diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
index 6cc4b78c167..5566c082cb6 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -4,13 +4,11 @@ Thank you for submitting a pull request to the JRuby project! Your help means a
 
 Please make sure you are targeting the correct branch:
 
-* Most bug fixes should target `jruby-9.4` as that is our current maintenance release JRuby 9.4.
-* Ruby 3.2, 3.3, or 3.4 compatibility fixes should target `master`, which is the branch for JRuby 10. Most performance fixes should also go to `master`.
-* We will accept fixes for JRuby 9.3 (branch `jruby-9.3`) but that version is EOL and may not get new releases.
+* Most **bug fixes** should target the `jruby-10.0` branch as that is our current maintenance release JRuby 10.0.x.
+* Ruby 4.0 **compatibility fixes** should target `master`, which is the branch for JRuby 10.1.x. Most **performance fixes** should also go to `master`.
+* We will accept fixes for JRuby 9.4 (branch `jruby-9.4`) but that version is EOL and may not get new releases.
 
-All branches are merged forward to the next major release (e.g. 9.4 is merged to master/10) as needed for releases.
-
-If you have questions, please just submit as best you can and we will assist.
+All branches are merged forward to the next major release (e.g. jruby-10.0 is merged to master/10.1) as needed for releases.
 
 We also request that current users of JRuby add themselves to our user
 list by submitting a pull request to the following file:
@@ -20,6 +18,8 @@ list by submitting a pull request to the following file:
 This helps the JRuby community grow and share best practices and new ideas
 for how to apply JRuby to JVM and Ruby apps around the world.
 
+If you have questions, please just submit as best you can and we will assist.
+
 Replace this text with your pull request details.
 
 -->
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b95c83ee3ff..ed2abbeb271 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,29 +16,56 @@ jobs:
     strategy:
       matrix:
         target: ['test:jruby:int', 'spec:ruby:fast', 'spec:ji', 'spec:ffi', 'test:mri:core:jit', 'test:mri:extra', 'spec:ruby:fast:jit', 'test:mri:stdlib', 'spec:ruby:slow', 'spec:ruby:debug', 'test:jruby:aot', 'test:slow_suites', 'spec:compiler', 'spec:regression', 'spec:jrubyc', 'spec:profiler']
-        java-version: ['21', '25']
+        java-version: ['21', '25', '26']
       fail-fast: false
 
     name: rake ${{ matrix.target }} (Java ${{ matrix.java-version }})
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: rake ${{ matrix.target }}
         run: bin/jruby -S rake ${{ matrix.target }}
 
+  # This job is a fast-fail all-interp run of test:mri:code to give early indication if the jitted runs will pass.
+  rake-test-mri-fast:
+    name: rake test:mri:core:int (Java 26, fast fail)
+
+    runs-on: ubuntu-latest
+
+    env:
+      JRUBY_OPTS: '--dev'
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+      - name: remove old java installs
+        run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
+      - name: set up java 26
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: 26
+          cache: 'maven'
+      - name: bootstrap
+        run: ./mvnw -ntp -Pbootstrap clean package
+      - name: bundle install
+        run: bin/jruby --dev -S bundle install
+      - name: rake test:mri:core:int
+        run: bin/jruby -S rake test:mri:core:int
+
   rake-test-multiplatform:
     runs-on: ${{ matrix.platform }}
 
@@ -46,22 +73,22 @@ jobs:
       matrix:
         target: ['spec:jruby']
         platform: ['ubuntu-latest', 'macos-latest']
-        java-version: ['21', '25']
+        java-version: ['21', '25', '26']
       fail-fast: false
 
     name: rake ${{ matrix.target }} (Java ${{ matrix.java-version }})
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: rake ${{ matrix.target }}
@@ -70,24 +97,21 @@ jobs:
   repeat-specs:
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-
     name: run specs repeatedly to test optimizations
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: run specs
@@ -98,25 +122,22 @@ jobs:
   jruby-tests-dev:
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-
     env:
       JRUBY_OPTS: '--dev'
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: 21
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: rake test:jruby
@@ -128,7 +149,7 @@ jobs:
     strategy:
       matrix:
         target: ['test:mri:core:jit', 'test:jruby:jit', 'spec:compiler', 'spec:ruby:fast:jit', 'spec:ji']
-        java-version: ['21', '25']
+        java-version: ['21', '25', '26']
       fail-fast: false
 
     name: rake ${{ matrix.target }} (Java ${{ matrix.java-version }} -indy)
@@ -138,17 +159,17 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: rake ${{ matrix.target }}
@@ -167,17 +188,17 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: mvn package ${{ matrix.package-flags }}
@@ -199,17 +220,17 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: ${{ matrix.java-version }}
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: mvn package ${{ matrix.package-flags }}
@@ -220,25 +241,22 @@ jobs:
   regression-specs-jit:
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-
     env:
       JRUBY_OPTS: '-Xjit.threshold=0'
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: rake spec:regression
@@ -247,9 +265,6 @@ jobs:
   mvn-test-windows:
     runs-on: windows-latest
 
-    strategy:
-      fail-fast: false
-
     name: mvn -Ptest, rake test:jruby (Windows, Java 21)
 
     env:
@@ -258,15 +273,15 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: rake test:jruby
@@ -274,13 +289,38 @@ jobs:
         env:
           JRUBY_OPTS: ''
       - name: mvn -P test
-        run: ./mvnw package -B -Ptest
+        run: ./mvnw -ntp package -Ptest
 
-  spec-ruby-language-windows:
+  spec-ruby-prism-wasm:
     runs-on: windows-latest
 
     strategy:
       fail-fast: false
+      matrix:
+        rubyspec-target: ['language', 'core']
+
+    name: ${{ matrix.rubyspec-target }} specs (WASM Prism parser, Java 21)
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: set up java 21
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 21
+          cache: 'maven'
+      - name: bootstrap
+        run: mvn -ntp -Pbootstrap clean package
+      - name: bundle install
+        run: bin/jruby --dev -S bundle install
+      - name: ${{ matrix.rubyspec-target }} specs
+        run: bin/jruby spec/mspec/bin/mspec ci :${{ matrix.rubyspec-target }}
+        env:
+          JRUBY_OPTS: -Xparser.prism -Xparser.prism.wasm
+
+  spec-ruby-language-windows:
+    runs-on: windows-latest
 
     name: language specs (Windows, Java 21)
 
@@ -290,15 +330,15 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: language specs interpreted
@@ -311,9 +351,6 @@ jobs:
   spec-ruby-core-windows:
     runs-on: windows-latest
 
-    strategy:
-      fail-fast: false
-
     name: core specs (Windows, Java 21)
 
     env:
@@ -322,15 +359,15 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: core specs interpreted
@@ -340,6 +377,72 @@ jobs:
         env:
           JRUBY_OPTS: -Xjit.threshold=0
 
+  spec-ruby-freebsd:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        rubyspec-target: ['language', 'core']
+
+    name: ${{ matrix.rubyspec-target }} specs (FreeBSD, Java 21)
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: set up java 21
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: 21
+          cache: 'maven'
+      - name: pre-build JRuby
+        run: |
+          ./mvnw -ntp -Pbootstrap clean package
+          bin/jruby --dev -S bundle install
+      - name: run in FreeBSD
+        uses: vmactions/freebsd-vm@v1
+        with:
+          prepare: |
+            pkg install -y openjdk21
+          run: |
+            export JAVA_HOME="/usr/local/openjdk21"
+            export TZ="America/Chicago"
+            bin/jruby spec/mspec/bin/mspec ci :${{ matrix.rubyspec-target }}
+
+  spec-ruby-openbsd:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        rubyspec-target: ['language', 'core']
+
+    name: ${{ matrix.rubyspec-target }} specs (OpenBSD, Java 21)
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: set up java 21
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: 21
+          cache: 'maven'
+      - name: pre-build JRuby
+        run: |
+          ./mvnw -ntp -Pbootstrap clean package
+          bin/jruby --dev -S bundle install
+      - name: run in OpenBSD
+        uses: vmactions/openbsd-vm@v1
+        with:
+          prepare: |
+            pkg_add jdk--%21
+          run: |
+            export JAVA_HOME="/usr/local/jdk-21"
+            export TZ="America/Chicago"
+            bin/jruby spec/mspec/bin/mspec ci :${{ matrix.rubyspec-target }}
+
   dependency-check:
     runs-on: ubuntu-latest
 
@@ -347,11 +450,11 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '21'
@@ -364,17 +467,14 @@ jobs:
   test-versions:
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-
     name: Verify build artifacts
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
@@ -387,9 +487,6 @@ jobs:
   sequel:
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-
     services:
       postgres:
         image: postgres:latest
@@ -414,17 +511,17 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: 21
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: sequel
@@ -433,22 +530,19 @@ jobs:
   concurrent-ruby:
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: 21
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby --dev -S bundle install
       - name: concurrent-ruby
@@ -468,9 +562,9 @@ jobs:
 #
 #    steps:
 #      - name: checkout
-#        uses: actions/checkout@v3
+#        uses: actions/checkout@v6
 #      - name: set up java ${{ matrix.java-version }}
-#        uses: actions/setup-java@v3
+#        uses: actions/setup-java@v5
 #        with:
 #          distribution: 'zulu'
 #          java-version: ${{ matrix.java-version }}
@@ -499,7 +593,7 @@ jobs:
 #        with:
 #          java-version: 21
 #      - name: set up java ${{ matrix.java-version }}
-#        uses: actions/setup-java@v3
+#        uses: actions/setup-java@v5
 #        with:
 #          distribution: 'zulu'
 #          java-version: ${{ matrix.java-version }}
@@ -516,17 +610,17 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: remove default java except 21
         run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'semeru'
           java-version: '21'
           cache: 'maven'
       - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
+        run: ./mvnw -ntp -Pbootstrap clean package
       - name: bundle install
         run: bin/jruby -S bundle install
       - name: test profile
@@ -541,7 +635,7 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: install shellcheck
         run: sudo apt install shellcheck
       - name: run shellcheck
@@ -552,7 +646,7 @@ jobs:
       contents: read
     if: ${{ github.ref == 'refs/heads/master' && github.repository == 'jruby/jruby' }}
     needs: [mvn-test, mvn-test-extended, mvn-test-windows, dependency-check, rake-test, rake-test-indy-off, rake-test, test-versions, sequel, concurrent-ruby, jruby-tests-dev, regression-specs-jit]
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@46678ce513443c231ce91c7782ad72b886aed5b4
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 21
     secrets:
diff --git a/.github/workflows/dist-verification-ci.yml b/.github/workflows/dist-verification-ci.yml
new file mode 100644
index 00000000000..23a5394b6b4
--- /dev/null
+++ b/.github/workflows/dist-verification-ci.yml
@@ -0,0 +1,189 @@
+name: Dist Verification CI
+
+on: [push, pull_request]
+
+env:
+  JAVA_OPTS: '-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xms60M -Xmx1G -XX:InitialCodeCacheSize=40M -XX:ReservedCodeCacheSize=120M'
+
+permissions:
+  contents: read
+
+jobs:
+  build-dist:
+
+    strategy:
+      matrix:
+        java-version: ['21']
+      fail-fast: false
+
+    runs-on: ubuntu-latest
+
+    name: Build JRuby release artifacts
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+      - name: set up java 21
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: 21
+          cache: 'maven'
+      - name: build dist archive
+        run: |
+          ./mvnw -ntp clean package -Pall
+          mv maven/jruby-dist/target/jruby-dist*-bin.tar.gz jruby-dist-bin.tar.gz
+          mv maven/jruby-dist/target/jruby-dist*-src.tar.gz jruby-dist-src.tar.gz
+          mv maven/jruby-complete/target/jruby-complete*.jar jruby-complete.jar
+      - name: cache dist bin
+        uses: actions/upload-artifact@v7
+        with:
+          path: jruby-dist-bin.tar.gz
+          retention-days: 1
+          archive: false
+      - name: cache dist src
+        uses: actions/upload-artifact@v7
+        with:
+          path: jruby-dist-src.tar.gz
+          retention-days: 1
+          archive: false
+      - name: cache jruby-complete
+        uses: actions/upload-artifact@v7
+        with:
+          path: jruby-complete.jar
+          retention-days: 1
+          archive: false
+
+  rails-verification:
+
+    needs: build-dist
+
+    strategy:
+      matrix:
+        java-version: ['21', '25']
+        runs-on: [windows-latest, macos-latest, ubuntu-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.runs-on }}
+
+    name: rails verification on ${{ matrix.runs-on }} (Java ${{ matrix.java-version }})
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+        with:
+          path: jruby-src
+      - name: set up java ${{ matrix.java-version }}
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java-version }}
+      - name: download cached dist bin
+        uses: actions/download-artifact@v8
+        with:
+          name: jruby-dist-bin.tar.gz
+      - name: unpack dist
+        run: tar xzf jruby-dist-bin.tar.gz --strip-components=1
+      - name: dist verification (Windows)
+        if: matrix.runs-on == 'windows-latest'
+        run: echo "${{ github.workspace }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+      - name: set up dist path (Unix)
+        if: matrix.runs-on != 'windows-latest'
+        run: echo "$(pwd)/bin" >> $GITHUB_PATH
+      - name: rails verification
+        run: jruby jruby-src/tool/rails_runner
+
+  src-verification:
+
+    needs: build-dist
+
+    strategy:
+      matrix:
+        java-version: ['21', '25']
+        runs-on: [windows-latest, macos-latest, ubuntu-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.runs-on }}
+
+    name: src verification on ${{ matrix.runs-on }} (Java ${{ matrix.java-version }})
+
+    steps:
+      - name: set up java ${{ matrix.java-version }}
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java-version }}
+      - name: download cached dist src
+        uses: actions/download-artifact@v8
+        with:
+          name: jruby-dist-src.tar.gz
+      - name: test compilation of dist src
+        run: |
+          mkdir jruby-dist-src
+          cd jruby-dist-src
+          tar xzf ../jruby-dist-src.tar.gz --strip-components=1
+          ./mvnw -ntp clean install -Pdist
+          cd ..
+
+  jruby-complete-verification:
+
+    needs: build-dist
+
+    strategy:
+      matrix:
+        java-version: ['21', '25']
+        runs-on: [windows-latest, macos-latest, ubuntu-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.runs-on }}
+
+    name: jruby-complete verification on ${{ matrix.runs-on }} (Java ${{ matrix.java-version }})
+
+    steps:
+      - name: set up java ${{ matrix.java-version }}
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java-version }}
+      - name: download cached jruby-complete
+        uses: actions/download-artifact@v8
+        with:
+          name: jruby-complete.jar
+      - name: confirm rubygems works with jruby-complete
+        run: java -jar jruby-complete.jar -S gem list
+
+  misc-verification:
+
+    needs: build-dist
+
+    strategy:
+      matrix:
+        java-version: ['21', '25']
+        runs-on: [windows-latest, macos-latest, ubuntu-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.runs-on }}
+
+    name: misc verification on ${{ matrix.runs-on }} (Java ${{ matrix.java-version }})
+
+    steps:
+      - name: set up java ${{ matrix.java-version }}
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java-version }}
+      - name: download cached dist bin
+        uses: actions/download-artifact@v8
+        with:
+          name: jruby-dist-bin.tar.gz
+      - name: unpack dist
+        run: tar xzf jruby-dist-bin.tar.gz --strip-components=1
+      - name: dist verification (Windows)
+        if: matrix.runs-on == 'windows-latest'
+        run: echo "${{ github.workspace }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+      - name: set up dist path (Unix)
+        if: matrix.runs-on != 'windows-latest'
+        run: echo "$(pwd)/bin" >> $GITHUB_PATH
+      - name: syslog verification (Unix)
+        if: matrix.runs-on != 'windows-latest'
+        run: jruby -rsyslog -e 1
diff --git a/.github/workflows/manual-snapshot-publish-21.yml b/.github/workflows/manual-snapshot-publish-21.yml
index 944e56259d9..ed8050003a7 100644
--- a/.github/workflows/manual-snapshot-publish-21.yml
+++ b/.github/workflows/manual-snapshot-publish-21.yml
@@ -8,7 +8,7 @@ jobs:
   publish:
     permissions:
       contents: read
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@659a649a802bafb69c5d216f6fbc4160c749d454
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 21
     secrets:
diff --git a/.github/workflows/manual-snapshot-publish.yml b/.github/workflows/manual-snapshot-publish.yml
index 5f33944a4ac..25c6e5efe63 100644
--- a/.github/workflows/manual-snapshot-publish.yml
+++ b/.github/workflows/manual-snapshot-publish.yml
@@ -8,7 +8,7 @@ jobs:
   publish:
     permissions:
       contents: read
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@659a649a802bafb69c5d216f6fbc4160c749d454
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 8
     secrets:
diff --git a/.github/workflows/nightly-snapshot-publish-21.yml b/.github/workflows/nightly-snapshot-publish-21.yml
index 25db07a32a5..941837f0871 100644
--- a/.github/workflows/nightly-snapshot-publish-21.yml
+++ b/.github/workflows/nightly-snapshot-publish-21.yml
@@ -15,7 +15,7 @@ jobs:
     permissions:
       contents: read
     if: ${{ github.ref == 'refs/heads/master' && github.repository == 'jruby/jruby' }}
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@659a649a802bafb69c5d216f6fbc4160c749d454
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 21
     secrets:
diff --git a/.github/workflows/nightly-snapshot-publish.yml b/.github/workflows/nightly-snapshot-publish.yml
index a0ab4b5bc22..4dfa431412f 100644
--- a/.github/workflows/nightly-snapshot-publish.yml
+++ b/.github/workflows/nightly-snapshot-publish.yml
@@ -15,7 +15,7 @@ jobs:
     permissions:
       contents: read
     if: ${{ github.ref == 'refs/heads/jruby-9.4' && github.repository == 'jruby/jruby' }}
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@659a649a802bafb69c5d216f6fbc4160c749d454
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 8
     secrets:
diff --git a/.github/workflows/snapshot-publish.yml b/.github/workflows/snapshot-publish.yml
index cc262263f5b..90d6d20e0e2 100644
--- a/.github/workflows/snapshot-publish.yml
+++ b/.github/workflows/snapshot-publish.yml
@@ -23,9 +23,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: set up Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: ${{ inputs.javaLevel }}
@@ -33,14 +33,13 @@ jobs:
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
       - name: Publish package
-        run: ./mvnw -B clean deploy -Psnapshots
+        run: ./mvnw -ntp clean deploy -Psnapshots
         env:
           MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Archive non-Maven artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: jruby-jars gem
-          path: |
-            maven/jruby-jars/pkg/jruby-jars-*.SNAPSHOT.gem
+          path: maven/jruby-jars/pkg/jruby-jars-*.SNAPSHOT.gem
+          archive: false
             
diff --git a/.github/workflows/windows-verification-ci.yml b/.github/workflows/windows-verification-ci.yml
deleted file mode 100644
index aef588ea0e0..00000000000
--- a/.github/workflows/windows-verification-ci.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: JRuby CI
-
-on: [push, pull_request]
-
-env:
-  JAVA_OPTS: '-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xms60M -Xmx1G -XX:InitialCodeCacheSize=40M -XX:ReservedCodeCacheSize=120M'
-
-permissions:
-  contents: read
-
-jobs:
-
-  rake-test:
-    runs-on: windows-latest
-
-    strategy:
-      matrix:
-        java-version: ['21', '25']
-      fail-fast: false
-
-    name: windows verification (Java ${{ matrix.java-version }})
-
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: ${{ matrix.java-version }}
-          cache: 'maven'
-      - name: bootstrap
-        run: mvn -ntp -Pbootstrap clean package
-      - name: bundle install
-        run: bin/jruby --dev -S bundle install
-      - name: jruby rails_runner
-        shell: cmd
-        run: |
-          set PATH=%CD%\bin;%PATH%
-          jruby tool/rails_runner
diff --git a/.gitignore b/.gitignore
index 953cd8c0edd..5bff5a3083e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,6 @@ lib/ruby/stdlib/*.jar
 lib/ruby/stdlib/ant*
 lib/ruby/stdlib/benchmark*
 lib/ruby/stdlib/bundler*
-lib/ruby/stdlib/cgi*
 lib/ruby/stdlib/debug*
 lib/ruby/stdlib/delegate*
 lib/ruby/stdlib/did_you_mean*
@@ -125,6 +124,7 @@ lib/ruby/stdlib/un*
 lib/ruby/stdlib/uri*
 lib/ruby/stdlib/yaml*
 lib/ruby/stdlib/weakref*
+lib/ruby/stdlib/win32/registry.rb
 
 release.properties
 share
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index cb28b0e37c7..00000000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index f5ed32693d9..c595b0093af 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,18 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip
diff --git a/BUILDING.md b/BUILDING.md
index 72b5fbadca4..b63f9bd66a0 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -5,7 +5,6 @@ Prerequisites:
 
 * A [Java 21-compatible (or higher) Java development kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
   * If `JAVA_HOME` is not set on Mac OS X: `export JAVA_HOME=$(/usr/libexec/java_home)`
-* [Maven](https://maven.apache.org/download.cgi) 3.3.0+ (Maven Wrapper provided with `./mvnw`)
 
 For running tests, you will need Ant:
 
@@ -25,7 +24,7 @@ command to execute is:
 ./mvnw
 ```
 
-This will run the default "install" goal (`mvn install`) and will do all of the following:
+This will run the default "install" goal (`./mvnw install`) and will do all of the following:
 
 * Compile JRuby
 * Build `lib/jruby.jar`, needed for running at command line
@@ -33,13 +32,11 @@ This will run the default "install" goal (`mvn install`) and will do all of the
 
 The environment is now suitable for running Ruby applications.
 
-If you have Maven installed in your PATH, you can just use `mvn` instead of `./mvnw`.
-
 Incremental Builds
 ------------------
 
 When working on JRuby sources, it is helpful to incrementally rebuild only the `lib/jruby.jar` file rather than also
-re-assembling the standard library. You can add `-Dcore` to the `mvn` command line to speed up incremental builds:
+re-assembling the standard library. You can add `-Dcore` to the `./mvnw` command line to speed up incremental builds:
 
 ```
 ./mvnw -Dcore
@@ -92,7 +89,7 @@ environment. This will do the following:
  needed to run integration tests.
 
 ```
-mvn -Pbootstrap
+./mvnw -Pbootstrap
 ```
 
 In case there is a problem with installing the jruby-launcher (due to missing compiler or so) use
@@ -110,7 +107,7 @@ After changing Java code, you can recompile quickly by running one of the
 jar files by
 
 ```
-mvn -pl core
+./mvnw -pl core
 ```
 
 ### Day to Day Testing
@@ -160,7 +157,7 @@ Most of the specs under the spec/ directory are written for rspec, and can be ru
 
 The notable exception is the "Ruby specs" under spec/ruby, which are run with mspec as described later in this document.
 
-rspec will be installed with `mvn package -Pbootstrap` or you can install it manually.
+rspec will be installed with `./mvnw package -Pbootstrap` or you can install it manually.
 
 ```
 ./bin/jruby -S rspec spec/path/to/spec
@@ -193,7 +190,7 @@ If you are making changes that would affect JRuby's core runtime
 or embedding APIs, you should run JRuby's Java-based unit tests via
 
 ```
-mvn -Ptest
+./mvnw -Ptest
 ```
 
 #### Tests for other ways of deploying and packaging JRuby
@@ -201,9 +198,9 @@ mvn -Ptest
 There are some maven integration tests (i.e. consistency test if all gems are included, osgi test, etc) for the various distributions of JRuby which can be invoked with
 
 ```
-mvn -Pmain -Dinvoker.skip=false
-mvn -Pcomplete -Dinvoker.skip=false
-mvn -Pdist -Dinvoker.skip=false
+./mvnw -Pmain -Dinvoker.skip=false
+./mvnw -Pcomplete -Dinvoker.skip=false
+./mvnw -Pdist -Dinvoker.skip=false
 ```
 
 #### Just Like CI
@@ -224,18 +221,18 @@ maven/jruby-dist/src/it
 To trigger the tests with the build:
 
 ```
-mvn -Pmain -Dinvoker.skip=false
-mvn -Pcomplete -Dinvoker.skip=false
-mvn -Pdist -Dinvoker.skip=false
-mvn -Pjruby-jars -Dinvoker.skip=false
+./mvnw -Pmain -Dinvoker.skip=false
+./mvnw -Pcomplete -Dinvoker.skip=false
+./mvnw -Pdist -Dinvoker.skip=false
+./mvnw -Pjruby-jars -Dinvoker.skip=false
 ```
 
 To pick a particular test, add the name of the directory inside the respective *src/it* folder, like (wildcards are possible):
 
 ```
-mvn -Pmain -Dinvoker.skip=false -Dinvoker.test=integrity
-mvn -Pmain -Dinvoker.skip=false -Dinvoker.test=j2ee*
-mvn -Pmain -Dinvoker.skip=false -Dinvoker.test=osgi*
+./mvnw -Pmain -Dinvoker.skip=false -Dinvoker.test=integrity
+./mvnw -Pmain -Dinvoker.skip=false -Dinvoker.test=j2ee*
+./mvnw -Pmain -Dinvoker.skip=false -Dinvoker.test=osgi*
 ```
 
 Clean Build
@@ -244,7 +241,7 @@ Clean Build
 To clean the build it is important to use the same profile for the clean as what you want to build. The best way to clean build something is, i.e. jruby-jars
 
 ```
-mvn clean install -Pjruby-jars
+./mvnw clean install -Pjruby-jars
 ```
 
 This first cleans everything and then starts the new build in one go!
@@ -253,12 +250,12 @@ Cleaning the build may be necessary after switching to a different
 version of JRuby (for example, after switching git branches) to ensure
 that everything is rebuilt properly.
 
-NOTE: `mvn clean` just cleans the **jruby-core** artifact and the **./lib/jruby.jar**!
+NOTE: `./mvnw clean` just cleans the **jruby-core** artifact and the **./lib/jruby.jar**!
 
 Clean everything:
 
 ```
-mvn -Pclean
+./mvnw -Pclean
 ```
 
 Distribution Packages
diff --git a/USERS.md b/USERS.md
index 16462f5bf62..3236045d8de 100644
--- a/USERS.md
+++ b/USERS.md
@@ -72,38 +72,30 @@ AsciiDoc content to HTML 5, PDF and other formats That is implemented in Ruby.
 Additional content in the [JRuby Success Stories](https://github.com/jruby/jruby/wiki/SuccessStories#substitutealert-inc) wiki page.
 
 * **Desc:** We make SubAlert, the top rated substitute teacher app in the U.S. and Canada.
-
 * **Usage:** JRuby is used for scaling this highly parallel application in ways that CRuby can't match. Java integration with the Firebase library allows sending Android notifications, even though there's no official support for Ruby. The JRuby team has been amazingly responsive and we are really happy using JRuby for over 12 years at the time of this writing! 🎉
-
 * **Since:** 2013
-
 * **Links:** [https://www.subalert.com](https://www.subalert.com), [iPhone App](https://apps.apple.com/us/app/subalert-for-frontline-ed/id557785741), [Android App](https://play.google.com/store/apps/details?id=com.substitutealert)
-
-* **Contact:** @mohamedhafez83 
+* **Contact:** @mohamedhafez83
 
 ### eazyBI
 
 * **Desc:** eazyBI is a Business Intelligence application for creating reports, charts, and dashboards from many different data sources. eazyBI's most popular integration is with Atlassian Jira and other Jira apps. It is one of the top-selling third-party apps on the Atlassian Marketplace.
-
 * **Usage:** eazyBI is a Ruby on Rails application that runs on JRuby. JRuby allows embedding a Java-based Mondrian OLAP engine, integrating with Apache POI and Batik libraries, as well as packaging eazyBI as a Jira Data Center plugin (Java jar file).
 eazyBI is deployed both in the cloud as well as installed on thousands of customer servers running Linux or Windows and connecting to PostgreSQL, MySQL, Oracle, and Microsoft SQL Server databases.
 One of the eazyBI core components is [mondrian-olap](https://github.com/rsim/mondrian-olap) which provides JRuby DSL for using the Mondrian OLAP engine.
-
 * **Since:** 2011
-
 * **Links:** [eazyBI](https://eazybi.com)
-
 * **Contact:** @rsim
 
 ### GoCD (Go Continuous Delivery)
 
 * **Desc:** GoCD is an open-source self-hostable continuous delivery / integration automation
 server, automating the software build-test-release cycle to enable frequent and reliable
-software builds & deployments. It helps teams visualise and streamline complex development workflows 
+software builds & deployments. It helps teams visualise and streamline complex development workflows
 by allowing teams to visualize their entire delivery process through "pipelines as code"
 ensuring that software can be released at any time.
-* **Usage:** While originally used more widely within GoCD, JRuby/Rails/[JRuby-Rack](https://github.com/jruby/jruby-rack) is still used 
-via [Jetty](https://jetty.org/) for server-side rendering of various interfaces for users to interact with their pipeline job runs 
+* **Usage:** While originally used more widely within GoCD, JRuby/Rails/[JRuby-Rack](https://github.com/jruby/jruby-rack) is still used
+via [Jetty](https://jetty.org/) for server-side rendering of various interfaces for users to interact with their pipeline job runs
 and interoperate with the rest of the Java-based server.
 * **Since:** 2007
 * **Links:** [gocd.org](https://www.gocd.org/), [source](https://github.com/gocd/gocd), [docs](https://docs.gocd.org/current/)
@@ -112,5 +104,12 @@ and interoperate with the rest of the Java-based server.
 ### Zendesk
 
 * **Desc**: Zendesk is a leading customer support SaaS solution.
-* **Usage**: We use JRuby for the search indexer of our core support product to fetch data from different data stores and push it to our search engine. JRuby was chosen due to its multithreading capabilities and the Java library ecosystem. 
+* **Usage**: We use JRuby for the search indexer of our core support product to fetch data from different data stores and push it to our search engine. JRuby was chosen due to its multithreading capabilities and the Java library ecosystem.
 * **Link**: [Presentation slides with more context](https://www.slideshare.net/slideshow/50-000-processed-records-per-second-a-cruby-jruby-story/278760878)
+
+### openHAB
+
+* **Description**: A vendor and technology agnostic open-source home automation platform written in Java.
+* **Usage**: Leverages JRuby as one of several scripting engines (alongside JavaScript and Python) for its OSGi-based architecture, allowing users to write complex automation rules and logic via a [dedicated JRuby scripting add-on](https://github.com/openhab/openhab-addons/tree/main/bundles/org.openhab.automation.jrubyscripting).
+* **Since**: 2020
+* **Link**: [openHAB](https://www.openhab.org/)
diff --git a/VERSION b/VERSION
index 66ffcfa55e9..27e366ae64f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.0.0-SNAPSHOT
+10.1.1.0-SNAPSHOT
diff --git a/antlib/extra.xml b/antlib/extra.xml
deleted file mode 100644
index 0af003b8a82..00000000000
--- a/antlib/extra.xml
+++ /dev/null
@@ -1,517 +0,0 @@
-<project basedir='..'>
-<target name='mvn'>
-<exec executable='mvn' vmlauncher='false'>
-<arg line='-q'/>
-<arg line='-Ptest,bootstrap'/>
-<arg line='-DskipTests'/>
-</exec>
-<echo>
-build jruby maven artifact
-</echo>
-<exec executable='mvn' vmlauncher='false'>
-<arg line='-q'/>
-<arg line='-Pmain'/>
-</exec>
-<echo>
-build jruby-complete.jar
-</echo>
-<exec executable='mvn' vmlauncher='false'>
-<arg line='-q'/>
-<arg line='-Pcomplete'/>
-</exec>
-</target>
-<target name='test-jruby-jars-jruby.1.9'>
-<exec executable='java' failonerror='true' vmlauncher='false'>
-<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
-<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
-<arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
-<arg value='org.jruby.main.Main'/>
-<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
-<arg value='-r./test/ruby19_env.rb'/>
-<arg value='-rminitest/excludes'/>
-<arg value='lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb'/>
-<arg value='test/test_globals.rb'/>
-<arg value='test/test_adding_pem_to_x509store.rb'/>
-<arg value='test/test_argf.rb'/>
-<arg value='test/test_array.rb'/>
-<arg value='test/test_autoload.rb'/>
-<arg value='test/test_backquote.rb'/>
-<arg value='test/test_backtraces.rb'/>
-<arg value='test/test_big_decimal.rb'/>
-<arg value='test/test_binding_eval_yield.rb'/>
-<arg value='test/test_caller.rb'/>
-<arg value='test/test_case.rb'/>
-<arg value='test/test_class.rb'/>
-<arg value='test/test_comparable.rb'/>
-<arg value='test/test_core_arities.rb'/>
-<arg value='test/test_custom_enumerable.rb'/>
-<arg value='test/test_cvars_in_odd_scopes.rb'/>
-<arg value='test/test_date_joda_time.rb'/>
-<arg value='test/test_defined.rb'/>
-<arg value='test/test_default_constants.rb'/>
-<arg value='test/test_delegated_array_equals.rb'/>
-<arg value='test/test_dir.rb'/>
-<arg value='test/test_dir_with_jar_without_dir_entry.rb'/>
-<arg value='test/test_digest_extend.rb'/>
-<arg value='test/test_digest2.rb'/>
-<arg value='test/test_env.rb'/>
-<arg value='test/test_etc.rb'/>
-<arg value='test/test_file.rb'/>
-<arg value='test/test_flip.rb'/>
-<arg value='test/test_frame_self.rb'/>
-<arg value='test/test_hash.rb'/>
-<arg value='test/test_higher_javasupport.rb'/>
-<arg value='test/test_included_in_object_space.rb'/>
-<arg value='test/test_integer_overflows.rb'/>
-<arg value='test/test_ivar_table_integrity.rb'/>
-<arg value='test/test_io.rb'/>
-<arg value='test/test_load.rb'/>
-<arg value='test/test_load_gem_extensions.rb'/>
-<arg value='test/test_method.rb'/>
-<arg value='test/test_method_cache.rb'/>
-<arg value='test/test_method_override_and_caching.rb'/>
-<arg value='test/test_java_accessible_object.rb'/>
-<arg value='test/test_java_extension.rb'/>
-<arg value='test/test_java_wrapper_deadlock.rb'/>
-<arg value='test/test_jruby_internals.rb'/>
-<arg value='test/compiler/test_jrubyc.rb'/>
-<arg value='test/test_marshal_with_instance_variables.rb'/>
-<arg value='test/test_marshal_gemspec.rb'/>
-<arg value='test/test_method_missing.rb'/>
-<arg value='test/test_no_stack_trace_stomp.rb'/>
-<arg value='test/test_pack.rb'/>
-<arg value='test/test_primitive_to_java.rb'/>
-<arg value='test/test_process.rb'/>
-<arg value='test/test_proc_visibility.rb'/>
-<arg value='test/test_parsing.rb'/>
-<arg value='test/test_pathname.rb'/>
-<arg value='test/test_random.rb'/>
-<arg value='test/test_rbconfig.rb'/>
-<arg value='test/test_require_once.rb'/>
-<arg value='test/test_respond_to.rb'/>
-<arg value='test/test_socket.rb'/>
-<arg value='test/test_string_java_bytes.rb'/>
-<arg value='test/test_string_printf.rb'/>
-<arg value='test/test_string_to_number.rb'/>
-<arg value='test/test_super_call_site_caching.rb'/>
-<arg value='test/test_system.rb'/>
-<arg value='test/test_system_error.rb'/>
-<arg value='test/test_timeout.rb'/>
-<arg value='test/test_thread.rb'/>
-<arg value='test/test_threaded_nonlocal_return.rb'/>
-<arg value='test/test_time_add.rb'/>
-<arg value='test/test_time_nil_ops.rb'/>
-<arg value='test/test_time_tz.rb'/>
-<arg value='test/test_unmarshal.rb'/>
-<arg value='test/test_vietnamese_charset.rb'/>
-<arg value='test/test_win32.rb'/>
-<arg value='test/test_zlib.rb'/>
-<arg value='test/test_loading_builtin_libraries.rb'/>
-<arg value='test/test_load_compiled_ruby_class_from_classpath.rb'/>
-<arg value='test/test_null_channel.rb'/>
-<arg value='test/test_irubyobject_java_passing.rb'/>
-<arg value='test/test_jruby_object_input_stream.rb'/>
-<arg value='test/test_jar_on_load_path.rb'/>
-<arg value='test/test_jruby_core_ext.rb'/>
-<arg value='test/test_thread_context_frame_dereferences_unreachable_variables.rb'/>
-<arg value='test/test_context_classloader.rb'/>
-<arg value='test/test_rexml_document.rb'/>
-<arg value='test/test_load_compiled_ruby.rb'/>
-<arg value='test/test_openssl_stub.rb'/>
-<arg value='test/test_missing_jruby_home.rb'/>
-<arg value='test/test_ast_inspector.rb'/>
-<arg value='test/test_jarred_gems_with_spaces_in_directory.rb'/>
-<arg value='test/test_kernel.rb'/>
-<arg value='test/test_dir_with_plusses.rb'/>
-<arg value='test/test_jar_file.rb'/>
-<arg value='test/test_jruby_synchronized.rb'/>
-<arg value='test/test_instantiating_interfaces.rb'/>
-<arg value='test/test_openssl.rb'/>
-<arg value='test/test_tempfile_cleanup.rb'/>
-<!--arg value='-v'/-->
-</exec>
-</target>
-<target name='test-jruby-complete-slow'>
-<exec executable='java' failonerror='true' vmlauncher='false'>
-<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
-<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
-<arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.jar'/>
-<arg value='org.jruby.main.Main'/>
-<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
-<arg value='-r./test/ruby19_env.rb'/>
-<arg value='-rminitest/excludes'/>
-<arg value='lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb'/>
-<arg value='test/test_command_line_switches.rb'/>
-<arg value='test/test_launching_by_shell_script.rb'/>
-<!--arg value='-v'/-->
-</exec>
-</target>
-<target name='test-jruby-jars-objectspace'>
-<exec executable='java' failonerror='true' vmlauncher='false'>
-<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
-<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
-<arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
-<arg value='org.jruby.main.Main'/>
-<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
-<arg value='-r./test/ruby19_env.rb'/>
-<arg value='-rminitest/excludes'/>
-<arg value='lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb'/>
-<arg value='test/test_objectspace.rb'/>
-<arg value='test/test_cache_map_leak.rb'/>
-<!--arg value='-v'/-->
-</exec>
-</target>
-<target name='test-jruby-jars-mri.1.9'>
-<exec executable='java' failonerror='true' vmlauncher='false'>
-<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
-<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
-<arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
-<arg value='org.jruby.main.Main'/>
-<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
-<arg value='-r./test/ruby19_env.rb'/>
-<arg value='-rminitest/excludes'/>
-<arg value='lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_alias.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_array.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_assignment.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_autoload.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_basicinstructions.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_beginendblock.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_bignum.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_call.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_case.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_clone.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_comparable.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_complex.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_complex2.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_complexrational.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_condition.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_const.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_continuation.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_defined.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_dir.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_dir_m17n.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_encoding.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_enum.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_enumerator.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_env.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_eval.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_exception.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_file.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_file_exhaustive.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_fixnum.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_flip.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_float.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_fnmatch.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_gc.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_hash.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_ifunless.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_integer.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_integer_comb.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_iterator.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_lambda.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_literal.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_m17n.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_m17n_comb.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_marshal.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_math.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_metaclass.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_method.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_mixed_unicode_escapes.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_module.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_notimp.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_numeric.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_object.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_objectspace.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_optimization.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_pack.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_parse.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_path.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_pipe.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_primitive.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_proc.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_rand.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_range.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_rational.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_rational2.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_readpartial.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_regexp.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_require.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_rubyoptions.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_settracefunc.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_signal.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_sleep.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_sprintf.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_sprintf_comb.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_string.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_stringchar.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_struct.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_super.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_symbol.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_syntax.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_system.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_thread.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_time.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_time_tz.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_trace.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_transcode.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_undef.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_unicode_escape.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_variable.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_whileuntil.rb'/>
-<arg value='test/externals/ruby1.9/ruby/test_yield.rb'/>
-<arg value='test/externals/ruby1.9/test_pp.rb'/>
-<arg value='test/externals/ruby1.9/test_cmath.rb'/>
-<arg value='test/externals/ruby1.9/test_delegate.rb'/>
-<arg value='test/externals/ruby1.9/test_find.rb'/>
-<arg value='test/externals/ruby1.9/test_ipaddr.rb'/>
-<arg value='test/externals/ruby1.9/test_pp.rb'/>
-<arg value='test/externals/ruby1.9/test_prettyprint.rb'/>
-<arg value='test/externals/ruby1.9/test_prime.rb'/>
-<arg value='test/externals/ruby1.9/test_pstore.rb'/>
-<arg value='test/externals/ruby1.9/test_pty.rb'/>
-<arg value='test/externals/ruby1.9/test_securerandom.rb'/>
-<arg value='test/externals/ruby1.9/test_set.rb'/>
-<arg value='test/externals/ruby1.9/test_shellwords.rb'/>
-<arg value='test/externals/ruby1.9/test_singleton.rb'/>
-<arg value='test/externals/ruby1.9/test_syslog.rb'/>
-<arg value='test/externals/ruby1.9/test_tempfile.rb'/>
-<arg value='test/externals/ruby1.9/test_time.rb'/>
-<arg value='test/externals/ruby1.9/test_timeout.rb'/>
-<arg value='test/externals/ruby1.9/test_tsort.rb'/>
-<arg value='test/externals/ruby1.9/base64/test_base64.rb'/>
-<arg value='test/externals/ruby1.9/benchmark/test_benchmark.rb'/>
-<arg value='test/externals/ruby1.9/bigdecimal/test_bigdecimal.rb'/>
-<arg value='test/externals/ruby1.9/bigdecimal/test_bigdecimal_util.rb'/>
-<arg value='test/externals/ruby1.9/bigdecimal/test_bigmath.rb'/>
-<arg value='test/externals/ruby1.9/cgi/test_cgi_cookie.rb'/>
-<arg value='test/externals/ruby1.9/cgi/test_cgi_core.rb'/>
-<arg value='test/externals/ruby1.9/cgi/test_cgi_header.rb'/>
-<arg value='test/externals/ruby1.9/cgi/test_cgi_modruby.rb'/>
-<arg value='test/externals/ruby1.9/cgi/test_cgi_multipart.rb'/>
-<arg value='test/externals/ruby1.9/cgi/test_cgi_session.rb'/>
-<arg value='test/externals/ruby1.9/cgi/test_cgi_tag_helper.rb'/>
-<arg value='test/externals/ruby1.9/cgi/test_cgi_util.rb'/>
-<arg value='test/externals/ruby1.9/coverage/test_coverage.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_csv_parsing.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_csv_writing.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_data_converters.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_encodings.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_features.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_headers.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_interface.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_row.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_serialization.rb'/>
-<arg value='test/externals/ruby1.9/csv/test_table.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_arith.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_attr.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_base.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_compat.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_conv.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_marshal.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_new.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_parse.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_strftime.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_strptime.rb'/>
-<arg value='test/externals/ruby1.9/date/test_date_parse.rb'/>
-<arg value='test/externals/ruby1.9/date/test_switch_hitter.rb'/>
-<arg value='test/externals/ruby1.9/digest/test_digest.rb'/>
-<arg value='test/externals/ruby1.9/digest/test_digest_extend.rb'/>
-<arg value='test/externals/ruby1.9/digest/test_digest_hmac.rb'/>
-<arg value='test/externals/ruby1.9/erb/test_erb.rb'/>
-<arg value='test/externals/ruby1.9/erb/test_erb_m17n.rb'/>
-<arg value='test/externals/ruby1.9/etc/test_etc.rb'/>
-<arg value='test/externals/ruby1.9/fileutils/test_dryrun.rb'/>
-<arg value='test/externals/ruby1.9/fileutils/test_fileutils.rb'/>
-<arg value='test/externals/ruby1.9/fileutils/test_nowrite.rb'/>
-<arg value='test/externals/ruby1.9/fileutils/test_verbose.rb'/>
-<arg value='test/externals/ruby1.9/iconv/test_basic.rb'/>
-<arg value='test/externals/ruby1.9/iconv/test_option.rb'/>
-<arg value='test/externals/ruby1.9/iconv/test_partial.rb'/>
-<arg value='test/externals/ruby1.9/json/test_json.rb'/>
-<arg value='test/externals/ruby1.9/json/test_json_addition.rb'/>
-<arg value='test/externals/ruby1.9/json/test_json_encoding.rb'/>
-<arg value='test/externals/ruby1.9/json/test_json_fixtures.rb'/>
-<arg value='test/externals/ruby1.9/json/test_json_generate.rb'/>
-<arg value='test/externals/ruby1.9/json/test_json_generic_object.rb'/>
-<arg value='test/externals/ruby1.9/json/test_json_string_matching.rb'/>
-<arg value='test/externals/ruby1.9/json/test_json_unicode.rb'/>
-<arg value='test/externals/ruby1.9/logger/test_logger.rb'/>
-<arg value='test/externals/ruby1.9/matrix/test_matrix.rb'/>
-<arg value='test/externals/ruby1.9/matrix/test_vector.rb'/>
-<arg value='test/externals/ruby1.9/monitor/test_monitor.rb'/>
-<arg value='test/externals/ruby1.9/nkf/test_kconv.rb'/>
-<arg value='test/externals/ruby1.9/nkf/test_nkf.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_asn1.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_bn.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_buffering.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_certificate.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_cipher.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_config.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_digest.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_hmac.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_imaps.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_integration.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_ns_spki.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_parse_certificate.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_pair.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_pkcs12.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_pkcs7.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_pkey_dh.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_pkey_dsa.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_pkey_rsa.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_ssl.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_partial_record_read.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_x509cert.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_x509crl.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_x509ext.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_x509name.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_x509req.rb'/>
-<arg value='test/externals/ruby1.9/openssl/test_x509store.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_bash_completion.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_getopts.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_noarg.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_optarg.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_optparse.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_placearg.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_reqarg.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_summary.rb'/>
-<arg value='test/externals/ruby1.9/optparse/test_zsh_completion.rb'/>
-<arg value='test/externals/ruby1.9/ostruct/test_ostruct.rb'/>
-<arg value='test/externals/ruby1.9/pathname/test_pathname.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_alias_and_anchor.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_array.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_boolean.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_class.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_coder.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_date_time.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_deprecated.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_document.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_emitter.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_encoding.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_exception.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_hash.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_json_tree.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_merge_keys.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_nil.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_null.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_numeric.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_object.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_object_references.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_omap.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_parser.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_psych.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_scalar.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_scalar_scanner.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_serialize_subclasses.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_set.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_stream.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_string.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_struct.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_symbol.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_tainted.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_to_yaml_properties.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_tree_builder.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_yaml.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_yamlstore.rb'/>
-<arg value='test/externals/ruby1.9/psych/json/test_stream.rb'/>
-<arg value='test/externals/ruby1.9/psych/nodes/test_enumerable.rb'/>
-<arg value='test/externals/ruby1.9/psych/visitors/test_depth_first.rb'/>
-<arg value='test/externals/ruby1.9/psych/visitors/test_emitter.rb'/>
-<arg value='test/externals/ruby1.9/psych/visitors/test_to_ruby.rb'/>
-<arg value='test/externals/ruby1.9/psych/visitors/test_yaml_tree.rb'/>
-<arg value='test/externals/ruby1.9/ripper/test_files.rb'/>
-<arg value='test/externals/ruby1.9/ripper/test_filter.rb'/>
-<arg value='test/externals/ruby1.9/ripper/test_parser_events.rb'/>
-<arg value='test/externals/ruby1.9/ripper/test_ripper.rb'/>
-<arg value='test/externals/ruby1.9/scanf/test_scanf.rb'/>
-<arg value='test/externals/ruby1.9/scanf/test_scanfblocks.rb'/>
-<arg value='test/externals/ruby1.9/socket/test_basicsocket.rb'/>
-<arg value='test/externals/ruby1.9/socket/test_nonblock.rb'/>
-<arg value='test/externals/ruby1.9/socket/test_socket.rb'/>
-<arg value='test/externals/ruby1.9/stringio/test_stringio.rb'/>
-<arg value='test/externals/ruby1.9/strscan/test_stringscanner.rb'/>
-<arg value='test/externals/ruby1.9/thread/test_queue.rb'/>
-<arg value='test/externals/ruby1.9/zlib/test_zlib.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_big5.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_cp949.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_emoji.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_euc_jp.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_euc_kr.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_euc_tw.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_gb18030.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_gbk.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_iso_8859.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_koi8.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_shift_jis.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_utf16.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_utf32.rb'/>
-<arg value='test/externals/ruby1.9/ruby/enc/test_windows_1251.rb'/>
-<!--arg value='-v'/-->
-</exec>
-</target>
-<target name='test-jruby-complete-rubicon.1.9'>
-<exec executable='java' failonerror='true' vmlauncher='false'>
-<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
-<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
-<arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.jar'/>
-<arg value='org.jruby.main.Main'/>
-<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
-<arg value='-r./test/ruby19_env.rb'/>
-<arg value='-rminitest/excludes'/>
-<arg value='lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb'/>
-<arg value='test/rubicon/test_access_control.rb'/>
-<arg value='test/rubicon/test_array.rb'/>
-<arg value='test/rubicon/test_assignment.rb'/>
-<arg value='test/rubicon/test_basic_expressions.rb'/>
-<arg value='test/rubicon/test_bignum.rb'/>
-<arg value='test/rubicon/test_blocks_procs.rb'/>
-<arg value='test/rubicon/test_boolean_expressions.rb'/>
-<arg value='test/rubicon/test_case.rb'/>
-<arg value='test/rubicon/test_catch_throw.rb'/>
-<arg value='test/rubicon/test_class.rb'/>
-<arg value='test/rubicon/test_comparable.rb'/>
-<arg value='test/rubicon/test_constants.rb'/>
-<arg value='test/rubicon/test_enumerable.rb'/>
-<arg value='test/rubicon/test_eval.rb'/>
-<arg value='test/rubicon/test_exception.rb'/>
-<arg value='test/rubicon/test_exceptions.rb'/>
-<arg value='test/rubicon/test_false_class.rb'/>
-<arg value='test/rubicon/test_float.rb'/>
-<arg value='test/rubicon/test_floats.rb'/>
-<arg value='test/rubicon/test_hash.rb'/>
-<arg value='test/rubicon/test_if_unless.rb'/>
-<arg value='test/rubicon/test_integer.rb'/>
-<arg value='test/rubicon/test_io.rb'/>
-<arg value='test/rubicon/test_loop_stuff.rb'/>
-<arg value='test/rubicon/test_marshal.rb'/>
-<arg value='test/rubicon/test_match_data.rb'/>
-<arg value='test/rubicon/test_math.rb'/>
-<arg value='test/rubicon/test_method.rb'/>
-<arg value='test/rubicon/test_methods.rb'/>
-<arg value='test/rubicon/test_module.rb'/>
-<arg value='test/rubicon/test_module_private.rb'/>
-<arg value='test/rubicon/test_nil_class.rb'/>
-<arg value='test/rubicon/test_numeric.rb'/>
-<arg value='test/rubicon/test_object.rb'/>
-<arg value='test/rubicon/test_object_space.rb'/>
-<arg value='test/rubicon/test_pack.rb'/>
-<arg value='test/rubicon/test_proc.rb'/>
-<arg value='test/rubicon/test_regexp.rb'/>
-<arg value='test/rubicon/test_range.rb'/>
-<arg value='test/rubicon/test_string.rb'/>
-<arg value='test/rubicon/test_strings.rb'/>
-<arg value='test/rubicon/test_struct.rb'/>
-<arg value='test/rubicon/test_symbol.rb'/>
-<arg value='test/rubicon/test_thread_group.rb'/>
-<arg value='test/rubicon/test_true_class.rb'/>
-<!--arg value='-v'/-->
-</exec>
-</target>
-<target description='test using jruby-complete or jruby-core/jruby-stdlib jars' name='test-jruby-jars' depends='mvn,test-jruby-jars-jruby.1.9,test-jruby-complete-slow,test-jruby-jars-objectspace,test-jruby-jars-mri.1.9,test-jruby-complete-rubicon.1.9'/></project>
\ No newline at end of file
diff --git a/bin/.jruby.release b/bin/.jruby.release
index 6b9f48136b5..4a34399e6cd 100644
--- a/bin/.jruby.release
+++ b/bin/.jruby.release
@@ -1,3 +1,3 @@
-JRUBY_VERSION=10.1.0.0-SNAPSHOT
+JRUBY_VERSION=10.1.1.0-SNAPSHOT
 JRUBY_MAIN=org.jruby.main.Main
 JRUBY_MINIMUM_JAVA_VERSION=21
diff --git a/bin/ast b/bin/ast
index 2ce305c077f..a1e1e9cd4cd 100755
--- a/bin/ast
+++ b/bin/ast
@@ -151,14 +151,14 @@ module DotGraph
   end
 end
 
-root = JRuby.parse(options[:expression])
+root = JRuby.parse_result(options[:expression])
 
 if options[:print_ast]
   if options[:dot_format]
     DotGraph.print_graph(root)
   else
     print "AST:"
-    puts indent(root.to_string) 
+    puts indent(root.get_ast.to_string) 
     puts
   end
 end
@@ -191,7 +191,7 @@ def ir_setup(root)
   JRuby::IR.compiler_debug = true
 
 
-  builder = org.jruby.ir.builder.IRBuilderAST
+  builder = org.jruby.ir.builder.IRBuilder
 
   scope = builder.build_root(manager, root).scope
   scope.prepare_for_compilation
diff --git a/bin/jruby.sh b/bin/jruby.sh
index 0bf0966d811..d35f61e0052 100755
--- a/bin/jruby.sh
+++ b/bin/jruby.sh
@@ -849,7 +849,15 @@ JAVA_OPTS="$JAVA_OPTS ${JAVA_MEM-} ${JAVA_STACK-}"
 
 JFFI_OPTS="-Djffi.boot.library.path=$JRUBY_HOME/lib/jni"
 
-CLASSPATH="${CP-}${CP_DELIMITER}${CLASSPATH-}"
+if [ -n "${CP-}" ]; then
+    if [ -n "${CLASSPATH-}" ]; then
+        CLASSPATH="${CP-}${CP_DELIMITER}${CLASSPATH-}"
+    else
+        CLASSPATH="${CP-}"
+    fi
+else
+    CLASSPATH="${CLASSPATH-}"
+fi
 
 # ----- Module and Class Data Sharing flags for Java 9+ -----------------------
 
@@ -989,17 +997,22 @@ fi
 
 prepend java_args "$JAVACMD"
 
+classpath_value=$CLASSPATH
 if $NO_BOOTCLASSPATH || $VERIFY_JRUBY; then
     if $use_modules; then
         # Use module path instead of classpath for the jruby libs
-        append java_args --module-path "$JRUBY_CP" -classpath "$CLASSPATH"
+        append java_args --module-path "$JRUBY_CP"
     else
-        append java_args -classpath "$JRUBY_CP$CP_DELIMITER$CLASSPATH"
+        classpath_value="$JRUBY_CP$CP_DELIMITER$classpath_value"
+        # Trim extra delimiter we might have appended
+        classpath_value="${classpath_value%"$CP_DELIMITER"}"
     fi
 else
     append java_args -Xbootclasspath/a:"$JRUBY_CP"
-    append java_args -classpath "$CLASSPATH"
-    append java_args -Djruby.home="$JRUBY_HOME"
+fi
+
+if [ -n "$classpath_value" ]; then
+    append java_args -classpath "$classpath_value"
 fi
 
 append java_args -Djruby.home="$JRUBY_HOME" \
diff --git a/core/pom.rb b/core/pom.rb
index b05d52b3c61..d39e520b858 100644
--- a/core/pom.rb
+++ b/core/pom.rb
@@ -45,16 +45,16 @@
 
   # exclude jnr-ffi to avoid problems with shading and relocation of the asm packages
   jar 'com.github.jnr:jnr-netdb:1.2.0', exclusions: ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-enxio:0.32.19', exclusions: ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-unixsocket:0.38.24', exclusions: ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-posix:3.1.21', exclusions: ['com.github.jnr:jnr-ffi']
+  jar 'com.github.jnr:jnr-enxio:0.32.20', exclusions: ['com.github.jnr:jnr-ffi']
+  jar 'com.github.jnr:jnr-unixsocket:0.38.25', exclusions: ['com.github.jnr:jnr-ffi']
+  jar 'com.github.jnr:jnr-posix:3.1.22', exclusions: ['com.github.jnr:jnr-ffi']
   jar 'com.github.jnr:jnr-constants:0.10.4', exclusions: ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-ffi:2.2.18'
+  jar 'com.github.jnr:jnr-ffi:2.2.19'
   jar 'com.github.jnr:jffi:${jffi.version}'
   jar 'com.github.jnr:jffi:${jffi.version}:native'
 
-  jar 'org.jruby.joni:joni:2.2.6'
-  jar 'org.jruby.jcodings:jcodings:1.0.63'
+  jar 'org.jruby.joni:joni:2.2.7'
+  jar 'org.jruby.jcodings:jcodings:1.0.64'
   jar 'org.jruby:dirgra:0.5'
 
   jar 'com.headius:invokebinder:1.14'
@@ -80,6 +80,10 @@
 
   jar 'org.crac:crac:1.5.0'
 
+  jar 'org.jruby:jruby-prism:2.0.2'
+
+  jar 'ch.randelshofer:fastdoubleparser:2.0.1'
+
   plugin_management do
     plugin('org.eclipse.m2e:lifecycle-mapping:1.0.0',
            lifecycleMappingMetadata: {
diff --git a/core/pom.xml b/core/pom.xml
index 37ec6972d21..74a106370ab 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>10.1.0.0-SNAPSHOT</version>
+    <version>10.1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-base</artifactId>
   <name>JRuby Base</name>
@@ -55,9 +55,9 @@ DO NOT MODIFY - GENERATED CODE
     <test.results.dir>${build.dir}/test-results</test.results.dir>
     <tzdata.scope>provided</tzdata.scope>
     <tzdata.version>2019c</tzdata.version>
-    <version.ruby>3.4.5</version.ruby>
-    <version.ruby.major>3.4</version.ruby.major>
-    <version.ruby.minor>5</version.ruby.minor>
+    <version.ruby>4.0.0</version.ruby>
+    <version.ruby.major>4.0</version.ruby.major>
+    <version.ruby.minor>0</version.ruby.minor>
   </properties>
   <dependencies>
     <dependency>
@@ -89,7 +89,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-enxio</artifactId>
-      <version>0.32.19</version>
+      <version>0.32.20</version>
       <exclusions>
         <exclusion>
           <groupId>com.github.jnr</groupId>
@@ -100,7 +100,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
-      <version>0.38.24</version>
+      <version>0.38.25</version>
       <exclusions>
         <exclusion>
           <groupId>com.github.jnr</groupId>
@@ -111,7 +111,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.1.21</version>
+      <version>3.1.22</version>
       <exclusions>
         <exclusion>
           <groupId>com.github.jnr</groupId>
@@ -133,7 +133,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-ffi</artifactId>
-      <version>2.2.18</version>
+      <version>2.2.19</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -149,12 +149,12 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>org.jruby.joni</groupId>
       <artifactId>joni</artifactId>
-      <version>2.2.6</version>
+      <version>2.2.7</version>
     </dependency>
     <dependency>
       <groupId>org.jruby.jcodings</groupId>
       <artifactId>jcodings</artifactId>
-      <version>1.0.63</version>
+      <version>1.0.64</version>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
@@ -237,6 +237,16 @@ DO NOT MODIFY - GENERATED CODE
       <artifactId>crac</artifactId>
       <version>1.5.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-prism</artifactId>
+      <version>2.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.randelshofer</groupId>
+      <artifactId>fastdoubleparser</artifactId>
+      <version>2.0.1</version>
+    </dependency>
   </dependencies>
   <build>
     <defaultGoal>package</defaultGoal>
@@ -701,7 +711,7 @@ DO NOT MODIFY - GENERATED CODE
                     <path>
                       <groupId>org.jruby</groupId>
                       <artifactId>jruby-base</artifactId>
-                      <version>10.1.0.0-SNAPSHOT</version>
+                      <version>10.1.1.0-SNAPSHOT</version>
                     </path>
                   </annotationProcessorPaths>
                 </configuration>
diff --git a/core/src/main/java/org/jruby/IncludedModule.java b/core/src/main/java/org/jruby/IncludedModule.java
index c5908f27f92..949193f2cef 100644
--- a/core/src/main/java/org/jruby/IncludedModule.java
+++ b/core/src/main/java/org/jruby/IncludedModule.java
@@ -45,12 +45,6 @@ public RubyModule getOrigin() {
         return origin;
     }
 
-    @Deprecated(since = "9.3.0.0")
-    @Override
-    public RubyModule getNonIncludedClass() {
-        return origin;
-    }
-
     @Deprecated(since = "10.0.3.0")
     @Override
     public IRubyObject id() {
diff --git a/core/src/main/java/org/jruby/IncludedModuleWrapper.java b/core/src/main/java/org/jruby/IncludedModuleWrapper.java
index b5945d373ab..340e55c1bde 100644
--- a/core/src/main/java/org/jruby/IncludedModuleWrapper.java
+++ b/core/src/main/java/org/jruby/IncludedModuleWrapper.java
@@ -73,24 +73,6 @@ public IncludedModuleWrapper(Ruby runtime, RubyClass superClass, RubyModule orig
         methods = methodsHolder.getMethodsForWrite();
     }
 
-    /**
-     * Overridden newIncludeClass implementation to allow attaching future includes to the correct module
-     * (i.e. the one to which this is attached)
-     *
-     * @see org.jruby.RubyModule#newIncludeClass(RubyClass)
-     */
-    @Override
-    @Deprecated(since = "1.1.5")
-    public IncludedModuleWrapper newIncludeClass(RubyClass superClass) {
-        var context = getCurrentContext();
-        IncludedModuleWrapper includedModule = new IncludedModuleWrapper(context.runtime, superClass, getOrigin());
-
-        // include its parent (and in turn that module's parents)
-        if (getSuperClass() != null) includedModule.includeModule(context, getSuperClass());
-
-        return includedModule;
-    }
-
     public RubyModule getDelegate() {
         return origin;
     }
diff --git a/core/src/main/java/org/jruby/MetaClass.java b/core/src/main/java/org/jruby/MetaClass.java
index c778f8c3c64..3d261052cd2 100644
--- a/core/src/main/java/org/jruby/MetaClass.java
+++ b/core/src/main/java/org/jruby/MetaClass.java
@@ -41,11 +41,6 @@
 
 public final class MetaClass extends RubyClass {
 
-    @Deprecated(since = "9.2.1.0")
-    public MetaClass(Ruby runtime, RubyClass superClass, IRubyObject attached) {
-        this(runtime, superClass, (RubyBasicObject) attached);
-    }
-
     /**
      * rb_class_boot for meta classes ({@link #makeMetaClass(ThreadContext, RubyClass)})
      */
diff --git a/core/src/main/java/org/jruby/NativeException.java b/core/src/main/java/org/jruby/NativeException.java
index c967c593b02..0cfb0ad129d 100644
--- a/core/src/main/java/org/jruby/NativeException.java
+++ b/core/src/main/java/org/jruby/NativeException.java
@@ -82,11 +82,6 @@ public final IRubyObject cause() {
         return Java.getInstance(getRuntime(), getCause());
     }
 
-    @Deprecated(since = "9.1.0.0")
-    public final IRubyObject cause(Block unusedBlock) {
-        return cause();
-    }
-
     @Override
     public final IRubyObject backtrace() {
         IRubyObject rubyTrace = super.backtrace();
@@ -134,45 +129,6 @@ private static RubyArray joinedBacktrace(final Ruby runtime, final RubyArray rTr
         return RubyArray.newArrayMayCopy(runtime, trace);
     }
 
-    @Deprecated(since = "9.1.0.0") // not used
-    public void trimStackTrace(Member target) {
-        Throwable t = new Throwable();
-        StackTraceElement[] origStackTrace = cause.getStackTrace();
-        StackTraceElement[] currentStackTrace = t.getStackTrace();
-        int skip = 0;
-        for (int i = 1;
-                i <= origStackTrace.length && i <= currentStackTrace.length;
-                ++i) {
-            StackTraceElement a = origStackTrace[origStackTrace.length - i];
-            StackTraceElement b = currentStackTrace[currentStackTrace.length - i];
-            if (a.equals(b)) {
-                skip += 1;
-            } else {
-                break;
-            }
-        }
-        // If we know what method was being called, strip everything
-        // before the call. This hides the JRuby and reflection internals.
-        if (target != null) {
-            String className = target.getDeclaringClass().getName();
-            String methodName = target.getName();
-            for (int i = origStackTrace.length - skip - 1; i >= 0; --i) {
-                StackTraceElement frame = origStackTrace[i];
-                if (frame.getClassName().equals(className) &&
-                    frame.getMethodName().equals(methodName)) {
-                    skip = origStackTrace.length - i - 1;
-                    break;
-                }
-            }
-        }
-        if (skip > 0) {
-            final int len = origStackTrace.length - skip;
-            StackTraceElement[] newStackTrace = new StackTraceElement[len];
-            System.arraycopy(origStackTrace, 0, newStackTrace, 0, len);
-            cause.setStackTrace(newStackTrace);
-        }
-    }
-
     @Override
     public final IRubyObject getMessage() {
         if (message == null) {
diff --git a/core/src/main/java/org/jruby/PrependedModule.java b/core/src/main/java/org/jruby/PrependedModule.java
index 8334c0003e3..80b4e8edd42 100644
--- a/core/src/main/java/org/jruby/PrependedModule.java
+++ b/core/src/main/java/org/jruby/PrependedModule.java
@@ -137,12 +137,6 @@ public RubyModule getDelegate() {
         return origin;
     }
 
-    @Deprecated(since = "9.3.0.0")
-    @Override
-    public RubyModule getNonIncludedClass() {
-        return origin;
-    }
-
     @Deprecated(since = "10.0.3.0")
     @Override
     public IRubyObject id() {
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
index 229a4878225..c62a2051e85 100644
--- a/core/src/main/java/org/jruby/Ruby.java
+++ b/core/src/main/java/org/jruby/Ruby.java
@@ -50,6 +50,7 @@
 import org.jruby.exceptions.LocalJumpError;
 import org.jruby.exceptions.SystemExit;
 import org.jruby.ext.jruby.JRubyUtilLibrary;
+import org.jruby.ext.set.RubySet;
 import org.jruby.ext.thread.ConditionVariable;
 import org.jruby.ext.thread.Mutex;
 import org.jruby.ext.thread.Queue;
@@ -497,12 +498,12 @@ private Ruby(RubyInstanceConfig config) {
             producerClass = null;
         }
 
-        continuationClass = initContinuation(context);
-
         TracePoint.createTracePointClass(context, objectClass);
 
         warningCategories = config.getWarningCategories();
         warningModule = RubyWarnings.createWarningModule(context);
+        warningBufferClass = RubyWarnings.createWarningBufferClass(context, warningModule);
+        warnings = new RubyWarnings(this, warningBufferClass);
 
         // Initialize exceptions
         initExceptions(context);
@@ -518,6 +519,8 @@ private Ruby(RubyInstanceConfig config) {
 
         dataClass = RubyData.createDataClass(context, objectClass);
 
+        setClass = RubySet.createSetClass(context, objectClass, enumerableModule);
+
         // everything booted, so SizedQueue should be available; set up root fiber
         ThreadFiber.initRootFiber(context, context.getThread());
 
@@ -602,6 +605,8 @@ private void initBootLibraries(ThreadContext context) {
         loadService.provide("thread.rb");
         loadService.provide("fiber.rb");
         loadService.provide("ruby2_keywords.rb");
+        loadService.provide("set.rb");
+        loadService.provide("pathname.rb");
 
         // Load preludes
         initRubyPreludes();
@@ -865,7 +870,7 @@ public IRubyObject evalScriptlet(String script) {
      */
     public IRubyObject evalScriptlet(String script, DynamicScope scope) {
         ThreadContext context = getCurrentContext();
-        RootNode rootNode = (RootNode) getParserManager().parseEval("<script>", 0, script, scope).getAST();
+        ParseResult rootNode = getParserManager().parseEval("<script>", 0, script, scope);
 
         context.preEvalScriptlet(scope);
 
@@ -1353,19 +1358,6 @@ public RubyClass getClass(String name) {
         return Access.getClass(getCurrentContext(), name);
     }
 
-    /**
-     * Retrieve the class with the given name from the Object namespace. The
-     * module name must be an interned string, but this method will be faster
-     * than the non-interned version.
-     *
-     * @param internedName the name of the class; <em>must</em> be an interned String!
-     * @return
-     */
-    @Deprecated(since = "1.7.0")
-    public RubyClass fastGetClass(String internedName) {
-        return Access.getClass(getCurrentContext(), internedName);
-    }
-
     /**
      * A variation of defineClass that allows passing in an array of supplementary
      * call sites for improving dynamic invocation performance.
@@ -1582,7 +1574,7 @@ public JavaSupport loadJavaSupport() {
     }
 
     private void loadBundler() {
-        loadService.loadFromClassLoader(getClassLoader(), "jruby/bundler/startup.rb", false);
+        loadService.loadFromClassLoader("jruby/bundler/startup.rb", false);
     }
 
     @SuppressWarnings("ReturnValueIgnored")
@@ -1608,18 +1600,7 @@ private void initThreadStatuses(ThreadContext context) {
         }
     }
 
-    @SuppressWarnings("deprecation")
-    private RubyClass initContinuation(ThreadContext context) {
-        // Bare-bones class for backward compatibility
-        if (profile.allowClass("Continuation")) {
-            // Some third-party code (racc's cparse ext, at least) uses RubyContinuation directly, so we need this.
-            // Most functionality lives in continuation.rb now.
-            return RubyContinuation.createContinuation(context, objectClass);
-        }
-        return null;
-    }
-
-    public static final int NIL_PREFILLED_ARRAY_SIZE = RubyArray.ARRAY_DEFAULT_SIZE * 8;
+    public static final int NIL_PREFILLED_ARRAY_SIZE = RubyArrayNative.ARRAY_DEFAULT_SIZE * 8;
     private final IRubyObject nilPrefilledArray[];
 
     public IRubyObject[] getNilPrefilledArray() {
@@ -1727,6 +1708,9 @@ private void initErrno(ThreadContext context) {
 
                 // map ENOSYS to NotImplementedError
                 errnos.put(Errno.ENOSYS.intValue(), notImplementedError);
+
+                // map NOERROR to 0
+                createSysErr(context, 0, "NOERROR");
             } catch (Exception e) {
                 // dump the trace and continue
                 // this is currently only here for Android, which seems to have
@@ -1776,7 +1760,7 @@ private void initJavaSupport(ThreadContext context) {
 
     private void initRubyKernel() {
         // load Ruby parts of core
-        loadService.loadFromClassLoader(getClassLoader(), "jruby/kernel.rb", false);
+        loadService.loadFromClassLoader("jruby/kernel.rb", false);
     }
 
     private void initRubyPreludes() {
@@ -1784,7 +1768,7 @@ private void initRubyPreludes() {
         if (RubyInstanceConfig.DEBUG_PARSER) return;
 
         // load Ruby parts of core
-        loadService.loadFromClassLoader(getClassLoader(), "jruby/preludes.rb", false);
+        loadService.loadFromClassLoader("jruby/preludes.rb", false);
     }
 
     public IRManager getIRManager() {
@@ -2188,10 +2172,6 @@ void setDefaultThreadGroup(RubyThreadGroup defaultThreadGroup) {
         this.defaultThreadGroup = defaultThreadGroup;
     }
 
-    public RubyClass getContinuation() {
-        return continuationClass;
-    }
-
     public RubyClass getStructClass() {
         return structClass;
     }
@@ -2508,6 +2488,10 @@ public RubyClass getData() {
         return dataClass;
     }
 
+    public RubyClass getSet() {
+        return setClass;
+    }
+
     /** The default Ruby Random object for this runtime */
     private RubyRandom defaultRandom;
 
@@ -2621,7 +2605,7 @@ public RubyObjectSpecializer getObjectSpecializer() {
     }
 
     public static ClassLoader getClassLoader() {
-        // we try to getService the classloader that loaded JRuby, falling back on System
+        // we try to get the classloader that loaded JRuby, falling back on System
         ClassLoader loader = Ruby.class.getClassLoader();
         if (loader == null) {
             loader = ClassLoader.getSystemClassLoader();
@@ -3345,7 +3329,7 @@ private void systemTeardown(final ThreadContext context) {
             printProfileData(profileCollection);
         }
 
-        if (Options.PARSER_SUMMARY.load()) parserManager.getParserStats().printParserStatistics();
+        if (Options.PARSER_SUMMARY.load()) parserManager.getParserStats().printParserStatistics(this);
 
         // shut down executors
         getJITCompiler().shutdown();
@@ -3362,21 +3346,23 @@ private void systemTeardown(final ThreadContext context) {
             }
         }
 
+        // Tear down LoadService before terminating ThreadService, since LoadedFeatures.clear requires context.
+        loadService.tearDown();
+
         // Shut down and replace thread service after all other hooks and finalizers have run
         threadService.teardown();
         threadService = new ThreadService(this);
 
-        // Release classloader resources
+        // Release classloader resources once all other runtime state has been torn down.
         releaseClassLoader();
 
-        // Tear down LoadService
-        loadService.tearDown();
-
         // Clear runtime tables to aid GC
         boundMethods.clear();
         allModules.clear();
         constantNameInvalidators.clear();
         symbolTable.clear();
+
+        javaSupport.tearDown();
         javaSupport = loadJavaSupport();
     }
 
@@ -4121,6 +4107,9 @@ public RaiseException newNameError(String message, IRubyObject recv, IRubyObject
         IRubyObject msg = new RubyNameError.RubyNameErrorMessage(this, message, recv, name);
         RubyException err = RubyNameError.newNameError(getCurrentContext(), getNameError(), msg, name, privateCall);
 
+        // set cause since we are preparing to raise
+        err.setCause(getCurrentContext().getErrorInfo());
+
         return err.toThrowable();
     }
 
@@ -4168,7 +4157,12 @@ public RaiseException newNameError(String message, String name, Throwable except
             }
         }
 
-        return new RubyNameError(this, getNameError(), message, name).toThrowable();
+        RubyNameError nameError = new RubyNameError(this, getNameError(), message, name);
+
+        // set cause since we are preparing to raise
+        nameError.setCause(getCurrentContext().getErrorInfo());
+
+        return nameError.toThrowable();
     }
 
     public RaiseException newNameError(String message, IRubyObject name, Throwable exception, boolean printWhenVerbose) {
@@ -4180,7 +4174,12 @@ public RaiseException newNameError(String message, IRubyObject name, Throwable e
             }
         }
 
-        return new RubyNameError(this, getNameError(), message, name).toThrowable();
+        RubyNameError nameError = new RubyNameError(this, getNameError(), message, name);
+
+        // set cause since we are preparing to raise
+        nameError.setCause(getCurrentContext().getErrorInfo());
+
+        return nameError.toThrowable();
     }
 
     /**
@@ -4244,6 +4243,9 @@ public RaiseException newNoMethodError(String message, IRubyObject recv, String
         IRubyObject msg = new RubyNameError.RubyNameErrorMessage(this, message, recv, nameStr);
         RubyException err = RubyNoMethodError.newNoMethodError(getNoMethodError(), msg, nameStr, args, privateCall);
 
+        // set cause since we are preparing to raise
+        err.setCause(getCurrentContext().getErrorInfo());
+
         return err.toThrowable();
     }
 
@@ -4391,7 +4393,7 @@ public RaiseException newFloatDomainError(String message){
     }
 
     public RaiseException newMathDomainError(String message) {
-        return newRaiseException(getMathDomainError(), "Numerical argument is out of domain - \"" + message + "\"");
+        return newRaiseException(getMathDomainError(), "Numerical argument is out of domain - " + message);
     }
 
     public RaiseException newEncodingError(String message){
@@ -4452,12 +4454,13 @@ public RaiseException newBufferMaskError(String message) {
      * @return a new RaiseException wrapping a new Ruby exception
      */
     public RaiseException newRaiseException(RubyClass exceptionClass, String message) {
-        IRubyObject cause = getCurrentContext().getErrorInfo();
+        ThreadContext context = getCurrentContext();
+        IRubyObject cause = context.getErrorInfo();
 
         RaiseException exception = RaiseException.from(this, exceptionClass, message);
 
         if (cause != null && !cause.isNil()) {
-            exception.getException().setCause(cause);
+            exception.getException().setCause(context, cause);
         }
 
         return exception;
@@ -4544,21 +4547,6 @@ public void setAbortOnException(final boolean abortOnException) {
         this.abortOnException = abortOnException;
     }
 
-    @Deprecated(since = "9.3.1.0")
-    public boolean isGlobalAbortOnExceptionEnabled() {
-        return abortOnException;
-    }
-
-    @Deprecated(since = "9.3.1.0")
-    public void setGlobalAbortOnExceptionEnabled(boolean enable) {
-        abortOnException = enable;
-    }
-
-    @Deprecated(since = "9.3.1.0")
-    public IRubyObject getReportOnException() {
-        return reportOnException ? getTrue() : getFalse();
-    }
-
     public boolean isReportOnException() {
         return reportOnException;
     }
@@ -4800,7 +4788,7 @@ void addProfiledMethod(final String id, final DynamicMethod method) {
      *
      * @return the builtin bits array
      */
-    public short[] getBuiltinBits() {
+    public int[] getBuiltinBits() {
         return builtinBits;
     }
 
@@ -5076,7 +5064,6 @@ public void setChdirThread(RubyThread thread) {
     public RubyThread getChdirThread() { return this.chdirCurrentThread; }
 
     public RubyStackTraceElement getChdirLocation() { return this.chdirLocation; }
-
     /**
      * Because RubyString.equals does not consider encoding, and MRI's logic for deduplication does need to consider
      * encoding, we use a wrapper object as the key. These wrappers need to be used on all get operations, so if we
@@ -5208,7 +5195,7 @@ public interface RecursiveFunctionEx<T> extends ThreadContext.RecursiveFunctionE
     private ThreadService threadService;
 
     /** Bit flags tracking which builtin methods have been redefined (thread-local builtin tracking system) */
-    private final short[] builtinBits = Builtins.allocate();
+    private final int[] builtinBits = Builtins.allocate();
 
     private final POSIX posix;
     private POSIX nativePosix;
@@ -5305,7 +5292,6 @@ public interface RecursiveFunctionEx<T> extends ThreadContext.RecursiveFunctionE
     private final RubyClass ioBufferClass;
     private final RubyClass threadClass;
     private final RubyClass threadGroupClass;
-    private final RubyClass continuationClass;
     private final RubyClass structClass;
     private final RubyClass exceptionClass;
     private final RubyClass dummyClass;
@@ -5316,6 +5302,8 @@ public interface RecursiveFunctionEx<T> extends ThreadContext.RecursiveFunctionE
     private final RubyClass closedQueueError;
     private final RubyClass sizedQueueClass;
     private final RubyClass dataClass;
+    private final RubyClass setClass;
+    private final RubyClass warningBufferClass;
 
     private RubyClass tmsStruct;
     private RubyClass passwdStruct;
@@ -5466,7 +5454,7 @@ public interface RecursiveFunctionEx<T> extends ThreadContext.RecursiveFunctionE
     private final EncodingService encodingService;
 
     private final GlobalVariables globalVariables = new GlobalVariables(this);
-    private final RubyWarnings warnings = new RubyWarnings(this);
+    private final RubyWarnings warnings;
     private final WarnCallback regexpWarnings = message -> getWarnings().warn(message);
 
     /**
@@ -5677,6 +5665,9 @@ public int applyAsInt(ThreadContext context) {
                     Ruby.this.getWarnings().warn(filename, "break from proc-closure");
                 }
 
+                // avoid errors during END being seen by other END blocks
+                context.clearErrorInfo();
+
             } catch (SystemExit exit) {
                 RubyException raisedException = exit.getException();
                 // adopt new exit code
@@ -5758,11 +5749,6 @@ protected TypePopulator computeValue(Class<?> type) {
 
     ParserManager parserManager;
 
-    @Deprecated(since = "9.3.0.0")
-    public RaiseException newErrnoEADDRFromBindException(BindException be) {
-        return newErrnoEADDRFromBindException(be, null);
-    }
-
     @Deprecated(since = "9.4.0.0")
     public RaiseException newFrozenError(String objectType) {
         return newFrozenError(objectType, null);
diff --git a/core/src/main/java/org/jruby/RubyArgsFile.java b/core/src/main/java/org/jruby/RubyArgsFile.java
index eba6ab6c998..e6f740a8122 100644
--- a/core/src/main/java/org/jruby/RubyArgsFile.java
+++ b/core/src/main/java/org/jruby/RubyArgsFile.java
@@ -78,8 +78,7 @@
 import static org.jruby.api.Define.defineClass;
 import static org.jruby.api.Error.argumentError;
 import static org.jruby.api.Warn.warn;
-import static org.jruby.runtime.ThreadContext.CALL_KEYWORD;
-import static org.jruby.runtime.ThreadContext.resetCallInfo;
+import static org.jruby.runtime.ThreadContext.hasKeywords;
 import static org.jruby.runtime.Visibility.PRIVATE;
 
 public class RubyArgsFile extends RubyObject {
@@ -160,11 +159,6 @@ public ArgsFileData(Ruby runtime, RubyArray argv) {
             this.currentFile = runtime.getNil();
         }
 
-        @Deprecated(since = "9.1.8.0")
-        public void setCurrentLineNumber(Ruby runtime, int linenumber) {
-            runtime.setCurrentLine(linenumber);
-        }
-
         // ARGF.class.new
         void setArgs(RubyArray argv) {
             inited = false;
@@ -239,11 +233,6 @@ public static ArgsFileData getArgsFileData(Ruby runtime) {
             return (ArgsFileData) runtime.getArgsFile().dataGetStruct();
         }
 
-        @Deprecated(since = "9.1.8.0")
-        public static ArgsFileData getDataFrom(IRubyObject recv) {
-            return getArgsFileData(((RubyBasicObject) recv).getCurrentContext().runtime);
-        }
-
         private void createNewFile(File file) {
             try {
                 file.createNewFile();
@@ -302,11 +291,6 @@ public boolean isCurrentFile(RubyIO io) {
         }
     }
 
-    @Deprecated(since = "9.1.8.0")
-    public static void setCurrentLineNumber(IRubyObject recv, int newLineNumber) {
-        ((RubyBasicObject) recv).getCurrentContext().runtime.setCurrentLine(newLineNumber);
-    }
-
     @JRubyMethod
     public static IRubyObject inplace_mode(ThreadContext context, IRubyObject recv) {
         ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
@@ -389,9 +373,7 @@ public static IRubyObject external_encoding(ThreadContext context, IRubyObject r
     }
 
     // MRI: argf_getline
-    private static IRubyObject argf_getline(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        int callInfo = resetCallInfo(context);
-        boolean keywords = (callInfo & CALL_KEYWORD) != 0;
+    private static IRubyObject argf_getline(ThreadContext context, final int callInfo, IRubyObject[] args) {
         IRubyObject line;
         ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
 
@@ -401,14 +383,13 @@ private static IRubyObject argf_getline(ThreadContext context, IRubyObject recv,
             RubyIO currentFile = (RubyIO) data.currentFile;
 
             if (isGenericInput(context, data)) {
-                // restore callInfo for kwargs
-                context.callInfo = callInfo;
+                context.callInfo = callInfo; // restore callInfo for kwargs
                 line = data.currentFile.callMethod(context, "gets", args);
             } else {
                 if (args.length == 0 && context.runtime.getRecordSeparatorVar().get() == globalVariables(context).getDefaultSeparator()) {
                     line = (currentFile).gets(context);
                 } else {
-                    line = Getline.getlineCall(context, GETLINE, currentFile, currentFile.getReadEncoding(), keywords, args);
+                    line = Getline.getlineCall(context, GETLINE, currentFile, currentFile.getReadEncoding(), hasKeywords(callInfo), args);
                 }
 
                 if (line.isNil() && data.next_p != Stream) {
@@ -436,9 +417,10 @@ private static boolean isGenericInput(ThreadContext context, ArgsFileData data)
      */
     @JRubyMethod(name = "gets", optional = 1, keywords = true, checkArity = false, writes = LASTLINE)
     public static IRubyObject gets(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        final int callInfo = ThreadContext.resetCallInfo(context);
         Arity.checkArgumentCount(context, args, 0, 1);
 
-        return context.setLastLine(argf_getline(context, recv, args));
+        return context.setLastLine(argf_getline(context, callInfo, args));
     }
 
     /** Read a line.
@@ -455,36 +437,26 @@ public static IRubyObject readline(ThreadContext context, IRubyObject recv, IRub
 
     @JRubyMethod(optional = 1, keywords = true, checkArity = false)
     public static IRubyObject readlines(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        final int callInfo = ThreadContext.resetCallInfo(context);
         Arity.checkArgumentCount(context, args, 0, 1);
 
-        int callInfo = context.callInfo;
         ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
 
         if (!data.next_argv(context)) return newEmptyArray(context);
 
-        if (!(data.currentFile instanceof RubyIO)) return data.currentFile.callMethod(context, "readlines", args);
+        if (!(data.currentFile instanceof RubyIO)) {
+            // TODO do we need to restore callInfo here?
+            return data.currentFile.callMethod(context, "readlines", args);
+        }
 
         var ary = newArray(context);
         IRubyObject line;
-        while(!(line = argfGetlineLoopWithKeywords(context, recv, args, callInfo)).isNil()) {
+        while(!(line = argf_getline(context, callInfo, args)).isNil()) {
             ary.append(context, line);
         }
         return ary;
     }
 
-    /**
-     * Call argf_getline as in a loop, providing the given keywords state between calls.
-     *
-     * @param context
-     * @param recv
-     * @param args
-     * @return
-     */
-    private static IRubyObject argfGetlineLoopWithKeywords(ThreadContext context, IRubyObject recv, IRubyObject[] args, int callInfo) {
-        context.callInfo = callInfo;
-        return argf_getline(context, recv, args);
-    }
-
     @JRubyMethod(optional = 1, checkArity = false)
     public static IRubyObject to_a(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         Arity.checkArgumentCount(context, args, 0, 1);
@@ -496,7 +468,7 @@ public static IRubyObject to_a(ThreadContext context, IRubyObject recv, IRubyObj
 
         var ary = newArray(context);
         IRubyObject line;
-        while ((line = argf_getline(context, recv, args)) != context.nil) {
+        while ((line = argf_getline(context, 0, args)) != context.nil) {
             ary.append(context, line);
         }
         return ary;
@@ -601,9 +573,9 @@ public static IRubyObject codepoints(ThreadContext context, IRubyObject recv, Bl
     public static IRubyObject each_line(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
         if (!block.isGiven()) return enumeratorize(context.runtime, recv, "each_line", args);
 
+        final int callInfo = ThreadContext.resetCallInfo(context);
         Arity.checkArgumentCount(context, args, 0, 1);
 
-        int callInfo = context.callInfo;
         ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
 
         if (!data.next_argv(context)) return context.nil;
@@ -616,7 +588,7 @@ public static IRubyObject each_line(ThreadContext context, IRubyObject recv, IRu
         }
 
         IRubyObject str;
-        while ((str = argfGetlineLoopWithKeywords(context, recv, args, callInfo)) != context.nil) {
+        while ((str = argf_getline(context, callInfo, args)) != context.nil) {
         	block.yield(context, str);
         }
 
diff --git a/core/src/main/java/org/jruby/RubyArray.java b/core/src/main/java/org/jruby/RubyArray.java
index 21b5a5a2f2a..84d26fb626a 100644
--- a/core/src/main/java/org/jruby/RubyArray.java
+++ b/core/src/main/java/org/jruby/RubyArray.java
@@ -39,81 +39,42 @@
 package org.jruby;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
-import java.math.BigInteger;
 import java.util.Arrays;
-import java.util.BitSet;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.RandomAccess;
-import java.util.Stack;
 import java.util.stream.Stream;
 
-import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.api.Create;
 import org.jruby.api.JRubyAPI;
-import org.jruby.ast.util.ArgsUtil;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.java.util.ArrayUtils;
-import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.Builtins;
 import org.jruby.runtime.CallSite;
 import org.jruby.runtime.ClassIndex;
-import org.jruby.runtime.Helpers;
 import org.jruby.runtime.JavaSites;
-import org.jruby.runtime.JavaSites.ArraySites;
-import org.jruby.runtime.Signature;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.callsite.CacheEntry;
 import org.jruby.runtime.callsite.CachingCallSite;
-import org.jruby.runtime.encoding.EncodingCapable;
 import org.jruby.runtime.marshal.MarshalDumper;
 import org.jruby.runtime.marshal.MarshalLoader;
 import org.jruby.specialized.RubyArrayOneObject;
-import org.jruby.specialized.RubyArraySpecialized;
 import org.jruby.specialized.RubyArrayTwoObject;
-import org.jruby.util.ArraySupport;
-import org.jruby.util.ByteList;
-import org.jruby.util.Pack;
-import org.jruby.util.RecursiveComparator;
 import org.jruby.util.TypeConverter;
-import org.jruby.util.cli.Options;
 import org.jruby.util.collections.StringArraySet;
-import org.jruby.util.io.EncodingUtils;
 import org.jruby.util.io.RubyInputStream;
 import org.jruby.util.io.RubyOutputStream;
 
 import static org.jruby.RubyEnumerator.SizeFn;
-import static org.jruby.RubyEnumerator.enumeratorize;
-import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
-import static org.jruby.RubyEnumerator.enumWithSize;
-import static org.jruby.api.Access.arrayClass;
 import static org.jruby.api.Access.fixnumClass;
-import static org.jruby.api.Access.globalVariables;
-import static org.jruby.api.Access.randomClass;
 import static org.jruby.api.Access.stringClass;
-import static org.jruby.api.Convert.*;
-import static org.jruby.api.Create.newHash;
-import static org.jruby.api.Create.newSharedString;
-import static org.jruby.api.Create.newSmallHash;
-import static org.jruby.api.Create.newString;
 import static org.jruby.api.Define.defineClass;
-import static org.jruby.api.Error.*;
+import static org.jruby.api.Error.argumentError;
 import static org.jruby.api.Warn.warn;
-import static org.jruby.api.Warn.warnDeprecated;
-import static org.jruby.api.Warn.warning;
-import static org.jruby.runtime.Helpers.*;
 import static org.jruby.runtime.Visibility.PRIVATE;
-import static org.jruby.util.Inspector.*;
 
 /**
  * The implementation of the built-in class Array in Ruby.
@@ -134,12 +95,10 @@
  *
  */
 @JRubyClass(name="Array", include = { "Enumerable" },
-        overrides = {RubyArrayOneObject.class, RubyArrayTwoObject.class, StringArraySet.class})
-public class RubyArray<T extends IRubyObject> extends RubyObject implements List, RandomAccess {
+        overrides = {RubyArrayNative.class, RubyArrayOneObject.class, RubyArrayTwoObject.class, StringArraySet.class})
+public abstract class RubyArray<T extends IRubyObject> extends RubyObject implements List, RandomAccess {
     public static final int DEFAULT_INSPECT_STR_SIZE = 10;
 
-    private static final boolean USE_PACKED_ARRAYS = Options.PACKED_ARRAYS.load();
-
     public static RubyClass createArrayClass(ThreadContext context, RubyClass Object, RubyModule Enumerable) {
         return defineClass(context, "Array", Object, RubyArray::newEmptyArray).
                 reifiedClass(RubyArray.class).
@@ -154,68 +113,38 @@ public ClassIndex getNativeClassIndex() {
         return ClassIndex.ARRAY;
     }
 
-    protected final void concurrentModification() {
-        throw concurrentModification(getRuntime().getCurrentContext(), null);
-    }
-
-    private static RuntimeException concurrentModification(ThreadContext context, Exception cause) {
-        RuntimeException ex = context.runtime.newConcurrencyError("Detected invalid array contents due to unsynchronized modifications with concurrent users");
-        // NOTE: probably not useful to be on except for debugging :
-        // if ( cause != null ) ex.initCause(cause);
-        return ex;
-    }
-
     @Deprecated(since = "10.0.0.0")
     public static IRubyObject create(IRubyObject klass, IRubyObject[] args, Block block) {
         return create(klass.getRuntime().getCurrentContext(), klass, args, block);
     }
 
-    /** rb_ary_s_create
-     *
-     */
      @JRubyMethod(name = "[]", rest = true, meta = true)
      public static IRubyObject create(ThreadContext context, IRubyObject klass, IRubyObject[] args, Block block) {
-         switch (args.length) {
-             case 0: return ((RubyClass) klass).allocate(context);
-             case 1: return new RubyArrayOneObject((RubyClass) klass, args[0]);
-             case 2: return new RubyArrayTwoObject((RubyClass) klass, args[0], args[1]);
-         }
-
-         RubyArray arr = (RubyArray) ((RubyClass) klass).allocate(context);
-         arr.values = args.clone();
-         arr.realLength = args.length;
-         return arr;
+         return RubyArrayNative.create(context, klass, args, block);
      }
 
-    /**
-     * Create array with specific allocated size
-     * @deprecated Use {@link Create#allocArray(ThreadContext, int)} instead
-     */
-    @Deprecated(since = "10.0.0.0")
-    public static final RubyArray newArray(final Ruby runtime, final long len) {
-        ThreadContext context = runtime.getCurrentContext();
-        return Create.allocArray(context, checkLength(context, len));
+    protected RubyArray(Ruby runtime, RubyClass klass) {
+        super(runtime, klass);
     }
 
-    @Deprecated(since = "10.0.0.0")
-    public static final RubyArray<?> newArrayLight(final Ruby runtime, final long len) {
-        return newArrayLight(runtime, checkLength(runtime.getCurrentContext(), len));
+    protected RubyArray(RubyClass klass) {
+        super(klass.runtime, klass);
+    }
+
+    protected RubyArray(Ruby runtime, RubyClass klass, boolean objectSpace) {
+        super(runtime, klass, objectSpace);
     }
 
-    public static final RubyArray<?> newArray(final Ruby runtime, final int len) {
-        return newArray(runtime.getCurrentContext(), len);
+    public static RubyArray<?> newArray(final Ruby runtime, final int len) {
+        return RubyArrayNative.newArray(runtime, len);
     }
 
-    public static final RubyArray<?> newArray(ThreadContext context, final int len) {
-        if (len == 0) return newEmptyArray(context.runtime);
-        IRubyObject[] values = IRubyObject.array(validateBufferLength(context, len));
-        return new RubyArray<>(context.runtime, values, 0, 0);
+    public static RubyArray<?> newArray(ThreadContext context, final int len) {
+        return RubyArrayNative.newArray(context, len);
     }
 
-    public static final RubyArray<?> newArrayLight(final Ruby runtime, final int len) {
-        if (len == 0) return newEmptyArray(runtime);
-        IRubyObject[] values = IRubyObject.array(validateBufferLength(runtime, len));
-        return new RubyArray<>(runtime, runtime.getArray(), values, 0, 0, false);
+    public static RubyArray<?> newArrayLight(final Ruby runtime, final int len) {
+        return RubyArrayNative.newArrayLight(runtime, len);
     }
 
     @Deprecated(since = "10.0.0.0")
@@ -223,137 +152,80 @@ public static final RubyArray<?> newArray(final Ruby runtime) {
         return newArray(runtime.getCurrentContext());
     }
 
-    /** rb_ary_new
-     *
-     */
-    public static final RubyArray<?> newArray(ThreadContext context) {
-        return newArray(context, ARRAY_DEFAULT_SIZE);
+    public static RubyArray<?> newArray(ThreadContext context) {
+        return RubyArrayNative.newArray(context);
     }
 
-    /** rb_ary_new
-     *
-     */
-    public static final RubyArray<?> newArrayLight(final Ruby runtime) {
-        /* Ruby arrays default to holding 16 elements, so we create an
-         * ArrayList of the same size if we're not told otherwise
-         */
-        return newArrayLight(runtime, ARRAY_DEFAULT_SIZE);
+    public static RubyArray<?> newArrayLight(final Ruby runtime) {
+        return RubyArrayNative.newArrayLight(runtime);
     }
 
     public static RubyArray<?> newArray(Ruby runtime, IRubyObject obj) {
-        return USE_PACKED_ARRAYS ? new RubyArrayOneObject(runtime, obj) : new RubyArray<>(runtime, arrayOf(obj));
+        return RubyArrayNative.newArray(runtime, obj);
     }
 
     public static RubyArray<?> newArrayLight(Ruby runtime, IRubyObject obj) {
-        return USE_PACKED_ARRAYS ? new RubyArrayOneObject(runtime, obj) : new RubyArray<>(runtime, arrayOf(obj));
+        return RubyArrayNative.newArrayLight(runtime, obj);
     }
 
     public static RubyArray<?> newArrayLight(RubyClass arrayClass, IRubyObject obj) {
-        return USE_PACKED_ARRAYS ? new RubyArrayOneObject(arrayClass, obj) : new RubyArray<>(arrayClass, arrayOf(obj), false);
+        return RubyArrayNative.newArrayLight(arrayClass, obj);
     }
 
     public static RubyArray<?> newArrayLight(Ruby runtime, IRubyObject car, IRubyObject cdr) {
-        return USE_PACKED_ARRAYS ? new RubyArrayTwoObject(runtime, car, cdr) : new RubyArray<>(runtime, arrayOf(car, cdr));
+        return RubyArrayNative.newArrayLight(runtime, car, cdr);
     }
 
     public static RubyArray<?> newArrayLight(RubyClass arrayClass, IRubyObject car, IRubyObject cdr) {
-        return USE_PACKED_ARRAYS ? new RubyArrayTwoObject(arrayClass, car, cdr) : new RubyArray<>(arrayClass, arrayOf(car, cdr), false);
+        return RubyArrayNative.newArrayLight(arrayClass, car, cdr);
     }
 
     public static RubyArray<?> newArrayLight(Ruby runtime, IRubyObject... objs) {
-        return new RubyArray<>(runtime, objs, false);
+        return RubyArrayNative.newArrayLight(runtime, objs);
     }
 
-    /** rb_assoc_new
-     *
-     */
     public static RubyArray<?> newArray(Ruby runtime, IRubyObject car, IRubyObject cdr) {
-        return USE_PACKED_ARRAYS ? new RubyArrayTwoObject(runtime, car, cdr) : new RubyArray<>(runtime, arrayOf(car, cdr));
+        return RubyArrayNative.newArray(runtime, car, cdr);
     }
 
     public static RubyArray<?> newArray(Ruby runtime, IRubyObject first, IRubyObject second, IRubyObject third) {
-        return new RubyArray<>(runtime, arrayOf(first, second, third));
+        return RubyArrayNative.newArray(runtime, first, second, third);
     }
 
     public static RubyArray<?> newArray(Ruby runtime, IRubyObject first, IRubyObject second, IRubyObject third, IRubyObject fourth) {
-        return new RubyArray<>(runtime, arrayOf(first, second, third, fourth));
+        return RubyArrayNative.newArray(runtime, first, second, third, fourth);
     }
 
     public static RubyArray<?> newEmptyArray(Ruby runtime) {
-        return new RubyArray<>(runtime, NULL_ARRAY);
+        return RubyArrayNative.newEmptyArray(runtime);
     }
 
     public static RubyArray<?> newEmptyArray(Ruby runtime, RubyClass klass) {
-        return new RubyArray<>(runtime, klass, NULL_ARRAY);
+        return RubyArrayNative.newEmptyArray(runtime, klass);
     }
 
-    /** rb_ary_new4, rb_ary_new3
-     *
-     */
     public static RubyArray<?> newArray(Ruby runtime, IRubyObject[] args) {
-        final int size = args.length;
-        if (size == 0) {
-            return newEmptyArray(runtime);
-        }
-        return isPackedArray(size) ? packedArray(runtime, args) : new RubyArray<>(runtime, args.clone());
+        return RubyArrayNative.newArray(runtime, args);
     }
 
     public static RubyArray<?> newArray(Ruby runtime, Collection<? extends IRubyObject> collection) {
-        if (collection.isEmpty()) {
-            return newEmptyArray(runtime);
-        }
-        final IRubyObject[] arr = collection.toArray(IRubyObject.NULL_ARRAY);
-        return isPackedArray(collection) ? packedArray(runtime, arr) : new RubyArray<>(runtime, arr);
+        return RubyArrayNative.newArray(runtime, collection);
     }
 
     public static RubyArray<?> newArray(Ruby runtime, List<? extends IRubyObject> list) {
-        if (list.isEmpty()) {
-            return newEmptyArray(runtime);
-        }
-        return isPackedArray(list) ? packedArray(runtime, list) : new RubyArray<>(runtime, list.toArray(IRubyObject.NULL_ARRAY));
+        return RubyArrayNative.newArray(runtime, list);
     }
 
     public static RubyArray<?> newSharedArray(RubyClass arrayClass, IRubyObject[] shared) {
-        var sharedArray = new RubyArray<>(arrayClass, shared, true);
-
-        sharedArray.isShared = true;
-
-        return sharedArray;
-    }
-
-    private static RubyArray<?> packedArray(final Ruby runtime, final IRubyObject[] args) {
-        return args.length == 1 ?
-                new RubyArrayOneObject(runtime, args[0]) :
-                new RubyArrayTwoObject(runtime, args[0], args[1]);
+        return RubyArrayNative.newSharedArray(arrayClass, shared);
     }
 
-    private static RubyArray<?> packedArray(final Ruby runtime, final List<? extends IRubyObject> args) {
-        return args.size() == 1 ?
-                new RubyArrayOneObject(runtime, args.get(0)) :        
-                new RubyArrayTwoObject(runtime, args.get(0), args.get(1));
-
-    }
-
-    private static boolean isPackedArray(final int size) {
-        return USE_PACKED_ARRAYS && size <= 2;
-    }
-
-    private static boolean isPackedArray(final Collection<? extends IRubyObject> collection) {
-        return USE_PACKED_ARRAYS && collection.size() <= 2;
-    }
-
-    /**
-     * @see RubyArray#newArrayMayCopy(Ruby, IRubyObject[], int, int)
-     */
     public static RubyArray newArrayMayCopy(Ruby runtime, IRubyObject... args) {
-        return newArrayMayCopy(runtime, args, 0, args.length);
+        return RubyArrayNative.newArrayMayCopy(runtime, args);
     }
 
-    /**
-     * @see RubyArray#newArrayMayCopy(Ruby, IRubyObject[], int, int)
-     */
     public static RubyArray newArrayMayCopy(Ruby runtime, IRubyObject[] args, int start) {
-        return newArrayMayCopy(runtime, args, start, args.length - start);
+        return RubyArrayNative.newArrayMayCopy(runtime, args, start);
     }
 
     /**
@@ -369,154 +241,23 @@ public static RubyArray newArrayMayCopy(Ruby runtime, IRubyObject[] args, int st
      * @return an array referencing the given elements
      */
     public static RubyArray newArrayMayCopy(Ruby runtime, IRubyObject[] args, int start, int length) {
-        if (length == 0) return newEmptyArray(runtime);
-
-        if (USE_PACKED_ARRAYS) {
-            if (length == 1) return new RubyArrayOneObject(runtime, args[start]);
-            if (length == 2) return new RubyArrayTwoObject(runtime, args[start], args[start + 1]);
-        }
-
-        return newArrayNoCopy(runtime, args, start, length);
+        return RubyArrayNative.newArrayMayCopy(runtime, args, start, length);
     }
 
     public static RubyArray newArrayNoCopy(Ruby runtime, IRubyObject... args) {
-        return new RubyArray(runtime, args);
+        return RubyArrayNative.newArrayNoCopy(runtime, args);
     }
 
     public static RubyArray newArrayNoCopy(Ruby runtime, IRubyObject[] args, int begin) {
-        assert begin >= 0 : "begin must be >= 0";
-        assert begin <= args.length : "begin must be <= length";
-
-        return new RubyArray(runtime, args, begin, args.length - begin);
+        return RubyArrayNative.newArrayNoCopy(runtime, args, begin);
     }
 
     public static RubyArray newArrayNoCopy(Ruby runtime, IRubyObject[] args, int begin, int length) {
-        assert begin >= 0 : "begin must be >= 0";
-        assert length >= 0 : "length must be >= 0";
-
-        return new RubyArray(runtime, args, begin, length);
+        return RubyArrayNative.newArrayNoCopy(runtime, args, begin, length);
     }
 
     public static RubyArray newArrayNoCopyLight(Ruby runtime, IRubyObject[] args) {
-        return new RubyArray(runtime, args, false);
-    }
-
-    public static final int ARRAY_DEFAULT_SIZE = 16;
-    private static final int SMALL_ARRAY_LEN = 16;
-
-    private volatile boolean isShared = false;
-
-    protected IRubyObject[] values;
-
-    protected int begin = 0;
-    protected int realLength = 0;
-
-    /*
-     * plain internal array assignment
-     */
-    private RubyArray(Ruby runtime, IRubyObject[] vals) {
-        super(runtime, runtime.getArray());
-        this.values = vals;
-        this.realLength = vals.length;
-    }
-
-    /*
-     * plain internal array assignment
-     */
-    private RubyArray(Ruby runtime, IRubyObject[] vals, boolean objectSpace) {
-        super(runtime, runtime.getArray(), objectSpace);
-        this.values = vals;
-        this.realLength = vals.length;
-    }
-
-    /*
-     * plain internal array assignment
-     */
-    public RubyArray(Ruby runtime, IRubyObject[] vals, int begin, int length) {
-        super(runtime, runtime.getArray());
-        this.values = vals;
-        this.begin = begin;
-        this.realLength = length;
-    }
-
-    private RubyArray(Ruby runtime, RubyClass metaClass, IRubyObject[] vals, int begin, int length, boolean objectSpace) {
-        super(runtime, metaClass, objectSpace);
-        this.values = vals;
-        this.begin = begin;
-        this.realLength = length;
-    }
-
-    public RubyArray(Ruby runtime, int length) {
-        super(runtime, runtime.getArray());
-        this.values = IRubyObject.array(validateBufferLength(runtime, length));
-    }
-
-    /* NEWOBJ and OBJSETUP equivalent
-     * fastest one, for shared arrays, optional objectspace
-     */
-    private RubyArray(Ruby runtime, boolean objectSpace) {
-        super(runtime, runtime.getArray(), objectSpace);
-    }
-
-    protected RubyArray(Ruby runtime, RubyClass klass) {
-        super(runtime, klass);
-    }
-
-    /* Array constructors taking the MetaClass to fulfil MRI Array subclass behaviour
-     *
-     */
-    private RubyArray(Ruby runtime, RubyClass klass, int length) {
-        super(runtime, klass);
-        values = IRubyObject.array(validateBufferLength(runtime, length));
-    }
-
-    private RubyArray(Ruby runtime, RubyClass klass, IRubyObject[] vals, boolean objectspace) {
-        super(runtime, klass, objectspace);
-        values = vals;
-        realLength = vals.length;
-    }
-
-    protected RubyArray(Ruby runtime, RubyClass klass, boolean objectSpace) {
-        super(runtime, klass, objectSpace);
-    }
-
-    public RubyArray(Ruby runtime, RubyClass klass, IRubyObject[] vals) {
-        super(runtime, klass);
-        values = vals;
-        realLength = vals.length;
-    }
-
-    public RubyArray(RubyClass klass, IRubyObject[] vals, boolean shared) {
-        super(klass);
-        values = vals;
-        realLength = vals.length;
-        isShared = shared;
-    }
-
-    /**
-     * Overridden by specialized arrays to fall back to IRubyObject[].
-     */
-    protected void unpack(ThreadContext context) {
-    }
-
-    private void alloc(ThreadContext context, int length) {
-        IRubyObject[] newValues = IRubyObject.array(validateBufferLength(context, length));
-        Helpers.fillNil(context, newValues);
-        values = newValues;
-        begin = 0;
-    }
-
-    private void realloc(ThreadContext context, int newLength, int valuesLength) {
-        unpack(context);
-        IRubyObject[] reallocated = IRubyObject.array(validateBufferLength(context, newLength));
-        if (newLength > valuesLength) {
-            Helpers.fillNil(context, reallocated, valuesLength, newLength);
-            safeArrayCopy(context, values, begin, reallocated, 0, valuesLength); // elements and trailing nils
-        } else {
-            safeArrayCopy(context, values, begin, reallocated, 0, newLength); // ???
-        }
-        begin = 0;
-        values = reallocated;
+        return RubyArrayNative.newArrayNoCopyLight(runtime, args);
     }
 
     @Deprecated(since = "10.0.0.0")
@@ -539,9 +280,7 @@ public final List<IRubyObject> getList() {
         return Arrays.asList(toJavaArray());
     }
 
-    public int getLength() {
-        return realLength;
-    }
+    public abstract int getLength();
 
     /**
      * @return ""
@@ -559,11 +298,7 @@ public IRubyObject[] toJavaArray() {
      *
      * @return a Java array with exactly the size and contents of this RubyArray's elements
      */
-    public IRubyObject[] toJavaArray(ThreadContext context) {
-        IRubyObject[] copy = IRubyObject.array(realLength);
-        copyInto(context, copy, 0);
-        return copy;
-    }
+    public abstract IRubyObject[] toJavaArray(ThreadContext context);
 
     /**
      * Return a reference to this RubyArray's underlying Java array, if it is not shared with another RubyArray, or
@@ -575,10 +310,7 @@ public IRubyObject[] toJavaArray(ThreadContext context) {
      * @return The underlying Java array for this RubyArray, or a copy if that array is shared.
      */
 
-    public IRubyObject[] toJavaArrayUnsafe() {
-        unpack(getRuntime().getCurrentContext());
-        return !isShared ? values : toJavaArray();
-    }
+    public abstract IRubyObject[] toJavaArrayUnsafe();
 
     /**
      * Return a Java array of the elements contained in this array, possibly a new array object.
@@ -589,4789 +321,942 @@ public IRubyObject[] toJavaArrayUnsafe() {
      * @return a Java array with exactly the size and contents of this RubyArray's elements, possibly the actual
      *         underlying array.
      */
-    public IRubyObject[] toJavaArrayMaybeUnsafe() {
-        unpack(getRuntime().getCurrentContext());
-        return (!isShared && begin == 0 && values.length == realLength) ? values : toJavaArray();
-    }
+    public abstract IRubyObject[] toJavaArrayMaybeUnsafe();
 
-    public boolean isSharedJavaArray(RubyArray other) {
-        return values == other.values && begin == other.begin && realLength == other.realLength;
-    }
+    public abstract boolean isSharedJavaArray(RubyArray other);
 
-    /** rb_ary_make_shared
-    *
-    */
-    protected RubyArray<?> makeShared() {
-        var context = getRuntime().getCurrentContext();
-        // TODO: (CON) Some calls to makeShared could create packed array almost as efficiently
-        unpack(context);
+    @JRubyMethod(visibility = PRIVATE)
+    public abstract IRubyObject initialize(ThreadContext context, Block block);
 
-        return makeShared(context, begin, realLength, arrayClass(context));
-    }
+    @JRubyMethod(visibility = PRIVATE)
+    public abstract IRubyObject initialize(ThreadContext context, IRubyObject arg0, Block block);
 
-    private RubyArray makeShared(ThreadContext context, int beg, int len, RubyClass klass) {
-        return makeShared(context, beg, len, new RubyArray(context.runtime, klass));
-    }
+    @JRubyMethod(visibility = PRIVATE)
+    public abstract IRubyObject initialize(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block);
+
+    @JRubyMethod(name = {"initialize_copy"}, visibility=PRIVATE)
+    public abstract IRubyObject initialize_copy(ThreadContext context, IRubyObject orig);
+
+    public abstract RubyArray aryDup();
 
-    private final RubyArray makeShared(ThreadContext context, int beg, int len, RubyArray sharedArray) {
-        unpack(context);
-        isShared = true;
-        sharedArray.values = values;
-        sharedArray.isShared = true;
-        sharedArray.begin = beg;
-        sharedArray.realLength = len;
-        return sharedArray;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject replace(IRubyObject orig) {
+        return replace(getCurrentContext(), orig);
     }
 
-    /** ary_shared_first
-     *
-     */
-    private RubyArray makeSharedFirst(ThreadContext context, IRubyObject num, boolean last) {
-        int n = toInt(context, num);
+    @JRubyMethod(name = {"replace"})
+    public abstract IRubyObject replace(ThreadContext context, IRubyObject orig);
 
-        if (n < 0) throw argumentError(context, "negative array size");
-        if (n > realLength) n = realLength;
+    @Override
+    public abstract RubyString to_s(ThreadContext context);
 
-        return makeShared(context, last ? begin + realLength - n : begin, n, arrayClass(context));
-    }
+    public abstract boolean includes(ThreadContext context, IRubyObject item);
 
-    @Deprecated(since = "10.0.0.0")
-    protected final void modifyCheck() {
-        modifyCheck(getCurrentContext());
-    }
+    protected abstract boolean includesByEql(ThreadContext context, IRubyObject item);
 
-    /** rb_ary_modify_check
-     *
-     */
-    protected final void modifyCheck(ThreadContext context) {
-        if (isFrozen()) throw context.runtime.newFrozenError(this);
-    }
+    @JRubyMethod(name = "hash")
+    public abstract RubyFixnum hash(ThreadContext context);
 
-    @Deprecated(since = "10.0.0.0")
-    protected void modify() {
-        modify(getCurrentContext());
-    }
+    public abstract IRubyObject store(long index, IRubyObject value);
 
-    /** rb_ary_modify
-     *
+    /**
+     * Store an element at the specified index or throw if the index is invalid.
+     * @param context the current thread context
+     * @param index the offset to store the value
+     * @param value the value to be stored
+     * @return the value set
      */
-    protected void modify(ThreadContext context) {
-        modifyCheck(context);
-        if (isShared) {
-            IRubyObject[] vals = IRubyObject.array(realLength);
-            safeArrayCopy(context, values, begin, vals, 0, realLength);
-            begin = 0;
-            values = vals;
-            isShared = false;
-        }
-    }
+    @JRubyAPI
+    public abstract IRubyObject store(ThreadContext context, long index, IRubyObject value);
 
-    /*  ================
-     *  Instance Methods
-     *  ================
-     */
+    // note: packed arrays will unpack in overridden version of this
+    protected abstract void storeInternal(ThreadContext context, int index, IRubyObject value);
+
+    protected abstract IRubyObject elt(long offset);
+
+    public abstract T eltOk(long offset);
+
+    public abstract T eltSetOk(long offset, T value);
+
+    public abstract T eltSetOk(int offset, T value);
+
+    public abstract IRubyObject entry(long offset);
+
+    public abstract IRubyObject entry(int offset);
+
+    public abstract T eltInternal(int offset);
+
+    public abstract T eltInternalSet(int offset, T item);
 
     /**
      * Variable arity version for compatibility. Not bound to a Ruby method.
      * @deprecated Use the versions with zero, one, or two args.
      */
     @Deprecated(since = "9.4-")
-    public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
+    public IRubyObject fetch(ThreadContext context, IRubyObject[] args, Block block) {
         switch (args.length) {
-        case 0:
-            return initialize(context, block);
-        case 1:
-            return initializeCommon(context, args[0], null, block);
-        case 2:
-            return initializeCommon(context, args[0], args[1], block);
-        default:
-            Arity.raiseArgumentError(context, args.length, 0, 2);
-            return null; // not reached
+            case 1:
+                return fetch(context, args[0], block);
+            case 2:
+                return fetch(context, args[0], args[1], block);
+            default:
+                Arity.raiseArgumentError(context, args.length, 1, 2);
+                return null; // not reached
         }
     }
 
-    /** rb_ary_initialize
-     *
-     */
-    @JRubyMethod(visibility = PRIVATE)
-    public IRubyObject initialize(ThreadContext context, Block block) {
-        modifyCheck(context);
-        unpack(context);
-        realLength = 0;
-        if (block.isGiven()) warning(context, "given block not used");
+    @JRubyMethod(rest = true)
+    public abstract IRubyObject fetch_values(ThreadContext context, IRubyObject[] args, Block block);
 
-        return this;
-    }
+    @JRubyMethod
+    public abstract IRubyObject fetch(ThreadContext context, IRubyObject arg0, Block block);
 
-    /** rb_ary_initialize
-     *
-     */
-    @JRubyMethod(visibility = PRIVATE)
-    public IRubyObject initialize(ThreadContext context, IRubyObject arg0, Block block) {
-        return initializeCommon(context, arg0, null, block);
-    }
+    @JRubyMethod
+    public abstract IRubyObject fetch(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block);
 
-    /** rb_ary_initialize
-     *
-     */
-    @JRubyMethod(visibility = PRIVATE)
-    public IRubyObject initialize(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
-        return initializeCommon(context, arg0, arg1, block);
+    public static RubyArray aryToAry(ThreadContext context, IRubyObject obj) {
+        IRubyObject tmp = TypeConverter.checkArrayType(context, obj);
+        return tmp != context.nil ? (RubyArray) tmp : RubyArray.newArray(context.runtime, obj);
     }
 
-    protected IRubyObject initializeCommon(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
-        unpack(context);
-
-        if (arg1 == null && !(arg0 instanceof RubyFixnum)) {
-            IRubyObject val = arg0.checkArrayType();
-            if (!val.isNil()) {
-                replace(val);
-                return this;
-            }
-        }
-
-        long len = toLong(context, arg0);
-        if (len < 0) throw argumentError(context, "negative array size");
-        int ilen = validateBufferLength(context, len);
-
-        modify(context);
-
-        if (ilen > values.length - begin) {
-            values = IRubyObject.array(ilen);
-            begin = 0;
-        }
-
-        if (block.isGiven()) {
-            if (arg1 != null) warn(context, "block supersedes default value argument");
-
-            if (block.getSignature() == Signature.NO_ARGUMENTS) {
-                IRubyObject nil = context.nil;
-                for (int i = 0; i < ilen; i++) {
-                    storeInternal(context, i, block.yield(context, nil));
-                    realLength = i + 1;
-                }
-            } else {
-                for (int i = 0; i < ilen; i++) {
-                    storeInternal(context, i, block.yield(context, asFixnum(context, i)));
-                    realLength = i + 1;
-                }
-            }
-
-        } else {
-            try {
-                if (arg1 == null) {
-                    //System.out.println("VAL.l: " + values.length + ", B: " + begin +"ilen: " + ilen);
-                    //Helpers.fillNil(context, values, begin, begin + ilen);
-                    Arrays.fill(values, begin, begin + ilen, context.nil);
-                } else {
-                    Arrays.fill(values, begin, begin + ilen, arg1);
-                }
-            } catch (ArrayIndexOutOfBoundsException ex) {
-                throw concurrentModification(context, ex);
-            }
-            realLength = ilen;
-        }
-        return this;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject insert(IRubyObject arg) {
+        return insert(getCurrentContext(), arg);
     }
 
-    /** rb_ary_initialize_copy
-     *
-     */
-    @JRubyMethod(name = {"initialize_copy"}, visibility=PRIVATE)
-    public IRubyObject initialize_copy(ThreadContext context, IRubyObject orig) {
-        return replace(orig);
+    @JRubyMethod(name = "insert")
+    public abstract IRubyObject insert(ThreadContext context, IRubyObject arg);
+
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject insert(IRubyObject arg1, IRubyObject arg2) {
+        return insert(getCurrentContext(), arg1, arg2);
     }
 
-    /**
-     * Overridden dup for fast-path logic.
-     *
-     * @return A new RubyArray sharing the original backing store.
-     */
-    @Override
-    public IRubyObject dup() {
-        CachingCallSite initCopy = sites(getRuntime().getCurrentContext()).initialize_copy;
-        if (metaClass.getClassIndex() != ClassIndex.ARRAY || !initCopy.retrieveCache(this).method.isBuiltin()) return super.dup();
+    @JRubyMethod(name = "insert")
+    public abstract IRubyObject insert(ThreadContext context, IRubyObject arg1, IRubyObject arg2);
 
-        Ruby runtime = metaClass.runtime;
-        RubyArray dup = dupImpl(runtime, runtime.getArray());
-        return dup;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject insert(IRubyObject[] args) {
+        return insert(getCurrentContext(), args);
     }
 
-    protected RubyArray dupImpl(Ruby runtime, RubyClass metaClass) {
-        RubyArray dup = new RubyArray(runtime, metaClass, values, begin, realLength, true);
-        dup.isShared = this.isShared = true;
-        return dup;
-    }
+    @JRubyMethod(name = "insert", required = 1, rest = true, checkArity = false)
+    public abstract IRubyObject insert(ThreadContext context, IRubyObject[] args);
 
-    /** rb_ary_dup
-     *
-     */
-    public RubyArray aryDup() {
-        // In 1.9, rb_ary_dup logic changed so that on subclasses of Array,
-        // dup returns an instance of Array, rather than an instance of the subclass
-        Ruby runtime = metaClass.runtime;
-        return dupImpl(runtime, runtime.getArray());
+    @Deprecated(since = "10.0.0.0")
+    public RubyArray transpose() {
+        return transpose(getCurrentContext());
     }
 
+    @JRubyMethod(name = "transpose")
+    public abstract RubyArray transpose(ThreadContext context);
+
     @Deprecated(since = "10.0.0.0")
-    public IRubyObject replace(IRubyObject orig) {
-        return replace(getCurrentContext(), orig);
+    public IRubyObject values_at(IRubyObject[] args) {
+        return values_at(getCurrentContext(), args);
     }
 
-        /** rb_ary_replace
-         *
-         */
-    @JRubyMethod(name = {"replace"})
-    public IRubyObject replace(ThreadContext context, IRubyObject orig) {
-        unpack(context);
-        modifyCheck(context);
-
-        if (this == orig) return this;
+    @JRubyMethod(name = "values_at", rest = true)
+    public abstract IRubyObject values_at(ThreadContext context, IRubyObject[] args);
 
-        var origArr = orig.convertToArray();
-        origArr.unpack(context);
-        origArr.isShared = true;
+    public abstract IRubyObject subseqLight(long beg, long len);
 
-        isShared = true;
-        values = origArr.values;
-        realLength = origArr.realLength;
-        begin = origArr.begin;
+    public abstract IRubyObject subseq(RubyClass metaClass, long beg, long len, boolean light);
 
+    @JRubyMethod(name = "length", alias = "size")
+    public abstract RubyFixnum length(ThreadContext context);
 
-        return this;
+    @Deprecated(since = "10.0.0.0")
+    public RubyFixnum length() {
+        return length(getCurrentContext());
     }
 
-    /** rb_ary_to_s
+    /**
+     * A size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
      *
+     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
      */
-    @Override
-    public RubyString to_s(ThreadContext context) {
-        return inspect(context);
+    protected static IRubyObject size(ThreadContext context, RubyArray self, IRubyObject[] args) {
+        return self.length(context);
     }
 
-    public boolean includes(ThreadContext context, IRubyObject item) {
-        int end = realLength;
-        for (int i = 0; i < end; i++) {
-            final IRubyObject value = eltOk(i);
-            if (equalInternal(context, value, item)) return true;
-        }
-
-        return false;
+    @Deprecated(since = "10.0.0.0")
+    public RubyArray<?> append(IRubyObject item) {
+        return append(getCurrentContext(), item);
     }
 
-    public boolean includesByEql(ThreadContext context, IRubyObject item) {
-        int end = realLength;
-        for (int i = 0; i < end; i++) {
-            final IRubyObject value = eltOk(i);
-            if (eqlInternal(context, item, value)) return true;
-        }
+    @JRubyMethod(name = "<<")
+    public abstract RubyArray append(ThreadContext context, IRubyObject item);
 
-        return false;
+    @Deprecated(since = "10.0.3.0") // not-used
+    public RubyArray<?> push_m(IRubyObject[] items) {
+        return push(items);
     }
 
-    /** rb_ary_hash
-     *
-     */
-    @JRubyMethod(name = "hash")
-    public RubyFixnum hash(ThreadContext context) {
-        return asFixnum(context, hashImpl(context));
+    @Deprecated(since = "10.0.0.0")
+    public RubyArray push(IRubyObject item) {
+        append(item);
+
+        return this;
     }
 
-    private long hashImpl(final ThreadContext context) {
-        long h = Helpers.hashStart(context.runtime, realLength);
+    @JRubyMethod(name = "push", alias = "append")
+    public abstract RubyArray push(ThreadContext context, IRubyObject item);
 
-        h = Helpers.murmurCombine(h, System.identityHashCode(RubyArray.class));
+    @Deprecated(since = "10.0.0.0")
+    public RubyArray<?> push(IRubyObject[] items) {
+        return push(getCurrentContext(), items);
+    }
 
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject value = eltOk(i);
-            long n = Helpers.safeHashLong(context, value);
-            h = murmurCombine(h, n);
-        }
+    @JRubyMethod(name = "push", alias = "append", rest = true)
+    public abstract RubyArray push(ThreadContext context, IRubyObject[] items);
 
-        return hashEnd(h);
-    }
+    @JRubyMethod
+    public abstract IRubyObject pop(ThreadContext context);
 
-    // NOTE: there's some (passing) RubySpec where [ ary ] is mocked with a custom hash
-    // maybe JRuby doesn't need to obey 100% since it already has hashCode on other core types
-    //@Override
-    //public int hashCode() {
-    //    return (int) hashImpl(getRuntime().getCurrentContext());
-    //}
-    public IRubyObject store(long index, IRubyObject value) {
-        return store(metaClass.runtime.getCurrentContext(), index, value);
-    }
+    @JRubyMethod
+    public abstract IRubyObject pop(ThreadContext context, IRubyObject num);
 
-    /**
-     * Store an element at the specified index or throw if the index is invalid.
-     * @param context the current thread context
-     * @param index the offset to store the value
-     * @param value the value to be stored
-     * @return the value set
-     */
-    // MRI: rb_ary_store
-    @JRubyAPI
-    public IRubyObject store(ThreadContext context, long index, IRubyObject value) {
-        if (index < 0 && (index += realLength) < 0) throw indexError(context, "index " + (index - realLength) + " out of array");
-        if (index >= Integer.MAX_VALUE) throw indexError(context, "index " + index  + " too big");
-
-        modify(context);
-
-        storeInternal(context, (int) index, value);
-
-        return value;
-    }
-
-    // note: packed arrays will unpack in overridden version of this
-    protected void storeInternal(ThreadContext context, final int index, final IRubyObject value) {
-        assert index >= 0;
-
-        if (index >= realLength) {
-            resizeAndFillBackingArray(context, index);
-            realLength = index + 1;
-        }
-
-        safeArraySet(context, values, begin + index, value);
-    }
-
-    private void resizeAndFillBackingArray(ThreadContext context, int index) {
-        int valuesLength = values.length - begin;
-        if (index >= valuesLength) {
-            if (index - realLength >= 1) { // fill null values unassigned up to alloc'd capacity
-                fillNil(context, values, begin + realLength, values.length);
-            }
-            storeRealloc(context, index, valuesLength);
-        } else if (index - realLength >= 1) {
-            int baseIndex = begin + realLength;
-            fillNil(context, values, baseIndex, baseIndex + (index - realLength));
-        }
-    }
-
-    private void storeRealloc(ThreadContext context, final int index, final int valuesLength) {
-        long newLength = valuesLength >> 1;
-
-        if (newLength < ARRAY_DEFAULT_SIZE) newLength = ARRAY_DEFAULT_SIZE;
-
-        newLength += index;
-        if (newLength >= Integer.MAX_VALUE) throw indexError(context, "index " + index  + " too big");
-
-        realloc(context, (int) newLength, valuesLength);
-    }
+    @JRubyMethod(name = "shift")
+    public abstract IRubyObject shift(ThreadContext context);
 
-    /** rb_ary_elt
-     *
-     */
-    private final IRubyObject elt(long offset) {
-        if (offset < 0 || offset >= realLength) {
-            return metaClass.runtime.getNil();
-        }
-        return eltOk(offset);
-    }
+    @JRubyMethod(name = "shift")
+    public abstract IRubyObject shift(ThreadContext context, IRubyObject num);
 
-    public T eltOk(long offset) {
-        try {
-            return (T) eltInternal((int)offset);
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(getRuntime().getCurrentContext(), ex);
-        }
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject unshift() {
+        return unshift(getCurrentContext());
     }
 
-    public T eltSetOk(long offset, T value) {
-        return eltSetOk((int) offset, value);
-    }
+    @JRubyMethod(name = "unshift", alias = "prepend")
+    public abstract IRubyObject unshift(ThreadContext context);
 
-    public T eltSetOk(int offset, T value) {
-        try {
-            return eltInternalSet(offset, value);
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(getRuntime().getCurrentContext(), ex);
-        }
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject unshift(IRubyObject item) {
+        return unshift(getCurrentContext(), item);
     }
 
-    /** rb_ary_entry
-     *
-     */
-    public final IRubyObject entry(long offset) {
-        return (offset < 0 ) ? elt(offset + realLength) : elt(offset);
-    }
+    @JRubyMethod(name = "unshift", alias = "prepend")
+    public abstract IRubyObject unshift(ThreadContext context, IRubyObject item);
 
-    public final IRubyObject entry(int offset) {
-        return (offset < 0 ) ? elt(offset + realLength) : elt(offset);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject unshift(IRubyObject[] items) {
+        return unshift(getCurrentContext(), items);
     }
 
-    public T eltInternal(int offset) {
-        return (T) values[begin + offset];
-    }
+    @JRubyMethod(name = "unshift", alias = "prepend",  rest = true)
+    public abstract IRubyObject unshift(ThreadContext context, IRubyObject[] items);
 
-    public T eltInternalSet(int offset, T item) {
-        values[begin + offset] = item;
-        return item;
-    }
+    @JRubyMethod(name = "include?")
+    public abstract RubyBoolean include_p(ThreadContext context, IRubyObject item);
 
     /**
      * Variable arity version for compatibility. Not bound to a Ruby method.
      * @deprecated Use the versions with zero, one, or two args.
      */
-    @Deprecated(since = "9.4-")
-    public IRubyObject fetch(ThreadContext context, IRubyObject[] args, Block block) {
-        switch (args.length) {
-        case 1:
-            return fetch(context, args[0], block);
-        case 2:
-            return fetch(context, args[0], args[1], block);
-        default:
-            Arity.raiseArgumentError(context, args.length, 1, 2);
-            return null; // not reached
-        }
-    }
-
-    @JRubyMethod(rest = true)
-    public IRubyObject fetch_values(ThreadContext context, IRubyObject[] args, Block block) {
-        int length = args.length;
-        if (length == 0) return Create.newEmptyArray(context);
-
-        int arraySize = size();
-        var result = Create.allocArray(context, length);
-        for (int i = 0; i < length; i++) {
-            int index = toInt(context, args[i]);
-            // FIXME: lookup the bounds part of this in error message??
-            if (index >= arraySize) {
-                if (!block.isGiven()) throw indexError(context, "index " + index + " outside of array bounds: 0...0");
-                result.append(context, block.yield(context, asFixnum(context, index)));
-            } else {
-                result.append(context, eltOk(index));
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject aref(IRubyObject[] args) {
+        ThreadContext context = getCurrentContext();
+        return switch (args.length) {
+            case 1 -> aref(context, args[0]);
+            case 2 -> aref(context, args[0], args[1]);
+            default -> {
+                Arity.raiseArgumentError(context, args.length, 1, 2);
+                yield null;
             }
-        }
-
-        return result;
+        };
     }
 
-    /** rb_ary_fetch
-     *
-     */
-    @JRubyMethod
-    public IRubyObject fetch(ThreadContext context, IRubyObject arg0, Block block) {
-        long index = toLong(context, arg0);
-
-        if (index < 0) index += realLength;
-        if (index < 0 || index >= realLength) {
-            if (block.isGiven()) return block.yield(context, arg0);
-            throw indexError(context, "index " + index + " out of array");
-        }
+    @JRubyMethod(name = {"[]", "slice"})
+    public abstract IRubyObject aref(ThreadContext context, IRubyObject arg0);
 
-        return eltOk((int) index);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject aref(IRubyObject arg0, IRubyObject arg1) {
+        return aref(getCurrentContext(), arg0, arg1);
     }
 
-    /** rb_ary_fetch
-    *
-    */
-   @JRubyMethod
-   public IRubyObject fetch(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
-       if (block.isGiven()) warn(context, "block supersedes default value argument");
-
-       long index = toLong(context, arg0);
-
-       if (index < 0) index += realLength;
-       if (index < 0 || index >= realLength) {
-           if (block.isGiven()) return block.yield(context, arg0);
-           return arg1;
-       }
-
-       return eltOk((int) index);
-   }
+    @JRubyMethod(name = {"[]", "slice"})
+    public abstract IRubyObject aref(ThreadContext context, IRubyObject arg0, IRubyObject arg1);
 
-    /** rb_ary_to_ary
-     *
+    /**
+     * Variable arity version for compatibility. Not bound to a Ruby method.
+     * @deprecated Use the versions with zero, one, or two args.
      */
-    public static RubyArray aryToAry(ThreadContext context, IRubyObject obj) {
-        IRubyObject tmp = TypeConverter.checkArrayType(context, obj);
-        return tmp != context.nil ? (RubyArray) tmp : newArray(context.runtime, obj);
-    }
-
-    @Deprecated(since = "9.2.5.0")
-    public static RubyArray aryToAry(IRubyObject obj) {
-        return aryToAry(obj.getRuntime().getCurrentContext(), obj);
-    }
-
-    private void splice(ThreadContext context, int beg, int len, IRubyObject rpl) {
-        if (len < 0) throw indexError(context, "negative length (" + len + ")");
-        if (beg < 0 && (beg += realLength) < 0) throw indexError(context, "index " + (beg - realLength) + " out of array");
-
-        final RubyArray rplArr;
-        final int rlen;
-
-        if (rpl == null) {
-            rplArr = null;
-            rlen = 0;
-        } else if (rpl.isNil()) {
-            // 1.9 replaces with nil
-            rplArr = newArray(context.runtime, rpl);
-            rlen = 1;
-        } else {
-            rplArr = aryToAry(context, rpl);
-            rlen = rplArr.realLength;
-        }
-
-        splice(context, beg, len, rplArr, rlen);
+    @Deprecated(since = "9.4-")
+    public IRubyObject aset(IRubyObject[] args) {
+        return switch (args.length) {
+            case 2 -> aset(args[0], args[1]);
+            case 3 -> aset(args[0], args[1], args[2]);
+            default -> throw argumentError(getCurrentContext(), "wrong number of arguments (" + args.length + " for 2)");
+        };
     }
 
-    /** rb_ary_splice
-     *
-     */
-    private void splice(ThreadContext context, int beg, int len, final RubyArray rplArr, final int rlen) {
-        if (len < 0) throw indexError(context, "negative length (" + len + ")");
-        if (beg < 0 && (beg += realLength) < 0) indexError(context, "index " + (beg - realLength) + " out of array");
-
-        unpack(context);
-        modify(context);
-
-        int valuesLength = values.length - begin;
-        if (beg >= realLength) {
-            len = beg + rlen;
-            if (len >= valuesLength) spliceRealloc(context, len, valuesLength);
-            try {
-                Helpers.fillNil(context, values, begin + realLength, begin + beg);
-            } catch (ArrayIndexOutOfBoundsException e) {
-                throw concurrentModification(context, e);
-            }
-            realLength = len;
-        } else {
-            if (beg + len > realLength) len = realLength - beg;
-            int alen = realLength + rlen - len;
-            if (alen >= valuesLength) spliceRealloc(context, alen, valuesLength);
-
-            if (len != rlen) {
-                safeArrayCopy(context, values, begin + (beg + len), values, begin + beg + rlen, realLength - (beg + len));
-                realLength = alen;
-            }
-        }
-
-        if (rlen > 0) {
-            rplArr.copyInto(context, values, begin + beg, rlen);
-        }
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject aset(IRubyObject arg0, IRubyObject arg1) {
+        return aset(getCurrentContext(), arg0, arg1);
     }
 
-    /** rb_ary_splice
-     *
+    /**
+     * @param arg0
+     * @param arg1
+     * @param arg2
+     * @return ""
+     * @deprecated Use {@link RubyArray#aset(ThreadContext, IRubyObject, IRubyObject, IRubyObject)} instead.
      */
-    private final void spliceOne(ThreadContext context, long beg, IRubyObject rpl) {
-        if (beg < 0 && (beg += realLength) < 0) throw indexError(context, "index " + (beg - realLength) + " out of array");
-
-        unpack(context);
-        modify(context);
-
-        int valuesLength = values.length - begin;
-        if (beg >= realLength) {
-            int len = (int) beg + 1;
-            if (len >= valuesLength) spliceRealloc(context, len, valuesLength);
-            Helpers.fillNil(context, values, begin + realLength, begin + ((int) beg));
-            realLength = len;
-        } else {
-            int len = beg > realLength ? realLength - (int) beg : 0;
-            int alen = realLength + 1 - len;
-            if (alen >= valuesLength) spliceRealloc(context, alen, valuesLength);
-
-            if (len == 0) {
-                safeArrayCopy(context, values, begin + (int) beg, values, begin + (int) beg + 1, realLength - (int) beg);
-                realLength = alen;
-            }
-        }
-
-        safeArraySet(context, values, begin + (int) beg, rpl);
-    }
-
-    private void spliceRealloc(ThreadContext context, int length, int valuesLength) {
-        int tryLength = calculateBufferLength(context.runtime, valuesLength);
-        int len = length > tryLength ? length : tryLength;
-        IRubyObject[] vals = IRubyObject.array(len);
-        System.arraycopy(values, begin, vals, 0, realLength);
-
-        // only fill if there actually will remain trailing storage
-        if (len > length) Helpers.fillNil(context, vals, length, len);
-
-        begin = 0;
-        values = vals;
-    }
-
-    private void unshiftRealloc(ThreadContext context, int valuesLength) {
-        int newLength = valuesLength >> 1;
-        if (newLength < ARRAY_DEFAULT_SIZE) newLength = ARRAY_DEFAULT_SIZE;
-
-        newLength = addBufferLength(context, valuesLength, newLength);
-        IRubyObject[] vals = IRubyObject.array(newLength);
-
-        int shiftedBegin = newLength - valuesLength;
-        int unshiftedBegin = shiftedBegin - 1;
-
-        // copy existing elements to the end of the new array, to leave room for future unshifts
-        safeArrayCopy(context, values, begin, vals, shiftedBegin, valuesLength);
-        Helpers.fillNil(context, vals, 0, unshiftedBegin);
-
-        values = vals;
-        begin = unshiftedBegin;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject aset(IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
+        return aset(getCurrentContext(), arg0, arg1, arg2);
     }
 
-    public IRubyObject insert() {
-        throw argumentError(getRuntime().getCurrentContext(), 0, 1);
-    }
+    @JRubyMethod(name = "[]=")
+    public abstract IRubyObject aset(ThreadContext context, IRubyObject arg0, IRubyObject arg1);
 
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject insert(IRubyObject arg) {
-        return insert(getCurrentContext(), arg);
-    }
+    @JRubyMethod(name = "[]=")
+    public abstract IRubyObject aset(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2);
 
-    /** rb_ary_insert
-     *
+    /**
+     * @param pos
+     * @return ""
+     * @deprecated Use {@link RubyArray#at(ThreadContext, IRubyObject)} instead.
      */
-    @JRubyMethod(name = "insert")
-    public IRubyObject insert(ThreadContext context, IRubyObject arg) {
-        modifyCheck(context);
-        toLong(context, arg);
-        return this;
-    }
-
     @Deprecated(since = "10.0.0.0")
-    public IRubyObject insert(IRubyObject arg1, IRubyObject arg2) {
-        return insert(getCurrentContext(), arg1, arg2);
-    }
-
-    @JRubyMethod(name = "insert")
-    public IRubyObject insert(ThreadContext context, IRubyObject arg1, IRubyObject arg2) {
-        modifyCheck(context);
-        insert(context, toLong(context, arg1), arg2);
-        return this;
+    public IRubyObject at(IRubyObject pos) {
+        return at(getCurrentContext(), pos);
     }
 
-    private void insert(ThreadContext context, long pos, IRubyObject val) {
-        if (pos == -1) pos = realLength;
-        else if (pos < 0) {
-            long minpos = -realLength - 1;
-            if (pos < minpos) throw indexError(context, "index " + pos + " too small for array; minimum: " + minpos);
-            pos++;
-        }
+    @JRubyMethod(name = "at")
+    public abstract IRubyObject at(ThreadContext context, IRubyObject pos);
 
-        spliceOne(context, pos, val); // rb_ary_new4
-    }
+    @JRubyMethod(name = "concat")
+    public abstract RubyArray concat(ThreadContext context, IRubyObject obj);
 
     @Deprecated(since = "10.0.0.0")
-    public IRubyObject insert(IRubyObject[] args) {
-        return insert(getCurrentContext(), args);
+    public RubyArray aryAppend(RubyArray y) {
+        return aryAppend(getCurrentContext(), y);
     }
 
-    @JRubyMethod(name = "insert", required = 1, rest = true, checkArity = false)
-    public IRubyObject insert(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return insert();
-            case 1:
-                return insert(args[0]);
-            case 2:
-                return insert(args[0], args[1]);
-        }
-
-        int argc = Arity.checkArgumentCount(context, args, 1, -1);
-
-        modifyCheck(context);
-
-        long pos = RubyNumeric.num2long(args[0]);
-
-        if (argc == 1) return this;
-
-        unpack(context);
-
-        if (pos == -1) pos = realLength;
-        if (pos < 0) pos++;
+    public abstract RubyArray aryAppend(ThreadContext context, RubyArray<?> y);
 
-        RubyArray inserted = new RubyArray(context.runtime, false);
-        inserted.values = args;
-        inserted.begin = 1;
-        inserted.realLength = argc - 1;
-
-        splice(context, checkInt(context, pos), 0, inserted, inserted.realLength); // rb_ary_new4
+    @JRubyMethod(name = "concat", rest = true)
+    public abstract RubyArray concat(ThreadContext context, IRubyObject[] objs);
 
-        return this;
-    }
+    public abstract RubyArray concat(IRubyObject obj);
 
-    @Deprecated(since = "10.0.0.0")
-    public RubyArray transpose() {
-        return transpose(getCurrentContext());
-    }
+    @JRubyMethod(name = "inspect", alias = "to_s")
+    public abstract RubyString inspect(ThreadContext context);
 
-    /** rb_ary_transpose
-     *
-     */
-    @JRubyMethod(name = "transpose")
-    public RubyArray transpose(ThreadContext context) {
-        int alen = realLength;
-        if (alen == 0) return aryDup();
-        int elen = -1;
-        IRubyObject[] result = null;
-
-        for (int i = 0; i < alen; i++) {
-            var tmp = elt(i).convertToArray();
-            if (elen < 0) {
-                elen = tmp.realLength;
-                result = IRubyObject.array(elen);
-                for (int j = 0; j < elen; j++) {
-                    result[j] = newBlankArray(context, alen);
-                }
-            } else if (elen != tmp.realLength) {
-                throw indexError(context, "element size differs (" + tmp.realLength + " should be " + elen + ")");
-            }
-            for (int j = 0; j < elen; j++) {
-                ((RubyArray<?>) result[j]).storeInternal(context, i, tmp.elt(j));
+    @Deprecated(since = "9.4-")
+    public IRubyObject first(IRubyObject[] args) {
+        return switch (args.length) {
+            case 0 -> first(getCurrentContext());
+            case 1 -> first(getCurrentContext(), args[0]);
+            default -> {
+                Arity.raiseArgumentError(getCurrentContext(), args.length, 0, 1);
+                yield null;
             }
-        }
-        return new RubyArray<>(context.runtime, result);
+        };
     }
 
     @Deprecated(since = "10.0.0.0")
-    public IRubyObject values_at(IRubyObject[] args) {
-        return values_at(getCurrentContext(), args);
+    public IRubyObject first() {
+        return first(getCurrentContext());
     }
 
-    /** rb_values_at
-     *
-     */
-    @JRubyMethod(name = "values_at", rest = true)
-    public IRubyObject values_at(ThreadContext context, IRubyObject[] args) {
-        final int length = realLength;
-        RubyArray<?> result = Create.allocArray(context, args.length);
-
-        for (int i = 0; i < args.length; i++) {
-            final IRubyObject arg = args[i];
-            if (arg instanceof RubyFixnum fix) {
-                result.append(context, entry(fix.getValue()));
-                continue;
-            }
-
-            final int[] begLen;
-            if (!(arg instanceof RubyRange range)) {
-                // do result.append
-            } else if ((begLen = range.begLenInt(context, length, 1)) == null) {
-                continue;
-            } else {
-                final int beg = begLen[0];
-                final int len = begLen[1];
-                for (int j = 0; j < len; j++) {
-                    result.append(context, entry(j + beg));
-                }
-                continue;
-            }
-            result.append(context, entry(toLong(context, arg)));
-        }
+    @JRubyAPI
+    @JRubyMethod(name = "first")
+    public abstract IRubyObject first(ThreadContext context);
 
-        return result;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject first(IRubyObject arg0) {
+        return first(getCurrentContext(), arg0);
     }
 
-    /** rb_ary_subseq
-     *
-     */
-    public IRubyObject subseq(long beg, long len) {
-        return subseq(getRuntime().getArray(), beg, len, true);
-    }
+    @JRubyAPI
+    @JRubyMethod(name = "first")
+    public abstract IRubyObject first(ThreadContext context, IRubyObject arg0);
 
-    /** rb_ary_subseq_step
-     *
-     */
-    public IRubyObject subseq_step(ThreadContext context, RubyArithmeticSequence arg0) {
-        long beg, len, end;
-        long step = getStep(context, arg0);
-        IRubyObject aseqBeg = getBegin(context, arg0);
-        IRubyObject aseqEnd = getEnd(context, arg0);
-        boolean aseqExcl = arg0.exclude_end(context).isTrue();
-        len = realLength;
-
-        if (step < 0) {
-            if (aseqExcl && !aseqEnd.isNil()) {
-                /* Handle exclusion before range reversal */
-                aseqEnd = asFixnum(context, toLong(context, aseqEnd) + 1);
-
-                /* Don't exclude the previous beginning */
-                aseqExcl = false;
-            }
-            IRubyObject tmp = aseqBeg;
-            aseqBeg = aseqEnd;
-            aseqEnd = tmp;
-        }
-
-        if (step < -1 || step > 1) {
-            int [] ret;
-            try {
-                ret = RubyRange.newRange(context, aseqBeg, aseqEnd, aseqExcl).begLenInt(context, (int)len, 1);
-            } catch(RaiseException ex){
-                if (ex.getException() instanceof RubyRangeError) {
-                    // convert exception message using an ArithsemeticSequece arg.
-                    // e.g.
-                    // [1].slice((-101..-1)%2) shoud throw "((-101..-1).%(2)) out of range".
-                    // The original exception message is "-1..-1 out of range".
-                    throw rangeError(context, arg0.inspect(context) + " out of range");
-                } else {
-                    throw ex;
-                }
-            }
-            if (ret != null && (ret[0] > len || ret[1] > len)) throw rangeError(context, arg0.inspect(context) + " out of range");
-        }
-
-        beg = aseqBeg.isNil() ? 0 : aseqBeg.convertToFloat().asLong(context);
-        end = aseqEnd.isNil() ? -1 : aseqEnd.convertToFloat().asLong(context);
-
-        if (aseqEnd.isNil()) aseqExcl = false;
-
-        if (beg < 0) {
-            beg += len;
-            if (beg < 0) throw rangeError(context, "integer " + beg + " out of range of fixnum");
-        }
-
-        if (end < 0) end += len;
-        if (!aseqExcl) end++;
-
-        len = end - beg;
-
-        if (len < 0) len = 0;
-
-        long alen = realLength;
-        if (beg > alen)  return context.nil;
-        if (beg < 0 || len < 0) return context.nil;
-
-        if (alen < len || alen < beg + len) len = alen - beg;
-
-        if (len == 0) return Create.newEmptyArray(context);
-        if (step == 0) throw rangeError(context, "slice step cannot be zero");
-        if (step == 1) return subseq(beg, len);
-
-        long orig_len = len;
-        if (step > 0 && step >= len) return Create.newArray(context, eltOk(beg));
-
-        if (step < 0 && (step < -len)) step = -len;
-
-        long ustep = (step < 0) ? -step : step;
-        len = (len + ustep - 1) / ustep;
-
-        long j = beg + ((step > 0) ? 0 : (orig_len - 1));
-        RubyArray<?> result1;
-        result1 = Create.allocArray(context, len);
-        RubyArray result = result1;
-
-        for(long i = 0; i < len; ++i) {
-            result.append(context, eltOk(j));
-            j = j + step;
-        }
-
-        return result;
-    }
-
-    private IRubyObject getBegin(ThreadContext context, RubyArithmeticSequence arg0) {
-      return arg0.begin(context);
-    }
-
-    private IRubyObject getEnd(ThreadContext context, RubyArithmeticSequence arg0) {
-        return arg0.end(context);
-    }
-
-    private Long getStep(ThreadContext context, RubyArithmeticSequence arg0) {
-        return arg0.step(context).isNil() ? null: toLong(context, arg0.step(context));
-    }
-
-    /** rb_ary_subseq
-     *
-     */
-    public IRubyObject subseqLight(long beg, long len) {
-        return subseq(metaClass, beg, len, true);
-    }
-
-    public IRubyObject subseq(RubyClass metaClass, long beg, long len, boolean light) {
-        Ruby runtime = metaClass.runtime;
-        if (beg > realLength || beg < 0 || len < 0) return runtime.getNil();
-
-        if (beg + len > realLength) {
-            len = realLength - beg;
-            if (len < 0) len = 0;
-        }
-
-        if (len == 0) return new RubyArray(runtime, metaClass, IRubyObject.NULL_ARRAY, !light);
-        return makeShared(runtime.getCurrentContext(), begin + (int) beg, (int) len, new RubyArray(runtime, metaClass, !light));
-    }
-
-    /** rb_ary_length
-     *
-     */
-    @JRubyMethod(name = "length", alias = "size")
-    public RubyFixnum length(ThreadContext context) {
-        return asFixnum(context, realLength);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public RubyFixnum length() {
-        return length(getCurrentContext());
-    }
-
-    /**
-     * A size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
-     *
-     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
-     */
-    protected static IRubyObject size(ThreadContext context, RubyArray self, IRubyObject[] args) {
-        return self.length(context);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public RubyArray<?> append(IRubyObject item) {
-        return append(getCurrentContext(), item);
-    }
-
-    /** rb_ary_push - specialized rb_ary_store
-     *
-     */
-    @JRubyMethod(name = "<<")
-    public RubyArray append(ThreadContext context, IRubyObject item) {
-        unpack(context);
-        modify(context);
-        int valuesLength = values.length - begin;
-        if (realLength == valuesLength) {
-            if (realLength == Integer.MAX_VALUE) throw indexError(context, "index " + Integer.MAX_VALUE + " too big");
-
-            long newLength = valuesLength + (valuesLength >> 1);
-            if (newLength > Integer.MAX_VALUE) {
-                newLength = Integer.MAX_VALUE;
-            } else if (newLength < ARRAY_DEFAULT_SIZE) {
-                newLength = ARRAY_DEFAULT_SIZE;
-            }
-
-            realloc(context, (int) newLength, valuesLength);
-        }
-
-        safeArraySet(context, values, begin + realLength++, item);
-
-        return this;
-    }
-
-    /** rb_ary_push_m - instance method push
-     *
-     */
-    @Deprecated(since = "9.2.0.0") // not-used
-    public RubyArray<?> push_m(IRubyObject[] items) {
-        return push(items);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public RubyArray push(IRubyObject item) {
-        append(item);
-
-        return this;
-    }
-
-    @JRubyMethod(name = "push", alias = "append")
-    public RubyArray push(ThreadContext context, IRubyObject item) {
-        append(context, item);
-
-        return this;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public RubyArray<?> push(IRubyObject[] items) {
-        return push(getCurrentContext(), items);
-    }
-
-    @JRubyMethod(name = "push", alias = "append", rest = true)
-    public RubyArray push(ThreadContext context, IRubyObject[] items) {
-        if (items.length == 0) modifyCheck(context);
-        for (IRubyObject item : items) {
-            append(context, item);
-        }
-        return this;
-    }
-
-    /** rb_ary_pop
-     *
-     */
-    @JRubyMethod
-    public IRubyObject pop(ThreadContext context) {
-        unpack(context);
-        modifyCheck(context);
-
-        if (realLength == 0) return context.nil;
-
-        if (isShared) {
-            return safeArrayRef(context, values, begin + --realLength);
-        } else {
-            int index = begin + --realLength;
-            return safeArrayRefSet(context, values, index, context.nil);
-        }
-    }
-
-    @JRubyMethod
-    public IRubyObject pop(ThreadContext context, IRubyObject num) {
-        unpack(context);
-        modifyCheck(context);
-        RubyArray result = makeSharedFirst(context, num, true);
-        realLength -= result.realLength;
-        return result;
-    }
-
-    /** rb_ary_shift
-     *
-     */
-    @JRubyMethod(name = "shift")
-    public IRubyObject shift(ThreadContext context) {
-        unpack(context);
-        modifyCheck(context);
-
-        if (realLength == 0) return context.nil;
-
-        final IRubyObject obj = safeArrayRefCondSet(context, values, begin, !isShared, context.nil);
-        begin++;
-        realLength--;
-        return obj;
-
-    }
-
-    @JRubyMethod(name = "shift")
-    public IRubyObject shift(ThreadContext context, IRubyObject num) {
-        unpack(context);
-        modify(context);
-
-        RubyArray result = makeSharedFirst(context, num, false);
-
-        int n = result.realLength;
-        begin += n;
-        realLength -= n;
-        return result;
-    }
-
-    /**
-     * @return ""
-     * @deprecated Use {@link RubyArray#unshift(ThreadContext)} instead
-     */
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject unshift() {
-        return unshift(getCurrentContext());
-    }
-
-    @JRubyMethod(name = "unshift", alias = "prepend")
-    public IRubyObject unshift(ThreadContext context) {
-        modifyCheck(context);
-        return this;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject unshift(IRubyObject item) {
-        return unshift(getCurrentContext(), item);
-    }
-    
-    /** rb_ary_unshift
-     *
-     */
-    @JRubyMethod(name = "unshift", alias = "prepend")
-    public IRubyObject unshift(ThreadContext context, IRubyObject item) {
-        unpack(context);
-
-        if (begin == 0 || isShared) {
-            modify(context);
-            final int valuesLength = values.length - begin;
-            if (valuesLength == 0) {
-                alloc(context, ARRAY_DEFAULT_SIZE);
-                begin = ARRAY_DEFAULT_SIZE - 1;
-            } else if (realLength == valuesLength) {
-                unshiftRealloc(context, valuesLength);
-            } else {
-                safeArrayCopy(context, values, begin, values, begin + 1, realLength);
-            }
-        } else {
-            modifyCheck(context);
-            begin--;
-        }
-        realLength++;
-        values[begin] = item;
-        return this;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject unshift(IRubyObject[] items) {
-        return unshift(getCurrentContext(), items);
-    }
-
-    @JRubyMethod(name = "unshift", alias = "prepend",  rest = true)
-    public IRubyObject unshift(ThreadContext context, IRubyObject[] items) {
-        unpack(context);
-
-        if (items.length == 0) {
-            modifyCheck(context);
-            return this;
-        }
-
-        final int len = realLength;
-        store(((long) len) + items.length - 1, context.nil);
-
-        try {
-            System.arraycopy(values, begin, values, begin + items.length, len);
-            ArraySupport.copy(items, 0, values, begin, items.length);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(context, e);
-        }
-
-        return this;
-    }
-
-    /** rb_ary_includes
-     *
-     */
-    @JRubyMethod(name = "include?")
-    public RubyBoolean include_p(ThreadContext context, IRubyObject item) {
-        return asBoolean(context, includes(context, item));
-    }
-
-    /**
-     * Variable arity version for compatibility. Not bound to a Ruby method.
-     * @deprecated Use the versions with zero, one, or two args.
-     */
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject aref(IRubyObject[] args) {
-        ThreadContext context = getCurrentContext();
-        return switch (args.length) {
-            case 1 -> aref(context, args[0]);
-            case 2 -> aref(context, args[0], args[1]);
-            default -> {
-                Arity.raiseArgumentError(context, args.length, 1, 2);
-                yield null;
-            }
-        };
-    }
-
-    @Deprecated(since = "9.4.0.0")
-    public IRubyObject aref(IRubyObject arg0) {
-        return aref(getCurrentContext(), arg0);
-    }
-
-    /** rb_ary_aref
-     */
-    @JRubyMethod(name = {"[]", "slice"})
-    public IRubyObject aref(ThreadContext context, IRubyObject arg0) {
-        if (arg0 instanceof RubyArithmeticSequence) {
-            return subseq_step(context, (RubyArithmeticSequence) arg0);
-        } else {
-            return arg0 instanceof RubyFixnum fixnum ? entry(fixnum.getValue()) : arefCommon(context, arg0);
-        }
-    }
-
-    private IRubyObject arefCommon(ThreadContext context, IRubyObject arg0) {
-        if (arg0 instanceof RubyRange range) {
-            long[] beglen = range.begLen(context, realLength, 0);
-            return beglen == null ? context.nil : subseq(beglen[0], beglen[1]);
-        } else {
-            ArraySites sites = sites(context);
-
-            if (RubyRange.isRangeLike(context, arg0, sites.begin_checked, sites.end_checked, sites.exclude_end_checked)) {
-                RubyRange range = RubyRange.rangeFromRangeLike(context, arg0, sites.begin, sites.end, sites.exclude_end);
-
-                long[] beglen = range.begLen(context, realLength, 0);
-                return beglen == null ? context.nil : subseq(beglen[0], beglen[1]);
-            }
-        }
-        return entry(toLong(context, arg0));
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject aref(IRubyObject arg0, IRubyObject arg1) {
-        return aref(getCurrentContext(), arg0, arg1);
-    }
-
-    @JRubyMethod(name = {"[]", "slice"})
-    public IRubyObject aref(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
-        long beg = toLong(context, arg0);
-        if (beg < 0) beg += realLength;
-        return subseq(beg, toLong(context, arg1));
-    }
-
-    /**
-     * Variable arity version for compatibility. Not bound to a Ruby method.
-     * @deprecated Use the versions with zero, one, or two args.
+    /**
+     * Variable arity version for compatibility. Not bound to a Ruby method.
+     * @deprecated Use the versions with zero, one, or two args.
      */
     @Deprecated(since = "9.4-")
-    public IRubyObject aset(IRubyObject[] args) {
-        return switch (args.length) {
-            case 2 -> aset(args[0], args[1]);
-            case 3 -> aset(args[0], args[1], args[2]);
-            default -> throw argumentError(getCurrentContext(), "wrong number of arguments (" + args.length + " for 2)");
-        };
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject aset(IRubyObject arg0, IRubyObject arg1) {
-        return aset(getCurrentContext(), arg0, arg1);
-    }
-
-    @JRubyMethod(name = "[]=")
-    public IRubyObject aset(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
-        modifyCheck(context);
-        if (arg0 instanceof RubyFixnum) {
-            store(((RubyFixnum) arg0).getValue(), arg1);
-        } else if (arg0 instanceof RubyRange range) {
-            int beg0 = checkLongForInt(context, range.begLen0(context, realLength));
-            int beg1 = checkLongForInt(context, range.begLen1(context, realLength, beg0));
-            splice(context, beg0, beg1, arg1);
-        } else {
-            asetFallback(context, arg0, arg1);
-        }
-        return arg1;
-    }
-
-    // stand in method for checkInt as it raises the wrong type of 
-    // exception to mri
-    private int checkLongForInt(ThreadContext context, long value) {
-        if (((int)value) != value) throw indexError(context, String.format("index %d is too big", value));
-
-        return (int)value;
-    }
-
-    private void asetFallback(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
-        ArraySites sites = sites(context);
-
-        if (RubyRange.isRangeLike(context, arg0, sites.begin_checked, sites.end_checked, sites.exclude_end_checked)) {
-            RubyRange range = RubyRange.rangeFromRangeLike(context, arg0, sites.begin, sites.end, sites.exclude_end);
-
-            int beg = checkInt(context, range.begLen0(context, realLength));
-            splice(context, beg, checkInt(context, range.begLen1(context, realLength, beg)), arg1);
-        } else {
-            store(toLong(context, arg0), arg1);
-        }
-    }
-
-    /**
-     * @param arg0
-     * @param arg1
-     * @param arg2
-     * @return ""
-     * @deprecated Use {@link RubyArray#aset(ThreadContext, IRubyObject, IRubyObject, IRubyObject)} instead.
-     */
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject aset(IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
-        return aset(getCurrentContext(), arg0, arg1, arg2);
-    }
-
-    /** rb_ary_aset
-    *
-    */
-    @JRubyMethod(name = "[]=")
-    public IRubyObject aset(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
-        modifyCheck(context);
-        splice(context, toInt(context, arg0), toInt(context, arg1), arg2);
-        return arg2;
-    }
-
-    /**
-     * @param pos
-     * @return ""
-     * @deprecated Use {@link RubyArray#at(ThreadContext, IRubyObject)} instead.
-     */
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject at(IRubyObject pos) {
-        return at(getCurrentContext(), pos);
-    }
-
-    /** rb_ary_at
-     *
-     */
-    @JRubyMethod(name = "at")
-    public IRubyObject at(ThreadContext context, IRubyObject pos) {
-        return entry(toLong(context, pos));
-    }
-
-	/** rb_ary_concat
-     *
-     */
-    @JRubyMethod(name = "concat")
-    public RubyArray concat(ThreadContext context, IRubyObject obj) {
-        modifyCheck(context);
-
-        concat(context, obj.convertToArray());
-        return this;
-    }
-
-    private void concat(ThreadContext context, RubyArray<?> obj) {
-        splice(context, realLength, 0, obj, obj.realLength);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public RubyArray aryAppend(RubyArray y) {
-        return aryAppend(getCurrentContext(), y);
-    }
-
-    // MRI: ary_append
-    public RubyArray aryAppend(ThreadContext context, RubyArray<?> y) {
-        if (y.realLength > 0) splice(context, realLength, 0, y, y.realLength);
-        return this;
-    }
-
-    /** rb_ary_concat_multi
-     *
-     */
-    @JRubyMethod(name = "concat", rest = true)
-    public RubyArray concat(ThreadContext context, IRubyObject[] objs) {
-        modifyCheck(context);
-        if (objs.length == 0) return this;
-
-        final int len = objs.length;
-        RubyArray<?> result = Create.allocArray(context, len);
-
-        for (IRubyObject obj : objs) {
-            result.concat(context, obj.convertToArray());
-        }
-
-        return aryAppend(context, result);
-    }
-
-    public RubyArray concat(IRubyObject obj) {
-        return concat(metaClass.runtime.getCurrentContext(), obj);
-    }
-
-    /** inspect_ary
-     *
-     */
-    protected IRubyObject inspectAry(ThreadContext context) {
-        RubyString str = RubyString.newStringLight(context.runtime, DEFAULT_INSPECT_STR_SIZE, USASCIIEncoding.INSTANCE);
-        str.cat((byte) '[');
-
-        for (int i = 0; i < realLength; i++) {
-
-            RubyString s = inspect(context, safeArrayRef(context, values, begin + i));
-            if (i > 0) {
-                ByteList bytes = str.getByteList();
-                bytes.append((byte) ',').append((byte) ' ');
-            } else {
-                EncodingUtils.encAssociateIndex(str, s.getEncoding());
-            }
-            str.catWithCodeRange(s);
-        }
-        str.cat((byte) ']');
-
-        return str;
-    }
-
-    /** rb_ary_inspect
-    *
-    */
-    @JRubyMethod(name = "inspect", alias = "to_s")
-    public RubyString inspect(ThreadContext context) {
-        final Ruby runtime = context.runtime;
-        if (realLength == 0) return newSharedString(context, EMPTY_ARRAY_BL);
-        if (runtime.isInspecting(this)) return newSharedString(context, RECURSIVE_ARRAY_BL);
-
-        try {
-            runtime.registerInspecting(this);
-            return (RubyString) inspectAry(context);
-        } finally {
-            runtime.unregisterInspecting(this);
-        }
-    }
-
-    /**
-     * Variable arity version for compatibility. Not bound to a Ruby method.
-     * @deprecated Use the versions with zero, one, or two args.
-     */
-    @Deprecated(since = "9.4-")
-    public IRubyObject first(IRubyObject[] args) {
-        return switch (args.length) {
-            case 0 -> first(getCurrentContext());
-            case 1 -> first(getCurrentContext(), args[0]);
-            default -> {
-                Arity.raiseArgumentError(getCurrentContext(), args.length, 0, 1);
-                yield null;
-            }
-        };
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject first() {
-        return first(getCurrentContext());
-    }
-
-    // MRI: rb_ary_first
-    @JRubyAPI
-    @JRubyMethod(name = "first")
-    public IRubyObject first(ThreadContext context) {
-        return realLength == 0 ? context.nil : eltOk(0);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject first(IRubyObject arg0) {
-        return first(getCurrentContext(), arg0);
-    }
-
-    // MRI: rb_ary_first
-    @JRubyAPI
-    @JRubyMethod(name = "first")
-    public IRubyObject first(ThreadContext context, IRubyObject arg0) {
-        long n = toLong(context, arg0);
-        if (n > realLength) {
-            n = realLength;
-        } else if (n < 0) {
-            throw argumentError(context, "negative array size (or size too big)");
-        } else if (n == 1) {
-            return Create.newArray(context, eltOk(0));
-        } else if (n == 2) {
-            return Create.newArray(context, eltOk(0), eltOk(1));
-        }
-
-        unpack(context);
-        return makeShared(context, begin, (int) n, arrayClass(context));
-    }
-
-    /**
-     * Variable arity version for compatibility. Not bound to a Ruby method.
-     * @deprecated Use the versions with zero, one, or two args.
-     */
-    @Deprecated(since = "9.4-")
-    public IRubyObject last(IRubyObject[] args) {
+    public IRubyObject last(IRubyObject[] args) {
         return switch (args.length) {
             case 0 -> last(getCurrentContext());
             case 1 -> last(getCurrentContext(), args[0]);
             default -> {
-                Arity.raiseArgumentError(getCurrentContext(), args.length, 0, 1);
-                yield null;
-            }
-        };
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject last() {
-        return last(getCurrentContext());
-    }
-
-
-    // MRI: rb_ary_last
-    @JRubyAPI
-    @JRubyMethod(name = "last")
-    public IRubyObject last(ThreadContext context) {
-        return realLength == 0 ? context.nil : eltOk(realLength - 1);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject last(IRubyObject arg0) {
-        return last(getCurrentContext(), arg0);
-    }
-
-    /** rb_ary_last
-     *
-     */
-    @JRubyMethod(name = "last")
-    public IRubyObject last(ThreadContext context, IRubyObject arg0) {
-        long n = toLong(context, arg0);
-        if (n > realLength) n = realLength;
-
-        if (n < 0) throw argumentError(context, "negative array size (or size too big)");
-        if (n == 1) return Create.newArray(context, eltOk(realLength - 1));
-        if (n == 2) return Create.newArray(context, eltOk(realLength - 2), eltOk(realLength - 1));
-
-        unpack(context);
-        return makeShared(context, begin + realLength - (int) n, (int) n, arrayClass(context));
-    }
-
-    /**
-     * mri: rb_ary_each
-     */
-    @JRubyMethod
-    public IRubyObject each(ThreadContext context, Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "each", RubyArray::size);
-
-        for (int i = 0; i < size(); i++) {
-            // do not coarsen the "safe" catch, since it will misinterpret AIOOBE from the yielded code.
-            // See JRUBY-5434
-            block.yield(context, eltOk(i));
-        }
-        return this;
-    }
-
-    public IRubyObject eachSlice(ThreadContext context, int size, Block block) {
-        unpack(context);
-        var array = arrayClass(context);
-
-        // local copies of everything
-        int realLength = this.realLength;
-        int begin = this.begin;
-
-        // sliding window
-        RubyArray window = makeShared(context, begin, size, array);
-
-        // don't expose shared array to ruby
-        Signature signature = block.getSignature();
-        final boolean specificArity = signature.isFixed() && signature.required() != 1;
-
-        for (; realLength >= size; realLength -= size) {
-            block.yield(context, window);
-            if (specificArity) { // array is never exposed to ruby, just use for yielding
-                window.begin = begin += size;
-            } else { // array may be exposed to ruby, create new
-                window = makeShared(context, begin += size, size, array);
-            }
-        }
-
-        // remainder
-        if (realLength > 0) {
-            window.realLength = realLength;
-            block.yield(context, window);
-        }
-        return this;
-    }
-
-    @JRubyMethod
-    public IRubyObject each_slice(ThreadContext context, IRubyObject arg, Block block) {
-        final int size = toInt(context, arg);
-        if (size <= 0) throw argumentError(context, "invalid slice size");
-        return block.isGiven() ?
-                eachSlice(context, size, block) :
-                enumeratorizeWithSize(context, this, "each_slice", arg, arg);
-    }
-
-    /** rb_ary_each_index
-     *
-     */
-    public IRubyObject eachIndex(ThreadContext context, Block block) {
-        if (!block.isGiven()) throw context.runtime.newLocalJumpErrorNoBlock();
-
-        for (int i = 0; i < realLength; i++) {
-            block.yield(context, asFixnum(context, i));
-        }
-        return this;
-    }
-
-    @JRubyMethod
-    public IRubyObject each_index(ThreadContext context, Block block) {
-        return block.isGiven() ? eachIndex(context, block) : enumeratorizeWithSize(context, this, "each_index", RubyArray::size);
-    }
-
-    /** rb_ary_reverse_each
-     *
-     */
-    public IRubyObject reverseEach(ThreadContext context, Block block) {
-        int len = realLength;
-
-        while(len-- > 0) {
-            // do not coarsen the "safe" catch, since it will misinterpret AIOOBE from the yielded code.
-            // See JRUBY-5434
-            block.yield(context, eltOk(len));
-            if (realLength < len) len = realLength;
-        }
-
-        return this;
-    }
-
-    @JRubyMethod
-    public IRubyObject reverse_each(ThreadContext context, Block block) {
-        return block.isGiven() ? reverseEach(context, block) : enumeratorizeWithSize(context, this, "reverse_each", RubyArray::size);
-    }
-
-    // MRI: ary_join_0
-    protected int joinStrings(RubyString sep, int max, RubyString result) {
-        if (max > 0 && eltOk(0) instanceof EncodingCapable ec) result.setEncoding(ec.getEncoding());
-
-        int i;
-        try {
-            for (i = 0; i < max; i++) {
-                IRubyObject val = eltInternal(i);
-                if (!(val instanceof RubyString)) break;
-                if (i > 0 && sep != null) result.catWithCodeRange(sep);
-                result.append(val);
-            }
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(getRuntime().getCurrentContext(), e);
-        }
-
-        return i;
-    }
-
-    // MRI: ary_join_1
-    private RubyString joinAny(ThreadContext context, RubyString sep, int i, RubyString result, boolean[] first) {
-        assert i >= 0 : "joining elements before beginning of array";
-        JavaSites.CheckedSites to_ary_checked = null;
-
-        for (; i < realLength; i++) {
-            if (i > 0 && sep != null) result.catWithCodeRange(sep);
-
-            IRubyObject val = eltOk(i);
-
-            if (val instanceof RubyString) {
-                strJoin(result, (RubyString) val, first);
-            } else if (val instanceof RubyArray) {
-                recursiveJoin(context, val, sep, result, (RubyArray) val, first);
-            } else {
-                IRubyObject tmp = val.checkStringType();
-                if (tmp != context.nil) {
-                    strJoin(result, (RubyString) tmp, first);
-                    continue;
-                }
-
-                if (to_ary_checked == null) to_ary_checked = sites(context).to_ary_checked;
-
-                tmp = TypeConverter.convertToTypeWithCheck(context, val, arrayClass(context), to_ary_checked);
-                if (tmp != context.nil) {
-                    recursiveJoin(context, val, sep, result, (RubyArray) tmp, first);
-                } else {
-                    strJoin(result, RubyString.objAsString(context, val), first);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    // MRI: ary_join_1, str_join label
-    private static void strJoin(RubyString result, RubyString val, boolean[] first) {
-        result.catWithCodeRange(val);
-        if (first[0]) {
-            result.setEncoding(val.getEncoding());
-            first[0] = false;
-        }
-    }
-
-    private void recursiveJoin(final ThreadContext context, final IRubyObject outValue,
-                               final RubyString sep, final RubyString result, final RubyArray ary, final boolean[] first) {
-
-        if (ary == this) throw argumentError(context, "recursive array join");
-
-        first[0] = false;
-
-        context.safeRecurse(JOIN_RECURSIVE, new JoinRecursive.State(ary, outValue, sep, result, first), outValue, "join", true);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject join19(final ThreadContext context, IRubyObject sep) {
-        return join(context, sep);
-    }
-
-    /** rb_ary_join
-     *
-     */
-    @JRubyMethod(name = "join")
-    public IRubyObject join(final ThreadContext context, IRubyObject sep) {
-        if (sep == context.nil) sep = getDefaultSeparator(context);
-
-        if (realLength == 0) return RubyString.newEmptyString(context.runtime, USASCIIEncoding.INSTANCE);
-
-        int len = 1;
-        RubyString sepString = null;
-        if (sep != context.nil) {
-            sepString = sep.convertToString();
-            len += sepString.size() * (realLength - 1);
-        }
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject val = eltOk(i);
-            IRubyObject tmp = val.checkStringType();
-            if (tmp == context.nil || tmp != val) {
-                if (i > realLength) i = realLength;
-                len += (realLength - i) * 10;
-                RubyString result = RubyString.newStringLight(context.runtime, len, USASCIIEncoding.INSTANCE);
-                i = joinStrings(sepString, i, result);
-                boolean[] first = new boolean[] { i == 0 };
-                return joinAny(context, sepString, i, result, first);
-            }
-
-            len += ((RubyString) tmp).getByteList().length();
-        }
-
-        RubyString result = RubyString.newStringLight(context.runtime, len);
-        joinStrings(sepString, realLength, result);
-
-        return result;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject join19(ThreadContext context) {
-        return join(context);
-    }
-
-    @JRubyMethod(name = "join")
-    public IRubyObject join(ThreadContext context) {
-        return join(context, context.nil);
-    }
-
-    private IRubyObject getDefaultSeparator(ThreadContext context) {
-        IRubyObject sep = globalVariables(context).get("$,");
-
-        if (!sep.isNil()) warnDeprecated(context, "$, is set to non-nil value");
-
-        return sep;
-    }
-
-    /** rb_ary_to_a
-     *
-     */
-    @JRubyMethod(name = "to_a")
-    @Override
-    public RubyArray to_a(ThreadContext context) {
-        final RubyClass arrayClass = arrayClass(context);
-        return this.metaClass != arrayClass ?
-            dupImpl(context.runtime, arrayClass) : this;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject to_ary() {
-        return this;
-    }
-
-    @JRubyMethod(name = "to_ary")
-    public IRubyObject to_ary(ThreadContext context) {
-    	return this;
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public IRubyObject to_h(ThreadContext context) {
-        return to_h(context, Block.NULL_BLOCK);
-    }
-
-    @JRubyMethod(name = "to_h")
-    public IRubyObject to_h(ThreadContext context, Block block) {
-        boolean useSmallHash = realLength <= 10;
-        RubyHash hash = useSmallHash ? newSmallHash(context) : newHash(context);
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject e = eltOk(i);
-            IRubyObject elt = block.isGiven() ? block.yield(context, e) : e;
-            IRubyObject key_value_pair = elt.checkArrayType();
-
-            if (key_value_pair == context.nil) throw typeError(context, "wrong element type ", elt, " at " + i + " (expected array)");
-
-            RubyArray ary = (RubyArray)key_value_pair;
-            if (ary.getLength() != 2) {
-                throw argumentError(context, "wrong array length at " + i + " (expected 2, was " + ary.getLength() + ")");
-            }
-
-            if (useSmallHash) {
-                hash.fastASetSmall(context.runtime, ary.eltOk(0), ary.eltOk(1), true);
-            } else {
-                hash.fastASet(context.runtime, ary.eltOk(0), ary.eltOk(1), true);
-            }
-        }
-        return hash;
-    }
-
-    @Override
-    public RubyArray convertToArray() {
-        return this;
-    }
-
-    @Override
-    public IRubyObject checkArrayType(){
-        return this;
-    }
-
-    /** rb_ary_equal
-     *
-     */
-    @JRubyMethod(name = "==")
-    @Override
-    public IRubyObject op_equal(ThreadContext context, IRubyObject obj) {
-        if (this == obj) return context.tru;
-
-        if (!(obj instanceof RubyArray)) {
-            if (obj == context.nil) return context.fals;
-
-            if (!sites(context).respond_to_to_ary.respondsTo(context, obj, obj)) {
-                return context.fals;
-            }
-            return Helpers.rbEqual(context, obj, this);
-        }
-        return RecursiveComparator.compare(context, sites(context).op_equal, this, obj, false);
-    }
-
-    public RubyBoolean compare(ThreadContext context, CallSite site, IRubyObject other) {
-        if (!(other instanceof RubyArray)) {
-            if (!sites(context).respond_to_to_ary.respondsTo(context, other, other)) return context.fals;
-
-            return Helpers.rbEqual(context, other, this);
-        }
-
-        RubyArray ary = (RubyArray) other;
-
-        if (realLength != ary.realLength) return context.fals;
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject a = elt(i);
-            IRubyObject b = ary.elt(i);
-
-            if (a == b) continue; // matching MRI opt. mock frameworks can throw errors if we don't
-
-            if (!site.call(context, a, a, b).isTrue()) return context.fals;
-        }
-
-        return context.tru;
-    }
-
-    /** rb_ary_eql
-     *
-     */
-    @JRubyMethod(name = "eql?")
-    public IRubyObject eql(ThreadContext context, IRubyObject obj) {
-        if(!(obj instanceof RubyArray)) {
-            return context.fals;
-        }
-        return RecursiveComparator.compare(context, sites(context).eql, this, obj, true);
-    }
-
-    /**
-     * @return ""
-     * @deprecated Use {@link RubyArray#compact_bang(ThreadContext)}
-     */
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject compact_bang() {
-        return compact_bang(getCurrentContext());
-    }
-
-    /** rb_ary_compact_bang
-     *
-     */
-    @JRubyMethod(name = "compact!")
-    public IRubyObject compact_bang(ThreadContext context) {
-        unpack(context);
-        modify(context);
-
-        int p = begin;
-        int t = p;
-        int end = p + realLength;
-
-        try {
-            while (t < end) {
-                if (values[t].isNil()) {
-                    t++;
-                } else {
-                    values[p++] = values[t++];
-                }
-            }
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(context, e);
-        }
-
-        p -= begin;
-        if (realLength == p) return context.nil;
-
-        realloc(context, p, values.length - begin);
-        realLength = p;
-        return this;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject compact() {
-        return compact(getCurrentContext());
-    }
-
-    // MRI: rb_ary_compact
-    @JRubyMethod(name = "compact")
-    public IRubyObject compact(ThreadContext context) {
-        RubyArray ary = aryDup();
-        ary.compact_bang(context);
-        return ary;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject empty_p() {
-        return empty_p(getCurrentContext());
-    }
-
-    /** rb_ary_empty_p
-     *
-     */
-    @JRubyMethod(name = "empty?")
-    public IRubyObject empty_p(ThreadContext context) {
-        return realLength == 0 ? context.tru : context.fals;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject rb_clear() {
-        return rb_clear(getCurrentContext());
-    }
-
-    /** rb_ary_clear
-     *
-     */
-    @JRubyMethod(name = "clear")
-    public IRubyObject rb_clear(ThreadContext context) {
-        modifyCheck(context);
-
-        if (isShared) {
-            alloc(context, ARRAY_DEFAULT_SIZE);
-            isShared = false;
-        } else if (values.length > ARRAY_DEFAULT_SIZE << 1) {
-            alloc(context, ARRAY_DEFAULT_SIZE << 1);
-        } else {
-            try {
-                begin = 0;
-                Helpers.fillNil(context, values, 0, realLength);
-            } catch (ArrayIndexOutOfBoundsException e) {
-                throw concurrentModification(context, e);
-            }
-        }
-
-        realLength = 0;
-        return this;
-    }
-
-    @JRubyMethod
-    public IRubyObject fill(ThreadContext context, Block block) {
-        if (!block.isGiven()) throw argumentError(context, 0, 1);
-        return fillCommon(context, 0, realLength, block);
-    }
-
-    @JRubyMethod
-    public IRubyObject fill(ThreadContext context, IRubyObject arg, Block block) {
-        if (!block.isGiven()) return fillCommon(context, 0, realLength, arg);
-        if (arg instanceof RubyRange range) {
-            int[] beglen = range.begLenInt(context, realLength, 1);
-            return fillCommon(context, beglen[0], beglen[1], block);
-        }
-
-        int beg = fillBegin(context, arg);
-        return fillCommon(context, beg, fillLen(context, beg, null),  block);
-    }
-
-    @JRubyMethod
-    public IRubyObject fill(ThreadContext context, IRubyObject arg1, IRubyObject arg2, Block block) {
-        if (block.isGiven()) {
-            int beg = fillBegin(context, arg1);
-            return fillCommon(context, beg, fillLen(context, beg, arg2), block);
-        } else if (arg2 instanceof RubyRange range) {
-            int[] beglen = range.begLenInt(context, realLength, 1);
-            return fillCommon(context, beglen[0], beglen[1], arg1);
-        } else {
-            int beg = fillBegin(context, arg2);
-            return fillCommon(context, beg, fillLen(context, beg, null), arg1);
-        }
-    }
-
-    @JRubyMethod
-    public IRubyObject fill(ThreadContext context, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3, Block block) {
-        if (block.isGiven()) throw argumentError(context, 3, 2);
-
-        int beg = fillBegin(context, arg2);
-        return fillCommon(context, beg, fillLen(context, beg, arg3), arg1);
-    }
-
-    private int fillBegin(ThreadContext context, IRubyObject arg) {
-        int beg = arg.isNil() ? 0 : toInt(context, arg);
-        if (beg < 0) {
-            beg = realLength + beg;
-            if (beg < 0) beg = 0;
-        }
-        return beg;
-    }
-
-    private long fillLen(ThreadContext context, long beg, IRubyObject arg) {
-        return arg == null || arg.isNil() ? realLength - beg : toLong(context, arg);
-    }
-
-    protected IRubyObject fillCommon(ThreadContext context, int beg, long len, IRubyObject item) {
-        unpack(context);
-        modify(context);
-
-        if (len < 0) return this;
-
-        if (len > Integer.MAX_VALUE - beg) throw argumentError(context, "argument too big");
-
-        int end = (int)(beg + len);
-        if (end > realLength) {
-            resizeAndFillBackingArray(context, end);
-            realLength = end;
-        }
-
-        if (len > 0) {
-            try {
-                Arrays.fill(values, begin + beg, begin + end, item);
-            } catch (ArrayIndexOutOfBoundsException ex) {
-                throw concurrentModification(context, ex);
-            }
-        }
-
-        return this;
-    }
-
-    protected IRubyObject fillCommon(ThreadContext context, int beg, long len, Block block) {
-        unpack(context);
-        modify(context);
-
-        if (len < 0) return this;
-
-        if (len > Integer.MAX_VALUE - beg) throw argumentError(context, "argument too big");
-
-        int end = (int)(beg + len);
-        if (end > realLength) {
-            resizeAndFillBackingArray(context, end);
-            realLength = end;
-        }
-
-        for (int i = beg; i < end; i++) {
-            IRubyObject v = block.yield(context, asFixnum(context, i));
-            if (i >= realLength) break;
-            safeArraySet(context, values, begin + i, v);
-        }
-        return this;
-    }
-
-
-    /** rb_ary_index
-     *
-     */
-    public IRubyObject index(ThreadContext context, IRubyObject obj) {
-        for (int i = 0; i < realLength; i++) {
-            if (equalInternal(context, eltOk(i), obj)) return asFixnum(context, i);
-        }
-
-        return context.nil;
-    }
-
-    @JRubyMethod(name = {"index", "find_index"})
-    public IRubyObject index(ThreadContext context, IRubyObject obj, Block unused) {
-        if (unused.isGiven()) warn(context, "given block not used");
-        return index(context, obj);
-    }
-
-    @JRubyMethod(name = {"index", "find_index"})
-    public IRubyObject index(ThreadContext context, Block block) {
-        if (!block.isGiven()) return enumeratorize(context.runtime, this, "index");
-
-        for (int i = 0; i < realLength; i++) {
-            if (block.yield(context, eltOk(i)).isTrue()) return asFixnum(context, i);
-        }
-
-        return context.nil;
-    }
-
-    @JRubyMethod
-    public IRubyObject bsearch(ThreadContext context, Block block) {
-        if (!block.isGiven()) {
-            return enumeratorize(context.runtime, this, "bsearch");
-        }
-
-        int rVal = bsearch_index_internal(context, block);
-        if (rVal == -1) {
-            return context.nil;
-        } else {
-            return eltOk(rVal);
-        }
-    }
-
-    @JRubyMethod
-    public IRubyObject bsearch_index(ThreadContext context, Block block) {
-        if (!block.isGiven()) {
-            return enumeratorize(context.runtime, this, "bsearch_index");
-        }
-        int rVal = bsearch_index_internal(context, block);
-        if (rVal == -1) {
-            return context.nil;
-        } else {
-            return asFixnum(context, rVal);
-        }
-    }
-
-    private int bsearch_index_internal(ThreadContext context, Block block) {
-        Ruby runtime = context.runtime;
-
-        int low = 0, high = realLength, mid;
-        boolean smaller = false, satisfied = false;
-        IRubyObject v;
-        CallSite op_cmp = null;
-
-        while (low < high) {
-            mid = low + ((high - low) / 2);
-            v = block.yieldSpecific(context, eltOk(mid));
-
-            if (v instanceof RubyFixnum fixnum) {
-                long fixValue = fixnum.getValue();
-                if (fixValue == 0) return mid;
-                smaller = fixValue < 0;
-            } else if (v == context.tru) {
-                satisfied = true;
-                smaller = true;
-            } else if (v == context.fals || v == context.nil) {
-                smaller = false;
-            } else if (runtime.getNumeric().isInstance(v)) {
-                if (op_cmp == null) op_cmp = sites(context).op_cmp_bsearch;
-                var zero = asFixnum(context, 0);
-                switch (RubyComparable.cmpint(context, op_cmp.call(context, v, v, zero), v, zero)) {
-                    case 0: return mid;
-                    case 1: smaller = false; break;
-                    case -1: smaller = true;
-                }
-            } else {
-                throw typeError(context, "wrong argument type ", v, " (must be numeric, true, false or nil");
-            }
-            if (smaller) {
-                high = mid;
-            } else {
-                low = mid + 1;
-            }
-        }
-        if (low == realLength) return -1;
-        if (!satisfied) return -1;
-        return low;
-    }
-
-    /** rb_ary_rindex
-     *
-     */
-    public IRubyObject rindex(ThreadContext context, IRubyObject obj) {
-        unpack(context);
-        
-        int i = realLength;
-
-        while (i-- > 0) {
-            if (i > realLength) {
-                i = realLength;
-                continue;
-            }
-            if (equalInternal(context, eltOk(i), obj)) return asFixnum(context, i);
-        }
-
-        return context.nil;
-    }
-
-    @JRubyMethod
-    public IRubyObject rindex(ThreadContext context, IRubyObject obj, Block unused) {
-        if (unused.isGiven()) warn(context, "given block not used");
-        return rindex(context, obj);
-    }
-
-    @JRubyMethod
-    public IRubyObject rindex(ThreadContext context, Block block) {
-        if (!block.isGiven()) return enumeratorize(context.runtime, this, "rindex");
-
-        int i = realLength;
-
-        while (i-- > 0) {
-            if (i >= realLength) {
-                i = realLength;
-                continue;
-            }
-            if (block.yield(context, eltOk(i)).isTrue()) return asFixnum(context, i);
-        }
-
-        return context.nil;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject indexes(IRubyObject[] args) {
-        return indexes(getCurrentContext(), args);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject indexes(ThreadContext context, IRubyObject[] args) {
-        int argc = Arity.checkArgumentCount(context, args, 1, -1);
-
-        warn(context, "Array#indexes is deprecated; use Array#values_at");
-
-        if (argc == 1) return Create.newArray(context, args[0]);
-
-        RubyArray ary = newBlankArrayInternal(context.runtime, argc);
-
-        for (int i = 0; i < argc; i++) {
-            ary.storeInternal(context, i, aref(context, args[i]));
-        }
-        ary.realLength = argc;
-
-        return ary;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject reverse_bang() {
-        return reverse_bang(getCurrentContext());
-    }
-
-    /** rb_ary_reverse_bang
-     *
-     */
-    @JRubyMethod(name = "reverse!")
-    public IRubyObject reverse_bang(ThreadContext context) {
-        modify(context);
-
-        try {
-            if (realLength > 1) {
-                int len = realLength;
-                for (int i = 0; i < len >> 1; i++) {
-                    T tmp = eltInternal(i);
-                    eltInternalSet(i, eltInternal(len - i - 1));
-                    eltInternalSet(len - i - 1, tmp);
-                }
-            }
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(context, e);
-        }
-        return this;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject reverse() {
-        return reverse(getCurrentContext());
-    }
-
-    // MRI: rb_ary_reverse_m
-    @JRubyAPI
-    @JRubyMethod(name = "reverse")
-    public IRubyObject reverse(ThreadContext context) {
-        return realLength > 1 ? safeReverse() : aryDup();
-    }
-
-    protected RubyArray safeReverse() {
-        int length = realLength;
-        int myBegin = this.begin;
-        IRubyObject[] myValues = this.values;
-        IRubyObject[] vals = IRubyObject.array(length);
-
-        final Ruby runtime = metaClass.runtime;
-        try {
-            for (int i = 0; i <= length >> 1; i++) {
-                vals[i] = myValues[myBegin + length - i - 1];
-                vals[length - i - 1] = myValues[myBegin + i];
-            }
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(runtime.getCurrentContext(), e);
-        }
-        return new RubyArray(runtime, runtime.getArray(), vals);
-    }
-
-    /**
-     * Collect the contents of this array after filtering through block, or return a new equivalent array if the block
-     * is not given (!isGiven()).
-     *
-     * @param context the current context
-     * @param block a block for filtering or NULL_BLOCK
-     * @return an array of the filtered or unfiltered results
-     */
-    public RubyArray collectArray(ThreadContext context, Block block) {
-        if (!block.isGiven()) return makeShared();
-
-        RubyArray<?> ary = Create.allocArray(context, realLength);
-
-        for (int i = 0; i < realLength; i++) {
-            // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield (see JRUBY-5434)
-            // arr[i] = ...
-            ary.append(context, block.yieldNonArray(context, eltOk(i), null));
-        }
-
-        return ary;
-    }
-
-    /**
-     * Produce a new enumerator that will filter the contents of this array using {@link #collectArray(ThreadContext, Block)}.
-     *
-     * @param context the current context
-     * @return an enumerator that will filter results
-     */
-    public RubyEnumerator collectEnum(ThreadContext context) {
-        return enumWithSize(context, this, "collect", RubyArray::size);
-    }
-
-    /**
-     * @see #collectArray(ThreadContext, Block)
-     */
-    public RubyArray collect(ThreadContext context, Block block) {
-        return collectArray(context, block);
-    }
-
-    /** rb_ary_collect
-     *
-     */
-    @JRubyMethod(name = {"collect"})
-    public IRubyObject rbCollect(ThreadContext context, Block block) {
-        return block.isGiven() ? collectArray(context, block) : collectEnum(context);
-    }
-
-    @JRubyMethod(name = {"map"})
-    public IRubyObject map(ThreadContext context, Block block) {
-        return block.isGiven() ? collectArray(context, block) : enumeratorizeWithSize(context, this, "map", RubyArray::size);
-    }
-
-    /** rb_ary_collect_bang
-     *
-     */
-    public RubyArray collectBang(ThreadContext context, Block block) {
-        if (!block.isGiven()) throw context.runtime.newLocalJumpErrorNoBlock();
-        modify(context);
-
-        for (int i = 0; i < realLength; i++) {
-            // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield
-            // See JRUBY-5434
-            storeInternal(context, i, block.yield(context, eltOk(i)));
-        }
-
-        return this;
-    }
-
-    /** rb_ary_collect_bang
-    *
-    */
-    @JRubyMethod(name = "collect!")
-    public IRubyObject collect_bang(ThreadContext context, Block block) {
-        return block.isGiven() ? collectBang(context, block) : enumeratorizeWithSize(context, this, "collect!", RubyArray::size);
-    }
-
-    /** rb_ary_collect_bang
-    *
-    */
-    @JRubyMethod(name = "map!")
-    public IRubyObject map_bang(ThreadContext context, Block block) {
-        return block.isGiven() ? collectBang(context, block) : enumeratorizeWithSize(context, this, "map!", RubyArray::size);
-    }
-
-    /** rb_ary_select
-     *
-     */
-    public IRubyObject selectCommon(ThreadContext context, Block block) {
-        final Ruby runtime = context.runtime;
-
-        // Packed array logic
-        switch (realLength) {
-            case 1: {
-                IRubyObject value = eltOk(0);
-                if (block.yield(context, value).isTrue()) return new RubyArrayOneObject(runtime, value);
-                return newEmptyArray(runtime);
-            }
-            case 2: {
-                IRubyObject value = eltOk(0);
-                boolean first = block.yield(context, value).isTrue();
-                IRubyObject value2 = eltOk(1);
-                boolean second = block.yield(context, value2).isTrue();
-                if (first) {
-                    if (second) return newArray(runtime, value, value2);
-                    return newArray(runtime, value);
-                } else if (second) {
-                    return newArray(runtime, value2);
-                }
-                return newEmptyArray(runtime);
-            }
-        }
-
-        RubyArray<?> result = Create.allocArray(context, realLength);
-
-        for (int i = 0; i < realLength; i++) {
-            // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield (see JRUBY-5434)
-            IRubyObject value = eltOk(i);
-            if (block.yield(context, value).isTrue()) result.append(context, value);
-        }
-
-        return result;
-    }
-
-    @JRubyMethod(name = "select", alias = "filter")
-    public IRubyObject select(ThreadContext context, Block block) {
-        return block.isGiven() ? selectCommon(context, block) : enumeratorizeWithSize(context, this, "select", RubyArray::size);
-    }
-
-    @JRubyMethod(name = "select!", alias = "filter!")
-    public IRubyObject select_bang(ThreadContext context, Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "select!", RubyArray::size);
-
-        unpack(context);
-        modify(context);
-
-        boolean modified = false;
-        int len0 = 0, len1 = 0;
-
-        try {
-            int i1, i2;
-            for (i1 = i2 = 0; i1 < realLength; len0 = ++i1) {
-                // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield (see JRUBY-5434)
-                IRubyObject value = eltOk(i1);
-
-                if (!block.yield(context, value).isTrue()) {
-                    modified = true;
-                    continue;
-                }
-
-                if (i1 != i2) eltSetOk(i2, (T) value);
-                len1 = ++i2;
-            }
-            return (i1 == i2) ? context.nil : this;
-        }
-        finally {
-            if (modified) checkFrozen();
-            selectBangEnsure(context, len0, len1);
-        }
-    }
-
-    @JRubyMethod
-    public IRubyObject keep_if(ThreadContext context, Block block) {
-        if (!block.isGiven()) {
-            return enumeratorizeWithSize(context, this, "keep_if", RubyArray::size);
-        }
-        select_bang(context, block);
-        return this;
-    }
-
-    @JRubyMethod
-    public IRubyObject deconstruct(ThreadContext context) {
-        return this;
-    }
-
-    /** rb_ary_delete
-     *
-     */
-    @JRubyMethod
-    public IRubyObject delete(ThreadContext context, IRubyObject item, Block block) {
-        unpack(context);
-        int i2 = 0;
-        IRubyObject value = item;
-
-        for (int i1 = 0; i1 < realLength; i1++) {
-            // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from equalInternal (see JRUBY-5434)
-            IRubyObject e = safeArrayRef(context, values, begin + i1);
-            if (equalInternal(context, e, item)) {
-                value = e;
-                continue;
-            }
-            if (i1 != i2) store(i2, e);
-            i2++;
-        }
-
-        if (realLength == i2) return block.isGiven() ? block.yield(context, item) : context.nil;
-
-        modify(context);
-
-        final int myRealLength = this.realLength;
-        final int myBegin = this.begin;
-        final IRubyObject[] myValues = this.values;
-        try {
-            if (myRealLength > i2) {
-                Helpers.fillNil(context, myValues, myBegin + i2, myBegin + myRealLength);
-                this.realLength = i2;
-                int valuesLength = myValues.length - myBegin;
-                if (i2 << 1 < valuesLength && valuesLength > ARRAY_DEFAULT_SIZE) realloc(context, i2 << 1, valuesLength);
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-
-        return value;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject delete_at(int pos) {
-        return delete_at(getCurrentContext(), pos);
-    }
-
-    /** rb_ary_delete_at
-     *
-     */
-    public IRubyObject delete_at(ThreadContext context, int pos) {
-        int len = realLength;
-        if (pos >= len || (pos < 0 && (pos += len) < 0)) return context.nil;
-
-        unpack(context);
-        modify(context);
-
-        try {
-            IRubyObject obj = values[begin + pos];
-            // fast paths for head and tail
-            if (pos == 0) {
-                values[begin] = context.nil;
-                begin++;
-                realLength--;
-                return obj;
-            } else if (pos == realLength - 1) {
-                values[begin + realLength - 1] = context.nil;
-                realLength--;
-                return obj;
-            }
-
-            System.arraycopy(values, begin + pos + 1, values, begin + pos, len - (pos + 1));
-            values[begin + len - 1] = context.nil;
-            realLength--;
-
-            return obj;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(context, e);
-        }
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject delete_at(IRubyObject obj) {
-        return delete_at(getCurrentContext(), obj);
-    }
-
-    /** rb_ary_delete_at_m
-     *
-     */
-    @JRubyMethod(name = "delete_at")
-    public IRubyObject delete_at(ThreadContext context, IRubyObject obj) {
-        return delete_at(toInt(context, obj));
-    }
-
-    /** rb_ary_reject_bang
-     *
-     */
-    public final IRubyObject rejectCommon(ThreadContext context, Block block) {
-        var ary = Create.newArray(context);
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = eltOk(i);
-            if (!block.yieldSpecific(context, v).isTrue()) {
-                ary.push(context, v);
-            }
-        }
-        return ary;
-    }
-
-    @JRubyMethod
-    public IRubyObject reject(ThreadContext context, Block block) {
-        return block.isGiven() ? rejectCommon(context, block) : enumeratorizeWithSize(context, this, "reject", RubyArray::size);
-    }
-
-    // MRI: ary_reject_bang and reject_bang_i
-    public IRubyObject rejectBang(ThreadContext context, Block block) {
-        unpack(context);
-        modify(context);
-
-        final int beg = begin;
-        boolean modified = false;
-
-        int len0 = 0, len1 = 0;
-        try {
-            int i1, i2;
-            for (i1 = i2 = 0; i1 < realLength; len0 = ++i1) {
-                final IRubyObject[] values = this.values;
-                // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield (see JRUBY-5434)
-                IRubyObject value = safeArrayRef(context, values, beg + i1);
-
-                if (block.yield(context, value).isTrue()) {
-                    modified = true;
-                    continue;
-                }
-
-                if (i1 != i2) safeArraySet(context, values, beg + i2, value);
-
-                len1 = ++i2;
-            }
-
-            return (i1 == i2) ? context.nil : this;
-        } finally {
-            if (modified) checkFrozen();
-            selectBangEnsure(context, len0, len1);
-        }
-    }
-
-    // MRI: select_bang_ensure
-    private void selectBangEnsure(ThreadContext context, int i1, int i2) {
-        int len = realLength;
-
-        if (i2 < len && i2 < i1) {
-            int tail = 0;
-            int beg = begin;
-            if (i1 < len) {
-                tail = len - i1;
-                safeArrayCopy(context, values, beg + i1, values, beg + i2, tail);
-            }
-            else if (realLength > 0) {
-                // nil out left-overs to avoid leaks (MRI doesn't)
-                try {
-                    Helpers.fillNil(context, values, beg + i2, beg + i1);
-                } catch (ArrayIndexOutOfBoundsException ex) {
-                    throw concurrentModification(context, ex);
-                }
-            }
-            realLength = i2 + tail;
-        }
-    }
-
-    @JRubyMethod(name = "reject!")
-    public IRubyObject reject_bang(ThreadContext context, Block block) {
-        return block.isGiven() ? rejectBang(context, block) : enumeratorizeWithSize(context, this, "reject!", RubyArray::size);
-    }
-
-    /** rb_ary_delete_if
-     *
-     */
-    public IRubyObject deleteIf(ThreadContext context, Block block) {
-        rejectBang(context, block);
-        return this;
-    }
-
-    @JRubyMethod
-    public IRubyObject delete_if(ThreadContext context, Block block) {
-        return block.isGiven() ? deleteIf(context, block) : enumeratorizeWithSize(context, this, "delete_if", RubyArray::size);
-    }
-
-    /** rb_ary_zip
-     *
-     */
-    @JRubyMethod(optional = 1, rest = true, checkArity = false)
-    public IRubyObject zip(ThreadContext context, IRubyObject[] args, Block block) {
-        RubyClass array = arrayClass(context);
-        ArraySites sites = sites(context);
-
-        final IRubyObject[] newArgs = IRubyObject.array(args.length);
-
-        boolean hasUncoercible = false;
-        JavaSites.CheckedSites to_ary_checked = sites.to_ary_checked;
-        for (int i = 0; i < args.length; i++) {
-            newArgs[i] = TypeConverter.convertToType(context, args[i], array, to_ary_checked, false);
-            if (newArgs[i].isNil()) {
-                hasUncoercible = true;
-            }
-        }
-
-        // Handle uncoercibles by trying to_enum conversion
-        if (hasUncoercible) {
-            CallSite to_enum = sites.to_enum;
-            RubySymbol each = asSymbol(context, "each");
-            for (int i = 0; i < args.length; i++) {
-                IRubyObject arg = args[i];
-                if (!arg.respondsTo("each")) throw typeError(context, arg, "must respond to :each");
-                newArgs[i] = to_enum.call(context, arg, arg, each);
-            }
-        }
-
-        if (hasUncoercible) {
-            return zipCommon(context, newArgs, block, (ctx, arg, i) -> RubyEnumerable.zipEnumNext(ctx, arg));
-        } else {
-            return zipCommon(context, newArgs, block, (ctx, arg, i) -> ((RubyArray) arg).elt(i));
-        }
-    }
-
-    // This can be shared with RubyEnumerable to clean #zipCommon{Enum,Arg} a little
-    public static interface ArgumentVisitor {
-        IRubyObject visit(ThreadContext ctx, IRubyObject arg, int i);
-    }
-
-    private IRubyObject zipCommon(ThreadContext context, IRubyObject[] args, Block block, ArgumentVisitor visitor) {
-        if (block.isGiven()) {
-            for (int i = 0; i < realLength; i++) {
-                IRubyObject[] tmp = IRubyObject.array(addBufferLength(context, args.length, 1));
-                // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield
-                // See JRUBY-5434
-                tmp[0] = eltInternal(i);
-                for (int j = 0; j < args.length; j++) {
-                    tmp[j + 1] = visitor.visit(context, args[j], i);
-                }
-                block.yield(context, newArrayMayCopy(context.runtime, tmp));
-            }
-            return context.nil;
-        }
-
-        IRubyObject[] result = IRubyObject.array(realLength);
-        try {
-            for (int i = 0; i < realLength; i++) {
-                IRubyObject[] tmp = IRubyObject.array(addBufferLength(context, args.length, 1));
-                tmp[0] = eltInternal(i);
-                for (int j = 0; j < args.length; j++) {
-                    tmp[j + 1] = visitor.visit(context, args[j], i);
-                }
-                result[i] = newArrayMayCopy(context.runtime, tmp);
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-        return newArrayMayCopy(context.runtime, result);
-    }
-
-    /** rb_ary_cmp
-     *
-     */
-    @JRubyMethod(name = "<=>")
-    public IRubyObject op_cmp(ThreadContext context, IRubyObject obj) {
-        boolean isAnArray = (obj instanceof RubyArray) || obj.getMetaClass().getSuperClass() == arrayClass(context);
-
-        if (!isAnArray && !sites(context).respond_to_to_ary.respondsTo(context, obj, obj, true)) {
-            return context.nil;
-        }
-
-        RubyArray ary2;
-        if (!isAnArray) {
-            ary2 = (RubyArray) sites(context).to_ary.call(context, obj, obj);
-        } else {
-            ary2 = obj.convertToArray();
-        }
-
-        return cmpCommon(context, ary2);
-    }
-
-    private IRubyObject cmpCommon(ThreadContext context, RubyArray ary2) {
-        if (this == ary2 || context.runtime.isInspecting(this)) return asFixnum(context, 0);
-
-        try {
-            context.runtime.registerInspecting(this);
-
-            int len = realLength;
-            if (len > ary2.realLength) len = ary2.realLength;
-
-            CallSite cmp = sites(context).cmp;
-            for (int i = 0; i < len; i++) {
-                IRubyObject elt = elt(i);
-                IRubyObject v = cmp.call(context, elt, elt, ary2.elt(i));
-                if (!(v instanceof RubyFixnum fixnum) || fixnum.getValue() != 0) return v;
-            }
-        } finally {
-            context.runtime.unregisterInspecting(this);
-        }
-
-        int len = realLength - ary2.realLength;
-        int cmpValue = len == 0 ? 0 : (len > 0 ? 1 : -1);   // -1 ... 0 ... 1
-        return asFixnum(context, cmpValue);
-    }
-
-    /**
-     * Variable arity version for compatibility. Not bound to a Ruby method.
-     * @deprecated Use the versions with zero, one, or two args.
-     */
-    @Deprecated(since = "9.4-")
-    public IRubyObject slice_bang(IRubyObject[] args) {
-        switch (args.length) {
-        case 1:
-            return slice_bang(args[0]);
-        case 2:
-            return slice_bang(args[0], args[1]);
-        default:
-            Arity.raiseArgumentError(getCurrentContext(), args.length, 1, 2);
-            return null; // not reached
-        }
-    }
-
-    private IRubyObject slice_internal(ThreadContext context, int pos, int len) {
-        if (len < 0) return context.nil;
-        int orig_len = realLength;
-        if (pos < 0) {
-            pos += orig_len;
-            if (pos < 0) return context.nil;
-        }
-
-        if (orig_len < pos) return context.nil;
-        if (orig_len < pos + len) len = orig_len - pos;
-
-        if (len == 0) return Create.newEmptyArray(context);
-
-        unpack(context);
-
-        var result = makeShared(context, begin + pos, len, arrayClass(context));
-        splice(context, pos, len, null, 0);
-
-        return result;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject slice_bang(IRubyObject arg0) {
-        return slice_bang(getCurrentContext(), arg0);
-    }
-
-        /** rb_ary_slice_bang
-         *
-         */
-    @JRubyMethod(name = "slice!")
-    public IRubyObject slice_bang(ThreadContext context, IRubyObject arg0) {
-        modifyCheck(context);
-
-        if (arg0 instanceof RubyRange range) {
-            if (!range.checkBegin(context, realLength)) return context.nil;
-
-            int pos = checkInt(context, range.begLen0(context, realLength));
-            int len = checkInt(context, range.begLen1(context, realLength, pos));
-            return slice_internal(context, pos, len);
-        }
-        return delete_at(toInt(context, arg0));
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject slice_bang(IRubyObject arg0, IRubyObject arg1) {
-        return slice_bang(getCurrentContext(), arg0, arg1);
-    }
-
-    /** rb_ary_slice_bang
-    *
-    */
-    @JRubyMethod(name = "slice!")
-    public IRubyObject slice_bang(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
-        modifyCheck(context);
-
-        return slice_internal(context, toInt(context, arg0), toInt(context, arg1));
-    }
-
-    /** rb_ary_assoc
-     *
-     */
-    @JRubyMethod(name = "assoc")
-    public IRubyObject assoc(ThreadContext context, IRubyObject key) {
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = TypeConverter.checkArrayType(context, sites(context).to_ary_checked, eltOk(i));
-            if (v instanceof RubyArray arr && arr.size() > 0) {
-                if (arr.realLength > 0 && equalInternal(context, arr.elt(0), key)) return arr;
-            }
-        }
-
-        return context.nil;
-    }
-
-    /** rb_ary_rassoc
-     *
-     */
-    @JRubyMethod(name = "rassoc")
-    public IRubyObject rassoc(ThreadContext context, IRubyObject value) {
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = TypeConverter.checkArrayType(context, sites(context).to_ary_checked, eltOk(i));
-            if (v instanceof RubyArray) {
-                RubyArray arr = (RubyArray)v;
-                if (arr.realLength > 1 && equalInternal(context, arr.eltOk(1), value)) return arr;
-            }
-        }
-
-        return context.nil;
-    }
-
-    // MRI array.c flatten
-    protected boolean flatten(ThreadContext context, final int level, final RubyArray result) {
-        // TODO: (CON) We can flatten packed versions efficiently if length does not change (e.g. [[1,2],[]])
-        unpack(context);
-
-        IRubyObject tmp = null;
-        int i = 0;
-        for (; i < realLength; i++) {
-            IRubyObject elt = eltOk(i);
-            tmp = TypeConverter.checkArrayType(context.runtime, elt);
-            if (!tmp.isNil()) break;
-        }
-
-        safeArrayCopy(context, values, begin, result.values, result.begin, i);
-        result.realLength = i;
-
-        if (i == realLength) return false;
-
-        Stack<Object> stack = new Stack<>();
-        stack.push(this);
-        stack.push(i + 1);
-        IdentityHashMap<RubyArray, IRubyObject> memo; // used as an IdentityHashSet
-
-        RubyArray ary = (RubyArray) tmp;
-
-        if (level < 0) {
-            memo = new IdentityHashMap<>(4 + 1);
-            memo.put(this, NEVER);
-            memo.put((RubyArray) tmp, NEVER);
-        } else {
-            memo = null;
-        }
-
-        i = 0;
-
-        try {
-            while (true) {
-                while (i < ary.realLength) {
-                    IRubyObject elt = ary.eltOk(i++);
-                    if (level >= 0 && stack.size() / 2 >= level) {
-                        result.append(context, elt);
-                        continue;
-                    }
-                    tmp = TypeConverter.checkArrayType(context, elt);
-                    if (tmp.isNil()) {
-                        result.append(context, elt);
-                    } else { // nested array element
-                        if (memo != null) {
-                            if (memo.get(tmp) != null) throw argumentError(context, "tried to flatten recursive array");
-                            memo.put(ary, NEVER);
-                        }
-                        stack.push(ary);
-                        stack.push(i); // add (ary, i) pair
-                        ary = (RubyArray) tmp;
-                        i = 0;
-                    }
-                }
-                if (stack.isEmpty()) break;
-                if (memo != null) memo.remove(ary);
-
-                i = (Integer) stack.pop();
-                ary = (RubyArray) stack.pop();
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-
-        return stack != null;
-    }
-
-    @JRubyMethod(name = "flatten!")
-    public IRubyObject flatten_bang(ThreadContext context) {
-        unpack(context);
-        modifyCheck(context);
-
-        RubyArray result = new RubyArray(context.runtime, getType(), realLength);
-        if (flatten(context, -1, result)) {
-            modifyCheck(context);
-            isShared = false;
-            begin = 0;
-            realLength = result.realLength;
-            values = result.values;
-            return this;
-        }
-        return context.nil;
-    }
-
-    @JRubyMethod(name = "flatten!")
-    public IRubyObject flatten_bang(ThreadContext context, IRubyObject arg) {
-        unpack(context);
-        modifyCheck(context);
-
-        int level = toInt(context, arg);
-        if (level == 0) return context.nil;
-
-        RubyArray result = new RubyArray(context.runtime, getType(), realLength);
-        if (flatten(context, level, result)) {
-            isShared = false;
-            begin = 0;
-            realLength = result.realLength;
-            values = result.values;
-            return this;
-        }
-        return context.nil;
-    }
-
-    @JRubyMethod(name = "flatten")
-    public IRubyObject flatten(ThreadContext context) {
-        var result = newArray(context, realLength);
-        flatten(context, -1, result);
-        return result;
-    }
-
-    @JRubyMethod(name = "flatten")
-    public IRubyObject flatten(ThreadContext context, IRubyObject arg) {
-        int level = toInt(context, arg);
-        if (level == 0) return makeShared();
-
-        RubyArray result = newArray(context, realLength);
-        flatten(context, level, result);
-        return result;
-    }
-
-    @JRubyMethod(name = "count")
-    public IRubyObject count(ThreadContext context, Block block) {
-        if (block.isGiven()) {
-            int n = 0;
-            for (int i = 0; i < realLength; i++) {
-                if (block.yield(context, elt(i)).isTrue()) n++;
-            }
-            return asFixnum(context, n);
-        } else {
-            return asFixnum(context, realLength);
-        }
-    }
-
-    @JRubyMethod(name = "count")
-    public IRubyObject count(ThreadContext context, IRubyObject obj, Block block) {
-        if (block.isGiven()) warn(context, "given block not used");
-
-        int n = 0;
-        for (int i = 0; i < realLength; i++) {
-            if (equalInternal(context, elt(i), obj)) n++;
-        }
-        return asFixnum(context, n);
-    }
-
-    /** rb_ary_nitems
-     *
-     */
-    @JRubyMethod(name = "nitems")
-    public IRubyObject nitems(ThreadContext context) {
-        int n = 0;
-
-        for (int i = 0; i < realLength; i++) {
-            if (!eltOk(i).isNil()) n++;
-        }
-
-        return asFixnum(context, n);
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject nitems() {
-        return nitems(getCurrentContext());
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject op_plus(IRubyObject obj) {
-        return op_plus(getCurrentContext(), obj);
-    }
-
-    /** rb_ary_plus
-     *
-     */
-    @JRubyMethod(name = "+")
-    public IRubyObject op_plus(ThreadContext context, IRubyObject obj) {
-        RubyArray y = obj.convertToArray();
-        int len = realLength + y.realLength;
-
-        switch (len) {
-            case 1:
-                return new RubyArrayOneObject(context.runtime, realLength == 1 ? eltInternal(0) : y.eltInternal(0));
-            case 2:
-                switch (realLength) {
-                    case 0:
-                        return newArray(context.runtime, y.eltInternal(0), y.eltInternal(1));
-                    case 1:
-                        return newArray(context.runtime, eltInternal(0), y.eltInternal(0));
-                    case 2:
-                        return newArray(context.runtime, eltInternal(0), eltInternal(1));
-                }
-        }
-
-        RubyArray<?> z = Create.allocArray(context, len);
-        try {
-            copyInto(context, z.values, 0);
-            y.copyInto(context, z.values, realLength);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(context, e);
-        }
-        z.realLength = len;
-        return z;
-    }
-
-    /** rb_ary_times
-     *
-     */
-    @JRubyMethod(name = "*")
-    public IRubyObject op_times(ThreadContext context, IRubyObject times) {
-        IRubyObject tmp = times.checkStringType();
-
-        if (!tmp.isNil()) return join(context, tmp);
-
-        long len = toLong(context, times);
-        if (len == 0) return RubyArray.newEmptyArray(context.runtime);
-        if (len < 0) throw argumentError(context, "negative argument");
-        if (Long.MAX_VALUE / len < realLength) throw argumentError(context, "argument too big");
-
-        len *= realLength;
-
-        RubyArray<?> ary2 = Create.allocArray(context, len);
-        ary2.realLength = ary2.values.length;
-
-        try {
-            for (int i = 0; i < len; i += realLength) {
-                copyInto(context, ary2.values, i);
-            }
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(context, e);
-        }
-
-        return ary2;
-    }
-
-    /** ary_make_hash
-     *
-     */
-    private RubyHash makeHash(Ruby runtime) {
-        return makeHash(new RubyHash(runtime, Math.min(realLength, 128), false));
-    }
-
-    private RubyHash makeHash(RubyHash hash) {
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = elt(i);
-            hash.internalPutIfNoKey(v, v);
-        }
-        return hash;
-    }
-
-    private RubyHash makeHash(ThreadContext context, Block block) {
-        return makeHash(context, new RubyHash(context.runtime, Math.min(realLength, 128), false), block);
-    }
-
-    private RubyHash makeHash(ThreadContext context, RubyHash hash, Block block) {
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = elt(i);
-            IRubyObject k = block.yield(context, v);
-            hash.internalPutIfNoKey(k, v);
-        }
-        return hash;
-    }
-
-    private void setValuesFrom(ThreadContext context, RubyHash hash) {
-        try {
-            hash.visitAll(context, RubyHash.SetValueVisitor, this);
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-    }
-
-    private void clearValues(ThreadContext context, final int from, final int to) {
-        try {
-            Helpers.fillNil(context, values, begin + from, begin + to);
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-    }
-
-    /** rb_ary_uniq_bang
-     *
-     */
-    public IRubyObject uniq_bang(ThreadContext context) {
-        final RubyHash hash = makeHash(context.runtime);
-        final int newLength = hash.size;
-        if (realLength == newLength) return context.nil;
-
-        modify(context); // in case array isShared
-        unpack(context);
-
-        setValuesFrom(context, hash);
-        clearValues(context, newLength, realLength);
-        realLength = newLength;
-
-        return this;
-    }
-
-    @JRubyMethod(name = "uniq!")
-    public IRubyObject uniq_bang(ThreadContext context, Block block) {
-        modifyCheck(context);
-
-        if (!block.isGiven()) return uniq_bang(context);
-
-        final RubyHash hash = makeHash(context, block);
-        final int newLength = hash.size;
-        if (realLength == newLength) return context.nil;
-
-        // after evaluating the block, a new modify check is needed
-        modify(context); // in case array isShared
-        unpack(context);
-
-        setValuesFrom(context, hash);
-        clearValues(context, newLength, realLength);
-        realLength = newLength;
-
-        return this;
-    }
-
-    /** rb_ary_uniq
-     *
-     */
-    public IRubyObject uniq(ThreadContext context) {
-        RubyHash hash = makeHash(context.runtime);
-        final int newLength = hash.size;
-        if (realLength == newLength) return makeShared();
-
-        RubyArray result = newBlankArrayInternal(context.runtime, arrayClass(context), newLength);
-        result.setValuesFrom(context, hash);
-        result.realLength = newLength;
-        return result;
-    }
-
-    @JRubyMethod(name = "uniq")
-    public IRubyObject uniq(ThreadContext context, Block block) {
-        if (!block.isGiven()) return uniq(context);
-        RubyHash hash = makeHash(context, block);
-        final int newLength = hash.size;
-        if (realLength == newLength) return makeShared();
-
-        RubyArray result = newBlankArrayInternal(context.runtime, arrayClass(context), newLength);
-        result.setValuesFrom(context, hash);
-        result.realLength = newLength;
-        return result;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject op_diff(IRubyObject other) {
-        return op_diff(getCurrentContext(), other);
-    }
-    /** rb_ary_diff
-     *
-     */
-    @JRubyMethod(name = "-")
-    public IRubyObject op_diff(ThreadContext context, IRubyObject other) {
-        final int len = realLength;
-        RubyArray<?> res = newBlankArrayInternal(context.runtime, len);
-
-        int index = 0;
-        RubyHash hash = other.convertToArray().makeHash(context.runtime);
-        for (int i = 0; i < len; i++) {
-            IRubyObject val = eltOk(i);
-            if (hash.fastARef(val) == null) res.storeInternal(context, index++, val);
-        }
-
-        // if index is 1 and we made a size 2 array, repack
-        if (index == 0) return newEmptyArray(context.runtime);
-        if (index == 1 && len == 2) return newArray(context.runtime, res.eltInternal(0));
-
-        assert index == res.realLength;
-        if (!(res instanceof RubyArraySpecialized)) {
-            Helpers.fillNil(context, res.values, index, res.values.length);
-        }
-
-        return res;
-    }
-
-    /** rb_ary_difference_multi
-     *
-     */
-    @JRubyMethod(name = "difference", rest = true)
-    public IRubyObject difference(ThreadContext context, IRubyObject[] args) {
-        BitSet isHash = new BitSet(args.length);
-        RubyArray[] arrays = new RubyArray[args.length];
-        RubyHash[] hashes = new RubyHash[args.length];
-
-        var diff = Create.newArray(context);
-
-        for (int i = 0; i < args.length; i++) {
-            arrays[i] = args[i].convertToArray();
-            isHash.set(i, (realLength > ARRAY_DEFAULT_SIZE && arrays[i].realLength > ARRAY_DEFAULT_SIZE));
-            if (isHash.get(i)) hashes[i] = arrays[i].makeHash(context.runtime);
-        }
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject elt = elt(i);
-            int j;
-            for (j = 0; j < args.length; j++) {
-                if (isHash.get(j)) {
-                    if (hashes[j].fastARef(elt) != null) break;
-                } else {
-                    if (arrays[j].includesByEql(context, elt)) break;
-                }
-            }
-            if (j == args.length) diff.append(context, elt);
-        }
-
-        return diff;
-    }
-
-    @JRubyMethod(rest = true)
-    public IRubyObject intersection(ThreadContext context, IRubyObject[] args) {
-        RubyArray result = aryDup();
-
-        for (IRubyObject arg: args) {
-            result = (RubyArray) result.op_and(arg);
-        }
-
-        return result;
-    }
-
-    /** MRI: rb_ary_intersect_p
-     *
-     */
-    @JRubyMethod(name = "intersect?")
-    public IRubyObject intersect_p(ThreadContext context, IRubyObject other) {
-
-        RubyArray ary2 = other.convertToArray();
-        final int len = realLength;
-
-        if (len == 0 || ary2.realLength == 0) return context.fals;
-
-        if (len <= SMALL_ARRAY_LEN && ary2.realLength <= SMALL_ARRAY_LEN) {
-            for (int i = 0; i < len; i++) {
-                if (ary2.includesByEql(context, elt(i))) return context.tru;
-            }
-            return context.fals;
-        }
-
-        RubyArray shorter = this;
-        RubyArray longer = ary2;
-
-        if (len > ary2.realLength) {
-            longer = this;
-            shorter = ary2;
-        }
-
-        RubyHash hash = shorter.makeHash(context.runtime);
-        for (int i = 0; i < longer.realLength; i++) {
-            IRubyObject val = longer.eltOk(i);
-            if (hash.fastARef(val) != null) return context.tru;
-        }
-
-        return context.fals;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject op_and(IRubyObject other) {
-        return op_and(getCurrentContext(), other);
-    }
-
-    /** MRI: rb_ary_and
-     *
-     */
-    @JRubyMethod(name = "&")
-    public IRubyObject op_and(ThreadContext context, IRubyObject other) {
-        RubyArray<?> ary2 = other.convertToArray();
-
-        final int len = realLength;
-        int maxSize = len < ary2.realLength ? len : ary2.realLength;
-        RubyArray res;
-        switch (maxSize) {
-            case 0:
-                return newEmptyArray(context.runtime);
-            case 1:
-                if (len == 0 || ary2.realLength == 0) return newEmptyArray(context.runtime);
-            default:
-                res = newBlankArrayInternal(context.runtime, maxSize);
-                break;
-        }
-
-        int index = 0;
-        RubyHash hash = ary2.makeHash(context.runtime);
-        for (int i = 0; i < len; i++) {
-            IRubyObject val = elt(i);
-            if (hash.fastDelete(val)) res.storeInternal(context, index++, val);
-        }
-
-        // if index is 1 and we made a size 2 array, repack
-        if (index == 0) return Create.newEmptyArray(context);
-        if (index == 1 && maxSize == 2) return Create.newArray(context, res.eltInternal(0));
-
-        assert index == res.realLength;
-        if (!(res instanceof RubyArraySpecialized)) {
-            Helpers.fillNil(context, res.values, index, res.values.length);
-        }
-
-        return res;
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    public IRubyObject op_or(IRubyObject other) {
-        return op_or(getCurrentContext(), other);
-    }
-
-    /** rb_ary_or
-     *
-     */
-    @JRubyMethod(name = "|")
-    public IRubyObject op_or(ThreadContext context, IRubyObject other) {
-        RubyArray ary2 = other.convertToArray();
-
-        int maxSize = realLength + ary2.realLength;
-        if (maxSize == 0) return Create.newEmptyArray(context);
-
-        RubyHash set = ary2.makeHash(makeHash(context.runtime));
-        RubyArray res = newBlankArrayInternal(context.runtime, set.size);
-        res.setValuesFrom(context, set);
-        res.realLength = set.size;
-
-        int index = res.realLength;
-        // if index is 1 and we made a size 2 array, repack
-        if (index == 1 && maxSize == 2) return Create.newArray(context, res.eltInternal(0));
-
-        return res;
-    }
-
-    /** rb_ary_union_multi
-     *
-     */
-    @JRubyMethod(name = "union", rest = true)
-    public IRubyObject union(ThreadContext context, IRubyObject[] args) {
-        RubyArray[] arrays = new RubyArray[args.length];
-        RubyArray result;
-
-        int maxSize = realLength;
-        for (int i = 0; i < args.length; i++) {
-            arrays[i] = args[i].convertToArray();
-            maxSize += arrays[i].realLength;
-        }
-        if (maxSize == 0) return Create.newEmptyArray(context);
-
-        if (maxSize <= ARRAY_DEFAULT_SIZE) {
-            result = Create.newArray(context);
-
-            result.unionInternal(context, this);
-            result.unionInternal(context, arrays);
-
-            return result;
-        }
-
-        RubyHash set = makeHash(context.runtime);
-
-        for (int i = 0; i < arrays.length; i++) {
-            for (int j = 0; j < arrays[i].realLength; j++) {
-                set.fastASet(arrays[i].elt(j), NEVER);
-            }
-        }
-
-        result = set.keys();
-        return result;
-    }
-
-    /** rb_ary_union
-     *
-     */
-    private void unionInternal(ThreadContext context, RubyArray... args) {
-        for (int i = 0; i < args.length; i++) {
-            for (int j = 0; j < args[i].realLength; j++) {
-                IRubyObject elt = args[i].elt(j);
-                if (includesByEql(context, elt)) continue;
-                append(context, elt);
-            }
-        }
-    }
-
-    /** rb_ary_sort
-     *
-     */
-    @JRubyMethod(name = "sort")
-    public RubyArray sort(ThreadContext context, Block block) {
-        RubyArray ary = aryDup();
-        ary.sort_bang(context, block);
-        return ary;
-    }
-
-    /** rb_ary_sort_bang
-     *
-     */
-    @JRubyMethod(name = "sort!")
-    public IRubyObject sort_bang(ThreadContext context, Block block) {
-        modify(context);
-        if (realLength > 1) {
-            return block.isGiven() ? sortInternal(context, block) : sortInternal(context, true);
-        }
-        return this;
-    }
-
-    protected IRubyObject sortInternal(final ThreadContext context, final boolean honorOverride) {
-        try {
-            Arrays.sort(values, begin, begin + realLength, new DefaultComparator(context, honorOverride) {
-                protected int compareGeneric(IRubyObject o1, IRubyObject o2) {
-                    int result = super.compareGeneric(o1, o2);
-                    modifyCheck(context);
-                    return result;
-                }
-            });
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-        return this;
-    }
-
-    // @Deprecated(since = "9.2.0.0")
-    protected static int compareFixnums(RubyFixnum o1, RubyFixnum o2) {
-        return DefaultComparator.compareInteger(o1, o2);
-    }
-
-    // @Deprecated(since = "9.2.0.0")
-    protected static int compareOthers(ThreadContext context, IRubyObject o1, IRubyObject o2) {
-        return DefaultComparator.compareGeneric(context, o1, o2);
-    }
-
-    public static class DefaultComparator implements Comparator<IRubyObject> {
-
-        final ThreadContext context;
-
-        private final boolean fixnumBypass;
-        private final boolean stringBypass;
-
-        public DefaultComparator(ThreadContext context) {
-            this(context, true);
-        }
-
-        DefaultComparator(ThreadContext context, final boolean honorOverride) {
-            this.context = context;
-            if ( honorOverride && context != null ) {
-                this.fixnumBypass = !honorOverride || Builtins.checkIntegerCmp(context);
-                this.stringBypass = !honorOverride || Builtins.checkStringCmp(context);
-            }
-            else { // no-opt
-                this.fixnumBypass = false;
-                this.stringBypass = false;
-            }
-        }
-
-        /*
-        DefaultComparator(ThreadContext context, final boolean fixnumBypass, final boolean stringBypass) {
-            this.context = context;
-            this.fixnumBypass = fixnumBypass;
-            this.stringBypass = stringBypass;
-        } */
-
-        public int compare(IRubyObject obj1, IRubyObject obj2) {
-            if (fixnumBypass && obj1 instanceof RubyFixnum fix1 && obj2 instanceof RubyFixnum fix2) {
-                return compareInteger(fix1, fix2);
-            }
-            if (stringBypass && obj1 instanceof RubyString str1 && obj2 instanceof RubyString str2) {
-                return compareString(str1, str2);
-            }
-            return compareGeneric(obj1, obj2);
-        }
-
-        protected int compareGeneric(IRubyObject o1, IRubyObject o2) {
-            final ThreadContext context = context();
-            return compareGeneric(context, sites(context).op_cmp_sort, o1, o2);
-        }
-
-        protected ThreadContext context() {
-            return context;
-        }
-
-        public static int compareInteger(RubyFixnum o1, RubyFixnum o2) {
-            long a = o1.getValue();
-            long b = o2.getValue();
-            return a > b ? 1 : a == b ? 0 : -1;
-        }
-
-        public static int compareString(RubyString o1, RubyString o2) {
-            return o1.op_cmp(o2);
-        }
-
-        public static int compareGeneric(ThreadContext context, IRubyObject o1, IRubyObject o2) {
-            return compareGeneric(context, sites(context).op_cmp_sort, o1, o2);
-        }
-
-        public static int compareGeneric(ThreadContext context, CallSite op_cmp_sort, IRubyObject o1, IRubyObject o2) {
-            IRubyObject ret = op_cmp_sort.call(context, o1, o1, o2);
-            return RubyComparable.cmpint(context, ret, o1, o2);
-        }
-
-    }
-
-    static class BlockComparator implements Comparator<IRubyObject> {
-
-        final ThreadContext context;
-
-        protected final Block block;
-        protected final IRubyObject self;
-
-        private final CallSite gt;
-        private final CallSite lt;
-
-        BlockComparator(ThreadContext context, Block block, CallSite gt, CallSite lt) {
-            this(context, block, null, gt, lt);
-        }
-
-        BlockComparator(ThreadContext context, Block block, IRubyObject self, CallSite gt, CallSite lt) {
-            this.context = context == null ? self.getRuntime().getCurrentContext() : context;
-            this.block = block; this.self = self;
-            this.gt = gt; this.lt = lt;
-        }
-
-        public int compare(IRubyObject obj1, IRubyObject obj2) {
-            return RubyComparable.cmpint(context, gt, lt, yieldBlock(obj1, obj2), obj1, obj2);
-        }
-
-        protected final IRubyObject yieldBlock(IRubyObject obj1, IRubyObject obj2) {
-            return block.yieldArray(context, Create.newArray(context, obj1, obj2), self);
-        }
-
-        protected final ThreadContext context() {
-            return context;
-        }
+                Arity.raiseArgumentError(getCurrentContext(), args.length, 0, 1);
+                yield null;
+            }
+        };
+    }
 
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject last() {
+        return last(getCurrentContext());
     }
 
-    protected IRubyObject sortInternal(final ThreadContext context, final Block block) {
-        // block code can modify, so we need to iterate
-        unpack(context);
-        IRubyObject[] newValues = IRubyObject.array(realLength);
-        int length = realLength;
-
-        copyInto(context, newValues, 0);
-        CallSite gt = sites(context).op_gt_sort;
-        CallSite lt = sites(context).op_lt_sort;
-        Arrays.sort(newValues, 0, length, new BlockComparator(context, block, gt, lt) {
-            @Override
-            public int compare(IRubyObject obj1, IRubyObject obj2) {
-                int result = super.compare(obj1, obj2);
-                modifyCheck(context);
-                return result;
-            }
-        });
+    @JRubyAPI
+    @JRubyMethod(name = "last")
+    public abstract IRubyObject last(ThreadContext context);
 
-        values = newValues;
-        begin = 0;
-        realLength = length;
-        return this;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject last(IRubyObject arg0) {
+        return last(getCurrentContext(), arg0);
     }
 
-    /** rb_ary_sort_by_bang
-     *
-     */
-    @JRubyMethod(name = "sort_by!")
-    public IRubyObject sort_by_bang(ThreadContext context, Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "sort_by!", RubyArray::size);
+    @JRubyMethod(name = "last")
+    public abstract IRubyObject last(ThreadContext context, IRubyObject arg0);
 
-        modifyCheck(context);
+    @JRubyMethod
+    public abstract IRubyObject each(ThreadContext context, Block block);
 
-        RubyArray sorted = sites(context).sort_by.call(context, this, this, block).convertToArray();
+    public abstract IRubyObject eachSlice(ThreadContext context, int size, Block block);
 
-        replace(sorted);
+    @JRubyMethod
+    public abstract IRubyObject each_slice(ThreadContext context, IRubyObject arg, Block block);
 
-        return this;
-    }
+    @JRubyMethod
+    public abstract IRubyObject each_index(ThreadContext context, Block block);
 
-    /** rb_ary_take
-     *
-     */
-    @JRubyMethod(name = "take")
-    public IRubyObject take(ThreadContext context, IRubyObject n) {
-        long len = toLong(context, n);
-        if (len < 0) throw argumentError(context, "attempt to take negative size");
+    @JRubyMethod
+    public abstract IRubyObject reverse_each(ThreadContext context, Block block);
 
-        return subseq(0, len);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject join19(final ThreadContext context, IRubyObject sep) {
+        return join(context, sep);
     }
 
-    /** rb_ary_take_while
-     *
-     */
-    @JRubyMethod(name = "take_while")
-    public IRubyObject take_while(ThreadContext context, Block block) {
-        if (!block.isGiven()) return enumeratorize(context.runtime, this, "take_while");
+    @JRubyMethod(name = "join")
+    public abstract IRubyObject join(final ThreadContext context, IRubyObject sep);
 
-        int i = 0;
-        for (; i < realLength; i++) {
-            if (!block.yield(context, eltOk(i)).isTrue()) break;
-        }
-        return subseq(0, i);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject join19(ThreadContext context) {
+        return join(context);
     }
 
-    /** rb_ary_take
-     *
-     */
-    @JRubyMethod(name = "drop")
-    public IRubyObject drop(ThreadContext context, IRubyObject n) {
-        long pos = toLong(context, n);
-        if (pos < 0) throw argumentError(context, "attempt to drop negative size");
-
-        IRubyObject result = subseq(pos, realLength);
-        return result.isNil() ? Create.newEmptyArray(context) : result;
-    }
+    @JRubyMethod(name = "join")
+    public abstract IRubyObject join(ThreadContext context);
 
-    /** rb_ary_take_while
-     *
-     */
-    @JRubyMethod(name = "drop_while")
-    public IRubyObject drop_while(ThreadContext context, Block block) {
-        if (!block.isGiven()) return enumeratorize(context.runtime, this, "drop_while");
+    @JRubyMethod(name = "to_a")
+    @Override
+    public abstract RubyArray to_a(ThreadContext context);
 
-        int i = 0;
-        for (; i < realLength; i++) {
-            if (!block.yield(context, eltOk(i)).isTrue()) break;
-        }
-        IRubyObject result = subseq(i, realLength);
-        return result.isNil() ? Create.newEmptyArray(context) : result;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject to_ary() {
+        return this;
     }
 
-    /** rb_ary_cycle
-     *
-     */
-    @JRubyMethod(name = "cycle")
-    public IRubyObject cycle(ThreadContext context, Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "cycle", RubyArray::cycleSize);
-        return cycleCommon(context, -1, block);
+    @JRubyMethod(name = "to_ary")
+    public final IRubyObject to_ary(ThreadContext context) {
+    	return this;
     }
 
-    /** rb_ary_cycle
-     *
-     */
-    @JRubyMethod(name = "cycle")
-    public IRubyObject cycle(ThreadContext context, IRubyObject arg, Block block) {
-        if (arg.isNil()) return cycle(context, block);
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "cycle", new IRubyObject[] {arg}, RubyArray::cycleSize);
-
-        long times = toLong(context, arg);
-        return times <= 0 ?
-                context.nil :
-                cycleCommon(context, times, block);
-    }
+    @JRubyMethod(name = "to_h")
+    public abstract IRubyObject to_h(ThreadContext context, Block block);
 
-    private IRubyObject cycleCommon(ThreadContext context, long n, Block block) {
-        while (realLength > 0 && (n < 0 || 0 < n--)) {
-            for (int i = 0; i < realLength; i++) {
-                block.yield(context, eltOk(i));
-            }
-        }
-        return context.nil;
+    @Override
+    public final RubyArray convertToArray() {
+        return this;
     }
 
-    /**
-     * A cycle size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
-     *
-     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
-     */
-    private static IRubyObject cycleSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
-        if (self.realLength == 0) return asFixnum(context, 0);
-
-        IRubyObject n = args != null && args.length > 0 ? args[0] : context.nil;
-
-        if (n == null || n.isNil()) return asFloat(context, RubyFloat.INFINITY);
+    @Override
+    public final IRubyObject checkArrayType(){
+        return this;
+    }
 
-        long multiple = toLong(context, n);
-        if (multiple <= 0) return asFixnum(context, 0);
+    @JRubyMethod(name = "==")
+    @Override
+    public abstract IRubyObject op_equal(ThreadContext context, IRubyObject obj);
 
-        RubyFixnum length = self.length(context);
-        return sites(context).op_times.call(context, length, length, asFixnum(context, multiple));
-    }
+    public abstract RubyBoolean compare(ThreadContext context, CallSite site, IRubyObject other);
 
+    @JRubyMethod(name = "eql?")
+    public abstract IRubyObject eql(ThreadContext context, IRubyObject obj);
 
-    /** rb_ary_product
-     *
+    /**
+     * @return ""
+     * @deprecated Use {@link RubyArray#compact_bang(ThreadContext)}
      */
-    public IRubyObject product(ThreadContext context, IRubyObject[] args) {
-        return product(context, args, Block.NULL_BLOCK);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject compact_bang() {
+        return compact_bang(getCurrentContext());
     }
 
-    @JRubyMethod(name = "product", rest = true)
-    public IRubyObject product(ThreadContext context, IRubyObject[] args, Block block) {
-        boolean useBlock = block.isGiven();
-
-        int n = args.length + 1;
-        RubyArray arrays[] = new RubyArray[n];
-        int counters[] = new int[n];
-
-        arrays[0] = this;
-        var array = arrayClass(context);
-        JavaSites.CheckedSites to_ary_checked = sites(context).to_ary_checked;
-        for (int i = 1; i < n; i++) arrays[i] = (RubyArray) TypeConverter.convertToType(context, args[i - 1], array, to_ary_checked);
-
-        int resultLen = 1;
-        for (int i = 0; i < n; i++) {
-            int k = arrays[i].realLength;
-            int l = resultLen;
-            if (k == 0) return useBlock ? this : Create.newEmptyArray(context);
-            resultLen *= k;
-            if (resultLen < k || resultLen < l || resultLen / k != l) {
-                if (!block.isGiven()) throw rangeError(context, "too big to product");
-            }
-        }
+    @JRubyMethod(name = "compact!")
+    public abstract IRubyObject compact_bang(ThreadContext context);
 
-        RubyArray result = useBlock ? null : newBlankArrayInternal(context.runtime, resultLen);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject compact() {
+        return compact(getCurrentContext());
+    }
 
-        for (int i = 0; i < resultLen; i++) {
-            RubyArray sub = newBlankArrayInternal(context.runtime, n);
-            for (int j = 0; j < n; j++) sub.eltInternalSet(j, arrays[j].entry(counters[j]));
-            sub.realLength = n;
+    @JRubyMethod(name = "compact")
+    public abstract IRubyObject compact(ThreadContext context);
 
-            if (useBlock) {
-                block.yieldSpecific(context, sub);
-            } else {
-                result.eltInternalSet(i, sub);
-            }
-            int m = n - 1;
-            counters[m]++;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject empty_p() {
+        return empty_p(getCurrentContext());
+    }
 
-            while (m > 0 && counters[m] == arrays[m].realLength) {
-                counters[m] = 0;
-                m--;
-                counters[m]++;
-            }
-        }
+    @JRubyMethod(name = "empty?")
+    public abstract IRubyObject empty_p(ThreadContext context);
 
-        if (useBlock) return this;
-        result.realLength = resultLen;
-        return result;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject rb_clear() {
+        return rb_clear(getCurrentContext());
     }
 
-    /** rb_ary_combination
-     *
-     */
-    @JRubyMethod(name = "combination")
-    public IRubyObject combination(ThreadContext context, IRubyObject num, Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "combination", new IRubyObject[]{num}, RubyArray::combinationSize);
+    @JRubyMethod(name = "clear")
+    public abstract IRubyObject rb_clear(ThreadContext context);
 
-        int n = toInt(context, num);
+    @JRubyMethod
+    public abstract IRubyObject fill(ThreadContext context, Block block);
 
-        if (n == 0) {
-            block.yield(context, Create.newEmptyArray(context));
-        } else if (n == 1) {
-            for (int i = 0; i < realLength; i++) {
-                block.yield(context, Create.newArray(context, eltOk(i)));
-            }
-        } else if (n >= 0 && realLength >= n) {
-            int stack[] = new int[n + 1];
-            RubyArray values = makeShared();
+    @JRubyMethod
+    public abstract IRubyObject fill(ThreadContext context, IRubyObject arg, Block block);
 
-            combinate(context, size(), n, stack, values, block);
-        }
+    @JRubyMethod
+    public abstract IRubyObject fill(ThreadContext context, IRubyObject arg1, IRubyObject arg2, Block block);
 
-        return this;
-    }
+    @JRubyMethod
+    public abstract IRubyObject fill(ThreadContext context, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3, Block block);
 
-    private static void combinate(ThreadContext context, int len, int n, int[] stack, RubyArray values, Block block) {
-        int lev = 0;
+    public abstract IRubyObject index(ThreadContext context, IRubyObject obj);
 
-        Arrays.fill(stack, 1, 1 + n, 0);
-        stack[0] = -1;
-        for (;;) {
-            for (lev++; lev < n; lev++) {
-                stack[lev+1] = stack[lev]+1;
-            }
-            // TODO: MRI has a weird reentrancy check that depends on having a null class in values
-            yieldValues(context, n, stack, 1, values, block);
-            do {
-                if (lev == 0) return;
-                stack[lev--]++;
-            } while (stack[lev+1]+n == len+lev+1);
-        }
-    }
+    @JRubyMethod(name = {"index", "find_index"})
+    public abstract IRubyObject index(ThreadContext context, IRubyObject obj, Block unused);
 
-    private static void rcombinate(ThreadContext context, int n, int r, int[] p, RubyArray values, Block block) {
-        int i = 0, index = 0;
+    @JRubyMethod(name = {"index", "find_index"})
+    public abstract IRubyObject index(ThreadContext context, Block block);
 
-        p[index] = i;
-        for (;;) {
-            if (++index < r-1) {
-                p[index] = i;
-                continue;
-            }
-            for (; i < n; ++i) {
-                p[index] = i;
-                // TODO: MRI has a weird reentrancy check that depends on having a null class in values
-                yieldValues(context, r, p, 0, values, block);
-            }
-            do {
-                if (index <= 0) return;
-            } while ((i = ++p[--index]) >= n);
-        }
-    }
+    @JRubyMethod
+    public abstract IRubyObject bsearch(ThreadContext context, Block block);
 
-    /**
-     * A combination size method suitable for method reference implementation of SizeFn{@link #size(ThreadContext, RubyArray, IRubyObject[])}.
-     *
-     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
-     */
-    private static IRubyObject combinationSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
-        long n = self.realLength;
-        assert args != null && args.length > 0 && args[0] instanceof RubyNumeric; // #combination ensures arg[0] is numeric
-        long k = ((RubyNumeric) args[0]).asLong(context);
+    @JRubyMethod
+    public abstract IRubyObject bsearch_index(ThreadContext context, Block block);
 
-        return binomialCoefficient(context, k, n);
-    }
+    @JRubyMethod
+    public abstract IRubyObject rindex(ThreadContext context, IRubyObject obj, Block unused);
 
-    private static IRubyObject binomialCoefficient(ThreadContext context, long comb, long size) {
-        if (comb > size - comb) comb = size - comb;
-        if (comb < 0) return asFixnum(context, 0);
+    @JRubyMethod
+    public abstract IRubyObject rindex(ThreadContext context, Block block);
 
-        IRubyObject r = descendingFactorial(context, size, comb);
-        IRubyObject v = descendingFactorial(context, comb, comb);
-        return sites(context).op_quo.call(context, r, r, v);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject indexes(IRubyObject[] args) {
+        return indexes(getCurrentContext(), args);
     }
 
-    @JRubyMethod(name = "repeated_combination")
-    public IRubyObject repeatedCombination(ThreadContext context, IRubyObject num, Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "repeated_combination", new IRubyObject[] { num }, RubyArray::repeatedCombinationSize);
-
-        int n = toInt(context, num);
-
-        if (n < 0) {
-            // yield nothing
-        } else if (n == 0) {
-            block.yield(context, Create.newEmptyArray(context));
-        } else if (n == 1) {
-            for (int i = 0; i < realLength; i++) {
-                block.yield(context, Create.newArray(context, eltOk(i)));
-            }
-        } else {
-            int[] p = new int[n];
-            RubyArray values = makeShared();
-            rcombinate(context, realLength, n, p, values, block);
-        }
-
-        return this;
-    }
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject indexes(ThreadContext context, IRubyObject[] args) {
+        int argc = Arity.checkArgumentCount(context, args, 1, -1);
 
-    /**
-     * A repeated combination size method suitable for method reference implementation of SizeFn{@link #size(ThreadContext, RubyArray, IRubyObject[])}.
-     *
-     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
-     */
-    private static IRubyObject repeatedCombinationSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
-        long n = self.realLength;
-        assert args != null && args.length > 0 && args[0] instanceof RubyNumeric; // #repeated_combination ensures arg[0] is numeric
-        long k = ((RubyNumeric) args[0]).asLong(context);
+        warn(context, "Array#indexes is deprecated; use Array#values_at");
 
-        return k == 0 ? asFixnum(context, 1) : binomialCoefficient(context, k, n + k - 1);
-    }
+        if (argc == 1) return Create.newArray(context, args[0]);
 
-    private static void permute(ThreadContext context, int n, int r, int[] p, boolean[] used, RubyArray values, Block block) {
-        int i = 0, index = 0;
-        for (;;) {
-            int unused = memchr(used, i, false, n - i);
-            if (unused == -1) {
-                if (index == 0) break;
-                i = p[--index];
-                used[i++] = false;
-            } else {
-                i = unused;
-                p[index] = i;
-                used[i] = true;
-                index++;
-                if (index < r - 1) {
-                    p[index] = i = 0;
-                    continue;
-                }
-                for (i = 0; i < n; i++) {
-                    if (used[i]) continue;
-                    p[index] = i;
-                    // TODO: MRI has a weird reentrancy check that depends on having a null class in values
-                    yieldValues(context, r, p, 0, values, block);
-                }
-            }
-        }
-    }
+        RubyArrayNative ary = RubyArrayNative.newBlankArrayInternal(context.runtime, argc);
 
-    private static void yieldValues(ThreadContext context, int r, int[] p, int pStart, RubyArray values, Block block) {
-        RubyArray result = newBlankArrayInternal(context.runtime, r);
-        for (int j = 0; j < r; j++) {
-            result.eltInternalSet(j, values.eltInternal(p[j + pStart]));
+        for (int i = 0; i < argc; i++) {
+            ary.storeInternal(context, i, aref(context, args[i]));
         }
-        result.realLength = r;
-
-        block.yield(context, result);
-    }
-
-    private static void rpermute(ThreadContext context, int n, int r, int[] p, RubyArray values, Block block) {
-        int index = 0;
+        ary.realLength = argc;
 
-        p[index] = 0;
-        for (;;) {
-            if (++index < r-1) {
-                p[index] = 0;
-                continue;
-            }
-            for (int i = 0; i < n; ++i) {
-                p[index] = i;
-                // TODO: MRI has a weird reentrancy check that depends on having a null class in values
-                yieldValues(context, r, p, 0, values, block);
-            }
-            do {
-                if (index <= 0) return;
-            } while ((++p[--index]) >= n);
-        }
+        return ary;
     }
 
-    /** rb_ary_permutation
-     *
-     */
-    @JRubyMethod(name = "permutation")
-    public IRubyObject permutation(ThreadContext context, IRubyObject num, Block block) {
-        return block.isGiven() ?
-                permutationCommon(context, toInt(context, num), false, block) :
-                enumeratorizeWithSize(context, this, "permutation", new IRubyObject[] { num }, RubyArray::permutationSize);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject reverse_bang() {
+        return reverse_bang(getCurrentContext());
     }
 
-    @JRubyMethod(name = "permutation")
-    public IRubyObject permutation(ThreadContext context, Block block) {
-        return block.isGiven() ? permutationCommon(context, realLength, false, block) : enumeratorizeWithSize(context, this, "permutation", RubyArray::permutationSize);
-    }
+    @JRubyMethod(name = "reverse!")
+    public abstract IRubyObject reverse_bang(ThreadContext context);
 
-    @JRubyMethod(name = "repeated_permutation")
-    public IRubyObject repeated_permutation(ThreadContext context, IRubyObject num, Block block) {
-        return block.isGiven() ?
-                permutationCommon(context, toInt(context, num), true, block) :
-                enumeratorizeWithSize(context, this, "repeated_permutation", new IRubyObject[]{num}, RubyArray::repeatedPermutationSize);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject reverse() {
+        return reverse(getCurrentContext());
     }
 
-    /**
-     * A repeated permutation size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
-     *
-     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
-     */
-    private static IRubyObject repeatedPermutationSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
-        RubyFixnum n = self.length(context);
-        assert args != null && args.length > 0 && args[0] instanceof RubyNumeric; // #repeated_permutation ensures arg[0] is numeric
-        long k = ((RubyNumeric) args[0]).asLong(context);
-
-        if (k < 0) return asFixnum(context, 0);
+    @JRubyAPI
+    @JRubyMethod(name = "reverse")
+    public abstract IRubyObject reverse(ThreadContext context);
 
-        RubyFixnum v = asFixnum(context, k);
-        return sites(context).op_exp.call(context, n, n, v);
-    }
+    @JRubyMethod(name = {"collect"})
+    public abstract IRubyObject rbCollect(ThreadContext context, Block block);
 
-    private IRubyObject permutationCommon(ThreadContext context, int r, boolean repeat, Block block) {
-        if (r == 0) {
-            block.yield(context, Create.newEmptyArray(context));
-        } else if (r == 1) {
-            for (int i = 0; i < realLength; i++) {
-                block.yield(context, Create.newArray(context, eltOk(i)));
-            }
-        } else if (r >= 0) {
-            unpack(context);
-            int n = realLength;
-            if (repeat) {
-                rpermute(context, n, r,
-                        new int[r],
-                        makeShared(context, begin, n, metaClass), block);
-            } else {
-                permute(context, n, r,
-                        new int[r],
-                        new boolean[n],
-                        makeShared(context, begin, n, metaClass),
-                        block);
-            }
-        }
-        return this;
-    }
+    @JRubyMethod(name = {"map"})
+    public abstract IRubyObject map(ThreadContext context, Block block);
 
-    /**
-     * A permutation size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
-     *
-     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
-     */
-    private static IRubyObject permutationSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
-        long n = self.realLength;
-        long k;
-
-        if (args != null && args.length > 0) {
-            assert args[0] instanceof RubyNumeric; // #permutation ensures arg[0] is numeric
-            k = ((RubyNumeric) args[0]).asLong(context);
-        } else {
-            k = n;
-        }
+    @JRubyMethod(name = "collect!")
+    public abstract IRubyObject collect_bang(ThreadContext context, Block block);
 
-        return descendingFactorial(context, n, k);
-    }
+    @JRubyMethod(name = "map!")
+    public abstract IRubyObject map_bang(ThreadContext context, Block block);
 
-    private static IRubyObject descendingFactorial(ThreadContext context, long from, long howMany) {
-        IRubyObject cnt = asFixnum(context, howMany >= 0 ?  1 : 0);
-        CallSite op_times = sites(context).op_times;
-        while (howMany-- > 0) {
-            cnt = op_times.call(context, cnt, cnt, asFixnum(context, from--));
-        }
-        return cnt;
-    }
+    @JRubyMethod(name = "select", alias = "filter")
+    public abstract IRubyObject select(ThreadContext context, Block block);
 
-    @JRubyMethod(name = "shuffle!")
-    public IRubyObject shuffle_bang(ThreadContext context) {
-        return shuffleBang(context, context.runtime.getRandomClass());
-    }
+    @JRubyMethod(name = "select!", alias = "filter!")
+    public abstract IRubyObject select_bang(ThreadContext context, Block block);
 
-    @JRubyMethod(name = "shuffle!")
-    public IRubyObject shuffle_bang(ThreadContext context, IRubyObject opts) {
-        IRubyObject hash = TypeConverter.checkHashType(context.runtime, opts);
-        if (hash.isNil()) throw argumentError(context, 1, 0, 0);
+    @JRubyMethod
+    public abstract IRubyObject keep_if(ThreadContext context, Block block);
 
-        IRubyObject ret = ArgsUtil.extractKeywordArg(context, (RubyHash) hash, "random");
-        return ret == null ? shuffle(context) : shuffleBang(context, ret);
+    @JRubyMethod
+    public final IRubyObject deconstruct(ThreadContext context) {
+        return this;
     }
 
-    private IRubyObject shuffleBang(ThreadContext context, IRubyObject randgen) {
-        modify(context);
-
-        int i = realLength;
-        int len = i;
-        try {
-            while (i > 0) {
-                int r = (int) randUpto(context, randgen, i);
-                if (len != realLength) { // || ptr != RARRAY_CONST_PTR(ary)
-                    throw runtimeError(context, "modified during shuffle");
-                }
-                T tmp = eltOk(--i);
-                eltSetOk(i, eltOk(r));
-                eltSetOk(r, tmp);
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
+    @JRubyMethod
+    public abstract IRubyObject delete(ThreadContext context, IRubyObject item, Block block);
 
-        return this;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject delete_at(int pos) {
+        return delete_at(getCurrentContext(), pos);
     }
 
+    public abstract IRubyObject delete_at(ThreadContext context, int pos);
 
-    @JRubyMethod(name = "shuffle")
-    public IRubyObject shuffle(ThreadContext context) {
-        RubyArray ary = aryDup();
-        ary.shuffle_bang(context);
-        return ary;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject delete_at(IRubyObject obj) {
+        return delete_at(getCurrentContext(), obj);
     }
 
-    @JRubyMethod(name = "shuffle")
-    public IRubyObject shuffle(ThreadContext context, IRubyObject opts) {
-        RubyArray ary = aryDup();
-        ary.shuffle_bang(context, opts);
-        return ary;
-    }
+    @JRubyMethod(name = "delete_at")
+    public abstract IRubyObject delete_at(ThreadContext context, IRubyObject obj);
 
-    private static final int SORTED_THRESHOLD = 10;
+    @JRubyMethod
+    public abstract IRubyObject reject(ThreadContext context, Block block);
 
-    @JRubyMethod(name = "sample")
-    public IRubyObject sample(ThreadContext context) {
-        return sampleCommon(context, randomClass(context));
-    }
+    @JRubyMethod(name = "reject!")
+    public abstract IRubyObject reject_bang(ThreadContext context, Block block);
 
-    @JRubyMethod(name = "sample")
-    public IRubyObject sample(ThreadContext context, IRubyObject sampleOrOpts) {
-        IRubyObject hash = TypeConverter.checkHashType(context.runtime, sampleOrOpts);
-        if (hash.isNil()) return sampleCommon(context, sampleOrOpts, randomClass(context));
+    @JRubyMethod
+    public abstract IRubyObject delete_if(ThreadContext context, Block block);
 
-        IRubyObject ret = ArgsUtil.extractKeywordArg(context, (RubyHash) hash, "random");
+    @JRubyMethod(optional = 1, rest = true, checkArity = false)
+    public abstract IRubyObject zip(ThreadContext context, IRubyObject[] args, Block block);
 
-        return sampleCommon(context, ret != null ? ret : randomClass(context));
+    // This can be shared with RubyEnumerable to clean #zipCommon{Enum,Arg} a little
+    public static interface ArgumentVisitor {
+        IRubyObject visit(ThreadContext ctx, IRubyObject arg, int i);
     }
 
-    @JRubyMethod(name = "sample")
-    public IRubyObject sample(ThreadContext context, IRubyObject sample, IRubyObject opts) {
-        IRubyObject hash = TypeConverter.checkHashType(context.runtime, opts);
-        if (hash.isNil()) throw argumentError(context, 2, 0, 1);
-
-        IRubyObject ret = ArgsUtil.extractKeywordArg(context, (RubyHash) hash, "random");
-        return sampleCommon(context, sample, ret != null ? ret : randomClass(context));
-    }
+    @JRubyMethod(name = "<=>")
+    public abstract IRubyObject op_cmp(ThreadContext context, IRubyObject obj);
 
     /**
-     * Common sample logic when no sample size was specified.
+     * Variable arity version for compatibility. Not bound to a Ruby method.
+     * @deprecated Use the versions with zero, one, or two args.
      */
-    private IRubyObject sampleCommon(ThreadContext context, IRubyObject randgen) {
-        if (realLength == 0) return context.nil;
-
-        if (realLength == 1) return eltOk(0);
+    @Deprecated(since = "9.4-")
+    public IRubyObject slice_bang(IRubyObject[] args) {
+        switch (args.length) {
+            case 1:
+                return slice_bang(args[0]);
+            case 2:
+                return slice_bang(args[0], args[1]);
+            default:
+                Arity.raiseArgumentError(getCurrentContext(), args.length, 1, 2);
+                return null; // not reached
+        }
+    }
 
-        long rand = randUpto(context, randgen, realLength);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject slice_bang(IRubyObject arg0) {
+        return slice_bang(getCurrentContext(), arg0);
+    }
 
-        if (rand < 0 || realLength <= rand) {
-            return context.nil;
-        }
+    @JRubyMethod(name = "slice!")
+    public abstract IRubyObject slice_bang(ThreadContext context, IRubyObject arg0);
 
-        return eltOk(rand);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject slice_bang(IRubyObject arg0, IRubyObject arg1) {
+        return slice_bang(getCurrentContext(), arg0, arg1);
     }
 
-    /**
-     * Common sample logic when a sample size was specified.
-     */
-    private IRubyObject sampleCommon(ThreadContext context, IRubyObject sample, IRubyObject randgen) {
-        int len = realLength;
-        int n = toInt(context, sample);
-
-        try {
-            if (n < 0) throw argumentError(context, "negative sample number");
-            if (n > len) n = len;
-
-            long[] rnds = new long[SORTED_THRESHOLD];
-            if (n <= SORTED_THRESHOLD) {
-                for (int i = 0; i < n; ++i) {
-                    rnds[i] = randUpto(context, randgen, len - i);
-                }
-            }
+    @JRubyMethod(name = "slice!")
+    public abstract IRubyObject slice_bang(ThreadContext context, IRubyObject arg0, IRubyObject arg1);
 
-            int i, j, k;
-            k = len;
-            len = realLength;
-            if (len < k && n <= SORTED_THRESHOLD) {
-                for (i = 0; i < n; ++i) {
-                    if (rnds[i] >= len) return Create.newEmptyArray(context);
-                }
-            }
+    @JRubyMethod(name = "assoc")
+    public abstract IRubyObject assoc(ThreadContext context, IRubyObject key);
 
-            if (n > len) n = len;
+    @JRubyMethod(name = "rassoc")
+    public abstract IRubyObject rassoc(ThreadContext context, IRubyObject value);
 
-            switch (n) {
-            case 0:
-                return Create.newEmptyArray(context);
-            case 1:
-                return realLength <= 0 ? Create.newEmptyArray(context) : Create.newArray(context, eltOk((int) rnds[0]));
-            case 2:
-                i = (int) rnds[0];
-                j = (int) rnds[1];
+    @JRubyMethod(name = "flatten!")
+    public abstract IRubyObject flatten_bang(ThreadContext context);
 
-                if (j >= i) j++;
+    @JRubyMethod(name = "flatten!")
+    public abstract IRubyObject flatten_bang(ThreadContext context, IRubyObject arg);
 
-                return Create.newArray(context, eltOk(i), eltOk(j));
-            case 3:
-                i = (int) rnds[0];
-                j = (int) rnds[1];
-                k = (int) rnds[2];
+    @JRubyMethod(name = "flatten")
+    public abstract IRubyObject flatten(ThreadContext context);
 
-                int l = j, g = i;
+    @JRubyMethod(name = "flatten")
+    public abstract IRubyObject flatten(ThreadContext context, IRubyObject arg);
 
-                if (j >= i) {
-                    l = i;
-                    g = ++j;
-                }
+    @JRubyMethod(name = "count")
+    public abstract IRubyObject count(ThreadContext context, Block block);
 
-                if (k >= l && (++k >= g)) ++k;
+    @JRubyMethod(name = "count")
+    public abstract IRubyObject count(ThreadContext context, IRubyObject obj, Block block);
 
-                return Create.newArray(context, eltOk(i), eltOk(j), eltOk(k));
-            }
+    @JRubyMethod(name = "nitems")
+    public abstract IRubyObject nitems(ThreadContext context);
 
-            if (n > len) n = len;
-            if (n <= SORTED_THRESHOLD) {
-                int idx[] = new int[SORTED_THRESHOLD];
-                int sorted[] = new int[SORTED_THRESHOLD];
-                sorted[0] = idx[0] = (int) rnds[0];
-                for (i = 1; i < n; i++) {
-                    k = (int) rnds[i];
-                    for (j = 0; j < i; j++) {
-                        if (k < sorted[j]) break;
-                        k++;
-                    }
-                    System.arraycopy(sorted, j, sorted, j + 1, i - j);
-                    sorted[j] = idx[i] = k;
-                }
-                IRubyObject[] result = IRubyObject.array(n);
-                for (i = 0; i < n; i++) {
-                    result[i] = eltOk(idx[i]);
-                }
-                return RubyArray.newArrayMayCopy(context.runtime, result);
-            } else {
-                IRubyObject[] result = IRubyObject.array(len);
-                System.arraycopy(values, begin, result, 0, len);
-                for (i = 0; i < n; i++) {
-                    j = (int) RubyRandom.randomLongLimited(context, randgen, len - i - 1) + i;
-                    IRubyObject tmp = result[j];
-                    result[j] = result[i];
-                    result[i] = tmp;
-                }
-                RubyArray<?> ary = newArrayNoCopy(context.runtime, result);
-                ary.realLength = n;
-                return ary;
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject nitems() {
+        return nitems(getCurrentContext());
     }
 
-    private static long randUpto(ThreadContext context, IRubyObject randgen, int max) {
-        return RubyRandom.randomLongLimited(context, randgen, max - 1);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject op_plus(IRubyObject obj) {
+        return op_plus(getCurrentContext(), obj);
     }
 
-    private static void aryReverse(IRubyObject[] _p1, int p1, IRubyObject[] _p2, int p2) {
-        while(p1 < p2) {
-            IRubyObject tmp = _p1[p1];
-            _p1[p1++] = _p2[p2];
-            _p2[p2--] = tmp;
-        }
-    }
+    @JRubyMethod(name = "+")
+    public abstract IRubyObject op_plus(ThreadContext context, IRubyObject obj);
 
-    protected IRubyObject internalRotateBang(ThreadContext context, int cnt) {
-        modify(context);
-
-        try {
-            if(cnt != 0) {
-                IRubyObject[] ptr = values;
-                int len = realLength;
-
-                if(len > 0 && (cnt = rotateCount(cnt, len)) > 0) {
-                    --len;
-                    if(cnt < len) aryReverse(ptr, begin + cnt, ptr, begin + len);
-                    if(--cnt > 0) aryReverse(ptr, begin, ptr, begin + cnt);
-                    if(len > 0)   aryReverse(ptr, begin, ptr, begin + len);
-                    return this;
-                }
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
+    @JRubyMethod(name = "*")
+    public abstract IRubyObject op_times(ThreadContext context, IRubyObject times);
 
-        return context.nil;
-    }
+    protected abstract RubyHash makeHash(Ruby runtime);
 
-    private static int rotateCount(int cnt, int len) {
-        return (cnt < 0) ? (len - (~cnt % len) - 1) : (cnt % len);
-    }
+    protected abstract RubyHash makeHash(RubyHash hash);
 
-    protected IRubyObject internalRotate(ThreadContext context, int cnt) {
-        int len = realLength;
-        RubyArray rotated = aryDup();
-        rotated.modify(context);
-
-        try {
-            if(len > 0) {
-                cnt = rotateCount(cnt, len);
-                IRubyObject[] ptr = this.values;
-                IRubyObject[] ptr2 = rotated.values;
-                len -= cnt;
-                System.arraycopy(ptr, begin + cnt, ptr2, 0, len);
-                System.arraycopy(ptr, begin, ptr2, len, cnt);
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
+    @JRubyMethod(name = "uniq!")
+    public abstract IRubyObject uniq_bang(ThreadContext context, Block block);
 
-        return rotated;
-    }
+    @JRubyMethod(name = "uniq")
+    public abstract IRubyObject uniq(ThreadContext context, Block block);
 
-    @JRubyMethod(name = "rotate!")
-    public IRubyObject rotate_bang(ThreadContext context) {
-        internalRotateBang(context, 1);
-        return this;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject op_diff(IRubyObject other) {
+        return op_diff(getCurrentContext(), other);
     }
 
-    @JRubyMethod(name = "rotate!")
-    public IRubyObject rotate_bang(ThreadContext context, IRubyObject cnt) {
-        internalRotateBang(context, toInt(context, cnt));
-        return this;
-    }
+    @JRubyMethod(name = "-")
+    public abstract IRubyObject op_diff(ThreadContext context, IRubyObject other);
 
-    @JRubyMethod(name = "rotate")
-    public IRubyObject rotate(ThreadContext context) {
-        return internalRotate(context, 1);
-    }
+    @JRubyMethod(name = "difference", rest = true)
+    public abstract IRubyObject difference(ThreadContext context, IRubyObject[] args);
 
-    @JRubyMethod(name = "rotate")
-    public IRubyObject rotate(ThreadContext context, IRubyObject cnt) {
-        return internalRotate(context, toInt(context, cnt));
-    }
+    @JRubyMethod(rest = true)
+    public abstract IRubyObject intersection(ThreadContext context, IRubyObject[] args);
 
-    @JRubyMethod(name = "all?")
-    public IRubyObject all_p(ThreadContext context, Block block) {
-        return all_pCommon(context, null, block);
-    }
+    @JRubyMethod(name = "intersect?")
+    public abstract IRubyObject intersect_p(ThreadContext context, IRubyObject other);
 
-    @JRubyMethod(name = "all?")
-    public IRubyObject all_p(ThreadContext context, IRubyObject arg, Block block) {
-        return all_pCommon(context, arg, block);
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject op_and(IRubyObject other) {
+        return op_and(getCurrentContext(), other);
     }
 
-    public IRubyObject all_pCommon(ThreadContext context, IRubyObject arg, Block block) {
-        CachingCallSite self_each = sites(context).self_each;
-        if (!self_each.isBuiltin(this)) return RubyEnumerable.all_pCommon(context, self_each, this, arg, block);
-        boolean patternGiven = arg != null;
-
-        if (block.isGiven() && patternGiven) warn(context, "given block not used");
-        if (!block.isGiven() || patternGiven) return all_pBlockless(context, arg);
-
-        for (int i = 0; i < realLength; i++) {
-            if (!block.yield(context, eltOk(i)).isTrue()) return context.fals;
-        }
+    @JRubyMethod(name = "&")
+    public abstract IRubyObject op_and(ThreadContext context, IRubyObject other);
 
-        return context.tru;
+    @Deprecated(since = "10.0.0.0")
+    public IRubyObject op_or(IRubyObject other) {
+        return op_or(getCurrentContext(), other);
     }
 
-    private IRubyObject all_pBlockless(ThreadContext context, IRubyObject pattern) {
-        if (pattern == null) {
-            for (int i = 0; i < realLength; i++) {
-                if (!eltOk(i).isTrue()) return context.fals;
-            }
-        } else {
-            for (int i = 0; i < realLength; i++) {
-                if (!(pattern.callMethod(context, "===", eltOk(i)).isTrue())) return context.fals;
-            }
-        }
+    @JRubyMethod(name = "|")
+    public abstract IRubyObject op_or(ThreadContext context, IRubyObject other);
 
-        return context.tru;
-    }
+    @JRubyMethod(name = "union", rest = true)
+    public abstract IRubyObject union(ThreadContext context, IRubyObject[] args);
 
-    @JRubyMethod(name = "any?")
-    public IRubyObject any_p(ThreadContext context, Block block) {
-        return any_pCommon(context, null, block);
-    }
+    protected abstract void unionInternal(ThreadContext context, RubyArray... args);
 
-    @JRubyMethod(name = "any?")
-    public IRubyObject any_p(ThreadContext context, IRubyObject arg, Block block) {
-        return any_pCommon(context, arg, block);
-    }
+    @JRubyMethod(name = "sort")
+    public abstract RubyArray sort(ThreadContext context, Block block);
 
-    public IRubyObject any_pCommon(ThreadContext context, IRubyObject arg, Block block) {
-        if (isEmpty()) return context.fals;
-        CachingCallSite self_each = sites(context).self_each;
-        if (!self_each.isBuiltin(this)) return RubyEnumerable.any_pCommon(context, self_each, this, arg, block);
-        boolean patternGiven = arg != null;
+    @JRubyMethod(name = "sort!")
+    public abstract IRubyObject sort_bang(ThreadContext context, Block block);
 
-        if (block.isGiven() && patternGiven) warn(context, "given block not used");
+    public static class DefaultComparator implements Comparator<IRubyObject> {
 
-        if (!block.isGiven() || patternGiven) return any_pBlockless(context, arg);
+        final ThreadContext context;
 
-        for (int i = 0; i < realLength; i++) {
-            if (block.yield(context, eltOk(i)).isTrue()) return context.tru;
-        }
+        private final boolean fixnumBypass;
+        private final boolean stringBypass;
 
-        return context.fals;
-    }
+        public DefaultComparator(ThreadContext context) {
+            this(context, true);
+        }
 
-    private IRubyObject any_pBlockless(ThreadContext context, IRubyObject pattern) {
-        if (pattern == null) {
-            for (int i = 0; i < realLength; i++) {
-                if (eltOk(i).isTrue()) return context.tru;
+        DefaultComparator(ThreadContext context, final boolean honorOverride) {
+            this.context = context;
+            if ( honorOverride && context != null ) {
+                this.fixnumBypass = !honorOverride || Builtins.checkIntegerCmp(context);
+                this.stringBypass = !honorOverride || Builtins.checkStringCmp(context);
             }
-        } else {
-            for (int i = 0; i < realLength; i++) {
-                if (pattern.callMethod(context, "===", eltOk(i)).isTrue()) return context.tru;
+            else { // no-opt
+                this.fixnumBypass = false;
+                this.stringBypass = false;
             }
         }
 
-        return context.fals;
-    }
-
-    @JRubyMethod(name = "none?")
-    public IRubyObject none_p(ThreadContext context, Block block) {
-        return none_pCommon(context, null, block);
-    }
-
-    @JRubyMethod(name = "none?")
-    public IRubyObject none_p(ThreadContext context, IRubyObject arg, Block block) {
-        return none_pCommon(context, arg, block);
-    }
-
-    public IRubyObject none_pCommon(ThreadContext context, IRubyObject arg, Block block) {
-        CachingCallSite self_each = sites(context).self_each;
-        if (!self_each.isBuiltin(this)) return RubyEnumerable.none_pCommon(context, self_each, this, arg, block);
-        boolean patternGiven = arg != null;
-
-        if (block.isGiven() && patternGiven) warn(context, "given block not used");
-        if (!block.isGiven() || patternGiven) return none_pBlockless(context, arg);
-
-        for (int i = 0; i < realLength; i++) {
-            if (block.yield(context, eltOk(i)).isTrue()) return context.fals;
-        }
-
-        return context.tru;
-    }
+        /*
+        DefaultComparator(ThreadContext context, final boolean fixnumBypass, final boolean stringBypass) {
+            this.context = context;
+            this.fixnumBypass = fixnumBypass;
+            this.stringBypass = stringBypass;
+        } */
 
-    private IRubyObject none_pBlockless(ThreadContext context, IRubyObject pattern) {
-        if (pattern == null) {
-            for (int i = 0; i < realLength; i++) {
-                if (eltOk(i).isTrue()) return context.fals;
+        public int compare(IRubyObject obj1, IRubyObject obj2) {
+            if (fixnumBypass && obj1 instanceof RubyFixnum fix1 && obj2 instanceof RubyFixnum fix2) {
+                return compareInteger(fix1, fix2);
             }
-        } else {
-            for (int i = 0; i < realLength; i++) {
-                if (pattern.callMethod(context, "===", eltOk(i)).isTrue()) return context.fals;
+            if (stringBypass && obj1 instanceof RubyString str1 && obj2 instanceof RubyString str2) {
+                return compareString(str1, str2);
             }
+            return compareGeneric(obj1, obj2);
         }
 
-        return context.tru;
-    }
-
-    @JRubyMethod(name = "one?")
-    public IRubyObject one_p(ThreadContext context, Block block) {
-        return one_pCommon(context, null, block);
-    }
-
-    @JRubyMethod(name = "one?")
-    public IRubyObject one_p(ThreadContext context, IRubyObject arg, Block block) {
-        return one_pCommon(context, arg, block);
-    }
-
-    public IRubyObject one_pCommon(ThreadContext context, IRubyObject arg, Block block) {
-        CachingCallSite self_each = sites(context).self_each;
-        if (!self_each.isBuiltin(this)) return RubyEnumerable.one_pCommon(context, self_each, this, arg, block);
-        boolean patternGiven = arg != null;
+        protected int compareGeneric(IRubyObject o1, IRubyObject o2) {
+            final ThreadContext context = context();
+            return compareGeneric(context, sites(context).op_cmp_sort, o1, o2);
+        }
 
-        if (block.isGiven() && patternGiven) warn(context, "given block not used");
-        if (!block.isGiven() || patternGiven) return one_pBlockless(context, arg);
+        protected ThreadContext context() {
+            return context;
+        }
 
-        boolean found = false;
-        for (int i = 0; i < realLength; i++) {
-            if (block.yield(context, eltOk(i)).isTrue()) {
-                if (found) return context.fals;
-                found = true;
-            }
+        public static int compareInteger(RubyFixnum o1, RubyFixnum o2) {
+            long a = o1.getValue();
+            long b = o2.getValue();
+            return a > b ? 1 : a == b ? 0 : -1;
         }
 
-        return found ? context.tru : context.fals;
-    }
+        public static int compareString(RubyString o1, RubyString o2) {
+            return o1.op_cmp(o2);
+        }
 
-    private IRubyObject one_pBlockless(ThreadContext context, IRubyObject pattern) {
-        boolean found = false;
+        public static int compareGeneric(ThreadContext context, IRubyObject o1, IRubyObject o2) {
+            return compareGeneric(context, sites(context).op_cmp_sort, o1, o2);
+        }
 
-        if (pattern == null) {
-            for (int i = 0; i < realLength; i++) {
-                if (eltOk(i).isTrue()) {
-                    if (found) return context.fals;
-                    found = true;
-                }
-            }
-        } else {
-            for (int i = 0; i < realLength; i++) {
-                if (pattern.callMethod(context, "===", eltOk(i)).isTrue()) {
-                    if (found) return context.fals;
-                    found = true;
-                }
-            }
+        public static int compareGeneric(ThreadContext context, CallSite op_cmp_sort, IRubyObject o1, IRubyObject o2) {
+            IRubyObject ret = op_cmp_sort.call(context, o1, o1, o2);
+            return RubyComparable.cmpint(context, ret, o1, o2);
         }
 
-        return found ? context.tru : context.fals;
     }
 
-    @JRubyMethod
-    public IRubyObject sum(final ThreadContext context, final Block block) {
-        RubyFixnum zero = asFixnum(context, 0);
-        CachingCallSite self_each = sites(context).self_each;
+    @JRubyMethod(name = "sort_by!")
+    public abstract IRubyObject sort_by_bang(ThreadContext context, Block block);
 
-        return !self_each.isBuiltin(this) ?
-                RubyEnumerable.sumCommon(context, self_each, this, zero, block) :
-                sumCommon(context, zero, block);
-    }
+    @JRubyMethod(name = "take")
+    public abstract IRubyObject take(ThreadContext context, IRubyObject n);
 
-    @JRubyMethod
-    public IRubyObject sum(final ThreadContext context, IRubyObject init, final Block block) {
-        CachingCallSite self_each = sites(context).self_each;
-        return !self_each.isBuiltin(this) ?
-                RubyEnumerable.sumCommon(context, self_each, this, init, block) :
-                sumCommon(context, init, block);
-    }
+    @JRubyMethod(name = "take_while")
+    public abstract IRubyObject take_while(ThreadContext context, Block block);
 
-    public IRubyObject sumCommon(final ThreadContext context, IRubyObject init, final Block block) {
-        IRubyObject result = init;
+    @JRubyMethod(name = "drop")
+    public abstract IRubyObject drop(ThreadContext context, IRubyObject n);
 
-        /*
-         * This state machine is simple: it assumes all elements are the same type,
-         * and transitions to a later state when that assumption fails.
-         *
-         * The order of states is:
-         *
-         * - is_fixnum =&gt; { is_bignum | is_rational | is_float | other }
-         * - is_bignum =&gt; { is_rational | is_float | other }
-         * - is_rational =&gt; { is_float | other }
-         * - is_float =&gt; { other }
-         * - other [terminal]
-         */
-        boolean is_fixnum=false, is_bignum=false, is_rational=false, is_float=false;
-
-        if (result instanceof RubyFixnum) {
-            is_fixnum = true;
-        } else if (result instanceof RubyBignum) {
-            is_bignum = true;
-        } else if (result instanceof RubyRational) {
-            is_rational = true;
-        } else if (result instanceof RubyFloat) {
-            is_float = true;
-        }
+    @JRubyMethod(name = "drop_while")
+    public abstract IRubyObject drop_while(ThreadContext context, Block block);
 
-        int i = 0;
-        IRubyObject value = null;
-
-        if (is_fixnum) {
-            long sum = ((RubyFixnum) result).getValue();
-fixnum_loop:
-            for (; i < realLength; value=null, i++) {
-                if (value == null) {
-                    value = eltOk(i);
-                    if (block.isGiven()) {
-                        value = block.yield(context, value);
-                    }
-                }
-
-                if (value instanceof RubyFixnum) {
-                    /* should not overflow long type */
-                    try {
-                        sum = Math.addExact(sum, ((RubyFixnum) value).getValue());
-                    } catch (ArithmeticException ae) {
-                        is_bignum = true;
-                        break fixnum_loop;
-                    }
-                } else if (value instanceof RubyBignum) {
-                    is_bignum = true;
-                    break fixnum_loop;
-                } else if (value instanceof RubyRational) {
-                    is_rational = true;
-                    break fixnum_loop;
-                } else {
-                    is_float = value instanceof RubyFloat;
-                    break fixnum_loop;
-                }
-            }
+    @JRubyMethod(name = "cycle")
+    public abstract IRubyObject cycle(ThreadContext context, Block block);
 
-            if (is_bignum) {
-                result = RubyBignum.newBignum(context.runtime, sum);
-            } else if (is_rational) {
-                result = RubyRational.newRational(context.runtime, sum, 1);
-            } else if (is_float) {
-                result = asFloat(context, (double) sum);
-            } else {
-                result = asFixnum(context, sum);
-            }
-        }
-        if (is_bignum) {
-            BigInteger sum = ((RubyBignum) result).value;
-bignum_loop:
-            for (; i < realLength; value=null, i++) {
-                if (value == null) {
-                    value = eltOk(i);
-                    if (block.isGiven()) {
-                        value = block.yield(context, value);
-                    }
-                }
-
-                if (value instanceof RubyFixnum) {
-                    final long val = ((RubyFixnum) value).getValue();
-                    sum = sum.add(BigInteger.valueOf(val));
-                } else if (value instanceof RubyBignum) {
-                    sum = sum.add(((RubyBignum) value).value);
-                } else if (value instanceof RubyRational) {
-                    is_rational = true;
-                    break bignum_loop;
-                } else {
-                    is_float = value instanceof RubyFloat;
-                    break bignum_loop;
-                }
-            }
+    @JRubyMethod(name = "cycle")
+    public abstract IRubyObject cycle(ThreadContext context, IRubyObject arg, Block block);
 
-            if (is_rational) {
-                result = RubyRational.newInstance(context, RubyBignum.newBignum(context.runtime, sum));
-            } else if (is_float) {
-                result = asFloat(context, sum.doubleValue());
-            } else {
-                result = RubyBignum.newBignum(context.runtime, sum);
-            }
-        }
-        if (is_rational) {
-rational_loop:
-            for (; i < realLength; value=null, i++) {
-                if (value == null) {
-                    value = eltOk(i);
-                    if (block.isGiven()) {
-                        value = block.yield(context, value);
-                    }
-                }
-
-                if (value instanceof RubyFixnum || value instanceof RubyBignum || value instanceof RubyRational) {
-                    if (result instanceof RubyInteger) {
-                        result = ((RubyInteger) result).op_plus(context, value);
-                    } else if (result instanceof RubyRational) {
-                        result = ((RubyRational) result).op_plus(context, value);
-                    } else {
-                        throw typeError(context, "BUG: unexpected type in rational part of Array#sum");
-                    }
-                } else if (value instanceof RubyFloat) {
-                    result = asFloat(context, ((RubyRational) result).asDouble(context));
-                    is_float = true;
-                    break rational_loop;
-                } else {
-                    break rational_loop;
-                }
-            }
-        }
-        if (is_float) {
-            /*
-             * Kahan-Babuska balancing compensated summation algorithm
-             * See http://link.springer.com/article/10.1007/s00607-005-0139-x
-             */
-            double f = ((RubyFloat) result).value;
-            double c = 0.0;
-            double x, t;
-float_loop:
-            for (; i < realLength; value=null, i++) {
-                if (value == null) {
-                    value = eltOk(i);
-                    if (block.isGiven()) {
-                        value = block.yield(context, value);
-                    }
-                }
-
-                if (!(value instanceof RubyFloat || value instanceof RubyFixnum || value instanceof RubyBignum || value instanceof RubyRational)) {
-                    break float_loop;
-                }
-
-                x = ((RubyNumeric) value).asDouble(context);
-
-                if (Double.isNaN(f)) continue;
-                if (Double.isNaN(x)) {
-                    f = x;
-                    continue;
-                }
-                if (Double.isInfinite(x)) {
-                    if (Double.isInfinite(f) && Math.signum(x) != Math.signum(f))
-                        f = Double.NaN;
-                    else
-                        f = x;
-                    continue;
-                }
-                if (Double.isInfinite(f)) continue;
-
-                t = f + x;
-                if (Math.abs(f) >= Math.abs(x)) {
-                    c += ((f - t) + x);
-                } else {
-                    c += ((x - t) + f);
-                }
-                f = t;
-            }
-            f += c;
+    @JRubyMethod(name = "product", rest = true)
+    public abstract IRubyObject product(ThreadContext context, IRubyObject[] args, Block block);
 
-            result = asFloat(context, f);
-        }
-//object_loop:
-        for (; i < realLength; value=null, i++) {
-            if (value == null) {
-                value = eltOk(i);
-                if (block.isGiven()) {
-                    value = block.yield(context, value);
-                }
-            }
+    @JRubyMethod(name = "combination")
+    public abstract IRubyObject combination(ThreadContext context, IRubyObject num, Block block);
 
-            result = result.callMethod(context, "+", value);
-        }
+    @JRubyMethod(name = "repeated_combination")
+    public abstract IRubyObject repeatedCombination(ThreadContext context, IRubyObject num, Block block);
 
-        return result;
-    }
+    @JRubyMethod(name = "permutation")
+    public abstract IRubyObject permutation(ThreadContext context, IRubyObject num, Block block);
 
-    public IRubyObject find(ThreadContext context, IRubyObject ifnone, Block block) {
-        CachingCallSite self_each = sites(context).self_each;
-        if (!self_each.isBuiltin(this)) return RubyEnumerable.detectCommon(context, self_each, this, block);
+    @JRubyMethod(name = "permutation")
+    public abstract IRubyObject permutation(ThreadContext context, Block block);
 
-        return detectCommon(context, ifnone, block);
-    }
+    @JRubyMethod(name = "repeated_permutation")
+    public abstract IRubyObject repeated_permutation(ThreadContext context, IRubyObject num, Block block);
 
-    public IRubyObject find_index(ThreadContext context, Block block) {
-        CachingCallSite self_each = sites(context).self_each;
-        if (!self_each.isBuiltin(this)) return RubyEnumerable.find_indexCommon(context, self_each, this, block, Signature.OPTIONAL);
+    @JRubyMethod(name = "shuffle!")
+    public abstract IRubyObject shuffle_bang(ThreadContext context);
 
-        for (int i = 0; i < realLength; i++) {
-            if (block.yield(context, eltOk(i)).isTrue()) return asFixnum(context, i);
-        }
+    @JRubyMethod(name = "shuffle!")
+    public abstract IRubyObject shuffle_bang(ThreadContext context, IRubyObject opts);
 
-        return context.nil;
-    }
+    @JRubyMethod(name = "shuffle")
+    public abstract IRubyObject shuffle(ThreadContext context);
 
-    public IRubyObject find_index(ThreadContext context, IRubyObject cond) {
-        CachingCallSite self_each = sites(context).self_each;
-        if (!self_each.isBuiltin(this)) return RubyEnumerable.find_indexCommon(context, self_each, this, cond);
+    @JRubyMethod(name = "shuffle")
+    public abstract IRubyObject shuffle(ThreadContext context, IRubyObject opts);
 
-        for (int i = 0; i < realLength; i++) {
-            if (eltOk(i).equals(cond)) return asFixnum(context, i);
-        }
+    @JRubyMethod(name = "sample")
+    public abstract IRubyObject sample(ThreadContext context);
 
-        return context.nil;
-    }
+    @JRubyMethod(name = "sample")
+    public abstract IRubyObject sample(ThreadContext context, IRubyObject sampleOrOpts);
 
-    public IRubyObject detectCommon(ThreadContext context, IRubyObject ifnone, Block block) {
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject value = eltOk(i);
+    @JRubyMethod(name = "sample")
+    public abstract IRubyObject sample(ThreadContext context, IRubyObject sample, IRubyObject opts);
 
-            if (block.yield(context, value).isTrue()) return value;
-        }
+    @JRubyMethod(name = "rotate!")
+    public abstract IRubyObject rotate_bang(ThreadContext context);
 
-        return ifnone != null && !ifnone.isNil() ? sites(context).call.call(context, ifnone, ifnone) : context.nil;
-    }
+    @JRubyMethod(name = "rotate!")
+    public abstract IRubyObject rotate_bang(ThreadContext context, IRubyObject cnt);
 
-    @Deprecated(since = "10.0.0.0", forRemoval = true)
-    @SuppressWarnings("removal")
-    public static void marshalTo(RubyArray array, org.jruby.runtime.marshal.MarshalStream output) throws IOException {
-        marshalTo(((RubyBasicObject) array).getCurrentContext(), array, output);
-    }
+    @JRubyMethod(name = "rotate")
+    public abstract IRubyObject rotate(ThreadContext context);
 
-    @Deprecated(since = "10.0.0.0", forRemoval = true)
-    @SuppressWarnings("removal")
-    public static void marshalTo(ThreadContext context, RubyArray array, org.jruby.runtime.marshal.MarshalStream output) throws IOException {
-        output.registerLinkTarget(context, array);
+    @JRubyMethod(name = "rotate")
+    public abstract IRubyObject rotate(ThreadContext context, IRubyObject cnt);
 
-        int length = array.realLength;
+    @JRubyMethod(name = "all?")
+    public abstract IRubyObject all_p(ThreadContext context, Block block);
 
-        output.writeInt(length);
-        try {
-            for (int i = 0; i < length; i++) {
-                output.dumpObject(array.eltInternal(i));
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-    }
+    @JRubyMethod(name = "all?")
+    public abstract IRubyObject all_p(ThreadContext context, IRubyObject arg, Block block);
 
-    public static void marshalTo(ThreadContext context, RubyOutputStream out, RubyArray array, MarshalDumper output) {
-        output.registerObject(array);
+    @JRubyMethod(name = "any?")
+    public abstract IRubyObject any_p(ThreadContext context, Block block);
 
-        int length = array.realLength;
+    @JRubyMethod(name = "any?")
+    public abstract IRubyObject any_p(ThreadContext context, IRubyObject arg, Block block);
 
-        output.writeInt(out, length);
-        try {
-            for (int i = 0; i < length; i++) {
-                output.dumpObject(context, out, array.eltInternal(i));
-            }
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-    }
+    @JRubyMethod(name = "none?")
+    public abstract IRubyObject none_p(ThreadContext context, Block block);
 
-    @Deprecated(since = "10.0.0.0", forRemoval = true)
-    @SuppressWarnings("removal")
-    public static RubyArray unmarshalFrom(org.jruby.runtime.marshal.UnmarshalStream input) throws IOException {
-        int size = input.unmarshalInt();
-        var context = input.getRuntime().getCurrentContext();
+    @JRubyMethod(name = "none?")
+    public abstract IRubyObject none_p(ThreadContext context, IRubyObject arg, Block block);
 
-        // FIXME: We used to use newArrayBlankInternal but this will not hash into a HashSet without an NPE.
-        // we create this now with an empty, nulled array so it's available for links in the marshal data
-        var result = (RubyArray<?>) input.entry(Create.allocArray(context, size));
+    @JRubyMethod(name = "one?")
+    public abstract IRubyObject one_p(ThreadContext context, Block block);
 
-        for (int i = 0; i < size; i++) {
-            result.append(context, input.unmarshalObject());
-        }
+    @JRubyMethod(name = "one?")
+    public abstract IRubyObject one_p(ThreadContext context, IRubyObject arg, Block block);
 
-        return result;
-    }
+    @JRubyMethod
+    public abstract IRubyObject sum(final ThreadContext context, final Block block);
 
-    public static RubyArray unmarshalFrom(ThreadContext context, RubyInputStream in, MarshalLoader input) {
-        int size = input.unmarshalInt(context, in);
+    @JRubyMethod
+    public abstract IRubyObject sum(final ThreadContext context, IRubyObject init, final Block block);
 
-        // FIXME: We used to use newArrayBlankInternal but this will not hash into a HashSet without an NPE.
-        // we create this now with an empty, nulled array so it's available for links in the marshal data
-        var result = (RubyArray<?>) input.entry(Create.allocArray(context, size));
+    public abstract IRubyObject find(ThreadContext context, IRubyObject ifnone, Block block);
 
-        for (int i = 0; i < size; i++) {
-            result.append(context, input.unmarshalObject(context, in));
-        }
+    public abstract IRubyObject find_index(ThreadContext context, Block block);
 
-        return result;
-    }
+    public abstract IRubyObject find_index(ThreadContext context, IRubyObject cond);
 
     @Deprecated(since = "10.0.0.0")
     public static RubyArray newBlankArray(Ruby runtime, int size) {
-        return newBlankArray(runtime.getCurrentContext(), size);
+        return RubyArray.newBlankArray(runtime.getCurrentContext(), size);
     }
 
     /**
@@ -5387,39 +1272,7 @@ public static RubyArray newBlankArray(Ruby runtime, int size) {
      * @return a RubyArray shaped for the given size
      */
     public static RubyArray newBlankArray(ThreadContext context, int size) {
-        switch (size) {
-            case 0:
-                return Create.newEmptyArray(context);
-            case 1:
-                if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(context.runtime, context.nil);
-                break;
-            case 2:
-                if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(context.runtime, context.nil, context.nil);
-                break;
-        }
-
-        return newArray(context, size);
-    }
-
-    // when caller is sure to set all elements
-    static RubyArray newBlankArrayInternal(Ruby runtime, int size) {
-        return newBlankArrayInternal(runtime, runtime.getArray(), size);
-    }
-
-    // when caller is sure to set all elements
-    static RubyArray newBlankArrayInternal(Ruby runtime, RubyClass metaClass, int size) {
-        switch (size) {
-            case 0:
-                return newEmptyArray(runtime);
-            case 1:
-                if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(metaClass, null);
-                break;
-            case 2:
-                if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(metaClass, null, null);
-                break;
-        }
-
-        return new RubyArray(runtime, metaClass, size);
+        return RubyArrayNative.newBlankArray(context, size);
     }
 
     @JRubyMethod(name = "try_convert", meta = true)
@@ -5428,194 +1281,37 @@ public static IRubyObject try_convert(ThreadContext context, IRubyObject self, I
     }
 
     @JRubyMethod(name = "pack")
-    public RubyString pack(ThreadContext context, IRubyObject obj) {
-        RubyString format = obj.convertToString();
-        try {
-            RubyString buffer = newString(context, new ByteList());
-            return Pack.pack(context, this, format, buffer);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(context, e);
-        }
-    }
+    public abstract RubyString pack(ThreadContext context, IRubyObject obj);
 
     @JRubyMethod(name = "pack")
-    public RubyString pack(ThreadContext context, IRubyObject obj, IRubyObject maybeOpts) {
-        IRubyObject opts = ArgsUtil.getOptionsArg(context, maybeOpts);
-        IRubyObject buffer = null;
-
-        if (opts != context.nil) {
-            buffer = ArgsUtil.extractKeywordArg(context, (RubyHash) opts, "buffer");
-            if (buffer == context.nil) buffer = null;
-            if (buffer != null && !(buffer instanceof RubyString)) {
-                throw typeError(context, "buffer must be String, not ", buffer, "");
-            }
-        }
-
-        if (buffer==null) buffer = newString(context, new ByteList());
-
-        return Pack.pack(context, this, obj.convertToString(), (RubyString) buffer);
-    }
+    public abstract RubyString pack(ThreadContext context, IRubyObject obj, IRubyObject maybeOpts);
 
     @JRubyMethod(name = "dig")
-    public IRubyObject dig(ThreadContext context, IRubyObject arg0) {
-        return at( arg0 );
-    }
+    public abstract IRubyObject dig(ThreadContext context, IRubyObject arg0);
 
     @JRubyMethod(name = "dig")
-    public IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
-        final IRubyObject val = at( arg0 );
-        return RubyObject.dig1(context, val, arg1);
-    }
+    public abstract IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1);
 
     @JRubyMethod(name = "dig")
-    public IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
-        final IRubyObject val = at( arg0 );
-        return RubyObject.dig2(context, val, arg1, arg2);
-    }
+    public abstract IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2);
 
     @JRubyMethod(name = "dig", required = 1, rest = true, checkArity = false)
-    public IRubyObject dig(ThreadContext context, IRubyObject[] args) {
-        int argc = Arity.checkArgumentCount(context, args, 1, -1);
-
-        final IRubyObject val = at( args[0] );
-        return argc == 1 ? val : RubyObject.dig(context, val, args, 1);
-    }
-
-    private IRubyObject maxWithBlock(ThreadContext context, Block block) {
-        IRubyObject result = UNDEF;
-        ArraySites sites = sites(context);
-        CallSite op_gt = sites.op_gt_minmax;
-        CallSite op_lt = sites.op_lt_minmax;
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = eltOk(i);
-
-            if (result == UNDEF ||
-                    RubyComparable.cmpint(context, op_gt, op_lt, block.yieldArray(context, Create.newArray(context, v, result), null), v, result) > 0) {
-                result = v;
-            }
-        }
-
-        return result == UNDEF ? context.nil : result;
-    }
+    public abstract IRubyObject dig(ThreadContext context, IRubyObject[] args);
 
     @JRubyMethod(name = "max")
-    public IRubyObject max(ThreadContext context, Block block) {
-        if (block.isGiven()) return maxWithBlock(context, block);
-        if (realLength < 1) return context.nil;
-
-        IRubyObject result = UNDEF;
-        ArraySites sites = sites(context);
-        CachingCallSite op_cmp = sites.op_cmp_minmax;
-        CallSite op_gt = sites.op_gt_minmax;
-        CallSite op_lt = sites.op_lt_minmax;
-
-        int generation = getArg0Generation(op_cmp);
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = eltOk(i);
-
-            if (result == UNDEF || optimizedCmp(context, v, result, generation, op_cmp, op_gt, op_lt) > 0) {
-                result = v;
-            }
-        }
-
-        return result == UNDEF ? context.nil : result;
-    }
+    public abstract IRubyObject max(ThreadContext context, Block block);
 
     @JRubyMethod(name = "max")
-    public IRubyObject max(ThreadContext context, IRubyObject num, Block block) {
-        if (!num.isNil()) {
-            return RubyEnumerable.max(context, this, num, block);
-        }
-
-        return max(context, block);
-    }
-
-    private IRubyObject minWithBlock(ThreadContext context, Block block) {
-        IRubyObject result = UNDEF;
-        ArraySites sites = sites(context);
-        CallSite op_gt = sites.op_gt_minmax;
-        CallSite op_lt = sites.op_lt_minmax;
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = eltOk(i);
-
-            if (result == UNDEF ||
-                    RubyComparable.cmpint(context, op_gt, op_lt, block.yieldArray(context, Create.newArray(context, v, result), null), v, result) < 0) {
-                result = v;
-            }
-        }
-
-        return result == UNDEF ? context.nil : result;
-    }
+    public abstract IRubyObject max(ThreadContext context, IRubyObject num, Block block);
 
     @JRubyMethod(name = "min")
-    public IRubyObject min(ThreadContext context, Block block) {
-        if (block.isGiven()) return minWithBlock(context, block);
-
-        if (realLength == 0) {
-            return context.nil;
-        }
-
-        if (realLength == 1) {
-            return eltInternal(0);
-        }
-
-        IRubyObject result = UNDEF;
-        ArraySites sites = sites(context);
-        CachingCallSite op_cmp = sites.op_cmp_minmax;
-        CallSite op_gt = sites.op_gt_minmax;
-        CallSite op_lt = sites.op_lt_minmax;
-
-        int generation = getArg0Generation(op_cmp);
-
-        for (int i = 0; i < realLength; i++) {
-            IRubyObject v = eltOk(i);
-
-            if (result == UNDEF || optimizedCmp(context, v, result, generation, op_cmp, op_gt, op_lt) < 0) {
-                result = v;
-            }
-        }
-
-        return result == UNDEF ? context.nil : result;
-    }
-
-    private int getArg0Generation(CachingCallSite op_cmp) {
-        IRubyObject arg0 = eltInternal(0);
-        RubyClass metaclass = arg0.getMetaClass();
-        CacheEntry entry = op_cmp.retrieveCache(metaclass);
-        int generation = -1;
-
-        if (entry.method.isBuiltin()) {
-            generation = entry.token;
-        }
-        return generation;
-    }
+    public abstract IRubyObject min(ThreadContext context, Block block);
 
     @JRubyMethod(name = "min")
-    public IRubyObject min(ThreadContext context, IRubyObject num, Block block) {
-        return num.isNil() ?
-                min(context, block) :
-                RubyEnumerable.min(context, this, num, block);
-    }
+    public abstract IRubyObject min(ThreadContext context, IRubyObject num, Block block);
 
     @JRubyMethod
-    public IRubyObject minmax(ThreadContext context, Block block) {
-        return block.isGiven() ?
-                Helpers.invokeSuper(context, this, arrayClass(context), "minmax", NULL_ARRAY, block) :
-                Create.newArray(context, callMethod("min"), callMethod("max"));
-    }
-
-    private static final int optimizedCmp(ThreadContext context, IRubyObject a, IRubyObject b, int token,
-                                          CachingCallSite op_cmp, CallSite op_gt, CallSite op_lt) {
-        if (token == ((RubyBasicObject) a).metaClass.generation) {
-            if (a instanceof RubyFixnum aa && b instanceof RubyFixnum bb) return Long.compare(aa.getValue(), bb.getValue());
-            if (a instanceof RubyString aa && b instanceof RubyString bb) return aa.op_cmp(bb);
-        }
-
-        return RubyComparable.cmpint(context, op_gt, op_lt, op_cmp.call(context, a, a, b), a, b);
-    }
+    public abstract IRubyObject minmax(ThreadContext context, Block block);
 
     @Override
     public Class getJavaClass() {
@@ -5631,10 +1327,7 @@ public void copyInto(IRubyObject[] target, int start) {
      * Copy the values contained in this array into the target array at the specified offset.
      * It is expected that the target array is large enough to hold all necessary values.
      */
-    public void copyInto(ThreadContext context, IRubyObject[] target, int start) {
-        assert target.length - start >= realLength;
-        safeArrayCopy(context, values, begin, target, start, realLength);
-    }
+    public abstract void copyInto(ThreadContext context, IRubyObject[] target, int start);
 
     @Deprecated(since = "10.0.0.0")
     public void copyInto(IRubyObject[] target, int start, int len) {
@@ -5645,434 +1338,87 @@ public void copyInto(IRubyObject[] target, int start, int len) {
      * Copy the specified number of values contained in this array into the target array at the specified offset.
      * It is expected that the target array is large enough to hold all necessary values.
      */
-    public void copyInto(ThreadContext context, IRubyObject[] target, int start, int len) {
-        assert target.length - start >= len;
-        safeArrayCopy(context, values, begin, target, start, len);
-    }
-
-    // Satisfy java.util.List interface (for Java integration)
-    public int size() {
-        return realLength;
-    }
-
-    public boolean isEmpty() {
-        return realLength == 0;
-    }
-
-    public boolean contains(Object element) {
-        return indexOf(element) != -1;
-    }
-
-    public Object[] toArray() {
-        // no catch for ArrayIndexOutOfBounds here because this impls a List method
-        Object[] array = new Object[realLength];
-        for (int i = 0; i < realLength; i++) {
-            array[i] = eltInternal(i).toJava(Object.class);
-        }
-        return array;
-    }
-
-    public Object[] toArray(final Object[] arg) {
-        // no catch for ArrayIndexOutOfBounds here because this impls a List method
-        Object[] array = arg;
-        Class type = array.getClass().getComponentType();
-        if (array.length < realLength) {
-            array = (Object[]) Array.newInstance(type, realLength);
-        }
-        int length = realLength;
-
-        for (int i = 0; i < length; i++) {
-            array[i] = eltInternal(i).toJava(type);
-        }
-        return array;
-    }
+    public abstract void copyInto(ThreadContext context, IRubyObject[] target, int start, int len);
 
     @Override
-    public <T> T toJava(Class<T> target) {
-        if (target.isArray()) {
-            Class type = target.getComponentType();
-            Object rawJavaArray = Array.newInstance(type, realLength);
-            try {
-                ArrayUtils.copyDataToJavaArrayDirect(this, rawJavaArray);
-            } catch (ArrayIndexOutOfBoundsException ex) {
-                throw concurrentModification(getRuntime().getCurrentContext(), ex);
-            }
-            return target.cast(rawJavaArray);
-        } else {
-            return super.toJava(target);
-        }
-    }
-
-    public boolean add(Object element) {
-        return add(getRuntime().getCurrentContext(), element);
-    }
-
-    public boolean add(ThreadContext context, Object element) {
-        append(context, JavaUtil.convertJavaToUsableRubyObject(context.runtime, element));
-        return true;
-    }
-
-    public boolean remove(Object element) {
-        final Ruby runtime = metaClass.runtime;
-        ThreadContext context = runtime.getCurrentContext();
-        unpack(context);
-        IRubyObject item = JavaUtil.convertJavaToUsableRubyObject(runtime, element);
-        boolean listchanged = false;
-
-        for (int i1 = 0; i1 < realLength; i1++) {
-            IRubyObject e = values[begin + i1];
-            if (equalInternal(context, e, item)) {
-                delete_at(i1);
-                listchanged = true;
-                break;
-            }
-        }
-
-        return listchanged;
-    }
-
-    public boolean containsAll(Collection c) {
-        for (Iterator iter = c.iterator(); iter.hasNext();) {
-            if (indexOf(iter.next()) == -1) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public boolean addAll(Collection c) {
-        for (Iterator iter = c.iterator(); iter.hasNext();) {
-            add(iter.next());
-        }
-        return !c.isEmpty();
-    }
-
-    public boolean addAll(int index, Collection c) {
-        Iterator iter = c.iterator();
-        for (int i = index; iter.hasNext(); i++) {
-            add(i, iter.next());
-        }
-        return !c.isEmpty();
-    }
-
-    public boolean removeAll(Collection c) {
-        boolean listChanged = false;
-        final Ruby runtime = metaClass.runtime;
-        ThreadContext context = runtime.getCurrentContext();
-        for (Iterator iter = c.iterator(); iter.hasNext();) {
-            IRubyObject deleted = delete(context, JavaUtil.convertJavaToUsableRubyObject(runtime, iter.next()), Block.NULL_BLOCK);
-            if (!deleted.isNil()) {
-                listChanged = true;
-            }
-        }
-        return listChanged;
-    }
-
-    public boolean retainAll(Collection c) {
-        boolean listChanged = false;
+    public abstract boolean equals(Object other);
 
-        for (Iterator iter = iterator(); iter.hasNext();) {
-            Object element = iter.next();
-            if (!c.contains(element)) {
-                remove(element);
-                listChanged = true;
-            }
-        }
-        return listChanged;
-    }
-
-    public Object get(int index) {
-        return elt(index).toJava(Object.class);
-    }
-
-    public Object set(int index, Object element) {
-        Object previous = elt(index).toJava(Object.class);
-        store(index, JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, element));
-        return previous;
-    }
-
-    public void add(int index, Object element) {
-        insert(metaClass.runtime.getCurrentContext(), index, JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, element));
-    }
-
-    public Object remove(int index) {
-        return delete_at(index).toJava(Object.class);
-    }
-
-    public int indexOf(Object element) {
-        int myBegin = this.begin;
-
-        if (element != null) {
-            IRubyObject convertedElement = JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, element);
-
-            for (int i = myBegin; i < myBegin + realLength; i++) {
-                if (convertedElement.equals(values[i])) {
-                    return i;
-                }
-            }
-        }
-        return -1;
-    }
-
-    public int lastIndexOf(Object element) {
-        if (element != null) {
-            IRubyObject convertedElement = JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, element);
-
-            for (int i = realLength - 1; i >= 0; i--) {
-                if (convertedElement.equals(eltInternal(i))) {
-                    return i;
-                }
-            }
-        }
-
-        return -1;
-    }
-
-    private static class JoinRecursive implements ThreadContext.RecursiveFunctionEx<JoinRecursive.State> {
-        protected static class State {
-            private final RubyArray ary;
-            //private final IRubyObject outValue;
-            private final RubyString sep;
-            private final RubyString result;
-            private final boolean[] first;
-
-            State(RubyArray ary, IRubyObject outValue, RubyString sep, RubyString result, boolean[] first) {
-                this.ary = ary;
-                //this.outValue = outValue;
-                this.sep = sep;
-                this.result = result;
-                this.first = first;
-            }
-        }
-
-        public IRubyObject call(ThreadContext context, State state, IRubyObject obj, boolean recur) {
-            if (recur) throw argumentError(context, "recursive array join");
+    @JRubyMethod
+    public abstract IRubyObject rfind(ThreadContext context, Block block);
 
-            state.ary.joinAny(context, state.sep, 0, state.result, state.first);
+    @JRubyMethod
+    public abstract IRubyObject rfind(ThreadContext context, IRubyObject ifnone, Block block);
 
-            return context.nil;
-        }
+    @Deprecated(since = "10.0.0.0", forRemoval = true)
+    @SuppressWarnings("removal")
+    public static void marshalTo(RubyArray array, org.jruby.runtime.marshal.MarshalStream output) throws IOException {
+        marshalTo(((RubyBasicObject) array).getCurrentContext(), array, output);
     }
 
-    private static final JoinRecursive JOIN_RECURSIVE = new JoinRecursive();
-
-    public class RubyArrayConversionIterator implements Iterator {
-        protected int index = 0;
-        protected int last = -1;
-
-        public boolean hasNext() {
-            return index < realLength;
-        }
-
-        public Object next() {
-            IRubyObject element = elt(index);
-            last = index++;
-            return element.toJava(Object.class);
-        }
-
-        public void remove() {
-            if (last == -1) throw new IllegalStateException();
+    @Deprecated(since = "10.0.0.0", forRemoval = true)
+    @SuppressWarnings("removal")
+    public static void marshalTo(ThreadContext context, RubyArray array, org.jruby.runtime.marshal.MarshalStream output) throws IOException {
+        output.registerLinkTarget(context, array);
 
-            delete_at(last);
-            if (last < index) index--;
+        int length = array.getLength();
 
-            last = -1;
+        output.writeInt(length);
 
+        for (int i = 0; i < length; i++) {
+            output.dumpObject(array.eltOk(i));
         }
     }
 
-    public Iterator iterator() {
-        return new RubyArrayConversionIterator();
-    }
-
-    final class RubyArrayConversionListIterator extends RubyArrayConversionIterator implements ListIterator {
-        public RubyArrayConversionListIterator() {
-        }
-
-        public RubyArrayConversionListIterator(int index) {
-            this.index = index;
-        }
-
-        public boolean hasPrevious() {
-            return index >= 0;
-        }
-
-        public Object previous() {
-            return elt(last = --index).toJava(Object.class);
-        }
-
-        public int nextIndex() {
-            return index;
-        }
-
-        public int previousIndex() {
-            return index - 1;
-        }
+    public static void marshalTo(ThreadContext context, RubyOutputStream out, RubyArray array, MarshalDumper output) {
+        output.registerObject(array);
 
-        public void set(Object obj) {
-            if (last == -1) {
-                throw new IllegalStateException();
-            }
+        int length = array.getLength();
 
-            store(last, JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, obj));
-        }
+        output.writeInt(out, length);
 
-        public void add(Object obj) {
-            Ruby runtime = metaClass.runtime;
-            insert(new IRubyObject[] { asFixnum(runtime.getCurrentContext(), index++), JavaUtil.convertJavaToUsableRubyObject(runtime, obj) });
-            last = -1;
+        for (int i = 0; i < length; i++) {
+            output.dumpObject(context, out, array.eltOk(i));
         }
     }
 
-    public ListIterator listIterator() {
-        return new RubyArrayConversionListIterator();
-    }
+    @Deprecated(since = "10.0.0.0", forRemoval = true)
+    @SuppressWarnings("removal")
+    public static RubyArray unmarshalFrom(org.jruby.runtime.marshal.UnmarshalStream input) throws IOException {
+        int size = input.unmarshalInt();
+        var context = input.getRuntime().getCurrentContext();
 
-    public ListIterator listIterator(int index) {
-        return new RubyArrayConversionListIterator(index);
-	}
+        // FIXME: We used to use newArrayBlankInternal but this will not hash into a HashSet without an NPE.
+        // we create this now with an empty, nulled array so it's available for links in the marshal data
+        var result = (RubyArray<?>) input.entry(Create.allocArray(context, size));
 
-    // TODO: list.subList(from, to).clear() is supposed to clear the sublist from the list
-    public List subList(int fromIndex, int toIndex) {
-        if (fromIndex < 0 || toIndex > size() || fromIndex > toIndex) {
-            throw new IndexOutOfBoundsException();
+        for (int i = 0; i < size; i++) {
+            result.append(context, input.unmarshalObject());
         }
 
-        IRubyObject subList = subseq(fromIndex, toIndex - fromIndex);
-
-        return subList.isNil() ? null : (List) subList;
-    }
-
-    public void clear() {
-        rb_clear(getRuntime().getCurrentContext());
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (this == other) return true;
-        if (other instanceof RubyArray) {
-            return op_equal(metaClass.runtime.getCurrentContext(), (RubyArray) other).isTrue();
-        }
-        return false;
+        return result;
     }
 
-    private static IRubyObject safeArrayRef(ThreadContext context, IRubyObject[] values, int i) {
-        try {
-            return values[i];
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-    }
+    public static RubyArray unmarshalFrom(ThreadContext context, RubyInputStream in, MarshalLoader input) {
+        int size = input.unmarshalInt(context, in);
 
-    protected static IRubyObject safeArraySet(ThreadContext context, IRubyObject[] values, int i, IRubyObject value) {
-        try {
-            return values[i] = value;
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-    }
+        // FIXME: We used to use newArrayBlankInternal but this will not hash into a HashSet without an NPE.
+        // we create this now with an empty, nulled array so it's available for links in the marshal data
+        var result = (RubyArray<?>) input.entry(Create.allocArray(context, size));
 
-    private static IRubyObject safeArrayRefSet(ThreadContext context, IRubyObject[] values, int i, IRubyObject value) {
-        try {
-            IRubyObject tmp = values[i];
-            values[i] = value;
-            return tmp;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw concurrentModification(context, e);
+        for (int i = 0; i < size; i++) {
+            result.append(context, input.unmarshalObject(context, in));
         }
-    }
 
-    private static IRubyObject safeArrayRefCondSet(ThreadContext context, IRubyObject[] values, int i, boolean doSet, IRubyObject value) {
-        try {
-            IRubyObject tmp = values[i];
-            if (doSet) values[i] = value;
-            return tmp;
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
-    }
-    
-    private static void safeArrayCopy(ThreadContext context, IRubyObject[] source, int sourceStart, IRubyObject[] target, int targetStart, int length) {
-        try {
-            System.arraycopy(source, sourceStart, target, targetStart, length);
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            throw concurrentModification(context, ex);
-        }
+        return result;
     }
 
-    private static ArraySites sites(ThreadContext context) {
+    private static JavaSites.ArraySites sites(ThreadContext context) {
         return context.sites.Array;
     }
 
-    /**
-     * Increases the capacity of this <code>Array</code>, if necessary.
-     * @param minCapacity the desired minimum capacity of the internal array
-     */
-    @Deprecated(since = "9.1.3.0")
-    public void ensureCapacity(int minCapacity) {
-        unpack(getCurrentContext());
-        if ( isShared || (values.length - begin) < minCapacity ) {
-            final int len = this.realLength;
-            int newCapacity = minCapacity > len ? minCapacity : len;
-            IRubyObject[] values = IRubyObject.array(newCapacity);
-            ArraySupport.copy(this.values, begin, values, 0, len);
-            this.values = values;
-            this.begin = 0;
-        }
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    @Override
-    public RubyArray to_a() {
-        var context = metaClass.runtime.getCurrentContext();
-        final RubyClass arrayClass = arrayClass(context);
-        return metaClass != arrayClass ? dupImpl(context.runtime, arrayClass) : this;
-    }
-
-    @Deprecated(since = "9.2.15.0")
-    public IRubyObject shuffle(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return shuffle(context);
-            case 1:
-                return shuffle(context, args[0]);
-            default:
-                throw argumentError(context, args.length, 0, 0);
-        }
-    }
-
-    @Deprecated(since = "9.2.15.0")
-    public IRubyObject shuffle_bang(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return shuffle_bang(context, context.nil);
-            case 1:
-                return shuffle_bang(context, args[0]);
-            default:
-                throw argumentError(context, args.length, 0, 0);
-        }
-    }
-
-    @Deprecated(since = "9.2.15.0")
-    public IRubyObject sample(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return sample(context);
-            case 1:
-                return sample(context, args[0]);
-            case 2:
-                return sample(context, args[0], args[1]);
-            default:
-                throw argumentError(context, args.length, 0, 1);
-        }
-    }
-
     /**
      * Returns a stream of each IRubyObject
      * @return
      */
-    public Stream<IRubyObject> rubyStream() {
-        return Stream.iterate(0, i -> i + 1).limit(realLength).map(this::eltInternal);
-    }
+    public abstract Stream<IRubyObject> rubyStream();
 }
diff --git a/core/src/main/java/org/jruby/RubyArrayNative.java b/core/src/main/java/org/jruby/RubyArrayNative.java
new file mode 100644
index 00000000000..14540c99a25
--- /dev/null
+++ b/core/src/main/java/org/jruby/RubyArrayNative.java
@@ -0,0 +1,5272 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2001 Alan Moore <alan_moore@gmx.net>
+ * Copyright (C) 2001 Chad Fowler <chadfowler@chadfowler.com>
+ * Copyright (C) 2001-2002 Benoit Cerrina <b.cerrina@wanadoo.fr>
+ * Copyright (C) 2001-2004 Jan Arne Petersen <jpetersen@uni-bonn.de>
+ * Copyright (C) 2002-2004 Anders Bengtsson <ndrsbngtssn@yahoo.se>
+ * Copyright (C) 2002-2005 Thomas E Enebo <enebo@acm.org>
+ * Copyright (C) 2004-2005 Charles O Nutter <headius@headius.com>
+ * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
+ * Copyright (C) 2006 Ola Bini <Ola.Bini@ki.se>
+ * Copyright (C) 2006 Daniel Steer <damian.steer@hp.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby;
+
+import org.jcodings.specific.USASCIIEncoding;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.api.Create;
+import org.jruby.api.JRubyAPI;
+import org.jruby.ast.util.ArgsUtil;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.java.util.ArrayUtils;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Arity;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.CallSite;
+import org.jruby.runtime.ClassIndex;
+import org.jruby.runtime.Helpers;
+import org.jruby.runtime.JavaSites;
+import org.jruby.runtime.JavaSites.ArraySites;
+import org.jruby.runtime.Signature;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.callsite.CacheEntry;
+import org.jruby.runtime.callsite.CachingCallSite;
+import org.jruby.runtime.encoding.EncodingCapable;
+import org.jruby.specialized.RubyArrayOneObject;
+import org.jruby.specialized.RubyArraySpecialized;
+import org.jruby.specialized.RubyArrayTwoObject;
+import org.jruby.util.ArraySupport;
+import org.jruby.util.ByteList;
+import org.jruby.util.Pack;
+import org.jruby.util.RecursiveComparator;
+import org.jruby.util.TypeConverter;
+import org.jruby.util.cli.Options;
+import org.jruby.util.io.EncodingUtils;
+
+import java.lang.reflect.Array;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Stack;
+import java.util.stream.Stream;
+
+import static org.jruby.RubyEnumerator.SizeFn;
+import static org.jruby.RubyEnumerator.enumWithSize;
+import static org.jruby.RubyEnumerator.enumeratorize;
+import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
+import static org.jruby.api.Access.arrayClass;
+import static org.jruby.api.Access.globalVariables;
+import static org.jruby.api.Access.randomClass;
+import static org.jruby.api.Convert.asBoolean;
+import static org.jruby.api.Convert.asFixnum;
+import static org.jruby.api.Convert.asFloat;
+import static org.jruby.api.Convert.asSymbol;
+import static org.jruby.api.Convert.checkInt;
+import static org.jruby.api.Convert.toInt;
+import static org.jruby.api.Convert.toLong;
+import static org.jruby.api.Create.newHash;
+import static org.jruby.api.Create.newSharedString;
+import static org.jruby.api.Create.newSmallHash;
+import static org.jruby.api.Create.newString;
+import static org.jruby.api.Error.argumentError;
+import static org.jruby.api.Error.indexError;
+import static org.jruby.api.Error.rangeError;
+import static org.jruby.api.Error.runtimeError;
+import static org.jruby.api.Error.typeError;
+import static org.jruby.api.Warn.warn;
+import static org.jruby.api.Warn.warnDeprecated;
+import static org.jruby.api.Warn.warning;
+import static org.jruby.runtime.Helpers.addBufferLength;
+import static org.jruby.runtime.Helpers.arrayOf;
+import static org.jruby.runtime.Helpers.calculateBufferLength;
+import static org.jruby.runtime.Helpers.fillNil;
+import static org.jruby.runtime.Helpers.hashEnd;
+import static org.jruby.runtime.Helpers.memchr;
+import static org.jruby.runtime.Helpers.murmurCombine;
+import static org.jruby.runtime.Helpers.validateBufferLength;
+import static org.jruby.util.Inspector.EMPTY_ARRAY_BL;
+import static org.jruby.util.Inspector.RECURSIVE_ARRAY_BL;
+
+/**
+ * The implementation of the built-in class Array in Ruby.
+ *
+ * Concurrency: no synchronization is required among readers, but
+ * all users must synchronize externally with writers.
+ *
+ * Note: elt(long) is based on notion if we exceed precision by passing in a long larger
+ * than int (actually Integer.MAX - 8) then it will just return nil.  Anything using eltOk
+ * must know this already to avoid an AIOOBE.  We do catch that in eltOk but only as an
+ * attempt at detecting concurrent modifications to the length.  So if you improperly
+ * use eltOk you will get a conc error and not AIOOBE.
+ *
+ * Guidance for elt(long) is that if the Ruby method should raise if it is too large
+ * then you need to do that before you call this (toLong vs getValue/asLong).
+ *
+ * @param <T> What array holds
+ *
+ */
+public class RubyArrayNative<T extends IRubyObject> extends RubyArray<T> {
+    public static final int DEFAULT_INSPECT_STR_SIZE = 10;
+
+    private static final boolean USE_PACKED_ARRAYS = Options.PACKED_ARRAYS.load();
+
+    private static RuntimeException concurrentModification(ThreadContext context, Exception cause) {
+        RuntimeException ex = context.runtime.newConcurrencyError("Detected invalid array contents due to unsynchronized modifications with concurrent users");
+        // NOTE: probably not useful to be on except for debugging :
+        // if ( cause != null ) ex.initCause(cause);
+        return ex;
+    }
+
+    /** rb_ary_s_create
+     *
+     */
+     public static IRubyObject create(ThreadContext context, IRubyObject klass, IRubyObject[] args, Block block) {
+         switch (args.length) {
+             case 0: return ((RubyClass) klass).allocate(context);
+             case 1: return new RubyArrayOneObject((RubyClass) klass, args[0]);
+             case 2: return new RubyArrayTwoObject((RubyClass) klass, args[0], args[1]);
+         }
+
+         RubyArrayNative arr = (RubyArrayNative) ((RubyClass) klass).allocate(context);
+         arr.values = args.clone();
+         arr.realLength = args.length;
+         return arr;
+     }
+
+    public static RubyArrayNative<?> newArray(final Ruby runtime, final int len) {
+        return newArray(runtime.getCurrentContext(), len);
+    }
+
+    public static final RubyArrayNative<?> newArray(ThreadContext context, final int len) {
+        if (len == 0) return newEmptyArray(context.runtime);
+        IRubyObject[] values = IRubyObject.array(validateBufferLength(context, len));
+        return new RubyArrayNative<>(context.runtime, values, 0, 0);
+    }
+
+    public static final RubyArrayNative<?> newArrayLight(final Ruby runtime, final int len) {
+        if (len == 0) return newEmptyArray(runtime);
+        IRubyObject[] values = IRubyObject.array(validateBufferLength(runtime, len));
+        return new RubyArrayNative<>(runtime, runtime.getArray(), values, 0, 0, false);
+    }
+
+    /** rb_ary_new
+     *
+     */
+    public static final RubyArrayNative<?> newArray(ThreadContext context) {
+        return newArray(context, ARRAY_DEFAULT_SIZE);
+    }
+
+    /** rb_ary_new
+     *
+     */
+    public static final RubyArrayNative<?> newArrayLight(final Ruby runtime) {
+        /* Ruby arrays default to holding 16 elements, so we create an
+         * ArrayList of the same size if we're not told otherwise
+         */
+        return newArrayLight(runtime, ARRAY_DEFAULT_SIZE);
+    }
+
+    public static RubyArrayNative<?> newArray(Ruby runtime, IRubyObject obj) {
+        return USE_PACKED_ARRAYS ? new RubyArrayOneObject(runtime, obj) : new RubyArrayNative<>(runtime, arrayOf(obj));
+    }
+
+    public static RubyArrayNative<?> newArrayLight(Ruby runtime, IRubyObject obj) {
+        return USE_PACKED_ARRAYS ? new RubyArrayOneObject(runtime, obj) : new RubyArrayNative<>(runtime, arrayOf(obj));
+    }
+
+    public static RubyArrayNative<?> newArrayLight(RubyClass arrayClass, IRubyObject obj) {
+        return USE_PACKED_ARRAYS ? new RubyArrayOneObject(arrayClass, obj) : new RubyArrayNative<>(arrayClass, arrayOf(obj), false);
+    }
+
+    public static RubyArrayNative<?> newArrayLight(Ruby runtime, IRubyObject car, IRubyObject cdr) {
+        return USE_PACKED_ARRAYS ? new RubyArrayTwoObject(runtime, car, cdr) : new RubyArrayNative<>(runtime, arrayOf(car, cdr));
+    }
+
+    public static RubyArrayNative<?> newArrayLight(RubyClass arrayClass, IRubyObject car, IRubyObject cdr) {
+        return USE_PACKED_ARRAYS ? new RubyArrayTwoObject(arrayClass, car, cdr) : new RubyArrayNative<>(arrayClass, arrayOf(car, cdr), false);
+    }
+
+    public static RubyArrayNative<?> newArrayLight(Ruby runtime, IRubyObject... objs) {
+        return new RubyArrayNative<>(runtime, objs, false);
+    }
+
+    /** rb_assoc_new
+     *
+     */
+    public static RubyArrayNative<?> newArray(Ruby runtime, IRubyObject car, IRubyObject cdr) {
+        return USE_PACKED_ARRAYS ? new RubyArrayTwoObject(runtime, car, cdr) : new RubyArrayNative<>(runtime, arrayOf(car, cdr));
+    }
+
+    public static RubyArrayNative<?> newArray(Ruby runtime, IRubyObject first, IRubyObject second, IRubyObject third) {
+        return new RubyArrayNative<>(runtime, arrayOf(first, second, third));
+    }
+
+    public static RubyArrayNative<?> newArray(Ruby runtime, IRubyObject first, IRubyObject second, IRubyObject third, IRubyObject fourth) {
+        return new RubyArrayNative<>(runtime, arrayOf(first, second, third, fourth));
+    }
+
+    public static RubyArrayNative<?> newEmptyArray(Ruby runtime) {
+        return new RubyArrayNative<>(runtime, NULL_ARRAY);
+    }
+
+    public static RubyArrayNative<?> newEmptyArray(Ruby runtime, RubyClass klass) {
+        return new RubyArrayNative<>(runtime, klass, NULL_ARRAY);
+    }
+
+    /** rb_ary_new4, rb_ary_new3
+     *
+     */
+    public static RubyArrayNative<?> newArray(Ruby runtime, IRubyObject[] args) {
+        final int size = args.length;
+        if (size == 0) {
+            return newEmptyArray(runtime);
+        }
+        return isPackedArray(size) ? packedArray(runtime, args) : new RubyArrayNative<>(runtime, args.clone());
+    }
+
+    public static RubyArrayNative<?> newArray(Ruby runtime, Collection<? extends IRubyObject> collection) {
+        if (collection.isEmpty()) {
+            return newEmptyArray(runtime);
+        }
+        final IRubyObject[] arr = collection.toArray(IRubyObject.NULL_ARRAY);
+        return isPackedArray(collection) ? packedArray(runtime, arr) : new RubyArrayNative<>(runtime, arr);
+    }
+
+    public static RubyArrayNative<?> newArray(Ruby runtime, List<? extends IRubyObject> list) {
+        if (list.isEmpty()) {
+            return newEmptyArray(runtime);
+        }
+        return isPackedArray(list) ? packedArray(runtime, list) : new RubyArrayNative<>(runtime, list.toArray(IRubyObject.NULL_ARRAY));
+    }
+
+    public static RubyArrayNative<?> newSharedArray(RubyClass arrayClass, IRubyObject[] shared) {
+        var sharedArray = new RubyArrayNative<>(arrayClass, shared, true);
+
+        sharedArray.isShared = true;
+
+        return sharedArray;
+    }
+
+    private static RubyArrayNative<?> packedArray(final Ruby runtime, final IRubyObject[] args) {
+        return args.length == 1 ?
+                new RubyArrayOneObject(runtime, args[0]) :
+                new RubyArrayTwoObject(runtime, args[0], args[1]);
+    }
+
+    private static RubyArrayNative<?> packedArray(final Ruby runtime, final List<? extends IRubyObject> args) {
+        return args.size() == 1 ?
+                new RubyArrayOneObject(runtime, args.get(0)) :
+                new RubyArrayTwoObject(runtime, args.get(0), args.get(1));
+
+    }
+
+    private static boolean isPackedArray(final int size) {
+        return USE_PACKED_ARRAYS && size <= 2;
+    }
+
+    private static boolean isPackedArray(final Collection<? extends IRubyObject> collection) {
+        return USE_PACKED_ARRAYS && collection.size() <= 2;
+    }
+
+    /**
+     * @see RubyArrayNative#newArrayMayCopy(Ruby, IRubyObject[], int, int)
+     */
+    public static RubyArrayNative newArrayMayCopy(Ruby runtime, IRubyObject... args) {
+        return newArrayMayCopy(runtime, args, 0, args.length);
+    }
+
+    /**
+     * @see RubyArrayNative#newArrayMayCopy(Ruby, IRubyObject[], int, int)
+     */
+    public static RubyArrayNative newArrayMayCopy(Ruby runtime, IRubyObject[] args, int start) {
+        return newArrayMayCopy(runtime, args, start, args.length - start);
+    }
+
+    /**
+     * Construct a new RubyArray given the specified range of elements in the source array. The elements
+     * <i>may</i> be copied into a new backing store, and therefore you should not expect future changes to the
+     * source array to be reflected. Conversely, you should not modify the array after passing it, since
+     * the contents <i>may not</i> be copied.
+     *
+     * @param runtime the runtime
+     * @param args the args
+     * @param start start index
+     * @param length number of elements
+     * @return an array referencing the given elements
+     */
+    public static RubyArrayNative newArrayMayCopy(Ruby runtime, IRubyObject[] args, int start, int length) {
+        if (length == 0) return newEmptyArray(runtime);
+
+        if (USE_PACKED_ARRAYS) {
+            if (length == 1) return new RubyArrayOneObject(runtime, args[start]);
+            if (length == 2) return new RubyArrayTwoObject(runtime, args[start], args[start + 1]);
+        }
+
+        return newArrayNoCopy(runtime, args, start, length);
+    }
+
+    public static RubyArrayNative newArrayNoCopy(Ruby runtime, IRubyObject... args) {
+        return new RubyArrayNative(runtime, args);
+    }
+
+    public static RubyArrayNative newArrayNoCopy(Ruby runtime, IRubyObject[] args, int begin) {
+        assert begin >= 0 : "begin must be >= 0";
+        assert begin <= args.length : "begin must be <= length";
+
+        return new RubyArrayNative(runtime, args, begin, args.length - begin);
+    }
+
+    public static RubyArrayNative newArrayNoCopy(Ruby runtime, IRubyObject[] args, int begin, int length) {
+        assert begin >= 0 : "begin must be >= 0";
+        assert length >= 0 : "length must be >= 0";
+
+        return new RubyArrayNative(runtime, args, begin, length);
+    }
+
+    public static RubyArrayNative newArrayNoCopyLight(Ruby runtime, IRubyObject[] args) {
+        return new RubyArrayNative(runtime, args, false);
+    }
+
+    public static final int ARRAY_DEFAULT_SIZE = 16;
+    private static final int SMALL_ARRAY_LEN = 16;
+
+    private volatile boolean isShared = false;
+
+    protected IRubyObject[] values;
+
+    protected int begin = 0;
+    protected int realLength = 0;
+
+    /*
+     * plain internal array assignment
+     */
+    private RubyArrayNative(Ruby runtime, IRubyObject[] vals) {
+        super(runtime, runtime.getArray());
+        this.values = vals;
+        this.realLength = vals.length;
+    }
+
+    /*
+     * plain internal array assignment
+     */
+    private RubyArrayNative(Ruby runtime, IRubyObject[] vals, boolean objectSpace) {
+        super(runtime, runtime.getArray(), objectSpace);
+        this.values = vals;
+        this.realLength = vals.length;
+    }
+
+    /*
+     * plain internal array assignment
+     */
+    public RubyArrayNative(Ruby runtime, IRubyObject[] vals, int begin, int length) {
+        super(runtime, runtime.getArray());
+        this.values = vals;
+        this.begin = begin;
+        this.realLength = length;
+    }
+
+    private RubyArrayNative(Ruby runtime, RubyClass metaClass, IRubyObject[] vals, int begin, int length, boolean objectSpace) {
+        super(runtime, metaClass, objectSpace);
+        this.values = vals;
+        this.begin = begin;
+        this.realLength = length;
+    }
+
+    public RubyArrayNative(Ruby runtime, int length) {
+        super(runtime, runtime.getArray());
+        this.values = IRubyObject.array(validateBufferLength(runtime, length));
+    }
+
+    /* NEWOBJ and OBJSETUP equivalent
+     * fastest one, for shared arrays, optional objectspace
+     */
+    private RubyArrayNative(Ruby runtime, boolean objectSpace) {
+        super(runtime, runtime.getArray(), objectSpace);
+    }
+
+    protected RubyArrayNative(Ruby runtime, RubyClass klass) {
+        super(runtime, klass);
+    }
+
+    /* Array constructors taking the MetaClass to fulfil MRI Array subclass behaviour
+     *
+     */
+    private RubyArrayNative(Ruby runtime, RubyClass klass, int length) {
+        super(runtime, klass);
+        values = IRubyObject.array(validateBufferLength(runtime, length));
+    }
+
+    private RubyArrayNative(Ruby runtime, RubyClass klass, IRubyObject[] vals, boolean objectspace) {
+        super(runtime, klass, objectspace);
+        values = vals;
+        realLength = vals.length;
+    }
+
+    protected RubyArrayNative(Ruby runtime, RubyClass klass, boolean objectSpace) {
+        super(runtime, klass, objectSpace);
+    }
+
+    public RubyArrayNative(Ruby runtime, RubyClass klass, IRubyObject[] vals) {
+        super(runtime, klass);
+        values = vals;
+        realLength = vals.length;
+    }
+
+    public RubyArrayNative(RubyClass klass, IRubyObject[] vals, boolean shared) {
+        super(klass);
+        values = vals;
+        realLength = vals.length;
+        isShared = shared;
+    }
+
+    /**
+     * Overridden by specialized arrays to fall back to IRubyObject[].
+     */
+    protected void unpack(ThreadContext context) {
+    }
+
+    private void alloc(ThreadContext context, int length) {
+        IRubyObject[] newValues = IRubyObject.array(validateBufferLength(context, length));
+        Helpers.fillNil(context, newValues);
+        values = newValues;
+        begin = 0;
+    }
+
+    private void realloc(ThreadContext context, int newLength, int valuesLength) {
+        unpack(context);
+        IRubyObject[] reallocated = IRubyObject.array(validateBufferLength(context, newLength));
+        if (newLength > valuesLength) {
+            Helpers.fillNil(context, reallocated, valuesLength, newLength);
+            safeArrayCopy(context, values, begin, reallocated, 0, valuesLength); // elements and trailing nils
+        } else {
+            safeArrayCopy(context, values, begin, reallocated, 0, newLength); // ???
+        }
+        begin = 0;
+        values = reallocated;
+    }
+
+    public int getLength() {
+        return realLength;
+    }
+
+    /**
+     * Return a Java array copy of the elements contained in this Array.
+     *
+     * This version always creates a new Java array that is exactly the length of the Array's elements.
+     *
+     * @return a Java array with exactly the size and contents of this RubyArray's elements
+     */
+    public IRubyObject[] toJavaArray(ThreadContext context) {
+        IRubyObject[] copy = IRubyObject.array(realLength);
+        copyInto(context, copy, 0);
+        return copy;
+    }
+
+    /**
+     * Return a reference to this RubyArray's underlying Java array, if it is not shared with another RubyArray, or
+     * an exact copy of the relevant range otherwise.
+     *
+     * This method is typically used to work with the underlying array directly, knowing that it is not shared and that
+     * all accesses must consider the begin offset.
+     *
+     * @return The underlying Java array for this RubyArray, or a copy if that array is shared.
+     */
+
+    public IRubyObject[] toJavaArrayUnsafe() {
+        unpack(getRuntime().getCurrentContext());
+        return !isShared ? values : toJavaArray();
+    }
+
+    /**
+     * Return a Java array of the elements contained in this array, possibly a new array object.
+     *
+     * Use this method to potentially avoid making a new array and copying elements when the Array does not view a
+     * subset of the underlying Java array.
+     *
+     * @return a Java array with exactly the size and contents of this RubyArray's elements, possibly the actual
+     *         underlying array.
+     */
+    public IRubyObject[] toJavaArrayMaybeUnsafe() {
+        unpack(getRuntime().getCurrentContext());
+        return (!isShared && begin == 0 && values.length == realLength) ? values : toJavaArray();
+    }
+
+    public boolean isSharedJavaArray(RubyArray other) {
+        if (!(other instanceof RubyArrayNative aryNative)) return false;
+
+        return values == aryNative.values && begin == aryNative.begin && realLength == aryNative.getLength();
+    }
+
+    /** rb_ary_make_shared
+    *
+    */
+    protected RubyArrayNative<?> makeShared() {
+        var context = getRuntime().getCurrentContext();
+        // TODO: (CON) Some calls to makeShared could create packed array almost as efficiently
+        unpack(context);
+
+        return makeShared(context, begin, realLength, arrayClass(context));
+    }
+
+    private RubyArrayNative makeShared(ThreadContext context, int beg, int len, RubyClass klass) {
+        return makeShared(context, beg, len, new RubyArrayNative(context.runtime, klass));
+    }
+
+    private final RubyArrayNative makeShared(ThreadContext context, int beg, int len, RubyArrayNative sharedArray) {
+        unpack(context);
+        isShared = true;
+        sharedArray.values = values;
+        sharedArray.isShared = true;
+        sharedArray.begin = beg;
+        sharedArray.realLength = len;
+        return sharedArray;
+    }
+
+    /** ary_shared_first
+     *
+     */
+    private RubyArray makeSharedFirst(ThreadContext context, IRubyObject num, boolean last) {
+        int n = toInt(context, num);
+
+        if (n < 0) throw argumentError(context, "negative array size");
+        if (n > realLength) n = realLength;
+
+        return makeShared(context, last ? begin + realLength - n : begin, n, arrayClass(context));
+    }
+
+    @Deprecated(since = "10.0.0.0")
+    protected final void modifyCheck() {
+        modifyCheck(getCurrentContext());
+    }
+
+    /** rb_ary_modify_check
+     *
+     */
+    protected final void modifyCheck(ThreadContext context) {
+        if (isFrozen()) throw context.runtime.newFrozenError(this);
+    }
+
+    @Deprecated(since = "10.0.0.0")
+    protected void modify() {
+        modify(getCurrentContext());
+    }
+
+    /** rb_ary_modify
+     *
+     */
+    protected void modify(ThreadContext context) {
+        modifyCheck(context);
+        if (isShared) {
+            IRubyObject[] vals = IRubyObject.array(realLength);
+            safeArrayCopy(context, values, begin, vals, 0, realLength);
+            begin = 0;
+            values = vals;
+            isShared = false;
+        }
+    }
+
+    /*  ================
+     *  Instance Methods
+     *  ================
+     */
+
+    /** rb_ary_initialize
+     *
+     */
+    public IRubyObject initialize(ThreadContext context, Block block) {
+        modifyCheck(context);
+        unpack(context);
+        realLength = 0;
+        if (block.isGiven()) warning(context, "given block not used");
+
+        return this;
+    }
+
+    /** rb_ary_initialize
+     *
+     */
+    public IRubyObject initialize(ThreadContext context, IRubyObject arg0, Block block) {
+        return initializeCommon(context, arg0, null, block);
+    }
+
+    /** rb_ary_initialize
+     *
+     */
+    public IRubyObject initialize(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
+        return initializeCommon(context, arg0, arg1, block);
+    }
+
+    protected IRubyObject initializeCommon(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
+        unpack(context);
+
+        if (arg1 == null && !(arg0 instanceof RubyFixnum)) {
+            IRubyObject val = arg0.checkArrayType();
+            if (!val.isNil()) {
+                replace(val);
+                return this;
+            }
+        }
+
+        long len = toLong(context, arg0);
+        if (len < 0) throw argumentError(context, "negative array size");
+        int ilen = validateBufferLength(context, len);
+
+        modify(context);
+
+        if (ilen > values.length - begin) {
+            values = IRubyObject.array(ilen);
+            begin = 0;
+        }
+
+        if (block.isGiven()) {
+            if (arg1 != null) warn(context, "block supersedes default value argument");
+
+            if (block.getSignature() == Signature.NO_ARGUMENTS) {
+                IRubyObject nil = context.nil;
+                for (int i = 0; i < ilen; i++) {
+                    storeInternal(context, i, block.yield(context, nil));
+                    realLength = i + 1;
+                }
+            } else {
+                for (int i = 0; i < ilen; i++) {
+                    storeInternal(context, i, block.yield(context, asFixnum(context, i)));
+                    realLength = i + 1;
+                }
+            }
+
+        } else {
+            try {
+                if (arg1 == null) {
+                    //System.out.println("VAL.l: " + values.length + ", B: " + begin +"ilen: " + ilen);
+                    //Helpers.fillNil(context, values, begin, begin + ilen);
+                    Arrays.fill(values, begin, begin + ilen, context.nil);
+                } else {
+                    Arrays.fill(values, begin, begin + ilen, arg1);
+                }
+            } catch (ArrayIndexOutOfBoundsException ex) {
+                throw concurrentModification(context, ex);
+            }
+            realLength = ilen;
+        }
+        return this;
+    }
+
+    /** rb_ary_initialize_copy
+     *
+     */
+    public IRubyObject initialize_copy(ThreadContext context, IRubyObject orig) {
+        return replace(orig);
+    }
+
+    /**
+     * Overridden dup for fast-path logic.
+     *
+     * @return A new RubyArray sharing the original backing store.
+     */
+    @Override
+    public IRubyObject dup() {
+        CachingCallSite initCopy = sites(getRuntime().getCurrentContext()).initialize_copy;
+        if (metaClass.getClassIndex() != ClassIndex.ARRAY || !initCopy.retrieveCache(this).method.isBuiltin()) return super.dup();
+
+        Ruby runtime = metaClass.runtime;
+        RubyArray dup = dupImpl(runtime, runtime.getArray());
+        return dup;
+    }
+
+    protected RubyArrayNative dupImpl(Ruby runtime, RubyClass metaClass) {
+        RubyArrayNative dup = new RubyArrayNative(runtime, metaClass, values, begin, realLength, true);
+        dup.isShared = this.isShared = true;
+        return dup;
+    }
+
+    /** rb_ary_dup
+     *
+     */
+    public RubyArrayNative aryDup() {
+        // In 1.9, rb_ary_dup logic changed so that on subclasses of Array,
+        // dup returns an instance of Array, rather than an instance of the subclass
+        Ruby runtime = metaClass.runtime;
+        return dupImpl(runtime, runtime.getArray());
+    }
+
+    /** rb_ary_replace
+     *
+     */
+    public IRubyObject replace(ThreadContext context, IRubyObject orig) {
+        unpack(context);
+        modifyCheck(context);
+
+        if (this == orig) return this;
+
+        var origArr = orig.convertToArray();
+
+        if (origArr instanceof RubyArrayNative origArrNative) {
+            origArrNative.unpack(context);
+            origArrNative.isShared = true;
+
+            isShared = true;
+            values = origArrNative.values;
+            realLength = origArrNative.getLength();
+            begin = origArrNative.begin;
+        } else {
+            IRubyObject[] newValues = origArr.toJavaArray(context);
+
+            isShared = true;
+            values = newValues;
+            realLength = newValues.length;
+            begin = 0;
+        }
+
+        return this;
+    }
+
+    /** rb_ary_to_s
+     *
+     */
+    @Override
+    public RubyString to_s(ThreadContext context) {
+        return inspect(context);
+    }
+
+    public boolean includes(ThreadContext context, IRubyObject item) {
+        int end = realLength;
+        for (int i = 0; i < end; i++) {
+            final IRubyObject value = eltOk(i);
+            if (equalInternal(context, value, item)) return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    protected boolean includesByEql(ThreadContext context, IRubyObject item) {
+        int end = realLength;
+        for (int i = 0; i < end; i++) {
+            final IRubyObject value = eltOk(i);
+            if (eqlInternal(context, item, value)) return true;
+        }
+
+        return false;
+    }
+
+    /** rb_ary_hash
+     *
+     */
+    public RubyFixnum hash(ThreadContext context) {
+        return asFixnum(context, hashImpl(context));
+    }
+
+    private long hashImpl(final ThreadContext context) {
+        long h = Helpers.hashStart(context.runtime, realLength);
+
+        h = Helpers.murmurCombine(h, System.identityHashCode(RubyArray.class));
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject value = eltOk(i);
+            long n = Helpers.safeHashLong(context, value);
+            h = murmurCombine(h, n);
+        }
+
+        return hashEnd(h);
+    }
+
+    // NOTE: there's some (passing) RubySpec where [ ary ] is mocked with a custom hash
+    // maybe JRuby doesn't need to obey 100% since it already has hashCode on other core types
+    //@Override
+    //public int hashCode() {
+    //    return (int) hashImpl(getRuntime().getCurrentContext());
+    //}
+    public IRubyObject store(long index, IRubyObject value) {
+        return store(metaClass.runtime.getCurrentContext(), index, value);
+    }
+
+    /**
+     * Store an element at the specified index or throw if the index is invalid.
+     * @param context the current thread context
+     * @param index the offset to store the value
+     * @param value the value to be stored
+     * @return the value set
+     */
+    // MRI: rb_ary_store
+    @JRubyAPI
+    public IRubyObject store(ThreadContext context, long index, IRubyObject value) {
+        if (index < 0 && (index += realLength) < 0) throw indexError(context, "index " + (index - realLength) + " out of array");
+        if (index >= Integer.MAX_VALUE) throw indexError(context, "index " + index  + " too big");
+
+        modify(context);
+
+        storeInternal(context, (int) index, value);
+
+        return value;
+    }
+
+    // note: packed arrays will unpack in overridden version of this
+    @Override
+    protected void storeInternal(ThreadContext context, final int index, final IRubyObject value) {
+        assert index >= 0;
+
+        if (index >= realLength) {
+            resizeAndFillBackingArray(context, index);
+            realLength = index + 1;
+        }
+
+        safeArraySet(context, values, begin + index, value);
+    }
+
+    private void resizeAndFillBackingArray(ThreadContext context, int index) {
+        int valuesLength = values.length - begin;
+        if (index >= valuesLength) {
+            if (index - realLength >= 1) { // fill null values unassigned up to alloc'd capacity
+                fillNil(context, values, begin + realLength, values.length);
+            }
+            storeRealloc(context, index, valuesLength);
+        } else if (index - realLength >= 1) {
+            int baseIndex = begin + realLength;
+            fillNil(context, values, baseIndex, baseIndex + (index - realLength));
+        }
+    }
+
+    private void storeRealloc(ThreadContext context, final int index, final int valuesLength) {
+        long newLength = valuesLength >> 1;
+
+        if (newLength < ARRAY_DEFAULT_SIZE) newLength = ARRAY_DEFAULT_SIZE;
+
+        newLength += index;
+        if (newLength >= Integer.MAX_VALUE) throw indexError(context, "index " + index  + " too big");
+
+        realloc(context, (int) newLength, valuesLength);
+    }
+
+    /** rb_ary_elt
+     *
+     */
+    @Override
+    protected final IRubyObject elt(long offset) {
+        if (offset < 0 || offset >= realLength) {
+            return metaClass.runtime.getNil();
+        }
+        return eltOk(offset);
+    }
+
+    public T eltOk(long offset) {
+        try {
+            return (T) eltInternal((int)offset);
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(getRuntime().getCurrentContext(), ex);
+        }
+    }
+
+    public T eltSetOk(long offset, T value) {
+        return eltSetOk((int) offset, value);
+    }
+
+    public T eltSetOk(int offset, T value) {
+        try {
+            return eltInternalSet(offset, value);
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(getRuntime().getCurrentContext(), ex);
+        }
+    }
+
+    /** rb_ary_entry
+     *
+     */
+    public final IRubyObject entry(long offset) {
+        return (offset < 0 ) ? elt(offset + realLength) : elt(offset);
+    }
+
+    public final IRubyObject entry(int offset) {
+        return (offset < 0 ) ? elt(offset + realLength) : elt(offset);
+    }
+
+    public T eltInternal(int offset) {
+        return (T) values[begin + offset];
+    }
+
+    public T eltInternalSet(int offset, T item) {
+        values[begin + offset] = item;
+        return item;
+    }
+
+    public IRubyObject fetch_values(ThreadContext context, IRubyObject[] args, Block block) {
+        int length = args.length;
+        RubyArray result = RubyArrayNative.newBlankArrayInternal(context.runtime, length);
+        for (int i = 0; i < args.length; i++) {
+            result.storeInternal(context, i, fetch(context, args[i], block));
+        }
+        return result;
+    }
+
+    /** rb_ary_fetch
+     *
+     */
+    public IRubyObject fetch(ThreadContext context, IRubyObject arg0, Block block) {
+        long index = toLong(context, arg0);
+
+        if (index < 0) index += realLength;
+        if (index < 0 || index >= realLength) {
+            if (block.isGiven()) return block.yield(context, arg0);
+            throw indexError(context, "index " + index + " out of array");
+        }
+
+        return eltOk((int) index);
+    }
+
+    /** rb_ary_fetch
+    *
+    */
+   public IRubyObject fetch(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
+       if (block.isGiven()) warn(context, "block supersedes default value argument");
+
+       long index = toLong(context, arg0);
+
+       if (index < 0) index += realLength;
+       if (index < 0 || index >= realLength) {
+           if (block.isGiven()) return block.yield(context, arg0);
+           return arg1;
+       }
+
+       return eltOk((int) index);
+   }
+
+    /** rb_ary_to_ary
+     *
+     */
+    public static RubyArray aryToAry(ThreadContext context, IRubyObject obj) {
+        IRubyObject tmp = TypeConverter.checkArrayType(context, obj);
+        return tmp != context.nil ? (RubyArray) tmp : newArray(context.runtime, obj);
+    }
+
+    private void splice(ThreadContext context, int beg, int len, IRubyObject rpl) {
+        if (len < 0) throw indexError(context, "negative length (" + len + ")");
+        if (beg < 0 && (beg += realLength) < 0) throw indexError(context, "index " + (beg - realLength) + " out of array");
+
+        final RubyArray rplArr;
+        final int rlen;
+
+        if (rpl == null) {
+            rplArr = null;
+            rlen = 0;
+        } else if (rpl.isNil()) {
+            // 1.9 replaces with nil
+            rplArr = newArray(context.runtime, rpl);
+            rlen = 1;
+        } else {
+            rplArr = aryToAry(context, rpl);
+            rlen = rplArr.getLength();
+        }
+
+        splice(context, beg, len, rplArr, rlen);
+    }
+
+    /** rb_ary_splice
+     *
+     */
+    private void splice(ThreadContext context, int beg, int len, final RubyArray rplArr, final int rlen) {
+        if (len < 0) throw indexError(context, "negative length (" + len + ")");
+        if (beg < 0 && (beg += realLength) < 0) indexError(context, "index " + (beg - realLength) + " out of array");
+
+        unpack(context);
+        modify(context);
+
+        int valuesLength = values.length - begin;
+        if (beg >= realLength) {
+            len = beg + rlen;
+            if (len >= valuesLength) spliceRealloc(context, len, valuesLength);
+            try {
+                Helpers.fillNil(context, values, begin + realLength, begin + beg);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                throw concurrentModification(context, e);
+            }
+            realLength = len;
+        } else {
+            if (beg + len > realLength) len = realLength - beg;
+            int alen = realLength + rlen - len;
+            if (alen >= valuesLength) spliceRealloc(context, alen, valuesLength);
+
+            if (len != rlen) {
+                safeArrayCopy(context, values, begin + (beg + len), values, begin + beg + rlen, realLength - (beg + len));
+                realLength = alen;
+            }
+        }
+
+        if (rlen > 0) {
+            rplArr.copyInto(context, values, begin + beg, rlen);
+        }
+    }
+
+    /** rb_ary_splice
+     *
+     */
+    private final void spliceOne(ThreadContext context, long beg, IRubyObject rpl) {
+        if (beg < 0 && (beg += realLength) < 0) throw indexError(context, "index " + (beg - realLength) + " out of array");
+
+        unpack(context);
+        modify(context);
+
+        int valuesLength = values.length - begin;
+        if (beg >= realLength) {
+            int len = (int) beg + 1;
+            if (len >= valuesLength) spliceRealloc(context, len, valuesLength);
+            Helpers.fillNil(context, values, begin + realLength, begin + ((int) beg));
+            realLength = len;
+        } else {
+            int len = beg > realLength ? realLength - (int) beg : 0;
+            int alen = realLength + 1 - len;
+            if (alen >= valuesLength) spliceRealloc(context, alen, valuesLength);
+
+            if (len == 0) {
+                safeArrayCopy(context, values, begin + (int) beg, values, begin + (int) beg + 1, realLength - (int) beg);
+                realLength = alen;
+            }
+        }
+
+        safeArraySet(context, values, begin + (int) beg, rpl);
+    }
+
+    private void spliceRealloc(ThreadContext context, int length, int valuesLength) {
+        int tryLength = calculateBufferLength(context.runtime, valuesLength);
+        int len = length > tryLength ? length : tryLength;
+        IRubyObject[] vals = IRubyObject.array(len);
+        System.arraycopy(values, begin, vals, 0, realLength);
+
+        // only fill if there actually will remain trailing storage
+        if (len > length) Helpers.fillNil(context, vals, length, len);
+
+        begin = 0;
+        values = vals;
+    }
+
+    private void unshiftRealloc(ThreadContext context, int valuesLength) {
+        int newLength = valuesLength >> 1;
+        if (newLength < ARRAY_DEFAULT_SIZE) newLength = ARRAY_DEFAULT_SIZE;
+
+        newLength = addBufferLength(context, valuesLength, newLength);
+        IRubyObject[] vals = IRubyObject.array(newLength);
+
+        int shiftedBegin = newLength - valuesLength;
+        int unshiftedBegin = shiftedBegin - 1;
+
+        // copy existing elements to the end of the new array, to leave room for future unshifts
+        safeArrayCopy(context, values, begin, vals, shiftedBegin, valuesLength);
+        Helpers.fillNil(context, vals, 0, unshiftedBegin);
+
+        values = vals;
+        begin = unshiftedBegin;
+    }
+
+    public IRubyObject insert() {
+        throw argumentError(getRuntime().getCurrentContext(), 0, 1);
+    }
+
+    /** rb_ary_insert
+     *
+     */
+    public IRubyObject insert(ThreadContext context, IRubyObject arg) {
+        modifyCheck(context);
+        toLong(context, arg);
+        return this;
+    }
+
+    public IRubyObject insert(ThreadContext context, IRubyObject arg1, IRubyObject arg2) {
+        modifyCheck(context);
+        insert(context, toLong(context, arg1), arg2);
+        return this;
+    }
+
+    private void insert(ThreadContext context, long pos, IRubyObject val) {
+        if (pos == -1) pos = realLength;
+        else if (pos < 0) {
+            long minpos = -realLength - 1;
+            if (pos < minpos) throw indexError(context, "index " + pos + " too small for array; minimum: " + minpos);
+            pos++;
+        }
+
+        spliceOne(context, pos, val); // rb_ary_new4
+    }
+
+    public IRubyObject insert(ThreadContext context, IRubyObject[] args) {
+        switch (args.length) {
+            case 0:
+                return insert();
+            case 1:
+                return insert(args[0]);
+            case 2:
+                return insert(args[0], args[1]);
+        }
+
+        int argc = Arity.checkArgumentCount(context, args, 1, -1);
+
+        modifyCheck(context);
+
+        long pos = RubyNumeric.num2long(args[0]);
+
+        if (argc == 1) return this;
+
+        unpack(context);
+
+        if (pos == -1) pos = realLength;
+        if (pos < 0) pos++;
+
+        RubyArrayNative inserted = new RubyArrayNative(context.runtime, false);
+        inserted.values = args;
+        inserted.begin = 1;
+        inserted.realLength = argc - 1;
+
+        splice(context, checkInt(context, pos), 0, inserted, inserted.getLength()); // rb_ary_new4
+
+        return this;
+    }
+
+    /** rb_ary_transpose
+     *
+     */
+    public RubyArray transpose(ThreadContext context) {
+        int alen = realLength;
+        if (alen == 0) return aryDup();
+        int elen = -1;
+        IRubyObject[] result = null;
+
+        for (int i = 0; i < alen; i++) {
+            var tmp = elt(i).convertToArray();
+            if (elen < 0) {
+                elen = tmp.getLength();
+                result = IRubyObject.array(elen);
+                for (int j = 0; j < elen; j++) {
+                    result[j] = newBlankArray(context, alen);
+                }
+            } else if (elen != tmp.getLength()) {
+                throw indexError(context, "element size differs (" + tmp.getLength() + " should be " + elen + ")");
+            }
+            for (int j = 0; j < elen; j++) {
+                ((RubyArray<?>) result[j]).storeInternal(context, i, tmp.elt(j));
+            }
+        }
+        return new RubyArrayNative<>(context.runtime, result);
+    }
+
+    /** rb_values_at
+     *
+     */
+    public IRubyObject values_at(ThreadContext context, IRubyObject[] args) {
+        final int length = realLength;
+        RubyArray<?> result = Create.allocArray(context, args.length);
+
+        for (int i = 0; i < args.length; i++) {
+            final IRubyObject arg = args[i];
+            if (arg instanceof RubyFixnum fix) {
+                result.append(context, entry(fix.getValue()));
+                continue;
+            }
+
+            final int[] begLen;
+            if (!(arg instanceof RubyRange range)) {
+                // do result.append
+            } else if ((begLen = range.begLenInt(context, length, 1)) == null) {
+                continue;
+            } else {
+                final int beg = begLen[0];
+                final int len = begLen[1];
+                for (int j = 0; j < len; j++) {
+                    result.append(context, entry(j + beg));
+                }
+                continue;
+            }
+            result.append(context, entry(toLong(context, arg)));
+        }
+
+        return result;
+    }
+
+    /** rb_ary_subseq
+     *
+     */
+    public IRubyObject subseq(long beg, long len) {
+        return subseq(getRuntime().getArray(), beg, len, true);
+    }
+
+    /** rb_ary_subseq_step
+     *
+     */
+    public IRubyObject subseq_step(ThreadContext context, RubyArithmeticSequence arg0) {
+        long beg, len, end;
+        long step = getStep(context, arg0);
+        IRubyObject aseqBeg = getBegin(context, arg0);
+        IRubyObject aseqEnd = getEnd(context, arg0);
+        boolean aseqExcl = arg0.exclude_end(context).isTrue();
+        len = realLength;
+
+        if (step < 0) {
+            if (aseqExcl && !aseqEnd.isNil()) {
+                /* Handle exclusion before range reversal */
+                aseqEnd = asFixnum(context, toLong(context, aseqEnd) + 1);
+
+                /* Don't exclude the previous beginning */
+                aseqExcl = false;
+            }
+            IRubyObject tmp = aseqBeg;
+            aseqBeg = aseqEnd;
+            aseqEnd = tmp;
+        }
+
+        if (step < -1 || step > 1) {
+            int [] ret;
+            try {
+                ret = RubyRange.newRange(context, aseqBeg, aseqEnd, aseqExcl).begLenInt(context, (int)len, 1);
+            } catch(RaiseException ex){
+                if (ex.getException() instanceof RubyRangeError) {
+                    // convert exception message using an ArithsemeticSequece arg.
+                    // e.g.
+                    // [1].slice((-101..-1)%2) shoud throw "((-101..-1).%(2)) out of range".
+                    // The original exception message is "-1..-1 out of range".
+                    throw rangeError(context, arg0.inspect(context) + " out of range");
+                } else {
+                    throw ex;
+                }
+            }
+            if (ret != null && (ret[0] > len || ret[1] > len)) throw rangeError(context, arg0.inspect(context) + " out of range");
+        }
+
+        beg = aseqBeg.isNil() ? 0 : aseqBeg.convertToFloat().asLong(context);
+        end = aseqEnd.isNil() ? -1 : aseqEnd.convertToFloat().asLong(context);
+
+        if (aseqEnd.isNil()) aseqExcl = false;
+
+        if (beg < 0) {
+            beg += len;
+            if (beg < 0) throw rangeError(context, "integer " + beg + " out of range of fixnum");
+        }
+
+        if (end < 0) end += len;
+        if (!aseqExcl) end++;
+
+        len = end - beg;
+
+        if (len < 0) len = 0;
+
+        long alen = realLength;
+        if (beg > alen)  return context.nil;
+        if (beg < 0 || len < 0) return context.nil;
+
+        if (alen < len || alen < beg + len) len = alen - beg;
+
+        if (len == 0) return Create.newEmptyArray(context);
+        if (step == 0) throw rangeError(context, "slice step cannot be zero");
+        if (step == 1) return subseq(beg, len);
+
+        long orig_len = len;
+        if (step > 0 && step >= len) return Create.newArray(context, eltOk(beg));
+
+        if (step < 0 && (step < -len)) step = -len;
+
+        long ustep = (step < 0) ? -step : step;
+        len = (len + ustep - 1) / ustep;
+
+        long j = beg + ((step > 0) ? 0 : (orig_len - 1));
+        RubyArray<?> result1;
+        result1 = Create.allocArray(context, len);
+        RubyArray result = result1;
+
+        for(long i = 0; i < len; ++i) {
+            result.append(context, eltOk(j));
+            j = j + step;
+        }
+
+        return result;
+    }
+
+    private IRubyObject getBegin(ThreadContext context, RubyArithmeticSequence arg0) {
+      return arg0.begin(context);
+    }
+
+    private IRubyObject getEnd(ThreadContext context, RubyArithmeticSequence arg0) {
+        return arg0.end(context);
+    }
+
+    private Long getStep(ThreadContext context, RubyArithmeticSequence arg0) {
+        return arg0.step(context).isNil() ? null: toLong(context, arg0.step(context));
+    }
+
+    /** rb_ary_subseq
+     *
+     */
+    public IRubyObject subseqLight(long beg, long len) {
+        return subseq(metaClass, beg, len, true);
+    }
+
+    public IRubyObject subseq(RubyClass metaClass, long beg, long len, boolean light) {
+        Ruby runtime = metaClass.runtime;
+        if (beg > realLength || beg < 0 || len < 0) return runtime.getNil();
+
+        if (beg + len > realLength) {
+            len = realLength - beg;
+            if (len < 0) len = 0;
+        }
+
+        if (len == 0) return new RubyArrayNative(runtime, metaClass, IRubyObject.NULL_ARRAY, !light);
+        return makeShared(runtime.getCurrentContext(), begin + (int) beg, (int) len, new RubyArrayNative(runtime, metaClass, !light));
+    }
+
+    /** rb_ary_length
+     *
+     */
+    public RubyFixnum length(ThreadContext context) {
+        return asFixnum(context, realLength);
+    }
+
+    /**
+     * A size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
+     *
+     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
+     */
+    protected static IRubyObject size(ThreadContext context, RubyArray self, IRubyObject[] args) {
+        return self.length(context);
+    }
+
+    /** rb_ary_push - specialized rb_ary_store
+     *
+     */
+    public RubyArray append(ThreadContext context, IRubyObject item) {
+        unpack(context);
+        modify(context);
+        int valuesLength = values.length - begin;
+        if (realLength == valuesLength) {
+            if (realLength == Integer.MAX_VALUE) throw indexError(context, "index " + Integer.MAX_VALUE + " too big");
+
+            long newLength = valuesLength + (valuesLength >> 1);
+            if (newLength > Integer.MAX_VALUE) {
+                newLength = Integer.MAX_VALUE;
+            } else if (newLength < ARRAY_DEFAULT_SIZE) {
+                newLength = ARRAY_DEFAULT_SIZE;
+            }
+
+            realloc(context, (int) newLength, valuesLength);
+        }
+
+        safeArraySet(context, values, begin + realLength++, item);
+
+        return this;
+    }
+
+    public RubyArray push(ThreadContext context, IRubyObject item) {
+        append(context, item);
+
+        return this;
+    }
+
+    public RubyArray push(ThreadContext context, IRubyObject[] items) {
+        if (items.length == 0) modifyCheck(context);
+        for (IRubyObject item : items) {
+            append(context, item);
+        }
+        return this;
+    }
+
+    /** rb_ary_pop
+     *
+     */
+    public IRubyObject pop(ThreadContext context) {
+        unpack(context);
+        modifyCheck(context);
+
+        if (realLength == 0) return context.nil;
+
+        if (isShared) {
+            return safeArrayRef(context, values, begin + --realLength);
+        } else {
+            int index = begin + --realLength;
+            return safeArrayRefSet(context, values, index, context.nil);
+        }
+    }
+
+    public IRubyObject pop(ThreadContext context, IRubyObject num) {
+        unpack(context);
+        modifyCheck(context);
+        RubyArray result = makeSharedFirst(context, num, true);
+        realLength -= result.getLength();
+        return result;
+    }
+
+    /** rb_ary_shift
+     *
+     */
+    public IRubyObject shift(ThreadContext context) {
+        unpack(context);
+        modifyCheck(context);
+
+        if (realLength == 0) return context.nil;
+
+        final IRubyObject obj = safeArrayRefCondSet(context, values, begin, !isShared, context.nil);
+        begin++;
+        realLength--;
+        return obj;
+
+    }
+
+    public IRubyObject shift(ThreadContext context, IRubyObject num) {
+        unpack(context);
+        modify(context);
+
+        RubyArray result = makeSharedFirst(context, num, false);
+
+        int n = result.getLength();
+        begin += n;
+        realLength -= n;
+        return result;
+    }
+
+    public IRubyObject unshift(ThreadContext context) {
+        modifyCheck(context);
+        return this;
+    }
+    
+    /** rb_ary_unshift
+     *
+     */
+    public IRubyObject unshift(ThreadContext context, IRubyObject item) {
+        unpack(context);
+
+        if (begin == 0 || isShared) {
+            modify(context);
+            final int valuesLength = values.length - begin;
+            if (valuesLength == 0) {
+                alloc(context, ARRAY_DEFAULT_SIZE);
+                begin = ARRAY_DEFAULT_SIZE - 1;
+            } else if (realLength == valuesLength) {
+                unshiftRealloc(context, valuesLength);
+            } else {
+                safeArrayCopy(context, values, begin, values, begin + 1, realLength);
+            }
+        } else {
+            modifyCheck(context);
+            begin--;
+        }
+        realLength++;
+        values[begin] = item;
+        return this;
+    }
+
+    public IRubyObject unshift(ThreadContext context, IRubyObject[] items) {
+        unpack(context);
+
+        if (items.length == 0) {
+            modifyCheck(context);
+            return this;
+        }
+
+        final int len = realLength;
+        store(((long) len) + items.length - 1, context.nil);
+
+        try {
+            System.arraycopy(values, begin, values, begin + items.length, len);
+            ArraySupport.copy(items, 0, values, begin, items.length);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(context, e);
+        }
+
+        return this;
+    }
+
+    /** rb_ary_includes
+     *
+     */
+    public RubyBoolean include_p(ThreadContext context, IRubyObject item) {
+        return asBoolean(context, includes(context, item));
+    }
+
+    /** rb_ary_aref
+     */
+    public IRubyObject aref(ThreadContext context, IRubyObject arg0) {
+        if (arg0 instanceof RubyArithmeticSequence) {
+            return subseq_step(context, (RubyArithmeticSequence) arg0);
+        } else {
+            return arg0 instanceof RubyFixnum fixnum ? entry(fixnum.getValue()) : arefCommon(context, arg0);
+        }
+    }
+
+    private IRubyObject arefCommon(ThreadContext context, IRubyObject arg0) {
+        if (arg0 instanceof RubyRange range) {
+            long[] beglen = range.begLen(context, realLength, 0);
+            return beglen == null ? context.nil : subseq(beglen[0], beglen[1]);
+        } else {
+            ArraySites sites = sites(context);
+
+            if (RubyRange.isRangeLike(context, arg0, sites.begin_checked, sites.end_checked, sites.exclude_end_checked)) {
+                RubyRange range = RubyRange.rangeFromRangeLike(context, arg0, sites.begin, sites.end, sites.exclude_end);
+
+                long[] beglen = range.begLen(context, realLength, 0);
+                return beglen == null ? context.nil : subseq(beglen[0], beglen[1]);
+            }
+        }
+        return entry(toLong(context, arg0));
+    }
+
+    public IRubyObject aref(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
+        long beg = toLong(context, arg0);
+        if (beg < 0) beg += realLength;
+        return subseq(beg, toLong(context, arg1));
+    }
+
+    public IRubyObject aset(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
+        modifyCheck(context);
+        if (arg0 instanceof RubyFixnum) {
+            store(((RubyFixnum) arg0).getValue(), arg1);
+        } else if (arg0 instanceof RubyRange range) {
+            int beg0 = checkLongForInt(context, range.begLen0(context, realLength));
+            int beg1 = checkLongForInt(context, range.begLen1(context, realLength, beg0));
+            splice(context, beg0, beg1, arg1);
+        } else {
+            asetFallback(context, arg0, arg1);
+        }
+        return arg1;
+    }
+
+    // stand in method for checkInt as it raises the wrong type of 
+    // exception to mri
+    private int checkLongForInt(ThreadContext context, long value) {
+        if (((int)value) != value) throw indexError(context, String.format("index %d is too big", value));
+
+        return (int)value;
+    }
+
+    private void asetFallback(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
+        ArraySites sites = sites(context);
+
+        if (RubyRange.isRangeLike(context, arg0, sites.begin_checked, sites.end_checked, sites.exclude_end_checked)) {
+            RubyRange range = RubyRange.rangeFromRangeLike(context, arg0, sites.begin, sites.end, sites.exclude_end);
+
+            int beg = checkInt(context, range.begLen0(context, realLength));
+            splice(context, beg, checkInt(context, range.begLen1(context, realLength, beg)), arg1);
+        } else {
+            store(toLong(context, arg0), arg1);
+        }
+    }
+
+    /** rb_ary_aset
+    *
+    */
+    public IRubyObject aset(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
+        modifyCheck(context);
+        splice(context, toInt(context, arg0), toInt(context, arg1), arg2);
+        return arg2;
+    }
+
+    /** rb_ary_at
+     *
+     */
+    public IRubyObject at(ThreadContext context, IRubyObject pos) {
+        return entry(toLong(context, pos));
+    }
+
+	/** rb_ary_concat
+     *
+     */
+    public RubyArray concat(ThreadContext context, IRubyObject obj) {
+        modifyCheck(context);
+
+        concat(context, obj.convertToArray());
+        return this;
+    }
+
+    private void concat(ThreadContext context, RubyArray<?> obj) {
+        splice(context, realLength, 0, obj, obj.getLength());
+    }
+
+    // MRI: ary_append
+    public RubyArray aryAppend(ThreadContext context, RubyArray<?> y) {
+        if (y.getLength() > 0) splice(context, realLength, 0, y, y.getLength());
+        return this;
+    }
+
+    /** rb_ary_concat_multi
+     *
+     */
+    public RubyArray concat(ThreadContext context, IRubyObject[] objs) {
+        modifyCheck(context);
+        if (objs.length == 0) return this;
+
+        final int len = objs.length;
+        RubyArray<?> result = Create.allocArray(context, len);
+
+        for (IRubyObject obj : objs) {
+            result.concat(context, obj.convertToArray());
+        }
+
+        return aryAppend(context, result);
+    }
+
+    public RubyArray concat(IRubyObject obj) {
+        return concat(metaClass.runtime.getCurrentContext(), obj);
+    }
+
+    /** inspect_ary
+     *
+     */
+    protected IRubyObject inspectAry(ThreadContext context) {
+        RubyString str = RubyString.newStringLight(context.runtime, DEFAULT_INSPECT_STR_SIZE, USASCIIEncoding.INSTANCE);
+        str.cat((byte) '[');
+
+        for (int i = 0; i < realLength; i++) {
+
+            RubyString s = inspect(context, safeArrayRef(context, values, begin + i));
+            if (i > 0) {
+                ByteList bytes = str.getByteList();
+                bytes.append((byte) ',').append((byte) ' ');
+            } else {
+                EncodingUtils.encAssociateIndex(str, s.getEncoding());
+            }
+            str.catWithCodeRange(s);
+        }
+        str.cat((byte) ']');
+
+        return str;
+    }
+
+    /** rb_ary_inspect
+    *
+    */
+    public RubyString inspect(ThreadContext context) {
+        final Ruby runtime = context.runtime;
+        if (realLength == 0) return newSharedString(context, EMPTY_ARRAY_BL);
+        if (runtime.isInspecting(this)) return newSharedString(context, RECURSIVE_ARRAY_BL);
+
+        try {
+            runtime.registerInspecting(this);
+            return (RubyString) inspectAry(context);
+        } finally {
+            runtime.unregisterInspecting(this);
+        }
+    }
+
+    // MRI: rb_ary_first
+    @JRubyAPI
+    public IRubyObject first(ThreadContext context) {
+        return realLength == 0 ? context.nil : eltOk(0);
+    }
+
+    // MRI: rb_ary_first
+    @JRubyAPI
+    public IRubyObject first(ThreadContext context, IRubyObject arg0) {
+        long n = toLong(context, arg0);
+        if (n > realLength) {
+            n = realLength;
+        } else if (n < 0) {
+            throw argumentError(context, "negative array size (or size too big)");
+        } else if (n == 1) {
+            return Create.newArray(context, eltOk(0));
+        } else if (n == 2) {
+            return Create.newArray(context, eltOk(0), eltOk(1));
+        }
+
+        unpack(context);
+        return makeShared(context, begin, (int) n, arrayClass(context));
+    }
+
+
+    // MRI: rb_ary_last
+    @JRubyAPI
+    public IRubyObject last(ThreadContext context) {
+        return realLength == 0 ? context.nil : eltOk(realLength - 1);
+    }
+
+    /** rb_ary_last
+     *
+     */
+    public IRubyObject last(ThreadContext context, IRubyObject arg0) {
+        long n = toLong(context, arg0);
+        if (n > realLength) n = realLength;
+
+        if (n < 0) throw argumentError(context, "negative array size (or size too big)");
+        if (n == 1) return Create.newArray(context, eltOk(realLength - 1));
+        if (n == 2) return Create.newArray(context, eltOk(realLength - 2), eltOk(realLength - 1));
+
+        unpack(context);
+        return makeShared(context, begin + realLength - (int) n, (int) n, arrayClass(context));
+    }
+
+    /**
+     * mri: rb_ary_each
+     */
+    public IRubyObject each(ThreadContext context, Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "each", RubyArray::size);
+
+        for (int i = 0; i < size(); i++) {
+            // do not coarsen the "safe" catch, since it will misinterpret AIOOBE from the yielded code.
+            // See JRUBY-5434
+            block.yield(context, eltOk(i));
+        }
+        return this;
+    }
+
+    public IRubyObject eachSlice(ThreadContext context, int size, Block block) {
+        unpack(context);
+        var array = arrayClass(context);
+
+        // local copies of everything
+        int realLength = this.getLength();
+        int begin = this.begin;
+
+        // sliding window
+        RubyArrayNative window = makeShared(context, begin, size, array);
+
+        // don't expose shared array to ruby
+        Signature signature = block.getSignature();
+        final boolean specificArity = signature.isFixed() && signature.required() != 1;
+
+        for (; realLength >= size; realLength -= size) {
+            block.yield(context, window);
+            if (specificArity) { // array is never exposed to ruby, just use for yielding
+                window.begin = begin += size;
+            } else { // array may be exposed to ruby, create new
+                window = makeShared(context, begin += size, size, array);
+            }
+        }
+
+        // remainder
+        if (realLength > 0) {
+            window.realLength = realLength;
+            block.yield(context, window);
+        }
+        return this;
+    }
+
+    public IRubyObject each_slice(ThreadContext context, IRubyObject arg, Block block) {
+        final int size = toInt(context, arg);
+        if (size <= 0) throw argumentError(context, "invalid slice size");
+        return block.isGiven() ?
+                eachSlice(context, size, block) :
+                enumeratorizeWithSize(context, this, "each_slice", arg, arg);
+    }
+
+    /** rb_ary_each_index
+     *
+     */
+    public IRubyObject eachIndex(ThreadContext context, Block block) {
+        if (!block.isGiven()) throw context.runtime.newLocalJumpErrorNoBlock();
+
+        for (int i = 0; i < realLength; i++) {
+            block.yield(context, asFixnum(context, i));
+        }
+        return this;
+    }
+
+    public IRubyObject each_index(ThreadContext context, Block block) {
+        return block.isGiven() ? eachIndex(context, block) : enumeratorizeWithSize(context, this, "each_index", RubyArray::size);
+    }
+
+    /** rb_ary_reverse_each
+     *
+     */
+    public IRubyObject reverseEach(ThreadContext context, Block block) {
+        int len = realLength;
+
+        while(len-- > 0) {
+            // do not coarsen the "safe" catch, since it will misinterpret AIOOBE from the yielded code.
+            // See JRUBY-5434
+            block.yield(context, eltOk(len));
+            if (realLength < len) len = realLength;
+        }
+
+        return this;
+    }
+
+    public IRubyObject reverse_each(ThreadContext context, Block block) {
+        return block.isGiven() ? reverseEach(context, block) : enumeratorizeWithSize(context, this, "reverse_each", RubyArray::size);
+    }
+
+    // MRI: ary_join_0
+    protected int joinStrings(RubyString sep, int max, RubyString result) {
+        if (max > 0 && eltOk(0) instanceof EncodingCapable ec) result.setEncoding(ec.getEncoding());
+
+        int i;
+        try {
+            for (i = 0; i < max; i++) {
+                IRubyObject val = eltInternal(i);
+                if (!(val instanceof RubyString)) break;
+                if (i > 0 && sep != null) result.catWithCodeRange(sep);
+                result.append(val);
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(getRuntime().getCurrentContext(), e);
+        }
+
+        return i;
+    }
+
+    // MRI: ary_join_1
+    private RubyString joinAny(ThreadContext context, RubyString sep, int i, RubyString result, boolean[] first) {
+        assert i >= 0 : "joining elements before beginning of array";
+        JavaSites.CheckedSites to_ary_checked = null;
+
+        for (; i < realLength; i++) {
+            if (i > 0 && sep != null) result.catWithCodeRange(sep);
+
+            IRubyObject val = eltOk(i);
+
+            if (val instanceof RubyString) {
+                strJoin(result, (RubyString) val, first);
+            } else if (val instanceof RubyArrayNative aryNative) {
+                recursiveJoin(context, val, sep, result, aryNative, first);
+            } else if (val instanceof RubyArray) {
+                throw new RuntimeException("unsupported array type: " + val.getClass().getName());
+            } else {
+                IRubyObject tmp = val.checkStringType();
+                if (tmp != context.nil) {
+                    strJoin(result, (RubyString) tmp, first);
+                    continue;
+                }
+
+                if (to_ary_checked == null) to_ary_checked = sites(context).to_ary_checked;
+
+                tmp = TypeConverter.convertToTypeWithCheck(context, val, arrayClass(context), to_ary_checked);
+                if (tmp != context.nil) {
+                    if (tmp instanceof RubyArrayNative aryNative) {
+                        recursiveJoin(context, val, sep, result, aryNative, first);
+                    } else if (val instanceof RubyArray) {
+                        throw new RuntimeException("unsupported array type: " + val.getClass().getName());
+                    }
+                } else {
+                    strJoin(result, RubyString.objAsString(context, val), first);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    // MRI: ary_join_1, str_join label
+    private static void strJoin(RubyString result, RubyString val, boolean[] first) {
+        result.catWithCodeRange(val);
+        if (first[0]) {
+            result.setEncoding(val.getEncoding());
+            first[0] = false;
+        }
+    }
+
+    private void recursiveJoin(final ThreadContext context, final IRubyObject outValue,
+                               final RubyString sep, final RubyString result, final RubyArrayNative ary, final boolean[] first) {
+
+        if (ary == this) throw argumentError(context, "recursive array join");
+
+        first[0] = false;
+
+        context.safeRecurse(JOIN_RECURSIVE, new JoinRecursive.State(ary, outValue, sep, result, first), outValue, "join", true);
+    }
+
+    /** rb_ary_join
+     *
+     */
+    public IRubyObject join(final ThreadContext context, IRubyObject sep) {
+        if (sep == context.nil) sep = getDefaultSeparator(context);
+
+        if (realLength == 0) return RubyString.newEmptyString(context.runtime, USASCIIEncoding.INSTANCE);
+
+        int len = 1;
+        RubyString sepString = null;
+        if (sep != context.nil) {
+            sepString = sep.convertToString();
+            len += sepString.size() * (realLength - 1);
+        }
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject val = eltOk(i);
+            IRubyObject tmp = val.checkStringType();
+            if (tmp == context.nil || tmp != val) {
+                if (i > realLength) i = realLength;
+                len += (realLength - i) * 10;
+                RubyString result = RubyString.newStringLight(context.runtime, len, USASCIIEncoding.INSTANCE);
+                i = joinStrings(sepString, i, result);
+                boolean[] first = new boolean[] { i == 0 };
+                return joinAny(context, sepString, i, result, first);
+            }
+
+            len += ((RubyString) tmp).getByteList().length();
+        }
+
+        RubyString result = RubyString.newStringLight(context.runtime, len);
+        joinStrings(sepString, realLength, result);
+
+        return result;
+    }
+
+    public IRubyObject join(ThreadContext context) {
+        return join(context, context.nil);
+    }
+
+    private IRubyObject getDefaultSeparator(ThreadContext context) {
+        IRubyObject sep = globalVariables(context).get("$,");
+
+        if (!sep.isNil()) warnDeprecated(context, "$, is set to non-nil value");
+
+        return sep;
+    }
+
+    /** rb_ary_to_a
+     *
+     */
+    @Override
+    public RubyArray to_a(ThreadContext context) {
+        final RubyClass arrayClass = arrayClass(context);
+        return this.metaClass != arrayClass ?
+            dupImpl(context.runtime, arrayClass) : this;
+    }
+
+    public IRubyObject to_h(ThreadContext context, Block block) {
+        boolean useSmallHash = realLength <= 10;
+        RubyHash hash = useSmallHash ? newSmallHash(context) : newHash(context);
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject e = eltOk(i);
+            IRubyObject elt = block.isGiven() ? block.yield(context, e) : e;
+            IRubyObject key_value_pair = elt.checkArrayType();
+
+            if (key_value_pair == context.nil) throw typeError(context, "wrong element type ", elt, " at " + i + " (expected array)");
+
+            RubyArray ary = (RubyArray)key_value_pair;
+            if (ary.getLength() != 2) {
+                throw argumentError(context, "wrong array length at " + i + " (expected 2, was " + ary.getLength() + ")");
+            }
+
+            if (useSmallHash) {
+                hash.fastASetSmall(context.runtime, ary.eltOk(0), ary.eltOk(1), true);
+            } else {
+                hash.fastASet(context.runtime, ary.eltOk(0), ary.eltOk(1), true);
+            }
+        }
+        return hash;
+    }
+
+    /** rb_ary_equal
+     *
+     */
+    @Override
+    public IRubyObject op_equal(ThreadContext context, IRubyObject obj) {
+        if (this == obj) return context.tru;
+
+        if (!(obj instanceof RubyArray)) {
+            if (obj == context.nil) return context.fals;
+
+            if (!sites(context).respond_to_to_ary.respondsTo(context, obj, obj)) {
+                return context.fals;
+            }
+            return Helpers.rbEqual(context, obj, this);
+        }
+        return RecursiveComparator.compare(context, sites(context).op_equal, this, obj, false);
+    }
+
+    public RubyBoolean compare(ThreadContext context, CallSite site, IRubyObject other) {
+        if (!(other instanceof RubyArray)) {
+            if (!sites(context).respond_to_to_ary.respondsTo(context, other, other)) return context.fals;
+
+            return Helpers.rbEqual(context, other, this);
+        }
+
+        RubyArray ary = (RubyArray) other;
+
+        if (realLength != ary.getLength()) return context.fals;
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject a = elt(i);
+            IRubyObject b = ary.elt(i);
+
+            if (a == b) continue; // matching MRI opt. mock frameworks can throw errors if we don't
+
+            if (!site.call(context, a, a, b).isTrue()) return context.fals;
+        }
+
+        return context.tru;
+    }
+
+    /** rb_ary_eql
+     *
+     */
+    public IRubyObject eql(ThreadContext context, IRubyObject obj) {
+        if(!(obj instanceof RubyArray)) {
+            return context.fals;
+        }
+        return RecursiveComparator.compare(context, sites(context).eql, this, obj, true);
+    }
+
+    /** rb_ary_compact_bang
+     *
+     */
+    public IRubyObject compact_bang(ThreadContext context) {
+        unpack(context);
+        modify(context);
+
+        int p = begin;
+        int t = p;
+        int end = p + realLength;
+
+        try {
+            while (t < end) {
+                if (values[t].isNil()) {
+                    t++;
+                } else {
+                    values[p++] = values[t++];
+                }
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(context, e);
+        }
+
+        p -= begin;
+        if (realLength == p) return context.nil;
+
+        realloc(context, p, values.length - begin);
+        realLength = p;
+        return this;
+    }
+
+    // MRI: rb_ary_compact
+    public IRubyObject compact(ThreadContext context) {
+        RubyArray ary = aryDup();
+        ary.compact_bang(context);
+        return ary;
+    }
+
+    /** rb_ary_empty_p
+     *
+     */
+    public IRubyObject empty_p(ThreadContext context) {
+        return realLength == 0 ? context.tru : context.fals;
+    }
+
+    /** rb_ary_clear
+     *
+     */
+    public IRubyObject rb_clear(ThreadContext context) {
+        modifyCheck(context);
+
+        if (isShared) {
+            alloc(context, ARRAY_DEFAULT_SIZE);
+            isShared = false;
+        } else if (values.length > ARRAY_DEFAULT_SIZE << 1) {
+            alloc(context, ARRAY_DEFAULT_SIZE << 1);
+        } else {
+            try {
+                begin = 0;
+                Helpers.fillNil(context, values, 0, realLength);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                throw concurrentModification(context, e);
+            }
+        }
+
+        realLength = 0;
+        return this;
+    }
+
+    public IRubyObject fill(ThreadContext context, Block block) {
+        if (!block.isGiven()) throw argumentError(context, 0, 1);
+        return fillCommon(context, 0, realLength, block);
+    }
+
+    public IRubyObject fill(ThreadContext context, IRubyObject arg, Block block) {
+        if (!block.isGiven()) return fillCommon(context, 0, realLength, arg);
+        if (arg instanceof RubyRange range) {
+            int[] beglen = range.begLenInt(context, realLength, 1);
+            return fillCommon(context, beglen[0], beglen[1], block);
+        }
+
+        int beg = fillBegin(context, arg);
+        return fillCommon(context, beg, fillLen(context, beg, null),  block);
+    }
+
+    public IRubyObject fill(ThreadContext context, IRubyObject arg1, IRubyObject arg2, Block block) {
+        if (block.isGiven()) {
+            int beg = fillBegin(context, arg1);
+            return fillCommon(context, beg, fillLen(context, beg, arg2), block);
+        } else if (arg2 instanceof RubyRange range) {
+            int[] beglen = range.begLenInt(context, realLength, 1);
+            return fillCommon(context, beglen[0], beglen[1], arg1);
+        } else {
+            int beg = fillBegin(context, arg2);
+            return fillCommon(context, beg, fillLen(context, beg, null), arg1);
+        }
+    }
+
+    public IRubyObject fill(ThreadContext context, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3, Block block) {
+        if (block.isGiven()) throw argumentError(context, 3, 2);
+
+        int beg = fillBegin(context, arg2);
+        return fillCommon(context, beg, fillLen(context, beg, arg3), arg1);
+    }
+
+    private int fillBegin(ThreadContext context, IRubyObject arg) {
+        int beg = arg.isNil() ? 0 : toInt(context, arg);
+        if (beg < 0) {
+            beg = realLength + beg;
+            if (beg < 0) beg = 0;
+        }
+        return beg;
+    }
+
+    private long fillLen(ThreadContext context, long beg, IRubyObject arg) {
+        return arg == null || arg.isNil() ? realLength - beg : toLong(context, arg);
+    }
+
+    protected IRubyObject fillCommon(ThreadContext context, int beg, long len, IRubyObject item) {
+        unpack(context);
+        modify(context);
+
+        if (len < 0) return this;
+
+        if (len > Integer.MAX_VALUE - beg) throw argumentError(context, "argument too big");
+
+        int end = (int)(beg + len);
+        if (end > realLength) {
+            resizeAndFillBackingArray(context, end);
+            realLength = end;
+        }
+
+        if (len > 0) {
+            try {
+                Arrays.fill(values, begin + beg, begin + end, item);
+            } catch (ArrayIndexOutOfBoundsException ex) {
+                throw concurrentModification(context, ex);
+            }
+        }
+
+        return this;
+    }
+
+    protected IRubyObject fillCommon(ThreadContext context, int beg, long len, Block block) {
+        unpack(context);
+        modify(context);
+
+        if (len < 0) return this;
+
+        if (len > Integer.MAX_VALUE - beg) throw argumentError(context, "argument too big");
+
+        int end = (int)(beg + len);
+        if (end > realLength) {
+            resizeAndFillBackingArray(context, end);
+            realLength = end;
+        }
+
+        for (int i = beg; i < end; i++) {
+            IRubyObject v = block.yield(context, asFixnum(context, i));
+            if (i >= realLength) break;
+            safeArraySet(context, values, begin + i, v);
+        }
+        return this;
+    }
+
+
+    /** rb_ary_index
+     *
+     */
+    public IRubyObject index(ThreadContext context, IRubyObject obj) {
+        for (int i = 0; i < realLength; i++) {
+            if (equalInternal(context, eltOk(i), obj)) return asFixnum(context, i);
+        }
+
+        return context.nil;
+    }
+
+    public IRubyObject index(ThreadContext context, IRubyObject obj, Block unused) {
+        if (unused.isGiven()) warn(context, "given block not used");
+        return index(context, obj);
+    }
+
+    public IRubyObject index(ThreadContext context, Block block) {
+        if (!block.isGiven()) return enumeratorize(context.runtime, this, "index");
+
+        for (int i = 0; i < realLength; i++) {
+            if (block.yield(context, eltOk(i)).isTrue()) return asFixnum(context, i);
+        }
+
+        return context.nil;
+    }
+
+    public IRubyObject bsearch(ThreadContext context, Block block) {
+        if (!block.isGiven()) {
+            return enumeratorize(context.runtime, this, "bsearch");
+        }
+
+        int rVal = bsearch_index_internal(context, block);
+        if (rVal == -1) {
+            return context.nil;
+        } else {
+            return eltOk(rVal);
+        }
+    }
+
+    public IRubyObject bsearch_index(ThreadContext context, Block block) {
+        if (!block.isGiven()) {
+            return enumeratorize(context.runtime, this, "bsearch_index");
+        }
+        int rVal = bsearch_index_internal(context, block);
+        if (rVal == -1) {
+            return context.nil;
+        } else {
+            return asFixnum(context, rVal);
+        }
+    }
+
+    private int bsearch_index_internal(ThreadContext context, Block block) {
+        Ruby runtime = context.runtime;
+
+        int low = 0, high = realLength, mid;
+        boolean smaller = false, satisfied = false;
+        IRubyObject v;
+        CallSite op_cmp = null;
+
+        while (low < high) {
+            mid = low + ((high - low) / 2);
+            v = block.yieldSpecific(context, eltOk(mid));
+
+            if (v instanceof RubyFixnum fixnum) {
+                long fixValue = fixnum.getValue();
+                if (fixValue == 0) return mid;
+                smaller = fixValue < 0;
+            } else if (v == context.tru) {
+                satisfied = true;
+                smaller = true;
+            } else if (v == context.fals || v == context.nil) {
+                smaller = false;
+            } else if (runtime.getNumeric().isInstance(v)) {
+                if (op_cmp == null) op_cmp = sites(context).op_cmp_bsearch;
+                var zero = asFixnum(context, 0);
+                switch (RubyComparable.cmpint(context, op_cmp.call(context, v, v, zero), v, zero)) {
+                    case 0: return mid;
+                    case 1: smaller = false; break;
+                    case -1: smaller = true;
+                }
+            } else {
+                throw typeError(context, "wrong argument type ", v, " (must be numeric, true, false or nil");
+            }
+            if (smaller) {
+                high = mid;
+            } else {
+                low = mid + 1;
+            }
+        }
+        if (low == realLength) return -1;
+        if (!satisfied) return -1;
+        return low;
+    }
+
+    /** rb_ary_rindex
+     *
+     */
+    public IRubyObject rindex(ThreadContext context, IRubyObject obj) {
+        unpack(context);
+        
+        int i = realLength;
+
+        while (i-- > 0) {
+            if (i > realLength) {
+                i = realLength;
+                continue;
+            }
+            if (equalInternal(context, eltOk(i), obj)) return asFixnum(context, i);
+        }
+
+        return context.nil;
+    }
+
+    public IRubyObject rindex(ThreadContext context, IRubyObject obj, Block unused) {
+        if (unused.isGiven()) warn(context, "given block not used");
+        return rindex(context, obj);
+    }
+
+    public IRubyObject rindex(ThreadContext context, Block block) {
+        if (!block.isGiven()) return enumeratorize(context.runtime, this, "rindex");
+
+        int i = realLength;
+
+        while (i-- > 0) {
+            if (i >= realLength) {
+                i = realLength;
+                continue;
+            }
+            if (block.yield(context, eltOk(i)).isTrue()) return asFixnum(context, i);
+        }
+
+        return context.nil;
+    }
+
+    /** rb_ary_reverse_bang
+     *
+     */
+    public IRubyObject reverse_bang(ThreadContext context) {
+        modify(context);
+
+        try {
+            if (realLength > 1) {
+                int len = realLength;
+                for (int i = 0; i < len >> 1; i++) {
+                    T tmp = eltInternal(i);
+                    eltInternalSet(i, eltInternal(len - i - 1));
+                    eltInternalSet(len - i - 1, tmp);
+                }
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(context, e);
+        }
+        return this;
+    }
+
+    // MRI: rb_ary_reverse_m
+    @JRubyAPI
+    public IRubyObject reverse(ThreadContext context) {
+        return realLength > 1 ? safeReverse() : aryDup();
+    }
+
+    protected RubyArray safeReverse() {
+        int length = realLength;
+        int myBegin = this.begin;
+        IRubyObject[] myValues = this.values;
+        IRubyObject[] vals = IRubyObject.array(length);
+
+        final Ruby runtime = metaClass.runtime;
+        try {
+            for (int i = 0; i <= length >> 1; i++) {
+                vals[i] = myValues[myBegin + length - i - 1];
+                vals[length - i - 1] = myValues[myBegin + i];
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(runtime.getCurrentContext(), e);
+        }
+        return new RubyArrayNative(runtime, runtime.getArray(), vals);
+    }
+
+    /**
+     * Collect the contents of this array after filtering through block, or return a new equivalent array if the block
+     * is not given (!isGiven()).
+     *
+     * @param context the current context
+     * @param block a block for filtering or NULL_BLOCK
+     * @return an array of the filtered or unfiltered results
+     */
+    public RubyArray collectArray(ThreadContext context, Block block) {
+        if (!block.isGiven()) return makeShared();
+
+        RubyArray<?> ary = Create.allocArray(context, realLength);
+
+        for (int i = 0; i < realLength; i++) {
+            // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield (see JRUBY-5434)
+            // arr[i] = ...
+            ary.append(context, block.yieldNonArray(context, eltOk(i), null));
+        }
+
+        return ary;
+    }
+
+    /**
+     * Produce a new enumerator that will filter the contents of this array using {@link #collectArray(ThreadContext, Block)}.
+     *
+     * @param context the current context
+     * @return an enumerator that will filter results
+     */
+    public RubyEnumerator collectEnum(ThreadContext context) {
+        return enumWithSize(context, this, "collect", RubyArray::size);
+    }
+
+    /**
+     * @see #collectArray(ThreadContext, Block)
+     */
+    public RubyArray collect(ThreadContext context, Block block) {
+        return collectArray(context, block);
+    }
+
+    /** rb_ary_collect
+     *
+     */
+    public IRubyObject rbCollect(ThreadContext context, Block block) {
+        return block.isGiven() ? collectArray(context, block) : collectEnum(context);
+    }
+
+    public IRubyObject map(ThreadContext context, Block block) {
+        return block.isGiven() ? collectArray(context, block) : enumeratorizeWithSize(context, this, "map", RubyArray::size);
+    }
+
+    /** rb_ary_collect_bang
+     *
+     */
+    public RubyArray collectBang(ThreadContext context, Block block) {
+        if (!block.isGiven()) throw context.runtime.newLocalJumpErrorNoBlock();
+        modify(context);
+
+        for (int i = 0; i < realLength; i++) {
+            // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield
+            // See JRUBY-5434
+            storeInternal(context, i, block.yield(context, eltOk(i)));
+        }
+
+        return this;
+    }
+
+    /** rb_ary_collect_bang
+    *
+    */
+    public IRubyObject collect_bang(ThreadContext context, Block block) {
+        return block.isGiven() ? collectBang(context, block) : enumeratorizeWithSize(context, this, "collect!", RubyArray::size);
+    }
+
+    /** rb_ary_collect_bang
+    *
+    */
+    public IRubyObject map_bang(ThreadContext context, Block block) {
+        return block.isGiven() ? collectBang(context, block) : enumeratorizeWithSize(context, this, "map!", RubyArray::size);
+    }
+
+    /** rb_ary_select
+     *
+     */
+    public IRubyObject selectCommon(ThreadContext context, Block block) {
+        final Ruby runtime = context.runtime;
+
+        // Packed array logic
+        switch (realLength) {
+            case 1: {
+                IRubyObject value = eltOk(0);
+                if (block.yield(context, value).isTrue()) return new RubyArrayOneObject(runtime, value);
+                return newEmptyArray(runtime);
+            }
+            case 2: {
+                IRubyObject value = eltOk(0);
+                boolean first = block.yield(context, value).isTrue();
+                IRubyObject value2 = eltOk(1);
+                boolean second = block.yield(context, value2).isTrue();
+                if (first) {
+                    if (second) return newArray(runtime, value, value2);
+                    return newArray(runtime, value);
+                } else if (second) {
+                    return newArray(runtime, value2);
+                }
+                return newEmptyArray(runtime);
+            }
+        }
+
+        RubyArray<?> result = Create.allocArray(context, realLength);
+
+        for (int i = 0; i < realLength; i++) {
+            // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield (see JRUBY-5434)
+            IRubyObject value = eltOk(i);
+            if (block.yield(context, value).isTrue()) result.append(context, value);
+        }
+
+        return result;
+    }
+
+    public IRubyObject select(ThreadContext context, Block block) {
+        return block.isGiven() ? selectCommon(context, block) : enumeratorizeWithSize(context, this, "select", RubyArray::size);
+    }
+
+    public IRubyObject select_bang(ThreadContext context, Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "select!", RubyArray::size);
+
+        unpack(context);
+        modify(context);
+
+        boolean modified = false;
+        int len0 = 0, len1 = 0;
+
+        try {
+            int i1, i2;
+            for (i1 = i2 = 0; i1 < realLength; len0 = ++i1) {
+                // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield (see JRUBY-5434)
+                IRubyObject value = eltOk(i1);
+
+                if (!block.yield(context, value).isTrue()) {
+                    modified = true;
+                    continue;
+                }
+
+                if (i1 != i2) eltSetOk(i2, (T) value);
+                len1 = ++i2;
+            }
+            return (i1 == i2) ? context.nil : this;
+        }
+        finally {
+            if (modified) checkFrozen();
+            selectBangEnsure(context, len0, len1);
+        }
+    }
+
+    public IRubyObject keep_if(ThreadContext context, Block block) {
+        if (!block.isGiven()) {
+            return enumeratorizeWithSize(context, this, "keep_if", RubyArray::size);
+        }
+        select_bang(context, block);
+        return this;
+    }
+
+    /** rb_ary_delete
+     *
+     */
+    public IRubyObject delete(ThreadContext context, IRubyObject item, Block block) {
+        unpack(context);
+        int i2 = 0;
+        IRubyObject value = item;
+
+        for (int i1 = 0; i1 < realLength; i1++) {
+            // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from equalInternal (see JRUBY-5434)
+            IRubyObject e = safeArrayRef(context, values, begin + i1);
+            if (equalInternal(context, e, item)) {
+                value = e;
+                continue;
+            }
+            if (i1 != i2) store(i2, e);
+            i2++;
+        }
+
+        if (realLength == i2) return block.isGiven() ? block.yield(context, item) : context.nil;
+
+        modify(context);
+
+        final int myRealLength = this.realLength;
+        final int myBegin = this.begin;
+        final IRubyObject[] myValues = this.values;
+        try {
+            if (myRealLength > i2) {
+                Helpers.fillNil(context, myValues, myBegin + i2, myBegin + myRealLength);
+                this.realLength = i2;
+                int valuesLength = myValues.length - myBegin;
+                if (i2 << 1 < valuesLength && valuesLength > ARRAY_DEFAULT_SIZE) realloc(context, i2 << 1, valuesLength);
+            }
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+
+        return value;
+    }
+
+    /** rb_ary_delete_at
+     *
+     */
+    public IRubyObject delete_at(ThreadContext context, int pos) {
+        int len = realLength;
+        if (pos >= len || (pos < 0 && (pos += len) < 0)) return context.nil;
+
+        unpack(context);
+        modify(context);
+
+        try {
+            IRubyObject obj = values[begin + pos];
+            // fast paths for head and tail
+            if (pos == 0) {
+                values[begin] = context.nil;
+                begin++;
+                realLength--;
+                return obj;
+            } else if (pos == realLength - 1) {
+                values[begin + realLength - 1] = context.nil;
+                realLength--;
+                return obj;
+            }
+
+            System.arraycopy(values, begin + pos + 1, values, begin + pos, len - (pos + 1));
+            values[begin + len - 1] = context.nil;
+            realLength--;
+
+            return obj;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(context, e);
+        }
+    }
+
+    /** rb_ary_delete_at_m
+     *
+     */
+    public IRubyObject delete_at(ThreadContext context, IRubyObject obj) {
+        return delete_at(toInt(context, obj));
+    }
+
+    /** rb_ary_reject_bang
+     *
+     */
+    public final IRubyObject rejectCommon(ThreadContext context, Block block) {
+        var ary = Create.newArray(context);
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = eltOk(i);
+            if (!block.yieldSpecific(context, v).isTrue()) {
+                ary.push(context, v);
+            }
+        }
+        return ary;
+    }
+
+    public IRubyObject reject(ThreadContext context, Block block) {
+        return block.isGiven() ? rejectCommon(context, block) : enumeratorizeWithSize(context, this, "reject", RubyArray::size);
+    }
+
+    // MRI: ary_reject_bang and reject_bang_i
+    public IRubyObject rejectBang(ThreadContext context, Block block) {
+        unpack(context);
+        modify(context);
+
+        final int beg = begin;
+        boolean modified = false;
+
+        int len0 = 0, len1 = 0;
+        try {
+            int i1, i2;
+            for (i1 = i2 = 0; i1 < realLength; len0 = ++i1) {
+                final IRubyObject[] values = this.values;
+                // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield (see JRUBY-5434)
+                IRubyObject value = safeArrayRef(context, values, beg + i1);
+
+                if (block.yield(context, value).isTrue()) {
+                    modified = true;
+                    continue;
+                }
+
+                if (i1 != i2) safeArraySet(context, values, beg + i2, value);
+
+                len1 = ++i2;
+            }
+
+            return (i1 == i2) ? context.nil : this;
+        } finally {
+            if (modified) checkFrozen();
+            selectBangEnsure(context, len0, len1);
+        }
+    }
+
+    // MRI: select_bang_ensure
+    private void selectBangEnsure(ThreadContext context, int i1, int i2) {
+        int len = realLength;
+
+        if (i2 < len && i2 < i1) {
+            int tail = 0;
+            int beg = begin;
+            if (i1 < len) {
+                tail = len - i1;
+                safeArrayCopy(context, values, beg + i1, values, beg + i2, tail);
+            }
+            else if (realLength > 0) {
+                // nil out left-overs to avoid leaks (MRI doesn't)
+                try {
+                    Helpers.fillNil(context, values, beg + i2, beg + i1);
+                } catch (ArrayIndexOutOfBoundsException ex) {
+                    throw concurrentModification(context, ex);
+                }
+            }
+            realLength = i2 + tail;
+        }
+    }
+
+    public IRubyObject reject_bang(ThreadContext context, Block block) {
+        return block.isGiven() ? rejectBang(context, block) : enumeratorizeWithSize(context, this, "reject!", RubyArray::size);
+    }
+
+    /** rb_ary_delete_if
+     *
+     */
+    public IRubyObject deleteIf(ThreadContext context, Block block) {
+        rejectBang(context, block);
+        return this;
+    }
+
+    public IRubyObject delete_if(ThreadContext context, Block block) {
+        return block.isGiven() ? deleteIf(context, block) : enumeratorizeWithSize(context, this, "delete_if", RubyArray::size);
+    }
+
+    /** rb_ary_zip
+     *
+     */
+    public IRubyObject zip(ThreadContext context, IRubyObject[] args, Block block) {
+        RubyClass array = arrayClass(context);
+        ArraySites sites = sites(context);
+
+        final IRubyObject[] newArgs = IRubyObject.array(args.length);
+
+        boolean hasUncoercible = false;
+        JavaSites.CheckedSites to_ary_checked = sites.to_ary_checked;
+        for (int i = 0; i < args.length; i++) {
+            newArgs[i] = TypeConverter.convertToType(context, args[i], array, to_ary_checked, false);
+            if (newArgs[i].isNil()) {
+                hasUncoercible = true;
+            }
+        }
+
+        // Handle uncoercibles by trying to_enum conversion
+        if (hasUncoercible) {
+            CallSite to_enum = sites.to_enum;
+            RubySymbol each = asSymbol(context, "each");
+            for (int i = 0; i < args.length; i++) {
+                IRubyObject arg = args[i];
+                if (!arg.respondsTo("each")) throw typeError(context, arg, "must respond to :each");
+                newArgs[i] = to_enum.call(context, arg, arg, each);
+            }
+        }
+
+        if (hasUncoercible) {
+            return zipCommon(context, newArgs, block, (ctx, arg, i) -> RubyEnumerable.zipEnumNext(ctx, arg));
+        } else {
+            return zipCommon(context, newArgs, block, (ctx, arg, i) -> ((RubyArray) arg).elt(i));
+        }
+    }
+
+    // This can be shared with RubyEnumerable to clean #zipCommon{Enum,Arg} a little
+    public static interface ArgumentVisitor {
+        IRubyObject visit(ThreadContext ctx, IRubyObject arg, int i);
+    }
+
+    private IRubyObject zipCommon(ThreadContext context, IRubyObject[] args, Block block, ArgumentVisitor visitor) {
+        if (block.isGiven()) {
+            for (int i = 0; i < realLength; i++) {
+                IRubyObject[] tmp = IRubyObject.array(addBufferLength(context, args.length, 1));
+                // Do not coarsen the "safe" check, since it will misinterpret AIOOBE from the yield
+                // See JRUBY-5434
+                tmp[0] = eltInternal(i);
+                for (int j = 0; j < args.length; j++) {
+                    tmp[j + 1] = visitor.visit(context, args[j], i);
+                }
+                block.yield(context, newArrayMayCopy(context.runtime, tmp));
+            }
+            return context.nil;
+        }
+
+        IRubyObject[] result = IRubyObject.array(realLength);
+        try {
+            for (int i = 0; i < realLength; i++) {
+                IRubyObject[] tmp = IRubyObject.array(addBufferLength(context, args.length, 1));
+                tmp[0] = eltInternal(i);
+                for (int j = 0; j < args.length; j++) {
+                    tmp[j + 1] = visitor.visit(context, args[j], i);
+                }
+                result[i] = newArrayMayCopy(context.runtime, tmp);
+            }
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+        return newArrayMayCopy(context.runtime, result);
+    }
+
+    /** rb_ary_cmp
+     *
+     */
+    public IRubyObject op_cmp(ThreadContext context, IRubyObject obj) {
+        boolean isAnArray = (obj instanceof RubyArray) || obj.getMetaClass().getSuperClass() == arrayClass(context);
+
+        if (!isAnArray && !sites(context).respond_to_to_ary.respondsTo(context, obj, obj, true)) {
+            return context.nil;
+        }
+
+        RubyArray ary2;
+        if (!isAnArray) {
+            ary2 = (RubyArray) sites(context).to_ary.call(context, obj, obj);
+        } else {
+            ary2 = obj.convertToArray();
+        }
+
+        return cmpCommon(context, ary2);
+    }
+
+    private IRubyObject cmpCommon(ThreadContext context, RubyArray ary2) {
+        if (this == ary2 || context.runtime.isInspecting(this)) return asFixnum(context, 0);
+
+        try {
+            context.runtime.registerInspecting(this);
+
+            int len = realLength;
+            if (len > ary2.getLength()) len = ary2.getLength();
+
+            CallSite cmp = sites(context).cmp;
+            for (int i = 0; i < len; i++) {
+                IRubyObject elt = elt(i);
+                IRubyObject v = cmp.call(context, elt, elt, ary2.elt(i));
+                if (!(v instanceof RubyFixnum fixnum) || fixnum.getValue() != 0) return v;
+            }
+        } finally {
+            context.runtime.unregisterInspecting(this);
+        }
+
+        int len = realLength - ary2.getLength();
+        int cmpValue = len == 0 ? 0 : (len > 0 ? 1 : -1);   // -1 ... 0 ... 1
+        return asFixnum(context, cmpValue);
+    }
+
+    private IRubyObject slice_internal(ThreadContext context, int pos, int len) {
+        if (len < 0) return context.nil;
+        int orig_len = realLength;
+        if (pos < 0) {
+            pos += orig_len;
+            if (pos < 0) return context.nil;
+        }
+
+        if (orig_len < pos) return context.nil;
+        if (orig_len < pos + len) len = orig_len - pos;
+
+        if (len == 0) return Create.newEmptyArray(context);
+
+        unpack(context);
+
+        var result = makeShared(context, begin + pos, len, arrayClass(context));
+        splice(context, pos, len, null, 0);
+
+        return result;
+    }
+
+        /** rb_ary_slice_bang
+         *
+         */
+    public IRubyObject slice_bang(ThreadContext context, IRubyObject arg0) {
+        modifyCheck(context);
+
+        if (arg0 instanceof RubyRange range) {
+            if (!range.checkBegin(context, realLength)) return context.nil;
+
+            int pos = checkInt(context, range.begLen0(context, realLength));
+            int len = checkInt(context, range.begLen1(context, realLength, pos));
+            return slice_internal(context, pos, len);
+        }
+        return delete_at(toInt(context, arg0));
+    }
+
+    /** rb_ary_slice_bang
+    *
+    */
+    public IRubyObject slice_bang(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
+        modifyCheck(context);
+
+        return slice_internal(context, toInt(context, arg0), toInt(context, arg1));
+    }
+
+    /** rb_ary_assoc
+     *
+     */
+    public IRubyObject assoc(ThreadContext context, IRubyObject key) {
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = TypeConverter.checkArrayType(context, sites(context).to_ary_checked, eltOk(i));
+            if (v instanceof RubyArray arr && arr.size() > 0) {
+                if (arr.getLength() > 0 && equalInternal(context, arr.elt(0), key)) return arr;
+            }
+        }
+
+        return context.nil;
+    }
+
+    /** rb_ary_rassoc
+     *
+     */
+    public IRubyObject rassoc(ThreadContext context, IRubyObject value) {
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = TypeConverter.checkArrayType(context, sites(context).to_ary_checked, eltOk(i));
+            if (v instanceof RubyArray) {
+                RubyArray arr = (RubyArray)v;
+                if (arr.getLength() > 1 && equalInternal(context, arr.eltOk(1), value)) return arr;
+            }
+        }
+
+        return context.nil;
+    }
+
+    // MRI array.c flatten
+    protected boolean flatten(ThreadContext context, final int level, final RubyArrayNative result) {
+        // TODO: (CON) We can flatten packed versions efficiently if length does not change (e.g. [[1,2],[]])
+        unpack(context);
+
+        IRubyObject tmp = null;
+        int i = 0;
+        for (; i < realLength; i++) {
+            IRubyObject elt = eltOk(i);
+            tmp = TypeConverter.checkArrayType(context.runtime, elt);
+            if (!tmp.isNil()) break;
+        }
+
+        safeArrayCopy(context, values, begin, result.values, result.begin, i);
+        result.realLength = i;
+
+        if (i == realLength) return false;
+
+        Stack<Object> stack = new Stack<>();
+        stack.push(this);
+        stack.push(i + 1);
+        IdentityHashMap<RubyArray, IRubyObject> memo; // used as an IdentityHashSet
+
+        RubyArray ary = (RubyArray) tmp;
+
+        if (level < 0) {
+            memo = new IdentityHashMap<>(4 + 1);
+            memo.put(this, NEVER);
+            memo.put((RubyArray) tmp, NEVER);
+        } else {
+            memo = null;
+        }
+
+        i = 0;
+
+        try {
+            while (true) {
+                while (i < ary.getLength()) {
+                    IRubyObject elt = ary.eltOk(i++);
+                    if (level >= 0 && stack.size() / 2 >= level) {
+                        result.append(context, elt);
+                        continue;
+                    }
+                    tmp = TypeConverter.checkArrayType(context, elt);
+                    if (tmp.isNil()) {
+                        result.append(context, elt);
+                    } else { // nested array element
+                        if (memo != null) {
+                            if (memo.get(tmp) != null) throw argumentError(context, "tried to flatten recursive array");
+                            memo.put(ary, NEVER);
+                        }
+                        stack.push(ary);
+                        stack.push(i); // add (ary, i) pair
+                        ary = (RubyArray) tmp;
+                        i = 0;
+                    }
+                }
+                if (stack.isEmpty()) break;
+                if (memo != null) memo.remove(ary);
+
+                i = (Integer) stack.pop();
+                ary = (RubyArray) stack.pop();
+            }
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+
+        return stack != null;
+    }
+
+    public IRubyObject flatten_bang(ThreadContext context) {
+        unpack(context);
+        modifyCheck(context);
+
+        RubyArrayNative result = new RubyArrayNative(context.runtime, getType(), realLength);
+        if (flatten(context, -1, result)) {
+            modifyCheck(context);
+            isShared = false;
+            begin = 0;
+            realLength = result.realLength;
+            values = result.values;
+            return this;
+        }
+        return context.nil;
+    }
+
+    public IRubyObject flatten_bang(ThreadContext context, IRubyObject arg) {
+        unpack(context);
+        modifyCheck(context);
+
+        int level = toInt(context, arg);
+        if (level == 0) return context.nil;
+
+        RubyArrayNative result = new RubyArrayNative(context.runtime, getType(), realLength);
+        if (flatten(context, level, result)) {
+            isShared = false;
+            begin = 0;
+            realLength = result.realLength;
+            values = result.values;
+            return this;
+        }
+        return context.nil;
+    }
+
+    public IRubyObject flatten(ThreadContext context) {
+        var result = newArray(context, realLength);
+        flatten(context, -1, result);
+        return result;
+    }
+
+    public IRubyObject flatten(ThreadContext context, IRubyObject arg) {
+        int level = toInt(context, arg);
+        if (level == 0) return makeShared();
+
+        RubyArrayNative result = newArray(context, realLength);
+        flatten(context, level, result);
+        return result;
+    }
+
+    public IRubyObject count(ThreadContext context, Block block) {
+        if (block.isGiven()) {
+            int n = 0;
+            for (int i = 0; i < realLength; i++) {
+                if (block.yield(context, elt(i)).isTrue()) n++;
+            }
+            return asFixnum(context, n);
+        } else {
+            return asFixnum(context, realLength);
+        }
+    }
+
+    public IRubyObject count(ThreadContext context, IRubyObject obj, Block block) {
+        if (block.isGiven()) warn(context, "given block not used");
+
+        int n = 0;
+        for (int i = 0; i < realLength; i++) {
+            if (equalInternal(context, elt(i), obj)) n++;
+        }
+        return asFixnum(context, n);
+    }
+
+    /** rb_ary_nitems
+     *
+     */
+    public IRubyObject nitems(ThreadContext context) {
+        int n = 0;
+
+        for (int i = 0; i < realLength; i++) {
+            if (!eltOk(i).isNil()) n++;
+        }
+
+        return asFixnum(context, n);
+    }
+
+    /** rb_ary_plus
+     *
+     */
+    public IRubyObject op_plus(ThreadContext context, IRubyObject obj) {
+        RubyArray y = obj.convertToArray();
+        int len = realLength + y.getLength();
+
+        switch (len) {
+            case 1:
+                return new RubyArrayOneObject(context.runtime, realLength == 1 ? eltInternal(0) : y.eltInternal(0));
+            case 2:
+                switch (realLength) {
+                    case 0:
+                        return newArray(context.runtime, y.eltInternal(0), y.eltInternal(1));
+                    case 1:
+                        return newArray(context.runtime, eltInternal(0), y.eltInternal(0));
+                    case 2:
+                        return newArray(context.runtime, eltInternal(0), eltInternal(1));
+                }
+        }
+
+        RubyArrayNative<?> z = Create.allocNativeArray(context, len);
+        try {
+            copyInto(context, z.values, 0);
+            y.copyInto(context, z.values, realLength);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(context, e);
+        }
+        z.realLength = len;
+        return z;
+    }
+
+    /** rb_ary_times
+     *
+     */
+    public IRubyObject op_times(ThreadContext context, IRubyObject times) {
+        IRubyObject tmp = times.checkStringType();
+
+        if (!tmp.isNil()) return join(context, tmp);
+
+        long len = toLong(context, times);
+        if (len == 0) return RubyArrayNative.newEmptyArray(context.runtime);
+        if (len < 0) throw argumentError(context, "negative argument");
+        if (Long.MAX_VALUE / len < realLength) throw argumentError(context, "argument too big");
+
+        len *= realLength;
+
+        RubyArrayNative<?> ary2 = Create.allocNativeArray(context, len);
+        ary2.realLength = ary2.values.length;
+
+        try {
+            for (int i = 0; i < len; i += realLength) {
+                copyInto(context, ary2.values, i);
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(context, e);
+        }
+
+        return ary2;
+    }
+
+    /** ary_make_hash
+     *
+     */
+    @Override
+    protected RubyHash makeHash(Ruby runtime) {
+        return makeHash(RubyHashLinkedBuckets.newLBHash(runtime, Math.min(realLength, 128), false));
+    }
+
+    @Override
+    protected RubyHash makeHash(RubyHash hash) {
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = elt(i);
+            hash.internalPutIfNoKey(v, v);
+        }
+        return hash;
+    }
+
+    private RubyHash makeHash(ThreadContext context, Block block) {
+        return makeHash(context, RubyHashLinkedBuckets.newLBHash(context.runtime, Math.min(realLength, 128), false), block);
+    }
+
+    private RubyHash makeHash(ThreadContext context, RubyHash hash, Block block) {
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = elt(i);
+            IRubyObject k = block.yield(context, v);
+            hash.internalPutIfNoKey(k, v);
+        }
+        return hash;
+    }
+
+    private void setValuesFrom(ThreadContext context, RubyHash hash) {
+        try {
+            hash.visitAll(context, RubyHash.SetValueVisitor, this);
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+    }
+
+    private void clearValues(ThreadContext context, final int from, final int to) {
+        try {
+            Helpers.fillNil(context, values, begin + from, begin + to);
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+    }
+
+    /** rb_ary_uniq_bang
+     *
+     */
+    public IRubyObject uniq_bang(ThreadContext context) {
+        final RubyHash hash = makeHash(context.runtime);
+        final int newLength = hash.size();
+        if (realLength == newLength) return context.nil;
+
+        modify(context); // in case array isShared
+        unpack(context);
+
+        setValuesFrom(context, hash);
+        clearValues(context, newLength, realLength);
+        realLength = newLength;
+
+        return this;
+    }
+
+    public IRubyObject uniq_bang(ThreadContext context, Block block) {
+        modifyCheck(context);
+
+        if (!block.isGiven()) return uniq_bang(context);
+
+        final RubyHash hash = makeHash(context, block);
+        final int newLength = hash.size();
+        if (realLength == newLength) return context.nil;
+
+        // after evaluating the block, a new modify check is needed
+        modify(context); // in case array isShared
+        unpack(context);
+
+        setValuesFrom(context, hash);
+        clearValues(context, newLength, realLength);
+        realLength = newLength;
+
+        return this;
+    }
+
+    /** rb_ary_uniq
+     *
+     */
+    public IRubyObject uniq(ThreadContext context) {
+        RubyHash hash = makeHash(context.runtime);
+        final int newLength = hash.size();
+        if (realLength == newLength) return makeShared();
+
+        RubyArrayNative result = newBlankArrayInternal(context.runtime, arrayClass(context), newLength);
+        result.setValuesFrom(context, hash);
+        result.realLength = newLength;
+        return result;
+    }
+
+    public IRubyObject uniq(ThreadContext context, Block block) {
+        if (!block.isGiven()) return uniq(context);
+        RubyHash hash = makeHash(context, block);
+        final int newLength = hash.size();
+        if (realLength == newLength) return makeShared();
+
+        RubyArrayNative result = newBlankArrayInternal(context.runtime, arrayClass(context), newLength);
+        result.setValuesFrom(context, hash);
+        result.realLength = newLength;
+        return result;
+    }
+
+    /** rb_ary_diff
+     *
+     */
+    public IRubyObject op_diff(ThreadContext context, IRubyObject other) {
+        final int len = realLength;
+        RubyArrayNative<?> res = newBlankArrayInternal(context.runtime, len);
+
+        int index = 0;
+        RubyHash hash = other.convertToArray().makeHash(context.runtime);
+        for (int i = 0; i < len; i++) {
+            IRubyObject val = eltOk(i);
+            if (hash.fastARef(val) == null) res.storeInternal(context, index++, val);
+        }
+
+        // if index is 1 and we made a size 2 array, repack
+        if (index == 0) return newEmptyArray(context.runtime);
+        if (index == 1 && len == 2) return newArray(context.runtime, res.eltInternal(0));
+
+        assert index == res.realLength;
+        if (!(res instanceof RubyArraySpecialized)) {
+            Helpers.fillNil(context, res.values, index, res.values.length);
+        }
+
+        return res;
+    }
+
+    /** rb_ary_difference_multi
+     *
+     */
+    public IRubyObject difference(ThreadContext context, IRubyObject[] args) {
+        BitSet isHash = new BitSet(args.length);
+        RubyArray[] arrays = new RubyArray[args.length];
+        RubyHash[] hashes = new RubyHash[args.length];
+
+        var diff = Create.newArray(context);
+
+        for (int i = 0; i < args.length; i++) {
+            arrays[i] = args[i].convertToArray();
+            isHash.set(i, (realLength > ARRAY_DEFAULT_SIZE && arrays[i].getLength() > ARRAY_DEFAULT_SIZE));
+            if (isHash.get(i)) hashes[i] = arrays[i].makeHash(context.runtime);
+        }
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject elt = elt(i);
+            int j;
+            for (j = 0; j < args.length; j++) {
+                if (isHash.get(j)) {
+                    if (hashes[j].fastARef(elt) != null) break;
+                } else {
+                    if (arrays[j].includesByEql(context, elt)) break;
+                }
+            }
+            if (j == args.length) diff.append(context, elt);
+        }
+
+        return diff;
+    }
+
+    public IRubyObject intersection(ThreadContext context, IRubyObject[] args) {
+        RubyArray result = aryDup();
+
+        for (IRubyObject arg: args) {
+            result = (RubyArray) result.op_and(context, arg);
+        }
+
+        return result;
+    }
+
+    /** MRI: rb_ary_intersect_p
+     *
+     */
+    public IRubyObject intersect_p(ThreadContext context, IRubyObject other) {
+
+        RubyArray ary2 = other.convertToArray();
+        final int len = realLength;
+
+        if (len == 0 || ary2.getLength() == 0) return context.fals;
+
+        if (len <= SMALL_ARRAY_LEN && ary2.getLength() <= SMALL_ARRAY_LEN) {
+            for (int i = 0; i < len; i++) {
+                if (ary2.includesByEql(context, elt(i))) return context.tru;
+            }
+            return context.fals;
+        }
+
+        RubyArray shorter = this;
+        RubyArray longer = ary2;
+
+        if (len > ary2.getLength()) {
+            longer = this;
+            shorter = ary2;
+        }
+
+        RubyHash hash = shorter.makeHash(context.runtime);
+        for (int i = 0; i < longer.getLength(); i++) {
+            IRubyObject val = longer.eltOk(i);
+            if (hash.fastARef(val) != null) return context.tru;
+        }
+
+        return context.fals;
+    }
+
+    /** MRI: rb_ary_and
+     *
+     */
+    public IRubyObject op_and(ThreadContext context, IRubyObject other) {
+        RubyArray<?> ary2 = other.convertToArray();
+
+        final int len = realLength;
+        int maxSize = len < ary2.getLength() ? len : ary2.getLength();
+        RubyArrayNative res;
+        switch (maxSize) {
+            case 0:
+                return newEmptyArray(context.runtime);
+            case 1:
+                if (len == 0 || ary2.getLength() == 0) return newEmptyArray(context.runtime);
+            default:
+                res = newBlankArrayInternal(context.runtime, maxSize);
+                break;
+        }
+
+        int index = 0;
+        RubyHash hash = ary2.makeHash(context.runtime);
+        for (int i = 0; i < len; i++) {
+            IRubyObject val = elt(i);
+            if (hash.fastDelete(val)) res.storeInternal(context, index++, val);
+        }
+
+        // if index is 1 and we made a size 2 array, repack
+        if (index == 0) return Create.newEmptyArray(context);
+        if (index == 1 && maxSize == 2) return Create.newArray(context, res.eltInternal(0));
+
+        assert index == res.getLength();
+        if (!(res instanceof RubyArraySpecialized)) {
+            Helpers.fillNil(context, res.values, index, res.values.length);
+        }
+
+        return res;
+    }
+
+    /** rb_ary_or
+     *
+     */
+    public IRubyObject op_or(ThreadContext context, IRubyObject other) {
+        RubyArray ary2 = other.convertToArray();
+
+        int maxSize = realLength + ary2.getLength();
+        if (maxSize == 0) return Create.newEmptyArray(context);
+
+        RubyHash set = ary2.makeHash(makeHash(context.runtime));
+        RubyArrayNative res = newBlankArrayInternal(context.runtime, set.size());
+        res.setValuesFrom(context, set);
+        res.realLength = set.size();
+
+        int index = res.getLength();
+        // if index is 1 and we made a size 2 array, repack
+        if (index == 1 && maxSize == 2) return Create.newArray(context, res.eltInternal(0));
+
+        return res;
+    }
+
+    /** rb_ary_union_multi
+     *
+     */
+    public IRubyObject union(ThreadContext context, IRubyObject[] args) {
+        RubyArray[] arrays = new RubyArray[args.length];
+        RubyArray result;
+
+        int maxSize = realLength;
+        for (int i = 0; i < args.length; i++) {
+            arrays[i] = args[i].convertToArray();
+            maxSize += arrays[i].getLength();
+        }
+        if (maxSize == 0) return Create.newEmptyArray(context);
+
+        if (maxSize <= ARRAY_DEFAULT_SIZE) {
+            result = Create.newArray(context);
+
+            result.unionInternal(context, this);
+            result.unionInternal(context, arrays);
+
+            return result;
+        }
+
+        RubyHash set = makeHash(context.runtime);
+
+        for (int i = 0; i < arrays.length; i++) {
+            for (int j = 0; j < arrays[i].getLength(); j++) {
+                set.fastASet(arrays[i].elt(j), NEVER);
+            }
+        }
+
+        result = set.keys();
+        return result;
+    }
+
+    /** rb_ary_union
+     *
+     */
+    @Override
+    protected void unionInternal(ThreadContext context, RubyArray... args) {
+        for (int i = 0; i < args.length; i++) {
+            for (int j = 0; j < args[i].getLength(); j++) {
+                IRubyObject elt = args[i].elt(j);
+                if (includesByEql(context, elt)) continue;
+                append(context, elt);
+            }
+        }
+    }
+
+    /** rb_ary_sort
+     *
+     */
+    public RubyArray sort(ThreadContext context, Block block) {
+        RubyArray ary = aryDup();
+        ary.sort_bang(context, block);
+        return ary;
+    }
+
+    /** rb_ary_sort_bang
+     *
+     */
+    public IRubyObject sort_bang(ThreadContext context, Block block) {
+        modify(context);
+        if (realLength > 1) {
+            return block.isGiven() ? sortInternal(context, block) : sortInternal(context, true);
+        }
+        return this;
+    }
+
+    protected IRubyObject sortInternal(final ThreadContext context, final boolean honorOverride) {
+        try {
+            Arrays.sort(values, begin, begin + realLength, new DefaultComparator(context, honorOverride) {
+                protected int compareGeneric(IRubyObject o1, IRubyObject o2) {
+                    int result = super.compareGeneric(o1, o2);
+                    modifyCheck(context);
+                    return result;
+                }
+            });
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+        return this;
+    }
+
+    // @Deprecated(since = "9.2.0.0")
+    protected static int compareFixnums(RubyFixnum o1, RubyFixnum o2) {
+        return DefaultComparator.compareInteger(o1, o2);
+    }
+
+    // @Deprecated(since = "9.2.0.0")
+    protected static int compareOthers(ThreadContext context, IRubyObject o1, IRubyObject o2) {
+        return DefaultComparator.compareGeneric(context, o1, o2);
+    }
+
+    static class BlockComparator implements Comparator<IRubyObject> {
+
+        final ThreadContext context;
+
+        protected final Block block;
+        protected final IRubyObject self;
+
+        private final CallSite gt;
+        private final CallSite lt;
+
+        BlockComparator(ThreadContext context, Block block, CallSite gt, CallSite lt) {
+            this(context, block, null, gt, lt);
+        }
+
+        BlockComparator(ThreadContext context, Block block, IRubyObject self, CallSite gt, CallSite lt) {
+            this.context = context == null ? self.getRuntime().getCurrentContext() : context;
+            this.block = block; this.self = self;
+            this.gt = gt; this.lt = lt;
+        }
+
+        public int compare(IRubyObject obj1, IRubyObject obj2) {
+            return RubyComparable.cmpint(context, gt, lt, yieldBlock(obj1, obj2), obj1, obj2);
+        }
+
+        protected final IRubyObject yieldBlock(IRubyObject obj1, IRubyObject obj2) {
+            return block.yieldArray(context, Create.newArray(context, obj1, obj2), self);
+        }
+
+        protected final ThreadContext context() {
+            return context;
+        }
+
+    }
+
+    protected IRubyObject sortInternal(final ThreadContext context, final Block block) {
+        // block code can modify, so we need to iterate
+        unpack(context);
+        IRubyObject[] newValues = IRubyObject.array(realLength);
+        int length = realLength;
+
+        copyInto(context, newValues, 0);
+        CallSite gt = sites(context).op_gt_sort;
+        CallSite lt = sites(context).op_lt_sort;
+        Arrays.sort(newValues, 0, length, new BlockComparator(context, block, gt, lt) {
+            @Override
+            public int compare(IRubyObject obj1, IRubyObject obj2) {
+                int result = super.compare(obj1, obj2);
+                modifyCheck(context);
+                return result;
+            }
+        });
+
+        values = newValues;
+        begin = 0;
+        realLength = length;
+        return this;
+    }
+
+    /** rb_ary_sort_by_bang
+     *
+     */
+    public IRubyObject sort_by_bang(ThreadContext context, Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "sort_by!", RubyArray::size);
+
+        modifyCheck(context);
+
+        RubyArray sorted = sites(context).sort_by.call(context, this, this, block).convertToArray();
+
+        replace(sorted);
+
+        return this;
+    }
+
+    /** rb_ary_take
+     *
+     */
+    public IRubyObject take(ThreadContext context, IRubyObject n) {
+        long len = toLong(context, n);
+        if (len < 0) throw argumentError(context, "attempt to take negative size");
+
+        return subseq(0, len);
+    }
+
+    /** rb_ary_take_while
+     *
+     */
+    public IRubyObject take_while(ThreadContext context, Block block) {
+        if (!block.isGiven()) return enumeratorize(context.runtime, this, "take_while");
+
+        int i = 0;
+        for (; i < realLength; i++) {
+            if (!block.yield(context, eltOk(i)).isTrue()) break;
+        }
+        return subseq(0, i);
+    }
+
+    /** rb_ary_take
+     *
+     */
+    public IRubyObject drop(ThreadContext context, IRubyObject n) {
+        long pos = toLong(context, n);
+        if (pos < 0) throw argumentError(context, "attempt to drop negative size");
+
+        IRubyObject result = subseq(pos, realLength);
+        return result.isNil() ? Create.newEmptyArray(context) : result;
+    }
+
+    /** rb_ary_take_while
+     *
+     */
+    public IRubyObject drop_while(ThreadContext context, Block block) {
+        if (!block.isGiven()) return enumeratorize(context.runtime, this, "drop_while");
+
+        int i = 0;
+        for (; i < realLength; i++) {
+            if (!block.yield(context, eltOk(i)).isTrue()) break;
+        }
+        IRubyObject result = subseq(i, realLength);
+        return result.isNil() ? Create.newEmptyArray(context) : result;
+    }
+
+    /** rb_ary_cycle
+     *
+     */
+    public IRubyObject cycle(ThreadContext context, Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "cycle", RubyArrayNative::cycleSize);
+        return cycleCommon(context, -1, block);
+    }
+
+    /** rb_ary_cycle
+     *
+     */
+    public IRubyObject cycle(ThreadContext context, IRubyObject arg, Block block) {
+        if (arg.isNil()) return cycle(context, block);
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "cycle", new IRubyObject[] {arg}, RubyArrayNative::cycleSize);
+
+        long times = toLong(context, arg);
+        return times <= 0 ?
+                context.nil :
+                cycleCommon(context, times, block);
+    }
+
+    private IRubyObject cycleCommon(ThreadContext context, long n, Block block) {
+        while (realLength > 0 && (n < 0 || 0 < n--)) {
+            for (int i = 0; i < realLength; i++) {
+                block.yield(context, eltOk(i));
+            }
+        }
+        return context.nil;
+    }
+
+    /**
+     * A cycle size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
+     *
+     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
+     */
+    private static IRubyObject cycleSize(ThreadContext context, RubyArrayNative self, IRubyObject[] args) {
+        if (self.realLength == 0) return asFixnum(context, 0);
+
+        IRubyObject n = args != null && args.length > 0 ? args[0] : context.nil;
+
+        if (n == null || n.isNil()) return asFloat(context, RubyFloat.INFINITY);
+
+        long multiple = toLong(context, n);
+        if (multiple <= 0) return asFixnum(context, 0);
+
+        RubyFixnum length = self.length(context);
+        return sites(context).op_times.call(context, length, length, asFixnum(context, multiple));
+    }
+
+
+    /** rb_ary_product
+     *
+     */
+    public IRubyObject product(ThreadContext context, IRubyObject[] args) {
+        return product(context, args, Block.NULL_BLOCK);
+    }
+
+    public IRubyObject product(ThreadContext context, IRubyObject[] args, Block block) {
+        boolean useBlock = block.isGiven();
+
+        int n = args.length + 1;
+        RubyArray arrays[] = new RubyArray[n];
+        int counters[] = new int[n];
+
+        arrays[0] = this;
+        var array = arrayClass(context);
+        JavaSites.CheckedSites to_ary_checked = sites(context).to_ary_checked;
+        for (int i = 1; i < n; i++) arrays[i] = (RubyArray) TypeConverter.convertToType(context, args[i - 1], array, to_ary_checked);
+
+        int resultLen = 1;
+        for (int i = 0; i < n; i++) {
+            int k = arrays[i].getLength();
+            int l = resultLen;
+            if (k == 0) return useBlock ? this : Create.newEmptyArray(context);
+            resultLen *= k;
+            if (resultLen < k || resultLen < l || resultLen / k != l) {
+                if (!block.isGiven()) throw rangeError(context, "too big to product");
+            }
+        }
+
+        RubyArrayNative result = useBlock ? null : newBlankArrayInternal(context.runtime, resultLen);
+
+        for (int i = 0; i < resultLen; i++) {
+            RubyArrayNative sub = newBlankArrayInternal(context.runtime, n);
+            for (int j = 0; j < n; j++) sub.eltInternalSet(j, arrays[j].entry(counters[j]));
+            sub.realLength = n;
+
+            if (useBlock) {
+                block.yieldSpecific(context, sub);
+            } else {
+                result.eltInternalSet(i, sub);
+            }
+            int m = n - 1;
+            counters[m]++;
+
+            while (m > 0 && counters[m] == arrays[m].getLength()) {
+                counters[m] = 0;
+                m--;
+                counters[m]++;
+            }
+        }
+
+        if (useBlock) return this;
+        result.realLength = resultLen;
+        return result;
+    }
+
+    /** rb_ary_combination
+     *
+     */
+    public IRubyObject combination(ThreadContext context, IRubyObject num, Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "combination", new IRubyObject[]{num}, RubyArrayNative::combinationSize);
+
+        int n = toInt(context, num);
+
+        if (n == 0) {
+            block.yield(context, Create.newEmptyArray(context));
+        } else if (n == 1) {
+            for (int i = 0; i < realLength; i++) {
+                block.yield(context, Create.newArray(context, eltOk(i)));
+            }
+        } else if (n >= 0 && realLength >= n) {
+            int stack[] = new int[n + 1];
+            RubyArray values = makeShared();
+
+            combinate(context, size(), n, stack, values, block);
+        }
+
+        return this;
+    }
+
+    private static void combinate(ThreadContext context, int len, int n, int[] stack, RubyArray values, Block block) {
+        int lev = 0;
+
+        Arrays.fill(stack, 1, 1 + n, 0);
+        stack[0] = -1;
+        for (;;) {
+            for (lev++; lev < n; lev++) {
+                stack[lev+1] = stack[lev]+1;
+            }
+            // TODO: MRI has a weird reentrancy check that depends on having a null class in values
+            yieldValues(context, n, stack, 1, values, block);
+            do {
+                if (lev == 0) return;
+                stack[lev--]++;
+            } while (stack[lev+1]+n == len+lev+1);
+        }
+    }
+
+    private static void rcombinate(ThreadContext context, int n, int r, int[] p, RubyArray values, Block block) {
+        int i = 0, index = 0;
+
+        p[index] = i;
+        for (;;) {
+            if (++index < r-1) {
+                p[index] = i;
+                continue;
+            }
+            for (; i < n; ++i) {
+                p[index] = i;
+                // TODO: MRI has a weird reentrancy check that depends on having a null class in values
+                yieldValues(context, r, p, 0, values, block);
+            }
+            do {
+                if (index <= 0) return;
+            } while ((i = ++p[--index]) >= n);
+        }
+    }
+
+    /**
+     * A combination size method suitable for method reference implementation of SizeFn{@link #size(ThreadContext, RubyArray, IRubyObject[])}.
+     *
+     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
+     */
+    private static IRubyObject combinationSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
+        long n = self.getLength();
+        assert args != null && args.length > 0 && args[0] instanceof RubyNumeric; // #combination ensures arg[0] is numeric
+        long k = ((RubyNumeric) args[0]).asLong(context);
+
+        return binomialCoefficient(context, k, n);
+    }
+
+    private static IRubyObject binomialCoefficient(ThreadContext context, long comb, long size) {
+        if (comb > size - comb) comb = size - comb;
+        if (comb < 0) return asFixnum(context, 0);
+
+        IRubyObject r = descendingFactorial(context, size, comb);
+        IRubyObject v = descendingFactorial(context, comb, comb);
+        return sites(context).op_quo.call(context, r, r, v);
+    }
+
+    public IRubyObject repeatedCombination(ThreadContext context, IRubyObject num, Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "repeated_combination", new IRubyObject[] { num }, RubyArrayNative::repeatedCombinationSize);
+
+        int n = toInt(context, num);
+
+        if (n < 0) {
+            // yield nothing
+        } else if (n == 0) {
+            block.yield(context, Create.newEmptyArray(context));
+        } else if (n == 1) {
+            for (int i = 0; i < realLength; i++) {
+                block.yield(context, Create.newArray(context, eltOk(i)));
+            }
+        } else {
+            int[] p = new int[n];
+            RubyArray values = makeShared();
+            rcombinate(context, realLength, n, p, values, block);
+        }
+
+        return this;
+    }
+
+    /**
+     * A repeated combination size method suitable for method reference implementation of SizeFn{@link #size(ThreadContext, RubyArray, IRubyObject[])}.
+     *
+     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
+     */
+    private static IRubyObject repeatedCombinationSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
+        long n = self.getLength();
+        assert args != null && args.length > 0 && args[0] instanceof RubyNumeric; // #repeated_combination ensures arg[0] is numeric
+        long k = ((RubyNumeric) args[0]).asLong(context);
+
+        return k == 0 ? asFixnum(context, 1) : binomialCoefficient(context, k, n + k - 1);
+    }
+
+    private static void permute(ThreadContext context, int n, int r, int[] p, boolean[] used, RubyArray values, Block block) {
+        int i = 0, index = 0;
+        for (;;) {
+            int unused = memchr(used, i, false, n - i);
+            if (unused == -1) {
+                if (index == 0) break;
+                i = p[--index];
+                used[i++] = false;
+            } else {
+                i = unused;
+                p[index] = i;
+                used[i] = true;
+                index++;
+                if (index < r - 1) {
+                    p[index] = i = 0;
+                    continue;
+                }
+                for (i = 0; i < n; i++) {
+                    if (used[i]) continue;
+                    p[index] = i;
+                    // TODO: MRI has a weird reentrancy check that depends on having a null class in values
+                    yieldValues(context, r, p, 0, values, block);
+                }
+            }
+        }
+    }
+
+    private static void yieldValues(ThreadContext context, int r, int[] p, int pStart, RubyArray values, Block block) {
+        RubyArrayNative result = newBlankArrayInternal(context.runtime, r);
+        for (int j = 0; j < r; j++) {
+            result.eltInternalSet(j, values.eltInternal(p[j + pStart]));
+        }
+        result.realLength = r;
+
+        block.yield(context, result);
+    }
+
+    private static void rpermute(ThreadContext context, int n, int r, int[] p, RubyArray values, Block block) {
+        int index = 0;
+
+        p[index] = 0;
+        for (;;) {
+            if (++index < r-1) {
+                p[index] = 0;
+                continue;
+            }
+            for (int i = 0; i < n; ++i) {
+                p[index] = i;
+                // TODO: MRI has a weird reentrancy check that depends on having a null class in values
+                yieldValues(context, r, p, 0, values, block);
+            }
+            do {
+                if (index <= 0) return;
+            } while ((++p[--index]) >= n);
+        }
+    }
+
+    /** rb_ary_permutation
+     *
+     */
+    public IRubyObject permutation(ThreadContext context, IRubyObject num, Block block) {
+        return block.isGiven() ?
+                permutationCommon(context, toInt(context, num), false, block) :
+                enumeratorizeWithSize(context, this, "permutation", new IRubyObject[] { num }, RubyArrayNative::permutationSize);
+    }
+
+    public IRubyObject permutation(ThreadContext context, Block block) {
+        return block.isGiven() ? permutationCommon(context, realLength, false, block) : enumeratorizeWithSize(context, this, "permutation", RubyArrayNative::permutationSize);
+    }
+
+    public IRubyObject repeated_permutation(ThreadContext context, IRubyObject num, Block block) {
+        return block.isGiven() ?
+                permutationCommon(context, toInt(context, num), true, block) :
+                enumeratorizeWithSize(context, this, "repeated_permutation", new IRubyObject[]{num}, RubyArrayNative::repeatedPermutationSize);
+    }
+
+    /**
+     * A repeated permutation size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
+     *
+     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
+     */
+    private static IRubyObject repeatedPermutationSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
+        RubyFixnum n = self.length(context);
+        assert args != null && args.length > 0 && args[0] instanceof RubyNumeric; // #repeated_permutation ensures arg[0] is numeric
+        long k = ((RubyNumeric) args[0]).asLong(context);
+
+        if (k < 0) return asFixnum(context, 0);
+
+        RubyFixnum v = asFixnum(context, k);
+        return sites(context).op_exp.call(context, n, n, v);
+    }
+
+    private IRubyObject permutationCommon(ThreadContext context, int r, boolean repeat, Block block) {
+        if (r == 0) {
+            block.yield(context, Create.newEmptyArray(context));
+        } else if (r == 1) {
+            for (int i = 0; i < realLength; i++) {
+                block.yield(context, Create.newArray(context, eltOk(i)));
+            }
+        } else if (r >= 0) {
+            unpack(context);
+            int n = realLength;
+            if (repeat) {
+                rpermute(context, n, r,
+                        new int[r],
+                        makeShared(context, begin, n, metaClass), block);
+            } else {
+                permute(context, n, r,
+                        new int[r],
+                        new boolean[n],
+                        makeShared(context, begin, n, metaClass),
+                        block);
+            }
+        }
+        return this;
+    }
+
+    /**
+     * A permutation size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
+     *
+     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
+     */
+    private static IRubyObject permutationSize(ThreadContext context, RubyArray self, IRubyObject[] args) {
+        long n = self.getLength();
+        long k;
+
+        if (args != null && args.length > 0) {
+            assert args[0] instanceof RubyNumeric; // #permutation ensures arg[0] is numeric
+            k = ((RubyNumeric) args[0]).asLong(context);
+        } else {
+            k = n;
+        }
+
+        return descendingFactorial(context, n, k);
+    }
+
+    private static IRubyObject descendingFactorial(ThreadContext context, long from, long howMany) {
+        IRubyObject cnt = asFixnum(context, howMany >= 0 ?  1 : 0);
+        CallSite op_times = sites(context).op_times;
+        while (howMany-- > 0) {
+            cnt = op_times.call(context, cnt, cnt, asFixnum(context, from--));
+        }
+        return cnt;
+    }
+
+    public IRubyObject shuffle_bang(ThreadContext context) {
+        return shuffleBang(context, context.runtime.getRandomClass());
+    }
+
+    public IRubyObject shuffle_bang(ThreadContext context, IRubyObject opts) {
+        IRubyObject hash = TypeConverter.checkHashType(context.runtime, opts);
+        if (hash.isNil()) throw argumentError(context, 1, 0, 0);
+
+        IRubyObject ret = ArgsUtil.extractKeywordArg(context, (RubyHash) hash, "random");
+        return ret == null ? shuffle(context) : shuffleBang(context, ret);
+    }
+
+    private IRubyObject shuffleBang(ThreadContext context, IRubyObject randgen) {
+        modify(context);
+
+        int i = realLength;
+        int len = i;
+        try {
+            while (i > 0) {
+                int r = (int) randUpto(context, randgen, i);
+                if (len != realLength) { // || ptr != RARRAY_CONST_PTR(ary)
+                    throw runtimeError(context, "modified during shuffle");
+                }
+                T tmp = eltOk(--i);
+                eltSetOk(i, eltOk(r));
+                eltSetOk(r, tmp);
+            }
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+
+        return this;
+    }
+
+
+    public IRubyObject shuffle(ThreadContext context) {
+        RubyArray ary = aryDup();
+        ary.shuffle_bang(context);
+        return ary;
+    }
+
+    public IRubyObject shuffle(ThreadContext context, IRubyObject opts) {
+        RubyArray ary = aryDup();
+        ary.shuffle_bang(context, opts);
+        return ary;
+    }
+
+    private static final int SORTED_THRESHOLD = 10;
+
+    public IRubyObject sample(ThreadContext context) {
+        return sampleCommon(context, randomClass(context));
+    }
+
+    public IRubyObject sample(ThreadContext context, IRubyObject sampleOrOpts) {
+        IRubyObject hash = TypeConverter.checkHashType(context.runtime, sampleOrOpts);
+        if (hash.isNil()) return sampleCommon(context, sampleOrOpts, randomClass(context));
+
+        IRubyObject ret = ArgsUtil.extractKeywordArg(context, (RubyHash) hash, "random");
+
+        return sampleCommon(context, ret != null ? ret : randomClass(context));
+    }
+
+    public IRubyObject sample(ThreadContext context, IRubyObject sample, IRubyObject opts) {
+        IRubyObject hash = TypeConverter.checkHashType(context.runtime, opts);
+        if (hash.isNil()) throw argumentError(context, 2, 0, 1);
+
+        IRubyObject ret = ArgsUtil.extractKeywordArg(context, (RubyHash) hash, "random");
+        return sampleCommon(context, sample, ret != null ? ret : randomClass(context));
+    }
+
+    /**
+     * Common sample logic when no sample size was specified.
+     */
+    private IRubyObject sampleCommon(ThreadContext context, IRubyObject randgen) {
+        if (realLength == 0) return context.nil;
+
+        if (realLength == 1) return eltOk(0);
+
+        long rand = randUpto(context, randgen, realLength);
+
+        if (rand < 0 || realLength <= rand) {
+            return context.nil;
+        }
+
+        return eltOk(rand);
+    }
+
+    /**
+     * Common sample logic when a sample size was specified.
+     */
+    private IRubyObject sampleCommon(ThreadContext context, IRubyObject sample, IRubyObject randgen) {
+        int len = realLength;
+        int n = toInt(context, sample);
+
+        try {
+            if (n < 0) throw argumentError(context, "negative sample number");
+            if (n > len) n = len;
+
+            long[] rnds = new long[SORTED_THRESHOLD];
+            if (n <= SORTED_THRESHOLD) {
+                for (int i = 0; i < n; ++i) {
+                    rnds[i] = randUpto(context, randgen, len - i);
+                }
+            }
+
+            int i, j, k;
+            k = len;
+            len = realLength;
+            if (len < k && n <= SORTED_THRESHOLD) {
+                for (i = 0; i < n; ++i) {
+                    if (rnds[i] >= len) return Create.newEmptyArray(context);
+                }
+            }
+
+            if (n > len) n = len;
+
+            switch (n) {
+            case 0:
+                return Create.newEmptyArray(context);
+            case 1:
+                return realLength <= 0 ? Create.newEmptyArray(context) : Create.newArray(context, eltOk((int) rnds[0]));
+            case 2:
+                i = (int) rnds[0];
+                j = (int) rnds[1];
+
+                if (j >= i) j++;
+
+                return Create.newArray(context, eltOk(i), eltOk(j));
+            case 3:
+                i = (int) rnds[0];
+                j = (int) rnds[1];
+                k = (int) rnds[2];
+
+                int l = j, g = i;
+
+                if (j >= i) {
+                    l = i;
+                    g = ++j;
+                }
+
+                if (k >= l && (++k >= g)) ++k;
+
+                return Create.newArray(context, eltOk(i), eltOk(j), eltOk(k));
+            }
+
+            if (n > len) n = len;
+            if (n <= SORTED_THRESHOLD) {
+                int idx[] = new int[SORTED_THRESHOLD];
+                int sorted[] = new int[SORTED_THRESHOLD];
+                sorted[0] = idx[0] = (int) rnds[0];
+                for (i = 1; i < n; i++) {
+                    k = (int) rnds[i];
+                    for (j = 0; j < i; j++) {
+                        if (k < sorted[j]) break;
+                        k++;
+                    }
+                    System.arraycopy(sorted, j, sorted, j + 1, i - j);
+                    sorted[j] = idx[i] = k;
+                }
+                IRubyObject[] result = IRubyObject.array(n);
+                for (i = 0; i < n; i++) {
+                    result[i] = eltOk(idx[i]);
+                }
+                return RubyArrayNative.newArrayMayCopy(context.runtime, result);
+            } else {
+                IRubyObject[] result = IRubyObject.array(len);
+                System.arraycopy(values, begin, result, 0, len);
+                for (i = 0; i < n; i++) {
+                    j = (int) RubyRandom.randomLongLimited(context, randgen, len - i - 1) + i;
+                    IRubyObject tmp = result[j];
+                    result[j] = result[i];
+                    result[i] = tmp;
+                }
+                RubyArrayNative<?> ary = newArrayNoCopy(context.runtime, result);
+                ary.realLength = n;
+                return ary;
+            }
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+    }
+
+    private static long randUpto(ThreadContext context, IRubyObject randgen, int max) {
+        return RubyRandom.randomLongLimited(context, randgen, max - 1);
+    }
+
+    private static void aryReverse(IRubyObject[] _p1, int p1, IRubyObject[] _p2, int p2) {
+        while(p1 < p2) {
+            IRubyObject tmp = _p1[p1];
+            _p1[p1++] = _p2[p2];
+            _p2[p2--] = tmp;
+        }
+    }
+
+    protected IRubyObject internalRotateBang(ThreadContext context, int cnt) {
+        modify(context);
+
+        try {
+            if(cnt != 0) {
+                IRubyObject[] ptr = values;
+                int len = realLength;
+
+                if(len > 0 && (cnt = rotateCount(cnt, len)) > 0) {
+                    --len;
+                    if(cnt < len) aryReverse(ptr, begin + cnt, ptr, begin + len);
+                    if(--cnt > 0) aryReverse(ptr, begin, ptr, begin + cnt);
+                    if(len > 0)   aryReverse(ptr, begin, ptr, begin + len);
+                    return this;
+                }
+            }
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+
+        return context.nil;
+    }
+
+    private static int rotateCount(int cnt, int len) {
+        return (cnt < 0) ? (len - (~cnt % len) - 1) : (cnt % len);
+    }
+
+    protected IRubyObject internalRotate(ThreadContext context, int cnt) {
+        int len = realLength;
+        RubyArrayNative rotated = aryDup();
+        rotated.modify(context);
+
+        try {
+            if(len > 0) {
+                cnt = rotateCount(cnt, len);
+                IRubyObject[] ptr = this.values;
+                IRubyObject[] ptr2 = rotated.values;
+                len -= cnt;
+                System.arraycopy(ptr, begin + cnt, ptr2, 0, len);
+                System.arraycopy(ptr, begin, ptr2, len, cnt);
+            }
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+
+        return rotated;
+    }
+
+    public IRubyObject rotate_bang(ThreadContext context) {
+        internalRotateBang(context, 1);
+        return this;
+    }
+
+    public IRubyObject rotate_bang(ThreadContext context, IRubyObject cnt) {
+        internalRotateBang(context, toInt(context, cnt));
+        return this;
+    }
+
+    public IRubyObject rotate(ThreadContext context) {
+        return internalRotate(context, 1);
+    }
+
+    public IRubyObject rotate(ThreadContext context, IRubyObject cnt) {
+        return internalRotate(context, toInt(context, cnt));
+    }
+
+    public IRubyObject all_p(ThreadContext context, Block block) {
+        return all_pCommon(context, null, block);
+    }
+
+    public IRubyObject all_p(ThreadContext context, IRubyObject arg, Block block) {
+        return all_pCommon(context, arg, block);
+    }
+
+    public IRubyObject all_pCommon(ThreadContext context, IRubyObject arg, Block block) {
+        CachingCallSite self_each = sites(context).self_each;
+        if (!self_each.isBuiltin(this)) return RubyEnumerable.all_pCommon(context, self_each, this, arg, block);
+        boolean patternGiven = arg != null;
+
+        if (block.isGiven() && patternGiven) warn(context, "given block not used");
+        if (!block.isGiven() || patternGiven) return all_pBlockless(context, arg);
+
+        for (int i = 0; i < realLength; i++) {
+            if (!block.yield(context, eltOk(i)).isTrue()) return context.fals;
+        }
+
+        return context.tru;
+    }
+
+    private IRubyObject all_pBlockless(ThreadContext context, IRubyObject pattern) {
+        if (pattern == null) {
+            for (int i = 0; i < realLength; i++) {
+                if (!eltOk(i).isTrue()) return context.fals;
+            }
+        } else {
+            for (int i = 0; i < realLength; i++) {
+                if (!(pattern.callMethod(context, "===", eltOk(i)).isTrue())) return context.fals;
+            }
+        }
+
+        return context.tru;
+    }
+
+    public IRubyObject any_p(ThreadContext context, Block block) {
+        return any_pCommon(context, null, block);
+    }
+
+    public IRubyObject any_p(ThreadContext context, IRubyObject arg, Block block) {
+        return any_pCommon(context, arg, block);
+    }
+
+    public IRubyObject any_pCommon(ThreadContext context, IRubyObject arg, Block block) {
+        if (isEmpty()) return context.fals;
+        CachingCallSite self_each = sites(context).self_each;
+        if (!self_each.isBuiltin(this)) return RubyEnumerable.any_pCommon(context, self_each, this, arg, block);
+        boolean patternGiven = arg != null;
+
+        if (block.isGiven() && patternGiven) warn(context, "given block not used");
+
+        if (!block.isGiven() || patternGiven) return any_pBlockless(context, arg);
+
+        for (int i = 0; i < realLength; i++) {
+            if (block.yield(context, eltOk(i)).isTrue()) return context.tru;
+        }
+
+        return context.fals;
+    }
+
+    private IRubyObject any_pBlockless(ThreadContext context, IRubyObject pattern) {
+        if (pattern == null) {
+            for (int i = 0; i < realLength; i++) {
+                if (eltOk(i).isTrue()) return context.tru;
+            }
+        } else {
+            for (int i = 0; i < realLength; i++) {
+                if (pattern.callMethod(context, "===", eltOk(i)).isTrue()) return context.tru;
+            }
+        }
+
+        return context.fals;
+    }
+
+    public IRubyObject none_p(ThreadContext context, Block block) {
+        return none_pCommon(context, null, block);
+    }
+
+    public IRubyObject none_p(ThreadContext context, IRubyObject arg, Block block) {
+        return none_pCommon(context, arg, block);
+    }
+
+    public IRubyObject none_pCommon(ThreadContext context, IRubyObject arg, Block block) {
+        CachingCallSite self_each = sites(context).self_each;
+        if (!self_each.isBuiltin(this)) return RubyEnumerable.none_pCommon(context, self_each, this, arg, block);
+        boolean patternGiven = arg != null;
+
+        if (block.isGiven() && patternGiven) warn(context, "given block not used");
+        if (!block.isGiven() || patternGiven) return none_pBlockless(context, arg);
+
+        for (int i = 0; i < realLength; i++) {
+            if (block.yield(context, eltOk(i)).isTrue()) return context.fals;
+        }
+
+        return context.tru;
+    }
+
+    private IRubyObject none_pBlockless(ThreadContext context, IRubyObject pattern) {
+        if (pattern == null) {
+            for (int i = 0; i < realLength; i++) {
+                if (eltOk(i).isTrue()) return context.fals;
+            }
+        } else {
+            for (int i = 0; i < realLength; i++) {
+                if (pattern.callMethod(context, "===", eltOk(i)).isTrue()) return context.fals;
+            }
+        }
+
+        return context.tru;
+    }
+
+    public IRubyObject one_p(ThreadContext context, Block block) {
+        return one_pCommon(context, null, block);
+    }
+
+    public IRubyObject one_p(ThreadContext context, IRubyObject arg, Block block) {
+        return one_pCommon(context, arg, block);
+    }
+
+    public IRubyObject one_pCommon(ThreadContext context, IRubyObject arg, Block block) {
+        CachingCallSite self_each = sites(context).self_each;
+        if (!self_each.isBuiltin(this)) return RubyEnumerable.one_pCommon(context, self_each, this, arg, block);
+        boolean patternGiven = arg != null;
+
+        if (block.isGiven() && patternGiven) warn(context, "given block not used");
+        if (!block.isGiven() || patternGiven) return one_pBlockless(context, arg);
+
+        boolean found = false;
+        for (int i = 0; i < realLength; i++) {
+            if (block.yield(context, eltOk(i)).isTrue()) {
+                if (found) return context.fals;
+                found = true;
+            }
+        }
+
+        return found ? context.tru : context.fals;
+    }
+
+    private IRubyObject one_pBlockless(ThreadContext context, IRubyObject pattern) {
+        boolean found = false;
+
+        if (pattern == null) {
+            for (int i = 0; i < realLength; i++) {
+                if (eltOk(i).isTrue()) {
+                    if (found) return context.fals;
+                    found = true;
+                }
+            }
+        } else {
+            for (int i = 0; i < realLength; i++) {
+                if (pattern.callMethod(context, "===", eltOk(i)).isTrue()) {
+                    if (found) return context.fals;
+                    found = true;
+                }
+            }
+        }
+
+        return found ? context.tru : context.fals;
+    }
+
+    public IRubyObject sum(final ThreadContext context, final Block block) {
+        RubyFixnum zero = asFixnum(context, 0);
+        CachingCallSite self_each = sites(context).self_each;
+
+        return !self_each.isBuiltin(this) ?
+                RubyEnumerable.sumCommon(context, self_each, this, zero, block) :
+                sumCommon(context, zero, block);
+    }
+
+    public IRubyObject sum(final ThreadContext context, IRubyObject init, final Block block) {
+        CachingCallSite self_each = sites(context).self_each;
+        return !self_each.isBuiltin(this) ?
+                RubyEnumerable.sumCommon(context, self_each, this, init, block) :
+                sumCommon(context, init, block);
+    }
+
+    public IRubyObject sumCommon(final ThreadContext context, IRubyObject init, final Block block) {
+        IRubyObject result = init;
+
+        /*
+         * This state machine is simple: it assumes all elements are the same type,
+         * and transitions to a later state when that assumption fails.
+         *
+         * The order of states is:
+         *
+         * - is_fixnum =&gt; { is_bignum | is_rational | is_float | other }
+         * - is_bignum =&gt; { is_rational | is_float | other }
+         * - is_rational =&gt; { is_float | other }
+         * - is_float =&gt; { other }
+         * - other [terminal]
+         */
+        boolean is_fixnum=false, is_bignum=false, is_rational=false, is_float=false;
+
+        if (result instanceof RubyFixnum) {
+            is_fixnum = true;
+        } else if (result instanceof RubyBignum) {
+            is_bignum = true;
+        } else if (result instanceof RubyRational) {
+            is_rational = true;
+        } else if (result instanceof RubyFloat) {
+            is_float = true;
+        }
+
+        int i = 0;
+        IRubyObject value = null;
+
+        if (is_fixnum) {
+            long sum = ((RubyFixnum) result).getValue();
+fixnum_loop:
+            for (; i < realLength; value=null, i++) {
+                if (value == null) {
+                    value = eltOk(i);
+                    if (block.isGiven()) {
+                        value = block.yield(context, value);
+                    }
+                }
+
+                if (value instanceof RubyFixnum) {
+                    /* should not overflow long type */
+                    try {
+                        sum = Math.addExact(sum, ((RubyFixnum) value).getValue());
+                    } catch (ArithmeticException ae) {
+                        is_bignum = true;
+                        break fixnum_loop;
+                    }
+                } else if (value instanceof RubyBignum) {
+                    is_bignum = true;
+                    break fixnum_loop;
+                } else if (value instanceof RubyRational) {
+                    is_rational = true;
+                    break fixnum_loop;
+                } else {
+                    is_float = value instanceof RubyFloat;
+                    break fixnum_loop;
+                }
+            }
+
+            if (is_bignum) {
+                result = RubyBignum.newBignum(context.runtime, sum);
+            } else if (is_rational) {
+                result = RubyRational.newRational(context.runtime, sum, 1);
+            } else if (is_float) {
+                result = asFloat(context, (double) sum);
+            } else {
+                result = asFixnum(context, sum);
+            }
+        }
+        if (is_bignum) {
+            BigInteger sum = ((RubyBignum) result).value;
+bignum_loop:
+            for (; i < realLength; value=null, i++) {
+                if (value == null) {
+                    value = eltOk(i);
+                    if (block.isGiven()) {
+                        value = block.yield(context, value);
+                    }
+                }
+
+                if (value instanceof RubyFixnum) {
+                    final long val = ((RubyFixnum) value).getValue();
+                    sum = sum.add(BigInteger.valueOf(val));
+                } else if (value instanceof RubyBignum) {
+                    sum = sum.add(((RubyBignum) value).value);
+                } else if (value instanceof RubyRational) {
+                    is_rational = true;
+                    break bignum_loop;
+                } else {
+                    is_float = value instanceof RubyFloat;
+                    break bignum_loop;
+                }
+            }
+
+            if (is_rational) {
+                result = RubyRational.newInstance(context, RubyBignum.newBignum(context.runtime, sum));
+            } else if (is_float) {
+                result = asFloat(context, sum.doubleValue());
+            } else {
+                result = RubyBignum.newBignum(context.runtime, sum);
+            }
+        }
+        if (is_rational) {
+rational_loop:
+            for (; i < realLength; value=null, i++) {
+                if (value == null) {
+                    value = eltOk(i);
+                    if (block.isGiven()) {
+                        value = block.yield(context, value);
+                    }
+                }
+
+                if (value instanceof RubyFixnum || value instanceof RubyBignum || value instanceof RubyRational) {
+                    if (result instanceof RubyInteger) {
+                        result = ((RubyInteger) result).op_plus(context, value);
+                    } else if (result instanceof RubyRational) {
+                        result = ((RubyRational) result).op_plus(context, value);
+                    } else {
+                        throw typeError(context, "BUG: unexpected type in rational part of Array#sum");
+                    }
+                } else if (value instanceof RubyFloat) {
+                    result = asFloat(context, ((RubyRational) result).asDouble(context));
+                    is_float = true;
+                    break rational_loop;
+                } else {
+                    break rational_loop;
+                }
+            }
+        }
+        if (is_float) {
+            /*
+             * Kahan-Babuska balancing compensated summation algorithm
+             * See http://link.springer.com/article/10.1007/s00607-005-0139-x
+             */
+            double f = ((RubyFloat) result).value;
+            double c = 0.0;
+            double x, t;
+float_loop:
+            for (; i < realLength; value=null, i++) {
+                if (value == null) {
+                    value = eltOk(i);
+                    if (block.isGiven()) {
+                        value = block.yield(context, value);
+                    }
+                }
+
+                if (!(value instanceof RubyFloat || value instanceof RubyFixnum || value instanceof RubyBignum || value instanceof RubyRational)) {
+                    break float_loop;
+                }
+
+                x = ((RubyNumeric) value).asDouble(context);
+
+                if (Double.isNaN(f)) continue;
+                if (Double.isNaN(x)) {
+                    f = x;
+                    continue;
+                }
+                if (Double.isInfinite(x)) {
+                    if (Double.isInfinite(f) && Math.signum(x) != Math.signum(f))
+                        f = Double.NaN;
+                    else
+                        f = x;
+                    continue;
+                }
+                if (Double.isInfinite(f)) continue;
+
+                t = f + x;
+                if (Math.abs(f) >= Math.abs(x)) {
+                    c += ((f - t) + x);
+                } else {
+                    c += ((x - t) + f);
+                }
+                f = t;
+            }
+            f += c;
+
+            result = asFloat(context, f);
+        }
+//object_loop:
+        for (; i < realLength; value=null, i++) {
+            if (value == null) {
+                value = eltOk(i);
+                if (block.isGiven()) {
+                    value = block.yield(context, value);
+                }
+            }
+
+            result = result.callMethod(context, "+", value);
+        }
+
+        return result;
+    }
+
+    public IRubyObject find(ThreadContext context, IRubyObject ifnone, Block block) {
+        CachingCallSite self_each = sites(context).self_each;
+        if (!self_each.isBuiltin(this)) return RubyEnumerable.detectCommon(context, self_each, this, block);
+
+        return detectCommon(context, ifnone, block);
+    }
+
+    public IRubyObject find_index(ThreadContext context, Block block) {
+        CachingCallSite self_each = sites(context).self_each;
+        if (!self_each.isBuiltin(this)) return RubyEnumerable.find_indexCommon(context, self_each, this, block, Signature.OPTIONAL);
+
+        for (int i = 0; i < realLength; i++) {
+            if (block.yield(context, eltOk(i)).isTrue()) return asFixnum(context, i);
+        }
+
+        return context.nil;
+    }
+
+    public IRubyObject find_index(ThreadContext context, IRubyObject cond) {
+        CachingCallSite self_each = sites(context).self_each;
+        if (!self_each.isBuiltin(this)) return RubyEnumerable.find_indexCommon(context, self_each, this, cond);
+
+        for (int i = 0; i < realLength; i++) {
+            if (eltOk(i).equals(cond)) return asFixnum(context, i);
+        }
+
+        return context.nil;
+    }
+
+    public IRubyObject detectCommon(ThreadContext context, IRubyObject ifnone, Block block) {
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject value = eltOk(i);
+
+            if (block.yield(context, value).isTrue()) return value;
+        }
+
+        return ifnone != null && !ifnone.isNil() ? sites(context).call.call(context, ifnone, ifnone) : context.nil;
+    }
+
+    /**
+     * Construct the most efficient array shape for the given size. This should only be used when you
+     * intend to populate all elements, since the packed arrays will be born with a nonzero size and
+     * would have to be unpacked to partially populate.
+     *
+     * We nil-fill all cases, to ensure nulls will never leak out if there's an unpopulated element
+     * or an index accessed before assignment.
+     *
+     * @param context the current thread context
+     * @param size the size
+     * @return a RubyArray shaped for the given size
+     */
+    public static RubyArray newBlankArray(ThreadContext context, int size) {
+        switch (size) {
+            case 0:
+                return Create.newEmptyArray(context);
+            case 1:
+                if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(context.runtime, context.nil);
+                break;
+            case 2:
+                if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(context.runtime, context.nil, context.nil);
+                break;
+        }
+
+        return newArray(context, size);
+    }
+
+    // when caller is sure to set all elements
+    static RubyArrayNative newBlankArrayInternal(Ruby runtime, int size) {
+        return newBlankArrayInternal(runtime, runtime.getArray(), size);
+    }
+
+    // when caller is sure to set all elements
+    static RubyArrayNative newBlankArrayInternal(Ruby runtime, RubyClass metaClass, int size) {
+        switch (size) {
+            case 0:
+                return newEmptyArray(runtime);
+            case 1:
+                if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(metaClass, null);
+                break;
+            case 2:
+                if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(metaClass, null, null);
+                break;
+        }
+
+        return new RubyArrayNative(runtime, metaClass, size);
+    }
+
+    public static IRubyObject try_convert(ThreadContext context, IRubyObject self, IRubyObject arg) {
+        return arg.checkArrayType();
+    }
+
+    public RubyString pack(ThreadContext context, IRubyObject obj) {
+        RubyString format = obj.convertToString();
+        try {
+            RubyString buffer = newString(context, new ByteList());
+            return Pack.pack(context, this, format, buffer);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(context, e);
+        }
+    }
+
+    public RubyString pack(ThreadContext context, IRubyObject obj, IRubyObject maybeOpts) {
+        IRubyObject opts = ArgsUtil.getOptionsArg(context, maybeOpts);
+        IRubyObject buffer = null;
+
+        if (opts != context.nil) {
+            buffer = ArgsUtil.extractKeywordArg(context, (RubyHash) opts, "buffer");
+            if (buffer == context.nil) buffer = null;
+            if (buffer != null && !(buffer instanceof RubyString)) {
+                throw typeError(context, "buffer must be String, not ", buffer, "");
+            }
+        }
+
+        if (buffer==null) buffer = newString(context, new ByteList());
+
+        return Pack.pack(context, this, obj.convertToString(), (RubyString) buffer);
+    }
+
+    public IRubyObject dig(ThreadContext context, IRubyObject arg0) {
+        return at( arg0 );
+    }
+
+    public IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
+        final IRubyObject val = at( arg0 );
+        return RubyObject.dig1(context, val, arg1);
+    }
+
+    public IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
+        final IRubyObject val = at( arg0 );
+        return RubyObject.dig2(context, val, arg1, arg2);
+    }
+
+    public IRubyObject dig(ThreadContext context, IRubyObject[] args) {
+        int argc = Arity.checkArgumentCount(context, args, 1, -1);
+
+        final IRubyObject val = at( args[0] );
+        return argc == 1 ? val : RubyObject.dig(context, val, args, 1);
+    }
+
+    private IRubyObject maxWithBlock(ThreadContext context, Block block) {
+        IRubyObject result = UNDEF;
+        ArraySites sites = sites(context);
+        CallSite op_gt = sites.op_gt_minmax;
+        CallSite op_lt = sites.op_lt_minmax;
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = eltOk(i);
+
+            if (result == UNDEF ||
+                    RubyComparable.cmpint(context, op_gt, op_lt, block.yieldArray(context, Create.newArray(context, v, result), null), v, result) > 0) {
+                result = v;
+            }
+        }
+
+        return result == UNDEF ? context.nil : result;
+    }
+
+    public IRubyObject max(ThreadContext context, Block block) {
+        if (block.isGiven()) return maxWithBlock(context, block);
+        if (realLength < 1) return context.nil;
+
+        IRubyObject result = UNDEF;
+        ArraySites sites = sites(context);
+        CachingCallSite op_cmp = sites.op_cmp_minmax;
+        CallSite op_gt = sites.op_gt_minmax;
+        CallSite op_lt = sites.op_lt_minmax;
+
+        int generation = getArg0Generation(op_cmp);
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = eltOk(i);
+
+            if (result == UNDEF || optimizedCmp(context, v, result, generation, op_cmp, op_gt, op_lt) > 0) {
+                result = v;
+            }
+        }
+
+        return result == UNDEF ? context.nil : result;
+    }
+
+    public IRubyObject max(ThreadContext context, IRubyObject num, Block block) {
+        if (!num.isNil()) {
+            return RubyEnumerable.max(context, this, num, block);
+        }
+
+        return max(context, block);
+    }
+
+    private IRubyObject minWithBlock(ThreadContext context, Block block) {
+        IRubyObject result = UNDEF;
+        ArraySites sites = sites(context);
+        CallSite op_gt = sites.op_gt_minmax;
+        CallSite op_lt = sites.op_lt_minmax;
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = eltOk(i);
+
+            if (result == UNDEF ||
+                    RubyComparable.cmpint(context, op_gt, op_lt, block.yieldArray(context, Create.newArray(context, v, result), null), v, result) < 0) {
+                result = v;
+            }
+        }
+
+        return result == UNDEF ? context.nil : result;
+    }
+
+    public IRubyObject min(ThreadContext context, Block block) {
+        if (block.isGiven()) return minWithBlock(context, block);
+
+        if (realLength == 0) {
+            return context.nil;
+        }
+
+        if (realLength == 1) {
+            return eltInternal(0);
+        }
+
+        IRubyObject result = UNDEF;
+        ArraySites sites = sites(context);
+        CachingCallSite op_cmp = sites.op_cmp_minmax;
+        CallSite op_gt = sites.op_gt_minmax;
+        CallSite op_lt = sites.op_lt_minmax;
+
+        int generation = getArg0Generation(op_cmp);
+
+        for (int i = 0; i < realLength; i++) {
+            IRubyObject v = eltOk(i);
+
+            if (result == UNDEF || optimizedCmp(context, v, result, generation, op_cmp, op_gt, op_lt) < 0) {
+                result = v;
+            }
+        }
+
+        return result == UNDEF ? context.nil : result;
+    }
+
+    private int getArg0Generation(CachingCallSite op_cmp) {
+        IRubyObject arg0 = eltInternal(0);
+        RubyClass metaclass = arg0.getMetaClass();
+        CacheEntry entry = op_cmp.retrieveCache(metaclass);
+        int generation = -1;
+
+        if (entry.method.isBuiltin()) {
+            generation = entry.token;
+        }
+        return generation;
+    }
+
+    public IRubyObject min(ThreadContext context, IRubyObject num, Block block) {
+        return num.isNil() ?
+                min(context, block) :
+                RubyEnumerable.min(context, this, num, block);
+    }
+
+    public IRubyObject minmax(ThreadContext context, Block block) {
+        return block.isGiven() ?
+                Helpers.invokeSuper(context, this, arrayClass(context), "minmax", NULL_ARRAY, block) :
+                Create.newArray(context, callMethod("min"), callMethod("max"));
+    }
+
+    private static final int optimizedCmp(ThreadContext context, IRubyObject a, IRubyObject b, int token,
+                                          CachingCallSite op_cmp, CallSite op_gt, CallSite op_lt) {
+        if (token == ((RubyBasicObject) a).metaClass.generation) {
+            if (a instanceof RubyFixnum aa && b instanceof RubyFixnum bb) return Long.compare(aa.getValue(), bb.getValue());
+            if (a instanceof RubyString aa && b instanceof RubyString bb) return aa.op_cmp(bb);
+        }
+
+        return RubyComparable.cmpint(context, op_gt, op_lt, op_cmp.call(context, a, a, b), a, b);
+    }
+
+    @Override
+    public Class getJavaClass() {
+        return List.class;
+    }
+
+    /**
+     * Copy the values contained in this array into the target array at the specified offset.
+     * It is expected that the target array is large enough to hold all necessary values.
+     */
+    public void copyInto(ThreadContext context, IRubyObject[] target, int start) {
+        assert target.length - start >= realLength;
+        safeArrayCopy(context, values, begin, target, start, realLength);
+    }
+
+    /**
+     * Copy the specified number of values contained in this array into the target array at the specified offset.
+     * It is expected that the target array is large enough to hold all necessary values.
+     */
+    public void copyInto(ThreadContext context, IRubyObject[] target, int start, int len) {
+        assert target.length - start >= len;
+        safeArrayCopy(context, values, begin, target, start, len);
+    }
+
+    // Satisfy java.util.List interface (for Java integration)
+    public int size() {
+        return realLength;
+    }
+
+    public boolean isEmpty() {
+        return realLength == 0;
+    }
+
+    public boolean contains(Object element) {
+        return indexOf(element) != -1;
+    }
+
+    public Object[] toArray() {
+        // no catch for ArrayIndexOutOfBounds here because this impls a List method
+        Object[] array = new Object[realLength];
+        for (int i = 0; i < realLength; i++) {
+            array[i] = eltInternal(i).toJava(Object.class);
+        }
+        return array;
+    }
+
+    public Object[] toArray(final Object[] arg) {
+        // no catch for ArrayIndexOutOfBounds here because this impls a List method
+        Object[] array = arg;
+        Class type = array.getClass().getComponentType();
+        if (array.length < realLength) {
+            array = (Object[]) Array.newInstance(type, realLength);
+        }
+        int length = realLength;
+
+        for (int i = 0; i < length; i++) {
+            array[i] = eltInternal(i).toJava(type);
+        }
+        return array;
+    }
+
+    @Override
+    public <T> T toJava(Class<T> target) {
+        if (target.isArray()) {
+            Class type = target.getComponentType();
+            Object rawJavaArray = Array.newInstance(type, realLength);
+            try {
+                ArrayUtils.copyDataToJavaArrayDirect(this, rawJavaArray);
+            } catch (ArrayIndexOutOfBoundsException ex) {
+                throw concurrentModification(getRuntime().getCurrentContext(), ex);
+            }
+            return target.cast(rawJavaArray);
+        } else {
+            return super.toJava(target);
+        }
+    }
+
+    public boolean add(Object element) {
+        return add(getRuntime().getCurrentContext(), element);
+    }
+
+    public boolean add(ThreadContext context, Object element) {
+        append(context, JavaUtil.convertJavaToUsableRubyObject(context.runtime, element));
+        return true;
+    }
+
+    public boolean remove(Object element) {
+        final Ruby runtime = metaClass.runtime;
+        ThreadContext context = runtime.getCurrentContext();
+        unpack(context);
+        IRubyObject item = JavaUtil.convertJavaToUsableRubyObject(runtime, element);
+        boolean listchanged = false;
+
+        for (int i1 = 0; i1 < realLength; i1++) {
+            IRubyObject e = values[begin + i1];
+            if (equalInternal(context, e, item)) {
+                delete_at(i1);
+                listchanged = true;
+                break;
+            }
+        }
+
+        return listchanged;
+    }
+
+    public boolean containsAll(Collection c) {
+        for (Iterator iter = c.iterator(); iter.hasNext();) {
+            if (indexOf(iter.next()) == -1) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public boolean addAll(Collection c) {
+        for (Iterator iter = c.iterator(); iter.hasNext();) {
+            add(iter.next());
+        }
+        return !c.isEmpty();
+    }
+
+    public boolean addAll(int index, Collection c) {
+        Iterator iter = c.iterator();
+        for (int i = index; iter.hasNext(); i++) {
+            add(i, iter.next());
+        }
+        return !c.isEmpty();
+    }
+
+    public boolean removeAll(Collection c) {
+        boolean listChanged = false;
+        final Ruby runtime = metaClass.runtime;
+        ThreadContext context = runtime.getCurrentContext();
+        for (Iterator iter = c.iterator(); iter.hasNext();) {
+            IRubyObject deleted = delete(context, JavaUtil.convertJavaToUsableRubyObject(runtime, iter.next()), Block.NULL_BLOCK);
+            if (!deleted.isNil()) {
+                listChanged = true;
+            }
+        }
+        return listChanged;
+    }
+
+    public boolean retainAll(Collection c) {
+        boolean listChanged = false;
+
+        for (Iterator iter = iterator(); iter.hasNext();) {
+            Object element = iter.next();
+            if (!c.contains(element)) {
+                remove(element);
+                listChanged = true;
+            }
+        }
+        return listChanged;
+    }
+
+    public Object get(int index) {
+        return elt(index).toJava(Object.class);
+    }
+
+    public Object set(int index, Object element) {
+        Object previous = elt(index).toJava(Object.class);
+        store(index, JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, element));
+        return previous;
+    }
+
+    public void add(int index, Object element) {
+        insert(metaClass.runtime.getCurrentContext(), index, JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, element));
+    }
+
+    public Object remove(int index) {
+        return delete_at(index).toJava(Object.class);
+    }
+
+    public int indexOf(Object element) {
+        int myBegin = this.begin;
+
+        if (element != null) {
+            IRubyObject convertedElement = JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, element);
+
+            for (int i = myBegin; i < myBegin + realLength; i++) {
+                if (convertedElement.equals(values[i])) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    public int lastIndexOf(Object element) {
+        if (element != null) {
+            IRubyObject convertedElement = JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, element);
+
+            for (int i = realLength - 1; i >= 0; i--) {
+                if (convertedElement.equals(eltInternal(i))) {
+                    return i;
+                }
+            }
+        }
+
+        return -1;
+    }
+
+    private static class JoinRecursive implements ThreadContext.RecursiveFunctionEx<JoinRecursive.State> {
+        protected static class State {
+            private final RubyArrayNative ary;
+            //private final IRubyObject outValue;
+            private final RubyString sep;
+            private final RubyString result;
+            private final boolean[] first;
+
+            State(RubyArrayNative ary, IRubyObject outValue, RubyString sep, RubyString result, boolean[] first) {
+                this.ary = ary;
+                //this.outValue = outValue;
+                this.sep = sep;
+                this.result = result;
+                this.first = first;
+            }
+        }
+
+        public IRubyObject call(ThreadContext context, State state, IRubyObject obj, boolean recur) {
+            if (recur) throw argumentError(context, "recursive array join");
+
+            state.ary.joinAny(context, state.sep, 0, state.result, state.first);
+
+            return context.nil;
+        }
+    }
+
+    private static final JoinRecursive JOIN_RECURSIVE = new JoinRecursive();
+
+    public class RubyArrayConversionIterator implements Iterator {
+        protected int index = 0;
+        protected int last = -1;
+
+        public boolean hasNext() {
+            return index < realLength;
+        }
+
+        public Object next() {
+            IRubyObject element = elt(index);
+            last = index++;
+            return element.toJava(Object.class);
+        }
+
+        public void remove() {
+            if (last == -1) throw new IllegalStateException();
+
+            delete_at(last);
+            if (last < index) index--;
+
+            last = -1;
+
+        }
+    }
+
+    public Iterator iterator() {
+        return new RubyArrayConversionIterator();
+    }
+
+    final class RubyArrayConversionListIterator extends RubyArrayConversionIterator implements ListIterator {
+        public RubyArrayConversionListIterator() {
+        }
+
+        public RubyArrayConversionListIterator(int index) {
+            this.index = index;
+        }
+
+        public boolean hasPrevious() {
+            return index >= 0;
+        }
+
+        public Object previous() {
+            return elt(last = --index).toJava(Object.class);
+        }
+
+        public int nextIndex() {
+            return index;
+        }
+
+        public int previousIndex() {
+            return index - 1;
+        }
+
+        public void set(Object obj) {
+            if (last == -1) {
+                throw new IllegalStateException();
+            }
+
+            store(last, JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, obj));
+        }
+
+        public void add(Object obj) {
+            Ruby runtime = metaClass.runtime;
+            insert(new IRubyObject[] { asFixnum(runtime.getCurrentContext(), index++), JavaUtil.convertJavaToUsableRubyObject(runtime, obj) });
+            last = -1;
+        }
+    }
+
+    public ListIterator listIterator() {
+        return new RubyArrayConversionListIterator();
+    }
+
+    public ListIterator listIterator(int index) {
+        return new RubyArrayConversionListIterator(index);
+	}
+
+    // TODO: list.subList(from, to).clear() is supposed to clear the sublist from the list
+    public List subList(int fromIndex, int toIndex) {
+        if (fromIndex < 0 || toIndex > size() || fromIndex > toIndex) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        IRubyObject subList = subseq(fromIndex, toIndex - fromIndex);
+
+        return subList.isNil() ? null : (List) subList;
+    }
+
+    public void clear() {
+        rb_clear(getRuntime().getCurrentContext());
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) return true;
+        if (other instanceof RubyArray) {
+            return op_equal(metaClass.runtime.getCurrentContext(), (RubyArray) other).isTrue();
+        }
+        return false;
+    }
+
+    @JRubyMethod
+    public IRubyObject rfind(ThreadContext context, Block block) {
+        return rfind(context, context.nil, block);
+    }
+
+    @JRubyMethod
+    public IRubyObject rfind(ThreadContext context, IRubyObject ifnone, Block block) {
+        CachingCallSite self_each = sites(context).self_each;
+        if (!self_each.isBuiltin(this)) return RubyEnumerable.detectCommon(context, self_each, this, block);
+
+        for (int i = realLength - 1; i >= 0; i--) {
+            IRubyObject value = eltOk(i);
+
+            if (block.yield(context, value).isTrue()) return value;
+        }
+
+        return ifnone != null && !ifnone.isNil() ? sites(context).call.call(context, ifnone, ifnone) : context.nil;
+    }
+
+    private static IRubyObject safeArrayRef(ThreadContext context, IRubyObject[] values, int i) {
+        try {
+            return values[i];
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+    }
+
+    protected static IRubyObject safeArraySet(ThreadContext context, IRubyObject[] values, int i, IRubyObject value) {
+        try {
+            return values[i] = value;
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+    }
+
+    private static IRubyObject safeArrayRefSet(ThreadContext context, IRubyObject[] values, int i, IRubyObject value) {
+        try {
+            IRubyObject tmp = values[i];
+            values[i] = value;
+            return tmp;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw concurrentModification(context, e);
+        }
+    }
+
+    private static IRubyObject safeArrayRefCondSet(ThreadContext context, IRubyObject[] values, int i, boolean doSet, IRubyObject value) {
+        try {
+            IRubyObject tmp = values[i];
+            if (doSet) values[i] = value;
+            return tmp;
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+    }
+    
+    private static void safeArrayCopy(ThreadContext context, IRubyObject[] source, int sourceStart, IRubyObject[] target, int targetStart, int length) {
+        try {
+            System.arraycopy(source, sourceStart, target, targetStart, length);
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            throw concurrentModification(context, ex);
+        }
+    }
+
+    private static ArraySites sites(ThreadContext context) {
+        return context.sites.Array;
+    }
+
+    /**
+     * Returns a stream of each IRubyObject
+     * @return
+     */
+    public Stream<IRubyObject> rubyStream() {
+        return Stream.iterate(0, i -> i + 1).limit(realLength).map(this::eltInternal);
+    }
+}
diff --git a/core/src/main/java/org/jruby/RubyBasicObject.java b/core/src/main/java/org/jruby/RubyBasicObject.java
index 79d471ebce7..cf3c04da0b2 100644
--- a/core/src/main/java/org/jruby/RubyBasicObject.java
+++ b/core/src/main/java/org/jruby/RubyBasicObject.java
@@ -315,7 +315,7 @@ protected final void testFrozen(String message) {
    protected final void testFrozen() {
        if (isFrozen()) {
            var context = getRuntime().getCurrentContext();
-           throw context.runtime.newFrozenError((isClass() ? "Class: " : (isModule() ? "Module: " : "object: ")) + inspect(context), this);
+           throw context.runtime.newFrozenError((isClass() ? "Class: " : (isModule() ? "Module: " : "Object: ")) + inspect(context), this);
        }
    }
 
@@ -905,6 +905,7 @@ private static void initCopy(ThreadContext context, IRubyObject clone, IRubyObje
             RubyModule cloneMod = (RubyModule)clone;
             cloneMod.syncConstants((RubyModule)original);
             cloneMod.syncClassVariables((RubyModule)original);
+            cloneMod.initializeCopiedModule(context, original);
         }
     }
 
@@ -1028,7 +1029,13 @@ protected RubyClass getSingletonClassCloneAndAttach(ThreadContext context, RubyB
         MetaClass clone = new MetaClass(context.runtime, klass.getSuperClass(), attach);
         clone.flags = klass.flags;
 
-        clone.setMetaClass(this instanceof RubyClass ? clone : klass.getSingletonClassCloneAndAttach(context, null));
+        if (this instanceof RubyClass) {
+            clone.setMetaClass(clone);
+        } else {
+            MetaClass metaClone = (MetaClass) klass.getSingletonClassCloneAndAttach(context, null);
+            clone.setMetaClass(metaClone);
+            metaClone.setAttached(clone);
+        }
 
         if (klass.hasVariables()) clone.syncVariables(klass);
 
@@ -1036,8 +1043,6 @@ protected RubyClass getSingletonClassCloneAndAttach(ThreadContext context, RubyB
 
         klass.cloneMethods(context, clone);
 
-        ((MetaClass) clone.getMetaClass()).setAttached(clone);
-
         return clone;
     }
 
@@ -1068,7 +1073,7 @@ public void dataWrapStruct(Object obj) {
         if (obj == null) {
             removeInternalVariable("__wrap_struct__");
         } else {
-            fastSetInternalVariable("__wrap_struct__", obj);
+            setInternalVariable("__wrap_struct__", obj);
         }
     }
 
@@ -1132,24 +1137,26 @@ public IRubyObject inspect() {
     // MRI: rb_obj_inspect
     public IRubyObject inspect(ThreadContext context) {
         return !isImmediate() && !(this instanceof RubyModule) && hasVariables() ?
-                hashyInspect() : to_s(context);
+                hashyInspect(context) : to_s(context);
     }
 
+    @Deprecated(since = "10.1.0.0")
     public final IRubyObject hashyInspect() {
-        final Ruby runtime = getRuntime();
+        return hashyInspect(getRuntime().getCurrentContext());
+    }
 
-        RubyString part = inspectPrefix(runtime.getCurrentContext(), metaClass.getRealClass(), inspectHashCode());
+    public final IRubyObject hashyInspect(ThreadContext context) {
+        IRubyObject ivars = Helpers.invokeChecked(context, this, sites(context).instance_variables_to_inspect_checked);
 
-        if (runtime.isInspecting(this)) {
-            encStrBufCat(runtime, part, SPACE_DOT_DOT_DOT_GT);
-            return part;
-        }
-        try {
-            runtime.registerInspecting(this);
-            return inspectObj(runtime, part);
-        } finally {
-            runtime.unregisterInspecting(this);
+        if (ivars != null && !ivars.isNil() && !(ivars instanceof RubyArray)) {
+            throw typeError(context, "Expected #instance_variables_to_inspect to return an Array or nil, but it returned " + ivars.getMetaClass());
         }
+
+        RubyString part = inspectPrefix(context, metaClass.getRealClass(), inspectHashCode());
+
+        return context.execRecursive(
+                (ctx, p, obj, recur) -> inspectObj(ctx, p, ivars, recur),
+                part, this, "inspect");
     }
 
     // MRI: rb_inspect, which does dispatch
@@ -1187,31 +1194,63 @@ protected int inspectHashCode() {
      * The internal helper method that takes care of the part of the
      * inspection that inspects instance variables.
      */
-    private RubyString inspectObj(final Ruby runtime, RubyString part) {
-        final ThreadContext context = runtime.getCurrentContext();
+    private RubyString inspectObj(final ThreadContext context, RubyString part, IRubyObject ivars, boolean recur) {
+        Ruby runtime = context.runtime;
+
+        if (recur) {
+            encStrBufCat(runtime, part, SPACE_DOT_DOT_DOT_GT);
+            return part;
+        }
+
+        if (ivars == null || ivars.isNil()) {
+            // no ivars specified, do all of them
+            boolean first = true;
+            for (Map.Entry<String, VariableAccessor> entry : metaClass.getVariableTableManager().getVariableAccessorsForRead().entrySet()) {
+                VariableAccessor accessor = entry.getValue();
+                String name = entry.getKey();
 
-        boolean first = true;
-        for (Map.Entry<String, VariableAccessor> entry : metaClass.getVariableTableManager().getVariableAccessorsForRead().entrySet()) {
-            Object value = entry.getValue().get(this);
-            if (!(value instanceof IRubyObject)) continue;
-            RubySymbol symbol = asSymbol(context, entry.getKey());
-            if (!symbol.validInstanceVariableName()) continue;
+                if (appendInstanceVariable(context, part, accessor, name, first, runtime)) continue;
+
+                first = false;
+            }
+        } else {
+            // ivars specified, do only those
+            RubyArray ivarsAry = Convert.castAsArray(context, ivars);
 
-            IRubyObject obj = (IRubyObject) value;
+            boolean first = true;
+            Map<String, VariableAccessor> accessors = metaClass.getVariableTableManager().getVariableAccessorsForRead();
+            for (int i = 0; i < ivarsAry.size(); i++) {
+                String name = ivarsAry.eltOk(i).toString();
+                VariableAccessor accessor = accessors.get(name);
+                if (accessor == null) continue;
 
-            if (!first) encStrBufCat(runtime, part, COMMA);
-            encStrBufCat(runtime, part, SPACE);
-            // FIXME: bytelist_love: EPICLY wrong but something in MRI gets around identifiers of arbitrary encoding.
-            encStrBufCat(runtime, part, symbol.asString().encode(context, encodingService(context).convertEncodingToRubyEncoding(part.getEncoding())).asString().getByteList());
-            encStrBufCat(runtime, part, EQUALS);
-            encStrBufCat(runtime, part, sites(context).inspect.call(context, obj, obj).convertToString().getByteList());
+                if (appendInstanceVariable(context, part, accessor, name, first, runtime)) continue;
 
-            first = false;
+                first = false;
+            }
         }
+
         encStrBufCat(runtime, part, GT);
         return part;
     }
 
+    private boolean appendInstanceVariable(ThreadContext context, RubyString part, VariableAccessor accessor, String name, boolean first, Ruby runtime) {
+        Object value = accessor.get(this);
+        if (!(value instanceof IRubyObject)) return true;
+        RubySymbol symbol = asSymbol(context, name);
+        if (!symbol.validInstanceVariableName()) return true;
+
+        IRubyObject obj = (IRubyObject) value;
+
+        if (!first) encStrBufCat(runtime, part, COMMA);
+        encStrBufCat(runtime, part, SPACE);
+        // FIXME: bytelist_love: EPICLY wrong but something in MRI gets around identifiers of arbitrary encoding.
+        encStrBufCat(runtime, part, symbol.asString().encode(context, encodingService(context).convertEncodingToRubyEncoding(part.getEncoding())).asString().getByteList());
+        encStrBufCat(runtime, part, EQUALS);
+        encStrBufCat(runtime, part, sites(context).inspect.call(context, obj, obj).convertToString().getByteList());
+        return false;
+    }
+
     // Methods of the Object class (rb_obj_*):
 
 
@@ -1695,19 +1734,15 @@ public void forEachInstanceVariable(BiConsumer<String, IRubyObject> accessor) {
     }
 
     private void raiseFrozenError() throws RaiseException {
-        if (this instanceof RubyModule) {
-            throw getRuntime().newFrozenError("class/module ", this);
+        if (this instanceof RubyClass) {
+            throw getRuntime().newFrozenError("Class", this);
+        } else if (this instanceof RubyModule) {
+            throw getRuntime().newFrozenError("Module", this);
         } else {
             throw getRuntime().newFrozenError(this);
         }
     }
 
-    @Deprecated(since = "9.0.0.0")
-    @Override
-    public final int getNativeTypeIndex() {
-        return getNativeClassIndex().ordinal();
-    }
-
     @Override
     public ClassIndex getNativeClassIndex() {
         return ClassIndex.BASICOBJECT;
@@ -2191,42 +2226,31 @@ public void checkFrozen() {
         testFrozen();
     }
 
-    /* obj_respond_to
-     *
-     * respond_to?( aSymbol, includePriv=false )$ -&gt; true or false
-     *
-     * Returns true if this object responds to the given method. Private
-     * methods are included in the search only if the optional second
-     * parameter evaluates to true.
-     *
-     * @return true if this responds to the given method
-     *
-     * !!! For some reason MRI shows the arity of respond_to? as -1, when it should be -2; that's why this is rest instead of required, optional = 1
-     *
-     * Going back to splitting according to method arity. MRI is wrong
-     * about most of these anyway, and since we have arity splitting
-     * in both the compiler and the interpreter, the performance
-     * benefit is important for this method.
-     */
-    @Deprecated(since = "9.2.0.0") // NOTE: does not match Ruby 2.x rules (does method bound check only)
     public final RubyBoolean respond_to_p(IRubyObject mname) {
         return getRuntime().newBoolean(getMetaClass().respondsToMethod(mname.asJavaString(), true));
     }
 
-    @Deprecated(since = "9.2.0.0") // NOTE: does not match Ruby 2.x rules (does method bound check only)
-    public final RubyBoolean respond_to_p(IRubyObject mname, IRubyObject includePrivate) {
-        String name = mname.asJavaString();
-        return getRuntime().newBoolean(getMetaClass().isMethodBound(name, !includePrivate.isTrue()));
-    }
-
     final RubyBoolean respond_to_p(ThreadContext context, IRubyObject methodName, final boolean includePrivate) {
         RubySymbol name = checkID(context, methodName);
 
         if (getMetaClass().respondsToMethod(name.idString(), !includePrivate, context.getCurrentStaticScope())) return context.tru;
 
-        Ruby runtime = context.runtime;
-        IRubyObject result = sites(context).respond_to_missing.call(context, this, this, name, runtime.newBoolean(includePrivate));
-        return context.runtime.newBoolean(result.isTrue());
+        IRubyObject respondToMissing = basicObjectRespondToMissing(context, getMetaClass(), this, name, includePrivate);
+        if (respondToMissing == UNDEF) return context.fals;
+        return asBoolean(context, respondToMissing.isTrue());
+    }
+
+    // MRI: basic_obj_respond_to_missing, sort of
+    private IRubyObject basicObjectRespondToMissing(ThreadContext context, RubyClass klass, IRubyObject obj,
+                                 IRubyObject mid, boolean includePrivate)
+    {
+        CacheEntry entry = sites(context).respond_to_missing.retrieveCache(this);
+
+        if (!entry.method.isUndefined()) {
+            return entry.method.call(context, this, klass, "respond_to_missing?", mid, asBoolean(context, includePrivate));
+        }
+
+        return UNDEF;
     }
 
     /**
@@ -2434,11 +2458,6 @@ final IRubyObject methodsImpl(ThreadContext context, final boolean all) {
         return methods;
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public final IRubyObject methods(ThreadContext context, IRubyObject[] args, boolean useSymbols) {
-        return methodsImpl(context, args.length == 1 ? args[0].isTrue() : true);
-    }
-
     /* rb_obj_public_methods
      *
      *  call-seq:
@@ -3038,23 +3057,6 @@ protected static int nonFixnumHashCode(ThreadContext context, IRubyObject hashVa
         return ((RubyInteger) TypeConverter.convertToType(hashValue, integerClass(context), "to_int")).asInt(context);
     }
 
-    /**
-     * Checks if the name parameter represents a legal instance variable name, and otherwise throws a Ruby NameError
-     * @param name of instance variable
-     * @return name it is valid
-     */
-    @Deprecated(since = "9.2.0.0")
-    protected String validateInstanceVariable(String name) {
-        if (IdUtil.isValidInstanceVariableName(name)) return name;
-
-        throw getRuntime().newNameError("'%1$s' is not allowable as an instance variable name", this, name);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    protected String validateInstanceVariable(IRubyObject name, String _unused_) {
-        return validateInstanceVariable(name);
-    }
-
     protected String validateInstanceVariable(IRubyObject name) {
         return RubySymbol.retrieveIDSymbol(name, (sym, newSym) -> {
             if (!sym.validInstanceVariableName()) {
@@ -3129,145 +3131,6 @@ private static BasicObjectSites sites(ThreadContext context) {
 
     // Deprecated methods below this line
 
-    @Deprecated(since = "1.7.0")
-    protected RubyBasicObject(Ruby runtime, RubyClass metaClass, boolean useObjectSpace, boolean canBeTainted) {
-        this(runtime, metaClass, useObjectSpace);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public IRubyObject callSuper(ThreadContext context, IRubyObject[] args, Block block) {
-        return Helpers.invokeSuper(context, this, args, block);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public final IRubyObject callMethod(ThreadContext context, int methodIndex, String name) {
-        return Helpers.invoke(context, this, name);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public final IRubyObject callMethod(ThreadContext context, int methodIndex, String name, IRubyObject arg) {
-        return Helpers.invoke(context, this, name, arg, Block.NULL_BLOCK);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public RubyInteger convertToInteger(int methodIndex, String convertMethod) {
-        return convertToInteger(convertMethod);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public int getVariableCount() {
-        return getMetaClass().getVariableTableSize();
-    }
-
-    @Deprecated(since = "1.7.0")
-    protected boolean variableTableFastContains(String internedName) {
-        return variableTableContains(internedName);
-    }
-
-    @Deprecated(since = "1.7.0")
-    protected Object variableTableFastFetch(String internedName) {
-        return variableTableFetch(internedName);
-    }
-
-    @Deprecated(since = "1.7.0")
-    protected Object variableTableFastStore(String internedName, Object value) {
-        return variableTableStore(internedName, value);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public boolean fastHasInternalVariable(String internedName) {
-        return hasInternalVariable(internedName);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public Object fastGetInternalVariable(String internedName) {
-        return getInternalVariable(internedName);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public void fastSetInternalVariable(String internedName, Object value) {
-        setInternalVariable(internedName, value);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public void syncVariables(List<Variable<Object>> variables) {
-        variableTableSync(variables);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public boolean fastHasInstanceVariable(String internedName) {
-        return hasInstanceVariable(internedName);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public IRubyObject fastGetInstanceVariable(String internedName) {
-        return getInstanceVariable(internedName);
-    }
-
-    @Deprecated(since = "1.7.0")
-    @Override
-    public IRubyObject fastSetInstanceVariable(String internedName, IRubyObject value) {
-        return setInstanceVariable(internedName, value);
-    }
-
-    @Override
-    @Deprecated(since = "9.0.0.0")
-    public boolean isUntrusted() {
-        return false;
-    }
-
-    @Override
-    @Deprecated(since = "9.0.0.0")
-    public void setUntrusted(boolean untrusted) {
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public RubyBoolean untrusted_p(ThreadContext context) {
-        return context.fals;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public IRubyObject untrust(ThreadContext context) {
-        return this;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public IRubyObject trust(ThreadContext context) {
-        return this;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public final Object getNativeHandle() {
-        return null;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public final void setNativeHandle(Object value) {
-    }
-
-    @Override
-    @Deprecated(since = "9.2.0.0")
-    public synchronized Object dataGetStructChecked() {
-        TypeConverter.checkData(this);
-        return getInternalVariable("__wrap_struct__");
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public RubyArray to_a() {
-        return to_a(getRuntime().getCurrentContext());
-    }
-
     @Deprecated(since = "9.4.0.0")
     public RubyBoolean tainted_p(ThreadContext context) {
         return context.fals;
@@ -3319,36 +3182,6 @@ final RubyBasicObject infectBy(int tuFlags) {
         return this;
     }
 
-    @Deprecated(since = "9.1.3.0")
-    public static final int FL_USHIFT = 4;
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER0_F = (1<<(FL_USHIFT+0));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER1_F = (1<<(FL_USHIFT+1));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER2_F = (1<<(FL_USHIFT+2));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER3_F = (1<<(FL_USHIFT+3));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER4_F = (1<<(FL_USHIFT+4));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER5_F = (1<<(FL_USHIFT+5));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER6_F = (1<<(FL_USHIFT+6));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER7_F = (1<<(FL_USHIFT+7));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER8_F = (1<<(FL_USHIFT+8));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USER9_F = (1<<(FL_USHIFT+9));
-    @Deprecated(since = "9.1.3.0")
-    public static final int USERA_F = (1<<(FL_USHIFT+10));
-    @Deprecated(since = "9.1.3.0")
-    public static final int REFINED_MODULE_F = USER9_F;
-    @Deprecated(since = "9.1.3.0")
-    public static final int IS_OVERLAID_F = USERA_F;
-    @Deprecated(since = "9.1.3.0")
-    public static final int COMPARE_BY_IDENTITY_F = USER8_F;
     @Deprecated(since = "9.4.0.0")
     public static final int TAINTED_F = 0;
     @Deprecated(since = "10.0.0.0")
diff --git a/core/src/main/java/org/jruby/RubyBignum.java b/core/src/main/java/org/jruby/RubyBignum.java
index 62526f4ed5f..1c30909bdd1 100644
--- a/core/src/main/java/org/jruby/RubyBignum.java
+++ b/core/src/main/java/org/jruby/RubyBignum.java
@@ -905,6 +905,30 @@ protected IRubyObject op_aref_subclass(ThreadContext context, IRubyObject other)
         return asFixnum(context, value.testBit((int)position) ? 1: 0);
     }
 
+    // MRI: rb_big_aref2
+    @Override
+    public IRubyObject op_aref(ThreadContext context, IRubyObject index, IRubyObject length) {
+        long shift = index.convertToInteger().asLong(context);
+        if (shift >= Integer.MAX_VALUE) {
+            throw rangeError(context, "offset too big");
+        }
+        if (shift <= Integer.MIN_VALUE) {
+            return RubyFixnum.zero(context.runtime);
+        }
+        BigInteger shifted = value.shiftRight((int) shift);
+        long bitLength = length.convertToInteger().asLong(context);
+        long len = bitLength;
+        if (value.signum() > 0) {
+            len = Math.min(bitLength, shifted.bitLength());
+        }
+        if (len >= Integer.MAX_VALUE) {
+            throw rangeError(context, "length too big");
+        }
+        BigInteger mask = BigInteger.ONE.shiftLeft((int) bitLength).subtract(BigInteger.ONE);
+        BigInteger slice = shifted.and(mask);
+        return bignorm(context.runtime, slice);
+    }
+
     private enum BIGNUM_OP_T {
         BIGNUM_OP_GT,
         BIGNUM_OP_GE,
@@ -921,7 +945,7 @@ private IRubyObject big_op(ThreadContext context, IRubyObject other, BIGNUM_OP_T
         } else if (other instanceof RubyFloat) {
             rel = float_cmp(context, (RubyFloat)other);
         } else {
-            CallSite site;
+            CallSite site = sites(context).op_gt;
             switch (op) {
                 case BIGNUM_OP_GT:
                     site = sites(context).op_gt;
@@ -936,7 +960,7 @@ private IRubyObject big_op(ThreadContext context, IRubyObject other, BIGNUM_OP_T
                     site = sites(context).op_le;
                     break;
             }
-            return coerceRelOp(context, sites(context).op_gt, other);
+            return coerceRelOp(context, site, other);
         }
 
         if (rel.isNil()) return context.fals;
@@ -1019,6 +1043,20 @@ private IRubyObject float_cmp(ThreadContext context, RubyFloat y) {
         return RubyFixnum.minus_one(runtime);
     }
 
+    // mri : rb_integer_float_eq
+    private boolean float_eq(ThreadContext context, RubyFloat y) {
+        double yd = y.value;
+
+        if (Double.isNaN(yd) || Double.isInfinite(yd)) return false;
+
+        // if yd has a fractional part, it can't equal an integer
+        if (Math.floor(yd) != yd) return false;
+
+        // compare as integers to avoid precision loss
+        IRubyObject rel = op_cmp(context, newBignorm(context.runtime, yd));
+        return rel instanceof RubyFixnum fix && fix.getLongValue() == 0;
+    }
+
     @Override
     public final int compareTo(IRubyObject other) {
         if (other instanceof RubyBignum bignum) return value.compareTo(bignum.value);
@@ -1047,9 +1085,7 @@ public IRubyObject op_cmp(ThreadContext context, IRubyObject other) {
         } else if (other instanceof RubyBignum big) {
             otherValue = big.value;
         } else if (other instanceof RubyFloat flt) {
-            return flt.isInfinite() ?
-                    asFixnum(context, flt.value > 0.0 ? -1 : 1) :
-                    dbl_cmp(context.runtime, big2dbl(this), flt.value);
+            return float_cmp(context, flt);
         } else {
             return coerceCmp(context, sites(context).op_cmp, other);
         }
@@ -1069,22 +1105,14 @@ public IRubyObject op_equal(ThreadContext context, IRubyObject other) {
         } else if (other instanceof RubyBignum bignum) {
             otherValue = bignum.value;
         } else if (other instanceof RubyFloat flote) {
-            double a = flote.value;
-            if (Double.isNaN(a) || Double.isInfinite(a)) return context.fals;
-            return asBoolean(context, a == big2dbl(this));
+            return asBoolean(context, float_eq(context, flote));
         } else {
             return other.op_eqq(context, this);
         }
         return asBoolean(context, value.compareTo(otherValue) == 0);
     }
 
-    /** rb_big_eql
-     *
-     */
-    @Override
-    public IRubyObject eql_p(ThreadContext context, IRubyObject other) {
-        return op_equal(context, other);  // '==' and '===' are the same, but they differ from 'eql?'.
-    }
+    // eql_p inherited from RubyNumeric: type-strict check (getClass) + equalInternal
 
     // MRI: rb_big_hash
     public RubyFixnum hash(ThreadContext context) {
@@ -1109,11 +1137,6 @@ public IRubyObject to_f(ThreadContext context) {
         return asFloat(context, asDouble(context));
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject abs() {
-        return abs(getCurrentContext());
-    }
-
     /** rb_big_abs
      *
      */
@@ -1332,7 +1355,7 @@ public RubyRational convertToRational(ThreadContext context) {
     // MRI: rb_int_s_isqrt, Fixnum portion
     @Override
     public IRubyObject sqrt(ThreadContext context) {
-        if (isNegativeNumber(context)) throw context.runtime.newMathDomainError("Numerical argument is out of domain - isqrt");
+        if (isNegativeNumber(context)) throw context.runtime.newMathDomainError("isqrt");
 
         return bignorm(context.runtime, floorSqrt(value));
     }
diff --git a/core/src/main/java/org/jruby/RubyBinding.java b/core/src/main/java/org/jruby/RubyBinding.java
index e51f821590f..88625c70c9d 100644
--- a/core/src/main/java/org/jruby/RubyBinding.java
+++ b/core/src/main/java/org/jruby/RubyBinding.java
@@ -36,7 +36,9 @@
 
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
 import org.jruby.ext.ripper.RubyLexer;
+import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Binding;
 import org.jruby.runtime.Block;
@@ -87,16 +89,6 @@ public static RubyBinding newBinding(Ruby runtime, Binding binding) {
         return new RubyBinding(runtime, runtime.getBinding(), binding);
     }
 
-    @Deprecated(since = "1.2")
-    public static RubyBinding newBinding(Ruby runtime) {
-        return newBinding(runtime, runtime.getCurrentContext().currentBinding());
-    }
-
-    @Deprecated(since = "1.2")
-    public static RubyBinding newBinding(Ruby runtime, IRubyObject self) {
-       return newBinding(runtime, runtime.getCurrentContext().currentBinding(self));
-    }
-    
     @JRubyMethod(name = "initialize", visibility = Visibility.PRIVATE)
     @Override
     public IRubyObject initialize(ThreadContext context) {
@@ -142,16 +134,17 @@ public IRubyObject eval(ThreadContext context, IRubyObject[] args) {
     @JRubyMethod(name = "local_variable_defined?")
     public IRubyObject local_variable_defined_p(ThreadContext context, IRubyObject symbol) {
         String id = checkLocalId(context, symbol);
-        return asBoolean(context, binding.getEvalScope(context.runtime).getStaticScope().isDefined(id) != -1);
+        return asBoolean(context, binding.getEvalScope(context.runtime).getStaticScope().isDefinedOrImplicit(id) >= 0);
     }
 
     @JRubyMethod
     public IRubyObject local_variable_get(ThreadContext context, IRubyObject symbol) {
         String id = checkLocalId(context, symbol);
         DynamicScope evalScope = binding.getEvalScope(context.runtime);
-        int slot = evalScope.getStaticScope().isDefined(id);
+        StaticScope staticScope = evalScope.getStaticScope();
+        int slot = staticScope.isDefinedOrImplicit(id);
 
-        if (slot == -1) throw nameError(context, str(context.runtime, "local variable '", symbol, "' not defined for " + inspect(context)), symbol);
+        if (slot < 0) throw undefinedVariableError(context, symbol);
 
         return evalScope.getValueOrNil(slot & 0xffff, slot >> 16, context.nil);
     }
@@ -160,7 +153,11 @@ public IRubyObject local_variable_get(ThreadContext context, IRubyObject symbol)
     public IRubyObject local_variable_set(ThreadContext context, IRubyObject symbol, IRubyObject value) {
         String id = checkLocalId(context, symbol);
         DynamicScope evalScope = binding.getEvalScope(context.runtime);
-        int slot = evalScope.getStaticScope().isDefined(id);
+        StaticScope staticScope = evalScope.getStaticScope();
+        int slot = staticScope.isDefinedOrImplicit(id);
+
+        // for the implicit "it" variable
+        if (slot == StaticScope.IMPLICIT) throw undefinedVariableError(context, symbol);
 
         if (slot == -1) { // Yay! New variable associated with this binding
             slot = evalScope.getStaticScope().addVariable(id.intern());
@@ -170,21 +167,73 @@ public IRubyObject local_variable_set(ThreadContext context, IRubyObject symbol,
         return evalScope.setValue(slot & 0xffff, value, slot >> 16);
     }
 
+    @JRubyMethod(name = "implicit_parameter_defined?")
+    public IRubyObject implicit_parameter_defined_p(ThreadContext context, IRubyObject symbol) {
+        String id = checkImplicitId(context, symbol);
+        return asBoolean(context, binding.getDynamicScope().getStaticScope().isDefinedImplicitParameter(id) != -1);
+    }
+
+    @JRubyMethod
+    public IRubyObject implicit_parameter_get(ThreadContext context, IRubyObject symbol) {
+        String id = checkImplicitId(context, symbol);
+        DynamicScope dynamicScope = binding.getDynamicScope();
+        StaticScope staticScope = dynamicScope.getStaticScope();
+        int slot = staticScope.isDefinedImplicitParameter(id);
+
+        if (slot != StaticScope.IMPLICIT) throw undefinedImplicitVariableError(context, symbol);
+
+        slot = staticScope.isDefined(id);
+
+        return dynamicScope.getValueOrNil(slot & 0xffff, slot >> 16, context.nil);
+    }
+
+    private static boolean isNumberedVariable(String id) {
+        return id.length() == 2 && id.charAt(0) == '_' && Character.isDigit(id.charAt(1));
+    }
+
+    private RaiseException numberedParameterError(ThreadContext context, IRubyObject symbol) {
+        return nameError(context, str(context.runtime, "numbered parameter '", symbol, "' is not a local variable"), symbol);
+    }
+
+    private RaiseException undefinedVariableError(ThreadContext context, IRubyObject symbol) {
+        return nameError(context, str(context.runtime, "local variable '", symbol, "' not defined for " + inspect(context)), symbol);
+    }
+
+    private RaiseException undefinedImplicitVariableError(ThreadContext context, IRubyObject symbol) {
+        return nameError(context, str(context.runtime, "'", symbol, "' is not an implicit parameter"), symbol);
+    }
+
     // MRI: check_local_id
     private String checkLocalId(ThreadContext context, IRubyObject obj) {
         String id = RubySymbol.idStringFromObject(context, obj);
 
+        if (isNumberedVariable(id)) throw numberedParameterError(context, obj);
+
         if (!RubyLexer.isIdentifierChar(id.charAt(0))) {
             throw nameError(context, str(context.runtime, "wrong local variable name '", obj, "' for ", this), id);
         }
 
         return id;
     }
+
+    private String checkImplicitId(ThreadContext context, IRubyObject obj) {
+        String id = RubySymbol.idStringFromObject(context, obj);
+
+        if (!isNumberedVariable(id) && !id.equals("it")) throw undefinedImplicitVariableError(context, obj);
+
+        return id;
+    }
+
     @JRubyMethod
     public IRubyObject local_variables(ThreadContext context) {
         return binding.getEvalScope(context.runtime).getStaticScope().getLocalVariables(context);
     }
 
+    @JRubyMethod
+    public IRubyObject implicit_parameters(ThreadContext context) {
+        return binding.getEvalScope(context.runtime).getStaticScope().getEnclosingScope().getImplicitParameters(context);
+    }
+
     @JRubyMethod(name = "receiver")
     public IRubyObject receiver(ThreadContext context) {
         return binding.getSelf();
diff --git a/core/src/main/java/org/jruby/RubyClass.java b/core/src/main/java/org/jruby/RubyClass.java
index 7cbed54f295..97a2abd2738 100644
--- a/core/src/main/java/org/jruby/RubyClass.java
+++ b/core/src/main/java/org/jruby/RubyClass.java
@@ -718,6 +718,8 @@ public IRubyObject invokePublic(ThreadContext context, IRubyObject self, String
     /**
      * Safely attempt to invoke the given method name on self, using respond_to? and method_missing as appropriate.
      *
+     * Return null if the method does not exist.
+     *
      * MRI: rb_check_funcall
      */
     public final IRubyObject finvokeChecked(ThreadContext context, IRubyObject self, String name) {
@@ -727,6 +729,8 @@ public final IRubyObject finvokeChecked(ThreadContext context, IRubyObject self,
     /**
      * Safely attempt to invoke the given method name on self, using respond_to? and method_missing as appropriate.
      *
+     * Return null if the method does not exist.
+     *
      * MRI: rb_check_funcall
      */
     public final IRubyObject finvokeChecked(ThreadContext context, IRubyObject self, JavaSites.CheckedSites sites) {
@@ -736,6 +740,8 @@ public final IRubyObject finvokeChecked(ThreadContext context, IRubyObject self,
     /**
      * Safely attempt to invoke the given method name on self, using respond_to? and method_missing as appropriate.
      *
+     * Return null if the method does not exist.
+     *
      * MRI: rb_check_funcall
      */
     public final IRubyObject finvokeChecked(ThreadContext context, IRubyObject self, String name, IRubyObject... args) {
@@ -745,6 +751,8 @@ public final IRubyObject finvokeChecked(ThreadContext context, IRubyObject self,
     /**
      * Safely attempt to invoke the given method name on self, using respond_to? and method_missing as appropriate.
      *
+     * Return null if the method does not exist.
+     *
      * MRI: rb_check_funcall
      */
     public final IRubyObject finvokeChecked(ThreadContext context, IRubyObject self, JavaSites.CheckedSites sites, IRubyObject... args) {
@@ -1010,14 +1018,14 @@ public IRubyObject invokeInherited(ThreadContext context, IRubyObject self, IRub
     /** rb_class_new_instance
     *
     */
-    @JRubyMethod(name = "new", keywords = true)
+    @JRubyMethod(name = "new", keywords = true, omit = true)
     public IRubyObject newInstance(ThreadContext context, Block block) {
         IRubyObject obj = allocate(context);
         getBaseCallSites()[CS_IDX_INITIALIZE].call(context, obj, obj, block);
         return obj;
     }
 
-    @JRubyMethod(name = "new", keywords = true)
+    @JRubyMethod(name = "new", keywords = true, omit = true)
     public IRubyObject newInstance(ThreadContext context, IRubyObject arg0, Block block) {
         IRubyObject obj = allocate(context);
         getBaseCallSites()[CS_IDX_INITIALIZE].call(context, obj, obj, arg0, block);
@@ -1030,21 +1038,21 @@ public IRubyObject newInstance(ThreadContext context, IRubyObject arg0) {
         return obj;
     }
 
-    @JRubyMethod(name = "new", keywords = true)
+    @JRubyMethod(name = "new", keywords = true, omit = true)
     public IRubyObject newInstance(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
         IRubyObject obj = allocate(context);
         getBaseCallSites()[CS_IDX_INITIALIZE].call(context, obj, obj, arg0, arg1, block);
         return obj;
     }
 
-    @JRubyMethod(name = "new", keywords = true)
+    @JRubyMethod(name = "new", keywords = true, omit = true)
     public IRubyObject newInstance(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) {
         IRubyObject obj = allocate(context);
         getBaseCallSites()[CS_IDX_INITIALIZE].call(context, obj, obj, arg0, arg1, arg2, block);
         return obj;
     }
 
-    @JRubyMethod(name = "new", rest = true, keywords = true)
+    @JRubyMethod(name = "new", rest = true, keywords = true, omit = true)
     public IRubyObject newInstance(ThreadContext context, IRubyObject[] args, Block block) {
         IRubyObject obj = allocate(context);
         getBaseCallSites()[CS_IDX_INITIALIZE].call(context, obj, obj, args, block);
@@ -1091,16 +1099,11 @@ private void copyVariableTableManagerForData(ThreadContext context, RubyClass su
         }
     }
 
-    /** rb_class_init_copy
-     *
+    /**
+     * Class-specific logic for {@link RubyModule#initializeCopiedModule(ThreadContext, IRubyObject)}
      */
-    @JRubyMethod(name = "initialize_copy", visibility = PRIVATE)
-    public IRubyObject initialize_copy(ThreadContext context, IRubyObject original) {
-        checkNotInitialized(context);
-        if (original == basicObjectClass(context)) throw typeError(context, "can't copy the root class");
-        if (original instanceof MetaClass) throw typeError(context, "can't copy singleton class");
-
-        super.initialize_copy(context, original);
+    public IRubyObject initializeCopiedModule(ThreadContext context, IRubyObject original) {
+        super.initializeCopiedModule(context, original);
         RubyClass originalClazz = (RubyClass) original;
         allocator = originalClazz.allocator;
 
@@ -1144,7 +1147,7 @@ private SubclassArray newConcreteSubclassesArray(ThreadContext context) {
         return new SubclassArray(context.runtime, this.concreteSubclassesEstimate);
     }
 
-    private static class SubclassArray extends RubyArray<RubyClass> implements BiConsumer<ThreadContext, RubyClass> {
+    private static class SubclassArray extends RubyArrayNative<RubyClass> implements BiConsumer<ThreadContext, RubyClass> {
         public SubclassArray(Ruby runtime, int length) {
             super(runtime, length);
         }
@@ -3077,11 +3080,6 @@ public IRubyObject smartLoadOldUser(IRubyObject data) {
 
     // DEPRECATED METHODS
 
-    @Deprecated(since = "9.1.5.0")
-    public IRubyObject invoke(ThreadContext context, IRubyObject self, int methodIndex, String name, IRubyObject[] args, CallType callType, Block block) {
-        return invoke(context, self, name, args, callType, block);
-    }
-
     /**
      * This method is deprecated because it depends on having a Ruby frame pushed for checking method visibility,
      * and there's no way to enforce that. Most users of this method probably don't need to check visibility.
@@ -3309,127 +3307,6 @@ public VariableAccessorField getObjectGroupAccessorField() {
         return variableTableManager.getObjectGroupAccessorField();
     }
 
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  Block block) {
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, block);
-        }
-        return method.call(context, self, entry.sourceModule, name, block);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  IRubyObject[] args, Block block) {
-        assert args != null;
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, args, block);
-        }
-        return method.call(context, self, entry.sourceModule, name, args, block);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  IRubyObject arg, Block block) {
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, arg, block);
-        }
-        return method.call(context, self, entry.sourceModule, name, arg, block);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  IRubyObject arg0, IRubyObject arg1, Block block) { // NOT USED?
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, arg0, arg1, block);
-        }
-        return method.call(context, self, entry.sourceModule, name, arg0, arg1, block);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) {
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, arg0, arg1, arg2, block);
-        }
-        return method.call(context, self, entry.sourceModule, name, arg0, arg1, arg2, block);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name) {
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, Block.NULL_BLOCK);
-        }
-        return method.call(context, self, entry.sourceModule, name);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  IRubyObject[] args) {
-        assert args != null;
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, args, Block.NULL_BLOCK);
-        }
-        return method.call(context, self, entry.sourceModule, name, args);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  IRubyObject arg) {
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, arg, Block.NULL_BLOCK);
-        }
-        return method.call(context, self, entry.sourceModule, name, arg);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  IRubyObject arg0, IRubyObject arg1) {
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, arg0, arg1, Block.NULL_BLOCK);
-        }
-        return method.call(context, self, entry.sourceModule, name, arg0, arg1);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public IRubyObject invokeFrom(ThreadContext context, CallType callType, IRubyObject caller, IRubyObject self, String name,
-                                  IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
-        CacheEntry entry = searchWithCache(name);
-        DynamicMethod method = entry.method;
-
-        if (shouldCallMethodMissing(method, name, caller, callType)) {
-            return Helpers.callMethodMissing(context, self, this, method.getVisibility(), name, callType, arg0, arg1, arg2, Block.NULL_BLOCK);
-        }
-        return method.call(context, self, entry.sourceModule, name, arg0, arg1, arg2);
-    }
-
     // OBJECT STATE
 
     protected final Ruby runtime;
diff --git a/core/src/main/java/org/jruby/RubyClassPathVariable.java b/core/src/main/java/org/jruby/RubyClassPathVariable.java
index 7ffe9b4acec..391d1535caf 100644
--- a/core/src/main/java/org/jruby/RubyClassPathVariable.java
+++ b/core/src/main/java/org/jruby/RubyClassPathVariable.java
@@ -54,11 +54,6 @@ private RubyClassPathVariable(ThreadContext context, RubyClass Object) {
         super(context.runtime, Object);
     }
     
-    @Deprecated(since = "1.7.0")
-    public IRubyObject append(IRubyObject obj) {
-        return append(obj.getRuntime().getCurrentContext(), obj);
-    }
-
     @JRubyMethod(name = {"append", "<<"})
     public IRubyObject append(ThreadContext context, IRubyObject obj) {
         IRubyObject[] paths;
diff --git a/core/src/main/java/org/jruby/RubyComplex.java b/core/src/main/java/org/jruby/RubyComplex.java
index 7454c142bc6..317420aab3c 100644
--- a/core/src/main/java/org/jruby/RubyComplex.java
+++ b/core/src/main/java/org/jruby/RubyComplex.java
@@ -193,11 +193,6 @@ static RubyComplex newComplexBang(ThreadContext context, RubyClass clazz, RubyNu
         return newComplexBang(context, clazz, x, RubyFixnum.zero(context.runtime));
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static RubyComplex newComplexBang(ThreadContext context, RubyClass clazz, IRubyObject x) {
-        return newComplexBang(context, clazz, (RubyNumeric) x);
-    }
-
     private IRubyObject real;
     private IRubyObject image;
     
@@ -254,19 +249,6 @@ private static IRubyObject m_sqrt(ThreadContext context, IRubyObject x) {
         }
     }
 
-    /** nucomp_s_new_bang
-     *
-     */
-    @Deprecated(since = "1.1.4")
-    public static IRubyObject newInstanceBang(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        switch (args.length) {
-            case 1: return newInstanceBang(context, recv, args[0]);
-            case 2: return newInstanceBang(context, recv, args[0], args[1]);
-        }
-        Arity.raiseArgumentError(context, args.length, 1, 2);
-        return null;
-    }
-
     @JRubyMethod(name = "new!", meta = true, visibility = Visibility.PRIVATE)
     public static IRubyObject newInstanceBang(ThreadContext context, IRubyObject recv, IRubyObject real) {
         if (!(real instanceof RubyNumeric)) real = f_to_i(context, real);
@@ -339,24 +321,6 @@ private static RubyNumeric canonicalizeInternal(ThreadContext context, RubyClass
         }
     }
     
-    /** nucomp_s_new
-     * 
-     */
-    @Deprecated(since = "1.1.4")
-    public static IRubyObject newInstance(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        switch (args.length) {
-            case 1: return newInstance(context, recv, args[0]);
-            case 2: return newInstance(context, recv, args[0], args[1]);
-        }
-        Arity.raiseArgumentError(context, args.length, 1, 2);
-        return null;
-    }
-
-    @Deprecated(since = "9.2.0.0") // @JRubyMethod(name = "new", meta = true, visibility = Visibility.PRIVATE)
-    public static IRubyObject newInstanceNew(ThreadContext context, IRubyObject recv, IRubyObject real) {
-        return newInstance(context, recv, real);
-    }
-
     @JRubyMethod(name = {"rect", "rectangular"}, meta = true)
     public static IRubyObject newInstance(ThreadContext context, IRubyObject recv, IRubyObject real) {
         return newInstance(context, recv, real, true);
@@ -367,11 +331,6 @@ public static IRubyObject newInstance(ThreadContext context, IRubyObject recv, I
         return canonicalizeInternal(context, (RubyClass) recv, real, RubyFixnum.zero(context.runtime));
     }
 
-    @Deprecated(since = "9.2.0.0") // @JRubyMethod(name = "new", meta = true, visibility = Visibility.PRIVATE)
-    public static IRubyObject newInstanceNew(ThreadContext context, IRubyObject recv, IRubyObject real, IRubyObject image) {
-        return newInstance(context, recv, real, image);
-    }
-
     @JRubyMethod(name = {"rect", "rectangular"}, meta = true)
     public static IRubyObject newInstance(ThreadContext context, IRubyObject recv, IRubyObject real, IRubyObject image) {
         return newInstance(context, recv, real, image, true);
@@ -427,16 +386,6 @@ public static IRubyObject newComplexConvert(ThreadContext context, IRubyObject x
     }
 
 
-    @Deprecated(since = "1.1.4")
-    public static IRubyObject convert(ThreadContext context, IRubyObject clazz, IRubyObject[]args) {
-        switch (args.length) {
-            case 1: return convert(context, clazz, args[0]);
-            case 2: return convert(context, clazz, args[0], args[1]);
-        }
-        Arity.raiseArgumentError(context, args.length, 1, 2);
-        return null;
-    }
-
     /** nucomp_s_convert
      * 
      */
diff --git a/core/src/main/java/org/jruby/RubyContinuation.java b/core/src/main/java/org/jruby/RubyContinuation.java
deleted file mode 100644
index 5e4531cbec7..00000000000
--- a/core/src/main/java/org/jruby/RubyContinuation.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: EPL 2.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2007 Ola Bini <ola@ologix.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby;
-
-import org.jruby.anno.JRubyClass;
-import org.jruby.exceptions.CatchThrow;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.ClassIndex;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-import static org.jruby.api.Create.newString;
-import static org.jruby.api.Define.defineClass;
-
-/**
- * Minimal RubyContinuation class to support third-party users.
- */
-@JRubyClass(name="Continuation")
-@Deprecated(since = "9.2.6.0")
-public class RubyContinuation extends RubyObject {
-    @Deprecated(since = "9.2.6.0")
-    public static class Continuation extends CatchThrow {
-        public Continuation() {
-            super();
-        }
-
-        public Continuation(IRubyObject tag) {
-            super(tag);
-        }
-    }
-
-    private final Continuation continuation;
-    private boolean disabled;
-    
-    public static RubyClass createContinuation(ThreadContext context, RubyClass objectClass) {
-        return defineClass(context, "Continuation", objectClass, objectClass.getAllocator()).
-                reifiedClass(RubyContinuation.class).
-                classIndex(ClassIndex.CONTINUATION).
-                tap(c -> c.singletonClass(context).undefMethods(context, "new"));
-    }
-
-    @Deprecated(since = "9.2.6.0")
-    public RubyContinuation(Ruby runtime) {
-        super(runtime, runtime.getContinuation());
-        this.continuation = new Continuation();
-    }
-
-    /**
-     * A RubyContinuation used for catch/throw, which have a tag associated
-     *
-     * @param runtime Current JRuby runtime
-     * @param tag The tag to use
-     */
-    @Deprecated(since = "9.2.6.0")
-    public RubyContinuation(Ruby runtime, IRubyObject tag) {
-        super(runtime, runtime.getContinuation());
-        this.continuation = new Continuation(tag);
-    }
-
-    @Deprecated(since = "9.2.6.0")
-    public Continuation getContinuation() {
-        return continuation;
-    }
-
-    @Deprecated(since = "9.2.6.0")
-    public IRubyObject call(ThreadContext context, IRubyObject[] args) {
-        if (disabled) {
-            RubyKernel.raise(context, context.runtime.getThreadError(),
-                    new IRubyObject[]{newString(context, "continuations can not be called from outside their scope")},
-                    Block.NULL_BLOCK);
-        }
-        continuation.args = args;
-        throw continuation;
-    }
-
-    @Deprecated(since = "9.2.6.0")
-    public IRubyObject enter(ThreadContext context, IRubyObject yielded, Block block) {
-        try {
-            return block.yield(context, yielded);
-        } catch (Continuation c) {
-            if (c == continuation) {
-                if (continuation.args.length == 0) {
-                    return context.nil;
-                } else if (continuation.args.length == 1) {
-                    return continuation.args[0];
-                } else {
-                    return RubyArray.newArrayMayCopy(context.runtime, continuation.args);
-                }
-            } else {
-                throw c;
-            }
-        } finally {
-            disabled = true;
-        }
-    }
-}// RubyContinuation
diff --git a/core/src/main/java/org/jruby/RubyData.java b/core/src/main/java/org/jruby/RubyData.java
index f4314b0506e..82df60c55bb 100644
--- a/core/src/main/java/org/jruby/RubyData.java
+++ b/core/src/main/java/org/jruby/RubyData.java
@@ -40,11 +40,7 @@
 import static org.jruby.runtime.Arity.checkArgumentCount;
 import static org.jruby.runtime.Helpers.invokedynamic;
 import static org.jruby.runtime.ThreadContext.CALL_KEYWORD;
-import static org.jruby.runtime.ThreadContext.CALL_KEYWORD_EMPTY;
-import static org.jruby.runtime.ThreadContext.clearCallInfo;
-import static org.jruby.runtime.ThreadContext.hasKeywords;
 import static org.jruby.runtime.ThreadContext.hasNonemptyKeywords;
-import static org.jruby.runtime.ThreadContext.resetCallInfo;
 import static org.jruby.runtime.invokedynamic.MethodNames.HASH;
 import static org.jruby.util.RubyStringBuilder.str;
 
@@ -88,18 +84,20 @@ public static RubyClass define(ThreadContext context, IRubyObject self, IRubyObj
 
     @JRubyMethod(keywords = true, rest = true)
     public static void initialize(ThreadContext context, IRubyObject self, IRubyObject[] args) {
+        ThreadContext.resetCallInfo(context); // we don't directly use callInfo here
+
         RubyBasicObject selfObj = (RubyBasicObject) self;
+
         selfObj.checkFrozen();
         RubyArray<RubySymbol> members = getStructMembers(self);
         int numMembers = members.size();
 
-        // we don't directly use callInfo here
-        ThreadContext.clearCallInfo(context);
-
         if (args.length == 0) {
             if (numMembers > 0) {
                 throw keywordError(context, "missing", members);
             }
+
+            selfObj.setFrozen(true);
             return;
         }
 
@@ -123,7 +121,7 @@ public static void initialize(ThreadContext context, IRubyObject self, IRubyObje
             String keyString = toSymbol(context, k).idString();
             VariableAccessor variableAccessor = variableAccessors.get(keyString);
             if (variableAccessor != null) {
-                selfObj.setInternalVariable(keyString, v);
+                variableAccessor.set(self, v);
             } else {
                 RubyArray unknownKeywords = unknownKeywordsPtr[0];
                 if (unknownKeywords == null) {
@@ -243,7 +241,7 @@ public static RubyHash deconstruct_keys(ThreadContext context, IRubyObject self,
     @JRubyMethod(keywords = true, optional = 1, checkArity = false)
     public static IRubyObject with(ThreadContext context, IRubyObject self, IRubyObject[] args) {
         IRubyObject kwargs = IRRuntimeHelpers.receiveKeywords(context, args, false, true, false);
-        if (kwargs == UndefinedValue.UNDEFINED || kwargs.isNil()) {
+        if (!(kwargs instanceof RubyHash)) {
             checkArgumentCount(context, args.length, 0, 0);
             return self;
         }
@@ -253,7 +251,7 @@ public static IRubyObject with(ThreadContext context, IRubyObject self, IRubyObj
         RubyHash kwargsHash = (RubyHash) kwargs;
         RubyHash h = to_h(context, self, Block.NULL_BLOCK);
         h.addAll(context, kwargsHash);
-        setCallInfo(context, CALL_KEYWORD);
+        context.callInfo = CALL_KEYWORD;
         return DataMethods.rbNew(context, self.getMetaClass(), h);
     }
 
@@ -281,7 +279,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyOb
 
             IRubyObject dataObject = klass.getAllocator().allocate(context.runtime, klass);
 
-            setCallInfo(context, ThreadContext.CALL_KEYWORD);
+            context.callInfo = ThreadContext.CALL_KEYWORD;
 
             // TODO: avoid initialize and hash overhead for known types
             dataObject.getMetaClass().getBaseCallSite(RubyClass.CS_IDX_INITIALIZE)
@@ -293,10 +291,9 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyOb
 
         @JRubyMethod(name = {"new", "[]"}, keywords = true)
         public static IRubyObject rbNew(ThreadContext context, IRubyObject self) {
-            RubyClass klass = (RubyClass) self;
-
-            clearCallInfo(context);
+            ThreadContext.resetCallInfo(context);
 
+            RubyClass klass = (RubyClass) self;
             IRubyObject dataObject = klass.getAllocator().allocate(context.runtime, klass);
 
             dataObject.getMetaClass().getBaseCallSite(RubyClass.CS_IDX_INITIALIZE)
@@ -307,10 +304,10 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self) {
 
         @JRubyMethod(name = {"new", "[]"}, keywords = true)
         public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyObject hashOrElt) {
-            RubyClass klass = (RubyClass) self;
+            int callInfo = ThreadContext.resetCallInfo(context);
 
+            RubyClass klass = (RubyClass) self;
             RubyHash init;
-            int callInfo = resetCallInfo(context);
             if (hasNonemptyKeywords(callInfo)) {
                 if (!(hashOrElt instanceof RubyHash)) {
                     throw argumentError(context, 1, 0, 0);
@@ -331,7 +328,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyOb
 
             IRubyObject dataObject = klass.getAllocator().allocate(context.runtime, klass);
 
-            setCallInfo(context, callInfo);
+            context.callInfo = callInfo;
 
             // TODO: avoid initialize and hash overhead for known types
             dataObject.getMetaClass().getBaseCallSite(RubyClass.CS_IDX_INITIALIZE)
@@ -443,7 +440,7 @@ private static IRubyObject checkDataEquality(ThreadContext context, RubyBasicObj
         if (selfObj == otherObj) return context.tru;
         RubyClass metaClass = otherObj.getMetaClass();
         if (!metaClass.isKindOfModule(context.runtime.getData())) return context.fals;
-        if (metaClass != selfObj.getMetaClass()) return context.fals;
+        if (metaClass.getRealClass() != selfObj.getMetaClass().getRealClass()) return context.fals;
 //        if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
 //            rb_bug("inconsistent struct"); /* should never happen */
 //        }
diff --git a/core/src/main/java/org/jruby/RubyDir.java b/core/src/main/java/org/jruby/RubyDir.java
index 04e787be4e2..a704e9484bd 100644
--- a/core/src/main/java/org/jruby/RubyDir.java
+++ b/core/src/main/java/org/jruby/RubyDir.java
@@ -274,6 +274,7 @@ private static void globOptions(ThreadContext context, IRubyObject[] args, Strin
 
     @JRubyMethod(name = "[]", rest = true, meta = true, keywords = true)
     public static IRubyObject aref(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        ThreadContext.resetCallInfo(context);
         Ruby runtime = context.runtime;
         GlobOptions options = new GlobOptions();
         globOptions(context, args, BASE_KEYWORDS, options);
@@ -321,8 +322,9 @@ private static ByteList globArgumentAsByteList(ThreadContext context, IRubyObjec
      * with each filename is passed to the block in turn. In this case, Nil is
      * returned.
      */
-    @JRubyMethod(required = 1, optional = 2, checkArity = false, meta = true)
+    @JRubyMethod(required = 1, optional = 2, checkArity = false, meta = true, keywords = true)
     public static IRubyObject glob(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
+        ThreadContext.resetCallInfo(context);
         Arity.checkArgumentCount(context, args, 1, 3);
 
         Ruby runtime = context.runtime;
@@ -691,11 +693,6 @@ public static IRubyObject mkdir(ThreadContext context, IRubyObject recv, IRubyOb
         return mkdirCommon(context, RubyFile.get_path(context, args[0]).asJavaString(), args);
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public static IRubyObject mkdir(IRubyObject recv, IRubyObject[] args) {
-        return mkdir(((RubyBasicObject) recv).getCurrentContext(), recv, args);
-    }
-
     private static IRubyObject mkdirCommon(ThreadContext context, String path, IRubyObject[] args) {
         if (path.startsWith("uri:")) throw context.runtime.newErrnoEACCESError(path);
 
@@ -1185,23 +1182,6 @@ public <T> T toJava(Class<T> target) {
         return super.toJava(target);
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject home(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        if (args.length > 0 && args[0] != context.nil) return getHomeDirectoryPath(context, args[0].toString());
-
-        return getHomeDirectoryPath(context);
-    }
-
-    @Deprecated(since = "9.2.15.0")
-    public static RubyArray entries(IRubyObject recv, IRubyObject path) {
-        return entries(((RubyBasicObject) recv).getCurrentContext(), recv, path);
-    }
-
-    @Deprecated(since = "9.2.15.0")
-    public static RubyArray entries(IRubyObject recv, IRubyObject path, IRubyObject arg, IRubyObject opts) {
-        return entries(((RubyBasicObject) recv).getCurrentContext(), recv, path, opts);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public static IRubyObject chdir(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
         return switch (args.length) {
diff --git a/core/src/main/java/org/jruby/RubyEncoding.java b/core/src/main/java/org/jruby/RubyEncoding.java
index bda699916e8..3f6f065081e 100755
--- a/core/src/main/java/org/jruby/RubyEncoding.java
+++ b/core/src/main/java/org/jruby/RubyEncoding.java
@@ -35,6 +35,7 @@
 import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
 
+import org.jcodings.Config;
 import org.jcodings.Encoding;
 import org.jcodings.EncodingDB.Entry;
 import org.jcodings.specific.ASCIIEncoding;
@@ -44,6 +45,7 @@
 import org.jcodings.util.CaseInsensitiveBytesHash;
 import org.jcodings.util.Hash.HashEntryIterator;
 import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyConstant;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.compiler.Constantizable;
 import org.jruby.runtime.ClassIndex;
@@ -77,12 +79,16 @@ public class RubyEncoding extends RubyObject implements Constantizable {
     public static final ByteList INTERNAL = new ByteList(encodeISO("internal"), false);
     public static final ByteList BINARY_ASCII_NAME = new ByteList(encodeISO("BINARY (ASCII-8BIT)"), false);
 
+    @JRubyConstant("UNICODE_VERSION")
+    public static final String UNICODE_VERSION = Config.UNICODE_VERSION_STRING;
+
     public static RubyClass createEncodingClass(ThreadContext context, RubyClass Object) {
         return defineClass(context, "Encoding", Object, NOT_ALLOCATABLE_ALLOCATOR).
                 reifiedClass(RubyEncoding.class).
                 kindOf(new RubyModule.JavaClassKindOf(RubyEncoding.class)).
                 classIndex(ClassIndex.ENCODING).
                 defineMethods(context, RubyEncoding.class).
+                defineConstants(context, RubyEncoding.class).
                 tap(c -> c.singletonClass(context).undefMethods(context, "allocate"));
     }
 
@@ -151,13 +157,11 @@ public static Encoding areCompatible(IRubyObject obj1, IRubyObject obj2) {
         if (!(obj1 instanceof RubyString) && enc1 instanceof USASCIIEncoding) return enc2;
 
         if (!(obj1 instanceof RubyString)) {
-            IRubyObject objTmp = obj1; // swap1 obj1 & obj2
+            IRubyObject objTmp = obj1; // swap obj1 & obj2
             obj1 = obj2;
             obj2 = objTmp;
-
-            Encoding encTmp = enc1;  // swap their encodings
-            enc1 = enc2;
-            enc2 = encTmp;
+            // Note: enc1/enc2 are NOT swapped — they retain the
+            // original argument order, matching CRuby's rb_enc_compatible.
         }
 
         if (obj1 instanceof RubyString) {
@@ -679,31 +683,10 @@ public static IRubyObject getDefaultInternal(ThreadContext context, IRubyObject
         return encodingService(context).getDefaultInternal();
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject getDefaultInternal(IRubyObject recv) {
-        return getDefaultInternal(recv.getRuntime().getCurrentContext(), recv);
-    }
-
     @JRubyMethod(name = "default_internal=", meta = true)
     public static IRubyObject setDefaultInternal(ThreadContext context, IRubyObject recv, IRubyObject encoding) {
         if (context.runtime.isVerbose()) context.runtime.getWarnings().warning("setting Encoding.default_internal");
         EncodingUtils.rbEncSetDefaultInternal(context, encoding);
         return encoding;
     }
-
-    /**
-     * @deprecated use {@link #decodeRaw(byte[], int, int)}
-     */
-    @Deprecated(since = "9.3.0.0")
-    public static String decodeISO(byte[] bytes, int start, int length) {
-        return decodeRaw(bytes, start, length);
-    }
-
-    /**
-     * @deprecated use {@link #decodeRaw(ByteList)}
-     */
-    @Deprecated(since = "9.3.0.0")
-    public static String decodeISO(ByteList byteList) {
-        return decodeRaw(byteList);
-    }
 }
diff --git a/core/src/main/java/org/jruby/RubyEnumerable.java b/core/src/main/java/org/jruby/RubyEnumerable.java
index 1a8404116ba..1a7a3e3257b 100644
--- a/core/src/main/java/org/jruby/RubyEnumerable.java
+++ b/core/src/main/java/org/jruby/RubyEnumerable.java
@@ -1877,7 +1877,7 @@ public static IRubyObject zipCommon(ThreadContext context, IRubyObject self,
 
         if (block.isGiven()) {
             callEach(context, eachSite(context), self, (ctx, largs, unused) -> {
-                var array = RubyArray.newBlankArrayInternal(ctx.runtime, len);
+                var array = RubyArrayNative.newBlankArrayInternal(ctx.runtime, len);
                 int myIx = ix.getAndIncrement();
                 array.eltInternalSet(0, packEnumValues(ctx, largs));
                 for (int i = 0, j = args.length; i < j; i++) {
@@ -1891,7 +1891,7 @@ public static IRubyObject zipCommon(ThreadContext context, IRubyObject self,
         } else {
             final var zip = newArray(context);
             callEach(context, eachSite(context), self, Signature.ONE_REQUIRED, (ctx, largs, unused) -> {
-                var array = RubyArray.newBlankArrayInternal(ctx.runtime, len);
+                var array = RubyArrayNative.newBlankArrayInternal(ctx.runtime, len);
                 int myIx = ix.getAndIncrement();
                 array.eltInternalSet(0, packEnumValues(ctx, largs));
                 for (int i = 0, j = args.length; i < j; i++) {
@@ -1981,7 +1981,7 @@ public static IRubyObject zipEnumNext(ThreadContext context, IRubyObject arg) {
     public static IRubyObject group_by(ThreadContext context, IRubyObject self, final Block block) {
         if (!block.isGiven()) return enumeratorizeWithSize(context, self, "group_by", RubyEnumerable::size);
 
-        final RubyHash result = new RubyHash(context.runtime);
+        final RubyHash result = RubyHashLinkedBuckets.newLBHash(context.runtime);
 
         callEach(context, eachSite(context), self, Signature.OPTIONAL, (ctx, largs, blk) -> {
             IRubyObject larg = packEnumValues(ctx, largs);
@@ -2031,7 +2031,7 @@ public static IRubyObject chunk(ThreadContext context, IRubyObject self, final B
 
     @JRubyMethod
     public static IRubyObject uniq(ThreadContext context, IRubyObject self, final Block block) {
-        final RubyHash hash = new RubyHash(context.runtime, 12, false);
+        final RubyHash hash = RubyHashLinkedBuckets.newLBHash(context.runtime, 12, false);
 
         final CachingCallSite each = eachSite(context);
         if (block.isGiven()) {
@@ -2046,7 +2046,7 @@ public IRubyObject call(ThreadContext ctx, IRubyObject[] largs, Block blk) {
 
                     IRubyObject key = ary ? block.yieldArray(ctx, obj, null) : block.yield(ctx, obj);
 
-                    if (hash.getEntry(key) == RubyHash.NO_ENTRY) {
+                    if (!hash.hasKey(key)) {
                         hash.internalPut(key, obj);
                     }
                     return obj;
@@ -2054,7 +2054,7 @@ public IRubyObject call(ThreadContext ctx, IRubyObject[] largs, Block blk) {
                 @Override
                 public IRubyObject call(ThreadContext ctx, IRubyObject obj, Block blk) {
                     IRubyObject key = block.yield(ctx, obj);
-                    if (hash.getEntry(key) == RubyHash.NO_ENTRY) {
+                    if (!hash.hasKey(key)) {
                         hash.internalPut(key, obj);
                     }
                     return obj;
@@ -2191,11 +2191,6 @@ public static final class AppendBlockCallback implements BlockCallback {
 
         private final RubyArray result;
 
-        @Deprecated(since = "9.1.3.0")
-        public AppendBlockCallback(Ruby runtime, RubyArray result) {
-            this.result = result;
-        }
-
         AppendBlockCallback(final RubyArray result) {
             this.result = result;
         }
@@ -2220,18 +2215,6 @@ public static final class PutKeyValueCallback implements BlockCallback {
         private final RubyHash result;
         private final Block block;
 
-        @Deprecated(since = "9.1.3.0")
-        public PutKeyValueCallback(Ruby runtime, RubyHash result) {
-            this.result = result;
-            this.block = Block.NULL_BLOCK;
-        }
-
-        @Deprecated(since = "9.3.0.0")
-        public PutKeyValueCallback(Ruby runtime, RubyHash result, Block block) {
-            this.result = result;
-            this.block = block;
-        }
-
         PutKeyValueCallback(RubyHash result) {
             this.result = result;
             this.block = Block.NULL_BLOCK;
@@ -2309,22 +2292,6 @@ public IRubyObject call(ThreadContext context, IRubyObject[] largs, Block blk) {
 
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject callEach(ThreadContext context, IRubyObject self, IRubyObject[] args, Signature signature,
-                                       BlockCallback callback) {
-        return callEach(context, eachSite(context), self, args, signature, callback);
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject callEach(ThreadContext context, IRubyObject self, BlockCallback callback) {
-        return callEach(context, eachSite(context), self, callback);
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject each(ThreadContext context, IRubyObject self, BlockBody body) {
-        return each(context, eachSite(context), self, body);
-    }
-
     protected static CachingCallSite eachSite(ThreadContext context) {
         return sites(context).each;
     }
diff --git a/core/src/main/java/org/jruby/RubyEnumerator.java b/core/src/main/java/org/jruby/RubyEnumerator.java
index 89ab6e67a2d..b33dc481296 100644
--- a/core/src/main/java/org/jruby/RubyEnumerator.java
+++ b/core/src/main/java/org/jruby/RubyEnumerator.java
@@ -30,6 +30,7 @@
 
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
+import org.jruby.ast.util.ArgsUtil;
 import org.jruby.exceptions.StopIteration;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
@@ -52,6 +53,9 @@
 import static org.jruby.runtime.Helpers.arrayOf;
 import static org.jruby.runtime.ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR;
 import static org.jruby.runtime.ThreadContext.CALL_KEYWORD;
+import static org.jruby.runtime.ThreadContext.hasKeywords;
+import static org.jruby.runtime.ThreadContext.hasNonemptyKeywords;
+import static org.jruby.runtime.ThreadContext.resetCallInfo;
 import static org.jruby.runtime.Visibility.PRIVATE;
 
 /**
@@ -209,10 +213,9 @@ public static IRubyObject enumeratorize(Ruby runtime, RubyClass type, IRubyObjec
     // and used internally to create enum from Enumerator::Lazy#eager
     @JRubyMethod(name = "__from", meta = true, required = 2, optional = 2, checkArity = false, visibility = PRIVATE, keywords = true)
     public static IRubyObject __from(ThreadContext context, IRubyObject klass, IRubyObject[] args) {
-        int argc = Arity.checkArgumentCount(context, args, 2, 4);
+        boolean keywords = hasNonemptyKeywords(ThreadContext.resetCallInfo(context));
 
-        boolean keywords = (context.callInfo & CALL_KEYWORD) != 0 && (context.callInfo & ThreadContext.CALL_KEYWORD_EMPTY) == 0;
-        ThreadContext.resetCallInfo(context);
+        int argc = Arity.checkArgumentCount(context, args, 2, 4);
 
         // Lazy.__from(enum, method, *args, size)
         IRubyObject object = args[0];
@@ -328,7 +331,7 @@ public IRubyObject each(ThreadContext context, Block block) {
     private IRubyObject __each__(ThreadContext context, final Block block) {
         if (methodArgsHasKeywords) context.callInfo = CALL_KEYWORD;
         return object.callMethod(context, method, methodArgs,
-                CallBlock.newCallClosure(context, this, Signature.OPTIONAL, (ctx, args, blk) -> {
+                CallBlock.newCallClosure(context, this, block.getSignature(), (ctx, args, blk) -> {
                     IRubyObject ret;
 
                     if (args.length == 1) {
@@ -353,7 +356,7 @@ public IRubyObject each(ThreadContext context, IRubyObject[] args, Block block)
         ArraySupport.copy(args, newArgs, mlen, args.length);
 
         return new RubyEnumerator(context.runtime, getType(), object, asSymbol(context, method), newArgs,
-                size, sizeFn, methodArgsHasKeywords).each(context, block);
+                null, null, methodArgsHasKeywords).each(context, block);
     }
 
     @JRubyMethod(name = "inspect")
@@ -563,17 +566,44 @@ private static JavaSites.FiberSites sites(ThreadContext context) {
     /** MRI: enumerator_s_produce
      *
      */
-    @JRubyMethod(meta = true, optional = 1, checkArity = false)
+    @JRubyMethod(meta = true, optional = 2, checkArity = false, keywords = true)
     public static IRubyObject produce(ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
-        int argc = Arity.checkArgumentCount(context, args, 0, 1);
+        IRubyObject size = UNDEF;
+        int argc = args.length;
+
+        if (hasKeywords(resetCallInfo(context))) {
+            argc--;
+            IRubyObject maybeSize = ArgsUtil.extractKeywordArg(context, (RubyHash) args[args.length - 1], "size");
+            if (maybeSize != null) {
+                size = maybeSize;
+            }
+        }
+
+        size = size == UNDEF ?
+                context.runtime.getFloat().getConstant("INFINITY") :
+                convertToFeasibleSizeValue(context, size);
+
+        Arity.checkArgumentCount(context, argc, 0, 1);
 
         if (!block.isGiven()) throw argumentError(context, "no block given");
 
         IRubyObject init = argc == 0 ? null : args[0];
-        RubyProducer producer = RubyProducer.newProducer(context, init, block);
+        RubyProducer producer = RubyProducer.newProducer(context, init, block, size);
         return enumeratorizeWithSize(context, producer, "each", RubyProducer::size);
     }
 
+    private static IRubyObject convertToFeasibleSizeValue(ThreadContext context, IRubyObject obj) {
+        if (obj.isNil()) {
+            return obj;
+        } else if (obj.respondsTo("call")) {
+            return obj;
+        } else if (obj instanceof RubyFloat flote && flote.value == Double.POSITIVE_INFINITY) {
+            return obj;
+        } else {
+            return toInteger(context, obj);
+        }
+    }
+
     @Deprecated(since = "9.4.3.0")
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
         IRubyObject size = Arity.checkArgumentCount(context, args, 0, 1) == 1 ? args[0] : null;
diff --git a/core/src/main/java/org/jruby/RubyException.java b/core/src/main/java/org/jruby/RubyException.java
index 9cdf133e42e..617d01667c4 100644
--- a/core/src/main/java/org/jruby/RubyException.java
+++ b/core/src/main/java/org/jruby/RubyException.java
@@ -189,9 +189,15 @@ public void marshalTo(Ruby runtime, RubyException exc, RubyClass type,
         public void marshalTo(ThreadContext context, RubyOutputStream out, RubyException exc, RubyClass type,
                               MarshalDumper marshalStream) {
             marshalStream.registerObject(exc);
-            marshalStream.dumpVariables(context, out, exc, 2, (marshal, c, o, v, receiver) -> {
+            Object _cause = exc.getCause();
+            IRubyObject cause = exc.getCause() instanceof RubyException ? (RubyException) _cause : null;
+            int count = cause == null ? 2 : 3;
+            marshalStream.dumpVariables(context, out, exc, count, (marshal, c, o, v, receiver) -> {
                 receiver.receive(marshal, c, o, "mesg", v.getMessage());
                 receiver.receive(marshal, c, o, "bt", v.getBacktrace());
+                if (cause != null) {
+                    receiver.receive(marshal, c, o, "cause", cause);
+                }
             });
         }
 
@@ -218,6 +224,10 @@ public RubyException unmarshalFrom(ThreadContext context, RubyInputStream in, Ru
 
             exc.setMessage((IRubyObject) exc.removeInternalVariable("mesg"));
             exc.set_backtrace(context, (IRubyObject) exc.removeInternalVariable("bt"));
+            if (exc.removeInternalVariable("cause") instanceof RubyException cause) {
+                checkCircularCause(context, exc, cause);
+                exc.setCause(context, cause);
+            }
 
             return exc;
         }
@@ -495,6 +505,17 @@ public RaiseException toThrowable() {
     }
 
     public void setCause(IRubyObject cause) {
+        setCause(getRuntime().getCurrentContext(), cause);
+    }
+
+    public void setCause(ThreadContext context, IRubyObject cause) {
+        if (cause == this) {
+            this.cause = context.nil;
+            return;
+        }
+
+        checkCircularCause(context, this, cause);
+
         this.cause = cause;
 
         // don't do anything to throwable for null/nil cause to avoid forcing backtrace
@@ -517,6 +538,16 @@ public void setCause(IRubyObject cause) {
         }
     }
 
+    static void checkCircularCause(ThreadContext context, IRubyObject exception, IRubyObject cause) {
+        Object c = cause;
+        while (c instanceof RubyException causeException) {
+            if (c == exception) {
+                throw argumentError(context, "circular causes");
+            }
+            c = causeException.getCause();
+        }
+    }
+
     // NOTE: can not have IRubyObject as NativeException has getCause() returning Throwable
     public Object getCause() {
         return cause == this ? null : cause;
@@ -555,6 +586,7 @@ public void copySpecialInstanceVariables(IRubyObject clone) {
         RubyException exception = (RubyException)clone;
         exception.backtrace.copy(backtrace);
         exception.message = message;
+        exception.cause = cause;
     }
 
     /**
@@ -643,9 +675,4 @@ public void prepareIntegratedBacktrace(ThreadContext context, StackTraceElement[
             backtrace.backtraceData = instanceConfig(context).getTraceType().getIntegratedBacktrace(context, javaTrace);
         }
     }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject newException(ThreadContext context, RubyClass exceptionClass, IRubyObject message) {
-        return newException(context, exceptionClass, message.convertToString());
-    }
 }
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
index cc0a36c59bb..5b86b69139e 100644
--- a/core/src/main/java/org/jruby/RubyFile.java
+++ b/core/src/main/java/org/jruby/RubyFile.java
@@ -45,6 +45,7 @@
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.api.API;
+import org.jruby.api.Error;
 import org.jruby.exceptions.NotImplementedError;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.runtime.*;
@@ -67,14 +68,13 @@
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
+import java.nio.channels.SeekableByteChannel;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.nio.file.attribute.FileTime;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
-import java.util.jar.JarFile;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
@@ -91,7 +91,6 @@
 import static org.jruby.api.Define.defineClass;
 import static org.jruby.api.Error.argumentError;
 import static org.jruby.api.Error.runtimeError;
-import static org.jruby.runtime.ThreadContext.hasKeywords;
 import static org.jruby.runtime.Visibility.PRIVATE;
 import static org.jruby.util.StringSupport.*;
 import static org.jruby.util.io.EncodingUtils.vmode;
@@ -237,6 +236,23 @@ public RubyFile(Ruby runtime, String path, InputStream in) {
         this.setPath(path);
     }
 
+
+    private RubyFile(Ruby runtime, String path, SeekableByteChannel in) {
+        super(runtime, runtime.getFile(), in);
+        this.setPath(path);
+    }
+
+    /**
+     * Only used by parser (prism) so that we can get a File
+     * @param runtime the runtime
+     * @param path the path of DATA
+     * @param in the channel to use
+     * @return a Ruby file
+     */
+    public static RubyFile DATAFile(Ruby runtime, String path, SeekableByteChannel in) {
+        return new RubyFile(runtime, path, in);
+    }
+
     public RubyFile(Ruby runtime, String path, FileChannel channel) {
         super(runtime, runtime.getFile(), channel);
         this.setPath(path);
@@ -299,7 +315,7 @@ public IRubyObject flock(ThreadContext context, IRubyObject operation) {
     @JRubyMethod(name = "initialize", required = 1, optional = 3, checkArity = false, visibility = PRIVATE, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
         // capture callInfo for delegating to IO#initialize
-        int callInfo = context.callInfo;
+        final int callInfo = context.callInfo;
         IRubyObject keywords = IRRuntimeHelpers.receiveKeywords(context, args, false, true, false);
         // Mild hack. We want to arity-mismatch if extra arg is not really a kwarg but not if it is one.
         int maxArgs = keywords instanceof RubyHash ? 4 : 3;
@@ -311,7 +327,7 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block b
             IRubyObject fd = TypeConverter.convertToTypeWithCheck(context, args[0], context.runtime.getFixnum(), sites(context).to_int_checked);
             if (!fd.isNil()) {
                 // restore callInfo for delegated call to IO#initialize
-                IRRuntimeHelpers.setCallInfo(context, callInfo);
+                context.callInfo = callInfo;
                 return switch (argc) {
                     case 1 -> super.initialize(context, fd, block);
                     case 2 -> super.initialize(context, fd, args[1], block);
@@ -455,12 +471,6 @@ public static RubyString basename(ThreadContext context, IRubyObject recv, IRuby
         return basenameImpl(context, (RubyClass) recv, path, ext == context.nil ? null : ext);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static IRubyObject basename(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        IRubyObject ext = (args.length > 1 && args[1] != context.nil) ? args[1] : null;
-        return basenameImpl(context, (RubyClass) recv, args[0], ext);
-    }
-
     private static RubyString basenameImpl(ThreadContext context, RubyClass klass, IRubyObject path, IRubyObject ext) {
         final int separatorChar = getSeparatorChar(context, klass);
         final int altSeparatorChar = getAltSeparatorChar(context, klass);
@@ -552,7 +562,7 @@ public static IRubyObject chmod(ThreadContext context, IRubyObject recv, IRubyOb
         int mode = toInt(context, args[0]);
 
         for (int i = 1; i < argc; i++, count++) {
-            JRubyFile filename = file(args[i]);
+            JRubyFile filename = fileResource(context, args[i]).unwrap(JRubyFile.class);
 
             if (!filename.exists()) throw context.runtime.newErrnoENOENTError(filename.toString());
 
@@ -572,7 +582,7 @@ public static IRubyObject chown(ThreadContext context, IRubyObject recv, IRubyOb
         int group = !args[1].isNil() ? toInt(context, args[1]) : -1;
 
         for (int i = 2; i < argc; i++) {
-            JRubyFile filename = file(args[i]);
+            JRubyFile filename = file(context, args[i]);
 
             if (!filename.exists()) throw context.runtime.newErrnoENOENTError(filename.toString());
 
@@ -956,7 +966,7 @@ public static IRubyObject lchmod(ThreadContext context, IRubyObject recv, IRubyO
         int mode = toInt(context, args[0]);
 
         for (int i = 1; i < argc; i++, count++) {
-            JRubyFile file = file(args[i]);
+            JRubyFile file = file(context, args[i]);
             if (context.runtime.getPosix().lchmod(file.toString(), mode) != 0) {
                 throw context.runtime.newErrnoFromLastPOSIXErrno();
             }
@@ -973,7 +983,7 @@ public static IRubyObject lchown(ThreadContext context, IRubyObject recv, IRubyO
         int count = 0;
 
         for (int i = 2; i < argc; i++) {
-            JRubyFile file = file(args[i]);
+            JRubyFile file = file(context, args[i]);
 
             if (0 != context.runtime.getPosix().lchown(file.toString(), owner, group)) {
                 throw context.runtime.newErrnoFromLastPOSIXErrno();
@@ -988,8 +998,8 @@ public static IRubyObject lchown(ThreadContext context, IRubyObject recv, IRubyO
     @JRubyMethod(meta = true)
     public static IRubyObject link(ThreadContext context, IRubyObject recv, IRubyObject from, IRubyObject to) {
         Ruby runtime = context.runtime;
-        String fromStr = file(from).toString();
-        String toStr = file(to).toString();
+        String fromStr = file(context, from).toString();
+        String toStr = file(context, to).toString();
 
         int ret = runtime.getPosix().link(fromStr, toStr);
         if (ret != 0) {
@@ -1090,7 +1100,7 @@ public static IRubyObject readlink(ThreadContext context, IRubyObject recv, IRub
             throw runtime.newNotImplementedError("readlink");
         }
 
-        JRubyFile link = file(path);
+        JRubyFile link = file(context, path);
 
         try {
             String realPath = runtime.getPosix().readlink(link.toString());
@@ -1126,6 +1136,31 @@ public static IRubyObject umask(ThreadContext context, IRubyObject recv, IRubyOb
         return asFixnum(context, oldMask);
     }
 
+    @JRubyMethod(meta = true)
+    public static IRubyObject lutime(ThreadContext context, IRubyObject recv, IRubyObject atime, IRubyObject mtime) {
+        if (atime != context.nil || mtime != context.nil) {
+            extractTimespec(context, atime);
+            extractTimespec(context, mtime);
+        }
+
+        return asFixnum(context, 0);
+    }
+
+    @JRubyMethod(meta = true)
+    public static IRubyObject lutime(ThreadContext context, IRubyObject recv, IRubyObject atime, IRubyObject mtime, IRubyObject path) {
+        long[] atimeval = null;
+        long[] mtimeval = null;
+
+        if (atime != context.nil || mtime != context.nil) {
+            atimeval = convertTimespecToTimeval(extractTimespec(context, atime));
+            mtimeval = convertTimespecToTimeval(extractTimespec(context, mtime));
+        }
+
+        lutime(context, path, atimeval, mtimeval);
+
+        return asFixnum(context, 1);
+    }
+
     @JRubyMethod(required = 2, rest = true, checkArity = false, meta = true)
     public static IRubyObject lutime(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         int argc = Arity.checkArgumentCount(context, args, 2, -1);
@@ -1140,22 +1175,52 @@ public static IRubyObject lutime(ThreadContext context, IRubyObject recv, IRubyO
         }
 
         for (int i = 2, j = argc; i < j; i++) {
-            var filename = get_path(context, args[i]).toString();
-            JRubyFile fileToTouch = JRubyFile.create(runtime.getCurrentDirectory(), filename);
-            if (!fileToTouch.exists()) throw runtime.newErrnoENOENTError(filename);
-
-            int result = runtime.getPosix().lutimes(fileToTouch.getAbsolutePath(), atimeval, mtimeval);
-            if (result == -1) throw runtime.newErrnoFromInt(runtime.getPosix().errno());
+            lutime(context, args[i], atimeval, mtimeval);
         }
 
         return asFixnum(context, argc - 2);
     }
 
+    private static void lutime(ThreadContext context, IRubyObject _path, long[] atimeval, long[] mtimeval) {
+        Ruby runtime = context.runtime;
+
+        var filename = get_path(context, _path).toString();
+
+        JRubyFile fileToTouch = JRubyFile.create(runtime.getCurrentDirectory(), filename);
+        if (!fileToTouch.exists()) throw runtime.newErrnoENOENTError(filename);
+
+        int result = runtime.getPosix().lutimes(fileToTouch.getAbsolutePath(), atimeval, mtimeval);
+        if (result == -1) throw runtime.newErrnoFromInt(runtime.getPosix().errno());
+    }
+
+    @JRubyMethod(meta = true)
+    public static IRubyObject utime(ThreadContext context, IRubyObject recv, IRubyObject atime, IRubyObject mtime) {
+        if (atime != context.nil || mtime != context.nil) {
+            extractTimespec(context, atime);
+            extractTimespec(context, mtime);
+        }
+
+        return asFixnum(context, 0);
+    }
+
+    @JRubyMethod(meta = true)
+    public static IRubyObject utime(ThreadContext context, IRubyObject recv, IRubyObject atime, IRubyObject mtime, IRubyObject path) {
+        long[] atimespec = null;
+        long[] mtimespec = null;
+        if (atime != context.nil || mtime != context.nil) {
+            atimespec = extractTimespec(context, atime);
+            mtimespec = extractTimespec(context, mtime);
+        }
+
+        utime(context, atimespec, mtimespec, path);
+
+        return asFixnum(context, 1);
+    }
+
     @JRubyMethod(required = 2, rest = true, checkArity = false, meta = true)
     public static IRubyObject utime(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         int argc = Arity.checkArgumentCount(context, args, 2, -1);
 
-        Ruby runtime = context.runtime;
         long[] atimespec = null;
         long[] mtimespec = null;
 
@@ -1165,26 +1230,30 @@ public static IRubyObject utime(ThreadContext context, IRubyObject recv, IRubyOb
         }
 
         for (int i = 2, j = argc; i < j; i++) {
-            var filename = get_path(context, args[i]).toString();
-
-            JRubyFile fileToTouch = JRubyFile.create(runtime.getCurrentDirectory(), filename);
-            if (!fileToTouch.exists()) throw runtime.newErrnoENOENTError(filename);
+            utime(context, atimespec, mtimespec, args[i]);
 
-            int result;
-            try {
-                result = runtime.getPosix().utimensat(0, fileToTouch.getAbsolutePath(), atimespec, mtimespec, 0);
-            } catch (NotImplementedError re) {
-                // fall back on utimes
-                result = runtime.getPosix().utimes(fileToTouch.getAbsolutePath(),
-                        convertTimespecToTimeval(atimespec), convertTimespecToTimeval(mtimespec));
-            }
-
-            if (result == -1) throw runtime.newErrnoFromInt(runtime.getPosix().errno());
         }
 
         return asFixnum(context, argc - 2);
     }
 
+    private static void utime(ThreadContext context, long[] atimespec, long[] mtimespec, IRubyObject args) {
+        Ruby runtime = context.runtime;
+
+        var filename = get_path(context, args).toString();
+        JRubyFile fileToTouch = JRubyFile.create(runtime.getCurrentDirectory(), filename);
+        if (!fileToTouch.exists()) throw runtime.newErrnoENOENTError(filename);
+        int result;
+        try {
+            result = runtime.getPosix().utimensat(0, fileToTouch.getAbsolutePath(), atimespec, mtimespec, 0);
+        } catch (NotImplementedError re) {
+            // fall back on utimes
+            result = runtime.getPosix().utimes(fileToTouch.getAbsolutePath(),
+                    convertTimespecToTimeval(atimespec), convertTimespecToTimeval(mtimespec));
+        }
+        if (result == -1) throw runtime.newErrnoFromInt(runtime.getPosix().errno());
+    }
+
     @JRubyMethod(rest = true, meta = true)
     public static IRubyObject delete(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         for (int i = 0; i < args.length; i++) {
@@ -1365,12 +1434,37 @@ public static String getAdjustedPath(ThreadContext context, IRubyObject fileOrPa
 
     // mri: FilePathValue/rb_get_path/rb_get_patch_check
     public static RubyString get_path(ThreadContext context, IRubyObject path) {
-        if (path instanceof RubyString) return checkEmbeddedNulls(context, path);
+        return getPathCheckConvert(context, getPathCheckToString(context, path));
+    }
+
+    // CRuby rb_get_path_check_convert
+    private static RubyString getPathCheckConvert(ThreadContext context, RubyString path) {
+        path = filePathConvert(context, path);
+
+        checkPathEncoding(context, path);
+
+        checkEmbeddedNulls(context, path);
+
+        return path.strDup(context.runtime);
+    }
+
+    // CRuby: check_path_encoding
+    private static Encoding checkPathEncoding(ThreadContext context, RubyString str) {
+        Encoding enc = str.getEncoding();
+        if (!enc.isAsciiCompatible()) {
+            throw Error.encodingCompatibilityError(context, "path name must be ASCII-compatible (" + enc + "): " + str);
+        }
+        return enc;
+    }
+
+    // CRuby: rb_get_path_check_to_string
+    private static RubyString getPathCheckToString(ThreadContext context, IRubyObject path) {
+        if (path instanceof RubyString) return (RubyString) path;
 
         FileSites sites = sites(context);
         if (sites.respond_to_to_path.respondsTo(context, path, path, true)) path = sites.to_path.call(context, path, path);
 
-        return filePathConvert(context, path.convertToString());
+        return path.convertToString();
     }
 
     // FIXME: MRI skips this logic on windows?  Does not make sense to me why so I left it in.
@@ -1378,6 +1472,10 @@ public static RubyString get_path(ThreadContext context, IRubyObject path) {
     protected static RubyString filePathConvert(ThreadContext context, RubyString path) {
         checkEmbeddedNulls(context, path);
 
+        if (!path.getEncoding().isAsciiCompatible()) {
+            throw context.runtime.newEncodingCompatibilityError("path name must be ASCII-compatible (" + path.getEncoding() + "): " + path);
+        }
+
         if (!Platform.IS_WINDOWS) {
             var encodingService = encodingService(context);
             Encoding pathEncoding = path.getEncoding();
@@ -1442,9 +1540,8 @@ private static String getDecodedPath(ThreadContext context, IRubyObject pathOrFi
         return decodedPath;
     }
 
-    @Deprecated(since = "1.7.11") // Use fileResource instead
-    public static JRubyFile file(IRubyObject pathOrFile) {
-        return fileResource(((RubyBasicObject) pathOrFile).getCurrentContext(), pathOrFile).unwrap(JRubyFile.class);
+    public static JRubyFile file(ThreadContext context, IRubyObject pathOrFile) {
+        return fileResource(context, pathOrFile).unwrap(JRubyFile.class);
     }
 
     @Override
@@ -1462,41 +1559,6 @@ private static ZipEntry getFileEntry(ZipFile jar, String path, final String pref
         return entry;
     }
 
-    @Deprecated(since = "9.1.11.0") // not-used
-    public static ZipEntry getDirOrFileEntry(String jar, String path) throws IOException {
-        return getDirOrFileEntry(new JarFile(jar), path);
-    }
-
-    @Deprecated(since = "9.2.0.0") // not-used
-    public static ZipEntry getDirOrFileEntry(ZipFile jar, String path) throws IOException {
-        String dirPath = path + '/';
-        ZipEntry entry = jar.getEntry(dirPath); // first try as directory
-        if (entry == null) {
-            if (dirPath.length() == 1) {
-                return new ZipEntry(dirPath);
-            }
-            // try canonicalizing the path to eliminate . and .. (JRUBY-4760, JRUBY-4879)
-            final String prefix = new File(".").getCanonicalPath();
-            entry = jar.getEntry(new File(dirPath).getCanonicalPath().substring(prefix.length() + 1).replaceAll("\\\\", "/"));
-
-            // JRUBY-6119
-            if (entry == null) {
-                Enumeration<? extends ZipEntry> entries = jar.entries();
-                while (entries.hasMoreElements()) {
-                    String zipEntry = entries.nextElement().getName();
-                    if (zipEntry.startsWith(dirPath)) {
-                        return new ZipEntry(dirPath);
-                    }
-                }
-            }
-
-            if (entry == null) { // try as file
-                entry = getFileEntry(jar, path, prefix);
-            }
-        }
-        return entry;
-    }
-
     // mri: rb_is_absolute_path
     // Do this versus stand up full JRubyFile and perform stats + canonicalization
     private static boolean isAbsolutePath(String path) {
@@ -2300,9 +2362,6 @@ private static FileSites sites(ThreadContext context) {
     private static final String[] SLASHES = { "", "/", "//" };
     private static final Pattern URI_PREFIX = Pattern.compile("^(jar:)?[a-z]{2,}:(.*)");
 
-    @Deprecated(since = "9.0.0.0")
-    protected String path;
-
     @Deprecated(since = "9.4.6.0")
     public static IRubyObject dirname(ThreadContext context, IRubyObject recv, IRubyObject [] args) {
         return switch (args.length) {
diff --git a/core/src/main/java/org/jruby/RubyFileStat.java b/core/src/main/java/org/jruby/RubyFileStat.java
index 7045725e970..17a60b31adb 100644
--- a/core/src/main/java/org/jruby/RubyFileStat.java
+++ b/core/src/main/java/org/jruby/RubyFileStat.java
@@ -179,13 +179,6 @@ public IRubyObject blockSize(ThreadContext context) {
         return asFixnum(context, stat.blockSize());
     }
 
-    @Deprecated(since = "9.0.4.0")
-    public RubyFixnum blksize() {
-        ThreadContext context = getCurrentContext();
-        checkInitialized(context);
-        return asFixnum(context, stat.blockSize());
-    }
-
     @JRubyMethod(name = "blockdev?")
     public IRubyObject blockdev_p(ThreadContext context) {
         checkInitialized(context);
diff --git a/core/src/main/java/org/jruby/RubyFileTest.java b/core/src/main/java/org/jruby/RubyFileTest.java
index a740bf33b3a..fcf270e6ba9 100644
--- a/core/src/main/java/org/jruby/RubyFileTest.java
+++ b/core/src/main/java/org/jruby/RubyFileTest.java
@@ -298,11 +298,6 @@ public static IRubyObject size(ThreadContext context, IRubyObject recv, IRubyObj
         return asFixnum(context, stat.st_size());
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public static IRubyObject size_p(IRubyObject recv, IRubyObject filename) {
-        return size_p(((RubyBasicObject) recv).getCurrentContext(), recv, filename);
-    }
-    
     @JRubyMethod(name = "size?", module = true)
     public static IRubyObject size_p(ThreadContext context, IRubyObject recv, IRubyObject filename) {
         if (!(filename instanceof RubyFile) && filename.respondsTo("to_io")) {
@@ -363,11 +358,6 @@ public static RubyBoolean writable_p(IRubyObject recv, IRubyObject filename) {
         return writable_p(((RubyBasicObject) recv).getCurrentContext(), recv, filename);
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public static RubyBoolean zero_p(IRubyObject recv, IRubyObject filename) {
-        return zero_p(((RubyBasicObject) recv).getCurrentContext(), recv, filename);
-    }
-
     @JRubyMethod(name = {"empty?", "zero?"}, module = true)
     public static RubyBoolean zero_p(ThreadContext context, IRubyObject recv, IRubyObject filename) {
         FileResource resource = fileResource(context, filename);
diff --git a/core/src/main/java/org/jruby/RubyFixnum.java b/core/src/main/java/org/jruby/RubyFixnum.java
index 087b3353339..20da809ad47 100644
--- a/core/src/main/java/org/jruby/RubyFixnum.java
+++ b/core/src/main/java/org/jruby/RubyFixnum.java
@@ -298,56 +298,244 @@ public RubyInteger negate(ThreadContext context) {
         return negate(context, getValue());
     }
 
-    public static RubyFixnum newFixnum(Ruby runtime, long value) {
-        if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) {
-            // long is never in cache range
+    private static final boolean USE_COMPACT_FIXNUMS = Options.USE_COMPACT_FIXNUMS.load();
+    private static final boolean USE_INT_FIXNUMS = Options.USE_INT_FIXNUMS.load();
+    private static final boolean USE_SHORT_FIXNUMS = Options.USE_SHORT_FIXNUMS.load();
+    private static final boolean USE_BYTE_FIXNUMS = Options.USE_BYTE_FIXNUMS.load();
+
+    private static final FixnumFactory FIXNUM_FACTORY;
+    static {
+        if (USE_INT_FIXNUMS || USE_BYTE_FIXNUMS) {
+            // fallback handles all configurations at runtime
+            FIXNUM_FACTORY = new FallbackFixnumFactory();
+        } else if (USE_COMPACT_FIXNUMS && USE_SHORT_FIXNUMS) {
+            if (USE_CACHE) {
+                FIXNUM_FACTORY = new LongShortCachedFixnumFactory();
+            } else {
+                FIXNUM_FACTORY = new LongShortUncachedFixnumFactory();
+            }
+        } else {
+            if (USE_CACHE) {
+                FIXNUM_FACTORY = new LongCachedFixnumFactory();
+            } else {
+                FIXNUM_FACTORY = new LongUncachedFixnumFactory();
+            }
+        }
+    }
+
+    private interface FixnumFactory {
+        RubyFixnum newFixnum(Ruby runtime, long value);
+        RubyFixnum newFixnum(Ruby runtime, int value);
+        RubyFixnum newFixnum(Ruby runtime, short value);
+        RubyFixnum newFixnum(Ruby runtime, byte value);
+        RubyFixnum newFixnumForCache(RubyClass fixnum, int value);
+    }
+
+    private static final class LongCachedFixnumFactory implements FixnumFactory {
+        public RubyFixnum newFixnum(Ruby runtime, long value) {
+            if (isInCacheRange(value)) {
+                return cachedFixnum(runtime, value);
+            }
             return new LongFixnum(runtime.getInteger(), value);
         }
-        return newFixnum(runtime, (int) value);
+
+        public RubyFixnum newFixnum(Ruby runtime, int value) {
+            if (isInCacheRange(value)) {
+                return cachedFixnum(runtime, value);
+            }
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, short value) {
+            if (isInCacheRange(value)) {
+                return cachedFixnum(runtime, value);
+            }
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, byte value) {
+            if (isInCacheRange(value)) {
+                return cachedFixnum(runtime, value);
+            }
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnumForCache(RubyClass fixnum, int value) {
+            return new LongFixnum(fixnum, value);
+        }
     }
 
-    public static RubyFixnum newFixnum(Ruby runtime, int value) {
-        if (value > Short.MAX_VALUE || value < Short.MIN_VALUE) {
-            // integer is never in cache range
-            return new IntFixnum(runtime.getInteger(), value);
+    private static final class LongUncachedFixnumFactory implements FixnumFactory {
+        public RubyFixnum newFixnum(Ruby runtime, long value) {
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, int value) {
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, short value) {
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, byte value) {
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnumForCache(RubyClass fixnum, int value) {
+            return new LongFixnum(fixnum, value);
         }
-        return newFixnum(runtime, (short) value);
     }
+    
+    private static final class LongShortCachedFixnumFactory implements FixnumFactory {
+        public RubyFixnum newFixnum(Ruby runtime, long value) {
+            short shortValue = (short) value;
+            if (shortValue == value) {
+                if (isInCacheRange(shortValue)) {
+                    return cachedFixnum(runtime, shortValue);
+                }
+                return new ShortFixnum(runtime.getInteger(), shortValue);
+            }
+            return new LongFixnum(runtime.getInteger(), value);
+        }
 
-    public static RubyFixnum newFixnum(Ruby runtime, short value) {
-        if (value > Byte.MAX_VALUE || value < Byte.MIN_VALUE) {
-            return USE_CACHE && isInCacheRange(value) ? cachedFixnum(runtime, value) : new ShortFixnum(runtime.getInteger(), value);
+        public RubyFixnum newFixnum(Ruby runtime, int value) {
+            short shortValue = (short) value;
+            if (shortValue == value) {
+                if (isInCacheRange(shortValue)) {
+                    return cachedFixnum(runtime, shortValue);
+                }
+                return new ShortFixnum(runtime.getInteger(), shortValue);
+            }
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, short value) {
+            if (isInCacheRange(value)) {
+                return cachedFixnum(runtime, value);
+            }
+            return new ShortFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, byte value) {
+            if (isInCacheRange(value)) {
+                return cachedFixnum(runtime, value);
+            }
+            return new ShortFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnumForCache(RubyClass fixnum, int value) {
+            return new ShortFixnum(fixnum, (short) value);
         }
-        return newFixnum(runtime, (byte) value);
+    }
+
+    private static final class LongShortUncachedFixnumFactory implements FixnumFactory {
+        public RubyFixnum newFixnum(Ruby runtime, long value) {
+            short shortValue = (short) value;
+            if (shortValue == value) {
+                return newFixnum(runtime, shortValue);
+            }
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, int value) {
+            short shortValue = (short) value;
+            if (shortValue == value) {
+                return newFixnum(runtime, shortValue);
+            }
+            return new LongFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, short value) {
+            return new ShortFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, byte value) {
+            return new ShortFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnumForCache(RubyClass fixnum, int value) {
+            return new ShortFixnum(fixnum, (short) value);
+        }
+    }
+    
+    private static final class FallbackFixnumFactory implements FixnumFactory {
+        public RubyFixnum newFixnum(Ruby runtime, long value) {
+            if (!USE_COMPACT_FIXNUMS || !USE_INT_FIXNUMS || value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) {
+                // long is never in cache range
+                return new LongFixnum(runtime.getInteger(), value);
+            }
+            return newFixnum(runtime, (int) value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, int value) {
+            if (!USE_COMPACT_FIXNUMS) return new LongFixnum(runtime.getInteger(), value);
+            if (!USE_SHORT_FIXNUMS || value > Short.MAX_VALUE || value < Short.MIN_VALUE) {
+                // integer is never in cache range
+                // disabled to avoid polymorphism and because it doesn't save size (https://github.com/jruby/jruby/pull/9379)
+                // return new IntFixnum(runtime.getInteger(), value);
+                return new LongFixnum(runtime.getInteger(), value);
+            }
+            return newFixnum(runtime, (short) value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, short value) {
+            if (!USE_COMPACT_FIXNUMS) return new LongFixnum(runtime.getInteger(), value);
+            if (!USE_BYTE_FIXNUMS || value > Byte.MAX_VALUE || value < Byte.MIN_VALUE) {
+                return USE_CACHE && isInCacheRange(value) ? cachedFixnum(runtime, value) : new ShortFixnum(runtime.getInteger(), value);
+            }
+            return newFixnum(runtime, (byte) value);
+        }
+
+        public RubyFixnum newFixnum(Ruby runtime, byte value) {
+            if (USE_CACHE && isInCacheRange(value)) return cachedFixnum(runtime, value);
+
+            if (!USE_COMPACT_FIXNUMS) return new LongFixnum(runtime.getInteger(), value);
+            if (!USE_BYTE_FIXNUMS) {
+                return new ShortFixnum(runtime.getInteger(), value);
+            }
+
+            return new ByteFixnum(runtime.getInteger(), value);
+        }
+
+        public RubyFixnum newFixnumForCache(RubyClass fixnum, int value) {
+            if (!USE_COMPACT_FIXNUMS) return new LongFixnum(fixnum, value);
+            if (!USE_SHORT_FIXNUMS || value > Short.MAX_VALUE || value < Short.MIN_VALUE) {
+                return new IntFixnum(fixnum, value);
+            } else if (!USE_BYTE_FIXNUMS || value > Byte.MAX_VALUE || value < Byte.MIN_VALUE) {
+                return new ShortFixnum(fixnum, (short) value);
+            }
+            return new ByteFixnum(fixnum, (byte) value);
+        }
+    }
+
+    public static RubyFixnum newFixnum(Ruby runtime, long value) {
+        return FIXNUM_FACTORY.newFixnum(runtime, value);
+    }
+
+    public static RubyFixnum newFixnum(Ruby runtime, int value) {
+        return FIXNUM_FACTORY.newFixnum(runtime, value);
+    }
+
+    public static RubyFixnum newFixnum(Ruby runtime, short value) {
+        return FIXNUM_FACTORY.newFixnum(runtime, value);
     }
 
     public static RubyFixnum newFixnum(Ruby runtime, byte value) {
-        // using ShortFixnum until there's value in using ByteFixnum
-        return USE_CACHE && isInCacheRange(value) ? cachedFixnum(runtime, value) : new ShortFixnum(runtime.getInteger(), value);
+        return FIXNUM_FACTORY.newFixnum(runtime, value);
     }
 
     private static RubyFixnum newFixnumForCache(RubyClass fixnum, int value) {
-        if (value > Short.MAX_VALUE || value < Short.MIN_VALUE) {
-            return new IntFixnum(fixnum, value);
-        } else if (value > Byte.MAX_VALUE || value < Byte.MIN_VALUE) {
-            return new ShortFixnum(fixnum, (short) value);
-        }
-        // using ShortFixnum until there's value in using ByteFixnum
-        return new ShortFixnum(fixnum, (byte) value);
+        return FIXNUM_FACTORY.newFixnumForCache(fixnum, value);
     }
 
-    private static boolean isInCacheRange(int value) {
+    private static boolean isInCacheRange(long value) {
         return value <= CACHE_OFFSET - 1 && value >= -CACHE_OFFSET;
     }
 
-    private static RubyFixnum cachedFixnum(Ruby runtime, int value) {
+    private static RubyFixnum cachedFixnum(Ruby runtime, long value) {
         // This truncates to int but we determine above that it's in cache range
-        return runtime.fixnumCache[value + CACHE_OFFSET];
-    }
-
-    @Deprecated(since = "9.2.1.0") // not used
-    public final RubyFixnum newFixnum(long newValue) {
-        return newFixnum(getCurrentContext().runtime, newValue);
+        return runtime.fixnumCache[(int) value + CACHE_OFFSET];
     }
 
     public static RubyFixnum zero(Ruby runtime) {
@@ -550,17 +738,6 @@ private RubyString longToString(ThreadContext context, long value, int base) {
                 newString(context, ConvertBytes.longToByteList(value, base), USASCIIEncoding.INSTANCE);
     }
 
-    /** fix_to_sym
-     *
-     */
-    @Deprecated(since = "9.0.0.0")
-    public IRubyObject to_sym() {
-        var context = getCurrentContext();
-        RubySymbol symbol = RubySymbol.getSymbolLong(context.runtime, getValue());
-
-        return symbol != null ? symbol : context.nil;
-    }
-
     /** fix_uminus
      *
      */
@@ -798,14 +975,6 @@ public IRubyObject pred(ThreadContext context) {
         return op_minus_one(context);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject idiv(ThreadContext context, IRubyObject other, String method) {
-        if (other instanceof RubyFixnum) {
-            return idivLong(context, getValue(), ((RubyFixnum) other).getValue());
-        }
-        return coerceBin(context, method, other);
-    }
-
     public IRubyObject idiv(ThreadContext context, IRubyObject other, CallSite site) {
         if (other instanceof RubyFixnum) {
             return idivLong(context, getValue(), ((RubyFixnum) other).getValue());
@@ -813,13 +982,6 @@ public IRubyObject idiv(ThreadContext context, IRubyObject other, CallSite site)
         return coerceBin(context, site, other);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject idiv(ThreadContext context, long y, String method) {
-        long x = getValue();
-
-        return idivLong(context, x, y);
-    }
-
     private RubyInteger idivLong(ThreadContext context, long x, long y) {
         if (y == 0) throw context.runtime.newZeroDivisionError();
 
@@ -1025,11 +1187,6 @@ protected IRubyObject intPowTmp1(ThreadContext context, RubyInteger y, long mm,
         return asFixnum(context, tmp);
     }
 
-    @Deprecated(since = "9.2.7.0")
-    protected IRubyObject intPowTmp2(ThreadContext context, IRubyObject y, final long mm, boolean negaFlg) {
-        return intPowTmp2(context, (RubyInteger) y, mm, negaFlg);
-    }
-
     // MRI: int_pow_tmp2
     IRubyObject intPowTmp2(ThreadContext context, RubyInteger y, final long mm, boolean negaFlg) {
         long tmp = 1L;
@@ -1401,11 +1558,6 @@ private RubyInteger lshift(ThreadContext context, final long width) {
         return asFixnum(context, getValue() << width);
     }
 
-    @Deprecated(since = "9.2.0.0") // no longer used
-    public IRubyObject op_lshift(long width) {
-        return op_lshift(getCurrentContext(), width);
-    }
-
     /** fix_rshift
      *
      */
@@ -1429,11 +1581,6 @@ private RubyFixnum rshift(ThreadContext context, final long width) {
                 asFixnum(context, getValue() >> width);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_rshift(long width) {
-        return op_rshift(getCurrentContext(), width);
-    }
-
     /** fix_to_f
      *
      */
@@ -1456,11 +1603,6 @@ public IRubyObject size(ThreadContext context) {
         return asFixnum(context, (long) ((BIT_SIZE + 7) / 8));
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject zero_p() {
-        return zero_p(getCurrentContext());
-    }
-
     /** fix_zero_p
      *
      */
@@ -1607,7 +1749,7 @@ public IRubyObject remainder(ThreadContext context, IRubyObject y) {
     // MRI: rb_int_s_isqrt, Fixnum portion
     @Override
     public IRubyObject sqrt(ThreadContext context) {
-        if (isNegativeNumber(context)) throw context.runtime.newMathDomainError("Numerical argument is out of domain - isqrt");
+        if (isNegativeNumber(context)) throw context.runtime.newMathDomainError("isqrt");
 
         return asFixnum(context, floorSqrt(getValue()));
     }
@@ -1626,11 +1768,6 @@ private static JavaSites.FixnumSites sites(ThreadContext context) {
         return context.sites.Fixnum;
     }
 
-    @Deprecated(since = "9.1.3.0")
-    public static IRubyObject induced_from(IRubyObject recv, IRubyObject other) {
-        return RubyNumeric.num2fix(recv.getRuntime().getCurrentContext(), other);
-    }
-
     @Deprecated(since = "9.4.0.0")
     @Override
     public IRubyObject taint(ThreadContext context) {
diff --git a/core/src/main/java/org/jruby/RubyFloat.java b/core/src/main/java/org/jruby/RubyFloat.java
index 4d7ba2974a6..83632ad371d 100644
--- a/core/src/main/java/org/jruby/RubyFloat.java
+++ b/core/src/main/java/org/jruby/RubyFloat.java
@@ -252,19 +252,6 @@ public static RubyFloat newFloat(Ruby runtime, double value) {
      *  ================
      */
 
-    /** rb_flo_induced_from
-     *
-     */
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject induced_from(ThreadContext context, IRubyObject recv, IRubyObject number) {
-        if (number instanceof RubyFixnum || number instanceof RubyBignum || number instanceof RubyRational) {
-            return number.callMethod(context, "to_f");
-        }
-
-        if (!(number instanceof RubyFloat)) throw typeError(context, "failed to convert ", number, " into Float");
-        return number;
-    }
-
     /** flo_to_s
      *
      */
@@ -295,11 +282,6 @@ public IRubyObject op_uminus(ThreadContext context) {
         return asFloat(context, -value);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_uminus() {
-        return op_uminus(getCurrentContext());
-    }
-
     /** flo_plus
      *
      */
@@ -1327,28 +1309,9 @@ public void appendIntoString(RubyString target) {
         target.catWithCodeRange((RubyString) to_s(getRuntime().getCurrentContext()));
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject zero_p() {
-        return zero_p(getCurrentContext());
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject floor(ThreadContext context, IRubyObject[] args) {
-        return switch (args.length) {
-            case 0 -> floor(context);
-            case 1 -> floor(context, args[0]);
-            default -> throw argumentError(context, args.length, 1);
-        };
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject round(ThreadContext context, IRubyObject[] args) {
-        return switch (args.length) {
-            case 0 -> round(context);
-            case 1 -> round(context, args[0]);
-            case 2 -> round(context, args[0], args[1]);
-            default -> throw argumentError(context, args.length, 2);
-        };
+    @Override
+    public boolean isImmediate() {
+        return true;
     }
 
     private static FloatSites sites(ThreadContext context) {
diff --git a/core/src/main/java/org/jruby/RubyGlobal.java b/core/src/main/java/org/jruby/RubyGlobal.java
index 04f1ebcc7a6..a5d51513e2e 100644
--- a/core/src/main/java/org/jruby/RubyGlobal.java
+++ b/core/src/main/java/org/jruby/RubyGlobal.java
@@ -44,6 +44,7 @@
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.api.Create;
+import org.jruby.api.Define;
 import org.jruby.ast.util.ArgsUtil;
 import org.jruby.common.IRubyWarnings;
 import org.jruby.exceptions.RaiseException;
@@ -155,6 +156,9 @@ public static RubyHash createGlobalsAndENV(ThreadContext context, GlobalVariable
         // initially set to config's script name, if any
         defineArgv0Global(context, globals, instanceConfig.displayedFileName());
 
+        // Ruby module contains general Ruby constants
+        RubyModule Ruby = Define.defineModule(context, "Ruby");
+
         // Version information:
         IRubyObject release = RubyString.newFString(runtime, Constants.COMPILE_DATE);
         IRubyObject platform = RubyString.newFString(runtime, Constants.PLATFORM);
@@ -162,38 +166,42 @@ public static RubyHash createGlobalsAndENV(ThreadContext context, GlobalVariable
         IRubyObject version = RubyString.newFString(runtime, Constants.RUBY_VERSION);
         IRubyObject patchlevel = asFixnum(context, 0);
 
-        Object.defineConstant(context, "RUBY_VERSION", version);
-        Object.defineConstant(context, "RUBY_PATCHLEVEL", patchlevel);
-        Object.defineConstant(context, "RUBY_RELEASE_DATE", release);
-        Object.defineConstant(context, "RUBY_PLATFORM", platform);
+        defineRubyConstant(context, Object, Ruby, "VERSION", version);
+        defineRubyConstant(context, Object, Ruby, "PATCHLEVEL", patchlevel);
+        defineRubyConstant(context, Object, Ruby, "RELEASE_DATE", release);
+        defineRubyConstant(context, Object, Ruby, "PLATFORM", platform);
 
         IRubyObject description = RubyString.newFString(runtime, OutputStrings.getVersionString(instanceConfig));
-        Object.defineConstant(context, "RUBY_DESCRIPTION", description);
+        defineRubyConstant(context, Object, Ruby, "DESCRIPTION", description);
 
         IRubyObject copyright = RubyString.newFString(runtime, OutputStrings.getCopyrightString());
-        Object.defineConstant(context, "RUBY_COPYRIGHT", copyright);
+        defineRubyConstant(context, Object, Ruby, "COPYRIGHT", copyright);
 
         Object.defineConstant(context, "RELEASE_DATE", release);
         Object.defineConstant(context, "PLATFORM", platform);
 
         IRubyObject jrubyVersion = RubyString.newFString(runtime, Constants.VERSION);
-        IRubyObject jrubyRevision = RubyString.newFString(runtime, Constants.REVISION);
+        RubyString revision = RubyString.newFString(runtime, Constants.REVISION);
+        IRubyObject jrubyRevision = revision;
+
         Object.defineConstant(context, "JRUBY_VERSION", jrubyVersion);
         Object.defineConstant(context, "JRUBY_REVISION", jrubyRevision);
-        Object.defineConstant(context, "RUBY_REVISION", RubyString.newFString(runtime, Constants.REVISION));
-        Object.defineConstant(context, "RUBY_ENGINE", engine);
-        Object.defineConstant(context, "RUBY_ENGINE_VERSION", jrubyVersion);
+
+        defineRubyConstant(context, Object, Ruby, "REVISION", revision);
+        defineRubyConstant(context, Object, Ruby, "ENGINE", engine);
+        defineRubyConstant(context, Object, Ruby, "ENGINE_VERSION", jrubyVersion);
 
         RubyInstanceConfig.Verbosity verbosity = instanceConfig.getVerbosity();
         runtime.defineVariable(new WarningGlobalVariable(context, "$-W", verbosity), GLOBAL);
 
-        IRubyObject defaultRS = RubyString.newFString(runtime, instanceConfig.getRecordSeparator());
-        GlobalVariable rs = new StringGlobalVariable(runtime, "$/", defaultRS);
+        IRubyObject defaultRS = RubyString.newFString(runtime, "\n");
+        IRubyObject configRS = RubyString.newFString(runtime, instanceConfig.getRecordSeparator());
+        GlobalVariable rs = new DeprecatedFrozenStringGlobalVariable(runtime, "$/", configRS);
         runtime.defineVariable(rs, GLOBAL);
         runtime.setRecordSeparatorVar(rs);
         globals.setDefaultSeparator(defaultRS);
-        runtime.defineVariable(new StringGlobalVariable(runtime, "$\\", context.nil), GLOBAL);
-        runtime.defineVariable(new DeprecatedStringGlobalVariable(runtime, "$,", context.nil), GLOBAL);
+        runtime.defineVariable(new DeprecatedStringGlobalVariable(runtime, "$\\", context.nil), GLOBAL);
+        runtime.defineVariable(new DeprecatedFrozenStringGlobalVariable(runtime, "$,", context.nil), GLOBAL);
 
         runtime.defineVariable(new LineNumberGlobalVariable(runtime, "$."), GLOBAL);
         runtime.defineVariable(new LastlineGlobalVariable(runtime, "$_"), FRAME);
@@ -299,6 +307,11 @@ public static RubyHash createGlobalsAndENV(ThreadContext context, GlobalVariable
         return env;
     }
 
+    private static void defineRubyConstant(ThreadContext context, RubyClass Object, RubyModule Ruby, String name, IRubyObject value) {
+        Object.defineConstant(context, "RUBY_" + name, value);
+        Ruby.defineConstant(context, name, value);
+    }
+
     static void defineArgv0Global(ThreadContext context, GlobalVariables globals, String scriptName) {
         IAccessor d = new IAccessor() {
             RubyString value = newFrozenString(context, scriptName);
@@ -451,8 +464,8 @@ private static RubyHash defineGlobalEnvConstants(ThreadContext context) {
         return env;
     }
 
-    private static void warnDeprecatedGlobal(ThreadContext context, final String name) {
-        warnDeprecated(context, "'" + name + "' is deprecated");
+    private static void warnDeprecatedGlobal(ThreadContext context, final String subject) {
+        warnDeprecated(context, subject + " is deprecated");
     }
 
     /**
@@ -532,7 +545,7 @@ public IRubyObject delete(ThreadContext context, IRubyObject key, Block block) {
         public IRubyObject each(final ThreadContext context, final Block block) {
             if (!block.isGiven()) return super.each(context, block);
 
-            RubyArray ary = new RubyArray(context.runtime, size());
+            RubyArray ary = RubyArray.newArray(context.runtime, size());
 
             visitAll(context, EachVisitor, ary);
 
@@ -562,7 +575,7 @@ public RubyBoolean has_key_p(ThreadContext context, IRubyObject key) {
             
             EnvStringValidation.ensureValidEnvString(context, key, "key");
 
-            return internalGetEntry(expected) == NO_ENTRY ? context.fals : context.tru;
+            return !hasKey(expected) ? context.fals : context.tru;
         }
 
         @JRubyMethod(name = {"has_value?", "value?"})
@@ -584,7 +597,7 @@ public IRubyObject index(ThreadContext context, IRubyObject expected) {
         @JRubyMethod(name = "keys")
         public RubyArray keys(final ThreadContext context) {
             try {
-                RubyArray keys = RubyArray.newBlankArrayInternal(context.runtime, size());
+                RubyArray keys = RubyArrayNative.newBlankArrayInternal(context.runtime, size());
 
                 visitAll(context, StoreKeyVisitor, keys);
 
@@ -669,11 +682,6 @@ public RubyString to_s(ThreadContext context) {
             return newSharedString(context, ENV);
         }
 
-        @Deprecated(since = "9.3.0.0")
-        public RubyHash to_h() {
-            return to_h(getCurrentContext(), Block.NULL_BLOCK);
-        }
-
         @JRubyMethod
         public RubyHash to_h(ThreadContext context, Block block){
             RubyHash h = to_hash(context);
@@ -729,7 +737,7 @@ protected void appendAssociation(boolean keyIsSymbol, ByteList bytes) {
      * On all platforms, the keys are case-sensitive.
      * Used for ENV_JAVA.
      */
-    public static class StringOnlyRubyHash extends RubyHash {
+    public static class StringOnlyRubyHash extends RubyHashLinkedBuckets {
         // This is an ugly hack.  Windows ENV map processing all happens in this
         // class and not in the caseinsensitive hash.  In order to not refactor
         // both of these maps we will pass in a flag to specify whether we want
@@ -1061,12 +1069,37 @@ public DeprecatedStringGlobalVariable(Ruby runtime, String name, IRubyObject val
         public IRubyObject set(IRubyObject value) {
             IRubyObject result = super.set(value);
 
-            if (!value.isNil()) warnDeprecatedGlobal(runtime.getCurrentContext(), name);
+            if (!value.isNil()) warnDeprecatedGlobal(runtime.getCurrentContext(), "non-nil '" + name + "'");
 
             return result;
         }
     }
 
+    public static class DeprecatedFrozenStringGlobalVariable extends StringGlobalVariable {
+        public DeprecatedFrozenStringGlobalVariable(Ruby runtime, String name, IRubyObject value) {
+            super(runtime, name, value);
+        }
+
+        @Override
+        public IRubyObject set(IRubyObject value) {
+            ThreadContext currentContext = runtime.getCurrentContext();
+            IRubyObject setValue = value;
+            if (setValue instanceof RubyString stringValue) {
+                if (!stringValue.isBare(currentContext) || !stringValue.isFrozen()) {
+                    stringValue = newSharedString(currentContext, stringValue.getByteList());
+                    stringValue.setFrozen(true);
+                }
+                setValue = stringValue;
+            }
+
+            super.set(setValue);
+
+            if (!value.isNil()) warnDeprecatedGlobal(currentContext, "non-nil '" + name + "'");
+
+            return value;
+        }
+    }
+
     public static class DeprecatedStringOrRegexpGlobalVariable extends StringOrRegexpGlobalVariable {
         public DeprecatedStringOrRegexpGlobalVariable(Ruby runtime, String name, IRubyObject value) {
             super(runtime, name, value);
@@ -1076,7 +1109,7 @@ public DeprecatedStringOrRegexpGlobalVariable(Ruby runtime, String name, IRubyOb
         public IRubyObject set(IRubyObject value) {
             IRubyObject result = super.set(value);
 
-            if (!result.isNil()) warnDeprecatedGlobal(runtime.getCurrentContext(), name);
+            if (!value.isNil()) warnDeprecatedGlobal(runtime.getCurrentContext(), "non-nil '" + name + "'");
 
             return result;
         }
diff --git a/core/src/main/java/org/jruby/RubyHash.java b/core/src/main/java/org/jruby/RubyHash.java
index 2f358a34090..08e9bd10909 100644
--- a/core/src/main/java/org/jruby/RubyHash.java
+++ b/core/src/main/java/org/jruby/RubyHash.java
@@ -39,63 +39,31 @@
 
 package org.jruby;
 
-import com.headius.backport9.buffer.Buffers;
-import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.api.Create;
 import org.jruby.api.Error;
-import org.jruby.ast.util.ArgsUtil;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.ir.runtime.IRBreakJump;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.Builtins;
-import org.jruby.runtime.CallBlock19;
 import org.jruby.runtime.ClassIndex;
-import org.jruby.runtime.Helpers;
-import org.jruby.runtime.JavaSites.HashSites;
-import org.jruby.runtime.Signature;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.callsite.CachingCallSite;
 import org.jruby.runtime.marshal.MarshalDumper;
 import org.jruby.runtime.marshal.MarshalLoader;
-import org.jruby.util.ByteList;
-import org.jruby.util.RecursiveComparator;
 import org.jruby.util.TypeConverter;
 import org.jruby.util.io.RubyInputStream;
 import org.jruby.util.io.RubyOutputStream;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.AbstractCollection;
-import java.util.AbstractSet;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
-import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
-import static org.jruby.RubyEnumerator.SizeFn;
 import static org.jruby.api.Access.arrayClass;
 import static org.jruby.api.Access.hashClass;
 import static org.jruby.api.Convert.asBoolean;
-import static org.jruby.api.Convert.asFixnum;
-import static org.jruby.api.Create.newArray;
-import static org.jruby.api.Create.newSharedString;
 import static org.jruby.api.Define.defineClass;
 import static org.jruby.api.Error.*;
-import static org.jruby.api.Warn.warn;
-import static org.jruby.runtime.ThreadContext.hasKeywords;
-import static org.jruby.runtime.ThreadContext.resetCallInfo;
 import static org.jruby.runtime.Visibility.PRIVATE;
-import static org.jruby.util.Inspector.*;
 
 // Design overview:
 //
@@ -133,25 +101,29 @@
  *  all users must synchronize externally with writers.
  *
  */
-@JRubyClass(name = "Hash", include="Enumerable")
+@JRubyClass(name = "Hash", include="Enumerable",
+        overrides = {RubyHashLinkedBuckets.class})
 public class RubyHash extends RubyObject implements Map {
     public static final int DEFAULT_INSPECT_STR_SIZE = 20;
 
-    private byte hashFlags;
+    /**
+     * This field is used as part of the state of RubyHashLinkedBuckets, but when supporting legacy constructors it will
+     * point at a delegated instance. Once all consumers of the deprecated constructor have been migrated, we move this
+     * field back into the subclasses and eliminate all delegated methods.
+     */
+    protected Object state;
 
-    private static final byte COMPARE_BY_IDENTITY = 0b00000001;
-    private static final byte RUBY2_KEYWORD = 0b00000010;
-    private static final byte PROCDEFAULT_HASH = 0b00000100;
+    protected static final byte COMPARE_BY_IDENTITY = 0b00000001;
+    protected static final byte RUBY2_KEYWORD = 0b00000010;
+    protected static final byte PROCDEFAULT_HASH = 0b00000100;
+
+    protected static final RubyHashEntry NULL_ENTRY = new RubyHashEntry();
 
     @Deprecated(since = "10.0.3.0")
-    public static final int COMPARE_BY_IDENTITY_F = COMPARE_BY_IDENTITY;
-    @Deprecated(since = "10.0.3.0")
-    public static final int RUBY2_KEYWORD_F = RUBY2_KEYWORD;
-    @Deprecated(since = "10.0.3.0")
-    private static final int PROCDEFAULT_HASH_F = PROCDEFAULT_HASH;
+    public static final RubyHashEntry NO_ENTRY = NULL_ENTRY;
 
     public static RubyClass createHashClass(ThreadContext context, RubyClass Object, RubyModule Enumerable) {
-        return defineClass(context, "Hash", Object, RubyHash::new).
+        return defineClass(context, "Hash", Object, (runtime, klass) -> new RubyHashLinkedBuckets(runtime, klass)).
                 reifiedClass(RubyHash.class).
                 kindOf(new RubyModule.JavaClassKindOf(RubyHash.class)).
                 classIndex(ClassIndex.HASH).
@@ -171,7 +143,7 @@ public ClassIndex getNativeClassIndex() {
     public static IRubyObject create(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
         if (args.length == 1) {
             IRubyObject tmp = TypeConverter.convertToTypeWithCheck(args[0], hashClass(context), "to_hash");
-            if (!tmp.isNil()) return new RubyHash(context.runtime, (RubyClass) recv, (RubyHash) tmp);
+            if (!tmp.isNil()) return new RubyHashLinkedBuckets(context.runtime, (RubyClass) recv, (RubyHash) tmp);
 
             var Array = arrayClass(context);
             final IRubyObject nil = context.nil;
@@ -218,14 +190,14 @@ public static IRubyObject try_convert(ThreadContext context, IRubyObject recv, I
      *
      */
     public static final RubyHash newHash(Ruby runtime) {
-        return new RubyHash(runtime);
+        return RubyHashLinkedBuckets.newLBHash(runtime);
     }
 
     /** rb_hash_new
      *
      */
     public static final RubyHash newSmallHash(Ruby runtime) {
-        return new RubyHash(runtime, 1);
+        return RubyHashLinkedBuckets.newLBHash(runtime, 1);
     }
 
     public static RubyHash newKwargs(Ruby runtime, String key, IRubyObject value) {
@@ -244,99 +216,51 @@ public static RubyHash newHash(Ruby runtime, IRubyObject key, IRubyObject value)
     public static final RubyHash newHash(Ruby runtime, Map valueMap, IRubyObject defaultValue) {
         assert defaultValue != null;
 
-        return new RubyHash(runtime, valueMap, defaultValue);
+        return new RubyHashLinkedBuckets(runtime, valueMap, defaultValue);
     }
 
-    private RubyHashEntry[] table;
-    protected int size = 0;
-    private int threshold;
-
-    private IRubyObject ifNone;
-
-    private RubyHash(Ruby runtime, RubyClass klass, RubyHash other) {
-        super(runtime, klass);
-        this.ifNone = UNDEF;
-        copyFrom(this, other, false);
-    }
+    // Only constructor that does not delegate
+    protected RubyHash(Ruby runtime, RubyClass klass, boolean objectSpace, int unused) {
+        super(runtime, klass, objectSpace);
 
-    private static void copyFrom(RubyHash self, RubyHash other, boolean identity) {
-        self.threshold = other.threshold;
-        self.table = other.internalCopyTable(self.head);
-        self.size = other.size();
-        self.setComparedByIdentity(identity);
+        // ensure only subclasses call this constructor
+        assert this.getClass() != RubyHash.class;
     }
 
+    // Delegated constructor, to be hidden and returned to normal super constructor once no longer in use
+    @Deprecated(since = "10.0.3.0")
     public RubyHash(Ruby runtime, RubyClass klass) {
         super(runtime, klass);
-        this.ifNone = UNDEF;
-        allocFirst();
+        // ensure no subclasses call this constructor
+        assert getClass() == RubyHash.class;
+        setDelegate(this);
     }
 
-    public RubyHash(Ruby runtime, int buckets) {
-        this(runtime, UNDEF, buckets);
+    // Delegated constructor, to be hidden and returned to normal super constructor once no longer in use
+    @Deprecated(since = "10.0.3.0")
+    public RubyHash(Ruby runtime, RubyClass klass, boolean objectSpace) {
+        super(runtime, klass, objectSpace);
+        // ensure no subclasses call this constructor
+        assert getClass() == RubyHash.class;
+        this.setDelegate(new RubyHashLinkedBuckets(runtime, klass, objectSpace));
     }
 
+    // Delegated constructor, to be hidden and returned to normal super constructor once no longer in use
+    @Deprecated(since = "10.0.3.0")
     public RubyHash(Ruby runtime) {
-        this(runtime, UNDEF);
-    }
-
-    public RubyHash(Ruby runtime, IRubyObject defaultValue) {
         super(runtime, runtime.getHash());
-        this.ifNone = defaultValue;
-        allocFirst();
-    }
-
-    public RubyHash(Ruby runtime, IRubyObject defaultValue, int buckets) {
-        this(runtime, buckets, true);
-        this.ifNone = defaultValue;
-    }
-
-    protected RubyHash(Ruby runtime, RubyClass metaClass, IRubyObject defaultValue, RubyHashEntry[] initialTable, int threshold) {
-        super(runtime, metaClass);
-        this.ifNone = defaultValue;
-        this.threshold = threshold;
-        this.table = initialTable;
-    }
-
-    /*
-     *  Constructor for internal usage (mainly for Array#|, Array#&, Array#- and Array#uniq)
-     *  it doesn't initialize ifNone field
-     */
-    RubyHash(Ruby runtime, int buckets, boolean objectSpace) {
-        super(runtime, runtime.getHash(), objectSpace);
-        // FIXME: current hash implementation cannot deal with no buckets so we will add a single one
-        //  (this constructor will go away once open addressing is added back ???)
-        if (buckets <= 0) buckets = 1;
-        allocFirst(buckets);
+        // ensure no subclasses call this constructor
+        assert getClass() == RubyHash.class;
+        this.setDelegate(RubyHashLinkedBuckets.newLBHash(runtime));
     }
 
-    // TODO should this be deprecated ? (to be efficient, internals should deal with RubyHash directly)
-    public RubyHash(Ruby runtime, Map valueMap, IRubyObject defaultValue) {
+    // Delegated constructor, to be hidden and returned to normal super constructor once no longer in use
+    @Deprecated(since = "10.0.3.0")
+    public RubyHash(Ruby runtime, IRubyObject defaultValue) {
         super(runtime, runtime.getHash());
-        this.ifNone = defaultValue;
-        allocFirst();
-
-        for (Iterator iter = valueMap.entrySet().iterator();iter.hasNext();) {
-            Map.Entry e = (Map.Entry)iter.next();
-            internalPut((IRubyObject)e.getKey(), (IRubyObject)e.getValue());
-        }
-    }
-
-    private final void allocFirst() {
-        threshold = INITIAL_THRESHOLD;
-        table = new RubyHashEntry[MRI_HASH_RESIZE ? MRI_INITIAL_CAPACITY : JAVASOFT_INITIAL_CAPACITY];
-    }
-
-    private final void allocFirst(int buckets) {
-        if (buckets <= 0) throw new ArrayIndexOutOfBoundsException("invalid bucket size: " + buckets);
-        threshold = INITIAL_THRESHOLD;
-        table = new RubyHashEntry[buckets];
-    }
-
-    private final void alloc() {
-        generation++;
-        head.prevAdded = head.nextAdded = head;
-        allocFirst();
+        // ensure no subclasses call this constructor
+        assert getClass() == RubyHash.class;
+        this.setDelegate(RubyHashLinkedBuckets.newLBHash(runtime, defaultValue));
     }
 
     /* ============================
@@ -345,6 +269,7 @@ private final void alloc() {
      * ============================
      */
 
+    @Deprecated(since = "10.0.3.0")
     public static final int MRI_PRIMES[] = {
         8 + 3, 16 + 3, 32 + 5, 64 + 3, 128 + 3, 256 + 27, 512 + 9, 1024 + 9, 2048 + 5, 4096 + 3,
         8192 + 27, 16384 + 43, 32768 + 3, 65536 + 45, 131072 + 29, 262144 + 3, 524288 + 21, 1048576 + 7,
@@ -352,24 +277,48 @@ private final void alloc() {
         134217728 + 29, 268435456 + 3, 536870912 + 11, 1073741824 + 85, 0
     };
 
-    private static final int JAVASOFT_INITIAL_CAPACITY = 8; // 16 ?
-    private static final int MRI_INITIAL_CAPACITY = MRI_PRIMES[0];
+    private RubyHash getDelegate() {
+        return (RubyHash) state;
+    }
+
+    private void setDelegate(RubyHash state) {
+        this.state = state;
+    }
+
+    public static class RubyHashEntryLink {
+        RubyHash.RubyHashEntryLink prevAdded;
+        RubyHash.RubyHashEntryLink nextAdded;
+
+        int hash() {
+            // should never be called
+            throw new RuntimeException("hash() should never be called on RubyHashEntryLink");
+        }
+
+        public IRubyObject key() {
+            // should never be called
+            throw new RuntimeException("key() should never be called on RubyHashEntryLink");
+        }
 
-    private static final int INITIAL_THRESHOLD = JAVASOFT_INITIAL_CAPACITY - (JAVASOFT_INITIAL_CAPACITY >> 2);
-    private static final int MAXIMUM_CAPACITY = 1 << 30;
+        IRubyObject value() {
+            // should never be called
+            throw new RuntimeException("value() should never be called on RubyHashEntryLink");
+        }
 
-    public static final RubyHashEntry NO_ENTRY = new RubyHashEntry();
-    private int generation = 0; // generation count for O(1) clears
-    private final RubyHashEntry head = new RubyHashEntry();
+        IRubyObject value(IRubyObject value) {
+            // should never be called
+            throw new RuntimeException("value(IRubyObject) should never be called on RubyHashEntryLink");
+        }
 
-    { head.prevAdded = head.nextAdded = head; }
+        public boolean isLive() {
+            // should never be called
+            throw new RuntimeException("value() should never be called on RubyHashEntryLink");
+        }
+    }
 
-    public static final class RubyHashEntry implements Map.Entry {
-        final IRubyObject key;
-        IRubyObject value;
+    public static final class RubyHashEntry extends RubyHashEntryLink implements Map.Entry {
+        private final IRubyObject key;
+        private IRubyObject value;
         private RubyHashEntry next;
-        private RubyHashEntry prevAdded;
-        private RubyHashEntry nextAdded;
         private final int hash;
 
         RubyHashEntry() {
@@ -377,15 +326,15 @@ public static final class RubyHashEntry implements Map.Entry {
             hash = -1;
         }
 
-        public RubyHashEntry(int h, IRubyObject k, IRubyObject v, RubyHashEntry e, RubyHashEntry head) {
+        public RubyHashEntry(int h, IRubyObject k, IRubyObject v, RubyHashEntry e, RubyHashEntryLink head) {
             key = k;
-            value = v;
-            next = e;
+            value(v);
+            next(e);
             hash = h;
 
             if (head != null) {
-                RubyHashEntry prevAdded = head.prevAdded;
-                RubyHashEntry nextAdded = head;
+                RubyHashEntryLink prevAdded = head.prevAdded;
+                RubyHashEntryLink nextAdded = head;
 
                 this.prevAdded = prevAdded;
                 prevAdded.nextAdded = this;
@@ -397,16 +346,16 @@ public RubyHashEntry(int h, IRubyObject k, IRubyObject v, RubyHashEntry e, RubyH
 
         public RubyHashEntry(RubyHashEntry oldEntry, int newHash) {
             this.hash = newHash;
-            this.key = oldEntry.key;
-            this.value = oldEntry.value;
-            this.next = oldEntry.next;
+            this.key = oldEntry.key();
+            this.value(oldEntry.value());
+            this.next(oldEntry.next());
 
             // prevAdded is never null
-            RubyHashEntry prevAdded = oldEntry.prevAdded;
+            RubyHashEntryLink prevAdded = oldEntry.prevAdded;
             this.prevAdded = prevAdded;
             prevAdded.nextAdded = this;
 
-            RubyHashEntry nextAdded = oldEntry.nextAdded;
+            RubyHashEntryLink nextAdded = oldEntry.nextAdded;
             if (nextAdded != null) {
                 this.nextAdded = nextAdded;
                 nextAdded.prevAdded = this;
@@ -427,25 +376,19 @@ public boolean isLive() {
 
         @Override
         public Object getKey() {
-            return key;
-        }
-        public Object getJavaifiedKey(){
-            return key.toJava(Object.class);
+            return key();
         }
 
         @Override
         public Object getValue() {
-            return value;
-        }
-        public Object getJavaifiedValue() {
-            return value.toJava(Object.class);
+            return value();
         }
 
         @Override
         public Object setValue(Object value) {
-            IRubyObject oldValue = this.value;
+            IRubyObject oldValue = this.value();
             if (value instanceof IRubyObject) {
-                this.value = (IRubyObject)value;
+                this.value((IRubyObject)value);
             } else {
                 throw new UnsupportedOperationException("directEntrySet() doesn't support setValue for non IRubyObject instance entries, convert them manually or use entrySet() instead");
             }
@@ -457,262 +400,70 @@ public boolean equals(Object other){
             if(!(other instanceof RubyHashEntry)) return false;
             RubyHashEntry otherEntry = (RubyHashEntry)other;
 
-            return (key == otherEntry.key || key.eql(otherEntry.key)) &&
-                    (value == otherEntry.value || value.equals(otherEntry.value));
+            return (key() == otherEntry.key() || key().eql(otherEntry.key())) &&
+                    (value() == otherEntry.value() || value().equals(otherEntry.value()));
         }
 
         @Override
         public int hashCode(){
-            return key.hashCode() ^ value.hashCode();
+            return key().hashCode() ^ value().hashCode();
         }
-    }
-
-    private static int JavaSoftHashValue(int h) {
-        h ^= (h >>> 20) ^ (h >>> 12);
-        return h ^ (h >>> 7) ^ (h >>> 4);
-    }
-
-    private static int JavaSoftBucketIndex(final int h, final int length) {
-        return h & (length - 1);
-    }
-
-    private static int MRIHashValue(int h) {
-        return h & HASH_SIGN_BIT_MASK;
-    }
-
-    private static final int HASH_SIGN_BIT_MASK = ~(1 << 31);
-    private static int MRIBucketIndex(final int h, final int length) {
-        return ((h & HASH_SIGN_BIT_MASK) % length);
-    }
 
-    private final synchronized void resize(int newCapacity) {
-        final RubyHashEntry[] oldTable = table;
-        final RubyHashEntry[] newTable = new RubyHashEntry[newCapacity];
-
-        for (int j = 0; j < oldTable.length; j++) {
-            RubyHashEntry entry = oldTable[j];
-            oldTable[j] = null;
-
-            while (entry != null) {
-                RubyHashEntry next = entry.next;
-                int i = bucketIndex(entry.hash, newCapacity);
-                entry.next = newTable[i];
-                newTable[i] = entry;
-                entry = next;
-            }
+        public IRubyObject key() {
+            return key;
         }
 
-        table = newTable;
-    }
-
-    private final void JavaSoftCheckResize() {
-        if (overThreshold()) {
-            RubyHashEntry[] tbl = table;
-            if (tbl.length == MAXIMUM_CAPACITY) {
-                threshold = Integer.MAX_VALUE;
-                return;
-            }
-            resizeAndAdjustThreshold(table);
+        IRubyObject value() {
+            return value;
         }
-    }
-
-    private boolean overThreshold() {
-        return size > threshold;
-    }
-
-    private void resizeAndAdjustThreshold(RubyHashEntry[] oldTable) {
-        int newCapacity = oldTable.length << 1;
-        resize(newCapacity);
-        threshold = newCapacity - (newCapacity >> 2);
-    }
 
-    private static final int MIN_CAPA = 8;
-    private static final int ST_DEFAULT_MAX_DENSITY = 2;
-    private final void MRICheckResize() {
-        if (size / table.length > ST_DEFAULT_MAX_DENSITY) {
-            int forSize = table.length + 1; // size + 1;
-            for (int i=0, newCapacity = MIN_CAPA; i < MRI_PRIMES.length; i++, newCapacity <<= 1) {
-                if (newCapacity > forSize) {
-                    resize(MRI_PRIMES[i]);
-                    return;
-                }
-            }
-            return; // suboptimal for large hashes (> 1073741824 + 85 entries) not very likely to happen
+        IRubyObject value(IRubyObject value) {
+            IRubyObject oldValue = this.value;
+            this.value = value;
+            return oldValue;
         }
-    }
-    // ------------------------------
-    private static final boolean MRI_HASH = true;
-    private static final boolean MRI_HASH_RESIZE = true;
-
-    protected final int hashValue(final IRubyObject key) {
-        final int h = isComparedByIdentity() ? System.identityHashCode(key) : key.hashCode();
-        return MRI_HASH ? MRIHashValue(h) : JavaSoftHashValue(h);
-    }
-
-    private static int bucketIndex(final int h, final int length) {
-        return MRI_HASH ? MRIBucketIndex(h, length) : JavaSoftBucketIndex(h, length);
-    }
-
-    private void checkResize() {
-        if (MRI_HASH_RESIZE) MRICheckResize(); else JavaSoftCheckResize();
-    }
 
-    protected final void checkIterating() {
-        if (iteratorCount > 0) {
-            throw metaClass.runtime.newRuntimeError("can't add a new key into hash during iteration");
+        RubyHashEntry next() {
+            return next;
         }
-    }
-
-    // put implementation
-
-    public IRubyObject internalPut(final IRubyObject key, final IRubyObject value) {
-        checkResize();
-        return internalPutNoResize(key, value, true);
-    }
-
-    private void internalPutSmall(final IRubyObject key, final IRubyObject value) {
-        internalPutNoResize(key, value, true);
-    }
-
-    private void internalPut(final IRubyObject key, final IRubyObject value, final boolean checkForExisting) {
-        checkResize();
-        internalPutNoResize(key, value, checkForExisting);
-    }
 
-    final boolean internalPutIfNoKey(final IRubyObject key, final IRubyObject value) {
-        if (internalGetEntry(key) == NO_ENTRY) {
-            internalPut(key, value);
-            return true;
+        void next(RubyHashEntry next) {
+            this.next = next;
         }
-        return false;
-    }
-
-    @Deprecated(since = "9.2.9.0") // no longer used
-    protected final IRubyObject internalJavaPut(final IRubyObject key, final IRubyObject value) {
-        checkResize();
-
-        return internalPutNoResize(key, value, true);
-    }
-
-    protected IRubyObject internalPutNoResize(final IRubyObject key, final IRubyObject value, final boolean checkForExisting) {
-        final int hash = hashValue(key);
-        final RubyHashEntry[] table = this.table;
 
-        final int i = bucketIndex(hash, table.length);
-
-        if (checkForExisting) {
-            for (RubyHashEntry entry = table[i]; entry != null; entry = entry.next) {
-                if (internalKeyExist(entry.hash, entry.key, hash, key)) {
-                    IRubyObject existing = entry.value;
-                    entry.value = value;
-
-                    return existing;
-                }
-            }
+        int hash() {
+            return hash;
         }
 
-        checkIterating();
-
-        table[i] = new RubyHashEntry(hash, key, value, table[i], head);
-        size++;
-
-        // no existing entry
-        return null;
-    }
-
-    // get implementation
-
-    protected IRubyObject internalGet(IRubyObject key) { // specialized for value
-        return internalGetEntry(key).value;
-    }
-
-    protected RubyHashEntry internalGetEntry(IRubyObject key) {
-        if (size == 0) return NO_ENTRY;
-
-        final int hash = hashValue(key);
-        final RubyHashEntry[] table = this.table;
-
-        for (RubyHashEntry entry = table[bucketIndex(hash, table.length)]; entry != null; entry = entry.next) {
-            if (internalKeyExist(entry.hash, entry.key, hash, key)) {
-                return entry;
-            }
+        @Deprecated(since = "10.1.1.0")
+        public Object getJavaifiedKey(){
+            return key.toJava(Object.class);
         }
-        return NO_ENTRY;
-    }
-
-    final RubyHashEntry getEntry(IRubyObject key) {
-        return internalGetEntry(key);
-    }
 
-    private boolean internalKeyExist(int entryHash, IRubyObject entryKey, int hash, IRubyObject key) {
-        return (entryHash == hash
-                && (entryKey == key || (!isComparedByIdentity() && key.eql(entryKey))));
+        @Deprecated(since = "10.1.1.0")
+        public Object getJavaifiedValue() {
+            return value.toJava(Object.class);
+        }
     }
 
-    // delete implementation
-
-
-    protected RubyHashEntry internalDelete(final IRubyObject key) {
-        if (size == 0) return NO_ENTRY;
-
-        return internalDelete(hashValue(key), MATCH_KEY, key);
-    }
+    // put implementation
 
-    protected RubyHashEntry internalDeleteEntry(final RubyHashEntry entry) {
-        // n.b. we need to recompute the hash in case the key object was modified
-        return internalDelete(hashValue(entry.key), MATCH_ENTRY, entry);
+    public IRubyObject internalPut(final IRubyObject key, final IRubyObject value) {
+        return getDelegate().internalPut(key, value);
     }
 
-    private final RubyHashEntry internalDelete(final int hash, final EntryMatchType matchType, final Object obj) {
-        final int i = bucketIndex(hash, table.length);
-
-        RubyHashEntry entry = table[i];
-        if (entry != null) {
-            RubyHashEntry prior = null;
-            for (; entry != null; prior = entry, entry = entry.next) {
-                if (entry.hash == hash && matchType.matches(entry, obj)) {
-                    if (prior != null) {
-                        prior.next = entry.next;
-                    } else {
-                        table[i] = entry.next;
-                    }
-                    entry.detach();
-                    size--;
-                    return entry;
-                }
-            }
-        }
-
-        return NO_ENTRY;
+    boolean internalPutIfNoKey(final IRubyObject key, final IRubyObject value) {
+        return getDelegate().internalPutIfNoKey(key, value);
     }
 
-    private static abstract class EntryMatchType {
-        public abstract boolean matches(final RubyHashEntry entry, final Object obj);
+    // get implementation
+    protected IRubyObject internalGet(IRubyObject key) {
+        return getDelegate().internalGet(key);
     }
 
-    private static final EntryMatchType MATCH_KEY = new EntryMatchType() {
-        @Override
-        public boolean matches(final RubyHashEntry entry, final Object obj) {
-            final IRubyObject key = entry.key;
-            return obj == key || (((IRubyObject)obj).eql(key));
-        }
-    };
-
-    private static final EntryMatchType MATCH_ENTRY = new EntryMatchType() {
-        @Override
-        public boolean matches(final RubyHashEntry entry, final Object obj) {
-            return entry.equals(obj);
-        }
-    };
-
-    private final RubyHashEntry[] internalCopyTable(RubyHashEntry destHead) {
-         RubyHashEntry[]newTable = new RubyHashEntry[table.length];
-
-         for (RubyHashEntry entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
-             int i = bucketIndex(entry.hash, table.length);
-             newTable[i] = new RubyHashEntry(entry.hash, entry.key, entry.value, newTable[i], destHead);
-         }
-         return newTable;
+    @Deprecated(since = "10.0.3.0")
+    RubyHashEntry getEntry(IRubyObject key) {
+        return getDelegate().getEntry(key);
     }
 
     public interface VisitorWithStateI {
@@ -727,73 +478,24 @@ public static abstract class Visitor extends VisitorWithState {
         public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Object state) {
             visit(key, value);
         }
+
         public abstract void visit(IRubyObject key, IRubyObject value);
     }
 
     public <T> void visitAll(ThreadContext context, VisitorWithStateI visitor) {
-        int startGeneration = generation;
-        long count = size;
-        int index = 0;
-        // visit not more than size entries
-        for (RubyHashEntry entry = head.nextAdded; entry != head && count != 0; entry = entry.nextAdded) {
-            if (startGeneration != generation) {
-                startGeneration = generation;
-                entry = head.nextAdded;
-                if (entry == head) break;
-            }
-            if (entry != null && entry.isLive()) {
-                visitor.visit(context, this, entry.key, entry.value, index++);
-                count--;
-            }
-        }
-        // it does not handle all concurrent modification cases,
-        // but at least provides correct marshal as we have exactly size entries visited (count == 0)
-        // or if count < 0 - skipped concurrent modification checks
-        if (count > 0) throw concurrentModification();
+        getDelegate().visitAll(context, visitor);
     }
 
     public <T> void visitAll(ThreadContext context, VisitorWithState visitor, T state) {
-        // use -1 to disable concurrency checks
-        visitLimited(context, visitor, -1, state);
-    }
-
-    private <T> void visitLimited(ThreadContext context, VisitorWithState visitor, long size, T state) {
-        int startGeneration = generation;
-        long count = size;
-        int index = 0;
-        // visit not more than size entries
-        for (RubyHashEntry entry = head.nextAdded; entry != head && count != 0; entry = entry.nextAdded) {
-            if (startGeneration != generation) {
-                startGeneration = generation;
-                entry = head.nextAdded;
-                if (entry == head) break;
-            }
-            if (entry != null && entry.isLive()) {
-                visitor.visit(context, this, entry.key, entry.value, index++, state);
-                count--;
-            }
-        }
-        // it does not handle all concurrent modification cases,
-        // but at least provides correct marshal as we have exactly size entries visited (count == 0)
-        // or if count < 0 - skipped concurrent modification checks
-        if (count > 0) throw concurrentModification();
+        this.getDelegate().visitAll(context, visitor, state);
+    }
+
+    protected <T> void visitLimited(ThreadContext context, RubyHash.VisitorWithState visitor, long size, T state) {
+        this.getDelegate().visitLimited(context, visitor, size, state);
     }
 
     public <T> boolean allSymbols() {
-        int startGeneration = generation;
-        // visit not more than size entries
-        RubyHashEntry head = this.head;
-        for (RubyHashEntry entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
-            if (startGeneration != generation) {
-                startGeneration = generation;
-                entry = head.nextAdded;
-                if (entry == head) break;
-            }
-            if (entry != null && entry.isLive()) {
-                if (!(entry.key instanceof RubySymbol)) return false;
-            }
-        }
-        return true;
+        return getDelegate().allSymbols();
     }
 
     /* ============================
@@ -806,1165 +508,318 @@ public <T> boolean allSymbols() {
      *  ================
      */
 
-    /** rb_hash_initialize
-     *
-     */
     @JRubyMethod(visibility = PRIVATE)
     public IRubyObject initialize(ThreadContext context, final Block block) {
-        modify();
-
-        if (block.isGiven()) {
-            ifNone = context.runtime.newProc(Block.Type.PROC, block);
-            hashFlags |= PROCDEFAULT_HASH;
-        } else {
-            ifNone = UNDEF;
-        }
-        return this;
+        return getDelegate().initialize(context, block);
     }
 
-    @JRubyMethod(visibility = PRIVATE)
+    @JRubyMethod(visibility = PRIVATE, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject _default, final Block block) {
-        boolean keywords = hasKeywords(resetCallInfo(context));
-        modify();
-
-        if (keywords) {
-            IRubyObject[] opts = ArgsUtil.extractKeywordArgs(context, (RubyHash) _default, "capacity");
-            // This will allocFirst twice since it already happened before initialize was called.  I think this is ok?
-            if (opts[0] instanceof RubyFixnum fixnum && fixnum.asInt(context) > 0) allocFirst(fixnum.asInt(context));
-
-            if (block.isGiven()) {
-                ifNone = context.runtime.newProc(Block.Type.PROC, block);
-                hashFlags |= PROCDEFAULT_HASH;
-            } else {
-                ifNone = UNDEF;
-            }
-        } else {
-            if (block.isGiven()) throw argumentError(context, 1, 0);
-
-            ifNone = _default;
-        }
-
-        return this;
+        return getDelegate().initialize(context, _default, block);
     }
 
     @JRubyMethod(visibility = PRIVATE, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject _default, IRubyObject hash, final Block block) {
-        if (!hasKeywords(resetCallInfo(context))) throw argumentError(context, 2, 0, 1);
-
-        IRubyObject[] opts = ArgsUtil.extractKeywordArgs(context, (RubyHash) hash, "capacity");
-
-        // This will allocFirst twice since it already happened before initialize was called.  I think this is ok?
-        if (opts[0] instanceof RubyFixnum fixnum && fixnum.asInt(context) > 0) allocFirst(fixnum.asInt(context));
-
-        modify();
-
-        if (block.isGiven()) throw argumentError(context, 1, 0);
-
-        ifNone = _default;
-
-        return this;
+        return getDelegate().initialize(context, _default, hash, block);
     }
 
     @JRubyMethod(name = "default")
     public IRubyObject default_value_get(ThreadContext context) {
-        if ((hashFlags & PROCDEFAULT_HASH) != 0) {
-            return context.nil;
-        }
-        return ifNone == UNDEF ? context.nil : ifNone;
+        return getDelegate().default_value_get(context);
     }
 
     @JRubyMethod(name = "default")
     public IRubyObject default_value_get(ThreadContext context, IRubyObject arg) {
-        if ((hashFlags & PROCDEFAULT_HASH) != 0) {
-            return sites(context).call.call(context, ifNone, ifNone, this, arg);
-        }
-        return ifNone == UNDEF ? context.nil : ifNone;
+        return getDelegate().default_value_get(context, arg);
     }
 
-    /** rb_hash_set_default
-     *
-     */
     @JRubyMethod(name = "default=")
     public IRubyObject default_value_set(ThreadContext context, final IRubyObject defaultValue) {
-        modify();
-
-        ifNone = defaultValue;
-        hashFlags &= ~PROCDEFAULT_HASH;
-
-        return ifNone;
+        return getDelegate().default_value_set(context, defaultValue);
     }
 
-    /** rb_hash_default_proc
-     *
-     */
     @JRubyMethod
     public IRubyObject default_proc(ThreadContext context) {
-        return (hashFlags & PROCDEFAULT_HASH) != 0 ? ifNone : context.nil;
-    }
-
-    /** default_proc_arity_check
-     *
-     */
-    private void checkDefaultProcArity(ThreadContext context, Block block) {
-        int n = block.getSignature().arityValue();
-
-        if (block.type == Block.Type.LAMBDA && n != 2 && (n >= 0 || n < -3)) {
-            if (n < 0) n = -n-1;
-            throw typeError(context, "default_proc takes two arguments (2 for " + n + ")");
-        }
+        return getDelegate().default_proc(context);
     }
 
-    /** rb_hash_set_default_proc
-     *
-     */
     @JRubyMethod(name = "default_proc=")
     public IRubyObject set_default_proc(ThreadContext context, IRubyObject proc) {
-        modify();
-
-        if (proc.isNil()) {
-            ifNone = proc;
-            hashFlags &= ~PROCDEFAULT_HASH;
-            return proc;
-        }
-
-        IRubyObject b = TypeConverter.convertToType(proc, context.runtime.getProc(), "to_proc");
-        if (b.isNil() || !(b instanceof RubyProc)) throw typeError(context, "wrong default_proc type ", proc, " (expected Proc)");
-
-        proc = b;
-        checkDefaultProcArity(context, ((RubyProc) proc).getBlock());
-        ifNone = proc;
-        hashFlags |= PROCDEFAULT_HASH;
-        return proc;
+        return getDelegate().set_default_proc(context, proc);
     }
 
-    /** rb_hash_modify
-     *
-     */
     public void modify() {
-    	testFrozen("Hash");
-    }
-
-    /** inspect_hash
-     *
-     */
-    protected RubyString inspectHash(final ThreadContext context) {
-        final RubyString str = RubyString.newStringLight(context.runtime, DEFAULT_INSPECT_STR_SIZE, USASCIIEncoding.INSTANCE);
-
-        str.cat((byte)'{');
-
-        visitAll(context, InspectVisitor, str);
-        str.cat((byte)'}');
-        return str;
-    }
-
-    private static final VisitorWithState<RubyString> InspectVisitor = new VisitorWithState<RubyString>() {
-        @Override
-        // MRI: inspect_i for inspect_hash in hash.c
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyString str) {
-            RubyString keyStr;
-
-            boolean isSymbol = key instanceof RubySymbol;
-            boolean quote = false;
-            if (key instanceof RubySymbol symbol) {
-                keyStr = symbol.fstring();
-                quote = symbolKeyNeedsQuote(context, symbol);
-            } else {
-                keyStr = inspect(context, key);
-            }
-
-            if (str.size() > 1) {
-                str.catString(", ");
-            } else {
-                str.setEncoding(keyStr.getEncoding());
-            }
-
-            if (quote) {
-                str.append(keyStr.inspect(context));
-            } else {
-                str.append(keyStr);
-            }
-
-            str.catString(isSymbol ? ": " : " => ");
-
-            RubyString valStr = inspect(context, value);
-            str.append(valStr);
-        }
-
-        // MRI: symbol_key_needs_quote
-        boolean symbolKeyNeedsQuote(ThreadContext context, RubySymbol sym) {
-            RubyString str = sym.fstring();
-            int len = str.size();
-            if (len == 0 || !sym.isSimpleName(context)) return true;
-            ByteList bytes = str.getByteList();
-            int first = bytes.get(0);
-            if (first == '@' || first == '$' || first == '!') return true;
-            if (!RubyString.atCharBoundary(bytes.unsafeBytes(), bytes.begin(), bytes.begin() + bytes.getRealSize() - 1, bytes.begin() + bytes.realSize(), bytes.getEncoding())) return false;
-            switch (bytes.get(len - 1)) {
-                case '+':
-                case '-':
-                case '*':
-                case '/':
-                case '`':
-                case '%':
-                case '^':
-                case '&':
-                case '|':
-                case ']':
-                case '<':
-                case '=':
-                case '>':
-                case '~':
-                case '@':
-                    return true;
-                default:
-                    return false;
-            }
-        }
-    };
-
-    /**
-     * Append appropriate characters to indicate association (": " vs " => ").
-     *
-     * @param keyIsSymbol is the key a symbol
-     * @param bytes buffer to which to append
-     */
-    protected void appendAssociation(boolean keyIsSymbol, ByteList bytes) {
-        if (keyIsSymbol) {
-            bytes.append(':').append(' ');
-        } else {
-            bytes.append(' ').append('=').append('>').append(' ');
-        }
+        getDelegate().modify();
     }
 
-    /** rb_hash_inspect
-     *
-     */
     @JRubyMethod(name = "inspect")
     public IRubyObject inspect(ThreadContext context) {
-        final Ruby runtime = context.runtime;
-
-        if (size() == 0) return newSharedString(context, EMPTY_HASH_BL);
-        if (runtime.isInspecting(this)) return newSharedString(context, RECURSIVE_HASH_BL);
-
-        try {
-            runtime.registerInspecting(this);
-            return inspectHash(context);
-        } finally {
-            runtime.unregisterInspecting(this);
-        }
+        return getDelegate().inspect(context);
     }
 
-    /** rb_hash_size
-     *
-     */
     @JRubyMethod(name = {"size", "length"})
     public RubyFixnum rb_size(ThreadContext context) {
-        return asFixnum(context, size);
-    }
-
-    /**
-     * A size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
-     *
-     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
-     */
-    private static IRubyObject size(ThreadContext context, RubyHash recv, IRubyObject[] args) {
-        return recv.rb_size(context);
+        return getDelegate().rb_size(context);
     }
 
-    /** rb_hash_empty_p
-     *
-     */
     @JRubyMethod(name = "empty?")
     public RubyBoolean empty_p(ThreadContext context) {
-        return size == 0 ? context.tru : context.fals;
+        return getDelegate().empty_p(context);
     }
 
-    /** rb_hash_to_a
-     *
-     */
     @JRubyMethod(name = "to_a")
     @Override
     public RubyArray to_a(ThreadContext context) {
-        final Ruby runtime = context.runtime;
-        try {
-            final RubyArray result = RubyArray.newBlankArrayInternal(runtime, size);
-
-            visitAll(context, RubyHash.StoreKeyValueVisitor, result);
+        return getDelegate().to_a(context);
+    }
 
-            return result;
-        } catch (NegativeArraySizeException nase) {
-            throw concurrentModification();
-        }
+    @JRubyMethod(name = "to_s")
+    public IRubyObject to_s(ThreadContext context) {
+        return getDelegate().to_s(context);
     }
 
-    private static final VisitorWithState<RubyArray> StoreKeyValueVisitor = new VisitorWithState<RubyArray>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyArray result) {
-            result.storeInternal(context, index, newArray(context, key, value));
-        }
-    };
-
-    /** rb_hash_to_s &amp; to_s_hash
-     *
-     */
-    @JRubyMethod(name = "to_s")
-    public IRubyObject to_s(ThreadContext context) {
-        return inspect(context);
-    }
-
-    /** rb_hash_rehash
-     *
-     */
     @JRubyMethod(name = "rehash")
     public RubyHash rehash(ThreadContext context) {
-        if (iteratorCount > 0) throw runtimeError(context, "rehash during iteration");
-
-        modify();
-        final RubyHashEntry[] oldTable = table;
-        final RubyHashEntry[] newTable = new RubyHashEntry[oldTable.length];
-        Set<Integer> rehashedIndexes = new HashSet<>();
-        for (int j = 0; j < oldTable.length; j++) {
-            RubyHashEntry entry = oldTable[j];
-            oldTable[j] = null;
-            while (entry != null) {
-                RubyHashEntry next = entry.next;
-                int oldHash = entry.hash;
-                IRubyObject key = entry.key;
-                int newHash = hashValue(key);
-
-                int i = bucketIndex(newHash, newTable.length);
-
-                RubyHashEntry newEntry = newTable[i];
-                if (newEntry != null && internalKeyExist(newEntry.hash, newEntry.key, newHash, key)) {
-                    RubyHashEntry tmpNext = entry.nextAdded;
-                    RubyHashEntry tmpPrev = entry.prevAdded;
-                    tmpPrev.nextAdded = tmpNext;
-                    tmpPrev.prevAdded = tmpPrev;
-                    size--;
-                } else {
-                    // replace entry if hash changed
-                    if (oldHash != newHash) {
-                        entry = new RubyHashEntry(entry, newHash);
-                        // memorize hash value
-                        rehashedIndexes.add(newHash);
-                    }
-
-                    entry.next = newEntry;
-                    newTable[i] = entry;
-                }
-                entry = next;
-            }
-        }
-        table = newTable;
-
-        // When a hash is large and contains duplicate keys, sometimes the above logic can not remove duplicate key.
-        // searches duplicate keys and removes it.
-        for (int hash : rehashedIndexes) {
-            RubyHashEntry entry = table[bucketIndex(hash, newTable.length)];
-            while (entry != null) {
-                if (entry.hash == hash) {
-                    RubyHashEntry nextEntry = entry.next;
-                    while (nextEntry != null) {
-                        if (internalKeyExist(entry.hash, entry.key, nextEntry.hash, nextEntry.key)) {
-                            RubyHashEntry tmpNext = entry.nextAdded;
-                            RubyHashEntry tmpPrev = entry.prevAdded;
-                            tmpPrev.nextAdded = tmpNext;
-                            tmpPrev.prevAdded = tmpPrev;
-                            size--;
-                        }
-                        nextEntry = nextEntry.next;
-                    }
-                }
-            entry = entry.next;
-            }
-        }
-        return this;
+        return getDelegate().rehash(context);
     }
 
-    /** rb_hash_to_hash
-     *
-     */
     @JRubyMethod(name = "to_hash")
     public RubyHash to_hash(ThreadContext context) {
-        return this;
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public RubyHash to_h(ThreadContext context) {
-        return to_h(context, Block.NULL_BLOCK);
+        return getDelegate().to_hash(context);
     }
 
     @JRubyMethod
     public RubyHash to_h(ThreadContext context, Block block) {
-        if (block.isGiven()) return to_h_block(context, block);
-        return getType() == hashClass(context) ? this : Create.newHash(context).replace(context, this);
+        return getDelegate().to_h(context, block);
     }
 
     protected RubyHash to_h_block(ThreadContext context, Block block) {
-        RubyHash result = Create.newHash(context);
-
-        visitAll(context, (ctxt, self, key, value, index) -> {
-            IRubyObject elt = block.yieldArray(ctxt, newArray(ctxt, key, value), null);
-            IRubyObject keyValue = elt.checkArrayType();
-
-            if (keyValue == ctxt.nil) throw typeError(context, "wrong element type ", elt, " (expected array)");
-
-            var ary = (RubyArray<?>) keyValue;
-            if (ary.getLength() != 2) {
-                throw argumentError(context, "element has wrong array length " + "(expected 2, was " + ary.getLength() + ")");
-            }
-
-            result.fastASet(ary.eltInternal(0), ary.eltInternal(1));
-        });
-
-        return result;
+        return getDelegate().to_h_block(context, block);
     }
 
     @Override
     public RubyHash convertToHash() {
-        return this;
+        return getDelegate().convertToHash();
     }
 
-    public final void fastASet(IRubyObject key, IRubyObject value) {
-        internalPut(key, value);
+    public void fastASet(IRubyObject key, IRubyObject value) {
+        getDelegate().fastASet(key, value);
     }
 
-    public final void fastASetSmall(IRubyObject key, IRubyObject value) {
-        internalPutSmall(key, value);
+    public void fastASetSmall(IRubyObject key, IRubyObject value) {
+        getDelegate().fastASetSmall(key, value);
     }
 
     // MRI: rb_hash_set_pair, fast/small version
-    public final void fastASetSmallPair(ThreadContext context, IRubyObject _pair) {
-        IRubyObject pair;
-
-        pair = TypeConverter.checkArrayType(context, _pair);
-        if (pair.isNil()) {
-            throw typeError(context, "wrong element type " + _pair.getType() + " (expected array)");
-        }
-        RubyArray pairAry = (RubyArray) pair;
-        int len = pairAry.size();
-        if (len != 2) {
-            throw argumentError(context, "element has wrong array length (expected 2, was " + len + ")");
-        }
-        fastASetSmall(pairAry.eltOk(0), pairAry.eltOk(1));
+    public void fastASetSmallPair(ThreadContext context, IRubyObject _pair) {
+        getDelegate().fastASetSmallPair(context, _pair);
     }
 
-    public final void fastASetCheckString(Ruby runtime, IRubyObject key, IRubyObject value) {
-      if (key instanceof RubyString strKey && !isComparedByIdentity()) {
-          op_asetForString(runtime, strKey, value);
-      } else {
-          internalPut(key, value);
-      }
+    public void fastASetCheckString(Ruby runtime, IRubyObject key, IRubyObject value) {
+        getDelegate().fastASetCheckString(runtime, key, value);
     }
 
-    public final void fastASetSmallCheckString(Ruby runtime, IRubyObject key, IRubyObject value) {
-        if (key instanceof RubyString strKey) {
-            op_asetSmallForString(runtime, strKey, value);
-        } else {
-            internalPutSmall(key, value);
-        }
+    public void fastASetSmallCheckString(Ruby runtime, IRubyObject key, IRubyObject value) {
+        getDelegate().fastASetSmallCheckString(runtime, key, value);
     }
 
-    public final void fastASet(Ruby runtime, IRubyObject key, IRubyObject value, boolean prepareString) {
-        if (prepareString) {
-            fastASetCheckString(runtime, key, value);
-        } else {
-            fastASet(key, value);
-        }
+    public void fastASet(Ruby runtime, IRubyObject key, IRubyObject value, boolean prepareString) {
+        getDelegate().fastASet(runtime, key, value, prepareString);
     }
 
-    public final void fastASetSmall(Ruby runtime, IRubyObject key, IRubyObject value, boolean prepareString) {
-        if (prepareString) {
-            fastASetSmallCheckString(runtime, key, value);
-        } else {
-            fastASetSmall(key, value);
-        }
+    public void fastASetSmall(Ruby runtime, IRubyObject key, IRubyObject value, boolean prepareString) {
+        getDelegate().fastASetSmall(runtime, key, value, prepareString);
     }
 
     /**
      * Set a key/value pair into this hash.
      *
      * @param context the current thread context
-     * @param key the key
-     * @param value the value
+     * @param key     the key
+     * @param value   the value
      * @return the value set
      */
-    // MRI: rb_hash_aset
     @JRubyMethod(name = {"[]=", "store"})
     public IRubyObject op_aset(ThreadContext context, IRubyObject key, IRubyObject value) {
-        modify();
-
-        fastASetCheckString(context.runtime, key, value);
-        return value;
-    }
-
-
-    protected void op_asetForString(Ruby runtime, RubyString key, IRubyObject value) {
-        final RubyHashEntry entry = internalGetEntry(key);
-        if (entry != NO_ENTRY) {
-            entry.value = value;
-        } else {
-            checkIterating();
-
-            if (!key.isFrozen()) key = hashKeyString(runtime.getCurrentContext(), key);
-
-            internalPut(key, value, false);
-        }
-    }
-
-    protected void op_asetSmallForString(Ruby runtime, RubyString key, IRubyObject value) {
-        final RubyHashEntry entry = internalGetEntry(key);
-        if (entry != NO_ENTRY) {
-            entry.value = value;
-        } else {
-            checkIterating();
-
-            if (!key.isFrozen()) key = hashKeyString(runtime.getCurrentContext(), key);
-
-            internalPutNoResize(key, value, false);
-        }
-    }
-
-    // MRI: rb_hash_key_str
-    private static RubyString hashKeyString(ThreadContext context, RubyString key) {
-        return key.isBare(context) ? context.runtime.freezeAndDedupString(key) : (RubyString) key.dupFrozen();
+        return getDelegate().op_aset(context, key, value);
     }
 
     // returns null when not found to avoid unnecessary getRuntime().getNil() call
-    public final IRubyObject fastARef(IRubyObject key) {
-        return internalGet(key);
+    public IRubyObject fastARef(IRubyObject key) {
+        return getDelegate().fastARef(key);
     }
 
     public RubyBoolean compare(final ThreadContext context, VisitorWithState<RubyHash> visitor, IRubyObject other, boolean eql) {
-        if (!(other instanceof RubyHash)) {
-            if (!sites(context).respond_to_to_hash.respondsTo(context, other, other)) {
-                return context.fals;
-            }
-
-            if(eql) {
-                return Helpers.rbEql(context, other, this);
-            }else {
-                return Helpers.rbEqual(context, other, this);
-
-            }
-        }
-
-        final RubyHash otherHash = (RubyHash) other;
-
-        if (this.size() != otherHash.size()) {
-            return context.fals;
-        }
-
-        try {
-            visitAll(context, visitor, otherHash);
-        } catch (Mismatch e) {
-            return context.fals;
-        }
-
-        return context.tru;
+        return getDelegate().compare(context, visitor, other, eql);
     }
 
-    private static final VisitorWithState<RubyHash> FindMismatchUsingEqualVisitor = new VisitorWithState<RubyHash>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyHash otherHash) {
-            IRubyObject value2 = otherHash.fastARef(key);
-
-            if (value2 == null) {
-                // other hash does not contain key
-                throw MISMATCH;
-            }
-
-            if (!Helpers.rbEqual(context, value, value2).isTrue()) {
-                throw MISMATCH;
-            }
-        }
-    };
-
-    private static final VisitorWithState<RubyHash> FindMismatchUsingEqlVisitor = new VisitorWithState<RubyHash>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyHash otherHash) {
-            IRubyObject value2 = otherHash.fastARef(key);
-
-            if (value2 == null) {
-                // other hash does not contain key
-                throw MISMATCH;
-            }
-
-            if (!Helpers.rbEql(context, value, value2).isTrue()) {
-                throw MISMATCH;
-            }
-        }
-    };
-
-    /** rb_hash_equal
-     *
-     */
     @Override
     @JRubyMethod(name = "==")
     public IRubyObject op_equal(final ThreadContext context, IRubyObject other) {
-        return RecursiveComparator.compare(context, FindMismatchUsingEqualVisitor, this, other, false);
+        return getDelegate().op_equal(context, other);
     }
 
-    /** rb_hash_eql
-     *
-     */
     @JRubyMethod(name = "eql?")
     public IRubyObject op_eql(final ThreadContext context, IRubyObject other) {
-        return RecursiveComparator.compare(context, FindMismatchUsingEqlVisitor, this, other, true);
+        return getDelegate().op_eql(context, other);
     }
 
-    /** rb_hash_aref
-     *
-     */
     @JRubyMethod(name = "[]")
     public IRubyObject op_aref(ThreadContext context, IRubyObject key) {
-        IRubyObject value;
-        return ((value = internalGet(key)) == null) ? sites(context).self_default.call(context, this, this, key) : value;
-    }
-
-    /** hash_le_i
-     *
-     */
-    private boolean hash_le(RubyHash other) {
-        return other.directEntrySet().containsAll(directEntrySet());
+        return getDelegate().op_aref(context, key);
     }
 
     @JRubyMethod(name = "<")
     public IRubyObject op_lt(ThreadContext context, IRubyObject other) {
-        final RubyHash otherHash = ((RubyBasicObject) other).convertToHash();
-        if (size() >= otherHash.size()) return context.fals;
-
-        return asBoolean(context, hash_le(otherHash));
+        return getDelegate().op_lt(context, other);
     }
 
     @JRubyMethod(name = "<=")
     public IRubyObject op_le(ThreadContext context, IRubyObject other) {
-        final RubyHash otherHash = other.convertToHash();
-        if (size() > otherHash.size()) return context.fals;
-
-        return asBoolean(context, hash_le(otherHash));
+        return getDelegate().op_le(context, other);
     }
 
     @JRubyMethod(name = ">")
     public IRubyObject op_gt(ThreadContext context, IRubyObject other) {
-        final RubyHash otherHash = other.convertToHash();
-        return otherHash.op_lt(context, this);
+        return getDelegate().op_gt(context, other);
     }
 
     @JRubyMethod(name = ">=")
     public IRubyObject op_ge(ThreadContext context, IRubyObject other) {
-        final RubyHash otherHash = other.convertToHash();
-        return otherHash.op_le(context, this);
+        return getDelegate().op_ge(context, other);
     }
 
     // MRI: rb_hash_hash
     @JRubyMethod(name = "hash")
     public RubyFixnum hash(ThreadContext context) {
-        final int size = size();
-
-        long hash = Helpers.hashStart(context.runtime, size);
-
-        if (size != 0) {
-            long[] hval = {hash};
-
-            iteratorVisitAll(context, CalculateHashVisitor, hval);
-
-            hash = hval[0];
-        }
-
-        return asFixnum(context, hash);
+        return getDelegate().hash(context);
     }
 
-    private static final ThreadLocal<ByteBuffer> HASH_16_BYTE = ThreadLocal.withInitial(() -> ByteBuffer.allocate(16));
-
-    private static final VisitorWithState<long[]> CalculateHashVisitor = new VisitorWithState<long[]>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, long[] hval) {
-            // perform hashing of key and value before populating shared buffer
-            long keyHash = Helpers.safeHashLong(context, key);
-            long valueHash = Helpers.safeHashLong(context, value);
-
-            ByteBuffer buffer = HASH_16_BYTE.get();
-            Buffers.clearBuffer(buffer).putLong(keyHash).putLong(valueHash);
-
-            hval[0] ^= Helpers.multAndMix(Ruby.getHashSeed0(), Arrays.hashCode(buffer.array()));
-        }
-    };
-
-    /** rb_hash_fetch
-     *
-     */
     public IRubyObject fetch(ThreadContext context, IRubyObject[] args, Block block) {
-        Arity.checkArgumentCount(context, args.length, 1, 2);
-
-        switch(args.length) {
-            case 1: return fetch(context, args[0], block);
-            case 2: return fetch(context, args[0], args[1], block);
-        }
-
-        return null;
+        return getDelegate().fetch(context, args, block);
     }
 
     @JRubyMethod(rest = true)
     public IRubyObject except(ThreadContext context, IRubyObject[] keys) {
-        RubyHash result = hashCopyWithIdentity(context);
-
-        for (int i = 0; i < keys.length; i++) {
-            result.delete(context, keys[i]);
-        }
-
-        return result;
+        return getDelegate().except(context, keys);
     }
 
     @JRubyMethod
     public IRubyObject fetch(ThreadContext context, IRubyObject key, Block block) {
-        IRubyObject value = internalGet(key);
-
-        if (value != null) return value;
-        if (block.isGiven()) return block.yield(context, key);
-
-        throw context.runtime.newKeyError("key not found: " + key.inspect(context), this, key);
+        return getDelegate().fetch(context, key, block);
     }
 
     @JRubyMethod
     public IRubyObject fetch(ThreadContext context, IRubyObject key, IRubyObject _default, Block block) {
-        if (block.isGiven()) warn(context, "block supersedes default value argument");
-
-        IRubyObject value = internalGet(key);
-
-        if (value == null) {
-            if (block.isGiven()) return block.yield(context, key);
-
-            return _default;
-        }
-
-        return value;
+        return getDelegate().fetch(context, key, _default, block);
     }
 
-    /** rb_hash_has_key
-     *
-     */
     @JRubyMethod(name = {"has_key?", "key?", "include?", "member?"})
     public RubyBoolean has_key_p(ThreadContext context, IRubyObject key) {
-        return hasKey(key) ? context.tru : context.fals;
-    }
-
-    @Deprecated(since = "9.3.5.0")
-    public RubyBoolean has_key_p(IRubyObject key) {
-        return has_key_p(metaClass.runtime.getCurrentContext(), key);
+        return getDelegate().has_key_p(context, key);
     }
 
     /**
      * A Java API to test the presence of a (Ruby) key in the Hash
+     *
      * @param key the native (Ruby) key
      * @return true if the hash contains the provided key
      */
     public boolean hasKey(IRubyObject key) {
-        return internalGetEntry(key) != NO_ENTRY;
-    }
-
-    private static class Found extends RuntimeException {
-        @Override
-        public Throwable fillInStackTrace() {
-            return null;
-        }
-    }
-
-    private static final Found FOUND = new Found();
-
-    private static class FoundKey extends Found {
-        public final IRubyObject key;
-        FoundKey(IRubyObject key) {
-            super();
-            this.key = key;
-        }
+        return getDelegate().hasKey(key);
     }
 
-    private static class FoundPair extends FoundKey {
-        public final IRubyObject value;
-        FoundPair(IRubyObject key, IRubyObject value) {
-            super(key);
-            this.value = value;
-        }
-    }
-
-    private boolean hasValue(ThreadContext context, IRubyObject expected) {
-        try {
-            visitAll(context, FoundIfEqualVisitor, expected);
-            return false;
-        } catch (Found found) {
-            return true;
-        }
-    }
-
-    private static final VisitorWithState<IRubyObject> FoundIfEqualVisitor = new VisitorWithState<IRubyObject>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, IRubyObject expected) {
-            if (equalInternal(context, value, expected)) {
-                throw FOUND;
-            }
-        }
-    };
-
-    /** rb_hash_has_value
-     *
-     */
     @JRubyMethod(name = {"has_value?", "value?"})
     public RubyBoolean has_value_p(ThreadContext context, IRubyObject expected) {
-        return asBoolean(context, hasValue(context, expected));
-    }
-
-    private volatile int iteratorCount;
-
-    private static final AtomicIntegerFieldUpdater<RubyHash> ITERATOR_UPDATER;
-    static {
-        AtomicIntegerFieldUpdater<RubyHash> iterUp = null;
-        try {
-            iterUp = AtomicIntegerFieldUpdater.newUpdater(RubyHash.class, "iteratorCount");
-        } catch (Exception e) {
-            // ignore, leave null
-        }
-        ITERATOR_UPDATER = iterUp;
-    }
-
-    private void iteratorEntry() {
-        if (ITERATOR_UPDATER == null) {
-            iteratorEntrySync();
-            return;
-        }
-        ITERATOR_UPDATER.incrementAndGet(this);
+        return getDelegate().has_value_p(context, expected);
     }
 
-    private void iteratorExit() {
-        if (ITERATOR_UPDATER == null) {
-            iteratorExitSync();
-            return;
-        }
-        ITERATOR_UPDATER.decrementAndGet(this);
-    }
-
-    private synchronized void iteratorEntrySync() {
-        ++iteratorCount;
-    }
-
-    private synchronized void iteratorExitSync() {
-        --iteratorCount;
-    }
-
-    private void iteratorVisitAll(ThreadContext context, VisitorWithStateI visitor) {
-        try {
-            iteratorEntry();
-            visitAll(context, visitor);
-        } finally {
-            iteratorExit();
-        }
-    }
-
-    private <T> void iteratorVisitAll(ThreadContext context, VisitorWithState<T> visitor, T state) {
-        try {
-            iteratorEntry();
-            visitAll(context, visitor, state);
-        } finally {
-            iteratorExit();
-        }
-    }
-
-    /** rb_hash_each
-     *
-     */
     public RubyHash eachCommon(final ThreadContext context, final Block block) {
-        iteratorVisitAll(context, YieldArrayVisitor, block);
-
-        return this;
+        return getDelegate().eachCommon(context, block);
     }
 
-    private static final VisitorWithState<Block> YieldArrayVisitor = new VisitorWithState<Block>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
-            block.yieldArray(context, newArray(context, key, value), null);
-        }
-    };
-
     @JRubyMethod(name = {"each", "each_pair"})
     public IRubyObject each(final ThreadContext context, final Block block) {
-        return block.isGiven() ? each_pairCommon(context, block) : enumeratorizeWithSize(context, this, "each", RubyHash::size);
+        return getDelegate().each(context, block);
     }
 
-    /** rb_hash_each_pair
-     *
-     */
     public RubyHash each_pairCommon(final ThreadContext context, final Block block) {
-        iteratorVisitAll(context, YieldKeyValueArrayVisitor, block);
-
-        return this;
+        return getDelegate().each_pairCommon(context, block);
     }
 
-    private static final VisitorWithState<Block> YieldKeyValueArrayVisitor = new VisitorWithState<Block>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
-            if (block.type == Block.Type.LAMBDA) {
-                block.call(context, newArray(context, key, value));
-            } else if (block.getSignature().isSpreadable()) {
-                block.yieldSpecific(context, key, value);
-            } else {
-                block.yield(context, newArray(context, key, value));
-            }
-        }
-    };
-
-    /** rb_hash_each_value
-     *
-     */
     public RubyHash each_valueCommon(final ThreadContext context, final Block block) {
-        iteratorVisitAll(context, YieldValueVisitor, block);
-
-        return this;
+        return getDelegate().each_valueCommon(context, block);
     }
 
-    private static final VisitorWithState<Block> YieldValueVisitor = new VisitorWithState<Block>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
-            block.yield(context, value);
-        }
-    };
-
     @JRubyMethod
     public IRubyObject each_value(final ThreadContext context, final Block block) {
-        return block.isGiven() ? each_valueCommon(context, block) : enumeratorizeWithSize(context, this, "each_value", RubyHash::size);
+        return getDelegate().each_value(context, block);
     }
 
-    /** rb_hash_each_key
-     *
-     */
     public RubyHash each_keyCommon(final ThreadContext context, final Block block) {
-        iteratorVisitAll(context, YieldKeyVisitor, block);
-
-        return this;
+        return getDelegate().each_keyCommon(context, block);
     }
 
-    private static final VisitorWithState<Block> YieldKeyVisitor = new VisitorWithState<Block>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
-            block.yield(context, key);
-        }
-    };
-
     @JRubyMethod
     public IRubyObject each_key(final ThreadContext context, final Block block) {
-        return block.isGiven() ? each_keyCommon(context, block) : enumeratorizeWithSize(context, this, "each_key", RubyHash::size);
+        return getDelegate().each_key(context, block);
     }
 
     @JRubyMethod(name = "transform_keys", rest = true)
     public IRubyObject transform_keys(final ThreadContext context, IRubyObject[] args, final Block block) {
-        if (args.length == 0 && !block.isGiven()) {
-            return enumeratorizeWithSize(context, this, "transform_keys", RubyHash::size);
-        }
-
-        IRubyObject transformHash = args.length > 0 ?
-                TypeConverter.convertToTypeWithCheck(args[0], hashClass(context), "to_hash") :
-                context.nil;
-        RubyHash result = Create.newHash(context);
-
-        if (!isEmpty()) {
-            if (!transformHash.isNil()) {
-                visitAll(context, (ctxt, self, key, value, index) -> {
-                    IRubyObject newKey = ((RubyHash) transformHash).internalGet(key);
-                    if (newKey == null) newKey = block.isGiven() ? block.yield(ctxt, key) : key;
-                    result.fastASet(newKey, value);
-                });
-            } else {
-                visitAll(context, (ctxt, self, key, value, index) -> result.fastASet(block.yield(ctxt, key), value));
-            }
-        }
-
-        return result;
-    }
-
-    private RubyHash hashCopyWithIdentity(ThreadContext context) {
-        RubyHash copy = new RubyHash(context.runtime, hashClass(context));
-
-        copy.replaceWith(context, this);
-
-        return copy;
+        return getDelegate().transform_keys(context, args, block);
     }
 
     @JRubyMethod(name = "transform_values")
     public IRubyObject transform_values(final ThreadContext context, final Block block) {
-        return hashCopyWithIdentity(context).transform_values_bang(context, block);
+        return getDelegate().transform_values(context, block);
     }
 
     @JRubyMethod(name = "transform_keys!", rest = true)
     public IRubyObject transform_keys_bang(final ThreadContext context, IRubyObject[] args, final Block block) {
-        if (args.length == 0 && !block.isGiven()) {
-            return enumeratorizeWithSize(context, this, "transform_keys!", RubyHash::size);
-        }
-
-        IRubyObject transformHash = args.length > 0 ?
-                TypeConverter.convertToTypeWithCheck(args[0], hashClass(context), "to_hash") :
-                context.nil;
-        modify();
-
-        if (!isEmpty()) {
-            RubyArray pairs = (RubyArray) flatten(context);
-            RubyHash newKeys = Create.newHash(context);
-            int length = pairs.size();
-            boolean aborted = false; // If break happens in blocks we stop transforming but still leave rest as-is.
-            for (int i = 0; i < length; i += 2) {
-                IRubyObject oldKey = pairs.eltOk(i);
-                IRubyObject newKey;
-
-                if (aborted) {
-                    newKey = oldKey;
-                } else {
-                    if (transformHash.isNil()) {
-                        try {
-                            newKey = block.yield(context, oldKey);
-                        } catch (IRBreakJump e) {
-                            aborted = true;
-                            continue;
-                        }
-                    } else {
-                        newKey = ((RubyHash) transformHash).internalGet(oldKey);
-
-                        if (newKey == null) {
-                            if (block.isGiven()) {
-                                try {
-                                    newKey = block.yield(context, oldKey);
-                                } catch (IRBreakJump e) {
-                                    aborted = true;
-                                    continue;
-                                }
-                            } else {
-                                newKey = oldKey;
-                            }
-                        }
-                    }
-                }
-
-                if (!newKeys.hasKey(oldKey)) fastDelete(oldKey);
-                fastASet(newKey, pairs.eltOk(i + 1));
-                newKeys.fastASet(newKey, null);
-            }
-        }
-
-        return this;
+        return getDelegate().transform_keys_bang(context, args, block);
     }
 
     @JRubyMethod(name = "transform_values!")
     public IRubyObject transform_values_bang(final ThreadContext context, final Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "transform_values!", RubyHash::size);
-
-        testFrozen("Hash");
-        iteratorVisitAll(context, (ctxt, self, key, value, index) -> self.op_aset(ctxt, key, block.yield(ctxt, value)));
-
-        return this;
+        return getDelegate().transform_values_bang(context, block);
     }
 
     @JRubyMethod(name = "select!", alias = "filter!")
     public IRubyObject select_bang(final ThreadContext context, final Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "select!", RubyHash::size);
-
-        return keep_ifCommon(context, block) ? this : context.nil;
+        return getDelegate().select_bang(context, block);
     }
 
     @JRubyMethod
     public IRubyObject keep_if(final ThreadContext context, final Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "keep_if", RubyHash::size);
-
-        keep_ifCommon(context, block);
-
-        return this;
+        return getDelegate().keep_if(context, block);
     }
 
     public boolean keep_ifCommon(final ThreadContext context, final Block block) {
-        testFrozen("Hash");
-        boolean[] modified = new boolean[] { false };
-        iteratorVisitAll(context, (ctxt, self, key, value, index) -> {
-            if (!block.yieldArray(ctxt, newArray(ctxt, key, value), null).isTrue()) {
-                testFrozen();
-                modified[0] = true;
-                self.remove(key);
-            }
-        });
-        return modified[0];
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public IRubyObject sort(ThreadContext context, Block block) {
-        return to_a(context).sort_bang(context, block);
+        return getDelegate().keep_ifCommon(context, block);
     }
 
     @JRubyMethod
     public IRubyObject key(ThreadContext context, IRubyObject expected) {
-        IRubyObject key = internalIndex(context, expected);
-        return key != null ? key : context.nil;
-    }
-
-    private IRubyObject internalIndex(final ThreadContext context, final IRubyObject expected) {
-        try {
-            visitAll(context, FoundKeyIfEqual, expected);
-            return null;
-        } catch (FoundKey found) {
-            return found.key;
-        }
+        return getDelegate().key(context, expected);
     }
 
-    private static final VisitorWithState<IRubyObject> FoundKeyIfEqual = new VisitorWithState<IRubyObject>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, IRubyObject expected) {
-            if (equalInternal(context, value, expected)) {
-                throw new FoundKey(key);
-            }
-        }
-    };
-
-    /** rb_hash_keys
-     *
-     */
-
     @JRubyMethod(name = "keys")
     public RubyArray keys(final ThreadContext context) {
-        try {
-            RubyArray keys = RubyArray.newBlankArrayInternal(context.runtime, size());
-
-            visitAll(context, StoreKeyVisitor, keys);
-
-            return keys;
-        } catch (NegativeArraySizeException nase) {
-            throw concurrentModification();
-        }
+        return getDelegate().keys(context);
     }
 
-    public final RubyArray keys() {
-        return keys(metaClass.runtime.getCurrentContext());
+    public RubyArray keys() {
+        return getDelegate().keys();
     }
 
-    private static final VisitorWithState<RubyArray> StoreKeyVisitor = new VisitorWithState<RubyArray>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyArray keys) {
-            keys.storeInternal(context, index, key);
-        }
-    };
-
-    /** rb_hash_values
-     *
-     */
-
     @JRubyMethod(name = "values")
     public RubyArray values(final ThreadContext context) {
-        try {
-            RubyArray values = RubyArray.newBlankArrayInternal(context.runtime, size());
-
-            visitAll(context, StoreValueVisitor, values);
-
-            return values;
-        } catch (NegativeArraySizeException nase) {
-            throw concurrentModification();
-        }
+        return getDelegate().values(context);
     }
 
-    public final RubyArray rb_values(ThreadContext context) {
-        return values(context);
+    public RubyArray rb_values(ThreadContext context) {
+        return getDelegate().rb_values(context);
     }
 
     public static final VisitorWithState<RubyArray> StoreValueVisitor = new VisitorWithState<RubyArray>() {
@@ -1981,487 +836,170 @@ public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyOb
         }
     };
 
-    /** rb_hash_equal
-     *
-     */
-
-    private static class Mismatch extends RuntimeException {
-        public Throwable fillInStackTrace() {
-            return this;
-        }
-    }
-    private static final Mismatch MISMATCH = new Mismatch();
-
-    /** rb_hash_shift
-     *
-     */
     @JRubyMethod(name = "shift")
     public IRubyObject shift(ThreadContext context) {
-        modify();
-
-        if (isEmpty()) return context.nil;
-
-        RubyHashEntry entry = head.nextAdded;
-        if (entry != head) {
-            var result = newArray(context, entry.key, entry.value);
-            internalDeleteEntry(entry);
-            return result;
-        }
-
-
-        CachingCallSite self_default = sites(context).self_default;
-        if (metaClass == context.runtime.getHash() && Builtins.checkHashDefault(context)) {
-            return default_value_get(context, context.nil);
-        }
-
-        return self_default.call(context, this, this, context.nil);
+        return getDelegate().shift(context);
     }
 
-    public final boolean fastDelete(IRubyObject key) {
-        return internalDelete(key) != NO_ENTRY;
+    public boolean fastDelete(IRubyObject key) {
+        return getDelegate().fastDelete(key);
     }
 
-    /** rb_hash_delete
-     *
-     */
     @JRubyMethod
     public IRubyObject delete(ThreadContext context, IRubyObject key, Block block) {
-        modify();
-
-        IRubyObject value = delete(key);
-        if (value != null) return value;
-
-        return block.isGiven() ? block.yield(context, key) : context.nil;
+        return getDelegate().delete(context, key, block);
     }
 
-    /**
-     * Delete entry or null.
-     */
     public IRubyObject delete(IRubyObject key) {
-        RubyHashEntry entry = internalDelete(key);
-        return entry != NO_ENTRY ? entry.value : null;
+        return getDelegate().delete(key);
     }
 
     public IRubyObject delete(ThreadContext context, IRubyObject key) {
-        return delete(context, key, Block.NULL_BLOCK);
+        return getDelegate().delete(context, key);
     }
 
-    /** rb_hash_select
-     *
-     */
     @JRubyMethod(name = "select", alias = "filter")
     public IRubyObject select(final ThreadContext context, final Block block) {
-        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "select", RubyHash::size);
-
-        final RubyHash result = hashCopyWithIdentity(context);
-
-        if (!isEmpty()) {
-            result.keep_ifCommon(context, block);
-        }
-
-        return result;
+        return getDelegate().select(context, block);
     }
 
-
-    /** rb_hash_slice
-     *
-     */
     @JRubyMethod(name = "slice", rest = true)
     public RubyHash slice(final ThreadContext context, final IRubyObject[] args) {
-        RubyHash result = Create.newHash(context);
-        result.setComparedByIdentity(isComparedByIdentity());
-
-        for (int i = 0; i < args.length; i++) {
-            IRubyObject key = args[i];
-            IRubyObject value = internalGet(key);
-            if (value != null) result.op_aset(key, value);
-        }
-
-        return result;
+        return getDelegate().slice(context, args);
     }
 
-    /** rb_hash_delete_if
-     *
-     */
     public RubyHash delete_ifInternal(ThreadContext context, Block block) {
-        modify();
-
-        iteratorVisitAll(context, DeleteIfVisitor, block);
-
-        return this;
+        return getDelegate().delete_ifInternal(context, block);
     }
 
-    private static final VisitorWithState<Block> DeleteIfVisitor = new VisitorWithState<Block>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
-            if (block.yieldArray(context, newArray(context, key, value), null).isTrue()) {
-                self.delete(context, key, Block.NULL_BLOCK);
-            }
-        }
-    };
-
     @JRubyMethod
     public IRubyObject delete_if(final ThreadContext context, final Block block) {
-        return block.isGiven() ? delete_ifInternal(context, block) : enumeratorizeWithSize(context, this, "delete_if", RubyHash::size);
+        return getDelegate().delete_if(context, block);
     }
 
-    /** rb_hash_reject
-     *
-     */
     public RubyHash rejectInternal(ThreadContext context, Block block) {
-        final RubyHash result = hashCopyWithIdentity(context);
-
-        if (!isEmpty()) {
-            result.delete_ifInternal(context, block);
-        }
-
-        return result;
+        return getDelegate().rejectInternal(context, block);
     }
 
     @JRubyMethod
     public IRubyObject reject(final ThreadContext context, final Block block) {
-        return block.isGiven() ? rejectInternal(context, block) : enumeratorizeWithSize(context, this, "reject", RubyHash::size);
+        return getDelegate().reject(context, block);
     }
 
-    /** rb_hash_reject_bang
-     *
-     */
     public IRubyObject reject_bangInternal(ThreadContext context, Block block) {
-        int n = size();
-        delete_if(context, block);
-        if (n == size()) return context.nil;
-        return this;
+        return getDelegate().reject_bangInternal(context, block);
     }
 
     @JRubyMethod(name = "reject!")
     public IRubyObject reject_bang(final ThreadContext context, final Block block) {
-        return block.isGiven() ? reject_bangInternal(context, block) : enumeratorizeWithSize(context, this, "reject!", RubyHash::size);
+        return getDelegate().reject_bang(context, block);
     }
 
-    /** rb_hash_clear
-     *
-     */
     @JRubyMethod(name = "clear")
     public RubyHash rb_clear(ThreadContext context) {
-        modify();
-
-        if (size > 0) {
-            alloc();
-            size = 0;
-        }
-
-        return this;
+        return getDelegate().rb_clear(context);
     }
 
-    /** rb_hash_invert
-     *
-     */
     @JRubyMethod(name = "invert")
     public RubyHash invert(final ThreadContext context) {
-        final RubyHash result = Create.newHash(context);
-
-        visitAll(context, InvertVisitor, result);
-
-        return result;
-    }
-
-    private static final VisitorWithState<RubyHash> InvertVisitor = new VisitorWithState<RubyHash>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyHash state) {
-            state.op_aset(context, value, key);
-        }
-    };
-
-    @Deprecated(since = "9.3.0.0")
-    public RubyHash merge_bang(ThreadContext context, IRubyObject other, Block block) {
-        return merge_bang(context, new IRubyObject[]{other}, block);
+        return getDelegate().invert(context);
     }
 
-    /** rb_hash_update
-     *
-     */
     @JRubyMethod(name = {"merge!", "update"}, rest = true)
     public RubyHash merge_bang(ThreadContext context, IRubyObject[] others, Block block) {
-        modify();
-
-        if (others.length == 0) return this;
-
-        for (int i = 0; i < others.length; i++) {
-            final RubyHash otherHash = others[i].convertToHash();
-            if (otherHash.empty_p().isTrue()) continue;
-            otherHash.visitAll(context, (ctxt, self, key, value, index) -> {
-                if (block.isGiven()) {
-                    IRubyObject existing = internalGet(key);
-                    if (existing != null) {
-                        value = block.yield(ctxt, newArray(ctxt, key, existing, value));
-                    }
-                }
-                op_aset(ctxt, key, value);
-            });
-        }
-
-        return this;
+        return getDelegate().merge_bang(context, others, block);
     }
 
     public void addAll(ThreadContext context, RubyHash otherHash) {
-        if (!otherHash.empty_p().isTrue()) {
-            otherHash.visitAll(context, (ctxt, self, key, value, index) -> op_aset(ctxt, key, value));
-        }
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public RubyHash merge(ThreadContext context, IRubyObject other, Block block) {
-        return merge(context, new IRubyObject[]{other}, block);
+        getDelegate().addAll(context, otherHash);
     }
 
-    /** rb_hash_merge
-     *
-     */
     @JRubyMethod(rest = true)
     public RubyHash merge(ThreadContext context, IRubyObject[] others, Block block) {
-        RubyHash dup = (RubyHash) dup(context);
-        return dup.merge_bang(context, others, block);
-    }
-
-    @JRubyMethod(name = "initialize_copy", visibility = PRIVATE)
-    public RubyHash initialize_copy(ThreadContext context, IRubyObject other) {
-        return replace(context, other);
-    }
-
-    /** rb_hash_replace
-     *
-     */
-    @JRubyMethod(name = "replace")
-    public RubyHash replace(final ThreadContext context, IRubyObject other) {
-        modify();
-
-        final RubyHash otherHash = other.convertToHash();
-
-        if (this == otherHash) return this;
-
-        replaceWith(context, otherHash);
-
-        ifNone = otherHash.ifNone;
-
-        if ((otherHash.hashFlags & PROCDEFAULT_HASH) != 0) {
-            hashFlags |= PROCDEFAULT_HASH;
-        } else {
-            hashFlags &= ~PROCDEFAULT_HASH;
-        }
-
-        return this;
-    }
-
-    protected void replaceWith(ThreadContext context, RubyHash otherHash) {
-        if (otherHash.getClass() == RubyHash.class) {
-            alloc();
-            copyFrom(this, otherHash, otherHash.isComparedByIdentity());
-        } else {
-            replaceExternally(context, otherHash);
-        }
+        return getDelegate().merge(context, others, block);
     }
 
-    protected void replaceExternally(ThreadContext context, RubyHash otherHash) {
-        rb_clear(context);
-
-        if (!isComparedByIdentity() && otherHash.isComparedByIdentity()) {
-            setComparedByIdentity(true);
-        }
-
-        otherHash.visitAll(context, ReplaceVisitor, this);
+    @JRubyMethod(name = "initialize_copy", visibility = PRIVATE)
+    public RubyHash initialize_copy(ThreadContext context, IRubyObject other) {
+        return getDelegate().initialize_copy(context, other);
     }
 
-    private static final VisitorWithState<RubyHash> ReplaceVisitor = new VisitorWithState<RubyHash>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyHash target) {
-            target.op_aset(context, key, value);
-        }
-    };
+    @JRubyMethod(name = "replace")
+    public RubyHash replace(final ThreadContext context, IRubyObject other) {
+        return getDelegate().replace(context, other);
+    }
 
-    /** rb_hash_values_at
-     *
-     */
     @JRubyMethod(name = "values_at", rest = true)
     public RubyArray values_at(ThreadContext context, IRubyObject[] args) {
-        RubyArray result = RubyArray.newBlankArrayInternal(context.runtime, args.length);
-        for (int i = 0; i < args.length; i++) {
-            result.storeInternal(context, i, op_aref(context, args[i]));
-        }
-        return result;
+        return getDelegate().values_at(context, args);
     }
 
     @JRubyMethod(name = "fetch_values", rest = true)
     public RubyArray fetch_values(ThreadContext context, IRubyObject[] args, Block block) {
-        RubyArray result = RubyArray.newBlankArrayInternal(context.runtime, args.length);
-        for (int i = 0; i < args.length; i++) {
-            result.storeInternal(context, i, fetch(context, args[i], block));
-        }
-        return result;
+        return getDelegate().fetch_values(context, args, block);
     }
 
     @JRubyMethod(name = "assoc")
     public IRubyObject assoc(final ThreadContext context, final IRubyObject obj) {
-        try {
-            visitAll(context, FoundPairIfEqualKeyVisitor, obj);
-            return context.nil;
-        } catch (FoundPair found) {
-            return newArray(context, found.key, found.value);
-        }
+        return getDelegate().assoc(context, obj);
     }
 
     @JRubyMethod(name = "rassoc")
     public IRubyObject rassoc(final ThreadContext context, final IRubyObject obj) {
-        try {
-            visitAll(context, FoundPairIfEqualValueVisitor, obj);
-            return context.nil;
-        } catch (FoundPair found) {
-            return newArray(context, found.key, found.value);
-        }
+        return getDelegate().rassoc(context, obj);
     }
 
-    private static final VisitorWithState<IRubyObject> FoundPairIfEqualKeyVisitor = new VisitorWithState<IRubyObject>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, IRubyObject obj) {
-            if (equalInternal(context, obj, key)) {
-                throw new FoundPair(key, value);
-            }
-        }
-    };
-
-    private static final VisitorWithState<IRubyObject> FoundPairIfEqualValueVisitor = new VisitorWithState<IRubyObject>() {
-        @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, IRubyObject obj) {
-            if (equalInternal(context, obj, value)) {
-                throw new FoundPair(key, value);
-            }
-        }
-    };
-
     @JRubyMethod
     public IRubyObject flatten(ThreadContext context) {
-        RubyArray ary = to_a(context);
-        sites(context).flatten_bang.call(context, ary, ary, RubyFixnum.one(context.runtime));
-        return ary;
+        return getDelegate().flatten(context);
     }
 
     @JRubyMethod
     public IRubyObject flatten(ThreadContext context, IRubyObject level) {
-        RubyArray ary = to_a(context);
-        sites(context).flatten_bang.call(context, ary, ary, level);
-        return ary;
+        return getDelegate().flatten(context, level);
     }
 
     @JRubyMethod(name = "compact")
     public IRubyObject compact(ThreadContext context) {
-      IRubyObject res = dup();
-      ((RubyHash)res).compact_bang(context);
-      return res;
+        return getDelegate().compact(context);
     }
 
     @JRubyMethod(name = "compact!")
     public IRubyObject compact_bang(ThreadContext context) {
-      boolean changed = false;
-      modify();
-      iteratorEntry();
-      try {
-        for (RubyHashEntry entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
-          if (entry.value == context.nil) {
-            internalDelete(entry.key);
-            changed = true;
-          }
-        }
-      } finally {
-        iteratorExit();
-      }
-      return changed ? this : context.nil;
+        return getDelegate().compact_bang(context);
     }
 
     @JRubyMethod(name = "compare_by_identity")
     public IRubyObject compare_by_identity(ThreadContext context) {
-        modify();
-        setComparedByIdentity(true);
-        return rehash(context);
+        return getDelegate().compare_by_identity(context);
     }
 
     @JRubyMethod(name = "compare_by_identity?")
     public IRubyObject compare_by_identity_p(ThreadContext context) {
-        return asBoolean(context, isComparedByIdentity());
+        return getDelegate().compare_by_identity_p(context);
     }
 
     @JRubyMethod
     public IRubyObject dup(ThreadContext context) {
-        RubyHash dup = (RubyHash) super.dup();
-        dup.setComparedByIdentity(isComparedByIdentity());
-        return dup;
+        return getDelegate().dup(context);
     }
 
     public IRubyObject rbClone(ThreadContext context, IRubyObject opts) {
-        RubyHash clone = (RubyHash) super.rbClone(context, opts);
-        clone.setComparedByIdentity(isComparedByIdentity());
-        return clone;
+        return super.rbClone(context, opts);
     }
 
     public IRubyObject rbClone(ThreadContext context) {
-        return rbClone(context, context.nil);
+        return super.rbClone(context, context.nil);
     }
 
     @JRubyMethod(name = "any?")
     public IRubyObject any_p(ThreadContext context, Block block) {
-        if (isEmpty()) return context.fals;
-        if (!block.isGiven()) return context.tru;
-
-        if (block.getSignature().arityValue() > 1) {
-            return any_p_i_fast(context, block);
-        }
-
-        return any_p_i(context, block);
+        return getDelegate().any_p(context, block);
     }
 
     @JRubyMethod(name = "any?")
     public IRubyObject any_p(ThreadContext context, IRubyObject pattern, Block block) {
-        if (isEmpty()) return context.fals;
-        if (block.isGiven()) warn(context, "given block not used");
-
-        return any_p_p(context, pattern);
-    }
-
-    protected IRubyObject any_p_i(ThreadContext context, Block block) {
-        iteratorEntry();
-        try {
-            for (RubyHashEntry entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
-                IRubyObject newAssoc = newArray(context, entry.key, entry.value);
-                if (block.yield(context, newAssoc).isTrue())
-                    return context.tru;
-            }
-            return context.fals;
-        } finally {
-            iteratorExit();
-        }
-    }
-
-    protected IRubyObject any_p_i_fast(ThreadContext context, Block block) {
-        iteratorEntry();
-        try {
-            for (RubyHashEntry entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
-                if (block.yieldArray(context, newArray(context, entry.key, entry.value), null).isTrue()) return context.tru;
-            }
-            return context.fals;
-        } finally {
-            iteratorExit();
-        }
-    }
-
-    protected IRubyObject any_p_p(ThreadContext context, IRubyObject pattern) {
-        iteratorEntry();
-        try {
-            for (RubyHashEntry entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
-                IRubyObject newAssoc = newArray(context, entry.key, entry.value);
-                if (pattern.callMethod(context, "===", newAssoc).isTrue()) return context.tru;
-            }
-            return context.fals;
-        } finally {
-            iteratorExit();
-        }
+        return getDelegate().any_p(context, pattern, block);
     }
 
     /**
@@ -2472,78 +1010,49 @@ protected IRubyObject any_p_p(ThreadContext context, IRubyObject pattern) {
      * @return
      */
     public RubyHash dupFast(final ThreadContext context) {
-        final Ruby runtime = context.runtime;
-        RubyHash dup = new RubyHash(runtime, metaClass, this);
-
-        dup.setComparedByIdentity(this.isComparedByIdentity());
-
-        dup.ifNone = this.ifNone;
-
-        if ((this.hashFlags & PROCDEFAULT_HASH) != 0) {
-            dup.hashFlags |= PROCDEFAULT_HASH;
-        } else {
-            dup.hashFlags &= ~PROCDEFAULT_HASH;
-        }
-
-        return dup;
+        return getDelegate().dupFast(context);
     }
 
     public RubyHash withRuby2Keywords(boolean ruby2Keywords) {
-        setRuby2KeywordHash(ruby2Keywords);
-        return this;
+        return getDelegate().withRuby2Keywords(ruby2Keywords);
     }
 
     public boolean hasDefaultProc() {
-        return (hashFlags & PROCDEFAULT_HASH) != 0;
+        return getDelegate().hasDefaultProc();
     }
 
-    public IRubyObject getIfNone(){
-        return ifNone;
+    public IRubyObject getIfNone() {
+        return getDelegate().getIfNone();
     }
 
     @JRubyMethod
     public IRubyObject deconstruct_keys(ThreadContext context, IRubyObject _arg1) {
-        return this;
+        return getDelegate().deconstruct_keys(context, _arg1);
     }
 
     @JRubyMethod(name = "dig")
     public IRubyObject dig(ThreadContext context, IRubyObject arg0) {
-        return op_aref( context, arg0 );
+        return getDelegate().dig(context, arg0);
     }
 
     @JRubyMethod(name = "dig")
     public IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
-        final IRubyObject val = op_aref( context, arg0 );
-        return RubyObject.dig1(context, val, arg1);
+        return getDelegate().dig(context, arg0, arg1);
     }
 
     @JRubyMethod(name = "dig")
     public IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
-        final IRubyObject val = op_aref( context, arg0 );
-        return RubyObject.dig2(context, val, arg1, arg2);
+        return getDelegate().dig(context, arg0, arg1, arg2);
     }
 
     @JRubyMethod(name = "dig", required = 1, rest = true, checkArity = false)
     public IRubyObject dig(ThreadContext context, IRubyObject[] args) {
-        int argc = Arity.checkArgumentCount(context, args, 1, -1);
-
-        final IRubyObject val = op_aref(context, args[0] );
-        return argc == 1 ? val : RubyObject.dig(context, val, args, 1);
+        return getDelegate().dig(context, args);
     }
 
     @JRubyMethod
     public IRubyObject to_proc(ThreadContext context) {
-        Block block = CallBlock19.newCallClosure(
-                this,
-                this.metaClass,
-                Signature.ONE_ARGUMENT,
-                (context1, args, procBlock) -> {
-                    Arity.checkArgumentCount(context1, args, 1, 1);
-                    return op_aref(context1, args[0]);
-                },
-                context);
-
-        return RubyProc.newProc(context.runtime, block, Block.Type.LAMBDA);
+        return getDelegate().to_proc(context);
     }
 
     @JRubyMethod(meta = true)
@@ -2563,7 +1072,7 @@ public static IRubyObject ruby2_keywords_hash_p(ThreadContext context, IRubyObje
         return asBoolean(context, ((RubyHash) arg).isRuby2KeywordHash());
     }
 
-    private static class VisitorIOException extends RuntimeException {
+    protected static class VisitorIOException extends RuntimeException {
         VisitorIOException(Throwable cause) {
             super(cause);
         }
@@ -2584,7 +1093,7 @@ public static void marshalTo(final RubyHash hash, final org.jruby.runtime.marsha
             throw (IOException)e.getCause();
         }
 
-        if (hash.ifNone != UNDEF) output.dumpObject(hash.ifNone);
+        if (hash.getIfNone() != UNDEF) output.dumpObject(hash.getIfNone());
     }
 
     public static void marshalTo(ThreadContext context, RubyOutputStream out, final RubyHash hash, final MarshalDumper output) {
@@ -2603,7 +1112,7 @@ public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyOb
             throw Error.toRubyException(context, (IOException) e.getCause());
         }
 
-        if (hash.ifNone != UNDEF) output.dumpObject(context, out, hash.ifNone);
+        if (hash.getIfNone() != UNDEF) output.dumpObject(context, out, hash.getIfNone());
     }
 
     @Deprecated(since = "10.0.0.0", forRemoval = true)
@@ -2623,14 +1132,15 @@ public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyOb
     @Deprecated(since = "10.0.0.0", forRemoval = true)
     @SuppressWarnings("removal")
     public static RubyHash unmarshalFrom(org.jruby.runtime.marshal.UnmarshalStream input, boolean defaultValue) throws IOException {
-        RubyHash result = (RubyHash) input.entry(newHash(input.getRuntime()));
+        Ruby runtime = input.getRuntime();
+        RubyHash result = (RubyHash) input.entry(newHash(runtime));
         int size = input.unmarshalInt();
 
         for (int i = 0; i < size; i++) {
-            result.fastASetCheckString(input.getRuntime(), input.unmarshalObject(), input.unmarshalObject());
+            result.fastASetCheckString(runtime, input.unmarshalObject(), input.unmarshalObject());
         }
 
-        if (defaultValue) result.default_value_set(input.unmarshalObject());
+        if (defaultValue) result.default_value_set(runtime.getCurrentContext(), input.unmarshalObject());
         return result;
     }
 
@@ -2644,7 +1154,7 @@ public static RubyHash unmarshalFrom(ThreadContext context, RubyInputStream in,
             result.fastASetCheckString(context.runtime, input.unmarshalObject(context, in), input.unmarshalObject(context, in));
         }
 
-        if (defaultValue) result.default_value_set(input.unmarshalObject(context, in));
+        if (defaultValue) result.default_value_set(context, input.unmarshalObject(context, in));
         return result;
     }
 
@@ -2653,544 +1163,114 @@ public Class getJavaClass() {
         return Map.class;
     }
 
+
     // Satisfy java.util.Map interface (for Java integration)
 
     @Override
     public int size() {
-        return size;
+        return getDelegate().size();
     }
 
     @Override
     public boolean isEmpty() {
-        return size() == 0;
+        return getDelegate().isEmpty();
     }
 
     @Override
     public boolean containsKey(Object key) {
-        return internalGet(JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, key)) != null;
+        return getDelegate().containsKey(key);
     }
 
     @Override
     public boolean containsValue(Object value) {
-        return hasValue(metaClass.runtime.getCurrentContext(), JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, value));
+        return getDelegate().containsValue(value);
     }
 
     @Override
     public Object get(Object key) {
-        IRubyObject gotten = internalGet(JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, key));
-        return gotten == null ? null : gotten.toJava(Object.class);
+        return getDelegate().get(key);
     }
 
     @Override
     public Object put(Object key, Object value) {
-        Ruby runtime = metaClass.runtime;
-        IRubyObject existing = internalJavaPut(JavaUtil.convertJavaToUsableRubyObject(runtime, key), JavaUtil.convertJavaToUsableRubyObject(runtime, value));
-        return existing == null ? null : existing.toJava(Object.class);
+        return getDelegate().put(key, value);
     }
 
     @Override
     public Object remove(Object key) {
-        IRubyObject rubyKey = JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, key);
-        return internalDelete(rubyKey).value;
+        return getDelegate().remove(key);
     }
 
     @Override
     public void putAll(Map map) {
-        final Ruby runtime = metaClass.runtime;
-        @SuppressWarnings("unchecked")
-        final Iterator<Map.Entry> iter = map.entrySet().iterator();
-        while ( iter.hasNext() ) {
-            Map.Entry entry = iter.next();
-            internalPut(
-                JavaUtil.convertJavaToUsableRubyObject(runtime, entry.getKey()),
-                JavaUtil.convertJavaToUsableRubyObject(runtime, entry.getValue())
-            );
-        }
+        getDelegate().putAll(map);
     }
 
     @Override
     public void clear() {
-        rb_clear(getRuntime().getCurrentContext());
+        getDelegate().clear();
     }
 
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof RubyHash)) return false;
-        if (this == other) return true;
-        return op_equal(metaClass.runtime.getCurrentContext(), (RubyHash)other).isTrue();
+        return getDelegate().equals(other);
     }
 
     @Override
     public Set keySet() {
-        return new BaseSet(KEY_VIEW);
-    }
-
-    public Set directKeySet() {
-        return new BaseSet(DIRECT_KEY_VIEW);
+        return getDelegate().keySet();
     }
 
     @Override
     public Collection values() {
-        return new BaseCollection(VALUE_VIEW);
-    }
-
-    public Collection directValues() {
-        return new BaseCollection(DIRECT_VALUE_VIEW);
+        return getDelegate().values();
     }
 
     @Override
     public Set entrySet() {
-        return new BaseSet(ENTRY_VIEW);
+        return getDelegate().entrySet();
     }
 
-    public Set directEntrySet() {
-        return new BaseSet(DIRECT_ENTRY_VIEW);
+    public Set directKeySet() {
+        return getDelegate().directKeySet();
     }
 
-    private final RaiseException concurrentModification() {
-        return metaClass.runtime.newConcurrencyError(
-                "Detected invalid hash contents due to unsynchronized modifications with concurrent users");
+    public Collection directValues() {
+        return getDelegate().directValues();
+    }
+
+    public Set directEntrySet() {
+        return getDelegate().directEntrySet();
     }
 
-    /**
-     * Is this object compared by identity or not?
-     *
-     * @return true if this object is compared by identity, false otherwise
-     */
     public boolean isComparedByIdentity() {
-        return (hashFlags & COMPARE_BY_IDENTITY) != 0;
+        return getDelegate().isComparedByIdentity();
     }
 
-    /**
-     * Sets whether this object is compared by identity or not.
-     *
-     * @param comparedByIdentity should this object be compared by identity?
-     */
     public void setComparedByIdentity(boolean comparedByIdentity) {
-        set(COMPARE_BY_IDENTITY, comparedByIdentity);
+        getDelegate().setComparedByIdentity(comparedByIdentity);
     }
 
     public boolean isRuby2KeywordHash() {
-        return (hashFlags & RUBY2_KEYWORD) != 0;
+        return getDelegate().isRuby2KeywordHash();
     }
 
     public void setRuby2KeywordHash(boolean value) {
-        set(RUBY2_KEYWORD, value);
-    }
-
-    public final void set(int flag, boolean set) {
-        if (set) {
-            hashFlags |= flag;
-        } else {
-            hashFlags &= ~flag;
-        }
-    }
-
-    public final boolean get(int flag) {
-        return (hashFlags & flag) != 0;
-    }
-
-    private class BaseSet extends AbstractSet {
-        final EntryView view;
-
-        public BaseSet(EntryView view) {
-            this.view = view;
-        }
-
-        @Override
-        public Iterator iterator() {
-            return new BaseIterator(view);
-        }
-
-        @Override
-        public boolean contains(Object o) {
-            return view.contains(RubyHash.this, o);
-        }
-
-        @Override
-        public void clear() {
-            RubyHash.this.clear();
-        }
-
-        @Override
-        public int size() {
-            return RubyHash.this.size();
-        }
-
-        @Override
-        public boolean remove(Object o) {
-            return view.remove(RubyHash.this, o);
-        }
-    }
-
-    private class BaseCollection extends AbstractCollection {
-        final EntryView view;
-
-        public BaseCollection(EntryView view) {
-            this.view = view;
-        }
-
-        @Override
-        public Iterator iterator() {
-            return new BaseIterator(view);
-        }
-
-        @Override
-        public boolean contains(Object o) {
-            return view.contains(RubyHash.this, o);
-        }
-
-        @Override
-        public void clear() {
-            RubyHash.this.clear();
-        }
-
-        @Override
-        public int size() {
-            return RubyHash.this.size();
-        }
-
-        @Override
-        public boolean remove(Object o) {
-            return view.remove(RubyHash.this, o);
-        }
-    }
-
-    private class BaseIterator implements Iterator {
-        final private EntryView view;
-        private RubyHashEntry entry;
-        private boolean peeking;
-        private int startGeneration;
-
-        public BaseIterator(EntryView view) {
-            this.view = view;
-            this.entry = head;
-            this.startGeneration = generation;
-        }
-
-        private void advance(boolean consume) {
-            if (!peeking) {
-                do {
-                    if (startGeneration != generation) {
-                        startGeneration = generation;
-                        entry = head;
-                    }
-                    entry = entry.nextAdded;
-                } while (entry != head && !entry.isLive());
-            }
-            peeking = !consume;
-        }
-
-        @Override
-        public Object next() {
-            advance(true);
-            if (entry == head) {
-                peeking = true; // remain where we are
-                throw new NoSuchElementException();
-            }
-            return view.convertEntry(getRuntime(), entry);
-        }
-
-        // once hasNext has been called, we commit to next() returning
-        // the entry it found, even if it were subsequently deleted
-        @Override
-        public boolean hasNext() {
-            advance(false);
-            return entry != head;
-        }
-
-        @Override
-        public void remove() {
-            if (entry == head) {
-                throw new IllegalStateException("Iterator out of range");
-            }
-            internalDeleteEntry(entry);
-        }
-    }
-
-    private static abstract class EntryView {
-        public abstract Object convertEntry(Ruby runtime, RubyHashEntry value);
-        public abstract boolean contains(RubyHash hash, Object o);
-        public abstract boolean remove(RubyHash hash, Object o);
-    }
-
-    private static final EntryView DIRECT_KEY_VIEW = new EntryView() {
-        @Override
-        public Object convertEntry(Ruby runtime, RubyHashEntry entry) {
-            return entry.key;
-        }
-        @Override
-        public boolean contains(RubyHash hash, Object o) {
-            if (!(o instanceof IRubyObject)) return false;
-            return hash.internalGet((IRubyObject)o) != null;
-        }
-        @Override
-        public boolean remove(RubyHash hash, Object o) {
-            if (!(o instanceof IRubyObject)) return false;
-            return hash.internalDelete((IRubyObject)o) != NO_ENTRY;
-        }
-    };
-
-    private static final EntryView KEY_VIEW = new EntryView() {
-        @Override
-        public Object convertEntry(Ruby runtime, RubyHashEntry entry) {
-            return entry.key.toJava(Object.class);
-        }
-        @Override
-        public boolean contains(RubyHash hash, Object o) {
-            return hash.containsKey(o);
-        }
-        @Override
-        public boolean remove(RubyHash hash, Object o) {
-            return hash.remove(o) != null;
-        }
-    };
-
-    private static final EntryView DIRECT_VALUE_VIEW = new EntryView() {
-        @Override
-        public Object convertEntry(Ruby runtime, RubyHashEntry entry) {
-            return entry.value;
-        }
-        @Override
-        public boolean contains(RubyHash hash, Object o) {
-            if (!(o instanceof IRubyObject)) return false;
-            IRubyObject obj = (IRubyObject)o;
-            return hash.hasValue(obj.getRuntime().getCurrentContext(), obj);
-        }
-        @Override
-        public boolean remove(RubyHash hash, Object o) {
-            if (!(o instanceof IRubyObject)) return false;
-            IRubyObject obj = (IRubyObject) o;
-            IRubyObject key = hash.internalIndex(obj.getRuntime().getCurrentContext(), obj);
-            if (key == null) return false;
-            return hash.internalDelete(key) != NO_ENTRY;
-        }
-    };
-
-    private static final EntryView VALUE_VIEW = new EntryView() {
-        @Override
-        public Object convertEntry(Ruby runtime, RubyHashEntry entry) {
-            return entry.value.toJava(Object.class);
-        }
-        @Override
-        public boolean contains(RubyHash hash, Object o) {
-            return hash.containsValue(o);
-        }
-        @Override
-        public boolean remove(RubyHash hash, Object o) {
-            Ruby runtime = hash.metaClass.runtime;
-            IRubyObject value = JavaUtil.convertJavaToUsableRubyObject(runtime, o);
-            IRubyObject key = hash.internalIndex(runtime.getCurrentContext(), value);
-            if (key == null) return false;
-            return hash.internalDelete(key) != NO_ENTRY;
-        }
-    };
-
-    private static final EntryView DIRECT_ENTRY_VIEW = new EntryView() {
-        @Override
-        public Object convertEntry(Ruby runtime, RubyHashEntry entry) {
-            return entry;
-        }
-        @Override
-        public boolean contains(RubyHash hash, Object o) {
-            if (!(o instanceof RubyHashEntry)) return false;
-            RubyHashEntry entry = (RubyHashEntry)o;
-            RubyHashEntry candidate = hash.internalGetEntry(entry.key);
-            return candidate != NO_ENTRY && entry.equals(candidate);
-        }
-        @Override
-        public boolean remove(RubyHash hash, Object o) {
-            if (!(o instanceof RubyHashEntry)) return false;
-            return hash.internalDeleteEntry((RubyHashEntry)o) != NO_ENTRY;
-        }
-    };
-
-    private static final EntryView ENTRY_VIEW = new EntryView() {
-        @Override
-        public Object convertEntry(Ruby runtime, RubyHashEntry entry) {
-            return new ConvertingEntry(runtime, entry);
-        }
-        @Override
-        public boolean contains(RubyHash hash, Object o) {
-            if (!(o instanceof ConvertingEntry)) return false;
-            ConvertingEntry entry = (ConvertingEntry)o;
-            RubyHashEntry candidate = hash.internalGetEntry(entry.entry.key);
-            return candidate != NO_ENTRY && entry.entry.equals(candidate);
-        }
-        @Override
-        public boolean remove(RubyHash hash, Object o) {
-            if (!(o instanceof ConvertingEntry)) return false;
-            ConvertingEntry entry = (ConvertingEntry)o;
-            return hash.internalDeleteEntry(entry.entry) != NO_ENTRY;
-        }
-    };
-
-    private static class ConvertingEntry implements Map.Entry {
-        private final RubyHashEntry entry;
-        private final Ruby runtime;
-
-        public ConvertingEntry(Ruby runtime, RubyHashEntry entry) {
-            this.entry = entry;
-            this.runtime = runtime;
-        }
-
-        @Override
-        public Object getKey() {
-            return entry.key.toJava(Object.class);
-        }
-        @Override
-        public Object getValue() {
-            return entry.value.toJava(Object.class);
-        }
-        @Override
-        public Object setValue(Object o) {
-            return entry.setValue(JavaUtil.convertJavaToUsableRubyObject(runtime, o));
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof ConvertingEntry)) {
-                return false;
-            }
-            ConvertingEntry other = (ConvertingEntry)o;
-            return entry.equals(other.entry);
-        }
-
-        @Override
-        public int hashCode() {
-            return entry.hashCode();
-        }
-    }
-
-    /**
-     * Note: this is included as a compatibility measure for AR-JDBC
-     * @deprecated use RubyHash.op_aset instead
-     */
-    @Deprecated(forRemoval = true)
-    public IRubyObject aset(IRubyObject key, IRubyObject value) {
-        return op_aset(metaClass.runtime.getCurrentContext(), key, value);
-    }
-
-    /**
-     * Note: this is included as a compatibility measure for Mongrel+JRuby
-     * @deprecated use RubyHash.op_aref instead
-     */
-    @Deprecated(forRemoval = true)
-    public IRubyObject aref(IRubyObject key) {
-        return op_aref(metaClass.runtime.getCurrentContext(), key);
-    }
-
-    private static HashSites sites(ThreadContext context) {
-        return context.sites.Hash;
+        getDelegate().setRuby2KeywordHash(value);
     }
 
-    @Deprecated(since = "1.7.5")
-    public IRubyObject op_aset(IRubyObject key, IRubyObject value) {
-        return op_aset(metaClass.runtime.getCurrentContext(), key, value);
+    protected void set(int flag, boolean set) {
+        getDelegate().set(flag, set);
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public IRubyObject each_pair(final ThreadContext context, final Block block) {
-        return block.isGiven() ? each_pairCommon(context, block) : enumeratorizeWithSize(context, this, "each_pair", RubyHash::size);
-    }
-
-    @Deprecated(since = "9.1.3.0")
-    public RubyHash each_pairCommon(final ThreadContext context, final Block block, final boolean oneNine) {
-        iteratorVisitAll(context, YieldKeyValueArrayVisitor, block);
-
-        return this;
+    protected boolean get(int flag) {
+        return getDelegate().get(flag);
     }
 
+    // Still used by jruby-openssl
     @Deprecated(since = "9.1.3.0")
     public final void visitAll(Visitor visitor) {
         // use -1 to disable concurrency checks
         visitLimited(getRuntime().getCurrentContext(), visitor, -1, null);
     }
-
-    /** rb_hash_default
-     *
-     */
-    @Deprecated(since = "9.1.3.0")
-    public IRubyObject default_value_get(ThreadContext context, IRubyObject[] args) {
-        return switch (args.length) {
-            case 0 -> default_value_get(context);
-            case 1 -> default_value_get(context, args[0]);
-            default -> throw argumentError(context, args.length, 1);
-        };
-    }
-
-    @Deprecated(since = "9.1.16.0")
-    protected void internalPutSmall(final IRubyObject key, final IRubyObject value, final boolean checkForExisting) {
-        internalPutNoResize(key, value, checkForExisting);
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    @Override
-    public RubyArray to_a() {
-        return to_a(getCurrentContext());
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public IRubyObject default_value_set(final IRubyObject defaultValue) {
-        return default_value_set(getCurrentContext(), defaultValue);
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public IRubyObject default_proc() {
-        return (hashFlags & PROCDEFAULT_HASH) != 0 ? ifNone : metaClass.runtime.getNil();
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public IRubyObject set_default_proc(IRubyObject proc) {
-        return set_default_proc(getCurrentContext(), proc);
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public RubyFixnum rb_size() {
-        return rb_size(getCurrentContext());
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public RubyBoolean empty_p() {
-        return asBoolean(getCurrentContext(), isEmpty());
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public RubyHash rehash() {
-        return rehash(getCurrentContext());
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public RubyHash to_hash() {
-        return to_hash(getCurrentContext());
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public final RubyArray rb_values() {
-        return values(metaClass.runtime.getCurrentContext());
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public RubyHash rb_clear() {
-        return rb_clear(getCurrentContext());
-    }
-
-    @Deprecated(since = "9.4.6.0")
-    public IRubyObject any_p(ThreadContext context, IRubyObject[] args, Block block) {
-        return switch (args.length) {
-            case 0 -> any_p(context, block);
-            case 1 -> any_p(context, args[0], block);
-            default -> throw argumentError(context, args.length, 0, 1);
-        };
-    }
-
-    @Deprecated(since = "9.4.6.0")
-    public IRubyObject initialize(IRubyObject[] args, final Block block) {
-        var context = getCurrentContext();
-        return switch (args.length) {
-            case 0 -> initialize(context, block);
-            case 1 -> initialize(context, args[0], block);
-            default -> throw argumentError(context, args.length, 0, 1);
-        };
-    }
 }
diff --git a/core/src/main/java/org/jruby/RubyHashLinkedBuckets.java b/core/src/main/java/org/jruby/RubyHashLinkedBuckets.java
new file mode 100644
index 00000000000..98661afd3aa
--- /dev/null
+++ b/core/src/main/java/org/jruby/RubyHashLinkedBuckets.java
@@ -0,0 +1,2727 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2001 Chad Fowler <chadfowler@chadfowler.com>
+ * Copyright (C) 2001 Alan Moore <alan_moore@gmx.net>
+ * Copyright (C) 2001-2002 Benoit Cerrina <b.cerrina@wanadoo.fr>
+ * Copyright (C) 2001-2004 Jan Arne Petersen <jpetersen@uni-bonn.de>
+ * Copyright (C) 2002-2004 Anders Bengtsson <ndrsbngtssn@yahoo.se>
+ * Copyright (C) 2004-2006 Thomas E Enebo <enebo@acm.org>
+ * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
+ * Copyright (C) 2005 Charles O Nutter <headius@headius.com>
+ * Copyright (C) 2006 Ola Bini <Ola.Bini@ki.se>
+ * Copyright (C) 2006 Tim Azzopardi <tim@tigerfive.com>
+ * Copyright (C) 2006 Miguel Covarrubias <mlcovarrubias@gmail.com>
+ * Copyright (C) 2007 MenTaLguY <mental@rydia.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby;
+
+import com.headius.backport9.buffer.Buffers;
+import org.jcodings.specific.USASCIIEncoding;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.api.Create;
+import org.jruby.api.Error;
+import org.jruby.ast.util.ArgsUtil;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.ir.runtime.IRBreakJump;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Arity;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.Builtins;
+import org.jruby.runtime.CallBlock19;
+import org.jruby.runtime.Helpers;
+import org.jruby.runtime.JavaSites.HashSites;
+import org.jruby.runtime.Signature;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.callsite.CachingCallSite;
+import org.jruby.runtime.marshal.MarshalDumper;
+import org.jruby.runtime.marshal.MarshalLoader;
+import org.jruby.util.ByteList;
+import org.jruby.util.RecursiveComparator;
+import org.jruby.util.TypeConverter;
+import org.jruby.util.io.RubyInputStream;
+import org.jruby.util.io.RubyOutputStream;
+
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteBuffer;
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import static org.jruby.RubyEnumerator.SizeFn;
+import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
+import static org.jruby.api.Access.hashClass;
+import static org.jruby.api.Convert.asBoolean;
+import static org.jruby.api.Convert.asFixnum;
+import static org.jruby.api.Create.newArray;
+import static org.jruby.api.Create.newSharedString;
+import static org.jruby.api.Error.argumentError;
+import static org.jruby.api.Error.runtimeError;
+import static org.jruby.api.Error.typeError;
+import static org.jruby.api.Warn.warn;
+import static org.jruby.runtime.ThreadContext.hasKeywords;
+import static org.jruby.runtime.Visibility.PRIVATE;
+import static org.jruby.util.Inspector.EMPTY_HASH_BL;
+import static org.jruby.util.Inspector.RECURSIVE_HASH_BL;
+
+// Design overview:
+//
+// RubyHash is implemented as hash table with a singly-linked list of
+// RubyHash.RubyHashEntry objects for each bucket.  RubyHashEntry objects
+// are also kept in a doubly-linked list which reflects their insertion
+// order and is used for iteration.  For simplicity, this latter list is
+// circular; a dummy RubyHashEntry, RubyHash.head, is used to mark the
+// ends of the list.
+//
+// When an entry is removed from the table, it is also removed from the
+// doubly-linked list.  However, while the reference to the previous
+// RubyHashEntry is cleared (to mark the entry as dead), the reference
+// to the next RubyHashEntry is preserved so that iterators are not
+// invalidated: any iterator with a reference to a dead entry can climb
+// back up into the list of live entries by chasing next references until
+// it finds a live entry (or head).
+//
+// Ordinarily, this scheme would require O(N) time to clear a hash (since
+// each RubyHashEntry would need to be visited and unlinked from the
+// iteration list), but RubyHash also maintains a generation count.  Every
+// time the hash is cleared, the doubly-linked list is simply discarded and
+// the generation count incremented.  Iterators check to see whether the
+// generation count has changed; if it has, they reset themselves back to
+// the new start of the list.
+//
+// This design means that iterators are never invalidated by changes to the
+// hashtable, and they do not need to modify the structure during their
+// lifecycle.
+//
+
+/** Implementation of the Hash class.
+ *
+ *  Concurrency: no synchronization is required among readers, but
+ *  all users must synchronize externally with writers.
+ *
+ */
+@JRubyClass(name = "Hash", include="Enumerable")
+public class RubyHashLinkedBuckets extends RubyHash {
+    protected int size;
+
+    private byte hashFlags;
+    private IRubyObject ifNone;
+
+    private final RubyHashLinkedBuckets.RubyHashEntryLink head = new RubyHashLinkedBuckets.RubyHashEntryLink();
+
+    @SuppressWarnings("unused")
+    private volatile short iteratorCount;
+
+    private static final VarHandle ITERATOR_UPDATER;
+    static {
+        VarHandle iterUp;
+        try {
+            iterUp = MethodHandles.lookup().findVarHandle(RubyHashLinkedBuckets.class, "iteratorCount", short.class);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        ITERATOR_UPDATER = iterUp;
+    }
+
+    RubyHashLinkedBuckets(Ruby runtime, RubyClass klass, RubyHash other) {
+        super(runtime, klass, true, 0);
+        this.ifNone = UNDEF;
+        copyFrom(this, other, false);
+    }
+
+    protected RubyHashLinkedBuckets(Ruby runtime, RubyClass klass) {
+        super(runtime, klass, true, 0);
+        this.ifNone = UNDEF;
+        allocFirst();
+    }
+
+    RubyHashLinkedBuckets(Ruby runtime, RubyClass klass, boolean objectSpace) {
+        super(runtime, klass, objectSpace, 0);
+        this.ifNone = UNDEF;
+        allocFirst();
+    }
+
+    protected RubyHashLinkedBuckets(Ruby runtime, int buckets) {
+        this(runtime, UNDEF, buckets);
+    }
+
+    protected RubyHashLinkedBuckets(Ruby runtime) {
+        this(runtime, UNDEF);
+    }
+
+    protected RubyHashLinkedBuckets(Ruby runtime, IRubyObject defaultValue) {
+        super(runtime, runtime.getHash(), true, 0);
+        this.ifNone = defaultValue;
+        allocFirst();
+    }
+
+    protected RubyHashLinkedBuckets(Ruby runtime, IRubyObject defaultValue, int buckets) {
+        this(runtime, buckets, true);
+        this.ifNone = defaultValue;
+    }
+
+    protected RubyHashLinkedBuckets(Ruby runtime, RubyClass metaClass, IRubyObject defaultValue, RubyHashEntry[] initialTable, int threshold) {
+        super(runtime, metaClass, true, 0);
+        this.ifNone = defaultValue;
+        this.setTable(initialTable);
+    }
+
+    /*
+     *  Constructor for internal usage (mainly for Array#|, Array#&, Array#- and Array#uniq)
+     *  it doesn't initialize ifNone field
+     */
+    RubyHashLinkedBuckets(Ruby runtime, int buckets, boolean objectSpace) {
+        super(runtime, runtime.getHash(), objectSpace, 0);
+        this.ifNone = UNDEF;
+        // FIXME: current hash implementation cannot deal with no buckets so we will add a single one
+        //  (this constructor will go away once open addressing is added back ???)
+        if (buckets <= 0) buckets = 1;
+        allocFirst(buckets);
+    }
+
+    // TODO should this be deprecated ? (to be efficient, internals should deal with RubyHash directly)
+    RubyHashLinkedBuckets(Ruby runtime, Map valueMap, IRubyObject defaultValue) {
+        super(runtime, runtime.getHash(), true, 0);
+        this.ifNone = defaultValue;
+        allocFirst();
+
+        for (Iterator iter = valueMap.entrySet().iterator();iter.hasNext();) {
+            Entry e = (Entry)iter.next();
+            internalPut((IRubyObject)e.getKey(), (IRubyObject)e.getValue());
+        }
+    }
+
+    private static void copyFrom(RubyHashLinkedBuckets self, RubyHash other, boolean identity) {
+        if (other instanceof RubyHashLinkedBuckets lbOther) {
+            self.setTable(lbOther.internalCopyTable(self.head));
+            self.size = other.size();
+        }
+
+        self.setComparedByIdentity(identity);
+    }
+
+    public static RubyHashLinkedBuckets newLBHash(Ruby runtime, int buckets) {
+        return new RubyHashLinkedBuckets(runtime, buckets);
+    }
+
+    public static RubyHashLinkedBuckets newLBHash(Ruby runtime, int buckets, boolean objectSpace) {
+        return new RubyHashLinkedBuckets(runtime, buckets, objectSpace);
+    }
+
+    public static RubyHashLinkedBuckets newLBHash(Ruby runtime) {
+        return new RubyHashLinkedBuckets(runtime);
+    }
+
+    public static RubyHashLinkedBuckets newLBHash(Ruby runtime, IRubyObject defaultValue) {
+        return new RubyHashLinkedBuckets(runtime, defaultValue);
+    }
+
+    public static RubyHashLinkedBuckets newLBHash(Ruby runtime, IRubyObject defaultValue, int buckets) {
+        return new RubyHashLinkedBuckets(runtime, defaultValue, buckets);
+    }
+
+    protected void set(int flag, boolean set) {
+        if (set) {
+            hashFlags |= flag;
+        } else {
+            hashFlags &= ~flag;
+        }
+    }
+
+    protected boolean get(int flag) {
+        return (hashFlags & flag) != 0;
+    }
+
+    private void allocFirst() {
+        setTable(new RubyHashEntry[MRI_INITIAL_CAPACITY]);
+    }
+
+    private void allocFirst(int buckets) {
+        if (buckets <= 0) throw new ArrayIndexOutOfBoundsException("invalid bucket size: " + buckets);
+        setTable(new RubyHashEntry[buckets]);
+    }
+
+    private void alloc() {
+        head.prevAdded = head.nextAdded = head;
+        allocFirst();
+    }
+
+    /* ============================
+     * Here are hash internals
+     * (This could be extracted to a separate class but it's not too large though)
+     * ============================
+     */
+
+    public static final int MRI_PRIMES[] = {
+        8 + 3, 16 + 3, 32 + 5, 64 + 3, 128 + 3, 256 + 27, 512 + 9, 1024 + 9, 2048 + 5, 4096 + 3,
+        8192 + 27, 16384 + 43, 32768 + 3, 65536 + 45, 131072 + 29, 262144 + 3, 524288 + 21, 1048576 + 7,
+        2097152 + 17, 4194304 + 15, 8388608 + 9, 16777216 + 43, 33554432 + 35, 67108864 + 15,
+        134217728 + 29, 268435456 + 3, 536870912 + 11, 1073741824 + 85, 0
+    };
+
+    private static final int MRI_INITIAL_CAPACITY = MRI_PRIMES[0];
+
+
+    { head.prevAdded = head.nextAdded = head; }
+
+    private static int MRIHashValue(int h) {
+        return h & HASH_SIGN_BIT_MASK;
+    }
+
+    private static final int HASH_SIGN_BIT_MASK = ~(1 << 31);
+
+    private synchronized void resize(int newCapacity) {
+        final RubyHashEntry[] oldTable = getTable();
+        final RubyHashEntry[] newTable = new RubyHashEntry[newCapacity];
+
+        for (int j = 0; j < oldTable.length; j++) {
+            RubyHashEntry entry = oldTable[j];
+            oldTable[j] = null;
+
+            while (entry != null) {
+                RubyHashEntry next = entry.next();
+                int i = bucketIndex(entry.hash(), newCapacity);
+                entry.next(newTable[i]);
+                newTable[i] = entry;
+                entry = next;
+            }
+        }
+
+        setTable(newTable);
+    }
+
+    private static final int MIN_CAPA = 8;
+    private static final int ST_DEFAULT_MAX_DENSITY = 2;
+
+    protected final int hashValue(final IRubyObject key) {
+        final int h = isComparedByIdentity() ? System.identityHashCode(key) : key.hashCode();
+        return MRIHashValue(h);
+    }
+
+    private static int bucketIndex(final int h, final int length) {
+        return ((h & HASH_SIGN_BIT_MASK) % length);
+    }
+
+    private void checkResize() {
+        if (size / getTable().length > ST_DEFAULT_MAX_DENSITY) {
+            int forSize = getTable().length + 1; // size + 1;
+            for (int i=0, newCapacity = MIN_CAPA; i < MRI_PRIMES.length; i++, newCapacity <<= 1) {
+                if (newCapacity > forSize) {
+                    resize(MRI_PRIMES[i]);
+                    return;
+                }
+            }
+            // suboptimal for large hashes (> 1073741824 + 85 entries) not very likely to happen
+        }
+    }
+
+    protected final void checkIterating() {
+        if (iteratorCount > 0) {
+            throw metaClass.runtime.newRuntimeError("can't add a new key into hash during iteration");
+        }
+    }
+
+    // put implementation
+
+    public IRubyObject internalPut(final IRubyObject key, final IRubyObject value) {
+        checkResize();
+        return internalPutNoResize(key, value, true);
+    }
+
+    private void internalPutSmall(final IRubyObject key, final IRubyObject value) {
+        internalPutNoResize(key, value, true);
+    }
+
+    private void internalPut(final IRubyObject key, final IRubyObject value, final boolean checkForExisting) {
+        checkResize();
+        internalPutNoResize(key, value, checkForExisting);
+    }
+
+    final boolean internalPutIfNoKey(final IRubyObject key, final IRubyObject value) {
+        if (internalGetEntry(key) == NULL_ENTRY) {
+            internalPut(key, value);
+            return true;
+        }
+        return false;
+    }
+
+    protected IRubyObject internalPutNoResize(final IRubyObject key, final IRubyObject value, final boolean checkForExisting) {
+        final int hash = hashValue(key);
+        final RubyHashEntry[] table = this.getTable();
+
+        final int i = bucketIndex(hash, table.length);
+
+        if (checkForExisting) {
+            for (RubyHashEntry entry = table[i]; entry != null; entry = entry.next()) {
+                if (internalKeyExist(entry.hash(), entry.key(), hash, key)) {
+                    IRubyObject existing = entry.value();
+                    entry.value(value);
+
+                    return existing;
+                }
+            }
+        }
+
+        checkIterating();
+
+        table[i] = new RubyHashEntry(hash, key, value, table[i], head);
+        size++;
+
+        // no existing entry
+        return null;
+    }
+
+    // get implementation
+
+    protected IRubyObject internalGet(IRubyObject key) { // specialized for value
+        return internalGetEntry(key).value();
+    }
+
+    protected RubyHashEntry internalGetEntry(IRubyObject key) {
+        if (size == 0) return NULL_ENTRY;
+
+        final int hash = hashValue(key);
+        final RubyHashEntry[] table = this.getTable();
+
+        for (RubyHashEntry entry = table[bucketIndex(hash, table.length)]; entry != null; entry = entry.next()) {
+            if (internalKeyExist(entry.hash(), entry.key(), hash, key)) {
+                return entry;
+            }
+        }
+        return NULL_ENTRY;
+    }
+
+    @Deprecated
+    @Override
+    final RubyHashEntry getEntry(IRubyObject key) {
+        return internalGetEntry(key);
+    }
+
+    private boolean internalKeyExist(int entryHash, IRubyObject entryKey, int hash, IRubyObject key) {
+        return (entryHash == hash
+                && (entryKey == key || (!isComparedByIdentity() && key.eql(entryKey))));
+    }
+
+    // delete implementation
+
+
+    protected RubyHashEntry internalDelete(final IRubyObject key) {
+        if (size == 0) return NULL_ENTRY;
+
+        return internalDelete(hashValue(key), MATCH_KEY, key);
+    }
+
+    protected RubyHashEntry internalDeleteEntry(final RubyHashEntry entry) {
+        // n.b. we need to recompute the hash in case the key object was modified
+        return internalDelete(hashValue(entry.key()), MATCH_ENTRY, entry);
+    }
+
+    private RubyHashEntry internalDelete(final int hash, final EntryMatchType matchType, final Object obj) {
+        final int i = bucketIndex(hash, getTable().length);
+
+        RubyHashEntry entry = getTable()[i];
+        if (entry != null) {
+            RubyHashEntry prior = null;
+            for (; entry != null; prior = entry, entry = entry.next()) {
+                if (entry.hash() == hash && matchType.matches(entry, obj)) {
+                    if (prior != null) {
+                        prior.next(entry.next());
+                    } else {
+                        getTable()[i] = entry.next();
+                    }
+                    entry.detach();
+                    size--;
+                    return entry;
+                }
+            }
+        }
+
+        return NULL_ENTRY;
+    }
+
+    private RubyHashEntry[] getTable() {
+        return (RubyHashEntry[]) state;
+    }
+
+    private void setTable(RubyHashEntry[] table) {
+        this.state = table;
+    }
+
+    private static abstract class EntryMatchType {
+        public abstract boolean matches(final RubyHashEntry entry, final Object obj);
+    }
+
+    private static final EntryMatchType MATCH_KEY = new EntryMatchType() {
+        @Override
+        public boolean matches(final RubyHashEntry entry, final Object obj) {
+            final IRubyObject key = entry.key();
+            return obj == key || (((IRubyObject)obj).eql(key));
+        }
+    };
+
+    private static final EntryMatchType MATCH_ENTRY = new EntryMatchType() {
+        @Override
+        public boolean matches(final RubyHashEntry entry, final Object obj) {
+            return entry.equals(obj);
+        }
+    };
+
+    private final RubyHashEntry[] internalCopyTable(RubyHashEntryLink destHead) {
+         RubyHashEntry[]newTable = new RubyHashEntry[getTable().length];
+
+         for (RubyHashEntryLink entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
+             int i = bucketIndex(entry.hash(), getTable().length);
+             newTable[i] = new RubyHashEntry(entry.hash(), entry.key(), entry.value(), newTable[i], destHead);
+         }
+         return newTable;
+    }
+
+    public <T> void visitAll(ThreadContext context, VisitorWithStateI visitor) {
+        long count = size;
+        int index = 0;
+        // visit not more than size entries
+        for (RubyHashEntryLink entry = head.nextAdded; entry != head && count != 0; entry = entry.nextAdded) {
+            if (entry != null && entry.isLive()) {
+                visitor.visit(context, this, entry.key(), entry.value(), index++);
+                count--;
+            }
+        }
+        // it does not handle all concurrent modification cases,
+        // but at least provides correct marshal as we have exactly size entries visited (count == 0)
+        // or if count < 0 - skipped concurrent modification checks
+        if (count > 0) throw concurrentModification();
+    }
+
+    public <T> void visitAll(ThreadContext context, VisitorWithState visitor, T state) {
+        // use -1 to disable concurrency checks
+        visitLimited(context, visitor, -1, state);
+    }
+
+    protected <T> void visitLimited(ThreadContext context, VisitorWithState visitor, long size, T state) {
+        long count = size;
+        int index = 0;
+        // visit not more than size entries
+        for (RubyHashEntryLink entry = head.nextAdded; entry != head && count != 0; entry = entry.nextAdded) {
+            if (entry != null && entry.isLive()) {
+                visitor.visit(context, this, entry.key(), entry.value(), index++, state);
+                count--;
+            }
+        }
+        // it does not handle all concurrent modification cases,
+        // but at least provides correct marshal as we have exactly size entries visited (count == 0)
+        // or if count < 0 - skipped concurrent modification checks
+        if (count > 0) throw concurrentModification();
+    }
+
+    public <T> boolean allSymbols() {
+        // visit not more than size entries
+        RubyHashEntryLink head = this.head;
+        for (RubyHashEntryLink entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
+            if (entry != null && entry.isLive()) {
+                if (!(entry.key() instanceof RubySymbol)) return false;
+            }
+        }
+        return true;
+    }
+
+    /* ============================
+     * End of hash internals
+     * ============================
+     */
+
+    /*  ================
+     *  Instance Methods
+     *  ================
+     */
+
+    /** rb_hash_initialize
+     *
+     */
+    @JRubyMethod(visibility = PRIVATE)
+    public IRubyObject initialize(ThreadContext context, final Block block) {
+        modify();
+
+        if (block.isGiven()) {
+            ifNone = context.runtime.newProc(Block.Type.PROC, block);
+            set(PROCDEFAULT_HASH, true);
+        } else {
+            ifNone = UNDEF;
+        }
+        return this;
+    }
+
+    @JRubyMethod(visibility = PRIVATE)
+    public IRubyObject initialize(ThreadContext context, IRubyObject _default, final Block block) {
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
+        modify();
+
+        if (keywords) {
+            IRubyObject[] opts = ArgsUtil.extractKeywordArgs(context, (RubyHash) _default, "capacity");
+            // This will allocFirst twice since it already happened before initialize was called.  I think this is ok?
+            if (opts[0] instanceof RubyFixnum fixnum && fixnum.asInt(context) > 0) allocFirst(fixnum.asInt(context));
+
+            if (block.isGiven()) {
+                ifNone = context.runtime.newProc(Block.Type.PROC, block);
+                set(PROCDEFAULT_HASH, true);
+            } else {
+                ifNone = UNDEF;
+            }
+        } else {
+            if (block.isGiven()) throw argumentError(context, 1, 0);
+
+            ifNone = _default;
+        }
+
+        return this;
+    }
+
+    @JRubyMethod(visibility = PRIVATE, keywords = true)
+    public IRubyObject initialize(ThreadContext context, IRubyObject _default, IRubyObject hash, final Block block) {
+        if (!hasKeywords(ThreadContext.resetCallInfo(context))) throw argumentError(context, 2, 0, 1);
+
+        IRubyObject[] opts = ArgsUtil.extractKeywordArgs(context, (RubyHash) hash, "capacity");
+
+        // This will allocFirst twice since it already happened before initialize was called.  I think this is ok?
+        if (opts[0] instanceof RubyFixnum fixnum && fixnum.asInt(context) > 0) allocFirst(fixnum.asInt(context));
+
+        modify();
+
+        if (block.isGiven()) throw argumentError(context, 1, 0);
+
+        ifNone = _default;
+
+        return this;
+    }
+
+    @JRubyMethod(name = "default")
+    public IRubyObject default_value_get(ThreadContext context) {
+        if (get(PROCDEFAULT_HASH)) {
+            return context.nil;
+        }
+        return ifNone == UNDEF ? context.nil : ifNone;
+    }
+
+    @JRubyMethod(name = "default")
+    public IRubyObject default_value_get(ThreadContext context, IRubyObject arg) {
+        if (get(PROCDEFAULT_HASH)) {
+            return sites(context).call.call(context, ifNone, ifNone, this, arg);
+        }
+        return ifNone == UNDEF ? context.nil : ifNone;
+    }
+
+    /** rb_hash_set_default
+     *
+     */
+    @JRubyMethod(name = "default=")
+    public IRubyObject default_value_set(ThreadContext context, final IRubyObject defaultValue) {
+        modify();
+
+        ifNone = defaultValue;
+        set(PROCDEFAULT_HASH, false);
+
+        return ifNone;
+    }
+
+    /** rb_hash_default_proc
+     *
+     */
+    @JRubyMethod
+    public IRubyObject default_proc(ThreadContext context) {
+        return get(PROCDEFAULT_HASH) ? ifNone : context.nil;
+    }
+
+    /** default_proc_arity_check
+     *
+     */
+    private void checkDefaultProcArity(ThreadContext context, Block block) {
+        int n = block.getSignature().arityValue();
+
+        if (block.type == Block.Type.LAMBDA && n != 2 && (n >= 0 || n < -3)) {
+            if (n < 0) n = -n-1;
+            throw typeError(context, "default_proc takes two arguments (2 for " + n + ")");
+        }
+    }
+
+    /** rb_hash_set_default_proc
+     *
+     */
+    @JRubyMethod(name = "default_proc=")
+    public IRubyObject set_default_proc(ThreadContext context, IRubyObject proc) {
+        modify();
+
+        if (proc.isNil()) {
+            ifNone = proc;
+            set(PROCDEFAULT_HASH, false);
+            return proc;
+        }
+
+        IRubyObject b = TypeConverter.convertToType(proc, context.runtime.getProc(), "to_proc");
+        if (b.isNil() || !(b instanceof RubyProc)) throw typeError(context, "wrong default_proc type ", proc, " (expected Proc)");
+
+        proc = b;
+        checkDefaultProcArity(context, ((RubyProc) proc).getBlock());
+        ifNone = proc;
+        set(PROCDEFAULT_HASH, true);
+        return proc;
+    }
+
+    /** rb_hash_modify
+     *
+     */
+    public void modify() {
+    	testFrozen("Hash");
+    }
+
+    /** inspect_hash
+     *
+     */
+    protected RubyString inspectHash(final ThreadContext context) {
+        final RubyString str = RubyString.newStringLight(context.runtime, DEFAULT_INSPECT_STR_SIZE, USASCIIEncoding.INSTANCE);
+
+        str.cat((byte)'{');
+
+        visitAll(context, InspectVisitor, str);
+        str.cat((byte)'}');
+        return str;
+    }
+
+    private static final VisitorWithState<RubyString> InspectVisitor = new VisitorWithState<RubyString>() {
+        @Override
+        // MRI: inspect_i for inspect_hash in hash.c
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyString str) {
+            RubyString keyStr;
+
+            boolean isSymbol = key instanceof RubySymbol;
+            boolean quote = false;
+            if (key instanceof RubySymbol symbol) {
+                keyStr = symbol.fstring();
+                quote = symbolKeyNeedsQuote(context, symbol);
+            } else {
+                keyStr = inspect(context, key);
+            }
+
+            if (str.size() > 1) {
+                str.catString(", ");
+            } else {
+                str.setEncoding(keyStr.getEncoding());
+            }
+
+            if (quote) {
+                str.append(keyStr.inspect(context));
+            } else {
+                str.append(keyStr);
+            }
+
+            str.catString(isSymbol ? ": " : " => ");
+
+            RubyString valStr = inspect(context, value);
+            str.append(valStr);
+        }
+
+        // MRI: symbol_key_needs_quote
+        boolean symbolKeyNeedsQuote(ThreadContext context, RubySymbol sym) {
+            RubyString str = sym.fstring();
+            int len = str.size();
+            if (len == 0 || !sym.isSimpleName(context)) return true;
+            ByteList bytes = str.getByteList();
+            int first = bytes.get(0);
+            if (first == '@' || first == '$' || first == '!') return true;
+            if (!RubyString.atCharBoundary(bytes.unsafeBytes(), bytes.begin(), bytes.begin() + bytes.getRealSize() - 1, bytes.begin() + bytes.realSize(), bytes.getEncoding())) return false;
+            switch (bytes.get(len - 1)) {
+                case '+':
+                case '-':
+                case '*':
+                case '/':
+                case '`':
+                case '%':
+                case '^':
+                case '&':
+                case '|':
+                case ']':
+                case '<':
+                case '=':
+                case '>':
+                case '~':
+                case '@':
+                    return true;
+                default:
+                    return false;
+            }
+        }
+    };
+
+    /**
+     * Append appropriate characters to indicate association (": " vs " => ").
+     *
+     * @param keyIsSymbol is the key a symbol
+     * @param bytes buffer to which to append
+     */
+    protected void appendAssociation(boolean keyIsSymbol, ByteList bytes) {
+        if (keyIsSymbol) {
+            bytes.append(':').append(' ');
+        } else {
+            bytes.append(' ').append('=').append('>').append(' ');
+        }
+    }
+
+    /** rb_hash_inspect
+     *
+     */
+    @JRubyMethod(name = "inspect")
+    public IRubyObject inspect(ThreadContext context) {
+        final Ruby runtime = context.runtime;
+
+        if (size() == 0) return newSharedString(context, EMPTY_HASH_BL);
+        if (runtime.isInspecting(this)) return newSharedString(context, RECURSIVE_HASH_BL);
+
+        try {
+            runtime.registerInspecting(this);
+            return inspectHash(context);
+        } finally {
+            runtime.unregisterInspecting(this);
+        }
+    }
+
+    /** rb_hash_size
+     *
+     */
+    @JRubyMethod(name = {"size", "length"})
+    public RubyFixnum rb_size(ThreadContext context) {
+        return asFixnum(context, size);
+    }
+
+    /**
+     * A size method suitable for lambda method reference implementation of {@link SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])}
+     *
+     * @see SizeFn#size(ThreadContext, IRubyObject, IRubyObject[])
+     */
+    private static IRubyObject size(ThreadContext context, RubyHashLinkedBuckets recv, IRubyObject[] args) {
+        return recv.rb_size(context);
+    }
+
+    /** rb_hash_empty_p
+     *
+     */
+    @JRubyMethod(name = "empty?")
+    public RubyBoolean empty_p(ThreadContext context) {
+        return size == 0 ? context.tru : context.fals;
+    }
+
+    /** rb_hash_to_a
+     *
+     */
+    @JRubyMethod(name = "to_a")
+    @Override
+    public RubyArray to_a(ThreadContext context) {
+        final Ruby runtime = context.runtime;
+        try {
+            final RubyArray result = RubyArrayNative.newBlankArrayInternal(runtime, size);
+
+            visitAll(context, RubyHashLinkedBuckets.StoreKeyValueVisitor, result);
+
+            return result;
+        } catch (NegativeArraySizeException nase) {
+            throw concurrentModification();
+        }
+    }
+
+    private static final VisitorWithState<RubyArray> StoreKeyValueVisitor = new VisitorWithState<RubyArray>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyArray result) {
+            result.storeInternal(context, index, newArray(context, key, value));
+        }
+    };
+
+    /** rb_hash_to_s &amp; to_s_hash
+     *
+     */
+    @JRubyMethod(name = "to_s")
+    public IRubyObject to_s(ThreadContext context) {
+        return inspect(context);
+    }
+
+    /** rb_hash_rehash
+     *
+     */
+    @JRubyMethod(name = "rehash")
+    public RubyHash rehash(ThreadContext context) {
+        if (iteratorCount > 0) throw runtimeError(context, "rehash during iteration");
+
+        modify();
+        final RubyHashEntry[] oldTable = getTable();
+        final RubyHashEntry[] newTable = new RubyHashEntry[oldTable.length];
+        Set<Integer> rehashedIndexes = new HashSet<>();
+        for (int j = 0; j < oldTable.length; j++) {
+            RubyHashEntry entry = oldTable[j];
+            oldTable[j] = null;
+            while (entry != null) {
+                RubyHashEntry next = entry.next();
+                int oldHash = entry.hash();
+                IRubyObject key = entry.key();
+                int newHash = hashValue(key);
+
+                int i = bucketIndex(newHash, newTable.length);
+
+                RubyHashEntry newEntry = newTable[i];
+                if (newEntry != null && internalKeyExist(newEntry.hash(), newEntry.key(), newHash, key)) {
+                    RubyHashEntryLink tmpNext = entry.nextAdded;
+                    RubyHashEntryLink tmpPrev = entry.prevAdded;
+                    tmpPrev.nextAdded = tmpNext;
+                    tmpNext.prevAdded = tmpPrev;
+                    size--;
+                } else {
+                    // replace entry if hash changed
+                    if (oldHash != newHash) {
+                        entry = new RubyHashEntry(entry, newHash);
+                        // memorize hash value
+                        rehashedIndexes.add(newHash);
+                    }
+
+                    entry.next(newEntry);
+                    newTable[i] = entry;
+                }
+                entry = next;
+            }
+        }
+        setTable(newTable);
+
+        // When a hash is large and contains duplicate keys, sometimes the above logic can not remove duplicate key.
+        // searches duplicate keys and removes it.
+        for (int hash : rehashedIndexes) {
+            RubyHashEntry entry = getTable()[bucketIndex(hash, newTable.length)];
+            while (entry != null) {
+                if (entry.hash() == hash) {
+                    RubyHashEntry nextEntry = entry.next();
+                    while (nextEntry != null) {
+                        if (internalKeyExist(entry.hash(), entry.key(), nextEntry.hash(), nextEntry.key())) {
+                            RubyHashEntryLink tmpNext = entry.nextAdded;
+                            RubyHashEntryLink tmpPrev = entry.prevAdded;
+                            tmpPrev.nextAdded = tmpNext;
+                            tmpNext.prevAdded = tmpPrev;
+                            size--;
+                        }
+                        nextEntry = nextEntry.next();
+                    }
+                }
+                entry = entry.next();
+            }
+        }
+        return this;
+    }
+
+    /** rb_hash_to_hash
+     *
+     */
+    @JRubyMethod(name = "to_hash")
+    public RubyHash to_hash(ThreadContext context) {
+        return this;
+    }
+
+    @JRubyMethod
+    public RubyHash to_h(ThreadContext context, Block block) {
+        if (block.isGiven()) return to_h_block(context, block);
+        return getType() == hashClass(context) ? this : Create.newHash(context).replace(context, this);
+    }
+
+    protected RubyHash to_h_block(ThreadContext context, Block block) {
+        RubyHash result = Create.newHash(context);
+
+        visitAll(context, (ctxt, self, key, value, index) -> {
+            IRubyObject elt = block.yieldArray(ctxt, newArray(ctxt, key, value), null);
+            IRubyObject keyValue = elt.checkArrayType();
+
+            if (keyValue == ctxt.nil) throw typeError(context, "wrong element type ", elt, " (expected array)");
+
+            var ary = (RubyArray<?>) keyValue;
+            if (ary.getLength() != 2) {
+                throw argumentError(context, "element has wrong array length " + "(expected 2, was " + ary.getLength() + ")");
+            }
+
+            result.fastASet(ary.eltInternal(0), ary.eltInternal(1));
+        });
+
+        return result;
+    }
+
+    @Override
+    public RubyHashLinkedBuckets convertToHash() {
+        return this;
+    }
+
+    public final void fastASet(IRubyObject key, IRubyObject value) {
+        internalPut(key, value);
+    }
+
+    public final void fastASetSmall(IRubyObject key, IRubyObject value) {
+        internalPutSmall(key, value);
+    }
+
+    // MRI: rb_hash_set_pair, fast/small version
+    public final void fastASetSmallPair(ThreadContext context, IRubyObject _pair) {
+        IRubyObject pair;
+
+        pair = TypeConverter.checkArrayType(context, _pair);
+        if (pair.isNil()) {
+            throw typeError(context, "wrong element type " + _pair.getType() + " (expected array)");
+        }
+        RubyArray pairAry = (RubyArray) pair;
+        int len = pairAry.size();
+        if (len != 2) {
+            throw argumentError(context, "element has wrong array length (expected 2, was " + len + ")");
+        }
+        fastASetSmall(pairAry.eltOk(0), pairAry.eltOk(1));
+    }
+
+    public final void fastASetCheckString(Ruby runtime, IRubyObject key, IRubyObject value) {
+      if (key instanceof RubyString strKey && !isComparedByIdentity()) {
+          op_asetForString(runtime, strKey, value);
+      } else {
+          internalPut(key, value);
+      }
+    }
+
+    public final void fastASetSmallCheckString(Ruby runtime, IRubyObject key, IRubyObject value) {
+        if (key instanceof RubyString strKey) {
+            op_asetSmallForString(runtime, strKey, value);
+        } else {
+            internalPutSmall(key, value);
+        }
+    }
+
+    public final void fastASet(Ruby runtime, IRubyObject key, IRubyObject value, boolean prepareString) {
+        if (prepareString) {
+            fastASetCheckString(runtime, key, value);
+        } else {
+            fastASet(key, value);
+        }
+    }
+
+    public final void fastASetSmall(Ruby runtime, IRubyObject key, IRubyObject value, boolean prepareString) {
+        if (prepareString) {
+            fastASetSmallCheckString(runtime, key, value);
+        } else {
+            fastASetSmall(key, value);
+        }
+    }
+
+    /**
+     * Set a key/value pair into this hash.
+     *
+     * @param context the current thread context
+     * @param key the key
+     * @param value the value
+     * @return the value set
+     */
+    // MRI: rb_hash_aset
+    @JRubyMethod(name = {"[]=", "store"})
+    public IRubyObject op_aset(ThreadContext context, IRubyObject key, IRubyObject value) {
+        modify();
+
+        fastASetCheckString(context.runtime, key, value);
+        return value;
+    }
+
+
+    protected void op_asetForString(Ruby runtime, RubyString key, IRubyObject value) {
+        final RubyHashEntry entry = internalGetEntry(key);
+        if (entry != NULL_ENTRY) {
+            entry.value(value);
+        } else {
+            checkIterating();
+
+            if (!key.isFrozen()) key = hashKeyString(runtime.getCurrentContext(), key);
+
+            internalPut(key, value, false);
+        }
+    }
+
+    protected void op_asetSmallForString(Ruby runtime, RubyString key, IRubyObject value) {
+        final RubyHashEntry entry = internalGetEntry(key);
+        if (entry != NULL_ENTRY) {
+            entry.value(value);
+        } else {
+            checkIterating();
+
+            if (!key.isFrozen()) key = hashKeyString(runtime.getCurrentContext(), key);
+
+            internalPutNoResize(key, value, false);
+        }
+    }
+
+    // MRI: rb_hash_key_str
+    private static RubyString hashKeyString(ThreadContext context, RubyString key) {
+        return key.isBare(context) ? context.runtime.freezeAndDedupString(key) : (RubyString) key.dupFrozen();
+    }
+
+    // returns null when not found to avoid unnecessary getRuntime().getNil() call
+    public final IRubyObject fastARef(IRubyObject key) {
+        return internalGet(key);
+    }
+
+    public RubyBoolean compare(final ThreadContext context, VisitorWithState<RubyHash> visitor, IRubyObject other, boolean eql) {
+        if (!(other instanceof RubyHash)) {
+            if (!sites(context).respond_to_to_hash.respondsTo(context, other, other)) {
+                return context.fals;
+            }
+
+            if(eql) {
+                return Helpers.rbEql(context, other, this);
+            }else {
+                return Helpers.rbEqual(context, other, this);
+
+            }
+        }
+
+        final RubyHashLinkedBuckets otherHash = (RubyHashLinkedBuckets) other;
+
+        if (this.size() != otherHash.size()) {
+            return context.fals;
+        }
+
+        try {
+            visitAll(context, visitor, otherHash);
+        } catch (Mismatch e) {
+            return context.fals;
+        }
+
+        return context.tru;
+    }
+
+    private static final VisitorWithState<RubyHash> FindMismatchUsingEqualVisitor = new VisitorWithState<RubyHash>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyHash otherHash) {
+            IRubyObject value2 = otherHash.fastARef(key);
+
+            if (value2 == null) {
+                // other hash does not contain key
+                throw MISMATCH;
+            }
+
+            if (!Helpers.rbEqual(context, value, value2).isTrue()) {
+                throw MISMATCH;
+            }
+        }
+    };
+
+    private static final VisitorWithState<RubyHash> FindMismatchUsingEqlVisitor = new VisitorWithState<RubyHash>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyHash otherHash) {
+            IRubyObject value2 = otherHash.fastARef(key);
+
+            if (value2 == null) {
+                // other hash does not contain key
+                throw MISMATCH;
+            }
+
+            if (!Helpers.rbEql(context, value, value2).isTrue()) {
+                throw MISMATCH;
+            }
+        }
+    };
+
+    /** rb_hash_equal
+     *
+     */
+    @Override
+    @JRubyMethod(name = "==")
+    public IRubyObject op_equal(final ThreadContext context, IRubyObject other) {
+        return hashEqual(context, this, other, false);
+    }
+
+    static IRubyObject hashEqual(final ThreadContext context, RubyHash hash1, IRubyObject _hash2, boolean eql) {
+        if (hash1 == _hash2) return context.tru;
+        if (!(_hash2 instanceof RubyHash hash2)) {
+            if (!_hash2.respondsTo("to_hash")) {
+                return context.fals;
+            }
+            if (eql) {
+                if (Helpers.rbEql(context, _hash2, hash1).isTrue()) {
+                    return context.tru;
+                } else {
+                    return context.fals;
+                }
+            } else {
+                return Helpers.rbEqual(context, _hash2, hash1);
+            }
+        }
+        if (hash1.size() != hash2.size()) return context.fals;
+        if (!hash1.isEmpty() && !hash2.isEmpty()) {
+            if (hash1.isComparedByIdentity() != hash2.isComparedByIdentity()) {
+                return context.fals;
+            } else {
+                return RecursiveComparator.compare(
+                        context,
+                        eql ? FindMismatchUsingEqlVisitor : FindMismatchUsingEqualVisitor,
+                        hash1, hash2, eql);
+            }
+        }
+        return context.tru;
+    }
+
+    /** rb_hash_eql
+     *
+     */
+    @JRubyMethod(name = "eql?")
+    public IRubyObject op_eql(final ThreadContext context, IRubyObject other) {
+        return hashEqual(context, this, other, true);
+    }
+
+    /** rb_hash_aref
+     *
+     */
+    @JRubyMethod(name = "[]")
+    public IRubyObject op_aref(ThreadContext context, IRubyObject key) {
+        IRubyObject value;
+        return ((value = internalGet(key)) == null) ? sites(context).self_default.call(context, this, this, key) : value;
+    }
+
+    /** hash_le_i
+     *
+     */
+    private boolean hash_le(RubyHash other) {
+        return other.directEntrySet().containsAll(directEntrySet());
+    }
+
+    @JRubyMethod(name = "<")
+    public IRubyObject op_lt(ThreadContext context, IRubyObject other) {
+        final RubyHash otherHash = ((RubyBasicObject) other).convertToHash();
+        if (size() >= otherHash.size()) return context.fals;
+
+        return asBoolean(context, hash_le(otherHash));
+    }
+
+    @JRubyMethod(name = "<=")
+    public IRubyObject op_le(ThreadContext context, IRubyObject other) {
+        final RubyHash otherHash = other.convertToHash();
+        if (size() > otherHash.size()) return context.fals;
+
+        return asBoolean(context, hash_le(otherHash));
+    }
+
+    @JRubyMethod(name = ">")
+    public IRubyObject op_gt(ThreadContext context, IRubyObject other) {
+        final RubyHash otherHash = other.convertToHash();
+        return otherHash.op_lt(context, this);
+    }
+
+    @JRubyMethod(name = ">=")
+    public IRubyObject op_ge(ThreadContext context, IRubyObject other) {
+        final RubyHash otherHash = other.convertToHash();
+        return otherHash.op_le(context, this);
+    }
+
+    // MRI: rb_hash_hash
+    @JRubyMethod(name = "hash")
+    public RubyFixnum hash(ThreadContext context) {
+        final int size = size();
+
+        long hash = Helpers.hashStart(context.runtime, size);
+
+        if (size != 0) {
+            long[] hval = {hash};
+
+            iteratorVisitAll(context, CalculateHashVisitor, hval);
+
+            hash = hval[0];
+        }
+
+        return asFixnum(context, hash);
+    }
+
+    private static final ThreadLocal<ByteBuffer> HASH_16_BYTE = ThreadLocal.withInitial(() -> ByteBuffer.allocate(16));
+
+    private static final VisitorWithState<long[]> CalculateHashVisitor = new VisitorWithState<long[]>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, long[] hval) {
+            // perform hashing of key and value before populating shared buffer
+            long keyHash = Helpers.safeHashLong(context, key);
+            long valueHash = Helpers.safeHashLong(context, value);
+
+            ByteBuffer buffer = HASH_16_BYTE.get();
+            Buffers.clearBuffer(buffer).putLong(keyHash).putLong(valueHash);
+
+            hval[0] ^= Helpers.multAndMix(Ruby.getHashSeed0(), Arrays.hashCode(buffer.array()));
+        }
+    };
+
+    /** rb_hash_fetch
+     *
+     */
+    public IRubyObject fetch(ThreadContext context, IRubyObject[] args, Block block) {
+        Arity.checkArgumentCount(context, args.length, 1, 2);
+
+        switch(args.length) {
+            case 1: return fetch(context, args[0], block);
+            case 2: return fetch(context, args[0], args[1], block);
+        }
+
+        return null;
+    }
+
+    @JRubyMethod(rest = true)
+    public IRubyObject except(ThreadContext context, IRubyObject[] keys) {
+        RubyHashLinkedBuckets result = hashCopyWithIdentity(context);
+
+        for (int i = 0; i < keys.length; i++) {
+            result.delete(context, keys[i]);
+        }
+
+        return result;
+    }
+
+    @JRubyMethod
+    public IRubyObject fetch(ThreadContext context, IRubyObject key, Block block) {
+        IRubyObject value = internalGet(key);
+
+        if (value != null) return value;
+        if (block.isGiven()) return block.yield(context, key);
+
+        RubyString desc = (RubyString) key.inspect(context);
+        if (desc.size() > 65) {
+            desc = (RubyString) desc.substrEnc(context, 0, 62);
+            desc.cat("...".getBytes());
+        }
+        throw context.runtime.newKeyError("key not found: " + desc, this, key);
+    }
+
+    @JRubyMethod
+    public IRubyObject fetch(ThreadContext context, IRubyObject key, IRubyObject _default, Block block) {
+        if (block.isGiven()) warn(context, "block supersedes default value argument");
+
+        IRubyObject value = internalGet(key);
+
+        if (value == null) {
+            if (block.isGiven()) return block.yield(context, key);
+
+            return _default;
+        }
+
+        return value;
+    }
+
+    /** rb_hash_has_key
+     *
+     */
+    @JRubyMethod(name = {"has_key?", "key?", "include?", "member?"})
+    public RubyBoolean has_key_p(ThreadContext context, IRubyObject key) {
+        return hasKey(key) ? context.tru : context.fals;
+    }
+
+    /**
+     * A Java API to test the presence of a (Ruby) key in the Hash
+     * @param key the native (Ruby) key
+     * @return true if the hash contains the provided key
+     */
+    public boolean hasKey(IRubyObject key) {
+        return internalGetEntry(key) != NULL_ENTRY;
+    }
+
+    private static class Found extends RuntimeException {
+        @Override
+        public Throwable fillInStackTrace() {
+            return null;
+        }
+    }
+
+    private static final Found FOUND = new Found();
+
+    private static class FoundKey extends Found {
+        public final IRubyObject key;
+        FoundKey(IRubyObject key) {
+            super();
+            this.key = key;
+        }
+    }
+
+    private static class FoundPair extends FoundKey {
+        public final IRubyObject value;
+        FoundPair(IRubyObject key, IRubyObject value) {
+            super(key);
+            this.value = value;
+        }
+    }
+
+    private boolean hasValue(ThreadContext context, IRubyObject expected) {
+        try {
+            visitAll(context, FoundIfEqualVisitor, expected);
+            return false;
+        } catch (Found found) {
+            return true;
+        }
+    }
+
+    private static final VisitorWithState<IRubyObject> FoundIfEqualVisitor = new VisitorWithState<IRubyObject>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, IRubyObject expected) {
+            if (equalInternal(context, value, expected)) {
+                throw FOUND;
+            }
+        }
+    };
+
+    /** rb_hash_has_value
+     *
+     */
+    @JRubyMethod(name = {"has_value?", "value?"})
+    public RubyBoolean has_value_p(ThreadContext context, IRubyObject expected) {
+        return asBoolean(context, hasValue(context, expected));
+    }
+
+    private void iteratorEntry() {
+        ITERATOR_UPDATER.getAndAdd(this, (short) 1);
+    }
+
+    private void iteratorExit() {
+        ITERATOR_UPDATER.getAndAdd(this, (short) -1);
+    }
+
+    private void iteratorVisitAll(ThreadContext context, VisitorWithStateI visitor) {
+        try {
+            iteratorEntry();
+            visitAll(context, visitor);
+        } finally {
+            iteratorExit();
+        }
+    }
+
+    private <T> void iteratorVisitAll(ThreadContext context, VisitorWithState<T> visitor, T state) {
+        try {
+            iteratorEntry();
+            visitAll(context, visitor, state);
+        } finally {
+            iteratorExit();
+        }
+    }
+
+    /** rb_hash_each
+     *
+     */
+    public RubyHashLinkedBuckets eachCommon(final ThreadContext context, final Block block) {
+        iteratorVisitAll(context, YieldArrayVisitor, block);
+
+        return this;
+    }
+
+    private static final VisitorWithState<Block> YieldArrayVisitor = new VisitorWithState<Block>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
+            block.yieldArray(context, newArray(context, key, value), null);
+        }
+    };
+
+    @JRubyMethod(name = {"each", "each_pair"})
+    public IRubyObject each(final ThreadContext context, final Block block) {
+        return block.isGiven() ? each_pairCommon(context, block) : enumeratorizeWithSize(context, this, "each", RubyHashLinkedBuckets::size);
+    }
+
+    /** rb_hash_each_pair
+     *
+     */
+    public RubyHashLinkedBuckets each_pairCommon(final ThreadContext context, final Block block) {
+        iteratorVisitAll(context, YieldKeyValueArrayVisitor, block);
+
+        return this;
+    }
+
+    private static final VisitorWithState<Block> YieldKeyValueArrayVisitor = new VisitorWithState<Block>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
+            if (block.type == Block.Type.LAMBDA) {
+                block.call(context, newArray(context, key, value));
+            } else if (block.getSignature().isSpreadable()) {
+                block.yieldSpecific(context, key, value);
+            } else {
+                block.yield(context, newArray(context, key, value));
+            }
+        }
+    };
+
+    /** rb_hash_each_value
+     *
+     */
+    public RubyHashLinkedBuckets each_valueCommon(final ThreadContext context, final Block block) {
+        iteratorVisitAll(context, YieldValueVisitor, block);
+
+        return this;
+    }
+
+    private static final VisitorWithState<Block> YieldValueVisitor = new VisitorWithState<Block>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
+            block.yield(context, value);
+        }
+    };
+
+    @JRubyMethod
+    public IRubyObject each_value(final ThreadContext context, final Block block) {
+        return block.isGiven() ? each_valueCommon(context, block) : enumeratorizeWithSize(context, this, "each_value", RubyHashLinkedBuckets::size);
+    }
+
+    /** rb_hash_each_key
+     *
+     */
+    public RubyHashLinkedBuckets each_keyCommon(final ThreadContext context, final Block block) {
+        iteratorVisitAll(context, YieldKeyVisitor, block);
+
+        return this;
+    }
+
+    private static final VisitorWithState<Block> YieldKeyVisitor = new VisitorWithState<Block>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
+            block.yield(context, key);
+        }
+    };
+
+    @JRubyMethod
+    public IRubyObject each_key(final ThreadContext context, final Block block) {
+        return block.isGiven() ? each_keyCommon(context, block) : enumeratorizeWithSize(context, this, "each_key", RubyHashLinkedBuckets::size);
+    }
+
+    @JRubyMethod(name = "transform_keys", rest = true)
+    public IRubyObject transform_keys(final ThreadContext context, IRubyObject[] args, final Block block) {
+        if (args.length == 0 && !block.isGiven()) {
+            return enumeratorizeWithSize(context, this, "transform_keys", RubyHashLinkedBuckets::size);
+        }
+
+        IRubyObject transformHash = args.length > 0 ?
+                TypeConverter.convertToTypeWithCheck(args[0], hashClass(context), "to_hash") :
+                context.nil;
+        RubyHash result = Create.newHash(context);
+
+        if (!isEmpty()) {
+            if (!transformHash.isNil()) {
+                visitAll(context, (ctxt, self, key, value, index) -> {
+                    IRubyObject newKey = ((RubyHashLinkedBuckets) transformHash).internalGet(key);
+                    if (newKey == null) newKey = block.isGiven() ? block.yield(ctxt, key) : key;
+                    result.fastASet(newKey, value);
+                });
+            } else {
+                visitAll(context, (ctxt, self, key, value, index) -> result.fastASet(block.yield(ctxt, key), value));
+            }
+        }
+
+        return result;
+    }
+
+    private RubyHashLinkedBuckets hashCopyWithIdentity(ThreadContext context) {
+        RubyHashLinkedBuckets copy = new RubyHashLinkedBuckets(context.runtime, hashClass(context));
+
+        copy.replaceWith(context, this);
+
+        return copy;
+    }
+
+    @JRubyMethod(name = "transform_values")
+    public IRubyObject transform_values(final ThreadContext context, final Block block) {
+        return hashCopyWithIdentity(context).transform_values_bang(context, block);
+    }
+
+    @JRubyMethod(name = "transform_keys!", rest = true)
+    public IRubyObject transform_keys_bang(final ThreadContext context, IRubyObject[] args, final Block block) {
+        if (args.length == 0 && !block.isGiven()) {
+            return enumeratorizeWithSize(context, this, "transform_keys!", RubyHashLinkedBuckets::size);
+        }
+
+        IRubyObject transformHash = args.length > 0 ?
+                TypeConverter.convertToTypeWithCheck(args[0], hashClass(context), "to_hash") :
+                context.nil;
+        modify();
+
+        if (!isEmpty()) {
+            RubyArray pairs = (RubyArray) flatten(context);
+            RubyHash newKeys = Create.newHash(context);
+            int length = pairs.size();
+            boolean aborted = false; // If break happens in blocks we stop transforming but still leave rest as-is.
+            for (int i = 0; i < length; i += 2) {
+                IRubyObject oldKey = pairs.eltOk(i);
+                IRubyObject newKey;
+
+                if (aborted) {
+                    newKey = oldKey;
+                } else {
+                    if (transformHash.isNil()) {
+                        try {
+                            newKey = block.yield(context, oldKey);
+                        } catch (IRBreakJump e) {
+                            aborted = true;
+                            continue;
+                        }
+                    } else {
+                        newKey = ((RubyHashLinkedBuckets) transformHash).internalGet(oldKey);
+
+                        if (newKey == null) {
+                            if (block.isGiven()) {
+                                try {
+                                    newKey = block.yield(context, oldKey);
+                                } catch (IRBreakJump e) {
+                                    aborted = true;
+                                    continue;
+                                }
+                            } else {
+                                newKey = oldKey;
+                            }
+                        }
+                    }
+                }
+
+                if (!newKeys.hasKey(oldKey)) fastDelete(oldKey);
+                fastASet(newKey, pairs.eltOk(i + 1));
+                newKeys.fastASet(newKey, null);
+            }
+        }
+
+        return this;
+    }
+
+    @JRubyMethod(name = "transform_values!")
+    public IRubyObject transform_values_bang(final ThreadContext context, final Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "transform_values!", RubyHashLinkedBuckets::size);
+
+        testFrozen("Hash");
+        iteratorVisitAll(context, (ctxt, self, key, value, index) -> self.op_aset(ctxt, key, block.yield(ctxt, value)));
+
+        return this;
+    }
+
+    @JRubyMethod(name = "select!", alias = "filter!")
+    public IRubyObject select_bang(final ThreadContext context, final Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "select!", RubyHashLinkedBuckets::size);
+
+        return keep_ifCommon(context, block) ? this : context.nil;
+    }
+
+    @JRubyMethod
+    public IRubyObject keep_if(final ThreadContext context, final Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "keep_if", RubyHashLinkedBuckets::size);
+
+        keep_ifCommon(context, block);
+
+        return this;
+    }
+
+    public boolean keep_ifCommon(final ThreadContext context, final Block block) {
+        testFrozen("Hash");
+        boolean[] modified = new boolean[] { false };
+        iteratorVisitAll(context, (ctxt, self, key, value, index) -> {
+            if (!block.yieldArray(ctxt, newArray(ctxt, key, value), null).isTrue()) {
+                testFrozen();
+                modified[0] = true;
+                self.remove(key);
+            }
+        });
+        return modified[0];
+    }
+
+    @JRubyMethod
+    public IRubyObject key(ThreadContext context, IRubyObject expected) {
+        IRubyObject key = internalIndex(context, expected);
+        return key != null ? key : context.nil;
+    }
+
+    private IRubyObject internalIndex(final ThreadContext context, final IRubyObject expected) {
+        try {
+            visitAll(context, FoundKeyIfEqual, expected);
+            return null;
+        } catch (FoundKey found) {
+            return found.key;
+        }
+    }
+
+    private static final VisitorWithState<IRubyObject> FoundKeyIfEqual = new VisitorWithState<IRubyObject>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, IRubyObject expected) {
+            if (equalInternal(context, value, expected)) {
+                throw new FoundKey(key);
+            }
+        }
+    };
+
+    /** rb_hash_keys
+     *
+     */
+
+    @JRubyMethod(name = "keys")
+    public RubyArray keys(final ThreadContext context) {
+        try {
+            RubyArray keys = RubyArrayNative.newBlankArrayInternal(context.runtime, size());
+
+            visitAll(context, StoreKeyVisitor, keys);
+
+            return keys;
+        } catch (NegativeArraySizeException nase) {
+            throw concurrentModification();
+        }
+    }
+
+    public final RubyArray keys() {
+        return keys(metaClass.runtime.getCurrentContext());
+    }
+
+    private static final VisitorWithState<RubyArray> StoreKeyVisitor = new VisitorWithState<RubyArray>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyArray keys) {
+            keys.storeInternal(context, index, key);
+        }
+    };
+
+    /** rb_hash_values
+     *
+     */
+
+    @JRubyMethod(name = "values")
+    public RubyArray values(final ThreadContext context) {
+        try {
+            RubyArray values = RubyArrayNative.newBlankArrayInternal(context.runtime, size());
+
+            visitAll(context, StoreValueVisitor, values);
+
+            return values;
+        } catch (NegativeArraySizeException nase) {
+            throw concurrentModification();
+        }
+    }
+
+    public final RubyArray rb_values(ThreadContext context) {
+        return values(context);
+    }
+
+    /** rb_hash_equal
+     *
+     */
+
+    private static class Mismatch extends RuntimeException {
+        public Throwable fillInStackTrace() {
+            return this;
+        }
+    }
+    private static final Mismatch MISMATCH = new Mismatch();
+
+    /** rb_hash_shift
+     *
+     */
+    @JRubyMethod(name = "shift")
+    public IRubyObject shift(ThreadContext context) {
+        modify();
+
+        if (isEmpty()) return context.nil;
+
+        RubyHashEntryLink entry = head.nextAdded;
+        if (entry != head) {
+            var result = newArray(context, entry.key(), entry.value());
+            internalDeleteEntry((RubyHashEntry) entry);
+            return result;
+        }
+
+
+        CachingCallSite self_default = sites(context).self_default;
+        if (metaClass == context.runtime.getHash() && Builtins.checkHashDefault(context)) {
+            return default_value_get(context, context.nil);
+        }
+
+        return self_default.call(context, this, this, context.nil);
+    }
+
+    public final boolean fastDelete(IRubyObject key) {
+        return internalDelete(key) != NULL_ENTRY;
+    }
+
+    /** rb_hash_delete
+     *
+     */
+    @JRubyMethod
+    public IRubyObject delete(ThreadContext context, IRubyObject key, Block block) {
+        modify();
+
+        IRubyObject value = delete(key);
+        if (value != null) return value;
+
+        return block.isGiven() ? block.yield(context, key) : context.nil;
+    }
+
+    /**
+     * Delete entry or null.
+     */
+    public IRubyObject delete(IRubyObject key) {
+        RubyHashEntry entry = internalDelete(key);
+        return entry != NULL_ENTRY ? entry.value() : null;
+    }
+
+    public IRubyObject delete(ThreadContext context, IRubyObject key) {
+        return delete(context, key, Block.NULL_BLOCK);
+    }
+
+    /** rb_hash_select
+     *
+     */
+    @JRubyMethod(name = "select", alias = "filter")
+    public IRubyObject select(final ThreadContext context, final Block block) {
+        if (!block.isGiven()) return enumeratorizeWithSize(context, this, "select", RubyHashLinkedBuckets::size);
+
+        final RubyHashLinkedBuckets result = hashCopyWithIdentity(context);
+
+        if (!isEmpty()) {
+            result.keep_ifCommon(context, block);
+        }
+
+        return result;
+    }
+
+
+    /** rb_hash_slice
+     *
+     */
+    @JRubyMethod(name = "slice", rest = true)
+    public RubyHash slice(final ThreadContext context, final IRubyObject[] args) {
+        RubyHash result = Create.newHash(context);
+        result.setComparedByIdentity(isComparedByIdentity());
+
+        for (int i = 0; i < args.length; i++) {
+            IRubyObject key = args[i];
+            IRubyObject value = internalGet(key);
+            if (value != null) result.op_aset(context, key, value);
+        }
+
+        return result;
+    }
+
+    /** rb_hash_delete_if
+     *
+     */
+    public RubyHashLinkedBuckets delete_ifInternal(ThreadContext context, Block block) {
+        modify();
+
+        iteratorVisitAll(context, DeleteIfVisitor, block);
+
+        return this;
+    }
+
+    private static final VisitorWithState<Block> DeleteIfVisitor = new VisitorWithState<Block>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
+            if (block.yieldArray(context, newArray(context, key, value), null).isTrue()) {
+                self.delete(context, key, Block.NULL_BLOCK);
+            }
+        }
+    };
+
+    @JRubyMethod
+    public IRubyObject delete_if(final ThreadContext context, final Block block) {
+        return block.isGiven() ? delete_ifInternal(context, block) : enumeratorizeWithSize(context, this, "delete_if", RubyHashLinkedBuckets::size);
+    }
+
+    /** rb_hash_reject
+     *
+     */
+    public RubyHashLinkedBuckets rejectInternal(ThreadContext context, Block block) {
+        final RubyHashLinkedBuckets result = hashCopyWithIdentity(context);
+
+        if (!isEmpty()) {
+            result.delete_ifInternal(context, block);
+        }
+
+        return result;
+    }
+
+    @JRubyMethod
+    public IRubyObject reject(final ThreadContext context, final Block block) {
+        return block.isGiven() ? rejectInternal(context, block) : enumeratorizeWithSize(context, this, "reject", RubyHashLinkedBuckets::size);
+    }
+
+    /** rb_hash_reject_bang
+     *
+     */
+    public IRubyObject reject_bangInternal(ThreadContext context, Block block) {
+        int n = size();
+        delete_if(context, block);
+        if (n == size()) return context.nil;
+        return this;
+    }
+
+    @JRubyMethod(name = "reject!")
+    public IRubyObject reject_bang(final ThreadContext context, final Block block) {
+        return block.isGiven() ? reject_bangInternal(context, block) : enumeratorizeWithSize(context, this, "reject!", RubyHashLinkedBuckets::size);
+    }
+
+    /** rb_hash_clear
+     *
+     */
+    @JRubyMethod(name = "clear")
+    public RubyHash rb_clear(ThreadContext context) {
+        modify();
+
+        if (size > 0) {
+            alloc();
+            size = 0;
+        }
+
+        return this;
+    }
+
+    /** rb_hash_invert
+     *
+     */
+    @JRubyMethod(name = "invert")
+    public RubyHash invert(final ThreadContext context) {
+        final RubyHash result = Create.newHash(context);
+
+        visitAll(context, InvertVisitor, result);
+
+        return result;
+    }
+
+    private static final VisitorWithState<RubyHashLinkedBuckets> InvertVisitor = new VisitorWithState<RubyHashLinkedBuckets>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyHashLinkedBuckets state) {
+            state.op_aset(context, value, key);
+        }
+    };
+
+    /** rb_hash_update
+     *
+     */
+    @JRubyMethod(name = {"merge!", "update"}, rest = true)
+    public RubyHashLinkedBuckets merge_bang(ThreadContext context, IRubyObject[] others, Block block) {
+        modify();
+
+        if (others.length == 0) return this;
+
+        for (int i = 0; i < others.length; i++) {
+            final RubyHash otherHash = others[i].convertToHash();
+            if (otherHash.empty_p(context).isTrue()) continue;
+            otherHash.visitAll(context, (ctxt, self, key, value, index) -> {
+                if (block.isGiven()) {
+                    IRubyObject existing = internalGet(key);
+                    if (existing != null) {
+                        value = block.yield(ctxt, newArray(ctxt, key, existing, value));
+                    }
+                }
+                op_aset(ctxt, key, value);
+            });
+        }
+
+        return this;
+    }
+
+    public void addAll(ThreadContext context, RubyHash otherHash) {
+        if (!otherHash.empty_p(context).isTrue()) {
+            otherHash.visitAll(context, (ctxt, self, key, value, index) -> op_aset(ctxt, key, value));
+        }
+    }
+
+    /** rb_hash_merge
+     *
+     */
+    @JRubyMethod(rest = true)
+    public RubyHash merge(ThreadContext context, IRubyObject[] others, Block block) {
+        RubyHash dup = (RubyHash) dup(context);
+        return dup.merge_bang(context, others, block);
+    }
+
+    @JRubyMethod(name = "initialize_copy", visibility = PRIVATE)
+    public RubyHash initialize_copy(ThreadContext context, IRubyObject other) {
+        return replace(context, other);
+    }
+
+    /** rb_hash_replace
+     *
+     */
+    @JRubyMethod(name = "replace")
+    public RubyHash replace(final ThreadContext context, IRubyObject other) {
+        modify();
+
+        final RubyHash otherHash = other.convertToHash();
+
+        if (this == otherHash) return this;
+
+        replaceWith(context, otherHash);
+
+        ifNone = otherHash.getIfNone();
+
+        if (otherHash.get(PROCDEFAULT_HASH)) {
+            set(PROCDEFAULT_HASH, true);
+        } else {
+            set(PROCDEFAULT_HASH, false);
+        }
+
+        return this;
+    }
+
+    protected void replaceWith(ThreadContext context, RubyHash otherHash) {
+        if (otherHash.getClass() == RubyHashLinkedBuckets.class) {
+            alloc();
+            copyFrom(this, otherHash, otherHash.isComparedByIdentity());
+        } else {
+            replaceExternally(context, otherHash);
+        }
+    }
+
+    protected void replaceExternally(ThreadContext context, RubyHash otherHash) {
+        rb_clear(context);
+
+        if (!isComparedByIdentity() && otherHash.isComparedByIdentity()) {
+            setComparedByIdentity(true);
+        }
+
+        otherHash.visitAll(context, ReplaceVisitor, this);
+    }
+
+    private static final VisitorWithState<RubyHash> ReplaceVisitor = new VisitorWithState<RubyHash>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, RubyHash target) {
+            target.op_aset(context, key, value);
+        }
+    };
+
+    /** rb_hash_values_at
+     *
+     */
+    @JRubyMethod(name = "values_at", rest = true)
+    public RubyArray values_at(ThreadContext context, IRubyObject[] args) {
+        RubyArray result = RubyArrayNative.newBlankArrayInternal(context.runtime, args.length);
+        for (int i = 0; i < args.length; i++) {
+            result.storeInternal(context, i, op_aref(context, args[i]));
+        }
+        return result;
+    }
+
+    @JRubyMethod(name = "fetch_values", rest = true)
+    public RubyArray fetch_values(ThreadContext context, IRubyObject[] args, Block block) {
+        RubyArray result = RubyArrayNative.newBlankArrayInternal(context.runtime, args.length);
+        for (int i = 0; i < args.length; i++) {
+            result.storeInternal(context, i, fetch(context, args[i], block));
+        }
+        return result;
+    }
+
+    @JRubyMethod(name = "assoc")
+    public IRubyObject assoc(final ThreadContext context, final IRubyObject obj) {
+        try {
+            visitAll(context, FoundPairIfEqualKeyVisitor, obj);
+            return context.nil;
+        } catch (FoundPair found) {
+            return newArray(context, found.key, found.value);
+        }
+    }
+
+    @JRubyMethod(name = "rassoc")
+    public IRubyObject rassoc(final ThreadContext context, final IRubyObject obj) {
+        try {
+            visitAll(context, FoundPairIfEqualValueVisitor, obj);
+            return context.nil;
+        } catch (FoundPair found) {
+            return newArray(context, found.key, found.value);
+        }
+    }
+
+    private static final VisitorWithState<IRubyObject> FoundPairIfEqualKeyVisitor = new VisitorWithState<IRubyObject>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, IRubyObject obj) {
+            if (equalInternal(context, obj, key)) {
+                throw new FoundPair(key, value);
+            }
+        }
+    };
+
+    private static final VisitorWithState<IRubyObject> FoundPairIfEqualValueVisitor = new VisitorWithState<IRubyObject>() {
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, IRubyObject obj) {
+            if (equalInternal(context, obj, value)) {
+                throw new FoundPair(key, value);
+            }
+        }
+    };
+
+    @JRubyMethod
+    public IRubyObject flatten(ThreadContext context) {
+        RubyArray ary = to_a(context);
+        sites(context).flatten_bang.call(context, ary, ary, RubyFixnum.one(context.runtime));
+        return ary;
+    }
+
+    @JRubyMethod
+    public IRubyObject flatten(ThreadContext context, IRubyObject level) {
+        RubyArray ary = to_a(context);
+        sites(context).flatten_bang.call(context, ary, ary, level);
+        return ary;
+    }
+
+    @JRubyMethod(name = "compact")
+    public IRubyObject compact(ThreadContext context) {
+      IRubyObject res = dup();
+      ((RubyHashLinkedBuckets)res).compact_bang(context);
+      return res;
+    }
+
+    @JRubyMethod(name = "compact!")
+    public IRubyObject compact_bang(ThreadContext context) {
+      boolean changed = false;
+      modify();
+      iteratorEntry();
+      try {
+        for (RubyHashEntryLink entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
+          if (entry.value() == context.nil) {
+            internalDelete(entry.key());
+            changed = true;
+          }
+        }
+      } finally {
+        iteratorExit();
+      }
+      return changed ? this : context.nil;
+    }
+
+    @JRubyMethod(name = "compare_by_identity")
+    public IRubyObject compare_by_identity(ThreadContext context) {
+        modify();
+        setComparedByIdentity(true);
+        return rehash(context);
+    }
+
+    @JRubyMethod(name = "compare_by_identity?")
+    public IRubyObject compare_by_identity_p(ThreadContext context) {
+        return asBoolean(context, isComparedByIdentity());
+    }
+
+    @JRubyMethod
+    public IRubyObject dup(ThreadContext context) {
+        RubyHashLinkedBuckets dup = (RubyHashLinkedBuckets) super.dup();
+        dup.setComparedByIdentity(isComparedByIdentity());
+        return dup;
+    }
+
+    public IRubyObject rbClone(ThreadContext context, IRubyObject opts) {
+        RubyHash clone = (RubyHash) super.rbClone(context, opts);
+        clone.setComparedByIdentity(isComparedByIdentity());
+        return clone;
+    }
+
+    public IRubyObject rbClone(ThreadContext context) {
+        return rbClone(context, context.nil);
+    }
+
+    @JRubyMethod(name = "any?")
+    public IRubyObject any_p(ThreadContext context, Block block) {
+        if (isEmpty()) return context.fals;
+        if (!block.isGiven()) return context.tru;
+
+        if (block.getSignature().arityValue() > 1) {
+            return any_p_i_fast(context, block);
+        }
+
+        return any_p_i(context, block);
+    }
+
+    @JRubyMethod(name = "any?")
+    public IRubyObject any_p(ThreadContext context, IRubyObject pattern, Block block) {
+        if (isEmpty()) return context.fals;
+        if (block.isGiven()) warn(context, "given block not used");
+
+        return any_p_p(context, pattern);
+    }
+
+    protected IRubyObject any_p_i(ThreadContext context, Block block) {
+        iteratorEntry();
+        try {
+            for (RubyHashEntryLink entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
+                IRubyObject newAssoc = newArray(context, entry.key(), entry.value());
+                if (block.yield(context, newAssoc).isTrue())
+                    return context.tru;
+            }
+            return context.fals;
+        } finally {
+            iteratorExit();
+        }
+    }
+
+    protected IRubyObject any_p_i_fast(ThreadContext context, Block block) {
+        iteratorEntry();
+        try {
+            for (RubyHashEntryLink entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
+                if (block.yieldArray(context, newArray(context, entry.key(), entry.value()), null).isTrue()) return context.tru;
+            }
+            return context.fals;
+        } finally {
+            iteratorExit();
+        }
+    }
+
+    protected IRubyObject any_p_p(ThreadContext context, IRubyObject pattern) {
+        iteratorEntry();
+        try {
+            for (RubyHashEntryLink entry = head.nextAdded; entry != head; entry = entry.nextAdded) {
+                IRubyObject newAssoc = newArray(context, entry.key(), entry.value());
+                if (pattern.callMethod(context, "===", newAssoc).isTrue()) return context.tru;
+            }
+            return context.fals;
+        } finally {
+            iteratorExit();
+        }
+    }
+
+    /**
+     * A lightweight dup for internal use that does not dispatch to initialize_copy nor rehash the keys. Intended for
+     * use in dup'ing keyword args for processing.
+     *
+     * @param context
+     * @return
+     */
+    public RubyHashLinkedBuckets dupFast(final ThreadContext context) {
+        final Ruby runtime = context.runtime;
+        RubyHashLinkedBuckets dup = new RubyHashLinkedBuckets(runtime, metaClass, this);
+
+        dup.setComparedByIdentity(this.isComparedByIdentity());
+
+        dup.ifNone = this.ifNone;
+
+        if (this.get(PROCDEFAULT_HASH)) {
+            dup.set(PROCDEFAULT_HASH, true);
+        } else {
+            dup.set(PROCDEFAULT_HASH, false);
+        }
+
+        return dup;
+    }
+
+    public RubyHashLinkedBuckets withRuby2Keywords(boolean ruby2Keywords) {
+        setRuby2KeywordHash(ruby2Keywords);
+        return this;
+    }
+
+    public boolean hasDefaultProc() {
+        return get(PROCDEFAULT_HASH);
+    }
+
+    public IRubyObject getIfNone(){
+        return ifNone;
+    }
+
+    @JRubyMethod
+    public IRubyObject deconstruct_keys(ThreadContext context, IRubyObject _arg1) {
+        return this;
+    }
+
+    @JRubyMethod(name = "dig")
+    public IRubyObject dig(ThreadContext context, IRubyObject arg0) {
+        return op_aref( context, arg0 );
+    }
+
+    @JRubyMethod(name = "dig")
+    public IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
+        final IRubyObject val = op_aref( context, arg0 );
+        return RubyObject.dig1(context, val, arg1);
+    }
+
+    @JRubyMethod(name = "dig")
+    public IRubyObject dig(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
+        final IRubyObject val = op_aref( context, arg0 );
+        return RubyObject.dig2(context, val, arg1, arg2);
+    }
+
+    @JRubyMethod(name = "dig", required = 1, rest = true, checkArity = false)
+    public IRubyObject dig(ThreadContext context, IRubyObject[] args) {
+        int argc = Arity.checkArgumentCount(context, args, 1, -1);
+
+        final IRubyObject val = op_aref(context, args[0] );
+        return argc == 1 ? val : RubyObject.dig(context, val, args, 1);
+    }
+
+    @JRubyMethod
+    public IRubyObject to_proc(ThreadContext context) {
+        Block block = CallBlock19.newCallClosure(
+                this,
+                this.metaClass,
+                Signature.ONE_ARGUMENT,
+                (context1, args, procBlock) -> {
+                    Arity.checkArgumentCount(context1, args, 1, 1);
+                    return op_aref(context1, args[0]);
+                },
+                context);
+
+        return RubyProc.newProc(context.runtime, block, Block.Type.LAMBDA);
+    }
+
+    @JRubyMethod(meta = true)
+    public static IRubyObject ruby2_keywords_hash(ThreadContext context, IRubyObject _self, IRubyObject arg) {
+        TypeConverter.checkType(context, arg, hashClass(context));
+
+        RubyHashLinkedBuckets hash = (RubyHashLinkedBuckets) arg.dup();
+        hash.setRuby2KeywordHash(true);
+
+        return hash;
+    }
+
+    @JRubyMethod(meta = true, name = "ruby2_keywords_hash?")
+    public static IRubyObject ruby2_keywords_hash_p(ThreadContext context, IRubyObject _self, IRubyObject arg) {
+        TypeConverter.checkType(context, arg, hashClass(context));
+
+        return asBoolean(context, ((RubyHashLinkedBuckets) arg).isRuby2KeywordHash());
+    }
+
+    public static void marshalTo(ThreadContext context, RubyOutputStream out, final RubyHashLinkedBuckets hash, final MarshalDumper output) {
+        output.registerObject(hash);
+        int hashSize = hash.size();
+        output.writeInt(out, hashSize);
+        try {
+            hash.visitLimited(context, new VisitorWithState<MarshalDumper>() {
+                @Override
+                public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, MarshalDumper state) {
+                    state.dumpObject(context, out, key);
+                    state.dumpObject(context, out, value);
+                }
+            }, hashSize, output);
+        } catch (VisitorIOException e) {
+            throw Error.toRubyException(context, (IOException) e.getCause());
+        }
+
+        if (hash.ifNone != UNDEF) output.dumpObject(context, out, hash.ifNone);
+    }
+
+    public static RubyHash unmarshalFrom(ThreadContext context, RubyInputStream in, MarshalLoader input, boolean defaultValue, boolean identity) {
+        RubyHash result = Create.newHash(context);
+        if (identity) result.setComparedByIdentity(true);
+        result = (RubyHashLinkedBuckets) input.entry(result);
+        int size = input.unmarshalInt(context, in);
+
+        for (int i = 0; i < size; i++) {
+            result.fastASetCheckString(context.runtime, input.unmarshalObject(context, in), input.unmarshalObject(context, in));
+        }
+
+        if (defaultValue) result.default_value_set(context, input.unmarshalObject(context, in));
+        return result;
+    }
+
+    @Override
+    public Class getJavaClass() {
+        return Map.class;
+    }
+
+    // Satisfy java.util.Map interface (for Java integration)
+
+    @Override
+    public int size() {
+        return size;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return size() == 0;
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return internalGet(JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, key)) != null;
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return hasValue(metaClass.runtime.getCurrentContext(), JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, value));
+    }
+
+    @Override
+    public Object get(Object key) {
+        IRubyObject gotten = internalGet(JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, key));
+        return gotten == null ? null : gotten.toJava(Object.class);
+    }
+
+    @Override
+    public Object put(Object key, Object value) {
+        Ruby runtime = metaClass.runtime;
+        IRubyObject existing = internalPutNoResize(JavaUtil.convertJavaToUsableRubyObject(runtime, key), JavaUtil.convertJavaToUsableRubyObject(runtime, value), true);
+        return existing == null ? null : existing.toJava(Object.class);
+    }
+
+    @Override
+    public Object remove(Object key) {
+        IRubyObject rubyKey = JavaUtil.convertJavaToUsableRubyObject(metaClass.runtime, key);
+        return internalDelete(rubyKey).value();
+    }
+
+    @Override
+    public void putAll(Map map) {
+        final Ruby runtime = metaClass.runtime;
+        @SuppressWarnings("unchecked")
+        final Iterator<Entry> iter = map.entrySet().iterator();
+        while ( iter.hasNext() ) {
+            Entry entry = iter.next();
+            internalPut(
+                JavaUtil.convertJavaToUsableRubyObject(runtime, entry.getKey()),
+                JavaUtil.convertJavaToUsableRubyObject(runtime, entry.getValue())
+            );
+        }
+    }
+
+    @Override
+    public void clear() {
+        rb_clear(getRuntime().getCurrentContext());
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof RubyHashLinkedBuckets)) return false;
+        if (this == other) return true;
+        return op_equal(metaClass.runtime.getCurrentContext(), (RubyHashLinkedBuckets)other).isTrue();
+    }
+
+    @Override
+    public Set keySet() {
+        return new BaseSet(KEY_VIEW);
+    }
+
+    public Set directKeySet() {
+        return new BaseSet(DIRECT_KEY_VIEW);
+    }
+
+    @Override
+    public Collection values() {
+        return new BaseCollection(VALUE_VIEW);
+    }
+
+    public Collection directValues() {
+        return new BaseCollection(DIRECT_VALUE_VIEW);
+    }
+
+    @Override
+    public Set entrySet() {
+        return new BaseSet(ENTRY_VIEW);
+    }
+
+    public Set directEntrySet() {
+        return new BaseSet(DIRECT_ENTRY_VIEW);
+    }
+
+    private final RaiseException concurrentModification() {
+        return metaClass.runtime.newConcurrencyError(
+                "Detected invalid hash contents due to unsynchronized modifications with concurrent users");
+    }
+
+    /**
+     * Is this object compared by identity or not?
+     *
+     * @return true if this object is compared by identity, false otherwise
+     */
+    public boolean isComparedByIdentity() {
+        return get(COMPARE_BY_IDENTITY);
+    }
+
+    /**
+     * Sets whether this object is compared by identity or not.
+     *
+     * @param comparedByIdentity should this object be compared by identity?
+     */
+    public void setComparedByIdentity(boolean comparedByIdentity) {
+        set(COMPARE_BY_IDENTITY, comparedByIdentity);
+    }
+
+    public boolean isRuby2KeywordHash() {
+        return get(RUBY2_KEYWORD);
+    }
+
+    public void setRuby2KeywordHash(boolean value) {
+        set(RUBY2_KEYWORD, value);
+    }
+
+    private class BaseSet extends AbstractSet {
+        final EntryView view;
+
+        public BaseSet(EntryView view) {
+            this.view = view;
+        }
+
+        @Override
+        public Iterator iterator() {
+            return new BaseIterator(view);
+        }
+
+        @Override
+        public boolean contains(Object o) {
+            return view.contains(RubyHashLinkedBuckets.this, o);
+        }
+
+        @Override
+        public void clear() {
+            RubyHashLinkedBuckets.this.clear();
+        }
+
+        @Override
+        public int size() {
+            return RubyHashLinkedBuckets.this.size();
+        }
+
+        @Override
+        public boolean remove(Object o) {
+            return view.remove(RubyHashLinkedBuckets.this, o);
+        }
+    }
+
+    private class BaseCollection extends AbstractCollection {
+        final EntryView view;
+
+        public BaseCollection(EntryView view) {
+            this.view = view;
+        }
+
+        @Override
+        public Iterator iterator() {
+            return new BaseIterator(view);
+        }
+
+        @Override
+        public boolean contains(Object o) {
+            return view.contains(RubyHashLinkedBuckets.this, o);
+        }
+
+        @Override
+        public void clear() {
+            RubyHashLinkedBuckets.this.clear();
+        }
+
+        @Override
+        public int size() {
+            return RubyHashLinkedBuckets.this.size();
+        }
+
+        @Override
+        public boolean remove(Object o) {
+            return view.remove(RubyHashLinkedBuckets.this, o);
+        }
+    }
+
+    private class BaseIterator implements Iterator {
+        final private EntryView view;
+        private RubyHashEntryLink entry;
+        private boolean peeking;
+        private int startGeneration;
+
+        public BaseIterator(EntryView view) {
+            this.view = view;
+            this.entry = head;
+        }
+
+        private void advance(boolean consume) {
+            if (!peeking) {
+                do {
+                    entry = entry.nextAdded;
+                } while (entry != head && !entry.isLive());
+            }
+            peeking = !consume;
+        }
+
+        @Override
+        public Object next() {
+            advance(true);
+            if (entry == head) {
+                peeking = true; // remain where we are
+                throw new NoSuchElementException();
+            }
+            return view.convertEntry(getRuntime(), entry);
+        }
+
+        // once hasNext has been called, we commit to next() returning
+        // the entry it found, even if it were subsequently deleted
+        @Override
+        public boolean hasNext() {
+            advance(false);
+            return entry != head;
+        }
+
+        @Override
+        public void remove() {
+            if (entry == head) {
+                throw new IllegalStateException("Iterator out of range");
+            }
+            internalDeleteEntry((RubyHashEntry) entry);
+        }
+    }
+
+    private static abstract class EntryView {
+        public abstract Object convertEntry(Ruby runtime, RubyHashEntryLink value);
+        public abstract boolean contains(RubyHashLinkedBuckets hash, Object o);
+        public abstract boolean remove(RubyHashLinkedBuckets hash, Object o);
+    }
+
+    private static final EntryView DIRECT_KEY_VIEW = new EntryView() {
+        @Override
+        public Object convertEntry(Ruby runtime, RubyHashEntryLink entry) {
+            return entry.key();
+        }
+        @Override
+        public boolean contains(RubyHashLinkedBuckets hash, Object o) {
+            if (!(o instanceof IRubyObject)) return false;
+            return hash.internalGet((IRubyObject)o) != null;
+        }
+        @Override
+        public boolean remove(RubyHashLinkedBuckets hash, Object o) {
+            if (!(o instanceof IRubyObject)) return false;
+            return hash.internalDelete((IRubyObject)o) != NULL_ENTRY;
+        }
+    };
+
+    private static final EntryView KEY_VIEW = new EntryView() {
+        @Override
+        public Object convertEntry(Ruby runtime, RubyHashEntryLink entry) {
+            return entry.key().toJava(Object.class);
+        }
+        @Override
+        public boolean contains(RubyHashLinkedBuckets hash, Object o) {
+            return hash.containsKey(o);
+        }
+        @Override
+        public boolean remove(RubyHashLinkedBuckets hash, Object o) {
+            return hash.remove(o) != null;
+        }
+    };
+
+    private static final EntryView DIRECT_VALUE_VIEW = new EntryView() {
+        @Override
+        public Object convertEntry(Ruby runtime, RubyHashEntryLink entry) {
+            return entry.value();
+        }
+        @Override
+        public boolean contains(RubyHashLinkedBuckets hash, Object o) {
+            if (!(o instanceof IRubyObject)) return false;
+            IRubyObject obj = (IRubyObject)o;
+            return hash.hasValue(obj.getRuntime().getCurrentContext(), obj);
+        }
+        @Override
+        public boolean remove(RubyHashLinkedBuckets hash, Object o) {
+            if (!(o instanceof IRubyObject)) return false;
+            IRubyObject obj = (IRubyObject) o;
+            IRubyObject key = hash.internalIndex(obj.getRuntime().getCurrentContext(), obj);
+            if (key == null) return false;
+            return hash.internalDelete(key) != NULL_ENTRY;
+        }
+    };
+
+    private static final EntryView VALUE_VIEW = new EntryView() {
+        @Override
+        public Object convertEntry(Ruby runtime, RubyHashEntryLink entry) {
+            return entry.value().toJava(Object.class);
+        }
+        @Override
+        public boolean contains(RubyHashLinkedBuckets hash, Object o) {
+            return hash.containsValue(o);
+        }
+        @Override
+        public boolean remove(RubyHashLinkedBuckets hash, Object o) {
+            Ruby runtime = hash.metaClass.runtime;
+            IRubyObject value = JavaUtil.convertJavaToUsableRubyObject(runtime, o);
+            IRubyObject key = hash.internalIndex(runtime.getCurrentContext(), value);
+            if (key == null) return false;
+            return hash.internalDelete(key) != NULL_ENTRY;
+        }
+    };
+
+    private static final EntryView DIRECT_ENTRY_VIEW = new EntryView() {
+        @Override
+        public Object convertEntry(Ruby runtime, RubyHashEntryLink entry) {
+            return entry;
+        }
+        @Override
+        public boolean contains(RubyHashLinkedBuckets hash, Object o) {
+            if (!(o instanceof RubyHashEntry)) return false;
+            RubyHashEntry entry = (RubyHashEntry)o;
+            RubyHashEntry candidate = hash.internalGetEntry(entry.key());
+            return candidate != NULL_ENTRY && entry.equals(candidate);
+        }
+        @Override
+        public boolean remove(RubyHashLinkedBuckets hash, Object o) {
+            if (!(o instanceof RubyHashEntry)) return false;
+            return hash.internalDeleteEntry((RubyHashEntry)o) != NULL_ENTRY;
+        }
+    };
+
+    private static final EntryView ENTRY_VIEW = new EntryView() {
+        @Override
+        public Object convertEntry(Ruby runtime, RubyHashEntryLink entry) {
+            return new ConvertingEntry(runtime, entry);
+        }
+        @Override
+        public boolean contains(RubyHashLinkedBuckets hash, Object o) {
+            if (!(o instanceof ConvertingEntry)) return false;
+            ConvertingEntry entry = (ConvertingEntry)o;
+            RubyHashEntry candidate = hash.internalGetEntry(entry.entry.key());
+            return candidate != NULL_ENTRY && entry.entry.equals(candidate);
+        }
+        @Override
+        public boolean remove(RubyHashLinkedBuckets hash, Object o) {
+            if (!(o instanceof ConvertingEntry)) return false;
+            ConvertingEntry entry = (ConvertingEntry)o;
+            return hash.internalDeleteEntry((RubyHashEntry) entry.entry) != NULL_ENTRY;
+        }
+    };
+
+    private static class ConvertingEntry implements Entry {
+        private final RubyHashEntryLink entry;
+        private final Ruby runtime;
+
+        public ConvertingEntry(Ruby runtime, RubyHashEntryLink entry) {
+            this.entry = entry;
+            this.runtime = runtime;
+        }
+
+        @Override
+        public Object getKey() {
+            return entry.key().toJava(Object.class);
+        }
+        @Override
+        public Object getValue() {
+            return entry.value().toJava(Object.class);
+        }
+        @Override
+        public Object setValue(Object o) {
+            return entry.value(JavaUtil.convertJavaToUsableRubyObject(runtime, o));
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof ConvertingEntry)) {
+                return false;
+            }
+            ConvertingEntry other = (ConvertingEntry)o;
+            return entry.equals(other.entry);
+        }
+
+        @Override
+        public int hashCode() {
+            return entry.hashCode();
+        }
+    }
+
+    private static HashSites sites(ThreadContext context) {
+        return context.sites.Hash;
+    }
+}
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
index 1811c39aa80..f88dc6dc47e 100644
--- a/core/src/main/java/org/jruby/RubyIO.java
+++ b/core/src/main/java/org/jruby/RubyIO.java
@@ -135,7 +135,7 @@
 import static org.jruby.api.Warn.warn;
 import static org.jruby.api.Warn.warnDeprecated;
 import static org.jruby.api.Warn.warningDeprecated;
-import static org.jruby.runtime.ThreadContext.*;
+import static org.jruby.runtime.ThreadContext.hasKeywords;
 import static org.jruby.runtime.Visibility.*;
 import static org.jruby.util.RubyStringBuilder.str;
 import static org.jruby.util.RubyStringBuilder.types;
@@ -533,6 +533,7 @@ protected RubyIO reopenIO(ThreadContext context, RubyIO nfile) {
         boolean locked2 = orig.lock(); // TODO: This WILL deadlock if two threads try to reopen the same IOs in opposite directions. Fix?
         try {
             fptr.setMode(orig.getMode() | (fptr.getMode() & (OpenFile.PREP | OpenFile.SYNC)));
+            fptr.encs = orig.encs;
             fptr.setProcess(orig.getProcess());
             fptr.setLineNumber(orig.getLineNumber());
             if (orig.getPath() != null) fptr.setPath(orig.getPath());
@@ -1294,11 +1295,6 @@ public static IRubyObject ensureYieldClose(ThreadContext context, IRubyObject po
         return port;
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static IRubyObject sysopen(IRubyObject recv, IRubyObject[] args, Block block) {
-        return sysopen(((RubyBasicObject) recv).getCurrentContext(), recv, args, block);
-    }
-
     // rb_io_s_sysopen
     @JRubyMethod(name = "sysopen", required = 1, optional = 2, checkArity = false, meta = true)
     public static IRubyObject sysopen(ThreadContext context, IRubyObject recv, IRubyObject[] argv, Block block) {
@@ -2279,6 +2275,7 @@ public IRubyObject initialize_copy(ThreadContext context, IRubyObject _io){
             fptr.encs = orig.encs;
             fptr.setProcess(orig.getProcess());
             fptr.setLineNumber(orig.getLineNumber());
+            fptr.setTimeout(orig.getTimeout());
             if (orig.getPath() != null) fptr.setPath(orig.getPath());
             fptr.setFinalizer(orig.getFinalizer());
             // TODO: not using pipe_finalize yet
@@ -2683,21 +2680,21 @@ public IRubyObject gets(ThreadContext context) {
     // rb_io_gets_m
     @JRubyMethod(name = "gets", writes = LASTLINE, keywords = true)
     public IRubyObject gets(ThreadContext context, IRubyObject arg) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         return Getline.getlineCall(context, GETLINE, this, getReadEncoding(context), arg, keywords);
     }
 
     // rb_io_gets_m
     @JRubyMethod(name = "gets", writes = LASTLINE, keywords = true)
     public IRubyObject gets(ThreadContext context, IRubyObject rs, IRubyObject limit_arg) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         return Getline.getlineCall(context, GETLINE, this, getReadEncoding(context), rs, limit_arg, keywords);
     }
 
     // rb_io_gets_m
     @JRubyMethod(name = "gets", writes = LASTLINE, keywords = true)
     public IRubyObject gets(ThreadContext context, IRubyObject rs, IRubyObject limit_arg, IRubyObject opt) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         return Getline.getlineCall(context, GETLINE, this, getReadEncoding(context), rs, limit_arg, opt, keywords);
     }
 
@@ -3158,11 +3155,6 @@ public IRubyObject readline(ThreadContext context, IRubyObject separator, IRubyO
         return line;
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public IRubyObject getc() {
-        return getbyte(getCurrentContext());
-    }
-
     /**
      * Read a char. On EOF throw EOFError.
      */ // rb_io_readchar
@@ -3687,11 +3679,6 @@ protected static int doRead(ThreadContext context, OpenFile fptr, byte[] buffer,
         return fptr.fread(context, buffer, start, len);
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public IRubyObject readchar() {
-        return readchar(getCurrentContext());
-    }
-
     @JRubyMethod
     public IRubyObject stat(ThreadContext context) {
         Ruby runtime = context.runtime;
@@ -3904,7 +3891,7 @@ public IRubyObject each(final ThreadContext context, final Block block) {
 
     @JRubyMethod(keywords = true)
     public IRubyObject each(final ThreadContext context, IRubyObject arg0, final Block block) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         if (!block.isGiven()) return enumeratorize(context.runtime, this, "each");
 
         return Getline.getlineCall(context, GETLINE_YIELD, this, getReadEncoding(context), arg0, block, keywords);
@@ -3912,7 +3899,7 @@ public IRubyObject each(final ThreadContext context, IRubyObject arg0, final Blo
 
     @JRubyMethod(keywords = true)
     public IRubyObject each(final ThreadContext context, IRubyObject arg0, IRubyObject arg1, final Block block) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         if (!block.isGiven()) return enumeratorize(context.runtime, this, "each");
 
         return Getline.getlineCall(context, GETLINE_YIELD, this, getReadEncoding(context), arg0, arg1, block, keywords);
@@ -3920,7 +3907,7 @@ public IRubyObject each(final ThreadContext context, IRubyObject arg0, IRubyObje
 
     @JRubyMethod(keywords = true)
     public IRubyObject each(final ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, final Block block) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         if (!block.isGiven()) return enumeratorize(context.runtime, this, "each");
 
         return Getline.getlineCall(context, GETLINE_YIELD, this, getReadEncoding(context), arg0, arg1, arg2, block, keywords);
@@ -3951,7 +3938,7 @@ public IRubyObject each_line(final ThreadContext context, final Block block) {
 
     @JRubyMethod(keywords = true)
     public IRubyObject each_line(final ThreadContext context, IRubyObject arg0, final Block block) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
 
         if (!block.isGiven()) return enumeratorize(context.runtime, this, "each_line", arg0);
 
@@ -3960,7 +3947,7 @@ public IRubyObject each_line(final ThreadContext context, IRubyObject arg0, fina
 
     @JRubyMethod(keywords = true)
     public IRubyObject each_line(final ThreadContext context, IRubyObject arg0, IRubyObject arg1, final Block block) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
 
         if (!block.isGiven()) return enumeratorize(context.runtime, this, "each_line", arg0, arg1);
 
@@ -3969,7 +3956,7 @@ public IRubyObject each_line(final ThreadContext context, IRubyObject arg0, IRub
 
     @JRubyMethod(keywords = true)
     public IRubyObject each_line(final ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, final Block block) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
 
         if (!block.isGiven()) return enumeratorize(context.runtime, this, "each_line", arg0, arg1, arg2);
 
@@ -4006,19 +3993,19 @@ public RubyArray readlines(ThreadContext context) {
 
     @JRubyMethod(name = "readlines", keywords = true)
     public RubyArray readlines(ThreadContext context, IRubyObject arg0) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         return Getline.getlineCall(context, GETLINE_ARY, this, getReadEncoding(context), arg0, keywords);
     }
 
     @JRubyMethod(name = "readlines", keywords = true)
     public RubyArray readlines(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         return Getline.getlineCall(context, GETLINE_ARY, this, getReadEncoding(context), arg0, arg1, keywords);
     }
 
     @JRubyMethod(name = "readlines", keywords = true)
     public RubyArray readlines(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
         return Getline.getlineCall(context, GETLINE_ARY, this, getReadEncoding(context), arg0, arg1, arg2, keywords);
     }
 
@@ -4090,7 +4077,7 @@ private static IRubyObject foreachInternal(ThreadContext context, IRubyObject re
 
     @JRubyMethod(name = "foreach", required = 1, optional = 3, checkArity = false, meta = true, writes = LASTLINE, keywords = true)
     public static IRubyObject foreach(final ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
-        boolean keywords = (resetCallInfo(context) & CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
 
         Arity.checkArgumentCount(context, args.length - (keywords ? 1 : 0), 1, 4);
 
@@ -4129,18 +4116,11 @@ public static IRubyObject select(ThreadContext context, IRubyObject recv, IRubyO
                 read = argv[0];
         }
         final Long timeout;
-        if (_timeout.isNil()) {
+        if (_timeout.isNil() || Numeric.isPositiveInfinity(_timeout)) {
             timeout = null;
         }
         else {
-            try { // MRI calls to_f even if not respond_to? (or respond_to_missing?) :to_f
-                _timeout = sites(context).to_f.call(context, _timeout, _timeout);
-            }
-            catch (RaiseException e) {
-                TypeConverter.handleUncoercibleObject(context.runtime, _timeout, floatClass(context), true);
-                throw e; // won't happen
-            }
-            final double t = _timeout.convertToFloat().asDouble(context);
+            double t = RubyTime.convertTimeInterval(context, _timeout);
             if ( t < 0 ) throw argumentError(context, "negative timeout");
             timeout = (long) (t * 1000); // ms
         }
@@ -4372,15 +4352,6 @@ static RubyIO ioOpen(ThreadContext context, IRubyObject recv, RubyString filenam
     private static RubyIO ioOpenGeneric(ThreadContext context, IRubyObject recv, IRubyObject filename, int oflags, int fmode, IOEncodable convconfig, int perm) {
         if ((filename instanceof RubyString name) && name.isEmpty()) throw context.runtime.newErrnoENOENTError();
 
-        IRubyObject cmd;
-        if ((recv == ioClass(context)) && (cmd = PopenExecutor.checkPipeCommand(context, filename)) != context.nil) {
-            warnDeprecated(context, "IO process creation with a leading '|' is deprecated and will be removed in Ruby 4.0; use IO.popen instead");
-            if (PopenExecutor.nativePopenAvailable(context.runtime)) {
-                return (RubyIO) PopenExecutor.pipeOpen(context, cmd, OpenFile.ioOflagsModestr(context, oflags), fmode, convconfig);
-            } else {
-                throw argumentError(context, "pipe open is not supported without native subprocess logic");
-            }
-        }
         return (RubyIO) ((RubyFile) fileClass(context).allocate(context)).
                 fileOpenGeneric(context, filename, oflags, fmode, convconfig, perm);
     }
@@ -4708,13 +4679,15 @@ public static IRubyObject popen(ThreadContext context, IRubyObject recv, IRubyOb
 
         int firstArg = 0;
 
-        if (argc > 0 && !TypeConverter.checkHashType(runtime, args[0]).isNil()) {
-            firstArg++;
+        // process trailing keyword arguments hash
+        if (argc > 0 && !(tmp = TypeConverter.checkHashType(runtime, args[argc - 1])).isNil()) {
+            options = (RubyHash)tmp;
             argc--;
         }
 
-        if (argc > 0 && !(tmp = TypeConverter.checkHashType(runtime, args[argc - 1])).isNil()) {
-            options = (RubyHash)tmp;
+        // process leading env hash
+        if (argc > 0 && !TypeConverter.checkHashType(runtime, args[0]).isNil()) {
+            firstArg++;
             argc--;
         }
 
@@ -5061,6 +5034,11 @@ private static RubyFixnum copyStreamCommon(ThreadContext context, IRubyObject ar
     }
 
     private static long transfer(ThreadContext context, ReadableByteChannel from, FileChannel to, long length, long position) throws IOException {
+        // do nothing for length zero
+        if (length == 0) {
+            return 0;
+        }
+
         // handle large files on 32-bit JVMs
         long chunkSize = 128 * 1024 * 1024;
         long transferred = 0;
@@ -5092,6 +5070,11 @@ private static long transfer(ThreadContext context, ReadableByteChannel from, Fi
     }
 
     private static long transfer(FileChannel from, WritableByteChannel to, long remaining, long position) throws IOException {
+        // do nothing for length zero
+        if (remaining == 0) {
+            return 0;
+        }
+
         // handle large files on 32-bit JVMs
         long chunkSize = 128 * 1024 * 1024;
         long transferred = 0;
@@ -5113,6 +5096,11 @@ private static long transfer(FileChannel from, WritableByteChannel to, long rema
     }
 
     private static long transfer(ThreadContext context, ReadableByteChannel from, WritableByteChannel to, long length, long position) throws IOException {
+        // do nothing for length zero
+        if (length == 0) {
+            return 0;
+        }
+
         int chunkSize = 8 * 1024;
         ByteBuffer buffer = ByteBuffer.allocate(chunkSize);
         long transferred = 0;
@@ -5318,6 +5306,22 @@ protected void setPath(String path) {
         openFile.setPath(path);
     }
 
+    @JRubyMethod(name = "timeout")
+    public IRubyObject timeout_get(ThreadContext context) {
+        return getOpenFileInitialized().getTimeout();
+    }
+
+    @JRubyMethod(name = "timeout=")
+    public IRubyObject timeout_set(ThreadContext context, IRubyObject timeout) {
+        if (timeout.isTrue()) {
+            RubyTime.convertTimeInterval(context, timeout);
+        }
+
+        getOpenFileInitialized().setTimeout(timeout);
+
+        return this;
+    }
+
     /**
      * Add a thread to the list of blocking threads for this IO.
      *
@@ -5432,38 +5436,6 @@ protected IOOptions updateIOOptionsFromOptions(ThreadContext context, RubyHash o
         ALL_SPAWN_OPTIONS = new HashSet<>(Arrays.asList(SPAWN_OPTIONS));
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public static void checkExecOptions(IRubyObject options) {
-        if (options instanceof RubyHash) {
-            RubyHash opts = (RubyHash) options;
-            ThreadContext context = opts.getRuntime().getCurrentContext();
-
-            checkValidSpawnOptions(context, opts);
-            checkUnsupportedOptions(context, opts, UNSUPPORTED_SPAWN_OPTIONS, "unsupported exec option");
-        }
-    }
-
-    @Deprecated(since = "9.2.1.0")
-    public static void checkSpawnOptions(IRubyObject options) {
-        if (options instanceof RubyHash) {
-            RubyHash opts = (RubyHash) options;
-            ThreadContext context = opts.getRuntime().getCurrentContext();
-
-            checkValidSpawnOptions(context, opts);
-            checkUnsupportedOptions(context, opts, UNSUPPORTED_SPAWN_OPTIONS, "unsupported spawn option");
-        }
-    }
-
-    @Deprecated(since = "9.2.1.0")
-    public static void checkPopenOptions(IRubyObject options) {
-        if (options instanceof RubyHash) {
-            RubyHash opts = (RubyHash) options;
-            ThreadContext context = opts.getRuntime().getCurrentContext();
-
-            checkUnsupportedOptions(context, opts, UNSUPPORTED_SPAWN_OPTIONS, "unsupported popen option");
-        }
-    }
-
     static void checkUnsupportedOptions(ThreadContext context, RubyHash opts, String[] unsupported, String error) {
         for (String key : unsupported) {
             if (opts.fastARef(asSymbol(context, key)) != null) warn(context, error + ": " + key);
@@ -5582,11 +5554,6 @@ public static IOOptions newIOOptions(Ruby runtime, IOOptions oldFlags, int orOfl
         }
     }
 
-    @Deprecated(since = "1.6.0")
-    public IRubyObject readline(ThreadContext context, IRubyObject[] args) {
-        return args.length == 0 ? readline(context) : readline(context, args[0]);
-    }
-
     @Override
     public void setEnc2(Encoding enc2) {
         openFile.encs.enc2 = enc2;
@@ -5686,277 +5653,6 @@ private static IOSites sites(ThreadContext context) {
         return context.sites.IO;
     }
 
-    @Deprecated(since = "1.7.5")
-    public IRubyObject getline(Ruby runtime, ByteList separator) {
-        return getline(runtime.getCurrentContext(), runtime.newString(separator), -1);
-    }
-
-    @Deprecated(since = "1.7.5")
-    public IRubyObject getline(Ruby runtime, ByteList separator, long limit) {
-        return getline(runtime.getCurrentContext(), runtime.newString(separator), limit);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public IRubyObject getline(ThreadContext context, ByteList separator) {
-        return getline(context, newString(context, separator), -1);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public IRubyObject getline(ThreadContext context, ByteList separator, long limit) {
-        return getline(context, newString(context, separator), limit);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public RubyIO(Ruby runtime, STDIO stdio) {
-        super(runtime, runtime.getIO());
-
-        RubyIO tmp = null;
-        switch (stdio) {
-            case IN:
-                tmp = prepStdio(runtime, runtime.getIn(), Channels.newChannel(runtime.getIn()), OpenFile.READABLE, runtime.getIO(), "<STDIN>");
-                break;
-            case OUT:
-                tmp = prepStdio(runtime, runtime.getOut(), Channels.newChannel(runtime.getOut()), OpenFile.WRITABLE, runtime.getIO(), "<STDOUT>");
-                break;
-            case ERR:
-                tmp = prepStdio(runtime, runtime.getErr(), Channels.newChannel(runtime.getErr()), OpenFile.WRITABLE | OpenFile.SYNC, runtime.getIO(), "<STDERR>");
-                break;
-        }
-
-        this.openFile = tmp.openFile;
-        tmp.openFile = null;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public RubyIO(Ruby runtime, RubyClass cls, ShellLauncher.POpenProcess process, RubyHash options, IOOptions ioOptions) {
-        super(runtime, cls);
-        var context = runtime.getCurrentContext();
-
-        ioOptions = updateIOOptionsFromOptions(context, options, ioOptions);
-
-        openFile = MakeOpenFile();
-
-        setupPopen(context, ioOptions.getModeFlags(), process);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static ModeFlags getIOModes(Ruby runtime, String modesString) {
-        return newModeFlags(runtime, modesString);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static int getIOModesIntFromString(Ruby runtime, String modesString) {
-        try {
-            return ModeFlags.getOFlagsFromString(modesString);
-        } catch (InvalidValueException ive) {
-            throw argumentError(runtime.getCurrentContext(), "illegal access mode");
-        }
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject writeStatic(ThreadContext context, IRubyObject recv, IRubyObject[] argv, Block unusedBlock) {
-        return write(context, recv, argv);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    @JRubyMethod(name = "popen3", rest = true, meta = true)
-    public static IRubyObject popen3(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
-        final Ruby runtime = context.runtime;
-
-        // TODO: handle opts
-        if (args.length > 0 && args[args.length - 1] instanceof RubyHash) {
-            args = ArraySupport.newCopy(args, args.length - 1);
-        }
-
-        final POpenTuple tuple = popenSpecial(context, args);
-        final long pid = ShellLauncher.getPidFromProcess(tuple.process);
-
-        // array trick to be able to reference enclosing RubyThread
-        final RubyThread[] waitThread = new RubyThread[1];
-        waitThread[0] = new RubyThread(
-                runtime,
-                (RubyClass) runtime.getProcess().getConstantAt(context, "WaitThread"), // Process::WaitThread
-                new ThreadedRunnable() {
-
-                    volatile Thread javaThread;
-
-                    @Override
-                    public Thread getJavaThread() {
-                        return javaThread;
-                    }
-
-                    @Override
-                    public void run() {
-                        javaThread = Thread.currentThread();
-                        RubyThread rubyThread;
-                        // spin a bit until this happens; should almost never spin
-                        while ((rubyThread = waitThread[0]) == null) {
-                            Thread.yield();
-                        }
-
-                        runtime.getThreadService().registerNewThread(rubyThread);
-
-                        rubyThread.op_aset(asSymbol(context, "pid"),  asFixnum(context, pid));
-
-                        try {
-                            int exitValue = tuple.process.waitFor();
-
-                            // RubyStatus uses real native status now, so we unshift Java's shifted exit status
-                            RubyProcess.RubyStatus status = RubyProcess.RubyStatus.newProcessStatus(
-                                    runtime,
-                                    exitValue << 8,
-                                    pid);
-
-                            rubyThread.cleanTerminate(status);
-                        } catch (Throwable t) {
-                            rubyThread.exceptionRaised(t);
-                        } finally {
-                            rubyThread.dispose();
-                        }
-                    }
-
-                });
-
-        RubyArray yieldArgs = RubyArray.newArrayLight(runtime,
-                tuple.output,
-                tuple.input,
-                tuple.error,
-                waitThread[0]);
-
-        if (block.isGiven()) {
-            try {
-                return block.yield(context, yieldArgs);
-            } finally {
-                cleanupPOpen(tuple);
-
-                IRubyObject status = waitThread[0].join(context);
-                context.setLastExitStatus(status);
-            }
-        }
-
-        return yieldArgs;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject popen4(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
-        Ruby runtime = context.runtime;
-
-        try {
-            POpenTuple tuple = popenSpecial(context, args);
-
-            RubyArray yieldArgs = RubyArray.newArrayLight(runtime,
-                    asFixnum(context, ShellLauncher.getPidFromProcess(tuple.process)),
-                    tuple.output,
-                    tuple.input,
-                    tuple.error);
-
-            if (block.isGiven()) {
-                try {
-                    return block.yield(context, yieldArgs);
-                } finally {
-                    cleanupPOpen(tuple);
-                    // RubyStatus uses real native status now, so we unshift Java's shifted exit status
-                    context.setLastExitStatus(RubyProcess.RubyStatus.newProcessStatus(runtime, tuple.process.waitFor() << 8, ShellLauncher.getPidFromProcess(tuple.process)));
-                }
-            }
-            return yieldArgs;
-        } catch (InterruptedException e) {
-            throw runtime.newThreadError("unexpected interrupt");
-        }
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    private static void cleanupPOpen(POpenTuple tuple) {
-        if (tuple.input.openFile.isOpen()) {
-            try {
-                tuple.input.close();
-            } catch (RaiseException re) {}
-        }
-        if (tuple.output.openFile.isOpen()) {
-            try {
-                tuple.output.close();
-            } catch (RaiseException re) {}
-        }
-        if (tuple.error.openFile.isOpen()) {
-            try {
-                tuple.error.close();
-            } catch (RaiseException re) {}
-        }
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    private static class POpenTuple {
-        public POpenTuple(RubyIO i, RubyIO o, RubyIO e, Process p) {
-            input = i; output = o; error = e; process = p;
-        }
-        public final RubyIO input;
-        public final RubyIO output;
-        public final RubyIO error;
-        public final Process process;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static POpenTuple popenSpecial(ThreadContext context, IRubyObject[] args) {
-        Ruby runtime = context.runtime;
-
-        try {
-            ShellLauncher.POpenProcess process = ShellLauncher.popen3(runtime, args, false);
-            RubyIO input = process.getInput() != null ?
-                    new RubyIO(runtime, process.getInput()) :
-                    new RubyIO(runtime, process.getInputStream());
-            RubyIO output = process.getOutput() != null ?
-                    new RubyIO(runtime, process.getOutput()) :
-                    new RubyIO(runtime, process.getOutputStream());
-            RubyIO error = process.getError() != null ?
-                    new RubyIO(runtime, process.getError()) :
-                    new RubyIO(runtime, process.getErrorStream());
-
-            // ensure the OpenFile knows it's a process; see OpenFile#finalize
-            input.getOpenFile().setProcess(process);
-            output.getOpenFile().setProcess(process);
-            error.getOpenFile().setProcess(process);
-
-            // set all streams as popenSpecial streams, so we don't shut down process prematurely
-            input.popenSpecial = true;
-            output.popenSpecial = true;
-            error.popenSpecial = true;
-
-            // process streams are not seekable
-//            input.getOpenFile().getMainStreamSafe().getDescriptor().
-//              setCanBeSeekable(false);
-//            output.getOpenFile().getMainStreamSafe().getDescriptor().
-//              setCanBeSeekable(false);
-//            error.getOpenFile().getMainStreamSafe().getDescriptor().
-//              setCanBeSeekable(false);
-
-            return new POpenTuple(input, output, error, process);
-//        } catch (BadDescriptorException e) {
-//            throw runtime.newErrnoEBADFError();
-        } catch (IOException e) {
-            throw runtime.newIOErrorFromException(e);
-        }
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public IRubyObject doWriteNonblock(ThreadContext context, IRubyObject[] argv, boolean useException) {
-        return write_nonblock(context, argv);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject select_static(ThreadContext context, Ruby runtime, IRubyObject[] args) {
-        return select(context, ioClass(context), args);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public static RubyArray checkExecEnv(ThreadContext context, RubyHash hash) {
-        return PopenExecutor.checkExecEnv(context, hash, null);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public static IRubyObject ioOpen(ThreadContext context, IRubyObject filename, IRubyObject vmode, IRubyObject vperm, IRubyObject opt) {
-        return ioOpen(context, ioClass(context), filename, vmode, vperm, opt);
-    }
-
     @Deprecated(since = "9.4.6.0")
     public IRubyObject write_nonblock(ThreadContext context, IRubyObject[] argv) {
         switch (argv.length) {
diff --git a/core/src/main/java/org/jruby/RubyIOBuffer.java b/core/src/main/java/org/jruby/RubyIOBuffer.java
index 43a8b0b5c95..6e86f163252 100644
--- a/core/src/main/java/org/jruby/RubyIOBuffer.java
+++ b/core/src/main/java/org/jruby/RubyIOBuffer.java
@@ -33,7 +33,8 @@
 
 public class RubyIOBuffer extends RubyObject {
 
-    public static final Runtime FFI_RUNTIME = Runtime.getSystemRuntime();
+    private static final BigInteger MIN_S128 = BigInteger.ONE.shiftLeft(127).negate();
+    private static final BigInteger MAX_S128 = BigInteger.ONE.shiftLeft(127).subtract(BigInteger.ONE);
 
     public static RubyClass createIOBufferClass(ThreadContext context, RubyClass Object, RubyModule Comparable, RubyClass IO) {
         RubyClass IOBuffer = IO.defineClassUnder(context, "Buffer", Object, RubyIOBuffer::new).
@@ -745,6 +746,7 @@ public IRubyObject clear(ThreadContext context, IRubyObject value) {
     public IRubyObject clear(ThreadContext context, IRubyObject _value, IRubyObject _offset) {
         int value = toInt(context, _value);
         int offset = toInt(context, _offset);
+        if (offset > size) throw argumentError(context, "The given offset is bigger than the buffer size!");
         return clear(context, value, offset, size - offset);
     }
 
@@ -759,7 +761,7 @@ public IRubyObject clear(ThreadContext context, IRubyObject _value, IRubyObject
     // MRI: rb_io_buffer_clear
     private IRubyObject clear(ThreadContext context, int value, int offset, int length) {
         ByteBuffer buffer = getBufferForWriting(context);
-        if (offset + length > size) throw argumentError(context, "The given offset + length out of bounds!");
+        if (size - length < offset) throw argumentError(context, "The given offset + length out of bounds!");
 
         if (buffer.hasArray()) Arrays.fill(buffer.array(), offset, offset + length, (byte) value);
 
@@ -821,17 +823,19 @@ private boolean freeInternal(ThreadContext context) {
 
     @JRubyMethod(name = "size_of", meta = true)
     public static IRubyObject size_of(ThreadContext context, IRubyObject self, IRubyObject dataType) {
-        if (dataType instanceof RubyArray) {
-            long total = 0;
-            RubyArray<?> array = (RubyArray<?>) dataType;
+        long total;
+        if (dataType instanceof RubyArray array) {
+            total = 0;
             int size = array.size();
             for (int i = 0; i < size; i++) {
                 IRubyObject elt = array.eltOk(i);
-                total += getDataType(elt).type.size();
+                total += getDataType(elt).size;
             }
+        } else {
+            total = getDataType(dataType).size;
         }
 
-        return asFixnum(context, getDataType(dataType).type.size());
+        return asFixnum(context, total);
     }
 
     private boolean isBigEndian() {
@@ -946,6 +950,100 @@ private static void writeLong(ThreadContext context, ByteBuffer buffer, int offs
         buffer.putLong(offset, Long.reverseBytes(value));
     }
 
+    private static BigInteger readLongLong(ThreadContext context, ByteBuffer buffer, int offset, ByteOrder order) {
+        if (order == ByteOrder.BIG_ENDIAN) {
+            // Read 16 bytes (big-endian)
+            byte[] bytes = new byte[16];
+            for (int i = 0; i < 16; i++) {
+                bytes[i] = buffer.get(offset + i);
+            }
+
+            return new BigInteger(bytes);
+        }
+
+        byte[] bytes = new byte[16];
+        for (int i = 0; i < 16; i++) {
+            bytes[15 - i] = buffer.get(offset + i);
+        }
+
+        return new BigInteger(bytes);
+    }
+
+    private static BigInteger readUnsignedLongLong(ThreadContext context, ByteBuffer buffer, int offset, ByteOrder order) {
+        // Read 16 bytes (big-endian)
+        byte[] bytes = new byte[16];
+        buffer.get(offset, bytes);
+
+        if (order == ByteOrder.LITTLE_ENDIAN) {
+            reverseBytes(bytes);
+        }
+
+        return new BigInteger(1, bytes);
+    }
+
+    private static byte[] reverseBytes(byte[] bytes) {
+        for (int i = 0; i < bytes.length / 2; i++) {
+            byte tmp = bytes[i];
+            bytes[i] = bytes[bytes.length - i - 1];
+            bytes[bytes.length - i - 1] = tmp;
+        }
+        return bytes;
+    }
+
+    private static void writeUnsignedLongLong(ThreadContext context, ByteBuffer buffer, int offset, ByteOrder order, BigInteger value) {
+        if (value.signum() < 0) {
+            throw argumentError(context, "Value must be non-negative");
+        }
+        if (value.bitLength() > 128) {
+            throw argumentError(context, "Value exceeds 128 bits");
+        }
+
+        writeLongLongBytes(buffer, offset, order, value.signum(), value.toByteArray());
+    }
+
+    private static void writeLongLong(ThreadContext context, ByteBuffer buffer, int offset, ByteOrder order, BigInteger value) {
+        if (value.compareTo(MIN_S128) < 0 || value.compareTo(MAX_S128) > 0) {
+            throw argumentError(context, "Value exceeds signed 128-bit range");
+        }
+
+        writeLongLongBytes(buffer, offset, order, value.signum(), value.toByteArray());
+    }
+
+    private static void writeLongLongBytes(ByteBuffer buffer, int offset, ByteOrder order, int signum, byte[] bytes) {
+        // Convert to byte array (big-endian, two's complement)
+        int byteLength = bytes.length;
+        int paddingNeeded = 16 - byteLength;
+
+        // Sign-extend padding byte if needed
+        byte paddingByte = (signum < 0) ? (byte) 0xFF : (byte) 0x00;
+
+        if (order == ByteOrder.BIG_ENDIAN) {// Validate the value fits in 128 bits (signed range)
+            if (byteLength <= 16) {
+                writePadding(buffer, offset, paddingNeeded, paddingByte);
+                buffer.put(offset + paddingNeeded, bytes);
+            } else {
+                // drop sign byte
+                buffer.put(offset, bytes, 1, bytes.length - 1);
+            }
+            return;
+        }
+
+        reverseBytes(bytes);
+        if (byteLength <= 16) {
+            buffer.put(offset, bytes);
+            writePadding(buffer, offset + byteLength, paddingNeeded, paddingByte);
+        } else {
+            // drop sign byte
+            buffer.put(offset, bytes, 0, 16);
+        }
+    }
+
+    private static void writePadding(ByteBuffer buffer, int offset, int paddingNeeded, byte paddingByte) {
+        for (int i = 0; i < paddingNeeded; i++) {
+            buffer.put(offset + i, paddingByte);
+        }
+    }
+
     private static void writeUnsignedLong(ThreadContext context, ByteBuffer buffer, int offset, ByteOrder order, long value) {
         writeLong(context, buffer, offset, order, value);
     }
@@ -1004,6 +1102,10 @@ private static long unwrapUnsignedLong(IRubyObject value) {
         return RubyNumeric.num2ulong(value);
     }
 
+    private static BigInteger unwrapUnsignedLongLong(ThreadContext context, IRubyObject value) {
+        return value.convertToInteger().asBigInteger(context);
+    }
+
     @JRubyMethod(name = "get_value")
     public IRubyObject get_value(ThreadContext context, IRubyObject type, IRubyObject _offset) {
         ByteBuffer buffer = getBufferForReading(context);
@@ -1016,7 +1118,8 @@ public IRubyObject get_value(ThreadContext context, IRubyObject type, IRubyObjec
     }
 
     private static IRubyObject getValue(ThreadContext context, ByteBuffer buffer, int size, DataType dataType, int offset) {
-        // TODO: validate size
+        if (offset < 0) throw argumentError(context, "Offset can't be negative!");
+        if (offset == size || size - dataType.size < offset) throw argumentError(context, "Type extends beyond end of buffer! (offset=" + offset + " > size=" + size + ")");
 
         switch (dataType) {
             case S8:
@@ -1047,6 +1150,14 @@ private static IRubyObject getValue(ThreadContext context, ByteBuffer buffer, in
                 return wrap(context, readLong(context, buffer, offset, ByteOrder.LITTLE_ENDIAN));
             case S64:
                 return wrap(context, readLong(context, buffer, offset, ByteOrder.BIG_ENDIAN));
+            case u128:
+                return wrap(context, readUnsignedLongLong(context, buffer, offset, ByteOrder.LITTLE_ENDIAN));
+            case U128:
+                return wrap(context, readUnsignedLongLong(context, buffer, offset, ByteOrder.BIG_ENDIAN));
+            case s128:
+                return wrap(context, readLongLong(context, buffer, offset, ByteOrder.LITTLE_ENDIAN));
+            case S128:
+                return wrap(context, readLongLong(context, buffer, offset, ByteOrder.BIG_ENDIAN));
             case f32:
                 return wrap(context, readFloat(context, buffer, offset, ByteOrder.LITTLE_ENDIAN));
             case F32:
@@ -1078,7 +1189,7 @@ public IRubyObject get_values(ThreadContext context, IRubyObject dataTypes, IRub
             DataType dataType = getDataType(type);
             IRubyObject value = getValue(context, buffer, size, dataType, offset);
 
-            offset += dataType.type.size();
+            offset += dataType.size;
 
             values.append(context, value);
         }
@@ -1123,7 +1234,7 @@ private IRubyObject each(ThreadContext context, ByteBuffer buffer, DataType data
         for (int i = 0 ; i < count; i++) {
             int currentOffset = offset;
             IRubyObject value = getValue(context, buffer, size, dataType, offset);
-            offset += dataType.type.size();
+            offset += dataType.size;
             block.yieldSpecific(context, asFixnum(context, currentOffset), value);
         }
 
@@ -1162,7 +1273,7 @@ private RubyArray values(ThreadContext context, ByteBuffer buffer, DataType data
 
         for (int i = 0 ; i < count; i++) {
             IRubyObject value = getValue(context, buffer, size, dataType, offset);
-            offset += dataType.type.size();
+            offset += dataType.size;
             values.push(context, value);
         }
 
@@ -1200,8 +1311,6 @@ public IRubyObject each_byte(ThreadContext context, IRubyObject _offset, IRubyOb
     }
 
     private IRubyObject eachByte(ThreadContext context, ByteBuffer buffer, int offset, int count, Block block) {
-        Ruby runtime = context.runtime;
-
         for (int i = 0 ; i < count; i++) {
             IRubyObject value = wrap(context, readByte(context, buffer, offset + i));
             block.yieldSpecific(context, value);
@@ -1211,7 +1320,9 @@ private IRubyObject eachByte(ThreadContext context, ByteBuffer buffer, int offse
     }
 
     private static void setValue(ThreadContext context, ByteBuffer buffer, int size, DataType dataType, int offset, IRubyObject value) {
-        // TODO: validate size
+        if (offset < 0) throw argumentError(context, "Offset can't be negative!");
+        if (size == 0) throw argumentError(context, "Size can't be zero!");
+        if (offset == size || size - dataType.size < offset) throw argumentError(context, "Specified offset+length is bigger than the buffer size!");
 
         switch (dataType) {
             case S8:
@@ -1256,6 +1367,18 @@ private static void setValue(ThreadContext context, ByteBuffer buffer, int size,
             case S64:
                 writeLong(context, buffer, offset, ByteOrder.BIG_ENDIAN, toLong(context, value));
                 return;
+            case u128:
+                writeUnsignedLongLong(context, buffer, offset, ByteOrder.LITTLE_ENDIAN, unwrapUnsignedLongLong(context, value));
+                return;
+            case U128:
+                writeUnsignedLongLong(context, buffer, offset, ByteOrder.BIG_ENDIAN, unwrapUnsignedLongLong(context, value));
+                return;
+            case s128:
+                writeLongLong(context, buffer, offset, ByteOrder.LITTLE_ENDIAN, toLongLong(context, value));
+                return;
+            case S128:
+                writeLongLong(context, buffer, offset, ByteOrder.BIG_ENDIAN, toLongLong(context, value));
+                return;
             case f32:
                 writeFloat(context, buffer, offset, ByteOrder.LITTLE_ENDIAN, (float) unwrapDouble(context, value));
                 return;
@@ -1283,7 +1406,7 @@ public IRubyObject set_value(ThreadContext context, IRubyObject _dataType, IRuby
 
         setValue(context, buffer, size, dataType, offset, _value);
 
-        return asFixnum(context, offset + dataType.type.size());
+        return asFixnum(context, offset + dataType.size);
     }
 
     @JRubyMethod(name = "set_values")
@@ -1313,7 +1436,7 @@ public IRubyObject set_values(ThreadContext context, IRubyObject _dataTypes, IRu
 
             setValue(context, buffer, size, dataType, offset, value);
 
-            offset += dataType.type.size();
+            offset += dataType.size;
         }
 
         return asFixnum(context, offset);
@@ -2067,44 +2190,38 @@ private static IRubyObject pwriteInternal(ThreadContext context, RubyIO io, Byte
     }
 
     enum DataType {
-        U8(NativeType.UCHAR, BIG_ENDIAN),
-        S8(NativeType.SCHAR, BIG_ENDIAN),
-        u16(NativeType.USHORT, LITTLE_ENDIAN),
-        U16(NativeType.USHORT, BIG_ENDIAN),
-        s16(NativeType.SSHORT, LITTLE_ENDIAN),
-        S16(NativeType.SSHORT, BIG_ENDIAN),
-        u32(NativeType.UINT, LITTLE_ENDIAN),
-        U32(NativeType.UINT, BIG_ENDIAN),
-        s32(NativeType.SINT, LITTLE_ENDIAN),
-        S32(NativeType.SINT, BIG_ENDIAN),
-        u64(NativeType.ULONG, LITTLE_ENDIAN),
-        U64(NativeType.ULONG, BIG_ENDIAN),
-        s64(NativeType.SLONG, LITTLE_ENDIAN),
-        S64(NativeType.SLONG, BIG_ENDIAN),
-        f32(NativeType.FLOAT,LITTLE_ENDIAN),
-        F32(NativeType.FLOAT, BIG_ENDIAN),
-        f64(NativeType.DOUBLE, LITTLE_ENDIAN),
-        F64(NativeType.DOUBLE, BIG_ENDIAN);
-
-        DataType(NativeType type, int endian) {
-            this.type = FFI_RUNTIME.findType(type);
+        U8(1, BIG_ENDIAN),
+        S8(1, BIG_ENDIAN),
+        u16(2, LITTLE_ENDIAN),
+        U16(2, BIG_ENDIAN),
+        s16(2, LITTLE_ENDIAN),
+        S16(2, BIG_ENDIAN),
+        u32(4, LITTLE_ENDIAN),
+        U32(4, BIG_ENDIAN),
+        s32(4, LITTLE_ENDIAN),
+        S32(4, BIG_ENDIAN),
+        u64(8, LITTLE_ENDIAN),
+        U64(8, BIG_ENDIAN),
+        s64(8, LITTLE_ENDIAN),
+        S64(8, BIG_ENDIAN),
+        u128(16, LITTLE_ENDIAN),
+        U128(16, BIG_ENDIAN),
+        s128(16, LITTLE_ENDIAN),
+        S128(16, BIG_ENDIAN),
+        f32(4, LITTLE_ENDIAN),
+        F32(4, BIG_ENDIAN),
+        f64(8, LITTLE_ENDIAN),
+        F64(8, BIG_ENDIAN);
+
+        DataType(int size, int endian) {
+            this.size = size;
             this.endian = endian;
         }
 
-        private final Type type;
+        private final int size;
         private final int endian;
     }
 
-    private static long swapAsShort(long l) {
-        short s = (short) l;
-
-        return (s >>> 8) | (int) (s << 8);
-    }
-
-    private static short swap(short s) {
-        return (short) ((s >>> 8) | (s << 8));
-    }
-
     private static long swapAsInt(long l) {
         int s = (int) l;
 
diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
index de062ee3af4..ae6d0a65685 100644
--- a/core/src/main/java/org/jruby/RubyInstanceConfig.java
+++ b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -100,7 +100,6 @@ public RubyInstanceConfig(boolean isSecurityRestricted) {
             }
 
             managementEnabled = Options.MANAGEMENT_ENABLED.load();
-            runRubyInProcess = Options.LAUNCH_INPROC.load();
             compileMode = Options.COMPILE_MODE.load();
 
             jitLogging = Options.JIT_LOGGING.load();
@@ -125,7 +124,6 @@ public RubyInstanceConfig(RubyInstanceConfig parentConfig) {
         jitMax = parentConfig.jitMax;
         jitMaxSize = parentConfig.jitMaxSize;
         managementEnabled = parentConfig.managementEnabled;
-        runRubyInProcess = parentConfig.runRubyInProcess;
         excludedMethods = parentConfig.excludedMethods;
         updateNativeENVEnabled = parentConfig.updateNativeENVEnabled;
 
@@ -584,20 +582,6 @@ public boolean isJitEnabled() {
         return getJitThreshold() >= 0 && getCompileMode().shouldJIT();
     }
 
-    /**
-     * @see Options#LAUNCH_INPROC
-     */
-    public boolean isRunRubyInProcess() {
-        return runRubyInProcess;
-    }
-
-    /**
-     * @see Options#LAUNCH_INPROC
-     */
-    public void setRunRubyInProcess(boolean flag) {
-        this.runRubyInProcess = flag;
-    }
-
     public void setInput(InputStream newInput) {
         input = newInput;
     }
@@ -1735,9 +1719,6 @@ public boolean shouldPrecompileAll() {
      */
     public static final boolean NATIVE_ENABLED = Options.NATIVE_ENABLED.load();
 
-    @Deprecated(since = "9.0.0.0")
-    public final static boolean CEXT_ENABLED = false;
-
     /**
      * Whether to reify (pre-compile and generate) a Java class per Ruby class.
      *
@@ -1841,207 +1822,4 @@ private static int initJavaBytecodeVersion() {
                 return Opcodes.V21;
         }
     }
-
-    @Deprecated(since = "1.7.0")
-    public void setSafeLevel(int safeLevel) {
-    }
-
-    @Deprecated(since = "1.7.0")
-    public String getInPlaceBackupExtention() {
-        return inPlaceBackupExtension;
-    }
-
-    @Deprecated(since = "1.7.5")
-    public String getBasicUsageHelp() {
-        return OutputStrings.getBasicUsageHelp();
-    }
-
-    @Deprecated(since = "1.7.5")
-    public String getExtendedHelp() {
-        return OutputStrings.getExtendedHelp();
-    }
-
-    @Deprecated(since = "1.7.5")
-    public String getPropertyHelp() {
-        return OutputStrings.getPropertyHelp();
-    }
-
-    @Deprecated(since = "1.7.5")
-    public String getVersionString() {
-        return OutputStrings.getVersionString();
-    }
-
-    @Deprecated(since = "1.7.5")
-    public String getCopyrightString() {
-        return OutputStrings.getCopyrightString();
-    }
-
-    @Deprecated(since = "1.7.5")
-    public Collection<String> requiredLibraries() {
-        return requiredLibraries;
-    }
-
-    @Deprecated(since = "1.7.5")
-    public List<String> loadPaths() {
-        return loadPaths;
-    }
-
-    @Deprecated(since = "1.7.5")
-    public boolean shouldPrintUsage() {
-        return shouldPrintUsage;
-    }
-
-    @Deprecated(since = "1.7.5")
-    public boolean shouldPrintProperties() {
-        return shouldPrintProperties;
-    }
-
-    @Deprecated(since = "1.7.5")
-    public Boolean getVerbose() {
-        return isVerbose();
-    }
-
-    @Deprecated(since = "1.7.5")
-    public boolean shouldRunInterpreter() {
-        return isShouldRunInterpreter();
-    }
-
-    @Deprecated(since = "1.7.5")
-    public boolean isShouldRunInterpreter() {
-        return shouldRunInterpreter;
-    }
-
-    @Deprecated(since = "1.7.5")
-    public boolean isxFlag() {
-        return xFlag;
-    }
-
-    /**
-     * The max count of active methods eligible for JIT-compilation.
-     */
-    @Deprecated(since = "1.7.5")
-    public static final int JIT_MAX_METHODS_LIMIT = Constants.JIT_MAX_METHODS_LIMIT;
-
-    /**
-     * The max size of JIT-compiled methods (full class size) allowed.
-     */
-    @Deprecated(since = "1.7.5")
-    public static final int JIT_MAX_SIZE_LIMIT = Constants.JIT_MAX_SIZE_LIMIT;
-
-    /**
-     * The JIT threshold to the specified method invocation count.
-     */
-    @Deprecated(since = "1.7.5")
-    public static final int JIT_THRESHOLD = Constants.JIT_THRESHOLD;
-
-    /**
-     * Default size for chained compilation.
-     */
-    @Deprecated(since = "1.7.5")
-    public static final int CHAINED_COMPILE_LINE_COUNT_DEFAULT = Constants.CHAINED_COMPILE_LINE_COUNT_DEFAULT;
-
-    @Deprecated(since = "1.7.5")
-    public static final boolean nativeEnabled = NATIVE_ENABLED;
-
-    @Deprecated(since = "1.7.5")
-    public boolean isSamplingEnabled() {
-        return false;
-    }
-
-    @Deprecated(since = "1.7.5")
-    public void setBenchmarking(boolean benchmarking) {
-    }
-
-    @Deprecated(since = "1.7.5")
-    public boolean isBenchmarking() {
-        return false;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public void setCextEnabled(boolean b) {
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public boolean isCextEnabled() {
-        return false;
-    }
-
-    @Deprecated(since = "1.7.22") public static final String JIT_CODE_CACHE = "";
-
-    @Deprecated(since = "9.3.0.0")
-    public boolean isJitDumping() {
-        return jitDumping;
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public String getThreadDumpSignal() {
-        return threadDumpSignal;
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public boolean isGlobalRequireLock() {
-        return globalRequireLock;
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public void setGlobalRequireLock(boolean globalRequireLock) {
-        this.globalRequireLock = globalRequireLock;
-    }
-
-    @Deprecated(since = "9.2.6.0")
-    public static final boolean NATIVE_NET_PROTOCOL = Options.NATIVE_NET_PROTOCOL.load();
-
-    @Deprecated(since = "9.2.9.0")
-    public static final boolean CAN_SET_ACCESSIBLE = Options.JI_SETACCESSIBLE.load();
-
-    @Deprecated(since = "9.3.0.0")
-    public static boolean THREADLESS_COMPILE_ENABLED = false;
-
-    @Deprecated(since = "9.3.0.0")
-    public static final int CHAINED_COMPILE_LINE_COUNT = 500;
-
-    @Deprecated(since = "9.3.0.0")
-    public static final boolean PEEPHOLE_OPTZ = true;
-
-    @Deprecated(since = "9.3.0.0")
-    public static boolean NOGUARDS_COMPILE_ENABLED = false;
-
-    @Deprecated(since = "9.3.0.0")
-    public static final boolean FASTEST_COMPILE_ENABLED = false;
-
-    @Deprecated(since = "9.3.0.0")
-    public static boolean FASTSEND_COMPILE_ENABLED = false;
-
-    @Deprecated(since = "9.3.0.0")
-    public static boolean FAST_MULTIPLE_ASSIGNMENT = false;
-
-    @Deprecated(since = "9.3.0.0")
-    private final boolean jitDumping = false;
-
-    @Deprecated(since = "9.3.0.0")
-    public static final boolean JIT_LOADING_DEBUG = false;
-
-    @Deprecated(since = "9.3.0.0")
-    public static final boolean JIT_CACHE_ENABLED = false;
-
-    @Deprecated(since = "9.3.0.0")
-    private boolean runRubyInProcess = true;
-
-    @Deprecated(since = "9.3.0.0")
-    public static final boolean REFLECTED_HANDLES = false;
-
-    @Deprecated(since = "9.3.0.0")
-    private String threadDumpSignal = null;
-
-    @Deprecated(since = "9.3.0.0")
-    public static final boolean COROUTINE_FIBERS = false;
-
-    @Deprecated(since = "9.3.0.0")
-    private boolean globalRequireLock = false;
-
-    @Deprecated(since = "9.3.0.0")
-    public static final boolean USE_GENERATED_HANDLES = false;
-
-    @Deprecated(since = "9.4.3.0")
-    public static final boolean FASTOPS_COMPILE_ENABLED = Options.COMPILE_FASTOPS.load();
 }
diff --git a/core/src/main/java/org/jruby/RubyInteger.java b/core/src/main/java/org/jruby/RubyInteger.java
index 668fe4920cc..2adc2fda92b 100644
--- a/core/src/main/java/org/jruby/RubyInteger.java
+++ b/core/src/main/java/org/jruby/RubyInteger.java
@@ -115,11 +115,6 @@ public RubyInteger(Ruby runtime, RubyClass rubyClass, boolean useObjectSpace) {
         super(runtime, rubyClass, useObjectSpace);
     }
 
-    @Deprecated(since = "1.7.0")
-    public RubyInteger(Ruby runtime, RubyClass rubyClass, boolean useObjectSpace, boolean canBeTainted) {
-        super(runtime, rubyClass, useObjectSpace, canBeTainted);
-    }
-
     @Override
     public RubyInteger convertToInteger() {
     	return this;
@@ -1158,16 +1153,6 @@ public IRubyObject op_aref(IRubyObject other) {
         return op_aref(getCurrentContext(), other);
     }
 
-    @Deprecated(since = "9.2.0.0") // no longer used
-    public IRubyObject op_lshift(IRubyObject other) {
-        return op_lshift(getCurrentContext(), other);
-    }
-
-    @Deprecated(since = "9.2.0.0") // no longer used
-    public IRubyObject op_rshift(IRubyObject other) {
-        return op_rshift(getCurrentContext(), other);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject to_f() {
         return to_f(getCurrentContext());
@@ -1185,43 +1170,4 @@ private static CallSite integer_p_site(ThreadContext context) {
     private static JavaSites.IntegerSites sites(ThreadContext context) {
         return context.sites.Integer;
     }
-
-    /** rb_int_induced_from
-     *
-     */
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject induced_from(ThreadContext context, IRubyObject recv, IRubyObject other) {
-        if (other instanceof RubyFixnum || other instanceof RubyBignum) return other;
-
-        if (!(other instanceof RubyFloat) && !(other instanceof RubyRational)) {
-            throw typeError(context, "failed to convert ", other, " into Integer");
-        }
-
-        return other.callMethod(context, "to_i");
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject round() {
-        return this;
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject ceil(){
-        return this;
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject floor(){
-        return this;
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject truncate(){
-        return this;
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public final IRubyObject op_idiv(ThreadContext context, IRubyObject arg) {
-        return div(context, arg);
-    }
 }
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
index 062678ef839..4976089a837 100644
--- a/core/src/main/java/org/jruby/RubyKernel.java
+++ b/core/src/main/java/org/jruby/RubyKernel.java
@@ -59,7 +59,6 @@
 import org.jruby.anno.JRubyModule;
 import org.jruby.api.Warn;
 import org.jruby.ast.util.ArgsUtil;
-import org.jruby.common.IRubyWarnings;
 import org.jruby.common.RubyWarnings;
 import org.jruby.exceptions.CatchThrow;
 import org.jruby.exceptions.MainExitException;
@@ -69,7 +68,6 @@
 import org.jruby.internal.runtime.methods.JavaMethod;
 import org.jruby.internal.runtime.methods.JavaMethod.JavaMethodNBlock;
 import org.jruby.ir.interpreter.Interpreter;
-import org.jruby.ir.operands.UndefinedValue;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.java.proxies.ConcreteJavaProxy;
 import org.jruby.platform.Platform;
@@ -96,7 +94,6 @@
 import org.jruby.util.io.OpenFile;
 import org.jruby.util.io.PopenExecutor;
 
-import static org.jruby.RubyBasicObject.UNDEF;
 import static org.jruby.RubyEnumerator.SizeFn;
 import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
 import static org.jruby.RubyFile.fileResource;
@@ -117,7 +114,6 @@
 import static org.jruby.api.Access.fileClass;
 import static org.jruby.api.Access.globalVariables;
 import static org.jruby.api.Access.integerClass;
-import static org.jruby.api.Access.ioClass;
 import static org.jruby.api.Access.kernelModule;
 import static org.jruby.api.Access.loadService;
 import static org.jruby.api.Access.objectClass;
@@ -138,10 +134,10 @@
 import static org.jruby.api.Create.newString;
 import static org.jruby.api.Error.argumentError;
 import static org.jruby.api.Error.typeError;
-import static org.jruby.api.Warn.warnDeprecatedForRemovalAlternate;
 import static org.jruby.ir.runtime.IRRuntimeHelpers.dupIfKeywordRestAtCallsite;
 import static org.jruby.ir.runtime.IRRuntimeHelpers.receiveKeywords;
 import static org.jruby.runtime.ThreadContext.hasKeywords;
+import static org.jruby.runtime.ThreadContext.hasNonemptyKeywords;
 import static org.jruby.runtime.Visibility.PRIVATE;
 import static org.jruby.runtime.Visibility.PROTECTED;
 import static org.jruby.runtime.Visibility.PUBLIC;
@@ -305,17 +301,6 @@ public static IRubyObject open(ThreadContext context, IRubyObject recv, IRubyObj
                 tmp = RubyFile.get_path(context, tmp);
                 if (tmp == context.nil) {
                     redirect = true;
-                } else {
-                    IRubyObject cmd = PopenExecutor.checkPipeCommand(context, tmp);
-                    if (cmd != context.nil) {
-                        warnDeprecatedForRemovalAlternate(context, "Calling Kernel#open with a leading '|'", "4.0", "IO.popen");
-                        if (PopenExecutor.nativePopenAvailable(context.runtime)) {
-                            args[0] = cmd;
-                            return PopenExecutor.popen(context, args, ioClass(context), block);
-                        }
-
-                        throw argumentError(context, "pipe open is not supported without native subprocess logic");
-                    }
                 }
             }
         }
@@ -329,6 +314,7 @@ public static IRubyObject open(ThreadContext context, IRubyObject recv, IRubyObj
         if (redirect) {
             if (keywords) context.callInfo = ThreadContext.CALL_KEYWORD;
             IRubyObject io = args[0].callMethod(context, "to_open", Arrays.copyOfRange(args, 1, args.length));
+            ThreadContext.resetCallInfo(context);
 
             RubyIO.ensureYieldClose(context, io, block);
             return io;
@@ -1036,97 +1022,212 @@ public static IRubyObject sprintf(ThreadContext context, IRubyObject recv, IRuby
         return str.op_format(context, arg);
     }
 
-    @Deprecated(since = "9.2.5.0")
-    public static IRubyObject sprintf(IRubyObject recv, IRubyObject[] args) {
-        return sprintf(((RubyBasicObject) recv).getCurrentContext(), recv, args);
+    @JRubyMethod(name = {"raise", "fail"}, optional = 4, checkArity = false, module = true, visibility = PRIVATE, omit = true, keywords = true)
+    public static IRubyObject raise(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        return switch (args.length) {
+            case 0 -> raise(context, recv);
+            case 1 -> raise(context, recv, args[0]);
+            case 2 -> raise(context, recv, args[0], args[1]);
+            case 3 -> raise(context, recv, args[0], args[1], args[2]);
+            case 4 -> raise(context, recv, args[0], args[1], args[2], args[3]);
+            default -> {
+                Arity.raiseArgumentError(context, args.length, 0, 3);
+                yield null;
+            }
+        };
     }
-    public static IRubyObject raise(ThreadContext context, IRubyObject self, IRubyObject arg0) {
-        // semi extract_raise_opts :
-        if (arg0 instanceof RubyHash opt && !opt.isEmpty() &&
-                opt.has_key_p(context, asSymbol(context, "cause")) == context.tru) {
-                throw argumentError(context, "only cause is given with no arguments");
-        }
 
-        IRubyObject cause = context.getErrorInfo(); // returns nil for no error-info
+    @JRubyMethod(name = {"raise", "fail"}, module = true, visibility = PRIVATE, omit = true, keywords = true)
+    public static IRubyObject raise(ThreadContext context, IRubyObject recv) {
+        ThreadContext.resetCallInfo(context);
 
-        maybeRaiseJavaException(context, arg0);
+        IRubyObject lastException = context.getErrorInfo();
 
-        RaiseException raise = arg0 instanceof RubyString ?
-                ((RubyException) context.runtime.getRuntimeError().newInstance(context, arg0)).toThrowable() :
-                convertToException(context, arg0, null).toThrowable();
+        maybeThrowJavaException(context, lastException);
 
-        var exception = raise.getException();
+        RubyException exception =
+                lastException instanceof RubyException ex ? ex : newBlankRuntimeException(context);
 
-        if (context.runtime.isDebug()) printExceptionSummary(context, exception);
-        if (exception.getCause() == null && cause != exception) exception.setCause(cause);
+        printDebugException(context, exception);
 
-        throw raise;
+        return Helpers.throwExceptionT(exception.toThrowable());
     }
 
-    @JRubyMethod(name = {"raise", "fail"}, optional = 3, checkArity = false, module = true, visibility = PRIVATE, omit = true)
-    public static IRubyObject raise(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
-        int argc = Arity.checkArgumentCount(context, args, 0, 3);
-        boolean forceCause = false;
+    @JRubyMethod(name = {"raise", "fail"}, module = true, visibility = PRIVATE, omit = true, keywords = true)
+    public static IRubyObject raise(ThreadContext context, IRubyObject recv, IRubyObject arg0) {
+        int callInfo = ThreadContext.resetCallInfo(context);
+
+        Cause cause = prepareCause(context, arg0, 1, callInfo);
+
+        if (cause.remainingArgs == 0) throw argumentError(context, "only cause is given with no arguments");
+
+        maybeThrowJavaException(context, arg0);
+
+        RubyException exception = prepareNewException(context, arg0);
+
+        printDebugException(context, exception);
+
+        setNewExceptionCause(context, exception, cause);
+
+        return Helpers.throwExceptionT(exception.toThrowable());
+    }
+
+    @JRubyMethod(name = {"raise", "fail"}, module = true, visibility = PRIVATE, omit = true, keywords = true)
+    public static IRubyObject raise(ThreadContext context, IRubyObject recv, IRubyObject arg0, IRubyObject arg1) {
+        int callInfo = ThreadContext.resetCallInfo(context);
+
+        Cause cause = prepareCause(context, arg1, 2, callInfo);
+
+        maybeThrowJavaException(context, arg0);
+
+        RubyException exception = switch (cause.remainingArgs) {
+            case 1 -> prepareNewException(context, arg0);
+            default -> prepareNewException(context, arg0, arg1);
+        };
+
+        printDebugException(context, exception);
+
+        setGivenExceptionCause(context, cause, exception);
+
+        return Helpers.throwExceptionT(exception.toThrowable());
+    }
+
+    @JRubyMethod(name = {"raise", "fail"}, module = true, visibility = PRIVATE, omit = true, keywords = true)
+    public static IRubyObject raise(ThreadContext context, IRubyObject recv, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
+        int callInfo = ThreadContext.resetCallInfo(context);
+        Cause cause = prepareCause(context, arg2, 3, callInfo);
+
+        maybeThrowJavaException(context, arg0);
+
+        RubyException exception = switch (cause.remainingArgs) {
+            case 2 -> prepareNewException(context, arg0, arg1);
+            default -> prepareNewException(context, arg0, arg1, arg2);
+        };
+
+        printDebugException(context, exception);
+
+        setNewExceptionCause(context, exception, cause);
+
+        return Helpers.throwExceptionT(exception.toThrowable());
+    }
+
+    public static IRubyObject raise(ThreadContext context, IRubyObject recv, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3) {
+        int callInfo = ThreadContext.resetCallInfo(context);
+
+        Cause cause = prepareCause(context, arg3, 4, callInfo);
+
+        // ensure no more than three args remain
+        Arity.checkArgumentCount(context, cause.remainingArgs, 0, 3);
 
-        // semi extract_raise_opts :
+        maybeThrowJavaException(context, arg0);
+
+        RubyException exception = prepareNewException(context, arg0, arg1, arg2);
+
+        printDebugException(context, exception);
+
+        setNewExceptionCause(context, exception, cause);
+
+        return Helpers.throwExceptionT(exception.toThrowable());
+    }
+
+    /**
+     * Construct a new RuntimeException with an empty message.
+     *
+     * @param context the current thread context
+     * @return the new blank RuntimeException object
+     */
+    private static RubyException newBlankRuntimeException(ThreadContext context) {
+        return RubyException.newException(context.runtime, runtimeErrorClass(context), "");
+    }
+
+    /**
+     * Prepare a {@link Cause} record given the provided last argument, total argument count, and keyword callInfo.
+     *
+     * @param context the current thread context
+     * @param lastArg the last argument provided to Kernel#raise
+     * @param argc the total count of arguments provided to Kernel#raise
+     * @param callInfo the keyword callInfo bits
+     * @return a Cause record
+     */
+    private static Cause prepareCause(ThreadContext context, IRubyObject lastArg, int argc, int callInfo) {
+        boolean causeGiven = false;
         IRubyObject cause = null;
-        if (argc > 0) {
-            IRubyObject last = args[argc - 1];
-            if (last instanceof RubyHash opt) {
+        if (ThreadContext.hasNonemptyKeywords(callInfo)) {
+            if (lastArg instanceof RubyHash opt) {
                 RubySymbol key;
                 if (!opt.isEmpty() && (opt.has_key_p(context, key = asSymbol(context, "cause")) == context.tru)) {
                     cause = opt.delete(context, key, Block.NULL_BLOCK);
-                    forceCause = true;
-                    if (opt.isEmpty() && --argc == 0) { // more opts will be passed along
-                        throw argumentError(context, "only cause is given with no arguments");
+                    causeGiven = true;
+                    if (opt.isEmpty()) {
+                        --argc;
                     }
                 }
             }
         }
 
-        if ( argc > 0 ) { // for argc == 0 we will be raising $!
-            // NOTE: getErrorInfo needs to happen before new RaiseException(...)
-            if ( cause == null ) cause = context.getErrorInfo(); // returns nil for no error-info
-        }
+        if ( cause == null ) cause = context.getErrorInfo();
+        return new Cause(argc, causeGiven, cause);
+    }
 
-        maybeRaiseJavaException(context, args, argc);
+    /**
+     * Represents an exception cause extracted from a Kernel#raise argument list.
+     *
+     * @param remainingArgs the remaining argument count, excluding any cause: keyword
+     * @param provided whether the cause was provided with a cause: keyword
+     * @param value the extracted cause
+     */
+    private record Cause(int remainingArgs, boolean provided, IRubyObject value) {}
 
-        RaiseException raise;
-        switch (argc) {
-            case 0:
-                IRubyObject lastException = globalVariables(context).get("$!");
-                if (lastException.isNil()) {
-                    raise = RaiseException.from(context.runtime, runtimeErrorClass(context), "");
-                } else {
-                    // non RubyException value is allowed to be assigned as $!.
-                    raise = ((RubyException) lastException).toThrowable();
-                }
-                break;
-            case 1:
-                if (args[0] instanceof RubyString) {
-                    raise = ((RubyException) runtimeErrorClass(context).newInstance(context, args, block)).toThrowable();
-                } else {
-                    raise = convertToException(context, args[0], null).toThrowable();
-                }
-                break;
-            case 2:
-                raise = convertToException(context, args[0], args[1]).toThrowable();
-                break;
-            default:
-                RubyException exception = convertToException(context, args[0], args[1]);
-                exception.setBacktrace(context, args[2]);
-                raise = exception.toThrowable();
-                break;
+    /**
+     * Set the cause for an exception that was already constructed elsewhere. This is intended to be used to
+     * appropriately set the cause for previously-raised exceptions. Such exceptions will only hve their cause altered
+     * if:
+     * </p>
+     * <ul>
+     *     <li>the cause is not nil, and either</li>
+     *     <ul>
+     *         <li>it is being forced (provided with cause: keyword), OR</li>
+     *         <li>it has never been set previously and the given cause is not the same as the target exception.</li>
+     *     </ul>
+     * </ul>
+     *
+     * @param context the current thread context
+     * @param cause the desired cause
+     * @param exception the exception
+     */
+    private static void setGivenExceptionCause(ThreadContext context, Cause cause, RubyException exception) {
+        if (!cause.value.isNil() && cause.value != exception) {
+            RubyException.checkCircularCause(context, exception, cause.value);
+
+            if (cause.provided) {
+                exception.setCause(context, cause.value);
+            } else if (exception.getCause() == null) {
+                exception.setCause(context, cause.value);
+            }
         }
+    }
 
-        var exception = raise.getException();
-        if (context.runtime.isDebug()) printExceptionSummary(context, exception);
-        if (forceCause || argc > 0 && exception.getCause() == null && cause != exception) exception.setCause(cause);
-
-        throw raise;
+    /**
+     * Set the cause for a newly-constructed exception.
+     *
+     * @param context the current thread context
+     * @param exception the exception
+     * @param cause the cause
+     */
+    private static void setNewExceptionCause(ThreadContext context, RubyException exception, Cause cause) {
+        if ((cause.provided || exception.getCause() == null) && cause.value != exception) exception.setCause(context, cause.value);
     }
 
-    private static void maybeRaiseJavaException(ThreadContext context, final IRubyObject[] args, final int argc) {
+    /**
+     * Locate and unwrap (if possible) a Java exception to be raised. This path will check for a Java exception in $!
+     * (if no arguments are passed) or as the first argument (if one argument is passed).
+     *
+     * @param context the current context
+     * @param args the arguments passed to Kernel#raise
+     * @param argc the count of arguments passed to Kernel#raise
+     * @return a Java Throwable for the unwrapped exception, or null if no Java exception is available
+     */
+    public static Throwable unwrapJavaException(ThreadContext context, final IRubyObject[] args, final int argc) {
         // Check for a Java exception
         IRubyObject maybeException = null;
         switch (argc) {
@@ -1138,10 +1239,18 @@ private static void maybeRaiseJavaException(ThreadContext context, final IRubyOb
                 break;
         }
 
-        maybeRaiseJavaException(context, maybeException);
+        return unwrapJavaException(context, maybeException);
     }
 
-    private static void maybeRaiseJavaException(ThreadContext context, final IRubyObject arg) {
+    /**
+     * Unwrap (if possible) a Java exception to be raised from the given argument. If the argument does not wrap a Java
+     * exception, this will return null.
+     *
+     * @param context the current context
+     * @param arg the argument to unwrap, if it is a Java exception
+     * @return a Java Throwable for the unwrapped exception, or null if no Java exception is available
+     */
+    private static Throwable unwrapJavaException(ThreadContext context, final IRubyObject arg) {
         // Check for a Java exception
         if (arg instanceof ConcreteJavaProxy) {
             // looks like someone's trying to raise a Java exception. Let them.
@@ -1150,33 +1259,103 @@ private static void maybeRaiseJavaException(ThreadContext context, final IRubyOb
             if (!(maybeThrowable instanceof Throwable)) throw typeError(context, "can't raise a non-Throwable Java object");
 
             final Throwable ex = (Throwable) maybeThrowable;
-            Helpers.throwException(ex);
-            return; // not reached
+            return ex; // not reached
         }
+        return null;
     }
 
-    private static RubyException convertToException(ThreadContext context, IRubyObject obj, IRubyObject optionalMessage) {
-        if (!obj.respondsTo("exception")) throw typeError(context, "exception class/object expected");
+    /**
+     * If the given exception is a Java exception, throw it without any further manipulation.
+     *
+     * @param context the current thread context
+     * @param exception the exception to check and possibly throw
+     */
+    private static void maybeThrowJavaException(ThreadContext context, IRubyObject exception) {
+        Throwable throwable = unwrapJavaException(context, exception);
+        if (throwable != null) Helpers.throwException(throwable);
+    }
+
+    /**
+     * Prepare a new exception given the provided factory object, message, and backtrace. The "exception" method will be
+     * called on the given factory.
+     *
+     * @param context the current thread context
+     * @param stringOrFactory the factory object or string message for RuntimeError
+     * @return the resulting exception object
+     */
+    private static RubyException prepareNewException(ThreadContext context, IRubyObject stringOrFactory) {
+        RubyException exception;
+
+        if (stringOrFactory instanceof RubyString) {
+            exception = ((RubyException) runtimeErrorClass(context).newInstance(context, stringOrFactory));
+        } else {
+            exception = prepareNewException(context, stringOrFactory, null);
+        }
+
+        return exception;
+    }
+
+
+    /**
+     * Prepare a new exception given the provided factory object, message, and backtrace. The "exception" method will be
+     * called on the given factory.
+     *
+     * @param context the current thread context
+     * @param factory the factory object
+     * @param optionalMessage the exception message or null if none
+     * @return the resulting exception object
+     */
+    private static RubyException prepareNewException(ThreadContext context, IRubyObject factory, IRubyObject optionalMessage) {
+        if (!factory.respondsTo("exception")) throw typeError(context, "exception class/object expected");
 
         IRubyObject exception = optionalMessage == null ?
-                obj.callMethod(context, "exception") :
-                obj.callMethod(context, "exception", optionalMessage);
+                factory.callMethod(context, "exception") :
+                factory.callMethod(context, "exception", optionalMessage);
 
-        if (!RubyException.class.isInstance(exception)) throw typeError(context, "exception object expected");
+        if (!(exception instanceof RubyException)) throw typeError(context, "exception object expected");
 
         return (RubyException) exception;
     }
 
-    private static void printExceptionSummary(ThreadContext context, RubyException rEx) {
-        RubyStackTraceElement[] elements = rEx.getBacktraceElements();
-        RubyStackTraceElement firstElement = elements.length > 0 ? elements[0] :
-                new RubyStackTraceElement("", "", "(empty)", 0, false);
-        String msg = String.format("Exception '%s' at %s:%s - %s\n",
-                rEx.getMetaClass(),
-                firstElement.getFileName(), firstElement.getLineNumber(),
-                TypeConverter.convertToType(rEx, stringClass(context), "to_s"));
+    /**
+     * Prepare a new exception given the provided factory object, message, and backtrace. The "exception" method will be
+     * called on the given factory.
+     *
+     * @param context the current thread context
+     * @param factory the factory object
+     * @param message the exception message
+     * @param backtrace the exception backtrace
+     * @return the resulting exception object
+     */
+    private static RubyException prepareNewException(ThreadContext context, IRubyObject factory, IRubyObject message, IRubyObject backtrace) {
+        RubyException exception = prepareNewException(context, factory, message);
+
+        exception.setBacktrace(context, backtrace);
+
+        return exception;
+    }
+
+    /**
+     * Print the given exception to stderr if debug is enabled.
+     *
+     * @param context the current thread context
+     * @param exception the exception to print
+     */
+    private static void printDebugException(ThreadContext context, RubyException exception) {
+        Ruby runtime = context.runtime;
+        if (runtime.isDebug()) {
+            // trigger exception backtrace construction
+            exception.toThrowable();
+            RubyStackTraceElement[] elements = exception.getBacktraceElements();
+            RubyStackTraceElement firstElement = elements.length > 0 ? elements[0] :
+                    new RubyStackTraceElement("", "", "(empty)", 0, false);
+            String msg = String.format("Exception '%s' at %s:%s - %s\n",
+                    exception.getMetaClass(),
+                    firstElement.getFileName(), firstElement.getLineNumber(),
+                    TypeConverter.convertToType(exception, stringClass(context), "to_s"));
 
-        context.runtime.getErrorStream().print(msg);
+            runtime.getErrorStream().print(msg);
+        }
     }
 
     /**
@@ -1516,8 +1695,16 @@ public static IRubyObject warn(ThreadContext context, IRubyObject recv, IRubyObj
                 i = 1;
             }
 
-            for (; i < argMessagesLen; i++) {
-                warnObj(context, recv, args[i], category);
+            if (argMessagesLen - i > 0) {
+                RubyString buffer = newEmptyString(context);
+                buffer.setMetaClass(context.runtime.getWarnings().getWarningBuffer());
+
+                IRubyObject[] newArgs = (argMessagesLen == args.length && i == 0) ? args : Arrays.copyOfRange(args, i, argMessagesLen);
+                RubyIO.puts(context, buffer, newArgs);
+
+                buffer.setMetaClass(context.runtime.getString());
+
+                warnObj(context, recv, buffer, category);
             }
         }
 
@@ -1652,11 +1839,6 @@ public static RubyProc lambda(ThreadContext context, IRubyObject recv, Block blo
         return context.runtime.newProc(Block.Type.LAMBDA, block);
     }
 
-    @Deprecated(since = "9.1.3.0")
-    public static RubyProc proc_1_9(ThreadContext context, IRubyObject recv, Block block) {
-        return proc(context, recv, block);
-    }
-
     @JRubyMethod(name = "loop", module = true, visibility = PRIVATE)
     public static IRubyObject loop(ThreadContext context, IRubyObject recv, Block block) {
         if ( ! block.isGiven() ) {
@@ -2092,9 +2274,7 @@ public static IRubyObject obj_to_enum(final ThreadContext context, IRubyObject s
             };
         }
 
-        boolean keywords = (callInfo & ThreadContext.CALL_KEYWORD) != 0 && (callInfo & ThreadContext.CALL_KEYWORD_EMPTY) == 0;
-
-        ThreadContext.resetCallInfo(context);
+        boolean keywords = hasNonemptyKeywords(ThreadContext.resetCallInfo(context));
         return enumeratorizeWithSize(context, self, method, args, sizeFn, keywords);
     }
 
@@ -2209,16 +2389,6 @@ public static IRubyObject initialize_dup(ThreadContext context, IRubyObject self
         return sites(context).initialize_copy.call(context, self, self, original);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static RubyBoolean respond_to_p(IRubyObject self, IRubyObject mname) {
-        return ((RubyBasicObject) self).respond_to_p(mname);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public static RubyBoolean respond_to_p(IRubyObject self, IRubyObject mname, IRubyObject includePrivate) {
-        return ((RubyBasicObject) self).respond_to_p(mname, includePrivate);
-    }
-
     @JRubyMethod(name = "respond_to?")
     public static IRubyObject respond_to_p(ThreadContext context, IRubyObject self, IRubyObject name) {
         return ((RubyBasicObject) self).respond_to_p(context, name, false);
@@ -2505,46 +2675,6 @@ private static KernelSites sites(ThreadContext context) {
         return context.sites.Kernel;
     }
 
-    @Deprecated(since = "9.1.0.0")
-    public static IRubyObject methodMissing(ThreadContext context, IRubyObject recv, String name, Visibility lastVis, CallType lastCallType, IRubyObject[] args, Block block) {
-        return methodMissing(context, recv, name, lastVis, lastCallType, args);
-    }
-
-    @Deprecated(since = "9.1.16.0")
-    private static IRubyObject caller(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
-        switch (args.length) {
-            case 0:
-                return caller(context, recv);
-            case 1:
-                return caller(context, recv, args[0]);
-            case 2:
-                return caller(context, recv, args[0], args[1]);
-            default:
-                Arity.checkArgumentCount(context, args, 0, 2);
-                return null; // not reached
-        }
-    }
-
-    @Deprecated(since = "9.1.16.0")
-    public static IRubyObject caller_locations(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return caller_locations(context, recv);
-            case 1:
-                return caller_locations(context, recv, args[0]);
-            case 2:
-                return caller_locations(context, recv, args[0], args[1]);
-            default:
-                Arity.checkArgumentCount(context, args, 0, 2);
-                return null; // not reached
-        }
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public static IRubyObject require(IRubyObject recv, IRubyObject name, Block block) {
-        return require(((RubyBasicObject) recv).getCurrentContext(), recv, name, block);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public static IRubyObject op_match(ThreadContext context, IRubyObject self, IRubyObject arg) {
         Warn.warn(context, "deprecated Object#=~ is called on " + ((RubyBasicObject) self).type() +
@@ -2552,23 +2682,6 @@ public static IRubyObject op_match(ThreadContext context, IRubyObject self, IRub
         return ((RubyBasicObject) self).op_match(context, arg);
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject autoload(final IRubyObject recv, IRubyObject symbol, IRubyObject file) {
-        return autoload(((RubyBasicObject) recv).getCurrentContext(), recv, symbol, file);
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject rand(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return RubyRandom.randFloat(context);
-            case 1:
-                return RubyRandom.randKernel(context, recv, args[0]);
-            default:
-                throw argumentError(context, args.length, 0, 1);
-        }
-    }
-
     @Deprecated(since = "9.4.0.0")
     public static IRubyObject method(IRubyObject self, IRubyObject symbol) {
         return ((RubyBasicObject)self).method(symbol);
@@ -2608,4 +2721,9 @@ public static IRubyObject test(ThreadContext context, IRubyObject recv, IRubyObj
                 throw argumentError(context, args.length, 2, 3);
         }
     }
+
+    @Deprecated(since = "10.1.1.0")
+    public static IRubyObject raise(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
+        return raise(context, recv, args);
+    }
 }
diff --git a/core/src/main/java/org/jruby/RubyMatchData.java b/core/src/main/java/org/jruby/RubyMatchData.java
index d3ab13a6db8..edd22aa5d6b 100644
--- a/core/src/main/java/org/jruby/RubyMatchData.java
+++ b/core/src/main/java/org/jruby/RubyMatchData.java
@@ -950,7 +950,7 @@ public IRubyObject deconstruct_keys(ThreadContext context, IRubyObject what) {
 
                 for (int b : entry.getBackRefs()) {
                     IRubyObject value = RubyRegexp.nth_match(context, b, this);
-                    if (value.isTrue()) hash.op_aset(context, key, value);
+                    hash.op_aset(context, key, value);
                 }
             });
         } else if (what instanceof RubyArray arr) {
@@ -966,8 +966,6 @@ public IRubyObject deconstruct_keys(ThreadContext context, IRubyObject what) {
                 if (index == -1) break;
 
                 IRubyObject value = RubyRegexp.nth_match(context, index, this);
-                if (!value.isTrue()) break;
-
                 hash.op_aset(context, requestedKey, value);
             }
         } else {
@@ -1032,20 +1030,4 @@ public int numRegs() {
         return regs == null ? 1 : regs.getNumRegs();
     }
 
-    @Deprecated(since = "9.2.10.0")
-    @Override
-    public RubyArray to_a() {
-        return match_array(getCurrentContext(), 0);
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public IRubyObject op_aref(IRubyObject idx) {
-        return op_aref(getCurrentContext(), idx);
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public IRubyObject op_aref(IRubyObject idx, IRubyObject rest) {
-        return op_aref(getCurrentContext(), idx, rest);
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/RubyMath.java b/core/src/main/java/org/jruby/RubyMath.java
index c55a2062d31..6d88443401a 100644
--- a/core/src/main/java/org/jruby/RubyMath.java
+++ b/core/src/main/java/org/jruby/RubyMath.java
@@ -40,7 +40,7 @@
 
 import static org.jruby.api.Convert.asFixnum;
 import static org.jruby.api.Convert.asFloat;
-import static org.jruby.api.Convert.toDouble;
+import static org.jruby.api.Convert.numToDouble;
 import static org.jruby.api.Convert.toInt;
 import static org.jruby.api.Create.newArray;
 import static org.jruby.api.Define.defineModule;
@@ -83,27 +83,27 @@ public static double sign(double x, double y) {
 
     @JRubyMethod(name = "atan2", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat atan2(ThreadContext context, IRubyObject recv, IRubyObject x, IRubyObject y) {
-        return asFloat(context, Math.atan2(toDouble(context, x), toDouble(context, y)));
+        return asFloat(context, Math.atan2(numToDouble(context, x), numToDouble(context, y)));
     }
 
     @JRubyMethod(name = "cos", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat cos(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        return asFloat(context, Math.cos(toDouble(context, x)));
+        return asFloat(context, Math.cos(numToDouble(context, x)));
     }
 
     @JRubyMethod(name = "sin", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat sin(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        return asFloat(context, Math.sin(toDouble(context, x)));
+        return asFloat(context, Math.sin(numToDouble(context, x)));
     }
 
     @JRubyMethod(name = "tan", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat tan(ThreadContext context, IRubyObject recv,  IRubyObject x) {
-        return asFloat(context, Math.tan(toDouble(context, x)));
+        return asFloat(context, Math.tan(numToDouble(context, x)));
     }
 
     @JRubyMethod(name = "asin", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat asin(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
 
         if (value < -1.0 || value > 1.0) throw context.runtime.newMathDomainError("asin");
 
@@ -112,7 +112,7 @@ public static RubyFloat asin(ThreadContext context, IRubyObject recv, IRubyObjec
 
     @JRubyMethod(name = "acos", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat acos(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
 
         if (value < -1.0 || value > 1.0) throw context.runtime.newMathDomainError("acos");
 
@@ -121,31 +121,31 @@ public static RubyFloat acos(ThreadContext context, IRubyObject recv, IRubyObjec
 
     @JRubyMethod(name = "atan", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat atan(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        return asFloat(context, Math.atan(toDouble(context, x)));
+        return asFloat(context, Math.atan(numToDouble(context, x)));
     }
 
     @JRubyMethod(name = "cosh", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat cosh(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
         
         return asFloat(context, (Math.exp(value) + Math.exp(-value)) / 2.0);
     }
 
     @JRubyMethod(name = "sinh", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat sinh(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
         
         return asFloat(context, (Math.exp(value) - Math.exp(-value)) / 2.0);
     }
 
     @JRubyMethod(name = "tanh", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat tanh(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        return asFloat(context, Math.tanh(toDouble(context, x)));
+        return asFloat(context, Math.tanh(numToDouble(context, x)));
     }
 
     @JRubyMethod(name = "acosh", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat acosh(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
         double result;
         
         if (Double.isNaN(value)) {
@@ -187,7 +187,7 @@ public static RubyFloat acosh(ThreadContext context, IRubyObject recv, IRubyObje
 
     @JRubyMethod(name = "asinh", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat asinh(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
         double  y = Math.abs(value);
         double result;
         
@@ -228,7 +228,7 @@ public static RubyFloat asinh(ThreadContext context, IRubyObject recv, IRubyObje
 
     @JRubyMethod(name = "atanh", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat atanh(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
 
         if (value < -1.0 || value > 1.0) throw context.runtime.newMathDomainError("atanh");
 
@@ -258,7 +258,7 @@ public static RubyFloat exp(ThreadContext context, IRubyObject recv, IRubyObject
     }
 
     public static RubyFloat exp(ThreadContext context, IRubyObject exponent) {
-        return asFloat(context, Math.exp(toDouble(context, exponent)));
+        return asFloat(context, Math.exp(numToDouble(context, exponent)));
     }
 
     // MRI : get_double_rshift
@@ -275,7 +275,7 @@ private static double[] get_double_rshift(ThreadContext context, IRubyObject x)
             }
         }
 
-        return new double[]{toDouble(context, x), numbits};
+        return new double[]{numToDouble(context, x), numbits};
     }
 
     private static int DBL_MANT_DIG = 53;
@@ -303,7 +303,7 @@ public static RubyFloat log(ThreadContext context, IRubyObject val) {
     @JRubyMethod(name = "log", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat log(ThreadContext context, IRubyObject recv, IRubyObject val, IRubyObject base) {
         double [] ret = get_double_rshift(context, val);
-        double _base = toDouble(context, base);
+        double _base = numToDouble(context, base);
 
         if (ret[0] < 0 || _base < 0) throw context.runtime.newMathDomainError("log");
 
@@ -343,7 +343,7 @@ public static RubyFloat log2(ThreadContext context, IRubyObject recv, IRubyObjec
 
     @JRubyMethod(name = "sqrt", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat sqrt(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
 
         if (value < 0) throw context.runtime.newMathDomainError("sqrt");
 
@@ -352,7 +352,7 @@ public static RubyFloat sqrt(ThreadContext context, IRubyObject recv, IRubyObjec
 
     @JRubyMethod(name = "cbrt", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat cbrt(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        return asFloat(context, Math.cbrt(toDouble(context, x)));
+        return asFloat(context, Math.cbrt(numToDouble(context, x)));
     }
 
     @Deprecated(since = "10.0.0.0")
@@ -362,8 +362,8 @@ public static RubyFloat hypot19(ThreadContext context, IRubyObject recv, IRubyOb
 
     @JRubyMethod(name = "hypot", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat hypot(ThreadContext context, IRubyObject recv, IRubyObject x, IRubyObject y) {
-        double valuea = toDouble(context, x);
-        double valueb = toDouble(context, y);
+        double valuea = numToDouble(context, x);
+        double valueb = numToDouble(context, y);
         double result;
         
         if (Math.abs(valuea) > Math.abs(valueb)) {
@@ -390,7 +390,7 @@ public static RubyFloat hypot(ThreadContext context, IRubyObject recv, IRubyObje
      */
     @JRubyMethod(name = "frexp", module = true, visibility = Visibility.PRIVATE)
     public static RubyArray frexp(ThreadContext context, IRubyObject recv, IRubyObject other) {
-        double mantissa = toDouble(context, other);
+        double mantissa = numToDouble(context, other);
         short sign = 1;
         long exponent = 0;
 
@@ -416,7 +416,7 @@ public static RubyArray frexp(ThreadContext context, IRubyObject recv, IRubyObje
      */
     @JRubyMethod(name = "ldexp", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat ldexp(ThreadContext context, IRubyObject recv, IRubyObject mantissa, IRubyObject exponent) {
-        double m = toDouble(context, mantissa);
+        double m = numToDouble(context, mantissa);
         int e = toInt(context, exponent);
 
         return e > 1023 ? // avoid overflow. Math.power(2.0, 1024) is greater than Math.MAX_VALUE.
@@ -443,7 +443,7 @@ public static RubyFloat ldexp(ThreadContext context, IRubyObject recv, IRubyObje
 
     @JRubyMethod(name = "erf", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat erf(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
         double  y = Math.abs(value);
         double  result;
 
@@ -526,7 +526,7 @@ public static RubyFloat erf(ThreadContext context, IRubyObject recv, IRubyObject
 
     @JRubyMethod(name = "erfc", module = true, visibility = Visibility.PRIVATE)
     public static RubyFloat erfc(ThreadContext context, IRubyObject recv, IRubyObject x) {
-        double value = toDouble(context, x);
+        double value = numToDouble(context, x);
         double  result;
         double  y = Math.abs(value);
 
@@ -720,4 +720,20 @@ private static boolean negZero(final double x) {
         }
 
     }
+
+    @JRubyMethod(module = true, visibility = Visibility.PRIVATE)
+    public static IRubyObject expm1(ThreadContext context, IRubyObject unused, IRubyObject x) {
+        return asFloat(context, Math.expm1(numToDouble(context, x)));
+    }
+
+    @JRubyMethod(module = true, visibility = Visibility.PRIVATE)
+    public static IRubyObject log1p(ThreadContext context, IRubyObject unused, IRubyObject x) {
+        double xDouble = numToDouble(context, x);
+
+        if (xDouble < -1.0) {
+            throw context.runtime.newMathDomainError("log1p");
+        }
+
+        return asFloat(context, Math.log1p(xDouble));
+    }
 }
diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
index 967d560a438..0e30c3a6d80 100644
--- a/core/src/main/java/org/jruby/RubyMethod.java
+++ b/core/src/main/java/org/jruby/RubyMethod.java
@@ -299,11 +299,6 @@ public IRubyObject super_method(ThreadContext context) {
         return super_method(context, receiver, superClass);
     }
 
-    @JRubyMethod
-    public IRubyObject original_name(ThreadContext context) {
-        return method instanceof AliasMethod ? asSymbol(context, ((AliasMethod)method).getOldName()) : name(context);
-    }
-
     public IRubyObject getReceiver() {
         return receiver;
     }
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
index fa357dc538c..82c30bc882c 100644
--- a/core/src/main/java/org/jruby/RubyModule.java
+++ b/core/src/main/java/org/jruby/RubyModule.java
@@ -234,7 +234,7 @@ public static void finishModuleClass(RubyClass Module) {
     }
 
     public static void finishCreateModuleClass(ThreadContext context, RubyClass Module) {
-        Module.defineMethods(context, RubyModule.class, ModuleKernelMethods.class);
+        Module.defineMethods(context, RubyModule.class);
     }
 
     public void checkValidBindTargetFrom(ThreadContext context, RubyModule originModule, boolean fromBind) throws RaiseException {
@@ -713,11 +713,6 @@ public RubyModule getOrigin() {
         return this;
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public RubyModule getNonIncludedClass() {
-        return this;
-    }
-
     public RubyModule getDelegate() {
         return this;
     }
@@ -828,7 +823,7 @@ private RubyString calculateAnonymousRubyName(ThreadContext context) {
         anonBase.append(metaClass.getRealClass().rubyName(context)).append(newString(context, ":0x"));
         anonBase.append(newString(context, Integer.toHexString(System.identityHashCode(this)))).append(newString(context, ">"));
 
-        return anonBase;
+        return (RubyString) anonBase.freeze(context);
     }
 
     private RubyString calculateRubyName(ThreadContext context) {
@@ -837,7 +832,7 @@ private RubyString calculateRubyName(ThreadContext context) {
         if (getBaseName() == null) return calculateAnonymousRubyName(context); // no name...anonymous!
 
         if (usingTemporaryName()) { // temporary name
-            cachedRubyName = asSymbol(context, baseName).toRubyString(context);
+            cachedRubyName = (RubyString) asSymbol(context, baseName).toRubyString(context).freeze(context);
             return cachedRubyName;
         }
         
@@ -864,7 +859,7 @@ private RubyString calculateRubyName(ThreadContext context) {
 
         RubyString fullName = buildPathString(context, parents);
 
-        if (cache) cachedRubyName = fullName;
+        if (cache) cachedRubyName = (RubyString) fullName.freeze(context);
 
         return fullName;
     }
@@ -1000,6 +995,8 @@ private String calculateAnonymousName(ThreadContext context) {
 
     @JRubyMethod(required = 1)
     public IRubyObject set_temporary_name(ThreadContext context, IRubyObject arg) {
+        checkFrozen();
+
         if (baseName != null && IdUtil.isValidConstantName(baseName) && (parent == null || parent.baseName != null)) {
             throw runtimeError(context, "can't change permanent name");
         }
@@ -1255,24 +1252,6 @@ public IRubyObject used_modules(ThreadContext context) {
         return ary;
     }
 
-    /**
-     * Create a wrapper to use for including the specified module into this one.
-     *
-     * Ruby C equivalent = "include_class_new"
-     *
-     * @return The module wrapper
-     */
-    @Deprecated(since = "1.1.5")
-    public IncludedModuleWrapper newIncludeClass(RubyClass superClazz) {
-        var context = getCurrentContext();
-        IncludedModuleWrapper includedModule = new IncludedModuleWrapper(context.runtime, superClazz, this);
-
-        // include its parent (and in turn that module's parents)
-        if (getSuperClass() != null) includedModule.includeModule(context, getSuperClass());
-
-        return includedModule;
-    }
-
     @Deprecated(since = "10.0.0.0")
     public RubyModule getModule(String name) {
         return getModule(getCurrentContext(), name);
@@ -1308,11 +1287,6 @@ public RubyClass getClass(ThreadContext context, String name) {
         return (RubyClass) getConstantAt(context, name);
     }
 
-    @Deprecated(since = "1.7.0")
-    public RubyClass fastGetClass(String internedName) {
-        return getClass(getCurrentContext(), internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public void prependModule(RubyModule module) {
         prependModule(getCurrentContext(), module);
@@ -1367,12 +1341,6 @@ public void accept(RubyClass includeClass) {
         }
     }
 
-    @Deprecated(since = "9.2.8.0")
-    public void prependModule(IRubyObject arg) {
-        assert arg != null;
-        prependModule(castAsModule(getCurrentContext(), arg));
-    }
-
     @Deprecated(since = "10.0.0.0")
     public synchronized void includeModule(IRubyObject arg) {
         includeModule(getCurrentContext(), arg);
@@ -1475,12 +1443,14 @@ private boolean defineAnnotatedConstant(ThreadContext context, Field field) {
         IRubyObject realVal;
 
         try {
-            if(tp == Integer.class || tp == Integer.TYPE || tp == Short.class || tp == Short.TYPE || tp == Byte.class || tp == Byte.TYPE) {
+            if (tp == Integer.class || tp == Integer.TYPE || tp == Short.class || tp == Short.TYPE || tp == Byte.class || tp == Byte.TYPE) {
                 realVal = asFixnum(context, field.getInt(null));
-            } else if(tp == Boolean.class || tp == Boolean.TYPE) {
+            } else if (tp == Boolean.class || tp == Boolean.TYPE) {
                 realVal = asBoolean(context, field.getBoolean(null));
+            } else if (tp == String.class) {
+                realVal = newString(context, field.get(null).toString());
             } else {
-                realVal = context.nil;
+                throw new RuntimeException("Unsupported type for annotated constant: " + tp.getName());
             }
         } catch(Exception e) {
             realVal = context.nil;
@@ -1560,11 +1530,6 @@ public void clump(final Method[] declaredMethods) {
             }
         }
 
-        @Deprecated(since = "9.1.0.0") // no-longer used
-        public Map<String, List<JavaMethodDescriptor>> getAllAnnotatedMethods() {
-            return null; // return allAnnotatedMethods;
-        }
-
         public final Map<String, List<JavaMethodDescriptor>> getAnnotatedMethods() {
             return annotatedMethods == null ? Collections.EMPTY_MAP : annotatedMethods;
         }
@@ -1679,7 +1644,6 @@ public <T extends RubyModule> T baseName(String name) {
     @JRubyAPI
     public <T extends RubyModule> T classIndex(ClassIndex classIndex) {
         this.classIndex = classIndex;
-        this.index = classIndex.ordinal();
         return (T) this;
     }
 
@@ -1922,7 +1886,7 @@ public IRubyObject singleton_class_p(ThreadContext context) {
     }
 
     private String frozenType() {
-        return isClass() ? "class" : "module";
+        return isClass() ? "Class" : "Module";
     }
 
     @Deprecated(since = "10.0.0.0")
@@ -2137,11 +2101,6 @@ private CacheEntry searchWithCacheMiss(Ruby runtime, final String id) {
         return methodEntry;
     }
 
-    @Deprecated(since = "1.7.0")
-    public final int getCacheToken() {
-        return generation;
-    }
-
     public final int getGeneration() {
         return generation;
     }
@@ -2334,18 +2293,6 @@ public CacheEntry searchMethodEntryInner(String id) {
         return null;
     }
 
-    /**
-     * Searches for a method up until the superclass, but include modules.
-     */
-    @Deprecated(since = "9.3.11.0")
-    public DynamicMethod searchMethodLateral(String id) {
-        for (RubyModule module = this; (module == this || (module instanceof IncludedModuleWrapper)); module = module.getSuperClass()) {
-            DynamicMethod method = module.searchMethodCommon(id);
-            if (method != null) return method.isNull() ? null : method;
-        }
-        return null;
-    }
-
     // MRI: resolve_refined_method
     public CacheEntry resolveRefinedMethod(RubyModule overlay, CacheEntry entry, String id) {
         if (entry != null && entry.method.isRefined()) {
@@ -2890,11 +2837,6 @@ public boolean respondsToMethod(String name, boolean checkVisibility) {
         return Helpers.respondsToMethod(searchMethod(name), checkVisibility);
     }
 
-    @Deprecated(since = "9.1.7.0")
-    public boolean isMethodBound(String name, boolean checkVisibility, boolean checkRespondTo) {
-        return checkRespondTo ? respondsToMethod(name, checkVisibility): isMethodBound(name, checkVisibility);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public final IRubyObject newMethod(IRubyObject receiver, String methodName, boolean bound, Visibility visibility) {
         return newMethod(getCurrentContext(), receiver, methodName, null, bound, visibility, false, true);
@@ -3061,15 +3003,6 @@ public IRubyObject defineMethodFromCallable(ThreadContext context, IRubyObject a
         return name;
     }
 
-    @Deprecated(since = "1.1.2")
-    public IRubyObject define_method(ThreadContext context, IRubyObject[] args, Block block) {
-        return switch (args.length) {
-            case 1 -> define_method(context, args[0], block);
-            case 2 -> define_method(context, args[0], args[1], block);
-            default -> throw argumentError(context, "wrong number of arguments (" + args.length + " for 2)");
-        };
-    }
-
     private DynamicMethod createProcMethod(Ruby runtime, String name, Visibility visibility, Block block) {
         block = block.cloneBlockAndFrame();
 
@@ -3120,12 +3053,14 @@ protected final IRubyObject cloneMethods(ThreadContext context, RubyModule clone
         return clone;
     }
 
-    /** mri: rb_mod_init_copy
+    /**
+     * mri: rb_mod_init_copy
      *
+     * This no longer overrides {@link RubyBasicObject#initialize_copy(ThreadContext, IRubyObject)} to ensure a cloned
+     * class or module is internally initialized before calling any user `initialize_copy` that might be defined.
      */
-    @JRubyMethod(name = "initialize_copy", visibility = Visibility.PRIVATE)
-    public IRubyObject initialize_copy(ThreadContext context, IRubyObject original) {
-        if (this instanceof RubyClass klazz) checkSafeTypeToCopy(context, klazz);
+    public IRubyObject initializeCopiedModule(ThreadContext context, IRubyObject original) {
+        if (original instanceof RubyClass klazz) checkSafeTypeToCopy(context, klazz);
 
         super.initialize_copy(context, original);
 
@@ -3150,7 +3085,7 @@ private void checkSafeTypeToCopy(ThreadContext context, RubyClass original) {
         var BasicObject = basicObjectClass(context);
         if (original == BasicObject) throw typeError(context, "can't copy the root class");
         if (getSuperClass() == BasicObject) throw typeError(context, "already initialized class");
-        if (original.isSingleton()) throw typeError(context, "can't copy singleton class");
+        if (original instanceof MetaClass) throw typeError(context, "can't copy singleton class");
     }
 
     public void syncConstants(RubyModule other) {
@@ -3508,12 +3443,12 @@ public IRubyObject ruby2_keywords(ThreadContext context, IRubyObject[] args) {
             if (method.getDefinedClass() == this) {
                 if (!method.isNative()) {
                     Signature signature = method.getSignature();
-                    if (!signature.hasRest()) {
-                        warn(context, str(context.runtime, "Skipping set of ruby2_keywords flag for ", ids(context.runtime, name), " (method accepts keywords or method does not accept argument splat)"));
+                    if (!signature.hasRest() || signature.post() != 0) {
+                        warn(context, str(context.runtime, "Skipping set of ruby2_keywords flag for ", ids(context.runtime, name), " (method accepts keywords or post arguments or method does not accept argument splat)"));
                     } else if (!signature.hasKwargs()) {
                         method.setRuby2Keywords();
                     } else if (method instanceof AbstractIRMethod && ((AbstractIRMethod) method).getStaticScope().exists("...") == -1) {
-                        warn(context, str(context.runtime, "Skipping set of ruby2_keywords flag for ", ids(context.runtime, name), " (method accepts keywords or method does not accept argument splat)"));
+                        warn(context, str(context.runtime, "Skipping set of ruby2_keywords flag for ", ids(context.runtime, name), " (method accepts keywords or post arguments or method does not accept argument splat)"));
                     }
                 } else {
                     warn(context, str(context.runtime, "Skipping set of ruby2_keywords flag for ", ids(context.runtime, name), " (method not defined in Ruby)"));
@@ -3544,11 +3479,6 @@ public IRubyObject attr(ThreadContext context, IRubyObject[] args) {
         return attr_reader(context, args);
     }
 
-    @Deprecated(since = "1.1.5")
-    public IRubyObject attr_reader(IRubyObject[] args) {
-        return attr_reader(getCurrentContext(), args);
-    }
-
     /** rb_mod_attr_reader
      *
      */
@@ -3589,11 +3519,6 @@ public IRubyObject attr_writer(ThreadContext context, IRubyObject[] args) {
     }
 
 
-    @Deprecated(since = "1.1.5")
-    public IRubyObject attr_accessor(IRubyObject[] args) {
-        return attr_accessor(getCurrentContext(), args);
-    }
-
     /** rb_mod_attr_accessor
      *  Note: this method should not be called from Java in most cases, since
      *  it depends on Ruby frame state for visibility. Use add[Read/Write]Attribute instead.
@@ -3853,6 +3778,13 @@ public IRubyObject extend_object(ThreadContext context, IRubyObject obj) {
         return obj;
     }
 
+    @JRubyAPI
+    public RubyModule extendObject(ThreadContext context, IRubyObject obj) {
+        extend_object(context, obj);
+
+        return this;
+    }
+
     @Deprecated(since = "10.0.0.0")
     public RubyModule include(IRubyObject[] modules) {
         return include(getCurrentContext(), modules);
@@ -4928,7 +4860,7 @@ public RubyArray constants(ThreadContext context, IRubyObject allConstants) {
 
     private RubyArray<?> constantsCommon(ThreadContext context, boolean replaceModule, boolean allConstants) {
         Collection<String> constantNames = constantsCommon(context.runtime, replaceModule, allConstants, false);
-        var array = RubyArray.newBlankArrayInternal(context.runtime, constantNames.size());
+        var array = RubyArrayNative.newBlankArrayInternal(context.runtime, constantNames.size());
 
         int i = 0;
         for (String name : constantNames) {
@@ -5161,11 +5093,6 @@ public IRubyObject setClassVar(ThreadContext context, String name, IRubyObject v
         return highest.storeClassVariable(context, name, value);
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastSetClassVar(final String internedName, final IRubyObject value) {
-        return setClassVar(getCurrentContext(), internedName, value);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject getClassVar(String name) {
         return getClassVar(getCurrentContext(), name);
@@ -5237,11 +5164,6 @@ private IRubyObject getClassVarQuiet(ThreadContext context, String name) {
         return null;
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastGetClassVar(String internedName) {
-        return getClassVar(getCurrentContext(), internedName);
-    }
-
     /**
      * Is class var defined?
      *
@@ -5260,11 +5182,6 @@ public boolean isClassVarDefined(String name) {
         return false;
     }
 
-    @Deprecated(since = "1.7.0")
-    public boolean fastIsClassVarDefined(String internedName) {
-        return isClassVarDefined(internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject removeClassVariable(String name) {
         return removeClassVariable(getCurrentContext(), name);
@@ -5325,11 +5242,6 @@ public IRubyObject getConstantAt(ThreadContext context, String name, boolean inc
         return value == UNDEF ? resolveUndefConstant(context, name) : value;
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastGetConstantAt(String internedName) {
-        return getConstantAt(getCurrentContext(), internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject getConstant(String name) {
         return getConstant(getCurrentContext(), name);
@@ -5385,16 +5297,6 @@ public IRubyObject getConstant(ThreadContext context, String name, boolean inher
         return value != null ? value : callMethod(context, "const_missing", asSymbol(context, name));
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastGetConstant(String internedName) {
-        return getConstant(getCurrentContext(), internedName);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastGetConstant(String internedName, boolean inherit) {
-        return getConstant(getCurrentContext(), internedName, inherit);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject getConstantNoConstMissing(String name) {
         return getConstantNoConstMissing(getCurrentContext(), name);
@@ -5437,11 +5339,6 @@ public final IRubyObject getConstantNoConstMissingSkipAutoload(ThreadContext con
         return getConstantSkipAutoload(context, name, true, true, true);
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public IRubyObject getConstantNoConstMissingSKipAutoload(String name) {
-        return getConstantSkipAutoload(getCurrentContext(), name, true, true, true);
-    }
-
     // returns null for autoloads that have failed
     private IRubyObject getConstantSkipAutoload(ThreadContext context, String name, boolean inherit, boolean searchObject, boolean inheritObject) {
         IRubyObject constant = iterateConstantNoConstMissing(context, name, this, inherit, false, inheritObject);
@@ -5538,11 +5435,6 @@ public IRubyObject getConstantWithAutoload(ThreadContext context, String name, I
         return autoloadModule != null ? failedAutoloadValue : null;
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastGetConstantFrom(String internedName) {
-        return getConstantFrom(getCurrentContext(), internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject getConstantFromNoConstMissing(String name) {
         return getConstantFromNoConstMissing(getCurrentContext(), name);
@@ -5575,11 +5467,6 @@ public IRubyObject getConstantFromNoConstMissing(ThreadContext context, String n
         return null;
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastGetConstantFromNoConstMissing(String internedName) {
-        return getConstantFromNoConstMissing(getCurrentContext(), internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject getConstantFromConstMissing(String name) {
         return getConstantFromConstMissing(getCurrentContext(), name);
@@ -5589,11 +5476,6 @@ public IRubyObject getConstantFromConstMissing(ThreadContext context, String nam
         return callMethod(context, "const_missing", context.runtime.fastNewSymbol(name));
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastGetConstantFromConstMissing(String internedName) {
-        return getConstantFromConstMissing(getCurrentContext(), internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public final IRubyObject resolveUndefConstant(String name) {
         return resolveUndefConstant(getCurrentContext(), name);
@@ -6045,22 +5927,12 @@ public boolean hasClassVariable(String name) {
         return getClassVariablesForRead().containsKey(name);
     }
 
-    @Deprecated(since = "1.7.0")
-    public boolean fastHasClassVariable(String internedName) {
-        return hasClassVariable(internedName);
-    }
-
     // runtime-free
     public IRubyObject fetchClassVariable(String name) {
         assert IdUtil.isClassVariable(name);
         return getClassVariablesForRead().get(name);
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastFetchClassVariable(String internedName) {
-        return fetchClassVariable(internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject storeClassVariable(String name, IRubyObject value) {
         return storeClassVariable(getCurrentContext(), name, value);
@@ -6073,11 +5945,6 @@ public IRubyObject storeClassVariable(ThreadContext context, String name, IRubyO
         return value;
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastStoreClassVariable(String internedName, IRubyObject value) {
-        return storeClassVariable(getCurrentContext(), internedName, value);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject deleteClassVariable(String name) {
         return deleteClassVariable(getCurrentContext(), name);
@@ -6143,11 +6010,6 @@ public boolean hasConstant(String name) {
         return constantTableContains(name);
     }
 
-    @Deprecated(since = "1.7.0")
-    public boolean fastHasConstant(String internedName) {
-        return hasConstant(internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject fetchConstant(String name) {
         return fetchConstant(getCurrentContext(), name);
@@ -6198,11 +6060,6 @@ public ConstantEntry fetchConstantEntry(ThreadContext context, String name, bool
         return entry;
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastFetchConstant(String internedName) {
-        return fetchConstant(getCurrentContext(), internedName);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject storeConstant(String name, IRubyObject value) {
         return storeConstant(getCurrentContext(), name, value);
@@ -6247,11 +6104,6 @@ private IRubyObject storeConstant(ThreadContext context, String name, IRubyObjec
         return constantTableStore(name, value, hidden, deprecated);
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject fastStoreConstant(String internedName, IRubyObject value) {
-        return storeConstant(getCurrentContext(), internedName, value);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject deleteConstant(String name) {
         return deleteConstant(getCurrentContext(), name);
@@ -6265,16 +6117,6 @@ public IRubyObject deleteConstant(ThreadContext context, String name) {
         return constantTableRemove(name);
     }
 
-    @Deprecated(since = "1.1.5")
-    public List<Variable<IRubyObject>> getStoredConstantList() {
-        return null;
-    }
-
-    @Deprecated(since = "1.1.5")
-    public List<String> getStoredConstantNameList() {
-        return new ArrayList<>(getConstantMap().keySet());
-    }
-
     /**
      * @return a list of constant names that exists at time this was called
      */
@@ -6354,7 +6196,7 @@ private void checkAndRaiseIfFrozen(ThreadContext context) throws RaiseException
     @Override
     public final void checkFrozen() {
        if ( isFrozen() ) {
-           throw getRuntime().newFrozenError(isClass() ? "class" : "module", this);
+           throw getRuntime().newFrozenError(frozenType(), this);
        }
     }
 
@@ -6583,11 +6425,6 @@ private static void define(ThreadContext context, RubyModule module, JavaMethodD
         }
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject initialize(Block block) {
-        return initialize(getCurrentContext());
-    }
-
     public KindOf kindOf = KindOf.DEFAULT_KIND_OF;
 
     public final int id;
@@ -6668,12 +6505,6 @@ public ConstantEntry dup() {
         }
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public interface AutoloadMethod {
-        void load(Ruby runtime);
-        RubyString getFile();
-    }
-
     /**
      * Objects for holding autoload state for the defined constant.
      *
@@ -6918,8 +6749,20 @@ private static void refinementImportMethodsIter(ThreadContext context, RubyModul
             DynamicMethod dup = entry.getValue().dup();
             dup.setImplementationClass(selfModule);
 
-            // maybe insufficient if we have already compiled assuming no refinements
-            ((AbstractIRMethod) dup).getIRScope().setIsMaybeUsingRefinements();
+            AbstractIRMethod dupAir = (AbstractIRMethod) dup;
+            dupAir.getIRScope().setIsMaybeUsingRefinements();
+
+            RubyModule definedAt = selfModule.getRefinementStoreForWrite().definedAt;
+            if (definedAt != null) {
+                Map<RubyModule, RubyModule> refinements = definedAt.getRefinements();
+                if (!refinements.isEmpty()) {
+                    dupAir
+                      .getStaticScope()
+                      .getOverlayModuleForWrite(context)
+                      .getRefinementsForWrite()
+                      .putAll(refinements);
+                }
+            }
 
             selfModule.addMethod(context, entry.getKey(), dup);
         }
@@ -6965,64 +6808,6 @@ private static void refinementImportMethodsIter(ThreadContext context, RubyModul
     // superClass may be null.
     protected RubyClass superClass;
 
-    /**
-     * The index of this class in the ClassIndex. Only non-zero for native JRuby
-     * classes that have a corresponding entry in ClassIndex.
-     *
-     * @see ClassIndex
-     * @deprecated use RubyModule#getClassIndex()
-     */
-    @Deprecated(since = "9.0.0.0")
-    public int index;
-
-    @Deprecated(since = "9.0.0.0")
-    public static final Set<String> SCOPE_CAPTURING_METHODS = new HashSet<String>(Arrays.asList(
-            "eval",
-            "module_eval",
-            "class_eval",
-            "instance_eval",
-            "module_exec",
-            "class_exec",
-            "instance_exec",
-            "binding",
-            "local_variables"
-    ));
-
-    @Deprecated(since = "9.3.0.0")
-    public boolean fastIsConstantDefined(String internedName){
-        return isConstantDefined(getCurrentContext(), internedName);
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static class ModuleKernelMethods {
-        @Deprecated(since = "9.3.0.0")
-        public static IRubyObject autoload(ThreadContext context, IRubyObject self, IRubyObject symbol, IRubyObject file) {
-            return ((RubyModule) self).autoload(context, symbol, file);
-        }
-
-        @Deprecated(since = "9.3.0.0")
-        public static IRubyObject autoload_p(ThreadContext context, IRubyObject self, IRubyObject symbol) {
-            return ((RubyModule) self).autoload_p(context, symbol);
-        }
-    }
-
-    @Deprecated(since = "9.3.1.0")
-    public synchronized void defineAliases(List<String> aliases, String oldId) {
-        var context = getCurrentContext();
-        testFrozen("module");
-
-        CacheEntry entry = deepMethodSearch(context, oldId);
-        DynamicMethod method = entry.method;
-
-        for (String name: aliases) {
-            checkAliasFrameAccesses(context, oldId, name, method);
-            putAlias(context, name, entry, oldId);
-        }
-
-        RubyModule methodLocation = getMethodLocation();
-        methodLocation.invalidateCacheDescendants(context);
-    }
-
     protected ClassIndex classIndex = ClassIndex.NO_INDEX;
 
     private volatile Map<String, IRubyObject> classVariables;
diff --git a/core/src/main/java/org/jruby/RubyNameError.java b/core/src/main/java/org/jruby/RubyNameError.java
index 558ee7f5e96..ea9f313ed46 100644
--- a/core/src/main/java/org/jruby/RubyNameError.java
+++ b/core/src/main/java/org/jruby/RubyNameError.java
@@ -186,7 +186,7 @@ public IRubyObject to_str(ThreadContext context) {
         // MRI: coercion dance for name error object inspection in name_err_mesg_to_str
         private static RubyString getNameOrInspect(ThreadContext context, IRubyObject object) {
             IRubyObject tmp = tryModuleName(context, object);
-            if (tmp == UNDEF || tmp.isNil()) tmp = tryInspect(context, object);
+            if (tmp == null || tmp.isNil()) tmp = tryInspect(context, object);
             if (tmp == UNDEF) context.clearErrorInfo();
             tmp = TypeConverter.checkStringType(context.runtime, tmp);
             if (tmp.isNil()) tmp = Convert.anyToString(context, object);
@@ -212,7 +212,7 @@ private static IRubyObject tryModuleName(ThreadContext context, IRubyObject obj)
                     // ignore
                 }
             }
-            return UNDEF;
+            return null;
         }
     }
 
diff --git a/core/src/main/java/org/jruby/RubyNil.java b/core/src/main/java/org/jruby/RubyNil.java
index d849ea58b51..b8fe9ecc5fd 100644
--- a/core/src/main/java/org/jruby/RubyNil.java
+++ b/core/src/main/java/org/jruby/RubyNil.java
@@ -199,11 +199,6 @@ public RubyBoolean nil_p(ThreadContext context) {
         return context.tru;
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public IRubyObject nil_p() {
-        return nil_p(getCurrentContext());
-    }
-
     @JRubyMethod
     public RubyFixnum hash(ThreadContext context) {
         return context.runtime.getNilHash();
@@ -277,7 +272,4 @@ public <T> T toJava(Class<T> target) {
     public IRubyObject taint(ThreadContext context) {
         return this;
     }
-
-    @Deprecated(since = "9.3.0.0")
-    public static final ObjectAllocator NIL_ALLOCATOR = NOT_ALLOCATABLE_ALLOCATOR;
 }
diff --git a/core/src/main/java/org/jruby/RubyNoMatchingPatternKeyError.java b/core/src/main/java/org/jruby/RubyNoMatchingPatternKeyError.java
index 5b92dfc5477..fa6035300f2 100644
--- a/core/src/main/java/org/jruby/RubyNoMatchingPatternKeyError.java
+++ b/core/src/main/java/org/jruby/RubyNoMatchingPatternKeyError.java
@@ -39,7 +39,6 @@
 
 import static org.jruby.api.Define.defineClass;
 import static org.jruby.api.Error.argumentError;
-import static org.jruby.runtime.ThreadContext.resetCallInfo;
 import static org.jruby.runtime.Visibility.PRIVATE;
 
 /**
@@ -80,7 +79,7 @@ private void setValues(ThreadContext context, IRubyObject message, IRubyObject k
 
     @JRubyMethod(visibility = PRIVATE, optional = 2, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
-        int callInfo = resetCallInfo(context);
+        int callInfo = ThreadContext.resetCallInfo(context);
 
         switch (args.length) {
             case 0:
diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
index e91ff80be0c..263f88e7430 100644
--- a/core/src/main/java/org/jruby/RubyNumeric.java
+++ b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -56,6 +56,7 @@
 import org.jruby.util.ByteList;
 import org.jruby.util.ConvertBytes;
 import org.jruby.util.ConvertDouble;
+import org.jruby.util.StringSupport;
 import org.jruby.util.TypeConverter;
 
 import java.math.BigDecimal;
@@ -118,11 +119,6 @@ public RubyNumeric(Ruby runtime, RubyClass metaClass, boolean useObjectSpace) {
         super(runtime, metaClass, useObjectSpace);
     }
 
-    @Deprecated(since = "1.7.0")
-    public RubyNumeric(Ruby runtime, RubyClass metaClass, boolean useObjectSpace, boolean canBeTainted) {
-        super(runtime, metaClass, useObjectSpace, canBeTainted);
-    }
-
     public static RoundingMode getRoundingMode(ThreadContext context, IRubyObject opts) {
         IRubyObject halfArg = ArgsUtil.extractKeywordArg(context, "half", opts);
 
@@ -299,7 +295,7 @@ private static long other2long(IRubyObject arg) throws RaiseException {
     @Deprecated(since = "10.0.0.0")
     public static long float2long(RubyFloat flt) {
         final double aFloat = flt.value;
-        if (aFloat <= (double) Long.MAX_VALUE && aFloat >= (double) Long.MIN_VALUE) {
+        if (aFloat < (double) Long.MAX_VALUE && aFloat >= (double) Long.MIN_VALUE) {
             return (long) aFloat;
         }
         // TODO: number formatting here, MRI uses "%-.10g", 1.4 API is a must?
@@ -526,8 +522,7 @@ public static IRubyObject str2fnum(Ruby runtime, RubyString arg, boolean strict,
         var context = runtime.getCurrentContext();
         try {
             ByteList bytes = arg.getByteList();
-            double value = ConvertDouble.byteListToDouble(bytes, strict);
-            return asFloat(context, value);
+            return asFloat(context, ConvertDouble.byteListToDouble(bytes, strict));
         } catch (NumberFormatException e) {
             if (strict) {
                 if (!exception) return context.nil;
@@ -627,15 +622,6 @@ protected final void coerceFailed(ThreadContext context, IRubyObject arg) {
         throw typeError(context, str(context.runtime, other, " can't be coerced into ", getMetaClass()));
     }
 
-    /** rb_num_coerce_bin
-     *  coercion taking two arguments
-     */
-    @Deprecated(since = "9.2.0.0")
-    protected final IRubyObject coerceBin(ThreadContext context, String method, IRubyObject other) {
-        RubyArray ary = doCoerce(context, other, true);
-        return (ary.eltInternal(0)).callMethod(context, method, ary.eltInternal(1));
-    }
-
     protected final IRubyObject coerceBin(ThreadContext context, CallSite site, IRubyObject other) {
         RubyArray ary = doCoerce(context, other, true);
         IRubyObject car = ary.eltInternal(0);
@@ -681,19 +667,6 @@ private static IRubyObject coerceBitRecursive(ThreadContext context, JavaSites.C
         return getMetaClass(x).finvokeChecked(context, x, site, y);
     }
 
-    /** rb_num_coerce_cmp
-     *  coercion used for comparisons
-     */
-
-    @Deprecated(since = "9.2.0.0") // no longer used
-    protected final IRubyObject coerceCmp(ThreadContext context, String method, IRubyObject other) {
-        RubyArray ary = doCoerce(context, other, false);
-        if (ary == null) {
-            return context.nil; // MRI does it!
-        }
-        return (ary.eltInternal(0)).callMethod(context, method, ary.eltInternal(1));
-    }
-
     protected final IRubyObject coerceCmp(ThreadContext context, CallSite site, IRubyObject other) {
         RubyArray ary = doCoerce(context, other, false);
         if (ary == null) {
@@ -703,17 +676,6 @@ protected final IRubyObject coerceCmp(ThreadContext context, CallSite site, IRub
         return site.call(context, car, car, ary.eltInternal(1));
     }
 
-    /** rb_num_coerce_relop
-     *  coercion used for relative operators
-     */
-
-    @Deprecated(since = "9.2.0.0") // no longer used
-    protected final IRubyObject coerceRelOp(ThreadContext context, String method, IRubyObject other) {
-        RubyArray ary = doCoerce(context, other, false);
-
-        return ary == null ? RubyComparable.cmperr(context, this, other) : unwrapCoerced(context, method, other, ary);
-    }
-
     protected final IRubyObject coerceRelOp(ThreadContext context, CallSite site, IRubyObject other) {
         RubyArray ary = doCoerce(context, other, false);
 
@@ -998,11 +960,6 @@ public IRubyObject real_p(ThreadContext context) {
 
     public boolean isReal() { return true; } // only RubyComplex isn't real
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject scalar_p() {
-        return asBoolean(getCurrentContext(), isReal());
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject integer_p() {
         return integer_p(getCurrentContext());
@@ -1535,37 +1492,6 @@ public <T> T toJava(Class<T> target) {
         return JavaUtil.getNumericConverter(target).coerce(getRuntime().getCurrentContext(), this, target);
     }
 
-    @Deprecated(since = "9.2.0.0") // not-used
-    public static class InvalidIntegerException extends NumberFormatException {
-        private static final long serialVersionUID = 55019452543252148L;
-
-        public InvalidIntegerException() {
-            super();
-        }
-        public InvalidIntegerException(String message) {
-            super(message);
-        }
-        @Override
-        public Throwable fillInStackTrace() {
-            return this;
-        }
-    }
-
-    @Deprecated(since = "9.2.0.0") // not-used
-    public static class NumberTooLargeException extends NumberFormatException {
-        private static final long serialVersionUID = -1835120694982699449L;
-        public NumberTooLargeException() {
-            super();
-        }
-        public NumberTooLargeException(String message) {
-            super(message);
-        }
-        @Override
-        public Throwable fillInStackTrace() {
-            return this;
-        }
-    }
-
     /** num_negative_p
      *
      */
@@ -1625,16 +1551,6 @@ public IRubyObject infinite_p(ThreadContext context) {
         return context.nil;
     }
 
-    @Deprecated(since = "9.2.5.0")
-    public final IRubyObject rbClone(IRubyObject[] args) {
-        ThreadContext context = metaClass.runtime.getCurrentContext();
-        switch (args.length) {
-            case 0: return rbClone(context);
-            case 1: return rbClone(context, args[0]);
-        }
-        throw argumentError(context, "wrong number of arguments (given " + args.length + ", expected 0)");
-    }
-
     @JRubyMethod(name = "clone")
     public final IRubyObject rbClone(ThreadContext context) {
         return this;
@@ -1728,29 +1644,6 @@ public static boolean negFixable(double l) {
         return l >= RubyFixnum.MIN;
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject floor() {
-        return floor(getCurrentContext());
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject ceil() {
-        return ceil(getCurrentContext());
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject round() {
-        return round(getCurrentContext());
-    }
-
-    /** num_truncate
-     *
-     */
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject truncate() {
-        return truncate(getCurrentContext());
-    }
-
     private static JavaSites.NumericSites sites(ThreadContext context) {
         return context.sites.Numeric;
     }
diff --git a/core/src/main/java/org/jruby/RubyObject.java b/core/src/main/java/org/jruby/RubyObject.java
index b16ff3da53a..b8641f26b23 100644
--- a/core/src/main/java/org/jruby/RubyObject.java
+++ b/core/src/main/java/org/jruby/RubyObject.java
@@ -110,11 +110,6 @@ public RubyObject(RubyClass metaClass) {
         super(metaClass);
     }
 
-    @Deprecated(since = "1.7.0")
-    protected RubyObject(Ruby runtime, RubyClass metaClass, boolean useObjectSpace, boolean canBeTainted) {
-        super(runtime, metaClass, useObjectSpace, canBeTainted);
-    }
-
     /**
      * Path for objects who want to decide whether they don't want to be in
      * ObjectSpace even when it is on. (notably used by objects being
@@ -333,55 +328,6 @@ public final void callInit(ThreadContext context, IRubyObject arg0, IRubyObject
         metaClass.getBaseCallSite(RubyClass.CS_IDX_INITIALIZE).call(context, this, this, arg0, arg1, arg2, block);
     }
 
-    /*
-     * Tries to convert this object to the specified Ruby type, using
-     * a specific conversion method.
-     */
-    @Deprecated(since = "1.1.6")
-    public final IRubyObject convertToType(RubyClass target, int convertMethodIndex) {
-        throw new RuntimeException("Not supported; use the String versions");
-    }
-
-    /* specific_eval
-     *
-     * Evaluates the block or string inside of the context of this
-     * object, using the supplied arguments. If a block is given, this
-     * will be yielded in the specific context of this object. If no
-     * block is given then a String-like object needs to be the first
-     * argument, and this string will be evaluated. Second and third
-     * arguments in the args-array is optional, but can contain the
-     * filename and line of the string under evaluation.
-     */
-    @Deprecated(since = "1.1.2")
-    public IRubyObject specificEval(ThreadContext context, RubyModule mod, IRubyObject[] args, Block block, EvalType evalType) {
-        if (block.isGiven()) {
-            if (args.length > 0) throw argumentError(context, args.length, 0);
-
-            return yieldUnder(context, mod, block, evalType);
-        }
-
-        if (args.length == 0) throw argumentError(context, "block not supplied");
-        if (args.length > 3) {
-            String lastFuncName = context.getFrameName();
-            throw argumentError(context, "wrong number of arguments: " + lastFuncName + "(src) or " + lastFuncName + "{..}");
-        }
-
-        // We just want the TypeError if the argument doesn't convert to a String (JRUBY-386)
-        RubyString evalStr = args[0] instanceof RubyString str ? str : args[0].convertToString();
-
-        String file;
-        int line;
-        if (args.length > 1) {
-            file = args[1].convertToString().asJavaString();
-            line = args.length > 2 ? toInt(context, args[2]) - 1 : 0;
-        } else {
-            file = "(eval at " + context.getSingleBacktrace().getFileAndLine() + ")";
-            line = 0;
-        }
-
-        return evalUnder(context, mod, evalStr, file, line, evalType);
-    }
-
     // Methods of the Object class (rb_obj_*):
 
     /** rb_equal
diff --git a/core/src/main/java/org/jruby/RubyObjectSpace.java b/core/src/main/java/org/jruby/RubyObjectSpace.java
index cc971071745..bb258bde528 100644
--- a/core/src/main/java/org/jruby/RubyObjectSpace.java
+++ b/core/src/main/java/org/jruby/RubyObjectSpace.java
@@ -42,6 +42,7 @@
 
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
+import org.jruby.api.Warn;
 import org.jruby.exceptions.StopIteration;
 import org.jruby.javasupport.JavaPackage;
 import org.jruby.runtime.Arity;
@@ -137,8 +138,11 @@ public static IRubyObject id2ref(IRubyObject recv, IRubyObject id) {
         return id2ref(((RubyBasicObject) recv).getCurrentContext(), recv, id);
     }
 
+    @Deprecated(since = "10.1.0.0")
     @JRubyMethod(name = "_id2ref", module = true, visibility = PRIVATE)
     public static IRubyObject id2ref(ThreadContext context, IRubyObject recv, IRubyObject id) {
+        Warn.warnDeprecated(context, "ObjectSpace._id2ref is deprecated");
+
         long longId = castAsFixnum(context, id).getValue();
         if (longId == 0) return context.fals;
         if (longId == 20) return context.tru;
diff --git a/core/src/main/java/org/jruby/RubyProc.java b/core/src/main/java/org/jruby/RubyProc.java
index ef7fdbb777f..ef4973a74cc 100644
--- a/core/src/main/java/org/jruby/RubyProc.java
+++ b/core/src/main/java/org/jruby/RubyProc.java
@@ -63,7 +63,7 @@
 import static org.jruby.runtime.Block.Type.LAMBDA;
 import static org.jruby.runtime.Block.Type.PROC;
 import static org.jruby.runtime.ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR;
-import static org.jruby.runtime.ThreadContext.resetCallInfo;
+import static org.jruby.runtime.ThreadContext.hasKeywords;
 import static org.jruby.util.RubyStringBuilder.types;
 
 @JRubyClass(name="Proc")
@@ -159,11 +159,6 @@ public Block getBlock() {
 
     // Proc class
 
-    @Deprecated(since = "1.6.0")
-    public static RubyProc newProc(Ruby runtime, Block.Type type) {
-        throw runtime.newRuntimeError("deprecated RubyProc.newProc with no block; do not use");
-    }
-
     public static RubyProc newProc(Ruby runtime, Block block, Block.Type type) {
         // The three valid types of execution here are PROC/LAMBDA/THREAD.  NORMAL should not normally
         // be passed but when it is we just assume it will be a PROC.
@@ -299,10 +294,10 @@ public IRubyObject ruby2_keywords(ThreadContext context) {
         BlockBody body = block.getBody();
         if (body.isRubyBlock()) {
             Signature signature = body.getSignature();
-            if (signature.hasRest() && !signature.hasKwargs()) {
+            if (signature.hasRest() && !signature.hasKwargs() && signature.post() == 0) {
                 ((IRBlockBody) body).getScope().setRuby2Keywords();
             } else {
-                warn(context, "Skipping set of ruby2_keywords flag for proc (proc accepts keywords or proc does not accept argument splat)");
+                warn(context, "Skipping set of ruby2_keywords flag for proc (proc accepts keywords or post arguments or proc does not accept argument splat)");
             }
 
         } else {
@@ -329,21 +324,6 @@ public IRubyObject op_equal(ThreadContext context, IRubyObject obj) {
         return asBoolean(context, getBlock().equals(other.block));
     }
 
-    /**
-     * For non-lambdas transforms the given arguments appropriately for the given arity (i.e. trimming to one arg for fixed
-     * arity of one, etc.)
-     *
-     * Note: nothing should be calling this any more.
-     */
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject[] prepareArgs(ThreadContext context, Block.Type type, BlockBody blockBody, IRubyObject[] args) {
-        if (type == Block.Type.LAMBDA) return args;
-
-        int arityValue = blockBody.getSignature().arityValue();
-        if (args.length == 1 && (arityValue < -1 || arityValue > 1)) args = IRRuntimeHelpers.toAry(context, args);
-        return args;
-    }
-
     private static IRubyObject[] checkArityForLambda(ThreadContext context, Block.Type type, BlockBody blockBody, IRubyObject... args) {
         if (type == Block.Type.LAMBDA) {
             blockBody.getSignature().checkArity(context, args);
@@ -461,16 +441,15 @@ public IRubyObject parameters(ThreadContext context) {
 
     @JRubyMethod(keywords = true)
     public IRubyObject parameters(ThreadContext context, IRubyObject opts) {
-        int callInfo = resetCallInfo(context);
-        boolean isLambda = isLambda();
+        final int callInfo = ThreadContext.resetCallInfo(context);
 
         IRubyObject lambdaOpt = ArgsUtil.extractKeywordArg(context, (RubyHash) opts, "lambda");
-
+        boolean isLambda;
         // ignore option if nil
         if (!lambdaOpt.isNil()) {
-            isLambda = (callInfo & ThreadContext.CALL_KEYWORD) != 0 ?
-                    lambdaOpt.isTrue() :
-                    isLambda();
+            isLambda = hasKeywords(callInfo) ? lambdaOpt.isTrue() : isLambda();
+        } else {
+            isLambda = isLambda();
         }
 
         return parametersCommon(context, isLambda);
@@ -507,11 +486,6 @@ private static JavaSites.ProcSites sites(ThreadContext context) {
         return context.sites.Proc;
     }
 
-    @Deprecated(since = "9.2.10.0")
-    public final IRubyObject call(ThreadContext context, IRubyObject[] args, IRubyObject self, Block passedBlock) {
-        return block.call(context, args, passedBlock);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject rbClone() {
         return rbClone(getRuntime().getCurrentContext());
diff --git a/core/src/main/java/org/jruby/RubyProcess.java b/core/src/main/java/org/jruby/RubyProcess.java
index c7bd163f798..8e3457445d2 100644
--- a/core/src/main/java/org/jruby/RubyProcess.java
+++ b/core/src/main/java/org/jruby/RubyProcess.java
@@ -260,31 +260,6 @@ public static IRubyObject wait(ThreadContext context, IRubyObject self, IRubyObj
             //checkErrno(runtime, pid, ECHILD);
         }
 
-        @JRubyMethod(name = "&")
-        public IRubyObject op_and(ThreadContext context, IRubyObject arg) {
-            long mask = toInt(context, arg);
-
-            if (mask < 0) throw argumentError(context, "negative mask value: " + mask);
-            if (mask > Integer.MAX_VALUE || mask < Integer.MIN_VALUE) {
-                throw rangeError(context, "mask value out of range: " + mask);
-            }
-
-            String message = switch ((int) mask) {
-                case 0x80 -> "Process::Status#coredump?";
-                case 0x7f -> "Process::Status#signaled? or Process::Status#termsig";
-                case 0xff -> "Process::Status#exited?, Process::Status#stopped? or Process::Status#coredump?";
-                case 0xff00 -> "Process::Status#exitstatus or Process::Status#stopsig";
-                default -> "other Process::Status predicates";
-            };
-            deprecateAndSuggest(context, "Process::Status#&", "3.5", message);
-
-            return asFixnum(context, status & mask);
-        }
-
-        private static void deprecateAndSuggest(ThreadContext context, String method, String version, String suggest) {
-            context.runtime.getWarnings().warnDeprecatedForRemovalAlternate(method, version, suggest);
-        }
-
         @JRubyMethod(name = "stopped?")
         public IRubyObject stopped_p(ThreadContext context) {
             return asBoolean(context, PosixShim.WAIT_MACROS.WIFSTOPPED(status));
@@ -347,23 +322,6 @@ public IRubyObject exitstatus(ThreadContext context) {
                 asFixnum(context, PosixShim.WAIT_MACROS.WEXITSTATUS(status)) : context.nil;
         }
 
-        @JRubyMethod(name = ">>")
-        public IRubyObject op_rshift(ThreadContext context, IRubyObject other) {
-            long places = toInt(context, other);
-
-            if (places < 0) throw argumentError(context, "negative shift value: " + places);
-            if (places > Integer.MAX_VALUE) throw rangeError(context, "shift value out of range: " + places);
-
-            String message = switch ((int) places) {
-                case 7 -> "Process::Status#coredump?";
-                case 8 -> "Process::Status#exitstatus or Process::Status#stopsig";
-                default -> "other Process::Status attributes";
-            };
-            deprecateAndSuggest(context, "Process::Status#>>", "3.5", message);
-
-            return asFixnum(context, status >> places);
-        }
-
         @Override
         @JRubyMethod(name = "==")
         public IRubyObject op_equal(ThreadContext context, IRubyObject other) {
@@ -462,23 +420,6 @@ public static String pst_message(String prefix, long pid, long status) {
             }
             return sb.toString();
         }
-
-        @Deprecated(since = "9.0.0.0")
-        public IRubyObject to_i() {
-            return to_i(getCurrentContext().runtime);
-        }
-
-        @Deprecated(since = "9.0.0.0")
-        public IRubyObject op_rshift(Ruby runtime, IRubyObject other) {
-            var context = getCurrentContext();
-            long shiftValue = toLong(context, other);
-            return asFixnum(context, status >> shiftValue);
-        }
-
-        @Deprecated(since = "10.0.0.0")
-        public IRubyObject op_and(IRubyObject arg) {
-            return op_and(getCurrentContext(), arg);
-        }
     }
 
     @JRubyModule(name="Process::UID")
@@ -493,19 +434,11 @@ public static IRubyObject change_privilege(ThreadContext context, IRubyObject se
             throw notImplementedError(context, "Process::UID::change_privilege not implemented yet");
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject eid(IRubyObject self) {
-            return euid(((RubyBasicObject) self).getCurrentContext(), null);
-        }
         @JRubyMethod(name = "eid", module = true, visibility = PRIVATE)
         public static IRubyObject eid(ThreadContext context, IRubyObject self) {
             return euid(context, self);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject eid(IRubyObject self, IRubyObject arg) {
-            return eid(((RubyBasicObject) self).getCurrentContext(), arg);
-        }
         @JRubyMethod(name = "eid=", module = true, visibility = PRIVATE)
         public static IRubyObject eid(ThreadContext context, IRubyObject self, IRubyObject arg) {
             return euid_set(context, self, arg);
@@ -539,10 +472,6 @@ public static IRubyObject re_exchangeable_p(ThreadContext context, IRubyObject s
             throw notImplementedError(context, "Process::UID::re_exchangeable? not implemented yet");
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject rid(IRubyObject self) {
-            return rid(((RubyBasicObject) self).getCurrentContext(), self);
-        }
         @JRubyMethod(name = "rid", module = true, visibility = PRIVATE)
         public static IRubyObject rid(ThreadContext context, IRubyObject self) {
             return rid(context.runtime);
@@ -598,10 +527,6 @@ public static IRubyObject change_privilege(ThreadContext context, IRubyObject se
             throw notImplementedError(context, "Process::GID::change_privilege not implemented yet");
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject eid(IRubyObject self) {
-            return eid(((RubyBasicObject) self).getCurrentContext(), self);
-        }
         @JRubyMethod(name = "eid", module = true, visibility = PRIVATE)
         public static IRubyObject eid(ThreadContext context, IRubyObject self) {
             return eid(context.runtime);
@@ -610,10 +535,6 @@ public static IRubyObject eid(Ruby runtime) {
             return egid(runtime.getCurrentContext(), null);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject eid(IRubyObject self, IRubyObject arg) {
-            return eid(((RubyBasicObject) self).getCurrentContext(), arg);
-        }
         @JRubyMethod(name = "eid=", module = true, visibility = PRIVATE)
         public static IRubyObject eid(ThreadContext context, IRubyObject self, IRubyObject arg) {
             return eid(context.runtime, arg);
@@ -647,10 +568,6 @@ public static IRubyObject re_exchangeable_p(ThreadContext context, IRubyObject s
             throw notImplementedError(context, "Process::GID::re_exchangeable? not implemented yet");
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject rid(IRubyObject self) {
-            return rid(((RubyBasicObject) self).getCurrentContext(), self);
-        }
         @JRubyMethod(name = "rid", module = true, visibility = PRIVATE)
         public static IRubyObject rid(ThreadContext context, IRubyObject self) {
             return rid(context.runtime);
@@ -696,73 +613,41 @@ public static IRubyObject switch_rb(ThreadContext context, IRubyObject self, Blo
 
     @JRubyModule(name="Process::Sys")
     public static class Sys {
-        @Deprecated(since = "1.2")
-        public static IRubyObject getegid(IRubyObject self) {
-            return egid(((RubyBasicObject) self).getCurrentContext(), null);
-        }
         @JRubyMethod(name = "getegid", module = true, visibility = PRIVATE)
         public static IRubyObject getegid(ThreadContext context, IRubyObject self) {
             return egid(context, self);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject geteuid(IRubyObject self) {
-            return euid(((RubyBasicObject) self).getCurrentContext(), self);
-        }
         @JRubyMethod(name = "geteuid", module = true, visibility = PRIVATE)
         public static IRubyObject geteuid(ThreadContext context, IRubyObject self) {
             return euid(context, self);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject getgid(IRubyObject self) {
-            return gid(((RubyBasicObject) self).getCurrentContext());
-        }
         @JRubyMethod(name = "getgid", module = true, visibility = PRIVATE)
         public static IRubyObject getgid(ThreadContext context, IRubyObject self) {
             return gid(context, self);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject getuid(IRubyObject self) {
-            return uid(((RubyBasicObject) self).getCurrentContext(), self);
-        }
         @JRubyMethod(name = "getuid", module = true, visibility = PRIVATE)
         public static IRubyObject getuid(ThreadContext context, IRubyObject self) {
             return uid(context, self);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject setegid(IRubyObject recv, IRubyObject arg) {
-            return egid_set(((RubyBasicObject) recv).getCurrentContext(), arg);
-        }
         @JRubyMethod(name = "setegid", module = true, visibility = PRIVATE)
         public static IRubyObject setegid(ThreadContext context, IRubyObject recv, IRubyObject arg) {
             return egid_set(context, recv, arg);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject seteuid(IRubyObject recv, IRubyObject arg) {
-            return euid_set(((RubyBasicObject) recv).getCurrentContext(), arg);
-        }
         @JRubyMethod(name = "seteuid", module = true, visibility = PRIVATE)
         public static IRubyObject seteuid(ThreadContext context, IRubyObject recv, IRubyObject arg) {
             return euid_set(context, arg);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject setgid(IRubyObject recv, IRubyObject arg) {
-            return gid_set(((RubyBasicObject) recv).getCurrentContext().runtime, arg);
-        }
         @JRubyMethod(name = "setgid", module = true, visibility = PRIVATE)
         public static IRubyObject setgid(ThreadContext context, IRubyObject recv, IRubyObject arg) {
             return gid_set(context.runtime, arg);
         }
 
-        @Deprecated(since = "1.2")
-        public static IRubyObject setuid(IRubyObject recv, IRubyObject arg) {
-            return uid_set(((RubyBasicObject) recv).getCurrentContext(), null, arg);
-        }
         @JRubyMethod(name = "setuid", module = true, visibility = PRIVATE)
         public static IRubyObject setuid(ThreadContext context, IRubyObject recv, IRubyObject arg) {
             return uid_set(context, null, arg);
@@ -1057,11 +942,6 @@ private static int rlimitTypeByHname(String name) {
         return rlimitResourceName2int(name, 0);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject getpgrp(IRubyObject recv) {
-        return getpgrp(((RubyBasicObject) recv).getCurrentContext(), recv);
-    }
-
     @JRubyMethod(name = "getpgrp", module = true, visibility = PRIVATE)
     public static IRubyObject getpgrp(ThreadContext context, IRubyObject recv) {
         return asFixnum(context, context.runtime.getPosix().getpgrp());
@@ -1082,10 +962,6 @@ public static IRubyObject groups_set(ThreadContext context, IRubyObject recv, IR
         throw notImplementedError(context, "Process#groups not yet implemented");
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject waitpid(IRubyObject recv, IRubyObject[] args) {
-        return waitpid(((RubyBasicObject) recv).getCurrentContext(), args);
-    }
     @JRubyMethod(name = "waitpid", rest = true, module = true, visibility = PRIVATE)
     public static IRubyObject waitpid(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         return waitpid(context, args);
@@ -1218,10 +1094,6 @@ public int handle(Ruby runtime, int result) {
         }
     };
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject wait(IRubyObject recv, IRubyObject[] args) {
-        return wait(((RubyBasicObject) recv).getCurrentContext(), args);
-    }
     @JRubyMethod(name = "wait", rest = true, module = true, visibility = PRIVATE)
     public static IRubyObject wait(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         return wait(context, args);
@@ -1249,10 +1121,6 @@ public static IRubyObject wait(ThreadContext context, IRubyObject[] args) {
     }
 
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject waitall(IRubyObject recv) {
-        return waitall(((RubyBasicObject) recv).getCurrentContext());
-    }
     @JRubyMethod(name = "waitall", module = true, visibility = PRIVATE)
     public static IRubyObject waitall(ThreadContext context, IRubyObject recv) {
         return waitall(context);
@@ -1279,10 +1147,6 @@ public static IRubyObject waitall(ThreadContext context) {
         return results;
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject setsid(IRubyObject recv) {
-        return setsid(((RubyBasicObject) recv).getCurrentContext().runtime);
-    }
     @JRubyMethod(name = "setsid", module = true, visibility = PRIVATE)
     public static IRubyObject setsid(ThreadContext context, IRubyObject recv) {
         return asFixnum(context, checkErrno(context, context.runtime.getPosix().setsid()));
@@ -1293,10 +1157,6 @@ public static IRubyObject setsid(Ruby runtime) {
         return setsid(runtime.getCurrentContext(), null);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject setpgrp(IRubyObject recv) {
-        return setpgrp(((RubyBasicObject) recv).getCurrentContext().runtime);
-    }
     @JRubyMethod(name = "setpgrp", module = true, visibility = PRIVATE)
     public static IRubyObject setpgrp(ThreadContext context, IRubyObject recv) {
         return asFixnum(context, checkErrno(context, context.runtime.getPosix().setpgid(0, 0)));
@@ -1307,10 +1167,6 @@ public static IRubyObject setpgrp(Ruby runtime) {
         return setpgrp(runtime.getCurrentContext(), null);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject egid_set(IRubyObject recv, IRubyObject arg) {
-        return egid_set(((RubyBasicObject) recv).getCurrentContext(), arg);
-    }
     @JRubyMethod(name = "egid=", module = true, visibility = PRIVATE)
     public static IRubyObject egid_set(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         return egid_set(context, arg);
@@ -1334,10 +1190,6 @@ public static IRubyObject egid_set(ThreadContext context, IRubyObject arg) {
         return asFixnum(context, 0);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject euid(IRubyObject recv) {
-        return euid(((RubyBasicObject) recv).getCurrentContext(), recv);
-    }
     @JRubyMethod(name = "euid", module = true, visibility = PRIVATE)
     public static IRubyObject euid(ThreadContext context, IRubyObject recv) {
         return asFixnum(context, checkErrno(context, context.runtime.getPosix().geteuid()));
@@ -1348,10 +1200,6 @@ public static IRubyObject euid(Ruby runtime) {
         return euid(runtime.getCurrentContext(), null);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject uid_set(IRubyObject recv, IRubyObject arg) {
-        return uid_set(((RubyBasicObject) recv).getCurrentContext(), null, arg);
-    }
     @JRubyMethod(name = "uid=", module = true, visibility = PRIVATE)
     public static IRubyObject uid_set(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         checkErrno(context, context.runtime.getPosix().setuid(toInt(context, arg)));
@@ -1362,10 +1210,6 @@ public static IRubyObject uid_set(Ruby runtime, IRubyObject arg) {
         return uid_set(runtime.getCurrentContext(), null, arg);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject gid(IRubyObject recv) {
-        return gid(((RubyBasicObject) recv).getCurrentContext());
-    }
     @JRubyMethod(name = "gid", module = true, visibility = PRIVATE)
     public static IRubyObject gid(ThreadContext context, IRubyObject recv) {
         return gid(context);
@@ -1391,10 +1235,6 @@ public static IRubyObject maxgroups(ThreadContext context, IRubyObject recv) {
         throw notImplementedError(context, "Process#maxgroups not yet implemented");
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject getpriority(IRubyObject recv, IRubyObject arg1, IRubyObject arg2) {
-        return getpriority(((RubyBasicObject) recv).getCurrentContext(), recv, arg1, arg2);
-    }
     @JRubyMethod(name = "getpriority", module = true, visibility = PRIVATE)
     public static IRubyObject getpriority(ThreadContext context, IRubyObject recv, IRubyObject arg1, IRubyObject arg2) {
         int which = toInt(context, arg1);
@@ -1409,10 +1249,6 @@ public static IRubyObject getpriority(Ruby runtime, IRubyObject arg1, IRubyObjec
         return getpriority(runtime.getCurrentContext(), null, arg1, arg2);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject uid(IRubyObject recv) {
-        return uid(((RubyBasicObject) recv).getCurrentContext(), recv);
-    }
     @JRubyMethod(name = "uid", module = true, visibility = PRIVATE)
     public static IRubyObject uid(ThreadContext context, IRubyObject recv) {
         return asFixnum(context, checkErrno(context, context.runtime.getPosix().getuid()));
@@ -1453,10 +1289,6 @@ public static IRubyObject maxgroups_set(ThreadContext context, IRubyObject recv,
         throw notImplementedError(context, "Process#maxgroups_set not yet implemented");
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject ppid(IRubyObject recv) {
-        return ppid(((RubyBasicObject) recv).getCurrentContext(), recv);
-    }
     @JRubyMethod(name = "ppid", module = true, visibility = PRIVATE)
     public static IRubyObject ppid(ThreadContext context, IRubyObject recv) {
         int result = checkErrno(context, context.runtime.getPosix().getppid());
@@ -1467,10 +1299,6 @@ public static IRubyObject ppid(Ruby runtime) {
         return ppid(runtime.getCurrentContext(), null);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject gid_set(IRubyObject recv, IRubyObject arg) {
-        return gid_set(((RubyBasicObject) recv).getCurrentContext(), recv, arg);
-    }
     @JRubyMethod(name = "gid=", module = true, visibility = PRIVATE)
     public static IRubyObject gid_set(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         int result = checkErrno(context, context.runtime.getPosix().setgid(toInt(context, arg)));
@@ -1483,19 +1311,11 @@ public static IRubyObject gid_set(Ruby runtime, IRubyObject arg) {
         return gid_set(runtime.getCurrentContext(), null, arg);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject wait2(IRubyObject recv, IRubyObject[] args) {
-        return waitpid2(((RubyBasicObject) recv).getCurrentContext(), recv, args);
-    }
     @JRubyMethod(name = "wait2", rest = true, module = true, visibility = PRIVATE)
     public static IRubyObject wait2(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         return waitpid2(context.runtime, args);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject euid_set(IRubyObject recv, IRubyObject arg) {
-        return euid_set(((RubyBasicObject) recv).getCurrentContext(), arg);
-    }
     @JRubyMethod(name = "euid=", module = true, visibility = PRIVATE)
     public static IRubyObject euid_set(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         return euid_set(context, arg);
@@ -1522,10 +1342,6 @@ public static IRubyObject euid_set(ThreadContext context, IRubyObject arg) {
         return asFixnum(context, 0);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject setpriority(IRubyObject recv, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3) {
-        return setpriority(((RubyBasicObject) recv).getCurrentContext(), recv, arg1, arg2, arg3);
-    }
     @JRubyMethod(name = "setpriority", module = true, visibility = PRIVATE)
     public static IRubyObject setpriority(ThreadContext context, IRubyObject recv, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3) {
         int which = toInt(context, arg1);
@@ -1541,10 +1357,6 @@ public static IRubyObject setpriority(Ruby runtime, IRubyObject arg1, IRubyObjec
         return setpriority(runtime.getCurrentContext(), null, arg1, arg2, arg3);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject setpgid(IRubyObject recv, IRubyObject arg1, IRubyObject arg2) {
-        return setpgid(((RubyBasicObject) recv).getCurrentContext(), recv, arg1, arg2);
-    }
     @JRubyMethod(name = "setpgid", module = true, visibility = PRIVATE)
     public static IRubyObject setpgid(ThreadContext context, IRubyObject recv, IRubyObject arg1, IRubyObject arg2) {
         int pid = toInt(context, arg1);
@@ -1557,10 +1369,6 @@ public static IRubyObject setpgid(Ruby runtime, IRubyObject arg1, IRubyObject ar
         return setpgid(runtime.getCurrentContext(), null, arg1, arg2);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject getpgid(IRubyObject recv, IRubyObject arg) {
-        return getpgid(((RubyBasicObject) recv).getCurrentContext(), recv, arg);
-    }
     @JRubyMethod(name = "getpgid", module = true, visibility = PRIVATE)
     public static IRubyObject getpgid(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         int pgid = toInt(context, arg);
@@ -1572,10 +1380,6 @@ public static IRubyObject getpgid(Ruby runtime, IRubyObject arg) {
         return getpgid(runtime.getCurrentContext(), null, arg);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject getrlimit(IRubyObject recv, IRubyObject arg) {
-        return getrlimit(((RubyBasicObject) recv).getCurrentContext(), arg);
-    }
     @JRubyMethod(name = "getrlimit", module = true, visibility = PRIVATE)
     public static IRubyObject getrlimit(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         return getrlimit(context, arg);
@@ -1602,10 +1406,6 @@ public static IRubyObject getrlimit(ThreadContext context, IRubyObject arg) {
         return newArray(context, asFixnum(context, rlimit.rlimCur()), asFixnum(context, rlimit.rlimMax()));
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject egid(IRubyObject recv) {
-        return egid(((RubyBasicObject) recv).getCurrentContext(), recv);
-    }
     @JRubyMethod(name = "egid", module = true, visibility = PRIVATE)
     public static IRubyObject egid(ThreadContext context, IRubyObject recv) {
         return Platform.IS_WINDOWS ? RubyFixnum.zero(context.runtime) :
@@ -1632,10 +1432,6 @@ private static int parseSignalString(ThreadContext context, String value) {
         return negative ? -signalValue : signalValue;
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject kill(IRubyObject recv, IRubyObject[] args) {
-        return kill(((RubyBasicObject) recv).getCurrentContext(), recv, args);
-    }
     @JRubyMethod(name = "kill", rest = true, module = true, visibility = PRIVATE)
     public static IRubyObject kill(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         if (args.length < 2) throw argumentError(context, "wrong number of arguments -- kill(sig, pid...)");
@@ -1751,10 +1547,6 @@ public static IRubyObject detach(ThreadContext context, IRubyObject recv, IRubyO
                 CallBlock.newCallClosure(context, recv, Signature.NO_ARGUMENTS, callback));
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject times(IRubyObject recv, Block unusedBlock) {
-        return times(((RubyBasicObject) recv).getCurrentContext(), recv, unusedBlock);
-    }
     @JRubyMethod(module = true, visibility = PRIVATE)
     public static IRubyObject times(ThreadContext context, IRubyObject recv, Block unusedBlock) {
         return times(context);
@@ -1896,10 +1688,6 @@ private static IRubyObject makeClockResolutionResult(ThreadContext context, long
                 asFloat(context, 1000000000.0 / nanos) : makeClockResult(context, nanos, unit);
     }
 
-    @Deprecated(since = "1.2")
-    public static IRubyObject pid(IRubyObject recv) {
-        return pid(((RubyBasicObject) recv).getCurrentContext());
-    }
     @JRubyMethod(name = "pid", module = true, visibility = PRIVATE)
     public static IRubyObject pid(ThreadContext context, IRubyObject recv) {
         return pid(context);
@@ -1988,9 +1776,4 @@ private static void raiseErrnoIfSet(Ruby runtime, NonNativeErrno nonNative) {
             throw runtime.newErrnoFromInt(runtime.getPosix().errno());
         }
     }
-
-    @Deprecated(since = "9.0.1.0")
-    public static IRubyObject waitpid2(IRubyObject recv, IRubyObject[] args) {
-        return waitpid2(((RubyBasicObject) recv).getCurrentContext().runtime, args);
-    }
 }
diff --git a/core/src/main/java/org/jruby/RubyProducer.java b/core/src/main/java/org/jruby/RubyProducer.java
index dac67986b9b..821fbc8c28b 100644
--- a/core/src/main/java/org/jruby/RubyProducer.java
+++ b/core/src/main/java/org/jruby/RubyProducer.java
@@ -31,6 +31,7 @@
 
 import org.jruby.exceptions.StopIteration;
 import org.jruby.runtime.Block;
+import org.jruby.runtime.JavaSites;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
@@ -44,6 +45,7 @@ public class RubyProducer extends RubyObject {
 
     private IRubyObject init;
     private Block producerBlock;
+    private IRubyObject size;
 
     public static RubyClass createProducerClass(ThreadContext context, RubyClass Object, RubyClass Enumerator, RubyModule Enumerable) {
         return Enumerator.defineClassUnder(context, "Producer", Object, RubyProducer::new).
@@ -56,19 +58,33 @@ public RubyProducer(Ruby runtime, RubyClass klass) {
     }
 
     public RubyProducer(Ruby runtime, RubyClass klass, IRubyObject init, final Block block) {
+        this(runtime, klass, init, block, runtime.getNil());
+    }
+
+    public RubyProducer(Ruby runtime, RubyClass klass, IRubyObject init, final Block block, IRubyObject size) {
         super(runtime, klass);
         this.init = init;
         this.producerBlock = block;
+        this.size = size;
     }
 
     public static RubyProducer newProducer(ThreadContext context, IRubyObject init, final Block block) {
-        return new RubyProducer(context.runtime, context.runtime.getProducer(), init, block);
+        return newProducer(context, init, block, context.nil);
+    }
+
+    public static RubyProducer newProducer(ThreadContext context, IRubyObject init, final Block block, IRubyObject size) {
+        return new RubyProducer(context.runtime, context.runtime.getProducer(), init, block, size);
     }
 
     /** MRI: producer_size
      */
     public static IRubyObject size(ThreadContext context, RubyProducer self, IRubyObject[] args) {
-        return asFloat(context, Double.POSITIVE_INFINITY);
+        IRubyObject size = self.size;
+
+        if (size.isNil()) return size;
+        if (size instanceof RubyInteger || size instanceof RubyFloat) return size;
+
+        return sites(context).call.call(context, self, size);
     }
 
     @JRubyMethod(rest = true)
@@ -93,4 +109,8 @@ public IRubyObject each(ThreadContext context, IRubyObject[] args, final Block b
 
         return this;
     }
+
+    private static JavaSites.ProducerSites sites(ThreadContext context) {
+        return context.sites.Producer;
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/jruby/RubyRandom.java b/core/src/main/java/org/jruby/RubyRandom.java
index 197b3a99e70..ff0142e5dbd 100644
--- a/core/src/main/java/org/jruby/RubyRandom.java
+++ b/core/src/main/java/org/jruby/RubyRandom.java
@@ -442,26 +442,6 @@ static RandomType tryGetRnd(ThreadContext context, IRubyObject obj) {
         }
     }
 
-    @Deprecated(since = "9.3.0.0")
-    static IRubyObject randKernel(ThreadContext context, IRubyObject[] args) {
-        RandomType random = getDefaultRand(context);
-        if (args.length == 0) {
-            return randFloat(context, random);
-        }
-
-        IRubyObject arg = args[0];
-        return randKernel(context, context.runtime.getRandomClass(), arg);
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject rand(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        return switch (args.length) {
-            case 0 -> randDefault(context, recv);
-            case 1 -> randDefault(context, recv, args[0]);
-            default -> throw argumentError(context, args.length, 0, 1);
-        };
-    }
-
     @Deprecated(since = "9.4.0.0")
     public IRubyObject randObj(ThreadContext context, IRubyObject[] args) {
         return (args.length == 0) ? rand(context) : rand(context, args[0]);
diff --git a/core/src/main/java/org/jruby/RubyRange.java b/core/src/main/java/org/jruby/RubyRange.java
index 8eccd29b746..c0a5bf29803 100644
--- a/core/src/main/java/org/jruby/RubyRange.java
+++ b/core/src/main/java/org/jruby/RubyRange.java
@@ -46,10 +46,12 @@
 import org.jruby.api.API;
 import org.jruby.api.JRubyAPI;
 import org.jruby.exceptions.JumpException;
+import org.jruby.exceptions.RuntimeError;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.BlockCallback;
 import org.jruby.runtime.CallBlock;
+import org.jruby.runtime.CallBlock19;
 import org.jruby.runtime.CallSite;
 import org.jruby.runtime.ClassIndex;
 import org.jruby.runtime.Helpers;
@@ -67,6 +69,7 @@
 import static org.jruby.api.Error.*;
 import static org.jruby.runtime.Helpers.hashEnd;
 import static org.jruby.runtime.Helpers.hashStart;
+import static org.jruby.runtime.Helpers.invokeSuper;
 import static org.jruby.runtime.Helpers.invokedynamic;
 import static org.jruby.runtime.Helpers.murmurCombine;
 import static org.jruby.runtime.Helpers.safeHashLong;
@@ -1154,7 +1157,7 @@ public IRubyObject max(ThreadContext context, Block block) {
 
             if (cmp == 0) return context.nil;
 
-            if (!(begin instanceof RubyInteger)) throw typeError(context, "cannot exclude end value with non Integer begin value");
+            if (!begin.isNil() && !(begin instanceof RubyInteger)) throw typeError(context, "cannot exclude end value with non Integer begin value");
 
             return end instanceof RubyFixnum fixnum ?
                     asFixnum(context, fixnum.getValue() - 1) :
@@ -1166,10 +1169,46 @@ public IRubyObject max(ThreadContext context, Block block) {
 
     @JRubyMethod(frame = true)
     public IRubyObject max(ThreadContext context, IRubyObject arg, Block block) {
-        if (isEndless) throw rangeError(context, "cannot get the maximum element of endless range");
-        return Helpers.invokeSuper(context, this, arg, block);
+        IRubyObject e = end;
+        boolean nm = e instanceof RubyNumeric;
+
+        if (isEndless) throw rangeError(context, "cannot get the maximum of endless range");
+
+        IRubyObject b = begin;
+
+        if (block.isGiven() || (isExclusive && !nm)) {
+            if (b.isNil()) {
+                throw rangeError(context, "cannot get the maximum of beginless range with custom comparison method");
+            }
+            return Helpers.invokeSuper(context, this, arg, block);
+        }
+
+        Break[] pBreak = {null};
+        int[] data = {toInt(context, arg)};
+        RubyArray ary = RubyArray.newArray(context.runtime, toInt(context, arg));
+        try {
+            sites(context).reverse_each.call(context, this, this, CallBlock19.newCallClosure(this, this.getMetaClass(), Signature.TWO_ARGUMENTS, (ctx, args, block1) -> {
+                int n = data[0];
+
+                if (n <= 0) {
+                    throw pBreak[0] = new Break();
+                }
+                ary.push(ctx, args[0]);
+                n--;
+                data[0] = n;
+                return ctx.nil;
+            }, context));
+        } catch (Break brk) {
+            if (pBreak[0] != brk) throw brk;
+        }
+        return ary;
     }
 
+    private static class Break extends RuntimeException {
+        @Override
+        public Throwable fillInStackTrace() {return this;}
+    };
+
     @JRubyMethod
     public IRubyObject first(ThreadContext context) {
         return first(context, null);
@@ -1255,29 +1294,44 @@ public IRubyObject end(ThreadContext context) {
     public IRubyObject last(ThreadContext context, IRubyObject arg) {
         if (isEndless) throw rangeError(context, "cannot get the last element of endless range");
 
-        if (begin instanceof RubyInteger && end instanceof RubyInteger
-            && getMetaClass().checkMethodBasicDefinition("each")) {
-                return intRangeLast(context, arg);
+        if (integerEndOptimizable(context)) {
+            return intRangeLast(context, arg);
         }
 
         return ((RubyArray) RubyKernel.new_array(context, this, this)).last(context, arg);
     }
 
+    private boolean integerEndOptimizable(ThreadContext context) {
+        IRubyObject b = begin;
+        if (!b.isNil() && !(b instanceof RubyInteger)) return false;
+        IRubyObject e = end;
+        if (!(e instanceof RubyInteger)) return false;
+        if (sites(context).each.isBuiltin(this)) return true;
+        return false;
+    }
+
     // MRI rb_int_range_last
     private RubyArray intRangeLast(ThreadContext context, IRubyObject arg) {
         RubyFixnum one = asFixnum(context, 1);
         RubyInteger e = (RubyInteger) end;
-        RubyInteger len;
-        RubyInteger len1 = (RubyInteger) e.op_minus(context, begin);
+        RubyInteger len = null;
 
-        if (isExclusive) {
-            e = (RubyInteger) e.op_minus(context, one);
-            len = len1;
+        if (!begin.isNil()) {
+            RubyInteger len1 = (RubyInteger) e.op_minus(context, begin);
+
+            if (isExclusive) {
+                e = (RubyInteger) e.op_minus(context, one);
+                len = len1;
+            } else {
+                len = (RubyInteger) len1.op_plus(context, one);
+            }
         } else {
-            len = (RubyInteger) len1.op_plus(context, one);
+            if (isExclusive) {
+                e = (RubyInteger) e.op_minus(context, one);
+            }
         }
 
-        if (len.isZero(context) || Numeric.f_negative_p(context, len)) {
+        if (len != null && (len.isZero(context) || Numeric.f_negative_p(context, len))) {
             return newEmptyArray(context);
         }
 
@@ -1285,7 +1339,7 @@ private RubyArray intRangeLast(ThreadContext context, IRubyObject arg) {
         if (n < 0) throw argumentError(context, "negative array size");
 
         RubyInteger nv = asFixnum(context, n);
-        if (Numeric.f_gt_p(context, nv, len)) {
+        if (!begin.isNil() && Numeric.f_gt_p(context, nv, len)) {
              nv = len;
              n = toLong(context, nv);
         }
@@ -1317,6 +1371,15 @@ public IRubyObject size(ThreadContext context) {
         return context.nil;
     }
 
+    @JRubyMethod(name = "to_set", rest = true, frame = true)
+    public IRubyObject to_set(ThreadContext context, IRubyObject[] args, Block block) {
+        if (isEndless) {
+            throw context.runtime.newRangeError("cannot convert endless range to a set");
+        }
+
+        return invokeSuper(context, this, context.getFrameKlazz(), context.getFrameName(), args, block);
+    }
+
     private boolean discreteObject(IRubyObject object) {
         return object.respondsTo("succ");
     }
diff --git a/core/src/main/java/org/jruby/RubyRational.java b/core/src/main/java/org/jruby/RubyRational.java
index c748d04dd8e..bd0dc046109 100644
--- a/core/src/main/java/org/jruby/RubyRational.java
+++ b/core/src/main/java/org/jruby/RubyRational.java
@@ -297,24 +297,6 @@ private static boolean canonicalizeShouldNegate(ThreadContext context, RubyInteg
         return signum < 0;
     }
     
-    /** nurat_s_new
-     * 
-     */
-    @Deprecated(since = "1.1.4")
-    public static IRubyObject newInstance(ThreadContext context, IRubyObject clazz, IRubyObject[]args) {
-        switch (args.length) {
-            case 1: return newInstance(context, (RubyClass) clazz, args[0]);
-            case 2: return newInstance(context, (RubyClass) clazz, args[0], args[1]);
-        }
-        Arity.raiseArgumentError(context, args.length, 1, 1);
-        return null;
-    }
-
-    @Deprecated(since = "9.2.0.0") // confusing parameters
-    public static IRubyObject newInstance(ThreadContext context, IRubyObject clazz, IRubyObject num) {
-        return newInstance(context, (RubyClass) clazz, num);
-    }
-
     static IRubyObject newInstance(ThreadContext context, RubyClass clazz, IRubyObject num) {
         return newInstance(context, clazz, num, true);
     }
@@ -326,11 +308,6 @@ static IRubyObject newInstance(ThreadContext context, RubyClass clazz, IRubyObje
         return canonicalizeInternal(context, clazz, maybeInt.convertToInteger(), RubyFixnum.one(context.runtime));
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static IRubyObject newInstance(ThreadContext context, IRubyObject clazz, IRubyObject num, IRubyObject den) {
-        return newInstance(context, (RubyClass) clazz, num, den);
-    }
-
     static IRubyObject newInstance(ThreadContext context, RubyClass clazz, IRubyObject num, IRubyObject den) {
         return newInstance(context, clazz, num, den, true);
     }
@@ -391,16 +368,6 @@ public static IRubyObject rationalCanonicalize(ThreadContext context, IRubyObjec
         return x;
     }
     
-    @Deprecated(since = "1.1.4")
-    public static IRubyObject convert(ThreadContext context, IRubyObject clazz, IRubyObject[]args) {
-        switch (args.length) {
-        case 1: return convert(context, clazz, args[0]);        
-        case 2: return convert(context, clazz, args[0], args[1]);
-        }
-        Arity.raiseArgumentError(context, args.length, 1, 1);
-        return null;
-    }
-
     /** nurat_s_convert
      * 
      */
@@ -714,9 +681,6 @@ public final RubyNumeric op_plus(ThreadContext context, RubyRational other) {
         return f_addsub(context, getMetaClass(), num, den, other.num, other.den, true);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_add(ThreadContext context, IRubyObject other) { return op_plus(context, other); }
-
     /** nurat_sub */
     @JRubyMethod(name = "-")
     public IRubyObject op_minus(ThreadContext context, IRubyObject other) {
@@ -736,9 +700,6 @@ public final RubyNumeric op_minus(ThreadContext context, RubyRational other) {
         return f_addsub(context, getMetaClass(), num, den, other.num, other.den, false);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_sub(ThreadContext context, IRubyObject other) { return op_minus(context, other); }
-
     @Override
     public IRubyObject op_uminus(ThreadContext context) {
         return RubyRational.newRationalNoReduce(context, num.negate(context), den);
@@ -1572,36 +1533,6 @@ public static IRubyObject numericQuo(ThreadContext context, IRubyObject x, IRuby
         return ((RubyRational) x).op_div(context, y);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_floor(ThreadContext context) {
-        return floor(context);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_floor(ThreadContext context, IRubyObject n) {
-        return floor(context, n);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_ceil(ThreadContext context) {
-        return ceil(context);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_ceil(ThreadContext context, IRubyObject n) {
-        return ceil(context, n);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_idiv(ThreadContext context, IRubyObject other) {
-        return idiv(context, other);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject op_fdiv(ThreadContext context, IRubyObject other) {
-        return fdiv(context, other);
-    }
-
     private static JavaSites.RationalSites sites(ThreadContext context) {
         return context.sites.Rational;
     }
diff --git a/core/src/main/java/org/jruby/RubyRegexp.java b/core/src/main/java/org/jruby/RubyRegexp.java
index 3e0024d2221..610df87d576 100755
--- a/core/src/main/java/org/jruby/RubyRegexp.java
+++ b/core/src/main/java/org/jruby/RubyRegexp.java
@@ -96,7 +96,7 @@
 import static org.jruby.api.Error.typeError;
 import static org.jruby.api.Warn.warn;
 import static org.jruby.api.Warn.warning;
-import static org.jruby.runtime.ThreadContext.resetCallInfo;
+import static org.jruby.runtime.ThreadContext.hasKeywords;
 import static org.jruby.util.RubyStringBuilder.str;
 import static org.jruby.util.StringSupport.CR_7BIT;
 import static org.jruby.util.StringSupport.EMPTY_STRING_ARRAY;
@@ -257,16 +257,6 @@ public static int matcherMatch(ThreadContext context, Matcher matcher, int start
         }
     }
 
-    @Deprecated(since = "9.2.0.0") // not-used
-    public static int matcherSearch(Ruby runtime, Matcher matcher, int start, int range, int option) {
-        return matcherSearch(runtime.getCurrentContext(), matcher, start, range, option);
-    }
-
-    @Deprecated(since = "9.2.0.0") // not-used
-    public static int matcherMatch(Ruby runtime, Matcher matcher, int start, int range, int option) {
-        return matcherMatch(runtime.getCurrentContext(), matcher, start, range, option);
-    }
-
     @Override
     public ClassIndex getNativeClassIndex() {
         return ClassIndex.REGEXP;
@@ -477,11 +467,6 @@ public static void preprocessCheck(Ruby runtime, ByteList bytes) {
         RegexpSupport.preprocess(runtime, bytes, bytes.getEncoding(), new Encoding[]{null}, RegexpSupport.ErrorMode.RAISE);
     }
 
-    @Deprecated(since = "9.2.10.0") // not used
-    public static RubyString preprocessDRegexp(Ruby runtime, RubyString[] strings, int embeddedOptions) {
-        return preprocessDRegexp(runtime, strings, RegexpOptions.fromEmbeddedOptions(embeddedOptions));
-    }
-
     // rb_reg_preprocess_dregexp
     public static RubyString preprocessDRegexp(Ruby runtime, IRubyObject[] strings, RegexpOptions options) {
         return preprocessDRegexp(runtime.getCurrentContext(), options, strings);
@@ -507,44 +492,14 @@ public static RubyString preprocessDRegexp(ThreadContext context, RegexpOptions
         return processElementIntoResult(context, null, arg0, options, null, context.encodingHolder());
     }
 
-    @Deprecated(since = "9.2.10.0") // not used
-    public static RubyString preprocessDRegexp(Ruby runtime, IRubyObject arg0, RegexpOptions options) {
-        var context = runtime.getCurrentContext();
-        return processElementIntoResult(context, null, arg0, options, null, context.encodingHolder());
-    }
-
     public static RubyString preprocessDRegexp(ThreadContext context, RegexpOptions options, IRubyObject arg0, IRubyObject arg1) {
         return processElementIntoResult(context, null, arg0, arg1, options, null, context.encodingHolder());
     }
 
-    @Deprecated(since = "9.2.10.0")
-    public static RubyString preprocessDRegexp(Ruby runtime, IRubyObject arg0, IRubyObject arg1, RegexpOptions options) {
-        var context = runtime.getCurrentContext();
-        return processElementIntoResult(context, null, arg0, arg1, options, null, context.encodingHolder());
-    }
-
     public static RubyString preprocessDRegexp(ThreadContext context, RegexpOptions options, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
         return processElementIntoResult(context, null, arg0, arg1, arg2, options, null, context.encodingHolder());
     }
 
-    @Deprecated(since = "9.2.10.0")
-    public static RubyString preprocessDRegexp(Ruby runtime, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, RegexpOptions options) {
-        var context = runtime.getCurrentContext();
-        return processElementIntoResult(context, null, arg0, arg1, arg2, options, null, context.encodingHolder());
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public static RubyString preprocessDRegexp(Ruby runtime, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3, RegexpOptions options) {
-        var context = runtime.getCurrentContext();
-        return processElementIntoResult(context, null, arg0, arg1, arg2, arg3, options, null, context.encodingHolder());
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    public static RubyString preprocessDRegexp(Ruby runtime, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3, IRubyObject arg4, RegexpOptions options) {
-        var context = runtime.getCurrentContext();
-        return processElementIntoResult(context, null, arg0, arg1, arg2, arg3, arg4, options, null, context.encodingHolder());
-    }
-
     private static RubyString processElementIntoResult(
             ThreadContext context,
             RubyString result,
@@ -941,7 +896,7 @@ public IRubyObject initialize_m(IRubyObject arg0, IRubyObject arg1) {
 
     @JRubyMethod(name = "initialize", visibility = Visibility.PRIVATE, keywords = true)
     public IRubyObject initialize_m(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
-        boolean keywords = (resetCallInfo(context) & ThreadContext.CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
 
         IRubyObject timeout;
         RegexpOptions regexpOptions;
@@ -968,7 +923,7 @@ public IRubyObject initialize_m(IRubyObject arg0, IRubyObject arg1, IRubyObject
 
     @JRubyMethod(name = "initialize", visibility = Visibility.PRIVATE, keywords = true)
     public IRubyObject initialize_m(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
-        boolean keywords = (resetCallInfo(context) & ThreadContext.CALL_KEYWORD) != 0;
+        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
 
         if (arg0 instanceof RubyRegexp && Options.PARSER_WARN_FLAGS_IGNORED.load()) {
             warn(context, "flags ignored");
@@ -1322,11 +1277,6 @@ final boolean startsWith(ThreadContext context, RubyString str) {
         }
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public final RubyBoolean startWithP(ThreadContext context, RubyString str) {
-        return startsWith(context, str) ? context.tru : context.fals;
-    }
-
     /**
      * Search the given string with this Regexp.
      *
@@ -1581,7 +1531,7 @@ public IRubyObject named_captures(ThreadContext context) {
         for (Iterator<NameEntry> i = pattern.namedBackrefIterator(); i.hasNext();) {
             NameEntry e = i.next();
             int[] backrefs = e.getBackRefs();
-            RubyArray ary = RubyArray.newBlankArrayInternal(context.runtime, backrefs.length);
+            RubyArray ary = RubyArrayNative.newBlankArrayInternal(context.runtime, backrefs.length);
 
             for (int idx = 0; idx<backrefs.length; idx++) {
                 ary.storeInternal(context, idx, asFixnum(context, backrefs[idx]));
@@ -1607,12 +1557,11 @@ private record RegexpArgs(RubyString string, int options, IRubyObject timeout) {
 
     // MRI: reg_extract_args - This does not break the regexp into a String value since it will never used if the first
     // argument is a Regexp.  This also is true of MRI so I am not sure why they do the string part.
-    private static RegexpArgs extractRegexpArgs(ThreadContext context, IRubyObject[] args) {
-        int callInfo = resetCallInfo(context);
+    private static RegexpArgs extractRegexpArgs(ThreadContext context, final int callInfo, IRubyObject[] args) {
         int length = args.length;
 
         IRubyObject timeout = null;
-        if ((callInfo & ThreadContext.CALL_KEYWORD) != 0) {
+        if (hasKeywords(callInfo)) {
             length--;
             RubyHash opts = Convert.castAsHash(context, args[args.length - 1]);
             timeout = opts.fastARef(asSymbol(context, "timeout"));
@@ -1631,9 +1580,10 @@ private static RegexpArgs extractRegexpArgs(ThreadContext context, IRubyObject[]
         return new RegexpArgs(string, opts, timeout);
     }
 
-    @JRubyMethod(name = "linear_time?", meta = true, required = 1, optional = 1)
+    @JRubyMethod(name = "linear_time?", meta = true, required = 1, optional = 1, keywords = true)
     public static IRubyObject linear_time_p(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        RegexpArgs regexpArgs = extractRegexpArgs(context, args);
+        final int callInfo = ThreadContext.resetCallInfo(context);
+        RegexpArgs regexpArgs = extractRegexpArgs(context, callInfo, args);
         RubyRegexp regexp = args[0] instanceof RubyRegexp reg ?
                 reg : newRegexpFromStr(context.runtime, regexpArgs.string, regexpArgs.options);
 
@@ -1942,22 +1892,6 @@ public static void marshalTo(ThreadContext context, RubyRegexp regexp, MarshalDu
         output.writeByte(out, options);
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public final int search(ThreadContext context, RubyString str, int pos, boolean reverse, IRubyObject[] holder) {
-        int result = searchString(context, str, pos, reverse);
-        if (holder != null) {
-            holder[0] = context.getLocalMatchOrNil();
-        } else {
-            context.setBackRef(context.getLocalMatchOrNil());
-        }
-        return result;
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject getBackRef(ThreadContext context) {
-        return context.getBackRef();
-    }
-
     @Deprecated(since = "10.0.0.0")
     public boolean isSimpleString() {
         return isSimpleString(getCurrentContext());
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
index 03a4ec4cd91..67151a58236 100644
--- a/core/src/main/java/org/jruby/RubyString.java
+++ b/core/src/main/java/org/jruby/RubyString.java
@@ -419,14 +419,17 @@ public void verifyAsciiCompatible() {
         if (!getEncoding().isAsciiCompatible()) throw getRuntime().newEncodingCompatibilityError("ASCII incompatible encoding: " + getEncoding());
     }
 
+    @Deprecated(since = "10.1.0.0", forRemoval = true)
     public RubyString(Ruby runtime, RubyClass rubyClass) {
         this(runtime, rubyClass, ByteList.NULL_ARRAY);
     }
 
+    @Deprecated(since = "10.1.0.0", forRemoval = true)
     public RubyString(Ruby runtime, RubyClass rubyClass, CharSequence value) {
         this(runtime, rubyClass, value, UTF8);
     }
 
+    @Deprecated(since = "10.1.0.0", forRemoval = true)
     public RubyString(Ruby runtime, RubyClass rubyClass, CharSequence value, Encoding enc) {
         super(runtime, rubyClass);
         assert value != null;
@@ -451,24 +454,28 @@ private RubyString(Ruby runtime, RubyClass rubyClass, String value, Encoding enc
         this.value = encodeBytelist(value, enc);
     }
 
+    @Deprecated(since = "10.1.0.0", forRemoval = true)
     public RubyString(Ruby runtime, RubyClass rubyClass, byte[] value) {
         super(runtime, rubyClass);
         assert value != null;
         this.value = new ByteList(value);
     }
 
+    @Deprecated(since = "10.1.0.0", forRemoval = true)
     public RubyString(Ruby runtime, RubyClass rubyClass, ByteList value) {
         super(runtime, rubyClass);
         assert value != null;
         this.value = value;
     }
 
+    @Deprecated(since = "10.1.0.0", forRemoval = true)
     public RubyString(Ruby runtime, RubyClass rubyClass, ByteList value, boolean objectSpace) {
         super(runtime, rubyClass, objectSpace);
         assert value != null;
         this.value = value;
     }
 
+    @Deprecated(since = "10.1.0.0", forRemoval = true)
     public RubyString(Ruby runtime, RubyClass rubyClass, ByteList value, Encoding encoding, boolean objectSpace) {
         this(runtime, rubyClass, value, objectSpace);
         value.setEncoding(encoding);
@@ -497,21 +504,6 @@ protected RubyString(Ruby runtime, RubyClass rubyClass, ByteList value, int cr,
 
     // Deprecated String construction routines
 
-    @Deprecated(since = "1.1.6")
-    public RubyString newString(CharSequence s) {
-        return new RubyString(getRuntime(), getType(), s);
-    }
-
-    @Deprecated(since = "1.1.6")
-    public RubyString newString(ByteList s) {
-        return new RubyString(getRuntime(), getMetaClass(), s);
-    }
-
-    @Deprecated(since = "1.1.2")
-    public static RubyString newString(Ruby runtime, RubyClass clazz, CharSequence str) {
-        return new RubyString(runtime, clazz, str);
-    }
-
     public static RubyString newStringLight(Ruby runtime, ByteList bytes) {
         return new RubyString(runtime, runtime.getString(), bytes, false);
     }
@@ -654,11 +646,6 @@ public static RubyString newInternalFromJavaExternal(Ruby runtime, String str) {
         return RubyString.newString(runtime,  new ByteList(RubyEncoding.encode(str, rubyInt), internal));
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public static RubyString newExternalStringWithEncoding(Ruby runtime, String string, Encoding encoding) {
-        return EncodingUtils.newExternalStringWithEncoding(runtime, string, encoding);
-    }
-
     // String construction routines by NOT byte[] buffer and making the target String shared
     public static RubyString newStringShared(Ruby runtime, RubyString orig) {
         orig.shareLevel = SHARE_LEVEL_BYTELIST;
@@ -2908,7 +2895,7 @@ public RubyString append(IRubyObject other, Function<IRubyObject, RubyString> co
     }
 
     public RubyString append(IRubyObject other) {
-        return append(other, (o) -> o.convertToString());
+        return append(other, IRubyObject::convertToString);
     }
 
     public RubyString append(RubyString other) {
@@ -5228,7 +5215,7 @@ private static IRubyObject scanOnce(ThreadContext context, RubyString str, IRuby
                 return RubyRegexp.nth_match(context, 0, match);
             }
             int size = match.numRegs();
-            RubyArray result = RubyArray.newBlankArrayInternal(context.runtime, size - 1);
+            RubyArrayNative result = RubyArrayNative.newBlankArrayInternal(context.runtime, size - 1);
             for (int i = 1; i < size; i++) {
                 result.eltInternalSet(i - 1, RubyRegexp.nth_match(context, i, match));
             }
@@ -6254,16 +6241,6 @@ public IRubyObject squeeze_bang(ThreadContext context, IRubyObject[] args) {
         return this;
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject tr19(ThreadContext context, IRubyObject src, IRubyObject repl) {
-        return tr(context, src, repl);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject tr_bang19(ThreadContext context, IRubyObject src, IRubyObject repl) {
-        return tr_bang(context, src, repl);
-    }
-
     /** rb_str_tr / rb_str_tr_bang
      *
      */
@@ -6342,54 +6319,6 @@ public IRubyObject each_line(ThreadContext context, IRubyObject arg, IRubyObject
         return StringSupport.rbStrEnumerateLines(this, context, "each_line", arg, opts, block, false);
     }
 
-    @Deprecated(since = "9.2.1.0") // no longer used
-    public IRubyObject each_lineCommon(ThreadContext context, IRubyObject sep, Block block) {
-        if (sep == context.nil) {
-            block.yield(context, this);
-            return this;
-        }
-
-        RubyString sepStr = sep.convertToString();
-        ByteList sepValue = sepStr.value;
-        int rslen = sepValue.getRealSize();
-
-        final byte newline;
-        if (rslen == 0) {
-            newline = '\n';
-        } else {
-            newline = sepValue.getUnsafeBytes()[sepValue.getBegin() + rslen - 1];
-        }
-
-        int p = value.getBegin();
-        int end = p + value.getRealSize();
-        int ptr = p, s = p;
-        int len = value.getRealSize();
-        byte[] bytes = value.getUnsafeBytes();
-
-        p += rslen;
-
-        for (; p < end; p++) {
-            if (rslen == 0 && bytes[p] == '\n') {
-                if (++p == end || bytes[p] != '\n') continue;
-                while(p < end && bytes[p] == '\n') p++;
-            }
-            if (ptr < p && bytes[p - 1] == newline &&
-               (rslen <= 1 ||
-                ByteList.memcmp(sepValue.getUnsafeBytes(), sepValue.getBegin(), rslen, bytes, p - rslen, rslen) == 0)) {
-                block.yield(context, makeShared(context.runtime, s - ptr, p - s));
-                modifyCheck(bytes, len);
-                s = p;
-            }
-        }
-
-        if (s != end) {
-            if (p > end) p = end;
-            block.yield(context, makeShared(context.runtime, s - ptr, p - s));
-        }
-
-        return this;
-    }
-
     @JRubyMethod(name = "lines")
     public IRubyObject lines(ThreadContext context, Block block) {
         return StringSupport.rbStrEnumerateLines(this, context, "lines", globalVariables(context).get("$/"), block, true);
@@ -7386,6 +7315,7 @@ private static StringSites sites(ThreadContext context) {
         return context.sites.String;
     }
 
+    /** Deprecated but still used by JIT, see {@link org.jruby.ir.targets.indy.ArrayDerefInvokeSite#STRDUP_FILTER} */
     @Deprecated(since = "9.0.0.0")
     public final RubyString strDup() {
         return strDup(getRuntime(), getMetaClass().getRealClass());
diff --git a/core/src/main/java/org/jruby/RubyStruct.java b/core/src/main/java/org/jruby/RubyStruct.java
index b2cf0262e7e..dad81f4080b 100644
--- a/core/src/main/java/org/jruby/RubyStruct.java
+++ b/core/src/main/java/org/jruby/RubyStruct.java
@@ -238,6 +238,7 @@ public static RubyClass newInstance(IRubyObject recv, IRubyObject[] args, Block
      */
     @JRubyMethod(name = "new", rest = true, checkArity = false, meta = true, keywords = true)
     public static RubyClass newInstance(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
+        ThreadContext.resetCallInfo(context);
         int argc = Arity.checkArgumentCount(context, args, 0, -1);
 
         String name = null;
@@ -299,8 +300,7 @@ public static RubyClass newInstance(ThreadContext context, IRubyObject recv, IRu
         }
 
         // set reified class to RubyStruct, for Java subclasses to use
-        newStruct.reifiedClass(RubyStruct.class).
-                classIndex(ClassIndex.STRUCT);
+        newStruct.reifiedClass(RubyStruct.class).classIndex(ClassIndex.STRUCT);
         newStruct.setInternalVariable(SIZE_VAR, member.length(context));
         newStruct.setInternalVariable(MEMBER_VAR, member);
         newStruct.setInternalVariable(KEYWORD_INIT_VAR, keywordInitValue);
@@ -480,24 +480,24 @@ private void checkSize(ThreadContext context, int length) {
         if (length > values.length) throw argumentError(context, "struct size differs (" + length +" for " + values.length + ")");
     }
 
-    private void checkForKeywords(ThreadContext context, boolean keywordInit) {
-        if (hasKeywords(ThreadContext.resetCallInfo(context)) && !keywordInit) {
+    private void checkForKeywords(ThreadContext context, int callInfo, boolean keywordInit) {
+        if (hasKeywords(callInfo) && !keywordInit) {
             warn(context, "Passing only keyword arguments to Struct#initialize will behave differently from Ruby 3.2. Please use a Hash literal like .new({k: v}) instead of .new(k: v).");
         }
     }
 
     @JRubyMethod(rest = true, visibility = PRIVATE, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
+        final int callInfo = ThreadContext.resetCallInfo(context);
         IRubyObject keywordInit = RubyStruct.getInternalVariable(context, classOf(), KEYWORD_INIT_VAR);
-        checkForKeywords(context, !keywordInit.isNil());
-        ThreadContext.resetCallInfo(context);
+        checkForKeywords(context, callInfo, !keywordInit.isNil());
         modify(context);
         checkSize(context, args.length);
 
         if (keywordInit.isTrue()) {
             if (args.length != 1) throw argumentError(context, args.length, 0);
 
-            return initialize(context, args[0]);
+            return initialize(context, args[0], callInfo);
         } else {
             System.arraycopy(args, 0, values, 0, args.length);
             Helpers.fillNil(context, values, args.length, values.length);
@@ -530,12 +530,16 @@ public IRubyObject initialize(ThreadContext context) {
         return initializeInternal(context, 0, nil, nil, nil);
     }
 
-    @JRubyMethod(visibility = PRIVATE)
+    @JRubyMethod(visibility = PRIVATE, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject arg0) {
-        boolean keywords = hasNonemptyKeywords(ThreadContext.resetCallInfo(context));
+        return initialize(context, arg0, ThreadContext.resetCallInfo(context));
+    }
 
-        if (keywords) {
-            return setupStructValuesFromHash(context, (RubyHash) arg0);
+    private IRubyObject initialize(ThreadContext context, IRubyObject arg0, final int callInfo) {
+        final boolean keywords = hasNonemptyKeywords(callInfo);
+
+        if (keywords && arg0 instanceof RubyHash hash) {
+            return setupStructValuesFromHash(context, hash);
         } else if (RubyStruct.getInternalVariable(context, classOf(), KEYWORD_INIT_VAR).isTrue()) {
             if (!(arg0 instanceof RubyHash hash)) throw argumentError(context, 1, 0);
             return setupStructValuesFromHash(context, hash);
@@ -544,15 +548,17 @@ public IRubyObject initialize(ThreadContext context, IRubyObject arg0) {
         return initializeInternal(context, 1, arg0, context.nil, context.nil);
     }
 
-    @JRubyMethod(visibility = PRIVATE)
+    @JRubyMethod(visibility = PRIVATE, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject arg0, IRubyObject arg1) {
+        ThreadContext.resetCallInfo(context);
         IRubyObject keywordInit = RubyStruct.getInternalVariable(context, classOf(), KEYWORD_INIT_VAR);
         if (keywordInit.isTrue()) throw argumentError(context, 2, 0);
         return initializeInternal(context, 2, arg0, arg1, context.nil);
     }
 
-    @JRubyMethod(visibility = PRIVATE)
+    @JRubyMethod(visibility = PRIVATE, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
+        ThreadContext.resetCallInfo(context);
         IRubyObject keywordInit = RubyStruct.getInternalVariable(context, classOf(), KEYWORD_INIT_VAR);
         if (keywordInit.isTrue()) throw argumentError(context, 3, 0);
         return initializeInternal(context, 3, arg0, arg1, arg2);
@@ -762,11 +768,6 @@ public RubyArray to_a(ThreadContext context) {
         return newArray(context, values);
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public RubyHash to_h(ThreadContext context) {
-        return to_h(context, Block.NULL_BLOCK);
-    }
-
     @JRubyMethod
     public RubyHash to_h(ThreadContext context, Block block) {
         RubyHash hash = newHash(context);
@@ -1172,10 +1173,4 @@ private static StructSites sites(ThreadContext context) {
         return context.sites.Struct;
     }
 
-    @Deprecated(since = "9.4-")
-    @Override
-    public RubyArray to_a() {
-        return to_a(getCurrentContext());
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/RubySymbol.java b/core/src/main/java/org/jruby/RubySymbol.java
index 8c586e5da4d..325fde19197 100644
--- a/core/src/main/java/org/jruby/RubySymbol.java
+++ b/core/src/main/java/org/jruby/RubySymbol.java
@@ -101,9 +101,6 @@
  */
 @JRubyClass(name = "Symbol", include = "Enumerable")
 public class RubySymbol extends RubyObject implements MarshalEncoding, EncodingCapable, Constantizable, Appendable, SimpleHash {
-    @Deprecated(since = "9.2.1.0")
-    public static final long symbolHashSeedK0 = 5238926673095087190l;
-
     private final int id;
     private final int hashCode;
     private final String symbol;
@@ -326,20 +323,6 @@ public static RubySymbol getSymbolLong(Ruby runtime, long id) {
         return runtime.getSymbolTable().lookup(id);
     }
 
-    /* Symbol class methods.
-     *
-     */
-    @Deprecated(since = "9.1.0.0")
-    public static RubySymbol newSymbol(Ruby runtime, IRubyObject name) {
-        if (name instanceof RubySymbol) {
-            return runtime.getSymbolTable().getSymbol(((RubySymbol) name).getBytes(), false);
-        } else if (name instanceof RubyString) {
-            return runtime.getSymbolTable().getSymbol(((RubyString) name).getByteList(), false);
-        } else {
-            return newSymbol(runtime, name.asString().getByteList());
-        }
-    }
-
     public static RubySymbol newHardSymbol(Ruby runtime, IRubyObject name) {
         if (name instanceof RubySymbol) {
             return runtime.getSymbolTable().getSymbol(((RubySymbol) name).getBytes(), true);
@@ -508,8 +491,15 @@ public boolean isSimpleName(ThreadContext context) {
         ByteList bytes = fstring.getByteList();
         Encoding enc = bytes.getEncoding();
 
+        boolean nameInvalid;
+        if (str.isAsciiOnly()) {
+            nameInvalid = !isSymbolName(symbol);
+        } else {
+            nameInvalid = this.type == SymbolNameType.OTHER;
+        }
+
         if ((resenc != enc && !str.isAsciiOnly()) /*|| len != (long)strlen(ptr)*/ ||
-                !isSymbolName(symbol) || !isPrintable(context)) {
+                nameInvalid || !isPrintable(context)) {
             return false;
         }
         return true;
@@ -940,11 +930,6 @@ private static boolean isSymbolLocal(final String str, final char first, final i
     public static IRubyObject all_symbols(ThreadContext context, IRubyObject recv) {
         return context.runtime.getSymbolTable().all_symbols(context);
     }
-    @Deprecated(since = "1.2")
-    public static IRubyObject all_symbols(IRubyObject recv) {
-        var runtime = recv.getRuntime();
-        return runtime.getSymbolTable().all_symbols(runtime.getCurrentContext());
-    }
 
     @Deprecated(since = "10.0.0.0", forRemoval = true)
     @SuppressWarnings("removal")
@@ -1484,32 +1469,6 @@ private SymbolEntry[] rehash() {
             symbolTable = newTable;
             return newTable;
         }
-
-        // backwards-compatibility, but threadsafe now
-        @Deprecated(since = "9.0.0.0")
-        public RubySymbol lookup(String name) {
-            int hash = name.hashCode();
-            SymbolEntry[] table = symbolTable;
-            RubySymbol symbol = null;
-
-            SymbolEntry e = table[getIndex(hash, table)];
-            while (e != null) {
-                if (hash == e.hash && name.equals(e.name)) {
-                    symbol = e.symbol.get();
-                    if (symbol != null) break;
-                }
-                e = e.next;
-            }
-
-            return symbol;
-        }
-
-        // not so backwards-compatible here, but no one should have been
-        // calling this anyway.
-        @Deprecated(since = "9.0.0.0")
-        public void store(RubySymbol symbol) {
-            throw new UnsupportedOperationException();
-        }
     }
 
     private static int javaStringHashCode(String str) {
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
index f3119d37bf7..3a50a80e0a6 100644
--- a/core/src/main/java/org/jruby/RubyThread.java
+++ b/core/src/main/java/org/jruby/RubyThread.java
@@ -35,7 +35,7 @@
 
 import java.io.IOException;
 import java.io.Writer;
-import java.lang.management.ManagementFactory;
+
 import java.lang.ref.WeakReference;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channel;
@@ -187,6 +187,9 @@ public class RubyThread extends RubyObject implements ExecutionContext {
     /** Thread-local tuple used for sleeping (semaphore, millis, nanos) */
     private final SleepTask2 sleepTask = new SleepTask2();
 
+    /** Thread-local tuple used for waiting (object, millis, nanos) */
+    private final WaitTask waitTask = new WaitTask();
+
     /** Whether this is an "adopted" thread not created by Ruby code */
     private final boolean adopted;
 
@@ -235,6 +238,8 @@ public enum Status {
     /** Short circuit to avoid-re-scanning for interrupts */
     private volatile boolean pendingInterruptQueueChecked = false;
 
+    /* Still used by jruby-openssl for its blocking logic */
+    @Deprecated
     private volatile BlockingTask currentBlockingTask;
 
     private volatile Selector currentSelector;
@@ -300,9 +305,13 @@ private void executeInterrupts(ThreadContext context, boolean blockingTiming) {
                     if (getStatus() == Status.SLEEP) exitSleep();
 
                     // if it's a Ruby exception, force the cause through
-                    IRubyObject[] args = err instanceof RubyException exc ?
-                            Helpers.arrayOf(err, RubyHash.newKwargs(runtime, "cause", exc.cause(context))) :
-                            Helpers.arrayOf(err);
+                    IRubyObject[] args;
+                    if (err instanceof RubyException exc ) {
+                        context.callInfo = ThreadContext.CALL_KEYWORD;
+                        args = Helpers.arrayOf(err, RubyHash.newKwargs(runtime, "cause", exc.cause(context)));
+                    } else {
+                        args = Helpers.arrayOf(err);
+                    }
                     RubyKernel.raise(context, this, args, Block.NULL_BLOCK);
                 }
             }
@@ -456,6 +465,9 @@ public void dispose() {
                 FiberScheduler.close(getContext(), scheduler);
             }
 
+            // unregister all event hooks
+            getContext().traceEvents.removeAllCallEventHooksFor(getContext());
+
             // mark thread as DEAD
             beDead();
         }
@@ -1492,10 +1504,8 @@ public final IRubyObject raise(IRubyObject exception, RubyString message) {
         return genericRaise(context, context.getThread(), exception, message);
     }
 
-    @JRubyMethod(optional = 3, checkArity = false)
+    @JRubyMethod(optional = 4, checkArity = false, keywords = true)
     public IRubyObject raise(ThreadContext context, IRubyObject[] args, Block block) {
-        Arity.checkArgumentCount(context, args, 0, 3);
-
         return genericRaise(context, context.getThread(), args);
     }
 
@@ -1503,25 +1513,17 @@ public IRubyObject raise(ThreadContext context, IRubyObject[] args, Block block)
     public IRubyObject native_thread_id(ThreadContext context) {
         if (!isAlive()) return context.nil;
 
-        String encodedString = ManagementFactory.getRuntimeMXBean().getName();
-        int atIndex = encodedString.indexOf('@');
-
-        // Undocumented format: 1761769@localhost.localdomain
-        if (atIndex != -1) {
-            try {
-                int id = Integer.parseInt(encodedString.substring(0, atIndex));
-
-                return asFixnum(context, id);
-            } catch (NumberFormatException e) {
-                // if we fail to parse this we will just act like we don't support it
-            }
-        }
+        Thread nativeThread = getNativeThread();
+        if (nativeThread == null) return context.nil;
 
-        return context.nil;  // Not supported or failed to extract id
+        return asFixnum(context, nativeThread.threadId());
     }
 
     private IRubyObject genericRaise(ThreadContext context, RubyThread currentThread, IRubyObject... args) {
-        if (!isAlive()) return context.nil;
+        if (!isAlive()) {
+            ThreadContext.resetCallInfo(context);
+            return context.nil;
+        }
 
         pendingInterruptEnqueue(prepareRaiseException(context, args));
         interrupt();
@@ -1534,45 +1536,89 @@ private IRubyObject genericRaise(ThreadContext context, RubyThread currentThread
     }
 
     public static IRubyObject prepareRaiseException(ThreadContext context, IRubyObject[] args) {
+        int argc = args.length;
         IRubyObject errorInfo = context.getErrorInfo();
+        IRubyObject tmp =  context.nil;
 
-        if (args.length == 0) {
-            if (errorInfo.isNil()) {
-                // We force RaiseException here to populate backtrace
-                return RaiseException.from(context.runtime, runtimeErrorClass(context), "").getException();
+        // semi extract_raise_opts, duplicated from RubyKernel.raise
+        int callInfo = ThreadContext.resetCallInfo(context);
+        IRubyObject cause = null;
+        if (ThreadContext.hasNonemptyKeywords(callInfo) && argc > 0) {
+            IRubyObject last = args[argc - 1];
+            if (last instanceof RubyHash opt) {
+                RubySymbol key;
+                if (!opt.isEmpty() && (opt.has_key_p(context, key = asSymbol(context, "cause")) == context.tru)) {
+                    cause = opt.delete(context, key, Block.NULL_BLOCK);
+                    if (opt.isEmpty() && --argc == 0) { // more opts will be passed along
+                        throw argumentError(context, "only cause is given with no arguments");
+                    }
+                }
             }
-            return errorInfo;
         }
+        Arity.checkArgumentCount(context, argc, 0, 3);
 
-        final IRubyObject arg = args[0];
+        Throwable throwable = RubyKernel.unwrapJavaException(context, args, argc);
 
-        IRubyObject tmp;
-        final RubyException exception;
-        if (args.length == 1) {
-            if (arg instanceof RubyString) {
-                tmp = runtimeErrorClass(context).newInstance(context, args, Block.NULL_BLOCK);
-            } else if (arg instanceof ConcreteJavaProxy ) {
-                return arg;
-            } else {
-                if (!arg.respondsTo("exception")) throw typeError(context, "exception class/object expected");
-                tmp = arg.callMethod(context, "exception");
+        if (throwable != null) {
+            return args[0];
+        }
+
+        switch (argc) {
+            case 0:
+                if (errorInfo.isNil()) {
+                    // We force RaiseException here to populate backtrace
+                    tmp = RaiseException.from(context.runtime, runtimeErrorClass(context), "").getException();
+                } else if (errorInfo instanceof ConcreteJavaProxy) {
+                    return errorInfo;
+                } else {
+                    tmp = errorInfo;
+                }
+                break;
+            case 1: {
+                final IRubyObject arg = args[0];
+
+                if (arg instanceof RubyString) {
+                    tmp = runtimeErrorClass(context).newInstance(context, arg);
+                } else if (arg instanceof ConcreteJavaProxy) {
+                    tmp = arg;
+                } else {
+                    if (!arg.respondsTo("exception")) throw typeError(context, "exception class/object expected");
+                    tmp = arg.callMethod(context, "exception");
+                }
             }
-        } else {
-            if (!arg.respondsTo("exception")) throw typeError(context, "exception class/object expected");
-            tmp = arg.callMethod(context, "exception", args[1]);
+            break;
+
+            case 2:
+            case 3: {
+                final IRubyObject arg0 = args[0];
+                final IRubyObject message = args[1];
+                if (!arg0.respondsTo("exception")) throw typeError(context, "exception class/object expected");
+                tmp = arg0.callMethod(context, "exception", message);
+            }
+            break;
         }
 
         if (!exceptionClass(context).isInstance(tmp)) throw typeError(context, "exception object expected");
 
-        exception = (RubyException) tmp;
+        RubyException exception = (RubyException) tmp;
 
-        if (args.length == 3) {
+        if (argc == 3) {
             exception.set_backtrace(context, args[2]);
         }
 
-        IRubyObject cause = errorInfo;
-        if (cause != exception) {
-            exception.setCause(cause);
+        if (cause == null) {
+            cause = errorInfo;
+        }
+
+        if (!cause.isNil() && cause != exception) {
+            // check for circular causes
+            for (Object cur = cause; cur instanceof RubyException curException && cur != null;) {
+                if (cur == exception) {
+                    throw argumentError(context, "circular causes");
+                }
+                cur = curException.getCause();
+            }
+            exception.setCause(context, cause);
         }
 
         return exception;
@@ -1620,6 +1666,67 @@ public boolean sleep(long milliseconds, long nanoseconds) throws InterruptedExce
         }
     }
 
+    /**
+     * Wait for the object's monitor the specified number of seconds, or forever if seconds is zero.
+     *
+     * @param o the object to wait for
+     * @param seconds the number of seconds to wait, as a double
+     * @return whether the wait took at least the specified amount of time, or true if the time specified was zero
+     * @throws InterruptedException
+     */
+    public boolean waitForObject(Object o, double seconds) throws InterruptedException {
+        if (seconds > 0.0) {
+            long delay_ns = (long)(seconds * 1000000000.0);
+            int delay_ns_remainder = (int)( delay_ns % 1000000 );
+            long delay_ms = delay_ns / 1000000;
+            return waitForObject(o, delay_ms, delay_ns_remainder);
+        } else {
+            waitForObject(o);
+            return true;
+        }
+    }
+
+    /**
+     * Wait for the object's monitor until woken up or notified.
+     *
+     * Equivalent to calling {@link RubyThread#waitForObject(Object, long, int)} with 0 for millis and nanos.
+     *
+     * @param o the object to wait for
+     * @throws InterruptedException
+     */
+    public void waitForObject(Object o) throws InterruptedException {
+        waitTask.millis = 0;
+        waitTask.nanos = 0;
+        executeTaskBlocking(getContext(), o, waitTask);
+    }
+
+    /**
+     * Wait for the object's monitor the specified number of milliseconds and nanoseconds, or forever if they are zero.
+     *
+     * @param o the object to wait for
+     * @param millis the number of milliseconds to wait
+     * @param nanos the number of nanoseconds to wait
+     * @return whether the wait took at least the specified amount of time, or true if the time specified was zero
+     * @throws InterruptedException
+     */
+    public boolean waitForObject(Object o, long millis, int nanos) throws InterruptedException {
+        long totalNanos = millis * 1000000 + nanos;
+        if (totalNanos == 0) {
+            waitForObject(o);
+            return true;
+        }
+
+        long start_ns = System.nanoTime();
+        if (totalNanos > 0) {
+            waitTask.millis = millis;
+            waitTask.nanos = nanos;
+            executeTaskBlocking(getContext(), o, waitTask);
+        }
+        long end_ns = System.nanoTime();
+
+        return (end_ns - start_ns) <= totalNanos;
+    }
+
     public IRubyObject status() { // not used
         return status(getRuntime().getCurrentContext());
     }
@@ -1671,6 +1778,7 @@ public Throwable getExitingException() {
         return exitingException;
     }
 
+    /* Still used by jruby-openssl for its blocking logic */
     @Deprecated(since = "9.0.0.0")
     public interface BlockingTask {
         public void run() throws InterruptedException;
@@ -1686,24 +1794,23 @@ public interface Task<Data, Return> extends Unblocker<Data> {
         public void wakeup(RubyThread thread, Data data);
     }
 
+    // Deprecated but still used by wait_timeout below
+    @Deprecated(since = "10.1.0.0")
     public static final class SleepTask implements BlockingTask {
         private final Object object;
         private final long millis;
         private final int nanos;
-
         public SleepTask(Object object, long millis, int nanos) {
             this.object = object;
             this.millis = millis;
             this.nanos = nanos;
         }
-
         @Override
         public void run() throws InterruptedException {
             synchronized (object) {
                 object.wait(millis, nanos);
             }
         }
-
         @Override
         public void wakeup() {
             synchronized (object) {
@@ -1747,6 +1854,32 @@ public void wakeup(RubyThread thread, Object data) {
         }
     }
 
+    /**
+     * A Task for waiting on an object's monitor.
+     */
+    private static class WaitTask implements Task<Object, Long> {
+        long millis;
+        int nanos;
+
+        @Override
+        public Long run(ThreadContext context, Object data) throws InterruptedException {
+            long start = System.nanoTime();
+
+            synchronized (data) {
+                data.wait(millis, nanos);
+            }
+
+            return System.nanoTime() - start;
+        }
+
+        @Override
+        public void wakeup(RubyThread thread, Object data) {
+            synchronized (data) {
+                data.notify();
+            }
+        }
+    }
+
     @Deprecated(since = "9.0.0.0")
     public void executeBlockingTask(BlockingTask task) throws InterruptedException {
         try {
@@ -2400,31 +2533,17 @@ public void beforeBlockingCall(ThreadContext context) {
         enterSleep();
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public void beforeBlockingCall() {
-        beforeBlockingCall(metaClass.runtime.getCurrentContext());
-    }
-
     public void afterBlockingCall() {
         exitSleep();
         pollThreadEvents();
     }
 
+    /**
+     * @deprecated use {@link RubyThread#waitForObject(Object, double)} and siblings
+     */
+    @Deprecated(since = "10.1.0.0")
     public boolean wait_timeout(IRubyObject o, Double timeout) throws InterruptedException {
-        if ( timeout != null ) {
-            long delay_ns = (long)(timeout.doubleValue() * 1000000000.0);
-            long start_ns = System.nanoTime();
-            if (delay_ns > 0) {
-                long delay_ms = delay_ns / 1000000;
-                int delay_ns_remainder = (int)( delay_ns % 1000000 );
-                executeBlockingTask(new SleepTask(o, delay_ms, delay_ns_remainder));
-            }
-            long end_ns = System.nanoTime();
-            return ( end_ns - start_ns ) <= delay_ns;
-        } else {
-            executeBlockingTask(new SleepTask(o, 0, 0));
-            return true;
-        }
+        return waitForObject(o, timeout == null ? 0 : timeout.doubleValue());
     }
 
     public RubyThreadGroup getThreadGroup() {
diff --git a/core/src/main/java/org/jruby/RubyTime.java b/core/src/main/java/org/jruby/RubyTime.java
index 7445da1f7d6..989eb02bce7 100644
--- a/core/src/main/java/org/jruby/RubyTime.java
+++ b/core/src/main/java/org/jruby/RubyTime.java
@@ -52,7 +52,6 @@
 import org.jruby.exceptions.TypeError;
 import org.jruby.java.proxies.JavaProxy;
 import org.jruby.runtime.Arity;
-import org.jruby.runtime.Block;
 import org.jruby.runtime.Builtins;
 import org.jruby.runtime.ClassIndex;
 import org.jruby.runtime.Helpers;
@@ -60,11 +59,11 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.callsite.CachingCallSite;
 import org.jruby.util.ByteList;
 import org.jruby.util.RubyDateFormatter;
 import org.jruby.util.RubyTimeParser;
 import org.jruby.util.Sprintf;
+import org.jruby.util.TypeConverter;
 import org.jruby.util.time.TimeArgs;
 
 import java.io.Serializable;
@@ -101,7 +100,6 @@
 import static org.jruby.runtime.Visibility.PRIVATE;
 import static org.jruby.runtime.invokedynamic.MethodNames.OP_CMP;
 import static org.jruby.util.RubyStringBuilder.str;
-import static org.jruby.util.TypeConverter.typeAsString;
 
 /** The Time class.
  *
@@ -114,6 +112,7 @@ public class RubyTime extends RubyObject {
     private static final BigDecimal ONE_MILLION_BD = BigDecimal.valueOf(1000000);
     private static final BigDecimal ONE_BILLION_BD = BigDecimal.valueOf(1000000000);
     public static final int TIME_SCALE = 1_000_000_000;
+    public static final BigInteger TIME_SCALE_BI = BigInteger.valueOf(TIME_SCALE);
     public static final int TIME_SCALE_DIGITS = 9;
 
     private DateTime dt;
@@ -164,11 +163,11 @@ public static String getEnvTimeZone(ThreadContext context) {
         }
         
         RubyHash.RubyHashEntry entry = context.runtime.getENV().getEntry(tz);
-        if (entry.key == null || entry.key == NEVER) return null; // NO_ENTRY
+        if (entry.key() == null || entry.key() == NEVER) return null; // NO_ENTRY
 
-        if (entry.key != tz) context.runtime.tzVar = (RubyString) entry.key;
+        if (entry.key() != tz) context.runtime.tzVar = (RubyString) entry.key();
 
-        return (entry.value instanceof RubyString) ? entry.value.asJavaString() : null;
+        return (entry.value() instanceof RubyString) ? entry.value().asJavaString() : null;
     }
 
     @Deprecated(since = "10.0.0.0")
@@ -547,14 +546,6 @@ public void setZoneObject(IRubyObject zone) {
         this.zone = zone;
     }
 
-    /**
-     * Use {@link #setDateTime(DateTime)} instead.
-     */
-    @Deprecated(since = "9.2.0.0")
-    public void updateCal(DateTime dt) {
-        this.dt = dt;
-    }
-
     public static RubyTime newTime(Ruby runtime, long milliseconds) {
         return newTime(runtime, new DateTime(milliseconds));
     }
@@ -700,11 +691,6 @@ else if (dtz == DateTimeZone.UTC) {
         return ((RubyTime) dup()).adjustTimeZone(context, dtz, false);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public RubyString strftime(IRubyObject format) {
-        return strftime(getRuntime().getCurrentContext(), format);
-    }
-
     @JRubyMethod
     public RubyString strftime(ThreadContext context, IRubyObject format) {
         final RubyDateFormatter rdf = context.getRubyDateFormatter();
@@ -775,7 +761,7 @@ public RubyString xmlschema(ThreadContext context, IRubyObject[] args) {
             pos = fillDigitsAfterChar(buf, pos, ':', offset % 60, 2, 10);
         }
 
-        return newString(context, new ByteList(buf, false));
+        return newString(context, new ByteList(buf, USASCIIEncoding.INSTANCE, false));
     }
 
     private static int fillDigits(byte[] buf, int begin, int number, int size, int divisor) {
@@ -1273,11 +1259,6 @@ public RubyBoolean saturday_p(ThreadContext context) {
         return asBoolean(context, (dt.getDayOfWeek() % 7) == 6);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject subsec() {
-        return subsec(getRuntime().getCurrentContext());
-    }
-
     @JRubyMethod
     public RubyNumeric subsec(final ThreadContext context) {
         long nanosec = dt.getMillisOfSecond() * 1_000_000 + this.nsec;
@@ -1415,18 +1396,6 @@ public RubyString dump(final ThreadContext context, final IRubyObject arg) {
         return dump(context);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public RubyString dump(IRubyObject[] args, Block unusedBlock) {
-        RubyString str = (RubyString) mdump();
-        str.syncVariables(this);
-        return str;
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public RubyObject mdump() {
-        return mdump(getCurrentContext());
-    }
-
     private RubyString mdump(ThreadContext context) {
         DateTime dateTime = dt.toDateTime(DateTimeZone.UTC);
         byte dumpValue[] = new byte[8];
@@ -1545,25 +1514,6 @@ private int getNdigits(ThreadContext context, IRubyObject[] args) {
 
     /* Time class methods */
 
-    /**
-     * @deprecated Use {@link #newInstance(ThreadContext, IRubyObject, IRubyObject[])}
-     */
-    @Deprecated(since = "9.2.0.0")
-    public static IRubyObject s_new(IRubyObject recv, IRubyObject[] args, Block block) {
-        Ruby runtime = recv.getRuntime();
-        RubyTime time = new RubyTime(runtime, (RubyClass) recv, new DateTime(getLocalTimeZone(runtime.getCurrentContext())));
-        time.callInit(args, block);
-        return time;
-    }
-
-    /**
-     * @deprecated Use {@link #newInstance(ThreadContext, IRubyObject, IRubyObject[])}
-     */
-    @Deprecated(since = "1.1.3")
-    public static IRubyObject newInstance(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
-        return newInstance(context, recv, args);
-    }
-
     @JRubyMethod(name = "now", meta = true, optional = 1, checkArity = false, keywords = true)
     public static RubyTime newInstance(ThreadContext context, IRubyObject recv, IRubyObject args[]) {
         int argc = Arity.checkArgumentCount(context, args, 0, 1);
@@ -1996,12 +1946,6 @@ private static RubyTime allocateInstance(ThreadContext context, RubyClass recv)
         return (RubyTime) recv.allocate(context);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static RubyTime load(IRubyObject recv, IRubyObject from, Block block) {
-        var context = recv.getRuntime().getCurrentContext();
-        return s_mload(context, allocateInstance(context, (RubyClass) recv), from);
-    }
-
     @JRubyMethod(name = "_load", meta = true)
     public static RubyTime load(ThreadContext context, IRubyObject recv, IRubyObject from) {
         return s_mload(context, allocateInstance(context, (RubyClass) recv), from);
@@ -2161,28 +2105,32 @@ public static double convertTimeInterval(ThreadContext context, IRubyObject sec)
 
         // NOTE: we can probably do better here, but we're matching MRI behavior
         // this is for converting custom objects such as ActiveSupport::Duration
-        else if ( sites(context).respond_to_divmod.respondsTo(context, sec, sec) ) {
-            IRubyObject result = sites(context).divmod.call(context, sec, sec, 1);
-            if (!(result instanceof RubyArray arr)) throw typeError(context, "unexpected divmod result: into ", result, "");
+        else {
+            IRubyObject ary = Helpers.invokeChecked(context, sec, sites(context).divmod_checked, RubyFixnum.one(context.runtime));
+            RubyArray arr;
+            if (ary != null && !(ary = TypeConverter.checkArrayType(context, sites(context).to_a_checked, ary)).isNil()) {
+                arr = (RubyArray) ary;
+                seconds = ((RubyNumeric) arr.eltOk(0)).asDouble(context) + // div
+                        ((RubyNumeric) arr.eltOk(1)).asDouble(context); // mod
+            } else {
+                boolean raise = true;
+                seconds = 0;
+
+                if (sec instanceof JavaProxy) {
+                    try { // support java.lang.Number proxies
+                        seconds = sec.convertToFloat().value;
+                        raise = false;
+                    } catch (TypeError ex) { /* fallback bellow to raising a TypeError */ }
+                }
 
-            seconds = ((RubyNumeric) arr.eltOk(0)).asDouble(context) + // div
-                    ((RubyNumeric) arr.eltOk(1)).asDouble(context); // mod
-        } else {
-            boolean raise = true;
-            seconds = 0;
-
-            if (sec instanceof JavaProxy) {
-                try { // support java.lang.Number proxies
-                    seconds = sec.convertToFloat().value;
-                    raise = false;
-                } catch (TypeError ex) { /* fallback bellow to raising a TypeError */ }
+                if (raise) throw typeError(context, "can't convert ", sec, " into time interval");
             }
-
-            if (raise) throw typeError(context, "can't convert ", sec, " into time interval");
         }
 
         if (seconds < 0) throw argumentError(context,"time interval must not be negative");
 
+        if (Double.isNaN(seconds)) throw rangeError(context, seconds + " out of Time range");
+
         return seconds;
     }
 
diff --git a/core/src/main/java/org/jruby/anno/JRubyMethod.java b/core/src/main/java/org/jruby/anno/JRubyMethod.java
index 7078e47755f..a346be4dc82 100644
--- a/core/src/main/java/org/jruby/anno/JRubyMethod.java
+++ b/core/src/main/java/org/jruby/anno/JRubyMethod.java
@@ -118,10 +118,4 @@
      * A list of classes that implement an abstract JRubyMethod, for backtrace purposes.
      */
     Class[] implementers() default {};
-
-    @Deprecated(since = "9.2.0.0")
-    boolean scope() default false;
-
-    @Deprecated(since = "9.2.0.0")
-    boolean backtrace() default false;
 }
diff --git a/core/src/main/java/org/jruby/anno/JavaMethodDescriptor.java b/core/src/main/java/org/jruby/anno/JavaMethodDescriptor.java
index 6d72c476cf8..17334362f51 100644
--- a/core/src/main/java/org/jruby/anno/JavaMethodDescriptor.java
+++ b/core/src/main/java/org/jruby/anno/JavaMethodDescriptor.java
@@ -39,10 +39,7 @@ public class JavaMethodDescriptor extends MethodDescriptor<Method> {
     public final Class[] parameters;
     public final Class returnClass;
     public final Class declaringClass;
-    @Deprecated(since = "9.2.0.0") // no longer used
-    public String signature;
-    @Deprecated(since = "9.2.0.0") // initialized on demand
-    public Class[] argumentTypes;
+    private Class[] argumentTypes;
 
     public JavaMethodDescriptor(Method method) {
         super(method);
diff --git a/core/src/main/java/org/jruby/api/Check.java b/core/src/main/java/org/jruby/api/Check.java
index 08ffd42fadf..d3406d53841 100644
--- a/core/src/main/java/org/jruby/api/Check.java
+++ b/core/src/main/java/org/jruby/api/Check.java
@@ -27,7 +27,7 @@ public static RubyString checkEmbeddedNulls(ThreadContext context, IRubyObject o
 
         if (checked[0] == null) {
             throw argumentError(context, (boolean)checked[1] ?
-                "string contains null char" : "string contains null byte");
+                "path name contains null char" : "path name contains null byte");
         }
 
         return (RubyString) checked[0];
diff --git a/core/src/main/java/org/jruby/api/Convert.java b/core/src/main/java/org/jruby/api/Convert.java
index 5eb4d7139dd..c4dc5f817e7 100644
--- a/core/src/main/java/org/jruby/api/Convert.java
+++ b/core/src/main/java/org/jruby/api/Convert.java
@@ -40,6 +40,7 @@
 import static org.jruby.api.Error.floatDomainError;
 import static org.jruby.api.Error.rangeError;
 import static org.jruby.api.Error.typeError;
+import static org.jruby.util.TypeConverter.convertToType;
 import static org.jruby.util.TypeConverter.convertToTypeWithCheck;
 import static org.jruby.util.TypeConverter.sites;
 
@@ -507,19 +508,110 @@ public static byte toByte(ThreadContext context, IRubyObject arg) {
     /**
      * Safely convert a Ruby Numeric into a java double value.  Raising if the value will not fit.
      * @param context the current thread context
-     * @param arg the Object to convert
+     * @param val the Object to convert
      * @return the value
      */
-    public static double toDouble(ThreadContext context, IRubyObject arg) {
-        return switch (arg) {
-            case RubyFloat flote -> flote.getValue();
-            case RubyInteger integer when Builtins.checkIntegerToF(context) -> integer.asDouble(context);
-            case RubyRational rational when Builtins.checkRationalToF(context) -> rational.asDouble(context);
-            case RubyString a -> throw typeError(context, "no implicit conversion to float from string");
-            case RubyNil a -> throw typeError(context, "no implicit conversion to float from nil");
-            case RubyBoolean a -> throw typeError(context, "no implicit conversion to float from " + (arg.isTrue() ? "true" : "false"));
-            default -> ((RubyFloat) TypeConverter.convertToType(arg, floatClass(context), "to_f")).getValue();
-        };
+    public static double toDouble(ThreadContext context, IRubyObject val) {
+        if (isSpecialConst(context, val)) {
+            switch (val) {
+                case RubyFixnum fixnum when Builtins.checkIntegerToF(context):
+                    return fixnum.asDouble(context);
+                case RubyFloat flote:
+                    return flote.getValue();
+                default:
+                    implicitConversionToFloat(context, val);
+            }
+        } else {
+            switch (val) {
+                case RubyFloat flote:
+                    return flote.getValue();
+                case RubyInteger integer when Builtins.checkIntegerToF(context):
+                    return integer.asDouble(context);
+                case RubyRational rational when Builtins.checkRationalToF(context):
+                    return rational.asDouble(context);
+                case RubyString a:
+                    throw typeError(context, "no implicit conversion to float from string");
+                default:
+                    // slow path below
+            }
+        }
+        return ((RubyFloat) TypeConverter.convertToType(val, floatClass(context), "to_f")).getValue();
+    }
+
+    // MRI: rb_num_to_dbl and Get_Double
+    /**
+     * Convert value to a double with appropriate optimizations and type checks.
+     *
+     * @param context the current thread context
+     * @param val the Object to convert
+     * @return the value
+     */
+    public static double numToDouble(ThreadContext context, IRubyObject val) {
+        if (isSpecialConst(context, val)) {
+            switch (val) {
+                case RubyFixnum fixnum:
+                    if (Builtins.checkIntegerToF(context)) {
+                        return fixnum.asDouble(context);
+                    }
+                    break;
+                case RubyFloat flote:
+                    return flote.getValue();
+                default:
+                    conversionToFloat(context, val);
+            }
+        } else {
+            switch (val) {
+                case RubyFloat flote:
+                    return flote.getValue();
+                case RubyInteger fixnum:
+                    if (Builtins.checkIntegerToF(context)) {
+                        return fixnum.asDouble(context);
+                    }
+                    break;
+                case RubyRational rational:
+                    if (Builtins.checkRationalToF(context))
+                        return rational.asDouble(context);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return numericToFloat(context, val).getValue();
+    }
+
+    // MRI: SPECIAL_CONST_P, used to identify false and immediate values nil, true, fixnums, flonums, and symbols
+    private static boolean isSpecialConst(ThreadContext context, IRubyObject val) {
+        return val == context.fals || val.isImmediate();
+    }
+
+    // MRI: conversion_to_float
+    private static void conversionToFloat(ThreadContext context, IRubyObject val) {
+        specialConstToFloat(context, val, "can't convert ", " into Float");
+    }
+
+    // MRI: implicit_conversion_to_float
+    private static void implicitConversionToFloat(ThreadContext context, IRubyObject val) {
+        specialConstToFloat(context, val, "no implicit conversion to float from ", "");
+    }
+
+    private static void specialConstToFloat(ThreadContext context, IRubyObject val, String pre, String post) {
+        switch (val) {
+            case RubyNil nil:
+                throw typeError(context, pre + "nil" + post);
+            case RubyBoolean.True tru:
+                throw typeError(context, pre + "true" + post);
+            case RubyBoolean.False fals:
+                throw typeError(context, pre + "false" + post);
+            default:
+        }
+    }
+
+    private static RubyFloat numericToFloat(ThreadContext context, IRubyObject val) {
+        if (!(val instanceof RubyNumeric)) {
+            throw typeError(context, "can't convert " + val.getMetaClass() + " into Float");
+        }
+        return (RubyFloat) convertToTypeWithCheck(context, val, context.runtime.getFloat(), sites(context).to_f_checked);
     }
 
     // MRI: rb_num2long and FIX2LONG (numeric.c)
@@ -538,6 +630,15 @@ public static long toLong(ThreadContext context, IRubyObject arg) {
         };
     }
 
+    public static BigInteger toLongLong(ThreadContext context, IRubyObject arg) {
+        return switch (arg) {
+            case RubyFixnum fixnum -> BigInteger.valueOf(fixnum.getValue());
+            case RubyFloat flote -> BigInteger.valueOf(toLong(context, flote));
+            case RubyBignum bignum -> bignum.getValue();
+            default -> toLongLongOther(context, arg);
+        };
+    }
+
     public static long toLong(ThreadContext context, RubyBignum value) {
         BigInteger big = value.getValue();
 
@@ -551,7 +652,7 @@ public static long toLong(ThreadContext context, RubyBignum value) {
     public static long toLong(ThreadContext context, RubyFloat value) {
         final double aFloat = value.getValue();
 
-        if (aFloat <= (double) Long.MAX_VALUE && aFloat >= (double) Long.MIN_VALUE) {
+        if (aFloat < (double) Long.MAX_VALUE && aFloat >= (double) Long.MIN_VALUE) {
             return (long) aFloat;
         }
 
@@ -565,6 +666,12 @@ private static long toLongOther(ThreadContext context, IRubyObject arg) {
         return toLong(context, TypeConverter.convertToType(arg, integerClass(context), "to_int"));
     }
 
+    private static BigInteger toLongLongOther(ThreadContext context, IRubyObject arg) {
+        if (arg.isNil()) throw typeError(context, "no implicit conversion from nil to integer");
+
+        return toLongLong(context, TypeConverter.convertToType(arg, integerClass(context), "to_int"));
+    }
+
     /**
      * Safely convert a Ruby Numeric into a java long value.  Raising if the value will not fit.
      * @param context the current thread context
@@ -585,7 +692,7 @@ public static int toInt(ThreadContext context, IRubyObject arg) {
     public static long toInt(ThreadContext context, RubyFloat value) {
         final double aFloat = value.getValue();
 
-        if (aFloat <= (double) Long.MAX_VALUE && aFloat >= (double) Long.MIN_VALUE) {
+        if (aFloat < (double) Long.MAX_VALUE && aFloat >= (double) Long.MIN_VALUE) {
             return (long) aFloat;
         }
 
diff --git a/core/src/main/java/org/jruby/api/Create.java b/core/src/main/java/org/jruby/api/Create.java
index 50b1e049047..3d0659cd6e7 100644
--- a/core/src/main/java/org/jruby/api/Create.java
+++ b/core/src/main/java/org/jruby/api/Create.java
@@ -45,6 +45,11 @@ public static RubyArray<?> allocArray(ThreadContext context, int length) {
         return RubyArray.newArray(context, length);
     }
 
+    public static RubyArrayNative<?> allocNativeArray(ThreadContext context, int length) {
+        // note: this cannot be newBlankArray because packed arrays only exist fully populated.
+        return RubyArrayNative.newArray(context, length);
+    }
+
     /**
      * Create an empty array with a specific allocated size.  This should be used to
      * make an array where you think you know how big the array will be and you plan on
@@ -67,6 +72,10 @@ public static RubyArray<?> allocArray(ThreadContext context, long length) {
         return allocArray(context, checkLength(context, length));
     }
 
+    public static RubyArrayNative<?> allocNativeArray(ThreadContext context, long length) {
+        // note: this cannot be newBlankArray because packed arrays only exist fully populated.
+        return allocNativeArray(context, checkLength(context, length));
+    }
 
     /**
      * Create a new array with a single element.
@@ -196,7 +205,7 @@ public static RubyArray<?> newArray(ThreadContext context, Collection<? extends
      */
     // MRI: rb_hash_new
     public static RubyHash newHash(ThreadContext context) {
-        return new RubyHash(context.runtime);
+        return RubyHashLinkedBuckets.newLBHash(context.runtime);
     }
 
     /**
@@ -224,7 +233,7 @@ public static RubyHash newEmptyHash(ThreadContext context) {
      */
     // MRI: rb_hash_new
     public static RubyHash newSmallHash(ThreadContext context) {
-        return new RubyHash(context.runtime, 1);
+        return RubyHashLinkedBuckets.newLBHash(context.runtime, 1);
     }
 
     /**
@@ -237,7 +246,7 @@ public static RubyHash newSmallHash(ThreadContext context) {
      */
     // MRI: rb_hash_new
     public static RubyHash newSmallHash(ThreadContext context, IRubyObject key, IRubyObject value) {
-        RubyHash hash = new RubyHash(context.runtime, 1);
+        RubyHash hash = RubyHashLinkedBuckets.newLBHash(context.runtime, 1);
         hash.fastASetSmall(context.runtime, key, value, true);
         return hash;
     }
diff --git a/core/src/main/java/org/jruby/api/Define.java b/core/src/main/java/org/jruby/api/Define.java
index 71674178cf8..2d286704287 100644
--- a/core/src/main/java/org/jruby/api/Define.java
+++ b/core/src/main/java/org/jruby/api/Define.java
@@ -42,6 +42,20 @@ public static RubyModule defineModule(ThreadContext context, String name) {
         return context.runtime.defineModuleUnder(context, name, objectClass(context));
     }
 
+    /**
+     * Define a new module under the given namespace. Roughly equivalent to
+     * rb_define_module_under in MRI.  Note: If a module already exists for this name
+     * it returns it or errors if it is not a Module at all.
+     *
+     * @param context the current context
+     * @param parent the parent module
+     * @param name The name of the new module
+     * @return The new module or existing one if it has already been defined.
+     */
+    public static RubyModule defineModuleUnder(ThreadContext context, RubyModule parent, String name) {
+        return context.runtime.defineModuleUnder(context, name, parent);
+    }
+
     /**
      * There are times when an anonymous module is needed.  It is up to the caller
      * to set it up as a constant or include methods or whatever else is needed.
diff --git a/core/src/main/java/org/jruby/api/Error.java b/core/src/main/java/org/jruby/api/Error.java
index 48cc9483e14..9f9cc849093 100644
--- a/core/src/main/java/org/jruby/api/Error.java
+++ b/core/src/main/java/org/jruby/api/Error.java
@@ -6,6 +6,7 @@
 import org.jruby.RubyModule;
 import org.jruby.exceptions.ArgumentError;
 import org.jruby.exceptions.EOFError;
+import org.jruby.exceptions.EncodingError;
 import org.jruby.exceptions.IOError;
 import org.jruby.exceptions.NotImplementedError;
 import org.jruby.exceptions.RaiseException;
@@ -276,4 +277,8 @@ private static IRubyObject typeFor(Ruby runtime, IRubyObject object) {
     public static EOFError eofError(ThreadContext context, String message) {
         return (EOFError) context.runtime.newEOFError(message);
     }
+
+    public static EncodingError.CompatibilityError encodingCompatibilityError(ThreadContext context, String s) {
+        return (EncodingError.CompatibilityError) context.runtime.newEncodingCompatibilityError(s);
+    }
 }
diff --git a/core/src/main/java/org/jruby/ast/ArgumentNode.java b/core/src/main/java/org/jruby/ast/ArgumentNode.java
index a84a45acc19..85bff2e452c 100644
--- a/core/src/main/java/org/jruby/ast/ArgumentNode.java
+++ b/core/src/main/java/org/jruby/ast/ArgumentNode.java
@@ -43,12 +43,18 @@
 public class ArgumentNode extends Node implements INameNode {
     private final RubySymbol identifier;
     private final int location;
+    private final boolean implicit;
 
     public ArgumentNode(int line, RubySymbol identifier, int location) {
+        this(line, identifier, location, false);
+    }
+
+    public ArgumentNode(int line, RubySymbol identifier, int location, boolean implicit) {
         super(line, false);
 
         this.identifier = identifier;
         this.location = location; // All variables should be depth 0 in this case
+        this.implicit = implicit;
     }
 
     public NodeType getNodeType() {
@@ -86,4 +92,8 @@ public RubySymbol getName() {
     public List<Node> childNodes() {
         return EMPTY_LIST;
     }
+
+    public boolean isImplicit() {
+        return implicit;
+    }
 }
diff --git a/core/src/main/java/org/jruby/ast/ClassVarDeclNode.java b/core/src/main/java/org/jruby/ast/ClassVarDeclNode.java
deleted file mode 100644
index 2850d35f3ff..00000000000
--- a/core/src/main/java/org/jruby/ast/ClassVarDeclNode.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- ***** BEGIN LICENSE BLOCK *****
- * Version: EPL 2.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2002 Benoit Cerrina <b.cerrina@wanadoo.fr>
- * Copyright (C) 2002 Jan Arne Petersen <jpetersen@uni-bonn.de>
- * Copyright (C) 2004 Anders Bengtsson <ndrsbngtssn@yahoo.se>
- * Copyright (C) 2004 Thomas E Enebo <enebo@acm.org>
- * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby.ast;
-
-import java.util.List;
-
-import org.jruby.RubySymbol;
-import org.jruby.ast.types.INameNode;
-import org.jruby.ast.visitor.NodeVisitor;
-
-/**
- * Class variable declaration.
- */
-@Deprecated(since = "9.2.0.0")
-public class ClassVarDeclNode extends AssignableNode implements INameNode {
-    private final RubySymbol name;
-
-    public ClassVarDeclNode(int line, RubySymbol name, Node valueNode) {
-        super(line, valueNode, valueNode != null && valueNode.containsVariableAssignment());
-
-        this.name = name;
-    }
-
-    public NodeType getNodeType() {
-        return NodeType.CLASSVARDECLNODE;
-    }
-    
-    /**
-     * Accept for the visitor pattern.
-     * @param iVisitor the visitor
-     **/
-    public <T> T accept(NodeVisitor<T> iVisitor) {
-        return iVisitor.visitClassVarDeclNode(this);
-    }
-
-    /**
-     * Gets the name.
-     * @return Returns a String
-     */
-    public RubySymbol getName() {
-        return name;
-    }
-    
-    public List<Node> childNodes() {
-        return createList(getValueNode());
-    }
-
-    @Override
-    public boolean needsDefinitionCheck() {
-        return false;
-    }
-}
diff --git a/core/src/main/java/org/jruby/ast/ListNode.java b/core/src/main/java/org/jruby/ast/ListNode.java
index a9e09f88b3e..455b9ce0d5e 100644
--- a/core/src/main/java/org/jruby/ast/ListNode.java
+++ b/core/src/main/java/org/jruby/ast/ListNode.java
@@ -228,6 +228,7 @@ public Node[] children() {
         return properList;
     }
 
+    // Note: deprecated but no replacement and can't be deleted without deprecating super method
     @Deprecated(since = "9.0.0.0")
     public List<Node> childNodes() {
         Node single = this.single;
diff --git a/core/src/main/java/org/jruby/ast/NewlineNode.java b/core/src/main/java/org/jruby/ast/NewlineNode.java
deleted file mode 100644
index 59b68c104c4..00000000000
--- a/core/src/main/java/org/jruby/ast/NewlineNode.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- ***** BEGIN LICENSE BLOCK *****
- * Version: EPL 2.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2001-2002 Jan Arne Petersen <jpetersen@uni-bonn.de>
- * Copyright (C) 2001-2002 Benoit Cerrina <b.cerrina@wanadoo.fr>
- * Copyright (C) 2002 Anders Bengtsson <ndrsbngtssn@yahoo.se>
- * Copyright (C) 2004 Thomas E Enebo <enebo@acm.org>
- * Copyright (C) 2004 Charles O Nutter <headius@headius.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby.ast;
-
-import java.util.List;
-
-import org.jruby.ast.visitor.NodeVisitor;
-
-/**
- * Note: This is a dead class but we leave it because people write against Visitor
- * and we do not want those consumers to break.
- * A new (logical) source code line.
- * This is used to change the value of the ruby interpreter source and line values.
- * There is one such node for each logical line.  Logical line differs
- * from physical line in that a ';' can be used to make several logical
- * line out of a physical line and a physical line if it is in a comment
- * or in a string does not necessarily correspond to a physical line.
- * This is normally a wrapper around another more significant node.
- * The parser generates such a node around each separate statement.  
- */
-public class NewlineNode extends Node {
-    private final Node nextNode;
-
-    @Deprecated(since = "9.0.1.0")
-    public NewlineNode(int line, Node nextNode) {
-        super(line, nextNode.containsVariableAssignment());
-
-        this.nextNode = nextNode;
-    }
-
-    public NodeType getNodeType() {
-        return NodeType.NEWLINENODE;
-    }
-
-    /**
-     * RubyMethod used by visitors.
-     * accepts the visitor
-     * @param iVisitor the visitor to accept
-     **/
-    public <T> T accept(NodeVisitor<T> iVisitor) {
-        return iVisitor.visitNewlineNode(this);
-    }
-
-    /**
-     * Gets the nextNode.
-     * @return Returns a Node
-     */
-    public Node getNextNode() {
-        return nextNode;
-    }
-    
-    public List<Node> childNodes() {
-        return createList(nextNode);
-    }
-}
diff --git a/core/src/main/java/org/jruby/ast/executable/AbstractScript.java b/core/src/main/java/org/jruby/ast/executable/AbstractScript.java
index 4bf8c670d2c..d5acc14f86d 100644
--- a/core/src/main/java/org/jruby/ast/executable/AbstractScript.java
+++ b/core/src/main/java/org/jruby/ast/executable/AbstractScript.java
@@ -44,11 +44,6 @@ public IRubyObject __file__(ThreadContext context, IRubyObject self, IRubyObject
         return __file__(context, self, new IRubyObject[] {arg1, arg2, arg3}, block);
     }
     
-    @Deprecated(since = "1.7.0")
-    public IRubyObject load(ThreadContext context, IRubyObject self, IRubyObject[] args, Block block) {
-        return load(context, self, false);
-    }
-    
     public IRubyObject load(ThreadContext context, IRubyObject self, boolean wrap) {
         return null;
     }
diff --git a/core/src/main/java/org/jruby/ast/executable/Script.java b/core/src/main/java/org/jruby/ast/executable/Script.java
index 861676e8be4..dccbb17fd5d 100644
--- a/core/src/main/java/org/jruby/ast/executable/Script.java
+++ b/core/src/main/java/org/jruby/ast/executable/Script.java
@@ -13,8 +13,6 @@ public interface Script {
     public IRubyObject __file__(ThreadContext context, IRubyObject self, IRubyObject[] args, Block block);
     
     public IRubyObject run(ThreadContext context, IRubyObject self, IRubyObject[] args, Block block);
-    @Deprecated(since = "1.7.0")
-    public IRubyObject load(ThreadContext context, IRubyObject self, IRubyObject[] args, Block block);
     public IRubyObject load(ThreadContext context, IRubyObject self, boolean wrap);
     public void setFilename(String filename);
     public void setRootScope(StaticScope scope);
diff --git a/core/src/main/java/org/jruby/ast/visitor/AbstractNodeVisitor.java b/core/src/main/java/org/jruby/ast/visitor/AbstractNodeVisitor.java
index 015cad3b5e1..55f7db66339 100644
--- a/core/src/main/java/org/jruby/ast/visitor/AbstractNodeVisitor.java
+++ b/core/src/main/java/org/jruby/ast/visitor/AbstractNodeVisitor.java
@@ -401,11 +401,6 @@ public T visitModuleNode(ModuleNode node) {
         return defaultVisit(node);
     }
 
-    @Override
-    public T visitNewlineNode(NewlineNode node) {
-        return defaultVisit(node);
-    }
-
     @Override
     public T visitNilRestArgNode(NilRestArgNode node) {
         return defaultVisit(node);
@@ -631,10 +626,4 @@ public T visitOther(Node node) {
         return defaultVisit(node);
     }
 
-    @Override
-    @Deprecated(since = "9.2.0.0")
-    public T visitClassVarDeclNode(ClassVarDeclNode node) {
-        return defaultVisit(node);
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/ast/visitor/InstanceVariableFinder.java b/core/src/main/java/org/jruby/ast/visitor/InstanceVariableFinder.java
index c5cb8ff10c7..e1dc0d31c1e 100644
--- a/core/src/main/java/org/jruby/ast/visitor/InstanceVariableFinder.java
+++ b/core/src/main/java/org/jruby/ast/visitor/InstanceVariableFinder.java
@@ -31,7 +31,7 @@
  *
  * @deprecated See {@link RubyModule#discoverInstanceVariables()} for the working version
  */
-@Deprecated
+@Deprecated(since = "10.0.3.0")
 public class InstanceVariableFinder extends AbstractNodeVisitor<Void> {
 
     @Override
diff --git a/core/src/main/java/org/jruby/ast/visitor/NodeVisitor.java b/core/src/main/java/org/jruby/ast/visitor/NodeVisitor.java
index e63b3b53c33..c1d5170cc1e 100644
--- a/core/src/main/java/org/jruby/ast/visitor/NodeVisitor.java
+++ b/core/src/main/java/org/jruby/ast/visitor/NodeVisitor.java
@@ -111,7 +111,6 @@ public interface NodeVisitor<T> {
     T visitMatch3Node(Match3Node iVisited);
     T visitMatchNode(MatchNode iVisited);
     T visitModuleNode(ModuleNode iVisited);
-    T visitNewlineNode(NewlineNode iVisited);
     T visitNextNode(NextNode iVisited);
     T visitNilNode(NilNode iVisited);
     T visitNilRestArgNode(NilRestArgNode iVisited);
@@ -157,7 +156,4 @@ public interface NodeVisitor<T> {
     T visitZArrayNode(ZArrayNode iVisited);
     T visitZSuperNode(ZSuperNode iVisited);
     T visitOther(Node iVisited);
-
-    @Deprecated(since = "9.2.0.0")
-    default T visitClassVarDeclNode(ClassVarDeclNode iVisited) { return null; }
 }
diff --git a/core/src/main/java/org/jruby/common/NullWarnings.java b/core/src/main/java/org/jruby/common/NullWarnings.java
index 4e31c45527b..846ce3fdb67 100644
--- a/core/src/main/java/org/jruby/common/NullWarnings.java
+++ b/core/src/main/java/org/jruby/common/NullWarnings.java
@@ -53,13 +53,4 @@ public void warn(ID id, String fileName, String message) {}
     public void warn(ID id, String message) {}
     public void warning(ID id, String message) {}
     public void warning(ID id, String fileName, int lineNumber, String message) {}
-    
-    @Deprecated(since = "1.7.0")
-    public void warn(ID id, String message, Object... data) {}
-    @Deprecated(since = "1.7.0")
-    public void warning(ID id, String message, Object... data) {}
-    @Deprecated(since = "1.7.0")
-    public void warn(ID id, String fileName, int lineNumber, String message, Object... data) {}
-    @Deprecated(since = "1.7.0")
-    public void warning(ID id, String fileName, int lineNumber, String message, Object...data) {}
 }
diff --git a/core/src/main/java/org/jruby/common/RubyWarnings.java b/core/src/main/java/org/jruby/common/RubyWarnings.java
index 1b24ed624ba..235163b9fad 100644
--- a/core/src/main/java/org/jruby/common/RubyWarnings.java
+++ b/core/src/main/java/org/jruby/common/RubyWarnings.java
@@ -34,6 +34,7 @@
 
 import org.joni.WarnCallback;
 import org.jruby.Ruby;
+import org.jruby.RubyClass;
 import org.jruby.RubyHash;
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
@@ -41,6 +42,7 @@
 import org.jruby.anno.JRubyMethod;
 import org.jruby.ast.util.ArgsUtil;
 import org.jruby.runtime.JavaSites;
+import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.Signature;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.backtrace.RubyStackTraceElement;
@@ -60,6 +62,7 @@
 import static org.jruby.api.Create.newString;
 import static org.jruby.api.Define.defineModule;
 import static org.jruby.api.Error.argumentError;
+import static org.jruby.runtime.ThreadContext.hasKeywords;
 import static org.jruby.util.RubyStringBuilder.str;
 
 public class RubyWarnings implements IRubyWarnings, WarnCallback {
@@ -68,9 +71,11 @@ public class RubyWarnings implements IRubyWarnings, WarnCallback {
 
     private final Ruby runtime;
     private final Set<ID> oncelers = EnumSet.allOf(IRubyWarnings.ID.class);
+    private final RubyClass WarningBuffer;
 
-    public RubyWarnings(Ruby runtime) {
+    public RubyWarnings(Ruby runtime, RubyClass WarningBuffer) {
         this.runtime = runtime;
+        this.WarningBuffer = WarningBuffer;
     }
 
     public static RubyModule createWarningModule(ThreadContext context) {
@@ -81,6 +86,24 @@ public static RubyModule createWarningModule(ThreadContext context) {
         return Warning;
     }
 
+    public static RubyClass createWarningBufferClass(ThreadContext context, RubyModule Warning) {
+        return Warning.defineClassUnder(context, "buffer", stringClass(context), ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR)
+                .defineMethods(context, Buffer.class);
+    }
+
+    public static class Buffer {
+        @JRubyMethod(rest = true)
+        public static IRubyObject write(ThreadContext context, IRubyObject buf, IRubyObject[] args) {
+            RubyString string = buf.convertToString();
+            for (var arg : args) string.append(arg);
+            return buf;
+        }
+    }
+
+    public RubyClass getWarningBuffer() {
+        return WarningBuffer;
+    }
+
     @Override
     public void warn(String message) {
         warn(ID.MISCELLANEOUS, message);
@@ -339,7 +362,7 @@ public static IRubyObject warn(ThreadContext context, IRubyObject recv, IRubyObj
 
     @JRubyMethod(keywords = true)
     public static IRubyObject warn(ThreadContext context, IRubyObject recv, IRubyObject arg0, IRubyObject arg1) {
-        if ((ThreadContext.resetCallInfo(context) & ThreadContext.CALL_KEYWORD) == 0) {
+        if (!hasKeywords(ThreadContext.resetCallInfo(context))) {
             throw argumentError(context, 2, 1);
         }
 
diff --git a/core/src/main/java/org/jruby/compiler/Compilable.java b/core/src/main/java/org/jruby/compiler/Compilable.java
index bdc821530a8..48c72bf61aa 100644
--- a/core/src/main/java/org/jruby/compiler/Compilable.java
+++ b/core/src/main/java/org/jruby/compiler/Compilable.java
@@ -81,11 +81,6 @@ default String getOwnerName(ThreadContext context) {
 
     public RubyModule getImplementationClass();
 
-    @Deprecated(since = "9.2.9.0")
-    default String getClassName(ThreadContext context) {
-        return getOwnerName(context);
-    }
-
     /**
      * Resolve the fully qualified name.
      * @param implementationClass
diff --git a/core/src/main/java/org/jruby/compiler/impl/SkinnyMethodAdapter.java b/core/src/main/java/org/jruby/compiler/impl/SkinnyMethodAdapter.java
index a1ab4107376..852b6fb2e30 100644
--- a/core/src/main/java/org/jruby/compiler/impl/SkinnyMethodAdapter.java
+++ b/core/src/main/java/org/jruby/compiler/impl/SkinnyMethodAdapter.java
@@ -968,18 +968,6 @@ public void visitFieldInsn(int arg0, String arg1, String arg2, String arg3) {
         getMethodVisitor().visitFieldInsn(arg0, arg1, arg2, arg3);
     }
 
-    @Override
-    @Deprecated(since = "9.1.6.0")
-    public void visitMethodInsn(int arg0, String arg1, String arg2, String arg3) {
-        getMethodVisitor().visitMethodInsn(arg0, arg1, arg2, arg3);
-    }
-
-    @Override
-    @Deprecated(since = "9.1.6.0")
-    public void visitMethodInsn(int arg0, String arg1, String arg2, String arg3, boolean arg4) {
-        getMethodVisitor().visitMethodInsn(arg0, arg1, arg2, arg3, arg4);
-    }
-    
     @Override
     public void visitInvokeDynamicInsn(String arg0, String arg1, Handle arg2, Object... arg3) {
         getMethodVisitor().visitInvokeDynamicInsn(arg0, arg1, arg2, arg3);
diff --git a/core/src/main/java/org/jruby/embed/EmbedEvalUnit.java b/core/src/main/java/org/jruby/embed/EmbedEvalUnit.java
index 3f6917fcb0d..759f72a3404 100644
--- a/core/src/main/java/org/jruby/embed/EmbedEvalUnit.java
+++ b/core/src/main/java/org/jruby/embed/EmbedEvalUnit.java
@@ -56,9 +56,4 @@ public interface EmbedEvalUnit extends JavaEmbedUtils.EvalUnit {
      * @return scope to refer local variables.
      */
     DynamicScope getLocalVarScope();
-
-    @Deprecated(since = "9.3.0.0")
-    default ManyVarsDynamicScope getScope() {
-        return (ManyVarsDynamicScope) getLocalVarScope();
-    }
 }
diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
index 52201c1436f..b555003ddb8 100644
--- a/core/src/main/java/org/jruby/embed/ScriptingContainer.java
+++ b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
@@ -476,8 +476,9 @@ public void setCompileMode(CompileMode mode) {
      *
      * @return true if Ruby is configured to run in a process, otherwise, false.
      */
+    @Deprecated(since = "10.1.0.0")
     public boolean isRunRubyInProcess() {
-        return provider.getRubyInstanceConfig().isRunRubyInProcess();
+        return false;
     }
 
     /**
@@ -491,8 +492,9 @@ public boolean isRunRubyInProcess() {
      * @param inprocess true when Ruby is set to run in the process, or false not to
      * run in the process.
      */
+    @Deprecated(since = "10.1.0.0")
     public void setRunRubyInProcess(boolean inprocess) {
-        provider.getRubyInstanceConfig().setRunRubyInProcess(inprocess);
+
     }
 
     /**
@@ -706,29 +708,6 @@ public ProfilingMode getProfilingMode() {
         return provider.getRubyInstanceConfig().getProfilingMode();
     }
 
-    /**
-     * Changes a ProfilingMode to a given one. The default value is Profiling.OFF.
-     * Call this method before you use put/get, runScriptlet, and parse methods so that
-     * initial configurations will work.
-     *
-     * ProfilingMode allows you to change profiling style.
-     *
-     * Profiling.OFF - default. profiling off.
-     * Profiling.API - activates Ruby profiler API. equivalent to --profile.api command line option
-     * Profiling.FLAT - synonym for --profile command line option equivalent to --profile.flat command line option
-     * Profiling.GRAPH - runs with instrumented (timed) profiling, graph format. equivalent to --profile.graph command line option.
-     *
-     * @since JRuby 1.6.6.
-     *
-     * @deprecated Use setProfilingMode instead
-     *
-     * @param mode a new profiling mode to be set.
-     */
-    @Deprecated(since = "1.7.17")
-    public void setProfile(ProfilingMode mode) {
-        provider.getRubyInstanceConfig().setProfilingMode(mode);
-    }
-
     /**
      * Changes a ProfilingMode to a given one. The default value is Profiling.OFF.
      * Call this method before you use put/get, runScriptlet, and parse methods so that
@@ -1041,18 +1020,6 @@ public LocalContextProvider getProvider() {
         return provider;
     }
 
-    /**
-     * Returns a Ruby runtime in one of {@link LocalContextScope}.
-     *
-     * @deprecated As of JRuby 1.5.0. Use getProvider().getRuntime() method instead.
-     *
-     * @return Ruby runtime of a specified local context
-     */
-    @Deprecated(since = "1.5.0")
-    public Ruby getRuntime() {
-        return provider.getRuntime();
-    }
-
     /**
      * Returns a variable map in one of {@link LocalContextScope}. Variables
      * in this map is used to share between Java and Ruby. Map keys are Ruby's
@@ -1690,19 +1657,6 @@ public Reader getReader() {
         return null;
     }
 
-    /**
-     * Returns an input stream that Ruby runtime has. The stream is set when
-     * Ruby runtime is initialized.
-     *
-     * @deprecated As of JRuby 1.5.0, replaced by getInput().
-     *
-     * @return an input stream that Ruby runtime has.
-     */
-    @Deprecated(since = "1.5.0")
-    public InputStream getIn() {
-        return getInput();
-    }
-
     /**
      * Replaces a standard output by a specified writer.
      *
@@ -1753,19 +1707,6 @@ public Writer getWriter() {
         return null;
     }
 
-    /**
-     * Returns an output stream that Ruby runtime has. The stream is set when
-     * Ruby runtime is initialized.
-     *
-     * @deprecated As of JRuby 1.5.0, replaced by getOutput().
-     *
-     * @return an output stream that Ruby runtime has
-     */
-    @Deprecated(since = "1.5.0")
-    public PrintStream getOut() {
-        return getOutput();
-    }
-
     /**
      * Replaces a standard error by a specified writer.
      *
@@ -1816,19 +1757,6 @@ public Writer getErrorWriter() {
         return null;
     }
 
-    /**
-     * Returns an error output stream that Ruby runtime has. The stream is set when
-     * Ruby runtime is initialized.
-     *
-     * @deprecated As of JRuby 1.5.0, Replaced by getError()
-     *
-     * @return an error output stream that Ruby runtime has
-     */
-    @Deprecated(since = "1.5.0")
-    public PrintStream getErr() {
-        return getError();
-    }
-
     /**
      * Cleanly shut down this ScriptingContainer and any JRuby resources it holds.
      * All ScriptingContainer instances should be terminated when you are done with
@@ -1897,40 +1825,6 @@ public void addClassLoader(ClassLoader classLoader) {
         getProvider().getRubyInstanceConfig().addLoader(classLoader);
     }
 
-    /**
-     * add the given classloader to the LOAD_PATH
-     * @param classloader
-     */
-    @Deprecated(since = "9.0.1.0")
-    public void addLoadPath(ClassLoader classloader) {
-        addLoadPath(createUri(classloader, "/.jrubydir"));
-    }
-
-    @Deprecated(since = "9.0.1.0")
-    protected void addLoadPath(String uri) {
-        runScriptlet( "$LOAD_PATH << '" + uri + "' unless $LOAD_PATH.member?( '" + uri + "' )" );
-    }
-
-    /**
-     * add the given classloader to the GEM_PATH
-     * @param classloader
-     */
-    @Deprecated(since = "9.0.1.0")
-    public void addGemPath(ClassLoader classloader) {
-        addGemPath(createUri(classloader, "/specifications/.jrubydir"));
-    }
-
-    private String createUri(ClassLoader cl, String ref) {
-        URL url = cl.getResource( ref );
-        if ( url == null && ref.startsWith( "/" ) ) {
-            url = cl.getResource( ref.substring( 1 ) );
-        }
-        if ( url == null ) {
-            throw new RuntimeException( "reference " + ref + " not found on classloader " + cl );
-        }
-        return "uri:" + url.toString().replaceFirst( ref + "$", "" );
-    }
-
     protected void addGemPath(String uri) {
         runScriptlet( "require 'rubygems';Gem::Specification.add_dir '" + uri + "' unless Gem::Specification.dirs.member?( '" + uri + "' )" );
     }
diff --git a/core/src/main/java/org/jruby/embed/internal/BiVariableMap.java b/core/src/main/java/org/jruby/embed/internal/BiVariableMap.java
index 79fda59df69..cbf968683ea 100644
--- a/core/src/main/java/org/jruby/embed/internal/BiVariableMap.java
+++ b/core/src/main/java/org/jruby/embed/internal/BiVariableMap.java
@@ -246,7 +246,6 @@ private RubyObject getTopSelf() {
      * @return the BiVariable type object to which the specified key is mapped, or
      *         {@code null} if this map contains no mapping for the key
      */
-    //@Deprecated(since = "1.7.20")
     public BiVariable getVariable(final String name) {
         return getVariable(getTopSelf(), name);
     }
diff --git a/core/src/main/java/org/jruby/embed/internal/EmbedRubyObjectAdapterImpl.java b/core/src/main/java/org/jruby/embed/internal/EmbedRubyObjectAdapterImpl.java
index c890638b29a..0345037df58 100644
--- a/core/src/main/java/org/jruby/embed/internal/EmbedRubyObjectAdapterImpl.java
+++ b/core/src/main/java/org/jruby/embed/internal/EmbedRubyObjectAdapterImpl.java
@@ -65,15 +65,6 @@ public class EmbedRubyObjectAdapterImpl implements EmbedRubyObjectAdapter {
     private final ScriptingContainer container;
     private final boolean wrapExceptions;
 
-    @Deprecated(since = "9.3.0.0") // not used
-    public enum MethodType {
-        CALLMETHOD,
-        CALLSUPER,
-        CALLMETHOD_NOARG,
-        CALLMETHOD_WITHBLOCK,
-        CALLSUPER_WITHBLOCK,
-    }
-
     public EmbedRubyObjectAdapterImpl(ScriptingContainer container) {
         this(container, false);
     }
diff --git a/core/src/main/java/org/jruby/embed/internal/LocalContext.java b/core/src/main/java/org/jruby/embed/internal/LocalContext.java
index 1e11b3c5eb0..7c4fac36114 100644
--- a/core/src/main/java/org/jruby/embed/internal/LocalContext.java
+++ b/core/src/main/java/org/jruby/embed/internal/LocalContext.java
@@ -31,6 +31,8 @@
 
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -50,6 +52,19 @@ public class LocalContext {
     private BiVariableMap varMap;
     private Map<AttributeName, Object> attributes;
 
+    /**
+     * Termination mark for removed LocalContext instances.
+     */
+    private volatile boolean terminated;
+    private static final VarHandle TERMINATED;
+    static {
+        try {
+            TERMINATED = MethodHandles.lookup().findVarHandle(LocalContext.class, "terminated", boolean.class);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public LocalContext(RubyInstanceConfig config, LocalVariableBehavior behavior) {
         this(config, behavior, false);
     }
@@ -60,14 +75,9 @@ public LocalContext(RubyInstanceConfig config, LocalVariableBehavior behavior, b
         this.lazy = lazy;
     }
 
-    // This method is used only from ThreadLocalContextProvider.
-    // Other providers should instantialte runtime in their own way.
-    @Deprecated(since = "1.7.20")
-    public Ruby getThreadSafeRuntime() {
-        return getRuntime();
-    }
-
     public BiVariableMap getVarMap(LocalContextProvider provider) {
+        checkTerminated();
+
         if (varMap == null) {
             synchronized(this) {
                 if (varMap == null) {
@@ -84,6 +94,8 @@ public LocalVariableBehavior getLocalVariableBehavior() {
 
     @SuppressWarnings("MapReplaceableByEnumMap")
     public Map<?, Object> getAttributeMap() {
+        checkTerminated();
+
         if (attributes == null) {
             synchronized(this) {
                 if (attributes == null) {
@@ -98,15 +110,25 @@ public Map<?, Object> getAttributeMap() {
     }
 
     public void remove() {
+        // Ensure the context is terminated only once
+        if (!TERMINATED.compareAndSet(this, false, true)) {
+            throw terminatedException();
+        }
+
         if (attributes != null) {
             synchronized(this) { attributes.clear(); }
         }
         if (varMap != null) {
             synchronized(this) { varMap.clear(); }
         }
+
+        // Clear the runtime reference to assist GC
+        runtime = null;
     }
 
     Ruby getRuntime() {
+        checkTerminated();
+
         if (runtime == null) {
             synchronized(this) {
                 if (runtime == null) {
@@ -117,6 +139,29 @@ Ruby getRuntime() {
         return runtime;
     }
 
+    /**
+     * Check if this LocalContext has been terminated and raise error if so.
+     */
+    private void checkTerminated() {
+        if (isTerminated()) throw terminatedException();
+    }
+
+    /**
+     * Construct an exception to indicate this LocalContext has been terminated.
+     *
+     * @return the exception
+     */
+    private static IllegalStateException terminatedException() {
+        return new IllegalStateException("LocalContext is terminated");
+    }
+
     boolean isInitialized() { return runtime != null; }
 
+    /**
+     * Return the termination state of this LocalContext.
+     *
+     * @return true if terminated, false otherise
+     */
+    boolean isTerminated() { return terminated; }
+
 }
diff --git a/core/src/main/java/org/jruby/embed/internal/SingletonLocalContextProvider.java b/core/src/main/java/org/jruby/embed/internal/SingletonLocalContextProvider.java
index c10dc422ad7..e654c1231bb 100644
--- a/core/src/main/java/org/jruby/embed/internal/SingletonLocalContextProvider.java
+++ b/core/src/main/java/org/jruby/embed/internal/SingletonLocalContextProvider.java
@@ -63,24 +63,6 @@ private LocalContext sharedLocalContext() {
         return localContext;
     }
 
-    @Deprecated(since = "9.0.0.0") // no longer used
-    public static LocalContext getLocalContextInstance(RubyInstanceConfig config, LocalVariableBehavior behavior, boolean lazy) {
-        if (localContext == null) {
-            synchronized( SingletonLocalContextProvider.class ) {
-                if (localContext == null) {
-                    localContext = new LocalContext(config, behavior, lazy);
-                }
-            }
-        }
-        return localContext;
-    }
-
-    @Deprecated(since = "9.0.0.0") // no longer used
-    public static LocalVariableBehavior getLocalVariableBehaviorOrNull() {
-        if (localContext == null) return null;
-        return localContext.getLocalVariableBehavior();
-    }
-
     public SingletonLocalContextProvider(LocalVariableBehavior behavior) {
         super( getGlobalRuntimeConfigOrNew(), behavior );
     }
diff --git a/core/src/main/java/org/jruby/embed/internal/ThreadLocalContext.java b/core/src/main/java/org/jruby/embed/internal/ThreadLocalContext.java
index e8ce9d4cdef..5c00319d08b 100644
--- a/core/src/main/java/org/jruby/embed/internal/ThreadLocalContext.java
+++ b/core/src/main/java/org/jruby/embed/internal/ThreadLocalContext.java
@@ -29,9 +29,8 @@
  */
 package org.jruby.embed.internal;
 
-import java.lang.ref.PhantomReference;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
+import java.lang.ref.Cleaner;
+import java.lang.ref.Cleaner.Cleanable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
@@ -44,8 +43,8 @@
  */
 class ThreadLocalContext {
 	private final ConcurrentHashMap<LocalContextCleaningAction, Object> contextRefs = new ConcurrentHashMap<>();
+	private final Cleaner cleaner = Cleaner.create();
 	private final Supplier<LocalContext> localContextFactory;
-	private final Cleaner cleaner = new Cleaner();
 
 	public ThreadLocalContext(final Supplier<LocalContext> localContextFactory) {
 		this.localContextFactory = localContextFactory;
@@ -62,13 +61,13 @@ protected AtomicReference<LocalContextCleaningAction> initialValue() {
 			// GC'd (i.e. when this class gets GC'd because terminate() was never called).
 			// see ThreadLocal JavaDoc: ref will stay reachable "as long as the thread is
 			// alive and the ThreadLocal instance is accessible"
-			ctx.register(ref, cleaner);
+			final Cleanable cleanable = cleaner.register(ref, ctx);
 			if (contextHolder == null)
 				// boundary case if we're already terminating: clean up immediately, because
 				// there is no more cleanup thread to do that later
 				// the returned context will be null, but that's to be expected when operating
 				// on an object that has been terminated
-				ctx.run();
+				cleanable.clean();
 			return ref;
 		}
 	};
@@ -78,7 +77,6 @@ public LocalContext get() {
 	}
 
 	public void terminate() {
-		cleaner.interrupt();
 		contextHolder = null;
 		for (final LocalContextCleaningAction ref : contextRefs.keySet())
 			ref.run();
@@ -90,14 +88,11 @@ public void terminate() {
 	 * everything that is GC-reachable from them will stay reachable until the
 	 * cleaning action has been run.
 	 */
-	static class LocalContextCleaningAction extends AtomicReference<LocalContext> implements Runnable {
+	private static class LocalContextCleaningAction extends AtomicReference<LocalContext> implements Runnable {
 		private static final long serialVersionUID = 1L;
 
 		private final ConcurrentHashMap<LocalContextCleaningAction, Object> contextRefs;
 
-		@SuppressWarnings("unused") // only used to make sure the PhantomReference doesn't get GC'd
-		private CleanerReference phantomReference;
-
 		private LocalContextCleaningAction(final ConcurrentHashMap<LocalContextCleaningAction, Object> contextRefs,
 				final LocalContext context) {
 			super(context);
@@ -116,42 +111,5 @@ public void run() {
 				lc.remove();
 			contextRefs.remove(this);
 		}
-
-		private void register(final AtomicReference<LocalContextCleaningAction> ref, final Cleaner cleaner) {
-			phantomReference = new CleanerReference(ref, cleaner.q, this);
-		}
-	}
-
-	private static class CleanerReference extends PhantomReference<AtomicReference<LocalContextCleaningAction>> {
-		private Runnable cleanup;
-
-		public CleanerReference(final AtomicReference<LocalContextCleaningAction> referent,
-				final ReferenceQueue<AtomicReference<LocalContextCleaningAction>> q, final Runnable cleanup) {
-			super(referent, q);
-			this.cleanup = cleanup;
-		}
-	}
-
-	private static class Cleaner extends Thread {
-		private final ReferenceQueue<AtomicReference<LocalContextCleaningAction>> q = new ReferenceQueue<>();
-
-		public Cleaner() {
-			setName("JRuby-ThreadLocalContext-Cleaner-" + getId());
-			setDaemon(true);
-			start();
-		}
-
-		@Override
-		public void run() {
-			while (!interrupted()) {
-				final Reference<?> cleanable;
-				try {
-					cleanable = q.remove();
-				} catch (InterruptedException e) {
-					break;
-				}
-				((CleanerReference) cleanable).cleanup.run();
-			}
-		}
 	}
 }
diff --git a/core/src/main/java/org/jruby/embed/osgi/OSGiIsolatedScriptingContainer.java b/core/src/main/java/org/jruby/embed/osgi/OSGiIsolatedScriptingContainer.java
index 9baa7ec7a46..e89395244ba 100644
--- a/core/src/main/java/org/jruby/embed/osgi/OSGiIsolatedScriptingContainer.java
+++ b/core/src/main/java/org/jruby/embed/osgi/OSGiIsolatedScriptingContainer.java
@@ -66,37 +66,6 @@ private Bundle toBundle(String symbolicName) {
         return bundle;
     }
 
-    @Deprecated(since = "9.0.1.0")
-    private String createUri(Bundle cl, String ref) {
-        URL url = cl.getResource(ref);
-        if ( url == null && ref.startsWith( "/" ) ) {
-            url = cl.getResource( ref.substring( 1 ) );
-        }
-        if ( url == null ) {
-            throw new RuntimeException( "reference " + ref + " not found on classloader " + cl );
-        }
-        return "uri:" + url.toString().replaceFirst( ref + "$", "" );
-    }
-    /**
-     * add the classloader from the given bundle to the LOAD_PATH
-     * @param bundle
-     */
-    @Deprecated(since = "9.0.1.0")
-    public void addBundleToLoadPath(Bundle bundle) {
-        addLoadPath(createUri(bundle, "/.jrubydir"));
-    }
-
-    /**
-     * add the classloader from the given bundle to the LOAD_PATH
-     * using the bundle symbolic name
-     * 
-     * @param symbolicName
-     */
-    @Deprecated(since = "9.0.1.0")
-    public void addBundleToLoadPath(String symbolicName) {
-        addBundleToLoadPath(toBundle(symbolicName));
-    }
-
     /**
      * add the classloader from the given bundle to the LOAD_PATH and the GEM_PATH
      * using the bundle symbolic name
@@ -114,26 +83,6 @@ public void addBundle(Bundle bundle) {
         getProvider().getRubyInstanceConfig().addLoader(new BundleGetResources(bundle));
     }
 
-    /**
-     * add the classloader from the given bundle to the GEM_PATH
-     * @param bundle
-     */
-    @Deprecated(since = "9.0.1.0")
-    public void addBundleToGemPath(Bundle bundle) {
-        addGemPath(createUri(bundle, "/specifications/.jrubydir"));
-    }
-
-    /**
-     * add the classloader from the given bundle to the GEM_PATH
-     * using the bundle symbolic name
-     * 
-     * @param symbolicName
-     */
-    @Deprecated(since = "9.0.1.0")
-    public void addBundleToGemPath(String symbolicName) {
-        addBundleToGemPath(toBundle(symbolicName));
-    }
-
     static class BundleGetResources implements Loader
     {
 
diff --git a/core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java b/core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
index 9fe31f558d5..c370a3e0c18 100644
--- a/core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
+++ b/core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
@@ -158,109 +158,6 @@ else if ("force".equalsIgnoreCase(mode)) {
         // String compat = SafePropertyAccessor.getProperty(PropertyName.COMPATVERSION.toString());
     }
 
-    /**
-     * Sets JRuby home if it is given by a JRUBY_HOME environment variable,
-     * jruby.home system property, or jury.home in jruby-complete.jar
-     *
-     * @param container ScriptingContainer to be set jruby home.
-     */
-    @Deprecated(since = "1.5.0")
-    public static void setJRubyHome(ScriptingContainer container) {
-        String jrubyhome = findJRubyHome(container);
-        if (jrubyhome != null) {
-            container.getProvider().getRubyInstanceConfig().setJRubyHome(jrubyhome);
-        }
-    }
-
-    /**
-     * Tries to find JRuby home from the order of JRUBY_HOME environment variable,
-     * jruby.home System property, then "/META-INF/jruby.home" if jruby-complete.jar
-     * is used.
-     *
-     * @param instance any instance to get a resource
-     * @return JRuby home path if exists, null when failed to find it.
-     */
-    @Deprecated(since = "9.0.3.0")
-    public static String findJRubyHome(Object instance) {
-        String jrubyhome;
-        if ((jrubyhome = SafePropertyAccessor.getenv("JRUBY_HOME")) != null) {
-            return jrubyhome;
-        }
-        if ((jrubyhome = SafePropertyAccessor.getProperty("jruby.home")) != null) {
-            return jrubyhome;
-        }
-        return "uri:classloader://META-INF/jruby.home";
-    }
-
-    @Deprecated(since = "9.0.3.0")
-    public static String findFromJar(Object instance) {
-        URL resource = instance.getClass().getResource("/META-INF/jruby.home");
-        if (resource == null) {
-            // on IBM WebSphere getResource for a dir returns null but an actual
-            // file if it's there returns e.g. wsjar:file:/opt/IBM/WebSphere/...
-            // .../jruby-stdlib-1.6.7.dev.jar!/META-INF/jruby.home/bin/jrubyc
-            resource = instance.getClass().getResource("/META-INF/jruby.home/bin/jrubyc");
-            if (resource == null) return null;
-        }
-
-        String location;
-        if (resource.getProtocol().equals("jar")) {
-            location = getPath(resource);
-            if (!location.startsWith("file:")) {
-                // for remote-sourced classpath resources, just use classpath:
-                location = "classpath:/META-INF/jruby.home";
-            }
-            if (location.startsWith("file:") && location.contains(" ")) {
-                location = location.replaceAll( " ", "%20" );
-            }
-        } else {
-            location = "classpath:/META-INF/jruby.home";
-        }
-
-        // Trim trailing slash. It confuses OSGi containers...
-        if (location.endsWith("/")) {
-            location = location.substring(0, location.length() - 1);
-        }
-
-        return location;
-    }
-
-    /**
-     * Tries to find load paths for ruby files and/or libraries. This methods
-     * sees org.jruby.embed.class.path system property first, then java.class.path.
-     *
-     * @return a list of load paths.
-     */
-    @Deprecated(since = "9.0.3.0")
-    public static List<String> findLoadPaths() {
-        String paths = SafePropertyAccessor.getProperty(PropertyName.CLASSPATH.toString());
-        List<String> loadPaths = new ArrayList<String>();
-        if (paths == null) {
-            paths = SafePropertyAccessor.getProperty("java.class.path");
-        }
-        if (paths == null) return loadPaths;
-        String[] possiblePaths = paths.split(File.pathSeparator);
-        String[] prefixes = {"file", "url"};
-        for (int i=0; i<possiblePaths.length; i++) {
-            int startIndex = i;
-            for (int j=0; j < prefixes.length; j++) {
-                if (prefixes[j].equals(possiblePaths[i]) && i < possiblePaths.length - 1) {
-                    loadPaths.add(possiblePaths[i] + ":" + possiblePaths[++i]);
-                    break;
-                }
-            }
-            if (startIndex == i) {
-                loadPaths.add(possiblePaths[i]);
-            }
-        }
-        return loadPaths;
-    }
-
-    private static boolean matches(final String name, final String pattern) {
-        Matcher matcher = Pattern.compile(pattern).matcher( name );
-        return matcher.matches();
-    }
-
     /**
      * Returns a possible base directory. PWD environment variables is looked up first,
      * then user.dir System property second. This directory is used as a default value
diff --git a/core/src/main/java/org/jruby/embed/variable/GlobalVariable.java b/core/src/main/java/org/jruby/embed/variable/GlobalVariable.java
index 0e7414737c1..e0d932b37df 100644
--- a/core/src/main/java/org/jruby/embed/variable/GlobalVariable.java
+++ b/core/src/main/java/org/jruby/embed/variable/GlobalVariable.java
@@ -183,7 +183,7 @@ public static boolean isValidName(Object name) {
     @Override
     public void setJavaObject(Ruby runtime, Object javaObject) {
         updateByJavaObject(runtime, javaObject);
-        tryEagerInjection(runtime, null);
+        tryEagerInjection(null);
     }
 
     /**
@@ -195,11 +195,6 @@ public void inject() {
         // do nothing
     }
 
-    @Deprecated(since = "1.7.20")
-    public void tryEagerInjection(Ruby runtime, IRubyObject receiver) {
-        tryEagerInjection(receiver);
-    }
-
     /**
      * Injects a global variable value to a parsed Ruby script. This method is
      * invoked during EvalUnit#run() is executed.
diff --git a/core/src/main/java/org/jruby/embed/variable/VariableInterceptor.java b/core/src/main/java/org/jruby/embed/variable/VariableInterceptor.java
index 24408d13bab..693c1e90173 100644
--- a/core/src/main/java/org/jruby/embed/variable/VariableInterceptor.java
+++ b/core/src/main/java/org/jruby/embed/variable/VariableInterceptor.java
@@ -103,30 +103,6 @@ private static BiVariable resolve(BiVariable[] entries) {
         return null;
     }
 
-    /**
-     * Injects variable values from Java to Ruby just before an evaluation or
-     * method invocation.
-     *
-     * @param map a variable map that has name-value pairs to be injected
-     * @param runtime Ruby runtime
-     * @param scope scope to inject local variable values
-     */
-    @Deprecated(since = "9.3.0.0")
-    public static void inject(BiVariableMap map, Ruby runtime, ManyVarsDynamicScope scope) {
-        // lvar might not be given while parsing but be given when evaluating.
-        // to avoid ArrayIndexOutOfBoundsException, checks the length of scope.getValues()
-        if (scope != null && scope.getValues().length > 0) {
-            IRubyObject[] values4Injection = map.getLocalVarValues();
-            if (values4Injection != null && values4Injection.length > 0) {
-                for (int i = 0; i < values4Injection.length; i++) {
-                    scope.setValue(i, values4Injection[i], 0);
-                }
-            }
-        }
-        Collection<BiVariable> variables = map.getVariables();
-        for ( final BiVariable var : variables ) var.inject();
-    }
-
     /**
      * Injects variable values from Java to Ruby just before an evaluation or
      * method invocation.
diff --git a/core/src/main/java/org/jruby/exceptions/RaiseException.java b/core/src/main/java/org/jruby/exceptions/RaiseException.java
index fae76adac06..a23efc4ed2e 100644
--- a/core/src/main/java/org/jruby/exceptions/RaiseException.java
+++ b/core/src/main/java/org/jruby/exceptions/RaiseException.java
@@ -292,90 +292,34 @@ public static StackTraceElement[] javaTraceFromRubyTrace(RubyStackTraceElement[]
         return newTrace;
     }
 
-    @Deprecated(since = "9.2.10.0") // used by JRuby-Rack
-    public static RaiseException createNativeRaiseException(Ruby runtime, Throwable cause) {
-        return createNativeRaiseException(runtime, cause, null);
-    }
-    @Deprecated(since = "9.2.7.0")
-    public static RaiseException createNativeRaiseException(Ruby runtime, Throwable cause, Member target) {
-        org.jruby.NativeException nativeException = new org.jruby.NativeException(runtime, runtime.getNativeException(), cause);
-        return new RaiseException(cause, nativeException);
-    }
-    @Deprecated(since = "9.2.7.0")
-    public RaiseException(Throwable cause, org.jruby.NativeException nativeException) {
-        super(nativeException.getMessageAsJavaString(), cause);
-        providedMessage = super.getMessage(); // cause.getClass().getId() + ": " + message
-        setException(nativeException);
-        preRaise(nativeException.getRuntime().getCurrentContext(), nativeException.getCause().getStackTrace());
-        setStackTraceFromException();
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public RaiseException(RubyException exception) {
-        this(exception.getMessageAsJavaString(), exception);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public RaiseException(RubyException exception, boolean unused) {
-        this(exception.getMessageAsJavaString(), exception);
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public RaiseException(RubyException exception, IRubyObject backtrace) {
-        // this(exception.getMessageAsJavaString(), exception) would preRaise twice!
-        super(exception.getMessageAsJavaString());
-        setException(exception);
-        preRaise(exception.getRuntime().getCurrentContext(), backtrace, true);
-    }
-
+    // Deprecated but still used by the overload below
     @Deprecated(since = "9.2.0.0")
     public RaiseException(Ruby runtime, RubyClass exceptionClass, String msg) {
         this(runtime, exceptionClass, msg, null);
     }
 
+    // Deprecated but still used by jruby-openssl in org.jruby.ext.openssl.Utils.newError
     @Deprecated(since = "9.2.0.0")
     public RaiseException(Ruby runtime, RubyClass exceptionClass, String msg, boolean unused) {
         this(runtime, exceptionClass, msg, null);
     }
 
+    // Deprecated but still used by the overload below
     @Deprecated(since = "9.2.0.0")
     public RaiseException(Ruby runtime, RubyClass exceptionClass, String msg, IRubyObject backtrace) {
         super(msg == null ? msg = "No message available" : msg);
         final ThreadContext context = runtime.getCurrentContext();
-
         providedMessage = '(' + exceptionClass.getName(context) + ") " + msg;
-
         setException(RubyException.newException(context, exceptionClass, RubyString.newUnicodeString(runtime, msg)));
         preRaise(context, backtrace, true);
     }
 
+    // Deprecated but still used by jruby-openssl in org.jruby.ext.openssl.Utils.newErrorWithoutTrace
     @Deprecated(since = "9.2.0.0")
     public RaiseException(Ruby runtime, RubyClass exceptionClass, String msg, IRubyObject backtrace, boolean unused) {
         this(runtime, exceptionClass, msg, backtrace);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    protected final void setException(RubyException newException, boolean unused) {
-        this.exception = newException;
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    private void preRaise(ThreadContext context, StackTraceElement[] javaTrace) {
-        preRaise(context, null, false);
-
-        if (requiresBacktrace(context)) {
-            exception.prepareIntegratedBacktrace(context, javaTrace);
-            setStackTraceFromException();
-        } else {
-            setStackTrace(skipFillInStackTracePart(javaTrace));
-        }
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static RaiseException from(RubyException exception, IRubyObject backtrace) {
-        return new RaiseException(exception, backtrace);
-    }
-
     private boolean requiresBacktrace(ThreadContext context) {
         // We can only omit backtraces of descendents of Standard error for 'foo rescue nil'
         return context.exceptionRequiresBacktrace || !(exception instanceof RubyStandardError);
diff --git a/core/src/main/java/org/jruby/ext/bigdecimal/BigDecimalLibrary.java b/core/src/main/java/org/jruby/ext/bigdecimal/BigDecimalLibrary.java
index f76a00dfa2e..9b1c183000c 100644
--- a/core/src/main/java/org/jruby/ext/bigdecimal/BigDecimalLibrary.java
+++ b/core/src/main/java/org/jruby/ext/bigdecimal/BigDecimalLibrary.java
@@ -43,6 +43,6 @@ public void load(Ruby runtime, boolean wrap) throws IOException {
         RubyBigDecimal.createBigDecimal(context);
 
         // using load since this file does not exist in MRI
-        loadService(context).loadFromClassLoader(Ruby.class.getClassLoader(), "jruby/bigdecimal.rb", false);
+        loadService(context).loadFromClassLoader("jruby/bigdecimal.rb", false);
     }
 }// BigDecimalLibrary
diff --git a/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java b/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
index 63557caf164..ef413f13e85 100644
--- a/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
+++ b/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
@@ -1839,11 +1839,6 @@ public IRubyObject nonzero_p(ThreadContext context) {
         return isZero(context) ? context.nil : this;
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject nonzero_p() {
-        return nonzero_p(getCurrentContext());
-    }
-
     @JRubyMethod
     public  IRubyObject n_significant_digits(ThreadContext context) {
         return value.equals(BigDecimal.ZERO) ?
@@ -1913,15 +1908,6 @@ private int getPrec(ThreadContext context) {
         return (value.unscaledValue().toString().length() + 8) / BASE_FIG;
     }
 
-    @Deprecated(since = "9.4.3.0")
-    @JRubyMethod
-    public IRubyObject precs(ThreadContext context) {
-        warnDeprecated(context, "BigDecimal#precs is deprecated and will be removed in the future; use BigDecimal#precision instead.");
-        return newArray(context,
-                asFixnum(context, getSignificantDigits().length()),
-                asFixnum(context, ((getAllDigits().length() / 4) + 1) * 4));
-    }
-
     @JRubyMethod(name = "round", optional = 2, checkArity = false)
     public IRubyObject round(ThreadContext context, IRubyObject[] args) {
         int argc = Arity.checkArgumentCount(context, args, 0, 2);
@@ -2373,11 +2359,6 @@ public String toString() {
         return engineeringValue(context, null).toString();
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject to_s(IRubyObject[] args) {
-        return toStringImpl(getCurrentContext(), args.length == 0 ? null : (args[0].isNil() ? null : args[0].toString()));
-    }
-
     // Note: #fix has only no-arg form, but truncate allows optional parameter.
     @Deprecated(since = "10.0.0.0")
     public IRubyObject fix() {
@@ -2416,11 +2397,6 @@ public IRubyObject zero_p(ThreadContext context) {
         return asBoolean(context, isZero(context));
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public IRubyObject zero_p() {
-        return zero_p(getCurrentContext());
-    }
-
     @Override
     public <T> T toJava(Class<T> target) {
         if (target == BigDecimal.class || target == Number.class) {
@@ -2538,21 +2514,6 @@ private static boolean isEven(ThreadContext context, final RubyNumeric x) {
         return false;
     }
 
-    @Deprecated(since = "9.3.0.0") // no longer used
-    public RubyBigDecimal(Ruby runtime, RubyBigDecimal rbd) {
-        this(runtime, Access.getClass(runtime.getCurrentContext(), "BigDecimal"), rbd);
-    }
-
-    @Deprecated(since = "9.3.0.0") // no longer used
-    public RubyBigDecimal(Ruby runtime, RubyClass klass, RubyBigDecimal rbd) {
-        super(runtime, klass);
-        this.isNaN = rbd.isNaN;
-        this.infinitySign = rbd.infinitySign;
-        this.zeroSign = rbd.zeroSign;
-        this.value = rbd.value;
-        this.setFrozen(true);
-    }
-
     private static JavaSites.BigDecimalSites sites(ThreadContext context) {
         return context.sites.BigDecimal;
     }
diff --git a/core/src/main/java/org/jruby/ext/cgi/escape/CGIEscape.java b/core/src/main/java/org/jruby/ext/cgi/escape/CGIEscape.java
new file mode 100644
index 00000000000..00f7d033223
--- /dev/null
+++ b/core/src/main/java/org/jruby/ext/cgi/escape/CGIEscape.java
@@ -0,0 +1,578 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * BSD 2-Clause License
+ *
+ * Copyright (c) 2016, Charles Oliver Nutter <headius@headius.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby.ext.cgi.escape;
+
+import org.jcodings.Encoding;
+import org.jcodings.specific.ISO8859_1Encoding;
+import org.jcodings.specific.UTF8Encoding;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyEncoding;
+import org.jruby.RubyModule;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.api.Define;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.Helpers;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.load.Library;
+import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
+import org.jruby.util.io.EncodingUtils;
+
+public class CGIEscape implements Library {
+    public static final String ACCEPT_CHARSET = "@@accept_charset";
+    public static final byte[] NO39 = "&#39;".getBytes(RubyEncoding.UTF8);
+    public static final byte[] AMP = "&amp;".getBytes(RubyEncoding.UTF8);
+    public static final byte[] QUOT = "&quot;".getBytes(RubyEncoding.UTF8);
+    public static final byte[] LT = "&lt;".getBytes(RubyEncoding.UTF8);
+    public static final byte[] GT = "&gt;".getBytes(RubyEncoding.UTF8);
+    public static final int UNICODE_MAX = 0x10ffff;
+    public static final byte[] TSEMI = "t;".getBytes(RubyEncoding.UTF8);
+    public static final byte[] UOTSEMI = "uot;".getBytes(RubyEncoding.UTF8);
+    public static final byte[] MPSEMI = "mp;".getBytes(RubyEncoding.UTF8);
+    public static final byte[] POSSEMI = "pos;".getBytes(RubyEncoding.UTF8);
+
+    static void html_escaped_cat(RubyString str, byte c) {
+        switch (c) {
+            case '\'':
+                str.cat(NO39);
+                break;
+            case '&':
+                str.cat(AMP);
+                break;
+            case '"':
+                str.cat(QUOT);
+                break;
+            case '<':
+                str.cat(LT);
+                break;
+            case '>':
+                str.cat(GT);
+                break;
+        }
+    }
+
+    static void preserve_original_state(RubyString orig, RubyString dest) {
+        dest.setEncoding(orig.getEncoding());
+    }
+
+    static IRubyObject
+    optimized_escape_html(Ruby runtime, RubyString str) {
+        int i, len, beg = 0;
+        RubyString dest = null;
+        byte[] cstrBytes;
+
+        len = str.size();
+        ByteList byteList = str.getByteList();
+        cstrBytes = byteList.unsafeBytes();
+        int cstr = byteList.begin();
+
+        for (i = 0; i < len; i++) {
+            switch (cstrBytes[cstr + i]) {
+                case '\'':
+                case '&':
+                case '"':
+                case '<':
+                case '>':
+                    if (dest == null) {
+                        dest = RubyString.newStringLight(runtime, len);
+                    }
+
+                    dest.cat(cstrBytes, cstr + beg, i - beg);
+                    beg = i + 1;
+
+                    html_escaped_cat(dest, cstrBytes[cstr + i]);
+                    break;
+            }
+        }
+
+        if (dest != null) {
+            dest.cat(cstrBytes, cstr + beg, len - beg);
+            preserve_original_state(str, dest);
+            return dest;
+        } else {
+            return str.strDup(runtime);
+        }
+    }
+
+    // Set of i has to happen outside this; see MATCH macro in MRI ext/cgi/escape/escape.c
+    static boolean MATCH(byte[] s, int len, int i, byte[] cstrBytes, int cstr) {
+        if (len - i >= s.length && ByteList.memcmp(cstrBytes, cstr + i, s, 0, s.length) == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    static IRubyObject
+    optimized_unescape_html(Ruby runtime, RubyString str) {
+        Encoding enc = str.getEncoding();
+        int charlimit = (enc instanceof UTF8Encoding) ? UNICODE_MAX :
+                (enc instanceof ISO8859_1Encoding) ? 256 :
+                        128;
+        int i, j, len, beg = 0;
+        int clen = 0, plen;
+        boolean overflow = false;
+        byte[] cstrBytes;
+        int cstr;
+        byte[] buf = new byte[6];
+        RubyString dest = null;
+
+        len = str.size();
+        ByteList byteList = str.getByteList();
+        cstrBytes = byteList.getUnsafeBytes();
+        cstr = byteList.begin();
+
+        for (i = 0; i < len; i++) {
+            int cc;
+            int c = cstrBytes[cstr + i];
+            if (c != '&') continue;
+            plen = i - beg;
+            if (++i >= len) break;
+            c = cstrBytes[cstr + i] & 0xFF;
+            j = i;
+            switch (c) {
+                case 'a':
+                    ++i;
+                    if (MATCH(POSSEMI, len, i, cstrBytes, cstr)) {
+                        i += POSSEMI.length - 1;
+                        c = '\'';
+                    } else if (MATCH(MPSEMI, len, i, cstrBytes, cstr)) {
+                        i += MPSEMI.length - 1;
+                        c = '&';
+                    } else {
+                        i = j;
+                        continue;
+                    }
+                    break;
+                case 'q':
+                    ++i;
+                    if (MATCH(UOTSEMI, len, i, cstrBytes, cstr)) {
+                        i += UOTSEMI.length - 1;
+                        c = '"';
+                    } else {
+                        i = j;
+                        continue;
+                    }
+                    break;
+                case 'g':
+                    ++i;
+                    if (MATCH(TSEMI, len, i, cstrBytes, cstr)) {
+                        i += TSEMI.length - 1;
+                        c = '>';
+                    } else {
+                        i = j;
+                        continue;
+                    }
+                    break;
+                case 'l':
+                    ++i;
+                    if (MATCH(TSEMI, len, i, cstrBytes, cstr)) {
+                        i += TSEMI.length - 1;
+                        c = '<';
+                    } else {
+                        i = j;
+                        continue;
+                    }
+                    break;
+                case '#':
+                    if (len - ++i >= 2 && Character.isDigit(cstrBytes[cstr + i])) {
+                        int[] clenOverflow = {clen, overflow ? 1 : 0};
+                        cc = ruby_scan_digits(cstrBytes, cstr + i, len - i, 10, clenOverflow);
+                        clen = clenOverflow[0];
+                        overflow = clenOverflow[1] == 1;
+                    } else if (i < len && (cstrBytes[cstr + i] == 'x' || cstrBytes[cstr + i] == 'X') && len - ++i >= 2 && ISXDIGIT(cstrBytes, cstr + i)) {
+                        int[] clenOverflow = {clen, overflow ? 1 : 0};
+                        cc = ruby_scan_digits(cstrBytes, cstr + i, len - i, 16, clenOverflow);
+                        clen = clenOverflow[0];
+                        overflow = clenOverflow[1] == 1;
+                    } else {
+                        i = j;
+                        continue;
+                    }
+                    i += clen;
+                    if (overflow || cc >= charlimit || i >= len || cstrBytes[cstr + i] != ';') {
+                        i = j;
+                        continue;
+                    }
+                    if (dest == null) {
+                        dest = RubyString.newStringLight(runtime, len);
+                    }
+                    dest.cat(cstrBytes, cstr + beg, plen);
+                    if (charlimit > 256) {
+                        dest.cat(buf, 0, enc.codeToMbc(cc, buf, 0));
+                    } else {
+                        c = cc;
+                        dest.cat(c);
+                    }
+                    beg = i + 1;
+                    continue;
+                default:
+                    --i;
+                    continue;
+            }
+            if (dest == null) {
+                dest = RubyString.newStringLight(runtime, len);
+            }
+            dest.cat(cstrBytes, cstr + beg, plen);
+            dest.cat(c);
+            beg = i + 1;
+        }
+
+        if (dest != null) {
+            dest.cat(cstrBytes, cstr + beg, len - beg);
+            preserve_original_state(str, dest);
+            return dest;
+        } else {
+            return str.strDup(runtime);
+        }
+    }
+
+    static boolean ISXDIGIT(byte[] cstrBytes, int i) {
+        byte cstrByte = cstrBytes[i];
+        return (cstrByte >= '0' && cstrByte <= '9') || (cstrByte >= 'a' && cstrByte <= 'f') || (cstrByte >= 'A' && cstrByte <= 'F');
+    }
+
+    static boolean url_unreserved_char(int c) {
+        switch (c) {
+            case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
+            case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': case 'i': case 'j':
+            case 'k': case 'l': case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': case 's': case 't':
+            case 'u': case 'v': case 'w': case 'x': case 'y': case 'z':
+            case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J':
+            case 'K': case 'L': case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T':
+            case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
+            case '-': case '.': case '_': case '~':
+                return true;
+            default:
+                break;
+        }
+        return false;
+    }
+
+    static final byte[] upper_hexdigits = "0123456789ABCDEF".getBytes(RubyEncoding.UTF8);
+
+    static IRubyObject optimized_escape(Ruby runtime, RubyString str, boolean escapePlus) {
+        int i, len, beg = 0;
+        RubyString dest = null;
+        byte[] cstrBytes;
+        int cstr;
+        byte[] buf = {'%', 0, 0};
+
+        len = str.size();
+        ByteList byteList = str.getByteList();
+        cstrBytes = byteList.unsafeBytes();
+        cstr = byteList.begin();
+
+        for (i = 0; i < len; ++i) {
+            int c = cstrBytes[cstr + i] & 0xFF;
+            if (!url_unreserved_char(c)) {
+                if (dest == null) {
+                    dest = RubyString.newStringLight(runtime, len);
+                }
+
+                dest.cat(cstrBytes, cstr + beg, i - beg);
+                beg = i + 1;
+
+                if (escapePlus && c == ' ') {
+                    dest.cat('+');
+                } else {
+                    buf[1] = upper_hexdigits[(c >> 4) & 0xf];
+                    buf[2] = upper_hexdigits[c & 0xf];
+                    dest.cat(buf, 0, 3);
+                }
+            }
+        }
+
+        if (dest != null) {
+            dest.cat(cstrBytes, cstr + beg, len - beg);
+            preserve_original_state(str, dest);
+            return dest;
+        } else {
+            return str.strDup(runtime);
+        }
+    }
+
+    static IRubyObject
+    optimized_unescape(ThreadContext context, RubyString str, IRubyObject encoding, boolean unescapePlus) {
+        int i, len, beg = 0;
+        RubyString dest = null;
+        byte[] cstrBytes;
+        int cstr;
+        int cr;
+        Encoding origenc, encidx = EncodingUtils.rbToEncoding(context, encoding);
+
+        len = str.size();
+        ByteList byteList = str.getByteList();
+        cstrBytes = byteList.unsafeBytes();
+        cstr = byteList.begin();
+
+        int buf = 0;
+        Ruby runtime = context.runtime;
+
+        for (i = 0; i < len; ++i) {
+            int c = cstrBytes[cstr + i] & 0xFF;
+            int clen = 0;
+            if (c == '%') {
+                if (i + 3 > len) break;
+                if (!ISXDIGIT(cstrBytes, cstr + i + 1)) continue;
+                if (!ISXDIGIT(cstrBytes, cstr + i + 2)) continue;
+                buf = ((char_to_number(cstrBytes[cstr + i + 1]) << 4)
+                        | char_to_number(cstrBytes[cstr + i + 2]));
+                clen = 2;
+            } else if (unescapePlus && c == '+') {
+                buf = ' ';
+            } else {
+                continue;
+            }
+
+            if (dest == null) {
+                dest = RubyString.newStringLight(runtime, len);
+            }
+
+            dest.cat(cstrBytes, cstr + beg, i - beg);
+            i += clen;
+            beg = i + 1;
+
+            dest.cat(buf);
+        }
+
+        if (dest != null) {
+            dest.cat(cstrBytes, cstr + beg, len - beg);
+            preserve_original_state(str, dest);
+            cr = StringSupport.CR_UNKNOWN;
+        } else {
+            dest = str.strDup(runtime);
+            cr = str.getCodeRange();
+        }
+        origenc = str.getEncoding();
+        if (origenc != encidx) {
+            dest.setEncoding(encidx);
+            if (StringSupport.encCoderangeClean(dest.scanForCodeRange()) == 0) {
+                EncodingUtils.encAssociateIndex(dest, origenc);
+                if (cr != StringSupport.CR_UNKNOWN)
+                    dest.setCodeRange(cr);
+            }
+        }
+        return dest;
+    }
+
+    /*
+     *  call-seq:
+     *     CGI.escapeHTML(string) -> string
+     *
+     *  Returns HTML-escaped string.
+     *
+     */
+    @JRubyMethod(name = "escapeHTML", module = true, frame = true)
+    public static IRubyObject cgiesc_escape_html(ThreadContext context, IRubyObject self, IRubyObject _str) {
+        RubyString str = _str.convertToString();
+
+        if (str.getEncoding().isAsciiCompatible()) {
+            return optimized_escape_html(context.runtime, str);
+        } else {
+            return Helpers.invokeSuper(context, self, _str, Block.NULL_BLOCK);
+        }
+    }
+
+    /*
+     *  call-seq:
+     *     CGI.unescapeHTML(string) -> string
+     *
+     *  Returns HTML-unescaped string.
+     *
+     */
+    @JRubyMethod(name = "unescapeHTML", module = true, frame = true)
+    public static IRubyObject cgiesc_unescape_html(ThreadContext context, IRubyObject self, IRubyObject _str) {
+        RubyString str = _str.convertToString();
+
+        if (str.getEncoding().isAsciiCompatible()) {
+            return optimized_unescape_html(context.runtime, str);
+        } else {
+            return Helpers.invokeSuper(context, self, _str, Block.NULL_BLOCK);
+        }
+    }
+
+    /*
+     *  call-seq:
+     *     CGI.escape(string) -> string
+     *
+     *  Returns URL-escaped string.
+     *
+     */
+    @JRubyMethod(name = "escape", module = true, frame = true)
+    public static IRubyObject cgiesc_escape(ThreadContext context, IRubyObject self, IRubyObject _str) {
+        RubyString str = _str.convertToString();
+
+        if (str.getEncoding().isAsciiCompatible()) {
+            return optimized_escape(context.runtime, str, true);
+        } else {
+            return Helpers.invokeSuper(context, self, _str, Block.NULL_BLOCK);
+        }
+    }
+
+    /*
+     *  call-seq:
+     *     CGI.escapeURIComponent(string) -> string
+     *
+     *  Returns URL-escaped string following RFC 3986.
+     *
+     */
+    @JRubyMethod(name = "escapeURIComponent", alias = { "escape_uri_component" }, module = true, frame = true)
+    public static IRubyObject cgiesc_escape_uri_component(ThreadContext context, IRubyObject self, IRubyObject _str) {
+        RubyString str = _str.convertToString();
+
+        if (str.getEncoding().isAsciiCompatible()) {
+            return optimized_escape(context.runtime, str, false);
+        } else {
+            return Helpers.invokeSuper(context, self, _str, Block.NULL_BLOCK);
+        }
+    }
+
+    static IRubyObject accept_charset(IRubyObject[] args, int argc, int argv, IRubyObject self) {
+        if (argc > 0)
+            return args[argv];
+        return self.getMetaClass().getClassVar(ACCEPT_CHARSET);
+    }
+
+    /*
+     *  call-seq:
+     *     CGI.unescape(string, encoding=@@accept_charset) -> string
+     *
+     *  Returns URL-unescaped string.
+     *
+     */
+    @JRubyMethod(name = "unescape", required = 1, optional = 1, module = true, frame = true)
+    public static IRubyObject cgiesc_unescape(ThreadContext context, IRubyObject self, IRubyObject[] argv) {
+        IRubyObject _str = argv[0];
+
+        RubyString str = _str.convertToString();
+
+        if (str.getEncoding().isAsciiCompatible()) {
+            IRubyObject enc = accept_charset(argv, argv.length - 1, 1, self);
+            return optimized_unescape(context, str, enc, true);
+        } else {
+            return Helpers.invokeSuper(context, self, argv, Block.NULL_BLOCK);
+        }
+    }
+
+    /*
+     *  call-seq:
+     *     CGI.unescapeURIComponent(string, encoding=@@accept_charset) -> string
+     *
+     *  Returns URL-unescaped string following RFC 3986.
+     *
+     */
+    @JRubyMethod(name = "unescapeURIComponent", alias = { "unescape_uri_component" }, required = 1, optional = 1, module = true, frame = true)
+    public static IRubyObject cgiesc_unescape_uri_component(ThreadContext context, IRubyObject self, IRubyObject[] argv) {
+        IRubyObject _str = argv[0];
+
+        RubyString str = _str.convertToString();
+
+        if (str.getEncoding().isAsciiCompatible()) {
+            IRubyObject enc = accept_charset(argv, argv.length - 1, 1, self);
+            return optimized_unescape(context, str, enc, false);
+        } else {
+            return Helpers.invokeSuper(context, self, argv, Block.NULL_BLOCK);
+        }
+    }
+
+    public void load(Ruby runtime, boolean wrap) {
+        ThreadContext context = runtime.getCurrentContext();
+
+        RubyClass rb_cCGI = Define.defineClass(context, "CGI", runtime.getObject(), runtime.getObject().getAllocator());
+
+        RubyModule rb_mEscapeExt =
+                Define.defineModuleUnder(context, rb_cCGI, "EscapeExt")
+                        .defineMethods(context, CGIEscape.class)
+                        .extendObject(context, rb_cCGI);
+
+        Define.defineModuleUnder(context, rb_cCGI, "Escape")
+                .prependModule(context, rb_mEscapeExt);
+    }
+
+    // PORTED FROM OTHER FILES IN MRI
+
+    static int ruby_scan_digits(byte[] strBytes, int str, int len, int base, int[] retlenOverflow) {
+        int start = str;
+        int ret = 0, x;
+        int mul_overflow = Integer.MAX_VALUE / base;
+
+        retlenOverflow[1] = 0;
+
+        if (len == 0) {
+            retlenOverflow[0] = 0;
+            return 0;
+        }
+
+        do {
+            int d = ruby_digit36_to_number_table[strBytes[str++]];
+            if (d == -1 || base <= d) {
+                --str;
+                break;
+            }
+            if (mul_overflow < ret)
+                retlenOverflow[1] = 1;
+            ret *= base;
+            x = ret;
+            ret += d;
+            if (ret < x)
+                retlenOverflow[1] = 1;
+        } while (len < 0 || (--len != 0));
+        retlenOverflow[0] = str - start;
+        return ret;
+    }
+
+    static int char_to_number(int c) {
+        return ruby_digit36_to_number_table[c];
+    }
+
+    private static final int ruby_digit36_to_number_table[] = {
+            /*     0   1   2   3   4   5   6   7   8   9   a   b   c   d   e   f */
+            /*0*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*1*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*2*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*3*/  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1,
+            /*4*/ -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+            /*5*/ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
+            /*6*/ -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+            /*7*/ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
+            /*8*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*9*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*a*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*b*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*c*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*d*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*e*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            /*f*/ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    };
+}
diff --git a/core/src/main/java/org/jruby/ext/coverage/CoverageData.java b/core/src/main/java/org/jruby/ext/coverage/CoverageData.java
index 0c0942e240a..27c6cf03d12 100644
--- a/core/src/main/java/org/jruby/ext/coverage/CoverageData.java
+++ b/core/src/main/java/org/jruby/ext/coverage/CoverageData.java
@@ -91,6 +91,9 @@ public Map<String, IntList> getCoverage() {
     public synchronized void coverLine(String filename, int line) {
         Map<String, IntList> coverage = this.coverage;
 
+        // negative lines are not included in coverage
+        if (line < 0) return;
+
         if (coverage != null) {
             IntList lines = coverage.get(filename);
 
diff --git a/core/src/main/java/org/jruby/ext/date/RubyDate.java b/core/src/main/java/org/jruby/ext/date/RubyDate.java
index 8ec4986855b..4b295f4ea48 100644
--- a/core/src/main/java/org/jruby/ext/date/RubyDate.java
+++ b/core/src/main/java/org/jruby/ext/date/RubyDate.java
@@ -1687,15 +1687,6 @@ static IRubyObject parse(ThreadContext context, IRubyObject string, String forma
         return new RubyDateParser().parse(context, format, (RubyString) string);
     }
 
-    // @Deprecated(since = "9.2.0.0")
-    public static IRubyObject _strptime(ThreadContext context, IRubyObject self, IRubyObject[] args) {
-        return switch (args.length) {
-            case 1 -> _strptime(context, self, args[0]);
-            case 2 -> _strptime(context, self, args[0], args[1]);
-            default -> throw argumentError(context, args.length, 1);
-        };
-    }
-
     @JRubyMethod(name = "zone_to_diff", meta = true, visibility = Visibility.PRIVATE)
     public static IRubyObject zone_to_diff(ThreadContext context, IRubyObject self, IRubyObject zone) {
         final int offset = TimeZoneConverter.dateZoneToDiff(zone.asJavaString());
diff --git a/core/src/main/java/org/jruby/ext/digest/RubyDigest.java b/core/src/main/java/org/jruby/ext/digest/RubyDigest.java
index 11c9869b467..c66dfe58456 100644
--- a/core/src/main/java/org/jruby/ext/digest/RubyDigest.java
+++ b/core/src/main/java/org/jruby/ext/digest/RubyDigest.java
@@ -532,7 +532,9 @@ public IRubyObject initialize_copy(ThreadContext context, IRubyObject obj) {
             from.checkFrozen();
 
             try {
-                this.algo = (MessageDigest) from.algo.clone();
+                synchronized (from) {
+                    this.algo = (MessageDigest) from.algo.clone();
+                }
             } catch (CloneNotSupportedException e) {
                 String name = from.algo.getAlgorithm();
                 throw typeError(context, "Could not initialize copy of digest (" + name + ")");
@@ -541,7 +543,7 @@ public IRubyObject initialize_copy(ThreadContext context, IRubyObject obj) {
         }
 
         @JRubyMethod(name = {"update", "<<"})
-        public IRubyObject update(IRubyObject obj) {
+        public synchronized IRubyObject update(IRubyObject obj) {
             ByteList bytes = obj.convertToString().getByteList();
             algo.update(bytes.getUnsafeBytes(), bytes.getBegin(), bytes.getRealSize());
             return this;
@@ -553,7 +555,7 @@ public IRubyObject finish() {
         }
 
         @JRubyMethod()
-        public IRubyObject finish(ThreadContext context) {
+        public synchronized IRubyObject finish(ThreadContext context) {
             IRubyObject digest = RubyString.newStringNoCopy(context.runtime, algo.digest());
             algo.reset();
             return digest;
@@ -581,13 +583,13 @@ public IRubyObject block_length(ThreadContext context) {
         }
 
         @JRubyMethod()
-        public IRubyObject reset() {
+        public synchronized IRubyObject reset() {
             algo.reset();
             return this;
         }
 
         @JRubyMethod()
-        public IRubyObject bubblebabble(ThreadContext context) {
+        public synchronized IRubyObject bubblebabble(ThreadContext context) {
             final byte[] digest = algo.digest();
             return newString(context, BubbleBabble.bubblebabble(digest, 0, digest.length));
         }
diff --git a/core/src/main/java/org/jruby/ext/ffi/Platform.java b/core/src/main/java/org/jruby/ext/ffi/Platform.java
index c6e7ed464bd..e8a3dfa83ec 100644
--- a/core/src/main/java/org/jruby/ext/ffi/Platform.java
+++ b/core/src/main/java/org/jruby/ext/ffi/Platform.java
@@ -92,6 +92,7 @@ public enum CPU_TYPE {
         ARM,
         AARCH64,
         LOONGARCH64,
+        RISCV64,
         UNKNOWN;
         @Override
         public String toString() { return name().toLowerCase(LOCALE); }
@@ -157,6 +158,8 @@ private static final CPU_TYPE determineCPU() {
             return CPU.AARCH64;
         } else if ("loongarch64".equals(archString)) {
             return CPU.LOONGARCH64;
+        } else if ("riscv64".equals(archString)) {
+            return CPU.RISCV64;
 	} else if ("universal".equals(archString)) {
             // OS X OpenJDK7 builds report "universal" right now
             String bits = SafePropertyAccessor.getProperty("sun.arch.data.model");
@@ -217,6 +220,7 @@ private static int determineArchDataModel() {
                 case S390X:
                 case AARCH64:
                 case LOONGARCH64:
+                case RISCV64:
                     dataModel = 64;
                     break;
                 default:
diff --git a/core/src/main/java/org/jruby/ext/ffi/Util.java b/core/src/main/java/org/jruby/ext/ffi/Util.java
index 2896dfdc14b..43967f7dc46 100644
--- a/core/src/main/java/org/jruby/ext/ffi/Util.java
+++ b/core/src/main/java/org/jruby/ext/ffi/Util.java
@@ -159,11 +159,6 @@ public static final IRubyObject newUnsigned64(Ruby runtime, long value) {
                     : RubyFixnum.newFixnum(runtime, value);
     }
 
-    @Deprecated(since = "1.4.0")
-    public static final <T> T convertParameter(IRubyObject parameter, Class<T> paramClass) {
-        return paramClass.cast(parameter.toJava(paramClass));
-    }
-
     public static final ByteBuffer slice(ByteBuffer buf, int offset) {
         ByteBuffer tmp = buf.duplicate();
         positionBuffer(tmp, offset);
diff --git a/core/src/main/java/org/jruby/ext/ffi/jffi/DataConverters.java b/core/src/main/java/org/jruby/ext/ffi/jffi/DataConverters.java
index 790d2242bba..2e3325ee7e6 100644
--- a/core/src/main/java/org/jruby/ext/ffi/jffi/DataConverters.java
+++ b/core/src/main/java/org/jruby/ext/ffi/jffi/DataConverters.java
@@ -21,6 +21,7 @@ public class DataConverters {
     @SuppressWarnings("unchecked")
     private static final Map<IRubyObject, NativeDataConverter> enumConverters = Collections.synchronizedMap(new WeakIdentityHashMap());
 
+    // Deprecated but no replacement
     @Deprecated(since = "1.7.17")
     static boolean isEnumConversionRequired(Type type, RubyHash enums) {
         if (type instanceof Type.Builtin && enums != null && !enums.isEmpty()) {
@@ -94,6 +95,7 @@ static NativeDataConverter getParameterConverter(Type type) {
         return null;
     }
 
+    // Deprecated but no replacement
     @Deprecated(since = "1.7.17")
     static NativeDataConverter getParameterConverter(Type type, RubyHash enums) {
         if (isEnumConversionRequired(type, enums)) {
diff --git a/core/src/main/java/org/jruby/ext/ffi/jffi/DefaultMethod.java b/core/src/main/java/org/jruby/ext/ffi/jffi/DefaultMethod.java
index bae98184b82..81ce718e588 100644
--- a/core/src/main/java/org/jruby/ext/ffi/jffi/DefaultMethod.java
+++ b/core/src/main/java/org/jruby/ext/ffi/jffi/DefaultMethod.java
@@ -37,11 +37,6 @@ public final DynamicMethod dup() {
         return this;
     }
 
-    @Deprecated(since = "9.4.3.0") @Override
-    public final Arity getArity() {
-        return arity;
-    }
-
     @Override
     public final boolean isNative() {
         return true;
diff --git a/core/src/main/java/org/jruby/ext/ffi/jffi/NativeInvoker.java b/core/src/main/java/org/jruby/ext/ffi/jffi/NativeInvoker.java
index 8b52a9c7fc1..844936ed3ef 100644
--- a/core/src/main/java/org/jruby/ext/ffi/jffi/NativeInvoker.java
+++ b/core/src/main/java/org/jruby/ext/ffi/jffi/NativeInvoker.java
@@ -42,10 +42,6 @@ public final DynamicMethod dup() {
         return this;
     }
 
-    @Deprecated(since = "9.4.3.0") @Override
-    public final Arity getArity() {
-        return arity;
-    }
     @Override
     public final boolean isNative() {
         return true;
diff --git a/core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java b/core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java
index 84c15addc5f..1c6435a0abf 100644
--- a/core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java
+++ b/core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java
@@ -227,7 +227,7 @@ private static void fiberCalledAcrossThreads(Ruby runtime) {
         throw runtime.newFiberError("fiber called across threads");
     }
 
-    @JRubyMethod(rest = true)
+    @JRubyMethod(optional = 4, checkArity = false, keywords = true)
     public IRubyObject raise(ThreadContext context, IRubyObject[] args) {
         return raise(context, RubyThread.prepareRaiseException(context, args));
     }
@@ -406,11 +406,9 @@ public IRubyObject raise(ThreadContext context, IRubyObject exception) {
         try {
             result = exchangeWithFiber(context, currentFiberData, data, val);
         } finally {
-            if (result == null) {
-                // exception raised, mark transfer as completed
-                data.prev = null;
-                currentFiberData.transferred = false;
-            }
+                // exception transferred, mark as completed
+            data.prev = null;
+            currentFiberData.transferred = false;
         }
 
         if (result.type == RequestType.RAISE) {
diff --git a/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java b/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java
index ea461a1266e..710983a4a89 100644
--- a/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java
+++ b/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java
@@ -77,7 +77,7 @@ public void load(Ruby runtime, boolean wrap) {
         var Object = objectClass(context);
 
         // load Ruby parts of the 'jruby' library
-        loadService(context).loadFromClassLoader(runtime.getJRubyClassLoader(), "jruby/jruby.rb", false);
+        loadService(context).loadFromClassLoader("jruby/jruby.rb", false);
 
         var JRuby = defineModule(context, "JRuby").
                 defineMethods(context, JRubyLibrary.class).defineMethods(context, JRubyUtilLibrary.class);
@@ -301,12 +301,6 @@ public static IRubyObject compile(ThreadContext context, IRubyObject recv, IRuby
                 Block.NULL_BLOCK);
     }
 
-    @Deprecated(since = "9.2.1.0") // @JRubyMethod(meta = true, visibility = Visibility.PRIVATE)
-    public static IRubyObject load_string_ext(ThreadContext context, IRubyObject recv) {
-        CoreExt.loadStringExtensions(context);
-        return context.nil;
-    }
-
     @JRubyMethod(module = true)
     public static IRubyObject subclasses(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         return subclasses(context, recv, arg instanceof RubyClass ? (RubyClass) arg : arg.getMetaClass(), false);
diff --git a/core/src/main/java/org/jruby/ext/jruby/JRubyUtilLibrary.java b/core/src/main/java/org/jruby/ext/jruby/JRubyUtilLibrary.java
index e6ca3c126d4..37db8edf852 100644
--- a/core/src/main/java/org/jruby/ext/jruby/JRubyUtilLibrary.java
+++ b/core/src/main/java/org/jruby/ext/jruby/JRubyUtilLibrary.java
@@ -112,11 +112,6 @@ public static IRubyObject native_posix_p(ThreadContext context, IRubyObject self
         return asBoolean(context, context.runtime.getPosix().isNative());
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public static IRubyObject getClassLoaderResources(IRubyObject recv, IRubyObject name) {
-        return class_loader_resources(((RubyBasicObject) recv).getCurrentContext(), recv, name);
-    }
-
     /**
      * Loads a (Java) class.
      * @param context
@@ -404,13 +399,6 @@ private static Object getSyncObject(IRubyObject arg) {
         return obj;
     }
 
-    @Deprecated(since = "9.2.0.0") // since 9.2 only loaded with require 'core_ext/string.rb'
-    public static class StringUtils {
-        public static IRubyObject unseeded_hash(ThreadContext context, IRubyObject recv) {
-            return CoreExt.String.unseeded_hash(context, recv);
-        }
-    }
-
     /**
      * Provide stats on how many method and constant invalidations have occurred globally.
      * This was added for Pry in https://github.com/jruby/jruby/issues/4384
diff --git a/core/src/main/java/org/jruby/ext/monitor/MonitorLibrary.java b/core/src/main/java/org/jruby/ext/monitor/MonitorLibrary.java
index 2454dd0e119..62777e4baef 100644
--- a/core/src/main/java/org/jruby/ext/monitor/MonitorLibrary.java
+++ b/core/src/main/java/org/jruby/ext/monitor/MonitorLibrary.java
@@ -29,9 +29,6 @@
 package org.jruby.ext.monitor;
 
 import org.jruby.Ruby;
-import org.jruby.ext.set.EnumerableExt;
-import org.jruby.ext.set.RubySet;
-import org.jruby.ext.set.RubySortedSet;
 import org.jruby.runtime.load.Library;
 
 public final class MonitorLibrary implements Library {
diff --git a/core/src/main/java/org/jruby/ext/pathname/RubyPathname.java b/core/src/main/java/org/jruby/ext/pathname/RubyPathname.java
index 02406aa3061..c6f26c1c366 100644
--- a/core/src/main/java/org/jruby/ext/pathname/RubyPathname.java
+++ b/core/src/main/java/org/jruby/ext/pathname/RubyPathname.java
@@ -35,6 +35,7 @@
 import static org.jruby.api.Convert.asSymbol;
 import static org.jruby.api.Create.*;
 import static org.jruby.api.Error.argumentError;
+import static org.jruby.api.Error.typeError;
 
 import org.jruby.*;
 import org.jruby.anno.JRubyClass;
@@ -42,6 +43,7 @@
 import org.jruby.api.Access;
 import org.jruby.api.Define;
 import org.jruby.exceptions.RaiseException;
+import org.jruby.exceptions.TypeError;
 import org.jruby.internal.runtime.methods.JavaMethod;
 import org.jruby.runtime.*;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -152,7 +154,8 @@ public RubyPathname(Ruby runtime, RubyClass metaClass) {
 
     public static RubyPathname newInstance(ThreadContext context, RubyClass klass, IRubyObject path) {
         RubyPathname pathname = new RubyPathname(context.runtime, klass);
-        return (RubyPathname) pathname.initialize(context, path);
+        pathname.initialize(context, path);
+        return pathname;
     }
 
     public static RubyPathname newInstance(ThreadContext context, IRubyObject path) {
@@ -161,13 +164,12 @@ public static RubyPathname newInstance(ThreadContext context, IRubyObject path)
 
     @JRubyMethod(visibility = Visibility.PRIVATE)
     public IRubyObject initialize(ThreadContext context, IRubyObject path) {
-        if (path.respondsTo("to_path")) path = path.callMethod(context, "to_path");
-
-        RubyString str = path.convertToString();
-        if (str.getByteList().indexOf('\0') != -1) throw argumentError(context, "pathname contains null byte");
-
-        setPath((RubyString) str.dup());
-        return this;
+        try {
+            setPath((RubyString) RubyFile.get_path(context, path).dup());
+        } catch (TypeError te) {
+            throw typeError(context, "Pathname.new requires a String, #to_path or #to_str");
+        }
+        return context.nil;
     }
 
     @JRubyMethod(visibility = Visibility.PRIVATE)
@@ -376,6 +378,11 @@ public IRubyObject empty_p(ThreadContext context) {
                 fileTest.callMethod(context, "empty?", getPath());
     }
 
+    @JRubyMethod(name = "lutime")
+    public IRubyObject lutime(ThreadContext context, IRubyObject atime, IRubyObject mtime) {
+        return RubyFile.lutime(context, context.runtime.getFile(), atime, mtime, getPath());
+    }
+
     /* Helpers */
 
     private IRubyObject[] insertPath(IRubyObject[] args, int i) {
diff --git a/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java b/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
index 720de40e5a4..0fa53198632 100644
--- a/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
+++ b/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
@@ -42,6 +42,7 @@
 import org.jcodings.Config;
 import org.jruby.Ruby;
 import org.jruby.RubyHash;
+import org.jruby.RubyHashLinkedBuckets;
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyModule;
@@ -112,6 +113,7 @@ public static String getArchitecture() {
         if ("amd64".equals(architecture)) architecture = "x86_64";
         if ("aarch64".equals(architecture) && Platform.IS_MAC) architecture = "arm64";
         if ("loongarch64".equals(architecture)) architecture = "loongarch64";
+        if ("riscv64".equals(architecture)) architecture = "riscv64";
 
         return architecture;
     }
@@ -236,7 +238,7 @@ public void load(Ruby runtime, boolean wrap) {
                 defineConstant(context, "DESTDIR", destDir);                            // DESTDIR on make install.
 
         // The hash configurations stored.
-        final RubyHash CONFIG = new RubyHash(runtime, 48);
+        final RubyHash CONFIG = RubyHashLinkedBuckets.newLBHash(runtime, 48);
 
         CONFIG.fastASetCheckString(runtime, newString(context, "DESTDIR"), destDir);
 
@@ -392,7 +394,7 @@ public void load(Ruby runtime, boolean wrap) {
 
 
         // TODO CONFIG and MAKEFILE_CONFIG seems to be the same Hash in Ruby 2.5
-        final RubyHash mkmfHash = new RubyHash(runtime, 64);
+        final RubyHash mkmfHash = RubyHashLinkedBuckets.newLBHash(runtime, 64);
 
         setConfig(context, mkmfHash, "libdir", vendorDirGeneral);
         setConfig(context, mkmfHash, "arch", "java");
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.java b/core/src/main/java/org/jruby/ext/ripper/RipperParser.java
index a27456752e1..c6e435998d3 100644
--- a/core/src/main/java/org/jruby/ext/ripper/RipperParser.java
+++ b/core/src/main/java/org/jruby/ext/ripper/RipperParser.java
@@ -247,362 +247,364 @@ public RipperParser(ThreadContext context, IRubyObject ripper, LexerSource sourc
       Order is mandated by <i>jay</i>.
     */
   protected static final int[] yyLhs = {
-//yyLhs 823
-    -1,   228,     0,    35,    36,    36,    36,    37,    37,    30,
-    38,   231,   232,    41,   233,    41,    42,    43,    43,    43,
-    44,   234,    44,    34,   216,   235,    45,    45,    45,    45,
+//yyLhs 827
+    -1,   229,     0,    35,    36,    36,    36,    37,    37,    30,
+    38,   232,   233,    41,   234,    41,    42,    43,    43,    43,
+    44,   235,    44,    34,   217,   236,    45,    45,    45,    45,
     45,    45,    45,    45,    45,    45,    45,    45,    45,    45,
-    45,    45,    45,    45,    85,    85,    85,    85,    85,    85,
-    85,    85,    85,    85,    40,    40,    40,    83,    83,    83,
-    46,    46,    46,    46,    46,   237,    46,   238,    46,    46,
-    27,    28,   239,    29,    52,    52,   240,   242,    53,    50,
-    50,    90,    90,   128,    57,    49,    49,    49,    49,    49,
-    49,    49,    49,    49,    49,    49,    49,   133,   133,   139,
-   139,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-   135,   136,   136,   134,   134,   138,   138,   137,   137,   137,
-   137,   137,   137,   137,   137,   137,   137,   137,   137,   137,
-   137,   137,   137,   137,   137,   137,   130,   130,   130,   130,
-   130,   130,   130,   130,   130,   130,   130,   130,   130,   130,
-   130,   130,   130,   130,   130,   167,   167,    26,    26,    26,
-   169,   169,   169,   169,   169,   132,   132,   107,   244,   107,
-   168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,    47,    47,    47,    47,    47,    47,    47,    47,    47,
+    45,    45,    45,    45,    86,    86,    86,    86,    86,    86,
+    86,    86,    86,    86,    86,    40,    40,    40,    84,    84,
+    84,    46,    46,    46,    46,    46,   238,    46,   239,    46,
+    46,    27,    28,   240,    29,    53,    53,   241,   243,    54,
+    50,    50,    51,    91,    91,   129,    58,    49,    49,    49,
+    49,    49,    49,    49,    49,    49,    49,    49,    49,   134,
+   134,   140,   140,   136,   136,   136,   136,   136,   136,   136,
+   136,   136,   136,   137,   137,   135,   135,   139,   139,   138,
+   138,   138,   138,   138,   138,   138,   138,   138,   138,   138,
+   138,   138,   138,   138,   138,   138,   138,   138,   131,   131,
+   131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+   131,   131,   131,   131,   131,   131,   131,   168,   168,    26,
+    26,    26,   170,   170,   170,   170,   170,   133,   133,   108,
+   245,   108,   169,   169,   169,   169,   169,   169,   169,   169,
+   169,   169,   169,   169,   169,   169,   169,   169,   169,   169,
+   169,   169,   169,   169,   169,   169,   169,   169,   169,   169,
+   169,   169,   181,   181,   181,   181,   181,   181,   181,   181,
+   181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+   181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+   181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+   181,   181,   181,    47,    47,    47,    47,    47,    47,    47,
     47,    47,    47,    47,    47,    47,    47,    47,    47,    47,
     47,    47,    47,    47,    47,    47,    47,    47,    47,    47,
     47,    47,    47,    47,    47,    47,    47,    47,    47,    47,
-    47,    47,    47,    47,    47,    47,    39,    39,    39,   181,
-   181,   181,   181,    56,    56,   193,   213,   219,    54,    78,
-    78,    78,    78,    84,    84,    71,    71,    71,    72,    72,
-    70,    70,    70,    70,    70,    69,    69,    69,    69,    69,
-   246,    77,    80,    80,    79,    79,    67,    67,    67,    67,
-    68,    68,    87,    87,    86,    86,    86,    48,    48,    48,
-    48,    48,    48,    48,    48,    48,    48,    48,   247,    48,
-   248,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+    47,    47,    47,    47,    47,    47,    47,    47,    39,    39,
+    39,   182,   182,   182,   182,    57,    57,   194,   214,   220,
+    55,    79,    79,    79,    79,    85,    85,    72,    72,    72,
+    73,    73,    71,    71,    71,    71,    71,    70,    70,    70,
+    70,    70,    70,    70,   247,    78,    81,    81,    80,    80,
+    68,    68,    68,    68,    69,    69,    88,    88,    87,    87,
+    87,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+    48,    48,   248,    48,   249,    48,    48,    48,    48,    48,
     48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-    48,    48,   250,    48,   251,    48,    48,    48,   252,    48,
-   254,    48,   255,    48,   256,    48,   257,    48,    48,    48,
-    48,    48,    55,   203,   204,   212,    31,    32,   211,    33,
-   214,   215,   209,   205,   206,   217,   218,   202,   201,   207,
-   210,   210,   200,   243,   249,   249,   249,   241,   241,    58,
-    58,    59,    59,   110,   110,   100,   100,   101,   101,   103,
-   103,   103,   103,   103,   102,   102,   189,   189,   259,   258,
-    75,    75,    75,    75,    76,    76,   191,   111,   111,   111,
-   111,   111,   111,   111,   111,   111,   111,   111,   111,   111,
-   111,   111,   112,   112,   113,   113,   120,   120,   119,   119,
-   121,   121,   225,   226,   227,   260,   261,   122,   126,   126,
-   123,   262,   123,   129,    89,    89,    89,    89,    51,    51,
-    51,    51,    51,    51,    51,    51,    51,   127,   127,   263,
-   124,   264,   125,    61,    61,    61,    61,    60,    62,    62,
-   224,   223,   220,   265,   140,   141,   141,   142,   142,   142,
-   143,   143,   143,   143,   143,   143,   144,   145,   145,   146,
-   146,   221,   222,   147,   147,   147,   147,   147,   147,   147,
-   147,   147,   147,   147,   147,   147,   266,   147,   147,   147,
-   149,   149,   149,   149,   149,   149,   150,   150,   151,   151,
-   148,   183,   183,   152,   152,   153,   160,   160,   160,   160,
-   161,   161,   162,   162,   187,   187,   184,   184,   185,   186,
-   186,   154,   154,   154,   154,   154,   154,   154,   154,   154,
-   154,   155,   155,   155,   155,   155,   155,   155,   155,   155,
-   155,   155,   155,   155,   155,   155,   155,   156,   157,   157,
-   158,   159,   159,   159,    63,    63,    64,    64,    64,    65,
-    65,    66,    66,    20,    20,     2,     3,     3,     3,     4,
-     5,     6,   267,   267,    11,    16,    16,    19,    19,    12,
-    13,    13,    14,    15,    17,    17,    18,    18,     7,     7,
-     8,     8,     9,     9,    10,   268,    10,   269,   270,   271,
-   272,    10,   273,   273,   109,   109,    25,    25,    23,   163,
-   163,    24,    21,    21,    22,    22,    22,    22,   192,   192,
-   192,    81,    81,    81,    81,    81,    81,    81,    81,    81,
-    81,    81,    81,    82,    82,    82,    82,    82,    82,    82,
-    82,    82,    82,    82,    82,   108,   108,   274,    88,    88,
-    94,    94,    95,    93,   275,    93,    73,    73,    73,    73,
-    73,    74,    74,    96,    96,    96,    96,    96,    96,    96,
-    96,    96,    96,    96,    96,    96,    96,    96,   190,   174,
-   174,   174,   174,   173,   173,   177,    98,    98,    97,    97,
-   176,   116,   116,   118,   118,   117,   117,   115,   115,   196,
-   196,   188,   175,   175,   114,    92,    91,    91,    99,    99,
-   195,   195,   170,   170,   194,   194,   171,   171,   172,   172,
-     1,   276,     1,   104,   104,   105,   105,   106,   106,   106,
-   106,   106,   106,   164,   164,   164,   165,   165,   166,   166,
-   166,   182,   182,   178,   178,   179,   179,   229,   229,   236,
-   236,   197,   198,   208,   245,   245,   245,   253,   253,   230,
-   230,   131,   199,
+    48,    48,    48,    48,    48,    48,   251,    48,   252,    48,
+    48,    48,   253,    48,   255,    48,   256,    48,   257,    48,
+   258,    48,    48,    48,    48,    48,    56,   204,   205,   213,
+    31,    32,   212,    33,   215,   216,   210,   206,   207,   218,
+   219,   203,   202,   208,   211,   211,   201,   244,   250,   250,
+   250,   242,   242,    59,    59,    60,    60,   111,   111,   101,
+   101,   102,   102,   104,   104,   104,   104,   104,   103,   103,
+   190,   190,   260,   259,    76,    76,    76,    76,    77,    77,
+   192,   112,   112,   112,   112,   112,   112,   112,   112,   112,
+   112,   112,   112,   112,   112,   112,   113,   113,   114,   114,
+   121,   121,   120,   120,   122,   122,   226,   227,   228,   261,
+   262,   123,   127,   127,   124,   263,   124,   130,    90,    90,
+    90,    90,    52,    52,    52,    52,    52,    52,    52,    52,
+    52,   128,   128,   264,   125,   265,   126,    62,    62,    62,
+    62,    61,    63,    63,   225,   224,   221,   266,   141,   142,
+   142,   143,   143,   143,   144,   144,   144,   144,   144,   144,
+   145,   146,   146,   147,   147,   222,   223,   148,   148,   148,
+   148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
+   267,   148,   148,   148,   150,   150,   150,   150,   150,   150,
+   151,   151,   152,   152,   149,   184,   184,   153,   153,   154,
+   161,   161,   161,   161,   162,   162,   163,   163,   188,   188,
+   185,   185,   186,   187,   187,   155,   155,   155,   155,   155,
+   155,   155,   155,   155,   155,   156,   156,   156,   156,   156,
+   156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
+   156,   157,   158,   158,   159,   160,   160,   160,    64,    64,
+    65,    65,    65,    66,    66,    67,    67,    20,    20,     2,
+     3,     3,     3,     4,     5,     6,   268,   268,    11,    16,
+    16,    19,    19,    12,    13,    13,    14,    15,    17,    17,
+    18,    18,     7,     7,     8,     8,     9,     9,    10,   269,
+    10,   270,   271,   272,   273,    10,   274,   274,   110,   110,
+    25,    25,    23,   164,   164,    24,    21,    21,    22,    22,
+    22,    22,   193,   193,   193,    82,    82,    82,    82,    82,
+    82,    82,    82,    82,    82,    82,    82,    83,    83,    83,
+    83,    83,    83,    83,    83,    83,    83,    83,    83,   109,
+   109,   275,    89,    89,    95,    95,    96,    94,   276,    94,
+    74,    74,    74,    74,    74,    75,    75,    97,    97,    97,
+    97,    97,    97,    97,    97,    97,    97,    97,    97,    97,
+    97,    97,   191,   175,   175,   175,   175,   174,   174,   178,
+    99,    99,    98,    98,   177,   117,   117,   119,   119,   118,
+   118,   116,   116,   197,   197,   189,   176,   176,   115,    93,
+    92,    92,   100,   100,   196,   196,   171,   171,   195,   195,
+   172,   172,   173,   173,     1,   277,     1,   105,   105,   106,
+   106,   107,   107,   107,   107,   107,   107,   165,   165,   165,
+   166,   166,   167,   167,   167,   183,   183,   179,   179,   180,
+   180,   230,   230,   237,   237,   198,   199,   209,   246,   246,
+   246,   254,   254,   231,   231,   132,   200,
     }, yyLen = {
-//yyLen 823
+//yyLen 827
      2,     0,     2,     2,     1,     1,     3,     1,     2,     1,
      3,     0,     0,     8,     0,     5,     2,     1,     1,     3,
      1,     0,     3,     0,     2,     0,     4,     3,     3,     3,
      2,     3,     3,     3,     3,     4,     5,     1,     4,     4,
      7,     4,     1,     1,     4,     4,     7,     6,     6,     6,
-     6,     4,     4,     4,     1,     4,     3,     1,     4,     1,
-     1,     3,     3,     3,     2,     0,     7,     0,     7,     1,
-     1,     2,     0,     5,     1,     1,     0,     0,     4,     1,
-     1,     1,     4,     3,     1,     2,     3,     4,     5,     4,
-     5,     6,     2,     2,     2,     2,     2,     1,     3,     1,
-     3,     1,     2,     3,     5,     2,     4,     2,     4,     1,
-     3,     1,     3,     2,     3,     1,     3,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
-     3,     3,     3,     3,     2,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     4,     3,
-     3,     3,     3,     2,     1,     1,     1,     2,     1,     3,
-     1,     1,     1,     1,     1,     1,     1,     1,     0,     4,
+     6,     5,     4,     4,     4,     1,     4,     3,     1,     4,
+     1,     1,     3,     3,     3,     2,     0,     7,     0,     7,
+     1,     1,     2,     0,     5,     1,     1,     0,     0,     4,
+     1,     1,     1,     1,     4,     3,     1,     2,     3,     4,
+     5,     4,     5,     6,     2,     2,     2,     2,     2,     1,
+     3,     1,     3,     1,     2,     3,     5,     2,     4,     2,
+     4,     1,     3,     1,     3,     2,     3,     1,     3,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     4,     3,     3,     3,     3,     2,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     4,     3,     3,     3,     3,     2,     1,     1,     1,     2,
+     1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+     0,     4,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     4,     4,     7,     6,     6,     6,     6,     5,     4,
-     3,     3,     2,     2,     2,     2,     3,     3,     3,     3,
-     3,     3,     4,     2,     2,     3,     3,     3,     3,     1,
-     3,     3,     3,     3,     3,     2,     2,     3,     3,     3,
-     3,     4,     6,     4,     4,     1,     1,     4,     3,     1,
-     1,     1,     1,     3,     3,     1,     1,     1,     1,     1,
-     2,     4,     2,     1,     4,     3,     5,     3,     1,     1,
-     1,     1,     2,     4,     2,     1,     2,     2,     4,     1,
-     0,     2,     2,     1,     2,     1,     1,     1,     3,     3,
-     2,     1,     1,     1,     3,     4,     2,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     0,     4,
-     0,     4,     3,     3,     2,     3,     3,     1,     4,     3,
-     1,     6,     4,     3,     2,     1,     2,     1,     6,     6,
-     4,     4,     0,     6,     0,     5,     5,     6,     0,     6,
-     0,     7,     0,     5,     0,     5,     0,     5,     1,     1,
-     1,     1,     1,     1,     1,     1,     2,     2,     1,     2,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     2,     1,     1,     1,
-     5,     1,     2,     1,     1,     1,     3,     1,     3,     1,
-     3,     5,     1,     3,     2,     1,     1,     1,     0,     2,
-     4,     2,     2,     1,     2,     0,     1,     6,     8,     4,
-     6,     4,     2,     6,     2,     4,     6,     2,     4,     2,
-     4,     1,     1,     1,     3,     4,     1,     4,     1,     3,
-     1,     1,     0,     0,     0,     0,     0,     9,     4,     1,
-     3,     0,     4,     3,     2,     4,     5,     5,     2,     4,
-     4,     3,     3,     3,     2,     1,     4,     3,     3,     0,
-     7,     0,     7,     1,     2,     3,     4,     5,     1,     1,
-     0,     0,     0,     0,     9,     1,     1,     1,     3,     3,
-     1,     2,     3,     1,     1,     1,     1,     3,     1,     3,
-     1,     2,     2,     1,     1,     4,     4,     4,     3,     4,
-     4,     4,     3,     3,     3,     2,     0,     6,     2,     4,
-     1,     1,     2,     2,     4,     1,     2,     3,     1,     3,
-     5,     2,     1,     1,     3,     1,     3,     1,     2,     1,
-     1,     3,     2,     1,     1,     3,     2,     1,     2,     1,
-     1,     1,     3,     3,     2,     2,     1,     1,     1,     2,
+     1,     1,     1,     4,     4,     7,     6,     6,     6,     6,
+     5,     4,     3,     3,     2,     2,     2,     2,     3,     3,
+     3,     3,     3,     3,     4,     2,     2,     3,     3,     3,
+     3,     1,     3,     3,     3,     3,     3,     2,     2,     3,
+     3,     3,     3,     4,     4,     4,     6,     1,     1,     4,
+     3,     1,     1,     1,     1,     3,     3,     1,     1,     1,
+     1,     1,     2,     4,     2,     1,     4,     3,     5,     3,
+     1,     1,     1,     1,     2,     4,     2,     1,     4,     4,
+     2,     2,     4,     1,     0,     2,     2,     1,     2,     1,
+     1,     1,     3,     3,     2,     1,     1,     1,     3,     4,
      2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
-     4,     2,     3,     1,     6,     1,     1,     1,     1,     2,
-     1,     2,     1,     1,     1,     1,     1,     1,     2,     3,
-     3,     3,     1,     2,     4,     0,     3,     1,     2,     4,
-     0,     3,     4,     4,     0,     3,     0,     3,     0,     2,
-     0,     2,     0,     2,     1,     0,     3,     0,     0,     0,
-     0,     7,     1,     1,     1,     1,     1,     1,     2,     1,
-     1,     3,     1,     2,     1,     1,     1,     1,     1,     1,
+     1,     1,     0,     4,     0,     4,     3,     3,     2,     3,
+     3,     1,     4,     3,     1,     6,     4,     3,     2,     1,
+     2,     1,     6,     6,     4,     4,     0,     6,     0,     5,
+     5,     6,     0,     6,     0,     7,     0,     5,     0,     5,
+     0,     5,     1,     1,     1,     1,     1,     1,     1,     1,
+     2,     2,     1,     2,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     2,     1,     1,     1,     5,     1,     2,     1,     1,     1,
+     3,     1,     3,     1,     3,     5,     1,     3,     2,     1,
+     1,     1,     0,     2,     4,     2,     2,     1,     2,     0,
+     1,     6,     8,     4,     6,     4,     2,     6,     2,     4,
+     6,     2,     4,     2,     4,     1,     1,     1,     3,     4,
+     1,     4,     1,     3,     1,     1,     0,     0,     0,     0,
+     0,     9,     4,     1,     3,     0,     4,     3,     2,     4,
+     5,     5,     2,     4,     4,     3,     3,     3,     2,     1,
+     4,     3,     3,     0,     7,     0,     7,     1,     2,     3,
+     4,     5,     1,     1,     0,     0,     0,     0,     9,     1,
+     1,     1,     3,     3,     1,     2,     3,     1,     1,     1,
+     1,     3,     1,     3,     1,     2,     2,     1,     1,     4,
+     4,     4,     3,     4,     4,     4,     3,     3,     3,     2,
+     0,     6,     2,     4,     1,     1,     2,     2,     4,     1,
+     2,     3,     1,     3,     5,     2,     1,     1,     3,     1,
+     3,     1,     2,     1,     1,     3,     2,     1,     1,     3,
+     2,     1,     2,     1,     1,     1,     3,     3,     2,     2,
+     1,     1,     1,     2,     2,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     0,     4,     0,
-     1,     1,     3,     1,     0,     3,     4,     2,     2,     1,
-     1,     2,     0,     6,     8,     4,     6,     4,     6,     2,
-     4,     6,     2,     4,     2,     4,     1,     0,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     3,     1,     3,
-     1,     2,     1,     2,     1,     1,     3,     1,     3,     1,
-     1,     1,     2,     1,     3,     3,     1,     3,     1,     3,
-     1,     1,     2,     1,     1,     1,     2,     1,     2,     0,
-     1,     0,     4,     1,     2,     1,     3,     3,     2,     1,
-     4,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     0,     1,     0,
-     1,     2,     2,     2,     0,     1,     1,     1,     1,     1,
-     2,     0,     0,
+     1,     1,     2,     2,     4,     2,     3,     1,     6,     1,
+     1,     1,     1,     2,     1,     2,     1,     1,     1,     1,
+     1,     1,     2,     3,     3,     3,     1,     2,     4,     0,
+     3,     1,     2,     4,     0,     3,     4,     4,     0,     3,
+     0,     3,     0,     2,     0,     2,     0,     2,     1,     0,
+     3,     0,     0,     0,     0,     7,     1,     1,     1,     1,
+     1,     1,     2,     1,     1,     3,     1,     2,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     0,     4,     0,     1,     1,     3,     1,     0,     3,
+     4,     2,     2,     1,     1,     2,     0,     6,     8,     4,
+     6,     4,     6,     2,     4,     6,     2,     4,     2,     4,
+     1,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     3,     1,     3,     1,     2,     1,     2,     1,     1,
+     3,     1,     3,     1,     1,     1,     2,     1,     3,     3,
+     1,     3,     1,     3,     1,     1,     2,     1,     1,     1,
+     2,     1,     2,     0,     1,     0,     4,     1,     2,     1,
+     3,     3,     2,     1,     4,     2,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     0,     1,     0,     1,     2,     2,     2,     0,     1,
+     1,     1,     1,     1,     2,     0,     0,
     }, yyDefRed = {
-//yyDefRed 1399
-     1,     0,     0,    43,   400,   401,   402,     0,   393,   394,
-   395,   398,    23,    23,    23,     0,     0,   390,   391,   412,
-   413,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   821,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   674,   675,   676,   677,   626,   705,   706,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   475,     0,
-   648,   650,   652,     0,     0,     0,     0,     0,     0,   338,
-     0,   627,   339,   340,   341,   343,   342,   344,   337,   623,
-   672,   666,   667,   624,     0,     0,    76,    76,     0,     2,
-     0,     5,     0,     0,     0,     0,     0,    60,     0,     0,
-     0,     0,   345,     0,    37,     0,    80,     0,   367,     0,
-     4,     0,     0,    97,     0,   111,    84,     0,   348,     0,
-     0,     0,     0,     0,     0,    23,     0,   210,   221,   211,
-   234,   207,   227,   217,   216,   237,   238,   232,   215,   214,
-   209,   235,   239,   240,   219,   208,   222,   226,   228,   220,
-   213,   229,   236,   231,   230,   223,   233,   218,   206,   225,
-   224,   205,   212,   203,   204,   200,   201,   202,   160,   162,
-   161,   195,   196,   191,   173,   174,   175,   182,   179,   181,
-   176,   177,   197,   198,   183,   184,   188,   192,   178,   180,
-   170,   171,   172,   185,   186,   187,   189,   190,   193,   194,
-   199,   166,     0,   167,   163,   165,   164,   396,   397,   399,
+//yyDefRed 1413
+     1,     0,     0,    43,   404,   405,   406,     0,   397,   398,
+   399,   402,    23,    23,    23,     0,     0,   394,   395,   416,
+   417,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   825,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   678,   679,   680,   681,   630,   709,   710,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,   479,     0,
+   652,   654,   656,     0,     0,     0,     0,     0,     0,   342,
+     0,   631,   343,   344,   345,   347,   346,   348,   341,   627,
+   676,   670,   671,   628,     0,     0,    77,    77,     0,     2,
+     0,     5,     0,     0,     0,     0,     0,    61,     0,     0,
+     0,     0,   349,     0,    37,     0,    81,     0,   371,     0,
+     4,     0,     0,    99,     0,   113,    86,     0,   352,     0,
+     0,     0,     0,     0,     0,    23,     0,   212,   223,   213,
+   236,   209,   229,   219,   218,   239,   240,   234,   217,   216,
+   211,   237,   241,   242,   221,   210,   224,   228,   230,   222,
+   215,   231,   238,   233,   232,   225,   235,   220,   208,   227,
+   226,   207,   214,   205,   206,   202,   203,   204,   162,   164,
+   163,   197,   198,   193,   175,   176,   177,   184,   181,   183,
+   178,   179,   199,   200,   185,   186,   190,   194,   180,   182,
+   172,   173,   174,   187,   188,   189,   191,   192,   195,   196,
+   201,   168,     0,   169,   165,   167,   166,   400,   401,   403,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   648,
-     0,     0,     0,     0,   315,     0,     0,     0,   327,    95,
-   319,     0,     0,   785,     0,     0,    96,     0,   494,    92,
-     0,     0,   810,     0,     0,    25,     0,     9,     0,     8,
-   295,    24,     0,   388,   389,     0,   263,     0,     0,   357,
-     0,     0,     0,     0,     0,    21,     0,     0,     0,    18,
-     0,    17,     0,     0,   350,     0,     0,     0,   299,     0,
-     0,     0,   783,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   652,
+     0,     0,     0,     0,   317,     0,     0,     0,   331,    97,
+   323,     0,     0,   789,     0,     0,    98,     0,   498,    94,
+     0,     0,   814,     0,     0,    25,     0,     9,     0,     8,
+   297,    24,     0,   392,   393,     0,     0,     0,   265,     0,
+     0,   361,     0,     0,     0,     0,     0,    21,     0,     0,
+     0,    18,     0,    17,     0,     0,   354,     0,     0,     0,
+   301,     0,     0,     0,   787,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   392,     0,     0,     0,   472,   679,   678,   680,     0,
-   668,   669,   670,     0,     0,     0,   632,     0,     0,     0,
-     0,   275,    64,   276,   628,     0,   384,     0,     0,   711,
-     0,   386,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   396,     0,     0,     0,   476,   683,   682,
+   684,     0,   672,   673,   674,     0,     0,     0,   636,     0,
+     0,     0,     0,   277,    65,   278,   632,     0,   388,     0,
+     0,   715,     0,   390,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   423,   424,   817,   818,     3,     0,   819,     0,
-     0,     0,     0,   821,     0,     0,    67,     0,     0,     0,
-     0,     0,   291,   292,     0,     0,     0,     0,     0,     0,
-     0,     0,    65,     0,   289,   290,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   404,   484,   501,   403,   499,
-   366,   501,   804,     0,     0,   803,     0,     0,   488,     0,
-   364,   821,   806,   805,     0,   821,   821,   821,     0,     0,
-     0,   113,    94,     0,    75,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   683,   682,     0,   685,   781,
-     0,    71,   780,    70,     0,   374,     0,     0,   687,   686,
-   688,   689,   691,   690,   692,     0,     0,     0,     0,     0,
-     0,   346,   158,   382,     0,     0,    93,   168,   788,     0,
-   330,   791,   322,     0,     0,     0,     0,     0,     0,     0,
-     0,   316,   325,   821,     0,   317,   821,   821,     0,     0,
-   311,     0,     0,   310,     0,   321,     0,   363,     0,    63,
-    27,    29,    28,     0,   821,   296,     0,     0,     0,     0,
-     0,   821,     0,     0,   352,    16,     0,     0,     0,     0,
-   815,   300,   355,     0,   302,   356,   784,     0,   673,     0,
-   115,     0,   713,     0,     0,     0,     0,   473,   654,   671,
-   657,   655,   649,   629,   630,   651,   631,   653,   633,     0,
-     0,     0,     0,   744,   741,   740,   739,   742,   750,   759,
-   738,     0,   771,   760,   775,   774,   770,   736,     0,     0,
-   748,     0,   768,     0,   757,     0,   719,   745,   743,   436,
-     0,     0,   761,   437,     0,   720,     0,     0,     0,     0,
+     0,     0,     0,     0,   427,   428,   821,   822,     3,     0,
+   823,     0,     0,     0,     0,   825,     0,     0,    68,     0,
+     0,     0,     0,     0,   293,   294,     0,     0,     0,     0,
+     0,     0,     0,     0,    66,     0,   291,   292,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,   408,   488,   505,
+   407,   503,   370,   505,   808,     0,     0,   807,     0,     0,
+   492,     0,   368,   825,   810,   809,     0,   825,   825,   825,
+     0,     0,     0,   115,    96,     0,    76,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,   687,   686,     0,
+   689,   785,     0,    72,   784,    71,     0,   378,     0,     0,
+   691,   690,   692,   693,   695,   694,   696,     0,     0,     0,
+     0,     0,     0,   350,   160,   386,     0,     0,    95,   170,
+   792,     0,   334,   795,   326,     0,     0,     0,     0,     0,
+     0,     0,     0,   320,   329,   825,     0,   321,   825,   825,
+     0,     0,   313,     0,     0,   312,     0,   325,     0,   367,
+     0,    64,    27,    29,    28,     0,   825,   298,     0,     0,
+     0,     0,     0,     0,     0,   825,     0,     0,   356,    16,
+     0,     0,     0,     0,   819,   302,   359,     0,   304,   360,
+   788,     0,   677,     0,   117,     0,   717,     0,     0,     0,
+     0,   477,   658,   675,   661,   659,   653,   633,   634,   655,
+   635,   657,   637,     0,     0,     0,     0,   748,   745,   744,
+   743,   746,   754,   763,   742,     0,   775,   764,   779,   778,
+   774,   740,     0,     0,   752,     0,   772,     0,   761,     0,
+   723,   749,   747,   440,     0,     0,   765,   441,     0,   724,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,    76,   820,     6,    31,    32,    33,    34,   297,     0,
-    61,    62,   512,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   512,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   472,     0,
-   472,     0,     0,     0,     0,   493,   796,     0,   491,     0,
-     0,     0,     0,   795,     0,   492,     0,   797,     0,   499,
-    86,     0,   793,   794,     0,     0,     0,     0,     0,     0,
-     0,   114,     0,   821,   415,     0,     0,     0,   802,   801,
-    72,     0,     0,     0,   380,   155,     0,   157,   707,   378,
-     0,     0,     0,     0,     0,     0,   359,     0,     0,     0,
-     0,   787,     0,     0,     0,     0,     0,     0,   329,   324,
-     0,     0,   786,     0,     0,     0,   305,     0,   307,   362,
-   811,    26,     0,     0,    10,     0,     0,     0,     0,     0,
-    22,     0,    19,   351,     0,     0,     0,     0,     0,     0,
-     0,     0,   474,   658,     0,   634,   637,     0,     0,   642,
-   639,     0,     0,   643,     0,     0,   427,     0,     0,     0,
-   425,   712,     0,   729,     0,   732,     0,   717,     0,   734,
-   751,     0,     0,     0,   718,   776,   772,   578,   762,     0,
-     0,     0,     0,     0,    54,   715,     0,     0,     0,   410,
-   411,   370,   418,    77,   417,   371,     0,     0,     0,     0,
-     0,     0,    35,   510,   510,     0,   483,   473,   497,   473,
-   498,   821,   821,   499,   490,     0,     0,     0,     0,   821,
-   821,   309,   489,     0,   308,     0,     0,     0,     0,    45,
-   242,    59,     0,     0,     0,     0,    53,   249,     0,     0,
-   326,     0,    44,   241,    39,    38,     0,   332,     0,   112,
-     0,     0,   349,     0,     0,   416,     0,     0,   512,     0,
-     0,   407,     0,     0,     0,     0,     0,     0,     0,     0,
-   159,     0,     0,     0,   358,   169,   790,     0,   821,   821,
-     0,   821,   821,   318,     0,     0,     0,   248,   301,   116,
-     0,    23,   659,   665,   656,   664,   638,     0,     0,     0,
-     0,     0,   434,     0,     0,   747,   721,   749,     0,     0,
-     0,   769,     0,   758,   778,     0,     0,     0,   746,   764,
-   439,   385,     0,   821,   821,   387,    78,     0,     0,   511,
-   511,     0,   474,   474,     0,     0,     0,    90,   821,   812,
-     0,     0,    88,    83,   821,   821,     0,     0,     0,   821,
-   486,   487,     0,     0,   821,     0,   405,     0,   615,     0,
-   409,   408,     0,   419,   421,     0,     0,   782,    73,   510,
-   376,     0,   375,     0,   503,     0,     0,     0,     0,     0,
-   496,   383,    36,     0,     0,     0,   821,     0,     0,     0,
-   306,   361,     0,   660,   426,   428,     0,     0,     0,   725,
-     0,   727,     0,   733,     0,   730,   716,   735,     0,     0,
-     0,     0,   377,     0,     0,     0,    23,    23,    50,   246,
-    49,   247,    91,     0,    47,   244,    48,   245,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-     0,     0,     0,   617,   618,   368,   422,     0,   511,   373,
-   504,     0,     0,   369,     0,   708,   379,     0,     0,   479,
-   476,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   600,   599,   601,   602,   604,   603,   605,   607,   613,   574,
-     0,     0,     0,   511,     0,     0,     0,   648,     0,   592,
-   593,   594,   595,   597,   596,   598,   591,   606,    68,     0,
-   526,     0,   530,   523,   524,   533,     0,   534,   586,   587,
-     0,   525,     0,   570,     0,   579,   580,   569,     0,     0,
-    66,     0,     0,    46,   243,     0,    58,     0,     0,    40,
-     0,   406,    15,   622,     0,     0,     0,   620,     0,     0,
-     0,   505,     0,   381,     0,     0,     0,     0,   726,     0,
-   723,   728,   731,   589,   590,   156,   611,     0,     0,     0,
-     0,     0,   555,     0,   545,   548,   821,     0,   561,     0,
-   608,     0,   609,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   576,     0,     0,   463,
-   462,     0,    12,   621,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   619,
-     0,     0,     0,     0,   506,   508,   509,   507,     0,     0,
-   481,     0,   477,   663,   662,   661,     0,     0,   544,   543,
-     0,     0,     0,   556,   546,   813,   575,     0,   527,   522,
-     0,   529,   582,   583,   612,   542,   532,   538,   531,     0,
-     0,     0,     0,     0,     0,   648,   571,   566,     0,   563,
-   461,     0,   766,     0,     0,     0,   755,     0,     0,   443,
-     0,     0,     0,   502,   500,     0,     0,     0,     0,     0,
-     0,   420,   513,     0,     0,   478,     0,     0,     0,   724,
-   549,   557,     0,     0,   610,     0,   536,   535,   537,   540,
-   539,   541,     0,     0,     0,   457,     0,   454,   452,     0,
-     0,   441,   464,     0,   459,     0,     0,     0,     0,     0,
-   442,    13,     0,     0,     0,     0,     0,   614,     0,   518,
-   519,   470,     0,   468,   471,     0,   480,     0,     0,     0,
-   564,   560,   444,   767,     0,     0,     0,     0,   465,   756,
-     0,     0,   354,     0,     0,     0,     0,     0,   467,   482,
-     0,   547,     0,   458,     0,   455,     0,   449,     0,   451,
-   440,   460,     0,     0,   515,   516,   514,   469,     0,     0,
-     0,     0,   456,   450,     0,   447,   453,     0,   448,
+     0,     0,     0,     0,     0,    77,   824,     6,    31,    32,
+    33,    34,   299,     0,    62,    63,   516,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   516,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   476,     0,   476,     0,     0,     0,     0,   497,
+   800,     0,   495,     0,     0,     0,     0,   799,     0,   496,
+     0,   801,     0,   503,    88,     0,   797,   798,     0,     0,
+     0,     0,     0,     0,     0,   116,     0,   825,   419,     0,
+     0,     0,   806,   805,    73,     0,     0,     0,   384,   157,
+     0,   159,   711,   382,     0,     0,     0,     0,     0,     0,
+   363,     0,   825,     0,     0,     0,   791,     0,     0,     0,
+     0,     0,     0,   333,   328,     0,     0,   790,     0,     0,
+     0,   307,     0,   309,   366,   815,    26,     0,     0,    10,
+     0,     0,     0,     0,     0,     0,     0,    22,     0,    19,
+   355,     0,     0,     0,     0,     0,     0,     0,     0,   478,
+   662,     0,   638,   641,     0,     0,   646,   643,     0,     0,
+   647,     0,     0,   431,     0,     0,     0,   429,   716,     0,
+   733,     0,   736,     0,   721,     0,   738,   755,     0,     0,
+     0,   722,   780,   776,   582,   766,     0,     0,     0,     0,
+     0,    55,   719,     0,     0,     0,   414,   415,   374,   422,
+    78,   421,   375,     0,     0,     0,     0,     0,     0,    35,
+   514,   514,     0,   487,   477,   501,   477,   502,   825,   825,
+   503,   494,     0,     0,     0,     0,   825,   825,   311,   493,
+     0,   310,     0,     0,     0,    82,     0,     0,    45,   244,
+    60,     0,     0,     0,     0,    52,   251,     0,     0,   330,
+     0,    44,   243,    39,    38,     0,   336,     0,   114,     0,
+     0,   353,     0,     0,   420,     0,     0,   516,     0,     0,
+   411,     0,     0,     0,     0,     0,     0,     0,     0,   161,
+     0,     0,     0,   362,   171,     0,   794,     0,     0,   825,
+   825,     0,   825,   825,   322,     0,     0,     0,     0,    51,
+   250,   303,   118,     0,    23,   663,   669,   660,   668,   642,
+     0,     0,     0,     0,     0,   438,     0,     0,   751,   725,
+   753,     0,     0,     0,   773,     0,   762,   782,     0,     0,
+     0,   750,   768,   443,   389,     0,   825,   825,   391,    79,
+     0,     0,   515,   515,     0,   478,   478,     0,     0,     0,
+    92,   825,   816,     0,     0,    90,    85,     0,   825,   825,
+     0,     0,     0,   825,   490,   491,     0,     0,   825,     0,
+   409,     0,   619,     0,   413,   412,     0,   423,   425,     0,
+     0,   786,    74,   514,   380,     0,   379,     0,   507,     0,
+     0,     0,     0,     0,   500,   387,    36,     0,     0,   825,
+     0,     0,     0,   308,   365,     0,     0,   664,   430,   432,
+     0,     0,     0,   729,     0,   731,     0,   737,     0,   734,
+   720,   739,     0,     0,     0,     0,   381,     0,     0,     0,
+    23,    23,    49,   248,    50,   249,    93,     0,    47,   246,
+    48,   247,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,    11,     0,     0,     0,   621,   622,   372,
+   426,     0,   515,   377,   508,     0,     0,   373,     0,   712,
+   383,     0,     0,   483,   480,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   604,   603,   605,   606,   608,   607,
+   609,   611,   617,   578,     0,     0,     0,   515,     0,     0,
+     0,   652,     0,   596,   597,   598,   599,   601,   600,   602,
+   595,   610,    69,     0,   530,     0,   534,   527,   528,   537,
+     0,   538,   590,   591,     0,   529,     0,   574,     0,   583,
+   584,   573,     0,     0,    67,     0,     0,    46,   245,     0,
+    59,     0,     0,    40,     0,   410,    15,   626,     0,     0,
+     0,   624,     0,     0,     0,   509,     0,   385,     0,     0,
+     0,     0,   730,     0,   727,   732,   735,   593,   594,   158,
+   615,     0,     0,     0,     0,     0,   559,     0,   549,   552,
+   825,     0,   565,     0,   612,     0,   613,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   580,     0,     0,   467,   466,     0,    12,   625,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   623,     0,     0,     0,     0,   510,   512,
+   513,   511,     0,     0,   485,     0,   481,   667,   666,   665,
+     0,     0,   548,   547,     0,     0,     0,   560,   550,   817,
+   579,     0,   531,   526,     0,   533,   586,   587,   616,   546,
+   536,   542,   535,     0,     0,     0,     0,     0,     0,   652,
+   575,   570,     0,   567,   465,     0,   770,     0,     0,     0,
+   759,     0,     0,   447,     0,     0,     0,   506,   504,     0,
+     0,     0,     0,     0,     0,   424,   517,     0,     0,   482,
+     0,     0,     0,   728,   553,   561,     0,     0,   614,     0,
+   540,   539,   541,   544,   543,   545,     0,     0,     0,   461,
+     0,   458,   456,     0,     0,   445,   468,     0,   463,     0,
+     0,     0,     0,     0,   446,    13,     0,     0,     0,     0,
+     0,   618,     0,   522,   523,   474,     0,   472,   475,     0,
+   484,     0,     0,     0,   568,   564,   448,   771,     0,     0,
+     0,     0,   469,   760,     0,     0,   358,     0,     0,     0,
+     0,     0,   471,   486,     0,   551,     0,   462,     0,   459,
+     0,   453,     0,   455,   444,   464,     0,     0,   519,   520,
+   518,   473,     0,     0,     0,     0,   460,   454,     0,   451,
+   457,     0,   452,
     }, yyDgoto = {
-//yyDgoto 277
-     1,   450,    69,    70,    71,    72,    73,   319,   324,   325,
-   552,    74,    75,   561,    76,    77,   559,   560,   562,   757,
-    78,    79,    80,    81,    82,    83,   469,   451,   231,   232,
-   258,    86,    87,    88,   207,    89,    90,    91,   259,   791,
-   792,   682,   683,   278,   279,   280,    93,    94,    95,    96,
-    97,    98,   436,   343,   235,   267,   100,   268,   972,   973,
-   872,   985,  1227,   967,  1052,  1146,  1142,   660,   238,   500,
-   501,   655,   832,   916,   773,  1352,  1315,   249,   286,   491,
-   240,   102,   241,   852,   853,   104,   854,   858,   699,   105,
-   106,  1271,  1272,   336,   337,   338,   578,   579,   580,   581,
-   766,   767,   768,   769,   290,   502,   243,   202,   244,   904,
-   361,  1274,  1198,  1199,   582,   583,   584,  1275,  1276,  1342,
-  1228,  1343,   108,  1232,   649,   647,  1070,   420,   670,   406,
-   245,   260,   203,   111,   112,   113,   114,   115,   541,   283,
-   869,  1386,  1222,  1108,  1240,  1110,  1111,  1112,  1113,  1170,
-  1171,  1172,  1268,  1173,  1115,  1116,  1117,  1118,  1119,  1120,
-  1121,  1122,  1123,   320,   116,   737,   658,   472,   659,   205,
-   585,   586,   777,   587,   588,   589,   590,   928,   702,   424,
-   206,   404,   690,  1124,  1125,   592,  1127,  1128,   593,   594,
-   595,  1318,   322,   618,   596,   597,   598,   507,   827,   492,
-   269,   975,   873,   118,   119,   411,   407,   976,  1175,   120,
-   801,   121,   122,   516,   123,   124,   125,   969,  1144,   619,
-   813,  1191,  1192,  1023,   939,   547,   752,   901,     2,   366,
-   456,  1140,  1285,  1050,   522,   513,   508,   636,   622,   867,
-   344,   803,   936,   270,   707,   531,   250,   433,   528,   685,
-   870,   692,   877,   686,   875,   703,   599,   602,   781,   782,
-   315,  1155,  1297,   650,   648,  1338,  1303,   327,   754,   753,
-   902,  1003,  1071,  1235,   876,   340,   687,
+//yyDgoto 278
+     1,   452,    69,    70,    71,    72,    73,   321,   326,   327,
+   556,    74,    75,   565,    76,    77,   563,   564,   566,   764,
+    78,    79,    80,    81,    82,    83,   471,   453,   266,   267,
+   258,    86,    87,    88,   207,    89,    90,    91,   259,   798,
+   799,   686,   687,   280,   281,   282,    93,    94,    95,    96,
+    97,   846,    98,   438,   345,   235,   269,   100,   270,   986,
+   987,   881,   999,  1241,   981,  1066,  1160,  1156,   664,   238,
+   502,   503,   659,   839,   929,   780,  1366,  1329,   249,   288,
+   493,   240,   102,   241,   861,   862,   104,   863,   867,   703,
+   105,   106,  1285,  1286,   338,   339,   340,   582,   583,   584,
+   585,   773,   774,   775,   776,   292,   504,   243,   202,   244,
+   917,   363,  1288,  1212,  1213,   586,   587,   588,  1289,  1290,
+  1356,  1242,  1357,   108,  1246,   653,   651,  1084,   422,   674,
+   408,   245,   260,   203,   111,   112,   113,   114,   115,   545,
+   285,   878,  1400,  1236,  1122,  1254,  1124,  1125,  1126,  1127,
+  1184,  1185,  1186,  1282,  1187,  1129,  1130,  1131,  1132,  1133,
+  1134,  1135,  1136,  1137,   322,   116,   744,   662,   474,   663,
+   205,   589,   590,   784,   591,   592,   593,   594,   941,   706,
+   426,   206,   406,   694,  1138,  1139,   596,  1141,  1142,   597,
+   598,   599,  1332,   324,   622,   600,   601,   602,   509,   834,
+   494,   271,   989,   882,   118,   119,   413,   409,   990,  1189,
+   120,   808,   121,   122,   518,   123,   124,   125,   983,  1158,
+   623,   820,  1205,  1206,  1037,   952,   551,   759,   914,     2,
+   368,   458,  1154,  1299,  1064,   526,   515,   510,   640,   626,
+   876,   346,   810,   949,   272,   711,   535,   250,   435,   532,
+   689,   879,   696,   886,   690,   884,   707,   603,   606,   788,
+   789,   317,  1169,  1311,   654,   652,  1352,  1317,   329,   761,
+   760,   915,  1017,  1085,  1249,   885,   342,   691,
     }, yySindex = {
-//yySindex 1399
-     0,     0, 25897,     0,     0,     0,     0, 29369,     0,     0,
-     0,     0,     0,     0,     0, 26389, 26389,     0,     0,     0,
-     0,   161,     0,     0,     0,     0,   313, 29264,   211,   158,
+//yySindex 1413
+     0,     0, 26764,     0,     0,     0,     0, 30335,     0,     0,
+     0,     0,     0,     0,     0, 27224, 27224,     0,     0,     0,
+     0,    86,     0,     0,     0,     0,   932, 30230,   148,    96,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,  1265, 28240, 28240,
- 28240, 28240,   153, 26023, 26143, 27007, 27253, 30036,     0, 29887,
-     0,     0,     0,   447,   447,   447,   447, 28357, 28240,     0,
-   137,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   495,   495,     0,     0, 32130,     0,
-   176,     0,  1989,   382, 29686,     0,   256,     0,    38,   179,
-   270,    82,     0,   283,     0,   136,     0,   368,     0,   676,
-     0,   683, 32243,     0,   562,     0,     0, 26389,     0, 27373,
- 29785, 25363, 27373, 32356, 32469,     0,   692,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,  1667, 29092, 29092,
+ 29092, 29092,  -141, 26878, 26994, 27798, 28028, 30908,     0, 30759,
+     0,     0,     0,   162,   162,   162,   162, 29206, 29092,     0,
+   -27,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   328,   328,     0,     0, 33085,     0,
+   270,     0,  1190,   702, 25583,     0,    72,     0,    45,   145,
+   151,   192,     0,   158,     0,   129,     0,   179,     0,   489,
+     0,   529, 33198,     0,   623,     0,     0, 27224,     0, 28144,
+ 30657, 26037, 28144, 33311, 33424,     0,   567,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -610,298 +612,302 @@ public RipperParser(ThreadContext context, IRubyObject ripper, LexerSource sourc
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   707,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   765,     0,     0,     0,     0,     0,
-     0,     0,     0, 28240,   517, 26143, 28240, 28240, 28240,     0,
- 28240,   495,   495, 25126,     0,   482,   196,   837,     0,     0,
-     0,   533,   869,     0,   588,   892,     0, 26515,     0,     0,
- 26389, 25478,     0, 28470,   438,     0,   943,     0, 25897,     0,
-     0,     0,   663,     0,     0,   161,     0,   213,    82,     0,
-   692,   696, 10321, 10321,   666,     0, 26023,   980,   176,     0,
-  1989,     0,     0,   211,     0,   330,   935,   634,     0,   482,
-   915,   634,     0,     0,     0,     0,     0,   211,     0,     0,
-     0,     0,     0,     0,     0,     0,  1265,   743, 32582,   495,
-   495,     0,   247,     0,  1041,     0,     0,     0,     0,   880,
-     0,     0,     0,  1098,  1133,  1249,     0,  1055,  1055,  1055,
-  1055,     0,     0,     0,     0,  4509,     0,  1044,     0,     0,
-  4509,     0,  1048, 26143, 27373, 26143,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   814,   445,
-     0,   870,     0,     0,     0,     0,     0, 25651,     0, 27373,
- 27373, 27373, 27373,     0, 28470, 28470,     0, 28240, 28240, 28240,
- 28240, 28240,     0,     0, 28240, 28240, 28240, 28240, 28240, 28240,
- 28240, 28240,     0, 28240,     0,     0, 28240, 28240, 28240, 28240,
- 28240, 28240, 28240, 28240, 28240,     0,     0,     0,     0,     0,
-     0,     0,     0, 30391, 26389,     0, 30582, 28240,     0,   796,
-     0,     0,     0,     0, 31872,     0,     0,     0, 26023, 30294,
-  1119,     0,     0, 26143,     0,   382,   149,     0,     0,     0,
+     0,     0,   634,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   662,     0,     0,     0,     0,     0,
+     0,     0,     0, 29092,   409, 26994, 29092, 29092, 29092,     0,
+ 29092,   328,   328, 30814,     0,   375,   156,   694,     0,     0,
+     0,   404,   726,     0,   433,   780,     0, 27338,     0,     0,
+ 27224, 26151,     0, 29322,   955,     0,   813,     0, 26764,     0,
+     0,     0,   587,     0,     0,    86,   328,   328,     0,   187,
+   192,     0,   567,   591,  4601,  4601,   544,     0, 26878,   816,
+   270,     0,  1190,     0,     0,   148,     0,   479,   829,   636,
+     0,   375,   855,   636,     0,     0,     0,     0,     0,   148,
+     0,     0,     0,     0,     0,     0,     0,     0,  1667,   628,
+ 33537,   328,   328,     0,   336,     0,   965,     0,     0,     0,
+     0,  1036,     0,     0,     0,  1125,  1325,   854,     0,   968,
+   968,   968,   968,     0,     0,     0,     0,  2496,     0,   944,
+     0,     0,  2496,     0,   982, 26994, 28144, 26994,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    46,     0,     0,     0,   176,     0,  1108,   149,     0,     0,
-     0,     0,     0,     0,     0,     0,     0, 27373,    53,  1115,
-   555,     0,     0,     0,  1058, 25248,     0,     0,     0,   666,
-     0,     0,     0,   996,  1125,  1130, 28240, 30647, 26389, 30714,
- 26635,     0,     0,     0, 27127,     0,     0,     0, 28240,  1157,
-     0,   211,  1171,     0,   211,     0,   275,     0,  1152,     0,
-     0,     0,     0, 29369,     0,     0, 28240,  1092, 28240, 30755,
- 30714,     0,   158,   211,     0,     0, 25776,     0,  1185, 27007,
-     0,     0,     0, 27253,     0,     0,     0,   943,     0,     0,
-     0,  1184,     0, 30810, 26389, 30904, 32582,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,  1263,
-  -118,  1460,   319,     0,     0,     0,     0,     0,     0,     0,
-     0,  2594,     0,     0,     0,     0,     0,     0,   211,  1191,
-     0,  1197,     0,  1201,     0,  1204,     0,     0,     0,     0,
- 28240,     0,     0,     0,  1211,     0,   955,   957,   -78, 26143,
- 28587,   176, 26143, 28587,   345,    92,   345,     0, 31132, 26389,
- 31226,     0,     0,     0,     0,     0,     0,     0,     0, 26269,
-     0,     0,     0,   696,  4479,  4479,  4479,  4479, 11335, 10828,
-  4479,  4479, 10321, 10321,  1434,  1434,     0, 24803,  1343,  1343,
-   897,   105,   105,   696,   696,   696,  3225,   345,     0,  1139,
-     0,   345,   917,     0,   -25,     0,     0,   161,     0,     0,
-  1229,   211,   926,     0,   928,     0,   161,     0,  3225,     0,
-     0, 28357,     0,     0,   161, 28357, 27499, 27499,   211, 32582,
-  1238,     0,   345,     0,     0, 26143,  1017, 28470,     0,     0,
-     0,  1006,  1021, 26143,     0,     0,     0,     0,     0,     0,
- 31267, 26389, 31311, 26143, 26143,   211,     0, 29369, 28240, 28700,
- 28700,     0,   954,   -14,   211,   962,   963,   482,     0,     0,
-   869, 28240,     0, 28240, 28240, 26761,     0, 27127,     0,     0,
-     0,     0, 28470, 25126,     0,   696,   973,   161,   161, 28240,
-     0,     0,     0,     0,   634, 32582,     0,     0,   211,     0,
-     0,  1184,     0,     0,  1857,     0,     0,   200,   447,     0,
-     0,   200,   447,     0,  2594,  1490,     0,  1258,  1286,   211,
-     0,     0,  4509,     0,  4509,     0,   422,     0,  4609,     0,
-     0, 28240,  1267,    43,     0,     0,     0,     0,     0,   345,
-   313,  1037,  1039, 25126,     0,     0,   345,  1037,  1039,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   211,     0,
-     0, 26143,     0,     0,     0,  1280,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   796, 26635,   989,  1248,     0,
-     0,     0,     0,   796,     0,  1219, 23963,  1049,   639,     0,
-     0,     0,   368,  1295,    38,   256,     0,     0, 28240, 23963,
-     0,  1313,     0,     0,     0,     0,     0,     0,  1064,     0,
-  1184, 32582,     0,  1107,   693,     0,   275, 30204,     0,   345,
-  1021,     0,   345, 27619,  1102,   176, 27373, 26143,     0,     0,
-     0,   211,   345,  1264,     0,     0,     0,   313,     0,     0,
-  1033,     0,     0,     0,  1340,   211,   275,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,  1055,  1055,  1055,
-  1055,   211,     0,  2594,  1890,     0,     0,     0,  1350,  1353,
-  1354,     0,  1359,     0,     0,  1211,  1099,  1354,     0,     0,
-     0,     0, 28587,     0,     0,     0,     0,     0,   345,     0,
-     0, 28240,     0,     0, 28357, 28357,  1268,     0,     0,     0,
- 28357, 28357,     0,     0,     0,     0, 31357, 26389, 31454,     0,
-     0,     0,     0, 27745,     0,  1184,     0,  1102,     0, 27865,
-     0,     0,   345,     0,     0, 26143, 27373,     0,     0,     0,
-     0,   345,     0, 28240,     0,   114,   345, 26143,   176,   345,
-     0,     0,     0, 28700, 28240, 28240,     0, 28240, 28240, 27127,
-     0,     0,  3109,     0,     0,     0,  1372,  1380,  4509,     0,
-  4609,     0,  4609,     0,  4609,     0,     0,     0,  1037,  1039,
- 28240, 28240,     0, 31932, 31932, 25126,     0,     0,     0,     0,
-     0,     0,     0, 28357,     0,     0,     0,     0, 28240, 26269,
-   917,   -25,   211,   926,   928, 28357, 28240,     0, 26269,     0,
-  1169,     0,  1083,     0,     0,     0,     0,   149,     0,     0,
-     0, 27991, 26143,     0,   345,     0,     0, 28240,  4509,     0,
-     0, 26143,  1890,  1890,  1354,  1393,  1354,  1354, 25126, 25126,
+   717,   424,     0,   801,     0,     0,     0,     0,     0, 26514,
+     0, 28144, 28144, 28144, 28144,     0, 29322, 29322,     0, 29092,
+ 29092, 29092, 29092, 29092,     0,     0, 29092, 29092, 29092, 29092,
+ 29092, 29092, 29092, 29092,     0, 29092,     0,     0, 29092, 29092,
+ 29092, 29092, 29092, 29092, 29092, 29092, 29092,     0,     0,     0,
+     0,     0,     0,     0,     0, 31263, 27224,     0, 31454, 29092,
+     0,   769,     0,     0,     0,     0, 32744,     0,     0,     0,
+ 26878, 31166,  1094,     0,     0, 26994,     0,   702,   304,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-  5083,  5083,   709,     0, 12514,   211,  1134,     0,  1376,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    64,
-     0,  1317,     0,     0,     0,     0,   667,     0,     0,     0,
-   122,     0,  1399,     0,  1400,     0,     0,     0, 32017,   524,
-     0,  1327,  1327,     0,     0, 25126,     0,   989,     0,     0,
- 26143,     0,     0,     0, 26143, 32695,   149,     0, 26143, 31932,
- 28240,     0,   557,     0,   211,  -129,   323,  1380,     0,  4609,
-     0,     0,     0,     0,     0,     0,     0, 32017,  1110,   211,
-   211, 17824,     0,  1415,     0,     0,     0,  1337,     0,  1188,
-     0, 27373,     0,  1162, 17824, 32017,  5083,  5083,   709,   211,
-   211, 31932, 31932,  1447, 32017,  1110,     0,  1349, 26143,     0,
-     0, 26143,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,  1165,   730,     0,     0,
- 26143,   693,   149,   739,     0,     0,     0,     0,  1432,  1421,
-     0, 26143,     0,     0,     0,     0,  1354,    67,     0,     0,
-  1110,  1438,  1442,     0,     0,     0,     0,   211,     0,     0,
-  1443,     0,     0,     0,     0,     0,     0,     0,     0,   211,
-   211,   211,   211,   211,   211,     0,     0,     0,  1444,     0,
-     0,  1446,     0,  1452,   211,  1453,     0,  1375,  1459,     0,
- 32808,     0,  1211,     0,     0,  1169,     0, 31679, 26389, 31776,
-  1107,     0,     0, 27373, 27373,     0,  2240, 26143,  1384,     0,
-     0,     0, 32017,  1447,     0, 32017,     0,     0,     0,     0,
-     0,     0,   448, 17824,  3725,     0,  3725,     0,     0,  1408,
-   422,     0,     0,  4976,     0,     0,     0,  1224,   752, 32808,
-     0,     0,     0,     0,   211,     0,     0,     0, 26143,     0,
-     0,     0,   671,     0,     0,   345,     0,  1493,   211,  1493,
-     0,     0,     0,     0,  1496,  1499,  1505,  1506,     0,     0,
-  1211,  1496,     0, 31817,   752,     0,    73,  2240,     0,     0,
- 32017,     0,  4976,     0,  4976,     0,  3725,     0,  4976,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,  1496,  1496,
-  1509,  1496,     0,     0,  4976,     0,     0,  1496,     0,
-    }, yyRindex = {
-//yyRindex 1399
-     0,     0,   472,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0, 18411, 18501,     0,     0,     0,
-     0, 14689, 19103, 19418, 19508, 19600, 28817,     0, 28127,     0,
-     0, 19915, 20005, 20097, 15540,  5683, 20412, 20502, 15657, 20594,
+     0,     0,    42,     0,     0,     0,   270,     0,  1089,   304,
+     0,     0,     0,     0,     0,     0,     0,     0,     0, 28144,
+   -51,  1095,   454,     0,     0,     0,  1043, 25864,     0,     0,
+     0,   809,     0,     0,     0,  1206,  1131,  1140, 29092, 31519,
+ 27224, 31586, 27454,     0,     0,     0, 27914,     0,     0,     0,
+ 29092,  1137,     0,   148,  1161,     0,   148,     0,   105,     0,
+  1170,     0,     0,     0,     0, 30335,     0,     0, 29092,  1090,
+ 29092,  1163,  1196, 31627, 31586,     0,    96,   148,     0,     0,
+ 26628,     0,  1221, 27798,     0,     0,     0, 28028,     0,     0,
+     0,   813,     0,     0,     0,  1226,     0, 31682, 27224, 31776,
+ 33537,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,  1337,    -7,  1381,   166,     0,     0,     0,
+     0,     0,     0,     0,     0,  1718,     0,     0,     0,     0,
+     0,     0,   148,  1234,     0,  1235,     0,  1238,     0,  1241,
+     0,     0,     0,     0, 29092,     0,     0,     0,  1261,     0,
+  1012,  1022,   594, 26994, 29436,   270, 26994, 29436,   134,   150,
+   134,     0, 32004, 27224, 32098,     0,     0,     0,     0,     0,
+     0,     0,     0, 27108,     0,     0,     0,   591,  3656,  3656,
+  3656,  3656, 11345, 10838,  3656,  3656,  4601,  4601,   163,   163,
+     0, 24521,  1208,  1208,   329,   256,   256,   591,   591,   591,
+  3217,   134,     0,  1210,     0,   134,   971,     0,    80,     0,
+     0,    86,     0,     0,  1287,   148,   987,     0,   988,     0,
+    86,     0,  3217,     0,     0, 29552,     0,     0,    86, 29552,
+ 28258, 28374,   148, 33537,  1304,     0,   134,     0,     0, 26994,
+  1096, 29322,     0,     0,     0,  1083,  1097, 26994,     0,     0,
+     0,     0,     0,     0, 32139, 27224, 32183, 26994, 26994,   148,
+     0, 30335,     0, 29092, 29436, 29436,     0,  1017,   108,   148,
+  1023,  1026,   375,     0,     0,   726, 29092,     0, 29092, 29092,
+ 27568,     0, 27914,     0,     0,     0,     0, 29322, 30814,     0,
+   591, 29666, 29666,  1030,    86,    86, 29552,     0,     0,     0,
+     0,   636, 33537,     0,     0,   148,     0,     0,  1226,     0,
+     0,  1655,     0,     0,   103,   162,     0,     0,   103,   162,
+     0,  1718,  1701,     0,  1338,  1348,   148,     0,     0,  2496,
+     0,  2496,     0,   140,     0,  3050,     0,     0, 29092,  1320,
+    35,     0,     0,     0,     0,     0,   134,   932,  1100,  1103,
+ 30814,     0,     0,   134,  1100,  1103,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   148,     0,     0, 26994,     0,
+     0,     0,  1335,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   769, 27454,  1062,  1322,     0,     0,     0,     0,
+   769,     0,  1288,  1107, 25906,     0,  1126,   467,     0,     0,
+     0,   179,  1362,    45,    72,     0,     0, 29092, 25906,     0,
+  1391,     0,     0,     0,     0,     0,     0,  1139,     0,  1226,
+ 33537,     0,  1181,   792,     0,   105, 31076,     0,   134,  1097,
+     0,   134, 28488,  1179,   270, 28144, 26994,     0,     0,     0,
+   148,   134,  1326,     0,     0, 29092,     0,  1103,  1103,     0,
+     0,  1102,     0,     0,     0,  1410,   148,   105,   932,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   454,   454,  1463,  1420,   359,     0,  1501,
+   968,   968,   968,   968,   148,     0,  1718,  2049,     0,     0,
+     0,  1413,  1414,  1415,     0,  1420,     0,     0,  1261,  1168,
+  1415,     0,     0,     0,     0, 29436,     0,     0,     0,     0,
+     0,   134,     0,     0, 29092,     0,     0, 29552, 29552,  1341,
+     0,     0,     0, 29552, 29552,     0,     0,   544,     0,     0,
+ 32229, 27224, 32326,     0,     0,     0,     0, 28604,     0,  1226,
+     0,  1179,     0, 28718,     0,     0,   134,     0,     0, 26994,
+ 28144,     0,     0,     0,     0,   134,     0, 29092,     0,   314,
+   134, 26994,   270,   134,     0,     0,     0, 29092, 29092,     0,
+ 29092, 29092, 27914,     0,     0, 29666,  3592,     0,     0,     0,
+  1423,  1432,  2496,     0,  3050,     0,  3050,     0,  3050,     0,
+     0,     0,  1100,  1103, 29092, 29092,     0, 32804, 32804, 30814,
+     0,     0,     0,     0,     0,     0,     0, 29552,     0,     0,
+     0,     0, 29092, 27108,   971,    80,   148,   987,   988, 29552,
+ 29092,     0, 27108,     0,  1215,     0,  1128,     0,     0,     0,
+     0,   304,     0,     0,     0, 28834, 26994,     0,   134,     0,
+     0, 29092,  2496,     0,     0, 26994,  2049,  2049,  1415,  1436,
+  1415,  1415, 30814, 30814,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,  4531,  4531,   139,     0, 24148,   148,
+  1187,     0,  1120,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,    56,     0,  1370,     0,     0,     0,     0,
+   747,     0,     0,     0,    74,     0,  1454,     0,  1456,     0,
+     0,     0, 32972,   695,     0,  1382,  1382,     0,     0, 30814,
+     0,  1062,     0,     0, 26994,     0,     0,     0, 26994, 33650,
+   304,     0, 26994, 32804, 29092,     0,   755,     0,   148,  -161,
+    -6,  1432,     0,  3050,     0,     0,     0,     0,     0,     0,
+     0, 32972,  1162,   148,   148, 32889,     0,  1468,     0,     0,
+     0,  1392,     0,  1308,     0, 28144,     0,  1214, 32889, 32972,
+  4531,  4531,   139,   148,   148, 32804, 32804,   983, 32972,  1162,
+     0,  1529, 26994,     0,     0, 26994,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-  8824,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,  1970,  1970,     0,     0,     0,     0,
-   167,     0,   794, 12019, 22766,  9140, 22331,     0,  9235,     0,
- 11677, 26881,     0,     0,     0, 22394,     0, 20909,     0,     0,
-     0,     0,   776,     0,     0,     0,     0, 18605,     0,     0,
-     0,  1287,     0,     0,     0,     0, 16024,     0,     0,     0,
+  1211,   556,     0,     0, 26994,   792,   304,   893,     0,     0,
+     0,     0,  1482,  1470,     0, 26994,     0,     0,     0,     0,
+  1415,   100,     0,     0,  1162,  1480,  1483,     0,     0,     0,
+     0,   148,     0,     0,  1491,     0,     0,     0,     0,     0,
+     0,     0,     0,   148,   148,   148,   148,   148,   148,     0,
+     0,     0,  1493,     0,     0,  1503,     0,  1504,   148,  1507,
+     0,  1433,  1515,     0, 33763,     0,  1261,     0,     0,  1215,
+     0, 32551, 27224, 32648,  1181,     0,     0, 28144, 28144,     0,
+  1889, 26994,  1444,     0,     0,     0, 32972,   983,     0, 32972,
+     0,     0,     0,     0,     0,     0,   503, 32889,  3581,     0,
+  3581,     0,     0,  1448,   140,     0,     0,  3739,     0,     0,
+     0,  1265,   597, 33763,     0,     0,     0,     0,   148,     0,
+     0,     0, 26994,     0,     0,     0,   708,     0,     0,   134,
+     0,  1532,   148,  1532,     0,     0,     0,     0,  1539,  1540,
+  1546,  1549,     0,     0,  1261,  1539,     0, 32689,   597,     0,
+   617,  1889,     0,     0, 32972,     0,  3739,     0,  3739,     0,
+  3581,     0,  3739,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,  1539,  1539,  1551,  1539,     0,     0,  3739,     0,
+     0,  1539,     0,
+    }, yyRindex = {
+//yyRindex 1413
+     0,     0,   953,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0, 18583, 18899,     0,     0,     0,
+     0, 15086, 19490, 19582, 19897, 19987, 29782,     0, 28976,     0,
+     0, 20079, 20394, 20484, 15687,  6200, 20576, 20891, 16054, 20981,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   961,   961,  1509,  1210,   227,     0,  1439,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+  9657,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,  1404,  1404,     0,     0,     0,     0,
+   167,     0,  1038,  2277,  2704,  9752, 23261,     0,  9850,     0,
+  3391, 27684,     0,     0,     0, 23328,     0, 21073,     0,     0,
+     0,     0,   480,     0,     0,     0,     0, 18989,     0,     0,
+     0,  1329,     0,     0,     0,     0, 16171,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0, 22888,     0,     0,     0,     0,     0,     0,     0,
-  6279,  6595,  6690,  6788,     0,  7104,  7199,  7297,  4348,  7613,
-  7708,  4715,  7806,  3207,     0,   454,  3871, 21259,  1448,     0,
-     0,  1970,  1970,  2231,     0, 21357,     0,  7007,     0,     0,
-     0,     0,  7007,     0,  8631,     0,     0,   467,     0,     0,
-     0,  1526,     0,     0,     0,     0, 28930,     0,   546,     0,
-     0,     0,  9649,     0,     0,  8122,     0,     0,     0,     0,
-  9333, 10156, 13829, 13956, 20999,     0,   454,     0,   713,     0,
-  1401,     0,   933,  1526,     0,  1478,     0,  1478,     0,     0,
-     0,  1449,     0,  2168,  2565,  2579,  2620,  1546,  3149,  3325,
-  3363,  1259,  3707,  3900,  1800,  3907,     0,     0,     0,  1284,
-  1284,     0,     0,  4321,   876,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,  1525,   490,  1537,
-   529,     0,     0,     0,     0,   829,     0,     0, 24615,     0,
-   621,     0,     0,   202,     0,   202,   302,   788,  1136,  1366,
-  1508,  1656,  1674,  1285,  1744,  1816,  1967,  1904,     0,     0,
-  2302,     0,     0,     0,     0,     0,     0,   169,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,  9744,  9840,
+     0,     0, 12000,     0,     0,     0,     0,     0,     0,     0,
+  7112,  7207,  7305,  7621,     0,  7716,  7814,  8130,  4865,  8225,
+  8323,  5232,  8639, 21738,     0,   961, 21836, 21883,  7524,     0,
+     0,  1404,  1404,  2772,     0, 21922,     0,  8033,     0,     0,
+     0,     0,  8033,     0,  9243,     0,     0,   551,     0,     0,
+     0,  1562,     0,     0,     0,     0, 29896,     0,   767,     0,
+     0,     0, 10261,     0,     0,  8734,  1404,  1404,     0,     0,
+     0,     0, 10166, 10673, 14112, 14207, 21388,     0,   961,     0,
+  3268,     0,  1239,     0,   888,  1562,     0,  1514,     0,  1514,
+     0,     0,     0,  1487,     0,   794,  1286,  1564,  2059,  1576,
+  2150,  2683,  2801,   832,  2861,  3001,  1086,  3100,     0,     0,
+     0,  2083,  2083,     0,     0,  3240,   612,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,  1449,
+   273,  1475,   477,     0,     0,     0,     0,   593,     0,     0,
+ 25218,     0,   789,     0,     0,   138,     0,   138,  1121,  1465,
+  1524,  1761,  2420,  2522,  2833,  2392,  2919,  3131,  2639,  3177,
+     0,     0,  3229,     0,     0,     0,     0,     0,     0,   196,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   206,     0,     0,     0,     0,  7516,
-     0,     0,     0,     0,     0,     0,     0,     0,   454,   887,
-  1053,     0,     0,   863,     0,  3935,     0,  3035,  3480,  3764,
-  6353,  9991, 10498, 11005, 13712,     0,     0, 14577,     0,     0,
-     0,     0,     0,     0,   243,     0,   629,     0,     0,     0,
-     0,     0,     0,     0,     0, 23315, 23441,     0,     0, 24729,
-     0,     0,     0,     0,     0,  1526,     0,     0,     0,  8726,
-     0,     0,     0,     0,     0,     0,     0,     0,   206,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   844,   883,
-     0,  1526,   190,     0,  1526,     0,  1526,     0,     0,     0,
+  4336, 10357,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,  1526,     0,     0,  3362,   124,     0,  1494,
-     0,     0,     0,   647,     0,     0,     0,     0,     0,  4502,
-     0,  1087,     0,     0,   206,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   248,     0,     0,     0,
+     0,  9051,     0,     0,     0,     0,     0,     0,     0,     0,
+   961,   772,   899,     0,     0,   836,     0,  4746,     0,  1955,
+  2144,  3247,  6870, 10508, 11015, 11522, 12044,     0,     0, 13023,
+     0,     0,     0,     0,     0,     0,   550,     0,   566,     0,
+     0,     0,     0,     0,     0,     0,     0, 23999, 24333,     0,
+     0, 25427,     0,     0,     0,     0,     0,  1562,     0,     0,
+     0,  9341,     0,     0,     0,     0,     0,     0,     0,     0,
+   248,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   689,   898,     0,  1562,   320,     0,  1562,     0,  1562,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,  1562,     0,     0,
+  3525,   545,     0,  1530,     0,     0,     0,   394,     0,     0,
+     0,     0,     0,  3261,     0,   918,     0,     0,   248,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,  1526,   209,
-     0,   209,     0,   210,     0,   209,     0,     0,     0,     0,
-   174,   134,     0,     0,   210,     0,   558,   394,   430,   863,
-     0,     0,   863,     0,     0,     0,     0,  2499,     0,   206,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0, 10251,  2838, 12965, 13209, 13309, 13405, 13707,
- 13526, 13612, 14072, 14119, 12171, 12266,     0,  1530, 12662, 12748,
- 12362, 11772, 11868, 10347, 10663, 10758, 12843,     0,     0,     0,
-     0,     0, 16141,  5800, 17593,     0,     0, 26881,     0,  6167,
-   418,  1504, 16508,     0, 16625,     0, 15056,     0, 13092,     0,
-     0,     0,     0,     0, 18077,     0,     0,     0,  1526,     0,
-  1127,     0,     0,     0,     0,   107, 24328,     0,     0,     0,
-     0,  1318,     0,   389,     0,     0, 24214,     0,     0,     0,
-     0,   206,     0,   863,   546,  1526,     0,     0,     0,     0,
-     0,     0,  4832, 15173,  1504,  5199,  5316, 21404,     0,     0,
-  7007,     0,     0,     0,     0,  1002,     0,   226,     0,     0,
-     0,     0,     0, 14205,     0, 10854,  8217,     0,  8315,     0,
-     0,  1722,     0,     0,  1478,     0,  1823,  2026,  1504,  2373,
-  2413,  1195,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,  1270,     0,  1031,  1052,  1526,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,  1562,   526,     0,   526,     0,   564,     0,   526,
+     0,     0,     0,     0,   766,   183,     0,     0,   564,     0,
+    98,   507,   528,   836,     0,     0,   836,     0,     0,     0,
+     0,  3254,     0,   248,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0, 10768,  3999,  4517,
+ 13465, 13592, 13709, 14026, 13809, 13905, 14326, 14421, 12378, 12681,
+     0,  1566, 12862, 13162, 12776, 12187, 12282, 10864, 11180, 11275,
+ 13248,     0,     0,     0,     0,     0, 16538,  6317, 17990,     0,
+     0, 27684,     0,  6684,   506,  1542, 16655,     0, 17022,     0,
+ 15203,     0, 13343,     0,     0,     0,     0,     0, 18474,     0,
+     0,     0,  1562,     0,   925,     0,     0,     0,     0,    88,
+ 25104,     0,     0,     0,     0,  1358,     0,   124,     0,     0,
+ 24895,     0,     0,     0,     0,   248,     0,   836,   767,  1562,
+     0,     0,     0,     0,     0,     0,     0,  5349, 15570,  1542,
+  5716,  5833, 22004,     0,     0,  8033,     0,     0,     0,     0,
+   923,     0,   660,     0,     0,     0,     0,     0,  2324,     0,
+ 11371,     0,     0,  8832,     0,  9148,     0,     0,   795,     0,
+     0,  1514,     0,  1899,  2667,  1542,  1908,  1992,   937,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
- 28817, 11170, 22973, 14255,     0,     0,     0, 11265, 23041,     0,
-     0,     0,     0,     0,     0,     0,  3180,   276,  1504,  3409,
-  4050,   202,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,  8025,   552, 18921,     0,     0,
-     0,     0,     0,  8534,     0,     0,  4184, 23083,     0,     0,
-     0,     0, 21091,     0,  2108, 22431,     0,     0,  1559,  9501,
-     0,     0,     0,     0,     0,     0, 22851,     0, 23161,     0,
-  1236,     0,     0,   657,   399,     0,  1526,     0,     0,     0,
-     0,     0,     0,     0,   399,     0,     0,   863, 23775, 23889,
-     0,  1504,     0,     0,     0,     0,     0, 28817,     0,     0,
-  4004,     0,     0,     0,   190,  1526,  1526,     0,     0,     0,
-  1481,     0,     0,     0,     0,     0,     0,  1545,   544,  1558,
-   636,  1526,     0,     0,     0,     0,     0,     0,   209,   209,
-   209,     0,   209,     0,     0,   210,   430,   209,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,  1166,     0,     0,
+     0,     0,   618,     0,   966,  1072,  1562,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   206,     0,     0,
-     0,     0,  1694,     0,     0,  1368,     0,   289,     0,    68,
-     0,     0,     0,     0,     0,   202,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   863,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   723,
-     0,     0,   -87,     0,     0,     0,  1069,  1071,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0, 11361, 23181,
-     0,     0,     0,     0,     0, 14389,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0, 29782, 11687,  3935,
+ 14507,     0,     0,     0, 11782, 12529,     0,     0,     0,     0,
+     0,     0,     0,  2646,   870,  1542,  2836,  3823,   138,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
- 16992, 17960,  1504, 17109, 17476,     0,  1559,  3660,     0,     0,
-   399,   101,   178,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   785,     0,     0,     0,     0,     0,   985,     0,
-     0,    84,     0,     0,   209,   209,   209,   209, 14525, 22901,
+     0,     0,  9560,   563, 19085,     0,     0,     0,     0,     0,
+ 10068,     0,     0,     0, 14902,     0, 23868,     0,     0,     0,
+     0, 21478,     0,  3538, 23393,     0,     0,  1588,  2948,     0,
+     0,     0,     0,     0,     0,  2891,     0, 23910,     0,  1015,
+     0,     0,   -84,   232,     0,  1562,     0,     0,     0,     0,
+     0,     0,     0,   232,     0,     0,   836, 24447, 24781,     0,
+  1542,     0,     0,     0,     0,     0,     0, 10479, 10986,     0,
+     0,  6796,     0,     0,     0,   320,  1562,  1562, 29782,     0,
+     0,     0,     0,  1545,     0,     0,     0,     0,     0,     0,
+  1536,   498,  1570,   502,  1562,     0,     0,     0,     0,     0,
+     0,   526,   526,   526,     0,   526,     0,     0,   564,   528,
+   526,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+  2885,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0, 21570,     0,     0,
+     0,   248,     0,     0,     0,     0, 10018,     0,     0,  1029,
+     0,    64,     0,    69,     0,     0,     0,     0,     0,   138,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,  1504,  1173, 21890,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0, 22523,
-     0, 21851,     0,     0,     0,     0, 21443,     0,     0,     0,
- 21552,     0,  9043,     0,  9551,     0,     0,     0, 21928,  9962,
-     0, 24938, 25052,     0,     0, 14572,     0, 19013, 11525,     0,
-   128,     0,     0,     0,   202,     0,     0,     0,   107,     0,
-     0,     0,   399,     0,   688,     0,     0,  1146,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0, 21975,  1504,
-  1504, 10469,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0, 22608,     0, 21591, 21732,     0, 29081,
- 29451,     0,     0, 10976,     0, 22038,     0,   373,   863,     0,
-     0,   546,     0,     0,   318,   441,  1163,  1228,  1971,  2068,
-  2218,  1646,  2709,  2777,  1757,  2945,     0,     0,  3007,     0,
-   863,   399,     0,   238,     0,     0,     0,     0,     0,   535,
-     0,   546,     0,     0,     0,     0,   209,  1526,     0,     0,
- 22085, 11483, 22124,     0,     0,     0,     0,  1526,     0,     0,
- 22672,     0,     0,     0,     0,     0,     0,     0,     0,  1526,
-  1526,  1526,  1504,  1504,  1504,     0,     0,     0, 22218,     0,
-     0,   651,     0,   651,   373,   777,     0,     0,   651,     0,
-   764,  1507,   777,     0,     0,   399,  3093,     0,   206,     0,
-   657,     0,     0,     0,     0,     0,     0,   863,     0,     0,
+     0,   836,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   972,     0,     0,     0,  -158,     0,     0,     0,
+  1104,  1152,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0, 11878, 11493,     0,     0,     0,     0,     0, 14602,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   942,     0,     0,     0,
-     0,     0,     0,     0,     0,  1878,  2495,     0,   825,     0,
-     0,     0,  2037,   756,  1504,  2704,  2739,     0,   832,     0,
-     0,     0,   545,     0,     0,     0,     0, 22281,  1477, 22724,
-     0,     0,     0,     0,   651,   651,   651,   651,     0,     0,
-   777,   651,     0,     0,   998,  1281,   399,     0,     0,     0,
+     0,     0,     0,     0, 17139, 18107,  1542, 17506, 17623,     0,
+  1588, 23754,     0,     0,   232,   122,   321,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   590,     0,     0,     0,
+     0,     0,  1065,     0,     0,    71,     0,     0,   526,   526,
+   526,   526, 14721,  8542,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,  1542,   500,
+ 22464,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0, 23437,     0, 22355,     0,     0,     0,     0,
+  4184,     0,     0,     0, 22042,     0, 18716,     0, 22740,     0,
+     0,     0, 22534, 22780,     0, 25541, 25750,     0,     0, 14816,
+     0, 19400, 23818,     0,   161,     0,     0,     0,   138,     0,
+     0,     0,    88,     0,     0,     0,   232,     0,   956,     0,
+     0,  1230,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0, 22621,  1542,  1542, 22940,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0, 23479,     0,
+ 22221, 22317,     0, 30047, 24985,     0,     0, 22987,     0, 22660,
+     0,   125,   836,     0,     0,   767,     0,     0,   741,  1266,
+  1431,  1731,  1819,  1870,  1888,  1359,  1946,  2179,  1805,  2242,
+     0,     0,  2402,     0,   836,   232,     0,   501,     0,     0,
+     0,     0,     0,   160,     0,   767,     0,     0,     0,     0,
+   526,  1562,     0,     0, 22698, 23050, 23087,     0,     0,     0,
+     0,  1562,     0,     0, 23569,     0,     0,     0,     0,     0,
+     0,     0,     0,  1562,  1562,  1562,  1542,  1542,  1542,     0,
+     0,     0, 23127,     0,     0,   573,     0,   573,   125,   887,
+     0,     0,   573,     0,   926,  1048,   887,     0,     0,   232,
+  2568,     0,   248,     0,   -84,     0,     0,     0,     0,     0,
+     0,   836,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,  2875,   836,     0,     0,     0,     0,   651,   651,
-   651,   651,     0,     0,     0,     0,     0,   651,     0,
+  1160,     0,     0,     0,     0,     0,     0,     0,     0,  1520,
+  2429,     0,  1110,     0,     0,     0,  2052,  1283,  1542,  2485,
+  2503,     0,   527,     0,     0,     0,   620,     0,     0,     0,
+     0, 23164,  1516, 23637,     0,     0,     0,     0,   573,   573,
+   573,   573,     0,     0,   887,   573,     0,     0,  1124,  1091,
+   232,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,  2441,   294,     0,     0,
+     0,     0,   573,   573,   573,   573,     0,     0,     0,     0,
+     0,   573,     0,
     }, yyGindex = {
-//yyGindex 277
-     0,     0,  1167,     0,  1535,  1605,  2549,   -58,     0,     0,
-  -212,  3229, 22802,     0, 23240, 23252,     0,     0,     0,  1050,
- 23638,     0,    59,     0,     0,    16,  1485,   750,  2213,  2337,
-     0,     0,     0,     0,     4,  1367,     0,  1260,  1116,  -531,
-  -534,  -577,   -42,     0,  1118,    -1,   -62,  3499,   -50,    -7,
-   -35,     0,  -117,   -61,  1759,    13,     0,   746,   425,  -838,
-  -715,     0,     0,   361,     0,     0,   369,    48,  -429,    89,
-  -370,    69,   988,  -295,  -497,   470,  3550,    30,     0,  -226,
-  -448,  1548,  2614,   -15,   469,  -555,  -558,     0,     0,     0,
-     0,   350,  -942,   129,   113,   824,  -326,    78,  -697,   901,
-  -798,  -766,   761,   912,     0,    40,  -436,     0,  1998,     0,
-     0,     0,   547,     0,  -594,     0,   905,     0,   363,     0,
- -1033,   328, 24685,     0,  -506,  1288,     0,   -95,   126,   853,
-  2635,    -2,    12,  1621,     0,    -4,   -91,   -16,  -455,  -123,
-   358,     0,     0,  -825,  1900,     0,     0,   541,  -945,   -22,
-     0,  -820,  -786,  -300,     0,  -240,   548,     0,     0,     0,
- -1015,     0,   543,     0,   652,  -348,     0,  -435,    20,   -49,
-  -724,     1,  -570,  -438, -1089,  -745,  1457,  -305,   -86,     0,
-     0,  1634,     0,  -962,     0,   952,   561,     0,     0,  1362,
-  -213,     0,  -655,    77,     0,     0,  -565,   354,   266,     0,
-  1149,   774,     0,     0,     0,     0,     0,     0,   402,     0,
-  -141,     0,     0,  1241,     0,     0,     0,     0,     0,   685,
-  -508,     0,     0,    50,  -668,  -201,   263,   281,     0,     2,
-    24,     0,     0,     0,     0,     0,   164,     0,     0,     0,
-     0,     0,     0,  1531,     0,  -198,     0,     0,     0,  -437,
-     0,     0,     0,   -84,     0,     0,     0,     0,   476,     0,
-     0,     0,     0,     0,     0,     0,     0,    21,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,
+//yyGindex 278
+     0,     0,  -274,     0,  1572, 17498, 18188,   -59,     0,     0,
+  -215, 21365, 22777,     0, 23793, 25344,     0,     0,     0,  1075,
+ 25376,     0,    54,     0,     0,     5,  1534,   777,  2120,  2406,
+     0,     0,     0,     0,    -9,  1390,     0,  1291,  1135,  -501,
+  -480,  -519,   -39,     0,  1132,    31,   -77,  4022,   -19,    20,
+    10,   984,     0,  -100,   -76,   522,    32,     0,  1014,   429,
+  -833,  -782,     0,     0,   365,     0,     0,   371,     1,  -414,
+    55,  -396,    16,   993,  -296,  -493,   462,  2473,   -52,     0,
+  -181,  -383,  1557,  3148,  -292,   727,   114,  -540,     0,     0,
+     0,     0,   348, -1068,   384,  1037,   948,  -316,   259,  -773,
+   902,  -780,  -820,   757,   929,     0,    87,  -457,     0,  2821,
+     0,     0,     0,   577,     0,  -657,     0,   919,     0,   390,
+     0,  -968,   346, 25450,     0,  -491,  1317,     0,   -91,   289,
+   877,  2968,    -2,    -3,  1645,     0,    23,   -89,    33,  -455,
+  -128,   360,     0,     0,  -831,   191,     0,     0,   543,  -464,
+   109,     0,  -812,  -814,  -365,     0,    -1,   546,     0,     0,
+     0,  -680,     0,   540,     0,  -360,  -351,     0,  -427,     3,
+   -57,  -563,   264,  -579,  -510, -1189,  -775,  1996,  -324,   -74,
+     0,     0,  1654,     0, -1008,     0,  -171,   548,     0,     0,
+   912,  -188,     0,  -701,  1033,     0,     0,  -726,   843,  -320,
+     0,  1169,   776,     0,     0,     0,     0,     0,     0,   396,
+     0,   785,     0,     0,  1250,     0,     0,     0,     0,     0,
+   818,  -507,     0,     0,   149,  -676,   499,   372,   282,     0,
+   -30,    46,     0,     0,     0,     0,     0,   133,     0,     0,
+     0,     0,     0,     0,  1672,     0,  -221,     0,     0,     0,
+  -456,     0,     0,     0,   -81,     0,     0,     0,     0,   473,
+     0,     0,     0,     0,     0,     0,     0,     0,   -37,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,
     };
     protected static final int[] yyTable = YyTables.yyTable();
     protected static final int[] yyCheck = YyTables.yyCheck();
@@ -998,7 +1004,7 @@ public RipperParser(ThreadContext context, IRubyObject ripper, LexerSource sourc
     "stmt : stmt modifier_rescue after_rescue stmt",
     "stmt : k_END allow_exits '{' compstmt '}'",
     "stmt : command_asgn",
-    "stmt : mlhs '=' lex_ctxt command_call",
+    "stmt : mlhs '=' lex_ctxt command_call_value",
     "stmt : lhs '=' lex_ctxt mrhs",
     "stmt : mlhs '=' lex_ctxt mrhs_arg modifier_rescue after_rescue stmt",
     "stmt : mlhs '=' lex_ctxt mrhs_arg",
@@ -1009,16 +1015,17 @@ public RipperParser(ThreadContext context, IRubyObject ripper, LexerSource sourc
     "command_asgn : primary_value '[' opt_call_args rbracket tOP_ASGN lex_ctxt command_rhs",
     "command_asgn : primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt command_rhs",
     "command_asgn : primary_value call_op tCONSTANT tOP_ASGN lex_ctxt command_rhs",
-    "command_asgn : primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs",
     "command_asgn : primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt command_rhs",
+    "command_asgn : primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs",
+    "command_asgn : tCOLON3 tCONSTANT tOP_ASGN lex_ctxt command_rhs",
+    "command_asgn : backref tOP_ASGN lex_ctxt command_rhs",
     "command_asgn : defn_head f_opt_paren_args '=' endless_command",
     "command_asgn : defs_head f_opt_paren_args '=' endless_command",
-    "command_asgn : backref tOP_ASGN lex_ctxt command_rhs",
     "endless_command : command",
     "endless_command : endless_command modifier_rescue after_rescue arg",
     "endless_command : keyword_not opt_nl endless_command",
-    "command_rhs : command_call",
-    "command_rhs : command_call modifier_rescue after_rescue stmt",
+    "command_rhs : command_call_value",
+    "command_rhs : command_call_value modifier_rescue after_rescue stmt",
     "command_rhs : command_asgn",
     "expr : command_call",
     "expr : expr keyword_and expr",
@@ -1041,6 +1048,7 @@ public RipperParser(ThreadContext context, IRubyObject ripper, LexerSource sourc
     "expr_value_do : $$10 expr_value do $$11",
     "command_call : command",
     "command_call : block_command",
+    "command_call_value : command_call",
     "block_command : block_call",
     "block_command : block_call call_op2 operation2 command_args",
     "cmd_brace_block : tLBRACE_ARG brace_body '}'",
@@ -1242,9 +1250,9 @@ public RipperParser(ThreadContext context, IRubyObject ripper, LexerSource sourc
     "arg : arg tANDOP arg",
     "arg : arg tOROP arg",
     "arg : keyword_defined opt_nl begin_defined arg",
-    "arg : arg '?' arg opt_nl ':' arg",
     "arg : defn_head f_opt_paren_args '=' endless_arg",
     "arg : defs_head f_opt_paren_args '=' endless_arg",
+    "arg : arg '?' arg opt_nl ':' arg",
     "arg : primary",
     "endless_arg : arg",
     "endless_arg : endless_arg modifier_rescue after_rescue arg",
@@ -1276,6 +1284,8 @@ public RipperParser(ThreadContext context, IRubyObject ripper, LexerSource sourc
     "opt_call_args : args ',' assocs ','",
     "opt_call_args : assocs ','",
     "call_args : command",
+    "call_args : defn_head f_opt_paren_args '=' endless_command",
+    "call_args : defs_head f_opt_paren_args '=' endless_command",
     "call_args : args opt_block_arg",
     "call_args : assocs opt_block_arg",
     "call_args : args ',' assocs opt_block_arg",
@@ -2004,7 +2014,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
     }
   }
 
-static ParserState<RipperParser>[] states = new ParserState[823];
+static ParserState<RipperParser>[] states = new ParserState[827];
 static {
 states[1] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                   p.setState(EXPR_BEG);
@@ -2349,18 +2359,6 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[49] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-{IRubyObject v1, v2, v3, v4, v5, v6, v7;
-                    v1 = ((IRubyObject)yyVals[-5+yyTop].value);
-                    v2 = ((IRubyObject)yyVals[-3+yyTop].value);
-                    v3 = p.dispatch("on_const_path_field", v1, v2);
-                    v4 = v3;
-                    v5 = ((IRubyObject)yyVals[-2+yyTop].value);
-                    v6 = ((IRubyObject)yyVals[0+yyTop].value);
-                    v7 = p.dispatch("on_opassign", v4, v5, v6);
-                    yyVal = v7;}
-  return yyVal;
-};
-states[50] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-5+yyTop].value);
                     v2 = p.intern("::");
@@ -2373,7 +2371,39 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
+states[50] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+{IRubyObject v1, v2, v3, v4, v5, v6, v7;
+                    v1 = ((IRubyObject)yyVals[-5+yyTop].value);
+                    v2 = ((IRubyObject)yyVals[-3+yyTop].value);
+                    v3 = p.dispatch("on_const_path_field", v1, v2);
+                    v4 = v3;
+                    v5 = ((IRubyObject)yyVals[-2+yyTop].value);
+                    v6 = ((IRubyObject)yyVals[0+yyTop].value);
+                    v7 = p.dispatch("on_opassign", v4, v5, v6);
+                    yyVal = v7;}
+  return yyVal;
+};
 states[51] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+{IRubyObject v1, v2, v3, v4, v5, v6;
+                    v1 = ((IRubyObject)yyVals[-3+yyTop].value);
+                    v2 = p.dispatch("on_top_const_field", v1);
+                    v3 = v2;
+                    v4 = ((IRubyObject)yyVals[-2+yyTop].value);
+                    v5 = ((IRubyObject)yyVals[0+yyTop].value);
+                    v6 = p.dispatch("on_opassign", v3, v4, v5);
+                    yyVal = v6;}
+  return yyVal;
+};
+states[52] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+{IRubyObject v1, v2, v3;
+                    v1 = p.var_field(((IRubyObject)yyVals[-3+yyTop].value));
+                    v2 = ((IRubyObject)yyVals[0+yyTop].value);
+                    v3 = p.dispatch("on_assign", v1, v2);
+                    yyVal = p.backref_error(((IRubyObject)yyVals[-3+yyTop].value), v3);
+                    p.error();}
+  return yyVal;
+};
+states[53] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
                     p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8, v9;
@@ -2390,7 +2420,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[52] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[54] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
                     p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11;
@@ -2409,16 +2439,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[53] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-{IRubyObject v1, v2, v3;
-                    v1 = p.var_field(((IRubyObject)yyVals[-3+yyTop].value));
-                    v2 = ((IRubyObject)yyVals[0+yyTop].value);
-                    v3 = p.dispatch("on_assign", v1, v2);
-                    yyVal = p.backref_error(((IRubyObject)yyVals[-3+yyTop].value), v3);
-                    p.error();}
-  return yyVal;
-};
-states[55] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[56] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_rescue = ((LexContext)yyVals[-1+yyTop].value).in_rescue;
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
@@ -2427,7 +2448,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[56] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[57] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((IRubyObject)yyVals[0+yyTop].value)), NOT);
 {IRubyObject v1, v2, v3;
                     v1 = p.intern("!");
@@ -2436,12 +2457,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[57] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    p.value_expr(((IRubyObject)yyVals[0+yyTop].value));
+states[58] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[58] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[59] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -2449,27 +2469,27 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[61] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[62] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.logop(((IRubyObject)yyVals[-2+yyTop].value), AND_KEYWORD, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[62] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[63] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.logop(((IRubyObject)yyVals[-2+yyTop].value), OR_KEYWORD, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[63] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[64] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((IRubyObject)yyVals[0+yyTop].value)), NOT);
   return yyVal;
 };
-states[64] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[65] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((IRubyObject)yyVals[0+yyTop].value)), BANG);
   return yyVal;
 };
-states[65] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[66] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((IRubyObject)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[66] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[67] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pvtbl(((Set)yyVals[-2+yyTop].value));
                     p.pop_pktbl(((Set)yyVals[-1+yyTop].value));
                     LexContext ctxt = p.getLexContext();
@@ -2485,11 +2505,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[67] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[68] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((IRubyObject)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[68] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[69] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pvtbl(((Set)yyVals[-2+yyTop].value));
                     p.pop_pktbl(((Set)yyVals[-1+yyTop].value));
                     LexContext ctxt = p.getLexContext();
@@ -2505,7 +2525,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[70] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[71] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pushLocalScope();
                     ByteList currentArg = p.getCurrentArg();
                     p.setCurrentArg(null);
@@ -2520,18 +2540,18 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.setCurrentArg(null);
   return yyVal;
 };
-states[71] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[72] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     ((DefHolder)yyVals[0+yyTop].value).line = yyVals[yyTop - count + 1].start();
                     yyVal = ((DefHolder)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[72] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[73] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_FNAME); 
                     LexContext ctxt = p.getLexContext();
                     ctxt.in_argdef = true;
   return yyVal;
 };
-states[73] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[74] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_ENDFN|EXPR_LABEL);
                     ((DefHolder)yyVals[0+yyTop].value).line = yyVals[yyTop - count + 1].start();
                     yyVal = ((DefHolder)yyVals[0+yyTop].value);
@@ -2539,28 +2559,33 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[74] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[75] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[75] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[76] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.NEW_ERROR(yyVals[yyTop - count + 1]);
   return yyVal;
 };
-states[76] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[77] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getConditionState().push1();
   return yyVal;
 };
-states[77] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[78] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getConditionState().pop();
   return yyVal;
 };
-states[78] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[79] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-2+yyTop].value);
 {                    yyVal = p.get_value(((IRubyObject)yyVals[-2+yyTop].value));}
   return yyVal;
 };
 states[82] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                       p.value_expr(((IRubyObject)yyVals[0+yyTop].value));
+                       yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+  return yyVal;
+};
+states[84] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -2572,15 +2597,15 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[83] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[85] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[84] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[86] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);}
   return yyVal;
 };
-states[85] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[87] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -2588,7 +2613,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[86] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[88] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -2599,7 +2624,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v6;}
   return yyVal;
 };
-states[87] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[89] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -2609,7 +2634,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[88] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[90] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-3+yyTop].value);
@@ -2622,7 +2647,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[89] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[91] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = p.intern("::");
@@ -2632,7 +2657,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[90] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[92] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = p.intern("::");
@@ -2645,7 +2670,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[91] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[93] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-5+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-4+yyTop].value);
@@ -2658,64 +2683,64 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[92] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[94] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_super", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[93] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[95] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_yield", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[94] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[96] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_return", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[95] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[97] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_break", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[96] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[98] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_next", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[98] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[100] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_mlhs_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[99] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[101] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[100] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[102] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_mlhs_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[101] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[103] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);}
   return yyVal;
 };
-states[102] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[104] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -2723,7 +2748,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[103] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[105] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -2731,7 +2756,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[104] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[106] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -2742,7 +2767,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v6;}
   return yyVal;
 };
-states[105] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[107] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.nil();
@@ -2750,7 +2775,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[106] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[108] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = p.nil();
@@ -2761,7 +2786,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v6;}
   return yyVal;
 };
-states[107] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[109] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -2770,7 +2795,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[108] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[110] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -2782,7 +2807,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[109] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[111] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -2791,7 +2816,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[110] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[112] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -2803,14 +2828,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[112] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[114] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_mlhs_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[113] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[115] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -2819,7 +2844,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[114] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[116] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -2827,7 +2852,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[115] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[117] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -2836,7 +2861,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[116] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[118] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -2844,16 +2869,6 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[117] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                      yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
-
-  return yyVal;
-};
-states[118] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                      yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
-
-  return yyVal;
-};
 states[119] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
@@ -2905,6 +2920,16 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[129] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                      yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
+
+  return yyVal;
+};
+states[130] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                      yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
+
+  return yyVal;
+};
+states[131] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = p.escape(((IRubyObject)yyVals[-1+yyTop].value));
@@ -2912,7 +2937,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[130] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[132] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (((IRubyObject)yyVals[-1+yyTop].value) == AMPERSAND_DOT) {
                         p.compile_error("&. inside multiple assignment destination");
                     }
@@ -2924,7 +2949,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[131] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[133] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -2932,7 +2957,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[132] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[134] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (((IRubyObject)yyVals[-1+yyTop].value) == AMPERSAND_DOT) {
                         p.compile_error("&. inside multiple assignment destination");
                     }
@@ -2944,7 +2969,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[133] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[135] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -2952,32 +2977,22 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = p.const_decl(v3);}
   return yyVal;
 };
-states[134] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[136] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_top_const_field", v1);
                     yyVal = p.const_decl(v2);}
   return yyVal;
 };
-states[135] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[137] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.backref_error(((IRubyObject)yyVals[0+yyTop].value), p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
                     p.error();}
   return yyVal;
 };
-states[136] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                      yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
-
-                    
-  return yyVal;
-};
-states[137] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                      yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
-
-  return yyVal;
-};
 states[138] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
+                    
   return yyVal;
 };
 states[139] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
@@ -3026,6 +3041,16 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[148] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                      yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
+
+  return yyVal;
+};
+states[149] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                      yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
+
+  return yyVal;
+};
+states[150] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = p.escape(((IRubyObject)yyVals[-1+yyTop].value));
@@ -3033,7 +3058,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[149] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[151] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -3042,7 +3067,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[150] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[152] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = p.intern("::");
@@ -3051,7 +3076,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[151] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[153] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -3060,7 +3085,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[152] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[154] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -3068,19 +3093,19 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = p.const_decl(v3);}
   return yyVal;
 };
-states[153] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[155] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_top_const_field", v1);
                     yyVal = p.const_decl(v2);}
   return yyVal;
 };
-states[154] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[156] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.backref_error(((IRubyObject)yyVals[0+yyTop].value), p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
                     p.error();}
   return yyVal;
 };
-states[155] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[157] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "class/module name must be CONSTANT";
 {IRubyObject v1, v2, v3;
                     v1 = p.intern(message);
@@ -3090,25 +3115,25 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.error();}
   return yyVal;
 };
-states[156] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[158] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[157] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[159] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_top_const_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[158] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[160] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_const_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[159] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[161] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -3116,28 +3141,28 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[160] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[162] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[161] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[163] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[162] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[164] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[163] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[165] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    p.setState(EXPR_ENDFN);
                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[164] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[166] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[165] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[167] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_symbol_literal", v1);
@@ -3145,28 +3170,20 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[166] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
-  return yyVal;
-};
-states[167] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-{                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
-  return yyVal;
-};
 states[168] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    p.setState(EXPR_FNAME|EXPR_FITEM);
+                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
 states[169] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-{                    yyVal = ((RubyArray)yyVals[-3+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
+{                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
 states[170] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+                    p.setState(EXPR_FNAME|EXPR_FITEM);
   return yyVal;
 };
 states[171] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+{                    yyVal = ((RubyArray)yyVals[-3+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
 states[172] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
@@ -3282,11 +3299,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[200] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
 states[201] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
 states[202] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
@@ -3362,7 +3379,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[220] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = yyVals[0+yyTop].value;
+                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
 states[221] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
@@ -3370,7 +3387,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[222] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+                    yyVal = yyVals[0+yyTop].value;
   return yyVal;
 };
 states[223] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
@@ -3446,6 +3463,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[241] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+  return yyVal;
+};
+states[242] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+  return yyVal;
+};
+states[243] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -3453,7 +3478,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[242] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[244] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -3462,7 +3487,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[243] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[245] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = ((IRubyObject)yyVals[-6+yyTop].value);
                     v2 = p.escape(((IRubyObject)yyVals[-4+yyTop].value));
@@ -3474,7 +3499,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[244] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[246] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-5+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-4+yyTop].value);
@@ -3487,7 +3512,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[245] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[247] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-5+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-4+yyTop].value);
@@ -3500,7 +3525,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[246] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[248] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-5+yyTop].value);
                     v2 = p.intern("::");
@@ -3513,7 +3538,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[247] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[249] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = ((IRubyObject)yyVals[-5+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-3+yyTop].value);
@@ -3525,7 +3550,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[248] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[250] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = p.dispatch("on_top_const_field", v1);
@@ -3536,7 +3561,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v6;}
   return yyVal;
 };
-states[249] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[251] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.var_field(((IRubyObject)yyVals[-3+yyTop].value));
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -3546,7 +3571,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.error();}
   return yyVal;
 };
-states[250] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[252] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -3554,7 +3579,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[251] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[253] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -3562,7 +3587,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[252] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[254] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.nil();
@@ -3570,7 +3595,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[253] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[255] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.nil();
@@ -3578,7 +3603,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[254] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[256] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = p.nil();
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -3586,7 +3611,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[255] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[257] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = p.nil();
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -3594,121 +3619,112 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[256] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[258] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), PLUS, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[257] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[259] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), MINUS, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[258] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[260] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), STAR, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[259] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[261] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), SLASH, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[260] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[262] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), PERCENT, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[261] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[263] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), STAR_STAR, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[262] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[264] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), STAR_STAR, ((IRubyObject)yyVals[0+yyTop].value), p.src_line()), MINUS_AT);
   return yyVal;
 };
-states[263] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[265] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(((IRubyObject)yyVals[0+yyTop].value), PLUS_AT);
   return yyVal;
 };
-states[264] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[266] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(((IRubyObject)yyVals[0+yyTop].value), MINUS_AT);
   return yyVal;
 };
-states[265] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[267] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), OR, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[266] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[268] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), CARET, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[267] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[269] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), AMPERSAND, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[268] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[270] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), LT_EQ_RT, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[269] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[271] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[270] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[272] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), EQ_EQ, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[271] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[273] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), EQ_EQ_EQ, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[272] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[274] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), BANG_EQ, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[273] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[275] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.match_op(((IRubyObject)yyVals[-2+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[274] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[276] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), BANG_TILDE, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[275] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[277] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((IRubyObject)yyVals[0+yyTop].value)), BANG);
   return yyVal;
 };
-states[276] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[278] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(((IRubyObject)yyVals[0+yyTop].value), TILDE);
   return yyVal;
 };
-states[277] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[279] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), LT_LT, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[278] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[280] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), GT_GT, ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[279] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[281] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.logop(((IRubyObject)yyVals[-2+yyTop].value), AMPERSAND_AMPERSAND, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[280] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[282] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.logop(((IRubyObject)yyVals[-2+yyTop].value), OR_OR, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[281] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[283] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_defined = false;                    
                     yyVal = p.new_defined(yyVals[yyTop - count + 1].start(), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[282] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-{IRubyObject v1, v2, v3, v4;
-                    v1 = ((IRubyObject)yyVals[-5+yyTop].value);
-                    v2 = ((IRubyObject)yyVals[-3+yyTop].value);
-                    v3 = ((IRubyObject)yyVals[0+yyTop].value);
-                    v4 = p.dispatch("on_ifop", v1, v2, v3);
-                    yyVal = v4;}
-  return yyVal;
-};
-states[283] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[284] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
                     p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8, v9;
@@ -3725,7 +3741,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[284] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[285] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
                     p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11;
@@ -3744,11 +3760,20 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[285] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+states[286] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+{IRubyObject v1, v2, v3, v4;
+                    v1 = ((IRubyObject)yyVals[-5+yyTop].value);
+                    v2 = ((IRubyObject)yyVals[-3+yyTop].value);
+                    v3 = ((IRubyObject)yyVals[0+yyTop].value);
+                    v4 = p.dispatch("on_ifop", v1, v2, v3);
+                    yyVal = v4;}
   return yyVal;
 };
 states[287] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
+  return yyVal;
+};
+states[289] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_rescue = ((LexContext)yyVals[-1+yyTop].value).in_rescue;
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
@@ -3757,7 +3782,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[288] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[290] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((IRubyObject)yyVals[0+yyTop].value)), NOT);
 {IRubyObject v1, v2, v3;
                     v1 = p.intern("!");
@@ -3766,55 +3791,55 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[289] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[291] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = GT;
   return yyVal;
 };
-states[290] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[292] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = LT;
   return yyVal;
 };
-states[291] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[293] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = GT_EQ;
   return yyVal;
 };
-states[292] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[294] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = LT_EQ;
   return yyVal;
 };
-states[293] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[295] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[294] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[296] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.warning(p.src_line(), "comparison '" + ((ByteList)yyVals[-1+yyTop].value) + "' after comparison");
                     yyVal = p.call_bin_op(((IRubyObject)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[295] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[297] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = (LexContext) p.getLexContext().clone();
   return yyVal;
 };
-states[296] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[298] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_defined = true;
                     yyVal = ((LexContext)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[297] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[299] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_rescue = LexContext.InRescue.AFTER_RESCUE;
                     yyVal = ((LexContext)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[298] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[300] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((IRubyObject)yyVals[0+yyTop].value));
                     yyVal = p.makeNullNil(((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[300] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[302] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[301] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[303] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = ((RubyArray)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_bare_assoc_hash", v1);
@@ -3824,7 +3849,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[302] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[304] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = p.dispatch("on_args_new");
                     v2 = ((RubyArray)yyVals[-1+yyTop].value);
@@ -3835,12 +3860,12 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v6;}
   return yyVal;
 };
-states[303] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[305] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((IRubyObject)yyVals[0+yyTop].value));
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[304] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[306] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_rescue = ((LexContext)yyVals[-1+yyTop].value).in_rescue;
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
@@ -3849,14 +3874,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[305] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[307] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = p.escape(((IRubyObject)yyVals[-1+yyTop].value));
                     v2 = p.dispatch("on_arg_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[306] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[308] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (!p.check_forwarding_args()) {
                         yyVal = null;
                     } else {
@@ -3870,7 +3895,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     }
   return yyVal;
 };
-states[307] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[309] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (!p.check_forwarding_args()) {
                         yyVal = null;
                     } else {
@@ -3881,11 +3906,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     }
   return yyVal;
 };
-states[312] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[314] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[313] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[315] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = ((RubyArray)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_bare_assoc_hash", v1);
@@ -3895,7 +3920,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[314] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[316] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = p.dispatch("on_args_new");
                     v2 = ((RubyArray)yyVals[-1+yyTop].value);
@@ -3906,7 +3931,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v6;}
   return yyVal;
 };
-states[315] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[317] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -3915,7 +3940,43 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[316] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[318] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
+                    p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
+{IRubyObject v1, v2, v3, v4, v5, v6, v7, v8, v9;
+                    v1 = ((IRubyObject)yyVals[0+yyTop].value);
+                    v2 = p.nil();
+                    v3 = p.nil();
+                    v4 = p.nil();
+                    v5 = p.dispatch("on_bodystmt", v1, v2, v3, v4);
+                    v6 = p.get_value(((DefHolder)yyVals[-3+yyTop].value));
+                    v7 = ((IRubyObject)yyVals[-2+yyTop].value);
+                    v8 = v5;
+                    v9 = p.dispatch("on_def", v6, v7, v8);
+                    yyVal = v9;}
+                    p.popCurrentScope();
+  return yyVal;
+};
+states[319] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
+                    p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
+{IRubyObject v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11;
+                    v1 = ((IRubyObject)yyVals[0+yyTop].value);
+                    v2 = p.nil();
+                    v3 = p.nil();
+                    v4 = p.nil();
+                    v5 = p.dispatch("on_bodystmt", v1, v2, v3, v4);
+                    v6 = ((RubyArray) ((DefHolder)yyVals[-3+yyTop].value).value).eltOk(0);
+                    v7 = ((RubyArray) ((DefHolder)yyVals[-3+yyTop].value).value).eltOk(1);
+                    v8 = ((RubyArray) ((DefHolder)yyVals[-3+yyTop].value).value).eltOk(2);
+                    v9 = ((IRubyObject)yyVals[-2+yyTop].value);
+                    v10 = v5;
+                    v11 = p.dispatch("on_defs", v6, v7, v8, v9, v10);
+                    yyVal = v11;}
+                    p.popCurrentScope();
+  return yyVal;
+};
+states[320] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -3923,7 +3984,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[317] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[321] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8, v9;
                     v1 = p.dispatch("on_args_new");
                     v2 = ((RubyArray)yyVals[-1+yyTop].value);
@@ -3937,7 +3998,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v9;}
   return yyVal;
 };
-states[318] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[322] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((RubyArray)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_bare_assoc_hash", v1);
@@ -3950,7 +4011,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[319] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[323] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -3959,7 +4020,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[320] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[324] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     boolean lookahead = false;
                     switch (yychar) {
                     case '(': case tLPAREN: case tLPAREN_ARG: case '[': case tLBRACK:
@@ -3971,7 +4032,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     if (lookahead) cmdarg.push0();
   return yyVal;
 };
-states[321] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[325] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     StackState cmdarg = p.getCmdArgumentState();
                     boolean lookahead = false;
                     switch (yychar) {
@@ -3985,25 +4046,25 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[322] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[326] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);}
   return yyVal;
 };
-states[323] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[327] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.nil();
 
   return yyVal;
 };
-states[324] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[328] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[325] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[329] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.fals();
 
   return yyVal;
 };
-states[326] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[330] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -4012,7 +4073,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[327] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[331] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -4021,7 +4082,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[328] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[332] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -4029,7 +4090,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[329] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[333] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -4037,24 +4098,24 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[330] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[334] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
 {                    yyVal = p.get_value(((IRubyObject)yyVals[0+yyTop].value));}
   return yyVal;
 };
-states[331] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[335] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.nil();}
   return yyVal;
 };
-states[332] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[336] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[333] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[337] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[334] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[338] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = p.dispatch("on_mrhs_new_from_args", v1);
@@ -4064,7 +4125,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[335] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[339] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = p.dispatch("on_mrhs_new_from_args", v1);
@@ -4074,7 +4135,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[336] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[340] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_mrhs_new");
                     v2 = v1;
@@ -4083,23 +4144,23 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[341] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[345] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((IRubyObject)yyVals[0+yyTop].value); /* FIXME: Why complaining without $$ = $1;*/
   return yyVal;
 };
-states[342] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[346] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((IRubyObject)yyVals[0+yyTop].value); /* FIXME: Why complaining without $$ = $1;*/
   return yyVal;
 };
-states[343] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[347] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((IRubyObject)yyVals[0+yyTop].value); /* FIXME: Why complaining without $$ = $1;*/
   return yyVal;
 };
-states[344] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[348] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((IRubyObject)yyVals[0+yyTop].value); /* FIXME: Why complaining without $$ = $1;*/
   return yyVal;
 };
-states[347] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[351] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_fcall", v1);
@@ -4110,11 +4171,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v6;}
   return yyVal;
 };
-states[348] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[352] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getCmdArgumentState().push0();
   return yyVal;
 };
-states[349] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[353] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getCmdArgumentState().pop();
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4122,25 +4183,25 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[350] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[354] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_ENDARG); 
   return yyVal;
 };
-states[351] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[355] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = p.dispatch("on_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[352] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[356] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[353] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[357] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -4148,34 +4209,34 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[354] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[358] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_top_const_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[355] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[359] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = p.escape(((IRubyObject)yyVals[-1+yyTop].value));
                     v2 = p.dispatch("on_array", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[356] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[360] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = p.escape(((IRubyObject)yyVals[-1+yyTop].value));
                     v2 = p.dispatch("on_hash", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[357] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[361] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_return0");
                     yyVal = v1;}
   return yyVal;
 };
-states[358] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[362] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_paren", v1);
@@ -4184,7 +4245,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[359] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[363] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -4194,26 +4255,26 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[360] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[364] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_yield0");
                     yyVal = v1;}
   return yyVal;
 };
-states[361] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[365] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_defined = false;
                     yyVal = p.new_defined(yyVals[yyTop - count + 1].start(), ((IRubyObject)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[362] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[366] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((IRubyObject)yyVals[-1+yyTop].value)), NOT);
   return yyVal;
 };
-states[363] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[367] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(p.nil()), NOT);
   return yyVal;
 };
-states[364] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[368] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8, v9;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_fcall", v1);
@@ -4227,7 +4288,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v9;}
   return yyVal;
 };
-states[366] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[370] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -4235,11 +4296,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[367] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[371] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[368] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[372] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -4248,7 +4309,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[369] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[373] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -4257,7 +4318,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[370] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[374] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4265,7 +4326,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[371] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[375] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4273,12 +4334,12 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[372] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[376] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.case_labels;
                     p.case_labels = p.getRuntime().getNil();
   return yyVal;
 };
-states[373] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[377] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4286,12 +4347,12 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[374] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[378] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.case_labels;
                     p.case_labels = null;
   return yyVal;
 };
-states[375] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[379] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = p.nil();
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4299,7 +4360,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[376] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[380] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4307,7 +4368,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[377] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[381] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -4316,11 +4377,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[378] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[382] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.begin_definition("class");
   return yyVal;
 };
-states[379] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[383] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-3+yyTop].value);
@@ -4334,11 +4395,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     ctxt.shareable_constant_value = ((LexContext)yyVals[-5+yyTop].value).shareable_constant_value;
   return yyVal;
 };
-states[380] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[384] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.begin_definition(null);
   return yyVal;
 };
-states[381] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[385] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4352,11 +4413,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[382] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[386] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.begin_definition("module");
   return yyVal;
 };
-states[383] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[387] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4369,11 +4430,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     ctxt.shareable_constant_value = ((LexContext)yyVals[-4+yyTop].value).shareable_constant_value;
   return yyVal;
 };
-states[384] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[388] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
   return yyVal;
 };
-states[385] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[389] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.restore_defun(((DefHolder)yyVals[-4+yyTop].value));
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.get_value(((DefHolder)yyVals[-4+yyTop].value));
@@ -4384,11 +4445,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[386] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[390] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
   return yyVal;
 };
-states[387] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[391] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.restore_defun(((DefHolder)yyVals[-4+yyTop].value));
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = ((RubyArray) ((DefHolder)yyVals[-4+yyTop].value).value).eltOk(0);
@@ -4401,7 +4462,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[388] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[392] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -4409,7 +4470,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[389] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[393] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -4417,30 +4478,30 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[390] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[394] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_redo");
                     yyVal = v1;}
   return yyVal;
 };
-states[391] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[395] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_retry");
                     yyVal = v1;}
   return yyVal;
 };
-states[392] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[396] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((IRubyObject)yyVals[0+yyTop].value));
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value) == null ? p.nil() : ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[393] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[397] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.token_info_push("begin", yyVals[yyTop - count + 1]);
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[394] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[398] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
                     p.WARN_EOL("if");
                     p.token_info_push("if", yyVals[yyTop - count + 1]);
@@ -4452,94 +4513,94 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                       }*/
   return yyVal;
 };
-states[395] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[399] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[396] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[400] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((NodeExits)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[397] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[401] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[398] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[402] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[399] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[403] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((NodeExits)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[400] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[404] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = (LexContext) p.getLexContext().clone();
                     p.getLexContext().in_rescue = LexContext.InRescue.BEFORE_RESCUE;
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
   return yyVal;
 };
-states[401] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[405] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = (LexContext) p.getLexContext().clone();  
                     p.getLexContext().in_rescue = LexContext.InRescue.BEFORE_RESCUE;
   return yyVal;
 };
-states[402] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[406] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
                     p.getLexContext().in_argdef = true;
   return yyVal;
 };
-states[403] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[407] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[404] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[408] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[405] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[409] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getLexContext().clone();
                     p.getLexContext().in_rescue = LexContext.InRescue.AFTER_RESCUE;
   return yyVal;
 };
-states[406] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[410] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getLexContext().clone();
   return yyVal;
 };
-states[407] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[411] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[408] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[412] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[409] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[413] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[410] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[414] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[411] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[415] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.compile_error("syntax error, unexpected end-of-input");
   return yyVal;
 };
-states[412] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[416] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     LexContext ctxt = p.getLexContext();
                     if (ctxt.cant_return && !p.dyna_in_block()) {
                         p.compile_error("Invalid return in class/module body");
                     }
   return yyVal;
 };
-states[413] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[417] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     LexContext ctxt = p.getLexContext();
                     if (ctxt.in_defined && !ctxt.in_def && !p.isEval()) {
                         p.compile_error("Invalid yield");
                     }
   return yyVal;
 };
-states[420] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[424] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4548,29 +4609,29 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[422] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[426] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_else", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[424] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[428] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
   return yyVal;
 };
-states[425] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[429] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[0+yyTop].value));
 
   return yyVal;
 };
-states[426] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[430] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_mlhs_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[427] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[431] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -4579,7 +4640,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[428] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[432] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -4587,11 +4648,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[429] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[433] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);}
   return yyVal;
 };
-states[430] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[434] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -4599,7 +4660,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[431] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[435] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -4610,7 +4671,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v6;}
   return yyVal;
 };
-states[432] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[436] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -4619,7 +4680,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[433] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[437] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = p.dispatch("on_mlhs_new");
                     v2 = v1;
@@ -4631,126 +4692,126 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[434] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[438] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     ByteList id = yyVals[yyTop - count + 2].id;
                       yyVal = p.assignable(id, ((IRubyObject)yyVals[0+yyTop].value));
 
   return yyVal;
 };
-states[435] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[439] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.nil();}
   return yyVal;
 };
-states[437] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[441] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.symbolID(LexingCommon.NIL);
 
   return yyVal;
 };
-states[438] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[442] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = false;
   return yyVal;
 };
-states[440] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[444] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-3+yyTop].value), ((IRubyObject)yyVals[-1+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[441] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[445] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-1+yyTop].value), (ByteList) null, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[442] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[446] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(p.src_line(), null, ((IRubyObject)yyVals[-1+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[443] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[447] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), null, (ByteList) null, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[444] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[448] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ArgsTailHolder)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[445] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[449] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(p.src_line(), null, (ByteList) null, (ByteList) null);
   return yyVal;
 };
-states[446] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[450] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_excessed_comma");
                     yyVal = v1;}
   return yyVal;
 };
-states[447] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[451] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-5+yyTop].value), ((RubyArray)yyVals[-3+yyTop].value), ((IRubyObject)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[448] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[452] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-7+yyTop].value), ((RubyArray)yyVals[-5+yyTop].value), ((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[449] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[453] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[450] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[454] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-5+yyTop].value), ((RubyArray)yyVals[-3+yyTop].value), null, ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[451] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[455] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-3+yyTop].value), null, ((IRubyObject)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[452] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[456] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-1+yyTop].value), null, ((IRubyObject)yyVals[0+yyTop].value), null, (ArgsTailHolder) null);
   return yyVal;
 };
-states[453] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[457] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-5+yyTop].value), null, ((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[454] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[458] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-1+yyTop].value), null, null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[455] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[459] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((RubyArray)yyVals[-3+yyTop].value), ((IRubyObject)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[456] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[460] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((RubyArray)yyVals[-5+yyTop].value), ((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[457] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[461] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((RubyArray)yyVals[-1+yyTop].value), null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[458] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[462] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((RubyArray)yyVals[-3+yyTop].value), null, ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[459] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[463] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, ((IRubyObject)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[460] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[464] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, ((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[461] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[465] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[462] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[466] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = null;
 
   return yyVal;
 };
-states[463] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[467] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCommandStart(true);
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[464] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[468] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     p.ordinalMaxNumParam();
                     p.getLexContext().in_argdef = false;
@@ -4769,7 +4830,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v11;}
   return yyVal;
 };
-states[465] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[469] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     p.ordinalMaxNumParam();
                     p.getLexContext().in_argdef = false;
@@ -4780,57 +4841,57 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[466] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[470] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
   return yyVal;
 };
-states[467] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[471] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-1+yyTop].value);}
   return yyVal;
 };
-states[468] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[472] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[469] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[473] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
-states[470] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[474] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.new_bv(yyVals[yyTop - count + 1].id);
 {                    yyVal = p.get_value(((IRubyObject)yyVals[0+yyTop].value));}
   return yyVal;
 };
-states[471] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[475] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
   return yyVal;
 };
-states[472] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[476] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.resetMaxNumParam();
   return yyVal;
 };
-states[473] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[477] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.numparam_push();
   return yyVal;
 };
-states[474] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[478] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.it_id();
                     p.set_it_id(null);
   return yyVal;
 };
-states[475] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[479] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pushBlockScope();
                     yyVal = p.getLeftParenBegin();
                     p.setLeftParenBegin(p.getParenNest());
   return yyVal;
 };
-states[476] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[480] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getCmdArgumentState().push0();
   return yyVal;
 };
-states[477] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[481] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     IRubyObject it_id = p.it_id();
                     int max_numparam = p.restoreMaxNumParam(((Integer)yyVals[-6+yyTop].value));
                     p.set_it_id(((IRubyObject)yyVals[-4+yyTop].value));
@@ -4846,7 +4907,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[478] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[482] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = false;
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -4854,29 +4915,29 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[479] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[483] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = false;
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[480] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[484] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.token_info_pop("}", yyVals[yyTop - count + 1]);
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[481] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[485] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
   return yyVal;
 };
-states[482] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[486] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[483] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[487] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[484] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[488] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /* Workaround for JRUBY-2326 (MRI does not enter this production for some reason)*/
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4885,7 +4946,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[485] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[489] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -4897,7 +4958,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[486] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[490] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-3+yyTop].value);
@@ -4910,7 +4971,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[487] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[491] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7, v8;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-3+yyTop].value);
@@ -4923,7 +4984,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v8;}
   return yyVal;
 };
-states[488] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[492] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_fcall", v1);
@@ -4933,7 +4994,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[489] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[493] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -4945,7 +5006,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[490] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[494] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = p.intern("::");
@@ -4957,7 +5018,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[491] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[495] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = p.intern("::");
@@ -4966,7 +5027,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[492] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[496] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -4978,7 +5039,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[493] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[497] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5, v6, v7;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = p.intern("::");
@@ -4990,20 +5051,20 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v7;}
   return yyVal;
 };
-states[494] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[498] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_super", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[495] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[499] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_zsuper");
                     yyVal = v1;}
   return yyVal;
 };
-states[496] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[500] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = p.escape(((IRubyObject)yyVals[-1+yyTop].value));
@@ -5011,19 +5072,19 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[497] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[501] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[498] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[502] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[499] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[503] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pushBlockScope();
   return yyVal;
 };
-states[500] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[504] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     IRubyObject it_id = p.it_id();
                     int max_numparam = p.restoreMaxNumParam(((Integer)yyVals[-5+yyTop].value));
                     p.set_it_id(((IRubyObject)yyVals[-3+yyTop].value));
@@ -5037,12 +5098,12 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();                    
   return yyVal;
 };
-states[501] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[505] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pushBlockScope();
                     p.getCmdArgumentState().push0();
   return yyVal;
 };
-states[502] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[506] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     IRubyObject it_id = p.it_id();
                     int max_numparam = p.restoreMaxNumParam(((Integer)yyVals[-5+yyTop].value));
                     p.set_it_id(((IRubyObject)yyVals[-3+yyTop].value));
@@ -5057,7 +5118,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[503] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[507] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -5066,7 +5127,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[504] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[508] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_args_new");
                     v2 = v1;
@@ -5075,7 +5136,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[505] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[509] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5083,7 +5144,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[506] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[510] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5091,7 +5152,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[507] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[511] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-3+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -5100,28 +5161,28 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[510] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[514] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.push_pvtbl();
   return yyVal;
 };
-states[511] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[515] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.push_pktbl();
   return yyVal;
 };
-states[512] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[516] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getLexContext().clone();
                     p.setState(EXPR_BEG|EXPR_LABEL);
                     p.setCommandStart(false);
                     p.getLexContext().in_kwarg = true;
   return yyVal;
 };
-states[513] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[517] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pvtbl(((Set)yyVals[-3+yyTop].value));
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     p.getLexContext().in_kwarg = ((LexContext)yyVals[-4+yyTop].value).in_kwarg;
   return yyVal;
 };
-states[514] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[518] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-4+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -5130,11 +5191,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[516] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[520] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[518] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[522] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -5142,7 +5203,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[519] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[523] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-2+yyTop].value);
@@ -5150,28 +5211,28 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[521] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[525] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, ((IRubyObject)yyVals[-1+yyTop].value),
                                                    p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, true, null, null));
   return yyVal;
 };
-states[522] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[526] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, ((IRubyObject)yyVals[-2+yyTop].value), ((RubyArray)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[523] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[527] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_find_pattern(null, ((RubyArray)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[524] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[528] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, null, ((RubyArray)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[525] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[529] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern(null, ((RubyArray)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[527] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[531] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = p.symbolID(EQ_GT);
@@ -5180,7 +5241,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[529] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[533] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = p.symbolID(OR);
@@ -5189,182 +5250,182 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[531] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[535] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Set)yyVals[0+yyTop].value);
 {                    yyVal = p.get_value(((Set)yyVals[0+yyTop].value));}
   return yyVal;
 };
-states[532] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[536] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Set)yyVals[0+yyTop].value);
 {                    yyVal = p.get_value(((Set)yyVals[0+yyTop].value));}
   return yyVal;
 };
-states[535] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[539] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), ((IRubyObject)yyVals[-3+yyTop].value), null, ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[536] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[540] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_find_pattern(((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[537] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[541] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_hash_pattern(((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[538] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[542] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), ((IRubyObject)yyVals[-2+yyTop].value), null,
                                                     p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, false, null, null));
   return yyVal;
 };
-states[539] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[543] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), ((IRubyObject)yyVals[-3+yyTop].value), null, ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[540] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[544] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_find_pattern(((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[541] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[545] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_hash_pattern(((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[542] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[546] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), ((IRubyObject)yyVals[-2+yyTop].value), null,
                             p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, false, null, null));
   return yyVal;
 };
-states[543] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[547] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, null, ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[544] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[548] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_find_pattern(null, ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[545] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[549] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, null,
                             p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, false, null, null));
   return yyVal;
 };
-states[546] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[550] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_kwarg = false;
   return yyVal;
 };
-states[547] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[551] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-4+yyTop].value));
                     p.getLexContext().in_kwarg = ((LexContext)yyVals[-3+yyTop].value).in_kwarg;
                     yyVal = p.new_hash_pattern(null, ((RubyArray)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[548] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[552] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern(null, p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), p.none(), null));
   return yyVal;
 };
-states[549] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[553] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[550] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[554] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                         yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), p.new_array(((IRubyObject)yyVals[0+yyTop].value)), false, null, null);
 
   return yyVal;
 };
-states[551] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[555] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[0+yyTop].value), true, null, null);
   return yyVal;
 };
-states[552] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[556] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 			RubyArray pre_args = ((RubyArray)yyVals[-1+yyTop].value).concat(((RubyArray)yyVals[0+yyTop].value));
 			yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), pre_args, false, null, null);
 
   return yyVal;
 };
-states[553] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[557] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-1+yyTop].value), true, ((IRubyObject)yyVals[0+yyTop].value), null);
   return yyVal;
 };
-states[554] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[558] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-3+yyTop].value), true, ((IRubyObject)yyVals[-2+yyTop].value), ((RubyArray)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[555] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[559] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((RubyArray)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[556] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[560] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((RubyArray)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[557] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[561] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((RubyArray)yyVals[-1+yyTop].value)));;}
   return yyVal;
 };
-states[558] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[562] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, true, ((IRubyObject)yyVals[0+yyTop].value), null);
   return yyVal;
 };
-states[559] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[563] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, true, ((IRubyObject)yyVals[-2+yyTop].value), ((RubyArray)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[560] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[564] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_find_pattern_tail(yyVals[yyTop - count + 1].start(), ((IRubyObject)yyVals[-4+yyTop].value), ((RubyArray)yyVals[-2+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[561] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[565] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.error_duplicate_pattern_variable(yyVals[yyTop - count + 2].id);
   return yyVal;
 };
-states[562] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[566] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
 {                    yyVal = p.var_field(p.nil());}
   return yyVal;
 };
-states[564] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[568] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((RubyArray)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
-states[565] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[569] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[566] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[570] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-2+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[567] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[571] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[0+yyTop].value), null);
   return yyVal;
 };
-states[568] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[572] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-1+yyTop].value), null);
   return yyVal;
 };
-states[569] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[573] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), null, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[570] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[574] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(((RubyArray)yyVals[0+yyTop].value));}
   return yyVal;
 };
-states[571] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[575] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), ((RubyArray)yyVals[0+yyTop].value));;}
   return yyVal;
 };
-states[572] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[576] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.error_duplicate_pattern_key(yyVals[yyTop - count + 1].id);
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[-1+yyTop].value)),  p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[573] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[577] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.error_duplicate_pattern_key(yyVals[yyTop - count + 1].id);
                     if (yyVals[yyTop - count + 1].id != null && !p.is_local_id(yyVals[yyTop - count + 1].id)) {
                         p.yyerror("key must be valid as local variables");
@@ -5373,7 +5434,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)),  p.nil());}
   return yyVal;
 };
-states[575] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[579] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       if (true) {
                         yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
                       }
@@ -5384,29 +5445,29 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     }
   return yyVal;
 };
-states[576] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[580] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[577] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[581] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                        yyVal = null;
 
   return yyVal;
 };
-states[578] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[582] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                        yyVal = p.symbolID(KWNOREST);
 
   return yyVal;
 };
-states[579] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[583] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[580] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[584] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[582] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[586] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5414,7 +5475,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[583] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[587] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5422,7 +5483,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[584] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[588] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.nil();
@@ -5430,7 +5491,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[585] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[589] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.nil();
@@ -5438,7 +5499,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[589] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[593] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = p.nil();
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5446,7 +5507,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[590] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[594] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = p.nil();
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5454,109 +5515,109 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[595] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[599] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[596] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[600] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[597] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[601] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[598] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[602] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[599] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[603] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[600] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[604] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[601] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[605] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[602] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[606] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[603] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[607] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[604] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[608] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[605] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[609] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[606] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[610] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[607] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[611] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[608] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[612] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[609] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[613] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[610] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[614] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_begin", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[611] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[615] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_top_const_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[612] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[616] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5564,14 +5625,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[613] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[617] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[614] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[618] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = p.escape(((IRubyObject)yyVals[-4+yyTop].value));
                     v2 = p.escape(((IRubyObject)yyVals[-3+yyTop].value));
@@ -5581,50 +5642,50 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[615] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[619] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null; 
   return yyVal;
 };
-states[616] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[620] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[617] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[621] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);}
   return yyVal;
 };
-states[619] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[623] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[621] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[625] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_ensure", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[623] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[627] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[624] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[628] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[625] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[629] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);}
   return yyVal;
 };
-states[626] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[630] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[627] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[631] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[628] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[632] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5632,41 +5693,41 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[629] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[633] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = p.heredoc_dedent(((IRubyObject)yyVals[-1+yyTop].value));
                     v2 = p.dispatch("on_string_literal", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[630] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[634] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = p.heredoc_dedent(((IRubyObject)yyVals[-1+yyTop].value));
                     v2 = p.dispatch("on_xstring_literal", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[631] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[635] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_regexp(yyVals[yyTop - count + 2].start(), ((IRubyObject)yyVals[-1+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[632] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[636] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
   return yyVal;
 };
-states[634] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[638] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_array", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[635] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[639] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_words_new");
                     yyVal = v1;}
   return yyVal;
 };
-states[636] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[640] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -5674,7 +5735,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[637] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[641] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((IRubyObject)yyVals[0+yyTop].value);
 {IRubyObject v1, v2, v3, v4;
                     v1 = p.dispatch("on_word_new");
@@ -5684,7 +5745,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[638] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[642] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5692,20 +5753,20 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[639] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[643] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_array", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[640] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[644] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_symbols_new");
                     yyVal = v1;}
   return yyVal;
 };
-states[641] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[645] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -5713,27 +5774,27 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[642] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[646] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_array", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[643] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[647] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_array", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[644] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[648] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_qwords_new");
                     yyVal = v1;}
   return yyVal;
 };
-states[645] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[649] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -5741,13 +5802,13 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[646] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[650] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_qsymbols_new");
                     yyVal = v1;}
   return yyVal;
 };
-states[647] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[651] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[-1+yyTop].value);
@@ -5755,7 +5816,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[648] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[652] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     ByteList aChar = ByteList.create("");
                     aChar.setEncoding(p.getEncoding());
                     yyVal = p.createStr(aChar, 0);
@@ -5764,7 +5825,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v1;}
   return yyVal;
 };
-states[649] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[653] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5773,13 +5834,13 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /* JRuby changed (removed)*/
   return yyVal;
 };
-states[650] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[654] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_xstring_new");
                     yyVal = v1;}
   return yyVal;
 };
-states[651] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[655] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5787,30 +5848,30 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[652] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[656] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_regexp_new");
                     yyVal = v1;}
   return yyVal;
 };
-states[653] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[657] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /* FIXME: mri is different here.*/
 			yyVal = p.dispatch("on_regexp_add", ((IRubyObject)yyVals[-1+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
 
   return yyVal;
 };
-states[654] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[658] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
 {                    yyVal = p.ripper_new_yylval(null, p.get_value(((IRubyObject)yyVals[0+yyTop].value)), ((IRubyObject)yyVals[0+yyTop].value));}
   return yyVal;
 };
-states[655] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[659] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getStrTerm();
                     p.setStrTerm(null);
                     p.setState(EXPR_BEG);
   return yyVal;
 };
-states[656] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[660] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setStrTerm(((StrTerm)yyVals[-1+yyTop].value));
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5818,29 +5879,29 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[657] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[661] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = p.getStrTerm();
                    p.setStrTerm(null);
                    p.getConditionState().push0();
                    p.getCmdArgumentState().push0();
   return yyVal;
 };
-states[658] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[662] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = p.getState();
                    p.setState(EXPR_BEG);
   return yyVal;
 };
-states[659] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[663] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = p.getBraceNest();
                    p.setBraceNest(0);
   return yyVal;
 };
-states[660] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[664] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = p.getHeredocIndent();
                    p.setHeredocIndent(0);
   return yyVal;
 };
-states[661] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[665] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    p.getConditionState().pop();
                    p.getCmdArgumentState().pop();
                    p.setStrTerm(((StrTerm)yyVals[-5+yyTop].value));
@@ -5855,14 +5916,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[664] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[668] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[668] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[672] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_END);
 {IRubyObject v1, v2, v3, v4;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5872,7 +5933,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v4;}
   return yyVal;
 };
-states[671] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[675] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_END);
 
 {IRubyObject v1, v2;
@@ -5881,11 +5942,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[672] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[676] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);  
   return yyVal;
 };
-states[673] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[677] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = p.intern("-@");
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -5893,23 +5954,23 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[674] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[678] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[675] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[679] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[676] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[680] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[677] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[681] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[681] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[685] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (p.id_is_var(yyVals[yyTop - count + 1].id)) {
                         yyVal = p.dispatch("on_var_ref", ((IRubyObject)yyVals[0+yyTop].value));
                     } else {
@@ -5918,7 +5979,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[682] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[686] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (p.id_is_var(yyVals[yyTop - count + 1].id)) {
                         yyVal = p.dispatch("on_var_ref", ((IRubyObject)yyVals[0+yyTop].value));
                     } else {
@@ -5927,7 +5988,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[683] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[687] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (p.id_is_var(yyVals[yyTop - count + 1].id)) {
                         yyVal = p.dispatch("on_var_ref", ((IRubyObject)yyVals[0+yyTop].value));
                     } else {
@@ -5936,7 +5997,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[684] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[688] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (p.id_is_var(yyVals[yyTop - count + 1].id)) {
                         yyVal = p.dispatch("on_var_ref", ((IRubyObject)yyVals[0+yyTop].value));
                     } else {
@@ -5945,7 +6006,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[685] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[689] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (p.id_is_var(yyVals[yyTop - count + 1].id)) {
                         yyVal = p.dispatch("on_var_ref", ((IRubyObject)yyVals[0+yyTop].value));
                     } else {
@@ -5954,49 +6015,49 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[686] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[690] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[687] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[691] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[688] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[692] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[689] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[693] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[690] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[694] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[691] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[695] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[692] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[696] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_var_ref", v1);
@@ -6004,96 +6065,96 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /* mri:keyword_variable*/
   return yyVal;
 };
-states[693] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[697] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
                     
   return yyVal;
 };
-states[694] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[698] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[695] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[699] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[696] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[700] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[697] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[701] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[698] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[702] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[699] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[703] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[700] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[704] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[701] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[705] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[702] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[706] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[703] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[707] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
   return yyVal;
 };
-states[704] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[708] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.assignable(yyVals[yyTop - count + 1].id, p.var_field(((IRubyObject)yyVals[0+yyTop].value)));
 
                     /* mri:keyword_variable*/
   return yyVal;
 };
-states[705] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[709] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[706] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[710] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[707] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[711] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    p.setState(EXPR_BEG);
                    p.setCommandStart(true);
   return yyVal;
 };
-states[708] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[712] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[709] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[713] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.nil();}
   return yyVal;
 };
-states[711] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[715] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = false;
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, null, null, 
                                     p.new_args_tail(p.src_line(), null, (ByteList) null, (ByteList) null));
   return yyVal;
 };
-states[712] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[716] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_paren", v1);
@@ -6103,18 +6164,18 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.setCommandStart(true);
   return yyVal;
 };
-states[713] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[717] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[714] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[718] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getLexContext().clone();
                     p.getLexContext().in_kwarg = true;
                     p.getLexContext().in_argdef = true;
                     p.setState(p.getState() | EXPR_LABEL);
   return yyVal;
 };
-states[715] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[719] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     LexContext ctxt = p.getLexContext();
                     ctxt.in_kwarg = ((LexContext)yyVals[-2+yyTop].value).in_kwarg;
                     ctxt.in_argdef = false;
@@ -6123,102 +6184,102 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.setCommandStart(true);
   return yyVal;
 };
-states[716] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[720] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-3+yyTop].value), ((IRubyObject)yyVals[-1+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[717] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[721] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-1+yyTop].value), (ByteList) null, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[718] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[722] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(p.src_line(), null, ((IRubyObject)yyVals[-1+yyTop].value), ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[719] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[723] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), null, (ByteList) null, ((IRubyObject)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[720] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[724] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.add_forwarding_args();
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), null, ((IRubyObject)yyVals[0+yyTop].value), FWD_BLOCK);
   return yyVal;
 };
-states[721] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[725] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ArgsTailHolder)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[722] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[726] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(p.src_line(), null, (ByteList) null, (ByteList) null);
   return yyVal;
 };
-states[723] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[727] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-5+yyTop].value), ((RubyArray)yyVals[-3+yyTop].value), ((IRubyObject)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[724] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[728] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-7+yyTop].value), ((RubyArray)yyVals[-5+yyTop].value), ((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[725] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[729] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[726] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[730] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-5+yyTop].value), ((RubyArray)yyVals[-3+yyTop].value), null, ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[727] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[731] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-3+yyTop].value), null, ((IRubyObject)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[728] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[732] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-5+yyTop].value), null, ((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[729] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[733] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((RubyArray)yyVals[-1+yyTop].value), null, null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[730] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[734] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((RubyArray)yyVals[-3+yyTop].value), ((IRubyObject)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[731] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[735] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((RubyArray)yyVals[-5+yyTop].value), ((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[732] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[736] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((RubyArray)yyVals[-1+yyTop].value), null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[733] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[737] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((RubyArray)yyVals[-3+yyTop].value), null, ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[734] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[738] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, ((IRubyObject)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[735] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[739] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, ((IRubyObject)yyVals[-3+yyTop].value), ((RubyArray)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[736] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[740] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[737] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[741] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(p.src_line(), null, null, null, null, (ArgsTailHolder) null);
   return yyVal;
 };
-states[738] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[742] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1;
                     v1 = p.dispatch("on_args_forward");
                     yyVal = v1;}
   return yyVal;
 };
-states[739] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[743] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "formal argument cannot be a constant";
 {IRubyObject v1, v2, v3;
                     v1 = p.intern(message);
@@ -6228,7 +6289,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.error();}
   return yyVal;
 };
-states[740] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[744] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "formal argument cannot be an instance variable";
 {IRubyObject v1, v2, v3;
                     v1 = p.intern(message);
@@ -6238,7 +6299,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.error();}
   return yyVal;
 };
-states[741] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[745] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "formal argument cannot be a global variable";
 {IRubyObject v1, v2, v3;
                     v1 = p.intern(message);
@@ -6248,7 +6309,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.error();}
   return yyVal;
 };
-states[742] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[746] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "formal argument cannot be a class variable";
 {IRubyObject v1, v2, v3;
                     v1 = p.intern(message);
@@ -6258,16 +6319,16 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.error();}
   return yyVal;
 };
-states[743] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[747] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value); /* Not really reached*/
   return yyVal;
 };
-states[744] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[748] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.formal_argument(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[0+yyTop].value));
                     p.ordinalMaxNumParam();
   return yyVal;
 };
-states[745] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[749] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     RubySymbol name = p.get_id(((IRubyObject)yyVals[0+yyTop].value));
                     p.setCurrentArg(name);
                       p.arg_var(yyVals[yyTop - count + 1].id);
@@ -6276,27 +6337,27 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[746] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[750] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
 {                    yyVal = p.get_value(((IRubyObject)yyVals[0+yyTop].value));}
   return yyVal;
 };
-states[747] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[751] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_mlhs_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[748] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[752] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[749] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[753] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
-states[750] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[754] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.formal_argument(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[0+yyTop].value));
                     p.arg_var(yyVals[yyTop - count + 1].id);
                     p.setCurrentArg(p.get_id(((IRubyObject)yyVals[0+yyTop].value)));
@@ -6305,64 +6366,64 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[751] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[755] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     p.getLexContext().in_argdef = true;
                       yyVal = p.new_assoc(p.assignable(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[-1+yyTop].value)), ((IRubyObject)yyVals[0+yyTop].value));
 
   return yyVal;
 };
-states[752] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[756] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     p.getLexContext().in_argdef = true;
                       yyVal = p.new_assoc(p.assignable(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[0+yyTop].value)), p.nil());
 
   return yyVal;
 };
-states[753] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[757] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = true;
                       yyVal = p.new_assoc(p.assignable(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[-1+yyTop].value)), ((IRubyObject)yyVals[0+yyTop].value));
 
   return yyVal;
 };
-states[754] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[758] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = true;
                       yyVal = p.new_assoc(p.assignable(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[0+yyTop].value)), p.fals());
 
   return yyVal;
 };
-states[755] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[759] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[756] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[760] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
-states[757] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[761] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[758] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[762] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
-states[759] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[763] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[760] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[764] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[761] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[765] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = p.nil();
                     v2 = p.dispatch("on_nokw_param", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[762] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[766] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.shadowing_lvar(yyVals[yyTop - count + 2].id);
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -6370,50 +6431,50 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[763] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[767] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = p.nil();
                     v2 = p.dispatch("on_kwrest_param", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[764] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[768] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = p.new_assoc(p.assignable(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[-2+yyTop].value)), ((IRubyObject)yyVals[0+yyTop].value));
 
   return yyVal;
 };
-states[765] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[769] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = true;
                     p.setCurrentArg(null);
                       yyVal = p.new_assoc(p.assignable(yyVals[yyTop - count + 1].id, ((IRubyObject)yyVals[-2+yyTop].value)), ((IRubyObject)yyVals[0+yyTop].value));
 
   return yyVal;
 };
-states[766] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[770] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[767] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[771] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
-states[768] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[772] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[769] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[773] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
-states[770] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[774] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = STAR;
   return yyVal;
 };
-states[771] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[775] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[772] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[776] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (!p.is_local_id(yyVals[yyTop - count + 2].id)) {
                         p.yyerror("rest argument must be local variable");
                     }
@@ -6424,22 +6485,22 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[773] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[777] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = p.nil();
                     v2 = p.dispatch("on_rest_param", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[774] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[778] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = AMPERSAND;
   return yyVal;
 };
-states[775] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[779] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[776] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[780] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (!p.is_local_id(yyVals[yyTop - count + 2].id)) {
                         p.yyerror("block argument must be local variable");
                     }
@@ -6450,55 +6511,55 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[777] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[781] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.arg_var(p.shadowing_lvar(ANON_BLOCK));
                         yyVal = p.dispatch("on_blockarg", p.nil());
 
   return yyVal;
 };
-states[778] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[782] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[779] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[783] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
   return yyVal;
 };
-states[780] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[784] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((IRubyObject)yyVals[0+yyTop].value));
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[781] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[785] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_BEG);
   return yyVal;
 };
-states[782] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[786] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_paren", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[783] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[787] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
   return yyVal;
 };
-states[784] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[788] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((RubyArray)yyVals[-1+yyTop].value);
                     v2 = p.dispatch("on_assoclist_from_args", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[785] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[789] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = p.new_array(p.get_value(((IRubyObject)yyVals[0+yyTop].value)));}
   return yyVal;
 };
-states[786] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[790] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {                    yyVal = ((RubyArray)yyVals[-2+yyTop].value).push(p.getContext(), p.get_value(((IRubyObject)yyVals[0+yyTop].value)));;}
   return yyVal;
 };
-states[787] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[791] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -6506,7 +6567,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[788] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[792] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[-1+yyTop].value);
                     v2 = ((IRubyObject)yyVals[0+yyTop].value);
@@ -6514,7 +6575,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[789] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[793] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.nil();
@@ -6522,7 +6583,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v3;}
   return yyVal;
 };
-states[790] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[794] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2, v3, v4, v5;
                     v1 = ((IRubyObject)yyVals[-2+yyTop].value);
                     v2 = p.dispatch("on_dyna_symbol", v1);
@@ -6532,14 +6593,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v5;}
   return yyVal;
 };
-states[791] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[795] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 {IRubyObject v1, v2;
                     v1 = ((IRubyObject)yyVals[0+yyTop].value);
                     v2 = p.dispatch("on_assoc_splat", v1);
                     yyVal = v2;}
   return yyVal;
 };
-states[792] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[796] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.forwarding_arg_check(FWD_KWREST, FWD_ALL, "keyword rest");
 {IRubyObject v1, v2;
                     v1 = p.nil();
@@ -6547,80 +6608,80 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = v2;}
   return yyVal;
 };
-states[793] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[797] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[794] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[798] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[795] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[799] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[796] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[800] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[797] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[801] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[798] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[802] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[799] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[803] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[800] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[804] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[801] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[805] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[802] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[806] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[803] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[807] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[804] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[808] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[806] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[810] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IRubyObject)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[811] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[815] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = RPAREN;
   return yyVal;
 };
-states[812] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[816] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = RBRACKET;
   return yyVal;
 };
-states[813] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[817] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = RCURLY;
   return yyVal;
 };
-states[821] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[825] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = null;
   return yyVal;
 };
-states[822] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[826] = (RipperParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                   yyVal = null;
   return yyVal;
 };
 }
-					// line 4639 "ripper_RubyParser.out"
+					// line 4688 "ripper_RubyParser.out"
 
 }
-					// line 14752 "-"
+					// line 15013 "-"
diff --git a/core/src/main/java/org/jruby/ext/ripper/RubyLexer.java b/core/src/main/java/org/jruby/ext/ripper/RubyLexer.java
index d3779d0c96f..8133233c515 100644
--- a/core/src/main/java/org/jruby/ext/ripper/RubyLexer.java
+++ b/core/src/main/java/org/jruby/ext/ripper/RubyLexer.java
@@ -984,6 +984,25 @@ private String tokenToEventId(int token) {
                 return "on_CHAR";
         }
     }
+    
+    // DEBUGGING HELP
+    // These are manually tweaked for deep debugging issues where yylex2 is changed to yylex and yylex is changed
+    // to yylex2.  We do not want to progmatically add printToken into our code as this is already a lot of code
+    // for the JVM to reason with.
+    /*
+    private int yylex2() throws IOException {
+        try {
+        int currentToken = yylex2();
+
+            printToken(currentToken);
+        
+        return currentToken;
+        } catch (Exception e) {
+            System.out.println("FFUFUFUFUFUFUFUF: " + e);
+            return EOF;
+        }
+    }
+     */
 
     /**
      *  Returns the next token. Also sets yyVal as needed.
diff --git a/core/src/main/java/org/jruby/ext/ripper/RubyRipper.java b/core/src/main/java/org/jruby/ext/ripper/RubyRipper.java
index 2b3c2759109..11962381c66 100644
--- a/core/src/main/java/org/jruby/ext/ripper/RubyRipper.java
+++ b/core/src/main/java/org/jruby/ext/ripper/RubyRipper.java
@@ -33,6 +33,7 @@
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyHash;
+import org.jruby.RubyHashLinkedBuckets;
 import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
@@ -72,7 +73,7 @@ private static void defineLexStateConstants(ThreadContext context, RubyClass rip
     
     // Creates mapping table of token to arity for on_* method calls for the scanner support
     private static RubyHash createScannerEventTable(ThreadContext context) {
-        RubyHash hash = new RubyHash(context.runtime);
+        RubyHash hash = RubyHashLinkedBuckets.newLBHash(context.runtime);
 
         hash.fastASet(asSymbol(context, "CHAR"), asFixnum(context, 1));
         hash.fastASet(asSymbol(context, "__end__"), asFixnum(context, 1));
@@ -131,7 +132,7 @@ private static RubyHash createScannerEventTable(ThreadContext context) {
     
     // Creates mapping table of token to arity for on_* method calls for the parser support    
     private static RubyHash createParserEventTable(ThreadContext context) {
-        RubyHash hash = new RubyHash(context.runtime);
+        RubyHash hash = RubyHashLinkedBuckets.newLBHash(context.runtime);
 
         hash.fastASet(asSymbol(context, "BEGIN"), asFixnum(context, 1));
         hash.fastASet(asSymbol(context, "END"), asFixnum(context, 1));
diff --git a/core/src/main/java/org/jruby/ext/ripper/Warnings.java b/core/src/main/java/org/jruby/ext/ripper/Warnings.java
index 5494e34a312..36e30a57826 100644
--- a/core/src/main/java/org/jruby/ext/ripper/Warnings.java
+++ b/core/src/main/java/org/jruby/ext/ripper/Warnings.java
@@ -110,17 +110,4 @@ public String getID() {
     public abstract void warning(ID id, String message);
     public abstract void warning(ID id, Position position, String message);
     public abstract void warning(ID id, String fileName, int lineNumber, String message);
-    
-    @Deprecated(since = "1.7.4")
-    public abstract void warn(ID id, String message, Object... data);
-    @Deprecated(since = "1.7.4")
-    public abstract void warning(ID id, String message, Object... data);
-    @Deprecated(since = "1.7.4")
-    public abstract void warn(ID id, Position position, String message, Object... data);
-    @Deprecated(since = "1.7.4")
-    public abstract void warn(ID id, String fileName, int lineNumber, String message, Object... data);
-    @Deprecated(since = "1.7.4")
-    public abstract void warning(ID id, Position position, String message, Object... data);
-    @Deprecated(since = "1.7.4")
-    public abstract void warning(ID id, String fileName, int lineNumber, String message, Object...data);
 }
diff --git a/core/src/main/java/org/jruby/ext/ripper/YyTables.java b/core/src/main/java/org/jruby/ext/ripper/YyTables.java
index 442885c4689..3eae35772a3 100644
--- a/core/src/main/java/org/jruby/ext/ripper/YyTables.java
+++ b/core/src/main/java/org/jruby/ext/ripper/YyTables.java
@@ -53,2577 +53,2775 @@ public static final int[] yyCheck() {
    private static final int[] yyTable1() {
       return new int[] {
 
-          110,   92,  323,  410,  454,  457,  368,  311,  234,  234, 
-          321,  277,  284,  416,  601,   99,  495,  208,  209,  423, 
-          693,  430,  789,  201,  784,  796,  345,  204,  236,  236, 
-          591,  925,  332,  697,  504,  591,  986,  368,  311,  255, 
-          577,  314,  719,  201,  661,  577,  719,  204,  919,  282, 
-          922,  281,  281,  288,  292,  242,  242,  435,  722,  435, 
-          435,  718,  311,  237,  237,  657,   99,   99,  666,  798, 
-          312,  453,  797,  311,  311,  917,  674,  252,  821,  204, 
-          236,  575,  339,  339,  775,  328,  329,  330,  779,  534, 
-          248,  751,  689,  536,  821,  287,  291,  722,  823,  905, 
-          718,  359,  365,  285,  239,  246,  262,  261, 1184,  823, 
-          234,  616,  555,  557,  367, 1005,  841,  821,  714,  857, 
-          841,  841,  247,  455,  365,  312,  882,  821,  814,  474, 
-          236,  419,  236,  770,  236,  236,  470,  470,  821,  657, 
-          204,  666,  403,  821,  746,  326,  940,  401, 1007, 1169, 
-          489,  364,  402,  523, 1230,  981,  476,  242, 1061,  365, 
-          616,  409, 1190,  835, 1277,  237,  821,  807,  112,  808, 
-          418,  483,  738,  364,  748,  746, 1261, 1264,  746,  797, 
-          921,  520,  415,  277,  752,   98,  365,  821,  821,  506, 
-          253,  509,  256,  746,  368,  438,  737,  738,  342, 1130, 
-          822,  247,  758, 1114, 1114,  409,  432, 1344,  364, 1242, 
-          787,  926,  821, 1189,  341,  752,  821,  540,  752,  722, 
-          779,  252, 1250,  281,  860,  415,  545,  605,  788,  339, 
-          339,  822,  326,  752,  277,  364,  314,  821,   99,  808, 
-          234, 1319,  415,  234, 1231,  503, 1259, 1262,  517,  759, 
-          722,  779,  614,  615,  616,  617,  110,   92,  311,  415, 
-          236,  821,  738,  236,  236,  880,  236,  314,  722,  779, 
-          414,   99,  282,  610,  281, 1005,  495,  719, 1344,  719, 
-          525,  257,  435,  822, 1075,  252,  737,  488, 1348,   99, 
-          242,  722,  807,  415,  808,  499,  718,  517,  237,  821, 
-          989,  604,  526,  606,  488,  678, 1157,  435,  435,  435, 
-          435, 1058,  620,  621, 1225,  917,  794,  946,  408,  314, 
-          133,  312,  353,  252, 1223,  822,  770,  912,  142, 1114, 
-          395,  881,  394,  515,  248,  821,  889,  418,  544,  505, 
-          530,  281,  971,  281,  484,  485,  123,  756,  687,  756, 
-          694, 1351,  868,  251,  738, 1016,   99,  236,   99,  695, 
-          979,  341,  408,  696,  687,  538,   92,  353,  616,  109, 
-          368,  821, 1353,  802,  529,  821,  821,  142,  719,  311, 
-           99,  684,  236,  236,  236,  236,  277,  236,  236,  841, 
-          841,  821,  821,  687,  688,  841,  841,  718, 1019,  821, 
-          109, 1018,  574,   98,  773,  435,  965,  234,  821,  687, 
-         1064, 1053,  503,  680,  921, 1183,  684,  746, 1183,  821, 
-          109, 1009, 1011, 1013,  282, 1015,  281,  236,  822,  821, 
-         1017,  281,  809,  377, 1353,  773,  667, 1226,  773,  341, 
-          763,   99,  312, 1182,  667,  821,   99,  817,  821,  819, 
-          821,  141,  616,  773,  821,  540,  691,  752, 1129, 1129, 
-          575,  537, 1018,  274,  821,  805,  821,  591,  234,  591, 
-         1188,  763,  821, 1278,  763,  770,  770,  821,  841,  326, 
-          236,  234,  821,  412,  422,  665,  503,  686,  236,  763, 
-          841,  415,  722,  779,  893,  821,  311,  809,  671,   60, 
-          141,  236,  675,  676,  677,  517,  816,  746,  821,  667, 
-          820,  822,  895,  821,  807,  242, 1347,  795,  773, 1349, 
-          548,  804,  807,  237,  821,  731,  412,  413, 1384,  201, 
-          720,  821,  686,  204,  718,  335,  609,  234,  405,   99, 
-          667,  862,  503,  412,  487,  906,  898,  752, 1062,  906, 
-          811,  719,   14,   14,  763,  152,  821,  236,  665,  312, 
-          412,  519,  312,  722,  705,  667,  374,  375,  777,  744, 
-          721,  550,  551,  723,  724, 1360,  466, 1158, 1160, 1161, 
-         1162,  142,  722,  779, 1129,  142,  809, 1042,  540,  665, 
-         1355,  515, 1357,  794,  412,  543,  794,  281,  739,  777, 
-          281,  415,  234,  382,  383,  821,  431,  503,  657,  799, 
-          666,   14,   99,  236,  665,   99,  236,  777,  812,  917, 
-         1148, 1283,  236,  353,  353,  866, 1129, 1129, 1129,  311, 
-          667,  737,   99,  421,  770,  770,  837,  527,  109,  762, 
-          837,  837,  855,  864,  530,  312,  701, 1233,  931,  687, 
-          687,  874, 1390,  821,  899,  935,  839, 1166,  821,  466, 
-          846,  445,  883,  821,  834,  687,  687,  800,  893,  809, 
-          896,  821,  834,  374,  375,  917, 1069,  773,  533,  665, 
-          737,  252,  777,  281,  838,  415,  763,  825,  838,  838, 
-          236,  281,  312, 1234,  234,  311,  833,  591,   99,  503, 
-          236,  281,  281,  591,  845, 1321,   99,  577,  141, 1220, 
-          445,  821, 1330,  763,  236, 1367,   99,   99,  425,  885, 
-         1345,  821,  667,  201,  851,  851,  824,  204,  980,  809, 
-          957,  982,  475,  313,  568,  831,  834,  426, 1129, 1299, 
-          816,  991, 1154,  831,  427,  236,  510,  809,  101,  960, 
-          569,  477,  958, 1254,  807,  926,  511,  512,  312,  988, 
-          863,  101,  101,  591,  313,  894,  152,  773,  548,  938, 
-          540,  665,  816,  577,  754,  445,  415,  924,  907,  908, 
-          573,  574,  909,  910,  924, 1292,  101,  779,  686,  686, 
-         1380,  987,  412,  608,    7,  821,  794, 1022,  415,  101, 
-          101,  815,  353,  763,    7,  251,  824,  831,  754,  281, 
-          644,  311,  787,  101,  435,  152,  313,  101,  453,  550, 
-          551, 1288, 1246,  754,   99,  828,  971,  479,  871,  706, 
-         1196, 1055,  122,  486,  686,  753,  779,  101,  807,  737, 
-         1059,  777,  821,  701,  821, 1063,  353,  353, 1066,  646, 
-         1163, 1164,  920,    7,  738,  726,  927,  644,  728, 1057, 
-          729,  968,  974,  101,  645,  101,  894,  101,  101,  753, 
-          737, 1241,  974,  821,  312,  281,  794,  741,  828,  686, 
-          353,  490,  353,  493,  753,  738,  107,  204,  754,  236, 
-           99,  821, 1281,  822, 1269,  353,  646,  105,  944,  945, 
-          808,  779,  412,  700, 1065, 1002,  950,  951,  808,  837, 
-          837,  645,  828,  494,  435,  837,  837,  107, 1334,    7, 
-          821,  821,  821, 1153,  822,  794,  821,  353,  105, 1028, 
-         1030,  777,  771, 1056,  403, 1034, 1036,  107,  496,  401, 
-          399,  738,  400,   99,  402,  236, 1252, 1253,  105,  753, 
-          234,  947,  446,  497,  932,  503,  647,  838,  838,  952, 
-          353,  970,  971,  838,  838,  994,  995, 1054,  997,  998, 
-          236,  101,  828,  281,   99,  807,  807,  807,  667,  821, 
-          890,  807,  807,  514,  807,  281,  412,  956,   99,  236, 
-         1024,  518,  807,  101,   97,  737,  101,  101,  837,  101, 
-           99,  446, 1269,  647,  101, 1269, 1186, 1187,  765, 1281, 
-          837, 1281,  312, 1350,  900,  695,  521,  851, 1133, 1165, 
-         1152,  524,  101,  152,  377, 1033,  737,  665,  532, 1156, 
-         1131, 1132,  859, 1293, 1294,  807, 1045,  807, 1136, 1179, 
-          535,  429,  765,  312,  737,  828,  838, 1139, 1143,  821, 
-         1147,  993,   99,  539,  821,  101,  821,  765,  838,  884, 
-          281,   99,  432,  102, 1247,  656,  446,  141,  656,  281, 
-         1350, 1281,  429, 1067,  937,   99,  656,  412, 1287,  430, 
-          942,  433,  943,  807,   99,  546, 1074,  558, 1076,  101, 
-          101,  101, 1077,  432,  102,  311,  821,  110, 1202,  412, 
-         1363,  821, 1203,  353,  353,  600, 1221,  821, 1149,  603, 
-          430,  821,  433,  101,  102,  101,  101,  101,  101,  435, 
-          101,  101,  765,  915,  607,  821,  821,  821,  110, 1200, 
-         1200, 1289,  821,  542,  542,  686,  686,  103,  281,  656, 
-          840,  656,  281, 1167,  847, 1176,  281,  990,  110,  611, 
-          974,  117,  669,   99,  821,  107,  431,   99, 1217, 1284, 
-          101,   99, 1249,  681,  117,  117,  105,  612,  103, 1260, 
-         1263,  656,  656,  143,  101,  698, 1339, 1340, 1290,  101, 
-          124,  704,  688,  353,  353,  821,  709,  431,  103, 1298, 
-          840,  710,  847,  730,  236,  656,  281,  656, 1279,  281, 
-          548,  725,  117,  117, 1369,  108,  828, 1312,  897,  688, 
-          129,   99,  496,  101,   99,  727,  117,  734,  281,  974, 
-          977,  101,  143, 1026, 1027,  377,  743,  688,  745,  281, 
-          311,  435,  435,   99,  101,  772,  108, 1236,  144, 1256, 
-         1258,  774,  390,  391,   99,  776,  106,  549,  778, 1000, 
-         1001,  550,  551, 1244,  688,  783,  108,  496,  828, 1177, 
-          656,  785,  656,  786,  818, 1004,  117,  821,  117,  117, 
-          117,  117,  101,  826,  689, 1273,  829,  106,  830,  311, 
-          435,  234,  861, 1143,  865,  868,  503,  144,  968,  496, 
-          101,  148,  871, 1328,  714,  281, 1366,  106,  809,  793, 
-          117,  236,  913,  117,  888,  681,  236,  236, 1137,  667, 
-           99,  435,  891,  892,  435, 1279,  548, 1279, 1229,  689, 
-          117,  924,  714,  889, 1279,  793,  714,  496,  930,  117, 
-          914,  681,  102,  828,  828,  933,  281,  934,  941,  948, 
-          148,  949, 1364,  714,  953,  101,  101,  955,  101,  101, 
-          681,   99,  656,  828,  656,  101,  959,  963,  665,  252, 
-         1174, 1229,  964,  553,  974,  101,  110,  550,  551,  966, 
-          708,  971,  496, 1279,  117, 1279,  681, 1279,  104, 1279, 
-          403,  398,  793,  996,  999,  401,  399,  575,  400,  992, 
-          402,  576, 1354, 1032, 1008, 1279,  117, 1010, 1012,  117, 
-          117, 1361,  117, 1014,  496,  788,  103,  117,  793,  104, 
-          125,   20,  689, 1029, 1031,  143, 1072,  101,  548, 1035, 
-         1037,  101,  101,  101, 1073,  117,  828,  828,  828,  104, 
-          143,  101, 1141,  101, 1145, 1238, 1239, 1159, 1229,  101, 
-         1178, 1185,   20, 1193, 1194,  148,  496,  101,  323,  101, 
-          101, 1197, 1388,  548, 1389, 1255, 1391,  689,  323, 1243, 
-           20, 1183, 1245, 1029, 1031,  553, 1035, 1037, 1087,  550, 
-          551,  403, 1397, 1295,  108, 1286,  401,  399,  101,  400, 
-         1296,  402, 1301,  688,  688,  511, 1302, 1305, 1313,  323, 
-         1314,  129,  117,  117,  117,  144, 1316, 1320,  828, 1322, 
-          554,  511, 1134, 1323,  550,  551, 1368,  323,  548, 1346, 
-          688,  688, 1177,  496,  496,  106,  117,  746,  117,  117, 
-          117,  117,  129,  117,  117,  129,   20,  496, 1309, 1310, 
-         1311,  511, 1358,  126, 1362,  511, 1134, 1370,  117,  793, 
-         1372,  323,  129, 1374, 1257,  821,  126,  126,  148, 1376, 
-         1378,  746,  127, 1394,  691,  553,  821,  101,  807,  550, 
-          551,  496, 1246,  117,  136,  793,  746,  809,  438,  548, 
-          556,  814,  496,  323,  814,  689,  689,  117,   40,   41, 
-           42,   43,  117,  548,  126,  126,  809,  816,  809,  372, 
-          714, 1300,  714,  714,  714,  714,  714,  809,  126,  691, 
-         1365, 1304,  809,  331,  496,  334,  681,  681,  656,  473, 
-          656,  761,  714, 1306, 1307, 1308,  117,  978, 1020, 1021, 
-          550,  551,  101,  101,  117,  517,  714,  613,  496,  496, 
-          755,  746,  681,  681,  550,  551,  714,  117,  740, 1038, 
-         1039,  714,  714,  714,  742,  144, 1291,  104,  126, 1048, 
-          126, 1337,  126,  126, 1331,  563,  136,  564,  565,  566, 
-          567,  568,  844,   20,   20,   20, 1356, 1270,  452,   20, 
-           20,  377,   20,  918, 1006,  117,  911,  569,  101, 1201, 
-           20,  923, 1180, 1359,  316,  317,  793,  318,  390,  391, 
-          101,  101,  681,  117,  336, 1387,  101,  101,  961,  651, 
-          126,  571,  690,  101,  336,  136,  572,  573,  574,  363, 
-          323,  323,  323,  689,  689,  323,  323,  323,  128,  323, 
-          692,  101,  101,   20, 1385,   20, 1251,  323, 1181,  323, 
-          323, 1248,  100,  101,  417,  336, 1266,  681,  330,  323, 
-          323, 1049,  323,  323,  323,  323,  323,  690,  117,  117, 
-         1371,  117,  117,  336, 1267,  732,  126, 1329,  117, 1089, 
-          129,  496,  377,  100,    0,  692,  112,  139,  117,  793, 
-          323,   20,  323,    0,    0,  569,    0,    0,  126,  101, 
-          548,  126,  126,   98,  126,  101,    0,  146,  119,  126, 
-          683,  101,    0,    0,  101,    0,  563,  794,  564,  565, 
-          566,  567,    0,  684,  323,  573,    0,  126,  101, 1265, 
-          120,    0,    0,    0,    0,  289,  139,  101,  323,  336, 
-          117,  648,    0,    0,  117,  117,  117,  760,  496,  496, 
-            0,  550,  551,  131,  117,  683,  117,    0,    0,    0, 
-          794,  120,  117,    0,  120,  635,  684,    0,  684,    0, 
-          117,    0,  117,  117,    0,  691,  691,  640,    0,    0, 
-          118,  120,  682,  793,  131,  636,    0,  131,  648,  798, 
-            0,    0,  648,  648,  126,  126,  126,    0,  641,    0, 
-          794,  117,    0,    0,  131,    0,  101,    0,  681,    0, 
-          101,  684,  635,    0,  101,    0,  635,  635,  126,    0, 
-          126,  126,  126,  126,  640,  126,  126,  682,  640,  640, 
-            0,    0,  636,  136,  798,    0,  636,  636,  793,    0, 
-            0,    0,  681,  794,  681,  641,  793,  101,    0,  641, 
-          641,    0,    0,    0,    0,  145,    0,  681,    0,  656, 
-            0,  656,    0,    0,  101,  126,  798,  101,  121,    0, 
-          685,    0,    0,  147,    0,    0,  336,  336,  336,  126, 
-          117,  336,  336,  336,  126,  336,  101,    0,    0,  681, 
-            0,    0,    0,  336,    0, 1126, 1126,  101,    0,    0, 
-          714,  146,  478,    0,    0,  480,  481,  482,  336,  336, 
-          336,  336,  336,  681,  681,  685,    0,    0,  126,    0, 
-          107,  793,  681,  690,  690,    0,  126,  794,  714,    0, 
-            0,  120,  714,  684,    0,  656,  336,  691,  336,  126, 
-            0,  692,  692,  138,  139,  117,  117,    0,    0,  714, 
-          146,  821,    0,    0,  101,    0,  133,  794,    0,  101, 
-          101,    0,    0,  101,    0,  336,    0,  150,    0,    0, 
-            0,  107,  107,    0,    0,  313,    0,  126,  684,    0, 
-            0,    0,  691,    0,  336,    0,  794,  133,    0,    0, 
-          133,    0,  353,    0,    0,  126,    0,  793,  145,  120, 
-          794,  117,    0,  798,  101,    0,  360,  133,    0,    0, 
-          794,  683,  683,  117,  117,  137,  150,    0,    0,  117, 
-          117, 1126,  131,  798,  684,  684,  117,    0,  485,    0, 
-          313,    0,    0,    0,  690,    0,    0,  353,  485,    0, 
-            0,  471,  471,    0,  117,  117,    0,  145,  798,    0, 
-          126,  126,    0,  126,  126,    0,  117,    0,    0,    0, 
-          126,    0,    0, 1126, 1126, 1126,    0,  684,  684,  485, 
-          126,    0,    0,    0,  485,    0,    0,    0,  793,  690, 
-          798,    0,    0,  682,  682,  316,  317,  485,  318,    0, 
-          798,  798,    0,    0,    0,   45,   46,    0,  123,    0, 
-            0,    0,  117,  140,    0,    0,    0,    0,  117,    0, 
-         1099, 1099,    0,    0,  117,    0,  563,  117,  564,  565, 
-          566,  567,  126,    0,    0,    0,  126,  126,  126,  123, 
-            0,  117,  123,    0,  687,   84,  126,    0,  126,    0, 
-          117,    0,    0,  107,  126,  681,  681,    0,  147,  123, 
-            0,  298,  126,  485,  126,  126,    0,    0,  146,    0, 
-            0,  298,  764,    0,    0,  711,  139,  794,    0,  717, 
-            0,  685,  685,  289,    0, 1126,  107, 1099, 1099,  687, 
-            0, 1099,    0,  126,  692,    0,   84,   84,    0,    0, 
-          309,    0,  298,    0,  107,  298,  714,  147,  714,  714, 
-          714,  714,  714,  369,  370,  371,  372,  373,  717,  117, 
-          298,    0,  289,  117,    0, 1099,    0,  117,  714,    0, 
-            0,  309,    0,    0,  150,  133,  313,    0,    0,  692, 
-            0,    0,  714,    0,  684,  684, 1099,  798,  691,  691, 
-            0,    0,  714,    0,  298,  309,    0,  714,  714,  714, 
-          117,    0,    0,    0, 1099,  145,  309,  309, 1099,   85, 
-            0,  107,  126,  107,    0,    0,  135,  117,  346,  780, 
-          117, 1099, 1099, 1099, 1099,    0,  298,    0, 1099, 1099, 
-            0, 1099,    0,    0,    0,  107,    0,    0,    0,  117, 
-          485,  485,  485,  353,  353,  485,  485,  485,    0,  485, 
-          117,    0,    0,  130,  798,  798,    0,  485,    0,  485, 
-           85,   85,    0,  346,  310,    0,    0,    0,    0,  485, 
-          485,    0,  485,  485,  485,  485,  485,  126,  126,    0, 
-            0,    0,    0,  793,  130,  690,  690,  130,    0,  793, 
-            0,    0,    0,  132,    0,  310,  107,  313,    0,    0, 
-          485,  107,  485,    0,  130,  850,  856,  117,   84,    0, 
-            0,    0,  117,  117,    0,    0,  117,  123,    0,  310, 
-            0,    0,    0,  794,  132,  485,  485,  132,    0,  794, 
-          310,  310,    0,  126,  793,    0,    0,  886,    0, 1099, 
-            0,   84, 1099,    0,  132,  126,  126,    0,  485,    0, 
-         1099,  126,  126,    0,  717,  147,  289,  117,  126,   84, 
-            0,    0,    0,  298,  298,  298,  793,    0,  298,  298, 
-          298,    0,  298,    0,  794,  684,  126,  126,    0,    0, 
-          298,    0,  298,  298,  298,  687,  687,    0,  126,    0, 
-            0,  309,  298,  298,  107,  298,  298,  298,  298,  298, 
-            0,    0,    0,    0,    0,  794,  794, 1099,    0,  684, 
-          929,  684,    0,  134,  313,  354, 1341,    0,  564,  565, 
-          566,  567,    0,  298,  684,  298,   84,    0,   84, 1282, 
-            0,    0,   85,    0,  126,  692,  692,    0,    0,    0, 
-          126,    0,    0,    0,    0,  122,  126,    0,    0,  126, 
-           84,  154,  298,    0,    0,  717,  684,  298,    0,  124, 
-          354,    0,    0,  126,    0,   85,    0,  107,    0,    0, 
-          107,  298,  126,    0,  298,    0,  122,  962,    0,  122, 
-            0,  686,    0,   85,    0,    0,  103,  107,  794,  684, 
-          124,    0,    0,  124,    0,  688,  122,    0, 1100, 1100, 
-          125,    0,  984,    0,    0,    0,    0,  109,    0,    0, 
-          124,   84,  309,    0,    0,  310,   84,    0,    0,  346, 
-          346,    0,  130,  793, 1280,    0,  686,    0,    0,    0, 
-            0,  125,    0,    0,  125,    0,  689,  103,  103,  842, 
-          688,  126,    0,  842,  842,  126, 1282,  313, 1282,  126, 
-           85,  125,   85,  107,    0, 1282,    0,    0,  109,  109, 
-            0,  107,  132,  794,    0, 1100, 1100,    0,    0, 1100, 
-            0,  107,  107,    0,   85,    0,    0,    0,    0,    0, 
-            0,  689,  126,    0,  149,    0,    0,    0,    0,  138, 
-          793,  793, 1047,  362,    0,    0,    0,    0, 1051,  126, 
-            0,    0,  126, 1100, 1282,    0, 1282,    0, 1282,   84, 
-         1282,    0, 1060,  313,  793,    0,    0,    0,    0,  151, 
-          793,  126,  903,    0, 1100,  683, 1282,    0,  289,  309, 
-          794,  794,  126,  149,    0,   85,  310,    0,  138,    0, 
-           85, 1280, 1100, 1280,    0,  794, 1100, 1280,  153,  794, 
-         1280,    0,    0,    0,    0,  794,    0,  137,    0, 1100, 
-         1100, 1100, 1100,    0,    0,  793, 1100, 1100,  151, 1100, 
-          683,    0,    0,    0,    0, 1138,    0,    0,    0,  107, 
-            0,    0,   84,    0,    0,   84,    0,    0,    0,  126, 
-         1151,    0,    0,  682,  126,  126,    0,  793,  126, 1280, 
-          794, 1280,   84, 1280,    0, 1280,  137,    0,  268,  103, 
-            0,    0,  684,  684,  122,    0,  354,  354,  268,    0, 
-            0, 1280,    0,    0,    0,    0,    0,    0,  124,  313, 
-          109,    0,  794,   85,    0,    0,    0,    0,  682,  126, 
-            0,    0,  103,    0,    0,  107,    0,    0,    0,  268, 
-            0,    0,  268,  310,   84,  798,    0,    0,   84,   84, 
-          103,    0,  309,  109,    0,    0,  268,  268,   84,  125, 
-          563,  268,  564,  565,  566,  567,   84, 1100,    0, 1224, 
-         1100,  109,  686,  686,    0,  793,   84,   84, 1100,  798, 
-            0,  798,    0, 1109, 1109,    0,  688,  688,    0,    0, 
-            0,  268,    0,    0,  798,    0,   85,    0,    0,   85, 
-            0,    0,  842,  842,    0,    0,  764,    0,  842,  842, 
-            0,  765,    0,    0,    0,  140,   85,  103,  309,  103, 
-            0,    0,    0,  268,    0,    0,  798,  689,  689,    0, 
-            0,  149,    0,  107,    0, 1100,  138,    0,  109,    0, 
-          109,  103,    0,    0,  793,  107,    0,    0,    0,    0, 
-            0,  685,    0,    0, 1168,    0,    0,    0,  798,  798, 
-            0,    0,  109,    0,  140,    0,  151,    0,   85,    0, 
-            0,    0,   85,   85,    0,    0,  310,  154,    0,  794, 
-            0,    0,   85,    0,   84,    0,    0,    0, 1195,    0, 
-           85,  842,    0,    0,    0,    0,  685,  107,    0,    0, 
-           85,   85,  103,  842,  137,  230,  107,  103,    0, 1109, 
-            0,  793,  793,  346,    0,    0,  683,  683,    0,    0, 
-          107,    0,    0,  109,    0,    0,  154, 1237,  109,  107, 
-            0,    0,    0,  230,  309,  230,    0,  230,    0,    0, 
-            0,  687,  310,    0, 1168,    0,  794,  794,    0,    0, 
-           84, 1168, 1168,    0,  230,    0,  230,    0,  346,    0, 
-          268,  268,  268,  153,    0,  268,  268,  268,    0,  268, 
-            0,    0,    0,    0,    0,    0,    0,  268,    0,  268, 
-          268,  268,    0,    0,  682,  682,    0,    0,    0,  268, 
-          268,    0,  268,  268,  268,  268,  268,    0,  107,  354, 
-          103,    0,  107, 1218,    0,    0,  107,  575,   85, 1068, 
-            0,  576,  153,    0,    0,  798,    0,   84,   84,  127, 
-          268,  109,  268,   84,   84,    0,    0,    0,    0,    0, 
-            0,    0,    0,  268,  268,    0,    0,  268,  268,    0, 
-            0,    0,    0,    0,  354,    0,    0,    0,   84,  268, 
-          127,    0,    0,  127,  268,  691,  107,    0,  310,  107, 
-           84,    0,    0,    0,    0,    0,    0,  789,  268,    0, 
-          127,  268,  140,  103,   85,    0,  103,  789,  107,    0, 
-          793,    0,  798,  798,  131,    0,  798,    0,    0,  107, 
-            0,    0,    0,  103,  109,    0,    0,  109,    0,    0, 
-          691,    0,    0,    0,    0,    0,   84,    0,  789,    0, 
-            0,  789,   84,    0,  109,    0,    0,    0,   84,    0, 
-            0,   84,  403,  398,    0,    0,  789,  401,  399,    0, 
-          400,  798,  402,    0,  154,   84,    0,    0,  471,    0, 
-            0,   85,   85,    0,   84,  103,    0,   85,   85,  103, 
-          103,    0,  685,  685,    0,  107,    0,    0,    0,  103, 
-          789,    0,    0,  798,    0,    0,  843,  103,    0,    0, 
-          843,  843,   85,    0,    0,    0,    0,  103,  103,  397, 
-          109,    0,    0,    0,   85,    0,    0,  471,  109,    0, 
-            0,    0,  789,    0,    0,  126,  107,    0,  109,  109, 
-            0,  230,    0,  230,  230,  230,  230,  230,    0,  396, 
-            0,    0,    0,   84,  346,  346,    0,   84,  309,    0, 
-          153,   84,    0,  230,    0,    0,  126,    0,    0,  126, 
-           85,  690,    0,  128,    0,    0,   85,  230,    0,    0, 
-            0,    0,   85,  687,    0,   85,  126,  230,    0,    0, 
-            0,    0,  230,  230,  230,    0,    0,    0,    0,   85, 
-            0,    0,    0,  808,  128,    0,    0,  128,   85,  692, 
-            0,   84,    0,    0,   84,  563,  690,  564,  565,  566, 
-          567,  568,    0,    0,  128,  103,    0,    0,  127,    0, 
-            0,    0,    0,   84,    0,    0,    0,  569,    0,    0, 
-          354,  354,    0,    0,   84,    0,  109,    0,    0,  793, 
-            0,  570,    0,  130,  692,  793,    0,    0,    0,  150, 
-          798,  571,    0,    0,    0,    0,  572,  573,  574,  789, 
-          789,  789,    0,    0,  789,  789,  789,   85,  789,    0, 
-            0,   85,  310,    0,    0,   85,  789,  808,  789,  789, 
-          223,  103,    0,  309,    0,    0,  691,  691,  789,  789, 
-          793,  789,  789,  789,  789,  789,    0,    0,    0,    0, 
-           84,    0,  109,    0,  233,  233,    0,    0,  223,    0, 
-          223,    0,  223,    0,    0,    0,  686,  798,  798,  789, 
-            0,  789,  793,    0,    0,   85,    0,    0,   85,  223, 
-            0,  223,  309,    0,    0,    0,    0,  266,  271,  272, 
-          273,   84,    0,  377,  233,  233,    0,   85,  103,  103, 
-            0,    0,    0,  789,  103,  103,  331,  333,   85,    0, 
-          390,  391, 1101, 1101,    0,    0,    0,  789,    0,  843, 
-          843,    0,    0,    0,    0,  843,  843,    0,    0,  103, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  103,    0,    0,  126,    0,    0,    0,    0,    0, 
-          109,    0,    0,    0,    0,    0,  233,  310,    0,    0, 
-            0,    0,  109,    0,  808,  808,  808,    0,    0,    0, 
-          808,  808,    0,  808,   85,    0,    0,    0,    0, 1101, 
-         1101,  808,  128, 1101,    0,    0,    0,  103,    0,    0, 
-            0,    0,    0,  103,    0,    0,    0,    0,    0,  103, 
-          334,    0,  103,    0,    0,    0,  310,    0,  843,    0, 
-          334,    0,  690,  690,  109,   85,  103, 1101,    0,    0, 
-          843,    0,    0,  109,  808,  103,  808,    0,  149,  793, 
-            0,    0,    0,    0,    0,    0,    0,  109, 1101,    0, 
-            0,  334,    0,    0,  328,    0,  109,    0,    0,    0, 
-          692,  692,    0,    0,    0,    0, 1101,  119,    0,  334, 
-         1101,    0,  233,    0,    0,  233,  233,  233,    0,  331, 
-            0,    0,  808, 1101, 1101, 1101, 1101,    0,    0,    0, 
-         1101, 1101,    0, 1101,    0,    0,  233,    0,  119,  233, 
-            0,  119,    0,  683,  103,    0,  793,  793,  103,    0, 
-            0,    0,  103,  575,    0,    0,    0,  576,  119,    0, 
-            0,    0,    0,    0,  233,  109,    0,    0,    0,  109, 
-         1219,    0,    0,  109,    0,  334,  223,    0,  223,  223, 
-          223,  223,  223,    0,    0,    0,    0,    0,  683,    0, 
-            0,    0,  233,    0,  233,    0,  233,    0,  223,    0, 
-          688,    0,  103,    0,    0,  103,    0,    0,    0,    0, 
-            0,    0,  223,  233,    0,  233,    0,    0,  686,    0, 
-            0,    0,  223,  109,  103,    0,  109,  223,  223,  223, 
-            0,    0,    0,    0,    0,  103,    0,    0,    0,    0, 
-            0, 1101,    0,    0, 1101,  109,    0,    0,    0,    0, 
-            0,    0, 1101,    0,    0,    0,  109,    0,    0,    0, 
-            0,  331,    0,    0,    0,    0,  623,  624,  625,  626, 
-          627,  331,    0,  628,  629,  630,  631,  632,  633,  634, 
-          635,    0,  637,    0,    0,  638,  639,  640,  641,  642, 
-          643,  644,  645,  646,    0,    0,    0,    0,    0,    0, 
-          118,  103,  331,  233,    0,  331,  668,  121,    0, 1101, 
-            0,    0,  334,  334,  334,    0,    0,  334,  334,  334, 
-          331,  334,  109,    0,    0,   74,    0,    0,    0,  334, 
-            0,  118,    0,    0,  118,   74,  682,    0,  121,    0, 
-            0,  121,  103,  685,  334,  334,  334,  334,  334,    0, 
-            0,  118,    0,    0,  331,    0,    0,    0,  121,    0, 
-            0,    0,    0,  109,  233,    0,   74,    0,    0,    0, 
-            0,    0,  334,    0,  334,  233,  119,  233,    0,  233, 
-            0,  682,    0,  233,   74,    0,  331,  273,  685,    0, 
-            0,    0,    0,    0,  496,    0,    0,    0,    0,    0, 
-            0,  334,    0,    0,  496,  733,    0,  735,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  233,    0, 
-          334,  563,  233,  564,  565,  566,  567,  568,    0,    0, 
-            0,  496,  496,  233,    0,  496,  496,  496,  496,  496, 
-          496,  496,    0,  569,  683,  683,    0,    0,    0,    0, 
-           74,    0,  496,  496,  496,  148,  496,  496,    0,    0, 
-          233,    0,  233,  233,  233,  233,  233,  571,    0,    0, 
-            0,    0,  572,  573,  574,    0,    0,    0,    0,  233, 
-          794,    0,  233,    0,  132,  496,  794,  496,  496,  793, 
-            0,    0,  793,    0,    0,    0,  233,    0,  233,    0, 
-            0,    0,  688,    0,    0,    0,  233,    0,    0,    0, 
-            0,  233,  233,  233,    0,    0,    0,  496,  496,  496, 
-            0,    0,    0,  331,  331,  331,    0,    0,  331,  331, 
-          331,  794,  331,    0,    0,    0,    0,    0,    0,    0, 
-          331,    0,  331,  331,    0,    0,    0,    0,    0,    0, 
-            0,    0,  331,  331,    0,  331,  331,  331,  331,  331, 
-          836,    0,    0,  794,  836,  849,  233,    0,    0,  118, 
-            0,    0,    0,    0,  303,    0,  121,    0,    0,    0, 
-            0,    0,    0,  331,  303,  331,    0,   74,   74,   74, 
-          233,    0,   74,   74,   74,    0,   74,  233,  793,  793, 
-            0,    0,    0,    0,   74,    0,   74,    0,    0,    0, 
-          836,    0,  836,  836,  233,  303,  233,  331,  303,   74, 
-           74,   74,   74,   74,    0,    0,    0,    0,  836,    0, 
-            0,  331,  303,  303,    0,    0,    0,  682,  682,    0, 
-            0,    0, 1102, 1102,  685,  685,    0,   74,    0,   74, 
-            0,    0,    0,    0,    0,    0,  496,  496,  496,    0, 
-            0,  496,  496,  496,    0,  496,    0,  303,    0,    0, 
-          233,    0,    0,  496,  496,  496,  496,  496,    0,    0, 
-            0,    0,    0,    0,    0,  496,  496,    0,  496,  496, 
-          496,  496,  496,    0,    0,   74,    0,    0,    0,  303, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0, 1102, 
-         1102,    0,    0, 1102,    0,  233,  496,    0,  496,  151, 
-          794,  135,  496,  496,  496,  496,  496,  496,  496,  496, 
-          496,  496,  496,  496,  496,    0,    0,  233,  681,  496, 
-          496,  496,  496,    0,    0,  496,    0, 1102,  681,    0, 
-          496,    0,  135,    0,    0,  135,    0,  346,    0,    0, 
-            0,    0,  233,    0,  496,    0,    0,  496, 1102,    0, 
-            0,  793,  135,    0,    0,  681,  681,    0,  793,  681, 
-          681,  681,  681,  681,  681,  681, 1102,  794,  794,    0, 
-         1102,    0,    0,    0,    0,    0,  681,  681,  681,  136, 
-          681,  681,  346, 1102, 1102, 1102, 1102,    0,    0,    0, 
-         1102, 1102,    0, 1102,    0,    0,    0,    0,    0,    0, 
-            0,  793,    0,    0,    0,    0,    0,    0,    0,  681, 
-         1025,  681,  681,  836,  836,    0,  303,  303,  303,  836, 
-          836,  303,  303,  303,    0,  303,  233,    0,    0,    0, 
-            0,    0,  233,  303,    0,  303,  303,  303,  233,    0, 
-            0,  793,  681,  681,  793,  303,  303,    0,  303,  303, 
-          303,  303,  233,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  793,  836,  836,    0,  836,  836,  233,    0, 
-            0,    0,    0,    0,    0,    0,  303,    0,  303,    0, 
-            0,    0,  134,    0,    0,    0,  403,  398,    0, 1078, 
-         1079,  401,  399,    0,  400,    0,  402,    0,    0,    0, 
-            0, 1102,  836,    0, 1102,  303,    0, 1135,    0,  395, 
-          303,  394, 1102,  134,  836,  233,  134,  575,  354,    0, 
-            0,  576,    0,    0,  303,    0,    0,  303,    0,    0, 
-          233,    0,    0,  134,    0,    0,  836,    0,    0,    0, 
-            0,    0,    0,  397,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  354,    0,    0,    0,    0,    0, 1102, 
-          135,    0,    0,  396,    0,  793,  793,  793,    0,  793, 
-          681,  681,  681,  793,  793,  681,  681,  681,  793,  681, 
-          793,  793,  793,  793,  793,  793,  793,  681,  793,  681, 
-          681,  681,  793,  793,  793,  793,  793,  793,  793,  681, 
-          681,  793,  681,  681,  681,  681,  681,  575,  793,  233, 
-            0,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  346,  346, 
-          681,  793,  681,    0,  793,  793,  681,  681,  681,  681, 
-          681,  681,  681,  681,  681,  681,  681,  681,  681,  793, 
-          793,    0,    0,  681,  681,  681,  681,  793,  693,  681, 
-          793,  793,  793,  793,  681,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  684,  793,  793,  681,    0, 
-            0,  681,    0,    0,    0,  684,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  794,    0, 
-            0,    0,  684,  684,    0,  794,  684,  684,  684,  684, 
-          684,  684,  684,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  684,  684,  684,  139,  684,  684,    0, 
-            0,  134,    0,    0,    0,    0,    0,  233,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  684,  377,  684,  684, 
-            0,    0,  382,  383,    0,  563,    0,  564,  565,  566, 
-          567,  568,    0, 1317,  390,  391,    0,    0, 1324,    0, 
-            0,    0,  798,    0,    0,    0,    0,  569,  794,  684, 
-          684,  794,  798,    0,    0,    0,    0,    0,    0,  354, 
-          354,  570,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  571,    0,    0,    0,  793,  572,  573,  574,  798, 
-          798,    0,  793,  798,  798,  798,  798,  798,  798,  798, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          798,  798,  798,  150,  798,  798,    0,    0,    0,    0, 
-            0,    0,    0,    0, 1373, 1375, 1377, 1379,    0,    0, 
-            0, 1381,    0,    0,    0,  563,    0,  564,  565,  566, 
-          567,  568,    0,  798,    0,  798,  798,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  569, 1392, 1393, 
-         1395, 1396,    0,    0,    0,    0,    0, 1398,    0,    0, 
-            0,  570,    0,    0,    0,  798,  798,  798,  793,    0, 
-            0,  571,    0,    0,    0,    0,    0,  573,  574,    0, 
-            0,    0,  794,  794,  794,    0,  794,  684,  684,  684, 
-          794,  794,  684,  684,  684,  794,  684,  794,  794,  794, 
-          794,  794,  794,  794,  684,  794,  684,  684,  684,  794, 
-          794,  794,  794,  794,  794,  794,  684,  684,  794,  684, 
-          684,  684,  684,  684,  575,  794,    0,    0,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,    0,    0,  684,  794,  684, 
-            0,  794,  794,  684,  684,  684,  684,  684,  684,  684, 
-          684,  684,  684,  684,  684,  684,  794,  794,    0,    0, 
-          684,  684,  684,  684,  794,  696,  684,  794,  794,  794, 
-          794,  684,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,    0,  794,  794,  684,    0,    0,  684,  793, 
-          793,  793,    0,  793,  798,  798,  798,  793,  793,  798, 
-          798,  798,  793,  798,  793,  793,  793,  793,  793,  793, 
-          793,  798,  798,  798,  798,  798,  793,  793,  793,  793, 
-          793,  793,  793,  798,  798,  793,  798,  798,  798,  798, 
-          798,    0,  793,    0,    0,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,    0,    0,  798,  793,  798,    0,  793,  793, 
+          110,  325,  323,  697,  208,  209,  930,  412,  938,  370, 
+          204,  347,  201,  595,  279,  286,  237,  237,  595,  791, 
+          665,  456,  459,  432,  255,  418,  605,  330,  331,  332, 
+          204,  425,  201,   92,   99,  234,  234,  248,  313,  727, 
+          370,  581,  437,  701,  437,  437,  581,  236,  236,  421, 
+         1000,  283,  283,  290,  294,  660,  287,  939,  660,  506, 
+          918,  497,  204,  455,  661,  777,  660,  670,  538,  313, 
+          239,  246,  540,  579,  478,  678,  284,  334,  723,  825, 
+          727,  825,  341,  341,  796,   99,   99,  803,  693,  314, 
+          316,  457,  782,  313,  719,  758,  786,  995,  825,  236, 
+         1198,  262,  242,  242,  313,  313,  804, 1021,  781,  724, 
+          252,  559,  561,  724, 1204,  252,  476,  420,  237,  723, 
+          361, 1358, 1244,  204,  934,  741,  247,  805,  825,  660, 
+          825,  660,  620,  821,  825,  328,  369,  234,  661,  781, 
+          670,  866,  289,  293,  314,  953, 1019,  825,  825,  236, 
+          527,  236,  755,  236,  236,  472,  472,  781,  252,  253, 
+          367,  256,  491,  660,  660, 1203,  330,  811,  411,  276, 
+          485,  825,  434,  745,  508,  417,  511, 1256,  579,  825, 
+          825,  620,  842,  825,  813,  825,  279,  660,  891,  660, 
+         1264,  417, 1358,  750,  328,  524,  812,  825,  745,  370, 
+          405,  470,  417,  830,  242,  403,  401, 1144,  402,  366, 
+          404,  397, 1245,  396,  804,  741,  932,  815,  935,  257, 
+          825,  544,  781,  283,  750, 1128, 1128,  750,  869,  341, 
+          341,  830,  247,  417,  897,  898,  416,  111,  825,  279, 
+          549,  804,  750, 1291,  442,  505,  609,  490,  501,  813, 
+          529,  237,  660,  930,  660,  699,  110,   99,  825,  700, 
+         1367,  777,  925,  745,  341,  341, 1171,  234,  111,  437, 
+          234,  618,  619,  620,  621,  727,  283,  889,  490,  236, 
+          367,  248,  236,  236,  470,  236,  420,  614,  111,   92, 
+           99,  313,  811,  405,  437,  437,  437,  437,  403,  624, 
+          625,  284,  682,  404,  357,  507,  608, 1019,  610,  890, 
+           99, 1143, 1143,  765,  367,  411,  723, 1072, 1247, 1365, 
+         1333,  812, 1367,  497,  367,  410,  530,   14,   14,  366, 
+          826,  825, 1237, 1239,  798,   60,  825,  242,  357,  959, 
+          357,  825,  314,  283,  660,  283,  660,  724,  763,  724, 
+          763, 1128,  825,  357,  407,  745,  825,  825, 1075, 1030, 
+          766,  826,  542,  366, 1248,  934,  405, 1003,  337,  698, 
+          993,  403,  401,  366,  402,  370,  404,   99,  236,   99, 
+          825,  781,  417,  848, 1240,  357,   14,  855,  825,  620, 
+          692,  279,  437,  825,  578,  825,  376,  377,  806,  901, 
+           92,   99,  825,  236,  236,  236,  236, 1197,  236,  236, 
+          825, 1196,  313,  826,  505,  979,  777,  777,  357,  723, 
+          825,  671, 1202,  552,  825,  825,  695,  548,  283,  671, 
+          829,  809,  541,  283,  669,  913,  234, 1143, 1023, 1025, 
+         1027,  825, 1029, 1067, 1032,  699,  825, 1031,  236, 1179, 
+          724, 1197,  572,  284,  909,  595,  807,  595,  900, 1089, 
+          825,  544,   99,  314,  684, 1033,  750,   99,  573,  343, 
+          417,  781,  410,  620,  554,  555,  414,  424,  237, 1143, 
+         1143, 1143, 1078,  825,  384,  385,  769,  820,  505,  534, 
+          103,  379,  414,  415,  671,  950,  825,  234,  577,  578, 
+          417,  236, 1361,  414,  489, 1363,  111,  669,  423,  236, 
+          234,  521,  736,  417, 1032,  613,  826,  777,  204,  820, 
+          201,  103,  236,  533,  802, 1275, 1278,  671,  811,  427, 
+          911,  313,  709,  770,  414,  523,  726,  825,  767,  818, 
+          669,  103,  906, 1076,  904,  705,  505, 1398,  777,  919, 
+          428,  777,  671,  919,  825,  727,  750,  930,  971, 1374, 
+          521,  825,   99,  723,  242,  669,  777,  726,  234,  767, 
+         1004,  688,  767,  314,  783, 1056,  777,  777,  291,  725, 
+          236,  688,  314,  449,  379,  726,  825,  767,  825,  114, 
+          429, 1143,  825,  648,  544, 1172, 1174, 1175, 1176,  826, 
+          825,  283,  417,  741,  283,  783,  100,  477,  939,  832, 
+          660,  505,  660,  930,  875, 1162,  343,  671,  840,  661, 
+          751,  670,  109,  783,  801,  813,  854,  801,  439,  724, 
+          669,  777,  449,  234,  741,   99,  236, 1362,   99,  236, 
+          648,  357,  357,  417, 1183,  236,  534, 1302, 1292,  825, 
+          873,  343,  767,  109,  819,   99,  314,  379,  883,  439, 
+          907,  813,  439,  912,  313, 1042, 1044,  433,  841,  892, 
+          316, 1048, 1050,  109,  392,  393,  841,  831,  479, 1180, 
+          537,  860,  860,  414,  547,  845,  838,  283,  705,  845, 
+          845,  845,  595, 1297,  838,  283,  343,  449,  595,  742, 
+         1083,  316,  251,  505, 1234,  283,  283,  847,  894,  671, 
+         1335,  847,  847,  236,  204,  314,  201, 1344,  252,  481, 
+          581,   99,  669,  236,  904,  234,  488,  920,  921,   99, 
+          742,  922,  923,  313,  801,  801, 1151,  236,  492,   99, 
+           99, 1273, 1276,  841,  813,  480,  236,  236,  482,  483, 
+          484,  144, 1381,  316,  495, 1147,  845, 1313,  595,  103, 
+          831,  838,  974, 1113, 1113, 1369, 1168, 1371,  521,  236, 
+          496,  414,  612,  972,  822, 1268,  756,  825,  847,  951, 
+         1306,  544,  107,  498,  314, 1002,  581,  691, 1188,  850, 
+          777,  825, 1359,  850,  850, 1394,  825,  650,  835,  741, 
+          144,  414,  704, 1001,  125,  102,  825,  756,  437,  726, 
+          756,  767,  515,  107,  414,  970,  283,  905,  649,  455, 
+         1255,  811,  651,  552,  100,  756,  825, 1404,  515,  811, 
+         1113, 1113,  691,  107, 1113,  125,  102,  812,  125,  114, 
+          691,  499,  119, 1283,  650,  812,  825,  783,  741,  825, 
+           99,  313,  835,  516,  825,  125,  100,  528,  515,  825, 
+          850,  825,  515, 1252, 1253,  649, 1140, 1140, 1113,  651, 
+          982,  988,  797,  119,  554,  555,  119, 1260,  685,  204, 
+          777,  988,  794, 1269,  283,  691,  985, 1295,  835, 1113, 
+         1071,  109,  825,  119,  525,  825,  877,  783,  101,  726, 
+          795,  767,  314,  414, 1301, 1016, 1348, 1113,  826,  104, 
+          798, 1113,  825,  437,  135,  520,  357,  236,   99,  379, 
+          905, 1079,  536,  685, 1113, 1113, 1113, 1113,  112,  101, 
+          945, 1113, 1113,  314, 1113,  105,  758,  783,  543,  826, 
+          104,  660,  252,  660,  414, 1377,  783,  110,  835,   99, 
+         1070, 1283,  745,  825, 1283,  797, 1323, 1324, 1325,  112, 
+          104,  357, 1364,  825,  314,  801,  105,  845,  845,  505, 
+          758,  825,  251,  845,  845,  671,  433,  236,  110,  112, 
+          539, 1068,  315,  794,  860,  758,  105,  283,  669,  847, 
+          847,  234, 1140,  376,  377,  847,  847,  813,  110,  283, 
+          562, 1210,  825,  236, 1295,  604, 1295,  433,  144,  550, 
+          716,  783,  825,  315,  722,  813,  101,  660,  291, 1364, 
+          825,   99,  236,  835,  985,  108,  880,  611, 1379,  101, 
+          101, 1145, 1146,   99, 1140, 1140, 1140, 1166,    7,  106, 
+          933, 1015, 1113,  607,  940, 1113, 1170,  937,    7,  756, 
+          758,  107, 1193, 1113,  937,  722,  108,  845,  750,  291, 
+          984,  985, 1157,  261, 1161,  315, 1295,  101,  101,  845, 
+          106,  850,  850,  125,  283,  741,  108,  850,  850,  847, 
+          615,  101,  436,  283, 1150,   99, 1200, 1201,  691,  691, 
+          106,  847,  750, 1153,   99, 1261,  122,    7,  825,  825, 
+          825,  150, 1038, 1177, 1178,  825,  741,  750,   99,  442, 
+         1113,  119,  797,  436,  434, 1216,  787,   99,  437, 1217, 
+          757,  960,  344, 1235,  741,  673,  798,  122,  531,  965, 
+          122,  101,  688,  101,  769,  101,  101,  500,  685,  756, 
+          313,  691,  691, 1214, 1214,  434, 1140,  122,  616,  154, 
+          150,  824,  283,  826,  757,  702,  283, 1303,  825,  712, 
+          283,  850,  437,    7,  988,  125,  708,  691,  769,  757, 
+          450,  117,  750,  850,  552,  560, 1298,  688,  104,  685, 
+          685,  730,  500,  769,  117,  117,   99, 1307, 1308,  835, 
+           99, 1231,  714,  437,   99, 1304,  955,  112,  956, 1266, 
+         1267,  715,  859,  865,  105,  732, 1312, 1353, 1354,  798, 
+          283,  735,  691,  283,  500,  739,  110,  357,  357,  450, 
+         1326, 1163,  117,  117,  741,  554,  555,  236, 1123, 1123, 
+          437,  437,  283,  988,  757,  896,  117, 1040, 1041,  101, 
+          435,  835, 1191,  283,   99,  405,  400,   99,  769,   20, 
+          403,  401,  722,  402,  291,  404, 1181,  742, 1190,  546, 
+          546,  101,  750,  512,  101,  101,   99,  101,  486,  487, 
+          752,  435,  101,  513,  514,  313,  143,   99,  779,  781, 
+           20, 1088,  783, 1090,  450,  785,  117, 1091,  117,  517, 
+          117,  117,  101,  154,  108, 1103,  124, 1157,   20, 1182, 
+          505, 1243,  982,  521,  522,  790,  671, 1263,  106,  283, 
+          942,  573,  690, 1380, 1274, 1277,  835,  835,  792,  669, 
+          710,  828,  234,  798,  313,  143, 1342,  124,  793,  357, 
+          124,  833,  690, 1209,  236,  825,  835,  836,  837,  236, 
+          236,  577,  154,   99, 1243, 1279,  731,  124,  870,  733, 
+          283,  734, 1270, 1272, 1123,  722,  552,  690,  150,  101, 
+          101,  101,  877,  874,   20,  122,  798,  899,  880,  138, 
+          748,  500, 1251,  902,  357, 1378,  903,  690,  988,  976, 
+          900,  943,  926,  101,   99,  101,  101,  101,  101, 1182, 
+          101,  101,  927,  954,  117,  812, 1182, 1182,  946,  797, 
+          144,  947,  849,  553,  998,  685,  856,  554,  555,  835, 
+          835,  835,  961,  966,  718,  962,  117,  967,  138,  117, 
+          117, 1243,  117,  973,  969,  778, 1194,  117,  318,  319, 
+          101,  320, 1250,  688,  688,  977,  823,  978,  500,  500, 
+          827,  145,  718,  980,  101,  552,  718,  117,  985,  101, 
+          685, 1006, 1009,  849, 1012,  856,  675, 1022, 1024, 1026, 
+          679,  680,  681,  718, 1028,  825, 1046, 1086,  691,  691, 
+         1287,  871, 1195,  910,  795, 1293, 1087,  692, 1155, 1159, 
+         1173,  835,  797,  101,  371,  372,  373,  374,  375, 1382, 
+          145,  101,  557, 1192, 1199, 1191,  554,  555, 1207, 1061, 
+         1208,   20,   20,   20,  101, 1065, 1211,   20,   20,  124, 
+           20,  690, 1257, 1197,  117,  117,  117, 1259,   20, 1074, 
+         1101, 1300,  692, 1309, 1315,  868,  552, 1316,  726, 1310, 
+          685,  728,  729,  143,  291, 1319,  379, 1327,  117,  252, 
+          117,  117,  117,  117,  101,  117,  117, 1328, 1330,  517, 
+          154, 1334,  893,  392,  393,  131,  690, 1336,  746, 1337, 
+          797,   20,  101,   20,  685,  124,  685,  579,  126, 1360, 
+          692,  580, 1372,  557,  126, 1376, 1384,  554,  555,  685, 
+          713,  944, 1152, 1386, 1388,  117,  131, 1368,  948,  131, 
+         1390,  500, 1293, 1392, 1293, 1408, 1375, 1165,  937,  117, 
+          811, 1293,  825,  813,  117,  126,  131,  818,  126,   20, 
+          692,  685,  818,  690,  690,  692,  813,  101,  101,  928, 
+          101,  101,  910,  820,  813,  126,  138,  101,  552,  376, 
+          357,  357,  335,  690,  690,  813,  500,  101,  117,  797, 
+          768,  813,  336,  797,  685,  552,  117, 1402,  519, 1403, 
+         1293, 1405, 1293,  992, 1293,  692, 1293,  552,  475,  117, 
+          617,  747,  749,  994, 1305,  864,  996, 1411,  500, 1351, 
+         1345,  853, 1293, 1284,  126,  557, 1005,  454, 1370,  554, 
+          555,  931, 1260, 1020, 1043, 1045, 1238,  126,  126,  101, 
+         1049, 1051,  558,  101,  101,  101,  554,  555,  145,  117, 
+          924,  552,  936,  101,  762,  101,  685,  685,  554,  555, 
+          718,  101,  718,  718,  718,  718,  718,  117,  991,  101, 
+          872,  101,  101, 1215, 1373,  126,  126, 1401,  101,  101, 
+          655,  975,  718,  365, 1043, 1045, 1036, 1049, 1051,  126, 
+         1399,  146, 1265, 1262,  143,  895,  718, 1280,  767, 1013, 
+         1014,  101,  554,  555,  419, 1281,  718, 1063, 1385,  652, 
+          101,  718,  718,  718, 1034, 1035,  737, 1018, 1343,  639, 
+            0, 1069,  117,  117, 1148,  117,  117,  693,  692,  692, 
+         1073,    0,  117,    0,    0, 1077, 1052, 1053, 1080,  126, 
+          146,  126,  117,  126,  126,  644, 1062,    0,    0,    0, 
+          797,    0,    0,  145,    0,  127,  652,  693, 1148,    0, 
+          652,  652,  690,  690,    0,  141,  639,    0,    0,    0, 
+          639,  639,  693,    0,  131,  500,    0,    0,    0,  148, 
+            0,    0,  101,    0,    0,  567,    0,  568,  569,  570, 
+          571,  572,  644,  126,  117,  798,  644,  644,  117,  117, 
+          117,  688,  693,    0,    0,    0,  640,  573,  117,    0, 
+          117,  957,  958, 1167,  141,  695,  117,  685,  685,  963, 
+          964,  692,  692,    0,  117,    0,  117,  117,  148,    0, 
+          147,  575,    0,  117,  117,    0,  576,  577,  578,    0, 
+          645,    0,  500,  500,    0,    0,  688,  126,  149,  101, 
+          101,    0,    0,  640,    0,    0,  117,  640,  640,  133, 
+          695,  692,  692,    0,    0,  117,  694,    0,  132,  126, 
+            0,    0,  126,  126,    0,  126,    0,    0,  798,  147, 
+          126,    0, 1007, 1008,  696, 1010, 1011,  645,    0,  797, 
+          133,  645,  645,  133,    0,  802,    0,  149,  797,  132, 
+          126,    0,  132,    0,  797,    0,  140,    0,    0,  101, 
+          133,  694,    0,  318,  319,  232,  320,    0,    0,  132, 
+            0,  101,  101,   45,   46,    0,    0,  101,  101,  696, 
+           40,   41,   42,   43,    0,  101,    0,  117,    0,    0, 
+          802,    0,  687,  232, 1047,  232,    0,  232,  146,  797, 
+            0,  691,  134,  101,  101,  140, 1059,  567,    0,  568, 
+          569,  570,  571,    0,  232,  101,  232,  126,  126,  126, 
+            0,    0,  802,    0,  567,    0,  568,  569,  570,  571, 
+            0,  797,  798,  134,    0,    0,  134,  687,  798,    0, 
+          146,  126, 1081,  126,  126,  126,  126, 1271,  126,  126, 
+            0,    0,    0,  134,  117,  117,    0,    0,    0,    0, 
+            0,  101,  152,    0,    0,    0,    0,  101,    0,  127, 
+          771,    0,  141,  101,    0,  772,  101,    0,  693,  693, 
+            0,    0,    0,  798,    0,  798,  148,    0,  126,    0, 
+          101,    0,  797,  718, 1314,    0,    0,    0,  802,  101, 
+          127,    0,  126,  127, 1318,  693,    0,  126,  693,  693, 
+            0,  152,    0,    0,  117,  798, 1320, 1321, 1322,    0, 
+          127,  718,   84, 1296,    0,  718,  117,  117,    0,    0, 
+            0,    0,  117,  117,    0,  231,  231,  147,    0,    0, 
+          117,  126,  718,  802, 1383,    0,    0,    0,    0,  126, 
+          693,    0,  688,  688,  225,  149,    0,    0,  117,  117, 
+          129,    0,  126,    0,    0,    0,  695,  695,  101,    0, 
+          117,    0,  101,   84,   84,  802,  101,  311,  133,  802, 
+            0,    0,  225,    0,  225,    0,  225,  132,  797,  139, 
+          690,  129,    0,    0,  129, 1355,  695,  568,  569,  570, 
+          571,    0,  126,  225,    0,  225,    0,    0,  311,  101, 
+            0,  129,    0,  140,    0,    0,  117,  694,  694,    0, 
+          126,    0,  117, 1258,    0,  686,  101,    0,  117,  101, 
+            0,  117,  311,    0,    0,  696,  696,  231,  139,    0, 
+         1296,  695, 1296,  311,  311,  117,  802,  802,  101, 1296, 
+            0,    0,  142,    0,  117,  797,  797,    0,    0,  101, 
+            0,  232,    0,  232,  232,  232,  232,  232,    0,    0, 
+          686,  134,  798,    0,    0,  126,  126,   42,  126,  126, 
+            0,    0,    0,  232,    0,  126,    0,   42,  689,    0, 
+            0,    0,    0,  687,  687,  126,    0,  232, 1296,    0, 
+         1296,  142, 1296,  691, 1296,    0,    0,  232,    0,    0, 
+            0,    0,  232,  232,  232,    0,  101,    0,   42,  152, 
+         1296,  101,  101,  117,  283,  101,    0,  117,    0,    0, 
+            0,  117,  802,  689,  283,    0,   42,    0,  127,  798, 
+          798,    0,    0,    0,    0,   84,    0,  126,    0,    0, 
+            0,  126,  126,  126,    0,  567,    0,  568,  569,  570, 
+          571,  126,    0,  126,  117,  283,  101,  231,  283,  126, 
+          231,    0,    0,    0,    0,    0,    0,  126,   84,  126, 
+          126,  117,  283,  283,  117,    0,  126,  126,    0,  718, 
+            0,  718,  718,  718,  718,  718,    0,    0,   84,  802, 
+          802,  771,   42,  117,    0,    0,  693,  693,   85,  126, 
+            0,  718,  156,    0,  117,    0,    0,  283,  126,    0, 
+            0,  232,  232,    0,    0,  718,    0,    0,    0,  129, 
+          311,    0,  797,    0,    0,  718,  119,    0,  685,  688, 
+          718,  718,  718,    0,    0,    0,  139,    0,  350,  283, 
+          225,  802,  225,  225,  225,  225,  225,    0,    0,   85, 
+           85,  156,    0,  312,  129,   84,  695,   84,    0,  798, 
+            0,  117,  225,  688,    0,  688,  117,  117,    0,    0, 
+          117,  797,    0,  685,    0,  802,  225,  802,  688,   84, 
+          126,    0,  690,  350,  312,  151,  225,  695,  695,    0, 
+          802,  225,  225,  225,    0,    0,    0,    0,    0,  142, 
+            0,  695,    0,  153,    0,  797,    0,    0,  312,    0, 
+          688,  117,    0,  232,    0,  797,  686,  686,    0,  312, 
+          312,  797,  802,    0,  579,    0,  231,    0,  580,   42, 
+           42,   42,    0,  798,  151,   42,   42,    0,   42,  798, 
+           84,  311,  798,  688,    0,   84,   42,  126,  126,    0, 
+            0,    0,  153,    0,  802,  802,  128,    0,  694,    0, 
+            0,   42,   42,   42,   42,   42,  797,    0,  155,    0, 
+            0,    0,    0,    0,    0,    0,  283,  283,  283,  689, 
+          689,  283,  283,  283,  798,  283,    0,  231,    0,   42, 
+            0,   42,    0,  283,    0,  283,  283,  283,  797,    0, 
+          231,    0,    0,  694,  358,  283,  283,  126,  283,  283, 
+          283,  283,  283,    0,    0,    0,  798,  155,    0,  126, 
+          126,   85,    0,    0,    0,  126,  126,    0,    0,    0, 
+            0,    0,    0,  126,    0,    0,  283,   42,  283,    0, 
+           84,    0,    0,  232,    0,    0,  232,    0,    0,  358, 
+            0,  126,  126,    0,   85,    0,    0,    0,  231,  156, 
+          311,  138,  797,  126,    0,  283,    0,  135,    0,  798, 
+          283,    0,    0,  122,   85,  688,  797,    0,    0,    0, 
+          133,    0,  802,  128,  283,    0,    0,  283,    0,  148, 
+            0,    0,    0,    0,   70,    0,    0,  798,  135,  798, 
+            0,  135,    0,  357,   70,    0,  312,    0,    0,  126, 
+            0,  802,    0,   84,  128,  126,   84,  128,  135,  694, 
+          688,  126,    0,  231,  126,    0,    0,  802,    0,  685, 
+          685,    0,    0,   84,  128,   70,    0,    0,  126,  350, 
+          350,   85,  151,   85,    0,    0,    0,  126,  357,    0, 
+            0,    0,  798,   70,    0,  797,    0,  695,  695,  802, 
+          153,    0,  300,    0,  694,   85,  688,  688,    0,    0, 
+            0,    0,  300,  798,    0,    0,    0,    0,  802,  802, 
+            0,    0,    0,    0,    0,   84,    0,    0,    0,   84, 
+           84,  147,  567,  311,  568,  569,  570,  571,  572,   84, 
+            0,  130,    0,  300,    0,    0,  300,   84,    0,    0, 
+            0,    0,  232,  107,  573,  231,  126,   84,   84,   70, 
+          126,  300,  797,  797,  126,  155,   85,  312,  574,    0, 
+            0,   85,  130,    0,    0,  130,    0,  696,  575,    0, 
+          798,  798,    0,  576,  577,  578,    0,    0,    0,    0, 
+            0,    0,  130,    0,    0,  300,   84,  126,    0,  694, 
+          694,  121,  311,    0,  107,  107,  797,  130,  315,  696, 
+          132,    0,  797,  232,  126,    0,    0,  126,    0,    0, 
+            0,  337,  696,    0,    0,    0,  232,  300,    0,    0, 
+            0,  337,  121,    0,    0,  121,  126,  687,    0,  362, 
+            0,    0,    0,    0,    0,  358,  358,  126,  141,  798, 
+            0,    0,  121,    0,  696,  152,  802,  797,    0,  131, 
+            0,  500,  337,  315,    0,  330,   85,    0,   84,    0, 
+            0,    0,    0,    0,  473,  473,  135,    0,  305,    0, 
+          337,    0,  687,    0,  232,    0,  312,    0,  305,  797, 
+            0,    0,  128,  121,    0,  687,   70,   70,   70,    0, 
+          109,   70,   70,   70,  126,   70,  500,    0,    0,  126, 
+          126,    0,    0,  126,    0,   70,  688,  688,    0,  305, 
+          311,    0,  300,  802,  802,   70,   70,    0,   70,   70, 
+           70,   70,   70,    0,    0,    0,   84,  305,  500,   85, 
+          687,  120,   85,    0,  357,  357,  337,    0,    0,  232, 
+            0,  109,  109,    0,  126,    0,   70,    0,   70,   85, 
+          694,  694,    0,    0,  300,  300,  300,    0,    0,  300, 
+          300,  300,  120,  300,    0,  120,  107,  686,    0,    0, 
+            0,  300,    0,  300,  300,  300,  364,    0,    0,    0, 
+            0,    0,  120,  300,  300,    0,  300,  300,  300,  300, 
+          300,    0,    0,  305,   70,    0,    0,   84,   84,  107, 
+          130,   85,    0,   84,   84,   85,   85,    0,  579,  312, 
+            0,  231,  686,    0,  300,   85,  300,    0,    0,  107, 
+            0,    0,    0,   85,    0,    0,    0,    0,    0,   84, 
+          123,  232,  149,   85,   85,  151,  797,    0,    0,    0, 
+            0,   84,    0,  300,    0,    0,    0,    0,  300,    0, 
+            0,  315,    0,    0,    0,    0,    0,    0,    0,    0, 
+          121,  123,  300,    0,  123,  300,  689,    0,  696,  696, 
+          103,    0,   85,  337,  337,  337,    0,    0,  312,  337, 
+          337,  123,  337,    0,  150,  500,  107,   84,  107,    0, 
+          337,    0,    0,   84,    0,  120,    0,  686,    0,   84, 
+          696,  696,   84,  797,  797,  337,  337,  337,  337,  337, 
+          107,  689,    0,  109,    0,    0,   84,    0,  140,    0, 
+            0,  103,  103,    0,    0,   84,    0, 1294,  687,  687, 
+          305,  305,  305,  337,    0,  337,  305,  305,    0,  305, 
+            0,  123,  686,  689,   85,    0,  109,  305,    0,    0, 
+            0,    0,  500,  500,    0,    0,    0,    0,    0,  305, 
+          305,    0,  305,  305,  305,  305,  109,    0,    0,    0, 
+          137,  107,  315,    0,  405,  400,  107,  235,    0,  403, 
+          401,  337,  402,    0,  404,    0,  687,  687,  689,    0, 
+          305,  136,  305,  137,   84,  350,  312,    0,   84,  311, 
+          120,  137,   84,    0,  137,  235,  350,  235,    0,  235, 
+            0,    0,   85,  692,    0,    0,    0,    0,  136,  305, 
+          358,  137,  136,    0,    0,  136,  235,  358,  235,  811, 
+            0,  399,    0,  109,    0,  109,    0,    0,  305,    0, 
+          350,    0,  136,    0, 1294,    0, 1294,    0,    0,    0, 
+         1294,  350,   84, 1294,    0,   84,    0,  109,    0,    0, 
+            0,  398,    0,    0,    0,  358,    0,    0,  686,  686, 
+            0,  107,  358,    0,   84,    0,  567,    0,  568,  569, 
+          570,  571,  572,   85,   85,   84,    0,    0,    0,   85, 
+           85,  315,    0,  103,    0,    0,    0,  232,  573,  123, 
+            0,    0, 1294,    0, 1294,    0, 1294,    0, 1294,    0, 
+            0,  271,  574,  811,    0,   85,    0,    0,  109,    0, 
+            0,  271,  575,  109, 1294,    0,  103,   85,  577,  578, 
+          139,    0,    0,    0,  311,    0,    0,    0,    0,    0, 
+            0,    0,  231,    0,  107,    0,  103,  107,  271,  271, 
+            0,   84,  271,  271,  271,  271,  271,    0,  271,    0, 
+            0,    0,    0,    0,  107,    0,    0,  689,  689,  271, 
+          271,    0,    0,   85,  271,    0,  142,    0,    0,   85, 
+            0,    0,    0,  311,    0,   85,    0,    0,   85,    0, 
+            0,    0,   84,    0,    0,    0,    0,    0,  686,  686, 
+            0,    0,   85,    0,  271,  271,    0,    0,    0,    0, 
+            0,   85,    0,  103,    0,  103,  851,    0,  109,    0, 
+          851,  851,    0,    0,  315,    0,    0,    0,  156,    0, 
+          107,    0,    0,    0,    0,  271,  271,  103,  107,  137, 
+            0,    0,    0,    0,  689,  689,    0,    0,  107,  107, 
+          811,  811,  811,  155,    0,    0,  811,  811,  489,  811, 
+          136,    0,    0,    0,    0,  379,    0,  811,  489,    0, 
+            0,    0,    0,  235,    0,  235,  235,  235,  235,  235, 
+           85,    0,  392,  393,   85,  312,  812,  851,   85,    0, 
+            0,  109,    0,  315,  109,  235,  350,  350,  103,  489, 
+            0,    0,  916,  103,  489,    0,    0,  350,  350,  235, 
+          811,  109,  811,    0,    0,  692,    0,  489,    0,  235, 
+            0,  358,  358,    0,  235,  235,  235,    0,  358,  358, 
+            0,    0,    0,    0,    0,    0,    0,    0,   85,  579, 
+            0,   85,    0,  580,    0,    0,    0,    0,    0,    0, 
+          579,    0, 1082,    0,  580,    0,    0,    0,  811,  107, 
+           85,    0,    0,  852,    0,    0,    0,  852,  852,    0, 
+          812,   85,    0,  271,  271,  271,    0,  109,  271,  271, 
+          271,    0,  271,  489,    0,  109,    0,    0,    0,    0, 
+          271,    0,  271,  271,  271,  109,  109,    0,  103,    0, 
+            0,    0,  271,  271,    0,  271,  271,  271,  271,  271, 
+            0,  315,    0,  405,  400,    0,    0,    0,  403,  401, 
+          312,  402,    0,  404,    0,    0,    0,  107,  232,    0, 
+            0,    0,    0,  271,  852,  271,  397,   85,  396,  271, 
+          271,  271,  271,  271,    0,    0,  271,  271,  271,  271, 
+          271,  271,    0,    0,    0,    0,  271,  271,    0,    0, 
+            0,    0,  271,    0,    0,    0,    0,  271,    0,  312, 
+          399,  103,    0,    0,  103,    0,    0,    0,   85,    0, 
+         1331,  271,    0,    0,  271, 1338,    0,    0,    0,    0, 
+            0,  103,    0,    0,    0,    0,    0,  579,  851,  851, 
+          398,    0,    0,    0,  851,  851,  109,  812,  812,  812, 
+            0,    0,    0,  812,  812,    0,  812,    0,    0,    0, 
+          489,  489,  489,    0,  812,  489,  489,  489,    0,  489, 
+          107,    0,    0,    0,    0,    0,    0,  489,    0,  489, 
+            0,    0,  107,  103,    0,    0,    0,  103,  103,  489, 
+          489,    0,  489,  489,  489,  489,  489,  103,    0,    0, 
+            0, 1387, 1389, 1391, 1393,  103,    0,  812, 1395,  812, 
+            0,    0,    0,    0,  109,  103,  103,    0,    0,    0, 
+          489,    0,  489,  798,    0,    0,    0,  134,  851,  798, 
+            0,    0,    0,    0,  107, 1406, 1407, 1409, 1410,    0, 
+          851,    0,    0,  107, 1412,  489,  489,  567,    0,  568, 
+          569,  570,  571,  572,  103,  812,    0,  107,  567,    0, 
+          568,  569,  570,  571,  572,    0,  107,    0,  489,  573, 
+            0,    0,    0,    0,  798,    0,    0,    0,    0,    0, 
+          573,    0,    0,    0,    0,  852,  852,    0,    0,    0, 
+            0,  852,  852,  575,  574,   53,    0,    0,  576,  577, 
+          578,    0,    0,    0,  575,   53,  798,    0,    0,  576, 
+          577,  578,    0,    0,    0,    0,    0,  109,    0,    0, 
+            0,    0,    0,    0,    0,    0,  103,    0,    0,  109, 
+            0,    0,    0,    0,    0,  107,   53,    0,    0,  107, 
+         1232,    0,    0,  107,  379,    0,    0,    0,    0,  384, 
+          385,    0,    0,    0,   53,    0,    0,    0,    0,  270, 
+            0,  392,  393,    0,    0,    0,    0,    0,    0,  270, 
+            0,    0,    0,    0,    0,  852,    0,    0,    0,    0, 
+            0,  109,    0,    0,    0,    0,    0,  852,    0,    0, 
+          109,    0,    0,  107,  103,    0,  107,  233,  233,    0, 
+          270,    0,    0,  270,  109,  567,    0,  568,  569,  570, 
+          571,  572,    0,  109,    0,  107,    0,  270,  270,    0, 
+           53,    0,  270,    0,    0,    0,  107,  573,    0,    0, 
+          268,  273,  274,  275,    0,    0,    0,  233,  233,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  333, 
+          335,  575,  270,    0,    0,    0,    0,  577,  578,    0, 
+            0,    0,  153,  798,    0,  103,  103,    0,    0,    0, 
+            0,  103,  103,    0,    0,  473,    0,    0,    0,    0, 
+            0,    0,  109,    0,  270,    0,  109, 1233,    0,    0, 
+          109,    0,  107,    0,    0,    0,    0,  103,    0,  233, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  103, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  473,    0,    0,    0,    0,    0, 
+          798,  798,    0,  107,    0,    0,    0,    0,    0,    0, 
+          109,    0,    0,  109,  585,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  585,  103,    0,   53,   53,   53, 
+            0,  103,  109,   53,   53,    0,   53,  103,    0,    0, 
+          103,    0,    0,  109,   53,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  103,  585,    0,    0,  585,   53, 
+           53,   53,   53,  103,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  585,    0,  233,    0,    0,  233,  233, 
+          233,    0,  333,    0,    0,    0,    0,   53,    0,   53, 
+            0,  270,  270,  270,    0,    0,  270,  270,  270,  233, 
+          270,    0,  233,    0,    0,    0,    0,  585,  270,  109, 
+          270,  270,  270,    0,    0,    0,    0,    0,    0,    0, 
+          270,  270,    0,  270,  270,  270,  270,  270,    0,    0, 
+            0,    0,  103,    0,    0,   53,  103,    0,  585,  585, 
+          103,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          109,  270,    0,  270,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  270,  270,  254,    0,  270,  270, 
+            0,    0,    0,    0,    0,    0,  254,    0,    0,    0, 
+          270,    0,    0,    0,    0,  270,    0,    0,    0,    0, 
+          103,    0,    0,  103,    0,    0,    0,    0,    0,  270, 
+            0,    0,  270,  254,  254,    0,    0,  254,  254,  254, 
+          254,  254,  103,  254,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  103,  254,  254,  254,    0,  254,  254, 
+            0,  627,  628,  629,  630,  631,    0,    0,  632,  633, 
+          634,  635,  636,  637,  638,  639,    0,  641,    0,    0, 
+          642,  643,  644,  645,  646,  647,  648,  649,  650,  254, 
+          254,    0,    0,    0,    0,    0,    0,    0,  233,    0, 
+            0,  672,    0,    0,    0,    0,  585,  585,  585,    0, 
+            0,  585,  585,  585,    0,  585,    0,    0,    0,  103, 
+          254,  254,    0,  585,    0,  585,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  585,  585,    0,  585,  585, 
+          585,  585,  585,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  233, 
+          103,    0,    0,    0,    0,    0,  585,    0,  585,    0, 
+          233,    0,  233,    0,  233,    0,    0,  272,  233,    0, 
+            0,    0,  275,    0,    0,    0,    0,  272,    0,    0, 
+            0,    0,    0,    0,    0,  585,    0,    0,    0,    0, 
+          738,    0,  740,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  585,  233,    0,    0,  272,  233, 
+            0,  272,    0,    0,    0,    0,    0,    0,    0,    0, 
+          233,    0,    0,    0,    0,  272,  272,    0,    0,    0, 
+          272,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  254,  254, 
+          254,    0,    0,  254,  254,  254,    0,  254,    0,    0, 
+          272,    0,    0,    0,    0,  254,  233,  254,  254,  254, 
+            0,    0,    0,    0,    0,    0,  800,  254,  254,  800, 
+          254,  254,  254,  254,  254,  233,    0,    0,  405,  400, 
+            0,    0,  272,  403,  401,    0,  402,    0,  404,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  254,    0, 
+          254,  397,    0,  396,  254,  254,  254,  254,  254,  254, 
+          254,  254,  254,  254,  254,  254,  254,    0,    0,    0, 
+            0,  254,  254,    0,    0,    0,    0,  254,    0,    0, 
+            0,    0,  254,    0,    0,  399,    0,  844,    0,    0, 
+            0,  844,  858,  233,    0,    0,  254,    0,    0,  254, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  398,    0,  233,    0,    0, 
+            0,    0,    0,    0,    0,  233,  800,  800,    0,    0, 
+            0,    0,    0,    0,    0,    0,   75,    0,  844,    0, 
+          844,  844,  233,    0,  233,    0,   75,    0,    0,    0, 
+            0,    0,    0,  800,  800,    0,    0,    0,  844,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  272, 
+          272,  272,    0,    0,  272,  272,  272,   75,  272,    0, 
+            0,    0,    0,    0,    0,    0,  272,    0,  272,  272, 
+          272,    0,    0,    0,    0,   75,    0,    0,  272,  272, 
+          233,  272,  272,  272,  272,  272,    0,    0, 1094, 1095, 
+         1096, 1097,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0, 1098, 1099, 1100,    0,    0,  272, 
+            0,  272,    0,    0,   40,   41,   42,   43,   44,    0, 
+            0,    0,  272,  272,  308,  233,  272,  272,    0,    0, 
+            0,    0,    0,    0,    0,  685,    0,    0,  272,    0, 
+            0,   75,    0,  272,    0,  685,    0,    0,    0,  233, 
+            0,    0,    0,    0,    0,    0,    0,  272,    0,    0, 
+          272,   58,   59,   60,   61,   62,   63,   64,  797,   65, 
+           66,    0,  685,  685,  233,  797,  685,  685,  685,  685, 
+          685,  685,  685,    0,    0,    0,    0,  844,    0,    0, 
+            0,    0,    0,  685,  685,  685,  138,  685,  685,  379, 
+          380,  381,  382,  383,  384,  385,  386,  387,  388,  389, 
+            0,    0,    0,    0,    0,    0,  392,  393,    0,    0, 
+            0,    0,    0,    0,    0,    0,  685,    0,  685,  685, 
+            0,    0,    0,    0,    0,    0,    0,  800,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1039,    0,    0,  844, 
+          844,    0,    0,    0,    0,  844,  844,    0,  797,  685, 
+          685,  797,    0,  233,    0,    0,    0,    0,    0,  233, 
+            0,    0,    0,    0,    0,  233,    0,    0,   75,   75, 
+           75,    0,    0,   75,   75,   75,    0,   75,    0,  233, 
+            0,    0,    0,    0,    0,   75,    0,   75,    0,  844, 
+          844,    0,  844,  844,  233,    0,    0,  800,    0,    0, 
+           75,   75,   75,   75,   75,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1092, 1093,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   75,  844, 
+           75,    0,    0,    0, 1149,    0,    0,    0,    0,    0, 
+            0,  844,  233,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  233,    0,    0, 
+            0,    0,    0,  844,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   75,    0,    0,    0, 
+            0,    0,  797,  797,  797,    0,  797,  685,  685,  685, 
+          797,  797,  685,  685,  685,  797,  685,  797,  797,  797, 
+          797,  797,  797,  797,  685,  797,  685,  685,  685,  797, 
+          797,  797,  797,  797,  797,  797,  685,  685,  797,  685, 
+          685,  685,  685,  685,    0,  797,    0,    0,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,    0,  233,  685,  797,  685, 
+            0,  797,  797,  685,  685,  685,  685,  685,  685,  685, 
+          685,  685,  685,  685,  685,  685,  797,  797,    0,    0, 
+          685,  685,  685,  685,  797,  697,  685,  797,  797,  797, 
+          797,  685,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  688,  797,  797,  685,    0,    0,  685,    0, 
+            0,    0,  688,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  798,    0,    0,    0,  688, 
+          688,    0,  798,  688,  688,  688,  688,  688,  688,  688, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          688,  688,  688,  141,  688,  688,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  688,  233,  688,  688,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  802, 
+            0,    0,    0,    0,    0,  798,  688,  688,  798,  802, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  797,    0,    0,    0,  802,  802,    0,  797, 
+          802,  802,  802,  802,  802,  802,  802,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  802,  802,  802, 
+          152,  802,  802,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          802,    0,  802,  802,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  802,  802,  802,  797,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  798, 
+          798,  798,    0,  798,  688,  688,  688,  798,  798,  688, 
+          688,  688,  798,  688,  798,  798,  798,  798,  798,  798, 
+          798,  688,  798,  688,  688,  688,  798,  798,  798,  798, 
+          798,  798,  798,  688,  688,  798,  688,  688,  688,  688, 
+          688,    0,  798,    0,    0,  798,  798,  798,  798,  798, 
           798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
-          798,  798,  798,  793,  793,    0,    0,  798,  798,  798, 
-          798,  793,    0,  798,  793,  793,  793,  793,  798,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  798,    0,    0,  798,    0,    0,    0,  793, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  793,    0,    0,    0,  793,  793,    0,  793, 
-          793,  793,  793,  793,  793,  793,  793,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  793,  793,  793, 
-          149,  793,  793,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  563,    0,  564,  565,  566,  567,  568,    0, 
-          793,    0,  793,  793,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  569,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,    0,    0,    0, 
-            0,    0,  793,  793,  793,  793,  794,    0,  571,    0, 
-            0,    0,    0,    0,  573,  574,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  794, 
-            0,    0,    0,  794,  794,    0,  794,  794,  794,  794, 
-          794,  794,  794,  794,    0,    0,    0,    0,    0,    0, 
-         1080, 1081, 1082, 1083,  794,  794,  794,  151,  794,  794, 
-            0,    0,    0,    0,    0,    0, 1084, 1085, 1086,    0, 
-            0,    0,    0,    0,    0,    0,   40,   41,   42,   43, 
-           44,    0,    0,    0,    0,    0,  306,  794,    0,  794, 
-          794,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  794, 
-          794,  794,  794,   58,   59,   60,   61,   62,   63,   64, 
-            0,   65,   66,    0,    0,    0,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,    0,  793, 
-            0,    0,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,    0, 
-            0,  793,  793,  793,    0,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,    0,    0,  793,  793,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,    0,  793,  793,  793, 
-            0,    0,  793,  794,  794,  794,    0,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,    0,  794,    0,    0,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,    0,    0,  794,  794, 
-          794,    0,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,    0, 
-            0,  794,  794,  794,  794,  794,    0,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  347,  794,  794,  794,    0,    0,  794, 
-            0,    0,    0,  347,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  795,    0,    0,    0, 
-          347,  347,    0,  795,  347,  347,  347,  347,  347,  347, 
-          347,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  347,  347,  347,    0,  347,  347,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  347,    0,  347,  347,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          799,    0,    0,    0,    0,    0,  795,  347,  347,  795, 
-          799,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  795,    0,    0,    0,  799,  799,    0, 
-          795,  799,  799,  799,  799,  799,  799,  799,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  799,  799, 
-          799,    0,  799,  799,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  799,    0,  799,  799,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  799,  799,  799,  795,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          795,  795,  795,    0,  795,  347,  347,  347,  795,  795, 
-          347,  347,  347,  795,  347,  795,  795,  795,  795,  795, 
-          795,  795,  347,  795,  347,  347,  347,  795,  795,  795, 
-          795,  795,  795,  795,  347,  347,  795,  347,  347,  347, 
-          347,  347,    0,  795,    0,    0,  795,  795,  795,  795, 
-          795,  795,  795,  795,  795,  795,  795,  795,  795,  795, 
-          795,  795,  795,    0,    0,  347,  795,  347,    0,  795, 
-          795,  347,  347,  347,  347,  347,  347,  347,  347,  347, 
-          347,  347,  347,  347,  795,  795,    0,    0,  347,  347, 
-          347,  347,  795,    0,  347,  795,  795,  795,  795,  347, 
-          795,  795,  795,  795,  795,  795,  795,  795,  795,  795, 
-            0,  795,  795,  347,    0,    0,  347,  795,  795,  795, 
-            0,  795,  799,  799,  799,  795,  795,  799,  799,  799, 
-          795,  799,  795,  795,  795,  795,  795,  795,  795,  799, 
-          799,  799,  799,  799,  795,  795,  795,  795,  795,  795, 
-          795,  799,  799,  795,  799,  799,  799,  799,  799,    0, 
-          795,    0,    0,  795,  795,  795,  795,  795,  795,  795, 
-          795,  795,  795,  795,  795,  795,  795,  795,  795,  795, 
-            0,    0,  799,  795,  799,    0,  795,  795,  799,  799, 
-          799,  799,  799,  799,  799,  799,  799,  799,  799,  799, 
-          799,  795,  795,    0,    0,  799,  799,  799,  799,  795, 
-            0,  799,  795,  795,  795,  795,  799,  795,  795,  795, 
-          795,  795,  795,  795,  795,  795,  795,  800,  795,  795, 
-          799,    0,    0,  799,    0,    0,    0,  800,    0,    0, 
+          798,  798,    0,    0,  688,  798,  688,    0,  798,  798, 
+          688,  688,  688,  688,  688,  688,  688,  688,  688,  688, 
+          688,  688,  688,  798,  798,    0,    0,  688,  688,  688, 
+          688,  798,  700,  688,  798,  798,  798,  798,  688,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,    0, 
+          798,  798,  688,    0,    0,  688,  797,  797,  797,    0, 
+          797,  802,  802,  802,  797,  797,  802,  802,  802,  797, 
+          802,  797,  797,  797,  797,  797,  797,  797,  802,  802, 
+          802,  802,  802,  797,  797,  797,  797,  797,  797,  797, 
+          802,  802,  797,  802,  802,  802,  802,  802,    0,  797, 
+            0,    0,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,    0, 
+            0,  802,  797,  802,    0,  797,  797,  802,  802,  802, 
+          802,  802,  802,  802,  802,  802,  802,  802,  802,  802, 
+          797,  797,    0,    0,  802,  802,  802,  802,  797,    0, 
+          802,  797,  797,  797,  797,  802,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  802, 
+            0,    0,  802,    0,    0,    0,  797,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  797, 
+            0,    0,    0,  797,  797,    0,  797,  797,  797,  797, 
+          797,  797,  797,  797,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  797,  797,  797,  151,  797,  797, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  797,    0,  797, 
+          797,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  798,    0,    0,    0,    0,    0,  797, 
+          797,  797,  797,  798,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  798,    0,    0,    0, 
+          798,  798,    0,  798,  798,  798,  798,  798,  798,  798, 
+          798,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  798,  798,  798,  153,  798,  798,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          797,    0,    0,    0,  800,  800,    0,  797,  800,  800, 
-          800,  800,  800,  800,  800,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  800,  800,  800,    0,  800, 
-          800,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  798,    0,  798,  798,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  800,    0, 
-          800,  800,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  687, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  687, 
-          800,  800,  800,  797,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  687,  687,    0,    0, 
-          687,  687,  687,  687,  687,  687,  687,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  687,  687,  687, 
-          142,  687,  687,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  218,    0,    0,    0,    0,    0,    0, 
-          687,    0,  687,  687,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  218,    0,  218,    0,  218,    0,    0,    0,  689, 
-            0,    0,    0,  687,  687,    0,    0,    0,    0,    0, 
-            0,    0,  218,    0,  218,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  797,  797,  797,    0,  797,  800, 
-          800,  800,  797,  797,  800,  800,  800,  797,  800,  797, 
-          797,  797,  797,  797,  797,  797,  800,  800,  800,  800, 
-          800,  797,  797,  797,  797,  797,  797,  797,  800,  800, 
-          797,  800,  800,  800,  800,  800,    0,  797,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  798,  798,  798,  798, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  797,  797,  797,    0,  797,  797,  797, 
           797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
-          797,  797,  797,  797,  797,  797,  797,    0,    0,  800, 
-          797,  800,    0,  797,  797,  800,  800,  800,  800,  800, 
-          800,  800,  800,  800,  800,  800,  800,  800,  797,  797, 
-            0,    0,  800,  800,  800,  800,  797,    0,  800,  797, 
-          797,  797,  797,  800,  797,  797,  797,  797,  797,  797, 
-          797,  797,  797,  797,    0,  797,  797,  800,    0,    0, 
-          800,  687,  687,  687,    0,    0,  687,  687,  687,    0, 
-          687,    0,    0,    0,    0,    0,    0,    0,  687,    0, 
-          687,  687,  687,    0,    0,    0,    0,    0,    0,    0, 
-          687,  687,    0,  687,  687,  687,  687,  687,    0,    0, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,    0,  797,    0,    0,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,    0,    0,  797,  797, 
+          797,    0,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,    0, 
+            0,  797,  797,  797,  797,  797,    0,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,    0,  797,  797,  797,    0,    0,  797, 
+          798,  798,  798,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,    0,  798,    0,    0,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,    0,    0,  798,  798,  798,    0,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,    0,    0,  798,  798, 
+          798,  798,  798,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          351,  798,  798,  798,    0,    0,  798,    0,    0,    0, 
+          351,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  686,    0,    0,    0,    0, 
-            0,  687,    0,  687,    0,  686,    0,  687,  687,  687, 
-          687,  687,  687,  687,  687,  687,  687,  687,  687,  687, 
-            0,    0,    0,    0,  687,  687,  687,  687,    0,  699, 
-          687,    0,  686,  686,    0,  687,  686,  686,  686,  686, 
-          686,  686,  686,    0,    0,    0,    0,    0,    0,  687, 
-            0,    0,  687,  686,  686,  686,  141,  686,  686,  218, 
-            0,  218,  218,  218,  218,  218,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  218,    0,    0,    0,    0,  686,    0,  686,  686, 
-          688,    0,    0,    0,    0,  218,    0,    0,    0,    0, 
-          688,  689,    0,    0,    0,  218,    0,    0,    0,    0, 
-          218,  218,  218,    0,    0,    0,    0,    0,    0,  686, 
-          686,    0,    0,    0,    0,    0,    0,  688,  688,    0, 
-            0,  688,  688,  688,  688,  688,  688,  688,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  688,  688, 
-          688,  143,  688,  688,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  688,    0,  688,  688,    0,    0,    0,  689,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  689,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  688,  688,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  689,  689,    0,    0,  689, 
-          689,  689,  689,  689,  689,  689,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  689,  689,  689,  144, 
-          689,  689,    0,    0,    0,    0,    0,  686,  686,  686, 
-            0,    0,  686,  686,  686,    0,  686,    0,    0,    0, 
-            0,    0,    0,    0,  686,    0,  686,  686,  686,  689, 
-            0,  689,  689,    0,    0,    0,  686,  686,    0,  686, 
-          686,  686,  686,  686,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  799,    0,    0,    0,  351,  351,    0, 
+          799,  351,  351,  351,  351,  351,  351,  351,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  351,  351, 
+          351,    0,  351,  351,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  689,  689,    0,    0,    0,  686,    0,  686, 
-            0,    0,    0,  686,  686,  686,  686,  686,  686,  686, 
-          686,  686,  686,  686,  686,  686,    0,    0,    0,    0, 
-          686,  686,  686,  686,    0,  698,  686,    0,    0,    0, 
-            0,  686,  688,  688,  688,    0,    0,  688,  688,  688, 
-            0,  688,    0,    0,    0,  686,    0,    0,  686,  688, 
-            0,  688,  688,  688,    0,    0,    0,    0,    0,    0, 
-            0,  688,  688,    0,  688,  688,  688,  688,  688,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  822,    0,    0, 
-            0,    0,  688,    0,  688,    0,    0,  822,  688,  688, 
-          688,  688,  688,  688,  688,  688,  688,  688,  688,  688, 
-          688,    0,    0,    0,    0,  688,  688,  688,  688,    0, 
-          700,  688,    0,    0,    0,    0,  688,    0,  822,    0, 
-          689,  689,  689,    0,    0,  689,  689,  689,    0,  689, 
-          688,    0,    0,  688,    0,    0,  822,  689,    0,  689, 
-          689,  689,    0,    0,    0,    0,    0,    0,    0,  689, 
-          689,    0,  689,  689,  689,  689,  689,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          822,    0,    0,    0,  691,    0,    0,    0,    0,    0, 
-          689,    0,  689,    0,  691,    0,  689,  689,  689,  689, 
-          689,  689,  689,  689,  689,  689,  689,  689,  689,    0, 
-            0,    0,  822,  689,  689,  689,  689,    0,  701,  689, 
-            0,  691,  691,    0,  689,  691,  691,  691,  691,  691, 
-          691,  691,    0,    0,    0,    0,    0,    0,  689,    0, 
-            0,  689,  691,  691,  691,  146,  691,  691,    0,    0, 
+            0,  351,    0,  351,  351,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  803,    0,    0, 
+            0,    0,    0,  799,  351,  351,  799,  803,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  691,    0,  691,  691,  690, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  690, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  691,  691, 
-            0,    0,    0,    0,    0,    0,  690,  690,    0,    0, 
-          690,  690,  690,  690,  690,  690,  690,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  690,  690,  690, 
-          145,  690,  690,    0,    0,    0,    0,    0,    0,  822, 
-          822,  822,    0,    0,  822,  822,  822,    0,  822,    0, 
-            0,    0,    0,    0,    0,    0,  822,    0,  822,  822, 
-          690,    0,  690,  690,    0,    0,    0,  692,  822,  822, 
-            0,  822,  822,  822,  822,  822,    0,  692,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  690,  690,    0,    0,    0,    0,  822, 
-            0,  822,    0,    0,  692,  692,    0,    0,  692,  692, 
-          692,  692,  692,  692,  692,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  692,  692,  692,  147,  692, 
-          692,    0,    0,  822,    0,    0,  691,  691,  691,    0, 
-            0,  691,  691,  691,    0,  691,    0,  822,    0,    0, 
-            0,    0,    0,  691,    0,  691,  691,  691,  692,    0, 
-          692,  692,    0,    0,    0,  691,  691,    0,  691,  691, 
-          691,  691,  691,    0,    0,    0,    0,    0,    0,    0, 
+          799,    0,    0,    0,  803,  803,    0,  799,  803,  803, 
+          803,  803,  803,  803,  803,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  803,  803,  803,    0,  803, 
+          803,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  692,  692,    0,    0,    0,  691,    0,  691,    0, 
-            0,    0,  691,  691,  691,  691,  691,  691,  691,  691, 
-          691,  691,  691,  691,  691,    0,    0,    0,    0,  691, 
-          691,  691,  691,    0,  703,  691,    0,    0,    0,    0, 
-          691,  690,  690,  690,    0,    0,  690,  690,  690,    0, 
-          690,    0,    0,    0,  691,    0,    0,  691,  690,    0, 
-          690,  690,  690,    0,    0,    0,    0,    0,    0,    0, 
-          690,  690,    0,  690,  690,  690,  690,  690,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,   85,    0,    0,    0, 
-            0,  690,    0,  690,    0,    0,   85,  690,  690,  690, 
-          690,  690,  690,  690,  690,  690,  690,  690,  690,  690, 
-            0,    0,    0,    0,  690,  690,  690,  690,    0,  702, 
-          690,    0,    0,    0,    0,  690,    0,   85,    0,  692, 
-          692,  692,    0,    0,  692,  692,  692,    0,  692,  690, 
-            0,    0,  690,    0,    0,   85,  692,    0,  692,  692, 
-          692,    0,    0,    0,    0,    0,    0,    0,  692,  692, 
-            0,  692,  692,  692,  692,  692,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,   85, 
-            0,    0,    0,  683,    0,    0,    0,    0,    0,  692, 
-            0,  692,    0,  683,    0,  692,  692,  692,  692,  692, 
-          692,  692,  692,  692,  692,  692,  692,  692,    0,    0, 
-            0,   85,  692,  692,  692,  692,    0,  704,  692,    0, 
-          683,  683,    0,  692,  683,  683,  683,  683,  683,  683, 
-          683,    0,    0,    0,    0,    0,    0,  692,    0,    0, 
-          692,  683,  683,  683,  138,  683,  683,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  683,    0,  683,  683,  682,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  682,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  683,  683,    0, 
-            0,    0,    0,    0,    0,  682,  682,    0,    0,  682, 
-          682,  682,  682,  682,  682,  682,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  682,  682,  682,  137, 
-          682,  682,    0,    0,    0,    0,    0,    0,   85,   85, 
-           85,    0,    0,   85,   85,   85,    0,   85,    0,    0, 
-            0,    0,    0,    0,    0,   85,    0,   85,   85,  682, 
-            0,  682,  682,    0,    0,    0,  685,   85,   85,    0, 
-           85,   85,   85,   85,   85,    0,  685,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  682,  682,    0,    0,    0,    0,   85,    0, 
-           85,    0,    0,  685,  685,    0,    0,  685,  685,  685, 
-          685,  685,  685,  685,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  685,  685,  685,  140,  685,  685, 
-            0,    0,    0,    0,    0,  683,  683,  683,    0,    0, 
-          683,  683,  683,    0,  683,    0,   85,    0,    0,    0, 
-            0,    0,  683,    0,  683,  683,  683,  685,    0,  685, 
-          685,    0,    0,    0,  683,  683,    0,  683,  683,  683, 
-          683,  683,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          685,  685,    0,    0,    0,  683,    0,  683,    0,    0, 
-            0,  683,  683,  683,  683,  683,  683,  683,  683,  683, 
-          683,  683,  683,  683,    0,    0,    0,    0,  683,  683, 
-          683,  683,    0,  695,  683,    0,    0,    0,    0,  683, 
-          682,  682,  682,    0,    0,  682,  682,  682,    0,  682, 
-            0,    0,    0,  683,    0,    0,  683,  682,    0,  682, 
-          682,  682,    0,    0,    0,    0,    0,    0,    0,  682, 
-          682,    0,  682,  682,  682,  682,  682,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  803,    0, 
+          803,  803,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   89,    0,    0,    0,    0, 
-          682,    0,  682,    0,    0,   89,  682,  682,  682,  682, 
-          682,  682,  682,  682,  682,  682,  682,  682,  682,    0, 
-            0,    0,    0,  682,  682,  682,  682,    0,  694,  682, 
-            0,    0,    0,    0,  682,    0,   89,    0,  685,  685, 
-          685,    0,    0,  685,  685,  685,    0,  685,  682,    0, 
-            0,  682,    0,    0,   89,  685,    0,  685,  685,  685, 
-            0,    0,    0,    0,    0,    0,    0,  685,  685,    0, 
-          685,  685,  685,  685,  685,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,   89,    0, 
-            0,    0,  495,    0,    0,    0,    0,    0,  685,    0, 
-          685,    0,  495,    0,  685,  685,  685,  685,  685,  685, 
-          685,  685,  685,  685,  685,  685,  685,    0,    0,    0, 
-           89,  685,  685,  685,  685,    0,  697,  685,    0,  495, 
-          495,    0,  685,  495,  495,  495,  495,  495,  495,  495, 
-            0,    0,    0,    0,    0,    0,  685,    0,    0,  685, 
-          495,  495,  495,    0,  495,  495,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  495,    0,  495,  495,  353,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  353,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  495,  495,  495,    0,    0, 
-            0,    0,    0,    0,  353,  353,    0,  794,  353,  353, 
-          353,  353,  353,  353,  353,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  353,  353,  353,  152,  353, 
-          353,    0,    0,    0,    0,    0,    0,   89,   89,   89, 
-            0,    0,   89,   89, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          803,  803,  803,  799,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  799,  799,  799, 
+            0,  799,  351,  351,  351,  799,  799,  351,  351,  351, 
+          799,  351,  799,  799,  799,  799,  799,  799,  799,  351, 
+          799,  351,  351,  351,  799,  799,  799,  799,  799,  799, 
+          799,  351,  351,  799,  351,  351,  351,  351,  351,    0, 
+          799,    0,    0,  799,  799,  799,  799,  799,  799,  799, 
+          799,  799,  799,  799,  799,  799,  799,  799,  799,  799, 
+            0,    0,  351,  799,  351,    0,  799,  799,  351,  351, 
+          351,  351,  351,  351,  351,  351,  351,  351,  351,  351, 
+          351,  799,  799,    0,    0,  351,  351,  351,  351,  799, 
+            0,  351,  799,  799,  799,  799,  351,  799,  799,  799, 
+          799,  799,  799,  799,  799,  799,  799,    0,  799,  799, 
+          351,    0,    0,  351,  799,  799,  799,    0,  799,  803, 
+          803,  803,  799,  799,  803,  803,  803,  799,  803,  799, 
+          799,  799,  799,  799,  799,  799,  803,  803,  803,  803, 
+          803,  799,  799,  799,  799,  799,  799,  799,  803,  803, 
+          799,  803,  803,  803,  803,  803,    0,  799,    0,    0, 
+          799,  799,  799,  799,  799,  799,  799,  799,  799,  799, 
+          799,  799,  799,  799,  799,  799,  799,    0,    0,  803, 
+          799,  803,    0,  799,  799,  803,  803,  803,  803,  803, 
+          803,  803,  803,  803,  803,  803,  803,  803,  799,  799, 
+            0,    0,  803,  803,  803,  803,  799,    0,  803,  799, 
+          799,  799,  799,  803,  799,  799,  799,  799,  799,  799, 
+          799,  799,  799,  799,  804,  799,  799,  803,    0,    0, 
+          803,    0,    0,    0,  804,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  801,    0,    0, 
+            0,  804,  804,    0,  801,  804,  804,  804,  804,  804, 
+          804,  804,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  804,  804,  804,    0,  804,  804,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  804,    0,  804,  804,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  500,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  500,  804,  804,  804, 
+          801,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  500,  500,    0,    0,  500,  500,  500, 
+          500,  500,  500,  500,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  500,  500,  500,  150,  500,  500, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          220,    0,    0,    0,    0,    0,    0,  500,    0,  500, 
+          500,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  220,    0, 
+          220,    0,  220,    0,    0,    0,  693,    0,    0,  500, 
+          500,  500,    0,    0,    0,    0,    0,    0,    0,  220, 
+            0,  220,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  801,  801,  801,    0,  801,  804,  804,  804,  801, 
+          801,  804,  804,  804,  801,  804,  801,  801,  801,  801, 
+          801,  801,  801,  804,  804,  804,  804,  804,  801,  801, 
+          801,  801,  801,  801,  801,  804,  804,  801,  804,  804, 
+          804,  804,  804,    0,  801,    0,    0,  801,  801,  801, 
+          801,  801,  801,  801,  801,  801,  801,  801,  801,  801, 
+          801,  801,  801,  801,    0,    0,  804,  801,  804,    0, 
+          801,  801,  804,  804,  804,  804,  804,  804,  804,  804, 
+          804,  804,  804,  804,  804,  801,  801,    0,    0,  804, 
+          804,  804,  804,  801,    0,  804,  801,  801,  801,  801, 
+          804,  801,  801,  801,  801,  801,  801,  801,  801,  801, 
+          801,    0,  801,  801,  804,    0,    0,  804,  500,  500, 
+          500,    0,    0,  500,  500,  500,    0,  500,    0,    0, 
+            0,    0,    0,    0,    0,  500,  500,  500,  500,  500, 
+            0,    0,    0,    0,    0,    0,    0,  500,  500,    0, 
+          500,  500,  500,  500,  500,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  691,    0,    0,    0,    0,    0,  500,    0, 
+          500,    0,  691,    0,  500,  500,  500,  500,  500,  500, 
+          500,  500,  500,  500,  500,  500,  500,    0,    0,    0, 
+            0,  500,  500,  500,  500,    0,    0,  500,    0,  691, 
+          691,    0,  500,  691,  691,  691,  691,  691,  691,  691, 
+            0,    0,    0,    0,    0,    0,  500,    0,    0,  500, 
+          691,  691,  691,  144,  691,  691,  220,    0,  220,  220, 
+          220,  220,  220,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  220,    0, 
+            0,    0,    0,  691,    0,  691,  691,  690,    0,    0, 
+            0,    0,  220,    0,    0,    0,    0,  690,  693,    0, 
+            0,    0,  220,    0,    0,    0,    0,  220,  220,  220, 
+            0,    0,    0,    0,    0,    0,  691,  691,    0,    0, 
+            0,    0,    0,    0,  690,  690,    0,    0,  690,  690, 
+          690,  690,  690,  690,  690,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  690,  690,  690,  143,  690, 
+          690,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  690,    0, 
+          690,  690,    0,    0,    0,  692,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  692,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  690,  690,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  692,  692,    0,    0,  692,  692,  692,  692, 
+          692,  692,  692,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  692,  692,  692,  145,  692,  692,    0, 
+            0,    0,    0,    0,  691,  691,  691,    0,    0,  691, 
+          691,  691,    0,  691,    0,    0,    0,    0,    0,    0, 
+            0,  691,    0,  691,  691,  691,  692,    0,  692,  692, 
+            0,    0,    0,  691,  691,    0,  691,  691,  691,  691, 
+          691,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  692, 
+          692,    0,    0,    0,  691,    0,  691,    0,    0,    0, 
+          691,  691,  691,  691,  691,  691,  691,  691,  691,  691, 
+          691,  691,  691,    0,    0,    0,    0,  691,  691,  691, 
+          691,    0,  703,  691,    0,    0,    0,    0,  691,  690, 
+          690,  690,    0,    0,  690,  690,  690,    0,  690,    0, 
+            0,    0,  691,    0,    0,  691,  690,    0,  690,  690, 
+          690,    0,    0,    0,    0,    0,    0,    0,  690,  690, 
+            0,  690,  690,  690,  690,  690,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  327,    0,    0,    0,    0,  690, 
+            0,  690,    0,    0,  327,  690,  690,  690,  690,  690, 
+          690,  690,  690,  690,  690,  690,  690,  690,    0,    0, 
+            0,    0,  690,  690,  690,  690,    0,  702,  690,    0, 
+            0,    0,    0,  690,    0,  327,    0,  692,  692,  692, 
+            0,    0,  692,  692,  692,    0,  692,  690,    0,    0, 
+          690,    0,    0,  327,  692,    0,  692,  692,  692,    0, 
+            0,    0,    0,    0,    0,    0,  692,  692,    0,  692, 
+          692,  692,  692,  692,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  327,    0,    0, 
+            0,  693,    0,    0,    0,    0,    0,  692,    0,  692, 
+            0,  693,    0,  692,  692,  692,  692,  692,  692,  692, 
+          692,  692,  692,  692,  692,  692,    0,    0,    0,  327, 
+          692,  692,  692,  692,    0,  704,  692,    0,  693,  693, 
+            0,  692,  693,  693,  693,  693,  693,  693,  693,    0, 
+            0,    0,    0,    0,    0,  692,    0,    0,  692,  693, 
+          693,  693,  146,  693,  693,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  693,    0,  693,  693,  695,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  695,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  693,  693,    0,    0,    0, 
+            0,    0,    0,  695,  695,    0,    0,  695,  695,  695, 
+          695,  695,  695,  695,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  695,  695,  695,  148,  695,  695, 
+            0,    0,    0,    0,    0,    0,  327,  327,  327,    0, 
+            0,  327,  327,  327,    0,  327,    0,    0,    0,    0, 
+            0,    0,    0,  327,    0,  327,  327,  695,    0,  695, 
+          695,    0,    0,    0,  694,  327,  327,    0,  327,  327, 
+          327,  327,  327,    0,  694,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          695,  695,    0,    0,    0,    0,  327,    0,  327,    0, 
+            0,  694,  694,    0,    0,  694,  694,  694,  694,  694, 
+          694,  694,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  694,  694,  694,  147,  694,  694,    0,    0, 
+          327,    0,    0,  693,  693,  693,    0,    0,  693,  693, 
+          693,    0,  693,    0,  327,    0,    0,    0,    0,    0, 
+          693,    0,  693,  693,  693,  694,    0,  694,  694,    0, 
+            0,    0,  693,  693,    0,  693,  693,  693,  693,  693, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  694,  694, 
+            0,    0,    0,  693,    0,  693,    0,    0,    0,  693, 
+          693,  693,  693,  693,  693,  693,  693,  693,  693,  693, 
+          693,  693,    0,    0,    0,    0,  693,  693,  693,  693, 
+            0,  705,  693,    0,    0,    0,    0,  693,  695,  695, 
+          695,    0,    0,  695,  695,  695,    0,  695,    0,    0, 
+            0,  693,    0,    0,  693,  695,    0,  695,  695,  695, 
+            0,    0,    0,    0,    0,    0,    0,  695,  695,    0, 
+          695,  695,  695,  695,  695,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  826,    0,    0,    0,    0,  695,    0, 
+          695,    0,    0,  826,  695,  695,  695,  695,  695,  695, 
+          695,  695,  695,  695,  695,  695,  695,    0,    0,    0, 
+            0,  695,  695,  695,  695,    0,  707,  695,    0,    0, 
+            0,    0,  695,    0,  826,    0,  694,  694,  694,    0, 
+            0,  694,  694,  694,    0,  694,  695,    0,    0,  695, 
+            0,    0,  826,  694,    0,  694,  694,  694,    0,    0, 
+            0,    0,    0,    0,    0,  694,  694,    0,  694,  694, 
+          694,  694,  694,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  826,    0,    0,    0, 
+          696,    0,    0,    0,    0,    0,  694,    0,  694,    0, 
+          696,    0,  694,  694,  694,  694,  694,  694,  694,  694, 
+          694,  694,  694,  694,  694,    0,    0,    0,  826,  694, 
+          694,  694,  694,    0,  706,  694,    0,  696,  696,    0, 
+          694,  696,  696,  696,  696,  696,  696,  696,    0,    0, 
+            0,    0,    0,    0,  694,    0,    0,  694,  696,  696, 
+          696,  149,  696,  696,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  696,    0,  696,  696,  687,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  687,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  696,  696,    0,    0,    0,    0, 
+            0,    0,  687,  687,    0,    0,  687,  687,  687,  687, 
+          687,  687,  687,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  687,  687,  687,  140,  687,  687,    0, 
+            0,    0,    0,    0,    0,  826,  826,  826,    0,    0, 
+          826,  826,  826,    0,  826,    0,    0,    0,    0,    0, 
+            0,    0,  826,    0,  826,  826,  687,    0,  687,  687, 
+            0,    0,    0,  686,  826,  826,    0,  826,  826,  826, 
+          826,  826,    0,  686,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  687, 
+          687,    0,    0,    0,    0,  826,    0,  826,    0,    0, 
+          686,  686,    0,    0,  686,  686,  686,  686,  686,  686, 
+          686,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  686,  686,  686,  139,  686,  686,    0,    0,  826, 
+            0,    0,  696,  696,  696,    0,    0,  696,  696,  696, 
+            0,  696,    0,  826,    0,    0,    0,    0,    0,  696, 
+            0,  696,  696,  696,  686,    0,  686,  686,    0,    0, 
+            0,  696,  696,    0,  696,  696,  696,  696,  696,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  686,  686,    0, 
+            0,    0,  696,    0,  696,    0,    0,    0,  696,  696, 
+          696,  696,  696,  696,  696,  696,  696,  696,  696,  696, 
+          696,    0,    0,    0,    0,  696,  696,  696,  696,    0, 
+          708,  696,    0,    0,    0,    0,  696,  687,  687,  687, 
+            0,    0,  687,  687,  687,    0,  687,    0,    0,    0, 
+          696,    0,    0,  696,  687,    0,  687,  687,  687,    0, 
+            0,    0,    0,    0,    0,    0,  687,  687,    0,  687, 
+          687,  687,  687,  687,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0, 
       };
    }
 
    private static final int[] yyTable2() {
       return new int[] {
 
-           89,    0,   89,    0,    0,    0,    0,    0,    0,    0, 
-           89,    0,   89,   89,  353,    0,  353,  353,    0,    0, 
-            0,  821,   89,   89,    0,   89,   89,   89,   89,   89, 
-            0,  821,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  353,  353,    0, 
-            0,    0,    0,   89,    0,   89,    0,    0,  821,  821, 
-            0,    0,  821,  821,  821,  821,  821,  821,  821,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  821, 
-          821,  821,    0,  821,  821,    0,    0,    0,    0,    0, 
-          495,  495,  495,    0,    0,  495,  495,  495,    0,  495, 
-            0,   89,    0,    0,    0,    0,    0,  495,  495,  495, 
-          495,  495,  821,    0,  821,  821,    0,    0,    0,  495, 
-          495,    0,  495,  495,  495,  495,  495,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  821,  821,  821,    0,    0,    0, 
-          495,    0,  495,    0,    0,    0,  495,  495,  495,  495, 
-          495,  495,  495,  495,  495,  495,  495,  495,  495,    0, 
-            0,    0,    0,  495,  495,  495,  495,    0,    0,  495, 
-            0,    0,    0,    0,  495,  353,  353,  353,    0,    0, 
-          353,  353,  353,    0,  353,    0,    0,    0,  495,    0, 
-            0,  495,  353,    0,  353,  353,  353,    0,    0,    0, 
-            0,    0,    0,    0,  353,  353,    0,  353,  353,  353, 
-          353,  353,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-           87,    0,    0,    0,    0,  353,    0,  353,    0,    0, 
-           87,  353,  353,  353,  353,  353,  353,  353,  353,  353, 
-          353,  353,  353,  353,    0,    0,    0,    0,  353,  353, 
-          353,  353,    0,    0,  353,    0,    0,    0,    0,  353, 
-            0,   87,    0,  821,  821,  821,    0,    0,  821,  821, 
-          821,    0,  821,  353,    0,    0,  353,    0,    0,   87, 
-          821,  821,  821,  821,  821,    0,    0,    0,    0,    0, 
-            0,    0,  821,  821,    0,  821,  821,  821,  821,  821, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   87,    0,    0,    0,  346,    0,    0, 
-            0,    0,    0,  821,    0,  821,    0,  346,    0,  821, 
-          821,  821,  821,  821,  821,  821,  821,  821,  821,  821, 
-          821,  821,    0,    0,    0,   87,  821,  821,  821,  821, 
-            0,    0,  821,    0,  346,  346,    0,  821,  346,  346, 
-          346,  346,  346,  346,  346,    0,    0,    0,    0,    0, 
-            0,  821,    0,    0,  821,  346,  346,  346,  154,  346, 
-          346,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  346,    0, 
-          346,  346,  354,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  354,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  346,  346,    0,    0,    0,    0,    0,    0,  354, 
-          354,    0,    0,  354,  354,  354,  354,  354,  354,  354, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          354,  354,  354,  153,  354,  354,    0,    0,    0,    0, 
-            0,    0,   87,   87,   87,    0,    0,   87,   87,   87, 
-            0,   87,    0,    0,    0,    0,    0,    0,    0,   87, 
-            0,   87,   87,  354,    0,  354,  354,    0,    0,    0, 
-          625,   87,   87,    0,   87,   87,   87,   87,   87,    0, 
-          625,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  354,  354,    0,    0, 
-            0,    0,   87,    0,   87,    0,    0,  625,  625,    0, 
-            0,  625,  625,  625,  625,  625,  625,  625,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  625,  625, 
-          625,    0,  625,  625,    0,    0,    0,    0,    0,  346, 
-          346,  346,    0,    0,  346,  346,  346,    0,  346,    0, 
-           87,    0,    0,    0,    0,    0,  346,    0,  346,  346, 
-          346,  625,    0,  625,  625,    0,    0,    0,  346,  346, 
-            0,  346,  346,  346,  346,  346,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  625,  625,    0,    0,    0,  346, 
-            0,  346,    0,    0,    0,  346,  346,  346,  346,  346, 
-          346,  346,  346,  346,  346,  346,  346,  346,    0,    0, 
-            0,    0,  346,  346,  346,  346,    0,    0,  346,    0, 
-            0,    0,    0,  346,  354,  354,  354,    0,    0,  354, 
-          354,  354,    0,  354,    0,    0,    0,  346,    0,    0, 
-          346,  354,    0,  354,  354,  354,    0,    0,    0,    0, 
-            0,    0,    0,  354,  354,    0,  354,  354,  354,  354, 
-          354,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  567, 
-            0,    0,    0,    0,  354,    0,  354,    0,    0,  567, 
-          354,  354,  354,  354,  354,  354,  354,  354,  354,  354, 
-          354,  354,  354,    0,    0,    0,    0,  354,  354,  354, 
-          354,    0,    0,  354,    0,    0,    0,    0,  354,    0, 
-          567,    0,  625,  625,  625,    0,    0,  625,  625,  625, 
-            0,  625,  354,    0,    0,  354,    0,    0,  567,  625, 
-            0,  625,  625,  625,    0,    0,    0,    0,    0,    0, 
-            0,  625,  625,    0,  625,  625,  625,  625,  625,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  567,    0,    0,    0,  285,    0,    0,    0, 
-            0,    0,  625,    0,  625,    0,  285,    0,  625,  625, 
-          625,  625,  625,  625,  625,  625,  625,  625,  625,  625, 
-          625,    0,    0,    0,  567,  625,  625,  625,  625,    0, 
-            0,  625,    0,  285,  285,    0,  625,  285,  285,  285, 
-          285,  285,  392,  285,    0,    0,    0,    0,    0,    0, 
-          625,    0,    0,  625,  285,  285,  285,    0,  285,  285, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  392,    0,  285, 
-          285,  365,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  365,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          285,  285,    0,    0,    0,    0,    0,    0,  365,  365, 
-            0,    0,  365,  365,  365,  365,  365,  365,  365,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  365, 
-          365,  365,    0,  365,  365,    0,    0,    0,    0,    0, 
-            0,  567,  567,  567,    0,    0,  567,  567,  567,    0, 
-          567,    0,    0,    0,    0,    0,    0,    0,  567,    0, 
-          567,    0,  365,    0,  365,  365,    0,    0,    0,  360, 
-          567,  567,    0,  567,  567,  567,  567,  567,    0,  360, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  365,  365,    0,    0,    0, 
-            0,  567,    0,  567,    0,    0,  360,  360,    0,    0, 
-          360,  360,  360,  360,  360,  360,  360,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  360,  360,  360, 
-            0,  360,  360,    0,    0,    0,    0,    0,  285,  285, 
-          285,    0,    0,  285,  285,  285,    0,  285,    0,  567, 
-            0,    0,    0,    0,    0,  285,    0,  285,  285,  285, 
-          360,    0,  360,  360,    0,    0,    0,  285,  285,    0, 
-          285,  285,  285,  285,  285,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  360,  360,    0,    0,    0,  285,    0, 
-          285,    0,    0,    0,  285,  285,  285,  285,  285,  285, 
-          285,  285,  285,  285,  285,  285,  285,    0,    0,    0, 
-            0,  285,  285,  392,  392,    0,    0,  285,    0,    0, 
-            0,    0,  285,  365,  365,  365,    0,  303,  365,  365, 
-          365,    0,  365,    0,    0,    0,  285,  303,    0,  285, 
-          365,    0,  365,  365,  365,    0,    0,    0,    0,    0, 
-            0,    0,  365,  365,    0,  365,  365,  365,  365,  365, 
-            0,    0,    0,    0,    0,    0,    0,    0,  303,    0, 
-            0,  298,    0,    0,    0,    0,    0,  558,    0,    0, 
-            0,    0,    0,  365,    0,  365,  303,  558,    0,  365, 
-          365,  365,  365,  365,  365,  365,  365,  365,  365,  365, 
-          365,  365,    0,    0,    0,    0,  365,  365,  365,  365, 
-            0,    0,  365,    0,    0,    0,    0,  365,  558,    0, 
-            0,  360,  360,  360,    0,    0,  360,  360,  360,    0, 
-          360,  365,    0,    0,  365,    0,  558,    0,  360,    0, 
-          360,  360,  360,    0,    0,    0,    0,    0,    0,    0, 
-          360,  360,  303,  360,  360,  360,  360,  360,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          558,    0,    0,    0,    0,  673,    0,    0,    0,    0, 
-            0,  360,    0,  360,    0,  673,    0,  360,  360,  360, 
-          360,  360,  360,  360,  360,  360,  360,  360,  360,  360, 
-            0,    0,  558,    0,  360,  360,  360,  360,    0,    0, 
-          360,    0,  673,  673,    0,  360,  673,  673,  673,  673, 
-          673,  673,  673,    0,    0,    0,    0,    0,    0,  360, 
-            0,    0,  360,  673,  673,  673,    0,  673,  673,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  673,    0,  673,  673, 
-          252,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          252,    0,    0,    0,    0,    0,    0,    0,    0,  303, 
-          303,  303,    0,    0,    0,  303,  303,    0,  303,  673, 
-          673,    0,    0,    0,    0,    0,  303,  252,  252,    0, 
-            0,  252,  252,  252,  252,  252,    0,  252,  303,  303, 
-            0,  303,  303,  303,  303,    0,    0,    0,  252,  252, 
-          252,    0,  252,  252,    0,    0,    0,    0,    0,  558, 
-          558,  558,    0,    0,  558,  558,  558,    0,  558,  303, 
-            0,  303,    0,    0,    0,    0,  558,    0,  558,    0, 
-            0,    0,    0,  252,  252,    0,  253,    0,  558,  558, 
-            0,  558,  558,  558,  558,  558,  253,    0,  303,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  252,  252,    0,  303,    0,  558, 
-            0,  558,    0,  253,  253,    0,    0,  253,  253,  253, 
-          253,  253,    0,  253,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  253,  253,  253,    0,  253,  253, 
-            0,    0,    0,    0,    0,    0,    0,  673,  673,  673, 
-            0,    0,  673,  673,  673,    0,  673,  558,    0,    0, 
-            0,    0,    0,    0,  673,    0,  673,  673,  673,  253, 
-          253,    0,    0,    0,    0,    0,  673,  673,    0,  673, 
-          673,  673,  673,  673,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  577,    0, 
-          253,  253,    0,    0,    0,    0,    0,  673,  577,  673, 
-            0,    0,    0,    0,  673,  673,  673,  673,  673,  673, 
-          673,  673,  673,  673,  673,  673,    0,    0,    0,    0, 
-          673,  673,  673,  673,    0,    0,  673,  200,    0,  577, 
-            0,  673,  252,  252,  252,    0,    0,  252,  252,  252, 
-            0,  252,    0,    0,    0,  673,    0,  577,  673,  252, 
-            0,  252,  252,  252,    0,  200,    0,  200,    0,  200, 
-            0,  252,  252,  691,  252,  252,  252,  252,  252,    0, 
-            0,    0,    0,    0,    0,    0,  200,    0,  200,    0, 
-            0,  577,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  252,    0,  252,    0,    0,    0,  252,  252, 
-          252,  252,  252,  252,  252,  252,  252,  252,  252,  252, 
-          252,    0,    0,  577,    0,  252,  252,    0,    0,    0, 
-            0,  252,    0,    0,    0,    0,  252,    0,  253,  253, 
-          253,    0,    0,  253,  253,  253,    0,  253,    0,    0, 
-          252,    0,    0,  252,    0,  253,    0,  253,  253,  253, 
-            0,    0,    0,    0,    0,    0,    0,  253,  253,    0, 
-          253,  253,  253,  253,  253,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  264,    0,    0,    0,    0,    0,  253,    0, 
-          253,    0,  264,    0,  253,  253,  253,  253,  253,  253, 
-          253,  253,  253,  253,  253,  253,  253,    0,    0,    0, 
-            0,  253,  253,    0,    0,    0,    0,  253,    0,  264, 
-          264,    0,  253,  264,  264,  264,  264,  264,    0,  264, 
-            0,    0,    0,    0,    0,    0,  253,    0,    0,  253, 
-          264,  264,  264,    0,  264,  264,    0,    0,    0,    0, 
-          577,  577,  577,    0,    0,  577,  577,  577,    0,  577, 
-            0,    0,    0,    0,    0,    0,    0,  577,    0,  577, 
-            0,    0,    0,    0,    0,  264,  264,  261,    0,  577, 
-          577,    0,  577,  577,  577,  577,  577,  261,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  264,  264,    0,    0, 
-          577,    0,  577,    0,  261,  261,    0,    0,  261,  261, 
-          261,  261,  261,  200,  261,  200,  200,  200,  200,  200, 
-            0,    0,    0,    0,    0,  261,  261,  261,    0,  261, 
-          261,    0,    0,    0,    0,  200,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  577,  200, 
-            0,    0,    0,    0,    0,  691,    0,    0,    0,  200, 
-          261,  261,    0,  258,  200,  200,  200,    0,    0,    0, 
-            0,    0,    0,  258,  403,  398,    0,    0,    0,  401, 
-          399,    0,  400,    0,  402,    0,    0,    0,    0,    0, 
-            0,  261,  261,    0,    0,    0,    0,  395,    0,  394, 
-          258,  258,    0,    0,  258,  258,  258,  258,  258,    0, 
-          258,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  258,  258,  258,    0,  258,  258,    0,    0,    0, 
-            0,  397,    0,    0,  264,  264,  264,    0,    0,  264, 
-          264,  264,    0,  264,    0,    0,    0,    0,    0,    0, 
-            0,  264,    0,  264,  264,  264,  258,  258,    0,    0, 
-            0,  396,    0,  264,  264,    0,  264,  264,  264,  264, 
-          264,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  551,    0,  258,  258,    0, 
-            0,    0,    0,    0,  264,  551,  264,    0,    0,    0, 
-            0,  264,  264,  264,  264,  264,  264,  264,  264,  264, 
-          264,  264,  264,    0,    0,    0,    0,  264,  264,    0, 
-            0,    0,    0,  264,  201,    0,  551,    0,  264,  261, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,   56, 
+            0,    0,    0,    0,  687,    0,  687,    0,    0,   56, 
+          687,  687,  687,  687,  687,  687,  687,  687,  687,  687, 
+          687,  687,  687,    0,    0,    0,    0,  687,  687,  687, 
+          687,    0,  699,  687,    0,    0,    0,    0,  687,    0, 
+           56,    0,  686,  686,  686,    0,    0,  686,  686,  686, 
+            0,  686,  687,    0,    0,  687,    0,    0,   56,  686, 
+            0,  686,  686,  686,    0,    0,    0,    0,    0,    0, 
+            0,  686,  686,    0,  686,  686,  686,  686,  686,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,   56,    0,    0,    0,  689,    0,    0,    0, 
+            0,    0,  686,    0,  686,    0,  689,    0,  686,  686, 
+          686,  686,  686,  686,  686,  686,  686,  686,  686,  686, 
+          686,    0,    0,    0,   56,  686,  686,  686,  686,    0, 
+          698,  686,    0,  689,  689,    0,  686,  689,  689,  689, 
+          689,  689,  689,  689,    0,    0,    0,    0,    0,    0, 
+          686,    0,    0,  686,  689,  689,  689,  142,  689,  689, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  689,    0,  689, 
+          689,  499,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  499,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          689,  689,    0,    0,    0,    0,    0,    0,  499,  499, 
+            0,    0,  499,  499,  499,  499,  499,  499,  499,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  499, 
+          499,  499,    0,  499,  499,    0,    0,    0,    0,    0, 
+            0,   56,   56,   56,    0,    0,   56,   56,   56,    0, 
+           56,    0,    0,    0,    0,    0,    0,    0,   56,    0, 
+           56,   56,  499,    0,  499,  499,    0,    0,    0,  357, 
+           56,   56,    0,   56,   56,   56,   56,   56,    0,  357, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  499,  499,  499,    0,    0,    0, 
+            0,   56,    0,   56,    0,    0,  357,  357,    0,  798, 
+          357,  357,  357,  357,  357,  357,  357,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  357,  357,  357, 
+          154,  357,  357,    0,    0,   56,    0,    0,  689,  689, 
+          689,    0,    0,  689,  689,  689,    0,  689,    0,   56, 
+            0,    0,    0,    0,    0,  689,    0,  689,  689,  689, 
+          357,    0,  357,  357,    0,    0,    0,  689,  689,    0, 
+          689,  689,  689,  689,  689,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  357,  357,    0,    0,    0,  689,    0, 
+          689,    0,    0,    0,  689,  689,  689,  689,  689,  689, 
+          689,  689,  689,  689,  689,  689,  689,    0,    0,    0, 
+            0,  689,  689,  689,  689,    0,  701,  689,    0,    0, 
+            0,    0,  689,  499,  499,  499,    0,    0,  499,  499, 
+          499,    0,  499,    0,    0,    0,  689,    0,    0,  689, 
+          499,  499,  499,  499,  499,    0,    0,    0,    0,    0, 
+            0,    0,  499,  499,    0,  499,  499,  499,  499,  499, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   87,    0, 
+            0,    0,    0,  499,    0,  499,    0,    0,   87,  499, 
+          499,  499,  499,  499,  499,  499,  499,  499,  499,  499, 
+          499,  499,    0,    0,    0,    0,  499,  499,  499,  499, 
+            0,    0,  499,    0,    0,    0,    0,  499,    0,   87, 
+            0,  357,  357,  357,    0,    0,  357,  357,  357,    0, 
+          357,  499,    0,    0,  499,    0,    0,   87,  357,    0, 
+          357,  357,  357,    0,    0,    0,    0,    0,    0,    0, 
+          357,  357,    0,  357,  357,  357,  357,  357,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,   87,    0,    0,    0,  825,    0,    0,    0,    0, 
+            0,  357,    0,  357,    0,  825,    0,  357,  357,  357, 
+          357,  357,  357,  357,  357,  357,  357,  357,  357,  357, 
+            0,    0,    0,   87,  357,  357,  357,  357,    0,    0, 
+          357,    0,  825,  825,    0,  357,  825,  825,  825,  825, 
+          825,  825,  825,    0,    0,    0,    0,    0,    0,  357, 
+            0,    0,  357,  825,  825,  825,    0,  825,  825,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  825,    0,  825,  825, 
+          350,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          350,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  825,  825, 
+          825,    0,    0,    0,    0,    0,    0,  350,  350,    0, 
+            0,  350,  350,  350,  350,  350,  350,  350,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  350,  350, 
+          350,  156,  350,  350,    0,    0,    0,    0,    0,    0, 
+           87,   87,   87,    0,    0,   87,   87,   87,    0,   87, 
+            0,    0,    0,    0,    0,    0,    0,   87,    0,   87, 
+           87,  350,    0,  350,  350,    0,    0,    0,  358,   87, 
+           87,    0,   87,   87,   87,   87,   87,    0,  358,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  350,  350,    0,    0,    0,    0, 
+           87,    0,   87,    0,    0,  358,  358,    0,    0,  358, 
+          358,  358,  358,  358,  358,  358,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  358,  358,  358,  155, 
+          358,  358,    0,    0,    0,    0,    0,  825,  825,  825, 
+            0,    0,  825,  825,  825,    0,  825,    0,   87,    0, 
+            0,    0,    0,    0,  825,  825,  825,  825,  825,  358, 
+            0,  358,  358,    0,    0,    0,  825,  825,    0,  825, 
+          825,  825,  825,  825,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  358,  358,    0,    0,    0,  825,    0,  825, 
+            0,    0,    0,  825,  825,  825,  825,  825,  825,  825, 
+          825,  825,  825,  825,  825,  825,    0,    0,    0,    0, 
+          825,  825,  825,  825,    0,    0,  825,    0,    0,    0, 
+            0,  825,  350,  350,  350,    0,    0,  350,  350,  350, 
+            0,  350,    0,    0,    0,  825,    0,    0,  825,  350, 
+            0,  350,  350,  350,    0,    0,    0,    0,    0,    0, 
+            0,  350,  350,    0,  350,  350,  350,  350,  350,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,   91,    0,    0, 
+            0,    0,  350,    0,  350,    0,    0,   91,  350,  350, 
+          350,  350,  350,  350,  350,  350,  350,  350,  350,  350, 
+          350,    0,    0,    0,    0,  350,  350,  350,  350,    0, 
+            0,  350,    0,    0,    0,    0,  350,    0,   91,    0, 
+          358,  358,  358,    0,    0,  358,  358,  358,    0,  358, 
+          350,    0,    0,  350,    0,    0,   91,  358,    0,  358, 
+          358,  358,    0,    0,    0,    0,    0,    0,    0,  358, 
+          358,    0,  358,  358,  358,  358,  358,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           91,    0,    0,    0,  629,    0,    0,    0,    0,    0, 
+          358,    0,  358,    0,  629,    0,  358,  358,  358,  358, 
+          358,  358,  358,  358,  358,  358,  358,  358,  358,    0, 
+            0,    0,   91,  358,  358,  358,  358,    0,    0,  358, 
+            0,  629,  629,    0,  358,  629,  629,  629,  629,  629, 
+          629,  629,    0,    0,    0,    0,    0,    0,  358,    0, 
+            0,  358,  629,  629,  629,    0,  629,  629,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  629,    0,  629,  629,  287, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  287, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  629,  629, 
+            0,    0,    0,    0,    0,    0,  287,  287,    0,    0, 
+          287,  287,  287,  287,  287,  396,  287,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  287,  287,  287, 
+            0,  287,  287,    0,    0,    0,    0,    0,    0,   91, 
+           91,   91,    0,    0,   91,   91,   91,    0,   91,    0, 
+            0,    0,    0,    0,    0,    0,   91,    0,   91,   91, 
+          396,    0,  287,  287,    0,    0,    0,  369,   91,   91, 
+            0,   91,   91,   91,   91,   91,    0,  369,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  287,  287,    0,    0,    0,    0,   91, 
+            0,   91,    0,    0,  369,  369,    0,    0,  369,  369, 
+          369,  369,  369,  369,  369,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  369,  369,  369,    0,  369, 
+          369,    0,    0,    0,    0,    0,  629,  629,  629,    0, 
+            0,  629,  629,  629,    0,  629,    0,   91,    0,    0, 
+            0,    0,    0,  629,    0,  629,  629,  629,  369,    0, 
+          369,  369,    0,    0,    0,  629,  629,    0,  629,  629, 
+          629,  629,  629,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  369,  369,    0,    0,    0,  629,    0,  629,    0, 
+            0,    0,  629,  629,  629,  629,  629,  629,  629,  629, 
+          629,  629,  629,  629,  629,    0,    0,    0,    0,  629, 
+          629,  629,  629,    0,    0,  629,    0,    0,    0,    0, 
+          629,  287,  287,  287,    0,  340,  287,  287,  287,    0, 
+          287,    0,    0,    0,  629,  340,    0,  629,  287,    0, 
+          287,  287,  287,    0,    0,    0,    0,    0,    0,    0, 
+          287,  287,    0,  287,  287,  287,  287,  287,    0,    0, 
+            0,    0,    0,    0,    0,    0,  340,    0,    0,  334, 
+            0,    0,    0,    0,    0,   89,    0,    0,    0,    0, 
+            0,  287,    0,  287,  340,   89,    0,  287,  287,  287, 
+          287,  287,  287,  287,  287,  287,  287,  287,  287,  287, 
+            0,    0,    0,    0,  287,  287,  396,  396,    0,    0, 
+          287,    0,    0,    0,    0,  287,   89,    0,    0,  369, 
+          369,  369,    0,    0,  369,  369,  369,    0,  369,  287, 
+            0,    0,  287,    0,   89,    0,  369,    0,  369,  369, 
+          369,    0,    0,    0,    0,    0,    0,    0,  369,  369, 
+          340,  369,  369,  369,  369,  369,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   89,    0, 
+            0,    0,    0,  364,    0,    0,    0,    0,    0,  369, 
+            0,  369,    0,  364,    0,  369,  369,  369,  369,  369, 
+          369,  369,  369,  369,  369,  369,  369,  369,    0,    0, 
+           89,    0,  369,  369,  369,  369,    0,    0,  369,    0, 
+          364,  364,    0,  369,  364,  364,  364,  364,  364,  364, 
+          364,    0,    0,    0,    0,    0,    0,  369,    0,    0, 
+          369,  364,  364,  364,    0,  364,  364,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  364,    0,  364,  364,  677,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  677,    0, 
+            0,    0,    0,    0,    0,    0,    0,  340,  340,  340, 
+            0,    0,  340,  340,  340,    0,  340,  364,  364,    0, 
+            0,    0,    0,    0,  340,  677,  677,    0,    0,  677, 
+          677,  677,  677,  677,  677,  677,    0,    0,    0,  340, 
+          340,  340,  340,  340,    0,    0,  677,  677,  677,    0, 
+          677,  677,    0,    0,    0,    0,    0,   89,   89,   89, 
+            0,    0,   89,   89,   89,    0,   89,  340,    0,  340, 
+            0,    0,    0,    0,   89,    0,   89,   89,    0,  677, 
+            0,  677,  677,    0,  255,    0,   89,   89,    0,   89, 
+           89,   89,   89,   89,  255,    0,  340,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  677,  677,    0,  340,    0,   89,    0,   89, 
+            0,  255,  255,    0,    0,  255,  255,  255,  255,  255, 
+            0,  255,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  255,  255,  255,    0,  255,  255,    0,    0, 
+            0,    0,    0,    0,    0,  364,  364,  364,    0,    0, 
+          364,  364,  364,    0,  364,   89,    0,    0,    0,    0, 
+            0,    0,  364,    0,  364,  364,  364,  255,  255,    0, 
+            0,    0,    0,    0,  364,  364,    0,  364,  364,  364, 
+          364,  364,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  318,    0,  255,  255, 
+            0,    0,    0,    0,    0,  364,  318,  364,    0,    0, 
+            0,  364,  364,  364,  364,  364,  364,  364,  364,  364, 
+          364,  364,  364,  364,    0,    0,    0,    0,  364,  364, 
+          364,  364,    0,    0,  364,  202,    0,  318,    0,  364, 
+          677,  677,  677,    0,    0,  677,  677,  677,    0,  677, 
+            0,    0,    0,  364,    0,  318,  364,  677,    0,  677, 
+          677,  677,    0,  202,    0,  202,    0,  202,    0,  677, 
+          677,  695,  677,  677,  677,  677,  677,    0,    0,    0, 
+            0,    0,    0,    0,  202,    0,  202,    0,    0,  318, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          677,    0,  677,    0,    0,    0,    0,  677,  677,  677, 
+          677,  677,  677,  677,  677,  677,  677,  677,  677,    0, 
+            0,  318,    0,  677,  677,  677,  677,    0,    0,  677, 
+            0,    0,    0,    0,  677,    0,  255,  255,  255,    0, 
+            0,  255,  255,  255,    0,  255,    0,    0,  677,    0, 
+            0,  677,    0,  255,    0,  255,  255,  255,    0,    0, 
+            0,    0,    0,    0,    0,  255,  255,    0,  255,  255, 
+          255,  255,  255,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          266,    0,    0,    0,    0,    0,  255,    0,  255,    0, 
+          266,    0,  255,  255,  255,  255,  255,  255,  255,  255, 
+          255,  255,  255,  255,  255,    0,    0,    0,    0,  255, 
+          255,    0,    0,    0,    0,  255,    0,  266,  266,    0, 
+          255,  266,  266,  266,  266,  266,    0,  266,    0,    0, 
+            0,    0,    0,    0,  255,    0,    0,  255,  266,  266, 
+          266,    0,  266,  266,    0,    0,    0,    0,  318,  318, 
+          318,    0,    0,  318,  318,  318,    0,  318,    0,    0, 
+            0,    0,    0,    0,    0,  318,    0,  318,  318,    0, 
+            0,    0,    0,  266,  266,  263,    0,  318,  318,    0, 
+          318,  318,  318,  318,    0,  263,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  266,  266,    0,    0,  318,    0, 
+          318,    0,  263,  263,    0,    0,  263,  263,  263,  263, 
+          263,  202,  263,  202,  202,  202,  202,  202,    0,    0, 
+            0,    0,    0,  263,  263,  263,    0,  263,  263,    0, 
+            0,    0,  318,  202,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  318,  202,    0,    0, 
+            0,    0,    0,  695,    0,    0,    0,  202,  263,  263, 
+            0,  260,  202,  202,  202,    0,    0,    0,    0,    0, 
+            0,  260,  405,  400,    0,    0,    0,  403,  401,    0, 
+          402,    0,  404,    0,    0,    0,    0,    0,    0,  263, 
+          263,    0,    0,    0,    0,  397,    0,  396,  260,  260, 
+            0,    0,  260,  260,  260,  260,  260,    0,  260,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  260, 
+          260,  260,    0,  260,  260,    0,    0,    0,    0,  399, 
+            0,    0,  266,  266,  266,    0,    0,  266,  266,  266, 
+            0,  266,    0,    0,    0,    0,    0,    0,    0,  266, 
+            0,  266,  266,  266,  260,  260,    0,    0,    0,  398, 
+            0,  266,  266,    0,  266,  266,  266,  266,  266,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  319,    0,  260,  260,    0,    0,    0, 
+            0,    0,  266,  319,  266,    0,    0,    0,    0,  266, 
+          266,  266,  266,  266,  266,  266,  266,  266,  266,  266, 
+          266,    0,    0,    0,    0,  266,  266,    0,    0,    0, 
+            0,  266,  203,    0,  319,    0,  266,  263,  263,  263, 
+            0,    0,  263,  263,  263,    0,  263,    0,    0,    0, 
+          266,    0,  319,  266,  263,    0,  263,  263,  263,    0, 
+          203,    0,  203,    0,  203,    0,  263,  263,  694,  263, 
+          263,  263,  263,  263,    0,    0,    0,    0,    0,    0, 
+            0,  203,    0,  203,    0,    0,  319,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  263,    0,  263, 
+            0,    0,    0,    0,  263,  263,  263,  263,  263,  263, 
+          263,  263,  263,  263,  263,  263,    0,    0,  319,    0, 
+          263,  263,    0,    0,    0,    0,  263,    0,    0,    0, 
+            0,  263,    0,  260,  260,  260,    0,    0,  260,  260, 
+          260,    0,  260,    0,    0,  263,    0,    0,  263,    0, 
+          260,    0,  260,  260,  260,    0,    0,    0,    0,    0, 
+            0,    0,  260,  260,    0,  260,  260,  260,  260,  260, 
+            0,    0,    0,  379,  380,  381,  382,  383,  384,  385, 
+          386,    0,  388,  389,    0,    0,    0,  261,    0,    0, 
+          392,  393,    0,  260,    0,  260,    0,  261,    0,    0, 
+          260,  260,  260,  260,  260,  260,  260,  260,  260,  260, 
+          260,  260,    0,    0,    0,    0,  260,  260,    0,    0, 
+            0,    0,  260,    0,  261,  261,    0,  260,  261,  261, 
+          261,  261,  261,    0,  261,    0,    0,    0,    0,    0, 
+            0,  260,    0,    0,  260,  261,  261,  261,    0,  261, 
+          261,    0,    0,    0,    0,  319,  319,  319,    0,    0, 
+          319,  319,  319,    0,  319,    0,    0,    0,    0,    0, 
+            0,    0,  319,    0,  319,  319,    0,    0,    0,    0, 
+          261,  261,  262,    0,  319,  319,    0,  319,  319,  319, 
+          319,    0,  262,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  261,  261,    0,    0,  319,    0,  319,    0,  262, 
+          262,    0,    0,  262,  262,  262,  262,  262,  203,  262, 
+          203,  203,  203,  203,  203,    0,    0,    0,    0,    0, 
+          262,  262,  262,    0,  262,  262,    0,    0,    0,  319, 
+          203,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  319,  203,    0,    0,    0,    0,    0, 
+          694,    0,    0,    0,  203,  262,  262,    0,  264,  203, 
+          203,  203,    0,    0,    0,    0,    0,    0,  264,  405, 
+          400,    0,    0,    0,  403,  401,    0,  402,    0,  404, 
+            0,    0,    0,    0,    0,    0,  262,  262,    0,    0, 
+            0,    0,  397,    0,  396,  264,  264,    0,    0,  264, 
+          264,  264,  264,  264,    0,  264,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  264,  264,  264,    0, 
+          264,  264,    0,    0,    0,    0,  399,    0,    0,  261, 
           261,  261,    0,    0,  261,  261,  261,    0,  261,    0, 
-            0,    0,  264,    0,  551,  264,  261,    0,  261,  261, 
-          261,    0,  201,    0,  201,    0,  201,    0,  261,  261, 
-          690,  261,  261,  261,  261,  261,    0,    0,    0,    0, 
-            0,    0,    0,  201,    0,  201,    0,    0,  551,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  261, 
-            0,  261,    0,    0,    0,    0,  261,  261,  261,  261, 
+            0,    0,    0,    0,    0,    0,  261,    0,  261,  261, 
+          261,  264,  264,    0,    0,    0,  398,    0,  261,  261, 
+            0,  261,  261,  261,  261,  261,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           57,    0,  264,  264,    0,    0,    0,    0,    0,  261, 
+           57,  261,    0,    0,    0,    0,  261,  261,  261,  261, 
           261,  261,  261,  261,  261,  261,  261,  261,    0,    0, 
-          551,    0,  261,  261,    0,    0,    0,    0,  261,    0, 
-            0,    0,    0,  261,    0,  258,  258,  258,    0,    0, 
-          258,  258,  258,    0,  258,    0,    0,  261,    0,    0, 
-          261,    0,  258,    0,  258,  258,  258,    0,    0,    0, 
-            0,    0,    0,    0,  258,  258,    0,  258,  258,  258, 
-          258,  258,    0,    0,    0,  377,  378,  379,  380,  381, 
-          382,  383,  384,  385,  386,  387,    0,    0,    0,  259, 
-            0,    0,  390,  391,    0,  258,    0,  258,    0,  259, 
-            0,    0,  258,  258,  258,  258,  258,  258,  258,  258, 
-          258,  258,  258,  258,    0,    0,    0,    0,  258,  258, 
-            0,    0,    0,    0,  258,    0,  259,  259,    0,  258, 
-          259,  259,  259,  259,  259,    0,  259,    0,    0,    0, 
-            0,    0,    0,  258,    0,    0,  258,  259,  259,  259, 
-            0,  259,  259,    0,    0,    0,    0,  551,  551,  551, 
-            0,    0,  551,  551,  551,    0,  551,    0,    0,    0, 
-            0,    0,    0,    0,  551,    0,  551,    0,    0,    0, 
-            0,    0,  259,  259,  260,    0,  551,  551,    0,  551, 
-          551,  551,  551,  551,  260,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  259,  259,    0,    0,  551,    0,  551, 
-            0,  260,  260,    0,    0,  260,  260,  260,  260,  260, 
-          201,  260,  201,  201,  201,  201,  201,    0,    0,    0, 
-            0,    0,  260,  260,  260,    0,  260,  260,    0,    0, 
-            0,    0,  201,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  551,  201,    0,    0,    0, 
-            0,    0,  690,    0,    0,    0,  201,  260,  260,    0, 
-          262,  201,  201,  201,    0,    0,    0,    0,    0,    0, 
-          262,  403,  398,    0,    0,    0,  401,  399,    0,  400, 
-            0,  402,    0,    0,    0,    0,    0,    0,  260,  260, 
-            0,    0,    0,    0,  395,    0,  394,  262,  262,    0, 
-            0,  262,  262,  262,  262,  262,    0,  262,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  262,  262, 
-          262,    0,  262,  262,    0,    0,    0,    0,  397,    0, 
-            0,  259,  259,  259,    0,    0,  259,  259,  259,    0, 
-          259,    0,    0,    0,    0,    0,    0,    0,  259,    0, 
-          259,  259,  259,  262,  262,    0,    0,    0,  396,    0, 
+            0,    0,  261,  261,    0,    0,    0,    0,  261,  204, 
+            0,   57,    0,  261,  262,  262,  262,    0,    0,  262, 
+          262,  262,    0,  262,    0,    0,    0,  261,    0,   57, 
+          261,  262,    0,  262,  262,  262,    0,  204,    0,  204, 
+            0,  204,    0,  262,  262,  696,  262,  262,  262,  262, 
+          262,    0,    0,    0,    0,    0,    0,    0,  204,    0, 
+          204,    0,    0,   57,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  262,    0,  262,    0,    0,    0, 
+            0,  262,  262,  262,  262,  262,  262,  262,  262,  262, 
+          262,  262,  262,    0,    0,   57,    0,  262,  262,    0, 
+            0,    0,    0,  262,    0,    0,    0,    0,  262,    0, 
+          264,  264,  264,    0,    0,  264,  264,  264,    0,  264, 
+            0,    0,  262,    0,    0,  262,    0,  264,    0,  264, 
+          264,  264,    0,    0,    0,    0,    0,    0,    0,  264, 
+          264,    0,  264,  264,  264,  264,  264,    0,    0,    0, 
+          379,  380,  381,  382,  383,  384,  385,    0,    0,  388, 
+          389,    0,    0,    0,  284,    0,    0,  392,  393,    0, 
+          264,    0,  264,    0,  284,    0,    0,  264,  264,  264, 
+          264,  264,  264,  264,  264,  264,  264,  264,  264,    0, 
+            0,    0,    0,  264,  264,    0,    0,    0,    0,  264, 
+            0,  284,  284,    0,  264,  284,  284,  284,  284,  284, 
+            0,  284,    0,    0,    0,    0,    0,    0,  264,    0, 
+            0,  264,  284,  284,  284,    0,  284,  284,    0,    0, 
+            0,    0,   57,   57,   57,    0,    0,   57,   57,   57, 
+            0,   57,    0,    0,    0,    0,    0,    0,    0,   57, 
+            0,   57,   57,    0,    0,    0,    0,  284,  284,  285, 
+            0,   57,   57,    0,   57,   57,   57,   57,    0,  285, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  284,  284, 
+            0,    0,   57,    0,   57,    0,  285,  285,    0,    0, 
+          285,  285,  285,  285,  285,  204,  285,  204,  204,  204, 
+          204,  204,    0,    0,    0,    0,    0,  285,  285,  285, 
+            0,  285,  285,    0,    0,    0,   57,  204,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           57,  204,    0,    0,    0,    0,    0,  696,    0,    0, 
+            0,  204,  285,  285,    0,  290,  204,  204,  204,    0, 
+            0,    0,    0,    0,    0,  290,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  285,  285,    0,    0,    0,    0,    0, 
+            0,    0,  290,  290,    0,    0,  290,  290,  290,  290, 
+          290,    0,  290,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  290,  290,  290,    0,  290,  290,    0, 
+            0,    0,    0,    0,    0,    0,  284,  284,  284,    0, 
+            0,  284,  284,  284,    0,  284,    0,    0,    0,    0, 
+            0,    0,    0,  284,    0,  284,  284,  284,  290,  290, 
+            0,    0,    0,    0,    0,  284,  284,    0,  284,  284, 
+          284,  284,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,   30,    0,  290, 
+          290,    0,    0,    0,    0,    0,  284,   30,  284,    0, 
+            0,    0,  284,  284,  284,  284,  284,  284,  284,  284, 
+          284,  284,  284,  284,  284,    0,    0,    0,    0,  284, 
+          284,    0,    0,    0,    0,  284,    0,    0,   30,    0, 
+          284,  285,  285,  285,    0,    0,  285,  285,  285,    0, 
+          285,  162,    0,    0,  284,    0,   30,  284,  285,    0, 
+          285,  285,  285,    0,    0,    0,    0,    0,    0,    0, 
+          285,  285,    0,  285,  285,  285,  285,    0,    0,  162, 
+            0,  162,    0,  162,    0,    0,    0,  685,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          162,  285,  162,  285,    0,    0,    0,  285,  285,  285, 
+          285,  285,  285,  285,  285,  285,  285,  285,  285,  285, 
+            0,    0,   30,    0,  285,  285,    0,    0,    0,    0, 
+          285,    0,    0,    0,    0,  285,    0,  290,  290,  290, 
+            0,    0,  290,  290,  290,    0,  290,    0,    0,  285, 
+            0,    0,  285,    0,  290,    0,  290,  290,  290,    0, 
+            0,    0,    0,    0,    0,    0,  290,  290,    0,  290, 
+          290,  290,  290,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  258,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  258,    0,    0,  290,    0,  290, 
+            0,    0,    0,  290,  290,  290,  290,  290,  290,  290, 
+          290,  290,  290,  290,  290,  290,    0,    0,    0,    0, 
+          290,  290,  258,    0,    0,  258,  290,  258,  258,  258, 
+            0,  290,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  258,  258,  258,  290,  258,  258,  290,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,   30, 
+           30,   30,    0,    0,    0,   30,   30,    0,   30,    0, 
+            0,    0,    0,    0,    0,    0,   30,  258,  258,  259, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  259, 
+            0,   30,   30,   30,   30,   30,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  258,  258, 
+            0,    0,    0,    0,    0,    0,    0,  259,    0,   30, 
+          259,   30,  259,  259,  259,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  259,  259,  259, 
+            0,  259,  259,    0,    0,    0,    0,  162,    0,  162, 
+          162,  162,  162,  162,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,   30,    0,  162, 
+            0,    0,  259,  259,    0,  279,    0,    0,    0,    0, 
+            0,    0,    0,  162,    0,  279,    0,    0,    0,  685, 
+            0,    0,    0,  162,    0,    0,    0,    0,  162,  162, 
+          162,    0,    0,  259,  259,    0,    0,    0,    0,    0, 
+            0,    0,    0,  279,    0,    0,  279,    0,    0,  279, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  279,  279,  279,    0,  279,  279,    0, 
+            0,    0,    0,    0,    0,    0,  258,  258,  258,    0, 
+            0,  258,  258,  258,    0,  258,    0,    0,    0,    0, 
+            0,    0,    0,  258,    0,  258,  258,  258,  279,  279, 
+            0,    0,    0,    0,    0,  258,  258,    0,  258,  258, 
+          258,  258,  258,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  279, 
+          279,    0,    0,    0,    0,    0,  258,    0,  258,    0, 
+            0,    0,    0,  258,  258,  258,  258,  258,  258,  258, 
+          258,  258,  258,  258,  258,    0,   54,    0,    0,  258, 
+          258,    0,    0,    0,    0,  258,   54,    0,    0,    0, 
+          258,  259,  259,  259,    0,    0,  259,  259,  259,    0, 
+          259,    0,    0,    0,  258,    0,    0,  258,  259,    0, 
+          259,  259,  259,    0,    0,    0,    0,   54,    0,    0, 
           259,  259,    0,  259,  259,  259,  259,  259,    0,    0, 
+            0,    0,    0,    0,    0,   54,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  568,    0,  262,  262,    0,    0,    0,    0, 
-            0,  259,  568,  259,    0,    0,    0,    0,  259,  259, 
+            0,  259,    0,  259,    0,    0,    0,    0,  259,  259, 
           259,  259,  259,  259,  259,  259,  259,  259,  259,  259, 
             0,    0,    0,    0,  259,  259,    0,    0,    0,    0, 
-          259,  202,    0,  568,    0,  259,  260,  260,  260,    0, 
-            0,  260,  260,  260,    0,  260,    0,    0,    0,  259, 
-            0,  568,  259,  260,    0,  260,  260,  260,    0,  202, 
-            0,  202,    0,  202,    0,  260,  260,  692,  260,  260, 
-          260,  260,  260,    0,    0,    0,    0,    0,    0,    0, 
-          202,    0,  202,    0,    0,  568,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  260,    0,  260,    0, 
-            0,    0,    0,  260,  260,  260,  260,  260,  260,  260, 
-          260,  260,  260,  260,  260,    0,    0,  568,    0,  260, 
-          260,    0,    0,    0,    0,  260,    0,    0,    0,    0, 
-          260,    0,  262,  262,  262,    0,    0,  262,  262,  262, 
-            0,  262,    0,    0,  260,    0,    0,  260,    0,  262, 
-            0,  262,  262,  262,    0,    0,    0,    0,    0,    0, 
-            0,  262,  262,    0,  262,  262,  262,  262,  262,    0, 
-            0,    0,  377,  378,  379,  380,  381,  382,  383,  384, 
-            0,  386,  387,    0,    0,    0,  283,    0,    0,  390, 
-          391,    0,  262,    0,  262,    0,  283,    0,    0,  262, 
-          262,  262,  262,  262,  262,  262,  262,  262,  262,  262, 
-          262,    0,    0,    0,    0,  262,  262,    0,    0,    0, 
-            0,  262,    0,  283,  283,    0,  262,  283,  283,  283, 
-          283,  283,    0,  283,    0,    0,    0,    0,    0,    0, 
-          262,    0,    0,  262,  283,  283,  283,    0,  283,  283, 
-            0,    0,    0,    0,  568,  568,  568,    0,    0,  568, 
-          568,  568,    0,  568,    0,    0,    0,    0,    0,    0, 
-            0,  568,    0,  568,    0,    0,    0,    0,    0,  283, 
-          283,  284,    0,  568,  568,    0,  568,  568,  568,  568, 
-          568,  284,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          283,  283,    0,    0,  568,    0,  568,    0,  284,  284, 
-            0,    0,  284,  284,  284,  284,  284,  202,  284,  202, 
-          202,  202,  202,  202,    0,    0,    0,    0,    0,  284, 
-          284,  284,    0,  284,  284,    0,    0,    0,    0,  202, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  568,  202,    0,    0,    0,    0,    0,  692, 
-            0,    0,    0,  202,  284,  284,    0,  288,  202,  202, 
-          202,    0,    0,    0,    0,    0,    0,  288,  403,  398, 
-            0,    0,    0,  401,  399,    0,  400,    0,  402,    0, 
-            0,    0,    0,    0,    0,  284,  284,    0,    0,    0, 
-            0,  395,    0,  394,  288,  288,    0,    0,  288,  288, 
-          288,  288,  288,    0,  288,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  288,  288,  288,    0,  288, 
-          288,    0,    0,    0,    0,  397,    0,    0,  283,  283, 
-          283,    0,    0,  283,  283,  283,    0,  283,    0,    0, 
-            0,    0,    0,    0,    0,  283,    0,  283,  283,  283, 
-          288,  288,    0,    0,    0,  396,    0,  283,  283,    0, 
-          283,  283,  283,  283,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  552, 
-            0,  288,  288,    0,    0,    0,    0,    0,  283,  552, 
-          283,    0,    0,    0,  283,  283,  283,  283,  283,  283, 
-          283,  283,  283,  283,  283,  283,  283,    0,    0,    0, 
-            0,  283,  283,    0,    0,    0,    0,  283,    0,    0, 
-          552,  335,  283,  284,  284,  284,    0,    0,  284,  284, 
-          284,  335,  284,    0,    0,    0,  283,    0,  552,  283, 
-          284,    0,  284,  284,  284,    0,    0,    0,    0,    0, 
-            0,    0,  284,  284,    0,  284,  284,  284,  284,    0, 
-            0,    0,  335,    0,    0,  330,    0,    0,    0,    0, 
-            0,    0,  552,    0,    0,    0,    0,    0,    0,    0, 
-          335,    0,    0,  284,    0,  284,    0,    0,    0,  284, 
-          284,  284,  284,  284,  284,  284,  284,  284,  284,  284, 
-          284,  284,    0,    0,  552,    0,  284,  284,    0,    0, 
-            0,    0,  284,    0,    0,    0,    0,  284,    0,  288, 
-          288,  288,    0,    0,  288,  288,  288,    0,  288,    0, 
-            0,  284,    0,    0,  284,    0,  288,    0,  288,  288, 
-          288,    0,    0,    0,    0,    0,  335,    0,  288,  288, 
-            0,  288,  288,  288,  288,    0,    0,    0,    0,  377, 
-          378,  379,  380,  381,  382,  383,    0,    0,  386,  387, 
-            0,    0,    0,  269,    0,    0,  390,  391,    0,  288, 
-            0,  288,    0,  269,    0,  288,  288,  288,  288,  288, 
-          288,  288,  288,  288,  288,  288,  288,  288,    0,    0, 
-            0,    0,  288,  288,    0,    0,    0,    0,  288,    0, 
-          269,  269,    0,  288,  269,  269,  269,  269,  269,    0, 
-          269,    0,    0,    0,    0,    0,    0,  288,    0,    0, 
-          288,  269,  269,    0,    0,    0,  269,    0,    0,    0, 
-            0,  552,  552,  552,    0,    0,  552,  552,  552,    0, 
-          552,    0,    0,    0,    0,    0,    0,    0,  552,    0, 
-          552,    0,    0,    0,    0,    0,  269,  269,  256,    0, 
-          552,  552,    0,  552,  552,  552,  552,  552,  256,    0, 
-            0,    0,    0,  335,  335,  335,    0,    0,  335,  335, 
-          335,    0,  335,    0,    0,    0,    0,  269,  269,    0, 
-          335,  552,    0,  552,    0,    0,  256,    0,    0,  256, 
-            0,  256,  256,  256,    0,  335,  335,  335,  335,  335, 
-            0,    0,    0,    0,    0,    0,  256,  256,  256,    0, 
-          256,  256,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  335,    0,  335,    0,    0,    0,  552, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  256,  256,    0,  257,    0,    0,    0,    0,    0, 
-            0,    0,  335,    0,  257,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  335,  256,  256,    0,    0,    0,    0,    0,    0, 
-            0,    0,  257,    0,    0,  257,    0,  257,  257,  257, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  257,  257,  257,    0,  257,  257,    0,    0, 
-            0,    0,    0,    0,    0,  269,  269,  269,    0,    0, 
-          269,  269,  269,    0,  269,    0,    0,    0,    0,    0, 
-            0,    0,  269,    0,  269,  269,  269,  257,  257,    0, 
-            0,    0,    0,    0,  269,  269,    0,  269,  269,  269, 
-          269,  269,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  257,  257, 
+          259,    0,    0,    0,    0,  259,    0,  279,  279,  279, 
+            0,    0,  279,  279,  279,    0,  279,    0,    0,  259, 
+            0,   54,  259,    0,  279,    0,  279,  279,  279,    0, 
+            0,    0,    0,    0,    0,    0,  279,  279,    0,  279, 
+          279,  279,  279,  279,    0,    0,    0,    0,  280,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  280,    0, 
+            0,    0,    0,    0,    0,    0,    0,  279,    0,  279, 
+            0,    0,    0,    0,  279,  279,  279,  279,  279,  279, 
+          279,  279,  279,  279,  279,  279,  280,    0,    0,  280, 
+          279,  279,  280,    0,    0,    0,  279,    0,    0,    0, 
+            0,  279,    0,    0,    0,    0,  280,  280,  280,    0, 
+          280,  280,    0,    0,    0,  279,    0,    0,  279,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  280,  280,  269,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  269,    0,    0,    0,    0,   54,   54, 
+           54,    0,    0,    0,   54,   54,    0,   54,    0,    0, 
+            0,    0,  280,  280,    0,   54,    0,    0,    0,    0, 
+            0,  269,    0,    0,  269,    0,    0,  269,    0,    0, 
+           54,   54,   54,   54,    0,    0,    0,    0,    0,    0, 
+            0,  269,  269,  269,    0,  269,  269,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   54,    0, 
+           54,    0,    0,    0,    0,    0,    0,    0,    0,  267, 
+            0,    0,    0,    0,    0,    0,  269,  269,    0,  267, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   54,  269,  269,    0, 
+          267,    0,    0,  267,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  267,  267,  267, 
+            0,  267,  267,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          280,  280,  280,    0,    0,  280,  280,  280,    0,  280, 
+            0,    0,  267,  267,    0,    0,    0,  280,    0,  280, 
+          280,  280,    0,    0,    0,    0,    0,    0,    0,  280, 
+          280,    0,  280,  280,  280,  280,  280,    0,    0,    0, 
+            0,    0,    0,  267,  267,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          280,    0,  280,    0,    0,    0,    0,  280,  280,  280, 
+          280,  280,  280,  280,  280,  280,  280,  280,  280,    0, 
+            0,    0,    0,  280,  280,    0,    0,    0,    0,  280, 
+          163,    0,    0,    0,  280,  269,  269,  269,    0,    0, 
+          269,  269,  269,    0,  269,    0,    0,    0,  280,    0, 
+            0,  280,  269,    0,  269,  269,  269,    0,  163,    0, 
+          163,    0,  163,    0,  269,  269,  688,  269,  269,  269, 
+          269,  269,    0,    0,    0,    0,    0,    0,    0,  163, 
+            0,  163,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,  269,    0,  269,    0,    0, 
-            0,  269,  269,  269,  269,  269,    0,    0,  269,  269, 
-          269,  269,  269,  269,    0,   42,    0,    0,  269,  269, 
-            0,    0,    0,    0,  269,   42,    0,    0,    0,  269, 
-          256,  256,  256,    0,    0,  256,  256,  256,    0,  256, 
-            0,    0,    0,  269,    0,    0,  269,  256,    0,  256, 
-          256,  256,    0,    0,    0,    0,   42,    0,    0,  256, 
-          256,    0,  256,  256,  256,  256,  256,    0,    0,    0, 
-            0,    0,    0,    0,   42,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          256,    0,  256,    0,    0,    0,    0,  256,  256,  256, 
-          256,  256,  256,  256,  256,  256,  256,  256,  256,    0, 
-            0,    0,    0,  256,  256,    0,    0,    0,    0,  256, 
-            0,    0,    0,    0,  256,    0,  257,  257,  257,    0, 
-            0,  257,  257,  257,    0,  257,    0,    0,  256,    0, 
-           42,  256,    0,  257,    0,  257,  257,  257,    0,    0, 
-            0,    0,    0,    0,    0,  257,  257,    0,  257,  257, 
-          257,  257,  257,    0,    0,    0,    0,  277,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  277,    0,    0, 
-            0,    0,    0,    0,    0,    0,  257,    0,  257,    0, 
-            0,    0,    0,  257,  257,  257,  257,  257,  257,  257, 
-          257,  257,  257,  257,  257,  277,    0,    0,  277,  257, 
-          257,  277,    0,    0,    0,  257,    0,    0,    0,    0, 
-          257,    0,    0,    0,    0,  277,  277,  277,    0,  277, 
-          277,    0,    0,    0,  257,    0,    0,  257,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          277,  277,  278,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  278,    0,    0,    0,    0,   42,   42,   42, 
-            0,    0,    0,   42,   42,    0,   42,    0,    0,    0, 
-            0,  277,  277,    0,   42,    0,    0,    0,    0,    0, 
-          278,    0,    0,  278,    0,    0,  278,    0,    0,   42, 
-           42,   42,   42,   42,    0,    0,    0,    0,    0,    0, 
-          278,  278,  278,    0,  278,  278,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   42,    0,   42, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  278,  278,    0,  267,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  267,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   42,  278,  278,    0,    0, 
-            0,    0,    0,    0,    0,    0,  267,    0,    0,  267, 
+            0,    0,  269,  269,  269,  269,  269,  269,  269,  269, 
+          269,  269,  269,  269,    0,    0,    0,    0,    0,    0, 
+            0,  267,  267,  267,  269,    0,  267,  267,  267,  269, 
+          267,    0,    0,    0,    0,    0,    0,    0,  267,    0, 
+          267,  267,  267,  269,    0,    0,  269,    0,    0,    0, 
+          267,  267,    0,  267,  267,  267,  267,  267,    0,  268, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  268, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  267,    0,  267,    0,    0,    0,    0,  267,  267, 
+          267,  267,  267,  267,  267,  267,  267,  267,  267,  267, 
+          268,    0,    0,  268,    0,    0,    0,    0,    0,    0, 
+          267,    0,    0,    0,    0,  267,    0,  268,  268,  268, 
+            0,  268,  268,    0,    0,    0,    0,    0,    0,  267, 
             0,    0,  267,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  267,  267,  267,    0, 
-          267,  267,    0,    0,    0,    0,    0,    0,    0,  277, 
-          277,  277,    0,    0,  277,  277,  277,    0,  277,    0, 
-            0,    0,    0,    0,    0,    0,  277,    0,  277,  277, 
-          277,  267,  267,    0,    0,    0,    0,    0,  277,  277, 
-            0,  277,  277,  277,  277,  277,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  267,  267,    0,    0,    0,    0,    0,  277, 
-            0,  277,    0,    0,    0,    0,  277,  277,  277,  277, 
-          277,  277,  277,  277,  277,  277,  277,  277,    0,    0, 
-            0,    0,  277,  277,    0,    0,    0,    0,  277,    0, 
-          252,    0,    0,  277,  278,  278,  278,    0,    0,  278, 
-          278,  278,    0,  278,    0,    0,    0,  277,    0,    0, 
-          277,  278,    0,  278,  278,  278,    0,    0,    0,    0, 
-            0,    0,    0,  278,  278,    0,  278,  278,  278,  278, 
-          278,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  278,    0,  278,    0,    0,    0, 
-            0,  278,  278,  278,  278,  278,  278,  278,  278,  278, 
-          278,  278,  278,    0, 1098,    0,    0,  278,  278,    0, 
-            0,    0,    0,  278,    0,    0,    0,    0,  278,    0, 
-          267,  267,  267,    0,    0,  267,  267,  267,    0,  267, 
-            0,    0,  278,    0,    0,  278,    0,  267,    0,  267, 
-          267,  267,    0,    0,    0,    0,    0,    0,    0,  267, 
-          267,    0,  267,  267,  267,  267,  267,    0,  265,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  265,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          267,    0,  267,    0,    0,    0,    0,  267,  267,  267, 
-          267,  267,  267,  267,  267,  267,  267,  267,  267,  265, 
-            0,    0,  265,    0,    0,    0,    0,    0,    0,  267, 
-            0,    0,    0,    0,  267,    0,  265,  265,  265,    0, 
-          265,  265,    0,    0,    0,    0,    0,    0,  267,    0, 
-            0,  267,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  266,    0,    0,    0,    0,    0, 
-            0,  265,  265,    0,  266,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  265,  265,    0,  266,    0,    0,  266,    0, 
-            0,    0,    0,    0,    0,    0,    0, 1080, 1081, 1082, 
-         1083,    0,  266,  266,  266,    0,  266,  266,    0,    0, 
-            0,    0,    0, 1084, 1085, 1086, 1087,    0,    0,    0, 
-         1088,    0,    0,   40,   41,   42,   43,   44,    0,    0, 
-            0,    0,    0,  306,    0,    0,    0,  266,  266,  293, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  293, 
-            0, 1090, 1091,    0,    0,    0,    0,    0,    0, 1092, 
-            0,    0, 1093,    0, 1094, 1095,    0, 1096,  266,  266, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-          293,    0,    0,  293,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  293,  293,  293, 
-            0,  293,  293,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          265,  265,  265,    0,    0,  265,  265,  265,    0,  265, 
-            0,    0,  293,    0,    0,    0,    0,  265,    0,  265, 
-          265,  265,    0,    0,    0,    0,    0,    0,    0,  265, 
-          265,    0,  265,  265,  265,  265,  265,    0,    0,    0, 
-            0,  270,    0,    0,  293,    0,    0,    0,    0,    0, 
-            0,  270,    0,    0,    0,    0,    0,    0,    0,    0, 
-          265,    0,  265,    0,    0,    0,    0,  265,  265,  265, 
-          265,  265,  265,  265,  265,  265,  265,  265,  265,    0, 
-            0,    0,  270,    0,    0,  270,  266,  266,  266,  265, 
-            0,  266,  266,  266,  265,  266,    0,    0,    0,  270, 
-          270,    0,    0,  266,  270,  266,  266,  266,  265,    0, 
-            0,  265,    0,    0,    0,  266,  266,    0,  266,  266, 
-          266,  266,  266,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  270,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  266,    0,  266,    0, 
-            0,    0,    0,  266,  266,  266,  266,  266,  266,  266, 
-          266,  266,  266,  266,  266,    0,  270,    0,  294,    0, 
-            0,    0,    0,    0,    0,  266,    0,    0,  294,    0, 
-          266,  293,  293,  293,    0,    0,  293,  293,  293,    0, 
-          293,    0,    0,    0,  266,    0,    0,  266,  293,    0, 
-          293,  293,  293,    0,    0,    0,    0,    0,    0,  294, 
-          293,  293,  294,  293,  293,  293,  293,  293,    0,    0, 
-            0,    0,    0,    0,    0,    0,  294,  294,  294,    0, 
-          294,  294,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  293,    0,  293,    0,    0,    0,    0,  293,  293, 
-          293,  293,  293,  293,  293,  293,  293,  293,  293,  293, 
-            0,  294,    0,    0,    0,    0,    0,    0,    0,    0, 
-          293,    0,    0,    0,    0,  293,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  271,    0,    0,    0,  293, 
-            0,    0,  293,  294,    0,  271,    0,    0,    0,    0, 
-            0,    0,    0,  270,  270,  270,    0,    0,  270,  270, 
-          270,    0,  270,    0,    0,    0,    0,    0,    0,    0, 
-          270,    0,  270,  270,  270,    0,  271,    0,    0,  271, 
-            0,    0,  270,  270,    0,  270,  270,  270,  270,  270, 
-            0,    0,    0,  271,  271,    0,    0,    0,  271,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  270,    0,  270,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  270,  270,  271,    0, 
-          270,  270,    0,    0,    0,  272,    0,    0,    0,    0, 
-            0,    0,  270,    0,    0,  272,    0,  270,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          271,  270,    0,    0,  270,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  272,    0,    0,  272, 
-          294,  294,  294,    0,    0,  294,  294,  294,    0,  294, 
-            0,    0,    0,  272,  272,    0,    0,  294,  272,  294, 
-          294,  294,    0,    0,    0,    0,    0,    0,    0,  294, 
-          294,    0,  294,  294,  294,  294,  294,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  272,    0, 
-            0,  279,    0,    0,    0,    0,    0,    0,    0,    0, 
-          294,  279,  294,    0,    0,    0,    0,  294,  294,  294, 
-          294,  294,  294,  294,  294,  294,  294,  294,  294,    0, 
-          272,    0,    0,    0,    0,    0,    0,    0,    0,  294, 
-            0,    0,  279,    0,  294,  279,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  294,  279, 
-          279,  294,    0,    0,  279,    0,    0,  271,  271,  271, 
-            0,    0,  271,  271,  271,    0,  271,    0,    0,    0, 
-            0,    0,    0,    0,  271,    0,  271,  271,  271,    0, 
-            0,    0,    0,    0,  279,    0,  271,  271,    0,  271, 
-          271,  271,  271,  271,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  273,    0,    0,    0,  279,  271,    0,  271, 
+            0,    0,    0,    0,    0,  295,    0,    0,    0,    0, 
+            0,    0,  268,  268,    0,  295,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  268,  268,    0,  295,    0,    0,  295, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  295,  295,  295,    0,  295,  295,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  163,    0,  163,  163, 
+          163,  163,  163,    0,    0,    0,    0,    0,  295,    0, 
+          296,    0,    0,    0,    0,    0,    0,    0,  163,    0, 
+          296,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  163,    0,    0,    0,    0,    0,  688,    0, 
+          295,    0,  163,    0,    0,    0,    0,  163,  163,  163, 
+            0,  296,    0,    0,  296,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  296,  296, 
+          296,    0,  296,  296,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  268,  268,  268,    0,    0,  268,  268,  268,    0, 
+          268,    0,    0,  296,    0,    0,    0,    0,  268,    0, 
+          268,  268,  268,    0,    0,    0,    0,    0,    0,    0, 
+          268,  268,    0,  268,  268,  268,  268,  268,    0,    0, 
+            0,    0,  273,    0,    0,  296,    0,    0,    0,    0, 
             0,    0,  273,    0,    0,    0,    0,    0,    0,    0, 
-          271,  271,    0,    0,  271,  271,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  271,    0,    0,    0, 
-            0,  271,    0,  273,    0,    0,  273,  272,  272,  272, 
-            0,    0,  272,  272,  272,  271,  272,    0,  271,    0, 
-          273,  273,    0,    0,  272,  273,  272,  272,  272,    0, 
-            0,    0,    0,    0,    0,    0,  272,  272,    0,  272, 
-          272,  272,  272,  272,    0,    0,    0,    0,  274,    0, 
-            0,    0,    0,    0,    0,  273,    0,    0,  274,    0, 
-            0,    0,    0,    0,    0,    0,    0,  272,    0,  272, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          272,  272,    0,    0,  272,  272,    0,  273,    0,  274, 
-            0,    0,  274,    0,    0,    0,  272,    0,    0,    0, 
-            0,  272,    0,  279,  279,  279,  274,  274,  279,  279, 
-          279,  274,  279,    0,    0,  272,    0,    0,  272,    0, 
-          279,    0,  279,  279,  279,    0,    0,    0,    0,    0, 
-            0,    0,  279,  279,    0,  279,  279,  279,  279,  279, 
-            0,  274,    0,  280,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  280,    0,    0,    0,    0,  160,    0, 
-            0,    0,    0,  279,    0,  279,    0,    0,    0,    0, 
-            0,    0,    0,  274,    0,    0,  279,  279,    0,    0, 
-          279,  279,    0,    0,  280,    0,  160,  280,  160,    0, 
-          160,    0,  279,    0,  681,    0,    0,  279,    0,    0, 
-            0,  280,  280,    0,    0,    0,  280,  160,    0,  160, 
-            0,  279,    0,    0,  279,    0,    0,    0,    0,    0, 
+            0,  268,    0,  268,    0,    0,    0,    0,  268,  268, 
+          268,  268,  268,  268,  268,  268,  268,  268,  268,  268, 
+            0,    0,    0,  273,    0,    0,  273,  295,  295,  295, 
+          268,    0,  295,  295,  295,  268,  295,    0,    0,    0, 
+          273,  273,    0,    0,  295,  273,  295,  295,  295,  268, 
+            0,    0,  268,    0,    0,    0,  295,  295,    0,  295, 
+          295,  295,  295,  295,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  273,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  295,    0,  295, 
+            0,    0,    0,    0,  295,  295,  295,  295,  295,  295, 
+          295,  295,  295,  295,  295,  295,    0,  273,    0,  274, 
+            0,    0,    0,    0,    0,    0,  295,    0,    0,  274, 
+            0,  295,  296,  296,  296,    0,    0,  296,  296,  296, 
+            0,  296,    0,    0,    0,  295,    0,    0,  295,  296, 
+            0,  296,  296,  296,    0,    0,    0,    0,    0,    0, 
+          274,  296,  296,  274,  296,  296,  296,  296,  296,    0, 
+            0,    0,    0,    0,    0,    0,    0,  274,  274,    0, 
+            0,    0,  274,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  296,    0,  296,    0,    0,    0,    0,  296, 
+          296,  296,  296,  296,  296,  296,  296,  296,  296,  296, 
+          296,    0,  274,    0,    0,    0,    0,    0,    0,    0, 
+            0,  296,    0,    0,    0,    0,  296,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  281,    0,    0,    0, 
+          296,    0,    0,  296,  274,    0,  281,    0,    0,    0, 
             0,    0,    0,    0,  273,  273,  273,    0,    0,  273, 
-          273,  273,    0,  273,    0,    0,  280,    0,    0,    0, 
-            0,  273,    0,  273,  273,  273,    0,    0,    0,    0, 
-            0,    0,    0,  273,  273,    0,  273,  273,  273,  273, 
-          273,    0,    0,    0,    0,  254,    0,    0,  280,    0, 
-            0,    0,    0,    0,    0,  254,    0,    0,    0,    0, 
+          273,  273,    0,  273,    0,    0,    0,    0,    0,    0, 
+            0,  273,    0,  273,  273,  273,    0,  281,    0,    0, 
+          281,    0,    0,  273,  273,    0,  273,  273,  273,  273, 
+          273,    0,    0,    0,  281,  281,    0,    0,    0,  281, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,  273,    0,  273,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  273,  273,    0, 
-            0,  273,  273,    0,    0,    0,  254,    0,    0,  254, 
-          274,  274,  274,  273,    0,  274,  274,  274,  273,  274, 
-            0,    0,    0,  254,  254,    0,    0,  274,  254,  274, 
-          274,  274,  273,    0,    0,  273,    0,    0,    0,  274, 
-          274,    0,  274,  274,  274,  274,  274,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  254,    0, 
+            0,    0,    0,    0,    0,    0,    0,  273,  273,  281, 
+            0,  273,  273,    0,    0,    0,  275,    0,    0,    0, 
+            0,    0,    0,  273,    0,    0,  275,    0,  273,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  281,  273,    0,    0,  273,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  275,    0,    0, 
+          275,  274,  274,  274,    0,    0,  274,  274,  274,    0, 
+          274,    0,    0,    0,  275,  275,    0,    0,  274,  275, 
+          274,  274,  274,    0,    0,    0,    0,    0,    0,    0, 
+          274,  274,    0,  274,  274,  274,  274,  274,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  275, 
+            0,    0,  276,    0,    0,    0,    0,    0,    0,    0, 
+            0,  274,  276,  274,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  274,  274,    0,    0,  274,  274, 
+            0,  275,    0,    0,    0,    0,    0,    0,    0,    0, 
+          274,    0,    0,  276,    0,  274,  276,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  274, 
+          276,  276,  274,    0,    0,  276,    0,    0,  281,  281, 
+          281,    0,    0,  281,  281,  281,    0,  281,    0,    0, 
+            0,    0,    0,    0,    0,  281,    0,  281,  281,  281, 
+            0,    0,    0,    0,    0,  276,    0,  281,  281,    0, 
+          281,  281,  281,  281,  281,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  282,    0,    0,    0,  276,  281,    0, 
+          281,    0,    0,  282,    0,    0,    0,    0,    0,    0, 
+            0,  281,  281,    0,    0,  281,  281,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  281,    0,    0, 
+            0,    0,  281,    0,  282,    0,    0,  282,  275,  275, 
+          275,    0,    0,  275,  275,  275,  281,  275,    0,  281, 
+            0,  282,  282,    0,    0,  275,  282,  275,  275,  275, 
+            0,    0,    0,    0,    0,    0,    0,  275,  275,    0, 
+          275,  275,  275,  275,  275,    0,    0,    0,    0,  256, 
+            0,    0,    0,    0,    0,    0,  282,    0,    0,  256, 
+            0,    0,    0,    0,    0,    0,    0,    0,  275,    0, 
+          275,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  275,  275,    0,    0,  275,  275,    0,  282,    0, 
+          256,    0,    0,  256,    0,    0,    0,  275,    0,    0, 
+            0,    0,  275,    0,  276,  276,  276,  256,  256,  276, 
+          276,  276,  256,  276,    0,    0,  275,    0,    0,  275, 
+            0,  276,    0,  276,  276,  276,    0,    0,    0,    0, 
+            0,    0,    0,  276,  276,    0,  276,  276,  276,  276, 
+          276,    0,  256,    0,  257,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  257,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  276,    0,  276,    0,    0,    0, 
+            0,    0,    0,    0,  256,    0,    0,  276,  276,    0, 
+            0,  276,  276,    0,    0,  257,    0,    0,  257,    0, 
+            0,    0,    0,  276,    0,    0,    0,    0,  276,    0, 
+            0,    0,  257,  257,    0,    0,    0,  257,    0,    0, 
+            0,    0,  276,    0,    0,  276,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  282,  282,  282,    0,    0, 
+          282,  282,  282,    0,  282,    0,    0,  257,    0,    0, 
+            0,    0,  282,    0,  282,  282,  282,    0,    0,    0, 
+            0,    0,    0,    0,  282,  282,    0,  282,  282,  282, 
+          282,  282,    0,  252,    0,    0,    0,    0,    0,  257, 
+            0,    0,    0,  252,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  282,    0,  282,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  282, 
+            0,    0,  282,  282,  252,    0,    0,  252,    0,    0, 
+            0,  256,  256,  256,  282,    0,  256,  256,  256,  282, 
+          256,  252,  252,    0,    0,    0,  252,    0,  256,    0, 
+          256,  256,  256,  282,    0,    0,  282,    0,    0,    0, 
+          256,  256,    0,  256,  256,  256,  256,  256,    0,    0, 
+            0,    0,    0,    0,    0,    0,  252,    0,  253,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  253,    0, 
+            0,  256,    0,  256,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  252,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  253, 
+          256,    0,  253,    0,    0,  256,  257,  257,  257,    0, 
+            0,  257,  257,  257,    0,  257,  253,  253,    0,  256, 
+            0,  253,  256,  257,    0,  257,  257,  257,    0,    0, 
+            0,    0,    0,    0,    0,  257,  257,    0,  257,  257, 
+          257,  257,  257,    0,  288,    0,    0,    0,    0,    0, 
+            0,  253,    0,    0,  288,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  257,    0,  257,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          274,    0,  274,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  274,  274,    0,    0,  274,  274,    0, 
-          254,    0,  255,    0,    0,    0,    0,    0,    0,  274, 
-            0,    0,  255,    0,  274,  280,  280,  280,    0,    0, 
-          280,  280,  280,    0,  280,    0,    0,    0,  274,    0, 
-            0,  274,  280,    0,  280,  280,  280,    0,    0,    0, 
-            0,    0,    0,  255,  280,  280,  255,  280,  280,  280, 
-          280,  280,    0,    0,    0,    0,    0,    0,    0,    0, 
-          255,  255,    0,    0,  160,  255,  160,  160,  160,  160, 
-          160,    0,    0,    0,    0,  280,    0,  280,    0,    0, 
-            0,    0,    0,    0,    0,    0,  160,    0,    0,  280, 
-            0,    0,  280,  280,    0,  255,    0,    0,    0,    0, 
-          160,    0,    0,    0,  280,    0,  681,    0,    0,  280, 
-          160,    0,    0,    0,    0,  160,  160,  160,  250,    0, 
-            0,    0,    0,  280,    0,    0,  280,  255,  250,    0, 
-            0,    0,    0,    0,    0,    0,    0,  254,  254,  254, 
-            0,    0,  254,  254,  254,    0,  254,    0,    0,    0, 
-            0,    0,    0,    0,  254,    0,  254,  254,  254,  250, 
-            0,    0,  250,    0,    0,  251,  254,  254,    0,  254, 
-          254,  254,  254,  254,    0,  251,  250,  250,    0,    0, 
-            0,  250,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  254,    0,  254, 
-            0,    0,    0,    0,    0,    0,  251,    0,    0,  251, 
-            0,  250,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  251,  251,    0,  254,    0,  251,    0, 
-            0,  254,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  250,    0,  254,    0,    0,  254,    0, 
-            0,  281,    0,    0,    0,    0,    0,    0,  251,    0, 
-            0,  281,    0,    0,  255,  255,  255,    0,    0,  255, 
-          255,  255,    0,  255,    0,    0,    0,    0,    0,    0, 
-            0,  255,    0,  255,  255,  255,    0,    0,    0,    0, 
-          251,    0,  281,  255,  255,  281,  255,  255,  255,  255, 
-          255,  286,    0,    0,    0,    0,    0,    0,    0,  281, 
-          281,  286,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  255,    0,  255,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  286,    0,  281,  286,    0,    0,    0,    0, 
-            0,    0,    0,  255,    0,    0,    0,    0,  255,  286, 
-          286,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  255,    0,    0,  255,  281,    0,    0,    0, 
-          250,  250,  250,    0,    0,  250,  250,  250,    0,  250, 
-            0,    0,    0,    0,  286,    0,    0,  250,    0,  250, 
-          250,  250,    0,    0,    0,    0,    0,    0,    0,  250, 
-          250,    0,  250,  250,  250,  250,  250,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  286,  251,  251,  251, 
-            0,    0,  251,  251,  251,  282,  251,    0,    0,    0, 
-          250,    0,  250,    0,  251,  282,  251,  251,  251,    0, 
-            0,    0,    0,    0,    0,    0,  251,  251,    0,  251, 
-          251,  251,  251,  251,    0,    0,    0,    0,    0,  250, 
-            0,    0,    0,    0,  250,    0,  282,    0,    0,  282, 
-            0,    0,    0,    0,    0,    0,    0,  251,  250,  251, 
-            0,  250,    0,  282,  282,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  281,  281,  281,  251,    0,  281,  281, 
-          281,  251,  281,    0,    0,    0,    0,    0,  282,    0, 
-          281,    0,  281,  281,  281,  251,    0,    0,  251,    0, 
-            0,    0,  281,  281,    0,  281,  281,  281,  281,  281, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          282,    0,    0,  286,  286,  286,    0,    0,  286,  286, 
-          286,  287,  286,  281,    0,  281,    0,    0,    0,    0, 
-          286,  287,  286,  286,  286,    0,    0,    0,    0,    0, 
-            0,    0,  286,  286,    0,  286,  286,  286,  286,  286, 
-            0,    0,  281,    0,    0,    0,    0,  281,    0,    0, 
-            0,    0,  287,    0,    0,  287,    0,    0,  304,    0, 
-            0,  281,    0,  286,  281,  286,    0,    0,  304,  287, 
-          287,    0,    0,  161,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  286,    0,    0,    0,    0,  286,    0,  304, 
-            0,  161,  304,  161,  287,  161,    0,    0,    0,  684, 
-            0,  286,    0,    0,  286,    0,  304,  304,    0,    0, 
-            0,    0,  161,    0,  161,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  287,  282,  282,  282, 
-            0,    0,  282,  282,  282,    0,  282,    0,    0,    0, 
-            0,  304,    0,    0,  282,    0,  282,  282,  282,    0, 
-            0,    0,    0,    0,    0,    0,  282,  282,    0,  282, 
-          282,  282,  282,  282,    0,  495,    0,    0,    0,    0, 
-            0,    0,    0,  304,    0,  495,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  282,    0,  282, 
-            0,    0,    0,    0,    0,    0,    0,    0,  320,    0, 
-            0,    0,  495,  495,    0,    0,  495,  495,  495,  495, 
-          495,  495,  495,    0,    0,    0,  282,    0,    0,    0, 
-            0,  282,    0,    0,  495,  495,    0,  495,  495,    0, 
-            0,    0,    0,    0,    0,  282,    0,    0,  282,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  495,    0,  495,  495, 
-            0,    0,    0,  287,  287,  287,    0,    0,  287,  287, 
-          287,    0,  287,    0,    0,    0,    0,    0,    0,    0, 
-          287,    0,  287,  287,  287,    0,    0,    0,  495,  495, 
-          495,  320,  287,  287,    0,  287,  287,  287,  287,  287, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          304,  304,  304,    0,    0,  304,  304,  304,    0,  304, 
-            0,    0,    0,  287,    0,  287,    0,  304,    0,  304, 
-          304,  304,    0,    0,    0,    0,    0,    0,    0,  304, 
-          304,    0,  304,  304,  304,  304,  304,    0,    0,    0, 
-            0,    0,  287,    0,    0,    0,    0,  287,    0,  161, 
-            0,  161,  161,  161,  161,  161,    0,    0,    0,    0, 
-          304,  287,  304,    0,  287,    0,    0,    0,    0,    0, 
-            0,  161,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  161,    0,    0,    0,  304, 
-            0,  684,    0,    0,  304,  161,    0,    0,    0,    0, 
-          161,  161,  161,    0,    0,    0,    0,    0,  304,    0, 
-            0,  304,  320,  320,  320,    0,  320,  495,  495,  495, 
-          320,  320,  495,  495,  495,  320,  495,  320,  320,  320, 
-          320,  320,  320,  320,  495,  495,  495,  495,    0,  320, 
-          320,  320,  320,  320,  320,  320,  495,  495,  320,  495, 
-          495,  495,  495,  495,    0,  320,    0,    0,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,    0,    0,  495,  320,  495, 
-            0,  320,  320,  495,  495,  495,  495,  495,  495,  495, 
-          495,  495,  495,  495,  495,  495,  320,  320,    0,    0, 
-          495,  495,  495,  495,  320,    0,  495,  320,  320,  320, 
-          320,  495,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  821,  320,  320,  495,    0,    0,    0,    0, 
-            0,    0,  821,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  320,    0,    0,    0,  821, 
-          821,    0,    0,  821,  821,  821,  821,  821,  821,  821, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  821,  821,    0,  821,  821,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  821,    0,  821,  821,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  353, 
-            0,    0,    0,    0,    0,  821,  821,  821,  320,  353, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  794,    0,    0,    0,  353,  353,    0,  794, 
-          353,  353,  353,  353,  353,  353,  353,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  353,  353, 
-          152,  353,  353,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          353,    0,  353,  353,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  353,  353,  794,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  320, 
-          320,  320,    0,  320,  821,  821,  821,  320,  320,  821, 
-          821,  821,  320,  821,  320,  320,  320,  320,  320,  320, 
-          320,  821,  821,  821,  821,    0,  320,  320,  320,  320, 
-          320,  320,  320,  821,  821,  320,  821,  821,  821,  821, 
-          821,    0,  320,    0,    0,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,    0,    0,  821,  320,  821,    0,  320,  320, 
-          821,  821,  821,  821,  821,  821,  821,  821,  821,  821, 
-          821,  821,  821,  320,  320,    0,    0,  821,  821,  821, 
-          821,  320,    0,  821,  320,  320,  320,  320,  821,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,  320,    0, 
-          320,  320,  821,    0,    0,    0,  794,  794,  794,    0, 
-          794,  353,  353,  353,  794,  794,  353,  353,  353,  794, 
-          353,  794,  794,  794,  794,  794,  794,  794,  353,    0, 
-          353,  353,    0,  794,  794,  794,  794,  794,  794,  794, 
-          353,  353,  794,  353,  353,  353,  353,  353,    0,  794, 
-            0,    0,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,    0, 
-            0,  353,  794,  353,    0,  794,  794,  353,  353,  353, 
-          353,  353,  353,  353,  353,  353,  353,  353,  353,  353, 
-          794,  794,    0,    0,  353,  353,  353,  353,  794,    0, 
-          353,  794,  794,  794,  794,  353,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  681,  794,  794,  353, 
-            0,    0,    0,    0,    0,    0,  681,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  793, 
-            0,    0,    0,  681,  681,    0,  793,  681,  681,  681, 
-          117,  681,  681,  681,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  681,  681,  136,  681,  681, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  681,    0,    0, 
-          681,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  684,    0,    0,    0,    0,    0,  793, 
-          681,  681,  793,  684,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,    0,    0,    0, 
-          684,  684,    0,  794,  684,  684,  684,  120,  684,  684, 
-          684,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  684,  684,  139,  684,  684,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  684,    0,    0,  684,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,  684,  684,  794, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  793,  793,  793,    0,  793,  681,  681, 
-          681,  793,  793,    0,  681,  681,  793,  681,  793,  793, 
-          793,  793,  793,  793,  793,  681,  793,    0,    0,    0, 
-          793,  793,  793,  793,  793,  793,  793,  681,  681,  793, 
-          681,  681,  681,  681,  681,    0,  793,    0,    0,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,    0,    0,  681,  793, 
-          681,    0,  793,  793,  681,  681,  681,  681,  681,  681, 
-          681,  681,  681,  681,  681,  681,  681,  793,  793,    0, 
-            0,  681,  681,  681,  681,  793,  693,  681,  793,  793, 
-          793,  793,    0,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,    0,  793,  793,  681,    0,    0,    0, 
-          794,  794,  794,    0,  794,  684,  684,  684,  794,  794, 
-            0,  684,  684,  794,  684,  794,  794,  794,  794,  794, 
-          794,  794,  684,  794,    0,    0,    0,  794,  794,  794, 
-          794,  794,  794,  794,  684,  684,  794,  684,  684,  684, 
-          684,  684,    0,  794,    0,    0,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,    0,    0,  684,  794,  684,    0,  794, 
-          794,  684,  684,  684,  684,  684,  684,  684,  684,  684, 
-          684,  684,  684,  684,  794,  794,    0,    0,  684,  684, 
-          684,  684,  794,  696,  684,  794,  794,  794,  794,    0, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          360,  794,  794,  684,    0,    0,    0,    0,    0,    0, 
-          360,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  320,    0,    0,    0,  360,  360,    0, 
-            0,  360,  360,  360,  360,  360,  360,  360,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  360, 
-          360,    0,  360,  360,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  360,    0,  360,  360,    0,    0,    0,    0,    0, 
+            0,    0,    0,  253,    0,  288,    0,    0,  288,    0, 
+            0,    0,    0,    0,    0,  257,    0,    0,    0,    0, 
+          257,    0,  288,  288,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  257,    0,    0,  257,    0,    0, 
+            0,    0,    0,    0,    0,  252,  252,  252,    0,    0, 
+          252,  252,  252,    0,  252,    0,    0,  288,    0,  286, 
+            0,    0,  252,    0,  252,  252,  252,    0,    0,  286, 
+            0,    0,    0,    0,  252,  252,    0,  252,  252,  252, 
+          252,  252,    0,    0,    0,    0,    0,    0,    0,  288, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          286,    0,    0,  286,    0,  252,    0,  252,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  286,  286,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  252,    0,    0,    0,    0,  252, 
+          253,  253,  253,    0,    0,  253,  253,  253,    0,  253, 
+            0,    0,  286,  252,    0,    0,  252,  253,    0,  253, 
+          253,  253,    0,    0,    0,    0,    0,    0,    0,  253, 
+          253,    0,  253,  253,  253,  253,  253,    0,  289,    0, 
+            0,    0,    0,    0,  286,    0,    0,    0,  289,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          253,    0,  253,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  289, 
+            0,    0,  289,    0,    0,    0,  288,  288,  288,  253, 
+            0,  288,  288,  288,  253,  288,  289,  289,    0,    0, 
+            0,    0,    0,  288,    0,  288,  288,  288,  253,    0, 
+            0,  253,    0,    0,    0,  288,  288,    0,  288,  288, 
+          288,  288,  288,    0,    0,    0,    0,    0,    0,    0, 
+            0,  289,    0,  306,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  306,    0,    0,  288,    0,  288,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  289,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  306,  288,    0,  306,    0,    0, 
+          288,  286,  286,  286,    0,    0,  286,  286,  286,    0, 
+          286,  306,  306,    0,  288,    0,    0,  288,  286,    0, 
+          286,  286,  286,    0,    0,    0,    0,    0,    0,    0, 
+          286,  286,    0,  286,  286,  286,  286,  286,    0,  305, 
+            0,    0,    0,    0,    0,    0,  306,    0,    0,  305, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  286,    0,  286,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  306,    0, 
+          305,    0,    0,  305,    0,    0,    0,    0,    0,    0, 
+          286,    0,    0,    0,    0,  286,    0,  305,  305,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  286, 
+            0,    0,  286,    0,    0,    0,    0,    0,    0,    0, 
+          289,  289,  289,    0,    0,  289,  289,  289,    0,  289, 
+            0,    0,  305,    0,    0,    0,    0,  289,    0,  289, 
+          289,  289,    0,    0,    0,    0,    0,    0,    0,  289, 
+          289,    0,  289,  289,  289,  289,  289,    0,    0,    0, 
+            0,    0,    0,    0,  305,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          289,    0,  289,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  289, 
+            0,    0,    0,    0,  289,  306,  306,  306,    0,    0, 
+          306,  306,  306,  499,  306,    0,    0,    0,  289,    0, 
+            0,  289,  306,  499,  306,  306,  306,    0,    0,    0, 
+            0,    0,    0,    0,  306,  306,    0,  306,  306,  306, 
+          306,  306,    0,    0,    0,    0,  324,    0,    0,    0, 
+          499,  499,    0,    0,  499,  499,  499,  499,  499,  499, 
+          499,    0,    0,    0,    0,  306,    0,  306,    0,    0, 
+            0,    0,  499,  499,    0,  499,  499,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  305,  305,  305,  306,    0,  305,  305,  305,  306, 
+          305,    0,    0,    0,  499,    0,  499,  499,  305,    0, 
+          305,  305,  305,  306,    0,    0,  306,    0,    0,    0, 
+          305,  305,    0,  305,  305,  305,  305,    0,    0,    0, 
+          825,    0,    0,    0,    0,    0,  499,  499,  499,  324, 
+          825,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  305,    0,  305,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  324,    0,    0,    0,  825,  825,    0, 
+            0,  825,  825,  825,  825,  825,  825,  825,    0,    0, 
+          305,    0,    0,    0,    0,  305,    0,    0,    0,  825, 
+          825,    0,  825,  825,    0,    0,    0,    0,    0,  305, 
+            0,    0,  305,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  825,    0,  825,  825,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  825,  825,  825,  324,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          324,  324,  324,    0,  324,  499,  499,  499,  324,  324, 
+          499,  499,  499,  324,  499,  324,  324,  324,  324,  324, 
+          324,  324,  499,  499,  499,  499,    0,  324,  324,  324, 
+          324,  324,  324,  324,  499,  499,  324,  499,  499,  499, 
+          499,  499,    0,  324,    0,    0,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,    0,    0,  499,  324,  499,    0,  324, 
+          324,  499,  499,  499,  499,  499,  499,  499,  499,  499, 
+          499,  499,  499,  499,  324,  324,    0,    0,  499,  499, 
+          499,  499,  324,    0,  499,  324,  324,  324,  324,  499, 
+          324,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+            0,  324,  324,  499,    0,    0,    0,  324,  324,  324, 
+            0,  324,  825,  825,  825,  324,  324,  825,  825,  825, 
+          324,  825,  324,  324,  324,  324,  324,  324,  324,  825, 
+          825,  825,  825,    0,  324,  324,  324,  324,  324,  324, 
+          324,  825,  825,  324,  825,  825,  825,  825,  825,    0, 
+          324,    0,    0,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+            0,    0,  825,  324,  825,    0,  324,  324,  825,  825, 
+          825,  825,  825,  825,  825,  825,  825,  825,  825,  825, 
+          825,  324,  324,    0,    0,  825,  825,  825,  825,  324, 
+            0,  825,  324,  324,  324,  324,  825,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  357,  324,  324, 
+          825,    0,    0,    0,    0,    0,    0,  357,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          798,    0,    0,    0,  357,  357,    0,  798,  357,  357, 
+          357,  357,  357,  357,  357,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  357,  357,  154,  357, 
+          357,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
-            0,    0,    0,    0,  360,  360,  320,  798,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  357,    0, 
+          357,  357,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  685,    0,    0,    0,    0,    0, 
+            0,  357,  357,  798,  685,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          793,    0,    0,    0,  798,  798,    0,  793,  798,  798, 
-          798,  131,  798,  798,  798,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  798,  798,  150,  798, 
-          798,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  797,    0,    0, 
+            0,  685,  685,    0,  797,  685,  685,  685,  119,  685, 
+          685,  685,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  685,  685,  138,  685,  685,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  798,    0, 
-            0,  798,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  685,    0,    0,  685,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  797,  685,  685, 
+          797,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  798,  798,  798,    0,  798,  357, 
+          357,  357,  798,  798,  357,  357,  357,  798,  357,  798, 
+          798,  798,  798,  798,  798,  798,  357,    0,  357,  357, 
+            0,  798,  798,  798,  798,  798,  798,  798,  357,  357, 
+          798,  357,  357,  357,  357,  357,    0,  798,    0,    0, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,    0,    0,  357, 
+          798,  357,    0,  798,  798,  357,  357,  357,  357,  357, 
+          357,  357,  357,  357,  357,  357,  357,  357,  798,  798, 
+            0,    0,  357,  357,  357,  357,  798,    0,  357,  798, 
+          798,  798,  798,  357,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,    0,  798,  798,  357,    0,    0, 
+            0,  797,  797,  797,    0,  797,  685,  685,  685,  797, 
+          797,    0,  685,  685,  797,  685,  797,  797,  797,  797, 
+          797,  797,  797,  685,  797,    0,    0,    0,  797,  797, 
+          797,  797,  797,  797,  797,  685,  685,  797,  685,  685, 
+          685,  685,  685,    0,  797,    0,    0,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,    0,    0,  685,  797,  685,    0, 
+          797,  797,  685,  685,  685,  685,  685,  685,  685,  685, 
+          685,  685,  685,  685,  685,  797,  797,    0,    0,  685, 
+          685,  685,  685,  797,  697,  685,  797,  797,  797,  797, 
+            0,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  688,  797,  797,  685,    0,    0,    0,    0,    0, 
+            0,  688,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  798,    0,    0,    0,  688,  688, 
+            0,  798,  688,  688,  688,  122,  688,  688,  688,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          688,  688,  141,  688,  688,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  688,    0,    0,  688,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  364,    0, 
+            0,    0,    0,    0,  798,  688,  688,  798,  364,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  324,    0,    0,    0,  364,  364,    0,    0,  364, 
+          364,  364,  364,  364,  364,  364,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  364,  364,    0, 
+          364,  364,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  364, 
+            0,  364,  364,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  364,  364,  324,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  798,  798, 
+          798,    0,  798,  688,  688,  688,  798,  798,    0,  688, 
+          688,  798,  688,  798,  798,  798,  798,  798,  798,  798, 
+          688,  798,    0,    0,    0,  798,  798,  798,  798,  798, 
+          798,  798,  688,  688,  798,  688,  688,  688,  688,  688, 
+            0,  798,    0,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,    0,    0,  688,  798,  688,    0,  798,  798,  688, 
+          688,  688,  688,  688,  688,  688,  688,  688,  688,  688, 
+          688,  688,  798,  798,    0,    0,  688,  688,  688,  688, 
+          798,  700,  688,  798,  798,  798,  798,    0,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,    0,  798, 
+          798,  688,    0,    0,    0,  324,  324,  324,    0,  324, 
+          364,  364,  364,  324,  324,  364,  364,  364,  324,  364, 
+          324,  324,  324,  324,  324,  324,  324,  364,    0,  364, 
+          364,    0,  324,  324,  324,  324,  324,  324,  324,  364, 
+          364,  324,  364,  364,  364,  364,  364,    0,  324,    0, 
+            0,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,    0,    0, 
+          364,  324,  364,    0,  324,  324,  364,  364,  364,  364, 
+          364,  364,  364,  364,  364,  364,  364,  364,  364,  324, 
+          324,    0,    0,  364,  364,  364,  364,  324,    0,  364, 
+          324,  324,  324,  324,  364,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  802,  324,  324,  364,    0, 
+            0,    0,    0,    0,    0,  802,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  797,    0, 
+            0,    0,  802,  802,    0,  797,  802,  802,  802,  133, 
+          802,  802,  802,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  802,  802,  152,  802,  802,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          798,  798,  798,  793,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  320,  320,  320, 
-            0,  320,  360,  360,  360,  320,  320,  360,  360,  360, 
-          320,  360,  320,  320,  320,  320,  320,  320,  320,  360, 
-            0,  360,  360,    0,  320,  320,  320,  320,  320,  320, 
-          320,  360,  360,  320,  360,  360,  360,  360,  360,    0, 
-          320,    0,    0,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-            0,    0,  360,  320,  360,    0,  320,  320,  360,  360, 
-          360,  360,  360,  360,  360,  360,  360,  360,  360,  360, 
-          360,  320,  320,    0,    0,  360,  360,  360,  360,  320, 
-            0,  360,  320,  320,  320,  320,  360,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,    0,  320,  320, 
-          360,    0,    0,    0,  793,  793,  793,    0,  793,  798, 
-          798,  798,  793,  793,    0,  798,  798,  793,  798,  793, 
-          793,  793,  793,  793,  793,  793,  798,  798,    0,    0, 
-            0,  793,  793,  793,  793,  793,  793,  793,  798,  798, 
-          793,  798,  798,  798,  798,  798,    0,  793,    0,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,    0,    0,  798, 
-          793,  798,    0,  793,  793,  798,  798,  798,  798,  798, 
-          798,  798,  798,  798,  798,  798,  798,  798,  793,  793, 
-            0,    0,  798,  798,  798,  798,  793,    0,  798,  793, 
-          793,  793,  793,    0,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  798,    0,    0, 
-            0,    0,    0,    0,  793,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  793,    0,    0, 
-            0,  793,  793,    0,  793,  793,  793,  793,  130,  793, 
-          793,  793,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  793,  793,  149,  793,  793,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  802,    0,    0,  802, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  797,    0,    0,    0,    0,    0,  802,  802, 
+          802,  797,  797,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  797,    0,    0,    0,  797, 
+          797,    0,  797,  797,  797,  797,  132,  797,  797,  797, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  797,  797,  151,  797,  797,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  797,    0,    0,  797,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  797,  797,  797,  797,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  797,  797,  797,    0,  797,  802,  802,  802, 
+          797,  797,    0,  802,  802,  797,  802,  797,  797,  797, 
+          797,  797,  797,  797,  802,  802,    0,    0,    0,  797, 
+          797,  797,  797,  797,  797,  797,  802,  802,  797,  802, 
+          802,  802,  802,  802,    0,  797,    0,    0,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,    0,    0,  802,  797,  802, 
+            0,  797,  797,  802,  802,  802,  802,  802,  802,  802, 
+          802,  802,  802,  802,  802,  802,  797,  797,    0,    0, 
+          802,  802,  802,  802,  797,    0,  802,  797,  797,  797, 
+          797,    0,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,    0,  797,  797,  802,    0,    0,    0,  797, 
+          797,  797,    0,  797,  797,  797,  797,  797,  797,    0, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,    0,    0,    0,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,    0,  797,    0,    0,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,    0,    0,  797,  797,  797,    0,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,    0,    0,  797,  797,  797, 
+          797,  797,    0,  797,  797,  797,  797,  797,    0,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  798, 
+          797,  797,  797,    0,    0,    0,    0,    0,    0,  798, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  798,    0,    0,    0,  798,  798,    0,  798, 
+          798,  798,  798, 
       };
    }
 
    private static final int[] yyTable3() {
       return new int[] {
 
+          134,  798,  798,  798,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  798,  798,  153,  798,  798, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          793,    0,    0,  793,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,    0,    0,    0, 
-            0,    0,  793,  793,  793,  793,  794,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  794, 
-            0,    0,    0,  794,  794,    0,  794,  794,  794,  794, 
-          132,  794,  794,  794,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  794,  794,  151,  794,  794, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  794,    0,    0, 
-          794,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  794, 
-          794,  794,  794,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,    0,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-            0,    0,    0,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,    0,  793, 
-            0,    0,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,    0, 
-            0,  793,  793,  793,    0,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,    0,    0,  793,  793,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,    0,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,    0,  793,  793,  793, 
-            0,    0,    0,  794,  794,  794,    0,  794,  794,  794, 
-          794,  794,  794,    0,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,    0,    0,    0, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,    0,  794,    0,    0,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,    0,    0,  794,  794, 
-          794,    0,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,    0, 
-            0,  794,  794,  794,  794,  794,    0,  794,  794,  794, 
-          794,  794,    0,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  798,  794,  794,  794,    0,    0,    0, 
-            0,    0,    0,  798,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  793,    0,    0,    0, 
-          798,  798,    0,  793,  798,  798,  798,  798,  798,  798, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
           798,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  798,  798,  150,  798,  798,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  798,    0,    0,  798,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          793,    0,    0,    0,    0,    0,  798,  798,  798,  793, 
-          793,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  793,    0,    0,    0,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  793, 
-          793,  149,  793,  793,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  793,    0,    0,  793,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  793,  793,  793,  793,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          793,  793,  793,    0,  793,  798,  798,  798,  793,  793, 
-            0,  798,  798,  793,  798,  793,  793,  793,  793,  793, 
-          793,  793,  798,  798,    0,    0,    0,  793,  793,  793, 
-          793,  793,  793,  793,  798,  798,  793,  798,  798,  798, 
-          798,  798,    0,  793,    0,    0,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,    0,    0,  798,  793,  798,    0,  793, 
-          793,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
-          798,  798,  798,  798,  793,  793,    0,    0,  798,  798, 
-          798,  798,  793,    0,  798,  793,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-            0,  793,  793,  798,    0,    0,    0,  793,  793,  793, 
-            0,  793,  793,  793,  793,  793,  793,    0,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,    0,    0,    0,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,    0, 
-          793,    0,    0,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-            0,    0,  793,  793,  793,    0,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,    0,    0,  793,  793,  793,  793,  793, 
-            0,  793,  793,  793,  793,  793,    0,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  794,  793,  793, 
-          793,    0,    0,    0,    0,    0,    0,  794,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          794,    0,    0,    0,  794,  794,    0,  794,  794,  794, 
-          794,  794,  794,  794,  794,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,  794,  151,  794, 
-          794,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  794,    0, 
-            0,  794,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  353,    0,    0,    0,    0,    0, 
-          794,  794,  794,  794,  353,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  794,    0,    0, 
-            0,  353,  353,    0,  794,  353,  353,  353,  133,  353, 
-          353,  353,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  353,  353,  152,  353,  353,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  353,    0,    0,  353,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  353,  353, 
-          794,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  794,  794,  794,    0,  794,  794, 
-          794,  794,  794,  794,    0,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,    0,    0, 
-            0,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,    0,  794,    0,    0, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,    0,    0,  794, 
-          794,  794,    0,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-            0,    0,  794,  794,  794,  794,  794,    0,  794,  794, 
-          794,  794,  794,    0,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,    0,  794,  794,  794,    0,    0, 
-            0,  794,  794,  794,    0,  794,  353,  353,  353,  794, 
-          794,    0,  353,  353,  794,  353,  794,  794,  794,  794, 
-          794,  794,  794,  353,    0,    0,    0,    0,  794,  794, 
-          794,  794,  794,  794,  794,  353,  353,  794,  353,  353, 
-          353,  353,  353,    0,  794,    0,    0,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,    0,    0,  353,  794,  353, 1098, 
-          794,  794,  353,  353,  353,  353,  353,  353,  353,  353, 
-          353,  353,  353,  353,  353,  794,  794,    0,    0,  353, 
-          353,  353,  353,  794,    0,  353,  794,  794,  794,  794, 
-            0,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  353,  794,  794,  353,    0,    0,    0,    0,    0, 
-            0,  353,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  794,    0,    0,    0,  353,  353, 
-            0,  794,  353,  353,  353,  353,  353,  353,  353,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          353,  353,  152,  353,  353,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  353,    0,    0,  353,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  821,    0, 
-            0,    0,    0,    0,    0,  353,  353,  794,  821,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  320, 1080, 1081, 1082, 1083,    0,    0,    0,  821, 
-            0,    0,    0,    0,  821,    0,    0,    0, 1084, 1085, 
-         1086, 1087,    0,    0,    0, 1088,    0,  821,   40,   41, 
-           42,   43,   44,    0,    0,    0,    0,    0,  306,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0, 1090, 1091,    0,    0, 
-            0,    0,    0,    0, 1092,    0,    0, 1093,    0, 1094, 
-         1095,    0, 1096,    0,    0,   58,   59,   60,   61,   62, 
-           63,   64,    0,   65,   66,    0,    0,    0,    0,    0, 
-            0,  821,    0,  821,  320,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  794,  794, 
-          794,    0,  794,  353,  353,  353,  794,  794,    0,  353, 
-          353,  794,  353,  794,  794,  794,  794,  794,  794,  794, 
-          353,    0,    0,    0,    0,  794,  794,  794,  794,  794, 
-          794,  794,  353,  353,  794,  353,  353,  353,  353,  353, 
-            0,  794,    0,    0,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,    0,    0,  353,  794,  353,    0,  794,  794,  353, 
-          353,  353,  353,  353,  353,  353,  353,  353,  353,  353, 
-          353,  353,  794,  794,    0,    0,  353,  353,  353,  353, 
-          794,    0,  353,  794,  794,  794,  794,    0,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,    0,  794, 
-          794,  353,    0,    0,    0,  320,  320,  320,    0,  320, 
-          821,  821,  821,  320,  320,  821,  821,  821,  320,  821, 
-          320,  320,  320,  320,  320,  320,  320,  821,  821,  821, 
-            0,    0,  320,  320,  320,  320,  320,  320,  320,  821, 
-          821,  320,  821,  821,  821,  821,  821,    0,  320,    0, 
-            0,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,    0,    0, 
-          821,  320,  821,    0,  320,  320,    0,    0,    0,    0, 
-            0,    0,  388,    0,    0,    0,    0,    0,    0,  320, 
-          320,    0,  388,    0,    0,  821,  821,  320,    0,    0, 
-          320,  320,  320,  320,    0,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,    0,  320,  320,  821,  388, 
-          388,    0,    0,  388,  388,  388,  388,  388,  388,  388, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  388,  388,    0,  388,  388,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  389,  388,    0,  388,  388,    0,    0,    0, 
-            0,    0,  389,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  388,  388,    0,  389, 
-          389,    0,    0,  389,  389,  389,  389,  389,  389,  389, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  389,  389,    0,  389,  389,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  389,    0,  389,  389,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  357,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  357,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  389,  389,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  357,  357,    0,    0,  357,  357,  357, 
-          357,  357,  357,  357,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  357,  357,    0,  357,  357, 
-            0,    0,    0,    0,  388,  388,  388,    0,    0,  388, 
-          388,  388,    0,  388,    0,    0,    0,    0,    0,    0, 
-            0,  388,    0,  388,  388,    0,    0,  357,    0,  357, 
-          357,    0,    0,  388,  388,    0,  388,  388,  388,  388, 
-          388,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          357,  357,    0,    0,  388,    0,  388,    0,    0,    0, 
-          388,  388,  388,  388,  388,  388,  388,  388,  388,  388, 
-          388,  388,  388,    0,    0,    0,    0,  388,  388,  388, 
-          388,    0,    0,  388,  389,  389,  389,    0,  388,  389, 
-          389,  389,    0,  389,    0,    0,    0,    0,    0,    0, 
-            0,  389,  388,  389,  389,    0,    0,    0,    0,    0, 
-            0,    0,    0,  389,  389,    0,  389,  389,  389,  389, 
-          389,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  389,    0,  389,    0,    0,    0, 
-          389,  389,  389,  389,  389,  389,  389,  389,  389,  389, 
-          389,  389,  389,    0,    0,    0,    0,  389,  389,  389, 
-          389,    0,    0,  389,    0,    0,    0,    0,  389,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  357,  357, 
-          357,    0,  389,  357,  357,  357,    0,  357,    0,    0, 
-            0,    0,    0,    0,    0,  357,    0,  357,  357,    0, 
-            0,    0,    0,    0,    0,    0,    0,  357,  357,    0, 
-          357,  357,  357,  357,  357,    0,    0,    0,    0,    0, 
+            0,    0,    0,  802,    0,    0,    0,    0,    0,  798, 
+          798,  798,  798,  802,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  797,    0,    0,    0, 
+          802,  802,    0,  797,  802,  802,  802,  802,  802,  802, 
+          802,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  802,  802,  152,  802,  802,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  496,    0,    0,    0,    0,    0,  357,    0, 
-          357,    0,  496,    0,  357,  357,  357,  357,  357,  357, 
-          357,  357,  357,  357,  357,  357,  357,    0,    0,    0, 
-            0,  357,  357,  357,  357,    0,    0,  357,    0,  496, 
-          496,    0,  357,  496,  496,  496,  129,  496,  496,  496, 
-            0,    0,    0,    0,    0,    0,  357,    0,    0,    0, 
-            0,  496,  496,  148,  496,  496,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  496,  496,    0,  496,    0,    0,    0, 
-            0,    0,    0,    0,  496,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  496,  496,  496,    0,    0, 
-            0,  496,  496,    0,    0,  496,  496,  496,  496,  496, 
-          496,  496,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  496,  496,  148,  496,  496,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  687,  496,    0,    0,  496,    0, 
-            0,    0,    0,    0,  687,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  496,  496,  496, 
-            0,  687,  687,    0,    0,  687,  687,  687,  123,  687, 
-          687,  687,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  687,  687,  142,  687,  687,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  496,  496,  496,    0,    0,    0, 
-          496,  496,    0,  496,    0,  687,    0,    0,  687,    0, 
-            0,  496,  496,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  496,  496,    0,  496,  496,  496,  496, 
-          496,    0,    0,    0,    0,    0,    0,    0,  687,  687, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  496,    0,  496,    0,    0,    0, 
-          496,  496,  496,  496,  496,  496,  496,  496,  496,  496, 
-          496,  496,  496,    0,    0,    0,    0,  496,  496,  496, 
-          496,    0,    0,  496,    0,    0,  496,  496,  496,    0, 
-            0,    0,  496,  496,    0,  496,    0,    0,    0,    0, 
-            0,    0,  496,  496,  496,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  496,  496,    0,  496,  496, 
-          496,  496,  496,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  496,    0,  496,    0, 
-            0,    0,  496,  496,  496,  496,  496,  496,  496,  496, 
-          496,  496,  496,  496,  496,    0,    0,    0,    0,  496, 
-          496,  496,  496,    0,    0,  496,  687,  687,  687,    0, 
-            0,    0,  687,  687,    0,  687,    0,    0,    0,    0, 
-            0,    0,    0,  687,  496,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  687,  687,    0,  687,  687, 
-          687,  687,  687,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  686, 
-            0,    0,    0,    0,    0,    0,  687,    0,  687,  686, 
-            0,    0,  687,  687,  687,  687,  687,  687,  687,  687, 
-          687,  687,  687,  687,  687,    0,    0,    0,    0,  687, 
-          687,  687,  687,    0,  699,  687,  686,  686,    0,    0, 
-          686,  686,  686,  122,  686,  686,  686,    0,    0,    0, 
-            0,    0,    0,    0,  687,    0,    0,    0,  686,  686, 
-          141,  686,  686,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  688, 
-          686,    0,    0,  686,    0,    0,    0,    0,    0,  688, 
+            0,    0,    0,    0,  802,    0,    0,  802,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  686,  686,    0,  688,  688,    0,    0, 
-          688,  688,  688,  124,  688,  688,  688,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  688,  688, 
-          143,  688,  688,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  802,  802,  802,  797, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  798,  798,  798,    0,  798,  798,  798, 
+          798,  798,  798,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,    0,    0,    0, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,    0,  798,    0,    0,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,    0,    0,  798,  798, 
+          798,    0,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,    0, 
+            0,  798,  798,  798,  798,  798,    0,  798,  798,  798, 
+          798,  798,    0,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,    0,  798,  798,  798,    0,    0,    0, 
+          797,  797,  797,    0,  797,  802,  802,  802,  797,  797, 
+            0,  802,  802,  797,  802,  797,  797,  797,  797,  797, 
+          797,  797,  802,  802,    0,    0,    0,  797,  797,  797, 
+          797,  797,  797,  797,  802,  802,  797,  802,  802,  802, 
+          802,  802,    0,  797,    0,    0,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,    0,    0,  802,  797,  802,    0,  797, 
+          797,  802,  802,  802,  802,  802,  802,  802,  802,  802, 
+          802,  802,  802,  802,  797,  797,    0,    0,  802,  802, 
+          802,  802,  797,    0,  802,  797,  797,  797,  797,    0, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  802,    0,    0,    0,    0,    0,    0, 
+          797,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          688,  689,    0,  688,    0,    0,    0,    0,    0,    0, 
-            0,  689,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  797,    0,    0,    0,  797,  797,    0, 
+          797,  797,  797,  797,  797,  797,  797,  797,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  797, 
+          797,  151,  797,  797,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  688,  688,    0,    0,    0,  689,  689, 
-            0,    0,  689,  689,  689,  125,  689,  689,  689,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          689,  689,  144,  689,  689,    0,    0,    0,    0,    0, 
+            0,  797,    0,    0,  797,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  686,  686,  686,    0,    0,    0,  686,  686,    0, 
-          686,    0,  689,    0,    0,  689,    0,    0,  686,    0, 
+            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
+            0,    0,    0,  797,  797,  797,  797,  798,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          686,  686,    0,  686,  686,  686,  686,  686,    0,    0, 
-            0,    0,    0,    0,    0,  689,  689,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  686,    0,  686,    0,    0,    0,  686,  686,  686, 
-          686,  686,  686,  686,  686,  686,  686,  686,  686,  686, 
-            0,    0,    0,    0,  686,  686,  686,  686,    0,  698, 
-          686,  688,  688,  688,    0,    0,    0,  688,  688,    0, 
-          688,    0,    0,    0,    0,    0,    0,    0,  688,  686, 
+          798,    0,    0,    0,  798,  798,    0,  798,  798,  798, 
+          798,  798,  798,  798,  798,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  798,  798,  153,  798, 
+          798,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  798,    0, 
+            0,  798,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          688,  688,    0,  688,  688,  688,  688,  688,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          798,  798,  798,  798,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  797,  797,  797, 
+            0,  797,  797,  797,  797,  797,  797,    0,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,    0,    0,    0,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,    0, 
+          797,    0,    0,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+            0,    0,  797,  797,  797,    0,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,    0,    0,  797,  797,  797,  797,  797, 
+            0,  797,  797,  797,  797,  797,    0,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,    0,  797,  797, 
+          797,    0,    0,    0,  798,  798,  798,    0,  798,  798, 
+          798,  798,  798,  798,    0,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,    0,    0, 
+            0,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,    0,  798,    0,    0, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,    0,    0,  798, 
+          798,  798,    0,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+            0,    0,  798,  798,  798,  798,  798,    0,  798,  798, 
+          798,  798,  798,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  357,  798,  798,  798,    0,    0, 
+            0,    0,    0,    0,  357,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
+            0,  357,  357,    0,  798,  357,  357,  357,  135,  357, 
+          357,  357,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  357,  357,  154,  357,  357,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  357,    0,    0,  357,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  688,    0,  688,    0,    0,    0,  688,  688,  688, 
-          688,  688,  688,  688,  688,  688,  688,  688,  688,  688, 
-            0,    0,    0,    0,  688,  688,  688,  688,    0,  700, 
-          688,    0,    0,  689,  689,  689,    0,    0,    0,  689, 
-          689,    0,  689,    0,    0,    0,    0,    0,    0,  688, 
-          689,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  689,  689,    0,  689,  689,  689,  689,  689, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  691,    0,    0,    0, 
-            0,    0,    0,  689,    0,  689,  691,    0,    0,  689, 
-          689,  689,  689,  689,  689,  689,  689,  689,  689,  689, 
-          689,  689,    0,    0,    0,    0,  689,  689,  689,  689, 
-            0,  701,  689,  691,  691,    0,    0,  691,  691,  691, 
-          127,  691,  691,  691,    0,    0,    0,    0,    0,    0, 
-            0,  689,    0,    0,    0,  691,  691,  146,  691,  691, 
+            0,  357,    0,    0,    0,    0,    0,    0,  357,  357, 
+          798,  357,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  798,    0,    0,    0,  357,  357, 
+            0,  798,  357,  357,  357,  357,  357,  357,  357,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  690,  691,    0,    0, 
-          691,    0,    0,    0,    0,    0,  690,    0,    0,    0, 
+          357,  357,  154,  357,  357,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          691,  691,    0,  690,  690,    0,    0,  690,  690,  690, 
-          126,  690,  690,  690,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  690,  690,  145,  690,  690, 
+            0,    0,  357,    0,    0,  357,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  690,  692,    0, 
-          690,    0,    0,    0,    0,    0,    0,    0,  692,    0, 
+            0,    0,    0,    0,    0,  357,  357,  798,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  798,  798,  798,    0,  798,  357,  357,  357,  798, 
+          798,    0,  357,  357,  798,  357,  798,  798,  798,  798, 
+          798,  798,  798,  357,    0,    0,    0,    0,  798,  798, 
+          798,  798,  798,  798,  798,  357,  357,  798,  357,  357, 
+          357,  357,  357,    0,  798,    0,    0,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,    0,    0,  357,  798,  357,    0, 
+          798,  798,  357,  357,  357,  357,  357,  357,  357,  357, 
+          357,  357,  357,  357,  357,  798,  798,    0,    0,  357, 
+          357,  357,  357,  798,    0,  357,  798,  798,  798,  798, 
+            0,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,    0,  798,  798,  357,    0,    0,    0,  798,  798, 
+          798,    0,  798,  357,  357,  357,  798,  798,    0,  357, 
+          357,  798,  357,  798,  798,  798,  798,  798,  798,  798, 
+          357,    0,    0,    0,    0,  798,  798,  798,  798,  798, 
+          798,  798,  357,  357,  798,  357,  357,  357,  357,  357, 
+            0,  798,    0,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,    0,    0,  357,  798,  357,    0,  798,  798,  357, 
+          357,  357,  357,  357,  357,  357,  357,  357,  357,  357, 
+          357,  357,  798,  798,    0,    0,  357,  357,  357,  357, 
+          798,    0,  357,  798,  798,  798,  798,    0,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  825,  798, 
+          798,  357,    0,    0,    0,    0,    0,    0,  825,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  324,    0,    0,    0,    0,    0,    0,    0,  825, 
+            0,    0,    0,    0,  825,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  825,    0, 1114, 
+         1114,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  392,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  392,    0,    0, 
+            0,  825,    0,  825,  324,    0, 1114, 1114,    0,    0, 
+         1114,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  392,  392,    0,    0,  392,  392, 
+          392,  392,  392,  392,  392,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0, 1114,    0,  392,  392,    0,  392, 
+          392,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0, 1114,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  392,    0, 
+          392,  392,    0, 1114,    0,    0,    0, 1114,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+         1114, 1114, 1114, 1114,    0,    0,    0, 1114, 1114,    0, 
+         1114,  392,  392,    0,    0,    0,    0,    0,    0,    0, 
+          571,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          571,    0,    0,    0,    0,  324,  324,  324,    0,  324, 
+          825,  825,  825,  324,  324,  825,  825,  825,  324,  825, 
+          324,  324,  324,  324,  324,  324,  324,  825,  825,  825, 
+            0,  571,  324,  324,  324,  324,  324,  324,  324,  825, 
+          825,  324,  825,  825,  825,  825,  825,    0,  324,  571, 
+            0,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,    0,    0, 
+          825,  324,  825,    0,  324,  324,    0,    0,    0,    0, 
+            0,    0,    0,  571,    0,    0,    0,    0, 1114,  324, 
+          324, 1114,    0,    0,    0,  825,  825,  324,    0, 1114, 
+          324,  324,  324,  324,    0,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  571,  324,  324,  825,  392, 
+          392,  392,    0,    0,  392,  392,  392,    0,  392,    0, 
+            0,    0,    0,    0,    0,    0,  392,    0,  392,  392, 
+            0,    0,    0,    0,    0,    0,    0,    0,  392,  392, 
+            0,  392,  392,  392,  392,  392, 1114,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  393,    0,    0,    0,    0,    0,  392, 
+            0,  392,    0,  393,    0,  392,  392,  392,  392,  392, 
+          392,  392,  392,  392,  392,  392,  392,  392,    0,    0, 
+            0,    0,  392,  392,  392,  392,    0,    0,  392,    0, 
+          393,  393,    0,  392,  393,  393,  393,  393,  393,  393, 
+          393,    0,    0,    0,    0,    0,    0,  392,    0,    0, 
+            0,    0,  393,  393,    0,  393,  393,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  571,  571,  571,    0,    0,  571,  571,  571, 
+            0,  571,    0,  361,  393,    0,  393,  393,    0,  571, 
+            0,  571,    0,  361,    0,    0,    0,    0,    0,    0, 
+            0,  571,  571,    0,  571,  571,  571,  571,  571,    0, 
+            0,    0,    0,    0,    0,    0,    0,  393,  393,    0, 
+          361,  361,    0,    0,  361,  361,  361,  361,  361,  361, 
+          361,    0,  571,    0,  571,    0,    0,    0,    0,    0, 
+            0,    0,  361,  361,    0,  361,  361,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  361,    0,  361,  361,    0,  500, 
+          571,    0,    0,    0,    0,    0,    0,    0,    0,  500, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  361,  361,    0, 
+            0,    0,    0,    0,    0,    0,  500,  500,    0,    0, 
+          500,  500,  500,  131,  500,  500,  500,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  500,  500, 
+          150,  500,  500,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  393,  393,  393,    0,    0, 
+          393,  393,  393,    0,  393,    0,    0,    0,    0,    0, 
+          500,    0,  393,  500,  393,  393,    0,    0,    0,    0, 
+            0,    0,    0,    0,  393,  393,    0,  393,  393,  393, 
+          393,  393,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  500,  500,  500,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  393,    0,  393,    0, 1115, 
+         1115,  393,  393,  393,  393,  393,  393,  393,  393,  393, 
+          393,  393,  393,  393,    0,    0,    0,    0,  393,  393, 
+          393,  393,    0,    0,  393,  361,  361,  361,    0,  393, 
+          361,  361,  361,    0,  361,    0,    0,    0,    0,    0, 
+            0,    0,  361,  393,  361,  361,    0,    0,    0,    0, 
+            0,    0,    0,    0,  361,  361,    0,  361,  361,  361, 
+          361,  361,    0,    0,    0,    0, 1115, 1115,    0,    0, 
+         1115,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  361,    0,  361,    0,    0, 
+            0,  361,  361,  361,  361,  361,  361,  361,  361,  361, 
+          361,  361,  361,  361, 1115,    0,    0,    0,  361,  361, 
+          361,  361,    0,    0,  361,    0,    0,    0,    0,  361, 
+            0,  500,  500,  500,    0, 1115,    0,  500,  500,    0, 
+          500,    0,    0,  361,    0,    0,    0,    0,  500,  500, 
+            0,    0,    0, 1115,    0,    0,    0, 1115,    0,    0, 
+          500,  500,    0,  500,  500,  500,  500,  500,    0,    0, 
+         1115, 1115, 1115, 1115,    0,    0,    0, 1115, 1115,    0, 
+         1115,    0,    0,    0,  500,    0,    0,    0,    0,    0, 
+            0,  500,    0,  500,  500,    0,    0,  500,  500,  500, 
+          500,  500,  500,  500,  500,  500,  500,  500,  500,  500, 
+            0,    0,    0,    0,  500,  500,  500,  500,    0,    0, 
+          500,  500,  500,    0,    0,  500,  500,  500,  500,  500, 
+          500,  500,    0,    0,    0,    0,    0,    0,    0,  500, 
+            0,    0,    0,  500,  500,  150,  500,  500,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  691,  500,    0,    0,  500,    0, 
+            0,    0,    0,    0,  691,    0,    0,    0, 1115,    0, 
+            0, 1115,    0,    0,    0,    0,    0,    0,    0, 1115, 
+            0,    0,    0,    0,    0,    0,    0,  500,  500,  500, 
+            0,  691,  691,    0,    0,  691,  691,  691,  125,  691, 
+          691,  691,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  691,  691,  144,  691,  691,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1115,    0,    0,    0, 
+            0,    0,    0,    0,    0,  691,  690,    0,  691,    0, 
+            0,    0,    0,    0,    0,    0,  690,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          690,  690,    0,    0,    0,  692,  692,    0,    0,  692, 
-          692,  692,  128,  692,  692,  692,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  692,  692,  147, 
-          692,  692,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,  691,  691, 
-          691,    0,    0,    0,  691,  691,    0,  691,    0,  692, 
-            0,    0,  692,    0,    0,  691,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  691,  691,    0, 
-          691,  691,  691,  691,  691,    0,    0,    0,    0,    0, 
-            0,    0,  692,  692,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  691,    0, 
-          691,    0,    0,    0,  691,  691,  691,  691,  691,  691, 
-          691,  691,  691,  691,  691,  691,  691,    0,    0,    0, 
-            0,  691,  691,  691,  691,    0,  703,  691,  690,  690, 
+            0,    0,    0,  690,  690,    0,    0,  690,  690,  690, 
+          124,  690,  690,  690,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  690,  690,  143,  690,  690, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  500,  500,  500,    0, 
+            0,    0,  500,  500,    0,  500,    0,  690,    0,    0, 
+          690,    0,    0,  500,  500,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  500,  500,    0,  500,  500, 
+          500,  500,  500,    0,    0,    0,    0,    0,    0,    0, 
+          690,  690,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  500,    0,  500,    0, 
+            0,    0,  500,  500,  500,  500,  500,  500,  500,  500, 
+          500,  500,  500,  500,  500,    0,    0,    0,    0,  500, 
+          500,  500,  500,    0,    0,  500,  691,  691,  691,    0, 
+            0,    0,  691,  691,    0,  691,    0,    0,    0,    0, 
+            0,    0,    0,  691,  500,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  691,  691,    0,  691,  691, 
+          691,  691,  691,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  691,    0,  691,    0, 
+            0,    0,  691,  691,  691,  691,  691,  691,  691,  691, 
+          691,  691,  691,  691,  691,    0,    0,    0,    0,  691, 
+          691,  691,  691,    0,  703,  691,    0,    0,  690,  690, 
           690,    0,    0,    0,  690,  690,    0,  690,    0,    0, 
-            0,    0,    0,    0,    0,  690,  691,    0,    0,    0, 
+            0,    0,    0,    0,  691,  690,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,  690,  690,    0, 
           690,  690,  690,  690,  690,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  690,    0, 
-          690,    0,    0,    0,  690,  690,  690,  690,  690,  690, 
+            0,  692,    0,    0,    0,    0,    0,    0,  690,    0, 
+          690,  692,    0,    0,  690,  690,  690,  690,  690,  690, 
           690,  690,  690,  690,  690,  690,  690,    0,    0,    0, 
-            0,  690,  690,  690,  690,    0,  702,  690,    0,    0, 
-          692,  692,  692,    0,    0,    0,  692,  692,    0,  692, 
-            0,    0,    0,    0,    0,    0,  690,  692,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  692, 
-          692,    0,  692,  692,  692,  692,  692,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  683,    0,    0,    0,    0,    0,    0, 
-          692,    0,  692,  683,    0,    0,  692,  692,  692,  692, 
-          692,  692,  692,  692,  692,  692,  692,  692,  692,    0, 
-            0,    0,    0,  692,  692,  692,  692,    0,  704,  692, 
-          683,  683,    0,    0,  683,  683,  683,  119,  683,  683, 
-          683,    0,    0,    0,    0,    0,    0,    0,  692,    0, 
-            0,    0,  683,  683,  138,  683,  683,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  682,  683,    0,    0,  683,    0,    0, 
-            0,    0,    0,  682,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  683,  683,    0, 
-          682,  682,    0,    0,  682,  682,  682,  118,  682,  682, 
-          682,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  682,  682,  137,  682,  682,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  682,  685,    0,  682,    0,    0, 
-            0,    0,    0,    0,    0,  685,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  682,  682,    0, 
-            0,    0,  685,  685,    0,    0,  685,  685,  685,  121, 
-          685,  685,  685,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  685,  685,  140,  685,  685,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  683,  683,  683,    0,    0, 
-            0,  683,  683,    0,  683,    0,  685,    0,    0,  685, 
-            0,    0,  683,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  683,  683,    0,  683,  683,  683, 
-          683,  683,    0,    0,    0,    0,    0,    0,    0,  685, 
-          685,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  683,    0,  683,    0,    0, 
-            0,  683,  683,  683,  683,  683,  683,  683,  683,  683, 
-          683,  683,  683,  683,    0,    0,    0,    0,  683,  683, 
-          683,  683,    0,  695,  683,  682,  682,  682,    0,    0, 
-            0,  682,  682,    0,  682,    0,    0,    0,    0,    0, 
-            0,    0,  682,  683,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  682,  682,    0,  682,  682,  682, 
-          682,  682,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  682,    0,  682,    0,    0, 
-            0,  682,  682,  682,  682,  682,  682,  682,  682,  682, 
-          682,  682,  682,  682,    0,    0,    0,    0,  682,  682, 
-          682,  682,    0,  694,  682,    0,    0,  685,  685,  685, 
-            0,    0,    0,  685,  685,    0,  685,    0,    0,    0, 
-            0,    0,    0,  682,  685,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  685,  685,    0,  685, 
-          685,  685,  685,  685,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          346,    0,    0,    0,    0,    0,    0,  685,    0,  685, 
-          346,    0,    0,  685,  685,  685,  685,  685,  685,  685, 
-          685,  685,  685,  685,  685,  685,    0,    0,    0,    0, 
-          685,  685,  685,  685,    0,  697,  685,  346,  346,    0, 
-            0,  346,  346,  346,  135,  346,  346,  346,    0,    0, 
-            0,    0,    0,    0,    0,  685,    0,    0,    0,  346, 
-          346,  154,  346,  346,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          354,  346,    0,    0,  346,    0,    0,    0,    0,    0, 
-          354,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  346,  346,    0,  354,  354,    0, 
-            0,  354,  354,  354,  134,  354,  354,  354,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  354, 
-          354,  153,  354,  354,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  354,  346,    0,  354,    0,    0,    0,    0,    0, 
-            0,    0,  346,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  354,  354,    0,    0,    0,  346, 
-          346,    0,    0,  346,  346,  346,  346,  346,  346,  346, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  346,  346,  154,  346,  346,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  346,  346,  346,    0,    0,    0,  346,  346, 
-            0,  346,    0,  346,    0,    0,  346,    0,    0,  346, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  346,  346,    0,  346,  346,  346,  346,  346,    0, 
-            0,    0,    0,    0,    0,    0,  346,  346,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  346,    0,  346,    0,    0,    0,  346,  346, 
-          346,  346,  346,  346,  346,  346,  346,  346,  346,  346, 
-          346,    0,    0,    0,    0,  346,  346,  346,  346,    0, 
-          792,  346,  354,  354,  354,    0,    0,    0,  354,  354, 
-          792,  354,    0,    0,    0,    0,    0,    0,    0,  354, 
-          346,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  354,  354,    0,  354,  354,  354,  354,  354,    0, 
-            0,  792,    0,    0,  792,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  792, 
-            0,    0,  354,    0,  354,    0,    0,    0,  354,  354, 
-          354,  354,  354,  354,  354,  354,  354,  354,  354,  354, 
-          354,    0,    0,    0,    0,  354,  354,  354,  354,    0, 
-            0,  354,    0,  792,  346,  346,  346,    0,  326,    0, 
-          346,  346,    0,  346,    0,    0,    0,    0,  326,    0, 
-          354,  346,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  346,  346,  792,  346,  346,  346,  346, 
-          346,    0,    0,    0,    0,    0,    0,    0,    0,  326, 
-            0,    0,  326,    0,    0,  328,    0,    0,    0,    0, 
-            0,    0,    0,    0,  346,  328,  346,  326,    0,    0, 
-          346,  346,  346,  346,  346,  346,  346,  346,  346,  346, 
-          346,  346,  346,    0,    0,    0,    0,  346,  346,  346, 
-          346,    0,    0,  346,  581,    0,  328,    0,    0,  328, 
-            0,  326,    0,    0,  581,    0,    0,    0,    0,    0, 
-            0,    0,  346,    0,  328,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  326,    0,  581,    0,    0,  581,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  328,    0, 
-            0,    0,    0,  581,    0,    0,    0,    0,    0,    0, 
+            0,  690,  690,  690,  690,    0,  702,  690,  692,  692, 
+            0,    0,  692,  692,  692,  126,  692,  692,  692,    0, 
+            0,    0,    0,    0,    0,    0,  690,    0,    0,    0, 
+          692,  692,  145,  692,  692,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  693,  692,    0,    0,  692,    0,    0,    0,    0, 
+            0,  693,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  692,  692,    0,  693,  693, 
+            0,    0,  693,  693,  693,  127,  693,  693,  693,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          693,  693,  146,  693,  693,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  693,  695,    0,  693,    0,    0,    0,    0, 
+            0,    0,    0,  695,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  693,  693,    0,    0,    0, 
+          695,  695,    0,    0,  695,  695,  695,  129,  695,  695, 
+          695,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  695,  695,  148,  695,  695,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  692,  692,  692,    0,    0,    0,  692, 
+          692,    0,  692,    0,  695,    0,    0,  695,    0,    0, 
+          692,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  692,  692,    0,  692,  692,  692,  692,  692, 
+            0,    0,    0,    0,    0,    0,    0,  695,  695,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  692,    0,  692,    0,    0,    0,  692, 
+          692,  692,  692,  692,  692,  692,  692,  692,  692,  692, 
+          692,  692,    0,    0,    0,    0,  692,  692,  692,  692, 
+            0,  704,  692,  693,  693,  693,    0,    0,    0,  693, 
+          693,    0,  693,    0,    0,    0,    0,    0,    0,    0, 
+          693,  692,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  693,  693,    0,  693,  693,  693,  693,  693, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  693,    0,  693,    0,    0,    0,  693, 
+          693,  693,  693,  693,  693,  693,  693,  693,  693,  693, 
+          693,  693,    0,    0,    0,    0,  693,  693,  693,  693, 
+            0,  705,  693,    0,    0,  695,  695,  695,    0,    0, 
+            0,  695,  695,    0,  695,    0,    0,    0,    0,    0, 
+            0,  693,  695,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  695,  695,    0,  695,  695,  695, 
+          695,  695,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  694,    0, 
+            0,    0,    0,    0,    0,  695,    0,  695,  694,    0, 
+            0,  695,  695,  695,  695,  695,  695,  695,  695,  695, 
+          695,  695,  695,  695,    0,    0,    0,    0,  695,  695, 
+          695,  695,    0,  707,  695,  694,  694,    0,    0,  694, 
+          694,  694,  128,  694,  694,  694,    0,    0,    0,    0, 
+            0,    0,    0,  695,    0,    0,    0,  694,  694,  147, 
+          694,  694,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  696,  694, 
+            0,    0,  694,    0,    0,    0,    0,    0,  696,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  694,  694,    0,  696,  696,    0,    0,  696, 
+          696,  696,  130,  696,  696,  696,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  696,  696,  149, 
+          696,  696,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  696, 
+          687,    0,  696,    0,    0,    0,    0,    0,    0,    0, 
+          687,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  696,  696,    0,    0,    0,  687,  687,    0, 
+            0,  687,  687,  687,  121,  687,  687,  687,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  687, 
+          687,  140,  687,  687,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  792,  792,  792,    0,    0,  792,  792,  792, 
-          328,  792,    0,    0,    0,    0,    0,  581,    0,  792, 
-            0,  792,  792,    0,    0,    0,    0,    0,    0,    0, 
-            0,  792,  792,  588,  792,  792,  792,  792,  792,    0, 
-            0,    0,    0,  588,    0,    0,    0,    0,  581,  581, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  792,    0,  792,    0,    0,    0,    0,    0, 
-            0,    0,  584,    0,  588,    0,    0,  588,    0,    0, 
-            0,    0,  584,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  588,    0,    0,    0,  792,    0,    0,    0, 
-          326,  326,  326,    0,    0,  326,  326,  326,    0,  326, 
-          792,    0,    0,  584,    0,    0,  584,  326,    0,  326, 
-          326,    0,    0,    0,    0,    0,  588,    0,    0,  326, 
-          326,  584,  326,  326,  326,  326,  326,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  328,  328,  328, 
-            0,    0,  328,  328,  328,    0,  328,  588,  588,    0, 
-          326,    0,  326,    0,  328,  584,  328,  328,    0,    0, 
-            0,    0,    0,    0,    0,    0,  328,  328,    0,  328, 
-          328,  328,  328,  328,    0,    0,  581,  581,  581,    0, 
-            0,  581,  581,  581,  326,  581,  584,  584,    0,    0, 
-            0,    0,    0,  581,    0,  581,    0,  328,  326,  328, 
-            0,    0,    0,  585,    0,  581,  581,    0,  581,  581, 
-          581,  581,  581,  585,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  328,    0,    0,    0,    0,  581,    0,  581,    0, 
-            0,    0,    0,    0,  585,  328,    0,  585,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  585,    0,    0,  581,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  581,  588,  588,  588,    0,    0, 
-          588,  588,  588,    0,  588,    0,  585,    0,    0,    0, 
-            0,    0,  588,    0,  588,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  588,  588,    0,  588,  588,  588, 
-          588,  588,  528,    0,  584,  584,  584,  585,  585,  584, 
-          584,  584,  528,  584,    0,    0,    0,    0,    0,    0, 
-            0,  584,    0,  584,    0,  588,    0,  588,    0,    0, 
-            0,    0,    0,  584,  584,    0,  584,  584,  584,  584, 
-          584,  562,    0,  528,    0,    0,  528,    0,    0,    0, 
-            0,  562,    0,    0,  588,    0,    0,    0,    0,    0, 
-            0,  528,    0,    0,  584,    0,  584,    0,    0,    0, 
-            0,    0,    0,  588,    0,    0,    0,    0,    0,  573, 
-            0,    0,  562,    0,    0,  562,    0,    0,    0,  573, 
-            0,    0,    0,  584,    0,  528,    0,    0,    0,    0, 
-          562,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  584,    0,    0,    0,    0,    0,    0,    0, 
-          573,    0,    0,  573,    0,    0,  550,  528,    0,    0, 
-            0,    0,    0,    0,  562,    0,  550,    0,  573,    0, 
-            0,    0,    0,    0,    0,  585,  585,  585,    0,    0, 
-          585,  585,  585,    0,  585,    0,    0,    0,    0,    0, 
-            0,    0,  585,    0,  585,    0,  562,  550,    0,    0, 
-          565,    0,  573,    0,  585,  585,    0,  585,  585,  585, 
-          585,  585,    0,    0,    0,  550,    0,    0,    0,  572, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  572, 
-            0,    0,    0,    0,  573,  585,    0,  585,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  550, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          572,    0,    0,  572,  585,    0,  565,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  565,    0,  572,    0, 
-            0,  550,    0,  585,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  528,  528,  528,    0,    0,  528, 
-          528,  528,    0,  528,    0,  553,    0,  565,    0,    0, 
-          565,  528,  572,  528,    0,  553,    0,    0,    0,    0, 
-            0,    0,    0,  528,  528,  565,  528,  528,  528,  528, 
-          528,    0,    0,  562,  562,  562,    0,    0,  562,  562, 
-          562,    0,  562,    0,  572,    0,  553,    0,    0,    0, 
-          562,    0,  562,    0,  528,    0,  528,    0,    0,  565, 
-            0,    0,  562,  562,  553,  562,  562,  562,  562,  562, 
-            0,  573,  573,  573,    0,    0,  573,  573,  573,    0, 
-          573,    0,    0,  528,    0,    0,    0,    0,  573,    0, 
-          573,  565,    0,  562,    0,  562,    0,    0,  553,  559, 
-          573,  573,  528,  573,  573,  573,  573,  573,    0,  559, 
-            0,    0,    0,    0,    0,    0,    0,    0,  550,  550, 
-          550,    0,    0,  550,  550,  550,    0,  550,    0,    0, 
-          553,  573,    0,  573,    0,  550,    0,  550,    0,    0, 
-          559,  562,    0,    0,    0,    0,    0,  550,  550,    0, 
-          550,  550,  550,  550,  550,    0,    0,    0,  559,    0, 
-            0,    0,  554,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  554,    0,    0,    0,    0,    0,  550,  573, 
-          550,  572,  572,  572,    0,    0,  572,  572,  572,    0, 
-          572,    0,  559,    0,    0,    0,    0,    0,  572,    0, 
-          572,    0,    0,  554,    0,    0,    0,    0,    0,    0, 
-          572,  572,   79,  572,  572,  572,  572,  572,    0,    0, 
-            0,  554,   79,    0,  559,    0,  550,    0,  565,  565, 
-          565,    0,    0,  565,  565,  565,    0,  565,    0,    0, 
-            0,  572,    0,  572,    0,  565,    0,  565,    0,    0, 
-            0,    0,    0,   79,    0,  554,    0,  565,  565,    0, 
-          565,  565,  565,  565,  565,    0,    0,  553,  553,  553, 
-            0,   79,  553,  553,  553,   81,  553,    0,    0,    0, 
-            0,    0,    0,    0,  553,   81,  553,  554,  565,  572, 
-          565,    0,    0,    0,    0,    0,  553,  553,    0,  553, 
-          553,  553,  553,  553,    0,    0,    0,    0,    0,    0, 
-            0,    0,   82,    0,    0,    0,   81,    0,    0,    0, 
-            0,    0,   82,    0,    0,    0,    0,  553,    0,  553, 
-            0,    0,    0,    0,   81,    0,  565,   79,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   82,    0,    0,    0,    0,    0,    0, 
-            0,  559,  559,  559,    0,    0,  559,  559,  559,    0, 
-          559,   82,    0,    0,    0,  553,    0,    0,  559,    0, 
-          559,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          559,  559,    0,  559,  559,  559,  559,  559,    0,    0, 
-           81,    0,    0,    0,  520,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  520,    0,    0,    0,    0,    0, 
-            0,  559,    0,  559,  554,  554,  554,    0,    0,  554, 
-          554,  554,    0,  554,    0,    0,    0,   82,    0,    0, 
-            0,  554,    0,  554,    0,  520,    0,    0,    0,    0, 
-            0,    0,    0,  554,  554,    0,  554,  554,  554,  554, 
-          554,    0,    0,  520,    0,    0,    0,    0,    0,  559, 
-            0,    0,    0,    0,   79,   79,   79,    0,    0,   79, 
-           79,   79,    0,   79,  554,    0,  554,    0,    0,  521, 
-            0,   79,    0,   79,    0,    0,    0,    0,    0,  521, 
-            0,    0,    0,   79,   79,    0,   79,   79,   79,   79, 
-           79,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  520, 
-          521,    0,  554,    0,   79,    0,   79,   81,   81,   81, 
-            0,    0,   81,   81,   81,    0,   81,    0,  521,    0, 
-            0,    0,    0,  558,   81,    0,   81,    0,    0,    0, 
-            0,    0,    0,  558,    0,    0,   81,   81,    0,   81, 
-           81,   81,   81,   81,   82,   82,   82,    0,    0,   82, 
-           82,   82,   79,   82,    0,    0,    0,    0,    0,    0, 
-            0,   82,    0,   82,  558,    0,    0,   81,    0,   81, 
-            0,    0,    0,   82,   82,  559,   82,   82,   82,   82, 
-           82,    0,  558,    0,  521,  559,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,   82,    0,   82,    0,    0,    0, 
-            0,    0,    0,    0,    0,   81,  559,   69,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   69,    0,    0, 
-            0,    0,    0,    0,  559,    0,  520,  520,  520,    0, 
-            0,  520,  520,  520,    0,  520,    0,    0,  558,    0, 
-            0,    0,   82,  520,    0,  520,    0,    0,   69,    0, 
-            0,    0,    0,    0,    0,  520,  520,    0,  520,  520, 
-          520,  520,  520,    0,    0,    0,   69,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  520,    0,  520,    0, 
-          559,    0,  333,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  333,    0,    0,    0,    0,    0,    0,    0, 
-            0,  521,  521,  521,    0,    0,  521,  521,  521,    0, 
-          521,    0,    0,    0,    0,    0,    0,    0,  521,   30, 
-          521,    0,   69,  333,  520,    0,  326,    0,    0,   30, 
-          521,  521,   55,  521,  521,  521,  521,  521,    0,    0, 
-            0,  333,   55,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-           30,  521,    0,  521,    0,  558,  558,  558,    0,    0, 
-          558,  558,  558,   55,  558,    0,    0,    0,   30,    0, 
-            0,    0,  558,    0,  558,    0,    0,    0,    0,    0, 
-            0,   55,    0,    0,  558,  558,    0,  558,  558,  558, 
-          558,  558,    0,    0,   51,    0,    0,  333,    0,  521, 
-            0,    0,    0,    0,   51,    0,    0,  559,  559,  559, 
-            0,    0,  559,  559,  559,  558,  559,  558,    0,    0, 
-            0,    0,    0,    0,  559,    0,  559,    0,    0,    0, 
-            0,    0,    0,    0,   30,   51,  559,  559,    0,  559, 
-          559,  559,  559,  559,    0,    0,    0,   55,    0,   69, 
-           69,   69,    0,   51,   69,   69,   69,    0,   69,    0, 
-            0,    0,   52,  558,    0,    0,    0,  559,   69,  559, 
-            0,    0,   52,    0,    0,    0,    0,    0,   69,   69, 
-            0,   69,   69,   69,   69,   69,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   52,   57,    0,    0,    0,    0,   69, 
-            0,   69,    0,    0,   57,  559,    0,    0,    0,   51, 
-            0,   52,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  333,  333,  333,    0,    0,    0, 
-          333,  333,    0,  333,    0,   57,    0,    0,    0,    0, 
-            0,  333,    0,    0,    0,    0,    0,   69,    0,    0, 
-            0,    0,    0,   57,    0,    0,  333,  333,  333,  333, 
-          333,   30,   30,   30,    0,    0,    0,   30,   30,    0, 
-           30,    0,   41,    0,   55,   55,   55,   52,   30,    0, 
-           55,   55,   41,   55,  333,    0,  333,    0,    0,    0, 
-            0,   55,   56,   30,   30,   30,   30,   30,    0,    0, 
-            0,    0,   56,    0,    0,    0,   55,   55,   55,   55, 
-           55,    0,    0,   41,    0,    0,    0,    0,    0,   57, 
-            0,   30,    0,   30,    0,    0,    0,    0,    0,    0, 
-            0,   41,  333,   56,   55,    0,   55,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,   51,   51,   51,    0, 
-            0,   56,   51,   51,    0,   51,    0,    0,    0,    0, 
-            0,    0,    0,   51,    0,    0,    0,    0,    0,   30, 
-            0,    0,    0,    0,    0,    0,    0,    0,   51,   51, 
-           51,   51,   55,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   41,    0,    0, 
-            0,    0,    0,    0,    0,    0,   51,    0,   51,    0, 
-            0,    0,    0,    0,   52,   52,   52,   56,    0,    0, 
-           52,   52,    0,   52,    0,    0,    0,    0,    0,    0, 
-            0,   52,    0,    0,    0,    0,  155,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,   52,   52,   52,   52, 
-            0,    0,    0,    0,   51,    0,   57,   57,   57,  155, 
-            0,    0,   57,   57,    0,   57,  793,    0,    0,    0, 
-            0,    0,  681,   57,   52,    0,   52,    0,    0,    0, 
-            0,    0,    0,    0,    0,  155,  155,    0,   57,   57, 
-           57,   57,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,   57,  681,   57,    0, 
-            0,    0,   52,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,   41,   41,   41,    0,    0,    0, 
-           41,   41,    0,   41,    0,    0,    0,    0,    0,  793, 
-            0,   41,  155,    0,   56,   56,   56,    0,    0,    0, 
-           56,   56,  156,   56,   57,    0,   41,   41,   41,   41, 
-            0,   56,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  156,   56,   56,   56,   56, 
-            0,    0,  794,    0,   41,    0,   41,    0,  684,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  156,  156,    0,   56,    0,   56,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,   41,  684,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,   56,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  794,    0,    0,  156,    0, 
-            0,    0,  155,  155,  155,  155,  155,  155,  155,  155, 
-          155,  155,  155,    0,    0,  155,  155,    0,  155,  155, 
-          155,  155,  155,  155,  155,    0,  793,    0,    0,    0, 
-          155,  155,  155,  155,  155,  155,  155,    0,    0,  155, 
-            0,    0,    0,    0,    0,  155,  155,  155,  155,  155, 
-          155,  155,  155,  155,  155,  155,  155,  155,    0,  155, 
-          155,  155,  155,  155,  155,  155,    0,    0,  155,  155, 
-            0,    0,  155,  155,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  155,  155,    0, 
-            0,    0,    0,  681,  681,  155,    0,    0,  155,  155, 
-          155,  155,    0,  155,    0,    0,  155,  155,  155,  155, 
-          155,  155,  155,    0,  155,  155,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  156,  156, 
-          156,  156,  156,  156,  156,  156,  156,  156,  156,    0, 
-            0,  156,  156,    0,  156,  156,  156,  156,  156,  156, 
-          156,    0,  794,    0,    0,    0,  156,  156,  156,  156, 
-          156,  156,  156,    0,    0,  156,    0,    0,    0,    0, 
-            0,  156,  156,  156,  156,  156,  156,  156,  156,  156, 
-          156,  156,  156,  156,    0,  156,  156,  156,  156,  156, 
-          156,  156,    0,    0,  156,  156,    0,    0,  156,  156, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  156,  156,    0,  155,    0,    0,  684, 
-          684,  156,    0,    0,  156,  156,  156,  156,    0,  156, 
-            0,    0,  156,  156,  156,  156,  156,  156,  156,  155, 
-          156,  156,    0,    0,    0,    0,  793,    0,    0,    0, 
-            0,    0,  798,    0,    0,    0, 1103, 1103,    0,    0, 
-            0,    0,    0,    0,    0,  155,  155,    0,    0,    0, 
+          694,  694,  694,    0,    0,    0,  694,  694,    0,  694, 
+            0,  687,    0,    0,  687,    0,    0,  694,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  694, 
+          694,    0,  694,  694,  694,  694,  694,    0,    0,    0, 
+            0,    0,    0,    0,  687,  687,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          694,    0,  694,    0,    0,    0,  694,  694,  694,  694, 
+          694,  694,  694,  694,  694,  694,  694,  694,  694,    0, 
+            0,    0,    0,  694,  694,  694,  694,    0,  706,  694, 
+          696,  696,  696,    0,    0,    0,  696,  696,    0,  696, 
+            0,    0,    0,    0,    0,    0,    0,  696,  694,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  696, 
+          696,    0,  696,  696,  696,  696,  696,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          696,    0,  696,    0,    0,    0,  696,  696,  696,  696, 
+          696,  696,  696,  696,  696,  696,  696,  696,  696,    0, 
+            0,    0,    0,  696,  696,  696,  696,    0,  708,  696, 
+            0,    0,  687,  687,  687,    0,    0,    0,  687,  687, 
+            0,  687,    0,    0,    0,    0,    0,    0,  696,  687, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  687,  687,    0,  687,  687,  687,  687,  687,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  686,    0,    0,    0,    0, 
+            0,    0,  687,    0,  687,  686,    0,    0,  687,  687, 
+          687,  687,  687,  687,  687,  687,  687,  687,  687,  687, 
+          687,    0,    0,    0,    0,  687,  687,  687,  687,    0, 
+          699,  687,  686,  686,    0,    0,  686,  686,  686,  120, 
+          686,  686,  686,    0,    0,    0,    0,    0,    0,    0, 
+          687,    0,    0,    0,  686,  686,  139,  686,  686,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  689,  686,    0,    0,  686, 
+            0,    0,    0,    0,    0,  689,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  686, 
+          686,    0,  689,  689,    0,    0,  689,  689,  689,  123, 
+          689,  689,  689,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  689,  689,  142,  689,  689,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  689,  350,    0,  689, 
+            0,    0,    0,    0,    0,    0,    0,  350,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  689, 
+          689,    0,    0,    0,  350,  350,    0,    0,  350,  350, 
+          350,  137,  350,  350,  350,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  350,  350,  156,  350, 
+          350,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  686,  686,  686, 
+            0,    0,    0,  686,  686,    0,  686,    0,  350,    0, 
+            0,  350,    0,    0,  686,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  686,  686,    0,  686, 
+          686,  686,  686,  686,    0,    0,    0,    0,    0,    0, 
+            0,  350,  350,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  686,    0,  686, 
+            0,    0,    0,  686,  686,  686,  686,  686,  686,  686, 
+          686,  686,  686,  686,  686,  686,    0,    0,    0,    0, 
+          686,  686,  686,  686,    0,  698,  686,  689,  689,  689, 
+            0,    0,    0,  689,  689,    0,  689,    0,    0,    0, 
+            0,    0,    0,    0,  689,  686,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  689,  689,    0,  689, 
+          689,  689,  689,  689,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  689,    0,  689, 
+            0,    0,    0,  689,  689,  689,  689,  689,  689,  689, 
+          689,  689,  689,  689,  689,  689,    0,    0,    0,    0, 
+          689,  689,  689,  689,    0,  701,  689,    0,    0,  350, 
+          350,  350,    0,    0,    0,  350,  350,    0,  350,    0, 
+            0,    0,    0,    0,    0,  689,  350,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  350,  350, 
+            0,  350,  350,  350,  350,  350,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  358,    0,    0,    0,    0,    0,    0,  350, 
+            0,  350,  358,    0,    0,  350,  350,  350,  350,  350, 
+          350,  350,  350,  350,  350,  350,  350,  350,    0,    0, 
+            0,    0,  350,  350,  350,  350,    0,    0,  350,  358, 
+          358,    0,    0,  358,  358,  358,  136,  358,  358,  358, 
+            0,    0,    0,    0,    0,    0,    0,  350,    0,    0, 
+            0,  358,  358,  155,  358,  358,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  350,  358,    0,    0,  358,    0,    0,    0, 
+            0,    0,  350,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  358,  358,    0,  350, 
+          350,    0,    0,  350,  350,  350,  350,  350,  350,  350, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  350,  350,  156,  350,  350,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  350,  358,    0,  350,    0,    0,    0, 
+            0,    0,    0,    0,  358,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  350,  350,    0,    0, 
+            0,  358,  358,    0,    0,  358,  358,  358,  358,  358, 
+          358,  358,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  358,  358,  155,  358,  358,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  358,  358,  358,    0,    0,    0, 
+          358,  358,    0,  358,    0,  358,    0,    0,  358,    0, 
+            0,  358,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  358,  358,    0,  358,  358,  358,  358, 
+          358,    0,    0,    0,    0,    0,    0,    0,  358,  358, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  358,    0,  358,    0,    0,    0, 
+          358,  358,  358,  358,  358,  358,  358,  358,  358,  358, 
+          358,  358,  358,    0,    0,    0,    0,  358,  358,  358, 
+          358,    0,  793,  358,  350,  350,  350,    0,    0,    0, 
+          350,  350,  793,  350,    0,    0,    0,    0,    0,    0, 
+            0,  350,  358,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  350,  350,    0,  350,  350,  350,  350, 
+          350,    0,    0,  793,    0,    0,  793,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  793,    0,    0,  350,    0,  350,    0,    0,    0, 
+          350,  350,  350,  350,  350,  350,  350,  350,  350,  350, 
+          350,  350,  350,    0,    0,    0,    0,  350,  350,  350, 
+          350,    0,    0,  350,    0,  793,  358,  358,  358,    0, 
+          335,    0,  358,  358,    0,  358,    0,    0,    0,    0, 
+          335,    0,  350,  358,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  358,  358,  793,  358,  358, 
+          358,  358,  358,    0,    0,    0,    0,    0,    0,    0, 
+            0,  335,    0,    0,  335,    0,    0,  796,    0,    0, 
+            0,    0,    0,    0,    0,    0,  358,  796,  358,  335, 
+            0,    0,  358,  358,  358,  358,  358,  358,  358,  358, 
+          358,  358,  358,  358,  358,    0,    0,    0,    0,  358, 
+          358,  358,  358,    0,    0,  358,  330,    0,  796,    0, 
+            0,  796,    0,  335,    0,    0,  330,    0,    0,    0, 
+            0,    0,    0,    0,  358,    0,  796,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  335,    0,  330,    0,    0, 
+          330,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          796,    0,    0,    0,    0,  330,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  793,  793,  793,    0,  332,  793, 
+          793,  793,  796,  793,    0,    0,    0,    0,  332,  330, 
+            0,  793,    0,  793,  793,    0,    0,    0,    0,    0, 
+            0,    0,    0,  793,  793,    0,  793,  793,  793,  793, 
+          793,    0,    0,    0,    0,    0,  592,    0,    0,  332, 
+            0,  330,  332,    0,    0,    0,  592,    0,    0,    0, 
+            0,    0,    0,    0,  793,    0,  793,  332,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  592,    0,    0, 
+          592,    0,    0,    0,    0,    0,    0,    0,  793,    0, 
+            0,  332,  335,  335,  335,  592,    0,  335,  335,  335, 
+            0,  335,  793,    0,    0,    0,    0,    0,    0,  335, 
+            0,  335,  335,    0,    0,    0,    0,    0,    0,    0, 
+            0,  335,  335,  332,  335,  335,  335,  335,  335,  592, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  796, 
+          796,  796,    0,    0,  796,  796,  796,    0,  796,    0, 
+            0,    0,  335,    0,  335,    0,  796,    0,  796,  796, 
+          592,  592,    0,    0,    0,    0,    0,    0,  796,  796, 
+            0,  796,  796,  796,  796,  796,    0,    0,  330,  330, 
+          330,    0,    0,  330,  330,  330,  335,  330,    0,    0, 
+            0,    0,    0,    0,    0,  330,    0,  330,  330,  796, 
+          335,  796,    0,    0,    0,    0,    0,  330,  330,    0, 
+          330,  330,  330,  330,  330,  588,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  588,    0,    0,    0,    0, 
+            0,    0,    0,  796,    0,    0,    0,    0,  330,    0, 
+          330,    0,    0,    0,    0,    0,    0,  796,    0,    0, 
+            0,    0,    0,    0,    0,    0,  588,    0,    0,  588, 
+          332,  332,  332,    0,    0,  332,  332,  332,    0,  332, 
+            0,    0,  330,    0,  588,    0,    0,  332,    0,  332, 
+          332,    0,    0,    0,    0,    0,  330,    0,    0,  332, 
+          332,    0,  332,  332,  332,  332,  332,    0,  592,  592, 
+          592,    0,    0,  592,  592,  592,    0,  592,  588,    0, 
+            0,  589,    0,    0,    0,  592,    0,  592,    0,    0, 
+          332,  589,  332,    0,    0,    0,    0,  592,  592,    0, 
+          592,  592,  592,  592,  592,    0,    0,    0,    0,  588, 
+          588,    0,    0,    0,    0,    0,    0,    0,    0,  532, 
+            0,    0,  589,    0,  332,  589,    0,    0,  592,  532, 
+          592,    0,    0,    0,    0,    0,    0,    0,  332,    0, 
+          589,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  592,    0,    0, 
+          532,    0,    0,  532,    0,    0, 1116, 1116,    0,    0, 
+            0,    0,    0,    0,  589,    0,  592,    0,  532,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  589,  589,    0,    0,    0, 
+            0,    0,  532,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  566,    0, 
+            0,    0,    0, 1116, 1116,    0,    0, 1116,  566,    0, 
+            0,    0,    0,    0,  532,    0,    0,  588,  588,  588, 
+            0,    0,  588,  588,  588,    0,  588,    0,    0,    0, 
+            0,    0,    0,    0,  588,    0,  588,    0,    0,  566, 
+            0, 1116,  566,    0,    0,    0,  588,  588,    0,  588, 
+          588,  588,  588,  588,    0,    0,    0,  566,    0,    0, 
+            0,    0, 1116,    0,    0,    0,    0,    0,  577,    0, 
+            0,    0,    0,    0,    0,    0,    0,  588,  577,  588, 
+         1116,    0,    0,    0, 1116,    0,    0,    0,    0,    0, 
+            0,  566,    0,    0,    0,    0,    0, 1116, 1116, 1116, 
+         1116,    0,    0,    0, 1116, 1116,  588, 1116,    0,  577, 
+            0,    0,  577,  589,  589,  589,    0,    0,  589,  589, 
+          589,    0,  589,  566,    0,  588,    0,  577,    0,    0, 
+          589,    0,  589,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  589,  589,    0,  589,  589,  589,  589,  589, 
+            0,  532,  532,  532,    0,  554,  532,  532,  532,    0, 
+          532,  577,    0,    0,    0,  554,    0,    0,  532,    0, 
+          532,    0,    0,  589,    0,  589,    0,    0,    0,    0, 
+          532,  532,    0,  532,  532,  532,  532,  532,    0,    0, 
+            0,    0,    0,  577,  576,    0,  554,    0,    0,  569, 
+            0,    0,  589,    0,  576,    0,    0,    0,    0,    0, 
+            0,  532,    0,  532,  554, 1116,    0,    0, 1116,    0, 
+            0,  589,    0,    0,    0,    0, 1116,    0,    0,    0, 
+            0,    0,  569,    0,    0,  576,    0,    0,  576,    0, 
+          532,    0,  569,    0,    0,    0,    0,    0,  554,    0, 
+            0,    0,    0,  576,    0,    0,    0,    0,    0,  532, 
+          566,  566,  566,    0,    0,  566,  566,  566,    0,  566, 
+            0,    0,    0,  569,  562,    0,  569,  566,    0,  566, 
+          554,    0,    0, 1116,  562,    0,    0,  576,    0,  566, 
+          566,  569,  566,  566,  566,  566,  566,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  581,  562,    0,    0,    0,  576, 
+          566,    0,  566,    0,  581,  569,    0,    0,    0,    0, 
+          577,  577,  577,  562,    0,  577,  577,  577,    0,  577, 
+            0,    0,    0,    0,    0,    0,    0,  577,    0,  577, 
+            0,    0,    0,    0,    0,  581,    0,  569,    0,  577, 
+          577,    0,  577,  577,  577,  577,  577,  562,  566,    0, 
+            0,    0,    0,  581,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0, 1103, 1103,    0,    0, 1103,    0,  798, 
-          156,    0,  155,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  156,    0,    0,    0,    0,    0,    0, 
-          794, 1103,    0,    0,    0,    0,  353,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  156, 
-          156,    0, 1103,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-         1103,    0,    0,    0, 1103,    0,    0,    0,    0,    0, 
-            0,  353,    0,    0,    0,    0,    0, 1103, 1103, 1103, 
-         1103,    0,    0,    0, 1103, 1103,    0, 1103,    0,    0, 
-            0,  403,  398,    0,    0,    0,  401,  399,    0,  400, 
-            0,  402,    0,    0,    0,    0,  156,    0,    0,    0, 
-            0,    0,    0,    0,  395,    0,  394,  393,    0,    0, 
-            0,    0,  155,  155,  155,  155,  155,  155,  155,  155, 
-          155,  155,  155,    0,    0,  155,  155,    0,  155,  155, 
-          155,  155,  155,  155,  155,    0,  798,    0,  397,    0, 
-          155,  155,  155,  155,  155,  155,  155,    0,    0,  155, 
-            0,    0,    0,    0,    0,  155,  155,  155,  155,  155, 
-          155,  155,  155,  155,  155,  155,  155,  155,  396,  155, 
-          155,  155,  155,  155,  155,  155,    0,    0,  155,  155, 
-            0,    0,  155,  155,    0, 1103,    0,    0, 1103,    0, 
-            0,    0,    0,    0,    0,    0, 1103,  155,  155,    0, 
-            0,    0,    0,  798,  798,  155,    0,    0,  155,  155, 
-          155,  155,    0,  155,    0,    0,  155,  155,  155,  155, 
-          155,  155,  155,    0,  155,  155,  156,  156,  156,  156, 
-          156,  156,  156,  156,  156,  156,  156,    0,    0,  156, 
-          156,    0,  156,  156,  156,  156,  156,  156,  156,    0, 
-            0,    0,    0, 1103,  156,  156,  156,  156,  156,  156, 
-          156,    0,    0,  156,    0,    0,    0,    0,    0,  156, 
-          156,  156,  156,  156,  156,  156,  156,  156,  156,  156, 
-          156,  156,    0,  156,  156,  156,  156,  156,  156,  156, 
-            0,    0,  156,  156,    0,    0,  156,  156,    0,    0, 
-            0,    0,    0,    0,    0,  156,    0,    0,    0,    0, 
-            0,  156,  156,    0,    0,    0,    0,  353,  353,  156, 
-            0,    0,  156,  156,  156,  156,    0,  156,  156,    0, 
-          156,  156,  156,  156,  156,  156,  156,    0,  156,  156, 
-            0,  354,  954,    0, 1104, 1104,    0,    0,    0,    0, 
-            0,    0,    0,    0,  156,  156, 1105, 1105,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  377,  378,  379,  380,  381,  382,  383,  384, 
-          385,  386,  387,  388,  389,    0,  354,    0,    0,  390, 
-          391,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0, 1104, 1104,    0,    0, 1104,    0,    0,    0,  414, 
-            0,  156,    0, 1105, 1105,    0,    0, 1105,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  414,    0,    0,    0,    0,    0,    0, 1104, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0, 1105,    0,    0,    0,    0,    0,    0,  414,    0, 
-         1104,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0, 1105,    0,    0,    0,    0,    0, 1104,    0, 
-            0,    0, 1104,    0,    0,    0,    0,    0,    0,    0, 
-         1105,    0,    0,    0, 1105, 1104, 1104, 1104, 1104,    0, 
-            0,    0, 1104, 1104,    0, 1104,    0, 1105, 1105, 1105, 
-         1105,    0,    0,    0, 1105, 1105,    0, 1105,    0,    0, 
-            0,    0,    0,    0,    0,  414,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  156,  156,  156,  156,  156,  156,  156,  156,  156, 
-          156,  156,    0,    0,  156,  156,    0,  156,  156,  156, 
-          156,  156,  156,  156,    0,    0,    0,    0,    0,  156, 
-          156,  156,  156,  156,  156,  156,    0,    0,  156,    0, 
-            0,    0,    0,    0,  156,  156,  156,  156,  156,  156, 
-          156,  156,  156,  156,  156,  156,  156,    0,  156,  156, 
-          156,  156,  156,  156,  156,    0,    0,  156,  156,    0, 
-            0,  156,  156, 1104,    0,    0, 1104,    0,    0,    0, 
-            0,    0,    0,    0, 1104, 1105,  156,  156, 1105,    0, 
-            0,    0,  354,  354,  156,    0, 1105,  156,  156,  156, 
-          156,    0,  156,    0,    0,  156,  156,  156,  156,  156, 
-          156,  156,    0,  156,  156,  414,  414,  414,  414,  414, 
-          414,  414,  414,  414,  414,  414,    0,  414,  414,  414, 
-          414,  414,  414,  414,  414,  414,  414,  414,  414,    0, 
-            0, 1104,    0,  414,  414,  414,  414,  414,  414,  414, 
-            0,    0,  414, 1105,    0,    0,  713,    0,  414,  414, 
-          414,  414,  414,  414,  414,  414,  414,  414,  414,  414, 
-          414,    0,  414,  414,  414,  414,  414,  414,  414,  713, 
-            0,  414,  414,    0,    0,  414,  414,    0,    0,    0, 
-            0,    0, 1106, 1106,    0,    0,    0,    0,    0,    0, 
-          414,  414,    0,    0,    0,  713,    0,  710,  414,    0, 
-            0,  414,  414,  414,  414,    0,  414,    0,    0,  414, 
-          414,  414,  414,  414,  414,  414,    0,  414,  414,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0, 1106, 
-         1106,    0,    0, 1106,    0,    0,    0,    0,    0,    0, 
-          709,    0,  713,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  709,    0,    0,    0, 1106,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0, 1106,  709, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0, 1106,    0,    0,    0, 
-         1106,    0,    0,    0,  252,    0,    0,    0,    0,    0, 
-            0,    0,    0, 1106, 1106, 1106, 1106,    0,    0,    0, 
-         1106, 1106,    0, 1106,    0,    0,    0,    0,    0,    0, 
-            0,  403,  398,    0,    0,    0,  401,  399,    0,  400, 
-            0,  402,    0,    0,    0,    0,  709,    0,    0,    0, 
-            0,    0,    0,    0,  395,    0,  394,  393,    0,    0, 
-            0,    0,  713,  713,  713,  713,  713,  713,  713,  713, 
-          713,  713,  713,    0, 
+          577,    0,  577,    0,    0,    0,    0,    0,    0,  562, 
+            0,    0,    0,    0,    0,    0,    0,  581,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  554,  554,  554, 
+            0,    0,  554,  554,  554,    0,  554,    0,    0,    0, 
+            0,    0,    0,    0,  554,    0,  554,    0,  577,  581, 
+            0,    0,    0,    0,    0,    0,  554,  554,    0,  554, 
+          554,  554,  554,  554,    0,    0,  576,  576,  576,    0, 
+            0,  576,  576,  576,    0,  576,    0,    0,    0,    0, 
+            0,    0,    0,  576,  555,  576,    0,  554,    0,  554, 
+            0,    0,    0,    0,  555,  576,  576,    0,  576,  576, 
+          576,  576,  576,    0,  569,  569,  569,    0,    0,  569, 
+          569,  569,    0,  569,    0,    0,    0,    0,    0,    0, 
+            0,  569,    0,  569,    0,  555,  576,    0,  576,    0, 
+            0,  572,    0,  569,  569,  554,  569,  569,  569,  569, 
+          569,  572,    0,  555,    0,    0,  562,  562,  562,    0, 
+            0,  562,  562,  562,    0,  562,    0,    0,    0,    0, 
+            0,    0,    0,  562,  569,  562,  569,    0,    0,    0, 
+            0,    0,  572,    0,  576,  562,  562,  555,  562,  562, 
+          562,  562,  562,    0,    0,    0,  581,  581,  581,    0, 
+          572,  581,  581,  581,  556,  581,    0,    0,    0,    0, 
+            0,    0,    0,  581,  556,  581,  562,    0,  562,  555, 
+            0,    0,  569,    0,    0,  581,  581,    0,  581,  581, 
+          581,  581,  581,    0,  572,    0,    0,    0,    0,    0, 
+            0,  557,    0,    0,    0,  556,    0,    0,    0,    0, 
+            0,  557,    0,    0,    0,    0,  581,    0,  581,    0, 
+            0,    0,    0,  556,  562,    0,  572,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  563,  557,    0,    0,    0,    0,    0,    0,    0, 
+            0,  563,    0,    0,    0,    0,    0,  556,    0,    0, 
+          557,    0,    0,    0,  581,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  558,    0, 
+            0,    0,  563,    0,    0,    0,    0,    0,  558,  556, 
+            0,    0,    0,    0,  557,    0,    0,    0,    0,    0, 
+          563,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  555,  555,  555,  558, 
+            0,  555,  555,  555,    0,  555,  557,    0,    0,    0, 
+            0,    0,    0,  555,  563,  555,    0,  558,    0,    0, 
+            0,    0,    0,    0,    0,  555,  555,    0,  555,  555, 
+          555,  555,  555,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  572,  572,  572,  563,    0,  572,  572, 
+          572,  558,  572,    0,    0,   80,  555,    0,  555,    0, 
+          572,    0,  572,    0,    0,   80,    0,    0,    0,    0, 
+            0,    0,  572,  572,    0,  572,  572,  572,  572,  572, 
+            0,    0,    0,  558,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   80,    0,    0,    0, 
+            0,    0,    0,  572,  555,  572,  556,  556,  556,    0, 
+            0,  556,  556,  556,   80,  556,    0,    0,    0,    0, 
+            0,    0,   83,  556,    0,  556,    0,    0,    0,    0, 
+            0,    0,   83,    0,    0,  556,  556,    0,  556,  556, 
+          556,  556,  556,  557,  557,  557,    0,    0,  557,  557, 
+          557,  572,  557,    0,    0,    0,    0,    0,    0,    0, 
+          557,    0,  557,   83,    0,    0,  556,    0,  556,    0, 
+            0,    0,  557,  557,    0,  557,  557,  557,  557,  557, 
+           80,   83,    0,  563,  563,  563,    0,   84,  563,  563, 
+          563,    0,  563,    0,    0,    0,    0,   84,    0,    0, 
+          563,    0,  563,  557,    0,  557,    0,    0,    0,    0, 
+            0,    0,  563,  563,  556,  563,  563,  563,  563,  563, 
+          558,  558,  558,    0,    0,  558,  558,  558,   84,  558, 
+            0,  524,    0,    0,    0,    0,    0,  558,    0,  558, 
+            0,  524,    0,  563,    0,  563,   84,   83,    0,  558, 
+          558,  557,  558,  558,  558,  558,  558,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  524,  525,    0,    0,    0,    0,    0,    0, 
+          558,    0,  558,  525,    0,    0,    0,    0,    0,    0, 
+          524,  563,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,   84,    0,  525,    0,    0,   80,   80,   80, 
+            0,    0,   80,   80,   80,    0,   80,    0,  558,    0, 
+            0,    0,  525,    0,   80,    0,   80,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   80,   80,    0,   80, 
+           80,   80,   80,   80,    0,    0,  524,    0,    0,    0, 
+            0,    0,    0,  562,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  562,    0,    0,    0,   80,    0,   80, 
+            0,    0,    0,    0,   83,   83,   83,    0,    0,   83, 
+           83,   83,    0,   83,    0,    0,    0,    0,  525,    0, 
+            0,   83,    0,   83,  562,    0,    0,    0,    0,    0, 
+            0,    0,    0,   83,   83,    0,   83,   83,   83,   83, 
+           83,    0,  562,    0,    0,   80,    0,    0,    0,    0, 
+            0,  563,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  563,    0,    0,   83,    0,   83,    0,    0,   84, 
+           84,   84,    0,    0,   84,   84,   84,    0,   84,    0, 
+            0,    0,    0,    0,    0,    0,   84,    0,   84,    0, 
+            0,    0,  563,    0,    0,    0,    0,    0,   84,   84, 
+            0,   84,   84,   84,   84,   84,    0,    0,  562,    0, 
+          563,    0,   83,  524,  524,  524,    0,    0,  524,  524, 
+          524,    0,  524,    0,    0,    0,    0,    0,    0,   84, 
+          524,   84,  524,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  524,  524,    0,  524,  524,  524,  524,  524, 
+            0,    0,    0,    0,    0,  525,  525,  525,    0,    0, 
+          525,  525,  525,    0,  525,    0,    0,    0,  338,    0, 
+            0,    0,  525,  524,  525,  524,  563,   84,  338,    0, 
+            0,    0,    0,    0,  525,  525,    0,  525,  525,  525, 
+          525,  525,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  338, 
+            0,    0,  332,    0,    0,  525,    0,  525,    0,    0, 
+            0,  524,    0,    0,    0,    0,    0,  338, 1117, 1117, 
+            0,    0,  339,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  339,    0,    0,  562,  562,  562,    0,    0, 
+          562,  562,  562,    0,  562,    0,    0,    0,    0,    0, 
+            0,    0,  562,  525,  562,    0,    0,    0,    0,    0, 
+            0,    0,    0,  339,  562,  562,  334,  562,  562,  562, 
+          562,  562,   58,    0,    0,    0,    0,    0,    0,    0, 
+            0,  339,   58,  338,    0, 1117, 1117,    0,    0, 1117, 
+            0,    0,    0,    0,    0,  562,    0,  562,    0,    0, 
+            0,    0,    0,  563,  563,  563,    0,    0,  563,  563, 
+          563,    0,  563,   58,   41,    0,    0,    0,    0,    0, 
+          563,    0,  563, 1117,   41,    0,    0,    0,    0,    0, 
+            0,   58,  563,  563,    0,  563,  563,  563,  563,  563, 
+            0,    0,    0,  562, 1117,    0,    0,  339,    0,    0, 
+            0,    0,    0,    0,    0,   41,    0,    0,    0,    0, 
+            0,    0, 1117,  563,    0,  563, 1117,    0,    0,    0, 
+            0,    0,    0,   41,    0,    0,    0,    0,    0, 1117, 
+         1117, 1117, 1117,    0,    0,    0, 1117, 1117,    0, 1117, 
+            0,    0,    0,    0,    0,    0,    0,   58,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  563,    0,  157,    0,    0,    0,    0,    0,    0, 
+          338,  338,  338,    0,    0,  338,  338,  338,    0,  338, 
+            0,    0,    0,    0,    0,    0,  157,  338,    0,   41, 
+            0,    0,    0,  797,    0,    0,    0,    0,    0,  685, 
+            0,    0,  338,  338,  338,  338,  338,    0,    0,    0, 
+            0,    0,  157,  157,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          338,    0,  338,    0,  339,  339,  339,    0,    0,  339, 
+          339,  339,    0,  339,  685,    0,    0, 1117,    0,    0, 
+         1117,  339,    0,    0,    0,    0,    0,    0, 1117,  338, 
+            0,    0,    0,    0,    0,    0,  339,  339,  339,  339, 
+          339,    0,    0,    0,    0,    0,  797,    0,  338,  157, 
+            0,    0,    0,    0,   58,   58,   58,    0,    0,    0, 
+           58,   58,    0,   58,  339,    0,  339,    0,    0,    0, 
+            0,   58,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  252,    0,    0, 1117,   58,   58,   58,   58, 
+            0,    0,    0,  339,    0,    0,   41,   41,   41,    0, 
+            0,    0,   41,   41,    0,   41,    0,    0,    0,    0, 
+            0,    0,  339,   41,   58,    0,   58,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   41,   41, 
+           41,   41,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   41,    0,   41,    0, 
+            0,    0,   58,    0,    0,    0, 1112,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  157, 
+          157,  157,  157,  157,  157,  157,  157,  157,  157,  157, 
+            0,    0,  157,  157,    0,  157,  157,  157,  157,  157, 
+          157,  157,    0,  797,   41,    0,    0,  157,  157,  157, 
+          157,  157,  157,  157,    0,    0,  157,    0,    0,    0, 
+            0,    0,  157,  157,  157,  157,  157,  157,  157,  157, 
+          157,  157,  157,  157,  157,    0,  157,  157,  157,  157, 
+          157,  157,  157,    0,    0,  157,  157,    0,    0,  157, 
+          157,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  157,  157,    0,  158,    0,    0, 
+          685,  685,  157,    0,    0,  157,  157,  157,  157,    0, 
+          157,    0,    0,  157,  157,  157,  157,  157,  157,  157, 
+          158,  157,  157,    0,    0,    0,    0,  798,    0,    0, 
+            0,    0,    0,  688,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  158,  158,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  688,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0, 1094, 
+         1095, 1096, 1097,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0, 1098, 1099, 1100, 1101,    0, 
+          798,  157, 1102,  158,    0,   40,   41,   42,   43,   44, 
+            0,    0,    0,    0,    0,  308,    0,    0,    0,    0, 
+            0,    0,    0,    0,  157,    0,    0,    0,    0,    0, 
+            0,  797,    0, 1104, 1105,    0,    0,  802,    0,    0, 
+            0, 1106,    0,    0, 1107,    0, 1108, 1109,    0, 1110, 
+          157,  157,   58,   59,   60,   61,   62,   63,   64,    0, 
+           65,   66,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  252,    0,    0,    0,    0, 
+            0,    0,  802,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  405,  400,    0,    0,    0,  403,  401,    0, 
+          402,    0,  404,    0,  802,    0,    0,  157,    0,    0, 
+            0,    0,    0,    0,    0,  397,    0,  396,  395,    0, 
+            0,    0,    0,  158,  158,  158,  158,  158,  158,  158, 
+          158,  158,  158,  158,    0,    0,  158,  158,    0,  158, 
+          158,  158,  158,  158,  158,  158,    0,  798,    0,  399, 
+            0,  158,  158,  158,  158,  158,  158,  158,    0,    0, 
+          158,    0,    0,    0,    0,    0,  158,  158,  158,  158, 
+          158,  158,  158,  158,  158,  158,  158,  158,  158,  398, 
+          158,  158,  158,  158,  158,  158,  158,    0,    0,  158, 
+          158,    0,    0,  158,  158,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  158,  158, 
+            0,    0,    0,    0,  688,  688,  158,    0,    0,  158, 
+          158,  158,  158,    0,  158,    0,    0,  158,  158,  158, 
+          158,  158,  158,  158,    0,  158,  158,  157,  157,  157, 
+          157,  157,  157,  157,  157,  157,  157,  157,    0,    0, 
+          157,  157,    0,  157,  157,  157,  157,  157,  157,  157, 
+            0,  802,    0,    0,    0,  157,  157,  157,  157,  157, 
+          157,  157,    0,    0,  157,    0,    0,    0,    0,    0, 
+          157,  157,  157,  157,  157,  157,  157,  157,  157,  157, 
+          157,  157,  157,    0,  157,  157,  157,  157,  157,  157, 
+          157,    0,    0,  157,  157,    0,    0,  157,  157,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  157,  157,    0,  158,    0,    0,  802,  802, 
+          157,    0,    0,  157,  157,  157,  157,    0,  157,    0, 
+            0,  157,  157,  157,  157,  157,  157,  157,  158,  157, 
+          157,    0,    0,    0,    0,  798,    0,    0,    0,    0, 
+            0,  357,    0,    0, 1118, 1118,    0,    0,    0,    0, 
+            0,    0,    0,    0,  158,  158,    0,    0,    0,    0, 
+            0,    0,    0,  379,  380,  381,  382,  383,  384,  385, 
+          386,  387,  388,  389,  390,  391,    0,    0,    0,    0, 
+          392,  393,    0,    0,    0,    0,  357,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0, 1118, 1118,    0,    0, 1118,    0,    0,    0,  158, 
+            0,  158,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  158,    0,    0,    0,    0,    0,    0, 1118, 
+            0,    0,    0,    0,    0,  358,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  158,  158, 
+         1118,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0, 1118,    0, 
+            0,    0, 1118,    0,    0,    0,    0,    0,    0,    0, 
+          358,    0,    0,    0,    0, 1118, 1118, 1118, 1118,    0, 
+            0,    0, 1118, 1118,    0, 1118,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  158,    0,    0,    0,    0, 
+          813,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  158,  158,  158,  158,  158,  158,  158,  158,  158, 
+          158,  158,    0,    0,  158,  158,    0,  158,  158,  158, 
+          158,  158,  158,  158,    0,    0,    0,    0,    0,  158, 
+          158,  158,  158,  158,  158,  158,    0,    0,  158,    0, 
+            0,    0,    0,  515,  158,  158,  158,  158,  158,  158, 
+          158,  158,  158,  158,  158,  158,  158,    0,  158,  158, 
+          158,  158,  158,  158,  158,    0,    0,  158,  158,    0, 
+            0,  158,  158, 1118,    0,    0, 1118,    0,  418,    0, 
+            0,    0,    0,    0, 1118,    0,  158,  158,    0,    0, 
+            0,    0,  357,  357,  158,    0,    0,  158,  158,  158, 
+          158,  418,  158,    0,    0,  158,  158,  158,  158,  158, 
+          158,  158,    0,  158,  158,  158,  158,  158,  158,  158, 
+          158,  158,  158,  158,  158,  158,    0,  418,  158,  158, 
+            0,  158,  158,  158,  158,  158,  158,  158,    0,    0, 
+            0, 1118,    0,  158,  158,  158,  158,  158,  158,  158, 
+            0,    0,  158,    0,    0,    0,    0,    0,  158,  158, 
+          158,  158,  158,  158,  158,  158,  158,  158,  158,  158, 
+          158,    0,  158,  158,  158,  158,  158,  158,  158,    0, 
+            0,  158,  158,    0,    0,  158,  158,    0,    0,    0, 
+            0,    0,  717,    0,  418,    0,    0,    0,    0,    0, 
+          158,  158,    0,    0,    0,    0,  358,  358,  158,    0, 
+            0,  158,  158,  158,  158,  717,  158,    0,    0,  158, 
+          158,  158,  158,  158,  158,  158,    0,  158,  158,    0, 
+            0,    0,    0,    0,    0,    0,  515,  515,  515,  515, 
+            0,  717,    0,  714,    0,    0,    0,    0,    0,    0, 
+            0,    0,  515,  515,  515,  515,    0,    0,    0,  515, 
+            0,  515,  515,  515,  515,  515,  515,    0,    0,    0, 
+            0,    0,  515,    0,    0,    0,    0,  515,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          515,  515,    0,    0,    0,    0,    0,    0,  515,    0, 
+            0,  515,    0,  515,  515,    0,  515,  515,  717,  515, 
+          515,  515,  515,  515,  515,  515,    0,  515,  515,    0, 
+            0,    0,    0,    0,  418,  418,  418,  418,  418,  418, 
+          418,  418,  418,  418,  418,    0,  418,  418,  418,  418, 
+          418,  418,  418,  418,  418,  418,  418,  418,    0,    0, 
+            0,    0,  418,  418,  418,  418,  418,  418,  418,    0, 
+            0,  418,    0,    0,    0,    0,    0,  418,  418,  418, 
+          418,  418,  418,  418,  418,  418,  418,  418,  418,  418, 
+            0,  418,  418,  418,  418,  418,  418,  418,    0,    0, 
+          418,  418,    0,    0,  418,  418,    0,    0,    0,    0, 
+            0,  713,    0,    0,    0,    0,    0,    0,    0,  418, 
+          418,    0,    0,    0,    0,    0,    0,  418,    0,    0, 
+          418,  418,  418,  418,  713,  418,    0,    0,  418,  418, 
+          418,  418,  418,  418,  418,    0,  418,  418,  717,  717, 
+          717,  717,  717,  717,  717,  717,  717,  717,  717,    0, 
+          713,  717,  717,    0,  717,  717,  717,  717,  717,  717, 
+          717,    0,    0,    0,    0,    0,  717,  717,  717,  717, 
+          717,  717,  717,    0,    0,  717,    0,    0,    0,    0, 
+            0,  717,  717,  717,  717,  717,  717,  717,  717,  717, 
+          717,  717,  717,  717,    0,  717,  717,  717,  717,  717, 
+          717,  717,    0,    0,  717,  717,    0,    0,  717,  717, 
+            0,    0,    0,    0,    0,  825,    0,  713,    0,    0, 
+            0,    0,    0,  717,  717,    0,    0,    0,    0,    0, 
+            0,  717,    0,    0,  717,  717,  717,  717,  825,  717, 
+            0,    0,  717,  717,  717,  717,  717,  717,  717,    0, 
+          717,  717,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0, 
       };
    }
 
    private static final int[] yyTable4() {
       return new int[] {
 
-            0,  713,  713,    0,  713,  713,  713,  713,  713,  713, 
-          713,    0,    0,    0,  397,    0,  713,  713,  713,  713, 
-          713,  713,  713,    0,    0,  713,    0,    0,    0,    0, 
-            0,  713,  713,  713,  713,  713,  713,  713,  713,  713, 
-          713,  713,  713,  713,  396,  713,  713,  713,  713,  713, 
-          713,  713,    0,    0,  713,  713,    0, 1106,  713,  713, 
-         1106,    0,    0,    0,    0,  821,    0,    0, 1106,    0, 
-            0,    0,    0,  713,  713,    0,    0,    0,    0,    0, 
-            0,  713,    0,    0,  713,  713,  713,  713,  821,  713, 
+            0,  825,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  405,  400,    0,    0,    0,  403,  401,    0,  402, 
+            0,  404,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  397,    0,  396,  395,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  825,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  399,    0, 
+            0,    0,    0,    0,  713,  713,  713,  713,  713,  713, 
+          713,  713,  713,  713,  713,    0,    0,  713,  713,    0, 
+          713,  713,  713,  713,  713,  713,  713,    0,  398,    0, 
             0,    0,  713,  713,  713,  713,  713,  713,  713,    0, 
-          713,  713,  709,  709,  709,  709,  709,  709,  709,  709, 
-          709,  709,  709,    0,  821,  709,  709,    0,  709,  709, 
-          709,  709,  709,  709,  709, 1106,    0,    0,    0,    0, 
-          709,  709,  709,  709,  709,  709,  709,    0,    0,  709, 
-            0,    0,    0,    0,    0,  709,  709,  709,  709,  709, 
-          709,  709,  709,  709,  709,  709,  709,  709,    0,  709, 
-          709,  709,  709,  709,  709,  709,    0,    0,  709,  709, 
-            0,    0,  709,  709,    0,    0,    0,    0,    0,  821, 
-            0,  821,    0,    0,    0,    0,    0,  709,  709,    0, 
-            0,    0,    0,    0,    0,  709,    0,    0,  709,  709, 
-          709,  709,  821,  709,    0,    0,  709,  709,  709,  709, 
-          709,  709,  709,    0,  709,  709,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  821,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  377,  378, 
-          379,  380,  381,  382,  383,  384,  385,  386,  387,  388, 
-          389,    0,    0,    0,    0,  390,  391,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          403,  398,    0,    0,    0,  401,  399,    0,  400,    0, 
-          402,    0,    0,    0,  821,  821,    0,    0,    0,    0, 
-            0,    0,    0,  395,    0,  394,  393,    0,    0,    0, 
-            0,  821,  821,  821,  821,  821,  821,  821,  821,  821, 
-          821,  821,    0,    0,  821,  821,    0,  821,  821,  821, 
-          821,  821,  821,  821,    0,    0,    0,  397,    0,  821, 
-          821,  821,  821,  821,  821,  821,    0,    0,  821,    0, 
-            0,    0,    0,    0,  821,  821,  821,  821,  821,  821, 
-          821,  821,  821,  821,  821,  821,  821,  396,  821,  821, 
-          821,  821,  821,  821,  821,  252,    0,  821,  821,    0, 
-            0,  821,  821,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  821,  821,  230,    0, 
-            0,    0,    0,    0,  821,    0,    0,  821,  821,  821, 
-          821,    0,  821,    0,    0,  821,  821,  821,  821,  821, 
-          821,  821,    0,  821,  821,  821,  821,  821,  821,  821, 
-          821,    0,    0,    0,  821,  821,    0,    0,    0,  821, 
-            0,  821,  821,  821,  821,  821,  821,  821,    0,    0, 
-            0,    0,    0,  821,  821,  821,  821,  821,  821,  821, 
-            0,    0,  821,    0,    0,    0,    0,    0,  821,  821, 
-          821,  821,  821,  821,  821,  821,  821,  821,  821,  821, 
-          821,    0,  821,  821,  821,  821,  821,  821,  821,    0, 
-          365,   68,  821,    0,    0,  821,  821,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          821,  821,    0,   67,    0,    0,    0,    0,  821,    0, 
-            0,  821,  821,  821,  821,    0,  821,    0,    0,  821, 
-          821,  821,  821,  821,  821,  821,    0,  821,  821,  364, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  377,  378,  379,  380,  381,  382,  383,  384,  385, 
-          386,  387,  388,  389,    0,    0,    0,    0,  390,  391, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  252,   68,    0,    0,    0, 
+            0,  713,    0,    0,    0,    0,    0,  713,  713,  713, 
+          713,  713,  713,  713,  713,  713,  713,  713,  713,  713, 
+            0,  713,  713,  713,  713,  713,  713,  713,    0,    0, 
+          713,  713,    0,    0,  713,  713,    0,    0,    0,    0, 
+            0,  825,    0,    0,    0,    0,    0,    0,    0,  713, 
+          713,    0,    0,    0,    0,    0,    0,  713,    0,    0, 
+          713,  713,  713,  713,  825,  713,    0,    0,  713,  713, 
+          713,  713,  713,  713,  713,    0,  713,  713,  825,  825, 
+          825,  825,  825,  825,  825,  825,  825,  825,  825,    0, 
+          825,  825,  825,    0,  825,  825,  825,  825,  825,  825, 
+          825,    0,    0,    0,    0,    0,  825,  825,  825,  825, 
+          825,  825,  825,    0,    0,  825,    0,    0,    0,    0, 
+            0,  825,  825,  825,  825,  825,  825,  825,  825,  825, 
+          825,  825,  825,  825,    0,  825,  825,  825,  825,  825, 
+          825,  825,    0,  378,  825,  825,    0,    0,  825,  825, 
+            0,    0,    0,    0,    0,  252,  825,  825,    0,    0, 
+            0,    0,    0,  825,  825,    0,    0,    0,    0,    0, 
+            0,  825,    0,    0,  825,  825,  825,  825,  230,  825, 
+            0,    0,  825,  825,  825,  825,  825,  825,  825,    0, 
+          825,  825,  379,  380,  381,  382,  383,  384,  385,  386, 
+          387,  388,  389,  390,  391,    0,    0,    0,    0,  392, 
+          393,    0,    0,    0,    0,  394,    0,    0,    0,    0, 
+            0,    0,    0,    0,  405,  400,    0,    0,    0,  403, 
+          401,    0,  402,    0,  404,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  397,    0,  396, 
+          395,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,   68,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  399,    0,    0,    0,    0,    0,  825,  825,  825, 
+          825,  825,  825,    0,    0,    0,  825,  825,    0,    0, 
+            0,  825,    0,  825,  825,  825,  825,  825,  825,  825, 
+            0,  398,    0,    0,    0,  825,  825,  825,  825,  825, 
+          825,  825,    0,    0,  825,    0,    0,    0,  367,    0, 
+          825,  825,  825,  825,  825,  825,  825,  825,  825,  825, 
+          825,  825,  825,    0,  825,  825,  825,  825,  825,  825, 
+          825,   67,    0,    0,  825,    0,    0,  825,  825,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  825,  825,    0,    0,    0,  366,    0,    0, 
+          825,    0,    0,  825,  825,  825,  825,    0,  825,    0, 
+            0,  825,  825,  825,  825,  825,  825,  825,    0,  825, 
+          825,    0,    4,    5,    6,    0,    8,    0,    0,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,   21,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,  252,    0,   68,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,  223,   40,   41, 
+           42,   43,   44,   45,   46,   67,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  968,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,    0,  226,  227,  228,   58,   59,  229,   61,   62, 
+           63,   64,    0,   65,   66,  379,  380,  381,  382,  383, 
+          384,  385,  386,  387,  388,  389,  390,  391,    0,    0, 
+            0,    0,  392,  393,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    4,    5,    6,    0,    8,    0,   67,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   68,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  436,    4,    5,    6,    0,    8, 
+            0,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
+           12,   13,   14,   15,   16,   17,   18,    0,    0,    0, 
+            0,    0,   19,   20,   21,  210,  211,  212,  213,    0, 
+            0,   26,    0,    0,    0,    0,    0,    0,   28,    0, 
+            0,  215,  216,  217,  218,   35,  219,  220,  221,  222, 
+            0,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
+            0,   47,    0,    0,   48,   49,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,   50, 
+           51,    0, 1119, 1119,    0,    0,    0,  224,    0,    0, 
+          225,   54,   55,   56,    0,    0,    0,    0,   58,   59, 
+           60,   61,   62,   63,   64,    0,   65,   66,    0,    4, 
+            5,    6,    0,    8, 1120, 1120,    0,    9,   10,    0, 
+            0,    0,   11,    0,   12,   13,   14,   15,   16,   17, 
+           18,    0,    0,    0,    0,    0,   19,   20,   21,  210, 
+          211,  212,  213,    0,    0,   26,    0,    0,    0, 1119, 
+         1119,    0,   28, 1119,    0,  215,  216,  217,  218,   35, 
+          219,  220,  221,  222,    0,   40,   41,   42,   43,   44, 
+           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
+            0, 1120, 1120,    0,    0, 1120,    0, 1119, 1121, 1121, 
+            0,    0,    0,   50,   51,    0,    0,    0,    0,    0, 
+            0,  224,    0,    0,  225,   54,   55,   56, 1119,    0, 
+            0,    0,   58,   59,   60,   61,   62,   63,   64, 1120, 
+           65,   66,    0,    0,    0,    0, 1119,    0,    0,    0, 
+         1119,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+         1120,    0,    0, 1119, 1119, 1119, 1119,    0,   67,    0, 
+         1119, 1119,    0, 1119,    0, 1121, 1121,    0, 1120, 1121, 
+            0,    0, 1120,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  616, 1120, 1120, 1120, 1120,    0, 
+            0,    0, 1120, 1120,    0, 1120,    0,    0,    0,    0, 
+            0,    0,    0, 1121,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0, 1121,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0, 1121,    0,    0,    0, 1121,    0,    0,    0, 
+            0,   68,    0,    0,    0,    0,    0,    0,    0, 1121, 
+         1121, 1121, 1121,    0,    0,    0, 1121, 1121,    0, 1121, 
+            0, 1119,   67,    0, 1119,    0,    0,    0,    0,    0, 
+            0,    0, 1119,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  616,    0, 
+            0,    0,    0, 1120,    0,    0, 1120,    0,    0,    0, 
+            0,    0,    0,    0, 1120,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0, 1119, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,   68,    0,    0,    0,    0, 
+            0, 1120,    0,    0,    0,    0,    0, 1121,    0,    0, 
+         1121,    3,    4,    5,    6,    7,    8,    0, 1121,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,   67,   19, 
+           20,   21,   22,   23,   24,   25,    0,    0,   26,    0, 
+            0,    0,    0,    0,   27,   28,   29,   30,   31,   32, 
+           33,   34,   35,   36,   37,   38,   39,    0,   40,   41, 
+           42,   43,   44,   45,   46, 1121,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,   52,    0,    0,   53,   54,   55, 
+           56,    0,   57,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    3,    4,    5,    6,    7, 
+            8,   68,    0,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,   67,   19,   20,   21,   22,   23,   24,   25, 
+            0,    0,   26,    0,    0,    0,    0,    0,   27,   28, 
+          277,   30,   31,   32,   33,   34,   35,   36,   37,   38, 
+           39,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,   52,    0, 
+            0,   53,   54,   55,   56,    0,   57,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    0,    0,    0,   68,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    3,    4,    5,    6,    7,    8,    0,   67,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,   21,   22,   23,   24,   25,    0,    0,   26,    0, 
+            0,    0,    0,    0,   27,   28,   29,   30,   31,   32, 
+           33,   34,   35,   36,   37,   38,   39,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,   52,    0,    0,   53,   54,   55, 
+           56,   68,   57,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    3,    4,    5,    6,    7, 
+            8,    0,   67,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,   21,   22,   23,   24,   25, 
+            0,    0,   26,    0,    0,    0,    0,    0,   27,   28, 
+          277,   30,   31,   32,   33,   34,   35,   36,   37,   38, 
+           39,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,   52,    0, 
+            0,  278,   54,   55,   56,   68,   57,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    3,    4,    5,    6,    7,    8,    0,  230,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,   21,   22,   23,   24,   25,    0,    0,   26,    0, 
+            0,    0,    0,    0,   27,   28,  277,   30,   31,   32, 
+           33,   34,   35,   36,   37,   38,   39,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,   52,    0,    0,   53,   54,   55, 
+           56,   68,   57,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    3,    4,    5,    6,    7, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,   21,   22,   23,   24,   25, 
+            0,    0,   26,    0,    0,    0,    0,    0,   27,   28, 
+            0,   30,   31,   32,   33,   34,   35,   36,   37,   38, 
+           39,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,   52,    0, 
+            0,   53,   54,   55,   56,   68,   57,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,  230,    0, 
             9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
            15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
            20,   21,  210,  211,  212,  213,    0,    0,  214,    0, 
@@ -2634,298 +2832,197 @@ private static final int[] yyTable4() {
             0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
             0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
            56,   68,  226,  227,  228,   58,   59,  229,   61,   62, 
-           63,   64,    0,   65,   66,    0,  434,    4,    5,    6, 
-            0,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,   15,   16,   17,   18,    0, 
-            0,    0,    0,    0,   19,   20,   21,  210,  211,  212, 
-          213,    0,    0,   26,    0,    0,    0,    0,    0,    0, 
-           28,    0,    0,  215,  216,  217,  218,   35,  219,  220, 
-          221,  222,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,   67,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0, 1107, 1107,  612,    0,  224, 
-            0,    0,  225,   54,   55,   56,    0,    0,    0,    0, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,    4,    5,    6,    0,    8,    0,    0,    0, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,   21,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,  223,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,  500,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,  226,  227,  228,   58, 
+           59,  229,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,  324,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+          263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,  265,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,  223,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,  324,  226,  227,  228,   58,   59,  229,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,  223,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,  500,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,  226,  227,  228,   58, 
+           59,  229,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,  324,  324,  324,    0,  324,    0,  230,    0, 
+          324,  324,    0,    0,    0,  324,    0,  324,  324,  324, 
+          324,  324,  324,  324,    0,    0,    0,    0,    0,  324, 
+          324,  324,  324,  324,  324,  324,    0,    0,  324,    0, 
+            0,    0,    0,    0,    0,  324,    0,    0,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,    0,    0,    0,  324,    0, 
+            0,  324,  324,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  324,  324,    0,    0, 
+            0,    0,    0,    0,  324,    0,    0,  324,  324,  324, 
+          324,   68,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,    0,  324,  324,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,  223,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,  226,  227,    0,   58, 
+           59,  229,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,   67,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+          263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,  265,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,  223,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,   68,    0,  227,  228,   58,   59,  229,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,  223,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,    0,  227,    0,   58, 
+           59,  229,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,  436,    4,    5,    6,    0,    8,    0,  230,    0, 
             9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
            15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
            20,   21,  210,  211,  212,  213,    0,    0,   26,    0, 
-            0,    0, 1107, 1107,   68,   28, 1107,    0,  215,  216, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
           217,  218,   35,  219,  220,  221,  222,    0,   40,   41, 
            42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
-            0,   48,   49,    0,    0,    0,   67,    0,    0,    0, 
-         1107,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
             0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
-           56, 1107,  612,    0,    0,   58,   59,   60,   61,   62, 
-           63,   64,    0,   65,   66,    0,    0,    0,    0, 1107, 
-            0,    0,    0, 1107,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0, 1107, 1107, 1107, 1107, 
-            0,    0,    0, 1107, 1107,    0, 1107,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           56,   68,    0,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,   21,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  843,    0, 
+            0,  225,   54,   55,   56,   68,  857,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,  230,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,   21,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,   68,  857,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,  997,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,  230,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+          263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,  265,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,   68, 1060,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,    0,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+          813,    0,  214,    0,    0,    0,    0,  813,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,    0,  857,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,    0,    0, 
+            9,   10,    0,  813,    0,   11,    0,   12,   13,   14, 
+          263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,  265,  210,  211,  212,  213,  230,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,    0, 1164,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,   68, 
-            0,    0,    0,    0,    3,    4,    5,    6,    7,    8, 
-            0,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
-           12,   13,   14,   15,   16,   17,   18,   67,    0,    0, 
-            0,    0,   19,   20,   21,   22,   23,   24,   25,    0, 
-            0,   26,    0,    0,    0,    0,    0,   27,   28,   29, 
-           30,   31,   32,   33,   34,   35,   36,   37,   38,   39, 
-            0,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
-            0,   47,    0,    0,   48,   49,    0,    0,    0,    0, 
-            0,    0,    0,    0, 1107,    0,    0, 1107,    0,   50, 
-           51,    0,    0,    0,    0, 1107,    0,   52,    0,    0, 
-           53,   54,   55,   56,    0,   57,    0,    0,   58,   59, 
-           60,   61,   62,   63,   64,    0,   65,   66,    0,    0, 
-           68,    0,    0,    0,    0,    0,    0,    0,    0,    3, 
-            4,    5,    6,    7,    8,    0,    0,    0,    9,   10, 
-            0,    0,    0,   11,    0,   12,   13,   14,   15,   16, 
-           17,   18, 1107,   67,    0,    0,    0,   19,   20,   21, 
-           22,   23,   24,   25,    0,    0,   26,    0,    0,    0, 
-            0,    0,   27,   28,  275,   30,   31,   32,   33,   34, 
-           35,   36,   37,   38,   39,    0,   40,   41,   42,   43, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  813,  813,  813,    0,  813,    0, 
+          230,    0,  813,  813,    0,    0,    0,  813,    0,  813, 
+          813,  813,  813,  813,  813,  813,    0,    0,    0,    0, 
+            0,  813,  813,  813,  813,  813,  813,  813,    0,    0, 
+          813,    0,    0,    0,    0,    0,    0,  813,    0,    0, 
+          813,  813,  813,  813,  813,  813,  813,  813,  813,    0, 
+          813,  813,  813,  813,  813,  813,  813,    0,    0,    0, 
+          813,    0,    0,  813,  813,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  813,  813, 
+            0,    0,    0,    0,    0,    0,  813,    0,    0,  813, 
+          813,  813,  813,   68,    0,    0,    0,  813,  813,  813, 
+          813,  813,  813,  813,    0,  813,  813,    0,    0,    0, 
+            4,    5,    6,    0,    8,    0,   67,    0,    9,   10, 
+            0,    0,    0,   11,    0,   12,   13,   14,  263,  264, 
+           17,   18,    0,    0,    0,    0,    0,   19,   20,  265, 
+          210,  211,  212,  213,    0,    0,  214,    0,    0,    0, 
+            0,    0,    0,   28,    0,    0,  215,  216,  217,  218, 
+           35,  219,  220,  221,  222,    0,   40,   41,   42,   43, 
            44,   45,   46,    0,    0,    0,   47,    0,    0,   48, 
            49,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,   50,   51,    0,    0,    0,    0, 
-            0,    0,   52,    0,    0,   53,   54,   55,   56,    0, 
-           57,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
-            0,   65,   66,    0,    0,    0,   68,    0,    0,    0, 
-            3,    4,    5,    6,    7,    8,    0,    0,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,   15, 
-           16,   17,   18,   67,    0,    0,    0,    0,   19,   20, 
-           21,   22,   23,   24,   25,    0,    0,   26,    0,    0, 
-            0,    0,    0,   27,   28,   29,   30,   31,   32,   33, 
-           34,   35,   36,   37,   38,   39,    0,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,   52,    0,    0,   53,   54,   55,   56, 
-            0,   57,    0,    0,   58,   59,   60,   61,   62,   63, 
-           64,    0,   65,   66,    0,    0,   68,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    3,    4,    5,    6, 
-            7,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,   15,   16,   17,   18,   67, 
-            0,    0,    0,    0,   19,   20,   21,   22,   23,   24, 
-           25,    0,    0,   26,    0,    0,    0,    0,    0,   27, 
-           28,  275,   30,   31,   32,   33,   34,   35,   36,   37, 
-           38,   39,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0,    0,    0,    0,    0,   52, 
-            0,    0,  276,   54,   55,   56,    0,   57,    0,    0, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,   68,    0,    0,    0,    3,    4,    5,    6, 
-            7,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,   15,   16,   17,   18,  230, 
-            0,    0,    0,    0,   19,   20,   21,   22,   23,   24, 
-           25,    0,    0,   26,    0,    0,    0,    0,    0,   27, 
-           28,  275,   30,   31,   32,   33,   34,   35,   36,   37, 
-           38,   39,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0,    0,    0,    0,    0,   52, 
-            0,    0,   53,   54,   55,   56,    0,   57,    0,    0, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,   68,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    3,    4,    5,    6,    7,    8,    0,    0, 
-            0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
-           14,   15,   16,   17,   18,  230,    0,    0,    0,    0, 
-           19,   20,   21,   22,   23,   24,   25,    0,    0,   26, 
-            0,    0,    0,    0,    0,   27,   28,    0,   30,   31, 
-           32,   33,   34,   35,   36,   37,   38,   39,    0,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,   47, 
-            0,    0,   48,   49,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   50,   51,    0, 
-            0,    0,    0,    0,    0,   52,    0,    0,   53,   54, 
-           55,   56,    0,   57,    0,    0,   58,   59,   60,   61, 
-           62,   63,   64,    0,   65,   66,    0,    0,   68,    0, 
-            0,    0,    0,    4,    5,    6,    0,    8,    0,    0, 
-            0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
-           14,   15,   16,   17,   18,  230,    0,    0,    0,    0, 
-           19,   20,   21,  210,  211,  212,  213,    0,    0,  214, 
-            0,    0,    0,    0,    0,    0,   28,    0,    0,  215, 
-          216,  217,  218,   35,  219,  220,  221,  222,  223,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,   47, 
-            0,    0,   48,   49,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   50,   51,    0, 
-            0,    0,    0,    0,    0,  224,    0,    0,  225,   54, 
-           55,   56,    0,  226,  227,  228,   58,   59,  229,   61, 
-           62,   63,   64,    0,   65,   66,    0,    0,   68,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    4, 
-            5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
-            0,    0,   11,    0,   12,   13,   14,   15,   16,   17, 
-           18,  230,    0,    0,    0,    0,   19,   20,   21,  210, 
-          211,  212,  213,    0,    0,  214,    0,    0,    0,    0, 
-            0,    0,   28,    0,    0,  215,  216,  217,  218,   35, 
-          219,  220,  221,  222,  223,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   50,  498,    0,    0,    0,    0,    0, 
-            0,  224,    0,    0,  225,   54,   55,   56,    0,  226, 
-          227,  228,   58,   59,  229,   61,   62,   63,   64,    0, 
-           65,   66,    0,    0,   68,    0,    0,    0,    0,    4, 
-            5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
-            0,    0,   11,    0,   12,   13,   14,  263,  264,   17, 
-           18,  320,    0,    0,    0,    0,   19,   20,  265,  210, 
-          211,  212,  213,    0,    0,  214,    0,    0,    0,    0, 
-            0,    0,   28,    0,    0,  215,  216,  217,  218,   35, 
-          219,  220,  221,  222,  223,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   50,   51,    0,    0,    0,    0,    0, 
-            0,  224,    0,    0,  225,   54,   55,   56,    0,  226, 
-          227,  228,   58,   59,  229,   61,   62,   63,   64,    0, 
-           65,   66,    0,    0,  320,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    4,    5,    6,    0,    8, 
-            0,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
-           12,   13,   14,  263,  264,   17,   18,  230,    0,    0, 
-            0,    0,   19,   20,  265,  210,  211,  212,  213,    0, 
-            0,  214,    0,    0,    0,    0,    0,    0,   28,    0, 
-            0,  215,  216,  217,  218,   35,  219,  220,  221,  222, 
-          223,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
-            0,   47,    0,    0,   48,   49,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,   50, 
-          498,    0,    0,    0,    0,    0,    0,  224,    0,    0, 
-          225,   54,   55,   56,    0,  226,  227,  228,   58,   59, 
-          229,   61,   62,   63,   64,    0,   65,   66,    0,    0, 
-           68,    0,    0,    0,    0,  320,  320,  320,    0,  320, 
-            0,    0,    0,  320,  320,    0,    0,    0,  320,    0, 
-          320,  320,  320,  320,  320,  320,  320,  230,    0,    0, 
-            0,    0,  320,  320,  320,  320,  320,  320,  320,    0, 
-            0,  320,    0,    0,    0,    0,    0,    0,  320,    0, 
-            0,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,    0,    0, 
-            0,  320,    0,    0,  320,  320,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  320, 
-          320,    0,    0,    0,    0,    0,    0,  320,    0,    0, 
-          320,  320,  320,  320,    0,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,    0,  320,  320,    0,    0, 
-           68,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    4,    5,    6,    0,    8,    0,    0,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,  263, 
-          264,   17,   18,  230,    0,    0,    0,    0,   19,   20, 
-          265,  210,  211,  212,  213,    0,    0,  214,    0,    0, 
-            0,    0,    0,    0,   28,    0,    0,  215,  216,  217, 
-          218,   35,  219,  220,  221,  222,  223,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,  224,    0,    0,  225,   54,   55,   56, 
-            0,  226,  227,    0,   58,   59,  229,   61,   62,   63, 
-           64,    0,   65,   66,    0,    0,   68,    0,    0,    0, 
-            0,    4,    5,    6,    0,    8,    0,    0,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,  263, 
-          264,   17,   18,   67,    0,    0,    0,    0,   19,   20, 
-          265,  210,  211,  212,  213,    0,    0,  214,    0,    0, 
-            0,    0,    0,    0,   28,    0,    0,  215,  216,  217, 
-          218,   35,  219,  220,  221,  222,  223,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,  224,    0,    0,  225,   54,   55,   56, 
-            0,    0,  227,  228,   58,   59,  229,   61,   62,   63, 
-           64,    0,   65,   66,    0,    0,   68,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    4,    5,    6, 
-            0,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,  263,  264,   17,   18,  230, 
-            0,    0,    0,    0,   19,   20,  265,  210,  211,  212, 
-          213,    0,    0,  214,    0,    0,    0,    0,    0,    0, 
-           28,    0,    0,  215,  216,  217,  218,   35,  219,  220, 
-          221,  222,  223,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0,    0,    0,    0,    0,  224, 
-            0,    0,  225,   54,   55,   56,    0,    0,  227,    0, 
-           58,   59,  229,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,   68,    0,    0,    0,  434,    4,    5,    6, 
-            0,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,   15,   16,   17,   18,  230, 
-            0,    0,    0,    0,   19,   20,   21,  210,  211,  212, 
-          213,    0,    0,   26,    0,    0,    0,    0,    0,    0, 
-           28,    0,    0,  215,  216,  217,  218,   35,  219,  220, 
-          221,  222,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0,    0,    0,    0,    0,  224, 
-            0,    0,  225,   54,   55,   56,    0,    0,    0,    0, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,   68,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    4,    5,    6,    0,    8,    0,    0, 
-            0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
-           14,   15,   16,   17,   18,  230,    0,    0,    0,    0, 
-           19,   20,   21,  210,  211,  212,  213,    0,    0,  214, 
-            0,    0,    0,    0,    0,    0,   28,    0,    0,  215, 
-          216,  217,  218,   35,  219,  220,  221,  222,    0,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,   47, 
-            0,    0,   48,   49,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   50,   51,    0, 
-            0,    0,    0,    0,    0,  224,    0,    0,  225,   54, 
-           55,   56,    0,  848,    0,    0,   58,   59,   60,   61, 
-           62,   63,   64,    0,   65,   66,    0,    0,   68,    0, 
-            0,    0,    0,    4,    5,    6,    0,    8,    0,    0, 
-            0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
-           14,  263,  264,   17,   18,  230,    0,    0,    0,    0, 
-           19,   20,  265,  210,  211,  212,  213,    0,    0,  214, 
-            0,    0,    0,    0,    0,    0,   28,    0,    0,  215, 
-          216,  217,  218,   35,  219,  220,  221,  222,    0,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,   47, 
-            0,    0,   48,   49,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   50,   51,    0, 
-            0,    0,    0,    0,    0,  224,    0,    0,  225,   54, 
-           55,   56,    0,  983,    0,    0,   58,   59,   60,   61, 
-           62,   63,   64,    0,   65,   66,    0,    0,   68,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    4, 
-            5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
-            0,    0,   11,    0,   12,   13,   14,  263,  264,   17, 
-           18,  230,    0,    0,    0,    0,   19,   20,  265,  210, 
-          211,  212,  213,    0,    0,  214,    0,    0,    0,    0, 
-            0,    0,   28,    0,    0,  215,  216,  217,  218,   35, 
-          219,  220,  221,  222,    0,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   50,   51,    0,    0,    0,    0,    0, 
-            0,  224,    0,    0,  225,   54,   55,   56,    0, 1046, 
-            0,    0,   58,   59,   60,   61,   62,   63,   64,    0, 
-           65,   66,    0,    0,   68,    0,    0,    0,    0,    4, 
-            5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
-            0,    0,   11,    0,   12,   13,   14,  263,  264,   17, 
-           18,    0,    0,    0,    0,    0,   19,   20,  265,  210, 
-          211,  212,  213,    0,    0,  214,    0,  809,    0,    0, 
-            0,    0,   28,    0,  809,  215,  216,  217,  218,   35, 
-          219,  220,  221,  222,    0,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   50,   51,    0,    0,    0,    0,    0, 
-            0,  224,    0,    0,  225,   54,   55,   56,    0,  848, 
-            0,    0,   58,   59,   60,   61,   62,   63,   64,    0, 
-           65,   66,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    4,    5,    6,    0,    8, 
-          809,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
-           12,   13,   14,  263,  264,   17,   18,    0,    0,    0, 
-          230,    0,   19,   20,  265,  210,  211,  212,  213,    0, 
-            0,  214,    0,    0,    0,    0,    0,    0,   28,    0, 
-            0,  215,  216,  217,  218,   35,  219,  220,  221,  222, 
-            0,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
-            0,   47,    0,    0,   48,   49,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,   50, 
-           51,    0,    0,    0,    0,    0,    0,  224,    0,    0, 
-          225,   54,   55,   56,    0, 1150,    0,    0,   58,   59, 
-           60,   61,   62,   63,   64,    0,   65,   66,    0,    0, 
-            0,    0,    0,   68,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  809,  809,  809,    0,  809,    0,  230,    0,  809, 
-          809,    0,    0,    0,  809,    0,  809,  809,  809,  809, 
-          809,  809,  809,    0,    0,    0,    0,    0,  809,  809, 
-          809,  809,  809,  809,  809,    0,    0,  809,    0,    0, 
-            0,    0,    0,    0,  809,    0,    0,  809,  809,  809, 
-          809,  809,  809,  809,  809,  809,    0,  809,  809,  809, 
-          809,  809,  809,  809,    0,    0,    0,  809,    0,    0, 
-          809,  809,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  809,  809,    0,    0,    0, 
-            0,    0,    0,  809,    0,    0,  809,  809,  809,  809, 
-           68,    0,    0,    0,  809,  809,  809,  809,  809,  809, 
-          809,    0,  809,  809,    4,    5,    6,    0,    8,    0, 
-           67,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
-           13,   14,  263,  264,   17,   18,    0,    0,    0,    0, 
-            0,   19,   20,  265,  210,  211,  212,  213,    0,    0, 
+            0,    0,  224,    0,    0,  225,   54,   55,   56,   68, 
+            0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
+            0,   65,   66,    0,    4,    5,    6,    0,    8,    0, 
+          230,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
+           13,   14,   15,   16,   17,   18,    0,    0,    0,    0, 
+            0,   19,   20,   21,  210,  211,  212,  213,    0,    0, 
           214,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
           215,  216,  217,  218,   35,  219,  220,  221,  222,    0, 
            40,   41,   42,   43,   44,   45,   46,    0,    0,    0, 
@@ -2934,22 +3031,22 @@ private static final int[] yyTable4() {
             0,    0,    0,    0,    0,    0,  224,    0,    0,  225, 
            54,   55,   56,   68,    0,    0,    0,   58,   59,   60, 
            61,   62,   63,   64,    0,   65,   66,    0,    0,    0, 
-            0,    4,    5,    6,    0,    8,    0,  230,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,   15, 
-           16,   17,   18,    0,    0,    0,    0,    0,   19,   20, 
-           21,  210,  211,  212,  213,    0,    0,  214,    0,    0, 
-            0,    0,    0,    0,   28,    0,    0,  215,  216,  217, 
-          218,   35,  219,  220,  221,  222,    0,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,  224,    0,    0,  225,   54,   55,   56, 
-           68,    0,    0,    0,   58,   59,   60,   61,   62,   63, 
-           64,    0,   65,   66,    4,    5,    6,    0,    8,    0, 
+            4,    5,    6,    0,    8,    0,  230,    0,    9,   10, 
+            0,    0,    0,   11,    0,   12,   13,   14,   15,   16, 
+           17,   18,    0,    0,    0,    0,    0,   19,   20,   21, 
+          210,  211,  212,  213,    0,    0,   26,    0,    0,    0, 
+            0,    0,    0,   28,    0,    0,  215,  216,  217,  218, 
+           35,  219,  220,  221,  222,    0,   40,   41,   42,   43, 
+           44,   45,   46,    0,    0,    0,   47,    0,    0,   48, 
+           49,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,   50,   51,    0,    0,    0,    0, 
+            0,    0,  224,    0,    0,  225,   54,   55,   56,   68, 
+            0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
+            0,   65,   66,    0,    4,    5,    6,    0,    8,    0, 
           230,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
            13,   14,   15,   16,   17,   18,    0,    0,    0,    0, 
             0,   19,   20,   21,  210,  211,  212,  213,    0,    0, 
-           26,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
+          797,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
           215,  216,  217,  218,   35,  219,  220,  221,  222,    0, 
            40,   41,   42,   43,   44,   45,   46,    0,    0,    0, 
            47,    0,    0,   48,   49,    0,    0,    0,    0,    0, 
@@ -2957,77 +3054,77 @@ private static final int[] yyTable4() {
             0,    0,    0,    0,    0,    0,  224,    0,    0,  225, 
            54,   55,   56,   68,    0,    0,    0,   58,   59,   60, 
            61,   62,   63,   64,    0,   65,   66,    0,    0,    0, 
-            0,    4,    5,    6,    0,    8,    0,  809,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,   15, 
-           16,   17,   18,    0,    0,    0,    0,    0,   19,   20, 
-           21,  210,  211,  212,  213,    0,    0,  790,    0,    0, 
-            0,    0,    0,    0,   28,    0,    0,  215,  216,  217, 
-          218,   35,  219,  220,  221,  222,    0,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,  224,    0,    0,  225,   54,   55,   56, 
-          809,    0,    0,    0,   58,   59,   60,   61,   62,   63, 
-           64,    0,   65,   66,    4,    5,    6,    0,    8,    0, 
-          821,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
+            4,    5,    6,    0,    8,    0,  813,    0,    9,   10, 
+            0,    0,    0,   11,    0,   12,   13,   14,   15,   16, 
+           17,   18,    0,    0,    0,    0,    0,   19,   20,   21, 
+          210,  211,  212,  213,    0,    0,  214,    0,    0,    0, 
+            0,    0,    0,   28,    0,    0,  215,  216,  217,  218, 
+           35,  219,  220,  221,  222,    0,   40,   41,   42,   43, 
+           44,   45,   46,    0,    0,    0,   47,    0,    0,   48, 
+           49,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,   50,   51,    0,    0,    0,    0, 
+            0,    0,  843,    0,    0,  225,   54,   55,   56,  813, 
+            0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
+            0,   65,   66,    0,    4,    5,    6,    0,    8,    0, 
+          825,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
            13,   14,  263,  264,   17,   18,    0,    0,    0,    0, 
             0,   19,   20,  265,  210,  211,  212,  213,    0,    0, 
-          887,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
+          908,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
           215,  216,  217,  218,   35,  219,  220,  221,  222,    0, 
            40,   41,   42,   43,   44,   45,   46,    0,    0,    0, 
            47,    0,    0,   48,   49,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,   50,   51, 
             0,    0,    0,    0,    0,    0,  224,    0,    0,  225, 
-           54,   55,   56,  821,    0,    0,    0,   58,   59,   60, 
+           54,   55,   56,  825,    0,    0,    0,   58,   59,   60, 
            61,   62,   63,   64,    0,   65,   66,    0,    0,    0, 
-            0,  809,  809,  809,    0,  809,    0,    0,    0,  809, 
-          809,    0,    0,    0,  809,    0,  809,  809,  809,  809, 
-          809,  809,  809,    0,    0,    0,    0,    0,  809,  809, 
-          809,  809,  809,  809,  809,    0,    0,  809,    0,    0, 
-            0,    0,    0,    0,  809,    0,    0,  809,  809,  809, 
-          809,  809,  809,  809,  809,  809,    0,  809,  809,  809, 
-          809,  809,  809,  809,    0,    0,    0,  809,    0,    0, 
-          809,  809,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  809,  809,    0,    0,    0, 
-            0,    0,    0,  809,    0,    0,  809,  809,  809,  809, 
-            0,  809,  511,    0,  809,  809,  809,  809,  809,  809, 
-          809,    0,  809,  809,  821,  821,  821,    0,  821,    0, 
-            0,    0,  821,  821,    0,    0,    0,  821,    0,  821, 
-          821,  821,  821,  821,  821,  821,    0,    0,    0,    0, 
-            0,  821,  821,  821,  821,  821,  821,  821,    0,    0, 
-          821,    0,    0,    0,    0,    0,    0,  821,    0,    0, 
-          821,  821,  821,  821,  821,  821,  821,  821,  821,    0, 
-          821,  821,  821,  821,  821,  821,  821,    0,    0,    0, 
-          821,    0,    0,  821,  821,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  821,  821, 
-            0,    0,    0,    0,    0,    0,  821,    0,    0,  821, 
-          821,  821,  821,    0,    0,    0,    0,  821,  821,  821, 
-          821,  821,  821,  821,  198,  821,  821,    0,  197,  192, 
+          813,  813,  813,    0,  813,    0,    0,    0,  813,  813, 
+            0,    0,    0,  813,    0,  813,  813,  813,  813,  813, 
+          813,  813,    0,    0,    0,    0,    0,  813,  813,  813, 
+          813,  813,  813,  813,    0,    0,  813,    0,    0,    0, 
+            0,    0,    0,  813,    0,    0,  813,  813,  813,  813, 
+          813,  813,  813,  813,  813,    0,  813,  813,  813,  813, 
+          813,  813,  813,    0,    0,    0,  813,    0,    0,  813, 
+          813,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  813,  813,    0,    0,    0,    0, 
+            0,    0,  813,    0,    0,  813,  813,  813,  813,    0, 
+            0,  813,  515,  813,  813,  813,  813,  813,  813,  813, 
+            0,  813,  813,    0,  825,  825,  825,    0,  825,    0, 
+            0,    0,  825,  825,    0,    0,    0,  825,    0,  825, 
+          825,  825,  825,  825,  825,  825,    0,    0,    0,    0, 
+            0,  825,  825,  825,  825,  825,  825,  825,    0,    0, 
+          825,    0,    0,    0,    0,    0,    0,  825,    0,    0, 
+          825,  825,  825,  825,  825,  825,  825,  825,  825,    0, 
+          825,  825,  825,  825,  825,  825,  825,    0,    0,    0, 
+          825,    0,    0,  825,  825,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  825,  825, 
+            0,    0,    0,    0,    0,    0,  825,    0,    0,  825, 
+          825,  825,  825,    0,    0,    0,    0,  825,  825,  825, 
+          825,  825,  825,  825,  198,  825,  825,    0,  197,  192, 
             0,    0,    0,  195,  193,    0,  194,    0,  196,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,  191,    0,  200,    0,    0, 
-            0,    0,    0,    0,    0,  511,  511,  511,  511,    0, 
+            0,    0,    0,    0,    0,  515,  515,  515,  515,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  511,  511,  511,  511,  190,    0,  199,  511,    0, 
-          511,  511,  511,  511,  511,  511,    0,    0,    0,  198, 
-            0,  511,    0,  197,  192,    0,  511,    0,  195,  193, 
-            0,  194,    0,  196,    0,    0,    0,    0,    0,  511, 
-          511,    0,    0,    0,    0,    0,  189,  511,  188,    0, 
-          511,    0,  511,  511,    0,  511,  511,    0,  511,  511, 
-          511,  511,  511,  511,  511,    0,  511,  511,    0,    0, 
+            0,  515,  515,  515,  515,  190,    0,  199,  515,    0, 
+          515,  515,  515,  515,  515,  515,    0,    0,    0,  198, 
+            0,  515,    0,  197,  192,    0,  515,    0,  195,  193, 
+            0,  194,    0,  196,    0,    0,    0,    0,    0,  515, 
+          515,    0,    0,    0,    0,    0,  189,  515,  188,    0, 
+          515,    0,  515,  515,    0,  515,  515,    0,  515,  515, 
+          515,  515,  515,  515,  515,    0,  515,  515,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
           191,    0,  200,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  809, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
           190,    0,  199,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,  127,  128, 
           129,  130,  131,  132,  133,  134,  135,  136,  137,  138, 
           139,  140,  141,  142,  143,  144,  145,  146,  147,  148, 
-          149,  150,  511,    0,    0,  151,  152,  153,  154,  155, 
+          149,  150,    0,    0,    0,  151,  152,  153,  154,  155, 
           156,  157,  158,  159,  160,    0,    0,    0,    0,    0, 
           161,  162,  163,  164,  165,  166,  167,  168,  169,  254, 
             0,  170,    0,    0,    0,    0,    0,    0,    0,    0, 
@@ -3045,879 +3142,893 @@ private static final int[] yyTable4() {
             0,    0,  171,  172,  173,  174,  175,  176,  177,  178, 
           179,    0,    0,  180,  181,    0,    0,    0,    0,  182, 
           183,  184,  185,    0,    0,    0,    0,    0,    0,    0, 
-          403,  398,    0,  186,  187,  401,  399,   59,  400,    0, 
-          402,    0,    0,    0,    0,  511,  511,  511,  511,    0, 
-            0,    0,    0,  395,    0,  394,  393,    0,    0,    0, 
-            0,  511,  511,  511,  511,    0,    0,    0,  511,    0, 
-          511,  511,  511,  511,  511,  511,    0,    0,    0,    0, 
-            0,  511,    0,    0,    0,    0,  511,  397,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  511, 
-          511,    0,    0,    0,    0,    0,    0,  511,    0,    0, 
-          511,    0,  511,  511,    0,  511,  511,  396,  511,  511, 
-          511,  511,  511,  511,  511,  198,  511,  511,    0,  197, 
-          192,    0,  449,    0,  195,  193,    0,  194,    0,  196, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  189,    0,  188,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  191,    0,  200,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  190,    0,  199,    0, 
-            0,    0,    0,    0,    0,    0,    0,  198,    0,    0, 
-            0,  197,  192,    0,    0,    0,  195,  193,    0,  194, 
-            0,  196,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
+            0,  198,    0,  186,  187,  197,  192,   59,  451,    0, 
+          195,  193,    0,  194,    0,  196,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  189,    0, 
+          188,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  376,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  191,    0, 
-          200,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  190,    0, 
-          199,  377,  378,  379,  380,  381,  382,  383,  384,  385, 
-          386,  387,  388,  389,    0,    0,    0,    0,  390,  391, 
-            0,    0,    0,    0,  392,    0,    0,    0,    0,  127, 
-          128,  129,  130,  131,  132,  133,  134,  135,  136,  137, 
-          138,  139,  140,  141,  142,  143,  144,  145,  146,  147, 
-          148,  149,  150,    0,    0,    0,  151,  152,  153,  437, 
-          438,  439,  440,  158,  159,  160,    0,  308,    0,    0, 
-            0,  161,  162,  163,  164,  441,  442,  443,  444,  169, 
-          445,  446,  447,  448,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  171,  172, 
-          173,  174,  175,  176,  177,  178,  179,    0,    0,  180, 
-          181,    0,    0,    0,    0,  182,  183,  184,  185,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  186, 
-          187,  127,  128,  129,  130,  131,  132,  133,  134,  135, 
-          136,  137,  138,  139,  140,  141,  142,  143,  144,  145, 
-          146,  147,  148,  149,  150,    0,    0,    0,  151,  152, 
-          153,  154,  155,  156,  157,  158,  159,  160,    0,    0, 
-            0,    0,    0,  161,  162,  163,  164,  165,  166,  167, 
-          168,  169,  316,  317,  170,  318,    0,    0,    0,    0, 
+            0,    0,  191,    0,  200,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
-            0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,  198,    0,    0,    0,  197,  192, 
-            0,  186,  187,  195,  193,    0,  194,    0,  196,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
+            0,    0,  190,    0,  199,    0,    0,    0,    0,    0, 
+            0,    0,    0,  198,    0,    0,    0,  197,  192,    0, 
+            0,    0,  195,  193,    0,  194,    0,  196,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          189,    0,  188,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            4,    5,    6,    0,    8,  191,    0,  200,    9,   10, 
-            0,    0,    0,   11,    0,   12,   13,   14,  263,  264, 
-           17,   18,    0,    0,    0,    0,    0,   19,   20,  265, 
-          293,  294,  295,  296,    0,  190,  214,  199,    0,    0, 
-            0,    0,    0,  297,    0,  679,  298,  299,  300,  301, 
-           35,  302,  303,  304,  305,    0,   40,   41,   42,   43, 
-           44,   45,   46,    0,    0,    0,  306,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  405,  400,  191,    0,  200,  403,  401,    0, 
+          402,    0,  404,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  397,    0,  396,  395,    0, 
+            0,    0,    0,    0,  190,    0,  199,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  307,    0,    0,  225,   54,   55,   56,    0, 
-            0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
-            0,   65,   66,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  399, 
+            0,    0,    0,    0,    0,  127,  128,  129,  130,  131, 
+          132,  133,  134,  135,  136,  137,  138,  139,  140,  141, 
+          142,  143,  144,  145,  146,  147,  148,  149,  150,  398, 
+            0,    0,  151,  152,  153,  439,  440,  441,  442,  158, 
+          159,  160,    0,  310,    0,    0,    0,  161,  162,  163, 
+          164,  443,  444,  445,  446,  169,  447,  448,  449,  450, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  198,    0,    0,    0,  197,  192,    0,  247,    0, 
-          195,  193,    0,  194,    0,  196,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  189,    0, 
-          188,    0,    0,    0,    0,    0,    0,    0,  127,  128, 
-          129,  130,  131,  132,  133,  134,  135,  136,  137,  138, 
-          139,  140,  141,  142,  143,  144,  145,  146,  147,  148, 
-          149,  150,  191,    0,  200,  151,  152,  153,  154,  155, 
-          156,  157,  158,  159,  160,    0,    0,    0,    0,    0, 
-          161,  162,  163,  164,  165,  166,  167,  168,  169,    0, 
-            0,  170,  190,    0,  199,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  171,  172,  173, 
-          174,  175,  176,  177,  178,  179,    0,    0,  180,  181, 
-            0,    0,    0,    0,  182,  183,  184,  185,    4,    5, 
-            6,    0,    8,    0,    0,    0,    9,   10,  186,  187, 
-            0,   11,    0,   12,   13,   14,  263,  264,   17,   18, 
-            0,    0,    0,    0,    0,   19,   20,  265,  293,  294, 
-          295,  296,    0,    0,  214,    0,    0,    0,    0,    0, 
-            0,  297,    0,    0,  298,  299,  300,  301,   35,  302, 
-          303,  304,  305,    0,   40,   41,   42,   43,   44,   45, 
-           46,    0,  198,    0,  306,    0,  197,  192,    0,  247, 
-            0,  195,  193,    0,  194,    0,  196,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  189, 
-          307,  188,    0,  225,   54,   55,   56,    0,    0,    0, 
-            0,   58,   59,   60,   61,   62,   63,   64,    0,   65, 
-           66,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  191,    0,  200,    0,  198,    0,    0, 
-            0,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
-            0,  196,    0,    0,  652,  653,    0,    0,  654,    0, 
-            0,    0,    0,  190,  189,  199,  188,    0,    0,    0, 
             0,    0,    0,    0,  171,  172,  173,  174,  175,  176, 
           177,  178,  179,    0,    0,  180,  181,    0,    0,    0, 
-            0,  182,  183,  184,  185,    0,    0,    0,  191,    0, 
-          200,    0,    0,    0,  198,  186,  187,    0,  197,  192, 
-            0,  247,    0,  195,  193,    0,  194,    0,  196,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  190,    0, 
-          199,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  198,    0,    0,    0,  197, 
-          192,    0,  247,    0,  195,  193,    0,  194,    0,  196, 
-            0,    0,    0,    0,    0,  191,    0,  200,    0,    0, 
-            0,    0,  189,    0,  188,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  190,    0,  199,    0,    0, 
-          198,    0,    0,    0,  197,  192,  191,  247,  200,  195, 
+            0,  182,  183,  184,  185,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  186,  187,  127,  128,  129, 
+          130,  131,  132,  133,  134,  135,  136,  137,  138,  139, 
+          140,  141,  142,  143,  144,  145,  146,  147,  148,  149, 
+          150,    0,    0,    0,  151,  152,  153,  154,  155,  156, 
+          157,  158,  159,  160,    0,    0,    0,    0,    0,  161, 
+          162,  163,  164,  165,  166,  167,  168,  169,  318,  319, 
+          170,  320,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+          198,    0,    0,    0,  197,  192,    0,  186,  187,  195, 
           193,    0,  194,    0,  196,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,  189,    0,  188, 
-            0,    0,    0,    0,    0,    0,  190,    0,  199,    0, 
-            0,    0,    0,    0,    0,  662,  663,    0,    0,  664, 
+            0,    0,    0,  379,  380,  381,  382,  383,  384,  385, 
+          386,  387,  388,  389,  390,  391,    0,    0,    0,    0, 
+          392,  393,    0,    0,    0,    0,    4,    5,    6,    0, 
+            8,  191,    0,  200,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  295,  296,  297,  298, 
+            0,  190,  214,  199,    0,    0,    0,    0,    0,  299, 
+            0,  683,  300,  301,  302,  303,   35,  304,  305,  306, 
+          307,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,  308,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  191,    0,  200,    0,  171,  172,  173,  174,  175, 
-          176,  177,  178,  179,    0,    0,  180,  181,    0,    0, 
-            0,    0,  182,  183,  184,  185,    0,    0,    0,    0, 
-            0,  190,    0,  199,  198,    0,  186,  187,  197,  192, 
-            0,  247,    0,  195,  193,    0,  194,    0,  196,    0, 
-          712,  653,    0,    0,  713,    0,    0,    0,    0,    0, 
-            0,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  309,    0, 
+            0,  225,   54,   55,   56,    0,    0,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  198,    0,    0, 
+            0,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
+            0,  196,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
+            0,    0,    0,    0,  127,  128,  129,  130,  131,  132, 
+          133,  134,  135,  136,  137,  138,  139,  140,  141,  142, 
+          143,  144,  145,  146,  147,  148,  149,  150,  191,    0, 
+          200,  151,  152,  153,  154,  155,  156,  157,  158,  159, 
+          160,    0,    0,    0,    0,    0,  161,  162,  163,  164, 
+          165,  166,  167,  168,  169,    0,    0,  170,  190,    0, 
+          199,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  171,  172,  173,  174,  175,  176,  177, 
+          178,  179,    0,    0,  180,  181,    0,    0,    0,    0, 
+          182,  183,  184,  185,    4,    5,    6,    0,    8,    0, 
+            0,    0,    9,   10,  186,  187,    0,   11,    0,   12, 
+           13,   14,  263,  264,   17,   18,    0,    0,    0,    0, 
+            0,   19,   20,  265,  295,  296,  297,  298,    0,    0, 
+          214,    0,    0,    0,    0,    0,    0,  299,    0,    0, 
+          300,  301,  302,  303,   35,  304,  305,  306,  307,    0, 
+           40,   41,   42,   43,   44,   45,   46,    0,  198,    0, 
+          308,    0,  197,  192,    0,  247,    0,  195,  193,    0, 
+          194,    0,  196,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  189,  309,  188,    0,  225, 
+           54,   55,   56,    0,    0,    0,    0,   58,   59,   60, 
+           61,   62,   63,   64,    0,   65,   66,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  191, 
+            0,  200,    0,  198,    0,    0,    0,  197,  192,    0, 
+          247,    0,  195,  193,    0,  194,    0,  196,    0,    0, 
+          656,  657,    0,    0,  658,    0,    0,    0,    0,  190, 
+          189,  199,  188,    0,    0,    0,    0,    0,    0,    0, 
           171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
             0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,    0,  191,    0,  200,    0,    0, 
-            0,  186,  187,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  715,  663,    0, 
-            0,  716,    0,    0,    0,  190,    0,  199,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  171,  172,  173, 
-          174,  175,  176,  177,  178,  179,    0,    0,  180,  181, 
-            0,    0,    0,    0,  182,  183,  184,  185,  712,  653, 
-            0,    0,  736,    0,    0,    0,    0,    0,  186,  187, 
-            0,    0,    0,    0,    0,    0,    0,    0,  171,  172, 
-          173,  174,  175,  176,  177,  178,  179,    0,    0,  180, 
-          181,    0,    0,    0,    0,  182,  183,  184,  185,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  186, 
-          187,    0,    0,  746,  653,    0,    0,  747,    0,    0, 
+          185,    0,    0,    0,  191,    0,  200,    0,    0,    0, 
+          198,  186,  187,    0,  197,  192,    0,  247,    0,  195, 
+          193,    0,  194,    0,  196,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  190,    0,  199,  189,    0,  188, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  198,    0,    0,    0,  197,  192,    0,  247,    0, 
+          195,  193,    0,  194,    0,  196,    0,    0,    0,    0, 
+            0,  191,    0,  200,    0,    0,    0,    0,  189,    0, 
+          188,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  190,    0,  199,    0,    0,  198,    0,    0,    0, 
+          197,  192,  191,  247,  200,  195,  193,    0,  194,    0, 
+          196,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  189,    0,  188,    0,    0,    0,    0, 
+            0,    0,  190,    0,  199,    0,    0,    0,    0,    0, 
+            0,  666,  667,    0,    0,  668,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  191,    0,  200, 
+            0,  171,  172,  173,  174,  175,  176,  177,  178,  179, 
+            0,    0,  180,  181,    0,    0,    0,    0,  182,  183, 
+          184,  185,    0,    0,    0,    0,    0,  190,    0,  199, 
+          198,    0,  186,  187,  197,  192,    0,  247,    0,  195, 
+          193,    0,  194,    0,  196,    0,  717,  657,    0,    0, 
+          718,    0,    0,    0,    0,    0,    0,  189,    0,  188, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+            0,  191,    0,  200,    0,    0,    0,  186,  187,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  720,  667,    0,    0,  721,    0,    0, 
+            0,  190,    0,  199,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,  171,  172,  173,  174,  175,  176,  177, 
           178,  179,    0,    0,  180,  181,    0,    0,    0,    0, 
-          182,  183,  184,  185,    0,    0,    0,    0,    0,    0, 
-            0,    0,  198,    0,  186,  187,  197,  192,    0,  247, 
+          182,  183,  184,  185,  717,  657,    0,    0,  743,    0, 
+            0,    0,    0,    0,  186,  187,    0,    0,    0,    0, 
+            0,    0,    0,    0,  171,  172,  173,  174,  175,  176, 
+          177,  178,  179,    0,    0,  180,  181,    0,    0,    0, 
+            0,  182,  183,  184,  185,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  186,  187,    0,    0,  753, 
+          657,    0,    0,  754,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  171, 
+          172,  173,  174,  175,  176,  177,  178,  179,    0,    0, 
+          180,  181,    0,    0,    0,    0,  182,  183,  184,  185, 
+            0,    0,    0,    0,    0,    0,    0,    0,  198,    0, 
+          186,  187,  197,  192,    0,  247,    0,  195,  193,    0, 
+          194,    0,  196,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  189,    0,  188,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  756,  667,    0,    0,  757,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  191, 
+            0,  200,    0,  171,  172,  173,  174,  175,  176,  177, 
+          178,  179,    0,    0,  180,  181,    0,    0,    0,    0, 
+          182,  183,  184,  185,    0,    0,    0,    0,    0,  190, 
+            0,  199,  198,    0,  186,  187,  197,  192,    0,  247, 
             0,  195,  193,    0,  194,    0,  196,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,  189, 
             0,  188,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  749,  663,    0, 
-            0,  750,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  191,    0,  200,    0,  171,  172,  173, 
-          174,  175,  176,  177,  178,  179,    0,    0,  180,  181, 
-            0,    0,    0,    0,  182,  183,  184,  185,    0,    0, 
-            0,    0,    0,  190,    0,  199,  198,    0,  186,  187, 
-          197,  192,    0,  247,    0,  195,  193,    0,  194,    0, 
-          196,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  189,    0,  188,    0,    0,    0,    0, 
+            0,    0,    0,  198,    0,    0,    0,  197,  192,    0, 
+          247,    0,  195,  193,    0,  194,    0,  196,    0,    0, 
+            0,    0,    0,  191,    0,  200,    0,    0,    0,    0, 
+          189,    0,  188,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,  198,    0,    0, 
-            0,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
-            0,  196,    0,    0,    0,    0,    0,  191,    0,  200, 
+            0,  197,  192,  190,  247,  199,  195,  193,    0,  194, 
+            0,  196,    0,    0,  191,    0,  200,    0,    0,    0, 
             0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  198,    0,    0,    0,  197,  192,  190,  247,  199, 
-          195,  193,    0,  194,    0,  196,    0,    0,  191,    0, 
-          200,    0,    0,    0,    0,    0,    0,    0,  189,    0, 
-          188,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  198,  190,    0, 
-          199,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
-            0,  196,  191,    0,  200,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
+            0,    0,    0,  198,  190,    0,  199,  197,  192,    0, 
+          247,    0,  195,  193,    0,  194,    0,  196,  191,    0, 
+          200,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          189,    0,  188,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  190,    0, 
+          199,  813,  657,    0,    0,  814,    0,    0,    0,    0, 
+            0,    0,    0,    0,  191,    0,  200,    0,    0,    0, 
+            0,  171,  172,  173,  174,  175,  176,  177,  178,  179, 
+            0,    0,  180,  181,    0,    0,    0,    0,  182,  183, 
+          184,  185,    0,    0,  190,    0,  199,    0,    0,    0, 
+          198,    0,  186,  187,  197,  192,    0,  247,    0,  195, 
+          193,    0,  194,    0,  196,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  189,    0,  188, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  816,  667,    0,    0,  817, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  190,    0,  199,  806,  653,    0,    0,  807, 
-            0,    0,    0,    0,    0,    0,    0,    0,  191,    0, 
-          200,    0,    0,    0,    0,  171,  172,  173,  174,  175, 
+            0,  191,    0,  200,    0,  171,  172,  173,  174,  175, 
           176,  177,  178,  179,    0,    0,  180,  181,    0,    0, 
-            0,    0,  182,  183,  184,  185,    0,    0,  190,    0, 
-          199,    0,    0,    0,  198,    0,  186,  187,  197,  192, 
-            0,  247,    0,  195,  193,    0,  194,    0,  196,    0, 
+            0,    0,  182,  183,  184,  185,  887,  657,    0,    0, 
+          888,  190,    0,  199,    0,    0,  186,  187,    0,    0, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+          676,  667,    0,    0,  677,    0,    0,  186,  187,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  809, 
-          663,    0,    0,  810,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  191,    0,  200,    0,  171, 
-          172,  173,  174,  175,  176,  177,  178,  179,    0,    0, 
-          180,  181,    0,    0,    0,    0,  182,  183,  184,  185, 
-          878,  653,    0,    0,  879,  190,    0,  199,    0,    0, 
-          186,  187,    0,    0,    0,    0,    0,    0,    0,    0, 
           171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
             0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,  672,  663,    0,    0,  673,    0, 
-            0,  186,  187,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  171,  172,  173,  174,  175,  176, 
-          177,  178,  179,    0,    0,  180,  181,    0,    0,    0, 
-            0,  182,  183,  184,  185,    0,    0,    0,    0,    0, 
-         1040,  653,    0,    0, 1041,  186,  187,    0,    0,    0, 
+          185,    0,    0,    0,    0,    0, 1054,  657,    0,    0, 
+         1055,  186,  187,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+            0,    0,    0,    0,    0,  198,    0,  186,  187,  197, 
+          192,    0,  247,    0,  195,  193,    0,  194,    0,  196, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
-            0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,    0,    0,    0,    0,    0,  198, 
-            0,  186,  187,  197,  192,    0,  247,    0,  195,  193, 
-            0,  194,    0,  196,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  189,    0,  188,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0, 1043,  663,    0, 
-            0, 1044,    0,    0,    0,    0,    0,    0,    0,    0, 
-          191,    0,  200,    0,    0,    0,    0,  171,  172,  173, 
-          174,  175,  176,  177,  178,  179,    0,    0,  180,  181, 
-            0,    0,    0,    0,  182,  183,  184,  185,    0,    0, 
-          190,    0,  199,    0,    0,    0,  198,    0,  186,  187, 
-          197,  192,    0,  247,    0,  195,  193,    0,  194,    0, 
-          196,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  189,    0,  188,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  198,    0,    0, 
-            0,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
-            0,  196,    0,    0,    0,    0,    0,  191,    0,  200, 
-            0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
+            0,    0,  189,    0,  188,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  190,    0,  199, 
-            0,    0,  198,    0,    0,    0,  197,  192,  191,    0, 
-          200,  195,  193,    0,  194,    0,  196,    0,    0,    0, 
+            0,    0,    0, 1057,  667,    0,    0, 1058,    0,    0, 
+            0,    0,    0,    0,    0,    0,  191,    0,  200,    0, 
+            0,    0,    0,  171,  172,  173,  174,  175,  176,  177, 
+          178,  179,    0,    0,  180,  181,    0,    0,    0,    0, 
+          182,  183,  184,  185,    0,    0,  190,    0,  199,    0, 
+            0,    0,  198,    0,  186,  187,  197,  192,    0,  247, 
+            0,  195,  193,    0,  194,    0,  196,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,  189, 
-            0,  188,    0,    0,    0,    0,    0,    0,  190,    0, 
-          199,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  188,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  198,    0,    0,    0,  197,  192,    0, 
+          247,    0,  195,  193,    0,  194,    0,  196,    0,    0, 
             0,    0,    0,  191,    0,  200,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0, 1332,  653,    0,    0, 1333,    0,    0,    0, 
-            0,    0,    0,  190,    0,  199,    0,    0,    0,    0, 
-            0,    0,  171,  172,  173,  174,  175,  176,  177,  178, 
-          179,    0,    0,  180,  181,    0,    0,    0,    0,  182, 
-          183,  184,  185, 1098,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  186,  187,    0,    0,    0,    0,    0, 
+          189,    0,  188,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  190,    0,  199,    0,    0,  198,    0, 
+            0,    0,  197,  192,  191,    0,  200,  195,  193,    0, 
+          194,    0,  196,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  189,    0,  188,    0,    0, 
+            0,    0,    0,    0,  190,    0,  199,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  191, 
+            0,  200,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0, 1346,  657, 
+            0,    0, 1347,    0,    0,    0,    0,    0,    0,  190, 
+            0,  199,    0,    0,    0,    0,    0,    0,  171,  172, 
+          173,  174,  175,  176,  177,  178,  179,    0,    0,  180, 
+          181,    0,    0,    0,    0,  182,  183,  184,  185, 1112, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  186, 
+          187,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0, 1335, 
-          663,    0,    0, 1336,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  171, 
-          172,  173,  174,  175,  176,  177,  178,  179, 1098,    0, 
-          180,  181,    0,    0,    0,    0,  182,  183,  184,  185, 
-         1382,  653,    0,    0, 1383,    0,    0,    0,    0,    0, 
-          186,  187,    0,    0,    0,    0,    0,    0,    0,    0, 
-          171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
-            0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  186,  187,    0,    0,  672,  663,    0,    0,  673, 
+            0,    0,    0,    0,    0, 1349,  667,    0,    0, 1350, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,  171,  172,  173,  174,  175, 
-          176,  177,  178,  179,    0,    0,  180,  181,    0,    0, 
-            0,    0,  182,  183,  184,  185, 1080, 1081, 1082, 1083, 
-            0,    0,    0,    0,    0,    0,  186,  187,    0,    0, 
-            0,    0, 1084, 1085, 1086, 1087,    0,    0,    0, 1088, 
-            0, 1089,   40,   41,   42,   43,   44,    0,    0,    0, 
-            0,    0,  306,    0,    0,    0,    0,  569,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-         1090, 1091,    0,    0,    0,    0,    0,    0, 1092,    0, 
-            0, 1093,    0, 1094, 1095,    0, 1096,  573,    0,   58, 
-           59, 1097,   61,   62,   63,   64,    0,   65,   66,    0, 
-            0, 1080, 1081, 1082, 1083,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0, 1084, 1085, 1086, 
-         1087,    0,    0,    0, 1088,    0,    0,   40,   41,   42, 
-           43,   44,    0,    0,    0,    0,    0,  306,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0, 1090, 1091,    0,    0,    0, 
-            0,    0,    0, 1092,    0,    0, 1093,    0, 1094, 1095, 
-            0,    0,    0,    0,   58,   59,   60,   61,   62,   63, 
-           64,    0,   65,   66,    4,    5,    6,    0,    8,    0, 
-            0,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
-           13,   14,  263,  264,   17,   18,    0,    0,    0,    0, 
-            0,   19,   20,  265,  346,  347,  348,  349,    0,    0, 
-          214,    0,    0,    0,    0,    0,    0,  297,    0,    0, 
-          350,  351,  352,  353,   35,  354,  355,  356,  357,    0, 
-           40,   41,   42,   43,   44,   45,   46,    0,    0,    0, 
-          306,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  358,    0,    0,   53, 
-           54,   55,   56,    0,   57,    0,    0,   58,   59,   60, 
-           61,   62,   63,   64,    0,   65,   66,    4,    5,    6, 
-            0,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,  263,  264,   17,   18,    0, 
-            0,    0,    0,    0,   19,   20,  265,  293,  294,  295, 
-          296,    0,    0,  214,    0,    0,    0,    0,    0,    0, 
-          297,    0,    0,  298,  299,  300,  301,   35,  302,  303, 
-          304,  305,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,  306,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  307, 
-            0,    0,  428,   54,   55,   56,    0,  429,    0,    0, 
+          176,  177,  178,  179, 1112,    0,  180,  181,    0,    0, 
+            0,    0,  182,  183,  184,  185, 1396,  657,    0,    0, 
+         1397,    0,    0,    0,    0,    0,  186,  187,    0,    0, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  186,  187,    0, 
+            0,  676,  667,    0,    0,  677,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0, 1112,    0,    0, 
+            0,  171,  172,  173,  174,  175,  176,  177,  178,  179, 
+            0,    0,  180,  181,    0,    0,    0,    0,  182,  183, 
+          184,  185, 1094, 1095, 1096, 1097,    0,    0,    0,    0, 
+            0,    0,  186,  187,    0,    0,    0,    0, 1098, 1099, 
+         1100, 1101,    0,    0,    0, 1102,    0, 1103,   40,   41, 
+           42,   43,   44,    0,    0,    0,    0,    0,  308,    0, 
+            0,    0,    0,  573,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1104, 1105,    0,    0, 
+            0,    0,    0,    0, 1106,    0,    0, 1107,    0, 1108, 
+         1109,    0, 1110,  577,    0,   58,   59, 1111,   61,   62, 
+           63,   64,    0,   65,   66,    0,    0, 1094, 1095, 1096, 
+         1097,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0, 1098, 1099, 1100, 1101,    0,    0,    0, 
+         1102,    0,    0,   40,   41,   42,   43,   44,    0,    0, 
+            0,    0,    0,  308,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0, 1104, 1105,    0,    0,    0,    0,    0,    0, 1106, 
+            0,    0, 1107,    0, 1108, 1109,    0, 1110,    0,    0, 
            58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            4,    5,    6,    0,    8,    0,    0,    0,    9,   10, 
-            0,    0,    0,   11,    0,   12,   13,   14,  263,  264, 
-           17,   18,    0,    0,    0,    0,    0,   19,   20,  265, 
-          458,  459,  460,  461,    0,    0,  214,    0,    0,    0, 
-            0,    0,    0,  297,    0,    0,  462,  463,  464,  465, 
-           35,  445,  446,  466,  448,    0,   40,   41,   42,   43, 
-           44,   45,   46,    0,    0,    0,  306,    0,    0,    0, 
+         1094, 1095, 1096, 1097,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1098, 1099, 1100, 1101, 
+            0,    0,    0, 1102,    0,    0,   40,   41,   42,   43, 
+           44,    0,    0,    0,    0,    0,  308,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  467,    0, 
-            0,    0,  468,    0,    0,  225,   54,   55,   56,    0, 
+            0,    0,    0,    0, 1104, 1105,    0,    0,    0,    0, 
+            0,    0, 1106,    0,    0, 1107,    0, 1108, 1109,    0, 
             0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
             0,   65,   66,    4,    5,    6,    0,    8,    0,    0, 
             0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
            14,  263,  264,   17,   18,    0,    0,    0,    0,    0, 
-           19,   20,  265,  458,  459,  460,  461,    0,    0,  214, 
-            0,    0,    0,    0,    0,    0,  297,    0,    0,  462, 
-          463,  464,  465,   35,  445,  446,  466,  448,    0,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,  306, 
+           19,   20,  265,  348,  349,  350,  351,    0,    0,  214, 
+            0,    0,    0,    0,    0,    0,  299,    0,    0,  352, 
+          353,  354,  355,   35,  356,  357,  358,  359,    0,   40, 
+           41,   42,   43,   44,   45,   46,    0,    0,    0,  308, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  468,    0,    0,  225,   54, 
-           55,   56,    0,    0,    0,    0,   58,   59,   60,   61, 
+            0,    0,    0,    0,    0,  360,    0,    0,   53,   54, 
+           55,   56,    0,   57,    0,    0,   58,   59,   60,   61, 
            62,   63,   64,    0,   65,   66,    4,    5,    6,    0, 
             8,    0,    0,    0,    9,   10,    0,    0,    0,   11, 
             0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
-            0,    0,    0,   19,   20,  265,  293,  294,  295,  296, 
-            0,    0,  214,    0,    0,    0,    0,    0,    0,  297, 
-            0,    0,  298,  299,  300,  301,   35,  302,  303,  304, 
-          305,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
-            0,    0,  306,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  307,    0, 
-            0,  428,   54,   55,   56,    0,    0,    0,    0,   58, 
+            0,    0,    0,   19,   20,  265,  295,  296,  297,  298, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,  299, 
+            0,    0,  300,  301,  302,  303,   35,  304,  305,  306, 
+          307,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,  308,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  309,    0, 
+            0,  430,   54,   55,   56,    0,  431,    0,    0,   58, 
            59,   60,   61,   62,   63,   64,    0,   65,   66,    4, 
             5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
             0,    0,   11,    0,   12,   13,   14,  263,  264,   17, 
-           18,    0,    0,    0,    0,    0,   19,   20,  265, 1204, 
-         1205, 1206, 1207,    0,    0,  214,    0,    0,    0,    0, 
-            0,    0,  297,    0,    0, 1208, 1209, 1210, 1211,   35, 
-         1212, 1213, 1214, 1215,    0,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,  306,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0, 1216,    0,    0,  225,   54,   55,   56,    0,    0, 
+           18,    0,    0,    0,    0,    0,   19,   20,  265,  460, 
+          461,  462,  463,    0,    0,  214,    0,    0,    0,    0, 
+            0,    0,  299,    0,    0,  464,  465,  466,  467,   35, 
+          447,  448,  468,  450,    0,   40,   41,   42,   43,   44, 
+           45,   46,    0,    0,    0,  308,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  469,    0,    0, 
+            0,  470,    0,    0,  225,   54,   55,   56,    0,    0, 
             0,    0,   58,   59,   60,   61,   62,   63,   64,    0, 
            65,   66,    4,    5,    6,    0,    8,    0,    0,    0, 
             9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
           263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
-           20,  265,  458,  459,  460,  461,    0,    0,  214,    0, 
-            0,    0,    0,    0,    0,  297,    0,    0,  462,  463, 
-          464, 1325,   35,  445,  446, 1326,  448,    0,   40,   41, 
-           42,   43,   44,   45,   46,    0,    0,    0,  306,    0, 
+           20,  265,  460,  461,  462,  463,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,  299,    0,    0,  464,  465, 
+          466,  467,   35,  447,  448,  468,  450,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,  308,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0, 1327,    0,    0,  225,   54,   55, 
+            0,    0,    0,    0,  470,    0,    0,  225,   54,   55, 
            56,    0,    0,    0,    0,   58,   59,   60,   61,   62, 
-           63,   64,    0,   65,   66, 
+           63,   64,    0,   65,   66,    4,    5,    6,    0,    8, 
+            0,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
+           12,   13,   14,  263,  264,   17,   18,    0,    0,    0, 
+            0,    0,   19,   20,  265,  295,  296,  297,  298,    0, 
+            0,  214,    0,    0,    0,    0,    0,    0,  299,    0, 
+            0,  300,  301,  302,  303,   35,  304,  305,  306,  307, 
+            0,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
+            0,  308,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  309,    0,    0, 
+          430,   54,   55,   56,    0,    0,    0,    0,   58,   59, 
+           60,   61,   62,   63,   64,    0,   65,   66,    4,    5, 
+            6,    0,    8,    0,    0,    0,    9,   10,    0,    0, 
+            0,   11,    0,   12,   13,   14,  263,  264,   17,   18, 
+            0,    0,    0,    0,    0,   19,   20,  265, 1218, 1219, 
+         1220, 1221,    0,    0,  214,    0,    0,    0,    0,    0, 
+            0,  299,    0,    0, 1222, 1223, 1224, 1225,   35, 1226, 
+         1227, 1228, 1229,    0,   40,   41,   42,   43,   44,   45, 
+           46,    0,    0,    0,  308,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+         1230,    0,    0,  225,   54,   55,   56,    0,    0,    0, 
+            0,   58,   59,   60,   61,   62,   63,   64,    0,   65, 
+           66,    4,    5,    6,    0,    8,    0,    0,    0,    9, 
+           10,    0,    0,    0,   11,    0,   12,   13,   14,  263, 
+          264,   17,   18,    0,    0,    0,    0,    0,   19,   20, 
+          265,  460,  461,  462,  463,    0,    0,  214,    0,    0, 
+            0,    0,    0,    0,  299,    0,    0,  464,  465,  466, 
+         1339,   35,  447,  448, 1340,  450,    0,   40,   41,   42, 
+           43,   44,   45,   46,    0,    0,    0,  308,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0, 1341,    0,    0,  225,   54,   55,   56, 
+            0,    0,    0,    0,   58,   59,   60,   61,   62,   63, 
+           64,    0,   65,   66, 
       };
    }
 
    private static final int[] yyCheck1() {
       return new int[] {
 
-            2,    2,   60,   98,  121,  122,   90,   57,   15,   16, 
-           59,   53,   54,   99,  340,    2,  242,   13,   14,  105, 
-          457,  112,  599,    7,  594,  602,   87,    7,   15,   16, 
-          335,  776,   67,  468,  247,  340,  874,  121,   88,   27, 
-          335,   57,  490,   27,  414,  340,  494,   27,  772,   53, 
-          774,   53,   54,   55,   56,   15,   16,  119,  494,  121, 
-          122,  490,  112,   15,   16,  413,   53,   54,  416,  603, 
-           57,  120,  603,  123,  124,  772,  424,   10,   10,   59, 
-           67,   38,   84,   85,  581,   64,   65,   66,  585,  287, 
-           21,  546,   46,  291,   10,   55,   56,  533,  123,  754, 
-          529,   88,   10,   55,   15,   16,   47,   30,   44,  123, 
-          117,   10,  324,  325,   90,  913,  671,   10,  488,  677, 
-          675,  676,   40,  121,   10,  112,  703,   59,  636,  125, 
-          117,  101,  119,  571,  121,  122,  123,  124,   10,  487, 
-          120,  489,   37,   59,   10,   44,  814,   42,  914, 1094, 
-          236,   59,   47,  276,  283,  870,  126,  117,   44,   10, 
-           59,  123,   40,  669, 1197,  117,   59,    0,   44,    0, 
-          101,  229,  520,   59,  544,   41, 1191, 1192,   44,  710, 
-          774,  267,   46,  225,   10,   61,   10,   59,   10,  251, 
-           26,  253,   28,   59,  278,   61,  283,  545,   85, 1024, 
-           10,   40,  320, 1023, 1024,  123,  117, 1296,   59, 1171, 
-          288,  776,   10,   91,   85,   41,   10,  308,   44,   10, 
-           10,   10, 1184,  225,  679,   46,  312,  344,  306,  231, 
-          232,   41,   32,   59,  276,   59,   10,   59,  225,  609, 
-          247, 1274,   46,  250,  373,  247, 1191, 1192,   10,  367, 
-           41,   41,  369,  370,  371,  372,  258,  258,  308,   46, 
-          247,   59,  610,  250,  251,  700,  253,   41,   59,   59, 
-           91,  258,  276,  359,  276, 1073,  502,  725, 1367,  727, 
-          278,  123,  344,   93, 1008,   10,  373,   91, 1303,  276, 
-          250,  727,  125,   46,  125,  247,  725,   59,  250,   93, 
-          877,  343,  278,  345,   91,  428, 1072,  369,  370,  371, 
-          372,  979,  374,  375, 1152, 1012,   40,  823,  280,   93, 
-           44,  308,   46,   10, 1149,  350,  764,  765,   10, 1149, 
-           60,  701,   62,  256,  265,  267,  350,  268,   91,  250, 
-           10,  343,  269,  345,  231,  232,   44,  559,   46,  561, 
-          467, 1313,  279,   40,  702,  925,  343,  344,  345,  306, 
-          868,  232,  280,  310,   46,  306,  367,   91,  267,   10, 
-          454,  264, 1314,  281,   44,  268,  269,   59,  826,  429, 
-          367,  267,  369,  370,  371,  372,  428,  374,  375,  944, 
-          945,  263,  264,   91,  348,  950,  951,  826,  932,   10, 
-           41,  932,  359,  279,   10,  467,  861,  414,  324,   91, 
-          987,  969,  414,  429, 1008,  351,  267,  283,  351,  351, 
-           61,  918,  919,  920,  428,  922,  428,  414,   10,  322, 
-          927,  433,   59,  328, 1376,   41,  416, 1152,   44,  310, 
-           10,  428,  429, 1098,  424,  267,  433,  648,   59,  650, 
-          322,   10,  351,   59,  370,  546,  454,  283, 1023, 1024, 
-           38,  297,  993,  310,   10,  606,  264,  772,  475,  774, 
-          348,   41,    0, 1197,   44,  913,  914,   10, 1033,   32, 
-          467,  488,   10,  347,  348,  416,  488,   46,  475,   59, 
-         1045,   46,  283,  283,  720,   41,  546,  124,  421,  362, 
-           59,  488,  425,  426,  427,  267,  647,  373,   41,  489, 
-          651,   93,  725,   59,  271,  475, 1302,  601,  124, 1305, 
-          320,  605,  279,  475,  322,  513,  347,  348, 1366,  513, 
-          490,   59,   91,  513,  963,   40,   91,  544,  282,  526, 
-          520,  682,  544,  347,  348,  757,  744,  373,  985,  761, 
-          611,  999,  263,  264,  124,  279,   10,  544,  489,  546, 
-          347,  348,   10,  999,  475,  545,  291,  292,   10,  529, 
-          493,  371,  372,  496,  497, 1320,   41, 1074, 1075, 1076, 
-         1077,  279,  373,  373, 1149,  267,   41,  957,  679,  520, 
-         1314,  514, 1316,  600,  347,  348,  603,  599,  521,   41, 
-          602,   46,  609,  333,  334,   59,   44,  609,  956,  264, 
-          958,  322,  599,  600,  545,  602,  603,   59,  619, 1316, 
-         1057, 1198,  609,  347,  348,  687, 1191, 1192, 1193,  679, 
-          610,   10,  619,  350, 1072, 1073,  671,  283,  279,  320, 
-          675,  676,  677,  685,   10,   93,   91,  324,  789,  347, 
-          348,  693, 1376,  264,  745,  796,  671, 1092,  269,  124, 
-          675,   10,  704,  264,  666,  347,  348,  322,  894,  124, 
-          732,  125,  674,  291,  292, 1372, 1002,  283,   44,  610, 
-           59,   10,  124,  685,  671,   46,  367,  657,  675,  676, 
-          677,  693,  679,  370,  701,  745,  666, 1002,  685,  701, 
-          687,  703,  704, 1008,  674, 1275,  693, 1002,  267, 1146, 
-           59,  322, 1282,  283,  701,   44,  703,  704,  350,  707, 
-         1297,  322,  702,  707,  676,  677,  657,  707,  869,   41, 
-           91,  872,   40,   10,  312,  666,  738,   61, 1303, 1236, 
-           93,  882, 1068,  674,   61,  732,  308,   59,    2,  844, 
-          328,   44,  838, 1188,   41, 1320,  318,  319,  745,  876, 
-          683,   15,   16, 1068,   41,  725,   10,  373,  320,  811, 
-          861,  702,  125, 1068,   10,  124,   46,  776,  757,  758, 
-          358,  359,  761,  762,  783, 1222,   10,   10,  347,  348, 
-         1360,  875,  347,  348,    0,   10,   40,  938,   46,   53, 
-           54,  637,   46,  373,   10,   40,  737,  738,   44,  811, 
-          320,  861,  288,   67,  876,   59,   93,   41,  867,  371, 
-          372,   91,  374,   59,  811,  661,  269,  310,  271,  475, 
-          306,  972,   44,  351,   46,   10,   59,   61,  125,   10, 
-          981,  283,   10,   91,   59,  986,   10,   91,  989,  320, 
-         1090, 1091,  774,   59,   10,  501,  778,  367,  504,  976, 
-          506,  863,  864,  117,  320,  119,  826,  121,  122,   44, 
-           41, 1171,  874,   10,  861,  877,   40,  523,  714,   91, 
-           44,   44,   46,  350,   59,   41,   10,  867,  124,  876, 
-          877,   59, 1197,   10, 1194,   59,  367,   10,  821,  822, 
-          271,  124,  347,  348,  988,  901,  829,  830,  279,  944, 
-          945,  367,  748,   44,  976,  950,  951,   41, 1288,  125, 
-          263,  264,   59, 1064,   41,  932,  269,   91,   41,  944, 
-          945,  373,  578,  975,   37,  950,  951,   61,  350,   42, 
-           43, 1289,   45,   10,   47,  932, 1186, 1187,   61,  124, 
-          957,  825,   10,   61,  790,  957,  320,  944,  945,  833, 
-          124,  268,  269,  950,  951,  888,  889,  969,  891,  892, 
-          957,  225,  808,  975,   41,  262,  263,  264,  958,  322, 
-          714,  268,  269,   40,  271,  987,  347,  348,  975,  976, 
-          940,  328,  279,  247,   61,   10,  250,  251, 1033,  253, 
-          987,   59, 1302,  367,  258, 1305,  339,  340,   10, 1314, 
-         1045, 1316,   10, 1313,  748,  306,  350,  969, 1033,  310, 
-         1062,   41,  276,  267,  328,  948,   41,  958,   93, 1071, 
-         1026, 1027,  678,  294,  295,  322,  959,  324, 1039, 1097, 
-          125,   10,   44,   41,   59,  881, 1033, 1048, 1050,  264, 
-         1052,  887, 1039,  310,  269,  279,  271,   59, 1045,  705, 
-         1062, 1048,   10,   10, 1181,  413,  124,  279,  416, 1071, 
-         1370, 1376,   41,  996,  808, 1062,  424,  347,  348,   10, 
-          817,   10,  819,  370, 1071,   44, 1008,   32, 1010,  343, 
-          344,  345, 1014,   41,   41, 1145,  264,   10, 1140,  347, 
-          348,  269, 1144,  347,  348,   61, 1148,  322, 1058,   61, 
-           41,  279,   41,  367,   61,  369,  370,  371,  372, 1181, 
-          374,  375,  124,  769,  310,  262,  263,  264,   41, 1131, 
-         1132, 1217,  269,  309,  310,  347,  348,   10, 1140,  487, 
-          671,  489, 1144, 1093,  675, 1095, 1148,  881,   61,  279, 
-         1152,    2,  356, 1140,  322,  279,   10, 1144, 1145, 1201, 
-          414, 1148, 1184,   44,   15,   16,  279,   59,   41, 1191, 
-         1192,  519,  520,   10,  428,   60, 1293, 1294, 1220,  433, 
-           44,  123,   46,  347,  348,  322,   61,   41,   61, 1231, 
-          721,   61,  723,   41, 1181,  543, 1198,  545, 1197, 1201, 
-          320,   44,   53,   54, 1345,   10, 1042, 1265,  739,   46, 
-           44, 1198,   46,  467, 1201,   44,   67,  125, 1220, 1221, 
-          866,  475,   59,  942,  943,  328,   41,   91,   44, 1231, 
-         1280, 1293, 1294, 1220,  488,   44,   41, 1159,   10, 1189, 
-         1190,   44,  345,  346, 1231,   44,   10,  367,   44,  895, 
-          896,  371,  372, 1176,   91,   44,   61,   91, 1094, 1095, 
-          608,  306,  610,  306,  125,  911,  117,  350,  119,   10, 
-          121,  122,  526,   44,   46, 1197,  350,   41,  350, 1329, 
-           10, 1288,   44, 1285,  267,  279, 1288,   59, 1290,  123, 
-          544,   10,  271, 1280,   10, 1297, 1338,   61,  125,   40, 
-           41, 1288,   44,   44,  350,   46, 1293, 1294, 1042, 1289, 
-         1297,   41,  350,  350,   44, 1314,  320, 1316, 1154,   91, 
-           61, 1320,   38,  350, 1323,   40,   42,   46,   61,   44, 
-           44,   46,  279, 1169, 1170,  298, 1338,  298,   58,  350, 
-           59,   93, 1329,   59,  125,  599,  600,  298,  602,  603, 
-           91, 1338,  700, 1189,  702,  609,   61,   44, 1289,   10, 
-         1094, 1197,  298,  367, 1366,  619,  279,  371,  372,  262, 
-          374,  269,   91, 1372,  225, 1374,   91, 1376,   10, 1378, 
-           37,   38,  123,  350,   44,   42,   43,   38,   45,  125, 
-           47,   42, 1314,  125,   44, 1394,  247,   44,   44,  250, 
-          251, 1323,  253,   44,  123,  306,  279,  258,  123,   41, 
-           44,   10,   46,  944,  945,  279,   44,  671,  320,  950, 
-          951,  675,  676,  677,   44,  276, 1262, 1263, 1264,   61, 
-          267,  685,  263,  687,  351, 1169, 1170,   44, 1274,  693, 
-          306,  124,   41,   44,   44,  279,  280,  701,    0,  703, 
-          704,  124, 1374,  320, 1376, 1189, 1378,   91,   10,   44, 
-           59,  351,  125,  994,  995,  367,  997,  998,  306,  371, 
-          372,   37, 1394,   41,  279,  310,   42,   43,  732,   45, 
-           59,   47,   44,  347,  348,  312,   44,   44,   44,   41, 
-           44,   10,  343,  344,  345,  267,   44,   44, 1334,  124, 
-          367,  328, 1033,   44,  371,  372, 1342,   59,  320,  125, 
-          347,  348, 1348,  347,  348,  279,  367,   10,  369,  370, 
-          371,  372,   41,  374,  375,   44,  125,   46, 1262, 1263, 
-         1264,  358,  124,    2,  310,  362, 1067,   44,  279,  280, 
-           44,   93,   61,   44, 1190,  125,   15,   16,  267,   44, 
-           44,   44,   44,   44,   46,  367,   93,  811,  271,  371, 
-          372,  280,  374,  414,  279,  280,   59,   41,   61,  320, 
-          321,   93,   91,  125,  125,  347,  348,  428,  313,  314, 
-          315,  316,  433,  320,   53,   54,   40,   93,   58,  271, 
-          306, 1237,  308,  309,  310,  311,  312,   93,   67,   91, 
-         1334, 1247,  125,   44,  123,   70,  347,  348,  956,  124, 
-          958,  561,  328, 1259, 1260, 1261,  467,  867,  933,  934, 
-          371,  372,  876,  877,  475,  258,  342,  367,  347,  348, 
-          367,  124,  347,  348,  371,  372,  352,  488,  522,  954, 
-          955,  357,  358,  359,  526,  279, 1221,  279,  117,  964, 
-          119, 1290,  121,  122, 1285,  306,   10,  308,  309,  310, 
-          311,  312,  674,  262,  263,  264, 1316, 1197,  120,  268, 
-          269,  328,  271,  772,  913,  526,  764,  328,  932, 1132, 
-          279,  776,  306, 1320,  308,  309,   40,  311,  345,  346, 
-          944,  945,   46,  544,    0, 1367,  950,  951,  845,  411, 
-           44,  352,   46,  957,   10,   59,  357,  358,  359,   88, 
-          262,  263,  264,  347,  348,  267,  268,  269,   44,  271, 
-           46,  975,  976,  322, 1366,  324, 1185,  279,  352,  281, 
-          282, 1183,   10,  987,  100,   41, 1193,   91,   44,  291, 
-          292,  967,  294,  295,  296,  297,  298,   91,  599,  600, 
-         1348,  602,  603,   59, 1193,  514,  225, 1281,  609,  312, 
-          279,  280,  328,   41,   -1,   91,   44,   10,  619,  123, 
-          322,  370,  324,   -1,   -1,  328,   -1,   -1,  247, 1033, 
-          320,  250,  251,   61,  253, 1039,   -1,  279,   44,  258, 
-           46, 1045,   -1,   -1, 1048,   -1,  306,   40,  308,  309, 
-          310,  311,   -1,   46,  356,  358,   -1,  276, 1062,  362, 
-           10,   -1,   -1,   -1,   -1,   56,   59, 1071,  370,  125, 
-          671,  320,   -1,   -1,  675,  676,  677,  367,  347,  348, 
-           -1,  371,  372,   10,  685,   91,  687,   -1,   -1,   -1, 
-           40,   41,  693,   -1,   44,  320,   46,   -1,   91,   -1, 
-          701,   -1,  703,  704,   -1,  347,  348,  320,   -1,   -1, 
-           44,   61,   46,   40,   41,  320,   -1,   44,  367,   46, 
-           -1,   -1,  371,  372,  343,  344,  345,   -1,  320,   -1, 
-          123,  732,   -1,   -1,   61,   -1, 1140,   -1,   10,   -1, 
-         1144,   91,  367,   -1, 1148,   -1,  371,  372,  367,   -1, 
-          369,  370,  371,  372,  367,  374,  375,   91,  371,  372, 
-           -1,   -1,  367,  267,   91,   -1,  371,  372,   40,   -1, 
-           -1,   -1,   44,  123,   46,  367,  280, 1181,   -1,  371, 
-          372,   -1,   -1,   -1,   -1,  279,   -1,   59,   -1, 1287, 
-           -1, 1289,   -1,   -1, 1198,  414,  123, 1201,   44,   -1, 
-           46,   -1,   -1,  279,   -1,   -1,  262,  263,  264,  428, 
-          811,  267,  268,  269,  433,  271, 1220,   -1,   -1,   91, 
-           -1,   -1,   -1,  279,   -1, 1023, 1024, 1231,   -1,   -1, 
-           10,   10,  223,   -1,   -1,  226,  227,  228,  294,  295, 
-          296,  297,  298,  347,  348,   91,   -1,   -1,  467,   -1, 
-            2,  123,  124,  347,  348,   -1,  475,   40,   38,   -1, 
-           -1,   44,   42,   46,   -1, 1363,  322,   46,  324,  488, 
-           -1,  347,  348,  279,  267,  876,  877,   -1,   -1,   59, 
-           59,   61,   -1,   -1, 1288,   -1,   10,  280,   -1, 1293, 
-         1294,   -1,   -1, 1297,   -1,  351,   -1,   10,   -1,   -1, 
-           -1,   53,   54,   -1,   -1,   57,   -1,  526,   91,   -1, 
-           -1,   -1,   91,   -1,  370,   -1,   40,   41,   -1,   -1, 
-           44,   -1,   46,   -1,   -1,  544,   -1,   40,   10,  279, 
-          280,  932,   -1,   46, 1338,   -1,   88,   61,   -1,   -1, 
-          123,  347,  348,  944,  945,  279,   59,   -1,   -1,  950, 
-          951, 1149,  279,  280,  347,  348,  957,   -1,    0,   -1, 
-          112,   -1,   -1,   -1,   46,   -1,   -1,   91,   10,   -1, 
-           -1,  123,  124,   -1,  975,  976,   -1,   59,   91,   -1, 
-          599,  600,   -1,  602,  603,   -1,  987,   -1,   -1,   -1, 
-          609,   -1,   -1, 1191, 1192, 1193,   -1,  347,  348,   41, 
-          619,   -1,   -1,   -1,   46,   -1,   -1,   -1,  280,   91, 
-          123,   -1,   -1,  347,  348,  308,  309,   59,  311,   -1, 
-          347,  348,   -1,   -1,   -1,  318,  319,   -1,   10,   -1, 
-           -1,   -1, 1033,  279,   -1,   -1,   -1,   -1, 1039,   -1, 
-         1023, 1024,   -1,   -1, 1045,   -1,  306, 1048,  308,  309, 
-          310,  311,  671,   -1,   -1,   -1,  675,  676,  677,   41, 
-           -1, 1062,   44,   -1,   46,    2,  685,   -1,  687,   -1, 
-         1071,   -1,   -1,  225,  693,  347,  348,   -1,   10,   61, 
-           -1,    0,  701,  125,  703,  704,   -1,   -1,  267,   -1, 
-           -1,   10,  352,   -1,   -1,  486,  279,  280,   -1,  490, 
-           -1,  347,  348,  494,   -1, 1303,  258, 1090, 1091,   91, 
-           -1, 1094,   -1,  732,   46,   -1,   53,   54,   -1,   -1, 
-           57,   -1,   41,   -1,  276,   44,  306,   59,  308,  309, 
-          310,  311,  312,  294,  295,  296,  297,  298,  529, 1140, 
-           59,   -1,  533, 1144,   -1, 1128,   -1, 1148,  328,   -1, 
-           -1,   88,   -1,   -1,  267,  279,  308,   -1,   -1,   91, 
-           -1,   -1,  342,   -1,  347,  348, 1149,  280,  347,  348, 
-           -1,   -1,  352,   -1,   93,  112,   -1,  357,  358,  359, 
-         1181,   -1,   -1,   -1, 1167,  267,  123,  124, 1171,    2, 
-           -1,  343,  811,  345,   -1,   -1,   44, 1198,   46,  590, 
-         1201, 1184, 1185, 1186, 1187,   -1,  125,   -1, 1191, 1192, 
-           -1, 1194,   -1,   -1,   -1,  367,   -1,   -1,   -1, 1220, 
-          262,  263,  264,  347,  348,  267,  268,  269,   -1,  271, 
-         1231,   -1,   -1,   10,  347,  348,   -1,  279,   -1,  281, 
-           53,   54,   -1,   91,   57,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,  876,  877,   -1, 
-           -1,   -1,   -1,   40,   41,  347,  348,   44,   -1,   46, 
-           -1,   -1,   -1,   10,   -1,   88,  428,  429,   -1,   -1, 
-          322,  433,  324,   -1,   61,  676,  677, 1288,  225,   -1, 
-           -1,   -1, 1293, 1294,   -1,   -1, 1297,  279,   -1,  112, 
-           -1,   -1,   -1,   40,   41,  347,  348,   44,   -1,   46, 
-          123,  124,   -1,  932,   91,   -1,   -1,  708,   -1, 1302, 
-           -1,  258, 1305,   -1,   61,  944,  945,   -1,  370,   -1, 
-         1313,  950,  951,   -1,  725,  267,  727, 1338,  957,  276, 
-           -1,   -1,   -1,  262,  263,  264,  123,   -1,  267,  268, 
-          269,   -1,  271,   -1,   91,   10,  975,  976,   -1,   -1, 
-          279,   -1,  281,  282,  283,  347,  348,   -1,  987,   -1, 
-           -1,  308,  291,  292,  526,  294,  295,  296,  297,  298, 
-           -1,   -1,   -1,   -1,   -1,   40,  123, 1370,   -1,   44, 
-          781,   46,   -1,   44,  546,   46,  306,   -1,  308,  309, 
-          310,  311,   -1,  322,   59,  324,  343,   -1,  345, 1197, 
-           -1,   -1,  225,   -1, 1033,  347,  348,   -1,   -1,   -1, 
-         1039,   -1,   -1,   -1,   -1,   10, 1045,   -1,   -1, 1048, 
-          367,  279,  351,   -1,   -1,  826,   91,  356,   -1,   10, 
-           91,   -1,   -1, 1062,   -1,  258,   -1,  599,   -1,   -1, 
-          602,  370, 1071,   -1,  373,   -1,   41,  848,   -1,   44, 
-           -1,   46,   -1,  276,   -1,   -1,    2,  619,  123,  124, 
-           41,   -1,   -1,   44,   -1,   46,   61,   -1, 1023, 1024, 
-           10,   -1,  873,   -1,   -1,   -1,   -1,    2,   -1,   -1, 
-           61,  428,  429,   -1,   -1,  308,  433,   -1,   -1,  347, 
-          348,   -1,  279,  280, 1197,   -1,   91,   -1,   -1,   -1, 
-           -1,   41,   -1,   -1,   44,   -1,   46,   53,   54,  671, 
-           91, 1140,   -1,  675,  676, 1144, 1314,  679, 1316, 1148, 
-          343,   61,  345,  685,   -1, 1323,   -1,   -1,   53,   54, 
-           -1,  693,  279,  280,   -1, 1090, 1091,   -1,   -1, 1094, 
-           -1,  703,  704,   -1,  367,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91, 1181,   -1,   10,   -1,   -1,   -1,   -1,   10, 
-          347,  348,  963,   88,   -1,   -1,   -1,   -1,  969, 1198, 
-           -1,   -1, 1201, 1128, 1372,   -1, 1374,   -1, 1376,  526, 
-         1378,   -1,  983,  745,   40,   -1,   -1,   -1,   -1,   10, 
-           46, 1220,  754,   -1, 1149,   46, 1394,   -1,  999,  546, 
-          347,  348, 1231,   59,   -1,  428,  429,   -1,   59,   -1, 
-          433, 1314, 1167, 1316,   -1,  280, 1171, 1320,  279,   40, 
-         1323,   -1,   -1,   -1,   -1,   46,   -1,   10,   -1, 1184, 
-         1185, 1186, 1187,   -1,   -1,   91, 1191, 1192,   59, 1194, 
-           91,   -1,   -1,   -1,   -1, 1046,   -1,   -1,   -1,  811, 
-           -1,   -1,  599,   -1,   -1,  602,   -1,   -1,   -1, 1288, 
-         1061,   -1,   -1,   46, 1293, 1294,   -1,  123, 1297, 1372, 
-           91, 1374,  619, 1376,   -1, 1378,   59,   -1,    0,  225, 
-           -1,   -1,  347,  348,  279,   -1,  347,  348,   10,   -1, 
-           -1, 1394,   -1,   -1,   -1,   -1,   -1,   -1,  279,  861, 
-          225,   -1,  123,  526,   -1,   -1,   -1,   -1,   91, 1338, 
-           -1,   -1,  258,   -1,   -1,  877,   -1,   -1,   -1,   41, 
-           -1,   -1,   44,  546,  671,   10,   -1,   -1,  675,  676, 
-          276,   -1,  679,  258,   -1,   -1,   58,   59,  685,  279, 
-          306,   63,  308,  309,  310,  311,  693, 1302,   -1, 1150, 
-         1305,  276,  347,  348,   -1,   40,  703,  704, 1313,   44, 
-           -1,   46,   -1, 1023, 1024,   -1,  347,  348,   -1,   -1, 
-           -1,   93,   -1,   -1,   59,   -1,  599,   -1,   -1,  602, 
-           -1,   -1,  944,  945,   -1,   -1,  352,   -1,  950,  951, 
-           -1,  357,   -1,   -1,   -1,   10,  619,  343,  745,  345, 
-           -1,   -1,   -1,  125,   -1,   -1,   91,  347,  348,   -1, 
-           -1,  267,   -1,  975,   -1, 1370,  267,   -1,  343,   -1, 
-          345,  367,   -1,   -1,  280,  987,   -1,   -1,   -1,   -1, 
-           -1,   46,   -1,   -1, 1094,   -1,   -1,   -1,  123,  124, 
-           -1,   -1,  367,   -1,   59,   -1,  267,   -1,  671,   -1, 
-           -1,   -1,  675,  676,   -1,   -1,  679,   10,   -1,  280, 
-           -1,   -1,  685,   -1,  811,   -1,   -1,   -1, 1128,   -1, 
-          693, 1033,   -1,   -1,   -1,   -1,   91, 1039,   -1,   -1, 
-          703,  704,  428, 1045,  267,   10, 1048,  433,   -1, 1149, 
-           -1,  347,  348,   46,   -1,   -1,  347,  348,   -1,   -1, 
-         1062,   -1,   -1,  428,   -1,   -1,   59, 1167,  433, 1071, 
-           -1,   -1,   -1,   38,  861,   40,   -1,   42,   -1,   -1, 
-           -1,   46,  745,   -1, 1184,   -1,  347,  348,   -1,   -1, 
-          877, 1191, 1192,   -1,   59,   -1,   61,   -1,   91,   -1, 
-          262,  263,  264,   10,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
-          282,  283,   -1,   -1,  347,  348,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1, 1140,   46, 
-          526,   -1, 1144, 1145,   -1,   -1, 1148,   38,  811,   40, 
-           -1,   42,   59,   -1,   -1,  280,   -1,  944,  945,   10, 
-          322,  526,  324,  950,  951,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  335,  336,   -1,   -1,  339,  340,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,  975,  351, 
-           41,   -1,   -1,   44,  356,   46, 1198,   -1,  861, 1201, 
-          987,   -1,   -1,   -1,   -1,   -1,   -1,    0,  370,   -1, 
-           61,  373,  267,  599,  877,   -1,  602,   10, 1220,   -1, 
-           40,   -1,  347,  348,   44,   -1,   46,   -1,   -1, 1231, 
-           -1,   -1,   -1,  619,  599,   -1,   -1,  602,   -1,   -1, 
-           91,   -1,   -1,   -1,   -1,   -1, 1033,   -1,   41,   -1, 
-           -1,   44, 1039,   -1,  619,   -1,   -1,   -1, 1045,   -1, 
-           -1, 1048,   37,   38,   -1,   -1,   59,   42,   43,   -1, 
-           45,   91,   47,   -1,  267, 1062,   -1,   -1, 1280,   -1, 
-           -1,  944,  945,   -1, 1071,  671,   -1,  950,  951,  675, 
-          676,   -1,  347,  348,   -1, 1297,   -1,   -1,   -1,  685, 
-           93,   -1,   -1,  123,   -1,   -1,  671,  693,   -1,   -1, 
-          675,  676,  975,   -1,   -1,   -1,   -1,  703,  704,   94, 
-          685,   -1,   -1,   -1,  987,   -1,   -1, 1329,  693,   -1, 
-           -1,   -1,  125,   -1,   -1,   10, 1338,   -1,  703,  704, 
-           -1,  306,   -1,  308,  309,  310,  311,  312,   -1,  124, 
-           -1,   -1,   -1, 1140,  347,  348,   -1, 1144, 1145,   -1, 
-          267, 1148,   -1,  328,   -1,   -1,   41,   -1,   -1,   44, 
-         1033,   46,   -1,   10,   -1,   -1, 1039,  342,   -1,   -1, 
-           -1,   -1, 1045,  348,   -1, 1048,   61,  352,   -1,   -1, 
-           -1,   -1,  357,  358,  359,   -1,   -1,   -1,   -1, 1062, 
-           -1,   -1,   -1,   41,   41,   -1,   -1,   44, 1071,   46, 
-           -1, 1198,   -1,   -1, 1201,  306,   91,  308,  309,  310, 
-          311,  312,   -1,   -1,   61,  811,   -1,   -1,  279,   -1, 
-           -1,   -1,   -1, 1220,   -1,   -1,   -1,  328,   -1,   -1, 
-          347,  348,   -1,   -1, 1231,   -1,  811,   -1,   -1,   40, 
-           -1,  342,   -1,   44,   91,   46,   -1,   -1,   -1,  279, 
-          280,  352,   -1,   -1,   -1,   -1,  357,  358,  359,  262, 
-          263,  264,   -1,   -1,  267,  268,  269, 1140,  271,   -1, 
-           -1, 1144, 1145,   -1,   -1, 1148,  279,  125,  281,  282, 
-           10,  877,   -1, 1280,   -1,   -1,  347,  348,  291,  292, 
-           91,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
-         1297,   -1,  877,   -1,   15,   16,   -1,   -1,   38,   -1, 
-           40,   -1,   42,   -1,   -1,   -1,   46,  347,  348,  322, 
-           -1,  324,  123,   -1,   -1, 1198,   -1,   -1, 1201,   59, 
-           -1,   61, 1329,   -1,   -1,   -1,   -1,   48,   49,   50, 
-           51, 1338,   -1,  328,   55,   56,   -1, 1220,  944,  945, 
-           -1,   -1,   -1,  356,  950,  951,   67,   68, 1231,   -1, 
-          345,  346, 1023, 1024,   -1,   -1,   -1,  370,   -1,  944, 
-          945,   -1,   -1,   -1,   -1,  950,  951,   -1,   -1,  975, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  987,   -1,   -1,  279,   -1,   -1,   -1,   -1,   -1, 
-          975,   -1,   -1,   -1,   -1,   -1,  117, 1280,   -1,   -1, 
-           -1,   -1,  987,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   -1,  271, 1297,   -1,   -1,   -1,   -1, 1090, 
-         1091,  279,  279, 1094,   -1,   -1,   -1, 1033,   -1,   -1, 
-           -1,   -1,   -1, 1039,   -1,   -1,   -1,   -1,   -1, 1045, 
-            0,   -1, 1048,   -1,   -1,   -1, 1329,   -1, 1033,   -1, 
-           10,   -1,  347,  348, 1039, 1338, 1062, 1128,   -1,   -1, 
-         1045,   -1,   -1, 1048,  322, 1071,  324,   -1,  279,  280, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1, 1062, 1149,   -1, 
-           -1,   41,   -1,   -1,   44,   -1, 1071,   -1,   -1,   -1, 
-          347,  348,   -1,   -1,   -1,   -1, 1167,   10,   -1,   59, 
-         1171,   -1,  223,   -1,   -1,  226,  227,  228,   -1,  230, 
-           -1,   -1,  370, 1184, 1185, 1186, 1187,   -1,   -1,   -1, 
-         1191, 1192,   -1, 1194,   -1,   -1,  247,   -1,   41,  250, 
-           -1,   44,   -1,   46, 1140,   -1,  347,  348, 1144,   -1, 
-           -1,   -1, 1148,   38,   -1,   -1,   -1,   42,   61,   -1, 
-           -1,   -1,   -1,   -1,   10, 1140,   -1,   -1,   -1, 1144, 
-         1145,   -1,   -1, 1148,   -1,  125,  306,   -1,  308,  309, 
-          310,  311,  312,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
-           -1,   -1,   38,   -1,   40,   -1,   42,   -1,  328,   -1, 
-           46,   -1, 1198,   -1,   -1, 1201,   -1,   -1,   -1,   -1, 
-           -1,   -1,  342,   59,   -1,   61,   -1,   -1,  348,   -1, 
-           -1,   -1,  352, 1198, 1220,   -1, 1201,  357,  358,  359, 
-           -1,   -1,   -1,   -1,   -1, 1231,   -1,   -1,   -1,   -1, 
-           -1, 1302,   -1,   -1, 1305, 1220,   -1,   -1,   -1,   -1, 
-           -1,   -1, 1313,   -1,   -1,   -1, 1231,   -1,   -1,   -1, 
-           -1,    0,   -1,   -1,   -1,   -1,  377,  378,  379,  380, 
-          381,   10,   -1,  384,  385,  386,  387,  388,  389,  390, 
-          391,   -1,  393,   -1,   -1,  396,  397,  398,  399,  400, 
-          401,  402,  403,  404,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10, 1297,   41,  414,   -1,   44,  417,   10,   -1, 1370, 
-           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           59,  271, 1297,   -1,   -1,    0,   -1,   -1,   -1,  279, 
-           -1,   41,   -1,   -1,   44,   10,   46,   -1,   41,   -1, 
-           -1,   44, 1338,   46,  294,  295,  296,  297,  298,   -1, 
-           -1,   61,   -1,   -1,   93,   -1,   -1,   -1,   61,   -1, 
-           -1,   -1,   -1, 1338,  475,   -1,   41,   -1,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,  486,  279,  488,   -1,  490, 
-           -1,   91,   -1,  494,   59,   -1,  125,  498,   91,   -1, 
-           -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-           -1,  351,   -1,   -1,   10,  516,   -1,  518,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  529,   -1, 
-          370,  306,  533,  308,  309,  310,  311,  312,   -1,   -1, 
-           -1,   37,   38,  544,   -1,   41,   42,   43,   44,   45, 
-           46,   47,   -1,  328,  347,  348,   -1,   -1,   -1,   -1, 
-          125,   -1,   58,   59,   60,   61,   62,   63,   -1,   -1, 
-          306,   -1,  308,  309,  310,  311,  312,  352,   -1,   -1, 
-           -1,   -1,  357,  358,  359,   -1,   -1,   -1,   -1,  590, 
-           40,   -1,  328,   -1,   44,   91,   46,   93,   94,  600, 
-           -1,   -1,  603,   -1,   -1,   -1,  342,   -1,  609,   -1, 
-           -1,   -1,  348,   -1,   -1,   -1,  352,   -1,   -1,   -1, 
-           -1,  357,  358,  359,   -1,   -1,   -1,  123,  124,  125, 
-           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   91,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          279,   -1,  281,  282,   -1,   -1,   -1,   -1,   -1,   -1, 
+            2,   60,   59,  459,   13,   14,  779,   98,  783,   90, 
+            7,   87,    7,  337,   53,   54,   15,   16,  342,  598, 
+          416,  121,  122,  112,   27,   99,  342,   64,   65,   66, 
+           27,  105,   27,    2,    2,   15,   16,   21,   57,  496, 
+          121,  337,  119,  470,  121,  122,  342,   15,   16,  101, 
+          883,   53,   54,   55,   56,  415,   55,  783,  418,  247, 
+          761,  242,   59,  120,  415,  575,  426,  418,  289,   88, 
+           15,   16,  293,   38,  126,  426,   53,   67,  492,   10, 
+          537,   10,   84,   85,  603,   53,   54,  606,   46,   57, 
+           57,  121,  585,  112,  490,  550,  589,  879,   10,   67, 
+           44,   47,   15,   16,  123,  124,  607,  927,   10,  492, 
+           10,  326,  327,  496,   40,   10,  125,  101,  117,  533, 
+           88, 1310,  283,  120,  781,  283,   40,  607,   59,  489, 
+           59,  491,   10,  640,   10,   32,   90,  117,  489,   41, 
+          491,  681,   55,   56,  112,  821,  926,   59,   10,  117, 
+          278,  119,  548,  121,  122,  123,  124,   59,   10,   26, 
+           10,   28,  236,  523,  524,   91,   44,    0,  123,  310, 
+          229,   10,  117,  524,  251,   46,  253, 1185,   38,  263, 
+          264,   59,  673,   59,   59,  269,  225,  547,  707,  549, 
+         1198,   46, 1381,   10,   32,  269,    0,   59,  549,  280, 
+           37,   41,   46,  123,  117,   42,   43, 1038,   45,   59, 
+           47,   60,  373,   62,  715,  373,  779,  613,  781,  123, 
+           59,  310,  124,  225,   41, 1037, 1038,   44,  683,  231, 
+          232,  123,   40,   46,  714,  715,   91,   10,  322,  278, 
+          314,  742,   59, 1211,   61,  247,  346,   91,  247,  124, 
+          280,  250,  612, 1026,  614,  306,  258,  225,   10,  310, 
+         1328,  771,  772,  614,  266,  267, 1086,  247,   41,  346, 
+          250,  371,  372,  373,  374,  732,  278,  704,   91,  247, 
+           10,  265,  250,  251,  124,  253,  270,  361,   61,  258, 
+          258,  310,  125,   37,  371,  372,  373,  374,   42,  376, 
+          377,  278,  430,   47,   10,  250,  345, 1087,  347,  705, 
+          278, 1037, 1038,  320,   10,  123,  730,  993,  324, 1327, 
+         1288,  125, 1390,  504,   10,  280,  280,  263,  264,   59, 
+           10,   10, 1163, 1166,   40,  362,  267,  250,   44,  830, 
+           46,   93,  310,  345,  704,  347,  706,  730,  563,  732, 
+          565, 1163,  264,   59,  282,  706,  268,  269,   44,  938, 
+          367,   41,  308,   59,  370, 1022,   37,  886,   40,  469, 
+          877,   42,   43,   59,   45,  456,   47,  345,  346,  347, 
+           59,  283,   46,  675, 1166,   91,  322,  679,  264,  267, 
+          348,  430,  469,  269,  359,  324,  291,  292,  264,  719, 
+          369,  369,  264,  371,  372,  373,  374,  351,  376,  377, 
+          322, 1112,  431,   93,  416,  870,  926,  927,  124,  833, 
+          351,  418,  348,  320,  263,  264,  456,   91,  430,  426, 
+          350,  281,  299,  435,  418,  755,  416, 1163,  931,  932, 
+          933,  370,  935,  983,  945,  306,  322,  940,  416,  310, 
+          833,  351,  312,  430,  746,  779,  322,  781,  350, 1022, 
+          322,  550,  430,  431,  431,  945,  283,  435,  328,   85, 
+           46,  373,  280,  351,  371,  372,  347,  348,  477, 1205, 
+         1206, 1207, 1001,  322,  333,  334,  320,   93,  490,   10, 
+           10,  328,  347,  348,  491,  815,  264,  477,  358,  359, 
+           46,  469, 1316,  347,  348, 1319,  279,  491,  350,  477, 
+          490,   10,  515,   46, 1015,   91,   10,   10,  515,  125, 
+          515,   41,  490,   44,  605, 1205, 1206,  524,  609,  350, 
+          751,  550,  477,  367,  347,  348,   10,   10,   10,  615, 
+          524,   61,  730,  999,  725,   91,  548, 1380,   41,  764, 
+           61,   44,  549,  768,  322, 1012,  373, 1330,   91, 1334, 
+           59,   10,  530,  977,  477,  549,   59,   41,  548,   41, 
+          890,  267,   44,   10,   10,  971, 1086, 1087,   56,  492, 
+          548,  267,  550,   10,  328,   59,   59,   59,  267,   44, 
+           61, 1317,   41,  320,  683, 1088, 1089, 1090, 1091,   93, 
+           10,  603,   46,   10,  606,   41,   61,   40, 1334,  661, 
+          970,  613,  972, 1386,  691, 1071,  232,  614,  670,  970, 
+          533,  972,   10,   59,  604,  125,  678,  607,   10, 1012, 
+          614,  124,   59,  613,   41,  603,  604, 1317,  606,  607, 
+          367,  347,  348,   46, 1108,  613,   10,   91, 1211,   59, 
+          689,  267,  124,   41,  623,  623,   93,  328,  697,   41, 
+          737,   41,   44,  752,  683,  957,  958,   44,  670,  708, 
+           10,  963,  964,   61,  345,  346,  678,  661,   44, 1106, 
+           44,  680,  681,  347,  348,  675,  670,  689,   91,  679, 
+          680,  681, 1016, 1212,  678,  697,  312,  124, 1022,   10, 
+         1016,   41,   40,  705, 1160,  707,  708,  675,  711,  706, 
+         1289,  679,  680,  681,  711,  683,  711, 1296,   10,  310, 
+         1016,  689,  706,  691,  905,  705,  351,  764,  765,  697, 
+           41,  768,  769,  752,  714,  715, 1056,  705,   44,  707, 
+          708, 1205, 1206,  745,  124,  223,  714,  715,  226,  227, 
+          228,   10,   44,   93,  350, 1047,  746, 1250, 1082,  279, 
+          744,  745,  853, 1037, 1038, 1328, 1082, 1330,  267,  737, 
+           44,  347,  348,  847,  641, 1202,   10,   10,  746,  818, 
+         1236,  870,   10,  350,  752,  885, 1082,   46, 1108,  675, 
+          283,  264, 1311,  679,  680, 1374,  269,  320,  665,   10, 
+           59,  347,  348,  884,   10,   10,  279,   41,  885,  283, 
+           44,  283,  312,   41,  347,  348,  818,  730,  320,  876, 
+         1185,  271,  320,  320,  279,   59,   59, 1390,  328,  279, 
+         1104, 1105,   91,   61, 1108,   41,   41,  271,   44,   44, 
+           46,   61,   10, 1208,  367,  279,   10,  283,   59,  322, 
+          818,  870,  719,   40,  264,   61,   61,   41,  358,  269, 
+          746,  271,  362, 1183, 1184,  367, 1037, 1038, 1142,  367, 
+          872,  873,   40,   41,  371,  372,   44,  374,   46,  876, 
+          373,  883,  288, 1203,  886,   91,  269, 1211,  755, 1163, 
+          990,  279,  125,   61,  350,   59,  279,   10,   10,  373, 
+          306,  373,  870,  347,  348,  914, 1302, 1181,   10,   10, 
+           40, 1185,  322,  990,   44,  328,   46,  885,  886,  328, 
+          833, 1002,   93,   91, 1198, 1199, 1200, 1201,   10,   41, 
+          797, 1205, 1206,   10, 1208,   10,   10,  373,  310,   41, 
+           41, 1301,   10, 1303,  347,  348,   59,   10,  815,   61, 
+          989, 1316, 1303,    0, 1319,  123, 1276, 1277, 1278,   41, 
+           61,   91, 1327,   10,   41,  945,   41,  957,  958,  971, 
+           44,   10,   40,  963,  964,  972,   10,  945,   41,   61, 
+          125,  983,   10,  288,  983,   59,   61,  989,  972,  957, 
+          958,  971, 1163,  291,  292,  963,  964,   41,   61, 1001, 
+           32,  306,   41,  971, 1328,   61, 1330,   41,  267,   44, 
+          488,  124,   59,   41,  492,   59,    2, 1377,  496, 1384, 
+           59,  989,  990,  890,  269,   10,  271,  310, 1348,   15, 
+           16, 1040, 1041, 1001, 1205, 1206, 1207, 1076,    0,   10, 
+          781,  908, 1316,   61,  785, 1319, 1085,  783,   10,  283, 
+          124,  279, 1111, 1327,  790,  533,   41, 1047,   10,  537, 
+          268,  269, 1064,   30, 1066,   93, 1390,   53,   54, 1059, 
+           41,  957,  958,  279, 1076,   10,   61,  963,  964, 1047, 
+          279,   67,   10, 1085, 1053, 1053,  339,  340,  347,  348, 
+           61, 1059,   44, 1062, 1062, 1195,   10,   59,  262,  263, 
+          264,   10,  953, 1104, 1105,  269,   41,   59, 1076,   61, 
+         1384,  279,  280,   41,   10, 1154,  594, 1085, 1195, 1158, 
+           10,  832,   85, 1162,   59,  356,   40,   41,  285,  840, 
+           44,  117,   46,  119,   10,  121,  122,   46,   44,  373, 
+         1159,  347,  348, 1145, 1146,   41, 1317,   61,   59,  279, 
+           59,  652, 1154,  654,   44,   60, 1158, 1231,  322,  350, 
+         1162, 1047,   10,  125, 1166,   44,  123,   46,   44,   59, 
+           10,    2,  124, 1059,  320,  321, 1215,   91,  279,  347, 
+          348,   44,   91,   59,   15,   16, 1154,  294,  295, 1056, 
+         1158, 1159,   61,   41, 1162, 1234,  824,  279,  826, 1200, 
+         1201,   61,  680,  681,  279,   44, 1245, 1307, 1308,  123, 
+         1212,   41,   91, 1215,  123,  125,  279,  347,  348,   59, 
+         1279, 1072,   53,   54,   61,  371,  372, 1195, 1037, 1038, 
+         1307, 1308, 1234, 1235,  124,  713,   67,  955,  956,  225, 
+           10, 1108, 1109, 1245, 1212,   37,   38, 1215,  124,   10, 
+           42,   43,  730,   45,  732,   47, 1107,   61, 1109,  311, 
+          312,  247,   41,  308,  250,  251, 1234,  253,  231,  232, 
+           44,   41,  258,  318,  319, 1294,   10, 1245,   44,   44, 
+           41, 1022,   44, 1024,  124,   44,  117, 1028,  119,  256, 
+          121,  122,  278,   10,  279,  312,   10, 1299,   59, 1108, 
+         1302, 1168, 1304,  266,  267,   44, 1303, 1198,  279, 1311, 
+          788,  328,   46, 1352, 1205, 1206, 1183, 1184,  306, 1303, 
+          477,  350, 1302,   40, 1343,   59, 1294,   41,  306,   46, 
+           44,   44,   46, 1142, 1302,  125, 1203,  350,  350, 1307, 
+         1308,  358,   59, 1311, 1211,  362,  503,   61,   44,  506, 
+         1352,  508, 1203, 1204, 1163,  833,  320,   91,  267,  345, 
+          346,  347,  279,  267,  125,  279,  280,  350,  271,   10, 
+          527,  280, 1181,  350,   91, 1343,  350,   91, 1380,  857, 
+          350,   61,   44,  369, 1352,  371,  372,  373,  374, 1198, 
+          376,  377,   44,   58,  225,  610, 1205, 1206,  298,   40, 
+          279,  298,  675,  367,  882,   46,  679,  371,  372, 1276, 
+         1277, 1278,  350,  125,   10,   93,  247,  310,   59,  250, 
+          251, 1288,  253,   61,  298,  582,  306,  258,  308,  309, 
+          416,  311, 1173,  347,  348,   44,  651,  298,  347,  348, 
+          655,   10,   38,  262,  430,  320,   42,  278,  269,  435, 
+           91,  125,  350,  726,   44,  728,  423,   44,   44,   44, 
+          427,  428,  429,   59,   44,   61,  125,   44,  347,  348, 
+         1211,  686,  352,  746,  306, 1211,   44,   46,  263,  351, 
+           44, 1348,  123,  469,  294,  295,  296,  297,  298, 1356, 
+           59,  477,  367,  306,  124, 1362,  371,  372,   44,  977, 
+           44,  262,  263,  264,  490,  983,  124,  268,  269,   44, 
+          271,   46,   44,  351,  345,  346,  347,  125,  279,  997, 
+          306,  310,   91,   41,   44,  682,  320,   44,  495,   59, 
+           10,  498,  499,  267, 1012,   44,  328,   44,  369,   10, 
+          371,  372,  373,  374,  530,  376,  377,   44,   44,  516, 
+          267,   44,  709,  345,  346,   10,   91,  124,  525,   44, 
+           40,  322,  548,  324,   44,  279,   46,   38,   44,  125, 
+           46,   42,  124,  367,   10,  310,   44,  371,  372,   59, 
+          374,  796, 1060,   44,   44,  416,   41, 1328,  803,   44, 
+           44,   46, 1328,   44, 1330,   44, 1337, 1075, 1334,  430, 
+          271, 1337,   93,   41,  435,   41,   61,   93,   44,  370, 
+           46,   91,  125,  347,  348,   91,   40,  603,  604,  776, 
+          606,  607,  895,   93,   58,   61,  267,  613,  320,  271, 
+          347,  348,   44,  347,  348,   93,   91,  623,  469,  280, 
+          565,  125,   70,  123,  124,  320,  477, 1388,  258, 1390, 
+         1386, 1392, 1388,  876, 1390,   91, 1392,  320,  124,  490, 
+          369,  526,  530,  878, 1235,  681,  881, 1408,  123, 1304, 
+         1299,  678, 1408, 1211,    2,  367,  891,  120, 1330,  371, 
+          372,  779,  374,  926,  957,  958, 1164,   15,   16,  675, 
+          963,  964,  367,  679,  680,  681,  371,  372,  267,  530, 
+          771,  320,  783,  689,  367,  691,  347,  348,  371,  372, 
+          306,  697,  308,  309,  310,  311,  312,  548,  875,  705, 
+          687,  707,  708, 1146, 1334,   53,   54, 1381,  714,  715, 
+          413,  854,  328,   88, 1007, 1008,  951, 1010, 1011,   67, 
+         1380,   10, 1199, 1197,  279,  712,  342, 1207,  367,  906, 
+          907,  737,  371,  372,  100, 1207,  352,  981, 1362,  320, 
+          746,  357,  358,  359,  946,  947,  516,  924, 1295,  320, 
+           -1,  986,  603,  604, 1047,  606,  607,   46,  347,  348, 
+          995,   -1,  613,   -1,   -1, 1000,  968,  969, 1003,  117, 
+           59,  119,  623,  121,  122,  320,  978,   -1,   -1,   -1, 
+          280,   -1,   -1,  279,   -1,   44,  367,   46, 1081,   -1, 
+          371,  372,  347,  348,   -1,   10,  367,   -1,   -1,   -1, 
+          371,  372,   91,   -1,  279,  280,   -1,   -1,   -1,   10, 
+           -1,   -1,  818,   -1,   -1,  306,   -1,  308,  309,  310, 
+          311,  312,  367,  279,  675,   40,  371,  372,  679,  680, 
+          681,   46,   91,   -1,   -1,   -1,  320,  328,  689,   -1, 
+          691,  828,  829, 1078,   59,   46,  697,  347,  348,  836, 
+          837,  347,  348,   -1,  705,   -1,  707,  708,   59,   -1, 
+           10,  352,   -1,  714,  715,   -1,  357,  358,  359,   -1, 
+          320,   -1,  347,  348,   -1,   -1,   91,  225,   10,  885, 
+          886,   -1,   -1,  367,   -1,   -1,  737,  371,  372,   10, 
+           91,  347,  348,   -1,   -1,  746,   46,   -1,   10,  247, 
+           -1,   -1,  250,  251,   -1,  253,   -1,   -1,  123,   59, 
+          258,   -1,  899,  900,   46,  902,  903,  367,   -1,   40, 
+           41,  371,  372,   44,   -1,   46,   -1,   59,   40,   41, 
+          278,   -1,   44,   -1,   46,   -1,   10,   -1,   -1,  945, 
+           61,   91,   -1,  308,  309,   10,  311,   -1,   -1,   61, 
+           -1,  957,  958,  318,  319,   -1,   -1,  963,  964,   91, 
+          313,  314,  315,  316,   -1,  971,   -1,  818,   -1,   -1, 
+           91,   -1,   46,   38,  961,   40,   -1,   42,  267,   91, 
+           -1,   46,   10,  989,  990,   59,  973,  306,   -1,  308, 
+          309,  310,  311,   -1,   59, 1001,   61,  345,  346,  347, 
+           -1,   -1,  123,   -1,  306,   -1,  308,  309,  310,  311, 
+           -1,  123,   40,   41,   -1,   -1,   44,   91,   46,   -1, 
+          279,  369, 1009,  371,  372,  373,  374, 1204,  376,  377, 
+           -1,   -1,   -1,   61,  885,  886,   -1,   -1,   -1,   -1, 
+           -1, 1047,   10,   -1,   -1,   -1,   -1, 1053,   -1,   10, 
+          352,   -1,  267, 1059,   -1,  357, 1062,   -1,  347,  348, 
+           -1,   -1,   -1,   91,   -1,  280,  267,   -1,  416,   -1, 
+         1076,   -1,   40,   10, 1251,   -1,   -1,   -1,   46, 1085, 
+           41,   -1,  430,   44, 1261,   46,   -1,  435,  347,  348, 
+           -1,   59,   -1,   -1,  945,  123, 1273, 1274, 1275,   -1, 
+           61,   38,    2, 1211,   -1,   42,  957,  958,   -1,   -1, 
+           -1,   -1,  963,  964,   -1,   15,   16,  267,   -1,   -1, 
+          971,  469,   59,   91, 1359,   -1,   -1,   -1,   -1,  477, 
+           91,   -1,  347,  348,   10,  267,   -1,   -1,  989,  990, 
+           10,   -1,  490,   -1,   -1,   -1,  347,  348, 1154,   -1, 
+         1001,   -1, 1158,   53,   54,  123, 1162,   57,  279,  280, 
+           -1,   -1,   38,   -1,   40,   -1,   42,  279,  280,   10, 
+           46,   41,   -1,   -1,   44,  306,   46,  308,  309,  310, 
+          311,   -1,  530,   59,   -1,   61,   -1,   -1,   88, 1195, 
+           -1,   61,   -1,  267,   -1,   -1, 1047,  347,  348,   -1, 
+          548,   -1, 1053, 1190,   -1,   46, 1212,   -1, 1059, 1215, 
+           -1, 1062,  112,   -1,   -1,  347,  348,  117,   59,   -1, 
+         1328,   91, 1330,  123,  124, 1076,  347,  348, 1234, 1337, 
+           -1,   -1,   10,   -1, 1085,  347,  348,   -1,   -1, 1245, 
+           -1,  306,   -1,  308,  309,  310,  311,  312,   -1,   -1, 
+           91,  279,  280,   -1,   -1,  603,  604,    0,  606,  607, 
+           -1,   -1,   -1,  328,   -1,  613,   -1,   10,   46,   -1, 
+           -1,   -1,   -1,  347,  348,  623,   -1,  342, 1386,   -1, 
+         1388,   59, 1390,  348, 1392,   -1,   -1,  352,   -1,   -1, 
+           -1,   -1,  357,  358,  359,   -1, 1302,   -1,   41,  267, 
+         1408, 1307, 1308, 1154,    0, 1311,   -1, 1158,   -1,   -1, 
+           -1, 1162,  280,   91,   10,   -1,   59,   -1,  279,  347, 
+          348,   -1,   -1,   -1,   -1,  225,   -1,  675,   -1,   -1, 
+           -1,  679,  680,  681,   -1,  306,   -1,  308,  309,  310, 
+          311,  689,   -1,  691, 1195,   41, 1352,  247,   44,  697, 
+          250,   -1,   -1,   -1,   -1,   -1,   -1,  705,  258,  707, 
+          708, 1212,   58,   59, 1215,   -1,  714,  715,   -1,  306, 
+           -1,  308,  309,  310,  311,  312,   -1,   -1,  278,  347, 
+          348,  352,  125, 1234,   -1,   -1,  347,  348,    2,  737, 
+           -1,  328,   10,   -1, 1245,   -1,   -1,   93,  746,   -1, 
+           -1,   15,   16,   -1,   -1,  342,   -1,   -1,   -1,  279, 
+          310,   -1,   40,   -1,   -1,  352,   44,   -1,   46,   10, 
+          357,  358,  359,   -1,   -1,   -1,  267,   -1,   46,  125, 
+          306,   10,  308,  309,  310,  311,  312,   -1,   -1,   53, 
+           54,   59,   -1,   57,   44,  345,   46,  347,   -1,   40, 
+           -1, 1302,  328,   44,   -1,   46, 1307, 1308,   -1,   -1, 
+         1311,   40,   -1,   91,   -1,   44,  342,   46,   59,  369, 
+          818,   -1,  348,   91,   88,   10,  352,  347,  348,   -1, 
+           59,  357,  358,  359,   -1,   -1,   -1,   -1,   -1,  267, 
+           -1,   91,   -1,   10,   -1,  123,   -1,   -1,  112,   -1, 
+           91, 1352,   -1,  117,   -1,   40,  347,  348,   -1,  123, 
+          124,   46,   91,   -1,   38,   -1,  416,   -1,   42,  262, 
+          263,  264,   -1,   40,   59,  268,  269,   -1,  271,   46, 
+          430,  431,  123,  124,   -1,  435,  279,  885,  886,   -1, 
+           -1,   -1,   59,   -1,  123,  124,   44,   -1,   46,   -1, 
+           -1,  294,  295,  296,  297,  298,   91,   -1,   10,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,  347, 
+          348,  267,  268,  269,   91,  271,   -1,  477,   -1,  322, 
+           -1,  324,   -1,  279,   -1,  281,  282,  283,  123,   -1, 
+          490,   -1,   -1,   91,   46,  291,  292,  945,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,  123,   59,   -1,  957, 
+          958,  225,   -1,   -1,   -1,  963,  964,   -1,   -1,   -1, 
+           -1,   -1,   -1,  971,   -1,   -1,  322,  370,  324,   -1, 
+          530,   -1,   -1,  247,   -1,   -1,  250,   -1,   -1,   91, 
+           -1,  989,  990,   -1,  258,   -1,   -1,   -1,  548,  267, 
+          550,  279,  280, 1001,   -1,  351,   -1,   10,   -1,   40, 
+          356,   -1,   -1,   44,  278,   46,   40,   -1,   -1,   -1, 
+           44,   -1,   46,   10,  370,   -1,   -1,  373,   -1,  279, 
+           -1,   -1,   -1,   -1,    0,   -1,   -1,   40,   41,  280, 
+           -1,   44,   -1,   46,   10,   -1,  310,   -1,   -1, 1047, 
+           -1,  280,   -1,  603,   41, 1053,  606,   44,   61,   46, 
+           91, 1059,   -1,  613, 1062,   -1,   -1,   91,   -1,  347, 
+          348,   -1,   -1,  623,   61,   41,   -1,   -1, 1076,  347, 
+          348,  345,  267,  347,   -1,   -1,   -1, 1085,   91,   -1, 
+           -1,   -1,  123,   59,   -1,  280,   -1,  347,  348,  123, 
+          267,   -1,    0,   -1,   91,  369,  347,  348,   -1,   -1, 
+           -1,   -1,   10,  280,   -1,   -1,   -1,   -1,  347,  348, 
+           -1,   -1,   -1,   -1,   -1,  675,   -1,   -1,   -1,  679, 
+          680,  279,  306,  683,  308,  309,  310,  311,  312,  689, 
+           -1,   10,   -1,   41,   -1,   -1,   44,  697,   -1,   -1, 
+           -1,   -1,  416,    2,  328,  705, 1154,  707,  708,  125, 
+         1158,   59,  347,  348, 1162,  267,  430,  431,  342,   -1, 
+           -1,  435,   41,   -1,   -1,   44,   -1,   46,  352,   -1, 
+          347,  348,   -1,  357,  358,  359,   -1,   -1,   -1,   -1, 
+           -1,   -1,   61,   -1,   -1,   93,  746, 1195,   -1,  347, 
+          348,   10,  752,   -1,   53,   54,   40,   44,   57,   46, 
+           44,   -1,   46,  477, 1212,   -1,   -1, 1215,   -1,   -1, 
+           -1,    0,   91,   -1,   -1,   -1,  490,  125,   -1,   -1, 
+           -1,   10,   41,   -1,   -1,   44, 1234,   46,   -1,   88, 
+           -1,   -1,   -1,   -1,   -1,  347,  348, 1245,  279,  280, 
+           -1,   -1,   61,   -1,   91,  279,  280,   91,   -1,   44, 
+           -1,   46,   41,  112,   -1,   44,  530,   -1,  818,   -1, 
+           -1,   -1,   -1,   -1,  123,  124,  279,   -1,    0,   -1, 
+           59,   -1,   91,   -1,  548,   -1,  550,   -1,   10,  123, 
+           -1,   -1,  279,   44,   -1,   46,  262,  263,  264,   -1, 
+            2,  267,  268,  269, 1302,  271,   91,   -1,   -1, 1307, 
+         1308,   -1,   -1, 1311,   -1,  281,  347,  348,   -1,   41, 
+          870,   -1,   44,  347,  348,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,  886,   59,  123,  603, 
+           91,   10,  606,   -1,  347,  348,  125,   -1,   -1,  613, 
+           -1,   53,   54,   -1, 1352,   -1,  322,   -1,  324,  623, 
+          347,  348,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   41,  271,   -1,   44,  225,   46,   -1,   -1, 
+           -1,  279,   -1,  281,  282,  283,   88,   -1,   -1,   -1, 
+           -1,   -1,   61,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,  125,  370,   -1,   -1,  957,  958,  258, 
+          279,  675,   -1,  963,  964,  679,  680,   -1,   38,  683, 
+           -1,  971,   91,   -1,  322,  689,  324,   -1,   -1,  278, 
+           -1,   -1,   -1,  697,   -1,   -1,   -1,   -1,   -1,  989, 
+           10,  705,  279,  707,  708,  279,  280,   -1,   -1,   -1, 
+           -1, 1001,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
+           -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          279,   41,  370,   -1,   44,  373,   46,   -1,  347,  348, 
+            2,   -1,  746,  262,  263,  264,   -1,   -1,  752,  268, 
+          269,   61,  271,   -1,  279,  280,  345, 1047,  347,   -1, 
+          279,   -1,   -1, 1053,   -1,   44,   -1,   46,   -1, 1059, 
+          347,  348, 1062,  347,  348,  294,  295,  296,  297,  298, 
+          369,   91,   -1,  225,   -1,   -1, 1076,   -1,  279,   -1, 
+           -1,   53,   54,   -1,   -1, 1085,   -1, 1211,  347,  348, 
+          262,  263,  264,  322,   -1,  324,  268,  269,   -1,  271, 
+           -1,   44,   91,   46,  818,   -1,  258,  279,   -1,   -1, 
+           -1,   -1,  347,  348,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  278,   -1,   -1,   -1, 
+           10,  430,  431,   -1,   37,   38,  435,   10,   -1,   42, 
+           43,  370,   45,   -1,   47,   -1,  347,  348,   91,   -1, 
+          322,   10,  324,   44, 1154,   46,  870,   -1, 1158, 1159, 
+          279,   41, 1162,   -1,   44,   38,   46,   40,   -1,   42, 
+           -1,   -1,  886,   46,   -1,   -1,   -1,   -1,   44,  351, 
+           46,   61,   41,   -1,   -1,   44,   59,   46,   61,   41, 
+           -1,   94,   -1,  345,   -1,  347,   -1,   -1,  370,   -1, 
+           91,   -1,   61,   -1, 1328,   -1, 1330,   -1,   -1,   -1, 
+         1334,   91, 1212, 1337,   -1, 1215,   -1,  369,   -1,   -1, 
+           -1,  124,   -1,   -1,   -1,   91,   -1,   -1,  347,  348, 
+           -1,  530,   91,   -1, 1234,   -1,  306,   -1,  308,  309, 
+          310,  311,  312,  957,  958, 1245,   -1,   -1,   -1,  963, 
+          964,  550,   -1,  225,   -1,   -1,   -1,  971,  328,  279, 
+           -1,   -1, 1386,   -1, 1388,   -1, 1390,   -1, 1392,   -1, 
+           -1,    0,  342,  125,   -1,  989,   -1,   -1,  430,   -1, 
+           -1,   10,  352,  435, 1408,   -1,  258, 1001,  358,  359, 
+          279,   -1,   -1,   -1, 1294,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1302,   -1,  603,   -1,  278,  606,   37,   38, 
+           -1, 1311,   41,   42,   43,   44,   45,   -1,   47,   -1, 
+           -1,   -1,   -1,   -1,  623,   -1,   -1,  347,  348,   58, 
+           59,   -1,   -1, 1047,   63,   -1,  279,   -1,   -1, 1053, 
+           -1,   -1,   -1, 1343,   -1, 1059,   -1,   -1, 1062,   -1, 
+           -1,   -1, 1352,   -1,   -1,   -1,   -1,   -1,  347,  348, 
+           -1,   -1, 1076,   -1,   93,   94,   -1,   -1,   -1,   -1, 
+           -1, 1085,   -1,  345,   -1,  347,  675,   -1,  530,   -1, 
+          679,  680,   -1,   -1,  683,   -1,   -1,   -1,  279,   -1, 
+          689,   -1,   -1,   -1,   -1,  124,  125,  369,  697,  279, 
+           -1,   -1,   -1,   -1,  347,  348,   -1,   -1,  707,  708, 
+          262,  263,  264,  279,   -1,   -1,  268,  269,    0,  271, 
+          279,   -1,   -1,   -1,   -1,  328,   -1,  279,   10,   -1, 
+           -1,   -1,   -1,  306,   -1,  308,  309,  310,  311,  312, 
+         1154,   -1,  345,  346, 1158, 1159,   41,  746, 1162,   -1, 
+           -1,  603,   -1,  752,  606,  328,  347,  348,  430,   41, 
+           -1,   -1,  761,  435,   46,   -1,   -1,  347,  348,  342, 
+          322,  623,  324,   -1,   -1,  348,   -1,   59,   -1,  352, 
+           -1,  347,  348,   -1,  357,  358,  359,   -1,  347,  348, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1212,   38, 
+           -1, 1215,   -1,   42,   -1,   -1,   -1,   -1,   -1,   -1, 
+           38,   -1,   40,   -1,   42,   -1,   -1,   -1,  370,  818, 
+         1234,   -1,   -1,  675,   -1,   -1,   -1,  679,  680,   -1, 
+          125, 1245,   -1,  262,  263,  264,   -1,  689,  267,  268, 
+          269,   -1,  271,  125,   -1,  697,   -1,   -1,   -1,   -1, 
+          279,   -1,  281,  282,  283,  707,  708,   -1,  530,   -1, 
            -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-          671,   -1,   -1,  123,  675,  676,  677,   -1,   -1,  279, 
-           -1,   -1,   -1,   -1,    0,   -1,  279,   -1,   -1,   -1, 
-           -1,   -1,   -1,  322,   10,  324,   -1,  262,  263,  264, 
-          701,   -1,  267,  268,  269,   -1,  271,  708,  709,  710, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1,   -1, 
-          721,   -1,  723,  724,  725,   41,  727,  356,   44,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,  739,   -1, 
-           -1,  370,   58,   59,   -1,   -1,   -1,  347,  348,   -1, 
-           -1,   -1, 1023, 1024,  347,  348,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,   93,   -1,   -1, 
-          781,   -1,   -1,  279,  280,  281,  282,  283,   -1,   -1, 
+           -1,  870,   -1,   37,   38,   -1,   -1,   -1,   42,   43, 
+         1294,   45,   -1,   47,   -1,   -1,   -1,  886, 1302,   -1, 
+           -1,   -1,   -1,  322,  746,  324,   60, 1311,   62,  328, 
+          329,  330,  331,  332,   -1,   -1,  335,  336,  337,  338, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1, 
+           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 1343, 
+           94,  603,   -1,   -1,  606,   -1,   -1,   -1, 1352,   -1, 
+         1287,  370,   -1,   -1,  373, 1292,   -1,   -1,   -1,   -1, 
+           -1,  623,   -1,   -1,   -1,   -1,   -1,   38,  957,  958, 
+          124,   -1,   -1,   -1,  963,  964,  818,  262,  263,  264, 
+           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1, 
+          262,  263,  264,   -1,  279,  267,  268,  269,   -1,  271, 
+          989,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
+           -1,   -1, 1001,  675,   -1,   -1,   -1,  679,  680,  291, 
+          292,   -1,  294,  295,  296,  297,  298,  689,   -1,   -1, 
+           -1, 1368, 1369, 1370, 1371,  697,   -1,  322, 1375,  324, 
+           -1,   -1,   -1,   -1,  886,  707,  708,   -1,   -1,   -1, 
+          322,   -1,  324,   40,   -1,   -1,   -1,   44, 1047,   46, 
+           -1,   -1,   -1,   -1, 1053, 1402, 1403, 1404, 1405,   -1, 
+         1059,   -1,   -1, 1062, 1411,  347,  348,  306,   -1,  308, 
+          309,  310,  311,  312,  746,  370,   -1, 1076,  306,   -1, 
+          308,  309,  310,  311,  312,   -1, 1085,   -1,  370,  328, 
+           -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   -1, 
+          328,   -1,   -1,   -1,   -1,  957,  958,   -1,   -1,   -1, 
+           -1,  963,  964,  352,  342,    0,   -1,   -1,  357,  358, 
+          359,   -1,   -1,   -1,  352,   10,  123,   -1,   -1,  357, 
+          358,  359,   -1,   -1,   -1,   -1,   -1,  989,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  818,   -1,   -1, 1001, 
+           -1,   -1,   -1,   -1,   -1, 1154,   41,   -1,   -1, 1158, 
+         1159,   -1,   -1, 1162,  328,   -1,   -1,   -1,   -1,  333, 
+          334,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,    0, 
+           -1,  345,  346,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
+           -1,   -1,   -1,   -1,   -1, 1047,   -1,   -1,   -1,   -1, 
+           -1, 1053,   -1,   -1,   -1,   -1,   -1, 1059,   -1,   -1, 
+         1062,   -1,   -1, 1212,  886,   -1, 1215,   15,   16,   -1, 
+           41,   -1,   -1,   44, 1076,  306,   -1,  308,  309,  310, 
+          311,  312,   -1, 1085,   -1, 1234,   -1,   58,   59,   -1, 
+          125,   -1,   63,   -1,   -1,   -1, 1245,  328,   -1,   -1, 
+           48,   49,   50,   51,   -1,   -1,   -1,   55,   56,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   67, 
+           68,  352,   93,   -1,   -1,   -1,   -1,  358,  359,   -1, 
+           -1,   -1,  279,  280,   -1,  957,  958,   -1,   -1,   -1, 
+           -1,  963,  964,   -1,   -1, 1294,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1154,   -1,  125,   -1, 1158, 1159,   -1,   -1, 
+         1162,   -1, 1311,   -1,   -1,   -1,   -1,  989,   -1,  117, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1001, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1343,   -1,   -1,   -1,   -1,   -1, 
+          347,  348,   -1, 1352,   -1,   -1,   -1,   -1,   -1,   -1, 
+         1212,   -1,   -1, 1215,    0,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   10, 1047,   -1,  262,  263,  264, 
+           -1, 1053, 1234,  268,  269,   -1,  271, 1059,   -1,   -1, 
+         1062,   -1,   -1, 1245,  279,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1076,   41,   -1,   -1,   44,  294, 
+          295,  296,  297, 1085,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   -1,  223,   -1,   -1,  226,  227, 
+          228,   -1,  230,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,  247, 
+          271,   -1,  250,   -1,   -1,   -1,   -1,   93,  279, 1311, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1, 1154,   -1,   -1,  370, 1158,   -1,  124,  125, 
+         1162,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+         1352,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  335,  336,    0,   -1,  339,  340, 
+           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,   -1,   -1,   -1, 
+         1212,   -1,   -1, 1215,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,  373,   37,   38,   -1,   -1,   41,   42,   43, 
+           44,   45, 1234,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1, 1245,   58,   59,   60,   -1,   62,   63, 
+           -1,  379,  380,  381,  382,  383,   -1,   -1,  386,  387, 
+          388,  389,  390,  391,  392,  393,   -1,  395,   -1,   -1, 
+          398,  399,  400,  401,  402,  403,  404,  405,  406,   93, 
+           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  416,   -1, 
+           -1,  419,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 1311, 
+          124,  125,   -1,  279,   -1,  281,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,  370,   -1,   -1,   -1,  125, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1090, 
-         1091,   -1,   -1, 1094,   -1,  826,  322,   -1,  324,  279, 
-          280,   10,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,  848,    0,  345, 
-          346,  347,  348,   -1,   -1,  351,   -1, 1128,   10,   -1, 
-          356,   -1,   41,   -1,   -1,   44,   -1,   46,   -1,   -1, 
-           -1,   -1,  873,   -1,  370,   -1,   -1,  373, 1149,   -1, 
-           -1,   33,   61,   -1,   -1,   37,   38,   -1,   40,   41, 
-           42,   43,   44,   45,   46,   47, 1167,  347,  348,   -1, 
-         1171,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61, 
-           62,   63,   91, 1184, 1185, 1186, 1187,   -1,   -1,   -1, 
-         1191, 1192,   -1, 1194,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  932,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91, 
-          941,   93,   94,  944,  945,   -1,  262,  263,  264,  950, 
-          951,  267,  268,  269,   -1,  271,  957,   -1,   -1,   -1, 
-           -1,   -1,  963,  279,   -1,  281,  282,  283,  969,   -1, 
-           -1,  123,  124,  125,  126,  291,  292,   -1,  294,  295, 
-          296,  297,  983,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  993,  994,  995,   -1,  997,  998,  999,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   37,   38,   -1, 1020, 
-         1021,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
-           -1, 1302, 1033,   -1, 1305,  351,   -1, 1038,   -1,   60, 
-          356,   62, 1313,   41, 1045, 1046,   44,   38,   46,   -1, 
-           -1,   42,   -1,   -1,  370,   -1,   -1,  373,   -1,   -1, 
-         1061,   -1,   -1,   61,   -1,   -1, 1067,   -1,   -1,   -1, 
-           -1,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   -1, 1370, 
-          279,   -1,   -1,  124,   -1,  257,  258,  259,   -1,  261, 
-          262,  263,  264,  265,  266,  267,  268,  269,  270,  271, 
-          272,  273,  274,  275,  276,  277,  278,  279,  280,  281, 
-          282,  283,  284,  285,  286,  287,  288,  289,  290,  291, 
-          292,  293,  294,  295,  296,  297,  298,   38,  300, 1150, 
-           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-          312,  313,  314,  315,  316,  317,  318,  319,  347,  348, 
-          322,  323,  324,   -1,  326,  327,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,  341, 
-          342,   -1,   -1,  345,  346,  347,  348,  349,  350,  351, 
-          352,  353,  354,  355,  356,  357,  358,  359,  360,  361, 
-          362,  363,  364,  365,  366,    0,  368,  369,  370,   -1, 
-           -1,  373,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1, 
-           -1,   -1,   37,   38,   -1,   40,   41,   42,   43,   44, 
-           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   58,   59,   60,   61,   62,   63,   -1, 
-           -1,  279,   -1,   -1,   -1,   -1,   -1, 1288,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   91,  328,   93,   94, 
-           -1,   -1,  333,  334,   -1,  306,   -1,  308,  309,  310, 
-          311,  312,   -1, 1273,  345,  346,   -1,   -1, 1278,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,  328,  123,  124, 
-          125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1,  347, 
-          348,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  352,   -1,   -1,   -1,   33,  357,  358,  359,   37, 
-           38,   -1,   40,   41,   42,   43,   44,   45,   46,   47, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           58,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1, 1354, 1355, 1356, 1357,   -1,   -1, 
-           -1, 1361,   -1,   -1,   -1,  306,   -1,  308,  309,  310, 
-          311,  312,   -1,   91,   -1,   93,   94,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  328, 1388, 1389, 
-         1390, 1391,   -1,   -1,   -1,   -1,   -1, 1397,   -1,   -1, 
-           -1,  342,   -1,   -1,   -1,  123,  124,  125,  126,   -1, 
-           -1,  352,   -1,   -1,   -1,   -1,   -1,  358,  359,   -1, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  477, 
+         1352,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+          488,   -1,  490,   -1,  492,   -1,   -1,    0,  496,   -1, 
+           -1,   -1,  500,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+          518,   -1,  520,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,  533,   -1,   -1,   41,  537, 
+           -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          548,   -1,   -1,   -1,   -1,   58,   59,   -1,   -1,   -1, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           93,   -1,   -1,   -1,   -1,  279,  594,  281,  282,  283, 
+           -1,   -1,   -1,   -1,   -1,   -1,  604,  291,  292,  607, 
+          294,  295,  296,  297,  298,  613,   -1,   -1,   37,   38, 
+           -1,   -1,  125,   42,   43,   -1,   45,   -1,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   60,   -1,   62,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
+           -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1,   -1, 
+           -1,   -1,  356,   -1,   -1,   94,   -1,  675,   -1,   -1, 
+           -1,  679,  680,  681,   -1,   -1,  370,   -1,   -1,  373, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,   -1,  705,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  713,  714,  715,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,  726,   -1, 
+          728,  729,  730,   -1,  732,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,  741,  742,   -1,   -1,   -1,  746,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   41,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
+          283,   -1,   -1,   -1,   -1,   59,   -1,   -1,  291,  292, 
+          788,  294,  295,  296,  297,  298,   -1,   -1,  287,  288, 
+          289,  290,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  303,  304,  305,   -1,   -1,  322, 
+           -1,  324,   -1,   -1,  313,  314,  315,  316,  317,   -1, 
+           -1,   -1,  335,  336,  323,  833,  339,  340,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,  351,   -1, 
+           -1,  125,   -1,  356,   -1,   10,   -1,   -1,   -1,  857, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+          373,  360,  361,  362,  363,  364,  365,  366,   33,  368, 
+          369,   -1,   37,   38,  882,   40,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,  895,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   61,   62,   63,  328, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+           -1,   -1,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  945,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  954,   -1,   -1,  957, 
+          958,   -1,   -1,   -1,   -1,  963,  964,   -1,  123,  124, 
+          125,  126,   -1,  971,   -1,   -1,   -1,   -1,   -1,  977, 
+           -1,   -1,   -1,   -1,   -1,  983,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,  997, 
+           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,   -1, 1007, 
+         1008,   -1, 1010, 1011, 1012,   -1,   -1, 1015,   -1,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1, 1034, 1035,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322, 1047, 
+          324,   -1,   -1,   -1, 1052,   -1,   -1,   -1,   -1,   -1, 
+           -1, 1059, 1060,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1, 1075,   -1,   -1, 
+           -1,   -1,   -1, 1081,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,   -1, 
            -1,   -1,  257,  258,  259,   -1,  261,  262,  263,  264, 
           265,  266,  267,  268,  269,  270,  271,  272,  273,  274, 
           275,  276,  277,  278,  279,  280,  281,  282,  283,  284, 
           285,  286,  287,  288,  289,  290,  291,  292,  293,  294, 
-          295,  296,  297,  298,   38,  300,   -1,   -1,  303,  304, 
+          295,  296,  297,  298,   -1,  300,   -1,   -1,  303,  304, 
           305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
-          315,  316,  317,  318,  319,   -1,   -1,  322,  323,  324, 
+          315,  316,  317,  318,  319,   -1, 1164,  322,  323,  324, 
            -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
           335,  336,  337,  338,  339,  340,  341,  342,   -1,   -1, 
           345,  346,  347,  348,  349,  350,  351,  352,  353,  354, 
           355,  356,  357,  358,  359,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,  370,   -1,   -1,  373,  257, 
-          258,  259,   -1,  261,  262,  263,  264,  265,  266,  267, 
-          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
-          278,  279,  280,  281,  282,  283,  284,  285,  286,  287, 
-          288,  289,  290,  291,  292,  293,  294,  295,  296,  297, 
-          298,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,  322,  323,  324,   -1,  326,  327, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,  341,  342,   -1,   -1,  345,  346,  347, 
-          348,  349,   -1,  351,  352,  353,  354,  355,  356,  357, 
-          358,  359,  360,  361,  362,  363,  364,  365,  366,    0, 
-          368,  369,  370,   -1,   -1,  373,   -1,   -1,   -1,   10, 
+          365,  366,    0,  368,  369,  370,   -1,   -1,  373,   -1, 
+           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37, 
+           38,   -1,   40,   41,   42,   43,   44,   45,   46,   47, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           58,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   91, 1302,   93,   94,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40, 
@@ -3925,24 +4036,24 @@ private static final int[] yyCheck1() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
            61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  306,   -1,  308,  309,  310,  311,  312,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  328,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,  123,  124,  125,  126,   10,   -1,  352,   -1, 
-           -1,   -1,   -1,   -1,  358,  359,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
-           -1,   -1,   -1,   37,   38,   -1,   40,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-          287,  288,  289,  290,   58,   59,   60,   61,   62,   63, 
-           -1,   -1,   -1,   -1,   -1,   -1,  303,  304,  305,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  313,  314,  315,  316, 
-          317,   -1,   -1,   -1,   -1,   -1,  323,   91,   -1,   93, 
-           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123, 
-          124,  125,  126,  360,  361,  362,  363,  364,  365,  366, 
-           -1,  368,  369,   -1,   -1,   -1,  257,  258,  259,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  123,  124,  125,  126,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257, 
+          258,  259,   -1,  261,  262,  263,  264,  265,  266,  267, 
+          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
+          278,  279,  280,  281,  282,  283,  284,  285,  286,  287, 
+          288,  289,  290,  291,  292,  293,  294,  295,  296,  297, 
+          298,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
+          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
+          318,  319,   -1,   -1,  322,  323,  324,   -1,  326,  327, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,  341,  342,   -1,   -1,  345,  346,  347, 
+          348,  349,  350,  351,  352,  353,  354,  355,  356,  357, 
+          358,  359,  360,  361,  362,  363,  364,  365,  366,   -1, 
+          368,  369,  370,   -1,   -1,  373,  257,  258,  259,   -1, 
           261,  262,  263,  264,  265,  266,  267,  268,  269,  270, 
           271,  272,  273,  274,  275,  276,  277,  278,  279,  280, 
           281,  282,  283,  284,  285,  286,  287,  288,  289,  290, 
@@ -3953,44 +4064,44 @@ private static final int[] yyCheck1() {
           331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
           341,  342,   -1,   -1,  345,  346,  347,  348,  349,   -1, 
           351,  352,  353,  354,  355,  356,  357,  358,  359,  360, 
-          361,  362,  363,  364,  365,  366,   -1,  368,  369,  370, 
-           -1,   -1,  373,  257,  258,  259,   -1,  261,  262,  263, 
-          264,  265,  266,  267,  268,  269,  270,  271,  272,  273, 
-          274,  275,  276,  277,  278,  279,  280,  281,  282,  283, 
-          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
-          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
-           -1,  345,  346,  347,  348,  349,   -1,  351,  352,  353, 
-          354,  355,  356,  357,  358,  359,  360,  361,  362,  363, 
-          364,  365,  366,    0,  368,  369,  370,   -1,   -1,  373, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
-           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   58,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
+          361,  362,  363,  364,  365,  366,    0,  368,  369,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
+           -1,   -1,   -1,   37,   38,   -1,   40,   41,   42,   43, 
+           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   58,   59,   60,   61,   62,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   93,   94,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93, 
+           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-            0,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
-           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  123, 
+          124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
-           40,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
+           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   58,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   91,   -1,   93,   94,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  123,  124,  125,  126,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  257,  258,  259,   -1,  261,  262,  263, 
+          264,  265,  266,  267,  268,  269,  270,  271,  272,  273, 
+          274,  275,  276,  277,  278,  279,  280,  281,  282,  283, 
+          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
+          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
+          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
+          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
+          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
+           -1,  345,  346,  347,  348,  349,   -1,  351,  352,  353, 
+          354,  355,  356,  357,  358,  359,  360,  361,  362,  363, 
+          364,  365,  366,   -1,  368,  369,  370,   -1,   -1,  373, 
           257,  258,  259,   -1,  261,  262,  263,  264,  265,  266, 
           267,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
           277,  278,  279,  280,  281,  282,  283,  284,  285,  286, 
@@ -4002,19 +4113,19 @@ private static final int[] yyCheck1() {
           337,  338,  339,  340,  341,  342,   -1,   -1,  345,  346, 
           347,  348,  349,   -1,  351,  352,  353,  354,  355,  356, 
           357,  358,  359,  360,  361,  362,  363,  364,  365,  366, 
-           -1,  368,  369,  370,   -1,   -1,  373,  257,  258,  259, 
-           -1,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
-          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
-          280,  281,  282,  283,  284,  285,  286,  287,  288,  289, 
-          290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
-           -1,  351,  352,  353,  354,  355,  356,  357,  358,  359, 
-          360,  361,  362,  363,  364,  365,  366,    0,  368,  369, 
-          370,   -1,   -1,  373,   -1,   -1,   -1,   10,   -1,   -1, 
+            0,  368,  369,  370,   -1,   -1,  373,   -1,   -1,   -1, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
+           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,   -1,  123,  124,  125,  126,   10,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            33,   -1,   -1,   -1,   37,   38,   -1,   40,   41,   42, 
@@ -4024,22 +4135,22 @@ private static final int[] yyCheck1() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
            93,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
-          123,  124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
-           91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   38,   -1,   40,   -1,   42,   -1,   -1,   -1,   46, 
-           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   -1,   61,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261,  262, 
+          123,  124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259, 
+           -1,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
+          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
+          280,  281,  282,  283,  284,  285,  286,  287,  288,  289, 
+          290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
+          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
+          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
+           -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
+           -1,  351,  352,  353,  354,  355,  356,  357,  358,  359, 
+          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
+          370,   -1,   -1,  373,  257,  258,  259,   -1,  261,  262, 
           263,  264,  265,  266,  267,  268,  269,  270,  271,  272, 
           273,  274,  275,  276,  277,  278,  279,  280,  281,  282, 
           283,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
@@ -4050,268 +4161,203 @@ private static final int[] yyCheck1() {
           333,  334,  335,  336,  337,  338,  339,  340,  341,  342, 
            -1,   -1,  345,  346,  347,  348,  349,   -1,  351,  352, 
           353,  354,  355,  356,  357,  358,  359,  360,  361,  362, 
-          363,  364,  365,  366,   -1,  368,  369,  370,   -1,   -1, 
-          373,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   10,   -1,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,  350, 
-          351,   -1,   37,   38,   -1,  356,   41,   42,   43,   44, 
-           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
-           -1,   -1,  373,   58,   59,   60,   61,   62,   63,  306, 
-           -1,  308,  309,  310,  311,  312,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  328,   -1,   -1,   -1,   -1,   91,   -1,   93,   94, 
-            0,   -1,   -1,   -1,   -1,  342,   -1,   -1,   -1,   -1, 
-           10,  348,   -1,   -1,   -1,  352,   -1,   -1,   -1,   -1, 
-          357,  358,  359,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
-          125,   -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
-           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   93,   94,   -1,   -1,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   41, 
-           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283,   91, 
-           -1,   93,   94,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
-          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
-          345,  346,  347,  348,   -1,  350,  351,   -1,   -1,   -1, 
-           -1,  356,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           -1,  271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279, 
-           -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   10,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
-          350,  351,   -1,   -1,   -1,   -1,  356,   -1,   41,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-          370,   -1,   -1,  373,   -1,   -1,   59,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           93,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   10,   -1,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,  125,  345,  346,  347,  348,   -1,  350,  351, 
-           -1,   37,   38,   -1,  356,   41,   42,   43,   44,   45, 
-           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,   58,   59,   60,   61,   62,   63,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
+          363,  364,  365,  366,    0,  368,  369,  370,   -1,   -1, 
+          373,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
-           -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
-           91,   -1,   93,   94,   -1,   -1,   -1,    0,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   10,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
+           -1,   37,   38,   -1,   40,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
-           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61,   62, 
-           63,   -1,   -1,  356,   -1,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,  370,   -1,   -1, 
-           -1,   -1,   -1,  279,   -1,  281,  282,  283,   91,   -1, 
-           93,   94,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  124,  125,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
-          346,  347,  348,   -1,  350,  351,   -1,   -1,   -1,   -1, 
-          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1, 
-          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   10,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,  350, 
-          351,   -1,   -1,   -1,   -1,  356,   -1,   41,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,  370, 
-           -1,   -1,  373,   -1,   -1,   59,  279,   -1,  281,  282, 
-          283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93, 
-           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   10,   -1,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-           -1,  125,  345,  346,  347,  348,   -1,  350,  351,   -1, 
-           37,   38,   -1,  356,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
-          373,   58,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   93,   94,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-           -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   41, 
-           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,   91, 
-           -1,   93,   94,   -1,   -1,   -1,    0,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   10,  123,  124,  125, 
+          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
+           -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
            44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   58,   59,   60,   61,   62,   63, 
-           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,  370,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,  281,  282,  283,   91,   -1,   93, 
-           94,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
-           -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-          347,  348,   -1,  350,  351,   -1,   -1,   -1,   -1,  356, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   10,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   -1,  345,  346,  347,  348,   -1,  350,  351, 
-           -1,   -1,   -1,   -1,  356,   -1,   41,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,  370,   -1, 
-           -1,  373,   -1,   -1,   59,  279,   -1,  281,  282,  283, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93, 
+           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   38,   -1, 
+           40,   -1,   42,   -1,   -1,   -1,   46,   -1,   -1,  123, 
+          124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
+           -1,   61,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  257,  258,  259,   -1,  261,  262,  263,  264,  265, 
+          266,  267,  268,  269,  270,  271,  272,  273,  274,  275, 
+          276,  277,  278,  279,  280,  281,  282,  283,  284,  285, 
+          286,  287,  288,  289,  290,  291,  292,  293,  294,  295, 
+          296,  297,  298,   -1,  300,   -1,   -1,  303,  304,  305, 
+          306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
+          316,  317,  318,  319,   -1,   -1,  322,  323,  324,   -1, 
+          326,  327,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,  341,  342,   -1,   -1,  345, 
+          346,  347,  348,  349,   -1,  351,  352,  353,  354,  355, 
+          356,  357,  358,  359,  360,  361,  362,  363,  364,  365, 
+          366,   -1,  368,  369,  370,   -1,   -1,  373,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  279,  280,  281,  282,  283, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
           294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
           324,   -1,   10,   -1,  328,  329,  330,  331,  332,  333, 
           334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-          125,  345,  346,  347,  348,   -1,  350,  351,   -1,   37, 
+           -1,  345,  346,  347,  348,   -1,   -1,  351,   -1,   37, 
            38,   -1,  356,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  373, 
-           58,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           58,   59,   60,   61,   62,   63,  306,   -1,  308,  309, 
+          310,  311,  312,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  328,   -1, 
            -1,   -1,   -1,   91,   -1,   93,   94,    0,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  123,  124,  125,   -1,   -1, 
-           -1,   -1,   -1,   -1,   37,   38,   -1,   40,   41,   42, 
+           -1,   -1,  342,   -1,   -1,   -1,   -1,   10,  348,   -1, 
+           -1,   -1,  352,   -1,   -1,   -1,   -1,  357,  358,  359, 
+           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
+           -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
            43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61,   62, 
-           63,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268, 
-      };
-   }
-
-   private static final int[] yyCheck2() {
-      return new int[] {
-
-          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          279,   -1,  281,  282,   91,   -1,   93,   94,   -1,   -1, 
-           -1,    0,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   37,   38, 
-           -1,   -1,   41,   42,   43,   44,   45,   46,   47,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58, 
-           59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,  370,   -1,   -1,   -1,   -1,   -1,  279,  280,  281, 
-          282,  283,   91,   -1,   93,   94,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  123,  124,  125,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   -1,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   -1,  345,  346,  347,  348,   -1,   -1,  351, 
-           -1,   -1,   -1,   -1,  356,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,  279,   -1,  281,  282,  283,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
+           93,   94,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-            0,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
-           10,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-          347,  348,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356, 
-           -1,   41,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,  370,   -1,   -1,  373,   -1,   -1,   59, 
-          279,  280,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   61,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  279,   -1,  281,  282,  283,   91,   -1,   93,   94, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
+          348,   -1,  350,  351,   -1,   -1,   -1,   -1,  356,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,  370,   -1,   -1,  373,  279,   -1,  281,  282, 
+          283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   -1,   -1,   10,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,  347,  348,   -1,  350,  351,   -1, 
+           -1,   -1,   -1,  356,   -1,   41,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,  370,   -1,   -1, 
+          373,   -1,   -1,   59,  279,   -1,  281,  282,  283,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   10,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,  125, 
+          345,  346,  347,  348,   -1,  350,  351,   -1,   37,   38, 
+           -1,  356,   41,   42,   43,   44,   45,   46,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   58, 
+           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   91,   -1,   93,   94,    0,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
+           -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
+           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   58,   59,   60,   61,   62,   63, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,   91,   -1,   93, 
+           94,   -1,   -1,   -1,    0,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          124,  125,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   58,   59,   60,   61,   62,   63,   -1,   -1, 
+          356,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   -1,  370,   -1,   -1,   -1,   -1,   -1, 
+          279,   -1,  281,  282,  283,   91,   -1,   93,   94,   -1, 
            -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   93,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   10,   -1,  328, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328, 
           329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
-          339,  340,   -1,   -1,   -1,  125,  345,  346,  347,  348, 
-           -1,   -1,  351,   -1,   37,   38,   -1,  356,   41,   42, 
-           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,  370,   -1,   -1,  373,   58,   59,   60,   61,   62, 
-           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
+           -1,  350,  351,   -1,   -1,   -1,   -1,  356,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           -1,  370,   -1,   -1,  373,  279,   -1,  281,  282,  283, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
-           93,   94,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   -1,   -1,   10,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
+           -1,  345,  346,  347,  348,   -1,  350,  351,   -1,   -1, 
+           -1,   -1,  356,   -1,   41,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,  370,   -1,   -1,  373, 
+           -1,   -1,   59,  279,   -1,  281,  282,  283,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1, 
+            0,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           10,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,  125,  345, 
+          346,  347,  348,   -1,  350,  351,   -1,   37,   38,   -1, 
+          356,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   58,   59, 
+           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           58,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   91,   -1,   93,   94,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   61,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,   -1,  281,  282,   91,   -1,   93,   94, 
+           -1,   -1,   -1,    0,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   58,   59,   60,   61,   62,   63,   -1,   -1,  356, 
            -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
-           -1,  281,  282,   91,   -1,   93,   94,   -1,   -1,   -1, 
-            0,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
-          370,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
-          283,   91,   -1,   93,   94,   -1,   -1,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           -1,  271,   -1,  370,   -1,   -1,   -1,   -1,   -1,  279, 
+           -1,  281,  282,  283,   91,   -1,   93,   94,   -1,   -1, 
+           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   -1,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-           -1,   -1,  345,  346,  347,  348,   -1,   -1,  351,   -1, 
-           -1,   -1,   -1,  356,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1,   -1, 
-          373,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
+           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
+          350,  351,   -1,   -1,   -1,   -1,  356,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
+          370,   -1,   -1,  373,  279,   -1,  281,  282,  283,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1, 
+      };
+   }
+
+   private static final int[] yyCheck2() {
+      return new int[] {
+
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
            -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   10, 
           328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
           338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
+          348,   -1,  350,  351,   -1,   -1,   -1,   -1,  356,   -1, 
            41,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
            -1,  271,  370,   -1,   -1,  373,   -1,   -1,   59,  279, 
            -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1, 
@@ -4321,9 +4367,9 @@ private static final int[] yyCheck2() {
            -1,   -1,  322,   -1,  324,   -1,   10,   -1,  328,  329, 
           330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
           340,   -1,   -1,   -1,  125,  345,  346,  347,  348,   -1, 
-           -1,  351,   -1,   37,   38,   -1,  356,   41,   42,   43, 
+          350,  351,   -1,   37,   38,   -1,  356,   41,   42,   43, 
            44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-          370,   -1,   -1,  373,   58,   59,   60,   -1,   62,   63, 
+          370,   -1,   -1,  373,   58,   59,   60,   61,   62,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93, 
@@ -4336,14 +4382,14 @@ private static final int[] yyCheck2() {
            59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1, 
            -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
           271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,   -1,   91,   -1,   93,   94,   -1,   -1,   -1,    0, 
+          281,  282,   91,   -1,   93,   94,   -1,   -1,   -1,    0, 
           291,  292,   -1,  294,  295,  296,  297,  298,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   37,   38,   -1,   -1, 
+           -1,   -1,   -1,   -1,  123,  124,  125,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   37,   38,   -1,   40, 
            41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
-           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,  262,  263, 
+           61,   62,   63,   -1,   -1,  356,   -1,   -1,  262,  263, 
           264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,  370, 
            -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283, 
            91,   -1,   93,   94,   -1,   -1,   -1,  291,  292,   -1, 
@@ -4352,26 +4398,26 @@ private static final int[] yyCheck2() {
            -1,   -1,   -1,  124,  125,   -1,   -1,   -1,  322,   -1, 
           324,   -1,   -1,   -1,  328,  329,  330,  331,  332,  333, 
           334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,  347,  348,   -1,   -1,  351,   -1,   -1, 
-           -1,   -1,  356,  262,  263,  264,   -1,    0,  267,  268, 
-          269,   -1,  271,   -1,   -1,   -1,  370,   10,   -1,  373, 
-          279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
+           -1,  345,  346,  347,  348,   -1,  350,  351,   -1,   -1, 
+           -1,   -1,  356,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   -1,   -1,   -1,  370,   -1,   -1,  373, 
+          279,  280,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41,   -1, 
-           -1,   44,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   59,   10,   -1,  328, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   10,  328, 
           329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
           339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   41,   -1, 
+           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   41, 
            -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,  370,   -1,   -1,  373,   -1,   59,   -1,  279,   -1, 
+          271,  370,   -1,   -1,  373,   -1,   -1,   59,  279,   -1, 
           281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,  125,  294,  295,  296,  297,  298,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           93,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   93,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
            -1,  322,   -1,  324,   -1,   10,   -1,  328,  329,  330, 
           331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,  125,   -1,  345,  346,  347,  348,   -1,   -1, 
+           -1,   -1,   -1,  125,  345,  346,  347,  348,   -1,   -1, 
           351,   -1,   37,   38,   -1,  356,   41,   42,   43,   44, 
            45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
            -1,   -1,  373,   58,   59,   60,   -1,   62,   63,   -1, 
@@ -4379,784 +4425,637 @@ private static final int[] yyCheck2() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94, 
             0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
-          263,  264,   -1,   -1,   -1,  268,  269,   -1,  271,  124, 
-          125,   -1,   -1,   -1,   -1,   -1,  279,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   -1,   47,  291,  292, 
-           -1,  294,  295,  296,  297,   -1,   -1,   -1,   58,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,  322, 
-           -1,  324,   -1,   -1,   -1,   -1,  279,   -1,  281,   -1, 
-           -1,   -1,   -1,   93,   94,   -1,    0,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   10,   -1,  351,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,  370,   -1,  322, 
-           -1,  324,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
-           44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62,   63, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,  370,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283,   93, 
-           94,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
-          124,  125,   -1,   -1,   -1,   -1,   -1,  322,   10,  324, 
-           -1,   -1,   -1,   -1,  329,  330,  331,  332,  333,  334, 
-          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
-          345,  346,  347,  348,   -1,   -1,  351,   10,   -1,   41, 
-           -1,  356,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           -1,  271,   -1,   -1,   -1,  370,   -1,   59,  373,  279, 
-           -1,  281,  282,  283,   -1,   38,   -1,   40,   -1,   42, 
-           -1,  291,  292,   46,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   61,   -1, 
-           -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,  125,   -1,  345,  346,   -1,   -1,   -1, 
-           -1,  351,   -1,   -1,   -1,   -1,  356,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-          370,   -1,   -1,  373,   -1,  279,   -1,  281,  282,  283, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   10,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1,   37, 
-           38,   -1,  356,   41,   42,   43,   44,   45,   -1,   47, 
-           -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  373, 
-           58,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,  124, 
+          125,   -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1, 
+           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
+           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
           262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
-           -1,   -1,   -1,   -1,   -1,   93,   94,    0,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
-          322,   -1,  324,   -1,   37,   38,   -1,   -1,   41,   42, 
-           43,   44,   45,  306,   47,  308,  309,  310,  311,  312, 
-           -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62, 
-           63,   -1,   -1,   -1,   -1,  328,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,  342, 
-           -1,   -1,   -1,   -1,   -1,  348,   -1,   -1,   -1,  352, 
-           93,   94,   -1,    0,  357,  358,  359,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   37,   38,   -1,   -1,   -1,   42, 
-           43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,  124,  125,   -1,   -1,   -1,   -1,   60,   -1,   62, 
-           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   58,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
-           -1,   94,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,  282,  283,   93,   94,   -1,   -1, 
-           -1,  124,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,    0,   -1,  124,  125,   -1, 
-           -1,   -1,   -1,   -1,  322,   10,  324,   -1,   -1,   -1, 
-           -1,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,   -1, 
-           -1,   -1,   -1,  351,   10,   -1,   41,   -1,  356,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
-           -1,   -1,  370,   -1,   59,  373,  279,   -1,  281,  282, 
-          283,   -1,   38,   -1,   40,   -1,   42,   -1,  291,  292, 
-           46,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   59,   -1,   61,   -1,   -1,   93,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-          125,   -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1, 
-           -1,   -1,   -1,  356,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,  370,   -1,   -1, 
-          373,   -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,   -1,   -1,   -1,    0, 
-           -1,   -1,  345,  346,   -1,  322,   -1,  324,   -1,   10, 
-           -1,   -1,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-           -1,   -1,   -1,   -1,  351,   -1,   37,   38,   -1,  356, 
-           41,   42,   43,   44,   45,   -1,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,  370,   -1,   -1,  373,   58,   59,   60, 
-           -1,   62,   63,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1,   -1, 
-           -1,   -1,   93,   94,    0,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   10,   -1,   -1,   -1,   -1,   -1, 
+          282,   91,   -1,   93,   94,   -1,   -1,   -1,    0,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,   -1,   -1,  322,   -1,  324, 
-           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
-          306,   47,  308,  309,  310,  311,  312,   -1,   -1,   -1, 
-           -1,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,  328,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,  342,   -1,   -1,   -1, 
-           -1,   -1,  348,   -1,   -1,   -1,  352,   93,   94,   -1, 
-            0,  357,  358,  359,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   -1,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   94,   -1, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,  282,  283,   93,   94,   -1,   -1,   -1,  124,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,  370,   -1, 
+           -1,   -1,   -1,   -1,  279,  280,  281,  282,  283,   91, 
+           -1,   93,   94,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,  124,  125,   -1,   -1,   -1,   -1, 
-           -1,  322,   10,  324,   -1,   -1,   -1,   -1,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1, 
-          351,   10,   -1,   41,   -1,  356,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,  370, 
-           -1,   59,  373,  279,   -1,  281,  282,  283,   -1,   38, 
-           -1,   40,   -1,   42,   -1,  291,  292,   46,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           59,   -1,   61,   -1,   -1,   93,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,  125,   -1,  345, 
-          346,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
-          356,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           -1,  271,   -1,   -1,  370,   -1,   -1,  373,   -1,  279, 
+           -1,   -1,  124,  125,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,  347,  348,   -1,   -1,  351,   -1,   -1,   -1, 
+           -1,  356,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279, 
            -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-           -1,  337,  338,   -1,   -1,   -1,    0,   -1,   -1,  345, 
-          346,   -1,  322,   -1,  324,   -1,   10,   -1,   -1,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1, 
-           -1,  351,   -1,   37,   38,   -1,  356,   41,   42,   43, 
-           44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-          370,   -1,   -1,  373,   58,   59,   60,   -1,   62,   63, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,   -1,   -1,   -1,   -1,   -1,   93, 
-           94,    0,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   -1,  322,   -1,  324,   -1,   37,   38, 
-           -1,   -1,   41,   42,   43,   44,   45,  306,   47,  308, 
-          309,  310,  311,  312,   -1,   -1,   -1,   -1,   -1,   58, 
-           59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1,  328, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,  342,   -1,   -1,   -1,   -1,   -1,  348, 
-           -1,   -1,   -1,  352,   93,   94,   -1,    0,  357,  358, 
-          359,   -1,   -1,   -1,   -1,   -1,   -1,   10,   37,   38, 
-           -1,   -1,   -1,   42,   43,   -1,   45,   -1,   47,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
-           -1,   60,   -1,   62,   37,   38,   -1,   -1,   41,   42, 
-           43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62, 
-           63,   -1,   -1,   -1,   -1,   94,   -1,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283, 
-           93,   94,   -1,   -1,   -1,  124,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,  124,  125,   -1,   -1,   -1,   -1,   -1,  322,   10, 
-          324,   -1,   -1,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1,   -1, 
-           41,    0,  356,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   10,  271,   -1,   -1,   -1,  370,   -1,   59,  373, 
-          279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,   -1, 
-           -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1, 
-           -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           59,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328, 
-          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
-          339,  340,   -1,   -1,  125,   -1,  345,  346,   -1,   -1, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
-           -1,  370,   -1,   -1,  373,   -1,  279,   -1,  281,  282, 
-          283,   -1,   -1,   -1,   -1,   -1,  125,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,   -1,   -1,   -1,   -1,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,    0,   -1,   -1,  345,  346,   -1,  322, 
-           -1,  324,   -1,   10,   -1,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-           -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1, 
-           37,   38,   -1,  356,   41,   42,   43,   44,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
-          373,   58,   59,   -1,   -1,   -1,   63,   -1,   -1,   -1, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,   -1,   -1,   -1,   -1,   -1,   93,   94,    0,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   10,   -1, 
-           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-          279,  322,   -1,  324,   -1,   -1,   38,   -1,   -1,   41, 
-           -1,   43,   44,   45,   -1,  294,  295,  296,  297,  298, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  370, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   93,   94,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  351,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  370,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   38,   -1,   -1,   41,   -1,   43,   44,   45, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,  281,  282,  283,   93,   94,   -1, 
-           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
-           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
-           -1,  328,  329,  330,  331,  332,   -1,   -1,  335,  336, 
-          337,  338,  339,  340,   -1,    0,   -1,   -1,  345,  346, 
-           -1,   -1,   -1,   -1,  351,   10,   -1,   -1,   -1,  356, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,  322,   -1,  324,   -1,   -1,   10,  328,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
+           -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   41,   -1, 
           262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   41,   -1,   -1,  291, 
+          370,   -1,   -1,  373,   -1,   -1,   59,  279,   -1,  281, 
+          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
           292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
+           93,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   10,   -1,  328,  329,  330,  331, 
           332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   -1,   -1,  356,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,   -1,  370,   -1, 
-          125,  373,   -1,  279,   -1,  281,  282,  283,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   38,   -1,   -1,   41,  345, 
-          346,   44,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
-          356,   -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62, 
-           63,   -1,   -1,   -1,  370,   -1,   -1,  373,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  125,  345,  346,  347,  348,   -1,   -1,  351, 
+           -1,   37,   38,   -1,  356,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
+           -1,  373,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           93,   94,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,  124,  125,   -1,  279,   -1,   -1,   -1,   -1,   -1, 
-           38,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           58,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   93,   94,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
+           -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,  124,  125,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   38,   -1,   -1,   41, 
-           -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1, 
+           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
           263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
-          283,   93,   94,   -1,   -1,   -1,   -1,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           91,   -1,   93,   94,   -1,   -1,   -1,    0,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   10,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-           -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1, 
-           10,   -1,   -1,  356,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1,   -1, 
-          373,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   94,   -1,   -1,  345,  346,   -1, 
-           -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,  370,   -1,   -1,  373,   -1,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
+           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
+           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,  370,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,  283,   91,   -1, 
+           93,   94,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   41, 
-           -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   -1,   -1,  356,   -1,   58,   59,   60,   -1, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-           -1,   93,   94,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,  347,  348,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+          356,  262,  263,  264,   -1,    0,  267,  268,  269,   -1, 
+          271,   -1,   -1,   -1,  370,   10,   -1,  373,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44, 
+           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   59,   10,   -1,  328,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   41,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,  370, 
+           -1,   -1,  373,   -1,   59,   -1,  279,   -1,  281,  282, 
+          283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+          125,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   -1,   10,   -1,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+          125,   -1,  345,  346,  347,  348,   -1,   -1,  351,   -1, 
+           37,   38,   -1,  356,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+          373,   58,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   41,   -1,   -1,   44,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  287,  288,  289, 
-          290,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,   -1,  303,  304,  305,  306,   -1,   -1,   -1, 
-          310,   -1,   -1,  313,  314,  315,  316,  317,   -1,   -1, 
-           -1,   -1,   -1,  323,   -1,   -1,   -1,   93,   94,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,   -1,  354,  355,   -1,  357,  124,  125, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
-           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   91,   -1,   93,   94,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,  124,  125,   -1, 
+           -1,   -1,   -1,   -1,  279,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   58,   59,   60,   -1, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,  322,   -1,  324, 
+           -1,   -1,   -1,   -1,  279,   -1,  281,  282,   -1,   91, 
+           -1,   93,   94,   -1,    0,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   10,   -1,  351,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,  125,   -1,  370,   -1,  322,   -1,  324, 
+           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,  370,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,   -1,  281,  282,  283,   93,   94,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,  322,   10,  324,   -1,   -1, 
+           -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
+          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
+          347,  348,   -1,   -1,  351,   10,   -1,   41,   -1,  356, 
           262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   93,   -1,   -1,   -1,   -1,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,    0,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1, 
-           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  370,   -1,   59,  373,  279,   -1,  281, 
+          282,  283,   -1,   38,   -1,   40,   -1,   42,   -1,  291, 
+          292,   46,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59,   -1,   61,   -1,   -1,   93, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
           332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   41,   -1,   -1,   44,  262,  263,  264,  351, 
-           -1,  267,  268,  269,  356,  271,   -1,   -1,   -1,   58, 
-           59,   -1,   -1,  279,   63,  281,  282,  283,  370,   -1, 
-           -1,  373,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+           -1,  125,   -1,  345,  346,  347,  348,   -1,   -1,  351, 
+           -1,   -1,   -1,   -1,  356,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,  370,   -1, 
+           -1,  373,   -1,  279,   -1,  281,  282,  283,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
           296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,  125,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   10,   -1, 
-          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1, 
-          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
-          291,  292,   44,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          351,   -1,   -1,   -1,   -1,  356,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,  370, 
-           -1,   -1,  373,  125,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          279,   -1,  281,  282,  283,   -1,   41,   -1,   -1,   44, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   -1,   -1,   58,   59,   -1,   -1,   -1,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  335,  336,   93,   -1, 
-          339,  340,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
-           -1,   -1,  351,   -1,   -1,   10,   -1,  356,   -1,   -1, 
+            0,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           10,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,   -1,   -1,   -1,   -1,  351,   -1,   37,   38,   -1, 
+          356,   41,   42,   43,   44,   45,   -1,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   58,   59, 
+           60,   -1,   62,   63,   -1,   -1,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,   -1, 
+           -1,   -1,   -1,   93,   94,    0,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,  322,   -1, 
+          324,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,  306,   47,  308,  309,  310,  311,  312,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   -1,   62,   63,   -1, 
+           -1,   -1,  356,  328,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  370,  342,   -1,   -1, 
+           -1,   -1,   -1,  348,   -1,   -1,   -1,  352,   93,   94, 
+           -1,    0,  357,  358,  359,   -1,   -1,   -1,   -1,   -1, 
+           -1,   10,   37,   38,   -1,   -1,   -1,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,   60,   -1,   62,   37,   38, 
+           -1,   -1,   41,   42,   43,   44,   45,   -1,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58, 
+           59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1,   94, 
+           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
+           -1,  281,  282,  283,   93,   94,   -1,   -1,   -1,  124, 
+           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          125,  370,   -1,   -1,  373,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,   58,   59,   -1,   -1,  279,   63,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
-           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   10,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-          125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   41,   -1,  356,   44,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   58, 
-           59,  373,   -1,   -1,   63,   -1,   -1,  262,  263,  264, 
+           -1,   -1,   -1,    0,   -1,  124,  125,   -1,   -1,   -1, 
+           -1,   -1,  322,   10,  324,   -1,   -1,   -1,   -1,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1, 
+           -1,  351,   10,   -1,   41,   -1,  356,  262,  263,  264, 
            -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283,   -1, 
-           -1,   -1,   -1,   -1,   93,   -1,  291,  292,   -1,  294, 
+          370,   -1,   59,  373,  279,   -1,  281,  282,  283,   -1, 
+           38,   -1,   40,   -1,   42,   -1,  291,  292,   46,  294, 
           295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,  125,  322,   -1,  324, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          335,  336,   -1,   -1,  339,  340,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
-           -1,  356,   -1,   41,   -1,   -1,   44,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,  370,  271,   -1,  373,   -1, 
-           58,   59,   -1,   -1,  279,   63,  281,  282,  283,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   10,   -1, 
+           -1,   59,   -1,   61,   -1,   -1,   93,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          335,  336,   -1,   -1,  339,  340,   -1,  125,   -1,   41, 
-           -1,   -1,   44,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
-           -1,  356,   -1,  262,  263,  264,   58,   59,  267,  268, 
-          269,   63,  271,   -1,   -1,  370,   -1,   -1,  373,   -1, 
+           -1,   -1,   -1,   -1,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,  125,   -1, 
+          345,  346,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
+           -1,  356,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   -1,   -1,  370,   -1,   -1,  373,   -1, 
           279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   93,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   10,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  125,   -1,   -1,  335,  336,   -1,   -1, 
-          339,  340,   -1,   -1,   41,   -1,   38,   44,   40,   -1, 
-           42,   -1,  351,   -1,   46,   -1,   -1,  356,   -1,   -1, 
-           -1,   58,   59,   -1,   -1,   -1,   63,   59,   -1,   61, 
-           -1,  370,   -1,   -1,  373,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   93,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,    0,   -1,   -1,  125,   -1, 
-           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  335,  336,   -1, 
-           -1,  339,  340,   -1,   -1,   -1,   41,   -1,   -1,   44, 
-          262,  263,  264,  351,   -1,  267,  268,  269,  356,  271, 
-           -1,   -1,   -1,   58,   59,   -1,   -1,  279,   63,  281, 
-          282,  283,  370,   -1,   -1,  373,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,   -1,  337,  338,   -1,   -1,   -1,    0,   -1,   -1, 
+          345,  346,   -1,  322,   -1,  324,   -1,   10,   -1,   -1, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1, 
+           -1,   -1,  351,   -1,   37,   38,   -1,  356,   41,   42, 
+           43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,  370,   -1,   -1,  373,   58,   59,   60,   -1,   62, 
+           63,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,   -1,  281,  282,   -1,   -1,   -1,   -1, 
+           93,   94,    0,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,   -1,   -1,  322,   -1,  324,   -1,   37, 
+           38,   -1,   -1,   41,   42,   43,   44,   45,  306,   47, 
+          308,  309,  310,  311,  312,   -1,   -1,   -1,   -1,   -1, 
+           58,   59,   60,   -1,   62,   63,   -1,   -1,   -1,  356, 
+          328,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  370,  342,   -1,   -1,   -1,   -1,   -1, 
+          348,   -1,   -1,   -1,  352,   93,   94,   -1,    0,  357, 
+          358,  359,   -1,   -1,   -1,   -1,   -1,   -1,   10,   37, 
+           38,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,   47, 
+           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
+           -1,   -1,   60,   -1,   62,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
+           62,   63,   -1,   -1,   -1,   -1,   94,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
+          283,   93,   94,   -1,   -1,   -1,  124,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  335,  336,   -1,   -1,  339,  340,   -1, 
-          125,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   10,   -1,  356,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,  279,   -1,  281,  282,  283,   -1,   -1,   -1, 
-           -1,   -1,   -1,   41,  291,  292,   44,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           58,   59,   -1,   -1,  306,   63,  308,  309,  310,  311, 
-          312,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  328,   -1,   -1,  336, 
-           -1,   -1,  339,  340,   -1,   93,   -1,   -1,   -1,   -1, 
-          342,   -1,   -1,   -1,  351,   -1,  348,   -1,   -1,  356, 
-          352,   -1,   -1,   -1,   -1,  357,  358,  359,    0,   -1, 
-           -1,   -1,   -1,  370,   -1,   -1,  373,  125,   10,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283,   41, 
-           -1,   -1,   44,   -1,   -1,    0,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   10,   58,   59,   -1,   -1, 
-           -1,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44, 
-           -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   58,   59,   -1,  351,   -1,   63,   -1, 
-           -1,  356,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  125,   -1,  370,   -1,   -1,  373,   -1, 
-           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
-           -1,   10,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
-          125,   -1,   41,  291,  292,   44,  294,  295,  296,  297, 
-          298,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58, 
-           59,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+            0,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1,  322, 
+           10,  324,   -1,   -1,   -1,   -1,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351,   10, 
+           -1,   41,   -1,  356,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1,   59, 
+          373,  279,   -1,  281,  282,  283,   -1,   38,   -1,   40, 
+           -1,   42,   -1,  291,  292,   46,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1, 
+           61,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   41,   -1,   93,   44,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   58, 
-           59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   -1,   -1,  373,  125,   -1,   -1,   -1, 
+           -1,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,   -1,   -1,  125,   -1,  345,  346,   -1, 
+           -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
           262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,   -1,   93,   -1,   -1,  279,   -1,  281, 
+           -1,   -1,  370,   -1,   -1,  373,   -1,  279,   -1,  281, 
           282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
           292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  125,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,    0,  271,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,  279,   10,  281,  282,  283,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   -1,   -1,  356,   -1,   41,   -1,   -1,   44, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,  370,  324, 
-           -1,  373,   -1,   58,   59,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  262,  263,  264,  351,   -1,  267,  268, 
-          269,  356,  271,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
-          279,   -1,  281,  282,  283,  370,   -1,   -1,  373,   -1, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+          328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337, 
+          338,   -1,   -1,   -1,    0,   -1,   -1,  345,  346,   -1, 
+          322,   -1,  324,   -1,   10,   -1,   -1,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
+           -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351, 
+           -1,   37,   38,   -1,  356,   41,   42,   43,   44,   45, 
+           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
+           -1,  373,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
+           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
+           -1,  281,  282,   -1,   -1,   -1,   -1,   93,   94,    0, 
+           -1,  291,  292,   -1,  294,  295,  296,  297,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          125,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,    0,  271,  322,   -1,  324,   -1,   -1,   -1,   -1, 
-          279,   10,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   -1, 
-           -1,   -1,   41,   -1,   -1,   44,   -1,   -1,    0,   -1, 
-           -1,  370,   -1,  322,  373,  324,   -1,   -1,   10,   58, 
-           59,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,  322,   -1,  324,   -1,   37,   38,   -1,   -1, 
+           41,   42,   43,   44,   45,  306,   47,  308,  309,  310, 
+          311,  312,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,  356,  328,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   41, 
-           -1,   38,   44,   40,   93,   42,   -1,   -1,   -1,   46, 
-           -1,  370,   -1,   -1,  373,   -1,   58,   59,   -1,   -1, 
-           -1,   -1,   59,   -1,   61,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  125,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   93,   -1,   -1,  279,   -1,  281,  282,  283,   -1, 
+          370,  342,   -1,   -1,   -1,   -1,   -1,  348,   -1,   -1, 
+           -1,  352,   93,   94,   -1,    0,  357,  358,  359,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   -1,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,  283,   93,   94, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,   -1,  322,   10,  324,   -1, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,   -1,   -1,   -1,   -1,  351,   -1,   -1,   41,   -1, 
+          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   10,   -1,   -1,  370,   -1,   59,  373,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,   -1,   -1,   38, 
+           -1,   40,   -1,   42,   -1,   -1,   -1,   46,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           59,  322,   61,  324,   -1,   -1,   -1,  328,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,  125,   -1,  345,  346,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,  370, 
+           -1,   -1,  373,   -1,  279,   -1,  281,  282,  283,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   10,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,   38,   -1,   -1,   41,  351,   43,   44,   45, 
+           -1,  356,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   58,   59,   60,  370,   62,   63,  373,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
+          263,  264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   93,   94,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   38,   -1,  322, 
+           41,  324,   43,   44,   45,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,   -1,  306,   -1,  308, 
+          309,  310,  311,  312,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,  328, 
+           -1,   -1,   93,   94,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  342,   -1,   10,   -1,   -1,   -1,  348, 
+           -1,   -1,   -1,  352,   -1,   -1,   -1,   -1,  357,  358, 
+          359,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   38,   -1,   -1,   41,   -1,   -1,   44, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   -1,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,  283,   93,   94, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,   -1,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,    0,   -1,   -1,  345, 
+          346,   -1,   -1,   -1,   -1,  351,   10,   -1,   -1,   -1, 
+          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   41,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,  370, 
+           -1,  125,  373,   -1,  279,   -1,  281,  282,  283,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,    0,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  125,   -1,   10,   -1,   -1,   -1,   -1, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1, 
-           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
-           45,   46,   47,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
-           -1,  356,   -1,   -1,   59,   60,   -1,   62,   63,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   -1, 
+           -1,   -1,   -1,   -1,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   38,   -1,   -1,   41, 
+          345,  346,   44,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
+           -1,  356,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
+           62,   63,   -1,   -1,   -1,  370,   -1,   -1,  373,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94, 
-           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          279,   -1,  281,  282,  283,   -1,   -1,   -1,  123,  124, 
-          125,  126,  291,  292,   -1,  294,  295,  296,  297,  298, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,  306, 
-           -1,  308,  309,  310,  311,  312,   -1,   -1,   -1,   -1, 
-          322,  370,  324,   -1,  373,   -1,   -1,   -1,   -1,   -1, 
-           -1,  328,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  342,   -1,   -1,   -1,  351, 
-           -1,  348,   -1,   -1,  356,  352,   -1,   -1,   -1,   -1, 
-          357,  358,  359,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,  257,  258,  259,   -1,  261,  262,  263,  264, 
-          265,  266,  267,  268,  269,  270,  271,  272,  273,  274, 
-          275,  276,  277,  278,  279,  280,  281,  282,   -1,  284, 
-          285,  286,  287,  288,  289,  290,  291,  292,  293,  294, 
-          295,  296,  297,  298,   -1,  300,   -1,   -1,  303,  304, 
-          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
-          315,  316,  317,  318,  319,   -1,   -1,  322,  323,  324, 
-           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
-          335,  336,  337,  338,  339,  340,  341,  342,   -1,   -1, 
-          345,  346,  347,  348,  349,   -1,  351,  352,  353,  354, 
-          355,  356,  357,  358,  359,  360,  361,  362,  363,  364, 
-          365,  366,    0,  368,  369,  370,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   93,   94,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,  262,  263, 
+          264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,  124,  125,   -1,  279,   -1,   -1,   -1,   -1, 
+           -1,   38,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1, 
+          294,  295,  296,  297,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   58,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   94,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  370,  124,  125,   -1, 
+           41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   93,   94,   -1,   -1,   -1,  279,   -1,  281, 
+          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   91,   -1,   93,   94,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
+           -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351, 
+           10,   -1,   -1,   -1,  356,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1, 
+           -1,  373,  279,   -1,  281,  282,  283,   -1,   38,   -1, 
+           40,   -1,   42,   -1,  291,  292,   46,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
+           -1,   61,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,  329,  330,  331,  332,  333,  334,  335,  336, 
+          337,  338,  339,  340,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  262,  263,  264,  351,   -1,  267,  268,  269,  356, 
+          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
+          281,  282,  283,  370,   -1,   -1,  373,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126,   10, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   93,   94,   -1,   10,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  124,  125,   -1,   41,   -1,   -1,   44, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   -1,   62,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  306,   -1,  308,  309, 
+          310,  311,  312,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+            0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  328,   -1, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  342,   -1,   -1,   -1,   -1,   -1,  348,   -1, 
+          125,   -1,  352,   -1,   -1,   -1,   -1,  357,  358,  359, 
+           -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
+           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   -1,   -1,   93,   -1,   -1,   -1,   -1,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,    0,   -1,   -1,  125,   -1,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,   -1,   41,   -1,   -1,   44,  262,  263,  264, 
+          351,   -1,  267,  268,  269,  356,  271,   -1,   -1,   -1, 
+           58,   59,   -1,   -1,  279,   63,  281,  282,  283,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,   -1,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,  125,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   10, 
+           -1,  356,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279, 
+           -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1, 
+           41,  291,  292,   44,  294,  295,  296,  297,  298,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   -1, 
+           -1,   -1,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
+          370,   -1,   -1,  373,  125,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  279,   -1,  281,  282,  283,   -1,   41,   -1,   -1, 
+           44,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   58,   59,   -1,   -1,   -1,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,  126,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,  262,  263,  264,  265,  266,  267, 
-          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
-          278,  279,  280,  281,  282,   -1,  284,  285,  286,  287, 
-          288,  289,  290,  291,  292,  293,  294,  295,  296,  297, 
-          298,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,  322,  323,  324,   -1,  326,  327, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,  341,  342,   -1,   -1,  345,  346,  347, 
-          348,  349,   -1,  351,  352,  353,  354,  355,  356,  357, 
-          358,  359,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,  370,   -1,   -1,   -1,  257,  258,  259,   -1, 
-          261,  262,  263,  264,  265,  266,  267,  268,  269,  270, 
-          271,  272,  273,  274,  275,  276,  277,  278,  279,   -1, 
-          281,  282,   -1,  284,  285,  286,  287,  288,  289,  290, 
-          291,  292,  293,  294,  295,  296,  297,  298,   -1,  300, 
-           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
-          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
-           -1,  322,  323,  324,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-          341,  342,   -1,   -1,  345,  346,  347,  348,  349,   -1, 
-          351,  352,  353,  354,  355,  356,  357,  358,  359,  360, 
-          361,  362,  363,  364,  365,  366,    0,  368,  369,  370, 
-           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
-           -1,   -1,   -1,   37,   38,   -1,   40,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1, 
-           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  123, 
-          124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
-           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,  262,  263, 
-          264,  265,  266,   -1,  268,  269,  270,  271,  272,  273, 
-          274,  275,  276,  277,  278,  279,  280,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
-          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
-           -1,  345,  346,  347,  348,  349,  350,  351,  352,  353, 
-          354,  355,   -1,  357,  358,  359,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,  370,   -1,   -1,   -1, 
-          257,  258,  259,   -1,  261,  262,  263,  264,  265,  266, 
-           -1,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
-          277,  278,  279,  280,   -1,   -1,   -1,  284,  285,  286, 
-          287,  288,  289,  290,  291,  292,  293,  294,  295,  296, 
-          297,  298,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
-          307,  308,  309,  310,  311,  312,  313,  314,  315,  316, 
-          317,  318,  319,   -1,   -1,  322,  323,  324,   -1,  326, 
-          327,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,  341,  342,   -1,   -1,  345,  346, 
-          347,  348,  349,  350,  351,  352,  353,  354,  355,   -1, 
-          357,  358,  359,  360,  361,  362,  363,  364,  365,  366, 
-            0,  368,  369,  370,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,  126,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           33,   -1,   -1,   -1,   37,   38,   -1,   40,   41,   42, 
-           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62, 
-           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
-           -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  335,  336,   93, 
+           -1,  339,  340,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
+           -1,   -1,   -1,  351,   -1,   -1,   10,   -1,  356,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  125,  370,   -1,   -1,  373,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1, 
+           44,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   -1,   -1,   -1,   58,   59,   -1,   -1,  279,   63, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93, 
+           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   10,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  335,  336,   -1,   -1,  339,  340, 
+           -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   41,   -1,  356,   44,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
+           58,   59,  373,   -1,   -1,   63,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283, 
+           -1,   -1,   -1,   -1,   -1,   93,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          123,  124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259, 
-           -1,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
-          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
-           -1,  281,  282,   -1,  284,  285,  286,  287,  288,  289, 
-          290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
-           -1,  351,  352,  353,  354,  355,  356,  357,  358,  359, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-          370,   -1,   -1,   -1,  257,  258,  259,   -1,  261,  262, 
-          263,  264,  265,  266,   -1,  268,  269,  270,  271,  272, 
-          273,  274,  275,  276,  277,  278,  279,  280,   -1,   -1, 
-           -1,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
-          293,  294,  295,  296,  297,  298,   -1,  300,   -1,   -1, 
-          303,  304,  305,  306,  307,  308,  309,  310,  311,  312, 
-          313,  314,  315,  316,  317,  318,  319,   -1,   -1,  322, 
-          323,  324,   -1,  326,  327,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,  341,  342, 
-           -1,   -1,  345,  346,  347,  348,  349,   -1,  351,  352, 
-          353,  354,  355,   -1,  357,  358,  359,  360,  361,  362, 
-          363,  364,  365,  366,    0,  368,  369,  370,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,  125,  322,   -1, 
+          324,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  335,  336,   -1,   -1,  339,  340,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  351,   -1,   -1, 
+           -1,   -1,  356,   -1,   41,   -1,   -1,   44,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,  370,  271,   -1,  373, 
+           -1,   58,   59,   -1,   -1,  279,   63,  281,  282,  283, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   10, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  335,  336,   -1,   -1,  339,  340,   -1,  125,   -1, 
+           41,   -1,   -1,   44,   -1,   -1,   -1,  351,   -1,   -1, 
+           -1,   -1,  356,   -1,  262,  263,  264,   58,   59,  267, 
+          268,  269,   63,  271,   -1,   -1,  370,   -1,   -1,  373, 
+           -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   93,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  125,   -1,   -1,  335,  336,   -1, 
+           -1,  339,  340,   -1,   -1,   41,   -1,   -1,   44,   -1, 
+           -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
+           -1,   -1,   58,   59,   -1,   -1,   -1,   63,   -1,   -1, 
+           -1,   -1,  370,   -1,   -1,  373,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   93,   -1,   -1, 
+           -1,   -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,    0,   -1,   -1,   -1,   -1,   -1,  125, 
+           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  336, 
+           -1,   -1,  339,  340,   41,   -1,   -1,   44,   -1,   -1, 
+           -1,  262,  263,  264,  351,   -1,  267,  268,  269,  356, 
+          271,   58,   59,   -1,   -1,   -1,   63,   -1,  279,   -1, 
+          281,  282,  283,  370,   -1,   -1,  373,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+          351,   -1,   44,   -1,   -1,  356,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   58,   59,   -1,  370, 
+           -1,   63,  373,  279,   -1,  281,  282,  283,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
+           -1,   93,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   40,   41,   42,   43,   44,   45, 
-           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1, 
-      };
-   }
-
-   private static final int[] yyCheck3() {
-      return new int[] {
-
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,  123,  124,  125,  126,   10,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
-           -1,   -1,   -1,   37,   38,   -1,   40,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
+           -1,   -1,   -1,  125,   -1,   41,   -1,   -1,   44,   -1, 
+           -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+          356,   -1,   58,   59,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   93,   -1,    0, 
+           -1,   -1,  279,   -1,  281,  282,  283,   -1,   -1,   10, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           41,   -1,   -1,   44,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1, 
-           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   93,  370,   -1,   -1,  373,  279,   -1,  281, 
+          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123, 
-          124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,   -1, 
-          261,  262,  263,  264,  265,  266,   -1,  268,  269,  270, 
-          271,  272,  273,  274,  275,  276,  277,  278,  279,  280, 
-           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
-          291,  292,  293,  294,  295,  296,  297,  298,   -1,  300, 
-           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
-          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
-           -1,  322,  323,  324,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-          341,  342,   -1,   -1,  345,  346,  347,  348,  349,   -1, 
-          351,  352,  353,  354,  355,   -1,  357,  358,  359,  360, 
-          361,  362,  363,  364,  365,  366,   -1,  368,  369,  370, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,  262,  263, 
-          264,  265,  266,   -1,  268,  269,  270,  271,  272,  273, 
-          274,  275,  276,  277,  278,  279,  280,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
-          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
-           -1,  345,  346,  347,  348,  349,   -1,  351,  352,  353, 
-          354,  355,   -1,  357,  358,  359,  360,  361,  362,  363, 
-          364,  365,  366,    0,  368,  369,  370,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+           -1,   -1,   44,   -1,   -1,   -1,  262,  263,  264,  351, 
+           -1,  267,  268,  269,  356,  271,   58,   59,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,  283,  370,   -1, 
+           -1,  373,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   93,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   10,   -1,   -1,  322,   -1,  324,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
-           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
+           -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   41,  351,   -1,   44,   -1,   -1, 
+          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   58,   59,   -1,  370,   -1,   -1,  373,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1, 
+           41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,   58,   59,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   93,   -1,   -1,   -1,   -1,  279,   -1,  281, 
+          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  351, 
+           -1,   -1,   -1,   -1,  356,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,    0,  271,   -1,   -1,   -1,  370,   -1, 
+           -1,  373,  279,   10,  281,  282,  283,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
+           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  262,  263,  264,  351,   -1,  267,  268,  269,  356, 
+          271,   -1,   -1,   -1,   91,   -1,   93,   94,  279,   -1, 
+          281,  282,  283,  370,   -1,   -1,  373,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,   -1,   -1,   -1, 
             0,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
            10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
-           40,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
-           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,   -1,   -1,   59, 
+           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1, 
+           -1,   91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,  123,  124,  125,  126,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           257,  258,  259,   -1,  261,  262,  263,  264,  265,  266, 
-           -1,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
-          277,  278,  279,  280,   -1,   -1,   -1,  284,  285,  286, 
+          267,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
+          277,  278,  279,  280,  281,  282,   -1,  284,  285,  286, 
           287,  288,  289,  290,  291,  292,  293,  294,  295,  296, 
           297,  298,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
           307,  308,  309,  310,  311,  312,  313,  314,  315,  316, 
           317,  318,  319,   -1,   -1,  322,  323,  324,   -1,  326, 
           327,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
           337,  338,  339,  340,  341,  342,   -1,   -1,  345,  346, 
-          347,  348,  349,   -1,  351,  352,  353,  354,  355,   -1, 
+          347,  348,  349,   -1,  351,  352,  353,  354,  355,  356, 
           357,  358,  359,  360,  361,  362,  363,  364,  365,  366, 
            -1,  368,  369,  370,   -1,   -1,   -1,  257,  258,  259, 
-           -1,  261,  262,  263,  264,  265,  266,   -1,  268,  269, 
+           -1,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
           270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
-          280,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
+          280,  281,  282,   -1,  284,  285,  286,  287,  288,  289, 
           290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
           300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
           310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
            -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
           330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
           340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
-           -1,  351,  352,  353,  354,  355,   -1,  357,  358,  359, 
+           -1,  351,  352,  353,  354,  355,  356,  357,  358,  359, 
           360,  361,  362,  363,  364,  365,  366,    0,  368,  369, 
           370,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
@@ -5167,10 +5066,10 @@ private static final int[] yyCheck3() {
            63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
-           -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           93,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-          123,  124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
            -1,   37,   38,   -1,   40,   41,   42,   43,   44,   45, 
@@ -5181,11 +5080,11 @@ private static final int[] yyCheck3() {
            -1,   -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125, 
           126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261,  262, 
-          263,  264,  265,  266,   -1,  268,  269,  270,  271,  272, 
-          273,  274,  275,  276,  277,  278,  279,  280,   -1,   -1, 
+          263,  264,  265,  266,  267,  268,  269,  270,  271,  272, 
+          273,  274,  275,  276,  277,  278,  279,   -1,  281,  282, 
            -1,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
           293,  294,  295,  296,  297,  298,   -1,  300,   -1,   -1, 
           303,  304,  305,  306,  307,  308,  309,  310,  311,  312, 
@@ -5193,18 +5092,18 @@ private static final int[] yyCheck3() {
           323,  324,   -1,  326,  327,  328,  329,  330,  331,  332, 
           333,  334,  335,  336,  337,  338,  339,  340,  341,  342, 
            -1,   -1,  345,  346,  347,  348,  349,   -1,  351,  352, 
-          353,  354,  355,   -1,  357,  358,  359,  360,  361,  362, 
+          353,  354,  355,  356,  357,  358,  359,  360,  361,  362, 
           363,  364,  365,  366,   -1,  368,  369,  370,   -1,   -1, 
            -1,  257,  258,  259,   -1,  261,  262,  263,  264,  265, 
           266,   -1,  268,  269,  270,  271,  272,  273,  274,  275, 
-          276,  277,  278,  279,   -1,   -1,   -1,   -1,  284,  285, 
+          276,  277,  278,  279,  280,   -1,   -1,   -1,  284,  285, 
           286,  287,  288,  289,  290,  291,  292,  293,  294,  295, 
           296,  297,  298,   -1,  300,   -1,   -1,  303,  304,  305, 
           306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,  322,  323,  324,   94, 
+          316,  317,  318,  319,   -1,   -1,  322,  323,  324,   -1, 
           326,  327,  328,  329,  330,  331,  332,  333,  334,  335, 
           336,  337,  338,  339,  340,  341,  342,   -1,   -1,  345, 
-          346,  347,  348,  349,   -1,  351,  352,  353,  354,  355, 
+          346,  347,  348,  349,  350,  351,  352,  353,  354,  355, 
            -1,  357,  358,  359,  360,  361,  362,  363,  364,  365, 
           366,    0,  368,  369,  370,   -1,   -1,   -1,   -1,   -1, 
            -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
@@ -5218,1055 +5117,1349 @@ private static final int[] yyCheck3() {
            -1,   -1,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,  125,  126,   10,   -1, 
+           -1,   -1,   -1,   -1,  123,  124,  125,  126,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   33,  287,  288,  289,  290,   -1,   -1,   -1,   41, 
-           -1,   -1,   -1,   -1,   46,   -1,   -1,   -1,  303,  304, 
-          305,  306,   -1,   -1,   -1,  310,   -1,   59,  313,  314, 
-          315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,   -1, 
+           -1,   33,   -1,   -1,   -1,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
-           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,   -1,  354, 
-          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1,   -1, 
-           -1,  123,   -1,  125,  126,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91, 
+           -1,   93,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,  125,  126,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258, 
           259,   -1,  261,  262,  263,  264,  265,  266,   -1,  268, 
           269,  270,  271,  272,  273,  274,  275,  276,  277,  278, 
-          279,   -1,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          279,  280,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
           289,  290,  291,  292,  293,  294,  295,  296,  297,  298, 
            -1,  300,   -1,   -1,  303,  304,  305,  306,  307,  308, 
           309,  310,  311,  312,  313,  314,  315,  316,  317,  318, 
           319,   -1,   -1,  322,  323,  324,   -1,  326,  327,  328, 
           329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
           339,  340,  341,  342,   -1,   -1,  345,  346,  347,  348, 
-          349,   -1,  351,  352,  353,  354,  355,   -1,  357,  358, 
+          349,  350,  351,  352,  353,  354,  355,   -1,  357,  358, 
           359,  360,  361,  362,  363,  364,  365,  366,   -1,  368, 
           369,  370,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
           262,  263,  264,  265,  266,  267,  268,  269,  270,  271, 
-          272,  273,  274,  275,  276,  277,  278,  279,  280,  281, 
-           -1,   -1,  284,  285,  286,  287,  288,  289,  290,  291, 
+          272,  273,  274,  275,  276,  277,  278,  279,   -1,  281, 
+          282,   -1,  284,  285,  286,  287,  288,  289,  290,  291, 
           292,  293,  294,  295,  296,  297,  298,   -1,  300,   -1, 
            -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
           312,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-          322,  323,  324,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   10,   -1,   -1,  347,  348,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,  358,  359,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,  370,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
+          322,  323,  324,   -1,  326,  327,  328,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,  341, 
+          342,   -1,   -1,  345,  346,  347,  348,  349,   -1,  351, 
+          352,  353,  354,  355,  356,  357,  358,  359,  360,  361, 
+          362,  363,  364,  365,  366,    0,  368,  369,  370,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1, 
+           -1,   -1,   37,   38,   -1,   40,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59,   60,   61,   62,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   91,   -1,   93,   94,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1,   94, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  123,  124, 
+          125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37, 
+           38,   -1,   40,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   91,   -1,   93,   94,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
+           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   62,   63, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,  282,   -1,   -1,   91,   -1,   93, 
-           94,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,  262,  263,  264,   -1,  356,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,  370,  281,  282,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   91,   -1,   -1,   94,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
-          264,   -1,  370,  267,  268,  269,   -1,  271,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   10,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,  347,  348,   -1,   -1,  351,   -1,   37, 
-           38,   -1,  356,   41,   42,   43,   44,   45,   46,   47, 
-           -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,   -1, 
-           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,  262,  263,  264, 
+          265,  266,   -1,  268,  269,  270,  271,  272,  273,  274, 
+          275,  276,  277,  278,  279,  280,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,  291,  292,  293,  294, 
+          295,  296,  297,  298,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,  322,  323,  324, 
+           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,  341,  342,   -1,   -1, 
+          345,  346,  347,  348,  349,   -1,  351,  352,  353,  354, 
+          355,   -1,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  370,   -1,   -1,   -1,  257, 
+          258,  259,   -1,  261,  262,  263,  264,  265,  266,   -1, 
+          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
+          278,  279,  280,   -1,   -1,   -1,  284,  285,  286,  287, 
+          288,  289,  290,  291,  292,  293,  294,  295,  296,  297, 
+          298,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
+          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
+          318,  319,   -1,   -1,  322,  323,  324,   -1,  326,  327, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,  341,  342,   -1,   -1,  345,  346,  347, 
+          348,  349,   -1,  351,  352,  353,  354,  355,   -1,  357, 
+          358,  359,  360,  361,  362,  363,  364,  365,  366,    0, 
+          368,  369,  370,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   91,    0,   -1,   94,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  123,  124,  125,   -1,   -1, 
-           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
-           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
+           -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40, 
+           41,   42,   43, 
+      };
+   }
+
+   private static final int[] yyCheck3() {
+      return new int[] {
+
+           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,    0,   91,   -1,   -1,   94,   -1, 
-           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1, 
+           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125, 
-           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
-           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  123, 
+          124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   -1,  271,   -1,   91,   -1,   -1,   94,   -1, 
-           -1,  279,  280,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
+           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,   -1,   -1,  262,  263,  264,   -1, 
-           -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,  279,  280,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
-          346,  347,  348,   -1,   -1,  351,  262,  263,  264,   -1, 
-           -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  279,  370,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   10, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
-          346,  347,  348,   -1,  350,  351,   37,   38,   -1,   -1, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  370,   -1,   -1,   -1,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,   -1,   37,   38,   -1,   -1, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  257,  258,  259,   -1,  261,  262,  263, 
+          264,  265,  266,   -1,  268,  269,  270,  271,  272,  273, 
+          274,  275,  276,  277,  278,  279,  280,   -1,   -1,   -1, 
+          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
+          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
+          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
+          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
+          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
+           -1,  345,  346,  347,  348,  349,   -1,  351,  352,  353, 
+          354,  355,   -1,  357,  358,  359,  360,  361,  362,  363, 
+          364,  365,  366,   -1,  368,  369,  370,   -1,   -1,   -1, 
+          257,  258,  259,   -1,  261,  262,  263,  264,  265,  266, 
+           -1,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
+          277,  278,  279,  280,   -1,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,  291,  292,  293,  294,  295,  296, 
+          297,  298,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,  312,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,  322,  323,  324,   -1,  326, 
+          327,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
+          337,  338,  339,  340,  341,  342,   -1,   -1,  345,  346, 
+          347,  348,  349,   -1,  351,  352,  353,  354,  355,   -1, 
+          357,  358,  359,  360,  361,  362,  363,  364,  365,  366, 
+            0,  368,  369,  370,   -1,   -1,   -1,   -1,   -1,   -1, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
+           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           91,    0,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   37,   38, 
-           -1,   -1,   41,   42,   43,   44,   45,   46,   47,   -1, 
+           -1,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,   -1,  123,  124,  125,  126,   10,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  262,  263,  264,   -1,   -1,   -1,  268,  269,   -1, 
-          271,   -1,   91,   -1,   -1,   94,   -1,   -1,  279,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
+           33,   -1,   -1,   -1,   37,   38,   -1,   40,   41,   42, 
+           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,  350, 
-          351,  262,  263,  264,   -1,   -1,   -1,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,  370, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
+           -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          123,  124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259, 
+           -1,  261,  262,  263,  264,  265,  266,   -1,  268,  269, 
+          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
+          280,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
+          290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
+          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
+          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
+           -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
+           -1,  351,  352,  353,  354,  355,   -1,  357,  358,  359, 
+          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
+          370,   -1,   -1,   -1,  257,  258,  259,   -1,  261,  262, 
+          263,  264,  265,  266,   -1,  268,  269,  270,  271,  272, 
+          273,  274,  275,  276,  277,  278,  279,  280,   -1,   -1, 
+           -1,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
+          293,  294,  295,  296,  297,  298,   -1,  300,   -1,   -1, 
+          303,  304,  305,  306,  307,  308,  309,  310,  311,  312, 
+          313,  314,  315,  316,  317,  318,  319,   -1,   -1,  322, 
+          323,  324,   -1,  326,  327,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,  341,  342, 
+           -1,   -1,  345,  346,  347,  348,  349,   -1,  351,  352, 
+          353,  354,  355,   -1,  357,  358,  359,  360,  361,  362, 
+          363,  364,  365,  366,    0,  368,  369,  370,   -1,   -1, 
+           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,  350, 
-          351,   -1,   -1,  262,  263,  264,   -1,   -1,   -1,  268, 
-          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
-          279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
+           -1,   37,   38,   -1,   40,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   10,   -1,   -1,  328, 
-          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
-          339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
-           -1,  350,  351,   37,   38,   -1,   -1,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  370,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   91,   -1,   -1, 
-           94,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+          126,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
+           -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38, 
+           -1,   40,   41,   42,   43,   44,   45,   46,   47,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,    0,   -1, 
-           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   -1,   -1,   37,   38,   -1,   -1,   41, 
-           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
-          264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1,   91, 
-           -1,   -1,   94,   -1,   -1,  279,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   -1,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,  347,  348,   -1,  350,  351,  262,  263, 
-          264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  279,  370,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   -1,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,  347,  348,   -1,  350,  351,   -1,   -1, 
-          262,  263,  264,   -1,   -1,   -1,  268,  269,   -1,  271, 
-           -1,   -1,   -1,   -1,   -1,   -1,  370,  279,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,  126,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   10,   -1,   -1,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   -1,  345,  346,  347,  348,   -1,  350,  351, 
-           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
-           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
+           -1,  257,  258,  259,   -1,  261,  262,  263,  264,  265, 
+          266,   -1,  268,  269,  270,  271,  272,  273,  274,  275, 
+          276,  277,  278,  279,   -1,   -1,   -1,   -1,  284,  285, 
+          286,  287,  288,  289,  290,  291,  292,  293,  294,  295, 
+          296,  297,  298,   -1,  300,   -1,   -1,  303,  304,  305, 
+          306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
+          316,  317,  318,  319,   -1,   -1,  322,  323,  324,   -1, 
+          326,  327,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,  341,  342,   -1,   -1,  345, 
+          346,  347,  348,  349,   -1,  351,  352,  353,  354,  355, 
+           -1,  357,  358,  359,  360,  361,  362,  363,  364,  365, 
+          366,   -1,  368,  369,  370,   -1,   -1,   -1,  257,  258, 
+          259,   -1,  261,  262,  263,  264,  265,  266,   -1,  268, 
+          269,  270,  271,  272,  273,  274,  275,  276,  277,  278, 
+          279,   -1,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          289,  290,  291,  292,  293,  294,  295,  296,  297,  298, 
+           -1,  300,   -1,   -1,  303,  304,  305,  306,  307,  308, 
+          309,  310,  311,  312,  313,  314,  315,  316,  317,  318, 
+          319,   -1,   -1,  322,  323,  324,   -1,  326,  327,  328, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+          339,  340,  341,  342,   -1,   -1,  345,  346,  347,  348, 
+          349,   -1,  351,  352,  353,  354,  355,   -1,  357,  358, 
+          359,  360,  361,  362,  363,  364,  365,  366,    0,  368, 
+          369,  370,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,    0,   91,   -1,   -1,   94,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+           -1,   -1,   -1,   -1,   46,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1, 1037, 
+         1038,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,    0,   -1,   94,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
+           -1,  123,   -1,  125,  126,   -1, 1104, 1105,   -1,   -1, 
+         1108,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
+           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1142,   -1,   59,   60,   -1,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1, 1163,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
+           93,   94,   -1, 1181,   -1,   -1,   -1, 1185,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+         1198, 1199, 1200, 1201,   -1,   -1,   -1, 1205, 1206,   -1, 
+         1208,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+            0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           10,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
+          262,  263,  264,  265,  266,  267,  268,  269,  270,  271, 
+          272,  273,  274,  275,  276,  277,  278,  279,  280,  281, 
+           -1,   41,  284,  285,  286,  287,  288,  289,  290,  291, 
+          292,  293,  294,  295,  296,  297,  298,   -1,  300,   59, 
+           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+          312,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+          322,  323,  324,   -1,  326,  327,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   93,   -1,   -1,   -1,   -1, 1316,  341, 
+          342, 1319,   -1,   -1,   -1,  347,  348,  349,   -1, 1327, 
+          352,  353,  354,  355,   -1,  357,  358,  359,  360,  361, 
+          362,  363,  364,  365,  366,  125,  368,  369,  370,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298, 1384,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   -1,   10,   -1,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,  347,  348,   -1,   -1,  351,   -1, 
+           37,   38,   -1,  356,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+           -1,   -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,    0,   91,   -1,   93,   94,   -1,  279, 
+           -1,  281,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
+           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
+           47,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
-           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   59,   60,   61,   62,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   91,   -1,   93,   94,   -1,    0, 
+          370,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1, 
+           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60, 
+           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
-           -1,  268,  269,   -1,  271,   -1,   91,   -1,   -1,   94, 
-           -1,   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           91,   -1,  279,   94,  281,  282,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  123,  124,  125,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 1037, 
+         1038,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
+          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
+          347,  348,   -1,   -1,  351,  262,  263,  264,   -1,  356, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,  370,  281,  282,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
-          125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          297,  298,   -1,   -1,   -1,   -1, 1104, 1105,   -1,   -1, 
+         1108,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
            -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-          347,  348,   -1,  350,  351,  262,  263,  264,   -1,   -1, 
+          337,  338,  339,  340, 1142,   -1,   -1,   -1,  345,  346, 
+          347,  348,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356, 
+           -1,  262,  263,  264,   -1, 1163,   -1,  268,  269,   -1, 
+          271,   -1,   -1,  370,   -1,   -1,   -1,   -1,  279,  280, 
+           -1,   -1,   -1, 1181,   -1,   -1,   -1, 1185,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+         1198, 1199, 1200, 1201,   -1,   -1,   -1, 1205, 1206,   -1, 
+         1208,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   10,   -1,   -1,  328,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,   -1, 
+          351,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,    0,   91,   -1,   -1,   94,   -1, 
+           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 1316,   -1, 
+           -1, 1319,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1327, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125, 
+           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1, 1384,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   91,    0,   -1,   94,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
+           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,   -1,  268,  269,   -1,  271,   -1,   91,   -1,   -1, 
+           94,   -1,   -1,  279,  280,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,  347,  348,   -1,   -1,  351,  262,  263,  264,   -1, 
+           -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,  370,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,  347,  348,   -1,  350,  351,   -1,   -1,  262,  263, 
+          264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,  279,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   10,   -1,   -1,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
+           -1,  345,  346,  347,  348,   -1,  350,  351,   37,   38, 
+           -1,   -1,   41,   42,   43,   44,   45,   46,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,   -1, 
+           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   37,   38, 
+           -1,   -1,   41,   42,   43,   44,   45,   46,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   91,    0,   -1,   94,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
+           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1,  268, 
+          269,   -1,  271,   -1,   91,   -1,   -1,   94,   -1,   -1, 
+          279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
+           -1,  350,  351,  262,  263,  264,   -1,   -1,   -1,  268, 
+          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          279,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
+           -1,  350,  351,   -1,   -1,  262,  263,  264,   -1,   -1, 
            -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  279,  370,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  370,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
           297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   10,   -1, 
            -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
           337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-          347,  348,   -1,  350,  351,   -1,   -1,  262,  263,  264, 
-           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,  370,  279,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+          347,  348,   -1,  350,  351,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  370,   -1,   -1,   -1,   59,   60,   61, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   91, 
+           -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-            0,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           10,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
-          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
-          345,  346,  347,  348,   -1,  350,  351,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,   -1,   59, 
-           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,  125,   -1,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-            0,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91, 
+            0,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,   37,   38,   -1, 
+           -1,   -1,  124,  125,   -1,   -1,   -1,   37,   38,   -1, 
            -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
            60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   -1,   -1,   -1,  268,  269,   -1,  271, 
+           -1,   91,   -1,   -1,   94,   -1,   -1,  279,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,    0,   -1,   94,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
+          322,   -1,  324,   -1,   -1,   -1,  328,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
+           -1,   -1,   -1,  345,  346,  347,  348,   -1,  350,  351, 
+          262,  263,  264,   -1,   -1,   -1,  268,  269,   -1,  271, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,  370,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,  328,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
+           -1,   -1,   -1,  345,  346,  347,  348,   -1,  350,  351, 
            -1,   -1,  262,  263,  264,   -1,   -1,   -1,  268,  269, 
-           -1,  271,   -1,   91,   -1,   -1,   94,   -1,   -1,  279, 
+           -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,  370,  279, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
-            0,  351,  262,  263,  264,   -1,   -1,   -1,  268,  269, 
-           10,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
-          370,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329, 
+           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,  322,   -1,  324,   10,   -1,   -1,  328,  329, 
           330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
           340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
-           -1,  351,   -1,   93,  262,  263,  264,   -1,    0,   -1, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   10,   -1, 
-          370,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,  125,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
-           -1,   -1,   44,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   10,  324,   59,   -1,   -1, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,    0,   -1,   41,   -1,   -1,   44, 
-           -1,   93,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   -1,   59,   -1,   -1,   -1,   -1,   -1, 
+          350,  351,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          370,   -1,   -1,   -1,   59,   60,   61,   62,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  125,   -1,   41,   -1,   -1,   44,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
-           -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-          125,  271,   -1,   -1,   -1,   -1,   -1,   93,   -1,  279, 
-           -1,  281,  282,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  291,  292,    0,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,    0,   91,   -1,   -1,   94, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   41,   -1,   -1,   44,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   -1,   -1,   -1,  356,   -1,   -1,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-          370,   -1,   -1,   41,   -1,   -1,   44,  279,   -1,  281, 
-          282,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,  291, 
-          292,   59,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59,   60,   61,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   91,    0,   -1,   94, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
+           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,  124,  125,   -1, 
-          322,   -1,  324,   -1,  279,   93,  281,  282,   -1,   -1, 
+           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   91,   -1, 
+           -1,   94,   -1,   -1,  279,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,  356,  271,  124,  125,   -1,   -1, 
-           -1,   -1,   -1,  279,   -1,  281,   -1,  322,  370,  324, 
-           -1,   -1,   -1,    0,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,  347,  348,   -1,  350,  351,  262,  263,  264, 
+           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  279,  370,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  356,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,   -1,   41,  370,   -1,   44,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,  347,  348,   -1,  350,  351,   -1,   -1,  262, 
+          263,  264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,  370,  279,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   10,   -1,   -1,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,  347,  348,   -1,   -1,  351,   37, 
+           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  370,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   93,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,  281,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,    0,   -1,  262,  263,  264,  124,  125,  267, 
-          268,  269,   10,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,   -1,  322,   -1,  324,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,    0,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1, 
-           -1,   10,   -1,   -1,  351,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,  370,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   10, 
-           -1,   -1,   -1,  351,   -1,   93,   -1,   -1,   -1,   -1, 
-           59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           41,   -1,   -1,   44,   -1,   -1,    0,  125,   -1,   -1, 
-           -1,   -1,   -1,   -1,   93,   -1,   10,   -1,   59,   -1, 
-           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,  281,   -1,  125,   41,   -1,   -1, 
-           44,   -1,   93,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   59,   -1,   -1,   -1,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
-           -1,   -1,   -1,   -1,  125,  322,   -1,  324,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           41,   -1,   -1,   44,  351,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   59,   -1, 
-           -1,  125,   -1,  370,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,    0,   -1,   41,   -1,   -1, 
-           44,  279,   93,  281,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   59,  294,  295,  296,  297, 
-          298,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,   -1,  125,   -1,   41,   -1,   -1,   -1, 
-          279,   -1,  281,   -1,  322,   -1,  324,   -1,   -1,   93, 
-           -1,   -1,  291,  292,   59,  294,  295,  296,  297,  298, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,  351,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,  125,   -1,  322,   -1,  324,   -1,   -1,   93,    0, 
-          291,  292,  370,  294,  295,  296,  297,  298,   -1,   10, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-          125,  322,   -1,  324,   -1,  279,   -1,  281,   -1,   -1, 
-           41,  370,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   59,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,  322,  370, 
-          324,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   93,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,   -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,    0,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   59,   10,   -1,  125,   -1,  370,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,  279,   -1,  281,   -1,   -1, 
-           -1,   -1,   -1,   41,   -1,   93,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,  262,  263,  264, 
-           -1,   59,  267,  268,  269,    0,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   10,  281,  125,  322,  370, 
-          324,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   41,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   59,   -1,  370,  125,   -1,   -1, 
+           -1,   -1,    0,   91,   -1,   -1,   94,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   59,   -1,   -1,   -1,  370,   -1,   -1,  279,   -1, 
-          281,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
-          125,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,  125,   -1,   -1, 
-           -1,  279,   -1,  281,   -1,   41,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,  370, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,  322,   -1,  324,   -1,   -1,    0, 
-           -1,  279,   -1,  281,   -1,   -1,   -1,   -1,   -1,   10, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125, 
-           41,   -1,  370,   -1,  322,   -1,  324,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   59,   -1, 
-           -1,   -1,   -1,    0,  279,   -1,  281,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,  370,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,   41,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,  291,  292,    0,  294,  295,  296,  297, 
-          298,   -1,   59,   -1,  125,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   37, 
+           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,   41,    0,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   59,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,   -1,  125,   -1, 
-           -1,   -1,  370,  279,   -1,  281,   -1,   -1,   41,   -1, 
-           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   59,   -1,   -1,   -1, 
+           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-          125,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,    0, 
-          281,   -1,  125,   41,  370,   -1,   44,   -1,   -1,   10, 
-          291,  292,    0,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   59,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           41,  322,   -1,  324,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   41,  271,   -1,   -1,   -1,   59,   -1, 
-           -1,   -1,  279,   -1,  281,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,    0,   -1,   -1,  125,   -1,  370, 
-           -1,   -1,   -1,   -1,   10,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,  322,  271,  324,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  125,   41,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,  125,   -1,  262, 
-          263,  264,   -1,   59,  267,  268,  269,   -1,  271,   -1, 
-           -1,   -1,    0,  370,   -1,   -1,   -1,  322,  281,  324, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   41,    0,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   10,  370,   -1,   -1,   -1,  125, 
-           -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   -1,  271,   -1,   41,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
-           -1,   -1,   -1,   59,   -1,   -1,  294,  295,  296,  297, 
-          298,  262,  263,  264,   -1,   -1,   -1,  268,  269,   -1, 
-          271,   -1,    0,   -1,  262,  263,  264,  125,  279,   -1, 
-          268,  269,   10,  271,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,  279,    0,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,  125, 
-           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,  370,   41,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
-           -1,   59,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  279,   -1,   -1,   -1,   -1,   -1,  370, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  294,  295, 
-          296,  297,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,  125,   -1,   -1, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  294,  295,  296,  297, 
-           -1,   -1,   -1,   -1,  370,   -1,  262,  263,  264,   33, 
-           -1,   -1,  268,  269,   -1,  271,   40,   -1,   -1,   -1, 
-           -1,   -1,   46,  279,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   -1,  294,  295, 
-          296,  297,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   91,    0,   -1,   94,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
+           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   91,  324,   -1, 
-           -1,   -1,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,  123, 
-           -1,  279,  126,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   10,  271,  370,   -1,  294,  295,  296,  297, 
+          268,  269,   -1,  271,   -1,   91,   -1,   -1,   94,   -1, 
            -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   33,  294,  295,  296,  297, 
-           -1,   -1,   40,   -1,  322,   -1,  324,   -1,   46,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
+          348,   -1,    0,  351,  262,  263,  264,   -1,   -1,   -1, 
+          268,  269,   10,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  279,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   59,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
+          348,   -1,   -1,  351,   -1,   93,  262,  263,  264,   -1, 
+            0,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           10,   -1,  370,  279,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,  125,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   41,   -1,   -1,   44,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   10,  324,   59, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,  347,  348,   -1,   -1,  351,    0,   -1,   41,   -1, 
+           -1,   44,   -1,   93,   -1,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,   -1,   59,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   91,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  125,   -1,   41,   -1,   -1, 
+           44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           93,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  123,   -1,   -1,  126,   -1, 
-           -1,   -1,  256,  257,  258,  259,  260,  261,  262,  263, 
-          264,  265,  266,   -1,   -1,  269,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   -1,  280,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,  347,  348,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,  257, 
-          258,  259,  260,  261,  262,  263,  264,  265,  266,   -1, 
-           -1,  269,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   -1,  280,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
-           -1,  299,  300,  301,  302,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,  322,  323,   -1,   -1,  326,  327, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,    0,  267, 
+          268,  269,  125,  271,   -1,   -1,   -1,   -1,   10,   93, 
+           -1,  279,   -1,  281,  282,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   41, 
+           -1,  125,   44,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  322,   -1,  324,   59,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1, 
+           44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  356,   -1, 
+           -1,   93,  262,  263,  264,   59,   -1,  267,  268,  269, 
+           -1,  271,  370,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
+           -1,  281,  282,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  291,  292,  125,  294,  295,  296,  297,  298,   93, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,  322,   -1,  324,   -1,  279,   -1,  281,  282, 
+          124,  125,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,  356,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,  322, 
+          370,  324,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  356,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,  356,   -1,   59,   -1,   -1,  279,   -1,  281, 
+          282,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   93,   -1, 
+           -1,    0,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1, 
+          322,   10,  324,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
+           -1,   -1,   41,   -1,  356,   44,   -1,   -1,  322,   10, 
+          324,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
+           59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  351,   -1,   -1, 
+           41,   -1,   -1,   44,   -1,   -1, 1037, 1038,   -1,   -1, 
+           -1,   -1,   -1,   -1,   93,   -1,  370,   -1,   59,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   10,   -1,   -1,  347, 
-          348,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-           -1,   -1,  360,  361,  362,  363,  364,  365,  366,   33, 
-          368,  369,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1, 
-           -1,   -1,   46,   -1,   -1,   -1, 1023, 1024,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
+           -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1, 1104, 1105,   -1,   -1, 1108,   10,   -1, 
+           -1,   -1,   -1,   -1,  125,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1,   41, 
+           -1, 1142,   44,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   59,   -1,   -1, 
+           -1,   -1, 1163,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   10,  324, 
+         1181,   -1,   -1,   -1, 1185,   -1,   -1,   -1,   -1,   -1, 
+           -1,   93,   -1,   -1,   -1,   -1,   -1, 1198, 1199, 1200, 
+         1201,   -1,   -1,   -1, 1205, 1206,  351, 1208,   -1,   41, 
+           -1,   -1,   44,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,  125,   -1,  370,   -1,   59,   -1,   -1, 
+          279,   -1,  281,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,  262,  263,  264,   -1,    0,  267,  268,  269,   -1, 
+          271,   93,   -1,   -1,   -1,   10,   -1,   -1,  279,   -1, 
+          281,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,  125,    0,   -1,   41,   -1,   -1,   44, 
+           -1,   -1,  351,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   59, 1316,   -1,   -1, 1319,   -1, 
+           -1,  370,   -1,   -1,   -1,   -1, 1327,   -1,   -1,   -1, 
+           -1,   -1,    0,   -1,   -1,   41,   -1,   -1,   44,   -1, 
+          351,   -1,   10,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+           -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,  370, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   -1,   41,    0,   -1,   44,  279,   -1,  281, 
+          125,   -1,   -1, 1384,   10,   -1,   -1,   93,   -1,  291, 
+          292,   59,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1, 
+           -1,   -1,   -1,   -1,    0,   41,   -1,   -1,   -1,  125, 
+          322,   -1,  324,   -1,   10,   93,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   59,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
+           -1,   -1,   -1,   -1,   -1,   41,   -1,  125,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   93,  370,   -1, 
+           -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,  370,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,    0,  281,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,   -1,   10,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  279,   -1,  281,   -1,   41,  322,   -1,  324,   -1, 
+           -1,    0,   -1,  291,  292,  370,  294,  295,  296,  297, 
+          298,   10,   -1,   59,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,  322,  281,  324,   -1,   -1,   -1, 
+           -1,   -1,   41,   -1,  370,  291,  292,   93,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           59,  267,  268,  269,    0,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   10,  281,  322,   -1,  324,  125, 
+           -1,   -1,  370,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   93,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   41,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,   -1,   59,  370,   -1,  125,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   41,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1, 
+           59,   -1,   -1,   -1,  370,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,   10,  125, 
+           -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1, 
+           59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   41, 
+           -1,  267,  268,  269,   -1,  271,  125,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   93,  281,   -1,   59,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  262,  263,  264,  125,   -1,  267,  268, 
+          269,   93,  271,   -1,   -1,    0,  322,   -1,  324,   -1, 
+          279,   -1,  281,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   -1, 
+           -1,   -1,   -1,  322,  370,  324,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   59,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,    0,  279,   -1,  281,   -1,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,  370,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          279,   -1,  281,   41,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+          125,   59,   -1,  262,  263,  264,   -1,    0,  267,  268, 
+          269,   -1,  271,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
+          279,   -1,  281,  322,   -1,  324,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,  370,  294,  295,  296,  297,  298, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   41,  271, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
+           -1,   10,   -1,  322,   -1,  324,   59,  125,   -1,  291, 
+          292,  370,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   41,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           59,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  125,   -1,   41,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,  370,   -1, 
+           -1,   -1,   59,   -1,  279,   -1,  281,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,  125,   -1,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   10,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,   -1,  125,   -1, 
+           -1,  279,   -1,  281,   41,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   59,   -1,   -1,  370,   -1,   -1,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,  322,   -1,  324,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,   -1, 
+           -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,  125,   -1, 
+           59,   -1,  370,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,  322, 
+          279,  324,  281,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,  279,  322,  281,  324,  125,  370,   10,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+           -1,   -1,   44,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,  370,   -1,   -1,   -1,   -1,   -1,   59, 1037, 1038, 
+           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,  370,  281,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   41,  291,  292,   44,  294,  295,  296, 
+          297,  298,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   59,   10,  125,   -1, 1104, 1105,   -1,   -1, 1108, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   41,    0,   -1,   -1,   -1,   -1,   -1, 
+          279,   -1,  281, 1142,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   59,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,  370, 1163,   -1,   -1,  125,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1181,  322,   -1,  324, 1185,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1, 1198, 
+         1199, 1200, 1201,   -1,   -1,   -1, 1205, 1206,   -1, 1208, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  370,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   -1,   -1,   -1,   -1,   33,  279,   -1,  125, 
+           -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,   46, 
+           -1,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   59,   60,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   91,   -1,   -1, 1316,   -1,   -1, 
+         1319,  279,   -1,   -1,   -1,   -1,   -1,   -1, 1327,  351, 
+           -1,   -1,   -1,   -1,   -1,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,  123,   -1,  370,  126, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1, 
+          268,  269,   -1,  271,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1, 1384,  294,  295,  296,  297, 
+           -1,   -1,   -1,  351,   -1,   -1,  262,  263,  264,   -1, 
+           -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,  370,  279,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  294,  295, 
+          296,  297,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1, 1090, 1091,   -1,   -1, 1094,   -1,  123, 
-           10,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  370,   -1,   -1,   -1,   94,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256, 
+          257,  258,  259,  260,  261,  262,  263,  264,  265,  266, 
+           -1,   -1,  269,  270,   -1,  272,  273,  274,  275,  276, 
+          277,  278,   -1,  280,  370,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
+           -1,   -1,  299,  300,  301,  302,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,  322,  323,   -1,   -1,  326, 
+          327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   10,   -1,   -1, 
+          347,  348,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
+          357,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
+           33,  368,  369,   -1,   -1,   -1,   -1,   40,   -1,   -1, 
+           -1,   -1,   -1,   46,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1, 
-           40, 1128,   -1,   -1,   -1,   -1,   46,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
-           60,   -1, 1149,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-         1167,   -1,   -1,   -1, 1171,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   -1,   -1,   -1,   -1, 1184, 1185, 1186, 
-         1187,   -1,   -1,   -1, 1191, 1192,   -1, 1194,   -1,   -1, 
-           -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,  256,  257,  258,  259,  260,  261,  262,  263, 
-          264,  265,  266,   -1,   -1,  269,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   -1,  280,   -1,   94,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  124,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-           -1,   -1,  326,  327,   -1, 1302,   -1,   -1, 1305,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1, 1313,  341,  342,   -1, 
-           -1,   -1,   -1,  347,  348,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,  256,  257,  258,  259, 
-          260,  261,  262,  263,  264,  265,  266,   -1,   -1,  269, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   -1, 
-           -1,   -1,   -1, 1370,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299, 
-          300,  301,  302,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,  322,  323,   -1,   -1,  326,  327,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  287, 
+          288,  289,  290,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  303,  304,  305,  306,   -1, 
+          123,   10,  310,  126,   -1,  313,  314,  315,  316,  317, 
+           -1,   -1,   -1,   -1,   -1,  323,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1, 
+           -1,   40,   -1,  341,  342,   -1,   -1,   46,   -1,   -1, 
+           -1,  349,   -1,   -1,  352,   -1,  354,  355,   -1,  357, 
+           59,   60,  360,  361,  362,  363,  364,  365,  366,   -1, 
+          368,  369,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,  347,  348,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,  357,   33,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   46,  298,   -1, 1023, 1024,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   59,   60, 1023, 1024,   -1,   -1, 
+           -1,   -1,   91,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1, 
+           45,   -1,   47,   -1,  123,   -1,   -1,  126,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1, 
+           -1,   -1,   -1,  256,  257,  258,  259,  260,  261,  262, 
+          263,  264,  265,  266,   -1,   -1,  269,  270,   -1,  272, 
+          273,  274,  275,  276,  277,  278,   -1,  280,   -1,   94, 
+           -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
+          293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302, 
+          303,  304,  305,  306,  307,  308,  309,  310,  311,  124, 
+          313,  314,  315,  316,  317,  318,  319,   -1,   -1,  322, 
+          323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342, 
+           -1,   -1,   -1,   -1,  347,  348,  349,   -1,   -1,  352, 
+          353,  354,  355,   -1,  357,   -1,   -1,  360,  361,  362, 
+          363,  364,  365,  366,   -1,  368,  369,  256,  257,  258, 
+          259,  260,  261,  262,  263,  264,  265,  266,   -1,   -1, 
+          269,  270,   -1,  272,  273,  274,  275,  276,  277,  278, 
+           -1,  280,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1, 
+          299,  300,  301,  302,  303,  304,  305,  306,  307,  308, 
+          309,  310,  311,   -1,  313,  314,  315,  316,  317,  318, 
+          319,   -1,   -1,  322,  323,   -1,   -1,  326,  327,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  341,  342,   -1,   10,   -1,   -1,  347,  348, 
+          349,   -1,   -1,  352,  353,  354,  355,   -1,  357,   -1, 
+           -1,  360,  361,  362,  363,  364,  365,  366,   33,  368, 
+          369,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1, 
+           -1,   46,   -1,   -1, 1037, 1038,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59,   60,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,   -1,   -1,   -1,   -1,   91,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   91,   -1,   -1,  345, 
-          346,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1, 1090, 1091,   -1,   -1, 1094,   -1,   -1,   -1,   10, 
-           -1,  126,   -1, 1090, 1091,   -1,   -1, 1094,   -1,   -1, 
+           -1, 1104, 1105,   -1,   -1, 1108,   -1,   -1,   -1,   10, 
+           -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1, 1128, 
+           -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1, 1142, 
+           -1,   -1,   -1,   -1,   -1,   46,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60, 
+         1163,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1181,   -1, 
+           -1,   -1, 1185,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           91,   -1,   -1,   -1,   -1, 1198, 1199, 1200, 1201,   -1, 
+           -1,   -1, 1205, 1206,   -1, 1208,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1, 1128,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1, 
-         1149,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1, 1149,   -1,   -1,   -1,   -1,   -1, 1167,   -1, 
-           -1,   -1, 1171,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-         1167,   -1,   -1,   -1, 1171, 1184, 1185, 1186, 1187,   -1, 
-           -1,   -1, 1191, 1192,   -1, 1194,   -1, 1184, 1185, 1186, 
-         1187,   -1,   -1,   -1, 1191, 1192,   -1, 1194,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           41,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,  256,  257,  258,  259,  260,  261,  262,  263,  264, 
           265,  266,   -1,   -1,  269,  270,   -1,  272,  273,  274, 
           275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
           285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
-           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
+           -1,   -1,   -1,   94,  299,  300,  301,  302,  303,  304, 
           305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
           315,  316,  317,  318,  319,   -1,   -1,  322,  323,   -1, 
-           -1,  326,  327, 1302,   -1,   -1, 1305,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1, 1313, 1302,  341,  342, 1305,   -1, 
-           -1,   -1,  347,  348,  349,   -1, 1313,  352,  353,  354, 
-          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+           -1,  326,  327, 1316,   -1,   -1, 1319,   -1,   10,   -1, 
+           -1,   -1,   -1,   -1, 1327,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,  347,  348,  349,   -1,   -1,  352,  353,  354, 
+          355,   33,  357,   -1,   -1,  360,  361,  362,  363,  364, 
           365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
-          261,  262,  263,  264,  265,  266,   -1,  268,  269,  270, 
-          271,  272,  273,  274,  275,  276,  277,  278,  279,   -1, 
-           -1, 1370,   -1,  284,  285,  286,  287,  288,  289,  290, 
-           -1,   -1,  293, 1370,   -1,   -1,   10,   -1,  299,  300, 
+          261,  262,  263,  264,  265,  266,   -1,   59,  269,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1, 1384,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
           301,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
-          311,   -1,  313,  314,  315,  316,  317,  318,  319,   33, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
            -1,  322,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
-           -1,   -1, 1023, 1024,   -1,   -1,   -1,   -1,   -1,   -1, 
-          341,  342,   -1,   -1,   -1,   59,   -1,   61,  349,   -1, 
-           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
+           -1,   -1,   10,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,  347,  348,  349,   -1, 
+           -1,  352,  353,  354,  355,   33,  357,   -1,   -1,  360, 
           361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  287,  288,  289,  290, 
+           -1,   59,   -1,   61,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  303,  304,  305,  306,   -1,   -1,   -1,  310, 
+           -1,  312,  313,  314,  315,  316,  317,   -1,   -1,   -1, 
+           -1,   -1,  323,   -1,   -1,   -1,   -1,  328,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1090, 
-         1091,   -1,   -1, 1094,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   33,   -1,   -1,   -1, 1128,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1149,   59, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1, 1167,   -1,   -1,   -1, 
-         1171,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1, 1184, 1185, 1186, 1187,   -1,   -1,   -1, 
-         1191, 1192,   -1, 1194,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,  256,  257,  258,  259,  260,  261,  262,  263, 
-          264,  265,  266,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,   -1,  354,  355,   -1,  357,  358,  126,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,   -1,   -1,  256,  257,  258,  259,  260,  261, 
+          262,  263,  264,  265,  266,   -1,  268,  269,  270,  271, 
+          272,  273,  274,  275,  276,  277,  278,  279,   -1,   -1, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
+           -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301, 
+          302,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+          322,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
+          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
+          352,  353,  354,  355,   33,  357,   -1,   -1,  360,  361, 
+          362,  363,  364,  365,  366,   -1,  368,  369,  256,  257, 
+          258,  259,  260,  261,  262,  263,  264,  265,  266,   -1, 
+           59,  269,  270,   -1,  272,  273,  274,  275,  276,  277, 
+          278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
+          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
+           -1,  299,  300,  301,  302,  303,  304,  305,  306,  307, 
+          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
+          318,  319,   -1,   -1,  322,  323,   -1,   -1,  326,  327, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,  126,   -1,   -1, 
+           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
+           -1,  349,   -1,   -1,  352,  353,  354,  355,   33,  357, 
+           -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
+          368,  369,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1, 
       };
    }
 
    private static final int[] yyCheck4() {
       return new int[] {
 
-           -1,  269,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   -1,   -1,   -1,   94,   -1,  284,  285,  286,  287, 
+           -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
+           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  126,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1, 
+           -1,   -1,   -1,   -1,  256,  257,  258,  259,  260,  261, 
+          262,  263,  264,  265,  266,   -1,   -1,  269,  270,   -1, 
+          272,  273,  274,  275,  276,  277,  278,   -1,  124,   -1, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
+           -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301, 
+          302,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+          322,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
+          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
+          352,  353,  354,  355,   33,  357,   -1,   -1,  360,  361, 
+          362,  363,  364,  365,  366,   -1,  368,  369,  256,  257, 
+          258,  259,  260,  261,  262,  263,  264,  265,  266,   -1, 
+           59,  269,  270,   -1,  272,  273,  274,  275,  276,  277, 
+          278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
           288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
            -1,  299,  300,  301,  302,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  124,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,  322,  323,   -1, 1302,  326,  327, 
-         1305,   -1,   -1,   -1,   -1,   10,   -1,   -1, 1313,   -1, 
+          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
+          318,  319,   -1,  279,  322,  323,   -1,   -1,  326,  327, 
+           -1,   -1,   -1,   -1,   -1,   10,  125,  126,   -1,   -1, 
            -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
            -1,  349,   -1,   -1,  352,  353,  354,  355,   33,  357, 
            -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,  256,  257,  258,  259,  260,  261,  262,  263, 
-          264,  265,  266,   -1,   59,  269,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278, 1370,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   10, 
-           -1,  126,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   33,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1, 
+          368,  369,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   -1,   42, 
+           43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   94,   -1,   -1,   -1,   -1,   -1,  256,  257,  258, 
+          259,  260,  261,   -1,   -1,   -1,  265,  266,   -1,   -1, 
+           -1,  270,   -1,  272,  273,  274,  275,  276,  277,  278, 
+           -1,  124,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          289,  290,   -1,   -1,  293,   -1,   -1,   -1,   10,   -1, 
+          299,  300,  301,  302,  303,  304,  305,  306,  307,  308, 
+          309,  310,  311,   -1,  313,  314,  315,  316,  317,  318, 
+          319,   33,   -1,   -1,  323,   -1,   -1,  326,  327,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  341,  342,   -1,   -1,   -1,   59,   -1,   -1, 
+          349,   -1,   -1,  352,  353,  354,  355,   -1,  357,   -1, 
+           -1,  360,  361,  362,  363,  364,  365,  366,   -1,  368, 
+          369,   -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   10,   -1,  126,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   33,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  298,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,   -1,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  126,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  256,  257,  258,  259,   -1,  261, 
+           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
+          272,  273,  274,  275,  276,  277,  278,   -1,   -1,   -1, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
+           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
+           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
+          342,   -1, 1037, 1038,   -1,   -1,   -1,  349,   -1,   -1, 
+          352,  353,  354,  355,   -1,   -1,   -1,   -1,  360,  361, 
+          362,  363,  364,  365,  366,   -1,  368,  369,   -1,  257, 
+          258,  259,   -1,  261, 1037, 1038,   -1,  265,  266,   -1, 
+           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
+          278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
+          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 1104, 
+         1105,   -1,  300, 1108,   -1,  303,  304,  305,  306,  307, 
+          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
+          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
+           -1, 1104, 1105,   -1,   -1, 1108,   -1, 1142, 1037, 1038, 
+           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
+           -1,  349,   -1,   -1,  352,  353,  354,  355, 1163,   -1, 
+           -1,   -1,  360,  361,  362,  363,  364,  365,  366, 1142, 
+          368,  369,   -1,   -1,   -1,   -1, 1181,   -1,   -1,   -1, 
+         1185,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+         1163,   -1,   -1, 1198, 1199, 1200, 1201,   -1,   33,   -1, 
+         1205, 1206,   -1, 1208,   -1, 1104, 1105,   -1, 1181, 1108, 
+           -1,   -1, 1185,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59, 1198, 1199, 1200, 1201,   -1, 
+           -1,   -1, 1205, 1206,   -1, 1208,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1, 1142,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1163,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1181,   -1,   -1,   -1, 1185,   -1,   -1,   -1, 
+           -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1198, 
+         1199, 1200, 1201,   -1,   -1,   -1, 1205, 1206,   -1, 1208, 
+           -1, 1316,   33,   -1, 1319,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1, 
+           -1,   -1,   -1, 1316,   -1,   -1, 1319,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1327,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1384, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1,   -1, 
+           -1, 1384,   -1,   -1,   -1,   -1,   -1, 1316,   -1,   -1, 
+         1319,  256,  257,  258,  259,  260,  261,   -1, 1327,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   33,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319, 1384,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
+          261,  126,   -1,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   33,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
+          301,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  256,  257,  258,  259,  260,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
+          301,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,  256,  257,  258,  259,  260,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
+           -1,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,  358,  359,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,  358,  359,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,  358,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,   -1,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,   -1,  358,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,  256,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,   -1,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           37,   38,   -1,   -1,   -1,   42,   43,   -1,   45,   -1, 
-           47,   -1,   -1,   -1,  125,  126,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1,   -1, 
-           -1,  256,  257,  258,  259,  260,  261,  262,  263,  264, 
-          265,  266,   -1,   -1,  269,  270,   -1,  272,  273,  274, 
-          275,  276,  277,  278,   -1,   -1,   -1,   94,   -1,  284, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
           285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
-           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
-          305,  306,  307,  308,  309,  310,  311,  124,  313,  314, 
-          315,  316,  317,  318,  319,   10,   -1,  322,  323,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
            -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   33,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
            -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
-          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
-          261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270, 
+          355,  126,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
            -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
            -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
-           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
-          301,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
           311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
-           10,  126,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          341,  342,   -1,   33,   -1,   -1,   -1,   -1,  349,   -1, 
-           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
-          361,  362,  363,  364,  365,  366,   -1,  368,  369,   59, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   10,  126,   -1,   -1,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
            -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
           265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
           275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
           285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
            -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
-          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
           315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
            -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
            -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
-          355,  126,  357,  358,  359,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,   -1,  256,  257,  258,  259, 
-           -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   -1, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   33,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
+          355,  126,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           33,   -1,  293,   -1,   -1,   -1,   -1,   40,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1, 1023, 1024,   59,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,   -1,   -1,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
            -1,   -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1, 
-          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          265,  266,   -1,  126,   -1,  270,   -1,  272,  273,  274, 
           275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
-          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
-           -1,   -1, 1090, 1091,  126,  300, 1094,   -1,  303,  304, 
+          285,  286,  287,  288,  289,  290,   33,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
           305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
           315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
-           -1,  326,  327,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
-         1128,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
            -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
-          355, 1149,   59,   -1,   -1,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1, 1167, 
-           -1,   -1,   -1, 1171,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1, 1184, 1185, 1186, 1187, 
-           -1,   -1,   -1, 1191, 1192,   -1, 1194,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  126, 
-           -1,   -1,   -1,   -1,  256,  257,  258,  259,  260,  261, 
-           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
-          272,  273,  274,  275,  276,  277,  278,   33,   -1,   -1, 
-           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
-           -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301, 
-          302,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1, 1302,   -1,   -1, 1305,   -1,  341, 
-          342,   -1,   -1,   -1,   -1, 1313,   -1,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,   -1,   -1,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,   -1,   -1, 
-          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256, 
-          257,  258,  259,  260,  261,   -1,   -1,   -1,  265,  266, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261,   -1, 
+           33,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
+          273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
+           -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
+          293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1, 
+          303,  304,  305,  306,  307,  308,  309,  310,  311,   -1, 
+          313,  314,  315,  316,  317,  318,  319,   -1,   -1,   -1, 
+          323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342, 
+           -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
+          353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
+          363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
+          257,  258,  259,   -1,  261,   -1,   33,   -1,  265,  266, 
            -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
-          277,  278, 1370,   33,   -1,   -1,   -1,  284,  285,  286, 
+          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
           287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
-           -1,   -1,  299,  300,  301,  302,  303,  304,  305,  306, 
+           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
           307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
           317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326, 
           327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
-           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
-          357,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
-           -1,  368,  369,   -1,   -1,   -1,  126,   -1,   -1,   -1, 
-          256,  257,  258,  259,  260,  261,   -1,   -1,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   33,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,  299,  300,  301,  302,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-           -1,  357,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  256,  257,  258,  259, 
-          260,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   33, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299, 
-          300,  301,  302,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,  357,   -1,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   -1,  126,   -1,   -1,   -1,  256,  257,  258,  259, 
-          260,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   33, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299, 
-          300,  301,  302,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,  357,   -1,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  256,  257,  258,  259,  260,  261,   -1,   -1, 
-           -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   33,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,  299,  300,   -1,  302,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,   -1,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,  126,   -1, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,   -1,   -1, 
-           -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   33,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,   -1,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,  358,  359,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,  126,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
-           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   33,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
-           -1,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
-           -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-          358,  359,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,   -1,   -1,  126,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
-           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   33,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
-           -1,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
-           -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-          358,  359,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,   -1,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
-           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
-          272,  273,  274,  275,  276,  277,  278,   33,   -1,   -1, 
-           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
-           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
-           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-          312,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,  358,  359,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,   -1,   -1, 
-          126,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
-           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
-          272,  273,  274,  275,  276,  277,  278,   33,   -1,   -1, 
-           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
-           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
-           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-          312,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,  358,  359,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,   -1,   -1, 
-          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   33,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-           -1,  357,  358,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   33,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-           -1,   -1,  358,  359,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259, 
-           -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   33, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,   -1,  358,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   -1,  126,   -1,   -1,   -1,  256,  257,  258,  259, 
-           -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   33, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,   -1,   -1,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,   -1,   -1, 
-           -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   33,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,   -1,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,  126,   -1, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,   -1,   -1, 
-           -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   33,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,   -1,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,  126,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
-           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   33,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
-           -1,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
-           -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-           -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,   -1,   -1,  126,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
-           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   33,   -1,   -1, 
-           -1,   -1,  300,   -1,   40,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
-           -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-           -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
-          126,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
-          272,  273,  274,  275,  276,  277,  278,   -1,   -1,   -1, 
-           33,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
-           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
-           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,   -1,   -1,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,   -1,   -1, 
-           -1,   -1,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   33,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-          126,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,  126, 
+           -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
+           -1,  368,  369,   -1,  257,  258,  259,   -1,  261,   -1, 
            33,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
           273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
            -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
@@ -6278,18 +6471,18 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
           353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
           363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   33,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-          126,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
+          257,  258,  259,   -1,  261,   -1,   33,   -1,  265,  266, 
+           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
+          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
+           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326, 
+          327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,  126, 
+           -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
+           -1,  368,  369,   -1,  257,  258,  259,   -1,  261,   -1, 
            33,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
           273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
            -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
@@ -6301,18 +6494,18 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
           353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
           363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   33,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-          126,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
+          257,  258,  259,   -1,  261,   -1,   33,   -1,  265,  266, 
+           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
+          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
+           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326, 
+          327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,  126, 
+           -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
+           -1,  368,  369,   -1,  257,  258,  259,   -1,  261,   -1, 
            33,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
           273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
            -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
@@ -6320,22 +6513,22 @@ private static final int[] yyCheck4() {
           303,  304,  305,  306,  307,  308,  309,  310,  311,   -1, 
           313,  314,  315,  316,  317,  318,  319,   -1,   -1,   -1, 
           323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342, 
-           -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
-          353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
-          363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-           -1,   93,   94,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342, 
+           -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
+          353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
+          363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
+          257,  258,  259,   -1,  261,   -1,   -1,   -1,  265,  266, 
+           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
+          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
+           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326, 
+          327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
+           -1,   93,   94,  360,  361,  362,  363,  364,  365,  366, 
+           -1,  368,  369,   -1,  257,  258,  259,   -1,  261,   -1, 
            -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
           273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
            -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
@@ -6365,13 +6558,13 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            94,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           124,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258, 
           259,  260,  261,  262,  263,  264,  265,  266,  267,  268, 
           269,  270,  271,  272,  273,  274,  275,  276,  277,  278, 
-          279,  280,   94,   -1,   -1,  284,  285,  286,  287,  288, 
+          279,  280,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
           289,  290,  291,  292,  293,   -1,   -1,   -1,   -1,   -1, 
           299,  300,  301,  302,  303,  304,  305,  306,  307,  308, 
            -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
@@ -6389,305 +6582,270 @@ private static final int[] yyCheck4() {
            -1,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
           334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343, 
           344,  345,  346,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           37,   38,   -1,  357,  358,   42,   43,  361,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,  287,  288,  289,  290,   -1, 
-           -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1,   -1, 
-           -1,  303,  304,  305,  306,   -1,   -1,   -1,  310,   -1, 
-          312,  313,  314,  315,  316,  317,   -1,   -1,   -1,   -1, 
-           -1,  323,   -1,   -1,   -1,   -1,  328,   94,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
-          352,   -1,  354,  355,   -1,  357,  358,  124,  360,  361, 
-          362,  363,  364,  365,  366,   33,  368,  369,   -1,   37, 
-           38,   -1,   40,   -1,   42,   43,   -1,   45,   -1,   47, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,  126,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
+           -1,   33,   -1,  357,  358,   37,   38,  361,   40,   -1, 
+           42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1, 
+           62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1, 
-           96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1, 
-          126,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-           -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  257, 
-          258,  259,  260,  261,  262,  263,  264,  265,  266,  267, 
-          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
-          278,  279,  280,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,  291,  292,  293,   -1,   44,   -1,   -1, 
-           -1,  299,  300,  301,  302,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327, 
-          328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337, 
-          338,   -1,   -1,   -1,   -1,  343,  344,  345,  346,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  357, 
-          358,  257,  258,  259,  260,  261,  262,  263,  264,  265, 
-          266,  267,  268,  269,  270,  271,  272,  273,  274,  275, 
-          276,  277,  278,  279,  280,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,  291,  292,  293,   -1,   -1, 
-           -1,   -1,   -1,  299,  300,  301,  302,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,   -1,   -1,   -1, 
+           -1,   -1,   94,   -1,   96,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
-           -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38, 
-           -1,  357,  358,   42,   43,   -1,   45,   -1,   47,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           -1,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          257,  258,  259,   -1,  261,   94,   -1,   96,  265,  266, 
-           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
-          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
-          287,  288,  289,  290,   -1,  124,  293,  126,   -1,   -1, 
-           -1,   -1,   -1,  300,   -1,   44,  303,  304,  305,  306, 
-          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
-          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   94,   -1,   96,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
-           -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
-           -1,  368,  369,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94, 
+           -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,  261, 
+          262,  263,  264,  265,  266,  267,  268,  269,  270,  271, 
+          272,  273,  274,  275,  276,  277,  278,  279,  280,  124, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,  291, 
+          292,  293,   -1,   44,   -1,   -1,   -1,  299,  300,  301, 
+          302,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40,   -1, 
-           42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1, 
-           62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258, 
-          259,  260,  261,  262,  263,  264,  265,  266,  267,  268, 
-          269,  270,  271,  272,  273,  274,  275,  276,  277,  278, 
-          279,  280,   94,   -1,   96,  284,  285,  286,  287,  288, 
-          289,  290,  291,  292,  293,   -1,   -1,   -1,   -1,   -1, 
-          299,  300,  301,  302,  303,  304,  305,  306,  307,   -1, 
-           -1,  310,  124,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,   -1,  343,  344,  345,  346,  257,  258, 
-          259,   -1,  261,   -1,   -1,   -1,  265,  266,  357,  358, 
-           -1,  270,   -1,  272,  273,  274,  275,  276,  277,  278, 
-           -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
-          289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1, 
-           -1,  300,   -1,   -1,  303,  304,  305,  306,  307,  308, 
-          309,  310,  311,   -1,  313,  314,  315,  316,  317,  318, 
-          319,   -1,   33,   -1,  323,   -1,   37,   38,   -1,   40, 
-           -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60, 
-          349,   62,   -1,  352,  353,  354,  355,   -1,   -1,   -1, 
-           -1,  360,  361,  362,  363,  364,  365,  366,   -1,  368, 
-          369,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   94,   -1,   96,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,  306,  307,   -1,   -1,  310,   -1, 
-           -1,   -1,   -1,  124,   60,  126,   62,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  326,  327,  328,  329,  330,  331, 
           332,  333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1, 
-           -1,  343,  344,  345,  346,   -1,   -1,   -1,   94,   -1, 
-           96,   -1,   -1,   -1,   33,  357,  358,   -1,   37,   38, 
-           -1,   40,   -1,   42,   43,   -1,   45,   -1,   47,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1, 
-          126,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37, 
-           38,   -1,   40,   -1,   42,   43,   -1,   45,   -1,   47, 
-           -1,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1,   -1, 
-           -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1, 
-           33,   -1,   -1,   -1,   37,   38,   94,   40,   96,   42, 
+           -1,  343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  357,  358,  257,  258,  259, 
+          260,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
+          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
+          280,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
+          290,  291,  292,  293,   -1,   -1,   -1,   -1,   -1,  299, 
+          300,  301,  302,  303,  304,  305,  306,  307,  308,  309, 
+          310,  311,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+           33,   -1,   -1,   -1,   37,   38,   -1,  357,  358,   42, 
            43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,  126,   -1, 
-           -1,   -1,   -1,   -1,   -1,  306,  307,   -1,   -1,  310, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,   -1,   -1,   -1,   -1,  257,  258,  259,   -1, 
+          261,   94,   -1,   96,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,  124,  293,  126,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   44,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   94,   -1,   96,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,   -1,   -1,  337,  338,   -1,   -1, 
-           -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1,   -1, 
-           -1,  124,   -1,  126,   33,   -1,  357,  358,   37,   38, 
-           -1,   40,   -1,   42,   43,   -1,   45,   -1,   47,   -1, 
-          306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1, 
-           -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,   -1,   -1,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
+           -1,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
+           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  257,  258,  259,  260,  261,  262, 
+          263,  264,  265,  266,  267,  268,  269,  270,  271,  272, 
+          273,  274,  275,  276,  277,  278,  279,  280,   94,   -1, 
+           96,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
+          293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302, 
+          303,  304,  305,  306,  307,   -1,   -1,  310,  124,   -1, 
+          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  326,  327,  328,  329,  330,  331,  332, 
+          333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1, 
+          343,  344,  345,  346,  257,  258,  259,   -1,  261,   -1, 
+           -1,   -1,  265,  266,  357,  358,   -1,  270,   -1,  272, 
+          273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
+           -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
+          293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1, 
+          303,  304,  305,  306,  307,  308,  309,  310,  311,   -1, 
+          313,  314,  315,  316,  317,  318,  319,   -1,   33,   -1, 
+          323,   -1,   37,   38,   -1,   40,   -1,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,  349,   62,   -1,  352, 
+          353,  354,  355,   -1,   -1,   -1,   -1,  360,  361,  362, 
+          363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94, 
+           -1,   96,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1, 
+          306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1,  124, 
+           60,  126,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
            -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1,   -1, 
-           -1,  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,   -1, 
-           -1,  310,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,   -1,  343,  344,  345,  346,  306,  307, 
-           -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,  357,  358, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327, 
-          328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337, 
-          338,   -1,   -1,   -1,   -1,  343,  344,  345,  346,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  357, 
-          358,   -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1, 
+          346,   -1,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1, 
+           33,  357,  358,   -1,   37,   38,   -1,   40,   -1,   42, 
+           43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,   -1,  126,   60,   -1,   62, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40,   -1, 
+           42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1, 
+           -1,   94,   -1,   96,   -1,   -1,   -1,   -1,   60,   -1, 
+           62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,   -1,  126,   -1,   -1,   33,   -1,   -1,   -1, 
+           37,   38,   94,   40,   96,   42,   43,   -1,   45,   -1, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
+           -1,  306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96, 
+           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
+           -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344, 
+          345,  346,   -1,   -1,   -1,   -1,   -1,  124,   -1,  126, 
+           33,   -1,  357,  358,   37,   38,   -1,   40,   -1,   42, 
+           43,   -1,   45,   -1,   47,   -1,  306,  307,   -1,   -1, 
+          310,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+           -1,   94,   -1,   96,   -1,   -1,   -1,  357,  358,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1, 
+           -1,  124,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,  326,  327,  328,  329,  330,  331,  332, 
           333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1, 
-          343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   33,   -1,  357,  358,   37,   38,   -1,   40, 
+          343,  344,  345,  346,  306,  307,   -1,   -1,  310,   -1, 
+           -1,   -1,   -1,   -1,  357,  358,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  326,  327,  328,  329,  330,  331, 
+          332,  333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1, 
+           -1,  343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  357,  358,   -1,   -1,  306, 
+          307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  326, 
+          327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1, 
+          337,  338,   -1,   -1,   -1,   -1,  343,  344,  345,  346, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1, 
+          357,  358,   37,   38,   -1,   40,   -1,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94, 
+           -1,   96,   -1,  326,  327,  328,  329,  330,  331,  332, 
+          333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1, 
+          343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1,  124, 
+           -1,  126,   33,   -1,  357,  358,   37,   38,   -1,   40, 
            -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60, 
            -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,   -1, 
-           -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   94,   -1,   96,   -1,  326,  327,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1, 
-           -1,   -1,   -1,  124,   -1,  126,   33,   -1,  357,  358, 
-           37,   38,   -1,   40,   -1,   42,   43,   -1,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1, 
+           -1,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1,   -1, 
+           60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96, 
+           -1,   37,   38,  124,   40,  126,   42,   43,   -1,   45, 
+           -1,   47,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   33,   -1,   -1,   -1,   37,   38,  124,   40,  126, 
-           42,   43,   -1,   45,   -1,   47,   -1,   -1,   94,   -1, 
-           96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1, 
-           62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,  124,   -1, 
-          126,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
-           -1,   47,   94,   -1,   96,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,  124,   -1,  126,   37,   38,   -1, 
+           40,   -1,   42,   43,   -1,   45,   -1,   47,   94,   -1, 
+           96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1, 
+          126,  306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1, 
+           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
+           -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344, 
+          345,  346,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1, 
+           33,   -1,  357,  358,   37,   38,   -1,   40,   -1,   42, 
+           43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,   -1,  126,  306,  307,   -1,   -1,  310, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1, 
-           96,   -1,   -1,   -1,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,   -1,   -1,  337,  338,   -1,   -1, 
-           -1,   -1,  343,  344,  345,  346,   -1,   -1,  124,   -1, 
-          126,   -1,   -1,   -1,   33,   -1,  357,  358,   37,   38, 
-           -1,   40,   -1,   42,   43,   -1,   45,   -1,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,  306,  307,   -1,   -1,  310, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306, 
-          307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1,  326, 
-          327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1, 
-          337,  338,   -1,   -1,   -1,   -1,  343,  344,  345,  346, 
-          306,  307,   -1,   -1,  310,  124,   -1,  126,   -1,   -1, 
-          357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
-           -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,  306,  307,   -1,   -1,  310,   -1, 
-           -1,  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  326,  327,  328,  329,  330,  331, 
-          332,  333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1, 
-           -1,  343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1, 
-          306,  307,   -1,   -1,  310,  357,  358,   -1,   -1,   -1, 
+           -1,   94,   -1,   96,   -1,  326,  327,  328,  329,  330, 
+          331,  332,  333,  334,   -1,   -1,  337,  338,   -1,   -1, 
+           -1,   -1,  343,  344,  345,  346,  306,  307,   -1,   -1, 
+          310,  124,   -1,  126,   -1,   -1,  357,  358,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+          306,  307,   -1,   -1,  310,   -1,   -1,  357,  358,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
            -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
-           -1,  357,  358,   37,   38,   -1,   40,   -1,   42,   43, 
-           -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   -1, 
+          346,   -1,   -1,   -1,   -1,   -1,  306,  307,   -1,   -1, 
+          310,  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   33,   -1,  357,  358,   37, 
+           38,   -1,   40,   -1,   42,   43,   -1,   45,   -1,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,   -1, 
-           -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           94,   -1,   96,   -1,   -1,   -1,   -1,  326,  327,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1, 
-          124,   -1,  126,   -1,   -1,   -1,   33,   -1,  357,  358, 
-           37,   38,   -1,   40,   -1,   42,   43,   -1,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
+           -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,  126, 
-           -1,   -1,   33,   -1,   -1,   -1,   37,   38,   94,   -1, 
-           96,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
+           -1,   -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1, 
+           -1,   -1,   -1,  326,  327,  328,  329,  330,  331,  332, 
+          333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1, 
+          343,  344,  345,  346,   -1,   -1,  124,   -1,  126,   -1, 
+           -1,   -1,   33,   -1,  357,  358,   37,   38,   -1,   40, 
+           -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60, 
-           -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1, 
-          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1, 
            -1,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1,   -1, 
-           -1,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
-          334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343, 
-          344,  345,  346,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  357,  358,   -1,   -1,   -1,   -1,   -1, 
+           60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   33,   -1, 
+           -1,   -1,   37,   38,   94,   -1,   96,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94, 
+           -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307, 
+           -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+           -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327, 
+          328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337, 
+          338,   -1,   -1,   -1,   -1,  343,  344,  345,  346,   94, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  357, 
+          358,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306, 
-          307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  326, 
-          327,  328,  329,  330,  331,  332,  333,  334,   94,   -1, 
-          337,  338,   -1,   -1,   -1,   -1,  343,  344,  345,  346, 
-          306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1, 
-          357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
-           -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  357,  358,   -1,   -1,  306,  307,   -1,   -1,  310, 
+           -1,   -1,   -1,   -1,   -1,  306,  307,   -1,   -1,  310, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,   -1,   -1,  337,  338,   -1,   -1, 
-           -1,   -1,  343,  344,  345,  346,  287,  288,  289,  290, 
-           -1,   -1,   -1,   -1,   -1,   -1,  357,  358,   -1,   -1, 
-           -1,   -1,  303,  304,  305,  306,   -1,   -1,   -1,  310, 
-           -1,  312,  313,  314,  315,  316,  317,   -1,   -1,   -1, 
-           -1,   -1,  323,   -1,   -1,   -1,   -1,  328,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
-           -1,  352,   -1,  354,  355,   -1,  357,  358,   -1,  360, 
-          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
-           -1,  287,  288,  289,  290,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  303,  304,  305, 
-          306,   -1,   -1,   -1,  310,   -1,   -1,  313,  314,  315, 
-          316,  317,   -1,   -1,   -1,   -1,   -1,  323,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,   -1,  354,  355, 
-           -1,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
-           -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
-          273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
-           -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
-          293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1, 
-          303,  304,  305,  306,  307,  308,  309,  310,  311,   -1, 
-          313,  314,  315,  316,  317,  318,  319,   -1,   -1,   -1, 
-          323,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
-          353,  354,  355,   -1,  357,   -1,   -1,  360,  361,  362, 
-          363,  364,  365,  366,   -1,  368,  369,  257,  258,  259, 
-           -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   -1, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
+          331,  332,  333,  334,   94,   -1,  337,  338,   -1,   -1, 
+           -1,   -1,  343,  344,  345,  346,  306,  307,   -1,   -1, 
+          310,   -1,   -1,   -1,   -1,   -1,  357,  358,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  357,  358,   -1, 
+           -1,  306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   -1, 
+           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
+           -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344, 
+          345,  346,  287,  288,  289,  290,   -1,   -1,   -1,   -1, 
+           -1,   -1,  357,  358,   -1,   -1,   -1,   -1,  303,  304, 
+          305,  306,   -1,   -1,   -1,  310,   -1,  312,  313,  314, 
+          315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,   -1, 
+           -1,   -1,   -1,  328,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,   -1,  354, 
+          355,   -1,  357,  358,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,   -1,  287,  288,  289, 
+          290,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  303,  304,  305,  306,   -1,   -1,   -1, 
+          310,   -1,   -1,  313,  314,  315,  316,  317,   -1,   -1, 
            -1,   -1,   -1,  323,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,  357,   -1,   -1, 
+           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
+           -1,   -1,  352,   -1,  354,  355,   -1,  357,   -1,   -1, 
           360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-          257,  258,  259,   -1,  261,   -1,   -1,   -1,  265,  266, 
-           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
-          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
-          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
-           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
-          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
-          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,   -1, 
+          287,  288,  289,  290,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  303,  304,  305,  306, 
+           -1,   -1,   -1,  310,   -1,   -1,  313,  314,  315,  316, 
+          317,   -1,   -1,   -1,   -1,   -1,  323,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  345,   -1, 
-           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,   -1,  354,  355,   -1, 
            -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
            -1,  368,  369,  257,  258,  259,   -1,  261,   -1,   -1, 
            -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
@@ -6699,7 +6857,7 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,   -1,   -1,   -1,  360,  361,  362,  363, 
+          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
           364,  365,  366,   -1,  368,  369,  257,  258,  259,   -1, 
           261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270, 
            -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
@@ -6710,7 +6868,7 @@ private static final int[] yyCheck4() {
            -1,   -1,  323,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
-           -1,  352,  353,  354,  355,   -1,   -1,   -1,   -1,  360, 
+           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
           361,  362,  363,  364,  365,  366,   -1,  368,  369,  257, 
           258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
            -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
@@ -6720,7 +6878,7 @@ private static final int[] yyCheck4() {
           308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
           318,  319,   -1,   -1,   -1,  323,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  345,   -1,   -1, 
            -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,   -1, 
            -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
           368,  369,  257,  258,  259,   -1,  261,   -1,   -1,   -1, 
@@ -6734,7 +6892,41 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
           355,   -1,   -1,   -1,   -1,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369, 
+          365,  366,   -1,  368,  369,  257,  258,  259,   -1,  261, 
+           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
+          272,  273,  274,  275,  276,  277,  278,   -1,   -1,   -1, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
+           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
+           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+           -1,  323,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
+          352,  353,  354,  355,   -1,   -1,   -1,   -1,  360,  361, 
+          362,  363,  364,  365,  366,   -1,  368,  369,  257,  258, 
+          259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1, 
+           -1,  270,   -1,  272,  273,  274,  275,  276,  277,  278, 
+           -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1, 
+           -1,  300,   -1,   -1,  303,  304,  305,  306,  307,  308, 
+          309,  310,  311,   -1,  313,  314,  315,  316,  317,  318, 
+          319,   -1,   -1,   -1,  323,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          349,   -1,   -1,  352,  353,  354,  355,   -1,   -1,   -1, 
+           -1,  360,  361,  362,  363,  364,  365,  366,   -1,  368, 
+          369,  257,  258,  259,   -1,  261,   -1,   -1,   -1,  265, 
+          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
+          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
+          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
+           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
+          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
+          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
+           -1,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
+          366,   -1,  368,  369, 
       };
    }
 
diff --git a/core/src/main/java/org/jruby/ext/set/EnumerableExt.java b/core/src/main/java/org/jruby/ext/set/EnumerableExt.java
index 6fed4387907..f0a46680b71 100644
--- a/core/src/main/java/org/jruby/ext/set/EnumerableExt.java
+++ b/core/src/main/java/org/jruby/ext/set/EnumerableExt.java
@@ -45,7 +45,7 @@ public abstract class EnumerableExt {
 
     //@JRubyMethod
     public static IRubyObject to_set(final ThreadContext context, final IRubyObject self, final Block block) {
-        RubySet set = new RubySet(context.runtime, Access.getClass(context, "Set"));
+        RubySet set = new RubySet(context.runtime, Access.getClass(context, "Set"), false);
         set.initialize(context, self, block);
         return set; // return runtime.getClass("Set").newInstance(context, self, block);
     }
diff --git a/core/src/main/java/org/jruby/ext/set/RubySet.java b/core/src/main/java/org/jruby/ext/set/RubySet.java
index 9c5e5dbb97a..c6e7a63621b 100644
--- a/core/src/main/java/org/jruby/ext/set/RubySet.java
+++ b/core/src/main/java/org/jruby/ext/set/RubySet.java
@@ -34,6 +34,9 @@
 import org.jruby.RubyEnumerator.SizeFn;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.api.Access;
+import org.jruby.api.Create;
+import org.jruby.api.Error;
+import org.jruby.api.Warn;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.*;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -70,15 +73,20 @@
  */
 @org.jruby.anno.JRubyClass(name="Set", include = { "Enumerable" })
 public class RubySet extends RubyObject implements Set {
+    private RubyHash hash;
 
-    static RubyClass createSetClass(ThreadContext context, RubyClass Object, RubyModule Enumerable) {
+    public static RubyClass createSetClass(ThreadContext context, RubyClass Object, RubyModule Enumerable) {
         RubyClass Set = defineClass(context, "Set", Object, RubySet::new).
                 reifiedClass(RubySet.class).
                 include(context, Enumerable).
-                defineMethods(context, RubySet.class).
-                tap(c -> c.marshalWith(new SetMarshal(c.getMarshal())));
+                tap((RubyClass c) -> c.marshalWith(new SetMarshal(c.getMarshal())));
 
-        loadService(context).require("jruby/set.rb");
+        // Define CoreSet before defining inherited (and other methods) on Set
+        Set.defineClassUnder(context, "CoreSet", Set, RubySet::new);
+
+        Set.defineMethods(context, RubySet.class);
+
+        Enumerable.defineMethods(context, EnumerableExt.class);
 
         return Set;
     }
@@ -98,60 +106,100 @@ public void marshalTo(Ruby runtime, Object obj, RubyClass type, org.jruby.runtim
             defaultMarshal.marshalTo(runtime, obj, type, marshalStream);
         }
 
+        /**
+         * Dump a set by using a dummy object to hold the @hash ivar, for compatibility.
+         *
+         * This logic duplicates some of the default marshal sequence but uses a dummy object to whole the @hash
+         * instance variable expected by older Ruby implementations.
+         *
+         * @param context the current thread context
+         * @param out the output stream
+         * @param obj the set object to dump
+         * @param type the class of the set object
+         * @param marshalStream the marshal stream
+         */
         public void marshalTo(ThreadContext context, RubyOutputStream out, Object obj, RubyClass type, MarshalDumper marshalStream) {
-            defaultMarshal.marshalTo(context, out, obj, type, marshalStream);
+            RubySet set = (RubySet) obj;
+
+            // register set object now for recursive sets
+            marshalStream.registerObject(set);
+
+            // create dummy object with extra @hash ivar and dump all variables from that
+            RubyObject dummy = new RubyObject(context.runtime, type);
+            dummy.setInstanceVariable("@hash", set.hash);
+            set.copyInstanceVariablesInto(dummy);
+            marshalStream.dumpVariables(context, out, dummy);
         }
 
         @Deprecated(since = "10.0.0.0", forRemoval = true)
         @SuppressWarnings("removal")
         public Object unmarshalFrom(Ruby runtime, RubyClass type, org.jruby.runtime.marshal.UnmarshalStream unmarshalStream) throws IOException {
             Object result = defaultMarshal.unmarshalFrom(runtime, type, unmarshalStream);
-            ((RubySet) result).unmarshal();
             return result;
         }
 
+        /**
+         * Load a Set from a marshal stream by intercepting the dummy object carrying the @hash ivar.
+         *
+         * See {@link #marshalTo} for an explanation of this custom marshal logic.
+         *
+         * @param context the current thread context
+         * @param in the input stream
+         * @param type the class of the set object
+         * @param loader the marshal loader
+         * @return the unmarshalled Set object
+         */
         public Object unmarshalFrom(ThreadContext context, RubyInputStream in, RubyClass type, MarshalLoader loader) {
-            Object result = defaultMarshal.unmarshalFrom(context, in, type, loader);
-            ((RubySet) result).unmarshal();
-            return result;
+            RubySet set = new RubySet(context.runtime, type, false);
+
+            loader.entry(set);
+
+            // unmarshal as dummy object and extra @hash ivar
+            RubyObject dummy = new RubyObject(context.runtime, type);
+            loader.ivar(context, in, null, dummy, null);
+
+            // update internal hash
+            set.hash = (RubyHash) dummy.getInstanceVariables().removeInstanceVariable("@hash");
+
+            // copy remaining instance variables
+            dummy.copyInstanceVariablesInto(set);
+
+            return set;
         }
 
     }
 
-    void unmarshal() {
-        this.hash = (RubyHash) getInstanceVariable("@hash");
+    protected RubySet(Ruby runtime, RubyClass klass) {
+        this(runtime, klass, true);
     }
 
-    RubyHash hash; // @hash
-
-    protected RubySet(Ruby runtime, RubyClass klass) {
+    protected RubySet(Ruby runtime, RubyClass klass, boolean alloc) {
         super(runtime, klass);
+        if (alloc) allocHash(runtime);
     }
 
-    /*
-    private RubySet(Ruby runtime, RubyHash hash) {
-        super(runtime, runtime.getClass("Set"));
-        allocHash(hash);
-    } */
+    private RubySet(Ruby runtime, RubyClass klass, RubyHash hash) {
+        super(runtime, klass);
+        this.hash = hash;
+    }
 
     // since MRI uses Hash.new(false) we'll (initially) strive for maximum compatibility
     // ... this is important with Rails using Sprockets at its marshalling Set instances
 
     final void allocHash(final ThreadContext context) {
-        setHash(new RubyHash(context.runtime, context.fals));
+        setHash(RubyHashLinkedBuckets.newLBHash(context.runtime, context.fals));
     }
 
     final void allocHash(final Ruby runtime) {
-        setHash(new RubyHash(runtime, runtime.getFalse()));
+        setHash(RubyHashLinkedBuckets.newLBHash(runtime, runtime.getFalse()));
     }
 
     final void allocHash(final ThreadContext context, final int size) {
-        setHash(new RubyHash(context.runtime, context.fals, size));
+        setHash(RubyHashLinkedBuckets.newLBHash(context.runtime, context.fals, size));
     }
 
     final void setHash(final RubyHash hash) {
         this.hash = hash;
-        setInstanceVariable("@hash", hash); // MRI compat with set.rb
     }
 
     /**
@@ -182,13 +230,11 @@ public static RubySet newSet(final Ruby runtime) {
      * @return a new Set
      */
     public static RubySet newSet(final Ruby runtime, final RubyClass metaclass) {
-        RubySet set = new RubySet(runtime, metaclass);
-        set.allocHash(runtime);
-        return set;
+        return new RubySet(runtime, metaclass);
     }
 
     private static RubySet newSet(final ThreadContext context, final RubyClass metaClass, final RubyArray elements) {
-        final RubySet set = new RubySet(context.runtime, metaClass);
+        final RubySet set = new RubySet(context.runtime, metaClass, false);
         return set.initSet(context, elements.toJavaArrayMaybeUnsafe(), 0, elements.size());
     }
 
@@ -207,7 +253,7 @@ final RubySet initSet(final ThreadContext context, final IRubyObject[] elements,
     public static RubySet create(final ThreadContext context, IRubyObject self, IRubyObject... ary) {
         final Ruby runtime = context.runtime;
 
-        RubySet set = new RubySet(runtime, (RubyClass) self);
+        RubySet set = new RubySet(runtime, (RubyClass) self, false);
         return set.initSet(context, ary, 0, ary.length);
     }
 
@@ -226,50 +272,51 @@ public IRubyObject initialize(ThreadContext context, Block block) {
      * initialize(enum = nil, &amp;block)
      */
     @JRubyMethod(visibility = Visibility.PRIVATE)
-    public IRubyObject initialize(ThreadContext context, IRubyObject enume, Block block) {
+    public IRubyObject initialize(final ThreadContext context, IRubyObject enume, final Block block) {
         if ( enume.isNil() ) return initialize(context, block);
 
-        if ( block.isGiven() ) {
-            return initWithEnum(context, enume, block);
-        }
-
-        allocHash(context);
-        return sites(context).merge.call(context, this, this, enume); // TODO site-cache
-    }
-
-    protected IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
-        return switch (args.length) {
-            case 0 -> initialize(context, block);
-            case 1 -> initialize(context, args[0], block);
-            default -> throw argumentError(context, args.length, 1);
-        };
-    }
-
-    private IRubyObject initWithEnum(final ThreadContext context, final IRubyObject enume, final Block block) {
         if (enume instanceof RubyArray ary) {
             allocHash(context, ary.size());
             for ( int i = 0; i < ary.size(); i++ ) {
-                invokeAdd(context, block.yield(context, ary.eltInternal(i)));
+                IRubyObject key = ary.eltInternal(i);
+                if (block.isGiven()) key = block.yield(context, key);
+                invokeAdd(context, key);
             }
             return ary; // done
         } else if (enume instanceof RubySet set) {
             allocHash(context, set.size());
             for ( IRubyObject elem : set.elementsOrdered() ) {
-                invokeAdd(context, block.yield(context, elem));
+                if (block.isGiven()) elem = block.yield(context, elem);
+                invokeAdd(context, elem);
             }
             return set; // done
         } else {
             allocHash(context);
 
-            // set.rb do_with_enum :
-            return doWithEnum(context, enume, new EachBody(context) {
-                IRubyObject yieldImpl(ThreadContext context, IRubyObject val) {
-                    return invokeAdd(context, block.yield(context, val));
-                }
-            });
+            if (block.isGiven()) {
+                return doWithEnum(context, enume, new EachBody(context) {
+                    IRubyObject yieldImpl(ThreadContext context2, IRubyObject val) {
+                        return invokeAdd(context2, block.yield(context2, val));
+                    }
+                });
+            } else {
+                return doWithEnum(context, enume, new EachBody(context) {
+                    IRubyObject yieldImpl(ThreadContext context2, IRubyObject val) {
+                        return invokeAdd(context2, val);
+                    }
+                });
+            }
         }
     }
 
+    protected IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
+        return switch (args.length) {
+            case 0 -> initialize(context, block);
+            case 1 -> initialize(context, args[0], block);
+            default -> throw argumentError(context, args.length, 1);
+        };
+    }
+
     // set.rb do_with_enum (block is required)
     private static IRubyObject doWithEnum(final ThreadContext context, final IRubyObject enume, final EachBody blockImpl) {
         JavaSites.SetSites sites = sites(context);
@@ -283,18 +330,6 @@ private static IRubyObject doWithEnum(final ThreadContext context, final IRubyOb
         throw argumentError(context, "value must be enumerable");
     }
 
-    // YAML doesn't have proper treatment for Set serialization, it dumps it just like
-    // any Ruby object, meaning on YAML.load will allocate an "initialize" all i-vars!
-    @Override
-    public IRubyObject instance_variable_set(IRubyObject name, IRubyObject value) {
-        if (getRuntime().newSymbol("@hash").equals(name)) {
-            if (value instanceof RubyHash) {
-                setHash((RubyHash) value); return value;
-            }
-        }
-        return super.instance_variable_set(name, value);
-    }
-
     IRubyObject invokeAdd(final ThreadContext context, final IRubyObject val) {
         return sites(context).add.call(context, this, this, val);
     }
@@ -327,7 +362,7 @@ protected final IRubyObject doYield(ThreadContext context, Block block, IRubyObj
     @JRubyMethod(frame = true)
     public IRubyObject initialize_dup(ThreadContext context, IRubyObject orig) {
         sites(context).initialize_dup_super.call(context, this, this, orig);
-        setHash((RubyHash) (((RubySet) orig).hash).dup(context));
+        this.hash = (RubyHash) (((RubySet) orig).hash).dup(context);
         return this;
     }
 
@@ -337,7 +372,7 @@ public IRubyObject initialize_clone(ThreadContext context, IRubyObject[] args) {
 
         sites(context).initialize_clone_super.call(context, this, this, args);
         IRubyObject orig = args[0];
-        setHash((RubyHash) (((RubySet) orig).hash).rbClone(context));
+        this.hash = (RubyHash) (((RubySet) orig).hash).rbClone(context);
         return this;
     }
 
@@ -411,7 +446,7 @@ public RubyArray to_a(final ThreadContext context) {
     @JRubyMethod
     public RubySet to_set(final ThreadContext context, final Block block) {
         if ( block.isGiven() ) {
-            RubySet set = new RubySet(context.runtime, getMetaClass());
+            RubySet set = new RubySet(context.runtime, getMetaClass(), false);
             set.initialize(context, this, block);
             return set;
         }
@@ -423,6 +458,8 @@ public RubySet to_set(final ThreadContext context, final Block block) {
     public RubySet to_set(final ThreadContext context, final IRubyObject[] args, final Block block) {
         if ( args.length == 0 ) return to_set(context, block);
 
+        Warn.warnDeprecated(context, "passing arguments to Set#to_set");
+
         IRubyObject klass = args[0];
         final RubyClass Set = Access.getClass(context, "Set");
 
@@ -436,13 +473,15 @@ public RubySet to_set(final ThreadContext context, final IRubyObject[] args, fin
             rest = args;
         }
 
-        RubySet set = new RubySet(context.runtime, (RubyClass) klass);
+        RubySet set = new RubySet(context.runtime, (RubyClass) klass, false);
         set.initialize(context, rest, block);
         return set;
     }
 
     @JRubyMethod
     public IRubyObject compare_by_identity(ThreadContext context) {
+        if (hash.isComparedByIdentity()) return this;
+        if (isFrozen()) throw context.runtime.newFrozenError("Set", this);
         this.hash.compare_by_identity(context);
         return this;
     }
@@ -564,9 +603,12 @@ public IRubyObject proper_subset_p(final ThreadContext context, IRubyObject setA
      */
     @JRubyMethod(name = "intersect?")
     public IRubyObject intersect_p(final ThreadContext context, IRubyObject setArg) {
-        if (!(setArg instanceof RubySet set)) throw argumentError(context, "value must be a set");
-
-        return asBoolean(context, intersect(set));
+        if (setArg instanceof RubySet other) {
+            return asBoolean(context, intersect(other));
+        } else if (setArg.getType().isKindOfModule(enumerableModule(context))) {
+            return setArg.callMethod(context, "any?", this);
+        }
+        throw argumentError(context, "value must be a set or array");
     }
 
     public boolean intersect(final RubySet set) {
@@ -590,9 +632,7 @@ public boolean intersect(final RubySet set) {
      */
     @JRubyMethod(name = "disjoint?")
     public IRubyObject disjoint_p(final ThreadContext context, IRubyObject setArg) {
-        if (!(setArg instanceof RubySet set)) throw argumentError(context, "value must be a set");
-
-        return asBoolean(context,  !intersect(set));
+        return asBoolean(context,  !intersect_p(context, setArg).isTrue());
     }
 
     @JRubyMethod
@@ -628,7 +668,7 @@ protected void addImpl(final Ruby runtime, final IRubyObject obj) {
     }
 
     protected void addImpl(final ThreadContext context, final IRubyObject obj) {
-        hash.fastASetCheckString(context.runtime, obj, context.tru); // @hash[obj] = true
+        hash.fastASetCheckString(context.runtime, obj, context.tru);
     }
 
     protected void addImplSet(final ThreadContext context, final RubySet set) {
@@ -747,8 +787,12 @@ public RubySet rb_merge(final ThreadContext context, IRubyObject enume) {
     /**
      * Merges the elements of the given enumerable object to the set and returns self.
      */
-    @JRubyMethod(name = "merge", required=1, rest=true)
+    @JRubyMethod(name = "merge", required=0, rest=true)
     public RubySet rb_merge(final ThreadContext context, IRubyObject... args) {
+        if (args.length > 0 && args[args.length - 1] instanceof RubyHash) {
+            throw argumentError(context, "no keywords accepted");
+        }
+
         var length = args.length;
         for (int i = 0; i < length; i++) {
             var arg = args[i];
@@ -819,7 +863,7 @@ public IRubyObject op_diff(final ThreadContext context, IRubyObject enume) {
      */
     @JRubyMethod(name = "&", alias = { "intersection" })
     public IRubyObject op_and(final ThreadContext context, IRubyObject enume) {
-        final RubySet newSet = new RubySet(context.runtime, getMetaClass());
+        final RubySet newSet = new RubySet(context.runtime, getMetaClass(), false);
         if (enume instanceof RubySet set) {
             newSet.allocHash(context, set.size());
             for ( IRubyObject obj : set.elementsOrdered() ) {
@@ -851,9 +895,15 @@ IRubyObject yieldImpl(ThreadContext context, IRubyObject obj) {
      */
     @JRubyMethod(name = "^")
     public IRubyObject op_xor(final ThreadContext context, IRubyObject enume) {
-        RubySet newSet = new RubySet(context.runtime, Access.getClass(context, "Set"));
-        newSet.initialize(context, enume, Block.NULL_BLOCK); // Set.new(enum)
-        for (IRubyObject o : elementsOrdered()) {
+        RubySet newSet = (RubySet) dup(context);
+        RubySet otherSet;
+        if (enume instanceof RubySet set) {
+            otherSet = set;
+        } else {
+            otherSet = new RubySet(context.runtime, getMetaClass(), false);
+            otherSet.initialize(context, enume, Block.NULL_BLOCK); // Set.new(enum)
+        }
+        for (IRubyObject o : otherSet.elementsOrdered()) {
             if (newSet.containsImpl(o)) {
                 newSet.deleteImpl(o); // exclusive or
             } else {
@@ -869,7 +919,7 @@ public IRubyObject op_xor(final ThreadContext context, IRubyObject enume) {
     public IRubyObject op_equal(ThreadContext context, IRubyObject other) {
         if (this == other) return context.tru;
         if (getMetaClass().isInstance(other)) {
-            return hash.op_equal(context, ((RubySet) other).hash); // @hash == ...
+            return hash.op_equal(context, ((RubySet) other).hash);
         }
         if (other instanceof RubySet that) {
             if (size() == that.size()) { // && includes all of our elements :
@@ -906,7 +956,7 @@ public boolean eql(IRubyObject otherArg) {
     }
 
     @JRubyMethod
-    public RubyFixnum hash(ThreadContext context) { // @hash.hash
+    public RubyFixnum hash(ThreadContext context) {
         RubyHash hash = this.hash;
 
         return hash == null ?
@@ -918,7 +968,7 @@ public RubyFixnum hash(ThreadContext context) { // @hash.hash
     public IRubyObject classify(ThreadContext context, final Block block) {
         if (!block.isGiven()) return enumeratorizeWithSize(context, this, "classify", RubySet::size);
 
-        final RubyHash h = new RubyHash(context.runtime, size());
+        final RubyHash h = RubyHashLinkedBuckets.newLBHash(context.runtime, size());
 
         for ( IRubyObject i : elementsOrdered() ) {
             final IRubyObject key = block.yield(context, i);
@@ -955,10 +1005,10 @@ public IRubyObject classify(ThreadContext context, final Block block) {
     public IRubyObject divide(ThreadContext context, final Block block) {
         if (!block.isGiven()) return enumeratorizeWithSize(context, this, "divide", RubySet::size);
 
-        if (block.getSignature().arityValue() == 2) return divideTSort(context, block);
+        if (block.getSignature().arityValue() == 2) return setDivideArity2(context, block);
 
         RubyHash vals = (RubyHash) classify(context, block);
-        final RubySet set = new RubySet(context.runtime, Access.getClass(context, "Set"));
+        final RubySet set = new RubySet(context.runtime, Access.getClass(context, "Set"), false);
         set.allocHash(context, vals.size());
         for ( IRubyObject val : (Collection<IRubyObject>) vals.directValues() ) {
             set.invokeAdd(context, val);
@@ -966,106 +1016,77 @@ public IRubyObject divide(ThreadContext context, final Block block) {
         return set;
     }
 
-    private IRubyObject divideTSort(ThreadContext context, final Block block) {
-        final RubyHash dig = DivideTSortHash.newInstance(context);
-
-        /*
-          each { |u|
-            dig[u] = a = []
-            each{ |v| func.call(u, v) and a << v }
-          }
-         */
-        for ( IRubyObject u : elementsOrdered() ) {
-            var a = newArray(context);
-            dig.fastASet(u, a);
-            for ( IRubyObject v : elementsOrdered() ) {
-                IRubyObject ret = block.call(context, u, v);
-                if ( ret.isTrue() ) a.append(context, v);
-            }
-        }
+    // MRI: set_divide_arity2
+    IRubyObject setDivideArity2(ThreadContext context, Block block) {
+        RubyClass setClass = getMetaClass();
 
-        /*
-          set = Set.new()
-          dig.each_strongly_connected_component { |css|
-            set.add(self.class.new(css))
-          }
-          set
-         */
-        final RubyClass Set = Access.getClass(context, "Set");
-        final RubySet set = new RubySet(context.runtime, Set);
-        set.allocHash(context, dig.size());
-        sites(context).each_strongly_connected_component.call(context, this, dig, new Block(
-            new JavaInternalBlockBody(context.runtime, Signature.ONE_REQUIRED) {
-                @Override
-                public IRubyObject yield(ThreadContext context, IRubyObject[] args) {
-                    return doYield(context, null, args[0]);
-                }
+        RubyArray items = to_a(context);
+        items.setFrozen(true);
+        int size = items.size();
 
-                @Override
-                protected IRubyObject doYield(ThreadContext context, Block block, IRubyObject css) {
-                    // set.add( self.class.new(css) ) :
-                    set.addImpl(context, newSet(context, Set, (RubyArray) css));
-                    return context.nil;
-                }
-            })
-        );
+        int[] tmp_array = new int[size];
+        int[] uf_parents = new int[size];
 
-        return set;
-    }
+        for (int i = 0; i < size; i++) {
+            uf_parents[i] = i;
+        }
 
-    // NOTE: a replacement for set.rb's eval in Set#divide : `class << dig = {} ...`
-    public static final class DivideTSortHash extends RubyHash {
+        for (int i = 0; i < size - 1; i++) {
+            IRubyObject item1 = items.eltOk(i);
 
-        private static final String NAME = "DivideTSortHash"; // private constant under Set::
+            for (int j = i + 1; j < size; j++) {
+                IRubyObject item2 = items.eltOk(j);
 
-        static DivideTSortHash newInstance(final ThreadContext context) {
-            RubyClass Set = Access.getClass(context, "Set");
-            RubyClass klass = (RubyClass) Set.getConstantAt(context, NAME, true);
-            if (klass == null) { // initialize on-demand when Set#divide is first called
-                synchronized (DivideTSortHash.class) {
-                    klass = (RubyClass) Set.getConstantAt(context, NAME, true);
-                    if (klass == null) {
-                        var Hash = hashClass(context);
-                        klass = Set.defineClassUnder(context, NAME, Hash, Hash.getAllocator()).
-                                include(context, getTSort(context)).
-                                defineMethods(context, DivideTSortHash.class);
-                        Set.setConstantVisibility(context, NAME, true); // private
-                    }
+                if (block.yieldSpecific(context, item1, item2).isTrue() &&
+                        block.yieldSpecific(context, item2, item1).isTrue()) {
+                    setDivideUnionFindMerge(context, uf_parents, i, j, tmp_array);
                 }
             }
-            return new DivideTSortHash(context.runtime, klass);
         }
 
-        DivideTSortHash(final Ruby runtime, final RubyClass metaClass) {
-            super(runtime, metaClass);
-        }
+        RubySet finalSet = newSet(context.runtime, setClass);
+        RubyHash hash = Create.newHash(context);
 
-        /*
-         class << dig = {}         # :nodoc:
-           include TSort
-
-           alias tsort_each_node each_key
-           def tsort_each_child(node, &block)
-             fetch(node).each(&block)
-           end
-         end
-         */
+        for (int i = 0; i < size; i++) {
+            IRubyObject v = items.eltOk(i);
 
-        @JRubyMethod
-        public IRubyObject tsort_each_node(ThreadContext context, Block block) {
-            return each_key(context, block);
-        }
+            int root = setDivideUnionFindRoot(context, uf_parents, i, tmp_array);
+
+            IRubyObject set = hash.op_aref(context, asFixnum(context, root));
 
-        @JRubyMethod
-        public IRubyObject tsort_each_child(ThreadContext context, IRubyObject node, Block block) {
-            IRubyObject set = fetch(context, node, Block.NULL_BLOCK);
-            if ( set instanceof RubySet ) {
-                return ((RubySet) set).each(context, block);
+            if (set.isNil()) {
+                set = newSet(context.runtime, setClass);
+                hash.op_aset(context, asFixnum(context, root), set);
+                finalSet.add(context, set);
             }
-            // some Enumerable (we do not expect this to happen)
-            return sites(context).each.call(context, this, set, block);
+
+            ((RubySet) set).add(context, v);
         }
 
+        return finalSet;
+    }
+
+    // MRI: set_divide_union_find_merge
+    static void setDivideUnionFindMerge(ThreadContext context, int[] uf_parents, int i, int j, int[] tmp_array) {
+        int root_i = setDivideUnionFindRoot(context, uf_parents, i, tmp_array);
+        int root_j = setDivideUnionFindRoot(context, uf_parents, j, tmp_array);
+        if (root_i != root_j) uf_parents[root_j] = root_i;
+    }
+
+    // MRI: set_divide_union_find_root
+    static int setDivideUnionFindRoot(ThreadContext context, int[] uf_parents, int index, int[] tmp_array) {
+        int root = uf_parents[index];
+        int update_size = 0;
+        while (root != index) {
+            tmp_array[update_size++] = index;
+            index = root;
+            root = uf_parents[index];
+        }
+        for (int j = 0; j < update_size; j++) {
+            int idx = tmp_array[j];
+            uf_parents[idx] = root;
+        }
+        return root;
     }
 
     @JRubyMethod(name = "<=>")
@@ -1140,7 +1161,7 @@ public RubyString inspect(ThreadContext context) {
         try {
             context.runtime.registerInspecting(this);
             inspectSet(context, str);
-            return str.cat('>');
+            return str;
         } finally {
             context.runtime.unregisterInspecting(this);
         }
@@ -1149,26 +1170,24 @@ public RubyString inspect(ThreadContext context) {
     private RubyString inspectEmpty(ThreadContext context) {
         RubyString str = RubyString.newStringLight(context.runtime, 16, USASCIIEncoding.INSTANCE);
         inspectPrefix(context, str, getMetaClass());
-        str.cat('{').cat('}').cat('>'); // "#<Set: {}>"
+        str.cat('[').cat(']'); // "#<Set: {}>"
         return str;
     }
 
     private RubyString inspectRecurse(ThreadContext context) {
         RubyString str = RubyString.newStringLight(context.runtime, 20, USASCIIEncoding.INSTANCE);
         inspectPrefix(context, str, getMetaClass());
-        str.cat('{').cat(RECURSIVE_BYTES).cat('}').cat('>'); // "#<Set: {...}>"
+        str.cat('[').cat(RECURSIVE_BYTES).cat(']'); // "#<Set: {...}>"
         return str;
     }
 
     private static RubyString inspectPrefix(ThreadContext context, final RubyString str, final RubyClass metaClass) {
-        str.cat('#').cat('<').cat(metaClass.getRealClass().getName(context).getBytes(RubyEncoding.UTF8));
-        str.cat(':').cat(' ');
-        return str;
+        return str.catString(metaClass.getRealClass().getName(context));
     }
 
     private void inspectSet(final ThreadContext context, final RubyString str) {
 
-        str.cat((byte) '{');
+        str.cat((byte) '[');
 
         boolean notFirst = false;
 
@@ -1179,7 +1198,7 @@ private void inspectSet(final ThreadContext context, final RubyString str) {
             str.catWithCodeRange(s);
         }
 
-        str.cat((byte) '}');
+        str.cat((byte) ']');
     }
 
     // pp (in __jruby/set.rb__)
@@ -1190,13 +1209,27 @@ private void inspectSet(final ThreadContext context, final RubyString str) {
     //    return pp.callMethod(context, "text", str); // pp.text ...
     //}
 
+    @JRubyMethod(meta = true)
+    public static IRubyObject inherited(ThreadContext context, IRubyObject klass, IRubyObject subclass) {
+        Ruby runtime = context.runtime;
+        if (klass == runtime.getSet()) {
+            // When subclassing directly from Set, include the compatibility layer
+            runtime.getLoadService().require("set/subclass_compatible.rb");
+            RubyModule SubclassCompatible = (RubyModule) ((RubyClass) klass).getConstant(context, "SubclassCompatible");
+            RubyModule subklass = (RubyModule) subclass;
+            subklass.includeModule(SubclassCompatible);
+            ((RubyModule) SubclassCompatible.getConstant(context, "ClassMethods")).extend_object(context, subklass);
+        }
+        return context.nil;
+    }
+
     protected final Set<IRubyObject> elements() {
         return hash.directKeySet(); // Hash view -> no copying
     }
 
     // NOTE: implementation does not expect to be used for altering contents using iterator
     protected Set<IRubyObject> elementsOrdered() {
-        return elements(); // potentially -> to be re-defined by SortedSet
+        return elements();
     }
 
     @Deprecated(since = "10.0.0.0")
diff --git a/core/src/main/java/org/jruby/ext/set/RubySortedSet.java b/core/src/main/java/org/jruby/ext/set/RubySortedSet.java
deleted file mode 100644
index df18bed363d..00000000000
--- a/core/src/main/java/org/jruby/ext/set/RubySortedSet.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- **** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2016 Karol Bucek
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby.ext.set;
-
-import org.jruby.*;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.Arity;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-import java.util.*;
-
-import static org.jruby.RubyArray.DefaultComparator;
-import static org.jruby.api.Define.defineClass;
-
-/**
- * Native implementation of Ruby's SortedSet (set.rb replacement).
- *
- * @author kares
- */
-@org.jruby.anno.JRubyClass(name="SortedSet", parent = "Set")
-public class RubySortedSet extends RubySet implements SortedSet {
-
-    static RubyClass createSortedSetClass(ThreadContext context, RubyClass Set) {
-        return defineClass(context, "SortedSet", Set, RubySortedSet::new).
-                reifiedClass(RubySortedSet.class).
-                defineMethods(context, RubySortedSet.class);
-    }
-
-    private static class OrderComparator extends DefaultComparator {
-
-        private final Ruby runtime;
-
-        OrderComparator(final Ruby runtime) {
-            super(null); this.runtime = runtime;
-        }
-
-        @Override
-        protected ThreadContext context() {
-            return runtime.getCurrentContext();
-        }
-
-        // NOTE: need a custom impl so that we use special care when compare returns 0
-        // this is required since/if we're using a TreeSet which assumes 0 -> eql == true
-
-        public int compare(IRubyObject obj1, IRubyObject obj2) {
-            final int cmp = super.compare(obj1, obj2);
-            if (cmp == 0) {
-                return equalInternal(context(), obj1, obj2) ? 0 : 1;
-            }
-            return cmp;
-        }
-
-    }
-
-    private final TreeSet<IRubyObject> order;
-
-    protected RubySortedSet(Ruby runtime, RubyClass klass) {
-        super(runtime, klass);
-        order = new TreeSet<>(new OrderComparator(runtime));
-    }
-
-    @Override
-    void unmarshal() {
-        super.unmarshal();
-        IRubyObject[] elems = hash.keys().toJavaArrayMaybeUnsafe();
-        for ( int i=0; i<elems.length; i++ ) order.add( elems[i] );
-    }
-
-    @JRubyMethod(name = "[]", rest = true, meta = true) // re-def Set[] for SortedSet
-    public static RubySortedSet create(final ThreadContext context, IRubyObject self, IRubyObject... ary) {
-        RubySortedSet set = new RubySortedSet(context.runtime, (RubyClass) self);
-        return (RubySortedSet) set.initSet(context, ary, 0, ary.length);
-    }
-
-    @Override
-    protected void addImpl(ThreadContext context, final IRubyObject obj) {
-        // NOTE: we're able to function without the check - comparator will raise ArgumentError
-        //if ( ! obj.respondsTo("<=>") ) {
-        //    throw argumentError(context, "value must respond to <=>");
-        //}
-        super.addImpl(context, obj); // @hash[obj] = true
-        order.add(obj);
-    }
-
-    @Override
-    protected void addImplSet(final ThreadContext context, final RubySet set) {
-        super.addImplSet(context, set);
-        order.addAll(set.elements());
-    }
-
-    @Override
-    protected boolean deleteImpl(final IRubyObject obj) {
-        if (super.deleteImpl(obj)) {
-            order.remove(obj);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    protected void deleteImplIterator(final IRubyObject obj, final Iterator it) {
-        super.deleteImpl(obj);
-        // iterator over elementsOrdered()
-        it.remove(); // order.remove(obj)
-    }
-
-    @Override
-    protected void clearImpl(ThreadContext context) {
-        hash.rb_clear(context);
-        order.clear();
-    }
-
-    @JRubyMethod(name = "sort") // re-def Enumerable#sort
-    public RubyArray sort(final ThreadContext context) {
-        return RubyArray.newArray(context.runtime, order); // instead of this.hash.keys();
-    }
-
-    @Override
-    public RubyArray to_a(final ThreadContext context) {
-        return sort(context); // instead of this.hash.keys();
-    }
-
-    @Override
-    public IRubyObject initialize_dup(ThreadContext context, IRubyObject orig) {
-        super.initialize_dup(context, orig);
-        if (this != orig) order.addAll(((RubySortedSet) orig).order);
-        return this;
-    }
-
-    @JRubyMethod(frame = true, keywords = true, required = 1, optional = 1, checkArity = false)
-    public IRubyObject initialize_clone(ThreadContext context, IRubyObject[] args) {
-        Arity.checkArgumentCount(context, args, 1, 2);
-
-        super.initialize_clone(context, args);
-        IRubyObject orig = args[0];
-        if (this != orig) order.addAll(((RubySortedSet) orig).order);
-        return this;
-    }
-
-    // NOTE: weirdly Set/SortedSet in Ruby do not have sort!
-
-    @Override
-    protected Set<IRubyObject> elementsOrdered() { return order; }
-
-    @Override
-    public Iterator<Object> iterator() {
-        return new JavaIterator();
-    }
-
-    // java.util.SortedSet :
-
-    public Comparator<? super IRubyObject> comparator() {
-        return order.comparator();
-    }
-
-    public Object first() {
-        return firstValue().toJava(Object.class);
-    }
-
-    public IRubyObject firstValue() {
-        return order.first();
-    }
-
-    public Object last() {
-        return lastValue().toJava(Object.class);
-    }
-
-    public IRubyObject lastValue() {
-        return order.last();
-    }
-
-    public SortedSet headSet(Object toElement) {
-        throw new UnsupportedOperationException("NOT IMPLEMENTED");
-    }
-
-    public SortedSet subSet(Object fromElement, Object toElement) {
-        throw new UnsupportedOperationException("NOT IMPLEMENTED");
-    }
-
-    public SortedSet tailSet(Object fromElement) {
-        throw new UnsupportedOperationException("NOT IMPLEMENTED");
-    }
-
-    public SortedSet<IRubyObject> rawHeadSet(IRubyObject toElement) {
-        return order.headSet(toElement);
-    }
-
-    public SortedSet<IRubyObject> rawSubSet(IRubyObject fromElement, IRubyObject toElement) {
-        return order.subSet(fromElement, toElement);
-    }
-
-    public SortedSet<IRubyObject> rawTailSet(IRubyObject fromElement) {
-        return order.tailSet(fromElement);
-    }
-
-    private class JavaIterator implements Iterator<Object> {
-
-        private final Iterator<IRubyObject> rawIterator;
-
-        JavaIterator() {
-            rawIterator = RubySortedSet.this.order.iterator();
-        }
-
-        @Override
-        public boolean hasNext() {
-            return rawIterator.hasNext();
-        }
-
-        @Override
-        public Object next() {
-            return rawIterator.next().toJava(Object.class);
-        }
-
-        @Override
-        public void remove() {
-            rawIterator.remove();
-        }
-
-    }
-
-}
diff --git a/core/src/main/java/org/jruby/ext/set/SetLibrary.java b/core/src/main/java/org/jruby/ext/set/SetLibrary.java
deleted file mode 100644
index 45f3c005ae9..00000000000
--- a/core/src/main/java/org/jruby/ext/set/SetLibrary.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: EPL 2.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2016 Karol Bucek
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby.ext.set;
-
-import org.jruby.Ruby;
-import org.jruby.runtime.load.Library;
-
-import static org.jruby.api.Access.enumerableModule;
-import static org.jruby.api.Access.objectClass;
-
-public final class SetLibrary implements Library {
-
-    public void load(Ruby runtime, boolean wrap) {
-        SetLibrary.load(runtime);
-    }
-
-    public static void load(Ruby runtime) {
-        var context = runtime.getCurrentContext();
-        var Object = objectClass(context);
-        var Enumerable = enumerableModule(context).defineMethods(context, EnumerableExt.class);
-        var Set = RubySet.createSetClass(context, Object, Enumerable);
-        RubySortedSet.createSortedSetClass(context, Set);
-    }
-}
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyBasicSocket.java b/core/src/main/java/org/jruby/ext/socket/RubyBasicSocket.java
index aaa5b17cf94..5edf5c7ee46 100644
--- a/core/src/main/java/org/jruby/ext/socket/RubyBasicSocket.java
+++ b/core/src/main/java/org/jruby/ext/socket/RubyBasicSocket.java
@@ -975,41 +975,6 @@ protected static String bindContextMessage(ThreadContext context, IRubyObject ho
         return "bind(2) for " + host.inspect(context) + " port " + port;
     }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject recv(IRubyObject[] args) {
-        return recv(getCurrentContext(), args);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject getsockopt(IRubyObject lev, IRubyObject optname) {
-        return getsockopt(getCurrentContext(), lev, optname);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject setsockopt(IRubyObject lev, IRubyObject optname, IRubyObject val) {
-        return setsockopt(getCurrentContext(), lev, optname, val);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject getsockname() {
-        return getsockname(getCurrentContext());
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject getpeername() {
-        return getpeername(getCurrentContext());
-    }
-
-    @Deprecated(since = "1.7.0")
-    public static IRubyObject do_not_reverse_lookup(IRubyObject recv) {
-        return do_not_reverse_lookup(((RubyBasicObject) recv).getCurrentContext(), recv);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public static IRubyObject set_do_not_reverse_lookup(IRubyObject recv, IRubyObject flag) {
-        return set_do_not_reverse_lookup(((RubyBasicObject) recv).getCurrentContext(), recv, flag);
-    }
-
     @Deprecated(since = "9.4.6.0")
     @Override
     public IRubyObject read_nonblock(ThreadContext context, IRubyObject[] args) {
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyIPSocket.java b/core/src/main/java/org/jruby/ext/socket/RubyIPSocket.java
index e2b0a66a5de..f87778becbd 100644
--- a/core/src/main/java/org/jruby/ext/socket/RubyIPSocket.java
+++ b/core/src/main/java/org/jruby/ext/socket/RubyIPSocket.java
@@ -181,33 +181,4 @@ public static Boolean doReverseLookup(ThreadContext context, IRubyObject norever
             default -> throw argumentError(context, "invalid reverse_lookup flag: " + noreverse);
         };
     }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject addr() {
-        return addr(getCurrentContext());
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject peeraddr() {
-        return peeraddr(getCurrentContext());
-    }
-
-    @Deprecated(since = "1.7.0")
-    public static IRubyObject getaddress(IRubyObject recv, IRubyObject hostname) {
-        return getaddress(((RubyBasicObject) recv).getCurrentContext(), recv, hostname);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject recvfrom(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 1:
-                return recvfrom(context, args[0]);
-            case 2:
-                return recvfrom(context, args[0], args[1]);
-            default:
-                Arity.raiseArgumentError(context, args, 1, 2);
-                return null; // not reached
-        }
-    }
-
 }// RubyIPSocket
diff --git a/core/src/main/java/org/jruby/ext/socket/RubySocket.java b/core/src/main/java/org/jruby/ext/socket/RubySocket.java
index b82be313f24..129e491fcec 100644
--- a/core/src/main/java/org/jruby/ext/socket/RubySocket.java
+++ b/core/src/main/java/org/jruby/ext/socket/RubySocket.java
@@ -519,18 +519,24 @@ private boolean tryConnect(ThreadContext context, Channel channel, SocketAddress
 
                     while (true) {
                         boolean result = true;
-                        if (channel instanceof SocketChannel) {
+                        if (channel instanceof UnixSocketChannel unix) {
+                            if (unix.isConnectionPending()) {
+                                // connection initiated but not finished
+                                result = unix.finishConnect();
+                            } else {
+                                result = unix.connect(addr);
+                            }
+                        } else if (channel instanceof SocketChannel) {
                             SocketChannel socket = (SocketChannel) channel;
 
-                            if (socket.isConnectionPending()) {
+                            if (socket.isConnected()) {
+                                return true;
+                            } else if (socket.isConnectionPending()) {
                                 // connection initiated but not finished
                                 result = socket.finishConnect();
                             } else {
                                 result = socket.connect(addr);
                             }
-                        } else if (channel instanceof UnixSocketChannel) {
-                            result = ((UnixSocketChannel) channel).connect((UnixSocketAddress) addr);
-
                         } else if (channel instanceof DatagramChannel datagram) {
                             datagram.connect(addr);
                         } else {
@@ -713,11 +719,6 @@ protected SocketAddress getSocketAddress() {
         return SocketType.forChannel(channel).getLocalSocketAddress(channel);
     }
 
-    @Deprecated(since = "1.7.0")
-    public static RuntimeException sockerr(Ruby runtime, String msg) {
-        return SocketUtils.sockerr(runtime, msg);
-    }
-
     private static final Pattern ALREADY_BOUND_PATTERN = Pattern.compile("[Aa]lready.*bound");
     private static final Pattern ADDR_NOT_AVAIL_PATTERN = Pattern.compile("assign.*address");
     //private static final Pattern PERM_DENIED_PATTERN = Pattern.compile("[Pp]ermission.*denied");
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java b/core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
index fb8c134192b..858c4ccc83f 100644
--- a/core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
+++ b/core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
@@ -102,10 +102,13 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
 
         int port = SocketUtils.getPortFrom(context, _port);
 
+        ServerSocketChannel ssc = null;
+        boolean success = false;
+
         try {
             InetAddress addr = InetAddress.getByName(host);
 
-            ServerSocketChannel ssc = ServerSocketChannel.open();
+            ssc = ServerSocketChannel.open();
             ssc.socket().setReuseAddress(true);
 
             InetSocketAddress socket_address = new InetSocketAddress(addr, port);
@@ -113,20 +116,26 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
             ssc.socket().bind(socket_address);
 
             initSocket(newChannelFD(runtime, ssc));
-        } catch(UnknownHostException e) {
+
+            success = true;
+        } catch (UnknownHostException e) {
             throw SocketUtils.sockerr(runtime, "initialize: name or service not known");
-        } catch(BindException e) {
+        } catch (BindException e) {
             throw runtime.newErrnoFromBindException(e, bindContextMessage(context, _host, port));
-        } catch(SocketException e) {
+        } catch (SocketException e) {
             String msg = e.getMessage();
 
             throw msg.contains("Permission denied") ?
                     runtime.newErrnoEACCESError("bind(2)") :
                     SocketUtils.sockerr(runtime, "initialize: name or service not known");
-        } catch(IOException e) {
+        } catch (IOException e) {
             throw runtime.newIOErrorFromException(e);
         } catch (IllegalArgumentException iae) {
             throw SocketUtils.sockerr(runtime, iae.getMessage());
+        } finally {
+            if (!success && ssc != null) {
+                try { ssc.close(); } catch (IOException ioe) {}
+            }
         }
 
         return this;
@@ -303,19 +312,4 @@ public IRubyObject gets(ThreadContext context, IRubyObject sep) {
     public IRubyObject gets(ThreadContext context, IRubyObject sep, IRubyObject limit) {
         throw context.runtime.newErrnoENOTCONNError();
     }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject accept() {
-        return accept(getCurrentContext());
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject listen(IRubyObject backlog) {
-        return listen(((RubyBasicObject) backlog).getCurrentContext(), backlog);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public static IRubyObject open(IRubyObject recv, IRubyObject[] args, Block block) {
-        return open(((RubyBasicObject) recv).getCurrentContext(), recv, args, block);
-    }
 }
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyTCPSocket.java b/core/src/main/java/org/jruby/ext/socket/RubyTCPSocket.java
index b7eeb51d1b9..8e8417e8e35 100644
--- a/core/src/main/java/org/jruby/ext/socket/RubyTCPSocket.java
+++ b/core/src/main/java/org/jruby/ext/socket/RubyTCPSocket.java
@@ -95,9 +95,10 @@ private SocketChannel attemptConnect(ThreadContext context, IRubyObject host, St
 
                 long timeout = -1;
                 if (opts != null) {
-                    IRubyObject timeoutObj = ArgsUtil.extractKeywordArg(context, opts, "connect_timeout");
-                    if (!timeoutObj.isNil()) {
-                        timeout = (long) (timeoutObj.convertToFloat().asDouble(context) * 1000);
+                    IRubyObject[] kwargs = ArgsUtil.extractKeywordArgs(context, opts, "connect_timeout", "open_timeout", "fast_fallback", "test_mode_settings");
+                    IRubyObject connectTimeout = kwargs[0];
+                    if (connectTimeout != null && !connectTimeout.isNil()) {
+                        timeout = (long) (connectTimeout.convertToFloat().asDouble(context) * 1000);
                     }
                 }
 
@@ -236,14 +237,4 @@ public static IRubyObject gethostbyname(ThreadContext context, IRubyObject recv,
             throw SocketUtils.sockerr(context.runtime, "gethostbyname: name or service not known");
         }
     }
-
-    @Deprecated(since = "1.7.0")
-    public static IRubyObject open(IRubyObject recv, IRubyObject[] args, Block block) {
-        return open(((RubyBasicObject) recv).getCurrentContext(), recv, args, block);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public static IRubyObject gethostbyname(IRubyObject recv, IRubyObject hostname) {
-        return gethostbyname(((RubyBasicObject) recv).getCurrentContext(), recv, hostname);
-    }
 }
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java b/core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java
index e4f3a312e99..5b57a86ca4f 100644
--- a/core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java
+++ b/core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java
@@ -663,29 +663,4 @@ private static IRubyObject doReceiveMulticast(RubyBasicSocket socket, final Ruby
 
     private volatile Class<? extends InetAddress> explicitFamily;
     private volatile ProtocolFamily family;
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject bind(IRubyObject host, IRubyObject port) {
-        return bind(getCurrentContext(), host, port);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject connect(IRubyObject host, IRubyObject port) {
-        return connect(getCurrentContext(), host, port);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject recvfrom(IRubyObject[] args) {
-        return recvfrom(getCurrentContext(), args);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public IRubyObject send(IRubyObject[] args) {
-        return send(getCurrentContext(), args);
-    }
-
-    @Deprecated(since = "1.7.0")
-    public static IRubyObject open(IRubyObject recv, IRubyObject[] args, Block block) {
-        return open(((RubyBasicObject) recv).getCurrentContext(), recv, args, block);
-    }
 }// RubyUDPSocket
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyUNIXSocket.java b/core/src/main/java/org/jruby/ext/socket/RubyUNIXSocket.java
index bc9c8181634..3b069bfc48b 100644
--- a/core/src/main/java/org/jruby/ext/socket/RubyUNIXSocket.java
+++ b/core/src/main/java/org/jruby/ext/socket/RubyUNIXSocket.java
@@ -42,6 +42,7 @@
 import jnr.unixsocket.UnixSocketChannel;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
+import org.jruby.RubyFile;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyIO;
 import org.jruby.RubyNumeric;
@@ -350,7 +351,7 @@ protected void init_unixsock(ThreadContext context, IRubyObject _path, boolean s
 
     // MRI: unixsock_path_value
     private static RubyString unixsockPathValue(ThreadContext context, IRubyObject path) {
-        return checkEmbeddedNulls(context, path.convertToString());
+        return checkEmbeddedNulls(context, RubyFile.get_path(context, path));
     }
 
 
diff --git a/core/src/main/java/org/jruby/ext/socket/SocketUtils.java b/core/src/main/java/org/jruby/ext/socket/SocketUtils.java
index d87222f8a41..1b20678b6c0 100644
--- a/core/src/main/java/org/jruby/ext/socket/SocketUtils.java
+++ b/core/src/main/java/org/jruby/ext/socket/SocketUtils.java
@@ -132,22 +132,6 @@ public static IRubyObject getservbyname(ThreadContext context, IRubyObject[] arg
         return asFixnum(context, port);
     }
 
-    @Deprecated(since = "9.1.6.0")
-    public static IRubyObject pack_sockaddr_in(ThreadContext context, IRubyObject port, IRubyObject host) {
-        return Sockaddr.pack_sockaddr_in(context, port, host);
-    }
-
-    @Deprecated(since = "9.1.6.0")
-    public static RubyArray unpack_sockaddr_in(ThreadContext context, IRubyObject addr) {
-        return Sockaddr.unpack_sockaddr_in(context, addr);
-    }
-
-    @Deprecated(since = "9.1.6.0")
-    public static IRubyObject pack_sockaddr_un(ThreadContext context, IRubyObject filename) {
-        String path = filename.convertToString().asJavaString();
-        return Sockaddr.pack_sockaddr_un(context, path);
-    }
-
     public static IRubyObject gethostbyname(ThreadContext context, IRubyObject hostname) {
         try {
             InetAddress addr = getRubyInetAddress(hostname.convertToString().toString());
@@ -405,14 +389,6 @@ public static IRubyObject ip_address_list(ThreadContext context) {
         }
     }
 
-    @Deprecated(since = "9.2.10.0")
-    public static InetAddress[] getRubyInetAddresses(ByteList address) throws UnknownHostException {
-        // switched to String because the ByteLists were not comparing properly in 1.9 mode (encoding?
-        // FIXME: Need to properly decode this string (see Helpers.decodeByteList)
-        String addressString = Helpers.byteListToString(address);
-        return getRubyInetAddresses(addressString);
-    }
-
     public static InetAddress[] getRubyInetAddresses(String addressString) throws UnknownHostException {
         InetAddress specialAddress = specialAddress(addressString);
         if (specialAddress != null) {
diff --git a/core/src/main/java/org/jruby/ext/thread/ConditionVariable.java b/core/src/main/java/org/jruby/ext/thread/ConditionVariable.java
index 3194f49cf46..8fb302cb19f 100644
--- a/core/src/main/java/org/jruby/ext/thread/ConditionVariable.java
+++ b/core/src/main/java/org/jruby/ext/thread/ConditionVariable.java
@@ -117,19 +117,6 @@ private static JavaSites.ConditionVariableSites sites(ThreadContext context) {
         return context.sites.ConditionVariable;
     }
 
-    @Deprecated(since = "9.2.8.0")
-    public IRubyObject wait_ruby(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 1:
-                return wait_ruby(context, args[0]);
-            case 2:
-                return wait_ruby(context, args[0], args[1]);
-            default:
-                Arity.raiseArgumentError(context, args.length, 1, 2);
-                return null; // not reached
-        }
-    }
-
     private final ConcurrentLinkedQueue<RubyThread> waiters = new ConcurrentLinkedQueue<>();
     
 }
diff --git a/core/src/main/java/org/jruby/ext/thread/Mutex.java b/core/src/main/java/org/jruby/ext/thread/Mutex.java
index 5463ff0e626..954df171e9d 100644
--- a/core/src/main/java/org/jruby/ext/thread/Mutex.java
+++ b/core/src/main/java/org/jruby/ext/thread/Mutex.java
@@ -124,8 +124,6 @@ public IRubyObject lock(ThreadContext context) {
             }
         }
 
-        this.lockingThread = parentThread;
-
         // always check for thread interrupts after acquiring lock
         try {
             thread.pollThreadEvents(context);
@@ -137,6 +135,9 @@ public IRubyObject lock(ThreadContext context) {
             Helpers.throwException(t);
         }
 
+        // set locking thread once successfully locked with no interrupts
+        this.lockingThread = parentThread;
+
         return this;
     }
 
diff --git a/core/src/main/java/org/jruby/ext/tracepoint/TracePoint.java b/core/src/main/java/org/jruby/ext/tracepoint/TracePoint.java
index 3a2469f1cd1..1b6e9dc580f 100644
--- a/core/src/main/java/org/jruby/ext/tracepoint/TracePoint.java
+++ b/core/src/main/java/org/jruby/ext/tracepoint/TracePoint.java
@@ -2,11 +2,13 @@
 
 import java.util.ArrayList;
 import java.util.EnumSet;
+
 import org.jruby.Ruby;
 import org.jruby.RubyBinding;
 import org.jruby.RubyClass;
 import org.jruby.RubyObject;
 import org.jruby.RubySymbol;
+import org.jruby.RubyThread;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.Block;
@@ -18,13 +20,17 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.TypeConverter;
 
+import static org.jruby.RubyHash.newHash;
+import static org.jruby.api.Access.getModule;
 import static org.jruby.api.Access.symbolClass;
-import static org.jruby.api.Convert.*;
+import static org.jruby.api.Convert.asBoolean;
+import static org.jruby.api.Convert.asFixnum;
+import static org.jruby.api.Convert.asSymbol;
+import static org.jruby.api.Create.newArray;
 import static org.jruby.api.Create.newString;
 import static org.jruby.api.Define.defineClass;
 import static org.jruby.api.Error.argumentError;
 import static org.jruby.api.Error.runtimeError;
-import static org.jruby.runtime.ThreadContext.resetCallInfo;
 import static org.jruby.util.RubyStringBuilder.str;
 
 public class TracePoint extends RubyObject {
@@ -77,60 +83,70 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] _events, fina
 
         if (!block.isGiven()) throw argumentError(context, "must be called with a block");
 
-        final ThreadContext threadToTrace = context;
-        hook = new EventHook() {
-            @Override
-            public void event(ThreadContext context, RubyEvent event, String file, int line, String name, IRubyObject type) {
-                if (!enabled || threadToTrace != context || context.isWithinTrace()) return;
+        hook = new TracePointEventHook(eventSet, block);
+                
+        return context.nil;
+    }
 
-                int savedCallInfo = resetCallInfo(context);
+    private class TracePointEventHook extends EventHook {
+        protected ThreadContext threadToTrace;
+        private final Block block;
+        private final EnumSet<RubyEvent> eventSet;
 
-                synchronized (this) {
-                    inside = true;
+        public TracePointEventHook(EnumSet<RubyEvent> eventSet, Block block) {
+            this.block = block;
+            this.eventSet = eventSet;
+        }
 
-                    if (file == null) file = "(ruby)";
-                    if (type == null) type = context.fals;
+        @Override
+        public void event(ThreadContext context, RubyEvent event, String file, int line, String name, IRubyObject type) {
+            if (!enabled || (threadToTrace != null && threadToTrace != context) || context.isWithinTrace()) return;
 
-                    IRubyObject binding;
-                    if (event == RubyEvent.THREAD_BEGIN || event == RubyEvent.THREAD_END) {
-                        binding = context.nil;
-                    } else {
-                        binding = RubyBinding.newBinding(context.runtime, context.currentBinding());
-                    }
+            int savedCallInfo = ThreadContext.resetCallInfo(context);
 
-                    context.preTrace();
+            synchronized (this) {
+                inside = true;
 
-                    // FIXME: get return value
-                    update(event.getName(), file, line, name, type, context.getErrorInfo(), context.nil, binding);
+                if (file == null) file = "(ruby)";
+                if (type == null) type = context.fals;
 
-                    try {
-                        block.yieldSpecific(context, TracePoint.this);
-                    } finally {
-                        update(null, null, line, null, context.nil, context.nil, context.nil, context.nil);
-                        context.postTrace();
-                        inside = false;
-                        context.callInfo = savedCallInfo;
-                    }
+                IRubyObject binding;
+                if (event == RubyEvent.THREAD_BEGIN || event == RubyEvent.THREAD_END) {
+                    binding = context.nil;
+                } else {
+                    binding = RubyBinding.newBinding(context.runtime, context.currentBinding());
                 }
-            }
 
-            @Override
-            public void eventHandler(ThreadContext context, String eventName, String file, int line, String name, IRubyObject type) {
-                event(context, RubyEvent.fromName(eventName), file, line, name, type);
-            }
+                context.preTrace();
 
-            @Override
-            public boolean isInterestedInEvent(RubyEvent event) {
-                return eventSet.contains(event);
-            }
+                // FIXME: get return value
+                update(event.getName(), file, line, name, type, context.getErrorInfo(), context.nil, binding);
 
-            @Override
-            public EnumSet<RubyEvent> eventSet() {
-                return eventSet;
+                try {
+                    block.yieldSpecific(context, TracePoint.this);
+                } finally {
+                    update(null, null, line, null, context.nil, context.nil, context.nil, context.nil);
+                    context.postTrace();
+                    inside = false;
+                    context.callInfo = savedCallInfo;
+                }
             }
-        };
-                
-        return context.nil;
+        }
+
+        @Override
+        public void eventHandler(ThreadContext context, String eventName, String file, int line, String name, IRubyObject type) {
+            event(context, RubyEvent.fromName(eventName), file, line, name, type);
+        }
+
+        @Override
+        public boolean isInterestedInEvent(RubyEvent event) {
+            return eventSet.contains(event);
+        }
+
+        @Override
+        public EnumSet<RubyEvent> eventSet() {
+            return eventSet;
+        }
     }
     
     @JRubyMethod
@@ -149,12 +165,48 @@ public IRubyObject defined_class(ThreadContext context) {
     
     @JRubyMethod
     public IRubyObject disable(ThreadContext context, Block block) {
-        return doToggle(context, block, false);
+        return doToggle(context, null, block, false);
     }
-    
+
     @JRubyMethod
     public IRubyObject enable(ThreadContext context, Block block) {
-        return doToggle(context, block, true);
+        return doToggle(context, null, block, true);
+    }
+    
+    @JRubyMethod
+    public IRubyObject enable(ThreadContext context, IRubyObject target, Block block) {
+        // TODO: implement target
+        if (!target.isNil()) {
+            context.runtime.getWarnings().warning("target argument to TracePoint.enable is unsupported");
+        }
+
+        return doToggle(context, null, block, true);
+    }
+
+    @JRubyMethod
+    public IRubyObject enable(ThreadContext context, IRubyObject target, IRubyObject targetLine, Block block) {
+        // TODO: implement target, target_line
+        if (!target.isNil() || !targetLine.isNil()) {
+            context.runtime.getWarnings().warning("target and target_line arguments to TracePoint.enable are unsupported");
+        }
+
+        return doToggle(context, null, block, true);
+    }
+
+    @JRubyMethod
+    public IRubyObject enable(ThreadContext context, IRubyObject target, IRubyObject targetLine, IRubyObject _targetThread, Block block) {
+        // TODO: implement target, target_line
+        if (!target.isNil() || !targetLine.isNil()) {
+            context.runtime.getWarnings().warning("target and target_line arguments to TracePoint.enable are unsupported");
+        }
+
+        RubyThread targetThread = null;
+        if (_targetThread != asSymbol(context, "default")) {
+            if (!(_targetThread instanceof RubyThread th)) throw argumentError(context, "target must be a Thread");
+            targetThread = th;
+        }
+
+        return doToggle(context, targetThread, block, true);
     }
     
     @JRubyMethod(name = "enabled?")
@@ -231,6 +283,15 @@ public static IRubyObject trace(ThreadContext context, IRubyObject self, IRubyOb
         tp.enable(context, Block.NULL_BLOCK);
         return tp;
     }
+
+    @JRubyMethod(meta = true)
+    public static IRubyObject stat(ThreadContext context, IRubyObject self) {
+        Ruby runtime = context.runtime;
+        var stats = runtime.getTraceEvents().eventHookStats();
+        return newHash(runtime,
+                getModule(context, "JRuby"),
+                newArray(context, asFixnum(context, stats[0]), asFixnum(context, stats[1])));
+    }
     
     private void update(String eventName, String file, int line, String name, IRubyObject type, IRubyObject exception, IRubyObject returnValue, IRubyObject binding) {
         // TODO: missing exception, self, return value
@@ -244,32 +305,36 @@ private void update(String eventName, String file, int line, String name, IRubyO
         this.binding = binding;
     }
 
-    private synchronized IRubyObject doToggle(ThreadContext context, Block block, boolean toggle) {
+    private synchronized IRubyObject doToggle(ThreadContext context, RubyThread _targetThread, Block block, boolean toggle) {
         if (block.isGiven()) {
             boolean old = enabled;
             try {
-                updateEnabled(context, toggle);
+                updateEnabled(context, _targetThread, toggle);
                 
                 return block.yieldSpecific(context);
             } finally {
-                updateEnabled(context, old);
+                updateEnabled(context, _targetThread, old);
             }
         }
         
         IRubyObject old = asBoolean(context, enabled);
-        updateEnabled(context, toggle);
+        updateEnabled(context, _targetThread, toggle);
         
         return old;
     }
 
-    public void updateEnabled(ThreadContext context, boolean toggle) {
+    public void updateEnabled(ThreadContext context, RubyThread targetThread, boolean toggle) {
         if (toggle == enabled) return; // don't re-add or re-remove hook
         
         enabled = toggle;
         
         if (toggle) {
+            if (targetThread != null && !targetThread.isNil()) {
+                hook.threadToTrace = targetThread.getContext();
+            }
             context.traceEvents.addEventHook(context, hook);
         } else {
+            hook.threadToTrace = null;
             context.traceEvents.removeEventHook(hook);
         }
     }
@@ -282,7 +347,7 @@ private static JavaSites.TracePointSites sites(ThreadContext context) {
         return context.sites.TracePoint;
     }
     
-    private EventHook hook;
+    private TracePointEventHook hook;
     private volatile boolean enabled = false;
     private String eventName;
     private String file;
diff --git a/core/src/main/java/org/jruby/internal/runtime/AbstractIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/AbstractIRMethod.java
index 2f261e14ebc..34da31a58d1 100644
--- a/core/src/main/java/org/jruby/internal/runtime/AbstractIRMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/AbstractIRMethod.java
@@ -33,6 +33,7 @@
 import org.jruby.compiler.Compilable;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.IRMethodArgs;
+import org.jruby.internal.runtime.methods.MixedModeIRMethod;
 import org.jruby.ir.IRFlags;
 import org.jruby.ir.IRMethod;
 import org.jruby.ir.IRScope;
@@ -156,11 +157,6 @@ public Signature getSignature() {
         return signature;
     }
 
-    @Deprecated(since = "9.3.0.0") @Override
-    public Arity getArity() {
-        return signature.arity();
-    }
-
     @Override
     public DynamicMethod dup() {
         return (DynamicMethod) clone();
@@ -169,7 +165,12 @@ public DynamicMethod dup() {
     @Override
     public Object clone() {
         try {
-            return super.clone();
+            AbstractIRMethod clone = (AbstractIRMethod) super.clone();
+            clone.callCount = 0;
+            if (clone instanceof MixedModeIRMethod mixedMode) {
+                mixedMode.reset();
+            }
+            return clone;
         } catch (CloneNotSupportedException cnse) {
             throw new RuntimeException("not cloneable: " + this);
         }
diff --git a/core/src/main/java/org/jruby/internal/runtime/AdoptedNativeThread.java b/core/src/main/java/org/jruby/internal/runtime/AdoptedNativeThread.java
index a9151b03b13..89fdf38b986 100644
--- a/core/src/main/java/org/jruby/internal/runtime/AdoptedNativeThread.java
+++ b/core/src/main/java/org/jruby/internal/runtime/AdoptedNativeThread.java
@@ -119,6 +119,7 @@ public void setRubyName(String id) {
         } catch (SecurityException ignore) { } // current thread can not modify
     }
 
+    // Deprecated in subclass but not in interface
     @Override
     @Deprecated(since = "9.2.0.0")
     public String getRubyName() {
diff --git a/core/src/main/java/org/jruby/internal/runtime/RubyNativeThread.java b/core/src/main/java/org/jruby/internal/runtime/RubyNativeThread.java
index 774a6f5e24b..f87cc2ed3b0 100644
--- a/core/src/main/java/org/jruby/internal/runtime/RubyNativeThread.java
+++ b/core/src/main/java/org/jruby/internal/runtime/RubyNativeThread.java
@@ -100,6 +100,7 @@ public void setRubyName(String id) {
         updateName();
     }
 
+    // Deprecated in subclass but not in interface
     @Override
     @Deprecated(since = "9.2.0.0")
     public String getRubyName() {
diff --git a/core/src/main/java/org/jruby/internal/runtime/RubyRunnable.java b/core/src/main/java/org/jruby/internal/runtime/RubyRunnable.java
index b17bd049ec6..b8fd7ec8b20 100644
--- a/core/src/main/java/org/jruby/internal/runtime/RubyRunnable.java
+++ b/core/src/main/java/org/jruby/internal/runtime/RubyRunnable.java
@@ -73,11 +73,6 @@ public RubyRunnable(RubyThread rubyThread, ThreadContext creatorContext, IRubyOb
         this.creatorContext = creatorContext;
     }
 
-    @Deprecated(since = "1.7.5")
-    public RubyThread getRubyThread() {
-        return rubyThread;
-    }
-
     public Thread getJavaThread() {
         return javaThread;
     }
@@ -111,6 +106,7 @@ public void run() {
         // uber-ThreadKill catcher, since it should always just mean "be dead"
         try {
             // Push a frame for the toplevel of the thread
+            context.pushFrame();
 
             // Call the thread's code
             Block threadBlock = proc.getBlock();
diff --git a/core/src/main/java/org/jruby/internal/runtime/ThreadService.java b/core/src/main/java/org/jruby/internal/runtime/ThreadService.java
index d173ae61afc..3e256e9459c 100644
--- a/core/src/main/java/org/jruby/internal/runtime/ThreadService.java
+++ b/core/src/main/java/org/jruby/internal/runtime/ThreadService.java
@@ -166,7 +166,13 @@ public void teardown() {
         mainContext = null;
 
         // clear thread map
+        for (Map.Entry<Thread, RubyThread> entry : rubyThreadMap.entrySet()) {
+            entry.getValue().clearContext();
+        }
         rubyThreadMap.clear();
+
+        // remove the terminating thread's context
+        remove();
     }
 
     public void initMainThread() {
@@ -293,112 +299,7 @@ private void unregisterThreadImpl(ThreadContext context, Thread nativeThread) {
         remove();
     }
 
-    @Deprecated(since = "9.2.6.0") // use unregisterCurrentThread
-    public void disposeCurrentThread() {
-        unregisterCurrentThread(getCurrentContext());
-    }
-
     public long incrementAndGetThreadCount() {
         return threadCount.incrementAndGet();
     }
-
-    @Deprecated(since = "9.1.15.0")
-    public Map<Object, RubyThread> getRubyThreadMap() {
-        return (Map<Object, RubyThread>) (Map) rubyThreadMap;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public void deliverEvent(RubyThread sender, RubyThread target, Event event) {
-    }
-
-    @Deprecated(since = "9.1.15.0")
-    public ThreadGroup getRubyThreadGroup() {
-        return rubyThreadGroup;
-    }
-
-    @Deprecated(since = "9.1.15.0")
-    public ThreadContext getThreadContextForThread(RubyThread thread) {
-        return thread.getContext();
-    }
-
-    @Deprecated(since = "9.1.15.0")
-    public synchronized void dissociateThread(Object thread) {
-        rubyThreadMap.remove(thread);
-    }
-
-    @Deprecated(since = "9.1.15.0")
-    public final void setCurrentContext(ThreadContext context) {
-        set(new SoftReference<ThreadContext>(context));
-    }
-
-    @Deprecated(since = "9.1.15.0")
-    public boolean getPolling() {
-        return rubyThreadMap.size() > 1;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static class Event {
-        public enum Type { KILL, RAISE, WAKEUP }
-        public final String description;
-        public final Type type;
-        public final IRubyObject exception;
-
-        public Event(String description, Type type) {
-            this(description, type, null);
-        }
-
-        public Event(String description, Type type, IRubyObject exception) {
-            this.description = description;
-            this.type = type;
-            this.exception = exception;
-        }
-
-        public String toString() {
-            switch (type) {
-                case KILL: return description;
-                case RAISE: return description + ": " + exception.getMetaClass().getRealClass();
-                case WAKEUP: return description;
-            }
-            return ""; // not reached
-        }
-
-        @Deprecated(since = "9.0.0.0")
-        public static Event kill(RubyThread sender, RubyThread target, Type type) {
-            return new Event(sender.toString() + " sent KILL to " + target, type);
-        }
-
-        @Deprecated(since = "9.0.0.0")
-        public static Event raise(RubyThread sender, RubyThread target, Type type, IRubyObject exception) {
-            return new Event(sender.toString() + " sent KILL to " + target, type, exception);
-        }
-
-        @Deprecated(since = "9.0.0.0")
-        public static Event wakeup(RubyThread sender, RubyThread target, Type type) {
-            return new Event(sender.toString() + " sent KILL to " + target, type);
-        }
-    }
-
-    @Deprecated(since = "9.2.1.0")
-    public void setCritical(boolean critical) {
-        if (critical && !criticalLock.isHeldByCurrentThread()) {
-            acquireCritical();
-        } else if (!critical && criticalLock.isHeldByCurrentThread()) {
-            releaseCritical();
-        }
-    }
-
-    @Deprecated(since = "9.2.1.0")
-    private void acquireCritical() {
-        criticalLock.lock();
-    }
-
-    @Deprecated(since = "9.2.1.0")
-    private void releaseCritical() {
-        criticalLock.unlock();
-    }
-
-    @Deprecated(since = "9.2.1.0")
-    public boolean getCritical() {
-        return criticalLock.isHeldByCurrentThread();
-    }
 }
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/AliasMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/AliasMethod.java
index 14dfe502d9e..c25f19d0f9b 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/AliasMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/AliasMethod.java
@@ -151,11 +151,6 @@ public DynamicMethod dup() {
     }
 
 
-    @Deprecated(since = "9.3.0.0") @Override
-    public Arity getArity(){
-        return entry.method.getArity();
-    }
-
     @Override
     public Signature getSignature() {
         return entry.method.getSignature();
@@ -163,9 +158,9 @@ public Signature getSignature() {
 
 
     public String getOldName() {
-        return entry.method.getName();
+        return getRealMethod().getName();
     }
-    
+
     @Override
     public DynamicMethod getRealMethod() {
         return entry.method.getRealMethod();
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/AttrReaderMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/AttrReaderMethod.java
index c896a5d1f99..42667fd3d39 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/AttrReaderMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/AttrReaderMethod.java
@@ -89,10 +89,4 @@ public MethodData getMethodData() {
     public Collection<String> getInstanceVariableNames() {
         return Collections.singletonList(name);
     }
-
-    // Used by racc extension, needed for backward-compat with 1.7.
-    @Deprecated(since = "9.0.3.0")
-    public AttrReaderMethod(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfiguration, String variableName) {
-        this(implementationClass, visibility, variableName);
-    }
 }
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/AttrWriterMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/AttrWriterMethod.java
index 8151df1b151..aa9d8170c22 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/AttrWriterMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/AttrWriterMethod.java
@@ -85,10 +85,4 @@ public MethodData getMethodData() {
     public Collection<String> getInstanceVariableNames() {
         return Collections.singletonList(variableName);
     }
-
-    // Used by racc extension, needed for backward-compat with 1.7.
-    @Deprecated(since = "9.0.3.0")
-    public AttrWriterMethod(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfiguration, String variableName) {
-        this(implementationClass, visibility, variableName);
-    }
 }
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/CallConfiguration.java b/core/src/main/java/org/jruby/internal/runtime/methods/CallConfiguration.java
index 69185da05e9..cd99ab3eb7a 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/CallConfiguration.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/CallConfiguration.java
@@ -89,44 +89,23 @@ void post(ThreadContext context) {
         }
     };
 
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration FRAME_AND_SCOPE = FrameFullScopeFull;
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration FRAME_AND_DUMMY_SCOPE = FrameFullScopeDummy;
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration FRAME_ONLY = FrameFullScopeNone;
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration BACKTRACE_AND_SCOPE = FrameBacktraceScopeFull;
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration BACKTRACE_DUMMY_SCOPE = FrameBacktraceScopeNone;
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration BACKTRACE_ONLY = FrameBacktraceScopeNone;
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration SCOPE_ONLY = FrameNoneScopeFull;
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration NO_FRAME_DUMMY_SCOPE = FrameNoneScopeDummy;
-    @Deprecated(since = "1.2")
-    public static final CallConfiguration NO_FRAME_NO_SCOPE = FrameNoneScopeNone;
-
     /**
      * Produce a CallConfiguration that represents what *caller* methods must prepare for
      * the method with this annotation.
      *
      * @see org.jruby.anno.AnnotationHelper#getCallerCallConfigNameByAnno(org.jruby.anno.JRubyMethod)
      */
+    @Deprecated(since = "10.0.3.0")
     public static CallConfiguration getCallerCallConfigByAnno(JRubyMethod jrubyMethod) {
         boolean frame = false;
-        boolean scope = false;
 
         for (FrameField field : jrubyMethod.reads()) {
             frame |= field.needsFrame();
-            scope |= field.needsScope();
         }
         for (FrameField field : jrubyMethod.writes()) {
             frame |= field.needsFrame();
-            scope |= field.needsScope();
         }
-        return getCallConfig(frame, scope);
+        return getCallConfig(frame);
     }
 
     /**
@@ -164,29 +143,4 @@ public static CallConfiguration getCallConfig(boolean frame) {
     abstract void pre(ThreadContext context, IRubyObject self, RubyModule implementer, String name, Block block, StaticScope scope);
     abstract void post(ThreadContext context);
     boolean isNoop() { return framing == Framing.None && scoping == Scoping.None; }
-
-    @Deprecated(since = "9.0.0.0")
-    public static CallConfiguration getCallConfig(boolean frame, boolean scope, boolean backtrace) {
-        return getCallConfig(frame, scope);
-    }
-
-    /**
-     * Given a frame and scope requirement, return the name of the appropriate CallConfiguration.
-     *
-     * @see org.jruby.anno.AnnotationHelper#getCallConfigName(boolean, boolean)
-     */
-    @Deprecated(since = "9.1.6.0")
-    public static CallConfiguration getCallConfig(boolean frame, boolean scope) {
-        if (frame) {
-            if (scope) {
-                return FrameFullScopeFull;
-            } else {
-                return FrameFullScopeNone;
-            }
-        } else if (scope) {
-            return FrameNoneScopeFull;
-        } else {
-            return FrameNoneScopeNone;
-        }
-    }
 }
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/DefineMethodMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/DefineMethodMethod.java
index b329465269c..64a7011ac26 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/DefineMethodMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/DefineMethodMethod.java
@@ -22,6 +22,10 @@ public DefineMethodMethod(IRScope method, Visibility visibility, RubyModule impl
         this.capturedBlock = capturedBlock;
     }
 
+    public Block getCapturedBlock() {
+        return capturedBlock;
+    }
+
     @Override
     public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
         return super.call(context, self, clazz, name, args, capturedBlock);
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/DelegatingDynamicMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/DelegatingDynamicMethod.java
index f8f16e9d2ca..a880726acb7 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/DelegatingDynamicMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/DelegatingDynamicMethod.java
@@ -162,11 +162,6 @@ public boolean isImplementedBy(RubyModule other) {
         return delegate.isImplementedBy(other);
     }
 
-    @Deprecated(since = "9.3.0.0") @Override
-    public Arity getArity() {
-        return delegate.getArity();
-    }
-
     @Override
     public Signature getSignature() {
         return delegate.getSignature();
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/DescriptorInfo.java b/core/src/main/java/org/jruby/internal/runtime/methods/DescriptorInfo.java
index 382b6ad660a..b4621f081d6 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/DescriptorInfo.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/DescriptorInfo.java
@@ -135,11 +135,6 @@ public DescriptorInfo(List<? extends MethodDescriptor> descs) {
         parameterDesc = descBuilder.toString();
     }
 
-    @Deprecated(since = "9.0.5.0")
-    public boolean isBacktrace() {
-        return false;
-    }
-
     public boolean acceptsKeywords() {
         return keywords;
     }
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java
index 7127f474e59..85faaf81219 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java
@@ -422,18 +422,6 @@ public final boolean isNull() {
         return this == NullMethod.INSTANCE;
     }
 
-    /**
-     * Retrieve the arity of this method, used for reporting arity to Ruby
-     * code. This arity may or may not reflect the actual specific or variable
-     * arities of the referenced method.
-     *
-     * @return The arity of the method, as reported to Ruby consumers.
-     */
-    @Deprecated(since = "9.3.0.0")
-    public Arity getArity() {
-        return Arity.optional();
-    }
-
     /**
      * Retrieve the signature of this method.
      *
@@ -644,40 +632,6 @@ public boolean isRefined() {
         return false;
     }
 
-    @Deprecated(since = "9.0.1.0")
-    protected DynamicMethod(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-        this(implementationClass, visibility);
-    }
-
-    @Deprecated(since = "9.0.1.0")
-    protected DynamicMethod(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig, String name) {
-        this(implementationClass, visibility, name);
-    }
-
-    @Deprecated(since = "9.0.1.0")
-    protected void init(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-        init(implementationClass, visibility);
-    }
-
-    @Deprecated(since = "9.0.1.0")
-    public CallConfiguration getCallConfig() {
-        return CallConfiguration.FrameNoneScopeNone;
-    }
-
-    @Deprecated(since = "9.0.1.0")
-    public void setCallConfig(CallConfiguration callConfig) {
-    }
-
-    /**
-     * @param implementationClass of the method
-     * @param visibility of the method
-     * @deprecated Use {@link DynamicMethod#DynamicMethod(RubyModule, Visibility, String)}
-     */
-    @Deprecated(since = "9.1.16.0")
-    protected DynamicMethod(RubyModule implementationClass, Visibility visibility) {
-        this(implementationClass, visibility, "(anonymous)");
-    }
-
     public void adjustAliasCount(int delta) {
         this.aliasCount += delta;
     }
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/HandleMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/HandleMethod.java
index 27e97d705d7..dc6a97f1e5b 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/HandleMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/HandleMethod.java
@@ -117,11 +117,6 @@ public HandleMethod(
         this.maker4 = maker4;
     }
 
-    @Deprecated(since = "9.3.0.0") @Override
-    public Arity getArity() {
-        return signature.arity();
-    }
-
     @Override
     public Signature getSignature() {
         return signature;
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java
index 3804797887a..bb208e90e86 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java
@@ -262,9 +262,4 @@ public void completeBuild(ThreadContext context, InterpreterContext interpreterC
     private void promoteToFullBuild(ThreadContext context) {
         tryJit(context, this, false);
     }
-
-    @Deprecated(since = "9.3.0.0")
-    public String getClassName(ThreadContext context) {
-        return null;
-    }
 }
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java b/core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java
index 4c8795aa460..ec52429a5ae 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java
@@ -846,6 +846,7 @@ private static void invokeCReturnTrace(SkinnyMethodAdapter method, int traceBool
         method.invokevirtual(p(JavaMethod.class), "returnTrace", sig(void.class, ThreadContext.class, boolean.class, String.class));
     }
 
+    // Deprecated but still in use and no replacement
     @Deprecated(since = "9.1.16.0")
     private static final Class[] RubyModule_and_Visibility = new Class[]{ RubyModule.class, Visibility.class };
 }
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/JavaMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/JavaMethod.java
index 8a2623d6c9e..fb240fbb727 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/JavaMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/JavaMethod.java
@@ -28,6 +28,7 @@
 package org.jruby.internal.runtime.methods;
 
 import org.jruby.RubyModule;
+import org.jruby.anno.JavaMethodDescriptor;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
@@ -196,20 +197,10 @@ protected final void returnTraceCompiled(ThreadContext context, boolean enabled,
         if (enabled) context.trace(RubyEvent.RETURN, Helpers.getSuperNameFromCompositeName(name), getImplementationClass());
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public void setArity(Arity arity) {
-        this.signature = Signature.from(arity);
-    }
-
     public void setSignature(Signature signature) {
         this.signature = signature;
     }
 
-    @Deprecated(since = "9.3.0.0") @Override
-    public Arity getArity() {
-        return getSignature().arity();
-    }
-
     public Signature getSignature() {
         return signature;
     }
@@ -301,14 +292,6 @@ public JavaMethodNBlock(RubyModule implementationClass, Visibility visibility, S
         public JavaMethodNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.1.16.0")
-        public JavaMethodNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig, String name) {
-            super(implementationClass, visibility, name);
-        }
     }
 
 
@@ -321,10 +304,6 @@ public JavaMethodZeroOrNBlock(RubyModule implementationClass, Visibility visibil
         public JavaMethodZeroOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name) {
@@ -343,10 +322,6 @@ public JavaMethodZeroOrOneOrNBlock(RubyModule implementationClass, Visibility vi
         public JavaMethodZeroOrOneOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0) {
@@ -365,10 +340,6 @@ public JavaMethodZeroOrOneOrTwoOrNBlock(RubyModule implementationClass, Visibili
         public JavaMethodZeroOrOneOrTwoOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrTwoOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1) {
@@ -387,10 +358,6 @@ public JavaMethodZeroOrOneOrTwoOrThreeOrNBlock(RubyModule implementationClass, V
         public JavaMethodZeroOrOneOrTwoOrThreeOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrTwoOrThreeOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
@@ -411,10 +378,6 @@ public JavaMethodOneOrNBlock(RubyModule implementationClass, Visibility visibili
         public JavaMethodOneOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0) {
@@ -433,10 +396,6 @@ public JavaMethodOneOrTwoOrNBlock(RubyModule implementationClass, Visibility vis
         public JavaMethodOneOrTwoOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrTwoOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1) {
@@ -455,10 +414,6 @@ public JavaMethodOneOrTwoOrThreeOrNBlock(RubyModule implementationClass, Visibil
         public JavaMethodOneOrTwoOrThreeOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrTwoOrThreeOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
@@ -479,10 +434,6 @@ public JavaMethodTwoOrNBlock(RubyModule implementationClass, Visibility visibili
         public JavaMethodTwoOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodTwoOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1) {
@@ -501,10 +452,6 @@ public JavaMethodTwoOrThreeOrNBlock(RubyModule implementationClass, Visibility v
         public JavaMethodTwoOrThreeOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodTwoOrThreeOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
@@ -525,10 +472,6 @@ public JavaMethodThreeOrNBlock(RubyModule implementationClass, Visibility visibi
         public JavaMethodThreeOrNBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodThreeOrNBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
@@ -549,10 +492,6 @@ public JavaMethodZeroBlock(RubyModule implementationClass, Visibility visibility
         public JavaMethodZeroBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             if (args.length != 0) return raiseArgumentError(this, context, name, args.length, 0, 0);
@@ -568,10 +507,6 @@ public JavaMethodZeroOrOneBlock(RubyModule implementationClass, Visibility visib
         public JavaMethodZeroOrOneBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             switch (args.length) {
@@ -593,10 +528,6 @@ public JavaMethodZeroOrOneOrTwoBlock(RubyModule implementationClass, Visibility
         public JavaMethodZeroOrOneOrTwoBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrTwoBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             switch (args.length) {
@@ -620,10 +551,6 @@ public JavaMethodZeroOrOneOrTwoOrThreeBlock(RubyModule implementationClass, Visi
         public JavaMethodZeroOrOneOrTwoOrThreeBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrTwoOrThreeBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             switch (args.length) {
@@ -650,21 +577,12 @@ public JavaMethodOneBlock(RubyModule implementationClass, Visibility visibility,
         public JavaMethodOneBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             if (args.length != 1) return raiseArgumentError(this, context, name, args.length, 1, 1);
             return call(context, self, clazz, name, args[0], block);
         }
 
-        @Deprecated(since = "9.3.0.0") @Override
-        public Arity getArity() {
-            return Arity.ONE_ARGUMENT;
-        }
-
         public Signature getSignature() {
             return Signature.ONE_ARGUMENT;
         }
@@ -678,10 +596,6 @@ public JavaMethodOneOrTwoBlock(RubyModule implementationClass, Visibility visibi
         public JavaMethodOneOrTwoBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrTwoBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             switch (args.length) {
@@ -703,10 +617,6 @@ public JavaMethodOneOrTwoOrThreeBlock(RubyModule implementationClass, Visibility
         public JavaMethodOneOrTwoOrThreeBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrTwoOrThreeBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             switch (args.length) {
@@ -732,10 +642,6 @@ public JavaMethodTwoBlock(RubyModule implementationClass, Visibility visibility,
         public JavaMethodTwoBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodTwoBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             if (args.length != 2) return raiseArgumentError(this, context, name, args.length, 2, 2);
@@ -751,10 +657,6 @@ public JavaMethodTwoOrThreeBlock(RubyModule implementationClass, Visibility visi
         public JavaMethodTwoOrThreeBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodTwoOrThreeBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             switch (args.length) {
@@ -778,10 +680,6 @@ public JavaMethodThreeBlock(RubyModule implementationClass, Visibility visibilit
         public JavaMethodThreeBlock(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodThreeBlock(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
             if (args.length != 3) return raiseArgumentError(this, context, name, args.length, 3, 3);
@@ -798,14 +696,6 @@ public JavaMethodN(RubyModule implementationClass, Visibility visibility, String
         public JavaMethodN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.1.16.0")
-        public JavaMethodN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig, String name) {
-            super(implementationClass, visibility, name);
-        }
 
         @Override
         public abstract IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args);
@@ -858,14 +748,6 @@ public JavaMethodZeroOrN(RubyModule implementationClass, Visibility visibility,
         public JavaMethodZeroOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.1.16.0")
-        public JavaMethodZeroOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig, String name) {
-            super(implementationClass, visibility, name);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, Block block) {
@@ -884,10 +766,6 @@ public JavaMethodZeroOrOneOrN(RubyModule implementationClass, Visibility visibil
         public JavaMethodZeroOrOneOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, Block block) {
@@ -906,10 +784,6 @@ public JavaMethodZeroOrOneOrTwoOrN(RubyModule implementationClass, Visibility vi
         public JavaMethodZeroOrOneOrTwoOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrTwoOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, Block block) {
@@ -928,10 +802,6 @@ public JavaMethodZeroOrOneOrTwoOrThreeOrN(RubyModule implementationClass, Visibi
         public JavaMethodZeroOrOneOrTwoOrThreeOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrTwoOrThreeOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) {
@@ -952,14 +822,6 @@ public JavaMethodOneOrN(RubyModule implementationClass, Visibility visibility, S
         public JavaMethodOneOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.1.16.0")
-        public JavaMethodOneOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig, String name) {
-            super(implementationClass, visibility, name);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, Block block) {
@@ -978,10 +840,6 @@ public JavaMethodOneOrTwoOrN(RubyModule implementationClass, Visibility visibili
         public JavaMethodOneOrTwoOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrTwoOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, Block block) {
@@ -1000,10 +858,6 @@ public JavaMethodOneOrTwoOrThreeOrN(RubyModule implementationClass, Visibility v
         public JavaMethodOneOrTwoOrThreeOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrTwoOrThreeOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) {
@@ -1024,10 +878,6 @@ public JavaMethodTwoOrN(RubyModule implementationClass, Visibility visibility, S
         public JavaMethodTwoOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodTwoOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, Block block) {
@@ -1046,10 +896,6 @@ public JavaMethodTwoOrThreeOrN(RubyModule implementationClass, Visibility visibi
         public JavaMethodTwoOrThreeOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodTwoOrThreeOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) {
@@ -1070,10 +916,6 @@ public JavaMethodThreeOrN(RubyModule implementationClass, Visibility visibility,
         public JavaMethodThreeOrN(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodThreeOrN(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) {
@@ -1094,23 +936,11 @@ public JavaMethodZero(RubyModule implementationClass, Visibility visibility, Str
         public JavaMethodZero(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.1.16.0")
-        public JavaMethodZero(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZero(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig, String name) {
-            super(implementationClass, visibility, name);
-        }
 
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
             if (args.length != 0) return raiseArgumentError(this, context, name, args.length, 0, 0);
             return call(context, self, clazz, name);
         }
-        @Deprecated(since = "9.3.0.0") @Override
-        public Arity getArity() {
-            return Arity.NO_ARGUMENTS;
-        }
 
         public Signature getSignature() {
             return Signature.NO_ARGUMENTS;
@@ -1125,10 +955,6 @@ public JavaMethodZeroOrOne(RubyModule implementationClass, Visibility visibility
         public JavaMethodZeroOrOne(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOne(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
@@ -1151,10 +977,6 @@ public JavaMethodZeroOrOneOrTwo(RubyModule implementationClass, Visibility visib
         public JavaMethodZeroOrOneOrTwo(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrTwo(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         @Override
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
@@ -1179,10 +1001,6 @@ public JavaMethodZeroOrOneOrTwoOrThree(RubyModule implementationClass, Visibilit
         public JavaMethodZeroOrOneOrTwoOrThree(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodZeroOrOneOrTwoOrThree(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
             switch (args.length) {
@@ -1212,27 +1030,12 @@ public JavaMethodOne(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
             setParameterList(ONE_REQ);
         }
-        @Deprecated(since = "9.1.16.0")
-        public JavaMethodOne(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-            setParameterList(ONE_REQ);
-        }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOne(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig, String name) {
-            super(implementationClass, visibility, name);
-            setParameterList(ONE_REQ);
-        }
 
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
             if (args.length != 1) return raiseArgumentError(this, context, name, args.length, 1, 1);
             return call(context, self, clazz, name, args[0]);
         }
 
-        @Deprecated(since = "9.3.0.0") @Override
-        public Arity getArity() {
-            return Arity.ONE_ARGUMENT;
-        }
-
         public Signature getSignature() {
             return Signature.ONE_ARGUMENT;
         }
@@ -1246,10 +1049,6 @@ public JavaMethodOneOrTwo(RubyModule implementationClass, Visibility visibility,
         public JavaMethodOneOrTwo(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrTwo(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
             switch (args.length) {
@@ -1271,10 +1070,6 @@ public JavaMethodOneOrTwoOrThree(RubyModule implementationClass, Visibility visi
         public JavaMethodOneOrTwoOrThree(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodOneOrTwoOrThree(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
             switch (args.length) {
@@ -1302,22 +1097,12 @@ public JavaMethodTwo(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
             setParameterList(TWO_REQ);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodTwo(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-            setParameterList(TWO_REQ);
-        }
 
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
             if (args.length != 2) return raiseArgumentError(this, context, name, args.length, 2, 2);
             return call(context, self, clazz, name, args[0], args[1]);
         }
 
-        @Deprecated(since = "9.3.0.0") @Override
-        public Arity getArity() {
-            return Arity.TWO_ARGUMENTS;
-        }
-
         public Signature getSignature() {
             return Signature.TWO_ARGUMENTS;
         }
@@ -1328,13 +1113,10 @@ public JavaMethodTwoOrThree(RubyModule implementationClass, Visibility visibilit
             super(implementationClass, visibility, name);
             setParameterList(TWO_REQ);
         }
+        @Deprecated(since = "9.1.16.0")
         public JavaMethodTwoOrThree(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodTwoOrThree(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
             switch (args.length) {
@@ -1355,55 +1137,33 @@ public JavaMethodThree(RubyModule implementationClass, Visibility visibility, St
             super(implementationClass, visibility, name);
             setParameterList(THREE_REQ);
         }
+        @Deprecated(since = "9.1.16.0")
         public JavaMethodThree(RubyModule implementationClass, Visibility visibility) {
             super(implementationClass, visibility);
             setParameterList(THREE_REQ);
         }
-        @Deprecated(since = "9.0.1.0")
-        public JavaMethodThree(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-            super(implementationClass, visibility);
-        }
 
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
             if (args.length != 3) return raiseArgumentError(this, context, name, args.length, 3, 3);
             return call(context, self, clazz, name, args[0], args[1], args[2]);
         }
 
-        @Deprecated(since = "9.3.0.0") @Override
-        public Arity getArity() {
-            return Arity.THREE_ARGUMENTS;
-        }
-
         public Signature getSignature() {
             return Signature.THREE_ARGUMENTS;
         }
     }
 
-    @Deprecated(since = "9.0.1.0")
-    public JavaMethod(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig) {
-        super(implementationClass, visibility);
-    }
-
-    @Deprecated(since = "9.0.1.0")
-    public JavaMethod(RubyModule implementationClass, Visibility visibility, CallConfiguration callConfig, String name) {
-        super(implementationClass, visibility, name);
-    }
-
-    @Deprecated(since = "9.0.1.0")
-    public CallConfiguration getCallerRequirement() {
-        return CallConfiguration.FrameNoneScopeNone;
-    }
-
-    @Deprecated(since = "9.0.1.0")
-    public void setCallerRequirement(CallConfiguration callerRequirement) {
-    }
-
     /**
      * Used for old-style nameless constructor to pass name in out-of-band.
+     * @deprecated but still used by {@link InvocationMethodFactory#constructJavaMethod(RubyModule, JavaMethodDescriptor, String, Class)}
      */
     @Deprecated(since = "9.1.16.0")
     public static final ThreadLocal<String> NAME_PASSER = new ThreadLocal<>();
 
+    /**
+     * Used for old-style nameless constructor to pass name in out-of-band.
+     * @deprecated but still used by {@link InvocationMethodFactory#constructJavaMethod(RubyModule, JavaMethodDescriptor, String, Class)}
+     */
     @Deprecated(since = "9.1.16.0")
     public JavaMethod(RubyModule implementationClass, Visibility visibility) {
         this(implementationClass, visibility, NAME_PASSER.get());
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/MixedModeIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/MixedModeIRMethod.java
index 942561fdf44..510401a7ca5 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/MixedModeIRMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/MixedModeIRMethod.java
@@ -65,6 +65,11 @@ public DynamicMethod getActualMethod() {
         return actualMethod;
     }
 
+    public void reset() {
+        this.callCount = 0;
+        this.actualMethod = null;
+    }
+
     protected void post(InterpreterContext ic, ThreadContext context) {
         // update call stacks (pop: ..)
         context.popFrame();
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/NullMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/NullMethod.java
index 58a6e6f392c..74eaa1f8cdd 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/NullMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/NullMethod.java
@@ -102,18 +102,6 @@ public void setVisibility(Visibility visibility) {
         // NullMethod should be immutable
     }
 
-    /**
-     * Dummy implementation of setCallConfig that does nothing.
-     *
-     * @param callConfig Ignored
-     */
-    @Override
-    @Deprecated(since = "9.1.6.0")
-    public void setCallConfig(CallConfiguration callConfig) {
-        throw new UnsupportedOperationException("BUG: NullMethod is immutable: setCallConfig called; report at http://bugs.jruby.org");
-        // NullMethod should be immutable
-    }
-
     /**
      * NullMethod is always visible because it's only used as a marker to
      * break method lookup loops.
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/PartialDelegatingMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/PartialDelegatingMethod.java
index f549dc524b9..842dd9195cb 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/PartialDelegatingMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/PartialDelegatingMethod.java
@@ -126,11 +126,6 @@ public DynamicMethod getRealMethod() {
         return entry.method.getRealMethod();
     }
 
-    @Deprecated(since = "9.3.0.0") @Override
-    public Arity getArity() {
-        return entry.method.getArity();
-    }
-
     @Override
     public Signature getSignature() {
         return entry.method.getSignature();
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/ProcMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/ProcMethod.java
index 3b071170b0e..2a3dec00a77 100644
--- a/core/src/main/java/org/jruby/internal/runtime/methods/ProcMethod.java
+++ b/core/src/main/java/org/jruby/internal/runtime/methods/ProcMethod.java
@@ -73,11 +73,6 @@ public boolean isSame(DynamicMethod method) {
         return ((ProcMethod) method).proc == proc;
     }
 
-    @Deprecated(since = "9.3.0.0") @Override
-    public Arity getArity() {
-        return getSignature().arity();
-    }
-
     public String getFile() {
         return proc.getBlock().getBody().getFile();
     }
diff --git a/core/src/main/java/org/jruby/ir/IRClosure.java b/core/src/main/java/org/jruby/ir/IRClosure.java
index 516d9a065ca..e7f5864a915 100644
--- a/core/src/main/java/org/jruby/ir/IRClosure.java
+++ b/core/src/main/java/org/jruby/ir/IRClosure.java
@@ -196,7 +196,6 @@ public boolean isNestedClosuresSafeForMethodConversion() {
     public IRMethod convertToMethod(ByteList name) {
         // We want variable scoping to be the same as a method and not see outside itself.
         if (source == null ||
-            isWithinMethod() ||                 // def foo; define_method {}; end has potential to implicitly access parents var yield
             accessesParentsLocalVariables() ||  // Built methods cannot search down past method scope
             receivesClosureArg() ||             // we pass in captured block at define_method as block so explicits ones not supported
             usesZSuper() ||                     // methods defined from closures cannot use zsuper
diff --git a/core/src/main/java/org/jruby/ir/IRManager.java b/core/src/main/java/org/jruby/ir/IRManager.java
index bac1d90f70c..3469fe358a2 100644
--- a/core/src/main/java/org/jruby/ir/IRManager.java
+++ b/core/src/main/java/org/jruby/ir/IRManager.java
@@ -35,6 +35,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.jruby.ir.passes.DeadCodeElimination;
 import org.jruby.ir.passes.OptimizeDelegationPass;
 import org.jruby.ir.passes.OptimizeDynScopesPass;
@@ -94,6 +96,7 @@ public class IRManager {
     private final RubyInstanceConfig config;
     public final Ruby runtime;
     private IRBuilderFactory builderFactory;
+    private AtomicLong callSiteCounter = new AtomicLong(1);
 
     public IRManager(Ruby runtime, RubyInstanceConfig config) {
         this.runtime = runtime;
@@ -445,4 +448,8 @@ private ParseResult parse(ThreadContext context, FileResource file, String fileN
     public BuiltinClass getSymbolClass() {
         return symbolClass;
     }
+
+    public long nextCallSiteID() {
+        return callSiteCounter.incrementAndGet();
+    }
 }
diff --git a/core/src/main/java/org/jruby/ir/IRMethod.java b/core/src/main/java/org/jruby/ir/IRMethod.java
index 0ebf38b454f..8815cb664ab 100644
--- a/core/src/main/java/org/jruby/ir/IRMethod.java
+++ b/core/src/main/java/org/jruby/ir/IRMethod.java
@@ -193,15 +193,6 @@ private synchronized ExitableInterpreterContext builtInterpreterContextForJavaCo
         return ExitableInterpreterContext.NULL;
     }
 
-    /**
-     * This method was renamed (due a typo).
-     * @see #builtInterpreterContextForJavaConstructor()
-     */
-    @Deprecated(since = "9.3.11.0")
-    public ExitableInterpreterContext builtInterperterContextForJavaConstructor() {
-        return builtInterpreterContextForJavaConstructor();
-    }
-
     public final InterpreterContext lazilyAcquireInterpreterContext() {
         if (!hasBeenBuilt()) buildMethodImpl();
 
diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
index 66e4b548a8e..faf707128fe 100644
--- a/core/src/main/java/org/jruby/ir/IRScope.java
+++ b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -246,6 +246,7 @@ public IRManager getManager() {
 
     public void setIsMaybeUsingRefinements() {
         maybeUsingRefinements = true;
+        fullInterpreterContext = null;
     }
 
     public boolean parentMaybeUsingRefinements() {
@@ -386,20 +387,10 @@ public Encoding getEncoding() {
         throw new IllegalArgumentException("This is only here because prism requires this in ParseResult");
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public String getFileName() {
-        return getFile();
-    }
-
     public String getFile() {
         return getRootLexicalScope().getFile();
     }
 
-    @Deprecated(since = "9.2.1.0")
-    public int getLineNumber() {
-        return lineNumber;
-    }
-
     public int getLine() {
         return lineNumber;
     }
@@ -678,9 +669,9 @@ public IGVDumper dumpToIGV() {
         if (RubyInstanceConfig.IR_DEBUG_IGV != null) {
             String spec = RubyInstanceConfig.IR_DEBUG_IGV;
 
-            if (spec.contains(":") && spec.equals(getFileName() + ":" + getLineNumber()) ||
-                    spec.equals(getFileName())) {
-                return new IGVDumper(getFullyQualifiedName() + "; line " + (getLineNumber() + 1), RubyInstanceConfig.IR_DEBUG_IGV_STDOUT);
+            if (spec.contains(":") && spec.equals(getFile() + ":" + getLine()) ||
+                    spec.equals(getFile())) {
+                return new IGVDumper(getFullyQualifiedName() + "; line " + (getLine() + 1), RubyInstanceConfig.IR_DEBUG_IGV_STDOUT);
             }
         }
 
diff --git a/core/src/main/java/org/jruby/ir/IRVisitor.java b/core/src/main/java/org/jruby/ir/IRVisitor.java
index 699ae89c95d..ba8cf251b9d 100644
--- a/core/src/main/java/org/jruby/ir/IRVisitor.java
+++ b/core/src/main/java/org/jruby/ir/IRVisitor.java
@@ -89,9 +89,6 @@ private void error(Object object) {
     public void NonlocalReturnInstr(NonlocalReturnInstr nonlocalreturninstr) { error(nonlocalreturninstr); }
     public void NopInstr(NopInstr nopinstr) { error(nopinstr); }
     public void NoResultCallInstr(NoResultCallInstr noresultcallinstr) { error(noresultcallinstr); }
-    @Deprecated(since = "9.1.3.0") public void OneFixnumArgNoBlockCallInstr(OneFixnumArgNoBlockCallInstr oneFixnumArgNoBlockCallInstr) { error(oneFixnumArgNoBlockCallInstr); }
-    @Deprecated(since = "9.1.3.0") public void OneFloatArgNoBlockCallInstr(OneFloatArgNoBlockCallInstr oneFloatArgNoBlockCallInstr) { error(oneFloatArgNoBlockCallInstr); }
-    @Deprecated(since = "9.1.3.0") public void OneOperandArgNoBlockCallInstr(OneOperandArgNoBlockCallInstr oneOperandArgNoBlockCallInstr) { error(oneOperandArgNoBlockCallInstr); }
     public void OptArgMultipleAsgnInstr(OptArgMultipleAsgnInstr optargmultipleasgninstr) { error(optargmultipleasgninstr); }
     public void PopBindingInstr(PopBindingInstr popbindinginstr) { error(popbindinginstr); }
     public void PopBlockFrameInstr(PopBlockFrameInstr instr) { error(instr); }
@@ -145,7 +142,6 @@ private void error(Object object) {
     public void UnresolvedSuperInstr(UnresolvedSuperInstr unresolvedsuperinstr) { error(unresolvedsuperinstr); }
     public void UpdateBlockExecutionStateInstr (UpdateBlockExecutionStateInstr instr) { error(instr); }
     public void YieldInstr(YieldInstr yieldinstr) { error(yieldinstr); }
-    @Deprecated(since = "9.1.3.0") public void ZeroOperandArgNoBlockCallInstr(ZeroOperandArgNoBlockCallInstr zeroOperandArgNoBlockCallInstr) { error(zeroOperandArgNoBlockCallInstr); }
     public void ZSuperInstr(ZSuperInstr zsuperinstr) { error(zsuperinstr); }
 
     // "defined" instructions
diff --git a/core/src/main/java/org/jruby/ir/builder/EnsureBlockInfo.java b/core/src/main/java/org/jruby/ir/builder/EnsureBlockInfo.java
index c9dc06c793c..fbae4354470 100644
--- a/core/src/main/java/org/jruby/ir/builder/EnsureBlockInfo.java
+++ b/core/src/main/java/org/jruby/ir/builder/EnsureBlockInfo.java
@@ -49,10 +49,10 @@
  * run the stack of ensure blocks in the right order.
  * ----------------------------------------------------------------------------------- */
 class EnsureBlockInfo {
-    final Label regionStart;
-    final Label    start;
-    final Label    end;
-    final Label    dummyRescueBlockLabel;
+    final Label start;         // Beginning of this ensure region
+    final Label bodyStart;     // Beginning of any actual instrs in the ensure body (will not be emitted if none)
+    final Label end;           // End of this ensure region
+    final Label ensureRescue;  // Where exceptions in an ensure flow through
     Variable savedGlobalException;
     boolean needsBacktrace;
 
@@ -65,13 +65,13 @@ class EnsureBlockInfo {
     // This ensure block's instructions
     final List<Instr> instrs;
 
-    public EnsureBlockInfo(IRScope s, IRLoop l, Label bodyRescuer) {
+    public EnsureBlockInfo(IRScope s, IRLoop l, Label bodyRescuer, int sourceLine) {
         // this technically may be any block and not specifically rescue but for the sake of looking at the CFG
         // it is more or less a begin block with exception handling around it.
-        regionStart = s.getNewLabel("BEGIN");
-        start       = s.getNewLabel("RESC_START");
-        end         = s.getNewLabel("AFTER_RESC");
-        dummyRescueBlockLabel = s.getNewLabel("RESC_DUMMY");
+        start = s.getNewLabel("ENSURE_BEGIN_@" + sourceLine);
+        bodyStart = s.getNewLabel("ENSURE_BODY_:@" + sourceLine);
+        end = s.getNewLabel("ENSURE_END_:@" + sourceLine);
+        ensureRescue = s.getNewLabel("ENSURE_CATCH_@" + sourceLine);
         instrs = new ArrayList<>(4);
         savedGlobalException = null;
         innermostLoop = l;
@@ -87,10 +87,14 @@ public void addInstrAtBeginning(Instr i) {
         instrs.add(0, i);
     }
 
-    public void emitBody(IRBuilder b) {
-        b.addInstr(new LabelInstr(start));
+    /**
+     * Emit the saved instrs for the ensure body into the current location in the provided builder.
+     * @param builder
+     */
+    public void emitEnsureBody(IRBuilder builder) {
+        builder.addInstr(new LabelInstr(bodyStart));
         for (Instr i: instrs) {
-            b.addInstr(i);
+            builder.addInstr(i);
         }
     }
 
@@ -106,20 +110,20 @@ public void cloneIntoHostScope(IRBuilder builder) {
         // there are no actual instrs pushed yet (but ebi has reserved a frame for it -- e.g. the rescue/ensure
         // the next is in).  Since it is doing nothing we have nothing to clone.  By skipping this we prevent
         // setting exception regions and simplify CFG construction.
-        if (instrs.size() == 0) return;
+        if (instrs.isEmpty()) return;
 
         SimpleCloneInfo ii = new SimpleCloneInfo(builder.scope, true);
 
         // Clone required labels.
         // During normal cloning below, labels not found in the rename map
         // are not cloned.
-        ii.renameLabel(start);
+        ii.renameLabel(bodyStart);
         for (Instr i: instrs) {
             if (i instanceof LabelInstr) ii.renameLabel(((LabelInstr)i).getLabel());
         }
 
         // Clone instructions now
-        builder.addInstr(new LabelInstr(ii.getRenamedLabel(start)));
+        builder.addInstr(new LabelInstr(ii.getRenamedLabel(bodyStart)));
         builder.addInstr(new ExceptionRegionStartMarkerInstr(bodyRescuer));
         for (Instr instr: instrs) {
             Instr clonedInstr = instr.clone(ii);
diff --git a/core/src/main/java/org/jruby/ir/builder/IRBuilder.java b/core/src/main/java/org/jruby/ir/builder/IRBuilder.java
index 17eab221881..ff1c0fe46c8 100644
--- a/core/src/main/java/org/jruby/ir/builder/IRBuilder.java
+++ b/core/src/main/java/org/jruby/ir/builder/IRBuilder.java
@@ -8,7 +8,6 @@
 import org.jruby.RubySymbol;
 import org.jruby.ast.IterNode;
 import org.jruby.ast.StrNode;
-import org.jruby.common.IRubyWarnings;
 import org.jruby.ext.coverage.CoverageData;
 import org.jruby.ir.IRClassBody;
 import org.jruby.ir.IRClosure;
@@ -167,44 +166,58 @@ public static InterpreterContext buildRoot(IRManager manager, ParseResult rootNo
         return manager.getBuilderFactory().topIRBuilder(manager, script, rootNode).buildRootInner(rootNode);
     }
 
+    protected int currentLine() {
+        return lastProcessedLineNum;
+    }
+
+    // FIXME: When legacy parser goes away this should be totally rewritten as prism represents the whole structure as one node vs
+    //   legacy which has ensure as the parent to any rescue.
     // FIXME: consider mod_rescue, rescue, and pure ensure as separate entries
-    // Note: reference is only passed in via Prism on legacy this is desugared into AST.
-    protected Operand buildEnsureInternal(U body, U elseNode, U[] exceptions, U rescueBody, X optRescue, boolean isModifier,
-                                U ensureNode, boolean isRescue, U reference) {
-        // Save $!
-        final Variable savedGlobalException = temp();
-        addInstr(new GetGlobalVariableInstr(savedGlobalException, symbol("$!")));
-
-        // ------------ Build the body of the ensure block ------------
-        //
+    /**
+     * @param body the main statements to be executed
+     * @param elseNode else path in a begin
+     * @param exceptions possible list of excpetions which will jump to rescueBody
+     * @param rescueBody the statements executed if the matching exception(s) occurs
+     * @param optRescue possible other rescue in the same begin
+     * @param isModifier foo rescue bar
+     * @param ensureNode ensure block
+     * @param reference variable for the rescue (NameError => name)
+     * @return return last operand of begin execution
+     *
+     * Note: reference is only passed in via Prism on legacy this is desugared into AST.
+     */
+    protected Operand buildEnsureInternal(U body, U elseNode, U[] exceptions, U rescueBody, X optRescue,
+                                          boolean isModifier, U ensureNode, boolean isRescue, U reference) {
+        var savedGlobalException = addResultInstr(new GetGlobalVariableInstr(temp(), symbol("$!")));
+
         // The ensure code is built first so that when the protected body is being built,
         // the ensure code can be cloned at break/next/return sites in the protected body.
+        EnsureBlockInfo ebi = new EnsureBlockInfo(scope, getCurrentLoop(), activeRescuers.peek(), currentLine() + 1);
 
-        // Push a new ensure block node onto the stack of ensure bodies being built
-        // The body's instructions are stashed and emitted later.
-        EnsureBlockInfo ebi = new EnsureBlockInfo(scope, getCurrentLoop(), activeRescuers.peek());
+        // Rescue will change $! but we need to restore $! later.  prism: ensure and isRescue means it is both (we
+        // call this method again below to rip those two things apart.
+        if (isRescue && ensureNode == null) ebi.savedGlobalException = savedGlobalException;
 
-        // Record $! save var if we had a non-empty rescue node.
-        // $! will be restored from it where required.
-        if (isRescue) ebi.savedGlobalException = savedGlobalException;
-
-        ensureBodyBuildStack.push(ebi);
-        Operand ensureRetVal = ensureNode == null ? nil() : build(ensureNode);
-        ensureBodyBuildStack.pop();
+        // Record body of ensure and push to ensure body stack if there is an actual ensure body.
+        Operand ensureRetVal = processEnsureBody(ensureNode, ebi);
 
         // ------------ Build the protected region ------------
         activeEnsureBlockStack.push(ebi);
 
         // Start of protected region
-        addInstr(new LabelInstr(ebi.regionStart));
-        addInstr(new ExceptionRegionStartMarkerInstr(ebi.dummyRescueBlockLabel));
-        activeRescuers.push(ebi.dummyRescueBlockLabel);
+        addInstr(new LabelInstr(ebi.start));
+        addInstr(new ExceptionRegionStartMarkerInstr(ebi.ensureRescue));
+        activeRescuers.push(ebi.ensureRescue);
 
         // Generate IR for code being protected
-        Variable ensureExprValue = temp();
         Operand rv;
         if (isRescue) {
-            rv = buildRescueInternal(body, elseNode, exceptions, rescueBody, optRescue, isModifier, ebi, reference);
+            if (ensureNode != null) {
+                // both were passed in via Prism.  Let's pretend they are nested like legacy where ensures enclose the rescue.
+                rv = buildEnsureInternal(body, elseNode, exceptions, rescueBody, optRescue, isModifier, null, isRescue, reference);
+            } else {
+                rv = buildRescueInternal(body, elseNode, exceptions, rescueBody, optRescue, isModifier, ebi, reference);
+            }
         } else {
             rv = build(body);
         }
@@ -215,8 +228,9 @@ protected Operand buildEnsureInternal(U body, U elseNode, U[] exceptions, U resc
 
         // Is this a begin..(rescue..)?ensure..end node that actually computes a value?
         // (vs. returning from protected body)
-        boolean isEnsureExpr = ensureNode != null && rv != U_NIL && !isRescue;
+        boolean isEnsureExpr = ensureNode != null && rv != U_NIL;
 
+        Variable ensureExprValue = temp();
         // Clone the ensure body and jump to the end
         if (isEnsureExpr) {
             addInstr(new CopyInstr(ensureExprValue, rv));
@@ -230,27 +244,36 @@ protected Operand buildEnsureInternal(U body, U elseNode, U[] exceptions, U resc
         // ------------ Emit the ensure body alongwith dummy rescue block ------------
         // Now build the dummy rescue block that
         // catches all exceptions thrown by the body
-        addInstr(new LabelInstr(ebi.dummyRescueBlockLabel));
+        addInstr(new LabelInstr(ebi.ensureRescue));
         Variable exc = addResultInstr(new ReceiveJRubyExceptionInstr(temp()));
 
         // Now emit the ensure body's stashed instructions
-        if (ensureNode != null) ebi.emitBody(this);
+        if (ensureNode != null) ebi.emitEnsureBody(this);
 
         // 1. Ensure block has no explicit return => the result of the entire ensure expression is the result of the protected body.
         // 2. Ensure block has an explicit return => the result of the protected body is ignored.
         // U_NIL => there was a return from within the ensure block!
+        // FIXME:  This U_NIL case is wrong in a few cases:  'ensure; return 1 if true; end' or weirder 'ensure; return 1; true; end'
         if (ensureRetVal == U_NIL) rv = U_NIL;
 
-        // Return (rethrow exception/end)
-        // rethrows the caught exception from the dummy ensure block
-        addInstr(new ThrowExceptionInstr(exc));
-
-        // End label for the exception region
-        addInstr(new LabelInstr(ebi.end));
+        addInstr(new ThrowExceptionInstr(exc));  // rethrows the caught exception from the dummy ensure block
+        addInstr(new LabelInstr(ebi.end));  // End label for the exception region
 
         return isEnsureExpr ? ensureExprValue : rv;
     }
 
+    private Operand processEnsureBody(U ensureNode, EnsureBlockInfo ebi) {
+        Operand ensureRetVal;
+        if (ensureNode != null) {
+            ensureBodyBuildStack.push(ebi);
+            ensureRetVal = build(ensureNode);
+            ensureBodyBuildStack.pop();
+        } else {
+            ensureRetVal = nil();
+        }
+        return ensureRetVal;
+    }
+
     public InterpreterContext buildEvalRoot(ParseResult rootNode) {
         executesOnce = false;
         coverageMode = rootNode.getCoverageMode();
@@ -1932,8 +1955,8 @@ protected Operand buildOpAsgnConstDecl(Y left, U right, RubySymbol operator) {
         return copy(temp(), putConstant(left, result));
     }
 
-    protected Operand buildOpAsgnConstDecl(Y left, RubySymbol name, U right, RubySymbol operator) {
-        Operand parent = buildColon2ForConstAsgnDeclNode((U) left, temp(), false);
+    protected Operand buildOpAsgnConstDecl(U left, RubySymbol name, U right, RubySymbol operator) {
+        Operand parent = buildColon2ForConstAsgnDeclNode(left, temp(), false);
         Operand lhs = searchModuleForConst(temp(), parent, name);
         Operand rhs = build(right);
         Variable result = call(temp(), lhs, operator, rhs);
@@ -2499,7 +2522,6 @@ protected Operand buildRedo(int line) {
     protected void buildRescueBodyInternal(U[] exceptions, U body, X consequent, Variable rv, Variable exc, Label endLabel,
                                  U reference) {
         // Compare and branch as necessary!
-        Label uncaughtLabel = getNewLabel("MISSED");
         Label caughtLabel = getNewLabel("RESCUE");
         if (exceptions == null || exceptions.length == 0) {
             outputExceptionCheck(getManager().getStandardError(), exc, caughtLabel);
@@ -2510,7 +2532,6 @@ protected void buildRescueBodyInternal(U[] exceptions, U body, X consequent, Var
         }
 
         // Uncaught exception -- build other rescue nodes or rethrow!
-        addInstr(new LabelInstr(uncaughtLabel));
         if (consequent != null) {
             buildRescueBodyInternal(exceptionNodesFor(consequent), bodyFor(consequent), optRescueFor(consequent), rv,
                     exc, endLabel, referenceFor(consequent));
@@ -2579,21 +2600,33 @@ protected Operand buildAttrAssign(Variable result, U receiver, U argsNode, U blo
 
     protected abstract Operand[] buildAttrAssignCallArgs(U args, Operand[] rhs, boolean containsAssignment);
 
+    /**
+     * @param bodyNode the main statements to be executed
+     * @param elseNode else path in a begin
+     * @param exceptions possible list of excpetions which will jump to rescueBody
+     * @param rescueBody the statements executed if the matching exception(s) occurs
+     * @param optRescue possible other rescue in the same begin
+     * @param isModifier foo rescue bar
+     * @param ensure ensure block
+     * @param reference variable for the rescue (NameError => name)
+     * @return return last operand of begin execution
+     */
     protected Operand buildRescueInternal(U bodyNode, U elseNode, U[] exceptions, U rescueBody,
                                         X optRescue, boolean isModifier, EnsureBlockInfo ensure, U reference) {
         boolean needsBacktrace = !canBacktraceBeRemoved(exceptions, rescueBody, optRescue, elseNode, isModifier);
 
         // Labels marking start, else, end of the begin-rescue(-ensure)-end block
-        Label rBeginLabel = getNewLabel();
-        Label rEndLabel   = ensure.end;
-        Label rescueLabel = getNewLabel("RESC_TEST"); // Label marking start of the first rescue code.
+        int line = currentLine() + 1;
+        Label beginLabel = getNewLabel("BEGIN_@" + line);
+        Label endLabel   = ensure.end;
+        Label rescueTestLabel = getNewLabel("RESCUE_TEST_@" + line); // Label marking start of the first rescue code.
         ensure.needsBacktrace = needsBacktrace;
 
-        addInstr(new LabelInstr(rBeginLabel));
+        addInstr(new LabelInstr(beginLabel));
 
         // Placeholder rescue instruction that tells rest of the compiler passes the boundaries of the rescue block.
-        addInstr(new ExceptionRegionStartMarkerInstr(rescueLabel));
-        activeRescuers.push(rescueLabel);
+        addInstr(new ExceptionRegionStartMarkerInstr(rescueTestLabel));
+        activeRescuers.push(rescueTestLabel);
         addInstr(getManager().needsBacktrace(needsBacktrace));
 
         // Body
@@ -2628,7 +2661,7 @@ protected Operand buildRescueInternal(U bodyNode, U elseNode, U[] exceptions, U
         //
         // The retry should jump to 1, not 2.
         // If we push the rescue block before building the body, we will jump to 2.
-        RescueBlockInfo rbi = new RescueBlockInfo(rBeginLabel, ensure.savedGlobalException);
+        RescueBlockInfo rbi = new RescueBlockInfo(beginLabel, ensure.savedGlobalException);
         activeRescueBlockStack.push(rbi);
 
         if (tmp != U_NIL) {
@@ -2638,7 +2671,7 @@ protected Operand buildRescueInternal(U bodyNode, U elseNode, U[] exceptions, U
             // - If we dont have any ensure blocks, simply jump to the end of the rescue block
             // - If we do, execute the ensure code.
             ensure.cloneIntoHostScope(this);
-            addInstr(new JumpInstr(rEndLabel));
+            addInstr(new JumpInstr(endLabel));
         }   //else {
         // If the body had an explicit return, the return instruction IR build takes care of setting
         // up execution of all necessary ensure blocks. So, nothing to do here!
@@ -2650,7 +2683,7 @@ protected Operand buildRescueInternal(U bodyNode, U elseNode, U[] exceptions, U
         //}
 
         // Start of rescue logic
-        addInstr(new LabelInstr(rescueLabel));
+        addInstr(new LabelInstr(rescueTestLabel));
 
         // This is optimized no backtrace path so we need to reenable backtraces since we are
         // exiting that region.
@@ -2660,7 +2693,7 @@ protected Operand buildRescueInternal(U bodyNode, U elseNode, U[] exceptions, U
         Variable exc = addResultInstr(new ReceiveRubyExceptionInstr(temp()));
 
         // Build the actual rescue block(s)
-        buildRescueBodyInternal(exceptions, rescueBody, optRescue, rv, exc, rEndLabel, reference);
+        buildRescueBodyInternal(exceptions, rescueBody, optRescue, rv, exc, endLabel, reference);
 
         activeRescueBlockStack.pop();
         return rv;
diff --git a/core/src/main/java/org/jruby/ir/builder/IRBuilderAST.java b/core/src/main/java/org/jruby/ir/builder/IRBuilderAST.java
index 2d294dfde7c..61700e97ca0 100644
--- a/core/src/main/java/org/jruby/ir/builder/IRBuilderAST.java
+++ b/core/src/main/java/org/jruby/ir/builder/IRBuilderAST.java
@@ -607,6 +607,10 @@ protected Operand[] buildCallArgsArray(ListNode args, int[] flags) {
 
     protected Operand[] buildCallArgs(Node args, int[] flags) {
         switch (args.getNodeType()) {
+            case DEFNNODE:
+            case DEFSNODE:
+                build(args);
+                return new Operand[] { new Symbol(((MethodDefNode) args).getName()) };
             case ARGSCATNODE:
             case ARGSPUSHNODE:
                 Operand lhs = build(((TwoValueNode) args).getFirstNode());
@@ -1039,7 +1043,8 @@ public Operand buildCase(CaseNode caseNode) {
             NodeType seenType = null;
             for (Node aCase : caseNode.getCases().children()) {
                 WhenNode whenNode = (WhenNode) aCase;
-                NodeType exprNodeType = whenNode.getExpressionNodes().getNodeType();
+                Node exprNode = whenNode.getExpressionNodes();
+                NodeType exprNodeType = exprNode.getNodeType();
 
                 if (seenType == null) {
                     seenType = exprNodeType;
@@ -1047,6 +1052,14 @@ public Operand buildCase(CaseNode caseNode) {
                     seenType = null;
                     break;
                 }
+
+                if (exprNode instanceof FixnumNode fixnum) {
+                    long value = fixnum.getValue();
+                    if (value > java.lang.Integer.MAX_VALUE || value < java.lang.Integer.MIN_VALUE) {
+                        seenType = null;
+                        break;
+                    }
+                }
             }
 
             if (seenType != null) {
@@ -1196,7 +1209,6 @@ private <T extends Node & ILiteralNode> Map<java.lang.Integer, Tuple<Operand, La
 
             T expr = (T) whenNode.getExpressionNodes();
             long exprLong = caseFunction.apply(expr);
-            if (exprLong > java.lang.Integer.MAX_VALUE) throw notCompilable("optimized case has long-ranged value", caseNode);
 
             if (jumpTable.get((int) exprLong) == null) {
                 jumpTable.put((int) exprLong, new Tuple<>(buildOptimizedWhenOperand(expr), bodyLabel));
@@ -2515,7 +2527,7 @@ public Operand buildOpAsgnConstDeclNode(OpAsgnConstDeclNode node) {
             return buildOpAsgnConstDeclAnd(node.getFirstNode(), node.getSecondNode(), ((Colon3Node) node.getFirstNode()).getName());
         }
 
-        return buildOpAsgnConstDecl((Colon3Node) node.getFirstNode(), ((Colon3Node) node.getFirstNode()).getName(), node.getSecondNode(), node.getSymbolOperator());
+        return buildOpAsgnConstDecl(node.getFirstNode(), ((Colon3Node) node.getFirstNode()).getName(), node.getSecondNode(), node.getSymbolOperator());
     }
 
     public Operand buildOpAsgnAnd(OpAsgnAndNode node) {
@@ -2762,7 +2774,7 @@ public Operand buildYield(Variable result, YieldNode node) {
         int[] flags = new int[] { 0 };
         Operand value = buildYieldArgs(argNode, flags);
 
-        addInstr(new YieldInstr(result, getYieldClosureVariable(), value, flags[0], unwrap));
+        addInstr(new YieldInstr(scope, result, getYieldClosureVariable(), value, flags[0], unwrap));
 
         return result;
     }
@@ -2811,4 +2823,4 @@ protected void createPrefixFromArgs(ByteList prefix, Node args) {
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/jruby/ir/instructions/ArrayDerefInstr.java b/core/src/main/java/org/jruby/ir/instructions/ArrayDerefInstr.java
index 5c9a88ec69f..14f08aabf78 100644
--- a/core/src/main/java/org/jruby/ir/instructions/ArrayDerefInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/ArrayDerefInstr.java
@@ -14,7 +14,6 @@
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -36,16 +35,6 @@ public static ArrayDerefInstr create(IRScope scope, Variable result, Operand obj
         return new ArrayDerefInstr(scope, result, obj, arg0, flags);
     }
 
-    // clone constructor
-    public ArrayDerefInstr(IRScope scope, Variable result, Operand obj, FrozenString arg0, int flags,
-                           CallSite callSite, long callSiteId) {
-        super(scope, Operation.ARRAY_DEREF, CallType.FUNCTIONAL, result,
-                scope.getManager().getRuntime().newSymbol(AREF), obj, new Operand[] {arg0}, flags, false,
-                callSite, callSiteId);
-
-        key = arg0;
-    }
-
     // normal constructor
     public ArrayDerefInstr(IRScope scope, Variable result, Operand obj, FrozenString arg0, int flags) {
         super(scope, Operation.ARRAY_DEREF, CallType.FUNCTIONAL, result,
@@ -57,7 +46,7 @@ public ArrayDerefInstr(IRScope scope, Variable result, Operand obj, FrozenString
     @Override
     public Instr clone(CloneInfo ii) {
         return new ArrayDerefInstr(ii.getScope(), (Variable) getResult().cloneForInlining(ii),
-                getReceiver().cloneForInlining(ii), key, getFlags(), getCallSite(), getCallSiteId());
+                getReceiver().cloneForInlining(ii), key, getFlags());
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/AsStringInstr.java b/core/src/main/java/org/jruby/ir/instructions/AsStringInstr.java
index 41eb72435fc..10b6c2c27d3 100644
--- a/core/src/main/java/org/jruby/ir/instructions/AsStringInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/AsStringInstr.java
@@ -1,6 +1,5 @@
 package org.jruby.ir.instructions;
 
-import org.jruby.compiler.NotCompilableException;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.IRVisitor;
 import org.jruby.ir.Operation;
@@ -13,7 +12,6 @@
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -38,23 +36,6 @@ public AsStringInstr(IRScope scope, Variable result, Operand source, boolean isP
         assert isPotentiallyRefined : "AsStringInstr should only be needed in refined scopes";
     }
 
-    private AsStringInstr(IRScope scope, Variable result, Operand source, boolean isPotentiallyRefined, CallSite callSite, long callSiteId) {
-        super(
-                scope,
-                Operation.AS_STRING,
-                CallType.FUNCTIONAL,
-                result,
-                scope.getManager().getRuntime().newSymbol(TO_S),
-                nonNull(source),
-                Operand.EMPTY_ARRAY,
-                0,
-                isPotentiallyRefined,
-                callSite,
-                callSiteId);
-
-        assert isPotentiallyRefined : "AsStringInstr should only be needed in refined scopes";
-    }
-
     private static Operand nonNull(Operand source) {
         return source == null ? MutableString.EMPTY_STRING : source;
     }
@@ -62,7 +43,7 @@ private static Operand nonNull(Operand source) {
     @Override
     public Instr clone(CloneInfo ii) {
         return new AsStringInstr(ii.getScope(), (Variable) getResult().cloneForInlining(ii),
-                getReceiver().cloneForInlining(ii), isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                getReceiver().cloneForInlining(ii), isPotentiallyRefined());
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/AttrAssignInstr.java b/core/src/main/java/org/jruby/ir/instructions/AttrAssignInstr.java
index 26c0b6f91dc..99ee3a633be 100644
--- a/core/src/main/java/org/jruby/ir/instructions/AttrAssignInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/AttrAssignInstr.java
@@ -36,9 +36,8 @@ public static AttrAssignInstr create(IRScope scope, Operand obj, RubySymbol attr
 
     // clone constructor
     protected AttrAssignInstr(IRScope scope, CallType callType, RubySymbol name, Operand receiver,
-                              Operand[] args, int flags, boolean potentiallyRefined, CallSite callSite,
-                              long callSiteId) {
-        super(scope, Operation.ATTR_ASSIGN, callType, name, receiver, args, NullBlock.INSTANCE, flags, potentiallyRefined, callSite, callSiteId);
+                              Operand[] args, int flags, boolean potentiallyRefined) {
+        super(scope, Operation.ATTR_ASSIGN, callType, name, receiver, args, NullBlock.INSTANCE, flags, potentiallyRefined);
     }
 
     // normal constructor
@@ -51,7 +50,7 @@ public AttrAssignInstr(IRScope scope, Operand obj, RubySymbol attr, Operand[] ar
     @Override
     public Instr clone(CloneInfo ii) {
         return new AttrAssignInstr(ii.getScope(), getCallType(), getName(), getReceiver().cloneForInlining(ii),
-                cloneCallArgs(ii), getFlags(), isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                cloneCallArgs(ii), getFlags(), isPotentiallyRefined());
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/CallBase.java b/core/src/main/java/org/jruby/ir/instructions/CallBase.java
index 4076abca3e2..84111b6a487 100644
--- a/core/src/main/java/org/jruby/ir/instructions/CallBase.java
+++ b/core/src/main/java/org/jruby/ir/instructions/CallBase.java
@@ -25,7 +25,6 @@
 import static org.jruby.ir.IRFlags.*;
 
 public abstract class CallBase extends NOperandInstr implements ClosureAcceptingInstr, Site {
-    public static long callSiteCounter = 1;
     private static final EnumSet<FrameField> ALL = EnumSet.allOf(FrameField.class);
 
     public transient long callSiteId;
@@ -49,29 +48,25 @@ public abstract class CallBase extends NOperandInstr implements ClosureAccepting
     // main constructor
     protected CallBase(IRScope scope, Operation op, CallType callType, RubySymbol name, Operand receiver,
                        Operand[] args, Operand closure, int flags, boolean potentiallyRefined) {
-        this(scope, op, callType, name, receiver, args, closure, flags, potentiallyRefined, null, callSiteCounter++);
-    }
-
-    // clone constructor
-    protected CallBase(IRScope scope, Operation op, CallType callType, RubySymbol name, Operand receiver,
-                       Operand[] args, Operand closure, int flags, boolean potentiallyRefined, CallSite callSite,
-                       long callSiteId) {
         super(op, arrayifyOperands(receiver, args, closure));
 
         this.flags = flags;
-        this.callSiteId = callSiteId;
+        this.callSiteId = scope.getManager().nextCallSiteID();
         argsCount = args.length;
         hasClosure = closure != NullBlock.INSTANCE;
         this.name = name;
         this.callType = callType;
-        this.callSite = callSite == null ? getCallSiteFor(scope, callType, name.idString(), callSiteId, hasLiteralClosure(), potentiallyRefined) : callSite;
+
+        boolean effectivelyRefined = potentiallyRefined || (scope != null && scope.maybeUsingRefinements());
+        this.callSite = getCallSiteFor(scope, callType, name.idString(), callSiteId, hasLiteralClosure(), effectivelyRefined);
+
         splatMap = IRRuntimeHelpers.buildSplatMap(args);
         flagsComputed = false;
         canBeEval = true;
         targetRequiresCallersBinding = true;
         targetRequiresCallersFrame = true;
         dontInline = false;
-        this.potentiallyRefined = potentiallyRefined;
+        this.potentiallyRefined = effectivelyRefined;
 
         captureFrameReadsAndWrites();
     }
diff --git a/core/src/main/java/org/jruby/ir/instructions/CallInstr.java b/core/src/main/java/org/jruby/ir/instructions/CallInstr.java
index a70e2a78e15..c9ee83169d6 100644
--- a/core/src/main/java/org/jruby/ir/instructions/CallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/CallInstr.java
@@ -11,18 +11,13 @@
 import org.jruby.ir.instructions.specialized.OneOperandArgNoBlockCallInstr;
 import org.jruby.ir.instructions.specialized.TwoOperandArgNoBlockCallInstr;
 import org.jruby.ir.instructions.specialized.ZeroOperandArgNoBlockCallInstr;
-import org.jruby.ir.operands.Hash;
 import org.jruby.ir.operands.NullBlock;
 import org.jruby.ir.operands.Operand;
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.persistence.IRReaderDecoder;
 import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
-import org.jruby.util.KeyValuePair;
-
-import java.util.List;
 
 /*
  * args field: [self, receiver, *args]
@@ -66,16 +61,6 @@ public CallInstr(IRScope scope, CallType callType, Variable result, RubySymbol n
         this(scope, Operation.CALL, callType, result, name, receiver, args, closure, flags, potentiallyRefined);
     }
 
-    // clone constructor
-    protected CallInstr(IRScope scope, Operation op, CallType callType, Variable result, RubySymbol name, Operand receiver,
-                                Operand[] args, Operand closure, int flags, boolean potentiallyRefined, CallSite callSite, long callSiteId) {
-        super(scope, op, callType, name, receiver, args, closure, flags, potentiallyRefined, callSite, callSiteId);
-
-        assert result != null;
-
-        this.result = result;
-    }
-
     // normal constructor
     protected CallInstr(IRScope scope, Operation op, CallType callType, Variable result, RubySymbol name, Operand receiver,
                         Operand[] args, Operand closure, int flags, boolean potentiallyRefined) {
@@ -141,8 +126,8 @@ public Instr clone(CloneInfo ii) {
         return new CallInstr(ii.getScope(), getOperation(), getCallType(), ii.getRenamedVariable(result), getName(),
                 getReceiver().cloneForInlining(ii), cloneCallArgs(ii),
                 getClosureArg().cloneForInlining(ii),
-                getFlags(), isPotentiallyRefined(),
-                getCallSite(), getCallSiteId());
+                getFlags(), isPotentiallyRefined()
+        );
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/CheckForLJEInstr.java b/core/src/main/java/org/jruby/ir/instructions/CheckForLJEInstr.java
index 8698a8512c5..0bfdcb4ad6a 100644
--- a/core/src/main/java/org/jruby/ir/instructions/CheckForLJEInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/CheckForLJEInstr.java
@@ -27,11 +27,6 @@ public CheckForLJEInstr(boolean notDefinedWithinMethod) {
         this.definedWithinMethod = notDefinedWithinMethod;
     }
 
-    @Deprecated(since = "9.1.9.0")
-    public boolean maybeLambda() {
-        return !definedWithinMethod;
-    }
-
     public boolean isDefinedWithinMethod() {
         return definedWithinMethod;
     }
diff --git a/core/src/main/java/org/jruby/ir/instructions/ClassSuperInstr.java b/core/src/main/java/org/jruby/ir/instructions/ClassSuperInstr.java
index 564226f35dc..14d5a99f87e 100644
--- a/core/src/main/java/org/jruby/ir/instructions/ClassSuperInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/ClassSuperInstr.java
@@ -22,16 +22,6 @@
 public class ClassSuperInstr extends CallInstr {
     private final boolean isLiteralBlock;
 
-    // clone constructor
-    protected ClassSuperInstr(IRScope scope, Variable result, Operand receiver, RubySymbol name, Operand[] args,
-                              Operand closure, int flags, boolean potentiallyRefined, CallSite callSite,
-                              long callSiteId) {
-        super(scope, Operation.CLASS_SUPER, CallType.SUPER, result, name, receiver, args, closure, flags,
-                potentiallyRefined, callSite, callSiteId);
-
-        isLiteralBlock = closure instanceof WrappedIRClosure;
-    }
-
     // normal constructor
     public ClassSuperInstr(IRScope scope, Variable result, Operand definingModule, RubySymbol name, Operand[] args,
                            Operand closure, int flags, boolean isPotentiallyRefined) {
@@ -58,7 +48,7 @@ public boolean computeScopeFlags(IRScope scope, EnumSet<IRFlags> flags) {
     public Instr clone(CloneInfo ii) {
         return new ClassSuperInstr(ii.getScope(), ii.getRenamedVariable(getResult()), getDefiningModule().cloneForInlining(ii),
                 name, cloneCallArgs(ii), getClosureArg().cloneForInlining(ii),
-                getFlags(), isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                getFlags(), isPotentiallyRefined());
     }
 
     public static ClassSuperInstr decode(IRReaderDecoder d) {
diff --git a/core/src/main/java/org/jruby/ir/instructions/EQQInstr.java b/core/src/main/java/org/jruby/ir/instructions/EQQInstr.java
index dcae255e9a8..60c23d060cc 100644
--- a/core/src/main/java/org/jruby/ir/instructions/EQQInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/EQQInstr.java
@@ -13,7 +13,6 @@
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -26,16 +25,6 @@ public class EQQInstr extends CallInstr implements FixedArityInstr {
     private final boolean splattedValue;
     private final boolean pattern;
 
-    // clone constructor
-    protected EQQInstr(IRScope scope, Variable result, Operand v1, Operand v2, boolean splattedValue, boolean pattern, boolean isPotentiallyRefined, CallSite callSite,
-                       long callSiteID) {
-        super(scope, Operation.EQQ, CallType.FUNCTIONAL, result, scope.getManager().getRuntime().newSymbol("==="),
-                v1, new Operand[] { v2 }, NullBlock.INSTANCE, 0, isPotentiallyRefined, callSite, callSiteID);
-
-        this.splattedValue = splattedValue;
-        this.pattern = pattern;
-    }
-
     // normal constructor
     public EQQInstr(IRScope scope, Variable result, Operand v1, Operand v2, boolean splattedValue, boolean pattern, boolean isPotentiallyRefined) {
         super(scope, Operation.EQQ, CallType.FUNCTIONAL, result, scope.getManager().getRuntime().newSymbol("==="), v1,
@@ -63,7 +52,7 @@ public boolean isPattern() {
     @Override
     public Instr clone(CloneInfo ii) {
         return new EQQInstr(ii.getScope(), ii.getRenamedVariable(result), getReceiver().cloneForInlining(ii),
-                getArg1().cloneForInlining(ii), isSplattedValue(), isPattern(), isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                getArg1().cloneForInlining(ii), isSplattedValue(), isPattern(), isPotentiallyRefined());
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/InheritanceSearchConstInstr.java b/core/src/main/java/org/jruby/ir/instructions/InheritanceSearchConstInstr.java
index 270afae6711..79cba7d059e 100644
--- a/core/src/main/java/org/jruby/ir/instructions/InheritanceSearchConstInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/InheritanceSearchConstInstr.java
@@ -50,11 +50,6 @@ public RubySymbol getName() {
         return constName;
     }
 
-    @Deprecated(since = "9.1.3.0")
-    public boolean isNoPrivateConsts() {
-        return false;
-    }
-
     @Override
     public Instr clone(CloneInfo ii) {
         return new InheritanceSearchConstInstr(ii.getRenamedVariable(result), getCurrentModule().cloneForInlining(ii), getName());
diff --git a/core/src/main/java/org/jruby/ir/instructions/InstanceSuperInstr.java b/core/src/main/java/org/jruby/ir/instructions/InstanceSuperInstr.java
index 27b685bab14..936ef42790c 100644
--- a/core/src/main/java/org/jruby/ir/instructions/InstanceSuperInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/InstanceSuperInstr.java
@@ -43,7 +43,6 @@
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -54,16 +53,6 @@
 public class InstanceSuperInstr extends CallInstr {
     private final boolean isLiteralBlock;
 
-    // clone constructor
-    protected InstanceSuperInstr(IRScope scope, Variable result, Operand definingModule, RubySymbol name, Operand[] args,
-                                 Operand closure, int flags, boolean isPotentiallyRefined, CallSite callSite,
-                                 long callSiteId) {
-        super(scope, Operation.INSTANCE_SUPER, CallType.SUPER, result, name, definingModule, args, closure, flags,
-                isPotentiallyRefined, callSite, callSiteId);
-
-        isLiteralBlock = closure instanceof WrappedIRClosure;
-    }
-
     // normal constructor
     public InstanceSuperInstr(IRScope scope, Variable result, Operand definingModule, RubySymbol name, Operand[] args,
                               Operand closure, int flags, boolean isPotentiallyRefined) {
@@ -90,7 +79,7 @@ public Instr clone(CloneInfo ii) {
         return new InstanceSuperInstr(ii.getScope(), ii.getRenamedVariable(getResult()),
                 getDefiningModule().cloneForInlining(ii), getName(), cloneCallArgs(ii),
                 getClosureArg().cloneForInlining(ii), getFlags(),
-                isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                isPotentiallyRefined());
     }
 
     public static InstanceSuperInstr decode(IRReaderDecoder d) {
diff --git a/core/src/main/java/org/jruby/ir/instructions/MatchInstr.java b/core/src/main/java/org/jruby/ir/instructions/MatchInstr.java
index e90488ea54d..10e0229e813 100644
--- a/core/src/main/java/org/jruby/ir/instructions/MatchInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/MatchInstr.java
@@ -11,7 +11,6 @@
 import org.jruby.ir.persistence.IRReaderDecoder;
 import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.util.ByteList;
 
@@ -22,12 +21,6 @@
 public class MatchInstr extends CallInstr implements FixedArityInstr {
     private static final ByteList MATCH = new ByteList(new byte[] {'=', '~'});
 
-    // clone constructor
-    protected MatchInstr(IRScope scope, Variable result, Operand receiver, Operand arg, CallSite callSite, long callSiteId) {
-        super(scope, Operation.MATCH, CallType.NORMAL, result, scope.getManager().getRuntime().newSymbol(MATCH),
-                receiver, new Operand[]{arg}, NullBlock.INSTANCE, 0, false, callSite, callSiteId);
-    }
-
     // normal constructor
     public MatchInstr(IRScope scope, Variable result, Operand receiver, Operand arg) {
         super(scope, Operation.MATCH, CallType.NORMAL, result, scope.getManager().getRuntime().newSymbol(MATCH),
@@ -48,7 +41,7 @@ public boolean computeScopeFlags(IRScope scope, EnumSet<IRFlags> flags) {
     @Override
     public Instr clone(CloneInfo ii) {
         return new MatchInstr(ii.getScope(), (Variable) result.cloneForInlining(ii), getReceiver().cloneForInlining(ii),
-                getArg1().cloneForInlining(ii), getCallSite(), getCallSiteId());
+                getArg1().cloneForInlining(ii));
     }
 
     // We do not call super here to bypass having to pass this exaclty like a call.
diff --git a/core/src/main/java/org/jruby/ir/instructions/NoResultCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/NoResultCallInstr.java
index 576e7f93154..90563c8d7c4 100644
--- a/core/src/main/java/org/jruby/ir/instructions/NoResultCallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/NoResultCallInstr.java
@@ -11,7 +11,6 @@
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.persistence.IRReaderDecoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 
 public class NoResultCallInstr extends CallBase {
@@ -25,13 +24,6 @@ public static NoResultCallInstr create(IRScope scope, CallType callType, RubySym
         return new NoResultCallInstr(scope, Operation.NORESULT_CALL, callType, name, receiver, args, closure, flags, isPotentiallyRefined);
     }
 
-    // clone constructor
-    protected NoResultCallInstr(IRScope scope, Operation op, CallType callType, RubySymbol name, Operand receiver,
-                                Operand[] args, Operand closure, int flags, boolean potentiallyRefined,
-                                CallSite callSite, long callSiteId) {
-        super(scope, op, callType, name, receiver, args, closure, flags, potentiallyRefined, callSite, callSiteId);
-    }
-
     // normal constructor
     public NoResultCallInstr(IRScope scope, Operation op, CallType callType, RubySymbol name, Operand receiver,
                              Operand[] args, Operand closure, int flags, boolean isPotentiallyRefined) {
@@ -52,7 +44,7 @@ public Instr clone(CloneInfo ii) {
         return new NoResultCallInstr(ii.getScope(), getOperation(), getCallType(), getName(),
                 getReceiver().cloneForInlining(ii), cloneCallArgs(ii),
                 getClosureArg().cloneForInlining(ii), getFlags(),
-                isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                isPotentiallyRefined());
     }
 
     public static NoResultCallInstr decode(IRReaderDecoder d) {
diff --git a/core/src/main/java/org/jruby/ir/instructions/UnresolvedSuperInstr.java b/core/src/main/java/org/jruby/ir/instructions/UnresolvedSuperInstr.java
index b50ff615993..a9ac6240045 100644
--- a/core/src/main/java/org/jruby/ir/instructions/UnresolvedSuperInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/UnresolvedSuperInstr.java
@@ -16,7 +16,6 @@
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -33,16 +32,6 @@ public class UnresolvedSuperInstr extends CallInstr {
     private static final ByteList DYNAMIC_SUPER_TARGET =
             new ByteList("-dynamic-super_target-".getBytes(), USASCIIEncoding.INSTANCE, false);
 
-    // clone constructor
-    public UnresolvedSuperInstr(IRScope scope, Operation op, Variable result, Operand receiver, Operand[] args,
-                                Operand closure, int flags, boolean isPotentiallyRefined, CallSite callSite,
-                                long callSiteId) {
-        super(scope, op, CallType.SUPER, result, scope.getManager().getRuntime().newSymbol(DYNAMIC_SUPER_TARGET),
-                receiver, args, closure, flags, isPotentiallyRefined, callSite, callSiteId);
-
-        isLiteralBlock = closure instanceof WrappedIRClosure;
-    }
-
     // normal constructor
     public UnresolvedSuperInstr(IRScope scope, Operation op, Variable result, Operand receiver, Operand[] args,
                                 Operand closure, int flags, boolean isPotentiallyRefined) {
@@ -72,7 +61,7 @@ public Instr clone(CloneInfo ii) {
         return new UnresolvedSuperInstr(ii.getScope(), Operation.UNRESOLVED_SUPER, ii.getRenamedVariable(getResult()),
                 getReceiver().cloneForInlining(ii), cloneCallArgs(ii),
                 getClosureArg().cloneForInlining(ii), getFlags(),
-                isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                isPotentiallyRefined());
     }
 
     public static UnresolvedSuperInstr decode(IRReaderDecoder d) {
diff --git a/core/src/main/java/org/jruby/ir/instructions/YieldInstr.java b/core/src/main/java/org/jruby/ir/instructions/YieldInstr.java
index c845cc54f34..33718106aa8 100644
--- a/core/src/main/java/org/jruby/ir/instructions/YieldInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/YieldInstr.java
@@ -1,5 +1,6 @@
 package org.jruby.ir.instructions;
 
+import org.jruby.ir.IRScope;
 import org.jruby.ir.IRVisitor;
 import org.jruby.ir.Interp;
 import org.jruby.ir.Operation;
@@ -22,14 +23,14 @@ public class YieldInstr extends TwoOperandResultBaseInstr implements FixedArityI
     private final int flags;
     private long callSiteId;
 
-    public YieldInstr(Variable result, Operand block, Operand arg, int flags, boolean unwrapArray) {
+    public YieldInstr(IRScope scope, Variable result, Operand block, Operand arg, int flags, boolean unwrapArray) {
         super(Operation.YIELD, result, block, arg == null ? UndefinedValue.UNDEFINED : arg);
 
         assert result != null: "YieldInstr result is null";
 
         this.flags = flags;
         this.unwrapArray = unwrapArray;
-        this.callSiteId = CallBase.callSiteCounter++;
+        this.callSiteId = scope.getManager().nextCallSiteID();
     }
 
     public Operand getBlockArg() {
@@ -49,7 +50,7 @@ public Instr clone(CloneInfo ii) {
         // FIXME: Is it necessary to clone a yield instruction in a method
         // that is being inlined, i.e. in METHOD_INLINE clone mode?
         // Fix BasicBlock.java:clone!!
-        return new YieldInstr(ii.getRenamedVariable(result), getBlockArg().cloneForInlining(ii),
+        return new YieldInstr(ii.getScope(), ii.getRenamedVariable(result), getBlockArg().cloneForInlining(ii),
                 getYieldArg().cloneForInlining(ii), flags, unwrapArray);
     }
 
@@ -72,7 +73,7 @@ public void encode(IRWriterEncoder e) {
     }
 
     public static YieldInstr decode(IRReaderDecoder d) {
-        return new YieldInstr(d.decodeVariable(), d.decodeOperand(), d.decodeOperand(), d.decodeInt(), d.decodeBoolean());
+        return new YieldInstr(d.getCurrentScope(), d.decodeVariable(), d.decodeOperand(), d.decodeOperand(), d.decodeInt(), d.decodeBoolean());
     }
 
     @Interp
diff --git a/core/src/main/java/org/jruby/ir/instructions/ZSuperInstr.java b/core/src/main/java/org/jruby/ir/instructions/ZSuperInstr.java
index 8a8f7ff64fc..bc03798d01d 100644
--- a/core/src/main/java/org/jruby/ir/instructions/ZSuperInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/ZSuperInstr.java
@@ -14,7 +14,6 @@
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -23,11 +22,7 @@
 import java.util.EnumSet;
 
 public class ZSuperInstr extends UnresolvedSuperInstr {
-    public ZSuperInstr(IRScope scope, Variable result, Operand receiver, Operand[] args, Operand closure, int flags,
-                       boolean isPotentiallyRefined, CallSite callSite, long callSiteId) {
-        super(scope, Operation.ZSUPER, result, receiver, args, closure, flags, isPotentiallyRefined, callSite, callSiteId);
-    }
-
+    // normal constructor
     public ZSuperInstr(IRScope scope, Variable result, Operand receiver, Operand[] args, Operand closure, int flags,
                        boolean isPotentiallyRefined) {
         super(scope, Operation.ZSUPER, result, receiver, args, closure, flags, isPotentiallyRefined);
@@ -45,7 +40,7 @@ public boolean computeScopeFlags(IRScope scope, EnumSet<IRFlags> flags) {
     public Instr clone(CloneInfo ii) {
         return new ZSuperInstr(ii.getScope(), ii.getRenamedVariable(getResult()), getReceiver().cloneForInlining(ii),
                 cloneCallArgs(ii), getClosureArg().cloneForInlining(ii), getFlags(),
-                isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                isPotentiallyRefined());
     }
 
     public static ZSuperInstr decode(IRReaderDecoder d) {
diff --git a/core/src/main/java/org/jruby/ir/instructions/specialized/OneArgOperandAttrAssignInstr.java b/core/src/main/java/org/jruby/ir/instructions/specialized/OneArgOperandAttrAssignInstr.java
index 6287205b40c..43fd52ab13c 100644
--- a/core/src/main/java/org/jruby/ir/instructions/specialized/OneArgOperandAttrAssignInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/specialized/OneArgOperandAttrAssignInstr.java
@@ -2,7 +2,6 @@
 
 import org.jruby.RubySymbol;
 import org.jruby.ir.IRScope;
-import org.jruby.ir.Operation;
 import org.jruby.ir.instructions.AttrAssignInstr;
 import org.jruby.ir.instructions.Instr;
 import org.jruby.ir.operands.NullBlock;
@@ -15,9 +14,8 @@
 public class OneArgOperandAttrAssignInstr extends AttrAssignInstr {
     // clone constructor
     protected OneArgOperandAttrAssignInstr(IRScope scope, CallType callType, RubySymbol name, Operand receiver,
-                                           Operand[] args, int flags, boolean potentiallyRefined, CallSite callSite,
-                                           long callSiteId) {
-        super(scope, callType, name, receiver, args, flags, potentiallyRefined, callSite, callSiteId);
+                                           Operand[] args, int flags, boolean potentiallyRefined) {
+        super(scope, callType, name, receiver, args, flags, potentiallyRefined);
     }
 
     // normal constructor
@@ -29,7 +27,7 @@ public OneArgOperandAttrAssignInstr(IRScope scope, Operand obj, RubySymbol attr,
     @Override
     public Instr clone(CloneInfo ii) {
         return new OneArgOperandAttrAssignInstr(ii.getScope(), getCallType(), getName(), getReceiver().cloneForInlining(ii),
-                cloneCallArgs(ii), getFlags(), isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                cloneCallArgs(ii), getFlags(), isPotentiallyRefined());
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/specialized/OneFixnumArgNoBlockCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/specialized/OneFixnumArgNoBlockCallInstr.java
index c2a49dd0b63..f14f7fa74a7 100644
--- a/core/src/main/java/org/jruby/ir/instructions/specialized/OneFixnumArgNoBlockCallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/specialized/OneFixnumArgNoBlockCallInstr.java
@@ -12,7 +12,6 @@
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -21,16 +20,6 @@
 public class OneFixnumArgNoBlockCallInstr extends CallInstr {
     private final long fixNum;
 
-    // clone constructor
-    protected OneFixnumArgNoBlockCallInstr(IRScope scope, CallType callType, Variable result, RubySymbol name,
-                                           Operand receiver, Operand[] args, int flags, boolean potentiallyRefined,
-                                           CallSite callSite, long callSiteId) {
-        super(scope, Operation.CALL_1F, callType, result, name, receiver, args, NullBlock.INSTANCE, flags, potentiallyRefined,
-                callSite, callSiteId);
-
-        fixNum = ((Fixnum) args[0]).value;
-    }
-
     // normal constructor
     public OneFixnumArgNoBlockCallInstr(IRScope scope, CallType callType, Variable result, RubySymbol name,
                                         Operand receiver, Operand[] args, int flags, boolean potentiallyRefined) {
@@ -44,7 +33,7 @@ public OneFixnumArgNoBlockCallInstr(IRScope scope, CallType callType, Variable r
     @Override
     public Instr clone(CloneInfo ii) {
         return new OneFixnumArgNoBlockCallInstr(ii.getScope(), getCallType(), ii.getRenamedVariable(result), getName(),
-                getReceiver().cloneForInlining(ii), cloneCallArgs(ii), getFlags(), isPotentiallyRefined(), callSite, callSiteId);
+                getReceiver().cloneForInlining(ii), cloneCallArgs(ii), getFlags(), isPotentiallyRefined());
     }
 
     public long getFixnumArg() {
diff --git a/core/src/main/java/org/jruby/ir/instructions/specialized/OneFloatArgNoBlockCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/specialized/OneFloatArgNoBlockCallInstr.java
index 840be449624..7b37b1122c8 100644
--- a/core/src/main/java/org/jruby/ir/instructions/specialized/OneFloatArgNoBlockCallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/specialized/OneFloatArgNoBlockCallInstr.java
@@ -12,7 +12,6 @@
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -21,16 +20,6 @@
 public class OneFloatArgNoBlockCallInstr extends CallInstr {
     private final double flote;
 
-    // clone constructor
-    protected OneFloatArgNoBlockCallInstr(IRScope scope, CallType callType, Variable result, RubySymbol name,
-                                          Operand receiver, Operand[] args, int flags, boolean potentiallyRefined,
-                                          CallSite callSite, long callSiteId) {
-        super(scope, Operation.CALL_1D, callType, result, name, receiver, args, NullBlock.INSTANCE, flags, potentiallyRefined,
-                callSite, callSiteId);
-
-        this.flote = ((Float) args[0]).value;
-    }
-
     // normal constructor
     public OneFloatArgNoBlockCallInstr(IRScope scope, CallType callType, Variable result, RubySymbol name,
                                        Operand receiver, Operand[] args, int flags, boolean potentiallyRefined) {
@@ -44,8 +33,8 @@ public OneFloatArgNoBlockCallInstr(IRScope scope, CallType callType, Variable re
     @Override
     public Instr clone(CloneInfo ii) {
         return new OneFloatArgNoBlockCallInstr(ii.getScope(), getCallType(), ii.getRenamedVariable(result), getName(),
-                getReceiver().cloneForInlining(ii), cloneCallArgs(ii), getFlags(), isPotentiallyRefined(),
-                getCallSite(), getCallSiteId());
+                getReceiver().cloneForInlining(ii), cloneCallArgs(ii), getFlags(), isPotentiallyRefined()
+        );
     }
 
     public double getFloatArg() {
diff --git a/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgBlockCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgBlockCallInstr.java
index ac81f0a8e31..9994dbc084e 100644
--- a/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgBlockCallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgBlockCallInstr.java
@@ -11,21 +11,12 @@
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 public class OneOperandArgBlockCallInstr extends CallInstr {
-    // clone constructor
-    public OneOperandArgBlockCallInstr(IRScope scope, CallType callType, Variable result, RubySymbol name,
-                                       Operand receiver, Operand[] args, Operand closure, int flags,
-                                       boolean isPotentiallyRefined, CallSite callSite, long callSiteId) {
-        super(scope, Operation.CALL_1OB, callType, result, name, receiver, args, closure, flags, isPotentiallyRefined,
-                callSite, callSiteId);
-    }
-
     // normal constructor
     public OneOperandArgBlockCallInstr(IRScope scope, CallType callType, Variable result, RubySymbol name,
                                        Operand receiver, Operand[] args, Operand closure, int flags,
@@ -37,8 +28,8 @@ public OneOperandArgBlockCallInstr(IRScope scope, CallType callType, Variable re
     public Instr clone(CloneInfo ii) {
         return new OneOperandArgBlockCallInstr(ii.getScope(), getCallType(), ii.getRenamedVariable(result), getName(),
                 getReceiver().cloneForInlining(ii), cloneCallArgs(ii),
-                getClosureArg().cloneForInlining(ii), getFlags(), isPotentiallyRefined(),
-                getCallSite(), getCallSiteId());
+                getClosureArg().cloneForInlining(ii), getFlags(), isPotentiallyRefined()
+        );
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgNoBlockCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgNoBlockCallInstr.java
index 34cdc61ff2e..4b960bfe514 100644
--- a/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgNoBlockCallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgNoBlockCallInstr.java
@@ -11,7 +11,6 @@
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -24,13 +23,6 @@ public OneOperandArgNoBlockCallInstr(IRScope scope, CallType callType, Variable
         this(scope, Operation.CALL_1O, callType, result, name, receiver, args, flags, isPotentiallyRefined);
     }
 
-    // clone constructor
-    public OneOperandArgNoBlockCallInstr(IRScope scope, Operation op, CallType callType, Variable result,
-                                         RubySymbol name, Operand receiver, Operand[] args, int flags,
-                                         boolean isPotentiallyRefined, CallSite callSite, long callSiteId) {
-        super(scope, op, callType, result, name, receiver, args, NullBlock.INSTANCE, flags, isPotentiallyRefined, callSite, callSiteId);
-    }
-
     // normal constructor
     public OneOperandArgNoBlockCallInstr(IRScope scope, Operation op, CallType callType, Variable result,
                                          RubySymbol name, Operand receiver, Operand[] args, int flags,
@@ -42,7 +34,7 @@ public OneOperandArgNoBlockCallInstr(IRScope scope, Operation op, CallType callT
     public Instr clone(CloneInfo ii) {
         return new OneOperandArgNoBlockCallInstr(ii.getScope(), Operation.CALL_1O, getCallType(),
                 ii.getRenamedVariable(result), getName(), getReceiver().cloneForInlining(ii), cloneCallArgs(ii),
-                getFlags(), isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                getFlags(), isPotentiallyRefined());
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgNoBlockNoResultCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgNoBlockNoResultCallInstr.java
index ac1226f3288..d3a825455f9 100644
--- a/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgNoBlockNoResultCallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/specialized/OneOperandArgNoBlockNoResultCallInstr.java
@@ -5,24 +5,15 @@
 import org.jruby.ir.Operation;
 import org.jruby.ir.instructions.Instr;
 import org.jruby.ir.instructions.NoResultCallInstr;
-import org.jruby.ir.operands.NullBlock;
 import org.jruby.ir.operands.Operand;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 public class OneOperandArgNoBlockNoResultCallInstr extends NoResultCallInstr {
-    // clone constructor
-    protected OneOperandArgNoBlockNoResultCallInstr(IRScope scope, CallType callType, RubySymbol name, Operand receiver,
-                                                    Operand[] args, Operand closure, int flags, boolean potentiallyRefined,
-                                                    CallSite callSite, long callSiteId) {
-        super(scope, Operation.NORESULT_CALL_1O, callType, name, receiver, args, closure, flags, potentiallyRefined, callSite, callSiteId);
-    }
-
     // normal constructor
     public OneOperandArgNoBlockNoResultCallInstr(IRScope scope, CallType callType, RubySymbol name, Operand receiver,
                                                  Operand[] args, Operand closure, int flags,
@@ -34,7 +25,7 @@ public OneOperandArgNoBlockNoResultCallInstr(IRScope scope, CallType callType, R
     public Instr clone(CloneInfo ii) {
         return new OneOperandArgNoBlockNoResultCallInstr(ii.getScope(), getCallType(), getName(), getReceiver().cloneForInlining(ii),
                 cloneCallArgs(ii), getClosureArg().cloneForInlining(ii), getFlags(),
-                isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                isPotentiallyRefined());
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/instructions/specialized/TwoOperandArgNoBlockCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/specialized/TwoOperandArgNoBlockCallInstr.java
index 27505be6cf6..c02a067f27a 100644
--- a/core/src/main/java/org/jruby/ir/instructions/specialized/TwoOperandArgNoBlockCallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/specialized/TwoOperandArgNoBlockCallInstr.java
@@ -11,21 +11,12 @@
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 public class TwoOperandArgNoBlockCallInstr  extends CallInstr  {
-    // clone constructor
-    protected TwoOperandArgNoBlockCallInstr(IRScope scope, CallType callType, Variable result, RubySymbol name,
-                                            Operand receiver, Operand[] args, int flags, boolean isPotentiallyRefined,
-                                            CallSite callSite, long callSiteId) {
-        super(scope, Operation.CALL_2O, callType, result, name, receiver, args, NullBlock.INSTANCE, flags, isPotentiallyRefined,
-                callSite, callSiteId);
-    }
-
     // normal constructor
     public TwoOperandArgNoBlockCallInstr(IRScope scope, CallType callType, Variable result, RubySymbol name,
                                          Operand receiver, Operand[] args, int flags, boolean isPotentiallyRefined) {
@@ -35,8 +26,8 @@ public TwoOperandArgNoBlockCallInstr(IRScope scope, CallType callType, Variable
     @Override
     public Instr clone(CloneInfo ii) {
         return new TwoOperandArgNoBlockCallInstr(ii.getScope(), getCallType(), ii.getRenamedVariable(result), getName(),
-                getReceiver().cloneForInlining(ii), cloneCallArgs(ii), getFlags(), isPotentiallyRefined(),
-                getCallSite(), getCallSiteId());
+                getReceiver().cloneForInlining(ii), cloneCallArgs(ii), getFlags(), isPotentiallyRefined()
+        );
     }
 
     public Operand getArg2() {
diff --git a/core/src/main/java/org/jruby/ir/instructions/specialized/ZeroOperandArgNoBlockCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/specialized/ZeroOperandArgNoBlockCallInstr.java
index 972ade243bf..7f370265bb6 100644
--- a/core/src/main/java/org/jruby/ir/instructions/specialized/ZeroOperandArgNoBlockCallInstr.java
+++ b/core/src/main/java/org/jruby/ir/instructions/specialized/ZeroOperandArgNoBlockCallInstr.java
@@ -11,20 +11,12 @@
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
-import org.jruby.runtime.CallSite;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 public class ZeroOperandArgNoBlockCallInstr extends CallInstr {
-    // clone constructor
-    public ZeroOperandArgNoBlockCallInstr(IRScope scope, Operation op, CallType callType, Variable result,
-                                          RubySymbol name, Operand receiver, Operand[] args, int flags,
-                                          boolean isPotentiallyRefined, CallSite callSite, long callSiteId) {
-        super(scope, op, callType, result, name, receiver, args, NullBlock.INSTANCE, flags, isPotentiallyRefined, callSite, callSiteId);
-    }
-
     // normal constructor
     protected ZeroOperandArgNoBlockCallInstr(IRScope scope, Operation op, CallType callType, Variable result,
                                              RubySymbol name, Operand receiver, Operand[] args, int flags,
@@ -41,7 +33,7 @@ public ZeroOperandArgNoBlockCallInstr(IRScope scope, CallType callType, Variable
     @Override
     public Instr clone(CloneInfo ii) {
         return new ZeroOperandArgNoBlockCallInstr(ii.getScope(), getOperation(), getCallType(), ii.getRenamedVariable(result), getName(),
-                getReceiver().cloneForInlining(ii), cloneCallArgs(ii), getFlags(), isPotentiallyRefined(), getCallSite(), getCallSiteId());
+                getReceiver().cloneForInlining(ii), cloneCallArgs(ii), getFlags(), isPotentiallyRefined());
     }
 
     @Override
diff --git a/core/src/main/java/org/jruby/ir/interpreter/InterpreterContext.java b/core/src/main/java/org/jruby/ir/interpreter/InterpreterContext.java
index 8bf87aacc11..8409ad2b5d9 100644
--- a/core/src/main/java/org/jruby/ir/interpreter/InterpreterContext.java
+++ b/core/src/main/java/org/jruby/ir/interpreter/InterpreterContext.java
@@ -275,9 +275,17 @@ public String toStringInstrs() {
         StringBuilder b = new StringBuilder();
         int length = instructions.length;
 
+        var indent = 0;
         for (int i = 0; i < length; i++) {
             if (i > 0) b.append("\n");
-            b.append(String.format("%6d",i)).append('\t').append(instructions[i]);
+            var instr = instructions[i];
+            if (instr instanceof ExceptionRegionEndMarkerInstr) {
+                indent -= 1;
+            }
+            b.append(String.format("%6d",i+1)).append('\t').append("  ".repeat(indent)).append(instr);
+            if (instr instanceof ExceptionRegionStartMarkerInstr) {
+                indent += 1;
+            }
         }
 
         /* ENEBO: I this this is too much output espectially for ic and not fic
diff --git a/core/src/main/java/org/jruby/ir/operands/UndefinedValue.java b/core/src/main/java/org/jruby/ir/operands/UndefinedValue.java
index d2cf4a34915..8a5bf1e9f15 100644
--- a/core/src/main/java/org/jruby/ir/operands/UndefinedValue.java
+++ b/core/src/main/java/org/jruby/ir/operands/UndefinedValue.java
@@ -58,10 +58,6 @@ private RuntimeException undefinedOperation() {
         return new RuntimeException("IR compiler/interpreter bug: org.jruby.ir.operands.UndefinedValue should not be used as a valid value during execution.");
     }
 
-    @Override
-    @Deprecated(since = "1.7.0")
-    public IRubyObject callSuper(ThreadContext context, IRubyObject[] args, Block block) { throw undefinedOperation(); }
-
     @Override
     public IRubyObject callMethod(ThreadContext context, String name) { throw undefinedOperation(); }
     @Override
@@ -71,11 +67,6 @@ private RuntimeException undefinedOperation() {
     @Override
     public IRubyObject callMethod(ThreadContext context, String name, IRubyObject[] args, Block block) { throw undefinedOperation(); }
 
-    @Deprecated(since = "1.7.0")
-    public IRubyObject callMethod(ThreadContext context, int methodIndex, String name) { throw undefinedOperation(); }
-    @Deprecated(since = "1.7.0")
-    public IRubyObject callMethod(ThreadContext context, int methodIndex, String name, IRubyObject arg) { throw undefinedOperation(); }
-
     @Override
     public IRubyObject checkCallMethod(ThreadContext context, String name) { throw undefinedOperation(); }
 
@@ -253,13 +244,6 @@ private RuntimeException undefinedOperation() {
     @Override
     public boolean hasVariables() { throw undefinedOperation(); }
 
-    @Override
-    public int getVariableCount() { throw undefinedOperation(); }
-
-    @Override
-    @Deprecated(since = "1.7.0")
-    public void syncVariables(List<Variable<Object>> variables) { throw undefinedOperation(); }
-
     @Override
     public void syncVariables(IRubyObject source) { throw undefinedOperation(); }
 
@@ -301,10 +285,6 @@ public void visit(IRVisitor visitor) {
         visitor.UndefinedValue(this);
     }
 
-    @Override
-    @Deprecated(since = "9.2.0.0")
-    public Object dataGetStructChecked() { throw undefinedOperation(); }
-
     @Override
     @Deprecated(since = "9.4.0.0")
     public boolean isTaint() { throw undefinedOperation(); }
@@ -316,12 +296,4 @@ public void visit(IRVisitor visitor) {
     @Override
     @Deprecated(since = "9.4.0.0")
     public IRubyObject infectBy(IRubyObject obj) { throw undefinedOperation(); }
-
-    @Override
-    @Deprecated(since = "9.4.0.0")
-    public boolean isUntrusted() { throw undefinedOperation(); }
-
-    @Override
-    @Deprecated(since = "9.4.0.0")
-    public void setUntrusted(boolean b) { throw undefinedOperation(); }
 }
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRBreakJump.java b/core/src/main/java/org/jruby/ir/runtime/IRBreakJump.java
index 38dec4de608..29fbc62570c 100644
--- a/core/src/main/java/org/jruby/ir/runtime/IRBreakJump.java
+++ b/core/src/main/java/org/jruby/ir/runtime/IRBreakJump.java
@@ -15,11 +15,6 @@ private IRBreakJump(DynamicScope scopeToReturnTo, IRubyObject rv, boolean breakI
         this.breakInEval = breakInEval;
     }
 
-    @Deprecated(since = "9.1.9.0")
-    public static IRBreakJump create(DynamicScope scopeToReturnTo, IRubyObject rv) {
-        return new IRBreakJump(scopeToReturnTo, rv, false);
-    }
-
     public static IRBreakJump create(DynamicScope scopeToReturnTo, IRubyObject rv, boolean breakInEval) {
         return new IRBreakJump(scopeToReturnTo, rv, breakInEval);
     }
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
index 0eb2b5ea7e3..a1c13476c65 100644
--- a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
+++ b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -411,6 +411,7 @@ private static IRubyObject wrapJavaException(final ThreadContext context, final
         return Helpers.wrapJavaException(runtime, throwable); // wrap as normal JI object
     }
 
+    @Deprecated(since = "10.0.3.0")
     @SuppressWarnings("deprecation")
     private static IRubyObject wrapWithNativeException(ThreadContext context, Throwable throwable, Ruby runtime) {
         // wrap Throwable in a NativeException object
@@ -553,7 +554,7 @@ public static Block getBlockFromObject(ThreadContext context, Object value) {
         } else if ((value instanceof IRubyObject) && ((IRubyObject)value).isNil()) {
             block = Block.NULL_BLOCK;
         } else if (value instanceof IRubyObject) {
-            block = ((RubyProc) TypeConverter.convertToType((IRubyObject) value, context.runtime.getProc(), "to_proc", true)).getBlock();
+            block = ((RubyProc) TypeConverter.convertToType((IRubyObject) value, context.runtime.getProc(), "to_proc")).getBlock();
         } else {
             throw new RuntimeException("Unhandled case in CallInstr:prepareBlock.  Got block arg: " + value);
         }
@@ -703,7 +704,7 @@ public static IRubyObject undefined() {
     // call on this path and pass in the live value of ruby2_keywords from the scope.
     @JIT
     public static IRubyObject receiveSpecificArityKeywords(ThreadContext context, IRubyObject last, boolean ruby2Keywords) {
-        int callInfo = resetCallInfo(context);
+        int callInfo = ThreadContext.resetCallInfo(context);
         if (last instanceof RubyHash hash) {
             KwargsAction kwargsAction = kwargsActionJIT(last, ruby2Keywords, callInfo);
             return switch (kwargsAction) {
@@ -1851,8 +1852,6 @@ private static RubyClass checkClassForDef(ThreadContext context, String id, IRub
                     ids(context.runtime, id), "\" for ", obj.getMetaClass().rubyBaseName(context)));
         }
 
-        // if (obj.isFrozen()) throw context.runtime.newFrozenError("object");
-
         return obj.singletonClass(context);
     }
 
@@ -2021,12 +2020,7 @@ public static RubyArray irSplat(ThreadContext context, IRubyObject ary) {
      */
     @JIT @Interp
     public static RubyArray splatArray(ThreadContext context, IRubyObject ary, boolean dupArray) {
-        IRubyObject tmp = TypeConverter.convertToTypeWithCheck(context, ary, arrayClass(context), sites(context).to_a_checked);
-
-        if (tmp.isNil()) return newArray(context, ary);
-        if (dupArray) return ((RubyArray<?>) tmp).aryDup();
-
-        return (RubyArray<?>) tmp;
+        return dupArray ? splatArrayDup(context, ary) : splatArray(context, ary);
     }
 
     /**
@@ -2036,6 +2030,8 @@ public static RubyArray splatArray(ThreadContext context, IRubyObject ary, boole
      */
     @JIT @Interp
     public static RubyArray splatArray(ThreadContext context, IRubyObject ary) {
+        if (ary.isNil()) return context.runtime.getEmptyFrozenArray();
+
         IRubyObject tmp = TypeConverter.convertToTypeWithCheck(context, ary, arrayClass(context), sites(context).to_a_checked);
 
         if (tmp.isNil()) return newArray(context, ary);
@@ -2050,9 +2046,13 @@ public static RubyArray splatArray(ThreadContext context, IRubyObject ary) {
      */
     @JIT @Interp
     public static RubyArray splatArrayDup(ThreadContext context, IRubyObject ary) {
+        if (ary.isNil()) return newEmptyArray(context);
+
         IRubyObject tmp = TypeConverter.convertToTypeWithCheck(context, ary, arrayClass(context), sites(context).to_a_checked);
 
-        return tmp.isNil() ? newArray(context, ary) : ((RubyArray<?>) tmp).aryDup();
+        if (tmp.isNil()) return newArray(context, ary);
+
+        return ((RubyArray<?>) tmp).aryDup();
     }
 
     public static IRubyObject irToAry(ThreadContext context, IRubyObject value) {
diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
index dcd6f0ca7e4..95d5ac04c4a 100644
--- a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
+++ b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -1290,7 +1290,8 @@ private void compileCallCommon(IRBytecodeAdapter m, CallBase call) {
 
         if (args.length == 1 && args[0] instanceof Splat) {
             visit(args[0]);
-            m.adapter.invokevirtual(p(RubyArray.class), "toJavaArray", sig(IRubyObject[].class));
+            m.loadContext();
+            m.adapter.invokevirtual(p(RubyArray.class), "toJavaArray", sig(IRubyObject[].class, ThreadContext.class));
             arity = -1;
         } else if (CallBase.containsArgSplat(args)) {
             throw new NotCompilableException("splat in non-initial argument for normal call is unsupported in JIT");
diff --git a/core/src/main/java/org/jruby/ir/targets/indy/BuildDynamicStringSite.java b/core/src/main/java/org/jruby/ir/targets/indy/BuildDynamicStringSite.java
index b7eba3227b0..c8278fcef43 100644
--- a/core/src/main/java/org/jruby/ir/targets/indy/BuildDynamicStringSite.java
+++ b/core/src/main/java/org/jruby/ir/targets/indy/BuildDynamicStringSite.java
@@ -504,10 +504,12 @@ private static RubyString createBufferFromStaticString(ThreadContext context, in
         int firstStringCR = firstString.cr;
 
         // copy element bytes into a buffer initialSize wide, zeroing out the begin offset
-        byte[] bufferArray = Arrays.copyOfRange(firstStringByteList.unsafeBytes(), firstStringByteList.begin(), initialSize);
+        int firstSize = firstStringByteList.realSize();
+        byte[] bufferArray = new byte[firstSize + initialSize];
+        System.arraycopy(firstStringByteList.unsafeBytes(), firstStringByteList.begin(), bufferArray, 0, firstSize);
 
         // use element realSize for starting buffer realSize
-        ByteList bufferByteList = new ByteList(bufferArray, 0, firstStringByteList.realSize(), firstStringByteList.getEncoding(), false);
+        ByteList bufferByteList = new ByteList(bufferArray, 0, firstSize, firstStringByteList.getEncoding(), false);
 
         buffer = RubyString.newString(context.runtime, bufferByteList, firstStringCR);
         return buffer;
diff --git a/core/src/main/java/org/jruby/ir/targets/indy/HashBootstrap.java b/core/src/main/java/org/jruby/ir/targets/indy/HashBootstrap.java
index 5c755a22c99..62d2325f66e 100644
--- a/core/src/main/java/org/jruby/ir/targets/indy/HashBootstrap.java
+++ b/core/src/main/java/org/jruby/ir/targets/indy/HashBootstrap.java
@@ -3,6 +3,7 @@
 import com.headius.invokebinder.Binder;
 import org.jruby.Ruby;
 import org.jruby.RubyHash;
+import org.jruby.RubyHashLinkedBuckets;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
@@ -86,7 +87,7 @@ public static CallSite kwargsHash(MethodHandles.Lookup lookup, String name, Meth
 
     public static RubyHash hash(ThreadContext context, IRubyObject[] pairs) {
         Ruby runtime = context.runtime;
-        RubyHash hash = new RubyHash(runtime, pairs.length / 2 + 1);
+        RubyHash hash = RubyHashLinkedBuckets.newLBHash(runtime, pairs.length / 2 + 1);
         for (int i = 0; i < pairs.length;) {
             hash.fastASetCheckString(runtime, pairs[i++], pairs[i++]);
         }
diff --git a/core/src/main/java/org/jruby/ir/targets/indy/InvokeSite.java b/core/src/main/java/org/jruby/ir/targets/indy/InvokeSite.java
index 8c7bec3aaf5..5617a949250 100644
--- a/core/src/main/java/org/jruby/ir/targets/indy/InvokeSite.java
+++ b/core/src/main/java/org/jruby/ir/targets/indy/InvokeSite.java
@@ -21,6 +21,7 @@
 import org.jruby.internal.runtime.methods.AttrReaderMethod;
 import org.jruby.internal.runtime.methods.AttrWriterMethod;
 import org.jruby.internal.runtime.methods.CompiledIRMethod;
+import org.jruby.internal.runtime.methods.DefineMethodMethod;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.HandleMethod;
 import org.jruby.internal.runtime.methods.MixedModeIRMethod;
@@ -361,8 +362,8 @@ private MethodHandle createAttrWriterHandle(IRubyObject self, RubyClass cls, Var
         return setValue;
     }
 
-    MethodHandle buildJittedHandle(CacheEntry entry, boolean blockGiven) {
-        MethodHandle mh = null;
+    MethodHandle buildJittedHandle(final CacheEntry entry, final boolean blockGiven) {
+        MethodHandle mh;
         SmartBinder binder;
         CompiledIRMethod compiledIRMethod = null;
         DynamicMethod method = entry.method;
@@ -410,7 +411,12 @@ MethodHandle buildJittedHandle(CacheEntry entry, boolean blockGiven) {
                 }
             }
 
-            if (!blockGiven) {
+            if (method instanceof DefineMethodMethod defineMethod) {
+                // DefineMethodMethod captures the block from define_method's enclosing scope;
+                // always use that captured block for yield, regardless of caller's block
+                if (blockGiven) binder = binder.drop("block");
+                binder = binder.append("block", Block.class, defineMethod.getCapturedBlock());
+            } else if (!blockGiven) {
                 binder = binder.append("block", Block.class, Block.NULL_BLOCK);
             }
 
@@ -424,6 +430,8 @@ MethodHandle buildJittedHandle(CacheEntry entry, boolean blockGiven) {
             if (Options.INVOKEDYNAMIC_LOG_BINDING.load()) {
                 LOG.info(name() + "\tbound directly to jitted method " + Bootstrap.logMethod(method));
             }
+        } else {
+            mh = null;
         }
 
         return mh;
@@ -1326,22 +1334,22 @@ MethodHandle buildAliasHandle(ThreadContext context, CacheEntry entry, IRubyObje
         if (method instanceof PartialDelegatingMethod delegate) {
             DynamicMethod innerMethod = delegate.getRealMethod();
             mh = getHandle(context, self, new CacheEntry(innerMethod, entry.sourceModule, entry.token));
-        } else if (method instanceof AliasMethod alias) {
-            DynamicMethod innerMethod = alias.getRealMethod();
-            String name = alias.getName();
-
-            // Use a second site to mimic invocation from AliasMethod
-            MethodType type = type();
-            if (!functional) type = type.dropParameterTypes(1, 2);
-            InvokeSite innerSite = (InvokeSite) SelfInvokeSite.bootstrap(LOOKUP, "callFunctional:" + name, type, literalClosure ? 1 : 0, flags, file, line);
-            mh = innerSite.getHandle(context, self, new CacheEntry(innerMethod, entry.sourceModule, entry.token));
-            if (!functional) mh = MethodHandles.dropArguments(mh, 1, IRubyObject.class);
-
-            alias.setHandle(mh);
-
-            if (Options.INVOKEDYNAMIC_LOG_BINDING.load()) {
-                LOG.info(name() + "\tbound directly through alias to " + Bootstrap.logMethod(method));
-            }
+//        } else if (method instanceof AliasMethod alias) {
+//            DynamicMethod innerMethod = alias.getRealMethod();
+//            String name = alias.getName();
+//
+//            // Use a second site to mimic invocation from AliasMethod
+//            MethodType type = type();
+//            if (!functional) type = type.dropParameterTypes(1, 2);
+//            InvokeSite innerSite = (InvokeSite) SelfInvokeSite.bootstrap(LOOKUP, "callFunctional:" + name, type, literalClosure ? 1 : 0, flags, file, line);
+//            mh = innerSite.getHandle(context, self, new CacheEntry(innerMethod, entry.sourceModule, entry.token));
+//            if (!functional) mh = MethodHandles.dropArguments(mh, 1, IRubyObject.class);
+//
+//            alias.setHandle(mh);
+//
+//            if (Options.INVOKEDYNAMIC_LOG_BINDING.load()) {
+//                LOG.info(name() + "\tbound directly through alias to " + Bootstrap.logMethod(method));
+//            }
         }
 
         return mh;
diff --git a/core/src/main/java/org/jruby/java/dispatch/CallableSelector.java b/core/src/main/java/org/jruby/java/dispatch/CallableSelector.java
index 8e4e126193b..0a770045c02 100644
--- a/core/src/main/java/org/jruby/java/dispatch/CallableSelector.java
+++ b/core/src/main/java/org/jruby/java/dispatch/CallableSelector.java
@@ -788,85 +788,4 @@ public static interface CallableCache<T extends ParameterTypes> {
 
     }
 
-    /**
-     * Internal helper to allocate a callable map to cache argument method matches.
-     * @param <T> the callable type
-     * @return cache usable with {@link CallableSelector}
-     */
-    @Deprecated(since = "9.0.4.0")
-    public static <T extends ParameterTypes> IntHashMap<T> newCallableCache() {
-        return new IntHashMap<T>(8);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Deprecated(since = "9.0.3.0")
-    public static ParameterTypes matchingCallableArityN(Ruby runtime, Map cache, ParameterTypes[] methods, IRubyObject[] args) {
-        final int signatureCode = argsHashCode(args);
-        ParameterTypes method = (ParameterTypes) cache.get(signatureCode);
-        if (method == null) {
-            method = findMatchingCallableForArgs(runtime, methods, args);
-            if (method != null) cache.put(signatureCode, method);
-        }
-        return method;
-    }
-
-    // NOTE: The five match methods are arity-split to avoid the cost of boxing arguments
-    // when there's already a cached match. Do not condense them into a single
-    // method.
-    @SuppressWarnings("unchecked")
-    @Deprecated(since = "9.0.3.0")
-    public static JavaCallable matchingCallableArityN(Ruby runtime, Map cache, JavaCallable[] methods, IRubyObject[] args) {
-        final int signatureCode = argsHashCode(args);
-        JavaCallable method = (JavaCallable) cache.get(signatureCode);
-        if (method == null) {
-            method = findMatchingCallableForArgs(runtime, methods, args);
-            if (method != null) cache.put(signatureCode, method);
-        }
-        return method;
-    }
-
-    @Deprecated(since = "9.0.3.0")
-    public static JavaCallable matchingCallableArityOne(Ruby runtime, Map cache, JavaCallable[] methods, IRubyObject arg0) {
-        final int signatureCode = argsHashCode(arg0);
-        JavaCallable method = (JavaCallable) cache.get(signatureCode);
-        if (method == null) {
-            method = findMatchingCallableForArgs(runtime, methods, arg0);
-            if (method != null) cache.put(signatureCode, method);
-        }
-        return method;
-    }
-
-    @Deprecated(since = "9.0.3.0")
-    public static JavaCallable matchingCallableArityTwo(Ruby runtime, Map cache, JavaCallable[] methods, IRubyObject arg0, IRubyObject arg1) {
-        final int signatureCode = argsHashCode(arg0, arg1);
-        JavaCallable method = (JavaCallable) cache.get(signatureCode);
-        if (method == null) {
-            method = findMatchingCallableForArgs(runtime, methods, arg0, arg1);
-            if (method != null) cache.put(signatureCode, method);
-        }
-        return method;
-    }
-
-    @Deprecated(since = "9.0.3.0")
-    public static JavaCallable matchingCallableArityThree(Ruby runtime, Map cache, JavaCallable[] methods, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
-        final int signatureCode = argsHashCode(arg0, arg1, arg2);
-        JavaCallable method = (JavaCallable) cache.get(signatureCode);
-        if (method == null) {
-            method = findMatchingCallableForArgs(runtime, methods, arg0, arg1, arg2);
-            if (method != null) cache.put(signatureCode, method);
-        }
-        return method;
-    }
-
-    @Deprecated(since = "9.0.3.0")
-    public static JavaCallable matchingCallableArityFour(Ruby runtime, Map cache, JavaCallable[] methods, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3) {
-        final int signatureCode = argsHashCode(arg0, arg1, arg2, arg3);
-        JavaCallable method = (JavaCallable) cache.get(signatureCode);
-        if (method == null) {
-            method = findMatchingCallableForArgs(runtime, methods, arg0, arg1, arg2, arg3);
-            if (method != null) cache.put(signatureCode, method);
-        }
-        return method;
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/java/invokers/ConstructorInvoker.java b/core/src/main/java/org/jruby/java/invokers/ConstructorInvoker.java
index b7a6874018c..7314898fd1f 100644
--- a/core/src/main/java/org/jruby/java/invokers/ConstructorInvoker.java
+++ b/core/src/main/java/org/jruby/java/invokers/ConstructorInvoker.java
@@ -46,12 +46,6 @@ protected Class[] getMemberParameterTypes(Member member) {
         return ((Constructor) member).getParameterTypes();
     }
 
-    @Override
-    @Deprecated(since = "9.1.6.0")
-    protected boolean isMemberVarArgs(Member member) {
-        return ((Constructor) member).isVarArgs();
-    }
-
     @Override
     public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
         JavaProxy proxy = castJavaProxy(self);
diff --git a/core/src/main/java/org/jruby/java/invokers/MethodInvoker.java b/core/src/main/java/org/jruby/java/invokers/MethodInvoker.java
index 24c5c2f1dcb..0162a207ce3 100644
--- a/core/src/main/java/org/jruby/java/invokers/MethodInvoker.java
+++ b/core/src/main/java/org/jruby/java/invokers/MethodInvoker.java
@@ -39,10 +39,4 @@ protected final Class[] getMemberParameterTypes(Member member) {
         return ((Method) member).getParameterTypes();
     }
 
-    @Override
-    @Deprecated(since = "9.1.6.0")
-    protected final boolean isMemberVarArgs(Member member) {
-        return ((Method) member).isVarArgs();
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java b/core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java
index 8c452ca77ac..a34b555471c 100644
--- a/core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java
+++ b/core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java
@@ -250,9 +250,6 @@ public final void putSignature(int signatureCode, T callable) {
 
     protected abstract Class[] getMemberParameterTypes(Member member);
 
-    @Deprecated(since = "9.0.3.0") // no longer used!
-    protected abstract boolean isMemberVarArgs(Member member);
-
     final int getMemberArity(Member member) {
         return getMemberParameterTypes(member).length;
     }
diff --git a/core/src/main/java/org/jruby/java/proxies/ConcreteJavaProxy.java b/core/src/main/java/org/jruby/java/proxies/ConcreteJavaProxy.java
index d19a9cdf776..0895dd3c326 100644
--- a/core/src/main/java/org/jruby/java/proxies/ConcreteJavaProxy.java
+++ b/core/src/main/java/org/jruby/java/proxies/ConcreteJavaProxy.java
@@ -201,7 +201,7 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
         }
 
     }
-    
+
     /**
      * Manually added as an override of `new` for Concrete Extension
      */
@@ -221,10 +221,12 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
                 IRubyObject[] args, Block block) {
             try {
                 ConcreteJavaProxy cjp = (ConcreteJavaProxy) self;
-                // TODO: Insead of selectively overwriting, silently fail? or only use the other method/this method?
+                // TODO: Instead of selectively overwriting, silently fail? or only use the other method/this method?
                 if (cjp.getObject() == null) {
                     withBlock.newInstance(cjp, args, block, context.runtime, clazz);
                     // note: the generated ctor sets self.object = our discarded return of the new object
+                } else if (oldInit != null) {
+                    return oldInit.call(context, self, clazz, name, args, block);
                 }
             } catch (InstantiationException | InvocationTargetException e) {
                 throw JavaProxyConstructor.throwInstantiationExceptionCause(context.runtime, e);
@@ -243,7 +245,7 @@ public static void tryInstall(Ruby runtime, RubyClass clazz, JavaProxyClass prox
                 // TODO: don't lock in this initialize method
                 var context = runtime.getCurrentContext();
                 if (overwriteInitialize) clazz.addMethod(context,"initialize",
-                        new StaticJCreateMethod(clazz, withBlock, clazz.searchMethod("initialize")));
+                    new StaticJCreateMethod(clazz, withBlock, clazz.getMethodLocation().searchMethod("initialize")));
                 clazz.addMethod(context, "__jallocate!", new StaticJCreateMethod(clazz, withBlock, null));
             } catch (SecurityException | NoSuchMethodException e) {
                 // TODO log?
@@ -321,36 +323,38 @@ public static final class SplitCtorData {
         // public fields used by RealClassGenerator's generated code
         public final Object[] arguments;
         public final int ctorIndex;
-        
+
         // public field used by finishInitialized &  (ruby < ruby < java) generated classes
         public final IRubyObject[] rbarguments;
         public final Block block;
 
         // fields below are only used in ConcreteJavaProxy finishInitialize
         private final AbstractIRMethod method;
+        private final RubyModule clazz;
         private final String name;
         private final SplitSuperState<?> state;
+        private final SplitCtorData nested;
 
         /**
          * Picks and converts arguments for the super call
          * Leaves ctorIndex and arguments ready for the super call
          */
         SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache) {
-            this(runtime, args, cache, null, null, null, Block.NULL_BLOCK);
+            this(runtime, args, cache, null, null, null, null, Block.NULL_BLOCK, null);
         }
 
         SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache,
-                      AbstractIRMethod method, SplitSuperState<?> state, Block block) {
-            this(runtime, args, cache, method, null, state, block);
+                      AbstractIRMethod method, RubyModule clazz, String name, Block block) {
+            this(runtime, args, cache, method, clazz, name, null, block, null);
         }
 
         SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache,
-                      AbstractIRMethod method, String name, Block block) {
-            this(runtime, args, cache, method, name, null, block);
+                      AbstractIRMethod method, RubyModule clazz, String name, SplitSuperState<?> state, Block block) {
+            this(runtime, args, cache, method, clazz, name, state, block, null);
         }
 
         private SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache,
-                              AbstractIRMethod method, String name, SplitSuperState<?> state, Block block) {
+                              AbstractIRMethod method, RubyModule clazz, String name, SplitSuperState<?> state, Block block, SplitCtorData nested) {
             rbarguments = args;
             if (cache == null) { // (ruby < ruby < java) super call from one IRO to another IRO ctor
                 ctorIndex = -1;
@@ -361,9 +365,24 @@ private SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache,
             }
 
             this.method = method;
+            this.clazz = clazz;
+            this.name = name;
+            this.state = state;
+            this.block = block;
+            this.nested = nested;
+        }
+
+        private SplitCtorData(SplitCtorData ctorData, IRubyObject[] args,
+                              AbstractIRMethod method, RubyModule clazz, String name, SplitSuperState<?> state, Block block) {
+            this.arguments = ctorData.arguments;
+            this.ctorIndex = ctorData.ctorIndex;
+            this.rbarguments = args;
+            this.method = method;
+            this.clazz = clazz;
             this.name = name;
             this.state = state;
             this.block = block;
+            this.nested = ctorData;
         }
     }
 
@@ -376,30 +395,57 @@ public SplitCtorData splitInitialized(RubyClass base, IRubyObject[] args, Block
         final Ruby runtime = getRuntime();
         final String name = base.getClassConfig().javaCtorMethodName;
         final CacheEntry methodEntry = base.searchWithCache(name);
+        final RubyClass sourceLocation = findIncludedPrependedModule(methodEntry.sourceModule, base);
+        final RubyModule effectiveSource = sourceLocation != null ? sourceLocation : methodEntry.sourceModule;
         final boolean isLateral = isClassOrIncludedPrependedModule(methodEntry.sourceModule, base);
         DynamicMethod method = methodEntry.method.getRealMethod(); // ensure we don't use a wrapper (jruby/jruby#8148)
         if (method instanceof StaticJCreateMethod) method = ((StaticJCreateMethod) method).oldInit;
 
+        if (isPrependedJavaCtorWrapper(sourceLocation, base) && method instanceof AbstractIRMethod air) {
+            SplitSuperState<?> state = air.startSplitSuperCall(runtime.getCurrentContext(), this, effectiveSource, name, args, block);
+            IRubyObject[] forwardedArgs = state == null ? args : state.callArrayArgs.toJavaArrayMaybeUnsafe();
+            Block forwardedBlock = state == null ? block : state.callBlockArgs;
+            SplitCtorData ctorData = splitInitialized(sourceLocation.getSuperClass(), forwardedArgs, forwardedBlock, jcc);
+            return new SplitCtorData(ctorData, args, air, effectiveSource, name, state, block);
+        }
+
         // jcreate is for nested ruby classes from a java class
         if (isLateral && method instanceof AbstractIRMethod) {
 
             AbstractIRMethod air = (AbstractIRMethod) method; // TODO: getMetaClass() ? or base? (below v)
 
-            SplitSuperState<?> state = air.startSplitSuperCall(runtime.getCurrentContext(), this, getMetaClass(), name, args, block);
+            SplitSuperState<?> state = air.startSplitSuperCall(runtime.getCurrentContext(), this, effectiveSource, name, args, block);
             if (state == null) { // no super in method
-                return new SplitCtorData(runtime, args, jcc, air, name, block);
+                return new SplitCtorData(runtime, args, jcc, air, effectiveSource, name, block);
             }
-            return new SplitCtorData(runtime, state.callArrayArgs.toJavaArrayMaybeUnsafe(), jcc, air, state, block);
+            return new SplitCtorData(runtime, state.callArrayArgs.toJavaArrayMaybeUnsafe(), jcc, air, effectiveSource, name, state, block);
         }
         return new SplitCtorData(runtime, args, jcc);
     }
 
+    private static boolean isPrependedJavaCtorWrapper(final RubyClass methodSource, final RubyClass klass) {
+        if (methodSource == null) return false;
+
+        return methodSource != klass && methodSource.isIncluded() &&
+                methodSource.getSuperClass() != null && methodSource.getSuperClass().getDelegate() == klass;
+    }
+
+    private static RubyClass findIncludedPrependedModule(final RubyModule methodSource, final RubyClass klass) {
+        RubyModule ceiling = klass.getMethodLocation();
+
+        for (RubyClass candidate = klass.getSuperClass(); candidate != null && candidate != ceiling; candidate = candidate.getSuperClass()) {
+            if (candidate.getOrigin() == methodSource.getOrigin()) return candidate;
+        }
+
+        return null;
+    }
+
     private static boolean isClassOrIncludedPrependedModule(final RubyModule methodSource, final RubyClass klass) {
-        if (methodSource == klass) return true;
+        if (methodSource == klass || methodSource.getDelegate() == klass) return true;
 
         RubyClass candidate = klass.getSuperClass();
         while (candidate != null && (candidate.isIncluded() || candidate.isPrepended())) { // up till 'real' superclass
-            if (candidate == klass) return true;
+            if (candidate == methodSource || candidate.getDelegate() == methodSource.getDelegate()) return true;
             candidate = candidate.getSuperClass();
         }
 
@@ -412,11 +458,13 @@ private static boolean isClassOrIncludedPrependedModule(final RubyModule methodS
      * <p>Note: invoked from generated byte-code</p>
      */
     public void finishInitialize(SplitCtorData returned) {
+        if (returned.nested != null) finishInitialize(returned.nested);
+
         if (returned.method != null) {
             if (returned.state != null) {
                 returned.method.finishSplitCall(returned.state);
             } else { // no super, direct call
-                returned.method.call(getRuntime().getCurrentContext(), this, getMetaClass(),
+                returned.method.call(getRuntime().getCurrentContext(), this, returned.clazz,
                         returned.name, returned.rbarguments, returned.block);
             }
         }
diff --git a/core/src/main/java/org/jruby/java/proxies/JavaInterfaceTemplate.java b/core/src/main/java/org/jruby/java/proxies/JavaInterfaceTemplate.java
index ee3391f6979..7a3207a9b45 100644
--- a/core/src/main/java/org/jruby/java/proxies/JavaInterfaceTemplate.java
+++ b/core/src/main/java/org/jruby/java/proxies/JavaInterfaceTemplate.java
@@ -79,43 +79,6 @@ public static IRubyObject java_class(final IRubyObject self) {
         return JavaProxy.getJavaClass((RubyModule) self);
     }
 
-    @Deprecated(since = "9.1.0.0") // not used - should go away in >= 9.2
-    // not intended to be called directly by users (private)
-    // OLD TODO from Ruby code:
-    // This should be implemented in JavaClass.java, where we can
-    // check for reserved Ruby names, conflicting methods, etc.
-    @JRubyMethod(visibility = Visibility.PRIVATE)
-    public static IRubyObject implement(ThreadContext context, IRubyObject self, IRubyObject clazz) {
-        final RubyModule targetModule = Convert.castAsModule(context, self);
-        final IRubyObject javaClass = JavaProxy.getJavaClass((RubyModule) self);
-        Class<?> klass = JavaUtil.unwrapJavaObject(javaClass);
-        final Method[] javaInstanceMethods = klass.getMethods();
-        final DynamicMethod dummyMethodImpl = new DummyMethodImpl(targetModule);
-
-        for (int i = 0; i < javaInstanceMethods.length; i++) {
-            final Method javaMethod = javaInstanceMethods[i];
-            final String name = javaMethod.getName();
-            if ( targetModule.searchMethod(name).isUndefined() ) {
-                targetModule.addMethod(context, name, dummyMethodImpl); // only those not-defined
-            }
-        }
-
-        return context.nil;
-    }
-
-    private static class DummyMethodImpl extends org.jruby.internal.runtime.methods.JavaMethod {
-
-        DummyMethodImpl(RubyModule targetModule) {
-            super(targetModule, Visibility.PUBLIC, ""); // NOTE: maybe dummy method should not be shared
-        }
-
-        @Override
-        public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
-            return context.nil; // dummy bodies for default impls
-        }
-
-    }
-
     @JRubyMethod(frame = true) // framed for invokeSuper
     public static IRubyObject append_features(ThreadContext context, IRubyObject self, IRubyObject clazz, Block block) {
         if (clazz instanceof RubyClass) {
diff --git a/core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java b/core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java
index 4d9ad2b1cf9..819333eab9b 100644
--- a/core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java
+++ b/core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java
@@ -36,6 +36,7 @@
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyHash;
+import org.jruby.RubyHashLinkedBuckets;
 import org.jruby.RubyProc;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
@@ -94,7 +95,7 @@ private RubyHashMap getOrCreateRubyHashMap(Ruby runtime) {
         return wrappedMap;
     }
 
-    private static final class RubyHashMap extends RubyHash {
+    private static final class RubyHashMap extends RubyHashLinkedBuckets {
         static final RubyHashEntry[] EMPTY_TABLE = new RubyHashEntry[0];
         private static final Map.Entry[] NULL_MAP_ENTRY = new Map.Entry[0];
 
@@ -217,7 +218,7 @@ public RubyHashEntry internalGetEntry(IRubyObject key) {
                 return new RubyHashEntry(key.hashCode(), key, JavaUtil.convertJavaToUsableRubyObject(getRuntime(), value), null, null);
             }
 
-            return NO_ENTRY;
+            return NULL_ENTRY;
         }
 
         @Override
@@ -230,7 +231,7 @@ public RubyHashEntry internalDelete(final IRubyObject key) {
                 map.remove(convertedKey);
                 return new RubyHashEntry(key.hashCode(), key, JavaUtil.convertJavaToUsableRubyObject(getRuntime(), value), null, null);
             }
-            return NO_ENTRY;
+            return NULL_ENTRY;
         }
 
         @Override // NOTE: likely won't be called
@@ -243,7 +244,7 @@ public RubyHashEntry internalDeleteEntry(final RubyHashEntry entry) {
                 return entry;
             }
 
-            return NO_ENTRY;
+            return NULL_ENTRY;
         }
 
         @Override
@@ -344,7 +345,7 @@ public IRubyObject shift(ThreadContext context) {
         @Override
         public RubyHash to_hash(ThreadContext context) {
             final Ruby runtime = context.runtime;
-            final RubyHash hash = new RubyHash(runtime);
+            final RubyHash hash = RubyHashLinkedBuckets.newLBHash(runtime);
             @SuppressWarnings("unchecked")
             Set<Map.Entry> entries = mapDelegate().entrySet();
             for ( Map.Entry entry : entries ) {
@@ -378,12 +379,6 @@ protected void replaceWith(ThreadContext context, RubyHash otherHash) {
             replaceExternally(context, otherHash);
         }
 
-        @Deprecated(since = "9.4.6.0")
-        @Override
-        public IRubyObject any_p(ThreadContext context, IRubyObject[] args, Block block) {
-            return super.any_p(context, args, block);
-        }
-
     }
 
     @JRubyMethod(name = "default")
@@ -709,11 +704,6 @@ public RubyHash invert(final ThreadContext context) {
         return getOrCreateRubyHashMap(context.runtime).invert(context);
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public RubyHash merge_bang(final ThreadContext context, final IRubyObject other, final Block block) {
-        return merge_bang(context, new IRubyObject[]{other}, block);
-    }
-
     /** rb_hash_merge_bang
      *
      */
@@ -722,11 +712,6 @@ public RubyHash merge_bang(final ThreadContext context, final IRubyObject[] othe
         return getOrCreateRubyHashMap(context.runtime).merge_bang(context, others, block);
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public RubyHash merge(ThreadContext context, IRubyObject other, Block block) {
-        return merge(context, new IRubyObject[]{other}, block);
-    }
-
     /** rb_hash_merge
      *
      */
@@ -859,14 +844,4 @@ public final RubyHash convertToHash() {
         return getOrCreateRubyHashMap(getRuntime());
     }
 
-    @Deprecated(since = "9.1.6.0")
-    public IRubyObject sort(ThreadContext context, Block block) {
-        return getOrCreateRubyHashMap(context.runtime).sort(context, block);
-    }
-
-    @Deprecated(since = "9.4.6.0")
-    public IRubyObject any_p(ThreadContext context, IRubyObject[] args, Block block) {
-        return getOrCreateRubyHashMap(context.runtime).any_p(context, args, block);
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/java/util/ArrayUtils.java b/core/src/main/java/org/jruby/java/util/ArrayUtils.java
index 4ac4af09363..1cbc3e3fe1b 100644
--- a/core/src/main/java/org/jruby/java/util/ArrayUtils.java
+++ b/core/src/main/java/org/jruby/java/util/ArrayUtils.java
@@ -134,12 +134,6 @@ private static RaiseException mapIllegalArgumentException(ThreadContext context,
                 array.getClass().getComponentType().getName() + ')');
     }
 
-    @Deprecated(since = "9.1.8.0")
-    public static void copyDataToJavaArrayDirect(ThreadContext context,
-        final RubyArray rubyArray, final Object javaArray) {
-        copyDataToJavaArrayDirect(rubyArray, javaArray);
-    }
-
     public static void copyDataToJavaArrayDirect(final RubyArray rubyArray, final Object javaArray) {
         Class targetType = javaArray.getClass().getComponentType();
 
diff --git a/core/src/main/java/org/jruby/javasupport/Java.java b/core/src/main/java/org/jruby/javasupport/Java.java
index ed223431734..82abd54ea29 100644
--- a/core/src/main/java/org/jruby/javasupport/Java.java
+++ b/core/src/main/java/org/jruby/javasupport/Java.java
@@ -139,7 +139,7 @@ public void load(Ruby runtime, boolean wrap) {
         RubyClass objectClass = (RubyClass) getProxyClass(context, java.lang.Object.class);
 
         // load Ruby parts of the 'java' library
-        loadService(context).loadFromClassLoader(Ruby.class.getClassLoader(), "jruby/java.rb", false);
+        loadService(context).loadFromClassLoader("jruby/java.rb", false);
 
         // rewire ArrayJavaProxy superclass to point at Object, so it inherits Object behaviors
         Access.getClass(context, "ArrayJavaProxy").
@@ -218,11 +218,6 @@ public static RubyModule createJavaModule(ThreadContext context) {
     }
 
     public static class OldStyleExtensionInherited {
-        @Deprecated(since = "9.1.0.0")
-        public static IRubyObject inherited(IRubyObject self, IRubyObject subclass) {
-            return inherited(((RubyBasicObject) self).getCurrentContext(), self, subclass);
-        }
-
         @JRubyMethod
         public static IRubyObject inherited(ThreadContext context, IRubyObject self, IRubyObject subclass) {
             return invokeProxyClassInherited(context, self, subclass);
@@ -230,11 +225,6 @@ public static IRubyObject inherited(ThreadContext context, IRubyObject self, IRu
     };
 
     public static class NewStyleExtensionInherited {
-        @Deprecated(since = "9.1.0.0")
-        public static IRubyObject inherited(IRubyObject self, IRubyObject subclass) {
-            return inherited(((RubyBasicObject) self).getCurrentContext(), self, subclass);
-        }
-
         @JRubyMethod
         public static IRubyObject inherited(ThreadContext context, IRubyObject self, IRubyObject subclass) {
             JavaInterfaceTemplate.addRealImplClassNew(castAsClass(context, subclass));
@@ -610,11 +600,6 @@ public static IRubyObject to_s(ThreadContext context, IRubyObject self) {
 
     }
 
-    @Deprecated(since = "9.1.0.0")
-    public static IRubyObject concrete_proxy_inherited(final IRubyObject clazz, final IRubyObject subclazz) {
-        return invokeProxyClassInherited(((RubyBasicObject) clazz).getCurrentContext(), clazz, subclazz);
-    }
-
     private static IRubyObject invokeProxyClassInherited(final ThreadContext context,
         final IRubyObject clazz, final IRubyObject subclazz) {
         final JavaSupport javaSupport = context.runtime.getJavaSupport();
@@ -1218,10 +1203,6 @@ public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModul
         public final IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, Block block) {
             return this.packageOrClass;
         }
-
-        @Deprecated(since = "9.4.3.0") @Override
-        public Arity getArity() { return Arity.noArguments(); }
-
     }
 
     static final class ProcToInterface extends org.jruby.internal.runtime.methods.DynamicMethod {
@@ -1373,37 +1354,6 @@ public static IRubyObject wrap(Ruby runtime, IRubyObject java_object) {
         return getInstance(runtime, ((JavaObject) java_object).getValue());
     }
 
-    /**
-     * High-level object conversion utility function 'java_to_primitive' is the low-level version
-     */
-    @Deprecated(since = "1.4.0")
-    @JRubyMethod(module = true, visibility = PRIVATE)
-    public static IRubyObject java_to_ruby(IRubyObject recv, IRubyObject object, Block unusedBlock) {
-        var context = ((RubyBasicObject) recv).getCurrentContext();
-        try {
-            return JavaUtil.java_to_ruby(context.runtime, object);
-        } catch (RuntimeException e) {
-            context.runtime.getJavaSupport().handleNativeException(e, null);
-            // This point is only reached if there was an exception handler installed.
-            return context.nil;
-        }
-    }
-
-    /**
-     * High-level object conversion utility.
-     */
-    @Deprecated(since = "1.4.0")
-    @JRubyMethod(module = true, visibility = PRIVATE)
-    public static IRubyObject ruby_to_java(final IRubyObject recv, IRubyObject object, Block unusedBlock) {
-        return JavaUtil.ruby_to_java(recv, object, unusedBlock);
-    }
-
-    @Deprecated(since = "1.4.0")
-    @JRubyMethod(module = true, visibility = PRIVATE)
-    public static IRubyObject java_to_primitive(IRubyObject recv, IRubyObject object, Block unusedBlock) {
-        return JavaUtil.java_to_primitive(recv, object, unusedBlock);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public static IRubyObject new_proxy_instance2(IRubyObject recv, final IRubyObject wrapper,
                                                   final IRubyObject interfaces, Block block) {
diff --git a/core/src/main/java/org/jruby/javasupport/JavaClass.java b/core/src/main/java/org/jruby/javasupport/JavaClass.java
index 0b4acec675e..59528d5c203 100644
--- a/core/src/main/java/org/jruby/javasupport/JavaClass.java
+++ b/core/src/main/java/org/jruby/javasupport/JavaClass.java
@@ -99,25 +99,12 @@ public final RubyClass getProxyClass() {
         return (RubyClass) getProxyModule();
     }
 
-    @Deprecated(since = "9.3.0.0")
+    // Deprecated in 9.3.0.0 but still used by methods deprecated in 9.4-
+    @Deprecated(since = "9.4-")
     public static JavaClass get(final Ruby runtime, final Class<?> klass) {
         return runtime.getJavaSupport().getJavaClassFromCache(klass);
     }
 
-    @Deprecated(since = "9.0.0.0") // only been used package internally - a bit poorly named
-    public static RubyArray getRubyArray(Ruby runtime, Class<?>[] classes) {
-        return toRubyArray(runtime, classes);
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static RubyArray toRubyArray(final Ruby runtime, final Class<?>[] classes) {
-        IRubyObject[] javaClasses = new IRubyObject[classes.length];
-        for ( int i = classes.length; --i >= 0; ) {
-            javaClasses[i] = get(runtime, classes[i]);
-        }
-        return RubyArray.newArrayMayCopy(runtime, javaClasses);
-    }
-
     public final Class javaClass() {
         return (Class<?>) getValue();
     }
@@ -167,50 +154,6 @@ public static IRubyObject java_class(final ThreadContext context, final RubyModu
         return java_class;
     }
 
-    /**
-     * Resolves a Java class from a passed type parameter.
-     *
-     * Uisng the rules accepted by `to_java(type)` in Ruby land.
-     * @param context
-     * @param type
-     * @return resolved type or null if resolution failed
-     */
-    @Deprecated(since = "9.3.0.0")
-    public static JavaClass resolveType(final ThreadContext context, final IRubyObject type) {
-        RubyModule proxyClass = Java.resolveType(context, type);
-        return proxyClass == null ? null : get(context.runtime, JavaUtil.getJavaClass(proxyClass, null));
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static JavaClass forNameVerbose(Ruby runtime, String className) {
-        Class<?> klass = null;
-        synchronized (JavaClass.class) {
-            if (klass == null) {
-                klass = runtime.getJavaSupport().loadJavaClassVerbose(className);
-            }
-            return JavaClass.get(runtime, klass);
-        }
-    }
-
-    @Deprecated(since = "9.3.0.0") // no longer used
-    public static JavaClass forNameQuiet(Ruby runtime, String className) {
-        synchronized (JavaClass.class) {
-            Class<?> klass = runtime.getJavaSupport().loadJavaClassQuiet(className);
-            return JavaClass.get(runtime, klass);
-        }
-    }
-
-    @Deprecated(since = "9.4.0.0")
-    @JRubyMethod(name = "for_name", meta = true)
-    public static JavaClass for_name(IRubyObject recv, IRubyObject name) {
-        return forNameVerbose(((RubyBasicObject) recv).getCurrentContext().getRuntime(), name.asJavaString());
-    }
-
-    @Deprecated(since = "10.0.0.0")
-    static JavaClass for_name(IRubyObject recv, String name) {
-        return forNameVerbose(((RubyBasicObject) recv).getCurrentContext().getRuntime(), name);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public RubyString inspect() {
         return inspect(getCurrentContext());
diff --git a/core/src/main/java/org/jruby/javasupport/JavaField.java b/core/src/main/java/org/jruby/javasupport/JavaField.java
deleted file mode 100644
index 414b215c0c8..00000000000
--- a/core/src/main/java/org/jruby/javasupport/JavaField.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: EPL 2.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2002-2004 Anders Bengtsson <ndrsbngtssn@yahoo.se>
- * Copyright (C) 2002-2004 Jan Arne Petersen <jpetersen@uni-bonn.de>
- * Copyright (C) 2004-2005 Thomas E Enebo <enebo@acm.org>
- * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
- * Copyright (C) 2004 David Corbin <dcorbin@users.sourceforge.net>
- * Copyright (C) 2005 Charles O Nutter <headius@headius.com>
- * Copyright (C) 2007 William N Dortch <bill.dortch@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby.javasupport;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-import org.jruby.Ruby;
-import org.jruby.RubyBoolean;
-import org.jruby.RubyString;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-import static org.jruby.api.Convert.asBoolean;
-import static org.jruby.api.Create.newString;
-import static org.jruby.api.Error.typeError;
-
-@Deprecated(since = "9.3.0.0")
-// @JRubyClass(name="Java::JavaField")
-public class JavaField {
-
-    private final Field field;
-
-    public final Field getValue() { return field; }
-
-    public JavaField(Ruby runtime, Field field) {
-        this.field = field;
-    }
-
-    public final boolean equals(Object other) {
-        return other instanceof JavaField && this.field.equals( ((JavaField) other).field );
-    }
-
-    public final int hashCode() {
-        return field.hashCode();
-    }
-
-    @JRubyMethod
-    public RubyString value_type(ThreadContext context) {
-        return newString(context, field.getType().getName());
-    }
-
-    @JRubyMethod(name = "public?")
-    public RubyBoolean public_p(ThreadContext context) {
-        return asBoolean(context, Modifier.isPublic(field.getModifiers()));
-    }
-
-    @JRubyMethod(name = "static?")
-    public RubyBoolean static_p(ThreadContext context) {
-        return asBoolean(context, Modifier.isStatic(field.getModifiers()));
-    }
-
-    @JRubyMethod(name = "enum_constant?")
-    public RubyBoolean enum_constant_p(ThreadContext context) {
-        return asBoolean(context, field.isEnumConstant());
-    }
-
-    @JRubyMethod
-    public RubyString to_generic_string(ThreadContext context) {
-        return newString(context, field.toGenericString());
-    }
-
-    @JRubyMethod(name = "type")
-    @SuppressWarnings("deprecation")
-    public IRubyObject field_type(ThreadContext context) {
-        return JavaClass.get(context.runtime, field.getType());
-    }
-
-    @JRubyMethod
-    public IRubyObject value(ThreadContext context, IRubyObject object) {
-        var javaObject = !Modifier.isStatic(field.getModifiers()) ? unwrapJavaObject(context, object) : null;
-
-        try {
-            return convertToRuby(context.runtime, field.get(javaObject));
-        } catch (IllegalAccessException iae) {
-            throw typeError(context, "illegal access");
-        }
-    }
-
-    @JRubyMethod
-    public IRubyObject set_value(ThreadContext context, IRubyObject object, IRubyObject value) {
-        var javaObject = !Modifier.isStatic(field.getModifiers()) ? unwrapJavaObject(context, object) : null;
-        var javaValue = convertValueToJava(value);
-
-        try {
-            field.set(javaObject, javaValue);
-        } catch (IllegalAccessException iae) {
-            throw typeError(context, "illegal access on setting variable: " + iae.getMessage());
-        } catch (IllegalArgumentException iae) {
-            throw typeError(context, "wrong type for " + field.getType().getName() + ": " +
-                    ( javaValue == null ? null : javaValue.getClass().getName() ) );
-        }
-        return value;
-    }
-
-    @JRubyMethod(name = "final?")
-    public RubyBoolean final_p(ThreadContext context) {
-        return asBoolean(context, Modifier.isFinal(field.getModifiers()));
-    }
-
-    @JRubyMethod
-    public IRubyObject static_value(ThreadContext context) {
-        try {
-            return convertToRuby( context.runtime, field.get(null) );
-        } catch (IllegalAccessException iae) {
-            throw typeError(context, "illegal static value access: " + iae.getMessage());
-        }
-    }
-
-    @JRubyMethod
-    public IRubyObject set_static_value(ThreadContext context, IRubyObject value) {
-        if (!(value instanceof JavaObject)) throw typeError(context, "not a java object:" + value);
-
-        var javaValue = convertValueToJava(value);
-
-        try {
-            field.set(null, javaValue);
-        } catch (IllegalAccessException iae) {
-            throw typeError(context, "illegal access on setting static variable: " + iae.getMessage());
-        } catch (IllegalArgumentException iae) {
-            throw typeError(context, "wrong type for " + field.getType().getName() + ": " +
-                    ( javaValue == null ? null : javaValue.getClass().getName() ) );
-        }
-        return value;
-    }
-
-    @JRubyMethod
-    public RubyString name(ThreadContext context) {
-        return newString(context, field.getName());
-    }
-
-    public AccessibleObject accessibleObject() {
-        return field;
-    }
-
-    private Object unwrapJavaObject(ThreadContext context, final IRubyObject object) throws RaiseException {
-        var javaObject = JavaUtil.unwrapJavaValue(object);
-        if (javaObject == null) throw typeError(context, "not a java object: " + object);
-        return javaObject;
-    }
-
-    private Object convertValueToJava(IRubyObject value) {
-        Object val = value.dataGetStruct();
-        if ( val instanceof JavaObject ) value = (IRubyObject) val;
-        return value.toJava( field.getType() );
-    }
-
-    private static IRubyObject convertToRuby(final Ruby runtime, final Object javaValue) {
-        return JavaUtil.convertJavaToUsableRubyObject(runtime, javaValue);
-    }
-
-}
diff --git a/core/src/main/java/org/jruby/javasupport/JavaMethod.java b/core/src/main/java/org/jruby/javasupport/JavaMethod.java
index b6dd78de04f..1788d99e55c 100644
--- a/core/src/main/java/org/jruby/javasupport/JavaMethod.java
+++ b/core/src/main/java/org/jruby/javasupport/JavaMethod.java
@@ -107,26 +107,6 @@ public static JavaMethod create(Ruby runtime, Method method) {
         return new JavaMethod(runtime, method);
     }
 
-    @Deprecated(since = "9.0.0.0") // no-longer used
-    public static JavaMethod create(Ruby runtime, Class<?> javaClass, String methodName, Class<?>[] argumentTypes) {
-        try {
-            return create(runtime, javaClass.getMethod(methodName, argumentTypes));
-        }
-        catch (NoSuchMethodException e) {
-            throw nameError(runtime.getCurrentContext(), undefinedMethodMessage(runtime, ids(runtime, methodName), ids(runtime, javaClass.getName()), false), methodName);
-        }
-    }
-
-    @Deprecated(since = "9.0.0.0") // no-longer used
-    public static JavaMethod createDeclared(Ruby runtime, Class<?> javaClass, String methodName, Class<?>[] argumentTypes) {
-        try {
-            return create(runtime, javaClass.getDeclaredMethod(methodName, argumentTypes));
-        }
-        catch (NoSuchMethodException e) {
-            throw nameError(runtime.getCurrentContext(), undefinedMethodMessage(runtime, ids(runtime, methodName), ids(runtime, javaClass.getName()), false), methodName);
-        }
-    }
-
     public static JavaMethod getMatchingDeclaredMethod(Ruby runtime, Class<?> javaClass, String methodName, Class<?>[] argumentTypes) {
         Method m = ClassUtils.getMatchingDeclaredMethod(javaClass, methodName, argumentTypes);
 
diff --git a/core/src/main/java/org/jruby/javasupport/JavaPackage.java b/core/src/main/java/org/jruby/javasupport/JavaPackage.java
index d63748b82d8..d9c48b7868c 100644
--- a/core/src/main/java/org/jruby/javasupport/JavaPackage.java
+++ b/core/src/main/java/org/jruby/javasupport/JavaPackage.java
@@ -381,9 +381,6 @@ public DynamicMethod dup() {
                 }
             }
 
-            @Deprecated(since = "9.3.0.0") @Override
-            public Arity getArity() { return Arity.NO_ARGUMENTS; }
-
             public Signature getSignature() {
                 return Signature.NO_ARGUMENTS;
             }
diff --git a/core/src/main/java/org/jruby/javasupport/JavaProxyMethods.java b/core/src/main/java/org/jruby/javasupport/JavaProxyMethods.java
index b6f735e781c..d945eaf4cc2 100644
--- a/core/src/main/java/org/jruby/javasupport/JavaProxyMethods.java
+++ b/core/src/main/java/org/jruby/javasupport/JavaProxyMethods.java
@@ -130,7 +130,7 @@ public static IRubyObject inspect(IRubyObject recv) {
 
     @JRubyMethod
     public static IRubyObject inspect(ThreadContext context, IRubyObject recv) {
-        return recv instanceof RubyBasicObject basic ? basic.hashyInspect() : recv.inspect(context);
+        return recv instanceof RubyBasicObject basic ? basic.hashyInspect(context) : recv.inspect(context);
     }
     
     @JRubyMethod
diff --git a/core/src/main/java/org/jruby/javasupport/JavaSupport.java b/core/src/main/java/org/jruby/javasupport/JavaSupport.java
index e9c31e87784..a01bee1b7c7 100644
--- a/core/src/main/java/org/jruby/javasupport/JavaSupport.java
+++ b/core/src/main/java/org/jruby/javasupport/JavaSupport.java
@@ -51,6 +51,7 @@
 import org.jruby.util.collections.ClassValue;
 import org.jruby.util.collections.ClassValueCalculator;
 
+import java.lang.ref.WeakReference;
 import java.lang.reflect.Member;
 import java.util.Map;
 import java.util.Set;
@@ -63,12 +64,17 @@
 
 public abstract class JavaSupport {
 
-    protected final Ruby runtime;
+    protected Ruby runtime;
 
     @Deprecated(since = "9.4.3.0")
     private final ClassValue<JavaClass> javaClassCache;
     private final ClassValue<RubyModule> proxyClassCache;
 
+    /**
+     * A lock to be used for proxy initialization.
+     */
+    private final ReentrantLock lock = new ReentrantLock();
+
     static final class UnfinishedProxy extends ReentrantLock {
         final RubyModule proxy;
         UnfinishedProxy(RubyModule proxy) {
@@ -112,23 +118,48 @@ public IRubyObject allocateProxy(Object javaObject, RubyClass clazz) {
     public JavaSupport(final Ruby runtime) {
         this.runtime = runtime;
 
-        this.javaClassCache = ClassValue.newInstance(klass -> new JavaClass(runtime, getJavaClassClass(), klass));
+        WeakReference<Ruby> runtimeRef = new WeakReference<>(runtime);
+        WeakReference<JavaSupport> javaSupportRef = new WeakReference<>(this);
 
-        this.proxyClassCache = ClassValue.newInstance(this::computeProxyClass);
+        this.javaClassCache = ClassValue.newInstance(javaClassCalculator(runtimeRef, javaSupportRef));
+
+        this.proxyClassCache = ClassValue.newInstance(proxyCalculator(runtimeRef, lock));
 
         // Proxy creation is synchronized (see above) so a HashMap is fine for recursion detection.
         this.unfinishedProxies = new ConcurrentHashMap<>(8, 0.75f, 1);
     }
 
+    private static ClassValueCalculator<JavaClass> javaClassCalculator(WeakReference<Ruby> runtimeRef, WeakReference<JavaSupport> javaSupportRef) {
+        return klass -> new JavaClass(runtimeRef.get(), javaSupportRef.get().getJavaClassClass(), klass);
+    }
+
+    private static ClassValueCalculator<RubyModule> proxyCalculator(WeakReference<Ruby> runtimeRef, ReentrantLock lock) {
+        return klass -> computeProxyClass(runtimeRef.get(), lock, klass);
+    }
+
+    public void tearDown() {
+        javaClassCache.clear();
+        proxyClassCache.clear();
+        unfinishedProxies.clear();
+        runtime = null;
+    }
+
     /**
      * Because of the complexity of processing a given class and all its dependencies,
      * we opt to synchronize this logic. Creation of all proxies goes through here,
      * allowing us to skip some threading work downstream.
+     *
+     * This method is made static to avoid any circular reference via JavaSupport back to the ClassValue this supports.
      */
-    private synchronized RubyModule computeProxyClass(Class<?> klass) {
-        RubyModule proxyKlass = Java.createProxyClassForClass(runtime, klass);
-        JavaExtensions.define(runtime, klass, proxyKlass); // (lazy) load extensions
-        return proxyKlass;
+    private static RubyModule computeProxyClass(Ruby runtime, ReentrantLock lock, Class<?> klass) {
+        lock.lock();
+        try {
+            RubyModule proxyKlass = Java.createProxyClassForClass(runtime, klass);
+            JavaExtensions.define(runtime, klass, proxyKlass); // (lazy) load extensions
+            return proxyKlass;
+        } finally {
+            lock.unlock();
+        }
     }
 
     @Deprecated(since = "9.4.0.0")
@@ -237,11 +268,6 @@ public JavaClass getObjectJavaClass() {
         return javaClass;
     }
 
-    @Deprecated(since = "9.1.0.0")
-    public void setObjectJavaClass(JavaClass objectJavaClass) {
-        // noop
-    }
-
     @Deprecated(since = "9.4.0.0")
     public RubyClass getJavaArrayClass() {
         RubyClass clazz;
@@ -274,11 +300,6 @@ public RubyModule getJavaInterfaceTemplate() {
         return javaInterfaceTemplate = getModule(runtime.getCurrentContext(), "JavaInterfaceTemplate");
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public RubyModule getPackageModuleTemplate() {
-        return null; // no longer used + has been deprecated since ~ 9.1
-    }
-
     public RubyClass getJavaProxyClass() {
         RubyClass clazz;
         if ((clazz = javaProxyClass) != null) return clazz;
@@ -367,12 +388,6 @@ public ObjectProxyCache<IRubyObject, RubyClass> getObjectProxyCache() {
 
     abstract ClassValue<Map<String, AssignedName>> getInstanceAssignedNames();
 
-    @Deprecated(since = "9.4.3.0")
-    public abstract Map<String, JavaClass> getNameClassMap();
-
-    @Deprecated(since = "9.1.0.0") // internal API - no longer used
-    public abstract Map<Set<?>, JavaProxyClass> getJavaProxyClassCache();
-
     @Deprecated(since = "9.4.0.0") // internal API - no longer used (kept functional due deprecated JavaClass.get API)
     public JavaClass getJavaClassFromCache(Class clazz) {
         return javaClassCache.get(clazz);
diff --git a/core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java b/core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java
index f54dde7a954..a70f48b94ea 100644
--- a/core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java
+++ b/core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java
@@ -61,13 +61,14 @@ public JavaSupportImpl(final Ruby runtime) {
         super(runtime);
     }
 
-    private static Map<String, AssignedName> newAssignedNames(Class<?> klass) {
-        return new HashMap<>(8, 1);
+    public void tearDown() {
+        super.tearDown();
+        staticAssignedNames.clear();
+        instanceAssignedNames.clear();
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public Map<String, JavaClass> getNameClassMap() {
-        return Collections.emptyMap();
+    private static Map<String, AssignedName> newAssignedNames(Class<?> klass) {
+        return new HashMap<>(8, 1);
     }
 
     public ClassValue<Map<String, AssignedName>> getStaticAssignedNames() {
@@ -78,27 +79,6 @@ public ClassValue<Map<String, AssignedName>> getInstanceAssignedNames() {
         return instanceAssignedNames;
     }
 
-    @Deprecated(since = "9.1.0.0")
-    public Map<Set<?>, JavaProxyClass> getJavaProxyClassCache() {
-        Map<Set<?>, JavaProxyClass> javaProxyClassCache = new HashMap<>(javaProxyClasses.size());
-        synchronized (javaProxyClasses) {
-            for ( Map.Entry<ProxyClassKey, JavaProxyClass> entry : javaProxyClasses.entrySet() ) {
-                final ProxyClassKey key = entry.getKey();
-                final Set<Object> cacheKey = new HashSet<>();
-                cacheKey.add(key.superClass);
-                for (int i = 0; i < key.interfaces.length; i++) {
-                    cacheKey.add(key.interfaces[i]);
-                }
-                // add (potentially) overridden names to the key.
-                if ( ! key.names.isEmpty() ) cacheKey.addAll(key.names);
-
-                javaProxyClassCache.put(cacheKey, entry.getValue());
-            }
-        }
-
-        return Collections.unmodifiableMap(javaProxyClassCache);
-    }
-
     // cache of all JavaProxyClass objects created for this runtime
     private final Map<ProxyClassKey, JavaProxyClass> javaProxyClasses = new HashMap<>();
 
@@ -192,45 +172,4 @@ public int hashCode() {
         }
     }
 
-    @Deprecated(since = "9.0.0.0")
-    private volatile Map<Object, Object[]> javaObjectVariables;
-
-    @Deprecated(since = "9.0.0.0")
-    public Object getJavaObjectVariable(Object o, int i) {
-        if (i == -1) return null;
-
-        Map<Object, Object[]> variables = javaObjectVariables;
-        if (variables == null) return null;
-
-        synchronized (this) {
-            Object[] vars = variables.get(o);
-            if (vars == null || vars.length <= i) return null;
-            return vars[i];
-        }
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public void setJavaObjectVariable(Object o, int i, Object v) {
-        if (i == -1) return;
-
-        synchronized (this) {
-            Map<Object, Object[]> variables = javaObjectVariables;
-
-            if (variables == null) {
-                variables = javaObjectVariables = new WeakIdentityHashMap();
-            }
-
-            Object[] vars = variables.get(o);
-            if (vars == null) {
-                vars = new Object[i + 1];
-                variables.put(o, vars);
-            }
-            else if (vars.length <= i) {
-                vars = ArraySupport.newCopy(vars, i + 1);
-                variables.put(o, vars);
-            }
-            vars[i] = v;
-        }
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/javasupport/JavaUtil.java b/core/src/main/java/org/jruby/javasupport/JavaUtil.java
index 20bbd20c245..d0925d04493 100644
--- a/core/src/main/java/org/jruby/javasupport/JavaUtil.java
+++ b/core/src/main/java/org/jruby/javasupport/JavaUtil.java
@@ -319,16 +319,6 @@ public static <T> T unwrapIfJavaObject(final IRubyObject object) {
         return (T) object; // assume correct instance
     }
 
-    @Deprecated(since = "9.0.0.0") // no longer used
-    public static Object unwrapJavaValue(final Ruby runtime, final IRubyObject object, final String errorMessage) {
-        if (object instanceof JavaProxy jp) return jp.getObject();
-        if (object instanceof JavaObject jo) return jo.getValue();
-
-        final Object unwrap = object.dataGetStruct();
-        if (unwrap instanceof IRubyObject ro) return unwrapJavaValue(runtime, ro, errorMessage);
-        throw typeError(runtime.getCurrentContext(), errorMessage);
-    }
-
     public static RubyString inspectObject(ThreadContext context, Object obj) {
         if (!(obj instanceof IRubyObject)) {
             obj = Java.getInstance(context.runtime, obj);
@@ -1098,562 +1088,6 @@ public static Class<?> getPrimitiveClass(final String name) {
         return null;
     }
 
-    @Deprecated(since = "1.4.0")
-    public static Object convertRubyToJava(IRubyObject rubyObject) {
-        return convertRubyToJava(rubyObject, Object.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static Object convertRubyToJava(IRubyObject rubyObject, Class javaClass) {
-        if ( javaClass == void.class || rubyObject == null || rubyObject.isNil() ) {
-            return null;
-        }
-
-        final ThreadContext context = ((RubyBasicObject) rubyObject).getCurrentContext();
-
-        IRubyObject origObject = rubyObject;
-        if (rubyObject.dataGetStruct() instanceof JavaObject) {
-            rubyObject = (IRubyObject) rubyObject.dataGetStruct();
-            if ( rubyObject == null ) {
-                throw new RuntimeException("dataGetStruct returned null for " + origObject.getType().getName(context));
-            }
-        } else if (rubyObject.respondsTo("java_object")) {
-            rubyObject = rubyObject.callMethod(context, "java_object");
-            if( rubyObject == null ) {
-                throw new RuntimeException("java_object returned null for " + origObject.getType().getName(context));
-            }
-        }
-
-        if (rubyObject instanceof JavaObject jo) {
-            Object value = jo.getValue();
-            return convertArgument(context.runtime, value, value.getClass());
-        }
-
-        if (javaClass == Object.class || javaClass == null) {
-            /* The Java method doesn't care what class it is, but we need to
-               know what to convert it to, so we use the object's own class.
-               If that doesn't help, we use String to force a call to the
-               object's "to_s" method. */
-            javaClass = rubyObject.getJavaClass();
-        }
-
-        if (javaClass.isInstance(rubyObject)) {
-            // rubyObject is already of the required jruby class (or subclass)
-            return rubyObject;
-        }
-
-        // the converters handle not only primitive types but also their boxed versions, so we should check
-        // if we have a converter before checking for isPrimitive()
-        RubyConverter converter = RUBY_CONVERTERS.get(javaClass);
-        if (converter != null) {
-            return converter.convert(context, rubyObject);
-        }
-
-        if (javaClass.isPrimitive()) {
-            String s = ((RubyString) TypeConverter.convertToType(rubyObject, stringClass(context), "to_s", true)).getUnicodeValue();
-            if ( s.length() > 0 ) return s.charAt(0);
-            return '\0';
-        }
-        if (javaClass == String.class) {
-            RubyString rubyString = (RubyString) rubyObject.callMethod(context, "to_s");
-            ByteList bytes = rubyString.getByteList();
-            return RubyEncoding.decodeUTF8(bytes.getUnsafeBytes(), bytes.begin(), bytes.length());
-        }
-        if (javaClass == ByteList.class) {
-            return rubyObject.convertToString().getByteList();
-        }
-        if (javaClass == BigInteger.class) {
-         	if (rubyObject instanceof RubyBignum bignum) return bignum.asLong(context);
-            if ( rubyObject instanceof RubyNumeric num) return BigInteger.valueOf(num.asLong(context));
-            if ( rubyObject.respondsTo("to_i") ) {
-         		RubyNumeric rubyNumeric = ((RubyNumeric) rubyObject.callMethod(context, "to_f"));
- 				return BigInteger.valueOf(rubyNumeric.asLong(context));
-         	}
-        }
-        if (javaClass == BigDecimal.class && !(rubyObject instanceof JavaObject)) {
-         	if (rubyObject.respondsTo("to_f")) {
-             	double double_value = ((RubyNumeric)rubyObject.callMethod(context, "to_f")).asDouble(context);
-             	return new BigDecimal(double_value);
-         	}
-        }
-
-        try {
-            if ( isDuckTypeConvertable(rubyObject.getClass(), javaClass) ) {
-                return convertProcToInterface(context, (RubyObject) rubyObject, javaClass);
-            }
-            return ((JavaObject) rubyObject).getValue();
-        }
-        catch (ClassCastException ex) {
-            if (context.runtime.getDebug().isTrue()) ex.printStackTrace();
-            return null;
-        }
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static byte convertRubyToJavaByte(IRubyObject rubyObject) {
-        return (Byte) convertRubyToJava(rubyObject, byte.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static short convertRubyToJavaShort(IRubyObject rubyObject) {
-        return (Short) convertRubyToJava(rubyObject, short.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static char convertRubyToJavaChar(IRubyObject rubyObject) {
-        return (Character) convertRubyToJava(rubyObject, char.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static int convertRubyToJavaInt(IRubyObject rubyObject) {
-        return (Integer) convertRubyToJava(rubyObject, int.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static long convertRubyToJavaLong(IRubyObject rubyObject) {
-        return (Long) convertRubyToJava(rubyObject, long.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static float convertRubyToJavaFloat(IRubyObject rubyObject) {
-        return (Float) convertRubyToJava(rubyObject, float.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static double convertRubyToJavaDouble(IRubyObject rubyObject) {
-        return (Double) convertRubyToJava(rubyObject, double.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static boolean convertRubyToJavaBoolean(IRubyObject rubyObject) {
-        return (Boolean) convertRubyToJava(rubyObject, boolean.class);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static Object convertArgumentToType(ThreadContext context, IRubyObject arg, Class target) {
-        return arg.toJava(target);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static Object coerceNilToType(RubyNil nil, Class target) {
-        return nil.toJava(target);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter RUBY_BOOLEAN_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.isTrue();
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter RUBY_BYTE_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            if (rubyObject.respondsTo("to_i")) {
-                return (byte) ((RubyNumeric) rubyObject.callMethod(context, "to_i")).asLong(context);
-            }
-            return (byte) 0;
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter RUBY_SHORT_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            if (rubyObject.respondsTo("to_i")) {
-                return (short) ((RubyNumeric) rubyObject.callMethod(context, "to_i")).asLong(context);
-            }
-            return (short) 0;
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter RUBY_CHAR_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            if (rubyObject.respondsTo("to_i")) {
-                return (char) ((RubyNumeric) rubyObject.callMethod(context, "to_i")).asLong(context);
-            }
-            return (char) 0;
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter RUBY_INTEGER_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            if (rubyObject.respondsTo("to_i")) {
-                return (int) ((RubyNumeric) rubyObject.callMethod(context, "to_i")).asLong(context);
-            }
-            return (int) 0;
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter RUBY_LONG_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            if (rubyObject.respondsTo("to_i")) {
-                return ((RubyNumeric) rubyObject.callMethod(context, "to_i")).asLong(context);
-            }
-            return 0L;
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter RUBY_FLOAT_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.respondsTo("to_f") ?
-                    (float) ((RubyNumeric) rubyObject.callMethod(context, "to_f")).asDouble(context) :
-                    0.0f;
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter RUBY_DOUBLE_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.respondsTo("to_f") ?
-                    ((RubyNumeric) rubyObject.callMethod(context, "to_f")).asDouble(context) :
-                    0.0d;
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final Map<Class, RubyConverter> RUBY_CONVERTERS = new HashMap<>(16, 1);
-    static {
-        RUBY_CONVERTERS.put(Boolean.class, RUBY_BOOLEAN_CONVERTER);
-        RUBY_CONVERTERS.put(Boolean.TYPE, RUBY_BOOLEAN_CONVERTER);
-        RUBY_CONVERTERS.put(Byte.class, RUBY_BYTE_CONVERTER);
-        RUBY_CONVERTERS.put(Byte.TYPE, RUBY_BYTE_CONVERTER);
-        RUBY_CONVERTERS.put(Short.class, RUBY_SHORT_CONVERTER);
-        RUBY_CONVERTERS.put(Short.TYPE, RUBY_SHORT_CONVERTER);
-        RUBY_CONVERTERS.put(Integer.class, RUBY_INTEGER_CONVERTER);
-        RUBY_CONVERTERS.put(Integer.TYPE, RUBY_INTEGER_CONVERTER);
-        RUBY_CONVERTERS.put(Long.class, RUBY_LONG_CONVERTER);
-        RUBY_CONVERTERS.put(Long.TYPE, RUBY_LONG_CONVERTER);
-        RUBY_CONVERTERS.put(Float.class, RUBY_FLOAT_CONVERTER);
-        RUBY_CONVERTERS.put(Float.TYPE, RUBY_FLOAT_CONVERTER);
-        RUBY_CONVERTERS.put(Double.class, RUBY_DOUBLE_CONVERTER);
-        RUBY_CONVERTERS.put(Double.TYPE, RUBY_DOUBLE_CONVERTER);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static IRubyObject convertJavaToRuby(Ruby runtime, JavaConverter converter, Object object) {
-        if (converter == null || converter == JAVA_DEFAULT_CONVERTER) {
-            return Java.getInstance(runtime, object);
-        }
-        return converter.convert(runtime, object);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public interface RubyConverter {
-        public Object convert(ThreadContext context, IRubyObject rubyObject);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_BOOLEAN_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Boolean.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_BYTE_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Byte.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_SHORT_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Short.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_CHAR_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Character.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_INT_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Integer.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_LONG_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Long.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_FLOAT_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Float.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_DOUBLE_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Double.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_OBJECT_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Object.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_CLASS_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(Class.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_STRING_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(String.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_BIGINTEGER_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(BigInteger.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final RubyConverter ARRAY_BIGDECIMAL_CONVERTER = new RubyConverter() {
-        public Object convert(ThreadContext context, IRubyObject rubyObject) {
-            return rubyObject.toJava(BigDecimal.class);
-        }
-    };
-
-    @Deprecated(since = "1.4.0")
-    public static final Map<Class, RubyConverter> ARRAY_CONVERTERS = new HashMap<>(24, 1);
-    static {
-        ARRAY_CONVERTERS.put(Boolean.class, ARRAY_BOOLEAN_CONVERTER);
-        ARRAY_CONVERTERS.put(Boolean.TYPE, ARRAY_BOOLEAN_CONVERTER);
-        ARRAY_CONVERTERS.put(Byte.class, ARRAY_BYTE_CONVERTER);
-        ARRAY_CONVERTERS.put(Byte.TYPE, ARRAY_BYTE_CONVERTER);
-        ARRAY_CONVERTERS.put(Short.class, ARRAY_SHORT_CONVERTER);
-        ARRAY_CONVERTERS.put(Short.TYPE, ARRAY_SHORT_CONVERTER);
-        ARRAY_CONVERTERS.put(Character.class, ARRAY_CHAR_CONVERTER);
-        ARRAY_CONVERTERS.put(Character.TYPE, ARRAY_CHAR_CONVERTER);
-        ARRAY_CONVERTERS.put(Integer.class, ARRAY_INT_CONVERTER);
-        ARRAY_CONVERTERS.put(Integer.TYPE, ARRAY_INT_CONVERTER);
-        ARRAY_CONVERTERS.put(Long.class, ARRAY_LONG_CONVERTER);
-        ARRAY_CONVERTERS.put(Long.TYPE, ARRAY_LONG_CONVERTER);
-        ARRAY_CONVERTERS.put(Float.class, ARRAY_FLOAT_CONVERTER);
-        ARRAY_CONVERTERS.put(Float.TYPE, ARRAY_FLOAT_CONVERTER);
-        ARRAY_CONVERTERS.put(Double.class, ARRAY_DOUBLE_CONVERTER);
-        ARRAY_CONVERTERS.put(Double.TYPE, ARRAY_DOUBLE_CONVERTER);
-        ARRAY_CONVERTERS.put(String.class, ARRAY_STRING_CONVERTER);
-        ARRAY_CONVERTERS.put(Class.class, ARRAY_CLASS_CONVERTER);
-        ARRAY_CONVERTERS.put(BigInteger.class, ARRAY_BIGINTEGER_CONVERTER);
-        ARRAY_CONVERTERS.put(BigDecimal.class, ARRAY_BIGDECIMAL_CONVERTER);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static RubyConverter getArrayConverter(Class type) {
-        RubyConverter converter = ARRAY_CONVERTERS.get(type);
-        if (converter == null) {
-            return ARRAY_OBJECT_CONVERTER;
-        }
-        return converter;
-    }
-
-    /**
-     * High-level object conversion utility.
-     */
-    @Deprecated(since = "1.4.0")
-    public static IRubyObject ruby_to_java(final IRubyObject recv, IRubyObject object, Block unusedBlock) {
-        var context = ((RubyObject) recv).getCurrentContext();
-        if (object.respondsTo("to_java_object")) {
-            IRubyObject result = (IRubyObject)object.dataGetStruct();
-            if (result == null) {
-                result = object.callMethod(context, "to_java_object");
-            }
-            if (result instanceof JavaObject) {
-                context.runtime.getJavaSupport().getObjectProxyCache().put(((JavaObject) result).getValue(), object);
-            }
-            return result;
-        }
-
-        return primitive_to_java(recv, object, unusedBlock);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static IRubyObject java_to_primitive(IRubyObject recv, IRubyObject object, Block unusedBlock) {
-        return object instanceof JavaObject jo ?
-                JavaUtil.convertJavaToRuby(((RubyBasicObject) recv).getCurrentContext().runtime, jo.getValue()) :
-                object;
-    }
-
-    @Deprecated(since = "1.4.0")
-    @SuppressWarnings("deprecation")
-    public static IRubyObject primitive_to_java(IRubyObject recv, IRubyObject object, Block unusedBlock) {
-        if (object instanceof JavaObject) return object;
-
-        var context = ((RubyObject) recv).getCurrentContext();
-        Object javaObject;
-        switch (object.getMetaClass().getClassIndex()) {
-        case NIL:
-            javaObject = null;
-            break;
-        case INTEGER:
-            if (object instanceof RubyFixnum fix) {
-                javaObject = Long.valueOf(fix.getValue());
-            } else {
-                javaObject = ((RubyBignum) object).asLong(context);
-            }
-            break;
-        case FLOAT:
-            javaObject = Double.valueOf(((RubyFloat) object).asLong(context));
-            break;
-        case STRING:
-            ByteList bytes = ((RubyString) object).getByteList();
-            javaObject = RubyEncoding.decodeUTF8(bytes.getUnsafeBytes(), bytes.begin(), bytes.length());
-            break;
-        case TRUE:
-            javaObject = Boolean.TRUE;
-            break;
-        case FALSE:
-            javaObject = Boolean.FALSE;
-            break;
-        case TIME:
-            javaObject = ((RubyTime) object).getJavaDate();
-            break;
-        default:
-            // it's not one of the types we convert, so just pass it out as-is without wrapping
-            return object;
-        }
-
-        // we've found a Java type to which we've coerced the Ruby value, wrap it
-        return Java.getInstance(((RubyBasicObject) object).getCurrentContext().runtime, javaObject);
-    }
-
-    @Deprecated(since = "1.4.0")
-    public static Object convertArgument(Ruby runtime, Object argument, Class<?> parameterType) {
-        if (argument == null) {
-            if (parameterType.isPrimitive()) throw typeError(runtime.getCurrentContext(), "primitives do not accept null");
-            return null;
-        }
-
-        if (argument instanceof JavaObject) {
-            argument = ((JavaObject) argument).getValue();
-            if (argument == null) return null;
-        }
-        Class<?> type = primitiveToWrapper(parameterType);
-
-        if (argument.getClass() == type) return argument;
-
-        if (type == Void.class) {
-            return null;
-        }
-
-        if (argument instanceof Number) {
-            final Number number = (Number) argument;
-            if (type == Long.class) {
-                return number.longValue();
-            } else if (type == Integer.class) {
-                return number.intValue();
-            } else if (type == Byte.class) {
-                return number.byteValue();
-            } else if (type == Character.class) {
-                return (char)number.intValue();
-            } else if (type == Double.class) {
-                return number.doubleValue();
-            } else if (type == Float.class) {
-                return number.floatValue();
-            } else if (type == Short.class) {
-                return number.shortValue();
-            }
-        }
-        if (isDuckTypeConvertable(argument.getClass(), parameterType)) {
-            RubyObject rubyObject = (RubyObject) argument;
-            if (!rubyObject.respondsTo("java_object")) {
-                return convertProcToInterface(runtime.getCurrentContext(), rubyObject, parameterType);
-            }
-        }
-        return argument;
-    }
-
-    /**
-     * High-level object conversion utility function 'java_to_primitive' is the low-level version
-     */
-    @Deprecated(since = "1.4.0")
-    public static IRubyObject java_to_ruby(Ruby runtime, IRubyObject object) {
-        if (object instanceof JavaObject) {
-            return JavaUtil.convertJavaToUsableRubyObject(runtime, ((JavaObject) object).getValue());
-        }
-        return object;
-    }
-
-    // FIXME: This doesn't actually support anything but String
-    @Deprecated(since = "1.5.0")
-    public static Object coerceStringToType(RubyString string, Class target) {
-        try {
-            ByteList bytes = string.getByteList();
-
-            // 1.9 support for encodings
-            // TODO: Fix charset use for JRUBY-4553
-            return new String(bytes.getUnsafeBytes(), bytes.begin(), bytes.length(), string.getEncoding().toString());
-        } catch (UnsupportedEncodingException uee) {
-            return string.toString();
-        }
-    }
-
-    @Deprecated(since = "1.5.0")
-    public static Object coerceOtherToType(ThreadContext context, IRubyObject arg, Class target) {
-        if (isDuckTypeConvertable(arg.getClass(), target)) {
-            RubyObject rubyObject = (RubyObject) arg;
-            if (!rubyObject.respondsTo("java_object")) {
-                return convertProcToInterface(context, rubyObject, target);
-            }
-        }
-
-        // it's either as converted as we can make it via above logic or it's
-        // not one of the types we convert, so just pass it out as-is without wrapping
-        return arg;
-    }
-
-    @Deprecated(since = "1.5.0")
-    public static Object coerceJavaObjectToType(ThreadContext context, Object javaObject, Class target) {
-        if (javaObject != null && isDuckTypeConvertable(javaObject.getClass(), target)) {
-            RubyObject rubyObject = (RubyObject) javaObject;
-            if (!rubyObject.respondsTo("java_object")) {
-                return convertProcToInterface(context, rubyObject, target);
-            }
-
-            // can't be converted any more, return it
-            return javaObject;
-        } else {
-            return javaObject;
-        }
-    }
-
-    @Deprecated(since = "1.6.0")
-    public static JavaObject unwrapJavaObject(Ruby runtime, IRubyObject convertee, String errorMessage) {
-        IRubyObject obj = convertee;
-        if(!(obj instanceof JavaObject)) {
-            if (obj.dataGetStruct() != null && (obj.dataGetStruct() instanceof JavaObject)) {
-                obj = (JavaObject)obj.dataGetStruct();
-            } else {
-                throw typeError(runtime.getCurrentContext(), errorMessage);
-            }
-        }
-        return (JavaObject)obj;
-    }
-
     @SuppressWarnings("deprecation")
     public static <T> T unwrapJava(final Object wrapped, final T defaultValue) {
         if ( wrapped instanceof JavaProxy proxy) {
@@ -1712,6 +1146,4 @@ public static Class<?> getJavaClass(final RubyModule type, final Supplier<Class<
         return ifNone == null ? null : ifNone.get();
     }
 
-    @Deprecated(since = "9.2.9.0")
-    public static final boolean CAN_SET_ACCESSIBLE = true;
 }
diff --git a/core/src/main/java/org/jruby/javasupport/JavaUtilities.java b/core/src/main/java/org/jruby/javasupport/JavaUtilities.java
index 9384579fc5c..22abb01caae 100644
--- a/core/src/main/java/org/jruby/javasupport/JavaUtilities.java
+++ b/core/src/main/java/org/jruby/javasupport/JavaUtilities.java
@@ -106,12 +106,4 @@ public static boolean validJavaIdentifier(final String javaName) {
         return true;
     }
     
-    @Deprecated(since = "9.2.1.0") // no longer used
-    @JRubyMethod(meta = true,
-            reads = { LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE },
-            writes = { LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE })
-    public static IRubyObject extend_proxy(ThreadContext context, IRubyObject recv, IRubyObject name, Block block) {
-        return Java.get_proxy_class(context, recv, name).module_eval(context, block);
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/javasupport/binding/Initializer.java b/core/src/main/java/org/jruby/javasupport/binding/Initializer.java
index 6ea04481e12..919a7d2bd7c 100644
--- a/core/src/main/java/org/jruby/javasupport/binding/Initializer.java
+++ b/core/src/main/java/org/jruby/javasupport/binding/Initializer.java
@@ -95,7 +95,4 @@ public RubyModule initialize(RubyModule proxy) {
 
     public abstract RubyModule initialize(ThreadContext context, RubyModule proxy);
 
-    @Deprecated(since = "9.2.9.0")
-    public static final ClassValue<Method[]> DECLARED_METHODS = MethodGatherer.DECLARED_METHODS;
-
 }
diff --git a/core/src/main/java/org/jruby/javasupport/ext/JavaLang.java b/core/src/main/java/org/jruby/javasupport/ext/JavaLang.java
index 4faad3c4485..106dfc86087 100644
--- a/core/src/main/java/org/jruby/javasupport/ext/JavaLang.java
+++ b/core/src/main/java/org/jruby/javasupport/ext/JavaLang.java
@@ -534,7 +534,7 @@ public static IRubyObject java_instance_methods(final ThreadContext context, fin
             // quick count for accurate size
             int size = 0;
             for (java.lang.reflect.Method method : publicMethods) if (!Modifier.isStatic(method.getModifiers())) size++;
-            final var methods = allocArray(context, size);
+            final var methods = allocNativeArray(context, size);
 
             for (java.lang.reflect.Method method : publicMethods) {
                 if (!Modifier.isStatic(method.getModifiers())) methods.add(context, method);
@@ -550,7 +550,7 @@ public static IRubyObject declared_instance_methods(final ThreadContext context,
             // quick count for accurate size
             int size = 0;
             for (java.lang.reflect.Method method : declaredMethods) if (!Modifier.isStatic(method.getModifiers())) size++;
-            final var methods = allocArray(context, size);
+            final var methods = allocNativeArray(context, size);
 
             for (java.lang.reflect.Method method : declaredMethods) {
                 if (!Modifier.isStatic(method.getModifiers())) methods.add(context, method);
diff --git a/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyClass.java b/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyClass.java
index c80188c9a88..9a2a3b5cc46 100644
--- a/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyClass.java
+++ b/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyClass.java
@@ -283,22 +283,6 @@ public String toString() {
             return method.toString();
         }
 
-        @Deprecated(since = "9.1.6.0")
-        public Object defaultResult() {
-            final Class returnType = method.getReturnType();
-
-            if (returnType == Void.TYPE) return null;
-            if (returnType == Boolean.TYPE) return Boolean.FALSE;
-            if (returnType == Byte.TYPE) return Byte.valueOf((byte) 0);
-            if (returnType == Short.TYPE) return Short.valueOf((short) 0);
-            if (returnType == Integer.TYPE) return Integer.valueOf(0);
-            if (returnType == Long.TYPE) return Long.valueOf(0L);
-            if (returnType == Float.TYPE) return Float.valueOf(0.0f);
-            if (returnType == Double.TYPE) return Double.valueOf(0.0);
-
-            return null;
-        }
-
         public final boolean matches(final String name, final Class<?>[] parameterTypes) {
             return method.getName().equals(name) && Arrays.equals(this.parameterTypes, parameterTypes);
         }
diff --git a/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyMethod.java b/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyMethod.java
index cc01dfff49b..e9f0d5c8edf 100644
--- a/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyMethod.java
+++ b/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyMethod.java
@@ -61,9 +61,6 @@ Object invoke(Object proxy, Object[] args) throws IllegalArgumentException,
             IllegalAccessException, InvocationTargetException,
             NoSuchMethodException;
 
-    @Deprecated(since = "9.1.0.0") // not-used
-    Object defaultResult();
-
     String getName();
 
     Class<?> getReturnType();
diff --git a/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyReflectionObject.java b/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyReflectionObject.java
index 3d2fc400f7e..36e3bbf0b0c 100644
--- a/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyReflectionObject.java
+++ b/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyReflectionObject.java
@@ -56,11 +56,6 @@ protected static void registerRubyMethods(ThreadContext context, RubyClass klass
         klass.getMetaClass().defineAlias(context, "__j_allocate", "allocate");
     }
 
-    @Deprecated(since = "1.7.20")
-    public IRubyObject op_equal(IRubyObject other) {
-        return op_eqq(getCurrentContext(), other);
-    }
-
     @Override
     @JRubyMethod(name = {"==", "eql?"})
     public RubyBoolean op_eqq(final ThreadContext context, IRubyObject obj) {
@@ -74,11 +69,6 @@ public RubyBoolean op_eqq(final ThreadContext context, IRubyObject obj) {
         return asBoolean(context, this.equals(obj));
     }
 
-    @Deprecated(since = "1.7.20")
-    public IRubyObject same(IRubyObject other) {
-        return op_equal(getCurrentContext(), other);
-    }
-
     @Override
     @JRubyMethod(name = "equal?")
     public RubyBoolean op_equal(final ThreadContext context, IRubyObject obj) {
diff --git a/core/src/main/java/org/jruby/javasupport/util/RuntimeHelpers.java b/core/src/main/java/org/jruby/javasupport/util/RuntimeHelpers.java
deleted file mode 100644
index 5ad36e08d32..00000000000
--- a/core/src/main/java/org/jruby/javasupport/util/RuntimeHelpers.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jruby.javasupport.util;
-
-import org.jruby.Ruby;
-import org.jruby.RubyHash;
-import org.jruby.embed.util.CoreConstructors;
-import org.jruby.runtime.Helpers;
-import org.jruby.runtime.builtin.IRubyObject;
-
-// Deprecated in 2012, but still in use in Nokogiri until Feb 2019
-// See https://github.com/sparklemotion/nokogiri/pull/1874
-// Relates to https://github.com/sparklemotion/nokogiri/pull/2027
-@Deprecated(since = "1.7.4")
-public class RuntimeHelpers extends Helpers {
-    @Deprecated(since = "9.0.0.0")
-    public static RubyHash constructHash(Ruby runtime, IRubyObject key, IRubyObject value) {
-        return CoreConstructors.createHash(runtime, key, value);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static RubyHash constructHash(Ruby runtime, IRubyObject key1, IRubyObject value1,
-                                         IRubyObject key2, IRubyObject value2) {
-        return CoreConstructors.createHash(runtime, key1, value1, key2, value2);
-    }
-}
diff --git a/core/src/main/java/org/jruby/lexer/LexingCommon.java b/core/src/main/java/org/jruby/lexer/LexingCommon.java
index 55e1ff4f3ae..2a6ae172a12 100644
--- a/core/src/main/java/org/jruby/lexer/LexingCommon.java
+++ b/core/src/main/java/org/jruby/lexer/LexingCommon.java
@@ -856,36 +856,6 @@ public void validateFormalIdentifier(ByteList identifier) {
         }
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public void validateFormalIdentifier(String identifier) {
-        char first = identifier.charAt(0);
-
-        if (Character.isUpperCase(first)) {
-            compile_error("formal argument cannot be a constant");
-        }
-
-        switch(first) {
-            case '@':
-                if (identifier.charAt(1) == '@') {
-                    compile_error("formal argument cannot be a class variable");
-                } else {
-                    compile_error("formal argument cannot be an instance variable");
-                }
-                break;
-            case '$':
-                compile_error("formal argument cannot be a global variable");
-                break;
-            default:
-                // This mechanism feels a tad dicey but at this point we are dealing with a valid
-                // method name at least so we should not need to check the entire string...
-                char last = identifier.charAt(identifier.length() - 1);
-
-                if (last == '=' || last == '?' || last == '!') {
-                    compile_error("formal argument must be local variable");
-                }
-        }
-    }
-
     /**
      * Value of last token (if it is a token which has a value).
      *
diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
index 91b1c16684d..1156434871e 100644
--- a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
+++ b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -946,6 +946,19 @@ private void printToken(int token) {
             default: System.err.print("'" + (char)token + "',"); break;
         }
     }
+
+    // DEBUGGING HELP
+    // These are manually tweaked for deep debugging issues where yylex2 is changed to yylex and yylex is changed
+    // to yylex2.  We do not want to progmatically add printToken into our code as this is already a lot of code
+    // for the JVM to reason with.
+    /*
+    private int yylex2() throws IOException {
+        int currentToken = yylex2();
+        
+        printToken(currentToken);
+        
+        return currentToken;
+    }*/
     
     /**
      *  Returns the next token. Also sets yyVal is needed.
@@ -1528,6 +1541,18 @@ private int dollar() {
             yaccValue = new NthRefNode(ruby_sourceline, ref);
             return tNTH_REF;
         case '0':
+            int c2 = nextc();
+            if (isIdentifierChar(c2)) {
+                // $0<ident-chars> e.g. $01234 is invalid
+                StringBuilder name = new StringBuilder("$0");
+                do {
+                    name.append((char) c2);
+                    c2 = nextc();
+                } while (isIdentifierChar(c2));
+                pushback(c2);
+                compile_error("'" + name + "' is not allowed as a global variable name");
+            }
+            pushback(c2);
             return identifierToken(tGVAR, new ByteList(new byte[] {'$', (byte) c}));
         default:
             if (!isIdentifierChar(c)) {
diff --git a/core/src/main/java/org/jruby/management/Config.java b/core/src/main/java/org/jruby/management/Config.java
index fa444303f88..b57b537b1f9 100644
--- a/core/src/main/java/org/jruby/management/Config.java
+++ b/core/src/main/java/org/jruby/management/Config.java
@@ -63,8 +63,9 @@ public void setJitMaxSize(int maxSize) {
         ruby.get().getInstanceConfig().setJitMaxSize(maxSize);
     }
 
+    @Deprecated(since = "10.1.0.0")
     public boolean isRunRubyInProcess() {
-        return ruby.get().getInstanceConfig().isRunRubyInProcess();
+        return false;
     }
 
     public String getCurrentDirectory() {
diff --git a/core/src/main/java/org/jruby/management/ParserStats.java b/core/src/main/java/org/jruby/management/ParserStats.java
index 30d5b718862..7c3da6ddfa6 100644
--- a/core/src/main/java/org/jruby/management/ParserStats.java
+++ b/core/src/main/java/org/jruby/management/ParserStats.java
@@ -4,6 +4,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import org.jruby.Ruby;
 import org.jruby.parser.ParserManager;
+import org.jruby.parser.ParserProvider;
 import org.jruby.util.cli.Options;
 
 public class ParserStats implements ParserStatsMBean {
@@ -87,12 +88,11 @@ public void addPrismTimeCParseSerialize(long time) {
         totalPrismCParseSerializingTime.addAndGet(time);
     }
 
-    public void printParserStatistics() {
+    public void printParserStatistics(Ruby runtime) {
         System.err.println("--------------------------------------------------------------------------------");
         System.err.println("Parser Statistics:");
         System.err.println("  Generic:");
-        System.err.println("    parser type: " + (ParserManager.PARSER_WASM ? "Prism(wasm)" :
-                (Options.PARSER_PRISM.load() ? "Prism(C)" : "Legacy")));
+        System.err.println("    parser type: " + runtime.getParserManager().getParser().getClass());
         System.err.println("    bytes processed: " + getTotalParsedBytes());
         System.err.println("    files parsed: " + getNumberOfLoadParses());
         System.err.println("    evals parsed: " + getNumberOfEvalParses());
diff --git a/core/src/main/java/org/jruby/parser/ReOptions.java b/core/src/main/java/org/jruby/parser/ReOptions.java
index 1f4bfbf8dff..7ada8f3b6c6 100644
--- a/core/src/main/java/org/jruby/parser/ReOptions.java
+++ b/core/src/main/java/org/jruby/parser/ReOptions.java
@@ -45,9 +45,4 @@ public interface ReOptions {
     int RE_LITERAL             = 256; // reusing regexp_options since we used 
                                       // and we won't escape regexp_options.
     int RE_DEFAULT = 512; // Only for RubyRegexp. for kcode default
-
-    @Deprecated(since = "9.0.0.0")
-    int RE_OPTION_LONGEST      = 16;
-    @Deprecated(since = "9.0.0.0")
-    int RE_MAY_IGNORECASE      = 32;
 }
diff --git a/core/src/main/java/org/jruby/parser/RubyParser.java b/core/src/main/java/org/jruby/parser/RubyParser.java
index ec572e6eca6..0de22c6d8c3 100644
--- a/core/src/main/java/org/jruby/parser/RubyParser.java
+++ b/core/src/main/java/org/jruby/parser/RubyParser.java
@@ -247,362 +247,364 @@ public RubyParser(Ruby runtime, LexerSource source, DynamicScope scope, org.jrub
       Order is mandated by <i>jay</i>.
     */
   protected static final int[] yyLhs = {
-//yyLhs 823
-    -1,   228,     0,    35,    36,    36,    36,    37,    37,    30,
-    38,   231,   232,    41,   233,    41,    42,    43,    43,    43,
-    44,   234,    44,    34,   216,   235,    45,    45,    45,    45,
+//yyLhs 827
+    -1,   229,     0,    35,    36,    36,    36,    37,    37,    30,
+    38,   232,   233,    41,   234,    41,    42,    43,    43,    43,
+    44,   235,    44,    34,   217,   236,    45,    45,    45,    45,
     45,    45,    45,    45,    45,    45,    45,    45,    45,    45,
-    45,    45,    45,    45,    85,    85,    85,    85,    85,    85,
-    85,    85,    85,    85,    40,    40,    40,    83,    83,    83,
-    46,    46,    46,    46,    46,   237,    46,   238,    46,    46,
-    27,    28,   239,    29,    52,    52,   240,   242,    53,    50,
-    50,    90,    90,   128,    57,    49,    49,    49,    49,    49,
-    49,    49,    49,    49,    49,    49,    49,   133,   133,   139,
-   139,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-   135,   136,   136,   134,   134,   138,   138,   137,   137,   137,
-   137,   137,   137,   137,   137,   137,   137,   137,   137,   137,
-   137,   137,   137,   137,   137,   137,   130,   130,   130,   130,
-   130,   130,   130,   130,   130,   130,   130,   130,   130,   130,
-   130,   130,   130,   130,   130,   167,   167,    26,    26,    26,
-   169,   169,   169,   169,   169,   132,   132,   107,   244,   107,
-   168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,    47,    47,    47,    47,    47,    47,    47,    47,    47,
+    45,    45,    45,    45,    86,    86,    86,    86,    86,    86,
+    86,    86,    86,    86,    86,    40,    40,    40,    84,    84,
+    84,    46,    46,    46,    46,    46,   238,    46,   239,    46,
+    46,    27,    28,   240,    29,    53,    53,   241,   243,    54,
+    50,    50,    51,    91,    91,   129,    58,    49,    49,    49,
+    49,    49,    49,    49,    49,    49,    49,    49,    49,   134,
+   134,   140,   140,   136,   136,   136,   136,   136,   136,   136,
+   136,   136,   136,   137,   137,   135,   135,   139,   139,   138,
+   138,   138,   138,   138,   138,   138,   138,   138,   138,   138,
+   138,   138,   138,   138,   138,   138,   138,   138,   131,   131,
+   131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+   131,   131,   131,   131,   131,   131,   131,   168,   168,    26,
+    26,    26,   170,   170,   170,   170,   170,   133,   133,   108,
+   245,   108,   169,   169,   169,   169,   169,   169,   169,   169,
+   169,   169,   169,   169,   169,   169,   169,   169,   169,   169,
+   169,   169,   169,   169,   169,   169,   169,   169,   169,   169,
+   169,   169,   181,   181,   181,   181,   181,   181,   181,   181,
+   181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+   181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+   181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+   181,   181,   181,    47,    47,    47,    47,    47,    47,    47,
     47,    47,    47,    47,    47,    47,    47,    47,    47,    47,
     47,    47,    47,    47,    47,    47,    47,    47,    47,    47,
     47,    47,    47,    47,    47,    47,    47,    47,    47,    47,
-    47,    47,    47,    47,    47,    47,    39,    39,    39,   181,
-   181,   181,   181,    56,    56,   193,   213,   219,    54,    78,
-    78,    78,    78,    84,    84,    71,    71,    71,    72,    72,
-    70,    70,    70,    70,    70,    69,    69,    69,    69,    69,
-   246,    77,    80,    80,    79,    79,    67,    67,    67,    67,
-    68,    68,    87,    87,    86,    86,    86,    48,    48,    48,
-    48,    48,    48,    48,    48,    48,    48,    48,   247,    48,
-   248,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+    47,    47,    47,    47,    47,    47,    47,    47,    39,    39,
+    39,   182,   182,   182,   182,    57,    57,   194,   214,   220,
+    55,    79,    79,    79,    79,    85,    85,    72,    72,    72,
+    73,    73,    71,    71,    71,    71,    71,    70,    70,    70,
+    70,    70,    70,    70,   247,    78,    81,    81,    80,    80,
+    68,    68,    68,    68,    69,    69,    88,    88,    87,    87,
+    87,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+    48,    48,   248,    48,   249,    48,    48,    48,    48,    48,
     48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-    48,    48,   250,    48,   251,    48,    48,    48,   252,    48,
-   254,    48,   255,    48,   256,    48,   257,    48,    48,    48,
-    48,    48,    55,   203,   204,   212,    31,    32,   211,    33,
-   214,   215,   209,   205,   206,   217,   218,   202,   201,   207,
-   210,   210,   200,   243,   249,   249,   249,   241,   241,    58,
-    58,    59,    59,   110,   110,   100,   100,   101,   101,   103,
-   103,   103,   103,   103,   102,   102,   189,   189,   259,   258,
-    75,    75,    75,    75,    76,    76,   191,   111,   111,   111,
-   111,   111,   111,   111,   111,   111,   111,   111,   111,   111,
-   111,   111,   112,   112,   113,   113,   120,   120,   119,   119,
-   121,   121,   225,   226,   227,   260,   261,   122,   126,   126,
-   123,   262,   123,   129,    89,    89,    89,    89,    51,    51,
-    51,    51,    51,    51,    51,    51,    51,   127,   127,   263,
-   124,   264,   125,    61,    61,    61,    61,    60,    62,    62,
-   224,   223,   220,   265,   140,   141,   141,   142,   142,   142,
-   143,   143,   143,   143,   143,   143,   144,   145,   145,   146,
-   146,   221,   222,   147,   147,   147,   147,   147,   147,   147,
-   147,   147,   147,   147,   147,   147,   266,   147,   147,   147,
-   149,   149,   149,   149,   149,   149,   150,   150,   151,   151,
-   148,   183,   183,   152,   152,   153,   160,   160,   160,   160,
-   161,   161,   162,   162,   187,   187,   184,   184,   185,   186,
-   186,   154,   154,   154,   154,   154,   154,   154,   154,   154,
-   154,   155,   155,   155,   155,   155,   155,   155,   155,   155,
-   155,   155,   155,   155,   155,   155,   155,   156,   157,   157,
-   158,   159,   159,   159,    63,    63,    64,    64,    64,    65,
-    65,    66,    66,    20,    20,     2,     3,     3,     3,     4,
-     5,     6,   267,   267,    11,    16,    16,    19,    19,    12,
-    13,    13,    14,    15,    17,    17,    18,    18,     7,     7,
-     8,     8,     9,     9,    10,   268,    10,   269,   270,   271,
-   272,    10,   273,   273,   109,   109,    25,    25,    23,   163,
-   163,    24,    21,    21,    22,    22,    22,    22,   192,   192,
-   192,    81,    81,    81,    81,    81,    81,    81,    81,    81,
-    81,    81,    81,    82,    82,    82,    82,    82,    82,    82,
-    82,    82,    82,    82,    82,   108,   108,   274,    88,    88,
-    94,    94,    95,    93,   275,    93,    73,    73,    73,    73,
-    73,    74,    74,    96,    96,    96,    96,    96,    96,    96,
-    96,    96,    96,    96,    96,    96,    96,    96,   190,   174,
-   174,   174,   174,   173,   173,   177,    98,    98,    97,    97,
-   176,   116,   116,   118,   118,   117,   117,   115,   115,   196,
-   196,   188,   175,   175,   114,    92,    91,    91,    99,    99,
-   195,   195,   170,   170,   194,   194,   171,   171,   172,   172,
-     1,   276,     1,   104,   104,   105,   105,   106,   106,   106,
-   106,   106,   106,   164,   164,   164,   165,   165,   166,   166,
-   166,   182,   182,   178,   178,   179,   179,   229,   229,   236,
-   236,   197,   198,   208,   245,   245,   245,   253,   253,   230,
-   230,   131,   199,
+    48,    48,    48,    48,    48,    48,   251,    48,   252,    48,
+    48,    48,   253,    48,   255,    48,   256,    48,   257,    48,
+   258,    48,    48,    48,    48,    48,    56,   204,   205,   213,
+    31,    32,   212,    33,   215,   216,   210,   206,   207,   218,
+   219,   203,   202,   208,   211,   211,   201,   244,   250,   250,
+   250,   242,   242,    59,    59,    60,    60,   111,   111,   101,
+   101,   102,   102,   104,   104,   104,   104,   104,   103,   103,
+   190,   190,   260,   259,    76,    76,    76,    76,    77,    77,
+   192,   112,   112,   112,   112,   112,   112,   112,   112,   112,
+   112,   112,   112,   112,   112,   112,   113,   113,   114,   114,
+   121,   121,   120,   120,   122,   122,   226,   227,   228,   261,
+   262,   123,   127,   127,   124,   263,   124,   130,    90,    90,
+    90,    90,    52,    52,    52,    52,    52,    52,    52,    52,
+    52,   128,   128,   264,   125,   265,   126,    62,    62,    62,
+    62,    61,    63,    63,   225,   224,   221,   266,   141,   142,
+   142,   143,   143,   143,   144,   144,   144,   144,   144,   144,
+   145,   146,   146,   147,   147,   222,   223,   148,   148,   148,
+   148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
+   267,   148,   148,   148,   150,   150,   150,   150,   150,   150,
+   151,   151,   152,   152,   149,   184,   184,   153,   153,   154,
+   161,   161,   161,   161,   162,   162,   163,   163,   188,   188,
+   185,   185,   186,   187,   187,   155,   155,   155,   155,   155,
+   155,   155,   155,   155,   155,   156,   156,   156,   156,   156,
+   156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
+   156,   157,   158,   158,   159,   160,   160,   160,    64,    64,
+    65,    65,    65,    66,    66,    67,    67,    20,    20,     2,
+     3,     3,     3,     4,     5,     6,   268,   268,    11,    16,
+    16,    19,    19,    12,    13,    13,    14,    15,    17,    17,
+    18,    18,     7,     7,     8,     8,     9,     9,    10,   269,
+    10,   270,   271,   272,   273,    10,   274,   274,   110,   110,
+    25,    25,    23,   164,   164,    24,    21,    21,    22,    22,
+    22,    22,   193,   193,   193,    82,    82,    82,    82,    82,
+    82,    82,    82,    82,    82,    82,    82,    83,    83,    83,
+    83,    83,    83,    83,    83,    83,    83,    83,    83,   109,
+   109,   275,    89,    89,    95,    95,    96,    94,   276,    94,
+    74,    74,    74,    74,    74,    75,    75,    97,    97,    97,
+    97,    97,    97,    97,    97,    97,    97,    97,    97,    97,
+    97,    97,   191,   175,   175,   175,   175,   174,   174,   178,
+    99,    99,    98,    98,   177,   117,   117,   119,   119,   118,
+   118,   116,   116,   197,   197,   189,   176,   176,   115,    93,
+    92,    92,   100,   100,   196,   196,   171,   171,   195,   195,
+   172,   172,   173,   173,     1,   277,     1,   105,   105,   106,
+   106,   107,   107,   107,   107,   107,   107,   165,   165,   165,
+   166,   166,   167,   167,   167,   183,   183,   179,   179,   180,
+   180,   230,   230,   237,   237,   198,   199,   209,   246,   246,
+   246,   254,   254,   231,   231,   132,   200,
     }, yyLen = {
-//yyLen 823
+//yyLen 827
      2,     0,     2,     2,     1,     1,     3,     1,     2,     1,
      3,     0,     0,     8,     0,     5,     2,     1,     1,     3,
      1,     0,     3,     0,     2,     0,     4,     3,     3,     3,
      2,     3,     3,     3,     3,     4,     5,     1,     4,     4,
      7,     4,     1,     1,     4,     4,     7,     6,     6,     6,
-     6,     4,     4,     4,     1,     4,     3,     1,     4,     1,
-     1,     3,     3,     3,     2,     0,     7,     0,     7,     1,
-     1,     2,     0,     5,     1,     1,     0,     0,     4,     1,
-     1,     1,     4,     3,     1,     2,     3,     4,     5,     4,
-     5,     6,     2,     2,     2,     2,     2,     1,     3,     1,
-     3,     1,     2,     3,     5,     2,     4,     2,     4,     1,
-     3,     1,     3,     2,     3,     1,     3,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
-     3,     3,     3,     3,     2,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     4,     3,
-     3,     3,     3,     2,     1,     1,     1,     2,     1,     3,
-     1,     1,     1,     1,     1,     1,     1,     1,     0,     4,
+     6,     5,     4,     4,     4,     1,     4,     3,     1,     4,
+     1,     1,     3,     3,     3,     2,     0,     7,     0,     7,
+     1,     1,     2,     0,     5,     1,     1,     0,     0,     4,
+     1,     1,     1,     1,     4,     3,     1,     2,     3,     4,
+     5,     4,     5,     6,     2,     2,     2,     2,     2,     1,
+     3,     1,     3,     1,     2,     3,     5,     2,     4,     2,
+     4,     1,     3,     1,     3,     2,     3,     1,     3,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     4,     3,     3,     3,     3,     2,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     4,     3,     3,     3,     3,     2,     1,     1,     1,     2,
+     1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+     0,     4,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     4,     4,     7,     6,     6,     6,     6,     5,     4,
-     3,     3,     2,     2,     2,     2,     3,     3,     3,     3,
-     3,     3,     4,     2,     2,     3,     3,     3,     3,     1,
-     3,     3,     3,     3,     3,     2,     2,     3,     3,     3,
-     3,     4,     6,     4,     4,     1,     1,     4,     3,     1,
-     1,     1,     1,     3,     3,     1,     1,     1,     1,     1,
-     2,     4,     2,     1,     4,     3,     5,     3,     1,     1,
-     1,     1,     2,     4,     2,     1,     2,     2,     4,     1,
-     0,     2,     2,     1,     2,     1,     1,     1,     3,     3,
-     2,     1,     1,     1,     3,     4,     2,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     0,     4,
-     0,     4,     3,     3,     2,     3,     3,     1,     4,     3,
-     1,     6,     4,     3,     2,     1,     2,     1,     6,     6,
-     4,     4,     0,     6,     0,     5,     5,     6,     0,     6,
-     0,     7,     0,     5,     0,     5,     0,     5,     1,     1,
-     1,     1,     1,     1,     1,     1,     2,     2,     1,     2,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     2,     1,     1,     1,
-     5,     1,     2,     1,     1,     1,     3,     1,     3,     1,
-     3,     5,     1,     3,     2,     1,     1,     1,     0,     2,
-     4,     2,     2,     1,     2,     0,     1,     6,     8,     4,
-     6,     4,     2,     6,     2,     4,     6,     2,     4,     2,
-     4,     1,     1,     1,     3,     4,     1,     4,     1,     3,
-     1,     1,     0,     0,     0,     0,     0,     9,     4,     1,
-     3,     0,     4,     3,     2,     4,     5,     5,     2,     4,
-     4,     3,     3,     3,     2,     1,     4,     3,     3,     0,
-     7,     0,     7,     1,     2,     3,     4,     5,     1,     1,
-     0,     0,     0,     0,     9,     1,     1,     1,     3,     3,
-     1,     2,     3,     1,     1,     1,     1,     3,     1,     3,
-     1,     2,     2,     1,     1,     4,     4,     4,     3,     4,
-     4,     4,     3,     3,     3,     2,     0,     6,     2,     4,
-     1,     1,     2,     2,     4,     1,     2,     3,     1,     3,
-     5,     2,     1,     1,     3,     1,     3,     1,     2,     1,
-     1,     3,     2,     1,     1,     3,     2,     1,     2,     1,
-     1,     1,     3,     3,     2,     2,     1,     1,     1,     2,
+     1,     1,     1,     4,     4,     7,     6,     6,     6,     6,
+     5,     4,     3,     3,     2,     2,     2,     2,     3,     3,
+     3,     3,     3,     3,     4,     2,     2,     3,     3,     3,
+     3,     1,     3,     3,     3,     3,     3,     2,     2,     3,
+     3,     3,     3,     4,     4,     4,     6,     1,     1,     4,
+     3,     1,     1,     1,     1,     3,     3,     1,     1,     1,
+     1,     1,     2,     4,     2,     1,     4,     3,     5,     3,
+     1,     1,     1,     1,     2,     4,     2,     1,     4,     4,
+     2,     2,     4,     1,     0,     2,     2,     1,     2,     1,
+     1,     1,     3,     3,     2,     1,     1,     1,     3,     4,
      2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
-     4,     2,     3,     1,     6,     1,     1,     1,     1,     2,
-     1,     2,     1,     1,     1,     1,     1,     1,     2,     3,
-     3,     3,     1,     2,     4,     0,     3,     1,     2,     4,
-     0,     3,     4,     4,     0,     3,     0,     3,     0,     2,
-     0,     2,     0,     2,     1,     0,     3,     0,     0,     0,
-     0,     7,     1,     1,     1,     1,     1,     1,     2,     1,
-     1,     3,     1,     2,     1,     1,     1,     1,     1,     1,
+     1,     1,     0,     4,     0,     4,     3,     3,     2,     3,
+     3,     1,     4,     3,     1,     6,     4,     3,     2,     1,
+     2,     1,     6,     6,     4,     4,     0,     6,     0,     5,
+     5,     6,     0,     6,     0,     7,     0,     5,     0,     5,
+     0,     5,     1,     1,     1,     1,     1,     1,     1,     1,
+     2,     2,     1,     2,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     2,     1,     1,     1,     5,     1,     2,     1,     1,     1,
+     3,     1,     3,     1,     3,     5,     1,     3,     2,     1,
+     1,     1,     0,     2,     4,     2,     2,     1,     2,     0,
+     1,     6,     8,     4,     6,     4,     2,     6,     2,     4,
+     6,     2,     4,     2,     4,     1,     1,     1,     3,     4,
+     1,     4,     1,     3,     1,     1,     0,     0,     0,     0,
+     0,     9,     4,     1,     3,     0,     4,     3,     2,     4,
+     5,     5,     2,     4,     4,     3,     3,     3,     2,     1,
+     4,     3,     3,     0,     7,     0,     7,     1,     2,     3,
+     4,     5,     1,     1,     0,     0,     0,     0,     9,     1,
+     1,     1,     3,     3,     1,     2,     3,     1,     1,     1,
+     1,     3,     1,     3,     1,     2,     2,     1,     1,     4,
+     4,     4,     3,     4,     4,     4,     3,     3,     3,     2,
+     0,     6,     2,     4,     1,     1,     2,     2,     4,     1,
+     2,     3,     1,     3,     5,     2,     1,     1,     3,     1,
+     3,     1,     2,     1,     1,     3,     2,     1,     1,     3,
+     2,     1,     2,     1,     1,     1,     3,     3,     2,     2,
+     1,     1,     1,     2,     2,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     0,     4,     0,
-     1,     1,     3,     1,     0,     3,     4,     2,     2,     1,
-     1,     2,     0,     6,     8,     4,     6,     4,     6,     2,
-     4,     6,     2,     4,     2,     4,     1,     0,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     3,     1,     3,
-     1,     2,     1,     2,     1,     1,     3,     1,     3,     1,
-     1,     1,     2,     1,     3,     3,     1,     3,     1,     3,
-     1,     1,     2,     1,     1,     1,     2,     1,     2,     0,
-     1,     0,     4,     1,     2,     1,     3,     3,     2,     1,
-     4,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     0,     1,     0,
-     1,     2,     2,     2,     0,     1,     1,     1,     1,     1,
-     2,     0,     0,
+     1,     1,     2,     2,     4,     2,     3,     1,     6,     1,
+     1,     1,     1,     2,     1,     2,     1,     1,     1,     1,
+     1,     1,     2,     3,     3,     3,     1,     2,     4,     0,
+     3,     1,     2,     4,     0,     3,     4,     4,     0,     3,
+     0,     3,     0,     2,     0,     2,     0,     2,     1,     0,
+     3,     0,     0,     0,     0,     7,     1,     1,     1,     1,
+     1,     1,     2,     1,     1,     3,     1,     2,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     0,     4,     0,     1,     1,     3,     1,     0,     3,
+     4,     2,     2,     1,     1,     2,     0,     6,     8,     4,
+     6,     4,     6,     2,     4,     6,     2,     4,     2,     4,
+     1,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     3,     1,     3,     1,     2,     1,     2,     1,     1,
+     3,     1,     3,     1,     1,     1,     2,     1,     3,     3,
+     1,     3,     1,     3,     1,     1,     2,     1,     1,     1,
+     2,     1,     2,     0,     1,     0,     4,     1,     2,     1,
+     3,     3,     2,     1,     4,     2,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     0,     1,     0,     1,     2,     2,     2,     0,     1,
+     1,     1,     1,     1,     2,     0,     0,
     }, yyDefRed = {
-//yyDefRed 1399
-     1,     0,     0,    43,   400,   401,   402,     0,   393,   394,
-   395,   398,    23,    23,    23,     0,     0,   390,   391,   412,
-   413,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   821,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   674,   675,   676,   677,   626,   705,   706,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   475,     0,
-   648,   650,   652,     0,     0,     0,     0,     0,     0,   338,
-     0,   627,   339,   340,   341,   343,   342,   344,   337,   623,
-   672,   666,   667,   624,     0,     0,    76,    76,     0,     2,
-     0,     5,     0,     0,     0,     0,     0,    60,     0,     0,
-     0,     0,   345,     0,    37,     0,    80,     0,   367,     0,
-     4,     0,     0,    97,     0,   111,    84,     0,   348,     0,
-     0,     0,     0,     0,     0,    23,     0,   210,   221,   211,
-   234,   207,   227,   217,   216,   237,   238,   232,   215,   214,
-   209,   235,   239,   240,   219,   208,   222,   226,   228,   220,
-   213,   229,   236,   231,   230,   223,   233,   218,   206,   225,
-   224,   205,   212,   203,   204,   200,   201,   202,   160,   162,
-   161,   195,   196,   191,   173,   174,   175,   182,   179,   181,
-   176,   177,   197,   198,   183,   184,   188,   192,   178,   180,
-   170,   171,   172,   185,   186,   187,   189,   190,   193,   194,
-   199,   166,     0,   167,   163,   165,   164,   396,   397,   399,
+//yyDefRed 1413
+     1,     0,     0,    43,   404,   405,   406,     0,   397,   398,
+   399,   402,    23,    23,    23,     0,     0,   394,   395,   416,
+   417,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   825,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   678,   679,   680,   681,   630,   709,   710,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,   479,     0,
+   652,   654,   656,     0,     0,     0,     0,     0,     0,   342,
+     0,   631,   343,   344,   345,   347,   346,   348,   341,   627,
+   676,   670,   671,   628,     0,     0,    77,    77,     0,     2,
+     0,     5,     0,     0,     0,     0,     0,    61,     0,     0,
+     0,     0,   349,     0,    37,     0,    81,     0,   371,     0,
+     4,     0,     0,    99,     0,   113,    86,     0,   352,     0,
+     0,     0,     0,     0,     0,    23,     0,   212,   223,   213,
+   236,   209,   229,   219,   218,   239,   240,   234,   217,   216,
+   211,   237,   241,   242,   221,   210,   224,   228,   230,   222,
+   215,   231,   238,   233,   232,   225,   235,   220,   208,   227,
+   226,   207,   214,   205,   206,   202,   203,   204,   162,   164,
+   163,   197,   198,   193,   175,   176,   177,   184,   181,   183,
+   178,   179,   199,   200,   185,   186,   190,   194,   180,   182,
+   172,   173,   174,   187,   188,   189,   191,   192,   195,   196,
+   201,   168,     0,   169,   165,   167,   166,   400,   401,   403,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   648,
-     0,     0,     0,     0,   315,     0,     0,     0,   327,    95,
-   319,     0,     0,   785,     0,     0,    96,     0,   494,    92,
-     0,     0,   810,     0,     0,    25,     0,     9,     0,     8,
-   295,    24,     0,   388,   389,     0,   263,     0,     0,   357,
-     0,     0,     0,     0,     0,    21,     0,     0,     0,    18,
-     0,    17,     0,     0,   350,     0,     0,     0,   299,     0,
-     0,     0,   783,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   652,
+     0,     0,     0,     0,   317,     0,     0,     0,   331,    97,
+   323,     0,     0,   789,     0,     0,    98,     0,   498,    94,
+     0,     0,   814,     0,     0,    25,     0,     9,     0,     8,
+   297,    24,     0,   392,   393,     0,     0,     0,   265,     0,
+     0,   361,     0,     0,     0,     0,     0,    21,     0,     0,
+     0,    18,     0,    17,     0,     0,   354,     0,     0,     0,
+   301,     0,     0,     0,   787,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   392,     0,     0,     0,   472,   679,   678,   680,     0,
-   668,   669,   670,     0,     0,     0,   632,     0,     0,     0,
-     0,   275,    64,   276,   628,     0,   384,     0,     0,   711,
-     0,   386,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   396,     0,     0,     0,   476,   683,   682,
+   684,     0,   672,   673,   674,     0,     0,     0,   636,     0,
+     0,     0,     0,   277,    65,   278,   632,     0,   388,     0,
+     0,   715,     0,   390,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   423,   424,   817,   818,     3,     0,   819,     0,
-     0,     0,     0,   821,     0,     0,    67,     0,     0,     0,
-     0,     0,   291,   292,     0,     0,     0,     0,     0,     0,
-     0,     0,    65,     0,   289,   290,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   404,   484,   501,   403,   499,
-   366,   501,   804,     0,     0,   803,     0,     0,   488,     0,
-   364,   821,   806,   805,     0,   821,   821,   821,     0,     0,
-     0,   113,    94,     0,    75,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   683,   682,     0,   685,   781,
-     0,    71,   780,    70,     0,   374,     0,     0,   687,   686,
-   688,   689,   691,   690,   692,     0,     0,     0,     0,     0,
-     0,   346,   158,   382,     0,     0,    93,   168,   788,     0,
-   330,   791,   322,     0,     0,     0,     0,     0,     0,     0,
-     0,   316,   325,   821,     0,   317,   821,   821,     0,     0,
-   311,     0,     0,   310,     0,   321,     0,   363,     0,    63,
-    27,    29,    28,     0,   821,   296,     0,     0,     0,     0,
-     0,   821,     0,     0,   352,    16,     0,     0,     0,     0,
-   815,   300,   355,     0,   302,   356,   784,     0,   673,     0,
-   115,     0,   713,     0,     0,     0,     0,   473,   654,   671,
-   657,   655,   649,   629,   630,   651,   631,   653,   633,     0,
-     0,     0,     0,   744,   741,   740,   739,   742,   750,   759,
-   738,     0,   771,   760,   775,   774,   770,   736,     0,     0,
-   748,     0,   768,     0,   757,     0,   719,   745,   743,   436,
-     0,     0,   761,   437,     0,   720,     0,     0,     0,     0,
+     0,     0,     0,     0,   427,   428,   821,   822,     3,     0,
+   823,     0,     0,     0,     0,   825,     0,     0,    68,     0,
+     0,     0,     0,     0,   293,   294,     0,     0,     0,     0,
+     0,     0,     0,     0,    66,     0,   291,   292,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,   408,   488,   505,
+   407,   503,   370,   505,   808,     0,     0,   807,     0,     0,
+   492,     0,   368,   825,   810,   809,     0,   825,   825,   825,
+     0,     0,     0,   115,    96,     0,    76,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,   687,   686,     0,
+   689,   785,     0,    72,   784,    71,     0,   378,     0,     0,
+   691,   690,   692,   693,   695,   694,   696,     0,     0,     0,
+     0,     0,     0,   350,   160,   386,     0,     0,    95,   170,
+   792,     0,   334,   795,   326,     0,     0,     0,     0,     0,
+     0,     0,     0,   320,   329,   825,     0,   321,   825,   825,
+     0,     0,   313,     0,     0,   312,     0,   325,     0,   367,
+     0,    64,    27,    29,    28,     0,   825,   298,     0,     0,
+     0,     0,     0,     0,     0,   825,     0,     0,   356,    16,
+     0,     0,     0,     0,   819,   302,   359,     0,   304,   360,
+   788,     0,   677,     0,   117,     0,   717,     0,     0,     0,
+     0,   477,   658,   675,   661,   659,   653,   633,   634,   655,
+   635,   657,   637,     0,     0,     0,     0,   748,   745,   744,
+   743,   746,   754,   763,   742,     0,   775,   764,   779,   778,
+   774,   740,     0,     0,   752,     0,   772,     0,   761,     0,
+   723,   749,   747,   440,     0,     0,   765,   441,     0,   724,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,    76,   820,     6,    31,    32,    33,    34,   297,     0,
-    61,    62,   512,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   512,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   472,     0,
-   472,     0,     0,     0,     0,   493,   796,     0,   491,     0,
-     0,     0,     0,   795,     0,   492,     0,   797,     0,   499,
-    86,     0,   793,   794,     0,     0,     0,     0,     0,     0,
-     0,   114,     0,   821,   415,     0,     0,     0,   802,   801,
-    72,     0,     0,     0,   380,   155,     0,   157,   707,   378,
-     0,     0,     0,     0,     0,     0,   359,     0,     0,     0,
-     0,   787,     0,     0,     0,     0,     0,     0,   329,   324,
-     0,     0,   786,     0,     0,     0,   305,     0,   307,   362,
-   811,    26,     0,     0,    10,     0,     0,     0,     0,     0,
-    22,     0,    19,   351,     0,     0,     0,     0,     0,     0,
-     0,     0,   474,   658,     0,   634,   637,     0,     0,   642,
-   639,     0,     0,   643,     0,     0,   427,     0,     0,     0,
-   425,   712,     0,   729,     0,   732,     0,   717,     0,   734,
-   751,     0,     0,     0,   718,   776,   772,   578,   762,     0,
-     0,     0,     0,     0,    54,   715,     0,     0,     0,   410,
-   411,   370,   418,    77,   417,   371,     0,     0,     0,     0,
-     0,     0,    35,   510,   510,     0,   483,   473,   497,   473,
-   498,   821,   821,   499,   490,     0,     0,     0,     0,   821,
-   821,   309,   489,     0,   308,     0,     0,     0,     0,    45,
-   242,    59,     0,     0,     0,     0,    53,   249,     0,     0,
-   326,     0,    44,   241,    39,    38,     0,   332,     0,   112,
-     0,     0,   349,     0,     0,   416,     0,     0,   512,     0,
-     0,   407,     0,     0,     0,     0,     0,     0,     0,     0,
-   159,     0,     0,     0,   358,   169,   790,     0,   821,   821,
-     0,   821,   821,   318,     0,     0,     0,   248,   301,   116,
-     0,    23,   659,   665,   656,   664,   638,     0,     0,     0,
-     0,     0,   434,     0,     0,   747,   721,   749,     0,     0,
-     0,   769,     0,   758,   778,     0,     0,     0,   746,   764,
-   439,   385,     0,   821,   821,   387,    78,     0,     0,   511,
-   511,     0,   474,   474,     0,     0,     0,    90,   821,   812,
-     0,     0,    88,    83,   821,   821,     0,     0,     0,   821,
-   486,   487,     0,     0,   821,     0,   405,     0,   615,     0,
-   409,   408,     0,   419,   421,     0,     0,   782,    73,   510,
-   376,     0,   375,     0,   503,     0,     0,     0,     0,     0,
-   496,   383,    36,     0,     0,     0,   821,     0,     0,     0,
-   306,   361,     0,   660,   426,   428,     0,     0,     0,   725,
-     0,   727,     0,   733,     0,   730,   716,   735,     0,     0,
-     0,     0,   377,     0,     0,     0,    23,    23,    50,   246,
-    49,   247,    91,     0,    47,   244,    48,   245,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-     0,     0,     0,   617,   618,   368,   422,     0,   511,   373,
-   504,     0,     0,   369,     0,   708,   379,     0,     0,   479,
-   476,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   600,   599,   601,   602,   604,   603,   605,   607,   613,   574,
-     0,     0,     0,   511,     0,     0,     0,   648,     0,   592,
-   593,   594,   595,   597,   596,   598,   591,   606,    68,     0,
-   526,     0,   530,   523,   524,   533,     0,   534,   586,   587,
-     0,   525,     0,   570,     0,   579,   580,   569,     0,     0,
-    66,     0,     0,    46,   243,     0,    58,     0,     0,    40,
-     0,   406,    15,   622,     0,     0,     0,   620,     0,     0,
-     0,   505,     0,   381,     0,     0,     0,     0,   726,     0,
-   723,   728,   731,   589,   590,   156,   611,     0,     0,     0,
-     0,     0,   555,     0,   545,   548,   821,     0,   561,     0,
-   608,     0,   609,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   576,     0,     0,   463,
-   462,     0,    12,   621,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   619,
-     0,     0,     0,     0,   506,   508,   509,   507,     0,     0,
-   481,     0,   477,   663,   662,   661,     0,     0,   544,   543,
-     0,     0,     0,   556,   546,   813,   575,     0,   527,   522,
-     0,   529,   582,   583,   612,   542,   532,   538,   531,     0,
-     0,     0,     0,     0,     0,   648,   571,   566,     0,   563,
-   461,     0,   766,     0,     0,     0,   755,     0,     0,   443,
-     0,     0,     0,   502,   500,     0,     0,     0,     0,     0,
-     0,   420,   513,     0,     0,   478,     0,     0,     0,   724,
-   549,   557,     0,     0,   610,     0,   536,   535,   537,   540,
-   539,   541,     0,     0,     0,   457,     0,   454,   452,     0,
-     0,   441,   464,     0,   459,     0,     0,     0,     0,     0,
-   442,    13,     0,     0,     0,     0,     0,   614,     0,   518,
-   519,   470,     0,   468,   471,     0,   480,     0,     0,     0,
-   564,   560,   444,   767,     0,     0,     0,     0,   465,   756,
-     0,     0,   354,     0,     0,     0,     0,     0,   467,   482,
-     0,   547,     0,   458,     0,   455,     0,   449,     0,   451,
-   440,   460,     0,     0,   515,   516,   514,   469,     0,     0,
-     0,     0,   456,   450,     0,   447,   453,     0,   448,
+     0,     0,     0,     0,     0,    77,   824,     6,    31,    32,
+    33,    34,   299,     0,    62,    63,   516,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   516,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   476,     0,   476,     0,     0,     0,     0,   497,
+   800,     0,   495,     0,     0,     0,     0,   799,     0,   496,
+     0,   801,     0,   503,    88,     0,   797,   798,     0,     0,
+     0,     0,     0,     0,     0,   116,     0,   825,   419,     0,
+     0,     0,   806,   805,    73,     0,     0,     0,   384,   157,
+     0,   159,   711,   382,     0,     0,     0,     0,     0,     0,
+   363,     0,   825,     0,     0,     0,   791,     0,     0,     0,
+     0,     0,     0,   333,   328,     0,     0,   790,     0,     0,
+     0,   307,     0,   309,   366,   815,    26,     0,     0,    10,
+     0,     0,     0,     0,     0,     0,     0,    22,     0,    19,
+   355,     0,     0,     0,     0,     0,     0,     0,     0,   478,
+   662,     0,   638,   641,     0,     0,   646,   643,     0,     0,
+   647,     0,     0,   431,     0,     0,     0,   429,   716,     0,
+   733,     0,   736,     0,   721,     0,   738,   755,     0,     0,
+     0,   722,   780,   776,   582,   766,     0,     0,     0,     0,
+     0,    55,   719,     0,     0,     0,   414,   415,   374,   422,
+    78,   421,   375,     0,     0,     0,     0,     0,     0,    35,
+   514,   514,     0,   487,   477,   501,   477,   502,   825,   825,
+   503,   494,     0,     0,     0,     0,   825,   825,   311,   493,
+     0,   310,     0,     0,     0,    82,     0,     0,    45,   244,
+    60,     0,     0,     0,     0,    52,   251,     0,     0,   330,
+     0,    44,   243,    39,    38,     0,   336,     0,   114,     0,
+     0,   353,     0,     0,   420,     0,     0,   516,     0,     0,
+   411,     0,     0,     0,     0,     0,     0,     0,     0,   161,
+     0,     0,     0,   362,   171,     0,   794,     0,     0,   825,
+   825,     0,   825,   825,   322,     0,     0,     0,     0,    51,
+   250,   303,   118,     0,    23,   663,   669,   660,   668,   642,
+     0,     0,     0,     0,     0,   438,     0,     0,   751,   725,
+   753,     0,     0,     0,   773,     0,   762,   782,     0,     0,
+     0,   750,   768,   443,   389,     0,   825,   825,   391,    79,
+     0,     0,   515,   515,     0,   478,   478,     0,     0,     0,
+    92,   825,   816,     0,     0,    90,    85,     0,   825,   825,
+     0,     0,     0,   825,   490,   491,     0,     0,   825,     0,
+   409,     0,   619,     0,   413,   412,     0,   423,   425,     0,
+     0,   786,    74,   514,   380,     0,   379,     0,   507,     0,
+     0,     0,     0,     0,   500,   387,    36,     0,     0,   825,
+     0,     0,     0,   308,   365,     0,     0,   664,   430,   432,
+     0,     0,     0,   729,     0,   731,     0,   737,     0,   734,
+   720,   739,     0,     0,     0,     0,   381,     0,     0,     0,
+    23,    23,    49,   248,    50,   249,    93,     0,    47,   246,
+    48,   247,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,    11,     0,     0,     0,   621,   622,   372,
+   426,     0,   515,   377,   508,     0,     0,   373,     0,   712,
+   383,     0,     0,   483,   480,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   604,   603,   605,   606,   608,   607,
+   609,   611,   617,   578,     0,     0,     0,   515,     0,     0,
+     0,   652,     0,   596,   597,   598,   599,   601,   600,   602,
+   595,   610,    69,     0,   530,     0,   534,   527,   528,   537,
+     0,   538,   590,   591,     0,   529,     0,   574,     0,   583,
+   584,   573,     0,     0,    67,     0,     0,    46,   245,     0,
+    59,     0,     0,    40,     0,   410,    15,   626,     0,     0,
+     0,   624,     0,     0,     0,   509,     0,   385,     0,     0,
+     0,     0,   730,     0,   727,   732,   735,   593,   594,   158,
+   615,     0,     0,     0,     0,     0,   559,     0,   549,   552,
+   825,     0,   565,     0,   612,     0,   613,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   580,     0,     0,   467,   466,     0,    12,   625,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   623,     0,     0,     0,     0,   510,   512,
+   513,   511,     0,     0,   485,     0,   481,   667,   666,   665,
+     0,     0,   548,   547,     0,     0,     0,   560,   550,   817,
+   579,     0,   531,   526,     0,   533,   586,   587,   616,   546,
+   536,   542,   535,     0,     0,     0,     0,     0,     0,   652,
+   575,   570,     0,   567,   465,     0,   770,     0,     0,     0,
+   759,     0,     0,   447,     0,     0,     0,   506,   504,     0,
+     0,     0,     0,     0,     0,   424,   517,     0,     0,   482,
+     0,     0,     0,   728,   553,   561,     0,     0,   614,     0,
+   540,   539,   541,   544,   543,   545,     0,     0,     0,   461,
+     0,   458,   456,     0,     0,   445,   468,     0,   463,     0,
+     0,     0,     0,     0,   446,    13,     0,     0,     0,     0,
+     0,   618,     0,   522,   523,   474,     0,   472,   475,     0,
+   484,     0,     0,     0,   568,   564,   448,   771,     0,     0,
+     0,     0,   469,   760,     0,     0,   358,     0,     0,     0,
+     0,     0,   471,   486,     0,   551,     0,   462,     0,   459,
+     0,   453,     0,   455,   444,   464,     0,     0,   519,   520,
+   518,   473,     0,     0,     0,     0,   460,   454,     0,   451,
+   457,     0,   452,
     }, yyDgoto = {
-//yyDgoto 277
-     1,   450,    69,    70,    71,    72,    73,   319,   324,   325,
-   552,    74,    75,   561,    76,    77,   559,   560,   562,   757,
-    78,    79,    80,    81,    82,    83,   469,   451,   231,   232,
-   258,    86,    87,    88,   207,    89,    90,    91,   259,   791,
-   792,   682,   683,   278,   279,   280,    93,    94,    95,    96,
-    97,    98,   436,   343,   235,   267,   100,   268,   972,   973,
-   872,   985,  1227,   967,  1052,  1146,  1142,   660,   238,   500,
-   501,   655,   832,   916,   773,  1352,  1315,   249,   286,   491,
-   240,   102,   241,   852,   853,   104,   854,   858,   699,   105,
-   106,  1271,  1272,   336,   337,   338,   578,   579,   580,   581,
-   766,   767,   768,   769,   290,   502,   243,   202,   244,   904,
-   361,  1274,  1198,  1199,   582,   583,   584,  1275,  1276,  1342,
-  1228,  1343,   108,  1232,   649,   647,  1070,   420,   670,   406,
-   245,   260,   203,   111,   112,   113,   114,   115,   541,   283,
-   869,  1386,  1222,  1108,  1240,  1110,  1111,  1112,  1113,  1170,
-  1171,  1172,  1268,  1173,  1115,  1116,  1117,  1118,  1119,  1120,
-  1121,  1122,  1123,   320,   116,   737,   658,   472,   659,   205,
-   585,   586,   777,   587,   588,   589,   590,   928,   702,   424,
-   206,   404,   690,  1124,  1125,   592,  1127,  1128,   593,   594,
-   595,  1318,   322,   618,   596,   597,   598,   507,   827,   492,
-   269,   975,   873,   118,   119,   411,   407,   976,  1175,   120,
-   801,   121,   122,   516,   123,   124,   125,   969,  1144,   619,
-   813,  1191,  1192,  1023,   939,   547,   752,   901,     2,   366,
-   456,  1140,  1285,  1050,   522,   513,   508,   636,   622,   867,
-   344,   803,   936,   270,   707,   531,   250,   433,   528,   685,
-   870,   692,   877,   686,   875,   703,   599,   602,   781,   782,
-   315,  1155,  1297,   650,   648,  1338,  1303,   327,   754,   753,
-   902,  1003,  1071,  1235,   876,   340,   687,
+//yyDgoto 278
+     1,   452,    69,    70,    71,    72,    73,   321,   326,   327,
+   556,    74,    75,   565,    76,    77,   563,   564,   566,   764,
+    78,    79,    80,    81,    82,    83,   471,   453,   266,   267,
+   258,    86,    87,    88,   207,    89,    90,    91,   259,   798,
+   799,   686,   687,   280,   281,   282,    93,    94,    95,    96,
+    97,   846,    98,   438,   345,   235,   269,   100,   270,   986,
+   987,   881,   999,  1241,   981,  1066,  1160,  1156,   664,   238,
+   502,   503,   659,   839,   929,   780,  1366,  1329,   249,   288,
+   493,   240,   102,   241,   861,   862,   104,   863,   867,   703,
+   105,   106,  1285,  1286,   338,   339,   340,   582,   583,   584,
+   585,   773,   774,   775,   776,   292,   504,   243,   202,   244,
+   917,   363,  1288,  1212,  1213,   586,   587,   588,  1289,  1290,
+  1356,  1242,  1357,   108,  1246,   653,   651,  1084,   422,   674,
+   408,   245,   260,   203,   111,   112,   113,   114,   115,   545,
+   285,   878,  1400,  1236,  1122,  1254,  1124,  1125,  1126,  1127,
+  1184,  1185,  1186,  1282,  1187,  1129,  1130,  1131,  1132,  1133,
+  1134,  1135,  1136,  1137,   322,   116,   744,   662,   474,   663,
+   205,   589,   590,   784,   591,   592,   593,   594,   941,   706,
+   426,   206,   406,   694,  1138,  1139,   596,  1141,  1142,   597,
+   598,   599,  1332,   324,   622,   600,   601,   602,   509,   834,
+   494,   271,   989,   882,   118,   119,   413,   409,   990,  1189,
+   120,   808,   121,   122,   518,   123,   124,   125,   983,  1158,
+   623,   820,  1205,  1206,  1037,   952,   551,   759,   914,     2,
+   368,   458,  1154,  1299,  1064,   526,   515,   510,   640,   626,
+   876,   346,   810,   949,   272,   711,   535,   250,   435,   532,
+   689,   879,   696,   886,   690,   884,   707,   603,   606,   788,
+   789,   317,  1169,  1311,   654,   652,  1352,  1317,   329,   761,
+   760,   915,  1017,  1085,  1249,   885,   342,   691,
     }, yySindex = {
-//yySindex 1399
-     0,     0, 25897,     0,     0,     0,     0, 29369,     0,     0,
-     0,     0,     0,     0,     0, 26389, 26389,     0,     0,     0,
-     0,   161,     0,     0,     0,     0,   313, 29264,   211,   158,
+//yySindex 1413
+     0,     0, 26764,     0,     0,     0,     0, 30335,     0,     0,
+     0,     0,     0,     0,     0, 27224, 27224,     0,     0,     0,
+     0,    86,     0,     0,     0,     0,   932, 30230,   148,    96,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,  1265, 28240, 28240,
- 28240, 28240,   153, 26023, 26143, 27007, 27253, 30036,     0, 29887,
-     0,     0,     0,   447,   447,   447,   447, 28357, 28240,     0,
-   137,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   495,   495,     0,     0, 32130,     0,
-   176,     0,  1989,   382, 29686,     0,   256,     0,    38,   179,
-   270,    82,     0,   283,     0,   136,     0,   368,     0,   676,
-     0,   683, 32243,     0,   562,     0,     0, 26389,     0, 27373,
- 29785, 25363, 27373, 32356, 32469,     0,   692,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,  1667, 29092, 29092,
+ 29092, 29092,  -141, 26878, 26994, 27798, 28028, 30908,     0, 30759,
+     0,     0,     0,   162,   162,   162,   162, 29206, 29092,     0,
+   -27,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   328,   328,     0,     0, 33085,     0,
+   270,     0,  1190,   702, 25583,     0,    72,     0,    45,   145,
+   151,   192,     0,   158,     0,   129,     0,   179,     0,   489,
+     0,   529, 33198,     0,   623,     0,     0, 27224,     0, 28144,
+ 30657, 26037, 28144, 33311, 33424,     0,   567,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -610,298 +612,302 @@ public RubyParser(Ruby runtime, LexerSource source, DynamicScope scope, org.jrub
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   707,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   765,     0,     0,     0,     0,     0,
-     0,     0,     0, 28240,   517, 26143, 28240, 28240, 28240,     0,
- 28240,   495,   495, 25126,     0,   482,   196,   837,     0,     0,
-     0,   533,   869,     0,   588,   892,     0, 26515,     0,     0,
- 26389, 25478,     0, 28470,   438,     0,   943,     0, 25897,     0,
-     0,     0,   663,     0,     0,   161,     0,   213,    82,     0,
-   692,   696, 10321, 10321,   666,     0, 26023,   980,   176,     0,
-  1989,     0,     0,   211,     0,   330,   935,   634,     0,   482,
-   915,   634,     0,     0,     0,     0,     0,   211,     0,     0,
-     0,     0,     0,     0,     0,     0,  1265,   743, 32582,   495,
-   495,     0,   247,     0,  1041,     0,     0,     0,     0,   880,
-     0,     0,     0,  1098,  1133,  1249,     0,  1055,  1055,  1055,
-  1055,     0,     0,     0,     0,  4509,     0,  1044,     0,     0,
-  4509,     0,  1048, 26143, 27373, 26143,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   814,   445,
-     0,   870,     0,     0,     0,     0,     0, 25651,     0, 27373,
- 27373, 27373, 27373,     0, 28470, 28470,     0, 28240, 28240, 28240,
- 28240, 28240,     0,     0, 28240, 28240, 28240, 28240, 28240, 28240,
- 28240, 28240,     0, 28240,     0,     0, 28240, 28240, 28240, 28240,
- 28240, 28240, 28240, 28240, 28240,     0,     0,     0,     0,     0,
-     0,     0,     0, 30391, 26389,     0, 30582, 28240,     0,   796,
-     0,     0,     0,     0, 31872,     0,     0,     0, 26023, 30294,
-  1119,     0,     0, 26143,     0,   382,   149,     0,     0,     0,
+     0,     0,   634,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   662,     0,     0,     0,     0,     0,
+     0,     0,     0, 29092,   409, 26994, 29092, 29092, 29092,     0,
+ 29092,   328,   328, 30814,     0,   375,   156,   694,     0,     0,
+     0,   404,   726,     0,   433,   780,     0, 27338,     0,     0,
+ 27224, 26151,     0, 29322,   955,     0,   813,     0, 26764,     0,
+     0,     0,   587,     0,     0,    86,   328,   328,     0,   187,
+   192,     0,   567,   591,  4601,  4601,   544,     0, 26878,   816,
+   270,     0,  1190,     0,     0,   148,     0,   479,   829,   636,
+     0,   375,   855,   636,     0,     0,     0,     0,     0,   148,
+     0,     0,     0,     0,     0,     0,     0,     0,  1667,   628,
+ 33537,   328,   328,     0,   336,     0,   965,     0,     0,     0,
+     0,  1036,     0,     0,     0,  1125,  1325,   854,     0,   968,
+   968,   968,   968,     0,     0,     0,     0,  2496,     0,   944,
+     0,     0,  2496,     0,   982, 26994, 28144, 26994,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    46,     0,     0,     0,   176,     0,  1108,   149,     0,     0,
-     0,     0,     0,     0,     0,     0,     0, 27373,    53,  1115,
-   555,     0,     0,     0,  1058, 25248,     0,     0,     0,   666,
-     0,     0,     0,   996,  1125,  1130, 28240, 30647, 26389, 30714,
- 26635,     0,     0,     0, 27127,     0,     0,     0, 28240,  1157,
-     0,   211,  1171,     0,   211,     0,   275,     0,  1152,     0,
-     0,     0,     0, 29369,     0,     0, 28240,  1092, 28240, 30755,
- 30714,     0,   158,   211,     0,     0, 25776,     0,  1185, 27007,
-     0,     0,     0, 27253,     0,     0,     0,   943,     0,     0,
-     0,  1184,     0, 30810, 26389, 30904, 32582,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,  1263,
-  -118,  1460,   319,     0,     0,     0,     0,     0,     0,     0,
-     0,  2594,     0,     0,     0,     0,     0,     0,   211,  1191,
-     0,  1197,     0,  1201,     0,  1204,     0,     0,     0,     0,
- 28240,     0,     0,     0,  1211,     0,   955,   957,   -78, 26143,
- 28587,   176, 26143, 28587,   345,    92,   345,     0, 31132, 26389,
- 31226,     0,     0,     0,     0,     0,     0,     0,     0, 26269,
-     0,     0,     0,   696,  4479,  4479,  4479,  4479, 11335, 10828,
-  4479,  4479, 10321, 10321,  1434,  1434,     0, 24803,  1343,  1343,
-   897,   105,   105,   696,   696,   696,  3225,   345,     0,  1139,
-     0,   345,   917,     0,   -25,     0,     0,   161,     0,     0,
-  1229,   211,   926,     0,   928,     0,   161,     0,  3225,     0,
-     0, 28357,     0,     0,   161, 28357, 27499, 27499,   211, 32582,
-  1238,     0,   345,     0,     0, 26143,  1017, 28470,     0,     0,
-     0,  1006,  1021, 26143,     0,     0,     0,     0,     0,     0,
- 31267, 26389, 31311, 26143, 26143,   211,     0, 29369, 28240, 28700,
- 28700,     0,   954,   -14,   211,   962,   963,   482,     0,     0,
-   869, 28240,     0, 28240, 28240, 26761,     0, 27127,     0,     0,
-     0,     0, 28470, 25126,     0,   696,   973,   161,   161, 28240,
-     0,     0,     0,     0,   634, 32582,     0,     0,   211,     0,
-     0,  1184,     0,     0,  1857,     0,     0,   200,   447,     0,
-     0,   200,   447,     0,  2594,  1490,     0,  1258,  1286,   211,
-     0,     0,  4509,     0,  4509,     0,   422,     0,  4609,     0,
-     0, 28240,  1267,    43,     0,     0,     0,     0,     0,   345,
-   313,  1037,  1039, 25126,     0,     0,   345,  1037,  1039,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   211,     0,
-     0, 26143,     0,     0,     0,  1280,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   796, 26635,   989,  1248,     0,
-     0,     0,     0,   796,     0,  1219, 23963,  1049,   639,     0,
-     0,     0,   368,  1295,    38,   256,     0,     0, 28240, 23963,
-     0,  1313,     0,     0,     0,     0,     0,     0,  1064,     0,
-  1184, 32582,     0,  1107,   693,     0,   275, 30204,     0,   345,
-  1021,     0,   345, 27619,  1102,   176, 27373, 26143,     0,     0,
-     0,   211,   345,  1264,     0,     0,     0,   313,     0,     0,
-  1033,     0,     0,     0,  1340,   211,   275,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,  1055,  1055,  1055,
-  1055,   211,     0,  2594,  1890,     0,     0,     0,  1350,  1353,
-  1354,     0,  1359,     0,     0,  1211,  1099,  1354,     0,     0,
-     0,     0, 28587,     0,     0,     0,     0,     0,   345,     0,
-     0, 28240,     0,     0, 28357, 28357,  1268,     0,     0,     0,
- 28357, 28357,     0,     0,     0,     0, 31357, 26389, 31454,     0,
-     0,     0,     0, 27745,     0,  1184,     0,  1102,     0, 27865,
-     0,     0,   345,     0,     0, 26143, 27373,     0,     0,     0,
-     0,   345,     0, 28240,     0,   114,   345, 26143,   176,   345,
-     0,     0,     0, 28700, 28240, 28240,     0, 28240, 28240, 27127,
-     0,     0,  3109,     0,     0,     0,  1372,  1380,  4509,     0,
-  4609,     0,  4609,     0,  4609,     0,     0,     0,  1037,  1039,
- 28240, 28240,     0, 31932, 31932, 25126,     0,     0,     0,     0,
-     0,     0,     0, 28357,     0,     0,     0,     0, 28240, 26269,
-   917,   -25,   211,   926,   928, 28357, 28240,     0, 26269,     0,
-  1169,     0,  1083,     0,     0,     0,     0,   149,     0,     0,
-     0, 27991, 26143,     0,   345,     0,     0, 28240,  4509,     0,
-     0, 26143,  1890,  1890,  1354,  1393,  1354,  1354, 25126, 25126,
+   717,   424,     0,   801,     0,     0,     0,     0,     0, 26514,
+     0, 28144, 28144, 28144, 28144,     0, 29322, 29322,     0, 29092,
+ 29092, 29092, 29092, 29092,     0,     0, 29092, 29092, 29092, 29092,
+ 29092, 29092, 29092, 29092,     0, 29092,     0,     0, 29092, 29092,
+ 29092, 29092, 29092, 29092, 29092, 29092, 29092,     0,     0,     0,
+     0,     0,     0,     0,     0, 31263, 27224,     0, 31454, 29092,
+     0,   769,     0,     0,     0,     0, 32744,     0,     0,     0,
+ 26878, 31166,  1094,     0,     0, 26994,     0,   702,   304,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-  5083,  5083,   709,     0, 12514,   211,  1134,     0,  1376,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    64,
-     0,  1317,     0,     0,     0,     0,   667,     0,     0,     0,
-   122,     0,  1399,     0,  1400,     0,     0,     0, 32017,   524,
-     0,  1327,  1327,     0,     0, 25126,     0,   989,     0,     0,
- 26143,     0,     0,     0, 26143, 32695,   149,     0, 26143, 31932,
- 28240,     0,   557,     0,   211,  -129,   323,  1380,     0,  4609,
-     0,     0,     0,     0,     0,     0,     0, 32017,  1110,   211,
-   211, 17824,     0,  1415,     0,     0,     0,  1337,     0,  1188,
-     0, 27373,     0,  1162, 17824, 32017,  5083,  5083,   709,   211,
-   211, 31932, 31932,  1447, 32017,  1110,     0,  1349, 26143,     0,
-     0, 26143,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,  1165,   730,     0,     0,
- 26143,   693,   149,   739,     0,     0,     0,     0,  1432,  1421,
-     0, 26143,     0,     0,     0,     0,  1354,    67,     0,     0,
-  1110,  1438,  1442,     0,     0,     0,     0,   211,     0,     0,
-  1443,     0,     0,     0,     0,     0,     0,     0,     0,   211,
-   211,   211,   211,   211,   211,     0,     0,     0,  1444,     0,
-     0,  1446,     0,  1452,   211,  1453,     0,  1375,  1459,     0,
- 32808,     0,  1211,     0,     0,  1169,     0, 31679, 26389, 31776,
-  1107,     0,     0, 27373, 27373,     0,  2240, 26143,  1384,     0,
-     0,     0, 32017,  1447,     0, 32017,     0,     0,     0,     0,
-     0,     0,   448, 17824,  3725,     0,  3725,     0,     0,  1408,
-   422,     0,     0,  4976,     0,     0,     0,  1224,   752, 32808,
-     0,     0,     0,     0,   211,     0,     0,     0, 26143,     0,
-     0,     0,   671,     0,     0,   345,     0,  1493,   211,  1493,
-     0,     0,     0,     0,  1496,  1499,  1505,  1506,     0,     0,
-  1211,  1496,     0, 31817,   752,     0,    73,  2240,     0,     0,
- 32017,     0,  4976,     0,  4976,     0,  3725,     0,  4976,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,  1496,  1496,
-  1509,  1496,     0,     0,  4976,     0,     0,  1496,     0,
-    }, yyRindex = {
-//yyRindex 1399
-     0,     0,   472,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0, 18411, 18501,     0,     0,     0,
-     0, 14689, 19103, 19418, 19508, 19600, 28817,     0, 28127,     0,
-     0, 19915, 20005, 20097, 15540,  5683, 20412, 20502, 15657, 20594,
+     0,     0,    42,     0,     0,     0,   270,     0,  1089,   304,
+     0,     0,     0,     0,     0,     0,     0,     0,     0, 28144,
+   -51,  1095,   454,     0,     0,     0,  1043, 25864,     0,     0,
+     0,   809,     0,     0,     0,  1206,  1131,  1140, 29092, 31519,
+ 27224, 31586, 27454,     0,     0,     0, 27914,     0,     0,     0,
+ 29092,  1137,     0,   148,  1161,     0,   148,     0,   105,     0,
+  1170,     0,     0,     0,     0, 30335,     0,     0, 29092,  1090,
+ 29092,  1163,  1196, 31627, 31586,     0,    96,   148,     0,     0,
+ 26628,     0,  1221, 27798,     0,     0,     0, 28028,     0,     0,
+     0,   813,     0,     0,     0,  1226,     0, 31682, 27224, 31776,
+ 33537,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,  1337,    -7,  1381,   166,     0,     0,     0,
+     0,     0,     0,     0,     0,  1718,     0,     0,     0,     0,
+     0,     0,   148,  1234,     0,  1235,     0,  1238,     0,  1241,
+     0,     0,     0,     0, 29092,     0,     0,     0,  1261,     0,
+  1012,  1022,   594, 26994, 29436,   270, 26994, 29436,   134,   150,
+   134,     0, 32004, 27224, 32098,     0,     0,     0,     0,     0,
+     0,     0,     0, 27108,     0,     0,     0,   591,  3656,  3656,
+  3656,  3656, 11345, 10838,  3656,  3656,  4601,  4601,   163,   163,
+     0, 24521,  1208,  1208,   329,   256,   256,   591,   591,   591,
+  3217,   134,     0,  1210,     0,   134,   971,     0,    80,     0,
+     0,    86,     0,     0,  1287,   148,   987,     0,   988,     0,
+    86,     0,  3217,     0,     0, 29552,     0,     0,    86, 29552,
+ 28258, 28374,   148, 33537,  1304,     0,   134,     0,     0, 26994,
+  1096, 29322,     0,     0,     0,  1083,  1097, 26994,     0,     0,
+     0,     0,     0,     0, 32139, 27224, 32183, 26994, 26994,   148,
+     0, 30335,     0, 29092, 29436, 29436,     0,  1017,   108,   148,
+  1023,  1026,   375,     0,     0,   726, 29092,     0, 29092, 29092,
+ 27568,     0, 27914,     0,     0,     0,     0, 29322, 30814,     0,
+   591, 29666, 29666,  1030,    86,    86, 29552,     0,     0,     0,
+     0,   636, 33537,     0,     0,   148,     0,     0,  1226,     0,
+     0,  1655,     0,     0,   103,   162,     0,     0,   103,   162,
+     0,  1718,  1701,     0,  1338,  1348,   148,     0,     0,  2496,
+     0,  2496,     0,   140,     0,  3050,     0,     0, 29092,  1320,
+    35,     0,     0,     0,     0,     0,   134,   932,  1100,  1103,
+ 30814,     0,     0,   134,  1100,  1103,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   148,     0,     0, 26994,     0,
+     0,     0,  1335,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   769, 27454,  1062,  1322,     0,     0,     0,     0,
+   769,     0,  1288,  1107, 25906,     0,  1126,   467,     0,     0,
+     0,   179,  1362,    45,    72,     0,     0, 29092, 25906,     0,
+  1391,     0,     0,     0,     0,     0,     0,  1139,     0,  1226,
+ 33537,     0,  1181,   792,     0,   105, 31076,     0,   134,  1097,
+     0,   134, 28488,  1179,   270, 28144, 26994,     0,     0,     0,
+   148,   134,  1326,     0,     0, 29092,     0,  1103,  1103,     0,
+     0,  1102,     0,     0,     0,  1410,   148,   105,   932,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   454,   454,  1463,  1420,   359,     0,  1501,
+   968,   968,   968,   968,   148,     0,  1718,  2049,     0,     0,
+     0,  1413,  1414,  1415,     0,  1420,     0,     0,  1261,  1168,
+  1415,     0,     0,     0,     0, 29436,     0,     0,     0,     0,
+     0,   134,     0,     0, 29092,     0,     0, 29552, 29552,  1341,
+     0,     0,     0, 29552, 29552,     0,     0,   544,     0,     0,
+ 32229, 27224, 32326,     0,     0,     0,     0, 28604,     0,  1226,
+     0,  1179,     0, 28718,     0,     0,   134,     0,     0, 26994,
+ 28144,     0,     0,     0,     0,   134,     0, 29092,     0,   314,
+   134, 26994,   270,   134,     0,     0,     0, 29092, 29092,     0,
+ 29092, 29092, 27914,     0,     0, 29666,  3592,     0,     0,     0,
+  1423,  1432,  2496,     0,  3050,     0,  3050,     0,  3050,     0,
+     0,     0,  1100,  1103, 29092, 29092,     0, 32804, 32804, 30814,
+     0,     0,     0,     0,     0,     0,     0, 29552,     0,     0,
+     0,     0, 29092, 27108,   971,    80,   148,   987,   988, 29552,
+ 29092,     0, 27108,     0,  1215,     0,  1128,     0,     0,     0,
+     0,   304,     0,     0,     0, 28834, 26994,     0,   134,     0,
+     0, 29092,  2496,     0,     0, 26994,  2049,  2049,  1415,  1436,
+  1415,  1415, 30814, 30814,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,  4531,  4531,   139,     0, 24148,   148,
+  1187,     0,  1120,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,    56,     0,  1370,     0,     0,     0,     0,
+   747,     0,     0,     0,    74,     0,  1454,     0,  1456,     0,
+     0,     0, 32972,   695,     0,  1382,  1382,     0,     0, 30814,
+     0,  1062,     0,     0, 26994,     0,     0,     0, 26994, 33650,
+   304,     0, 26994, 32804, 29092,     0,   755,     0,   148,  -161,
+    -6,  1432,     0,  3050,     0,     0,     0,     0,     0,     0,
+     0, 32972,  1162,   148,   148, 32889,     0,  1468,     0,     0,
+     0,  1392,     0,  1308,     0, 28144,     0,  1214, 32889, 32972,
+  4531,  4531,   139,   148,   148, 32804, 32804,   983, 32972,  1162,
+     0,  1529, 26994,     0,     0, 26994,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-  8824,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,  1970,  1970,     0,     0,     0,     0,
-   167,     0,   794, 12019, 22766,  9140, 22331,     0,  9235,     0,
- 11677, 26881,     0,     0,     0, 22394,     0, 20909,     0,     0,
-     0,     0,   776,     0,     0,     0,     0, 18605,     0,     0,
-     0,  1287,     0,     0,     0,     0, 16024,     0,     0,     0,
+  1211,   556,     0,     0, 26994,   792,   304,   893,     0,     0,
+     0,     0,  1482,  1470,     0, 26994,     0,     0,     0,     0,
+  1415,   100,     0,     0,  1162,  1480,  1483,     0,     0,     0,
+     0,   148,     0,     0,  1491,     0,     0,     0,     0,     0,
+     0,     0,     0,   148,   148,   148,   148,   148,   148,     0,
+     0,     0,  1493,     0,     0,  1503,     0,  1504,   148,  1507,
+     0,  1433,  1515,     0, 33763,     0,  1261,     0,     0,  1215,
+     0, 32551, 27224, 32648,  1181,     0,     0, 28144, 28144,     0,
+  1889, 26994,  1444,     0,     0,     0, 32972,   983,     0, 32972,
+     0,     0,     0,     0,     0,     0,   503, 32889,  3581,     0,
+  3581,     0,     0,  1448,   140,     0,     0,  3739,     0,     0,
+     0,  1265,   597, 33763,     0,     0,     0,     0,   148,     0,
+     0,     0, 26994,     0,     0,     0,   708,     0,     0,   134,
+     0,  1532,   148,  1532,     0,     0,     0,     0,  1539,  1540,
+  1546,  1549,     0,     0,  1261,  1539,     0, 32689,   597,     0,
+   617,  1889,     0,     0, 32972,     0,  3739,     0,  3739,     0,
+  3581,     0,  3739,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,  1539,  1539,  1551,  1539,     0,     0,  3739,     0,
+     0,  1539,     0,
+    }, yyRindex = {
+//yyRindex 1413
+     0,     0,   953,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0, 18583, 18899,     0,     0,     0,
+     0, 15086, 19490, 19582, 19897, 19987, 29782,     0, 28976,     0,
+     0, 20079, 20394, 20484, 15687,  6200, 20576, 20891, 16054, 20981,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   961,   961,  1509,  1210,   227,     0,  1439,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+  9657,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,  1404,  1404,     0,     0,     0,     0,
+   167,     0,  1038,  2277,  2704,  9752, 23261,     0,  9850,     0,
+  3391, 27684,     0,     0,     0, 23328,     0, 21073,     0,     0,
+     0,     0,   480,     0,     0,     0,     0, 18989,     0,     0,
+     0,  1329,     0,     0,     0,     0, 16171,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0, 22888,     0,     0,     0,     0,     0,     0,     0,
-  6279,  6595,  6690,  6788,     0,  7104,  7199,  7297,  4348,  7613,
-  7708,  4715,  7806,  3207,     0,   454,  3871, 21259,  1448,     0,
-     0,  1970,  1970,  2231,     0, 21357,     0,  7007,     0,     0,
-     0,     0,  7007,     0,  8631,     0,     0,   467,     0,     0,
-     0,  1526,     0,     0,     0,     0, 28930,     0,   546,     0,
-     0,     0,  9649,     0,     0,  8122,     0,     0,     0,     0,
-  9333, 10156, 13829, 13956, 20999,     0,   454,     0,   713,     0,
-  1401,     0,   933,  1526,     0,  1478,     0,  1478,     0,     0,
-     0,  1449,     0,  2168,  2565,  2579,  2620,  1546,  3149,  3325,
-  3363,  1259,  3707,  3900,  1800,  3907,     0,     0,     0,  1284,
-  1284,     0,     0,  4321,   876,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,  1525,   490,  1537,
-   529,     0,     0,     0,     0,   829,     0,     0, 24615,     0,
-   621,     0,     0,   202,     0,   202,   302,   788,  1136,  1366,
-  1508,  1656,  1674,  1285,  1744,  1816,  1967,  1904,     0,     0,
-  2302,     0,     0,     0,     0,     0,     0,   169,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,  9744,  9840,
+     0,     0, 12000,     0,     0,     0,     0,     0,     0,     0,
+  7112,  7207,  7305,  7621,     0,  7716,  7814,  8130,  4865,  8225,
+  8323,  5232,  8639, 21738,     0,   961, 21836, 21883,  7524,     0,
+     0,  1404,  1404,  2772,     0, 21922,     0,  8033,     0,     0,
+     0,     0,  8033,     0,  9243,     0,     0,   551,     0,     0,
+     0,  1562,     0,     0,     0,     0, 29896,     0,   767,     0,
+     0,     0, 10261,     0,     0,  8734,  1404,  1404,     0,     0,
+     0,     0, 10166, 10673, 14112, 14207, 21388,     0,   961,     0,
+  3268,     0,  1239,     0,   888,  1562,     0,  1514,     0,  1514,
+     0,     0,     0,  1487,     0,   794,  1286,  1564,  2059,  1576,
+  2150,  2683,  2801,   832,  2861,  3001,  1086,  3100,     0,     0,
+     0,  2083,  2083,     0,     0,  3240,   612,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,  1449,
+   273,  1475,   477,     0,     0,     0,     0,   593,     0,     0,
+ 25218,     0,   789,     0,     0,   138,     0,   138,  1121,  1465,
+  1524,  1761,  2420,  2522,  2833,  2392,  2919,  3131,  2639,  3177,
+     0,     0,  3229,     0,     0,     0,     0,     0,     0,   196,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   206,     0,     0,     0,     0,  7516,
-     0,     0,     0,     0,     0,     0,     0,     0,   454,   887,
-  1053,     0,     0,   863,     0,  3935,     0,  3035,  3480,  3764,
-  6353,  9991, 10498, 11005, 13712,     0,     0, 14577,     0,     0,
-     0,     0,     0,     0,   243,     0,   629,     0,     0,     0,
-     0,     0,     0,     0,     0, 23315, 23441,     0,     0, 24729,
-     0,     0,     0,     0,     0,  1526,     0,     0,     0,  8726,
-     0,     0,     0,     0,     0,     0,     0,     0,   206,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   844,   883,
-     0,  1526,   190,     0,  1526,     0,  1526,     0,     0,     0,
+  4336, 10357,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,  1526,     0,     0,  3362,   124,     0,  1494,
-     0,     0,     0,   647,     0,     0,     0,     0,     0,  4502,
-     0,  1087,     0,     0,   206,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   248,     0,     0,     0,
+     0,  9051,     0,     0,     0,     0,     0,     0,     0,     0,
+   961,   772,   899,     0,     0,   836,     0,  4746,     0,  1955,
+  2144,  3247,  6870, 10508, 11015, 11522, 12044,     0,     0, 13023,
+     0,     0,     0,     0,     0,     0,   550,     0,   566,     0,
+     0,     0,     0,     0,     0,     0,     0, 23999, 24333,     0,
+     0, 25427,     0,     0,     0,     0,     0,  1562,     0,     0,
+     0,  9341,     0,     0,     0,     0,     0,     0,     0,     0,
+   248,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   689,   898,     0,  1562,   320,     0,  1562,     0,  1562,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,  1562,     0,     0,
+  3525,   545,     0,  1530,     0,     0,     0,   394,     0,     0,
+     0,     0,     0,  3261,     0,   918,     0,     0,   248,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,  1526,   209,
-     0,   209,     0,   210,     0,   209,     0,     0,     0,     0,
-   174,   134,     0,     0,   210,     0,   558,   394,   430,   863,
-     0,     0,   863,     0,     0,     0,     0,  2499,     0,   206,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0, 10251,  2838, 12965, 13209, 13309, 13405, 13707,
- 13526, 13612, 14072, 14119, 12171, 12266,     0,  1530, 12662, 12748,
- 12362, 11772, 11868, 10347, 10663, 10758, 12843,     0,     0,     0,
-     0,     0, 16141,  5800, 17593,     0,     0, 26881,     0,  6167,
-   418,  1504, 16508,     0, 16625,     0, 15056,     0, 13092,     0,
-     0,     0,     0,     0, 18077,     0,     0,     0,  1526,     0,
-  1127,     0,     0,     0,     0,   107, 24328,     0,     0,     0,
-     0,  1318,     0,   389,     0,     0, 24214,     0,     0,     0,
-     0,   206,     0,   863,   546,  1526,     0,     0,     0,     0,
-     0,     0,  4832, 15173,  1504,  5199,  5316, 21404,     0,     0,
-  7007,     0,     0,     0,     0,  1002,     0,   226,     0,     0,
-     0,     0,     0, 14205,     0, 10854,  8217,     0,  8315,     0,
-     0,  1722,     0,     0,  1478,     0,  1823,  2026,  1504,  2373,
-  2413,  1195,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,  1270,     0,  1031,  1052,  1526,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,  1562,   526,     0,   526,     0,   564,     0,   526,
+     0,     0,     0,     0,   766,   183,     0,     0,   564,     0,
+    98,   507,   528,   836,     0,     0,   836,     0,     0,     0,
+     0,  3254,     0,   248,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0, 10768,  3999,  4517,
+ 13465, 13592, 13709, 14026, 13809, 13905, 14326, 14421, 12378, 12681,
+     0,  1566, 12862, 13162, 12776, 12187, 12282, 10864, 11180, 11275,
+ 13248,     0,     0,     0,     0,     0, 16538,  6317, 17990,     0,
+     0, 27684,     0,  6684,   506,  1542, 16655,     0, 17022,     0,
+ 15203,     0, 13343,     0,     0,     0,     0,     0, 18474,     0,
+     0,     0,  1562,     0,   925,     0,     0,     0,     0,    88,
+ 25104,     0,     0,     0,     0,  1358,     0,   124,     0,     0,
+ 24895,     0,     0,     0,     0,   248,     0,   836,   767,  1562,
+     0,     0,     0,     0,     0,     0,     0,  5349, 15570,  1542,
+  5716,  5833, 22004,     0,     0,  8033,     0,     0,     0,     0,
+   923,     0,   660,     0,     0,     0,     0,     0,  2324,     0,
+ 11371,     0,     0,  8832,     0,  9148,     0,     0,   795,     0,
+     0,  1514,     0,  1899,  2667,  1542,  1908,  1992,   937,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
- 28817, 11170, 22973, 14255,     0,     0,     0, 11265, 23041,     0,
-     0,     0,     0,     0,     0,     0,  3180,   276,  1504,  3409,
-  4050,   202,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,  8025,   552, 18921,     0,     0,
-     0,     0,     0,  8534,     0,     0,  4184, 23083,     0,     0,
-     0,     0, 21091,     0,  2108, 22431,     0,     0,  1559,  9501,
-     0,     0,     0,     0,     0,     0, 22851,     0, 23161,     0,
-  1236,     0,     0,   657,   399,     0,  1526,     0,     0,     0,
-     0,     0,     0,     0,   399,     0,     0,   863, 23775, 23889,
-     0,  1504,     0,     0,     0,     0,     0, 28817,     0,     0,
-  4004,     0,     0,     0,   190,  1526,  1526,     0,     0,     0,
-  1481,     0,     0,     0,     0,     0,     0,  1545,   544,  1558,
-   636,  1526,     0,     0,     0,     0,     0,     0,   209,   209,
-   209,     0,   209,     0,     0,   210,   430,   209,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,  1166,     0,     0,
+     0,     0,   618,     0,   966,  1072,  1562,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   206,     0,     0,
-     0,     0,  1694,     0,     0,  1368,     0,   289,     0,    68,
-     0,     0,     0,     0,     0,   202,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   863,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   723,
-     0,     0,   -87,     0,     0,     0,  1069,  1071,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0, 11361, 23181,
-     0,     0,     0,     0,     0, 14389,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0, 29782, 11687,  3935,
+ 14507,     0,     0,     0, 11782, 12529,     0,     0,     0,     0,
+     0,     0,     0,  2646,   870,  1542,  2836,  3823,   138,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
- 16992, 17960,  1504, 17109, 17476,     0,  1559,  3660,     0,     0,
-   399,   101,   178,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   785,     0,     0,     0,     0,     0,   985,     0,
-     0,    84,     0,     0,   209,   209,   209,   209, 14525, 22901,
+     0,     0,  9560,   563, 19085,     0,     0,     0,     0,     0,
+ 10068,     0,     0,     0, 14902,     0, 23868,     0,     0,     0,
+     0, 21478,     0,  3538, 23393,     0,     0,  1588,  2948,     0,
+     0,     0,     0,     0,     0,  2891,     0, 23910,     0,  1015,
+     0,     0,   -84,   232,     0,  1562,     0,     0,     0,     0,
+     0,     0,     0,   232,     0,     0,   836, 24447, 24781,     0,
+  1542,     0,     0,     0,     0,     0,     0, 10479, 10986,     0,
+     0,  6796,     0,     0,     0,   320,  1562,  1562, 29782,     0,
+     0,     0,     0,  1545,     0,     0,     0,     0,     0,     0,
+  1536,   498,  1570,   502,  1562,     0,     0,     0,     0,     0,
+     0,   526,   526,   526,     0,   526,     0,     0,   564,   528,
+   526,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+  2885,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0, 21570,     0,     0,
+     0,   248,     0,     0,     0,     0, 10018,     0,     0,  1029,
+     0,    64,     0,    69,     0,     0,     0,     0,     0,   138,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,  1504,  1173, 21890,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0, 22523,
-     0, 21851,     0,     0,     0,     0, 21443,     0,     0,     0,
- 21552,     0,  9043,     0,  9551,     0,     0,     0, 21928,  9962,
-     0, 24938, 25052,     0,     0, 14572,     0, 19013, 11525,     0,
-   128,     0,     0,     0,   202,     0,     0,     0,   107,     0,
-     0,     0,   399,     0,   688,     0,     0,  1146,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0, 21975,  1504,
-  1504, 10469,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0, 22608,     0, 21591, 21732,     0, 29081,
- 29451,     0,     0, 10976,     0, 22038,     0,   373,   863,     0,
-     0,   546,     0,     0,   318,   441,  1163,  1228,  1971,  2068,
-  2218,  1646,  2709,  2777,  1757,  2945,     0,     0,  3007,     0,
-   863,   399,     0,   238,     0,     0,     0,     0,     0,   535,
-     0,   546,     0,     0,     0,     0,   209,  1526,     0,     0,
- 22085, 11483, 22124,     0,     0,     0,     0,  1526,     0,     0,
- 22672,     0,     0,     0,     0,     0,     0,     0,     0,  1526,
-  1526,  1526,  1504,  1504,  1504,     0,     0,     0, 22218,     0,
-     0,   651,     0,   651,   373,   777,     0,     0,   651,     0,
-   764,  1507,   777,     0,     0,   399,  3093,     0,   206,     0,
-   657,     0,     0,     0,     0,     0,     0,   863,     0,     0,
+     0,   836,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   972,     0,     0,     0,  -158,     0,     0,     0,
+  1104,  1152,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0, 11878, 11493,     0,     0,     0,     0,     0, 14602,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   942,     0,     0,     0,
-     0,     0,     0,     0,     0,  1878,  2495,     0,   825,     0,
-     0,     0,  2037,   756,  1504,  2704,  2739,     0,   832,     0,
-     0,     0,   545,     0,     0,     0,     0, 22281,  1477, 22724,
-     0,     0,     0,     0,   651,   651,   651,   651,     0,     0,
-   777,   651,     0,     0,   998,  1281,   399,     0,     0,     0,
+     0,     0,     0,     0, 17139, 18107,  1542, 17506, 17623,     0,
+  1588, 23754,     0,     0,   232,   122,   321,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   590,     0,     0,     0,
+     0,     0,  1065,     0,     0,    71,     0,     0,   526,   526,
+   526,   526, 14721,  8542,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,  1542,   500,
+ 22464,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0, 23437,     0, 22355,     0,     0,     0,     0,
+  4184,     0,     0,     0, 22042,     0, 18716,     0, 22740,     0,
+     0,     0, 22534, 22780,     0, 25541, 25750,     0,     0, 14816,
+     0, 19400, 23818,     0,   161,     0,     0,     0,   138,     0,
+     0,     0,    88,     0,     0,     0,   232,     0,   956,     0,
+     0,  1230,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0, 22621,  1542,  1542, 22940,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0, 23479,     0,
+ 22221, 22317,     0, 30047, 24985,     0,     0, 22987,     0, 22660,
+     0,   125,   836,     0,     0,   767,     0,     0,   741,  1266,
+  1431,  1731,  1819,  1870,  1888,  1359,  1946,  2179,  1805,  2242,
+     0,     0,  2402,     0,   836,   232,     0,   501,     0,     0,
+     0,     0,     0,   160,     0,   767,     0,     0,     0,     0,
+   526,  1562,     0,     0, 22698, 23050, 23087,     0,     0,     0,
+     0,  1562,     0,     0, 23569,     0,     0,     0,     0,     0,
+     0,     0,     0,  1562,  1562,  1562,  1542,  1542,  1542,     0,
+     0,     0, 23127,     0,     0,   573,     0,   573,   125,   887,
+     0,     0,   573,     0,   926,  1048,   887,     0,     0,   232,
+  2568,     0,   248,     0,   -84,     0,     0,     0,     0,     0,
+     0,   836,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,  2875,   836,     0,     0,     0,     0,   651,   651,
-   651,   651,     0,     0,     0,     0,     0,   651,     0,
+  1160,     0,     0,     0,     0,     0,     0,     0,     0,  1520,
+  2429,     0,  1110,     0,     0,     0,  2052,  1283,  1542,  2485,
+  2503,     0,   527,     0,     0,     0,   620,     0,     0,     0,
+     0, 23164,  1516, 23637,     0,     0,     0,     0,   573,   573,
+   573,   573,     0,     0,   887,   573,     0,     0,  1124,  1091,
+   232,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,  2441,   294,     0,     0,
+     0,     0,   573,   573,   573,   573,     0,     0,     0,     0,
+     0,   573,     0,
     }, yyGindex = {
-//yyGindex 277
-     0,     0,  1167,     0,  1535,  1605,  2549,   -58,     0,     0,
-  -212,  3229, 22802,     0, 23240, 23252,     0,     0,     0,  1050,
- 23638,     0,    59,     0,     0,    16,  1485,   750,  2213,  2337,
-     0,     0,     0,     0,     4,  1367,     0,  1260,  1116,  -531,
-  -534,  -577,   -42,     0,  1118,    -1,   -62,  3499,   -50,    -7,
-   -35,     0,  -117,   -61,  1759,    13,     0,   746,   425,  -838,
-  -715,     0,     0,   361,     0,     0,   369,    48,  -429,    89,
-  -370,    69,   988,  -295,  -497,   470,  3550,    30,     0,  -226,
-  -448,  1548,  2614,   -15,   469,  -555,  -558,     0,     0,     0,
-     0,   350,  -942,   129,   113,   824,  -326,    78,  -697,   901,
-  -798,  -766,   761,   912,     0,    40,  -436,     0,  1998,     0,
-     0,     0,   547,     0,  -594,     0,   905,     0,   363,     0,
- -1033,   328, 24685,     0,  -506,  1288,     0,   -95,   126,   853,
-  2635,    -2,    12,  1621,     0,    -4,   -91,   -16,  -455,  -123,
-   358,     0,     0,  -825,  1900,     0,     0,   541,  -945,   -22,
-     0,  -820,  -786,  -300,     0,  -240,   548,     0,     0,     0,
- -1015,     0,   543,     0,   652,  -348,     0,  -435,    20,   -49,
-  -724,     1,  -570,  -438, -1089,  -745,  1457,  -305,   -86,     0,
-     0,  1634,     0,  -962,     0,   952,   561,     0,     0,  1362,
-  -213,     0,  -655,    77,     0,     0,  -565,   354,   266,     0,
-  1149,   774,     0,     0,     0,     0,     0,     0,   402,     0,
-  -141,     0,     0,  1241,     0,     0,     0,     0,     0,   685,
-  -508,     0,     0,    50,  -668,  -201,   263,   281,     0,     2,
-    24,     0,     0,     0,     0,     0,   164,     0,     0,     0,
-     0,     0,     0,  1531,     0,  -198,     0,     0,     0,  -437,
-     0,     0,     0,   -84,     0,     0,     0,     0,   476,     0,
-     0,     0,     0,     0,     0,     0,     0,    21,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,
+//yyGindex 278
+     0,     0,  -274,     0,  1572, 17498, 18188,   -59,     0,     0,
+  -215, 21365, 22777,     0, 23793, 25344,     0,     0,     0,  1075,
+ 25376,     0,    54,     0,     0,     5,  1534,   777,  2120,  2406,
+     0,     0,     0,     0,    -9,  1390,     0,  1291,  1135,  -501,
+  -480,  -519,   -39,     0,  1132,    31,   -77,  4022,   -19,    20,
+    10,   984,     0,  -100,   -76,   522,    32,     0,  1014,   429,
+  -833,  -782,     0,     0,   365,     0,     0,   371,     1,  -414,
+    55,  -396,    16,   993,  -296,  -493,   462,  2473,   -52,     0,
+  -181,  -383,  1557,  3148,  -292,   727,   114,  -540,     0,     0,
+     0,     0,   348, -1068,   384,  1037,   948,  -316,   259,  -773,
+   902,  -780,  -820,   757,   929,     0,    87,  -457,     0,  2821,
+     0,     0,     0,   577,     0,  -657,     0,   919,     0,   390,
+     0,  -968,   346, 25450,     0,  -491,  1317,     0,   -91,   289,
+   877,  2968,    -2,    -3,  1645,     0,    23,   -89,    33,  -455,
+  -128,   360,     0,     0,  -831,   191,     0,     0,   543,  -464,
+   109,     0,  -812,  -814,  -365,     0,    -1,   546,     0,     0,
+     0,  -680,     0,   540,     0,  -360,  -351,     0,  -427,     3,
+   -57,  -563,   264,  -579,  -510, -1189,  -775,  1996,  -324,   -74,
+     0,     0,  1654,     0, -1008,     0,  -171,   548,     0,     0,
+   912,  -188,     0,  -701,  1033,     0,     0,  -726,   843,  -320,
+     0,  1169,   776,     0,     0,     0,     0,     0,     0,   396,
+     0,   785,     0,     0,  1250,     0,     0,     0,     0,     0,
+   818,  -507,     0,     0,   149,  -676,   499,   372,   282,     0,
+   -30,    46,     0,     0,     0,     0,     0,   133,     0,     0,
+     0,     0,     0,     0,  1672,     0,  -221,     0,     0,     0,
+  -456,     0,     0,     0,   -81,     0,     0,     0,     0,   473,
+     0,     0,     0,     0,     0,     0,     0,     0,   -37,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,
     };
     protected static final int[] yyTable = YyTables.yyTable();
     protected static final int[] yyCheck = YyTables.yyCheck();
@@ -998,7 +1004,7 @@ public RubyParser(Ruby runtime, LexerSource source, DynamicScope scope, org.jrub
     "stmt : stmt modifier_rescue after_rescue stmt",
     "stmt : k_END allow_exits '{' compstmt '}'",
     "stmt : command_asgn",
-    "stmt : mlhs '=' lex_ctxt command_call",
+    "stmt : mlhs '=' lex_ctxt command_call_value",
     "stmt : lhs '=' lex_ctxt mrhs",
     "stmt : mlhs '=' lex_ctxt mrhs_arg modifier_rescue after_rescue stmt",
     "stmt : mlhs '=' lex_ctxt mrhs_arg",
@@ -1009,16 +1015,17 @@ public RubyParser(Ruby runtime, LexerSource source, DynamicScope scope, org.jrub
     "command_asgn : primary_value '[' opt_call_args rbracket tOP_ASGN lex_ctxt command_rhs",
     "command_asgn : primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt command_rhs",
     "command_asgn : primary_value call_op tCONSTANT tOP_ASGN lex_ctxt command_rhs",
-    "command_asgn : primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs",
     "command_asgn : primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt command_rhs",
+    "command_asgn : primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs",
+    "command_asgn : tCOLON3 tCONSTANT tOP_ASGN lex_ctxt command_rhs",
+    "command_asgn : backref tOP_ASGN lex_ctxt command_rhs",
     "command_asgn : defn_head f_opt_paren_args '=' endless_command",
     "command_asgn : defs_head f_opt_paren_args '=' endless_command",
-    "command_asgn : backref tOP_ASGN lex_ctxt command_rhs",
     "endless_command : command",
     "endless_command : endless_command modifier_rescue after_rescue arg",
     "endless_command : keyword_not opt_nl endless_command",
-    "command_rhs : command_call",
-    "command_rhs : command_call modifier_rescue after_rescue stmt",
+    "command_rhs : command_call_value",
+    "command_rhs : command_call_value modifier_rescue after_rescue stmt",
     "command_rhs : command_asgn",
     "expr : command_call",
     "expr : expr keyword_and expr",
@@ -1041,6 +1048,7 @@ public RubyParser(Ruby runtime, LexerSource source, DynamicScope scope, org.jrub
     "expr_value_do : $$10 expr_value do $$11",
     "command_call : command",
     "command_call : block_command",
+    "command_call_value : command_call",
     "block_command : block_call",
     "block_command : block_call call_op2 operation2 command_args",
     "cmd_brace_block : tLBRACE_ARG brace_body '}'",
@@ -1242,9 +1250,9 @@ public RubyParser(Ruby runtime, LexerSource source, DynamicScope scope, org.jrub
     "arg : arg tANDOP arg",
     "arg : arg tOROP arg",
     "arg : keyword_defined opt_nl begin_defined arg",
-    "arg : arg '?' arg opt_nl ':' arg",
     "arg : defn_head f_opt_paren_args '=' endless_arg",
     "arg : defs_head f_opt_paren_args '=' endless_arg",
+    "arg : arg '?' arg opt_nl ':' arg",
     "arg : primary",
     "endless_arg : arg",
     "endless_arg : endless_arg modifier_rescue after_rescue arg",
@@ -1276,6 +1284,8 @@ public RubyParser(Ruby runtime, LexerSource source, DynamicScope scope, org.jrub
     "opt_call_args : args ',' assocs ','",
     "opt_call_args : assocs ','",
     "call_args : command",
+    "call_args : defn_head f_opt_paren_args '=' endless_command",
+    "call_args : defs_head f_opt_paren_args '=' endless_command",
     "call_args : args opt_block_arg",
     "call_args : assocs opt_block_arg",
     "call_args : args ',' assocs opt_block_arg",
@@ -2004,7 +2014,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
     }
   }
 
-static ParserState<RubyParser>[] states = new ParserState[823];
+static ParserState<RubyParser>[] states = new ParserState[827];
 static {
 states[1] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                   p.setState(EXPR_BEG);
@@ -2253,7 +2263,6 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 };
 states[38] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
-                    p.value_expr(((Node)yyVals[0+yyTop].value));
                     yyVal = node_assign(((MultipleAsgnNode)yyVals[-3+yyTop].value), ((Node)yyVals[0+yyTop].value), ((LexContext)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: massign!($1, $4) %*/
@@ -2325,6 +2334,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[49] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    /*%%%*/
+                    p.value_expr(((Node)yyVals[0+yyTop].value));
+                    yyVal = p.new_attr_op_assign(((Node)yyVals[-5+yyTop].value), ((ByteList)yyVals[-4+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
+                    /*% %*/
+                    /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/
+  return yyVal;
+};
+states[50] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     int line = yyVals[yyTop - count + 1].start();
                     yyVal = p.new_const_op_assign(line, p.new_colon2(line, ((Node)yyVals[-5+yyTop].value), ((ByteList)yyVals[-3+yyTop].value)), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value), ((LexContext)yyVals[-1+yyTop].value));
@@ -2332,15 +2349,22 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/
   return yyVal;
 };
-states[50] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[51] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
-                    p.value_expr(((Node)yyVals[0+yyTop].value));
-                    yyVal = p.new_attr_op_assign(((Node)yyVals[-5+yyTop].value), ((ByteList)yyVals[-4+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
+                    Integer pos = p.src_line();
+                    yyVal = p.new_const_op_assign(pos, new Colon3Node(pos, p.symbolID(((ByteList)yyVals[-3+yyTop].value))), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value), ((LexContext)yyVals[-1+yyTop].value));
                     /*% %*/
-                    /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/
+                    /*% ripper: opassign!(top_const_field!($2), $3, $5) %*/
   return yyVal;
 };
-states[51] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[52] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    /*%%%*/
+                    p.backref_error(((Node)yyVals[-3+yyTop].value));
+                    /*% %*/
+                    /*% ripper[error]: backref_error(p, RNODE($1), assign!(var_field(p, $1), $4)) %*/
+  return yyVal;
+};
+states[53] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
                     p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
                     /*%%%*/
@@ -2351,7 +2375,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[52] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[54] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
                     p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
                     /*%%%*/
@@ -2361,14 +2385,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[53] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    /*%%%*/
-                    p.backref_error(((Node)yyVals[-3+yyTop].value));
-                    /*% %*/
-                    /*% ripper[error]: backref_error(p, RNODE($1), assign!(var_field(p, $1), $4)) %*/
-  return yyVal;
-};
-states[55] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[56] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_rescue = ((LexContext)yyVals[-1+yyTop].value).in_rescue;
                     /*%%%*/
                     yyVal = p.rescued_expr(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-3+yyTop].value), ((Node)yyVals[0+yyTop].value));
@@ -2376,17 +2393,17 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rescue_mod!($:1, $:4) %*/
   return yyVal;
 };
-states[56] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = p.call_uni_op(p.method_cond(((Node)yyVals[0+yyTop].value)), NOT);
+states[57] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    /*%%%/
+                    $$ = p.call_uni_op(p.method_cond($3), NOT);
                     /*% ripper: unary!(ID2VAL(idNOT), $:3) %*/
   return yyVal;
 };
-states[57] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    p.value_expr(((Node)yyVals[0+yyTop].value));
+states[58] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[58] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[59] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.getLexContext().in_rescue = ((LexContext)yyVals[-1+yyTop].value).in_rescue;
                     p.value_expr(((Node)yyVals[-3+yyTop].value));
@@ -2395,27 +2412,27 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rescue_mod!($1, $4) %*/
   return yyVal;
 };
-states[61] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[62] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.logop(((Node)yyVals[-2+yyTop].value), AND_KEYWORD, ((Node)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[62] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[63] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.logop(((Node)yyVals[-2+yyTop].value), OR_KEYWORD, ((Node)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[63] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[64] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((Node)yyVals[0+yyTop].value)), NOT);
   return yyVal;
 };
-states[64] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[65] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((Node)yyVals[0+yyTop].value)), BANG);
   return yyVal;
 };
-states[65] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[66] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((Node)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[66] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[67] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pvtbl(((Set)yyVals[-2+yyTop].value));
                     p.pop_pktbl(((Set)yyVals[-1+yyTop].value));
                     LexContext ctxt = p.getLexContext();
@@ -2426,11 +2443,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: case!($1, in!($7, Qnil, Qnil)) %*/
   return yyVal;
 };
-states[67] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[68] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((Node)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[68] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[69] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pvtbl(((Set)yyVals[-2+yyTop].value));
                     p.pop_pktbl(((Set)yyVals[-1+yyTop].value));
                     LexContext ctxt = p.getLexContext();
@@ -2441,7 +2458,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: case!($1, in!($7, Qnil, Qnil)) %*/
   return yyVal;
 };
-states[70] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[71] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pushLocalScope();
                     ByteList currentArg = p.getCurrentArg();
                     p.setCurrentArg(null);
@@ -2461,18 +2478,18 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.setCurrentArg(null);
   return yyVal;
 };
-states[71] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[72] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     ((DefHolder)yyVals[0+yyTop].value).line = yyVals[yyTop - count + 1].start();
                     yyVal = ((DefHolder)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[72] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[73] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_FNAME); 
                     LexContext ctxt = p.getLexContext();
                     ctxt.in_argdef = true;
   return yyVal;
 };
-states[73] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[74] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_ENDFN|EXPR_LABEL);
                     ((DefHolder)yyVals[0+yyTop].value).line = yyVals[yyTop - count + 1].start();
                     yyVal = ((DefHolder)yyVals[0+yyTop].value);
@@ -2485,49 +2502,54 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[74] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[75] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((Node)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[75] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[76] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.NEW_ERROR(yyVals[yyTop - count + 1]);
   return yyVal;
 };
-states[76] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[77] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getConditionState().push1();
   return yyVal;
 };
-states[77] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[78] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getConditionState().pop();
   return yyVal;
 };
-states[78] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[79] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[-2+yyTop].value);
                     /*% ripper: get_value($:2); %*/
   return yyVal;
 };
 states[82] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                       p.value_expr(((Node)yyVals[0+yyTop].value));
+                       yyVal = ((Node)yyVals[0+yyTop].value);
+  return yyVal;
+};
+states[84] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), null, yyVals[yyTop - count + 3].start());
                     /*% %*/
                     /*% ripper: method_add_arg!(call!($1, $2, $3), $4) %*/
   return yyVal;
 };
-states[83] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[85] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IterNode)yyVals[-1+yyTop].value);
                     /*%%%*/
                     /* FIXME: Missing loc stuff here.*/
                     /*% %*/
   return yyVal;
 };
-states[84] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[86] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_fcall(((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: $1 %*/
   return yyVal;
 };
-states[85] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[87] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.frobnicate_fcall_args(((FCallNode)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), null);
                     yyVal = ((FCallNode)yyVals[-1+yyTop].value);
@@ -2535,7 +2557,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: command!($1, $2) %*/
   return yyVal;
 };
-states[86] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[88] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.frobnicate_fcall_args(((FCallNode)yyVals[-2+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((IterNode)yyVals[0+yyTop].value));
                     yyVal = ((FCallNode)yyVals[-2+yyTop].value);
@@ -2543,200 +2565,200 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: method_add_block!(command!($1, $2), $3) %*/
   return yyVal;
 };
-states[87] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[89] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), null, yyVals[yyTop - count + 3].start());
                     /*% %*/
                     /*% ripper: command_call!($1, $2, $3, $4) %*/
   return yyVal;
 };
-states[88] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[90] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-4+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((IterNode)yyVals[0+yyTop].value), yyVals[yyTop - count + 3].start());
                     /*% %*/
                     /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/
   return yyVal;
 };
-states[89] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[91] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-3+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), null);
                     /*% %*/
                     /*% ripper: command_call!($1, ID2VAL(idCOLON2), $3, $4) %*/
   return yyVal;
 };
-states[90] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[92] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-4+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((IterNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: method_add_block!(command_call!($1, ID2VAL(idCOLON2), $3, $4), $5) %*/
   return yyVal;
 };
-states[91] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[93] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-5+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), null, ((IterNode)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: method_add_block!(command_call!($:1, $:2, $:3, Qnil), $:5) %*/
   return yyVal;
 };
-states[92] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[94] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_super(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: super!($2) %*/
   return yyVal;
 };
-states[93] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[95] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_yield(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: yield!($2) %*/
   return yyVal;
 };
-states[94] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[96] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ReturnNode(yyVals[yyTop - count + 1].start(), p.ret_args(((Node)yyVals[0+yyTop].value), yyVals[yyTop - count + 1].start()));
                     /*% %*/
                     /*% ripper: return!($2) %*/
   return yyVal;
 };
-states[95] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[97] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new BreakNode(yyVals[yyTop - count + 1].start(), p.ret_args(((Node)yyVals[0+yyTop].value), yyVals[yyTop - count + 1].start()));
                     /*% %*/
                     /*% ripper: break!($2) %*/
   return yyVal;
 };
-states[96] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[98] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new NextNode(yyVals[yyTop - count + 1].start(), p.ret_args(((Node)yyVals[0+yyTop].value), yyVals[yyTop - count + 1].start()));
                     /*% %*/
                     /*% ripper: next!($2) %*/
   return yyVal;
 };
-states[98] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[100] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((Node)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: mlhs_paren!($2) %*/
   return yyVal;
 };
-states[99] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[101] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((MultipleAsgnNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[100] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[102] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(((Integer)yyVals[-2+yyTop].value), p.newArrayNode(((Integer)yyVals[-2+yyTop].value), ((Node)yyVals[-1+yyTop].value)), null, null);
                     /*% %*/
                     /*% ripper: mlhs_paren!($2) %*/
   return yyVal;
 };
-states[101] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[103] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[0+yyTop].value), null, null);
                     /*% %*/
                     /*% ripper: $1 %*/
   return yyVal;
 };
-states[102] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[104] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-1+yyTop].value).add(((Node)yyVals[0+yyTop].value)), null, null);
                     /*% %*/
                     /*% ripper: mlhs_add!($1, $2) %*/
   return yyVal;
 };
-states[103] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[105] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value), (ListNode) null);
                     /*% %*/
                     /*% ripper: mlhs_add_star!($1, $3) %*/
   return yyVal;
 };
-states[104] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[106] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-4+yyTop].value), ((Node)yyVals[-2+yyTop].value), ((ListNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/
   return yyVal;
 };
-states[105] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[107] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-1+yyTop].value), new StarNode(p.src_line()), null);
                     /*% %*/
                     /*% ripper: mlhs_add_star!($1, Qnil) %*/
   return yyVal;
 };
-states[106] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[108] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-3+yyTop].value), new StarNode(p.src_line()), ((ListNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add_post!(mlhs_add_star!($1, Qnil), $4) %*/
   return yyVal;
 };
-states[107] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[109] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 2].start(), null, ((Node)yyVals[0+yyTop].value), null);
                     /*% %*/
                     /*% ripper: mlhs_add_star!(mlhs_new!, $2) %*/
   return yyVal;
 };
-states[108] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[110] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 2].start(), null, ((Node)yyVals[-2+yyTop].value), ((ListNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $2), $4) %*/
   return yyVal;
 };
-states[109] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[111] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(p.src_line(), null, new StarNode(p.src_line()), null);
                     /*% %*/
                     /*% ripper: mlhs_add_star!(mlhs_new!, Qnil) %*/
   return yyVal;
 };
-states[110] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[112] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(p.src_line(), null, new StarNode(p.src_line()), ((ListNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, Qnil), $3) %*/
   return yyVal;
 };
-states[112] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[114] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((Node)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: mlhs_paren!($2) %*/
   return yyVal;
 };
-states[113] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[115] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
   return yyVal;
 };
-states[114] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[116] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-2+yyTop].value).add(((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add!($1, $2) %*/
   return yyVal;
 };
-states[115] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[117] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
   return yyVal;
 };
-states[116] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[118] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-2+yyTop].value).add(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add!($1, $3) %*/
   return yyVal;
 };
-states[117] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[119] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                    yyVal = p.assignableLabelOrIdentifier(((ByteList)yyVals[0+yyTop].value), null);
                     /*%
@@ -2744,7 +2766,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[118] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[120] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                    yyVal = new InstAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -2752,7 +2774,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[119] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[121] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                    yyVal = new GlobalAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -2760,7 +2782,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[120] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[122] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (p.getLexContext().in_def) p.compile_error("dynamic constant assignment");
                     yyVal = new ConstDeclNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), null, NilImplicitNode.NIL);
@@ -2769,7 +2791,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[121] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[123] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ClassVarAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -2777,7 +2799,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[122] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[124] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to nil");
                     yyVal = null;
@@ -2786,7 +2808,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[123] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[125] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't change the value of self");
                     yyVal = null;
@@ -2795,7 +2817,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[124] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[126] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to true");
                     yyVal = null;
@@ -2804,7 +2826,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[125] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[127] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to false");
                     yyVal = null;
@@ -2813,7 +2835,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[126] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[128] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __FILE__");
                     yyVal = null;
@@ -2822,7 +2844,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[127] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[129] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __LINE__");
                     yyVal = null;
@@ -2831,7 +2853,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[128] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[130] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __ENCODING__");
                     yyVal = null;
@@ -2840,14 +2862,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[129] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[131] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.aryset(((Node)yyVals[-3+yyTop].value), ((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: aref_field!($1, escape_Qundef($3)) %*/
   return yyVal;
 };
-states[130] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[132] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (((ByteList)yyVals[-1+yyTop].value) == AMPERSAND_DOT) {
                         p.compile_error("&. inside multiple assignment destination");
                     }
@@ -2857,14 +2879,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: field!($1, $2, $3) %*/
   return yyVal;
 };
-states[131] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[133] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.attrset(((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: const_path_field!($1, $3) %*/
   return yyVal;
 };
-states[132] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[134] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (((ByteList)yyVals[-1+yyTop].value) == AMPERSAND_DOT) {
                         p.compile_error("&. inside multiple assignment destination");
                     }
@@ -2874,7 +2896,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: field!($1, $2, $3) %*/
   return yyVal;
 };
-states[133] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[135] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (p.getLexContext().in_def) p.yyerror("dynamic constant assignment");
 
@@ -2885,7 +2907,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/
   return yyVal;
 };
-states[134] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[136] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (p.getLexContext().in_def) {
                         p.yyerror("dynamic constant assignment");
@@ -2898,14 +2920,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: const_decl(p, top_const_field!($2)) %*/
   return yyVal;
 };
-states[135] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[137] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.backref_error(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper[error]: backref_error(p, RNODE($1), var_field(p, $1)) %*/
   return yyVal;
 };
-states[136] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[138] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.assignableLabelOrIdentifier(((ByteList)yyVals[0+yyTop].value), null);
                     /*%
@@ -2914,7 +2936,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     
   return yyVal;
 };
-states[137] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[139] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new InstAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -2922,7 +2944,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[138] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[140] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new GlobalAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -2930,7 +2952,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[139] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[141] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (p.getLexContext().in_def) p.compile_error("dynamic constant assignment");
 
@@ -2940,7 +2962,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[140] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[142] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ClassVarAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -2948,7 +2970,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[141] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[143] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to nil");
                     yyVal = null;
@@ -2957,7 +2979,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[142] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[144] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't change the value of self");
                     yyVal = null;
@@ -2966,7 +2988,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[143] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[145] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to true");
                     yyVal = null;
@@ -2975,7 +2997,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[144] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[146] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to false");
                     yyVal = null;
@@ -2984,7 +3006,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[145] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[147] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __FILE__");
                     yyVal = null;
@@ -2993,7 +3015,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[146] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[148] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __LINE__");
                     yyVal = null;
@@ -3002,7 +3024,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[147] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[149] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __ENCODING__");
                     yyVal = null;
@@ -3011,56 +3033,56 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[148] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[150] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.aryset(((Node)yyVals[-3+yyTop].value), ((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: aref_field!($1, escape_Qundef($3)) %*/
   return yyVal;
 };
-states[149] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[151] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.attrset(((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: field!($1, $2, $3) %*/
   return yyVal;
 };
-states[150] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[152] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.attrset(((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: field!($1, ID2VAL(idCOLON2), $3) %*/
   return yyVal;
 };
-states[151] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[153] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.attrset(((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: field!($1, $2, $3) %*/
   return yyVal;
 };
-states[152] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[154] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ConstDeclNode(yyVals[yyTop - count + 1].start(), (RubySymbol) null, p.new_colon2(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*% %*/
                     /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/
   return yyVal;
 };
-states[153] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[155] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ConstDeclNode(yyVals[yyTop - count + 1].start(), (RubySymbol) null, p.new_colon3(yyVals[yyTop - count + 1].start(), ((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*% %*/
                     /*% ripper: const_decl(p, top_const_field!($2)) %*/
   return yyVal;
 };
-states[154] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[156] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.backref_error(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper[error]: backref_error(p, RNODE($1), var_field(p, $1)) %*/
   return yyVal;
 };
-states[155] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[157] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "class/module name must be CONSTANT";
                     /*%%%*/
                     p.yyerror(message, yyVals[yyTop - count + 1]);
@@ -3068,53 +3090,53 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper[error]: class_name_error!(ERR_MESG(), $1) %*/
   return yyVal;
 };
-states[156] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[158] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[157] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[159] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_colon3(yyVals[yyTop - count + 1].start(), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: top_const_ref!($2) %*/
   return yyVal;
 };
-states[158] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[160] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_colon2(yyVals[yyTop - count + 1].start(), null, ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: const_ref!($1) %*/
   return yyVal;
 };
-states[159] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[161] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_colon2(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: const_path_ref!($1, $3) %*/
   return yyVal;
 };
-states[160] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[162] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[161] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[163] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[162] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[164] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[163] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[165] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    p.setState(EXPR_ENDFN);
                    yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[164] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[166] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[165] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[167] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal =  new LiteralNode(p.src_line(), p.symbolID(((ByteList)yyVals[0+yyTop].value)));
                     /*% %*/
@@ -3122,36 +3144,28 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[166] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[168] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[167] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[169] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = newUndef(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[168] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[170] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_FNAME|EXPR_FITEM);
   return yyVal;
 };
-states[169] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[171] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.appendToBlock(((Node)yyVals[-3+yyTop].value), newUndef(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value)));
                     /*% %*/
                     /*% ripper: rb_ary_push($1, get_value($4)) %*/
   return yyVal;
 };
-states[170] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                     yyVal = ((ByteList)yyVals[0+yyTop].value);
-  return yyVal;
-};
-states[171] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                     yyVal = ((ByteList)yyVals[0+yyTop].value);
-  return yyVal;
-};
 states[172] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
@@ -3265,11 +3279,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[200] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((ByteList)yyVals[0+yyTop].value);
+                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
 states[201] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((ByteList)yyVals[0+yyTop].value);
+                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
 states[202] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
@@ -3345,7 +3359,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[220] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = yyVals[0+yyTop].value;
+                    yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
 states[221] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
@@ -3353,7 +3367,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[222] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((ByteList)yyVals[0+yyTop].value);
+                    yyVal = yyVals[0+yyTop].value;
   return yyVal;
 };
 states[223] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
@@ -3429,27 +3443,35 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   return yyVal;
 };
 states[241] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    yyVal = ((ByteList)yyVals[0+yyTop].value);
+  return yyVal;
+};
+states[242] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    yyVal = ((ByteList)yyVals[0+yyTop].value);
+  return yyVal;
+};
+states[243] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = node_assign(((Node)yyVals[-3+yyTop].value), ((Node)yyVals[0+yyTop].value), ((LexContext)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: assign!($1, $4) %*/
   return yyVal;
 };
-states[242] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[244] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_op_assign(((AssignableNode)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value), ((LexContext)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: opassign!($1, $2, $4) %*/
   return yyVal;
 };
-states[243] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[245] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_ary_op_assign(((Node)yyVals[-6+yyTop].value), ((Node)yyVals[-4+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $7) %*/
   return yyVal;
 };
-states[244] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[246] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
 
                     yyVal = p.new_attr_op_assign(((Node)yyVals[-5+yyTop].value), ((ByteList)yyVals[-4+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
@@ -3457,7 +3479,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
   return yyVal;
 };
-states[245] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[247] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     yyVal = p.new_attr_op_assign(((Node)yyVals[-5+yyTop].value), ((ByteList)yyVals[-4+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
@@ -3465,14 +3487,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
   return yyVal;
 };
-states[246] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[248] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_attr_op_assign(((Node)yyVals[-5+yyTop].value), ((ByteList)yyVals[-4+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/
   return yyVal;
 };
-states[247] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[249] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Integer pos = yyVals[yyTop - count + 1].start();
                     yyVal = p.new_const_op_assign(pos, p.new_colon2(pos, ((Node)yyVals[-5+yyTop].value), ((ByteList)yyVals[-3+yyTop].value)), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value), ((LexContext)yyVals[-1+yyTop].value));
@@ -3480,7 +3502,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/
   return yyVal;
 };
-states[248] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[250] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Integer pos = p.src_line();
                     yyVal = p.new_const_op_assign(pos, new Colon3Node(pos, p.symbolID(((ByteList)yyVals[-3+yyTop].value))), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value), ((LexContext)yyVals[-1+yyTop].value));
@@ -3488,14 +3510,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: opassign!(top_const_field!($2), $3, $5) %*/
   return yyVal;
 };
-states[249] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[251] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.backref_error(((Node)yyVals[-3+yyTop].value));
                     /*% %*/
                     /*% ripper[error]: backref_error(p, RNODE($1), opassign!(var_field(p, $1), $2, $4)) %*/
   return yyVal;
 };
-states[250] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[252] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-2+yyTop].value));
                     p.value_expr(((Node)yyVals[0+yyTop].value));
@@ -3506,7 +3528,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot2!($1, $3) %*/
   return yyVal;
 };
-states[251] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[253] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-2+yyTop].value));
                     p.value_expr(((Node)yyVals[0+yyTop].value));
@@ -3517,7 +3539,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot3!($1, $3) %*/
   return yyVal;
 };
-states[252] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[254] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-1+yyTop].value));
 
@@ -3527,7 +3549,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot2!($1, Qnil) %*/
   return yyVal;
 };
-states[253] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[255] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-1+yyTop].value));
 
@@ -3537,7 +3559,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot3!($1, Qnil) %*/
   return yyVal;
 };
-states[254] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[256] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     boolean isLiteral = ((Node)yyVals[0+yyTop].value) instanceof FixnumNode;
@@ -3546,7 +3568,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot2!(Qnil, $2) %*/
   return yyVal;
 };
-states[255] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[257] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     boolean isLiteral = ((Node)yyVals[0+yyTop].value) instanceof FixnumNode;
@@ -3555,120 +3577,112 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot3!(Qnil, $2) %*/
   return yyVal;
 };
-states[256] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[258] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), PLUS, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[257] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[259] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), MINUS, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[258] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[260] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), STAR, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[259] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[261] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), SLASH, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[260] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[262] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), PERCENT, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[261] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[263] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), STAR_STAR, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[262] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[264] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.call_bin_op(((NumericNode)yyVals[-2+yyTop].value), STAR_STAR, ((Node)yyVals[0+yyTop].value), p.src_line()), MINUS_AT);
   return yyVal;
 };
-states[263] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[265] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(((Node)yyVals[0+yyTop].value), PLUS_AT);
   return yyVal;
 };
-states[264] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[266] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(((Node)yyVals[0+yyTop].value), MINUS_AT);
   return yyVal;
 };
-states[265] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[267] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), OR, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[266] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[268] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), CARET, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[267] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[269] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), AMPERSAND, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[268] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[270] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), LT_EQ_RT, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[269] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[271] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[270] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[272] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), EQ_EQ, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[271] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[273] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), EQ_EQ_EQ, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[272] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[274] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), BANG_EQ, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[273] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[275] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.match_op(((Node)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[274] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[276] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), BANG_TILDE, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[275] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[277] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((Node)yyVals[0+yyTop].value)), BANG);
   return yyVal;
 };
-states[276] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[278] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(((Node)yyVals[0+yyTop].value), TILDE);
   return yyVal;
 };
-states[277] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[279] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), LT_LT, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[278] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[280] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), GT_GT, ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[279] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[281] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.logop(((Node)yyVals[-2+yyTop].value), AMPERSAND_AMPERSAND, ((Node)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[280] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[282] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.logop(((Node)yyVals[-2+yyTop].value), OR_OR, ((Node)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[281] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[283] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_defined = false;                    
                     yyVal = p.new_defined(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[282] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    /*%%%*/
-                    p.value_expr(((Node)yyVals[-5+yyTop].value));
-                    yyVal = p.new_if(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-5+yyTop].value), ((Node)yyVals[-3+yyTop].value), ((Node)yyVals[0+yyTop].value));
-                    /*% %*/
-                    /*% ripper: ifop!($1, $3, $6) %*/
-  return yyVal;
-};
-states[283] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[284] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
                     p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
                     /*%%%*/
@@ -3680,7 +3694,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[284] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[285] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
                     p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
                     /*%%%*/
@@ -3691,11 +3705,19 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[285] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
-                    yyVal = ((Node)yyVals[0+yyTop].value);
+states[286] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    /*%%%*/
+                    p.value_expr(((Node)yyVals[-5+yyTop].value));
+                    yyVal = p.new_if(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-5+yyTop].value), ((Node)yyVals[-3+yyTop].value), ((Node)yyVals[0+yyTop].value));
+                    /*% %*/
+                    /*% ripper: ifop!($1, $3, $6) %*/
   return yyVal;
 };
 states[287] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    yyVal = ((Node)yyVals[0+yyTop].value);
+  return yyVal;
+};
+states[289] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_rescue = ((LexContext)yyVals[-1+yyTop].value).in_rescue;
                     /*%%%*/
                     yyVal = p.rescued_expr(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-3+yyTop].value), ((Node)yyVals[0+yyTop].value));
@@ -3703,79 +3725,79 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rescue_mod!($:1, $:4) %*/
   return yyVal;
 };
-states[288] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[290] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((Node)yyVals[0+yyTop].value)), NOT);
                     /*% ripper: unary!(ID2VAL(idNOT), $:3) %*/
   return yyVal;
 };
-states[289] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[291] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = GT;
   return yyVal;
 };
-states[290] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[292] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = LT;
   return yyVal;
 };
-states[291] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[293] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = GT_EQ;
   return yyVal;
 };
-states[292] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[294] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = LT_EQ;
   return yyVal;
 };
-states[293] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[295] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[294] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[296] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.warning(p.src_line(), "comparison '" + ((ByteList)yyVals[-1+yyTop].value) + "' after comparison");
                     yyVal = p.call_bin_op(((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), p.src_line());
   return yyVal;
 };
-states[295] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[297] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = (LexContext) p.getLexContext().clone();
   return yyVal;
 };
-states[296] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[298] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_defined = true;
                     yyVal = ((LexContext)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[297] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[299] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_rescue = LexContext.InRescue.AFTER_RESCUE;
                     yyVal = ((LexContext)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[298] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[300] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     yyVal = p.makeNullNil(((Node)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[300] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[302] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[301] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[303] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.arg_append(((Node)yyVals[-3+yyTop].value), p.remove_duplicate_keys(((HashNode)yyVals[-1+yyTop].value)));
                     /*% %*/
                     /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/
   return yyVal;
 };
-states[302] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[304] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), p.remove_duplicate_keys(((HashNode)yyVals[-1+yyTop].value)));
                     /*% %*/
                     /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/
   return yyVal;
 };
-states[303] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[305] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[304] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[306] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_rescue = ((LexContext)yyVals[-1+yyTop].value).in_rescue;
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-3+yyTop].value));
@@ -3784,14 +3806,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rescue_mod!($1, $4) %*/
   return yyVal;
 };
-states[305] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[307] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((Node)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: arg_paren!(escape_Qundef($2)) %*/
   return yyVal;
 };
-states[306] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[308] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (!p.check_forwarding_args()) {
                         yyVal = null;
                     } else {
@@ -3802,7 +3824,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     }
   return yyVal;
 };
-states[307] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[309] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (!p.check_forwarding_args()) {
                         yyVal = null;
                     } else {
@@ -3813,25 +3835,25 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     }
   return yyVal;
 };
-states[312] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[314] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[313] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[315] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.arg_append(((Node)yyVals[-3+yyTop].value), p.remove_duplicate_keys(((HashNode)yyVals[-1+yyTop].value)));
                     /*% %*/
                     /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/
   return yyVal;
 };
-states[314] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[316] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), p.remove_duplicate_keys(((HashNode)yyVals[-1+yyTop].value)));
                     /*% %*/
                     /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/
   return yyVal;
 };
-states[315] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[317] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
@@ -3839,14 +3861,37 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: args_add!(args_new!, $1) %*/
   return yyVal;
 };
-states[316] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[318] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
+                    p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
+                    /*%%%*/
+                    yyVal = new DefnNode(((DefHolder)yyVals[-3+yyTop].value).line, ((DefHolder)yyVals[-3+yyTop].value).name, ((ArgsNode)yyVals[-2+yyTop].value), p.getCurrentScope(), p.reduce_nodes(p.remove_begin(((Node)yyVals[0+yyTop].value))), yyVals[yyTop - count + 4].end());
+                    if (p.isNextBreak) ((DefnNode)yyVal).setContainsNextBreak();
+                    /* Changed from MRI (combined two stmts)*/
+                    /*% %*/
+                    /*% ripper: def!(get_value($1), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
+                    p.popCurrentScope();
+  return yyVal;
+};
+states[319] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+                    p.endless_method_name(((DefHolder)yyVals[-3+yyTop].value), yyVals[yyTop - count + 1]);
+                    p.restore_defun(((DefHolder)yyVals[-3+yyTop].value));
+                    /*%%%*/
+                    yyVal = new DefsNode(((DefHolder)yyVals[-3+yyTop].value).line, (Node) ((DefHolder)yyVals[-3+yyTop].value).singleton, ((DefHolder)yyVals[-3+yyTop].value).name, ((ArgsNode)yyVals[-2+yyTop].value), p.getCurrentScope(), p.reduce_nodes(p.remove_begin(((Node)yyVals[0+yyTop].value))), yyVals[yyTop - count + 4].end());
+                    if (p.isNextBreak) ((DefsNode)yyVal).setContainsNextBreak();
+                    /*% %*/
+                    /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
+                    p.popCurrentScope();
+  return yyVal;
+};
+states[320] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = arg_blk_pass(((Node)yyVals[-1+yyTop].value), ((BlockPassNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: args_add_block!($1, $2) %*/
   return yyVal;
 };
-states[317] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[321] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), p.remove_duplicate_keys(((HashNode)yyVals[-1+yyTop].value)));
                     yyVal = arg_blk_pass(((Node)yyVal), ((BlockPassNode)yyVals[0+yyTop].value));
@@ -3854,7 +3899,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: args_add_block!(args_add!(args_new!, bare_assoc_hash!($1)), $2) %*/
   return yyVal;
 };
-states[318] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[322] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.arg_append(((Node)yyVals[-3+yyTop].value), p.remove_duplicate_keys(((HashNode)yyVals[-1+yyTop].value)));
                     yyVal = arg_blk_pass(((Node)yyVal), ((BlockPassNode)yyVals[0+yyTop].value));
@@ -3862,11 +3907,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: args_add_block!(args_add!($1, bare_assoc_hash!($3)), $4) %*/
   return yyVal;
 };
-states[319] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[323] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*% ripper[brace]: args_add_block!(args_new!, $1) %*/
   return yyVal;
 };
-states[320] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[324] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     boolean lookahead = false;
                     switch (yychar) {
                     case '(': case tLPAREN: case tLPAREN_ARG: case '[': case tLBRACK:
@@ -3878,7 +3923,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     if (lookahead) cmdarg.push0();
   return yyVal;
 };
-states[321] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[325] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     StackState cmdarg = p.getCmdArgumentState();
                     boolean lookahead = false;
                     switch (yychar) {
@@ -3892,14 +3937,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[322] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[326] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new BlockPassNode(yyVals[yyTop - count + 2].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: $2 %*/
   return yyVal;
 };
-states[323] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[327] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (!p.local_id(ANON_BLOCK)) p.compile_error("no anonymous block parameter");
                     yyVal = new BlockPassNode(yyVals[yyTop - count + 1].start(), p.arg_var(ANON_BLOCK));
@@ -3909,11 +3954,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[324] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[328] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((BlockPassNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[325] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[329] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = null;
                     /* Changed from MRI*/
@@ -3922,7 +3967,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[326] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[330] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     int line = ((Node)yyVals[0+yyTop].value) instanceof NilImplicitNode ? p.src_line() : yyVals[yyTop - count + 1].start();
                     yyVal = p.newArrayNode(line, ((Node)yyVals[0+yyTop].value));
@@ -3930,14 +3975,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: args_add!(args_new!, $1) %*/
   return yyVal;
 };
-states[327] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[331] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newSplatNode(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: args_add_star!(args_new!, $1) %*/
   return yyVal;
 };
-states[328] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[332] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node node = p.splat_array(((Node)yyVals[-2+yyTop].value));
 
@@ -3950,19 +3995,19 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: args_add!($1, $3) %*/
   return yyVal;
 };
-states[329] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[333] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.rest_arg_append(((Node)yyVals[-2+yyTop].value), p.newSplatNode(((Node)yyVals[0+yyTop].value)));
                     /*% %*/
                     /*% ripper: args_add_star!($1, $3) %*/
   return yyVal;
 };
-states[330] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[334] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
                     /*% ripper: get_value($2); %*/
   return yyVal;
 };
-states[331] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[335] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.forwarding_arg_check(FWD_REST, FWD_ALL, "rest");
                     yyVal = p.declareIdentifier(FWD_REST);
@@ -3970,15 +4015,15 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: Qnil %*/
   return yyVal;
 };
-states[332] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[336] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[333] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[337] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[334] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[338] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
 
                     Node node = p.splat_array(((Node)yyVals[-2+yyTop].value));
@@ -3992,7 +4037,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: mrhs_add!(mrhs_new_from_args!($1), $3) %*/
   return yyVal;
 };
-states[335] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[339] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node node = null;
 
@@ -4006,41 +4051,41 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: mrhs_add_star!(mrhs_new_from_args!($1), $4) %*/
   return yyVal;
 };
-states[336] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[340] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newSplatNode(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mrhs_add_star!(mrhs_new!, $2) %*/
   return yyVal;
 };
-states[341] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[345] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((ListNode)yyVals[0+yyTop].value); /* FIXME: Why complaining without $$ = $1;*/
   return yyVal;
 };
-states[342] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[346] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((ListNode)yyVals[0+yyTop].value); /* FIXME: Why complaining without $$ = $1;*/
   return yyVal;
 };
-states[343] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[347] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((ListNode)yyVals[0+yyTop].value); /* FIXME: Why complaining without $$ = $1;*/
   return yyVal;
 };
-states[344] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[348] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((ListNode)yyVals[0+yyTop].value); /* FIXME: Why complaining without $$ = $1;*/
   return yyVal;
 };
-states[347] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[351] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_fcall(((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: method_add_arg!(fcall!($1), args_new!) %*/
   return yyVal;
 };
-states[348] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[352] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getCmdArgumentState().push0();
   return yyVal;
 };
-states[349] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[353] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getCmdArgumentState().pop();
                     /*%%%*/
                     yyVal = new BeginNode(yyVals[yyTop - count + 1].start(), p.makeNullNil(((Node)yyVals[-1+yyTop].value)));
@@ -4048,18 +4093,18 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: begin!($3) %*/
   return yyVal;
 };
-states[350] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[354] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_ENDARG); 
   return yyVal;
 };
-states[351] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[355] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((Node)yyVals[-2+yyTop].value);
                     /*% %*/
                     /*% ripper: paren!($2) %*/
   return yyVal;
 };
-states[352] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[356] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (((Node)yyVals[-1+yyTop].value) != null) {
                         /* compstmt position includes both parens around it*/
@@ -4072,21 +4117,21 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: paren!($2) %*/
   return yyVal;
 };
-states[353] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[357] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_colon2(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: const_path_ref!($1, $3) %*/
   return yyVal;
 };
-states[354] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[358] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_colon3(yyVals[yyTop - count + 1].start(), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: top_const_ref!($2) %*/
   return yyVal;
 };
-states[355] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[359] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Integer position = yyVals[yyTop - count + 2].start();
                     if (((Node)yyVals[-1+yyTop].value) == null) {
@@ -4098,7 +4143,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: array!(escape_Qundef($2)) %*/
   return yyVal;
 };
-states[356] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[360] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((HashNode)yyVals[-1+yyTop].value);
                     ((HashNode)yyVal).setIsLiteral();
@@ -4106,48 +4151,48 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: hash!(escape_Qundef($2)) %*/
   return yyVal;
 };
-states[357] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[361] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ReturnNode(yyVals[yyTop - count + 1].start(), NilImplicitNode.NIL);
                     /*% %*/
                     /*% ripper: return0! %*/
   return yyVal;
 };
-states[358] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[362] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_yield(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: yield!(paren!($3)) %*/
   return yyVal;
 };
-states[359] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[363] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new YieldNode(yyVals[yyTop - count + 1].start(), null);
                     /*% %*/
                     /*% ripper: yield!(paren!(args_new!)) %*/
   return yyVal;
 };
-states[360] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[364] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new YieldNode(yyVals[yyTop - count + 1].start(), null);
                     /*% %*/
                     /*% ripper: yield0! %*/
   return yyVal;
 };
-states[361] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[365] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_defined = false;
                     yyVal = p.new_defined(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[362] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[366] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(((Node)yyVals[-1+yyTop].value)), NOT);
   return yyVal;
 };
-states[363] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[367] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.call_uni_op(p.method_cond(p.nil()), NOT);
   return yyVal;
 };
-states[364] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[368] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.frobnicate_fcall_args(((FCallNode)yyVals[-1+yyTop].value), null, ((IterNode)yyVals[0+yyTop].value));
                     yyVal = ((FCallNode)yyVals[-1+yyTop].value);                    
@@ -4155,7 +4200,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: method_add_block!(method_add_arg!(fcall!($1), args_new!), $2) %*/
   return yyVal;
 };
-states[366] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[370] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (((Node)yyVals[-1+yyTop].value) != null && 
                           ((BlockAcceptingNode)yyVals[-1+yyTop].value).getIterNode() instanceof BlockPassNode) {
@@ -4167,44 +4212,44 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: method_add_block!($1, $2) %*/
   return yyVal;
 };
-states[367] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[371] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((LambdaNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[368] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[372] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_if(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-4+yyTop].value), ((Node)yyVals[-2+yyTop].value), ((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: if!($2, $4, escape_Qundef($5)) %*/
   return yyVal;
 };
-states[369] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[373] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_if(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-4+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((Node)yyVals[-2+yyTop].value));
                     /*% %*/
                     /*% ripper: unless!($2, $4, escape_Qundef($5)) %*/
   return yyVal;
 };
-states[370] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[374] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new WhileNode(yyVals[yyTop - count + 1].start(), p.cond(((Node)yyVals[-2+yyTop].value)), p.makeNullNil(((Node)yyVals[-1+yyTop].value)));
                     /*% %*/
                     /*% ripper: while!($2, $3) %*/
   return yyVal;
 };
-states[371] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[375] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new UntilNode(yyVals[yyTop - count + 1].start(), p.cond(((Node)yyVals[-2+yyTop].value)), p.makeNullNil(((Node)yyVals[-1+yyTop].value)));
                     /*% %*/
                     /*% ripper: until!($2, $3) %*/
   return yyVal;
 };
-states[372] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[376] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.case_labels;
                     p.case_labels = p.getRuntime().getNil();
   return yyVal;
 };
-states[373] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[377] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newCaseNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-4+yyTop].value), ((Node)yyVals[-1+yyTop].value));
                     p.fixpos(((Node)yyVal), ((Node)yyVals[-4+yyTop].value));
@@ -4212,37 +4257,37 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: case!($2, $5) %*/
   return yyVal;
 };
-states[374] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[378] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.case_labels;
                     p.case_labels = null;
   return yyVal;
 };
-states[375] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[379] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newCaseNode(yyVals[yyTop - count + 1].start(), null, ((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: case!(Qnil, $4) %*/
   return yyVal;
 };
-states[376] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[380] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newPatternCaseNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-3+yyTop].value), ((InNode)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: case!($2, $4) %*/
   return yyVal;
 };
-states[377] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[381] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ForNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-4+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((Node)yyVals[-2+yyTop].value), p.getCurrentScope(), 111);
                     /*% %*/
                     /*% ripper: for!($2, $4, $5) %*/
   return yyVal;
 };
-states[378] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[382] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.begin_definition("class");
   return yyVal;
 };
-states[379] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[383] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node body = p.makeNullNil(((Node)yyVals[-1+yyTop].value));
 
@@ -4256,11 +4301,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     ctxt.shareable_constant_value = ((LexContext)yyVals[-5+yyTop].value).shareable_constant_value;
   return yyVal;
 };
-states[380] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[384] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.begin_definition(null);
   return yyVal;
 };
-states[381] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[385] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node body = p.makeNullNil(((Node)yyVals[-1+yyTop].value));
 
@@ -4275,11 +4320,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[382] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[386] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.begin_definition("module");
   return yyVal;
 };
-states[383] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[387] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node body = p.makeNullNil(((Node)yyVals[-1+yyTop].value));
 
@@ -4293,11 +4338,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     ctxt.shareable_constant_value = ((LexContext)yyVals[-4+yyTop].value).shareable_constant_value;
   return yyVal;
 };
-states[384] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[388] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
   return yyVal;
 };
-states[385] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[389] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.restore_defun(((DefHolder)yyVals[-4+yyTop].value));
                     /*%%%*/
                     Node body = p.reduce_nodes(p.remove_begin(p.makeNullNil(((Node)yyVals[-1+yyTop].value))));
@@ -4308,11 +4353,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[386] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[390] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
   return yyVal;
 };
-states[387] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[391] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.restore_defun(((DefHolder)yyVals[-4+yyTop].value));
                     /*%%%*/
                     Node body = p.reduce_nodes(p.remove_begin(p.makeNullNil(((Node)yyVals[-1+yyTop].value))));
@@ -4324,7 +4369,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[388] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[392] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.isNextBreak = true;
                     yyVal = new BreakNode(yyVals[yyTop - count + 1].start(), NilImplicitNode.NIL);
@@ -4332,7 +4377,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: break!(args_new!) %*/
   return yyVal;
 };
-states[389] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[393] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.isNextBreak = true;
                     yyVal = new NextNode(yyVals[yyTop - count + 1].start(), NilImplicitNode.NIL);
@@ -4340,14 +4385,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: next!(args_new!) %*/
   return yyVal;
 };
-states[390] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[394] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new RedoNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: redo! %*/
   return yyVal;
 };
-states[391] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[395] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (!p.getLexContext().in_defined) {
                         LexContext.InRescue rescue = p.getLexContext().in_rescue;
@@ -4365,18 +4410,18 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: retry! %*/
   return yyVal;
 };
-states[392] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[396] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     yyVal = ((Node)yyVals[0+yyTop].value) == null ? p.nil() : ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[393] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[397] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.token_info_push("begin", yyVals[yyTop - count + 1]);
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[394] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[398] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
                     p.WARN_EOL("if");
                     p.token_info_push("if", yyVals[yyTop - count + 1]);
@@ -4388,111 +4433,111 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                       }*/
   return yyVal;
 };
-states[395] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[399] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[396] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[400] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((NodeExits)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[397] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[401] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[398] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[402] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[399] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[403] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((NodeExits)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[400] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[404] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = (LexContext) p.getLexContext().clone();
                     p.getLexContext().in_rescue = LexContext.InRescue.BEFORE_RESCUE;
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
   return yyVal;
 };
-states[401] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[405] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = (LexContext) p.getLexContext().clone();  
                     p.getLexContext().in_rescue = LexContext.InRescue.BEFORE_RESCUE;
   return yyVal;
 };
-states[402] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[406] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
                     p.getLexContext().in_argdef = true;
   return yyVal;
 };
-states[403] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[407] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[404] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[408] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[405] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[409] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getLexContext().clone();
                     p.getLexContext().in_rescue = LexContext.InRescue.AFTER_RESCUE;
   return yyVal;
 };
-states[406] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[410] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getLexContext().clone();
   return yyVal;
 };
-states[407] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[411] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[408] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[412] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[409] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[413] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[410] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[414] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[411] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[415] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.compile_error("syntax error, unexpected end-of-input");
   return yyVal;
 };
-states[412] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[416] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     LexContext ctxt = p.getLexContext();
                     if (ctxt.cant_return && !p.dyna_in_block()) {
                         p.compile_error("Invalid return in class/module body");
                     }
   return yyVal;
 };
-states[413] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[417] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     LexContext ctxt = p.getLexContext();
                     if (ctxt.in_defined && !ctxt.in_def && !p.isEval()) {
                         p.compile_error("Invalid yield");
                     }
   return yyVal;
 };
-states[420] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[424] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_if(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-3+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: elsif!($2, $4, escape_Qundef($5)) %*/
   return yyVal;
 };
-states[422] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[426] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((Node)yyVals[0+yyTop].value) == null ? NilImplicitNode.NIL : ((Node)yyVals[0+yyTop].value);
                     /*% %*/
                     /*% ripper: else!($2) %*/
   return yyVal;
 };
-states[424] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[428] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
   return yyVal;
 };
-states[425] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[429] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.assignableInCurr(((ByteList)yyVals[0+yyTop].value), NilImplicitNode.NIL);
                     /*%
@@ -4500,63 +4545,63 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[426] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[430] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((Node)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: mlhs_paren!($2) %*/
   return yyVal;
 };
-states[427] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[431] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
   return yyVal;
 };
-states[428] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[432] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-2+yyTop].value).add(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add!($1, $3) %*/
   return yyVal;
 };
-states[429] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[433] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[0+yyTop].value), null, null);
                     /*% %*/
                     /*% ripper: $1 %*/
   return yyVal;
 };
-states[430] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[434] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value), null);
                     /*% %*/
                     /*% ripper: mlhs_add_star!($1, $3) %*/
   return yyVal;
 };
-states[431] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[435] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-4+yyTop].value), ((Node)yyVals[-2+yyTop].value), ((ListNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/
   return yyVal;
 };
-states[432] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[436] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(p.src_line(), null, ((Node)yyVals[0+yyTop].value), null);
                     /*% %*/
                     /*% ripper: mlhs_add_star!(mlhs_new!, $1) %*/
   return yyVal;
 };
-states[433] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[437] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new MultipleAsgnNode(p.src_line(), null, ((Node)yyVals[-2+yyTop].value), ((ListNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $1), $3) %*/
   return yyVal;
 };
-states[434] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[438] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     ByteList id = yyVals[yyTop - count + 2].id;
                     /*%%%*/
                     yyVal = p.assignableInCurr(id, null);
@@ -4565,14 +4610,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[435] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[439] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new StarNode(p.src_line());
                     /*% %*/
                     /*% ripper: Qnil %*/
   return yyVal;
 };
-states[437] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[441] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
                     /*%
@@ -4580,102 +4625,102 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                       %*/
   return yyVal;
 };
-states[438] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[442] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = false;
   return yyVal;
 };
-states[440] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[444] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-3+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((BlockArgNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[441] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[445] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-1+yyTop].value), (ByteList) null, ((BlockArgNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[442] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[446] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(p.src_line(), null, ((ByteList)yyVals[-1+yyTop].value), ((BlockArgNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[443] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[447] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), null, (ByteList) null, ((BlockArgNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[444] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[448] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ArgsTailHolder)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[445] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[449] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(p.src_line(), null, (ByteList) null, (ByteList) null);
   return yyVal;
 };
-states[446] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[450] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new UnnamedRestArgNode(yyVals[yyTop - count + 1].start(), null, p.getCurrentScope().addVariable("*"));
                     /*% %*/
                     /*% ripper: excessed_comma! %*/
   return yyVal;
 };
-states[447] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[451] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-5+yyTop].value), ((ListNode)yyVals[-3+yyTop].value), ((RestArgNode)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[448] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[452] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-7+yyTop].value), ((ListNode)yyVals[-5+yyTop].value), ((RestArgNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[449] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[453] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[450] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[454] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-5+yyTop].value), ((ListNode)yyVals[-3+yyTop].value), null, ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[451] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[455] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-3+yyTop].value), null, ((RestArgNode)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[452] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[456] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-1+yyTop].value), null, ((RestArgNode)yyVals[0+yyTop].value), null, (ArgsTailHolder) null);
   return yyVal;
 };
-states[453] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[457] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-5+yyTop].value), null, ((RestArgNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[454] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[458] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-1+yyTop].value), null, null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[455] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[459] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((ListNode)yyVals[-3+yyTop].value), ((RestArgNode)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[456] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[460] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((ListNode)yyVals[-5+yyTop].value), ((RestArgNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[457] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[461] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((ListNode)yyVals[-1+yyTop].value), null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[458] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[462] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((ListNode)yyVals[-3+yyTop].value), null, ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[459] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[463] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, ((RestArgNode)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[460] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[464] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, ((RestArgNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[461] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[465] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[462] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[466] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_args(p.src_line(), null, null, null, null, (ArgsTailHolder) null);
                     /*%
@@ -4683,12 +4728,12 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                       %*/
   return yyVal;
 };
-states[463] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[467] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCommandStart(true);
                     yyVal = ((ArgsNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[464] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[468] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     p.ordinalMaxNumParam();
                     p.getLexContext().in_argdef = false;
@@ -4698,7 +4743,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: block_var!(params!(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil), escape_Qundef($2)) %*/
   return yyVal;
 };
-states[465] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[469] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     p.ordinalMaxNumParam();
                     p.getLexContext().in_argdef = false;
@@ -4708,60 +4753,60 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: block_var!(escape_Qundef($2), escape_Qundef($3)) %*/
   return yyVal;
 };
-states[466] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[470] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
   return yyVal;
 };
-states[467] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[471] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = null;
                     /*% %*/
                     /*% ripper: $3 %*/
   return yyVal;
 };
-states[468] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[472] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
                     /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[469] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[473] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
                     /*% ripper[brace]: rb_ary_push($1, get_value($3)) %*/
   return yyVal;
 };
-states[470] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[474] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.new_bv(yyVals[yyTop - count + 1].id);
                     /*% ripper: get_value($1) %*/
   return yyVal;
 };
-states[471] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[475] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
   return yyVal;
 };
-states[472] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[476] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.resetMaxNumParam();
   return yyVal;
 };
-states[473] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[477] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.numparam_push();
   return yyVal;
 };
-states[474] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[478] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.it_id();
                     p.set_it_id(null);
   return yyVal;
 };
-states[475] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[479] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pushBlockScope();
                     yyVal = p.getLeftParenBegin();
                     p.setLeftParenBegin(p.getParenNest());
   return yyVal;
 };
-states[476] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[480] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getCmdArgumentState().push0();
   return yyVal;
 };
-states[477] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[481] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     Node it_id = p.it_id();
                     int max_numparam = p.restoreMaxNumParam(((Integer)yyVals[-6+yyTop].value));
                     p.set_it_id(((Node)yyVals[-4+yyTop].value));
@@ -4777,7 +4822,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[478] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[482] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = false;
                     /*%%%*/
                     yyVal = ((ArgsNode)yyVals[-2+yyTop].value);
@@ -4786,7 +4831,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: paren!($2) %*/
   return yyVal;
 };
-states[479] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[483] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = false;
                     /*%%%*/
                     if (!p.isArgsInfoEmpty(((ArgsNode)yyVals[0+yyTop].value))) {
@@ -4796,26 +4841,26 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = ((ArgsNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[480] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[484] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.token_info_pop("}", yyVals[yyTop - count + 1]);
                     yyVal = ((Node)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[481] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[485] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.push_end_expect_token_locations(yyVals[yyTop - count + 1].start());
   return yyVal;
 };
-states[482] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[486] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[483] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[487] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IterNode)yyVals[-1+yyTop].value);
                     /*%%%*/
                     /*% %*/
   return yyVal;
 };
-states[484] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[488] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /* Workaround for JRUBY-2326 (MRI does not enter this production for some reason)*/
                     /*%%%*/
                     if (((Node)yyVals[-1+yyTop].value) instanceof YieldNode) {
@@ -4835,28 +4880,28 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: method_add_block!($1, $2) %*/
   return yyVal;
 };
-states[485] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[489] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), null, yyVals[yyTop - count + 3].start());
                     /*% %*/
                     /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/
   return yyVal;
 };
-states[486] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[490] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-4+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((IterNode)yyVals[0+yyTop].value), yyVals[yyTop - count + 3].start());
                     /*% %*/
                     /*% ripper: opt_event(:method_add_block!, command_call!($1, $2, $3, $4), $5) %*/
   return yyVal;
 };
-states[487] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[491] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-4+yyTop].value), ((ByteList)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((IterNode)yyVals[0+yyTop].value), yyVals[yyTop - count + 3].start());
                     /*% %*/
                     /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/
   return yyVal;
 };
-states[488] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[492] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.frobnicate_fcall_args(((FCallNode)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), null);
                     yyVal = ((FCallNode)yyVals[-1+yyTop].value);
@@ -4864,56 +4909,56 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: method_add_arg!(fcall!($1), $2) %*/
   return yyVal;
 };
-states[489] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[493] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-3+yyTop].value), ((ByteList)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), null, yyVals[yyTop - count + 3].start());
                     /*% %*/
                     /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/
   return yyVal;
 };
-states[490] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[494] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-3+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value), null);
                     /*% %*/
                     /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), $3), $4) %*/
   return yyVal;
 };
-states[491] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[495] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value), null, null);
                     /*% %*/
                     /*% ripper: call!($1, ID2VAL(idCOLON2), $3) %*/
   return yyVal;
 };
-states[492] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[496] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), LexingCommon.CALL, ((Node)yyVals[0+yyTop].value), null, yyVals[yyTop - count + 3].start());
                     /*% %*/
                     /*% ripper: method_add_arg!(call!($1, $2, ID2VAL(idCall)), $3) %*/
   return yyVal;
 };
-states[493] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[497] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_call(((Node)yyVals[-2+yyTop].value), LexingCommon.CALL, ((Node)yyVals[0+yyTop].value), null);
                     /*% %*/
                     /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), ID2VAL(idCall)), $3) %*/
   return yyVal;
 };
-states[494] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[498] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_super(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: super!($2) %*/
   return yyVal;
 };
-states[495] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[499] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ZSuperNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: zsuper! %*/
   return yyVal;
 };
-states[496] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[500] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (((Node)yyVals[-3+yyTop].value) instanceof SelfNode) {
                         yyVal = p.new_fcall(LBRACKET_RBRACKET);
@@ -4925,25 +4970,25 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: aref!($1, escape_Qundef($3)) %*/
   return yyVal;
 };
-states[497] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[501] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IterNode)yyVals[-1+yyTop].value);
                     /*%%%*/
                     ((IterNode)yyVals[-1+yyTop].value).setLine(yyVals[yyTop - count + 1].end());
                     /*% %*/
   return yyVal;
 };
-states[498] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[502] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((IterNode)yyVals[-1+yyTop].value);
                     /*%%%*/
                     ((IterNode)yyVals[-1+yyTop].value).setLine(yyVals[yyTop - count + 1].end());
                     /*% %*/
   return yyVal;
 };
-states[499] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[503] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pushBlockScope();
   return yyVal;
 };
-states[500] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[504] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     Node it_id = p.it_id();
                     int max_numparam = p.restoreMaxNumParam(((Integer)yyVals[-5+yyTop].value));
                     p.set_it_id(((Node)yyVals[-3+yyTop].value));
@@ -4957,12 +5002,12 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();                    
   return yyVal;
 };
-states[501] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[505] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pushBlockScope();
                     p.getCmdArgumentState().push0();
   return yyVal;
 };
-states[502] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[506] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     Node it_id = p.it_id();
                     int max_numparam = p.restoreMaxNumParam(((Integer)yyVals[-5+yyTop].value));
                     p.set_it_id(((Node)yyVals[-3+yyTop].value));
@@ -4977,7 +5022,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.popCurrentScope();
   return yyVal;
 };
-states[503] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[507] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.check_literal_when(((Node)yyVals[0+yyTop].value));
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
@@ -4985,14 +5030,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: args_add!(args_new!, $1) %*/
   return yyVal;
 };
-states[504] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[508] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newSplatNode(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: args_add_star!(args_new!, $2) %*/
   return yyVal;
 };
-states[505] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[509] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.check_literal_when(((Node)yyVals[0+yyTop].value));
                     yyVal = p.last_arg_append(((Node)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
@@ -5000,53 +5045,53 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: args_add!($1, $3) %*/
   return yyVal;
 };
-states[506] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[510] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.rest_arg_append(((Node)yyVals[-3+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: args_add_star!($1, $4) %*/
   return yyVal;
 };
-states[507] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[511] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newWhenNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-3+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: when!($2, $4, escape_Qundef($5)) %*/
   return yyVal;
 };
-states[510] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[514] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.push_pvtbl();
   return yyVal;
 };
-states[511] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[515] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.push_pktbl();
   return yyVal;
 };
-states[512] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[516] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getLexContext().clone();
                     p.setState(EXPR_BEG|EXPR_LABEL);
                     p.setCommandStart(false);
                     p.getLexContext().in_kwarg = true;
   return yyVal;
 };
-states[513] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[517] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pvtbl(((Set)yyVals[-3+yyTop].value));
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     p.getLexContext().in_kwarg = ((LexContext)yyVals[-4+yyTop].value).in_kwarg;
   return yyVal;
 };
-states[514] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[518] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newIn(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-4+yyTop].value), ((Node)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: in!($5, $8, escape_Qundef($9)) %*/
   return yyVal;
 };
-states[516] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[520] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((InNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[518] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[522] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_if(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value), ((Node)yyVals[-2+yyTop].value), null);
                     p.fixpos(((Node)yyVal), ((Node)yyVals[0+yyTop].value));
@@ -5054,7 +5099,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: if_mod!($3, $1) %*/
   return yyVal;
 };
-states[519] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[523] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_if(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value), null, ((Node)yyVals[-2+yyTop].value));
                     p.fixpos(((Node)yyVal), ((Node)yyVals[0+yyTop].value));
@@ -5062,55 +5107,55 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: unless_mod!($3, $1) %*/
   return yyVal;
 };
-states[521] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[525] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, ((Node)yyVals[-1+yyTop].value),
                                                    p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, true, null, null));
   return yyVal;
 };
-states[522] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[526] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, ((Node)yyVals[-2+yyTop].value), ((ArrayPatternNode)yyVals[0+yyTop].value));
                     /*%%%*/
                     p.nd_set_first_loc(((Node)yyVal), yyVals[yyTop - count + 1].start());
                     /*% %*/
   return yyVal;
 };
-states[523] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[527] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_find_pattern(null, ((FindPatternNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[524] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[528] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, null, ((ArrayPatternNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[525] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[529] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern(null, ((HashPatternNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[527] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[531] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new HashNode(yyVals[yyTop - count + 1].start(), new KeyValuePair(((Node)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value)));
                     /*% %*/
                     /*% ripper: binary!($1, STATIC_ID2SYM((id_assoc)), $3) %*/
   return yyVal;
 };
-states[529] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[533] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.logop(((Node)yyVals[-2+yyTop].value), OR, ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: binary!($1, STATIC_ID2SYM(idOr), $3) %*/
   return yyVal;
 };
-states[531] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[535] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Set)yyVals[0+yyTop].value);
                     /*% ripper: get_value($:2); %*/
   return yyVal;
 };
-states[532] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[536] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Set)yyVals[0+yyTop].value);
                     /*% ripper: get_value($:2); %*/
   return yyVal;
 };
-states[535] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[539] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-3+yyTop].value), null, ((ArrayPatternNode)yyVals[-1+yyTop].value));
                     /*%%%*/
@@ -5118,7 +5163,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% %*/
   return yyVal;
 };
-states[536] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[540] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_find_pattern(((Node)yyVals[-3+yyTop].value), ((FindPatternNode)yyVals[-1+yyTop].value));
                     /*%%%*/
@@ -5126,7 +5171,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% %*/
   return yyVal;
 };
-states[537] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[541] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_hash_pattern(((Node)yyVals[-3+yyTop].value), ((HashPatternNode)yyVals[-1+yyTop].value));
                     /*%%%*/
@@ -5134,12 +5179,12 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% %*/
   return yyVal;
 };
-states[538] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[542] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-2+yyTop].value), null,
                                                     p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, false, null, null));
   return yyVal;
 };
-states[539] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[543] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-3+yyTop].value), null, ((ArrayPatternNode)yyVals[-1+yyTop].value));
                     /*%%%*/
@@ -5147,7 +5192,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% %*/
   return yyVal;
 };
-states[540] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[544] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_find_pattern(((Node)yyVals[-3+yyTop].value), ((FindPatternNode)yyVals[-1+yyTop].value));
                     /*%%%*/
@@ -5155,7 +5200,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% %*/
   return yyVal;
 };
-states[541] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[545] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = p.new_hash_pattern(((Node)yyVals[-3+yyTop].value), ((HashPatternNode)yyVals[-1+yyTop].value));
                     /*%%%*/
@@ -5163,44 +5208,44 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% %*/
   return yyVal;
 };
-states[542] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[546] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-2+yyTop].value), null,
                             p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, false, null, null));
   return yyVal;
 };
-states[543] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[547] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, null, ((ArrayPatternNode)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[544] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[548] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_find_pattern(null, ((FindPatternNode)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[545] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[549] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern(yyVals[yyTop - count + 1].start(), null, null,
                             p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, false, null, null));
   return yyVal;
 };
-states[546] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[550] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_kwarg = false;
   return yyVal;
 };
-states[547] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[551] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-4+yyTop].value));
                     p.getLexContext().in_kwarg = ((LexContext)yyVals[-3+yyTop].value).in_kwarg;
                     yyVal = p.new_hash_pattern(null, ((HashPatternNode)yyVals[-1+yyTop].value));
   return yyVal;
 };
-states[548] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[552] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern(null, p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), p.none(), null));
   return yyVal;
 };
-states[549] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[553] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.pop_pktbl(((Set)yyVals[-2+yyTop].value));
                     yyVal = ((Node)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[550] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[554] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     ListNode preArgs = p.newArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), preArgs, false, null, null);
@@ -5210,11 +5255,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[551] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[555] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[0+yyTop].value), true, null, null);
   return yyVal;
 };
-states[552] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[556] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), p.list_concat(((ListNode)yyVals[-1+yyTop].value), ((ListNode)yyVals[0+yyTop].value)), false, null, null);
                     /* JRuby Changed*/
@@ -5224,42 +5269,42 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[553] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[557] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-1+yyTop].value), true, ((ByteList)yyVals[0+yyTop].value), null);
   return yyVal;
 };
-states[554] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[558] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-3+yyTop].value), true, ((ByteList)yyVals[-2+yyTop].value), ((ListNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[555] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[559] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((ArrayPatternNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[556] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[560] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((ListNode)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[557] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[561] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.list_concat(((ListNode)yyVals[-2+yyTop].value), ((ListNode)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_concat($1, get_value($2)) %*/
   return yyVal;
 };
-states[558] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[562] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, true, ((ByteList)yyVals[0+yyTop].value), null);
   return yyVal;
 };
-states[559] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[563] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_array_pattern_tail(yyVals[yyTop - count + 1].start(), null, true, ((ByteList)yyVals[-2+yyTop].value), ((ListNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[560] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[564] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_find_pattern_tail(yyVals[yyTop - count + 1].start(), ((ByteList)yyVals[-4+yyTop].value), ((ListNode)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[561] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[565] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.error_duplicate_pattern_variable(yyVals[yyTop - count + 2].id);
                     /*%%%*/
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
@@ -5267,49 +5312,49 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% p.assignable(yyVals[yyTop - count + 2].id, p.var_field(p.get_value($2))); %*/
   return yyVal;
 };
-states[562] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[566] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
                     /*% ripper: var_field(p, Qnil) %*/
   return yyVal;
 };
-states[564] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[568] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.list_concat(((ListNode)yyVals[-2+yyTop].value), ((ListNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_concat($1, get_value($3)) %*/
   return yyVal;
 };
-states[565] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[569] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_new_from_args(1, get_value($1)) %*/
   return yyVal;
 };
-states[566] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[570] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), ((HashNode)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[567] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[571] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), ((HashNode)yyVals[0+yyTop].value), null);
   return yyVal;
 };
-states[568] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[572] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), ((HashNode)yyVals[-1+yyTop].value), null);
   return yyVal;
 };
-states[569] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[573] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_hash_pattern_tail(yyVals[yyTop - count + 1].start(), null, ((ByteList)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[570] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[574] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new HashNode(yyVals[yyTop - count + 1].start(), ((KeyValuePair)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper[brace]: rb_ary_new_from_args(1, $1) %*/
   return yyVal;
 };
-states[571] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[575] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     ((HashNode)yyVals[-2+yyTop].value).add(((KeyValuePair)yyVals[0+yyTop].value));
                     yyVal = ((HashNode)yyVals[-2+yyTop].value);
@@ -5317,7 +5362,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rb_ary_push($1, $3) %*/
   return yyVal;
 };
-states[572] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[576] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.error_duplicate_pattern_key(yyVals[yyTop - count + 1].id);
                     /*%%%*/
                     Node label = p.asSymbol(yyVals[yyTop - count + 1].start(), ((ByteList)yyVals[-1+yyTop].value));
@@ -5327,7 +5372,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rb_ary_new_from_args(2, get_value($1), get_value($2)) %*/
   return yyVal;
 };
-states[573] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[577] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.error_duplicate_pattern_key(yyVals[yyTop - count + 1].id);
                     if (yyVals[yyTop - count + 1].id != null && !p.is_local_id(yyVals[yyTop - count + 1].id)) {
                         p.yyerror("key must be valid as local variables");
@@ -5341,7 +5386,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rb_ary_new_from_args(2, get_value($1), Qnil) %*/
   return yyVal;
 };
-states[575] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[579] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
 		    /*%%%*/
                     if (((Node)yyVals[-1+yyTop].value) == null || ((Node)yyVals[-1+yyTop].value) instanceof StrNode) {
                         yyVal = ((StrNode)yyVals[-1+yyTop].value).getValue();
@@ -5357,11 +5402,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     }
   return yyVal;
 };
-states[576] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[580] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[577] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[581] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = STAR_STAR;
                     /*%
@@ -5369,7 +5414,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[578] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[582] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                        yyVal = KWNOREST;
                     /*%
@@ -5377,15 +5422,15 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[579] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[583] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[580] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[584] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[582] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[586] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-2+yyTop].value));
                     p.value_expr(((Node)yyVals[0+yyTop].value));
@@ -5395,7 +5440,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot2!($1, $3) %*/
   return yyVal;
 };
-states[583] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[587] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-2+yyTop].value));
                     p.value_expr(((Node)yyVals[0+yyTop].value));
@@ -5405,7 +5450,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot3!($1, $3) %*/
   return yyVal;
 };
-states[584] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[588] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-1+yyTop].value));
                     boolean isLiteral = ((Node)yyVals[-1+yyTop].value) instanceof FixnumNode;
@@ -5414,7 +5459,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot2!($1, Qnil) %*/
   return yyVal;
 };
-states[585] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[589] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[-1+yyTop].value));
                     boolean isLiteral = ((Node)yyVals[-1+yyTop].value) instanceof FixnumNode;
@@ -5423,7 +5468,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot3!($1, Qnil) %*/
   return yyVal;
 };
-states[589] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[593] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     boolean isLiteral = ((Node)yyVals[0+yyTop].value) instanceof FixnumNode;
@@ -5432,7 +5477,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot2!(Qnil, $2) %*/
   return yyVal;
 };
-states[590] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[594] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     boolean isLiteral = ((Node)yyVals[0+yyTop].value) instanceof FixnumNode;
@@ -5441,51 +5486,51 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dot3!(Qnil, $2) %*/
   return yyVal;
 };
-states[595] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[599] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ListNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[596] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[600] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ListNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[597] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[601] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ListNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[598] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[602] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ListNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[599] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[603] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new NilNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[600] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[604] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new SelfNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[601] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[605] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new TrueNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[602] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[606] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new FalseNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[603] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[607] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new FileNode(yyVals[yyTop - count + 1].start(), new ByteList(p.getFile().getBytes(),
                     p.getRuntime().getEncodingService().getLocaleEncoding()));
@@ -5493,25 +5538,25 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[604] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[608] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new FixnumNode(yyVals[yyTop - count + 1].start(), yyVals[yyTop - count + 1].start()+1);
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[605] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[609] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new EncodingNode(yyVals[yyTop - count + 1].start(), p.getEncoding());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[606] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[610] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((LambdaNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[607] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[611] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.error_duplicate_pattern_variable(((ByteList)yyVals[0+yyTop].value));
                     yyVal = p.assignableLabelOrIdentifier(((ByteList)yyVals[0+yyTop].value), null);
@@ -5520,7 +5565,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[608] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[612] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node n = p.gettable(((ByteList)yyVals[0+yyTop].value));
                     if (!(n instanceof LocalVarNode || n instanceof DVarNode)) {
@@ -5531,7 +5576,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: var_ref!($2) %*/
   return yyVal;
 };
-states[609] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[613] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.gettable(((ByteList)yyVals[0+yyTop].value));
                     if (yyVal == null) yyVal = new BeginNode(yyVals[yyTop - count + 1].start(), NilImplicitNode.NIL);
@@ -5539,35 +5584,35 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: var_ref!($2) %*/
   return yyVal;
 };
-states[610] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[614] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new BeginNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: begin!($3) %*/
   return yyVal;
 };
-states[611] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[615] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_colon3(yyVals[yyTop - count + 1].start(), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: top_const_ref!($2) %*/
   return yyVal;
 };
-states[612] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[616] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.new_colon2(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-2+yyTop].value), ((ByteList)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: const_path_ref!($1, $3) %*/
   return yyVal;
 };
-states[613] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[617] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ConstNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)));
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[614] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[618] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node node;
                     if (((Node)yyVals[-3+yyTop].value) != null) {
@@ -5584,18 +5629,18 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rescue!(escape_Qundef($2), escape_Qundef($3), escape_Qundef($5), escape_Qundef($6)) %*/
   return yyVal;
 };
-states[615] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[619] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null; 
   return yyVal;
 };
-states[616] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[620] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.newArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[617] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[621] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.splat_array(((Node)yyVals[0+yyTop].value));
                     if (yyVal == null) yyVal = ((Node)yyVals[0+yyTop].value); /* ArgsCat or ArgsPush*/
@@ -5603,11 +5648,11 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: $1 %*/
   return yyVal;
 };
-states[619] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[623] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[621] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[625] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.getLexContext().in_rescue = ((LexContext)yyVals[-1+yyTop].value).in_rescue;
                     yyVal = ((Node)yyVals[0+yyTop].value);
@@ -5615,37 +5660,37 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: ensure!($2) %*/
   return yyVal;
 };
-states[623] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[627] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((NumericNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[624] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[628] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[625] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[629] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((Node)yyVals[0+yyTop].value) instanceof EvStrNode ? new DStrNode(yyVals[yyTop - count + 1].start(), p.getEncoding()).add(((Node)yyVals[0+yyTop].value)) : ((Node)yyVals[0+yyTop].value);
                     /*% %*/
                     /*% ripper: $1 %*/
   return yyVal;
 };
-states[626] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[630] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((StrNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[627] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[631] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[628] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[632] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.literal_concat(((Node)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: string_concat!($1, $2) %*/
   return yyVal;
 };
-states[629] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[633] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.heredoc_dedent(((Node)yyVals[-1+yyTop].value));
                     yyVal = ((Node)yyVals[-1+yyTop].value);
@@ -5653,7 +5698,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: string_literal!(heredoc_dedent(p, $2)) %*/
   return yyVal;
 };
-states[630] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[634] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     int line = yyVals[yyTop - count + 2].start();
 
@@ -5674,117 +5719,117 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: xstring_literal!(heredoc_dedent(p, $2)) %*/
   return yyVal;
 };
-states[631] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[635] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_regexp(yyVals[yyTop - count + 2].start(), ((Node)yyVals[-1+yyTop].value), ((RegexpNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[632] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[636] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
   return yyVal;
 };
-states[634] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[638] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: array!($3) %*/
   return yyVal;
 };
-states[635] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[639] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                      yyVal = new ArrayNode(p.src_line());
                     /*% %*/
                     /*% ripper: words_new! %*/
   return yyVal;
 };
-states[636] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[640] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                      yyVal = ((ListNode)yyVals[-2+yyTop].value).add(((Node)yyVals[-1+yyTop].value) instanceof EvStrNode ? new DStrNode(yyVals[yyTop - count + 1].start(), p.getEncoding()).add(((Node)yyVals[-1+yyTop].value)) : ((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: words_add!($1, $2) %*/
   return yyVal;
 };
-states[637] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[641] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((Node)yyVals[0+yyTop].value);
                      /*% ripper[brace]: word_add!(word_new!, $1) %*/
   return yyVal;
 };
-states[638] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[642] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.literal_concat(((Node)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: word_add!($1, $2) %*/
   return yyVal;
 };
-states[639] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[643] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: array!($3) %*/
   return yyVal;
 };
-states[640] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[644] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ArrayNode(p.src_line());
                     /*% %*/
                     /*% ripper: symbols_new! %*/
   return yyVal;
 };
-states[641] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[645] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-2+yyTop].value).add(((Node)yyVals[-1+yyTop].value) instanceof EvStrNode ? new DSymbolNode(yyVals[yyTop - count + 1].start()).add(((Node)yyVals[-1+yyTop].value)) : p.asSymbol(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-1+yyTop].value)));
                     /*% %*/
                     /*% ripper: symbols_add!($1, $2) %*/
   return yyVal;
 };
-states[642] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[646] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: array!($3) %*/
   return yyVal;
 };
-states[643] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[647] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: array!($3) %*/
   return yyVal;
 };
-states[644] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[648] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ArrayNode(p.src_line());
                     /*% %*/
                     /*% ripper: qwords_new! %*/
   return yyVal;
 };
-states[645] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[649] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-2+yyTop].value).add(((Node)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: qwords_add!($1, $2) %*/
   return yyVal;
 };
-states[646] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[650] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ArrayNode(p.src_line());
                     /*% %*/
                     /*% ripper: qsymbols_new! %*/
   return yyVal;
 };
-states[647] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[651] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-2+yyTop].value).add(p.asSymbol(yyVals[yyTop - count + 1].start(), ((Node)yyVals[-1+yyTop].value)));
                     /*% %*/
                     /*% ripper: qsymbols_add!($1, $2) %*/
   return yyVal;
 };
-states[648] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[652] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     ByteList aChar = ByteList.create("");
                     aChar.setEncoding(p.getEncoding());
                     yyVal = p.createStr(aChar, 0);
                     /*% ripper: string_content! %*/
   return yyVal;
 };
-states[649] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[653] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.literal_concat(((Node)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
@@ -5792,7 +5837,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /* JRuby changed (removed)*/
   return yyVal;
 };
-states[650] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[654] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     ByteList aChar = ByteList.create("");
                     aChar.setEncoding(p.getEncoding());
@@ -5801,21 +5846,21 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: xstring_new! %*/
   return yyVal;
 };
-states[651] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[655] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.literal_concat(((Node)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: xstring_add!($1, $2) %*/
   return yyVal;
 };
-states[652] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[656] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = null;
                     /*% %*/
                     /*% ripper: regexp_new! %*/
   return yyVal;
 };
-states[653] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[657] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /* FIXME: mri is different here.*/
                     /*%%%*/
                     yyVal = p.literal_concat(((Node)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value));
@@ -5825,18 +5870,18 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[654] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[658] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
 		    /*% ripper[brace]: ripper_new_yylval(p, 0, get_value($1), $1) %*/
   return yyVal;
 };
-states[655] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[659] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getStrTerm();
                     p.setStrTerm(null);
                     p.setState(EXPR_BEG);
   return yyVal;
 };
-states[656] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[660] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setStrTerm(((StrTerm)yyVals[-1+yyTop].value));
                    /*%%%*/
                     yyVal = new EvStrNode(yyVals[yyTop - count + 3].start(), ((Node)yyVals[0+yyTop].value));
@@ -5844,29 +5889,29 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: string_dvar!($3) %*/
   return yyVal;
 };
-states[657] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[661] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = p.getStrTerm();
                    p.setStrTerm(null);
                    p.getConditionState().push0();
                    p.getCmdArgumentState().push0();
   return yyVal;
 };
-states[658] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[662] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = p.getState();
                    p.setState(EXPR_BEG);
   return yyVal;
 };
-states[659] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[663] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = p.getBraceNest();
                    p.setBraceNest(0);
   return yyVal;
 };
-states[660] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[664] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = p.getHeredocIndent();
                    p.setHeredocIndent(0);
   return yyVal;
 };
-states[661] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[665] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    p.getConditionState().pop();
                    p.getCmdArgumentState().pop();
                    p.setStrTerm(((StrTerm)yyVals[-5+yyTop].value));
@@ -5882,7 +5927,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                    /*% ripper: string_embexpr!($6) %*/
   return yyVal;
 };
-states[664] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[668] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.gettable(((ByteList)yyVals[0+yyTop].value));
                     if (yyVal == null) yyVal = p.NEW_ERROR(yyVals[yyTop - count + 1]);
@@ -5890,7 +5935,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[668] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[672] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_END);
                     /*%%%*/
                     yyVal = p.asSymbol(p.src_line(), ((ByteList)yyVals[0+yyTop].value));
@@ -5898,7 +5943,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: symbol_literal!(symbol!($2)) %*/
   return yyVal;
 };
-states[671] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[675] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_END);
 
                     /*%%%*/
@@ -5920,34 +5965,34 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: dyna_symbol!($2) %*/
   return yyVal;
 };
-states[672] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[676] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((NumericNode)yyVals[0+yyTop].value);  
   return yyVal;
 };
-states[673] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[677] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.negateNumeric(((NumericNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: unary!(ID2VAL(idUMinus), $2) %*/
   return yyVal;
 };
-states[674] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[678] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[675] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[679] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((FloatNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[676] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[680] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((RationalNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[677] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[681] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                      yyVal = ((ComplexNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[681] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[685] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.declareIdentifier(((ByteList)yyVals[0+yyTop].value));
                     /*%  %*/
@@ -5960,7 +6005,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[682] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[686] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new InstVarNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)));
                     /*%  %*/
@@ -5973,7 +6018,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[683] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[687] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new GlobalVarNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)));
                     /*%  %*/
@@ -5986,7 +6031,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[684] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[688] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ConstNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)));
                     /*%  %*/
@@ -5999,7 +6044,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[685] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[689] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ClassVarNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)));
                     /*%  %*/
@@ -6012,35 +6057,35 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[686] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[690] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new NilNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[687] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[691] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new SelfNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[688] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[692] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new TrueNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[689] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[693] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new FalseNode(yyVals[yyTop - count + 1].start());
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[690] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[694] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new FileNode(yyVals[yyTop - count + 1].start(), new ByteList(p.getFile().getBytes(),
                     p.getRuntime().getEncodingService().getLocaleEncoding()));
@@ -6048,14 +6093,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[691] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[695] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new FixnumNode(yyVals[yyTop - count + 1].start(), yyVals[yyTop - count + 1].start()+1);
                     /*% %*/
                     /*% ripper: var_ref!($1) %*/
   return yyVal;
 };
-states[692] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[696] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new EncodingNode(yyVals[yyTop - count + 1].start(), p.getEncoding());
                     /*% %*/
@@ -6063,7 +6108,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /* mri:keyword_variable*/
   return yyVal;
 };
-states[693] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[697] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.assignableLabelOrIdentifier(((ByteList)yyVals[0+yyTop].value), null);
                     /*%
@@ -6072,7 +6117,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     
   return yyVal;
 };
-states[694] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[698] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new InstAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -6080,7 +6125,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[695] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[699] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new GlobalAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -6088,7 +6133,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[696] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[700] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (p.getLexContext().in_def) p.compile_error("dynamic constant assignment");
 
@@ -6098,7 +6143,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[697] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[701] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ClassVarAsgnNode(yyVals[yyTop - count + 1].start(), p.symbolID(((ByteList)yyVals[0+yyTop].value)), NilImplicitNode.NIL);
                     /*%
@@ -6106,7 +6151,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[698] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[702] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to nil");
                     yyVal = null;
@@ -6115,7 +6160,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[699] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[703] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't change the value of self");
                     yyVal = null;
@@ -6124,7 +6169,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[700] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[704] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to true");
                     yyVal = null;
@@ -6133,7 +6178,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[701] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[705] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to false");
                     yyVal = null;
@@ -6142,7 +6187,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[702] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[706] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __FILE__");
                     yyVal = null;
@@ -6151,7 +6196,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[703] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[707] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __LINE__");
                     yyVal = null;
@@ -6160,7 +6205,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[704] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[708] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.compile_error("Can't assign to __ENCODING__");
                     yyVal = null;
@@ -6170,37 +6215,37 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /* mri:keyword_variable*/
   return yyVal;
 };
-states[705] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[709] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[706] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[710] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[707] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[711] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    p.setState(EXPR_BEG);
                    p.setCommandStart(true);
   return yyVal;
 };
-states[708] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[712] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((Node)yyVals[-1+yyTop].value);
   return yyVal;
 };
-states[709] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[713] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = null;
                     /*% %*/
                     /*% ripper: Qnil %*/
   return yyVal;
 };
-states[711] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[715] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = false;
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, null, null, 
                                     p.new_args_tail(p.src_line(), null, (ByteList) null, (ByteList) null));
   return yyVal;
 };
-states[712] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[716] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ArgsNode)yyVals[-1+yyTop].value);
                     /*% %*/
@@ -6210,18 +6255,18 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.setCommandStart(true);
   return yyVal;
 };
-states[713] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[717] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                    yyVal = ((ArgsNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[714] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[718] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.getLexContext().clone();
                     p.getLexContext().in_kwarg = true;
                     p.getLexContext().in_argdef = true;
                     p.setState(p.getState() | EXPR_LABEL);
   return yyVal;
 };
-states[715] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[719] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     LexContext ctxt = p.getLexContext();
                     ctxt.in_kwarg = ((LexContext)yyVals[-2+yyTop].value).in_kwarg;
                     ctxt.in_argdef = false;
@@ -6230,103 +6275,103 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     p.setCommandStart(true);
   return yyVal;
 };
-states[716] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[720] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-3+yyTop].value), ((ByteList)yyVals[-1+yyTop].value), ((BlockArgNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[717] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[721] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-1+yyTop].value), (ByteList) null, ((BlockArgNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[718] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[722] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(p.src_line(), null, ((ByteList)yyVals[-1+yyTop].value), ((BlockArgNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[719] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[723] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), null, (ByteList) null, ((BlockArgNode)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[720] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[724] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.add_forwarding_args();
                     yyVal = p.new_args_tail(yyVals[yyTop - count + 1].start(), null, ((ByteList)yyVals[0+yyTop].value), FWD_BLOCK);
   return yyVal;
 };
-states[721] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[725] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ArgsTailHolder)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[722] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[726] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args_tail(p.src_line(), null, (ByteList) null, (ByteList) null);
   return yyVal;
 };
-states[723] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[727] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-5+yyTop].value), ((ListNode)yyVals[-3+yyTop].value), ((RestArgNode)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[724] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[728] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-7+yyTop].value), ((ListNode)yyVals[-5+yyTop].value), ((RestArgNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[725] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[729] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[726] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[730] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-5+yyTop].value), ((ListNode)yyVals[-3+yyTop].value), null, ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[727] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[731] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-3+yyTop].value), null, ((RestArgNode)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[728] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[732] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-5+yyTop].value), null, ((RestArgNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[729] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[733] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), ((ListNode)yyVals[-1+yyTop].value), null, null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[730] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[734] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((ListNode)yyVals[-3+yyTop].value), ((RestArgNode)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[731] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[735] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((ListNode)yyVals[-5+yyTop].value), ((RestArgNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[732] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[736] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((ListNode)yyVals[-1+yyTop].value), null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[733] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[737] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, ((ListNode)yyVals[-3+yyTop].value), null, ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[734] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[738] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, ((RestArgNode)yyVals[-1+yyTop].value), null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[735] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[739] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, ((RestArgNode)yyVals[-3+yyTop].value), ((ListNode)yyVals[-1+yyTop].value), ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[736] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[740] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(yyVals[yyTop - count + 1].start(), null, null, null, null, ((ArgsTailHolder)yyVals[0+yyTop].value));
   return yyVal;
 };
-states[737] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[741] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.new_args(p.src_line(), null, null, null, null, (ArgsTailHolder) null);
   return yyVal;
 };
-states[738] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[742] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = FWD_KWREST;
                     /*% %*/
                     /*% ripper: args_forward! %*/
   return yyVal;
 };
-states[739] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[743] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "formal argument cannot be a constant";
                     /*%%%*/
                     p.yyerror(message);
@@ -6334,7 +6379,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/
   return yyVal;
 };
-states[740] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[744] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "formal argument cannot be an instance variable";
                     /*%%%*/
                     p.yyerror(message);
@@ -6342,7 +6387,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/
   return yyVal;
 };
-states[741] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[745] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "formal argument cannot be a global variable";
                     /*%%%*/
                     p.yyerror(message);
@@ -6350,7 +6395,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/
   return yyVal;
 };
-states[742] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[746] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     String message = "formal argument cannot be a class variable";
                     /*%%%*/
                     p.yyerror(message);
@@ -6358,16 +6403,16 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/
   return yyVal;
 };
-states[743] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[747] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value); /* Not really reached*/
   return yyVal;
 };
-states[744] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[748] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.formal_argument(yyVals[yyTop - count + 1].id, ((ByteList)yyVals[0+yyTop].value));
                     p.ordinalMaxNumParam();
   return yyVal;
 };
-states[745] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[749] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     RubySymbol name = p.get_id(((ByteList)yyVals[0+yyTop].value));
                     p.setCurrentArg(name);
                     /*%%%*/
@@ -6379,7 +6424,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 
   return yyVal;
 };
-states[746] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[750] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     /*%%%*/
                     yyVal = ((ArgumentNode)yyVals[0+yyTop].value);
@@ -6387,21 +6432,21 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: get_value($1) %*/
   return yyVal;
 };
-states[747] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[751] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((Node)yyVals[-1+yyTop].value);
                     /*% %*/
                     /*% ripper: mlhs_paren!($2) %*/
   return yyVal;
 };
-states[748] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[752] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ArrayNode(p.src_line(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[749] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[753] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     ((ListNode)yyVals[-2+yyTop].value).add(((Node)yyVals[0+yyTop].value));
                     yyVal = ((ListNode)yyVals[-2+yyTop].value);
@@ -6409,7 +6454,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rb_ary_push($1, get_value($3)) %*/
   return yyVal;
 };
-states[750] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[754] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.formal_argument(yyVals[yyTop - count + 1].id, ((ByteList)yyVals[0+yyTop].value));
                     p.arg_var(yyVals[yyTop - count + 1].id);
                     p.setCurrentArg(p.get_id(((ByteList)yyVals[0+yyTop].value)));
@@ -6418,7 +6463,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[751] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[755] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     p.getLexContext().in_argdef = true;
                     /*%%%*/
@@ -6428,7 +6473,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[752] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[756] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setCurrentArg(null);
                     p.getLexContext().in_argdef = true;
                     /*%%%*/
@@ -6438,7 +6483,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[753] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[757] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = true;
                     /*%%%*/
                     yyVal = new KeywordArgNode(yyVals[yyTop - count + 2].start(), p.assignableKeyword(((ByteList)yyVals[-1+yyTop].value), ((Node)yyVals[0+yyTop].value)));
@@ -6447,7 +6492,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[754] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[758] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = true;
                     /*%%%*/
                     yyVal = new KeywordArgNode(p.src_line(), p.assignableKeyword(((ByteList)yyVals[0+yyTop].value), new RequiredKeywordArgumentValueNode()));
@@ -6456,47 +6501,47 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[755] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[759] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ArrayNode(yyVals[yyTop - count + 1].start(), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[756] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[760] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-2+yyTop].value).add(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_push($1, get_value($3)) %*/
   return yyVal;
 };
-states[757] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[761] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new ArrayNode(yyVals[yyTop - count + 1].start(), ((KeywordArgNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[758] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[762] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((ListNode)yyVals[-2+yyTop].value).add(((KeywordArgNode)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_push($1, get_value($3)) %*/
   return yyVal;
 };
-states[759] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[763] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[760] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[764] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[761] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[765] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*% ripper: nokw_param!(Qnil) %*/
   return yyVal;
 };
-states[762] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[766] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.shadowing_lvar(yyVals[yyTop - count + 2].id);
                     /*%%%*/
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
@@ -6504,14 +6549,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: kwrest_param!($2) %*/
   return yyVal;
 };
-states[763] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[767] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = FWD_KWREST;
                     /*% %*/
                     /*% ripper: kwrest_param!(Qnil) %*/
   return yyVal;
 };
-states[764] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[768] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     p.setCurrentArg(null);
                     p.getLexContext().in_argdef = true;
@@ -6521,7 +6566,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[765] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[769] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.getLexContext().in_argdef = true;
                     p.setCurrentArg(null);
                     /*%%%*/
@@ -6531,43 +6576,43 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[766] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[770] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new BlockNode(yyVals[yyTop - count + 1].start()).add(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[767] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[771] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.appendToBlock(((ListNode)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_push($1, get_value($3)) %*/
   return yyVal;
 };
-states[768] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[772] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new BlockNode(yyVals[yyTop - count + 1].start()).add(((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[769] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[773] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.appendToBlock(((ListNode)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_push($1, get_value($3)) %*/
   return yyVal;
 };
-states[770] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[774] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = STAR;
   return yyVal;
 };
-states[771] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[775] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[772] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[776] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (!p.is_local_id(yyVals[yyTop - count + 2].id)) {
                         p.yyerror("rest argument must be local variable");
                     }
@@ -6578,22 +6623,22 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: rest_param!($2) %*/
   return yyVal;
 };
-states[773] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[777] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new UnnamedRestArgNode(p.src_line(), p.symbolID(CommonByteLists.EMPTY), p.getCurrentScope().addVariable("*"));
                     /*% %*/
                     /*% ripper: rest_param!(Qnil) %*/
   return yyVal;
 };
-states[774] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[778] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = AMPERSAND;
   return yyVal;
 };
-states[775] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[779] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[776] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[780] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     if (!p.is_local_id(yyVals[yyTop - count + 2].id)) {
                         p.yyerror("block argument must be local variable");
                     }
@@ -6604,7 +6649,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: blockarg!($2) %*/
   return yyVal;
 };
-states[777] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[781] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = p.arg_var(p.shadowing_lvar(ANON_BLOCK));
                     /*%%%*/
                     yyVal = new BlockArgNode(((ArgumentNode)yyVal));
@@ -6614,24 +6659,24 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     %*/
   return yyVal;
 };
-states[778] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[782] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((BlockArgNode)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[779] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[783] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = null;
   return yyVal;
 };
-states[780] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[784] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.value_expr(((Node)yyVals[0+yyTop].value));
                     yyVal = ((Node)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[781] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[785] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.setState(EXPR_BEG);
   return yyVal;
 };
-states[782] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[786] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (((Node)yyVals[-1+yyTop].value) == null) {
                         p.yyerror("can't define single method for ().");
@@ -6644,41 +6689,41 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: paren!($3) %*/
   return yyVal;
 };
-states[783] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[787] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new HashNode(p.src_line());
                     /*% %*/
   return yyVal;
 };
-states[784] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[788] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.remove_duplicate_keys(((HashNode)yyVals[-1+yyTop].value));
                     /*% %*/
                     /*% ripper: assoclist_from_args!($1) %*/
   return yyVal;
 };
-states[785] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[789] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = new HashNode(p.src_line(), ((KeyValuePair)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
   return yyVal;
 };
-states[786] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[790] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = ((HashNode)yyVals[-2+yyTop].value).add(((KeyValuePair)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: rb_ary_push($1, get_value($3)) %*/
   return yyVal;
 };
-states[787] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[791] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.createKeyValue(((Node)yyVals[-2+yyTop].value), ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: assoc_new!($1, $3) %*/
   return yyVal;
 };
-states[788] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[792] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node label = p.asSymbol(yyVals[yyTop - count + 2].start(), ((ByteList)yyVals[-1+yyTop].value));
                     yyVal = p.createKeyValue(label, ((Node)yyVals[0+yyTop].value));
@@ -6686,7 +6731,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: assoc_new!($1, $2) %*/
   return yyVal;
 };
-states[789] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[793] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     Node label = p.asSymbol(yyVals[yyTop - count + 1].start(), ((ByteList)yyVals[0+yyTop].value));
                     Node var = p.gettable(((ByteList)yyVals[0+yyTop].value));
@@ -6696,7 +6741,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: assoc_new!($1, Qnil) %*/
   return yyVal;
 };
-states[790] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[794] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     if (((Node)yyVals[-2+yyTop].value) instanceof StrNode) {
                         DStrNode dnode = new DStrNode(yyVals[yyTop - count + 2].start(), p.getEncoding());
@@ -6711,14 +6756,14 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: assoc_new!(dyna_symbol!($2), $4) %*/
   return yyVal;
 };
-states[791] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[795] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     /*%%%*/
                     yyVal = p.createKeyValue(null, ((Node)yyVals[0+yyTop].value));
                     /*% %*/
                     /*% ripper: assoc_splat!($2) %*/
   return yyVal;
 };
-states[792] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[796] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     p.forwarding_arg_check(FWD_KWREST, FWD_ALL, "keyword rest");
                     /*%%%*/
                     yyVal = p.createKeyValue(null, p.declareIdentifier(FWD_KWREST));
@@ -6726,80 +6771,80 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
                     /*% ripper: assoc_splat!(Qnil) %*/
   return yyVal;
 };
-states[793] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[797] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[794] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[798] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[795] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[799] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[796] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[800] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[797] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[801] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[798] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[802] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[799] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[803] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[800] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[804] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[801] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[805] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[802] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[806] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[803] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[807] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[804] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[808] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[806] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[810] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = ((ByteList)yyVals[0+yyTop].value);
   return yyVal;
 };
-states[811] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[815] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = RPAREN;
   return yyVal;
 };
-states[812] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[816] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = RBRACKET;
   return yyVal;
 };
-states[813] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[817] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                     yyVal = RCURLY;
   return yyVal;
 };
-states[821] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[825] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                       yyVal = null;
   return yyVal;
 };
-states[822] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
+states[826] = (RubyParser p, Object yyVal, ProductionState[] yyVals, int yyTop, int count, int yychar) -> {
                   yyVal = null;
   return yyVal;
 };
 }
-					// line 4818 "parse.y"
+					// line 4851 "parse.y"
 
 }
-					// line 14931 "-"
+					// line 15176 "-"
diff --git a/core/src/main/java/org/jruby/parser/RubyParser.y b/core/src/main/java/org/jruby/parser/RubyParser.y
index 1faa25eb995..65544bb45af 100644
--- a/core/src/main/java/org/jruby/parser/RubyParser.y
+++ b/core/src/main/java/org/jruby/parser/RubyParser.y
@@ -267,7 +267,7 @@ import static org.jruby.util.CommonByteLists.FWD_KWREST;
 %type <DefHolder> def_name defn_head defs_head
 %type <NodeExits> block_open k_while k_until k_for allow_exits
 %type <@@prod_type@@> top_compstmt top_stmts top_stmt begin_block endless_arg endless_command
-%type <@@prod_type@@> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call method_call
+%type <@@prod_type@@> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call command_call_value method_call
 %type <@@prod_type@@> expr_value expr_value_do arg_value primary_value
 %type <@@prod_type@@> rel_expr
 %type <@@prod_fcall_type@@> fcall
@@ -673,9 +673,8 @@ stmt            : keyword_alias fitem {
                     /*% ripper: END!($4) %*/
                 }
                 | command_asgn
-                | mlhs '=' lex_ctxt command_call {
+                | mlhs '=' lex_ctxt command_call_value {
                     /*%%%*/
-                    p.value_expr($4);
                     $$ = node_assign($1, $4, $3);
                     /*% %*/
                     /*% ripper: massign!($1, $4) %*/
@@ -737,6 +736,13 @@ command_asgn    : lhs '=' lex_ctxt command_rhs {
                     /*% %*/
                     /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
                 }
+                | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt command_rhs {
+                    /*%%%*/
+                    p.value_expr($6);
+                    $$ = p.new_attr_op_assign($1, $2, $3, $4, $6);
+                    /*% %*/
+                    /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/
+                }
                 | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs {
                     /*%%%*/
                     int line = @1.start();
@@ -744,13 +750,19 @@ command_asgn    : lhs '=' lex_ctxt command_rhs {
                     /*% %*/
                     /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/
                 }
-                | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt command_rhs {
+                | tCOLON3 tCONSTANT tOP_ASGN lex_ctxt command_rhs {
                     /*%%%*/
-                    p.value_expr($6);
-                    $$ = p.new_attr_op_assign($1, $2, $3, $4, $6);
+                    Integer pos = p.src_line();
+                    $$ = p.new_const_op_assign(pos, new Colon3Node(pos, p.symbolID($2)), $3, $5, $4);
                     /*% %*/
-                    /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/
+                    /*% ripper: opassign!(top_const_field!($2), $3, $5) %*/
                 }
+                | backref tOP_ASGN lex_ctxt command_rhs {
+                    /*%%%*/
+                    p.backref_error($1);
+                    /*% %*/
+                    /*% ripper[error]: backref_error(p, RNODE($1), assign!(var_field(p, $1), $4)) %*/
+                };
  		| defn_head f_opt_paren_args '=' endless_command {
                     p.endless_method_name($1, @1);
                     p.restore_defun($1);
@@ -769,12 +781,6 @@ command_asgn    : lhs '=' lex_ctxt command_rhs {
                     /*% %*/                    
                     /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
                     p.popCurrentScope();
-                }
-                | backref tOP_ASGN lex_ctxt command_rhs {
-                    /*%%%*/
-                    p.backref_error($1);
-                    /*% %*/
-                    /*% ripper[error]: backref_error(p, RNODE($1), assign!(var_field(p, $1), $4)) %*/
                 };
 
 endless_command : command
@@ -786,15 +792,15 @@ endless_command : command
                     /*% ripper: rescue_mod!($:1, $:4) %*/
                 }
                 | keyword_not opt_nl endless_command {
+                    /*%%%/
                     $$ = p.call_uni_op(p.method_cond($3), NOT);
                     /*% ripper: unary!(ID2VAL(idNOT), $:3) %*/
                 };
 
-command_rhs     : command_call %prec tOP_ASGN {
-                    p.value_expr($1);
+command_rhs     : command_call_value %prec tOP_ASGN {
                     $$ = $1;
                 }
-		| command_call modifier_rescue after_rescue stmt {
+		| command_call_value modifier_rescue after_rescue stmt {
                     /*%%%*/
                     p.getLexContext().in_rescue = $3.in_rescue;
                     p.value_expr($1);
@@ -913,6 +919,11 @@ expr_value_do   : {
 command_call    : command
                 | block_command
 
+command_call_value : command_call {
+                       p.value_expr($1);
+                       $$ = $1;
+                   };
+
 // Node:block_command - A call with a block (foo.bar {...}, foo::bar {...}, bar {...}) [!null]
 block_command   : block_call
                 | block_call call_op2 operation2 command_args {
@@ -1716,7 +1727,7 @@ arg             : lhs '=' lex_ctxt arg_rhs {
                     $$ = node_assign($1, $4, $3);
                     /*% %*/
                     /*% ripper: assign!($1, $4) %*/
-                }
+                } 
                 | var_lhs tOP_ASGN lex_ctxt arg_rhs {
                     /*%%%*/
                     $$ = p.new_op_assign($1, $2, $4, $3);
@@ -1902,13 +1913,6 @@ arg             : lhs '=' lex_ctxt arg_rhs {
                     p.getLexContext().in_defined = false;                    
                     $$ = p.new_defined(@1.start(), $4);
                 }
-                | arg '?' arg opt_nl ':' arg {
-                    /*%%%*/
-                    p.value_expr($1);
-                    $$ = p.new_if(@1.start(), $1, $3, $6);
-                    /*% %*/
-                    /*% ripper: ifop!($1, $3, $6) %*/
-                }
                 | defn_head f_opt_paren_args '=' endless_arg {
                     p.endless_method_name($1, @1);
                     p.restore_defun($1);
@@ -1930,10 +1934,18 @@ arg             : lhs '=' lex_ctxt arg_rhs {
                     /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
                     p.popCurrentScope();
 		}
+                | arg '?' arg opt_nl ':' arg {
+                    /*%%%*/
+                    p.value_expr($1);
+                    $$ = p.new_if(@1.start(), $1, $3, $6);
+                    /*% %*/
+                    /*% ripper: ifop!($1, $3, $6) %*/
+                }
                 | primary {
                     $$ = $1;
                 };
 
+ 
 endless_arg     : arg %prec modifier_rescue
                 | endless_arg modifier_rescue after_rescue arg {
                     p.getLexContext().in_rescue = $3.in_rescue;
@@ -2073,6 +2085,27 @@ call_args       : command {
                     /*% %*/
                     /*% ripper: args_add!(args_new!, $1) %*/
                 }
+                | defn_head f_opt_paren_args '=' endless_command {
+                    p.endless_method_name($1, @1);
+                    p.restore_defun($1);
+                    /*%%%*/
+                    $$ = new DefnNode($1.line, $1.name, $2, p.getCurrentScope(), p.reduce_nodes(p.remove_begin($4)), @4.end());
+                    if (p.isNextBreak) $<DefnNode>$.setContainsNextBreak();
+                    // Changed from MRI (combined two stmts)
+                    /*% %*/
+                    /*% ripper: def!(get_value($1), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
+                    p.popCurrentScope();
+		}
+                | defs_head f_opt_paren_args '=' endless_command {
+                    p.endless_method_name($1, @1);
+                    p.restore_defun($1);
+                    /*%%%*/
+                    $$ = new DefsNode($1.line, (Node) $1.singleton, $1.name, $2, p.getCurrentScope(), p.reduce_nodes(p.remove_begin($4)), @4.end());
+                    if (p.isNextBreak) $<DefsNode>$.setContainsNextBreak();
+                    /*% %*/
+                    /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
+                    p.popCurrentScope();
+		}
                 | args opt_block_arg {
                     /*%%%*/
                     $$ = arg_blk_pass($1, $2);
diff --git a/core/src/main/java/org/jruby/parser/RubyParserBase.java b/core/src/main/java/org/jruby/parser/RubyParserBase.java
index b14b1212f2a..3b0c49c9fef 100644
--- a/core/src/main/java/org/jruby/parser/RubyParserBase.java
+++ b/core/src/main/java/org/jruby/parser/RubyParserBase.java
@@ -205,7 +205,7 @@ public ArgsNode args_with_numbered(ArgsNode args, int paramCount, Node itNode) {
             args = new_args(lexer.getRubySourceline(), pre, null, null, null, null);
         } else if (itNode != null) {
             DVarNode dvar = (DVarNode) itNode;
-            Node arg = new ArgumentNode(dvar.getLine(), dvar.getName(), dvar.getDepth());
+            Node arg = new ArgumentNode(dvar.getLine(), dvar.getName(), dvar.getDepth(), true);
             args = new_args(lexer.getRubySourceline(), newArrayNode(arg.getLine(), arg), null, null, null, null);
         }
         return args;
@@ -397,7 +397,7 @@ public Node declareIdentifier(ByteList byteName) {
             node = new LocalVarNode(lexer.tokline, slot, name);
         } else if (dyna_in_block() && id.equals("it")) {
             if (!hasArguments()) {
-                int existing = currentScope.isDefinedNotImplicit(id);
+                int existing = currentScope.isDefinedOrImplicit(id);
                 boolean newIt = false;
 
                 if (existing == -1) {
@@ -416,7 +416,7 @@ public Node declareIdentifier(ByteList byteName) {
                 node = new DVarNode(lexer.tokline, slot, name);
                 if (newIt) set_it_id(node);
             } else {
-                slot = currentScope.isDefinedNotImplicit(id);
+                slot = currentScope.isDefinedOrImplicit(id);
                 // A special it cannot exist without being marked as a special it.
                 if (it_id() != null) compile_error("`it` is not allowed when an ordinary parameter is defined");
 
@@ -542,7 +542,10 @@ public Node appendToBlock(Node head, Node tail) {
     public AssignableNode assignableInCurr(ByteList nameBytes, Node value) {
         RubySymbol name = symbolID(nameBytes);
         currentScope.addVariableThisScope(name.idString());
-        if (warnOnUnusedVariables) scopedParserState.addDefinedVariable(name, lexer.getRubySourceline());
+        if (warnOnUnusedVariables) {
+            scopedParserState.addDefinedVariable(name, lexer.getRubySourceline());
+            scopedParserState.markUsedVariable(name, 0);
+        }
         return currentScope.assign(lexer.getRubySourceline(), name, makeNullNil(value));
     }
 
@@ -970,13 +973,13 @@ public Node void_stmts(Node node) {
      * assign_in_cond
 	 **/
     private boolean checkAssignmentInCondition(Node node) {
-        if (node instanceof MultipleAsgnNode || node instanceof LocalAsgnNode || node instanceof DAsgnNode || node instanceof GlobalAsgnNode || node instanceof InstAsgnNode) {
+        if (node instanceof MultipleAsgnNode || node instanceof LocalAsgnNode || node instanceof DAsgnNode || node instanceof GlobalAsgnNode || node instanceof InstAsgnNode || node instanceof ClassVarAsgnNode || node instanceof ConstDeclNode) {
             Node valueNode = ((AssignableNode) node).getValueNode();
             if (isStaticContent(valueNode)) {
                 warning(ID.ASSIGNMENT_IN_CONDITIONAL, lexer.getFile(), valueNode.getLine(), "found '= literal' in conditional, should be ==");
             }
             return true;
-        } 
+        }
 
         return false;
     }
@@ -1401,6 +1404,14 @@ public void fixpos(Node node, Node orig) {
         if (node == null || orig == null) return;
 
         node.setLine(orig.getLine());
+
+        // Detect IfNode and propagate newline to the bodies.
+        // This is a bit of a form-fitted fix, but the full reduce_nodes logic from CRuby
+        // defied an initial porting attempt. See jruby/jruby#9293.
+        if (node.isNewline() && node instanceof IfNode ifNode) {
+            if (ifNode.getThenBody() instanceof Node thenNode) thenNode.setNewline();
+            if (ifNode.getElseBody() instanceof Node elseNode) elseNode.setNewline();
+        }
     }
 
     public Node new_fcall(ByteList operation) {
@@ -1716,11 +1727,6 @@ public static boolean is_local_id(ByteList name) {
         return RubyLexer.isIdentifierChar(name.charAt(0));
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public boolean is_local_id(String name) {
-        return RubyLexer.isIdentifierChar(name.charAt(0));
-    }
-
     // 1.9
     public ListNode list_append(Node list, Node item) {
         if (list == null) return new ArrayNode(item.getLine(), item);
@@ -2001,11 +2007,6 @@ public NumericNode negateNumeric(NumericNode node) {
 
     public static final ByteList INTERNAL_ID = new ByteList(new byte[] {}, USASCIIEncoding.INSTANCE);
 
-    @Deprecated(since = "9.2.0.0")
-    public String internalId() {
-        return INTERNAL_ID.toString();
-    }
-
     protected void begin_definition(String name) {
         LexContext ctxt = getLexContext();
         ctxt.in_class = name != null;
diff --git a/core/src/main/java/org/jruby/parser/StaticScope.java b/core/src/main/java/org/jruby/parser/StaticScope.java
index c21feef6a6d..4ae833d2772 100644
--- a/core/src/main/java/org/jruby/parser/StaticScope.java
+++ b/core/src/main/java/org/jruby/parser/StaticScope.java
@@ -430,7 +430,7 @@ public int exists(String name) {
      * @param name of the variable to find
      * @return index of variable; -1 if it does not exist; -2 if is implicit.
      */
-    public int existsAndNotImplicit(String name) {
+    public int existsOrImplicit(String name) {
         int slot = findVariableName(name);
         if (slot >= 0 && isImplicitVariable(slot)) return IMPLICIT;
         return slot;
@@ -455,14 +455,25 @@ public int isDefined(String name) {
     }
 
     /**
-     * Is this name visible to the current scope and not an implicit variable ("it", "_1", etc).
+     * Is this name visible to the current scope as either a variable or an implicit variable
+     *
+     * @param name to be looked for
+     * @return a location where the left-most 16 bits of number of scopes down it is and the
+     * right-most 16 bits represents its index in that scope
+     */
+    public int isDefinedOrImplicit(String name) {
+        return isDefinedOrImplicit(name, 0);
+    }
+
+    /**
+     * Is this name visible to the current scope and not an implicit parameter ("it", "_1", etc).
      *
      * @param name to be looked for
      * @return -1 if it is not defined; -2 if it is implicit; or a location where the left-most 16 bits of number of scopes down it is and the
      * right-most 16 bits represents its index in that scope.
      */
-    public int isDefinedNotImplicit(String name) {
-        return isDefinedNotImplicit(name, 0);
+    public int isDefinedImplicitParameter(String name) {
+        return isDefinedImplicitParameter(name, 0);
     }
 
     /**
@@ -547,11 +558,12 @@ public <T> T collectVariables(IntFunction<T> collectionFactory, BiConsumer<T, St
      * @return populated collection
      */
     public <T> T collectAllVariables(ThreadContext context, BiFunction<ThreadContext, Integer, T> collectionFactory, BiConsumer<T, String> collectionPopulator) {
-        return collectVariables(context, collectionFactory, collectionPopulator, null);
+        T collection = collectVariables(context, collectionFactory, collectionPopulator, false, true);
+        return collectVariables(context, (t, i) -> collection, collectionPopulator, true, true);
     }
 
     /**
-     * Populate a deduplicated collection of variable names in scope using the given functions.
+     * Populate a deduplicated collection of non-implicit variable names in scope using the given functions.
      *
      * This may include variables that are not strictly Ruby local variable names, so the consumer should validate
      * names as appropriate.
@@ -562,7 +574,7 @@ public <T> T collectAllVariables(ThreadContext context, BiFunction<ThreadContext
      * @return populated collection
      */
     public <T> T collectVariables(ThreadContext context, BiFunction<ThreadContext, Integer, T> collectionFactory, BiConsumer<T, String> collectionPopulator) {
-        return collectVariables(context, collectionFactory, collectionPopulator, false);
+        return collectVariables(context, collectionFactory, collectionPopulator, false, true);
     }
 
     /**
@@ -576,42 +588,47 @@ public <T> T collectVariables(ThreadContext context, BiFunction<ThreadContext, I
      * @param <T> resulting collection type
      * @return populated collection
      */
-    public <T> T collectImplicitVariables(ThreadContext context, BiFunction<ThreadContext, Integer, T> collectionFactory, BiConsumer<T, String> collectionPopulator) {
-        return collectVariables(context, collectionFactory, collectionPopulator, true);
+    public <T> T collectImplicitParameters(ThreadContext context, BiFunction<ThreadContext, Integer, T> collectionFactory, BiConsumer<T, String> collectionPopulator) {
+        return collectVariables(context, collectionFactory, collectionPopulator, true, false);
     }
 
-    public <T> T collectVariables(ThreadContext context, BiFunction<ThreadContext, Integer, T> collectionFactory, BiConsumer<T, String> collectionPopulator, Boolean implicit) {
+    private <T> T collectVariables(ThreadContext context, BiFunction<ThreadContext, Integer, T> collectionFactory, BiConsumer<T, String> collectionPopulator, boolean implicit, boolean parents) {
         StaticScope current = this;
 
         T collection = collectionFactory.apply(context, current.variableNamesLength);
 
         HashMap<String, Object> dedup = new HashMap<>();
 
-        while (current.isBlockOrEval) {
-            addVariableNamesToCollection(current, collectionPopulator, dedup, collection, implicit);
+        addVariableNamesToCollection(current, collectionPopulator, dedup, collection, implicit);
+
+        if (parents) {
             current = current.enclosingScope;
-        }
 
-        // once more for method scope
-        addVariableNamesToCollection(current, collectionPopulator, dedup, collection, implicit);
+            while (current.isBlockOrEval) {
+                addVariableNamesToCollection(current, collectionPopulator, dedup, collection, implicit);
+                current = current.enclosingScope;
+            }
+
+            // once more for method scope
+            addVariableNamesToCollection(current, collectionPopulator, dedup, collection, implicit);
+        }
 
         return collection;
     }
 
-    private static <T> void addVariableNamesToCollection(StaticScope current, BiConsumer<T, String> collectionPopulator, HashMap<String, Object> dedup, T collection, Boolean implicit) {
+    private static <T> void addVariableNamesToCollection(StaticScope current, BiConsumer<T, String> collectionPopulator, HashMap<String, Object> dedup, T collection, boolean implicit) {
         BitSet implicitVariables = current.implicitVariables;
 
         boolean hasImplicits = implicitVariables != null;
-        boolean filterImplicits = implicit != null;
-        if (filterImplicits && implicit && !hasImplicits) return;
+        if (implicit && !hasImplicits) return;
 
         int variableNamesLength = current.variableNamesLength;
         String[] variableNames = current.variableNames;
 
         for (int i = 0; i < variableNamesLength; i++) {
             if (hasImplicits && implicitVariables.get(i)) {
-                if (filterImplicits && !implicit) continue;
-            } else if (filterImplicits && implicit) continue;
+                if (!implicit) continue;
+            } else if (implicit) continue;
 
             String name = variableNames[i];
             dedup.computeIfAbsent(name, key -> {
@@ -632,7 +649,20 @@ public RubyArray getLocalVariables(Ruby runtime) {
      * @return populated RubyArray
      */
     public RubyArray getLocalVariables(ThreadContext context) {
-        return collectAllVariables(
+        return collectVariables(
+                context,
+                Create::allocArray,
+                (array, id) -> appendVariableIfValid(context, array, id));
+    }
+
+    /**
+     * Get a Ruby Array of all implicit local variables.
+     *
+     * @param context the current context
+     * @return populated RubyArray
+     */
+    public RubyArray getImplicitParameters(ThreadContext context) {
+        return collectImplicitParameters(
                 context,
                 Create::allocArray,
                 (array, id) -> appendVariableIfValid(context, array, id));
@@ -654,19 +684,26 @@ public int isDefined(String name, int depth) {
         }
     }
 
-    public int isDefinedNotImplicit(String name, int depth) {
-        int slot = existsAndNotImplicit(name);
-        if (slot == IMPLICIT) return slot;
-
+    public int isDefinedOrImplicit(String name, int depth) {
         if (isBlockOrEval) {
+            int slot = existsOrImplicit(name);
+            if (slot == IMPLICIT) return slot;
+
             if (slot >= 0) return (depth << 16) | slot;
 
-            return enclosingScope.isDefinedNotImplicit(name, depth + 1);
+            return enclosingScope.isDefinedOrImplicit(name, depth + 1);
         } else {
-            return (depth << 16) | slot;
+            return (depth << 16) | existsOrImplicit(name);
         }
     }
 
+    public int isDefinedImplicitParameter(String name, int depth) {
+        int slot = existsOrImplicit(name);
+        if (slot == IMPLICIT) return slot;
+
+        return -1;
+    }
+
     public AssignableNode addAssign(int line, RubySymbol symbolID, Node value) {
         int slot = addVariable(symbolID.idString());
         // No bit math to store level since we know level is zero for this case
diff --git a/core/src/main/java/org/jruby/parser/StaticScopeFactory.java b/core/src/main/java/org/jruby/parser/StaticScopeFactory.java
index 596da985bbf..c711994881d 100644
--- a/core/src/main/java/org/jruby/parser/StaticScopeFactory.java
+++ b/core/src/main/java/org/jruby/parser/StaticScopeFactory.java
@@ -55,24 +55,6 @@ public static StaticScope newIRBlockScope(StaticScope parent) {
         return scope;
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public static StaticScope newStaticScope(StaticScope parent, StaticScope.Type type, String[] names) {
-        if(names == null) {
-            return new StaticScope(type, parent);
-        } else {
-            return new StaticScope(type, parent, names);
-        }
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static StaticScope newStaticScope(StaticScope parent, StaticScope.Type type, String[] names, int keywordArgIndex) {
-        if(names == null) {
-            return new StaticScope(type, parent);
-        } else {
-            return new StaticScope(type, parent, names, keywordArgIndex);
-        }
-    }
-
     public static StaticScope newStaticScope(StaticScope parent, StaticScope.Type type, String file, String[] names, int keywordArgIndex) {
         if(names == null) {
             return new StaticScope(type, parent, file);
diff --git a/core/src/main/java/org/jruby/parser/YyTables.java b/core/src/main/java/org/jruby/parser/YyTables.java
index 2b0f32c1dff..3f4f5df8685 100644
--- a/core/src/main/java/org/jruby/parser/YyTables.java
+++ b/core/src/main/java/org/jruby/parser/YyTables.java
@@ -53,2577 +53,2775 @@ public static final int[] yyCheck() {
    private static final int[] yyTable1() {
       return new int[] {
 
-          110,   92,  323,  410,  454,  457,  368,  311,  234,  234, 
-          321,  277,  284,  416,  601,   99,  495,  208,  209,  423, 
-          693,  430,  789,  201,  784,  796,  345,  204,  236,  236, 
-          591,  925,  332,  697,  504,  591,  986,  368,  311,  255, 
-          577,  314,  719,  201,  661,  577,  719,  204,  919,  282, 
-          922,  281,  281,  288,  292,  242,  242,  435,  722,  435, 
-          435,  718,  311,  237,  237,  657,   99,   99,  666,  798, 
-          312,  453,  797,  311,  311,  917,  674,  252,  821,  204, 
-          236,  575,  339,  339,  775,  328,  329,  330,  779,  534, 
-          248,  751,  689,  536,  821,  287,  291,  722,  823,  905, 
-          718,  359,  365,  285,  239,  246,  262,  261, 1184,  823, 
-          234,  616,  555,  557,  367, 1005,  841,  821,  714,  857, 
-          841,  841,  247,  455,  365,  312,  882,  821,  814,  474, 
-          236,  419,  236,  770,  236,  236,  470,  470,  821,  657, 
-          204,  666,  403,  821,  746,  326,  940,  401, 1007, 1169, 
-          489,  364,  402,  523, 1230,  981,  476,  242, 1061,  365, 
-          616,  409, 1190,  835, 1277,  237,  821,  807,  112,  808, 
-          418,  483,  738,  364,  748,  746, 1261, 1264,  746,  797, 
-          921,  520,  415,  277,  752,   98,  365,  821,  821,  506, 
-          253,  509,  256,  746,  368,  438,  737,  738,  342, 1130, 
-          822,  247,  758, 1114, 1114,  409,  432, 1344,  364, 1242, 
-          787,  926,  821, 1189,  341,  752,  821,  540,  752,  722, 
-          779,  252, 1250,  281,  860,  415,  545,  605,  788,  339, 
-          339,  822,  326,  752,  277,  364,  314,  821,   99,  808, 
-          234, 1319,  415,  234, 1231,  503, 1259, 1262,  517,  759, 
-          722,  779,  614,  615,  616,  617,  110,   92,  311,  415, 
-          236,  821,  738,  236,  236,  880,  236,  314,  722,  779, 
-          414,   99,  282,  610,  281, 1005,  495,  719, 1344,  719, 
-          525,  257,  435,  822, 1075,  252,  737,  488, 1348,   99, 
-          242,  722,  807,  415,  808,  499,  718,  517,  237,  821, 
-          989,  604,  526,  606,  488,  678, 1157,  435,  435,  435, 
-          435, 1058,  620,  621, 1225,  917,  794,  946,  408,  314, 
-          133,  312,  353,  252, 1223,  822,  770,  912,  142, 1114, 
-          395,  881,  394,  515,  248,  821,  889,  418,  544,  505, 
-          530,  281,  971,  281,  484,  485,  123,  756,  687,  756, 
-          694, 1351,  868,  251,  738, 1016,   99,  236,   99,  695, 
-          979,  341,  408,  696,  687,  538,   92,  353,  616,  109, 
-          368,  821, 1353,  802,  529,  821,  821,  142,  719,  311, 
-           99,  684,  236,  236,  236,  236,  277,  236,  236,  841, 
-          841,  821,  821,  687,  688,  841,  841,  718, 1019,  821, 
-          109, 1018,  574,   98,  773,  435,  965,  234,  821,  687, 
-         1064, 1053,  503,  680,  921, 1183,  684,  746, 1183,  821, 
-          109, 1009, 1011, 1013,  282, 1015,  281,  236,  822,  821, 
-         1017,  281,  809,  377, 1353,  773,  667, 1226,  773,  341, 
-          763,   99,  312, 1182,  667,  821,   99,  817,  821,  819, 
-          821,  141,  616,  773,  821,  540,  691,  752, 1129, 1129, 
-          575,  537, 1018,  274,  821,  805,  821,  591,  234,  591, 
-         1188,  763,  821, 1278,  763,  770,  770,  821,  841,  326, 
-          236,  234,  821,  412,  422,  665,  503,  686,  236,  763, 
-          841,  415,  722,  779,  893,  821,  311,  809,  671,   60, 
-          141,  236,  675,  676,  677,  517,  816,  746,  821,  667, 
-          820,  822,  895,  821,  807,  242, 1347,  795,  773, 1349, 
-          548,  804,  807,  237,  821,  731,  412,  413, 1384,  201, 
-          720,  821,  686,  204,  718,  335,  609,  234,  405,   99, 
-          667,  862,  503,  412,  487,  906,  898,  752, 1062,  906, 
-          811,  719,   14,   14,  763,  152,  821,  236,  665,  312, 
-          412,  519,  312,  722,  705,  667,  374,  375,  777,  744, 
-          721,  550,  551,  723,  724, 1360,  466, 1158, 1160, 1161, 
-         1162,  142,  722,  779, 1129,  142,  809, 1042,  540,  665, 
-         1355,  515, 1357,  794,  412,  543,  794,  281,  739,  777, 
-          281,  415,  234,  382,  383,  821,  431,  503,  657,  799, 
-          666,   14,   99,  236,  665,   99,  236,  777,  812,  917, 
-         1148, 1283,  236,  353,  353,  866, 1129, 1129, 1129,  311, 
-          667,  737,   99,  421,  770,  770,  837,  527,  109,  762, 
-          837,  837,  855,  864,  530,  312,  701, 1233,  931,  687, 
-          687,  874, 1390,  821,  899,  935,  839, 1166,  821,  466, 
-          846,  445,  883,  821,  834,  687,  687,  800,  893,  809, 
-          896,  821,  834,  374,  375,  917, 1069,  773,  533,  665, 
-          737,  252,  777,  281,  838,  415,  763,  825,  838,  838, 
-          236,  281,  312, 1234,  234,  311,  833,  591,   99,  503, 
-          236,  281,  281,  591,  845, 1321,   99,  577,  141, 1220, 
-          445,  821, 1330,  763,  236, 1367,   99,   99,  425,  885, 
-         1345,  821,  667,  201,  851,  851,  824,  204,  980,  809, 
-          957,  982,  475,  313,  568,  831,  834,  426, 1129, 1299, 
-          816,  991, 1154,  831,  427,  236,  510,  809,  101,  960, 
-          569,  477,  958, 1254,  807,  926,  511,  512,  312,  988, 
-          863,  101,  101,  591,  313,  894,  152,  773,  548,  938, 
-          540,  665,  816,  577,  754,  445,  415,  924,  907,  908, 
-          573,  574,  909,  910,  924, 1292,  101,  779,  686,  686, 
-         1380,  987,  412,  608,    7,  821,  794, 1022,  415,  101, 
-          101,  815,  353,  763,    7,  251,  824,  831,  754,  281, 
-          644,  311,  787,  101,  435,  152,  313,  101,  453,  550, 
-          551, 1288, 1246,  754,   99,  828,  971,  479,  871,  706, 
-         1196, 1055,  122,  486,  686,  753,  779,  101,  807,  737, 
-         1059,  777,  821,  701,  821, 1063,  353,  353, 1066,  646, 
-         1163, 1164,  920,    7,  738,  726,  927,  644,  728, 1057, 
-          729,  968,  974,  101,  645,  101,  894,  101,  101,  753, 
-          737, 1241,  974,  821,  312,  281,  794,  741,  828,  686, 
-          353,  490,  353,  493,  753,  738,  107,  204,  754,  236, 
-           99,  821, 1281,  822, 1269,  353,  646,  105,  944,  945, 
-          808,  779,  412,  700, 1065, 1002,  950,  951,  808,  837, 
-          837,  645,  828,  494,  435,  837,  837,  107, 1334,    7, 
-          821,  821,  821, 1153,  822,  794,  821,  353,  105, 1028, 
-         1030,  777,  771, 1056,  403, 1034, 1036,  107,  496,  401, 
-          399,  738,  400,   99,  402,  236, 1252, 1253,  105,  753, 
-          234,  947,  446,  497,  932,  503,  647,  838,  838,  952, 
-          353,  970,  971,  838,  838,  994,  995, 1054,  997,  998, 
-          236,  101,  828,  281,   99,  807,  807,  807,  667,  821, 
-          890,  807,  807,  514,  807,  281,  412,  956,   99,  236, 
-         1024,  518,  807,  101,   97,  737,  101,  101,  837,  101, 
-           99,  446, 1269,  647,  101, 1269, 1186, 1187,  765, 1281, 
-          837, 1281,  312, 1350,  900,  695,  521,  851, 1133, 1165, 
-         1152,  524,  101,  152,  377, 1033,  737,  665,  532, 1156, 
-         1131, 1132,  859, 1293, 1294,  807, 1045,  807, 1136, 1179, 
-          535,  429,  765,  312,  737,  828,  838, 1139, 1143,  821, 
-         1147,  993,   99,  539,  821,  101,  821,  765,  838,  884, 
-          281,   99,  432,  102, 1247,  656,  446,  141,  656,  281, 
-         1350, 1281,  429, 1067,  937,   99,  656,  412, 1287,  430, 
-          942,  433,  943,  807,   99,  546, 1074,  558, 1076,  101, 
-          101,  101, 1077,  432,  102,  311,  821,  110, 1202,  412, 
-         1363,  821, 1203,  353,  353,  600, 1221,  821, 1149,  603, 
-          430,  821,  433,  101,  102,  101,  101,  101,  101,  435, 
-          101,  101,  765,  915,  607,  821,  821,  821,  110, 1200, 
-         1200, 1289,  821,  542,  542,  686,  686,  103,  281,  656, 
-          840,  656,  281, 1167,  847, 1176,  281,  990,  110,  611, 
-          974,  117,  669,   99,  821,  107,  431,   99, 1217, 1284, 
-          101,   99, 1249,  681,  117,  117,  105,  612,  103, 1260, 
-         1263,  656,  656,  143,  101,  698, 1339, 1340, 1290,  101, 
-          124,  704,  688,  353,  353,  821,  709,  431,  103, 1298, 
-          840,  710,  847,  730,  236,  656,  281,  656, 1279,  281, 
-          548,  725,  117,  117, 1369,  108,  828, 1312,  897,  688, 
-          129,   99,  496,  101,   99,  727,  117,  734,  281,  974, 
-          977,  101,  143, 1026, 1027,  377,  743,  688,  745,  281, 
-          311,  435,  435,   99,  101,  772,  108, 1236,  144, 1256, 
-         1258,  774,  390,  391,   99,  776,  106,  549,  778, 1000, 
-         1001,  550,  551, 1244,  688,  783,  108,  496,  828, 1177, 
-          656,  785,  656,  786,  818, 1004,  117,  821,  117,  117, 
-          117,  117,  101,  826,  689, 1273,  829,  106,  830,  311, 
-          435,  234,  861, 1143,  865,  868,  503,  144,  968,  496, 
-          101,  148,  871, 1328,  714,  281, 1366,  106,  809,  793, 
-          117,  236,  913,  117,  888,  681,  236,  236, 1137,  667, 
-           99,  435,  891,  892,  435, 1279,  548, 1279, 1229,  689, 
-          117,  924,  714,  889, 1279,  793,  714,  496,  930,  117, 
-          914,  681,  102,  828,  828,  933,  281,  934,  941,  948, 
-          148,  949, 1364,  714,  953,  101,  101,  955,  101,  101, 
-          681,   99,  656,  828,  656,  101,  959,  963,  665,  252, 
-         1174, 1229,  964,  553,  974,  101,  110,  550,  551,  966, 
-          708,  971,  496, 1279,  117, 1279,  681, 1279,  104, 1279, 
-          403,  398,  793,  996,  999,  401,  399,  575,  400,  992, 
-          402,  576, 1354, 1032, 1008, 1279,  117, 1010, 1012,  117, 
-          117, 1361,  117, 1014,  496,  788,  103,  117,  793,  104, 
-          125,   20,  689, 1029, 1031,  143, 1072,  101,  548, 1035, 
-         1037,  101,  101,  101, 1073,  117,  828,  828,  828,  104, 
-          143,  101, 1141,  101, 1145, 1238, 1239, 1159, 1229,  101, 
-         1178, 1185,   20, 1193, 1194,  148,  496,  101,  323,  101, 
-          101, 1197, 1388,  548, 1389, 1255, 1391,  689,  323, 1243, 
-           20, 1183, 1245, 1029, 1031,  553, 1035, 1037, 1087,  550, 
-          551,  403, 1397, 1295,  108, 1286,  401,  399,  101,  400, 
-         1296,  402, 1301,  688,  688,  511, 1302, 1305, 1313,  323, 
-         1314,  129,  117,  117,  117,  144, 1316, 1320,  828, 1322, 
-          554,  511, 1134, 1323,  550,  551, 1368,  323,  548, 1346, 
-          688,  688, 1177,  496,  496,  106,  117,  746,  117,  117, 
-          117,  117,  129,  117,  117,  129,   20,  496, 1309, 1310, 
-         1311,  511, 1358,  126, 1362,  511, 1134, 1370,  117,  793, 
-         1372,  323,  129, 1374, 1257,  821,  126,  126,  148, 1376, 
-         1378,  746,  127, 1394,  691,  553,  821,  101,  807,  550, 
-          551,  496, 1246,  117,  136,  793,  746,  809,  438,  548, 
-          556,  814,  496,  323,  814,  689,  689,  117,   40,   41, 
-           42,   43,  117,  548,  126,  126,  809,  816,  809,  372, 
-          714, 1300,  714,  714,  714,  714,  714,  809,  126,  691, 
-         1365, 1304,  809,  331,  496,  334,  681,  681,  656,  473, 
-          656,  761,  714, 1306, 1307, 1308,  117,  978, 1020, 1021, 
-          550,  551,  101,  101,  117,  517,  714,  613,  496,  496, 
-          755,  746,  681,  681,  550,  551,  714,  117,  740, 1038, 
-         1039,  714,  714,  714,  742,  144, 1291,  104,  126, 1048, 
-          126, 1337,  126,  126, 1331,  563,  136,  564,  565,  566, 
-          567,  568,  844,   20,   20,   20, 1356, 1270,  452,   20, 
-           20,  377,   20,  918, 1006,  117,  911,  569,  101, 1201, 
-           20,  923, 1180, 1359,  316,  317,  793,  318,  390,  391, 
-          101,  101,  681,  117,  336, 1387,  101,  101,  961,  651, 
-          126,  571,  690,  101,  336,  136,  572,  573,  574,  363, 
-          323,  323,  323,  689,  689,  323,  323,  323,  128,  323, 
-          692,  101,  101,   20, 1385,   20, 1251,  323, 1181,  323, 
-          323, 1248,  100,  101,  417,  336, 1266,  681,  330,  323, 
-          323, 1049,  323,  323,  323,  323,  323,  690,  117,  117, 
-         1371,  117,  117,  336, 1267,  732,  126, 1329,  117, 1089, 
-          129,  496,  377,  100,    0,  692,  112,  139,  117,  793, 
-          323,   20,  323,    0,    0,  569,    0,    0,  126,  101, 
-          548,  126,  126,   98,  126,  101,    0,  146,  119,  126, 
-          683,  101,    0,    0,  101,    0,  563,  794,  564,  565, 
-          566,  567,    0,  684,  323,  573,    0,  126,  101, 1265, 
-          120,    0,    0,    0,    0,  289,  139,  101,  323,  336, 
-          117,  648,    0,    0,  117,  117,  117,  760,  496,  496, 
-            0,  550,  551,  131,  117,  683,  117,    0,    0,    0, 
-          794,  120,  117,    0,  120,  635,  684,    0,  684,    0, 
-          117,    0,  117,  117,    0,  691,  691,  640,    0,    0, 
-          118,  120,  682,  793,  131,  636,    0,  131,  648,  798, 
-            0,    0,  648,  648,  126,  126,  126,    0,  641,    0, 
-          794,  117,    0,    0,  131,    0,  101,    0,  681,    0, 
-          101,  684,  635,    0,  101,    0,  635,  635,  126,    0, 
-          126,  126,  126,  126,  640,  126,  126,  682,  640,  640, 
-            0,    0,  636,  136,  798,    0,  636,  636,  793,    0, 
-            0,    0,  681,  794,  681,  641,  793,  101,    0,  641, 
-          641,    0,    0,    0,    0,  145,    0,  681,    0,  656, 
-            0,  656,    0,    0,  101,  126,  798,  101,  121,    0, 
-          685,    0,    0,  147,    0,    0,  336,  336,  336,  126, 
-          117,  336,  336,  336,  126,  336,  101,    0,    0,  681, 
-            0,    0,    0,  336,    0, 1126, 1126,  101,    0,    0, 
-          714,  146,  478,    0,    0,  480,  481,  482,  336,  336, 
-          336,  336,  336,  681,  681,  685,    0,    0,  126,    0, 
-          107,  793,  681,  690,  690,    0,  126,  794,  714,    0, 
-            0,  120,  714,  684,    0,  656,  336,  691,  336,  126, 
-            0,  692,  692,  138,  139,  117,  117,    0,    0,  714, 
-          146,  821,    0,    0,  101,    0,  133,  794,    0,  101, 
-          101,    0,    0,  101,    0,  336,    0,  150,    0,    0, 
-            0,  107,  107,    0,    0,  313,    0,  126,  684,    0, 
-            0,    0,  691,    0,  336,    0,  794,  133,    0,    0, 
-          133,    0,  353,    0,    0,  126,    0,  793,  145,  120, 
-          794,  117,    0,  798,  101,    0,  360,  133,    0,    0, 
-          794,  683,  683,  117,  117,  137,  150,    0,    0,  117, 
-          117, 1126,  131,  798,  684,  684,  117,    0,  485,    0, 
-          313,    0,    0,    0,  690,    0,    0,  353,  485,    0, 
-            0,  471,  471,    0,  117,  117,    0,  145,  798,    0, 
-          126,  126,    0,  126,  126,    0,  117,    0,    0,    0, 
-          126,    0,    0, 1126, 1126, 1126,    0,  684,  684,  485, 
-          126,    0,    0,    0,  485,    0,    0,    0,  793,  690, 
-          798,    0,    0,  682,  682,  316,  317,  485,  318,    0, 
-          798,  798,    0,    0,    0,   45,   46,    0,  123,    0, 
-            0,    0,  117,  140,    0,    0,    0,    0,  117,    0, 
-         1099, 1099,    0,    0,  117,    0,  563,  117,  564,  565, 
-          566,  567,  126,    0,    0,    0,  126,  126,  126,  123, 
-            0,  117,  123,    0,  687,   84,  126,    0,  126,    0, 
-          117,    0,    0,  107,  126,  681,  681,    0,  147,  123, 
-            0,  298,  126,  485,  126,  126,    0,    0,  146,    0, 
-            0,  298,  764,    0,    0,  711,  139,  794,    0,  717, 
-            0,  685,  685,  289,    0, 1126,  107, 1099, 1099,  687, 
-            0, 1099,    0,  126,  692,    0,   84,   84,    0,    0, 
-          309,    0,  298,    0,  107,  298,  714,  147,  714,  714, 
-          714,  714,  714,  369,  370,  371,  372,  373,  717,  117, 
-          298,    0,  289,  117,    0, 1099,    0,  117,  714,    0, 
-            0,  309,    0,    0,  150,  133,  313,    0,    0,  692, 
-            0,    0,  714,    0,  684,  684, 1099,  798,  691,  691, 
-            0,    0,  714,    0,  298,  309,    0,  714,  714,  714, 
-          117,    0,    0,    0, 1099,  145,  309,  309, 1099,   85, 
-            0,  107,  126,  107,    0,    0,  135,  117,  346,  780, 
-          117, 1099, 1099, 1099, 1099,    0,  298,    0, 1099, 1099, 
-            0, 1099,    0,    0,    0,  107,    0,    0,    0,  117, 
-          485,  485,  485,  353,  353,  485,  485,  485,    0,  485, 
-          117,    0,    0,  130,  798,  798,    0,  485,    0,  485, 
-           85,   85,    0,  346,  310,    0,    0,    0,    0,  485, 
-          485,    0,  485,  485,  485,  485,  485,  126,  126,    0, 
-            0,    0,    0,  793,  130,  690,  690,  130,    0,  793, 
-            0,    0,    0,  132,    0,  310,  107,  313,    0,    0, 
-          485,  107,  485,    0,  130,  850,  856,  117,   84,    0, 
-            0,    0,  117,  117,    0,    0,  117,  123,    0,  310, 
-            0,    0,    0,  794,  132,  485,  485,  132,    0,  794, 
-          310,  310,    0,  126,  793,    0,    0,  886,    0, 1099, 
-            0,   84, 1099,    0,  132,  126,  126,    0,  485,    0, 
-         1099,  126,  126,    0,  717,  147,  289,  117,  126,   84, 
-            0,    0,    0,  298,  298,  298,  793,    0,  298,  298, 
-          298,    0,  298,    0,  794,  684,  126,  126,    0,    0, 
-          298,    0,  298,  298,  298,  687,  687,    0,  126,    0, 
-            0,  309,  298,  298,  107,  298,  298,  298,  298,  298, 
-            0,    0,    0,    0,    0,  794,  794, 1099,    0,  684, 
-          929,  684,    0,  134,  313,  354, 1341,    0,  564,  565, 
-          566,  567,    0,  298,  684,  298,   84,    0,   84, 1282, 
-            0,    0,   85,    0,  126,  692,  692,    0,    0,    0, 
-          126,    0,    0,    0,    0,  122,  126,    0,    0,  126, 
-           84,  154,  298,    0,    0,  717,  684,  298,    0,  124, 
-          354,    0,    0,  126,    0,   85,    0,  107,    0,    0, 
-          107,  298,  126,    0,  298,    0,  122,  962,    0,  122, 
-            0,  686,    0,   85,    0,    0,  103,  107,  794,  684, 
-          124,    0,    0,  124,    0,  688,  122,    0, 1100, 1100, 
-          125,    0,  984,    0,    0,    0,    0,  109,    0,    0, 
-          124,   84,  309,    0,    0,  310,   84,    0,    0,  346, 
-          346,    0,  130,  793, 1280,    0,  686,    0,    0,    0, 
-            0,  125,    0,    0,  125,    0,  689,  103,  103,  842, 
-          688,  126,    0,  842,  842,  126, 1282,  313, 1282,  126, 
-           85,  125,   85,  107,    0, 1282,    0,    0,  109,  109, 
-            0,  107,  132,  794,    0, 1100, 1100,    0,    0, 1100, 
-            0,  107,  107,    0,   85,    0,    0,    0,    0,    0, 
-            0,  689,  126,    0,  149,    0,    0,    0,    0,  138, 
-          793,  793, 1047,  362,    0,    0,    0,    0, 1051,  126, 
-            0,    0,  126, 1100, 1282,    0, 1282,    0, 1282,   84, 
-         1282,    0, 1060,  313,  793,    0,    0,    0,    0,  151, 
-          793,  126,  903,    0, 1100,  683, 1282,    0,  289,  309, 
-          794,  794,  126,  149,    0,   85,  310,    0,  138,    0, 
-           85, 1280, 1100, 1280,    0,  794, 1100, 1280,  153,  794, 
-         1280,    0,    0,    0,    0,  794,    0,  137,    0, 1100, 
-         1100, 1100, 1100,    0,    0,  793, 1100, 1100,  151, 1100, 
-          683,    0,    0,    0,    0, 1138,    0,    0,    0,  107, 
-            0,    0,   84,    0,    0,   84,    0,    0,    0,  126, 
-         1151,    0,    0,  682,  126,  126,    0,  793,  126, 1280, 
-          794, 1280,   84, 1280,    0, 1280,  137,    0,  268,  103, 
-            0,    0,  684,  684,  122,    0,  354,  354,  268,    0, 
-            0, 1280,    0,    0,    0,    0,    0,    0,  124,  313, 
-          109,    0,  794,   85,    0,    0,    0,    0,  682,  126, 
-            0,    0,  103,    0,    0,  107,    0,    0,    0,  268, 
-            0,    0,  268,  310,   84,  798,    0,    0,   84,   84, 
-          103,    0,  309,  109,    0,    0,  268,  268,   84,  125, 
-          563,  268,  564,  565,  566,  567,   84, 1100,    0, 1224, 
-         1100,  109,  686,  686,    0,  793,   84,   84, 1100,  798, 
-            0,  798,    0, 1109, 1109,    0,  688,  688,    0,    0, 
-            0,  268,    0,    0,  798,    0,   85,    0,    0,   85, 
-            0,    0,  842,  842,    0,    0,  764,    0,  842,  842, 
-            0,  765,    0,    0,    0,  140,   85,  103,  309,  103, 
-            0,    0,    0,  268,    0,    0,  798,  689,  689,    0, 
-            0,  149,    0,  107,    0, 1100,  138,    0,  109,    0, 
-          109,  103,    0,    0,  793,  107,    0,    0,    0,    0, 
-            0,  685,    0,    0, 1168,    0,    0,    0,  798,  798, 
-            0,    0,  109,    0,  140,    0,  151,    0,   85,    0, 
-            0,    0,   85,   85,    0,    0,  310,  154,    0,  794, 
-            0,    0,   85,    0,   84,    0,    0,    0, 1195,    0, 
-           85,  842,    0,    0,    0,    0,  685,  107,    0,    0, 
-           85,   85,  103,  842,  137,  230,  107,  103,    0, 1109, 
-            0,  793,  793,  346,    0,    0,  683,  683,    0,    0, 
-          107,    0,    0,  109,    0,    0,  154, 1237,  109,  107, 
-            0,    0,    0,  230,  309,  230,    0,  230,    0,    0, 
-            0,  687,  310,    0, 1168,    0,  794,  794,    0,    0, 
-           84, 1168, 1168,    0,  230,    0,  230,    0,  346,    0, 
-          268,  268,  268,  153,    0,  268,  268,  268,    0,  268, 
-            0,    0,    0,    0,    0,    0,    0,  268,    0,  268, 
-          268,  268,    0,    0,  682,  682,    0,    0,    0,  268, 
-          268,    0,  268,  268,  268,  268,  268,    0,  107,  354, 
-          103,    0,  107, 1218,    0,    0,  107,  575,   85, 1068, 
-            0,  576,  153,    0,    0,  798,    0,   84,   84,  127, 
-          268,  109,  268,   84,   84,    0,    0,    0,    0,    0, 
-            0,    0,    0,  268,  268,    0,    0,  268,  268,    0, 
-            0,    0,    0,    0,  354,    0,    0,    0,   84,  268, 
-          127,    0,    0,  127,  268,  691,  107,    0,  310,  107, 
-           84,    0,    0,    0,    0,    0,    0,  789,  268,    0, 
-          127,  268,  140,  103,   85,    0,  103,  789,  107,    0, 
-          793,    0,  798,  798,  131,    0,  798,    0,    0,  107, 
-            0,    0,    0,  103,  109,    0,    0,  109,    0,    0, 
-          691,    0,    0,    0,    0,    0,   84,    0,  789,    0, 
-            0,  789,   84,    0,  109,    0,    0,    0,   84,    0, 
-            0,   84,  403,  398,    0,    0,  789,  401,  399,    0, 
-          400,  798,  402,    0,  154,   84,    0,    0,  471,    0, 
-            0,   85,   85,    0,   84,  103,    0,   85,   85,  103, 
-          103,    0,  685,  685,    0,  107,    0,    0,    0,  103, 
-          789,    0,    0,  798,    0,    0,  843,  103,    0,    0, 
-          843,  843,   85,    0,    0,    0,    0,  103,  103,  397, 
-          109,    0,    0,    0,   85,    0,    0,  471,  109,    0, 
-            0,    0,  789,    0,    0,  126,  107,    0,  109,  109, 
-            0,  230,    0,  230,  230,  230,  230,  230,    0,  396, 
-            0,    0,    0,   84,  346,  346,    0,   84,  309,    0, 
-          153,   84,    0,  230,    0,    0,  126,    0,    0,  126, 
-           85,  690,    0,  128,    0,    0,   85,  230,    0,    0, 
-            0,    0,   85,  687,    0,   85,  126,  230,    0,    0, 
-            0,    0,  230,  230,  230,    0,    0,    0,    0,   85, 
-            0,    0,    0,  808,  128,    0,    0,  128,   85,  692, 
-            0,   84,    0,    0,   84,  563,  690,  564,  565,  566, 
-          567,  568,    0,    0,  128,  103,    0,    0,  127,    0, 
-            0,    0,    0,   84,    0,    0,    0,  569,    0,    0, 
-          354,  354,    0,    0,   84,    0,  109,    0,    0,  793, 
-            0,  570,    0,  130,  692,  793,    0,    0,    0,  150, 
-          798,  571,    0,    0,    0,    0,  572,  573,  574,  789, 
-          789,  789,    0,    0,  789,  789,  789,   85,  789,    0, 
-            0,   85,  310,    0,    0,   85,  789,  808,  789,  789, 
-          223,  103,    0,  309,    0,    0,  691,  691,  789,  789, 
-          793,  789,  789,  789,  789,  789,    0,    0,    0,    0, 
-           84,    0,  109,    0,  233,  233,    0,    0,  223,    0, 
-          223,    0,  223,    0,    0,    0,  686,  798,  798,  789, 
-            0,  789,  793,    0,    0,   85,    0,    0,   85,  223, 
-            0,  223,  309,    0,    0,    0,    0,  266,  271,  272, 
-          273,   84,    0,  377,  233,  233,    0,   85,  103,  103, 
-            0,    0,    0,  789,  103,  103,  331,  333,   85,    0, 
-          390,  391, 1101, 1101,    0,    0,    0,  789,    0,  843, 
-          843,    0,    0,    0,    0,  843,  843,    0,    0,  103, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  103,    0,    0,  126,    0,    0,    0,    0,    0, 
-          109,    0,    0,    0,    0,    0,  233,  310,    0,    0, 
-            0,    0,  109,    0,  808,  808,  808,    0,    0,    0, 
-          808,  808,    0,  808,   85,    0,    0,    0,    0, 1101, 
-         1101,  808,  128, 1101,    0,    0,    0,  103,    0,    0, 
-            0,    0,    0,  103,    0,    0,    0,    0,    0,  103, 
-          334,    0,  103,    0,    0,    0,  310,    0,  843,    0, 
-          334,    0,  690,  690,  109,   85,  103, 1101,    0,    0, 
-          843,    0,    0,  109,  808,  103,  808,    0,  149,  793, 
-            0,    0,    0,    0,    0,    0,    0,  109, 1101,    0, 
-            0,  334,    0,    0,  328,    0,  109,    0,    0,    0, 
-          692,  692,    0,    0,    0,    0, 1101,  119,    0,  334, 
-         1101,    0,  233,    0,    0,  233,  233,  233,    0,  331, 
-            0,    0,  808, 1101, 1101, 1101, 1101,    0,    0,    0, 
-         1101, 1101,    0, 1101,    0,    0,  233,    0,  119,  233, 
-            0,  119,    0,  683,  103,    0,  793,  793,  103,    0, 
-            0,    0,  103,  575,    0,    0,    0,  576,  119,    0, 
-            0,    0,    0,    0,  233,  109,    0,    0,    0,  109, 
-         1219,    0,    0,  109,    0,  334,  223,    0,  223,  223, 
-          223,  223,  223,    0,    0,    0,    0,    0,  683,    0, 
-            0,    0,  233,    0,  233,    0,  233,    0,  223,    0, 
-          688,    0,  103,    0,    0,  103,    0,    0,    0,    0, 
-            0,    0,  223,  233,    0,  233,    0,    0,  686,    0, 
-            0,    0,  223,  109,  103,    0,  109,  223,  223,  223, 
-            0,    0,    0,    0,    0,  103,    0,    0,    0,    0, 
-            0, 1101,    0,    0, 1101,  109,    0,    0,    0,    0, 
-            0,    0, 1101,    0,    0,    0,  109,    0,    0,    0, 
-            0,  331,    0,    0,    0,    0,  623,  624,  625,  626, 
-          627,  331,    0,  628,  629,  630,  631,  632,  633,  634, 
-          635,    0,  637,    0,    0,  638,  639,  640,  641,  642, 
-          643,  644,  645,  646,    0,    0,    0,    0,    0,    0, 
-          118,  103,  331,  233,    0,  331,  668,  121,    0, 1101, 
-            0,    0,  334,  334,  334,    0,    0,  334,  334,  334, 
-          331,  334,  109,    0,    0,   74,    0,    0,    0,  334, 
-            0,  118,    0,    0,  118,   74,  682,    0,  121,    0, 
-            0,  121,  103,  685,  334,  334,  334,  334,  334,    0, 
-            0,  118,    0,    0,  331,    0,    0,    0,  121,    0, 
-            0,    0,    0,  109,  233,    0,   74,    0,    0,    0, 
-            0,    0,  334,    0,  334,  233,  119,  233,    0,  233, 
-            0,  682,    0,  233,   74,    0,  331,  273,  685,    0, 
-            0,    0,    0,    0,  496,    0,    0,    0,    0,    0, 
-            0,  334,    0,    0,  496,  733,    0,  735,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  233,    0, 
-          334,  563,  233,  564,  565,  566,  567,  568,    0,    0, 
-            0,  496,  496,  233,    0,  496,  496,  496,  496,  496, 
-          496,  496,    0,  569,  683,  683,    0,    0,    0,    0, 
-           74,    0,  496,  496,  496,  148,  496,  496,    0,    0, 
-          233,    0,  233,  233,  233,  233,  233,  571,    0,    0, 
-            0,    0,  572,  573,  574,    0,    0,    0,    0,  233, 
-          794,    0,  233,    0,  132,  496,  794,  496,  496,  793, 
-            0,    0,  793,    0,    0,    0,  233,    0,  233,    0, 
-            0,    0,  688,    0,    0,    0,  233,    0,    0,    0, 
-            0,  233,  233,  233,    0,    0,    0,  496,  496,  496, 
-            0,    0,    0,  331,  331,  331,    0,    0,  331,  331, 
-          331,  794,  331,    0,    0,    0,    0,    0,    0,    0, 
-          331,    0,  331,  331,    0,    0,    0,    0,    0,    0, 
-            0,    0,  331,  331,    0,  331,  331,  331,  331,  331, 
-          836,    0,    0,  794,  836,  849,  233,    0,    0,  118, 
-            0,    0,    0,    0,  303,    0,  121,    0,    0,    0, 
-            0,    0,    0,  331,  303,  331,    0,   74,   74,   74, 
-          233,    0,   74,   74,   74,    0,   74,  233,  793,  793, 
-            0,    0,    0,    0,   74,    0,   74,    0,    0,    0, 
-          836,    0,  836,  836,  233,  303,  233,  331,  303,   74, 
-           74,   74,   74,   74,    0,    0,    0,    0,  836,    0, 
-            0,  331,  303,  303,    0,    0,    0,  682,  682,    0, 
-            0,    0, 1102, 1102,  685,  685,    0,   74,    0,   74, 
-            0,    0,    0,    0,    0,    0,  496,  496,  496,    0, 
-            0,  496,  496,  496,    0,  496,    0,  303,    0,    0, 
-          233,    0,    0,  496,  496,  496,  496,  496,    0,    0, 
-            0,    0,    0,    0,    0,  496,  496,    0,  496,  496, 
-          496,  496,  496,    0,    0,   74,    0,    0,    0,  303, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0, 1102, 
-         1102,    0,    0, 1102,    0,  233,  496,    0,  496,  151, 
-          794,  135,  496,  496,  496,  496,  496,  496,  496,  496, 
-          496,  496,  496,  496,  496,    0,    0,  233,  681,  496, 
-          496,  496,  496,    0,    0,  496,    0, 1102,  681,    0, 
-          496,    0,  135,    0,    0,  135,    0,  346,    0,    0, 
-            0,    0,  233,    0,  496,    0,    0,  496, 1102,    0, 
-            0,  793,  135,    0,    0,  681,  681,    0,  793,  681, 
-          681,  681,  681,  681,  681,  681, 1102,  794,  794,    0, 
-         1102,    0,    0,    0,    0,    0,  681,  681,  681,  136, 
-          681,  681,  346, 1102, 1102, 1102, 1102,    0,    0,    0, 
-         1102, 1102,    0, 1102,    0,    0,    0,    0,    0,    0, 
-            0,  793,    0,    0,    0,    0,    0,    0,    0,  681, 
-         1025,  681,  681,  836,  836,    0,  303,  303,  303,  836, 
-          836,  303,  303,  303,    0,  303,  233,    0,    0,    0, 
-            0,    0,  233,  303,    0,  303,  303,  303,  233,    0, 
-            0,  793,  681,  681,  793,  303,  303,    0,  303,  303, 
-          303,  303,  233,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  793,  836,  836,    0,  836,  836,  233,    0, 
-            0,    0,    0,    0,    0,    0,  303,    0,  303,    0, 
-            0,    0,  134,    0,    0,    0,  403,  398,    0, 1078, 
-         1079,  401,  399,    0,  400,    0,  402,    0,    0,    0, 
-            0, 1102,  836,    0, 1102,  303,    0, 1135,    0,  395, 
-          303,  394, 1102,  134,  836,  233,  134,  575,  354,    0, 
-            0,  576,    0,    0,  303,    0,    0,  303,    0,    0, 
-          233,    0,    0,  134,    0,    0,  836,    0,    0,    0, 
-            0,    0,    0,  397,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  354,    0,    0,    0,    0,    0, 1102, 
-          135,    0,    0,  396,    0,  793,  793,  793,    0,  793, 
-          681,  681,  681,  793,  793,  681,  681,  681,  793,  681, 
-          793,  793,  793,  793,  793,  793,  793,  681,  793,  681, 
-          681,  681,  793,  793,  793,  793,  793,  793,  793,  681, 
-          681,  793,  681,  681,  681,  681,  681,  575,  793,  233, 
-            0,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  346,  346, 
-          681,  793,  681,    0,  793,  793,  681,  681,  681,  681, 
-          681,  681,  681,  681,  681,  681,  681,  681,  681,  793, 
-          793,    0,    0,  681,  681,  681,  681,  793,  693,  681, 
-          793,  793,  793,  793,  681,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  684,  793,  793,  681,    0, 
-            0,  681,    0,    0,    0,  684,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  794,    0, 
-            0,    0,  684,  684,    0,  794,  684,  684,  684,  684, 
-          684,  684,  684,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  684,  684,  684,  139,  684,  684,    0, 
-            0,  134,    0,    0,    0,    0,    0,  233,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  684,  377,  684,  684, 
-            0,    0,  382,  383,    0,  563,    0,  564,  565,  566, 
-          567,  568,    0, 1317,  390,  391,    0,    0, 1324,    0, 
-            0,    0,  798,    0,    0,    0,    0,  569,  794,  684, 
-          684,  794,  798,    0,    0,    0,    0,    0,    0,  354, 
-          354,  570,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  571,    0,    0,    0,  793,  572,  573,  574,  798, 
-          798,    0,  793,  798,  798,  798,  798,  798,  798,  798, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          798,  798,  798,  150,  798,  798,    0,    0,    0,    0, 
-            0,    0,    0,    0, 1373, 1375, 1377, 1379,    0,    0, 
-            0, 1381,    0,    0,    0,  563,    0,  564,  565,  566, 
-          567,  568,    0,  798,    0,  798,  798,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  569, 1392, 1393, 
-         1395, 1396,    0,    0,    0,    0,    0, 1398,    0,    0, 
-            0,  570,    0,    0,    0,  798,  798,  798,  793,    0, 
-            0,  571,    0,    0,    0,    0,    0,  573,  574,    0, 
-            0,    0,  794,  794,  794,    0,  794,  684,  684,  684, 
-          794,  794,  684,  684,  684,  794,  684,  794,  794,  794, 
-          794,  794,  794,  794,  684,  794,  684,  684,  684,  794, 
-          794,  794,  794,  794,  794,  794,  684,  684,  794,  684, 
-          684,  684,  684,  684,  575,  794,    0,    0,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,    0,    0,  684,  794,  684, 
-            0,  794,  794,  684,  684,  684,  684,  684,  684,  684, 
-          684,  684,  684,  684,  684,  684,  794,  794,    0,    0, 
-          684,  684,  684,  684,  794,  696,  684,  794,  794,  794, 
-          794,  684,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,    0,  794,  794,  684,    0,    0,  684,  793, 
-          793,  793,    0,  793,  798,  798,  798,  793,  793,  798, 
-          798,  798,  793,  798,  793,  793,  793,  793,  793,  793, 
-          793,  798,  798,  798,  798,  798,  793,  793,  793,  793, 
-          793,  793,  793,  798,  798,  793,  798,  798,  798,  798, 
-          798,    0,  793,    0,    0,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,    0,    0,  798,  793,  798,    0,  793,  793, 
+          110,  325,  323,  697,  208,  209,  930,  412,  938,  370, 
+          204,  347,  201,  595,  279,  286,  237,  237,  595,  791, 
+          665,  456,  459,  432,  255,  418,  605,  330,  331,  332, 
+          204,  425,  201,   92,   99,  234,  234,  248,  313,  727, 
+          370,  581,  437,  701,  437,  437,  581,  236,  236,  421, 
+         1000,  283,  283,  290,  294,  660,  287,  939,  660,  506, 
+          918,  497,  204,  455,  661,  777,  660,  670,  538,  313, 
+          239,  246,  540,  579,  478,  678,  284,  334,  723,  825, 
+          727,  825,  341,  341,  796,   99,   99,  803,  693,  314, 
+          316,  457,  782,  313,  719,  758,  786,  995,  825,  236, 
+         1198,  262,  242,  242,  313,  313,  804, 1021,  781,  724, 
+          252,  559,  561,  724, 1204,  252,  476,  420,  237,  723, 
+          361, 1358, 1244,  204,  934,  741,  247,  805,  825,  660, 
+          825,  660,  620,  821,  825,  328,  369,  234,  661,  781, 
+          670,  866,  289,  293,  314,  953, 1019,  825,  825,  236, 
+          527,  236,  755,  236,  236,  472,  472,  781,  252,  253, 
+          367,  256,  491,  660,  660, 1203,  330,  811,  411,  276, 
+          485,  825,  434,  745,  508,  417,  511, 1256,  579,  825, 
+          825,  620,  842,  825,  813,  825,  279,  660,  891,  660, 
+         1264,  417, 1358,  750,  328,  524,  812,  825,  745,  370, 
+          405,  470,  417,  830,  242,  403,  401, 1144,  402,  366, 
+          404,  397, 1245,  396,  804,  741,  932,  815,  935,  257, 
+          825,  544,  781,  283,  750, 1128, 1128,  750,  869,  341, 
+          341,  830,  247,  417,  897,  898,  416,  111,  825,  279, 
+          549,  804,  750, 1291,  442,  505,  609,  490,  501,  813, 
+          529,  237,  660,  930,  660,  699,  110,   99,  825,  700, 
+         1367,  777,  925,  745,  341,  341, 1171,  234,  111,  437, 
+          234,  618,  619,  620,  621,  727,  283,  889,  490,  236, 
+          367,  248,  236,  236,  470,  236,  420,  614,  111,   92, 
+           99,  313,  811,  405,  437,  437,  437,  437,  403,  624, 
+          625,  284,  682,  404,  357,  507,  608, 1019,  610,  890, 
+           99, 1143, 1143,  765,  367,  411,  723, 1072, 1247, 1365, 
+         1333,  812, 1367,  497,  367,  410,  530,   14,   14,  366, 
+          826,  825, 1237, 1239,  798,   60,  825,  242,  357,  959, 
+          357,  825,  314,  283,  660,  283,  660,  724,  763,  724, 
+          763, 1128,  825,  357,  407,  745,  825,  825, 1075, 1030, 
+          766,  826,  542,  366, 1248,  934,  405, 1003,  337,  698, 
+          993,  403,  401,  366,  402,  370,  404,   99,  236,   99, 
+          825,  781,  417,  848, 1240,  357,   14,  855,  825,  620, 
+          692,  279,  437,  825,  578,  825,  376,  377,  806,  901, 
+           92,   99,  825,  236,  236,  236,  236, 1197,  236,  236, 
+          825, 1196,  313,  826,  505,  979,  777,  777,  357,  723, 
+          825,  671, 1202,  552,  825,  825,  695,  548,  283,  671, 
+          829,  809,  541,  283,  669,  913,  234, 1143, 1023, 1025, 
+         1027,  825, 1029, 1067, 1032,  699,  825, 1031,  236, 1179, 
+          724, 1197,  572,  284,  909,  595,  807,  595,  900, 1089, 
+          825,  544,   99,  314,  684, 1033,  750,   99,  573,  343, 
+          417,  781,  410,  620,  554,  555,  414,  424,  237, 1143, 
+         1143, 1143, 1078,  825,  384,  385,  769,  820,  505,  534, 
+          103,  379,  414,  415,  671,  950,  825,  234,  577,  578, 
+          417,  236, 1361,  414,  489, 1363,  111,  669,  423,  236, 
+          234,  521,  736,  417, 1032,  613,  826,  777,  204,  820, 
+          201,  103,  236,  533,  802, 1275, 1278,  671,  811,  427, 
+          911,  313,  709,  770,  414,  523,  726,  825,  767,  818, 
+          669,  103,  906, 1076,  904,  705,  505, 1398,  777,  919, 
+          428,  777,  671,  919,  825,  727,  750,  930,  971, 1374, 
+          521,  825,   99,  723,  242,  669,  777,  726,  234,  767, 
+         1004,  688,  767,  314,  783, 1056,  777,  777,  291,  725, 
+          236,  688,  314,  449,  379,  726,  825,  767,  825,  114, 
+          429, 1143,  825,  648,  544, 1172, 1174, 1175, 1176,  826, 
+          825,  283,  417,  741,  283,  783,  100,  477,  939,  832, 
+          660,  505,  660,  930,  875, 1162,  343,  671,  840,  661, 
+          751,  670,  109,  783,  801,  813,  854,  801,  439,  724, 
+          669,  777,  449,  234,  741,   99,  236, 1362,   99,  236, 
+          648,  357,  357,  417, 1183,  236,  534, 1302, 1292,  825, 
+          873,  343,  767,  109,  819,   99,  314,  379,  883,  439, 
+          907,  813,  439,  912,  313, 1042, 1044,  433,  841,  892, 
+          316, 1048, 1050,  109,  392,  393,  841,  831,  479, 1180, 
+          537,  860,  860,  414,  547,  845,  838,  283,  705,  845, 
+          845,  845,  595, 1297,  838,  283,  343,  449,  595,  742, 
+         1083,  316,  251,  505, 1234,  283,  283,  847,  894,  671, 
+         1335,  847,  847,  236,  204,  314,  201, 1344,  252,  481, 
+          581,   99,  669,  236,  904,  234,  488,  920,  921,   99, 
+          742,  922,  923,  313,  801,  801, 1151,  236,  492,   99, 
+           99, 1273, 1276,  841,  813,  480,  236,  236,  482,  483, 
+          484,  144, 1381,  316,  495, 1147,  845, 1313,  595,  103, 
+          831,  838,  974, 1113, 1113, 1369, 1168, 1371,  521,  236, 
+          496,  414,  612,  972,  822, 1268,  756,  825,  847,  951, 
+         1306,  544,  107,  498,  314, 1002,  581,  691, 1188,  850, 
+          777,  825, 1359,  850,  850, 1394,  825,  650,  835,  741, 
+          144,  414,  704, 1001,  125,  102,  825,  756,  437,  726, 
+          756,  767,  515,  107,  414,  970,  283,  905,  649,  455, 
+         1255,  811,  651,  552,  100,  756,  825, 1404,  515,  811, 
+         1113, 1113,  691,  107, 1113,  125,  102,  812,  125,  114, 
+          691,  499,  119, 1283,  650,  812,  825,  783,  741,  825, 
+           99,  313,  835,  516,  825,  125,  100,  528,  515,  825, 
+          850,  825,  515, 1252, 1253,  649, 1140, 1140, 1113,  651, 
+          982,  988,  797,  119,  554,  555,  119, 1260,  685,  204, 
+          777,  988,  794, 1269,  283,  691,  985, 1295,  835, 1113, 
+         1071,  109,  825,  119,  525,  825,  877,  783,  101,  726, 
+          795,  767,  314,  414, 1301, 1016, 1348, 1113,  826,  104, 
+          798, 1113,  825,  437,  135,  520,  357,  236,   99,  379, 
+          905, 1079,  536,  685, 1113, 1113, 1113, 1113,  112,  101, 
+          945, 1113, 1113,  314, 1113,  105,  758,  783,  543,  826, 
+          104,  660,  252,  660,  414, 1377,  783,  110,  835,   99, 
+         1070, 1283,  745,  825, 1283,  797, 1323, 1324, 1325,  112, 
+          104,  357, 1364,  825,  314,  801,  105,  845,  845,  505, 
+          758,  825,  251,  845,  845,  671,  433,  236,  110,  112, 
+          539, 1068,  315,  794,  860,  758,  105,  283,  669,  847, 
+          847,  234, 1140,  376,  377,  847,  847,  813,  110,  283, 
+          562, 1210,  825,  236, 1295,  604, 1295,  433,  144,  550, 
+          716,  783,  825,  315,  722,  813,  101,  660,  291, 1364, 
+          825,   99,  236,  835,  985,  108,  880,  611, 1379,  101, 
+          101, 1145, 1146,   99, 1140, 1140, 1140, 1166,    7,  106, 
+          933, 1015, 1113,  607,  940, 1113, 1170,  937,    7,  756, 
+          758,  107, 1193, 1113,  937,  722,  108,  845,  750,  291, 
+          984,  985, 1157,  261, 1161,  315, 1295,  101,  101,  845, 
+          106,  850,  850,  125,  283,  741,  108,  850,  850,  847, 
+          615,  101,  436,  283, 1150,   99, 1200, 1201,  691,  691, 
+          106,  847,  750, 1153,   99, 1261,  122,    7,  825,  825, 
+          825,  150, 1038, 1177, 1178,  825,  741,  750,   99,  442, 
+         1113,  119,  797,  436,  434, 1216,  787,   99,  437, 1217, 
+          757,  960,  344, 1235,  741,  673,  798,  122,  531,  965, 
+          122,  101,  688,  101,  769,  101,  101,  500,  685,  756, 
+          313,  691,  691, 1214, 1214,  434, 1140,  122,  616,  154, 
+          150,  824,  283,  826,  757,  702,  283, 1303,  825,  712, 
+          283,  850,  437,    7,  988,  125,  708,  691,  769,  757, 
+          450,  117,  750,  850,  552,  560, 1298,  688,  104,  685, 
+          685,  730,  500,  769,  117,  117,   99, 1307, 1308,  835, 
+           99, 1231,  714,  437,   99, 1304,  955,  112,  956, 1266, 
+         1267,  715,  859,  865,  105,  732, 1312, 1353, 1354,  798, 
+          283,  735,  691,  283,  500,  739,  110,  357,  357,  450, 
+         1326, 1163,  117,  117,  741,  554,  555,  236, 1123, 1123, 
+          437,  437,  283,  988,  757,  896,  117, 1040, 1041,  101, 
+          435,  835, 1191,  283,   99,  405,  400,   99,  769,   20, 
+          403,  401,  722,  402,  291,  404, 1181,  742, 1190,  546, 
+          546,  101,  750,  512,  101,  101,   99,  101,  486,  487, 
+          752,  435,  101,  513,  514,  313,  143,   99,  779,  781, 
+           20, 1088,  783, 1090,  450,  785,  117, 1091,  117,  517, 
+          117,  117,  101,  154,  108, 1103,  124, 1157,   20, 1182, 
+          505, 1243,  982,  521,  522,  790,  671, 1263,  106,  283, 
+          942,  573,  690, 1380, 1274, 1277,  835,  835,  792,  669, 
+          710,  828,  234,  798,  313,  143, 1342,  124,  793,  357, 
+          124,  833,  690, 1209,  236,  825,  835,  836,  837,  236, 
+          236,  577,  154,   99, 1243, 1279,  731,  124,  870,  733, 
+          283,  734, 1270, 1272, 1123,  722,  552,  690,  150,  101, 
+          101,  101,  877,  874,   20,  122,  798,  899,  880,  138, 
+          748,  500, 1251,  902,  357, 1378,  903,  690,  988,  976, 
+          900,  943,  926,  101,   99,  101,  101,  101,  101, 1182, 
+          101,  101,  927,  954,  117,  812, 1182, 1182,  946,  797, 
+          144,  947,  849,  553,  998,  685,  856,  554,  555,  835, 
+          835,  835,  961,  966,  718,  962,  117,  967,  138,  117, 
+          117, 1243,  117,  973,  969,  778, 1194,  117,  318,  319, 
+          101,  320, 1250,  688,  688,  977,  823,  978,  500,  500, 
+          827,  145,  718,  980,  101,  552,  718,  117,  985,  101, 
+          685, 1006, 1009,  849, 1012,  856,  675, 1022, 1024, 1026, 
+          679,  680,  681,  718, 1028,  825, 1046, 1086,  691,  691, 
+         1287,  871, 1195,  910,  795, 1293, 1087,  692, 1155, 1159, 
+         1173,  835,  797,  101,  371,  372,  373,  374,  375, 1382, 
+          145,  101,  557, 1192, 1199, 1191,  554,  555, 1207, 1061, 
+         1208,   20,   20,   20,  101, 1065, 1211,   20,   20,  124, 
+           20,  690, 1257, 1197,  117,  117,  117, 1259,   20, 1074, 
+         1101, 1300,  692, 1309, 1315,  868,  552, 1316,  726, 1310, 
+          685,  728,  729,  143,  291, 1319,  379, 1327,  117,  252, 
+          117,  117,  117,  117,  101,  117,  117, 1328, 1330,  517, 
+          154, 1334,  893,  392,  393,  131,  690, 1336,  746, 1337, 
+          797,   20,  101,   20,  685,  124,  685,  579,  126, 1360, 
+          692,  580, 1372,  557,  126, 1376, 1384,  554,  555,  685, 
+          713,  944, 1152, 1386, 1388,  117,  131, 1368,  948,  131, 
+         1390,  500, 1293, 1392, 1293, 1408, 1375, 1165,  937,  117, 
+          811, 1293,  825,  813,  117,  126,  131,  818,  126,   20, 
+          692,  685,  818,  690,  690,  692,  813,  101,  101,  928, 
+          101,  101,  910,  820,  813,  126,  138,  101,  552,  376, 
+          357,  357,  335,  690,  690,  813,  500,  101,  117,  797, 
+          768,  813,  336,  797,  685,  552,  117, 1402,  519, 1403, 
+         1293, 1405, 1293,  992, 1293,  692, 1293,  552,  475,  117, 
+          617,  747,  749,  994, 1305,  864,  996, 1411,  500, 1351, 
+         1345,  853, 1293, 1284,  126,  557, 1005,  454, 1370,  554, 
+          555,  931, 1260, 1020, 1043, 1045, 1238,  126,  126,  101, 
+         1049, 1051,  558,  101,  101,  101,  554,  555,  145,  117, 
+          924,  552,  936,  101,  762,  101,  685,  685,  554,  555, 
+          718,  101,  718,  718,  718,  718,  718,  117,  991,  101, 
+          872,  101,  101, 1215, 1373,  126,  126, 1401,  101,  101, 
+          655,  975,  718,  365, 1043, 1045, 1036, 1049, 1051,  126, 
+         1399,  146, 1265, 1262,  143,  895,  718, 1280,  767, 1013, 
+         1014,  101,  554,  555,  419, 1281,  718, 1063, 1385,  652, 
+          101,  718,  718,  718, 1034, 1035,  737, 1018, 1343,  639, 
+            0, 1069,  117,  117, 1148,  117,  117,  693,  692,  692, 
+         1073,    0,  117,    0,    0, 1077, 1052, 1053, 1080,  126, 
+          146,  126,  117,  126,  126,  644, 1062,    0,    0,    0, 
+          797,    0,    0,  145,    0,  127,  652,  693, 1148,    0, 
+          652,  652,  690,  690,    0,  141,  639,    0,    0,    0, 
+          639,  639,  693,    0,  131,  500,    0,    0,    0,  148, 
+            0,    0,  101,    0,    0,  567,    0,  568,  569,  570, 
+          571,  572,  644,  126,  117,  798,  644,  644,  117,  117, 
+          117,  688,  693,    0,    0,    0,  640,  573,  117,    0, 
+          117,  957,  958, 1167,  141,  695,  117,  685,  685,  963, 
+          964,  692,  692,    0,  117,    0,  117,  117,  148,    0, 
+          147,  575,    0,  117,  117,    0,  576,  577,  578,    0, 
+          645,    0,  500,  500,    0,    0,  688,  126,  149,  101, 
+          101,    0,    0,  640,    0,    0,  117,  640,  640,  133, 
+          695,  692,  692,    0,    0,  117,  694,    0,  132,  126, 
+            0,    0,  126,  126,    0,  126,    0,    0,  798,  147, 
+          126,    0, 1007, 1008,  696, 1010, 1011,  645,    0,  797, 
+          133,  645,  645,  133,    0,  802,    0,  149,  797,  132, 
+          126,    0,  132,    0,  797,    0,  140,    0,    0,  101, 
+          133,  694,    0,  318,  319,  232,  320,    0,    0,  132, 
+            0,  101,  101,   45,   46,    0,    0,  101,  101,  696, 
+           40,   41,   42,   43,    0,  101,    0,  117,    0,    0, 
+          802,    0,  687,  232, 1047,  232,    0,  232,  146,  797, 
+            0,  691,  134,  101,  101,  140, 1059,  567,    0,  568, 
+          569,  570,  571,    0,  232,  101,  232,  126,  126,  126, 
+            0,    0,  802,    0,  567,    0,  568,  569,  570,  571, 
+            0,  797,  798,  134,    0,    0,  134,  687,  798,    0, 
+          146,  126, 1081,  126,  126,  126,  126, 1271,  126,  126, 
+            0,    0,    0,  134,  117,  117,    0,    0,    0,    0, 
+            0,  101,  152,    0,    0,    0,    0,  101,    0,  127, 
+          771,    0,  141,  101,    0,  772,  101,    0,  693,  693, 
+            0,    0,    0,  798,    0,  798,  148,    0,  126,    0, 
+          101,    0,  797,  718, 1314,    0,    0,    0,  802,  101, 
+          127,    0,  126,  127, 1318,  693,    0,  126,  693,  693, 
+            0,  152,    0,    0,  117,  798, 1320, 1321, 1322,    0, 
+          127,  718,   84, 1296,    0,  718,  117,  117,    0,    0, 
+            0,    0,  117,  117,    0,  231,  231,  147,    0,    0, 
+          117,  126,  718,  802, 1383,    0,    0,    0,    0,  126, 
+          693,    0,  688,  688,  225,  149,    0,    0,  117,  117, 
+          129,    0,  126,    0,    0,    0,  695,  695,  101,    0, 
+          117,    0,  101,   84,   84,  802,  101,  311,  133,  802, 
+            0,    0,  225,    0,  225,    0,  225,  132,  797,  139, 
+          690,  129,    0,    0,  129, 1355,  695,  568,  569,  570, 
+          571,    0,  126,  225,    0,  225,    0,    0,  311,  101, 
+            0,  129,    0,  140,    0,    0,  117,  694,  694,    0, 
+          126,    0,  117, 1258,    0,  686,  101,    0,  117,  101, 
+            0,  117,  311,    0,    0,  696,  696,  231,  139,    0, 
+         1296,  695, 1296,  311,  311,  117,  802,  802,  101, 1296, 
+            0,    0,  142,    0,  117,  797,  797,    0,    0,  101, 
+            0,  232,    0,  232,  232,  232,  232,  232,    0,    0, 
+          686,  134,  798,    0,    0,  126,  126,   42,  126,  126, 
+            0,    0,    0,  232,    0,  126,    0,   42,  689,    0, 
+            0,    0,    0,  687,  687,  126,    0,  232, 1296,    0, 
+         1296,  142, 1296,  691, 1296,    0,    0,  232,    0,    0, 
+            0,    0,  232,  232,  232,    0,  101,    0,   42,  152, 
+         1296,  101,  101,  117,  283,  101,    0,  117,    0,    0, 
+            0,  117,  802,  689,  283,    0,   42,    0,  127,  798, 
+          798,    0,    0,    0,    0,   84,    0,  126,    0,    0, 
+            0,  126,  126,  126,    0,  567,    0,  568,  569,  570, 
+          571,  126,    0,  126,  117,  283,  101,  231,  283,  126, 
+          231,    0,    0,    0,    0,    0,    0,  126,   84,  126, 
+          126,  117,  283,  283,  117,    0,  126,  126,    0,  718, 
+            0,  718,  718,  718,  718,  718,    0,    0,   84,  802, 
+          802,  771,   42,  117,    0,    0,  693,  693,   85,  126, 
+            0,  718,  156,    0,  117,    0,    0,  283,  126,    0, 
+            0,  232,  232,    0,    0,  718,    0,    0,    0,  129, 
+          311,    0,  797,    0,    0,  718,  119,    0,  685,  688, 
+          718,  718,  718,    0,    0,    0,  139,    0,  350,  283, 
+          225,  802,  225,  225,  225,  225,  225,    0,    0,   85, 
+           85,  156,    0,  312,  129,   84,  695,   84,    0,  798, 
+            0,  117,  225,  688,    0,  688,  117,  117,    0,    0, 
+          117,  797,    0,  685,    0,  802,  225,  802,  688,   84, 
+          126,    0,  690,  350,  312,  151,  225,  695,  695,    0, 
+          802,  225,  225,  225,    0,    0,    0,    0,    0,  142, 
+            0,  695,    0,  153,    0,  797,    0,    0,  312,    0, 
+          688,  117,    0,  232,    0,  797,  686,  686,    0,  312, 
+          312,  797,  802,    0,  579,    0,  231,    0,  580,   42, 
+           42,   42,    0,  798,  151,   42,   42,    0,   42,  798, 
+           84,  311,  798,  688,    0,   84,   42,  126,  126,    0, 
+            0,    0,  153,    0,  802,  802,  128,    0,  694,    0, 
+            0,   42,   42,   42,   42,   42,  797,    0,  155,    0, 
+            0,    0,    0,    0,    0,    0,  283,  283,  283,  689, 
+          689,  283,  283,  283,  798,  283,    0,  231,    0,   42, 
+            0,   42,    0,  283,    0,  283,  283,  283,  797,    0, 
+          231,    0,    0,  694,  358,  283,  283,  126,  283,  283, 
+          283,  283,  283,    0,    0,    0,  798,  155,    0,  126, 
+          126,   85,    0,    0,    0,  126,  126,    0,    0,    0, 
+            0,    0,    0,  126,    0,    0,  283,   42,  283,    0, 
+           84,    0,    0,  232,    0,    0,  232,    0,    0,  358, 
+            0,  126,  126,    0,   85,    0,    0,    0,  231,  156, 
+          311,  138,  797,  126,    0,  283,    0,  135,    0,  798, 
+          283,    0,    0,  122,   85,  688,  797,    0,    0,    0, 
+          133,    0,  802,  128,  283,    0,    0,  283,    0,  148, 
+            0,    0,    0,    0,   70,    0,    0,  798,  135,  798, 
+            0,  135,    0,  357,   70,    0,  312,    0,    0,  126, 
+            0,  802,    0,   84,  128,  126,   84,  128,  135,  694, 
+          688,  126,    0,  231,  126,    0,    0,  802,    0,  685, 
+          685,    0,    0,   84,  128,   70,    0,    0,  126,  350, 
+          350,   85,  151,   85,    0,    0,    0,  126,  357,    0, 
+            0,    0,  798,   70,    0,  797,    0,  695,  695,  802, 
+          153,    0,  300,    0,  694,   85,  688,  688,    0,    0, 
+            0,    0,  300,  798,    0,    0,    0,    0,  802,  802, 
+            0,    0,    0,    0,    0,   84,    0,    0,    0,   84, 
+           84,  147,  567,  311,  568,  569,  570,  571,  572,   84, 
+            0,  130,    0,  300,    0,    0,  300,   84,    0,    0, 
+            0,    0,  232,  107,  573,  231,  126,   84,   84,   70, 
+          126,  300,  797,  797,  126,  155,   85,  312,  574,    0, 
+            0,   85,  130,    0,    0,  130,    0,  696,  575,    0, 
+          798,  798,    0,  576,  577,  578,    0,    0,    0,    0, 
+            0,    0,  130,    0,    0,  300,   84,  126,    0,  694, 
+          694,  121,  311,    0,  107,  107,  797,  130,  315,  696, 
+          132,    0,  797,  232,  126,    0,    0,  126,    0,    0, 
+            0,  337,  696,    0,    0,    0,  232,  300,    0,    0, 
+            0,  337,  121,    0,    0,  121,  126,  687,    0,  362, 
+            0,    0,    0,    0,    0,  358,  358,  126,  141,  798, 
+            0,    0,  121,    0,  696,  152,  802,  797,    0,  131, 
+            0,  500,  337,  315,    0,  330,   85,    0,   84,    0, 
+            0,    0,    0,    0,  473,  473,  135,    0,  305,    0, 
+          337,    0,  687,    0,  232,    0,  312,    0,  305,  797, 
+            0,    0,  128,  121,    0,  687,   70,   70,   70,    0, 
+          109,   70,   70,   70,  126,   70,  500,    0,    0,  126, 
+          126,    0,    0,  126,    0,   70,  688,  688,    0,  305, 
+          311,    0,  300,  802,  802,   70,   70,    0,   70,   70, 
+           70,   70,   70,    0,    0,    0,   84,  305,  500,   85, 
+          687,  120,   85,    0,  357,  357,  337,    0,    0,  232, 
+            0,  109,  109,    0,  126,    0,   70,    0,   70,   85, 
+          694,  694,    0,    0,  300,  300,  300,    0,    0,  300, 
+          300,  300,  120,  300,    0,  120,  107,  686,    0,    0, 
+            0,  300,    0,  300,  300,  300,  364,    0,    0,    0, 
+            0,    0,  120,  300,  300,    0,  300,  300,  300,  300, 
+          300,    0,    0,  305,   70,    0,    0,   84,   84,  107, 
+          130,   85,    0,   84,   84,   85,   85,    0,  579,  312, 
+            0,  231,  686,    0,  300,   85,  300,    0,    0,  107, 
+            0,    0,    0,   85,    0,    0,    0,    0,    0,   84, 
+          123,  232,  149,   85,   85,  151,  797,    0,    0,    0, 
+            0,   84,    0,  300,    0,    0,    0,    0,  300,    0, 
+            0,  315,    0,    0,    0,    0,    0,    0,    0,    0, 
+          121,  123,  300,    0,  123,  300,  689,    0,  696,  696, 
+          103,    0,   85,  337,  337,  337,    0,    0,  312,  337, 
+          337,  123,  337,    0,  150,  500,  107,   84,  107,    0, 
+          337,    0,    0,   84,    0,  120,    0,  686,    0,   84, 
+          696,  696,   84,  797,  797,  337,  337,  337,  337,  337, 
+          107,  689,    0,  109,    0,    0,   84,    0,  140,    0, 
+            0,  103,  103,    0,    0,   84,    0, 1294,  687,  687, 
+          305,  305,  305,  337,    0,  337,  305,  305,    0,  305, 
+            0,  123,  686,  689,   85,    0,  109,  305,    0,    0, 
+            0,    0,  500,  500,    0,    0,    0,    0,    0,  305, 
+          305,    0,  305,  305,  305,  305,  109,    0,    0,    0, 
+          137,  107,  315,    0,  405,  400,  107,  235,    0,  403, 
+          401,  337,  402,    0,  404,    0,  687,  687,  689,    0, 
+          305,  136,  305,  137,   84,  350,  312,    0,   84,  311, 
+          120,  137,   84,    0,  137,  235,  350,  235,    0,  235, 
+            0,    0,   85,  692,    0,    0,    0,    0,  136,  305, 
+          358,  137,  136,    0,    0,  136,  235,  358,  235,  811, 
+            0,  399,    0,  109,    0,  109,    0,    0,  305,    0, 
+          350,    0,  136,    0, 1294,    0, 1294,    0,    0,    0, 
+         1294,  350,   84, 1294,    0,   84,    0,  109,    0,    0, 
+            0,  398,    0,    0,    0,  358,    0,    0,  686,  686, 
+            0,  107,  358,    0,   84,    0,  567,    0,  568,  569, 
+          570,  571,  572,   85,   85,   84,    0,    0,    0,   85, 
+           85,  315,    0,  103,    0,    0,    0,  232,  573,  123, 
+            0,    0, 1294,    0, 1294,    0, 1294,    0, 1294,    0, 
+            0,  271,  574,  811,    0,   85,    0,    0,  109,    0, 
+            0,  271,  575,  109, 1294,    0,  103,   85,  577,  578, 
+          139,    0,    0,    0,  311,    0,    0,    0,    0,    0, 
+            0,    0,  231,    0,  107,    0,  103,  107,  271,  271, 
+            0,   84,  271,  271,  271,  271,  271,    0,  271,    0, 
+            0,    0,    0,    0,  107,    0,    0,  689,  689,  271, 
+          271,    0,    0,   85,  271,    0,  142,    0,    0,   85, 
+            0,    0,    0,  311,    0,   85,    0,    0,   85,    0, 
+            0,    0,   84,    0,    0,    0,    0,    0,  686,  686, 
+            0,    0,   85,    0,  271,  271,    0,    0,    0,    0, 
+            0,   85,    0,  103,    0,  103,  851,    0,  109,    0, 
+          851,  851,    0,    0,  315,    0,    0,    0,  156,    0, 
+          107,    0,    0,    0,    0,  271,  271,  103,  107,  137, 
+            0,    0,    0,    0,  689,  689,    0,    0,  107,  107, 
+          811,  811,  811,  155,    0,    0,  811,  811,  489,  811, 
+          136,    0,    0,    0,    0,  379,    0,  811,  489,    0, 
+            0,    0,    0,  235,    0,  235,  235,  235,  235,  235, 
+           85,    0,  392,  393,   85,  312,  812,  851,   85,    0, 
+            0,  109,    0,  315,  109,  235,  350,  350,  103,  489, 
+            0,    0,  916,  103,  489,    0,    0,  350,  350,  235, 
+          811,  109,  811,    0,    0,  692,    0,  489,    0,  235, 
+            0,  358,  358,    0,  235,  235,  235,    0,  358,  358, 
+            0,    0,    0,    0,    0,    0,    0,    0,   85,  579, 
+            0,   85,    0,  580,    0,    0,    0,    0,    0,    0, 
+          579,    0, 1082,    0,  580,    0,    0,    0,  811,  107, 
+           85,    0,    0,  852,    0,    0,    0,  852,  852,    0, 
+          812,   85,    0,  271,  271,  271,    0,  109,  271,  271, 
+          271,    0,  271,  489,    0,  109,    0,    0,    0,    0, 
+          271,    0,  271,  271,  271,  109,  109,    0,  103,    0, 
+            0,    0,  271,  271,    0,  271,  271,  271,  271,  271, 
+            0,  315,    0,  405,  400,    0,    0,    0,  403,  401, 
+          312,  402,    0,  404,    0,    0,    0,  107,  232,    0, 
+            0,    0,    0,  271,  852,  271,  397,   85,  396,  271, 
+          271,  271,  271,  271,    0,    0,  271,  271,  271,  271, 
+          271,  271,    0,    0,    0,    0,  271,  271,    0,    0, 
+            0,    0,  271,    0,    0,    0,    0,  271,    0,  312, 
+          399,  103,    0,    0,  103,    0,    0,    0,   85,    0, 
+         1331,  271,    0,    0,  271, 1338,    0,    0,    0,    0, 
+            0,  103,    0,    0,    0,    0,    0,  579,  851,  851, 
+          398,    0,    0,    0,  851,  851,  109,  812,  812,  812, 
+            0,    0,    0,  812,  812,    0,  812,    0,    0,    0, 
+          489,  489,  489,    0,  812,  489,  489,  489,    0,  489, 
+          107,    0,    0,    0,    0,    0,    0,  489,    0,  489, 
+            0,    0,  107,  103,    0,    0,    0,  103,  103,  489, 
+          489,    0,  489,  489,  489,  489,  489,  103,    0,    0, 
+            0, 1387, 1389, 1391, 1393,  103,    0,  812, 1395,  812, 
+            0,    0,    0,    0,  109,  103,  103,    0,    0,    0, 
+          489,    0,  489,  798,    0,    0,    0,  134,  851,  798, 
+            0,    0,    0,    0,  107, 1406, 1407, 1409, 1410,    0, 
+          851,    0,    0,  107, 1412,  489,  489,  567,    0,  568, 
+          569,  570,  571,  572,  103,  812,    0,  107,  567,    0, 
+          568,  569,  570,  571,  572,    0,  107,    0,  489,  573, 
+            0,    0,    0,    0,  798,    0,    0,    0,    0,    0, 
+          573,    0,    0,    0,    0,  852,  852,    0,    0,    0, 
+            0,  852,  852,  575,  574,   53,    0,    0,  576,  577, 
+          578,    0,    0,    0,  575,   53,  798,    0,    0,  576, 
+          577,  578,    0,    0,    0,    0,    0,  109,    0,    0, 
+            0,    0,    0,    0,    0,    0,  103,    0,    0,  109, 
+            0,    0,    0,    0,    0,  107,   53,    0,    0,  107, 
+         1232,    0,    0,  107,  379,    0,    0,    0,    0,  384, 
+          385,    0,    0,    0,   53,    0,    0,    0,    0,  270, 
+            0,  392,  393,    0,    0,    0,    0,    0,    0,  270, 
+            0,    0,    0,    0,    0,  852,    0,    0,    0,    0, 
+            0,  109,    0,    0,    0,    0,    0,  852,    0,    0, 
+          109,    0,    0,  107,  103,    0,  107,  233,  233,    0, 
+          270,    0,    0,  270,  109,  567,    0,  568,  569,  570, 
+          571,  572,    0,  109,    0,  107,    0,  270,  270,    0, 
+           53,    0,  270,    0,    0,    0,  107,  573,    0,    0, 
+          268,  273,  274,  275,    0,    0,    0,  233,  233,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  333, 
+          335,  575,  270,    0,    0,    0,    0,  577,  578,    0, 
+            0,    0,  153,  798,    0,  103,  103,    0,    0,    0, 
+            0,  103,  103,    0,    0,  473,    0,    0,    0,    0, 
+            0,    0,  109,    0,  270,    0,  109, 1233,    0,    0, 
+          109,    0,  107,    0,    0,    0,    0,  103,    0,  233, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  103, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  473,    0,    0,    0,    0,    0, 
+          798,  798,    0,  107,    0,    0,    0,    0,    0,    0, 
+          109,    0,    0,  109,  585,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  585,  103,    0,   53,   53,   53, 
+            0,  103,  109,   53,   53,    0,   53,  103,    0,    0, 
+          103,    0,    0,  109,   53,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  103,  585,    0,    0,  585,   53, 
+           53,   53,   53,  103,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  585,    0,  233,    0,    0,  233,  233, 
+          233,    0,  333,    0,    0,    0,    0,   53,    0,   53, 
+            0,  270,  270,  270,    0,    0,  270,  270,  270,  233, 
+          270,    0,  233,    0,    0,    0,    0,  585,  270,  109, 
+          270,  270,  270,    0,    0,    0,    0,    0,    0,    0, 
+          270,  270,    0,  270,  270,  270,  270,  270,    0,    0, 
+            0,    0,  103,    0,    0,   53,  103,    0,  585,  585, 
+          103,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          109,  270,    0,  270,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  270,  270,  254,    0,  270,  270, 
+            0,    0,    0,    0,    0,    0,  254,    0,    0,    0, 
+          270,    0,    0,    0,    0,  270,    0,    0,    0,    0, 
+          103,    0,    0,  103,    0,    0,    0,    0,    0,  270, 
+            0,    0,  270,  254,  254,    0,    0,  254,  254,  254, 
+          254,  254,  103,  254,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  103,  254,  254,  254,    0,  254,  254, 
+            0,  627,  628,  629,  630,  631,    0,    0,  632,  633, 
+          634,  635,  636,  637,  638,  639,    0,  641,    0,    0, 
+          642,  643,  644,  645,  646,  647,  648,  649,  650,  254, 
+          254,    0,    0,    0,    0,    0,    0,    0,  233,    0, 
+            0,  672,    0,    0,    0,    0,  585,  585,  585,    0, 
+            0,  585,  585,  585,    0,  585,    0,    0,    0,  103, 
+          254,  254,    0,  585,    0,  585,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  585,  585,    0,  585,  585, 
+          585,  585,  585,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  233, 
+          103,    0,    0,    0,    0,    0,  585,    0,  585,    0, 
+          233,    0,  233,    0,  233,    0,    0,  272,  233,    0, 
+            0,    0,  275,    0,    0,    0,    0,  272,    0,    0, 
+            0,    0,    0,    0,    0,  585,    0,    0,    0,    0, 
+          738,    0,  740,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  585,  233,    0,    0,  272,  233, 
+            0,  272,    0,    0,    0,    0,    0,    0,    0,    0, 
+          233,    0,    0,    0,    0,  272,  272,    0,    0,    0, 
+          272,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  254,  254, 
+          254,    0,    0,  254,  254,  254,    0,  254,    0,    0, 
+          272,    0,    0,    0,    0,  254,  233,  254,  254,  254, 
+            0,    0,    0,    0,    0,    0,  800,  254,  254,  800, 
+          254,  254,  254,  254,  254,  233,    0,    0,  405,  400, 
+            0,    0,  272,  403,  401,    0,  402,    0,  404,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  254,    0, 
+          254,  397,    0,  396,  254,  254,  254,  254,  254,  254, 
+          254,  254,  254,  254,  254,  254,  254,    0,    0,    0, 
+            0,  254,  254,    0,    0,    0,    0,  254,    0,    0, 
+            0,    0,  254,    0,    0,  399,    0,  844,    0,    0, 
+            0,  844,  858,  233,    0,    0,  254,    0,    0,  254, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  398,    0,  233,    0,    0, 
+            0,    0,    0,    0,    0,  233,  800,  800,    0,    0, 
+            0,    0,    0,    0,    0,    0,   75,    0,  844,    0, 
+          844,  844,  233,    0,  233,    0,   75,    0,    0,    0, 
+            0,    0,    0,  800,  800,    0,    0,    0,  844,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  272, 
+          272,  272,    0,    0,  272,  272,  272,   75,  272,    0, 
+            0,    0,    0,    0,    0,    0,  272,    0,  272,  272, 
+          272,    0,    0,    0,    0,   75,    0,    0,  272,  272, 
+          233,  272,  272,  272,  272,  272,    0,    0, 1094, 1095, 
+         1096, 1097,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0, 1098, 1099, 1100,    0,    0,  272, 
+            0,  272,    0,    0,   40,   41,   42,   43,   44,    0, 
+            0,    0,  272,  272,  308,  233,  272,  272,    0,    0, 
+            0,    0,    0,    0,    0,  685,    0,    0,  272,    0, 
+            0,   75,    0,  272,    0,  685,    0,    0,    0,  233, 
+            0,    0,    0,    0,    0,    0,    0,  272,    0,    0, 
+          272,   58,   59,   60,   61,   62,   63,   64,  797,   65, 
+           66,    0,  685,  685,  233,  797,  685,  685,  685,  685, 
+          685,  685,  685,    0,    0,    0,    0,  844,    0,    0, 
+            0,    0,    0,  685,  685,  685,  138,  685,  685,  379, 
+          380,  381,  382,  383,  384,  385,  386,  387,  388,  389, 
+            0,    0,    0,    0,    0,    0,  392,  393,    0,    0, 
+            0,    0,    0,    0,    0,    0,  685,    0,  685,  685, 
+            0,    0,    0,    0,    0,    0,    0,  800,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1039,    0,    0,  844, 
+          844,    0,    0,    0,    0,  844,  844,    0,  797,  685, 
+          685,  797,    0,  233,    0,    0,    0,    0,    0,  233, 
+            0,    0,    0,    0,    0,  233,    0,    0,   75,   75, 
+           75,    0,    0,   75,   75,   75,    0,   75,    0,  233, 
+            0,    0,    0,    0,    0,   75,    0,   75,    0,  844, 
+          844,    0,  844,  844,  233,    0,    0,  800,    0,    0, 
+           75,   75,   75,   75,   75,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1092, 1093,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   75,  844, 
+           75,    0,    0,    0, 1149,    0,    0,    0,    0,    0, 
+            0,  844,  233,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  233,    0,    0, 
+            0,    0,    0,  844,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   75,    0,    0,    0, 
+            0,    0,  797,  797,  797,    0,  797,  685,  685,  685, 
+          797,  797,  685,  685,  685,  797,  685,  797,  797,  797, 
+          797,  797,  797,  797,  685,  797,  685,  685,  685,  797, 
+          797,  797,  797,  797,  797,  797,  685,  685,  797,  685, 
+          685,  685,  685,  685,    0,  797,    0,    0,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,    0,  233,  685,  797,  685, 
+            0,  797,  797,  685,  685,  685,  685,  685,  685,  685, 
+          685,  685,  685,  685,  685,  685,  797,  797,    0,    0, 
+          685,  685,  685,  685,  797,  697,  685,  797,  797,  797, 
+          797,  685,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  688,  797,  797,  685,    0,    0,  685,    0, 
+            0,    0,  688,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  798,    0,    0,    0,  688, 
+          688,    0,  798,  688,  688,  688,  688,  688,  688,  688, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          688,  688,  688,  141,  688,  688,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  688,  233,  688,  688,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  802, 
+            0,    0,    0,    0,    0,  798,  688,  688,  798,  802, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  797,    0,    0,    0,  802,  802,    0,  797, 
+          802,  802,  802,  802,  802,  802,  802,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  802,  802,  802, 
+          152,  802,  802,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          802,    0,  802,  802,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  802,  802,  802,  797,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  798, 
+          798,  798,    0,  798,  688,  688,  688,  798,  798,  688, 
+          688,  688,  798,  688,  798,  798,  798,  798,  798,  798, 
+          798,  688,  798,  688,  688,  688,  798,  798,  798,  798, 
+          798,  798,  798,  688,  688,  798,  688,  688,  688,  688, 
+          688,    0,  798,    0,    0,  798,  798,  798,  798,  798, 
           798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
-          798,  798,  798,  793,  793,    0,    0,  798,  798,  798, 
-          798,  793,    0,  798,  793,  793,  793,  793,  798,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  798,    0,    0,  798,    0,    0,    0,  793, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  793,    0,    0,    0,  793,  793,    0,  793, 
-          793,  793,  793,  793,  793,  793,  793,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  793,  793,  793, 
-          149,  793,  793,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  563,    0,  564,  565,  566,  567,  568,    0, 
-          793,    0,  793,  793,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  569,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,    0,    0,    0, 
-            0,    0,  793,  793,  793,  793,  794,    0,  571,    0, 
-            0,    0,    0,    0,  573,  574,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  794, 
-            0,    0,    0,  794,  794,    0,  794,  794,  794,  794, 
-          794,  794,  794,  794,    0,    0,    0,    0,    0,    0, 
-         1080, 1081, 1082, 1083,  794,  794,  794,  151,  794,  794, 
-            0,    0,    0,    0,    0,    0, 1084, 1085, 1086,    0, 
-            0,    0,    0,    0,    0,    0,   40,   41,   42,   43, 
-           44,    0,    0,    0,    0,    0,  306,  794,    0,  794, 
-          794,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  794, 
-          794,  794,  794,   58,   59,   60,   61,   62,   63,   64, 
-            0,   65,   66,    0,    0,    0,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,    0,  793, 
-            0,    0,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,    0, 
-            0,  793,  793,  793,    0,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,    0,    0,  793,  793,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,    0,  793,  793,  793, 
-            0,    0,  793,  794,  794,  794,    0,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,    0,  794,    0,    0,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,    0,    0,  794,  794, 
-          794,    0,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,    0, 
-            0,  794,  794,  794,  794,  794,    0,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  347,  794,  794,  794,    0,    0,  794, 
-            0,    0,    0,  347,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  795,    0,    0,    0, 
-          347,  347,    0,  795,  347,  347,  347,  347,  347,  347, 
-          347,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  347,  347,  347,    0,  347,  347,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  347,    0,  347,  347,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          799,    0,    0,    0,    0,    0,  795,  347,  347,  795, 
-          799,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  795,    0,    0,    0,  799,  799,    0, 
-          795,  799,  799,  799,  799,  799,  799,  799,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  799,  799, 
-          799,    0,  799,  799,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  799,    0,  799,  799,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  799,  799,  799,  795,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          795,  795,  795,    0,  795,  347,  347,  347,  795,  795, 
-          347,  347,  347,  795,  347,  795,  795,  795,  795,  795, 
-          795,  795,  347,  795,  347,  347,  347,  795,  795,  795, 
-          795,  795,  795,  795,  347,  347,  795,  347,  347,  347, 
-          347,  347,    0,  795,    0,    0,  795,  795,  795,  795, 
-          795,  795,  795,  795,  795,  795,  795,  795,  795,  795, 
-          795,  795,  795,    0,    0,  347,  795,  347,    0,  795, 
-          795,  347,  347,  347,  347,  347,  347,  347,  347,  347, 
-          347,  347,  347,  347,  795,  795,    0,    0,  347,  347, 
-          347,  347,  795,    0,  347,  795,  795,  795,  795,  347, 
-          795,  795,  795,  795,  795,  795,  795,  795,  795,  795, 
-            0,  795,  795,  347,    0,    0,  347,  795,  795,  795, 
-            0,  795,  799,  799,  799,  795,  795,  799,  799,  799, 
-          795,  799,  795,  795,  795,  795,  795,  795,  795,  799, 
-          799,  799,  799,  799,  795,  795,  795,  795,  795,  795, 
-          795,  799,  799,  795,  799,  799,  799,  799,  799,    0, 
-          795,    0,    0,  795,  795,  795,  795,  795,  795,  795, 
-          795,  795,  795,  795,  795,  795,  795,  795,  795,  795, 
-            0,    0,  799,  795,  799,    0,  795,  795,  799,  799, 
-          799,  799,  799,  799,  799,  799,  799,  799,  799,  799, 
-          799,  795,  795,    0,    0,  799,  799,  799,  799,  795, 
-            0,  799,  795,  795,  795,  795,  799,  795,  795,  795, 
-          795,  795,  795,  795,  795,  795,  795,  800,  795,  795, 
-          799,    0,    0,  799,    0,    0,    0,  800,    0,    0, 
+          798,  798,    0,    0,  688,  798,  688,    0,  798,  798, 
+          688,  688,  688,  688,  688,  688,  688,  688,  688,  688, 
+          688,  688,  688,  798,  798,    0,    0,  688,  688,  688, 
+          688,  798,  700,  688,  798,  798,  798,  798,  688,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,    0, 
+          798,  798,  688,    0,    0,  688,  797,  797,  797,    0, 
+          797,  802,  802,  802,  797,  797,  802,  802,  802,  797, 
+          802,  797,  797,  797,  797,  797,  797,  797,  802,  802, 
+          802,  802,  802,  797,  797,  797,  797,  797,  797,  797, 
+          802,  802,  797,  802,  802,  802,  802,  802,    0,  797, 
+            0,    0,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,    0, 
+            0,  802,  797,  802,    0,  797,  797,  802,  802,  802, 
+          802,  802,  802,  802,  802,  802,  802,  802,  802,  802, 
+          797,  797,    0,    0,  802,  802,  802,  802,  797,    0, 
+          802,  797,  797,  797,  797,  802,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  802, 
+            0,    0,  802,    0,    0,    0,  797,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  797, 
+            0,    0,    0,  797,  797,    0,  797,  797,  797,  797, 
+          797,  797,  797,  797,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  797,  797,  797,  151,  797,  797, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  797,    0,  797, 
+          797,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  798,    0,    0,    0,    0,    0,  797, 
+          797,  797,  797,  798,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  798,    0,    0,    0, 
+          798,  798,    0,  798,  798,  798,  798,  798,  798,  798, 
+          798,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  798,  798,  798,  153,  798,  798,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          797,    0,    0,    0,  800,  800,    0,  797,  800,  800, 
-          800,  800,  800,  800,  800,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  800,  800,  800,    0,  800, 
-          800,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  798,    0,  798,  798,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  800,    0, 
-          800,  800,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  687, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  687, 
-          800,  800,  800,  797,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  687,  687,    0,    0, 
-          687,  687,  687,  687,  687,  687,  687,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  687,  687,  687, 
-          142,  687,  687,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  218,    0,    0,    0,    0,    0,    0, 
-          687,    0,  687,  687,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  218,    0,  218,    0,  218,    0,    0,    0,  689, 
-            0,    0,    0,  687,  687,    0,    0,    0,    0,    0, 
-            0,    0,  218,    0,  218,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  797,  797,  797,    0,  797,  800, 
-          800,  800,  797,  797,  800,  800,  800,  797,  800,  797, 
-          797,  797,  797,  797,  797,  797,  800,  800,  800,  800, 
-          800,  797,  797,  797,  797,  797,  797,  797,  800,  800, 
-          797,  800,  800,  800,  800,  800,    0,  797,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  798,  798,  798,  798, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  797,  797,  797,    0,  797,  797,  797, 
           797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
-          797,  797,  797,  797,  797,  797,  797,    0,    0,  800, 
-          797,  800,    0,  797,  797,  800,  800,  800,  800,  800, 
-          800,  800,  800,  800,  800,  800,  800,  800,  797,  797, 
-            0,    0,  800,  800,  800,  800,  797,    0,  800,  797, 
-          797,  797,  797,  800,  797,  797,  797,  797,  797,  797, 
-          797,  797,  797,  797,    0,  797,  797,  800,    0,    0, 
-          800,  687,  687,  687,    0,    0,  687,  687,  687,    0, 
-          687,    0,    0,    0,    0,    0,    0,    0,  687,    0, 
-          687,  687,  687,    0,    0,    0,    0,    0,    0,    0, 
-          687,  687,    0,  687,  687,  687,  687,  687,    0,    0, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,    0,  797,    0,    0,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,    0,    0,  797,  797, 
+          797,    0,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,    0, 
+            0,  797,  797,  797,  797,  797,    0,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,    0,  797,  797,  797,    0,    0,  797, 
+          798,  798,  798,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,    0,  798,    0,    0,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,    0,    0,  798,  798,  798,    0,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,    0,    0,  798,  798, 
+          798,  798,  798,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          351,  798,  798,  798,    0,    0,  798,    0,    0,    0, 
+          351,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  686,    0,    0,    0,    0, 
-            0,  687,    0,  687,    0,  686,    0,  687,  687,  687, 
-          687,  687,  687,  687,  687,  687,  687,  687,  687,  687, 
-            0,    0,    0,    0,  687,  687,  687,  687,    0,  699, 
-          687,    0,  686,  686,    0,  687,  686,  686,  686,  686, 
-          686,  686,  686,    0,    0,    0,    0,    0,    0,  687, 
-            0,    0,  687,  686,  686,  686,  141,  686,  686,  218, 
-            0,  218,  218,  218,  218,  218,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  218,    0,    0,    0,    0,  686,    0,  686,  686, 
-          688,    0,    0,    0,    0,  218,    0,    0,    0,    0, 
-          688,  689,    0,    0,    0,  218,    0,    0,    0,    0, 
-          218,  218,  218,    0,    0,    0,    0,    0,    0,  686, 
-          686,    0,    0,    0,    0,    0,    0,  688,  688,    0, 
-            0,  688,  688,  688,  688,  688,  688,  688,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  688,  688, 
-          688,  143,  688,  688,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  688,    0,  688,  688,    0,    0,    0,  689,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  689,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  688,  688,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  689,  689,    0,    0,  689, 
-          689,  689,  689,  689,  689,  689,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  689,  689,  689,  144, 
-          689,  689,    0,    0,    0,    0,    0,  686,  686,  686, 
-            0,    0,  686,  686,  686,    0,  686,    0,    0,    0, 
-            0,    0,    0,    0,  686,    0,  686,  686,  686,  689, 
-            0,  689,  689,    0,    0,    0,  686,  686,    0,  686, 
-          686,  686,  686,  686,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  799,    0,    0,    0,  351,  351,    0, 
+          799,  351,  351,  351,  351,  351,  351,  351,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  351,  351, 
+          351,    0,  351,  351,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  689,  689,    0,    0,    0,  686,    0,  686, 
-            0,    0,    0,  686,  686,  686,  686,  686,  686,  686, 
-          686,  686,  686,  686,  686,  686,    0,    0,    0,    0, 
-          686,  686,  686,  686,    0,  698,  686,    0,    0,    0, 
-            0,  686,  688,  688,  688,    0,    0,  688,  688,  688, 
-            0,  688,    0,    0,    0,  686,    0,    0,  686,  688, 
-            0,  688,  688,  688,    0,    0,    0,    0,    0,    0, 
-            0,  688,  688,    0,  688,  688,  688,  688,  688,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  822,    0,    0, 
-            0,    0,  688,    0,  688,    0,    0,  822,  688,  688, 
-          688,  688,  688,  688,  688,  688,  688,  688,  688,  688, 
-          688,    0,    0,    0,    0,  688,  688,  688,  688,    0, 
-          700,  688,    0,    0,    0,    0,  688,    0,  822,    0, 
-          689,  689,  689,    0,    0,  689,  689,  689,    0,  689, 
-          688,    0,    0,  688,    0,    0,  822,  689,    0,  689, 
-          689,  689,    0,    0,    0,    0,    0,    0,    0,  689, 
-          689,    0,  689,  689,  689,  689,  689,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          822,    0,    0,    0,  691,    0,    0,    0,    0,    0, 
-          689,    0,  689,    0,  691,    0,  689,  689,  689,  689, 
-          689,  689,  689,  689,  689,  689,  689,  689,  689,    0, 
-            0,    0,  822,  689,  689,  689,  689,    0,  701,  689, 
-            0,  691,  691,    0,  689,  691,  691,  691,  691,  691, 
-          691,  691,    0,    0,    0,    0,    0,    0,  689,    0, 
-            0,  689,  691,  691,  691,  146,  691,  691,    0,    0, 
+            0,  351,    0,  351,  351,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  803,    0,    0, 
+            0,    0,    0,  799,  351,  351,  799,  803,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  691,    0,  691,  691,  690, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  690, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  691,  691, 
-            0,    0,    0,    0,    0,    0,  690,  690,    0,    0, 
-          690,  690,  690,  690,  690,  690,  690,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  690,  690,  690, 
-          145,  690,  690,    0,    0,    0,    0,    0,    0,  822, 
-          822,  822,    0,    0,  822,  822,  822,    0,  822,    0, 
-            0,    0,    0,    0,    0,    0,  822,    0,  822,  822, 
-          690,    0,  690,  690,    0,    0,    0,  692,  822,  822, 
-            0,  822,  822,  822,  822,  822,    0,  692,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  690,  690,    0,    0,    0,    0,  822, 
-            0,  822,    0,    0,  692,  692,    0,    0,  692,  692, 
-          692,  692,  692,  692,  692,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  692,  692,  692,  147,  692, 
-          692,    0,    0,  822,    0,    0,  691,  691,  691,    0, 
-            0,  691,  691,  691,    0,  691,    0,  822,    0,    0, 
-            0,    0,    0,  691,    0,  691,  691,  691,  692,    0, 
-          692,  692,    0,    0,    0,  691,  691,    0,  691,  691, 
-          691,  691,  691,    0,    0,    0,    0,    0,    0,    0, 
+          799,    0,    0,    0,  803,  803,    0,  799,  803,  803, 
+          803,  803,  803,  803,  803,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  803,  803,  803,    0,  803, 
+          803,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  692,  692,    0,    0,    0,  691,    0,  691,    0, 
-            0,    0,  691,  691,  691,  691,  691,  691,  691,  691, 
-          691,  691,  691,  691,  691,    0,    0,    0,    0,  691, 
-          691,  691,  691,    0,  703,  691,    0,    0,    0,    0, 
-          691,  690,  690,  690,    0,    0,  690,  690,  690,    0, 
-          690,    0,    0,    0,  691,    0,    0,  691,  690,    0, 
-          690,  690,  690,    0,    0,    0,    0,    0,    0,    0, 
-          690,  690,    0,  690,  690,  690,  690,  690,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,   85,    0,    0,    0, 
-            0,  690,    0,  690,    0,    0,   85,  690,  690,  690, 
-          690,  690,  690,  690,  690,  690,  690,  690,  690,  690, 
-            0,    0,    0,    0,  690,  690,  690,  690,    0,  702, 
-          690,    0,    0,    0,    0,  690,    0,   85,    0,  692, 
-          692,  692,    0,    0,  692,  692,  692,    0,  692,  690, 
-            0,    0,  690,    0,    0,   85,  692,    0,  692,  692, 
-          692,    0,    0,    0,    0,    0,    0,    0,  692,  692, 
-            0,  692,  692,  692,  692,  692,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,   85, 
-            0,    0,    0,  683,    0,    0,    0,    0,    0,  692, 
-            0,  692,    0,  683,    0,  692,  692,  692,  692,  692, 
-          692,  692,  692,  692,  692,  692,  692,  692,    0,    0, 
-            0,   85,  692,  692,  692,  692,    0,  704,  692,    0, 
-          683,  683,    0,  692,  683,  683,  683,  683,  683,  683, 
-          683,    0,    0,    0,    0,    0,    0,  692,    0,    0, 
-          692,  683,  683,  683,  138,  683,  683,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  683,    0,  683,  683,  682,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  682,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  683,  683,    0, 
-            0,    0,    0,    0,    0,  682,  682,    0,    0,  682, 
-          682,  682,  682,  682,  682,  682,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  682,  682,  682,  137, 
-          682,  682,    0,    0,    0,    0,    0,    0,   85,   85, 
-           85,    0,    0,   85,   85,   85,    0,   85,    0,    0, 
-            0,    0,    0,    0,    0,   85,    0,   85,   85,  682, 
-            0,  682,  682,    0,    0,    0,  685,   85,   85,    0, 
-           85,   85,   85,   85,   85,    0,  685,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  682,  682,    0,    0,    0,    0,   85,    0, 
-           85,    0,    0,  685,  685,    0,    0,  685,  685,  685, 
-          685,  685,  685,  685,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  685,  685,  685,  140,  685,  685, 
-            0,    0,    0,    0,    0,  683,  683,  683,    0,    0, 
-          683,  683,  683,    0,  683,    0,   85,    0,    0,    0, 
-            0,    0,  683,    0,  683,  683,  683,  685,    0,  685, 
-          685,    0,    0,    0,  683,  683,    0,  683,  683,  683, 
-          683,  683,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          685,  685,    0,    0,    0,  683,    0,  683,    0,    0, 
-            0,  683,  683,  683,  683,  683,  683,  683,  683,  683, 
-          683,  683,  683,  683,    0,    0,    0,    0,  683,  683, 
-          683,  683,    0,  695,  683,    0,    0,    0,    0,  683, 
-          682,  682,  682,    0,    0,  682,  682,  682,    0,  682, 
-            0,    0,    0,  683,    0,    0,  683,  682,    0,  682, 
-          682,  682,    0,    0,    0,    0,    0,    0,    0,  682, 
-          682,    0,  682,  682,  682,  682,  682,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  803,    0, 
+          803,  803,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   89,    0,    0,    0,    0, 
-          682,    0,  682,    0,    0,   89,  682,  682,  682,  682, 
-          682,  682,  682,  682,  682,  682,  682,  682,  682,    0, 
-            0,    0,    0,  682,  682,  682,  682,    0,  694,  682, 
-            0,    0,    0,    0,  682,    0,   89,    0,  685,  685, 
-          685,    0,    0,  685,  685,  685,    0,  685,  682,    0, 
-            0,  682,    0,    0,   89,  685,    0,  685,  685,  685, 
-            0,    0,    0,    0,    0,    0,    0,  685,  685,    0, 
-          685,  685,  685,  685,  685,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,   89,    0, 
-            0,    0,  495,    0,    0,    0,    0,    0,  685,    0, 
-          685,    0,  495,    0,  685,  685,  685,  685,  685,  685, 
-          685,  685,  685,  685,  685,  685,  685,    0,    0,    0, 
-           89,  685,  685,  685,  685,    0,  697,  685,    0,  495, 
-          495,    0,  685,  495,  495,  495,  495,  495,  495,  495, 
-            0,    0,    0,    0,    0,    0,  685,    0,    0,  685, 
-          495,  495,  495,    0,  495,  495,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  495,    0,  495,  495,  353,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  353,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  495,  495,  495,    0,    0, 
-            0,    0,    0,    0,  353,  353,    0,  794,  353,  353, 
-          353,  353,  353,  353,  353,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  353,  353,  353,  152,  353, 
-          353,    0,    0,    0,    0,    0,    0,   89,   89,   89, 
-            0,    0,   89,   89, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          803,  803,  803,  799,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  799,  799,  799, 
+            0,  799,  351,  351,  351,  799,  799,  351,  351,  351, 
+          799,  351,  799,  799,  799,  799,  799,  799,  799,  351, 
+          799,  351,  351,  351,  799,  799,  799,  799,  799,  799, 
+          799,  351,  351,  799,  351,  351,  351,  351,  351,    0, 
+          799,    0,    0,  799,  799,  799,  799,  799,  799,  799, 
+          799,  799,  799,  799,  799,  799,  799,  799,  799,  799, 
+            0,    0,  351,  799,  351,    0,  799,  799,  351,  351, 
+          351,  351,  351,  351,  351,  351,  351,  351,  351,  351, 
+          351,  799,  799,    0,    0,  351,  351,  351,  351,  799, 
+            0,  351,  799,  799,  799,  799,  351,  799,  799,  799, 
+          799,  799,  799,  799,  799,  799,  799,    0,  799,  799, 
+          351,    0,    0,  351,  799,  799,  799,    0,  799,  803, 
+          803,  803,  799,  799,  803,  803,  803,  799,  803,  799, 
+          799,  799,  799,  799,  799,  799,  803,  803,  803,  803, 
+          803,  799,  799,  799,  799,  799,  799,  799,  803,  803, 
+          799,  803,  803,  803,  803,  803,    0,  799,    0,    0, 
+          799,  799,  799,  799,  799,  799,  799,  799,  799,  799, 
+          799,  799,  799,  799,  799,  799,  799,    0,    0,  803, 
+          799,  803,    0,  799,  799,  803,  803,  803,  803,  803, 
+          803,  803,  803,  803,  803,  803,  803,  803,  799,  799, 
+            0,    0,  803,  803,  803,  803,  799,    0,  803,  799, 
+          799,  799,  799,  803,  799,  799,  799,  799,  799,  799, 
+          799,  799,  799,  799,  804,  799,  799,  803,    0,    0, 
+          803,    0,    0,    0,  804,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  801,    0,    0, 
+            0,  804,  804,    0,  801,  804,  804,  804,  804,  804, 
+          804,  804,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  804,  804,  804,    0,  804,  804,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  804,    0,  804,  804,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  500,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  500,  804,  804,  804, 
+          801,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  500,  500,    0,    0,  500,  500,  500, 
+          500,  500,  500,  500,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  500,  500,  500,  150,  500,  500, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          220,    0,    0,    0,    0,    0,    0,  500,    0,  500, 
+          500,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  220,    0, 
+          220,    0,  220,    0,    0,    0,  693,    0,    0,  500, 
+          500,  500,    0,    0,    0,    0,    0,    0,    0,  220, 
+            0,  220,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  801,  801,  801,    0,  801,  804,  804,  804,  801, 
+          801,  804,  804,  804,  801,  804,  801,  801,  801,  801, 
+          801,  801,  801,  804,  804,  804,  804,  804,  801,  801, 
+          801,  801,  801,  801,  801,  804,  804,  801,  804,  804, 
+          804,  804,  804,    0,  801,    0,    0,  801,  801,  801, 
+          801,  801,  801,  801,  801,  801,  801,  801,  801,  801, 
+          801,  801,  801,  801,    0,    0,  804,  801,  804,    0, 
+          801,  801,  804,  804,  804,  804,  804,  804,  804,  804, 
+          804,  804,  804,  804,  804,  801,  801,    0,    0,  804, 
+          804,  804,  804,  801,    0,  804,  801,  801,  801,  801, 
+          804,  801,  801,  801,  801,  801,  801,  801,  801,  801, 
+          801,    0,  801,  801,  804,    0,    0,  804,  500,  500, 
+          500,    0,    0,  500,  500,  500,    0,  500,    0,    0, 
+            0,    0,    0,    0,    0,  500,  500,  500,  500,  500, 
+            0,    0,    0,    0,    0,    0,    0,  500,  500,    0, 
+          500,  500,  500,  500,  500,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  691,    0,    0,    0,    0,    0,  500,    0, 
+          500,    0,  691,    0,  500,  500,  500,  500,  500,  500, 
+          500,  500,  500,  500,  500,  500,  500,    0,    0,    0, 
+            0,  500,  500,  500,  500,    0,    0,  500,    0,  691, 
+          691,    0,  500,  691,  691,  691,  691,  691,  691,  691, 
+            0,    0,    0,    0,    0,    0,  500,    0,    0,  500, 
+          691,  691,  691,  144,  691,  691,  220,    0,  220,  220, 
+          220,  220,  220,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  220,    0, 
+            0,    0,    0,  691,    0,  691,  691,  690,    0,    0, 
+            0,    0,  220,    0,    0,    0,    0,  690,  693,    0, 
+            0,    0,  220,    0,    0,    0,    0,  220,  220,  220, 
+            0,    0,    0,    0,    0,    0,  691,  691,    0,    0, 
+            0,    0,    0,    0,  690,  690,    0,    0,  690,  690, 
+          690,  690,  690,  690,  690,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  690,  690,  690,  143,  690, 
+          690,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  690,    0, 
+          690,  690,    0,    0,    0,  692,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  692,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  690,  690,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  692,  692,    0,    0,  692,  692,  692,  692, 
+          692,  692,  692,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  692,  692,  692,  145,  692,  692,    0, 
+            0,    0,    0,    0,  691,  691,  691,    0,    0,  691, 
+          691,  691,    0,  691,    0,    0,    0,    0,    0,    0, 
+            0,  691,    0,  691,  691,  691,  692,    0,  692,  692, 
+            0,    0,    0,  691,  691,    0,  691,  691,  691,  691, 
+          691,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  692, 
+          692,    0,    0,    0,  691,    0,  691,    0,    0,    0, 
+          691,  691,  691,  691,  691,  691,  691,  691,  691,  691, 
+          691,  691,  691,    0,    0,    0,    0,  691,  691,  691, 
+          691,    0,  703,  691,    0,    0,    0,    0,  691,  690, 
+          690,  690,    0,    0,  690,  690,  690,    0,  690,    0, 
+            0,    0,  691,    0,    0,  691,  690,    0,  690,  690, 
+          690,    0,    0,    0,    0,    0,    0,    0,  690,  690, 
+            0,  690,  690,  690,  690,  690,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  327,    0,    0,    0,    0,  690, 
+            0,  690,    0,    0,  327,  690,  690,  690,  690,  690, 
+          690,  690,  690,  690,  690,  690,  690,  690,    0,    0, 
+            0,    0,  690,  690,  690,  690,    0,  702,  690,    0, 
+            0,    0,    0,  690,    0,  327,    0,  692,  692,  692, 
+            0,    0,  692,  692,  692,    0,  692,  690,    0,    0, 
+          690,    0,    0,  327,  692,    0,  692,  692,  692,    0, 
+            0,    0,    0,    0,    0,    0,  692,  692,    0,  692, 
+          692,  692,  692,  692,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  327,    0,    0, 
+            0,  693,    0,    0,    0,    0,    0,  692,    0,  692, 
+            0,  693,    0,  692,  692,  692,  692,  692,  692,  692, 
+          692,  692,  692,  692,  692,  692,    0,    0,    0,  327, 
+          692,  692,  692,  692,    0,  704,  692,    0,  693,  693, 
+            0,  692,  693,  693,  693,  693,  693,  693,  693,    0, 
+            0,    0,    0,    0,    0,  692,    0,    0,  692,  693, 
+          693,  693,  146,  693,  693,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  693,    0,  693,  693,  695,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  695,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  693,  693,    0,    0,    0, 
+            0,    0,    0,  695,  695,    0,    0,  695,  695,  695, 
+          695,  695,  695,  695,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  695,  695,  695,  148,  695,  695, 
+            0,    0,    0,    0,    0,    0,  327,  327,  327,    0, 
+            0,  327,  327,  327,    0,  327,    0,    0,    0,    0, 
+            0,    0,    0,  327,    0,  327,  327,  695,    0,  695, 
+          695,    0,    0,    0,  694,  327,  327,    0,  327,  327, 
+          327,  327,  327,    0,  694,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          695,  695,    0,    0,    0,    0,  327,    0,  327,    0, 
+            0,  694,  694,    0,    0,  694,  694,  694,  694,  694, 
+          694,  694,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  694,  694,  694,  147,  694,  694,    0,    0, 
+          327,    0,    0,  693,  693,  693,    0,    0,  693,  693, 
+          693,    0,  693,    0,  327,    0,    0,    0,    0,    0, 
+          693,    0,  693,  693,  693,  694,    0,  694,  694,    0, 
+            0,    0,  693,  693,    0,  693,  693,  693,  693,  693, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  694,  694, 
+            0,    0,    0,  693,    0,  693,    0,    0,    0,  693, 
+          693,  693,  693,  693,  693,  693,  693,  693,  693,  693, 
+          693,  693,    0,    0,    0,    0,  693,  693,  693,  693, 
+            0,  705,  693,    0,    0,    0,    0,  693,  695,  695, 
+          695,    0,    0,  695,  695,  695,    0,  695,    0,    0, 
+            0,  693,    0,    0,  693,  695,    0,  695,  695,  695, 
+            0,    0,    0,    0,    0,    0,    0,  695,  695,    0, 
+          695,  695,  695,  695,  695,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  826,    0,    0,    0,    0,  695,    0, 
+          695,    0,    0,  826,  695,  695,  695,  695,  695,  695, 
+          695,  695,  695,  695,  695,  695,  695,    0,    0,    0, 
+            0,  695,  695,  695,  695,    0,  707,  695,    0,    0, 
+            0,    0,  695,    0,  826,    0,  694,  694,  694,    0, 
+            0,  694,  694,  694,    0,  694,  695,    0,    0,  695, 
+            0,    0,  826,  694,    0,  694,  694,  694,    0,    0, 
+            0,    0,    0,    0,    0,  694,  694,    0,  694,  694, 
+          694,  694,  694,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  826,    0,    0,    0, 
+          696,    0,    0,    0,    0,    0,  694,    0,  694,    0, 
+          696,    0,  694,  694,  694,  694,  694,  694,  694,  694, 
+          694,  694,  694,  694,  694,    0,    0,    0,  826,  694, 
+          694,  694,  694,    0,  706,  694,    0,  696,  696,    0, 
+          694,  696,  696,  696,  696,  696,  696,  696,    0,    0, 
+            0,    0,    0,    0,  694,    0,    0,  694,  696,  696, 
+          696,  149,  696,  696,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  696,    0,  696,  696,  687,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  687,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  696,  696,    0,    0,    0,    0, 
+            0,    0,  687,  687,    0,    0,  687,  687,  687,  687, 
+          687,  687,  687,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  687,  687,  687,  140,  687,  687,    0, 
+            0,    0,    0,    0,    0,  826,  826,  826,    0,    0, 
+          826,  826,  826,    0,  826,    0,    0,    0,    0,    0, 
+            0,    0,  826,    0,  826,  826,  687,    0,  687,  687, 
+            0,    0,    0,  686,  826,  826,    0,  826,  826,  826, 
+          826,  826,    0,  686,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  687, 
+          687,    0,    0,    0,    0,  826,    0,  826,    0,    0, 
+          686,  686,    0,    0,  686,  686,  686,  686,  686,  686, 
+          686,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  686,  686,  686,  139,  686,  686,    0,    0,  826, 
+            0,    0,  696,  696,  696,    0,    0,  696,  696,  696, 
+            0,  696,    0,  826,    0,    0,    0,    0,    0,  696, 
+            0,  696,  696,  696,  686,    0,  686,  686,    0,    0, 
+            0,  696,  696,    0,  696,  696,  696,  696,  696,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  686,  686,    0, 
+            0,    0,  696,    0,  696,    0,    0,    0,  696,  696, 
+          696,  696,  696,  696,  696,  696,  696,  696,  696,  696, 
+          696,    0,    0,    0,    0,  696,  696,  696,  696,    0, 
+          708,  696,    0,    0,    0,    0,  696,  687,  687,  687, 
+            0,    0,  687,  687,  687,    0,  687,    0,    0,    0, 
+          696,    0,    0,  696,  687,    0,  687,  687,  687,    0, 
+            0,    0,    0,    0,    0,    0,  687,  687,    0,  687, 
+          687,  687,  687,  687,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0, 
       };
    }
 
    private static final int[] yyTable2() {
       return new int[] {
 
-           89,    0,   89,    0,    0,    0,    0,    0,    0,    0, 
-           89,    0,   89,   89,  353,    0,  353,  353,    0,    0, 
-            0,  821,   89,   89,    0,   89,   89,   89,   89,   89, 
-            0,  821,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  353,  353,    0, 
-            0,    0,    0,   89,    0,   89,    0,    0,  821,  821, 
-            0,    0,  821,  821,  821,  821,  821,  821,  821,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  821, 
-          821,  821,    0,  821,  821,    0,    0,    0,    0,    0, 
-          495,  495,  495,    0,    0,  495,  495,  495,    0,  495, 
-            0,   89,    0,    0,    0,    0,    0,  495,  495,  495, 
-          495,  495,  821,    0,  821,  821,    0,    0,    0,  495, 
-          495,    0,  495,  495,  495,  495,  495,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  821,  821,  821,    0,    0,    0, 
-          495,    0,  495,    0,    0,    0,  495,  495,  495,  495, 
-          495,  495,  495,  495,  495,  495,  495,  495,  495,    0, 
-            0,    0,    0,  495,  495,  495,  495,    0,    0,  495, 
-            0,    0,    0,    0,  495,  353,  353,  353,    0,    0, 
-          353,  353,  353,    0,  353,    0,    0,    0,  495,    0, 
-            0,  495,  353,    0,  353,  353,  353,    0,    0,    0, 
-            0,    0,    0,    0,  353,  353,    0,  353,  353,  353, 
-          353,  353,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-           87,    0,    0,    0,    0,  353,    0,  353,    0,    0, 
-           87,  353,  353,  353,  353,  353,  353,  353,  353,  353, 
-          353,  353,  353,  353,    0,    0,    0,    0,  353,  353, 
-          353,  353,    0,    0,  353,    0,    0,    0,    0,  353, 
-            0,   87,    0,  821,  821,  821,    0,    0,  821,  821, 
-          821,    0,  821,  353,    0,    0,  353,    0,    0,   87, 
-          821,  821,  821,  821,  821,    0,    0,    0,    0,    0, 
-            0,    0,  821,  821,    0,  821,  821,  821,  821,  821, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   87,    0,    0,    0,  346,    0,    0, 
-            0,    0,    0,  821,    0,  821,    0,  346,    0,  821, 
-          821,  821,  821,  821,  821,  821,  821,  821,  821,  821, 
-          821,  821,    0,    0,    0,   87,  821,  821,  821,  821, 
-            0,    0,  821,    0,  346,  346,    0,  821,  346,  346, 
-          346,  346,  346,  346,  346,    0,    0,    0,    0,    0, 
-            0,  821,    0,    0,  821,  346,  346,  346,  154,  346, 
-          346,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  346,    0, 
-          346,  346,  354,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  354,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  346,  346,    0,    0,    0,    0,    0,    0,  354, 
-          354,    0,    0,  354,  354,  354,  354,  354,  354,  354, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          354,  354,  354,  153,  354,  354,    0,    0,    0,    0, 
-            0,    0,   87,   87,   87,    0,    0,   87,   87,   87, 
-            0,   87,    0,    0,    0,    0,    0,    0,    0,   87, 
-            0,   87,   87,  354,    0,  354,  354,    0,    0,    0, 
-          625,   87,   87,    0,   87,   87,   87,   87,   87,    0, 
-          625,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  354,  354,    0,    0, 
-            0,    0,   87,    0,   87,    0,    0,  625,  625,    0, 
-            0,  625,  625,  625,  625,  625,  625,  625,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  625,  625, 
-          625,    0,  625,  625,    0,    0,    0,    0,    0,  346, 
-          346,  346,    0,    0,  346,  346,  346,    0,  346,    0, 
-           87,    0,    0,    0,    0,    0,  346,    0,  346,  346, 
-          346,  625,    0,  625,  625,    0,    0,    0,  346,  346, 
-            0,  346,  346,  346,  346,  346,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  625,  625,    0,    0,    0,  346, 
-            0,  346,    0,    0,    0,  346,  346,  346,  346,  346, 
-          346,  346,  346,  346,  346,  346,  346,  346,    0,    0, 
-            0,    0,  346,  346,  346,  346,    0,    0,  346,    0, 
-            0,    0,    0,  346,  354,  354,  354,    0,    0,  354, 
-          354,  354,    0,  354,    0,    0,    0,  346,    0,    0, 
-          346,  354,    0,  354,  354,  354,    0,    0,    0,    0, 
-            0,    0,    0,  354,  354,    0,  354,  354,  354,  354, 
-          354,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  567, 
-            0,    0,    0,    0,  354,    0,  354,    0,    0,  567, 
-          354,  354,  354,  354,  354,  354,  354,  354,  354,  354, 
-          354,  354,  354,    0,    0,    0,    0,  354,  354,  354, 
-          354,    0,    0,  354,    0,    0,    0,    0,  354,    0, 
-          567,    0,  625,  625,  625,    0,    0,  625,  625,  625, 
-            0,  625,  354,    0,    0,  354,    0,    0,  567,  625, 
-            0,  625,  625,  625,    0,    0,    0,    0,    0,    0, 
-            0,  625,  625,    0,  625,  625,  625,  625,  625,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  567,    0,    0,    0,  285,    0,    0,    0, 
-            0,    0,  625,    0,  625,    0,  285,    0,  625,  625, 
-          625,  625,  625,  625,  625,  625,  625,  625,  625,  625, 
-          625,    0,    0,    0,  567,  625,  625,  625,  625,    0, 
-            0,  625,    0,  285,  285,    0,  625,  285,  285,  285, 
-          285,  285,  392,  285,    0,    0,    0,    0,    0,    0, 
-          625,    0,    0,  625,  285,  285,  285,    0,  285,  285, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  392,    0,  285, 
-          285,  365,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  365,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          285,  285,    0,    0,    0,    0,    0,    0,  365,  365, 
-            0,    0,  365,  365,  365,  365,  365,  365,  365,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  365, 
-          365,  365,    0,  365,  365,    0,    0,    0,    0,    0, 
-            0,  567,  567,  567,    0,    0,  567,  567,  567,    0, 
-          567,    0,    0,    0,    0,    0,    0,    0,  567,    0, 
-          567,    0,  365,    0,  365,  365,    0,    0,    0,  360, 
-          567,  567,    0,  567,  567,  567,  567,  567,    0,  360, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  365,  365,    0,    0,    0, 
-            0,  567,    0,  567,    0,    0,  360,  360,    0,    0, 
-          360,  360,  360,  360,  360,  360,  360,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  360,  360,  360, 
-            0,  360,  360,    0,    0,    0,    0,    0,  285,  285, 
-          285,    0,    0,  285,  285,  285,    0,  285,    0,  567, 
-            0,    0,    0,    0,    0,  285,    0,  285,  285,  285, 
-          360,    0,  360,  360,    0,    0,    0,  285,  285,    0, 
-          285,  285,  285,  285,  285,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  360,  360,    0,    0,    0,  285,    0, 
-          285,    0,    0,    0,  285,  285,  285,  285,  285,  285, 
-          285,  285,  285,  285,  285,  285,  285,    0,    0,    0, 
-            0,  285,  285,  392,  392,    0,    0,  285,    0,    0, 
-            0,    0,  285,  365,  365,  365,    0,  303,  365,  365, 
-          365,    0,  365,    0,    0,    0,  285,  303,    0,  285, 
-          365,    0,  365,  365,  365,    0,    0,    0,    0,    0, 
-            0,    0,  365,  365,    0,  365,  365,  365,  365,  365, 
-            0,    0,    0,    0,    0,    0,    0,    0,  303,    0, 
-            0,  298,    0,    0,    0,    0,    0,  558,    0,    0, 
-            0,    0,    0,  365,    0,  365,  303,  558,    0,  365, 
-          365,  365,  365,  365,  365,  365,  365,  365,  365,  365, 
-          365,  365,    0,    0,    0,    0,  365,  365,  365,  365, 
-            0,    0,  365,    0,    0,    0,    0,  365,  558,    0, 
-            0,  360,  360,  360,    0,    0,  360,  360,  360,    0, 
-          360,  365,    0,    0,  365,    0,  558,    0,  360,    0, 
-          360,  360,  360,    0,    0,    0,    0,    0,    0,    0, 
-          360,  360,  303,  360,  360,  360,  360,  360,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          558,    0,    0,    0,    0,  673,    0,    0,    0,    0, 
-            0,  360,    0,  360,    0,  673,    0,  360,  360,  360, 
-          360,  360,  360,  360,  360,  360,  360,  360,  360,  360, 
-            0,    0,  558,    0,  360,  360,  360,  360,    0,    0, 
-          360,    0,  673,  673,    0,  360,  673,  673,  673,  673, 
-          673,  673,  673,    0,    0,    0,    0,    0,    0,  360, 
-            0,    0,  360,  673,  673,  673,    0,  673,  673,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  673,    0,  673,  673, 
-          252,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          252,    0,    0,    0,    0,    0,    0,    0,    0,  303, 
-          303,  303,    0,    0,    0,  303,  303,    0,  303,  673, 
-          673,    0,    0,    0,    0,    0,  303,  252,  252,    0, 
-            0,  252,  252,  252,  252,  252,    0,  252,  303,  303, 
-            0,  303,  303,  303,  303,    0,    0,    0,  252,  252, 
-          252,    0,  252,  252,    0,    0,    0,    0,    0,  558, 
-          558,  558,    0,    0,  558,  558,  558,    0,  558,  303, 
-            0,  303,    0,    0,    0,    0,  558,    0,  558,    0, 
-            0,    0,    0,  252,  252,    0,  253,    0,  558,  558, 
-            0,  558,  558,  558,  558,  558,  253,    0,  303,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  252,  252,    0,  303,    0,  558, 
-            0,  558,    0,  253,  253,    0,    0,  253,  253,  253, 
-          253,  253,    0,  253,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  253,  253,  253,    0,  253,  253, 
-            0,    0,    0,    0,    0,    0,    0,  673,  673,  673, 
-            0,    0,  673,  673,  673,    0,  673,  558,    0,    0, 
-            0,    0,    0,    0,  673,    0,  673,  673,  673,  253, 
-          253,    0,    0,    0,    0,    0,  673,  673,    0,  673, 
-          673,  673,  673,  673,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  577,    0, 
-          253,  253,    0,    0,    0,    0,    0,  673,  577,  673, 
-            0,    0,    0,    0,  673,  673,  673,  673,  673,  673, 
-          673,  673,  673,  673,  673,  673,    0,    0,    0,    0, 
-          673,  673,  673,  673,    0,    0,  673,  200,    0,  577, 
-            0,  673,  252,  252,  252,    0,    0,  252,  252,  252, 
-            0,  252,    0,    0,    0,  673,    0,  577,  673,  252, 
-            0,  252,  252,  252,    0,  200,    0,  200,    0,  200, 
-            0,  252,  252,  691,  252,  252,  252,  252,  252,    0, 
-            0,    0,    0,    0,    0,    0,  200,    0,  200,    0, 
-            0,  577,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  252,    0,  252,    0,    0,    0,  252,  252, 
-          252,  252,  252,  252,  252,  252,  252,  252,  252,  252, 
-          252,    0,    0,  577,    0,  252,  252,    0,    0,    0, 
-            0,  252,    0,    0,    0,    0,  252,    0,  253,  253, 
-          253,    0,    0,  253,  253,  253,    0,  253,    0,    0, 
-          252,    0,    0,  252,    0,  253,    0,  253,  253,  253, 
-            0,    0,    0,    0,    0,    0,    0,  253,  253,    0, 
-          253,  253,  253,  253,  253,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  264,    0,    0,    0,    0,    0,  253,    0, 
-          253,    0,  264,    0,  253,  253,  253,  253,  253,  253, 
-          253,  253,  253,  253,  253,  253,  253,    0,    0,    0, 
-            0,  253,  253,    0,    0,    0,    0,  253,    0,  264, 
-          264,    0,  253,  264,  264,  264,  264,  264,    0,  264, 
-            0,    0,    0,    0,    0,    0,  253,    0,    0,  253, 
-          264,  264,  264,    0,  264,  264,    0,    0,    0,    0, 
-          577,  577,  577,    0,    0,  577,  577,  577,    0,  577, 
-            0,    0,    0,    0,    0,    0,    0,  577,    0,  577, 
-            0,    0,    0,    0,    0,  264,  264,  261,    0,  577, 
-          577,    0,  577,  577,  577,  577,  577,  261,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  264,  264,    0,    0, 
-          577,    0,  577,    0,  261,  261,    0,    0,  261,  261, 
-          261,  261,  261,  200,  261,  200,  200,  200,  200,  200, 
-            0,    0,    0,    0,    0,  261,  261,  261,    0,  261, 
-          261,    0,    0,    0,    0,  200,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  577,  200, 
-            0,    0,    0,    0,    0,  691,    0,    0,    0,  200, 
-          261,  261,    0,  258,  200,  200,  200,    0,    0,    0, 
-            0,    0,    0,  258,  403,  398,    0,    0,    0,  401, 
-          399,    0,  400,    0,  402,    0,    0,    0,    0,    0, 
-            0,  261,  261,    0,    0,    0,    0,  395,    0,  394, 
-          258,  258,    0,    0,  258,  258,  258,  258,  258,    0, 
-          258,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  258,  258,  258,    0,  258,  258,    0,    0,    0, 
-            0,  397,    0,    0,  264,  264,  264,    0,    0,  264, 
-          264,  264,    0,  264,    0,    0,    0,    0,    0,    0, 
-            0,  264,    0,  264,  264,  264,  258,  258,    0,    0, 
-            0,  396,    0,  264,  264,    0,  264,  264,  264,  264, 
-          264,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  551,    0,  258,  258,    0, 
-            0,    0,    0,    0,  264,  551,  264,    0,    0,    0, 
-            0,  264,  264,  264,  264,  264,  264,  264,  264,  264, 
-          264,  264,  264,    0,    0,    0,    0,  264,  264,    0, 
-            0,    0,    0,  264,  201,    0,  551,    0,  264,  261, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,   56, 
+            0,    0,    0,    0,  687,    0,  687,    0,    0,   56, 
+          687,  687,  687,  687,  687,  687,  687,  687,  687,  687, 
+          687,  687,  687,    0,    0,    0,    0,  687,  687,  687, 
+          687,    0,  699,  687,    0,    0,    0,    0,  687,    0, 
+           56,    0,  686,  686,  686,    0,    0,  686,  686,  686, 
+            0,  686,  687,    0,    0,  687,    0,    0,   56,  686, 
+            0,  686,  686,  686,    0,    0,    0,    0,    0,    0, 
+            0,  686,  686,    0,  686,  686,  686,  686,  686,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,   56,    0,    0,    0,  689,    0,    0,    0, 
+            0,    0,  686,    0,  686,    0,  689,    0,  686,  686, 
+          686,  686,  686,  686,  686,  686,  686,  686,  686,  686, 
+          686,    0,    0,    0,   56,  686,  686,  686,  686,    0, 
+          698,  686,    0,  689,  689,    0,  686,  689,  689,  689, 
+          689,  689,  689,  689,    0,    0,    0,    0,    0,    0, 
+          686,    0,    0,  686,  689,  689,  689,  142,  689,  689, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  689,    0,  689, 
+          689,  499,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  499,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          689,  689,    0,    0,    0,    0,    0,    0,  499,  499, 
+            0,    0,  499,  499,  499,  499,  499,  499,  499,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  499, 
+          499,  499,    0,  499,  499,    0,    0,    0,    0,    0, 
+            0,   56,   56,   56,    0,    0,   56,   56,   56,    0, 
+           56,    0,    0,    0,    0,    0,    0,    0,   56,    0, 
+           56,   56,  499,    0,  499,  499,    0,    0,    0,  357, 
+           56,   56,    0,   56,   56,   56,   56,   56,    0,  357, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  499,  499,  499,    0,    0,    0, 
+            0,   56,    0,   56,    0,    0,  357,  357,    0,  798, 
+          357,  357,  357,  357,  357,  357,  357,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  357,  357,  357, 
+          154,  357,  357,    0,    0,   56,    0,    0,  689,  689, 
+          689,    0,    0,  689,  689,  689,    0,  689,    0,   56, 
+            0,    0,    0,    0,    0,  689,    0,  689,  689,  689, 
+          357,    0,  357,  357,    0,    0,    0,  689,  689,    0, 
+          689,  689,  689,  689,  689,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  357,  357,    0,    0,    0,  689,    0, 
+          689,    0,    0,    0,  689,  689,  689,  689,  689,  689, 
+          689,  689,  689,  689,  689,  689,  689,    0,    0,    0, 
+            0,  689,  689,  689,  689,    0,  701,  689,    0,    0, 
+            0,    0,  689,  499,  499,  499,    0,    0,  499,  499, 
+          499,    0,  499,    0,    0,    0,  689,    0,    0,  689, 
+          499,  499,  499,  499,  499,    0,    0,    0,    0,    0, 
+            0,    0,  499,  499,    0,  499,  499,  499,  499,  499, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   87,    0, 
+            0,    0,    0,  499,    0,  499,    0,    0,   87,  499, 
+          499,  499,  499,  499,  499,  499,  499,  499,  499,  499, 
+          499,  499,    0,    0,    0,    0,  499,  499,  499,  499, 
+            0,    0,  499,    0,    0,    0,    0,  499,    0,   87, 
+            0,  357,  357,  357,    0,    0,  357,  357,  357,    0, 
+          357,  499,    0,    0,  499,    0,    0,   87,  357,    0, 
+          357,  357,  357,    0,    0,    0,    0,    0,    0,    0, 
+          357,  357,    0,  357,  357,  357,  357,  357,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,   87,    0,    0,    0,  825,    0,    0,    0,    0, 
+            0,  357,    0,  357,    0,  825,    0,  357,  357,  357, 
+          357,  357,  357,  357,  357,  357,  357,  357,  357,  357, 
+            0,    0,    0,   87,  357,  357,  357,  357,    0,    0, 
+          357,    0,  825,  825,    0,  357,  825,  825,  825,  825, 
+          825,  825,  825,    0,    0,    0,    0,    0,    0,  357, 
+            0,    0,  357,  825,  825,  825,    0,  825,  825,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  825,    0,  825,  825, 
+          350,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          350,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  825,  825, 
+          825,    0,    0,    0,    0,    0,    0,  350,  350,    0, 
+            0,  350,  350,  350,  350,  350,  350,  350,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  350,  350, 
+          350,  156,  350,  350,    0,    0,    0,    0,    0,    0, 
+           87,   87,   87,    0,    0,   87,   87,   87,    0,   87, 
+            0,    0,    0,    0,    0,    0,    0,   87,    0,   87, 
+           87,  350,    0,  350,  350,    0,    0,    0,  358,   87, 
+           87,    0,   87,   87,   87,   87,   87,    0,  358,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  350,  350,    0,    0,    0,    0, 
+           87,    0,   87,    0,    0,  358,  358,    0,    0,  358, 
+          358,  358,  358,  358,  358,  358,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  358,  358,  358,  155, 
+          358,  358,    0,    0,    0,    0,    0,  825,  825,  825, 
+            0,    0,  825,  825,  825,    0,  825,    0,   87,    0, 
+            0,    0,    0,    0,  825,  825,  825,  825,  825,  358, 
+            0,  358,  358,    0,    0,    0,  825,  825,    0,  825, 
+          825,  825,  825,  825,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  358,  358,    0,    0,    0,  825,    0,  825, 
+            0,    0,    0,  825,  825,  825,  825,  825,  825,  825, 
+          825,  825,  825,  825,  825,  825,    0,    0,    0,    0, 
+          825,  825,  825,  825,    0,    0,  825,    0,    0,    0, 
+            0,  825,  350,  350,  350,    0,    0,  350,  350,  350, 
+            0,  350,    0,    0,    0,  825,    0,    0,  825,  350, 
+            0,  350,  350,  350,    0,    0,    0,    0,    0,    0, 
+            0,  350,  350,    0,  350,  350,  350,  350,  350,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,   91,    0,    0, 
+            0,    0,  350,    0,  350,    0,    0,   91,  350,  350, 
+          350,  350,  350,  350,  350,  350,  350,  350,  350,  350, 
+          350,    0,    0,    0,    0,  350,  350,  350,  350,    0, 
+            0,  350,    0,    0,    0,    0,  350,    0,   91,    0, 
+          358,  358,  358,    0,    0,  358,  358,  358,    0,  358, 
+          350,    0,    0,  350,    0,    0,   91,  358,    0,  358, 
+          358,  358,    0,    0,    0,    0,    0,    0,    0,  358, 
+          358,    0,  358,  358,  358,  358,  358,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           91,    0,    0,    0,  629,    0,    0,    0,    0,    0, 
+          358,    0,  358,    0,  629,    0,  358,  358,  358,  358, 
+          358,  358,  358,  358,  358,  358,  358,  358,  358,    0, 
+            0,    0,   91,  358,  358,  358,  358,    0,    0,  358, 
+            0,  629,  629,    0,  358,  629,  629,  629,  629,  629, 
+          629,  629,    0,    0,    0,    0,    0,    0,  358,    0, 
+            0,  358,  629,  629,  629,    0,  629,  629,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  629,    0,  629,  629,  287, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  287, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  629,  629, 
+            0,    0,    0,    0,    0,    0,  287,  287,    0,    0, 
+          287,  287,  287,  287,  287,  396,  287,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  287,  287,  287, 
+            0,  287,  287,    0,    0,    0,    0,    0,    0,   91, 
+           91,   91,    0,    0,   91,   91,   91,    0,   91,    0, 
+            0,    0,    0,    0,    0,    0,   91,    0,   91,   91, 
+          396,    0,  287,  287,    0,    0,    0,  369,   91,   91, 
+            0,   91,   91,   91,   91,   91,    0,  369,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  287,  287,    0,    0,    0,    0,   91, 
+            0,   91,    0,    0,  369,  369,    0,    0,  369,  369, 
+          369,  369,  369,  369,  369,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  369,  369,  369,    0,  369, 
+          369,    0,    0,    0,    0,    0,  629,  629,  629,    0, 
+            0,  629,  629,  629,    0,  629,    0,   91,    0,    0, 
+            0,    0,    0,  629,    0,  629,  629,  629,  369,    0, 
+          369,  369,    0,    0,    0,  629,  629,    0,  629,  629, 
+          629,  629,  629,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  369,  369,    0,    0,    0,  629,    0,  629,    0, 
+            0,    0,  629,  629,  629,  629,  629,  629,  629,  629, 
+          629,  629,  629,  629,  629,    0,    0,    0,    0,  629, 
+          629,  629,  629,    0,    0,  629,    0,    0,    0,    0, 
+          629,  287,  287,  287,    0,  340,  287,  287,  287,    0, 
+          287,    0,    0,    0,  629,  340,    0,  629,  287,    0, 
+          287,  287,  287,    0,    0,    0,    0,    0,    0,    0, 
+          287,  287,    0,  287,  287,  287,  287,  287,    0,    0, 
+            0,    0,    0,    0,    0,    0,  340,    0,    0,  334, 
+            0,    0,    0,    0,    0,   89,    0,    0,    0,    0, 
+            0,  287,    0,  287,  340,   89,    0,  287,  287,  287, 
+          287,  287,  287,  287,  287,  287,  287,  287,  287,  287, 
+            0,    0,    0,    0,  287,  287,  396,  396,    0,    0, 
+          287,    0,    0,    0,    0,  287,   89,    0,    0,  369, 
+          369,  369,    0,    0,  369,  369,  369,    0,  369,  287, 
+            0,    0,  287,    0,   89,    0,  369,    0,  369,  369, 
+          369,    0,    0,    0,    0,    0,    0,    0,  369,  369, 
+          340,  369,  369,  369,  369,  369,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   89,    0, 
+            0,    0,    0,  364,    0,    0,    0,    0,    0,  369, 
+            0,  369,    0,  364,    0,  369,  369,  369,  369,  369, 
+          369,  369,  369,  369,  369,  369,  369,  369,    0,    0, 
+           89,    0,  369,  369,  369,  369,    0,    0,  369,    0, 
+          364,  364,    0,  369,  364,  364,  364,  364,  364,  364, 
+          364,    0,    0,    0,    0,    0,    0,  369,    0,    0, 
+          369,  364,  364,  364,    0,  364,  364,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  364,    0,  364,  364,  677,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  677,    0, 
+            0,    0,    0,    0,    0,    0,    0,  340,  340,  340, 
+            0,    0,  340,  340,  340,    0,  340,  364,  364,    0, 
+            0,    0,    0,    0,  340,  677,  677,    0,    0,  677, 
+          677,  677,  677,  677,  677,  677,    0,    0,    0,  340, 
+          340,  340,  340,  340,    0,    0,  677,  677,  677,    0, 
+          677,  677,    0,    0,    0,    0,    0,   89,   89,   89, 
+            0,    0,   89,   89,   89,    0,   89,  340,    0,  340, 
+            0,    0,    0,    0,   89,    0,   89,   89,    0,  677, 
+            0,  677,  677,    0,  255,    0,   89,   89,    0,   89, 
+           89,   89,   89,   89,  255,    0,  340,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  677,  677,    0,  340,    0,   89,    0,   89, 
+            0,  255,  255,    0,    0,  255,  255,  255,  255,  255, 
+            0,  255,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  255,  255,  255,    0,  255,  255,    0,    0, 
+            0,    0,    0,    0,    0,  364,  364,  364,    0,    0, 
+          364,  364,  364,    0,  364,   89,    0,    0,    0,    0, 
+            0,    0,  364,    0,  364,  364,  364,  255,  255,    0, 
+            0,    0,    0,    0,  364,  364,    0,  364,  364,  364, 
+          364,  364,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  318,    0,  255,  255, 
+            0,    0,    0,    0,    0,  364,  318,  364,    0,    0, 
+            0,  364,  364,  364,  364,  364,  364,  364,  364,  364, 
+          364,  364,  364,  364,    0,    0,    0,    0,  364,  364, 
+          364,  364,    0,    0,  364,  202,    0,  318,    0,  364, 
+          677,  677,  677,    0,    0,  677,  677,  677,    0,  677, 
+            0,    0,    0,  364,    0,  318,  364,  677,    0,  677, 
+          677,  677,    0,  202,    0,  202,    0,  202,    0,  677, 
+          677,  695,  677,  677,  677,  677,  677,    0,    0,    0, 
+            0,    0,    0,    0,  202,    0,  202,    0,    0,  318, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          677,    0,  677,    0,    0,    0,    0,  677,  677,  677, 
+          677,  677,  677,  677,  677,  677,  677,  677,  677,    0, 
+            0,  318,    0,  677,  677,  677,  677,    0,    0,  677, 
+            0,    0,    0,    0,  677,    0,  255,  255,  255,    0, 
+            0,  255,  255,  255,    0,  255,    0,    0,  677,    0, 
+            0,  677,    0,  255,    0,  255,  255,  255,    0,    0, 
+            0,    0,    0,    0,    0,  255,  255,    0,  255,  255, 
+          255,  255,  255,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          266,    0,    0,    0,    0,    0,  255,    0,  255,    0, 
+          266,    0,  255,  255,  255,  255,  255,  255,  255,  255, 
+          255,  255,  255,  255,  255,    0,    0,    0,    0,  255, 
+          255,    0,    0,    0,    0,  255,    0,  266,  266,    0, 
+          255,  266,  266,  266,  266,  266,    0,  266,    0,    0, 
+            0,    0,    0,    0,  255,    0,    0,  255,  266,  266, 
+          266,    0,  266,  266,    0,    0,    0,    0,  318,  318, 
+          318,    0,    0,  318,  318,  318,    0,  318,    0,    0, 
+            0,    0,    0,    0,    0,  318,    0,  318,  318,    0, 
+            0,    0,    0,  266,  266,  263,    0,  318,  318,    0, 
+          318,  318,  318,  318,    0,  263,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  266,  266,    0,    0,  318,    0, 
+          318,    0,  263,  263,    0,    0,  263,  263,  263,  263, 
+          263,  202,  263,  202,  202,  202,  202,  202,    0,    0, 
+            0,    0,    0,  263,  263,  263,    0,  263,  263,    0, 
+            0,    0,  318,  202,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  318,  202,    0,    0, 
+            0,    0,    0,  695,    0,    0,    0,  202,  263,  263, 
+            0,  260,  202,  202,  202,    0,    0,    0,    0,    0, 
+            0,  260,  405,  400,    0,    0,    0,  403,  401,    0, 
+          402,    0,  404,    0,    0,    0,    0,    0,    0,  263, 
+          263,    0,    0,    0,    0,  397,    0,  396,  260,  260, 
+            0,    0,  260,  260,  260,  260,  260,    0,  260,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  260, 
+          260,  260,    0,  260,  260,    0,    0,    0,    0,  399, 
+            0,    0,  266,  266,  266,    0,    0,  266,  266,  266, 
+            0,  266,    0,    0,    0,    0,    0,    0,    0,  266, 
+            0,  266,  266,  266,  260,  260,    0,    0,    0,  398, 
+            0,  266,  266,    0,  266,  266,  266,  266,  266,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  319,    0,  260,  260,    0,    0,    0, 
+            0,    0,  266,  319,  266,    0,    0,    0,    0,  266, 
+          266,  266,  266,  266,  266,  266,  266,  266,  266,  266, 
+          266,    0,    0,    0,    0,  266,  266,    0,    0,    0, 
+            0,  266,  203,    0,  319,    0,  266,  263,  263,  263, 
+            0,    0,  263,  263,  263,    0,  263,    0,    0,    0, 
+          266,    0,  319,  266,  263,    0,  263,  263,  263,    0, 
+          203,    0,  203,    0,  203,    0,  263,  263,  694,  263, 
+          263,  263,  263,  263,    0,    0,    0,    0,    0,    0, 
+            0,  203,    0,  203,    0,    0,  319,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  263,    0,  263, 
+            0,    0,    0,    0,  263,  263,  263,  263,  263,  263, 
+          263,  263,  263,  263,  263,  263,    0,    0,  319,    0, 
+          263,  263,    0,    0,    0,    0,  263,    0,    0,    0, 
+            0,  263,    0,  260,  260,  260,    0,    0,  260,  260, 
+          260,    0,  260,    0,    0,  263,    0,    0,  263,    0, 
+          260,    0,  260,  260,  260,    0,    0,    0,    0,    0, 
+            0,    0,  260,  260,    0,  260,  260,  260,  260,  260, 
+            0,    0,    0,  379,  380,  381,  382,  383,  384,  385, 
+          386,    0,  388,  389,    0,    0,    0,  261,    0,    0, 
+          392,  393,    0,  260,    0,  260,    0,  261,    0,    0, 
+          260,  260,  260,  260,  260,  260,  260,  260,  260,  260, 
+          260,  260,    0,    0,    0,    0,  260,  260,    0,    0, 
+            0,    0,  260,    0,  261,  261,    0,  260,  261,  261, 
+          261,  261,  261,    0,  261,    0,    0,    0,    0,    0, 
+            0,  260,    0,    0,  260,  261,  261,  261,    0,  261, 
+          261,    0,    0,    0,    0,  319,  319,  319,    0,    0, 
+          319,  319,  319,    0,  319,    0,    0,    0,    0,    0, 
+            0,    0,  319,    0,  319,  319,    0,    0,    0,    0, 
+          261,  261,  262,    0,  319,  319,    0,  319,  319,  319, 
+          319,    0,  262,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  261,  261,    0,    0,  319,    0,  319,    0,  262, 
+          262,    0,    0,  262,  262,  262,  262,  262,  203,  262, 
+          203,  203,  203,  203,  203,    0,    0,    0,    0,    0, 
+          262,  262,  262,    0,  262,  262,    0,    0,    0,  319, 
+          203,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  319,  203,    0,    0,    0,    0,    0, 
+          694,    0,    0,    0,  203,  262,  262,    0,  264,  203, 
+          203,  203,    0,    0,    0,    0,    0,    0,  264,  405, 
+          400,    0,    0,    0,  403,  401,    0,  402,    0,  404, 
+            0,    0,    0,    0,    0,    0,  262,  262,    0,    0, 
+            0,    0,  397,    0,  396,  264,  264,    0,    0,  264, 
+          264,  264,  264,  264,    0,  264,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  264,  264,  264,    0, 
+          264,  264,    0,    0,    0,    0,  399,    0,    0,  261, 
           261,  261,    0,    0,  261,  261,  261,    0,  261,    0, 
-            0,    0,  264,    0,  551,  264,  261,    0,  261,  261, 
-          261,    0,  201,    0,  201,    0,  201,    0,  261,  261, 
-          690,  261,  261,  261,  261,  261,    0,    0,    0,    0, 
-            0,    0,    0,  201,    0,  201,    0,    0,  551,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  261, 
-            0,  261,    0,    0,    0,    0,  261,  261,  261,  261, 
+            0,    0,    0,    0,    0,    0,  261,    0,  261,  261, 
+          261,  264,  264,    0,    0,    0,  398,    0,  261,  261, 
+            0,  261,  261,  261,  261,  261,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           57,    0,  264,  264,    0,    0,    0,    0,    0,  261, 
+           57,  261,    0,    0,    0,    0,  261,  261,  261,  261, 
           261,  261,  261,  261,  261,  261,  261,  261,    0,    0, 
-          551,    0,  261,  261,    0,    0,    0,    0,  261,    0, 
-            0,    0,    0,  261,    0,  258,  258,  258,    0,    0, 
-          258,  258,  258,    0,  258,    0,    0,  261,    0,    0, 
-          261,    0,  258,    0,  258,  258,  258,    0,    0,    0, 
-            0,    0,    0,    0,  258,  258,    0,  258,  258,  258, 
-          258,  258,    0,    0,    0,  377,  378,  379,  380,  381, 
-          382,  383,  384,  385,  386,  387,    0,    0,    0,  259, 
-            0,    0,  390,  391,    0,  258,    0,  258,    0,  259, 
-            0,    0,  258,  258,  258,  258,  258,  258,  258,  258, 
-          258,  258,  258,  258,    0,    0,    0,    0,  258,  258, 
-            0,    0,    0,    0,  258,    0,  259,  259,    0,  258, 
-          259,  259,  259,  259,  259,    0,  259,    0,    0,    0, 
-            0,    0,    0,  258,    0,    0,  258,  259,  259,  259, 
-            0,  259,  259,    0,    0,    0,    0,  551,  551,  551, 
-            0,    0,  551,  551,  551,    0,  551,    0,    0,    0, 
-            0,    0,    0,    0,  551,    0,  551,    0,    0,    0, 
-            0,    0,  259,  259,  260,    0,  551,  551,    0,  551, 
-          551,  551,  551,  551,  260,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  259,  259,    0,    0,  551,    0,  551, 
-            0,  260,  260,    0,    0,  260,  260,  260,  260,  260, 
-          201,  260,  201,  201,  201,  201,  201,    0,    0,    0, 
-            0,    0,  260,  260,  260,    0,  260,  260,    0,    0, 
-            0,    0,  201,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  551,  201,    0,    0,    0, 
-            0,    0,  690,    0,    0,    0,  201,  260,  260,    0, 
-          262,  201,  201,  201,    0,    0,    0,    0,    0,    0, 
-          262,  403,  398,    0,    0,    0,  401,  399,    0,  400, 
-            0,  402,    0,    0,    0,    0,    0,    0,  260,  260, 
-            0,    0,    0,    0,  395,    0,  394,  262,  262,    0, 
-            0,  262,  262,  262,  262,  262,    0,  262,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  262,  262, 
-          262,    0,  262,  262,    0,    0,    0,    0,  397,    0, 
-            0,  259,  259,  259,    0,    0,  259,  259,  259,    0, 
-          259,    0,    0,    0,    0,    0,    0,    0,  259,    0, 
-          259,  259,  259,  262,  262,    0,    0,    0,  396,    0, 
+            0,    0,  261,  261,    0,    0,    0,    0,  261,  204, 
+            0,   57,    0,  261,  262,  262,  262,    0,    0,  262, 
+          262,  262,    0,  262,    0,    0,    0,  261,    0,   57, 
+          261,  262,    0,  262,  262,  262,    0,  204,    0,  204, 
+            0,  204,    0,  262,  262,  696,  262,  262,  262,  262, 
+          262,    0,    0,    0,    0,    0,    0,    0,  204,    0, 
+          204,    0,    0,   57,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  262,    0,  262,    0,    0,    0, 
+            0,  262,  262,  262,  262,  262,  262,  262,  262,  262, 
+          262,  262,  262,    0,    0,   57,    0,  262,  262,    0, 
+            0,    0,    0,  262,    0,    0,    0,    0,  262,    0, 
+          264,  264,  264,    0,    0,  264,  264,  264,    0,  264, 
+            0,    0,  262,    0,    0,  262,    0,  264,    0,  264, 
+          264,  264,    0,    0,    0,    0,    0,    0,    0,  264, 
+          264,    0,  264,  264,  264,  264,  264,    0,    0,    0, 
+          379,  380,  381,  382,  383,  384,  385,    0,    0,  388, 
+          389,    0,    0,    0,  284,    0,    0,  392,  393,    0, 
+          264,    0,  264,    0,  284,    0,    0,  264,  264,  264, 
+          264,  264,  264,  264,  264,  264,  264,  264,  264,    0, 
+            0,    0,    0,  264,  264,    0,    0,    0,    0,  264, 
+            0,  284,  284,    0,  264,  284,  284,  284,  284,  284, 
+            0,  284,    0,    0,    0,    0,    0,    0,  264,    0, 
+            0,  264,  284,  284,  284,    0,  284,  284,    0,    0, 
+            0,    0,   57,   57,   57,    0,    0,   57,   57,   57, 
+            0,   57,    0,    0,    0,    0,    0,    0,    0,   57, 
+            0,   57,   57,    0,    0,    0,    0,  284,  284,  285, 
+            0,   57,   57,    0,   57,   57,   57,   57,    0,  285, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  284,  284, 
+            0,    0,   57,    0,   57,    0,  285,  285,    0,    0, 
+          285,  285,  285,  285,  285,  204,  285,  204,  204,  204, 
+          204,  204,    0,    0,    0,    0,    0,  285,  285,  285, 
+            0,  285,  285,    0,    0,    0,   57,  204,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           57,  204,    0,    0,    0,    0,    0,  696,    0,    0, 
+            0,  204,  285,  285,    0,  290,  204,  204,  204,    0, 
+            0,    0,    0,    0,    0,  290,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  285,  285,    0,    0,    0,    0,    0, 
+            0,    0,  290,  290,    0,    0,  290,  290,  290,  290, 
+          290,    0,  290,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  290,  290,  290,    0,  290,  290,    0, 
+            0,    0,    0,    0,    0,    0,  284,  284,  284,    0, 
+            0,  284,  284,  284,    0,  284,    0,    0,    0,    0, 
+            0,    0,    0,  284,    0,  284,  284,  284,  290,  290, 
+            0,    0,    0,    0,    0,  284,  284,    0,  284,  284, 
+          284,  284,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,   30,    0,  290, 
+          290,    0,    0,    0,    0,    0,  284,   30,  284,    0, 
+            0,    0,  284,  284,  284,  284,  284,  284,  284,  284, 
+          284,  284,  284,  284,  284,    0,    0,    0,    0,  284, 
+          284,    0,    0,    0,    0,  284,    0,    0,   30,    0, 
+          284,  285,  285,  285,    0,    0,  285,  285,  285,    0, 
+          285,  162,    0,    0,  284,    0,   30,  284,  285,    0, 
+          285,  285,  285,    0,    0,    0,    0,    0,    0,    0, 
+          285,  285,    0,  285,  285,  285,  285,    0,    0,  162, 
+            0,  162,    0,  162,    0,    0,    0,  685,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          162,  285,  162,  285,    0,    0,    0,  285,  285,  285, 
+          285,  285,  285,  285,  285,  285,  285,  285,  285,  285, 
+            0,    0,   30,    0,  285,  285,    0,    0,    0,    0, 
+          285,    0,    0,    0,    0,  285,    0,  290,  290,  290, 
+            0,    0,  290,  290,  290,    0,  290,    0,    0,  285, 
+            0,    0,  285,    0,  290,    0,  290,  290,  290,    0, 
+            0,    0,    0,    0,    0,    0,  290,  290,    0,  290, 
+          290,  290,  290,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  258,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  258,    0,    0,  290,    0,  290, 
+            0,    0,    0,  290,  290,  290,  290,  290,  290,  290, 
+          290,  290,  290,  290,  290,  290,    0,    0,    0,    0, 
+          290,  290,  258,    0,    0,  258,  290,  258,  258,  258, 
+            0,  290,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  258,  258,  258,  290,  258,  258,  290,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,   30, 
+           30,   30,    0,    0,    0,   30,   30,    0,   30,    0, 
+            0,    0,    0,    0,    0,    0,   30,  258,  258,  259, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  259, 
+            0,   30,   30,   30,   30,   30,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  258,  258, 
+            0,    0,    0,    0,    0,    0,    0,  259,    0,   30, 
+          259,   30,  259,  259,  259,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  259,  259,  259, 
+            0,  259,  259,    0,    0,    0,    0,  162,    0,  162, 
+          162,  162,  162,  162,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,   30,    0,  162, 
+            0,    0,  259,  259,    0,  279,    0,    0,    0,    0, 
+            0,    0,    0,  162,    0,  279,    0,    0,    0,  685, 
+            0,    0,    0,  162,    0,    0,    0,    0,  162,  162, 
+          162,    0,    0,  259,  259,    0,    0,    0,    0,    0, 
+            0,    0,    0,  279,    0,    0,  279,    0,    0,  279, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  279,  279,  279,    0,  279,  279,    0, 
+            0,    0,    0,    0,    0,    0,  258,  258,  258,    0, 
+            0,  258,  258,  258,    0,  258,    0,    0,    0,    0, 
+            0,    0,    0,  258,    0,  258,  258,  258,  279,  279, 
+            0,    0,    0,    0,    0,  258,  258,    0,  258,  258, 
+          258,  258,  258,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  279, 
+          279,    0,    0,    0,    0,    0,  258,    0,  258,    0, 
+            0,    0,    0,  258,  258,  258,  258,  258,  258,  258, 
+          258,  258,  258,  258,  258,    0,   54,    0,    0,  258, 
+          258,    0,    0,    0,    0,  258,   54,    0,    0,    0, 
+          258,  259,  259,  259,    0,    0,  259,  259,  259,    0, 
+          259,    0,    0,    0,  258,    0,    0,  258,  259,    0, 
+          259,  259,  259,    0,    0,    0,    0,   54,    0,    0, 
           259,  259,    0,  259,  259,  259,  259,  259,    0,    0, 
+            0,    0,    0,    0,    0,   54,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  568,    0,  262,  262,    0,    0,    0,    0, 
-            0,  259,  568,  259,    0,    0,    0,    0,  259,  259, 
+            0,  259,    0,  259,    0,    0,    0,    0,  259,  259, 
           259,  259,  259,  259,  259,  259,  259,  259,  259,  259, 
             0,    0,    0,    0,  259,  259,    0,    0,    0,    0, 
-          259,  202,    0,  568,    0,  259,  260,  260,  260,    0, 
-            0,  260,  260,  260,    0,  260,    0,    0,    0,  259, 
-            0,  568,  259,  260,    0,  260,  260,  260,    0,  202, 
-            0,  202,    0,  202,    0,  260,  260,  692,  260,  260, 
-          260,  260,  260,    0,    0,    0,    0,    0,    0,    0, 
-          202,    0,  202,    0,    0,  568,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  260,    0,  260,    0, 
-            0,    0,    0,  260,  260,  260,  260,  260,  260,  260, 
-          260,  260,  260,  260,  260,    0,    0,  568,    0,  260, 
-          260,    0,    0,    0,    0,  260,    0,    0,    0,    0, 
-          260,    0,  262,  262,  262,    0,    0,  262,  262,  262, 
-            0,  262,    0,    0,  260,    0,    0,  260,    0,  262, 
-            0,  262,  262,  262,    0,    0,    0,    0,    0,    0, 
-            0,  262,  262,    0,  262,  262,  262,  262,  262,    0, 
-            0,    0,  377,  378,  379,  380,  381,  382,  383,  384, 
-            0,  386,  387,    0,    0,    0,  283,    0,    0,  390, 
-          391,    0,  262,    0,  262,    0,  283,    0,    0,  262, 
-          262,  262,  262,  262,  262,  262,  262,  262,  262,  262, 
-          262,    0,    0,    0,    0,  262,  262,    0,    0,    0, 
-            0,  262,    0,  283,  283,    0,  262,  283,  283,  283, 
-          283,  283,    0,  283,    0,    0,    0,    0,    0,    0, 
-          262,    0,    0,  262,  283,  283,  283,    0,  283,  283, 
-            0,    0,    0,    0,  568,  568,  568,    0,    0,  568, 
-          568,  568,    0,  568,    0,    0,    0,    0,    0,    0, 
-            0,  568,    0,  568,    0,    0,    0,    0,    0,  283, 
-          283,  284,    0,  568,  568,    0,  568,  568,  568,  568, 
-          568,  284,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          283,  283,    0,    0,  568,    0,  568,    0,  284,  284, 
-            0,    0,  284,  284,  284,  284,  284,  202,  284,  202, 
-          202,  202,  202,  202,    0,    0,    0,    0,    0,  284, 
-          284,  284,    0,  284,  284,    0,    0,    0,    0,  202, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  568,  202,    0,    0,    0,    0,    0,  692, 
-            0,    0,    0,  202,  284,  284,    0,  288,  202,  202, 
-          202,    0,    0,    0,    0,    0,    0,  288,  403,  398, 
-            0,    0,    0,  401,  399,    0,  400,    0,  402,    0, 
-            0,    0,    0,    0,    0,  284,  284,    0,    0,    0, 
-            0,  395,    0,  394,  288,  288,    0,    0,  288,  288, 
-          288,  288,  288,    0,  288,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  288,  288,  288,    0,  288, 
-          288,    0,    0,    0,    0,  397,    0,    0,  283,  283, 
-          283,    0,    0,  283,  283,  283,    0,  283,    0,    0, 
-            0,    0,    0,    0,    0,  283,    0,  283,  283,  283, 
-          288,  288,    0,    0,    0,  396,    0,  283,  283,    0, 
-          283,  283,  283,  283,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  552, 
-            0,  288,  288,    0,    0,    0,    0,    0,  283,  552, 
-          283,    0,    0,    0,  283,  283,  283,  283,  283,  283, 
-          283,  283,  283,  283,  283,  283,  283,    0,    0,    0, 
-            0,  283,  283,    0,    0,    0,    0,  283,    0,    0, 
-          552,  335,  283,  284,  284,  284,    0,    0,  284,  284, 
-          284,  335,  284,    0,    0,    0,  283,    0,  552,  283, 
-          284,    0,  284,  284,  284,    0,    0,    0,    0,    0, 
-            0,    0,  284,  284,    0,  284,  284,  284,  284,    0, 
-            0,    0,  335,    0,    0,  330,    0,    0,    0,    0, 
-            0,    0,  552,    0,    0,    0,    0,    0,    0,    0, 
-          335,    0,    0,  284,    0,  284,    0,    0,    0,  284, 
-          284,  284,  284,  284,  284,  284,  284,  284,  284,  284, 
-          284,  284,    0,    0,  552,    0,  284,  284,    0,    0, 
-            0,    0,  284,    0,    0,    0,    0,  284,    0,  288, 
-          288,  288,    0,    0,  288,  288,  288,    0,  288,    0, 
-            0,  284,    0,    0,  284,    0,  288,    0,  288,  288, 
-          288,    0,    0,    0,    0,    0,  335,    0,  288,  288, 
-            0,  288,  288,  288,  288,    0,    0,    0,    0,  377, 
-          378,  379,  380,  381,  382,  383,    0,    0,  386,  387, 
-            0,    0,    0,  269,    0,    0,  390,  391,    0,  288, 
-            0,  288,    0,  269,    0,  288,  288,  288,  288,  288, 
-          288,  288,  288,  288,  288,  288,  288,  288,    0,    0, 
-            0,    0,  288,  288,    0,    0,    0,    0,  288,    0, 
-          269,  269,    0,  288,  269,  269,  269,  269,  269,    0, 
-          269,    0,    0,    0,    0,    0,    0,  288,    0,    0, 
-          288,  269,  269,    0,    0,    0,  269,    0,    0,    0, 
-            0,  552,  552,  552,    0,    0,  552,  552,  552,    0, 
-          552,    0,    0,    0,    0,    0,    0,    0,  552,    0, 
-          552,    0,    0,    0,    0,    0,  269,  269,  256,    0, 
-          552,  552,    0,  552,  552,  552,  552,  552,  256,    0, 
-            0,    0,    0,  335,  335,  335,    0,    0,  335,  335, 
-          335,    0,  335,    0,    0,    0,    0,  269,  269,    0, 
-          335,  552,    0,  552,    0,    0,  256,    0,    0,  256, 
-            0,  256,  256,  256,    0,  335,  335,  335,  335,  335, 
-            0,    0,    0,    0,    0,    0,  256,  256,  256,    0, 
-          256,  256,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  335,    0,  335,    0,    0,    0,  552, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  256,  256,    0,  257,    0,    0,    0,    0,    0, 
-            0,    0,  335,    0,  257,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  335,  256,  256,    0,    0,    0,    0,    0,    0, 
-            0,    0,  257,    0,    0,  257,    0,  257,  257,  257, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  257,  257,  257,    0,  257,  257,    0,    0, 
-            0,    0,    0,    0,    0,  269,  269,  269,    0,    0, 
-          269,  269,  269,    0,  269,    0,    0,    0,    0,    0, 
-            0,    0,  269,    0,  269,  269,  269,  257,  257,    0, 
-            0,    0,    0,    0,  269,  269,    0,  269,  269,  269, 
-          269,  269,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  257,  257, 
+          259,    0,    0,    0,    0,  259,    0,  279,  279,  279, 
+            0,    0,  279,  279,  279,    0,  279,    0,    0,  259, 
+            0,   54,  259,    0,  279,    0,  279,  279,  279,    0, 
+            0,    0,    0,    0,    0,    0,  279,  279,    0,  279, 
+          279,  279,  279,  279,    0,    0,    0,    0,  280,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  280,    0, 
+            0,    0,    0,    0,    0,    0,    0,  279,    0,  279, 
+            0,    0,    0,    0,  279,  279,  279,  279,  279,  279, 
+          279,  279,  279,  279,  279,  279,  280,    0,    0,  280, 
+          279,  279,  280,    0,    0,    0,  279,    0,    0,    0, 
+            0,  279,    0,    0,    0,    0,  280,  280,  280,    0, 
+          280,  280,    0,    0,    0,  279,    0,    0,  279,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  280,  280,  269,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  269,    0,    0,    0,    0,   54,   54, 
+           54,    0,    0,    0,   54,   54,    0,   54,    0,    0, 
+            0,    0,  280,  280,    0,   54,    0,    0,    0,    0, 
+            0,  269,    0,    0,  269,    0,    0,  269,    0,    0, 
+           54,   54,   54,   54,    0,    0,    0,    0,    0,    0, 
+            0,  269,  269,  269,    0,  269,  269,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   54,    0, 
+           54,    0,    0,    0,    0,    0,    0,    0,    0,  267, 
+            0,    0,    0,    0,    0,    0,  269,  269,    0,  267, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   54,  269,  269,    0, 
+          267,    0,    0,  267,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  267,  267,  267, 
+            0,  267,  267,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          280,  280,  280,    0,    0,  280,  280,  280,    0,  280, 
+            0,    0,  267,  267,    0,    0,    0,  280,    0,  280, 
+          280,  280,    0,    0,    0,    0,    0,    0,    0,  280, 
+          280,    0,  280,  280,  280,  280,  280,    0,    0,    0, 
+            0,    0,    0,  267,  267,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          280,    0,  280,    0,    0,    0,    0,  280,  280,  280, 
+          280,  280,  280,  280,  280,  280,  280,  280,  280,    0, 
+            0,    0,    0,  280,  280,    0,    0,    0,    0,  280, 
+          163,    0,    0,    0,  280,  269,  269,  269,    0,    0, 
+          269,  269,  269,    0,  269,    0,    0,    0,  280,    0, 
+            0,  280,  269,    0,  269,  269,  269,    0,  163,    0, 
+          163,    0,  163,    0,  269,  269,  688,  269,  269,  269, 
+          269,  269,    0,    0,    0,    0,    0,    0,    0,  163, 
+            0,  163,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,  269,    0,  269,    0,    0, 
-            0,  269,  269,  269,  269,  269,    0,    0,  269,  269, 
-          269,  269,  269,  269,    0,   42,    0,    0,  269,  269, 
-            0,    0,    0,    0,  269,   42,    0,    0,    0,  269, 
-          256,  256,  256,    0,    0,  256,  256,  256,    0,  256, 
-            0,    0,    0,  269,    0,    0,  269,  256,    0,  256, 
-          256,  256,    0,    0,    0,    0,   42,    0,    0,  256, 
-          256,    0,  256,  256,  256,  256,  256,    0,    0,    0, 
-            0,    0,    0,    0,   42,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          256,    0,  256,    0,    0,    0,    0,  256,  256,  256, 
-          256,  256,  256,  256,  256,  256,  256,  256,  256,    0, 
-            0,    0,    0,  256,  256,    0,    0,    0,    0,  256, 
-            0,    0,    0,    0,  256,    0,  257,  257,  257,    0, 
-            0,  257,  257,  257,    0,  257,    0,    0,  256,    0, 
-           42,  256,    0,  257,    0,  257,  257,  257,    0,    0, 
-            0,    0,    0,    0,    0,  257,  257,    0,  257,  257, 
-          257,  257,  257,    0,    0,    0,    0,  277,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  277,    0,    0, 
-            0,    0,    0,    0,    0,    0,  257,    0,  257,    0, 
-            0,    0,    0,  257,  257,  257,  257,  257,  257,  257, 
-          257,  257,  257,  257,  257,  277,    0,    0,  277,  257, 
-          257,  277,    0,    0,    0,  257,    0,    0,    0,    0, 
-          257,    0,    0,    0,    0,  277,  277,  277,    0,  277, 
-          277,    0,    0,    0,  257,    0,    0,  257,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          277,  277,  278,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  278,    0,    0,    0,    0,   42,   42,   42, 
-            0,    0,    0,   42,   42,    0,   42,    0,    0,    0, 
-            0,  277,  277,    0,   42,    0,    0,    0,    0,    0, 
-          278,    0,    0,  278,    0,    0,  278,    0,    0,   42, 
-           42,   42,   42,   42,    0,    0,    0,    0,    0,    0, 
-          278,  278,  278,    0,  278,  278,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   42,    0,   42, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  278,  278,    0,  267,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  267,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   42,  278,  278,    0,    0, 
-            0,    0,    0,    0,    0,    0,  267,    0,    0,  267, 
+            0,    0,  269,  269,  269,  269,  269,  269,  269,  269, 
+          269,  269,  269,  269,    0,    0,    0,    0,    0,    0, 
+            0,  267,  267,  267,  269,    0,  267,  267,  267,  269, 
+          267,    0,    0,    0,    0,    0,    0,    0,  267,    0, 
+          267,  267,  267,  269,    0,    0,  269,    0,    0,    0, 
+          267,  267,    0,  267,  267,  267,  267,  267,    0,  268, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  268, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  267,    0,  267,    0,    0,    0,    0,  267,  267, 
+          267,  267,  267,  267,  267,  267,  267,  267,  267,  267, 
+          268,    0,    0,  268,    0,    0,    0,    0,    0,    0, 
+          267,    0,    0,    0,    0,  267,    0,  268,  268,  268, 
+            0,  268,  268,    0,    0,    0,    0,    0,    0,  267, 
             0,    0,  267,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  267,  267,  267,    0, 
-          267,  267,    0,    0,    0,    0,    0,    0,    0,  277, 
-          277,  277,    0,    0,  277,  277,  277,    0,  277,    0, 
-            0,    0,    0,    0,    0,    0,  277,    0,  277,  277, 
-          277,  267,  267,    0,    0,    0,    0,    0,  277,  277, 
-            0,  277,  277,  277,  277,  277,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  267,  267,    0,    0,    0,    0,    0,  277, 
-            0,  277,    0,    0,    0,    0,  277,  277,  277,  277, 
-          277,  277,  277,  277,  277,  277,  277,  277,    0,    0, 
-            0,    0,  277,  277,    0,    0,    0,    0,  277,    0, 
-          252,    0,    0,  277,  278,  278,  278,    0,    0,  278, 
-          278,  278,    0,  278,    0,    0,    0,  277,    0,    0, 
-          277,  278,    0,  278,  278,  278,    0,    0,    0,    0, 
-            0,    0,    0,  278,  278,    0,  278,  278,  278,  278, 
-          278,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  278,    0,  278,    0,    0,    0, 
-            0,  278,  278,  278,  278,  278,  278,  278,  278,  278, 
-          278,  278,  278,    0, 1098,    0,    0,  278,  278,    0, 
-            0,    0,    0,  278,    0,    0,    0,    0,  278,    0, 
-          267,  267,  267,    0,    0,  267,  267,  267,    0,  267, 
-            0,    0,  278,    0,    0,  278,    0,  267,    0,  267, 
-          267,  267,    0,    0,    0,    0,    0,    0,    0,  267, 
-          267,    0,  267,  267,  267,  267,  267,    0,  265,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  265,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          267,    0,  267,    0,    0,    0,    0,  267,  267,  267, 
-          267,  267,  267,  267,  267,  267,  267,  267,  267,  265, 
-            0,    0,  265,    0,    0,    0,    0,    0,    0,  267, 
-            0,    0,    0,    0,  267,    0,  265,  265,  265,    0, 
-          265,  265,    0,    0,    0,    0,    0,    0,  267,    0, 
-            0,  267,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  266,    0,    0,    0,    0,    0, 
-            0,  265,  265,    0,  266,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  265,  265,    0,  266,    0,    0,  266,    0, 
-            0,    0,    0,    0,    0,    0,    0, 1080, 1081, 1082, 
-         1083,    0,  266,  266,  266,    0,  266,  266,    0,    0, 
-            0,    0,    0, 1084, 1085, 1086, 1087,    0,    0,    0, 
-         1088,    0,    0,   40,   41,   42,   43,   44,    0,    0, 
-            0,    0,    0,  306,    0,    0,    0,  266,  266,  293, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  293, 
-            0, 1090, 1091,    0,    0,    0,    0,    0,    0, 1092, 
-            0,    0, 1093,    0, 1094, 1095,    0, 1096,  266,  266, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-          293,    0,    0,  293,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  293,  293,  293, 
-            0,  293,  293,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          265,  265,  265,    0,    0,  265,  265,  265,    0,  265, 
-            0,    0,  293,    0,    0,    0,    0,  265,    0,  265, 
-          265,  265,    0,    0,    0,    0,    0,    0,    0,  265, 
-          265,    0,  265,  265,  265,  265,  265,    0,    0,    0, 
-            0,  270,    0,    0,  293,    0,    0,    0,    0,    0, 
-            0,  270,    0,    0,    0,    0,    0,    0,    0,    0, 
-          265,    0,  265,    0,    0,    0,    0,  265,  265,  265, 
-          265,  265,  265,  265,  265,  265,  265,  265,  265,    0, 
-            0,    0,  270,    0,    0,  270,  266,  266,  266,  265, 
-            0,  266,  266,  266,  265,  266,    0,    0,    0,  270, 
-          270,    0,    0,  266,  270,  266,  266,  266,  265,    0, 
-            0,  265,    0,    0,    0,  266,  266,    0,  266,  266, 
-          266,  266,  266,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  270,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  266,    0,  266,    0, 
-            0,    0,    0,  266,  266,  266,  266,  266,  266,  266, 
-          266,  266,  266,  266,  266,    0,  270,    0,  294,    0, 
-            0,    0,    0,    0,    0,  266,    0,    0,  294,    0, 
-          266,  293,  293,  293,    0,    0,  293,  293,  293,    0, 
-          293,    0,    0,    0,  266,    0,    0,  266,  293,    0, 
-          293,  293,  293,    0,    0,    0,    0,    0,    0,  294, 
-          293,  293,  294,  293,  293,  293,  293,  293,    0,    0, 
-            0,    0,    0,    0,    0,    0,  294,  294,  294,    0, 
-          294,  294,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  293,    0,  293,    0,    0,    0,    0,  293,  293, 
-          293,  293,  293,  293,  293,  293,  293,  293,  293,  293, 
-            0,  294,    0,    0,    0,    0,    0,    0,    0,    0, 
-          293,    0,    0,    0,    0,  293,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  271,    0,    0,    0,  293, 
-            0,    0,  293,  294,    0,  271,    0,    0,    0,    0, 
-            0,    0,    0,  270,  270,  270,    0,    0,  270,  270, 
-          270,    0,  270,    0,    0,    0,    0,    0,    0,    0, 
-          270,    0,  270,  270,  270,    0,  271,    0,    0,  271, 
-            0,    0,  270,  270,    0,  270,  270,  270,  270,  270, 
-            0,    0,    0,  271,  271,    0,    0,    0,  271,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  270,    0,  270,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  270,  270,  271,    0, 
-          270,  270,    0,    0,    0,  272,    0,    0,    0,    0, 
-            0,    0,  270,    0,    0,  272,    0,  270,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          271,  270,    0,    0,  270,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  272,    0,    0,  272, 
-          294,  294,  294,    0,    0,  294,  294,  294,    0,  294, 
-            0,    0,    0,  272,  272,    0,    0,  294,  272,  294, 
-          294,  294,    0,    0,    0,    0,    0,    0,    0,  294, 
-          294,    0,  294,  294,  294,  294,  294,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  272,    0, 
-            0,  279,    0,    0,    0,    0,    0,    0,    0,    0, 
-          294,  279,  294,    0,    0,    0,    0,  294,  294,  294, 
-          294,  294,  294,  294,  294,  294,  294,  294,  294,    0, 
-          272,    0,    0,    0,    0,    0,    0,    0,    0,  294, 
-            0,    0,  279,    0,  294,  279,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  294,  279, 
-          279,  294,    0,    0,  279,    0,    0,  271,  271,  271, 
-            0,    0,  271,  271,  271,    0,  271,    0,    0,    0, 
-            0,    0,    0,    0,  271,    0,  271,  271,  271,    0, 
-            0,    0,    0,    0,  279,    0,  271,  271,    0,  271, 
-          271,  271,  271,  271,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  273,    0,    0,    0,  279,  271,    0,  271, 
+            0,    0,    0,    0,    0,  295,    0,    0,    0,    0, 
+            0,    0,  268,  268,    0,  295,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  268,  268,    0,  295,    0,    0,  295, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  295,  295,  295,    0,  295,  295,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  163,    0,  163,  163, 
+          163,  163,  163,    0,    0,    0,    0,    0,  295,    0, 
+          296,    0,    0,    0,    0,    0,    0,    0,  163,    0, 
+          296,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  163,    0,    0,    0,    0,    0,  688,    0, 
+          295,    0,  163,    0,    0,    0,    0,  163,  163,  163, 
+            0,  296,    0,    0,  296,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  296,  296, 
+          296,    0,  296,  296,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  268,  268,  268,    0,    0,  268,  268,  268,    0, 
+          268,    0,    0,  296,    0,    0,    0,    0,  268,    0, 
+          268,  268,  268,    0,    0,    0,    0,    0,    0,    0, 
+          268,  268,    0,  268,  268,  268,  268,  268,    0,    0, 
+            0,    0,  273,    0,    0,  296,    0,    0,    0,    0, 
             0,    0,  273,    0,    0,    0,    0,    0,    0,    0, 
-          271,  271,    0,    0,  271,  271,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  271,    0,    0,    0, 
-            0,  271,    0,  273,    0,    0,  273,  272,  272,  272, 
-            0,    0,  272,  272,  272,  271,  272,    0,  271,    0, 
-          273,  273,    0,    0,  272,  273,  272,  272,  272,    0, 
-            0,    0,    0,    0,    0,    0,  272,  272,    0,  272, 
-          272,  272,  272,  272,    0,    0,    0,    0,  274,    0, 
-            0,    0,    0,    0,    0,  273,    0,    0,  274,    0, 
-            0,    0,    0,    0,    0,    0,    0,  272,    0,  272, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          272,  272,    0,    0,  272,  272,    0,  273,    0,  274, 
-            0,    0,  274,    0,    0,    0,  272,    0,    0,    0, 
-            0,  272,    0,  279,  279,  279,  274,  274,  279,  279, 
-          279,  274,  279,    0,    0,  272,    0,    0,  272,    0, 
-          279,    0,  279,  279,  279,    0,    0,    0,    0,    0, 
-            0,    0,  279,  279,    0,  279,  279,  279,  279,  279, 
-            0,  274,    0,  280,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  280,    0,    0,    0,    0,  160,    0, 
-            0,    0,    0,  279,    0,  279,    0,    0,    0,    0, 
-            0,    0,    0,  274,    0,    0,  279,  279,    0,    0, 
-          279,  279,    0,    0,  280,    0,  160,  280,  160,    0, 
-          160,    0,  279,    0,  681,    0,    0,  279,    0,    0, 
-            0,  280,  280,    0,    0,    0,  280,  160,    0,  160, 
-            0,  279,    0,    0,  279,    0,    0,    0,    0,    0, 
+            0,  268,    0,  268,    0,    0,    0,    0,  268,  268, 
+          268,  268,  268,  268,  268,  268,  268,  268,  268,  268, 
+            0,    0,    0,  273,    0,    0,  273,  295,  295,  295, 
+          268,    0,  295,  295,  295,  268,  295,    0,    0,    0, 
+          273,  273,    0,    0,  295,  273,  295,  295,  295,  268, 
+            0,    0,  268,    0,    0,    0,  295,  295,    0,  295, 
+          295,  295,  295,  295,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  273,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  295,    0,  295, 
+            0,    0,    0,    0,  295,  295,  295,  295,  295,  295, 
+          295,  295,  295,  295,  295,  295,    0,  273,    0,  274, 
+            0,    0,    0,    0,    0,    0,  295,    0,    0,  274, 
+            0,  295,  296,  296,  296,    0,    0,  296,  296,  296, 
+            0,  296,    0,    0,    0,  295,    0,    0,  295,  296, 
+            0,  296,  296,  296,    0,    0,    0,    0,    0,    0, 
+          274,  296,  296,  274,  296,  296,  296,  296,  296,    0, 
+            0,    0,    0,    0,    0,    0,    0,  274,  274,    0, 
+            0,    0,  274,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  296,    0,  296,    0,    0,    0,    0,  296, 
+          296,  296,  296,  296,  296,  296,  296,  296,  296,  296, 
+          296,    0,  274,    0,    0,    0,    0,    0,    0,    0, 
+            0,  296,    0,    0,    0,    0,  296,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  281,    0,    0,    0, 
+          296,    0,    0,  296,  274,    0,  281,    0,    0,    0, 
             0,    0,    0,    0,  273,  273,  273,    0,    0,  273, 
-          273,  273,    0,  273,    0,    0,  280,    0,    0,    0, 
-            0,  273,    0,  273,  273,  273,    0,    0,    0,    0, 
-            0,    0,    0,  273,  273,    0,  273,  273,  273,  273, 
-          273,    0,    0,    0,    0,  254,    0,    0,  280,    0, 
-            0,    0,    0,    0,    0,  254,    0,    0,    0,    0, 
+          273,  273,    0,  273,    0,    0,    0,    0,    0,    0, 
+            0,  273,    0,  273,  273,  273,    0,  281,    0,    0, 
+          281,    0,    0,  273,  273,    0,  273,  273,  273,  273, 
+          273,    0,    0,    0,  281,  281,    0,    0,    0,  281, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,  273,    0,  273,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  273,  273,    0, 
-            0,  273,  273,    0,    0,    0,  254,    0,    0,  254, 
-          274,  274,  274,  273,    0,  274,  274,  274,  273,  274, 
-            0,    0,    0,  254,  254,    0,    0,  274,  254,  274, 
-          274,  274,  273,    0,    0,  273,    0,    0,    0,  274, 
-          274,    0,  274,  274,  274,  274,  274,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  254,    0, 
+            0,    0,    0,    0,    0,    0,    0,  273,  273,  281, 
+            0,  273,  273,    0,    0,    0,  275,    0,    0,    0, 
+            0,    0,    0,  273,    0,    0,  275,    0,  273,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  281,  273,    0,    0,  273,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  275,    0,    0, 
+          275,  274,  274,  274,    0,    0,  274,  274,  274,    0, 
+          274,    0,    0,    0,  275,  275,    0,    0,  274,  275, 
+          274,  274,  274,    0,    0,    0,    0,    0,    0,    0, 
+          274,  274,    0,  274,  274,  274,  274,  274,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  275, 
+            0,    0,  276,    0,    0,    0,    0,    0,    0,    0, 
+            0,  274,  276,  274,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  274,  274,    0,    0,  274,  274, 
+            0,  275,    0,    0,    0,    0,    0,    0,    0,    0, 
+          274,    0,    0,  276,    0,  274,  276,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  274, 
+          276,  276,  274,    0,    0,  276,    0,    0,  281,  281, 
+          281,    0,    0,  281,  281,  281,    0,  281,    0,    0, 
+            0,    0,    0,    0,    0,  281,    0,  281,  281,  281, 
+            0,    0,    0,    0,    0,  276,    0,  281,  281,    0, 
+          281,  281,  281,  281,  281,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  282,    0,    0,    0,  276,  281,    0, 
+          281,    0,    0,  282,    0,    0,    0,    0,    0,    0, 
+            0,  281,  281,    0,    0,  281,  281,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  281,    0,    0, 
+            0,    0,  281,    0,  282,    0,    0,  282,  275,  275, 
+          275,    0,    0,  275,  275,  275,  281,  275,    0,  281, 
+            0,  282,  282,    0,    0,  275,  282,  275,  275,  275, 
+            0,    0,    0,    0,    0,    0,    0,  275,  275,    0, 
+          275,  275,  275,  275,  275,    0,    0,    0,    0,  256, 
+            0,    0,    0,    0,    0,    0,  282,    0,    0,  256, 
+            0,    0,    0,    0,    0,    0,    0,    0,  275,    0, 
+          275,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  275,  275,    0,    0,  275,  275,    0,  282,    0, 
+          256,    0,    0,  256,    0,    0,    0,  275,    0,    0, 
+            0,    0,  275,    0,  276,  276,  276,  256,  256,  276, 
+          276,  276,  256,  276,    0,    0,  275,    0,    0,  275, 
+            0,  276,    0,  276,  276,  276,    0,    0,    0,    0, 
+            0,    0,    0,  276,  276,    0,  276,  276,  276,  276, 
+          276,    0,  256,    0,  257,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  257,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  276,    0,  276,    0,    0,    0, 
+            0,    0,    0,    0,  256,    0,    0,  276,  276,    0, 
+            0,  276,  276,    0,    0,  257,    0,    0,  257,    0, 
+            0,    0,    0,  276,    0,    0,    0,    0,  276,    0, 
+            0,    0,  257,  257,    0,    0,    0,  257,    0,    0, 
+            0,    0,  276,    0,    0,  276,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  282,  282,  282,    0,    0, 
+          282,  282,  282,    0,  282,    0,    0,  257,    0,    0, 
+            0,    0,  282,    0,  282,  282,  282,    0,    0,    0, 
+            0,    0,    0,    0,  282,  282,    0,  282,  282,  282, 
+          282,  282,    0,  252,    0,    0,    0,    0,    0,  257, 
+            0,    0,    0,  252,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  282,    0,  282,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  282, 
+            0,    0,  282,  282,  252,    0,    0,  252,    0,    0, 
+            0,  256,  256,  256,  282,    0,  256,  256,  256,  282, 
+          256,  252,  252,    0,    0,    0,  252,    0,  256,    0, 
+          256,  256,  256,  282,    0,    0,  282,    0,    0,    0, 
+          256,  256,    0,  256,  256,  256,  256,  256,    0,    0, 
+            0,    0,    0,    0,    0,    0,  252,    0,  253,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  253,    0, 
+            0,  256,    0,  256,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  252,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  253, 
+          256,    0,  253,    0,    0,  256,  257,  257,  257,    0, 
+            0,  257,  257,  257,    0,  257,  253,  253,    0,  256, 
+            0,  253,  256,  257,    0,  257,  257,  257,    0,    0, 
+            0,    0,    0,    0,    0,  257,  257,    0,  257,  257, 
+          257,  257,  257,    0,  288,    0,    0,    0,    0,    0, 
+            0,  253,    0,    0,  288,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  257,    0,  257,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          274,    0,  274,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  274,  274,    0,    0,  274,  274,    0, 
-          254,    0,  255,    0,    0,    0,    0,    0,    0,  274, 
-            0,    0,  255,    0,  274,  280,  280,  280,    0,    0, 
-          280,  280,  280,    0,  280,    0,    0,    0,  274,    0, 
-            0,  274,  280,    0,  280,  280,  280,    0,    0,    0, 
-            0,    0,    0,  255,  280,  280,  255,  280,  280,  280, 
-          280,  280,    0,    0,    0,    0,    0,    0,    0,    0, 
-          255,  255,    0,    0,  160,  255,  160,  160,  160,  160, 
-          160,    0,    0,    0,    0,  280,    0,  280,    0,    0, 
-            0,    0,    0,    0,    0,    0,  160,    0,    0,  280, 
-            0,    0,  280,  280,    0,  255,    0,    0,    0,    0, 
-          160,    0,    0,    0,  280,    0,  681,    0,    0,  280, 
-          160,    0,    0,    0,    0,  160,  160,  160,  250,    0, 
-            0,    0,    0,  280,    0,    0,  280,  255,  250,    0, 
-            0,    0,    0,    0,    0,    0,    0,  254,  254,  254, 
-            0,    0,  254,  254,  254,    0,  254,    0,    0,    0, 
-            0,    0,    0,    0,  254,    0,  254,  254,  254,  250, 
-            0,    0,  250,    0,    0,  251,  254,  254,    0,  254, 
-          254,  254,  254,  254,    0,  251,  250,  250,    0,    0, 
-            0,  250,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  254,    0,  254, 
-            0,    0,    0,    0,    0,    0,  251,    0,    0,  251, 
-            0,  250,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  251,  251,    0,  254,    0,  251,    0, 
-            0,  254,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  250,    0,  254,    0,    0,  254,    0, 
-            0,  281,    0,    0,    0,    0,    0,    0,  251,    0, 
-            0,  281,    0,    0,  255,  255,  255,    0,    0,  255, 
-          255,  255,    0,  255,    0,    0,    0,    0,    0,    0, 
-            0,  255,    0,  255,  255,  255,    0,    0,    0,    0, 
-          251,    0,  281,  255,  255,  281,  255,  255,  255,  255, 
-          255,  286,    0,    0,    0,    0,    0,    0,    0,  281, 
-          281,  286,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  255,    0,  255,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  286,    0,  281,  286,    0,    0,    0,    0, 
-            0,    0,    0,  255,    0,    0,    0,    0,  255,  286, 
-          286,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  255,    0,    0,  255,  281,    0,    0,    0, 
-          250,  250,  250,    0,    0,  250,  250,  250,    0,  250, 
-            0,    0,    0,    0,  286,    0,    0,  250,    0,  250, 
-          250,  250,    0,    0,    0,    0,    0,    0,    0,  250, 
-          250,    0,  250,  250,  250,  250,  250,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  286,  251,  251,  251, 
-            0,    0,  251,  251,  251,  282,  251,    0,    0,    0, 
-          250,    0,  250,    0,  251,  282,  251,  251,  251,    0, 
-            0,    0,    0,    0,    0,    0,  251,  251,    0,  251, 
-          251,  251,  251,  251,    0,    0,    0,    0,    0,  250, 
-            0,    0,    0,    0,  250,    0,  282,    0,    0,  282, 
-            0,    0,    0,    0,    0,    0,    0,  251,  250,  251, 
-            0,  250,    0,  282,  282,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  281,  281,  281,  251,    0,  281,  281, 
-          281,  251,  281,    0,    0,    0,    0,    0,  282,    0, 
-          281,    0,  281,  281,  281,  251,    0,    0,  251,    0, 
-            0,    0,  281,  281,    0,  281,  281,  281,  281,  281, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          282,    0,    0,  286,  286,  286,    0,    0,  286,  286, 
-          286,  287,  286,  281,    0,  281,    0,    0,    0,    0, 
-          286,  287,  286,  286,  286,    0,    0,    0,    0,    0, 
-            0,    0,  286,  286,    0,  286,  286,  286,  286,  286, 
-            0,    0,  281,    0,    0,    0,    0,  281,    0,    0, 
-            0,    0,  287,    0,    0,  287,    0,    0,  304,    0, 
-            0,  281,    0,  286,  281,  286,    0,    0,  304,  287, 
-          287,    0,    0,  161,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  286,    0,    0,    0,    0,  286,    0,  304, 
-            0,  161,  304,  161,  287,  161,    0,    0,    0,  684, 
-            0,  286,    0,    0,  286,    0,  304,  304,    0,    0, 
-            0,    0,  161,    0,  161,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  287,  282,  282,  282, 
-            0,    0,  282,  282,  282,    0,  282,    0,    0,    0, 
-            0,  304,    0,    0,  282,    0,  282,  282,  282,    0, 
-            0,    0,    0,    0,    0,    0,  282,  282,    0,  282, 
-          282,  282,  282,  282,    0,  495,    0,    0,    0,    0, 
-            0,    0,    0,  304,    0,  495,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  282,    0,  282, 
-            0,    0,    0,    0,    0,    0,    0,    0,  320,    0, 
-            0,    0,  495,  495,    0,    0,  495,  495,  495,  495, 
-          495,  495,  495,    0,    0,    0,  282,    0,    0,    0, 
-            0,  282,    0,    0,  495,  495,    0,  495,  495,    0, 
-            0,    0,    0,    0,    0,  282,    0,    0,  282,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  495,    0,  495,  495, 
-            0,    0,    0,  287,  287,  287,    0,    0,  287,  287, 
-          287,    0,  287,    0,    0,    0,    0,    0,    0,    0, 
-          287,    0,  287,  287,  287,    0,    0,    0,  495,  495, 
-          495,  320,  287,  287,    0,  287,  287,  287,  287,  287, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          304,  304,  304,    0,    0,  304,  304,  304,    0,  304, 
-            0,    0,    0,  287,    0,  287,    0,  304,    0,  304, 
-          304,  304,    0,    0,    0,    0,    0,    0,    0,  304, 
-          304,    0,  304,  304,  304,  304,  304,    0,    0,    0, 
-            0,    0,  287,    0,    0,    0,    0,  287,    0,  161, 
-            0,  161,  161,  161,  161,  161,    0,    0,    0,    0, 
-          304,  287,  304,    0,  287,    0,    0,    0,    0,    0, 
-            0,  161,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  161,    0,    0,    0,  304, 
-            0,  684,    0,    0,  304,  161,    0,    0,    0,    0, 
-          161,  161,  161,    0,    0,    0,    0,    0,  304,    0, 
-            0,  304,  320,  320,  320,    0,  320,  495,  495,  495, 
-          320,  320,  495,  495,  495,  320,  495,  320,  320,  320, 
-          320,  320,  320,  320,  495,  495,  495,  495,    0,  320, 
-          320,  320,  320,  320,  320,  320,  495,  495,  320,  495, 
-          495,  495,  495,  495,    0,  320,    0,    0,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,    0,    0,  495,  320,  495, 
-            0,  320,  320,  495,  495,  495,  495,  495,  495,  495, 
-          495,  495,  495,  495,  495,  495,  320,  320,    0,    0, 
-          495,  495,  495,  495,  320,    0,  495,  320,  320,  320, 
-          320,  495,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  821,  320,  320,  495,    0,    0,    0,    0, 
-            0,    0,  821,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  320,    0,    0,    0,  821, 
-          821,    0,    0,  821,  821,  821,  821,  821,  821,  821, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  821,  821,    0,  821,  821,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  821,    0,  821,  821,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  353, 
-            0,    0,    0,    0,    0,  821,  821,  821,  320,  353, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  794,    0,    0,    0,  353,  353,    0,  794, 
-          353,  353,  353,  353,  353,  353,  353,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  353,  353, 
-          152,  353,  353,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          353,    0,  353,  353,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  353,  353,  794,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  320, 
-          320,  320,    0,  320,  821,  821,  821,  320,  320,  821, 
-          821,  821,  320,  821,  320,  320,  320,  320,  320,  320, 
-          320,  821,  821,  821,  821,    0,  320,  320,  320,  320, 
-          320,  320,  320,  821,  821,  320,  821,  821,  821,  821, 
-          821,    0,  320,    0,    0,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,    0,    0,  821,  320,  821,    0,  320,  320, 
-          821,  821,  821,  821,  821,  821,  821,  821,  821,  821, 
-          821,  821,  821,  320,  320,    0,    0,  821,  821,  821, 
-          821,  320,    0,  821,  320,  320,  320,  320,  821,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,  320,    0, 
-          320,  320,  821,    0,    0,    0,  794,  794,  794,    0, 
-          794,  353,  353,  353,  794,  794,  353,  353,  353,  794, 
-          353,  794,  794,  794,  794,  794,  794,  794,  353,    0, 
-          353,  353,    0,  794,  794,  794,  794,  794,  794,  794, 
-          353,  353,  794,  353,  353,  353,  353,  353,    0,  794, 
-            0,    0,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,    0, 
-            0,  353,  794,  353,    0,  794,  794,  353,  353,  353, 
-          353,  353,  353,  353,  353,  353,  353,  353,  353,  353, 
-          794,  794,    0,    0,  353,  353,  353,  353,  794,    0, 
-          353,  794,  794,  794,  794,  353,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  681,  794,  794,  353, 
-            0,    0,    0,    0,    0,    0,  681,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  793, 
-            0,    0,    0,  681,  681,    0,  793,  681,  681,  681, 
-          117,  681,  681,  681,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  681,  681,  136,  681,  681, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  681,    0,    0, 
-          681,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  684,    0,    0,    0,    0,    0,  793, 
-          681,  681,  793,  684,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,    0,    0,    0, 
-          684,  684,    0,  794,  684,  684,  684,  120,  684,  684, 
-          684,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  684,  684,  139,  684,  684,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  684,    0,    0,  684,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,  684,  684,  794, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  793,  793,  793,    0,  793,  681,  681, 
-          681,  793,  793,    0,  681,  681,  793,  681,  793,  793, 
-          793,  793,  793,  793,  793,  681,  793,    0,    0,    0, 
-          793,  793,  793,  793,  793,  793,  793,  681,  681,  793, 
-          681,  681,  681,  681,  681,    0,  793,    0,    0,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,    0,    0,  681,  793, 
-          681,    0,  793,  793,  681,  681,  681,  681,  681,  681, 
-          681,  681,  681,  681,  681,  681,  681,  793,  793,    0, 
-            0,  681,  681,  681,  681,  793,  693,  681,  793,  793, 
-          793,  793,    0,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,    0,  793,  793,  681,    0,    0,    0, 
-          794,  794,  794,    0,  794,  684,  684,  684,  794,  794, 
-            0,  684,  684,  794,  684,  794,  794,  794,  794,  794, 
-          794,  794,  684,  794,    0,    0,    0,  794,  794,  794, 
-          794,  794,  794,  794,  684,  684,  794,  684,  684,  684, 
-          684,  684,    0,  794,    0,    0,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,    0,    0,  684,  794,  684,    0,  794, 
-          794,  684,  684,  684,  684,  684,  684,  684,  684,  684, 
-          684,  684,  684,  684,  794,  794,    0,    0,  684,  684, 
-          684,  684,  794,  696,  684,  794,  794,  794,  794,    0, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          360,  794,  794,  684,    0,    0,    0,    0,    0,    0, 
-          360,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  320,    0,    0,    0,  360,  360,    0, 
-            0,  360,  360,  360,  360,  360,  360,  360,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  360, 
-          360,    0,  360,  360,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  360,    0,  360,  360,    0,    0,    0,    0,    0, 
+            0,    0,    0,  253,    0,  288,    0,    0,  288,    0, 
+            0,    0,    0,    0,    0,  257,    0,    0,    0,    0, 
+          257,    0,  288,  288,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  257,    0,    0,  257,    0,    0, 
+            0,    0,    0,    0,    0,  252,  252,  252,    0,    0, 
+          252,  252,  252,    0,  252,    0,    0,  288,    0,  286, 
+            0,    0,  252,    0,  252,  252,  252,    0,    0,  286, 
+            0,    0,    0,    0,  252,  252,    0,  252,  252,  252, 
+          252,  252,    0,    0,    0,    0,    0,    0,    0,  288, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          286,    0,    0,  286,    0,  252,    0,  252,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  286,  286,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  252,    0,    0,    0,    0,  252, 
+          253,  253,  253,    0,    0,  253,  253,  253,    0,  253, 
+            0,    0,  286,  252,    0,    0,  252,  253,    0,  253, 
+          253,  253,    0,    0,    0,    0,    0,    0,    0,  253, 
+          253,    0,  253,  253,  253,  253,  253,    0,  289,    0, 
+            0,    0,    0,    0,  286,    0,    0,    0,  289,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          253,    0,  253,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  289, 
+            0,    0,  289,    0,    0,    0,  288,  288,  288,  253, 
+            0,  288,  288,  288,  253,  288,  289,  289,    0,    0, 
+            0,    0,    0,  288,    0,  288,  288,  288,  253,    0, 
+            0,  253,    0,    0,    0,  288,  288,    0,  288,  288, 
+          288,  288,  288,    0,    0,    0,    0,    0,    0,    0, 
+            0,  289,    0,  306,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  306,    0,    0,  288,    0,  288,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  289,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  306,  288,    0,  306,    0,    0, 
+          288,  286,  286,  286,    0,    0,  286,  286,  286,    0, 
+          286,  306,  306,    0,  288,    0,    0,  288,  286,    0, 
+          286,  286,  286,    0,    0,    0,    0,    0,    0,    0, 
+          286,  286,    0,  286,  286,  286,  286,  286,    0,  305, 
+            0,    0,    0,    0,    0,    0,  306,    0,    0,  305, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  286,    0,  286,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  306,    0, 
+          305,    0,    0,  305,    0,    0,    0,    0,    0,    0, 
+          286,    0,    0,    0,    0,  286,    0,  305,  305,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  286, 
+            0,    0,  286,    0,    0,    0,    0,    0,    0,    0, 
+          289,  289,  289,    0,    0,  289,  289,  289,    0,  289, 
+            0,    0,  305,    0,    0,    0,    0,  289,    0,  289, 
+          289,  289,    0,    0,    0,    0,    0,    0,    0,  289, 
+          289,    0,  289,  289,  289,  289,  289,    0,    0,    0, 
+            0,    0,    0,    0,  305,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          289,    0,  289,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  289, 
+            0,    0,    0,    0,  289,  306,  306,  306,    0,    0, 
+          306,  306,  306,  499,  306,    0,    0,    0,  289,    0, 
+            0,  289,  306,  499,  306,  306,  306,    0,    0,    0, 
+            0,    0,    0,    0,  306,  306,    0,  306,  306,  306, 
+          306,  306,    0,    0,    0,    0,  324,    0,    0,    0, 
+          499,  499,    0,    0,  499,  499,  499,  499,  499,  499, 
+          499,    0,    0,    0,    0,  306,    0,  306,    0,    0, 
+            0,    0,  499,  499,    0,  499,  499,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  305,  305,  305,  306,    0,  305,  305,  305,  306, 
+          305,    0,    0,    0,  499,    0,  499,  499,  305,    0, 
+          305,  305,  305,  306,    0,    0,  306,    0,    0,    0, 
+          305,  305,    0,  305,  305,  305,  305,    0,    0,    0, 
+          825,    0,    0,    0,    0,    0,  499,  499,  499,  324, 
+          825,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  305,    0,  305,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  324,    0,    0,    0,  825,  825,    0, 
+            0,  825,  825,  825,  825,  825,  825,  825,    0,    0, 
+          305,    0,    0,    0,    0,  305,    0,    0,    0,  825, 
+          825,    0,  825,  825,    0,    0,    0,    0,    0,  305, 
+            0,    0,  305,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  825,    0,  825,  825,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  825,  825,  825,  324,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          324,  324,  324,    0,  324,  499,  499,  499,  324,  324, 
+          499,  499,  499,  324,  499,  324,  324,  324,  324,  324, 
+          324,  324,  499,  499,  499,  499,    0,  324,  324,  324, 
+          324,  324,  324,  324,  499,  499,  324,  499,  499,  499, 
+          499,  499,    0,  324,    0,    0,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,    0,    0,  499,  324,  499,    0,  324, 
+          324,  499,  499,  499,  499,  499,  499,  499,  499,  499, 
+          499,  499,  499,  499,  324,  324,    0,    0,  499,  499, 
+          499,  499,  324,    0,  499,  324,  324,  324,  324,  499, 
+          324,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+            0,  324,  324,  499,    0,    0,    0,  324,  324,  324, 
+            0,  324,  825,  825,  825,  324,  324,  825,  825,  825, 
+          324,  825,  324,  324,  324,  324,  324,  324,  324,  825, 
+          825,  825,  825,    0,  324,  324,  324,  324,  324,  324, 
+          324,  825,  825,  324,  825,  825,  825,  825,  825,    0, 
+          324,    0,    0,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+            0,    0,  825,  324,  825,    0,  324,  324,  825,  825, 
+          825,  825,  825,  825,  825,  825,  825,  825,  825,  825, 
+          825,  324,  324,    0,    0,  825,  825,  825,  825,  324, 
+            0,  825,  324,  324,  324,  324,  825,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  357,  324,  324, 
+          825,    0,    0,    0,    0,    0,    0,  357,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          798,    0,    0,    0,  357,  357,    0,  798,  357,  357, 
+          357,  357,  357,  357,  357,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  357,  357,  154,  357, 
+          357,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
-            0,    0,    0,    0,  360,  360,  320,  798,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  357,    0, 
+          357,  357,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  685,    0,    0,    0,    0,    0, 
+            0,  357,  357,  798,  685,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          793,    0,    0,    0,  798,  798,    0,  793,  798,  798, 
-          798,  131,  798,  798,  798,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  798,  798,  150,  798, 
-          798,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  797,    0,    0, 
+            0,  685,  685,    0,  797,  685,  685,  685,  119,  685, 
+          685,  685,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  685,  685,  138,  685,  685,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  798,    0, 
-            0,  798,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  685,    0,    0,  685,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  797,  685,  685, 
+          797,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  798,  798,  798,    0,  798,  357, 
+          357,  357,  798,  798,  357,  357,  357,  798,  357,  798, 
+          798,  798,  798,  798,  798,  798,  357,    0,  357,  357, 
+            0,  798,  798,  798,  798,  798,  798,  798,  357,  357, 
+          798,  357,  357,  357,  357,  357,    0,  798,    0,    0, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,    0,    0,  357, 
+          798,  357,    0,  798,  798,  357,  357,  357,  357,  357, 
+          357,  357,  357,  357,  357,  357,  357,  357,  798,  798, 
+            0,    0,  357,  357,  357,  357,  798,    0,  357,  798, 
+          798,  798,  798,  357,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,    0,  798,  798,  357,    0,    0, 
+            0,  797,  797,  797,    0,  797,  685,  685,  685,  797, 
+          797,    0,  685,  685,  797,  685,  797,  797,  797,  797, 
+          797,  797,  797,  685,  797,    0,    0,    0,  797,  797, 
+          797,  797,  797,  797,  797,  685,  685,  797,  685,  685, 
+          685,  685,  685,    0,  797,    0,    0,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,    0,    0,  685,  797,  685,    0, 
+          797,  797,  685,  685,  685,  685,  685,  685,  685,  685, 
+          685,  685,  685,  685,  685,  797,  797,    0,    0,  685, 
+          685,  685,  685,  797,  697,  685,  797,  797,  797,  797, 
+            0,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  688,  797,  797,  685,    0,    0,    0,    0,    0, 
+            0,  688,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  798,    0,    0,    0,  688,  688, 
+            0,  798,  688,  688,  688,  122,  688,  688,  688,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          688,  688,  141,  688,  688,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  688,    0,    0,  688,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  364,    0, 
+            0,    0,    0,    0,  798,  688,  688,  798,  364,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  324,    0,    0,    0,  364,  364,    0,    0,  364, 
+          364,  364,  364,  364,  364,  364,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  364,  364,    0, 
+          364,  364,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  364, 
+            0,  364,  364,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  364,  364,  324,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  798,  798, 
+          798,    0,  798,  688,  688,  688,  798,  798,    0,  688, 
+          688,  798,  688,  798,  798,  798,  798,  798,  798,  798, 
+          688,  798,    0,    0,    0,  798,  798,  798,  798,  798, 
+          798,  798,  688,  688,  798,  688,  688,  688,  688,  688, 
+            0,  798,    0,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,    0,    0,  688,  798,  688,    0,  798,  798,  688, 
+          688,  688,  688,  688,  688,  688,  688,  688,  688,  688, 
+          688,  688,  798,  798,    0,    0,  688,  688,  688,  688, 
+          798,  700,  688,  798,  798,  798,  798,    0,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,    0,  798, 
+          798,  688,    0,    0,    0,  324,  324,  324,    0,  324, 
+          364,  364,  364,  324,  324,  364,  364,  364,  324,  364, 
+          324,  324,  324,  324,  324,  324,  324,  364,    0,  364, 
+          364,    0,  324,  324,  324,  324,  324,  324,  324,  364, 
+          364,  324,  364,  364,  364,  364,  364,    0,  324,    0, 
+            0,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,    0,    0, 
+          364,  324,  364,    0,  324,  324,  364,  364,  364,  364, 
+          364,  364,  364,  364,  364,  364,  364,  364,  364,  324, 
+          324,    0,    0,  364,  364,  364,  364,  324,    0,  364, 
+          324,  324,  324,  324,  364,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  802,  324,  324,  364,    0, 
+            0,    0,    0,    0,    0,  802,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  797,    0, 
+            0,    0,  802,  802,    0,  797,  802,  802,  802,  133, 
+          802,  802,  802,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  802,  802,  152,  802,  802,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          798,  798,  798,  793,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  320,  320,  320, 
-            0,  320,  360,  360,  360,  320,  320,  360,  360,  360, 
-          320,  360,  320,  320,  320,  320,  320,  320,  320,  360, 
-            0,  360,  360,    0,  320,  320,  320,  320,  320,  320, 
-          320,  360,  360,  320,  360,  360,  360,  360,  360,    0, 
-          320,    0,    0,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-            0,    0,  360,  320,  360,    0,  320,  320,  360,  360, 
-          360,  360,  360,  360,  360,  360,  360,  360,  360,  360, 
-          360,  320,  320,    0,    0,  360,  360,  360,  360,  320, 
-            0,  360,  320,  320,  320,  320,  360,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,    0,  320,  320, 
-          360,    0,    0,    0,  793,  793,  793,    0,  793,  798, 
-          798,  798,  793,  793,    0,  798,  798,  793,  798,  793, 
-          793,  793,  793,  793,  793,  793,  798,  798,    0,    0, 
-            0,  793,  793,  793,  793,  793,  793,  793,  798,  798, 
-          793,  798,  798,  798,  798,  798,    0,  793,    0,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,    0,    0,  798, 
-          793,  798,    0,  793,  793,  798,  798,  798,  798,  798, 
-          798,  798,  798,  798,  798,  798,  798,  798,  793,  793, 
-            0,    0,  798,  798,  798,  798,  793,    0,  798,  793, 
-          793,  793,  793,    0,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  798,    0,    0, 
-            0,    0,    0,    0,  793,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  793,    0,    0, 
-            0,  793,  793,    0,  793,  793,  793,  793,  130,  793, 
-          793,  793,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  793,  793,  149,  793,  793,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  802,    0,    0,  802, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  797,    0,    0,    0,    0,    0,  802,  802, 
+          802,  797,  797,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  797,    0,    0,    0,  797, 
+          797,    0,  797,  797,  797,  797,  132,  797,  797,  797, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  797,  797,  151,  797,  797,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  797,    0,    0,  797,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  797,  797,  797,  797,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  797,  797,  797,    0,  797,  802,  802,  802, 
+          797,  797,    0,  802,  802,  797,  802,  797,  797,  797, 
+          797,  797,  797,  797,  802,  802,    0,    0,    0,  797, 
+          797,  797,  797,  797,  797,  797,  802,  802,  797,  802, 
+          802,  802,  802,  802,    0,  797,    0,    0,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,    0,    0,  802,  797,  802, 
+            0,  797,  797,  802,  802,  802,  802,  802,  802,  802, 
+          802,  802,  802,  802,  802,  802,  797,  797,    0,    0, 
+          802,  802,  802,  802,  797,    0,  802,  797,  797,  797, 
+          797,    0,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,    0,  797,  797,  802,    0,    0,    0,  797, 
+          797,  797,    0,  797,  797,  797,  797,  797,  797,    0, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,    0,    0,    0,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,    0,  797,    0,    0,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,    0,    0,  797,  797,  797,    0,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,    0,    0,  797,  797,  797, 
+          797,  797,    0,  797,  797,  797,  797,  797,    0,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  798, 
+          797,  797,  797,    0,    0,    0,    0,    0,    0,  798, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  798,    0,    0,    0,  798,  798,    0,  798, 
+          798,  798,  798, 
       };
    }
 
    private static final int[] yyTable3() {
       return new int[] {
 
+          134,  798,  798,  798,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  798,  798,  153,  798,  798, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          793,    0,    0,  793,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,    0,    0,    0, 
-            0,    0,  793,  793,  793,  793,  794,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  794, 
-            0,    0,    0,  794,  794,    0,  794,  794,  794,  794, 
-          132,  794,  794,  794,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  794,  794,  151,  794,  794, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  794,    0,    0, 
-          794,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  794, 
-          794,  794,  794,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,    0,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-            0,    0,    0,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,    0,  793, 
-            0,    0,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,    0, 
-            0,  793,  793,  793,    0,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,    0,    0,  793,  793,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,    0,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,    0,  793,  793,  793, 
-            0,    0,    0,  794,  794,  794,    0,  794,  794,  794, 
-          794,  794,  794,    0,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,    0,    0,    0, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,    0,  794,    0,    0,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,    0,    0,  794,  794, 
-          794,    0,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,    0, 
-            0,  794,  794,  794,  794,  794,    0,  794,  794,  794, 
-          794,  794,    0,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  798,  794,  794,  794,    0,    0,    0, 
-            0,    0,    0,  798,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  793,    0,    0,    0, 
-          798,  798,    0,  793,  798,  798,  798,  798,  798,  798, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
           798,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  798,  798,  150,  798,  798,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  798,    0,    0,  798,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          793,    0,    0,    0,    0,    0,  798,  798,  798,  793, 
-          793,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  793,    0,    0,    0,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  793, 
-          793,  149,  793,  793,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  793,    0,    0,  793,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  793,  793,  793,  793,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          793,  793,  793,    0,  793,  798,  798,  798,  793,  793, 
-            0,  798,  798,  793,  798,  793,  793,  793,  793,  793, 
-          793,  793,  798,  798,    0,    0,    0,  793,  793,  793, 
-          793,  793,  793,  793,  798,  798,  793,  798,  798,  798, 
-          798,  798,    0,  793,    0,    0,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,    0,    0,  798,  793,  798,    0,  793, 
-          793,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
-          798,  798,  798,  798,  793,  793,    0,    0,  798,  798, 
-          798,  798,  793,    0,  798,  793,  793,  793,  793,    0, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-            0,  793,  793,  798,    0,    0,    0,  793,  793,  793, 
-            0,  793,  793,  793,  793,  793,  793,    0,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,    0,    0,    0,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,    0, 
-          793,    0,    0,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-            0,    0,  793,  793,  793,    0,  793,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  793,  793,  793, 
-          793,  793,  793,    0,    0,  793,  793,  793,  793,  793, 
-            0,  793,  793,  793,  793,  793,    0,  793,  793,  793, 
-          793,  793,  793,  793,  793,  793,  793,  794,  793,  793, 
-          793,    0,    0,    0,    0,    0,    0,  794,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          794,    0,    0,    0,  794,  794,    0,  794,  794,  794, 
-          794,  794,  794,  794,  794,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  794,  794,  151,  794, 
-          794,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  794,    0, 
-            0,  794,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  353,    0,    0,    0,    0,    0, 
-          794,  794,  794,  794,  353,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  794,    0,    0, 
-            0,  353,  353,    0,  794,  353,  353,  353,  133,  353, 
-          353,  353,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  353,  353,  152,  353,  353,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  353,    0,    0,  353,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  353,  353, 
-          794,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  794,  794,  794,    0,  794,  794, 
-          794,  794,  794,  794,    0,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,    0,    0, 
-            0,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,    0,  794,    0,    0, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,    0,    0,  794, 
-          794,  794,    0,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-            0,    0,  794,  794,  794,  794,  794,    0,  794,  794, 
-          794,  794,  794,    0,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,    0,  794,  794,  794,    0,    0, 
-            0,  794,  794,  794,    0,  794,  353,  353,  353,  794, 
-          794,    0,  353,  353,  794,  353,  794,  794,  794,  794, 
-          794,  794,  794,  353,    0,    0,    0,    0,  794,  794, 
-          794,  794,  794,  794,  794,  353,  353,  794,  353,  353, 
-          353,  353,  353,    0,  794,    0,    0,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,    0,    0,  353,  794,  353, 1098, 
-          794,  794,  353,  353,  353,  353,  353,  353,  353,  353, 
-          353,  353,  353,  353,  353,  794,  794,    0,    0,  353, 
-          353,  353,  353,  794,    0,  353,  794,  794,  794,  794, 
-            0,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,  353,  794,  794,  353,    0,    0,    0,    0,    0, 
-            0,  353,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  794,    0,    0,    0,  353,  353, 
-            0,  794,  353,  353,  353,  353,  353,  353,  353,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          353,  353,  152,  353,  353,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  353,    0,    0,  353,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  821,    0, 
-            0,    0,    0,    0,    0,  353,  353,  794,  821,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  320, 1080, 1081, 1082, 1083,    0,    0,    0,  821, 
-            0,    0,    0,    0,  821,    0,    0,    0, 1084, 1085, 
-         1086, 1087,    0,    0,    0, 1088,    0,  821,   40,   41, 
-           42,   43,   44,    0,    0,    0,    0,    0,  306,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0, 1090, 1091,    0,    0, 
-            0,    0,    0,    0, 1092,    0,    0, 1093,    0, 1094, 
-         1095,    0, 1096,    0,    0,   58,   59,   60,   61,   62, 
-           63,   64,    0,   65,   66,    0,    0,    0,    0,    0, 
-            0,  821,    0,  821,  320,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  794,  794, 
-          794,    0,  794,  353,  353,  353,  794,  794,    0,  353, 
-          353,  794,  353,  794,  794,  794,  794,  794,  794,  794, 
-          353,    0,    0,    0,    0,  794,  794,  794,  794,  794, 
-          794,  794,  353,  353,  794,  353,  353,  353,  353,  353, 
-            0,  794,    0,    0,  794,  794,  794,  794,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,  794,  794, 
-          794,    0,    0,  353,  794,  353,    0,  794,  794,  353, 
-          353,  353,  353,  353,  353,  353,  353,  353,  353,  353, 
-          353,  353,  794,  794,    0,    0,  353,  353,  353,  353, 
-          794,    0,  353,  794,  794,  794,  794,    0,  794,  794, 
-          794,  794,  794,  794,  794,  794,  794,  794,    0,  794, 
-          794,  353,    0,    0,    0,  320,  320,  320,    0,  320, 
-          821,  821,  821,  320,  320,  821,  821,  821,  320,  821, 
-          320,  320,  320,  320,  320,  320,  320,  821,  821,  821, 
-            0,    0,  320,  320,  320,  320,  320,  320,  320,  821, 
-          821,  320,  821,  821,  821,  821,  821,    0,  320,    0, 
-            0,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,    0,    0, 
-          821,  320,  821,    0,  320,  320,    0,    0,    0,    0, 
-            0,    0,  388,    0,    0,    0,    0,    0,    0,  320, 
-          320,    0,  388,    0,    0,  821,  821,  320,    0,    0, 
-          320,  320,  320,  320,    0,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,    0,  320,  320,  821,  388, 
-          388,    0,    0,  388,  388,  388,  388,  388,  388,  388, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  388,  388,    0,  388,  388,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  389,  388,    0,  388,  388,    0,    0,    0, 
-            0,    0,  389,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  388,  388,    0,  389, 
-          389,    0,    0,  389,  389,  389,  389,  389,  389,  389, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  389,  389,    0,  389,  389,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  389,    0,  389,  389,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  357,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  357,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  389,  389,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  357,  357,    0,    0,  357,  357,  357, 
-          357,  357,  357,  357,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  357,  357,    0,  357,  357, 
-            0,    0,    0,    0,  388,  388,  388,    0,    0,  388, 
-          388,  388,    0,  388,    0,    0,    0,    0,    0,    0, 
-            0,  388,    0,  388,  388,    0,    0,  357,    0,  357, 
-          357,    0,    0,  388,  388,    0,  388,  388,  388,  388, 
-          388,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          357,  357,    0,    0,  388,    0,  388,    0,    0,    0, 
-          388,  388,  388,  388,  388,  388,  388,  388,  388,  388, 
-          388,  388,  388,    0,    0,    0,    0,  388,  388,  388, 
-          388,    0,    0,  388,  389,  389,  389,    0,  388,  389, 
-          389,  389,    0,  389,    0,    0,    0,    0,    0,    0, 
-            0,  389,  388,  389,  389,    0,    0,    0,    0,    0, 
-            0,    0,    0,  389,  389,    0,  389,  389,  389,  389, 
-          389,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  389,    0,  389,    0,    0,    0, 
-          389,  389,  389,  389,  389,  389,  389,  389,  389,  389, 
-          389,  389,  389,    0,    0,    0,    0,  389,  389,  389, 
-          389,    0,    0,  389,    0,    0,    0,    0,  389,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  357,  357, 
-          357,    0,  389,  357,  357,  357,    0,  357,    0,    0, 
-            0,    0,    0,    0,    0,  357,    0,  357,  357,    0, 
-            0,    0,    0,    0,    0,    0,    0,  357,  357,    0, 
-          357,  357,  357,  357,  357,    0,    0,    0,    0,    0, 
+            0,    0,    0,  802,    0,    0,    0,    0,    0,  798, 
+          798,  798,  798,  802,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  797,    0,    0,    0, 
+          802,  802,    0,  797,  802,  802,  802,  802,  802,  802, 
+          802,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  802,  802,  152,  802,  802,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  496,    0,    0,    0,    0,    0,  357,    0, 
-          357,    0,  496,    0,  357,  357,  357,  357,  357,  357, 
-          357,  357,  357,  357,  357,  357,  357,    0,    0,    0, 
-            0,  357,  357,  357,  357,    0,    0,  357,    0,  496, 
-          496,    0,  357,  496,  496,  496,  129,  496,  496,  496, 
-            0,    0,    0,    0,    0,    0,  357,    0,    0,    0, 
-            0,  496,  496,  148,  496,  496,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  496,  496,    0,  496,    0,    0,    0, 
-            0,    0,    0,    0,  496,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  496,  496,  496,    0,    0, 
-            0,  496,  496,    0,    0,  496,  496,  496,  496,  496, 
-          496,  496,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  496,  496,  148,  496,  496,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  687,  496,    0,    0,  496,    0, 
-            0,    0,    0,    0,  687,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  496,  496,  496, 
-            0,  687,  687,    0,    0,  687,  687,  687,  123,  687, 
-          687,  687,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  687,  687,  142,  687,  687,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  496,  496,  496,    0,    0,    0, 
-          496,  496,    0,  496,    0,  687,    0,    0,  687,    0, 
-            0,  496,  496,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  496,  496,    0,  496,  496,  496,  496, 
-          496,    0,    0,    0,    0,    0,    0,    0,  687,  687, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  496,    0,  496,    0,    0,    0, 
-          496,  496,  496,  496,  496,  496,  496,  496,  496,  496, 
-          496,  496,  496,    0,    0,    0,    0,  496,  496,  496, 
-          496,    0,    0,  496,    0,    0,  496,  496,  496,    0, 
-            0,    0,  496,  496,    0,  496,    0,    0,    0,    0, 
-            0,    0,  496,  496,  496,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  496,  496,    0,  496,  496, 
-          496,  496,  496,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  496,    0,  496,    0, 
-            0,    0,  496,  496,  496,  496,  496,  496,  496,  496, 
-          496,  496,  496,  496,  496,    0,    0,    0,    0,  496, 
-          496,  496,  496,    0,    0,  496,  687,  687,  687,    0, 
-            0,    0,  687,  687,    0,  687,    0,    0,    0,    0, 
-            0,    0,    0,  687,  496,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  687,  687,    0,  687,  687, 
-          687,  687,  687,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  686, 
-            0,    0,    0,    0,    0,    0,  687,    0,  687,  686, 
-            0,    0,  687,  687,  687,  687,  687,  687,  687,  687, 
-          687,  687,  687,  687,  687,    0,    0,    0,    0,  687, 
-          687,  687,  687,    0,  699,  687,  686,  686,    0,    0, 
-          686,  686,  686,  122,  686,  686,  686,    0,    0,    0, 
-            0,    0,    0,    0,  687,    0,    0,    0,  686,  686, 
-          141,  686,  686,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  688, 
-          686,    0,    0,  686,    0,    0,    0,    0,    0,  688, 
+            0,    0,    0,    0,  802,    0,    0,  802,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  686,  686,    0,  688,  688,    0,    0, 
-          688,  688,  688,  124,  688,  688,  688,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  688,  688, 
-          143,  688,  688,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  802,  802,  802,  797, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  798,  798,  798,    0,  798,  798,  798, 
+          798,  798,  798,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,    0,    0,    0, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,    0,  798,    0,    0,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,    0,    0,  798,  798, 
+          798,    0,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,    0, 
+            0,  798,  798,  798,  798,  798,    0,  798,  798,  798, 
+          798,  798,    0,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,    0,  798,  798,  798,    0,    0,    0, 
+          797,  797,  797,    0,  797,  802,  802,  802,  797,  797, 
+            0,  802,  802,  797,  802,  797,  797,  797,  797,  797, 
+          797,  797,  802,  802,    0,    0,    0,  797,  797,  797, 
+          797,  797,  797,  797,  802,  802,  797,  802,  802,  802, 
+          802,  802,    0,  797,    0,    0,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,    0,    0,  802,  797,  802,    0,  797, 
+          797,  802,  802,  802,  802,  802,  802,  802,  802,  802, 
+          802,  802,  802,  802,  797,  797,    0,    0,  802,  802, 
+          802,  802,  797,    0,  802,  797,  797,  797,  797,    0, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  802,    0,    0,    0,    0,    0,    0, 
+          797,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          688,  689,    0,  688,    0,    0,    0,    0,    0,    0, 
-            0,  689,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  797,    0,    0,    0,  797,  797,    0, 
+          797,  797,  797,  797,  797,  797,  797,  797,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  797, 
+          797,  151,  797,  797,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  688,  688,    0,    0,    0,  689,  689, 
-            0,    0,  689,  689,  689,  125,  689,  689,  689,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          689,  689,  144,  689,  689,    0,    0,    0,    0,    0, 
+            0,  797,    0,    0,  797,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  686,  686,  686,    0,    0,    0,  686,  686,    0, 
-          686,    0,  689,    0,    0,  689,    0,    0,  686,    0, 
+            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
+            0,    0,    0,  797,  797,  797,  797,  798,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          686,  686,    0,  686,  686,  686,  686,  686,    0,    0, 
-            0,    0,    0,    0,    0,  689,  689,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  686,    0,  686,    0,    0,    0,  686,  686,  686, 
-          686,  686,  686,  686,  686,  686,  686,  686,  686,  686, 
-            0,    0,    0,    0,  686,  686,  686,  686,    0,  698, 
-          686,  688,  688,  688,    0,    0,    0,  688,  688,    0, 
-          688,    0,    0,    0,    0,    0,    0,    0,  688,  686, 
+          798,    0,    0,    0,  798,  798,    0,  798,  798,  798, 
+          798,  798,  798,  798,  798,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  798,  798,  153,  798, 
+          798,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  798,    0, 
+            0,  798,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          688,  688,    0,  688,  688,  688,  688,  688,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          798,  798,  798,  798,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  797,  797,  797, 
+            0,  797,  797,  797,  797,  797,  797,    0,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,    0,    0,    0,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,    0, 
+          797,    0,    0,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+            0,    0,  797,  797,  797,    0,  797,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,  797,  797,  797, 
+          797,  797,  797,    0,    0,  797,  797,  797,  797,  797, 
+            0,  797,  797,  797,  797,  797,    0,  797,  797,  797, 
+          797,  797,  797,  797,  797,  797,  797,    0,  797,  797, 
+          797,    0,    0,    0,  798,  798,  798,    0,  798,  798, 
+          798,  798,  798,  798,    0,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,    0,    0, 
+            0,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,    0,  798,    0,    0, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,    0,    0,  798, 
+          798,  798,    0,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+            0,    0,  798,  798,  798,  798,  798,    0,  798,  798, 
+          798,  798,  798,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  357,  798,  798,  798,    0,    0, 
+            0,    0,    0,    0,  357,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
+            0,  357,  357,    0,  798,  357,  357,  357,  135,  357, 
+          357,  357,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  357,  357,  154,  357,  357,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  357,    0,    0,  357,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  688,    0,  688,    0,    0,    0,  688,  688,  688, 
-          688,  688,  688,  688,  688,  688,  688,  688,  688,  688, 
-            0,    0,    0,    0,  688,  688,  688,  688,    0,  700, 
-          688,    0,    0,  689,  689,  689,    0,    0,    0,  689, 
-          689,    0,  689,    0,    0,    0,    0,    0,    0,  688, 
-          689,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  689,  689,    0,  689,  689,  689,  689,  689, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  691,    0,    0,    0, 
-            0,    0,    0,  689,    0,  689,  691,    0,    0,  689, 
-          689,  689,  689,  689,  689,  689,  689,  689,  689,  689, 
-          689,  689,    0,    0,    0,    0,  689,  689,  689,  689, 
-            0,  701,  689,  691,  691,    0,    0,  691,  691,  691, 
-          127,  691,  691,  691,    0,    0,    0,    0,    0,    0, 
-            0,  689,    0,    0,    0,  691,  691,  146,  691,  691, 
+            0,  357,    0,    0,    0,    0,    0,    0,  357,  357, 
+          798,  357,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  798,    0,    0,    0,  357,  357, 
+            0,  798,  357,  357,  357,  357,  357,  357,  357,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  690,  691,    0,    0, 
-          691,    0,    0,    0,    0,    0,  690,    0,    0,    0, 
+          357,  357,  154,  357,  357,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          691,  691,    0,  690,  690,    0,    0,  690,  690,  690, 
-          126,  690,  690,  690,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  690,  690,  145,  690,  690, 
+            0,    0,  357,    0,    0,  357,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  690,  692,    0, 
-          690,    0,    0,    0,    0,    0,    0,    0,  692,    0, 
+            0,    0,    0,    0,    0,  357,  357,  798,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  798,  798,  798,    0,  798,  357,  357,  357,  798, 
+          798,    0,  357,  357,  798,  357,  798,  798,  798,  798, 
+          798,  798,  798,  357,    0,    0,    0,    0,  798,  798, 
+          798,  798,  798,  798,  798,  357,  357,  798,  357,  357, 
+          357,  357,  357,    0,  798,    0,    0,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,    0,    0,  357,  798,  357,    0, 
+          798,  798,  357,  357,  357,  357,  357,  357,  357,  357, 
+          357,  357,  357,  357,  357,  798,  798,    0,    0,  357, 
+          357,  357,  357,  798,    0,  357,  798,  798,  798,  798, 
+            0,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,    0,  798,  798,  357,    0,    0,    0,  798,  798, 
+          798,    0,  798,  357,  357,  357,  798,  798,    0,  357, 
+          357,  798,  357,  798,  798,  798,  798,  798,  798,  798, 
+          357,    0,    0,    0,    0,  798,  798,  798,  798,  798, 
+          798,  798,  357,  357,  798,  357,  357,  357,  357,  357, 
+            0,  798,    0,    0,  798,  798,  798,  798,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  798,  798, 
+          798,    0,    0,  357,  798,  357,    0,  798,  798,  357, 
+          357,  357,  357,  357,  357,  357,  357,  357,  357,  357, 
+          357,  357,  798,  798,    0,    0,  357,  357,  357,  357, 
+          798,    0,  357,  798,  798,  798,  798,    0,  798,  798, 
+          798,  798,  798,  798,  798,  798,  798,  798,  825,  798, 
+          798,  357,    0,    0,    0,    0,    0,    0,  825,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  324,    0,    0,    0,    0,    0,    0,    0,  825, 
+            0,    0,    0,    0,  825,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  825,    0, 1114, 
+         1114,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  392,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  392,    0,    0, 
+            0,  825,    0,  825,  324,    0, 1114, 1114,    0,    0, 
+         1114,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  392,  392,    0,    0,  392,  392, 
+          392,  392,  392,  392,  392,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0, 1114,    0,  392,  392,    0,  392, 
+          392,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0, 1114,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  392,    0, 
+          392,  392,    0, 1114,    0,    0,    0, 1114,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+         1114, 1114, 1114, 1114,    0,    0,    0, 1114, 1114,    0, 
+         1114,  392,  392,    0,    0,    0,    0,    0,    0,    0, 
+          571,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          571,    0,    0,    0,    0,  324,  324,  324,    0,  324, 
+          825,  825,  825,  324,  324,  825,  825,  825,  324,  825, 
+          324,  324,  324,  324,  324,  324,  324,  825,  825,  825, 
+            0,  571,  324,  324,  324,  324,  324,  324,  324,  825, 
+          825,  324,  825,  825,  825,  825,  825,    0,  324,  571, 
+            0,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,    0,    0, 
+          825,  324,  825,    0,  324,  324,    0,    0,    0,    0, 
+            0,    0,    0,  571,    0,    0,    0,    0, 1114,  324, 
+          324, 1114,    0,    0,    0,  825,  825,  324,    0, 1114, 
+          324,  324,  324,  324,    0,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,  571,  324,  324,  825,  392, 
+          392,  392,    0,    0,  392,  392,  392,    0,  392,    0, 
+            0,    0,    0,    0,    0,    0,  392,    0,  392,  392, 
+            0,    0,    0,    0,    0,    0,    0,    0,  392,  392, 
+            0,  392,  392,  392,  392,  392, 1114,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  393,    0,    0,    0,    0,    0,  392, 
+            0,  392,    0,  393,    0,  392,  392,  392,  392,  392, 
+          392,  392,  392,  392,  392,  392,  392,  392,    0,    0, 
+            0,    0,  392,  392,  392,  392,    0,    0,  392,    0, 
+          393,  393,    0,  392,  393,  393,  393,  393,  393,  393, 
+          393,    0,    0,    0,    0,    0,    0,  392,    0,    0, 
+            0,    0,  393,  393,    0,  393,  393,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  571,  571,  571,    0,    0,  571,  571,  571, 
+            0,  571,    0,  361,  393,    0,  393,  393,    0,  571, 
+            0,  571,    0,  361,    0,    0,    0,    0,    0,    0, 
+            0,  571,  571,    0,  571,  571,  571,  571,  571,    0, 
+            0,    0,    0,    0,    0,    0,    0,  393,  393,    0, 
+          361,  361,    0,    0,  361,  361,  361,  361,  361,  361, 
+          361,    0,  571,    0,  571,    0,    0,    0,    0,    0, 
+            0,    0,  361,  361,    0,  361,  361,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  361,    0,  361,  361,    0,  500, 
+          571,    0,    0,    0,    0,    0,    0,    0,    0,  500, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  361,  361,    0, 
+            0,    0,    0,    0,    0,    0,  500,  500,    0,    0, 
+          500,  500,  500,  131,  500,  500,  500,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  500,  500, 
+          150,  500,  500,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  393,  393,  393,    0,    0, 
+          393,  393,  393,    0,  393,    0,    0,    0,    0,    0, 
+          500,    0,  393,  500,  393,  393,    0,    0,    0,    0, 
+            0,    0,    0,    0,  393,  393,    0,  393,  393,  393, 
+          393,  393,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  500,  500,  500,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  393,    0,  393,    0, 1115, 
+         1115,  393,  393,  393,  393,  393,  393,  393,  393,  393, 
+          393,  393,  393,  393,    0,    0,    0,    0,  393,  393, 
+          393,  393,    0,    0,  393,  361,  361,  361,    0,  393, 
+          361,  361,  361,    0,  361,    0,    0,    0,    0,    0, 
+            0,    0,  361,  393,  361,  361,    0,    0,    0,    0, 
+            0,    0,    0,    0,  361,  361,    0,  361,  361,  361, 
+          361,  361,    0,    0,    0,    0, 1115, 1115,    0,    0, 
+         1115,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  361,    0,  361,    0,    0, 
+            0,  361,  361,  361,  361,  361,  361,  361,  361,  361, 
+          361,  361,  361,  361, 1115,    0,    0,    0,  361,  361, 
+          361,  361,    0,    0,  361,    0,    0,    0,    0,  361, 
+            0,  500,  500,  500,    0, 1115,    0,  500,  500,    0, 
+          500,    0,    0,  361,    0,    0,    0,    0,  500,  500, 
+            0,    0,    0, 1115,    0,    0,    0, 1115,    0,    0, 
+          500,  500,    0,  500,  500,  500,  500,  500,    0,    0, 
+         1115, 1115, 1115, 1115,    0,    0,    0, 1115, 1115,    0, 
+         1115,    0,    0,    0,  500,    0,    0,    0,    0,    0, 
+            0,  500,    0,  500,  500,    0,    0,  500,  500,  500, 
+          500,  500,  500,  500,  500,  500,  500,  500,  500,  500, 
+            0,    0,    0,    0,  500,  500,  500,  500,    0,    0, 
+          500,  500,  500,    0,    0,  500,  500,  500,  500,  500, 
+          500,  500,    0,    0,    0,    0,    0,    0,    0,  500, 
+            0,    0,    0,  500,  500,  150,  500,  500,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  691,  500,    0,    0,  500,    0, 
+            0,    0,    0,    0,  691,    0,    0,    0, 1115,    0, 
+            0, 1115,    0,    0,    0,    0,    0,    0,    0, 1115, 
+            0,    0,    0,    0,    0,    0,    0,  500,  500,  500, 
+            0,  691,  691,    0,    0,  691,  691,  691,  125,  691, 
+          691,  691,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  691,  691,  144,  691,  691,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1115,    0,    0,    0, 
+            0,    0,    0,    0,    0,  691,  690,    0,  691,    0, 
+            0,    0,    0,    0,    0,    0,  690,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          690,  690,    0,    0,    0,  692,  692,    0,    0,  692, 
-          692,  692,  128,  692,  692,  692,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  692,  692,  147, 
-          692,  692,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,  691,  691, 
-          691,    0,    0,    0,  691,  691,    0,  691,    0,  692, 
-            0,    0,  692,    0,    0,  691,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  691,  691,    0, 
-          691,  691,  691,  691,  691,    0,    0,    0,    0,    0, 
-            0,    0,  692,  692,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  691,    0, 
-          691,    0,    0,    0,  691,  691,  691,  691,  691,  691, 
-          691,  691,  691,  691,  691,  691,  691,    0,    0,    0, 
-            0,  691,  691,  691,  691,    0,  703,  691,  690,  690, 
+            0,    0,    0,  690,  690,    0,    0,  690,  690,  690, 
+          124,  690,  690,  690,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  690,  690,  143,  690,  690, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  500,  500,  500,    0, 
+            0,    0,  500,  500,    0,  500,    0,  690,    0,    0, 
+          690,    0,    0,  500,  500,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  500,  500,    0,  500,  500, 
+          500,  500,  500,    0,    0,    0,    0,    0,    0,    0, 
+          690,  690,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  500,    0,  500,    0, 
+            0,    0,  500,  500,  500,  500,  500,  500,  500,  500, 
+          500,  500,  500,  500,  500,    0,    0,    0,    0,  500, 
+          500,  500,  500,    0,    0,  500,  691,  691,  691,    0, 
+            0,    0,  691,  691,    0,  691,    0,    0,    0,    0, 
+            0,    0,    0,  691,  500,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  691,  691,    0,  691,  691, 
+          691,  691,  691,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  691,    0,  691,    0, 
+            0,    0,  691,  691,  691,  691,  691,  691,  691,  691, 
+          691,  691,  691,  691,  691,    0,    0,    0,    0,  691, 
+          691,  691,  691,    0,  703,  691,    0,    0,  690,  690, 
           690,    0,    0,    0,  690,  690,    0,  690,    0,    0, 
-            0,    0,    0,    0,    0,  690,  691,    0,    0,    0, 
+            0,    0,    0,    0,  691,  690,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,  690,  690,    0, 
           690,  690,  690,  690,  690,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  690,    0, 
-          690,    0,    0,    0,  690,  690,  690,  690,  690,  690, 
+            0,  692,    0,    0,    0,    0,    0,    0,  690,    0, 
+          690,  692,    0,    0,  690,  690,  690,  690,  690,  690, 
           690,  690,  690,  690,  690,  690,  690,    0,    0,    0, 
-            0,  690,  690,  690,  690,    0,  702,  690,    0,    0, 
-          692,  692,  692,    0,    0,    0,  692,  692,    0,  692, 
-            0,    0,    0,    0,    0,    0,  690,  692,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  692, 
-          692,    0,  692,  692,  692,  692,  692,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  683,    0,    0,    0,    0,    0,    0, 
-          692,    0,  692,  683,    0,    0,  692,  692,  692,  692, 
-          692,  692,  692,  692,  692,  692,  692,  692,  692,    0, 
-            0,    0,    0,  692,  692,  692,  692,    0,  704,  692, 
-          683,  683,    0,    0,  683,  683,  683,  119,  683,  683, 
-          683,    0,    0,    0,    0,    0,    0,    0,  692,    0, 
-            0,    0,  683,  683,  138,  683,  683,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  682,  683,    0,    0,  683,    0,    0, 
-            0,    0,    0,  682,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  683,  683,    0, 
-          682,  682,    0,    0,  682,  682,  682,  118,  682,  682, 
-          682,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  682,  682,  137,  682,  682,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  682,  685,    0,  682,    0,    0, 
-            0,    0,    0,    0,    0,  685,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  682,  682,    0, 
-            0,    0,  685,  685,    0,    0,  685,  685,  685,  121, 
-          685,  685,  685,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  685,  685,  140,  685,  685,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  683,  683,  683,    0,    0, 
-            0,  683,  683,    0,  683,    0,  685,    0,    0,  685, 
-            0,    0,  683,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  683,  683,    0,  683,  683,  683, 
-          683,  683,    0,    0,    0,    0,    0,    0,    0,  685, 
-          685,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  683,    0,  683,    0,    0, 
-            0,  683,  683,  683,  683,  683,  683,  683,  683,  683, 
-          683,  683,  683,  683,    0,    0,    0,    0,  683,  683, 
-          683,  683,    0,  695,  683,  682,  682,  682,    0,    0, 
-            0,  682,  682,    0,  682,    0,    0,    0,    0,    0, 
-            0,    0,  682,  683,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  682,  682,    0,  682,  682,  682, 
-          682,  682,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  682,    0,  682,    0,    0, 
-            0,  682,  682,  682,  682,  682,  682,  682,  682,  682, 
-          682,  682,  682,  682,    0,    0,    0,    0,  682,  682, 
-          682,  682,    0,  694,  682,    0,    0,  685,  685,  685, 
-            0,    0,    0,  685,  685,    0,  685,    0,    0,    0, 
-            0,    0,    0,  682,  685,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  685,  685,    0,  685, 
-          685,  685,  685,  685,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          346,    0,    0,    0,    0,    0,    0,  685,    0,  685, 
-          346,    0,    0,  685,  685,  685,  685,  685,  685,  685, 
-          685,  685,  685,  685,  685,  685,    0,    0,    0,    0, 
-          685,  685,  685,  685,    0,  697,  685,  346,  346,    0, 
-            0,  346,  346,  346,  135,  346,  346,  346,    0,    0, 
-            0,    0,    0,    0,    0,  685,    0,    0,    0,  346, 
-          346,  154,  346,  346,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          354,  346,    0,    0,  346,    0,    0,    0,    0,    0, 
-          354,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  346,  346,    0,  354,  354,    0, 
-            0,  354,  354,  354,  134,  354,  354,  354,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  354, 
-          354,  153,  354,  354,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  354,  346,    0,  354,    0,    0,    0,    0,    0, 
-            0,    0,  346,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  354,  354,    0,    0,    0,  346, 
-          346,    0,    0,  346,  346,  346,  346,  346,  346,  346, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  346,  346,  154,  346,  346,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  346,  346,  346,    0,    0,    0,  346,  346, 
-            0,  346,    0,  346,    0,    0,  346,    0,    0,  346, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  346,  346,    0,  346,  346,  346,  346,  346,    0, 
-            0,    0,    0,    0,    0,    0,  346,  346,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  346,    0,  346,    0,    0,    0,  346,  346, 
-          346,  346,  346,  346,  346,  346,  346,  346,  346,  346, 
-          346,    0,    0,    0,    0,  346,  346,  346,  346,    0, 
-          792,  346,  354,  354,  354,    0,    0,    0,  354,  354, 
-          792,  354,    0,    0,    0,    0,    0,    0,    0,  354, 
-          346,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  354,  354,    0,  354,  354,  354,  354,  354,    0, 
-            0,  792,    0,    0,  792,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  792, 
-            0,    0,  354,    0,  354,    0,    0,    0,  354,  354, 
-          354,  354,  354,  354,  354,  354,  354,  354,  354,  354, 
-          354,    0,    0,    0,    0,  354,  354,  354,  354,    0, 
-            0,  354,    0,  792,  346,  346,  346,    0,  326,    0, 
-          346,  346,    0,  346,    0,    0,    0,    0,  326,    0, 
-          354,  346,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  346,  346,  792,  346,  346,  346,  346, 
-          346,    0,    0,    0,    0,    0,    0,    0,    0,  326, 
-            0,    0,  326,    0,    0,  328,    0,    0,    0,    0, 
-            0,    0,    0,    0,  346,  328,  346,  326,    0,    0, 
-          346,  346,  346,  346,  346,  346,  346,  346,  346,  346, 
-          346,  346,  346,    0,    0,    0,    0,  346,  346,  346, 
-          346,    0,    0,  346,  581,    0,  328,    0,    0,  328, 
-            0,  326,    0,    0,  581,    0,    0,    0,    0,    0, 
-            0,    0,  346,    0,  328,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  326,    0,  581,    0,    0,  581,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  328,    0, 
-            0,    0,    0,  581,    0,    0,    0,    0,    0,    0, 
+            0,  690,  690,  690,  690,    0,  702,  690,  692,  692, 
+            0,    0,  692,  692,  692,  126,  692,  692,  692,    0, 
+            0,    0,    0,    0,    0,    0,  690,    0,    0,    0, 
+          692,  692,  145,  692,  692,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  693,  692,    0,    0,  692,    0,    0,    0,    0, 
+            0,  693,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  692,  692,    0,  693,  693, 
+            0,    0,  693,  693,  693,  127,  693,  693,  693,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          693,  693,  146,  693,  693,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  693,  695,    0,  693,    0,    0,    0,    0, 
+            0,    0,    0,  695,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  693,  693,    0,    0,    0, 
+          695,  695,    0,    0,  695,  695,  695,  129,  695,  695, 
+          695,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  695,  695,  148,  695,  695,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  692,  692,  692,    0,    0,    0,  692, 
+          692,    0,  692,    0,  695,    0,    0,  695,    0,    0, 
+          692,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  692,  692,    0,  692,  692,  692,  692,  692, 
+            0,    0,    0,    0,    0,    0,    0,  695,  695,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  692,    0,  692,    0,    0,    0,  692, 
+          692,  692,  692,  692,  692,  692,  692,  692,  692,  692, 
+          692,  692,    0,    0,    0,    0,  692,  692,  692,  692, 
+            0,  704,  692,  693,  693,  693,    0,    0,    0,  693, 
+          693,    0,  693,    0,    0,    0,    0,    0,    0,    0, 
+          693,  692,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  693,  693,    0,  693,  693,  693,  693,  693, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  693,    0,  693,    0,    0,    0,  693, 
+          693,  693,  693,  693,  693,  693,  693,  693,  693,  693, 
+          693,  693,    0,    0,    0,    0,  693,  693,  693,  693, 
+            0,  705,  693,    0,    0,  695,  695,  695,    0,    0, 
+            0,  695,  695,    0,  695,    0,    0,    0,    0,    0, 
+            0,  693,  695,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  695,  695,    0,  695,  695,  695, 
+          695,  695,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  694,    0, 
+            0,    0,    0,    0,    0,  695,    0,  695,  694,    0, 
+            0,  695,  695,  695,  695,  695,  695,  695,  695,  695, 
+          695,  695,  695,  695,    0,    0,    0,    0,  695,  695, 
+          695,  695,    0,  707,  695,  694,  694,    0,    0,  694, 
+          694,  694,  128,  694,  694,  694,    0,    0,    0,    0, 
+            0,    0,    0,  695,    0,    0,    0,  694,  694,  147, 
+          694,  694,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  696,  694, 
+            0,    0,  694,    0,    0,    0,    0,    0,  696,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  694,  694,    0,  696,  696,    0,    0,  696, 
+          696,  696,  130,  696,  696,  696,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  696,  696,  149, 
+          696,  696,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  696, 
+          687,    0,  696,    0,    0,    0,    0,    0,    0,    0, 
+          687,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  696,  696,    0,    0,    0,  687,  687,    0, 
+            0,  687,  687,  687,  121,  687,  687,  687,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  687, 
+          687,  140,  687,  687,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  792,  792,  792,    0,    0,  792,  792,  792, 
-          328,  792,    0,    0,    0,    0,    0,  581,    0,  792, 
-            0,  792,  792,    0,    0,    0,    0,    0,    0,    0, 
-            0,  792,  792,  588,  792,  792,  792,  792,  792,    0, 
-            0,    0,    0,  588,    0,    0,    0,    0,  581,  581, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  792,    0,  792,    0,    0,    0,    0,    0, 
-            0,    0,  584,    0,  588,    0,    0,  588,    0,    0, 
-            0,    0,  584,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  588,    0,    0,    0,  792,    0,    0,    0, 
-          326,  326,  326,    0,    0,  326,  326,  326,    0,  326, 
-          792,    0,    0,  584,    0,    0,  584,  326,    0,  326, 
-          326,    0,    0,    0,    0,    0,  588,    0,    0,  326, 
-          326,  584,  326,  326,  326,  326,  326,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  328,  328,  328, 
-            0,    0,  328,  328,  328,    0,  328,  588,  588,    0, 
-          326,    0,  326,    0,  328,  584,  328,  328,    0,    0, 
-            0,    0,    0,    0,    0,    0,  328,  328,    0,  328, 
-          328,  328,  328,  328,    0,    0,  581,  581,  581,    0, 
-            0,  581,  581,  581,  326,  581,  584,  584,    0,    0, 
-            0,    0,    0,  581,    0,  581,    0,  328,  326,  328, 
-            0,    0,    0,  585,    0,  581,  581,    0,  581,  581, 
-          581,  581,  581,  585,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  328,    0,    0,    0,    0,  581,    0,  581,    0, 
-            0,    0,    0,    0,  585,  328,    0,  585,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  585,    0,    0,  581,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  581,  588,  588,  588,    0,    0, 
-          588,  588,  588,    0,  588,    0,  585,    0,    0,    0, 
-            0,    0,  588,    0,  588,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  588,  588,    0,  588,  588,  588, 
-          588,  588,  528,    0,  584,  584,  584,  585,  585,  584, 
-          584,  584,  528,  584,    0,    0,    0,    0,    0,    0, 
-            0,  584,    0,  584,    0,  588,    0,  588,    0,    0, 
-            0,    0,    0,  584,  584,    0,  584,  584,  584,  584, 
-          584,  562,    0,  528,    0,    0,  528,    0,    0,    0, 
-            0,  562,    0,    0,  588,    0,    0,    0,    0,    0, 
-            0,  528,    0,    0,  584,    0,  584,    0,    0,    0, 
-            0,    0,    0,  588,    0,    0,    0,    0,    0,  573, 
-            0,    0,  562,    0,    0,  562,    0,    0,    0,  573, 
-            0,    0,    0,  584,    0,  528,    0,    0,    0,    0, 
-          562,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  584,    0,    0,    0,    0,    0,    0,    0, 
-          573,    0,    0,  573,    0,    0,  550,  528,    0,    0, 
-            0,    0,    0,    0,  562,    0,  550,    0,  573,    0, 
-            0,    0,    0,    0,    0,  585,  585,  585,    0,    0, 
-          585,  585,  585,    0,  585,    0,    0,    0,    0,    0, 
-            0,    0,  585,    0,  585,    0,  562,  550,    0,    0, 
-          565,    0,  573,    0,  585,  585,    0,  585,  585,  585, 
-          585,  585,    0,    0,    0,  550,    0,    0,    0,  572, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  572, 
-            0,    0,    0,    0,  573,  585,    0,  585,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  550, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          572,    0,    0,  572,  585,    0,  565,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  565,    0,  572,    0, 
-            0,  550,    0,  585,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  528,  528,  528,    0,    0,  528, 
-          528,  528,    0,  528,    0,  553,    0,  565,    0,    0, 
-          565,  528,  572,  528,    0,  553,    0,    0,    0,    0, 
-            0,    0,    0,  528,  528,  565,  528,  528,  528,  528, 
-          528,    0,    0,  562,  562,  562,    0,    0,  562,  562, 
-          562,    0,  562,    0,  572,    0,  553,    0,    0,    0, 
-          562,    0,  562,    0,  528,    0,  528,    0,    0,  565, 
-            0,    0,  562,  562,  553,  562,  562,  562,  562,  562, 
-            0,  573,  573,  573,    0,    0,  573,  573,  573,    0, 
-          573,    0,    0,  528,    0,    0,    0,    0,  573,    0, 
-          573,  565,    0,  562,    0,  562,    0,    0,  553,  559, 
-          573,  573,  528,  573,  573,  573,  573,  573,    0,  559, 
-            0,    0,    0,    0,    0,    0,    0,    0,  550,  550, 
-          550,    0,    0,  550,  550,  550,    0,  550,    0,    0, 
-          553,  573,    0,  573,    0,  550,    0,  550,    0,    0, 
-          559,  562,    0,    0,    0,    0,    0,  550,  550,    0, 
-          550,  550,  550,  550,  550,    0,    0,    0,  559,    0, 
-            0,    0,  554,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  554,    0,    0,    0,    0,    0,  550,  573, 
-          550,  572,  572,  572,    0,    0,  572,  572,  572,    0, 
-          572,    0,  559,    0,    0,    0,    0,    0,  572,    0, 
-          572,    0,    0,  554,    0,    0,    0,    0,    0,    0, 
-          572,  572,   79,  572,  572,  572,  572,  572,    0,    0, 
-            0,  554,   79,    0,  559,    0,  550,    0,  565,  565, 
-          565,    0,    0,  565,  565,  565,    0,  565,    0,    0, 
-            0,  572,    0,  572,    0,  565,    0,  565,    0,    0, 
-            0,    0,    0,   79,    0,  554,    0,  565,  565,    0, 
-          565,  565,  565,  565,  565,    0,    0,  553,  553,  553, 
-            0,   79,  553,  553,  553,   81,  553,    0,    0,    0, 
-            0,    0,    0,    0,  553,   81,  553,  554,  565,  572, 
-          565,    0,    0,    0,    0,    0,  553,  553,    0,  553, 
-          553,  553,  553,  553,    0,    0,    0,    0,    0,    0, 
-            0,    0,   82,    0,    0,    0,   81,    0,    0,    0, 
-            0,    0,   82,    0,    0,    0,    0,  553,    0,  553, 
-            0,    0,    0,    0,   81,    0,  565,   79,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   82,    0,    0,    0,    0,    0,    0, 
-            0,  559,  559,  559,    0,    0,  559,  559,  559,    0, 
-          559,   82,    0,    0,    0,  553,    0,    0,  559,    0, 
-          559,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          559,  559,    0,  559,  559,  559,  559,  559,    0,    0, 
-           81,    0,    0,    0,  520,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  520,    0,    0,    0,    0,    0, 
-            0,  559,    0,  559,  554,  554,  554,    0,    0,  554, 
-          554,  554,    0,  554,    0,    0,    0,   82,    0,    0, 
-            0,  554,    0,  554,    0,  520,    0,    0,    0,    0, 
-            0,    0,    0,  554,  554,    0,  554,  554,  554,  554, 
-          554,    0,    0,  520,    0,    0,    0,    0,    0,  559, 
-            0,    0,    0,    0,   79,   79,   79,    0,    0,   79, 
-           79,   79,    0,   79,  554,    0,  554,    0,    0,  521, 
-            0,   79,    0,   79,    0,    0,    0,    0,    0,  521, 
-            0,    0,    0,   79,   79,    0,   79,   79,   79,   79, 
-           79,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  520, 
-          521,    0,  554,    0,   79,    0,   79,   81,   81,   81, 
-            0,    0,   81,   81,   81,    0,   81,    0,  521,    0, 
-            0,    0,    0,  558,   81,    0,   81,    0,    0,    0, 
-            0,    0,    0,  558,    0,    0,   81,   81,    0,   81, 
-           81,   81,   81,   81,   82,   82,   82,    0,    0,   82, 
-           82,   82,   79,   82,    0,    0,    0,    0,    0,    0, 
-            0,   82,    0,   82,  558,    0,    0,   81,    0,   81, 
-            0,    0,    0,   82,   82,  559,   82,   82,   82,   82, 
-           82,    0,  558,    0,  521,  559,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,   82,    0,   82,    0,    0,    0, 
-            0,    0,    0,    0,    0,   81,  559,   69,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   69,    0,    0, 
-            0,    0,    0,    0,  559,    0,  520,  520,  520,    0, 
-            0,  520,  520,  520,    0,  520,    0,    0,  558,    0, 
-            0,    0,   82,  520,    0,  520,    0,    0,   69,    0, 
-            0,    0,    0,    0,    0,  520,  520,    0,  520,  520, 
-          520,  520,  520,    0,    0,    0,   69,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  520,    0,  520,    0, 
-          559,    0,  333,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  333,    0,    0,    0,    0,    0,    0,    0, 
-            0,  521,  521,  521,    0,    0,  521,  521,  521,    0, 
-          521,    0,    0,    0,    0,    0,    0,    0,  521,   30, 
-          521,    0,   69,  333,  520,    0,  326,    0,    0,   30, 
-          521,  521,   55,  521,  521,  521,  521,  521,    0,    0, 
-            0,  333,   55,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-           30,  521,    0,  521,    0,  558,  558,  558,    0,    0, 
-          558,  558,  558,   55,  558,    0,    0,    0,   30,    0, 
-            0,    0,  558,    0,  558,    0,    0,    0,    0,    0, 
-            0,   55,    0,    0,  558,  558,    0,  558,  558,  558, 
-          558,  558,    0,    0,   51,    0,    0,  333,    0,  521, 
-            0,    0,    0,    0,   51,    0,    0,  559,  559,  559, 
-            0,    0,  559,  559,  559,  558,  559,  558,    0,    0, 
-            0,    0,    0,    0,  559,    0,  559,    0,    0,    0, 
-            0,    0,    0,    0,   30,   51,  559,  559,    0,  559, 
-          559,  559,  559,  559,    0,    0,    0,   55,    0,   69, 
-           69,   69,    0,   51,   69,   69,   69,    0,   69,    0, 
-            0,    0,   52,  558,    0,    0,    0,  559,   69,  559, 
-            0,    0,   52,    0,    0,    0,    0,    0,   69,   69, 
-            0,   69,   69,   69,   69,   69,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   52,   57,    0,    0,    0,    0,   69, 
-            0,   69,    0,    0,   57,  559,    0,    0,    0,   51, 
-            0,   52,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  333,  333,  333,    0,    0,    0, 
-          333,  333,    0,  333,    0,   57,    0,    0,    0,    0, 
-            0,  333,    0,    0,    0,    0,    0,   69,    0,    0, 
-            0,    0,    0,   57,    0,    0,  333,  333,  333,  333, 
-          333,   30,   30,   30,    0,    0,    0,   30,   30,    0, 
-           30,    0,   41,    0,   55,   55,   55,   52,   30,    0, 
-           55,   55,   41,   55,  333,    0,  333,    0,    0,    0, 
-            0,   55,   56,   30,   30,   30,   30,   30,    0,    0, 
-            0,    0,   56,    0,    0,    0,   55,   55,   55,   55, 
-           55,    0,    0,   41,    0,    0,    0,    0,    0,   57, 
-            0,   30,    0,   30,    0,    0,    0,    0,    0,    0, 
-            0,   41,  333,   56,   55,    0,   55,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,   51,   51,   51,    0, 
-            0,   56,   51,   51,    0,   51,    0,    0,    0,    0, 
-            0,    0,    0,   51,    0,    0,    0,    0,    0,   30, 
-            0,    0,    0,    0,    0,    0,    0,    0,   51,   51, 
-           51,   51,   55,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   41,    0,    0, 
-            0,    0,    0,    0,    0,    0,   51,    0,   51,    0, 
-            0,    0,    0,    0,   52,   52,   52,   56,    0,    0, 
-           52,   52,    0,   52,    0,    0,    0,    0,    0,    0, 
-            0,   52,    0,    0,    0,    0,  155,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,   52,   52,   52,   52, 
-            0,    0,    0,    0,   51,    0,   57,   57,   57,  155, 
-            0,    0,   57,   57,    0,   57,  793,    0,    0,    0, 
-            0,    0,  681,   57,   52,    0,   52,    0,    0,    0, 
-            0,    0,    0,    0,    0,  155,  155,    0,   57,   57, 
-           57,   57,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,   57,  681,   57,    0, 
-            0,    0,   52,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,   41,   41,   41,    0,    0,    0, 
-           41,   41,    0,   41,    0,    0,    0,    0,    0,  793, 
-            0,   41,  155,    0,   56,   56,   56,    0,    0,    0, 
-           56,   56,  156,   56,   57,    0,   41,   41,   41,   41, 
-            0,   56,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  156,   56,   56,   56,   56, 
-            0,    0,  794,    0,   41,    0,   41,    0,  684,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  156,  156,    0,   56,    0,   56,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,   41,  684,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,   56,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  794,    0,    0,  156,    0, 
-            0,    0,  155,  155,  155,  155,  155,  155,  155,  155, 
-          155,  155,  155,    0,    0,  155,  155,    0,  155,  155, 
-          155,  155,  155,  155,  155,    0,  793,    0,    0,    0, 
-          155,  155,  155,  155,  155,  155,  155,    0,    0,  155, 
-            0,    0,    0,    0,    0,  155,  155,  155,  155,  155, 
-          155,  155,  155,  155,  155,  155,  155,  155,    0,  155, 
-          155,  155,  155,  155,  155,  155,    0,    0,  155,  155, 
-            0,    0,  155,  155,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  155,  155,    0, 
-            0,    0,    0,  681,  681,  155,    0,    0,  155,  155, 
-          155,  155,    0,  155,    0,    0,  155,  155,  155,  155, 
-          155,  155,  155,    0,  155,  155,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  156,  156, 
-          156,  156,  156,  156,  156,  156,  156,  156,  156,    0, 
-            0,  156,  156,    0,  156,  156,  156,  156,  156,  156, 
-          156,    0,  794,    0,    0,    0,  156,  156,  156,  156, 
-          156,  156,  156,    0,    0,  156,    0,    0,    0,    0, 
-            0,  156,  156,  156,  156,  156,  156,  156,  156,  156, 
-          156,  156,  156,  156,    0,  156,  156,  156,  156,  156, 
-          156,  156,    0,    0,  156,  156,    0,    0,  156,  156, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  156,  156,    0,  155,    0,    0,  684, 
-          684,  156,    0,    0,  156,  156,  156,  156,    0,  156, 
-            0,    0,  156,  156,  156,  156,  156,  156,  156,  155, 
-          156,  156,    0,    0,    0,    0,  793,    0,    0,    0, 
-            0,    0,  798,    0,    0,    0, 1103, 1103,    0,    0, 
-            0,    0,    0,    0,    0,  155,  155,    0,    0,    0, 
+          694,  694,  694,    0,    0,    0,  694,  694,    0,  694, 
+            0,  687,    0,    0,  687,    0,    0,  694,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  694, 
+          694,    0,  694,  694,  694,  694,  694,    0,    0,    0, 
+            0,    0,    0,    0,  687,  687,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          694,    0,  694,    0,    0,    0,  694,  694,  694,  694, 
+          694,  694,  694,  694,  694,  694,  694,  694,  694,    0, 
+            0,    0,    0,  694,  694,  694,  694,    0,  706,  694, 
+          696,  696,  696,    0,    0,    0,  696,  696,    0,  696, 
+            0,    0,    0,    0,    0,    0,    0,  696,  694,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  696, 
+          696,    0,  696,  696,  696,  696,  696,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  798,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          696,    0,  696,    0,    0,    0,  696,  696,  696,  696, 
+          696,  696,  696,  696,  696,  696,  696,  696,  696,    0, 
+            0,    0,    0,  696,  696,  696,  696,    0,  708,  696, 
+            0,    0,  687,  687,  687,    0,    0,    0,  687,  687, 
+            0,  687,    0,    0,    0,    0,    0,    0,  696,  687, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  687,  687,    0,  687,  687,  687,  687,  687,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  686,    0,    0,    0,    0, 
+            0,    0,  687,    0,  687,  686,    0,    0,  687,  687, 
+          687,  687,  687,  687,  687,  687,  687,  687,  687,  687, 
+          687,    0,    0,    0,    0,  687,  687,  687,  687,    0, 
+          699,  687,  686,  686,    0,    0,  686,  686,  686,  120, 
+          686,  686,  686,    0,    0,    0,    0,    0,    0,    0, 
+          687,    0,    0,    0,  686,  686,  139,  686,  686,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  689,  686,    0,    0,  686, 
+            0,    0,    0,    0,    0,  689,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  686, 
+          686,    0,  689,  689,    0,    0,  689,  689,  689,  123, 
+          689,  689,  689,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  689,  689,  142,  689,  689,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  689,  350,    0,  689, 
+            0,    0,    0,    0,    0,    0,    0,  350,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  689, 
+          689,    0,    0,    0,  350,  350,    0,    0,  350,  350, 
+          350,  137,  350,  350,  350,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  350,  350,  156,  350, 
+          350,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  686,  686,  686, 
+            0,    0,    0,  686,  686,    0,  686,    0,  350,    0, 
+            0,  350,    0,    0,  686,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  686,  686,    0,  686, 
+          686,  686,  686,  686,    0,    0,    0,    0,    0,    0, 
+            0,  350,  350,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  686,    0,  686, 
+            0,    0,    0,  686,  686,  686,  686,  686,  686,  686, 
+          686,  686,  686,  686,  686,  686,    0,    0,    0,    0, 
+          686,  686,  686,  686,    0,  698,  686,  689,  689,  689, 
+            0,    0,    0,  689,  689,    0,  689,    0,    0,    0, 
+            0,    0,    0,    0,  689,  686,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  689,  689,    0,  689, 
+          689,  689,  689,  689,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  689,    0,  689, 
+            0,    0,    0,  689,  689,  689,  689,  689,  689,  689, 
+          689,  689,  689,  689,  689,  689,    0,    0,    0,    0, 
+          689,  689,  689,  689,    0,  701,  689,    0,    0,  350, 
+          350,  350,    0,    0,    0,  350,  350,    0,  350,    0, 
+            0,    0,    0,    0,    0,  689,  350,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  350,  350, 
+            0,  350,  350,  350,  350,  350,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  358,    0,    0,    0,    0,    0,    0,  350, 
+            0,  350,  358,    0,    0,  350,  350,  350,  350,  350, 
+          350,  350,  350,  350,  350,  350,  350,  350,    0,    0, 
+            0,    0,  350,  350,  350,  350,    0,    0,  350,  358, 
+          358,    0,    0,  358,  358,  358,  136,  358,  358,  358, 
+            0,    0,    0,    0,    0,    0,    0,  350,    0,    0, 
+            0,  358,  358,  155,  358,  358,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  350,  358,    0,    0,  358,    0,    0,    0, 
+            0,    0,  350,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  358,  358,    0,  350, 
+          350,    0,    0,  350,  350,  350,  350,  350,  350,  350, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  350,  350,  156,  350,  350,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  350,  358,    0,  350,    0,    0,    0, 
+            0,    0,    0,    0,  358,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  350,  350,    0,    0, 
+            0,  358,  358,    0,    0,  358,  358,  358,  358,  358, 
+          358,  358,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  358,  358,  155,  358,  358,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  358,  358,  358,    0,    0,    0, 
+          358,  358,    0,  358,    0,  358,    0,    0,  358,    0, 
+            0,  358,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  358,  358,    0,  358,  358,  358,  358, 
+          358,    0,    0,    0,    0,    0,    0,    0,  358,  358, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  358,    0,  358,    0,    0,    0, 
+          358,  358,  358,  358,  358,  358,  358,  358,  358,  358, 
+          358,  358,  358,    0,    0,    0,    0,  358,  358,  358, 
+          358,    0,  793,  358,  350,  350,  350,    0,    0,    0, 
+          350,  350,  793,  350,    0,    0,    0,    0,    0,    0, 
+            0,  350,  358,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  350,  350,    0,  350,  350,  350,  350, 
+          350,    0,    0,  793,    0,    0,  793,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  793,    0,    0,  350,    0,  350,    0,    0,    0, 
+          350,  350,  350,  350,  350,  350,  350,  350,  350,  350, 
+          350,  350,  350,    0,    0,    0,    0,  350,  350,  350, 
+          350,    0,    0,  350,    0,  793,  358,  358,  358,    0, 
+          335,    0,  358,  358,    0,  358,    0,    0,    0,    0, 
+          335,    0,  350,  358,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  358,  358,  793,  358,  358, 
+          358,  358,  358,    0,    0,    0,    0,    0,    0,    0, 
+            0,  335,    0,    0,  335,    0,    0,  796,    0,    0, 
+            0,    0,    0,    0,    0,    0,  358,  796,  358,  335, 
+            0,    0,  358,  358,  358,  358,  358,  358,  358,  358, 
+          358,  358,  358,  358,  358,    0,    0,    0,    0,  358, 
+          358,  358,  358,    0,    0,  358,  330,    0,  796,    0, 
+            0,  796,    0,  335,    0,    0,  330,    0,    0,    0, 
+            0,    0,    0,    0,  358,    0,  796,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  335,    0,  330,    0,    0, 
+          330,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          796,    0,    0,    0,    0,  330,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  793,  793,  793,    0,  332,  793, 
+          793,  793,  796,  793,    0,    0,    0,    0,  332,  330, 
+            0,  793,    0,  793,  793,    0,    0,    0,    0,    0, 
+            0,    0,    0,  793,  793,    0,  793,  793,  793,  793, 
+          793,    0,    0,    0,    0,    0,  592,    0,    0,  332, 
+            0,  330,  332,    0,    0,    0,  592,    0,    0,    0, 
+            0,    0,    0,    0,  793,    0,  793,  332,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  592,    0,    0, 
+          592,    0,    0,    0,    0,    0,    0,    0,  793,    0, 
+            0,  332,  335,  335,  335,  592,    0,  335,  335,  335, 
+            0,  335,  793,    0,    0,    0,    0,    0,    0,  335, 
+            0,  335,  335,    0,    0,    0,    0,    0,    0,    0, 
+            0,  335,  335,  332,  335,  335,  335,  335,  335,  592, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  796, 
+          796,  796,    0,    0,  796,  796,  796,    0,  796,    0, 
+            0,    0,  335,    0,  335,    0,  796,    0,  796,  796, 
+          592,  592,    0,    0,    0,    0,    0,    0,  796,  796, 
+            0,  796,  796,  796,  796,  796,    0,    0,  330,  330, 
+          330,    0,    0,  330,  330,  330,  335,  330,    0,    0, 
+            0,    0,    0,    0,    0,  330,    0,  330,  330,  796, 
+          335,  796,    0,    0,    0,    0,    0,  330,  330,    0, 
+          330,  330,  330,  330,  330,  588,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  588,    0,    0,    0,    0, 
+            0,    0,    0,  796,    0,    0,    0,    0,  330,    0, 
+          330,    0,    0,    0,    0,    0,    0,  796,    0,    0, 
+            0,    0,    0,    0,    0,    0,  588,    0,    0,  588, 
+          332,  332,  332,    0,    0,  332,  332,  332,    0,  332, 
+            0,    0,  330,    0,  588,    0,    0,  332,    0,  332, 
+          332,    0,    0,    0,    0,    0,  330,    0,    0,  332, 
+          332,    0,  332,  332,  332,  332,  332,    0,  592,  592, 
+          592,    0,    0,  592,  592,  592,    0,  592,  588,    0, 
+            0,  589,    0,    0,    0,  592,    0,  592,    0,    0, 
+          332,  589,  332,    0,    0,    0,    0,  592,  592,    0, 
+          592,  592,  592,  592,  592,    0,    0,    0,    0,  588, 
+          588,    0,    0,    0,    0,    0,    0,    0,    0,  532, 
+            0,    0,  589,    0,  332,  589,    0,    0,  592,  532, 
+          592,    0,    0,    0,    0,    0,    0,    0,  332,    0, 
+          589,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  592,    0,    0, 
+          532,    0,    0,  532,    0,    0, 1116, 1116,    0,    0, 
+            0,    0,    0,    0,  589,    0,  592,    0,  532,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  589,  589,    0,    0,    0, 
+            0,    0,  532,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  566,    0, 
+            0,    0,    0, 1116, 1116,    0,    0, 1116,  566,    0, 
+            0,    0,    0,    0,  532,    0,    0,  588,  588,  588, 
+            0,    0,  588,  588,  588,    0,  588,    0,    0,    0, 
+            0,    0,    0,    0,  588,    0,  588,    0,    0,  566, 
+            0, 1116,  566,    0,    0,    0,  588,  588,    0,  588, 
+          588,  588,  588,  588,    0,    0,    0,  566,    0,    0, 
+            0,    0, 1116,    0,    0,    0,    0,    0,  577,    0, 
+            0,    0,    0,    0,    0,    0,    0,  588,  577,  588, 
+         1116,    0,    0,    0, 1116,    0,    0,    0,    0,    0, 
+            0,  566,    0,    0,    0,    0,    0, 1116, 1116, 1116, 
+         1116,    0,    0,    0, 1116, 1116,  588, 1116,    0,  577, 
+            0,    0,  577,  589,  589,  589,    0,    0,  589,  589, 
+          589,    0,  589,  566,    0,  588,    0,  577,    0,    0, 
+          589,    0,  589,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  589,  589,    0,  589,  589,  589,  589,  589, 
+            0,  532,  532,  532,    0,  554,  532,  532,  532,    0, 
+          532,  577,    0,    0,    0,  554,    0,    0,  532,    0, 
+          532,    0,    0,  589,    0,  589,    0,    0,    0,    0, 
+          532,  532,    0,  532,  532,  532,  532,  532,    0,    0, 
+            0,    0,    0,  577,  576,    0,  554,    0,    0,  569, 
+            0,    0,  589,    0,  576,    0,    0,    0,    0,    0, 
+            0,  532,    0,  532,  554, 1116,    0,    0, 1116,    0, 
+            0,  589,    0,    0,    0,    0, 1116,    0,    0,    0, 
+            0,    0,  569,    0,    0,  576,    0,    0,  576,    0, 
+          532,    0,  569,    0,    0,    0,    0,    0,  554,    0, 
+            0,    0,    0,  576,    0,    0,    0,    0,    0,  532, 
+          566,  566,  566,    0,    0,  566,  566,  566,    0,  566, 
+            0,    0,    0,  569,  562,    0,  569,  566,    0,  566, 
+          554,    0,    0, 1116,  562,    0,    0,  576,    0,  566, 
+          566,  569,  566,  566,  566,  566,  566,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  581,  562,    0,    0,    0,  576, 
+          566,    0,  566,    0,  581,  569,    0,    0,    0,    0, 
+          577,  577,  577,  562,    0,  577,  577,  577,    0,  577, 
+            0,    0,    0,    0,    0,    0,    0,  577,    0,  577, 
+            0,    0,    0,    0,    0,  581,    0,  569,    0,  577, 
+          577,    0,  577,  577,  577,  577,  577,  562,  566,    0, 
+            0,    0,    0,  581,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0, 1103, 1103,    0,    0, 1103,    0,  798, 
-          156,    0,  155,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  156,    0,    0,    0,    0,    0,    0, 
-          794, 1103,    0,    0,    0,    0,  353,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  156, 
-          156,    0, 1103,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-         1103,    0,    0,    0, 1103,    0,    0,    0,    0,    0, 
-            0,  353,    0,    0,    0,    0,    0, 1103, 1103, 1103, 
-         1103,    0,    0,    0, 1103, 1103,    0, 1103,    0,    0, 
-            0,  403,  398,    0,    0,    0,  401,  399,    0,  400, 
-            0,  402,    0,    0,    0,    0,  156,    0,    0,    0, 
-            0,    0,    0,    0,  395,    0,  394,  393,    0,    0, 
-            0,    0,  155,  155,  155,  155,  155,  155,  155,  155, 
-          155,  155,  155,    0,    0,  155,  155,    0,  155,  155, 
-          155,  155,  155,  155,  155,    0,  798,    0,  397,    0, 
-          155,  155,  155,  155,  155,  155,  155,    0,    0,  155, 
-            0,    0,    0,    0,    0,  155,  155,  155,  155,  155, 
-          155,  155,  155,  155,  155,  155,  155,  155,  396,  155, 
-          155,  155,  155,  155,  155,  155,    0,    0,  155,  155, 
-            0,    0,  155,  155,    0, 1103,    0,    0, 1103,    0, 
-            0,    0,    0,    0,    0,    0, 1103,  155,  155,    0, 
-            0,    0,    0,  798,  798,  155,    0,    0,  155,  155, 
-          155,  155,    0,  155,    0,    0,  155,  155,  155,  155, 
-          155,  155,  155,    0,  155,  155,  156,  156,  156,  156, 
-          156,  156,  156,  156,  156,  156,  156,    0,    0,  156, 
-          156,    0,  156,  156,  156,  156,  156,  156,  156,    0, 
-            0,    0,    0, 1103,  156,  156,  156,  156,  156,  156, 
-          156,    0,    0,  156,    0,    0,    0,    0,    0,  156, 
-          156,  156,  156,  156,  156,  156,  156,  156,  156,  156, 
-          156,  156,    0,  156,  156,  156,  156,  156,  156,  156, 
-            0,    0,  156,  156,    0,    0,  156,  156,    0,    0, 
-            0,    0,    0,    0,    0,  156,    0,    0,    0,    0, 
-            0,  156,  156,    0,    0,    0,    0,  353,  353,  156, 
-            0,    0,  156,  156,  156,  156,    0,  156,  156,    0, 
-          156,  156,  156,  156,  156,  156,  156,    0,  156,  156, 
-            0,  354,  954,    0, 1104, 1104,    0,    0,    0,    0, 
-            0,    0,    0,    0,  156,  156, 1105, 1105,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  377,  378,  379,  380,  381,  382,  383,  384, 
-          385,  386,  387,  388,  389,    0,  354,    0,    0,  390, 
-          391,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0, 1104, 1104,    0,    0, 1104,    0,    0,    0,  414, 
-            0,  156,    0, 1105, 1105,    0,    0, 1105,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  414,    0,    0,    0,    0,    0,    0, 1104, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0, 1105,    0,    0,    0,    0,    0,    0,  414,    0, 
-         1104,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0, 1105,    0,    0,    0,    0,    0, 1104,    0, 
-            0,    0, 1104,    0,    0,    0,    0,    0,    0,    0, 
-         1105,    0,    0,    0, 1105, 1104, 1104, 1104, 1104,    0, 
-            0,    0, 1104, 1104,    0, 1104,    0, 1105, 1105, 1105, 
-         1105,    0,    0,    0, 1105, 1105,    0, 1105,    0,    0, 
-            0,    0,    0,    0,    0,  414,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  156,  156,  156,  156,  156,  156,  156,  156,  156, 
-          156,  156,    0,    0,  156,  156,    0,  156,  156,  156, 
-          156,  156,  156,  156,    0,    0,    0,    0,    0,  156, 
-          156,  156,  156,  156,  156,  156,    0,    0,  156,    0, 
-            0,    0,    0,    0,  156,  156,  156,  156,  156,  156, 
-          156,  156,  156,  156,  156,  156,  156,    0,  156,  156, 
-          156,  156,  156,  156,  156,    0,    0,  156,  156,    0, 
-            0,  156,  156, 1104,    0,    0, 1104,    0,    0,    0, 
-            0,    0,    0,    0, 1104, 1105,  156,  156, 1105,    0, 
-            0,    0,  354,  354,  156,    0, 1105,  156,  156,  156, 
-          156,    0,  156,    0,    0,  156,  156,  156,  156,  156, 
-          156,  156,    0,  156,  156,  414,  414,  414,  414,  414, 
-          414,  414,  414,  414,  414,  414,    0,  414,  414,  414, 
-          414,  414,  414,  414,  414,  414,  414,  414,  414,    0, 
-            0, 1104,    0,  414,  414,  414,  414,  414,  414,  414, 
-            0,    0,  414, 1105,    0,    0,  713,    0,  414,  414, 
-          414,  414,  414,  414,  414,  414,  414,  414,  414,  414, 
-          414,    0,  414,  414,  414,  414,  414,  414,  414,  713, 
-            0,  414,  414,    0,    0,  414,  414,    0,    0,    0, 
-            0,    0, 1106, 1106,    0,    0,    0,    0,    0,    0, 
-          414,  414,    0,    0,    0,  713,    0,  710,  414,    0, 
-            0,  414,  414,  414,  414,    0,  414,    0,    0,  414, 
-          414,  414,  414,  414,  414,  414,    0,  414,  414,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0, 1106, 
-         1106,    0,    0, 1106,    0,    0,    0,    0,    0,    0, 
-          709,    0,  713,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  709,    0,    0,    0, 1106,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0, 1106,  709, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0, 1106,    0,    0,    0, 
-         1106,    0,    0,    0,  252,    0,    0,    0,    0,    0, 
-            0,    0,    0, 1106, 1106, 1106, 1106,    0,    0,    0, 
-         1106, 1106,    0, 1106,    0,    0,    0,    0,    0,    0, 
-            0,  403,  398,    0,    0,    0,  401,  399,    0,  400, 
-            0,  402,    0,    0,    0,    0,  709,    0,    0,    0, 
-            0,    0,    0,    0,  395,    0,  394,  393,    0,    0, 
-            0,    0,  713,  713,  713,  713,  713,  713,  713,  713, 
-          713,  713,  713,    0, 
+          577,    0,  577,    0,    0,    0,    0,    0,    0,  562, 
+            0,    0,    0,    0,    0,    0,    0,  581,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  554,  554,  554, 
+            0,    0,  554,  554,  554,    0,  554,    0,    0,    0, 
+            0,    0,    0,    0,  554,    0,  554,    0,  577,  581, 
+            0,    0,    0,    0,    0,    0,  554,  554,    0,  554, 
+          554,  554,  554,  554,    0,    0,  576,  576,  576,    0, 
+            0,  576,  576,  576,    0,  576,    0,    0,    0,    0, 
+            0,    0,    0,  576,  555,  576,    0,  554,    0,  554, 
+            0,    0,    0,    0,  555,  576,  576,    0,  576,  576, 
+          576,  576,  576,    0,  569,  569,  569,    0,    0,  569, 
+          569,  569,    0,  569,    0,    0,    0,    0,    0,    0, 
+            0,  569,    0,  569,    0,  555,  576,    0,  576,    0, 
+            0,  572,    0,  569,  569,  554,  569,  569,  569,  569, 
+          569,  572,    0,  555,    0,    0,  562,  562,  562,    0, 
+            0,  562,  562,  562,    0,  562,    0,    0,    0,    0, 
+            0,    0,    0,  562,  569,  562,  569,    0,    0,    0, 
+            0,    0,  572,    0,  576,  562,  562,  555,  562,  562, 
+          562,  562,  562,    0,    0,    0,  581,  581,  581,    0, 
+          572,  581,  581,  581,  556,  581,    0,    0,    0,    0, 
+            0,    0,    0,  581,  556,  581,  562,    0,  562,  555, 
+            0,    0,  569,    0,    0,  581,  581,    0,  581,  581, 
+          581,  581,  581,    0,  572,    0,    0,    0,    0,    0, 
+            0,  557,    0,    0,    0,  556,    0,    0,    0,    0, 
+            0,  557,    0,    0,    0,    0,  581,    0,  581,    0, 
+            0,    0,    0,  556,  562,    0,  572,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  563,  557,    0,    0,    0,    0,    0,    0,    0, 
+            0,  563,    0,    0,    0,    0,    0,  556,    0,    0, 
+          557,    0,    0,    0,  581,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  558,    0, 
+            0,    0,  563,    0,    0,    0,    0,    0,  558,  556, 
+            0,    0,    0,    0,  557,    0,    0,    0,    0,    0, 
+          563,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  555,  555,  555,  558, 
+            0,  555,  555,  555,    0,  555,  557,    0,    0,    0, 
+            0,    0,    0,  555,  563,  555,    0,  558,    0,    0, 
+            0,    0,    0,    0,    0,  555,  555,    0,  555,  555, 
+          555,  555,  555,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  572,  572,  572,  563,    0,  572,  572, 
+          572,  558,  572,    0,    0,   80,  555,    0,  555,    0, 
+          572,    0,  572,    0,    0,   80,    0,    0,    0,    0, 
+            0,    0,  572,  572,    0,  572,  572,  572,  572,  572, 
+            0,    0,    0,  558,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   80,    0,    0,    0, 
+            0,    0,    0,  572,  555,  572,  556,  556,  556,    0, 
+            0,  556,  556,  556,   80,  556,    0,    0,    0,    0, 
+            0,    0,   83,  556,    0,  556,    0,    0,    0,    0, 
+            0,    0,   83,    0,    0,  556,  556,    0,  556,  556, 
+          556,  556,  556,  557,  557,  557,    0,    0,  557,  557, 
+          557,  572,  557,    0,    0,    0,    0,    0,    0,    0, 
+          557,    0,  557,   83,    0,    0,  556,    0,  556,    0, 
+            0,    0,  557,  557,    0,  557,  557,  557,  557,  557, 
+           80,   83,    0,  563,  563,  563,    0,   84,  563,  563, 
+          563,    0,  563,    0,    0,    0,    0,   84,    0,    0, 
+          563,    0,  563,  557,    0,  557,    0,    0,    0,    0, 
+            0,    0,  563,  563,  556,  563,  563,  563,  563,  563, 
+          558,  558,  558,    0,    0,  558,  558,  558,   84,  558, 
+            0,  524,    0,    0,    0,    0,    0,  558,    0,  558, 
+            0,  524,    0,  563,    0,  563,   84,   83,    0,  558, 
+          558,  557,  558,  558,  558,  558,  558,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  524,  525,    0,    0,    0,    0,    0,    0, 
+          558,    0,  558,  525,    0,    0,    0,    0,    0,    0, 
+          524,  563,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,   84,    0,  525,    0,    0,   80,   80,   80, 
+            0,    0,   80,   80,   80,    0,   80,    0,  558,    0, 
+            0,    0,  525,    0,   80,    0,   80,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   80,   80,    0,   80, 
+           80,   80,   80,   80,    0,    0,  524,    0,    0,    0, 
+            0,    0,    0,  562,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  562,    0,    0,    0,   80,    0,   80, 
+            0,    0,    0,    0,   83,   83,   83,    0,    0,   83, 
+           83,   83,    0,   83,    0,    0,    0,    0,  525,    0, 
+            0,   83,    0,   83,  562,    0,    0,    0,    0,    0, 
+            0,    0,    0,   83,   83,    0,   83,   83,   83,   83, 
+           83,    0,  562,    0,    0,   80,    0,    0,    0,    0, 
+            0,  563,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  563,    0,    0,   83,    0,   83,    0,    0,   84, 
+           84,   84,    0,    0,   84,   84,   84,    0,   84,    0, 
+            0,    0,    0,    0,    0,    0,   84,    0,   84,    0, 
+            0,    0,  563,    0,    0,    0,    0,    0,   84,   84, 
+            0,   84,   84,   84,   84,   84,    0,    0,  562,    0, 
+          563,    0,   83,  524,  524,  524,    0,    0,  524,  524, 
+          524,    0,  524,    0,    0,    0,    0,    0,    0,   84, 
+          524,   84,  524,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  524,  524,    0,  524,  524,  524,  524,  524, 
+            0,    0,    0,    0,    0,  525,  525,  525,    0,    0, 
+          525,  525,  525,    0,  525,    0,    0,    0,  338,    0, 
+            0,    0,  525,  524,  525,  524,  563,   84,  338,    0, 
+            0,    0,    0,    0,  525,  525,    0,  525,  525,  525, 
+          525,  525,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  338, 
+            0,    0,  332,    0,    0,  525,    0,  525,    0,    0, 
+            0,  524,    0,    0,    0,    0,    0,  338, 1117, 1117, 
+            0,    0,  339,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  339,    0,    0,  562,  562,  562,    0,    0, 
+          562,  562,  562,    0,  562,    0,    0,    0,    0,    0, 
+            0,    0,  562,  525,  562,    0,    0,    0,    0,    0, 
+            0,    0,    0,  339,  562,  562,  334,  562,  562,  562, 
+          562,  562,   58,    0,    0,    0,    0,    0,    0,    0, 
+            0,  339,   58,  338,    0, 1117, 1117,    0,    0, 1117, 
+            0,    0,    0,    0,    0,  562,    0,  562,    0,    0, 
+            0,    0,    0,  563,  563,  563,    0,    0,  563,  563, 
+          563,    0,  563,   58,   41,    0,    0,    0,    0,    0, 
+          563,    0,  563, 1117,   41,    0,    0,    0,    0,    0, 
+            0,   58,  563,  563,    0,  563,  563,  563,  563,  563, 
+            0,    0,    0,  562, 1117,    0,    0,  339,    0,    0, 
+            0,    0,    0,    0,    0,   41,    0,    0,    0,    0, 
+            0,    0, 1117,  563,    0,  563, 1117,    0,    0,    0, 
+            0,    0,    0,   41,    0,    0,    0,    0,    0, 1117, 
+         1117, 1117, 1117,    0,    0,    0, 1117, 1117,    0, 1117, 
+            0,    0,    0,    0,    0,    0,    0,   58,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  563,    0,  157,    0,    0,    0,    0,    0,    0, 
+          338,  338,  338,    0,    0,  338,  338,  338,    0,  338, 
+            0,    0,    0,    0,    0,    0,  157,  338,    0,   41, 
+            0,    0,    0,  797,    0,    0,    0,    0,    0,  685, 
+            0,    0,  338,  338,  338,  338,  338,    0,    0,    0, 
+            0,    0,  157,  157,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          338,    0,  338,    0,  339,  339,  339,    0,    0,  339, 
+          339,  339,    0,  339,  685,    0,    0, 1117,    0,    0, 
+         1117,  339,    0,    0,    0,    0,    0,    0, 1117,  338, 
+            0,    0,    0,    0,    0,    0,  339,  339,  339,  339, 
+          339,    0,    0,    0,    0,    0,  797,    0,  338,  157, 
+            0,    0,    0,    0,   58,   58,   58,    0,    0,    0, 
+           58,   58,    0,   58,  339,    0,  339,    0,    0,    0, 
+            0,   58,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  252,    0,    0, 1117,   58,   58,   58,   58, 
+            0,    0,    0,  339,    0,    0,   41,   41,   41,    0, 
+            0,    0,   41,   41,    0,   41,    0,    0,    0,    0, 
+            0,    0,  339,   41,   58,    0,   58,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   41,   41, 
+           41,   41,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   41,    0,   41,    0, 
+            0,    0,   58,    0,    0,    0, 1112,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  157, 
+          157,  157,  157,  157,  157,  157,  157,  157,  157,  157, 
+            0,    0,  157,  157,    0,  157,  157,  157,  157,  157, 
+          157,  157,    0,  797,   41,    0,    0,  157,  157,  157, 
+          157,  157,  157,  157,    0,    0,  157,    0,    0,    0, 
+            0,    0,  157,  157,  157,  157,  157,  157,  157,  157, 
+          157,  157,  157,  157,  157,    0,  157,  157,  157,  157, 
+          157,  157,  157,    0,    0,  157,  157,    0,    0,  157, 
+          157,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  157,  157,    0,  158,    0,    0, 
+          685,  685,  157,    0,    0,  157,  157,  157,  157,    0, 
+          157,    0,    0,  157,  157,  157,  157,  157,  157,  157, 
+          158,  157,  157,    0,    0,    0,    0,  798,    0,    0, 
+            0,    0,    0,  688,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  158,  158,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  688,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0, 1094, 
+         1095, 1096, 1097,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0, 1098, 1099, 1100, 1101,    0, 
+          798,  157, 1102,  158,    0,   40,   41,   42,   43,   44, 
+            0,    0,    0,    0,    0,  308,    0,    0,    0,    0, 
+            0,    0,    0,    0,  157,    0,    0,    0,    0,    0, 
+            0,  797,    0, 1104, 1105,    0,    0,  802,    0,    0, 
+            0, 1106,    0,    0, 1107,    0, 1108, 1109,    0, 1110, 
+          157,  157,   58,   59,   60,   61,   62,   63,   64,    0, 
+           65,   66,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  252,    0,    0,    0,    0, 
+            0,    0,  802,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  405,  400,    0,    0,    0,  403,  401,    0, 
+          402,    0,  404,    0,  802,    0,    0,  157,    0,    0, 
+            0,    0,    0,    0,    0,  397,    0,  396,  395,    0, 
+            0,    0,    0,  158,  158,  158,  158,  158,  158,  158, 
+          158,  158,  158,  158,    0,    0,  158,  158,    0,  158, 
+          158,  158,  158,  158,  158,  158,    0,  798,    0,  399, 
+            0,  158,  158,  158,  158,  158,  158,  158,    0,    0, 
+          158,    0,    0,    0,    0,    0,  158,  158,  158,  158, 
+          158,  158,  158,  158,  158,  158,  158,  158,  158,  398, 
+          158,  158,  158,  158,  158,  158,  158,    0,    0,  158, 
+          158,    0,    0,  158,  158,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  158,  158, 
+            0,    0,    0,    0,  688,  688,  158,    0,    0,  158, 
+          158,  158,  158,    0,  158,    0,    0,  158,  158,  158, 
+          158,  158,  158,  158,    0,  158,  158,  157,  157,  157, 
+          157,  157,  157,  157,  157,  157,  157,  157,    0,    0, 
+          157,  157,    0,  157,  157,  157,  157,  157,  157,  157, 
+            0,  802,    0,    0,    0,  157,  157,  157,  157,  157, 
+          157,  157,    0,    0,  157,    0,    0,    0,    0,    0, 
+          157,  157,  157,  157,  157,  157,  157,  157,  157,  157, 
+          157,  157,  157,    0,  157,  157,  157,  157,  157,  157, 
+          157,    0,    0,  157,  157,    0,    0,  157,  157,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  157,  157,    0,  158,    0,    0,  802,  802, 
+          157,    0,    0,  157,  157,  157,  157,    0,  157,    0, 
+            0,  157,  157,  157,  157,  157,  157,  157,  158,  157, 
+          157,    0,    0,    0,    0,  798,    0,    0,    0,    0, 
+            0,  357,    0,    0, 1118, 1118,    0,    0,    0,    0, 
+            0,    0,    0,    0,  158,  158,    0,    0,    0,    0, 
+            0,    0,    0,  379,  380,  381,  382,  383,  384,  385, 
+          386,  387,  388,  389,  390,  391,    0,    0,    0,    0, 
+          392,  393,    0,    0,    0,    0,  357,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0, 1118, 1118,    0,    0, 1118,    0,    0,    0,  158, 
+            0,  158,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  158,    0,    0,    0,    0,    0,    0, 1118, 
+            0,    0,    0,    0,    0,  358,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  158,  158, 
+         1118,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0, 1118,    0, 
+            0,    0, 1118,    0,    0,    0,    0,    0,    0,    0, 
+          358,    0,    0,    0,    0, 1118, 1118, 1118, 1118,    0, 
+            0,    0, 1118, 1118,    0, 1118,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  158,    0,    0,    0,    0, 
+          813,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  158,  158,  158,  158,  158,  158,  158,  158,  158, 
+          158,  158,    0,    0,  158,  158,    0,  158,  158,  158, 
+          158,  158,  158,  158,    0,    0,    0,    0,    0,  158, 
+          158,  158,  158,  158,  158,  158,    0,    0,  158,    0, 
+            0,    0,    0,  515,  158,  158,  158,  158,  158,  158, 
+          158,  158,  158,  158,  158,  158,  158,    0,  158,  158, 
+          158,  158,  158,  158,  158,    0,    0,  158,  158,    0, 
+            0,  158,  158, 1118,    0,    0, 1118,    0,  418,    0, 
+            0,    0,    0,    0, 1118,    0,  158,  158,    0,    0, 
+            0,    0,  357,  357,  158,    0,    0,  158,  158,  158, 
+          158,  418,  158,    0,    0,  158,  158,  158,  158,  158, 
+          158,  158,    0,  158,  158,  158,  158,  158,  158,  158, 
+          158,  158,  158,  158,  158,  158,    0,  418,  158,  158, 
+            0,  158,  158,  158,  158,  158,  158,  158,    0,    0, 
+            0, 1118,    0,  158,  158,  158,  158,  158,  158,  158, 
+            0,    0,  158,    0,    0,    0,    0,    0,  158,  158, 
+          158,  158,  158,  158,  158,  158,  158,  158,  158,  158, 
+          158,    0,  158,  158,  158,  158,  158,  158,  158,    0, 
+            0,  158,  158,    0,    0,  158,  158,    0,    0,    0, 
+            0,    0,  717,    0,  418,    0,    0,    0,    0,    0, 
+          158,  158,    0,    0,    0,    0,  358,  358,  158,    0, 
+            0,  158,  158,  158,  158,  717,  158,    0,    0,  158, 
+          158,  158,  158,  158,  158,  158,    0,  158,  158,    0, 
+            0,    0,    0,    0,    0,    0,  515,  515,  515,  515, 
+            0,  717,    0,  714,    0,    0,    0,    0,    0,    0, 
+            0,    0,  515,  515,  515,  515,    0,    0,    0,  515, 
+            0,  515,  515,  515,  515,  515,  515,    0,    0,    0, 
+            0,    0,  515,    0,    0,    0,    0,  515,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          515,  515,    0,    0,    0,    0,    0,    0,  515,    0, 
+            0,  515,    0,  515,  515,    0,  515,  515,  717,  515, 
+          515,  515,  515,  515,  515,  515,    0,  515,  515,    0, 
+            0,    0,    0,    0,  418,  418,  418,  418,  418,  418, 
+          418,  418,  418,  418,  418,    0,  418,  418,  418,  418, 
+          418,  418,  418,  418,  418,  418,  418,  418,    0,    0, 
+            0,    0,  418,  418,  418,  418,  418,  418,  418,    0, 
+            0,  418,    0,    0,    0,    0,    0,  418,  418,  418, 
+          418,  418,  418,  418,  418,  418,  418,  418,  418,  418, 
+            0,  418,  418,  418,  418,  418,  418,  418,    0,    0, 
+          418,  418,    0,    0,  418,  418,    0,    0,    0,    0, 
+            0,  713,    0,    0,    0,    0,    0,    0,    0,  418, 
+          418,    0,    0,    0,    0,    0,    0,  418,    0,    0, 
+          418,  418,  418,  418,  713,  418,    0,    0,  418,  418, 
+          418,  418,  418,  418,  418,    0,  418,  418,  717,  717, 
+          717,  717,  717,  717,  717,  717,  717,  717,  717,    0, 
+          713,  717,  717,    0,  717,  717,  717,  717,  717,  717, 
+          717,    0,    0,    0,    0,    0,  717,  717,  717,  717, 
+          717,  717,  717,    0,    0,  717,    0,    0,    0,    0, 
+            0,  717,  717,  717,  717,  717,  717,  717,  717,  717, 
+          717,  717,  717,  717,    0,  717,  717,  717,  717,  717, 
+          717,  717,    0,    0,  717,  717,    0,    0,  717,  717, 
+            0,    0,    0,    0,    0,  825,    0,  713,    0,    0, 
+            0,    0,    0,  717,  717,    0,    0,    0,    0,    0, 
+            0,  717,    0,    0,  717,  717,  717,  717,  825,  717, 
+            0,    0,  717,  717,  717,  717,  717,  717,  717,    0, 
+          717,  717,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0, 
       };
    }
 
    private static final int[] yyTable4() {
       return new int[] {
 
-            0,  713,  713,    0,  713,  713,  713,  713,  713,  713, 
-          713,    0,    0,    0,  397,    0,  713,  713,  713,  713, 
-          713,  713,  713,    0,    0,  713,    0,    0,    0,    0, 
-            0,  713,  713,  713,  713,  713,  713,  713,  713,  713, 
-          713,  713,  713,  713,  396,  713,  713,  713,  713,  713, 
-          713,  713,    0,    0,  713,  713,    0, 1106,  713,  713, 
-         1106,    0,    0,    0,    0,  821,    0,    0, 1106,    0, 
-            0,    0,    0,  713,  713,    0,    0,    0,    0,    0, 
-            0,  713,    0,    0,  713,  713,  713,  713,  821,  713, 
+            0,  825,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  405,  400,    0,    0,    0,  403,  401,    0,  402, 
+            0,  404,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  397,    0,  396,  395,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  825,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  399,    0, 
+            0,    0,    0,    0,  713,  713,  713,  713,  713,  713, 
+          713,  713,  713,  713,  713,    0,    0,  713,  713,    0, 
+          713,  713,  713,  713,  713,  713,  713,    0,  398,    0, 
             0,    0,  713,  713,  713,  713,  713,  713,  713,    0, 
-          713,  713,  709,  709,  709,  709,  709,  709,  709,  709, 
-          709,  709,  709,    0,  821,  709,  709,    0,  709,  709, 
-          709,  709,  709,  709,  709, 1106,    0,    0,    0,    0, 
-          709,  709,  709,  709,  709,  709,  709,    0,    0,  709, 
-            0,    0,    0,    0,    0,  709,  709,  709,  709,  709, 
-          709,  709,  709,  709,  709,  709,  709,  709,    0,  709, 
-          709,  709,  709,  709,  709,  709,    0,    0,  709,  709, 
-            0,    0,  709,  709,    0,    0,    0,    0,    0,  821, 
-            0,  821,    0,    0,    0,    0,    0,  709,  709,    0, 
-            0,    0,    0,    0,    0,  709,    0,    0,  709,  709, 
-          709,  709,  821,  709,    0,    0,  709,  709,  709,  709, 
-          709,  709,  709,    0,  709,  709,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  821,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  377,  378, 
-          379,  380,  381,  382,  383,  384,  385,  386,  387,  388, 
-          389,    0,    0,    0,    0,  390,  391,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          403,  398,    0,    0,    0,  401,  399,    0,  400,    0, 
-          402,    0,    0,    0,  821,  821,    0,    0,    0,    0, 
-            0,    0,    0,  395,    0,  394,  393,    0,    0,    0, 
-            0,  821,  821,  821,  821,  821,  821,  821,  821,  821, 
-          821,  821,    0,    0,  821,  821,    0,  821,  821,  821, 
-          821,  821,  821,  821,    0,    0,    0,  397,    0,  821, 
-          821,  821,  821,  821,  821,  821,    0,    0,  821,    0, 
-            0,    0,    0,    0,  821,  821,  821,  821,  821,  821, 
-          821,  821,  821,  821,  821,  821,  821,  396,  821,  821, 
-          821,  821,  821,  821,  821,  252,    0,  821,  821,    0, 
-            0,  821,  821,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  821,  821,  230,    0, 
-            0,    0,    0,    0,  821,    0,    0,  821,  821,  821, 
-          821,    0,  821,    0,    0,  821,  821,  821,  821,  821, 
-          821,  821,    0,  821,  821,  821,  821,  821,  821,  821, 
-          821,    0,    0,    0,  821,  821,    0,    0,    0,  821, 
-            0,  821,  821,  821,  821,  821,  821,  821,    0,    0, 
-            0,    0,    0,  821,  821,  821,  821,  821,  821,  821, 
-            0,    0,  821,    0,    0,    0,    0,    0,  821,  821, 
-          821,  821,  821,  821,  821,  821,  821,  821,  821,  821, 
-          821,    0,  821,  821,  821,  821,  821,  821,  821,    0, 
-          365,   68,  821,    0,    0,  821,  821,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          821,  821,    0,   67,    0,    0,    0,    0,  821,    0, 
-            0,  821,  821,  821,  821,    0,  821,    0,    0,  821, 
-          821,  821,  821,  821,  821,  821,    0,  821,  821,  364, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  377,  378,  379,  380,  381,  382,  383,  384,  385, 
-          386,  387,  388,  389,    0,    0,    0,    0,  390,  391, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  252,   68,    0,    0,    0, 
+            0,  713,    0,    0,    0,    0,    0,  713,  713,  713, 
+          713,  713,  713,  713,  713,  713,  713,  713,  713,  713, 
+            0,  713,  713,  713,  713,  713,  713,  713,    0,    0, 
+          713,  713,    0,    0,  713,  713,    0,    0,    0,    0, 
+            0,  825,    0,    0,    0,    0,    0,    0,    0,  713, 
+          713,    0,    0,    0,    0,    0,    0,  713,    0,    0, 
+          713,  713,  713,  713,  825,  713,    0,    0,  713,  713, 
+          713,  713,  713,  713,  713,    0,  713,  713,  825,  825, 
+          825,  825,  825,  825,  825,  825,  825,  825,  825,    0, 
+          825,  825,  825,    0,  825,  825,  825,  825,  825,  825, 
+          825,    0,    0,    0,    0,    0,  825,  825,  825,  825, 
+          825,  825,  825,    0,    0,  825,    0,    0,    0,    0, 
+            0,  825,  825,  825,  825,  825,  825,  825,  825,  825, 
+          825,  825,  825,  825,    0,  825,  825,  825,  825,  825, 
+          825,  825,    0,  378,  825,  825,    0,    0,  825,  825, 
+            0,    0,    0,    0,    0,  252,  825,  825,    0,    0, 
+            0,    0,    0,  825,  825,    0,    0,    0,    0,    0, 
+            0,  825,    0,    0,  825,  825,  825,  825,  230,  825, 
+            0,    0,  825,  825,  825,  825,  825,  825,  825,    0, 
+          825,  825,  379,  380,  381,  382,  383,  384,  385,  386, 
+          387,  388,  389,  390,  391,    0,    0,    0,    0,  392, 
+          393,    0,    0,    0,    0,  394,    0,    0,    0,    0, 
+            0,    0,    0,    0,  405,  400,    0,    0,    0,  403, 
+          401,    0,  402,    0,  404,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  397,    0,  396, 
+          395,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,   68,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  399,    0,    0,    0,    0,    0,  825,  825,  825, 
+          825,  825,  825,    0,    0,    0,  825,  825,    0,    0, 
+            0,  825,    0,  825,  825,  825,  825,  825,  825,  825, 
+            0,  398,    0,    0,    0,  825,  825,  825,  825,  825, 
+          825,  825,    0,    0,  825,    0,    0,    0,  367,    0, 
+          825,  825,  825,  825,  825,  825,  825,  825,  825,  825, 
+          825,  825,  825,    0,  825,  825,  825,  825,  825,  825, 
+          825,   67,    0,    0,  825,    0,    0,  825,  825,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  825,  825,    0,    0,    0,  366,    0,    0, 
+          825,    0,    0,  825,  825,  825,  825,    0,  825,    0, 
+            0,  825,  825,  825,  825,  825,  825,  825,    0,  825, 
+          825,    0,    4,    5,    6,    0,    8,    0,    0,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,   21,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,  252,    0,   68,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,  223,   40,   41, 
+           42,   43,   44,   45,   46,   67,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  968,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,    0,  226,  227,  228,   58,   59,  229,   61,   62, 
+           63,   64,    0,   65,   66,  379,  380,  381,  382,  383, 
+          384,  385,  386,  387,  388,  389,  390,  391,    0,    0, 
+            0,    0,  392,  393,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    4,    5,    6,    0,    8,    0,   67,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,   68,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  436,    4,    5,    6,    0,    8, 
+            0,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
+           12,   13,   14,   15,   16,   17,   18,    0,    0,    0, 
+            0,    0,   19,   20,   21,  210,  211,  212,  213,    0, 
+            0,   26,    0,    0,    0,    0,    0,    0,   28,    0, 
+            0,  215,  216,  217,  218,   35,  219,  220,  221,  222, 
+            0,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
+            0,   47,    0,    0,   48,   49,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,   50, 
+           51,    0, 1119, 1119,    0,    0,    0,  224,    0,    0, 
+          225,   54,   55,   56,    0,    0,    0,    0,   58,   59, 
+           60,   61,   62,   63,   64,    0,   65,   66,    0,    4, 
+            5,    6,    0,    8, 1120, 1120,    0,    9,   10,    0, 
+            0,    0,   11,    0,   12,   13,   14,   15,   16,   17, 
+           18,    0,    0,    0,    0,    0,   19,   20,   21,  210, 
+          211,  212,  213,    0,    0,   26,    0,    0,    0, 1119, 
+         1119,    0,   28, 1119,    0,  215,  216,  217,  218,   35, 
+          219,  220,  221,  222,    0,   40,   41,   42,   43,   44, 
+           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
+            0, 1120, 1120,    0,    0, 1120,    0, 1119, 1121, 1121, 
+            0,    0,    0,   50,   51,    0,    0,    0,    0,    0, 
+            0,  224,    0,    0,  225,   54,   55,   56, 1119,    0, 
+            0,    0,   58,   59,   60,   61,   62,   63,   64, 1120, 
+           65,   66,    0,    0,    0,    0, 1119,    0,    0,    0, 
+         1119,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+         1120,    0,    0, 1119, 1119, 1119, 1119,    0,   67,    0, 
+         1119, 1119,    0, 1119,    0, 1121, 1121,    0, 1120, 1121, 
+            0,    0, 1120,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  616, 1120, 1120, 1120, 1120,    0, 
+            0,    0, 1120, 1120,    0, 1120,    0,    0,    0,    0, 
+            0,    0,    0, 1121,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0, 1121,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0, 1121,    0,    0,    0, 1121,    0,    0,    0, 
+            0,   68,    0,    0,    0,    0,    0,    0,    0, 1121, 
+         1121, 1121, 1121,    0,    0,    0, 1121, 1121,    0, 1121, 
+            0, 1119,   67,    0, 1119,    0,    0,    0,    0,    0, 
+            0,    0, 1119,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  616,    0, 
+            0,    0,    0, 1120,    0,    0, 1120,    0,    0,    0, 
+            0,    0,    0,    0, 1120,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0, 1119, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,   68,    0,    0,    0,    0, 
+            0, 1120,    0,    0,    0,    0,    0, 1121,    0,    0, 
+         1121,    3,    4,    5,    6,    7,    8,    0, 1121,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,   67,   19, 
+           20,   21,   22,   23,   24,   25,    0,    0,   26,    0, 
+            0,    0,    0,    0,   27,   28,   29,   30,   31,   32, 
+           33,   34,   35,   36,   37,   38,   39,    0,   40,   41, 
+           42,   43,   44,   45,   46, 1121,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,   52,    0,    0,   53,   54,   55, 
+           56,    0,   57,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    3,    4,    5,    6,    7, 
+            8,   68,    0,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,   67,   19,   20,   21,   22,   23,   24,   25, 
+            0,    0,   26,    0,    0,    0,    0,    0,   27,   28, 
+          277,   30,   31,   32,   33,   34,   35,   36,   37,   38, 
+           39,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,   52,    0, 
+            0,   53,   54,   55,   56,    0,   57,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    0,    0,    0,   68,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    3,    4,    5,    6,    7,    8,    0,   67,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,   21,   22,   23,   24,   25,    0,    0,   26,    0, 
+            0,    0,    0,    0,   27,   28,   29,   30,   31,   32, 
+           33,   34,   35,   36,   37,   38,   39,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,   52,    0,    0,   53,   54,   55, 
+           56,   68,   57,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    3,    4,    5,    6,    7, 
+            8,    0,   67,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,   21,   22,   23,   24,   25, 
+            0,    0,   26,    0,    0,    0,    0,    0,   27,   28, 
+          277,   30,   31,   32,   33,   34,   35,   36,   37,   38, 
+           39,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,   52,    0, 
+            0,  278,   54,   55,   56,   68,   57,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    3,    4,    5,    6,    7,    8,    0,  230,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,   21,   22,   23,   24,   25,    0,    0,   26,    0, 
+            0,    0,    0,    0,   27,   28,  277,   30,   31,   32, 
+           33,   34,   35,   36,   37,   38,   39,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,   52,    0,    0,   53,   54,   55, 
+           56,   68,   57,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    3,    4,    5,    6,    7, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,   21,   22,   23,   24,   25, 
+            0,    0,   26,    0,    0,    0,    0,    0,   27,   28, 
+            0,   30,   31,   32,   33,   34,   35,   36,   37,   38, 
+           39,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,   52,    0, 
+            0,   53,   54,   55,   56,   68,   57,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,  230,    0, 
             9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
            15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
            20,   21,  210,  211,  212,  213,    0,    0,  214,    0, 
@@ -2634,298 +2832,197 @@ private static final int[] yyTable4() {
             0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
             0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
            56,   68,  226,  227,  228,   58,   59,  229,   61,   62, 
-           63,   64,    0,   65,   66,    0,  434,    4,    5,    6, 
-            0,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,   15,   16,   17,   18,    0, 
-            0,    0,    0,    0,   19,   20,   21,  210,  211,  212, 
-          213,    0,    0,   26,    0,    0,    0,    0,    0,    0, 
-           28,    0,    0,  215,  216,  217,  218,   35,  219,  220, 
-          221,  222,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,   67,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0, 1107, 1107,  612,    0,  224, 
-            0,    0,  225,   54,   55,   56,    0,    0,    0,    0, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,    4,    5,    6,    0,    8,    0,    0,    0, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,   21,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,  223,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,  500,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,  226,  227,  228,   58, 
+           59,  229,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,  324,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+          263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,  265,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,  223,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,  324,  226,  227,  228,   58,   59,  229,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,  223,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,  500,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,  226,  227,  228,   58, 
+           59,  229,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,  324,  324,  324,    0,  324,    0,  230,    0, 
+          324,  324,    0,    0,    0,  324,    0,  324,  324,  324, 
+          324,  324,  324,  324,    0,    0,    0,    0,    0,  324, 
+          324,  324,  324,  324,  324,  324,    0,    0,  324,    0, 
+            0,    0,    0,    0,    0,  324,    0,    0,  324,  324, 
+          324,  324,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,  324,  324,  324,    0,    0,    0,  324,    0, 
+            0,  324,  324,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  324,  324,    0,    0, 
+            0,    0,    0,    0,  324,    0,    0,  324,  324,  324, 
+          324,   68,  324,  324,  324,  324,  324,  324,  324,  324, 
+          324,  324,    0,  324,  324,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,  223,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,  226,  227,    0,   58, 
+           59,  229,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,   67,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+          263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,  265,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,  223,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,   68,    0,  227,  228,   58,   59,  229,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,  223,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,    0,  227,    0,   58, 
+           59,  229,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,  436,    4,    5,    6,    0,    8,    0,  230,    0, 
             9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
            15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
            20,   21,  210,  211,  212,  213,    0,    0,   26,    0, 
-            0,    0, 1107, 1107,   68,   28, 1107,    0,  215,  216, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
           217,  218,   35,  219,  220,  221,  222,    0,   40,   41, 
            42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
-            0,   48,   49,    0,    0,    0,   67,    0,    0,    0, 
-         1107,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
             0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
-           56, 1107,  612,    0,    0,   58,   59,   60,   61,   62, 
-           63,   64,    0,   65,   66,    0,    0,    0,    0, 1107, 
-            0,    0,    0, 1107,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0, 1107, 1107, 1107, 1107, 
-            0,    0,    0, 1107, 1107,    0, 1107,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           56,   68,    0,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,   15,   16,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,   21,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  843,    0, 
+            0,  225,   54,   55,   56,   68,  857,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,  230,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+           15,   16,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,   21,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,   68,  857,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,  230,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,   68,  997,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,  230,    0, 
+            9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
+          263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,  265,  210,  211,  212,  213,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,   68, 1060,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    0,    4,    5,    6,    0, 
+            8,    0,    0,    0,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  210,  211,  212,  213, 
+          813,    0,  214,    0,    0,    0,    0,  813,    0,   28, 
+            0,    0,  215,  216,  217,  218,   35,  219,  220,  221, 
+          222,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,   47,    0,    0,   48,   49,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+           50,   51,    0,    0,    0,    0,    0,    0,  224,    0, 
+            0,  225,   54,   55,   56,    0,  857,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    4,    5,    6,    0,    8,    0,    0,    0, 
+            9,   10,    0,  813,    0,   11,    0,   12,   13,   14, 
+          263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
+           20,  265,  210,  211,  212,  213,  230,    0,  214,    0, 
+            0,    0,    0,    0,    0,   28,    0,    0,  215,  216, 
+          217,  218,   35,  219,  220,  221,  222,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,   47,    0, 
+            0,   48,   49,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,   50,   51,    0,    0, 
+            0,    0,    0,    0,  224,    0,    0,  225,   54,   55, 
+           56,    0, 1164,    0,    0,   58,   59,   60,   61,   62, 
+           63,   64,    0,   65,   66,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,   68, 
-            0,    0,    0,    0,    3,    4,    5,    6,    7,    8, 
-            0,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
-           12,   13,   14,   15,   16,   17,   18,   67,    0,    0, 
-            0,    0,   19,   20,   21,   22,   23,   24,   25,    0, 
-            0,   26,    0,    0,    0,    0,    0,   27,   28,   29, 
-           30,   31,   32,   33,   34,   35,   36,   37,   38,   39, 
-            0,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
-            0,   47,    0,    0,   48,   49,    0,    0,    0,    0, 
-            0,    0,    0,    0, 1107,    0,    0, 1107,    0,   50, 
-           51,    0,    0,    0,    0, 1107,    0,   52,    0,    0, 
-           53,   54,   55,   56,    0,   57,    0,    0,   58,   59, 
-           60,   61,   62,   63,   64,    0,   65,   66,    0,    0, 
-           68,    0,    0,    0,    0,    0,    0,    0,    0,    3, 
-            4,    5,    6,    7,    8,    0,    0,    0,    9,   10, 
-            0,    0,    0,   11,    0,   12,   13,   14,   15,   16, 
-           17,   18, 1107,   67,    0,    0,    0,   19,   20,   21, 
-           22,   23,   24,   25,    0,    0,   26,    0,    0,    0, 
-            0,    0,   27,   28,  275,   30,   31,   32,   33,   34, 
-           35,   36,   37,   38,   39,    0,   40,   41,   42,   43, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  813,  813,  813,    0,  813,    0, 
+          230,    0,  813,  813,    0,    0,    0,  813,    0,  813, 
+          813,  813,  813,  813,  813,  813,    0,    0,    0,    0, 
+            0,  813,  813,  813,  813,  813,  813,  813,    0,    0, 
+          813,    0,    0,    0,    0,    0,    0,  813,    0,    0, 
+          813,  813,  813,  813,  813,  813,  813,  813,  813,    0, 
+          813,  813,  813,  813,  813,  813,  813,    0,    0,    0, 
+          813,    0,    0,  813,  813,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  813,  813, 
+            0,    0,    0,    0,    0,    0,  813,    0,    0,  813, 
+          813,  813,  813,   68,    0,    0,    0,  813,  813,  813, 
+          813,  813,  813,  813,    0,  813,  813,    0,    0,    0, 
+            4,    5,    6,    0,    8,    0,   67,    0,    9,   10, 
+            0,    0,    0,   11,    0,   12,   13,   14,  263,  264, 
+           17,   18,    0,    0,    0,    0,    0,   19,   20,  265, 
+          210,  211,  212,  213,    0,    0,  214,    0,    0,    0, 
+            0,    0,    0,   28,    0,    0,  215,  216,  217,  218, 
+           35,  219,  220,  221,  222,    0,   40,   41,   42,   43, 
            44,   45,   46,    0,    0,    0,   47,    0,    0,   48, 
            49,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,   50,   51,    0,    0,    0,    0, 
-            0,    0,   52,    0,    0,   53,   54,   55,   56,    0, 
-           57,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
-            0,   65,   66,    0,    0,    0,   68,    0,    0,    0, 
-            3,    4,    5,    6,    7,    8,    0,    0,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,   15, 
-           16,   17,   18,   67,    0,    0,    0,    0,   19,   20, 
-           21,   22,   23,   24,   25,    0,    0,   26,    0,    0, 
-            0,    0,    0,   27,   28,   29,   30,   31,   32,   33, 
-           34,   35,   36,   37,   38,   39,    0,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,   52,    0,    0,   53,   54,   55,   56, 
-            0,   57,    0,    0,   58,   59,   60,   61,   62,   63, 
-           64,    0,   65,   66,    0,    0,   68,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    3,    4,    5,    6, 
-            7,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,   15,   16,   17,   18,   67, 
-            0,    0,    0,    0,   19,   20,   21,   22,   23,   24, 
-           25,    0,    0,   26,    0,    0,    0,    0,    0,   27, 
-           28,  275,   30,   31,   32,   33,   34,   35,   36,   37, 
-           38,   39,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0,    0,    0,    0,    0,   52, 
-            0,    0,  276,   54,   55,   56,    0,   57,    0,    0, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,   68,    0,    0,    0,    3,    4,    5,    6, 
-            7,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,   15,   16,   17,   18,  230, 
-            0,    0,    0,    0,   19,   20,   21,   22,   23,   24, 
-           25,    0,    0,   26,    0,    0,    0,    0,    0,   27, 
-           28,  275,   30,   31,   32,   33,   34,   35,   36,   37, 
-           38,   39,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0,    0,    0,    0,    0,   52, 
-            0,    0,   53,   54,   55,   56,    0,   57,    0,    0, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,   68,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    3,    4,    5,    6,    7,    8,    0,    0, 
-            0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
-           14,   15,   16,   17,   18,  230,    0,    0,    0,    0, 
-           19,   20,   21,   22,   23,   24,   25,    0,    0,   26, 
-            0,    0,    0,    0,    0,   27,   28,    0,   30,   31, 
-           32,   33,   34,   35,   36,   37,   38,   39,    0,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,   47, 
-            0,    0,   48,   49,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   50,   51,    0, 
-            0,    0,    0,    0,    0,   52,    0,    0,   53,   54, 
-           55,   56,    0,   57,    0,    0,   58,   59,   60,   61, 
-           62,   63,   64,    0,   65,   66,    0,    0,   68,    0, 
-            0,    0,    0,    4,    5,    6,    0,    8,    0,    0, 
-            0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
-           14,   15,   16,   17,   18,  230,    0,    0,    0,    0, 
-           19,   20,   21,  210,  211,  212,  213,    0,    0,  214, 
-            0,    0,    0,    0,    0,    0,   28,    0,    0,  215, 
-          216,  217,  218,   35,  219,  220,  221,  222,  223,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,   47, 
-            0,    0,   48,   49,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   50,   51,    0, 
-            0,    0,    0,    0,    0,  224,    0,    0,  225,   54, 
-           55,   56,    0,  226,  227,  228,   58,   59,  229,   61, 
-           62,   63,   64,    0,   65,   66,    0,    0,   68,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    4, 
-            5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
-            0,    0,   11,    0,   12,   13,   14,   15,   16,   17, 
-           18,  230,    0,    0,    0,    0,   19,   20,   21,  210, 
-          211,  212,  213,    0,    0,  214,    0,    0,    0,    0, 
-            0,    0,   28,    0,    0,  215,  216,  217,  218,   35, 
-          219,  220,  221,  222,  223,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   50,  498,    0,    0,    0,    0,    0, 
-            0,  224,    0,    0,  225,   54,   55,   56,    0,  226, 
-          227,  228,   58,   59,  229,   61,   62,   63,   64,    0, 
-           65,   66,    0,    0,   68,    0,    0,    0,    0,    4, 
-            5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
-            0,    0,   11,    0,   12,   13,   14,  263,  264,   17, 
-           18,  320,    0,    0,    0,    0,   19,   20,  265,  210, 
-          211,  212,  213,    0,    0,  214,    0,    0,    0,    0, 
-            0,    0,   28,    0,    0,  215,  216,  217,  218,   35, 
-          219,  220,  221,  222,  223,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   50,   51,    0,    0,    0,    0,    0, 
-            0,  224,    0,    0,  225,   54,   55,   56,    0,  226, 
-          227,  228,   58,   59,  229,   61,   62,   63,   64,    0, 
-           65,   66,    0,    0,  320,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    4,    5,    6,    0,    8, 
-            0,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
-           12,   13,   14,  263,  264,   17,   18,  230,    0,    0, 
-            0,    0,   19,   20,  265,  210,  211,  212,  213,    0, 
-            0,  214,    0,    0,    0,    0,    0,    0,   28,    0, 
-            0,  215,  216,  217,  218,   35,  219,  220,  221,  222, 
-          223,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
-            0,   47,    0,    0,   48,   49,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,   50, 
-          498,    0,    0,    0,    0,    0,    0,  224,    0,    0, 
-          225,   54,   55,   56,    0,  226,  227,  228,   58,   59, 
-          229,   61,   62,   63,   64,    0,   65,   66,    0,    0, 
-           68,    0,    0,    0,    0,  320,  320,  320,    0,  320, 
-            0,    0,    0,  320,  320,    0,    0,    0,  320,    0, 
-          320,  320,  320,  320,  320,  320,  320,  230,    0,    0, 
-            0,    0,  320,  320,  320,  320,  320,  320,  320,    0, 
-            0,  320,    0,    0,    0,    0,    0,    0,  320,    0, 
-            0,  320,  320,  320,  320,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,  320,  320,  320,    0,    0, 
-            0,  320,    0,    0,  320,  320,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  320, 
-          320,    0,    0,    0,    0,    0,    0,  320,    0,    0, 
-          320,  320,  320,  320,    0,  320,  320,  320,  320,  320, 
-          320,  320,  320,  320,  320,    0,  320,  320,    0,    0, 
-           68,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    4,    5,    6,    0,    8,    0,    0,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,  263, 
-          264,   17,   18,  230,    0,    0,    0,    0,   19,   20, 
-          265,  210,  211,  212,  213,    0,    0,  214,    0,    0, 
-            0,    0,    0,    0,   28,    0,    0,  215,  216,  217, 
-          218,   35,  219,  220,  221,  222,  223,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,  224,    0,    0,  225,   54,   55,   56, 
-            0,  226,  227,    0,   58,   59,  229,   61,   62,   63, 
-           64,    0,   65,   66,    0,    0,   68,    0,    0,    0, 
-            0,    4,    5,    6,    0,    8,    0,    0,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,  263, 
-          264,   17,   18,   67,    0,    0,    0,    0,   19,   20, 
-          265,  210,  211,  212,  213,    0,    0,  214,    0,    0, 
-            0,    0,    0,    0,   28,    0,    0,  215,  216,  217, 
-          218,   35,  219,  220,  221,  222,  223,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,  224,    0,    0,  225,   54,   55,   56, 
-            0,    0,  227,  228,   58,   59,  229,   61,   62,   63, 
-           64,    0,   65,   66,    0,    0,   68,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    4,    5,    6, 
-            0,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,  263,  264,   17,   18,  230, 
-            0,    0,    0,    0,   19,   20,  265,  210,  211,  212, 
-          213,    0,    0,  214,    0,    0,    0,    0,    0,    0, 
-           28,    0,    0,  215,  216,  217,  218,   35,  219,  220, 
-          221,  222,  223,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0,    0,    0,    0,    0,  224, 
-            0,    0,  225,   54,   55,   56,    0,    0,  227,    0, 
-           58,   59,  229,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,   68,    0,    0,    0,  434,    4,    5,    6, 
-            0,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,   15,   16,   17,   18,  230, 
-            0,    0,    0,    0,   19,   20,   21,  210,  211,  212, 
-          213,    0,    0,   26,    0,    0,    0,    0,    0,    0, 
-           28,    0,    0,  215,  216,  217,  218,   35,  219,  220, 
-          221,  222,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,   47,    0,    0,   48,   49,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,   50,   51,    0,    0,    0,    0,    0,    0,  224, 
-            0,    0,  225,   54,   55,   56,    0,    0,    0,    0, 
-           58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            0,    0,   68,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    4,    5,    6,    0,    8,    0,    0, 
-            0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
-           14,   15,   16,   17,   18,  230,    0,    0,    0,    0, 
-           19,   20,   21,  210,  211,  212,  213,    0,    0,  214, 
-            0,    0,    0,    0,    0,    0,   28,    0,    0,  215, 
-          216,  217,  218,   35,  219,  220,  221,  222,    0,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,   47, 
-            0,    0,   48,   49,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   50,   51,    0, 
-            0,    0,    0,    0,    0,  224,    0,    0,  225,   54, 
-           55,   56,    0,  848,    0,    0,   58,   59,   60,   61, 
-           62,   63,   64,    0,   65,   66,    0,    0,   68,    0, 
-            0,    0,    0,    4,    5,    6,    0,    8,    0,    0, 
-            0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
-           14,  263,  264,   17,   18,  230,    0,    0,    0,    0, 
-           19,   20,  265,  210,  211,  212,  213,    0,    0,  214, 
-            0,    0,    0,    0,    0,    0,   28,    0,    0,  215, 
-          216,  217,  218,   35,  219,  220,  221,  222,    0,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,   47, 
-            0,    0,   48,   49,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,   50,   51,    0, 
-            0,    0,    0,    0,    0,  224,    0,    0,  225,   54, 
-           55,   56,    0,  983,    0,    0,   58,   59,   60,   61, 
-           62,   63,   64,    0,   65,   66,    0,    0,   68,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    4, 
-            5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
-            0,    0,   11,    0,   12,   13,   14,  263,  264,   17, 
-           18,  230,    0,    0,    0,    0,   19,   20,  265,  210, 
-          211,  212,  213,    0,    0,  214,    0,    0,    0,    0, 
-            0,    0,   28,    0,    0,  215,  216,  217,  218,   35, 
-          219,  220,  221,  222,    0,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   50,   51,    0,    0,    0,    0,    0, 
-            0,  224,    0,    0,  225,   54,   55,   56,    0, 1046, 
-            0,    0,   58,   59,   60,   61,   62,   63,   64,    0, 
-           65,   66,    0,    0,   68,    0,    0,    0,    0,    4, 
-            5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
-            0,    0,   11,    0,   12,   13,   14,  263,  264,   17, 
-           18,    0,    0,    0,    0,    0,   19,   20,  265,  210, 
-          211,  212,  213,    0,    0,  214,    0,  809,    0,    0, 
-            0,    0,   28,    0,  809,  215,  216,  217,  218,   35, 
-          219,  220,  221,  222,    0,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,   47,    0,    0,   48,   49, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,   50,   51,    0,    0,    0,    0,    0, 
-            0,  224,    0,    0,  225,   54,   55,   56,    0,  848, 
-            0,    0,   58,   59,   60,   61,   62,   63,   64,    0, 
-           65,   66,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    4,    5,    6,    0,    8, 
-          809,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
-           12,   13,   14,  263,  264,   17,   18,    0,    0,    0, 
-          230,    0,   19,   20,  265,  210,  211,  212,  213,    0, 
-            0,  214,    0,    0,    0,    0,    0,    0,   28,    0, 
-            0,  215,  216,  217,  218,   35,  219,  220,  221,  222, 
-            0,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
-            0,   47,    0,    0,   48,   49,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,   50, 
-           51,    0,    0,    0,    0,    0,    0,  224,    0,    0, 
-          225,   54,   55,   56,    0, 1150,    0,    0,   58,   59, 
-           60,   61,   62,   63,   64,    0,   65,   66,    0,    0, 
-            0,    0,    0,   68,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  809,  809,  809,    0,  809,    0,  230,    0,  809, 
-          809,    0,    0,    0,  809,    0,  809,  809,  809,  809, 
-          809,  809,  809,    0,    0,    0,    0,    0,  809,  809, 
-          809,  809,  809,  809,  809,    0,    0,  809,    0,    0, 
-            0,    0,    0,    0,  809,    0,    0,  809,  809,  809, 
-          809,  809,  809,  809,  809,  809,    0,  809,  809,  809, 
-          809,  809,  809,  809,    0,    0,    0,  809,    0,    0, 
-          809,  809,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  809,  809,    0,    0,    0, 
-            0,    0,    0,  809,    0,    0,  809,  809,  809,  809, 
-           68,    0,    0,    0,  809,  809,  809,  809,  809,  809, 
-          809,    0,  809,  809,    4,    5,    6,    0,    8,    0, 
-           67,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
-           13,   14,  263,  264,   17,   18,    0,    0,    0,    0, 
-            0,   19,   20,  265,  210,  211,  212,  213,    0,    0, 
+            0,    0,  224,    0,    0,  225,   54,   55,   56,   68, 
+            0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
+            0,   65,   66,    0,    4,    5,    6,    0,    8,    0, 
+          230,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
+           13,   14,   15,   16,   17,   18,    0,    0,    0,    0, 
+            0,   19,   20,   21,  210,  211,  212,  213,    0,    0, 
           214,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
           215,  216,  217,  218,   35,  219,  220,  221,  222,    0, 
            40,   41,   42,   43,   44,   45,   46,    0,    0,    0, 
@@ -2934,22 +3031,22 @@ private static final int[] yyTable4() {
             0,    0,    0,    0,    0,    0,  224,    0,    0,  225, 
            54,   55,   56,   68,    0,    0,    0,   58,   59,   60, 
            61,   62,   63,   64,    0,   65,   66,    0,    0,    0, 
-            0,    4,    5,    6,    0,    8,    0,  230,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,   15, 
-           16,   17,   18,    0,    0,    0,    0,    0,   19,   20, 
-           21,  210,  211,  212,  213,    0,    0,  214,    0,    0, 
-            0,    0,    0,    0,   28,    0,    0,  215,  216,  217, 
-          218,   35,  219,  220,  221,  222,    0,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,  224,    0,    0,  225,   54,   55,   56, 
-           68,    0,    0,    0,   58,   59,   60,   61,   62,   63, 
-           64,    0,   65,   66,    4,    5,    6,    0,    8,    0, 
+            4,    5,    6,    0,    8,    0,  230,    0,    9,   10, 
+            0,    0,    0,   11,    0,   12,   13,   14,   15,   16, 
+           17,   18,    0,    0,    0,    0,    0,   19,   20,   21, 
+          210,  211,  212,  213,    0,    0,   26,    0,    0,    0, 
+            0,    0,    0,   28,    0,    0,  215,  216,  217,  218, 
+           35,  219,  220,  221,  222,    0,   40,   41,   42,   43, 
+           44,   45,   46,    0,    0,    0,   47,    0,    0,   48, 
+           49,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,   50,   51,    0,    0,    0,    0, 
+            0,    0,  224,    0,    0,  225,   54,   55,   56,   68, 
+            0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
+            0,   65,   66,    0,    4,    5,    6,    0,    8,    0, 
           230,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
            13,   14,   15,   16,   17,   18,    0,    0,    0,    0, 
             0,   19,   20,   21,  210,  211,  212,  213,    0,    0, 
-           26,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
+          797,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
           215,  216,  217,  218,   35,  219,  220,  221,  222,    0, 
            40,   41,   42,   43,   44,   45,   46,    0,    0,    0, 
            47,    0,    0,   48,   49,    0,    0,    0,    0,    0, 
@@ -2957,77 +3054,77 @@ private static final int[] yyTable4() {
             0,    0,    0,    0,    0,    0,  224,    0,    0,  225, 
            54,   55,   56,   68,    0,    0,    0,   58,   59,   60, 
            61,   62,   63,   64,    0,   65,   66,    0,    0,    0, 
-            0,    4,    5,    6,    0,    8,    0,  809,    0,    9, 
-           10,    0,    0,    0,   11,    0,   12,   13,   14,   15, 
-           16,   17,   18,    0,    0,    0,    0,    0,   19,   20, 
-           21,  210,  211,  212,  213,    0,    0,  790,    0,    0, 
-            0,    0,    0,    0,   28,    0,    0,  215,  216,  217, 
-          218,   35,  219,  220,  221,  222,    0,   40,   41,   42, 
-           43,   44,   45,   46,    0,    0,    0,   47,    0,    0, 
-           48,   49,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,   50,   51,    0,    0,    0, 
-            0,    0,    0,  224,    0,    0,  225,   54,   55,   56, 
-          809,    0,    0,    0,   58,   59,   60,   61,   62,   63, 
-           64,    0,   65,   66,    4,    5,    6,    0,    8,    0, 
-          821,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
+            4,    5,    6,    0,    8,    0,  813,    0,    9,   10, 
+            0,    0,    0,   11,    0,   12,   13,   14,   15,   16, 
+           17,   18,    0,    0,    0,    0,    0,   19,   20,   21, 
+          210,  211,  212,  213,    0,    0,  214,    0,    0,    0, 
+            0,    0,    0,   28,    0,    0,  215,  216,  217,  218, 
+           35,  219,  220,  221,  222,    0,   40,   41,   42,   43, 
+           44,   45,   46,    0,    0,    0,   47,    0,    0,   48, 
+           49,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,   50,   51,    0,    0,    0,    0, 
+            0,    0,  843,    0,    0,  225,   54,   55,   56,  813, 
+            0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
+            0,   65,   66,    0,    4,    5,    6,    0,    8,    0, 
+          825,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
            13,   14,  263,  264,   17,   18,    0,    0,    0,    0, 
             0,   19,   20,  265,  210,  211,  212,  213,    0,    0, 
-          887,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
+          908,    0,    0,    0,    0,    0,    0,   28,    0,    0, 
           215,  216,  217,  218,   35,  219,  220,  221,  222,    0, 
            40,   41,   42,   43,   44,   45,   46,    0,    0,    0, 
            47,    0,    0,   48,   49,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,   50,   51, 
             0,    0,    0,    0,    0,    0,  224,    0,    0,  225, 
-           54,   55,   56,  821,    0,    0,    0,   58,   59,   60, 
+           54,   55,   56,  825,    0,    0,    0,   58,   59,   60, 
            61,   62,   63,   64,    0,   65,   66,    0,    0,    0, 
-            0,  809,  809,  809,    0,  809,    0,    0,    0,  809, 
-          809,    0,    0,    0,  809,    0,  809,  809,  809,  809, 
-          809,  809,  809,    0,    0,    0,    0,    0,  809,  809, 
-          809,  809,  809,  809,  809,    0,    0,  809,    0,    0, 
-            0,    0,    0,    0,  809,    0,    0,  809,  809,  809, 
-          809,  809,  809,  809,  809,  809,    0,  809,  809,  809, 
-          809,  809,  809,  809,    0,    0,    0,  809,    0,    0, 
-          809,  809,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  809,  809,    0,    0,    0, 
-            0,    0,    0,  809,    0,    0,  809,  809,  809,  809, 
-            0,  809,  511,    0,  809,  809,  809,  809,  809,  809, 
-          809,    0,  809,  809,  821,  821,  821,    0,  821,    0, 
-            0,    0,  821,  821,    0,    0,    0,  821,    0,  821, 
-          821,  821,  821,  821,  821,  821,    0,    0,    0,    0, 
-            0,  821,  821,  821,  821,  821,  821,  821,    0,    0, 
-          821,    0,    0,    0,    0,    0,    0,  821,    0,    0, 
-          821,  821,  821,  821,  821,  821,  821,  821,  821,    0, 
-          821,  821,  821,  821,  821,  821,  821,    0,    0,    0, 
-          821,    0,    0,  821,  821,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  821,  821, 
-            0,    0,    0,    0,    0,    0,  821,    0,    0,  821, 
-          821,  821,  821,    0,    0,    0,    0,  821,  821,  821, 
-          821,  821,  821,  821,  198,  821,  821,    0,  197,  192, 
+          813,  813,  813,    0,  813,    0,    0,    0,  813,  813, 
+            0,    0,    0,  813,    0,  813,  813,  813,  813,  813, 
+          813,  813,    0,    0,    0,    0,    0,  813,  813,  813, 
+          813,  813,  813,  813,    0,    0,  813,    0,    0,    0, 
+            0,    0,    0,  813,    0,    0,  813,  813,  813,  813, 
+          813,  813,  813,  813,  813,    0,  813,  813,  813,  813, 
+          813,  813,  813,    0,    0,    0,  813,    0,    0,  813, 
+          813,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  813,  813,    0,    0,    0,    0, 
+            0,    0,  813,    0,    0,  813,  813,  813,  813,    0, 
+            0,  813,  515,  813,  813,  813,  813,  813,  813,  813, 
+            0,  813,  813,    0,  825,  825,  825,    0,  825,    0, 
+            0,    0,  825,  825,    0,    0,    0,  825,    0,  825, 
+          825,  825,  825,  825,  825,  825,    0,    0,    0,    0, 
+            0,  825,  825,  825,  825,  825,  825,  825,    0,    0, 
+          825,    0,    0,    0,    0,    0,    0,  825,    0,    0, 
+          825,  825,  825,  825,  825,  825,  825,  825,  825,    0, 
+          825,  825,  825,  825,  825,  825,  825,    0,    0,    0, 
+          825,    0,    0,  825,  825,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  825,  825, 
+            0,    0,    0,    0,    0,    0,  825,    0,    0,  825, 
+          825,  825,  825,    0,    0,    0,    0,  825,  825,  825, 
+          825,  825,  825,  825,  198,  825,  825,    0,  197,  192, 
             0,    0,    0,  195,  193,    0,  194,    0,  196,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,  191,    0,  200,    0,    0, 
-            0,    0,    0,    0,    0,  511,  511,  511,  511,    0, 
+            0,    0,    0,    0,    0,  515,  515,  515,  515,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  511,  511,  511,  511,  190,    0,  199,  511,    0, 
-          511,  511,  511,  511,  511,  511,    0,    0,    0,  198, 
-            0,  511,    0,  197,  192,    0,  511,    0,  195,  193, 
-            0,  194,    0,  196,    0,    0,    0,    0,    0,  511, 
-          511,    0,    0,    0,    0,    0,  189,  511,  188,    0, 
-          511,    0,  511,  511,    0,  511,  511,    0,  511,  511, 
-          511,  511,  511,  511,  511,    0,  511,  511,    0,    0, 
+            0,  515,  515,  515,  515,  190,    0,  199,  515,    0, 
+          515,  515,  515,  515,  515,  515,    0,    0,    0,  198, 
+            0,  515,    0,  197,  192,    0,  515,    0,  195,  193, 
+            0,  194,    0,  196,    0,    0,    0,    0,    0,  515, 
+          515,    0,    0,    0,    0,    0,  189,  515,  188,    0, 
+          515,    0,  515,  515,    0,  515,  515,    0,  515,  515, 
+          515,  515,  515,  515,  515,    0,  515,  515,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
           191,    0,  200,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  809, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
           190,    0,  199,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,  127,  128, 
           129,  130,  131,  132,  133,  134,  135,  136,  137,  138, 
           139,  140,  141,  142,  143,  144,  145,  146,  147,  148, 
-          149,  150,  511,    0,    0,  151,  152,  153,  154,  155, 
+          149,  150,    0,    0,    0,  151,  152,  153,  154,  155, 
           156,  157,  158,  159,  160,    0,    0,    0,    0,    0, 
           161,  162,  163,  164,  165,  166,  167,  168,  169,  254, 
             0,  170,    0,    0,    0,    0,    0,    0,    0,    0, 
@@ -3045,879 +3142,893 @@ private static final int[] yyTable4() {
             0,    0,  171,  172,  173,  174,  175,  176,  177,  178, 
           179,    0,    0,  180,  181,    0,    0,    0,    0,  182, 
           183,  184,  185,    0,    0,    0,    0,    0,    0,    0, 
-          403,  398,    0,  186,  187,  401,  399,   59,  400,    0, 
-          402,    0,    0,    0,    0,  511,  511,  511,  511,    0, 
-            0,    0,    0,  395,    0,  394,  393,    0,    0,    0, 
-            0,  511,  511,  511,  511,    0,    0,    0,  511,    0, 
-          511,  511,  511,  511,  511,  511,    0,    0,    0,    0, 
-            0,  511,    0,    0,    0,    0,  511,  397,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  511, 
-          511,    0,    0,    0,    0,    0,    0,  511,    0,    0, 
-          511,    0,  511,  511,    0,  511,  511,  396,  511,  511, 
-          511,  511,  511,  511,  511,  198,  511,  511,    0,  197, 
-          192,    0,  449,    0,  195,  193,    0,  194,    0,  196, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  189,    0,  188,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  191,    0,  200,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  190,    0,  199,    0, 
-            0,    0,    0,    0,    0,    0,    0,  198,    0,    0, 
-            0,  197,  192,    0,    0,    0,  195,  193,    0,  194, 
-            0,  196,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
+            0,  198,    0,  186,  187,  197,  192,   59,  451,    0, 
+          195,  193,    0,  194,    0,  196,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  189,    0, 
+          188,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  376,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  191,    0, 
-          200,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  190,    0, 
-          199,  377,  378,  379,  380,  381,  382,  383,  384,  385, 
-          386,  387,  388,  389,    0,    0,    0,    0,  390,  391, 
-            0,    0,    0,    0,  392,    0,    0,    0,    0,  127, 
-          128,  129,  130,  131,  132,  133,  134,  135,  136,  137, 
-          138,  139,  140,  141,  142,  143,  144,  145,  146,  147, 
-          148,  149,  150,    0,    0,    0,  151,  152,  153,  437, 
-          438,  439,  440,  158,  159,  160,    0,  308,    0,    0, 
-            0,  161,  162,  163,  164,  441,  442,  443,  444,  169, 
-          445,  446,  447,  448,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  171,  172, 
-          173,  174,  175,  176,  177,  178,  179,    0,    0,  180, 
-          181,    0,    0,    0,    0,  182,  183,  184,  185,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  186, 
-          187,  127,  128,  129,  130,  131,  132,  133,  134,  135, 
-          136,  137,  138,  139,  140,  141,  142,  143,  144,  145, 
-          146,  147,  148,  149,  150,    0,    0,    0,  151,  152, 
-          153,  154,  155,  156,  157,  158,  159,  160,    0,    0, 
-            0,    0,    0,  161,  162,  163,  164,  165,  166,  167, 
-          168,  169,  316,  317,  170,  318,    0,    0,    0,    0, 
+            0,    0,  191,    0,  200,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
-            0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,  198,    0,    0,    0,  197,  192, 
-            0,  186,  187,  195,  193,    0,  194,    0,  196,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
+            0,    0,  190,    0,  199,    0,    0,    0,    0,    0, 
+            0,    0,    0,  198,    0,    0,    0,  197,  192,    0, 
+            0,    0,  195,  193,    0,  194,    0,  196,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          189,    0,  188,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            4,    5,    6,    0,    8,  191,    0,  200,    9,   10, 
-            0,    0,    0,   11,    0,   12,   13,   14,  263,  264, 
-           17,   18,    0,    0,    0,    0,    0,   19,   20,  265, 
-          293,  294,  295,  296,    0,  190,  214,  199,    0,    0, 
-            0,    0,    0,  297,    0,  679,  298,  299,  300,  301, 
-           35,  302,  303,  304,  305,    0,   40,   41,   42,   43, 
-           44,   45,   46,    0,    0,    0,  306,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,  405,  400,  191,    0,  200,  403,  401,    0, 
+          402,    0,  404,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  397,    0,  396,  395,    0, 
+            0,    0,    0,    0,  190,    0,  199,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  307,    0,    0,  225,   54,   55,   56,    0, 
-            0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
-            0,   65,   66,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  399, 
+            0,    0,    0,    0,    0,  127,  128,  129,  130,  131, 
+          132,  133,  134,  135,  136,  137,  138,  139,  140,  141, 
+          142,  143,  144,  145,  146,  147,  148,  149,  150,  398, 
+            0,    0,  151,  152,  153,  439,  440,  441,  442,  158, 
+          159,  160,    0,  310,    0,    0,    0,  161,  162,  163, 
+          164,  443,  444,  445,  446,  169,  447,  448,  449,  450, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  198,    0,    0,    0,  197,  192,    0,  247,    0, 
-          195,  193,    0,  194,    0,  196,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  189,    0, 
-          188,    0,    0,    0,    0,    0,    0,    0,  127,  128, 
-          129,  130,  131,  132,  133,  134,  135,  136,  137,  138, 
-          139,  140,  141,  142,  143,  144,  145,  146,  147,  148, 
-          149,  150,  191,    0,  200,  151,  152,  153,  154,  155, 
-          156,  157,  158,  159,  160,    0,    0,    0,    0,    0, 
-          161,  162,  163,  164,  165,  166,  167,  168,  169,    0, 
-            0,  170,  190,    0,  199,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  171,  172,  173, 
-          174,  175,  176,  177,  178,  179,    0,    0,  180,  181, 
-            0,    0,    0,    0,  182,  183,  184,  185,    4,    5, 
-            6,    0,    8,    0,    0,    0,    9,   10,  186,  187, 
-            0,   11,    0,   12,   13,   14,  263,  264,   17,   18, 
-            0,    0,    0,    0,    0,   19,   20,  265,  293,  294, 
-          295,  296,    0,    0,  214,    0,    0,    0,    0,    0, 
-            0,  297,    0,    0,  298,  299,  300,  301,   35,  302, 
-          303,  304,  305,    0,   40,   41,   42,   43,   44,   45, 
-           46,    0,  198,    0,  306,    0,  197,  192,    0,  247, 
-            0,  195,  193,    0,  194,    0,  196,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  189, 
-          307,  188,    0,  225,   54,   55,   56,    0,    0,    0, 
-            0,   58,   59,   60,   61,   62,   63,   64,    0,   65, 
-           66,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  191,    0,  200,    0,  198,    0,    0, 
-            0,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
-            0,  196,    0,    0,  652,  653,    0,    0,  654,    0, 
-            0,    0,    0,  190,  189,  199,  188,    0,    0,    0, 
             0,    0,    0,    0,  171,  172,  173,  174,  175,  176, 
           177,  178,  179,    0,    0,  180,  181,    0,    0,    0, 
-            0,  182,  183,  184,  185,    0,    0,    0,  191,    0, 
-          200,    0,    0,    0,  198,  186,  187,    0,  197,  192, 
-            0,  247,    0,  195,  193,    0,  194,    0,  196,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  190,    0, 
-          199,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  198,    0,    0,    0,  197, 
-          192,    0,  247,    0,  195,  193,    0,  194,    0,  196, 
-            0,    0,    0,    0,    0,  191,    0,  200,    0,    0, 
-            0,    0,  189,    0,  188,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  190,    0,  199,    0,    0, 
-          198,    0,    0,    0,  197,  192,  191,  247,  200,  195, 
+            0,  182,  183,  184,  185,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  186,  187,  127,  128,  129, 
+          130,  131,  132,  133,  134,  135,  136,  137,  138,  139, 
+          140,  141,  142,  143,  144,  145,  146,  147,  148,  149, 
+          150,    0,    0,    0,  151,  152,  153,  154,  155,  156, 
+          157,  158,  159,  160,    0,    0,    0,    0,    0,  161, 
+          162,  163,  164,  165,  166,  167,  168,  169,  318,  319, 
+          170,  320,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+          198,    0,    0,    0,  197,  192,    0,  186,  187,  195, 
           193,    0,  194,    0,  196,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,  189,    0,  188, 
-            0,    0,    0,    0,    0,    0,  190,    0,  199,    0, 
-            0,    0,    0,    0,    0,  662,  663,    0,    0,  664, 
+            0,    0,    0,  379,  380,  381,  382,  383,  384,  385, 
+          386,  387,  388,  389,  390,  391,    0,    0,    0,    0, 
+          392,  393,    0,    0,    0,    0,    4,    5,    6,    0, 
+            8,  191,    0,  200,    9,   10,    0,    0,    0,   11, 
+            0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
+            0,    0,    0,   19,   20,  265,  295,  296,  297,  298, 
+            0,  190,  214,  199,    0,    0,    0,    0,    0,  299, 
+            0,  683,  300,  301,  302,  303,   35,  304,  305,  306, 
+          307,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,  308,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  191,    0,  200,    0,  171,  172,  173,  174,  175, 
-          176,  177,  178,  179,    0,    0,  180,  181,    0,    0, 
-            0,    0,  182,  183,  184,  185,    0,    0,    0,    0, 
-            0,  190,    0,  199,  198,    0,  186,  187,  197,  192, 
-            0,  247,    0,  195,  193,    0,  194,    0,  196,    0, 
-          712,  653,    0,    0,  713,    0,    0,    0,    0,    0, 
-            0,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  309,    0, 
+            0,  225,   54,   55,   56,    0,    0,    0,    0,   58, 
+           59,   60,   61,   62,   63,   64,    0,   65,   66,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  198,    0,    0, 
+            0,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
+            0,  196,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
+            0,    0,    0,    0,  127,  128,  129,  130,  131,  132, 
+          133,  134,  135,  136,  137,  138,  139,  140,  141,  142, 
+          143,  144,  145,  146,  147,  148,  149,  150,  191,    0, 
+          200,  151,  152,  153,  154,  155,  156,  157,  158,  159, 
+          160,    0,    0,    0,    0,    0,  161,  162,  163,  164, 
+          165,  166,  167,  168,  169,    0,    0,  170,  190,    0, 
+          199,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  171,  172,  173,  174,  175,  176,  177, 
+          178,  179,    0,    0,  180,  181,    0,    0,    0,    0, 
+          182,  183,  184,  185,    4,    5,    6,    0,    8,    0, 
+            0,    0,    9,   10,  186,  187,    0,   11,    0,   12, 
+           13,   14,  263,  264,   17,   18,    0,    0,    0,    0, 
+            0,   19,   20,  265,  295,  296,  297,  298,    0,    0, 
+          214,    0,    0,    0,    0,    0,    0,  299,    0,    0, 
+          300,  301,  302,  303,   35,  304,  305,  306,  307,    0, 
+           40,   41,   42,   43,   44,   45,   46,    0,  198,    0, 
+          308,    0,  197,  192,    0,  247,    0,  195,  193,    0, 
+          194,    0,  196,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  189,  309,  188,    0,  225, 
+           54,   55,   56,    0,    0,    0,    0,   58,   59,   60, 
+           61,   62,   63,   64,    0,   65,   66,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  191, 
+            0,  200,    0,  198,    0,    0,    0,  197,  192,    0, 
+          247,    0,  195,  193,    0,  194,    0,  196,    0,    0, 
+          656,  657,    0,    0,  658,    0,    0,    0,    0,  190, 
+          189,  199,  188,    0,    0,    0,    0,    0,    0,    0, 
           171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
             0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,    0,  191,    0,  200,    0,    0, 
-            0,  186,  187,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  715,  663,    0, 
-            0,  716,    0,    0,    0,  190,    0,  199,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  171,  172,  173, 
-          174,  175,  176,  177,  178,  179,    0,    0,  180,  181, 
-            0,    0,    0,    0,  182,  183,  184,  185,  712,  653, 
-            0,    0,  736,    0,    0,    0,    0,    0,  186,  187, 
-            0,    0,    0,    0,    0,    0,    0,    0,  171,  172, 
-          173,  174,  175,  176,  177,  178,  179,    0,    0,  180, 
-          181,    0,    0,    0,    0,  182,  183,  184,  185,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  186, 
-          187,    0,    0,  746,  653,    0,    0,  747,    0,    0, 
+          185,    0,    0,    0,  191,    0,  200,    0,    0,    0, 
+          198,  186,  187,    0,  197,  192,    0,  247,    0,  195, 
+          193,    0,  194,    0,  196,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,  190,    0,  199,  189,    0,  188, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  198,    0,    0,    0,  197,  192,    0,  247,    0, 
+          195,  193,    0,  194,    0,  196,    0,    0,    0,    0, 
+            0,  191,    0,  200,    0,    0,    0,    0,  189,    0, 
+          188,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  190,    0,  199,    0,    0,  198,    0,    0,    0, 
+          197,  192,  191,  247,  200,  195,  193,    0,  194,    0, 
+          196,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  189,    0,  188,    0,    0,    0,    0, 
+            0,    0,  190,    0,  199,    0,    0,    0,    0,    0, 
+            0,  666,  667,    0,    0,  668,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  191,    0,  200, 
+            0,  171,  172,  173,  174,  175,  176,  177,  178,  179, 
+            0,    0,  180,  181,    0,    0,    0,    0,  182,  183, 
+          184,  185,    0,    0,    0,    0,    0,  190,    0,  199, 
+          198,    0,  186,  187,  197,  192,    0,  247,    0,  195, 
+          193,    0,  194,    0,  196,    0,  717,  657,    0,    0, 
+          718,    0,    0,    0,    0,    0,    0,  189,    0,  188, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+            0,  191,    0,  200,    0,    0,    0,  186,  187,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  720,  667,    0,    0,  721,    0,    0, 
+            0,  190,    0,  199,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,  171,  172,  173,  174,  175,  176,  177, 
           178,  179,    0,    0,  180,  181,    0,    0,    0,    0, 
-          182,  183,  184,  185,    0,    0,    0,    0,    0,    0, 
-            0,    0,  198,    0,  186,  187,  197,  192,    0,  247, 
+          182,  183,  184,  185,  717,  657,    0,    0,  743,    0, 
+            0,    0,    0,    0,  186,  187,    0,    0,    0,    0, 
+            0,    0,    0,    0,  171,  172,  173,  174,  175,  176, 
+          177,  178,  179,    0,    0,  180,  181,    0,    0,    0, 
+            0,  182,  183,  184,  185,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  186,  187,    0,    0,  753, 
+          657,    0,    0,  754,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  171, 
+          172,  173,  174,  175,  176,  177,  178,  179,    0,    0, 
+          180,  181,    0,    0,    0,    0,  182,  183,  184,  185, 
+            0,    0,    0,    0,    0,    0,    0,    0,  198,    0, 
+          186,  187,  197,  192,    0,  247,    0,  195,  193,    0, 
+          194,    0,  196,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  189,    0,  188,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  756,  667,    0,    0,  757,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  191, 
+            0,  200,    0,  171,  172,  173,  174,  175,  176,  177, 
+          178,  179,    0,    0,  180,  181,    0,    0,    0,    0, 
+          182,  183,  184,  185,    0,    0,    0,    0,    0,  190, 
+            0,  199,  198,    0,  186,  187,  197,  192,    0,  247, 
             0,  195,  193,    0,  194,    0,  196,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,  189, 
             0,  188,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  749,  663,    0, 
-            0,  750,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  191,    0,  200,    0,  171,  172,  173, 
-          174,  175,  176,  177,  178,  179,    0,    0,  180,  181, 
-            0,    0,    0,    0,  182,  183,  184,  185,    0,    0, 
-            0,    0,    0,  190,    0,  199,  198,    0,  186,  187, 
-          197,  192,    0,  247,    0,  195,  193,    0,  194,    0, 
-          196,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  189,    0,  188,    0,    0,    0,    0, 
+            0,    0,    0,  198,    0,    0,    0,  197,  192,    0, 
+          247,    0,  195,  193,    0,  194,    0,  196,    0,    0, 
+            0,    0,    0,  191,    0,  200,    0,    0,    0,    0, 
+          189,    0,  188,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,  198,    0,    0, 
-            0,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
-            0,  196,    0,    0,    0,    0,    0,  191,    0,  200, 
+            0,  197,  192,  190,  247,  199,  195,  193,    0,  194, 
+            0,  196,    0,    0,  191,    0,  200,    0,    0,    0, 
             0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  198,    0,    0,    0,  197,  192,  190,  247,  199, 
-          195,  193,    0,  194,    0,  196,    0,    0,  191,    0, 
-          200,    0,    0,    0,    0,    0,    0,    0,  189,    0, 
-          188,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  198,  190,    0, 
-          199,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
-            0,  196,  191,    0,  200,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
+            0,    0,    0,  198,  190,    0,  199,  197,  192,    0, 
+          247,    0,  195,  193,    0,  194,    0,  196,  191,    0, 
+          200,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+          189,    0,  188,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  190,    0, 
+          199,  813,  657,    0,    0,  814,    0,    0,    0,    0, 
+            0,    0,    0,    0,  191,    0,  200,    0,    0,    0, 
+            0,  171,  172,  173,  174,  175,  176,  177,  178,  179, 
+            0,    0,  180,  181,    0,    0,    0,    0,  182,  183, 
+          184,  185,    0,    0,  190,    0,  199,    0,    0,    0, 
+          198,    0,  186,  187,  197,  192,    0,  247,    0,  195, 
+          193,    0,  194,    0,  196,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  189,    0,  188, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  816,  667,    0,    0,  817, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,  190,    0,  199,  806,  653,    0,    0,  807, 
-            0,    0,    0,    0,    0,    0,    0,    0,  191,    0, 
-          200,    0,    0,    0,    0,  171,  172,  173,  174,  175, 
+            0,  191,    0,  200,    0,  171,  172,  173,  174,  175, 
           176,  177,  178,  179,    0,    0,  180,  181,    0,    0, 
-            0,    0,  182,  183,  184,  185,    0,    0,  190,    0, 
-          199,    0,    0,    0,  198,    0,  186,  187,  197,  192, 
-            0,  247,    0,  195,  193,    0,  194,    0,  196,    0, 
+            0,    0,  182,  183,  184,  185,  887,  657,    0,    0, 
+          888,  190,    0,  199,    0,    0,  186,  187,    0,    0, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+          676,  667,    0,    0,  677,    0,    0,  186,  187,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  189,    0,  188,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  809, 
-          663,    0,    0,  810,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  191,    0,  200,    0,  171, 
-          172,  173,  174,  175,  176,  177,  178,  179,    0,    0, 
-          180,  181,    0,    0,    0,    0,  182,  183,  184,  185, 
-          878,  653,    0,    0,  879,  190,    0,  199,    0,    0, 
-          186,  187,    0,    0,    0,    0,    0,    0,    0,    0, 
           171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
             0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,  672,  663,    0,    0,  673,    0, 
-            0,  186,  187,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,  171,  172,  173,  174,  175,  176, 
-          177,  178,  179,    0,    0,  180,  181,    0,    0,    0, 
-            0,  182,  183,  184,  185,    0,    0,    0,    0,    0, 
-         1040,  653,    0,    0, 1041,  186,  187,    0,    0,    0, 
+          185,    0,    0,    0,    0,    0, 1054,  657,    0,    0, 
+         1055,  186,  187,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+            0,    0,    0,    0,    0,  198,    0,  186,  187,  197, 
+          192,    0,  247,    0,  195,  193,    0,  194,    0,  196, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-          171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
-            0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,    0,    0,    0,    0,    0,  198, 
-            0,  186,  187,  197,  192,    0,  247,    0,  195,  193, 
-            0,  194,    0,  196,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  189,    0,  188,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0, 1043,  663,    0, 
-            0, 1044,    0,    0,    0,    0,    0,    0,    0,    0, 
-          191,    0,  200,    0,    0,    0,    0,  171,  172,  173, 
-          174,  175,  176,  177,  178,  179,    0,    0,  180,  181, 
-            0,    0,    0,    0,  182,  183,  184,  185,    0,    0, 
-          190,    0,  199,    0,    0,    0,  198,    0,  186,  187, 
-          197,  192,    0,  247,    0,  195,  193,    0,  194,    0, 
-          196,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  189,    0,  188,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  198,    0,    0, 
-            0,  197,  192,    0,  247,    0,  195,  193,    0,  194, 
-            0,  196,    0,    0,    0,    0,    0,  191,    0,  200, 
-            0,    0,    0,    0,  189,    0,  188,    0,    0,    0, 
+            0,    0,  189,    0,  188,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,  190,    0,  199, 
-            0,    0,  198,    0,    0,    0,  197,  192,  191,    0, 
-          200,  195,  193,    0,  194,    0,  196,    0,    0,    0, 
+            0,    0,    0, 1057,  667,    0,    0, 1058,    0,    0, 
+            0,    0,    0,    0,    0,    0,  191,    0,  200,    0, 
+            0,    0,    0,  171,  172,  173,  174,  175,  176,  177, 
+          178,  179,    0,    0,  180,  181,    0,    0,    0,    0, 
+          182,  183,  184,  185,    0,    0,  190,    0,  199,    0, 
+            0,    0,  198,    0,  186,  187,  197,  192,    0,  247, 
+            0,  195,  193,    0,  194,    0,  196,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,  189, 
-            0,  188,    0,    0,    0,    0,    0,    0,  190,    0, 
-          199,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,  188,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  198,    0,    0,    0,  197,  192,    0, 
+          247,    0,  195,  193,    0,  194,    0,  196,    0,    0, 
             0,    0,    0,  191,    0,  200,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0, 1332,  653,    0,    0, 1333,    0,    0,    0, 
-            0,    0,    0,  190,    0,  199,    0,    0,    0,    0, 
-            0,    0,  171,  172,  173,  174,  175,  176,  177,  178, 
-          179,    0,    0,  180,  181,    0,    0,    0,    0,  182, 
-          183,  184,  185, 1098,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,  186,  187,    0,    0,    0,    0,    0, 
+          189,    0,  188,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,  190,    0,  199,    0,    0,  198,    0, 
+            0,    0,  197,  192,  191,    0,  200,  195,  193,    0, 
+          194,    0,  196,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,  189,    0,  188,    0,    0, 
+            0,    0,    0,    0,  190,    0,  199,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  191, 
+            0,  200,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0, 1346,  657, 
+            0,    0, 1347,    0,    0,    0,    0,    0,    0,  190, 
+            0,  199,    0,    0,    0,    0,    0,    0,  171,  172, 
+          173,  174,  175,  176,  177,  178,  179,    0,    0,  180, 
+          181,    0,    0,    0,    0,  182,  183,  184,  185, 1112, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  186, 
+          187,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0, 1335, 
-          663,    0,    0, 1336,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  171, 
-          172,  173,  174,  175,  176,  177,  178,  179, 1098,    0, 
-          180,  181,    0,    0,    0,    0,  182,  183,  184,  185, 
-         1382,  653,    0,    0, 1383,    0,    0,    0,    0,    0, 
-          186,  187,    0,    0,    0,    0,    0,    0,    0,    0, 
-          171,  172,  173,  174,  175,  176,  177,  178,  179,    0, 
-            0,  180,  181,    0,    0,    0,    0,  182,  183,  184, 
-          185,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,  186,  187,    0,    0,  672,  663,    0,    0,  673, 
+            0,    0,    0,    0,    0, 1349,  667,    0,    0, 1350, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,  171,  172,  173,  174,  175, 
-          176,  177,  178,  179,    0,    0,  180,  181,    0,    0, 
-            0,    0,  182,  183,  184,  185, 1080, 1081, 1082, 1083, 
-            0,    0,    0,    0,    0,    0,  186,  187,    0,    0, 
-            0,    0, 1084, 1085, 1086, 1087,    0,    0,    0, 1088, 
-            0, 1089,   40,   41,   42,   43,   44,    0,    0,    0, 
-            0,    0,  306,    0,    0,    0,    0,  569,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-         1090, 1091,    0,    0,    0,    0,    0,    0, 1092,    0, 
-            0, 1093,    0, 1094, 1095,    0, 1096,  573,    0,   58, 
-           59, 1097,   61,   62,   63,   64,    0,   65,   66,    0, 
-            0, 1080, 1081, 1082, 1083,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0, 1084, 1085, 1086, 
-         1087,    0,    0,    0, 1088,    0,    0,   40,   41,   42, 
-           43,   44,    0,    0,    0,    0,    0,  306,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0, 1090, 1091,    0,    0,    0, 
-            0,    0,    0, 1092,    0,    0, 1093,    0, 1094, 1095, 
-            0,    0,    0,    0,   58,   59,   60,   61,   62,   63, 
-           64,    0,   65,   66,    4,    5,    6,    0,    8,    0, 
-            0,    0,    9,   10,    0,    0,    0,   11,    0,   12, 
-           13,   14,  263,  264,   17,   18,    0,    0,    0,    0, 
-            0,   19,   20,  265,  346,  347,  348,  349,    0,    0, 
-          214,    0,    0,    0,    0,    0,    0,  297,    0,    0, 
-          350,  351,  352,  353,   35,  354,  355,  356,  357,    0, 
-           40,   41,   42,   43,   44,   45,   46,    0,    0,    0, 
-          306,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,  358,    0,    0,   53, 
-           54,   55,   56,    0,   57,    0,    0,   58,   59,   60, 
-           61,   62,   63,   64,    0,   65,   66,    4,    5,    6, 
-            0,    8,    0,    0,    0,    9,   10,    0,    0,    0, 
-           11,    0,   12,   13,   14,  263,  264,   17,   18,    0, 
-            0,    0,    0,    0,   19,   20,  265,  293,  294,  295, 
-          296,    0,    0,  214,    0,    0,    0,    0,    0,    0, 
-          297,    0,    0,  298,  299,  300,  301,   35,  302,  303, 
-          304,  305,    0,   40,   41,   42,   43,   44,   45,   46, 
-            0,    0,    0,  306,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  307, 
-            0,    0,  428,   54,   55,   56,    0,  429,    0,    0, 
+          176,  177,  178,  179, 1112,    0,  180,  181,    0,    0, 
+            0,    0,  182,  183,  184,  185, 1396,  657,    0,    0, 
+         1397,    0,    0,    0,    0,    0,  186,  187,    0,    0, 
+            0,    0,    0,    0,    0,    0,  171,  172,  173,  174, 
+          175,  176,  177,  178,  179,    0,    0,  180,  181,    0, 
+            0,    0,    0,  182,  183,  184,  185,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  186,  187,    0, 
+            0,  676,  667,    0,    0,  677,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0, 1112,    0,    0, 
+            0,  171,  172,  173,  174,  175,  176,  177,  178,  179, 
+            0,    0,  180,  181,    0,    0,    0,    0,  182,  183, 
+          184,  185, 1094, 1095, 1096, 1097,    0,    0,    0,    0, 
+            0,    0,  186,  187,    0,    0,    0,    0, 1098, 1099, 
+         1100, 1101,    0,    0,    0, 1102,    0, 1103,   40,   41, 
+           42,   43,   44,    0,    0,    0,    0,    0,  308,    0, 
+            0,    0,    0,  573,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1104, 1105,    0,    0, 
+            0,    0,    0,    0, 1106,    0,    0, 1107,    0, 1108, 
+         1109,    0, 1110,  577,    0,   58,   59, 1111,   61,   62, 
+           63,   64,    0,   65,   66,    0,    0, 1094, 1095, 1096, 
+         1097,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0, 1098, 1099, 1100, 1101,    0,    0,    0, 
+         1102,    0,    0,   40,   41,   42,   43,   44,    0,    0, 
+            0,    0,    0,  308,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0, 1104, 1105,    0,    0,    0,    0,    0,    0, 1106, 
+            0,    0, 1107,    0, 1108, 1109,    0, 1110,    0,    0, 
            58,   59,   60,   61,   62,   63,   64,    0,   65,   66, 
-            4,    5,    6,    0,    8,    0,    0,    0,    9,   10, 
-            0,    0,    0,   11,    0,   12,   13,   14,  263,  264, 
-           17,   18,    0,    0,    0,    0,    0,   19,   20,  265, 
-          458,  459,  460,  461,    0,    0,  214,    0,    0,    0, 
-            0,    0,    0,  297,    0,    0,  462,  463,  464,  465, 
-           35,  445,  446,  466,  448,    0,   40,   41,   42,   43, 
-           44,   45,   46,    0,    0,    0,  306,    0,    0,    0, 
+         1094, 1095, 1096, 1097,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0, 1098, 1099, 1100, 1101, 
+            0,    0,    0, 1102,    0,    0,   40,   41,   42,   43, 
+           44,    0,    0,    0,    0,    0,  308,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  467,    0, 
-            0,    0,  468,    0,    0,  225,   54,   55,   56,    0, 
+            0,    0,    0,    0, 1104, 1105,    0,    0,    0,    0, 
+            0,    0, 1106,    0,    0, 1107,    0, 1108, 1109,    0, 
             0,    0,    0,   58,   59,   60,   61,   62,   63,   64, 
             0,   65,   66,    4,    5,    6,    0,    8,    0,    0, 
             0,    9,   10,    0,    0,    0,   11,    0,   12,   13, 
            14,  263,  264,   17,   18,    0,    0,    0,    0,    0, 
-           19,   20,  265,  458,  459,  460,  461,    0,    0,  214, 
-            0,    0,    0,    0,    0,    0,  297,    0,    0,  462, 
-          463,  464,  465,   35,  445,  446,  466,  448,    0,   40, 
-           41,   42,   43,   44,   45,   46,    0,    0,    0,  306, 
+           19,   20,  265,  348,  349,  350,  351,    0,    0,  214, 
+            0,    0,    0,    0,    0,    0,  299,    0,    0,  352, 
+          353,  354,  355,   35,  356,  357,  358,  359,    0,   40, 
+           41,   42,   43,   44,   45,   46,    0,    0,    0,  308, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,  468,    0,    0,  225,   54, 
-           55,   56,    0,    0,    0,    0,   58,   59,   60,   61, 
+            0,    0,    0,    0,    0,  360,    0,    0,   53,   54, 
+           55,   56,    0,   57,    0,    0,   58,   59,   60,   61, 
            62,   63,   64,    0,   65,   66,    4,    5,    6,    0, 
             8,    0,    0,    0,    9,   10,    0,    0,    0,   11, 
             0,   12,   13,   14,  263,  264,   17,   18,    0,    0, 
-            0,    0,    0,   19,   20,  265,  293,  294,  295,  296, 
-            0,    0,  214,    0,    0,    0,    0,    0,    0,  297, 
-            0,    0,  298,  299,  300,  301,   35,  302,  303,  304, 
-          305,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
-            0,    0,  306,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,  307,    0, 
-            0,  428,   54,   55,   56,    0,    0,    0,    0,   58, 
+            0,    0,    0,   19,   20,  265,  295,  296,  297,  298, 
+            0,    0,  214,    0,    0,    0,    0,    0,    0,  299, 
+            0,    0,  300,  301,  302,  303,   35,  304,  305,  306, 
+          307,    0,   40,   41,   42,   43,   44,   45,   46,    0, 
+            0,    0,  308,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,  309,    0, 
+            0,  430,   54,   55,   56,    0,  431,    0,    0,   58, 
            59,   60,   61,   62,   63,   64,    0,   65,   66,    4, 
             5,    6,    0,    8,    0,    0,    0,    9,   10,    0, 
             0,    0,   11,    0,   12,   13,   14,  263,  264,   17, 
-           18,    0,    0,    0,    0,    0,   19,   20,  265, 1204, 
-         1205, 1206, 1207,    0,    0,  214,    0,    0,    0,    0, 
-            0,    0,  297,    0,    0, 1208, 1209, 1210, 1211,   35, 
-         1212, 1213, 1214, 1215,    0,   40,   41,   42,   43,   44, 
-           45,   46,    0,    0,    0,  306,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0, 1216,    0,    0,  225,   54,   55,   56,    0,    0, 
+           18,    0,    0,    0,    0,    0,   19,   20,  265,  460, 
+          461,  462,  463,    0,    0,  214,    0,    0,    0,    0, 
+            0,    0,  299,    0,    0,  464,  465,  466,  467,   35, 
+          447,  448,  468,  450,    0,   40,   41,   42,   43,   44, 
+           45,   46,    0,    0,    0,  308,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  469,    0,    0, 
+            0,  470,    0,    0,  225,   54,   55,   56,    0,    0, 
             0,    0,   58,   59,   60,   61,   62,   63,   64,    0, 
            65,   66,    4,    5,    6,    0,    8,    0,    0,    0, 
             9,   10,    0,    0,    0,   11,    0,   12,   13,   14, 
           263,  264,   17,   18,    0,    0,    0,    0,    0,   19, 
-           20,  265,  458,  459,  460,  461,    0,    0,  214,    0, 
-            0,    0,    0,    0,    0,  297,    0,    0,  462,  463, 
-          464, 1325,   35,  445,  446, 1326,  448,    0,   40,   41, 
-           42,   43,   44,   45,   46,    0,    0,    0,  306,    0, 
+           20,  265,  460,  461,  462,  463,    0,    0,  214,    0, 
+            0,    0,    0,    0,    0,  299,    0,    0,  464,  465, 
+          466,  467,   35,  447,  448,  468,  450,    0,   40,   41, 
+           42,   43,   44,   45,   46,    0,    0,    0,  308,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-            0,    0,    0,    0, 1327,    0,    0,  225,   54,   55, 
+            0,    0,    0,    0,  470,    0,    0,  225,   54,   55, 
            56,    0,    0,    0,    0,   58,   59,   60,   61,   62, 
-           63,   64,    0,   65,   66, 
+           63,   64,    0,   65,   66,    4,    5,    6,    0,    8, 
+            0,    0,    0,    9,   10,    0,    0,    0,   11,    0, 
+           12,   13,   14,  263,  264,   17,   18,    0,    0,    0, 
+            0,    0,   19,   20,  265,  295,  296,  297,  298,    0, 
+            0,  214,    0,    0,    0,    0,    0,    0,  299,    0, 
+            0,  300,  301,  302,  303,   35,  304,  305,  306,  307, 
+            0,   40,   41,   42,   43,   44,   45,   46,    0,    0, 
+            0,  308,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,  309,    0,    0, 
+          430,   54,   55,   56,    0,    0,    0,    0,   58,   59, 
+           60,   61,   62,   63,   64,    0,   65,   66,    4,    5, 
+            6,    0,    8,    0,    0,    0,    9,   10,    0,    0, 
+            0,   11,    0,   12,   13,   14,  263,  264,   17,   18, 
+            0,    0,    0,    0,    0,   19,   20,  265, 1218, 1219, 
+         1220, 1221,    0,    0,  214,    0,    0,    0,    0,    0, 
+            0,  299,    0,    0, 1222, 1223, 1224, 1225,   35, 1226, 
+         1227, 1228, 1229,    0,   40,   41,   42,   43,   44,   45, 
+           46,    0,    0,    0,  308,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+         1230,    0,    0,  225,   54,   55,   56,    0,    0,    0, 
+            0,   58,   59,   60,   61,   62,   63,   64,    0,   65, 
+           66,    4,    5,    6,    0,    8,    0,    0,    0,    9, 
+           10,    0,    0,    0,   11,    0,   12,   13,   14,  263, 
+          264,   17,   18,    0,    0,    0,    0,    0,   19,   20, 
+          265,  460,  461,  462,  463,    0,    0,  214,    0,    0, 
+            0,    0,    0,    0,  299,    0,    0,  464,  465,  466, 
+         1339,   35,  447,  448, 1340,  450,    0,   40,   41,   42, 
+           43,   44,   45,   46,    0,    0,    0,  308,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+            0,    0,    0, 1341,    0,    0,  225,   54,   55,   56, 
+            0,    0,    0,    0,   58,   59,   60,   61,   62,   63, 
+           64,    0,   65,   66, 
       };
    }
 
    private static final int[] yyCheck1() {
       return new int[] {
 
-            2,    2,   60,   98,  121,  122,   90,   57,   15,   16, 
-           59,   53,   54,   99,  340,    2,  242,   13,   14,  105, 
-          457,  112,  599,    7,  594,  602,   87,    7,   15,   16, 
-          335,  776,   67,  468,  247,  340,  874,  121,   88,   27, 
-          335,   57,  490,   27,  414,  340,  494,   27,  772,   53, 
-          774,   53,   54,   55,   56,   15,   16,  119,  494,  121, 
-          122,  490,  112,   15,   16,  413,   53,   54,  416,  603, 
-           57,  120,  603,  123,  124,  772,  424,   10,   10,   59, 
-           67,   38,   84,   85,  581,   64,   65,   66,  585,  287, 
-           21,  546,   46,  291,   10,   55,   56,  533,  123,  754, 
-          529,   88,   10,   55,   15,   16,   47,   30,   44,  123, 
-          117,   10,  324,  325,   90,  913,  671,   10,  488,  677, 
-          675,  676,   40,  121,   10,  112,  703,   59,  636,  125, 
-          117,  101,  119,  571,  121,  122,  123,  124,   10,  487, 
-          120,  489,   37,   59,   10,   44,  814,   42,  914, 1094, 
-          236,   59,   47,  276,  283,  870,  126,  117,   44,   10, 
-           59,  123,   40,  669, 1197,  117,   59,    0,   44,    0, 
-          101,  229,  520,   59,  544,   41, 1191, 1192,   44,  710, 
-          774,  267,   46,  225,   10,   61,   10,   59,   10,  251, 
-           26,  253,   28,   59,  278,   61,  283,  545,   85, 1024, 
-           10,   40,  320, 1023, 1024,  123,  117, 1296,   59, 1171, 
-          288,  776,   10,   91,   85,   41,   10,  308,   44,   10, 
-           10,   10, 1184,  225,  679,   46,  312,  344,  306,  231, 
-          232,   41,   32,   59,  276,   59,   10,   59,  225,  609, 
-          247, 1274,   46,  250,  373,  247, 1191, 1192,   10,  367, 
-           41,   41,  369,  370,  371,  372,  258,  258,  308,   46, 
-          247,   59,  610,  250,  251,  700,  253,   41,   59,   59, 
-           91,  258,  276,  359,  276, 1073,  502,  725, 1367,  727, 
-          278,  123,  344,   93, 1008,   10,  373,   91, 1303,  276, 
-          250,  727,  125,   46,  125,  247,  725,   59,  250,   93, 
-          877,  343,  278,  345,   91,  428, 1072,  369,  370,  371, 
-          372,  979,  374,  375, 1152, 1012,   40,  823,  280,   93, 
-           44,  308,   46,   10, 1149,  350,  764,  765,   10, 1149, 
-           60,  701,   62,  256,  265,  267,  350,  268,   91,  250, 
-           10,  343,  269,  345,  231,  232,   44,  559,   46,  561, 
-          467, 1313,  279,   40,  702,  925,  343,  344,  345,  306, 
-          868,  232,  280,  310,   46,  306,  367,   91,  267,   10, 
-          454,  264, 1314,  281,   44,  268,  269,   59,  826,  429, 
-          367,  267,  369,  370,  371,  372,  428,  374,  375,  944, 
-          945,  263,  264,   91,  348,  950,  951,  826,  932,   10, 
-           41,  932,  359,  279,   10,  467,  861,  414,  324,   91, 
-          987,  969,  414,  429, 1008,  351,  267,  283,  351,  351, 
-           61,  918,  919,  920,  428,  922,  428,  414,   10,  322, 
-          927,  433,   59,  328, 1376,   41,  416, 1152,   44,  310, 
-           10,  428,  429, 1098,  424,  267,  433,  648,   59,  650, 
-          322,   10,  351,   59,  370,  546,  454,  283, 1023, 1024, 
-           38,  297,  993,  310,   10,  606,  264,  772,  475,  774, 
-          348,   41,    0, 1197,   44,  913,  914,   10, 1033,   32, 
-          467,  488,   10,  347,  348,  416,  488,   46,  475,   59, 
-         1045,   46,  283,  283,  720,   41,  546,  124,  421,  362, 
-           59,  488,  425,  426,  427,  267,  647,  373,   41,  489, 
-          651,   93,  725,   59,  271,  475, 1302,  601,  124, 1305, 
-          320,  605,  279,  475,  322,  513,  347,  348, 1366,  513, 
-          490,   59,   91,  513,  963,   40,   91,  544,  282,  526, 
-          520,  682,  544,  347,  348,  757,  744,  373,  985,  761, 
-          611,  999,  263,  264,  124,  279,   10,  544,  489,  546, 
-          347,  348,   10,  999,  475,  545,  291,  292,   10,  529, 
-          493,  371,  372,  496,  497, 1320,   41, 1074, 1075, 1076, 
-         1077,  279,  373,  373, 1149,  267,   41,  957,  679,  520, 
-         1314,  514, 1316,  600,  347,  348,  603,  599,  521,   41, 
-          602,   46,  609,  333,  334,   59,   44,  609,  956,  264, 
-          958,  322,  599,  600,  545,  602,  603,   59,  619, 1316, 
-         1057, 1198,  609,  347,  348,  687, 1191, 1192, 1193,  679, 
-          610,   10,  619,  350, 1072, 1073,  671,  283,  279,  320, 
-          675,  676,  677,  685,   10,   93,   91,  324,  789,  347, 
-          348,  693, 1376,  264,  745,  796,  671, 1092,  269,  124, 
-          675,   10,  704,  264,  666,  347,  348,  322,  894,  124, 
-          732,  125,  674,  291,  292, 1372, 1002,  283,   44,  610, 
-           59,   10,  124,  685,  671,   46,  367,  657,  675,  676, 
-          677,  693,  679,  370,  701,  745,  666, 1002,  685,  701, 
-          687,  703,  704, 1008,  674, 1275,  693, 1002,  267, 1146, 
-           59,  322, 1282,  283,  701,   44,  703,  704,  350,  707, 
-         1297,  322,  702,  707,  676,  677,  657,  707,  869,   41, 
-           91,  872,   40,   10,  312,  666,  738,   61, 1303, 1236, 
-           93,  882, 1068,  674,   61,  732,  308,   59,    2,  844, 
-          328,   44,  838, 1188,   41, 1320,  318,  319,  745,  876, 
-          683,   15,   16, 1068,   41,  725,   10,  373,  320,  811, 
-          861,  702,  125, 1068,   10,  124,   46,  776,  757,  758, 
-          358,  359,  761,  762,  783, 1222,   10,   10,  347,  348, 
-         1360,  875,  347,  348,    0,   10,   40,  938,   46,   53, 
-           54,  637,   46,  373,   10,   40,  737,  738,   44,  811, 
-          320,  861,  288,   67,  876,   59,   93,   41,  867,  371, 
-          372,   91,  374,   59,  811,  661,  269,  310,  271,  475, 
-          306,  972,   44,  351,   46,   10,   59,   61,  125,   10, 
-          981,  283,   10,   91,   59,  986,   10,   91,  989,  320, 
-         1090, 1091,  774,   59,   10,  501,  778,  367,  504,  976, 
-          506,  863,  864,  117,  320,  119,  826,  121,  122,   44, 
-           41, 1171,  874,   10,  861,  877,   40,  523,  714,   91, 
-           44,   44,   46,  350,   59,   41,   10,  867,  124,  876, 
-          877,   59, 1197,   10, 1194,   59,  367,   10,  821,  822, 
-          271,  124,  347,  348,  988,  901,  829,  830,  279,  944, 
-          945,  367,  748,   44,  976,  950,  951,   41, 1288,  125, 
-          263,  264,   59, 1064,   41,  932,  269,   91,   41,  944, 
-          945,  373,  578,  975,   37,  950,  951,   61,  350,   42, 
-           43, 1289,   45,   10,   47,  932, 1186, 1187,   61,  124, 
-          957,  825,   10,   61,  790,  957,  320,  944,  945,  833, 
-          124,  268,  269,  950,  951,  888,  889,  969,  891,  892, 
-          957,  225,  808,  975,   41,  262,  263,  264,  958,  322, 
-          714,  268,  269,   40,  271,  987,  347,  348,  975,  976, 
-          940,  328,  279,  247,   61,   10,  250,  251, 1033,  253, 
-          987,   59, 1302,  367,  258, 1305,  339,  340,   10, 1314, 
-         1045, 1316,   10, 1313,  748,  306,  350,  969, 1033,  310, 
-         1062,   41,  276,  267,  328,  948,   41,  958,   93, 1071, 
-         1026, 1027,  678,  294,  295,  322,  959,  324, 1039, 1097, 
-          125,   10,   44,   41,   59,  881, 1033, 1048, 1050,  264, 
-         1052,  887, 1039,  310,  269,  279,  271,   59, 1045,  705, 
-         1062, 1048,   10,   10, 1181,  413,  124,  279,  416, 1071, 
-         1370, 1376,   41,  996,  808, 1062,  424,  347,  348,   10, 
-          817,   10,  819,  370, 1071,   44, 1008,   32, 1010,  343, 
-          344,  345, 1014,   41,   41, 1145,  264,   10, 1140,  347, 
-          348,  269, 1144,  347,  348,   61, 1148,  322, 1058,   61, 
-           41,  279,   41,  367,   61,  369,  370,  371,  372, 1181, 
-          374,  375,  124,  769,  310,  262,  263,  264,   41, 1131, 
-         1132, 1217,  269,  309,  310,  347,  348,   10, 1140,  487, 
-          671,  489, 1144, 1093,  675, 1095, 1148,  881,   61,  279, 
-         1152,    2,  356, 1140,  322,  279,   10, 1144, 1145, 1201, 
-          414, 1148, 1184,   44,   15,   16,  279,   59,   41, 1191, 
-         1192,  519,  520,   10,  428,   60, 1293, 1294, 1220,  433, 
-           44,  123,   46,  347,  348,  322,   61,   41,   61, 1231, 
-          721,   61,  723,   41, 1181,  543, 1198,  545, 1197, 1201, 
-          320,   44,   53,   54, 1345,   10, 1042, 1265,  739,   46, 
-           44, 1198,   46,  467, 1201,   44,   67,  125, 1220, 1221, 
-          866,  475,   59,  942,  943,  328,   41,   91,   44, 1231, 
-         1280, 1293, 1294, 1220,  488,   44,   41, 1159,   10, 1189, 
-         1190,   44,  345,  346, 1231,   44,   10,  367,   44,  895, 
-          896,  371,  372, 1176,   91,   44,   61,   91, 1094, 1095, 
-          608,  306,  610,  306,  125,  911,  117,  350,  119,   10, 
-          121,  122,  526,   44,   46, 1197,  350,   41,  350, 1329, 
-           10, 1288,   44, 1285,  267,  279, 1288,   59, 1290,  123, 
-          544,   10,  271, 1280,   10, 1297, 1338,   61,  125,   40, 
-           41, 1288,   44,   44,  350,   46, 1293, 1294, 1042, 1289, 
-         1297,   41,  350,  350,   44, 1314,  320, 1316, 1154,   91, 
-           61, 1320,   38,  350, 1323,   40,   42,   46,   61,   44, 
-           44,   46,  279, 1169, 1170,  298, 1338,  298,   58,  350, 
-           59,   93, 1329,   59,  125,  599,  600,  298,  602,  603, 
-           91, 1338,  700, 1189,  702,  609,   61,   44, 1289,   10, 
-         1094, 1197,  298,  367, 1366,  619,  279,  371,  372,  262, 
-          374,  269,   91, 1372,  225, 1374,   91, 1376,   10, 1378, 
-           37,   38,  123,  350,   44,   42,   43,   38,   45,  125, 
-           47,   42, 1314,  125,   44, 1394,  247,   44,   44,  250, 
-          251, 1323,  253,   44,  123,  306,  279,  258,  123,   41, 
-           44,   10,   46,  944,  945,  279,   44,  671,  320,  950, 
-          951,  675,  676,  677,   44,  276, 1262, 1263, 1264,   61, 
-          267,  685,  263,  687,  351, 1169, 1170,   44, 1274,  693, 
-          306,  124,   41,   44,   44,  279,  280,  701,    0,  703, 
-          704,  124, 1374,  320, 1376, 1189, 1378,   91,   10,   44, 
-           59,  351,  125,  994,  995,  367,  997,  998,  306,  371, 
-          372,   37, 1394,   41,  279,  310,   42,   43,  732,   45, 
-           59,   47,   44,  347,  348,  312,   44,   44,   44,   41, 
-           44,   10,  343,  344,  345,  267,   44,   44, 1334,  124, 
-          367,  328, 1033,   44,  371,  372, 1342,   59,  320,  125, 
-          347,  348, 1348,  347,  348,  279,  367,   10,  369,  370, 
-          371,  372,   41,  374,  375,   44,  125,   46, 1262, 1263, 
-         1264,  358,  124,    2,  310,  362, 1067,   44,  279,  280, 
-           44,   93,   61,   44, 1190,  125,   15,   16,  267,   44, 
-           44,   44,   44,   44,   46,  367,   93,  811,  271,  371, 
-          372,  280,  374,  414,  279,  280,   59,   41,   61,  320, 
-          321,   93,   91,  125,  125,  347,  348,  428,  313,  314, 
-          315,  316,  433,  320,   53,   54,   40,   93,   58,  271, 
-          306, 1237,  308,  309,  310,  311,  312,   93,   67,   91, 
-         1334, 1247,  125,   44,  123,   70,  347,  348,  956,  124, 
-          958,  561,  328, 1259, 1260, 1261,  467,  867,  933,  934, 
-          371,  372,  876,  877,  475,  258,  342,  367,  347,  348, 
-          367,  124,  347,  348,  371,  372,  352,  488,  522,  954, 
-          955,  357,  358,  359,  526,  279, 1221,  279,  117,  964, 
-          119, 1290,  121,  122, 1285,  306,   10,  308,  309,  310, 
-          311,  312,  674,  262,  263,  264, 1316, 1197,  120,  268, 
-          269,  328,  271,  772,  913,  526,  764,  328,  932, 1132, 
-          279,  776,  306, 1320,  308,  309,   40,  311,  345,  346, 
-          944,  945,   46,  544,    0, 1367,  950,  951,  845,  411, 
-           44,  352,   46,  957,   10,   59,  357,  358,  359,   88, 
-          262,  263,  264,  347,  348,  267,  268,  269,   44,  271, 
-           46,  975,  976,  322, 1366,  324, 1185,  279,  352,  281, 
-          282, 1183,   10,  987,  100,   41, 1193,   91,   44,  291, 
-          292,  967,  294,  295,  296,  297,  298,   91,  599,  600, 
-         1348,  602,  603,   59, 1193,  514,  225, 1281,  609,  312, 
-          279,  280,  328,   41,   -1,   91,   44,   10,  619,  123, 
-          322,  370,  324,   -1,   -1,  328,   -1,   -1,  247, 1033, 
-          320,  250,  251,   61,  253, 1039,   -1,  279,   44,  258, 
-           46, 1045,   -1,   -1, 1048,   -1,  306,   40,  308,  309, 
-          310,  311,   -1,   46,  356,  358,   -1,  276, 1062,  362, 
-           10,   -1,   -1,   -1,   -1,   56,   59, 1071,  370,  125, 
-          671,  320,   -1,   -1,  675,  676,  677,  367,  347,  348, 
-           -1,  371,  372,   10,  685,   91,  687,   -1,   -1,   -1, 
-           40,   41,  693,   -1,   44,  320,   46,   -1,   91,   -1, 
-          701,   -1,  703,  704,   -1,  347,  348,  320,   -1,   -1, 
-           44,   61,   46,   40,   41,  320,   -1,   44,  367,   46, 
-           -1,   -1,  371,  372,  343,  344,  345,   -1,  320,   -1, 
-          123,  732,   -1,   -1,   61,   -1, 1140,   -1,   10,   -1, 
-         1144,   91,  367,   -1, 1148,   -1,  371,  372,  367,   -1, 
-          369,  370,  371,  372,  367,  374,  375,   91,  371,  372, 
-           -1,   -1,  367,  267,   91,   -1,  371,  372,   40,   -1, 
-           -1,   -1,   44,  123,   46,  367,  280, 1181,   -1,  371, 
-          372,   -1,   -1,   -1,   -1,  279,   -1,   59,   -1, 1287, 
-           -1, 1289,   -1,   -1, 1198,  414,  123, 1201,   44,   -1, 
-           46,   -1,   -1,  279,   -1,   -1,  262,  263,  264,  428, 
-          811,  267,  268,  269,  433,  271, 1220,   -1,   -1,   91, 
-           -1,   -1,   -1,  279,   -1, 1023, 1024, 1231,   -1,   -1, 
-           10,   10,  223,   -1,   -1,  226,  227,  228,  294,  295, 
-          296,  297,  298,  347,  348,   91,   -1,   -1,  467,   -1, 
-            2,  123,  124,  347,  348,   -1,  475,   40,   38,   -1, 
-           -1,   44,   42,   46,   -1, 1363,  322,   46,  324,  488, 
-           -1,  347,  348,  279,  267,  876,  877,   -1,   -1,   59, 
-           59,   61,   -1,   -1, 1288,   -1,   10,  280,   -1, 1293, 
-         1294,   -1,   -1, 1297,   -1,  351,   -1,   10,   -1,   -1, 
-           -1,   53,   54,   -1,   -1,   57,   -1,  526,   91,   -1, 
-           -1,   -1,   91,   -1,  370,   -1,   40,   41,   -1,   -1, 
-           44,   -1,   46,   -1,   -1,  544,   -1,   40,   10,  279, 
-          280,  932,   -1,   46, 1338,   -1,   88,   61,   -1,   -1, 
-          123,  347,  348,  944,  945,  279,   59,   -1,   -1,  950, 
-          951, 1149,  279,  280,  347,  348,  957,   -1,    0,   -1, 
-          112,   -1,   -1,   -1,   46,   -1,   -1,   91,   10,   -1, 
-           -1,  123,  124,   -1,  975,  976,   -1,   59,   91,   -1, 
-          599,  600,   -1,  602,  603,   -1,  987,   -1,   -1,   -1, 
-          609,   -1,   -1, 1191, 1192, 1193,   -1,  347,  348,   41, 
-          619,   -1,   -1,   -1,   46,   -1,   -1,   -1,  280,   91, 
-          123,   -1,   -1,  347,  348,  308,  309,   59,  311,   -1, 
-          347,  348,   -1,   -1,   -1,  318,  319,   -1,   10,   -1, 
-           -1,   -1, 1033,  279,   -1,   -1,   -1,   -1, 1039,   -1, 
-         1023, 1024,   -1,   -1, 1045,   -1,  306, 1048,  308,  309, 
-          310,  311,  671,   -1,   -1,   -1,  675,  676,  677,   41, 
-           -1, 1062,   44,   -1,   46,    2,  685,   -1,  687,   -1, 
-         1071,   -1,   -1,  225,  693,  347,  348,   -1,   10,   61, 
-           -1,    0,  701,  125,  703,  704,   -1,   -1,  267,   -1, 
-           -1,   10,  352,   -1,   -1,  486,  279,  280,   -1,  490, 
-           -1,  347,  348,  494,   -1, 1303,  258, 1090, 1091,   91, 
-           -1, 1094,   -1,  732,   46,   -1,   53,   54,   -1,   -1, 
-           57,   -1,   41,   -1,  276,   44,  306,   59,  308,  309, 
-          310,  311,  312,  294,  295,  296,  297,  298,  529, 1140, 
-           59,   -1,  533, 1144,   -1, 1128,   -1, 1148,  328,   -1, 
-           -1,   88,   -1,   -1,  267,  279,  308,   -1,   -1,   91, 
-           -1,   -1,  342,   -1,  347,  348, 1149,  280,  347,  348, 
-           -1,   -1,  352,   -1,   93,  112,   -1,  357,  358,  359, 
-         1181,   -1,   -1,   -1, 1167,  267,  123,  124, 1171,    2, 
-           -1,  343,  811,  345,   -1,   -1,   44, 1198,   46,  590, 
-         1201, 1184, 1185, 1186, 1187,   -1,  125,   -1, 1191, 1192, 
-           -1, 1194,   -1,   -1,   -1,  367,   -1,   -1,   -1, 1220, 
-          262,  263,  264,  347,  348,  267,  268,  269,   -1,  271, 
-         1231,   -1,   -1,   10,  347,  348,   -1,  279,   -1,  281, 
-           53,   54,   -1,   91,   57,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,  876,  877,   -1, 
-           -1,   -1,   -1,   40,   41,  347,  348,   44,   -1,   46, 
-           -1,   -1,   -1,   10,   -1,   88,  428,  429,   -1,   -1, 
-          322,  433,  324,   -1,   61,  676,  677, 1288,  225,   -1, 
-           -1,   -1, 1293, 1294,   -1,   -1, 1297,  279,   -1,  112, 
-           -1,   -1,   -1,   40,   41,  347,  348,   44,   -1,   46, 
-          123,  124,   -1,  932,   91,   -1,   -1,  708,   -1, 1302, 
-           -1,  258, 1305,   -1,   61,  944,  945,   -1,  370,   -1, 
-         1313,  950,  951,   -1,  725,  267,  727, 1338,  957,  276, 
-           -1,   -1,   -1,  262,  263,  264,  123,   -1,  267,  268, 
-          269,   -1,  271,   -1,   91,   10,  975,  976,   -1,   -1, 
-          279,   -1,  281,  282,  283,  347,  348,   -1,  987,   -1, 
-           -1,  308,  291,  292,  526,  294,  295,  296,  297,  298, 
-           -1,   -1,   -1,   -1,   -1,   40,  123, 1370,   -1,   44, 
-          781,   46,   -1,   44,  546,   46,  306,   -1,  308,  309, 
-          310,  311,   -1,  322,   59,  324,  343,   -1,  345, 1197, 
-           -1,   -1,  225,   -1, 1033,  347,  348,   -1,   -1,   -1, 
-         1039,   -1,   -1,   -1,   -1,   10, 1045,   -1,   -1, 1048, 
-          367,  279,  351,   -1,   -1,  826,   91,  356,   -1,   10, 
-           91,   -1,   -1, 1062,   -1,  258,   -1,  599,   -1,   -1, 
-          602,  370, 1071,   -1,  373,   -1,   41,  848,   -1,   44, 
-           -1,   46,   -1,  276,   -1,   -1,    2,  619,  123,  124, 
-           41,   -1,   -1,   44,   -1,   46,   61,   -1, 1023, 1024, 
-           10,   -1,  873,   -1,   -1,   -1,   -1,    2,   -1,   -1, 
-           61,  428,  429,   -1,   -1,  308,  433,   -1,   -1,  347, 
-          348,   -1,  279,  280, 1197,   -1,   91,   -1,   -1,   -1, 
-           -1,   41,   -1,   -1,   44,   -1,   46,   53,   54,  671, 
-           91, 1140,   -1,  675,  676, 1144, 1314,  679, 1316, 1148, 
-          343,   61,  345,  685,   -1, 1323,   -1,   -1,   53,   54, 
-           -1,  693,  279,  280,   -1, 1090, 1091,   -1,   -1, 1094, 
-           -1,  703,  704,   -1,  367,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91, 1181,   -1,   10,   -1,   -1,   -1,   -1,   10, 
-          347,  348,  963,   88,   -1,   -1,   -1,   -1,  969, 1198, 
-           -1,   -1, 1201, 1128, 1372,   -1, 1374,   -1, 1376,  526, 
-         1378,   -1,  983,  745,   40,   -1,   -1,   -1,   -1,   10, 
-           46, 1220,  754,   -1, 1149,   46, 1394,   -1,  999,  546, 
-          347,  348, 1231,   59,   -1,  428,  429,   -1,   59,   -1, 
-          433, 1314, 1167, 1316,   -1,  280, 1171, 1320,  279,   40, 
-         1323,   -1,   -1,   -1,   -1,   46,   -1,   10,   -1, 1184, 
-         1185, 1186, 1187,   -1,   -1,   91, 1191, 1192,   59, 1194, 
-           91,   -1,   -1,   -1,   -1, 1046,   -1,   -1,   -1,  811, 
-           -1,   -1,  599,   -1,   -1,  602,   -1,   -1,   -1, 1288, 
-         1061,   -1,   -1,   46, 1293, 1294,   -1,  123, 1297, 1372, 
-           91, 1374,  619, 1376,   -1, 1378,   59,   -1,    0,  225, 
-           -1,   -1,  347,  348,  279,   -1,  347,  348,   10,   -1, 
-           -1, 1394,   -1,   -1,   -1,   -1,   -1,   -1,  279,  861, 
-          225,   -1,  123,  526,   -1,   -1,   -1,   -1,   91, 1338, 
-           -1,   -1,  258,   -1,   -1,  877,   -1,   -1,   -1,   41, 
-           -1,   -1,   44,  546,  671,   10,   -1,   -1,  675,  676, 
-          276,   -1,  679,  258,   -1,   -1,   58,   59,  685,  279, 
-          306,   63,  308,  309,  310,  311,  693, 1302,   -1, 1150, 
-         1305,  276,  347,  348,   -1,   40,  703,  704, 1313,   44, 
-           -1,   46,   -1, 1023, 1024,   -1,  347,  348,   -1,   -1, 
-           -1,   93,   -1,   -1,   59,   -1,  599,   -1,   -1,  602, 
-           -1,   -1,  944,  945,   -1,   -1,  352,   -1,  950,  951, 
-           -1,  357,   -1,   -1,   -1,   10,  619,  343,  745,  345, 
-           -1,   -1,   -1,  125,   -1,   -1,   91,  347,  348,   -1, 
-           -1,  267,   -1,  975,   -1, 1370,  267,   -1,  343,   -1, 
-          345,  367,   -1,   -1,  280,  987,   -1,   -1,   -1,   -1, 
-           -1,   46,   -1,   -1, 1094,   -1,   -1,   -1,  123,  124, 
-           -1,   -1,  367,   -1,   59,   -1,  267,   -1,  671,   -1, 
-           -1,   -1,  675,  676,   -1,   -1,  679,   10,   -1,  280, 
-           -1,   -1,  685,   -1,  811,   -1,   -1,   -1, 1128,   -1, 
-          693, 1033,   -1,   -1,   -1,   -1,   91, 1039,   -1,   -1, 
-          703,  704,  428, 1045,  267,   10, 1048,  433,   -1, 1149, 
-           -1,  347,  348,   46,   -1,   -1,  347,  348,   -1,   -1, 
-         1062,   -1,   -1,  428,   -1,   -1,   59, 1167,  433, 1071, 
-           -1,   -1,   -1,   38,  861,   40,   -1,   42,   -1,   -1, 
-           -1,   46,  745,   -1, 1184,   -1,  347,  348,   -1,   -1, 
-          877, 1191, 1192,   -1,   59,   -1,   61,   -1,   91,   -1, 
-          262,  263,  264,   10,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
-          282,  283,   -1,   -1,  347,  348,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1, 1140,   46, 
-          526,   -1, 1144, 1145,   -1,   -1, 1148,   38,  811,   40, 
-           -1,   42,   59,   -1,   -1,  280,   -1,  944,  945,   10, 
-          322,  526,  324,  950,  951,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  335,  336,   -1,   -1,  339,  340,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,  975,  351, 
-           41,   -1,   -1,   44,  356,   46, 1198,   -1,  861, 1201, 
-          987,   -1,   -1,   -1,   -1,   -1,   -1,    0,  370,   -1, 
-           61,  373,  267,  599,  877,   -1,  602,   10, 1220,   -1, 
-           40,   -1,  347,  348,   44,   -1,   46,   -1,   -1, 1231, 
-           -1,   -1,   -1,  619,  599,   -1,   -1,  602,   -1,   -1, 
-           91,   -1,   -1,   -1,   -1,   -1, 1033,   -1,   41,   -1, 
-           -1,   44, 1039,   -1,  619,   -1,   -1,   -1, 1045,   -1, 
-           -1, 1048,   37,   38,   -1,   -1,   59,   42,   43,   -1, 
-           45,   91,   47,   -1,  267, 1062,   -1,   -1, 1280,   -1, 
-           -1,  944,  945,   -1, 1071,  671,   -1,  950,  951,  675, 
-          676,   -1,  347,  348,   -1, 1297,   -1,   -1,   -1,  685, 
-           93,   -1,   -1,  123,   -1,   -1,  671,  693,   -1,   -1, 
-          675,  676,  975,   -1,   -1,   -1,   -1,  703,  704,   94, 
-          685,   -1,   -1,   -1,  987,   -1,   -1, 1329,  693,   -1, 
-           -1,   -1,  125,   -1,   -1,   10, 1338,   -1,  703,  704, 
-           -1,  306,   -1,  308,  309,  310,  311,  312,   -1,  124, 
-           -1,   -1,   -1, 1140,  347,  348,   -1, 1144, 1145,   -1, 
-          267, 1148,   -1,  328,   -1,   -1,   41,   -1,   -1,   44, 
-         1033,   46,   -1,   10,   -1,   -1, 1039,  342,   -1,   -1, 
-           -1,   -1, 1045,  348,   -1, 1048,   61,  352,   -1,   -1, 
-           -1,   -1,  357,  358,  359,   -1,   -1,   -1,   -1, 1062, 
-           -1,   -1,   -1,   41,   41,   -1,   -1,   44, 1071,   46, 
-           -1, 1198,   -1,   -1, 1201,  306,   91,  308,  309,  310, 
-          311,  312,   -1,   -1,   61,  811,   -1,   -1,  279,   -1, 
-           -1,   -1,   -1, 1220,   -1,   -1,   -1,  328,   -1,   -1, 
-          347,  348,   -1,   -1, 1231,   -1,  811,   -1,   -1,   40, 
-           -1,  342,   -1,   44,   91,   46,   -1,   -1,   -1,  279, 
-          280,  352,   -1,   -1,   -1,   -1,  357,  358,  359,  262, 
-          263,  264,   -1,   -1,  267,  268,  269, 1140,  271,   -1, 
-           -1, 1144, 1145,   -1,   -1, 1148,  279,  125,  281,  282, 
-           10,  877,   -1, 1280,   -1,   -1,  347,  348,  291,  292, 
-           91,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
-         1297,   -1,  877,   -1,   15,   16,   -1,   -1,   38,   -1, 
-           40,   -1,   42,   -1,   -1,   -1,   46,  347,  348,  322, 
-           -1,  324,  123,   -1,   -1, 1198,   -1,   -1, 1201,   59, 
-           -1,   61, 1329,   -1,   -1,   -1,   -1,   48,   49,   50, 
-           51, 1338,   -1,  328,   55,   56,   -1, 1220,  944,  945, 
-           -1,   -1,   -1,  356,  950,  951,   67,   68, 1231,   -1, 
-          345,  346, 1023, 1024,   -1,   -1,   -1,  370,   -1,  944, 
-          945,   -1,   -1,   -1,   -1,  950,  951,   -1,   -1,  975, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  987,   -1,   -1,  279,   -1,   -1,   -1,   -1,   -1, 
-          975,   -1,   -1,   -1,   -1,   -1,  117, 1280,   -1,   -1, 
-           -1,   -1,  987,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   -1,  271, 1297,   -1,   -1,   -1,   -1, 1090, 
-         1091,  279,  279, 1094,   -1,   -1,   -1, 1033,   -1,   -1, 
-           -1,   -1,   -1, 1039,   -1,   -1,   -1,   -1,   -1, 1045, 
-            0,   -1, 1048,   -1,   -1,   -1, 1329,   -1, 1033,   -1, 
-           10,   -1,  347,  348, 1039, 1338, 1062, 1128,   -1,   -1, 
-         1045,   -1,   -1, 1048,  322, 1071,  324,   -1,  279,  280, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1, 1062, 1149,   -1, 
-           -1,   41,   -1,   -1,   44,   -1, 1071,   -1,   -1,   -1, 
-          347,  348,   -1,   -1,   -1,   -1, 1167,   10,   -1,   59, 
-         1171,   -1,  223,   -1,   -1,  226,  227,  228,   -1,  230, 
-           -1,   -1,  370, 1184, 1185, 1186, 1187,   -1,   -1,   -1, 
-         1191, 1192,   -1, 1194,   -1,   -1,  247,   -1,   41,  250, 
-           -1,   44,   -1,   46, 1140,   -1,  347,  348, 1144,   -1, 
-           -1,   -1, 1148,   38,   -1,   -1,   -1,   42,   61,   -1, 
-           -1,   -1,   -1,   -1,   10, 1140,   -1,   -1,   -1, 1144, 
-         1145,   -1,   -1, 1148,   -1,  125,  306,   -1,  308,  309, 
-          310,  311,  312,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
-           -1,   -1,   38,   -1,   40,   -1,   42,   -1,  328,   -1, 
-           46,   -1, 1198,   -1,   -1, 1201,   -1,   -1,   -1,   -1, 
-           -1,   -1,  342,   59,   -1,   61,   -1,   -1,  348,   -1, 
-           -1,   -1,  352, 1198, 1220,   -1, 1201,  357,  358,  359, 
-           -1,   -1,   -1,   -1,   -1, 1231,   -1,   -1,   -1,   -1, 
-           -1, 1302,   -1,   -1, 1305, 1220,   -1,   -1,   -1,   -1, 
-           -1,   -1, 1313,   -1,   -1,   -1, 1231,   -1,   -1,   -1, 
-           -1,    0,   -1,   -1,   -1,   -1,  377,  378,  379,  380, 
-          381,   10,   -1,  384,  385,  386,  387,  388,  389,  390, 
-          391,   -1,  393,   -1,   -1,  396,  397,  398,  399,  400, 
-          401,  402,  403,  404,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10, 1297,   41,  414,   -1,   44,  417,   10,   -1, 1370, 
-           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           59,  271, 1297,   -1,   -1,    0,   -1,   -1,   -1,  279, 
-           -1,   41,   -1,   -1,   44,   10,   46,   -1,   41,   -1, 
-           -1,   44, 1338,   46,  294,  295,  296,  297,  298,   -1, 
-           -1,   61,   -1,   -1,   93,   -1,   -1,   -1,   61,   -1, 
-           -1,   -1,   -1, 1338,  475,   -1,   41,   -1,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,  486,  279,  488,   -1,  490, 
-           -1,   91,   -1,  494,   59,   -1,  125,  498,   91,   -1, 
-           -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-           -1,  351,   -1,   -1,   10,  516,   -1,  518,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  529,   -1, 
-          370,  306,  533,  308,  309,  310,  311,  312,   -1,   -1, 
-           -1,   37,   38,  544,   -1,   41,   42,   43,   44,   45, 
-           46,   47,   -1,  328,  347,  348,   -1,   -1,   -1,   -1, 
-          125,   -1,   58,   59,   60,   61,   62,   63,   -1,   -1, 
-          306,   -1,  308,  309,  310,  311,  312,  352,   -1,   -1, 
-           -1,   -1,  357,  358,  359,   -1,   -1,   -1,   -1,  590, 
-           40,   -1,  328,   -1,   44,   91,   46,   93,   94,  600, 
-           -1,   -1,  603,   -1,   -1,   -1,  342,   -1,  609,   -1, 
-           -1,   -1,  348,   -1,   -1,   -1,  352,   -1,   -1,   -1, 
-           -1,  357,  358,  359,   -1,   -1,   -1,  123,  124,  125, 
-           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   91,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          279,   -1,  281,  282,   -1,   -1,   -1,   -1,   -1,   -1, 
+            2,   60,   59,  459,   13,   14,  779,   98,  783,   90, 
+            7,   87,    7,  337,   53,   54,   15,   16,  342,  598, 
+          416,  121,  122,  112,   27,   99,  342,   64,   65,   66, 
+           27,  105,   27,    2,    2,   15,   16,   21,   57,  496, 
+          121,  337,  119,  470,  121,  122,  342,   15,   16,  101, 
+          883,   53,   54,   55,   56,  415,   55,  783,  418,  247, 
+          761,  242,   59,  120,  415,  575,  426,  418,  289,   88, 
+           15,   16,  293,   38,  126,  426,   53,   67,  492,   10, 
+          537,   10,   84,   85,  603,   53,   54,  606,   46,   57, 
+           57,  121,  585,  112,  490,  550,  589,  879,   10,   67, 
+           44,   47,   15,   16,  123,  124,  607,  927,   10,  492, 
+           10,  326,  327,  496,   40,   10,  125,  101,  117,  533, 
+           88, 1310,  283,  120,  781,  283,   40,  607,   59,  489, 
+           59,  491,   10,  640,   10,   32,   90,  117,  489,   41, 
+          491,  681,   55,   56,  112,  821,  926,   59,   10,  117, 
+          278,  119,  548,  121,  122,  123,  124,   59,   10,   26, 
+           10,   28,  236,  523,  524,   91,   44,    0,  123,  310, 
+          229,   10,  117,  524,  251,   46,  253, 1185,   38,  263, 
+          264,   59,  673,   59,   59,  269,  225,  547,  707,  549, 
+         1198,   46, 1381,   10,   32,  269,    0,   59,  549,  280, 
+           37,   41,   46,  123,  117,   42,   43, 1038,   45,   59, 
+           47,   60,  373,   62,  715,  373,  779,  613,  781,  123, 
+           59,  310,  124,  225,   41, 1037, 1038,   44,  683,  231, 
+          232,  123,   40,   46,  714,  715,   91,   10,  322,  278, 
+          314,  742,   59, 1211,   61,  247,  346,   91,  247,  124, 
+          280,  250,  612, 1026,  614,  306,  258,  225,   10,  310, 
+         1328,  771,  772,  614,  266,  267, 1086,  247,   41,  346, 
+          250,  371,  372,  373,  374,  732,  278,  704,   91,  247, 
+           10,  265,  250,  251,  124,  253,  270,  361,   61,  258, 
+          258,  310,  125,   37,  371,  372,  373,  374,   42,  376, 
+          377,  278,  430,   47,   10,  250,  345, 1087,  347,  705, 
+          278, 1037, 1038,  320,   10,  123,  730,  993,  324, 1327, 
+         1288,  125, 1390,  504,   10,  280,  280,  263,  264,   59, 
+           10,   10, 1163, 1166,   40,  362,  267,  250,   44,  830, 
+           46,   93,  310,  345,  704,  347,  706,  730,  563,  732, 
+          565, 1163,  264,   59,  282,  706,  268,  269,   44,  938, 
+          367,   41,  308,   59,  370, 1022,   37,  886,   40,  469, 
+          877,   42,   43,   59,   45,  456,   47,  345,  346,  347, 
+           59,  283,   46,  675, 1166,   91,  322,  679,  264,  267, 
+          348,  430,  469,  269,  359,  324,  291,  292,  264,  719, 
+          369,  369,  264,  371,  372,  373,  374,  351,  376,  377, 
+          322, 1112,  431,   93,  416,  870,  926,  927,  124,  833, 
+          351,  418,  348,  320,  263,  264,  456,   91,  430,  426, 
+          350,  281,  299,  435,  418,  755,  416, 1163,  931,  932, 
+          933,  370,  935,  983,  945,  306,  322,  940,  416,  310, 
+          833,  351,  312,  430,  746,  779,  322,  781,  350, 1022, 
+          322,  550,  430,  431,  431,  945,  283,  435,  328,   85, 
+           46,  373,  280,  351,  371,  372,  347,  348,  477, 1205, 
+         1206, 1207, 1001,  322,  333,  334,  320,   93,  490,   10, 
+           10,  328,  347,  348,  491,  815,  264,  477,  358,  359, 
+           46,  469, 1316,  347,  348, 1319,  279,  491,  350,  477, 
+          490,   10,  515,   46, 1015,   91,   10,   10,  515,  125, 
+          515,   41,  490,   44,  605, 1205, 1206,  524,  609,  350, 
+          751,  550,  477,  367,  347,  348,   10,   10,   10,  615, 
+          524,   61,  730,  999,  725,   91,  548, 1380,   41,  764, 
+           61,   44,  549,  768,  322, 1012,  373, 1330,   91, 1334, 
+           59,   10,  530,  977,  477,  549,   59,   41,  548,   41, 
+          890,  267,   44,   10,   10,  971, 1086, 1087,   56,  492, 
+          548,  267,  550,   10,  328,   59,   59,   59,  267,   44, 
+           61, 1317,   41,  320,  683, 1088, 1089, 1090, 1091,   93, 
+           10,  603,   46,   10,  606,   41,   61,   40, 1334,  661, 
+          970,  613,  972, 1386,  691, 1071,  232,  614,  670,  970, 
+          533,  972,   10,   59,  604,  125,  678,  607,   10, 1012, 
+          614,  124,   59,  613,   41,  603,  604, 1317,  606,  607, 
+          367,  347,  348,   46, 1108,  613,   10,   91, 1211,   59, 
+          689,  267,  124,   41,  623,  623,   93,  328,  697,   41, 
+          737,   41,   44,  752,  683,  957,  958,   44,  670,  708, 
+           10,  963,  964,   61,  345,  346,  678,  661,   44, 1106, 
+           44,  680,  681,  347,  348,  675,  670,  689,   91,  679, 
+          680,  681, 1016, 1212,  678,  697,  312,  124, 1022,   10, 
+         1016,   41,   40,  705, 1160,  707,  708,  675,  711,  706, 
+         1289,  679,  680,  681,  711,  683,  711, 1296,   10,  310, 
+         1016,  689,  706,  691,  905,  705,  351,  764,  765,  697, 
+           41,  768,  769,  752,  714,  715, 1056,  705,   44,  707, 
+          708, 1205, 1206,  745,  124,  223,  714,  715,  226,  227, 
+          228,   10,   44,   93,  350, 1047,  746, 1250, 1082,  279, 
+          744,  745,  853, 1037, 1038, 1328, 1082, 1330,  267,  737, 
+           44,  347,  348,  847,  641, 1202,   10,   10,  746,  818, 
+         1236,  870,   10,  350,  752,  885, 1082,   46, 1108,  675, 
+          283,  264, 1311,  679,  680, 1374,  269,  320,  665,   10, 
+           59,  347,  348,  884,   10,   10,  279,   41,  885,  283, 
+           44,  283,  312,   41,  347,  348,  818,  730,  320,  876, 
+         1185,  271,  320,  320,  279,   59,   59, 1390,  328,  279, 
+         1104, 1105,   91,   61, 1108,   41,   41,  271,   44,   44, 
+           46,   61,   10, 1208,  367,  279,   10,  283,   59,  322, 
+          818,  870,  719,   40,  264,   61,   61,   41,  358,  269, 
+          746,  271,  362, 1183, 1184,  367, 1037, 1038, 1142,  367, 
+          872,  873,   40,   41,  371,  372,   44,  374,   46,  876, 
+          373,  883,  288, 1203,  886,   91,  269, 1211,  755, 1163, 
+          990,  279,  125,   61,  350,   59,  279,   10,   10,  373, 
+          306,  373,  870,  347,  348,  914, 1302, 1181,   10,   10, 
+           40, 1185,  322,  990,   44,  328,   46,  885,  886,  328, 
+          833, 1002,   93,   91, 1198, 1199, 1200, 1201,   10,   41, 
+          797, 1205, 1206,   10, 1208,   10,   10,  373,  310,   41, 
+           41, 1301,   10, 1303,  347,  348,   59,   10,  815,   61, 
+          989, 1316, 1303,    0, 1319,  123, 1276, 1277, 1278,   41, 
+           61,   91, 1327,   10,   41,  945,   41,  957,  958,  971, 
+           44,   10,   40,  963,  964,  972,   10,  945,   41,   61, 
+          125,  983,   10,  288,  983,   59,   61,  989,  972,  957, 
+          958,  971, 1163,  291,  292,  963,  964,   41,   61, 1001, 
+           32,  306,   41,  971, 1328,   61, 1330,   41,  267,   44, 
+          488,  124,   59,   41,  492,   59,    2, 1377,  496, 1384, 
+           59,  989,  990,  890,  269,   10,  271,  310, 1348,   15, 
+           16, 1040, 1041, 1001, 1205, 1206, 1207, 1076,    0,   10, 
+          781,  908, 1316,   61,  785, 1319, 1085,  783,   10,  283, 
+          124,  279, 1111, 1327,  790,  533,   41, 1047,   10,  537, 
+          268,  269, 1064,   30, 1066,   93, 1390,   53,   54, 1059, 
+           41,  957,  958,  279, 1076,   10,   61,  963,  964, 1047, 
+          279,   67,   10, 1085, 1053, 1053,  339,  340,  347,  348, 
+           61, 1059,   44, 1062, 1062, 1195,   10,   59,  262,  263, 
+          264,   10,  953, 1104, 1105,  269,   41,   59, 1076,   61, 
+         1384,  279,  280,   41,   10, 1154,  594, 1085, 1195, 1158, 
+           10,  832,   85, 1162,   59,  356,   40,   41,  285,  840, 
+           44,  117,   46,  119,   10,  121,  122,   46,   44,  373, 
+         1159,  347,  348, 1145, 1146,   41, 1317,   61,   59,  279, 
+           59,  652, 1154,  654,   44,   60, 1158, 1231,  322,  350, 
+         1162, 1047,   10,  125, 1166,   44,  123,   46,   44,   59, 
+           10,    2,  124, 1059,  320,  321, 1215,   91,  279,  347, 
+          348,   44,   91,   59,   15,   16, 1154,  294,  295, 1056, 
+         1158, 1159,   61,   41, 1162, 1234,  824,  279,  826, 1200, 
+         1201,   61,  680,  681,  279,   44, 1245, 1307, 1308,  123, 
+         1212,   41,   91, 1215,  123,  125,  279,  347,  348,   59, 
+         1279, 1072,   53,   54,   61,  371,  372, 1195, 1037, 1038, 
+         1307, 1308, 1234, 1235,  124,  713,   67,  955,  956,  225, 
+           10, 1108, 1109, 1245, 1212,   37,   38, 1215,  124,   10, 
+           42,   43,  730,   45,  732,   47, 1107,   61, 1109,  311, 
+          312,  247,   41,  308,  250,  251, 1234,  253,  231,  232, 
+           44,   41,  258,  318,  319, 1294,   10, 1245,   44,   44, 
+           41, 1022,   44, 1024,  124,   44,  117, 1028,  119,  256, 
+          121,  122,  278,   10,  279,  312,   10, 1299,   59, 1108, 
+         1302, 1168, 1304,  266,  267,   44, 1303, 1198,  279, 1311, 
+          788,  328,   46, 1352, 1205, 1206, 1183, 1184,  306, 1303, 
+          477,  350, 1302,   40, 1343,   59, 1294,   41,  306,   46, 
+           44,   44,   46, 1142, 1302,  125, 1203,  350,  350, 1307, 
+         1308,  358,   59, 1311, 1211,  362,  503,   61,   44,  506, 
+         1352,  508, 1203, 1204, 1163,  833,  320,   91,  267,  345, 
+          346,  347,  279,  267,  125,  279,  280,  350,  271,   10, 
+          527,  280, 1181,  350,   91, 1343,  350,   91, 1380,  857, 
+          350,   61,   44,  369, 1352,  371,  372,  373,  374, 1198, 
+          376,  377,   44,   58,  225,  610, 1205, 1206,  298,   40, 
+          279,  298,  675,  367,  882,   46,  679,  371,  372, 1276, 
+         1277, 1278,  350,  125,   10,   93,  247,  310,   59,  250, 
+          251, 1288,  253,   61,  298,  582,  306,  258,  308,  309, 
+          416,  311, 1173,  347,  348,   44,  651,  298,  347,  348, 
+          655,   10,   38,  262,  430,  320,   42,  278,  269,  435, 
+           91,  125,  350,  726,   44,  728,  423,   44,   44,   44, 
+          427,  428,  429,   59,   44,   61,  125,   44,  347,  348, 
+         1211,  686,  352,  746,  306, 1211,   44,   46,  263,  351, 
+           44, 1348,  123,  469,  294,  295,  296,  297,  298, 1356, 
+           59,  477,  367,  306,  124, 1362,  371,  372,   44,  977, 
+           44,  262,  263,  264,  490,  983,  124,  268,  269,   44, 
+          271,   46,   44,  351,  345,  346,  347,  125,  279,  997, 
+          306,  310,   91,   41,   44,  682,  320,   44,  495,   59, 
+           10,  498,  499,  267, 1012,   44,  328,   44,  369,   10, 
+          371,  372,  373,  374,  530,  376,  377,   44,   44,  516, 
+          267,   44,  709,  345,  346,   10,   91,  124,  525,   44, 
+           40,  322,  548,  324,   44,  279,   46,   38,   44,  125, 
+           46,   42,  124,  367,   10,  310,   44,  371,  372,   59, 
+          374,  796, 1060,   44,   44,  416,   41, 1328,  803,   44, 
+           44,   46, 1328,   44, 1330,   44, 1337, 1075, 1334,  430, 
+          271, 1337,   93,   41,  435,   41,   61,   93,   44,  370, 
+           46,   91,  125,  347,  348,   91,   40,  603,  604,  776, 
+          606,  607,  895,   93,   58,   61,  267,  613,  320,  271, 
+          347,  348,   44,  347,  348,   93,   91,  623,  469,  280, 
+          565,  125,   70,  123,  124,  320,  477, 1388,  258, 1390, 
+         1386, 1392, 1388,  876, 1390,   91, 1392,  320,  124,  490, 
+          369,  526,  530,  878, 1235,  681,  881, 1408,  123, 1304, 
+         1299,  678, 1408, 1211,    2,  367,  891,  120, 1330,  371, 
+          372,  779,  374,  926,  957,  958, 1164,   15,   16,  675, 
+          963,  964,  367,  679,  680,  681,  371,  372,  267,  530, 
+          771,  320,  783,  689,  367,  691,  347,  348,  371,  372, 
+          306,  697,  308,  309,  310,  311,  312,  548,  875,  705, 
+          687,  707,  708, 1146, 1334,   53,   54, 1381,  714,  715, 
+          413,  854,  328,   88, 1007, 1008,  951, 1010, 1011,   67, 
+         1380,   10, 1199, 1197,  279,  712,  342, 1207,  367,  906, 
+          907,  737,  371,  372,  100, 1207,  352,  981, 1362,  320, 
+          746,  357,  358,  359,  946,  947,  516,  924, 1295,  320, 
+           -1,  986,  603,  604, 1047,  606,  607,   46,  347,  348, 
+          995,   -1,  613,   -1,   -1, 1000,  968,  969, 1003,  117, 
+           59,  119,  623,  121,  122,  320,  978,   -1,   -1,   -1, 
+          280,   -1,   -1,  279,   -1,   44,  367,   46, 1081,   -1, 
+          371,  372,  347,  348,   -1,   10,  367,   -1,   -1,   -1, 
+          371,  372,   91,   -1,  279,  280,   -1,   -1,   -1,   10, 
+           -1,   -1,  818,   -1,   -1,  306,   -1,  308,  309,  310, 
+          311,  312,  367,  279,  675,   40,  371,  372,  679,  680, 
+          681,   46,   91,   -1,   -1,   -1,  320,  328,  689,   -1, 
+          691,  828,  829, 1078,   59,   46,  697,  347,  348,  836, 
+          837,  347,  348,   -1,  705,   -1,  707,  708,   59,   -1, 
+           10,  352,   -1,  714,  715,   -1,  357,  358,  359,   -1, 
+          320,   -1,  347,  348,   -1,   -1,   91,  225,   10,  885, 
+          886,   -1,   -1,  367,   -1,   -1,  737,  371,  372,   10, 
+           91,  347,  348,   -1,   -1,  746,   46,   -1,   10,  247, 
+           -1,   -1,  250,  251,   -1,  253,   -1,   -1,  123,   59, 
+          258,   -1,  899,  900,   46,  902,  903,  367,   -1,   40, 
+           41,  371,  372,   44,   -1,   46,   -1,   59,   40,   41, 
+          278,   -1,   44,   -1,   46,   -1,   10,   -1,   -1,  945, 
+           61,   91,   -1,  308,  309,   10,  311,   -1,   -1,   61, 
+           -1,  957,  958,  318,  319,   -1,   -1,  963,  964,   91, 
+          313,  314,  315,  316,   -1,  971,   -1,  818,   -1,   -1, 
+           91,   -1,   46,   38,  961,   40,   -1,   42,  267,   91, 
+           -1,   46,   10,  989,  990,   59,  973,  306,   -1,  308, 
+          309,  310,  311,   -1,   59, 1001,   61,  345,  346,  347, 
+           -1,   -1,  123,   -1,  306,   -1,  308,  309,  310,  311, 
+           -1,  123,   40,   41,   -1,   -1,   44,   91,   46,   -1, 
+          279,  369, 1009,  371,  372,  373,  374, 1204,  376,  377, 
+           -1,   -1,   -1,   61,  885,  886,   -1,   -1,   -1,   -1, 
+           -1, 1047,   10,   -1,   -1,   -1,   -1, 1053,   -1,   10, 
+          352,   -1,  267, 1059,   -1,  357, 1062,   -1,  347,  348, 
+           -1,   -1,   -1,   91,   -1,  280,  267,   -1,  416,   -1, 
+         1076,   -1,   40,   10, 1251,   -1,   -1,   -1,   46, 1085, 
+           41,   -1,  430,   44, 1261,   46,   -1,  435,  347,  348, 
+           -1,   59,   -1,   -1,  945,  123, 1273, 1274, 1275,   -1, 
+           61,   38,    2, 1211,   -1,   42,  957,  958,   -1,   -1, 
+           -1,   -1,  963,  964,   -1,   15,   16,  267,   -1,   -1, 
+          971,  469,   59,   91, 1359,   -1,   -1,   -1,   -1,  477, 
+           91,   -1,  347,  348,   10,  267,   -1,   -1,  989,  990, 
+           10,   -1,  490,   -1,   -1,   -1,  347,  348, 1154,   -1, 
+         1001,   -1, 1158,   53,   54,  123, 1162,   57,  279,  280, 
+           -1,   -1,   38,   -1,   40,   -1,   42,  279,  280,   10, 
+           46,   41,   -1,   -1,   44,  306,   46,  308,  309,  310, 
+          311,   -1,  530,   59,   -1,   61,   -1,   -1,   88, 1195, 
+           -1,   61,   -1,  267,   -1,   -1, 1047,  347,  348,   -1, 
+          548,   -1, 1053, 1190,   -1,   46, 1212,   -1, 1059, 1215, 
+           -1, 1062,  112,   -1,   -1,  347,  348,  117,   59,   -1, 
+         1328,   91, 1330,  123,  124, 1076,  347,  348, 1234, 1337, 
+           -1,   -1,   10,   -1, 1085,  347,  348,   -1,   -1, 1245, 
+           -1,  306,   -1,  308,  309,  310,  311,  312,   -1,   -1, 
+           91,  279,  280,   -1,   -1,  603,  604,    0,  606,  607, 
+           -1,   -1,   -1,  328,   -1,  613,   -1,   10,   46,   -1, 
+           -1,   -1,   -1,  347,  348,  623,   -1,  342, 1386,   -1, 
+         1388,   59, 1390,  348, 1392,   -1,   -1,  352,   -1,   -1, 
+           -1,   -1,  357,  358,  359,   -1, 1302,   -1,   41,  267, 
+         1408, 1307, 1308, 1154,    0, 1311,   -1, 1158,   -1,   -1, 
+           -1, 1162,  280,   91,   10,   -1,   59,   -1,  279,  347, 
+          348,   -1,   -1,   -1,   -1,  225,   -1,  675,   -1,   -1, 
+           -1,  679,  680,  681,   -1,  306,   -1,  308,  309,  310, 
+          311,  689,   -1,  691, 1195,   41, 1352,  247,   44,  697, 
+          250,   -1,   -1,   -1,   -1,   -1,   -1,  705,  258,  707, 
+          708, 1212,   58,   59, 1215,   -1,  714,  715,   -1,  306, 
+           -1,  308,  309,  310,  311,  312,   -1,   -1,  278,  347, 
+          348,  352,  125, 1234,   -1,   -1,  347,  348,    2,  737, 
+           -1,  328,   10,   -1, 1245,   -1,   -1,   93,  746,   -1, 
+           -1,   15,   16,   -1,   -1,  342,   -1,   -1,   -1,  279, 
+          310,   -1,   40,   -1,   -1,  352,   44,   -1,   46,   10, 
+          357,  358,  359,   -1,   -1,   -1,  267,   -1,   46,  125, 
+          306,   10,  308,  309,  310,  311,  312,   -1,   -1,   53, 
+           54,   59,   -1,   57,   44,  345,   46,  347,   -1,   40, 
+           -1, 1302,  328,   44,   -1,   46, 1307, 1308,   -1,   -1, 
+         1311,   40,   -1,   91,   -1,   44,  342,   46,   59,  369, 
+          818,   -1,  348,   91,   88,   10,  352,  347,  348,   -1, 
+           59,  357,  358,  359,   -1,   -1,   -1,   -1,   -1,  267, 
+           -1,   91,   -1,   10,   -1,  123,   -1,   -1,  112,   -1, 
+           91, 1352,   -1,  117,   -1,   40,  347,  348,   -1,  123, 
+          124,   46,   91,   -1,   38,   -1,  416,   -1,   42,  262, 
+          263,  264,   -1,   40,   59,  268,  269,   -1,  271,   46, 
+          430,  431,  123,  124,   -1,  435,  279,  885,  886,   -1, 
+           -1,   -1,   59,   -1,  123,  124,   44,   -1,   46,   -1, 
+           -1,  294,  295,  296,  297,  298,   91,   -1,   10,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,  347, 
+          348,  267,  268,  269,   91,  271,   -1,  477,   -1,  322, 
+           -1,  324,   -1,  279,   -1,  281,  282,  283,  123,   -1, 
+          490,   -1,   -1,   91,   46,  291,  292,  945,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,  123,   59,   -1,  957, 
+          958,  225,   -1,   -1,   -1,  963,  964,   -1,   -1,   -1, 
+           -1,   -1,   -1,  971,   -1,   -1,  322,  370,  324,   -1, 
+          530,   -1,   -1,  247,   -1,   -1,  250,   -1,   -1,   91, 
+           -1,  989,  990,   -1,  258,   -1,   -1,   -1,  548,  267, 
+          550,  279,  280, 1001,   -1,  351,   -1,   10,   -1,   40, 
+          356,   -1,   -1,   44,  278,   46,   40,   -1,   -1,   -1, 
+           44,   -1,   46,   10,  370,   -1,   -1,  373,   -1,  279, 
+           -1,   -1,   -1,   -1,    0,   -1,   -1,   40,   41,  280, 
+           -1,   44,   -1,   46,   10,   -1,  310,   -1,   -1, 1047, 
+           -1,  280,   -1,  603,   41, 1053,  606,   44,   61,   46, 
+           91, 1059,   -1,  613, 1062,   -1,   -1,   91,   -1,  347, 
+          348,   -1,   -1,  623,   61,   41,   -1,   -1, 1076,  347, 
+          348,  345,  267,  347,   -1,   -1,   -1, 1085,   91,   -1, 
+           -1,   -1,  123,   59,   -1,  280,   -1,  347,  348,  123, 
+          267,   -1,    0,   -1,   91,  369,  347,  348,   -1,   -1, 
+           -1,   -1,   10,  280,   -1,   -1,   -1,   -1,  347,  348, 
+           -1,   -1,   -1,   -1,   -1,  675,   -1,   -1,   -1,  679, 
+          680,  279,  306,  683,  308,  309,  310,  311,  312,  689, 
+           -1,   10,   -1,   41,   -1,   -1,   44,  697,   -1,   -1, 
+           -1,   -1,  416,    2,  328,  705, 1154,  707,  708,  125, 
+         1158,   59,  347,  348, 1162,  267,  430,  431,  342,   -1, 
+           -1,  435,   41,   -1,   -1,   44,   -1,   46,  352,   -1, 
+          347,  348,   -1,  357,  358,  359,   -1,   -1,   -1,   -1, 
+           -1,   -1,   61,   -1,   -1,   93,  746, 1195,   -1,  347, 
+          348,   10,  752,   -1,   53,   54,   40,   44,   57,   46, 
+           44,   -1,   46,  477, 1212,   -1,   -1, 1215,   -1,   -1, 
+           -1,    0,   91,   -1,   -1,   -1,  490,  125,   -1,   -1, 
+           -1,   10,   41,   -1,   -1,   44, 1234,   46,   -1,   88, 
+           -1,   -1,   -1,   -1,   -1,  347,  348, 1245,  279,  280, 
+           -1,   -1,   61,   -1,   91,  279,  280,   91,   -1,   44, 
+           -1,   46,   41,  112,   -1,   44,  530,   -1,  818,   -1, 
+           -1,   -1,   -1,   -1,  123,  124,  279,   -1,    0,   -1, 
+           59,   -1,   91,   -1,  548,   -1,  550,   -1,   10,  123, 
+           -1,   -1,  279,   44,   -1,   46,  262,  263,  264,   -1, 
+            2,  267,  268,  269, 1302,  271,   91,   -1,   -1, 1307, 
+         1308,   -1,   -1, 1311,   -1,  281,  347,  348,   -1,   41, 
+          870,   -1,   44,  347,  348,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,  886,   59,  123,  603, 
+           91,   10,  606,   -1,  347,  348,  125,   -1,   -1,  613, 
+           -1,   53,   54,   -1, 1352,   -1,  322,   -1,  324,  623, 
+          347,  348,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   41,  271,   -1,   44,  225,   46,   -1,   -1, 
+           -1,  279,   -1,  281,  282,  283,   88,   -1,   -1,   -1, 
+           -1,   -1,   61,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,  125,  370,   -1,   -1,  957,  958,  258, 
+          279,  675,   -1,  963,  964,  679,  680,   -1,   38,  683, 
+           -1,  971,   91,   -1,  322,  689,  324,   -1,   -1,  278, 
+           -1,   -1,   -1,  697,   -1,   -1,   -1,   -1,   -1,  989, 
+           10,  705,  279,  707,  708,  279,  280,   -1,   -1,   -1, 
+           -1, 1001,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
+           -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          279,   41,  370,   -1,   44,  373,   46,   -1,  347,  348, 
+            2,   -1,  746,  262,  263,  264,   -1,   -1,  752,  268, 
+          269,   61,  271,   -1,  279,  280,  345, 1047,  347,   -1, 
+          279,   -1,   -1, 1053,   -1,   44,   -1,   46,   -1, 1059, 
+          347,  348, 1062,  347,  348,  294,  295,  296,  297,  298, 
+          369,   91,   -1,  225,   -1,   -1, 1076,   -1,  279,   -1, 
+           -1,   53,   54,   -1,   -1, 1085,   -1, 1211,  347,  348, 
+          262,  263,  264,  322,   -1,  324,  268,  269,   -1,  271, 
+           -1,   44,   91,   46,  818,   -1,  258,  279,   -1,   -1, 
+           -1,   -1,  347,  348,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  278,   -1,   -1,   -1, 
+           10,  430,  431,   -1,   37,   38,  435,   10,   -1,   42, 
+           43,  370,   45,   -1,   47,   -1,  347,  348,   91,   -1, 
+          322,   10,  324,   44, 1154,   46,  870,   -1, 1158, 1159, 
+          279,   41, 1162,   -1,   44,   38,   46,   40,   -1,   42, 
+           -1,   -1,  886,   46,   -1,   -1,   -1,   -1,   44,  351, 
+           46,   61,   41,   -1,   -1,   44,   59,   46,   61,   41, 
+           -1,   94,   -1,  345,   -1,  347,   -1,   -1,  370,   -1, 
+           91,   -1,   61,   -1, 1328,   -1, 1330,   -1,   -1,   -1, 
+         1334,   91, 1212, 1337,   -1, 1215,   -1,  369,   -1,   -1, 
+           -1,  124,   -1,   -1,   -1,   91,   -1,   -1,  347,  348, 
+           -1,  530,   91,   -1, 1234,   -1,  306,   -1,  308,  309, 
+          310,  311,  312,  957,  958, 1245,   -1,   -1,   -1,  963, 
+          964,  550,   -1,  225,   -1,   -1,   -1,  971,  328,  279, 
+           -1,   -1, 1386,   -1, 1388,   -1, 1390,   -1, 1392,   -1, 
+           -1,    0,  342,  125,   -1,  989,   -1,   -1,  430,   -1, 
+           -1,   10,  352,  435, 1408,   -1,  258, 1001,  358,  359, 
+          279,   -1,   -1,   -1, 1294,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1302,   -1,  603,   -1,  278,  606,   37,   38, 
+           -1, 1311,   41,   42,   43,   44,   45,   -1,   47,   -1, 
+           -1,   -1,   -1,   -1,  623,   -1,   -1,  347,  348,   58, 
+           59,   -1,   -1, 1047,   63,   -1,  279,   -1,   -1, 1053, 
+           -1,   -1,   -1, 1343,   -1, 1059,   -1,   -1, 1062,   -1, 
+           -1,   -1, 1352,   -1,   -1,   -1,   -1,   -1,  347,  348, 
+           -1,   -1, 1076,   -1,   93,   94,   -1,   -1,   -1,   -1, 
+           -1, 1085,   -1,  345,   -1,  347,  675,   -1,  530,   -1, 
+          679,  680,   -1,   -1,  683,   -1,   -1,   -1,  279,   -1, 
+          689,   -1,   -1,   -1,   -1,  124,  125,  369,  697,  279, 
+           -1,   -1,   -1,   -1,  347,  348,   -1,   -1,  707,  708, 
+          262,  263,  264,  279,   -1,   -1,  268,  269,    0,  271, 
+          279,   -1,   -1,   -1,   -1,  328,   -1,  279,   10,   -1, 
+           -1,   -1,   -1,  306,   -1,  308,  309,  310,  311,  312, 
+         1154,   -1,  345,  346, 1158, 1159,   41,  746, 1162,   -1, 
+           -1,  603,   -1,  752,  606,  328,  347,  348,  430,   41, 
+           -1,   -1,  761,  435,   46,   -1,   -1,  347,  348,  342, 
+          322,  623,  324,   -1,   -1,  348,   -1,   59,   -1,  352, 
+           -1,  347,  348,   -1,  357,  358,  359,   -1,  347,  348, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1212,   38, 
+           -1, 1215,   -1,   42,   -1,   -1,   -1,   -1,   -1,   -1, 
+           38,   -1,   40,   -1,   42,   -1,   -1,   -1,  370,  818, 
+         1234,   -1,   -1,  675,   -1,   -1,   -1,  679,  680,   -1, 
+          125, 1245,   -1,  262,  263,  264,   -1,  689,  267,  268, 
+          269,   -1,  271,  125,   -1,  697,   -1,   -1,   -1,   -1, 
+          279,   -1,  281,  282,  283,  707,  708,   -1,  530,   -1, 
            -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-          671,   -1,   -1,  123,  675,  676,  677,   -1,   -1,  279, 
-           -1,   -1,   -1,   -1,    0,   -1,  279,   -1,   -1,   -1, 
-           -1,   -1,   -1,  322,   10,  324,   -1,  262,  263,  264, 
-          701,   -1,  267,  268,  269,   -1,  271,  708,  709,  710, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1,   -1, 
-          721,   -1,  723,  724,  725,   41,  727,  356,   44,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,  739,   -1, 
-           -1,  370,   58,   59,   -1,   -1,   -1,  347,  348,   -1, 
-           -1,   -1, 1023, 1024,  347,  348,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,   93,   -1,   -1, 
-          781,   -1,   -1,  279,  280,  281,  282,  283,   -1,   -1, 
+           -1,  870,   -1,   37,   38,   -1,   -1,   -1,   42,   43, 
+         1294,   45,   -1,   47,   -1,   -1,   -1,  886, 1302,   -1, 
+           -1,   -1,   -1,  322,  746,  324,   60, 1311,   62,  328, 
+          329,  330,  331,  332,   -1,   -1,  335,  336,  337,  338, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1, 
+           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 1343, 
+           94,  603,   -1,   -1,  606,   -1,   -1,   -1, 1352,   -1, 
+         1287,  370,   -1,   -1,  373, 1292,   -1,   -1,   -1,   -1, 
+           -1,  623,   -1,   -1,   -1,   -1,   -1,   38,  957,  958, 
+          124,   -1,   -1,   -1,  963,  964,  818,  262,  263,  264, 
+           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1, 
+          262,  263,  264,   -1,  279,  267,  268,  269,   -1,  271, 
+          989,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
+           -1,   -1, 1001,  675,   -1,   -1,   -1,  679,  680,  291, 
+          292,   -1,  294,  295,  296,  297,  298,  689,   -1,   -1, 
+           -1, 1368, 1369, 1370, 1371,  697,   -1,  322, 1375,  324, 
+           -1,   -1,   -1,   -1,  886,  707,  708,   -1,   -1,   -1, 
+          322,   -1,  324,   40,   -1,   -1,   -1,   44, 1047,   46, 
+           -1,   -1,   -1,   -1, 1053, 1402, 1403, 1404, 1405,   -1, 
+         1059,   -1,   -1, 1062, 1411,  347,  348,  306,   -1,  308, 
+          309,  310,  311,  312,  746,  370,   -1, 1076,  306,   -1, 
+          308,  309,  310,  311,  312,   -1, 1085,   -1,  370,  328, 
+           -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   -1, 
+          328,   -1,   -1,   -1,   -1,  957,  958,   -1,   -1,   -1, 
+           -1,  963,  964,  352,  342,    0,   -1,   -1,  357,  358, 
+          359,   -1,   -1,   -1,  352,   10,  123,   -1,   -1,  357, 
+          358,  359,   -1,   -1,   -1,   -1,   -1,  989,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  818,   -1,   -1, 1001, 
+           -1,   -1,   -1,   -1,   -1, 1154,   41,   -1,   -1, 1158, 
+         1159,   -1,   -1, 1162,  328,   -1,   -1,   -1,   -1,  333, 
+          334,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,    0, 
+           -1,  345,  346,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
+           -1,   -1,   -1,   -1,   -1, 1047,   -1,   -1,   -1,   -1, 
+           -1, 1053,   -1,   -1,   -1,   -1,   -1, 1059,   -1,   -1, 
+         1062,   -1,   -1, 1212,  886,   -1, 1215,   15,   16,   -1, 
+           41,   -1,   -1,   44, 1076,  306,   -1,  308,  309,  310, 
+          311,  312,   -1, 1085,   -1, 1234,   -1,   58,   59,   -1, 
+          125,   -1,   63,   -1,   -1,   -1, 1245,  328,   -1,   -1, 
+           48,   49,   50,   51,   -1,   -1,   -1,   55,   56,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   67, 
+           68,  352,   93,   -1,   -1,   -1,   -1,  358,  359,   -1, 
+           -1,   -1,  279,  280,   -1,  957,  958,   -1,   -1,   -1, 
+           -1,  963,  964,   -1,   -1, 1294,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1154,   -1,  125,   -1, 1158, 1159,   -1,   -1, 
+         1162,   -1, 1311,   -1,   -1,   -1,   -1,  989,   -1,  117, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1001, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1343,   -1,   -1,   -1,   -1,   -1, 
+          347,  348,   -1, 1352,   -1,   -1,   -1,   -1,   -1,   -1, 
+         1212,   -1,   -1, 1215,    0,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   10, 1047,   -1,  262,  263,  264, 
+           -1, 1053, 1234,  268,  269,   -1,  271, 1059,   -1,   -1, 
+         1062,   -1,   -1, 1245,  279,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1076,   41,   -1,   -1,   44,  294, 
+          295,  296,  297, 1085,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   -1,  223,   -1,   -1,  226,  227, 
+          228,   -1,  230,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,  247, 
+          271,   -1,  250,   -1,   -1,   -1,   -1,   93,  279, 1311, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1, 1154,   -1,   -1,  370, 1158,   -1,  124,  125, 
+         1162,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+         1352,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  335,  336,    0,   -1,  339,  340, 
+           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,   -1,   -1,   -1, 
+         1212,   -1,   -1, 1215,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,  373,   37,   38,   -1,   -1,   41,   42,   43, 
+           44,   45, 1234,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1, 1245,   58,   59,   60,   -1,   62,   63, 
+           -1,  379,  380,  381,  382,  383,   -1,   -1,  386,  387, 
+          388,  389,  390,  391,  392,  393,   -1,  395,   -1,   -1, 
+          398,  399,  400,  401,  402,  403,  404,  405,  406,   93, 
+           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  416,   -1, 
+           -1,  419,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 1311, 
+          124,  125,   -1,  279,   -1,  281,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,  370,   -1,   -1,   -1,  125, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1090, 
-         1091,   -1,   -1, 1094,   -1,  826,  322,   -1,  324,  279, 
-          280,   10,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,  848,    0,  345, 
-          346,  347,  348,   -1,   -1,  351,   -1, 1128,   10,   -1, 
-          356,   -1,   41,   -1,   -1,   44,   -1,   46,   -1,   -1, 
-           -1,   -1,  873,   -1,  370,   -1,   -1,  373, 1149,   -1, 
-           -1,   33,   61,   -1,   -1,   37,   38,   -1,   40,   41, 
-           42,   43,   44,   45,   46,   47, 1167,  347,  348,   -1, 
-         1171,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61, 
-           62,   63,   91, 1184, 1185, 1186, 1187,   -1,   -1,   -1, 
-         1191, 1192,   -1, 1194,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  932,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91, 
-          941,   93,   94,  944,  945,   -1,  262,  263,  264,  950, 
-          951,  267,  268,  269,   -1,  271,  957,   -1,   -1,   -1, 
-           -1,   -1,  963,  279,   -1,  281,  282,  283,  969,   -1, 
-           -1,  123,  124,  125,  126,  291,  292,   -1,  294,  295, 
-          296,  297,  983,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  993,  994,  995,   -1,  997,  998,  999,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   37,   38,   -1, 1020, 
-         1021,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
-           -1, 1302, 1033,   -1, 1305,  351,   -1, 1038,   -1,   60, 
-          356,   62, 1313,   41, 1045, 1046,   44,   38,   46,   -1, 
-           -1,   42,   -1,   -1,  370,   -1,   -1,  373,   -1,   -1, 
-         1061,   -1,   -1,   61,   -1,   -1, 1067,   -1,   -1,   -1, 
-           -1,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   -1, 1370, 
-          279,   -1,   -1,  124,   -1,  257,  258,  259,   -1,  261, 
-          262,  263,  264,  265,  266,  267,  268,  269,  270,  271, 
-          272,  273,  274,  275,  276,  277,  278,  279,  280,  281, 
-          282,  283,  284,  285,  286,  287,  288,  289,  290,  291, 
-          292,  293,  294,  295,  296,  297,  298,   38,  300, 1150, 
-           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-          312,  313,  314,  315,  316,  317,  318,  319,  347,  348, 
-          322,  323,  324,   -1,  326,  327,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,  341, 
-          342,   -1,   -1,  345,  346,  347,  348,  349,  350,  351, 
-          352,  353,  354,  355,  356,  357,  358,  359,  360,  361, 
-          362,  363,  364,  365,  366,    0,  368,  369,  370,   -1, 
-           -1,  373,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1, 
-           -1,   -1,   37,   38,   -1,   40,   41,   42,   43,   44, 
-           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   58,   59,   60,   61,   62,   63,   -1, 
-           -1,  279,   -1,   -1,   -1,   -1,   -1, 1288,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   91,  328,   93,   94, 
-           -1,   -1,  333,  334,   -1,  306,   -1,  308,  309,  310, 
-          311,  312,   -1, 1273,  345,  346,   -1,   -1, 1278,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,  328,  123,  124, 
-          125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1,  347, 
-          348,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  352,   -1,   -1,   -1,   33,  357,  358,  359,   37, 
-           38,   -1,   40,   41,   42,   43,   44,   45,   46,   47, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           58,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1, 1354, 1355, 1356, 1357,   -1,   -1, 
-           -1, 1361,   -1,   -1,   -1,  306,   -1,  308,  309,  310, 
-          311,  312,   -1,   91,   -1,   93,   94,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  328, 1388, 1389, 
-         1390, 1391,   -1,   -1,   -1,   -1,   -1, 1397,   -1,   -1, 
-           -1,  342,   -1,   -1,   -1,  123,  124,  125,  126,   -1, 
-           -1,  352,   -1,   -1,   -1,   -1,   -1,  358,  359,   -1, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  477, 
+         1352,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+          488,   -1,  490,   -1,  492,   -1,   -1,    0,  496,   -1, 
+           -1,   -1,  500,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+          518,   -1,  520,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,  533,   -1,   -1,   41,  537, 
+           -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          548,   -1,   -1,   -1,   -1,   58,   59,   -1,   -1,   -1, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           93,   -1,   -1,   -1,   -1,  279,  594,  281,  282,  283, 
+           -1,   -1,   -1,   -1,   -1,   -1,  604,  291,  292,  607, 
+          294,  295,  296,  297,  298,  613,   -1,   -1,   37,   38, 
+           -1,   -1,  125,   42,   43,   -1,   45,   -1,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   60,   -1,   62,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
+           -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1,   -1, 
+           -1,   -1,  356,   -1,   -1,   94,   -1,  675,   -1,   -1, 
+           -1,  679,  680,  681,   -1,   -1,  370,   -1,   -1,  373, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,   -1,  705,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  713,  714,  715,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,  726,   -1, 
+          728,  729,  730,   -1,  732,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,  741,  742,   -1,   -1,   -1,  746,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   41,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
+          283,   -1,   -1,   -1,   -1,   59,   -1,   -1,  291,  292, 
+          788,  294,  295,  296,  297,  298,   -1,   -1,  287,  288, 
+          289,  290,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  303,  304,  305,   -1,   -1,  322, 
+           -1,  324,   -1,   -1,  313,  314,  315,  316,  317,   -1, 
+           -1,   -1,  335,  336,  323,  833,  339,  340,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,  351,   -1, 
+           -1,  125,   -1,  356,   -1,   10,   -1,   -1,   -1,  857, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+          373,  360,  361,  362,  363,  364,  365,  366,   33,  368, 
+          369,   -1,   37,   38,  882,   40,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,  895,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   61,   62,   63,  328, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+           -1,   -1,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  945,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  954,   -1,   -1,  957, 
+          958,   -1,   -1,   -1,   -1,  963,  964,   -1,  123,  124, 
+          125,  126,   -1,  971,   -1,   -1,   -1,   -1,   -1,  977, 
+           -1,   -1,   -1,   -1,   -1,  983,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,  997, 
+           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,   -1, 1007, 
+         1008,   -1, 1010, 1011, 1012,   -1,   -1, 1015,   -1,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1, 1034, 1035,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322, 1047, 
+          324,   -1,   -1,   -1, 1052,   -1,   -1,   -1,   -1,   -1, 
+           -1, 1059, 1060,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1, 1075,   -1,   -1, 
+           -1,   -1,   -1, 1081,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,   -1, 
            -1,   -1,  257,  258,  259,   -1,  261,  262,  263,  264, 
           265,  266,  267,  268,  269,  270,  271,  272,  273,  274, 
           275,  276,  277,  278,  279,  280,  281,  282,  283,  284, 
           285,  286,  287,  288,  289,  290,  291,  292,  293,  294, 
-          295,  296,  297,  298,   38,  300,   -1,   -1,  303,  304, 
+          295,  296,  297,  298,   -1,  300,   -1,   -1,  303,  304, 
           305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
-          315,  316,  317,  318,  319,   -1,   -1,  322,  323,  324, 
+          315,  316,  317,  318,  319,   -1, 1164,  322,  323,  324, 
            -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
           335,  336,  337,  338,  339,  340,  341,  342,   -1,   -1, 
           345,  346,  347,  348,  349,  350,  351,  352,  353,  354, 
           355,  356,  357,  358,  359,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,  370,   -1,   -1,  373,  257, 
-          258,  259,   -1,  261,  262,  263,  264,  265,  266,  267, 
-          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
-          278,  279,  280,  281,  282,  283,  284,  285,  286,  287, 
-          288,  289,  290,  291,  292,  293,  294,  295,  296,  297, 
-          298,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,  322,  323,  324,   -1,  326,  327, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,  341,  342,   -1,   -1,  345,  346,  347, 
-          348,  349,   -1,  351,  352,  353,  354,  355,  356,  357, 
-          358,  359,  360,  361,  362,  363,  364,  365,  366,    0, 
-          368,  369,  370,   -1,   -1,  373,   -1,   -1,   -1,   10, 
+          365,  366,    0,  368,  369,  370,   -1,   -1,  373,   -1, 
+           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37, 
+           38,   -1,   40,   41,   42,   43,   44,   45,   46,   47, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           58,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   91, 1302,   93,   94,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40, 
@@ -3925,24 +4036,24 @@ private static final int[] yyCheck1() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
            61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  306,   -1,  308,  309,  310,  311,  312,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  328,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,  123,  124,  125,  126,   10,   -1,  352,   -1, 
-           -1,   -1,   -1,   -1,  358,  359,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
-           -1,   -1,   -1,   37,   38,   -1,   40,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-          287,  288,  289,  290,   58,   59,   60,   61,   62,   63, 
-           -1,   -1,   -1,   -1,   -1,   -1,  303,  304,  305,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  313,  314,  315,  316, 
-          317,   -1,   -1,   -1,   -1,   -1,  323,   91,   -1,   93, 
-           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123, 
-          124,  125,  126,  360,  361,  362,  363,  364,  365,  366, 
-           -1,  368,  369,   -1,   -1,   -1,  257,  258,  259,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  123,  124,  125,  126,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257, 
+          258,  259,   -1,  261,  262,  263,  264,  265,  266,  267, 
+          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
+          278,  279,  280,  281,  282,  283,  284,  285,  286,  287, 
+          288,  289,  290,  291,  292,  293,  294,  295,  296,  297, 
+          298,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
+          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
+          318,  319,   -1,   -1,  322,  323,  324,   -1,  326,  327, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,  341,  342,   -1,   -1,  345,  346,  347, 
+          348,  349,  350,  351,  352,  353,  354,  355,  356,  357, 
+          358,  359,  360,  361,  362,  363,  364,  365,  366,   -1, 
+          368,  369,  370,   -1,   -1,  373,  257,  258,  259,   -1, 
           261,  262,  263,  264,  265,  266,  267,  268,  269,  270, 
           271,  272,  273,  274,  275,  276,  277,  278,  279,  280, 
           281,  282,  283,  284,  285,  286,  287,  288,  289,  290, 
@@ -3953,44 +4064,44 @@ private static final int[] yyCheck1() {
           331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
           341,  342,   -1,   -1,  345,  346,  347,  348,  349,   -1, 
           351,  352,  353,  354,  355,  356,  357,  358,  359,  360, 
-          361,  362,  363,  364,  365,  366,   -1,  368,  369,  370, 
-           -1,   -1,  373,  257,  258,  259,   -1,  261,  262,  263, 
-          264,  265,  266,  267,  268,  269,  270,  271,  272,  273, 
-          274,  275,  276,  277,  278,  279,  280,  281,  282,  283, 
-          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
-          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
-           -1,  345,  346,  347,  348,  349,   -1,  351,  352,  353, 
-          354,  355,  356,  357,  358,  359,  360,  361,  362,  363, 
-          364,  365,  366,    0,  368,  369,  370,   -1,   -1,  373, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
-           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   58,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
+          361,  362,  363,  364,  365,  366,    0,  368,  369,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
+           -1,   -1,   -1,   37,   38,   -1,   40,   41,   42,   43, 
+           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   58,   59,   60,   61,   62,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   93,   94,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93, 
+           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-            0,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
-           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  123, 
+          124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
-           40,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
+           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   58,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   91,   -1,   93,   94,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  123,  124,  125,  126,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  257,  258,  259,   -1,  261,  262,  263, 
+          264,  265,  266,  267,  268,  269,  270,  271,  272,  273, 
+          274,  275,  276,  277,  278,  279,  280,  281,  282,  283, 
+          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
+          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
+          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
+          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
+          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
+           -1,  345,  346,  347,  348,  349,   -1,  351,  352,  353, 
+          354,  355,  356,  357,  358,  359,  360,  361,  362,  363, 
+          364,  365,  366,   -1,  368,  369,  370,   -1,   -1,  373, 
           257,  258,  259,   -1,  261,  262,  263,  264,  265,  266, 
           267,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
           277,  278,  279,  280,  281,  282,  283,  284,  285,  286, 
@@ -4002,19 +4113,19 @@ private static final int[] yyCheck1() {
           337,  338,  339,  340,  341,  342,   -1,   -1,  345,  346, 
           347,  348,  349,   -1,  351,  352,  353,  354,  355,  356, 
           357,  358,  359,  360,  361,  362,  363,  364,  365,  366, 
-           -1,  368,  369,  370,   -1,   -1,  373,  257,  258,  259, 
-           -1,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
-          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
-          280,  281,  282,  283,  284,  285,  286,  287,  288,  289, 
-          290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
-           -1,  351,  352,  353,  354,  355,  356,  357,  358,  359, 
-          360,  361,  362,  363,  364,  365,  366,    0,  368,  369, 
-          370,   -1,   -1,  373,   -1,   -1,   -1,   10,   -1,   -1, 
+            0,  368,  369,  370,   -1,   -1,  373,   -1,   -1,   -1, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
+           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,   -1,  123,  124,  125,  126,   10,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            33,   -1,   -1,   -1,   37,   38,   -1,   40,   41,   42, 
@@ -4024,22 +4135,22 @@ private static final int[] yyCheck1() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
            93,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
-          123,  124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
-           91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   38,   -1,   40,   -1,   42,   -1,   -1,   -1,   46, 
-           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   -1,   61,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261,  262, 
+          123,  124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259, 
+           -1,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
+          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
+          280,  281,  282,  283,  284,  285,  286,  287,  288,  289, 
+          290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
+          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
+          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
+           -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
+           -1,  351,  352,  353,  354,  355,  356,  357,  358,  359, 
+          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
+          370,   -1,   -1,  373,  257,  258,  259,   -1,  261,  262, 
           263,  264,  265,  266,  267,  268,  269,  270,  271,  272, 
           273,  274,  275,  276,  277,  278,  279,  280,  281,  282, 
           283,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
@@ -4050,268 +4161,203 @@ private static final int[] yyCheck1() {
           333,  334,  335,  336,  337,  338,  339,  340,  341,  342, 
            -1,   -1,  345,  346,  347,  348,  349,   -1,  351,  352, 
           353,  354,  355,  356,  357,  358,  359,  360,  361,  362, 
-          363,  364,  365,  366,   -1,  368,  369,  370,   -1,   -1, 
-          373,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   10,   -1,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,  350, 
-          351,   -1,   37,   38,   -1,  356,   41,   42,   43,   44, 
-           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
-           -1,   -1,  373,   58,   59,   60,   61,   62,   63,  306, 
-           -1,  308,  309,  310,  311,  312,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  328,   -1,   -1,   -1,   -1,   91,   -1,   93,   94, 
-            0,   -1,   -1,   -1,   -1,  342,   -1,   -1,   -1,   -1, 
-           10,  348,   -1,   -1,   -1,  352,   -1,   -1,   -1,   -1, 
-          357,  358,  359,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
-          125,   -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
-           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   93,   94,   -1,   -1,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   41, 
-           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283,   91, 
-           -1,   93,   94,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
-          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
-          345,  346,  347,  348,   -1,  350,  351,   -1,   -1,   -1, 
-           -1,  356,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           -1,  271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279, 
-           -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   10,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
-          350,  351,   -1,   -1,   -1,   -1,  356,   -1,   41,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-          370,   -1,   -1,  373,   -1,   -1,   59,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           93,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   10,   -1,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,  125,  345,  346,  347,  348,   -1,  350,  351, 
-           -1,   37,   38,   -1,  356,   41,   42,   43,   44,   45, 
-           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,   58,   59,   60,   61,   62,   63,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
+          363,  364,  365,  366,    0,  368,  369,  370,   -1,   -1, 
+          373,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
-           -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
-           91,   -1,   93,   94,   -1,   -1,   -1,    0,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   10,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
+           -1,   37,   38,   -1,   40,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
-           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61,   62, 
-           63,   -1,   -1,  356,   -1,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,  370,   -1,   -1, 
-           -1,   -1,   -1,  279,   -1,  281,  282,  283,   91,   -1, 
-           93,   94,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  124,  125,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
-          346,  347,  348,   -1,  350,  351,   -1,   -1,   -1,   -1, 
-          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1, 
-          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   10,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,  350, 
-          351,   -1,   -1,   -1,   -1,  356,   -1,   41,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,  370, 
-           -1,   -1,  373,   -1,   -1,   59,  279,   -1,  281,  282, 
-          283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93, 
-           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   10,   -1,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-           -1,  125,  345,  346,  347,  348,   -1,  350,  351,   -1, 
-           37,   38,   -1,  356,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
-          373,   58,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   93,   94,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-           -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   41, 
-           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,   91, 
-           -1,   93,   94,   -1,   -1,   -1,    0,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   10,  123,  124,  125, 
+          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
+           -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
            44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   58,   59,   60,   61,   62,   63, 
-           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,  370,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,  281,  282,  283,   91,   -1,   93, 
-           94,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
-           -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-          347,  348,   -1,  350,  351,   -1,   -1,   -1,   -1,  356, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   10,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   -1,  345,  346,  347,  348,   -1,  350,  351, 
-           -1,   -1,   -1,   -1,  356,   -1,   41,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,  370,   -1, 
-           -1,  373,   -1,   -1,   59,  279,   -1,  281,  282,  283, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93, 
+           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   38,   -1, 
+           40,   -1,   42,   -1,   -1,   -1,   46,   -1,   -1,  123, 
+          124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
+           -1,   61,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  257,  258,  259,   -1,  261,  262,  263,  264,  265, 
+          266,  267,  268,  269,  270,  271,  272,  273,  274,  275, 
+          276,  277,  278,  279,  280,  281,  282,  283,  284,  285, 
+          286,  287,  288,  289,  290,  291,  292,  293,  294,  295, 
+          296,  297,  298,   -1,  300,   -1,   -1,  303,  304,  305, 
+          306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
+          316,  317,  318,  319,   -1,   -1,  322,  323,  324,   -1, 
+          326,  327,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,  341,  342,   -1,   -1,  345, 
+          346,  347,  348,  349,   -1,  351,  352,  353,  354,  355, 
+          356,  357,  358,  359,  360,  361,  362,  363,  364,  365, 
+          366,   -1,  368,  369,  370,   -1,   -1,  373,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  279,  280,  281,  282,  283, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
           294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
           324,   -1,   10,   -1,  328,  329,  330,  331,  332,  333, 
           334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-          125,  345,  346,  347,  348,   -1,  350,  351,   -1,   37, 
+           -1,  345,  346,  347,  348,   -1,   -1,  351,   -1,   37, 
            38,   -1,  356,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  373, 
-           58,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           58,   59,   60,   61,   62,   63,  306,   -1,  308,  309, 
+          310,  311,  312,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  328,   -1, 
            -1,   -1,   -1,   91,   -1,   93,   94,    0,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  123,  124,  125,   -1,   -1, 
-           -1,   -1,   -1,   -1,   37,   38,   -1,   40,   41,   42, 
+           -1,   -1,  342,   -1,   -1,   -1,   -1,   10,  348,   -1, 
+           -1,   -1,  352,   -1,   -1,   -1,   -1,  357,  358,  359, 
+           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
+           -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
            43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61,   62, 
-           63,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268, 
-      };
-   }
-
-   private static final int[] yyCheck2() {
-      return new int[] {
-
-          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          279,   -1,  281,  282,   91,   -1,   93,   94,   -1,   -1, 
-           -1,    0,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   37,   38, 
-           -1,   -1,   41,   42,   43,   44,   45,   46,   47,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58, 
-           59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,  370,   -1,   -1,   -1,   -1,   -1,  279,  280,  281, 
-          282,  283,   91,   -1,   93,   94,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  123,  124,  125,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   -1,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   -1,  345,  346,  347,  348,   -1,   -1,  351, 
-           -1,   -1,   -1,   -1,  356,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,  279,   -1,  281,  282,  283,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
+           93,   94,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-            0,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
-           10,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-          347,  348,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356, 
-           -1,   41,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,  370,   -1,   -1,  373,   -1,   -1,   59, 
-          279,  280,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   61,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  279,   -1,  281,  282,  283,   91,   -1,   93,   94, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
+          348,   -1,  350,  351,   -1,   -1,   -1,   -1,  356,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,  370,   -1,   -1,  373,  279,   -1,  281,  282, 
+          283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   -1,   -1,   10,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,  347,  348,   -1,  350,  351,   -1, 
+           -1,   -1,   -1,  356,   -1,   41,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,  370,   -1,   -1, 
+          373,   -1,   -1,   59,  279,   -1,  281,  282,  283,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   10,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,  125, 
+          345,  346,  347,  348,   -1,  350,  351,   -1,   37,   38, 
+           -1,  356,   41,   42,   43,   44,   45,   46,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   58, 
+           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   91,   -1,   93,   94,    0,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
+           -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
+           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   58,   59,   60,   61,   62,   63, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,   91,   -1,   93, 
+           94,   -1,   -1,   -1,    0,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          124,  125,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   58,   59,   60,   61,   62,   63,   -1,   -1, 
+          356,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   -1,  370,   -1,   -1,   -1,   -1,   -1, 
+          279,   -1,  281,  282,  283,   91,   -1,   93,   94,   -1, 
            -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   93,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   10,   -1,  328, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328, 
           329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
-          339,  340,   -1,   -1,   -1,  125,  345,  346,  347,  348, 
-           -1,   -1,  351,   -1,   37,   38,   -1,  356,   41,   42, 
-           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,  370,   -1,   -1,  373,   58,   59,   60,   61,   62, 
-           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
+           -1,  350,  351,   -1,   -1,   -1,   -1,  356,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           -1,  370,   -1,   -1,  373,  279,   -1,  281,  282,  283, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
-           93,   94,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   -1,   -1,   10,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
+           -1,  345,  346,  347,  348,   -1,  350,  351,   -1,   -1, 
+           -1,   -1,  356,   -1,   41,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,  370,   -1,   -1,  373, 
+           -1,   -1,   59,  279,   -1,  281,  282,  283,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1, 
+            0,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           10,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,  125,  345, 
+          346,  347,  348,   -1,  350,  351,   -1,   37,   38,   -1, 
+          356,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   58,   59, 
+           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           58,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   91,   -1,   93,   94,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   61,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,   -1,  281,  282,   91,   -1,   93,   94, 
+           -1,   -1,   -1,    0,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   58,   59,   60,   61,   62,   63,   -1,   -1,  356, 
            -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
-           -1,  281,  282,   91,   -1,   93,   94,   -1,   -1,   -1, 
-            0,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
-          370,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
-          283,   91,   -1,   93,   94,   -1,   -1,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           -1,  271,   -1,  370,   -1,   -1,   -1,   -1,   -1,  279, 
+           -1,  281,  282,  283,   91,   -1,   93,   94,   -1,   -1, 
+           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   -1,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-           -1,   -1,  345,  346,  347,  348,   -1,   -1,  351,   -1, 
-           -1,   -1,   -1,  356,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1,   -1, 
-          373,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
+           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
+          350,  351,   -1,   -1,   -1,   -1,  356,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
+          370,   -1,   -1,  373,  279,   -1,  281,  282,  283,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1, 
+      };
+   }
+
+   private static final int[] yyCheck2() {
+      return new int[] {
+
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
            -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   10, 
           328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
           338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
+          348,   -1,  350,  351,   -1,   -1,   -1,   -1,  356,   -1, 
            41,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
            -1,  271,  370,   -1,   -1,  373,   -1,   -1,   59,  279, 
            -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1, 
@@ -4321,9 +4367,9 @@ private static final int[] yyCheck2() {
            -1,   -1,  322,   -1,  324,   -1,   10,   -1,  328,  329, 
           330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
           340,   -1,   -1,   -1,  125,  345,  346,  347,  348,   -1, 
-           -1,  351,   -1,   37,   38,   -1,  356,   41,   42,   43, 
+          350,  351,   -1,   37,   38,   -1,  356,   41,   42,   43, 
            44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-          370,   -1,   -1,  373,   58,   59,   60,   -1,   62,   63, 
+          370,   -1,   -1,  373,   58,   59,   60,   61,   62,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93, 
@@ -4336,14 +4382,14 @@ private static final int[] yyCheck2() {
            59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1, 
            -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
           271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,   -1,   91,   -1,   93,   94,   -1,   -1,   -1,    0, 
+          281,  282,   91,   -1,   93,   94,   -1,   -1,   -1,    0, 
           291,  292,   -1,  294,  295,  296,  297,  298,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   37,   38,   -1,   -1, 
+           -1,   -1,   -1,   -1,  123,  124,  125,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   37,   38,   -1,   40, 
            41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
-           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,  262,  263, 
+           61,   62,   63,   -1,   -1,  356,   -1,   -1,  262,  263, 
           264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,  370, 
            -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283, 
            91,   -1,   93,   94,   -1,   -1,   -1,  291,  292,   -1, 
@@ -4352,26 +4398,26 @@ private static final int[] yyCheck2() {
            -1,   -1,   -1,  124,  125,   -1,   -1,   -1,  322,   -1, 
           324,   -1,   -1,   -1,  328,  329,  330,  331,  332,  333, 
           334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,  347,  348,   -1,   -1,  351,   -1,   -1, 
-           -1,   -1,  356,  262,  263,  264,   -1,    0,  267,  268, 
-          269,   -1,  271,   -1,   -1,   -1,  370,   10,   -1,  373, 
-          279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
+           -1,  345,  346,  347,  348,   -1,  350,  351,   -1,   -1, 
+           -1,   -1,  356,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   -1,   -1,   -1,  370,   -1,   -1,  373, 
+          279,  280,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41,   -1, 
-           -1,   44,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   59,   10,   -1,  328, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   10,  328, 
           329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
           339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   41,   -1, 
+           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   41, 
            -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,  370,   -1,   -1,  373,   -1,   59,   -1,  279,   -1, 
+          271,  370,   -1,   -1,  373,   -1,   -1,   59,  279,   -1, 
           281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,  125,  294,  295,  296,  297,  298,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           93,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   93,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
            -1,  322,   -1,  324,   -1,   10,   -1,  328,  329,  330, 
           331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,  125,   -1,  345,  346,  347,  348,   -1,   -1, 
+           -1,   -1,   -1,  125,  345,  346,  347,  348,   -1,   -1, 
           351,   -1,   37,   38,   -1,  356,   41,   42,   43,   44, 
            45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
            -1,   -1,  373,   58,   59,   60,   -1,   62,   63,   -1, 
@@ -4379,784 +4425,637 @@ private static final int[] yyCheck2() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94, 
             0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
-          263,  264,   -1,   -1,   -1,  268,  269,   -1,  271,  124, 
-          125,   -1,   -1,   -1,   -1,   -1,  279,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   -1,   47,  291,  292, 
-           -1,  294,  295,  296,  297,   -1,   -1,   -1,   58,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,  322, 
-           -1,  324,   -1,   -1,   -1,   -1,  279,   -1,  281,   -1, 
-           -1,   -1,   -1,   93,   94,   -1,    0,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   10,   -1,  351,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,  370,   -1,  322, 
-           -1,  324,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
-           44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62,   63, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,  370,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283,   93, 
-           94,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
-          124,  125,   -1,   -1,   -1,   -1,   -1,  322,   10,  324, 
-           -1,   -1,   -1,   -1,  329,  330,  331,  332,  333,  334, 
-          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
-          345,  346,  347,  348,   -1,   -1,  351,   10,   -1,   41, 
-           -1,  356,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           -1,  271,   -1,   -1,   -1,  370,   -1,   59,  373,  279, 
-           -1,  281,  282,  283,   -1,   38,   -1,   40,   -1,   42, 
-           -1,  291,  292,   46,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   61,   -1, 
-           -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,  125,   -1,  345,  346,   -1,   -1,   -1, 
-           -1,  351,   -1,   -1,   -1,   -1,  356,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-          370,   -1,   -1,  373,   -1,  279,   -1,  281,  282,  283, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   10,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1,   37, 
-           38,   -1,  356,   41,   42,   43,   44,   45,   -1,   47, 
-           -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  373, 
-           58,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,  124, 
+          125,   -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1, 
+           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
+           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
           262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
-           -1,   -1,   -1,   -1,   -1,   93,   94,    0,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
-          322,   -1,  324,   -1,   37,   38,   -1,   -1,   41,   42, 
-           43,   44,   45,  306,   47,  308,  309,  310,  311,  312, 
-           -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62, 
-           63,   -1,   -1,   -1,   -1,  328,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,  342, 
-           -1,   -1,   -1,   -1,   -1,  348,   -1,   -1,   -1,  352, 
-           93,   94,   -1,    0,  357,  358,  359,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   37,   38,   -1,   -1,   -1,   42, 
-           43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,  124,  125,   -1,   -1,   -1,   -1,   60,   -1,   62, 
-           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   58,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
-           -1,   94,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,  282,  283,   93,   94,   -1,   -1, 
-           -1,  124,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,    0,   -1,  124,  125,   -1, 
-           -1,   -1,   -1,   -1,  322,   10,  324,   -1,   -1,   -1, 
-           -1,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,   -1, 
-           -1,   -1,   -1,  351,   10,   -1,   41,   -1,  356,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
-           -1,   -1,  370,   -1,   59,  373,  279,   -1,  281,  282, 
-          283,   -1,   38,   -1,   40,   -1,   42,   -1,  291,  292, 
-           46,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   59,   -1,   61,   -1,   -1,   93,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-          125,   -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1, 
-           -1,   -1,   -1,  356,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,  370,   -1,   -1, 
-          373,   -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,   -1,   -1,   -1,    0, 
-           -1,   -1,  345,  346,   -1,  322,   -1,  324,   -1,   10, 
-           -1,   -1,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-           -1,   -1,   -1,   -1,  351,   -1,   37,   38,   -1,  356, 
-           41,   42,   43,   44,   45,   -1,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,  370,   -1,   -1,  373,   58,   59,   60, 
-           -1,   62,   63,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1,   -1, 
-           -1,   -1,   93,   94,    0,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   10,   -1,   -1,   -1,   -1,   -1, 
+          282,   91,   -1,   93,   94,   -1,   -1,   -1,    0,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,   -1,   -1,  322,   -1,  324, 
-           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
-          306,   47,  308,  309,  310,  311,  312,   -1,   -1,   -1, 
-           -1,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,  328,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,  342,   -1,   -1,   -1, 
-           -1,   -1,  348,   -1,   -1,   -1,  352,   93,   94,   -1, 
-            0,  357,  358,  359,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   -1,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   94,   -1, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,  282,  283,   93,   94,   -1,   -1,   -1,  124,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   61, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,  370,   -1, 
+           -1,   -1,   -1,   -1,  279,  280,  281,  282,  283,   91, 
+           -1,   93,   94,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,  124,  125,   -1,   -1,   -1,   -1, 
-           -1,  322,   10,  324,   -1,   -1,   -1,   -1,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1, 
-          351,   10,   -1,   41,   -1,  356,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,  370, 
-           -1,   59,  373,  279,   -1,  281,  282,  283,   -1,   38, 
-           -1,   40,   -1,   42,   -1,  291,  292,   46,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           59,   -1,   61,   -1,   -1,   93,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,  125,   -1,  345, 
-          346,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
-          356,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-           -1,  271,   -1,   -1,  370,   -1,   -1,  373,   -1,  279, 
+           -1,   -1,  124,  125,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,  347,  348,   -1,   -1,  351,   -1,   -1,   -1, 
+           -1,  356,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279, 
            -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-           -1,  337,  338,   -1,   -1,   -1,    0,   -1,   -1,  345, 
-          346,   -1,  322,   -1,  324,   -1,   10,   -1,   -1,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1, 
-           -1,  351,   -1,   37,   38,   -1,  356,   41,   42,   43, 
-           44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-          370,   -1,   -1,  373,   58,   59,   60,   -1,   62,   63, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,   -1,   -1,   -1,   -1,   -1,   93, 
-           94,    0,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   -1,  322,   -1,  324,   -1,   37,   38, 
-           -1,   -1,   41,   42,   43,   44,   45,  306,   47,  308, 
-          309,  310,  311,  312,   -1,   -1,   -1,   -1,   -1,   58, 
-           59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1,  328, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,  342,   -1,   -1,   -1,   -1,   -1,  348, 
-           -1,   -1,   -1,  352,   93,   94,   -1,    0,  357,  358, 
-          359,   -1,   -1,   -1,   -1,   -1,   -1,   10,   37,   38, 
-           -1,   -1,   -1,   42,   43,   -1,   45,   -1,   47,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
-           -1,   60,   -1,   62,   37,   38,   -1,   -1,   41,   42, 
-           43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62, 
-           63,   -1,   -1,   -1,   -1,   94,   -1,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283, 
-           93,   94,   -1,   -1,   -1,  124,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,  124,  125,   -1,   -1,   -1,   -1,   -1,  322,   10, 
-          324,   -1,   -1,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1,   -1, 
-           41,    0,  356,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   10,  271,   -1,   -1,   -1,  370,   -1,   59,  373, 
-          279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,   -1, 
-           -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1, 
-           -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           59,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328, 
-          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
-          339,  340,   -1,   -1,  125,   -1,  345,  346,   -1,   -1, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,  262, 
-          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
-           -1,  370,   -1,   -1,  373,   -1,  279,   -1,  281,  282, 
-          283,   -1,   -1,   -1,   -1,   -1,  125,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,   -1,   -1,   -1,   -1,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,    0,   -1,   -1,  345,  346,   -1,  322, 
-           -1,  324,   -1,   10,   -1,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-           -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1, 
-           37,   38,   -1,  356,   41,   42,   43,   44,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
-          373,   58,   59,   -1,   -1,   -1,   63,   -1,   -1,   -1, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,   -1,   -1,   -1,   -1,   -1,   93,   94,    0,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   10,   -1, 
-           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-          279,  322,   -1,  324,   -1,   -1,   38,   -1,   -1,   41, 
-           -1,   43,   44,   45,   -1,  294,  295,  296,  297,  298, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  370, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   93,   94,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  351,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  370,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   38,   -1,   -1,   41,   -1,   43,   44,   45, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,  281,  282,  283,   93,   94,   -1, 
-           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
-           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
-           -1,  328,  329,  330,  331,  332,   -1,   -1,  335,  336, 
-          337,  338,  339,  340,   -1,    0,   -1,   -1,  345,  346, 
-           -1,   -1,   -1,   -1,  351,   10,   -1,   -1,   -1,  356, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,  322,   -1,  324,   -1,   -1,   10,  328,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
+           -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   41,   -1, 
           262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   41,   -1,   -1,  291, 
+          370,   -1,   -1,  373,   -1,   -1,   59,  279,   -1,  281, 
+          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
           292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
+           93,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   10,   -1,  328,  329,  330,  331, 
           332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   -1,   -1,  356,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,   -1,  370,   -1, 
-          125,  373,   -1,  279,   -1,  281,  282,  283,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   38,   -1,   -1,   41,  345, 
-          346,   44,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
-          356,   -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62, 
-           63,   -1,   -1,   -1,  370,   -1,   -1,  373,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  125,  345,  346,  347,  348,   -1,   -1,  351, 
+           -1,   37,   38,   -1,  356,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
+           -1,  373,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           93,   94,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,  124,  125,   -1,  279,   -1,   -1,   -1,   -1,   -1, 
-           38,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           58,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   93,   94,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
+           -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,  124,  125,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   38,   -1,   -1,   41, 
-           -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1, 
+           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
           263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
-          283,   93,   94,   -1,   -1,   -1,   -1,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           91,   -1,   93,   94,   -1,   -1,   -1,    0,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   10,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
-           -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351,   -1, 
-           10,   -1,   -1,  356,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1,   -1, 
-          373,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   94,   -1,   -1,  345,  346,   -1, 
-           -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,  370,   -1,   -1,  373,   -1,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
+           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
+           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,  370,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,  283,   91,   -1, 
+           93,   94,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   41, 
-           -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   -1,   -1,  356,   -1,   58,   59,   60,   -1, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-           -1,   93,   94,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,  347,  348,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+          356,  262,  263,  264,   -1,    0,  267,  268,  269,   -1, 
+          271,   -1,   -1,   -1,  370,   10,   -1,  373,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44, 
+           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   59,   10,   -1,  328,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   41,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,  370, 
+           -1,   -1,  373,   -1,   59,   -1,  279,   -1,  281,  282, 
+          283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+          125,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   -1,   10,   -1,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+          125,   -1,  345,  346,  347,  348,   -1,   -1,  351,   -1, 
+           37,   38,   -1,  356,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+          373,   58,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   41,   -1,   -1,   44,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  287,  288,  289, 
-          290,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,   -1,  303,  304,  305,  306,   -1,   -1,   -1, 
-          310,   -1,   -1,  313,  314,  315,  316,  317,   -1,   -1, 
-           -1,   -1,   -1,  323,   -1,   -1,   -1,   93,   94,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,   -1,  354,  355,   -1,  357,  124,  125, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
-           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   91,   -1,   93,   94,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,  124,  125,   -1, 
+           -1,   -1,   -1,   -1,  279,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   58,   59,   60,   -1, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,  322,   -1,  324, 
+           -1,   -1,   -1,   -1,  279,   -1,  281,  282,   -1,   91, 
+           -1,   93,   94,   -1,    0,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   10,   -1,  351,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,  125,   -1,  370,   -1,  322,   -1,  324, 
+           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,  370,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,   -1,  281,  282,  283,   93,   94,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,  322,   10,  324,   -1,   -1, 
+           -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
+          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
+          347,  348,   -1,   -1,  351,   10,   -1,   41,   -1,  356, 
           262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   93,   -1,   -1,   -1,   -1,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,    0,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1, 
-           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  370,   -1,   59,  373,  279,   -1,  281, 
+          282,  283,   -1,   38,   -1,   40,   -1,   42,   -1,  291, 
+          292,   46,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59,   -1,   61,   -1,   -1,   93, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
           332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   41,   -1,   -1,   44,  262,  263,  264,  351, 
-           -1,  267,  268,  269,  356,  271,   -1,   -1,   -1,   58, 
-           59,   -1,   -1,  279,   63,  281,  282,  283,  370,   -1, 
-           -1,  373,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+           -1,  125,   -1,  345,  346,  347,  348,   -1,   -1,  351, 
+           -1,   -1,   -1,   -1,  356,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,  370,   -1, 
+           -1,  373,   -1,  279,   -1,  281,  282,  283,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
           296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,  125,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   10,   -1, 
-          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1, 
-          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
-          291,  292,   44,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          351,   -1,   -1,   -1,   -1,  356,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,  370, 
-           -1,   -1,  373,  125,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          279,   -1,  281,  282,  283,   -1,   41,   -1,   -1,   44, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   -1,   -1,   58,   59,   -1,   -1,   -1,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  335,  336,   93,   -1, 
-          339,  340,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
-           -1,   -1,  351,   -1,   -1,   10,   -1,  356,   -1,   -1, 
+            0,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           10,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,   -1,   -1,   -1,   -1,  351,   -1,   37,   38,   -1, 
+          356,   41,   42,   43,   44,   45,   -1,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   58,   59, 
+           60,   -1,   62,   63,   -1,   -1,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,   -1, 
+           -1,   -1,   -1,   93,   94,    0,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,  322,   -1, 
+          324,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,  306,   47,  308,  309,  310,  311,  312,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   -1,   62,   63,   -1, 
+           -1,   -1,  356,  328,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  370,  342,   -1,   -1, 
+           -1,   -1,   -1,  348,   -1,   -1,   -1,  352,   93,   94, 
+           -1,    0,  357,  358,  359,   -1,   -1,   -1,   -1,   -1, 
+           -1,   10,   37,   38,   -1,   -1,   -1,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,   60,   -1,   62,   37,   38, 
+           -1,   -1,   41,   42,   43,   44,   45,   -1,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58, 
+           59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1,   94, 
+           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
+           -1,  281,  282,  283,   93,   94,   -1,   -1,   -1,  124, 
+           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          125,  370,   -1,   -1,  373,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,   58,   59,   -1,   -1,  279,   63,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
-           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   10,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-          125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   41,   -1,  356,   44,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   58, 
-           59,  373,   -1,   -1,   63,   -1,   -1,  262,  263,  264, 
+           -1,   -1,   -1,    0,   -1,  124,  125,   -1,   -1,   -1, 
+           -1,   -1,  322,   10,  324,   -1,   -1,   -1,   -1,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1, 
+           -1,  351,   10,   -1,   41,   -1,  356,  262,  263,  264, 
            -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283,   -1, 
-           -1,   -1,   -1,   -1,   93,   -1,  291,  292,   -1,  294, 
+          370,   -1,   59,  373,  279,   -1,  281,  282,  283,   -1, 
+           38,   -1,   40,   -1,   42,   -1,  291,  292,   46,  294, 
           295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,  125,  322,   -1,  324, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          335,  336,   -1,   -1,  339,  340,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
-           -1,  356,   -1,   41,   -1,   -1,   44,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,  370,  271,   -1,  373,   -1, 
-           58,   59,   -1,   -1,  279,   63,  281,  282,  283,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   10,   -1, 
+           -1,   59,   -1,   61,   -1,   -1,   93,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          335,  336,   -1,   -1,  339,  340,   -1,  125,   -1,   41, 
-           -1,   -1,   44,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
-           -1,  356,   -1,  262,  263,  264,   58,   59,  267,  268, 
-          269,   63,  271,   -1,   -1,  370,   -1,   -1,  373,   -1, 
+           -1,   -1,   -1,   -1,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,  125,   -1, 
+          345,  346,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
+           -1,  356,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   -1,   -1,  370,   -1,   -1,  373,   -1, 
           279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   93,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   10,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  125,   -1,   -1,  335,  336,   -1,   -1, 
-          339,  340,   -1,   -1,   41,   -1,   38,   44,   40,   -1, 
-           42,   -1,  351,   -1,   46,   -1,   -1,  356,   -1,   -1, 
-           -1,   58,   59,   -1,   -1,   -1,   63,   59,   -1,   61, 
-           -1,  370,   -1,   -1,  373,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   93,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,    0,   -1,   -1,  125,   -1, 
-           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  335,  336,   -1, 
-           -1,  339,  340,   -1,   -1,   -1,   41,   -1,   -1,   44, 
-          262,  263,  264,  351,   -1,  267,  268,  269,  356,  271, 
-           -1,   -1,   -1,   58,   59,   -1,   -1,  279,   63,  281, 
-          282,  283,  370,   -1,   -1,  373,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,   -1,  337,  338,   -1,   -1,   -1,    0,   -1,   -1, 
+          345,  346,   -1,  322,   -1,  324,   -1,   10,   -1,   -1, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1, 
+           -1,   -1,  351,   -1,   37,   38,   -1,  356,   41,   42, 
+           43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,  370,   -1,   -1,  373,   58,   59,   60,   -1,   62, 
+           63,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,   -1,  281,  282,   -1,   -1,   -1,   -1, 
+           93,   94,    0,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,   -1,   -1,  322,   -1,  324,   -1,   37, 
+           38,   -1,   -1,   41,   42,   43,   44,   45,  306,   47, 
+          308,  309,  310,  311,  312,   -1,   -1,   -1,   -1,   -1, 
+           58,   59,   60,   -1,   62,   63,   -1,   -1,   -1,  356, 
+          328,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  370,  342,   -1,   -1,   -1,   -1,   -1, 
+          348,   -1,   -1,   -1,  352,   93,   94,   -1,    0,  357, 
+          358,  359,   -1,   -1,   -1,   -1,   -1,   -1,   10,   37, 
+           38,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,   47, 
+           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
+           -1,   -1,   60,   -1,   62,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
+           62,   63,   -1,   -1,   -1,   -1,   94,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
+          283,   93,   94,   -1,   -1,   -1,  124,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  335,  336,   -1,   -1,  339,  340,   -1, 
-          125,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   10,   -1,  356,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,  279,   -1,  281,  282,  283,   -1,   -1,   -1, 
-           -1,   -1,   -1,   41,  291,  292,   44,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           58,   59,   -1,   -1,  306,   63,  308,  309,  310,  311, 
-          312,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  328,   -1,   -1,  336, 
-           -1,   -1,  339,  340,   -1,   93,   -1,   -1,   -1,   -1, 
-          342,   -1,   -1,   -1,  351,   -1,  348,   -1,   -1,  356, 
-          352,   -1,   -1,   -1,   -1,  357,  358,  359,    0,   -1, 
-           -1,   -1,   -1,  370,   -1,   -1,  373,  125,   10,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283,   41, 
-           -1,   -1,   44,   -1,   -1,    0,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   10,   58,   59,   -1,   -1, 
-           -1,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44, 
-           -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   58,   59,   -1,  351,   -1,   63,   -1, 
-           -1,  356,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  125,   -1,  370,   -1,   -1,  373,   -1, 
-           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
-           -1,   10,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
-          125,   -1,   41,  291,  292,   44,  294,  295,  296,  297, 
-          298,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58, 
-           59,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+            0,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1,  322, 
+           10,  324,   -1,   -1,   -1,   -1,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351,   10, 
+           -1,   41,   -1,  356,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1,   59, 
+          373,  279,   -1,  281,  282,  283,   -1,   38,   -1,   40, 
+           -1,   42,   -1,  291,  292,   46,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1, 
+           61,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   41,   -1,   93,   44,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   58, 
-           59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   -1,   -1,  373,  125,   -1,   -1,   -1, 
+           -1,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,   -1,   -1,  125,   -1,  345,  346,   -1, 
+           -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
           262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,   -1,   93,   -1,   -1,  279,   -1,  281, 
+           -1,   -1,  370,   -1,   -1,  373,   -1,  279,   -1,  281, 
           282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
           292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  125,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,    0,  271,   -1,   -1,   -1, 
-          322,   -1,  324,   -1,  279,   10,  281,  282,  283,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,  351, 
-           -1,   -1,   -1,   -1,  356,   -1,   41,   -1,   -1,   44, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,  370,  324, 
-           -1,  373,   -1,   58,   59,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  262,  263,  264,  351,   -1,  267,  268, 
-          269,  356,  271,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
-          279,   -1,  281,  282,  283,  370,   -1,   -1,  373,   -1, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+          328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337, 
+          338,   -1,   -1,   -1,    0,   -1,   -1,  345,  346,   -1, 
+          322,   -1,  324,   -1,   10,   -1,   -1,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
+           -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351, 
+           -1,   37,   38,   -1,  356,   41,   42,   43,   44,   45, 
+           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
+           -1,  373,   58,   59,   60,   -1,   62,   63,   -1,   -1, 
+           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
+           -1,  281,  282,   -1,   -1,   -1,   -1,   93,   94,    0, 
+           -1,  291,  292,   -1,  294,  295,  296,  297,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          125,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,    0,  271,  322,   -1,  324,   -1,   -1,   -1,   -1, 
-          279,   10,  281,  282,  283,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   -1, 
-           -1,   -1,   41,   -1,   -1,   44,   -1,   -1,    0,   -1, 
-           -1,  370,   -1,  322,  373,  324,   -1,   -1,   10,   58, 
-           59,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,  322,   -1,  324,   -1,   37,   38,   -1,   -1, 
+           41,   42,   43,   44,   45,  306,   47,  308,  309,  310, 
+          311,  312,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,  356,  328,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   41, 
-           -1,   38,   44,   40,   93,   42,   -1,   -1,   -1,   46, 
-           -1,  370,   -1,   -1,  373,   -1,   58,   59,   -1,   -1, 
-           -1,   -1,   59,   -1,   61,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  125,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   93,   -1,   -1,  279,   -1,  281,  282,  283,   -1, 
+          370,  342,   -1,   -1,   -1,   -1,   -1,  348,   -1,   -1, 
+           -1,  352,   93,   94,   -1,    0,  357,  358,  359,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   -1,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,  283,   93,   94, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,   -1,  322,   10,  324,   -1, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,   -1,   -1,   -1,   -1,  351,   -1,   -1,   41,   -1, 
+          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   10,   -1,   -1,  370,   -1,   59,  373,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,   -1,   -1,   38, 
+           -1,   40,   -1,   42,   -1,   -1,   -1,   46,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           59,  322,   61,  324,   -1,   -1,   -1,  328,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,  125,   -1,  345,  346,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,  370, 
+           -1,   -1,  373,   -1,  279,   -1,  281,  282,  283,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   10,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,   38,   -1,   -1,   41,  351,   43,   44,   45, 
+           -1,  356,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   58,   59,   60,  370,   62,   63,  373,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
+          263,  264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   93,   94,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   38,   -1,  322, 
+           41,  324,   43,   44,   45,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,   -1,  306,   -1,  308, 
+          309,  310,  311,  312,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,  328, 
+           -1,   -1,   93,   94,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  342,   -1,   10,   -1,   -1,   -1,  348, 
+           -1,   -1,   -1,  352,   -1,   -1,   -1,   -1,  357,  358, 
+          359,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   38,   -1,   -1,   41,   -1,   -1,   44, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   -1,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,  283,   93,   94, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,   -1,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,    0,   -1,   -1,  345, 
+          346,   -1,   -1,   -1,   -1,  351,   10,   -1,   -1,   -1, 
+          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   41,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,  370, 
+           -1,  125,  373,   -1,  279,   -1,  281,  282,  283,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,    0,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  125,   -1,   10,   -1,   -1,   -1,   -1, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1, 
-           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
-           45,   46,   47,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
-           -1,  356,   -1,   -1,   59,   60,   -1,   62,   63,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   -1, 
+           -1,   -1,   -1,   -1,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   38,   -1,   -1,   41, 
+          345,  346,   44,   -1,   -1,   -1,  351,   -1,   -1,   -1, 
+           -1,  356,   -1,   -1,   -1,   -1,   58,   59,   60,   -1, 
+           62,   63,   -1,   -1,   -1,  370,   -1,   -1,  373,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   93,   94, 
-           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          279,   -1,  281,  282,  283,   -1,   -1,   -1,  123,  124, 
-          125,  126,  291,  292,   -1,  294,  295,  296,  297,  298, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-           -1,   -1,   -1,  322,   -1,  324,   -1,  279,   -1,  281, 
-          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
-           -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1,  306, 
-           -1,  308,  309,  310,  311,  312,   -1,   -1,   -1,   -1, 
-          322,  370,  324,   -1,  373,   -1,   -1,   -1,   -1,   -1, 
-           -1,  328,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  342,   -1,   -1,   -1,  351, 
-           -1,  348,   -1,   -1,  356,  352,   -1,   -1,   -1,   -1, 
-          357,  358,  359,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
-           -1,  373,  257,  258,  259,   -1,  261,  262,  263,  264, 
-          265,  266,  267,  268,  269,  270,  271,  272,  273,  274, 
-          275,  276,  277,  278,  279,  280,  281,  282,   -1,  284, 
-          285,  286,  287,  288,  289,  290,  291,  292,  293,  294, 
-          295,  296,  297,  298,   -1,  300,   -1,   -1,  303,  304, 
-          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
-          315,  316,  317,  318,  319,   -1,   -1,  322,  323,  324, 
-           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
-          335,  336,  337,  338,  339,  340,  341,  342,   -1,   -1, 
-          345,  346,  347,  348,  349,   -1,  351,  352,  353,  354, 
-          355,  356,  357,  358,  359,  360,  361,  362,  363,  364, 
-          365,  366,    0,  368,  369,  370,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   93,   94,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,  262,  263, 
+          264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,  124,  125,   -1,  279,   -1,   -1,   -1,   -1, 
+           -1,   38,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1, 
+          294,  295,  296,  297,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   58,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   94,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  370,  124,  125,   -1, 
+           41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   93,   94,   -1,   -1,   -1,  279,   -1,  281, 
+          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   91,   -1,   93,   94,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
+           -1,   -1,   -1,  345,  346,   -1,   -1,   -1,   -1,  351, 
+           10,   -1,   -1,   -1,  356,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,  370,   -1, 
+           -1,  373,  279,   -1,  281,  282,  283,   -1,   38,   -1, 
+           40,   -1,   42,   -1,  291,  292,   46,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
+           -1,   61,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,  329,  330,  331,  332,  333,  334,  335,  336, 
+          337,  338,  339,  340,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  262,  263,  264,  351,   -1,  267,  268,  269,  356, 
+          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
+          281,  282,  283,  370,   -1,   -1,  373,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126,   10, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,   58,   59,   60, 
+           -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   93,   94,   -1,   10,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  124,  125,   -1,   41,   -1,   -1,   44, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   58,   59,   60,   -1,   62,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  306,   -1,  308,  309, 
+          310,  311,  312,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+            0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  328,   -1, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  342,   -1,   -1,   -1,   -1,   -1,  348,   -1, 
+          125,   -1,  352,   -1,   -1,   -1,   -1,  357,  358,  359, 
+           -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59, 
+           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   -1,   -1,   93,   -1,   -1,   -1,   -1,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,    0,   -1,   -1,  125,   -1,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,   -1,   41,   -1,   -1,   44,  262,  263,  264, 
+          351,   -1,  267,  268,  269,  356,  271,   -1,   -1,   -1, 
+           58,   59,   -1,   -1,  279,   63,  281,  282,  283,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,   -1,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,  125,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   10, 
+           -1,  356,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,   -1,   -1,  370,   -1,   -1,  373,  279, 
+           -1,  281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1, 
+           41,  291,  292,   44,  294,  295,  296,  297,  298,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   -1, 
+           -1,   -1,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  351,   -1,   -1,   -1,   -1,  356,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
+          370,   -1,   -1,  373,  125,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  279,   -1,  281,  282,  283,   -1,   41,   -1,   -1, 
+           44,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   58,   59,   -1,   -1,   -1,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,  126,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,  262,  263,  264,  265,  266,  267, 
-          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
-          278,  279,  280,  281,  282,   -1,  284,  285,  286,  287, 
-          288,  289,  290,  291,  292,  293,  294,  295,  296,  297, 
-          298,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,  322,  323,  324,   -1,  326,  327, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,  341,  342,   -1,   -1,  345,  346,  347, 
-          348,  349,   -1,  351,  352,  353,  354,  355,  356,  357, 
-          358,  359,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,  370,   -1,   -1,   -1,  257,  258,  259,   -1, 
-          261,  262,  263,  264,  265,  266,  267,  268,  269,  270, 
-          271,  272,  273,  274,  275,  276,  277,  278,  279,   -1, 
-          281,  282,   -1,  284,  285,  286,  287,  288,  289,  290, 
-          291,  292,  293,  294,  295,  296,  297,  298,   -1,  300, 
-           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
-          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
-           -1,  322,  323,  324,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-          341,  342,   -1,   -1,  345,  346,  347,  348,  349,   -1, 
-          351,  352,  353,  354,  355,  356,  357,  358,  359,  360, 
-          361,  362,  363,  364,  365,  366,    0,  368,  369,  370, 
-           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
-           -1,   -1,   -1,   37,   38,   -1,   40,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1, 
-           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  123, 
-          124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
-           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,  262,  263, 
-          264,  265,  266,   -1,  268,  269,  270,  271,  272,  273, 
-          274,  275,  276,  277,  278,  279,  280,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
-          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
-           -1,  345,  346,  347,  348,  349,  350,  351,  352,  353, 
-          354,  355,   -1,  357,  358,  359,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,  370,   -1,   -1,   -1, 
-          257,  258,  259,   -1,  261,  262,  263,  264,  265,  266, 
-           -1,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
-          277,  278,  279,  280,   -1,   -1,   -1,  284,  285,  286, 
-          287,  288,  289,  290,  291,  292,  293,  294,  295,  296, 
-          297,  298,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
-          307,  308,  309,  310,  311,  312,  313,  314,  315,  316, 
-          317,  318,  319,   -1,   -1,  322,  323,  324,   -1,  326, 
-          327,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,  341,  342,   -1,   -1,  345,  346, 
-          347,  348,  349,  350,  351,  352,  353,  354,  355,   -1, 
-          357,  358,  359,  360,  361,  362,  363,  364,  365,  366, 
-            0,  368,  369,  370,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
-           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,  126,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           33,   -1,   -1,   -1,   37,   38,   -1,   40,   41,   42, 
-           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62, 
-           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
-           -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  335,  336,   93, 
+           -1,  339,  340,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
+           -1,   -1,   -1,  351,   -1,   -1,   10,   -1,  356,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  125,  370,   -1,   -1,  373,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1, 
+           44,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   -1,   -1,   -1,   58,   59,   -1,   -1,  279,   63, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93, 
+           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   10,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  335,  336,   -1,   -1,  339,  340, 
+           -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   41,   -1,  356,   44,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
+           58,   59,  373,   -1,   -1,   63,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,  283, 
+           -1,   -1,   -1,   -1,   -1,   93,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          123,  124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259, 
-           -1,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
-          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
-           -1,  281,  282,   -1,  284,  285,  286,  287,  288,  289, 
-          290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
-           -1,  351,  352,  353,  354,  355,  356,  357,  358,  359, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-          370,   -1,   -1,   -1,  257,  258,  259,   -1,  261,  262, 
-          263,  264,  265,  266,   -1,  268,  269,  270,  271,  272, 
-          273,  274,  275,  276,  277,  278,  279,  280,   -1,   -1, 
-           -1,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
-          293,  294,  295,  296,  297,  298,   -1,  300,   -1,   -1, 
-          303,  304,  305,  306,  307,  308,  309,  310,  311,  312, 
-          313,  314,  315,  316,  317,  318,  319,   -1,   -1,  322, 
-          323,  324,   -1,  326,  327,  328,  329,  330,  331,  332, 
-          333,  334,  335,  336,  337,  338,  339,  340,  341,  342, 
-           -1,   -1,  345,  346,  347,  348,  349,   -1,  351,  352, 
-          353,  354,  355,   -1,  357,  358,  359,  360,  361,  362, 
-          363,  364,  365,  366,    0,  368,  369,  370,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,  125,  322,   -1, 
+          324,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  335,  336,   -1,   -1,  339,  340,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  351,   -1,   -1, 
+           -1,   -1,  356,   -1,   41,   -1,   -1,   44,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,  370,  271,   -1,  373, 
+           -1,   58,   59,   -1,   -1,  279,   63,  281,  282,  283, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   10, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  335,  336,   -1,   -1,  339,  340,   -1,  125,   -1, 
+           41,   -1,   -1,   44,   -1,   -1,   -1,  351,   -1,   -1, 
+           -1,   -1,  356,   -1,  262,  263,  264,   58,   59,  267, 
+          268,  269,   63,  271,   -1,   -1,  370,   -1,   -1,  373, 
+           -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   93,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  125,   -1,   -1,  335,  336,   -1, 
+           -1,  339,  340,   -1,   -1,   41,   -1,   -1,   44,   -1, 
+           -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
+           -1,   -1,   58,   59,   -1,   -1,   -1,   63,   -1,   -1, 
+           -1,   -1,  370,   -1,   -1,  373,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   93,   -1,   -1, 
+           -1,   -1,  279,   -1,  281,  282,  283,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,    0,   -1,   -1,   -1,   -1,   -1,  125, 
+           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  336, 
+           -1,   -1,  339,  340,   41,   -1,   -1,   44,   -1,   -1, 
+           -1,  262,  263,  264,  351,   -1,  267,  268,  269,  356, 
+          271,   58,   59,   -1,   -1,   -1,   63,   -1,  279,   -1, 
+          281,  282,  283,  370,   -1,   -1,  373,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+          351,   -1,   44,   -1,   -1,  356,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   58,   59,   -1,  370, 
+           -1,   63,  373,  279,   -1,  281,  282,  283,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
+           -1,   93,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   40,   41,   42,   43,   44,   45, 
-           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1, 
-      };
-   }
-
-   private static final int[] yyCheck3() {
-      return new int[] {
-
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,  123,  124,  125,  126,   10,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
-           -1,   -1,   -1,   37,   38,   -1,   40,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
+           -1,   -1,   -1,  125,   -1,   41,   -1,   -1,   44,   -1, 
+           -1,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+          356,   -1,   58,   59,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,   -1,   -1,  373,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   93,   -1,    0, 
+           -1,   -1,  279,   -1,  281,  282,  283,   -1,   -1,   10, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           41,   -1,   -1,   44,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   58,   59,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1, 
-           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   93,  370,   -1,   -1,  373,  279,   -1,  281, 
+          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123, 
-          124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,   -1, 
-          261,  262,  263,  264,  265,  266,   -1,  268,  269,  270, 
-          271,  272,  273,  274,  275,  276,  277,  278,  279,  280, 
-           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
-          291,  292,  293,  294,  295,  296,  297,  298,   -1,  300, 
-           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
-          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
-           -1,  322,  323,  324,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-          341,  342,   -1,   -1,  345,  346,  347,  348,  349,   -1, 
-          351,  352,  353,  354,  355,   -1,  357,  358,  359,  360, 
-          361,  362,  363,  364,  365,  366,   -1,  368,  369,  370, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,  262,  263, 
-          264,  265,  266,   -1,  268,  269,  270,  271,  272,  273, 
-          274,  275,  276,  277,  278,  279,  280,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
-          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
-           -1,  345,  346,  347,  348,  349,   -1,  351,  352,  353, 
-          354,  355,   -1,  357,  358,  359,  360,  361,  362,  363, 
-          364,  365,  366,    0,  368,  369,  370,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+           -1,   -1,   44,   -1,   -1,   -1,  262,  263,  264,  351, 
+           -1,  267,  268,  269,  356,  271,   58,   59,   -1,   -1, 
+           -1,   -1,   -1,  279,   -1,  281,  282,  283,  370,   -1, 
+           -1,  373,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   93,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   10,   -1,   -1,  322,   -1,  324,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
-           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
+           -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   41,  351,   -1,   44,   -1,   -1, 
+          356,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
+          271,   58,   59,   -1,  370,   -1,   -1,  373,  279,   -1, 
+          281,  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,    0, 
+           -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1, 
+           41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,   58,   59,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   93,   -1,   -1,   -1,   -1,  279,   -1,  281, 
+          282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  351, 
+           -1,   -1,   -1,   -1,  356,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,    0,  271,   -1,   -1,   -1,  370,   -1, 
+           -1,  373,  279,   10,  281,  282,  283,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
+           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  262,  263,  264,  351,   -1,  267,  268,  269,  356, 
+          271,   -1,   -1,   -1,   91,   -1,   93,   94,  279,   -1, 
+          281,  282,  283,  370,   -1,   -1,  373,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,   -1,   -1,   -1, 
             0,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
            10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
-           40,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
-           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+          351,   -1,   -1,   -1,   -1,  356,   -1,   -1,   -1,   59, 
+           60,   -1,   62,   63,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1, 
+           -1,   91,   -1,   93,   94,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,  123,  124,  125,  126,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           257,  258,  259,   -1,  261,  262,  263,  264,  265,  266, 
-           -1,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
-          277,  278,  279,  280,   -1,   -1,   -1,  284,  285,  286, 
+          267,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
+          277,  278,  279,  280,  281,  282,   -1,  284,  285,  286, 
           287,  288,  289,  290,  291,  292,  293,  294,  295,  296, 
           297,  298,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
           307,  308,  309,  310,  311,  312,  313,  314,  315,  316, 
           317,  318,  319,   -1,   -1,  322,  323,  324,   -1,  326, 
           327,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
           337,  338,  339,  340,  341,  342,   -1,   -1,  345,  346, 
-          347,  348,  349,   -1,  351,  352,  353,  354,  355,   -1, 
+          347,  348,  349,   -1,  351,  352,  353,  354,  355,  356, 
           357,  358,  359,  360,  361,  362,  363,  364,  365,  366, 
            -1,  368,  369,  370,   -1,   -1,   -1,  257,  258,  259, 
-           -1,  261,  262,  263,  264,  265,  266,   -1,  268,  269, 
+           -1,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
           270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
-          280,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
+          280,  281,  282,   -1,  284,  285,  286,  287,  288,  289, 
           290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
           300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
           310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
            -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
           330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
           340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
-           -1,  351,  352,  353,  354,  355,   -1,  357,  358,  359, 
+           -1,  351,  352,  353,  354,  355,  356,  357,  358,  359, 
           360,  361,  362,  363,  364,  365,  366,    0,  368,  369, 
           370,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
@@ -5167,10 +5066,10 @@ private static final int[] yyCheck3() {
            63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
-           -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           93,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-          123,  124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
            -1,   37,   38,   -1,   40,   41,   42,   43,   44,   45, 
@@ -5181,11 +5080,11 @@ private static final int[] yyCheck3() {
            -1,   -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125, 
           126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261,  262, 
-          263,  264,  265,  266,   -1,  268,  269,  270,  271,  272, 
-          273,  274,  275,  276,  277,  278,  279,  280,   -1,   -1, 
+          263,  264,  265,  266,  267,  268,  269,  270,  271,  272, 
+          273,  274,  275,  276,  277,  278,  279,   -1,  281,  282, 
            -1,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
           293,  294,  295,  296,  297,  298,   -1,  300,   -1,   -1, 
           303,  304,  305,  306,  307,  308,  309,  310,  311,  312, 
@@ -5193,18 +5092,18 @@ private static final int[] yyCheck3() {
           323,  324,   -1,  326,  327,  328,  329,  330,  331,  332, 
           333,  334,  335,  336,  337,  338,  339,  340,  341,  342, 
            -1,   -1,  345,  346,  347,  348,  349,   -1,  351,  352, 
-          353,  354,  355,   -1,  357,  358,  359,  360,  361,  362, 
+          353,  354,  355,  356,  357,  358,  359,  360,  361,  362, 
           363,  364,  365,  366,   -1,  368,  369,  370,   -1,   -1, 
            -1,  257,  258,  259,   -1,  261,  262,  263,  264,  265, 
           266,   -1,  268,  269,  270,  271,  272,  273,  274,  275, 
-          276,  277,  278,  279,   -1,   -1,   -1,   -1,  284,  285, 
+          276,  277,  278,  279,  280,   -1,   -1,   -1,  284,  285, 
           286,  287,  288,  289,  290,  291,  292,  293,  294,  295, 
           296,  297,  298,   -1,  300,   -1,   -1,  303,  304,  305, 
           306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,  322,  323,  324,   94, 
+          316,  317,  318,  319,   -1,   -1,  322,  323,  324,   -1, 
           326,  327,  328,  329,  330,  331,  332,  333,  334,  335, 
           336,  337,  338,  339,  340,  341,  342,   -1,   -1,  345, 
-          346,  347,  348,  349,   -1,  351,  352,  353,  354,  355, 
+          346,  347,  348,  349,  350,  351,  352,  353,  354,  355, 
            -1,  357,  358,  359,  360,  361,  362,  363,  364,  365, 
           366,    0,  368,  369,  370,   -1,   -1,   -1,   -1,   -1, 
            -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
@@ -5218,1055 +5117,1349 @@ private static final int[] yyCheck3() {
            -1,   -1,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,  125,  126,   10,   -1, 
+           -1,   -1,   -1,   -1,  123,  124,  125,  126,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   33,  287,  288,  289,  290,   -1,   -1,   -1,   41, 
-           -1,   -1,   -1,   -1,   46,   -1,   -1,   -1,  303,  304, 
-          305,  306,   -1,   -1,   -1,  310,   -1,   59,  313,  314, 
-          315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,   -1, 
+           -1,   33,   -1,   -1,   -1,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
-           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,   -1,  354, 
-          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1,   -1, 
-           -1,  123,   -1,  125,  126,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91, 
+           -1,   93,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,  125,  126,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258, 
           259,   -1,  261,  262,  263,  264,  265,  266,   -1,  268, 
           269,  270,  271,  272,  273,  274,  275,  276,  277,  278, 
-          279,   -1,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          279,  280,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
           289,  290,  291,  292,  293,  294,  295,  296,  297,  298, 
            -1,  300,   -1,   -1,  303,  304,  305,  306,  307,  308, 
           309,  310,  311,  312,  313,  314,  315,  316,  317,  318, 
           319,   -1,   -1,  322,  323,  324,   -1,  326,  327,  328, 
           329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
           339,  340,  341,  342,   -1,   -1,  345,  346,  347,  348, 
-          349,   -1,  351,  352,  353,  354,  355,   -1,  357,  358, 
+          349,  350,  351,  352,  353,  354,  355,   -1,  357,  358, 
           359,  360,  361,  362,  363,  364,  365,  366,   -1,  368, 
           369,  370,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
           262,  263,  264,  265,  266,  267,  268,  269,  270,  271, 
-          272,  273,  274,  275,  276,  277,  278,  279,  280,  281, 
-           -1,   -1,  284,  285,  286,  287,  288,  289,  290,  291, 
+          272,  273,  274,  275,  276,  277,  278,  279,   -1,  281, 
+          282,   -1,  284,  285,  286,  287,  288,  289,  290,  291, 
           292,  293,  294,  295,  296,  297,  298,   -1,  300,   -1, 
            -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
           312,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-          322,  323,  324,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   10,   -1,   -1,  347,  348,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,  358,  359,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,  370,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
+          322,  323,  324,   -1,  326,  327,  328,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,  341, 
+          342,   -1,   -1,  345,  346,  347,  348,  349,   -1,  351, 
+          352,  353,  354,  355,  356,  357,  358,  359,  360,  361, 
+          362,  363,  364,  365,  366,    0,  368,  369,  370,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1, 
+           -1,   -1,   37,   38,   -1,   40,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59,   60,   61,   62,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   91,   -1,   93,   94,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1,   94, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  123,  124, 
+          125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37, 
+           38,   -1,   40,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   91,   -1,   93,   94,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
+           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   62,   63, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,  282,   -1,   -1,   91,   -1,   93, 
-           94,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,  262,  263,  264,   -1,  356,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,  370,  281,  282,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   91,   -1,   -1,   94,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
-          264,   -1,  370,  267,  268,  269,   -1,  271,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   10,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,  347,  348,   -1,   -1,  351,   -1,   37, 
-           38,   -1,  356,   41,   42,   43,   44,   45,   46,   47, 
-           -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,   -1, 
-           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,  262,  263,  264, 
+          265,  266,   -1,  268,  269,  270,  271,  272,  273,  274, 
+          275,  276,  277,  278,  279,  280,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,  291,  292,  293,  294, 
+          295,  296,  297,  298,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,  322,  323,  324, 
+           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,  341,  342,   -1,   -1, 
+          345,  346,  347,  348,  349,   -1,  351,  352,  353,  354, 
+          355,   -1,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  370,   -1,   -1,   -1,  257, 
+          258,  259,   -1,  261,  262,  263,  264,  265,  266,   -1, 
+          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
+          278,  279,  280,   -1,   -1,   -1,  284,  285,  286,  287, 
+          288,  289,  290,  291,  292,  293,  294,  295,  296,  297, 
+          298,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
+          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
+          318,  319,   -1,   -1,  322,  323,  324,   -1,  326,  327, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,  341,  342,   -1,   -1,  345,  346,  347, 
+          348,  349,   -1,  351,  352,  353,  354,  355,   -1,  357, 
+          358,  359,  360,  361,  362,  363,  364,  365,  366,    0, 
+          368,  369,  370,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   91,    0,   -1,   94,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  123,  124,  125,   -1,   -1, 
-           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
-           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
+           -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40, 
+           41,   42,   43, 
+      };
+   }
+
+   private static final int[] yyCheck3() {
+      return new int[] {
+
+           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,    0,   91,   -1,   -1,   94,   -1, 
-           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1, 
+           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125, 
-           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
-           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  123, 
+          124,  125,  126,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   -1,  271,   -1,   91,   -1,   -1,   94,   -1, 
-           -1,  279,  280,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
+           37,   38,   -1,   40,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,   -1,   -1,  262,  263,  264,   -1, 
-           -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,  279,  280,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
-          346,  347,  348,   -1,   -1,  351,  262,  263,  264,   -1, 
-           -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  279,  370,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   10, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
-          346,  347,  348,   -1,  350,  351,   37,   38,   -1,   -1, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  370,   -1,   -1,   -1,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
-           91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   10, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125,  126, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,   -1,   37,   38,   -1,   -1, 
-           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60, 
-           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  257,  258,  259,   -1,  261,  262,  263, 
+          264,  265,  266,   -1,  268,  269,  270,  271,  272,  273, 
+          274,  275,  276,  277,  278,  279,  280,   -1,   -1,   -1, 
+          284,  285,  286,  287,  288,  289,  290,  291,  292,  293, 
+          294,  295,  296,  297,  298,   -1,  300,   -1,   -1,  303, 
+          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
+          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
+          324,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,  341,  342,   -1, 
+           -1,  345,  346,  347,  348,  349,   -1,  351,  352,  353, 
+          354,  355,   -1,  357,  358,  359,  360,  361,  362,  363, 
+          364,  365,  366,   -1,  368,  369,  370,   -1,   -1,   -1, 
+          257,  258,  259,   -1,  261,  262,  263,  264,  265,  266, 
+           -1,  268,  269,  270,  271,  272,  273,  274,  275,  276, 
+          277,  278,  279,  280,   -1,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,  291,  292,  293,  294,  295,  296, 
+          297,  298,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,  312,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,  322,  323,  324,   -1,  326, 
+          327,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
+          337,  338,  339,  340,  341,  342,   -1,   -1,  345,  346, 
+          347,  348,  349,   -1,  351,  352,  353,  354,  355,   -1, 
+          357,  358,  359,  360,  361,  362,  363,  364,  365,  366, 
+            0,  368,  369,  370,   -1,   -1,   -1,   -1,   -1,   -1, 
+           10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
+           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           91,    0,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   37,   38, 
-           -1,   -1,   41,   42,   43,   44,   45,   46,   47,   -1, 
+           -1,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,   -1,  123,  124,  125,  126,   10,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  262,  263,  264,   -1,   -1,   -1,  268,  269,   -1, 
-          271,   -1,   91,   -1,   -1,   94,   -1,   -1,  279,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
+           33,   -1,   -1,   -1,   37,   38,   -1,   40,   41,   42, 
+           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,  350, 
-          351,  262,  263,  264,   -1,   -1,   -1,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,  370, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
+           -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          123,  124,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259, 
+           -1,  261,  262,  263,  264,  265,  266,   -1,  268,  269, 
+          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
+          280,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
+          290,  291,  292,  293,  294,  295,  296,  297,  298,   -1, 
+          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
+          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
+           -1,   -1,  322,  323,  324,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
+          340,  341,  342,   -1,   -1,  345,  346,  347,  348,  349, 
+           -1,  351,  352,  353,  354,  355,   -1,  357,  358,  359, 
+          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
+          370,   -1,   -1,   -1,  257,  258,  259,   -1,  261,  262, 
+          263,  264,  265,  266,   -1,  268,  269,  270,  271,  272, 
+          273,  274,  275,  276,  277,  278,  279,  280,   -1,   -1, 
+           -1,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
+          293,  294,  295,  296,  297,  298,   -1,  300,   -1,   -1, 
+          303,  304,  305,  306,  307,  308,  309,  310,  311,  312, 
+          313,  314,  315,  316,  317,  318,  319,   -1,   -1,  322, 
+          323,  324,   -1,  326,  327,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,  341,  342, 
+           -1,   -1,  345,  346,  347,  348,  349,   -1,  351,  352, 
+          353,  354,  355,   -1,  357,  358,  359,  360,  361,  362, 
+          363,  364,  365,  366,    0,  368,  369,  370,   -1,   -1, 
+           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329,  330, 
-          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
-           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,  350, 
-          351,   -1,   -1,  262,  263,  264,   -1,   -1,   -1,  268, 
-          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
-          279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
+           -1,   37,   38,   -1,   40,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,   -1,  322,   -1,  324,   10,   -1,   -1,  328, 
-          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
-          339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
-           -1,  350,  351,   37,   38,   -1,   -1,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  370,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   91,   -1,   -1,   94,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,    0,   91,   -1,   -1, 
-           94,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+          126,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
-           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
+           -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38, 
+           -1,   40,   41,   42,   43,   44,   45,   46,   47,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,    0,   -1, 
-           94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          124,  125,   -1,   -1,   -1,   37,   38,   -1,   -1,   41, 
-           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61, 
-           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
-          264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1,   91, 
-           -1,   -1,   94,   -1,   -1,  279,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   -1,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,  347,  348,   -1,  350,  351,  262,  263, 
-          264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  279,  370,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
-          324,   -1,   -1,   -1,  328,  329,  330,  331,  332,  333, 
-          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
-           -1,  345,  346,  347,  348,   -1,  350,  351,   -1,   -1, 
-          262,  263,  264,   -1,   -1,   -1,  268,  269,   -1,  271, 
-           -1,   -1,   -1,   -1,   -1,   -1,  370,  279,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
-          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,  126,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
-          322,   -1,  324,   10,   -1,   -1,  328,  329,  330,  331, 
-          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
-           -1,   -1,   -1,  345,  346,  347,  348,   -1,  350,  351, 
-           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
-           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
+           -1,  257,  258,  259,   -1,  261,  262,  263,  264,  265, 
+          266,   -1,  268,  269,  270,  271,  272,  273,  274,  275, 
+          276,  277,  278,  279,   -1,   -1,   -1,   -1,  284,  285, 
+          286,  287,  288,  289,  290,  291,  292,  293,  294,  295, 
+          296,  297,  298,   -1,  300,   -1,   -1,  303,  304,  305, 
+          306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
+          316,  317,  318,  319,   -1,   -1,  322,  323,  324,   -1, 
+          326,  327,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,  341,  342,   -1,   -1,  345, 
+          346,  347,  348,  349,   -1,  351,  352,  353,  354,  355, 
+           -1,  357,  358,  359,  360,  361,  362,  363,  364,  365, 
+          366,   -1,  368,  369,  370,   -1,   -1,   -1,  257,  258, 
+          259,   -1,  261,  262,  263,  264,  265,  266,   -1,  268, 
+          269,  270,  271,  272,  273,  274,  275,  276,  277,  278, 
+          279,   -1,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          289,  290,  291,  292,  293,  294,  295,  296,  297,  298, 
+           -1,  300,   -1,   -1,  303,  304,  305,  306,  307,  308, 
+          309,  310,  311,  312,  313,  314,  315,  316,  317,  318, 
+          319,   -1,   -1,  322,  323,  324,   -1,  326,  327,  328, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+          339,  340,  341,  342,   -1,   -1,  345,  346,  347,  348, 
+          349,   -1,  351,  352,  353,  354,  355,   -1,  357,  358, 
+          359,  360,  361,  362,  363,  364,  365,  366,    0,  368, 
+          369,  370,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,    0,   91,   -1,   -1,   94,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+           -1,   -1,   -1,   -1,   46,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1, 1037, 
+         1038,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   91,    0,   -1,   94,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
+           -1,  123,   -1,  125,  126,   -1, 1104, 1105,   -1,   -1, 
+         1108,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
+           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1142,   -1,   59,   60,   -1,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1, 1163,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
+           93,   94,   -1, 1181,   -1,   -1,   -1, 1185,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+         1198, 1199, 1200, 1201,   -1,   -1,   -1, 1205, 1206,   -1, 
+         1208,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+            0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           10,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
+          262,  263,  264,  265,  266,  267,  268,  269,  270,  271, 
+          272,  273,  274,  275,  276,  277,  278,  279,  280,  281, 
+           -1,   41,  284,  285,  286,  287,  288,  289,  290,  291, 
+          292,  293,  294,  295,  296,  297,  298,   -1,  300,   59, 
+           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+          312,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+          322,  323,  324,   -1,  326,  327,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   93,   -1,   -1,   -1,   -1, 1316,  341, 
+          342, 1319,   -1,   -1,   -1,  347,  348,  349,   -1, 1327, 
+          352,  353,  354,  355,   -1,  357,  358,  359,  360,  361, 
+          362,  363,  364,  365,  366,  125,  368,  369,  370,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298, 1384,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   -1,   10,   -1,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,  347,  348,   -1,   -1,  351,   -1, 
+           37,   38,   -1,  356,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+           -1,   -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
+           -1,  271,   -1,    0,   91,   -1,   93,   94,   -1,  279, 
+           -1,  281,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
+           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
+           47,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   59,   60,   -1,   62,   63,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
-           -1,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
-           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   59,   60,   61,   62,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   91,   -1,   93,   94,   -1,    0, 
+          370,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   -1, 
+           41,   42,   43,   44,   45,   46,   47,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60, 
+           61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
-           -1,  268,  269,   -1,  271,   -1,   91,   -1,   -1,   94, 
-           -1,   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           91,   -1,  279,   94,  281,  282,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  123,  124,  125,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 1037, 
+         1038,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
+          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
+          347,  348,   -1,   -1,  351,  262,  263,  264,   -1,  356, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,  370,  281,  282,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
-          125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          297,  298,   -1,   -1,   -1,   -1, 1104, 1105,   -1,   -1, 
+         1108,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
            -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-          347,  348,   -1,  350,  351,  262,  263,  264,   -1,   -1, 
+          337,  338,  339,  340, 1142,   -1,   -1,   -1,  345,  346, 
+          347,  348,   -1,   -1,  351,   -1,   -1,   -1,   -1,  356, 
+           -1,  262,  263,  264,   -1, 1163,   -1,  268,  269,   -1, 
+          271,   -1,   -1,  370,   -1,   -1,   -1,   -1,  279,  280, 
+           -1,   -1,   -1, 1181,   -1,   -1,   -1, 1185,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+         1198, 1199, 1200, 1201,   -1,   -1,   -1, 1205, 1206,   -1, 
+         1208,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   10,   -1,   -1,  328,  329,  330, 
+          331,  332,  333,  334,  335,  336,  337,  338,  339,  340, 
+           -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1,   -1, 
+          351,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370, 
+           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,    0,   91,   -1,   -1,   94,   -1, 
+           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 1316,   -1, 
+           -1, 1319,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1327, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,  124,  125, 
+           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1, 1384,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   91,    0,   -1,   94,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42,   43, 
+           44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62,   63, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           -1,   -1,  268,  269,   -1,  271,   -1,   91,   -1,   -1, 
+           94,   -1,   -1,  279,  280,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,  347,  348,   -1,   -1,  351,  262,  263,  264,   -1, 
+           -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,  370,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,  347,  348,   -1,  350,  351,   -1,   -1,  262,  263, 
+          264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,  279,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   10,   -1,   -1,  328,  329,  330,  331,  332,  333, 
+          334,  335,  336,  337,  338,  339,  340,   -1,   -1,   -1, 
+           -1,  345,  346,  347,  348,   -1,  350,  351,   37,   38, 
+           -1,   -1,   41,   42,   43,   44,   45,   46,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,   -1, 
+           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   37,   38, 
+           -1,   -1,   41,   42,   43,   44,   45,   46,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           59,   60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   91,    0,   -1,   94,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
+           37,   38,   -1,   -1,   41,   42,   43,   44,   45,   46, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   59,   60,   61,   62,   63,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1,  268, 
+          269,   -1,  271,   -1,   91,   -1,   -1,   94,   -1,   -1, 
+          279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
+           -1,  350,  351,  262,  263,  264,   -1,   -1,   -1,  268, 
+          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          279,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328, 
+          329,  330,  331,  332,  333,  334,  335,  336,  337,  338, 
+          339,  340,   -1,   -1,   -1,   -1,  345,  346,  347,  348, 
+           -1,  350,  351,   -1,   -1,  262,  263,  264,   -1,   -1, 
            -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  279,  370,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  370,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
           297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   10,   -1, 
            -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
           337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-          347,  348,   -1,  350,  351,   -1,   -1,  262,  263,  264, 
-           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,  370,  279,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+          347,  348,   -1,  350,  351,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  370,   -1,   -1,   -1,   59,   60,   61, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   91, 
+           -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   10,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-            0,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           10,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
-          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
-          345,  346,  347,  348,   -1,  350,  351,   37,   38,   -1, 
-           -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,   -1,   59, 
-           60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,  125,   -1,   37,   38,   -1,   -1,   41, 
+           42,   43,   44,   45,   46,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61, 
+           62,   63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-            0,   91,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91, 
+            0,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,   37,   38,   -1, 
+           -1,   -1,  124,  125,   -1,   -1,   -1,   37,   38,   -1, 
            -1,   41,   42,   43,   44,   45,   46,   47,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
            60,   61,   62,   63,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   -1,   -1,   -1,  268,  269,   -1,  271, 
+           -1,   91,   -1,   -1,   94,   -1,   -1,  279,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,    0,   -1,   94,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1,   37, 
-           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
+          322,   -1,  324,   -1,   -1,   -1,  328,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
+           -1,   -1,   -1,  345,  346,  347,  348,   -1,  350,  351, 
+          262,  263,  264,   -1,   -1,   -1,  268,  269,   -1,  271, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,  370,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,  328,  329,  330,  331, 
+          332,  333,  334,  335,  336,  337,  338,  339,  340,   -1, 
+           -1,   -1,   -1,  345,  346,  347,  348,   -1,  350,  351, 
            -1,   -1,  262,  263,  264,   -1,   -1,   -1,  268,  269, 
-           -1,  271,   -1,   91,   -1,   -1,   94,   -1,   -1,  279, 
+           -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,  370,  279, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
-            0,  351,  262,  263,  264,   -1,   -1,   -1,  268,  269, 
-           10,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
-          370,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  291,  292,   -1,  294,  295,  296,  297,  298,   -1, 
-           -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,  328,  329, 
+           -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,  322,   -1,  324,   10,   -1,   -1,  328,  329, 
           330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
           340,   -1,   -1,   -1,   -1,  345,  346,  347,  348,   -1, 
-           -1,  351,   -1,   93,  262,  263,  264,   -1,    0,   -1, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   10,   -1, 
-          370,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,  125,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
-           -1,   -1,   44,   -1,   -1,    0,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   10,  324,   59,   -1,   -1, 
-          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
-          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
-          348,   -1,   -1,  351,    0,   -1,   41,   -1,   -1,   44, 
-           -1,   93,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   -1,   59,   -1,   -1,   -1,   -1,   -1, 
+          350,  351,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          370,   -1,   -1,   -1,   59,   60,   61,   62,   63,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  125,   -1,   41,   -1,   -1,   44,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
-           -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  262,  263,  264,   -1,   -1,  267,  268,  269, 
-          125,  271,   -1,   -1,   -1,   -1,   -1,   93,   -1,  279, 
-           -1,  281,  282,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  291,  292,    0,  294,  295,  296,  297,  298,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,  124,  125, 
+           -1,   -1,   -1,   -1,   -1,    0,   91,   -1,   -1,   94, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   41,   -1,   -1,   44,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   -1,   -1,   -1,  356,   -1,   -1,   -1, 
-          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
-          370,   -1,   -1,   41,   -1,   -1,   44,  279,   -1,  281, 
-          282,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,  291, 
-          292,   59,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   37,   38,   -1,   -1,   41,   42,   43,   44, 
+           45,   46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59,   60,   61,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   91,    0,   -1,   94, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   37,   38,   -1,   -1,   41,   42, 
+           43,   44,   45,   46,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   61,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,  124,  125,   -1, 
-          322,   -1,  324,   -1,  279,   93,  281,  282,   -1,   -1, 
+           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   91,   -1, 
+           -1,   94,   -1,   -1,  279,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,  356,  271,  124,  125,   -1,   -1, 
-           -1,   -1,   -1,  279,   -1,  281,   -1,  322,  370,  324, 
-           -1,   -1,   -1,    0,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,  347,  348,   -1,  350,  351,  262,  263,  264, 
+           -1,   -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  279,  370,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  356,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,   -1,   41,  370,   -1,   44,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,  347,  348,   -1,  350,  351,   -1,   -1,  262, 
+          263,  264,   -1,   -1,   -1,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,  370,  279,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   59,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  322, 
+           -1,  324,   10,   -1,   -1,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,  347,  348,   -1,   -1,  351,   37, 
+           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  370,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   93,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,  281,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,    0,   -1,  262,  263,  264,  124,  125,  267, 
-          268,  269,   10,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,   -1,  322,   -1,  324,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,    0,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1, 
-           -1,   10,   -1,   -1,  351,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,  370,   -1,   -1,   -1,   -1,   -1,    0, 
-           -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   10, 
-           -1,   -1,   -1,  351,   -1,   93,   -1,   -1,   -1,   -1, 
-           59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           41,   -1,   -1,   44,   -1,   -1,    0,  125,   -1,   -1, 
-           -1,   -1,   -1,   -1,   93,   -1,   10,   -1,   59,   -1, 
-           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,  281,   -1,  125,   41,   -1,   -1, 
-           44,   -1,   93,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,   -1,   59,   -1,   -1,   -1,    0, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   10, 
-           -1,   -1,   -1,   -1,  125,  322,   -1,  324,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           41,   -1,   -1,   44,  351,   -1,    0,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   59,   -1, 
-           -1,  125,   -1,  370,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,    0,   -1,   41,   -1,   -1, 
-           44,  279,   93,  281,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   59,  294,  295,  296,  297, 
-          298,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
-          269,   -1,  271,   -1,  125,   -1,   41,   -1,   -1,   -1, 
-          279,   -1,  281,   -1,  322,   -1,  324,   -1,   -1,   93, 
-           -1,   -1,  291,  292,   59,  294,  295,  296,  297,  298, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,  351,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,  125,   -1,  322,   -1,  324,   -1,   -1,   93,    0, 
-          291,  292,  370,  294,  295,  296,  297,  298,   -1,   10, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-          125,  322,   -1,  324,   -1,  279,   -1,  281,   -1,   -1, 
-           41,  370,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,   -1,   59,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,  322,  370, 
-          324,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   93,   -1,   -1,   -1,   -1,   -1,  279,   -1, 
-          281,   -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,    0,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   59,   10,   -1,  125,   -1,  370,   -1,  262,  263, 
-          264,   -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1, 
-           -1,  322,   -1,  324,   -1,  279,   -1,  281,   -1,   -1, 
-           -1,   -1,   -1,   41,   -1,   93,   -1,  291,  292,   -1, 
-          294,  295,  296,  297,  298,   -1,   -1,  262,  263,  264, 
-           -1,   59,  267,  268,  269,    0,  271,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   10,  281,  125,  322,  370, 
-          324,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,    0,   -1,   -1,   -1,   41,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,   -1,   59,   -1,  370,  125,   -1,   -1, 
+           -1,   -1,    0,   91,   -1,   -1,   94,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   59,   -1,   -1,   -1,  370,   -1,   -1,  279,   -1, 
-          281,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
-          125,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
-           -1,  322,   -1,  324,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,   -1,   -1,   -1,  125,   -1,   -1, 
-           -1,  279,   -1,  281,   -1,   41,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,  370, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,   -1,  271,  322,   -1,  324,   -1,   -1,    0, 
-           -1,  279,   -1,  281,   -1,   -1,   -1,   -1,   -1,   10, 
-           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125, 
-           41,   -1,  370,   -1,  322,   -1,  324,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,   -1,  271,   -1,   59,   -1, 
-           -1,   -1,   -1,    0,  279,   -1,  281,   -1,   -1,   -1, 
-           -1,   -1,   -1,   10,   -1,   -1,  291,  292,   -1,  294, 
-          295,  296,  297,  298,  262,  263,  264,   -1,   -1,  267, 
-          268,  269,  370,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,  281,   41,   -1,   -1,  322,   -1,  324, 
-           -1,   -1,   -1,  291,  292,    0,  294,  295,  296,  297, 
-          298,   -1,   59,   -1,  125,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   37, 
+           38,   -1,   -1,   41,   42,   43,   44,   45,   46,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  370,   41,    0,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
-           -1,   -1,   -1,   -1,   59,   -1,  262,  263,  264,   -1, 
-           -1,  267,  268,  269,   -1,  271,   -1,   -1,  125,   -1, 
-           -1,   -1,  370,  279,   -1,  281,   -1,   -1,   41,   -1, 
-           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
-          296,  297,  298,   -1,   -1,   -1,   59,   -1,   -1,   -1, 
+           -1,   59,   60,   61,   62,   63,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-          125,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  262,  263,  264,   -1,   -1,  267,  268,  269,   -1, 
-          271,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,    0, 
-          281,   -1,  125,   41,  370,   -1,   44,   -1,   -1,   10, 
-          291,  292,    0,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   59,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           41,  322,   -1,  324,   -1,  262,  263,  264,   -1,   -1, 
-          267,  268,  269,   41,  271,   -1,   -1,   -1,   59,   -1, 
-           -1,   -1,  279,   -1,  281,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
-          297,  298,   -1,   -1,    0,   -1,   -1,  125,   -1,  370, 
-           -1,   -1,   -1,   -1,   10,   -1,   -1,  262,  263,  264, 
-           -1,   -1,  267,  268,  269,  322,  271,  324,   -1,   -1, 
-           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  125,   41,  291,  292,   -1,  294, 
-          295,  296,  297,  298,   -1,   -1,   -1,  125,   -1,  262, 
-          263,  264,   -1,   59,  267,  268,  269,   -1,  271,   -1, 
-           -1,   -1,    0,  370,   -1,   -1,   -1,  322,  281,  324, 
-           -1,   -1,   10,   -1,   -1,   -1,   -1,   -1,  291,  292, 
-           -1,  294,  295,  296,  297,  298,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   41,    0,   -1,   -1,   -1,   -1,  322, 
-           -1,  324,   -1,   -1,   10,  370,   -1,   -1,   -1,  125, 
-           -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   -1,  271,   -1,   41,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
-           -1,   -1,   -1,   59,   -1,   -1,  294,  295,  296,  297, 
-          298,  262,  263,  264,   -1,   -1,   -1,  268,  269,   -1, 
-          271,   -1,    0,   -1,  262,  263,  264,  125,  279,   -1, 
-          268,  269,   10,  271,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,  279,    0,  294,  295,  296,  297,  298,   -1,   -1, 
-           -1,   -1,   10,   -1,   -1,   -1,  294,  295,  296,  297, 
-          298,   -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,  125, 
-           -1,  322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,  370,   41,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1, 
-           -1,   59,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  279,   -1,   -1,   -1,   -1,   -1,  370, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  294,  295, 
-          296,  297,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
-           -1,   -1,   -1,   -1,  262,  263,  264,  125,   -1,   -1, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  279,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  294,  295,  296,  297, 
-           -1,   -1,   -1,   -1,  370,   -1,  262,  263,  264,   33, 
-           -1,   -1,  268,  269,   -1,  271,   40,   -1,   -1,   -1, 
-           -1,   -1,   46,  279,  322,   -1,  324,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   -1,  294,  295, 
-          296,  297,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   91,    0,   -1,   94,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1, 
+           -1,   37,   38,   -1,   -1,   41,   42,   43,   44,   45, 
+           46,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   60,   61,   62,   63,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  322,   91,  324,   -1, 
-           -1,   -1,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,  123, 
-           -1,  279,  126,   -1,  262,  263,  264,   -1,   -1,   -1, 
-          268,  269,   10,  271,  370,   -1,  294,  295,  296,  297, 
+          268,  269,   -1,  271,   -1,   91,   -1,   -1,   94,   -1, 
            -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   33,  294,  295,  296,  297, 
-           -1,   -1,   40,   -1,  322,   -1,  324,   -1,   46,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,  125, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   59,   60,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
+          348,   -1,    0,  351,  262,  263,  264,   -1,   -1,   -1, 
+          268,  269,   10,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  279,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   59,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1, 
+          328,  329,  330,  331,  332,  333,  334,  335,  336,  337, 
+          338,  339,  340,   -1,   -1,   -1,   -1,  345,  346,  347, 
+          348,   -1,   -1,  351,   -1,   93,  262,  263,  264,   -1, 
+            0,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           10,   -1,  370,  279,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,  125,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   41,   -1,   -1,   44,   -1,   -1,    0,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   10,  324,   59, 
+           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,  347,  348,   -1,   -1,  351,    0,   -1,   41,   -1, 
+           -1,   44,   -1,   93,   -1,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  370,   -1,   59,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   91,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  125,   -1,   41,   -1,   -1, 
+           44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           93,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  123,   -1,   -1,  126,   -1, 
-           -1,   -1,  256,  257,  258,  259,  260,  261,  262,  263, 
-          264,  265,  266,   -1,   -1,  269,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   -1,  280,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,  347,  348,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,  257, 
-          258,  259,  260,  261,  262,  263,  264,  265,  266,   -1, 
-           -1,  269,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   -1,  280,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
-           -1,  299,  300,  301,  302,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,  322,  323,   -1,   -1,  326,  327, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,    0,  267, 
+          268,  269,  125,  271,   -1,   -1,   -1,   -1,   10,   93, 
+           -1,  279,   -1,  281,  282,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   41, 
+           -1,  125,   44,   -1,   -1,   -1,   10,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  322,   -1,  324,   59,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1, 
+           44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  356,   -1, 
+           -1,   93,  262,  263,  264,   59,   -1,  267,  268,  269, 
+           -1,  271,  370,   -1,   -1,   -1,   -1,   -1,   -1,  279, 
+           -1,  281,  282,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  291,  292,  125,  294,  295,  296,  297,  298,   93, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,  322,   -1,  324,   -1,  279,   -1,  281,  282, 
+          124,  125,   -1,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,  356,  271,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  279,   -1,  281,  282,  322, 
+          370,  324,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,    0,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  356,   -1,   -1,   -1,   -1,  322,   -1, 
+          324,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,  356,   -1,   59,   -1,   -1,  279,   -1,  281, 
+          282,   -1,   -1,   -1,   -1,   -1,  370,   -1,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   -1,  262,  263, 
+          264,   -1,   -1,  267,  268,  269,   -1,  271,   93,   -1, 
+           -1,    0,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1, 
+          322,   10,  324,   -1,   -1,   -1,   -1,  291,  292,   -1, 
+          294,  295,  296,  297,  298,   -1,   -1,   -1,   -1,  124, 
+          125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0, 
+           -1,   -1,   41,   -1,  356,   44,   -1,   -1,  322,   10, 
+          324,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  370,   -1, 
+           59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  351,   -1,   -1, 
+           41,   -1,   -1,   44,   -1,   -1, 1037, 1038,   -1,   -1, 
+           -1,   -1,   -1,   -1,   93,   -1,  370,   -1,   59,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   10,   -1,   -1,  347, 
-          348,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-           -1,   -1,  360,  361,  362,  363,  364,  365,  366,   33, 
-          368,  369,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1, 
-           -1,   -1,   46,   -1,   -1,   -1, 1023, 1024,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  124,  125,   -1,   -1,   -1, 
+           -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1, 1104, 1105,   -1,   -1, 1108,   10,   -1, 
+           -1,   -1,   -1,   -1,  125,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,   -1,   41, 
+           -1, 1142,   44,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,   -1,   59,   -1,   -1, 
+           -1,   -1, 1163,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  322,   10,  324, 
+         1181,   -1,   -1,   -1, 1185,   -1,   -1,   -1,   -1,   -1, 
+           -1,   93,   -1,   -1,   -1,   -1,   -1, 1198, 1199, 1200, 
+         1201,   -1,   -1,   -1, 1205, 1206,  351, 1208,   -1,   41, 
+           -1,   -1,   44,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,  125,   -1,  370,   -1,   59,   -1,   -1, 
+          279,   -1,  281,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,  262,  263,  264,   -1,    0,  267,  268,  269,   -1, 
+          271,   93,   -1,   -1,   -1,   10,   -1,   -1,  279,   -1, 
+          281,   -1,   -1,  322,   -1,  324,   -1,   -1,   -1,   -1, 
+          291,  292,   -1,  294,  295,  296,  297,  298,   -1,   -1, 
+           -1,   -1,   -1,  125,    0,   -1,   41,   -1,   -1,   44, 
+           -1,   -1,  351,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,  322,   -1,  324,   59, 1316,   -1,   -1, 1319,   -1, 
+           -1,  370,   -1,   -1,   -1,   -1, 1327,   -1,   -1,   -1, 
+           -1,   -1,    0,   -1,   -1,   41,   -1,   -1,   44,   -1, 
+          351,   -1,   10,   -1,   -1,   -1,   -1,   -1,   93,   -1, 
+           -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,  370, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   -1,   41,    0,   -1,   44,  279,   -1,  281, 
+          125,   -1,   -1, 1384,   10,   -1,   -1,   93,   -1,  291, 
+          292,   59,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1, 
+           -1,   -1,   -1,   -1,    0,   41,   -1,   -1,   -1,  125, 
+          322,   -1,  324,   -1,   10,   93,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   59,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
+           -1,   -1,   -1,   -1,   -1,   41,   -1,  125,   -1,  291, 
+          292,   -1,  294,  295,  296,  297,  298,   93,  370,   -1, 
+           -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,   -1,   -1,   -1,   -1,   -1,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  279,   -1,  281,   -1,  370,  125, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,    0,  281,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,   -1,   10,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  279,   -1,  281,   -1,   41,  322,   -1,  324,   -1, 
+           -1,    0,   -1,  291,  292,  370,  294,  295,  296,  297, 
+          298,   10,   -1,   59,   -1,   -1,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,  322,  281,  324,   -1,   -1,   -1, 
+           -1,   -1,   41,   -1,  370,  291,  292,   93,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,  262,  263,  264,   -1, 
+           59,  267,  268,  269,    0,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   10,  281,  322,   -1,  324,  125, 
+           -1,   -1,  370,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   93,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   41,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,   -1,   59,  370,   -1,  125,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,    0,   41,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1, 
+           59,   -1,   -1,   -1,  370,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,   10,  125, 
+           -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1, 
+           59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  262,  263,  264,   41, 
+           -1,  267,  268,  269,   -1,  271,  125,   -1,   -1,   -1, 
+           -1,   -1,   -1,  279,   93,  281,   -1,   59,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  262,  263,  264,  125,   -1,  267,  268, 
+          269,   93,  271,   -1,   -1,    0,  322,   -1,  324,   -1, 
+          279,   -1,  281,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   -1, 
+           -1,   -1,   -1,  322,  370,  324,  262,  263,  264,   -1, 
+           -1,  267,  268,  269,   59,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,    0,  279,   -1,  281,   -1,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1,  291,  292,   -1,  294,  295, 
+          296,  297,  298,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,  370,  271,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          279,   -1,  281,   41,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+          125,   59,   -1,  262,  263,  264,   -1,    0,  267,  268, 
+          269,   -1,  271,   -1,   -1,   -1,   -1,   10,   -1,   -1, 
+          279,   -1,  281,  322,   -1,  324,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,  370,  294,  295,  296,  297,  298, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   41,  271, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281, 
+           -1,   10,   -1,  322,   -1,  324,   59,  125,   -1,  291, 
+          292,  370,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   41,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+           59,  370,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  125,   -1,   41,   -1,   -1,  262,  263,  264, 
+           -1,   -1,  267,  268,  269,   -1,  271,   -1,  370,   -1, 
+           -1,   -1,   59,   -1,  279,   -1,  281,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  291,  292,   -1,  294, 
+          295,  296,  297,  298,   -1,   -1,  125,   -1,   -1,   -1, 
+           -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   10,   -1,   -1,   -1,  322,   -1,  324, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   -1,   -1,   -1,   -1,  125,   -1, 
+           -1,  279,   -1,  281,   41,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  291,  292,   -1,  294,  295,  296,  297, 
+          298,   -1,   59,   -1,   -1,  370,   -1,   -1,   -1,   -1, 
+           -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,  322,   -1,  324,   -1,   -1,  262, 
+          263,  264,   -1,   -1,  267,  268,  269,   -1,  271,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,  281,   -1, 
+           -1,   -1,   41,   -1,   -1,   -1,   -1,   -1,  291,  292, 
+           -1,  294,  295,  296,  297,  298,   -1,   -1,  125,   -1, 
+           59,   -1,  370,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   -1,   -1,   -1,   -1,   -1,   -1,  322, 
+          279,  324,  281,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,    0,   -1, 
+           -1,   -1,  279,  322,  281,  324,  125,  370,   10,   -1, 
+           -1,   -1,   -1,   -1,  291,  292,   -1,  294,  295,  296, 
+          297,  298,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+           -1,   -1,   44,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,  370,   -1,   -1,   -1,   -1,   -1,   59, 1037, 1038, 
+           -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1,  262,  263,  264,   -1,   -1, 
+          267,  268,  269,   -1,  271,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  279,  370,  281,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   41,  291,  292,   44,  294,  295,  296, 
+          297,  298,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   59,   10,  125,   -1, 1104, 1105,   -1,   -1, 1108, 
+           -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1,   -1, 
+           -1,   -1,   -1,  262,  263,  264,   -1,   -1,  267,  268, 
+          269,   -1,  271,   41,    0,   -1,   -1,   -1,   -1,   -1, 
+          279,   -1,  281, 1142,   10,   -1,   -1,   -1,   -1,   -1, 
+           -1,   59,  291,  292,   -1,  294,  295,  296,  297,  298, 
+           -1,   -1,   -1,  370, 1163,   -1,   -1,  125,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   41,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1181,  322,   -1,  324, 1185,   -1,   -1,   -1, 
+           -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1, 1198, 
+         1199, 1200, 1201,   -1,   -1,   -1, 1205, 1206,   -1, 1208, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  370,   -1,   10,   -1,   -1,   -1,   -1,   -1,   -1, 
+          262,  263,  264,   -1,   -1,  267,  268,  269,   -1,  271, 
+           -1,   -1,   -1,   -1,   -1,   -1,   33,  279,   -1,  125, 
+           -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,   46, 
+           -1,   -1,  294,  295,  296,  297,  298,   -1,   -1,   -1, 
+           -1,   -1,   59,   60,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          322,   -1,  324,   -1,  262,  263,  264,   -1,   -1,  267, 
+          268,  269,   -1,  271,   91,   -1,   -1, 1316,   -1,   -1, 
+         1319,  279,   -1,   -1,   -1,   -1,   -1,   -1, 1327,  351, 
+           -1,   -1,   -1,   -1,   -1,   -1,  294,  295,  296,  297, 
+          298,   -1,   -1,   -1,   -1,   -1,  123,   -1,  370,  126, 
+           -1,   -1,   -1,   -1,  262,  263,  264,   -1,   -1,   -1, 
+          268,  269,   -1,  271,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   10,   -1,   -1, 1384,  294,  295,  296,  297, 
+           -1,   -1,   -1,  351,   -1,   -1,  262,  263,  264,   -1, 
+           -1,   -1,  268,  269,   -1,  271,   -1,   -1,   -1,   -1, 
+           -1,   -1,  370,  279,  322,   -1,  324,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  294,  295, 
+          296,  297,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1, 1090, 1091,   -1,   -1, 1094,   -1,  123, 
-           10,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  322,   -1,  324,   -1, 
+           -1,   -1,  370,   -1,   -1,   -1,   94,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256, 
+          257,  258,  259,  260,  261,  262,  263,  264,  265,  266, 
+           -1,   -1,  269,  270,   -1,  272,  273,  274,  275,  276, 
+          277,  278,   -1,  280,  370,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
+           -1,   -1,  299,  300,  301,  302,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,  322,  323,   -1,   -1,  326, 
+          327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   10,   -1,   -1, 
+          347,  348,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
+          357,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
+           33,  368,  369,   -1,   -1,   -1,   -1,   40,   -1,   -1, 
+           -1,   -1,   -1,   46,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1, 
-           40, 1128,   -1,   -1,   -1,   -1,   46,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59, 
-           60,   -1, 1149,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-         1167,   -1,   -1,   -1, 1171,   -1,   -1,   -1,   -1,   -1, 
-           -1,   91,   -1,   -1,   -1,   -1,   -1, 1184, 1185, 1186, 
-         1187,   -1,   -1,   -1, 1191, 1192,   -1, 1194,   -1,   -1, 
-           -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,  256,  257,  258,  259,  260,  261,  262,  263, 
-          264,  265,  266,   -1,   -1,  269,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   -1,  280,   -1,   94,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  124,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-           -1,   -1,  326,  327,   -1, 1302,   -1,   -1, 1305,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1, 1313,  341,  342,   -1, 
-           -1,   -1,   -1,  347,  348,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,  256,  257,  258,  259, 
-          260,  261,  262,  263,  264,  265,  266,   -1,   -1,  269, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   -1, 
-           -1,   -1,   -1, 1370,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299, 
-          300,  301,  302,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,  322,  323,   -1,   -1,  326,  327,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  287, 
+          288,  289,  290,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  303,  304,  305,  306,   -1, 
+          123,   10,  310,  126,   -1,  313,  314,  315,  316,  317, 
+           -1,   -1,   -1,   -1,   -1,  323,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1, 
+           -1,   40,   -1,  341,  342,   -1,   -1,   46,   -1,   -1, 
+           -1,  349,   -1,   -1,  352,   -1,  354,  355,   -1,  357, 
+           59,   60,  360,  361,  362,  363,  364,  365,  366,   -1, 
+          368,  369,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,  347,  348,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,  357,   33,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   46,  298,   -1, 1023, 1024,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   59,   60, 1023, 1024,   -1,   -1, 
+           -1,   -1,   91,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1, 
+           45,   -1,   47,   -1,  123,   -1,   -1,  126,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1, 
+           -1,   -1,   -1,  256,  257,  258,  259,  260,  261,  262, 
+          263,  264,  265,  266,   -1,   -1,  269,  270,   -1,  272, 
+          273,  274,  275,  276,  277,  278,   -1,  280,   -1,   94, 
+           -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
+          293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302, 
+          303,  304,  305,  306,  307,  308,  309,  310,  311,  124, 
+          313,  314,  315,  316,  317,  318,  319,   -1,   -1,  322, 
+          323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342, 
+           -1,   -1,   -1,   -1,  347,  348,  349,   -1,   -1,  352, 
+          353,  354,  355,   -1,  357,   -1,   -1,  360,  361,  362, 
+          363,  364,  365,  366,   -1,  368,  369,  256,  257,  258, 
+          259,  260,  261,  262,  263,  264,  265,  266,   -1,   -1, 
+          269,  270,   -1,  272,  273,  274,  275,  276,  277,  278, 
+           -1,  280,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1, 
+          299,  300,  301,  302,  303,  304,  305,  306,  307,  308, 
+          309,  310,  311,   -1,  313,  314,  315,  316,  317,  318, 
+          319,   -1,   -1,  322,  323,   -1,   -1,  326,  327,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  341,  342,   -1,   10,   -1,   -1,  347,  348, 
+          349,   -1,   -1,  352,  353,  354,  355,   -1,  357,   -1, 
+           -1,  360,  361,  362,  363,  364,  365,  366,   33,  368, 
+          369,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1, 
+           -1,   46,   -1,   -1, 1037, 1038,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59,   60,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,   -1,   -1,   -1,   -1,   91,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  328,  329,  330,  331,  332,  333,  334,  335, 
-          336,  337,  338,  339,  340,   -1,   91,   -1,   -1,  345, 
-          346,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1, 1090, 1091,   -1,   -1, 1094,   -1,   -1,   -1,   10, 
-           -1,  126,   -1, 1090, 1091,   -1,   -1, 1094,   -1,   -1, 
+           -1, 1104, 1105,   -1,   -1, 1108,   -1,   -1,   -1,   10, 
+           -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1, 1128, 
+           -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1, 1142, 
+           -1,   -1,   -1,   -1,   -1,   46,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60, 
+         1163,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1181,   -1, 
+           -1,   -1, 1185,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           91,   -1,   -1,   -1,   -1, 1198, 1199, 1200, 1201,   -1, 
+           -1,   -1, 1205, 1206,   -1, 1208,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1, 1128,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1, 
-         1149,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1, 1149,   -1,   -1,   -1,   -1,   -1, 1167,   -1, 
-           -1,   -1, 1171,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-         1167,   -1,   -1,   -1, 1171, 1184, 1185, 1186, 1187,   -1, 
-           -1,   -1, 1191, 1192,   -1, 1194,   -1, 1184, 1185, 1186, 
-         1187,   -1,   -1,   -1, 1191, 1192,   -1, 1194,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           41,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,  256,  257,  258,  259,  260,  261,  262,  263,  264, 
           265,  266,   -1,   -1,  269,  270,   -1,  272,  273,  274, 
           275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
           285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
-           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
+           -1,   -1,   -1,   94,  299,  300,  301,  302,  303,  304, 
           305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
           315,  316,  317,  318,  319,   -1,   -1,  322,  323,   -1, 
-           -1,  326,  327, 1302,   -1,   -1, 1305,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1, 1313, 1302,  341,  342, 1305,   -1, 
-           -1,   -1,  347,  348,  349,   -1, 1313,  352,  353,  354, 
-          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+           -1,  326,  327, 1316,   -1,   -1, 1319,   -1,   10,   -1, 
+           -1,   -1,   -1,   -1, 1327,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,  347,  348,  349,   -1,   -1,  352,  353,  354, 
+          355,   33,  357,   -1,   -1,  360,  361,  362,  363,  364, 
           365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
-          261,  262,  263,  264,  265,  266,   -1,  268,  269,  270, 
-          271,  272,  273,  274,  275,  276,  277,  278,  279,   -1, 
-           -1, 1370,   -1,  284,  285,  286,  287,  288,  289,  290, 
-           -1,   -1,  293, 1370,   -1,   -1,   10,   -1,  299,  300, 
+          261,  262,  263,  264,  265,  266,   -1,   59,  269,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1, 1384,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
           301,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
-          311,   -1,  313,  314,  315,  316,  317,  318,  319,   33, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
            -1,  322,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
-           -1,   -1, 1023, 1024,   -1,   -1,   -1,   -1,   -1,   -1, 
-          341,  342,   -1,   -1,   -1,   59,   -1,   61,  349,   -1, 
-           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
+           -1,   -1,   10,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,  347,  348,  349,   -1, 
+           -1,  352,  353,  354,  355,   33,  357,   -1,   -1,  360, 
           361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  287,  288,  289,  290, 
+           -1,   59,   -1,   61,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  303,  304,  305,  306,   -1,   -1,   -1,  310, 
+           -1,  312,  313,  314,  315,  316,  317,   -1,   -1,   -1, 
+           -1,   -1,  323,   -1,   -1,   -1,   -1,  328,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1090, 
-         1091,   -1,   -1, 1094,   -1,   -1,   -1,   -1,   -1,   -1, 
-           10,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   33,   -1,   -1,   -1, 1128,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1149,   59, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1, 1167,   -1,   -1,   -1, 
-         1171,   -1,   -1,   -1,   10,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1, 1184, 1185, 1186, 1187,   -1,   -1,   -1, 
-         1191, 1192,   -1, 1194,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1, 
-           -1,   -1,  256,  257,  258,  259,  260,  261,  262,  263, 
-          264,  265,  266,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,   -1,  354,  355,   -1,  357,  358,  126,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,   -1,   -1,  256,  257,  258,  259,  260,  261, 
+          262,  263,  264,  265,  266,   -1,  268,  269,  270,  271, 
+          272,  273,  274,  275,  276,  277,  278,  279,   -1,   -1, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
+           -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301, 
+          302,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+          322,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
+          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
+          352,  353,  354,  355,   33,  357,   -1,   -1,  360,  361, 
+          362,  363,  364,  365,  366,   -1,  368,  369,  256,  257, 
+          258,  259,  260,  261,  262,  263,  264,  265,  266,   -1, 
+           59,  269,  270,   -1,  272,  273,  274,  275,  276,  277, 
+          278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
+          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
+           -1,  299,  300,  301,  302,  303,  304,  305,  306,  307, 
+          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
+          318,  319,   -1,   -1,  322,  323,   -1,   -1,  326,  327, 
+           -1,   -1,   -1,   -1,   -1,   10,   -1,  126,   -1,   -1, 
+           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
+           -1,  349,   -1,   -1,  352,  353,  354,  355,   33,  357, 
+           -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
+          368,  369,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1, 
       };
    }
 
    private static final int[] yyCheck4() {
       return new int[] {
 
-           -1,  269,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   -1,   -1,   -1,   94,   -1,  284,  285,  286,  287, 
+           -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
+           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  126,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1, 
+           -1,   -1,   -1,   -1,  256,  257,  258,  259,  260,  261, 
+          262,  263,  264,  265,  266,   -1,   -1,  269,  270,   -1, 
+          272,  273,  274,  275,  276,  277,  278,   -1,  124,   -1, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
+           -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301, 
+          302,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+          322,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
+           -1,   10,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
+          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
+          352,  353,  354,  355,   33,  357,   -1,   -1,  360,  361, 
+          362,  363,  364,  365,  366,   -1,  368,  369,  256,  257, 
+          258,  259,  260,  261,  262,  263,  264,  265,  266,   -1, 
+           59,  269,  270,   -1,  272,  273,  274,  275,  276,  277, 
+          278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
           288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
            -1,  299,  300,  301,  302,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  124,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,  322,  323,   -1, 1302,  326,  327, 
-         1305,   -1,   -1,   -1,   -1,   10,   -1,   -1, 1313,   -1, 
+          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
+          318,  319,   -1,  279,  322,  323,   -1,   -1,  326,  327, 
+           -1,   -1,   -1,   -1,   -1,   10,  125,  126,   -1,   -1, 
            -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
            -1,  349,   -1,   -1,  352,  353,  354,  355,   33,  357, 
            -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,  256,  257,  258,  259,  260,  261,  262,  263, 
-          264,  265,  266,   -1,   59,  269,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278, 1370,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,  322,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   10, 
-           -1,  126,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   33,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1, 
+          368,  369,  328,  329,  330,  331,  332,  333,  334,  335, 
+          336,  337,  338,  339,  340,   -1,   -1,   -1,   -1,  345, 
+          346,   -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   37,   38,   -1,   -1,   -1,   42, 
+           43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62, 
+           63,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   94,   -1,   -1,   -1,   -1,   -1,  256,  257,  258, 
+          259,  260,  261,   -1,   -1,   -1,  265,  266,   -1,   -1, 
+           -1,  270,   -1,  272,  273,  274,  275,  276,  277,  278, 
+           -1,  124,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          289,  290,   -1,   -1,  293,   -1,   -1,   -1,   10,   -1, 
+          299,  300,  301,  302,  303,  304,  305,  306,  307,  308, 
+          309,  310,  311,   -1,  313,  314,  315,  316,  317,  318, 
+          319,   33,   -1,   -1,  323,   -1,   -1,  326,  327,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  341,  342,   -1,   -1,   -1,   59,   -1,   -1, 
+          349,   -1,   -1,  352,  353,  354,  355,   -1,  357,   -1, 
+           -1,  360,  361,  362,  363,  364,  365,  366,   -1,  368, 
+          369,   -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   10,   -1,  126,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   33,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  298,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,   -1,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  328,  329,  330,  331,  332, 
+          333,  334,  335,  336,  337,  338,  339,  340,   -1,   -1, 
+           -1,   -1,  345,  346,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  126,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  256,  257,  258,  259,   -1,  261, 
+           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
+          272,  273,  274,  275,  276,  277,  278,   -1,   -1,   -1, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
+           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
+           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
+          342,   -1, 1037, 1038,   -1,   -1,   -1,  349,   -1,   -1, 
+          352,  353,  354,  355,   -1,   -1,   -1,   -1,  360,  361, 
+          362,  363,  364,  365,  366,   -1,  368,  369,   -1,  257, 
+          258,  259,   -1,  261, 1037, 1038,   -1,  265,  266,   -1, 
+           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
+          278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
+          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 1104, 
+         1105,   -1,  300, 1108,   -1,  303,  304,  305,  306,  307, 
+          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
+          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
+           -1, 1104, 1105,   -1,   -1, 1108,   -1, 1142, 1037, 1038, 
+           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
+           -1,  349,   -1,   -1,  352,  353,  354,  355, 1163,   -1, 
+           -1,   -1,  360,  361,  362,  363,  364,  365,  366, 1142, 
+          368,  369,   -1,   -1,   -1,   -1, 1181,   -1,   -1,   -1, 
+         1185,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+         1163,   -1,   -1, 1198, 1199, 1200, 1201,   -1,   33,   -1, 
+         1205, 1206,   -1, 1208,   -1, 1104, 1105,   -1, 1181, 1108, 
+           -1,   -1, 1185,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   59, 1198, 1199, 1200, 1201,   -1, 
+           -1,   -1, 1205, 1206,   -1, 1208,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1, 1142,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1163,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1181,   -1,   -1,   -1, 1185,   -1,   -1,   -1, 
+           -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1198, 
+         1199, 1200, 1201,   -1,   -1,   -1, 1205, 1206,   -1, 1208, 
+           -1, 1316,   33,   -1, 1319,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1, 1327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1, 
+           -1,   -1,   -1, 1316,   -1,   -1, 1319,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1, 1327,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  328,  329, 
-          330,  331,  332,  333,  334,  335,  336,  337,  338,  339, 
-          340,   -1,   -1,   -1,   -1,  345,  346,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1384, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1,   -1, 
+           -1, 1384,   -1,   -1,   -1,   -1,   -1, 1316,   -1,   -1, 
+         1319,  256,  257,  258,  259,  260,  261,   -1, 1327,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   33,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319, 1384,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
+          261,  126,   -1,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   33,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
+          301,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,   -1,   -1,   -1,  126,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  256,  257,  258,  259,  260,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
+          301,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,  256,  257,  258,  259,  260,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
+           -1,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,  358,  359,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,  358,  359,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,  357,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,  358,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,   -1,  358,  359,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,  312,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,   -1,  358,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,  256,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
+          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
+          355,  126,   -1,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           37,   38,   -1,   -1,   -1,   42,   43,   -1,   45,   -1, 
-           47,   -1,   -1,   -1,  125,  126,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1,   -1, 
-           -1,  256,  257,  258,  259,  260,  261,  262,  263,  264, 
-          265,  266,   -1,   -1,  269,  270,   -1,  272,  273,  274, 
-          275,  276,  277,  278,   -1,   -1,   -1,   94,   -1,  284, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
+          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
           285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
-           -1,   -1,   -1,   -1,  299,  300,  301,  302,  303,  304, 
-          305,  306,  307,  308,  309,  310,  311,  124,  313,  314, 
-          315,  316,  317,  318,  319,   10,   -1,  322,  323,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
+          315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
            -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   33,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
            -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
-          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,  256,  257,  258,  259,  260, 
-          261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270, 
+          355,  126,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   33,   -1,  265,  266,   -1,   -1,   -1,  270, 
            -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
            -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
-           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300, 
-          301,  302,  303,  304,  305,  306,  307,  308,  309,  310, 
+           -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
           311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
-           10,  126,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          341,  342,   -1,   33,   -1,   -1,   -1,   -1,  349,   -1, 
-           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
-          361,  362,  363,  364,  365,  366,   -1,  368,  369,   59, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   10,  126,   -1,   -1,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,  126,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
            -1,   -1,  257,  258,  259,   -1,  261,   -1,   33,   -1, 
           265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
           275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
           285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
            -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
-          305,  306,  307,  308,  309,  310,  311,  312,  313,  314, 
+          305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
           315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
            -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
            -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
-          355,  126,  357,  358,  359,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,   -1,  256,  257,  258,  259, 
-           -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   -1, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   33,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
+          355,  126,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,  257,  258,  259,   -1, 
+          261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           33,   -1,  293,   -1,   -1,   -1,   -1,   40,   -1,  300, 
+           -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1, 1023, 1024,   59,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,   -1,   -1,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
+          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
            -1,   -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1, 
-          265,  266,   -1,   -1,   -1,  270,   -1,  272,  273,  274, 
+          265,  266,   -1,  126,   -1,  270,   -1,  272,  273,  274, 
           275,  276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284, 
-          285,  286,  287,  288,  289,  290,   -1,   -1,  293,   -1, 
-           -1,   -1, 1090, 1091,  126,  300, 1094,   -1,  303,  304, 
+          285,  286,  287,  288,  289,  290,   33,   -1,  293,   -1, 
+           -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304, 
           305,  306,  307,  308,  309,  310,  311,   -1,  313,  314, 
           315,  316,  317,  318,  319,   -1,   -1,   -1,  323,   -1, 
-           -1,  326,  327,   -1,   -1,   -1,   33,   -1,   -1,   -1, 
-         1128,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
            -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
-          355, 1149,   59,   -1,   -1,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1, 1167, 
-           -1,   -1,   -1, 1171,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1, 1184, 1185, 1186, 1187, 
-           -1,   -1,   -1, 1191, 1192,   -1, 1194,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          355,   -1,  357,   -1,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  126, 
-           -1,   -1,   -1,   -1,  256,  257,  258,  259,  260,  261, 
-           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
-          272,  273,  274,  275,  276,  277,  278,   33,   -1,   -1, 
-           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
-           -1,  293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301, 
-          302,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1, 1302,   -1,   -1, 1305,   -1,  341, 
-          342,   -1,   -1,   -1,   -1, 1313,   -1,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,   -1,   -1,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,   -1,   -1, 
-          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256, 
-          257,  258,  259,  260,  261,   -1,   -1,   -1,  265,  266, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261,   -1, 
+           33,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
+          273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
+           -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
+          293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1, 
+          303,  304,  305,  306,  307,  308,  309,  310,  311,   -1, 
+          313,  314,  315,  316,  317,  318,  319,   -1,   -1,   -1, 
+          323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342, 
+           -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
+          353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
+          363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
+          257,  258,  259,   -1,  261,   -1,   33,   -1,  265,  266, 
            -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
-          277,  278, 1370,   33,   -1,   -1,   -1,  284,  285,  286, 
+          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
           287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
-           -1,   -1,  299,  300,  301,  302,  303,  304,  305,  306, 
+           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
           307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
           317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326, 
           327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
-           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
-          357,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
-           -1,  368,  369,   -1,   -1,   -1,  126,   -1,   -1,   -1, 
-          256,  257,  258,  259,  260,  261,   -1,   -1,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   33,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,  299,  300,  301,  302,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-           -1,  357,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  256,  257,  258,  259, 
-          260,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   33, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299, 
-          300,  301,  302,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,  357,   -1,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   -1,  126,   -1,   -1,   -1,  256,  257,  258,  259, 
-          260,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   33, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,  299, 
-          300,  301,  302,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,  357,   -1,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  256,  257,  258,  259,  260,  261,   -1,   -1, 
-           -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   33,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,  299,  300,   -1,  302,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,   -1,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,  126,   -1, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,   -1,   -1, 
-           -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   33,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,  312,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,   -1,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,  358,  359,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,  126,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
-           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   33,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
-           -1,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
-           -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-          358,  359,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,   -1,   -1,  126,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
-           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   33,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
-           -1,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,  312,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
-           -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-          358,  359,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,   -1,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
-           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
-          272,  273,  274,  275,  276,  277,  278,   33,   -1,   -1, 
-           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
-           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
-           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-          312,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,  358,  359,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,   -1,   -1, 
-          126,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
-           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
-          272,  273,  274,  275,  276,  277,  278,   33,   -1,   -1, 
-           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
-           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
-           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-          312,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,  358,  359,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,   -1,   -1, 
-          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   33,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-           -1,  357,  358,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   33,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,  312,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-           -1,   -1,  358,  359,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,   -1,   -1,  126,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259, 
-           -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   33, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,  312,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,   -1,  358,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   -1,  126,   -1,   -1,   -1,  256,  257,  258,  259, 
-           -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   33, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
-           -1,   -1,   -1,  323,   -1,   -1,  326,  327,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,   -1,   -1,   -1, 
-          360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-           -1,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,   -1,   -1, 
-           -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   33,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,   -1,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,  126,   -1, 
-           -1,   -1,   -1,  257,  258,  259,   -1,  261,   -1,   -1, 
-           -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
-          274,  275,  276,  277,  278,   33,   -1,   -1,   -1,   -1, 
-          284,  285,  286,  287,  288,  289,  290,   -1,   -1,  293, 
-           -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1,  303, 
-          304,  305,  306,  307,  308,  309,  310,  311,   -1,  313, 
-          314,  315,  316,  317,  318,  319,   -1,   -1,   -1,  323, 
-           -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1, 
-           -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
-          364,  365,  366,   -1,  368,  369,   -1,   -1,  126,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
-           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   33,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1, 
-           -1,   -1,  300,   -1,   -1,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
-           -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-           -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,   -1,   -1,  126,   -1,   -1,   -1,   -1,  257, 
-          258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
-           -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
-          278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,   -1,   -1,  293,   -1,   33,   -1,   -1, 
-           -1,   -1,  300,   -1,   40,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
-          318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326,  327, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1, 
-           -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,  357, 
-           -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
-          368,  369,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,  261, 
-          126,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
-          272,  273,  274,  275,  276,  277,  278,   -1,   -1,   -1, 
-           33,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
-           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
-           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
-           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
-           -1,  323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
-          352,  353,  354,  355,   -1,  357,   -1,   -1,  360,  361, 
-          362,  363,  364,  365,  366,   -1,  368,  369,   -1,   -1, 
-           -1,   -1,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   33,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-          126,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,  126, 
+           -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
+           -1,  368,  369,   -1,  257,  258,  259,   -1,  261,   -1, 
            33,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
           273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
            -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
@@ -6278,18 +6471,18 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
           353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
           363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   33,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-          126,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
+          257,  258,  259,   -1,  261,   -1,   33,   -1,  265,  266, 
+           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
+          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
+           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326, 
+          327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,  126, 
+           -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
+           -1,  368,  369,   -1,  257,  258,  259,   -1,  261,   -1, 
            33,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
           273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
            -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
@@ -6301,18 +6494,18 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
           353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
           363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   33,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-          126,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
+          257,  258,  259,   -1,  261,   -1,   33,   -1,  265,  266, 
+           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
+          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
+           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326, 
+          327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,  126, 
+           -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
+           -1,  368,  369,   -1,  257,  258,  259,   -1,  261,   -1, 
            33,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
           273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
            -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
@@ -6320,22 +6513,22 @@ private static final int[] yyCheck4() {
           303,  304,  305,  306,  307,  308,  309,  310,  311,   -1, 
           313,  314,  315,  316,  317,  318,  319,   -1,   -1,   -1, 
           323,   -1,   -1,  326,  327,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342, 
-           -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
-          353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
-          363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
-           -1,  257,  258,  259,   -1,  261,   -1,   -1,   -1,  265, 
-          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
-          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
-           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
-          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
-          326,  327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
-           -1,   93,   94,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,  342, 
+           -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
+          353,  354,  355,  126,   -1,   -1,   -1,  360,  361,  362, 
+          363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
+          257,  258,  259,   -1,  261,   -1,   -1,   -1,  265,  266, 
+           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
+          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
+          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
+           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
+          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
+          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,  326, 
+          327,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
+           -1,   93,   94,  360,  361,  362,  363,  364,  365,  366, 
+           -1,  368,  369,   -1,  257,  258,  259,   -1,  261,   -1, 
            -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
           273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
            -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
@@ -6365,13 +6558,13 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            94,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   41, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           124,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258, 
           259,  260,  261,  262,  263,  264,  265,  266,  267,  268, 
           269,  270,  271,  272,  273,  274,  275,  276,  277,  278, 
-          279,  280,   94,   -1,   -1,  284,  285,  286,  287,  288, 
+          279,  280,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
           289,  290,  291,  292,  293,   -1,   -1,   -1,   -1,   -1, 
           299,  300,  301,  302,  303,  304,  305,  306,  307,  308, 
            -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
@@ -6389,305 +6582,270 @@ private static final int[] yyCheck4() {
            -1,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
           334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343, 
           344,  345,  346,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           37,   38,   -1,  357,  358,   42,   43,  361,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,  287,  288,  289,  290,   -1, 
-           -1,   -1,   -1,   60,   -1,   62,   63,   -1,   -1,   -1, 
-           -1,  303,  304,  305,  306,   -1,   -1,   -1,  310,   -1, 
-          312,  313,  314,  315,  316,  317,   -1,   -1,   -1,   -1, 
-           -1,  323,   -1,   -1,   -1,   -1,  328,   94,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341, 
-          342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
-          352,   -1,  354,  355,   -1,  357,  358,  124,  360,  361, 
-          362,  363,  364,  365,  366,   33,  368,  369,   -1,   37, 
-           38,   -1,   40,   -1,   42,   43,   -1,   45,   -1,   47, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,  126,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   -1,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
+           -1,   33,   -1,  357,  358,   37,   38,  361,   40,   -1, 
+           42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1, 
+           62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1, 
-           96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1, 
-          126,  328,  329,  330,  331,  332,  333,  334,  335,  336, 
-          337,  338,  339,  340,   -1,   -1,   -1,   -1,  345,  346, 
-           -1,   -1,   -1,   -1,  351,   -1,   -1,   -1,   -1,  257, 
-          258,  259,  260,  261,  262,  263,  264,  265,  266,  267, 
-          268,  269,  270,  271,  272,  273,  274,  275,  276,  277, 
-          278,  279,  280,   -1,   -1,   -1,  284,  285,  286,  287, 
-          288,  289,  290,  291,  292,  293,   -1,   44,   -1,   -1, 
-           -1,  299,  300,  301,  302,  303,  304,  305,  306,  307, 
-          308,  309,  310,  311,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327, 
-          328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337, 
-          338,   -1,   -1,   -1,   -1,  343,  344,  345,  346,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  357, 
-          358,  257,  258,  259,  260,  261,  262,  263,  264,  265, 
-          266,  267,  268,  269,  270,  271,  272,  273,  274,  275, 
-          276,  277,  278,  279,  280,   -1,   -1,   -1,  284,  285, 
-          286,  287,  288,  289,  290,  291,  292,  293,   -1,   -1, 
-           -1,   -1,   -1,  299,  300,  301,  302,  303,  304,  305, 
-          306,  307,  308,  309,  310,  311,   -1,   -1,   -1,   -1, 
+           -1,   -1,   94,   -1,   96,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
-           -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38, 
-           -1,  357,  358,   42,   43,   -1,   45,   -1,   47,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           -1,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          257,  258,  259,   -1,  261,   94,   -1,   96,  265,  266, 
-           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
-          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
-          287,  288,  289,  290,   -1,  124,  293,  126,   -1,   -1, 
-           -1,   -1,   -1,  300,   -1,   44,  303,  304,  305,  306, 
-          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
-          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   37,   38,   94,   -1,   96,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   63,   -1, 
+           -1,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
-           -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
-           -1,  368,  369,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94, 
+           -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,  261, 
+          262,  263,  264,  265,  266,  267,  268,  269,  270,  271, 
+          272,  273,  274,  275,  276,  277,  278,  279,  280,  124, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,  291, 
+          292,  293,   -1,   44,   -1,   -1,   -1,  299,  300,  301, 
+          302,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40,   -1, 
-           42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1, 
-           62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258, 
-          259,  260,  261,  262,  263,  264,  265,  266,  267,  268, 
-          269,  270,  271,  272,  273,  274,  275,  276,  277,  278, 
-          279,  280,   94,   -1,   96,  284,  285,  286,  287,  288, 
-          289,  290,  291,  292,  293,   -1,   -1,   -1,   -1,   -1, 
-          299,  300,  301,  302,  303,  304,  305,  306,  307,   -1, 
-           -1,  310,  124,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,   -1,  343,  344,  345,  346,  257,  258, 
-          259,   -1,  261,   -1,   -1,   -1,  265,  266,  357,  358, 
-           -1,  270,   -1,  272,  273,  274,  275,  276,  277,  278, 
-           -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
-          289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1, 
-           -1,  300,   -1,   -1,  303,  304,  305,  306,  307,  308, 
-          309,  310,  311,   -1,  313,  314,  315,  316,  317,  318, 
-          319,   -1,   33,   -1,  323,   -1,   37,   38,   -1,   40, 
-           -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60, 
-          349,   62,   -1,  352,  353,  354,  355,   -1,   -1,   -1, 
-           -1,  360,  361,  362,  363,  364,  365,  366,   -1,  368, 
-          369,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   94,   -1,   96,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,  306,  307,   -1,   -1,  310,   -1, 
-           -1,   -1,   -1,  124,   60,  126,   62,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  326,  327,  328,  329,  330,  331, 
           332,  333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1, 
-           -1,  343,  344,  345,  346,   -1,   -1,   -1,   94,   -1, 
-           96,   -1,   -1,   -1,   33,  357,  358,   -1,   37,   38, 
-           -1,   40,   -1,   42,   43,   -1,   45,   -1,   47,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1, 
-          126,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37, 
-           38,   -1,   40,   -1,   42,   43,   -1,   45,   -1,   47, 
-           -1,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1,   -1, 
-           -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1, 
-           33,   -1,   -1,   -1,   37,   38,   94,   40,   96,   42, 
+           -1,  343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  357,  358,  257,  258,  259, 
+          260,  261,  262,  263,  264,  265,  266,  267,  268,  269, 
+          270,  271,  272,  273,  274,  275,  276,  277,  278,  279, 
+          280,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
+          290,  291,  292,  293,   -1,   -1,   -1,   -1,   -1,  299, 
+          300,  301,  302,  303,  304,  305,  306,  307,  308,  309, 
+          310,  311,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+           33,   -1,   -1,   -1,   37,   38,   -1,  357,  358,   42, 
            43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62, 
-           -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,  126,   -1, 
-           -1,   -1,   -1,   -1,   -1,  306,  307,   -1,   -1,  310, 
+           -1,   -1,   -1,  328,  329,  330,  331,  332,  333,  334, 
+          335,  336,  337,  338,  339,  340,   -1,   -1,   -1,   -1, 
+          345,  346,   -1,   -1,   -1,   -1,  257,  258,  259,   -1, 
+          261,   94,   -1,   96,  265,  266,   -1,   -1,   -1,  270, 
+           -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
+           -1,   -1,   -1,  284,  285,  286,  287,  288,  289,  290, 
+           -1,  124,  293,  126,   -1,   -1,   -1,   -1,   -1,  300, 
+           -1,   44,  303,  304,  305,  306,  307,  308,  309,  310, 
+          311,   -1,  313,  314,  315,  316,  317,  318,  319,   -1, 
+           -1,   -1,  323,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   94,   -1,   96,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,   -1,   -1,  337,  338,   -1,   -1, 
-           -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1,   -1, 
-           -1,  124,   -1,  126,   33,   -1,  357,  358,   37,   38, 
-           -1,   40,   -1,   42,   43,   -1,   45,   -1,   47,   -1, 
-          306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1, 
-           -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
+           -1,  352,  353,  354,  355,   -1,   -1,   -1,   -1,  360, 
+          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
+           -1,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
+           -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  257,  258,  259,  260,  261,  262, 
+          263,  264,  265,  266,  267,  268,  269,  270,  271,  272, 
+          273,  274,  275,  276,  277,  278,  279,  280,   94,   -1, 
+           96,  284,  285,  286,  287,  288,  289,  290,  291,  292, 
+          293,   -1,   -1,   -1,   -1,   -1,  299,  300,  301,  302, 
+          303,  304,  305,  306,  307,   -1,   -1,  310,  124,   -1, 
+          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  326,  327,  328,  329,  330,  331,  332, 
+          333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1, 
+          343,  344,  345,  346,  257,  258,  259,   -1,  261,   -1, 
+           -1,   -1,  265,  266,  357,  358,   -1,  270,   -1,  272, 
+          273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
+           -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
+          293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1, 
+          303,  304,  305,  306,  307,  308,  309,  310,  311,   -1, 
+          313,  314,  315,  316,  317,  318,  319,   -1,   33,   -1, 
+          323,   -1,   37,   38,   -1,   40,   -1,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,  349,   62,   -1,  352, 
+          353,  354,  355,   -1,   -1,   -1,   -1,  360,  361,  362, 
+          363,  364,  365,  366,   -1,  368,  369,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94, 
+           -1,   96,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1, 
+          306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1,  124, 
+           60,  126,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
            -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1,   -1, 
-           -1,  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,   -1, 
-           -1,  310,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,   -1,  343,  344,  345,  346,  306,  307, 
-           -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,  357,  358, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327, 
-          328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337, 
-          338,   -1,   -1,   -1,   -1,  343,  344,  345,  346,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  357, 
-          358,   -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1, 
+          346,   -1,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1, 
+           33,  357,  358,   -1,   37,   38,   -1,   40,   -1,   42, 
+           43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,   -1,  126,   60,   -1,   62, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   33,   -1,   -1,   -1,   37,   38,   -1,   40,   -1, 
+           42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1, 
+           -1,   94,   -1,   96,   -1,   -1,   -1,   -1,   60,   -1, 
+           62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,  124,   -1,  126,   -1,   -1,   33,   -1,   -1,   -1, 
+           37,   38,   94,   40,   96,   42,   43,   -1,   45,   -1, 
+           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1, 
+           -1,   -1,  124,   -1,  126,   -1,   -1,   -1,   -1,   -1, 
+           -1,  306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96, 
+           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
+           -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344, 
+          345,  346,   -1,   -1,   -1,   -1,   -1,  124,   -1,  126, 
+           33,   -1,  357,  358,   37,   38,   -1,   40,   -1,   42, 
+           43,   -1,   45,   -1,   47,   -1,  306,  307,   -1,   -1, 
+          310,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+           -1,   94,   -1,   96,   -1,   -1,   -1,  357,  358,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1, 
+           -1,  124,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,  326,  327,  328,  329,  330,  331,  332, 
           333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1, 
-          343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   33,   -1,  357,  358,   37,   38,   -1,   40, 
+          343,  344,  345,  346,  306,  307,   -1,   -1,  310,   -1, 
+           -1,   -1,   -1,   -1,  357,  358,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,  326,  327,  328,  329,  330,  331, 
+          332,  333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1, 
+           -1,  343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,  357,  358,   -1,   -1,  306, 
+          307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  326, 
+          327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1, 
+          337,  338,   -1,   -1,   -1,   -1,  343,  344,  345,  346, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1, 
+          357,  358,   37,   38,   -1,   40,   -1,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94, 
+           -1,   96,   -1,  326,  327,  328,  329,  330,  331,  332, 
+          333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1, 
+          343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1,  124, 
+           -1,  126,   33,   -1,  357,  358,   37,   38,   -1,   40, 
            -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60, 
            -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,   -1, 
-           -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   94,   -1,   96,   -1,  326,  327,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1, 
-           -1,   -1,   -1,  124,   -1,  126,   33,   -1,  357,  358, 
-           37,   38,   -1,   40,   -1,   42,   43,   -1,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1, 
+           -1,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1,   -1, 
+           60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96, 
+           -1,   37,   38,  124,   40,  126,   42,   43,   -1,   45, 
+           -1,   47,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   33,   -1,   -1,   -1,   37,   38,  124,   40,  126, 
-           42,   43,   -1,   45,   -1,   47,   -1,   -1,   94,   -1, 
-           96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1, 
-           62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,  124,   -1, 
-          126,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
-           -1,   47,   94,   -1,   96,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,  124,   -1,  126,   37,   38,   -1, 
+           40,   -1,   42,   43,   -1,   45,   -1,   47,   94,   -1, 
+           96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1, 
+          126,  306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1, 
+           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
+           -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344, 
+          345,  346,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1, 
+           33,   -1,  357,  358,   37,   38,   -1,   40,   -1,   42, 
+           43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  124,   -1,  126,  306,  307,   -1,   -1,  310, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1, 
-           96,   -1,   -1,   -1,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,   -1,   -1,  337,  338,   -1,   -1, 
-           -1,   -1,  343,  344,  345,  346,   -1,   -1,  124,   -1, 
-          126,   -1,   -1,   -1,   33,   -1,  357,  358,   37,   38, 
-           -1,   40,   -1,   42,   43,   -1,   45,   -1,   47,   -1, 
+           -1,   -1,   -1,   -1,   -1,  306,  307,   -1,   -1,  310, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306, 
-          307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1,  326, 
-          327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1, 
-          337,  338,   -1,   -1,   -1,   -1,  343,  344,  345,  346, 
-          306,  307,   -1,   -1,  310,  124,   -1,  126,   -1,   -1, 
-          357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
-           -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,  306,  307,   -1,   -1,  310,   -1, 
-           -1,  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,  326,  327,  328,  329,  330,  331, 
-          332,  333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1, 
-           -1,  343,  344,  345,  346,   -1,   -1,   -1,   -1,   -1, 
-          306,  307,   -1,   -1,  310,  357,  358,   -1,   -1,   -1, 
+           -1,   94,   -1,   96,   -1,  326,  327,  328,  329,  330, 
+          331,  332,  333,  334,   -1,   -1,  337,  338,   -1,   -1, 
+           -1,   -1,  343,  344,  345,  346,  306,  307,   -1,   -1, 
+          310,  124,   -1,  126,   -1,   -1,  357,  358,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+          306,  307,   -1,   -1,  310,   -1,   -1,  357,  358,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
           326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
            -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33, 
-           -1,  357,  358,   37,   38,   -1,   40,   -1,   42,   43, 
-           -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   -1, 
+          346,   -1,   -1,   -1,   -1,   -1,  306,  307,   -1,   -1, 
+          310,  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   33,   -1,  357,  358,   37, 
+           38,   -1,   40,   -1,   42,   43,   -1,   45,   -1,   47, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,   -1, 
-           -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           94,   -1,   96,   -1,   -1,   -1,   -1,  326,  327,  328, 
-          329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338, 
-           -1,   -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1, 
-          124,   -1,  126,   -1,   -1,   -1,   33,   -1,  357,  358, 
-           37,   38,   -1,   40,   -1,   42,   43,   -1,   45,   -1, 
-           47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1, 
-           -1,   37,   38,   -1,   40,   -1,   42,   43,   -1,   45, 
-           -1,   47,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96, 
-           -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1, 
+           -1,   -1,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,  126, 
-           -1,   -1,   33,   -1,   -1,   -1,   37,   38,   94,   -1, 
-           96,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
+           -1,   -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   96,   -1, 
+           -1,   -1,   -1,  326,  327,  328,  329,  330,  331,  332, 
+          333,  334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1, 
+          343,  344,  345,  346,   -1,   -1,  124,   -1,  126,   -1, 
+           -1,   -1,   33,   -1,  357,  358,   37,   38,   -1,   40, 
+           -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   60, 
-           -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1, 
-          126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   38,   -1, 
+           40,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1, 
            -1,   -1,   -1,   94,   -1,   96,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,  306,  307,   -1,   -1,  310,   -1,   -1,   -1, 
-           -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1,   -1, 
-           -1,   -1,  326,  327,  328,  329,  330,  331,  332,  333, 
-          334,   -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343, 
-          344,  345,  346,   94,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,  357,  358,   -1,   -1,   -1,   -1,   -1, 
+           60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   33,   -1, 
+           -1,   -1,   37,   38,   94,   -1,   96,   42,   43,   -1, 
+           45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1, 
+           -1,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94, 
+           -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307, 
+           -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,   -1,  124, 
+           -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,  326,  327, 
+          328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337, 
+          338,   -1,   -1,   -1,   -1,  343,  344,  345,  346,   94, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  357, 
+          358,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306, 
-          307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  326, 
-          327,  328,  329,  330,  331,  332,  333,  334,   94,   -1, 
-          337,  338,   -1,   -1,   -1,   -1,  343,  344,  345,  346, 
-          306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1,   -1, 
-          357,  358,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          326,  327,  328,  329,  330,  331,  332,  333,  334,   -1, 
-           -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344,  345, 
-          346,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,  357,  358,   -1,   -1,  306,  307,   -1,   -1,  310, 
+           -1,   -1,   -1,   -1,   -1,  306,  307,   -1,   -1,  310, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329,  330, 
-          331,  332,  333,  334,   -1,   -1,  337,  338,   -1,   -1, 
-           -1,   -1,  343,  344,  345,  346,  287,  288,  289,  290, 
-           -1,   -1,   -1,   -1,   -1,   -1,  357,  358,   -1,   -1, 
-           -1,   -1,  303,  304,  305,  306,   -1,   -1,   -1,  310, 
-           -1,  312,  313,  314,  315,  316,  317,   -1,   -1,   -1, 
-           -1,   -1,  323,   -1,   -1,   -1,   -1,  328,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-          341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
-           -1,  352,   -1,  354,  355,   -1,  357,  358,   -1,  360, 
-          361,  362,  363,  364,  365,  366,   -1,  368,  369,   -1, 
-           -1,  287,  288,  289,  290,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,  303,  304,  305, 
-          306,   -1,   -1,   -1,  310,   -1,   -1,  313,  314,  315, 
-          316,  317,   -1,   -1,   -1,   -1,   -1,  323,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1, 
-           -1,   -1,   -1,  349,   -1,   -1,  352,   -1,  354,  355, 
-           -1,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
-          366,   -1,  368,  369,  257,  258,  259,   -1,  261,   -1, 
-           -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272, 
-          273,  274,  275,  276,  277,  278,   -1,   -1,   -1,   -1, 
-           -1,  284,  285,  286,  287,  288,  289,  290,   -1,   -1, 
-          293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1,   -1, 
-          303,  304,  305,  306,  307,  308,  309,  310,  311,   -1, 
-          313,  314,  315,  316,  317,  318,  319,   -1,   -1,   -1, 
-          323,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352, 
-          353,  354,  355,   -1,  357,   -1,   -1,  360,  361,  362, 
-          363,  364,  365,  366,   -1,  368,  369,  257,  258,  259, 
-           -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1, 
-          270,   -1,  272,  273,  274,  275,  276,  277,  278,   -1, 
-           -1,   -1,   -1,   -1,  284,  285,  286,  287,  288,  289, 
-          290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1,   -1, 
-          300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309, 
-          310,  311,   -1,  313,  314,  315,  316,  317,  318,  319, 
+          331,  332,  333,  334,   94,   -1,  337,  338,   -1,   -1, 
+           -1,   -1,  343,  344,  345,  346,  306,  307,   -1,   -1, 
+          310,   -1,   -1,   -1,   -1,   -1,  357,  358,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  326,  327,  328,  329, 
+          330,  331,  332,  333,  334,   -1,   -1,  337,  338,   -1, 
+           -1,   -1,   -1,  343,  344,  345,  346,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  357,  358,   -1, 
+           -1,  306,  307,   -1,   -1,  310,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   -1, 
+           -1,  326,  327,  328,  329,  330,  331,  332,  333,  334, 
+           -1,   -1,  337,  338,   -1,   -1,   -1,   -1,  343,  344, 
+          345,  346,  287,  288,  289,  290,   -1,   -1,   -1,   -1, 
+           -1,   -1,  357,  358,   -1,   -1,   -1,   -1,  303,  304, 
+          305,  306,   -1,   -1,   -1,  310,   -1,  312,  313,  314, 
+          315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,   -1, 
+           -1,   -1,   -1,  328,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1, 
+           -1,   -1,   -1,   -1,  349,   -1,   -1,  352,   -1,  354, 
+          355,   -1,  357,  358,   -1,  360,  361,  362,  363,  364, 
+          365,  366,   -1,  368,  369,   -1,   -1,  287,  288,  289, 
+          290,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  303,  304,  305,  306,   -1,   -1,   -1, 
+          310,   -1,   -1,  313,  314,  315,  316,  317,   -1,   -1, 
            -1,   -1,   -1,  323,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
-           -1,   -1,  352,  353,  354,  355,   -1,  357,   -1,   -1, 
+           -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,  349, 
+           -1,   -1,  352,   -1,  354,  355,   -1,  357,   -1,   -1, 
           360,  361,  362,  363,  364,  365,  366,   -1,  368,  369, 
-          257,  258,  259,   -1,  261,   -1,   -1,   -1,  265,  266, 
-           -1,   -1,   -1,  270,   -1,  272,  273,  274,  275,  276, 
-          277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285,  286, 
-          287,  288,  289,  290,   -1,   -1,  293,   -1,   -1,   -1, 
-           -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305,  306, 
-          307,  308,  309,  310,  311,   -1,  313,  314,  315,  316, 
-          317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1,   -1, 
+          287,  288,  289,  290,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,  303,  304,  305,  306, 
+           -1,   -1,   -1,  310,   -1,   -1,  313,  314,  315,  316, 
+          317,   -1,   -1,   -1,   -1,   -1,  323,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  345,   -1, 
-           -1,   -1,  349,   -1,   -1,  352,  353,  354,  355,   -1, 
+           -1,   -1,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1, 
+           -1,   -1,  349,   -1,   -1,  352,   -1,  354,  355,   -1, 
            -1,   -1,   -1,  360,  361,  362,  363,  364,  365,  366, 
            -1,  368,  369,  257,  258,  259,   -1,  261,   -1,   -1, 
            -1,  265,  266,   -1,   -1,   -1,  270,   -1,  272,  273, 
@@ -6699,7 +6857,7 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353, 
-          354,  355,   -1,   -1,   -1,   -1,  360,  361,  362,  363, 
+          354,  355,   -1,  357,   -1,   -1,  360,  361,  362,  363, 
           364,  365,  366,   -1,  368,  369,  257,  258,  259,   -1, 
           261,   -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270, 
            -1,  272,  273,  274,  275,  276,  277,  278,   -1,   -1, 
@@ -6710,7 +6868,7 @@ private static final int[] yyCheck4() {
            -1,   -1,  323,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1, 
-           -1,  352,  353,  354,  355,   -1,   -1,   -1,   -1,  360, 
+           -1,  352,  353,  354,  355,   -1,  357,   -1,   -1,  360, 
           361,  362,  363,  364,  365,  366,   -1,  368,  369,  257, 
           258,  259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1, 
            -1,   -1,  270,   -1,  272,  273,  274,  275,  276,  277, 
@@ -6720,7 +6878,7 @@ private static final int[] yyCheck4() {
           308,  309,  310,  311,   -1,  313,  314,  315,  316,  317, 
           318,  319,   -1,   -1,   -1,  323,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  345,   -1,   -1, 
            -1,  349,   -1,   -1,  352,  353,  354,  355,   -1,   -1, 
            -1,   -1,  360,  361,  362,  363,  364,  365,  366,   -1, 
           368,  369,  257,  258,  259,   -1,  261,   -1,   -1,   -1, 
@@ -6734,7 +6892,41 @@ private static final int[] yyCheck4() {
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
            -1,   -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354, 
           355,   -1,   -1,   -1,   -1,  360,  361,  362,  363,  364, 
-          365,  366,   -1,  368,  369, 
+          365,  366,   -1,  368,  369,  257,  258,  259,   -1,  261, 
+           -1,   -1,   -1,  265,  266,   -1,   -1,   -1,  270,   -1, 
+          272,  273,  274,  275,  276,  277,  278,   -1,   -1,   -1, 
+           -1,   -1,  284,  285,  286,  287,  288,  289,  290,   -1, 
+           -1,  293,   -1,   -1,   -1,   -1,   -1,   -1,  300,   -1, 
+           -1,  303,  304,  305,  306,  307,  308,  309,  310,  311, 
+           -1,  313,  314,  315,  316,  317,  318,  319,   -1,   -1, 
+           -1,  323,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,   -1, 
+          352,  353,  354,  355,   -1,   -1,   -1,   -1,  360,  361, 
+          362,  363,  364,  365,  366,   -1,  368,  369,  257,  258, 
+          259,   -1,  261,   -1,   -1,   -1,  265,  266,   -1,   -1, 
+           -1,  270,   -1,  272,  273,  274,  275,  276,  277,  278, 
+           -1,   -1,   -1,   -1,   -1,  284,  285,  286,  287,  288, 
+          289,  290,   -1,   -1,  293,   -1,   -1,   -1,   -1,   -1, 
+           -1,  300,   -1,   -1,  303,  304,  305,  306,  307,  308, 
+          309,  310,  311,   -1,  313,  314,  315,  316,  317,  318, 
+          319,   -1,   -1,   -1,  323,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+          349,   -1,   -1,  352,  353,  354,  355,   -1,   -1,   -1, 
+           -1,  360,  361,  362,  363,  364,  365,  366,   -1,  368, 
+          369,  257,  258,  259,   -1,  261,   -1,   -1,   -1,  265, 
+          266,   -1,   -1,   -1,  270,   -1,  272,  273,  274,  275, 
+          276,  277,  278,   -1,   -1,   -1,   -1,   -1,  284,  285, 
+          286,  287,  288,  289,  290,   -1,   -1,  293,   -1,   -1, 
+           -1,   -1,   -1,   -1,  300,   -1,   -1,  303,  304,  305, 
+          306,  307,  308,  309,  310,  311,   -1,  313,  314,  315, 
+          316,  317,  318,  319,   -1,   -1,   -1,  323,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+           -1,   -1,   -1,  349,   -1,   -1,  352,  353,  354,  355, 
+           -1,   -1,   -1,   -1,  360,  361,  362,  363,  364,  365, 
+          366,   -1,  368,  369, 
       };
    }
 
diff --git a/core/src/main/java/org/jruby/runtime/ArgumentDescriptor.java b/core/src/main/java/org/jruby/runtime/ArgumentDescriptor.java
index 7b5de43bedc..17b75530431 100644
--- a/core/src/main/java/org/jruby/runtime/ArgumentDescriptor.java
+++ b/core/src/main/java/org/jruby/runtime/ArgumentDescriptor.java
@@ -46,7 +46,11 @@ public final RubyArray toArrayForm(Ruby runtime, boolean isLambda) {
     }
 
     public final RubyArray toArrayForm(ThreadContext context, boolean isLambda) {
-        ArgumentType argType = type == ArgumentType.req && !isLambda ? ArgumentType.opt : type;
+        ArgumentType argType = type;
+        if (!isLambda) {
+            if (argType == ArgumentType.req) argType = ArgumentType.opt;
+            if (argType == ArgumentType.anonreq) argType = ArgumentType.anonopt;
+        }
         RubySymbol name = this.name;
 
         // FIXME: When consolidating block and method parameter arg descriptors eliminate this special *,** handling.
diff --git a/core/src/main/java/org/jruby/runtime/Binding.java b/core/src/main/java/org/jruby/runtime/Binding.java
index 9892a569855..cb654e8104e 100644
--- a/core/src/main/java/org/jruby/runtime/Binding.java
+++ b/core/src/main/java/org/jruby/runtime/Binding.java
@@ -281,42 +281,6 @@ public final DynamicScope getEvalScope(Ruby runtime) {
         return evalScopeBinding.evalScope;
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public Binding(IRubyObject self, Frame frame,
-                   Visibility visibility, DynamicScope dynamicScope, BacktraceElement backtrace) {
-        this.self = self;
-        this.frame = frame;
-        this.visibility = visibility;
-        this.dynamicScope = dynamicScope;
-        this.method = backtrace.method;
-        this.filename = backtrace.filename;
-        this.line = backtrace.line;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public Binding(Frame frame, DynamicScope dynamicScope, BacktraceElement backtrace) {
-        this.self = frame.getSelf();
-        this.frame = frame;
-        this.visibility = frame.getVisibility();
-        this.dynamicScope = dynamicScope;
-        this.method = backtrace.method;
-        this.filename = backtrace.filename;
-        this.line = backtrace.line;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public BacktraceElement getBacktrace() {
-        return new BacktraceElement(method, filename, line);
-    }
-
-    @Deprecated(since = "9.2.8.0")
-    public static final Binding DUMMY =
-            new Binding(
-                    RubyBasicObject.NEVER,
-                    // Can't use Frame.DUMMY because of circular static init seeing it before it's assigned
-                    new Frame(),
-                    Visibility.PUBLIC);
-
     /**
      * Duplicate this binding and setup the proper cloned instance of the eval scope so that any previously
      * captured variables still exist but are not shared with the original binding.
diff --git a/core/src/main/java/org/jruby/runtime/Block.java b/core/src/main/java/org/jruby/runtime/Block.java
index c5b1e4626c0..de6a65d6a02 100644
--- a/core/src/main/java/org/jruby/runtime/Block.java
+++ b/core/src/main/java/org/jruby/runtime/Block.java
@@ -227,7 +227,9 @@ public IRubyObject call(ThreadContext context, IRubyObject state, IRubyObject ob
     // This should be the only argument massaging in yield.  This handles all argument conversion logic except
     // for the generic Block#yield(IRubyObject value).
     private static IRubyObject[] maybeSpreadArgs(ThreadContext context, IRubyObject[] args, Block block) {
-        return block.type != Type.LAMBDA && args.length == 1 && block.getSignature().isSpreadable() ?
+        Signature sig = block.getSignature();
+        return block.type != Type.LAMBDA && args.length == 1 && sig.isSpreadable()
+                && !(sig.opt() + sig.required() == 1 && !sig.hasRest()) ?
                 IRRuntimeHelpers.toAry(context, args) :
                 args;
     }
@@ -303,16 +305,6 @@ public Block deepCloneBlockForEval(IRubyObject self, EvalType evalType) {
         return block;
     }
 
-    /**
-     * What is the arity of this block?
-     *
-     * @return the arity
-     */
-    @Deprecated(since = "9.0.0.0")
-    public Arity arity() {
-        return getSignature().arity();
-    }
-
     public Signature getSignature() {
         return body.getSignature();
     }
diff --git a/core/src/main/java/org/jruby/runtime/BlockBody.java b/core/src/main/java/org/jruby/runtime/BlockBody.java
index f4439d49f94..a8514afee1e 100644
--- a/core/src/main/java/org/jruby/runtime/BlockBody.java
+++ b/core/src/main/java/org/jruby/runtime/BlockBody.java
@@ -227,16 +227,6 @@ public IRubyObject yieldSpecific(ThreadContext context, Block block, IRubyObject
     public abstract StaticScope getStaticScope();
     public abstract void setStaticScope(StaticScope newScope);
 
-    /**
-     * What is the arity of this block?
-     *
-     * @return the arity
-     */
-    @Deprecated(since = "9.0.0.0")
-    public Arity arity() {
-        return signature.arity();
-    }
-
     /**
      * Is the current block a real yield'able block instead a null one
      *
diff --git a/core/src/main/java/org/jruby/runtime/Builtins.java b/core/src/main/java/org/jruby/runtime/Builtins.java
index f8bccb044f6..5cb90007bc5 100644
--- a/core/src/main/java/org/jruby/runtime/Builtins.java
+++ b/core/src/main/java/org/jruby/runtime/Builtins.java
@@ -252,6 +252,7 @@ public class Builtins {
         CLASS_FLAGS.put(ClassIndex.PROC, PROC);
         CLASS_FLAGS.put(ClassIndex.RANGE, RANGE);
         CLASS_FLAGS.put(ClassIndex.STRUCT, STRUCT);
+        CLASS_FLAGS.put(ClassIndex.RATIONAL, RATIONAL);
 
         // ---------------------------------------------------------------------
         // Method mappings - map method names to BOP indices
@@ -307,8 +308,8 @@ public class Builtins {
      *
      * @return new short array sized for all BOP indices
      */
-    public static short[] allocate() {
-        return new short[BOP_LAST_];
+    public static int[] allocate() {
+        return new int[BOP_LAST_];
     }
 
     // =========================================================================
@@ -324,7 +325,7 @@ public static short[] allocate() {
      * @param classIndex the ClassIndex of the class being modified
      * @param method the method name being defined
      */
-    public static void invalidateBuiltin(short[] bits, ClassIndex classIndex, String method) {
+    public static void invalidateBuiltin(int[] bits, ClassIndex classIndex, String method) {
         Integer classFlag = CLASS_FLAGS.get(classIndex);
         Integer methodId = METHOD_IDS.get(method);
 
@@ -408,7 +409,7 @@ public static boolean checkIntegerGe(ThreadContext ctx) {
 
     /** Check if all Integer comparison operators are still builtin */
     public static boolean checkIntegerCompare(ThreadContext ctx) {
-        short[] bits = ctx.builtinBits;
+        int[] bits = ctx.builtinBits;
         return (bits[BOP_LT] & INTEGER) == 0 &&
                (bits[BOP_LE] & INTEGER) == 0 &&
                (bits[BOP_GT] & INTEGER) == 0 &&
@@ -476,7 +477,7 @@ public static boolean checkFloatEquals(ThreadContext ctx) {
 
     /** Check if Float comparisons are still builtin */
     public static boolean checkFloatCompare(ThreadContext ctx) {
-        short[] bits = ctx.builtinBits;
+        int[] bits = ctx.builtinBits;
         return (bits[BOP_LT] & FLOAT) == 0 &&
                (bits[BOP_LE] & FLOAT) == 0 &&
                (bits[BOP_GT] & FLOAT) == 0 &&
@@ -509,7 +510,7 @@ public static boolean checkStringAref(ThreadContext ctx) {
 
     /** Check if String#length/size is still builtin */
     public static boolean checkStringLength(ThreadContext ctx) {
-        short[] bits = ctx.builtinBits;
+        int[] bits = ctx.builtinBits;
         return (bits[BOP_LENGTH] & STRING) == 0 &&
                (bits[BOP_SIZE] & STRING) == 0;
     }
@@ -560,7 +561,7 @@ public static boolean checkArrayPush(ThreadContext ctx) {
 
     /** Check if Array#length/size is still builtin */
     public static boolean checkArrayLength(ThreadContext ctx) {
-        short[] bits = ctx.builtinBits;
+        int[] bits = ctx.builtinBits;
         return (bits[BOP_LENGTH] & ARRAY) == 0 &&
                (bits[BOP_SIZE] & ARRAY) == 0;
     }
@@ -611,7 +612,7 @@ public static boolean checkHashAset(ThreadContext ctx) {
 
     /** Check if Hash#length/size is still builtin */
     public static boolean checkHashLength(ThreadContext ctx) {
-        short[] bits = ctx.builtinBits;
+        int[] bits = ctx.builtinBits;
         return (bits[BOP_LENGTH] & HASH) == 0 &&
                (bits[BOP_SIZE] & HASH) == 0;
     }
@@ -727,7 +728,7 @@ public static boolean checkTimeMinus(ThreadContext ctx) {
 
     /** Check if Time comparisons are still builtin */
     public static boolean checkTimeCompare(ThreadContext ctx) {
-        short[] bits = ctx.builtinBits;
+        int[] bits = ctx.builtinBits;
         return (bits[BOP_LT] & TIME) == 0 &&
                (bits[BOP_LE] & TIME) == 0 &&
                (bits[BOP_GT] & TIME) == 0 &&
@@ -756,4 +757,19 @@ public static boolean checkStructDig(ThreadContext ctx) {
     public static boolean checkRationalToF(ThreadContext ctx) {
         return (ctx.builtinBits[BOP_TO_F] & RATIONAL) == 0;
     }
+
+    /** Check if Rational#+ is still builtin */
+    public static boolean checkRationalPlus(ThreadContext ctx) {
+        return (ctx.builtinBits[BOP_PLUS] & RATIONAL) == 0;
+    }
+
+    /** Check if Rational#* is still builtin */
+    public static boolean checkRationalMult(ThreadContext ctx) {
+        return (ctx.builtinBits[BOP_MULT] & RATIONAL) == 0;
+    }
+
+    /** Check if Rational#- is still builtin */
+    public static boolean checkRationalMinus(ThreadContext ctx) {
+        return (ctx.builtinBits[BOP_MINUS] & RATIONAL) == 0;
+    }
 }
diff --git a/core/src/main/java/org/jruby/runtime/CallBlock.java b/core/src/main/java/org/jruby/runtime/CallBlock.java
index 78a09406544..e8f9465baee 100644
--- a/core/src/main/java/org/jruby/runtime/CallBlock.java
+++ b/core/src/main/java/org/jruby/runtime/CallBlock.java
@@ -52,12 +52,6 @@ public static Block newCallClosure(ThreadContext context, IRubyObject self, Sign
         return new Block(body, binding);
     }
 
-    // Put back because fishwife 1.10.1 still relies on this.
-    @Deprecated(since = "9.3.3.0")
-    public static Block newCallClosure(IRubyObject self, RubyModule imClass, Arity arity, BlockCallback callback, ThreadContext context) {
-        return newCallClosure(self, imClass, Signature.from(arity), callback, context);
-    }
-
     private CallBlock(ThreadContext context, Signature signature, BlockCallback callback) {
         super(signature);
         this.callback = callback;
diff --git a/core/src/main/java/org/jruby/runtime/CallBlock19.java b/core/src/main/java/org/jruby/runtime/CallBlock19.java
index 7c7e77986a1..28943386129 100644
--- a/core/src/main/java/org/jruby/runtime/CallBlock19.java
+++ b/core/src/main/java/org/jruby/runtime/CallBlock19.java
@@ -47,16 +47,6 @@ public static Block newCallClosure(IRubyObject self, RubyModule imClass, Signatu
         return new Block(body, binding);
     }
 
-    // This is a stop-gap method where we try to construct an equivalent Signature from an Arity but beyond very simple Arity's it will strip
-    // some info off.
-    @Deprecated(since = "9.3.0.0")
-    public static Block newCallClosure(IRubyObject self, RubyModule imClass, Arity arity, BlockCallback callback, ThreadContext context) {
-        Binding binding = context.currentBinding(self, Visibility.PUBLIC);
-        BlockBody body = new CallBlock19(Signature.from(arity), callback, context);
-
-        return new Block(body, binding);
-    }
-
     public CallBlock19(Signature signature, BlockCallback callback, ThreadContext context) {
         super(signature);
         this.callback = callback;
diff --git a/core/src/main/java/org/jruby/runtime/DynamicScope.java b/core/src/main/java/org/jruby/runtime/DynamicScope.java
index 86bee942db0..6ec342ffde9 100644
--- a/core/src/main/java/org/jruby/runtime/DynamicScope.java
+++ b/core/src/main/java/org/jruby/runtime/DynamicScope.java
@@ -74,11 +74,6 @@ public final DynamicScope getParentScope() {
         return parent;
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public DynamicScope getNextCapturedScope() {  // Used by ruby-debug-ide
-        return getParentScope();
-    }
-
     /**
      * Returns the n-th parent scope of this scope.
      * May return <code>null</code>.
@@ -591,15 +586,6 @@ public boolean isReturnTarget() {
                 scopeType.isBlock() && (staticScope.isArgumentScope() || lambda);  // Contained within define_method closure
     }
 
-    @Deprecated(since = "9.1.6.0")
-    public DynamicScope cloneScope() {
-        try {
-            return (DynamicScope) clone();
-        } catch (CloneNotSupportedException cnse) {
-            throw new RuntimeException("BUG: failed to clone scope type " + getClass().getName());
-        }
-    }
-
     /**
      * Binding needs to clone its scope with all the current values.
      * @return a duplicate of this scope with all the current values
diff --git a/core/src/main/java/org/jruby/runtime/Frame.java b/core/src/main/java/org/jruby/runtime/Frame.java
index 980f4e7ad8e..0e9d6137044 100644
--- a/core/src/main/java/org/jruby/runtime/Frame.java
+++ b/core/src/main/java/org/jruby/runtime/Frame.java
@@ -369,7 +369,4 @@ public String toString() {
 
         return sb.toString();
     }
-
-    @Deprecated(since = "9.2.8.0")
-    public static final Frame DUMMY = new Frame();
 }
diff --git a/core/src/main/java/org/jruby/runtime/Helpers.java b/core/src/main/java/org/jruby/runtime/Helpers.java
index e96f5bdf97f..60fb378bf77 100644
--- a/core/src/main/java/org/jruby/runtime/Helpers.java
+++ b/core/src/main/java/org/jruby/runtime/Helpers.java
@@ -827,27 +827,42 @@ public static IRubyObject invokePublic(ThreadContext context, IRubyObject self,
         return getMetaClass(self).invokePublic(context, self, name, arg);
     }
 
-    // MRI: rb_check_funcall
+    /**
+     * Invoke the method requested if the given object respond_to? it, returning null if it is not defined.
+     * MRI: rb_check_funcall
+     */
     public static IRubyObject invokeChecked(ThreadContext context, IRubyObject self, String name) {
         return getMetaClass(self).finvokeChecked(context, self, name);
     }
 
-    // MRI: rb_check_funcall
+    /**
+     * Invoke the method requested if the given object respond_to? it, returning null if it is not defined.
+     * MRI: rb_check_funcall
+     */
     public static IRubyObject invokeChecked(ThreadContext context, IRubyObject self, JavaSites.CheckedSites sites) {
         return getMetaClass(self).finvokeChecked(context, self, sites);
     }
 
-    // MRI: rb_check_funcall
+    /**
+     * Invoke the method requested if the given object respond_to? it, returning null if it is not defined.
+     * MRI: rb_check_funcall
+     */
     public static IRubyObject invokeChecked(ThreadContext context, IRubyObject self, String name, IRubyObject... args) {
         return getMetaClass(self).finvokeChecked(context, self, name, args);
     }
 
-    // MRI: rb_check_funcall
+    /**
+     * Invoke the method requested if the given object respond_to? it, returning null if it is not defined.
+     * MRI: rb_check_funcall
+     */
     public static IRubyObject invokeChecked(ThreadContext context, IRubyObject self, JavaSites.CheckedSites sites, IRubyObject arg0) {
         return getMetaClass(self).finvokeChecked(context, self, sites, arg0);
     }
 
-    // MRI: rb_check_funcall
+    /**
+     * Invoke the method requested if the given object respond_to? it, returning null if it is not defined.
+     * MRI: rb_check_funcall
+     */
     public static IRubyObject invokeChecked(ThreadContext context, IRubyObject self, JavaSites.CheckedSites sites, IRubyObject... args) {
         return getMetaClass(self).finvokeChecked(context, self, sites, args);
     }
@@ -972,11 +987,6 @@ public static IRubyObject invokeSuper(ThreadContext context, IRubyObject self, I
         return method.call(context, self, entry.sourceModule, name, arg0, arg1, arg2, block);
     }
 
-    @Deprecated(since = "9.2.5.0")
-    public static RubyArray ensureRubyArray(IRubyObject value) {
-        return ensureRubyArray(((RubyBasicObject) value).getCurrentContext(), value);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public static RubyArray ensureRubyArray(Ruby runtime, IRubyObject value) {
         return ensureRubyArray(runtime.getCurrentContext(), value);
@@ -986,16 +996,6 @@ public static RubyArray ensureRubyArray(ThreadContext context, IRubyObject value
         return value instanceof RubyArray ary ? ary : newArray(context, value);
     }
 
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject nullToNil(IRubyObject value, ThreadContext context) {
-        return value != null ? value : context.nil;
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject nullToNil(IRubyObject value, Ruby runtime) {
-        return value != null ? value : runtime.getNil();
-    }
-
     /**
      * @see Ruby#getNullToNilHandle()
      */
@@ -1089,26 +1089,6 @@ public static Block getBlockFromBlockPassBody(IRubyObject proc, Block currentBlo
         return getBlockFromBlockPassBody(((RubyBasicObject) proc).getCurrentContext().runtime, proc, currentBlock);
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject backrefLastMatch(ThreadContext context) {
-        return RubyRegexp.last_match(context.getBackRef());
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject backrefMatchPre(ThreadContext context) {
-        return RubyRegexp.match_pre(context, context.getBackRef());
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject backrefMatchPost(ThreadContext context) {
-        return RubyRegexp.match_post(context.getBackRef());
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject backrefMatchLast(ThreadContext context) {
-        return RubyRegexp.match_last(context, context.getBackRef());
-    }
-
     public static IRubyObject[] appendToObjectArray(IRubyObject[] array, IRubyObject add) {
         return ArraySupport.newCopy(array, add);
     }
@@ -1235,101 +1215,6 @@ public static IRubyObject wrapJavaException(final Ruby runtime, final Throwable
         return JavaUtil.convertJavaToUsableRubyObject(runtime, ex);
     }
 
-    @Deprecated(since = "9.1.3.0") // due deprecated checkJavaException
-    public static IRubyObject isJavaExceptionHandled(Throwable currentThrowable, IRubyObject[] throwables, ThreadContext context) {
-        if (currentThrowable instanceof Unrescuable) {
-            throwException(currentThrowable);
-        }
-
-        if (currentThrowable instanceof RaiseException) {
-            return isExceptionHandled(((RaiseException) currentThrowable).getException(), throwables, context);
-        } else {
-            if (throwables.length == 0) {
-                // no rescue means StandardError, which rescues Java exceptions
-                return context.tru;
-            } else {
-                for (int i = 0; i < throwables.length; i++) {
-                    if (checkJavaException(currentThrowable, throwables[i], context)) {
-                        return context.tru;
-                    }
-                }
-            }
-
-            return context.fals;
-        }
-    }
-
-    @Deprecated(since = "9.1.3.0") // due deprecated checkJavaException
-    public static IRubyObject isJavaExceptionHandled(Throwable currentThrowable, IRubyObject throwable, ThreadContext context) {
-        if (currentThrowable instanceof Unrescuable) {
-            throwException(currentThrowable);
-        }
-
-        if (currentThrowable instanceof RaiseException) {
-            return isExceptionHandled(((RaiseException) currentThrowable).getException(), throwable, context);
-        } else {
-            if (checkJavaException(currentThrowable, throwable, context)) {
-                return context.tru;
-            }
-
-            return context.fals;
-        }
-    }
-
-    @Deprecated(since = "9.1.3.0") // due deprecated checkJavaException
-    public static IRubyObject isJavaExceptionHandled(Throwable currentThrowable, IRubyObject throwable0, IRubyObject throwable1, ThreadContext context) {
-        if (currentThrowable instanceof Unrescuable) {
-            throwException(currentThrowable);
-        }
-
-        if (currentThrowable instanceof RaiseException) {
-            return isExceptionHandled(((RaiseException)currentThrowable).getException(), throwable0, throwable1, context);
-        } else {
-            if (checkJavaException(currentThrowable, throwable0, context)) {
-                return context.tru;
-            }
-            if (checkJavaException(currentThrowable, throwable1, context)) {
-                return context.tru;
-            }
-
-            return context.fals;
-        }
-    }
-
-    @Deprecated(since = "9.1.3.0") // due deprecated checkJavaException
-    public static IRubyObject isJavaExceptionHandled(Throwable currentThrowable, IRubyObject throwable0, IRubyObject throwable1, IRubyObject throwable2, ThreadContext context) {
-        if (currentThrowable instanceof Unrescuable) {
-            throwException(currentThrowable);
-        }
-
-        if (currentThrowable instanceof RaiseException) {
-            return isExceptionHandled(((RaiseException)currentThrowable).getException(), throwable0, throwable1, throwable2, context);
-        } else {
-            if (checkJavaException(currentThrowable, throwable0, context)) {
-                return context.tru;
-            }
-            if (checkJavaException(currentThrowable, throwable1, context)) {
-                return context.tru;
-            }
-            if (checkJavaException(currentThrowable, throwable2, context)) {
-                return context.tru;
-            }
-
-            return context.fals;
-        }
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public static void storeExceptionInErrorInfo(Throwable currentThrowable, ThreadContext context) {
-        IRubyObject exception;
-        if (currentThrowable instanceof RaiseException) {
-            exception = ((RaiseException)currentThrowable).getException();
-        } else {
-            exception = JavaUtil.convertJavaToUsableRubyObject(context.runtime, currentThrowable);
-        }
-        context.setErrorInfo(exception);
-    }
-
     public static void clearErrorInfo(ThreadContext context) {
         context.setErrorInfo(context.nil);
     }
@@ -1856,11 +1741,6 @@ public static IRubyObject negate(IRubyObject value, Ruby runtime) {
         return runtime.getTrue();
     }
 
-    @Deprecated(since = "9.0.3.0") // no-longer used + confusing argument order
-    public static IRubyObject stringOrNil(ByteList value, ThreadContext context) {
-        return value == null ? context.nil : newSharedString(context, value);
-    }
-
     @SuppressWarnings("deprecation")
     public static StaticScope preLoad(ThreadContext context, String[] varNames) {
         StaticScope staticScope = context.runtime.getStaticScopeFactory().newLocalScope(null, varNames);
@@ -1886,30 +1766,6 @@ public static void postLoad(ThreadContext context) {
         context.postScopedBody();
     }
 
-    @Deprecated(since = "9.2.0.0") // not-used
-    public static void registerEndBlock(Block block, Ruby runtime) {
-        runtime.pushExitBlock(runtime.newProc(Block.Type.LAMBDA, block));
-    }
-
-    @Deprecated(since = "9.2.0.0") // not-used
-    public static IRubyObject match3(RubyRegexp regexp, IRubyObject value, ThreadContext context) {
-        if (value instanceof RubyString) {
-            return regexp.op_match(context, value);
-        } else {
-            return value.callMethod(context, "=~", regexp);
-        }
-    }
-
-    @Deprecated(since = "9.2.9.0") // not-used
-    public static IRubyObject getErrorInfo(Ruby runtime) {
-        return runtime.getCurrentContext().getErrorInfo();
-    }
-
-    @Deprecated(since = "9.2.9.0") // not-used
-    public static void setErrorInfo(Ruby runtime, IRubyObject error) {
-        runtime.getCurrentContext().setErrorInfo(error);
-    }
-
     public static IRubyObject setLastLine(Ruby runtime, ThreadContext context, IRubyObject value) {
         return context.setLastLine(value);
     }
@@ -1968,17 +1824,6 @@ public static RubyArray arrayValue(ThreadContext context, IRubyObject value) {
         return ((RubyArray<?>) tmp).aryDup();
     }
 
-    // mri: rb_Array
-    @Deprecated(since = "9.3.0.0")
-    public static RubyArray asArray(ThreadContext context, IRubyObject value) {
-        return TypeConverter.rb_Array(context, value);
-    }
-
-    @Deprecated(since = "9.2.5.0") // not used
-    public static IRubyObject aryToAry(IRubyObject value) {
-        return aryToAry(((RubyBasicObject) value).getCurrentContext(), value);
-    }
-
     public static IRubyObject aryToAry(ThreadContext context, IRubyObject value) {
         if (value instanceof RubyArray) return value;
 
@@ -2005,14 +1850,6 @@ public static IRubyObject aryOrToAry(ThreadContext context, IRubyObject value) {
                 context.nil;
     }
 
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject aValueSplat(IRubyObject value) {
-        var context = ((RubyBasicObject) value).getCurrentContext();
-        if (!(value instanceof RubyArray array) || array.length().getValue() == 0) return context.nil;
-
-        return array.getLength() == 1 ? array.first(context) : array;
-    }
-
     @Deprecated(since = "9.4-") // not used
     public static RubyArray splatValue(IRubyObject value) {
         var context = ((RubyBasicObject) value).getCurrentContext();
@@ -2051,23 +1888,6 @@ private static IRubyObject[] convertSplatToJavaArray(ThreadContext context, IRub
         return ary.toJavaArray(context);
     }
 
-    @SuppressWarnings("deprecation") @Deprecated(since = "9.1.5.0") // no longer used
-    public static IRubyObject[] argsCatToArguments(IRubyObject[] args, IRubyObject cat) {
-        IRubyObject[] ary = splatToArguments(cat);
-        if (ary.length > 0) {
-            IRubyObject[] newArgs = new IRubyObject[args.length + ary.length];
-            System.arraycopy(args, 0, newArgs, 0, args.length);
-            System.arraycopy(ary, 0, newArgs, args.length, ary.length);
-            return newArgs;
-        }
-        return args;
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public static RubySymbol addInstanceMethod(RubyModule containingClass, String name, DynamicMethod method, Visibility visibility, ThreadContext context, Ruby runtime) {
-        return addInstanceMethod(containingClass, runtime.fastNewSymbol(name), method, visibility, context, runtime);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public static RubySymbol addInstanceMethod(RubyModule containingClass, RubySymbol symbol, DynamicMethod method, Visibility visibility, ThreadContext context, Ruby runtime) {
         return addInstanceMethod(containingClass, symbol, method, visibility, context);
@@ -2249,88 +2069,6 @@ public static Visibility performNormalMethodChecksAndDetermineVisibility(ThreadC
         return visibility;
     }
 
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject arrayEntryOrNil(RubyArray array, int index) {
-        return index < array.getLength() ? array.eltInternal(index) : array.getCurrentContext().nil;
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject arrayEntryOrNilZero(RubyArray array) {
-        return 0 < array.getLength() ? array.eltInternal(0) : array.getCurrentContext().nil;
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject arrayEntryOrNilOne(RubyArray array) {
-        return 1 < array.getLength() ? array.eltInternal(1) : array.getCurrentContext().nil;
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject arrayEntryOrNilTwo(RubyArray array) {
-        return 2 < array.getLength() ? array.eltInternal(2) : array.getCurrentContext().nil;
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject arrayPostOrNil(RubyArray array, int pre, int post, int index) {
-        if (pre + post < array.getLength()) {
-            return array.eltInternal(array.getLength() - post + index);
-        } else if (pre + index < array.getLength()) {
-            return array.eltInternal(pre + index);
-        } else {
-            return array.getCurrentContext().nil;
-        }
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject arrayPostOrNilZero(RubyArray array, int pre, int post) {
-        if (pre + post < array.getLength()) {
-            return array.eltInternal(array.getLength() - post + 0);
-        } else if (pre + 0 < array.getLength()) {
-            return array.eltInternal(pre + 0);
-        } else {
-            return array.getCurrentContext().nil;
-        }
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject arrayPostOrNilOne(RubyArray array, int pre, int post) {
-        if (pre + post < array.getLength()) {
-            return array.eltInternal(array.getLength() - post + 1);
-        } else if (pre + 1 < array.getLength()) {
-            return array.eltInternal(pre + 1);
-        } else {
-            return array.getCurrentContext().nil;
-        }
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject arrayPostOrNilTwo(RubyArray array, int pre, int post) {
-        if (pre + post < array.getLength()) {
-            return array.eltInternal(array.getLength() - post + 2);
-        } else if (pre + 2 < array.getLength()) {
-            return array.eltInternal(pre + 2);
-        } else {
-            return array.getCurrentContext().nil;
-        }
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static RubyArray subarrayOrEmpty(RubyArray array, Ruby runtime, int index) {
-        if (index < array.getLength()) {
-            return createSubarray(array, index);
-        } else {
-            return RubyArray.newEmptyArray(runtime);
-        }
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static RubyArray subarrayOrEmpty(RubyArray array, Ruby runtime, int index, int post) {
-        if (index + post < array.getLength()) {
-            return createSubarray(array, index, post);
-        } else {
-            return RubyArray.newEmptyArray(runtime);
-        }
-    }
-
     @Deprecated(since = "10.0.0.0")
     public static RubyModule checkIsModule(IRubyObject maybeModule) {
         if (maybeModule instanceof RubyModule mod) return mod;
@@ -2587,11 +2325,6 @@ public static int[] decodeCaptureOffsets(String encoded) {
         return scopeOffsets;
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static RubyArray argsPush(ThreadContext context, RubyArray first, IRubyObject second) {
-        return ((RubyArray)first.dup()).append(context, second);
-    }
-
     @JIT @Interp
     public static RubyArray argsPush(ThreadContext context, IRubyObject first, IRubyObject second, boolean usesKeywords) {
         boolean isEmptyKeywordRest = usesKeywords && second instanceof RubyHash && ((RubyHash) second).isEmpty();
@@ -2611,11 +2344,6 @@ public static RubyArray argsCat(ThreadContext context, IRubyObject first, IRubyO
         return ((RubyArray) Helpers.ensureRubyArray(context, first).dup()).concat(secondArgs);
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public static RubyArray argsCat(IRubyObject first, IRubyObject second) {
-        return argsCat(((RubyBasicObject) first).getCurrentContext(), first, second);
-    }
-
     /** Use an ArgsNode (used for blocks) to generate ArgumentDescriptors */
     public static ArgumentDescriptor[] argsNodeToArgumentDescriptors(ArgsNode argsNode) {
         ArrayList<ArgumentDescriptor> descs = new ArrayList<>();
@@ -2627,7 +2355,12 @@ public static ArgumentDescriptor[] argsNodeToArgumentDescriptors(ArgsNode argsNo
                 if (args[i] instanceof MultipleAsgnNode) {
                     descs.add(new ArgumentDescriptor(ArgumentType.anonreq));
                 } else {
-                    descs.add(new ArgumentDescriptor(ArgumentType.req, ((ArgumentNode) args[i]).getName()));
+                    ArgumentNode arg = (ArgumentNode) args[i];
+                    ArgumentDescriptor desc =
+                            arg.isImplicit() ?
+                                    new ArgumentDescriptor(ArgumentType.anonreq) :
+                                    new ArgumentDescriptor(ArgumentType.req, arg.getName());
+                    descs.add(desc);
                 }
             }
         }
@@ -2810,16 +2543,6 @@ private static CacheEntry getMethodCached(ThreadContext context, RubyClass metac
         return context.runtimeCache.getMethodEntry(context, metaclass, metaclass.getClassIndex().ordinal() * (index + 1), name);
     }
 
-    @Deprecated(since = "9.2.0.0") // not used
-    public static IRubyObject lastElement(IRubyObject[] ary) {
-        return ary[ary.length - 1];
-    }
-
-    @Deprecated(since = "9.2.0.0") // not used
-    public static RubyString appendAsString(RubyString target, IRubyObject other) {
-        return target.append(other.asString());
-    }
-
     // . Array given to rest should pass itself
     // . Array with rest + other args should extract array
     // . Array with multiple values and NO rest should extract args if there are more than one argument
@@ -2834,12 +2557,6 @@ static IRubyObject[] restructureBlockArgs(ThreadContext context,
         return new IRubyObject[] { value };
     }
 
-    @Deprecated(since = "9.2.0.0") // not used
-    public static RubyString appendByteList(RubyString target, ByteList source) {
-        target.getByteList().append(source);
-        return target;
-    }
-
     @JIT
     public static boolean BNE(ThreadContext context, IRubyObject value1, IRubyObject value2) {
         boolean eql = value2 == context.nil || value2 == UndefinedValue.UNDEFINED ?
@@ -2855,16 +2572,6 @@ public static void irCheckArgsArrayArity(ThreadContext context, RubyArray args,
         }
     }
 
-    @Deprecated(since = "1.7.4")
-    public static IRubyObject invokedynamic(ThreadContext context, IRubyObject self, int index) {
-        return invokedynamic(context, self, MethodNames.values()[index]);
-    }
-
-    @Deprecated(since = "1.7.4")
-    public static IRubyObject invokedynamic(ThreadContext context, IRubyObject self, int index, IRubyObject arg0) {
-        return invokedynamic(context, self, MethodNames.values()[index], arg0);
-    }
-
     /**
      * <p>Note: Assumes exception: ... to be the only (optional) keyword argument!</p>
      * @param context
@@ -2906,6 +2613,11 @@ public static void throwException(final Throwable e) {
         Helpers.<RuntimeException>throwsUnchecked(e);
     }
 
+    public static <T> T throwExceptionT(final Throwable e) {
+        Helpers.<RuntimeException>throwsUnchecked(e);
+        return null; // not reached
+    }
+
     public static <T> T tryThrow(Callable<T> call) {
         try {
             return call.call();
@@ -3009,13 +2721,6 @@ public static IRubyObject rewriteStackTraceAndThrow(ThreadContext context, Throw
         return null; // not reached
     }
 
-    @Deprecated(since = "9.2.0.0") // un-used
-    public static void rewriteStackTrace(final Ruby runtime, final Throwable e) {
-        final StackTraceElement[] javaTrace = e.getStackTrace();
-        BacktraceData backtraceData = runtime.getInstanceConfig().getTraceType().getIntegratedBacktrace(runtime.getCurrentContext(), javaTrace);
-        e.setStackTrace(RaiseException.javaTraceFromRubyTrace(backtraceData.getBacktrace(runtime)));
-    }
-
     public static <T> T[] arrayOf(T... values) {
         return values;
     }
@@ -3183,22 +2888,6 @@ private static HelpersSites sites(ThreadContext context) {
         return context.sites.Helpers;
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public static String encodeParameterList(List<String[]> args) {
-        if (args.size() == 0) return "NONE";
-
-        StringBuilder builder = new StringBuilder();
-
-        boolean added = false;
-        for (String[] desc : args) {
-            if (added) builder.append(';');
-            builder.append(desc[0]).append(desc[1]);
-            added = true;
-        }
-
-        return builder.toString();
-    }
-
     public static byte[] subseq(byte[] ary, int start, int len) {
         byte[] newAry = new byte[len];
         System.arraycopy(ary, start, newAry, 0, len);
@@ -3267,36 +2956,4 @@ public static IRubyObject invoke(ThreadContext context, IRubyObject self, String
     public static IRubyObject invoke(ThreadContext context, IRubyObject self, String name, CallType callType) {
         return Helpers.invoke(context, self, name, IRubyObject.NULL_ARRAY, callType, Block.NULL_BLOCK);
     }
-
-    @Deprecated(since = "9.2.7.0")
-    public static IRubyObject invokeFrom(ThreadContext context, IRubyObject caller, IRubyObject self, String name, IRubyObject[] args, CallType callType, Block block) {
-        return self.getMetaClass().invokeFrom(context, callType, caller, self, name, args, block);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public static IRubyObject invokeFrom(ThreadContext context, IRubyObject caller, IRubyObject self, String name, IRubyObject arg, CallType callType, Block block) {
-        return self.getMetaClass().invokeFrom(context, callType, caller, self, name, arg, block);
-    }
-
-    @Deprecated(since = "9.2.7.0")
-    public static IRubyObject invokeFrom(ThreadContext context, IRubyObject caller, IRubyObject self, String name, CallType callType) {
-        return self.getMetaClass().invokeFrom(context, callType, caller, self, name, IRubyObject.NULL_ARRAY, Block.NULL_BLOCK);
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject setBackref(Ruby runtime, ThreadContext context, IRubyObject value) {
-        if (!value.isNil() && !(value instanceof RubyMatchData)) throw typeError(context, value, "MatchData");
-
-        return context.setBackRef(value);
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject getBackref(Ruby runtime, ThreadContext context) {
-        return context.getBackRef();
-    }
-
-    @Deprecated(since = "9.3.0.0")
-    public static IRubyObject backref(ThreadContext context) {
-        return context.getBackRef();
-    }
 }
diff --git a/core/src/main/java/org/jruby/runtime/JavaInternalBlockBody.java b/core/src/main/java/org/jruby/runtime/JavaInternalBlockBody.java
index 19bb1f2fced..2075ce7a36e 100644
--- a/core/src/main/java/org/jruby/runtime/JavaInternalBlockBody.java
+++ b/core/src/main/java/org/jruby/runtime/JavaInternalBlockBody.java
@@ -35,11 +35,6 @@ public JavaInternalBlockBody(Ruby runtime, ThreadContext originalContext, String
         this.dummyScope = runtime.getStaticScopeFactory().getDummyScope();
     }
 
-    @Deprecated(since = "9.1.3.0") // needed by jruby-rack until it supports 1.7 along side with 9K
-    public JavaInternalBlockBody(Ruby runtime, Arity arity) {
-        this(runtime, null, null, Signature.from(arity));
-    }
-
     // Make sure we are still on the same thread as originator if we care
     private void threadCheck(ThreadContext yieldingContext) {
         if (originalContext != null && yieldingContext != originalContext) {
diff --git a/core/src/main/java/org/jruby/runtime/JavaSites.java b/core/src/main/java/org/jruby/runtime/JavaSites.java
index 557454bca93..d8111a75207 100644
--- a/core/src/main/java/org/jruby/runtime/JavaSites.java
+++ b/core/src/main/java/org/jruby/runtime/JavaSites.java
@@ -58,10 +58,11 @@ public class JavaSites {
     public final SymbolSites Symbol = new SymbolSites();
     public final ProcSites Proc = new ProcSites();
     public final ModuleSites Module = new ModuleSites();
+    public final ProducerSites Producer = new ProducerSites();
 
     public static class BasicObjectSites {
         public final CallSite respond_to = new FunctionalCachingCallSite("respond_to?");
-        public final CallSite respond_to_missing = new FunctionalCachingCallSite("respond_to_missing?");
+        public final CachingCallSite respond_to_missing = new FunctionalCachingCallSite("respond_to_missing?");
         public final CallSite initialize_dup = new FunctionalCachingCallSite("initialize_dup");
         public final CallSite initialize_clone = new FunctionalCachingCallSite("initialize_clone");
         public final CallSite to_s = new FunctionalCachingCallSite("to_s");
@@ -77,6 +78,7 @@ public static class BasicObjectSites {
         public final CallSite match = new FunctionalCachingCallSite("=~");
         public final CallSite call = new FunctionalCachingCallSite("call");
         public final CallSite op_equal = new FunctionalCachingCallSite("==");
+        public final CheckedSites instance_variables_to_inspect_checked = new CheckedSites("instance_variables_to_inspect");
     }
 
     public static class ObjectSites {
@@ -333,8 +335,8 @@ public static class TimeSites {
         public final CachingCallSite to_r = new FunctionalCachingCallSite("to_r");
         public final CheckedSites checked_to_r = new CheckedSites("to_r");
 
-        public final RespondToCallSite respond_to_divmod = new RespondToCallSite("divmod");
-        public final CachingCallSite divmod = new FunctionalCachingCallSite("divmod");
+        public final CheckedSites divmod_checked = new CheckedSites("divmod");
+        public final CheckedSites to_a_checked = new CheckedSites("to_a");
     }
 
     public static class EnumerableSites {
@@ -469,7 +471,9 @@ public static class RangeSites {
         public final CallSite op_cmp = new FunctionalCachingCallSite("<=>");
         public final CallSite op_gt = new FunctionalCachingCallSite(">");
         public final CallSite op_lt = new FunctionalCachingCallSite("<");
-        public final CallSite each = new FunctionalCachingCallSite("each");
+        public final CachingCallSite each = new FunctionalCachingCallSite("each");
+        public final CallSite reverse_each = new FunctionalCachingCallSite("reverse_each");
+        public final CallSite size = new FunctionalCachingCallSite("size");
     }
 
     public static class WarningSites {
@@ -571,6 +575,10 @@ public static class ModuleSites {
         public final CachingCallSite hash = new FunctionalCachingCallSite("hash");
     }
 
+    public static class ProducerSites {
+        public final CachingCallSite call = new FunctionalCachingCallSite("call");
+    }
+
     public static class CheckedSites {
         public final RespondToCallSite respond_to_X;
         public final CachingCallSite respond_to_missing = new FunctionalCachingCallSite("respond_to_missing?");
diff --git a/core/src/main/java/org/jruby/runtime/MethodIndex.java b/core/src/main/java/org/jruby/runtime/MethodIndex.java
index a27272d8083..13764f2a236 100644
--- a/core/src/main/java/org/jruby/runtime/MethodIndex.java
+++ b/core/src/main/java/org/jruby/runtime/MethodIndex.java
@@ -77,28 +77,6 @@ public class MethodIndex {
 
     private static final Logger LOG = LoggerFactory.getLogger(MethodIndex.class);
 
-    @Deprecated(since = "1.7.1")
-    public static final int NO_METHOD = MethodNames.DUMMY.ordinal();
-    @Deprecated(since = "1.7.1")
-    public static final int OP_EQUAL = MethodNames.OP_EQUAL.ordinal();
-    @Deprecated(since = "1.7.1")
-    public static final int EQL = MethodNames.EQL.ordinal();
-    @Deprecated(since = "1.7.1")
-    public static final int HASH = MethodNames.HASH.ordinal();
-    @Deprecated(since = "1.7.1")
-    public static final int OP_CMP = MethodNames.OP_CMP.ordinal();
-    @Deprecated(since = "1.7.1")
-    public static final int MAX_METHODS = MethodNames.values().length;
-
-    @Deprecated(since = "1.7.1")
-    public static final String[] METHOD_NAMES = {
-        "",
-        "==",
-        "eql?",
-        "hash",
-        "<=>"
-    };
-
     public static final Set<String> FRAME_AWARE_METHODS = Collections.synchronizedSet(new HashSet<String>());
     public static final Set<String> SCOPE_AWARE_METHODS = Collections.synchronizedSet(new HashSet<String>());
 
@@ -274,16 +252,4 @@ public static void addMethodReadFields(String name, FrameField... reads) {
     public static void addMethodWriteFields(String name, FrameField... write) {
         addMethodWriteFieldsPacked(FrameField.pack(write), name);
     }
-
-    @Deprecated(since = "9.2.0.0")
-    public static void addFrameAwareMethods(String... methods) {
-        if (DEBUG) LOG.debug("Adding frame-aware method names: {}", Arrays.toString(methods));
-        FRAME_AWARE_METHODS.addAll(Arrays.asList(methods));
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public static void addScopeAwareMethods(String... methods) {
-        if (DEBUG) LOG.debug("Adding scope-aware method names: {}", Arrays.toString(methods));
-        SCOPE_AWARE_METHODS.addAll(Arrays.asList(methods));
-    }
 }
diff --git a/core/src/main/java/org/jruby/runtime/ObjectSpace.java b/core/src/main/java/org/jruby/runtime/ObjectSpace.java
index 5fcc9f3c54d..3e2db23e317 100644
--- a/core/src/main/java/org/jruby/runtime/ObjectSpace.java
+++ b/core/src/main/java/org/jruby/runtime/ObjectSpace.java
@@ -116,11 +116,6 @@ private void cleanIdentities() {
         }
     }
 
-    @Deprecated(since = "1.6.0")
-    public long idOf(IRubyObject rubyObject) {
-        return createAndRegisterObjectId(rubyObject);
-    }
-
     @Deprecated(since = "9.4.10.0")
     public void addFinalizer(IRubyObject object, IRubyObject proc) {
         addFinalizer(((RubyBasicObject) object).getCurrentContext(), object, proc);
diff --git a/core/src/main/java/org/jruby/runtime/RubyEvent.java b/core/src/main/java/org/jruby/runtime/RubyEvent.java
index b363d28addc..7774cd3f189 100644
--- a/core/src/main/java/org/jruby/runtime/RubyEvent.java
+++ b/core/src/main/java/org/jruby/runtime/RubyEvent.java
@@ -54,11 +54,6 @@ public enum RubyEvent {
         this.requiresDebug = requiresDebug;
     }
 
-    @Deprecated(since = "9.2.9.0")
-    public int getLineNumberOffset(){
-        return 0;
-    }
-	
     public String getName(){
         return event_name;
     }
diff --git a/core/src/main/java/org/jruby/runtime/Signature.java b/core/src/main/java/org/jruby/runtime/Signature.java
index d1e4345bf80..34ef7f7434f 100644
--- a/core/src/main/java/org/jruby/runtime/Signature.java
+++ b/core/src/main/java/org/jruby/runtime/Signature.java
@@ -141,20 +141,6 @@ public boolean isTwoArguments() {
 
     public int required() { return pre + post; }
 
-    // We calculate this every time but no one should be using this any more
-    @Deprecated(since = "9.3.0.0")
-    public Arity arity() {
-        // NOTE: Some logic to *assign* variables still uses Arity, which treats Rest.ANON (the
-        //       |a,| form) as a rest arg for destructuring purposes. However ANON does *not*
-        //       permit more than required args to be passed to a lambda, so we do not consider
-        //       it a "true" rest arg for arity-checking purposes below in checkArity.
-        if (rest != Rest.NONE || opt != 0) {
-            return Arity.createArity(-(required() + 1));
-        } else {
-            return Arity.fixed(required() + getRequiredKeywordForArityCount());
-        }
-    }
-
     /**
      * Best attempt at breaking the code of arity values!  We figure out how many fixed/required parameters
      * must be supplied. Then we figure out if we need to mark the value as optional. Optional is indicated
@@ -207,23 +193,6 @@ public static Signature fromArityValue(int arityValue) {
         throw new UnsupportedOperationException("We do not know enough about the arity to convert it to a signature");
     }
 
-    // Lossy conversion to half-support older signatures which externally use Arity but needs to be converted.
-    @Deprecated(since = "9.3.0.0")
-    public static Signature from(Arity arity) {
-        switch(arity.required()) {
-            case 0:
-                return arity.isFixed() ? Signature.NO_ARGUMENTS : Signature.OPTIONAL;
-            case 1:
-                return arity.isFixed() ? Signature.ONE_ARGUMENT : Signature.ONE_REQUIRED;
-            case 2:
-                return arity.isFixed() ? Signature.TWO_ARGUMENTS : Signature.TWO_REQUIRED;
-            case 3:
-                return arity.isFixed() ? Signature.THREE_ARGUMENTS : Signature.THREE_REQUIRED;
-        }
-
-        throw new UnsupportedOperationException("We do not know enough about the arity to convert it to a signature");
-    }
-
     public static Signature from(int pre, int opt, int post, int kwargs, int requiredKwargs, Rest rest, int keyRest) {
         if (opt == 0 && post == 0 && kwargs == 0 && keyRest == -1) {
             switch (pre) {
diff --git a/core/src/main/java/org/jruby/runtime/ThreadContext.java b/core/src/main/java/org/jruby/runtime/ThreadContext.java
index e90439bdf06..0c9d96b56c5 100644
--- a/core/src/main/java/org/jruby/runtime/ThreadContext.java
+++ b/core/src/main/java/org/jruby/runtime/ThreadContext.java
@@ -43,7 +43,6 @@
 import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
-import org.jruby.RubyContinuation;
 import org.jruby.RubyMatchData;
 import org.jruby.RubyProc;
 import org.jruby.exceptions.CatchThrow;
@@ -112,7 +111,7 @@ public static ThreadContext newContext(Ruby runtime) {
      *
      * Usage: Builtins.checkIntegerPlus(context) reads context.builtinBits[0]
      */
-    public final short[] builtinBits;
+    public final int[] builtinBits;
 
     // Thread#set_trace_func for specific threads events.  We need this because successive
     // Thread.set_trace_funcs will end up replacing the current one (as opposed to add_trace_func).
@@ -187,13 +186,6 @@ public static ThreadContext newContext(Ruby runtime) {
     // (via IR instructions) for blocks.
     private Throwable savedExcInLambda;  // See handleBreakAndReturnsInLambda in IRRuntimeHelpers
 
-    /**
-     * This fields is no longer initialized, is null by default!
-     * @deprecated Use {@link #getSecureRandom()} instead.
-     */
-    @Deprecated(since = "9.1.0.0")
-    public transient SecureRandom secureRandom;
-
     private static boolean tryPreferredPRNG = true;
     private static boolean trySHA1PRNG = true;
 
@@ -203,38 +195,6 @@ public static ThreadContext newContext(Ruby runtime) {
 
     private RubyMatchData matchData;
 
-    @SuppressWarnings("deprecation")
-    public SecureRandom getSecureRandom() {
-        SecureRandom secureRandom = this.secureRandom;
-
-        // Try preferred PRNG, which defaults to NativePRNGNonBlocking
-        if (secureRandom == null && tryPreferredPRNG) {
-            try {
-                secureRandom = SecureRandom.getInstance(Options.PREFERRED_PRNG.load());
-            } catch (Exception e) {
-                tryPreferredPRNG = false;
-            }
-        }
-
-        // Try SHA1PRNG
-        if (secureRandom == null && trySHA1PRNG) {
-            try {
-                secureRandom = SecureRandom.getInstance("SHA1PRNG");
-            } catch (Exception e) {
-                trySHA1PRNG = false;
-            }
-        }
-
-        // Just let JDK do whatever it does
-        if (secureRandom == null) {
-            secureRandom = new SecureRandom();
-        }
-
-        this.secureRandom = secureRandom;
-
-        return secureRandom;
-    }
-
     private Encoding[] encodingHolder;
 
     /**
@@ -451,11 +411,6 @@ private void expandCatchStack() {
         catchStack = newCatchStack;
     }
 
-    @Deprecated(since = "9.2.6.0")
-    public void pushCatch(RubyContinuation.Continuation catchTarget) {
-        pushCatch((CatchThrow) catchTarget);
-    }
-
     public void pushCatch(CatchThrow catchTarget) {
         int index = ++catchIndex;
         if (index == catchStack.length) {
@@ -860,14 +815,6 @@ public void trace(RubyEvent event, String name, RubyModule implClass, String fil
         traceEvents.callEventHooks(this, event, file, line, name, implClass);
     }
 
-    /**
-     * Used by the evaluator and the compiler to look up a constant by name
-     */
-    @Deprecated(since = "1.7.2")
-    public IRubyObject getConstant(String internedName) {
-        return getCurrentStaticScope().getConstant(this, internedName);
-    }
-
     /**
      * Render the current backtrace as a string to the given StringBuilder. This will honor the currently-configured
      * backtrace format and content.
@@ -1437,6 +1384,11 @@ public interface RecursiveFunctionEx<T> {
         IRubyObject call(ThreadContext context, T state, IRubyObject obj, boolean recur);
     }
 
+    // MRI: rb_exec_recursive
+    public <T> IRubyObject execRecursive(RecursiveFunctionEx<T> func, T state, IRubyObject obj, String name) {
+        return safeRecurse(func, state, obj, name, false);
+    }
+
     public <T> IRubyObject safeRecurse(RecursiveFunctionEx<T> func, T state, IRubyObject obj, String name, boolean outer) {
         Map<IRubyObject, IRubyObject> guards = safeRecurseGetGuards(name);
 
@@ -1589,6 +1541,7 @@ public void clearCallInfo() {
      * Clear call info state (set to 0). This method is static to make it trivially
      * inlinable on most JVM JITs
      */
+    @JIT
     public static void clearCallInfo(ThreadContext context) {
         context.callInfo = 0;
     }
@@ -1598,17 +1551,10 @@ public static boolean hasKeywords(int callInfo) {
     }
 
     public static boolean hasNonemptyKeywords(int callInfo) {
-        return (callInfo & CALL_KEYWORD) != 0 && !keywordsEmpty(callInfo);
+        return hasKeywords(callInfo) && !keywordsEmpty(callInfo);
     }
 
     public static boolean keywordsEmpty(int callInfo) {
         return (callInfo & CALL_KEYWORD_EMPTY) != 0;
     }
-
-    @Deprecated(since = "9.3.0.0")
-    public IRubyObject setBackRef(IRubyObject match) {
-        if (match.isNil()) return clearBackRef();
-
-        return setBackRef((RubyMatchData) match);
-    }
 }
diff --git a/core/src/main/java/org/jruby/runtime/TraceEventManager.java b/core/src/main/java/org/jruby/runtime/TraceEventManager.java
index d234960f6a5..08ccc860f0e 100644
--- a/core/src/main/java/org/jruby/runtime/TraceEventManager.java
+++ b/core/src/main/java/org/jruby/runtime/TraceEventManager.java
@@ -21,7 +21,7 @@
 import java.util.stream.Collectors;
 
 import static org.jruby.api.Convert.asFixnum;
-import static org.jruby.api.Create.*;
+import static org.jruby.api.Create.newString;
 import static org.jruby.api.Warn.warn;
 
 public class TraceEventManager {
@@ -164,10 +164,11 @@ public void setTraceFunction(CallTraceFuncHook hook, RubyProc traceFunction) {
     public void removeAllCallEventHooksFor(ThreadContext context) {
         if (eventHooks.length == 0) return;
 
+        int size = eventHooks.length;
         List<EventHook> hooks = new ArrayList<>(Arrays.asList(eventHooks));
 
         hooks = hooks.stream().filter(hook ->
-                !(hook instanceof CallTraceFuncHook) || !((CallTraceFuncHook) hook).getThread().equals(context)
+                !(hook instanceof CallTraceFuncHook ctfHook && ctfHook.getThread().equals(context))
         ).collect(Collectors.toList());
 
         EventHook[] newHooks = new EventHook[hooks.size()];
@@ -211,6 +212,10 @@ public boolean hasEventHooks() {
         return hasEventHooks;
     }
 
+    public int[] eventHookStats() {
+        return new int[] {eventHooks.length, 0};
+    }
+
     public static class CallTraceFuncHook extends EventHook {
         private RubyProc traceFunc;
         private final ThreadContext thread; // if non-null only call traceFunc if it is from this thread.
diff --git a/core/src/main/java/org/jruby/runtime/backtrace/BacktraceData.java b/core/src/main/java/org/jruby/runtime/backtrace/BacktraceData.java
index 91685b8ea28..8f2af94d883 100644
--- a/core/src/main/java/org/jruby/runtime/backtrace/BacktraceData.java
+++ b/core/src/main/java/org/jruby/runtime/backtrace/BacktraceData.java
@@ -126,8 +126,21 @@ private void eachBacktrace(Map<String, Map<String, String>> boundMethods, Predic
                             continue;
                         }
 
-                        // mask internal file paths
-                        filename = TraceType.maskInternalFiles(filename);
+                        // skip internal sources if requested
+                        if (TraceType.isExcludedInternal(filename)) {
+                            // if excluding internal sources, skip frame altogether
+                            if (excludeInternal) continue;
+
+                            // if masking internal sources, replace only the highest frame with most recent Ruby frame
+                            if (maskNative) {
+                                dupFrame = true;
+                                dupFrameName = decodedName;
+                                continue;
+                            }
+
+                            // otherwise, mark internal file paths with "internal:" prefix
+                            filename = TraceType.maskInternalFiles(filename);
+                        }
 
                         // construct Ruby trace element
                         RubyStackTraceElement rubyElement = new RubyStackTraceElement(className, decodedName, filename, line, false, type);
@@ -180,28 +193,38 @@ private void eachBacktrace(Map<String, Map<String, String>> boundMethods, Predic
                 BacktraceElement rubyFrame = backIter.next();
 
                 // construct Ruby trace element
-                final String newName;
+                final String translatedName;
                 switch (frameType) {
-                    case METHOD: newName = rubyFrame.method; break;
-                    case BLOCK: newName = rubyFrame.method; break;
-                    case CLASS: newName = "<class:" + rubyFrame.method + '>'; break;
-                    case MODULE: newName = "<module:" + rubyFrame.method + '>'; break;
-                    case METACLASS: newName = "singleton class"; break;
-                    case ROOT: newName = "<main>"; break;
+                    case METHOD: translatedName = rubyFrame.method; break;
+                    case BLOCK: translatedName = rubyFrame.method; break;
+                    case CLASS: translatedName = "<class:" + rubyFrame.method + '>'; break;
+                    case MODULE: translatedName = "<module:" + rubyFrame.method + '>'; break;
+                    case METACLASS: translatedName = "singleton class"; break;
+                    case ROOT: translatedName = "<main>"; break;
                     case EVAL:
-                        newName = rubyFrame.method == null || rubyFrame.method.isEmpty() ? "<main>" : rubyFrame.method;
+                        translatedName = rubyFrame.method == null || rubyFrame.method.isEmpty() ? "<main>" : rubyFrame.method;
                         break;
-                    default: newName = rubyFrame.method;
+                    default: translatedName = rubyFrame.method;
                 }
 
                 // skip internal sources if requested
                 filename = rubyFrame.filename;
-                if (excludeInternal && TraceType.isExcludedInternal(filename)) continue;
+                if (TraceType.isExcludedInternal(filename)) {
+                    // if excluding internal sources, skip frame altogether
+                    if (excludeInternal) continue;
+
+                    // if masking internal sources, replace only the highest frame with most recent Ruby frame
+                    if (maskNative) {
+                        dupFrame = true;
+                        dupFrameName = translatedName;
+                        continue;
+                    }
 
-                // mask internal file paths
-                filename = TraceType.maskInternalFiles(filename);
+                    // otherwise, mark internal file paths with "internal:" prefix
+                    filename = TraceType.maskInternalFiles(filename);
+                }
 
-                RubyStackTraceElement rubyElement = new RubyStackTraceElement("RUBY", newName, filename, rubyFrame.line + 1, false, frameType);
+                RubyStackTraceElement rubyElement = new RubyStackTraceElement("RUBY", translatedName, filename, rubyFrame.line + 1, false, frameType);
 
                 // dup if masking native and previous frame was native
                 if (maskNative && dupFrame) {
diff --git a/core/src/main/java/org/jruby/runtime/backtrace/RubyStackTraceElement.java b/core/src/main/java/org/jruby/runtime/backtrace/RubyStackTraceElement.java
index 89dac255094..2db62a07d19 100644
--- a/core/src/main/java/org/jruby/runtime/backtrace/RubyStackTraceElement.java
+++ b/core/src/main/java/org/jruby/runtime/backtrace/RubyStackTraceElement.java
@@ -79,9 +79,6 @@ public final StackTraceElement asStackTraceElement() {
         return element = new StackTraceElement(className, methodName, fileName, lineNumber);
     }
 
-    @Deprecated(since = "9.1.0.0")
-    public StackTraceElement getElement() { return asStackTraceElement(); }
-
     public String toString() {
         return asStackTraceElement().toString();
     }
@@ -103,12 +100,4 @@ public static RubyString to_s_mri(ThreadContext context, RubyStackTraceElement e
         return line;
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public final CharSequence mriStyleString() {
-        // return fileName + ':' + lineNumber + ":in '" + methodName + '\'';
-        return new StringBuilder(fileName.length() + methodName.length() + 12).
-                append(fileName).append(':').append(lineNumber).
-                append(":in '").append(methodName).append('\'');
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/runtime/backtrace/TraceType.java b/core/src/main/java/org/jruby/runtime/backtrace/TraceType.java
index 5ae0efa1aab..f1091c44d1b 100644
--- a/core/src/main/java/org/jruby/runtime/backtrace/TraceType.java
+++ b/core/src/main/java/org/jruby/runtime/backtrace/TraceType.java
@@ -813,15 +813,4 @@ public static boolean hasInternalMarker(String filename) {
     public static boolean isExcludedInternal(String filename) {
         return TraceType.isInternalFile(filename) || TraceType.hasInternalMarker(filename);
     }
-
-    @Deprecated(since = "9.2.7.0")
-    public RubyStackTraceElement getBacktraceElement(ThreadContext context, int uplevel) {
-        // NOTE: could be optimized not to walk the whole stack
-        RubyStackTraceElement[] elements = getBacktrace(context).getBacktrace(context.runtime);
-
-        // User can ask for level higher than stack
-        if (elements.length <= uplevel + 1) uplevel = -1;
-
-        return elements[uplevel + 1];
-    }
 }
diff --git a/core/src/main/java/org/jruby/runtime/builtin/IRubyObject.java b/core/src/main/java/org/jruby/runtime/builtin/IRubyObject.java
index 43ed35b9b6f..c335338fc54 100644
--- a/core/src/main/java/org/jruby/runtime/builtin/IRubyObject.java
+++ b/core/src/main/java/org/jruby/runtime/builtin/IRubyObject.java
@@ -64,17 +64,10 @@ static IRubyObject[] array(int length) {
 
     IRubyObject[] NULL_ARRAY = new IRubyObject[0];
 
-    @Deprecated(since = "1.1.5")
-    public IRubyObject callSuper(ThreadContext context, IRubyObject[] args, Block block);
-
     public IRubyObject callMethod(ThreadContext context, String name);
     public IRubyObject callMethod(ThreadContext context, String name, IRubyObject arg);
     public IRubyObject callMethod(ThreadContext context, String name, IRubyObject[] args);
     public IRubyObject callMethod(ThreadContext context, String name, IRubyObject[] args, Block block);
-    @Deprecated(since = "1.1.5")
-    public IRubyObject callMethod(ThreadContext context, int methodIndex, String name);
-    @Deprecated(since = "1.1.6")
-    public IRubyObject callMethod(ThreadContext context, int methodIndex, String name, IRubyObject arg);
 
     public IRubyObject checkCallMethod(ThreadContext context, String name);
 
@@ -107,18 +100,6 @@ static IRubyObject[] array(int length) {
      */
     void setFrozen(boolean b);
 
-    /**
-     * RubyMethod isUntrusted.
-     * @return boolean
-     */
-    boolean isUntrusted();
-
-    /**
-     * RubyMethod setUntrusted.
-     * @param b boolean
-     */
-    void setUntrusted(boolean b);
-    
     /**
      * Is this an immediate object
      * @return boolean
@@ -332,9 +313,6 @@ default IRubyObject inspect(ThreadContext context) {
      */
     Object dataGetStruct();
 
-    @Deprecated(since = "9.2.0.0") // not used at all
-    Object dataGetStructChecked();
-
     @Deprecated
     IRubyObject id();
 
@@ -375,22 +353,6 @@ public default IRubyObject addFinalizer(ThreadContext context, IRubyObject final
      */
     boolean hasVariables();
 
-    /**
-     * how many variables?
-     * @return the count of all variables (ivar/cvar/constant/internal)
-     */
-    int getVariableCount();
-    
-    /**
-     * Sets object's variables to those in the supplied list,
-     * removing/replacing any previously defined variables.  Applies
-     * to all variable types (ivar/cvar/constant/internal).
-     * 
-     * @param variables the variables to be set for object 
-     */
-    @Deprecated(since = "1.6.0")
-    void syncVariables(List<Variable<Object>> variables);
-
     /**
      * Sets object's variables to those in the supplied object,
      * removing/replacing any previously defined variables of the same name.
@@ -451,18 +413,6 @@ default IRubyObject checkStringType19() {
         return checkStringType();
     }
 
-    /**
-     * convert this object to an integer
-     * @param convertMethod conversion method name
-     * @param convertMethodIndex index
-     * @see #convertToInteger(String)
-     * @return integer
-     */
-    @Deprecated(since = "9.2.0.0")
-    default RubyInteger convertToInteger(int convertMethodIndex, String convertMethod) {
-        return convertToInteger(convertMethod);
-    }
-
     @Deprecated(since = "9.4.0.0")
     boolean isTaint();
 
diff --git a/core/src/main/java/org/jruby/runtime/builtin/InstanceVariables.java b/core/src/main/java/org/jruby/runtime/builtin/InstanceVariables.java
index 8d76d6db305..3f4a0ce3d75 100644
--- a/core/src/main/java/org/jruby/runtime/builtin/InstanceVariables.java
+++ b/core/src/main/java/org/jruby/runtime/builtin/InstanceVariables.java
@@ -28,9 +28,6 @@ public interface InstanceVariables {
      */
     boolean hasInstanceVariable(String name);
 
-    @Deprecated(since = "1.7.0")
-    boolean fastHasInstanceVariable(String internedName);
-    
     /**
      * Returns the named instance variable if present, else null. 
      * 
@@ -39,9 +36,6 @@ public interface InstanceVariables {
      */
     IRubyObject getInstanceVariable(String name);
 
-    @Deprecated(since = "1.7.0")
-    IRubyObject fastGetInstanceVariable(String internedName);
-
     /**
      * Sets the named instance variable to the specified value.
      * 
@@ -51,9 +45,6 @@ public interface InstanceVariables {
      */    
     IRubyObject setInstanceVariable(String name, IRubyObject value);
 
-    @Deprecated(since = "1.7.0")
-    IRubyObject fastSetInstanceVariable(String internedName, IRubyObject value);
-
     /**
      * Removes the named instance variable, if present, returning its
      * value.
diff --git a/core/src/main/java/org/jruby/runtime/builtin/InternalVariables.java b/core/src/main/java/org/jruby/runtime/builtin/InternalVariables.java
index 3df0b647944..c6781c2aa65 100644
--- a/core/src/main/java/org/jruby/runtime/builtin/InternalVariables.java
+++ b/core/src/main/java/org/jruby/runtime/builtin/InternalVariables.java
@@ -21,9 +21,6 @@ public interface InternalVariables {
      */
     boolean hasInternalVariable(String name);
 
-    @Deprecated(since = "1.7.0")
-    boolean fastHasInternalVariable(String internedName);
-    
     /**
      * Returns the named internal variable if present, else null.  Use only
      * for internal variables (not ivar/cvar/constant).
@@ -33,9 +30,6 @@ public interface InternalVariables {
      */
     Object getInternalVariable(String name);
 
-    @Deprecated(since = "1.7.0")
-    Object fastGetInternalVariable(String internedNaem);
-    
     /**
      * Sets the named internal variable to the specified value.  Use only
      * for internal variables (not ivar/cvar/constant).
@@ -45,9 +39,6 @@ public interface InternalVariables {
      */
     void setInternalVariable(String name, Object value);
 
-    @Deprecated(since = "1.7.0")
-    void fastSetInternalVariable(String internedName, Object value);
-    
     /**
      * Removes the named internal variable, if present, returning its
      * value.  Use only for internal variables (not ivar/cvar/constant).
diff --git a/core/src/main/java/org/jruby/runtime/callback/Callback.java b/core/src/main/java/org/jruby/runtime/callback/Callback.java
deleted file mode 100644
index bcae4e5200a..00000000000
--- a/core/src/main/java/org/jruby/runtime/callback/Callback.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: EPL 2.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2001-2002 Jan Arne Petersen <jpetersen@uni-bonn.de>
- * Copyright (C) 2002 Benoit Cerrina <b.cerrina@wanadoo.fr>
- * Copyright (C) 2002-2004 Anders Bengtsson <ndrsbngtssn@yahoo.se>
- * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby.runtime.callback;
-
-import org.jruby.runtime.Arity;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@Deprecated(since = "1.7.4")
-public interface Callback {
-    IRubyObject execute(IRubyObject recv, IRubyObject[] args, Block block);
-    Arity getArity();
-}
diff --git a/core/src/main/java/org/jruby/runtime/callsite/CachingCallSite.java b/core/src/main/java/org/jruby/runtime/callsite/CachingCallSite.java
index 45e43006f7f..c91e1b6341a 100644
--- a/core/src/main/java/org/jruby/runtime/callsite/CachingCallSite.java
+++ b/core/src/main/java/org/jruby/runtime/callsite/CachingCallSite.java
@@ -17,8 +17,6 @@
 public abstract class CachingCallSite extends CallSite {
 
     protected CacheEntry cache = CacheEntry.NULL_CACHE;
-    @Deprecated(since = "9.2.17.0")
-    protected CacheEntry builtinCache = CacheEntry.NULL_CACHE;
 
     public CachingCallSite(String methodName, CallType callType) {
         super(methodName, callType);
@@ -400,16 +398,6 @@ public final CacheEntry retrieveCache(RubyClass selfType) {
         return cacheAndGet(selfType, methodName);
     }
 
-    @Deprecated(since = "9.2.8.0")
-    public final CacheEntry retrieveCache(RubyClass selfType, String methodName) {
-        // This must be retrieved *once* to avoid racing with other threads.
-        CacheEntry cache = this.cache;
-        if (cache.typeOk(selfType)) {
-            return cache;
-        }
-        return cacheAndGet(selfType, methodName);
-    }
-
     public boolean isBuiltin(IRubyObject self) {
         RubyClass selfType = getMetaClass(self);
         // This must be retrieved *once* to avoid racing with other threads.
@@ -425,12 +413,10 @@ public final boolean isBuiltin(RubyClass selfType) {
         return retrieveCache(selfType).method.isBuiltin();
     }
 
-    @Deprecated(since = "9.2.8.0")
     private CacheEntry cacheAndGet(RubyClass selfType, String methodName) {
         CacheEntry entry = selfType.searchWithCache(methodName);
         if (!entry.method.isUndefined()) {
             this.cache = entry;
-            if (entry.method.isBuiltin()) builtinCache = entry;
         }
         return entry;
     }
diff --git a/core/src/main/java/org/jruby/runtime/callsite/PlusCallSite.java b/core/src/main/java/org/jruby/runtime/callsite/PlusCallSite.java
index b7248edf17c..011a2afc70a 100644
--- a/core/src/main/java/org/jruby/runtime/callsite/PlusCallSite.java
+++ b/core/src/main/java/org/jruby/runtime/callsite/PlusCallSite.java
@@ -2,6 +2,7 @@
 
 import org.jruby.RubyFixnum;
 import org.jruby.RubyFloat;
+import org.jruby.runtime.Builtins;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import static org.jruby.RubyBasicObject.getMetaClass;
@@ -30,12 +31,12 @@ public IRubyObject call(ThreadContext context, IRubyObject caller, IRubyObject s
 
     @Override
     public IRubyObject call(ThreadContext context, IRubyObject caller, IRubyObject self, IRubyObject arg1) {
-        if (self instanceof RubyFixnum) {
+        if (self instanceof RubyFixnum && Builtins.checkIntegerPlus(context)) {
             CacheEntry cache = this.cache;
             if (cache instanceof FixnumEntry && cache.typeOk(getMetaClass(self))) {
                 return ((RubyFixnum) self).op_plus(context, arg1);
             }
-        } else if (self instanceof RubyFloat) {
+        } else if (self instanceof RubyFloat && Builtins.checkFloatPlus(context)) {
             CacheEntry cache = this.secondaryCache;
             if (cache instanceof FloatEntry && cache.typeOk(getMetaClass(self))) {
                 return ((RubyFloat) self).op_plus(context, arg1);
diff --git a/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java b/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
index 4648e3b9d14..f46971277ad 100644
--- a/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
+++ b/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
@@ -561,9 +561,4 @@ private Entry findEntryFromEncoding(Encoding e) {
         if (e == null) return null;
         return findEncodingEntry(e.getName());
     }
-
-    @Deprecated(since = "9.1.1.0")
-    public Encoding getFileSystemEncoding(Ruby runtime) {
-        return getFileSystemEncoding();
-    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/jruby/runtime/invokedynamic/VariableSite.java b/core/src/main/java/org/jruby/runtime/invokedynamic/VariableSite.java
index 4d2b188b1d3..21a3b341647 100644
--- a/core/src/main/java/org/jruby/runtime/invokedynamic/VariableSite.java
+++ b/core/src/main/java/org/jruby/runtime/invokedynamic/VariableSite.java
@@ -122,7 +122,7 @@ public IRubyObject ivarGet(IRubyObject self) throws Throwable {
         getValue = filterReturnValue(getValue, nullToNil);
 
         // prepare fallback
-        MethodHandle fallback = null;
+        MethodHandle fallback;
         if (chainCount() + 1 > Options.INVOKEDYNAMIC_MAXPOLY.load()) {
             if (Options.INVOKEDYNAMIC_LOG_BINDING.load()) LOG.info(name() + "\tqet on type " + self.getMetaClass().id + " failed (polymorphic)" + extractSourceInfo());
             fallback = findVirtual(VariableSite.class, "ivarGetFail", methodType(IRubyObject.class, IRubyObject.class));
@@ -145,10 +145,10 @@ public IRubyObject ivarGet(IRubyObject self) throws Throwable {
         MethodHandle test = findStatic(VariableSite.class, "testRealClass", methodType(boolean.class, int.class, IRubyObject.class));
         test = insertArguments(test, 0, accessor.getClassId());
 
-        getValue = guardWithTest(test, getValue, fallback);
+        MethodHandle guarded = guardWithTest(test, getValue, fallback);
 
         if (Options.INVOKEDYNAMIC_LOG_BINDING.load()) LOG.info(name() + "\tget on class " + self.getMetaClass().id + " bound directly" + extractSourceInfo());
-        setTarget(getValue);
+        setTarget(guarded);
 
         return (IRubyObject)getValue.invokeExact(self);
     }
@@ -185,13 +185,14 @@ public void ivarSet(IRubyObject self, IRubyObject value) throws Throwable {
         }
 
         // prepare fallback
-        MethodHandle fallback = null;
+        MethodHandle fallback;
         if (chainCount() + 1 > Options.INVOKEDYNAMIC_MAXPOLY.load()) {
             if (Options.INVOKEDYNAMIC_LOG_BINDING.load()) LOG.info(name() + "\tset on type " + self.getMetaClass().id + " failed (polymorphic)" + extractSourceInfo());
             fallback = findVirtual(VariableSite.class, "ivarSetFail", methodType(void.class, IRubyObject.class, IRubyObject.class));
             fallback = fallback.bindTo(this);
             setTarget(fallback);
             fallback.invokeExact(self, value);
+            return;
         } else {
             if (Options.INVOKEDYNAMIC_LOG_BINDING.load()) {
                 if (direct) {
@@ -209,10 +210,10 @@ public void ivarSet(IRubyObject self, IRubyObject value) throws Throwable {
         test = insertArguments(test, 0, accessor.getClassId());
         test = dropArguments(test, 1, IRubyObject.class);
 
-        setValue = guardWithTest(test, setValue, fallback);
+        MethodHandle guarded = guardWithTest(test, setValue, fallback);
 
         if (Options.INVOKEDYNAMIC_LOG_BINDING.load()) LOG.info(name() + "\tset on class " + self.getMetaClass().id + " bound directly" + extractSourceInfo());
-        setTarget(setValue);
+        setTarget(guarded);
 
         setValue.invokeExact(self, value);
     }
diff --git a/core/src/main/java/org/jruby/runtime/ivars/FieldVariableAccessor.java b/core/src/main/java/org/jruby/runtime/ivars/FieldVariableAccessor.java
index 4136b75f605..dbae1062472 100644
--- a/core/src/main/java/org/jruby/runtime/ivars/FieldVariableAccessor.java
+++ b/core/src/main/java/org/jruby/runtime/ivars/FieldVariableAccessor.java
@@ -43,8 +43,8 @@
  * A variable accessor that accesses a field directly;
  */
 public class FieldVariableAccessor extends VariableAccessor {
-    private final MethodHandle getter;
-    private final MethodHandle setter;
+    protected final MethodHandle getter;
+    protected final MethodHandle setter;
     
     /**
      * Construct a new FieldVariableAccessor for the given "real" class,
@@ -64,6 +64,10 @@ public FieldVariableAccessor(RubyClass realClass, String name, int index, int cl
         this.setter = wrapSetter(setter);
     }
 
+    public FieldVariableAccessor cloneFor(RubyClass newRealClass) {
+        return new FieldVariableAccessor(newRealClass, name, index, classId, getter, setter);
+    }
+
     protected MethodHandle wrapSetter(MethodHandle setter) {
         // mix frozen check into setter
         return MethodHandles.foldArguments(setter, ENSURE_SETTABLE.asType(setter.type()));
diff --git a/core/src/main/java/org/jruby/runtime/ivars/RawFieldVariableAccessor.java b/core/src/main/java/org/jruby/runtime/ivars/RawFieldVariableAccessor.java
index c00a7513cc4..a69b66cd610 100644
--- a/core/src/main/java/org/jruby/runtime/ivars/RawFieldVariableAccessor.java
+++ b/core/src/main/java/org/jruby/runtime/ivars/RawFieldVariableAccessor.java
@@ -59,8 +59,15 @@ public class RawFieldVariableAccessor extends FieldVariableAccessor {
      * @param setter the setter handle for the field
      */
     public RawFieldVariableAccessor(RubyClass realClass, boolean unwrapInSet, Class<?> toJava, Class<?> returnType, String name, int index, int classId, MethodHandle getter, MethodHandle setter) {
-        super(realClass, name, index, classId, wrapGetter(getter, realClass, returnType), wrapSetter(setter, realClass, unwrapInSet, toJava, returnType));
+        this(realClass, name, index, classId, wrapGetter(getter, realClass, returnType), wrapSetter(setter, realClass, unwrapInSet, toJava, returnType));
+    }
+
+    private RawFieldVariableAccessor(RubyClass realClass, String name, int index, int classId, MethodHandle getter, MethodHandle setter) {
+        super(realClass, name, index, classId, getter, setter);
+    }
 
+    public RawFieldVariableAccessor cloneFor(RubyClass newRealClass) {
+        return new RawFieldVariableAccessor(newRealClass, name, index, classId, getter, setter);
     }
     
     @Override
diff --git a/core/src/main/java/org/jruby/runtime/ivars/StampedVariableAccessor.java b/core/src/main/java/org/jruby/runtime/ivars/StampedVariableAccessor.java
index 22519dcae70..2f17b2d34b9 100644
--- a/core/src/main/java/org/jruby/runtime/ivars/StampedVariableAccessor.java
+++ b/core/src/main/java/org/jruby/runtime/ivars/StampedVariableAccessor.java
@@ -51,6 +51,10 @@ public StampedVariableAccessor(RubyClass realClass, String name, int index, int
         super(realClass, name, index, classId);
     }
 
+    public StampedVariableAccessor cloneFor(RubyClass newRealClass) {
+        return new StampedVariableAccessor(newRealClass, name, index, classId);
+    }
+
     /**
      * Set this variable into the given object using Unsafe to ensure
      * safe updating of the variable table.
diff --git a/core/src/main/java/org/jruby/runtime/ivars/VariableAccessor.java b/core/src/main/java/org/jruby/runtime/ivars/VariableAccessor.java
index 0f1c62efe4c..b458a3887a6 100644
--- a/core/src/main/java/org/jruby/runtime/ivars/VariableAccessor.java
+++ b/core/src/main/java/org/jruby/runtime/ivars/VariableAccessor.java
@@ -192,6 +192,10 @@ public String toString() {
         return "ivar:" + getName() + ":" + index;
     }
 
+    public VariableAccessor cloneFor(RubyClass newRealClass) {
+        throw new UnsupportedOperationException();
+    }
+
     /** a dummy accessor that will always return null */
     public static final VariableAccessor DUMMY_ACCESSOR = new VariableAccessor(null, null, -1, -1) {};
     
diff --git a/core/src/main/java/org/jruby/runtime/ivars/VariableTableManager.java b/core/src/main/java/org/jruby/runtime/ivars/VariableTableManager.java
index 8ece0b2ad33..c28cbb31098 100644
--- a/core/src/main/java/org/jruby/runtime/ivars/VariableTableManager.java
+++ b/core/src/main/java/org/jruby/runtime/ivars/VariableTableManager.java
@@ -115,7 +115,7 @@ public VariableTableManager(RubyClass realClass) {
     VariableTableManager(VariableTableManager original, RubyClass realClass) {
         synchronized (original) {
             this.realClass = realClass;
-            this.variableAccessors = copyVariableAccessors(original.variableAccessors);
+            this.variableAccessors = copyVariableAccessors(realClass, original.variableAccessors);
             this.variableNames = original.variableNames.clone();
             this.hasObjectID = original.hasObjectID;
             this.hasFFI = original.hasFFI;
@@ -283,8 +283,10 @@ VariableAccessor getVariableAccessorWithBuilder(String name, Function<Integer, V
         return ivarAccessor;
     }
 
-    private static Map<String, VariableAccessor> copyVariableAccessors(Map<String, VariableAccessor> myVariableAccessors) {
-        return new LinkedHashMap<>(myVariableAccessors);
+    private static Map<String, VariableAccessor> copyVariableAccessors(RubyClass realClass, Map<String, VariableAccessor> otherVariableAccessors) {
+        var myVariableAccessors = new LinkedHashMap<String, VariableAccessor>(otherVariableAccessors.size());
+        otherVariableAccessors.forEach((name, accessor) -> myVariableAccessors.put(name, accessor.cloneFor(realClass)));
+        return myVariableAccessors;
     }
 
     private static Map<String, VariableAccessor> copyVariableAccessors(Map<String, VariableAccessor> myVariableAccessors, String name, VariableAccessor ivarAccessor) {
diff --git a/core/src/main/java/org/jruby/runtime/load/IAutoloadMethod.java b/core/src/main/java/org/jruby/runtime/load/IAutoloadMethod.java
deleted file mode 100644
index 184b8c64441..00000000000
--- a/core/src/main/java/org/jruby/runtime/load/IAutoloadMethod.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: EPL 2.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2002 Jan Arne Petersen <jpetersen@uni-bonn.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby.runtime.load;
-
-import org.jruby.Ruby;
-
-@Deprecated(since = "9.0.5.0") // no longer used
-public interface IAutoloadMethod {
-    String file();
-    void load(Ruby runtime);
-}
diff --git a/core/src/main/java/org/jruby/runtime/load/LoadService.java b/core/src/main/java/org/jruby/runtime/load/LoadService.java
index 0d2fac50872..b3f3bcff008 100644
--- a/core/src/main/java/org/jruby/runtime/load/LoadService.java
+++ b/core/src/main/java/org/jruby/runtime/load/LoadService.java
@@ -160,18 +160,6 @@ public enum SuffixType {
         public EnumSet<LibrarySearcher.Suffix> getSuffixSet() {
             return suffixes;
         }
-
-        @Deprecated(since = "9.3.0.0")
-        public String[] getSuffixes() {
-            return suffixes.stream()
-                    .map((suffix) -> suffix.name())
-                    .toArray(String[]::new);
-        }
-
-        @Deprecated(since = "9.3.0.0")
-        public static final String[] sourceSuffixes = LibrarySearcher.Suffix.SOURCES.stream().map((suffix) -> suffix.name()).toArray(String[]::new);
-        @Deprecated(since = "9.3.0.0")
-        public static final String[] extensionSuffixes = LibrarySearcher.Suffix.EXTENSIONS.stream().map((suffix) -> suffix.name()).toArray(String[]::new);
     }
 
     @Deprecated(since = "10.0.3.0")
@@ -186,6 +174,7 @@ public String[] getSuffixes() {
     protected final Map<String, JarFile> jarFiles = new HashMap<>(0);
 
     protected final Ruby runtime;
+    protected final ClassLoader systemClassLoader;
     protected LibrarySearcher librarySearcher;
 
     protected String mainScript;
@@ -193,6 +182,7 @@ public String[] getSuffixes() {
 
     public LoadService(Ruby runtime) {
         this.runtime = runtime;
+        this.systemClassLoader = Ruby.getClassLoader();
         if (RubyInstanceConfig.DEBUG_LOAD_TIMINGS) {
             loadTimer = new TracingLoadTimer();
         } else {
@@ -383,6 +373,10 @@ public void load(String file, boolean wrap) {
         }
     }
 
+    public void loadFromClassLoader(String file, boolean wrap) {
+        loadFromClassLoader(systemClassLoader, file, wrap);
+    }
+
     public void loadFromClassLoader(ClassLoader classLoader, String file, boolean wrap) {
         long startTime = loadTimer.startLoad("classloader:" + file);
         int currentLine = runtime.getCurrentLine();
@@ -991,7 +985,11 @@ public String getPathForLocation(String filename) {
     }
 
     public void tearDown() {
-        loadedFeatures.clear();
+        if (loadedFeatures.isFrozen()) {
+            loadedFeatures = new StringArraySet(runtime);
+        } else {
+            loadedFeatures.clear();
+        }
         librarySearcher.tearDown();
     }
 }
diff --git a/core/src/main/java/org/jruby/runtime/marshal/CoreObjectType.java b/core/src/main/java/org/jruby/runtime/marshal/CoreObjectType.java
index e5543566a79..f4355aca5f8 100644
--- a/core/src/main/java/org/jruby/runtime/marshal/CoreObjectType.java
+++ b/core/src/main/java/org/jruby/runtime/marshal/CoreObjectType.java
@@ -29,18 +29,6 @@
 import org.jruby.runtime.ClassIndex;
 
 public interface CoreObjectType {
-    /**
-     * Return the ClassIndex value for the native type this object was
-     * constructed from. Particularly useful for determining marshalling
-     * format. All instances of subclasses of Hash, for example
-     * are of Java type RubyHash, and so should utilize RubyHash marshalling
-     * logic in addition to user-defined class marshalling logic.
-     *
-     * @return the ClassIndex of the native type this object was constructed from
-     */
-    @Deprecated(since = "9.0.0.0")
-    int getNativeTypeIndex();
-    
     /**
      * Return the ClassIndex for the native type this object was constructed
      * from.
diff --git a/core/src/main/java/org/jruby/runtime/marshal/MarshalDumper.java b/core/src/main/java/org/jruby/runtime/marshal/MarshalDumper.java
index 5f733d63a51..9580dbaa3a1 100644
--- a/core/src/main/java/org/jruby/runtime/marshal/MarshalDumper.java
+++ b/core/src/main/java/org/jruby/runtime/marshal/MarshalDumper.java
@@ -67,6 +67,7 @@
 
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
 
@@ -91,6 +92,8 @@ public class MarshalDumper {
     private final HashMapInt<IRubyObject> linkCache = new HashMapInt<>(4, true);
     // lazy for simple cases that encounter no symbols
     private HashMapInt<RubySymbol> symbolCache;
+    // lazy unless userdef dumps are needed
+    private IdentityHashMap<IRubyObject, Object> activeUserdefs;
 
     public MarshalDumper(int depthLimit) {
         this.depthLimit = depthLimit >= 0 ? depthLimit : Integer.MAX_VALUE;
@@ -437,6 +440,10 @@ private void userCommon(ThreadContext context, RubyOutputStream out, IRubyObject
         
         RubyString marshaled = castAsString(context, dumpResult);
 
+        if (activeUserdefs != null && activeUserdefs.containsKey(value)) {
+            throw runtimeError(context, "can't dump recursive object using _dump()");
+        }
+
         if (marshaled.hasVariables()) {
             var ivarAccessors = countVariables(marshaled);
             int size = variableCount;
@@ -448,7 +455,10 @@ private void userCommon(ThreadContext context, RubyOutputStream out, IRubyObject
 
                 writeInt(out, size);
 
+                if (activeUserdefs == null) activeUserdefs = new IdentityHashMap<>();
+                activeUserdefs.put(value, null);
                 ivarAccessors.forEach(new VariableDumper(context, out, marshaled));
+                activeUserdefs.remove(value);
             } else {
                 dumpUserdefBase(context, out, klass, marshaled);
             }
diff --git a/core/src/main/java/org/jruby/runtime/marshal/MarshalLoader.java b/core/src/main/java/org/jruby/runtime/marshal/MarshalLoader.java
index fad42289a75..9816f6e47c2 100644
--- a/core/src/main/java/org/jruby/runtime/marshal/MarshalLoader.java
+++ b/core/src/main/java/org/jruby/runtime/marshal/MarshalLoader.java
@@ -84,10 +84,11 @@
  * Unmarshals objects from strings or streams in Ruby's marshal format.
  */
 public class MarshalLoader {
-    private final List<IRubyObject> links = new ArrayList<>();
-    private final List<RubySymbol> symbols = new ArrayList<>();
-    private final Map<IRubyObject, IRubyObject> partials = new IdentityHashMap<>();
+    private List<IRubyObject> links;
+    private List<RubySymbol> symbols;
+    private final Map<IRubyObject, IRubyObject> partials;
     private final IRubyObject proc;
+    private final boolean hasProc;
     private final boolean freeze;
 
     public MarshalLoader(ThreadContext context, IRubyObject proc) {
@@ -99,6 +100,8 @@ public MarshalLoader(ThreadContext context, boolean freeze, IRubyObject proc) {
         if (proc == null) proc = context.nil;
         
         this.proc = proc;
+        this.hasProc = !(proc == null || proc.isNil());
+        this.partials = hasProc ? new IdentityHashMap<>() : null;
         this.freeze = freeze;
     }
 
@@ -153,7 +156,7 @@ public static RubyClass getClassFromPath(ThreadContext context, String path) {
     }
 
     private IRubyObject doCallProcForObj(ThreadContext context, IRubyObject result) {
-        if (proc == null || proc.isNil()) return result;
+        if (!hasProc) return result;
 
         return Helpers.invoke(context, proc, "call", result);
     }
@@ -206,17 +209,7 @@ private IRubyObject leave(ThreadContext context, IRubyObject value, boolean part
         if (!partial) {
             noLongerPartial(value);
             if (freeze) {
-                RubyClass metaClass = value.getMetaClass();
-                if (metaClass == stringClass(context)) {
-                    IRubyObject original = value;
-                    // FIXME: We need to modify original to be frozen but we also need it to be part of the deduped table.
-                    value = context.runtime.freezeAndDedupString((RubyString) value);
-                    if (value != original) {
-                        original.setFrozen(value.isFrozen());
-                    }
-                } else if (!value.isModule() && !value.isClass()) {
-                    value.setFrozen(true);
-                }
+                value = freezeObject(context, value);
             }
             value = postProc(context, value);
         }
@@ -224,6 +217,26 @@ private IRubyObject leave(ThreadContext context, IRubyObject value, boolean part
         return value;
     }
 
+    private static IRubyObject freezeObject(ThreadContext context, IRubyObject value) {
+        RubyClass metaClass = value.getMetaClass();
+        if (metaClass == stringClass(context)) {
+            value = freezeString(context, value);
+        } else if (!value.isModule() && !value.isClass()) {
+            value.setFrozen(true);
+        }
+        return value;
+    }
+
+    private static IRubyObject freezeString(ThreadContext context, IRubyObject value) {
+        IRubyObject original = value;
+        // FIXME: We need to modify original to be frozen but we also need it to be part of the deduped table.
+        value = context.runtime.freezeAndDedupString((RubyString) value);
+        if (value != original) {
+            original.setFrozen(value.isFrozen());
+        }
+        return value;
+    }
+
     private RubyModule mustBeModule(ThreadContext context, IRubyObject value, IRubyObject path) {
         if (!value.isModule()) throw argumentError(context, str(context.runtime, path, " does not refer to module"));
 
@@ -366,19 +379,19 @@ private IRubyObject objectForFloat(ThreadContext context, RubyInputStream in) {
     }
 
     private IRubyObject objectForFixnum(ThreadContext context, RubyInputStream in) {
-        return leave(context, RubyFixnum.unmarshalFrom(context, in, this), false);
+        return postProc(context, RubyFixnum.unmarshalFrom(context, in, this));
     }
 
     private IRubyObject objectForFalse(ThreadContext context) {
-        return leave(context, context.fals, false);
+        return postProc(context, context.fals);
     }
 
     private IRubyObject objectForTrue(ThreadContext context) {
-        return leave(context, context.tru, false);
+        return postProc(context, context.tru);
     }
 
     private IRubyObject objectForNil(ThreadContext context) {
-        return leave(context, context.nil, false);
+        return postProc(context, context.nil);
     }
 
     private IRubyObject objectForUClass(ThreadContext context, RubyInputStream in, boolean partial, List<RubyModule> extendedModules) {
@@ -733,19 +746,20 @@ private void appendExtendedModules(ThreadContext context, IRubyObject obj, List<
     }
 
     private boolean isPartialObject(IRubyObject value) {
-        return partials.containsKey(value);
+        return hasProc && partials.containsKey(value);
     }
 
     private void markAsPartialObject(IRubyObject value) {
-        partials.put(value, value);
+        if (hasProc) partials.put(value, value);
     }
 
     private void noLongerPartial(IRubyObject value) {
-        partials.remove(value);
+        if (hasProc) partials.remove(value);
     }
 
     private IRubyObject readSymbolLink(ThreadContext context, RubyInputStream in, MarshalLoader input) {
         try {
+            assert symbols != null : "symbols were found but symbols list was uninitialized";
             return symbols.get(input.unmarshalInt(context, in));
         } catch (IndexOutOfBoundsException e) {
             throw typeError(context,"bad symbol");
@@ -755,6 +769,7 @@ private IRubyObject readSymbolLink(ThreadContext context, RubyInputStream in, Ma
     private IRubyObject readDataLink(ThreadContext context, RubyInputStream in, MarshalLoader input) {
         int index = input.unmarshalInt(context, in);
         try {
+            assert links != null : "links were found but links list was uninitialized";
             return links.get(index);
         } catch (IndexOutOfBoundsException e) {
             throw argumentError(context, "dump format error (unlinked, index: " + index + ")");
@@ -762,10 +777,12 @@ private IRubyObject readDataLink(ThreadContext context, RubyInputStream in, Mars
     }
 
     private void registerDataLink(IRubyObject value) {
+        if (links == null) links = new ArrayList<>(4);
         links.add(value);
     }
 
     private void registerSymbolLink(RubySymbol value) {
+        if (symbols == null) symbols = new ArrayList<>(4);
         symbols.add(value);
     }
 }
diff --git a/core/src/main/java/org/jruby/runtime/marshal/UnmarshalStream.java b/core/src/main/java/org/jruby/runtime/marshal/UnmarshalStream.java
index 09ac054f56a..55517b66301 100644
--- a/core/src/main/java/org/jruby/runtime/marshal/UnmarshalStream.java
+++ b/core/src/main/java/org/jruby/runtime/marshal/UnmarshalStream.java
@@ -776,11 +776,6 @@ public IRubyObject unmarshalObject(boolean _callProc) throws IOException { // <-
         }
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public UnmarshalStream(Ruby runtime, InputStream in, IRubyObject proc, boolean taint, boolean untrust) throws IOException {
-        this(runtime, in, proc);
-    }
-
     @Deprecated(since = "9.4.0.0")
     public UnmarshalStream(Ruby runtime, InputStream in, IRubyObject proc, boolean taint) throws IOException {
         this(runtime, in, proc);
diff --git a/core/src/main/java/org/jruby/runtime/scope/ManyVarsDynamicScope.java b/core/src/main/java/org/jruby/runtime/scope/ManyVarsDynamicScope.java
index d2e4befc4d7..7e1158ae805 100644
--- a/core/src/main/java/org/jruby/runtime/scope/ManyVarsDynamicScope.java
+++ b/core/src/main/java/org/jruby/runtime/scope/ManyVarsDynamicScope.java
@@ -220,42 +220,42 @@ public void setValueThreeDepthZeroVoid(IRubyObject value) {
     public void setValueFourDepthZeroVoid(IRubyObject value) {
         IRubyObject[] variableValues = this.variableValues;
 
-        assert checkOffset(variableValues, 3) : failSet(this, value, 3);
+        assert checkOffset(variableValues, 4) : failSet(this, value, 4);
 
         variableValues[4] = value;
     }
     public void setValueFiveDepthZeroVoid(IRubyObject value) {
         IRubyObject[] variableValues = this.variableValues;
 
-        assert checkOffset(variableValues, 3) : failSet(this, value, 3);
+        assert checkOffset(variableValues, 5) : failSet(this, value, 5);
 
         variableValues[5] = value;
     }
     public void setValueSixDepthZeroVoid(IRubyObject value) {
         IRubyObject[] variableValues = this.variableValues;
 
-        assert checkOffset(variableValues, 3) : failSet(this, value, 3);
+        assert checkOffset(variableValues, 6) : failSet(this, value, 6);
 
         variableValues[6] = value;
     }
     public void setValueSevenDepthZeroVoid(IRubyObject value) {
         IRubyObject[] variableValues = this.variableValues;
 
-        assert checkOffset(variableValues, 3) : failSet(this, value, 3);
+        assert checkOffset(variableValues, 7) : failSet(this, value, 7);
 
         variableValues[7] = value;
     }
     public void setValueEightDepthZeroVoid(IRubyObject value) {
         IRubyObject[] variableValues = this.variableValues;
 
-        assert checkOffset(variableValues, 3) : failSet(this, value, 3);
+        assert checkOffset(variableValues, 8) : failSet(this, value, 8);
 
         variableValues[8] = value;
     }
     public void setValueNineDepthZeroVoid(IRubyObject value) {
         IRubyObject[] variableValues = this.variableValues;
 
-        assert checkOffset(variableValues, 3) : failSet(this, value, 3);
+        assert checkOffset(variableValues, 9) : failSet(this, value, 9);
 
         variableValues[9] = value;
     }
@@ -297,10 +297,4 @@ public void growIfNeeded() {
             variableValues = values;
         }
     }
-
-    @Deprecated(since = "9.1.6.0")
-    public DynamicScope cloneScope() {
-        // we construct new rather than clone to avoid sharing variableValues
-        return new ManyVarsDynamicScope(staticScope, parent);
-    }
 }
diff --git a/core/src/main/java/org/jruby/specialized/RubyArrayOneObject.java b/core/src/main/java/org/jruby/specialized/RubyArrayOneObject.java
index c455df2aade..17afc7aab93 100644
--- a/core/src/main/java/org/jruby/specialized/RubyArrayOneObject.java
+++ b/core/src/main/java/org/jruby/specialized/RubyArrayOneObject.java
@@ -3,6 +3,7 @@
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyArrayNative;
 import org.jruby.RubyClass;
 import org.jruby.RubyString;
 import org.jruby.javasupport.JavaUtil;
@@ -61,7 +62,7 @@ protected void finishUnpack(IRubyObject nil) {
     }
 
     @Override
-    public RubyArray<?> aryDup() {
+    public RubyArrayNative<?> aryDup() {
         if (!packed()) return super.aryDup();
         return new RubyArrayOneObject(getRuntime().getArray(), this);
     }
@@ -104,7 +105,7 @@ public void copyInto(ThreadContext context, IRubyObject[] target, int start, int
     }
 
     @Override
-    protected RubyArray<?> dupImpl(Ruby runtime, RubyClass metaClass) {
+    protected RubyArrayNative<?> dupImpl(Ruby runtime, RubyClass metaClass) {
         if (!packed()) return super.dupImpl(runtime, metaClass);
         return new RubyArrayOneObject(metaClass, this);
     }
@@ -268,7 +269,7 @@ public RubyArray<?> collectArray(ThreadContext context, Block block) {
     }
 
     @Override
-    protected RubyArray<?> makeShared() {
+    protected RubyArrayNative<?> makeShared() {
         if (!packed()) return super.makeShared();
 
         return new RubyArrayOneObject(this);
diff --git a/core/src/main/java/org/jruby/specialized/RubyArraySpecialized.java b/core/src/main/java/org/jruby/specialized/RubyArraySpecialized.java
index 15b55ed06fa..b0ce2c966b2 100644
--- a/core/src/main/java/org/jruby/specialized/RubyArraySpecialized.java
+++ b/core/src/main/java/org/jruby/specialized/RubyArraySpecialized.java
@@ -2,6 +2,7 @@
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyArrayNative;
 import org.jruby.RubyClass;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
@@ -39,7 +40,7 @@
  * RubyArray{@link #toJavaArray(ThreadContext)}
  * RubyArray{@link #uniq(org.jruby.runtime.ThreadContext)}
  */
-public abstract class RubyArraySpecialized extends RubyArray {
+public abstract class RubyArraySpecialized extends RubyArrayNative {
     public static final int MAX_PACKED_SIZE = 2;
 
     public RubyArraySpecialized(Ruby runtime, boolean light) {
diff --git a/core/src/main/java/org/jruby/specialized/RubyArrayTwoObject.java b/core/src/main/java/org/jruby/specialized/RubyArrayTwoObject.java
index c3bdcf62773..a2056ba1e11 100644
--- a/core/src/main/java/org/jruby/specialized/RubyArrayTwoObject.java
+++ b/core/src/main/java/org/jruby/specialized/RubyArrayTwoObject.java
@@ -3,6 +3,7 @@
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyArrayNative;
 import org.jruby.RubyClass;
 import org.jruby.RubyComparable;
 import org.jruby.RubyFixnum;
@@ -74,7 +75,7 @@ protected void finishUnpack(IRubyObject nil) {
     }
 
     @Override
-    public RubyArray<?> aryDup() {
+    public RubyArrayNative<?> aryDup() {
         if (!packed()) return super.aryDup();
         return new RubyArrayTwoObject(getRuntime().getArray(), this);
     }
@@ -119,7 +120,7 @@ public void copyInto(ThreadContext context, IRubyObject[] target, int start, int
     }
 
     @Override
-    protected RubyArray<?> dupImpl(Ruby runtime, RubyClass metaClass) {
+    protected RubyArrayNative<?> dupImpl(Ruby runtime, RubyClass metaClass) {
         if (!packed()) return super.dupImpl(runtime, metaClass);
         return new RubyArrayTwoObject(metaClass, this);
     }
@@ -314,7 +315,7 @@ public IRubyObject subseq(RubyClass metaClass, long beg, long len, boolean light
 
         if (beg > 2 || beg < 0 || len < 0) return runtime.getNil();
 
-        if (len == 0 || beg == 2) return new RubyArray<>(runtime, metaClass, IRubyObject.NULL_ARRAY);
+        if (len == 0 || beg == 2) return RubyArray.newEmptyArray(runtime, metaClass);
 
         if (beg == 0) {
             if (len == 1) return new RubyArrayOneObject(metaClass, car);
@@ -380,7 +381,7 @@ public RubyArray<?> collectArray(ThreadContext context, Block block) {
     }
 
     @Override
-    protected RubyArray<?> makeShared() {
+    protected RubyArrayNative<?> makeShared() {
         if (!packed()) return super.makeShared();
 
         return new RubyArrayTwoObject(this);
diff --git a/core/src/main/java/org/jruby/util/ByteList.java b/core/src/main/java/org/jruby/util/ByteList.java
index 9408ca112df..f7872a0df9a 100644
--- a/core/src/main/java/org/jruby/util/ByteList.java
+++ b/core/src/main/java/org/jruby/util/ByteList.java
@@ -61,20 +61,15 @@ public class ByteList implements Comparable, CharSequence, Serializable {
 
     private static final Charset ISO_LATIN_1 = StandardCharsets.ISO_8859_1;
 
-    // NOTE: AR-JDBC (still) uses these fields directly in its ext .java parts  ,
-    // until there's new releases we shall keep them public and maybe review other exts using BL's API
-    @Deprecated(since = "9.2.1.0")
-    public byte[] bytes;
-    @Deprecated(since = "9.2.1.0")
-    public int begin;
-    @Deprecated(since = "9.2.1.0")
-    public int realSize;
+    private byte[] bytes;
+    private int begin;
+    private int realSize;
 
     private Encoding encoding = ASCIIEncoding.INSTANCE;
 
-    transient int hash;
+    private transient int hash;
 
-    transient String stringValue;
+    private transient String stringValue;
 
     private static final int DEFAULT_SIZE = 4;
 
@@ -220,7 +215,8 @@ public ByteList(byte[] wrap, int index, int len, boolean copy) {
     public ByteList(byte[] wrap, int index, int len, Encoding encoding, boolean copy) {
         assert wrap != null : "'wrap' must not be null";
         assert index >= 0 && index <= wrap.length : "'index' is not without bounds of 'wrap' array";
-        assert wrap.length >= index + len : "'index' + 'len' is longer than the 'wrap' array";
+        assert len >= 0 : "'len' must be non-negative";
+        assert wrap.length - index >= len : "'len' extends beyond the 'wrap' array";
 
         if (copy) {
             bytes = new byte[len];
@@ -255,8 +251,9 @@ public ByteList(ByteList wrap, int index, int len) {
      * @param len number of bytes to delete
      */
     public void delete(int start, int len) {
-        assert start >= begin && start < realSize : "'start' is at invalid index";
-        assert len >= 0 : "'len' must be positive";
+        assert start >= begin : "'start' is at invalid index (< begin)";
+        assert start < begin + realSize : "'start' is at invalid index (>= end)";
+        assert len >= 0 : "'len' must be non-negative";
         assert start + len <= begin + realSize : "too many bytes requested";
 
         realSize -= len;
@@ -627,7 +624,8 @@ public int lengthEnc() {
      * @return the byte retreived
      */
     public int get(int index) {
-        assert index >= 0 : "index must be positive";
+        assert index >= 0 : "index must be non-negative";
+        assert begin + index < begin + realSize : "index is too large";
 
         return bytes[begin + index] & 0xFF;
     }
@@ -649,7 +647,7 @@ public int getEnc(int index) {
      * @param b is the new value.
      */
     public void set(int index, int b) {
-        assert index >= 0 : "index must be positive";
+        assert index >= 0 : "index must be non-negative";
         assert begin + index < begin + realSize : "index is too large";
 
         bytes[begin + index] = (byte)b;
@@ -1226,7 +1224,8 @@ public static byte[] plain(char[] s) {
      */
     public static char[] plain(byte[] b, int start, int length) {
         assert b != null : "byte array cannot be null";
-        assert start >= 0 && start + length <= b.length : "Invalid start or start+length too long";
+        assert length >= 0 : "length must be non-negative";
+        assert start >= 0 && start + length <= b.length : "invalid start index";
 
         char[] chars = new char[length];
         for (int i = 0; i < length; i++) {
@@ -1243,12 +1242,7 @@ public static char[] plain(byte[] b, int start, int length) {
      */
     public static char[] plain(byte[] b) {
         assert b != null : "byte array cannot be null";
-
-        char[] chars = new char[b.length];
-        for (int i = 0; i < b.length; i++) {
-            chars[i] = (char) (b[i] & 0xFF);
-        }
-        return chars;
+        return plain(b, 0, b.length);
     }
 
     // Work around bad charset handling in JDK. See
@@ -1433,7 +1427,6 @@ public Encoding getEncoding() {
      * @param encoding the encoding to set
      */
     public void setEncoding(Encoding encoding) {
-        assert encoding != null;
         this.encoding = safeEncoding(encoding);
         invalidate();
     }
diff --git a/core/src/main/java/org/jruby/util/CodegenUtils.java b/core/src/main/java/org/jruby/util/CodegenUtils.java
index 43eb96dd444..1a97ab982da 100644
--- a/core/src/main/java/org/jruby/util/CodegenUtils.java
+++ b/core/src/main/java/org/jruby/util/CodegenUtils.java
@@ -123,16 +123,6 @@ public static String sig(MethodType type) {
         return sig(type.returnType(), type.parameterArray());
     }
 
-    @Deprecated(since = "9.0.0.0") // not used
-    public static String sigParams(Class... params) {
-        return sigParams(new StringBuilder(), null, params).toString();
-    }
-
-    @Deprecated(since = "9.0.0.0") // not used
-    public static String sigParams(String descriptor, Class... params) {
-        return sigParams(new StringBuilder(), descriptor, params).toString();
-    }
-
     private static StringBuilder sigParams(final StringBuilder str,
         final String descriptor, final Class... params) {
         str.append('(');
diff --git a/core/src/main/java/org/jruby/util/ConvertBytes.java b/core/src/main/java/org/jruby/util/ConvertBytes.java
index 0bac02478a1..7e84088377d 100644
--- a/core/src/main/java/org/jruby/util/ConvertBytes.java
+++ b/core/src/main/java/org/jruby/util/ConvertBytes.java
@@ -38,11 +38,6 @@ public ConvertBytes(Ruby runtime, ByteList str, int base, boolean badcheck) {
         this.base = base;
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public ConvertBytes(Ruby runtime, ByteList str, int base, boolean badcheck, boolean is19) {
-        this(runtime, str, base, badcheck);
-    }
-
     public static final byte[] intToBinaryBytes(int i) {
         return intToUnsignedByteList(i, 1, LOWER_DIGITS).bytes();
     }
diff --git a/core/src/main/java/org/jruby/util/ConvertDouble.java b/core/src/main/java/org/jruby/util/ConvertDouble.java
index b52acb40e7c..2d1b3b61e04 100644
--- a/core/src/main/java/org/jruby/util/ConvertDouble.java
+++ b/core/src/main/java/org/jruby/util/ConvertDouble.java
@@ -28,15 +28,77 @@
 
 package org.jruby.util;
 
+import ch.randelshofer.fastdoubleparser.ConfigurableDoubleParser;
+import ch.randelshofer.fastdoubleparser.NumberFormatSymbols;
+
+import java.util.Collections;
+import java.util.Set;
+
 public class ConvertDouble {
+
+    /**
+     * Performance optimisation:
+     * By reusing an instance of the parser, we can save the costly initialisation time.
+     */
+    private static final ConfigurableDoubleParser FAST_PARSER = new ConfigurableDoubleParser(
+            NumberFormatSymbols.fromDefault()
+                    .withGroupingSeparator(Set.<Character>of('_'))
+                    .withInfinity(Collections.EMPTY_SET)
+                    .withNaN(Collections.EMPTY_SET));
+
+
     /**
      * Converts supplied ByteList into a double.  strict-mode will not like
      * extra text non-numeric text or multiple sequention underscores.
      */
     public static double byteListToDouble(ByteList bytes, boolean strict) {
+        byte[] b = bytes.getUnsafeBytes();
+        int begin = bytes.begin();
+        int length = bytes.length();
+
+        if (!rejectedByRuby(b, begin, length)) {
+            try {
+                // Fast path:
+                // Optimistically parse the entire input using the fast parser.
+                return FAST_PARSER.parseDouble(b, begin, length);
+            } catch (NumberFormatException e) {
+            }
+        }
+        // Slow path:
+        // Determine how many bytes we can safely consume, and then
+        // call the fast parser again.
         return new DoubleConverter().parse(bytes, strict, true);
     }
 
+    /**
+     * Efficiently reject strings with leading [_], trailing [_-+], or any of /__|-_|+_|_e|e_|_E|E_/.
+     * @param b incoming bytes
+     * @param begin starting offset
+     * @param length effective length
+     * @return true if the string is rejected by Ruby, false otherwise.
+     */
+    private static boolean rejectedByRuby(byte[] b, int begin, int length) {
+        if (length == 0) return true;
+
+        // reject invalid prefix or suffix
+        byte first = b[begin];
+        int end = length - 1;
+        int last = b[end];
+        if (first == '_' || last == '_' || last == '+' || last == '-') return true;
+
+        // scan remaining chars to reject invalid underscores
+        for (int i = 1, cur = first; i <= end; i++) {
+            byte next = b[begin + i];
+
+            if (cur == '_' && (next == 'e' || next == 'E' || next == '_' || next == '.')) return true;
+            if (next == '_' && (cur == 'e' || cur == 'E' || cur == '-' || cur == '+')) return true;
+
+            cur = next;
+        }
+
+        return false;
+    }
+
     public static class DoubleConverter {
         private byte[] bytes;
         private int index;
@@ -154,7 +216,7 @@ private double completeCalculation() {
                 addExponentToResult(adjustExponent);
             }
 
-            return Double.valueOf(new String(chars, 0, charsIndex));
+            return FAST_PARSER.parseDouble(new String(chars, 0, charsIndex));
         }
 
         static class LightweightNumberFormatException extends NumberFormatException {
diff --git a/core/src/main/java/org/jruby/util/Dir.java b/core/src/main/java/org/jruby/util/Dir.java
index 342b2a7da0d..02357f5149c 100644
--- a/core/src/main/java/org/jruby/util/Dir.java
+++ b/core/src/main/java/org/jruby/util/Dir.java
@@ -945,12 +945,4 @@ private static ByteList createPath(byte[] base, byte[] segment, Encoding encodin
     private static byte[] getBytesInUTF8(final String str) {
         return RubyEncoding.encodeUTF8(str);
     }
-
-    /**
-     * @deprecated No replacement; not intended to be made public
-     */
-    @Deprecated(since = "9.3.0.0")
-    public static int range(byte[] _pat, int pat, int pend, char test, int flags) {
-        return new FilenameMatch(pat, 0, flags).helper(_pat, pend, new byte[] {(byte) test}, 1, ASCIIEncoding.INSTANCE);
-    }
 }
diff --git a/core/src/main/java/org/jruby/util/FileResource.java b/core/src/main/java/org/jruby/util/FileResource.java
index c117f751510..3035885d3e0 100644
--- a/core/src/main/java/org/jruby/util/FileResource.java
+++ b/core/src/main/java/org/jruby/util/FileResource.java
@@ -58,20 +58,6 @@ static FileResource wrap(POSIX posix, JRubyFile file) {
      */
     <T> T unwrap(Class<T> type) throws UnsupportedOperationException ;
 
-
-    // For transition to file resources only. Implementations should return
-    // JRubyFile if this resource is backed by one, and NOT_FOUND JRubyFile
-    // otherwise.
-    @Deprecated(since = "9.2.1.0")
-    default JRubyFile hackyGetJRubyFile() {
-        try {
-            return unwrap(JRubyFile.class);
-        }
-        catch (UnsupportedOperationException ex) {
-            return JRubyFile.DUMMY;
-        }
-    }
-
     /**
      * @deprecated
      *
diff --git a/core/src/main/java/org/jruby/util/IdUtil.java b/core/src/main/java/org/jruby/util/IdUtil.java
index ba16e52beb0..ef2bd0033b1 100644
--- a/core/src/main/java/org/jruby/util/IdUtil.java
+++ b/core/src/main/java/org/jruby/util/IdUtil.java
@@ -71,14 +71,6 @@ public static boolean isPredicate(String id) {
         return id.endsWith("?");
     }
     
-    /**
-     * rb_is_local_id and is_local_id
-     */
-    @Deprecated(since = "9.3.0.0")
-    public static boolean isLocal(String id) {
-        return !isGlobal(id) && !isClassVariable(id) && !isInstanceVariable(id) && !isConstant(id) && !isPredicate(id) && !isSpecial(id);
-    }
-
     /**
      * We store IR special variables (e.g. %block) in scope and we want reflective Ruby methods to
      * not see these since they are not real variables...they're special.
diff --git a/core/src/main/java/org/jruby/util/JRubyClassLoader.java b/core/src/main/java/org/jruby/util/JRubyClassLoader.java
index ce67dd5499f..a402f99a104 100644
--- a/core/src/main/java/org/jruby/util/JRubyClassLoader.java
+++ b/core/src/main/java/org/jruby/util/JRubyClassLoader.java
@@ -229,6 +229,7 @@ protected void terminateJarIndexCacheEntries() {
         });
     }
 
+    // Deprecated in 1.7.22 but still no replacement available
     @Deprecated(since = "1.7.22")
     public synchronized Runnable getJDBCDriverUnloader() {
         if (unloader == null) {
diff --git a/core/src/main/java/org/jruby/util/JRubyNonExistentFile.java b/core/src/main/java/org/jruby/util/JRubyNonExistentFile.java
deleted file mode 100644
index cb7d27711dc..00000000000
--- a/core/src/main/java/org/jruby/util/JRubyNonExistentFile.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: EPL 2.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Eclipse Public
- * License Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/epl-v20.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2007 Nick Sieger <nicksieger@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the EPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the EPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.jruby.util;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
-@Deprecated(since = "1.7.13") // Replaced now with EmptyFileResource
-public class JRubyNonExistentFile extends JRubyFile {
-    static final JRubyNonExistentFile NOT_EXIST = new JRubyNonExistentFile();
-    private JRubyNonExistentFile() {
-        super("");
-    }
-
-    @Override
-    public String getAbsolutePath() {
-        return "";
-    }
-    
-    @Override
-    public boolean isDirectory() {
-        return false;
-    }
-    
-    @Override
-    public boolean exists() {
-        return false;
-    }
-
-    @Override
-    public String getCanonicalPath() throws IOException {
-        throw new FileNotFoundException("File does not exist");
-    }
-
-    @Override
-    public String getPath() {
-        return "";
-    }
-
-    @Override
-    public String toString() {
-        return "";
-    }
-
-    @Override
-    public File getAbsoluteFile() {
-        return this;
-    }
-
-    @Override
-    public File getCanonicalFile() throws IOException {
-        throw new FileNotFoundException("File does not exist");
-    }
-
-    @Override
-    public String getParent() {
-        return "";
-    }
-
-    @Override
-    public File getParentFile() {
-        return this;
-    }
-
-    public static File[] listRoots() {
-        return new File[0];
-    }
-
-    public static File createTempFile(String prefix, String suffix, File directory) throws IOException {
-        return createTempFile(prefix, suffix);
-    }
-
-    public static File createTempFile(String prefix, String suffix) throws IOException {
-        throw new FileNotFoundException("File does not exist");
-    }
-
-    @Override
-    public String[] list(FilenameFilter filter) {
-        return new String[0];
-    }
-
-    @Override
-    public File[] listFiles() {
-        return new File[0];
-    }
-
-    @Override
-    public File[] listFiles(final FileFilter filter) {
-        return new File[0];
-    }
-
-    @Override
-    public File[] listFiles(final FilenameFilter filter) {
-        return new File[0];
-    }
-}
diff --git a/core/src/main/java/org/jruby/util/JavaNameMangler.java b/core/src/main/java/org/jruby/util/JavaNameMangler.java
index 91c6983042d..26f91e2b66c 100644
--- a/core/src/main/java/org/jruby/util/JavaNameMangler.java
+++ b/core/src/main/java/org/jruby/util/JavaNameMangler.java
@@ -359,16 +359,4 @@ public static FrameType decodeFrameTypeFromMangledName(String type) {
         throw new IllegalStateException("unknown encoded method type '" + type);
 
     }
-
-    @Deprecated(since = "9.2.7.0")
-    public static boolean willMethodMangleOk(CharSequence name) {
-        if (false && Platform.IS_IBM) {
-            // IBM's JVM is much less forgiving, so we disallow anything with non-alphanumeric, _, and $
-            for ( int i = 0; i < name.length(); i++ ) {
-                if (!Character.isJavaIdentifierPart(name.charAt(i))) return false;
-            }
-        }
-        // other JVMs will accept our mangling algorithm
-        return true;
-    }
 }
diff --git a/core/src/main/java/org/jruby/util/MRIRecursionGuard.java b/core/src/main/java/org/jruby/util/MRIRecursionGuard.java
deleted file mode 100644
index 988ace6392a..00000000000
--- a/core/src/main/java/org/jruby/util/MRIRecursionGuard.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.jruby.util;
-
-import org.jruby.Ruby;
-import org.jruby.RubyHash;
-import org.jruby.RubySymbol;
-import org.jruby.exceptions.Unrescuable;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.Helpers;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import static org.jruby.api.Create.newHash;
-import static org.jruby.api.Error.typeError;
-
-/**
- * Deprecated MRI-style recursion guard logic pulled out of {@link Ruby}.
- */
-public class MRIRecursionGuard {
-    private final Ruby runtime;
-    private final RubySymbol recursiveKey;
-    private final ThreadLocal<Map<String, RubyHash>> recursive = new ThreadLocal<Map<String, RubyHash>>();
-    private final ThreadLocal<Boolean> inRecursiveListOperation = new ThreadLocal<>();
-
-    @Deprecated(since = "9.1.7.0")
-    public MRIRecursionGuard(Ruby runtime) {
-        this.runtime = runtime;
-        this.recursiveKey = runtime.newSymbol("__recursive_key__");
-    }
-
-    @Deprecated(since = "9.1.7.0")
-    public interface RecursiveFunction  {
-        IRubyObject call(IRubyObject obj, boolean recur);
-    }
-
-    @Deprecated(since = "9.1.7.0")
-    public IRubyObject execRecursive(RecursiveFunction func, IRubyObject obj) {
-        if (!inRecursiveListOperation.get()) {
-            throw runtime.newThreadError("BUG: execRecursive called outside recursiveListOperation");
-        }
-        return execRecursiveInternal(func, obj, null, false);
-    }
-
-    @Deprecated(since = "9.1.7.0")
-    public IRubyObject execRecursiveOuter(RecursiveFunction func, IRubyObject obj) {
-        try {
-            return execRecursiveInternal(func, obj, null, true);
-        } finally {
-            recursiveListClear();
-        }
-    }
-
-    @Deprecated(since = "9.1.7.0")
-    public <T extends IRubyObject> T recursiveListOperation(Callable<T> body) {
-        try {
-            inRecursiveListOperation.set(true);
-            return body.call();
-        } catch (Exception e) {
-            Helpers.throwException(e);
-            return null; // not reached
-        } finally {
-            recursiveListClear();
-            inRecursiveListOperation.set(false);
-        }
-    }
-
-    // exec_recursive
-    @Deprecated(since = "9.1.7.0")
-    private IRubyObject execRecursiveInternal(RecursiveFunction func, IRubyObject obj, IRubyObject pairid, boolean outer) {
-        var context = runtime.getCurrentContext();
-        ExecRecursiveParams p = new ExecRecursiveParams();
-        p.list = recursiveListAccess(context);
-        p.objid = obj.__id__(context);
-        boolean outermost = outer && !recursiveCheck(p.list, recursiveKey, null);
-        if(recursiveCheck(p.list, p.objid, pairid)) {
-            if(outer && !outermost) {
-                throw new RecursiveError(p.list);
-            }
-            return func.call(obj, true);
-        } else {
-            IRubyObject result;
-            p.func = func;
-            p.obj = obj;
-            p.pairid = pairid;
-
-            if(outermost) {
-                recursivePush(context, p.list, recursiveKey, null);
-                try {
-                    result = execRecursiveI(context, p);
-                } catch(RecursiveError e) {
-                    if(e.tag != p.list) {
-                        throw e;
-                    } else {
-                        result = p.list;
-                    }
-                }
-                recursivePop(context, p.list, recursiveKey, null);
-                if(result == p.list) {
-                    result = func.call(obj, true);
-                }
-            } else {
-                result = execRecursiveI(context, p);
-            }
-
-            return result;
-        }
-    }
-
-    // exec_recursive_i
-    private IRubyObject execRecursiveI(ThreadContext context, ExecRecursiveParams p) {
-        IRubyObject result = null;
-        recursivePush(context, p.list, p.objid, p.pairid);
-        try {
-            result = p.func.call(p.obj, false);
-        } finally {
-            recursivePop(context, p.list, p.objid, p.pairid);
-        }
-        return result;
-    }
-
-    private IRubyObject recursiveListAccess(ThreadContext context) {
-        Map<String, RubyHash> hash = recursive.get();
-        String sym = context.getFrameName();
-        IRubyObject list = context.nil;
-        if(hash == null) {
-            hash = new HashMap<>();
-            recursive.set(hash);
-        } else {
-            list = hash.get(sym);
-        }
-        if(list == null || list.isNil()) {
-            list = newHash(context);
-            hash.put(sym, (RubyHash)list);
-        }
-        return list;
-    }
-
-    private void recursiveListClear() {
-        Map<String, RubyHash> hash = recursive.get();
-        if(hash != null) {
-            hash.clear();
-        }
-    }
-
-    private void recursivePush(ThreadContext context, IRubyObject list, IRubyObject obj, IRubyObject paired_obj) {
-        IRubyObject pair_list;
-        if (paired_obj == null) {
-            ((RubyHash) list).op_aset(context, obj, context.tru);
-        } else if ((pair_list = ((RubyHash)list).fastARef(obj)) == null) {
-            ((RubyHash) list).op_aset(context, obj, paired_obj);
-        } else {
-            if (!(pair_list instanceof RubyHash)) {
-                IRubyObject other_paired_obj = pair_list;
-                pair_list = newHash(context);
-                ((RubyHash) pair_list).op_aset(context, other_paired_obj, context.tru);
-                ((RubyHash) list).op_aset(context, obj, pair_list);
-            }
-            ((RubyHash)pair_list).op_aset(context, paired_obj, context.tru);
-        }
-    }
-
-    private void recursivePop(ThreadContext context, IRubyObject list, IRubyObject obj, IRubyObject paired_obj) {
-        if (paired_obj != null) {
-            IRubyObject pair_list = ((RubyHash)list).fastARef(obj);
-            if (pair_list == null) throw typeError(context, "invalid inspect_tbl pair_list for " + context.getFrameName());
-
-            if (pair_list instanceof RubyHash pairHash) {
-                pairHash.delete(context, paired_obj, Block.NULL_BLOCK);
-                if (!pairHash.isEmpty()) return;
-            }
-        }
-        ((RubyHash)list).delete(context, obj, Block.NULL_BLOCK);
-    }
-
-    private boolean recursiveCheck(IRubyObject list, IRubyObject obj_id, IRubyObject paired_obj_id) {
-        IRubyObject pair_list = ((RubyHash)list).fastARef(obj_id);
-        if (pair_list == null) return false;
-
-        if (paired_obj_id != null) {
-            if (!(pair_list instanceof RubyHash)) {
-                if (pair_list != paired_obj_id) return false;
-            } else {
-                IRubyObject paired_result = ((RubyHash)pair_list).fastARef(paired_obj_id);
-                if (paired_result == null || paired_result.isNil()) return false;
-            }
-        }
-        return true;
-    }
-
-    private static class RecursiveError extends Error implements Unrescuable {
-        public RecursiveError(Object tag) {
-            this.tag = tag;
-        }
-        public final Object tag;
-
-        @Override
-        public synchronized Throwable fillInStackTrace() {
-            return this;
-        }
-    }
-
-    private static class ExecRecursiveParams {
-        public ExecRecursiveParams() {}
-        public RecursiveFunction func;
-        public IRubyObject list;
-        public IRubyObject obj;
-        public IRubyObject objid;
-        public IRubyObject pairid;
-    }
-}
diff --git a/core/src/main/java/org/jruby/util/Numeric.java b/core/src/main/java/org/jruby/util/Numeric.java
index 04cf7bebfb7..a11f506f10e 100644
--- a/core/src/main/java/org/jruby/util/Numeric.java
+++ b/core/src/main/java/org/jruby/util/Numeric.java
@@ -57,21 +57,24 @@ public class Numeric {
      *
      */
     public static IRubyObject f_add(ThreadContext context, IRubyObject x, IRubyObject y) {
-        if (Builtins.checkIntegerPlus(context)) {
-            if (x instanceof RubyInteger rint) {
+        switch (x) {
+            case RubyInteger rint when Builtins.checkIntegerPlus(context) -> {
                 if (fixnumZero(context, x)) return y;
                 if (fixnumZero(context, y)) return x;
                 return rint.op_plus(context, y);
-            } else if (x instanceof RubyFloat flote) {
+            }
+            case RubyFloat flote when Builtins.checkFloatPlus(context) -> {
                 if (fixnumZero(context, y)) return x;
                 return flote.op_plus(context, y);
-            } else if (x instanceof RubyRational rat) {
+            }
+            case RubyRational rat when Builtins.checkRationalPlus(context) -> {
                 if (fixnumZero(context, y)) return x;
                 return rat.op_plus(context, y);
             }
+            default -> {
+                return sites(context).op_plus.call(context, x, x, y);
+            }
         }
-
-        return sites(context).op_plus.call(context, x, x, y);
     }
 
     private static boolean fixnumZero(ThreadContext context, IRubyObject y) {
@@ -161,25 +164,24 @@ public static IRubyObject f_mod(ThreadContext context, IRubyObject x, IRubyObjec
      *
      */
     public static IRubyObject f_mul(ThreadContext context, IRubyObject x, IRubyObject y) {
-        if (Builtins.checkIntegerMult(context)) {
-            if (x instanceof RubyInteger) {
-                if (fixnumZero(context, y)) return y;
-                if (fixnumZero(context, x) && y instanceof RubyInteger) return x;
-                if (fixnumOne(context, x)) return y;
-                if (fixnumOne(context, y)) return x;
-                return ((RubyInteger) x).op_mul(context, y);
-            } else if (x instanceof RubyFloat) {
-                if (fixnumOne(context, y)) return x;
-                return ((RubyFloat) x).op_mul(context, y);
-            } else if (x instanceof RubyRational) {
-                if (fixnumOne(context, y)) return x;
-                return ((RubyRational) x).op_mul(context, y);
-            } else {
-                if (fixnumOne(context, y)) return x;
+        return switch (x) {
+            case RubyInteger rint when Builtins.checkIntegerMult(context) -> {
+                if (fixnumZero(context, y)) yield y;
+                if (fixnumZero(context, x) && y instanceof RubyInteger) yield x;
+                if (fixnumOne(context, x)) yield y;
+                if (fixnumOne(context, y)) yield x;
+                yield rint.op_mul(context, y);
             }
-        }
-
-        return sites(context).op_times.call(context, x, x, y);
+            case RubyFloat rfloat when Builtins.checkFloatMult(context) -> {
+                if (fixnumOne(context, y)) yield x;
+                yield rfloat.op_mul(context, y);
+            }
+            case RubyRational rrat when Builtins.checkRationalMult(context) -> {
+                if (fixnumOne(context, y)) yield x;
+                yield rrat.op_mul(context, y);
+            }
+            default -> sites(context).op_times.call(context, x, x, y);
+        };
     }
 
     public static RubyInteger f_mul(ThreadContext context, RubyInteger x, RubyInteger y) {
@@ -202,11 +204,21 @@ public static IRubyObject safe_mul(ThreadContext context, IRubyObject a, IRubyOb
      *
      */
     public static IRubyObject f_sub(ThreadContext context, IRubyObject x, IRubyObject y) {
-        if (Builtins.checkIntegerMinus(context) && fixnumZero(context, y)) {
-            return x;
-        }
-
-        return sites(context).op_minus.call(context, x, x, y);
+        return switch (x) {
+            case RubyInteger rint when Builtins.checkIntegerMinus(context) -> {
+                if (fixnumZero(context, y)) yield x;
+                yield rint.op_minus(context, y);
+            }
+            case RubyFloat rfloat when Builtins.checkFloatMinus(context) -> {
+                if (fixnumZero(context, y)) yield x;
+                yield rfloat.op_minus(context, y);
+            }
+            case RubyRational rrat when Builtins.checkRationalMinus(context) -> {
+                if (fixnumZero(context, y)) yield x;
+                yield rrat.op_minus(context, y);
+            }
+            default -> sites(context).op_minus.call(context, x, x, y);
+        };
     }
 
     public static RubyInteger f_sub(ThreadContext context, RubyInteger x, RubyInteger y) {
@@ -933,6 +945,15 @@ public static boolean f_eqeq_p(ThreadContext context, IRubyObject x, IRubyObject
         return x.op_eqq(context, y).isTrue();
     }
 
+    // MRI: is_pos_inf
+    public static boolean isPositiveInfinity(IRubyObject x) {
+        double f;
+        if (!(x instanceof RubyFloat flote))
+            return false;
+        f = flote.getValue();
+        return Double.isInfinite(f) && 0 < f;
+    }
+
     @Deprecated(since = "10.0.0.0")
     public static void checkInteger(ThreadContext context, IRubyObject obj) {
         if (!(obj instanceof RubyInteger)) throw typeError(context, "not an integer");
diff --git a/core/src/main/java/org/jruby/util/ResourceException.java b/core/src/main/java/org/jruby/util/ResourceException.java
index 006718f05a9..b8cc1d55ef9 100644
--- a/core/src/main/java/org/jruby/util/ResourceException.java
+++ b/core/src/main/java/org/jruby/util/ResourceException.java
@@ -87,7 +87,8 @@ public static class TooManySymlinks extends ErrnoException {
         public TooManySymlinks(String path) { super("ELOOP", path); }
     }
 
-    @Deprecated(since = "9.2.1.0")
+    // Deprecated in 9.2.1.0 but still used by methods not deprecated until 9.4-
+    @Deprecated(since = "9.4-")
     public static class IOError extends ResourceException {
         private final IOException ioe;
 
diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
index cc96e2f11af..4e9fa25e7e8 100644
--- a/core/src/main/java/org/jruby/util/ShellLauncher.java
+++ b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -842,26 +842,6 @@ public static POpenProcess popen(Ruby runtime, IRubyObject string, Map env, Mode
         return new POpenProcess(popenShared(runtime, new IRubyObject[] {string}, env, true), runtime, modes);
     }
 
-    @Deprecated(since = "1.7.4")
-    public static POpenProcess popen(Ruby runtime, IRubyObject string, IOOptions modes) throws IOException {
-        return new POpenProcess(popenShared(runtime, new IRubyObject[] {string}, null, true), runtime, modes);
-    }
-
-    @Deprecated(since = "1.7.4")
-    public static POpenProcess popen(Ruby runtime, IRubyObject[] strings, Map env, IOOptions modes) throws IOException {
-        return new POpenProcess(popenShared(runtime, strings, env), runtime, modes);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static POpenProcess popen3(Ruby runtime, IRubyObject[] strings) throws IOException {
-        return new POpenProcess(popenShared(runtime, strings));
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static POpenProcess popen3(Ruby runtime, IRubyObject[] strings, boolean addShell) throws IOException {
-        return new POpenProcess(popenShared(runtime, strings, null, addShell));
-    }
-
     private static Process popenShared(Ruby runtime, IRubyObject[] strings) throws IOException {
         return popenShared(runtime, strings, null);
     }
@@ -924,11 +904,6 @@ public static class POpenProcess extends Process {
         private Pumper inputPumper;
         private Pumper inerrPumper;
 
-        @Deprecated(since = "1.7.4")
-        public POpenProcess(Process child, Ruby runtime, IOOptions modes) {
-            this(child, runtime, modes.getModeFlags());
-        }
-
         public POpenProcess(Process child, Ruby runtime, ModeFlags modes) {
             this.child = child;
 
@@ -1127,57 +1102,9 @@ public LaunchConfig(Ruby runtime, IRubyObject[] rawArgs, boolean doExecutableSea
          * Only run an in-process script if the script name has "ruby", ".rb",
          * or "irb" in the name.
          */
+        @Deprecated(since = "10.1.0.0")
         public boolean shouldRunInProcess() {
-            if (!runtime.getInstanceConfig().isRunRubyInProcess()
-                    || RubyInstanceConfig.hasLoadedNativeExtensions()) {
-                return false;
-            }
-
-            // Check for special shell characters [<>|] at the beginning
-            // and end of each command word and don't run in process if we find them.
-            for (int i = 0; i < args.length; i++) {
-                String c = args[i];
-                if (c.trim().length() == 0) continue;
-
-                char[] firstLast = new char[] {c.charAt(0), c.charAt(c.length()-1)};
-                for (int j = 0; j < firstLast.length; j++) {
-                    switch (firstLast[j]) {
-                    case '<': case '>': case '|': case ';': case '(': case ')':
-                    case '~': case '&': case '$': case '"': case '`': case '\n':
-                    case '\\': case '\'':
-                        return false;
-                    case '2':
-                        if(c.length() > 1 && c.charAt(1) == '>') return false;
-                    }
-                }
-            }
-
-            String command = args[0];
-
-            if (Platform.IS_WINDOWS) command = command.toLowerCase();
-
-            // handle both slash types, \ and /.
-            String[] slashDelimitedTokens = command.split("[/\\\\]");
-            String finalToken = slashDelimitedTokens[slashDelimitedTokens.length - 1];
-            boolean inProc = (finalToken.endsWith("ruby")
-                    || (Platform.IS_WINDOWS && finalToken.endsWith("ruby.exe"))
-                    || finalToken.endsWith(".rb")
-                    || finalToken.endsWith("irb"));
-
-            if (!inProc) return false;
-
-            // snip off ruby or jruby command from list of arguments
-            // leave alone if the command is the name of a script
-            int startIndex = command.endsWith(".rb") ? 0 : 1;
-            if (command.trim().endsWith("irb")) {
-                startIndex = 0;
-                args[0] = runtime.getJRubyHome() + File.separator + "bin" + File.separator + "jirb";
-            }
-
-            execArgs = new String[args.length - startIndex];
-            System.arraycopy(args, startIndex, execArgs, 0, execArgs.length);
-
-            return true;
+            return false;
         }
 
         /**
@@ -1734,24 +1661,4 @@ static void log(Ruby runtime, String msg) {
             runtime.getErr().println("ShellLauncher: " + msg);
         }
     }
-
-    @Deprecated(since = "9.1.3.0")
-    public static OutputStream unwrapBufferedStream(OutputStream filteredStream) {
-        return ChannelHelper.unwrapBufferedStream(filteredStream);
-    }
-
-    @Deprecated(since = "9.1.3.0")
-    public static InputStream unwrapBufferedStream(InputStream filteredStream) {
-        return ChannelHelper.unwrapBufferedStream(filteredStream);
-    }
-
-    @Deprecated(since = "9.1.3.0")
-    public static OutputStream unwrapFilterOutputStream(OutputStream filteredStream) {
-        return ChannelHelper.unwrapFilterOutputStream(filteredStream);
-    }
-
-    @Deprecated(since = "9.1.3.0")
-    public static InputStream unwrapFilterInputStream(InputStream filteredStream) {
-        return ChannelHelper.unwrapFilterInputStream(filteredStream);
-    }
 }
diff --git a/core/src/main/java/org/jruby/util/Sprintf.java b/core/src/main/java/org/jruby/util/Sprintf.java
index d791be137b3..15994e1d6ee 100644
--- a/core/src/main/java/org/jruby/util/Sprintf.java
+++ b/core/src/main/java/org/jruby/util/Sprintf.java
@@ -246,44 +246,6 @@ private void checkNameArg(ByteList name, char startDelim, char endDelim) {
             positionIndex = -2;
         }
 
-        @Deprecated(since = "9.1.8.0")
-        IRubyObject next(ByteList name) {
-            // for 1.9 hash args
-            if (name != null) {
-                if (rubyHash == null && positionIndex == -1) raiseArgumentError("positional args mixed with named args");
-
-                RubySymbol nameSym = runtime.newSymbol(name);
-                IRubyObject object = rubyHash.fastARef(nameSym);
-
-                // if not found, try dispatching to pick up default hash value
-                // MRI: spliced together bits from rb_hash_default_value
-                if (object == null) {
-                    object = rubyHash.getIfNone();
-                    if (object == RubyBasicObject.UNDEF) {
-                        RubyString nameStr = RubyString.newString(runtime, name);
-                        raiseKeyError("key<" + name + "> not found", rubyHash, nameSym);
-                    } else if (rubyHash.hasDefaultProc()) {
-                        object = object.callMethod(runtime.getCurrentContext(), "call", nameSym);
-                    }
-
-                    if (object.isNil()) {
-                        throw runtime.newKeyError("key " + nameSym + " not found", rubyHash, nameSym);
-                    }
-                }
-
-                return object;
-            } else if (rubyHash != null) {
-                raiseArgumentError("positional args mixed with named args");
-            }
-
-            // this is the order in which MRI does these two tests
-            if (positionIndex == -1) raiseArgumentError("unnumbered" + (positionIndex + 1) + "mixed with numbered");
-            if (positionIndex >= length) raiseArgumentError("too few arguments");
-            IRubyObject object = rubyArray == null ? rubyObject : rubyArray.eltInternal(positionIndex);
-            positionIndex++;
-            return object;
-        }
-
         int intValue(ThreadContext context, IRubyObject obj) {
             if (obj instanceof RubyNumeric num) return num.asInt(context);
 
diff --git a/core/src/main/java/org/jruby/util/StringSupport.java b/core/src/main/java/org/jruby/util/StringSupport.java
index f8430fddaa0..2c1c16e453f 100644
--- a/core/src/main/java/org/jruby/util/StringSupport.java
+++ b/core/src/main/java/org/jruby/util/StringSupport.java
@@ -746,16 +746,6 @@ public static int offset(RubyString str, int pos) {
         return offset(str.getEncoding(), value.getUnsafeBytes(), value.getBegin(), value.getBegin() + value.getRealSize(), pos);
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static int toLower(Encoding enc, int c) {
-        return Encoding.isAscii(c) ? AsciiTables.ToLowerCaseTable[c] : c;
-    }
-
-    @Deprecated(since = "9.2.0.0")
-    public static int toUpper(Encoding enc, int c) {
-        return Encoding.isAscii(c) ? AsciiTables.ToUpperCaseTable[c] : c;
-    }
-
     public static int caseCmp(byte[]bytes1, int p1, byte[]bytes2, int p2, int len) {
         int i = -1;
         for (; ++i < len && bytes1[p1 + i] == bytes2[p2 + i];) {}
@@ -908,6 +898,7 @@ public static int bytesToFixBrokenTrailingCharacter(byte[] bytes, int begin, int
         return 0;
     }
 
+    // Deprecated but still used by StringIO
     @Deprecated(since = "10.0.0.0")
     public static int memchr(byte[] ptr, int start, final int find, int len) {
         return Helpers.memchr(ptr, start, find, len);
@@ -2960,9 +2951,4 @@ public static String byteListAsString(ByteList bytes) {
 
         return new String(bytes.unsafeBytes(), bytes.begin(), bytes.realSize());
     }
-
-    @Deprecated(since = "9.1.16.0")
-    public static boolean isUnicode(Encoding enc) {
-        return enc.isUnicode();
-    }
 }
diff --git a/core/src/main/java/org/jruby/util/TypeConverter.java b/core/src/main/java/org/jruby/util/TypeConverter.java
index 0fcb87c46cc..0ccf18e8f6d 100644
--- a/core/src/main/java/org/jruby/util/TypeConverter.java
+++ b/core/src/main/java/org/jruby/util/TypeConverter.java
@@ -240,13 +240,13 @@ public static RaiseException newTypeError(Ruby runtime, IRubyObject obj, RubyCla
         IRubyObject className =  types(runtime, obj.getType());
         String message = isImplicitTypeError(methodName) ? "no implicit conversion of" : "can't convert ";
 
-        return typeError(runtime.getCurrentContext(), str(runtime, message, className, " to ", types(runtime, target)));
+        return typeError(runtime.getCurrentContext(), str(runtime, message, className, " into ", types(runtime, target)));
     }
 
     public static RaiseException newTypeErrorMismatch(Ruby runtime, IRubyObject obj, RubyClass target, String methodName, IRubyObject val) {
         IRubyObject className =  types(runtime, obj.getType());
 
-        return typeError(runtime.getCurrentContext(), str(runtime, "can't convert ", className, " to ", types(runtime, target), " (",
+        return typeError(runtime.getCurrentContext(), str(runtime, "can't convert ", className, " into ", types(runtime, target), " (",
                 className, '#' + methodName + " gives ", types(runtime, val.getType()), ")"));
     }
 
@@ -374,11 +374,6 @@ public static IRubyObject checkArrayType(ThreadContext context, IRubyObject obj)
         return TypeConverter.convertToTypeWithCheck(context, obj, arrayClass(context), sites(context).to_ary_checked);
     }
 
-    @Deprecated(since = "9.2.5.0") // no longer used
-    public static IRubyObject checkArrayType(IRubyObject obj) {
-        return checkArrayType(obj.getRuntime().getCurrentContext(), obj);
-    }
-
     public static IRubyObject handleUncoercibleObject(boolean raise, IRubyObject obj, RubyClass target) {
         return handleUncoercibleObject(obj.getRuntime(), obj, target, raise);
     }
@@ -388,11 +383,6 @@ public static IRubyObject handleUncoercibleObject(Ruby runtime, IRubyObject obj,
         return runtime.getNil();
     }
 
-    @Deprecated(since = "9.2.0.0") // not-used
-    public static IRubyObject handleImplicitlyUncoercibleObject(boolean raise, IRubyObject obj, RubyClass target) {
-        return handleUncoercibleObject(obj.getRuntime(), obj, target, raise);
-    }
-
     // rb_check_type and Check_Type
     public static void checkType(ThreadContext context, IRubyObject x, final RubyModule type) {
         assert x != RubyBasicObject.UNDEF;
@@ -490,71 +480,6 @@ public static TypeConverterSites sites(ThreadContext context) {
         return context.sites.TypeConverter;
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject convertToType(IRubyObject obj, RubyClass target, int convertMethodIndex, String convertMethod, boolean raise) {
-        if (!obj.respondsTo(convertMethod)) return handleUncoercibleObject(raise, obj, target);
-
-        return obj.callMethod(obj.getRuntime().getCurrentContext(), convertMethod);
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject convertToType(IRubyObject obj, RubyClass target, int convertMethodIndex, String convertMethod) {
-        if (target.isInstance(obj)) return obj;
-        IRubyObject val = convertToType(obj, target, convertMethod, true);
-        if (!target.isInstance(val)) {
-            Ruby runtime = obj.getRuntime();
-            throw typeError(runtime.getCurrentContext(), str(runtime, types(runtime, obj.getMetaClass()),
-                    "#" + convertMethod + " should return ", types(runtime, target)));
-        }
-        return val;
-    }
-
-    @Deprecated(since = "9.0.0.0")
-    public static IRubyObject convertToTypeWithCheck(IRubyObject obj, RubyClass target, int convertMethodIndex, String convertMethod) {
-        if (target.isInstance(obj)) return obj;
-        IRubyObject val = TypeConverter.convertToType(obj, target, convertMethod, false);
-        if (val.isNil()) return val;
-        if (!target.isInstance(val)) {
-            Ruby runtime = obj.getRuntime();
-            throw typeError(runtime.getCurrentContext(), str(runtime, types(runtime, obj.getMetaClass()),
-                    "#" + convertMethod + " should return ", types(runtime, target)));
-        }
-        return val;
-    }
-
-    @Deprecated(since = "9.0.3.0")
-    public static String convertToIdentifier(IRubyObject obj) {
-        // Assume Symbol already returns ISO8859-1/raw bytes from asJavaString()
-        // Assume all other objects cannot participate in providing raw bytes since we cannot
-        // grab it's string representation without calling a method which properly encodes
-        // the string.
-        if (obj instanceof RubyString) {
-            return RubyEncoding.decodeRaw(((RubyString) obj).getByteList()).intern();
-        }
-        return obj.asJavaString().intern();
-    }
-    /**
-     * Higher level conversion utility similar to convertToType but it can throw an
-     * additional TypeError during conversion (MRI: rb_check_convert_type).
-     *
-     * @param obj the object to convert
-     * @param target is the type we are trying to convert to
-     * @param convertMethod is the method to be called to try and convert to targeType
-     * @return the converted value
-     */
-    @Deprecated(since = "9.1.3.0") // no longer used
-    public static IRubyObject convertToTypeOrRaise(IRubyObject obj, RubyClass target, String convertMethod) {
-        if (target.isInstance(obj)) return obj;
-        IRubyObject val = TypeConverter.convertToType(obj, target, convertMethod, true);
-        if (val.isNil()) return val;
-        if (!target.isInstance(val)) {
-            Ruby runtime = obj.getRuntime();
-            throw typeError(runtime.getCurrentContext(), str(runtime, types(runtime, obj.getMetaClass()),
-                    "#" + convertMethod + " should return ", types(runtime, target)));
-        }
-        return val;
-    }
-
     private static boolean isImplicitTypeError(String methodID) {
         for (int i = 0; i < IMPLICIT_CONVERTED_METHODS.length; i++) {
             if (IMPLICIT_CONVERTED_METHODS[i].equals(methodID)) return true;
diff --git a/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java b/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
index ffcbc5c52b4..7cab4f9dcfe 100644
--- a/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
+++ b/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
@@ -807,14 +807,6 @@ private String resolveScript(String scriptName) {
         return null;
     }
 
-    @Deprecated(since = "9.1.3.0")
-    public String resolveScriptUsingClassLoader(String scriptName) {
-        if (RubyInstanceConfig.defaultClassLoader().getResourceAsStream("bin/" + scriptName) != null){
-            return "classpath:/bin/" + scriptName;
-        }
-        return null;
-    }
-
     private String grabValue(String errorMessage) {
         return grabValue(errorMessage, true);
     }
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
index d47a98a1ac0..7f8f6f89be7 100644
--- a/core/src/main/java/org/jruby/util/cli/Options.java
+++ b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -193,6 +193,13 @@ public class Options {
     public static final Option<String> GEM_HOME = string(MISCELLANEOUS, "gem.home", "The home dir where Ruby gems will be installed.");
     public static final Option<String> GEM_PATH = string(MISCELLANEOUS, "gem.path", "The path containing all dirs to search for installed Ruby gems.");
 
+    public static final Option<Boolean> USE_COMPACT_FIXNUMS = bool(MISCELLANEOUS, "fixnum.compact", true, "Allocate fixnums compactly.");
+    // int fixnums don't pack any tighter than long with current JVMs
+    public static final Option<Boolean> USE_INT_FIXNUMS = bool(MISCELLANEOUS, "fixnum.int", false, "Allocate int-range fixnums compactly.");
+    public static final Option<Boolean> USE_SHORT_FIXNUMS = bool(MISCELLANEOUS, "fixnum.short", true, "Allocate short-range fixnums compactly.");
+    // byte fixnums don't pack any tighter than short with current JVMs
+    public static final Option<Boolean> USE_BYTE_FIXNUMS = bool(MISCELLANEOUS, "fixnum.byte", false, "Allocate byte-range fixnums compactly.");
+
     public static final Option<Boolean> DEBUG_LOADSERVICE = bool(DEBUG, "debug.loadService", false, "Log require/load file searches.");
     public static final Option<Boolean> DEBUG_LOADSERVICE_TIMING = bool(DEBUG, "debug.loadService.timing", false, "Log require/load parse+evaluate times.");
     public static final Option<Boolean> DEBUG_LAUNCH = bool(DEBUG, "debug.launch", false, "Log externally-launched processes.");
@@ -251,7 +258,7 @@ public class Options {
     public static final Option<String> CLI_ENCODING_INTERNAL = string(CLI, "cli.encoding.internal", "Encoding name to use internally.");
     public static final Option<String> CLI_ENCODING_EXTERNAL = string(CLI, "cli.encoding.external", "Encoding name to treat external data.");
     public static final Option<String> CLI_ENCODING_SOURCE = string(CLI, "cli.encoding.source", "Encoding name to treat source code.");
-    public static final Option<String> CLI_RECORD_SEPARATOR = string(CLI, "cli.record.separator", "\n", "Default record separator.");
+    public static final Option<String> CLI_RECORD_SEPARATOR = string(CLI, "cli.record.separator", "\n", "Configurable record separator.");
     public static final Option<String> CLI_BACKUP_EXTENSION = string(CLI, "cli.backup.extension", "Backup extension for in-place ARGV files. Same as -i.");
     public static final Option<ProfilingMode> CLI_PROFILING_MODE = enumeration(CLI, "cli.profiling.mode", ProfilingMode.class, ProfilingMode.OFF, "Enable instrumented profiling modes.");
     public static final Option<String> CLI_PROFILING_SERVICE = string(CLI, "cli.profiling.service", "Profiling service class to use.");
@@ -366,112 +373,6 @@ static void addPropertyNames(final Set<String> propertyNames) {
         }
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> PARSER_WARN_GROUPED_EXPRESSIONS = bool(PARSER, "parser.warn.grouped_expressions", true, "Warn about interpreting (...) as a grouped expression.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> COMPILE_FASTOPS = bool(COMPILER, "compile.fastops", true, "Turn on fast operators for Fixnum and Float.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> COMPILE_THREADLESS = bool(COMPILER, "compile.threadless", false, "(EXPERIMENTAL) Turn on compilation without polling for \"unsafe\" thread events.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Integer> COMPILE_CHAINSIZE = integer(COMPILER, "compile.chainsize", Constants.CHAINED_COMPILE_LINE_COUNT_DEFAULT, "Set the number of lines at which compiled bodies are \"chained\".");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> COMPILE_PEEPHOLE = bool(COMPILER, "compile.peephole", true, "Enable or disable peephole optimizations.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> COMPILE_NOGUARDS = bool(COMPILER, "compile.noguards", false, "Compile calls without guards, for experimentation.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> COMPILE_FASTEST = bool(COMPILER, "compile.fastest", false, "Compile with all \"mostly harmless\" compiler optimizations.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> COMPILE_FASTSEND = bool(COMPILER, "compile.fastsend", false, "Compile obj.__send__(<literal>, ...) as obj.<literal>(...).");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> COMPILE_FASTMASGN = bool(COMPILER, "compile.fastMasgn", false, "Return true from multiple assignment instead of a new array.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Integer> COMPILE_OUTLINE_CASECOUNT = integer(COMPILER, "compile.outline.casecount", 50, "Outline when bodies when number of cases exceeds this value.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_SAFE = bool(INVOKEDYNAMIC, "invokedynamic.safe", false, "Enable all safe (but maybe not fast) uses of invokedynamic.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_INVOCATION = bool(INVOKEDYNAMIC, "invokedynamic.invocation", true, "Enable invokedynamic for method invocations.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_INVOCATION_INDIRECT = bool(INVOKEDYNAMIC, "invokedynamic.invocation.indirect", true, "Also bind indirect method invokers to invokedynamic.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_INVOCATION_JAVA = bool(INVOKEDYNAMIC, "invokedynamic.invocation.java", true, "Bind Ruby to Java invocations with invokedynamic.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_INVOCATION_ATTR = bool(INVOKEDYNAMIC, "invokedynamic.invocation.attr", true, "Bind Ruby attribute invocations directly to invokedynamic.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_INVOCATION_FFI = bool(INVOKEDYNAMIC, "invokedynamic.invocation.ffi", true, "Bind Ruby FFI invocations directly to invokedynamic.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_INVOCATION_FASTOPS = bool(INVOKEDYNAMIC, "invokedynamic.invocation.fastops", true, "Bind Fixnum and Float math using optimized logic.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_CACHE = bool(INVOKEDYNAMIC, "invokedynamic.cache", true, "Use invokedynamic to load cached values like literals and constants.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_CACHE_CONSTANTS = bool(INVOKEDYNAMIC, "invokedynamic.cache.constants", true, "Use invokedynamic to load constants.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_CACHE_LITERALS = bool(INVOKEDYNAMIC, "invokedynamic.cache.literals", true, "Use invokedynamic to load literals.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> INVOKEDYNAMIC_CACHE_IVARS = bool(INVOKEDYNAMIC, "invokedynamic.cache.ivars", true, "Use invokedynamic to get/set instance variables.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> JIT_CACHE = bool(JIT, "jit.cache", !COMPILE_INVOKEDYNAMIC.load(), "(DEPRECATED) Cache jitted method in-memory bodies across runtimes and loads.");    public static final Option<Boolean> INVOKEDYNAMIC_ALL = bool(INVOKEDYNAMIC, "invokedynamic.all", false, "Enable all possible uses of invokedynamic.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> JIT_DUMPING = bool(JIT, "jit.dumping", false, "Enable stdout dumping of JITed bytecode.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<String>  IR_INLINE_COMPILER_PASSES = string(IR, "ir.inline_passes", "Specify comma delimeted list of passes to run after inlining a method.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> FFI_COMPILE_INVOKEDYNAMIC = bool(NATIVE, "ffi.compile.invokedynamic", false, "Use invokedynamic to bind FFI invocations.");
-
-    // internal IO mimics what this was doing, and this has been untested and unsupported for many years
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> NATIVE_NET_PROTOCOL = bool(MISCELLANEOUS, "native.net.protocol", false, "Use native impls for parts of net/protocol.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<String> THREAD_DUMP_SIGNAL = string(MISCELLANEOUS, "thread.dump.signal", new String[]{"USR1", "USR2", "etc"}, "USR2", "Set the signal used for dumping thread stacks.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> FIBER_COROUTINES = bool(MISCELLANEOUS, "fiber.coroutines", false, "Use JVM coroutines for Fiber.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> GLOBAL_REQUIRE_LOCK = bool(MISCELLANEOUS, "global.require.lock", false, "Use a single global lock for requires.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> REFLECTED_HANDLES = bool(MISCELLANEOUS, "reflected.handles", false, "Use reflection for binding methods, not generated bytecode.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> ENUMERATOR_LIGHTWEIGHT = bool(MISCELLANEOUS, "enumerator.lightweight", true, "Use lightweight Enumerator#next logic when possible.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> FCNTL_LOCKING = bool(MISCELLANEOUS, "file.flock.fcntl", true, "Use fcntl rather than flock for File#flock");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> RECORD_LEXICAL_HIERARCHY = bool(MISCELLANEOUS, "record.lexical.hierarchy", false, "Maintain children static scopes to support scope dumping.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> JI_LOGCANSETACCESSIBLE = bool(JAVA_INTEGRATION, "ji.logCanSetAccessible", false, "Log whether setAccessible is working.");
-
-    @Deprecated(since = "9.3.0.0")
-    public static final Option<Boolean> JAVA_HANDLES = bool(JAVA_INTEGRATION, "java.handles", false, "Use generated handles instead of reflection for calling Java.");
-
     @Deprecated(since = "10.0.0.0")
     public static final Option<Boolean> NAME_ERROR_INSPECT_OBJECT = bool(MISCELLANEOUS, "nameError.inspect.object", true, "Inspect the target object for display in NameError messages.");
 }
diff --git a/core/src/main/java/org/jruby/util/collections/ClassValue.java b/core/src/main/java/org/jruby/util/collections/ClassValue.java
index 6641aea0290..70220a539f1 100644
--- a/core/src/main/java/org/jruby/util/collections/ClassValue.java
+++ b/core/src/main/java/org/jruby/util/collections/ClassValue.java
@@ -47,7 +47,17 @@ public ClassValue(ClassValueCalculator<T> calculator) {
 
     public abstract T get(Class<?> cls);
 
-    protected final ClassValueCalculator<T> calculator;
+    /**
+     * Make a best effort to clear all references.
+     *
+     * Best effort here is sometimes not easily achievable, if for example values are opaquely contained
+     * in a {@link java.lang.ClassValue} instance that does not directly support global clearing.
+     */
+    public void clear() {
+        calculator = null;
+    }
+
+    protected volatile ClassValueCalculator<T> calculator;
 
     public static <T> ClassValue<T> newInstance(ClassValueCalculator<T> calculator) {
         if (Options.INVOKEDYNAMIC_CLASS_VALUES.load()) return newJava7Instance(calculator);
diff --git a/core/src/main/java/org/jruby/util/collections/Java7ClassValue.java b/core/src/main/java/org/jruby/util/collections/Java7ClassValue.java
index ed394f194a2..0cd9015b7ac 100644
--- a/core/src/main/java/org/jruby/util/collections/Java7ClassValue.java
+++ b/core/src/main/java/org/jruby/util/collections/Java7ClassValue.java
@@ -20,6 +20,10 @@ public T get(Class<?> cls) {
         return proxy.get(cls).get();
     }
 
+    public void clear() {
+        // nothing to clear and values are weakly referenced by the ClassValue anyway
+    }
+
     // If we put any objects that reference an org.jruby.Ruby runtime
     // (like RubyClass instances) in here we run into a circular
     // reference situation that GC isn't handling where they will
diff --git a/core/src/main/java/org/jruby/util/collections/MapBasedClassValue.java b/core/src/main/java/org/jruby/util/collections/MapBasedClassValue.java
index 70c5635104f..1da7feb7250 100644
--- a/core/src/main/java/org/jruby/util/collections/MapBasedClassValue.java
+++ b/core/src/main/java/org/jruby/util/collections/MapBasedClassValue.java
@@ -30,6 +30,10 @@ public T get(Class<?> cls) {
         return obj;
     }
 
+    public void clear() {
+        cache.clear();
+    }
+
     // There's not a compelling reason to keep JavaClass instances in a weak map
     // (any proxies created are [were] kept in a non-weak map, so in most cases they will
     // stick around anyway), and some good reasons not to (JavaClass creation is
diff --git a/core/src/main/java/org/jruby/util/collections/StableClassValue.java b/core/src/main/java/org/jruby/util/collections/StableClassValue.java
index 7d2a8999cf2..28778398f4b 100644
--- a/core/src/main/java/org/jruby/util/collections/StableClassValue.java
+++ b/core/src/main/java/org/jruby/util/collections/StableClassValue.java
@@ -1,5 +1,7 @@
 package org.jruby.util.collections;
 
+import java.util.WeakHashMap;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 
 /**
@@ -7,6 +9,8 @@
  * occurs at most once.
  */
 final class StableClassValue<T> extends ClassValue<T> {
+    private final ReentrantLock lock = new ReentrantLock();
+    private final WeakHashMap<StableValue<Class<?>, T>, Object> stableValues = new WeakHashMap<>();
 
     public StableClassValue(ClassValueCalculator<T> calculator) {
         super(calculator);
@@ -18,6 +22,15 @@ public T get(Class<?> cls) {
         return proxy.get(cls).get(cls);
     }
 
+    public void clear() {
+        synchronized (stableValues) {
+            for (StableValue<Class<?>, T> value : stableValues.keySet()) {
+                value.clear();
+            }
+            stableValues.clear();
+        }
+    }
+
     /**
      * Represents a stable value, which is computed at most once and then stored forever.
      *
@@ -27,10 +40,12 @@ public T get(Class<?> cls) {
      * @param <Input> input of the computation
      * @param <Result> result of the computation
      */
-    private class StableValue<Input, Result> {
-        private final Function<Input, Result> calculator;
+    private static class StableValue<Input, Result> {
+        private final ReentrantLock lock;
+        private volatile Function<Input, Result> calculator;
         private volatile Result result;
-        StableValue(Function<Input, Result> calculator) {
+        StableValue(ReentrantLock lock, Function<Input, Result> calculator) {
+            this.lock = lock;
             this.calculator = calculator;
         }
         Result get(Input input) {
@@ -38,24 +53,40 @@ Result get(Input input) {
 
             if (result != null) return result;
 
-            // lock on the StableClassValue so there are not multiple locks potentially in different orders
-            synchronized (StableClassValue.this) {
+            // Use shared lock to ensure only one StableValue can initialize at a time
+            lock.lock();
+            try {
                 result = this.result;
 
                 if (result != null) return result;
 
                 result = this.calculator.apply(input);
                 this.result = result;
+            } finally {
+                lock.unlock();
             }
 
             return result;
         }
-    }
 
-    private final java.lang.ClassValue<StableValue<Class<?>, T>> proxy = new java.lang.ClassValue<StableValue<Class<?>, T>>() {
-        @Override
-        protected StableValue<Class<?>, T> computeValue(Class<?> type) {
-            return new StableValue<>(calculator);
+        void clear() {
+            this.calculator = null;
+            this.result = null;
         }
-    };
+    }
+
+    private final java.lang.ClassValue<StableValue<Class<?>, T>> proxy = createStableValueProxy(lock, calculator, stableValues);
+
+    private static <U> java.lang.ClassValue<StableValue<Class<?>, U>> createStableValueProxy(ReentrantLock lock, Function<Class<?>, U> calculator, WeakHashMap<StableValue<Class<?>, U>, Object> stableValues){
+        return new java.lang.ClassValue<>() {
+            @Override
+            protected StableValue<Class<?>, U> computeValue(Class<?> type) {
+                StableValue<Class<?>, U> stableValue = new StableValue<>(lock, calculator);
+                synchronized (stableValues) {
+                    stableValues.put(stableValue, null);
+                }
+                return stableValue;
+            }
+        };
+    }
 }
diff --git a/core/src/main/java/org/jruby/util/collections/StringArraySet.java b/core/src/main/java/org/jruby/util/collections/StringArraySet.java
index 0bd43c22cb1..5127f0c42f6 100644
--- a/core/src/main/java/org/jruby/util/collections/StringArraySet.java
+++ b/core/src/main/java/org/jruby/util/collections/StringArraySet.java
@@ -33,6 +33,7 @@
 import java.util.Set;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyArrayNative;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyString;
 import org.jruby.runtime.Block;
@@ -45,7 +46,7 @@
 /**
  * An RubyArray that maintains an O(1) Set for fast include? operations.
  */
-public class StringArraySet extends RubyArray {
+public class StringArraySet extends RubyArrayNative {
 
     private final Set<String> set;
 
diff --git a/core/src/main/java/org/jruby/util/io/EncodingUtils.java b/core/src/main/java/org/jruby/util/io/EncodingUtils.java
index 90d02a427c5..4089b3a37d0 100644
--- a/core/src/main/java/org/jruby/util/io/EncodingUtils.java
+++ b/core/src/main/java/org/jruby/util/io/EncodingUtils.java
@@ -2457,11 +2457,6 @@ public static Encoding rbAscii8bitAppendableEncodingIndex(ThreadContext context,
         }
     }
 
-    @Deprecated(since = "9.2.0.0")
-    public static Encoding ioStripBOM(RubyIO io) {
-        return ioStripBOM(io.getRuntime().getCurrentContext(), io);
-    }
-
     @Deprecated(since = "9.4.6.0")
     public static Encoding strTranscode0(ThreadContext context, int argc, IRubyObject[] args, IRubyObject[] self_p, int ecflags, IRubyObject ecopts) {
         Encoding[] enc_p = {null};
diff --git a/core/src/main/java/org/jruby/util/io/ModeFlags.java b/core/src/main/java/org/jruby/util/io/ModeFlags.java
index 1f5a11da128..2e0ea7a690b 100644
--- a/core/src/main/java/org/jruby/util/io/ModeFlags.java
+++ b/core/src/main/java/org/jruby/util/io/ModeFlags.java
@@ -214,37 +214,6 @@ public static int oflagsFrom(POSIX posix, Channel channel) {
         return mode;
     }
 
-    /**
-     * Build a set of mode flags using the specified channel's actual capabilities.
-     *
-     * @param channel the channel to examine for capabilities
-     * @return the mode flags
-     */
-    @Deprecated(since = "9.0.0.0")
-    public static ModeFlags getModesFromChannel(Channel channel) {
-        try {
-            ModeFlags modes;
-
-            if (channel instanceof ReadableByteChannel) {
-                if (channel instanceof WritableByteChannel) {
-                    modes = new ModeFlags(RDWR);
-                } else {
-                    modes = new ModeFlags(RDONLY);
-                }
-            } else if (channel instanceof WritableByteChannel) {
-                modes = new ModeFlags(WRONLY);
-            } else {
-                // FIXME: I don't like this
-                modes = new ModeFlags(RDWR);
-            }
-
-            return modes;
-        } catch (InvalidValueException ive) {
-            // should never happen, because all values above are valid
-            throw new RuntimeException(ive);
-        }
-    }
-
     /**
      * Produce a Java IO mode string from the flags in this object.
      * 
diff --git a/core/src/main/java/org/jruby/util/io/OpenFile.java b/core/src/main/java/org/jruby/util/io/OpenFile.java
index 25ca5972d81..05d114a11f8 100644
--- a/core/src/main/java/org/jruby/util/io/OpenFile.java
+++ b/core/src/main/java/org/jruby/util/io/OpenFile.java
@@ -134,6 +134,7 @@ public static interface Finalizer {
     private Finalizer finalizer;
     public Closeable stdio_file;
     public volatile FileLock currentLock;
+    private IRubyObject timeout;
 
     public static class Buffer {
         public byte[] ptr;
@@ -885,28 +886,6 @@ public void cleanup(Ruby runtime, boolean noraise) {
         }
     }
 
-    @Deprecated(since = "9.2.1.0") // no longer used
-    public static final Finalizer PIPE_FINALIZE = new Finalizer() {
-        @Override
-        public void finalize(Ruby runtime, OpenFile fptr, boolean noraise) {
-            if (!Platform.IS_WINDOWS) { // #if !defined(HAVE_FORK) && !defined(_WIN32)
-                int status = 0;
-                if (fptr.stdio_file != null) {
-                    // unsure how to do this
-//                    status = pclose(fptr->stdio_file);
-                    fptr.posix.close(fptr.stdio_file);
-                }
-                fptr.setFD(null);
-                fptr.stdio_file = null;
-                // no status from above, so can't really do this
-//                runtime.getCurrentContext().setLastExitStatus();
-            } else {
-                fptr.finalize(runtime.getCurrentContext(), noraise);
-            }
-//            pipe_del_fptr(fptr);
-        }
-    };
-
     public void finalize() {
         if (fd != null && isAutoclose()) finalize(runtime.getCurrentContext(), true);
     }
@@ -1884,16 +1863,6 @@ public void incrementLineno(Ruby runtime, RubyIO io) {
         }
     }
 
-    @Deprecated(since = "9.1.8.0")
-    public void incrementLineno(Ruby runtime) {
-        boolean locked = lock();
-        try {
-            lineno++;
-        } finally {
-            if (locked) unlock();
-        }
-    }
-
     // read_all, 2014-5-13
     public IRubyObject readAll(ThreadContext context, int siz, IRubyObject str) {
         Ruby runtime = context.runtime;
@@ -2578,37 +2547,39 @@ public ChannelFD fd() {
     }
 
     public Channel channel() {
-        assert(fd != null);
+        // MRI equivalent: rb_io_check_closed(fptr) + fptr->fd access in io.c
+        // when an IO was closed from another thread MRI raises IOError("closed stream") via io_fd_check_closed (io.c)
+        checkClosed();
         return fd.ch;
     }
 
     public ReadableByteChannel readChannel() {
-        assert(fd != null);
+        checkClosed();
         return fd.chRead;
     }
 
     public WritableByteChannel writeChannel() {
-        assert(fd != null);
+        checkClosed();
         return fd.chWrite;
     }
 
     public SeekableByteChannel seekChannel() {
-        assert(fd != null);
+        checkClosed();
         return fd.chSeek;
     }
 
     public SelectableChannel selectChannel() {
-        assert(fd != null);
+        checkClosed();
         return fd.chSelect;
     }
 
     public FileChannel fileChannel() {
-        assert(fd != null);
+        checkClosed();
         return fd.chFile;
     }
 
     public SocketChannel socketChannel() {
-        assert(fd != null);
+        checkClosed();
         return fd.chSock;
     }
 
@@ -2771,50 +2742,6 @@ public int readPending() {
         }
     }
 
-    @Deprecated(since = "9.0.0.0")
-    public static int getFModeFromString(String modesString) throws InvalidValueException {
-        int fmode = 0;
-        int length = modesString.length();
-
-        if (length == 0) {
-            throw new InvalidValueException();
-        }
-
-        switch (modesString.charAt(0)) {
-            case 'r' :
-                fmode |= READABLE;
-                break;
-            case 'w' :
-                fmode |= WRITABLE | TRUNC | CREATE;
-                break;
-            case 'a' :
-                fmode |= WRITABLE | APPEND | CREATE;
-                break;
-            default :
-                throw new InvalidValueException();
-        }
-
-        ModifierLoop: for (int n = 1; n < length; n++) {
-            switch (modesString.charAt(n)) {
-                case 'b':
-                    fmode |= BINMODE;
-                    break;
-                case 't' :
-                    fmode |= TEXTMODE;
-                    break;
-                case '+':
-                    fmode |= READWRITE;
-                    break;
-                case ':':
-                    break ModifierLoop;
-                default:
-                    throw new InvalidValueException();
-            }
-        }
-
-        return fmode;
-    }
-
     public int getFileno() {
         return fd.bestFileno(true);
     }
@@ -3044,8 +2971,11 @@ public boolean lockedByMe() {
         return lock.isHeldByCurrentThread();
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public long binwrite(ThreadContext context, byte[] ptrBytes, int ptr, int len, boolean nosync) {
-        return binwriteInt(context, ptrBytes, ptr, len, nosync);
+    public IRubyObject getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(IRubyObject timeout) {
+        this.timeout = timeout;
     }
 }
diff --git a/core/src/main/java/org/jruby/util/io/PopenExecutor.java b/core/src/main/java/org/jruby/util/io/PopenExecutor.java
index 3f90eceab34..69053e79beb 100644
--- a/core/src/main/java/org/jruby/util/io/PopenExecutor.java
+++ b/core/src/main/java/org/jruby/util/io/PopenExecutor.java
@@ -73,6 +73,7 @@ public static boolean nativePopenAvailable(Ruby runtime) {
     }
 
     // MRI: check_pipe_command
+    @Deprecated(since = "10.1.0.0", forRemoval = true)
     public static IRubyObject checkPipeCommand(ThreadContext context, IRubyObject filenameOrCommand) {
         RubyString filenameStr = filenameOrCommand.convertToString();
         ByteList filenameByteList = filenameStr.getByteList();
diff --git a/core/src/main/java/org/jruby/util/io/PosixShim.java b/core/src/main/java/org/jruby/util/io/PosixShim.java
index 1c36da64775..46c94a3403e 100644
--- a/core/src/main/java/org/jruby/util/io/PosixShim.java
+++ b/core/src/main/java/org/jruby/util/io/PosixShim.java
@@ -216,7 +216,8 @@ public int flock(ChannelFD fd, int lockMode) {
 
         int real_fd = fd.realFileno;
 
-        if (posix.isNative() && real_fd != -1 && real_fd < FilenoUtil.FIRST_FAKE_FD && !Platform.IS_SOLARIS) {
+        if (!Platform.IS_SOLARIS && !Platform.IS_WINDOWS &&
+                posix.isNative() && real_fd != -1 && real_fd < FilenoUtil.FIRST_FAKE_FD) {
             // we have a real fd and not on Solaris...try native flocking
             // see jruby/jruby#3254 and jnr/jnr-posix#60
             int result = posix.flock(real_fd, lockMode);
@@ -494,16 +495,6 @@ public Channel open(String cwd, String path, ModeFlags flags, int perm) {
         return open(cwd, path, flags.getFlags(), perm);
     }
 
-    @Deprecated(since = "9.0.0.0") // special case is already handled with JRubyFile.createResource
-    public Channel open(String cwd, String path, ModeFlags flags, int perm, ClassLoader classLoader) {
-        if (path.startsWith("classpath:/") && classLoader != null) {
-            path = path.substring("classpath:/".length());
-            return Channels.newChannel(classLoader.getResourceAsStream(path));
-        }
-
-        return open(cwd, path, flags, perm);
-    }
-
     /**
      * Joy of POSIX, only way to get the umask is to set the umask,
      * then set it back. That's unsafe in a threaded program. We
diff --git a/core/src/main/java/org/jruby/util/io/SeekableByteChannelImpl.java b/core/src/main/java/org/jruby/util/io/SeekableByteChannelImpl.java
index 6827c53f185..bdb11aa7bf9 100644
--- a/core/src/main/java/org/jruby/util/io/SeekableByteChannelImpl.java
+++ b/core/src/main/java/org/jruby/util/io/SeekableByteChannelImpl.java
@@ -24,7 +24,7 @@
  * Seekable byte channel impl over a byte array stream.
  * @author kares
  */
-final class SeekableByteChannelImpl extends AbstractInterruptibleChannel
+public final class SeekableByteChannelImpl extends AbstractInterruptibleChannel
     implements ReadableByteChannel, SeekableByteChannel {
 
     private final ByteArrayInputStream in;
@@ -34,7 +34,7 @@ final class SeekableByteChannelImpl extends AbstractInterruptibleChannel
 
     private int truncatedBy = 0;
 
-    SeekableByteChannelImpl(ByteArrayInputStream in) {
+    public SeekableByteChannelImpl(ByteArrayInputStream in) {
         this.in = in;
         this.mark = mark(in);
         this.count = count(in);
diff --git a/core/src/main/java/org/jruby/util/io/SelectExecutor.java b/core/src/main/java/org/jruby/util/io/SelectExecutor.java
index 033108445de..bfb42917466 100644
--- a/core/src/main/java/org/jruby/util/io/SelectExecutor.java
+++ b/core/src/main/java/org/jruby/util/io/SelectExecutor.java
@@ -16,6 +16,7 @@
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.SelectorProvider;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -103,12 +104,11 @@ IRubyObject selectEnd(ThreadContext context) throws IOException {
     IRubyObject selectInternal(ThreadContext context) throws IOException {
         Ruby runtime = context.runtime;
         OpenFile fptr;
-        long i;
 
         RubyArray readAry = null;
         if (!read.isNil()) {
             readAry = read.convertToArray();
-            for (i = 0; i < readAry.size(); i++) {
+            for (int i = 0; i < readAry.size(); i++) {
                 fptr = TypeConverter.ioGetIO(runtime, readAry.eltOk(i)).getOpenFileChecked();
                 fdSetRead(context, fptr.fd(), readAry.size());
                 if (fptr.READ_DATA_PENDING() || fptr.READ_CHAR_PENDING()) { /* check for buffered data */
@@ -124,7 +124,7 @@ IRubyObject selectInternal(ThreadContext context) throws IOException {
         RubyArray writeAry = null;
         if (!write.isNil()) {
             writeAry = write.convertToArray();
-            for (i = 0; i < writeAry.size(); i++) {
+            for (int i = 0; i < writeAry.size(); i++) {
                 RubyIO write_io = TypeConverter.ioGetIO(runtime, writeAry.eltOk(i)).GetWriteIO();
                 fptr = write_io.getOpenFileChecked();
                 fdSetWrite(context, fptr.fd(), writeAry.size());
@@ -139,7 +139,7 @@ IRubyObject selectInternal(ThreadContext context) throws IOException {
             // This does not actually register anything because we do not have a way to select for error on JDK.
             // We make the calls for their side effects.
             exceptAry = except.convertToArray();
-            for (i = 0; i < exceptAry.size(); i++) {
+            for (int i = 0; i < exceptAry.size(); i++) {
                 RubyIO io = TypeConverter.ioGetIO(runtime, exceptAry.eltOk(i));
                 RubyIO write_io = io.GetWriteIO();
                 io.getOpenFileChecked();
@@ -159,7 +159,7 @@ IRubyObject selectInternal(ThreadContext context) throws IOException {
         } else {
             final int len = Math.min(n, maxReadReadySize());
             readReady = Create.allocArray(context, len);
-            for (i = 0; i < readAry.size(); i++) {
+            for (int i = 0; i < readAry.size(); i++) {
                 IRubyObject obj = readAry.eltOk(i);
                 RubyIO io = TypeConverter.ioGetIO(runtime, obj);
                 fptr = io.getOpenFileChecked();
@@ -177,13 +177,21 @@ IRubyObject selectInternal(ThreadContext context) throws IOException {
         } else {
             final int len = Math.min(n, maxWriteReadySize());
             writeReady = Create.allocArray(context, len);
-            for (i = 0; i < writeAry.size(); i++) {
+            for (int i = 0; i < writeAry.size(); i++) {
                 IRubyObject obj = writeAry.eltOk(i);
                 RubyIO io = TypeConverter.ioGetIO(runtime, obj);
                 RubyIO write_io = io.GetWriteIO();
                 fptr = write_io.getOpenFileChecked();
                 if (writeKeyList != null && fdIsSet(writeKeyList, fptr.fd(), WRITE_CONNECT_OPS) ||
                         (unselectableWriteFDs != null && unselectableWriteFDs.contains(fptr.fd()))) {
+
+                    // ensure any pending connections get finished
+                    if (writeKeyList != null && writeKeyList.get(i).isConnectable()) {
+                        if (fptr.fd().ch instanceof SocketChannel sock) {
+                            sock.finishConnect();
+                        }
+                    }
+
                     writeReady.push(context, obj);
                 }
             }
@@ -194,7 +202,7 @@ IRubyObject selectInternal(ThreadContext context) throws IOException {
             error = newEmptyArray(context);
         } else {
             error = Create.allocArray(context, exceptAry.size());
-            for (i = 0; i < exceptAry.size(); i++) {
+            for (int i = 0; i < exceptAry.size(); i++) {
                 IRubyObject obj = exceptAry.eltOk(i);
                 RubyIO io = TypeConverter.ioGetIO(runtime, obj);
                 RubyIO write_io = io.GetWriteIO();
diff --git a/core/src/main/java/org/jruby/util/time/TimeArgs.java b/core/src/main/java/org/jruby/util/time/TimeArgs.java
index 98e9b892ca7..940c1f13142 100644
--- a/core/src/main/java/org/jruby/util/time/TimeArgs.java
+++ b/core/src/main/java/org/jruby/util/time/TimeArgs.java
@@ -15,6 +15,8 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
+import java.math.BigInteger;
+
 import static org.jruby.RubyTime.TIME_SCALE;
 import static org.jruby.api.Convert.asFixnum;
 import static org.jruby.api.Convert.toDouble;
@@ -126,17 +128,29 @@ public void initializeTime(ThreadContext context, RubyTime time, DateTimeZone dt
                 if (secondObj instanceof RubyRational subSecond) {
                     if (subSecond.isNegativeNumber(context)) throw argumentError(context, "argument out of range");
 
-                    var numerator = subSecond.getNumerator().asLong(context);
-                    var denominator = subSecond.getDenominator().asLong(context);
-                    if (numerator >= denominator) {
-                        secondsInRational = (int) (numerator / (double) denominator);
-                        numerator = numerator % denominator;
-                        subSecond = RubyRational.newRational(context.runtime, numerator, denominator);
+                    RubyInteger num = subSecond.getNumerator();
+                    RubyInteger den = subSecond.getDenominator();
+                    if (num.equals(den)) {
+                        secondsInRational = 1;
+                    } else {
+                        var numerator = num.asBigInteger(context);
+                        var denominator = den.asBigInteger(context);
+                        long subSeconds;
+                        int cmp = numerator.compareTo(denominator);
+
+                        if (cmp > 0) {
+                            secondsInRational = numerator.divide(denominator).intValue();
+                            numerator = numerator.mod(denominator);
+                        }
+
+                        subSeconds = numerator
+                                .multiply(RubyTime.TIME_SCALE_BI)
+                                .divide(denominator)
+                                .longValue();
+
+                        millis = subSeconds / 1_000_000;
+                        nanos = subSeconds % 1_000_000;
                     }
-                    var subSeconds = subSecond.asDouble(context) * TIME_SCALE;
-
-                    millis = (long) subSeconds / 1_000_000;
-                    nanos = (long) subSeconds % 1_000_000;
                 } else {
                     double secs = toDouble(context, secondObj);
 
@@ -149,10 +163,10 @@ public void initializeTime(ThreadContext context, RubyTime time, DateTimeZone dt
         } else if (usecObj instanceof RubyRational subSecond) {
             if (subSecond.isNegativeNumber(context)) throw argumentError(context, "argument out of range");
 
-            var subSeconds = subSecond.asDouble(context) * 1_000;
+            long subNanos = subSecond.getNumerator().asLong(context) * 1_000 / subSecond.getDenominator().asLong(context);
 
-            millis = (long) subSeconds / 1_000_000;
-            nanos = (long) subSeconds % 1_000_000;
+            millis = subNanos / 1_000_000;
+            nanos = subNanos % 1_000_000;
         } else if (usecObj instanceof RubyFloat flo) {
             if (flo.isNegativeNumber(context)) throw argumentError(context, "argument out of range");
 
diff --git a/core/src/main/resources/org/jruby/runtime/Constants.java b/core/src/main/resources/org/jruby/runtime/Constants.java
index 7d6d3a42f0d..871c4f40474 100644
--- a/core/src/main/resources/org/jruby/runtime/Constants.java
+++ b/core/src/main/resources/org/jruby/runtime/Constants.java
@@ -50,9 +50,6 @@ public final class Constants {
     public static final String JODA_TIME_VERSION = "@joda.time.version@";
     public static final String TZDATA_VERSION = "@tzdata.version@";
 
-    @Deprecated(since = "9.1.7.0")
-    public static final String DEFAULT_RUBY_VERSION = RUBY_MAJOR_VERSION;
-    
     /**
      * Default size for chained compilation.
      */
@@ -64,12 +61,6 @@ public final class Constants {
      */
     public static final int JIT_MAX_LIMIT = 10000;
 
-    /**
-     * The max count of active methods eligible for JIT-compilation.
-     */
-    @Deprecated(since = "9.2.9.0")
-    public static final int JIT_MAX_METHODS_LIMIT = JIT_MAX_LIMIT;
-
     /**
      * The max size of JIT-compiled methods (full class size) allowed.
      */
@@ -87,9 +78,6 @@ public final class Constants {
     
     private static String jruby_revision = "@jruby.revision@";
 
-    @Deprecated(since = "1.6.0")
-    public static final String JRUBY_PROPERTIES = "/org/jruby/jruby.properties";
-
     public static final String BOGUS_REVISION = "ffffffffff";
 
     static {
@@ -104,10 +92,4 @@ public final class Constants {
     }
 
     private Constants() {}
-
-    @Deprecated(since = "9.0.0.0")
-    public static final int    RUBY_PATCHLEVEL = 0;
-
-    @Deprecated(since = "9.4.0.0")
-    public static final int    RUBY_REVISION = 1;
 }
diff --git a/core/src/main/resources/wasm/prism.wasm b/core/src/main/resources/wasm/prism.wasm
deleted file mode 100755
index bbe0031a18b..00000000000
Binary files a/core/src/main/resources/wasm/prism.wasm and /dev/null differ
diff --git a/core/src/main/ruby/jruby/kernel.rb b/core/src/main/ruby/jruby/kernel.rb
index 26f816f22f5..6037f48324e 100644
--- a/core/src/main/ruby/jruby/kernel.rb
+++ b/core/src/main/ruby/jruby/kernel.rb
@@ -30,3 +30,4 @@ module JRuby
 load 'uri:classloader:jruby/kernel/integer.rb'
 load 'uri:classloader:jruby/kernel/time.rb'
 load 'uri:classloader:jruby/kernel/string.rb'
+load 'uri:classloader:jruby/kernel/pathname.rb'
diff --git a/core/src/main/ruby/jruby/kernel/enumerable.rb b/core/src/main/ruby/jruby/kernel/enumerable.rb
index da475906e1a..358786a4402 100644
--- a/core/src/main/ruby/jruby/kernel/enumerable.rb
+++ b/core/src/main/ruby/jruby/kernel/enumerable.rb
@@ -114,4 +114,15 @@ def enumerator_size
     respond_to?(:size) ? size : nil
   end
   private :enumerator_size
+
+  # Passing arguments to this method is deprecated.
+  def to_set(*args, &block)
+    klass = if args.empty?
+      Set
+    else
+      warn "passing arguments to Enumerable#to_set is deprecated", uplevel: 1
+      args.shift
+    end
+    klass.new(self, *args, &block)
+  end
 end
diff --git a/lib/ruby/stdlib/pathname.rb b/core/src/main/ruby/jruby/kernel/pathname.rb
similarity index 100%
rename from lib/ruby/stdlib/pathname.rb
rename to core/src/main/ruby/jruby/kernel/pathname.rb
diff --git a/core/src/main/ruby/jruby/kernel/prelude.rb b/core/src/main/ruby/jruby/kernel/prelude.rb
index e68b1f341c9..06949076c84 100644
--- a/core/src/main/ruby/jruby/kernel/prelude.rb
+++ b/core/src/main/ruby/jruby/kernel/prelude.rb
@@ -1,25 +1,43 @@
 class Binding
   # :nodoc:
-  def irb
-    require 'irb'
-    irb
+  def irb(...)
+    begin
+      require 'irb'
+    rescue LoadError, Gem::LoadError
+      Gem::BUNDLED_GEMS.force_activate 'irb'
+      require 'irb'
+    end
+    irb(...)
   end
+
+  # suppress redefinition warning
+  alias irb irb # :nodoc:
 end
 
 module Kernel
+  # :stopdoc:
   def pp(*objs)
     require 'pp'
     pp(*objs)
   end
 
+  # suppress redefinition warning
+  alias pp pp
+
   private :pp
+  # :startdoc:
 end
 
-autoload :Set, 'set'
-
 module Enumerable
   # Makes a set from the enumerable object with given arguments.
-  def to_set(klass = Set, *args, &block)
+  # Passing arguments to this method is deprecated.
+  def to_set(*args, &block)
+    klass = if args.empty?
+              Set
+            else
+              warn "passing arguments to Enumerable#to_set is deprecated", uplevel: 1
+              args.shift
+            end
     klass.new(self, *args, &block)
   end
 end
diff --git a/core/src/main/ruby/jruby/set.rb b/core/src/main/ruby/jruby/kernel/set.rb
similarity index 100%
rename from core/src/main/ruby/jruby/set.rb
rename to core/src/main/ruby/jruby/kernel/set.rb
diff --git a/core/src/test/java/org/jruby/embed/ScriptingContainerClassLeakTest.java b/core/src/test/java/org/jruby/embed/ScriptingContainerClassLeakTest.java
new file mode 100644
index 00000000000..8aa32b5c452
--- /dev/null
+++ b/core/src/test/java/org/jruby/embed/ScriptingContainerClassLeakTest.java
@@ -0,0 +1,184 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2026 Charles O Nutter <headius@headius.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+package org.jruby.embed;
+
+import org.jruby.Ruby;
+import org.junit.Test;
+
+import java.lang.management.ManagementFactory;
+import java.lang.ref.WeakReference;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Regression test for https://github.com/jruby/jruby/issues/9092
+ * <p/>
+ * The basic tests here are:
+ *
+ * <ul>
+ *     <li>Main thread creates and terminates a ScriptingContainer and verifies the runtime is collected.</li>
+ *     <li>Child thread does the same.</li>
+ *     <li>Main thread creates and terminates down several containers and verifies minimmal loaded classes growth.</li>
+ * </ul>
+ *
+ * This test was generated by Copilot and justified with incorrect logic, but the basic tests
+ * are useful. This version was modified and cleaned up by headius.
+ */
+public class ScriptingContainerClassLeakTest {
+
+    /**
+     * Primary regression test for GH-9092.
+     *
+     * After the container is terminated (engine disposed), the Ruby runtime must
+     * be eligible for collection by a normal GC — not just when the JVM is under
+     * memory pressure.
+     *
+     * Without the fix: the calling thread's ThreadLocalMap retains
+     *   Entry.value = SoftRef&lt;ThreadContext&gt; → ThreadContext → Ruby
+     * so Ruby remains <em>softly reachable</em> and survives System.gc().
+     *
+     * With the fix: teardown() calls SoftReference.clear() on every tracked ref,
+     * breaking the chain; Ruby becomes only weakly reachable and is collected.
+     */
+    @Test
+    public void runtimeIsGCdAfterTeardown() throws InterruptedException {
+        // Create engine and dispose inside a helper method so that the
+        // ScriptingContainer is guaranteed out-of-scope when we check GC.
+        WeakReference<Ruby> ref = createEvalAndClose();
+        forceGC();
+        assertNull(
+                "Ruby runtime was not collected after terminate() (GH-9092). " +
+                        "The calling thread's ThreadLocalMap is holding a SoftReference to " +
+                        "the runtime's ThreadContext, keeping it alive across GC cycles.",
+                ref.get()
+        );
+    }
+
+    /**
+     * Secondary regression test, perform the same action in a non-main thread. Child thread still handles runtime
+     * tearDown.
+     *
+     * @throws InterruptedException
+     */
+    @Test
+    public void runtimeIsGCdAfterWorkerThreadTeardown() throws InterruptedException {
+        AtomicReference<WeakReference<Ruby>> refHolder = new AtomicReference<>();
+
+        Thread thread = new Thread(() -> refHolder.set(createEvalAndClose()));
+
+        thread.start();
+        thread.join();
+
+        WeakReference<Ruby> ref = refHolder.get();
+        forceGC();
+
+        assertNull(
+                "Ruby runtime created and terminated on a worker thread was not collected after terminate() (GH-9092).",
+                ref.get()
+        );
+    }
+
+    /**
+     * Create a container, eval something (so the calling thread's ThreadContext
+     * is registered via ThreadService.set()), then dispose it.  Returning only a
+     * WeakReference ensures the container itself is out-of-scope at the call site.
+     */
+    private static WeakReference<Ruby> createEvalAndClose() {
+        ScriptingContainer sc = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
+        // trigger runtime and thread initialization
+        sc.runScriptlet("nil");
+
+        var ref = new WeakReference<>(sc.getProvider().getRuntime());
+
+        // terminate container and ensure global runtime is also cleared
+        sc.terminate();
+        Ruby.clearGlobalRuntime();
+
+        return ref;
+    }
+
+    /**
+     * Check count of loaded classes after loading and terminating several runtimes.
+     *
+     * Generated by Copilot, modified by headius.
+     */
+    @Test
+    public void classCountDoesNotGrowUnboundedly() throws InterruptedException {
+        // Ensure all classes are loaded before we start counting.
+        for (int i = 0; i < 3; i++) createAndTearDown();
+        forceGC();
+
+        long classesBefore = ManagementFactory.getClassLoadingMXBean().getLoadedClassCount();
+
+        for (int i = 0; i < 20; i++) {
+            createAndTearDown();
+            forceGC();
+        }
+
+        long classesAfter = ManagementFactory.getClassLoadingMXBean().getLoadedClassCount();
+        long growth = classesAfter - classesBefore;
+
+        // Generous constant budget (lazy JDK internals etc.), but not per-cycle growth.
+        // Pre-fix behaviour was ~98 new classes per cycle * 10 = ~980.
+        assertTrue(
+                "Loaded class count grew by " + growth + " across 10 ScriptingContainer " +
+                        "cycles (max allowed: 200). Classloader leak detected (see GH-9092).",
+                growth <= 200
+        );
+    }
+
+    /**
+     * Create runtime, run some code, and tear down immediately without retaining any references.
+     */
+    private static void createAndTearDown() {
+        ScriptingContainer sc = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
+        try {
+            sc.runScriptlet("1 + 1");
+        } finally {
+            sc.terminate();
+            Ruby.clearGlobalRuntime();
+        }
+    }
+
+
+    @SuppressWarnings({"deprecation", "removal"})
+    private static void forceGC() throws InterruptedException {
+        // ScriptingContainer has finalize(), so two GC passes are needed:
+        // 1st: detects sc is unreachable → enqueues for finalization
+        // System.runFinalization(): runs sc.finalize() → sc now truly collectable
+        // 2nd: collects sc + LocalContext → Ruby loses its strong-ref path
+        // 3rd+: Ruby (with fix: weakly reachable) is collected
+        for (int i = 0; i < 5; i++) {
+            System.gc();
+            System.runFinalization();
+            Thread.sleep(100);
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java b/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
index 0f97767743f..4289410bf99 100644
--- a/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
+++ b/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
@@ -1793,28 +1793,6 @@ public void testIsRunRubyInProcess() {
         instance.terminate();
     }
 
-    /**
-     * Test of setRunRubyInProcess method, of class ScriptingContainer.
-     */
-    @Test
-    public void testSetRunRubyInProcess() {
-        logger1.info("setRunRubyInProcess");
-        boolean inprocess = false;
-        ScriptingContainer instance = new ScriptingContainer(LocalContextScope.THREADSAFE);
-        instance.setError(pstream);
-        instance.setOutput(pstream);
-        instance.setWriter(writer);
-        instance.setErrorWriter(writer);
-        instance.setRunRubyInProcess(inprocess);
-        assertEquals(inprocess, instance.isRunRubyInProcess());
-
-        inprocess = true;
-        instance.setRunRubyInProcess(inprocess);
-        assertEquals(inprocess, instance.isRunRubyInProcess());
-
-        instance.terminate();
-    }
-
     /**
      * Test of isObjectSpaceEnabled method, of class ScriptingContainer.
      */
diff --git a/core/src/test/java/org/jruby/embed/jsr223/JRubyEngineTest.java b/core/src/test/java/org/jruby/embed/jsr223/JRubyEngineTest.java
index 8a4c198300b..2b67b68d967 100644
--- a/core/src/test/java/org/jruby/embed/jsr223/JRubyEngineTest.java
+++ b/core/src/test/java/org/jruby/embed/jsr223/JRubyEngineTest.java
@@ -672,7 +672,7 @@ public void testInvokeFunctionWithJavaException() throws Exception {
         ScriptEngine instance = newScriptEngine();
         instance.eval("def trigger_npe\nraise java.lang.NullPointerException.new\nend");
         try {
-            ((Invocable) instance).invokeFunction("trigger_npe", null);
+            ((Invocable) instance).invokeFunction("trigger_npe");
             fail("Expected javax.script.ScriptException");
         } catch (javax.script.ScriptException sex) {
             // javax.script.ScriptException is expected
diff --git a/core/src/test/java/org/jruby/exceptions/TestRaiseException.java b/core/src/test/java/org/jruby/exceptions/TestRaiseException.java
index 4d4c1eb356a..cc6817a8a40 100644
--- a/core/src/test/java/org/jruby/exceptions/TestRaiseException.java
+++ b/core/src/test/java/org/jruby/exceptions/TestRaiseException.java
@@ -92,17 +92,6 @@ public void testFromWithBacktrace() {
         assertEquals( 0, ex.getException().getBacktraceElements().length );
     }
 
-    public void testFromLegacyOnlyPreRaisesOnce() {
-        final int count = context.runtime.getExceptionCount();
-
-        final IRubyObject ex = runtimeErrorClass(context).newInstance(context, Block.NULL_BLOCK);
-        RaiseException.from((RubyException) ex, RubyArray.newArrayLight(context.runtime));
-
-        assertEquals( count + 1, context.runtime.getExceptionCount() );
-
-        assertEquals( 0, ((RubyException) ex).getBacktraceElements().length );
-    }
-
     public void testFromJavaGeneratedBacktrace() {
         final int count = context.runtime.getBacktraceCount();
 
@@ -318,12 +307,12 @@ public void testRubyExceptionBacktraceIncludesJavaOrigin() {
 
         boolean hash_default = false;
         for ( Object element : trace ) {
-            if ( element.toString().contains("org.jruby.RubyHash.default")) {
+            if ( element.toString().contains("org.jruby.RubyHashLinkedBuckets.default")) {
                 if ( hash_default ) fail("duplicate " + element + " in : \n" + fullTrace);
                 hash_default = true;
             }
         }
-        assertTrue("missing org.jruby.RubyHash.default ... in : \n" + fullTrace, hash_default);
+        assertTrue("missing org.jruby.RubyHashLinkedBuckets.default ... in : \n" + fullTrace, hash_default);
     }
 
     public void testRubyExceptionUsingEmbedAdapter() {
diff --git a/core/src/test/java/org/jruby/javasupport/JavaEmbedUtilsTest.java b/core/src/test/java/org/jruby/javasupport/JavaEmbedUtilsTest.java
index 8d60d96fb95..6b6ad9c1dce 100644
--- a/core/src/test/java/org/jruby/javasupport/JavaEmbedUtilsTest.java
+++ b/core/src/test/java/org/jruby/javasupport/JavaEmbedUtilsTest.java
@@ -92,7 +92,7 @@ public void testAPIUsageTheNonGenericWay() { // before <T> generic signatures we
         assertEquals("barbarbar", javaStr);
 
         Object val = JavaEmbedUtils.rubyToJava(newEmptyArray(context));
-        assertEquals("org.jruby.RubyArray", val.getClass().getName());
+        assertEquals("org.jruby.RubyArrayNative", val.getClass().getName());
     }
 
     @Test
diff --git a/core/src/test/java/org/jruby/javasupport/test/RubyTestCase.java b/core/src/test/java/org/jruby/javasupport/test/RubyTestCase.java
index bd96ea4f3ae..7f2e47d0056 100644
--- a/core/src/test/java/org/jruby/javasupport/test/RubyTestCase.java
+++ b/core/src/test/java/org/jruby/javasupport/test/RubyTestCase.java
@@ -70,7 +70,7 @@ protected Ruby createRuby(URL url) throws IOException {
         String filePath = f.getAbsolutePath();
         Ruby runtime = Ruby.newInstance();
         initRuby(runtime);
-        RubyKernel.require(runtime.getTopSelf(), runtime.newString(filePath), null);
+        RubyKernel.require(runtime.getCurrentContext(), runtime.getTopSelf(), runtime.newString(filePath), null);
         f.delete();
         return runtime;
     }
diff --git a/core/src/test/java/org/jruby/test/TestRuby.java b/core/src/test/java/org/jruby/test/TestRuby.java
index dd7afb4167b..b0cf5042462 100644
--- a/core/src/test/java/org/jruby/test/TestRuby.java
+++ b/core/src/test/java/org/jruby/test/TestRuby.java
@@ -112,7 +112,6 @@ public void testNativeENVSettingWhenNativeIsDisabledGloballyButExplicitlyEnabled
     @SuppressWarnings("deprecation")
     public void testRequireCextNotAllowedWhenCextIsDisabledGlobally() throws Exception {
         RubyInstanceConfig cfg = new RubyInstanceConfig();
-        cfg.setCextEnabled(false);
         var runtime = Ruby.newInstance(cfg);
         
         String extensionSuffix;
diff --git a/core/src/test/java/org/jruby/test/TestRubyHash.java b/core/src/test/java/org/jruby/test/TestRubyHash.java
index aadf078b118..0515ec80d97 100644
--- a/core/src/test/java/org/jruby/test/TestRubyHash.java
+++ b/core/src/test/java/org/jruby/test/TestRubyHash.java
@@ -34,6 +34,8 @@
 
 import org.jruby.Ruby;
 import org.jruby.RubyHash;
+import org.jruby.RubyHashLinkedBuckets;
+import org.jruby.api.Create;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
@@ -185,7 +187,7 @@ public void testRestructuring() throws Exception {
     }
     
     public void testGet() {
-        RubyHash rubyHash = new RubyHash(Ruby.getGlobalRuntime());
+        RubyHash rubyHash = Create.newHash(Ruby.getGlobalRuntime().getCurrentContext());
         assertEquals(null, rubyHash.get("Non matching key"));
     }
 
diff --git a/default.build.properties b/default.build.properties
index c1fcea1fb6c..110dc39d37b 100644
--- a/default.build.properties
+++ b/default.build.properties
@@ -28,7 +28,7 @@ rake.args=
 install4j.executable=/Applications/install4j9/bin/install4jc
 
 # Ruby versions
-version.ruby=3.4.5
-version.ruby.major=3.4
-version.ruby.minor=5
+version.ruby=4.0.0
+version.ruby.major=4.0
+version.ruby.minor=0
 
diff --git a/install/jruby.install4j b/install/jruby.install4j
index c7247f990c5..af06bcb138e 100644
--- a/install/jruby.install4j
+++ b/install/jruby.install4j
@@ -83,6 +83,7 @@
           <entry location="lib/jni/i386-FreeBSD" />
           <entry location="lib/jni/i386-OpenBSD" />
           <entry location="lib/jni/loongarch64-Linux" />
+          <entry location="lib/jni/riscv64-Linux" />
           <entry location="lib/jni/ppc-AIX" />
           <entry location="lib/jni/ppc64-Linux" />
           <entry location="lib/jni/ppc64le-Linux" />
@@ -108,6 +109,7 @@
           <entry location="lib/jni/i386-SunOS" />
           <entry location="lib/jni/i386-Windows" />
           <entry location="lib/jni/loongarch64-Linux" />
+          <entry location="lib/jni/riscv64-Linux" />
           <entry location="lib/jni/ppc64-Linux" />
           <entry location="lib/jni/ppc64le-Linux" />
           <entry location="lib/jni/ppc-AIX" />
diff --git a/ivy/build.xml b/ivy/build.xml
deleted file mode 100644
index 10142598558..00000000000
--- a/ivy/build.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<project xmlns:ivy="antlib:org.apache.ivy.ant">
-
-  <property name="ivy.install.version" value="2.0.0" />
-  <property name="ivy.jar.dir" value="${user.home}/.ivy2" />
-  <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar" />
-  <property name="jsch.install.version" value="0.1.29" />
-  <property name="jsch.jar.file" value="${ivy.jar.dir}/jsch-${jsch.install.version}.jar" />
-  
-  <!--
-    download ivy from the web site so that it can be used without being
-    installed. if the file has already been downloaded, we use a rename
-    trick to avoid hitting the website again. (that would be annoying
-    when building offline.)
-  -->
-  <target name="download-ivy" unless="skip.download">
-    <mkdir dir="${ivy.jar.dir}" />
-    <condition property="ivy.url" value="file:${ivy.jar.file}">
-      <available file="${ivy.jar.file}" />
-    </condition>
-    <property name="ivy.url" value="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" />
-    <get src="${ivy.url}" dest="${ivy.jar.file}.download" usetimestamp="true" />
-    <move file="${ivy.jar.file}.download" tofile="${ivy.jar.file}" />
-    
-    <condition property="jsch.url" value="file:${jsch.jar.file}">
-      <available file="${jsch.jar.file}" />
-    </condition>
-    <property name="jsch.url" value="http://repo1.maven.org/maven2/jsch/jsch/${jsch.install.version}/jsch-${jsch.install.version}.jar" />
-    <get src="${jsch.url}" dest="${jsch.jar.file}.download" usetimestamp="true" />
-    <move file="${jsch.jar.file}.download" tofile="${jsch.jar.file}" />
-  </target>
-  
-  <!-- import ivy's ant tasks -->
-  <target name="install-ivy" depends="download-ivy">
-    <path id="ivy.lib.path">
-      <fileset dir="${ivy.jar.dir}" includes="ivy-${ivy.install.version}.jar" />
-    </path>
-    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" />
-  </target>
-  
-  <!-- where to look for the ivy config -->
-  <property name="ivy.dep.file" value="${basedir}/ivy/ivy.xml" />
-  <property name="ivy.settings.file" value="${basedir}/ivy/ivysettings.xml" />
-  
-  <target name="findbugs" depends="install-ivy" description="Run Findbugs on JRuby source">
-    
-    <!-- 
-	 TODO move this out into a target that can be dependended on, and introduce code coverage, 
-         cyclomatic complexity and any other metrics that you want to include. 
-    -->
-    <ivy:resolve conf="check" />
-    <ivy:cachepath pathid="check.path" conf="check" />
-
-    <taskdef name="findbugs" classpathref="check.path" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
-            
-    <findbugs classpathref="check.path" pluginList="" output="html" outputfile="${basedir}/jruby-findbugs.html" 
-              excludefilter="${basedir}/findbugs.xml" jvmargs="-Xmx1024M">
-      <sourcepath path="${basedir}/source" />
-      <class location="${jruby.classes.dir}" />
-      <auxclasspath>
-	<path refid="build.classpath" />
-      </auxclasspath>
-    </findbugs>
-  </target>
-
-</project>
diff --git a/ivy/ivy.xml b/ivy/ivy.xml
deleted file mode 100644
index 8c1969adcfe..00000000000
--- a/ivy/ivy.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<ivy-module version="2.0">
-  <info organisation="org.jruby" module="jruby" revision="1.7.19" />
-  <configurations>
-    <conf name="default" description="normal build" />
-    <conf name="test" visibility="private" description="build and run tests" />
-    <conf name="check" visibility="private" description="run analysis tools on the source" />
-  </configurations>
-  <publications>
-    <artifact />
-    <artifact name="jruby-sources" />
-  </publications>
-  <dependencies>
-    <dependency org="com.google.code.findbugs" name="findbugs" rev="1.3.9" conf="check->*" />
-  </dependencies>
-</ivy-module>
diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
deleted file mode 100644
index da6549ee684..00000000000
--- a/ivy/ivysettings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ivysettings>
-  <settings defaultResolver="chain-repos" />
-  <resolvers>
-    <chain name="chain-repos">
-      <!-- Disable consistency checking due to invalid poms for Findbugs -->
-      <ibiblio name="maven2" m2compatible="true" checkconsistency="false" />
-    </chain>
-    <filesystem name="local" m2compatible="true" transactional="false">
-      <artifact pattern="${basedir}/dist/repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-    </filesystem>
-  </resolvers>
-</ivysettings>
diff --git a/lib/pom.rb b/lib/pom.rb
index fd05c9f02f4..784f84cfcb1 100644
--- a/lib/pom.rb
+++ b/lib/pom.rb
@@ -21,113 +21,113 @@ def log(message = nil)
 default_gems = [
   # treat RGs update special:
   # - we do not want bin/update_rubygems or bin/gem overrides
-  ['rubygems-update', '3.7.2', { bin: false, require_paths: ['lib'] }],
-  ['benchmark', '0.4.0'],
-  ['bundler', '2.7.2'],
-  ['cgi', '0.4.2'],
+  ['rubygems-update', '4.0.3', { bin: false, require_paths: ['lib'] }],
+  ['bundler', '4.0.3'],
   # Currently using a stub gem for JRuby until we can incorporate our code.
   # https://github.com/ruby/date/issues/48
-  ['date', '3.4.1'],
-  ['delegate', '0.4.0'],
+  ['date', '3.5.1'],
+  ['delegate', '0.6.1'],
   ['did_you_mean', '2.0.0'],
-  ['digest', '3.2.0'],
-  ['english', '0.8.0'],
+  ['digest', '3.2.1'],
+  ['english', '0.8.1'],
   # Ongoing discussion about the -java gem, since it just omits the ext: https://github.com/ruby/erb/issues/52
-  ['erb', '4.0.4'],
-  ['error_highlight', '0.7.0'],
+  ['erb', '6.0.1.1'],
+  ['error_highlight', '0.7.1'],
   # https://github.com/ruby/etc/issues/19
-  # ['etc', '1.4.5'],
+  # ['etc', '1.4.6'],
   # https://github.com/ruby/fcntl/issues/9
-  # ['fcntl', '1.2.0'],
+  # ['fcntl', '1.3.0'],
   ['ffi', '1.17.0'],
-  ['fiddle', '1.1.6'],
-  ['fileutils', '1.7.3'],
+  # Temporarily moved back to default gems, see https://github.com/jruby/jruby/issues/9278
+  ['fiddle', '1.1.8'],
+  ['fileutils', '1.8.0'],
   ['find', '0.2.0'],
-  ['forwardable', '1.3.3'],
-  ['io-console', '0.8.1'],
+  ['forwardable', '1.4.0'],
+  ['io-console', '0.8.2'],
   # https://github.com/ruby/io-nonblock/issues/4
-  # ['io-nonblock', '0.3.1'],
-  ['io-wait', '0.3.2'],
-  ['ipaddr', '1.2.7'],
-  ['irb', '1.14.3'],
-  ['jar-dependencies', '0.5.4'],
+  # ['io-nonblock', '0.3.2'],
+  ['io-wait', '0.4.0'],
+  ['ipaddr', '1.2.8'],
+  ['jar-dependencies', '0.5.7'],
   ['jruby-readline', '1.3.7'],
-  ['jruby-openssl', '0.15.5'],
-  ['json', '2.16.0'],
-  ['logger', '1.6.4'],
-  ['net-http', '0.6.0'],
+  ['jruby-openssl', '0.16.0'],
+  ['json', '2.18.0'],
+  ['net-http', '0.9.1'],
   ['net-protocol', '0.2.2'],
   ['open-uri', '0.5.0'],
   ['open3', '0.2.1'],
   # https://github.com/ruby/openssl/issues/20#issuecomment-1022872855
-  # ['openssl', '3.2.0'],
-  ['optparse', '0.6.0'],
-  ['ostruct', '0.6.1'],
+  # ['openssl', '4.0.0'],
+  ['optparse', '0.8.1'],
   # https://github.com/ruby/pathname/issues/17
   # ['pathname', '0.4.0'],
-  ['pp', '0.6.2'],
+  ['pp', '0.6.3'],
   ['prettyprint', '0.2.0'],
   # Not ready to ship in the box yet (native dependencies)
-  # ['prism', '1.2.0'],
-  ['pstore', '0.1.4'],
-  ['psych', '5.2.3'],
+  # ['prism', '1.6.0'],
+  ['psych', '5.3.1'],
   ['rake-ant', '1.0.6'],
-  ['rdoc', '6.14.0'],
-  ['reline', '0.6.0'],
-  ['resolv', '0.6.3'],
+  ['resolv', '0.7.0'],
   ['ruby2_keywords', '0.0.5'],
   ['securerandom', '0.4.1'],
   ['shellwords', '0.2.2'],
   ['singleton', '0.3.0'],
-  ['stringio', '3.1.9'],
-  ['strscan', '3.1.5'],
+  ['stringio', '3.2.0'],
+  ['strscan', '3.1.6'],
   ['subspawn', '0.1.1'], # has 3 transitive deps:
   ['subspawn-posix', '0.1.1'],
   ['ffi-binary-libfixposix', '0.5.1.1'],
   ['ffi-bindings-libfixposix', '0.5.1.0'],
   ['syntax_suggest', '2.0.2'],
   ['tempfile', '0.3.1'],
-  ['time', '0.4.1'],
-  ['timeout', '0.4.3'],
+  ['time', '0.4.2'],
+  ['timeout', '0.6.0'],
   # https://github.com/ruby/tmpdir/issues/13
   # ['tmpdir', '0.3.1'],
   ['tsort', '0.2.0'],
   ['un', '0.3.0'],
-  ['uri', '1.0.3'],
-  ['weakref', '0.1.3'],
+  ['uri', '1.1.1'],
+  ['weakref', '0.1.4'],
+  ['win32-registry', '0.1.1'],
   # https://github.com/ruby/win32ole/issues/12
   # ['win32ole', '1.9.0'],
   ['yaml', '0.4.0']
   # https://github.com/ruby/zlib/issues/38
-  # ['zlib', '3.2.1'],
+  # ['zlib', '3.2.2'],
 ]
 
 bundled_gems = [
   ['abbrev', '0.1.2'],
-  ['base64', '0.2.0'],
+  ['base64', '0.3.0'],
+  ['benchmark', '0.5.0'],
   # Extension still lives in JRuby. See https://github.com/ruby/bigdecimal/issues/268
-  ['bigdecimal', '3.1.9'],
-  ['csv', '3.3.2'],
+  ['bigdecimal', '4.0.1'],
+  ['csv', '3.3.5'],
   # Newer versions require deep control over CRuby internals, needs work to support JRuby.
-  # ['debug', '1.10.0'],
+  # ['debug', '1.11.1'],
   ['debug', '0.2.1'],
-  ['drb', '2.2.1'],
+  ['drb', '2.2.3'],
   ['getoptlong', '0.2.1'],
-  ['matrix', '0.4.2'],
-  ['minitest', '5.25.4'],
+  ['irb', '1.16.0'],
+  ['logger', '1.7.0'],
+  ['matrix', '0.4.3'],
+  ['minitest', '6.0.0'],
   ['mutex_m', '0.3.0'],
-  ['net-ftp', '0.3.8'],
-  ['net-imap', '0.5.8'],
+  ['net-ftp', '0.3.9'],
+  ['net-imap', '0.6.2'],
   ['net-pop', '0.1.2'],
   ['net-smtp', '0.5.1'],
   ['nkf', '0.2.0'],
   ['observer', '0.1.2'],
-  ['power_assert', '2.0.5'],
-  ['prime', '0.1.3'],
+  ['ostruct', '0.6.3'],
+  ['power_assert', '3.0.1'],
+  ['prime', '0.1.4'],
+  ['pstore', '0.2.0'],
   ['racc', '1.8.1'],
   ['rake', '${rake.version}'],
   # Depends on many CRuby internals
-  # ['rbs', '3.8.0'],
+  # ['rbs', '3.10.0'],
+  ['rdoc', '7.0.3'],
   # Ext removed from CRuby in 3.3, equivalent for us would be to remove jruby-readline but unknown implications.
   # The gem below just attempts to load the extension, and failing that loads reline. Our current readline.rb in
   # jruby-readline does largely the same, but it finds the extension and does not load reline.
@@ -135,16 +135,17 @@ def log(message = nil)
   # ['readline', '0.0.4'],
   # Will be solved with readline
   # ['readline-ext', '0.2.0'],
+  ['reline', '0.6.3'],
   # Depends on prism gem with native ext
-  # ['repl_type_completer', '0.1.1'],
+  # ['repl_type_completer', '0.1.12'],
   ['resolv-replace', '0.1.1'],
   ['rexml', '3.4.4'],
   ['rinda', '0.2.0'],
-  ['rss', '0.3.1'],
+  ['rss', '0.3.2'],
   ['syslog', '0.4.0'],
-  ['test-unit', '3.6.7']
+  ['test-unit', '3.7.5']
   # Depends on many CRuby internals
-  # ['typeprof', '0.30.1'],
+  # ['typeprof', '0.31.1'],
 ]
 
 project 'JRuby Lib Setup' do
@@ -207,15 +208,15 @@ def log(message = nil)
     execute_goal 'copy-dependencies', phase: 'generate-resources'
   end
 
+  # force platform to match build JRuby
+  Gem.set_target_rbconfig(File.join(File.dirname(__FILE__), "ruby/stdlib/jruby/build/rbconfig.rb"))
+  Gem.instance_variable_set :@ruby_api_version, Gem.target_rbconfig['ruby_version']
+
   execute :install_gems, :initialize do |ctx|
     require 'fileutils'
 
     log "using jruby #{JRUBY_VERSION}"
 
-    # force platform to match build JRuby
-    Gem.set_target_rbconfig(File.join(File.dirname(__FILE__), "ruby/stdlib/jruby/build/rbconfig.rb"))
-    Gem.instance_variable_set :@ruby_api_version, Gem.target_rbconfig['ruby_version']
-
     target = ctx.project.build.directory.to_pathname
     gem_home = File.join(target, 'rubygems')
     gems = File.join(gem_home, 'gems')
@@ -437,7 +438,8 @@ def installer.ensure_required_ruby_version_met; end
         'specifications/default/*',
         *all_gems.map { |name, version| "specifications/#{name}-#{version}*" },
         *all_gems.map { |name, version| "gems/#{name}-#{version}*/**/*" },
-        *all_gems.map { |name, version| "cache/#{name}-#{version}*" }
+        *all_gems.map { |name, version| "cache/#{name}-#{version}*" },
+        *all_gems.map { |name, version| "extensions/universal-java/#{Gem.target_rbconfig['ruby_version']}/#{name}-#{version}/*" }
       ]
       target_path '${jruby.complete.gems}'
     end
diff --git a/lib/pom.xml b/lib/pom.xml
index af312496698..d4ac208f5c7 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>10.1.0.0-SNAPSHOT</version>
+    <version>10.1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
   <name>JRuby Lib Setup</name>
@@ -28,26 +28,13 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>10.1.0.0-SNAPSHOT</version>
+      <version>10.1.1.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rubygems-update</artifactId>
-      <version>3.7.2</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>benchmark</artifactId>
-      <version>0.4.0</version>
+      <version>4.0.3</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -60,20 +47,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>bundler</artifactId>
-      <version>2.7.2</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>cgi</artifactId>
-      <version>0.4.2</version>
+      <version>4.0.3</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -86,7 +60,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>date</artifactId>
-      <version>3.4.1</version>
+      <version>3.5.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -99,7 +73,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>delegate</artifactId>
-      <version>0.4.0</version>
+      <version>0.6.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -125,7 +99,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>digest</artifactId>
-      <version>3.2.0</version>
+      <version>3.2.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -138,7 +112,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>english</artifactId>
-      <version>0.8.0</version>
+      <version>0.8.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -151,7 +125,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>erb</artifactId>
-      <version>4.0.4</version>
+      <version>6.0.1.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -164,7 +138,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>error_highlight</artifactId>
-      <version>0.7.0</version>
+      <version>0.7.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -190,7 +164,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>fiddle</artifactId>
-      <version>1.1.6</version>
+      <version>1.1.8</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -203,7 +177,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>fileutils</artifactId>
-      <version>1.7.3</version>
+      <version>1.8.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -229,7 +203,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>forwardable</artifactId>
-      <version>1.3.3</version>
+      <version>1.4.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -242,7 +216,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>io-console</artifactId>
-      <version>0.8.1</version>
+      <version>0.8.2</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -255,7 +229,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>io-wait</artifactId>
-      <version>0.3.2</version>
+      <version>0.4.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -268,20 +242,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>ipaddr</artifactId>
-      <version>1.2.7</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>irb</artifactId>
-      <version>1.14.3</version>
+      <version>1.2.8</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -294,7 +255,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>0.5.4</version>
+      <version>0.5.7</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -320,7 +281,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>
-      <version>0.15.5</version>
+      <version>0.16.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -333,20 +294,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>json</artifactId>
-      <version>2.16.0</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>logger</artifactId>
-      <version>1.6.4</version>
+      <version>2.18.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -359,7 +307,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>net-http</artifactId>
-      <version>0.6.0</version>
+      <version>0.9.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -411,20 +359,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>optparse</artifactId>
-      <version>0.6.0</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>ostruct</artifactId>
-      <version>0.6.1</version>
+      <version>0.8.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -437,7 +372,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>pp</artifactId>
-      <version>0.6.2</version>
+      <version>0.6.3</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -460,23 +395,10 @@ DO NOT MODIFY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>pstore</artifactId>
-      <version>0.1.4</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>psych</artifactId>
-      <version>5.2.3</version>
+      <version>5.3.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -499,36 +421,10 @@ DO NOT MODIFY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>rdoc</artifactId>
-      <version>6.14.0</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>reline</artifactId>
-      <version>0.6.0</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>resolv</artifactId>
-      <version>0.6.3</version>
+      <version>0.7.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -593,7 +489,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>stringio</artifactId>
-      <version>3.1.9</version>
+      <version>3.2.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -606,7 +502,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>strscan</artifactId>
-      <version>3.1.5</version>
+      <version>3.1.6</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -697,7 +593,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>time</artifactId>
-      <version>0.4.1</version>
+      <version>0.4.2</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -710,7 +606,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>timeout</artifactId>
-      <version>0.4.3</version>
+      <version>0.6.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -749,7 +645,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>uri</artifactId>
-      <version>1.0.3</version>
+      <version>1.1.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -762,7 +658,20 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>weakref</artifactId>
-      <version>0.1.3</version>
+      <version>0.1.4</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>win32-registry</artifactId>
+      <version>0.1.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -801,7 +710,20 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>base64</artifactId>
-      <version>0.2.0</version>
+      <version>0.3.0</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>benchmark</artifactId>
+      <version>0.5.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -814,7 +736,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>bigdecimal</artifactId>
-      <version>3.1.9</version>
+      <version>4.0.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -827,7 +749,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>csv</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.5</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -853,7 +775,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>drb</artifactId>
-      <version>2.2.1</version>
+      <version>2.2.3</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -876,10 +798,36 @@ DO NOT MODIFY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>irb</artifactId>
+      <version>1.16.0</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>logger</artifactId>
+      <version>1.7.0</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>matrix</artifactId>
-      <version>0.4.2</version>
+      <version>0.4.3</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -892,7 +840,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>minitest</artifactId>
-      <version>5.25.4</version>
+      <version>6.0.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -918,7 +866,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>net-ftp</artifactId>
-      <version>0.3.8</version>
+      <version>0.3.9</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -931,7 +879,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>net-imap</artifactId>
-      <version>0.5.8</version>
+      <version>0.6.2</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -993,10 +941,23 @@ DO NOT MODIFY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>ostruct</artifactId>
+      <version>0.6.3</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>power_assert</artifactId>
-      <version>2.0.5</version>
+      <version>3.0.1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -1009,7 +970,20 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>prime</artifactId>
-      <version>0.1.3</version>
+      <version>0.1.4</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>pstore</artifactId>
+      <version>0.2.0</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -1045,6 +1019,32 @@ DO NOT MODIFY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>rdoc</artifactId>
+      <version>7.0.3</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>reline</artifactId>
+      <version>0.6.3</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>resolv-replace</artifactId>
@@ -1087,7 +1087,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rss</artifactId>
-      <version>0.3.1</version>
+      <version>0.3.2</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -1113,7 +1113,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>test-unit</artifactId>
-      <version>3.6.7</version>
+      <version>3.7.5</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -1144,258 +1144,342 @@ DO NOT MODIFY - GENERATED CODE
         <directory>${gem.home}</directory>
         <includes>
           <include>specifications/default/*</include>
-          <include>specifications/rubygems-update-3.7.2*</include>
-          <include>specifications/benchmark-0.4.0*</include>
-          <include>specifications/bundler-2.7.2*</include>
-          <include>specifications/cgi-0.4.2*</include>
-          <include>specifications/date-3.4.1*</include>
-          <include>specifications/delegate-0.4.0*</include>
+          <include>specifications/rubygems-update-4.0.3*</include>
+          <include>specifications/bundler-4.0.3*</include>
+          <include>specifications/date-3.5.1*</include>
+          <include>specifications/delegate-0.6.1*</include>
           <include>specifications/did_you_mean-2.0.0*</include>
-          <include>specifications/digest-3.2.0*</include>
-          <include>specifications/english-0.8.0*</include>
-          <include>specifications/erb-4.0.4*</include>
-          <include>specifications/error_highlight-0.7.0*</include>
+          <include>specifications/digest-3.2.1*</include>
+          <include>specifications/english-0.8.1*</include>
+          <include>specifications/erb-6.0.1.1*</include>
+          <include>specifications/error_highlight-0.7.1*</include>
           <include>specifications/ffi-1.17.0*</include>
-          <include>specifications/fiddle-1.1.6*</include>
-          <include>specifications/fileutils-1.7.3*</include>
+          <include>specifications/fiddle-1.1.8*</include>
+          <include>specifications/fileutils-1.8.0*</include>
           <include>specifications/find-0.2.0*</include>
-          <include>specifications/forwardable-1.3.3*</include>
-          <include>specifications/io-console-0.8.1*</include>
-          <include>specifications/io-wait-0.3.2*</include>
-          <include>specifications/ipaddr-1.2.7*</include>
-          <include>specifications/irb-1.14.3*</include>
-          <include>specifications/jar-dependencies-0.5.4*</include>
+          <include>specifications/forwardable-1.4.0*</include>
+          <include>specifications/io-console-0.8.2*</include>
+          <include>specifications/io-wait-0.4.0*</include>
+          <include>specifications/ipaddr-1.2.8*</include>
+          <include>specifications/jar-dependencies-0.5.7*</include>
           <include>specifications/jruby-readline-1.3.7*</include>
-          <include>specifications/jruby-openssl-0.15.5*</include>
-          <include>specifications/json-2.16.0*</include>
-          <include>specifications/logger-1.6.4*</include>
-          <include>specifications/net-http-0.6.0*</include>
+          <include>specifications/jruby-openssl-0.16.0*</include>
+          <include>specifications/json-2.18.0*</include>
+          <include>specifications/net-http-0.9.1*</include>
           <include>specifications/net-protocol-0.2.2*</include>
           <include>specifications/open-uri-0.5.0*</include>
           <include>specifications/open3-0.2.1*</include>
-          <include>specifications/optparse-0.6.0*</include>
-          <include>specifications/ostruct-0.6.1*</include>
-          <include>specifications/pp-0.6.2*</include>
+          <include>specifications/optparse-0.8.1*</include>
+          <include>specifications/pp-0.6.3*</include>
           <include>specifications/prettyprint-0.2.0*</include>
-          <include>specifications/pstore-0.1.4*</include>
-          <include>specifications/psych-5.2.3*</include>
+          <include>specifications/psych-5.3.1*</include>
           <include>specifications/rake-ant-1.0.6*</include>
-          <include>specifications/rdoc-6.14.0*</include>
-          <include>specifications/reline-0.6.0*</include>
-          <include>specifications/resolv-0.6.3*</include>
+          <include>specifications/resolv-0.7.0*</include>
           <include>specifications/ruby2_keywords-0.0.5*</include>
           <include>specifications/securerandom-0.4.1*</include>
           <include>specifications/shellwords-0.2.2*</include>
           <include>specifications/singleton-0.3.0*</include>
-          <include>specifications/stringio-3.1.9*</include>
-          <include>specifications/strscan-3.1.5*</include>
+          <include>specifications/stringio-3.2.0*</include>
+          <include>specifications/strscan-3.1.6*</include>
           <include>specifications/subspawn-0.1.1*</include>
           <include>specifications/subspawn-posix-0.1.1*</include>
           <include>specifications/ffi-binary-libfixposix-0.5.1.1*</include>
           <include>specifications/ffi-bindings-libfixposix-0.5.1.0*</include>
           <include>specifications/syntax_suggest-2.0.2*</include>
           <include>specifications/tempfile-0.3.1*</include>
-          <include>specifications/time-0.4.1*</include>
-          <include>specifications/timeout-0.4.3*</include>
+          <include>specifications/time-0.4.2*</include>
+          <include>specifications/timeout-0.6.0*</include>
           <include>specifications/tsort-0.2.0*</include>
           <include>specifications/un-0.3.0*</include>
-          <include>specifications/uri-1.0.3*</include>
-          <include>specifications/weakref-0.1.3*</include>
+          <include>specifications/uri-1.1.1*</include>
+          <include>specifications/weakref-0.1.4*</include>
+          <include>specifications/win32-registry-0.1.1*</include>
           <include>specifications/yaml-0.4.0*</include>
           <include>specifications/abbrev-0.1.2*</include>
-          <include>specifications/base64-0.2.0*</include>
-          <include>specifications/bigdecimal-3.1.9*</include>
-          <include>specifications/csv-3.3.2*</include>
+          <include>specifications/base64-0.3.0*</include>
+          <include>specifications/benchmark-0.5.0*</include>
+          <include>specifications/bigdecimal-4.0.1*</include>
+          <include>specifications/csv-3.3.5*</include>
           <include>specifications/debug-0.2.1*</include>
-          <include>specifications/drb-2.2.1*</include>
+          <include>specifications/drb-2.2.3*</include>
           <include>specifications/getoptlong-0.2.1*</include>
-          <include>specifications/matrix-0.4.2*</include>
-          <include>specifications/minitest-5.25.4*</include>
+          <include>specifications/irb-1.16.0*</include>
+          <include>specifications/logger-1.7.0*</include>
+          <include>specifications/matrix-0.4.3*</include>
+          <include>specifications/minitest-6.0.0*</include>
           <include>specifications/mutex_m-0.3.0*</include>
-          <include>specifications/net-ftp-0.3.8*</include>
-          <include>specifications/net-imap-0.5.8*</include>
+          <include>specifications/net-ftp-0.3.9*</include>
+          <include>specifications/net-imap-0.6.2*</include>
           <include>specifications/net-pop-0.1.2*</include>
           <include>specifications/net-smtp-0.5.1*</include>
           <include>specifications/nkf-0.2.0*</include>
           <include>specifications/observer-0.1.2*</include>
-          <include>specifications/power_assert-2.0.5*</include>
-          <include>specifications/prime-0.1.3*</include>
+          <include>specifications/ostruct-0.6.3*</include>
+          <include>specifications/power_assert-3.0.1*</include>
+          <include>specifications/prime-0.1.4*</include>
+          <include>specifications/pstore-0.2.0*</include>
           <include>specifications/racc-1.8.1*</include>
           <include>specifications/rake-${rake.version}*</include>
+          <include>specifications/rdoc-7.0.3*</include>
+          <include>specifications/reline-0.6.3*</include>
           <include>specifications/resolv-replace-0.1.1*</include>
           <include>specifications/rexml-3.4.4*</include>
           <include>specifications/rinda-0.2.0*</include>
-          <include>specifications/rss-0.3.1*</include>
+          <include>specifications/rss-0.3.2*</include>
           <include>specifications/syslog-0.4.0*</include>
-          <include>specifications/test-unit-3.6.7*</include>
-          <include>gems/rubygems-update-3.7.2*/**/*</include>
-          <include>gems/benchmark-0.4.0*/**/*</include>
-          <include>gems/bundler-2.7.2*/**/*</include>
-          <include>gems/cgi-0.4.2*/**/*</include>
-          <include>gems/date-3.4.1*/**/*</include>
-          <include>gems/delegate-0.4.0*/**/*</include>
+          <include>specifications/test-unit-3.7.5*</include>
+          <include>gems/rubygems-update-4.0.3*/**/*</include>
+          <include>gems/bundler-4.0.3*/**/*</include>
+          <include>gems/date-3.5.1*/**/*</include>
+          <include>gems/delegate-0.6.1*/**/*</include>
           <include>gems/did_you_mean-2.0.0*/**/*</include>
-          <include>gems/digest-3.2.0*/**/*</include>
-          <include>gems/english-0.8.0*/**/*</include>
-          <include>gems/erb-4.0.4*/**/*</include>
-          <include>gems/error_highlight-0.7.0*/**/*</include>
+          <include>gems/digest-3.2.1*/**/*</include>
+          <include>gems/english-0.8.1*/**/*</include>
+          <include>gems/erb-6.0.1.1*/**/*</include>
+          <include>gems/error_highlight-0.7.1*/**/*</include>
           <include>gems/ffi-1.17.0*/**/*</include>
-          <include>gems/fiddle-1.1.6*/**/*</include>
-          <include>gems/fileutils-1.7.3*/**/*</include>
+          <include>gems/fiddle-1.1.8*/**/*</include>
+          <include>gems/fileutils-1.8.0*/**/*</include>
           <include>gems/find-0.2.0*/**/*</include>
-          <include>gems/forwardable-1.3.3*/**/*</include>
-          <include>gems/io-console-0.8.1*/**/*</include>
-          <include>gems/io-wait-0.3.2*/**/*</include>
-          <include>gems/ipaddr-1.2.7*/**/*</include>
-          <include>gems/irb-1.14.3*/**/*</include>
-          <include>gems/jar-dependencies-0.5.4*/**/*</include>
+          <include>gems/forwardable-1.4.0*/**/*</include>
+          <include>gems/io-console-0.8.2*/**/*</include>
+          <include>gems/io-wait-0.4.0*/**/*</include>
+          <include>gems/ipaddr-1.2.8*/**/*</include>
+          <include>gems/jar-dependencies-0.5.7*/**/*</include>
           <include>gems/jruby-readline-1.3.7*/**/*</include>
-          <include>gems/jruby-openssl-0.15.5*/**/*</include>
-          <include>gems/json-2.16.0*/**/*</include>
-          <include>gems/logger-1.6.4*/**/*</include>
-          <include>gems/net-http-0.6.0*/**/*</include>
+          <include>gems/jruby-openssl-0.16.0*/**/*</include>
+          <include>gems/json-2.18.0*/**/*</include>
+          <include>gems/net-http-0.9.1*/**/*</include>
           <include>gems/net-protocol-0.2.2*/**/*</include>
           <include>gems/open-uri-0.5.0*/**/*</include>
           <include>gems/open3-0.2.1*/**/*</include>
-          <include>gems/optparse-0.6.0*/**/*</include>
-          <include>gems/ostruct-0.6.1*/**/*</include>
-          <include>gems/pp-0.6.2*/**/*</include>
+          <include>gems/optparse-0.8.1*/**/*</include>
+          <include>gems/pp-0.6.3*/**/*</include>
           <include>gems/prettyprint-0.2.0*/**/*</include>
-          <include>gems/pstore-0.1.4*/**/*</include>
-          <include>gems/psych-5.2.3*/**/*</include>
+          <include>gems/psych-5.3.1*/**/*</include>
           <include>gems/rake-ant-1.0.6*/**/*</include>
-          <include>gems/rdoc-6.14.0*/**/*</include>
-          <include>gems/reline-0.6.0*/**/*</include>
-          <include>gems/resolv-0.6.3*/**/*</include>
+          <include>gems/resolv-0.7.0*/**/*</include>
           <include>gems/ruby2_keywords-0.0.5*/**/*</include>
           <include>gems/securerandom-0.4.1*/**/*</include>
           <include>gems/shellwords-0.2.2*/**/*</include>
           <include>gems/singleton-0.3.0*/**/*</include>
-          <include>gems/stringio-3.1.9*/**/*</include>
-          <include>gems/strscan-3.1.5*/**/*</include>
+          <include>gems/stringio-3.2.0*/**/*</include>
+          <include>gems/strscan-3.1.6*/**/*</include>
           <include>gems/subspawn-0.1.1*/**/*</include>
           <include>gems/subspawn-posix-0.1.1*/**/*</include>
           <include>gems/ffi-binary-libfixposix-0.5.1.1*/**/*</include>
           <include>gems/ffi-bindings-libfixposix-0.5.1.0*/**/*</include>
           <include>gems/syntax_suggest-2.0.2*/**/*</include>
           <include>gems/tempfile-0.3.1*/**/*</include>
-          <include>gems/time-0.4.1*/**/*</include>
-          <include>gems/timeout-0.4.3*/**/*</include>
+          <include>gems/time-0.4.2*/**/*</include>
+          <include>gems/timeout-0.6.0*/**/*</include>
           <include>gems/tsort-0.2.0*/**/*</include>
           <include>gems/un-0.3.0*/**/*</include>
-          <include>gems/uri-1.0.3*/**/*</include>
-          <include>gems/weakref-0.1.3*/**/*</include>
+          <include>gems/uri-1.1.1*/**/*</include>
+          <include>gems/weakref-0.1.4*/**/*</include>
+          <include>gems/win32-registry-0.1.1*/**/*</include>
           <include>gems/yaml-0.4.0*/**/*</include>
           <include>gems/abbrev-0.1.2*/**/*</include>
-          <include>gems/base64-0.2.0*/**/*</include>
-          <include>gems/bigdecimal-3.1.9*/**/*</include>
-          <include>gems/csv-3.3.2*/**/*</include>
+          <include>gems/base64-0.3.0*/**/*</include>
+          <include>gems/benchmark-0.5.0*/**/*</include>
+          <include>gems/bigdecimal-4.0.1*/**/*</include>
+          <include>gems/csv-3.3.5*/**/*</include>
           <include>gems/debug-0.2.1*/**/*</include>
-          <include>gems/drb-2.2.1*/**/*</include>
+          <include>gems/drb-2.2.3*/**/*</include>
           <include>gems/getoptlong-0.2.1*/**/*</include>
-          <include>gems/matrix-0.4.2*/**/*</include>
-          <include>gems/minitest-5.25.4*/**/*</include>
+          <include>gems/irb-1.16.0*/**/*</include>
+          <include>gems/logger-1.7.0*/**/*</include>
+          <include>gems/matrix-0.4.3*/**/*</include>
+          <include>gems/minitest-6.0.0*/**/*</include>
           <include>gems/mutex_m-0.3.0*/**/*</include>
-          <include>gems/net-ftp-0.3.8*/**/*</include>
-          <include>gems/net-imap-0.5.8*/**/*</include>
+          <include>gems/net-ftp-0.3.9*/**/*</include>
+          <include>gems/net-imap-0.6.2*/**/*</include>
           <include>gems/net-pop-0.1.2*/**/*</include>
           <include>gems/net-smtp-0.5.1*/**/*</include>
           <include>gems/nkf-0.2.0*/**/*</include>
           <include>gems/observer-0.1.2*/**/*</include>
-          <include>gems/power_assert-2.0.5*/**/*</include>
-          <include>gems/prime-0.1.3*/**/*</include>
+          <include>gems/ostruct-0.6.3*/**/*</include>
+          <include>gems/power_assert-3.0.1*/**/*</include>
+          <include>gems/prime-0.1.4*/**/*</include>
+          <include>gems/pstore-0.2.0*/**/*</include>
           <include>gems/racc-1.8.1*/**/*</include>
           <include>gems/rake-${rake.version}*/**/*</include>
+          <include>gems/rdoc-7.0.3*/**/*</include>
+          <include>gems/reline-0.6.3*/**/*</include>
           <include>gems/resolv-replace-0.1.1*/**/*</include>
           <include>gems/rexml-3.4.4*/**/*</include>
           <include>gems/rinda-0.2.0*/**/*</include>
-          <include>gems/rss-0.3.1*/**/*</include>
+          <include>gems/rss-0.3.2*/**/*</include>
           <include>gems/syslog-0.4.0*/**/*</include>
-          <include>gems/test-unit-3.6.7*/**/*</include>
-          <include>cache/rubygems-update-3.7.2*</include>
-          <include>cache/benchmark-0.4.0*</include>
-          <include>cache/bundler-2.7.2*</include>
-          <include>cache/cgi-0.4.2*</include>
-          <include>cache/date-3.4.1*</include>
-          <include>cache/delegate-0.4.0*</include>
+          <include>gems/test-unit-3.7.5*/**/*</include>
+          <include>cache/rubygems-update-4.0.3*</include>
+          <include>cache/bundler-4.0.3*</include>
+          <include>cache/date-3.5.1*</include>
+          <include>cache/delegate-0.6.1*</include>
           <include>cache/did_you_mean-2.0.0*</include>
-          <include>cache/digest-3.2.0*</include>
-          <include>cache/english-0.8.0*</include>
-          <include>cache/erb-4.0.4*</include>
-          <include>cache/error_highlight-0.7.0*</include>
+          <include>cache/digest-3.2.1*</include>
+          <include>cache/english-0.8.1*</include>
+          <include>cache/erb-6.0.1.1*</include>
+          <include>cache/error_highlight-0.7.1*</include>
           <include>cache/ffi-1.17.0*</include>
-          <include>cache/fiddle-1.1.6*</include>
-          <include>cache/fileutils-1.7.3*</include>
+          <include>cache/fiddle-1.1.8*</include>
+          <include>cache/fileutils-1.8.0*</include>
           <include>cache/find-0.2.0*</include>
-          <include>cache/forwardable-1.3.3*</include>
-          <include>cache/io-console-0.8.1*</include>
-          <include>cache/io-wait-0.3.2*</include>
-          <include>cache/ipaddr-1.2.7*</include>
-          <include>cache/irb-1.14.3*</include>
-          <include>cache/jar-dependencies-0.5.4*</include>
+          <include>cache/forwardable-1.4.0*</include>
+          <include>cache/io-console-0.8.2*</include>
+          <include>cache/io-wait-0.4.0*</include>
+          <include>cache/ipaddr-1.2.8*</include>
+          <include>cache/jar-dependencies-0.5.7*</include>
           <include>cache/jruby-readline-1.3.7*</include>
-          <include>cache/jruby-openssl-0.15.5*</include>
-          <include>cache/json-2.16.0*</include>
-          <include>cache/logger-1.6.4*</include>
-          <include>cache/net-http-0.6.0*</include>
+          <include>cache/jruby-openssl-0.16.0*</include>
+          <include>cache/json-2.18.0*</include>
+          <include>cache/net-http-0.9.1*</include>
           <include>cache/net-protocol-0.2.2*</include>
           <include>cache/open-uri-0.5.0*</include>
           <include>cache/open3-0.2.1*</include>
-          <include>cache/optparse-0.6.0*</include>
-          <include>cache/ostruct-0.6.1*</include>
-          <include>cache/pp-0.6.2*</include>
+          <include>cache/optparse-0.8.1*</include>
+          <include>cache/pp-0.6.3*</include>
           <include>cache/prettyprint-0.2.0*</include>
-          <include>cache/pstore-0.1.4*</include>
-          <include>cache/psych-5.2.3*</include>
+          <include>cache/psych-5.3.1*</include>
           <include>cache/rake-ant-1.0.6*</include>
-          <include>cache/rdoc-6.14.0*</include>
-          <include>cache/reline-0.6.0*</include>
-          <include>cache/resolv-0.6.3*</include>
+          <include>cache/resolv-0.7.0*</include>
           <include>cache/ruby2_keywords-0.0.5*</include>
           <include>cache/securerandom-0.4.1*</include>
           <include>cache/shellwords-0.2.2*</include>
           <include>cache/singleton-0.3.0*</include>
-          <include>cache/stringio-3.1.9*</include>
-          <include>cache/strscan-3.1.5*</include>
+          <include>cache/stringio-3.2.0*</include>
+          <include>cache/strscan-3.1.6*</include>
           <include>cache/subspawn-0.1.1*</include>
           <include>cache/subspawn-posix-0.1.1*</include>
           <include>cache/ffi-binary-libfixposix-0.5.1.1*</include>
           <include>cache/ffi-bindings-libfixposix-0.5.1.0*</include>
           <include>cache/syntax_suggest-2.0.2*</include>
           <include>cache/tempfile-0.3.1*</include>
-          <include>cache/time-0.4.1*</include>
-          <include>cache/timeout-0.4.3*</include>
+          <include>cache/time-0.4.2*</include>
+          <include>cache/timeout-0.6.0*</include>
           <include>cache/tsort-0.2.0*</include>
           <include>cache/un-0.3.0*</include>
-          <include>cache/uri-1.0.3*</include>
-          <include>cache/weakref-0.1.3*</include>
+          <include>cache/uri-1.1.1*</include>
+          <include>cache/weakref-0.1.4*</include>
+          <include>cache/win32-registry-0.1.1*</include>
           <include>cache/yaml-0.4.0*</include>
           <include>cache/abbrev-0.1.2*</include>
-          <include>cache/base64-0.2.0*</include>
-          <include>cache/bigdecimal-3.1.9*</include>
-          <include>cache/csv-3.3.2*</include>
+          <include>cache/base64-0.3.0*</include>
+          <include>cache/benchmark-0.5.0*</include>
+          <include>cache/bigdecimal-4.0.1*</include>
+          <include>cache/csv-3.3.5*</include>
           <include>cache/debug-0.2.1*</include>
-          <include>cache/drb-2.2.1*</include>
+          <include>cache/drb-2.2.3*</include>
           <include>cache/getoptlong-0.2.1*</include>
-          <include>cache/matrix-0.4.2*</include>
-          <include>cache/minitest-5.25.4*</include>
+          <include>cache/irb-1.16.0*</include>
+          <include>cache/logger-1.7.0*</include>
+          <include>cache/matrix-0.4.3*</include>
+          <include>cache/minitest-6.0.0*</include>
           <include>cache/mutex_m-0.3.0*</include>
-          <include>cache/net-ftp-0.3.8*</include>
-          <include>cache/net-imap-0.5.8*</include>
+          <include>cache/net-ftp-0.3.9*</include>
+          <include>cache/net-imap-0.6.2*</include>
           <include>cache/net-pop-0.1.2*</include>
           <include>cache/net-smtp-0.5.1*</include>
           <include>cache/nkf-0.2.0*</include>
           <include>cache/observer-0.1.2*</include>
-          <include>cache/power_assert-2.0.5*</include>
-          <include>cache/prime-0.1.3*</include>
+          <include>cache/ostruct-0.6.3*</include>
+          <include>cache/power_assert-3.0.1*</include>
+          <include>cache/prime-0.1.4*</include>
+          <include>cache/pstore-0.2.0*</include>
           <include>cache/racc-1.8.1*</include>
           <include>cache/rake-${rake.version}*</include>
+          <include>cache/rdoc-7.0.3*</include>
+          <include>cache/reline-0.6.3*</include>
           <include>cache/resolv-replace-0.1.1*</include>
           <include>cache/rexml-3.4.4*</include>
           <include>cache/rinda-0.2.0*</include>
-          <include>cache/rss-0.3.1*</include>
+          <include>cache/rss-0.3.2*</include>
           <include>cache/syslog-0.4.0*</include>
-          <include>cache/test-unit-3.6.7*</include>
+          <include>cache/test-unit-3.7.5*</include>
+          <include>extensions/universal-java/4.0.0/rubygems-update-4.0.3/*</include>
+          <include>extensions/universal-java/4.0.0/bundler-4.0.3/*</include>
+          <include>extensions/universal-java/4.0.0/date-3.5.1/*</include>
+          <include>extensions/universal-java/4.0.0/delegate-0.6.1/*</include>
+          <include>extensions/universal-java/4.0.0/did_you_mean-2.0.0/*</include>
+          <include>extensions/universal-java/4.0.0/digest-3.2.1/*</include>
+          <include>extensions/universal-java/4.0.0/english-0.8.1/*</include>
+          <include>extensions/universal-java/4.0.0/erb-6.0.1.1/*</include>
+          <include>extensions/universal-java/4.0.0/error_highlight-0.7.1/*</include>
+          <include>extensions/universal-java/4.0.0/ffi-1.17.0/*</include>
+          <include>extensions/universal-java/4.0.0/fiddle-1.1.8/*</include>
+          <include>extensions/universal-java/4.0.0/fileutils-1.8.0/*</include>
+          <include>extensions/universal-java/4.0.0/find-0.2.0/*</include>
+          <include>extensions/universal-java/4.0.0/forwardable-1.4.0/*</include>
+          <include>extensions/universal-java/4.0.0/io-console-0.8.2/*</include>
+          <include>extensions/universal-java/4.0.0/io-wait-0.4.0/*</include>
+          <include>extensions/universal-java/4.0.0/ipaddr-1.2.8/*</include>
+          <include>extensions/universal-java/4.0.0/jar-dependencies-0.5.7/*</include>
+          <include>extensions/universal-java/4.0.0/jruby-readline-1.3.7/*</include>
+          <include>extensions/universal-java/4.0.0/jruby-openssl-0.16.0/*</include>
+          <include>extensions/universal-java/4.0.0/json-2.18.0/*</include>
+          <include>extensions/universal-java/4.0.0/net-http-0.9.1/*</include>
+          <include>extensions/universal-java/4.0.0/net-protocol-0.2.2/*</include>
+          <include>extensions/universal-java/4.0.0/open-uri-0.5.0/*</include>
+          <include>extensions/universal-java/4.0.0/open3-0.2.1/*</include>
+          <include>extensions/universal-java/4.0.0/optparse-0.8.1/*</include>
+          <include>extensions/universal-java/4.0.0/pp-0.6.3/*</include>
+          <include>extensions/universal-java/4.0.0/prettyprint-0.2.0/*</include>
+          <include>extensions/universal-java/4.0.0/psych-5.3.1/*</include>
+          <include>extensions/universal-java/4.0.0/rake-ant-1.0.6/*</include>
+          <include>extensions/universal-java/4.0.0/resolv-0.7.0/*</include>
+          <include>extensions/universal-java/4.0.0/ruby2_keywords-0.0.5/*</include>
+          <include>extensions/universal-java/4.0.0/securerandom-0.4.1/*</include>
+          <include>extensions/universal-java/4.0.0/shellwords-0.2.2/*</include>
+          <include>extensions/universal-java/4.0.0/singleton-0.3.0/*</include>
+          <include>extensions/universal-java/4.0.0/stringio-3.2.0/*</include>
+          <include>extensions/universal-java/4.0.0/strscan-3.1.6/*</include>
+          <include>extensions/universal-java/4.0.0/subspawn-0.1.1/*</include>
+          <include>extensions/universal-java/4.0.0/subspawn-posix-0.1.1/*</include>
+          <include>extensions/universal-java/4.0.0/ffi-binary-libfixposix-0.5.1.1/*</include>
+          <include>extensions/universal-java/4.0.0/ffi-bindings-libfixposix-0.5.1.0/*</include>
+          <include>extensions/universal-java/4.0.0/syntax_suggest-2.0.2/*</include>
+          <include>extensions/universal-java/4.0.0/tempfile-0.3.1/*</include>
+          <include>extensions/universal-java/4.0.0/time-0.4.2/*</include>
+          <include>extensions/universal-java/4.0.0/timeout-0.6.0/*</include>
+          <include>extensions/universal-java/4.0.0/tsort-0.2.0/*</include>
+          <include>extensions/universal-java/4.0.0/un-0.3.0/*</include>
+          <include>extensions/universal-java/4.0.0/uri-1.1.1/*</include>
+          <include>extensions/universal-java/4.0.0/weakref-0.1.4/*</include>
+          <include>extensions/universal-java/4.0.0/win32-registry-0.1.1/*</include>
+          <include>extensions/universal-java/4.0.0/yaml-0.4.0/*</include>
+          <include>extensions/universal-java/4.0.0/abbrev-0.1.2/*</include>
+          <include>extensions/universal-java/4.0.0/base64-0.3.0/*</include>
+          <include>extensions/universal-java/4.0.0/benchmark-0.5.0/*</include>
+          <include>extensions/universal-java/4.0.0/bigdecimal-4.0.1/*</include>
+          <include>extensions/universal-java/4.0.0/csv-3.3.5/*</include>
+          <include>extensions/universal-java/4.0.0/debug-0.2.1/*</include>
+          <include>extensions/universal-java/4.0.0/drb-2.2.3/*</include>
+          <include>extensions/universal-java/4.0.0/getoptlong-0.2.1/*</include>
+          <include>extensions/universal-java/4.0.0/irb-1.16.0/*</include>
+          <include>extensions/universal-java/4.0.0/logger-1.7.0/*</include>
+          <include>extensions/universal-java/4.0.0/matrix-0.4.3/*</include>
+          <include>extensions/universal-java/4.0.0/minitest-6.0.0/*</include>
+          <include>extensions/universal-java/4.0.0/mutex_m-0.3.0/*</include>
+          <include>extensions/universal-java/4.0.0/net-ftp-0.3.9/*</include>
+          <include>extensions/universal-java/4.0.0/net-imap-0.6.2/*</include>
+          <include>extensions/universal-java/4.0.0/net-pop-0.1.2/*</include>
+          <include>extensions/universal-java/4.0.0/net-smtp-0.5.1/*</include>
+          <include>extensions/universal-java/4.0.0/nkf-0.2.0/*</include>
+          <include>extensions/universal-java/4.0.0/observer-0.1.2/*</include>
+          <include>extensions/universal-java/4.0.0/ostruct-0.6.3/*</include>
+          <include>extensions/universal-java/4.0.0/power_assert-3.0.1/*</include>
+          <include>extensions/universal-java/4.0.0/prime-0.1.4/*</include>
+          <include>extensions/universal-java/4.0.0/pstore-0.2.0/*</include>
+          <include>extensions/universal-java/4.0.0/racc-1.8.1/*</include>
+          <include>extensions/universal-java/4.0.0/rake-${rake.version}/*</include>
+          <include>extensions/universal-java/4.0.0/rdoc-7.0.3/*</include>
+          <include>extensions/universal-java/4.0.0/reline-0.6.3/*</include>
+          <include>extensions/universal-java/4.0.0/resolv-replace-0.1.1/*</include>
+          <include>extensions/universal-java/4.0.0/rexml-3.4.4/*</include>
+          <include>extensions/universal-java/4.0.0/rinda-0.2.0/*</include>
+          <include>extensions/universal-java/4.0.0/rss-0.3.2/*</include>
+          <include>extensions/universal-java/4.0.0/syslog-0.4.0/*</include>
+          <include>extensions/universal-java/4.0.0/test-unit-3.7.5/*</include>
         </includes>
       </resource>
       <resource>
diff --git a/lib/ruby/stdlib/cgi.rb b/lib/ruby/stdlib/cgi.rb
new file mode 100644
index 00000000000..bb306d2e064
--- /dev/null
+++ b/lib/ruby/stdlib/cgi.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "cgi/escape"
+warn <<-WARNING, uplevel: Gem::BUNDLED_GEMS.uplevel if $VERBOSE
+CGI library is removed from Ruby 4.0. Please use cgi/escape instead for CGI.escape and CGI.unescape features.
+If you need to use the full features of CGI library, Please install cgi gem.
+WARNING
diff --git a/lib/ruby/stdlib/cgi/escape.rb b/lib/ruby/stdlib/cgi/escape.rb
new file mode 100644
index 00000000000..92470c81bb3
--- /dev/null
+++ b/lib/ruby/stdlib/cgi/escape.rb
@@ -0,0 +1,236 @@
+# frozen_string_literal: true
+
+# Since Ruby 4.0, \CGI is a small holder for various escaping methods, included from CGI::Escape
+#
+#    require 'cgi/escape'
+#
+#    CGI.escape("Ruby programming language")
+#    #=> "Ruby+programming+language"
+#    CGI.escapeURIComponent("Ruby programming language")
+#    #=> "Ruby%20programming%20language"
+#
+# See CGI::Escape module for methods list and their description.
+class CGI
+  module Escape; end
+  include Escape
+  extend Escape
+  module EscapeExt; end # :nodoc:
+end
+
+# Web-related escape/unescape functionality.
+module CGI::Escape
+  @@accept_charset = Encoding::UTF_8 unless defined?(@@accept_charset)
+
+  # URL-encode a string into application/x-www-form-urlencoded.
+  # Space characters (<tt>" "</tt>) are encoded with plus signs (<tt>"+"</tt>)
+  #   url_encoded_string = CGI.escape("'Stop!' said Fred")
+  #      # => "%27Stop%21%27+said+Fred"
+  def escape(string)
+    encoding = string.encoding
+    buffer = string.b
+    buffer.gsub!(/([^ a-zA-Z0-9_.\-~]+)/) do |m|
+      '%' + m.unpack('H2' * m.bytesize).join('%').upcase
+    end
+    buffer.tr!(' ', '+')
+    buffer.force_encoding(encoding)
+  end
+
+  # URL-decode an application/x-www-form-urlencoded string with encoding(optional).
+  #   string = CGI.unescape("%27Stop%21%27+said+Fred")
+  #      # => "'Stop!' said Fred"
+  def unescape(string, encoding = @@accept_charset)
+    str = string.tr('+', ' ')
+    str = str.b
+    str.gsub!(/((?:%[0-9a-fA-F]{2})+)/) do |m|
+      [m.delete('%')].pack('H*')
+    end
+    str.force_encoding(encoding)
+    str.valid_encoding? ? str : str.force_encoding(string.encoding)
+  end
+
+  # URL-encode a string following RFC 3986
+  # Space characters (<tt>" "</tt>) are encoded with (<tt>"%20"</tt>)
+  #   url_encoded_string = CGI.escapeURIComponent("'Stop!' said Fred")
+  #      # => "%27Stop%21%27%20said%20Fred"
+  def escapeURIComponent(string)
+    encoding = string.encoding
+    buffer = string.b
+    buffer.gsub!(/([^a-zA-Z0-9_.\-~]+)/) do |m|
+      '%' + m.unpack('H2' * m.bytesize).join('%').upcase
+    end
+    buffer.force_encoding(encoding)
+  end
+  alias escape_uri_component escapeURIComponent
+
+  # URL-decode a string following RFC 3986 with encoding(optional).
+  #   string = CGI.unescapeURIComponent("%27Stop%21%27+said%20Fred")
+  #      # => "'Stop!'+said Fred"
+  def unescapeURIComponent(string, encoding = @@accept_charset)
+    str = string.b
+    str.gsub!(/((?:%[0-9a-fA-F]{2})+)/) do |m|
+      [m.delete('%')].pack('H*')
+    end
+    str.force_encoding(encoding)
+    str.valid_encoding? ? str : str.force_encoding(string.encoding)
+  end
+
+  alias unescape_uri_component unescapeURIComponent
+
+  # The set of special characters and their escaped values
+  TABLE_FOR_ESCAPE_HTML__ = { # :nodoc:
+    "'" => '&#39;',
+    '&' => '&amp;',
+    '"' => '&quot;',
+    '<' => '&lt;',
+    '>' => '&gt;',
+  }
+
+  # \Escape special characters in HTML, namely <tt>'&\"<></tt>
+  #   CGI.escapeHTML('Usage: foo "bar" <baz>')
+  #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
+  def escapeHTML(string)
+    enc = string.encoding
+    unless enc.ascii_compatible?
+      if enc.dummy?
+        origenc = enc
+        enc = Encoding::Converter.asciicompat_encoding(enc)
+        string = enc ? string.encode(enc) : string.b
+      end
+      table = Hash[TABLE_FOR_ESCAPE_HTML__.map {|pair|pair.map {|s|s.encode(enc)}}]
+      string = string.gsub(/#{"['&\"<>]".encode(enc)}/, table)
+      string.encode!(origenc) if origenc
+      string
+    else
+      string = string.b
+      string.gsub!(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+      string.force_encoding(enc)
+    end
+  end
+
+  # Unescape a string that has been HTML-escaped
+  #   CGI.unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
+  #      # => "Usage: foo \"bar\" <baz>"
+  def unescapeHTML(string)
+    enc = string.encoding
+    unless enc.ascii_compatible?
+      if enc.dummy?
+        origenc = enc
+        enc = Encoding::Converter.asciicompat_encoding(enc)
+        string = enc ? string.encode(enc) : string.b
+      end
+      string = string.gsub(Regexp.new('&(apos|amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do
+        case $1.encode(Encoding::US_ASCII)
+        when 'apos'                then "'".encode(enc)
+        when 'amp'                 then '&'.encode(enc)
+        when 'quot'                then '"'.encode(enc)
+        when 'gt'                  then '>'.encode(enc)
+        when 'lt'                  then '<'.encode(enc)
+        when /\A#0*(\d+)\z/        then $1.to_i.chr(enc)
+        when /\A#x([0-9a-f]+)\z/i  then $1.hex.chr(enc)
+        end
+      end
+      string.encode!(origenc) if origenc
+      return string
+    end
+    return string unless string.include? '&'
+    charlimit = case enc
+                when Encoding::UTF_8; 0x10ffff
+                when Encoding::ISO_8859_1; 256
+                else 128
+                end
+    string = string.b
+    string.gsub!(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
+      match = $1.dup
+      case match
+      when 'apos'                then "'"
+      when 'amp'                 then '&'
+      when 'quot'                then '"'
+      when 'gt'                  then '>'
+      when 'lt'                  then '<'
+      when /\A#0*(\d+)\z/
+        n = $1.to_i
+        if n < charlimit
+          n.chr(enc)
+        else
+          "&##{$1};"
+        end
+      when /\A#x([0-9a-f]+)\z/i
+        n = $1.hex
+        if n < charlimit
+          n.chr(enc)
+        else
+          "&#x#{$1};"
+        end
+      else
+        "&#{match};"
+      end
+    end
+    string.force_encoding enc
+  end
+
+  alias escape_html escapeHTML
+  alias h escapeHTML
+
+  alias unescape_html unescapeHTML
+
+  case RUBY_ENGINE
+  when "jruby"
+    JRuby::Util.load_ext("org.jruby.ext.cgi.escape.CGIEscape")
+  when "truffleruby"
+    # TruffleRuby runs the pure-Ruby variant faster, do not use the C extension there
+  else
+    begin
+      require 'cgi/escape.so'
+    rescue LoadError
+    end
+  end
+
+  # \Escape only the tags of certain HTML elements in +string+.
+  #
+  # Takes an element or elements or array of elements.  Each element
+  # is specified by the name of the element, without angle brackets.
+  # This matches both the start and the end tag of that element.
+  # The attribute list of the open tag will also be escaped (for
+  # instance, the double-quotes surrounding attribute values).
+  #
+  #   print CGI.escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
+  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+  #
+  #   print CGI.escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
+  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+  def escapeElement(string, *elements)
+    elements = elements[0] if elements[0].kind_of?(Array)
+    unless elements.empty?
+      string.gsub(/<\/?(?:#{elements.join("|")})\b[^<>]*+>?/im) do
+        CGI.escapeHTML($&)
+      end
+    else
+      string
+    end
+  end
+
+  # Undo escaping such as that done by CGI.escapeElement
+  #
+  #   print CGI.unescapeElement(
+  #           CGI.escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
+  #     # "&lt;BR&gt;<A HREF="url"></A>"
+  #
+  #   print CGI.unescapeElement(
+  #           CGI.escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
+  #     # "&lt;BR&gt;<A HREF="url"></A>"
+  def unescapeElement(string, *elements)
+    elements = elements[0] if elements[0].kind_of?(Array)
+    unless elements.empty?
+      string.gsub(/&lt;\/?(?:#{elements.join("|")})\b(?>[^&]+|&(?![gl]t;)\w+;)*(?:&gt;)?/im) do
+        unescapeHTML($&)
+      end
+    else
+      string
+    end
+  end
+
+  alias escape_element escapeElement
+
+  alias unescape_element unescapeElement
+
+end
diff --git a/lib/ruby/stdlib/cgi/util.rb b/lib/ruby/stdlib/cgi/util.rb
new file mode 100644
index 00000000000..50a2e91665e
--- /dev/null
+++ b/lib/ruby/stdlib/cgi/util.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "cgi/escape"
+warn <<-WARNING, uplevel: Gem::BUNDLED_GEMS.uplevel if $VERBOSE
+CGI::Util is removed from Ruby 4.0. Please use cgi/escape instead for CGI.escape and CGI.unescape features.
+If you are using CGI.parse, please install and use the cgi gem instead.
+WARNING
diff --git a/lib/ruby/stdlib/rbconfig.rb b/lib/ruby/stdlib/rbconfig.rb
index 3c5c35c499c..33f674f17cf 100644
--- a/lib/ruby/stdlib/rbconfig.rb
+++ b/lib/ruby/stdlib/rbconfig.rb
@@ -1,2 +1,77 @@
 # Load built-in rbconfig library
 JRuby::Util.load_ext("org.jruby.ext.rbconfig.RbConfigLibrary")
+
+module RbConfig
+  # call-seq:
+  #
+  #   RbConfig.expand(val)         -> string
+  #   RbConfig.expand(val, config) -> string
+  #
+  # expands variable with given +val+ value.
+  #
+  #   RbConfig.expand("$(bindir)") # => /home/foobar/all-ruby/ruby19x/bin
+  def RbConfig::expand(val, config = CONFIG)
+    newval = val.gsub(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) {
+      var = $&
+      if !(v = $1 || $2)
+        '$'
+      elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]]
+        pat, sub = $1, $2
+        config[v] = false
+        config[v] = RbConfig::expand(key, config)
+        key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat
+        key
+      else
+        var
+      end
+    }
+    val.replace(newval) unless newval == val
+    val
+  end
+  CONFIG.each_value do |val|
+    RbConfig::expand(val)
+  end
+
+  # call-seq:
+  #
+  #   RbConfig.fire_update!(key, val)               -> array
+  #   RbConfig.fire_update!(key, val, mkconf, conf) -> array
+  #
+  # updates +key+ in +mkconf+ with +val+, and all values depending on
+  # the +key+ in +mkconf+.
+  #
+  #   RbConfig::MAKEFILE_CONFIG.values_at("CC", "LDSHARED") # => ["gcc", "$(CC) -shared"]
+  #   RbConfig::CONFIG.values_at("CC", "LDSHARED")          # => ["gcc", "gcc -shared"]
+  #   RbConfig.fire_update!("CC", "gcc-8")                  # => ["CC", "LDSHARED"]
+  #   RbConfig::MAKEFILE_CONFIG.values_at("CC", "LDSHARED") # => ["gcc-8", "$(CC) -shared"]
+  #   RbConfig::CONFIG.values_at("CC", "LDSHARED")          # => ["gcc-8", "gcc-8 -shared"]
+  #
+  # returns updated keys list, or +nil+ if nothing changed.
+  def RbConfig.fire_update!(key, val, mkconf = MAKEFILE_CONFIG, conf = CONFIG) # :nodoc:
+    return if mkconf[key] == val
+    mkconf[key] = val
+    keys = [key]
+    deps = []
+    begin
+      re = Regexp.new("\\$\\((?:%1$s)\\)|\\$\\{(?:%1$s)\\}" % keys.join('|'))
+      deps |= keys
+      keys.clear
+      mkconf.each {|k,v| keys << k if re =~ v}
+    end until keys.empty?
+    deps.each {|k| conf[k] = mkconf[k].dup}
+    deps.each {|k| expand(conf[k])}
+    deps
+  end
+
+  # call-seq:
+  #
+  #   RbConfig.ruby -> path
+  #
+  # returns the absolute pathname of the ruby command.
+  def RbConfig.ruby
+    File.join(
+      RbConfig::CONFIG["bindir"],
+      RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
+    )
+  end
+end
diff --git a/lib/ruby/stdlib/rubygems/defaults/jruby.rb b/lib/ruby/stdlib/rubygems/defaults/jruby.rb
index f3e4fbf0866..7e755b7c3fc 100644
--- a/lib/ruby/stdlib/rubygems/defaults/jruby.rb
+++ b/lib/ruby/stdlib/rubygems/defaults/jruby.rb
@@ -57,6 +57,14 @@ def self.path_separator
 
 ## JAR FILES: Allow gem path entries to contain jar files
 class Gem::Specification
+  ##
+  # Ignore missing extensions on JRuby
+  #
+  # See https://github.com/ruby/rubygems/issues/3520
+  def missing_extensions?
+    false
+  end
+
   class << self
     # Replace existing dirs
     def dirs
diff --git a/lib/ruby/stdlib/set.rb b/lib/ruby/stdlib/set.rb
deleted file mode 100644
index 53b79579daf..00000000000
--- a/lib/ruby/stdlib/set.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load the built-in set library
-JRuby::Util.load_ext("org.jruby.ext.set.SetLibrary")
diff --git a/lib/ruby/stdlib/set/subclass_compatible.rb b/lib/ruby/stdlib/set/subclass_compatible.rb
new file mode 100644
index 00000000000..ab0aedc0e5b
--- /dev/null
+++ b/lib/ruby/stdlib/set/subclass_compatible.rb
@@ -0,0 +1,353 @@
+# frozen_string_literal: true
+
+# :markup: markdown
+#
+# set/subclass_compatible.rb - Provides compatibility for set subclasses
+#
+# Copyright (c) 2002-2024 Akinori MUSHA <knu@iDaemons.org>
+#
+# Documentation by Akinori MUSHA and Gavin Sinclair.
+#
+# All rights reserved.  You can redistribute and/or modify it under the same
+# terms as Ruby.
+
+
+class Set
+  # This module is automatically included in subclasses of Set, to
+  # make them backwards compatible with the pure-Ruby set implementation
+  # used before Ruby 4. Users who want to use Set subclasses without
+  # this compatibility layer should subclass from Set::CoreSet.
+  #
+  # Note that Set subclasses that access `@hash` are not compatible even
+  # with this support. Such subclasses must be updated to support Ruby 4.
+  module SubclassCompatible
+    module ClassMethods
+      def [](*ary)
+        new(ary)
+      end
+    end
+
+    # Creates a new set containing the elements of the given enumerable
+    # object.
+    #
+    # If a block is given, the elements of enum are preprocessed by the
+    # given block.
+    #
+    #     Set.new([1, 2])                       #=> #<Set: {1, 2}>
+    #     Set.new([1, 2, 1])                    #=> #<Set: {1, 2}>
+    #     Set.new([1, 'c', :s])                 #=> #<Set: {1, "c", :s}>
+    #     Set.new(1..5)                         #=> #<Set: {1, 2, 3, 4, 5}>
+    #     Set.new([1, 2, 3]) { |x| x * x }      #=> #<Set: {1, 4, 9}>
+    def initialize(enum = nil, &block) # :yields: o
+      enum.nil? and return
+
+      if block
+        do_with_enum(enum) { |o| add(block[o]) }
+      else
+        merge(enum)
+      end
+    end
+
+    def do_with_enum(enum, &block) # :nodoc:
+      if enum.respond_to?(:each_entry)
+        enum.each_entry(&block) if block
+      elsif enum.respond_to?(:each)
+        enum.each(&block) if block
+      else
+        raise ArgumentError, "value must be enumerable"
+      end
+    end
+    private :do_with_enum
+
+    def replace(enum)
+      if enum.instance_of?(self.class)
+        super
+      else
+        do_with_enum(enum)  # make sure enum is enumerable before calling clear
+        clear
+        merge(enum)
+      end
+    end
+
+    def to_set(*args, &block)
+      klass = if args.empty?
+        Set
+      else
+        warn "passing arguments to Enumerable#to_set is deprecated", uplevel: 1
+        args.shift
+      end
+      return self if instance_of?(Set) && klass == Set && block.nil? && args.empty?
+      klass.new(self, *args, &block)
+    end
+
+    def flatten_merge(set, seen = {}) # :nodoc:
+      set.each { |e|
+        if e.is_a?(Set)
+          case seen[e_id = e.object_id]
+          when true
+            raise ArgumentError, "tried to flatten recursive Set"
+          when false
+            next
+          end
+
+          seen[e_id] = true
+          flatten_merge(e, seen)
+          seen[e_id] = false
+        else
+          add(e)
+        end
+      }
+
+      self
+    end
+    protected :flatten_merge
+
+    def flatten
+      self.class.new.flatten_merge(self)
+    end
+
+    def flatten!
+      replace(flatten()) if any?(Set)
+    end
+
+    def superset?(set)
+      case
+      when set.instance_of?(self.class)
+        super
+      when set.is_a?(Set)
+        size >= set.size && set.all?(self)
+      else
+        raise ArgumentError, "value must be a set"
+      end
+    end
+    alias >= superset?
+
+    def proper_superset?(set)
+      case
+      when set.instance_of?(self.class)
+        super
+      when set.is_a?(Set)
+        size > set.size && set.all?(self)
+      else
+        raise ArgumentError, "value must be a set"
+      end
+    end
+    alias > proper_superset?
+
+    def subset?(set)
+      case
+      when set.instance_of?(self.class)
+        super
+      when set.is_a?(Set)
+        size <= set.size && all?(set)
+      else
+        raise ArgumentError, "value must be a set"
+      end
+    end
+    alias <= subset?
+
+    def proper_subset?(set)
+      case
+      when set.instance_of?(self.class)
+        super
+      when set.is_a?(Set)
+        size < set.size && all?(set)
+      else
+        raise ArgumentError, "value must be a set"
+      end
+    end
+    alias < proper_subset?
+
+    def <=>(set)
+      return unless set.is_a?(Set)
+
+      case size <=> set.size
+      when -1 then -1 if proper_subset?(set)
+      when +1 then +1 if proper_superset?(set)
+      else 0 if self.==(set)
+      end
+    end
+
+    def intersect?(set)
+      case set
+      when Set
+        if size < set.size
+          any?(set)
+        else
+          set.any?(self)
+        end
+      when Enumerable
+        set.any?(self)
+      else
+        raise ArgumentError, "value must be enumerable"
+      end
+    end
+
+    def disjoint?(set)
+      !intersect?(set)
+    end
+
+    def add?(o)
+      add(o) unless include?(o)
+    end
+
+    def delete?(o)
+      delete(o) if include?(o)
+    end
+
+    def delete_if(&block)
+      block_given? or return enum_for(__method__) { size }
+      select(&block).each { |o| delete(o) }
+      self
+    end
+
+    def keep_if(&block)
+      block_given? or return enum_for(__method__) { size }
+      reject(&block).each { |o| delete(o) }
+      self
+    end
+
+    def collect!
+      block_given? or return enum_for(__method__) { size }
+      set = self.class.new
+      each { |o| set << yield(o) }
+      replace(set)
+    end
+    alias map! collect!
+
+    def reject!(&block)
+      block_given? or return enum_for(__method__) { size }
+      n = size
+      delete_if(&block)
+      self if size != n
+    end
+
+    def select!(&block)
+      block_given? or return enum_for(__method__) { size }
+      n = size
+      keep_if(&block)
+      self if size != n
+    end
+
+    alias filter! select!
+
+    def merge(*enums, **nil)
+      enums.each do |enum|
+        if enum.instance_of?(self.class)
+          super(enum)
+        else
+          do_with_enum(enum) { |o| add(o) }
+        end
+      end
+
+      self
+    end
+
+    def subtract(enum)
+      do_with_enum(enum) { |o| delete(o) }
+      self
+    end
+
+    def |(enum)
+      dup.merge(enum)
+    end
+    alias + |
+    alias union |
+
+    def -(enum)
+      dup.subtract(enum)
+    end
+    alias difference -
+
+    def &(enum)
+      n = self.class.new
+      if enum.is_a?(Set)
+        if enum.size > size
+          each { |o| n.add(o) if enum.include?(o) }
+        else
+          enum.each { |o| n.add(o) if include?(o) }
+        end
+      else
+        do_with_enum(enum) { |o| n.add(o) if include?(o) }
+      end
+      n
+    end
+    alias intersection &
+
+    def ^(enum)
+      n = self.class.new(enum)
+      each { |o| n.add(o) unless n.delete?(o) }
+      n
+    end
+
+    def ==(other)
+      if self.equal?(other)
+        true
+      elsif other.instance_of?(self.class)
+        super
+      elsif other.is_a?(Set) && self.size == other.size
+        other.all? { |o| include?(o) }
+      else
+        false
+      end
+    end
+
+    def eql?(o)   # :nodoc:
+      return false unless o.is_a?(Set)
+      super
+    end
+
+    def classify
+      block_given? or return enum_for(__method__) { size }
+
+      h = {}
+
+      each { |i|
+        (h[yield(i)] ||= self.class.new).add(i)
+      }
+
+      h
+    end
+
+    def join(separator=nil)
+      to_a.join(separator)
+    end
+
+    InspectKey = :__inspect_key__         # :nodoc:
+
+    # Returns a string containing a human-readable representation of the
+    # set ("#<Set: {element1, element2, ...}>").
+    def inspect
+      ids = (Thread.current[InspectKey] ||= [])
+
+      if ids.include?(object_id)
+        return sprintf('#<%s: {...}>', self.class.name)
+      end
+
+      ids << object_id
+      begin
+        return sprintf('#<%s: {%s}>', self.class, to_a.inspect[1..-2])
+      ensure
+        ids.pop
+      end
+    end
+
+    alias to_s inspect
+
+    def pretty_print(pp)  # :nodoc:
+      pp.group(1, sprintf('#<%s:', self.class.name), '>') {
+        pp.breakable
+        pp.group(1, '{', '}') {
+          pp.seplist(self) { |o|
+            pp.pp o
+          }
+        }
+      }
+    end
+
+    def pretty_print_cycle(pp)    # :nodoc:
+      pp.text sprintf('#<%s: {%s}>', self.class.name, empty? ? '' : '...')
+    end
+  end
+  private_constant :SubclassCompatible
+end
diff --git a/lib/ruby/stdlib/socket.rb b/lib/ruby/stdlib/socket.rb
index 889c523c843..4455bde2756 100644
--- a/lib/ruby/stdlib/socket.rb
+++ b/lib/ruby/stdlib/socket.rb
@@ -63,7 +63,7 @@ def connect_internal(local_addrinfo, timeout=nil) # :yields: socket
           break
         when :wait_writable
           sock.wait_writable(timeout) or
-            raise Errno::ETIMEDOUT, 'user specified timeout'
+            raise Errno::ETIMEDOUT, "user specified timeout for #{self.ip_address}:#{self.ip_port}"
         end while true
       else
         sock.connect(self)
@@ -615,8 +615,9 @@ def ipv6only!
   HOSTNAME_RESOLUTION_QUEUE_UPDATED = 0
   private_constant :HOSTNAME_RESOLUTION_QUEUE_UPDATED
 
-  IPV6_ADRESS_FORMAT = /\A(?i:(?:(?:[0-9A-F]{1,4}:){7}(?:[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){6}(?:[0-9A-F]{1,4}|:(?:[0-9A-F]{1,4}:){1,5}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){5}(?:(?::[0-9A-F]{1,4}){1,2}|:(?:[0-9A-F]{1,4}:){1,4}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){4}(?:(?::[0-9A-F]{1,4}){1,3}|:(?:[0-9A-F]{1,4}:){1,3}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){3}(?:(?::[0-9A-F]{1,4}){1,4}|:(?:[0-9A-F]{1,4}:){1,2}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){2}(?:(?::[0-9A-F]{1,4}){1,5}|:(?:[0-9A-F]{1,4}:)[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){1}(?:(?::[0-9A-F]{1,4}){1,6}|:(?:[0-9A-F]{1,4}:){0,5}[0-9A-F]{1,4}|:)|(?:::(?:[0-9A-F]{1,4}:){0,7}[0-9A-F]{1,4}|::)))(?:%.+)?\z/
-  private_constant :IPV6_ADRESS_FORMAT
+  IPV6_ADDRESS_FORMAT = /\A(?i:(?:(?:[0-9A-F]{1,4}:){7}(?:[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){6}(?:[0-9A-F]{1,4}|:(?:[0-9A-F]{1,4}:){1,5}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){5}(?:(?::[0-9A-F]{1,4}){1,2}|:(?:[0-9A-F]{1,4}:){1,4}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){4}(?:(?::[0-9A-F]{1,4}){1,3}|:(?:[0-9A-F]{1,4}:){1,3}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){3}(?:(?::[0-9A-F]{1,4}){1,4}|:(?:[0-9A-F]{1,4}:){1,2}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){2}(?:(?::[0-9A-F]{1,4}){1,5}|:(?:[0-9A-F]{1,4}:)[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){1}(?:(?::[0-9A-F]{1,4}){1,6}|:(?:[0-9A-F]{1,4}:){0,5}[0-9A-F]{1,4}|:)|(?:::(?:[0-9A-F]{1,4}:){0,7}[0-9A-F]{1,4}|::)))(?:%.+)?\z/
+  private_constant :IPV6_ADDRESS_FORMAT
+  # :startdoc:
 
   # :call-seq:
   #   Socket.tcp(host, port, local_host=nil, local_port=nil, [opts]) {|socket| ... }
@@ -644,6 +645,7 @@ def ipv6only!
   #
   # [:resolv_timeout] Specifies the timeout in seconds from when the hostname resolution starts.
   # [:connect_timeout] This method sequentially attempts connecting to all candidate destination addresses.<br>The +connect_timeout+ specifies the timeout in seconds from the start of the connection attempt to the last candidate.<br>By default, all connection attempts continue until the timeout occurs.<br>When +fast_fallback:false+ is explicitly specified,<br>a timeout is set for each connection attempt and any connection attempt that exceeds its timeout will be canceled.
+  # [:open_timeout] Specifies the timeout in seconds from the start of the method execution.<br>If this timeout is reached while there are still addresses that have not yet been attempted for connection, no further attempts will be made.<br>If this option is specified together with other timeout options, an +ArgumentError+ will be raised.
   # [:fast_fallback] Enables the Happy Eyeballs Version 2 algorithm (enabled by default).
   #
   # If a block is given, the block is called with the socket.
@@ -657,11 +659,16 @@ def ipv6only!
   #     sock.close_write
   #     puts sock.read
   #   }
-  def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil, fast_fallback: tcp_fast_fallback, &) # :yield: socket
+  def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil, open_timeout: nil, fast_fallback: tcp_fast_fallback, &) # :yield: socket
+
+    if open_timeout && (connect_timeout || resolv_timeout)
+      raise ArgumentError, "Cannot specify open_timeout along with connect_timeout or resolv_timeout"
+    end
+
     sock = if fast_fallback && !(host && ip_address?(host))
-      tcp_with_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:)
+      tcp_with_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:, open_timeout:)
     else
-      tcp_without_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:)
+      tcp_without_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:, open_timeout:)
     end
 
     if block_given?
@@ -675,9 +682,10 @@ def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: ni
     end
   end
 
-  def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil)
+  # :stopdoc:
+  def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil, open_timeout: nil)
     if local_host || local_port
-      local_addrinfos = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, timeout: resolv_timeout)
+      local_addrinfos = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, timeout: open_timeout || resolv_timeout)
       resolving_family_names = local_addrinfos.map { |lai| ADDRESS_FAMILIES.key(lai.afamily) }.uniq
     else
       local_addrinfos = []
@@ -690,14 +698,17 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
     is_windows_environment ||= (RUBY_PLATFORM =~ /mswin|mingw|cygwin/)
 
     now = current_clock_time
+    starts_at = now
     resolution_delay_expires_at = nil
     connection_attempt_delay_expires_at = nil
     user_specified_connect_timeout_at = nil
+    user_specified_open_timeout_at = open_timeout ? now + open_timeout : nil
     last_error = nil
+    last_error_from_thread = false
 
     if resolving_family_names.size == 1
       family_name = resolving_family_names.first
-      addrinfos = Addrinfo.getaddrinfo(host, port, family_name, :STREAM, timeout: resolv_timeout)
+      addrinfos = Addrinfo.getaddrinfo(host, port, ADDRESS_FAMILIES[:family_name], :STREAM, timeout: open_timeout || resolv_timeout)
       resolution_store.add_resolved(family_name, addrinfos)
       hostname_resolution_result = nil
       hostname_resolution_notifier = nil
@@ -714,7 +725,6 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
           thread
         }
       )
-
       user_specified_resolv_timeout_at = resolv_timeout ? now + resolv_timeout : Float::INFINITY
     end
 
@@ -748,9 +758,16 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
               socket.bind(local_addrinfo) if local_addrinfo
               result = socket.connect_nonblock(addrinfo, exception: false)
             else
+              timeout =
+                if open_timeout
+                  t = open_timeout - (current_clock_time - starts_at)
+                  t.negative? ? 0 : t
+                else
+                  connect_timeout
+                end
               result = socket = local_addrinfo ?
-                addrinfo.connect_from(local_addrinfo, timeout: connect_timeout) :
-                addrinfo.connect(timeout: connect_timeout)
+                addrinfo.connect_from(local_addrinfo, timeout:) :
+                addrinfo.connect(timeout:)
             end
 
             if result == :wait_writable
@@ -784,7 +801,10 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
 
       ends_at =
         if resolution_store.any_addrinfos?
-          resolution_delay_expires_at || connection_attempt_delay_expires_at
+          [(resolution_delay_expires_at || connection_attempt_delay_expires_at),
+           user_specified_open_timeout_at].compact.min
+        elsif user_specified_open_timeout_at
+          user_specified_open_timeout_at
         else
           [user_specified_resolv_timeout_at, user_specified_connect_timeout_at].compact.max
         end
@@ -866,6 +886,7 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
               other = family_name == :ipv6 ? :ipv4 : :ipv6
               if !resolution_store.resolved?(other) || !resolution_store.resolved_successfully?(other)
                 last_error = result
+                last_error_from_thread = true
               end
             end
           else
@@ -884,14 +905,22 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
         end
       end
 
+      if expired?(now, user_specified_open_timeout_at)
+        raise(IO::TimeoutError, "user specified timeout for #{host}:#{port}")
+      end
+
       if resolution_store.empty_addrinfos?
         if connecting_sockets.empty? && resolution_store.resolved_all_families?
-          raise last_error
+          if last_error_from_thread
+            raise last_error.class, last_error.message, cause: last_error
+          else
+            raise last_error
+          end
         end
 
         if (expired?(now, user_specified_resolv_timeout_at) || resolution_store.resolved_all_families?) &&
            (expired?(now, user_specified_connect_timeout_at) || connecting_sockets.empty?)
-          raise Errno::ETIMEDOUT, 'user specified timeout'
+          raise(IO::TimeoutError, "user specified timeout for #{host}:#{port}")
         end
       end
     end
@@ -906,17 +935,21 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
       connecting_socket.close
     end
   end
+  private_class_method :tcp_with_fast_fallback
 
-  def self.tcp_without_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:)
+  def self.tcp_without_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:, open_timeout:)
     last_error = nil
     ret = nil
 
     local_addr_list = nil
     if local_host != nil || local_port != nil
-      local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
+      local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil, timeout: open_timeout || resolv_timeout)
     end
 
-    Addrinfo.foreach(host, port, nil, :STREAM, timeout: resolv_timeout) {|ai|
+    timeout = open_timeout ? open_timeout : resolv_timeout
+    starts_at = current_clock_time
+
+    Addrinfo.foreach(host, port, nil, :STREAM, timeout:) {|ai|
       if local_addr_list
         local_addr = local_addr_list.find {|local_ai| local_ai.afamily == ai.afamily }
         next unless local_addr
@@ -924,9 +957,17 @@ def self.tcp_without_fast_fallback(host, port, local_host, local_port, connect_t
         local_addr = nil
       end
       begin
+        timeout =
+          if open_timeout
+            t = open_timeout - (current_clock_time - starts_at)
+            t.negative? ? 0 : t
+          else
+            connect_timeout
+          end
+
         sock = local_addr ?
-          ai.connect_from(local_addr, timeout: connect_timeout) :
-          ai.connect(timeout: connect_timeout)
+          ai.connect_from(local_addr, timeout:) :
+          ai.connect(timeout:)
       rescue SystemCallError
         last_error = $!
         next
@@ -947,7 +988,7 @@ def self.tcp_without_fast_fallback(host, port, local_host, local_port, connect_t
   private_class_method :tcp_without_fast_fallback
 
   def self.ip_address?(hostname)
-    hostname.match?(IPV6_ADRESS_FORMAT) || hostname.match?(/\A([0-9]{1,3}\.){3}[0-9]{1,3}\z/)
+    hostname.match?(IPV6_ADDRESS_FORMAT) || hostname.match?(/\A([0-9]{1,3}\.){3}[0-9]{1,3}\z/)
   end
   private_class_method :ip_address?
 
@@ -1085,7 +1126,6 @@ def any_unresolved_family?
   end
   private_constant :HostnameResolutionStore
 
-  # :stopdoc:
   def self.ip_sockets_port0(ai_list, reuseaddr)
     sockets = []
     begin
@@ -1118,9 +1158,7 @@ def self.ip_sockets_port0(ai_list, reuseaddr)
     end
     sockets
   end
-  class << self
-    private :ip_sockets_port0
-  end
+  private_class_method :ip_sockets_port0
 
   def self.tcp_server_sockets_port0(host)
     ai_list = Addrinfo.getaddrinfo(host, 0, nil, :STREAM, nil, Socket::AI_PASSIVE)
@@ -1548,13 +1586,18 @@ def self.unix_server_socket(path)
     end
   end
 
-  class << self
-    private
-
-    def unix_socket_abstract_name?(path)
-      /linux/ =~ RUBY_PLATFORM && /\A(\0|\z)/ =~ path
+  # :stopdoc:
+  if RUBY_PLATFORM.include?("linux")
+    def self.unix_socket_abstract_name?(path)
+      path.empty? or path.start_with?("\0")
+    end
+  else
+    def self.unix_socket_abstract_name?(path)
+      false
     end
   end
+  private_class_method :unix_socket_abstract_name?
+  # :startdoc:
 
   # creates a UNIX socket server on _path_.
   # It calls the block for each socket accepted.
diff --git a/lib/ruby/stdlib/unicode_normalize/normalize.rb b/lib/ruby/stdlib/unicode_normalize/normalize.rb
index b27cdadaaac..0447df8de70 100644
--- a/lib/ruby/stdlib/unicode_normalize/normalize.rb
+++ b/lib/ruby/stdlib/unicode_normalize/normalize.rb
@@ -20,7 +20,7 @@
 
 require_relative 'tables'
 
-
+# :stopdoc:
 module UnicodeNormalize  # :nodoc:
   ## Constant for max hash capacity to avoid DoS attack
   MAX_HASH_LENGTH = 18000 # enough for all test cases, otherwise tests get slow
@@ -82,16 +82,22 @@ def self.hangul_comp_one(string)
 
   ## Canonical Ordering
   def self.canonical_ordering_one(string)
-    sorting = string.each_char.collect { |c| [c, CLASS_TABLE[c]] }
-    (sorting.length-2).downto(0) do |i| # almost, but not exactly bubble sort
-      (0..i).each do |j|
-        later_class = sorting[j+1].last
-        if 0<later_class and later_class<sorting[j].last
-          sorting[j], sorting[j+1] = sorting[j+1], sorting[j]
-        end
+    result = ''
+    unordered = []
+    chars = string.chars
+    n = chars.size
+    chars.each_with_index do |char, i|
+      ccc = CLASS_TABLE[char]
+      if ccc == 0
+        unordered.sort!.each { result << chars[it % n] }
+        unordered.clear
+        result << char
+      else
+        unordered << ccc * n + i
       end
     end
-    return sorting.collect(&:first).join('')
+    unordered.sort!.each { result << chars[it % n] }
+    result
   end
 
   ## Normalization Forms for Patterns (not whole Strings)
@@ -105,16 +111,22 @@ def self.nfc_one(string)
     start = nfd_string[0]
     last_class = CLASS_TABLE[start]-1
     accents = ''
+    result = ''
     nfd_string[1..-1].each_char do |accent|
       accent_class = CLASS_TABLE[accent]
       if last_class<accent_class and composite = COMPOSITION_TABLE[start+accent]
         start = composite
+      elsif accent_class == 0
+        result << start << accents
+        start = accent
+        accents = ''
+        last_class = -1
       else
         accents << accent
         last_class = accent_class
       end
     end
-    hangul_comp_one(start+accents)
+    hangul_comp_one(result+start+accents)
   end
 
   def self.normalize(string, form = :nfc)
diff --git a/lib/ruby/stdlib/unicode_normalize/tables.rb b/lib/ruby/stdlib/unicode_normalize/tables.rb
index a7a387d13cb..dd5d3499b81 100644
--- a/lib/ruby/stdlib/unicode_normalize/tables.rb
+++ b/lib/ruby/stdlib/unicode_normalize/tables.rb
@@ -1,6 +1,9 @@
 # coding: us-ascii
 # frozen_string_literal: true
 
+Encoding::UNICODE_VERSION == "17.0.0" or
+  raise "Unicode version mismatch: 17.0.0 expected but #{Encoding::UNICODE_VERSION}"
+
 # automatically generated by template/unicode_norm_gen.tmpl
 
 module UnicodeNormalize  # :nodoc:
@@ -29,7 +32,8 @@ module UnicodeNormalize  # :nodoc:
     "\u0825-\u0827" \
     "\u0829-\u082D" \
     "\u0859-\u085B" \
-    "\u08D3-\u08E1" \
+    "\u0897-\u089F" \
+    "\u08CA-\u08E1" \
     "\u08E3-\u08FF" \
     "\u093C" \
     "\u094D" \
@@ -50,6 +54,7 @@ module UnicodeNormalize  # :nodoc:
     "\u0BBE" \
     "\u0BCD" \
     "\u0BD7" \
+    "\u0C3C" \
     "\u0C4D" \
     "\u0C55\u0C56" \
     "\u0CBC" \
@@ -83,7 +88,7 @@ module UnicodeNormalize  # :nodoc:
     "\u1039\u103A" \
     "\u108D" \
     "\u135D-\u135F" \
-    "\u1714" \
+    "\u1714\u1715" \
     "\u1734" \
     "\u17D2" \
     "\u17DD" \
@@ -94,7 +99,8 @@ module UnicodeNormalize  # :nodoc:
     "\u1A75-\u1A7C" \
     "\u1A7F" \
     "\u1AB0-\u1ABD" \
-    "\u1ABF\u1AC0" \
+    "\u1ABF-\u1ADD" \
+    "\u1AE0-\u1AEB" \
     "\u1B34\u1B35" \
     "\u1B44" \
     "\u1B6B-\u1B73" \
@@ -108,8 +114,7 @@ module UnicodeNormalize  # :nodoc:
     "\u1CED" \
     "\u1CF4" \
     "\u1CF8\u1CF9" \
-    "\u1DC0-\u1DF9" \
-    "\u1DFB-\u1DFF" \
+    "\u1DC0-\u1DFF" \
     "\u20D0-\u20DC" \
     "\u20E1" \
     "\u20E5-\u20F0" \
@@ -148,9 +153,14 @@ module UnicodeNormalize  # :nodoc:
     "\u{10A3F}" \
     "\u{10AE5}\u{10AE6}" \
     "\u{10D24}-\u{10D27}" \
+    "\u{10D69}-\u{10D6D}" \
     "\u{10EAB}\u{10EAC}" \
+    "\u{10EFA}\u{10EFB}" \
+    "\u{10EFD}-\u{10EFF}" \
     "\u{10F46}-\u{10F50}" \
+    "\u{10F82}-\u{10F85}" \
     "\u{11046}" \
+    "\u{11070}" \
     "\u{1107F}" \
     "\u{110B9}\u{110BA}" \
     "\u{11100}-\u{11102}" \
@@ -167,6 +177,12 @@ module UnicodeNormalize  # :nodoc:
     "\u{11357}" \
     "\u{11366}-\u{1136C}" \
     "\u{11370}-\u{11374}" \
+    "\u{113B8}" \
+    "\u{113BB}" \
+    "\u{113C2}" \
+    "\u{113C5}" \
+    "\u{113C7}-\u{113C9}" \
+    "\u{113CE}-\u{113D0}" \
     "\u{11442}" \
     "\u{11446}" \
     "\u{1145E}" \
@@ -191,8 +207,12 @@ module UnicodeNormalize  # :nodoc:
     "\u{11D42}" \
     "\u{11D44}\u{11D45}" \
     "\u{11D97}" \
+    "\u{11F41}\u{11F42}" \
+    "\u{1611E}-\u{16129}" \
+    "\u{1612F}" \
     "\u{16AF0}-\u{16AF4}" \
     "\u{16B30}-\u{16B36}" \
+    "\u{16D67}\u{16D68}" \
     "\u{16FF0}\u{16FF1}" \
     "\u{1BC9E}" \
     "\u{1D165}-\u{1D169}" \
@@ -206,8 +226,16 @@ module UnicodeNormalize  # :nodoc:
     "\u{1E01B}-\u{1E021}" \
     "\u{1E023}\u{1E024}" \
     "\u{1E026}-\u{1E02A}" \
+    "\u{1E08F}" \
     "\u{1E130}-\u{1E136}" \
+    "\u{1E2AE}" \
     "\u{1E2EC}-\u{1E2EF}" \
+    "\u{1E4EC}-\u{1E4EF}" \
+    "\u{1E5EE}\u{1E5EF}" \
+    "\u{1E6E3}" \
+    "\u{1E6E6}" \
+    "\u{1E6EE}\u{1E6EF}" \
+    "\u{1E6F5}" \
     "\u{1E8D0}-\u{1E8D6}" \
     "\u{1E944}-\u{1E94A}" \
     "]"
@@ -433,15 +461,25 @@ module UnicodeNormalize  # :nodoc:
     "\uFB40\uFB41" \
     "\uFB43\uFB44" \
     "\uFB46-\uFB4E" \
+    "\u{105C9}" \
+    "\u{105E4}" \
     "\u{1109A}" \
     "\u{1109C}" \
     "\u{110AB}" \
     "\u{1112E}\u{1112F}" \
     "\u{1134B}\u{1134C}" \
+    "\u{11383}" \
+    "\u{11385}" \
+    "\u{1138E}" \
+    "\u{11391}" \
+    "\u{113C5}" \
+    "\u{113C7}\u{113C8}" \
     "\u{114BB}\u{114BC}" \
     "\u{114BE}" \
     "\u{115BA}\u{115BB}" \
     "\u{11938}" \
+    "\u{16121}-\u{16128}" \
+    "\u{16D68}-\u{16D6A}" \
     "\u{1D15E}-\u{1D164}" \
     "\u{1D1BB}-\u{1D1C0}" \
     "\u{2F800}-\u{2FA1D}" \
@@ -605,14 +643,25 @@ module UnicodeNormalize  # :nodoc:
     "\u30DB" \
     "\u30EF-\u30F2" \
     "\u30FD" \
+    "\u{105D2}" \
+    "\u{105DA}" \
     "\u{11099}" \
     "\u{1109B}" \
     "\u{110A5}" \
     "\u{11131}\u{11132}" \
     "\u{11347}" \
+    "\u{11382}" \
+    "\u{11384}" \
+    "\u{1138B}" \
+    "\u{11390}" \
+    "\u{113C2}" \
     "\u{114B9}" \
     "\u{115B8}\u{115B9}" \
     "\u{11935}" \
+    "\u{1611E}" \
+    "\u{16129}" \
+    "\u{16D63}" \
+    "\u{16D67}" \
     "]?#{accents}+" \
     "|#{''  # precomposed Hangul syllables
     }" \
@@ -883,6 +932,10 @@ module UnicodeNormalize  # :nodoc:
     "\u30F4" \
     "\u30F7-\u30FA" \
     "\u30FD\u30FE" \
+    "\u{105C9}" \
+    "\u{105D2}" \
+    "\u{105DA}" \
+    "\u{105E4}" \
     "\u{11099}-\u{1109C}" \
     "\u{110A5}" \
     "\u{110AB}" \
@@ -890,12 +943,23 @@ module UnicodeNormalize  # :nodoc:
     "\u{11131}\u{11132}" \
     "\u{11347}" \
     "\u{1134B}\u{1134C}" \
+    "\u{11382}-\u{11385}" \
+    "\u{1138B}" \
+    "\u{1138E}" \
+    "\u{11390}\u{11391}" \
+    "\u{113C2}" \
+    "\u{113C5}" \
+    "\u{113C7}\u{113C8}" \
     "\u{114B9}" \
     "\u{114BB}\u{114BC}" \
     "\u{114BE}" \
     "\u{115B8}-\u{115BB}" \
     "\u{11935}" \
     "\u{11938}" \
+    "\u{1611E}" \
+    "\u{16121}-\u{16129}" \
+    "\u{16D63}" \
+    "\u{16D67}-\u{16D6A}" \
     "]?#{accents}+" \
     "|#{''  # Hangul syllables with separate trailer
     }" \
@@ -1402,6 +1466,7 @@ module UnicodeNormalize  # :nodoc:
     "\u3280-\u33FF" \
     "\uA69C\uA69D" \
     "\uA770" \
+    "\uA7F1-\uA7F4" \
     "\uA7F8\uA7F9" \
     "\uAB5C-\uAB5F" \
     "\uAB69" \
@@ -1428,6 +1493,10 @@ module UnicodeNormalize  # :nodoc:
     "\uFFDA-\uFFDC" \
     "\uFFE0-\uFFE6" \
     "\uFFE8-\uFFEE" \
+    "\u{10781}-\u{10785}" \
+    "\u{10787}-\u{107B0}" \
+    "\u{107B2}-\u{107BA}" \
+    "\u{1CCD6}-\u{1CCF9}" \
     "\u{1D400}-\u{1D454}" \
     "\u{1D456}-\u{1D49C}" \
     "\u{1D49E}\u{1D49F}" \
@@ -1449,6 +1518,7 @@ module UnicodeNormalize  # :nodoc:
     "\u{1D552}-\u{1D6A5}" \
     "\u{1D6A8}-\u{1D7CB}" \
     "\u{1D7CE}-\u{1D7FF}" \
+    "\u{1E030}-\u{1E06D}" \
     "\u{1EE00}-\u{1EE03}" \
     "\u{1EE05}-\u{1EE1F}" \
     "\u{1EE21}\u{1EE22}" \
@@ -1776,6 +1846,24 @@ module UnicodeNormalize  # :nodoc:
     "\u0859"=>220,
     "\u085A"=>220,
     "\u085B"=>220,
+    "\u0897"=>230,
+    "\u0898"=>230,
+    "\u0899"=>220,
+    "\u089A"=>220,
+    "\u089B"=>220,
+    "\u089C"=>230,
+    "\u089D"=>230,
+    "\u089E"=>230,
+    "\u089F"=>230,
+    "\u08CA"=>230,
+    "\u08CB"=>230,
+    "\u08CC"=>230,
+    "\u08CD"=>230,
+    "\u08CE"=>230,
+    "\u08CF"=>220,
+    "\u08D0"=>220,
+    "\u08D1"=>220,
+    "\u08D2"=>220,
     "\u08D3"=>220,
     "\u08D4"=>230,
     "\u08D5"=>230,
@@ -1836,6 +1924,7 @@ module UnicodeNormalize  # :nodoc:
     "\u0B3C"=>7,
     "\u0B4D"=>9,
     "\u0BCD"=>9,
+    "\u0C3C"=>7,
     "\u0C4D"=>9,
     "\u0C55"=>84,
     "\u0C56"=>91,
@@ -1886,6 +1975,7 @@ module UnicodeNormalize  # :nodoc:
     "\u135E"=>230,
     "\u135F"=>230,
     "\u1714"=>9,
+    "\u1715"=>9,
     "\u1734"=>9,
     "\u17D2"=>9,
     "\u17DD"=>230,
@@ -1921,6 +2011,47 @@ module UnicodeNormalize  # :nodoc:
     "\u1ABD"=>220,
     "\u1ABF"=>220,
     "\u1AC0"=>220,
+    "\u1AC1"=>230,
+    "\u1AC2"=>230,
+    "\u1AC3"=>220,
+    "\u1AC4"=>220,
+    "\u1AC5"=>230,
+    "\u1AC6"=>230,
+    "\u1AC7"=>230,
+    "\u1AC8"=>230,
+    "\u1AC9"=>230,
+    "\u1ACA"=>220,
+    "\u1ACB"=>230,
+    "\u1ACC"=>230,
+    "\u1ACD"=>230,
+    "\u1ACE"=>230,
+    "\u1ACF"=>230,
+    "\u1AD0"=>230,
+    "\u1AD1"=>230,
+    "\u1AD2"=>230,
+    "\u1AD3"=>230,
+    "\u1AD4"=>230,
+    "\u1AD5"=>230,
+    "\u1AD6"=>230,
+    "\u1AD7"=>230,
+    "\u1AD8"=>230,
+    "\u1AD9"=>230,
+    "\u1ADA"=>230,
+    "\u1ADB"=>230,
+    "\u1ADC"=>230,
+    "\u1ADD"=>220,
+    "\u1AE0"=>230,
+    "\u1AE1"=>230,
+    "\u1AE2"=>230,
+    "\u1AE3"=>230,
+    "\u1AE4"=>230,
+    "\u1AE5"=>230,
+    "\u1AE6"=>220,
+    "\u1AE7"=>230,
+    "\u1AE8"=>230,
+    "\u1AE9"=>230,
+    "\u1AEA"=>230,
+    "\u1AEB"=>234,
     "\u1B34"=>7,
     "\u1B44"=>9,
     "\u1B6B"=>230,
@@ -2023,6 +2154,7 @@ module UnicodeNormalize  # :nodoc:
     "\u1DF7"=>228,
     "\u1DF8"=>228,
     "\u1DF9"=>220,
+    "\u1DFA"=>218,
     "\u1DFB"=>230,
     "\u1DFC"=>233,
     "\u1DFD"=>220,
@@ -2187,8 +2319,18 @@ module UnicodeNormalize  # :nodoc:
     "\u{10D25}"=>230,
     "\u{10D26}"=>230,
     "\u{10D27}"=>230,
+    "\u{10D69}"=>230,
+    "\u{10D6A}"=>230,
+    "\u{10D6B}"=>230,
+    "\u{10D6C}"=>230,
+    "\u{10D6D}"=>230,
     "\u{10EAB}"=>230,
     "\u{10EAC}"=>230,
+    "\u{10EFA}"=>220,
+    "\u{10EFB}"=>220,
+    "\u{10EFD}"=>220,
+    "\u{10EFE}"=>220,
+    "\u{10EFF}"=>220,
     "\u{10F46}"=>220,
     "\u{10F47}"=>220,
     "\u{10F48}"=>230,
@@ -2200,7 +2342,12 @@ module UnicodeNormalize  # :nodoc:
     "\u{10F4E}"=>220,
     "\u{10F4F}"=>220,
     "\u{10F50}"=>220,
+    "\u{10F82}"=>230,
+    "\u{10F83}"=>220,
+    "\u{10F84}"=>230,
+    "\u{10F85}"=>220,
     "\u{11046}"=>9,
+    "\u{11070}"=>9,
     "\u{1107F}"=>9,
     "\u{110B9}"=>9,
     "\u{110BA}"=>7,
@@ -2231,6 +2378,9 @@ module UnicodeNormalize  # :nodoc:
     "\u{11372}"=>230,
     "\u{11373}"=>230,
     "\u{11374}"=>230,
+    "\u{113CE}"=>9,
+    "\u{113CF}"=>9,
+    "\u{113D0}"=>9,
     "\u{11442}"=>9,
     "\u{11446}"=>7,
     "\u{1145E}"=>230,
@@ -2256,6 +2406,9 @@ module UnicodeNormalize  # :nodoc:
     "\u{11D44}"=>9,
     "\u{11D45}"=>9,
     "\u{11D97}"=>9,
+    "\u{11F41}"=>9,
+    "\u{11F42}"=>9,
+    "\u{1612F}"=>9,
     "\u{16AF0}"=>1,
     "\u{16AF1}"=>1,
     "\u{16AF2}"=>1,
@@ -2342,6 +2495,7 @@ module UnicodeNormalize  # :nodoc:
     "\u{1E028}"=>230,
     "\u{1E029}"=>230,
     "\u{1E02A}"=>230,
+    "\u{1E08F}"=>230,
     "\u{1E130}"=>230,
     "\u{1E131}"=>230,
     "\u{1E132}"=>230,
@@ -2349,10 +2503,22 @@ module UnicodeNormalize  # :nodoc:
     "\u{1E134}"=>230,
     "\u{1E135}"=>230,
     "\u{1E136}"=>230,
+    "\u{1E2AE}"=>230,
     "\u{1E2EC}"=>230,
     "\u{1E2ED}"=>230,
     "\u{1E2EE}"=>230,
     "\u{1E2EF}"=>230,
+    "\u{1E4EC}"=>232,
+    "\u{1E4ED}"=>232,
+    "\u{1E4EE}"=>220,
+    "\u{1E4EF}"=>230,
+    "\u{1E5EE}"=>230,
+    "\u{1E5EF}"=>220,
+    "\u{1E6E3}"=>230,
+    "\u{1E6E6}"=>230,
+    "\u{1E6EE}"=>230,
+    "\u{1E6EF}"=>230,
+    "\u{1E6F5}"=>230,
     "\u{1E8D0}"=>220,
     "\u{1E8D1}"=>220,
     "\u{1E8D2}"=>220,
@@ -3865,6 +4031,8 @@ module UnicodeNormalize  # :nodoc:
     "\uFB4C"=>"\u05D1\u05BF",
     "\uFB4D"=>"\u05DB\u05BF",
     "\uFB4E"=>"\u05E4\u05BF",
+    "\u{105C9}"=>"\u{105D2}\u0307",
+    "\u{105E4}"=>"\u{105DA}\u0307",
     "\u{1109A}"=>"\u{11099}\u{110BA}",
     "\u{1109C}"=>"\u{1109B}\u{110BA}",
     "\u{110AB}"=>"\u{110A5}\u{110BA}",
@@ -3872,12 +4040,30 @@ module UnicodeNormalize  # :nodoc:
     "\u{1112F}"=>"\u{11132}\u{11127}",
     "\u{1134B}"=>"\u{11347}\u{1133E}",
     "\u{1134C}"=>"\u{11347}\u{11357}",
+    "\u{11383}"=>"\u{11382}\u{113C9}",
+    "\u{11385}"=>"\u{11384}\u{113BB}",
+    "\u{1138E}"=>"\u{1138B}\u{113C2}",
+    "\u{11391}"=>"\u{11390}\u{113C9}",
+    "\u{113C5}"=>"\u{113C2}\u{113C2}",
+    "\u{113C7}"=>"\u{113C2}\u{113B8}",
+    "\u{113C8}"=>"\u{113C2}\u{113C9}",
     "\u{114BB}"=>"\u{114B9}\u{114BA}",
     "\u{114BC}"=>"\u{114B9}\u{114B0}",
     "\u{114BE}"=>"\u{114B9}\u{114BD}",
     "\u{115BA}"=>"\u{115B8}\u{115AF}",
     "\u{115BB}"=>"\u{115B9}\u{115AF}",
     "\u{11938}"=>"\u{11935}\u{11930}",
+    "\u{16121}"=>"\u{1611E}\u{1611E}",
+    "\u{16122}"=>"\u{1611E}\u{16129}",
+    "\u{16123}"=>"\u{1611E}\u{1611F}",
+    "\u{16124}"=>"\u{16129}\u{1611F}",
+    "\u{16125}"=>"\u{1611E}\u{16120}",
+    "\u{16126}"=>"\u{1611E}\u{1611E}\u{1611F}",
+    "\u{16127}"=>"\u{1611E}\u{16129}\u{1611F}",
+    "\u{16128}"=>"\u{1611E}\u{1611E}\u{16120}",
+    "\u{16D68}"=>"\u{16D67}\u{16D67}",
+    "\u{16D69}"=>"\u{16D63}\u{16D67}",
+    "\u{16D6A}"=>"\u{16D63}\u{16D67}\u{16D67}",
     "\u{1D15E}"=>"\u{1D157}\u{1D165}",
     "\u{1D15F}"=>"\u{1D158}\u{1D165}",
     "\u{1D160}"=>"\u{1D158}\u{1D165}\u{1D16E}",
@@ -5776,6 +5962,10 @@ module UnicodeNormalize  # :nodoc:
     "\uA69C"=>"\u044A",
     "\uA69D"=>"\u044C",
     "\uA770"=>"\uA76F",
+    "\uA7F1"=>"S",
+    "\uA7F2"=>"C",
+    "\uA7F3"=>"F",
+    "\uA7F4"=>"Q",
     "\uA7F8"=>"\u0126",
     "\uA7F9"=>"\u0153",
     "\uAB5C"=>"\uA727",
@@ -6828,6 +7018,98 @@ module UnicodeNormalize  # :nodoc:
     "\uFFEC"=>"\u2193",
     "\uFFED"=>"\u25A0",
     "\uFFEE"=>"\u25CB",
+    "\u{10781}"=>"\u02D0",
+    "\u{10782}"=>"\u02D1",
+    "\u{10783}"=>"\u00E6",
+    "\u{10784}"=>"\u0299",
+    "\u{10785}"=>"\u0253",
+    "\u{10787}"=>"\u02A3",
+    "\u{10788}"=>"\uAB66",
+    "\u{10789}"=>"\u02A5",
+    "\u{1078A}"=>"\u02A4",
+    "\u{1078B}"=>"\u0256",
+    "\u{1078C}"=>"\u0257",
+    "\u{1078D}"=>"\u1D91",
+    "\u{1078E}"=>"\u0258",
+    "\u{1078F}"=>"\u025E",
+    "\u{10790}"=>"\u02A9",
+    "\u{10791}"=>"\u0264",
+    "\u{10792}"=>"\u0262",
+    "\u{10793}"=>"\u0260",
+    "\u{10794}"=>"\u029B",
+    "\u{10795}"=>"\u0127",
+    "\u{10796}"=>"\u029C",
+    "\u{10797}"=>"\u0267",
+    "\u{10798}"=>"\u0284",
+    "\u{10799}"=>"\u02AA",
+    "\u{1079A}"=>"\u02AB",
+    "\u{1079B}"=>"\u026C",
+    "\u{1079C}"=>"\u{1DF04}",
+    "\u{1079D}"=>"\uA78E",
+    "\u{1079E}"=>"\u026E",
+    "\u{1079F}"=>"\u{1DF05}",
+    "\u{107A0}"=>"\u028E",
+    "\u{107A1}"=>"\u{1DF06}",
+    "\u{107A2}"=>"\u00F8",
+    "\u{107A3}"=>"\u0276",
+    "\u{107A4}"=>"\u0277",
+    "\u{107A5}"=>"q",
+    "\u{107A6}"=>"\u027A",
+    "\u{107A7}"=>"\u{1DF08}",
+    "\u{107A8}"=>"\u027D",
+    "\u{107A9}"=>"\u027E",
+    "\u{107AA}"=>"\u0280",
+    "\u{107AB}"=>"\u02A8",
+    "\u{107AC}"=>"\u02A6",
+    "\u{107AD}"=>"\uAB67",
+    "\u{107AE}"=>"\u02A7",
+    "\u{107AF}"=>"\u0288",
+    "\u{107B0}"=>"\u2C71",
+    "\u{107B2}"=>"\u028F",
+    "\u{107B3}"=>"\u02A1",
+    "\u{107B4}"=>"\u02A2",
+    "\u{107B5}"=>"\u0298",
+    "\u{107B6}"=>"\u01C0",
+    "\u{107B7}"=>"\u01C1",
+    "\u{107B8}"=>"\u01C2",
+    "\u{107B9}"=>"\u{1DF0A}",
+    "\u{107BA}"=>"\u{1DF1E}",
+    "\u{1CCD6}"=>"A",
+    "\u{1CCD7}"=>"B",
+    "\u{1CCD8}"=>"C",
+    "\u{1CCD9}"=>"D",
+    "\u{1CCDA}"=>"E",
+    "\u{1CCDB}"=>"F",
+    "\u{1CCDC}"=>"G",
+    "\u{1CCDD}"=>"H",
+    "\u{1CCDE}"=>"I",
+    "\u{1CCDF}"=>"J",
+    "\u{1CCE0}"=>"K",
+    "\u{1CCE1}"=>"L",
+    "\u{1CCE2}"=>"M",
+    "\u{1CCE3}"=>"N",
+    "\u{1CCE4}"=>"O",
+    "\u{1CCE5}"=>"P",
+    "\u{1CCE6}"=>"Q",
+    "\u{1CCE7}"=>"R",
+    "\u{1CCE8}"=>"S",
+    "\u{1CCE9}"=>"T",
+    "\u{1CCEA}"=>"U",
+    "\u{1CCEB}"=>"V",
+    "\u{1CCEC}"=>"W",
+    "\u{1CCED}"=>"X",
+    "\u{1CCEE}"=>"Y",
+    "\u{1CCEF}"=>"Z",
+    "\u{1CCF0}"=>"0",
+    "\u{1CCF1}"=>"1",
+    "\u{1CCF2}"=>"2",
+    "\u{1CCF3}"=>"3",
+    "\u{1CCF4}"=>"4",
+    "\u{1CCF5}"=>"5",
+    "\u{1CCF6}"=>"6",
+    "\u{1CCF7}"=>"7",
+    "\u{1CCF8}"=>"8",
+    "\u{1CCF9}"=>"9",
     "\u{1D400}"=>"A",
     "\u{1D401}"=>"B",
     "\u{1D402}"=>"C",
@@ -7824,6 +8106,68 @@ module UnicodeNormalize  # :nodoc:
     "\u{1D7FD}"=>"7",
     "\u{1D7FE}"=>"8",
     "\u{1D7FF}"=>"9",
+    "\u{1E030}"=>"\u0430",
+    "\u{1E031}"=>"\u0431",
+    "\u{1E032}"=>"\u0432",
+    "\u{1E033}"=>"\u0433",
+    "\u{1E034}"=>"\u0434",
+    "\u{1E035}"=>"\u0435",
+    "\u{1E036}"=>"\u0436",
+    "\u{1E037}"=>"\u0437",
+    "\u{1E038}"=>"\u0438",
+    "\u{1E039}"=>"\u043A",
+    "\u{1E03A}"=>"\u043B",
+    "\u{1E03B}"=>"\u043C",
+    "\u{1E03C}"=>"\u043E",
+    "\u{1E03D}"=>"\u043F",
+    "\u{1E03E}"=>"\u0440",
+    "\u{1E03F}"=>"\u0441",
+    "\u{1E040}"=>"\u0442",
+    "\u{1E041}"=>"\u0443",
+    "\u{1E042}"=>"\u0444",
+    "\u{1E043}"=>"\u0445",
+    "\u{1E044}"=>"\u0446",
+    "\u{1E045}"=>"\u0447",
+    "\u{1E046}"=>"\u0448",
+    "\u{1E047}"=>"\u044B",
+    "\u{1E048}"=>"\u044D",
+    "\u{1E049}"=>"\u044E",
+    "\u{1E04A}"=>"\uA689",
+    "\u{1E04B}"=>"\u04D9",
+    "\u{1E04C}"=>"\u0456",
+    "\u{1E04D}"=>"\u0458",
+    "\u{1E04E}"=>"\u04E9",
+    "\u{1E04F}"=>"\u04AF",
+    "\u{1E050}"=>"\u04CF",
+    "\u{1E051}"=>"\u0430",
+    "\u{1E052}"=>"\u0431",
+    "\u{1E053}"=>"\u0432",
+    "\u{1E054}"=>"\u0433",
+    "\u{1E055}"=>"\u0434",
+    "\u{1E056}"=>"\u0435",
+    "\u{1E057}"=>"\u0436",
+    "\u{1E058}"=>"\u0437",
+    "\u{1E059}"=>"\u0438",
+    "\u{1E05A}"=>"\u043A",
+    "\u{1E05B}"=>"\u043B",
+    "\u{1E05C}"=>"\u043E",
+    "\u{1E05D}"=>"\u043F",
+    "\u{1E05E}"=>"\u0441",
+    "\u{1E05F}"=>"\u0443",
+    "\u{1E060}"=>"\u0444",
+    "\u{1E061}"=>"\u0445",
+    "\u{1E062}"=>"\u0446",
+    "\u{1E063}"=>"\u0447",
+    "\u{1E064}"=>"\u0448",
+    "\u{1E065}"=>"\u044A",
+    "\u{1E066}"=>"\u044B",
+    "\u{1E067}"=>"\u0491",
+    "\u{1E068}"=>"\u0456",
+    "\u{1E069}"=>"\u0455",
+    "\u{1E06A}"=>"\u045F",
+    "\u{1E06B}"=>"\u04AB",
+    "\u{1E06C}"=>"\uA651",
+    "\u{1E06D}"=>"\u04B1",
     "\u{1EE00}"=>"\u0627",
     "\u{1EE01}"=>"\u0628",
     "\u{1EE02}"=>"\u062C",
@@ -9058,6 +9402,8 @@ module UnicodeNormalize  # :nodoc:
     "\u30F1\u3099"=>"\u30F9",
     "\u30F2\u3099"=>"\u30FA",
     "\u30FD\u3099"=>"\u30FE",
+    "\u{105D2}\u0307"=>"\u{105C9}",
+    "\u{105DA}\u0307"=>"\u{105E4}",
     "\u{11099}\u{110BA}"=>"\u{1109A}",
     "\u{1109B}\u{110BA}"=>"\u{1109C}",
     "\u{110A5}\u{110BA}"=>"\u{110AB}",
@@ -9065,11 +9411,29 @@ module UnicodeNormalize  # :nodoc:
     "\u{11132}\u{11127}"=>"\u{1112F}",
     "\u{11347}\u{1133E}"=>"\u{1134B}",
     "\u{11347}\u{11357}"=>"\u{1134C}",
+    "\u{11382}\u{113C9}"=>"\u{11383}",
+    "\u{11384}\u{113BB}"=>"\u{11385}",
+    "\u{1138B}\u{113C2}"=>"\u{1138E}",
+    "\u{11390}\u{113C9}"=>"\u{11391}",
+    "\u{113C2}\u{113C2}"=>"\u{113C5}",
+    "\u{113C2}\u{113B8}"=>"\u{113C7}",
+    "\u{113C2}\u{113C9}"=>"\u{113C8}",
     "\u{114B9}\u{114BA}"=>"\u{114BB}",
     "\u{114B9}\u{114B0}"=>"\u{114BC}",
     "\u{114B9}\u{114BD}"=>"\u{114BE}",
     "\u{115B8}\u{115AF}"=>"\u{115BA}",
     "\u{115B9}\u{115AF}"=>"\u{115BB}",
     "\u{11935}\u{11930}"=>"\u{11938}",
+    "\u{1611E}\u{1611E}"=>"\u{16121}",
+    "\u{1611E}\u{16129}"=>"\u{16122}",
+    "\u{1611E}\u{1611F}"=>"\u{16123}",
+    "\u{16129}\u{1611F}"=>"\u{16124}",
+    "\u{1611E}\u{16120}"=>"\u{16125}",
+    "\u{16121}\u{1611F}"=>"\u{16126}",
+    "\u{16122}\u{1611F}"=>"\u{16127}",
+    "\u{16121}\u{16120}"=>"\u{16128}",
+    "\u{16D67}\u{16D67}"=>"\u{16D68}",
+    "\u{16D63}\u{16D67}"=>"\u{16D69}",
+    "\u{16D69}\u{16D67}"=>"\u{16D6A}",
   }.freeze
 end
diff --git a/lib/ruby/stdlib/win32/registry.rb b/lib/ruby/stdlib/win32/registry.rb
deleted file mode 100644
index d0cbb6afcfc..00000000000
--- a/lib/ruby/stdlib/win32/registry.rb
+++ /dev/null
@@ -1,925 +0,0 @@
-# frozen_string_literal: true
-require 'fiddle/import'
-
-module Win32
-
-=begin rdoc
-= Win32 Registry
-
-win32/registry is registry accessor library for Win32 platform.
-It uses importer to call Win32 Registry APIs.
-
-== example
-  Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
-    value = reg['foo']                               # read a value
-    value = reg['foo', Win32::Registry::REG_SZ]      # read a value with type
-    type, value = reg.read('foo')                    # read a value
-    reg['foo'] = 'bar'                               # write a value
-    reg['foo', Win32::Registry::REG_SZ] = 'bar'      # write a value with type
-    reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
-
-    reg.each_value { |name, type, data| ... }        # Enumerate values
-    reg.each_key { |key, wtime| ... }                # Enumerate subkeys
-
-    reg.delete_value(name)                         # Delete a value
-    reg.delete_key(name)                           # Delete a subkey
-    reg.delete_key(name, true)                     # Delete a subkey recursively
-  end
-
-= Reference
-
-== Win32::Registry class
-
---- info
-
---- num_keys
-
---- max_key_length
-
---- num_values
-
---- max_value_name_length
-
---- max_value_length
-
---- descriptor_length
-
---- wtime
-    Returns an item of key information.
-
-=== constants
---- HKEY_CLASSES_ROOT
-
---- HKEY_CURRENT_USER
-
---- HKEY_LOCAL_MACHINE
-
---- HKEY_PERFORMANCE_DATA
-
---- HKEY_CURRENT_CONFIG
-
---- HKEY_DYN_DATA
-
-    Win32::Registry object whose key is predefined key.
-For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp] article.
-
-=end rdoc
-
-  WCHAR = Encoding::UTF_16LE
-  WCHAR_NUL = "\0".encode(WCHAR).freeze
-  WCHAR_CR = "\r".encode(WCHAR).freeze
-  WCHAR_SIZE = WCHAR_NUL.bytesize
-  LOCALE = Encoding::UTF_8
-
-  class Registry
-
-    #
-    # For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp].
-    #
-    # --- HKEY_*
-    #
-    #     Predefined key ((*handle*)).
-    #     These are Integer, not Win32::Registry.
-    #
-    # --- REG_*
-    #
-    #     Registry value type.
-    #
-    # --- KEY_*
-    #
-    #     Security access mask.
-    #
-    # --- KEY_OPTIONS_*
-    #
-    #     Key options.
-    #
-    # --- REG_CREATED_NEW_KEY
-    #
-    # --- REG_OPENED_EXISTING_KEY
-    #
-    #     If the key is created newly or opened existing key.
-    #     See also Registry#disposition method.
-    module Constants
-      HKEY_CLASSES_ROOT = 0x80000000
-      HKEY_CURRENT_USER = 0x80000001
-      HKEY_LOCAL_MACHINE = 0x80000002
-      HKEY_USERS = 0x80000003
-      HKEY_PERFORMANCE_DATA = 0x80000004
-      HKEY_PERFORMANCE_TEXT = 0x80000050
-      HKEY_PERFORMANCE_NLSTEXT = 0x80000060
-      HKEY_CURRENT_CONFIG = 0x80000005
-      HKEY_DYN_DATA = 0x80000006
-
-      REG_NONE = 0
-      REG_SZ = 1
-      REG_EXPAND_SZ = 2
-      REG_BINARY = 3
-      REG_DWORD = 4
-      REG_DWORD_LITTLE_ENDIAN = 4
-      REG_DWORD_BIG_ENDIAN = 5
-      REG_LINK = 6
-      REG_MULTI_SZ = 7
-      REG_RESOURCE_LIST = 8
-      REG_FULL_RESOURCE_DESCRIPTOR = 9
-      REG_RESOURCE_REQUIREMENTS_LIST = 10
-      REG_QWORD = 11
-      REG_QWORD_LITTLE_ENDIAN = 11
-
-      STANDARD_RIGHTS_READ = 0x00020000
-      STANDARD_RIGHTS_WRITE = 0x00020000
-      KEY_QUERY_VALUE = 0x0001
-      KEY_SET_VALUE = 0x0002
-      KEY_CREATE_SUB_KEY = 0x0004
-      KEY_ENUMERATE_SUB_KEYS = 0x0008
-      KEY_NOTIFY = 0x0010
-      KEY_CREATE_LINK = 0x0020
-      KEY_READ = STANDARD_RIGHTS_READ |
-        KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
-      KEY_WRITE = STANDARD_RIGHTS_WRITE |
-        KEY_SET_VALUE | KEY_CREATE_SUB_KEY
-      KEY_EXECUTE = KEY_READ
-      KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-
-      REG_OPTION_RESERVED = 0x0000
-      REG_OPTION_NON_VOLATILE = 0x0000
-      REG_OPTION_VOLATILE = 0x0001
-      REG_OPTION_CREATE_LINK = 0x0002
-      REG_OPTION_BACKUP_RESTORE = 0x0004
-      REG_OPTION_OPEN_LINK = 0x0008
-      REG_LEGAL_OPTION = REG_OPTION_RESERVED |
-        REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
-        REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
-
-      REG_CREATED_NEW_KEY = 1
-      REG_OPENED_EXISTING_KEY = 2
-
-      REG_WHOLE_HIVE_VOLATILE = 0x0001
-      REG_REFRESH_HIVE = 0x0002
-      REG_NO_LAZY_FLUSH = 0x0004
-      REG_FORCE_RESTORE = 0x0008
-
-      MAX_KEY_LENGTH = 514
-      MAX_VALUE_LENGTH = 32768
-    end
-    include Constants
-    include Enumerable
-
-    #
-    # Error
-    #
-    class Error < ::StandardError
-      module Kernel32
-        extend Fiddle::Importer
-        dlload "kernel32.dll"
-      end
-      FormatMessageW = Kernel32.extern "int FormatMessageW(int, void *, int, int, void *, int, void *)", :stdcall
-      def initialize(code)
-        @code = code
-        buff = WCHAR_NUL * 1024
-        lang = 0
-        begin
-          len = FormatMessageW.call(0x1200, nil, code, lang, buff, 1024, nil)
-          msg = buff.byteslice(0, len * WCHAR_SIZE)
-          msg.delete!(WCHAR_CR)
-          msg.chomp!
-          msg.encode!(LOCALE)
-        rescue EncodingError
-          raise unless lang == 0
-          lang = 0x0409         # en_US
-          retry
-        end
-        super msg
-      end
-      attr_reader :code
-    end
-
-    #
-    # Predefined Keys
-    #
-    class PredefinedKey < Registry
-      def initialize(hkey, keyname)
-        @hkey = Fiddle::Pointer.new(hkey)
-        @parent = nil
-        @keyname = keyname
-        @disposition = REG_OPENED_EXISTING_KEY
-      end
-
-      # Predefined keys cannot be closed
-      def close
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-
-      # Fake #class method for Registry#open, Registry#create
-      def class
-        Registry
-      end
-
-      # Make all
-      Constants.constants.grep(/^HKEY_/) do |c|
-        Registry.const_set c, new(Constants.const_get(c), c.to_s)
-      end
-    end
-
-    #
-    # Win32 APIs
-    #
-    module API
-      include Constants
-      extend Fiddle::Importer
-      dlload "advapi32.dll"
-      [
-        "long RegOpenKeyExW(void *, void *, long, long, void *)",
-        "long RegCreateKeyExW(void *, void *, long, long, long, long, void *, void *, void *)",
-        "long RegEnumValueW(void *, long, void *, void *, void *, void *, void *, void *)",
-        "long RegEnumKeyExW(void *, long, void *, void *, void *, void *, void *, void *)",
-        "long RegQueryValueExW(void *, void *, void *, void *, void *, void *)",
-        "long RegSetValueExW(void *, void *, long, long, void *, long)",
-        "long RegDeleteValueW(void *, void *)",
-        "long RegDeleteKeyW(void *, void *)",
-        "long RegFlushKey(void *)",
-        "long RegCloseKey(void *)",
-        "long RegQueryInfoKeyW(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
-      ].each do |fn|
-        cfunc = extern fn, :stdcall
-        const_set cfunc.name.intern, cfunc
-      end
-
-      module_function
-
-      def check(result)
-        raise Error, result, caller(1) if result != 0
-      end
-
-      def win64?
-        /^(?:x64|x86_64)/ =~ RUBY_PLATFORM
-      end
-
-      TEMPLATE_HANDLE = 'J<'
-
-      def packhandle(h)
-        [h].pack(TEMPLATE_HANDLE)
-      end
-
-      def unpackhandle(h)
-        (h + [0].pack(TEMPLATE_HANDLE)).unpack1(TEMPLATE_HANDLE)
-      end
-
-      TEMPLATE_DWORD = 'V'
-
-      def packdw(dw)
-        [dw].pack(TEMPLATE_DWORD)
-      end
-
-      def unpackdw(dw)
-        (dw + [0].pack(TEMPLATE_DWORD)).unpack1(TEMPLATE_DWORD)
-      end
-
-      TEMPLATE_QWORD = 'Q<'
-
-      def packqw(qw)
-        [qw].pack(TEMPLATE_QWORD)
-      end
-
-      def unpackqw(qw)
-        (qw + [0].pack(TEMPLATE_QWORD)).unpack1(TEMPLATE_QWORD)
-      end
-
-      def make_wstr(str)
-        (str+"\0").encode(WCHAR)
-      end
-
-      def OpenKey(hkey, name, opt, desired)
-        result = packhandle(0)
-        check RegOpenKeyExW.call(hkey, make_wstr(name), opt, desired, result)
-        unpackhandle(result)
-      end
-
-      def CreateKey(hkey, name, opt, desired)
-        result = packhandle(0)
-        disp = packdw(0)
-        check RegCreateKeyExW.call(hkey, make_wstr(name), 0, 0, opt, desired,
-                                   nil, result, disp)
-        [ unpackhandle(result), unpackdw(disp) ]
-      end
-
-      def EnumValue(hkey, index)
-        name = WCHAR_NUL * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        check RegEnumValueW.call(hkey, index, name, size, nil, nil, nil, nil)
-        name.byteslice(0, unpackdw(size) * WCHAR_SIZE)
-      end
-
-      def EnumKey(hkey, index)
-        name = WCHAR_NUL * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        wtime = ' ' * 8
-        check RegEnumKeyExW.call(hkey, index, name, size, nil, nil, nil, wtime)
-        [ name.byteslice(0, unpackdw(size) * WCHAR_SIZE), unpackqw(wtime) ]
-      end
-
-      def QueryValue(hkey, name)
-        type = packdw(0)
-        size = packdw(0)
-        name = make_wstr(name)
-        check RegQueryValueExW.call(hkey, name, nil, type, nil, size)
-        data = "\0".b * unpackdw(size)
-        check RegQueryValueExW.call(hkey, name, nil, type, data, size)
-        [ unpackdw(type), data[0, unpackdw(size)] ]
-      end
-
-      def SetValue(hkey, name, type, data, size)
-        case type
-        when REG_SZ, REG_EXPAND_SZ, REG_MULTI_SZ
-          data = data.encode(WCHAR)
-          size ||= data.bytesize + WCHAR_SIZE
-        end
-        check RegSetValueExW.call(hkey, make_wstr(name), 0, type, data, size)
-      end
-
-      def DeleteValue(hkey, name)
-        check RegDeleteValueW.call(hkey, make_wstr(name))
-      end
-
-      def DeleteKey(hkey, name)
-        check RegDeleteKeyW.call(hkey, make_wstr(name))
-      end
-
-      def FlushKey(hkey)
-        check RegFlushKey.call(hkey)
-      end
-
-      def CloseKey(hkey)
-        check RegCloseKey.call(hkey)
-      end
-
-      def QueryInfoKey(hkey)
-        subkeys = packdw(0)
-        maxsubkeylen = packdw(0)
-        values = packdw(0)
-        maxvaluenamelen = packdw(0)
-        maxvaluelen = packdw(0)
-        secdescs = packdw(0)
-        wtime = ' ' * 8
-        check RegQueryInfoKeyW.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
-          values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
-        [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
-          unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
-          unpackdw(secdescs), unpackqw(wtime) ]
-      end
-    end
-
-    #
-    # Replace %\w+% into the environment value of what is contained between the %'s
-    # This method is used for REG_EXPAND_SZ.
-    #
-    # For detail, see expandEnvironmentStrings[http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp] \Win32 \API.
-    #
-    def self.expand_environ(str)
-      str.gsub(Regexp.compile("%([^%]+)%".encode(str.encoding))) {
-        v = $1.encode(LOCALE)
-        (ENV[v] || ENV[v.upcase])&.encode(str.encoding) || $&
-      }
-    end
-
-    @@type2name = %w[
-      REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
-      REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
-      REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
-      REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
-    ].inject([]) do |ary, type|
-      ary[Constants.const_get(type)] = type
-      ary
-    end.freeze
-
-    #
-    # Convert registry type value to readable string.
-    #
-    def self.type2name(type)
-      @@type2name[type] || type.to_s
-    end
-
-    #
-    # Convert 64-bit FILETIME integer into Time object.
-    #
-    def self.wtime2time(wtime)
-      Time.at((wtime - 116444736000000000) / 10000000)
-    end
-
-    #
-    # Convert Time object or Integer object into 64-bit FILETIME.
-    #
-    def self.time2wtime(time)
-      time.to_i * 10000000 + 116444736000000000
-    end
-
-    #
-    # constructor
-    #
-    private_class_method :new
-
-    #
-    # --- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-    #
-    # --- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
-    #
-    # Open the registry key subkey under key.
-    # key is Win32::Registry object of parent key.
-    # You can use predefined key HKEY_* (see Constants)
-    # desired and opt is access mask and key option.
-    # For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp].
-    # If block is given, the key is closed automatically.
-    def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-      subkey = subkey.chomp('\\')
-      newkey = API.OpenKey(hkey.instance_variable_get(:@hkey), subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-
-    #
-    # --- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-    #
-    # --- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
-    #
-    # Create or open the registry key subkey under key.
-    # You can use predefined key HKEY_* (see Constants)
-    #
-    # If subkey is already exists, key is opened and Registry#created?
-    # method will return false.
-    #
-    # If block is given, the key is closed automatically.
-    #
-    def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-      newkey, disp = API.CreateKey(hkey.instance_variable_get(:@hkey), subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, disp)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-
-    #
-    # finalizer
-    #
-    @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
-
-    #
-    # initialize
-    #
-    def initialize(hkey, parent, keyname, disposition)
-      @hkey = Fiddle::Pointer.new(hkey)
-      @parent = parent
-      @keyname = keyname
-      @disposition = disposition
-      @hkeyfinal = [ hkey ]
-      ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
-    end
-
-    # Win32::Registry object of parent key, or nil if predefeined key.
-    attr_reader :parent
-    # Same as subkey value of Registry.open or
-    # Registry.create method.
-    attr_reader :keyname
-    #  Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
-    attr_reader :disposition
-
-    #  Returns key handle value.
-    def hkey
-      @hkey.to_i
-    end
-
-    #
-    # Returns if key is created ((*newly*)).
-    # (see Registry.create) -- basically you call create
-    # then when you call created? on the instance returned
-    # it will tell if it was successful or not
-    #
-    def created?
-      @disposition == REG_CREATED_NEW_KEY
-    end
-
-    #
-    # Returns if key is not closed.
-    #
-    def open?
-      !@hkey.nil?
-    end
-
-    #
-    # Full path of key such as 'HKEY_CURRENT_USER\SOFTWARE\foo\bar'.
-    #
-    def name
-      parent = self
-      name = @keyname
-      while parent = parent.parent
-        name = parent.keyname + '\\' + name
-      end
-      name
-    end
-
-    def inspect
-      "\#<Win32::Registry key=#{name.inspect}>"
-    end
-
-    #
-    # marshalling is not allowed
-    #
-    def _dump(depth)
-      raise TypeError, "can't dump Win32::Registry"
-    end
-
-    #
-    # Same as Win32::Registry.open (self, subkey, desired, opt)
-    #
-    def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
-      self.class.open(self, subkey, desired, opt, &blk)
-    end
-
-    #
-    # Same as Win32::Registry.create (self, subkey, desired, opt)
-    #
-    def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
-      self.class.create(self, subkey, desired, opt, &blk)
-    end
-
-    #
-    # Close key.
-    #
-    # After close, most method raise an error.
-    #
-    def close
-      API.CloseKey(@hkey)
-      @hkey = @parent = @keyname = nil
-      @hkeyfinal[0] = nil
-    end
-
-    #
-    # Enumerate all values in this registry path.
-    #
-    # For each value it yields key, type and data.
-    #
-    # key is a String which contains name of key.
-    # type is a type contant kind of Win32::Registry::REG_*
-    # data is the value of this key.
-    #
-    def each_value
-      return enum_for(:each_value) unless block_given?
-      index = 0
-      while true
-        begin
-          subkey = API.EnumValue(@hkey, index)
-        rescue Error
-          break
-        end
-        subkey = export_string(subkey)
-        begin
-          type, data = read(subkey)
-        rescue Error
-        else
-          yield subkey, type, data
-        end
-        index += 1
-      end
-      index
-    end
-    alias each each_value
-
-    #
-    # return values as an array
-    #
-    def values
-      vals_ary = []
-      each_value { |*, val| vals_ary << val }
-      vals_ary
-    end
-
-    #
-    # Enumerate all subkeys.
-    #
-    # For each subkey it yields subkey and wtime.
-    #
-    # subkey is String which contains name of subkey.
-    # wtime is last write time as FILETIME (64-bit integer).
-    # (see Registry.wtime2time)
-    #
-    def each_key
-      return enum_for(:each_key) unless block_given?
-      index = 0
-      while true
-        begin
-          subkey, wtime = API.EnumKey(@hkey, index)
-        rescue Error
-          break
-        end
-        subkey = export_string(subkey)
-        yield subkey, wtime
-        index += 1
-      end
-      index
-    end
-
-    #
-    # return keys as an array
-    #
-    def keys
-      keys_ary = []
-      each_key { |key,| keys_ary << key }
-      keys_ary
-    end
-
-    # Read a registry value named name and return array of
-    # [ type, data ].
-    # When name is nil, the `default' value is read.
-    # type is value type. (see Win32::Registry::Constants module)
-    # data is value data, its class is:
-    # :REG_SZ, REG_EXPAND_SZ
-    #    String
-    # :REG_MULTI_SZ
-    #    Array of String
-    # :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
-    #    Integer
-    # :REG_BINARY, REG_NONE
-    #    String (contains binary data)
-    #
-    # When rtype is specified, the value type must be included by
-    # rtype array, or TypeError is raised.
-    def read(name, *rtype)
-      type, data = API.QueryValue(@hkey, name)
-      unless rtype.empty? or rtype.include?(type)
-        raise TypeError, "Type mismatch (expect [#{
-          rtype.map{|t|Registry.type2name(t)}.join(', ')}] but #{
-          Registry.type2name(type)} present)"
-      end
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        [ type, data.encode(name.encoding, WCHAR).chop ]
-      when REG_MULTI_SZ
-        [ type, data.encode(name.encoding, WCHAR).split(/\0/) ]
-      when REG_BINARY, REG_NONE
-        [ type, data ]
-      when REG_DWORD
-        [ type, API.unpackdw(data) ]
-      when REG_DWORD_BIG_ENDIAN
-        [ type, data.unpack1('N') ]
-      when REG_QWORD
-        [ type, API.unpackqw(data) ]
-      else
-        raise TypeError, "Type #{Registry.type2name(type)} is not supported."
-      end
-    end
-
-    #
-    # Read a registry value named name and return its value data.
-    # The class of the value is the same as the #read method returns.
-    #
-    # If the value type is REG_EXPAND_SZ, returns value data whose environment
-    # variables are replaced.
-    # If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
-    # REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
-    #
-    # The meaning of rtype is the same as for the #read method.
-    #
-    def [](name, *rtype)
-      type, data = read(name, *rtype)
-      case type
-      when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
-        data
-      when REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        raise TypeError, "Type #{Registry.type2name(type)} is not supported."
-      end
-    end
-
-    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    # registry value named name.
-    #
-    # If the values type does not match, TypeError is raised.
-    def read_s(name)
-      read(name, REG_SZ)[1]
-    end
-
-    #
-    # Read a REG_SZ or REG_EXPAND_SZ registry value named name.
-    #
-    # If the value type is REG_EXPAND_SZ, environment variables are replaced.
-    # Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
-    #
-    def read_s_expand(name)
-      type, data = read(name, REG_SZ, REG_EXPAND_SZ)
-      if type == REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        data
-      end
-    end
-
-    #
-    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    # registry value named name.
-    #
-    # If the values type does not match, TypeError is raised.
-    #
-    def read_i(name)
-      read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
-    end
-
-    #
-    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    # registry value named name.
-    #
-    # If the values type does not match, TypeError is raised.
-    #
-    def read_bin(name)
-      read(name, REG_BINARY)[1]
-    end
-
-    #
-    # Write data to a registry value named name.
-    # When name is nil, write to the `default' value.
-    #
-    # type is type value. (see Registry::Constants module)
-    # Class of data must be same as which #read
-    # method returns.
-    #
-    def write(name, type, data)
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        data = data.encode(WCHAR) << WCHAR_NUL
-      when REG_MULTI_SZ
-        data = data.to_a.map {|s| s.encode(WCHAR)}.join(WCHAR_NUL) << WCHAR_NUL
-      when REG_BINARY, REG_NONE
-        data = data.to_s
-      when REG_DWORD
-        data = API.packdw(data.to_i)
-      when REG_DWORD_BIG_ENDIAN
-        data = [data.to_i].pack('N')
-      when REG_QWORD
-        data = API.packqw(data.to_i)
-      else
-        raise TypeError, "Unsupported type #{Registry.type2name(type)}"
-      end
-      API.SetValue(@hkey, name, type, data, data.bytesize)
-    end
-
-    #
-    # Write value to a registry value named name.
-    #
-    # If wtype is specified, the value type is it.
-    # Otherwise, the value type is depend on class of value:
-    # :Integer
-    #   REG_DWORD
-    # :String
-    #   REG_SZ
-    # :Array
-    #   REG_MULTI_SZ
-    #
-    def []=(name, rtype, value = nil)
-      if value
-        write name, rtype, value
-      else
-        case value = rtype
-        when Integer
-          write name, REG_DWORD, value
-        when String
-          write name, REG_SZ, value
-        when Array
-          write name, REG_MULTI_SZ, value
-        else
-          raise TypeError, "Unexpected type #{value.class}"
-        end
-      end
-      value
-    end
-
-    #
-    # Write value to a registry value named name.
-    #
-    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    # REG_BINARY(write_bin).
-    #
-    def write_s(name, value)
-      write name, REG_SZ, value.to_s
-    end
-
-    #
-    # Write value to a registry value named name.
-    #
-    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    # REG_BINARY(write_bin).
-    #
-    def write_i(name, value)
-      write name, REG_DWORD, value.to_i
-    end
-
-    #
-    # Write value to a registry value named name.
-    #
-    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    # REG_BINARY(write_bin).
-    #
-    def write_bin(name, value)
-      write name, REG_BINARY, value.to_s
-    end
-
-    #
-    # Delete a registry value named name.
-    # We can not delete the `default' value.
-    #
-    def delete_value(name)
-      API.DeleteValue(@hkey, name)
-    end
-    alias delete delete_value
-
-    #
-    # Delete a subkey named name and all its values.
-    #
-    # If recursive is false, the subkey must not have subkeys.
-    # Otherwise, this method deletes all subkeys and values recursively.
-    #
-    def delete_key(name, recursive = false)
-      if recursive
-        open(name, KEY_ALL_ACCESS) do |reg|
-          reg.keys.each do |key|
-            begin
-              reg.delete_key(key, true)
-            rescue Error
-              #
-            end
-          end
-        end
-        API.DeleteKey(@hkey, name)
-      else
-        begin
-          API.EnumKey @hkey, 0
-        rescue Error
-          return API.DeleteKey(@hkey, name)
-        end
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-    end
-
-    #
-    # Write all the attributes into the registry file.
-    #
-    def flush
-      API.FlushKey @hkey
-    end
-
-    #
-    # Returns key information as Array of:
-    # :num_keys
-    #   The number of subkeys.
-    # :max_key_length
-    #   Maximum length of name of subkeys.
-    # :num_values
-    #   The number of values.
-    # :max_value_name_length
-    #   Maximum length of name of values.
-    # :max_value_length
-    #   Maximum length of value of values.
-    # :descriptor_length
-    #   Length of security descriptor.
-    # :wtime
-    #   Last write time as FILETIME(64-bit integer)
-    #
-    # For detail, see RegQueryInfoKey[http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp] Win32 API.
-    #
-    def info
-      API.QueryInfoKey(@hkey)
-    end
-
-    #
-    # Returns an item of key information.
-    #
-    %w[
-      num_keys max_key_length
-      num_values max_value_name_length max_value_length
-      descriptor_length wtime
-    ].each_with_index do |s, i|
-      eval <<-__END__
-        def #{s}
-          info[#{i}]
-        end
-      __END__
-    end
-
-    private
-
-    def export_string(str, enc = Encoding.default_internal || LOCALE) # :nodoc:
-      str.encode(enc)
-    end
-  end
-end
diff --git a/maven/jruby-dist/pom.rb b/maven/jruby-dist/pom.rb
index 97ff0d655c0..8d12e5f67e8 100644
--- a/maven/jruby-dist/pom.rb
+++ b/maven/jruby-dist/pom.rb
@@ -36,13 +36,13 @@
           <ftp action="get" server="rsync.osuosl.org" passive="yes" userid="anonymous" password=""
                remotedir="/debian/pool/main/r/ruby3.4" depends="yes">
             <fileset dir="${project.build.directory}/rdoc/downloads">
-              <include name="ruby3.4-doc*.deb"/>
+              <include name="ruby3.4-doc_3.4.5*.deb"/>
             </fileset>
           </ftp>
 
           <!-- Move the .deb file to a simple name (should be only one or this will fail) -->
           <move tofile="${project.build.directory}/rdoc/downloads/rubydoc.deb">
-            <fileset dir="${project.build.directory}/rdoc/downloads" includes="ruby3.4-doc*.deb"/>
+            <fileset dir="${project.build.directory}/rdoc/downloads" includes="ruby3.4-doc_3.4.5*.deb"/>
           </move>
 
           <!-- Extract .deb using ar -->
diff --git a/maven/jruby-dist/src/main/assembly/common.xml b/maven/jruby-dist/src/main/assembly/common.xml
index 1e241b14e86..b65c0590bb7 100644
--- a/maven/jruby-dist/src/main/assembly/common.xml
+++ b/maven/jruby-dist/src/main/assembly/common.xml
@@ -44,6 +44,13 @@
         <include>*.gemspec</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/rubygems-provided/extensions</directory>
+      <outputDirectory>/lib/ruby/gems/shared/extensions</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>${project.build.directory}/rdoc/unpacked/usr</directory>
       <outputDirectory>/</outputDirectory>
diff --git a/maven/jruby/README.md b/maven/jruby/README.md
index 8390ca7a31d..f124d4d914d 100644
--- a/maven/jruby/README.md
+++ b/maven/jruby/README.md
@@ -6,7 +6,7 @@ mvn verify -Papps
 ```
 or from the jruby root directory
 ```
-mvn -Papps
+./mvnw -Papps
 ```
 
 
diff --git a/mvnw b/mvnw
index 8d937f4c14f..bd8896bf221 100755
--- a/mvnw
+++ b/mvnw
@@ -19,290 +19,277 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.2.0
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
+# Apache Maven Wrapper startup batch script, version 3.3.4
 #
 # Optional ENV vars
 # -----------------
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
 # ----------------------------------------------------------------------------
 
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /usr/local/etc/mavenrc ] ; then
-    . /usr/local/etc/mavenrc
-  fi
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
 
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
 case "$(uname)" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
-      else
-        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
-      fi
-    fi
-    ;;
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
 esac
 
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=$(java-config --jre-home)
-  fi
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
-    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="$(which javac)"
-  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=$(which readlink)
-    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
-      if $darwin ; then
-        javaHome="$(dirname "\"$javaExecutable\"")"
-        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
-      else
-        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
-      fi
-      javaHome="$(dirname "\"$javaExecutable\"")"
-      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
       # IBM's JDK on AIX uses strange locations for the executables
       JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
     else
       JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
     fi
   else
-    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
-  fi
-fi
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
 
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
   fi
+}
 
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=$(cd "$wdir/.." || exit 1; pwd)
-    fi
-    # end of workaround
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
   done
-  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
+  printf %x\\n $h
 }
 
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    # Remove \r in case we run on Windows within Git Bash
-    # and check out the repository with auto CRLF management
-    # enabled. Otherwise, we may read lines that are delimited with
-    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
-    # splitting rules.
-    tr -s '\r\n' ' ' < "$1"
-  fi
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
 }
 
-log() {
-  if [ "$MVNW_VERBOSE" = true ]; then
-    printf '%s\n' "$1"
-  fi
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+scriptDir="$(dirname "$0")"
+scriptName="$(basename "$0")"
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
 }
 
-BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
 fi
 
-MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
-log "$MAVEN_PROJECTBASEDIR"
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
 
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
-if [ -r "$wrapperJarPath" ]; then
-    log "Found $wrapperJarPath"
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
 else
-    log "Couldn't find $wrapperJarPath, downloading it ..."
+  die "cannot create temp dir"
+fi
 
-    if [ -n "$MVNW_REPOURL" ]; then
-      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    else
-      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    fi
-    while IFS="=" read -r key value; do
-      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
-      safeValue=$(echo "$value" | tr -d '\r')
-      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
-      esac
-    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-    log "Downloading from: $wrapperUrl"
-
-    if $cygwin; then
-      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
-    fi
+mkdir -p -- "${MAVEN_HOME%/*}"
 
-    if command -v wget > /dev/null; then
-        log "Found wget ... using wget"
-        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        else
-            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        log "Found curl ... using curl"
-        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-        else
-            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-        fi
-    else
-        log "Falling back to using Java to download"
-        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaSource=$(cygpath --path --windows "$javaSource")
-          javaClass=$(cygpath --path --windows "$javaClass")
-        fi
-        if [ -e "$javaSource" ]; then
-            if [ ! -e "$javaClass" ]; then
-                log " - Compiling MavenWrapperDownloader.java ..."
-                ("$JAVA_HOME/bin/javac" "$javaSource")
-            fi
-            if [ -e "$javaClass" ]; then
-                log " - Running MavenWrapperDownloader.java ..."
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
-            fi
-        fi
-    fi
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
 fi
-##########################################################################################
-# End of extension
-##########################################################################################
 
-# If specified, validate the SHA-256 sum of the Maven wrapper jar file
-wrapperSha256Sum=""
-while IFS="=" read -r key value; do
-  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
-  esac
-done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-if [ -n "$wrapperSha256Sum" ]; then
-  wrapperSha256Result=false
-  if command -v sha256sum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
-      wrapperSha256Result=true
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
+      distributionSha256Result=true
     fi
-  elif command -v shasum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
-      wrapperSha256Result=true
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
     fi
   else
-    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
-    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
     exit 1
   fi
-  if [ $wrapperSha256Result = false ]; then
-    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
-    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
-    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
     exit 1
   fi
 fi
 
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+actualDistributionDir=""
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+# First try the expected directory name (for regular distributions)
+if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
+  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
+    actualDistributionDir="$distributionUrlNameMain"
+  fi
 fi
 
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
-export MAVEN_CMD_LINE_ARGS
+# If not found, search for any directory with the Maven executable (for snapshots)
+if [ -z "$actualDistributionDir" ]; then
+  # enable globbing to iterate over items
+  set +f
+  for dir in "$TMP_DOWNLOAD_DIR"/*; do
+    if [ -d "$dir" ]; then
+      if [ -f "$dir/bin/$MVN_CMD" ]; then
+        actualDistributionDir="$(basename "$dir")"
+        break
+      fi
+    fi
+  done
+  set -f
+fi
+
+if [ -z "$actualDistributionDir" ]; then
+  verbose "Contents of $TMP_DOWNLOAD_DIR:"
+  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
+  die "Could not find Maven distribution directory in extracted archive"
+fi
 
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
 
-# shellcheck disable=SC2086 # safe args
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  $MAVEN_DEBUG_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
+clean || :
+exec_maven "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
index f80fbad3e76..5761d948924 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -1,3 +1,4 @@
+<# : batch portion
 @REM ----------------------------------------------------------------------------
 @REM Licensed to the Apache Software Foundation (ASF) under one
 @REM or more contributor license agreements.  See the NOTICE file
@@ -18,188 +19,171 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.2.0
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
 @REM
 @REM Optional ENV vars
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
 @REM ----------------------------------------------------------------------------
 
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %WRAPPER_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
-SET WRAPPER_SHA_256_SUM=""
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
 )
-IF NOT %WRAPPER_SHA_256_SUM%=="" (
-    powershell -Command "&{"^
-       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
-       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
-       "  Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
-       "  Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
-       "  Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
-       "  exit 1;"^
-       "}"^
-       "}"
-    if ERRORLEVEL 1 goto error
-)
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% ^
-  %JVM_CONFIG_MAVEN_PROPS% ^
-  %MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  -classpath %WRAPPER_JAR% ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
-
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-
-cmd /C exit /B %ERROR_CODE%
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+
+$MAVEN_M2_PATH = "$HOME/.m2"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+}
+
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+}
+
+$MAVEN_WRAPPER_DISTS = $null
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+} else {
+  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+}
+
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+$actualDistributionDir = ""
+
+# First try the expected directory name (for regular distributions)
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+  $actualDistributionDir = $distributionUrlNameMain
+}
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if (!$actualDistributionDir) {
+  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+    if (Test-Path -Path $testPath -PathType Leaf) {
+      $actualDistributionDir = $_.Name
+    }
+  }
+}
+
+if (!$actualDistributionDir) {
+  Write-Error "Could not find Maven distribution directory in extracted archive"
+}
+
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/pom.rb b/pom.rb
index 6acdb235198..3b9e935aac6 100644
--- a/pom.rb
+++ b/pom.rb
@@ -71,12 +71,12 @@
 
              # versions for default gems with bin executables
              # used in ./lib/pom.rb and ./maven/jruby-stdlib/pom.rb
-             "rake.version": '13.2.1',
+             "rake.version": '13.3.1',
              "jruby-launcher.version": '1.1.6',
              "ant.version": '1.9.8',
              "asm.version": '9.7.1',
              "jar-dependencies.version": '0.4.1',
-             "jffi.version": '1.3.14',
+             "jffi.version": '1.3.15',
              "joda.time.version": '2.14.0')
 
   plugin_management do
diff --git a/pom.xml b/pom.xml
index 65ebb4c8258..50579cec9e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jruby</groupId>
   <artifactId>jruby-parent</artifactId>
-  <version>10.1.0.0-SNAPSHOT</version>
+  <version>10.1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JRuby</name>
   <description>JRuby is the effort to recreate the Ruby (https://www.ruby-lang.org) interpreter in Java.</description>
@@ -108,7 +108,7 @@ DO NOT MODIFY - GENERATED CODE
     <its.j2ee>j2ee*/pom.xml</its.j2ee>
     <its.osgi>osgi*/pom.xml</its.osgi>
     <jar-dependencies.version>0.4.1</jar-dependencies.version>
-    <jffi.version>1.3.14</jffi.version>
+    <jffi.version>1.3.15</jffi.version>
     <joda.time.version>2.14.0</joda.time.version>
     <jruby-launcher.version>1.1.6</jruby-launcher.version>
     <jruby.basedir>${project.basedir}</jruby.basedir>
@@ -117,7 +117,7 @@ DO NOT MODIFY - GENERATED CODE
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <polyglot.dump.readonly>true</polyglot.dump.readonly>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <rake.version>13.2.1</rake.version>
+    <rake.version>13.3.1</rake.version>
     <version.jruby>${project.version}</version.jruby>
   </properties>
   <dependencyManagement>
diff --git a/rakelib/maven.rake b/rakelib/maven.rake
index efe73678b8f..f27e03b4c5a 100644
--- a/rakelib/maven.rake
+++ b/rakelib/maven.rake
@@ -45,6 +45,6 @@ namespace :maven do
 
   desc "Deploy release and bump version"
   task :deploy_release do
-    system "mvn clean deploy -Psonatype-oss-release,release"
+    system "./mvnw clean deploy -Psonatype-oss-release,release"
   end
 end
diff --git a/rakelib/release.rake b/rakelib/release.rake
index 2dad7631460..63c7d684ff4 100644
--- a/rakelib/release.rake
+++ b/rakelib/release.rake
@@ -36,5 +36,5 @@ def jruby_version
   Dir[File.join(DIST_FILES_DIR, "jruby-dist-*.zip")].each do |f|
     return $1 if f =~ /jruby-dist-(.*)-bin.zip/
   end
-  raise ArgumentError "mvn release:prepare has not been run"
+  raise ArgumentError "./mvnw release:prepare has not been run"
 end
diff --git a/shaded/pom.rb b/shaded/pom.rb
index 9c1051bb598..dcb4ef776d3 100644
--- a/shaded/pom.rb
+++ b/shaded/pom.rb
@@ -23,7 +23,10 @@
                   },
                   relocations: [
                     { pattern: 'org.objectweb', shadedPattern: 'org.jruby.org.objectweb' },
-                    { pattern: 'me.qmx.jitescript', shadedPattern: 'org.jruby.me.qmx.jitescript' }
+                    { pattern: 'me.qmx.jitescript', shadedPattern: 'org.jruby.me.qmx.jitescript' },
+                    { pattern: 'com.dylibso.chicory', shadedPattern: 'com.jruby.internal.org.dylibso.chicory'},
+                    { pattern: 'org.ruby_lang.prism', shadedPattern: 'org.jruby.internal.prism'},
+                    { pattern: 'org.jruby.parser.prism', shadedPattern: 'org.jruby.internal.parser.prism'}
                   ],
                   transformers: [{ :@implementation => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
                                    mainClass: 'org.jruby.main.Main',
@@ -38,6 +41,11 @@
                                      'Enable-Native-Access' => 'ALL-UNNAMED',
                                    }
                                  }],
+                  filters: [
+                    { artifact: 'ch.randelshofer:fastdoubleparser', excludes: '**/23/**' },
+                    { artifact: 'ch.randelshofer:fastdoubleparser', excludes: '**/17/**' },
+                    { artifact: 'ch.randelshofer:fastdoubleparser', excludes: '**/11/**' },
+                  ],
                   createSourcesJar: false,
                   compress: false)
   end
@@ -77,12 +85,17 @@
                         # maven/jruby-complete/pom.rb
                         includes: ['com.github.jnr:jnr-ffi',
                                    'me.qmx.jitescript:jitescript',
-                                   'org.ow2.asm:*'],
+                                   'org.ow2.asm:*',
+                                   'com.dylibso:*',
+                                   'org.jruby:jruby-prism',
+                                   'org.ruby_lang:prism-parser-wasm'],
                         excludes: 'javax.annotation:javax.annotation-api'
                       },
                       relocations: [
                         { pattern: 'org.objectweb', shadedPattern: 'org.jruby.org.objectweb' },
-                        { pattern: 'me.qmx.jitescript', shadedPattern: 'org.jruby.me.qmx.jitescript' }
+                        { pattern: 'me.qmx.jitescript', shadedPattern: 'org.jruby.me.qmx.jitescript' },
+                        { pattern: 'com.dylibso.chicory', shadedPattern: 'org.jruby.internal.com.dylibso.chicory'},
+                        { pattern: 'org.ruby_lang', shadedPattern: 'org.jruby.internal.org.ruby_lang'}
                       ],
                       transformers: [{ :@implementation => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
                                        :mainClass => 'org.jruby.main.Main',
diff --git a/shaded/pom.xml b/shaded/pom.xml
index 9ded8cef28a..32719a76303 100644
--- a/shaded/pom.xml
+++ b/shaded/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>10.1.0.0-SNAPSHOT</version>
+    <version>10.1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>
@@ -52,6 +52,18 @@ DO NOT MODIFY - GENERATED CODE
                   <pattern>me.qmx.jitescript</pattern>
                   <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>com.dylibso.chicory</pattern>
+                  <shadedPattern>com.jruby.internal.org.dylibso.chicory</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.ruby_lang.prism</pattern>
+                  <shadedPattern>org.jruby.internal.prism</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.jruby.parser.prism</pattern>
+                  <shadedPattern>org.jruby.internal.parser.prism</shadedPattern>
+                </relocation>
               </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -63,6 +75,20 @@ DO NOT MODIFY - GENERATED CODE
                   </manifestEntries>
                 </transformer>
               </transformers>
+              <filters>
+                <filter>
+                  <artifact>ch.randelshofer:fastdoubleparser</artifact>
+                  <excludes>**/23/**</excludes>
+                </filter>
+                <filter>
+                  <artifact>ch.randelshofer:fastdoubleparser</artifact>
+                  <excludes>**/17/**</excludes>
+                </filter>
+                <filter>
+                  <artifact>ch.randelshofer:fastdoubleparser</artifact>
+                  <excludes>**/11/**</excludes>
+                </filter>
+              </filters>
               <createSourcesJar>false</createSourcesJar>
               <compress>false</compress>
             </configuration>
@@ -133,6 +159,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -145,6 +174,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -194,6 +231,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -206,6 +246,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -255,6 +303,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -267,6 +318,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -316,6 +375,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -328,6 +390,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -377,6 +447,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -389,6 +462,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -438,6 +519,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -450,6 +534,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -499,6 +591,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -511,6 +606,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -560,6 +663,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -572,6 +678,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -621,6 +735,9 @@ DO NOT MODIFY - GENERATED CODE
                       <include>com.github.jnr:jnr-ffi</include>
                       <include>me.qmx.jitescript:jitescript</include>
                       <include>org.ow2.asm:*</include>
+                      <include>com.dylibso:*</include>
+                      <include>org.jruby:jruby-prism</include>
+                      <include>org.ruby_lang:prism-parser-wasm</include>
                     </includes>
                     <excludes>javax.annotation:javax.annotation-api</excludes>
                   </artifactSet>
@@ -633,6 +750,14 @@ DO NOT MODIFY - GENERATED CODE
                       <pattern>me.qmx.jitescript</pattern>
                       <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>com.dylibso.chicory</pattern>
+                      <shadedPattern>org.jruby.internal.com.dylibso.chicory</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.ruby_lang</pattern>
+                      <shadedPattern>org.jruby.internal.org.ruby_lang</shadedPattern>
+                    </relocation>
                   </relocations>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
diff --git a/spec/ffi/fixtures/compile.rb b/spec/ffi/fixtures/compile.rb
index 8c65c4fc83c..0f6e868f2f6 100644
--- a/spec/ffi/fixtures/compile.rb
+++ b/spec/ffi/fixtures/compile.rb
@@ -20,6 +20,8 @@ module TestLibrary
       "x86_64"
     when /loongarch64/
       "loongarch64"
+    when /riscv64/
+      "riscv64"
     when /ppc64|powerpc64/
       "powerpc64"
     when /ppc|powerpc/
diff --git a/spec/java_integration/reify/become_java_spec.rb b/spec/java_integration/reify/become_java_spec.rb
index 7789075acbb..3a10ab99c3a 100644
--- a/spec/java_integration/reify/become_java_spec.rb
+++ b/spec/java_integration/reify/become_java_spec.rb
@@ -120,6 +120,42 @@ class TopRightOfTheJStack < MiddleOfTheJStack ;def size; super + 3; end ; end
     expect(TopRightOfTheJStack.new([:a, :b]).size).to eq (2+3)
   end
 
+  it "calls prepended and leaf initialize methods for Ruby classes rooted in a Java superclass" do
+    class PrependJavaBaseInitC < java.util.ArrayList
+      def initialize(trace)
+        trace << :c
+        super()
+      end
+    end
+
+    class PrependJavaBaseInitD < PrependJavaBaseInitC
+      def initialize(trace)
+        trace << :d
+        super
+      end
+    end
+
+    class PrependJavaBaseInitE < PrependJavaBaseInitD
+      def initialize(trace)
+        trace << :e
+        super
+      end
+    end
+
+    module PrependJavaBaseInitM
+      def initialize(trace)
+        trace << :m
+        super
+      end
+    end
+
+    PrependJavaBaseInitE.prepend(PrependJavaBaseInitM)
+
+    trace = []
+    PrependJavaBaseInitE.new(trace)
+    expect(trace).to eq([:m, :e, :d, :c])
+  end
+
   it "supports auto reifying a class hierarchy when class gets redefined" do
     class ASubList < java.util.ArrayList
       attr_reader :args
diff --git a/spec/java_integration/utilities/jruby_spec.rb b/spec/java_integration/utilities/jruby_spec.rb
index a29e6e554a1..5ccfc828ea0 100644
--- a/spec/java_integration/utilities/jruby_spec.rb
+++ b/spec/java_integration/utilities/jruby_spec.rb
@@ -23,7 +23,7 @@
     require 'jruby'
     compiled = JRuby.compile_ir("foo = 1; bar = 2", 'foobar.rbx')
 
-    expect(compiled.file_name).to eql 'foobar.rbx'
+    expect(compiled.file).to eql 'foobar.rbx'
   end
 end
 
diff --git a/spec/jruby.mspec b/spec/jruby.mspec
index ee24b5fcb34..7e026127e19 100644
--- a/spec/jruby.mspec
+++ b/spec/jruby.mspec
@@ -107,10 +107,6 @@ class MSpecScript
   instance_config = JRuby.runtime.instance_config
 
   if WINDOWS
-    # Some specs on Windows will fail in we launch JRuby via
-    # ruby_exe() in-process (see core/argf/gets_spec.rb)
-    instance_config.run_ruby_in_process = false
-
     # exclude specs tagged with 'windows' keyword
     get(:ci_xtags) << 'windows'
   end
diff --git a/spec/mspec/lib/mspec/commands/mspec-tag.rb b/spec/mspec/lib/mspec/commands/mspec-tag.rb
index 8b1cb838094..9ce9f048c63 100644
--- a/spec/mspec/lib/mspec/commands/mspec-tag.rb
+++ b/spec/mspec/lib/mspec/commands/mspec-tag.rb
@@ -112,6 +112,7 @@ def register
       MSpec.register_mode :pretend
       MSpec.register_mode :unguarded
       config[:formatter] = false
+      config[:xtags] = []
     else
       raise ArgumentError, "No recognized action given"
     end
diff --git a/spec/mspec/lib/mspec/matchers/base.rb b/spec/mspec/lib/mspec/matchers/base.rb
index d9d7f6fec02..3534520d88c 100644
--- a/spec/mspec/lib/mspec/matchers/base.rb
+++ b/spec/mspec/lib/mspec/matchers/base.rb
@@ -36,6 +36,14 @@ def equal?(expected)
     end
   end
 
+  def raise(exception = ::Exception, message = nil, options = nil, &block)
+    matcher = ::RaiseErrorMatcher.new(exception, message, options, &block)
+    unless matcher.matches? @actual
+      expected, actual = matcher.failure_message
+      ::SpecExpectation.fail_with(expected, actual)
+    end
+  end
+
   def method_missing(name, *args, &block)
     result = @actual.__send__(name, *args, &block)
     unless result
@@ -70,6 +78,14 @@ def equal?(expected)
     end
   end
 
+  def raise(exception = ::Exception, message = nil, options = nil, &block)
+    matcher = ::RaiseErrorMatcher.new(exception, message, options, &block)
+    if matcher.matches? @actual
+      expected, actual = matcher.negative_failure_message
+      ::SpecExpectation.fail_with(expected, actual)
+    end
+  end
+
   def method_missing(name, *args, &block)
     result = @actual.__send__(name, *args, &block)
     if result
diff --git a/spec/mspec/lib/mspec/matchers/raise_error.rb b/spec/mspec/lib/mspec/matchers/raise_error.rb
index 54378bb34ce..8cba842ce3f 100644
--- a/spec/mspec/lib/mspec/matchers/raise_error.rb
+++ b/spec/mspec/lib/mspec/matchers/raise_error.rb
@@ -1,11 +1,18 @@
 class RaiseErrorMatcher
   FAILURE_MESSAGE_FOR_EXCEPTION = {}.compare_by_identity
+  UNDEF_CAUSE = Object.new
 
   attr_writer :block
 
-  def initialize(exception, message, &block)
+  def initialize(exception, message = nil, options = nil, &block)
+    if message.is_a? Hash
+      @message = nil
+      options = message
+    else
+      @message = message
+    end
+    @cause = options ? options.fetch(:cause, UNDEF_CAUSE) : UNDEF_CAUSE
     @exception = exception
-    @message = message
     @block = block
     @actual = nil
   end
@@ -45,24 +52,45 @@ def matching_message?(exc)
     end
   end
 
+  def matching_cause?(exc)
+    case @cause
+    when UNDEF_CAUSE
+      true
+    else
+      @cause == exc.cause
+    end
+  end
+
   def matching_exception?(exc)
-    matching_class?(exc) and matching_message?(exc)
+    matching_class?(exc) and matching_message?(exc) and matching_cause?(exc)
   end
 
-  def exception_class_and_message(exception_class, message)
-    if message
-      "#{exception_class} (#{message})"
-    else
-      "#{exception_class}"
+  def exception_class_and_message_and_cause(exception_class, message, cause)
+    string = "#{exception_class}"
+    prefixed = false
+    prefix = -> { prefixed ? ", " : prefixed = "(" }
+
+    if message != nil
+      string << "#{prefix.()}#{message.inspect}"
+    end
+
+    if cause != UNDEF_CAUSE
+      string << "#{prefix.()}cause: #{cause.inspect}"
     end
+
+    string << ")" if prefixed
+
+    string
   end
 
   def format_expected_exception
-    exception_class_and_message(@exception, @message)
+    exception_class_and_message_and_cause(@exception, @message, @cause)
   end
 
   def format_exception(exception)
-    exception_class_and_message(exception.class, exception.message)
+    exception_class_and_message_and_cause(exception.class,
+                                          @message == nil ? nil : exception.message,
+                                          @cause == UNDEF_CAUSE ? UNDEF_CAUSE : exception.cause)
   end
 
   def failure_message
@@ -87,7 +115,18 @@ def negative_failure_message
 end
 
 module MSpecMatchers
-  private def raise_error(exception = Exception, message = nil, &block)
-    RaiseErrorMatcher.new(exception, message, &block)
+  private def raise_error(exception = Exception, message = nil, options = nil, &block)
+    RaiseErrorMatcher.new(exception, message, options, &block)
+  end
+
+  # CRuby < 4.1 has inconsistent coercion errors:
+  # https://bugs.ruby-lang.org/issues/21864
+  # This matcher ignores the message on CRuby < 4.1
+  # and checks the message for all other cases, including other Rubies
+  private def raise_consistent_error(exception = Exception, message = nil, options = nil, &block)
+    if RUBY_ENGINE == "ruby" and ruby_version_is ""..."4.1"
+      message = nil
+    end
+    RaiseErrorMatcher.new(exception, message, options, &block)
   end
 end
diff --git a/spec/mspec/lib/mspec/runner/formatters/base.rb b/spec/mspec/lib/mspec/runner/formatters/base.rb
index e3b5bb23e0b..882e15c8c22 100644
--- a/spec/mspec/lib/mspec/runner/formatters/base.rb
+++ b/spec/mspec/lib/mspec/runner/formatters/base.rb
@@ -46,7 +46,7 @@ def register
       LeakCheckerAction.new.register
     end
 
-    if ENV['CHECK_LEAKS'] || ENV['CHECK_CONSTANT_LEAKS']
+    if (ENV['CHECK_LEAKS'] || ENV['CHECK_CONSTANT_LEAKS']) && ENV['CHECK_CONSTANT_LEAKS'] != 'false'
       save = ENV['CHECK_LEAKS'] == 'save' || ENV['CHECK_CONSTANT_LEAKS'] == 'save'
       ConstantsLeakCheckerAction.new(save).register
     end
diff --git a/spec/mspec/lib/mspec/runner/mspec.rb b/spec/mspec/lib/mspec/runner/mspec.rb
index 97c3f365bc7..0e016c67a75 100644
--- a/spec/mspec/lib/mspec/runner/mspec.rb
+++ b/spec/mspec/lib/mspec/runner/mspec.rb
@@ -365,6 +365,7 @@ def self.make_tag_dir(path)
   # Writes each tag in +tags+ to the tag file. Overwrites the
   # tag file if it exists.
   def self.write_tags(tags)
+    return delete_tags if tags.empty?
     file = tags_file
     make_tag_dir(file)
     File.open(file, "w:utf-8") do |f|
diff --git a/spec/mspec/spec/matchers/raise_error_spec.rb b/spec/mspec/spec/matchers/raise_error_spec.rb
index 8613eee1185..3849c7dd2a3 100644
--- a/spec/mspec/spec/matchers/raise_error_spec.rb
+++ b/spec/mspec/spec/matchers/raise_error_spec.rb
@@ -84,10 +84,10 @@ class UnexpectedException < Exception; end
       matcher.matches?(Proc.new { raise exc })
     rescue UnexpectedException => e
       expect(matcher.failure_message).to eq(
-        ["Expected ExpectedException (message)", "but got: UnexpectedException (message)"]
+        ['Expected ExpectedException("message")', 'but got: UnexpectedException("message")']
       )
       expect(ExceptionState.new(nil, nil, e).message).to eq(
-        "Expected ExpectedException (message)\nbut got: UnexpectedException (message)"
+        "Expected ExpectedException(\"message\")\nbut got: UnexpectedException(\"message\")"
       )
     else
       raise "no exception"
@@ -103,10 +103,10 @@ class UnexpectedException < Exception; end
       matcher.matches?(Proc.new { raise exc })
     rescue ExpectedException => e
       expect(matcher.failure_message).to eq(
-        ["Expected ExpectedException (expected)", "but got: ExpectedException (unexpected)"]
+        ['Expected ExpectedException("expected")', 'but got: ExpectedException("unexpected")']
       )
       expect(ExceptionState.new(nil, nil, e).message).to eq(
-        "Expected ExpectedException (expected)\nbut got: ExpectedException (unexpected)"
+        "Expected ExpectedException(\"expected\")\nbut got: ExpectedException(\"unexpected\")"
       )
     else
       raise "no exception"
@@ -122,10 +122,10 @@ class UnexpectedException < Exception; end
       matcher.matches?(Proc.new { raise exc })
     rescue UnexpectedException => e
       expect(matcher.failure_message).to eq(
-          ["Expected ExpectedException (expected)", "but got: UnexpectedException (unexpected)"]
+          ['Expected ExpectedException("expected")', 'but got: UnexpectedException("unexpected")']
       )
       expect(ExceptionState.new(nil, nil, e).message).to eq(
-          "Expected ExpectedException (expected)\nbut got: UnexpectedException (unexpected)"
+          "Expected ExpectedException(\"expected\")\nbut got: UnexpectedException(\"unexpected\")"
       )
     else
       raise "no exception"
@@ -137,7 +137,7 @@ class UnexpectedException < Exception; end
     matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
     matcher.matches?(proc)
     expect(matcher.failure_message).to eq(
-      ["Expected ExpectedException (expected)", "but no exception was raised (120 was returned)"]
+      ['Expected ExpectedException("expected")', "but no exception was raised (120 was returned)"]
     )
   end
 
@@ -146,7 +146,7 @@ class UnexpectedException < Exception; end
     matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
     matcher.matches?(proc)
     expect(matcher.failure_message).to eq(
-      ["Expected ExpectedException (expected)", "but no exception was raised (nil was returned)"]
+      ['Expected ExpectedException("expected")', "but no exception was raised (nil was returned)"]
     )
   end
 
@@ -159,7 +159,7 @@ def result.pretty_inspect
     matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
     matcher.matches?(proc)
     expect(matcher.failure_message).to eq(
-      ["Expected ExpectedException (expected)", "but no exception was raised (#<Object>(#pretty_inspect raised #<ArgumentError: bad>) was returned)"]
+      ['Expected ExpectedException("expected")', 'but no exception was raised (#<Object>(#pretty_inspect raised #<ArgumentError: bad>) was returned)']
     )
   end
 
@@ -168,7 +168,7 @@ def result.pretty_inspect
     matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
     matcher.matches?(proc)
     expect(matcher.negative_failure_message).to eq(
-      ["Expected to not get ExpectedException (expected)", ""]
+      ['Expected to not get ExpectedException("expected")', ""]
     )
   end
 
@@ -177,7 +177,58 @@ def result.pretty_inspect
     matcher = RaiseErrorMatcher.new(Exception, nil)
     matcher.matches?(proc)
     expect(matcher.negative_failure_message).to eq(
-      ["Expected to not get Exception", "but got: UnexpectedException (unexpected)"]
+      ['Expected to not get Exception', 'but got: UnexpectedException']
     )
   end
+
+  it "matches cause if given" do
+    cause = RuntimeError.new("foo")
+    proc = -> do
+      raise cause
+    rescue
+      raise "bar"
+    end
+
+    matcher = RaiseErrorMatcher.new(RuntimeError, cause: cause)
+    expect(matcher.matches?(proc)).to eq(true)
+  end
+
+  it "matches message and cause if given" do
+    cause = RuntimeError.new("foo")
+    proc = -> do
+      raise cause
+    rescue
+      raise "bar"
+    end
+
+    matcher = RaiseErrorMatcher.new(RuntimeError, "bar", cause: cause)
+    expect(matcher.matches?(proc)).to eq(true)
+  end
+
+  it "provides useful negative failure message when cause does not match" do
+    cause = RuntimeError.new("bar")
+    proc = -> do
+      raise "foo"
+    end
+
+    matcher = RaiseErrorMatcher.new(RuntimeError, cause: cause)
+
+    begin
+      matcher.matches?(proc)
+    rescue RuntimeError
+      expect(matcher.failure_message).to eq(
+        ['Expected RuntimeError(cause: #<RuntimeError: bar>)', 'but got: RuntimeError(cause: nil)']
+      )
+    end
+
+    matcher = RaiseErrorMatcher.new(RuntimeError, "foo", cause: cause)
+
+    begin
+      matcher.matches?(proc)
+    rescue RuntimeError
+      expect(matcher.failure_message).to eq(
+        ['Expected RuntimeError("foo", cause: #<RuntimeError: bar>)', 'but got: RuntimeError("foo", cause: nil)']
+      )
+    end
+  end
 end
diff --git a/spec/mspec/tool/remove_old_guards.rb b/spec/mspec/tool/remove_old_guards.rb
index 75c48e05843..bc5612c78dd 100755
--- a/spec/mspec/tool/remove_old_guards.rb
+++ b/spec/mspec/tool/remove_old_guards.rb
@@ -31,6 +31,12 @@ def each_spec_file(&block)
   Dir["*/**/*.rb"].each(&block)
 end
 
+def each_file(&block)
+  Dir["**/*"].each { |path|
+    yield path if File.file?(path)
+  }
+end
+
 def remove_guards(guard, keep)
   each_spec_file do |file|
     contents = File.binread(file)
@@ -109,7 +115,7 @@ def remove_unused_shared_specs
 end
 
 def search(regexp)
-  each_spec_file do |file|
+  each_file do |file|
     contents = File.binread(file)
     if contents =~ regexp
       puts file
@@ -136,3 +142,4 @@ def search(regexp)
 puts "Search:"
 search(/(["'])#{version}\1/)
 search(/^\s*#.+#{version}/)
+search(/RUBY_VERSION_IS_#{version.tr('.', '_')}/)
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
index 122de0decba..86c43d0dc80 100644
--- a/spec/mspec/tool/sync/sync-rubyspec.rb
+++ b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -207,16 +207,6 @@ def test_new_specs
   end
 end
 
-def verify_commits(impl)
-  puts
-  Dir.chdir(SOURCE_REPO) do
-    puts "Manually check commit messages:"
-    print "Press enter >"
-    STDIN.gets
-    system "git", "log", "master..."
-  end
-end
-
 def fast_forward_master(impl)
   Dir.chdir(SOURCE_REPO) do
     sh "git", "checkout", "master"
@@ -243,7 +233,6 @@ def main(impls)
       rebase_commits(impl)
       if new_commits?(impl)
         test_new_specs
-        verify_commits(impl)
         fast_forward_master(impl)
         check_ci
       else
diff --git a/spec/regression/GH-8946_define_method_yield_with_jit_spec.rb b/spec/regression/GH-8946_define_method_yield_with_jit_spec.rb
new file mode 100644
index 00000000000..6e433d8b6be
--- /dev/null
+++ b/spec/regression/GH-8946_define_method_yield_with_jit_spec.rb
@@ -0,0 +1,45 @@
+# https://github.com/jruby/jruby/issues/8946
+#
+# When define_method is called within another method and the block uses yield,
+# the captured block must be used for yield even after JIT + invokedynamic
+# optimization (which previously bypassed DefineMethodMethod.call and lost
+# the captured block).
+
+describe 'define_method with yield inside another method' do
+  it 'yields to the captured block after JIT optimization' do
+    cls = Class.new do
+      class << self
+        def go(&blk)
+          define_method(:foo) { yield }
+        end
+      end
+    end
+
+    results = []
+    cls.go { results << :called }
+
+    obj = cls.new
+    # call enough times to trigger JIT and indy binding
+    10.times { obj.foo }
+
+    expect(results).to eq(Array.new(10, :called))
+  end
+
+  it 'yields to the captured block with arguments' do
+    cls = Class.new do
+      class << self
+        def go(&blk)
+          define_method(:bar) { |x| yield(x) }
+        end
+      end
+    end
+
+    results = []
+    cls.go { |v| results << v }
+
+    obj = cls.new
+    10.times { |i| obj.bar(i) }
+
+    expect(results).to eq((0..9).to_a)
+  end
+end
diff --git a/spec/ruby/CONTRIBUTING.md b/spec/ruby/CONTRIBUTING.md
index 366b484bada..0b0f2514409 100644
--- a/spec/ruby/CONTRIBUTING.md
+++ b/spec/ruby/CONTRIBUTING.md
@@ -55,6 +55,11 @@ which indicates the file was generated but the method unspecified.
 Here is a list of frequently-used matchers, which should be enough for most specs.
 There are a few extra specific matchers used in the couple specs that need it.
 
+The general idea is: add `.should` just before the predicate you expect to be truthy, and done!
+This works for most needs and provides a great error when it fails.
+It's immediately clear which method is used and there no need to remember a mapping like in RSpec between e.g. `eq` and `==`.
+See [this blog post](https://eregon.me/blog/2019/10/07/a-new-should-syntax.html) for the motivation behind that syntax.
+
 #### Comparison matchers
 
 ```ruby
@@ -83,43 +88,37 @@ File.should.equal?(File) # Calls #equal? (tests identity)
 
 (0.1 + 0.2).should be_close(0.3, TOLERANCE) # (0.2-0.1).abs < TOLERANCE
 (0.0/0.0).should.nan?
-(1.0/0.0).should be_positive_infinity
-(-1.0/0.0).should be_negative_infinity
 
-3.14.should be_an_instance_of(Float) # Calls #instance_of?
-3.14.should be_kind_of(Numeric) # Calls #is_a?
-Numeric.should be_ancestor_of(Float) # Float.ancestors.include?(Numeric)
+3.14.should.instance_of?(Float) # Calls #instance_of?
+3.14.should.is_a?(Numeric) # Calls #is_a?
 
 3.14.should.respond_to?(:to_i)
-Integer.should have_instance_method(:+)
-Array.should have_method(:new)
+Integer.should.method_defined?(:+, false)
 ```
 
-Also `have_constant`, `have_private_instance_method`, `have_singleton_method`, etc.
-
 #### Exception matchers
 
 ```ruby
 -> {
   raise "oops"
-}.should raise_error(RuntimeError, /oops/)
+}.should.raise(RuntimeError, /oops/)
 
 -> {
   raise "oops"
-}.should raise_error(RuntimeError) { |e|
+}.should.raise(RuntimeError) { |e|
   # Custom checks on the Exception object
   e.message.should.include?("oops")
   e.cause.should == nil
 }
 ```
 
-##### `should_not raise_error`
+##### `should_not.raise`
 
 **Avoid this!** Instead, use an expectation testing what the code in the lambda does.
 If an exception is raised, it will fail the example anyway.
 
 ```ruby
--> { ... }.should_not raise_error
+-> { ... }.should_not.raise
 ```
 
 #### Warning matcher
@@ -274,7 +273,7 @@ how this is used currently:
 ```ruby
 describe :kernel_sprintf, shared: true do
   it "raises TypeError exception if cannot convert to Integer" do
-    -> { @method.call("%b", Object.new) }.should raise_error(TypeError)
+    -> { @method.call("%b", Object.new) }.should.raise(TypeError)
   end
 end
 
diff --git a/spec/ruby/README.md b/spec/ruby/README.md
index 14a0068346f..b259a97e21c 100644
--- a/spec/ruby/README.md
+++ b/spec/ruby/README.md
@@ -30,8 +30,8 @@ ruby/spec is known to be tested in these implementations for every commit:
 * [Opal](https://github.com/opal/opal/tree/master/spec)
 * [Artichoke](https://github.com/artichoke/spec/tree/artichoke-vendor)
 
-ruby/spec describes the behavior of Ruby 3.2 and more recent Ruby versions.
-More precisely, every latest stable MRI release should [pass](https://github.com/ruby/spec/actions/workflows/ci.yml) all specs of ruby/spec (3.2.x, 3.3.x, etc), and those are tested in CI.
+ruby/spec describes the behavior of Ruby 3.3 and more recent Ruby versions.
+More precisely, every latest stable MRI release should [pass](https://github.com/ruby/spec/actions/workflows/ci.yml) all specs of ruby/spec (3.3.x, 3.4.x, etc), and those are tested in CI.
 
 ### Synchronization with Ruby Implementations
 
diff --git a/spec/ruby/command_line/dash_r_spec.rb b/spec/ruby/command_line/dash_r_spec.rb
index 62b8dc00145..0de9ba2e24e 100644
--- a/spec/ruby/command_line/dash_r_spec.rb
+++ b/spec/ruby/command_line/dash_r_spec.rb
@@ -8,15 +8,15 @@
 
   it "requires the specified file" do
     out = ruby_exe(@script, options: "-r #{@test_file}")
-    out.should include("REQUIRED")
-    out.should include(@test_file + ".rb")
+    out.should.include?("REQUIRED")
+    out.should.include?(@test_file + ".rb")
   end
 
   it "requires the file before parsing the main script" do
     out = ruby_exe(fixture(__FILE__, "bad_syntax.rb"), options: "-r #{@test_file}", args: "2>&1", exit_status: 1)
     $?.should_not.success?
-    out.should include("REQUIRED")
-    out.should include("SyntaxError")
+    out.should.include?("REQUIRED")
+    out.should.include?("SyntaxError")
   end
 
   it "does not require the file if the main script file does not exist" do
diff --git a/spec/ruby/command_line/dash_upper_i_spec.rb b/spec/ruby/command_line/dash_upper_i_spec.rb
index 4cafb724e30..4005a27d235 100644
--- a/spec/ruby/command_line/dash_upper_i_spec.rb
+++ b/spec/ruby/command_line/dash_upper_i_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "adds the path to the load path ($:)" do
-    ruby_exe(@script, options: "-I fixtures").should include("fixtures")
+    ruby_exe(@script, options: "-I fixtures").should.include?("fixtures")
   end
 
   it "adds the path at the front of $LOAD_PATH" do
@@ -18,16 +18,16 @@
       idx.should < 2
       idx.should < lines.size-1
     else
-      lines[0].should include("fixtures")
+      lines[0].should.include?("fixtures")
     end
   end
 
   it "adds the path expanded from CWD to $LOAD_PATH" do
-    ruby_exe(@script, options: "-I fixtures").lines.should include "#{Dir.pwd}/fixtures\n"
+    ruby_exe(@script, options: "-I fixtures").lines.should.include? "#{Dir.pwd}/fixtures\n"
   end
 
   it "expands a path from CWD even if it does not exist" do
-    ruby_exe(@script, options: "-I not_exist/not_exist").lines.should include "#{Dir.pwd}/not_exist/not_exist\n"
+    ruby_exe(@script, options: "-I not_exist/not_exist").lines.should.include? "#{Dir.pwd}/not_exist/not_exist\n"
   end
 end
 
@@ -45,7 +45,7 @@
     end
 
     it "does not expand symlinks" do
-      ruby_exe(@script, options: "-I #{@symlink}").lines.should include "#{@symlink}\n"
+      ruby_exe(@script, options: "-I #{@symlink}").lines.should.include? "#{@symlink}\n"
     end
   end
 end
diff --git a/spec/ruby/command_line/dash_upper_s_spec.rb b/spec/ruby/command_line/dash_upper_s_spec.rb
index 17991503f17..71c6016659e 100644
--- a/spec/ruby/command_line/dash_upper_s_spec.rb
+++ b/spec/ruby/command_line/dash_upper_s_spec.rb
@@ -2,7 +2,8 @@
 
 describe 'The -S command line option' do
   before :each do
-    @path = [ENV['PATH'], fixture(__FILE__, "bin")].join(':')
+    @bin = fixture(__FILE__, "bin")
+    @path = [ENV['PATH'], @bin].join(File::PATH_SEPARATOR)
   end
 
   platform_is_not :windows do
@@ -10,20 +11,57 @@
     # and MRI shows warning when including world writable path in ENV['PATH'].
     # This is why we are using /success$/ matching in the following cases.
 
+    it "runs launcher found in RUBYPATH, but only code after the first /\#!.*ruby.*/-ish line in target file" do
+      result = ruby_exe(nil, options: '-S hybrid_launcher.sh', env: { 'RUBYPATH' => @bin }, args: '2>&1')
+      result.should =~ /success$/
+    end
+
     it "runs launcher found in PATH, but only code after the first /\#!.*ruby.*/-ish line in target file" do
       result = ruby_exe(nil, options: '-S hybrid_launcher.sh', env: { 'PATH' => @path }, args: '2>&1')
       result.should =~ /success$/
     end
 
+    it "runs launcher found in RUBYPATH" do
+      result = ruby_exe(nil, options: '-S launcher.rb', env: { 'RUBYPATH' => @bin }, args: '2>&1')
+      result.should =~ /success$/
+    end
+
     it "runs launcher found in PATH" do
       result = ruby_exe(nil, options: '-S launcher.rb', env: { 'PATH' => @path }, args: '2>&1')
       result.should =~ /success$/
     end
 
+    it "runs launcher found in RUBYPATH and sets the exit status to 1 if it fails" do
+      result = ruby_exe(nil, options: '-S dash_s_fail', env: { 'RUBYPATH' => @bin }, args: '2>&1', exit_status: 1)
+      result.should =~ /\bdie\b/
+      $?.exitstatus.should == 1
+    end
+
     it "runs launcher found in PATH and sets the exit status to 1 if it fails" do
       result = ruby_exe(nil, options: '-S dash_s_fail', env: { 'PATH' => @path }, args: '2>&1', exit_status: 1)
       result.should =~ /\bdie\b/
       $?.exitstatus.should == 1
     end
+
+    ruby_version_is "4.1" do
+      describe "if the script name contains separator" do
+        before(:each) do
+          @bin = File.dirname(@bin)
+          @path = [ENV['PATH'], @bin].join(File::PATH_SEPARATOR)
+        end
+
+        it "does not search launcher in RUBYPATH" do
+          result = ruby_exe(nil, options: '-S bin/launcher.rb', env: { 'RUBYPATH' => @bin }, args: '2>&1', exit_status: 1)
+          result.should =~ /LoadError/
+          $?.should_not.success?
+        end
+
+        it "does not search launcher in PATH" do
+          result = ruby_exe(nil, options: '-S bin/launcher.rb', env: { 'PATH' => @path }, args: '2>&1', exit_status: 1)
+          result.should =~ /LoadError/
+          $?.should_not.success?
+        end
+      end
+    end
   end
 end
diff --git a/spec/ruby/command_line/dash_v_spec.rb b/spec/ruby/command_line/dash_v_spec.rb
index b13350404c6..6a4f7d3a156 100644
--- a/spec/ruby/command_line/dash_v_spec.rb
+++ b/spec/ruby/command_line/dash_v_spec.rb
@@ -6,7 +6,7 @@
 
   describe "when used alone" do
     it "prints version and ends" do
-      ruby_exe(nil, args: '-v').gsub("+PRISM ", "").should include(RUBY_DESCRIPTION.gsub("+PRISM ", ""))
+      ruby_exe(nil, args: '-v').gsub("+PRISM ", "").should.include?(RUBY_DESCRIPTION.gsub("+PRISM ", ""))
     end unless (defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?) ||
                (defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?) ||
                (ENV['RUBY_GC_LIBRARY'] && ENV['RUBY_GC_LIBRARY'].length > 0) ||
diff --git a/spec/ruby/command_line/dash_x_spec.rb b/spec/ruby/command_line/dash_x_spec.rb
index ae14b610707..38f97a5ab1b 100644
--- a/spec/ruby/command_line/dash_x_spec.rb
+++ b/spec/ruby/command_line/dash_x_spec.rb
@@ -10,7 +10,7 @@
   it "fails when /\#!.*ruby.*/-ish line in target file is not found" do
     bad_embedded_ruby = fixture __FILE__, "bin/bad_embedded_ruby.txt"
     result = ruby_exe(bad_embedded_ruby, options: '-x', args: '2>&1', exit_status: 1)
-    result.should include "no Ruby script found in input"
+    result.should.include? "no Ruby script found in input"
   end
 
   it "behaves as -x was set when non-ruby shebang is encountered on first line" do
diff --git a/spec/ruby/command_line/error_message_spec.rb b/spec/ruby/command_line/error_message_spec.rb
index 02150f30ce0..157cb8969ca 100644
--- a/spec/ruby/command_line/error_message_spec.rb
+++ b/spec/ruby/command_line/error_message_spec.rb
@@ -8,4 +8,9 @@
     out = ruby_exe("end #syntax error", args: "2> #{File::NULL}", exit_status: 1)
     out.chomp.should.empty?
   end
+
+  it "is not modified with extra escaping of control characters and backslashes" do
+    out = ruby_exe('raise "\e[31mRed\e[0m error\\\\message"', args: "2>&1", exit_status: 1)
+    out.chomp.should.include?("\e[31mRed\e[0m error\\message")
+  end
 end
diff --git a/spec/ruby/command_line/feature_spec.rb b/spec/ruby/command_line/feature_spec.rb
index 838581d04ab..0a3252b88d7 100644
--- a/spec/ruby/command_line/feature_spec.rb
+++ b/spec/ruby/command_line/feature_spec.rb
@@ -62,10 +62,10 @@
   end
 
   it "prints a warning for unknown features" do
-    ruby_exe("p 14", options: "--enable=ruby-spec-feature-does-not-exist 2>&1").chomp.should include('warning: unknown argument for --enable')
-    ruby_exe("p 14", options: "--disable=ruby-spec-feature-does-not-exist 2>&1").chomp.should include('warning: unknown argument for --disable')
-    ruby_exe("p 14", options: "--enable-ruby-spec-feature-does-not-exist 2>&1").chomp.should include('warning: unknown argument for --enable')
-    ruby_exe("p 14", options: "--disable-ruby-spec-feature-does-not-exist 2>&1").chomp.should include('warning: unknown argument for --disable')
+    ruby_exe("p 14", options: "--enable=ruby-spec-feature-does-not-exist 2>&1").chomp.should.include?('warning: unknown argument for --enable')
+    ruby_exe("p 14", options: "--disable=ruby-spec-feature-does-not-exist 2>&1").chomp.should.include?('warning: unknown argument for --disable')
+    ruby_exe("p 14", options: "--enable-ruby-spec-feature-does-not-exist 2>&1").chomp.should.include?('warning: unknown argument for --enable')
+    ruby_exe("p 14", options: "--disable-ruby-spec-feature-does-not-exist 2>&1").chomp.should.include?('warning: unknown argument for --disable')
   end
 
 end
diff --git a/spec/ruby/command_line/frozen_strings_spec.rb b/spec/ruby/command_line/frozen_strings_spec.rb
index 8acab5bc1d6..32ff7d03712 100644
--- a/spec/ruby/command_line/frozen_strings_spec.rb
+++ b/spec/ruby/command_line/frozen_strings_spec.rb
@@ -78,17 +78,17 @@
 describe "The --debug flag produces" do
   it "debugging info on attempted frozen string modification" do
     error_str = ruby_exe(fixture(__FILE__, 'debug_info.rb'), options: '--enable-frozen-string-literal --debug',  args: "2>&1")
-    error_str.should include("can't modify frozen String")
-    error_str.should include("created at")
-    error_str.should include("command_line/fixtures/debug_info.rb:1")
+    error_str.should.include?("can't modify frozen String")
+    error_str.should.include?("created at")
+    error_str.should.include?("command_line/fixtures/debug_info.rb:1")
   end
 
   guard -> { ruby_version_is "3.4" and !"test".frozen? } do
     it "debugging info on mutating chilled string" do
       error_str = ruby_exe(fixture(__FILE__, 'debug_info.rb'), options: '-w --debug',  args: "2>&1")
-      error_str.should include("literal string will be frozen in the future")
-      error_str.should include("the string was created here")
-      error_str.should include("command_line/fixtures/debug_info.rb:1")
+      error_str.should.include?("literal string will be frozen in the future")
+      error_str.should.include?("the string was created here")
+      error_str.should.include?("command_line/fixtures/debug_info.rb:1")
     end
   end
 end
diff --git a/spec/ruby/command_line/rubylib_spec.rb b/spec/ruby/command_line/rubylib_spec.rb
index b45919b9979..1bedd146e37 100644
--- a/spec/ruby/command_line/rubylib_spec.rb
+++ b/spec/ruby/command_line/rubylib_spec.rb
@@ -14,15 +14,15 @@
     dir = tmp("rubylib/incl")
     ENV["RUBYLIB"] = @pre + dir
     paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
-    paths.should include(dir)
+    paths.should.include?(dir)
   end
 
   it "adds a File::PATH_SEPARATOR-separated list of directories to $LOAD_PATH" do
     dir1, dir2 = tmp("rubylib/incl1"), tmp("rubylib/incl2")
     ENV["RUBYLIB"] = @pre + "#{dir1}#{File::PATH_SEPARATOR}#{dir2}"
     paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
-    paths.should include(dir1)
-    paths.should include(dir2)
+    paths.should.include?(dir1)
+    paths.should.include?(dir2)
     paths.index(dir1).should < paths.index(dir2)
   end
 
@@ -46,8 +46,8 @@
     rubylib_dir = tmp("rubylib_include")
     ENV["RUBYLIB"] = @pre + rubylib_dir
     paths = ruby_exe("puts $LOAD_PATH", options: "-I #{dash_i_dir}").lines.map(&:chomp)
-    paths.should include(dash_i_dir)
-    paths.should include(rubylib_dir)
+    paths.should.include?(dash_i_dir)
+    paths.should.include?(rubylib_dir)
     paths.index(dash_i_dir).should < paths.index(rubylib_dir)
   end
 
@@ -56,14 +56,14 @@
     rubylib_dir = tmp("rubylib_include")
     ENV["RUBYLIB"] = @pre + rubylib_dir
     paths = ruby_exe("puts $LOAD_PATH", env: { "RUBYOPT" => "-I#{rubyopt_dir}" }).lines.map(&:chomp)
-    paths.should include(rubyopt_dir)
-    paths.should include(rubylib_dir)
+    paths.should.include?(rubyopt_dir)
+    paths.should.include?(rubylib_dir)
     paths.index(rubyopt_dir).should < paths.index(rubylib_dir)
   end
 
   it "keeps spaces in the value" do
     ENV["RUBYLIB"] = @pre + " rubylib/incl "
     out = ruby_exe("puts $LOAD_PATH")
-    out.should include(" rubylib/incl ")
+    out.should.include?(" rubylib/incl ")
   end
 end
diff --git a/spec/ruby/core/argf/argf_spec.rb b/spec/ruby/core/argf/argf_spec.rb
index af67170b98d..f9468539bba 100644
--- a/spec/ruby/core/argf/argf_spec.rb
+++ b/spec/ruby/core/argf/argf_spec.rb
@@ -2,10 +2,10 @@
 
 describe "ARGF" do
   it "is extended by the Enumerable module" do
-    ARGF.should be_kind_of(Enumerable)
+    ARGF.should.is_a?(Enumerable)
   end
 
   it "is an instance of ARGF.class" do
-    ARGF.should be_an_instance_of(ARGF.class)
+    ARGF.should.instance_of?(ARGF.class)
   end
 end
diff --git a/spec/ruby/core/argf/argv_spec.rb b/spec/ruby/core/argf/argv_spec.rb
index eab03c450f2..77dfe78c21e 100644
--- a/spec/ruby/core/argf/argv_spec.rb
+++ b/spec/ruby/core/argf/argv_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "returns ARGV for the initial ARGF" do
-    ARGF.argv.should equal ARGV
+    ARGF.argv.should.equal? ARGV
   end
 
   it "returns the remaining arguments to treat" do
diff --git a/spec/ruby/core/argf/binmode_spec.rb b/spec/ruby/core/argf/binmode_spec.rb
index e083a30a27a..5288e3199d4 100644
--- a/spec/ruby/core/argf/binmode_spec.rb
+++ b/spec/ruby/core/argf/binmode_spec.rb
@@ -9,7 +9,7 @@
 
   it "returns self" do
     argf [@bin_file] do
-      @argf.binmode.should equal @argf
+      @argf.binmode.should.equal? @argf
     end
   end
 
diff --git a/spec/ruby/core/argf/close_spec.rb b/spec/ruby/core/argf/close_spec.rb
index d4d6a51e723..8ca7d71dc20 100644
--- a/spec/ruby/core/argf/close_spec.rb
+++ b/spec/ruby/core/argf/close_spec.rb
@@ -10,20 +10,20 @@
     argf [@file1_name, @file2_name] do
       io = @argf.to_io
       @argf.close
-      io.closed?.should be_true
+      io.closed?.should == true
     end
   end
 
   it "returns self" do
     argf [@file1_name, @file2_name] do
-      @argf.close.should equal(@argf)
+      @argf.close.should.equal?(@argf)
     end
   end
 
   it "doesn't raise an IOError if called on a closed stream" do
     argf [@file1_name] do
-      -> { @argf.close }.should_not raise_error
-      -> { @argf.close }.should_not raise_error
+      -> { @argf.close }.should_not.raise
+      -> { @argf.close }.should_not.raise
     end
   end
 end
diff --git a/spec/ruby/core/argf/closed_spec.rb b/spec/ruby/core/argf/closed_spec.rb
index e2dd6134e50..769381e8c3e 100644
--- a/spec/ruby/core/argf/closed_spec.rb
+++ b/spec/ruby/core/argf/closed_spec.rb
@@ -11,7 +11,7 @@
       stream = @argf.to_io
       stream.close
 
-      @argf.closed?.should be_true
+      @argf.closed?.should == true
       stream.reopen(@argf.filename, 'r')
     end
   end
diff --git a/spec/ruby/core/argf/read_nonblock_spec.rb b/spec/ruby/core/argf/read_nonblock_spec.rb
index 804a459a62d..5c6bd52d805 100644
--- a/spec/ruby/core/argf/read_nonblock_spec.rb
+++ b/spec/ruby/core/argf/read_nonblock_spec.rb
@@ -66,7 +66,7 @@
         argf ['-'] do
           -> {
             @argf.read_nonblock(4)
-          }.should raise_error(IO::EAGAINWaitReadable)
+          }.should.raise(IO::EAGAINWaitReadable)
         end
       end
 
diff --git a/spec/ruby/core/argf/readchar_spec.rb b/spec/ruby/core/argf/readchar_spec.rb
index 4eca2efcf7d..63632721ecd 100644
--- a/spec/ruby/core/argf/readchar_spec.rb
+++ b/spec/ruby/core/argf/readchar_spec.rb
@@ -13,7 +13,7 @@
 
   it "raises EOFError when end of stream reached" do
     argf [@file1, @file2] do
-      -> { while @argf.readchar; end }.should raise_error(EOFError)
+      -> { while @argf.readchar; end }.should.raise(EOFError)
     end
   end
 end
diff --git a/spec/ruby/core/argf/readline_spec.rb b/spec/ruby/core/argf/readline_spec.rb
index db53c499e95..8c23549b1bc 100644
--- a/spec/ruby/core/argf/readline_spec.rb
+++ b/spec/ruby/core/argf/readline_spec.rb
@@ -17,7 +17,7 @@
 
   it "raises an EOFError when reaching end of files" do
     argf [@file1, @file2] do
-      -> { while @argf.readline; end }.should raise_error(EOFError)
+      -> { while @argf.readline; end }.should.raise(EOFError)
     end
   end
 end
diff --git a/spec/ruby/core/argf/readpartial_spec.rb b/spec/ruby/core/argf/readpartial_spec.rb
index ea4301f25c6..9f04e72cc26 100644
--- a/spec/ruby/core/argf/readpartial_spec.rb
+++ b/spec/ruby/core/argf/readpartial_spec.rb
@@ -16,7 +16,7 @@
 
   it "raises an ArgumentError if called without a maximum read length" do
     argf [@file1_name] do
-      -> { @argf.readpartial }.should raise_error(ArgumentError)
+      -> { @argf.readpartial }.should.raise(ArgumentError)
     end
   end
 
@@ -59,8 +59,8 @@
       @argf.readpartial(@file1.size)
       @argf.readpartial(1)
       @argf.readpartial(@file2.size)
-      -> { @argf.readpartial(1) }.should raise_error(EOFError)
-      -> { @argf.readpartial(1) }.should raise_error(EOFError)
+      -> { @argf.readpartial(1) }.should.raise(EOFError)
+      -> { @argf.readpartial(1) }.should.raise(EOFError)
     end
   end
 
diff --git a/spec/ruby/core/argf/rewind_spec.rb b/spec/ruby/core/argf/rewind_spec.rb
index b29f0b75b76..9255f790fee 100644
--- a/spec/ruby/core/argf/rewind_spec.rb
+++ b/spec/ruby/core/argf/rewind_spec.rb
@@ -33,7 +33,7 @@
   it "raises an ArgumentError when end of stream reached" do
     argf [@file1_name, @file2_name] do
       @argf.read
-      -> { @argf.rewind }.should raise_error(ArgumentError)
+      -> { @argf.rewind }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/argf/seek_spec.rb b/spec/ruby/core/argf/seek_spec.rb
index 2b73bd46fb9..c1ea1ea4389 100644
--- a/spec/ruby/core/argf/seek_spec.rb
+++ b/spec/ruby/core/argf/seek_spec.rb
@@ -57,7 +57,7 @@
 
   it "takes at least one argument (offset)" do
     argf [@file1_name] do
-      -> { @argf.seek }.should raise_error(ArgumentError)
+      -> { @argf.seek }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/argf/shared/each_byte.rb b/spec/ruby/core/argf/shared/each_byte.rb
index 6b1dc1dae2e..48c9ae04f88 100644
--- a/spec/ruby/core/argf/shared/each_byte.rb
+++ b/spec/ruby/core/argf/shared/each_byte.rb
@@ -18,14 +18,14 @@
 
   it "returns self when passed a block" do
     argf [@file1_name, @file2_name] do
-      @argf.send(@method) {}.should equal(@argf)
+      @argf.send(@method) {}.should.equal?(@argf)
     end
   end
 
   it "returns an Enumerator when passed no block" do
     argf [@file1_name, @file2_name] do
       enum = @argf.send(@method)
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
 
       bytes = []
       enum.each { |b| bytes << b }
@@ -37,7 +37,7 @@
     it "returns an Enumerator" do
       argf [@file1_name, @file2_name] do
         enum = @argf.send(@method)
-        enum.should be_an_instance_of(Enumerator)
+        enum.should.instance_of?(Enumerator)
 
         bytes = []
         enum.each { |b| bytes << b }
diff --git a/spec/ruby/core/argf/shared/each_char.rb b/spec/ruby/core/argf/shared/each_char.rb
index 9e333ecc5b4..4b5e8452ab9 100644
--- a/spec/ruby/core/argf/shared/each_char.rb
+++ b/spec/ruby/core/argf/shared/each_char.rb
@@ -18,14 +18,14 @@
 
   it "returns self when passed a block" do
     argf [@file1_name, @file2_name] do
-      @argf.send(@method) {}.should equal(@argf)
+      @argf.send(@method) {}.should.equal?(@argf)
     end
   end
 
   it "returns an Enumerator when passed no block" do
     argf [@file1_name, @file2_name] do
       enum = @argf.send(@method)
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
 
       chars = []
       enum.each { |c| chars << c }
@@ -37,7 +37,7 @@
     it "returns an Enumerator" do
       argf [@file1_name, @file2_name] do
         enum = @argf.send(@method)
-        enum.should be_an_instance_of(Enumerator)
+        enum.should.instance_of?(Enumerator)
 
         chars = []
         enum.each { |c| chars << c }
diff --git a/spec/ruby/core/argf/shared/each_codepoint.rb b/spec/ruby/core/argf/shared/each_codepoint.rb
index e2a2dfff460..3137306ad5f 100644
--- a/spec/ruby/core/argf/shared/each_codepoint.rb
+++ b/spec/ruby/core/argf/shared/each_codepoint.rb
@@ -10,7 +10,7 @@
 
   it "is a public method" do
     argf @filenames do
-      @argf.public_methods(false).should include(@method)
+      @argf.public_methods(false).should.include?(@method)
     end
   end
 
@@ -22,13 +22,13 @@
 
   it "returns self when passed a block" do
     argf @filenames do
-      @argf.send(@method) {}.should equal(@argf)
+      @argf.send(@method) {}.should.equal?(@argf)
     end
   end
 
   it "returns an Enumerator when passed no block" do
     argf @filenames do
-      @argf.send(@method).should be_an_instance_of(Enumerator)
+      @argf.send(@method).should.instance_of?(Enumerator)
     end
   end
 
@@ -41,7 +41,7 @@
   describe "when no block is given" do
     it "returns an Enumerator" do
       argf @filenames do
-        @argf.send(@method).should be_an_instance_of(Enumerator)
+        @argf.send(@method).should.instance_of?(Enumerator)
       end
     end
 
diff --git a/spec/ruby/core/argf/shared/each_line.rb b/spec/ruby/core/argf/shared/each_line.rb
index c0ef77dc543..7e66e388033 100644
--- a/spec/ruby/core/argf/shared/each_line.rb
+++ b/spec/ruby/core/argf/shared/each_line.rb
@@ -9,7 +9,7 @@
 
   it "is a public method" do
     argf [@file1_name, @file2_name] do
-      @argf.public_methods(false).should include(@method)
+      @argf.public_methods(false).should.include?(@method)
     end
   end
 
@@ -29,7 +29,7 @@
 
   it "returns self when passed a block" do
     argf [@file1_name, @file2_name] do
-      @argf.send(@method) {}.should equal(@argf)
+      @argf.send(@method) {}.should.equal?(@argf)
     end
   end
 
@@ -45,7 +45,7 @@
   describe "when no block is given" do
     it "returns an Enumerator" do
       argf [@file1_name, @file2_name] do
-        @argf.send(@method).should be_an_instance_of(Enumerator)
+        @argf.send(@method).should.instance_of?(Enumerator)
       end
     end
 
diff --git a/spec/ruby/core/argf/shared/eof.rb b/spec/ruby/core/argf/shared/eof.rb
index 0e684f943f7..8b3897b9520 100644
--- a/spec/ruby/core/argf/shared/eof.rb
+++ b/spec/ruby/core/argf/shared/eof.rb
@@ -18,7 +18,7 @@
   it "raises IOError when called on a closed stream" do
     argf [@file1] do
       @argf.read
-      -> { @argf.send(@method) }.should raise_error(IOError)
+      -> { @argf.send(@method) }.should.raise(IOError)
     end
   end
 end
diff --git a/spec/ruby/core/argf/shared/fileno.rb b/spec/ruby/core/argf/shared/fileno.rb
index 4350d437478..e605be46e31 100644
--- a/spec/ruby/core/argf/shared/fileno.rb
+++ b/spec/ruby/core/argf/shared/fileno.rb
@@ -18,7 +18,7 @@
   it "raises an ArgumentError when called on a closed stream" do
     argf [@file1] do
       @argf.read
-      -> { @argf.send(@method) }.should raise_error(ArgumentError)
+      -> { @argf.send(@method) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/argf/shared/pos.rb b/spec/ruby/core/argf/shared/pos.rb
index 9836d5f1e4f..f859d3a29d0 100644
--- a/spec/ruby/core/argf/shared/pos.rb
+++ b/spec/ruby/core/argf/shared/pos.rb
@@ -25,7 +25,7 @@
   it "raises an ArgumentError when called on a closed stream" do
     argf [@file1] do
       @argf.read
-      -> { @argf.send(@method) }.should raise_error(ArgumentError)
+      -> { @argf.send(@method) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/argf/skip_spec.rb b/spec/ruby/core/argf/skip_spec.rb
index 0181801c2d1..bb1c0ae1105 100644
--- a/spec/ruby/core/argf/skip_spec.rb
+++ b/spec/ruby/core/argf/skip_spec.rb
@@ -37,6 +37,6 @@
   # which as a side-effect calls argf.file which will initialize
   # internals of ARGF enough for this to work.
   it "has no effect when nothing has been processed yet" do
-    -> { ARGF.class.new(@file1_name).skip }.should_not raise_error
+    -> { ARGF.class.new(@file1_name).skip }.should_not.raise
   end
 end
diff --git a/spec/ruby/core/argf/to_io_spec.rb b/spec/ruby/core/argf/to_io_spec.rb
index 062383d2911..ab5de58bcf2 100644
--- a/spec/ruby/core/argf/to_io_spec.rb
+++ b/spec/ruby/core/argf/to_io_spec.rb
@@ -15,7 +15,7 @@
         result << @argf.to_io
       end
 
-      result.each { |io| io.should be_kind_of(IO) }
+      result.each { |io| io.should.is_a?(IO) }
       result[0].should == result[1]
       result[2].should == result[3]
     end
diff --git a/spec/ruby/core/array/allocate_spec.rb b/spec/ruby/core/array/allocate_spec.rb
index 04f7c0d0ad3..c9eceef5903 100644
--- a/spec/ruby/core/array/allocate_spec.rb
+++ b/spec/ruby/core/array/allocate_spec.rb
@@ -3,7 +3,7 @@
 describe "Array.allocate" do
   it "returns an instance of Array" do
     ary = Array.allocate
-    ary.should be_an_instance_of(Array)
+    ary.should.instance_of?(Array)
   end
 
   it "returns a fully-formed instance of Array" do
@@ -14,6 +14,6 @@
   end
 
   it "does not accept any arguments" do
-    -> { Array.allocate(1) }.should raise_error(ArgumentError)
+    -> { Array.allocate(1) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/array/append_spec.rb b/spec/ruby/core/array/append_spec.rb
index c12473dc07f..de0e56b5133 100644
--- a/spec/ruby/core/array/append_spec.rb
+++ b/spec/ruby/core/array/append_spec.rb
@@ -10,8 +10,8 @@
   it "returns self to allow chaining" do
     a = []
     b = a
-    (a << 1).should equal(b)
-    (a << 2 << 3).should equal(b)
+    (a << 1).should.equal?(b)
+    (a << 2 << 3).should.equal?(b)
   end
 
   it "correctly resizes the Array" do
@@ -31,7 +31,7 @@
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array << 5 }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array << 5 }.should.raise(FrozenError)
   end
 end
 
diff --git a/spec/ruby/core/array/assoc_spec.rb b/spec/ruby/core/array/assoc_spec.rb
index f0be3de7957..a5026cf5d4f 100644
--- a/spec/ruby/core/array/assoc_spec.rb
+++ b/spec/ruby/core/array/assoc_spec.rb
@@ -10,14 +10,14 @@
     s5 = [:letters, "a", "i", "u"]
     s_nil = [nil, nil]
     a = [s1, s2, s3, s4, s5, s_nil]
-    a.assoc(s1.first).should equal(s1)
-    a.assoc(s2.first).should equal(s2)
-    a.assoc(s3.first).should equal(s3)
-    a.assoc(s4.first).should equal(s1)
-    a.assoc(s5.first).should equal(s2)
-    a.assoc(s_nil.first).should equal(s_nil)
-    a.assoc(4).should equal(s3)
-    a.assoc("key not in array").should be_nil
+    a.assoc(s1.first).should.equal?(s1)
+    a.assoc(s2.first).should.equal?(s2)
+    a.assoc(s3.first).should.equal?(s3)
+    a.assoc(s4.first).should.equal?(s1)
+    a.assoc(s5.first).should.equal?(s2)
+    a.assoc(s_nil.first).should.equal?(s_nil)
+    a.assoc(4).should.equal?(s3)
+    a.assoc("key not in array").should == nil
   end
 
   it "calls == on first element of each array" do
@@ -25,17 +25,17 @@
     key2 = mock('key2')
     items = [['not it', 1], [ArraySpecs::AssocKey.new, 2], ['na', 3]]
 
-    items.assoc(key1).should equal(items[1])
-    items.assoc(key2).should be_nil
+    items.assoc(key1).should.equal?(items[1])
+    items.assoc(key2).should == nil
   end
 
   it "ignores any non-Array elements" do
-    [1, 2, 3].assoc(2).should be_nil
+    [1, 2, 3].assoc(2).should == nil
     s1 = [4]
     s2 = [5, 4, 3]
     a = ["foo", [], s1, s2, nil, []]
-    a.assoc(s1.first).should equal(s1)
-    a.assoc(s2.first).should equal(s2)
+    a.assoc(s1.first).should.equal?(s1)
+    a.assoc(s2.first).should.equal?(s2)
   end
 
   it "calls to_ary on non-array elements" do
@@ -44,9 +44,9 @@
     a = [s1, s2]
 
     s1.should_not_receive(:to_ary)
-    a.assoc(s1.first).should equal(s1)
+    a.assoc(s1.first).should.equal?(s1)
 
     a.assoc(2).should == [2, 3]
-    s2.called.should equal(:to_ary)
+    s2.called.should.equal?(:to_ary)
   end
 end
diff --git a/spec/ruby/core/array/at_spec.rb b/spec/ruby/core/array/at_spec.rb
index 8bc789fef75..3c7c99fdffe 100644
--- a/spec/ruby/core/array/at_spec.rb
+++ b/spec/ruby/core/array/at_spec.rb
@@ -47,10 +47,10 @@
   end
 
   it "raises a TypeError when the passed argument can't be coerced to Integer" do
-    -> { [].at("cat") }.should raise_error(TypeError)
+    -> { [].at("cat") }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when 2 or more arguments are passed" do
-    -> { [:a, :b].at(0,1) }.should raise_error(ArgumentError)
+    -> { [:a, :b].at(0,1) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/array/bsearch_index_spec.rb b/spec/ruby/core/array/bsearch_index_spec.rb
index 94d85b37f33..e1d5eb66bb1 100644
--- a/spec/ruby/core/array/bsearch_index_spec.rb
+++ b/spec/ruby/core/array/bsearch_index_spec.rb
@@ -8,11 +8,11 @@
     end
 
     it "returns an Enumerator" do
-      @enum.should be_an_instance_of(Enumerator)
+      @enum.should.instance_of?(Enumerator)
     end
 
     it "returns an Enumerator with unknown size" do
-      @enum.size.should be_nil
+      @enum.size.should == nil
     end
 
     it "returns index of element when block condition is satisfied" do
@@ -21,11 +21,11 @@
   end
 
   it "raises a TypeError when block returns a String" do
-    -> { [1, 2, 3].bsearch_index { "not ok" } }.should raise_error(TypeError)
+    -> { [1, 2, 3].bsearch_index { "not ok" } }.should.raise(TypeError)
   end
 
   it "returns nil when block is empty" do
-    [1, 2, 3].bsearch_index {}.should be_nil
+    [1, 2, 3].bsearch_index {}.should == nil
   end
 
   context "minimum mode" do
@@ -40,8 +40,8 @@
     end
 
     it "returns nil when block condition is never satisfied" do
-      @array.bsearch_index { false }.should be_nil
-      @array.bsearch_index { |x| x >= 100 }.should be_nil
+      @array.bsearch_index { false }.should == nil
+      @array.bsearch_index { |x| x >= 100 }.should == nil
     end
   end
 
@@ -51,30 +51,30 @@
     end
 
     it "returns the index of any matched elements where element is between 4 <= x < 8" do
-      [1, 2].should include(@array.bsearch_index { |x| 1 - x / 4 })
+      [1, 2].should.include?(@array.bsearch_index { |x| 1 - x / 4 })
     end
 
     it "returns the index of any matched elements where element is between 8 <= x < 10" do
-      @array.bsearch_index { |x| 4 - x / 2 }.should be_nil
+      @array.bsearch_index { |x| 4 - x / 2 }.should == nil
     end
 
     it "returns nil when block never returns 0" do
-      @array.bsearch_index { |x| 1 }.should be_nil
-      @array.bsearch_index { |x| -1 }.should be_nil
+      @array.bsearch_index { |x| 1 }.should == nil
+      @array.bsearch_index { |x| -1 }.should == nil
     end
 
     context "magnitude does not effect the result" do
       it "returns the index of any matched elements where element is between 4n <= xn < 8n" do
-        [1, 2].should include(@array.bsearch_index { |x| (1 - x / 4) * (2**100) })
+        [1, 2].should.include?(@array.bsearch_index { |x| (1 - x / 4) * (2**100) })
       end
 
       it "returns nil when block never returns 0" do
-        @array.bsearch_index { |x| 1 * (2**100) }.should be_nil
-        @array.bsearch_index { |x| (-1) * (2**100) }.should be_nil
+        @array.bsearch_index { |x| 1 * (2**100) }.should == nil
+        @array.bsearch_index { |x| (-1) * (2**100) }.should == nil
       end
 
       it "handles values from Integer#coerce" do
-        [1, 2].should include(@array.bsearch_index { |x| (2**100).coerce((1 - x / 4) * (2**100)).first })
+        [1, 2].should.include?(@array.bsearch_index { |x| (2**100).coerce((1 - x / 4) * (2**100)).first })
       end
     end
   end
diff --git a/spec/ruby/core/array/bsearch_spec.rb b/spec/ruby/core/array/bsearch_spec.rb
index 8fa6245dbff..12aec606543 100644
--- a/spec/ruby/core/array/bsearch_spec.rb
+++ b/spec/ruby/core/array/bsearch_spec.rb
@@ -3,26 +3,26 @@
 
 describe "Array#bsearch" do
   it "returns an Enumerator when not passed a block" do
-    [1].bsearch.should be_an_instance_of(Enumerator)
+    [1].bsearch.should.instance_of?(Enumerator)
   end
 
   it_behaves_like :enumeratorized_with_unknown_size, :bsearch, [1,2,3]
 
   it "raises a TypeError if the block returns an Object" do
-    -> { [1].bsearch { Object.new } }.should raise_error(TypeError)
+    -> { [1].bsearch { Object.new } }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the block returns a String" do
-    -> { [1].bsearch { "1" } }.should raise_error(TypeError)
+    -> { [1].bsearch { "1" } }.should.raise(TypeError)
   end
 
   context "with a block returning true or false" do
     it "returns nil if the block returns false for every element" do
-      [0, 1, 2, 3].bsearch { |x| x > 3 }.should be_nil
+      [0, 1, 2, 3].bsearch { |x| x > 3 }.should == nil
     end
 
     it "returns nil if the block returns nil for every element" do
-      [0, 1, 2, 3].bsearch { |x| nil }.should be_nil
+      [0, 1, 2, 3].bsearch { |x| nil }.should == nil
     end
 
     it "returns element at zero if the block returns true for every element" do
@@ -38,21 +38,21 @@
 
   context "with a block returning negative, zero, positive numbers" do
     it "returns nil if the block returns less than zero for every element" do
-      [0, 1, 2, 3].bsearch { |x| x <=> 5 }.should be_nil
+      [0, 1, 2, 3].bsearch { |x| x <=> 5 }.should == nil
     end
 
     it "returns nil if the block returns greater than zero for every element" do
-      [0, 1, 2, 3].bsearch { |x| x <=> -1 }.should be_nil
+      [0, 1, 2, 3].bsearch { |x| x <=> -1 }.should == nil
 
     end
 
     it "returns nil if the block never returns zero" do
-      [0, 1, 3, 4].bsearch { |x| x <=> 2 }.should be_nil
+      [0, 1, 3, 4].bsearch { |x| x <=> 2 }.should == nil
     end
 
     it "accepts (+/-)Float::INFINITY from the block" do
-      [0, 1, 3, 4].bsearch { |x| Float::INFINITY }.should be_nil
-      [0, 1, 3, 4].bsearch { |x| -Float::INFINITY }.should be_nil
+      [0, 1, 3, 4].bsearch { |x| Float::INFINITY }.should == nil
+      [0, 1, 3, 4].bsearch { |x| -Float::INFINITY }.should == nil
     end
 
     it "returns an element at an index for which block returns 0.0" do
@@ -62,17 +62,17 @@
 
     it "returns an element at an index for which block returns 0" do
       result = [0, 1, 2, 3, 4].bsearch { |x| x < 1 ? 1 : x > 3 ? -1 : 0 }
-      [1, 2].should include(result)
+      [1, 2].should.include?(result)
     end
   end
 
   context "with a block that calls break" do
     it "returns nil if break is called without a value" do
-      ['a', 'b', 'c'].bsearch { |v| break }.should be_nil
+      ['a', 'b', 'c'].bsearch { |v| break }.should == nil
     end
 
     it "returns nil if break is called with a nil value" do
-      ['a', 'b', 'c'].bsearch { |v| break nil }.should be_nil
+      ['a', 'b', 'c'].bsearch { |v| break nil }.should == nil
     end
 
     it "returns object if break is called with an object" do
diff --git a/spec/ruby/core/array/clear_spec.rb b/spec/ruby/core/array/clear_spec.rb
index 81ba56e01e4..15778f864f5 100644
--- a/spec/ruby/core/array/clear_spec.rb
+++ b/spec/ruby/core/array/clear_spec.rb
@@ -4,13 +4,13 @@
 describe "Array#clear" do
   it "removes all elements" do
     a = [1, 2, 3, 4]
-    a.clear.should equal(a)
+    a.clear.should.equal?(a)
     a.should == []
   end
 
   it "returns self" do
     a = [1]
-    a.should equal a.clear
+    a.should.equal? a.clear
   end
 
   it "leaves the Array empty" do
@@ -21,12 +21,12 @@
   end
 
   it "does not accept any arguments" do
-    -> { [1].clear(true) }.should raise_error(ArgumentError)
+    -> { [1].clear(true) }.should.raise(ArgumentError)
   end
 
   it "raises a FrozenError on a frozen array" do
     a = [1]
     a.freeze
-    -> { a.clear }.should raise_error(FrozenError)
+    -> { a.clear }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/clone_spec.rb b/spec/ruby/core/array/clone_spec.rb
index e22a6c6d536..7ce9d40a81f 100644
--- a/spec/ruby/core/array/clone_spec.rb
+++ b/spec/ruby/core/array/clone_spec.rb
@@ -23,9 +23,9 @@ def a.a_singleton_method; end
     aa = a.clone
     bb = b.clone
 
-    a.respond_to?(:a_singleton_method).should be_true
-    b.respond_to?(:a_singleton_method).should be_false
-    aa.respond_to?(:a_singleton_method).should be_true
-    bb.respond_to?(:a_singleton_method).should be_false
+    a.respond_to?(:a_singleton_method).should == true
+    b.respond_to?(:a_singleton_method).should == false
+    aa.respond_to?(:a_singleton_method).should == true
+    bb.respond_to?(:a_singleton_method).should == false
   end
 end
diff --git a/spec/ruby/core/array/combination_spec.rb b/spec/ruby/core/array/combination_spec.rb
index f16d6f98fc7..ac570687ca0 100644
--- a/spec/ruby/core/array/combination_spec.rb
+++ b/spec/ruby/core/array/combination_spec.rb
@@ -6,11 +6,11 @@
   end
 
   it "returns an enumerator when no block is provided" do
-    @array.combination(2).should be_an_instance_of(Enumerator)
+    @array.combination(2).should.instance_of?(Enumerator)
   end
 
   it "returns self when a block is given" do
-    @array.combination(2){}.should equal(@array)
+    @array.combination(2){}.should.equal?(@array)
   end
 
   it "yields nothing for out of bounds length and return self" do
@@ -30,7 +30,7 @@
   it "yields a copy of self if the argument is the size of the receiver" do
     r = @array.combination(4).to_a
     r.should == [@array]
-    r[0].should_not equal(@array)
+    r[0].should_not.equal?(@array)
   end
 
   it "yields [] when length is 0" do
diff --git a/spec/ruby/core/array/compact_spec.rb b/spec/ruby/core/array/compact_spec.rb
index 83b3fa2a891..dbcd16da35b 100644
--- a/spec/ruby/core/array/compact_spec.rb
+++ b/spec/ruby/core/array/compact_spec.rb
@@ -15,30 +15,30 @@
 
   it "does not return self" do
     a = [1, 2, 3]
-    a.compact.should_not equal(a)
+    a.compact.should_not.equal?(a)
   end
 
   it "does not return subclass instance for Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3, nil].compact.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3, nil].compact.should.instance_of?(Array)
   end
 end
 
 describe "Array#compact!" do
   it "removes all nil elements" do
     a = ['a', nil, 'b', false, 'c']
-    a.compact!.should equal(a)
+    a.compact!.should.equal?(a)
     a.should == ["a", "b", false, "c"]
     a = [nil, 'a', 'b', false, 'c']
-    a.compact!.should equal(a)
+    a.compact!.should.equal?(a)
     a.should == ["a", "b", false, "c"]
     a = ['a', 'b', false, 'c', nil]
-    a.compact!.should equal(a)
+    a.compact!.should.equal?(a)
     a.should == ["a", "b", false, "c"]
   end
 
   it "returns self if some nil elements are removed" do
     a = ['a', nil, 'b', false, 'c']
-    a.compact!.should equal a
+    a.compact!.should.equal? a
   end
 
   it "returns nil if there are no nil elements to remove" do
@@ -46,6 +46,6 @@
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.compact! }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.compact! }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/comparison_spec.rb b/spec/ruby/core/array/comparison_spec.rb
index 5d1c3265f17..14e8931e5a4 100644
--- a/spec/ruby/core/array/comparison_spec.rb
+++ b/spec/ruby/core/array/comparison_spec.rb
@@ -92,6 +92,6 @@
   end
 
   it "returns nil when the argument is not array-like" do
-    ([] <=> false).should be_nil
+    ([] <=> false).should == nil
   end
 end
diff --git a/spec/ruby/core/array/concat_spec.rb b/spec/ruby/core/array/concat_spec.rb
index f3cab9c17c4..1e8d20c36c2 100644
--- a/spec/ruby/core/array/concat_spec.rb
+++ b/spec/ruby/core/array/concat_spec.rb
@@ -4,12 +4,12 @@
 describe "Array#concat" do
   it "returns the array itself" do
     ary = [1,2,3]
-    ary.concat([4,5,6]).equal?(ary).should be_true
+    ary.concat([4,5,6]).equal?(ary).should == true
   end
 
   it "appends the elements in the other array" do
     ary = [1, 2, 3]
-    ary.concat([9, 10, 11]).should equal(ary)
+    ary.concat([9, 10, 11]).should.equal?(ary)
     ary.should == [1, 2, 3, 9, 10, 11]
     ary.concat([])
     ary.should == [1, 2, 3, 9, 10, 11]
@@ -33,12 +33,12 @@
   end
 
   it "raises a FrozenError when Array is frozen and modification occurs" do
-    -> { ArraySpecs.frozen_array.concat [1] }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.concat [1] }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError when Array is frozen and no modification occurs" do
-    -> { ArraySpecs.frozen_array.concat([]) }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.concat([]) }.should.raise(FrozenError)
   end
 
   it "appends elements to an Array with enough capacity that has been shifted" do
@@ -68,7 +68,7 @@
 
   it "returns self when given no arguments" do
     ary = [1, 2]
-    ary.concat.should equal(ary)
+    ary.concat.should.equal?(ary)
     ary.should == [1, 2]
   end
 end
diff --git a/spec/ruby/core/array/constructor_spec.rb b/spec/ruby/core/array/constructor_spec.rb
index 6f36074c45e..c4398c535d4 100644
--- a/spec/ruby/core/array/constructor_spec.rb
+++ b/spec/ruby/core/array/constructor_spec.rb
@@ -7,7 +7,7 @@
     Array.[](5, true, nil, 'a', "Ruby", obj).should == [5, true, nil, "a", "Ruby", obj]
 
     a = ArraySpecs::MyArray.[](5, true, nil, 'a', "Ruby", obj)
-    a.should be_an_instance_of(ArraySpecs::MyArray)
+    a.should.instance_of?(ArraySpecs::MyArray)
     a.inspect.should == [5, true, nil, "a", "Ruby", obj].inspect
   end
 end
@@ -18,7 +18,7 @@
     Array[5, true, nil, 'a', "Ruby", obj].should == Array.[](5, true, nil, "a", "Ruby", obj)
 
     a = ArraySpecs::MyArray[5, true, nil, 'a', "Ruby", obj]
-    a.should be_an_instance_of(ArraySpecs::MyArray)
+    a.should.instance_of?(ArraySpecs::MyArray)
     a.inspect.should == [5, true, nil, "a", "Ruby", obj].inspect
   end
 end
diff --git a/spec/ruby/core/array/cycle_spec.rb b/spec/ruby/core/array/cycle_spec.rb
index 7219b498839..29284257e9c 100644
--- a/spec/ruby/core/array/cycle_spec.rb
+++ b/spec/ruby/core/array/cycle_spec.rb
@@ -10,17 +10,17 @@
   end
 
   it "does not yield and returns nil when the array is empty and passed value is an integer" do
-    [].cycle(6, &@prc).should be_nil
+    [].cycle(6, &@prc).should == nil
     ScratchPad.recorded.should == []
   end
 
   it "does not yield and returns nil when the array is empty and passed value is nil" do
-    [].cycle(nil, &@prc).should be_nil
+    [].cycle(nil, &@prc).should == nil
     ScratchPad.recorded.should == []
   end
 
   it "does not yield and returns nil when passed 0" do
-    @array.cycle(0, &@prc).should be_nil
+    @array.cycle(0, &@prc).should == nil
     ScratchPad.recorded.should == []
   end
 
@@ -48,13 +48,13 @@
   it "does not rescue StopIteration when not passed a count" do
     -> do
       @array.cycle { raise StopIteration }
-    end.should raise_error(StopIteration)
+    end.should.raise(StopIteration)
   end
 
   it "does not rescue StopIteration when passed a count" do
     -> do
       @array.cycle(3) { raise StopIteration }
-    end.should raise_error(StopIteration)
+    end.should.raise(StopIteration)
   end
 
   it "iterates the array Integer(count) times when passed a Float count" do
@@ -74,23 +74,23 @@
     count = mock("cycle count 2")
     count.should_receive(:to_int).and_return("2")
 
-    -> { @array.cycle(count, &@prc) }.should raise_error(TypeError)
+    -> { @array.cycle(count, &@prc) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed a String" do
-    -> { @array.cycle("4") { } }.should raise_error(TypeError)
+    -> { @array.cycle("4") { } }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an Object" do
-    -> { @array.cycle(mock("cycle count")) { } }.should raise_error(TypeError)
+    -> { @array.cycle(mock("cycle count")) { } }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed true" do
-    -> { @array.cycle(true) { } }.should raise_error(TypeError)
+    -> { @array.cycle(true) { } }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed false" do
-    -> { @array.cycle(false) { } }.should raise_error(TypeError)
+    -> { @array.cycle(false) { } }.should.raise(TypeError)
   end
 
   before :all do
diff --git a/spec/ruby/core/array/deconstruct_spec.rb b/spec/ruby/core/array/deconstruct_spec.rb
index ad67abe47bc..11bb8e72c41 100644
--- a/spec/ruby/core/array/deconstruct_spec.rb
+++ b/spec/ruby/core/array/deconstruct_spec.rb
@@ -4,6 +4,6 @@
   it "returns self" do
     array = [1]
 
-    array.deconstruct.should equal array
+    array.deconstruct.should.equal? array
   end
 end
diff --git a/spec/ruby/core/array/delete_at_spec.rb b/spec/ruby/core/array/delete_at_spec.rb
index 80ec6437026..1e298b6730d 100644
--- a/spec/ruby/core/array/delete_at_spec.rb
+++ b/spec/ruby/core/array/delete_at_spec.rb
@@ -36,6 +36,6 @@
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { [1,2,3].freeze.delete_at(0) }.should raise_error(FrozenError)
+    -> { [1,2,3].freeze.delete_at(0) }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/delete_if_spec.rb b/spec/ruby/core/array/delete_if_spec.rb
index 10972eee0e6..701a612395f 100644
--- a/spec/ruby/core/array/delete_if_spec.rb
+++ b/spec/ruby/core/array/delete_if_spec.rb
@@ -17,7 +17,7 @@
   end
 
   it "returns self" do
-    @a.delete_if{ true }.equal?(@a).should be_true
+    @a.delete_if{ true }.equal?(@a).should == true
   end
 
   it_behaves_like :enumeratorize, :delete_if
@@ -25,27 +25,27 @@
   it "returns self when called on an Array emptied with #shift" do
     array = [1]
     array.shift
-    array.delete_if { |x| true }.should equal(array)
+    array.delete_if { |x| true }.should.equal?(array)
   end
 
   it "returns an Enumerator if no block given, and the enumerator can modify the original array" do
     enum = @a.delete_if
-    enum.should be_an_instance_of(Enumerator)
-    @a.should_not be_empty
+    enum.should.instance_of?(Enumerator)
+    @a.should_not.empty?
     enum.each { true }
-    @a.should be_empty
+    @a.should.empty?
   end
 
   it "returns an Enumerator if no block given, and the array is frozen" do
-    @a.freeze.delete_if.should be_an_instance_of(Enumerator)
+    @a.freeze.delete_if.should.instance_of?(Enumerator)
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.delete_if {} }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.delete_if {} }.should.raise(FrozenError)
   end
 
   it "raises a FrozenError on an empty frozen array" do
-    -> { ArraySpecs.empty_frozen_array.delete_if {} }.should raise_error(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.delete_if {} }.should.raise(FrozenError)
   end
 
   it "does not truncate the array is the block raises an exception" do
diff --git a/spec/ruby/core/array/delete_spec.rb b/spec/ruby/core/array/delete_spec.rb
index dddbbe6bd33..0d80b2839da 100644
--- a/spec/ruby/core/array/delete_spec.rb
+++ b/spec/ruby/core/array/delete_spec.rb
@@ -41,6 +41,6 @@ def x.==(other) 3 == other end
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { [1, 2, 3].freeze.delete(1) }.should raise_error(FrozenError)
+    -> { [1, 2, 3].freeze.delete(1) }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/difference_spec.rb b/spec/ruby/core/array/difference_spec.rb
index 9f7d4c4a1a2..63e32feca00 100644
--- a/spec/ruby/core/array/difference_spec.rb
+++ b/spec/ruby/core/array/difference_spec.rb
@@ -8,11 +8,11 @@
   it "returns a copy when called without any parameter" do
     x = [1, 2, 3, 2]
     x.difference.should == x
-    x.difference.should_not equal x
+    x.difference.should_not.equal? x
   end
 
   it "does not return subclass instances for Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].difference.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].difference.should.instance_of?(Array)
   end
 
   it "accepts multiple arguments" do
diff --git a/spec/ruby/core/array/dig_spec.rb b/spec/ruby/core/array/dig_spec.rb
index f2d8ff47fdf..4166ff9f1fc 100644
--- a/spec/ruby/core/array/dig_spec.rb
+++ b/spec/ruby/core/array/dig_spec.rb
@@ -4,7 +4,7 @@
 
   it "returns #at with one arg" do
     ['a'].dig(0).should == 'a'
-    ['a'].dig(1).should be_nil
+    ['a'].dig(1).should == nil
   end
 
   it "recurses array elements" do
@@ -22,20 +22,20 @@
   it "raises a TypeError for a non-numeric index" do
     -> {
       ['a'].dig(:first)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises a TypeError if any intermediate step does not respond to #dig" do
     a = [1, 2]
     -> {
       a.dig(0, 1)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError if no arguments provided" do
     -> {
       [10].dig()
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "returns nil if any intermediate step is nil" do
diff --git a/spec/ruby/core/array/drop_spec.rb b/spec/ruby/core/array/drop_spec.rb
index 5926c291b84..c0e1c9edcea 100644
--- a/spec/ruby/core/array/drop_spec.rb
+++ b/spec/ruby/core/array/drop_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "raises an ArgumentError if the number of elements specified is negative" do
-    -> { [1, 2].drop(-3) }.should raise_error(ArgumentError)
+    -> { [1, 2].drop(-3) }.should.raise(ArgumentError)
   end
 
   it "returns an empty Array if all elements are dropped" do
@@ -40,17 +40,17 @@
   end
 
   it "raises a TypeError when the passed argument can't be coerced to Integer" do
-    -> { [1, 2].drop("cat") }.should raise_error(TypeError)
+    -> { [1, 2].drop("cat") }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the passed argument isn't an integer and #to_int returns non-Integer" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return("cat")
 
-    -> { [1, 2].drop(obj) }.should raise_error(TypeError)
+    -> { [1, 2].drop(obj) }.should.raise(TypeError)
   end
 
   it 'returns a Array instance for Array subclasses' do
-    ArraySpecs::MyArray[1, 2, 3, 4, 5].drop(1).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3, 4, 5].drop(1).should.instance_of?(Array)
   end
 end
diff --git a/spec/ruby/core/array/drop_while_spec.rb b/spec/ruby/core/array/drop_while_spec.rb
index bd46e8b882b..4fead3ff065 100644
--- a/spec/ruby/core/array/drop_while_spec.rb
+++ b/spec/ruby/core/array/drop_while_spec.rb
@@ -19,6 +19,6 @@
   end
 
   it 'returns a Array instance for Array subclasses' do
-    ArraySpecs::MyArray[1, 2, 3, 4, 5].drop_while { |n| n < 4 }.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3, 4, 5].drop_while { |n| n < 4 }.should.instance_of?(Array)
   end
 end
diff --git a/spec/ruby/core/array/dup_spec.rb b/spec/ruby/core/array/dup_spec.rb
index 17f467d5fc5..f14aeca3b55 100644
--- a/spec/ruby/core/array/dup_spec.rb
+++ b/spec/ruby/core/array/dup_spec.rb
@@ -12,8 +12,8 @@
     aa = a.dup
     bb = b.dup
 
-    aa.frozen?.should be_false
-    bb.frozen?.should be_false
+    aa.frozen?.should == false
+    bb.frozen?.should == false
   end
 
   it "does not copy singleton methods" do
@@ -23,9 +23,9 @@ def a.a_singleton_method; end
     aa = a.dup
     bb = b.dup
 
-    a.respond_to?(:a_singleton_method).should be_true
-    b.respond_to?(:a_singleton_method).should be_false
-    aa.respond_to?(:a_singleton_method).should be_false
-    bb.respond_to?(:a_singleton_method).should be_false
+    a.respond_to?(:a_singleton_method).should == true
+    b.respond_to?(:a_singleton_method).should == false
+    aa.respond_to?(:a_singleton_method).should == false
+    bb.respond_to?(:a_singleton_method).should == false
   end
 end
diff --git a/spec/ruby/core/array/each_index_spec.rb b/spec/ruby/core/array/each_index_spec.rb
index 3a4bca92515..b238a89d8a0 100644
--- a/spec/ruby/core/array/each_index_spec.rb
+++ b/spec/ruby/core/array/each_index_spec.rb
@@ -20,7 +20,7 @@
 
   it "returns self" do
     a = [:a, :b, :c]
-    a.each_index { |i| }.should equal(a)
+    a.each_index { |i| }.should.equal?(a)
   end
 
   it "is not confused by removing elements from the front" do
diff --git a/spec/ruby/core/array/each_spec.rb b/spec/ruby/core/array/each_spec.rb
index f4b5b758d0a..73a4c36b17b 100644
--- a/spec/ruby/core/array/each_spec.rb
+++ b/spec/ruby/core/array/each_spec.rb
@@ -13,7 +13,7 @@
   it "yields each element to the block" do
     a = []
     x = [1, 2, 3]
-    x.each { |item| a << item }.should equal(x)
+    x.each { |item| a << item }.should.equal?(x)
     a.should == [1, 2, 3]
   end
 
diff --git a/spec/ruby/core/array/element_reference_spec.rb b/spec/ruby/core/array/element_reference_spec.rb
index 31e5578a093..eb41a9e199c 100644
--- a/spec/ruby/core/array/element_reference_spec.rb
+++ b/spec/ruby/core/array/element_reference_spec.rb
@@ -39,12 +39,12 @@
     end
 
     it "returns an instance of the subclass" do
-      ArraySpecs::MyArray[1, 2, 3].should be_an_instance_of(ArraySpecs::MyArray)
+      ArraySpecs::MyArray[1, 2, 3].should.instance_of?(ArraySpecs::MyArray)
     end
 
     it "does not call #initialize on the subclass instance" do
       ArraySpecs::MyArray[1, 2, 3].should == [1, 2, 3]
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/array/element_set_spec.rb b/spec/ruby/core/array/element_set_spec.rb
index df5ca9582e8..671e4338de6 100644
--- a/spec/ruby/core/array/element_set_spec.rb
+++ b/spec/ruby/core/array/element_set_spec.rb
@@ -95,8 +95,8 @@
 
   it "checks frozen before attempting to coerce arguments" do
     a = [1,2,3,4].freeze
-    -> {a[:foo] = 1}.should raise_error(FrozenError)
-    -> {a[:foo, :bar] = 1}.should raise_error(FrozenError)
+    -> {a[:foo] = 1}.should.raise(FrozenError)
+    -> {a[:foo, :bar] = 1}.should.raise(FrozenError)
   end
 
   it "sets elements in the range arguments when passed ranges" do
@@ -197,25 +197,25 @@ def to.to_int() -2 end
 
     a[to .. from] = ["x"]
     a.should == [1, "a", "b", "x", "c", 4]
-    -> { a["a" .. "b"] = []  }.should raise_error(TypeError)
-    -> { a[from .. "b"] = [] }.should raise_error(TypeError)
+    -> { a["a" .. "b"] = []  }.should.raise(TypeError)
+    -> { a[from .. "b"] = [] }.should.raise(TypeError)
   end
 
   it "raises an IndexError when passed indexes out of bounds" do
     a = [1, 2, 3, 4]
-    -> { a[-5] = ""      }.should raise_error(IndexError)
-    -> { a[-5, -1] = ""  }.should raise_error(IndexError)
-    -> { a[-5, 0] = ""   }.should raise_error(IndexError)
-    -> { a[-5, 1] = ""   }.should raise_error(IndexError)
-    -> { a[-5, 2] = ""   }.should raise_error(IndexError)
-    -> { a[-5, 10] = ""  }.should raise_error(IndexError)
-
-    -> { a[-5..-5] = ""  }.should raise_error(RangeError)
-    -> { a[-5...-5] = "" }.should raise_error(RangeError)
-    -> { a[-5..-4] = ""  }.should raise_error(RangeError)
-    -> { a[-5...-4] = "" }.should raise_error(RangeError)
-    -> { a[-5..10] = ""  }.should raise_error(RangeError)
-    -> { a[-5...10] = "" }.should raise_error(RangeError)
+    -> { a[-5] = ""      }.should.raise(IndexError)
+    -> { a[-5, -1] = ""  }.should.raise(IndexError)
+    -> { a[-5, 0] = ""   }.should.raise(IndexError)
+    -> { a[-5, 1] = ""   }.should.raise(IndexError)
+    -> { a[-5, 2] = ""   }.should.raise(IndexError)
+    -> { a[-5, 10] = ""  }.should.raise(IndexError)
+
+    -> { a[-5..-5] = ""  }.should.raise(RangeError)
+    -> { a[-5...-5] = "" }.should.raise(RangeError)
+    -> { a[-5..-4] = ""  }.should.raise(RangeError)
+    -> { a[-5...-4] = "" }.should.raise(RangeError)
+    -> { a[-5..10] = ""  }.should.raise(RangeError)
+    -> { a[-5...10] = "" }.should.raise(RangeError)
 
     # ok
     a[0..-9] = [1]
@@ -239,7 +239,7 @@ def obj.to_ary() [1, 2, 3] end
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array[0, 0] = [] }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array[0, 0] = [] }.should.raise(FrozenError)
   end
 end
 
@@ -349,12 +349,12 @@ def obj.to_ary() [1, 2, 3] end
 
   it "raises an IndexError when passed start and negative length" do
     a = [1, 2, 3, 4]
-    -> { a[-2, -1] = "" }.should raise_error(IndexError)
-    -> { a[0, -1] = ""  }.should raise_error(IndexError)
-    -> { a[2, -1] = ""  }.should raise_error(IndexError)
-    -> { a[4, -1] = ""  }.should raise_error(IndexError)
-    -> { a[10, -1] = "" }.should raise_error(IndexError)
-    -> { [1, 2, 3, 4,  5][2, -1] = [7, 8] }.should raise_error(IndexError)
+    -> { a[-2, -1] = "" }.should.raise(IndexError)
+    -> { a[0, -1] = ""  }.should.raise(IndexError)
+    -> { a[2, -1] = ""  }.should.raise(IndexError)
+    -> { a[4, -1] = ""  }.should.raise(IndexError)
+    -> { a[10, -1] = "" }.should.raise(IndexError)
+    -> { [1, 2, 3, 4,  5][2, -1] = [7, 8] }.should.raise(IndexError)
   end
 end
 
diff --git a/spec/ruby/core/array/eql_spec.rb b/spec/ruby/core/array/eql_spec.rb
index 8565b94c60a..9a7447c2e8c 100644
--- a/spec/ruby/core/array/eql_spec.rb
+++ b/spec/ruby/core/array/eql_spec.rb
@@ -6,7 +6,7 @@
   it_behaves_like :array_eql, :eql?
 
   it "returns false if any corresponding elements are not #eql?" do
-    [1, 2, 3, 4].should_not eql([1, 2, 3, 4.0])
+    [1, 2, 3, 4].should_not.eql?([1, 2, 3, 4.0])
   end
 
   it "returns false if other is not a kind of Array" do
@@ -14,6 +14,6 @@
     obj.should_not_receive(:to_ary)
     obj.should_not_receive(:eql?)
 
-    [1, 2, 3].should_not eql(obj)
+    [1, 2, 3].should_not.eql?(obj)
   end
 end
diff --git a/spec/ruby/core/array/equal_value_spec.rb b/spec/ruby/core/array/equal_value_spec.rb
index a82e07b2189..4f7c0ce5e33 100644
--- a/spec/ruby/core/array/equal_value_spec.rb
+++ b/spec/ruby/core/array/equal_value_spec.rb
@@ -10,17 +10,17 @@
     obj.should_receive(:respond_to?).at_least(1).with(:to_ary).and_return(true)
     obj.should_receive(:==).with([1]).at_least(1).and_return(true)
 
-    ([1] == obj).should be_true
-    ([[1]] == [obj]).should be_true
-    ([[[1], 3], 2] == [[obj, 3], 2]).should be_true
+    ([1] == obj).should == true
+    ([[1]] == [obj]).should == true
+    ([[[1], 3], 2] == [[obj, 3], 2]).should == true
 
     # recursive arrays
     arr1 = [[1]]
     arr1 << arr1
     arr2 = [obj]
     arr2 << arr2
-    (arr1 == arr2).should be_true
-    (arr2 == arr1).should be_true
+    (arr1 == arr2).should == true
+    (arr2 == arr1).should == true
   end
 
   it "returns false if any corresponding elements are not #==" do
diff --git a/spec/ruby/core/array/fetch_spec.rb b/spec/ruby/core/array/fetch_spec.rb
index 598b481ba46..ee94cfcbb23 100644
--- a/spec/ruby/core/array/fetch_spec.rb
+++ b/spec/ruby/core/array/fetch_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it "raises an IndexError if there is no element at index" do
-    -> { [1, 2, 3].fetch(3) }.should raise_error(IndexError, "index 3 outside of array bounds: -3...3")
-    -> { [1, 2, 3].fetch(-4) }.should raise_error(IndexError, "index -4 outside of array bounds: -3...3")
-    -> { [].fetch(0) }.should raise_error(IndexError, "index 0 outside of array bounds: 0...0")
+    -> { [1, 2, 3].fetch(3) }.should.raise(IndexError, "index 3 outside of array bounds: -3...3")
+    -> { [1, 2, 3].fetch(-4) }.should.raise(IndexError, "index -4 outside of array bounds: -3...3")
+    -> { [].fetch(0) }.should.raise(IndexError, "index 0 outside of array bounds: 0...0")
   end
 
   it "returns default if there is no element at index if passed a default value" do
@@ -33,7 +33,7 @@
     o = mock('5')
     def o.to_int(); 5; end
 
-    [1, 2, 3].fetch(o) { |i| i }.should equal(o)
+    [1, 2, 3].fetch(o) { |i| i }.should.equal?(o)
   end
 
   it "gives precedence to the default block over the default argument" do
@@ -50,6 +50,6 @@ def o.to_int(); 5; end
   end
 
   it "raises a TypeError when the passed argument can't be coerced to Integer" do
-    -> { [].fetch("cat") }.should raise_error(TypeError, "no implicit conversion of String into Integer")
+    -> { [].fetch("cat") }.should.raise(TypeError, "no implicit conversion of String into Integer")
   end
 end
diff --git a/spec/ruby/core/array/fetch_values_spec.rb b/spec/ruby/core/array/fetch_values_spec.rb
index cf377b3b716..237d6ad7f7a 100644
--- a/spec/ruby/core/array/fetch_values_spec.rb
+++ b/spec/ruby/core/array/fetch_values_spec.rb
@@ -21,7 +21,7 @@
 
     describe "with unmatched indexes" do
       it "raises a index error if no block is provided" do
-        -> { @array.fetch_values(0, 1, 44) }.should raise_error(IndexError, "index 44 outside of array bounds: -3...3")
+        -> { @array.fetch_values(0, 1, 44) }.should.raise(IndexError, "index 44 outside of array bounds: -3...3")
       end
 
       it "returns the default value from block" do
@@ -45,11 +45,11 @@
     it "does not support a Range object as argument" do
       -> {
         @array.fetch_values(1..2)
-      }.should raise_error(TypeError, "no implicit conversion of Range into Integer")
+      }.should.raise(TypeError, "no implicit conversion of Range into Integer")
     end
 
     it "raises a TypeError when the passed argument can't be coerced to Integer" do
-      -> { [].fetch_values("cat") }.should raise_error(TypeError, "no implicit conversion of String into Integer")
+      -> { [].fetch_values("cat") }.should.raise(TypeError, "no implicit conversion of String into Integer")
     end
   end
 end
diff --git a/spec/ruby/core/array/fill_spec.rb b/spec/ruby/core/array/fill_spec.rb
index 2c3b5d9e84b..e4d51bd9985 100644
--- a/spec/ruby/core/array/fill_spec.rb
+++ b/spec/ruby/core/array/fill_spec.rb
@@ -10,7 +10,7 @@
 
   it "returns self" do
     ary = [1, 2, 3]
-    ary.fill(:a).should equal(ary)
+    ary.fill(:a).should.equal?(ary)
   end
 
   it "is destructive" do
@@ -25,10 +25,10 @@
     ary.fill(str).should == [str, str, str, str]
     str << "y"
     ary.should == [str, str, str, str]
-    ary[0].should equal(str)
-    ary[1].should equal(str)
-    ary[2].should equal(str)
-    ary[3].should equal(str)
+    ary[0].should.equal?(str)
+    ary[1].should.equal?(str)
+    ary[2].should.equal?(str)
+    ary[3].should.equal?(str)
   end
 
   it "replaces all elements in the array with the filler if not given a index nor a length" do
@@ -44,29 +44,29 @@
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.fill('x') }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.fill('x') }.should.raise(FrozenError)
   end
 
   it "raises a FrozenError on an empty frozen array" do
-    -> { ArraySpecs.empty_frozen_array.fill('x') }.should raise_error(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.fill('x') }.should.raise(FrozenError)
   end
 
   it "raises an ArgumentError if 4 or more arguments are passed when no block given" do
     [].fill('a').should == []
     [].fill('a', 1).should == []
     [].fill('a', 1, 2).should == [nil, 'a', 'a']
-    -> { [].fill('a', 1, 2, true) }.should raise_error(ArgumentError)
+    -> { [].fill('a', 1, 2, true) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if no argument passed and no block given" do
-    -> { [].fill }.should raise_error(ArgumentError)
+    -> { [].fill }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if 3 or more arguments are passed when a block given" do
     [].fill() {|i|}.should == []
     [].fill(1) {|i|}.should == []
     [].fill(1, 2) {|i|}.should == [nil, nil, nil]
-    -> { [].fill(1, 2, true) {|i|} }.should raise_error(ArgumentError)
+    -> { [].fill(1, 2, true) {|i|} }.should.raise(ArgumentError)
   end
 
   it "does not truncate the array is the block raises an exception" do
@@ -237,24 +237,24 @@
   end
 
   it "raises a TypeError if the index is not numeric" do
-    -> { [].fill 'a', true }.should raise_error(TypeError)
+    -> { [].fill 'a', true }.should.raise(TypeError)
 
     obj = mock('nonnumeric')
-    -> { [].fill('a', obj) }.should raise_error(TypeError)
+    -> { [].fill('a', obj) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the length is not numeric" do
-    -> { [1, 2, 3].fill("x", 1, "foo") }.should raise_error(TypeError, /no implicit conversion of String into Integer/)
-    -> { [1, 2, 3].fill("x", 1, :"foo") }.should raise_error(TypeError, /no implicit conversion of Symbol into Integer/)
-    -> { [1, 2, 3].fill("x", 1, Object.new) }.should raise_error(TypeError, /no implicit conversion of Object into Integer/)
+    -> { [1, 2, 3].fill("x", 1, "foo") }.should.raise(TypeError, /no implicit conversion of String into Integer/)
+    -> { [1, 2, 3].fill("x", 1, :"foo") }.should.raise(TypeError, /no implicit conversion of Symbol into Integer/)
+    -> { [1, 2, 3].fill("x", 1, Object.new) }.should.raise(TypeError, /no implicit conversion of Object into Integer/)
   end
 
   not_supported_on :opal do
     it "raises an ArgumentError or RangeError for too-large sizes" do
       error_types = [RangeError, ArgumentError]
       arr = [1, 2, 3]
-      -> { arr.fill(10, 1, fixnum_max) }.should raise_error { |err| error_types.should include(err.class) }
-      -> { arr.fill(10, 1, bignum_value) }.should raise_error(RangeError)
+      -> { arr.fill(10, 1, fixnum_max) }.should.raise { |err| error_types.should.include?(err.class) }
+      -> { arr.fill(10, 1, bignum_value) }.should.raise(RangeError)
     end
   end
 end
@@ -284,7 +284,7 @@
   end
 
   it "raises a TypeError with range and length argument" do
-    -> { [].fill('x', 0 .. 2, 5) }.should raise_error(TypeError)
+    -> { [].fill('x', 0 .. 2, 5) }.should.raise(TypeError)
   end
 
   it "replaces elements between the (-m)th to the last and the (n+1)th from the first if given an range m..n where m < 0 and n >= 0" do
@@ -336,13 +336,13 @@
   end
 
   it "raises an exception if some of the given range lies before the first of the array" do
-    -> { [1, 2, 3].fill('x', -5..-3) }.should raise_error(RangeError)
-    -> { [1, 2, 3].fill('x', -5...-3) }.should raise_error(RangeError)
-    -> { [1, 2, 3].fill('x', -5..-4) }.should raise_error(RangeError)
+    -> { [1, 2, 3].fill('x', -5..-3) }.should.raise(RangeError)
+    -> { [1, 2, 3].fill('x', -5...-3) }.should.raise(RangeError)
+    -> { [1, 2, 3].fill('x', -5..-4) }.should.raise(RangeError)
 
-    -> { [1, 2, 3].fill(-5..-3, &@never_passed) }.should raise_error(RangeError)
-    -> { [1, 2, 3].fill(-5...-3, &@never_passed) }.should raise_error(RangeError)
-    -> { [1, 2, 3].fill(-5..-4, &@never_passed) }.should raise_error(RangeError)
+    -> { [1, 2, 3].fill(-5..-3, &@never_passed) }.should.raise(RangeError)
+    -> { [1, 2, 3].fill(-5...-3, &@never_passed) }.should.raise(RangeError)
+    -> { [1, 2, 3].fill(-5..-4, &@never_passed) }.should.raise(RangeError)
   end
 
   it "tries to convert the start and end of the passed range to Integers using #to_int" do
@@ -357,7 +357,7 @@ def obj.<=>(rhs); rhs == self ? 0 : nil end
   it "raises a TypeError if the start or end of the passed range is not numeric" do
     obj = mock('nonnumeric')
     def obj.<=>(rhs); rhs == self ? 0 : nil end
-    -> { [].fill('a', obj..obj) }.should raise_error(TypeError)
+    -> { [].fill('a', obj..obj) }.should.raise(TypeError)
   end
 
   it "works with endless ranges" do
diff --git a/spec/ruby/core/array/filter_spec.rb b/spec/ruby/core/array/filter_spec.rb
index 156ad14f9c7..7807c3886d4 100644
--- a/spec/ruby/core/array/filter_spec.rb
+++ b/spec/ruby/core/array/filter_spec.rb
@@ -7,7 +7,7 @@
 
 describe "Array#filter!" do
   it "returns nil if no changes were made in the array" do
-    [1, 2, 3].filter! { true }.should be_nil
+    [1, 2, 3].filter! { true }.should == nil
   end
 
   it_behaves_like :keep_if, :filter!
diff --git a/spec/ruby/core/array/first_spec.rb b/spec/ruby/core/array/first_spec.rb
index 66eeba65653..2c343ac8f67 100644
--- a/spec/ruby/core/array/first_spec.rb
+++ b/spec/ruby/core/array/first_spec.rb
@@ -30,11 +30,11 @@
   end
 
   it "raises an ArgumentError when count is negative" do
-    -> { [1, 2].first(-1) }.should raise_error(ArgumentError)
+    -> { [1, 2].first(-1) }.should.raise(ArgumentError)
   end
 
   it "raises a RangeError when count is a Bignum" do
-    -> { [].first(bignum_value) }.should raise_error(RangeError)
+    -> { [].first(bignum_value) }.should.raise(RangeError)
   end
 
   it "returns the entire array when count > length" do
@@ -53,10 +53,10 @@
 
   it "properly handles recursive arrays" do
     empty = ArraySpecs.empty_recursive_array
-    empty.first.should equal(empty)
+    empty.first.should.equal?(empty)
 
     ary = ArraySpecs.head_recursive_array
-    ary.first.should equal(ary)
+    ary.first.should.equal?(ary)
   end
 
   it "tries to convert the passed argument to an Integer using #to_int" do
@@ -66,19 +66,19 @@
   end
 
   it "raises a TypeError if the passed argument is not numeric" do
-    -> { [1,2].first(nil) }.should raise_error(TypeError)
-    -> { [1,2].first("a") }.should raise_error(TypeError)
+    -> { [1,2].first(nil) }.should.raise(TypeError)
+    -> { [1,2].first("a") }.should.raise(TypeError)
 
     obj = mock("nonnumeric")
-    -> { [1,2].first(obj) }.should raise_error(TypeError)
+    -> { [1,2].first(obj) }.should.raise(TypeError)
   end
 
   it "does not return subclass instance when passed count on Array subclasses" do
-    ArraySpecs::MyArray[].first(0).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[].first(2).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].first(0).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].first(1).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].first(2).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[].first(0).should.instance_of?(Array)
+    ArraySpecs::MyArray[].first(2).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].first(0).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].first(1).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].first(2).should.instance_of?(Array)
   end
 
   it "is not destructive" do
diff --git a/spec/ruby/core/array/flatten_spec.rb b/spec/ruby/core/array/flatten_spec.rb
index 8c97000c79c..272406b8f95 100644
--- a/spec/ruby/core/array/flatten_spec.rb
+++ b/spec/ruby/core/array/flatten_spec.rb
@@ -13,7 +13,7 @@
   it "returns dup when the level of recursion is 0" do
     a = [ 1, 2, [3, [4, 5] ] ]
     a.flatten(0).should == a
-    a.flatten(0).should_not equal(a)
+    a.flatten(0).should_not.equal?(a)
   end
 
   it "ignores negative levels" do
@@ -30,7 +30,7 @@
 
   it "raises a TypeError when the passed Object can't be converted to an Integer" do
     obj = mock("Not converted")
-    -> { [ 1, 2, [3, [4, 5] ] ].flatten(obj) }.should raise_error(TypeError)
+    -> { [ 1, 2, [3, [4, 5] ] ].flatten(obj) }.should.raise(TypeError)
   end
 
   it "does not call flatten on elements" do
@@ -46,13 +46,13 @@
   it "raises an ArgumentError on recursive arrays" do
     x = []
     x << x
-    -> { x.flatten }.should raise_error(ArgumentError)
+    -> { x.flatten }.should.raise(ArgumentError)
 
     x = []
     y = []
     x << y
     y << x
-    -> { x.flatten }.should raise_error(ArgumentError)
+    -> { x.flatten }.should.raise(ArgumentError)
   end
 
   it "flattens any element which responds to #to_ary, using the return value of said method" do
@@ -76,11 +76,11 @@
   end
 
   it "returns Array instance for Array subclasses" do
-    ArraySpecs::MyArray[].flatten.should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].flatten.should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, [2], 3].flatten.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[].flatten.should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].flatten.should.instance_of?(Array)
+    ArraySpecs::MyArray[1, [2], 3].flatten.should.instance_of?(Array)
     ArraySpecs::MyArray[1, [2, 3], 4].flatten.should == [1, 2, 3, 4]
-    [ArraySpecs::MyArray[1, 2, 3]].flatten.should be_an_instance_of(Array)
+    [ArraySpecs::MyArray[1, 2, 3]].flatten.should.instance_of?(Array)
   end
 
   it "is not destructive" do
@@ -106,7 +106,7 @@
 
     it "raises a TypeError if #to_ary does not return an Array" do
       @obj.should_receive(:to_ary).and_return(1)
-      -> { [@obj].flatten }.should raise_error(TypeError)
+      -> { [@obj].flatten }.should.raise(TypeError)
     end
 
     it "calls respond_to_missing?(:to_ary, true) to try coercing" do
@@ -125,7 +125,7 @@ def @obj.respond_to_missing?(name, priv) ScratchPad << name; false end
     it "calls #to_ary if not defined when #respond_to_missing? returns true" do
       def @obj.respond_to_missing?(name, priv) ScratchPad << name; true end
 
-      -> { [@obj].flatten }.should raise_error(NoMethodError)
+      -> { [@obj].flatten }.should.raise(NoMethodError)
       ScratchPad.recorded.should == [:to_ary]
     end
 
@@ -168,7 +168,7 @@ def bo.respond_to?(name, *)
 
   it "returns self if made some modifications" do
     a = [[[1, [2, 3]],[2, 3, [4, [4, [5, 5]], [1, 2, 3]]], [4]], []]
-    a.flatten!.should equal(a)
+    a.flatten!.should.equal?(a)
   end
 
   it "returns nil if no modifications took place" do
@@ -208,7 +208,7 @@ def bo.respond_to?(name, *)
 
   it "raises a TypeError when the passed Object can't be converted to an Integer" do
     obj = mock("Not converted")
-    -> { [ 1, 2, [3, [4, 5] ] ].flatten!(obj) }.should raise_error(TypeError)
+    -> { [ 1, 2, [3, [4, 5] ] ].flatten!(obj) }.should.raise(TypeError)
   end
 
   it "does not call flatten! on elements" do
@@ -224,13 +224,13 @@ def bo.respond_to?(name, *)
   it "raises an ArgumentError on recursive arrays" do
     x = []
     x << x
-    -> { x.flatten! }.should raise_error(ArgumentError)
+    -> { x.flatten! }.should.raise(ArgumentError)
 
     x = []
     y = []
     x << y
     y << x
-    -> { x.flatten! }.should raise_error(ArgumentError)
+    -> { x.flatten! }.should.raise(ArgumentError)
   end
 
   it "flattens any elements which responds to #to_ary, using the return value of said method" do
@@ -248,19 +248,19 @@ def bo.respond_to?(name, *)
 
     ary = [ArraySpecs::MyArray[1, 2, 3]]
     ary.flatten!
-    ary.should be_an_instance_of(Array)
+    ary.should.instance_of?(Array)
     ary.should == [1, 2, 3]
   end
 
   it "raises a FrozenError on frozen arrays when the array is modified" do
     nested_ary = [1, 2, []]
     nested_ary.freeze
-    -> { nested_ary.flatten! }.should raise_error(FrozenError)
+    -> { nested_ary.flatten! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23663]
   it "raises a FrozenError on frozen arrays when the array would not be modified" do
-    -> { ArraySpecs.frozen_array.flatten! }.should raise_error(FrozenError)
-    -> { ArraySpecs.empty_frozen_array.flatten! }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.flatten! }.should.raise(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.flatten! }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/hash_spec.rb b/spec/ruby/core/array/hash_spec.rb
index f3bcc83fce8..3b7b6d5bedb 100644
--- a/spec/ruby/core/array/hash_spec.rb
+++ b/spec/ruby/core/array/hash_spec.rb
@@ -7,16 +7,16 @@
 
     [[], [1, 2, 3]].each do |ary|
       ary.hash.should == ary.dup.hash
-      ary.hash.should be_an_instance_of(Integer)
+      ary.hash.should.instance_of?(Integer)
     end
   end
 
   it "properly handles recursive arrays" do
     empty = ArraySpecs.empty_recursive_array
-    -> { empty.hash }.should_not raise_error
+    -> { empty.hash }.should_not.raise
 
     array = ArraySpecs.recursive_array
-    -> { array.hash }.should_not raise_error
+    -> { array.hash }.should_not.raise
   end
 
   it "returns the same hash for equal recursive arrays" do
@@ -74,7 +74,7 @@ def obj.hash() @hash end
     a.fill 'a', 0..3
     b = %w|a a a a|
     a.hash.should == b.hash
-    a.should eql(b)
+    a.should.eql?(b)
   end
 
   it "produces different hashes for nested arrays with different values and empty terminator" do
diff --git a/spec/ruby/core/array/initialize_spec.rb b/spec/ruby/core/array/initialize_spec.rb
index b9fa77b16eb..19ee37825e0 100644
--- a/spec/ruby/core/array/initialize_spec.rb
+++ b/spec/ruby/core/array/initialize_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "is private" do
-    Array.should have_private_instance_method("initialize")
+    Array.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "is called on subclasses" do
@@ -19,26 +19,26 @@
 
   it "preserves the object's identity even when changing its value" do
     a = [1, 2, 3]
-    a.send(:initialize).should equal(a)
+    a.send(:initialize).should.equal?(a)
     a.should_not == [1, 2, 3]
   end
 
   it "raises an ArgumentError if passed 3 or more arguments" do
     -> do
       [1, 2].send :initialize, 1, 'x', true
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
     -> do
       [1, 2].send(:initialize, 1, 'x', true) {}
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises a FrozenError on frozen arrays" do
     -> do
       ArraySpecs.frozen_array.send :initialize
-    end.should raise_error(FrozenError)
+    end.should.raise(FrozenError)
     -> do
       ArraySpecs.frozen_array.send :initialize, ArraySpecs.frozen_array
-    end.should raise_error(FrozenError)
+    end.should.raise(FrozenError)
   end
 
   it "calls #to_ary to convert the value to an array, even if it's private" do
@@ -49,12 +49,12 @@
 
 describe "Array#initialize with no arguments" do
   it "makes the array empty" do
-    [1, 2, 3].send(:initialize).should be_empty
+    [1, 2, 3].send(:initialize).should.empty?
   end
 
   it "does not use the given block" do
     -> {
-      -> { [1, 2, 3].send(:initialize) { raise } }.should_not raise_error
+      -> { [1, 2, 3].send(:initialize) { raise } }.should_not.raise
     }.should complain(/#{__FILE__}:#{__LINE__-1}: warning: given block not used/, verbose: true)
   end
 end
@@ -66,7 +66,7 @@
   end
 
   it "does not use the given block" do
-    ->{ [1, 2, 3].send(:initialize) { raise } }.should_not raise_error
+    ->{ [1, 2, 3].send(:initialize) { raise } }.should_not.raise
   end
 
   it "calls #to_ary to convert the value to an array" do
@@ -83,7 +83,7 @@
   end
 
   it "raises a TypeError if an Array type argument and a default object" do
-    -> { [].send(:initialize, [1, 2], 1) }.should raise_error(TypeError)
+    -> { [].send(:initialize, [1, 2], 1) }.should.raise(TypeError)
   end
 end
 
@@ -92,8 +92,8 @@
     a = []
     obj = [3]
     a.send(:initialize, 2, obj).should == [obj, obj]
-    a[0].should equal(obj)
-    a[1].should equal(obj)
+    a[0].should.equal?(obj)
+    a[1].should.equal?(obj)
 
     b = []
     b.send(:initialize, 3, 14).should == [14, 14, 14]
@@ -105,12 +105,12 @@
   end
 
   it "raises an ArgumentError if size is negative" do
-    -> { [].send(:initialize, -1, :a) }.should raise_error(ArgumentError)
-    -> { [].send(:initialize, -1) }.should raise_error(ArgumentError)
+    -> { [].send(:initialize, -1, :a) }.should.raise(ArgumentError)
+    -> { [].send(:initialize, -1) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if size is too large" do
-    -> { [].send(:initialize, fixnum_max+1) }.should raise_error(ArgumentError)
+    -> { [].send(:initialize, fixnum_max+1) }.should.raise(ArgumentError)
   end
 
   it "calls #to_int to convert the size argument to an Integer when object is given" do
@@ -128,7 +128,7 @@
   it "raises a TypeError if the size argument is not an Integer type" do
     obj = mock('nonnumeric')
     obj.stub!(:to_ary).and_return([1, 2])
-    ->{ [].send(:initialize, obj, :a) }.should raise_error(TypeError)
+    ->{ [].send(:initialize, obj, :a) }.should.raise(TypeError)
   end
 
   it "yields the index of the element and sets the element to the value of the block" do
diff --git a/spec/ruby/core/array/insert_spec.rb b/spec/ruby/core/array/insert_spec.rb
index 9e1757f68b4..38e132fd259 100644
--- a/spec/ruby/core/array/insert_spec.rb
+++ b/spec/ruby/core/array/insert_spec.rb
@@ -4,8 +4,8 @@
 describe "Array#insert" do
   it "returns self" do
     ary = []
-    ary.insert(0).should equal(ary)
-    ary.insert(0, :a).should equal(ary)
+    ary.insert(0).should.equal?(ary)
+    ary.insert(0, :a).should.equal?(ary)
   end
 
   it "inserts objects before the element at index for non-negative index" do
@@ -46,8 +46,8 @@
   end
 
   it "raises an IndexError if the negative index is out of bounds" do
-    -> { [].insert(-2, 1)  }.should raise_error(IndexError)
-    -> { [1].insert(-3, 2) }.should raise_error(IndexError)
+    -> { [].insert(-2, 1)  }.should.raise(IndexError)
+    -> { [1].insert(-3, 2) }.should.raise(IndexError)
   end
 
   it "does nothing of no object is passed" do
@@ -64,15 +64,15 @@
   end
 
   it "raises an ArgumentError if no argument passed" do
-    -> { [].insert() }.should raise_error(ArgumentError)
+    -> { [].insert() }.should.raise(ArgumentError)
   end
 
   it "raises a FrozenError on frozen arrays when the array is modified" do
-    -> { ArraySpecs.frozen_array.insert(0, 'x') }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.insert(0, 'x') }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError on frozen arrays when the array would not be modified" do
-    -> { ArraySpecs.frozen_array.insert(0) }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.insert(0) }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/join_spec.rb b/spec/ruby/core/array/join_spec.rb
index e78ea6f9e11..811db036a84 100644
--- a/spec/ruby/core/array/join_spec.rb
+++ b/spec/ruby/core/array/join_spec.rb
@@ -24,11 +24,11 @@
 
   it "raises a TypeError if the separator cannot be coerced to a String by calling #to_str" do
     obj = mock("not a string")
-    -> { [1, 2].join(obj) }.should raise_error(TypeError)
+    -> { [1, 2].join(obj) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed false as the separator" do
-    -> { [1, 2].join(false) }.should raise_error(TypeError)
+    -> { [1, 2].join(false) }.should.raise(TypeError)
   end
 end
 
diff --git a/spec/ruby/core/array/keep_if_spec.rb b/spec/ruby/core/array/keep_if_spec.rb
index 40f7329b7c8..62a65a04e85 100644
--- a/spec/ruby/core/array/keep_if_spec.rb
+++ b/spec/ruby/core/array/keep_if_spec.rb
@@ -4,7 +4,7 @@
 describe "Array#keep_if" do
   it "returns the same array if no changes were made" do
     array = [1, 2, 3]
-    array.keep_if { true }.should equal(array)
+    array.keep_if { true }.should.equal?(array)
   end
 
   it_behaves_like :keep_if, :keep_if
diff --git a/spec/ruby/core/array/last_spec.rb b/spec/ruby/core/array/last_spec.rb
index d6fefada092..ed417bcd2ab 100644
--- a/spec/ruby/core/array/last_spec.rb
+++ b/spec/ruby/core/array/last_spec.rb
@@ -28,7 +28,7 @@
   end
 
   it "raises an ArgumentError when count is negative" do
-    -> { [1, 2].last(-1) }.should raise_error(ArgumentError)
+    -> { [1, 2].last(-1) }.should.raise(ArgumentError)
   end
 
   it "returns the entire array when count > length" do
@@ -47,10 +47,10 @@
 
   it "properly handles recursive arrays" do
     empty = ArraySpecs.empty_recursive_array
-    empty.last.should equal(empty)
+    empty.last.should.equal?(empty)
 
     array = ArraySpecs.recursive_array
-    array.last.should equal(array)
+    array.last.should.equal?(array)
   end
 
   it "tries to convert the passed argument to an Integer using #to_int" do
@@ -60,19 +60,19 @@
   end
 
   it "raises a TypeError if the passed argument is not numeric" do
-    -> { [1,2].last(nil) }.should raise_error(TypeError)
-    -> { [1,2].last("a") }.should raise_error(TypeError)
+    -> { [1,2].last(nil) }.should.raise(TypeError)
+    -> { [1,2].last("a") }.should.raise(TypeError)
 
     obj = mock("nonnumeric")
-    -> { [1,2].last(obj) }.should raise_error(TypeError)
+    -> { [1,2].last(obj) }.should.raise(TypeError)
   end
 
   it "does not return subclass instance on Array subclasses" do
-    ArraySpecs::MyArray[].last(0).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[].last(2).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].last(0).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].last(1).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].last(2).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[].last(0).should.instance_of?(Array)
+    ArraySpecs::MyArray[].last(2).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].last(0).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].last(1).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].last(2).should.instance_of?(Array)
   end
 
   it "is not destructive" do
diff --git a/spec/ruby/core/array/max_spec.rb b/spec/ruby/core/array/max_spec.rb
index d1c64519d0b..868275a7485 100644
--- a/spec/ruby/core/array/max_spec.rb
+++ b/spec/ruby/core/array/max_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Array#max" do
   it "is defined on Array" do
-    [1].method(:max).owner.should equal Array
+    [1].method(:max).owner.should.equal? Array
   end
 
   it "returns nil with no values" do
@@ -70,16 +70,16 @@
   it "raises a NoMethodError for elements without #<=>" do
     -> do
       [BasicObject.new, BasicObject.new].max
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 
   it "raises an ArgumentError for incomparable elements" do
     -> do
       [11,"22"].max
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
     -> do
       [11,12,22,33].max{|a, b| nil}
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "returns the maximum element (with block)" do
diff --git a/spec/ruby/core/array/min_spec.rb b/spec/ruby/core/array/min_spec.rb
index 3bdef0dd009..5913e08cf80 100644
--- a/spec/ruby/core/array/min_spec.rb
+++ b/spec/ruby/core/array/min_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Array#min" do
   it "is defined on Array" do
-    [1].method(:max).owner.should equal Array
+    [1].method(:max).owner.should.equal? Array
   end
 
   it "returns nil with no values" do
@@ -64,22 +64,22 @@
   end
 
   it "returns nil for an empty Enumerable" do
-    [].min.should be_nil
+    [].min.should == nil
   end
 
   it "raises a NoMethodError for elements without #<=>" do
     -> do
       [BasicObject.new, BasicObject.new].min
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 
   it "raises an ArgumentError for incomparable elements" do
     -> do
       [11,"22"].min
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
     -> do
       [11,12,22,33].min{|a, b| nil}
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "returns the minimum when using a block rule" do
diff --git a/spec/ruby/core/array/multiply_spec.rb b/spec/ruby/core/array/multiply_spec.rb
index eca51142fb2..1ac14e1b09b 100644
--- a/spec/ruby/core/array/multiply_spec.rb
+++ b/spec/ruby/core/array/multiply_spec.rb
@@ -17,7 +17,7 @@
 
   it "raises a TypeError if the argument can neither be converted to a string nor an integer" do
     obj = mock('not a string or integer')
-    ->{ [1,2] * obj }.should raise_error(TypeError)
+    ->{ [1,2] * obj }.should.raise(TypeError)
   end
 
   it "converts the passed argument to a String rather than an Integer" do
@@ -28,15 +28,15 @@ def obj.to_str() "2" end
   end
 
   it "raises a TypeError is the passed argument is nil" do
-    ->{ [1,2] * nil }.should raise_error(TypeError)
+    ->{ [1,2] * nil }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when passed 2 or more arguments" do
-    ->{ [1,2].send(:*, 1, 2) }.should raise_error(ArgumentError)
+    ->{ [1,2].send(:*, 1, 2) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when passed no arguments" do
-    ->{ [1,2].send(:*) }.should raise_error(ArgumentError)
+    ->{ [1,2].send(:*) }.should.raise(ArgumentError)
   end
 end
 
@@ -50,7 +50,7 @@ def obj.to_str() "2" end
 
   it "does not return self even if the passed integer is 1" do
     ary = [1, 2, 3]
-    (ary * 1).should_not equal(ary)
+    (ary * 1).should_not.equal?(ary)
   end
 
   it "properly handles recursive arrays" do
@@ -65,8 +65,8 @@ def obj.to_str() "2" end
   end
 
   it "raises an ArgumentError when passed a negative integer" do
-    -> { [ 1, 2, 3 ] * -1 }.should raise_error(ArgumentError)
-    -> { [] * -1 }.should raise_error(ArgumentError)
+    -> { [ 1, 2, 3 ] * -1 }.should.raise(ArgumentError)
+    -> { [] * -1 }.should.raise(ArgumentError)
   end
 
   describe "with a subclass of Array" do
@@ -77,14 +77,14 @@ def obj.to_str() "2" end
     end
 
     it "returns an Array instance" do
-      (@array * 0).should be_an_instance_of(Array)
-      (@array * 1).should be_an_instance_of(Array)
-      (@array * 2).should be_an_instance_of(Array)
+      (@array * 0).should.instance_of?(Array)
+      (@array * 1).should.instance_of?(Array)
+      (@array * 2).should.instance_of?(Array)
     end
 
     it "does not call #initialize on the subclass instance" do
       (@array * 2).should == [1, 2, 3, 4, 5, 1, 2, 3, 4, 5]
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/array/new_spec.rb b/spec/ruby/core/array/new_spec.rb
index b50a4857b0f..b2f23e2f6b1 100644
--- a/spec/ruby/core/array/new_spec.rb
+++ b/spec/ruby/core/array/new_spec.rb
@@ -3,31 +3,31 @@
 
 describe "Array.new" do
   it "returns an instance of Array" do
-    Array.new.should be_an_instance_of(Array)
+    Array.new.should.instance_of?(Array)
   end
 
   it "returns an instance of a subclass" do
-    ArraySpecs::MyArray.new(1, 2).should be_an_instance_of(ArraySpecs::MyArray)
+    ArraySpecs::MyArray.new(1, 2).should.instance_of?(ArraySpecs::MyArray)
   end
 
   it "raises an ArgumentError if passed 3 or more arguments" do
     -> do
       [1, 2].send :initialize, 1, 'x', true
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
     -> do
       [1, 2].send(:initialize, 1, 'x', true) {}
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 end
 
 describe "Array.new with no arguments" do
   it "returns an empty array" do
-    Array.new.should be_empty
+    Array.new.should.empty?
   end
 
   it "does not use the given block" do
     -> {
-      -> { Array.new { raise } }.should_not raise_error
+      -> { Array.new { raise } }.should_not.raise
     }.should complain(/warning: given block not used/, verbose: true)
   end
 end
@@ -39,7 +39,7 @@
   end
 
   it "does not use the given block" do
-    ->{ Array.new([1, 2]) { raise } }.should_not raise_error
+    ->{ Array.new([1, 2]) { raise } }.should_not.raise
   end
 
   it "calls #to_ary to convert the value to an array" do
@@ -56,7 +56,7 @@
   end
 
   it "raises a TypeError if an Array type argument and a default object" do
-    -> { Array.new([1, 2], 1) }.should raise_error(TypeError)
+    -> { Array.new([1, 2], 1) }.should.raise(TypeError)
   end
 end
 
@@ -65,8 +65,8 @@
     obj = [3]
     a = Array.new(2, obj)
     a.should == [obj, obj]
-    a[0].should equal(obj)
-    a[1].should equal(obj)
+    a[0].should.equal?(obj)
+    a[1].should.equal?(obj)
 
     Array.new(3, 14).should == [14, 14, 14]
   end
@@ -76,12 +76,12 @@
   end
 
   it "raises an ArgumentError if size is negative" do
-    -> { Array.new(-1, :a) }.should raise_error(ArgumentError)
-    -> { Array.new(-1) }.should raise_error(ArgumentError)
+    -> { Array.new(-1, :a) }.should.raise(ArgumentError)
+    -> { Array.new(-1) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if size is too large" do
-    -> { Array.new(fixnum_max+1) }.should raise_error(ArgumentError)
+    -> { Array.new(fixnum_max+1) }.should.raise(ArgumentError)
   end
 
   it "calls #to_int to convert the size argument to an Integer when object is given" do
@@ -99,7 +99,7 @@
   it "raises a TypeError if the size argument is not an Integer type" do
     obj = mock('nonnumeric')
     obj.stub!(:to_ary).and_return([1, 2])
-    ->{ Array.new(obj, :a) }.should raise_error(TypeError)
+    ->{ Array.new(obj, :a) }.should.raise(TypeError)
   end
 
   it "yields the index of the element and sets the element to the value of the block" do
diff --git a/spec/ruby/core/array/pack/a_spec.rb b/spec/ruby/core/array/pack/a_spec.rb
index 8245cd54709..03bfd8214c8 100644
--- a/spec/ruby/core/array/pack/a_spec.rb
+++ b/spec/ruby/core/array/pack/a_spec.rb
@@ -19,8 +19,8 @@
   end
 
   it "will not implicitly convert a number to a string" do
-    -> { [0].pack('A') }.should raise_error(TypeError)
-    -> { [0].pack('a') }.should raise_error(TypeError)
+    -> { [0].pack('A') }.should.raise(TypeError)
+    -> { [0].pack('a') }.should.raise(TypeError)
   end
 
   it "adds all the bytes to the output when passed the '*' modifier" do
diff --git a/spec/ruby/core/array/pack/b_spec.rb b/spec/ruby/core/array/pack/b_spec.rb
index 247a9ca023f..f7576846ef9 100644
--- a/spec/ruby/core/array/pack/b_spec.rb
+++ b/spec/ruby/core/array/pack/b_spec.rb
@@ -19,8 +19,8 @@
   end
 
   it "will not implicitly convert a number to a string" do
-    -> { [0].pack('B') }.should raise_error(TypeError)
-    -> { [0].pack('b') }.should raise_error(TypeError)
+    -> { [0].pack('B') }.should.raise(TypeError)
+    -> { [0].pack('b') }.should.raise(TypeError)
   end
 
   it "encodes one bit for each character starting with the most significant bit" do
diff --git a/spec/ruby/core/array/pack/buffer_spec.rb b/spec/ruby/core/array/pack/buffer_spec.rb
index b77b2d1efa5..d104c80186f 100644
--- a/spec/ruby/core/array/pack/buffer_spec.rb
+++ b/spec/ruby/core/array/pack/buffer_spec.rb
@@ -7,7 +7,7 @@
     n = [ 65, 66, 67 ]
     buffer = " "*3
     result = n.pack("ccc", buffer: buffer)      #=> "ABC"
-    result.should equal(buffer)
+    result.should.equal?(buffer)
   end
 
   it "adds result at the end of buffer content" do
@@ -24,12 +24,12 @@
   end
 
   it "raises TypeError exception if buffer is not String" do
-    -> { [65].pack("ccc", buffer: []) }.should raise_error(
+    -> { [65].pack("ccc", buffer: []) }.should.raise(
       TypeError, "buffer must be String, not Array")
   end
 
   it "raise FrozenError if buffer is frozen" do
-    -> { [65].pack("c", buffer: "frozen-string".freeze) }.should raise_error(FrozenError)
+    -> { [65].pack("c", buffer: "frozen-string".freeze) }.should.raise(FrozenError)
   end
 
   it "preserves the encoding of the given buffer" do
diff --git a/spec/ruby/core/array/pack/c_spec.rb b/spec/ruby/core/array/pack/c_spec.rb
index 7a2b95def87..de06207a233 100644
--- a/spec/ruby/core/array/pack/c_spec.rb
+++ b/spec/ruby/core/array/pack/c_spec.rb
@@ -48,7 +48,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [1, 2, 3].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/array/pack/h_spec.rb b/spec/ruby/core/array/pack/h_spec.rb
index ba188874ba6..1492d02b1fb 100644
--- a/spec/ruby/core/array/pack/h_spec.rb
+++ b/spec/ruby/core/array/pack/h_spec.rb
@@ -19,8 +19,8 @@
   end
 
   it "will not implicitly convert a number to a string" do
-    -> { [0].pack('H') }.should raise_error(TypeError)
-    -> { [0].pack('h') }.should raise_error(TypeError)
+    -> { [0].pack('H') }.should.raise(TypeError)
+    -> { [0].pack('h') }.should.raise(TypeError)
   end
 
   it "encodes the first character as the most significant nibble when passed no count modifier" do
diff --git a/spec/ruby/core/array/pack/m_spec.rb b/spec/ruby/core/array/pack/m_spec.rb
index a80f91275c9..fb670d120e2 100644
--- a/spec/ruby/core/array/pack/m_spec.rb
+++ b/spec/ruby/core/array/pack/m_spec.rb
@@ -155,7 +155,7 @@
 
   it "encodes a recursive array" do
     empty = ArraySpecs.empty_recursive_array
-    empty.pack('M').should be_an_instance_of(String)
+    empty.pack('M').should.instance_of?(String)
 
     array = ArraySpecs.recursive_array
     array.pack('M').should == "1=\n"
@@ -172,7 +172,7 @@
     obj = mock("pack M non-string")
     obj.should_receive(:to_s).and_return(2)
 
-    [obj].pack("M").should be_an_instance_of(String)
+    [obj].pack("M").should.instance_of?(String)
   end
 
   it "encodes a Symbol as a String" do
@@ -293,16 +293,16 @@
 
   it "raises a TypeError if #to_str does not return a String" do
     obj = mock("pack m non-string")
-    -> { [obj].pack("m") }.should raise_error(TypeError)
+    -> { [obj].pack("m") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed nil" do
-    -> { [nil].pack("m") }.should raise_error(TypeError)
+    -> { [nil].pack("m") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an Integer" do
-    -> { [0].pack("m") }.should raise_error(TypeError)
-    -> { [bignum_value].pack("m") }.should raise_error(TypeError)
+    -> { [0].pack("m") }.should.raise(TypeError)
+    -> { [bignum_value].pack("m") }.should.raise(TypeError)
   end
 
   it "does not emit a newline if passed zero as the count modifier" do
diff --git a/spec/ruby/core/array/pack/percent_spec.rb b/spec/ruby/core/array/pack/percent_spec.rb
index 5d56dea5fe5..29b119732a4 100644
--- a/spec/ruby/core/array/pack/percent_spec.rb
+++ b/spec/ruby/core/array/pack/percent_spec.rb
@@ -2,6 +2,6 @@
 
 describe "Array#pack with format '%'" do
   it "raises an Argument Error" do
-    -> { [1].pack("%") }.should raise_error(ArgumentError)
+    -> { [1].pack("%") }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/array/pack/r_spec.rb b/spec/ruby/core/array/pack/r_spec.rb
new file mode 100644
index 00000000000..cefe1388d2b
--- /dev/null
+++ b/spec/ruby/core/array/pack/r_spec.rb
@@ -0,0 +1,89 @@
+# encoding: binary
+require_relative '../../../spec_helper'
+require_relative '../fixtures/classes'
+require_relative 'shared/basic'
+require_relative 'shared/numeric_basic'
+require_relative 'shared/integer'
+
+ruby_version_is "4.1" do
+  describe "Array#pack with format 'R'" do
+    it_behaves_like :array_pack_basic, 'R'
+    it_behaves_like :array_pack_basic_non_float, 'R'
+    it_behaves_like :array_pack_arguments, 'R'
+    it_behaves_like :array_pack_numeric_basic, 'R'
+    it_behaves_like :array_pack_integer, 'R'
+
+    it "encodes a ULEB128 integer" do
+      [ [[0],            "\x00"],
+        [[1],            "\x01"],
+        [[127],          "\x7f"],
+        [[128],          "\x80\x01"],
+        [[0x3fff],       "\xff\x7f"],
+        [[0x4000],       "\x80\x80\x01"],
+        [[0xffffffff],   "\xff\xff\xff\xff\x0f"],
+        [[0x100000000],  "\x80\x80\x80\x80\x10"],
+        [[0xffff_ffff_ffff_ffff], "\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01"],
+        [[0xffff_ffff_ffff_ffff_ffff_ffff], "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x1f"],
+      ].should be_computed_by(:pack, "R")
+    end
+
+    it "encodes multiple values with '*' modifier" do
+      [1, 2].pack("R*").should == "\x01\x02"
+      [127, 128].pack("R*").should == "\x7f\x80\x01"
+    end
+
+    it "raises an ArgumentError when passed a negative value" do
+      -> { [-1].pack("R") }.should.raise(ArgumentError)
+      -> { [-100].pack("R") }.should.raise(ArgumentError)
+    end
+
+    it "round-trips values through pack and unpack" do
+      values = [0, 1, 127, 128, 0x3fff, 0x4000, 0xffffffff, 0x100000000]
+      values.pack("R*").unpack("R*").should == values
+    end
+  end
+
+  describe "Array#pack with format 'r'" do
+    it_behaves_like :array_pack_basic, 'r'
+    it_behaves_like :array_pack_basic_non_float, 'r'
+    it_behaves_like :array_pack_arguments, 'r'
+    it_behaves_like :array_pack_numeric_basic, 'r'
+    it_behaves_like :array_pack_integer, 'r'
+
+    it "encodes a SLEB128 integer" do
+      [ [[0],     "\x00"],
+        [[1],     "\x01"],
+        [[-1],    "\x7f"],
+        [[-2],    "\x7e"],
+        [[127],   "\xff\x00"],
+        [[128],   "\x80\x01"],
+        [[-127],  "\x81\x7f"],
+        [[-128],  "\x80\x7f"],
+      ].should be_computed_by(:pack, "r")
+    end
+
+    it "encodes larger positive numbers" do
+      [0x3fff].pack("r").should == "\xff\xff\x00"
+      [0x4000].pack("r").should == "\x80\x80\x01"
+    end
+
+    it "encodes larger negative numbers" do
+      [-0x3fff].pack("r").should == "\x81\x80\x7f"
+      [-0x4000].pack("r").should == "\x80\x80\x7f"
+    end
+
+    it "encodes very large numbers" do
+      [0xffff_ffff_ffff_ffff_ffff_ffff].pack("r").should == "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1F"
+      [-0xffff_ffff_ffff_ffff_ffff_ffff].pack("r").should == "\x81\x80\x80\x80\x80\x80\x80\x80\x80\x80\x80\x80\x80\x60"
+    end
+
+    it "encodes multiple values with '*' modifier" do
+      [0, 1, -1].pack("r*").should == "\x00\x01\x7f"
+    end
+
+    it "round-trips values through pack and unpack" do
+      values = [0, 1, -1, 127, -127, 128, -128, 0x3fff, -0x3fff, 0x4000, -0x4000]
+      values.pack("r*").unpack("r*").should == values
+    end
+  end
+end
diff --git a/spec/ruby/core/array/pack/shared/basic.rb b/spec/ruby/core/array/pack/shared/basic.rb
index 2ebd75f6c5e..2894369c713 100644
--- a/spec/ruby/core/array/pack/shared/basic.rb
+++ b/spec/ruby/core/array/pack/shared/basic.rb
@@ -1,6 +1,6 @@
 describe :array_pack_arguments, shared: true do
   it "raises an ArgumentError if there are fewer elements than the format requires" do
-    -> { [].pack(pack_format(1)) }.should raise_error(ArgumentError)
+    -> { [].pack(pack_format(1)) }.should.raise(ArgumentError)
   end
 end
 
@@ -10,11 +10,11 @@
   end
 
   it "raises a TypeError when passed nil" do
-    -> { [@obj].pack(nil) }.should raise_error(TypeError)
+    -> { [@obj].pack(nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed an Integer" do
-    -> { [@obj].pack(1) }.should raise_error(TypeError)
+    -> { [@obj].pack(1) }.should.raise(TypeError)
   end
 end
 
@@ -24,50 +24,50 @@
   end
 
   it "ignores whitespace in the format string" do
-    [@obj, @obj].pack("a \t\n\v\f\r"+pack_format).should be_an_instance_of(String)
+    [@obj, @obj].pack("a \t\n\v\f\r"+pack_format).should.instance_of?(String)
   end
 
   it "ignores comments in the format string" do
     # 2 additional directives ('a') are required for the X directive
-    [@obj, @obj, @obj, @obj].pack("aa #{pack_format} # some comment \n#{pack_format}").should be_an_instance_of(String)
+    [@obj, @obj, @obj, @obj].pack("aa #{pack_format} # some comment \n#{pack_format}").should.instance_of?(String)
   end
 
   it "raise ArgumentError when a directive is unknown" do
     # additional directive ('a') is required for the X directive
-    -> { [@obj, @obj].pack("a R" + pack_format) }.should raise_error(ArgumentError, /unknown pack directive 'R'/)
-    -> { [@obj, @obj].pack("a 0" + pack_format) }.should raise_error(ArgumentError, /unknown pack directive '0'/)
-    -> { [@obj, @obj].pack("a :" + pack_format) }.should raise_error(ArgumentError, /unknown pack directive ':'/)
+    -> { [@obj, @obj].pack("a K" + pack_format) }.should.raise(ArgumentError, /unknown pack directive 'K'/)
+    -> { [@obj, @obj].pack("a 0" + pack_format) }.should.raise(ArgumentError, /unknown pack directive '0'/)
+    -> { [@obj, @obj].pack("a :" + pack_format) }.should.raise(ArgumentError, /unknown pack directive ':'/)
   end
 
   it "calls #to_str to coerce the directives string" do
     d = mock("pack directive")
     d.should_receive(:to_str).and_return("x"+pack_format)
-    [@obj, @obj].pack(d).should be_an_instance_of(String)
+    [@obj, @obj].pack(d).should.instance_of?(String)
   end
 end
 
 describe :array_pack_basic_float, shared: true do
   it "ignores whitespace in the format string" do
-    [9.3, 4.7].pack(" \t\n\v\f\r"+pack_format).should be_an_instance_of(String)
+    [9.3, 4.7].pack(" \t\n\v\f\r"+pack_format).should.instance_of?(String)
   end
 
   it "ignores comments in the format string" do
-    [9.3, 4.7].pack(pack_format + "# some comment \n" + pack_format).should be_an_instance_of(String)
+    [9.3, 4.7].pack(pack_format + "# some comment \n" + pack_format).should.instance_of?(String)
   end
 
   it "calls #to_str to coerce the directives string" do
     d = mock("pack directive")
     d.should_receive(:to_str).and_return("x"+pack_format)
-    [1.2, 4.7].pack(d).should be_an_instance_of(String)
+    [1.2, 4.7].pack(d).should.instance_of?(String)
   end
 end
 
 describe :array_pack_no_platform, shared: true do
   it "raises ArgumentError when the format modifier is '_'" do
-    ->{ [1].pack(pack_format("_")) }.should raise_error(ArgumentError)
+    ->{ [1].pack(pack_format("_")) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when the format modifier is '!'" do
-    ->{ [1].pack(pack_format("!")) }.should raise_error(ArgumentError)
+    ->{ [1].pack(pack_format("!")) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/array/pack/shared/encodings.rb b/spec/ruby/core/array/pack/shared/encodings.rb
index 6b7ffac7645..0b5a5cc8a01 100644
--- a/spec/ruby/core/array/pack/shared/encodings.rb
+++ b/spec/ruby/core/array/pack/shared/encodings.rb
@@ -5,12 +5,12 @@
 
   it "raises a TypeError if the object does not respond to #to_str" do
     obj = mock("pack hex non-string")
-    -> { [obj].pack(pack_format) }.should raise_error(TypeError)
+    -> { [obj].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_str does not return a String" do
     obj = mock("pack hex non-string")
     obj.should_receive(:to_str).and_return(1)
-    -> { [obj].pack(pack_format) }.should raise_error(TypeError)
+    -> { [obj].pack(pack_format) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/array/pack/shared/float.rb b/spec/ruby/core/array/pack/shared/float.rb
index 3f60fee2150..c1efcd7677b 100644
--- a/spec/ruby/core/array/pack/shared/float.rb
+++ b/spec/ruby/core/array/pack/shared/float.rb
@@ -14,7 +14,7 @@
   end
 
   it "raises a TypeError if passed a String representation of a floating point number" do
-    -> { ["13"].pack(pack_format) }.should raise_error(TypeError)
+    -> { ["13"].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "encodes the number of array elements specified by the count modifier" do
@@ -28,7 +28,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [5.3, 9.2].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -45,7 +45,7 @@
 
   it "encodes NaN" do
     nans = ["\x00\x00\xc0\xff", "\x00\x00\xc0\x7f", "\xFF\xFF\xFF\x7F"]
-    nans.should include([nan_value].pack(pack_format))
+    nans.should.include?([nan_value].pack(pack_format))
   end
 
   it "encodes a positive Float outside the range of a single precision float" do
@@ -84,7 +84,7 @@
   end
 
   it "raises a TypeError if passed a String representation of a floating point number" do
-    -> { ["13"].pack(pack_format) }.should raise_error(TypeError)
+    -> { ["13"].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "encodes the number of array elements specified by the count modifier" do
@@ -98,7 +98,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [5.3, 9.2].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -115,7 +115,7 @@
 
   it "encodes NaN" do
     nans = ["\xff\xc0\x00\x00", "\x7f\xc0\x00\x00", "\x7F\xFF\xFF\xFF"]
-    nans.should include([nan_value].pack(pack_format))
+    nans.should.include?([nan_value].pack(pack_format))
   end
 
   it "encodes a positive Float outside the range of a single precision float" do
@@ -146,7 +146,7 @@
   end
 
   it "raises a TypeError if passed a String representation of a floating point number" do
-    -> { ["13"].pack(pack_format) }.should raise_error(TypeError)
+    -> { ["13"].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "encodes the number of array elements specified by the count modifier" do
@@ -160,7 +160,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [5.3, 9.2].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -181,7 +181,7 @@
       "\x00\x00\x00\x00\x00\x00\xf8\x7f",
       "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F"
     ]
-    nans.should include([nan_value].pack(pack_format))
+    nans.should.include?([nan_value].pack(pack_format))
   end
 
   it "encodes a positive Float outside the range of a single precision float" do
@@ -207,7 +207,7 @@
   end
 
   it "raises a TypeError if passed a String representation of a floating point number" do
-    -> { ["13"].pack(pack_format) }.should raise_error(TypeError)
+    -> { ["13"].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "encodes the number of array elements specified by the count modifier" do
@@ -221,7 +221,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [5.3, 9.2].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -242,7 +242,7 @@
       "\x7f\xf8\x00\x00\x00\x00\x00\x00",
       "\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
     ]
-    nans.should include([nan_value].pack(pack_format))
+    nans.should.include?([nan_value].pack(pack_format))
   end
 
   it "encodes a positive Float outside the range of a single precision float" do
diff --git a/spec/ruby/core/array/pack/shared/integer.rb b/spec/ruby/core/array/pack/shared/integer.rb
index ff2ee492016..1cdd386cc15 100644
--- a/spec/ruby/core/array/pack/shared/integer.rb
+++ b/spec/ruby/core/array/pack/shared/integer.rb
@@ -44,7 +44,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -97,7 +97,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -150,7 +150,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -203,7 +203,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -316,7 +316,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [0xdef0_abcd_3412_7856, 0x7865_4321_dcba_def0].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -377,7 +377,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [0xdef0_abcd_3412_7856, 0x7865_4321_dcba_def0].pack(pack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/array/pack/shared/numeric_basic.rb b/spec/ruby/core/array/pack/shared/numeric_basic.rb
index 545e215e646..6594914933b 100644
--- a/spec/ruby/core/array/pack/shared/numeric_basic.rb
+++ b/spec/ruby/core/array/pack/shared/numeric_basic.rb
@@ -4,15 +4,15 @@
   end
 
   it "raises a TypeError when passed nil" do
-    -> { [nil].pack(pack_format) }.should raise_error(TypeError)
+    -> { [nil].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed true" do
-    -> { [true].pack(pack_format) }.should raise_error(TypeError)
+    -> { [true].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed false" do
-    -> { [false].pack(pack_format) }.should raise_error(TypeError)
+    -> { [false].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "returns a binary string" do
@@ -24,27 +24,27 @@
 describe :array_pack_integer, shared: true do
   it "raises a TypeError when the object does not respond to #to_int" do
     obj = mock('not an integer')
-    -> { [obj].pack(pack_format) }.should raise_error(TypeError)
+    -> { [obj].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { ["5"].pack(pack_format) }.should raise_error(TypeError)
+    -> { ["5"].pack(pack_format) }.should.raise(TypeError)
   end
 end
 
 describe :array_pack_float, shared: true do
   it "raises a TypeError if a String does not represent a floating point number" do
-    -> { ["a"].pack(pack_format) }.should raise_error(TypeError)
+    -> { ["a"].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the object is not Numeric" do
     obj = Object.new
-    -> { [obj].pack(pack_format) }.should raise_error(TypeError, /can't convert Object into Float/)
+    -> { [obj].pack(pack_format) }.should.raise(TypeError, /can't convert Object into Float/)
   end
 
   it "raises a TypeError when the Numeric object does not respond to #to_f" do
     klass = Class.new(Numeric)
     obj = klass.new
-    -> { [obj].pack(pack_format) }.should raise_error(TypeError)
+    -> { [obj].pack(pack_format) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/array/pack/shared/string.rb b/spec/ruby/core/array/pack/shared/string.rb
index 805f78b53b6..b02257059f8 100644
--- a/spec/ruby/core/array/pack/shared/string.rb
+++ b/spec/ruby/core/array/pack/shared/string.rb
@@ -17,11 +17,11 @@
   end
 
   it "raises an ArgumentError when the Array is empty" do
-    -> { [].pack(pack_format) }.should raise_error(ArgumentError)
+    -> { [].pack(pack_format) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the Array has too few elements" do
-    -> { ["a"].pack(pack_format(nil, 2)) }.should raise_error(ArgumentError)
+    -> { ["a"].pack(pack_format(nil, 2)) }.should.raise(ArgumentError)
   end
 
   it "calls #to_str to convert the element to a String" do
@@ -33,7 +33,7 @@
 
   it "raises a TypeError when the object does not respond to #to_str" do
     obj = mock("not a string")
-    -> { [obj].pack(pack_format) }.should raise_error(TypeError)
+    -> { [obj].pack(pack_format) }.should.raise(TypeError)
   end
 
   it "returns a string in encoding of common to the concatenated results" do
diff --git a/spec/ruby/core/array/pack/shared/unicode.rb b/spec/ruby/core/array/pack/shared/unicode.rb
index 0eccc7098c7..58ba8a8b233 100644
--- a/spec/ruby/core/array/pack/shared/unicode.rb
+++ b/spec/ruby/core/array/pack/shared/unicode.rb
@@ -26,7 +26,7 @@
   it "constructs strings with valid encodings" do
     str = [0x85].pack("U*")
     str.should == "\xc2\x85"
-    str.valid_encoding?.should be_true
+    str.valid_encoding?.should == true
   end
 
   it "encodes values larger than UTF-8 max codepoints" do
@@ -64,13 +64,13 @@
   it "raises a TypeError if #to_int does not return an Integer" do
     obj = mock('to_int')
     obj.should_receive(:to_int).and_return("5")
-    -> { [obj].pack("U") }.should raise_error(TypeError)
+    -> { [obj].pack("U") }.should.raise(TypeError)
   end
 
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [1, 2, 3].pack("U\x00U")
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -78,11 +78,11 @@
   end
 
   it "raises a RangeError if passed a negative number" do
-    -> { [-1].pack("U") }.should raise_error(RangeError)
+    -> { [-1].pack("U") }.should.raise(RangeError)
   end
 
   it "raises a RangeError if passed a number larger than an unsigned 32-bit integer" do
-    -> { [2**32].pack("U") }.should raise_error(RangeError)
+    -> { [2**32].pack("U") }.should.raise(RangeError)
   end
 
   it "sets the output string to UTF-8 encoding" do
diff --git a/spec/ruby/core/array/pack/u_spec.rb b/spec/ruby/core/array/pack/u_spec.rb
index 1f84095ac46..c6a0d77eb2d 100644
--- a/spec/ruby/core/array/pack/u_spec.rb
+++ b/spec/ruby/core/array/pack/u_spec.rb
@@ -25,7 +25,7 @@
   end
 
   it "will not implicitly convert a number to a string" do
-    -> { [0].pack('u') }.should raise_error(TypeError)
+    -> { [0].pack('u') }.should.raise(TypeError)
   end
 
   it "encodes an empty string as an empty string" do
@@ -122,16 +122,16 @@
 
   it "raises a TypeError if #to_str does not return a String" do
     obj = mock("pack m non-string")
-    -> { [obj].pack("u") }.should raise_error(TypeError)
+    -> { [obj].pack("u") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed nil" do
-    -> { [nil].pack("u") }.should raise_error(TypeError)
+    -> { [nil].pack("u") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an Integer" do
-    -> { [0].pack("u") }.should raise_error(TypeError)
-    -> { [bignum_value].pack("u") }.should raise_error(TypeError)
+    -> { [0].pack("u") }.should.raise(TypeError)
+    -> { [bignum_value].pack("u") }.should.raise(TypeError)
   end
 
   it "sets the output string to US-ASCII encoding" do
diff --git a/spec/ruby/core/array/pack/w_spec.rb b/spec/ruby/core/array/pack/w_spec.rb
index ebadb94cab0..263e2a2288f 100644
--- a/spec/ruby/core/array/pack/w_spec.rb
+++ b/spec/ruby/core/array/pack/w_spec.rb
@@ -27,7 +27,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       [1, 2, 3].pack("w\x00w")
-    }.should raise_error(ArgumentError, /unknown pack directive/)
+    }.should.raise(ArgumentError, /unknown pack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -35,7 +35,7 @@
   end
 
   it "raises an ArgumentError when passed a negative value" do
-    -> { [-1].pack("w") }.should raise_error(ArgumentError)
+    -> { [-1].pack("w") }.should.raise(ArgumentError)
   end
 
   it "returns a binary string" do
diff --git a/spec/ruby/core/array/pack/x_spec.rb b/spec/ruby/core/array/pack/x_spec.rb
index 012fe4567f9..7ff587a01ed 100644
--- a/spec/ruby/core/array/pack/x_spec.rb
+++ b/spec/ruby/core/array/pack/x_spec.rb
@@ -56,10 +56,10 @@
   end
 
   it "raises an ArgumentError if the output string is empty" do
-    -> { [1, 2, 3].pack("XC") }.should raise_error(ArgumentError)
+    -> { [1, 2, 3].pack("XC") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the count modifier is greater than the bytes in the string" do
-    -> { [1, 2, 3].pack("C2X3") }.should raise_error(ArgumentError)
+    -> { [1, 2, 3].pack("C2X3") }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/array/pack/z_spec.rb b/spec/ruby/core/array/pack/z_spec.rb
index 60f8f7bf10c..5cd084c8251 100644
--- a/spec/ruby/core/array/pack/z_spec.rb
+++ b/spec/ruby/core/array/pack/z_spec.rb
@@ -19,7 +19,7 @@
   end
 
   it "will not implicitly convert a number to a string" do
-    -> { [0].pack('Z') }.should raise_error(TypeError)
+    -> { [0].pack('Z') }.should.raise(TypeError)
   end
 
   it "adds all the bytes and appends a NULL byte when passed the '*' modifier" do
diff --git a/spec/ruby/core/array/partition_spec.rb b/spec/ruby/core/array/partition_spec.rb
index be36fffcab9..bd3f3a6b6f9 100644
--- a/spec/ruby/core/array/partition_spec.rb
+++ b/spec/ruby/core/array/partition_spec.rb
@@ -36,8 +36,8 @@
 
   it "does not return subclass instances on Array subclasses" do
     result = ArraySpecs::MyArray[1, 2, 3].partition { |x| x % 2 == 0 }
-    result.should be_an_instance_of(Array)
-    result[0].should be_an_instance_of(Array)
-    result[1].should be_an_instance_of(Array)
+    result.should.instance_of?(Array)
+    result[0].should.instance_of?(Array)
+    result[1].should.instance_of?(Array)
   end
 end
diff --git a/spec/ruby/core/array/permutation_spec.rb b/spec/ruby/core/array/permutation_spec.rb
index f15bd76639b..b5df84b52b0 100644
--- a/spec/ruby/core/array/permutation_spec.rb
+++ b/spec/ruby/core/array/permutation_spec.rb
@@ -11,7 +11,7 @@
 
   it "returns an Enumerator of all permutations when called without a block or arguments" do
     enum = @numbers.permutation
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.sort.should == [
       [1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]
     ].sort
@@ -19,13 +19,13 @@
 
   it "returns an Enumerator of permutations of given length when called with an argument but no block" do
     enum = @numbers.permutation(1)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.sort.should == [[1],[2],[3]]
   end
 
   it "yields all permutations to the block then returns self when called with block but no arguments" do
     array = @numbers.permutation {|n| @yielded << n}
-    array.should be_an_instance_of(Array)
+    array.should.instance_of?(Array)
     array.sort.should == @numbers.sort
     @yielded.sort.should == [
       [1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]
@@ -34,7 +34,7 @@
 
   it "yields all permutations of given length to the block then returns self when called with block and argument" do
     array = @numbers.permutation(2) {|n| @yielded << n}
-    array.should be_an_instance_of(Array)
+    array.should.instance_of?(Array)
     array.sort.should == @numbers.sort
     @yielded.sort.should == [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]].sort
   end
@@ -78,7 +78,7 @@
        [3, 1],      [3, 2],      [3, [4, 5]],
       [[4, 5], 1], [[4, 5], 2], [[4, 5], 3]
     ]
-    expected.each {|e| got.include?(e).should be_true}
+    expected.each {|e| got.include?(e).should == true}
     got.size.should == expected.size
   end
 
diff --git a/spec/ruby/core/array/plus_spec.rb b/spec/ruby/core/array/plus_spec.rb
index b7153fd3ef1..7ead927fc09 100644
--- a/spec/ruby/core/array/plus_spec.rb
+++ b/spec/ruby/core/array/plus_spec.rb
@@ -22,14 +22,14 @@
     end
 
     it "raises a TypeError if the given argument can't be converted to an array" do
-      -> { [1, 2, 3] + nil }.should raise_error(TypeError)
-      -> { [1, 2, 3] + "abc" }.should raise_error(TypeError)
+      -> { [1, 2, 3] + nil }.should.raise(TypeError)
+      -> { [1, 2, 3] + "abc" }.should.raise(TypeError)
     end
 
     it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to an Array" do
       obj = mock("hello")
       obj.should_receive(:to_ary).and_raise(NoMethodError)
-      -> { [1, 2, 3] + obj }.should raise_error(NoMethodError)
+      -> { [1, 2, 3] + obj }.should.raise(NoMethodError)
     end
   end
 
@@ -45,9 +45,9 @@
   end
 
   it "does return subclass instances with Array subclasses" do
-    (ArraySpecs::MyArray[1, 2, 3] + []).should be_an_instance_of(Array)
-    (ArraySpecs::MyArray[1, 2, 3] + ArraySpecs::MyArray[]).should be_an_instance_of(Array)
-    ([1, 2, 3] + ArraySpecs::MyArray[]).should be_an_instance_of(Array)
+    (ArraySpecs::MyArray[1, 2, 3] + []).should.instance_of?(Array)
+    (ArraySpecs::MyArray[1, 2, 3] + ArraySpecs::MyArray[]).should.instance_of?(Array)
+    ([1, 2, 3] + ArraySpecs::MyArray[]).should.instance_of?(Array)
   end
 
   it "does not call to_ary on array subclasses" do
diff --git a/spec/ruby/core/array/pop_spec.rb b/spec/ruby/core/array/pop_spec.rb
index 2a194086609..069083331c1 100644
--- a/spec/ruby/core/array/pop_spec.rb
+++ b/spec/ruby/core/array/pop_spec.rb
@@ -31,11 +31,11 @@
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.pop }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.pop }.should.raise(FrozenError)
   end
 
   it "raises a FrozenError on an empty frozen array" do
-    -> { ArraySpecs.empty_frozen_array.pop }.should raise_error(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.pop }.should.raise(FrozenError)
   end
 
   describe "passed a number n as an argument" do
@@ -71,7 +71,7 @@
       popped2.should == []
       a.should == []
 
-      popped1.should_not equal(popped2)
+      popped1.should_not.equal?(popped2)
     end
 
     it "returns whole elements if n exceeds size of the array" do
@@ -82,14 +82,14 @@
 
     it "does not return self even when it returns whole elements" do
       a = [1, 2, 3, 4, 5]
-      a.pop(5).should_not equal(a)
+      a.pop(5).should_not.equal?(a)
 
       a = [1, 2, 3, 4, 5]
-      a.pop(6).should_not equal(a)
+      a.pop(6).should_not.equal?(a)
     end
 
     it "raises an ArgumentError if n is negative" do
-      ->{ [1, 2, 3].pop(-1) }.should raise_error(ArgumentError)
+      ->{ [1, 2, 3].pop(-1) }.should.raise(ArgumentError)
     end
 
     it "tries to convert n to an Integer using #to_int" do
@@ -104,21 +104,21 @@
     end
 
     it "raises a TypeError when the passed n cannot be coerced to Integer" do
-      ->{ [1, 2].pop("cat") }.should raise_error(TypeError)
-      ->{ [1, 2].pop(nil) }.should raise_error(TypeError)
+      ->{ [1, 2].pop("cat") }.should.raise(TypeError)
+      ->{ [1, 2].pop(nil) }.should.raise(TypeError)
     end
 
     it "raises an ArgumentError if more arguments are passed" do
-      ->{ [1, 2].pop(1, 2) }.should raise_error(ArgumentError)
+      ->{ [1, 2].pop(1, 2) }.should.raise(ArgumentError)
     end
 
     it "does not return subclass instances with Array subclass" do
-      ArraySpecs::MyArray[1, 2, 3].pop(2).should be_an_instance_of(Array)
+      ArraySpecs::MyArray[1, 2, 3].pop(2).should.instance_of?(Array)
     end
 
     it "raises a FrozenError on a frozen array" do
-      -> { ArraySpecs.frozen_array.pop(2) }.should raise_error(FrozenError)
-      -> { ArraySpecs.frozen_array.pop(0) }.should raise_error(FrozenError)
+      -> { ArraySpecs.frozen_array.pop(2) }.should.raise(FrozenError)
+      -> { ArraySpecs.frozen_array.pop(0) }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/array/product_spec.rb b/spec/ruby/core/array/product_spec.rb
index 6fb3818508e..837f0eaf345 100644
--- a/spec/ruby/core/array/product_spec.rb
+++ b/spec/ruby/core/array/product_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Array#product" do
   it "returns converted arguments using :to_ary" do
-    ->{ [1].product(2..3) }.should raise_error(TypeError)
+    ->{ [1].product(2..3) }.should.raise(TypeError)
     ar = ArraySpecs::ArrayConvertible.new(2,3)
     [1].product(ar).should == [[1,2],[1,3]]
     ar.called.should == :to_ary
@@ -31,7 +31,7 @@
     a = (0..100).to_a
     -> do
       a.product(a, a, a, a, a, a, a, a, a, a)
-    end.should raise_error(RangeError)
+    end.should.raise(RangeError)
   end
 
   describe "when given a block" do
@@ -43,7 +43,7 @@
 
       acc = []
       [1,2].product([3,4,5],[],[6,8]){|array| acc << array}
-      acc.should be_empty
+      acc.should.empty?
     end
 
     it "returns self" do
@@ -56,18 +56,18 @@
       a = (0..100).to_a
       -> do
         a.product(a, a, a, a, a, a, a, a, a, a)
-      end.should raise_error(RangeError)
+      end.should.raise(RangeError)
     end
   end
 
   describe "when given an empty block" do
     it "returns self" do
       arr = [1,2]
-      arr.product([3,4,5],[6,8]){}.should equal(arr)
+      arr.product([3,4,5],[6,8]){}.should.equal?(arr)
       arr = []
-      arr.product([3,4,5],[6,8]){}.should equal(arr)
+      arr.product([3,4,5],[6,8]){}.should.equal?(arr)
       arr = [1,2]
-      arr.product([]){}.should equal(arr)
+      arr.product([]){}.should.equal?(arr)
     end
   end
 end
diff --git a/spec/ruby/core/array/rassoc_spec.rb b/spec/ruby/core/array/rassoc_spec.rb
index a7ffb75fb53..95e4ed18927 100644
--- a/spec/ruby/core/array/rassoc_spec.rb
+++ b/spec/ruby/core/array/rassoc_spec.rb
@@ -12,11 +12,11 @@
 
   it "properly handles recursive arrays" do
     empty = ArraySpecs.empty_recursive_array
-    empty.rassoc([]).should be_nil
+    empty.rassoc([]).should == nil
     [[empty, empty]].rassoc(empty).should == [empty, empty]
 
     array = ArraySpecs.recursive_array
-    array.rassoc(array).should be_nil
+    array.rassoc(array).should == nil
     [[empty, array]].rassoc(array).should == [empty, array]
   end
 
@@ -42,9 +42,9 @@ def o.==(other); other == 'foobar'; end
     a = [s1, s2]
 
     s1.should_not_receive(:to_ary)
-    a.rassoc(2).should equal(s1)
+    a.rassoc(2).should.equal?(s1)
 
     a.rassoc(3).should == [2, 3]
-    s2.called.should equal(:to_ary)
+    s2.called.should.equal?(:to_ary)
   end
 end
diff --git a/spec/ruby/core/array/reject_spec.rb b/spec/ruby/core/array/reject_spec.rb
index 81a467e364c..8d237b3a750 100644
--- a/spec/ruby/core/array/reject_spec.rb
+++ b/spec/ruby/core/array/reject_spec.rb
@@ -10,9 +10,9 @@
     ary = [1, 2, 3, 4, 5]
     ary.reject { true }.should == []
     ary.reject { false }.should == ary
-    ary.reject { false }.should_not equal ary
+    ary.reject { false }.should_not.equal? ary
     ary.reject { nil }.should == ary
-    ary.reject { nil }.should_not equal ary
+    ary.reject { nil }.should_not.equal? ary
     ary.reject { 5 }.should == []
     ary.reject { |i| i < 3 }.should == [3, 4, 5]
     ary.reject { |i| i % 2 == 0 }.should == [1, 3, 5]
@@ -35,7 +35,7 @@
   end
 
   it "does not return subclass instance on Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].reject { |x| x % 2 == 0 }.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].reject { |x| x % 2 == 0 }.should.instance_of?(Array)
   end
 
   it "does not retain instance variables" do
@@ -55,7 +55,7 @@
 describe "Array#reject!" do
   it "removes elements for which block is true" do
     a = [3, 4, 5, 6, 7, 8, 9, 10, 11]
-    a.reject! { |i| i % 2 == 0 }.should equal(a)
+    a.reject! { |i| i % 2 == 0 }.should.equal?(a)
     a.should == [3, 5, 7, 9, 11]
     a.reject! { |i| i > 8 }
     a.should == [3, 5, 7]
@@ -105,20 +105,20 @@
   end
 
   it "returns an Enumerator if no block given, and the array is frozen" do
-    ArraySpecs.frozen_array.reject!.should be_an_instance_of(Enumerator)
+    ArraySpecs.frozen_array.reject!.should.instance_of?(Enumerator)
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.reject! {} }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.reject! {} }.should.raise(FrozenError)
   end
 
   it "raises a FrozenError on an empty frozen array" do
-    -> { ArraySpecs.empty_frozen_array.reject! {} }.should raise_error(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.reject! {} }.should.raise(FrozenError)
   end
 
   it "raises a FrozenError on a frozen array only during iteration if called without a block" do
     enum = ArraySpecs.frozen_array.reject!
-    -> { enum.each {} }.should raise_error(FrozenError)
+    -> { enum.each {} }.should.raise(FrozenError)
   end
 
   it "does not truncate the array is the block raises an exception" do
diff --git a/spec/ruby/core/array/repeated_combination_spec.rb b/spec/ruby/core/array/repeated_combination_spec.rb
index b62382024ab..a714f05f54c 100644
--- a/spec/ruby/core/array/repeated_combination_spec.rb
+++ b/spec/ruby/core/array/repeated_combination_spec.rb
@@ -6,16 +6,16 @@
   end
 
   it "returns an enumerator when no block is provided" do
-    @array.repeated_combination(2).should be_an_instance_of(Enumerator)
+    @array.repeated_combination(2).should.instance_of?(Enumerator)
   end
 
   it "returns self when a block is given" do
-    @array.repeated_combination(2){}.should equal(@array)
+    @array.repeated_combination(2){}.should.equal?(@array)
   end
 
   it "yields nothing for negative length and return self" do
-    @array.repeated_combination(-1){ fail }.should equal(@array)
-    @array.repeated_combination(-10){ fail }.should equal(@array)
+    @array.repeated_combination(-1){ fail }.should.equal?(@array)
+    @array.repeated_combination(-10){ fail }.should.equal?(@array)
   end
 
   it "yields the expected repeated_combinations" do
diff --git a/spec/ruby/core/array/repeated_permutation_spec.rb b/spec/ruby/core/array/repeated_permutation_spec.rb
index a165fda09ed..c54a8c0c2bf 100644
--- a/spec/ruby/core/array/repeated_permutation_spec.rb
+++ b/spec/ruby/core/array/repeated_permutation_spec.rb
@@ -10,13 +10,13 @@
 
   it "returns an Enumerator of all repeated permutations of given length when called without a block" do
     enum = @numbers.repeated_permutation(2)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.sort.should == @permutations
   end
 
   it "yields all repeated_permutations to the block then returns self when called with block but no arguments" do
     yielded = []
-    @numbers.repeated_permutation(2) {|n| yielded << n}.should equal(@numbers)
+    @numbers.repeated_permutation(2) {|n| yielded << n}.should.equal?(@numbers)
     yielded.sort.should == @permutations
   end
 
diff --git a/spec/ruby/core/array/reverse_each_spec.rb b/spec/ruby/core/array/reverse_each_spec.rb
index 59dabcd33d0..8fa5ce6da1f 100644
--- a/spec/ruby/core/array/reverse_each_spec.rb
+++ b/spec/ruby/core/array/reverse_each_spec.rb
@@ -19,7 +19,7 @@
 
   it "returns self" do
     a = [:a, :b, :c]
-    a.reverse_each { |x| }.should equal(a)
+    a.reverse_each { |x| }.should.equal?(a)
   end
 
   it "yields only the top level element of an empty recursive arrays" do
diff --git a/spec/ruby/core/array/reverse_spec.rb b/spec/ruby/core/array/reverse_spec.rb
index 05dbd2efcf4..f25a484be8b 100644
--- a/spec/ruby/core/array/reverse_spec.rb
+++ b/spec/ruby/core/array/reverse_spec.rb
@@ -16,14 +16,14 @@
   end
 
   it "does not return subclass instance on Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].reverse.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].reverse.should.instance_of?(Array)
   end
 end
 
 describe "Array#reverse!" do
   it "reverses the elements in place" do
     a = [6, 3, 4, 2, 1]
-    a.reverse!.should equal(a)
+    a.reverse!.should.equal?(a)
     a.should == [1, 2, 4, 3, 6]
     [].reverse!.should == []
   end
@@ -37,6 +37,6 @@
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.reverse! }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.reverse! }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/rindex_spec.rb b/spec/ruby/core/array/rindex_spec.rb
index 13de88818c7..858c39dc928 100644
--- a/spec/ruby/core/array/rindex_spec.rb
+++ b/spec/ruby/core/array/rindex_spec.rb
@@ -41,7 +41,7 @@
   it "properly handles empty recursive arrays" do
     empty = ArraySpecs.empty_recursive_array
     empty.rindex(empty).should == 0
-    empty.rindex(1).should be_nil
+    empty.rindex(1).should == nil
   end
 
   it "properly handles recursive arrays" do
@@ -86,7 +86,7 @@
   describe "given no argument and no block" do
     it "produces an Enumerator" do
       enum = [4, 2, 1, 5, 1, 3].rindex
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
       enum.each { |x| x < 2 }.should == 4
     end
   end
diff --git a/spec/ruby/core/array/rotate_spec.rb b/spec/ruby/core/array/rotate_spec.rb
index 60dcc8b1132..009ce5ed49e 100644
--- a/spec/ruby/core/array/rotate_spec.rb
+++ b/spec/ruby/core/array/rotate_spec.rb
@@ -29,10 +29,10 @@
     it "raises a TypeError if not passed an integer-like argument" do
       -> {
         [1, 2].rotate(nil)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
       -> {
         [1, 2].rotate("4")
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 
@@ -50,18 +50,18 @@
       [].freeze.rotate
       [2].freeze.rotate(2)
       [1,2,3].freeze.rotate(-3)
-    }.should_not raise_error
+    }.should_not.raise
   end
 
   it "does not return self" do
     a = [1, 2, 3]
-    a.rotate.should_not equal(a)
+    a.rotate.should_not.equal?(a)
     a = []
-    a.rotate(0).should_not equal(a)
+    a.rotate(0).should_not.equal?(a)
   end
 
   it "does not return subclass instance for Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].rotate.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].rotate.should.instance_of?(Array)
   end
 end
 
@@ -69,7 +69,7 @@
   describe "when passed no argument" do
     it "moves the first element to the end and returns self" do
       a = [1, 2, 3, 4, 5]
-      a.rotate!.should equal(a)
+      a.rotate!.should.equal?(a)
       a.should == [2, 3, 4, 5, 1]
     end
   end
@@ -77,11 +77,11 @@
   describe "with an argument n" do
     it "moves the first (n % size) elements at the end and returns self" do
       a = [1, 2, 3, 4, 5]
-      a.rotate!(2).should equal(a)
+      a.rotate!(2).should.equal?(a)
       a.should == [3, 4, 5, 1, 2]
-      a.rotate!(-12).should equal(a)
+      a.rotate!(-12).should.equal?(a)
       a.should == [1, 2, 3, 4, 5]
-      a.rotate!(13).should equal(a)
+      a.rotate!(13).should.equal?(a)
       a.should == [4, 5, 1, 2, 3]
     end
 
@@ -96,34 +96,34 @@
     it "raises a TypeError if not passed an integer-like argument" do
       -> {
         [1, 2].rotate!(nil)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
       -> {
         [1, 2].rotate!("4")
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 
   it "does nothing and returns self when the length is zero or one" do
     a = [1]
-    a.rotate!.should equal(a)
+    a.rotate!.should.equal?(a)
     a.should == [1]
-    a.rotate!(2).should equal(a)
+    a.rotate!(2).should.equal?(a)
     a.should == [1]
-    a.rotate!(-21).should equal(a)
+    a.rotate!(-21).should.equal?(a)
     a.should == [1]
 
     a = []
-    a.rotate!.should equal(a)
+    a.rotate!.should.equal?(a)
     a.should == []
-    a.rotate!(2).should equal(a)
+    a.rotate!(2).should.equal?(a)
     a.should == []
-    a.rotate!(-21).should equal(a)
+    a.rotate!(-21).should.equal?(a)
     a.should == []
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { [1, 2, 3].freeze.rotate!(0) }.should raise_error(FrozenError)
-    -> { [1].freeze.rotate!(42) }.should raise_error(FrozenError)
-    -> { [].freeze.rotate! }.should raise_error(FrozenError)
+    -> { [1, 2, 3].freeze.rotate!(0) }.should.raise(FrozenError)
+    -> { [1].freeze.rotate!(42) }.should.raise(FrozenError)
+    -> { [].freeze.rotate! }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/sample_spec.rb b/spec/ruby/core/array/sample_spec.rb
index d4e945152d7..fd443b47de9 100644
--- a/spec/ruby/core/array/sample_spec.rb
+++ b/spec/ruby/core/array/sample_spec.rb
@@ -14,23 +14,23 @@
   end
 
   it "returns nil for an empty Array" do
-    [].sample.should be_nil
+    [].sample.should == nil
   end
 
   it "returns nil for an empty array when called without n and a Random is given" do
-    [].sample(random: Random.new(42)).should be_nil
+    [].sample(random: Random.new(42)).should == nil
   end
 
   it "returns a single value when not passed a count" do
-    [4].sample.should equal(4)
+    [4].sample.should.equal?(4)
   end
 
   it "returns a single value when not passed a count and a Random is given" do
-    [4].sample(random: Random.new(42)).should equal(4)
+    [4].sample(random: Random.new(42)).should.equal?(4)
   end
 
   it "returns a single value when not passed a count and a Random class is given" do
-    [4].sample(random: Random).should equal(4)
+    [4].sample(random: Random).should.equal?(4)
   end
 
   it "returns an empty Array when passed zero" do
@@ -38,12 +38,12 @@
   end
 
   it "returns an Array of elements when passed a count" do
-    [1, 2, 3, 4].sample(3).should be_an_instance_of(Array)
+    [1, 2, 3, 4].sample(3).should.instance_of?(Array)
   end
 
   it "returns elements from the Array" do
     array = [1, 2, 3, 4]
-    array.sample(3).all? { |x| array.should include(x) }
+    array.sample(3).all? { |x| array.should.include?(x) }
   end
 
   it "returns at most the number of elements in the Array" do
@@ -67,11 +67,11 @@
   end
 
   it "raises ArgumentError when passed a negative count" do
-    -> { [1, 2].sample(-1) }.should raise_error(ArgumentError)
+    -> { [1, 2].sample(-1) }.should.raise(ArgumentError)
   end
 
   it "does not return subclass instances with Array subclass" do
-    ArraySpecs::MyArray[1, 2, 3].sample(2).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].sample(2).should.instance_of?(Array)
   end
 
   describe "with options" do
@@ -79,13 +79,13 @@
       obj = mock("array_sample_random")
       obj.should_receive(:rand).and_return(0.5)
 
-      [1, 2].sample(random: obj).should be_an_instance_of(Integer)
+      [1, 2].sample(random: obj).should.instance_of?(Integer)
     end
 
     it "raises a NoMethodError if an object passed for the RNG does not define #rand" do
       obj = BasicObject.new
 
-      -> { [1, 2].sample(random: obj) }.should raise_error(NoMethodError)
+      -> { [1, 2].sample(random: obj) }.should.raise(NoMethodError)
     end
 
     describe "when the object returned by #rand is an Integer" do
@@ -105,21 +105,21 @@
         random = mock("array_sample_random")
         random.should_receive(:rand).and_return(-1)
 
-        -> { [1, 2].sample(random: random) }.should raise_error(RangeError)
+        -> { [1, 2].sample(random: random) }.should.raise(RangeError)
       end
 
       it "raises a RangeError if the value is equal to the Array size" do
         random = mock("array_sample_random")
         random.should_receive(:rand).and_return(2)
 
-        -> { [1, 2].sample(random: random) }.should raise_error(RangeError)
+        -> { [1, 2].sample(random: random) }.should.raise(RangeError)
       end
 
       it "raises a RangeError if the value is greater than the Array size" do
         random = mock("array_sample_random")
         random.should_receive(:rand).and_return(3)
 
-        -> { [1, 2].sample(random: random) }.should raise_error(RangeError)
+        -> { [1, 2].sample(random: random) }.should.raise(RangeError)
       end
     end
   end
@@ -140,7 +140,7 @@
       random = mock("array_sample_random")
       random.should_receive(:rand).and_return(value)
 
-      -> { [1, 2].sample(random: random) }.should raise_error(RangeError)
+      -> { [1, 2].sample(random: random) }.should.raise(RangeError)
     end
 
     it "raises a RangeError if the value is equal to the Array size" do
@@ -149,7 +149,7 @@
       random = mock("array_sample_random")
       random.should_receive(:rand).and_return(value)
 
-      -> { [1, 2].sample(random: random) }.should raise_error(RangeError)
+      -> { [1, 2].sample(random: random) }.should.raise(RangeError)
     end
   end
 end
diff --git a/spec/ruby/core/array/select_spec.rb b/spec/ruby/core/array/select_spec.rb
index 298b5917449..e8775ee5ac5 100644
--- a/spec/ruby/core/array/select_spec.rb
+++ b/spec/ruby/core/array/select_spec.rb
@@ -7,7 +7,7 @@
 
 describe "Array#select!" do
   it "returns nil if no changes were made in the array" do
-    [1, 2, 3].select! { true }.should be_nil
+    [1, 2, 3].select! { true }.should == nil
   end
 
   it_behaves_like :keep_if, :select!
diff --git a/spec/ruby/core/array/shared/clone.rb b/spec/ruby/core/array/shared/clone.rb
index 035b45ec99a..1a45c2fe2c1 100644
--- a/spec/ruby/core/array/shared/clone.rb
+++ b/spec/ruby/core/array/shared/clone.rb
@@ -1,14 +1,14 @@
 describe :array_clone, shared: true do
   it "returns an Array or a subclass instance" do
-    [].send(@method).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2].send(@method).should be_an_instance_of(ArraySpecs::MyArray)
+    [].send(@method).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2].send(@method).should.instance_of?(ArraySpecs::MyArray)
   end
 
   it "produces a shallow copy where the references are directly copied" do
     a = [mock('1'), mock('2')]
     b = a.send @method
-    b.first.should equal a.first
-    b.last.should equal a.last
+    b.first.should.equal? a.first
+    b.last.should.equal? a.last
   end
 
   it "creates a new array containing all elements or the original" do
diff --git a/spec/ruby/core/array/shared/collect.rb b/spec/ruby/core/array/shared/collect.rb
index 030302ced6c..aec51c9dc96 100644
--- a/spec/ruby/core/array/shared/collect.rb
+++ b/spec/ruby/core/array/shared/collect.rb
@@ -6,11 +6,11 @@
     a = ['a', 'b', 'c', 'd']
     b = a.send(@method) { |i| i + '!' }
     b.should == ["a!", "b!", "c!", "d!"]
-    b.should_not equal a
+    b.should_not.equal? a
   end
 
   it "does not return subclass instance" do
-    ArraySpecs::MyArray[1, 2, 3].send(@method) { |x| x + 1 }.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].send(@method) { |x| x + 1 }.should.instance_of?(Array)
   end
 
   it "does not change self" do
@@ -33,14 +33,14 @@
 
   it "returns an Enumerator when no block given" do
     a = [1, 2, 3]
-    a.send(@method).should be_an_instance_of(Enumerator)
+    a.send(@method).should.instance_of?(Enumerator)
   end
 
   it "raises an ArgumentError when no block and with arguments" do
     a = [1, 2, 3]
     -> {
       a.send(@method, :foo)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   before :all do
@@ -54,14 +54,14 @@
 describe :array_collect_b, shared: true do
   it "replaces each element with the value returned by block" do
     a = [7, 9, 3, 5]
-    a.send(@method) { |i| i - 1 }.should equal(a)
+    a.send(@method) { |i| i - 1 }.should.equal?(a)
     a.should == [6, 8, 2, 4]
   end
 
   it "returns self" do
     a = [1, 2, 3, 4, 5]
     b = a.send(@method) {|i| i+1 }
-    a.should equal b
+    a.should.equal? b
   end
 
   it "returns the evaluated value of block but its contents is partially modified, if it broke in the block" do
@@ -80,28 +80,28 @@
   it "returns an Enumerator when no block given, and the enumerator can modify the original array" do
     a = [1, 2, 3]
     enum = a.send(@method)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.each{|i| "#{i}!" }
     a.should == ["1!", "2!", "3!"]
   end
 
   describe "when frozen" do
     it "raises a FrozenError" do
-      -> { ArraySpecs.frozen_array.send(@method) {} }.should raise_error(FrozenError)
+      -> { ArraySpecs.frozen_array.send(@method) {} }.should.raise(FrozenError)
     end
 
     it "raises a FrozenError when empty" do
-      -> { ArraySpecs.empty_frozen_array.send(@method) {} }.should raise_error(FrozenError)
+      -> { ArraySpecs.empty_frozen_array.send(@method) {} }.should.raise(FrozenError)
     end
 
     it "raises a FrozenError when calling #each on the returned Enumerator" do
       enumerator = ArraySpecs.frozen_array.send(@method)
-      -> { enumerator.each {|x| x } }.should raise_error(FrozenError)
+      -> { enumerator.each {|x| x } }.should.raise(FrozenError)
     end
 
     it "raises a FrozenError when calling #each on the returned Enumerator when empty" do
       enumerator = ArraySpecs.empty_frozen_array.send(@method)
-      -> { enumerator.each {|x| x } }.should raise_error(FrozenError)
+      -> { enumerator.each {|x| x } }.should.raise(FrozenError)
     end
   end
 
diff --git a/spec/ruby/core/array/shared/difference.rb b/spec/ruby/core/array/shared/difference.rb
index 3e69050d826..3fe22331bde 100644
--- a/spec/ruby/core/array/shared/difference.rb
+++ b/spec/ruby/core/array/shared/difference.rb
@@ -27,13 +27,13 @@
 
   it "raises a TypeError if the argument cannot be coerced to an Array by calling #to_ary" do
     obj = mock('not an array')
-    -> { [1, 2, 3].send(@method, obj) }.should raise_error(TypeError)
+    -> { [1, 2, 3].send(@method, obj) }.should.raise(TypeError)
   end
 
   it "does not return subclass instance for Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].send(@method, []).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[]).should be_an_instance_of(Array)
-    [1, 2, 3].send(@method, ArraySpecs::MyArray[]).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].send(@method, []).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[]).should.instance_of?(Array)
+    [1, 2, 3].send(@method, ArraySpecs::MyArray[]).should.instance_of?(Array)
   end
 
   it "does not call to_ary on array subclasses" do
diff --git a/spec/ruby/core/array/shared/enumeratorize.rb b/spec/ruby/core/array/shared/enumeratorize.rb
index a19a5d3b9b8..5beab5c4c44 100644
--- a/spec/ruby/core/array/shared/enumeratorize.rb
+++ b/spec/ruby/core/array/shared/enumeratorize.rb
@@ -1,5 +1,5 @@
 describe :enumeratorize, shared: true do
   it "returns an Enumerator if no block given" do
-    [1,2].send(@method).should be_an_instance_of(Enumerator)
+    [1,2].send(@method).should.instance_of?(Enumerator)
   end
 end
diff --git a/spec/ruby/core/array/shared/eql.rb b/spec/ruby/core/array/shared/eql.rb
index b5d9128434d..5e770bf1676 100644
--- a/spec/ruby/core/array/shared/eql.rb
+++ b/spec/ruby/core/array/shared/eql.rb
@@ -1,59 +1,59 @@
 describe :array_eql, shared: true do
   it "returns true if other is the same array" do
     a = [1]
-    a.send(@method, a).should be_true
+    a.send(@method, a).should == true
   end
 
   it "returns true if corresponding elements are #eql?" do
-    [].send(@method, []).should be_true
-    [1, 2, 3, 4].send(@method, [1, 2, 3, 4]).should be_true
+    [].send(@method, []).should == true
+    [1, 2, 3, 4].send(@method, [1, 2, 3, 4]).should == true
   end
 
   it "returns false if other is shorter than self" do
-    [1, 2, 3, 4].send(@method, [1, 2, 3]).should be_false
+    [1, 2, 3, 4].send(@method, [1, 2, 3]).should == false
   end
 
   it "returns false if other is longer than self" do
-    [1, 2, 3, 4].send(@method, [1, 2, 3, 4, 5]).should be_false
+    [1, 2, 3, 4].send(@method, [1, 2, 3, 4, 5]).should == false
   end
 
   it "returns false immediately when sizes of the arrays differ" do
     obj = mock('1')
     obj.should_not_receive(@method)
 
-    []        .send(@method,    [obj]  ).should be_false
-    [obj]     .send(@method,    []     ).should be_false
+    []        .send(@method,    [obj]  ).should == false
+    [obj]     .send(@method,    []     ).should == false
   end
 
   it "handles well recursive arrays" do
     a = ArraySpecs.empty_recursive_array
-    a       .send(@method,    [a]    ).should be_true
-    a       .send(@method,    [[a]]  ).should be_true
-    [a]     .send(@method,    a      ).should be_true
-    [[a]]   .send(@method,    a      ).should be_true
+    a       .send(@method,    [a]    ).should == true
+    a       .send(@method,    [[a]]  ).should == true
+    [a]     .send(@method,    a      ).should == true
+    [[a]]   .send(@method,    a      ).should == true
     # These may be surprising, but no difference can be
     # found between these arrays, so they are ==.
     # There is no "path" that will lead to a difference
     # (contrary to other examples below)
 
     a2 = ArraySpecs.empty_recursive_array
-    a       .send(@method,    a2     ).should be_true
-    a       .send(@method,    [a2]   ).should be_true
-    a       .send(@method,    [[a2]] ).should be_true
-    [a]     .send(@method,    a2     ).should be_true
-    [[a]]   .send(@method,    a2     ).should be_true
+    a       .send(@method,    a2     ).should == true
+    a       .send(@method,    [a2]   ).should == true
+    a       .send(@method,    [[a2]] ).should == true
+    [a]     .send(@method,    a2     ).should == true
+    [[a]]   .send(@method,    a2     ).should == true
 
     back = []
     forth = [back]; back << forth;
-    back   .send(@method,  a  ).should be_true
+    back   .send(@method,  a  ).should == true
 
     x = []; x << x << x
-    x       .send(@method,    a                ).should be_false  # since x.size != a.size
-    x       .send(@method,    [a, a]           ).should be_false  # since x[0].size != [a, a][0].size
-    x       .send(@method,    [x, a]           ).should be_false  # since x[1].size != [x, a][1].size
-    [x, a]  .send(@method,    [a, x]           ).should be_false  # etc...
-    x       .send(@method,    [x, x]           ).should be_true
-    x       .send(@method,    [[x, x], [x, x]] ).should be_true
+    x       .send(@method,    a                ).should == false  # since x.size != a.size
+    x       .send(@method,    [a, a]           ).should == false  # since x[0].size != [a, a][0].size
+    x       .send(@method,    [x, a]           ).should == false  # since x[1].size != [x, a][1].size
+    [x, a]  .send(@method,    [a, x]           ).should == false  # etc...
+    x       .send(@method,    [x, x]           ).should == true
+    x       .send(@method,    [[x, x], [x, x]] ).should == true
 
     tree = [];
     branch = []; branch << tree << tree; tree << branch
@@ -62,31 +62,31 @@
     forest = [tree, branch, :bird, a]; forest << forest
     forest2 = [tree2, branch2, :bird, a2]; forest2 << forest2
 
-    forest .send(@method,     forest2         ).should be_true
-    forest .send(@method,     [tree2, branch, :bird, a, forest2]).should be_true
+    forest .send(@method,     forest2         ).should == true
+    forest .send(@method,     [tree2, branch, :bird, a, forest2]).should == true
 
     diffforest = [branch2, tree2, :bird, a2]; diffforest << forest2
-    forest .send(@method,     diffforest      ).should be_false # since forest[0].size == 1 != 3 == diffforest[0]
-    forest .send(@method,     [nil]           ).should be_false
-    forest .send(@method,     [forest]        ).should be_false
+    forest .send(@method,     diffforest      ).should == false # since forest[0].size == 1 != 3 == diffforest[0]
+    forest .send(@method,     [nil]           ).should == false
+    forest .send(@method,     [forest]        ).should == false
   end
 
   it "does not call #to_ary on its argument" do
     obj = mock('to_ary')
     obj.should_not_receive(:to_ary)
 
-    [1, 2, 3].send(@method, obj).should be_false
+    [1, 2, 3].send(@method, obj).should == false
   end
 
   it "does not call #to_ary on Array subclasses" do
     ary = ArraySpecs::ToAryArray[5, 6, 7]
     ary.should_not_receive(:to_ary)
-    [5, 6, 7].send(@method, ary).should be_true
+    [5, 6, 7].send(@method, ary).should == true
   end
 
   it "ignores array class differences" do
-    ArraySpecs::MyArray[1, 2, 3].send(@method, [1, 2, 3]).should be_true
-    ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should be_true
-    [1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should be_true
+    ArraySpecs::MyArray[1, 2, 3].send(@method, [1, 2, 3]).should == true
+    ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should == true
+    [1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should == true
   end
 end
diff --git a/spec/ruby/core/array/shared/index.rb b/spec/ruby/core/array/shared/index.rb
index a4a0adbab66..cc6d6cfb5b6 100644
--- a/spec/ruby/core/array/shared/index.rb
+++ b/spec/ruby/core/array/shared/index.rb
@@ -33,7 +33,7 @@ def x.==(obj) 3 == obj; end
 
   describe "given no argument and no block" do
     it "produces an Enumerator" do
-      [].send(@method).should be_an_instance_of(Enumerator)
+      [].send(@method).should.instance_of?(Enumerator)
     end
   end
 
diff --git a/spec/ruby/core/array/shared/inspect.rb b/spec/ruby/core/array/shared/inspect.rb
index af5128c645a..7197cd7f264 100644
--- a/spec/ruby/core/array/shared/inspect.rb
+++ b/spec/ruby/core/array/shared/inspect.rb
@@ -2,7 +2,7 @@
 
 describe :array_inspect, shared: true do
   it "returns a string" do
-    [1, 2, 3].send(@method).should be_an_instance_of(String)
+    [1, 2, 3].send(@method).should.instance_of?(String)
   end
 
   it "returns '[]' for an empty Array" do
@@ -55,7 +55,7 @@
     obj.should_receive(:inspect).and_return(obj)
     obj.should_receive(:to_s).and_raise(Exception)
 
-    -> { [obj].send(@method) }.should raise_error(Exception)
+    -> { [obj].send(@method) }.should.raise(Exception)
   end
 
   it "represents a recursive element with '[...]'" do
diff --git a/spec/ruby/core/array/shared/intersection.rb b/spec/ruby/core/array/shared/intersection.rb
index 0b4166ab633..dda72e8bd79 100644
--- a/spec/ruby/core/array/shared/intersection.rb
+++ b/spec/ruby/core/array/shared/intersection.rb
@@ -66,9 +66,9 @@
   end
 
   it "does return subclass instances for Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].send(@method, []).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should be_an_instance_of(Array)
-    [].send(@method, ArraySpecs::MyArray[1, 2, 3]).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].send(@method, []).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should.instance_of?(Array)
+    [].send(@method, ArraySpecs::MyArray[1, 2, 3]).should.instance_of?(Array)
   end
 
   it "does not call to_ary on array subclasses" do
diff --git a/spec/ruby/core/array/shared/join.rb b/spec/ruby/core/array/shared/join.rb
index 507b13e3c8a..2be60a4dbcd 100644
--- a/spec/ruby/core/array/shared/join.rb
+++ b/spec/ruby/core/array/shared/join.rb
@@ -49,13 +49,13 @@
   it "raises a NoMethodError if an element does not respond to #to_str, #to_ary, or #to_s" do
     obj = mock('o')
     class << obj; undef :to_s; end
-    -> { [1, obj].send(@method) }.should raise_error(NoMethodError)
+    -> { [1, obj].send(@method) }.should.raise(NoMethodError)
   end
 
   it "raises an ArgumentError when the Array is recursive" do
-    -> { ArraySpecs.recursive_array.send(@method) }.should raise_error(ArgumentError)
-    -> { ArraySpecs.head_recursive_array.send(@method) }.should raise_error(ArgumentError)
-    -> { ArraySpecs.empty_recursive_array.send(@method) }.should raise_error(ArgumentError)
+    -> { ArraySpecs.recursive_array.send(@method) }.should.raise(ArgumentError)
+    -> { ArraySpecs.head_recursive_array.send(@method) }.should.raise(ArgumentError)
+    -> { ArraySpecs.empty_recursive_array.send(@method) }.should.raise(ArgumentError)
   end
 
   it "uses the first encoding when other strings are compatible" do
@@ -81,7 +81,7 @@ class << obj; undef :to_s; end
   it "fails for arrays with incompatibly-encoded strings" do
     ary_utf8_bad_binary = ArraySpecs.array_with_utf8_and_binary_strings
 
-    -> { ary_utf8_bad_binary.send(@method) }.should raise_error(EncodingError)
+    -> { ary_utf8_bad_binary.send(@method) }.should.raise(EncodingError)
   end
 
   context "when $, is not nil" do
diff --git a/spec/ruby/core/array/shared/keep_if.rb b/spec/ruby/core/array/shared/keep_if.rb
index 43a047c0a78..44625eebd1d 100644
--- a/spec/ruby/core/array/shared/keep_if.rb
+++ b/spec/ruby/core/array/shared/keep_if.rb
@@ -4,12 +4,12 @@
 describe :keep_if, shared: true do
   it "deletes elements for which the block returns a false value" do
     array = [1, 2, 3, 4, 5]
-    array.send(@method) {|item| item > 3 }.should equal(array)
+    array.send(@method) {|item| item > 3 }.should.equal?(array)
     array.should == [4, 5]
   end
 
   it "returns an enumerator if no block is given" do
-    [1, 2, 3].send(@method).should be_an_instance_of(Enumerator)
+    [1, 2, 3].send(@method).should.instance_of?(Enumerator)
   end
 
   it "updates the receiver after all blocks" do
@@ -33,34 +33,34 @@
     end
 
     it "returns an Enumerator if no block is given" do
-      @frozen.send(@method).should be_an_instance_of(Enumerator)
+      @frozen.send(@method).should.instance_of?(Enumerator)
     end
 
     describe "with truthy block" do
       it "keeps elements after any exception" do
-        -> { @frozen.send(@method) { true } }.should raise_error(Exception)
+        -> { @frozen.send(@method) { true } }.should.raise(Exception)
         @frozen.should == @origin
       end
 
       it "raises a FrozenError" do
-        -> { @frozen.send(@method) { true } }.should raise_error(FrozenError)
+        -> { @frozen.send(@method) { true } }.should.raise(FrozenError)
       end
     end
 
     describe "with falsy block" do
       it "keeps elements after any exception" do
-        -> { @frozen.send(@method) { false } }.should raise_error(Exception)
+        -> { @frozen.send(@method) { false } }.should.raise(Exception)
         @frozen.should == @origin
       end
 
       it "raises a FrozenError" do
-        -> { @frozen.send(@method) { false } }.should raise_error(FrozenError)
+        -> { @frozen.send(@method) { false } }.should.raise(FrozenError)
       end
     end
 
     it "raises a FrozenError on a frozen array only during iteration if called without a block" do
       enum = @frozen.send(@method)
-      -> { enum.each {} }.should raise_error(FrozenError)
+      -> { enum.each {} }.should.raise(FrozenError)
     end
   end
 
diff --git a/spec/ruby/core/array/shared/push.rb b/spec/ruby/core/array/shared/push.rb
index ac790fb6a4e..ec406e506e1 100644
--- a/spec/ruby/core/array/shared/push.rb
+++ b/spec/ruby/core/array/shared/push.rb
@@ -1,7 +1,7 @@
 describe :array_push, shared: true do
   it "appends the arguments to the array" do
     a = [ "a", "b", "c" ]
-    a.send(@method, "d", "e", "f").should equal(a)
+    a.send(@method, "d", "e", "f").should.equal?(a)
     a.send(@method).should == ["a", "b", "c", "d", "e", "f"]
     a.send(@method, 5)
     a.should == ["a", "b", "c", "d", "e", "f", 5]
@@ -27,7 +27,7 @@
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.send(@method, 1) }.should raise_error(FrozenError)
-    -> { ArraySpecs.frozen_array.send(@method) }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.send(@method, 1) }.should.raise(FrozenError)
+    -> { ArraySpecs.frozen_array.send(@method) }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/shared/replace.rb b/spec/ruby/core/array/shared/replace.rb
index 9a6e60c1b02..06bfd00795c 100644
--- a/spec/ruby/core/array/shared/replace.rb
+++ b/spec/ruby/core/array/shared/replace.rb
@@ -2,9 +2,9 @@
   it "replaces the elements with elements from other array" do
     a = [1, 2, 3, 4, 5]
     b = ['a', 'b', 'c']
-    a.send(@method, b).should equal(a)
+    a.send(@method, b).should.equal?(a)
     a.should == b
-    a.should_not equal(b)
+    a.should_not.equal?(b)
 
     a.send(@method, [4] * 10)
     a.should == [4] * 10
@@ -27,7 +27,7 @@
   it "returns self" do
     ary = [1, 2, 3]
     other = [:a, :b, :c]
-    ary.send(@method, other).should equal(ary)
+    ary.send(@method, other).should.equal?(ary)
   end
 
   it "does not make self dependent to the original array" do
@@ -55,6 +55,6 @@
   it "raises a FrozenError on a frozen array" do
     -> {
       ArraySpecs.frozen_array.send(@method, ArraySpecs.frozen_array)
-    }.should raise_error(FrozenError)
+    }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/array/shared/select.rb b/spec/ruby/core/array/shared/select.rb
index 9c2cbf76c47..cb4f9acbb79 100644
--- a/spec/ruby/core/array/shared/select.rb
+++ b/spec/ruby/core/array/shared/select.rb
@@ -20,7 +20,7 @@
   end
 
   it "does not return subclass instance on Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].send(@method) { true }.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].send(@method) { true }.should.instance_of?(Array)
   end
 
   it "properly handles recursive arrays" do
diff --git a/spec/ruby/core/array/shared/slice.rb b/spec/ruby/core/array/shared/slice.rb
index b80261d32fd..b838d86118c 100644
--- a/spec/ruby/core/array/shared/slice.rb
+++ b/spec/ruby/core/array/shared/slice.rb
@@ -130,12 +130,12 @@ def to.<=>(o) 0 end
     def from.to_int() 'cat' end
     def to.to_int() -2 end
 
-    -> { a.send(@method, from..to) }.should raise_error(TypeError)
+    -> { a.send(@method, from..to) }.should.raise(TypeError)
 
     def from.to_int() 1 end
     def to.to_int() 'cat' end
 
-    -> { a.send(@method, from..to) }.should raise_error(TypeError)
+    -> { a.send(@method, from..to) }.should.raise(TypeError)
   end
 
   it "returns the elements specified by Range indexes with [m..n]" do
@@ -287,10 +287,10 @@ def to.to_int() -2 end
     a.send(@method, 1..0).should == []
     a.send(@method, 1...0).should == []
 
-    -> { a.send(@method, "a" .. "b") }.should raise_error(TypeError)
-    -> { a.send(@method, "a" ... "b") }.should raise_error(TypeError)
-    -> { a.send(@method, from .. "b") }.should raise_error(TypeError)
-    -> { a.send(@method, from ... "b") }.should raise_error(TypeError)
+    -> { a.send(@method, "a" .. "b") }.should.raise(TypeError)
+    -> { a.send(@method, "a" ... "b") }.should.raise(TypeError)
+    -> { a.send(@method, from .. "b") }.should.raise(TypeError)
+    -> { a.send(@method, from ... "b") }.should.raise(TypeError)
   end
 
   it "returns the same elements as [m..n] and [m...n] with Range subclasses" do
@@ -398,63 +398,63 @@ def to.to_int() -2 end
     end
 
     it "returns a Array instance with [n, m]" do
-      @array.send(@method, 0, 2).should be_an_instance_of(Array)
+      @array.send(@method, 0, 2).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [-n, m]" do
-      @array.send(@method, -3, 2).should be_an_instance_of(Array)
+      @array.send(@method, -3, 2).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [n..m]" do
-      @array.send(@method, 1..3).should be_an_instance_of(Array)
+      @array.send(@method, 1..3).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [n...m]" do
-      @array.send(@method, 1...3).should be_an_instance_of(Array)
+      @array.send(@method, 1...3).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [-n..-m]" do
-      @array.send(@method, -3..-1).should be_an_instance_of(Array)
+      @array.send(@method, -3..-1).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [-n...-m]" do
-      @array.send(@method, -3...-1).should be_an_instance_of(Array)
+      @array.send(@method, -3...-1).should.instance_of?(Array)
     end
 
     it "returns an empty array when m == n with [m...n]" do
       @array.send(@method, 1...1).should == []
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "returns an empty array with [0...0]" do
       @array.send(@method, 0...0).should == []
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "returns an empty array when m > n and m, n are positive with [m..n]" do
       @array.send(@method, 3..2).should == []
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "returns an empty array when m > n and m, n are negative with [m..n]" do
       @array.send(@method, -2..-3).should == []
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "returns [] if index == array.size with [index, length]" do
       @array.send(@method, 5, 2).should == []
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "returns [] if the index is valid but length is zero with [index, length]" do
       @array.send(@method, 0, 0).should == []
       @array.send(@method, 2, 0).should == []
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "does not call #initialize on the subclass instance" do
       @array.send(@method, 0, 3).should == [1, 2, 3]
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
   end
 
@@ -462,13 +462,13 @@ def to.to_int() -2 end
     array = [1, 2, 3, 4, 5, 6]
     obj = mock('large value')
     obj.should_receive(:to_int).and_return(bignum_value)
-    -> { array.send(@method, obj) }.should raise_error(RangeError)
+    -> { array.send(@method, obj) }.should.raise(RangeError)
 
     obj = 8e19
-    -> { array.send(@method, obj) }.should raise_error(RangeError)
+    -> { array.send(@method, obj) }.should.raise(RangeError)
 
     # boundary value when longs are 64 bits
-    -> { array.send(@method, 2.0**63) }.should raise_error(RangeError)
+    -> { array.send(@method, 2.0**63) }.should.raise(RangeError)
 
     # just under the boundary value when longs are 64 bits
     array.send(@method, max_long.to_f.prev_float).should == nil
@@ -478,20 +478,20 @@ def to.to_int() -2 end
     array = [1, 2, 3, 4, 5, 6]
     obj = mock('large value')
     obj.should_receive(:to_int).and_return(bignum_value)
-    -> { array.send(@method, 1, obj) }.should raise_error(RangeError)
+    -> { array.send(@method, 1, obj) }.should.raise(RangeError)
 
     obj = 8e19
-    -> { array.send(@method, 1, obj) }.should raise_error(RangeError)
+    -> { array.send(@method, 1, obj) }.should.raise(RangeError)
   end
 
   it "raises a type error if a range is passed with a length" do
-    ->{ [1, 2, 3].send(@method, 1..2, 1) }.should raise_error(TypeError)
+    ->{ [1, 2, 3].send(@method, 1..2, 1) }.should.raise(TypeError)
   end
 
   it "raises a RangeError if passed a range with a bound that is too large" do
     array = [1, 2, 3, 4, 5, 6]
-    -> { array.send(@method, bignum_value..(bignum_value + 1)) }.should raise_error(RangeError)
-    -> { array.send(@method, 0..bignum_value) }.should raise_error(RangeError)
+    -> { array.send(@method, bignum_value..(bignum_value + 1)) }.should.raise(RangeError)
+    -> { array.send(@method, 0..bignum_value) }.should.raise(RangeError)
   end
 
   it "can accept endless ranges" do
@@ -718,17 +718,17 @@ def to.to_int() -2 end
     it "has range with bounds outside of array" do
       # end is equal to array's length
       @array.send(@method, (0..6).step(1)).should == [0, 1, 2, 3, 4, 5]
-      -> { @array.send(@method, (0..6).step(2)) }.should raise_error(RangeError)
+      -> { @array.send(@method, (0..6).step(2)) }.should.raise(RangeError)
 
       # end is greater than length with positive steps
       @array.send(@method, (1..6).step(2)).should == [1, 3, 5]
       @array.send(@method, (2..7).step(2)).should == [2, 4]
-      -> { @array.send(@method, (2..8).step(2)) }.should raise_error(RangeError)
+      -> { @array.send(@method, (2..8).step(2)) }.should.raise(RangeError)
 
       # begin is greater than length with negative steps
       @array.send(@method, (6..1).step(-2)).should == [5, 3, 1]
       @array.send(@method, (7..2).step(-2)).should == [5, 3]
-      -> { @array.send(@method, (8..2).step(-2)) }.should raise_error(RangeError)
+      -> { @array.send(@method, (8..2).step(-2)) }.should.raise(RangeError)
     end
 
     it "has endless range with start outside of array's bounds" do
@@ -736,7 +736,7 @@ def to.to_int() -2 end
       @array.send(@method, eval("(7..).step(1)")).should == nil
 
       @array.send(@method, eval("(6..).step(2)")).should == []
-      -> { @array.send(@method, eval("(7..).step(2)")) }.should raise_error(RangeError)
+      -> { @array.send(@method, eval("(7..).step(2)")) }.should.raise(RangeError)
     end
   end
 
diff --git a/spec/ruby/core/array/shared/union.rb b/spec/ruby/core/array/shared/union.rb
index 0b60df9ca4d..0b225b9a312 100644
--- a/spec/ruby/core/array/shared/union.rb
+++ b/spec/ruby/core/array/shared/union.rb
@@ -60,9 +60,9 @@
   end
 
   it "does not return subclass instances for Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].send(@method, []).should be_an_instance_of(Array)
-    ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should be_an_instance_of(Array)
-    [].send(@method, ArraySpecs::MyArray[1, 2, 3]).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].send(@method, []).should.instance_of?(Array)
+    ArraySpecs::MyArray[1, 2, 3].send(@method, ArraySpecs::MyArray[1, 2, 3]).should.instance_of?(Array)
+    [].send(@method, ArraySpecs::MyArray[1, 2, 3]).should.instance_of?(Array)
   end
 
   it "does not call to_ary on array subclasses" do
diff --git a/spec/ruby/core/array/shared/unshift.rb b/spec/ruby/core/array/shared/unshift.rb
index 9e0fe7556a4..b636347cd36 100644
--- a/spec/ruby/core/array/shared/unshift.rb
+++ b/spec/ruby/core/array/shared/unshift.rb
@@ -1,9 +1,9 @@
 describe :array_unshift, shared: true do
   it "prepends object to the original array" do
     a = [1, 2, 3]
-    a.send(@method, "a").should equal(a)
+    a.send(@method, "a").should.equal?(a)
     a.should == ['a', 1, 2, 3]
-    a.send(@method).should equal(a)
+    a.send(@method).should.equal?(a)
     a.should == ['a', 1, 2, 3]
     a.send(@method, 5, 4, 3)
     a.should == [5, 4, 3, 'a', 1, 2, 3]
@@ -41,12 +41,12 @@
   end
 
   it "raises a FrozenError on a frozen array when the array is modified" do
-    -> { ArraySpecs.frozen_array.send(@method, 1) }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.send(@method, 1) }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError on a frozen array when the array would not be modified" do
-    -> { ArraySpecs.frozen_array.send(@method) }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.send(@method) }.should.raise(FrozenError)
   end
 
   # https://github.com/truffleruby/truffleruby/issues/2772
diff --git a/spec/ruby/core/array/shift_spec.rb b/spec/ruby/core/array/shift_spec.rb
index 6b4ef39f77c..09dfa79c45f 100644
--- a/spec/ruby/core/array/shift_spec.rb
+++ b/spec/ruby/core/array/shift_spec.rb
@@ -31,10 +31,10 @@
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.shift }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.shift }.should.raise(FrozenError)
   end
   it "raises a FrozenError on an empty frozen array" do
-    -> { ArraySpecs.empty_frozen_array.shift }.should raise_error(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.shift }.should.raise(FrozenError)
   end
 
   describe "passed a number n as an argument" do
@@ -72,7 +72,7 @@
       popped2.should == []
       a.should == []
 
-      popped1.should_not equal(popped2)
+      popped1.should_not.equal?(popped2)
     end
 
     it "returns whole elements if n exceeds size of the array" do
@@ -83,14 +83,14 @@
 
     it "does not return self even when it returns whole elements" do
       a = [1, 2, 3, 4, 5]
-      a.shift(5).should_not equal(a)
+      a.shift(5).should_not.equal?(a)
 
       a = [1, 2, 3, 4, 5]
-      a.shift(6).should_not equal(a)
+      a.shift(6).should_not.equal?(a)
     end
 
     it "raises an ArgumentError if n is negative" do
-      ->{ [1, 2, 3].shift(-1) }.should raise_error(ArgumentError)
+      ->{ [1, 2, 3].shift(-1) }.should.raise(ArgumentError)
     end
 
     it "tries to convert n to an Integer using #to_int" do
@@ -105,16 +105,16 @@
     end
 
     it "raises a TypeError when the passed n cannot be coerced to Integer" do
-      ->{ [1, 2].shift("cat") }.should raise_error(TypeError)
-      ->{ [1, 2].shift(nil) }.should raise_error(TypeError)
+      ->{ [1, 2].shift("cat") }.should.raise(TypeError)
+      ->{ [1, 2].shift(nil) }.should.raise(TypeError)
     end
 
     it "raises an ArgumentError if more arguments are passed" do
-      ->{ [1, 2].shift(1, 2) }.should raise_error(ArgumentError)
+      ->{ [1, 2].shift(1, 2) }.should.raise(ArgumentError)
     end
 
     it "does not return subclass instances with Array subclass" do
-      ArraySpecs::MyArray[1, 2, 3].shift(2).should be_an_instance_of(Array)
+      ArraySpecs::MyArray[1, 2, 3].shift(2).should.instance_of?(Array)
     end
   end
 end
diff --git a/spec/ruby/core/array/shuffle_spec.rb b/spec/ruby/core/array/shuffle_spec.rb
index b84394bcb5b..9bc9df73ac2 100644
--- a/spec/ruby/core/array/shuffle_spec.rb
+++ b/spec/ruby/core/array/shuffle_spec.rb
@@ -10,7 +10,7 @@
       s.sort.should == a
       different ||= (a != s)
     end
-    different.should be_true # Will fail once in a blue moon (4!^10)
+    different.should == true # Will fail once in a blue moon (4!^10)
   end
 
   it "is not destructive" do
@@ -22,7 +22,7 @@
   end
 
   it "does not return subclass instances with Array subclass" do
-    ArraySpecs::MyArray[1, 2, 3].shuffle.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].shuffle.should.instance_of?(Array)
   end
 
   it "calls #rand on the Object passed by the :random key in the arguments Hash" do
@@ -31,24 +31,24 @@
 
     result = [1, 2].shuffle(random: obj)
     result.size.should == 2
-    result.should include(1, 2)
+    result.sort.should == [1, 2]
   end
 
   it "raises a NoMethodError if an object passed for the RNG does not define #rand" do
     obj = BasicObject.new
 
-    -> { [1, 2].shuffle(random: obj) }.should raise_error(NoMethodError)
+    -> { [1, 2].shuffle(random: obj) }.should.raise(NoMethodError)
   end
 
   it "accepts a Float for the value returned by #rand" do
     random = mock("array_shuffle_random")
     random.should_receive(:rand).at_least(1).times.and_return(0.3)
 
-    [1, 2].shuffle(random: random).should be_an_instance_of(Array)
+    [1, 2].shuffle(random: random).should.instance_of?(Array)
   end
 
   it "accepts a Random class for the value for random: argument" do
-    [1, 2].shuffle(random: Random).should be_an_instance_of(Array)
+    [1, 2].shuffle(random: Random).should.instance_of?(Array)
   end
 
   it "calls #to_int on the Object returned by #rand" do
@@ -57,7 +57,7 @@
     random = mock("array_shuffle_random")
     random.should_receive(:rand).at_least(1).times.and_return(value)
 
-    [1, 2].shuffle(random: random).should be_an_instance_of(Array)
+    [1, 2].shuffle(random: random).should.instance_of?(Array)
   end
 
   it "raises a RangeError if the value is less than zero" do
@@ -66,7 +66,7 @@
     random = mock("array_shuffle_random")
     random.should_receive(:rand).and_return(value)
 
-    -> { [1, 2].shuffle(random: random) }.should raise_error(RangeError)
+    -> { [1, 2].shuffle(random: random) }.should.raise(RangeError)
   end
 
   it "raises a RangeError if the value is equal to the Array size" do
@@ -75,7 +75,7 @@
     random = mock("array_shuffle_random")
     random.should_receive(:rand).at_least(1).times.and_return(value)
 
-    -> { [1, 2].shuffle(random: random) }.should raise_error(RangeError)
+    -> { [1, 2].shuffle(random: random) }.should.raise(RangeError)
   end
 
   it "raises a RangeError if the value is greater than the Array size" do
@@ -84,7 +84,7 @@
     random = mock("array_shuffle_random")
     random.should_receive(:rand).at_least(1).times.and_return(value)
 
-    -> { [1, 2].shuffle(random: random) }.should raise_error(RangeError)
+    -> { [1, 2].shuffle(random: random) }.should.raise(RangeError)
   end
 end
 
@@ -98,13 +98,13 @@
       a.sort.should == [1, 2, 3, 4]
       different ||= (a != [1, 2, 3, 4])
     end
-    different.should be_true # Will fail once in a blue moon (4!^10)
-    a.should equal(original)
+    different.should == true # Will fail once in a blue moon (4!^10)
+    a.should.equal?(original)
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.shuffle! }.should raise_error(FrozenError)
-    -> { ArraySpecs.empty_frozen_array.shuffle! }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.shuffle! }.should.raise(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.shuffle! }.should.raise(FrozenError)
   end
 
   it "matches CRuby with random:" do
diff --git a/spec/ruby/core/array/slice_spec.rb b/spec/ruby/core/array/slice_spec.rb
index 731c1292512..eb7e47d9476 100644
--- a/spec/ruby/core/array/slice_spec.rb
+++ b/spec/ruby/core/array/slice_spec.rb
@@ -116,8 +116,8 @@ def to.to_int() -2 end
     a.slice!(from .. to).should == [2, 3, 4]
     a.should == [1, 5]
 
-    -> { a.slice!("a" .. "b")  }.should raise_error(TypeError)
-    -> { a.slice!(from .. "b") }.should raise_error(TypeError)
+    -> { a.slice!("a" .. "b")  }.should.raise(TypeError)
+    -> { a.slice!(from .. "b") }.should.raise(TypeError)
   end
 
   it "returns last element for consecutive calls at zero index" do
@@ -151,7 +151,7 @@ def to.to_int() -2 end
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.slice!(0, 0) }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.slice!(0, 0) }.should.raise(FrozenError)
   end
 
   it "works with endless ranges" do
@@ -188,27 +188,27 @@ def to.to_int() -2 end
     end
 
     it "returns a Array instance with [n, m]" do
-      @array.slice!(0, 2).should be_an_instance_of(Array)
+      @array.slice!(0, 2).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [-n, m]" do
-      @array.slice!(-3, 2).should be_an_instance_of(Array)
+      @array.slice!(-3, 2).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [n..m]" do
-      @array.slice!(1..3).should be_an_instance_of(Array)
+      @array.slice!(1..3).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [n...m]" do
-      @array.slice!(1...3).should be_an_instance_of(Array)
+      @array.slice!(1...3).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [-n..-m]" do
-      @array.slice!(-3..-1).should be_an_instance_of(Array)
+      @array.slice!(-3..-1).should.instance_of?(Array)
     end
 
     it "returns a Array instance with [-n...-m]" do
-      @array.slice!(-3...-1).should be_an_instance_of(Array)
+      @array.slice!(-3...-1).should.instance_of?(Array)
     end
   end
 end
diff --git a/spec/ruby/core/array/sort_by_spec.rb b/spec/ruby/core/array/sort_by_spec.rb
index 0334f953f6c..132abb028a2 100644
--- a/spec/ruby/core/array/sort_by_spec.rb
+++ b/spec/ruby/core/array/sort_by_spec.rb
@@ -11,30 +11,30 @@
   end
 
   it "returns an Enumerator if not given a block" do
-    (1..10).to_a.sort_by!.should be_an_instance_of(Enumerator)
+    (1..10).to_a.sort_by!.should.instance_of?(Enumerator)
   end
 
   it "completes when supplied a block that always returns the same result" do
     a = [2, 3, 5, 1, 4]
     a.sort_by!{  1 }
-    a.should be_an_instance_of(Array)
+    a.should.instance_of?(Array)
     a.sort_by!{  0 }
-    a.should be_an_instance_of(Array)
+    a.should.instance_of?(Array)
     a.sort_by!{ -1 }
-    a.should be_an_instance_of(Array)
+    a.should.instance_of?(Array)
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.sort_by! {}}.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.sort_by! {}}.should.raise(FrozenError)
   end
 
   it "raises a FrozenError on an empty frozen array" do
-    -> { ArraySpecs.empty_frozen_array.sort_by! {}}.should raise_error(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.sort_by! {}}.should.raise(FrozenError)
   end
 
   it "raises a FrozenError on a frozen array only during iteration if called without a block" do
     enum = ArraySpecs.frozen_array.sort_by!
-    -> { enum.each {} }.should raise_error(FrozenError)
+    -> { enum.each {} }.should.raise(FrozenError)
   end
 
   it "returns the specified value when it would break in the given block" do
@@ -47,7 +47,7 @@
       ary.sort_by!{|x,y| break if x==i; x<=>y}
       ary
     }
-    partially_sorted.any?{|ary| ary != [1, 2, 3, 4, 5]}.should be_true
+    partially_sorted.any?{|ary| ary != [1, 2, 3, 4, 5]}.should == true
   end
 
   it "changes nothing when called on a single element array" do
diff --git a/spec/ruby/core/array/sort_spec.rb b/spec/ruby/core/array/sort_spec.rb
index e20b6505164..27300c33853 100644
--- a/spec/ruby/core/array/sort_spec.rb
+++ b/spec/ruby/core/array/sort_spec.rb
@@ -42,7 +42,7 @@
     a = [1, 2, 3]
     sorted = a.sort
     sorted.should == a
-    sorted.should_not equal(a)
+    sorted.should_not.equal?(a)
   end
 
   it "properly handles recursive arrays" do
@@ -68,7 +68,7 @@
 
     -> {
       [o, 1].sort
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "may take a block which is used to determine the order of objects a and b described as -1, 0 or +1" do
@@ -78,28 +78,28 @@
   end
 
   it "raises an error when a given block returns nil" do
-    -> { [1, 2].sort {} }.should raise_error(ArgumentError)
+    -> { [1, 2].sort {} }.should.raise(ArgumentError)
   end
 
   it "does not call #<=> on contained objects when invoked with a block" do
     a = Array.new(25)
     (0...25).each {|i| a[i] = ArraySpecs::UFOSceptic.new }
 
-    a.sort { -1 }.should be_an_instance_of(Array)
+    a.sort { -1 }.should.instance_of?(Array)
   end
 
   it "does not call #<=> on elements when invoked with a block even if Array is large (Rubinius #412)" do
     a = Array.new(1500)
     (0...1500).each {|i| a[i] = ArraySpecs::UFOSceptic.new }
 
-    a.sort { -1 }.should be_an_instance_of(Array)
+    a.sort { -1 }.should.instance_of?(Array)
   end
 
   it "completes when supplied a block that always returns the same result" do
     a = [2, 3, 5, 1, 4]
-    a.sort {  1 }.should be_an_instance_of(Array)
-    a.sort {  0 }.should be_an_instance_of(Array)
-    a.sort { -1 }.should be_an_instance_of(Array)
+    a.sort {  1 }.should.instance_of?(Array)
+    a.sort {  0 }.should.instance_of?(Array)
+    a.sort { -1 }.should.instance_of?(Array)
   end
 
   it "does not freezes self during being sorted" do
@@ -136,7 +136,7 @@ class Integer
     }.should == [-4, 1, 2, 5, 7, 10, 12]
     -> {
       a.sort { |n, m| (n - m).to_s }
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "sorts an array that has a value shifted off without a block" do
@@ -155,7 +155,7 @@ class Integer
 
   it "raises an error if objects can't be compared" do
     a=[ArraySpecs::Uncomparable.new, ArraySpecs::Uncomparable.new]
-    -> {a.sort}.should raise_error(ArgumentError)
+    -> {a.sort}.should.raise(ArgumentError)
   end
 
   # From a strange Rubinius bug
@@ -166,7 +166,7 @@ class Integer
 
   it "does not return subclass instance on Array subclasses" do
     ary = ArraySpecs::MyArray[1, 2, 3]
-    ary.sort.should be_an_instance_of(Array)
+    ary.sort.should.instance_of?(Array)
   end
 end
 
@@ -184,13 +184,13 @@ class Integer
 
   it "returns self if the order of elements changed" do
     a = [6, 7, 2, 3, 7]
-    a.sort!.should equal(a)
+    a.sort!.should.equal?(a)
     a.should == [2, 3, 6, 7, 7]
   end
 
   it "returns self even if makes no modification" do
     a = [1, 2, 3, 4, 5]
-    a.sort!.should equal(a)
+    a.sort!.should.equal?(a)
     a.should == [1, 2, 3, 4, 5]
   end
 
@@ -216,25 +216,25 @@ class Integer
     a = Array.new(25)
     (0...25).each {|i| a[i] = ArraySpecs::UFOSceptic.new }
 
-    a.sort! { -1 }.should be_an_instance_of(Array)
+    a.sort! { -1 }.should.instance_of?(Array)
   end
 
   it "does not call #<=> on elements when invoked with a block even if Array is large (Rubinius #412)" do
     a = Array.new(1500)
     (0...1500).each {|i| a[i] = ArraySpecs::UFOSceptic.new }
 
-    a.sort! { -1 }.should be_an_instance_of(Array)
+    a.sort! { -1 }.should.instance_of?(Array)
   end
 
   it "completes when supplied a block that always returns the same result" do
     a = [2, 3, 5, 1, 4]
-    a.sort!{  1 }.should be_an_instance_of(Array)
-    a.sort!{  0 }.should be_an_instance_of(Array)
-    a.sort!{ -1 }.should be_an_instance_of(Array)
+    a.sort!{  1 }.should.instance_of?(Array)
+    a.sort!{  0 }.should.instance_of?(Array)
+    a.sort!{ -1 }.should.instance_of?(Array)
   end
 
   it "raises a FrozenError on a frozen array" do
-    -> { ArraySpecs.frozen_array.sort! }.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.sort! }.should.raise(FrozenError)
   end
 
   it "returns the specified value when it would break in the given block" do
@@ -247,6 +247,6 @@ class Integer
       ary.sort!{|x,y| break if x==i; x<=>y}
       ary
     }
-    partially_sorted.any?{|ary| ary != [1, 2, 3, 4, 5]}.should be_true
+    partially_sorted.any?{|ary| ary != [1, 2, 3, 4, 5]}.should == true
   end
 end
diff --git a/spec/ruby/core/array/sum_spec.rb b/spec/ruby/core/array/sum_spec.rb
index 1886d692faa..cd4ba4c2d8e 100644
--- a/spec/ruby/core/array/sum_spec.rb
+++ b/spec/ruby/core/array/sum_spec.rb
@@ -60,11 +60,11 @@
   end
 
   it 'raises TypeError if any element are not numeric' do
-    -> { ["a"].sum }.should raise_error(TypeError)
+    -> { ["a"].sum }.should.raise(TypeError)
   end
 
   it 'raises TypeError if any element cannot be added to init value' do
-    -> { [1].sum([]) }.should raise_error(TypeError)
+    -> { [1].sum([]) }.should.raise(TypeError)
   end
 
   it "calls + to sum the elements" do
diff --git a/spec/ruby/core/array/take_spec.rb b/spec/ruby/core/array/take_spec.rb
index c4f0ac9aa46..837c734b77c 100644
--- a/spec/ruby/core/array/take_spec.rb
+++ b/spec/ruby/core/array/take_spec.rb
@@ -23,10 +23,10 @@
   end
 
   it "raises an ArgumentError when the argument is negative" do
-    ->{ [1].take(-3) }.should raise_error(ArgumentError)
+    ->{ [1].take(-3) }.should.raise(ArgumentError)
   end
 
   it 'returns a Array instance for Array subclasses' do
-    ArraySpecs::MyArray[1, 2, 3, 4, 5].take(1).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3, 4, 5].take(1).should.instance_of?(Array)
   end
 end
diff --git a/spec/ruby/core/array/take_while_spec.rb b/spec/ruby/core/array/take_while_spec.rb
index 8f50260b42a..7811edab9e0 100644
--- a/spec/ruby/core/array/take_while_spec.rb
+++ b/spec/ruby/core/array/take_while_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it 'returns a Array instance for Array subclasses' do
-    ArraySpecs::MyArray[1, 2, 3, 4, 5].take_while { |n| n < 4 }.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3, 4, 5].take_while { |n| n < 4 }.should.instance_of?(Array)
   end
 end
 
diff --git a/spec/ruby/core/array/to_a_spec.rb b/spec/ruby/core/array/to_a_spec.rb
index 49d0a4782e3..078de1638a1 100644
--- a/spec/ruby/core/array/to_a_spec.rb
+++ b/spec/ruby/core/array/to_a_spec.rb
@@ -5,12 +5,12 @@
   it "returns self" do
     a = [1, 2, 3]
     a.to_a.should == [1, 2, 3]
-    a.should equal(a.to_a)
+    a.should.equal?(a.to_a)
   end
 
   it "does not return subclass instance on Array subclasses" do
     e = ArraySpecs::MyArray.new(1, 2)
-    e.to_a.should be_an_instance_of(Array)
+    e.to_a.should.instance_of?(Array)
     e.to_a.should == [1, 2]
   end
 
diff --git a/spec/ruby/core/array/to_ary_spec.rb b/spec/ruby/core/array/to_ary_spec.rb
index 314699b709a..dc5193158db 100644
--- a/spec/ruby/core/array/to_ary_spec.rb
+++ b/spec/ruby/core/array/to_ary_spec.rb
@@ -4,9 +4,9 @@
 describe "Array#to_ary" do
   it "returns self" do
     a = [1, 2, 3]
-    a.should equal(a.to_ary)
+    a.should.equal?(a.to_ary)
     a = ArraySpecs::MyArray[1, 2, 3]
-    a.should equal(a.to_ary)
+    a.should.equal?(a.to_ary)
   end
 
   it "properly handles recursive arrays" do
diff --git a/spec/ruby/core/array/to_h_spec.rb b/spec/ruby/core/array/to_h_spec.rb
index 1c814f3d012..1d626763c2f 100644
--- a/spec/ruby/core/array/to_h_spec.rb
+++ b/spec/ruby/core/array/to_h_spec.rb
@@ -25,19 +25,19 @@
   end
 
   it "raises TypeError if an element is not an array" do
-    -> { [:x].to_h }.should raise_error(TypeError)
+    -> { [:x].to_h }.should.raise(TypeError)
   end
 
   it "raises ArgumentError if an element is not a [key, value] pair" do
-    -> { [[:x]].to_h }.should raise_error(ArgumentError)
+    -> { [[:x]].to_h }.should.raise(ArgumentError)
   end
 
   it "does not accept arguments" do
-    -> { [].to_h(:a, :b) }.should raise_error(ArgumentError)
+    -> { [].to_h(:a, :b) }.should.raise(ArgumentError)
   end
 
   it "produces a hash that returns nil for a missing element" do
-    [[:a, 1], [:b, 2]].to_h[:c].should be_nil
+    [[:a, 1], [:b, 2]].to_h[:c].should == nil
   end
 
   context "with block" do
@@ -54,17 +54,17 @@
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         [:a, :b].to_h { |k| [k, k.to_s, 1] }
-      end.should raise_error(ArgumentError, /wrong array length at 0/)
+      end.should.raise(ArgumentError, /wrong array length at 0/)
 
       -> do
         [:a, :b].to_h { |k| [k] }
-      end.should raise_error(ArgumentError, /wrong array length at 0/)
+      end.should.raise(ArgumentError, /wrong array length at 0/)
     end
 
     it "raises TypeError if block returns something other than Array" do
       -> do
         [:a, :b].to_h { |k| "not-array" }
-      end.should raise_error(TypeError, /wrong element type String at 0/)
+      end.should.raise(TypeError, /wrong element type String at 0/)
     end
 
     it "coerces returned pair to Array with #to_ary" do
@@ -80,7 +80,7 @@
 
       -> do
         [:a].to_h { |k| x }
-      end.should raise_error(TypeError, /wrong element type MockObject at 0/)
+      end.should.raise(TypeError, /wrong element type MockObject at 0/)
     end
   end
 end
diff --git a/spec/ruby/core/array/transpose_spec.rb b/spec/ruby/core/array/transpose_spec.rb
index b39077f4c9d..d45e9c351ca 100644
--- a/spec/ruby/core/array/transpose_spec.rb
+++ b/spec/ruby/core/array/transpose_spec.rb
@@ -32,7 +32,7 @@
   end
 
   it "raises a TypeError if the passed Argument does not respond to #to_ary" do
-    -> { [Object.new, [:a, :b]].transpose }.should raise_error(TypeError)
+    -> { [Object.new, [:a, :b]].transpose }.should.raise(TypeError)
   end
 
   it "does not call to_ary on array subclass elements" do
@@ -41,13 +41,13 @@
   end
 
   it "raises an IndexError if the arrays are not of the same length" do
-    -> { [[1, 2], [:a]].transpose }.should raise_error(IndexError)
+    -> { [[1, 2], [:a]].transpose }.should.raise(IndexError)
   end
 
   it "does not return subclass instance on Array subclasses" do
     result = ArraySpecs::MyArray[ArraySpecs::MyArray[1, 2, 3], ArraySpecs::MyArray[4, 5, 6]].transpose
-    result.should be_an_instance_of(Array)
-    result[0].should be_an_instance_of(Array)
-    result[1].should be_an_instance_of(Array)
+    result.should.instance_of?(Array)
+    result[0].should.instance_of?(Array)
+    result[1].should.instance_of?(Array)
   end
 end
diff --git a/spec/ruby/core/array/try_convert_spec.rb b/spec/ruby/core/array/try_convert_spec.rb
index bea88150065..3eaa0f4b7c2 100644
--- a/spec/ruby/core/array/try_convert_spec.rb
+++ b/spec/ruby/core/array/try_convert_spec.rb
@@ -4,47 +4,47 @@
 describe "Array.try_convert" do
   it "returns the argument if it's an Array" do
     x = Array.new
-    Array.try_convert(x).should equal(x)
+    Array.try_convert(x).should.equal?(x)
   end
 
   it "returns the argument if it's a kind of Array" do
     x = ArraySpecs::MyArray[]
-    Array.try_convert(x).should equal(x)
+    Array.try_convert(x).should.equal?(x)
   end
 
   it "returns nil when the argument does not respond to #to_ary" do
-    Array.try_convert(Object.new).should be_nil
+    Array.try_convert(Object.new).should == nil
   end
 
   it "sends #to_ary to the argument and returns the result if it's nil" do
     obj = mock("to_ary")
     obj.should_receive(:to_ary).and_return(nil)
-    Array.try_convert(obj).should be_nil
+    Array.try_convert(obj).should == nil
   end
 
   it "sends #to_ary to the argument and returns the result if it's an Array" do
     x = Array.new
     obj = mock("to_ary")
     obj.should_receive(:to_ary).and_return(x)
-    Array.try_convert(obj).should equal(x)
+    Array.try_convert(obj).should.equal?(x)
   end
 
   it "sends #to_ary to the argument and returns the result if it's a kind of Array" do
     x = ArraySpecs::MyArray[]
     obj = mock("to_ary")
     obj.should_receive(:to_ary).and_return(x)
-    Array.try_convert(obj).should equal(x)
+    Array.try_convert(obj).should.equal?(x)
   end
 
   it "sends #to_ary to the argument and raises TypeError if it's not a kind of Array" do
     obj = mock("to_ary")
     obj.should_receive(:to_ary).and_return(Object.new)
-    -> { Array.try_convert obj }.should raise_error(TypeError, "can't convert MockObject to Array (MockObject#to_ary gives Object)")
+    -> { Array.try_convert obj }.should raise_consistent_error(TypeError, "can't convert MockObject into Array (MockObject#to_ary gives Object)")
   end
 
   it "does not rescue exceptions raised by #to_ary" do
     obj = mock("to_ary")
     obj.should_receive(:to_ary).and_raise(RuntimeError)
-    -> { Array.try_convert obj }.should raise_error(RuntimeError)
+    -> { Array.try_convert obj }.should.raise(RuntimeError)
   end
 end
diff --git a/spec/ruby/core/array/union_spec.rb b/spec/ruby/core/array/union_spec.rb
index ba2cc0d6b7d..110894e83d3 100644
--- a/spec/ruby/core/array/union_spec.rb
+++ b/spec/ruby/core/array/union_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it "does not return subclass instances for Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].union.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].union.should.instance_of?(Array)
   end
 
   it "accepts multiple arguments" do
diff --git a/spec/ruby/core/array/uniq_spec.rb b/spec/ruby/core/array/uniq_spec.rb
index d5d826db15b..0289bee7c2c 100644
--- a/spec/ruby/core/array/uniq_spec.rb
+++ b/spec/ruby/core/array/uniq_spec.rb
@@ -86,7 +86,7 @@ def obj.eql?(o)
   end
 
   it "returns Array instance on Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].uniq.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].uniq.should.instance_of?(Array)
   end
 
   it "properly handles an identical item even when its #eql? isn't reflexive" do
@@ -138,7 +138,7 @@ def hash
 
   it "returns self" do
     a = [ "a", "a", "b", "b", "c" ]
-    a.should equal(a.uniq!)
+    a.should.equal?(a.uniq!)
   end
 
   it "properly handles recursive arrays" do
@@ -185,17 +185,17 @@ def hash
   it "raises a FrozenError on a frozen array when the array is modified" do
     dup_ary = [1, 1, 2]
     dup_ary.freeze
-    -> { dup_ary.uniq! }.should raise_error(FrozenError)
+    -> { dup_ary.uniq! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError on a frozen array when the array would not be modified" do
-    -> { ArraySpecs.frozen_array.uniq!}.should raise_error(FrozenError)
-    -> { ArraySpecs.empty_frozen_array.uniq!}.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.uniq!}.should.raise(FrozenError)
+    -> { ArraySpecs.empty_frozen_array.uniq!}.should.raise(FrozenError)
   end
 
   it "doesn't yield to the block on a frozen array" do
-    -> { ArraySpecs.frozen_array.uniq!{ raise RangeError, "shouldn't yield"}}.should raise_error(FrozenError)
+    -> { ArraySpecs.frozen_array.uniq!{ raise RangeError, "shouldn't yield"}}.should.raise(FrozenError)
   end
 
   it "compares elements based on the value returned from the block" do
diff --git a/spec/ruby/core/array/values_at_spec.rb b/spec/ruby/core/array/values_at_spec.rb
index e85bbee400b..e11e7e4451c 100644
--- a/spec/ruby/core/array/values_at_spec.rb
+++ b/spec/ruby/core/array/values_at_spec.rb
@@ -59,7 +59,7 @@ def to.to_int() -2 end
   end
 
   it "does not return subclass instance on Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].values_at(0, 1..2, 1).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].values_at(0, 1..2, 1).should.instance_of?(Array)
   end
 
   it "works when given endless ranges" do
diff --git a/spec/ruby/core/array/zip_spec.rb b/spec/ruby/core/array/zip_spec.rb
index 2a0f64cb491..3ccdf143d69 100644
--- a/spec/ruby/core/array/zip_spec.rb
+++ b/spec/ruby/core/array/zip_spec.rb
@@ -60,12 +60,12 @@ def obj.each
   end
 
   it "does not return subclass instance on Array subclasses" do
-    ArraySpecs::MyArray[1, 2, 3].zip(["a", "b"]).should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].zip(["a", "b"]).should.instance_of?(Array)
   end
 
   it "raises TypeError when some argument isn't Array and doesn't respond to #to_ary and #to_enum" do
-    -> { [1, 2, 3].zip(Object.new) }.should raise_error(TypeError, "wrong argument type Object (must respond to :each)")
-    -> { [1, 2, 3].zip(1) }.should raise_error(TypeError, "wrong argument type Integer (must respond to :each)")
-    -> { [1, 2, 3].zip(true) }.should raise_error(TypeError, "wrong argument type TrueClass (must respond to :each)")
+    -> { [1, 2, 3].zip(Object.new) }.should.raise(TypeError, "wrong argument type Object (must respond to :each)")
+    -> { [1, 2, 3].zip(1) }.should.raise(TypeError, "wrong argument type Integer (must respond to :each)")
+    -> { [1, 2, 3].zip(true) }.should.raise(TypeError, "wrong argument type TrueClass (must respond to :each)")
   end
 end
diff --git a/spec/ruby/core/basicobject/__send___spec.rb b/spec/ruby/core/basicobject/__send___spec.rb
index 005b1d0d908..2f814e448ca 100644
--- a/spec/ruby/core/basicobject/__send___spec.rb
+++ b/spec/ruby/core/basicobject/__send___spec.rb
@@ -3,7 +3,7 @@
 
 describe "BasicObject#__send__" do
   it "is a public instance method" do
-    BasicObject.should have_public_instance_method(:__send__)
+    BasicObject.public_instance_methods(false).should.include?(:__send__)
   end
 
   it_behaves_like :basicobject_send, :__send__
diff --git a/spec/ruby/core/basicobject/basicobject_spec.rb b/spec/ruby/core/basicobject/basicobject_spec.rb
index 27a322e72cf..af28de0687a 100644
--- a/spec/ruby/core/basicobject/basicobject_spec.rb
+++ b/spec/ruby/core/basicobject/basicobject_spec.rb
@@ -8,23 +8,23 @@
   end
 
   it "raises NameError when referencing built-in constants" do
-    -> { class BasicObjectSpecs::BOSubclass; Kernel; end }.should raise_error(NameError)
+    -> { class BasicObjectSpecs::BOSubclass; Kernel; end }.should.raise(NameError)
   end
 
   it "does not define built-in constants (according to const_defined?)" do
-    BasicObject.const_defined?(:Kernel).should be_false
+    BasicObject.const_defined?(:Kernel).should == false
   end
 
   it "does not define built-in constants (according to defined?)" do
-    BasicObjectSpecs::BOSubclass.kernel_defined?.should be_nil
+    BasicObjectSpecs::BOSubclass.kernel_defined?.should == nil
   end
 
   it "is included in Object's list of constants" do
-    Object.constants(false).should include(:BasicObject)
+    Object.constants(false).should.include?(:BasicObject)
   end
 
   it "includes itself in its list of constants" do
-    BasicObject.constants(false).should include(:BasicObject)
+    BasicObject.constants(false).should.include?(:BasicObject)
   end
 end
 
@@ -34,11 +34,11 @@
   end
 
   it "is an instance of Class" do
-    @meta.should be_an_instance_of(Class)
+    @meta.should.instance_of?(Class)
   end
 
   it "has Class as superclass" do
-    @meta.superclass.should equal(Class)
+    @meta.superclass.should.equal?(Class)
   end
 
   it "contains methods for the BasicObject class" do
@@ -57,11 +57,11 @@ def rubyspec_test_method() :test end
   end
 
   it "is an instance of Class" do
-    @meta.should be_an_instance_of(Class)
+    @meta.should.instance_of?(Class)
   end
 
   it "has BasicObject as superclass" do
-    @meta.superclass.should equal(BasicObject)
+    @meta.superclass.should.equal?(BasicObject)
   end
 
   it "contains methods defined for the BasicObject instance" do
@@ -85,7 +85,7 @@ def test_method() :test end
 
   describe "BasicObject references" do
     it "can refer to BasicObject from within itself" do
-      -> { BasicObject::BasicObject }.should_not raise_error
+      -> { BasicObject::BasicObject }.should_not.raise
     end
   end
 end
diff --git a/spec/ruby/core/basicobject/equal_spec.rb b/spec/ruby/core/basicobject/equal_spec.rb
index ce28eaed955..c0f41dc0c0a 100644
--- a/spec/ruby/core/basicobject/equal_spec.rb
+++ b/spec/ruby/core/basicobject/equal_spec.rb
@@ -3,7 +3,7 @@
 
 describe "BasicObject#equal?" do
   it "is a public instance method" do
-    BasicObject.should have_public_instance_method(:equal?)
+    BasicObject.public_instance_methods(false).should.include?(:equal?)
   end
 
   it_behaves_like :object_equal, :equal?
@@ -15,7 +15,7 @@
       def o1.__id__; 10; end
       def o2.__id__; 10; end
     }
-    o1.equal?(o2).should be_false
+    o1.equal?(o2).should == false
   end
 
   it "is unaffected by overriding object_id" do
@@ -23,7 +23,7 @@ def o2.__id__; 10; end
     o1.stub!(:object_id).and_return(10)
     o2 = mock("object")
     o2.stub!(:object_id).and_return(10)
-    o1.equal?(o2).should be_false
+    o1.equal?(o2).should == false
   end
 
   it "is unaffected by overriding ==" do
@@ -31,12 +31,12 @@ def o2.__id__; 10; end
     o1 = mock("object")
     o1.stub!(:==).and_return(true)
     o2 = mock("object")
-    o1.equal?(o2).should be_false
+    o1.equal?(o2).should == false
 
     # same objects, overriding == to return false
     o3 = mock("object")
     o3.stub!(:==).and_return(false)
-    o3.equal?(o3).should be_true
+    o3.equal?(o3).should == true
   end
 
   it "is unaffected by overriding eql?" do
@@ -44,11 +44,11 @@ def o2.__id__; 10; end
     o1 = mock("object")
     o1.stub!(:eql?).and_return(true)
     o2 = mock("object")
-    o1.equal?(o2).should be_false
+    o1.equal?(o2).should == false
 
     # same objects, overriding eql? to return false
     o3 = mock("object")
     o3.stub!(:eql?).and_return(false)
-    o3.equal?(o3).should be_true
+    o3.equal?(o3).should == true
   end
 end
diff --git a/spec/ruby/core/basicobject/equal_value_spec.rb b/spec/ruby/core/basicobject/equal_value_spec.rb
index 6c825513c19..eb951a8305f 100644
--- a/spec/ruby/core/basicobject/equal_value_spec.rb
+++ b/spec/ruby/core/basicobject/equal_value_spec.rb
@@ -3,7 +3,7 @@
 
 describe "BasicObject#==" do
   it "is a public instance method" do
-    BasicObject.should have_public_instance_method(:==)
+    BasicObject.public_instance_methods(false).should.include?(:==)
   end
 
   it_behaves_like :object_equal, :==
diff --git a/spec/ruby/core/basicobject/initialize_spec.rb b/spec/ruby/core/basicobject/initialize_spec.rb
index b7ce73ffd5c..09e86676b61 100644
--- a/spec/ruby/core/basicobject/initialize_spec.rb
+++ b/spec/ruby/core/basicobject/initialize_spec.rb
@@ -2,12 +2,12 @@
 
 describe "BasicObject#initialize" do
   it "is a private instance method" do
-    BasicObject.should have_private_instance_method(:initialize)
+    BasicObject.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "does not accept arguments" do
     -> {
       BasicObject.new("This", "makes it easier", "to call super", "from other constructors")
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/basicobject/instance_eval_spec.rb b/spec/ruby/core/basicobject/instance_eval_spec.rb
index f8d9d750592..124d179b5a2 100644
--- a/spec/ruby/core/basicobject/instance_eval_spec.rb
+++ b/spec/ruby/core/basicobject/instance_eval_spec.rb
@@ -7,31 +7,31 @@
   end
 
   it "is a public instance method" do
-    BasicObject.should have_public_instance_method(:instance_eval)
+    BasicObject.public_instance_methods(false).should.include?(:instance_eval)
   end
 
   it "sets self to the receiver in the context of the passed block" do
     a = BasicObject.new
-    a.instance_eval { self }.equal?(a).should be_true
+    a.instance_eval { self }.equal?(a).should == true
   end
 
   it "evaluates strings" do
     a = BasicObject.new
-    a.instance_eval('self').equal?(a).should be_true
+    a.instance_eval('self').equal?(a).should == true
   end
 
   it "raises an ArgumentError when no arguments and no block are given" do
-    -> { "hola".instance_eval }.should raise_error(ArgumentError, "wrong number of arguments (given 0, expected 1..3)")
+    -> { "hola".instance_eval }.should.raise(ArgumentError, "wrong number of arguments (given 0, expected 1..3)")
   end
 
   it "raises an ArgumentError when a block and normal arguments are given" do
-    -> { "hola".instance_eval(4, 5) {|a,b| a + b } }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 0)")
+    -> { "hola".instance_eval(4, 5) {|a,b| a + b } }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 0)")
   end
 
   it "raises an ArgumentError when more than 3 arguments are given" do
     -> {
       "hola".instance_eval("1 + 1", "some file", 0, "bogus")
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
   end
 
   it "yields the object to the block" do
@@ -51,7 +51,7 @@ def foo
       end
     end
     f.foo.should == 1
-    -> { Object.new.foo }.should raise_error(NoMethodError)
+    -> { Object.new.foo }.should.raise(NoMethodError)
   end
 
   it "preserves self in the original block when passed a block argument" do
@@ -71,9 +71,9 @@ def foo
 
   it "binds self to the receiver" do
     s = "hola"
-    (s == s.instance_eval { self }).should be_true
+    (s == s.instance_eval { self }).should == true
     o = mock('o')
-    (o == o.instance_eval("self")).should be_true
+    (o == o.instance_eval("self")).should == true
   end
 
   it "executes in the context of the receiver" do
@@ -95,15 +95,15 @@ def foo
   end
 
   it "raises TypeError for frozen objects when tries to set receiver's instance variables" do
-    -> { nil.instance_eval { @foo = 42 } }.should raise_error(FrozenError, "can't modify frozen NilClass: nil")
-    -> { true.instance_eval { @foo = 42 } }.should raise_error(FrozenError, "can't modify frozen TrueClass: true")
-    -> { false.instance_eval { @foo = 42 } }.should raise_error(FrozenError, "can't modify frozen FalseClass: false")
-    -> { 1.instance_eval { @foo = 42 } }.should raise_error(FrozenError, "can't modify frozen Integer: 1")
-    -> { :symbol.instance_eval { @foo = 42 } }.should raise_error(FrozenError, "can't modify frozen Symbol: :symbol")
+    -> { nil.instance_eval { @foo = 42 } }.should.raise(FrozenError, "can't modify frozen NilClass: nil")
+    -> { true.instance_eval { @foo = 42 } }.should.raise(FrozenError, "can't modify frozen TrueClass: true")
+    -> { false.instance_eval { @foo = 42 } }.should.raise(FrozenError, "can't modify frozen FalseClass: false")
+    -> { 1.instance_eval { @foo = 42 } }.should.raise(FrozenError, "can't modify frozen Integer: 1")
+    -> { :symbol.instance_eval { @foo = 42 } }.should.raise(FrozenError, "can't modify frozen Symbol: :symbol")
 
     obj = Object.new
     obj.freeze
-    -> { obj.instance_eval { @foo = 42 } }.should raise_error(FrozenError)
+    -> { obj.instance_eval { @foo = 42 } }.should.raise(FrozenError)
   end
 
   it "treats block-local variables as local to the block" do
@@ -128,7 +128,7 @@ def foo
       class B; end
       B
     }
-    obj.singleton_class.const_get(:B).should be_an_instance_of(Class)
+    obj.singleton_class.const_get(:B).should.instance_of?(Class)
   end
 
   describe "constants lookup when a String given" do
@@ -169,16 +169,16 @@ class B; end
   end
 
   it "doesn't get constants in the receiver if a block given" do
-    BasicObjectSpecs::InstEvalOuter::Inner::X_BY_BLOCK.should be_nil
+    BasicObjectSpecs::InstEvalOuter::Inner::X_BY_BLOCK.should == nil
   end
 
   it "raises a TypeError when defining methods on an immediate" do
     -> do
       1.instance_eval { def foo; end }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
     -> do
       :foo.instance_eval { def foo; end }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   describe "class variables lookup" do
@@ -217,23 +217,23 @@ class B; end
     it "does not have access to class variables in the receiver class when called with a String" do
       receiver = BasicObjectSpecs::InstEval::CVar::Get::ReceiverScope.new
       caller = BasicObjectSpecs::InstEval::CVar::Get::CallerWithoutCVarScope.new
-      -> { caller.get_class_variable_with_string(receiver) }.should raise_error(NameError, /uninitialized class variable @@cvar/)
+      -> { caller.get_class_variable_with_string(receiver) }.should.raise(NameError, /uninitialized class variable @@cvar/)
     end
 
     it "does not have access to class variables in the receiver's singleton class when called with a String" do
       receiver = BasicObjectSpecs::InstEval::CVar::Get::ReceiverWithCVarDefinedInSingletonClass
       caller = BasicObjectSpecs::InstEval::CVar::Get::CallerWithoutCVarScope.new
-      -> { caller.get_class_variable_with_string(receiver) }.should raise_error(NameError, /uninitialized class variable @@cvar/)
+      -> { caller.get_class_variable_with_string(receiver) }.should.raise(NameError, /uninitialized class variable @@cvar/)
     end
   end
 
   it "raises a TypeError when defining methods on numerics" do
     -> do
       (1.0).instance_eval { def foo; end }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
     -> do
       (1 << 64).instance_eval { def foo; end }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "evaluates procs originating from methods" do
@@ -284,7 +284,7 @@ def source_code.to_str() "1" end
     def source_code.to_str() :symbol end
 
     a = BasicObject.new
-    -> { a.instance_eval(source_code) }.should raise_error(TypeError, /can't convert Object to String/)
+    -> { a.instance_eval(source_code) }.should raise_consistent_error(TypeError, /can't convert Object into String/)
   end
 
   it "converts filename argument with #to_str method" do
@@ -303,7 +303,7 @@ def filename.to_str() "file.rb" end
     filename = Object.new
     def filename.to_str() :symbol end
 
-    -> { Object.new.instance_eval("raise", filename) }.should raise_error(TypeError, /can't convert Object to String/)
+    -> { Object.new.instance_eval("raise", filename) }.should raise_consistent_error(TypeError, /can't convert Object into String/)
   end
 
   it "converts lineno argument with #to_int method" do
@@ -322,6 +322,6 @@ def lineno.to_int() 15 end
     lineno = Object.new
     def lineno.to_int() :symbol end
 
-    -> { Object.new.instance_eval("raise", "file.rb", lineno) }.should raise_error(TypeError, /can't convert Object to Integer/)
+    -> { Object.new.instance_eval("raise", "file.rb", lineno) }.should raise_consistent_error(TypeError, /can't convert Object into Integer/)
   end
 end
diff --git a/spec/ruby/core/basicobject/instance_exec_spec.rb b/spec/ruby/core/basicobject/instance_exec_spec.rb
index 370f03d33c6..cfce9a65ade 100644
--- a/spec/ruby/core/basicobject/instance_exec_spec.rb
+++ b/spec/ruby/core/basicobject/instance_exec_spec.rb
@@ -3,21 +3,21 @@
 
 describe "BasicObject#instance_exec" do
   it "is a public instance method" do
-    BasicObject.should have_public_instance_method(:instance_exec)
+    BasicObject.public_instance_methods(false).should.include?(:instance_exec)
   end
 
   it "sets self to the receiver in the context of the passed block" do
     a = BasicObject.new
-    a.instance_exec { self }.equal?(a).should be_true
+    a.instance_exec { self }.equal?(a).should == true
   end
 
   it "passes arguments to the block" do
     a = BasicObject.new
-    a.instance_exec(1) { |b| b }.should equal(1)
+    a.instance_exec(1) { |b| b }.should.equal?(1)
   end
 
   it "raises a LocalJumpError unless given a block" do
-    -> { "hola".instance_exec }.should raise_error(LocalJumpError)
+    -> { "hola".instance_exec }.should.raise(LocalJumpError)
   end
 
   it "has an arity of -1" do
@@ -25,17 +25,23 @@
   end
 
   it "accepts arguments with a block" do
-    -> { "hola".instance_exec(4, 5) { |a,b| a + b } }.should_not raise_error
+    -> { "hola".instance_exec(4, 5) { |a,b| a + b } }.should_not.raise
   end
 
   it "doesn't pass self to the block as an argument" do
-    "hola".instance_exec { |o| o }.should be_nil
+    "hola".instance_exec { |o| o }.should == nil
   end
 
   it "passes any arguments to the block" do
     Object.new.instance_exec(1,2) {|one, two| one + two}.should == 3
   end
 
+  describe "with optional argument" do
+    it "does not destructure a single array argument" do
+      Object.new.instance_exec([1, 2, 3]) { |a = 99| a }.should == [1, 2, 3]
+    end
+  end
+
   it "only binds the exec to the receiver" do
     f = Object.new
     f.instance_exec do
@@ -44,7 +50,7 @@ def foo
       end
     end
     f.foo.should == 1
-    -> { Object.new.foo }.should raise_error(NoMethodError)
+    -> { Object.new.foo }.should.raise(NoMethodError)
   end
 
   # TODO: This should probably be replaced with a "should behave like" that uses
@@ -71,17 +77,17 @@ def foo
   end
 
   it "sets class variables in the receiver" do
-    BasicObjectSpecs::InstExec.class_variables.should include(:@@count)
+    BasicObjectSpecs::InstExec.class_variables.should.include?(:@@count)
     BasicObjectSpecs::InstExec.send(:class_variable_get, :@@count).should == 2
   end
 
   it "raises a TypeError when defining methods on an immediate" do
     -> do
       1.instance_exec { def foo; end }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
     -> do
       :foo.instance_exec { def foo; end }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   quarantine! do # Not clean, leaves cvars lying around to break other specs
@@ -99,9 +105,9 @@ def foo
   it "raises a TypeError when defining methods on numerics" do
     -> do
       (1.0).instance_exec { def foo; end }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
     -> do
       (1 << 64).instance_exec { def foo; end }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/basicobject/method_missing_spec.rb b/spec/ruby/core/basicobject/method_missing_spec.rb
index a29d4375bce..8785b41b211 100644
--- a/spec/ruby/core/basicobject/method_missing_spec.rb
+++ b/spec/ruby/core/basicobject/method_missing_spec.rb
@@ -3,7 +3,7 @@
 
 describe "BasicObject#method_missing" do
   it "is a private method" do
-    BasicObject.should have_private_instance_method(:method_missing)
+    BasicObject.private_instance_methods(false).should.include?(:method_missing)
   end
 end
 
diff --git a/spec/ruby/core/basicobject/not_equal_spec.rb b/spec/ruby/core/basicobject/not_equal_spec.rb
index 9329128c434..29b14b0fff6 100644
--- a/spec/ruby/core/basicobject/not_equal_spec.rb
+++ b/spec/ruby/core/basicobject/not_equal_spec.rb
@@ -2,24 +2,24 @@
 
 describe "BasicObject#!=" do
   it "is a public instance method" do
-    BasicObject.should have_public_instance_method(:'!=')
+    BasicObject.public_instance_methods(false).should.include?(:'!=')
   end
 
   it "returns true if other is not identical to self" do
     a = BasicObject.new
     b = BasicObject.new
-    (a != b).should be_true
+    (a != b).should == true
   end
 
   it "returns true if other is an Object" do
     a = BasicObject.new
     b = Object.new
-    (a != b).should be_true
+    (a != b).should == true
   end
 
   it "returns false if other is identical to self" do
     a = BasicObject.new
-    (a != a).should be_false
+    (a != a).should == false
   end
 
   it "dispatches to #==" do
@@ -27,19 +27,19 @@
     b = BasicObject.new
     a.should_receive(:==).and_return(true)
 
-    (a != b).should be_false
+    (a != b).should == false
   end
 
   describe "when invoked using Kernel#send" do
     it "returns true if other is not identical to self" do
       a = Object.new
       b = Object.new
-      a.send(:!=, b).should be_true
+      a.send(:!=, b).should == true
     end
 
     it "returns false if other is identical to self" do
       a = Object.new
-      a.send(:!=, a).should be_false
+      a.send(:!=, a).should == false
     end
 
     it "dispatches to #==" do
@@ -47,7 +47,7 @@
       b = Object.new
       a.should_receive(:==).and_return(true)
 
-      a.send(:!=, b).should be_false
+      a.send(:!=, b).should == false
     end
   end
 end
diff --git a/spec/ruby/core/basicobject/not_spec.rb b/spec/ruby/core/basicobject/not_spec.rb
index ca4cb6f5ffb..a6f58ae6f5d 100644
--- a/spec/ruby/core/basicobject/not_spec.rb
+++ b/spec/ruby/core/basicobject/not_spec.rb
@@ -2,10 +2,10 @@
 
 describe "BasicObject#!" do
   it "is a public instance method" do
-    BasicObject.should have_public_instance_method(:'!')
+    BasicObject.public_instance_methods(false).should.include?(:'!')
   end
 
   it "returns false" do
-    (!BasicObject.new).should be_false
+    (!BasicObject.new).should == false
   end
 end
diff --git a/spec/ruby/core/basicobject/singleton_method_added_spec.rb b/spec/ruby/core/basicobject/singleton_method_added_spec.rb
index bd21458ea76..f39b91768c3 100644
--- a/spec/ruby/core/basicobject/singleton_method_added_spec.rb
+++ b/spec/ruby/core/basicobject/singleton_method_added_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "is a private method" do
-    BasicObject.should have_private_instance_method(:singleton_method_added)
+    BasicObject.private_instance_methods(false).should.include?(:singleton_method_added)
   end
 
   it "is called when a singleton method is defined on an object" do
@@ -35,7 +35,7 @@ def new_instance_method
       end
     end
 
-    ScratchPad.recorded.should_not include(:new_instance_method)
+    ScratchPad.recorded.should_not.include?(:new_instance_method)
   end
 
   it "is called when a singleton method is defined on a module" do
@@ -94,7 +94,7 @@ class << self
         -> {
           def self.foo
           end
-        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for/)
+        }.should.raise(NoMethodError, /undefined method [`']singleton_method_added' for/)
       end
     ensure
       BasicObjectSpecs.send(:remove_const, :NoSingletonMethodAdded)
@@ -108,16 +108,16 @@ class << object
         -> {
           def foo
           end
-        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
+        }.should.raise(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
 
         -> {
           define_method(:bar) {}
-        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
+        }.should.raise(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
       end
 
       -> {
         object.define_singleton_method(:baz) {}
-      }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
+      }.should.raise(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
     end
 
     it "calls #method_missing" do
diff --git a/spec/ruby/core/basicobject/singleton_method_removed_spec.rb b/spec/ruby/core/basicobject/singleton_method_removed_spec.rb
index 46f9a6894ce..1831e3c070a 100644
--- a/spec/ruby/core/basicobject/singleton_method_removed_spec.rb
+++ b/spec/ruby/core/basicobject/singleton_method_removed_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "is a private method" do
-    BasicObject.should have_private_instance_method(:singleton_method_removed)
+    BasicObject.private_instance_methods(false).should.include?(:singleton_method_removed)
   end
 
   it "is called when a method is removed on self" do
diff --git a/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb b/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb
index 7d6c7207db6..cc47341878b 100644
--- a/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb
+++ b/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "is a private method" do
-    BasicObject.should have_private_instance_method(:singleton_method_undefined)
+    BasicObject.private_instance_methods(false).should.include?(:singleton_method_undefined)
   end
 
   it "is called when a method is removed on self" do
diff --git a/spec/ruby/core/binding/dup_spec.rb b/spec/ruby/core/binding/dup_spec.rb
index 4eff66bd9a4..f5f0c72d5d2 100644
--- a/spec/ruby/core/binding/dup_spec.rb
+++ b/spec/ruby/core/binding/dup_spec.rb
@@ -21,7 +21,7 @@
     eval("a", bind2).should == 2
 
     eval("b = 2", bind2)
-    -> { eval("b", bind1) }.should raise_error(NameError)
+    -> { eval("b", bind1) }.should.raise(NameError)
     eval("b", bind2).should == 2
 
     bind1.local_variables.sort.should == [:a, :bind1, :bind2]
diff --git a/spec/ruby/core/binding/eval_spec.rb b/spec/ruby/core/binding/eval_spec.rb
index 7852e1c9393..f1d85913200 100644
--- a/spec/ruby/core/binding/eval_spec.rb
+++ b/spec/ruby/core/binding/eval_spec.rb
@@ -7,7 +7,7 @@
     bind = obj.get_binding
 
     bind.eval("@secret += square(3)").should == 10
-    bind.eval("a").should be_true
+    bind.eval("a").should == true
 
     bind.eval("class Inside; end")
     bind.eval("Inside.name").should == "BindingSpecs::Demo::Inside"
diff --git a/spec/ruby/core/binding/local_variable_get_spec.rb b/spec/ruby/core/binding/local_variable_get_spec.rb
index 005670becc2..d97100deda3 100644
--- a/spec/ruby/core/binding/local_variable_get_spec.rb
+++ b/spec/ruby/core/binding/local_variable_get_spec.rb
@@ -13,7 +13,7 @@
 
     -> {
       bind.local_variable_get(:no_such_variable)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "reads variables added later to the binding" do
@@ -21,7 +21,7 @@
 
     -> {
       bind.local_variable_get(:a)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
 
     bind.local_variable_set(:a, 42)
 
@@ -45,12 +45,12 @@
 
   it "raises a NameError on global access" do
     bind = binding
-    -> { bind.local_variable_get(:$0) }.should raise_error(NameError)
+    -> { bind.local_variable_get(:$0) }.should.raise(NameError)
   end
 
   it "raises a NameError on special variable access" do
     bind = binding
-    -> { bind.local_variable_get(:$~) }.should raise_error(NameError)
-    -> { bind.local_variable_get(:$_) }.should raise_error(NameError)
+    -> { bind.local_variable_get(:$~) }.should.raise(NameError)
+    -> { bind.local_variable_get(:$_) }.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/binding/local_variable_set_spec.rb b/spec/ruby/core/binding/local_variable_set_spec.rb
index 1456c6dda1d..3e4f407fc32 100644
--- a/spec/ruby/core/binding/local_variable_set_spec.rb
+++ b/spec/ruby/core/binding/local_variable_set_spec.rb
@@ -38,7 +38,7 @@
     bind = binding
     bind.local_variable_set(:number, 10)
 
-    -> { number }.should raise_error(NameError)
+    -> { number }.should.raise(NameError)
   end
 
   it 'overwrites an existing local variable defined before a Binding' do
@@ -59,13 +59,13 @@
 
   it "raises a NameError on global access" do
     bind = binding
-    -> { bind.local_variable_set(:$0, "") }.should raise_error(NameError)
+    -> { bind.local_variable_set(:$0, "") }.should.raise(NameError)
   end
 
   it "raises a NameError on special variable access" do
     bind = binding
-    -> { bind.local_variable_set(:$~, "") }.should raise_error(NameError)
-    -> { bind.local_variable_set(:$_, "") }.should raise_error(NameError)
+    -> { bind.local_variable_set(:$~, "") }.should.raise(NameError)
+    -> { bind.local_variable_set(:$_, "") }.should.raise(NameError)
   end
 
 end
diff --git a/spec/ruby/core/binding/local_variables_spec.rb b/spec/ruby/core/binding/local_variables_spec.rb
index 92c817b9a81..0f596813420 100644
--- a/spec/ruby/core/binding/local_variables_spec.rb
+++ b/spec/ruby/core/binding/local_variables_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Binding#local_variables" do
   it "returns an Array" do
-    binding.local_variables.should be_kind_of(Array)
+    binding.local_variables.should.is_a?(Array)
   end
 
   it "includes local variables in the current scope" do
diff --git a/spec/ruby/core/builtin_constants/builtin_constants_spec.rb b/spec/ruby/core/builtin_constants/builtin_constants_spec.rb
index 2c71b416679..67b3339aa66 100644
--- a/spec/ruby/core/builtin_constants/builtin_constants_spec.rb
+++ b/spec/ruby/core/builtin_constants/builtin_constants_spec.rb
@@ -2,7 +2,7 @@
 
 describe "RUBY_VERSION" do
   it "is a String" do
-    RUBY_VERSION.should be_kind_of(String)
+    RUBY_VERSION.should.is_a?(String)
   end
 
   it "is frozen" do
@@ -12,13 +12,13 @@
 
 describe "RUBY_PATCHLEVEL" do
   it "is an Integer" do
-    RUBY_PATCHLEVEL.should be_kind_of(Integer)
+    RUBY_PATCHLEVEL.should.is_a?(Integer)
   end
 end
 
 describe "RUBY_COPYRIGHT" do
   it "is a String" do
-    RUBY_COPYRIGHT.should be_kind_of(String)
+    RUBY_COPYRIGHT.should.is_a?(String)
   end
 
   it "is frozen" do
@@ -28,7 +28,7 @@
 
 describe "RUBY_DESCRIPTION" do
   it "is a String" do
-    RUBY_DESCRIPTION.should be_kind_of(String)
+    RUBY_DESCRIPTION.should.is_a?(String)
   end
 
   it "is frozen" do
@@ -38,7 +38,7 @@
 
 describe "RUBY_ENGINE" do
   it "is a String" do
-    RUBY_ENGINE.should be_kind_of(String)
+    RUBY_ENGINE.should.is_a?(String)
   end
 
   it "is frozen" do
@@ -48,7 +48,7 @@
 
 describe "RUBY_ENGINE_VERSION" do
   it "is a String" do
-    RUBY_ENGINE_VERSION.should be_kind_of(String)
+    RUBY_ENGINE_VERSION.should.is_a?(String)
   end
 
   it "is frozen" do
@@ -58,7 +58,7 @@
 
 describe "RUBY_PLATFORM" do
   it "is a String" do
-    RUBY_PLATFORM.should be_kind_of(String)
+    RUBY_PLATFORM.should.is_a?(String)
   end
 
   it "is frozen" do
@@ -68,7 +68,7 @@
 
 describe "RUBY_RELEASE_DATE" do
   it "is a String" do
-    RUBY_RELEASE_DATE.should be_kind_of(String)
+    RUBY_RELEASE_DATE.should.is_a?(String)
   end
 
   it "is frozen" do
@@ -78,7 +78,7 @@
 
 describe "RUBY_REVISION" do
   it "is a String" do
-    RUBY_REVISION.should be_kind_of(String)
+    RUBY_REVISION.should.is_a?(String)
   end
 
   it "is frozen" do
@@ -95,55 +95,55 @@
 
   describe "Ruby::VERSION" do
     it "is equal to RUBY_VERSION" do
-      Ruby::VERSION.should equal(RUBY_VERSION)
+      Ruby::VERSION.should.equal?(RUBY_VERSION)
     end
   end
 
   describe "RUBY::PATCHLEVEL" do
     it "is equal to RUBY_PATCHLEVEL" do
-      Ruby::PATCHLEVEL.should equal(RUBY_PATCHLEVEL)
+      Ruby::PATCHLEVEL.should.equal?(RUBY_PATCHLEVEL)
     end
   end
 
   describe "Ruby::COPYRIGHT" do
     it "is equal to RUBY_COPYRIGHT" do
-      Ruby::COPYRIGHT.should equal(RUBY_COPYRIGHT)
+      Ruby::COPYRIGHT.should.equal?(RUBY_COPYRIGHT)
     end
   end
 
   describe "Ruby::DESCRIPTION" do
     it "is equal to RUBY_DESCRIPTION" do
-      Ruby::DESCRIPTION.should equal(RUBY_DESCRIPTION)
+      Ruby::DESCRIPTION.should.equal?(RUBY_DESCRIPTION)
     end
   end
 
   describe "Ruby::ENGINE" do
     it "is equal to RUBY_ENGINE" do
-      Ruby::ENGINE.should equal(RUBY_ENGINE)
+      Ruby::ENGINE.should.equal?(RUBY_ENGINE)
     end
   end
 
   describe "Ruby::ENGINE_VERSION" do
     it "is equal to RUBY_ENGINE_VERSION" do
-      Ruby::ENGINE_VERSION.should equal(RUBY_ENGINE_VERSION)
+      Ruby::ENGINE_VERSION.should.equal?(RUBY_ENGINE_VERSION)
     end
   end
 
   describe "Ruby::PLATFORM" do
     it "is equal to RUBY_PLATFORM" do
-      Ruby::PLATFORM.should equal(RUBY_PLATFORM)
+      Ruby::PLATFORM.should.equal?(RUBY_PLATFORM)
     end
   end
 
   describe "Ruby::RELEASE_DATE" do
     it "is equal to RUBY_RELEASE_DATE" do
-      Ruby::RELEASE_DATE.should equal(RUBY_RELEASE_DATE)
+      Ruby::RELEASE_DATE.should.equal?(RUBY_RELEASE_DATE)
     end
   end
 
   describe "Ruby::REVISION" do
     it "is equal to RUBY_REVISION" do
-      Ruby::REVISION.should equal(RUBY_REVISION)
+      Ruby::REVISION.should.equal?(RUBY_REVISION)
     end
   end
 end
diff --git a/spec/ruby/core/class/allocate_spec.rb b/spec/ruby/core/class/allocate_spec.rb
index b39622e06a4..b8950a678ec 100644
--- a/spec/ruby/core/class/allocate_spec.rb
+++ b/spec/ruby/core/class/allocate_spec.rb
@@ -3,7 +3,7 @@
 describe "Class#allocate" do
   it "returns an instance of self" do
     klass = Class.new
-    klass.allocate.should be_an_instance_of(klass)
+    klass.allocate.should.instance_of?(klass)
   end
 
   it "returns a fully-formed instance of Module" do
@@ -16,7 +16,7 @@
     klass = Class.allocate
     -> do
       klass.new
-    end.should raise_error(Exception)
+    end.should.raise(Exception)
   end
 
   it "does not call initialize on the new instance" do
@@ -36,6 +36,6 @@ def initialized?
   it "raises TypeError for #superclass" do
     -> do
       Class.allocate.superclass
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/class/attached_object_spec.rb b/spec/ruby/core/class/attached_object_spec.rb
index 8f8a0734c6e..b75e61ca07b 100644
--- a/spec/ruby/core/class/attached_object_spec.rb
+++ b/spec/ruby/core/class/attached_object_spec.rb
@@ -18,12 +18,12 @@
   it "raises TypeError if the class is not a singleton class" do
     a = Class.new
 
-    -> { a.attached_object }.should raise_error(TypeError, /is not a singleton class/)
+    -> { a.attached_object }.should.raise(TypeError, /is not a singleton class/)
   end
 
   it "raises TypeError for special singleton classes" do
-    -> { nil.singleton_class.attached_object }.should raise_error(TypeError, /[`']NilClass' is not a singleton class/)
-    -> { true.singleton_class.attached_object }.should raise_error(TypeError, /[`']TrueClass' is not a singleton class/)
-    -> { false.singleton_class.attached_object }.should raise_error(TypeError, /[`']FalseClass' is not a singleton class/)
+    -> { nil.singleton_class.attached_object }.should.raise(TypeError, /[`']NilClass' is not a singleton class/)
+    -> { true.singleton_class.attached_object }.should.raise(TypeError, /[`']TrueClass' is not a singleton class/)
+    -> { false.singleton_class.attached_object }.should.raise(TypeError, /[`']FalseClass' is not a singleton class/)
   end
 end
diff --git a/spec/ruby/core/class/dup_spec.rb b/spec/ruby/core/class/dup_spec.rb
index 1ff9abf7b44..17c0171ceb1 100644
--- a/spec/ruby/core/class/dup_spec.rb
+++ b/spec/ruby/core/class/dup_spec.rb
@@ -53,7 +53,7 @@ def self.message
 
   it "sets the name from the class to nil if not assigned to a constant" do
     copy = CoreClassSpecs::Record.dup
-    copy.name.should be_nil
+    copy.name.should == nil
   end
 
   it "stores the new name if assigned to a constant" do
@@ -64,6 +64,6 @@ def self.message
   end
 
   it "raises TypeError if called on BasicObject" do
-    -> { BasicObject.dup }.should raise_error(TypeError, "can't copy the root class")
+    -> { BasicObject.dup }.should.raise(TypeError, "can't copy the root class")
   end
 end
diff --git a/spec/ruby/core/class/inherited_spec.rb b/spec/ruby/core/class/inherited_spec.rb
index 2a8d1ff813a..c9acc740a10 100644
--- a/spec/ruby/core/class/inherited_spec.rb
+++ b/spec/ruby/core/class/inherited_spec.rb
@@ -92,10 +92,10 @@ def inherited(cls); end
     end
 
     class << top; private :inherited; end
-    -> { Class.new(top) }.should_not raise_error
+    -> { Class.new(top) }.should_not.raise
 
     class << top; protected :inherited; end
-    -> { Class.new(top) }.should_not raise_error
+    -> { Class.new(top) }.should_not.raise
   end
 
   it "if the subclass is assigned to a constant, it is all set" do
diff --git a/spec/ruby/core/class/initialize_spec.rb b/spec/ruby/core/class/initialize_spec.rb
index 63487584857..ab8f0a157e6 100644
--- a/spec/ruby/core/class/initialize_spec.rb
+++ b/spec/ruby/core/class/initialize_spec.rb
@@ -2,24 +2,24 @@
 
 describe "Class#initialize" do
   it "is private" do
-    Class.should have_private_method(:initialize)
+    Class.private_methods(false).should.include?(:initialize)
   end
 
   it "raises a TypeError when called on already initialized classes" do
     ->{
       Integer.send :initialize
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
 
     ->{
       Object.send :initialize
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   # See [redmine:2601]
   it "raises a TypeError when called on BasicObject" do
     ->{
       BasicObject.send :initialize
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   describe "when given the Class" do
@@ -28,7 +28,7 @@
     end
 
     it "raises a TypeError" do
-      ->{@uninitialized.send(:initialize, Class)}.should raise_error(TypeError)
+      ->{@uninitialized.send(:initialize, Class)}.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/class/new_spec.rb b/spec/ruby/core/class/new_spec.rb
index 6fe54c3209b..111e31252eb 100644
--- a/spec/ruby/core/class/new_spec.rb
+++ b/spec/ruby/core/class/new_spec.rb
@@ -7,7 +7,7 @@
     klass = Class.new do
       self_in_block = self
     end
-    self_in_block.should equal klass
+    self_in_block.should.equal? klass
   end
 
   it "uses the given block as the class' body" do
@@ -70,11 +70,11 @@ def message2; "hello"; end
   it "raises a TypeError if passed a metaclass" do
     obj = mock("Class.new metaclass")
     meta = obj.singleton_class
-    -> { Class.new meta }.should raise_error(TypeError)
+    -> { Class.new meta }.should.raise(TypeError)
   end
 
   it "creates a class without a name" do
-    Class.new.name.should be_nil
+    Class.new.name.should == nil
   end
 
   it "creates a class that can be given a name by assigning it to a constant" do
@@ -98,12 +98,12 @@ def message2; "hello"; end
 
   it "raises a TypeError when given a non-Class" do
     error_msg = /superclass must be a.*Class/
-    -> { Class.new("")              }.should raise_error(TypeError, error_msg)
-    -> { Class.new(1)               }.should raise_error(TypeError, error_msg)
-    -> { Class.new(:symbol)         }.should raise_error(TypeError, error_msg)
-    -> { Class.new(mock('o'))       }.should raise_error(TypeError, error_msg)
-    -> { Class.new(Module.new)      }.should raise_error(TypeError, error_msg)
-    -> { Class.new(BasicObject.new) }.should raise_error(TypeError, error_msg)
+    -> { Class.new("")              }.should.raise(TypeError, error_msg)
+    -> { Class.new(1)               }.should.raise(TypeError, error_msg)
+    -> { Class.new(:symbol)         }.should.raise(TypeError, error_msg)
+    -> { Class.new(mock('o'))       }.should.raise(TypeError, error_msg)
+    -> { Class.new(Module.new)      }.should.raise(TypeError, error_msg)
+    -> { Class.new(BasicObject.new) }.should.raise(TypeError, error_msg)
   end
 end
 
@@ -141,8 +141,8 @@ def self.allocate
     end
 
     instance = klass.new
-    instance.should be_kind_of klass
-    instance.class.should equal klass
+    instance.should.is_a? klass
+    instance.class.should.equal? klass
   end
 
   it "passes the block to #initialize" do
diff --git a/spec/ruby/core/class/subclasses_spec.rb b/spec/ruby/core/class/subclasses_spec.rb
index f6921527871..c3d7b07e124 100644
--- a/spec/ruby/core/class/subclasses_spec.rb
+++ b/spec/ruby/core/class/subclasses_spec.rb
@@ -50,7 +50,7 @@ def a_obj.force_singleton_class
       42
     end
 
-    a.subclasses.should_not include(a_obj.singleton_class)
+    a.subclasses.should_not.include?(a_obj.singleton_class)
   end
 
   it "has 1 entry per module or class" do
@@ -76,7 +76,7 @@ def a_obj.force_singleton_class
     classes = threads.map(&:value)
 
     superclass.subclasses.size.should == t * n
-    superclass.subclasses.each { |c| c.should be_kind_of(Class) }
+    superclass.subclasses.each { |c| c.should.is_a?(Class) }
   end
 
   def assert_subclasses(mod,subclasses)
diff --git a/spec/ruby/core/class/superclass_spec.rb b/spec/ruby/core/class/superclass_spec.rb
index 00579238a6e..87d9b20490b 100644
--- a/spec/ruby/core/class/superclass_spec.rb
+++ b/spec/ruby/core/class/superclass_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Class#superclass" do
   it "returns the superclass of self" do
-    BasicObject.superclass.should be_nil
+    BasicObject.superclass.should == nil
     Object.superclass.should == BasicObject
     Class.superclass.should == Module
     Class.new.superclass.should == Object
diff --git a/spec/ruby/core/comparable/clamp_spec.rb b/spec/ruby/core/comparable/clamp_spec.rb
index 18f616a9979..eb1dc1ff98a 100644
--- a/spec/ruby/core/comparable/clamp_spec.rb
+++ b/spec/ruby/core/comparable/clamp_spec.rb
@@ -7,9 +7,9 @@
     two = ComparableSpecs::WithOnlyCompareDefined.new(2)
     c = ComparableSpecs::Weird.new(3)
 
-    -> { c.clamp(two, one) }.should raise_error(ArgumentError)
+    -> { c.clamp(two, one) }.should.raise(ArgumentError)
     one.should_receive(:<=>).any_number_of_times.and_return(nil)
-    -> { c.clamp(one, two) }.should raise_error(ArgumentError)
+    -> { c.clamp(one, two) }.should.raise(ArgumentError)
   end
 
   it 'returns self if within the given parameters' do
@@ -18,10 +18,10 @@
     three = ComparableSpecs::WithOnlyCompareDefined.new(3)
     c = ComparableSpecs::Weird.new(2)
 
-    c.clamp(one, two).should equal(c)
-    c.clamp(two, two).should equal(c)
-    c.clamp(one, three).should equal(c)
-    c.clamp(two, three).should equal(c)
+    c.clamp(one, two).should.equal?(c)
+    c.clamp(two, two).should.equal?(c)
+    c.clamp(one, three).should.equal?(c)
+    c.clamp(two, three).should.equal?(c)
   end
 
   it 'returns the min parameter if less than it' do
@@ -29,7 +29,7 @@
     two = ComparableSpecs::WithOnlyCompareDefined.new(2)
     c = ComparableSpecs::Weird.new(0)
 
-    c.clamp(one, two).should equal(one)
+    c.clamp(one, two).should.equal?(one)
   end
 
   it 'returns the max parameter if greater than it' do
@@ -37,20 +37,20 @@
     two = ComparableSpecs::WithOnlyCompareDefined.new(2)
     c = ComparableSpecs::Weird.new(3)
 
-    c.clamp(one, two).should equal(two)
+    c.clamp(one, two).should.equal?(two)
   end
 
   context 'max is nil' do
     it 'returns min if less than it' do
       one = ComparableSpecs::WithOnlyCompareDefined.new(1)
       c = ComparableSpecs::Weird.new(0)
-      c.clamp(one, nil).should equal(one)
+      c.clamp(one, nil).should.equal?(one)
     end
 
     it 'always returns self if greater than min' do
       one = ComparableSpecs::WithOnlyCompareDefined.new(1)
       c = ComparableSpecs::Weird.new(2)
-      c.clamp(one, nil).should equal(c)
+      c.clamp(one, nil).should.equal?(c)
     end
   end
 
@@ -58,19 +58,19 @@
     it 'returns max if greater than it' do
       one = ComparableSpecs::WithOnlyCompareDefined.new(1)
       c = ComparableSpecs::Weird.new(2)
-      c.clamp(nil, one).should equal(one)
+      c.clamp(nil, one).should.equal?(one)
     end
 
     it 'always returns self if less than max' do
       one = ComparableSpecs::WithOnlyCompareDefined.new(1)
       c = ComparableSpecs::Weird.new(0)
-      c.clamp(nil, one).should equal(c)
+      c.clamp(nil, one).should.equal?(c)
     end
   end
 
   it 'always returns self when min is nil and max is nil' do
     c = ComparableSpecs::Weird.new(1)
-    c.clamp(nil, nil).should equal(c)
+    c.clamp(nil, nil).should.equal?(c)
   end
 
   it 'returns self if within the given range parameters' do
@@ -79,10 +79,10 @@
     three = ComparableSpecs::WithOnlyCompareDefined.new(3)
     c = ComparableSpecs::Weird.new(2)
 
-    c.clamp(one..two).should equal(c)
-    c.clamp(two..two).should equal(c)
-    c.clamp(one..three).should equal(c)
-    c.clamp(two..three).should equal(c)
+    c.clamp(one..two).should.equal?(c)
+    c.clamp(two..two).should.equal?(c)
+    c.clamp(one..three).should.equal?(c)
+    c.clamp(two..three).should.equal?(c)
   end
 
   it 'returns the minimum value of the range parameters if less than it' do
@@ -90,7 +90,7 @@
     two = ComparableSpecs::WithOnlyCompareDefined.new(2)
     c = ComparableSpecs::Weird.new(0)
 
-    c.clamp(one..two).should equal(one)
+    c.clamp(one..two).should.equal?(one)
   end
 
   it 'returns the maximum value of the range parameters if greater than it' do
@@ -98,7 +98,7 @@
     two = ComparableSpecs::WithOnlyCompareDefined.new(2)
     c = ComparableSpecs::Weird.new(3)
 
-    c.clamp(one..two).should equal(two)
+    c.clamp(one..two).should.equal?(two)
   end
 
   it 'raises an Argument error if the range parameter is exclusive' do
@@ -106,7 +106,7 @@
     two = ComparableSpecs::WithOnlyCompareDefined.new(2)
     c = ComparableSpecs::Weird.new(3)
 
-    -> { c.clamp(one...two) }.should raise_error(ArgumentError)
+    -> { c.clamp(one...two) }.should.raise(ArgumentError)
   end
 
   context 'with nil as the max argument' do
@@ -115,8 +115,8 @@
       zero = ComparableSpecs::WithOnlyCompareDefined.new(0)
       c = ComparableSpecs::Weird.new(0)
 
-      c.clamp(one, nil).should equal(one)
-      c.clamp(zero, nil).should equal(c)
+      c.clamp(one, nil).should.equal?(one)
+      c.clamp(zero, nil).should.equal?(c)
     end
 
     it 'always returns self if greater than min argument' do
@@ -124,8 +124,8 @@
       two = ComparableSpecs::WithOnlyCompareDefined.new(2)
       c = ComparableSpecs::Weird.new(2)
 
-      c.clamp(one, nil).should equal(c)
-      c.clamp(two, nil).should equal(c)
+      c.clamp(one, nil).should.equal?(c)
+      c.clamp(two, nil).should.equal?(c)
     end
   end
 
@@ -135,8 +135,8 @@
       zero = ComparableSpecs::WithOnlyCompareDefined.new(0)
       c = ComparableSpecs::Weird.new(0)
 
-      c.clamp(one..).should equal(one)
-      c.clamp(zero..).should equal(c)
+      c.clamp(one..).should.equal?(one)
+      c.clamp(zero..).should.equal?(c)
     end
 
     it 'always returns self if greater than minimum value of the range parameters' do
@@ -144,15 +144,15 @@
       two = ComparableSpecs::WithOnlyCompareDefined.new(2)
       c = ComparableSpecs::Weird.new(2)
 
-      c.clamp(one..).should equal(c)
-      c.clamp(two..).should equal(c)
+      c.clamp(one..).should.equal?(c)
+      c.clamp(two..).should.equal?(c)
     end
 
     it 'works with exclusive range' do
       one = ComparableSpecs::WithOnlyCompareDefined.new(1)
       c = ComparableSpecs::Weird.new(2)
 
-      c.clamp(one...).should equal(c)
+      c.clamp(one...).should.equal?(c)
     end
   end
 
@@ -161,7 +161,7 @@
       one = ComparableSpecs::WithOnlyCompareDefined.new(1)
       c = ComparableSpecs::Weird.new(2)
 
-      c.clamp(nil, one).should equal(one)
+      c.clamp(nil, one).should.equal?(one)
     end
 
     it 'always returns self if less than max argument' do
@@ -169,8 +169,8 @@
       zero = ComparableSpecs::WithOnlyCompareDefined.new(0)
       c = ComparableSpecs::Weird.new(0)
 
-      c.clamp(nil, one).should equal(c)
-      c.clamp(nil, zero).should equal(c)
+      c.clamp(nil, one).should.equal?(c)
+      c.clamp(nil, zero).should.equal?(c)
     end
   end
 
@@ -179,7 +179,7 @@
       one = ComparableSpecs::WithOnlyCompareDefined.new(1)
       c = ComparableSpecs::Weird.new(2)
 
-      c.clamp(..one).should equal(one)
+      c.clamp(..one).should.equal?(one)
     end
 
     it 'always returns self if less than maximum value of the range parameters' do
@@ -187,15 +187,15 @@
       zero = ComparableSpecs::WithOnlyCompareDefined.new(0)
       c = ComparableSpecs::Weird.new(0)
 
-      c.clamp(..one).should equal(c)
-      c.clamp(..zero).should equal(c)
+      c.clamp(..one).should.equal?(c)
+      c.clamp(..zero).should.equal?(c)
     end
 
     it 'raises an Argument error if the range parameter is exclusive' do
       one = ComparableSpecs::WithOnlyCompareDefined.new(1)
       c = ComparableSpecs::Weird.new(0)
 
-      -> { c.clamp(...one) }.should raise_error(ArgumentError)
+      -> { c.clamp(...one) }.should.raise(ArgumentError)
     end
   end
 
@@ -203,7 +203,7 @@
     it 'always returns self' do
       c = ComparableSpecs::Weird.new(1)
 
-      c.clamp(nil, nil).should equal(c)
+      c.clamp(nil, nil).should.equal?(c)
     end
   end
 
@@ -211,13 +211,13 @@
     it 'always returns self' do
       c = ComparableSpecs::Weird.new(1)
 
-      c.clamp(nil..nil).should equal(c)
+      c.clamp(nil..nil).should.equal?(c)
     end
 
     it 'works with exclusive range' do
       c = ComparableSpecs::Weird.new(2)
 
-      c.clamp(nil...nil).should equal(c)
+      c.clamp(nil...nil).should.equal?(c)
     end
   end
 end
diff --git a/spec/ruby/core/comparable/equal_value_spec.rb b/spec/ruby/core/comparable/equal_value_spec.rb
index ddcc03cb410..3af40d1c7e3 100644
--- a/spec/ruby/core/comparable/equal_value_spec.rb
+++ b/spec/ruby/core/comparable/equal_value_spec.rb
@@ -39,7 +39,7 @@
     end
 
     it "returns false" do
-      (a == b).should be_false
+      (a == b).should == false
     end
   end
 
@@ -49,7 +49,7 @@
     end
 
     it "raises an ArgumentError" do
-      -> { (a == b) }.should raise_error(ArgumentError)
+      -> { (a == b) }.should.raise(ArgumentError)
     end
   end
 
@@ -60,7 +60,7 @@
       end
 
       it "lets it go through" do
-        -> { (a == b) }.should raise_error(StandardError)
+        -> { (a == b) }.should.raise(StandardError)
       end
     end
 
@@ -71,13 +71,13 @@
       end
 
       it "lets it go through" do
-        -> { (a == b) }.should raise_error(TypeError)
+        -> { (a == b) }.should.raise(TypeError)
       end
     end
 
     it "lets it go through if it is not a StandardError" do
       a.should_receive(:<=>).once.and_raise(Exception)
-      -> { (a == b) }.should raise_error(Exception)
+      -> { (a == b) }.should.raise(Exception)
     end
   end
 
diff --git a/spec/ruby/core/comparable/gt_spec.rb b/spec/ruby/core/comparable/gt_spec.rb
index 150e653dc75..cebb5464ad0 100644
--- a/spec/ruby/core/comparable/gt_spec.rb
+++ b/spec/ruby/core/comparable/gt_spec.rb
@@ -38,6 +38,6 @@
     b = ComparableSpecs::Weird.new(20)
 
     a.should_receive(:<=>).any_number_of_times.and_return(nil)
-    -> { (a > b) }.should raise_error(ArgumentError)
+    -> { (a > b) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/comparable/gte_spec.rb b/spec/ruby/core/comparable/gte_spec.rb
index 328f58c66cf..16da81b3ead 100644
--- a/spec/ruby/core/comparable/gte_spec.rb
+++ b/spec/ruby/core/comparable/gte_spec.rb
@@ -42,6 +42,6 @@
     b = ComparableSpecs::Weird.new(20)
 
     a.should_receive(:<=>).any_number_of_times.and_return(nil)
-    -> { (a >= b) }.should raise_error(ArgumentError)
+    -> { (a >= b) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/comparable/lt_spec.rb b/spec/ruby/core/comparable/lt_spec.rb
index bca95f8d252..175646d0d7d 100644
--- a/spec/ruby/core/comparable/lt_spec.rb
+++ b/spec/ruby/core/comparable/lt_spec.rb
@@ -38,12 +38,12 @@
     b = ComparableSpecs::Weird.new(20)
 
     a.should_receive(:<=>).any_number_of_times.and_return(nil)
-    -> { (a < b) }.should raise_error(ArgumentError)
+    -> { (a < b) }.should.raise(ArgumentError)
   end
 
   it "raises an argument error with a message containing the value" do
-    -> { ("foo" < 7) }.should raise_error(ArgumentError) { |e|
-      e.message.should == "comparison of String with 7 failed"
+    -> { ("foo" < 7) }.should.raise(ArgumentError) { |e|
+      e.message.should.include? "String with 7 failed"
     }
   end
 end
diff --git a/spec/ruby/core/comparable/lte_spec.rb b/spec/ruby/core/comparable/lte_spec.rb
index b5cb9cc4e7f..8cbbd5ebb4a 100644
--- a/spec/ruby/core/comparable/lte_spec.rb
+++ b/spec/ruby/core/comparable/lte_spec.rb
@@ -41,6 +41,6 @@
     b = ComparableSpecs::Weird.new(20)
 
     a.should_receive(:<=>).any_number_of_times.and_return(nil)
-    -> { (a <= b) }.should raise_error(ArgumentError)
+    -> { (a <= b) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/complex/coerce_spec.rb b/spec/ruby/core/complex/coerce_spec.rb
index a30a6c1d5f7..d4ea85a7136 100644
--- a/spec/ruby/core/complex/coerce_spec.rb
+++ b/spec/ruby/core/complex/coerce_spec.rb
@@ -8,37 +8,37 @@
   it "returns an array containing other and self as Complex when other is an Integer" do
     result = @one.coerce(2)
     result.should == [2, 1]
-    result.first.should be_kind_of(Complex)
-    result.last.should be_kind_of(Complex)
+    result.first.should.is_a?(Complex)
+    result.last.should.is_a?(Complex)
   end
 
   it "returns an array containing other and self as Complex when other is a Float" do
     result = @one.coerce(20.5)
     result.should == [20.5, 1]
-    result.first.should be_kind_of(Complex)
-    result.last.should be_kind_of(Complex)
+    result.first.should.is_a?(Complex)
+    result.last.should.is_a?(Complex)
   end
 
   it "returns an array containing other and self as Complex when other is a Bignum" do
     result = @one.coerce(4294967296)
     result.should == [4294967296, 1]
-    result.first.should be_kind_of(Complex)
-    result.last.should be_kind_of(Complex)
+    result.first.should.is_a?(Complex)
+    result.last.should.is_a?(Complex)
   end
 
   it "returns an array containing other and self as Complex when other is a Rational" do
     result = @one.coerce(Rational(5,6))
     result.should == [Rational(5,6), 1]
-    result.first.should be_kind_of(Complex)
-    result.last.should be_kind_of(Complex)
+    result.first.should.is_a?(Complex)
+    result.last.should.is_a?(Complex)
   end
 
   it "returns an array containing other and self when other is a Complex" do
     other = Complex(2)
     result = @one.coerce(other)
     result.should == [other, @one]
-    result.first.should equal(other)
-    result.last.should equal(@one)
+    result.first.should.equal?(other)
+    result.last.should.equal?(@one)
   end
 
   it "returns an array containing other as Complex and self when other is a Numeric which responds to #real? with true" do
@@ -46,25 +46,25 @@
     other.should_receive(:real?).any_number_of_times.and_return(true)
     result = @one.coerce(other)
     result.should == [other, @one]
-    result.first.should eql(Complex(other))
-    result.last.should equal(@one)
+    result.first.should.eql?(Complex(other))
+    result.last.should.equal?(@one)
   end
 
   it "raises TypeError when other is a Numeric which responds to #real? with false" do
     other = mock_numeric('other')
     other.should_receive(:real?).any_number_of_times.and_return(false)
-    -> { @one.coerce(other) }.should raise_error(TypeError)
+    -> { @one.coerce(other) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when other is a String" do
-    -> { @one.coerce("20") }.should raise_error(TypeError)
+    -> { @one.coerce("20") }.should.raise(TypeError)
   end
 
   it "raises a TypeError when other is nil" do
-    -> { @one.coerce(nil) }.should raise_error(TypeError)
+    -> { @one.coerce(nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when other is false" do
-    -> { @one.coerce(false) }.should raise_error(TypeError)
+    -> { @one.coerce(false) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/complex/comparison_spec.rb b/spec/ruby/core/complex/comparison_spec.rb
index 3a3142f2344..3115f4e205b 100644
--- a/spec/ruby/core/complex/comparison_spec.rb
+++ b/spec/ruby/core/complex/comparison_spec.rb
@@ -2,15 +2,15 @@
 
 describe "Complex#<=>" do
   it "returns nil if either self or argument has imaginary part" do
-    (Complex(5, 1) <=> Complex(2)).should be_nil
-    (Complex(1) <=> Complex(2, 1)).should be_nil
-    (5 <=> Complex(2, 1)).should be_nil
+    (Complex(5, 1) <=> Complex(2)).should == nil
+    (Complex(1) <=> Complex(2, 1)).should == nil
+    (5 <=> Complex(2, 1)).should == nil
   end
 
   it "returns nil if argument is not numeric" do
-    (Complex(5, 1) <=> "cmp").should be_nil
-    (Complex(1) <=> "cmp").should be_nil
-    (Complex(1) <=> Object.new).should be_nil
+    (Complex(5, 1) <=> "cmp").should == nil
+    (Complex(1) <=> "cmp").should == nil
+    (Complex(1) <=> Object.new).should == nil
   end
 
   it "returns 0, 1, or -1 if self and argument do not have imaginary part" do
diff --git a/spec/ruby/core/complex/constants_spec.rb b/spec/ruby/core/complex/constants_spec.rb
index 50303de16cc..200e97731a1 100644
--- a/spec/ruby/core/complex/constants_spec.rb
+++ b/spec/ruby/core/complex/constants_spec.rb
@@ -2,6 +2,6 @@
 
 describe "Complex::I" do
   it "is Complex(0, 1)" do
-    Complex::I.should eql(Complex(0, 1))
+    Complex::I.should.eql?(Complex(0, 1))
   end
 end
diff --git a/spec/ruby/core/complex/eql_spec.rb b/spec/ruby/core/complex/eql_spec.rb
index 9194efc074d..2082a22feb8 100644
--- a/spec/ruby/core/complex/eql_spec.rb
+++ b/spec/ruby/core/complex/eql_spec.rb
@@ -2,23 +2,23 @@
 
 describe "Complex#eql?" do
   it "returns false if other is not Complex" do
-    Complex(1).eql?(1).should be_false
+    Complex(1).eql?(1).should == false
   end
 
   it "returns true when the respective parts are of the same classes and self == other" do
-    Complex(1, 2).eql?(Complex(1, 2)).should be_true
+    Complex(1, 2).eql?(Complex(1, 2)).should == true
   end
 
   it "returns false when the real parts are of different classes" do
-    Complex(1).eql?(Complex(1.0)).should be_false
+    Complex(1).eql?(Complex(1.0)).should == false
   end
 
   it "returns false when the imaginary parts are of different classes" do
-    Complex(1, 2).eql?(Complex(1, 2.0)).should be_false
+    Complex(1, 2).eql?(Complex(1, 2.0)).should == false
   end
 
   it "returns false when self == other is false" do
-    Complex(1, 2).eql?(Complex(2, 3)).should be_false
+    Complex(1, 2).eql?(Complex(2, 3)).should == false
   end
 
   it "does NOT send #eql? to real or imaginary parts" do
@@ -26,6 +26,6 @@
     imag = mock_numeric('imag')
     real.should_not_receive(:eql?)
     imag.should_not_receive(:eql?)
-    Complex(real, imag).eql?(Complex(real, imag)).should be_true
+    Complex(real, imag).eql?(Complex(real, imag)).should == true
   end
 end
diff --git a/spec/ruby/core/complex/equal_value_spec.rb b/spec/ruby/core/complex/equal_value_spec.rb
index 97c486d8204..b3562ff3fb8 100644
--- a/spec/ruby/core/complex/equal_value_spec.rb
+++ b/spec/ruby/core/complex/equal_value_spec.rb
@@ -60,7 +60,7 @@
       obj = mock("Object")
       obj.should_receive(:==).with(value).and_return(:expected)
 
-      (value == obj).should_not be_false
+      (value == obj).should_not == false
     end
   end
 
@@ -73,11 +73,11 @@
     it "returns real == other when the imaginary part is zero" do
       real = mock_numeric('real')
       real.should_receive(:==).with(@other).and_return(true)
-      (Complex(real, 0) == @other).should be_true
+      (Complex(real, 0) == @other).should == true
     end
 
     it "returns false when the imaginary part is not zero" do
-      (Complex(3, 1) == @other).should be_false
+      (Complex(3, 1) == @other).should == false
     end
   end
 
@@ -87,7 +87,7 @@
       other = mock_numeric('other')
       other.should_receive(:real?).any_number_of_times.and_return(false)
       other.should_receive(:==).with(complex).and_return(true)
-      (complex == other).should be_true
+      (complex == other).should == true
     end
   end
 end
diff --git a/spec/ruby/core/complex/exponent_spec.rb b/spec/ruby/core/complex/exponent_spec.rb
index 86f827aece9..d0db0a40c2a 100644
--- a/spec/ruby/core/complex/exponent_spec.rb
+++ b/spec/ruby/core/complex/exponent_spec.rb
@@ -3,13 +3,13 @@
 describe "Complex#**" do
   describe "with Integer 0" do
     it "returns Complex(1)" do
-      (Complex(3, 4) ** 0).should eql(Complex(1))
+      (Complex(3, 4) ** 0).should.eql?(Complex(1))
     end
   end
 
   describe "with Float 0.0" do
     it "returns Complex(1.0, 0.0)" do
-      (Complex(3, 4) ** 0.0).should eql(Complex(1.0, 0.0))
+      (Complex(3, 4) ** 0.0).should.eql?(Complex(1.0, 0.0))
     end
   end
 
diff --git a/spec/ruby/core/complex/fdiv_spec.rb b/spec/ruby/core/complex/fdiv_spec.rb
index 68f7d1b309f..fdcbc6a95d7 100644
--- a/spec/ruby/core/complex/fdiv_spec.rb
+++ b/spec/ruby/core/complex/fdiv_spec.rb
@@ -2,44 +2,44 @@
 
 describe "Complex#fdiv" do
   it "accepts a numeric argument" do
-    -> { Complex(20).fdiv(2) }.should_not raise_error(TypeError)
-    -> { Complex(20).fdiv(2.0) }.should_not raise_error(TypeError)
-    -> { Complex(20).fdiv(bignum_value) }.should_not raise_error(TypeError)
+    -> { Complex(20).fdiv(2) }.should_not.raise(TypeError)
+    -> { Complex(20).fdiv(2.0) }.should_not.raise(TypeError)
+    -> { Complex(20).fdiv(bignum_value) }.should_not.raise(TypeError)
   end
 
   it "accepts a negative numeric argument" do
-    -> { Complex(20).fdiv(-2) }.should_not raise_error(TypeError)
-    -> { Complex(20).fdiv(-2.0) }.should_not raise_error(TypeError)
-    -> { Complex(20).fdiv(-bignum_value) }.should_not raise_error(TypeError)
+    -> { Complex(20).fdiv(-2) }.should_not.raise(TypeError)
+    -> { Complex(20).fdiv(-2.0) }.should_not.raise(TypeError)
+    -> { Complex(20).fdiv(-bignum_value) }.should_not.raise(TypeError)
   end
 
   it "raises a TypeError if passed a non-numeric argument" do
-    -> { Complex(20).fdiv([]) }.should raise_error(TypeError)
-    -> { Complex(20).fdiv(:sym) }.should raise_error(TypeError)
-    -> { Complex(20).fdiv('s') }.should raise_error(TypeError)
+    -> { Complex(20).fdiv([]) }.should.raise(TypeError)
+    -> { Complex(20).fdiv(:sym) }.should.raise(TypeError)
+    -> { Complex(20).fdiv('s') }.should.raise(TypeError)
   end
 
   it "sets the real part to NaN if self's real part is NaN" do
-    Complex(nan_value).fdiv(2).real.nan?.should be_true
+    Complex(nan_value).fdiv(2).real.nan?.should == true
   end
 
   it "sets the imaginary part to NaN if self's imaginary part is NaN" do
-    Complex(2, nan_value).fdiv(2).imag.nan?.should be_true
+    Complex(2, nan_value).fdiv(2).imag.nan?.should == true
   end
 
   it "sets the real and imaginary part to NaN if self's real and imaginary parts are NaN" do
-    Complex(nan_value, nan_value).fdiv(2).imag.nan?.should be_true
-    Complex(nan_value, nan_value).fdiv(2).real.nan?.should be_true
+    Complex(nan_value, nan_value).fdiv(2).imag.nan?.should == true
+    Complex(nan_value, nan_value).fdiv(2).real.nan?.should == true
   end
 
   it "sets the real and imaginary part to NaN if self's real part and the argument are both NaN" do
-    Complex(nan_value, 2).fdiv(nan_value).imag.nan?.should be_true
-    Complex(nan_value, 2).fdiv(nan_value).real.nan?.should be_true
+    Complex(nan_value, 2).fdiv(nan_value).imag.nan?.should == true
+    Complex(nan_value, 2).fdiv(nan_value).real.nan?.should == true
   end
 
   it "sets the real and imaginary part to NaN if self's real part, self's imaginary part, and the argument are NaN" do
-    Complex(nan_value, nan_value).fdiv(nan_value).imag.nan?.should be_true
-    Complex(nan_value, nan_value).fdiv(nan_value).real.nan?.should be_true
+    Complex(nan_value, nan_value).fdiv(nan_value).imag.nan?.should == true
+    Complex(nan_value, nan_value).fdiv(nan_value).real.nan?.should == true
   end
 
   it "sets the real part to Infinity if self's real part is Infinity" do
@@ -58,8 +58,8 @@
   end
 
   it "sets the real part to NaN and the imaginary part to NaN if self's imaginary part, self's real part, and the argument are Infinity" do
-    Complex(infinity_value, infinity_value).fdiv(infinity_value).real.nan?.should be_true
-    Complex(infinity_value, infinity_value).fdiv(infinity_value).imag.nan?.should be_true
+    Complex(infinity_value, infinity_value).fdiv(infinity_value).real.nan?.should == true
+    Complex(infinity_value, infinity_value).fdiv(infinity_value).imag.nan?.should == true
   end
 end
 
@@ -71,7 +71,7 @@
   it "returns a Complex number" do
     @numbers.each do |real|
       @numbers.each do |other|
-        Complex(real).fdiv(other).should be_an_instance_of(Complex)
+        Complex(real).fdiv(other).should.instance_of?(Complex)
       end
     end
   end
@@ -103,7 +103,7 @@
       @numbers.each_with_index do |other,idx|
         Complex(
           real,@numbers[idx == 0 ? -1 : idx-1]
-        ).fdiv(other).should be_an_instance_of(Complex)
+        ).fdiv(other).should.instance_of?(Complex)
       end
     end
   end
diff --git a/spec/ruby/core/complex/integer_spec.rb b/spec/ruby/core/complex/integer_spec.rb
index 0957accb70b..559bfbccfd7 100644
--- a/spec/ruby/core/complex/integer_spec.rb
+++ b/spec/ruby/core/complex/integer_spec.rb
@@ -2,10 +2,10 @@
 
 describe "Complex#integer?" do
   it "returns false for a Complex with no imaginary part" do
-    Complex(20).integer?.should be_false
+    Complex(20).integer?.should == false
   end
 
   it "returns false for a Complex with an imaginary part" do
-    Complex(20,3).integer?.should be_false
+    Complex(20,3).integer?.should == false
   end
 end
diff --git a/spec/ruby/core/complex/marshal_dump_spec.rb b/spec/ruby/core/complex/marshal_dump_spec.rb
index 116899b0adb..201d55e9e55 100644
--- a/spec/ruby/core/complex/marshal_dump_spec.rb
+++ b/spec/ruby/core/complex/marshal_dump_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Complex#marshal_dump" do
   it "is a private method" do
-    Complex.should have_private_instance_method(:marshal_dump, false)
+    Complex.private_instance_methods(false).should.include?(:marshal_dump)
   end
 
   it "dumps real and imaginary parts" do
diff --git a/spec/ruby/core/complex/negative_spec.rb b/spec/ruby/core/complex/negative_spec.rb
index 62ab89c04a0..566975b8e1e 100644
--- a/spec/ruby/core/complex/negative_spec.rb
+++ b/spec/ruby/core/complex/negative_spec.rb
@@ -4,10 +4,10 @@
   it "is undefined" do
     c = Complex(1)
 
-    c.methods.should_not include(:negative?)
+    c.methods.should_not.include?(:negative?)
 
     -> {
       c.negative?
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/complex/polar_spec.rb b/spec/ruby/core/complex/polar_spec.rb
index 56335584efe..824211fcd05 100644
--- a/spec/ruby/core/complex/polar_spec.rb
+++ b/spec/ruby/core/complex/polar_spec.rb
@@ -7,22 +7,22 @@
   end
 
   it "raises a TypeError when given non real arguments" do
-    ->{ Complex.polar(nil)      }.should raise_error(TypeError)
-    ->{ Complex.polar(nil, nil) }.should raise_error(TypeError)
+    ->{ Complex.polar(nil)      }.should.raise(TypeError)
+    ->{ Complex.polar(nil, nil) }.should.raise(TypeError)
   end
 
   it "computes the real values of the real & imaginary parts from the polar form" do
     a = Complex.polar(1.0+0.0i, Math::PI/2+0.0i)
     a.real.should be_close(0.0, TOLERANCE)
     a.imag.should be_close(1.0, TOLERANCE)
-    a.real.real?.should be_true
-    a.imag.real?.should be_true
+    a.real.real?.should == true
+    a.imag.real?.should == true
 
     b = Complex.polar(1+0.0i)
     b.real.should be_close(1.0, TOLERANCE)
     b.imag.should be_close(0.0, TOLERANCE)
-    b.real.real?.should be_true
-    b.imag.real?.should be_true
+    b.real.real?.should == true
+    b.imag.real?.should == true
   end
 end
 
diff --git a/spec/ruby/core/complex/positive_spec.rb b/spec/ruby/core/complex/positive_spec.rb
index f1bad8608ca..d2fb2565381 100644
--- a/spec/ruby/core/complex/positive_spec.rb
+++ b/spec/ruby/core/complex/positive_spec.rb
@@ -4,10 +4,10 @@
   it "is undefined" do
     c = Complex(1)
 
-    c.methods.should_not include(:positive?)
+    c.methods.should_not.include?(:positive?)
 
     -> {
       c.positive?
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/complex/rationalize_spec.rb b/spec/ruby/core/complex/rationalize_spec.rb
index 043b8ddf2a0..d49bb52def7 100644
--- a/spec/ruby/core/complex/rationalize_spec.rb
+++ b/spec/ruby/core/complex/rationalize_spec.rb
@@ -2,11 +2,11 @@
 
 describe "Complex#rationalize" do
   it "raises RangeError if self has non-zero imaginary part" do
-    -> { Complex(1,5).rationalize }.should raise_error(RangeError)
+    -> { Complex(1,5).rationalize }.should.raise(RangeError)
   end
 
   it "raises RangeError if self has 0.0 imaginary part" do
-    -> { Complex(1,0.0).rationalize }.should raise_error(RangeError)
+    -> { Complex(1,0.0).rationalize }.should.raise(RangeError)
   end
 
   it "returns a Rational if self has zero imaginary part" do
@@ -25,7 +25,7 @@
   end
 
   it "raises ArgumentError when passed more than one argument" do
-    -> { Complex(1,0).rationalize(0.1, 0.1) }.should raise_error(ArgumentError)
-    -> { Complex(1,0).rationalize(0.1, 0.1, 2) }.should raise_error(ArgumentError)
+    -> { Complex(1,0).rationalize(0.1, 0.1) }.should.raise(ArgumentError)
+    -> { Complex(1,0).rationalize(0.1, 0.1, 2) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/complex/real_spec.rb b/spec/ruby/core/complex/real_spec.rb
index 2ea791c005a..41734b23f0b 100644
--- a/spec/ruby/core/complex/real_spec.rb
+++ b/spec/ruby/core/complex/real_spec.rb
@@ -11,18 +11,18 @@
 
 describe "Complex#real?" do
   it "returns false if there is an imaginary part" do
-    Complex(2,3).real?.should be_false
+    Complex(2,3).real?.should == false
   end
 
   it "returns false if there is not an imaginary part" do
-    Complex(2).real?.should be_false
+    Complex(2).real?.should == false
   end
 
   it "returns false if the real part is Infinity" do
-    Complex(infinity_value).real?.should be_false
+    Complex(infinity_value).real?.should == false
   end
 
   it "returns false if the real part is NaN" do
-    Complex(nan_value).real?.should be_false
+    Complex(nan_value).real?.should == false
   end
 end
diff --git a/spec/ruby/core/complex/shared/divide.rb b/spec/ruby/core/complex/shared/divide.rb
index a60802c74cb..ef79ecdf751 100644
--- a/spec/ruby/core/complex/shared/divide.rb
+++ b/spec/ruby/core/complex/shared/divide.rb
@@ -19,11 +19,11 @@
     end
 
     it "raises a ZeroDivisionError when given zero" do
-      -> { Complex(20, 40).send(@method, 0) }.should raise_error(ZeroDivisionError)
+      -> { Complex(20, 40).send(@method, 0) }.should.raise(ZeroDivisionError)
     end
 
     it "produces Rational parts" do
-      Complex(5, 9).send(@method, 2).should eql(Complex(Rational(5,2), Rational(9,2)))
+      Complex(5, 9).send(@method, 2).should.eql?(Complex(Rational(5,2), Rational(9,2)))
     end
   end
 
@@ -76,7 +76,7 @@
       other = mock_numeric('other')
       other.should_receive(:real?).any_number_of_times.and_return(false)
       other.should_receive(:coerce).with(complex).and_return([5, 2])
-      complex.send(@method, other).should eql(Rational(5, 2))
+      complex.send(@method, other).should.eql?(Rational(5, 2))
     end
   end
 end
diff --git a/spec/ruby/core/complex/shared/rect.rb b/spec/ruby/core/complex/shared/rect.rb
index 4ac294e7716..858234961b6 100644
--- a/spec/ruby/core/complex/shared/rect.rb
+++ b/spec/ruby/core/complex/shared/rect.rb
@@ -13,7 +13,7 @@
 
   it "returns an Array" do
     @numbers.each do |number|
-      number.send(@method).should be_an_instance_of(Array)
+      number.send(@method).should.instance_of?(Array)
     end
   end
 
@@ -37,7 +37,7 @@
 
   it "raises an ArgumentError if given any arguments" do
     @numbers.each do |number|
-      -> { number.send(@method, number) }.should raise_error(ArgumentError)
+      -> { number.send(@method, number) }.should.raise(ArgumentError)
     end
   end
 end
@@ -57,7 +57,7 @@
     it "raises TypeError" do
       n = mock_numeric('n')
       n.should_receive(:real?).any_number_of_times.and_return(false)
-      -> { Complex.send(@method, n) }.should raise_error(TypeError)
+      -> { Complex.send(@method, n) }.should.raise(TypeError)
     end
   end
 
@@ -68,7 +68,7 @@
         n2 = mock_numeric('n2')
         n1.should_receive(:real?).any_number_of_times.and_return(r1)
         n2.should_receive(:real?).any_number_of_times.and_return(r2)
-        -> { Complex.send(@method, n1, n2) }.should raise_error(TypeError)
+        -> { Complex.send(@method, n1, n2) }.should.raise(TypeError)
       end
     end
   end
@@ -87,8 +87,8 @@
 
   describe "passed a non-Numeric" do
     it "raises TypeError" do
-      -> { Complex.send(@method, :sym) }.should raise_error(TypeError)
-      -> { Complex.send(@method, 0, :sym) }.should raise_error(TypeError)
+      -> { Complex.send(@method, :sym) }.should.raise(TypeError)
+      -> { Complex.send(@method, 0, :sym) }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/complex/to_c_spec.rb b/spec/ruby/core/complex/to_c_spec.rb
index 5ce01d9d4e9..cd7195556c9 100644
--- a/spec/ruby/core/complex/to_c_spec.rb
+++ b/spec/ruby/core/complex/to_c_spec.rb
@@ -3,7 +3,7 @@
 describe "Complex#to_c" do
   it "returns self" do
     value = Complex(1, 5)
-    value.to_c.should equal(value)
+    value.to_c.should.equal?(value)
   end
 
   it 'returns the same value' do
diff --git a/spec/ruby/core/complex/to_f_spec.rb b/spec/ruby/core/complex/to_f_spec.rb
index b53471c1fcc..9f3265cdb92 100644
--- a/spec/ruby/core/complex/to_f_spec.rb
+++ b/spec/ruby/core/complex/to_f_spec.rb
@@ -29,13 +29,13 @@
 
   describe "when the imaginary part is non-zero" do
     it "raises RangeError" do
-      -> { Complex(0, 1).to_f }.should raise_error(RangeError)
+      -> { Complex(0, 1).to_f }.should.raise(RangeError)
     end
   end
 
   describe "when the imaginary part is Float 0.0" do
     it "raises RangeError" do
-      -> { Complex(0, 0.0).to_f }.should raise_error(RangeError)
+      -> { Complex(0, 0.0).to_f }.should.raise(RangeError)
     end
   end
 end
diff --git a/spec/ruby/core/complex/to_i_spec.rb b/spec/ruby/core/complex/to_i_spec.rb
index 1e78f5ec0e6..9149ffbbaa0 100644
--- a/spec/ruby/core/complex/to_i_spec.rb
+++ b/spec/ruby/core/complex/to_i_spec.rb
@@ -29,13 +29,13 @@
 
   describe "when the imaginary part is non-zero" do
     it "raises RangeError" do
-      -> { Complex(0, 1).to_i }.should raise_error(RangeError)
+      -> { Complex(0, 1).to_i }.should.raise(RangeError)
     end
   end
 
   describe "when the imaginary part is Float 0.0" do
     it "raises RangeError" do
-      -> { Complex(0, 0.0).to_i }.should raise_error(RangeError)
+      -> { Complex(0, 0.0).to_i }.should.raise(RangeError)
     end
   end
 end
diff --git a/spec/ruby/core/complex/to_r_spec.rb b/spec/ruby/core/complex/to_r_spec.rb
index 788027a5003..6587ae9e2eb 100644
--- a/spec/ruby/core/complex/to_r_spec.rb
+++ b/spec/ruby/core/complex/to_r_spec.rb
@@ -29,14 +29,14 @@
 
   describe "when the imaginary part is non-zero" do
     it "raises RangeError" do
-      -> { Complex(0, 1).to_r }.should raise_error(RangeError)
+      -> { Complex(0, 1).to_r }.should.raise(RangeError)
     end
   end
 
   describe "when the imaginary part is Float 0.0" do
     ruby_version_is ''...'3.4' do
       it "raises RangeError" do
-        -> { Complex(0, 0.0).to_r }.should raise_error(RangeError)
+        -> { Complex(0, 0.0).to_r }.should.raise(RangeError)
       end
     end
 
diff --git a/spec/ruby/core/conditionvariable/broadcast_spec.rb b/spec/ruby/core/conditionvariable/broadcast_spec.rb
index 55a7b89c729..16c7b4cc8d4 100644
--- a/spec/ruby/core/conditionvariable/broadcast_spec.rb
+++ b/spec/ruby/core/conditionvariable/broadcast_spec.rb
@@ -24,7 +24,7 @@
     # wait until all threads are sleeping (ie waiting)
     Thread.pass until threads.all?(&:stop?)
 
-    r2.should be_empty
+    r2.should.empty?
     m.synchronize do
       cv.broadcast
     end
diff --git a/spec/ruby/core/conditionvariable/marshal_dump_spec.rb b/spec/ruby/core/conditionvariable/marshal_dump_spec.rb
index 88b1cc38c14..594c178e888 100644
--- a/spec/ruby/core/conditionvariable/marshal_dump_spec.rb
+++ b/spec/ruby/core/conditionvariable/marshal_dump_spec.rb
@@ -3,6 +3,6 @@
 describe "ConditionVariable#marshal_dump" do
   it "raises a TypeError" do
     cv = ConditionVariable.new
-    -> { cv.marshal_dump }.should raise_error(TypeError, /can't dump/)
+    -> { cv.marshal_dump }.should.raise(TypeError, /can't dump/)
   end
 end
diff --git a/spec/ruby/core/conditionvariable/signal_spec.rb b/spec/ruby/core/conditionvariable/signal_spec.rb
index 43a9cc611b5..3b266cf8c67 100644
--- a/spec/ruby/core/conditionvariable/signal_spec.rb
+++ b/spec/ruby/core/conditionvariable/signal_spec.rb
@@ -24,7 +24,7 @@
     # wait until all threads are sleeping (ie waiting)
     Thread.pass until threads.all?(&:stop?)
 
-    r2.should be_empty
+    r2.should.empty?
     100.times do |i|
       m.synchronize do
         cv.signal
diff --git a/spec/ruby/core/conditionvariable/wait_spec.rb b/spec/ruby/core/conditionvariable/wait_spec.rb
index fe73e513c07..1af53a15a2d 100644
--- a/spec/ruby/core/conditionvariable/wait_spec.rb
+++ b/spec/ruby/core/conditionvariable/wait_spec.rb
@@ -163,7 +163,7 @@
         # On TruffleRuby, this causes a safepoint which has interesting
         # interactions with the ConditionVariable.
         bt = t.backtrace
-        bt.should be_kind_of(Array)
+        bt.should.is_a?(Array)
         bt.size.should >= 2
       }
     end
diff --git a/spec/ruby/core/data/deconstruct_keys_spec.rb b/spec/ruby/core/data/deconstruct_keys_spec.rb
index df378f8b986..53f2334546a 100644
--- a/spec/ruby/core/data/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/data/deconstruct_keys_spec.rb
@@ -15,7 +15,7 @@
 
     -> {
       d.deconstruct_keys
-    }.should raise_error(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
+    }.should.raise(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
   end
 
   it "returns only specified keys" do
@@ -34,29 +34,6 @@
     d.deconstruct_keys(['x', 'y']).should == {'x' => 1, 'y' => 2}
   end
 
-  it "accepts argument position number as well but returns them as keys" do
-    klass = Data.define(:x, :y)
-    d = klass.new(1, 2)
-
-    d.deconstruct_keys([0, 1]).should == {0 => 1, 1 => 2}
-    d.deconstruct_keys([0]   ).should == {0 => 1}
-    d.deconstruct_keys([-1]  ).should == {-1 => 2}
-  end
-
-  it "ignores incorrect position numbers" do
-    klass = Data.define(:x, :y)
-    d = klass.new(1, 2)
-
-    d.deconstruct_keys([0, 3]).should == {0 => 1}
-  end
-
-  it "support mixing attribute names and argument position numbers" do
-    klass = Data.define(:x, :y)
-    d = klass.new(1, 2)
-
-    d.deconstruct_keys([0, :x]).should == {0 => 1, :x => 1}
-  end
-
   it "returns an empty hash when there are more keys than attributes" do
     klass = Data.define(:x, :y)
     d = klass.new(1, 2)
@@ -72,14 +49,6 @@
     d.deconstruct_keys([:x, :a]).should == {x: 1}
   end
 
-  it "returns at first not existing argument position number" do
-    klass = Data.define(:x, :y)
-    d = klass.new(1, 2)
-
-    d.deconstruct_keys([3, 0]).should == {}
-    d.deconstruct_keys([0, 3]).should == {0 => 1}
-  end
-
   it "accepts nil argument and return all the attributes" do
     klass = Data.define(:x, :y)
     d = klass.new(1, 2)
@@ -87,44 +56,55 @@
     d.deconstruct_keys(nil).should == {x: 1, y: 2}
   end
 
-  it "tries to convert a key with #to_int if index is not a String nor a Symbol, but responds to #to_int" do
-    klass = Data.define(:x, :y)
-    d = klass.new(1, 2)
+  ruby_bug "Bug #21844", ""..."4.1" do
+    it "tries to convert a key with #to_str if index is not a String nor a Symbol, but responds to #to_str" do
+      klass = Data.define(:x, :y)
+      d = klass.new(1, 2)
 
-    key = mock("to_int")
-    key.should_receive(:to_int).and_return(1)
+      key = mock("to_str")
+      key.should_receive(:to_str).and_return("y")
 
-    d.deconstruct_keys([key]).should == { key => 2 }
-  end
+      d.deconstruct_keys([key]).should == { "y" => 2 }
+    end
 
-  it "raises a TypeError if the conversion with #to_int does not return an Integer" do
-    klass = Data.define(:x, :y)
-    d = klass.new(1, 2)
+    it "raise an error on argument position number" do
+      klass = Data.define(:x, :y)
+      d = klass.new(1, 2)
 
-    key = mock("to_int")
-    key.should_receive(:to_int).and_return("not an Integer")
+      -> {
+        d.deconstruct_keys([0, 1])
+      }.should.raise(TypeError, "0 is not a symbol nor a string")
+    end
 
-    -> {
-      d.deconstruct_keys([key])
-    }.should raise_error(TypeError, /can't convert MockObject to Integer/)
-  end
+    it "raises a TypeError if the conversion with #to_str does not return a String" do
+      klass = Data.define(:x, :y)
+      d = klass.new(1, 2)
 
-  it "raises TypeError if index is not a String, a Symbol and not convertible to Integer " do
-    klass = Data.define(:x, :y)
-    d = klass.new(1, 2)
+      key = mock("to_str")
+      key.should_receive(:to_str).and_return(0)
 
-    -> {
-      d.deconstruct_keys([0, []])
-    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+      -> {
+        d.deconstruct_keys([key])
+      }.should raise_consistent_error(TypeError, /can't convert MockObject into String/)
+    end
+
+    it "raises TypeError if index is not a Symbol and not convertible to String" do
+      klass = Data.define(:x, :y)
+      d = klass.new(1, 2)
+
+      -> {
+        d.deconstruct_keys([0, []])
+      }.should.raise(TypeError, "0 is not a symbol nor a string")
+    end
   end
 
   it "raise TypeError if passed anything except nil or array" do
     klass = Data.define(:x, :y)
     d = klass.new(1, 2)
 
-    -> { d.deconstruct_keys('x') }.should raise_error(TypeError, /expected Array or nil/)
-    -> { d.deconstruct_keys(1)   }.should raise_error(TypeError, /expected Array or nil/)
-    -> { d.deconstruct_keys(:x)  }.should raise_error(TypeError, /expected Array or nil/)
-    -> { d.deconstruct_keys({})  }.should raise_error(TypeError, /expected Array or nil/)
+    -> { d.deconstruct_keys('x') }.should.raise(TypeError, /expected Array or nil/)
+    -> { d.deconstruct_keys(1)   }.should.raise(TypeError, /expected Array or nil/)
+    -> { d.deconstruct_keys(:x)  }.should.raise(TypeError, /expected Array or nil/)
+    -> { d.deconstruct_keys({})  }.should.raise(TypeError, /expected Array or nil/)
   end
 end
diff --git a/spec/ruby/core/data/hash_spec.rb b/spec/ruby/core/data/hash_spec.rb
index c23f08a71d6..bab146c92ef 100644
--- a/spec/ruby/core/data/hash_spec.rb
+++ b/spec/ruby/core/data/hash_spec.rb
@@ -6,7 +6,7 @@
     a = DataSpecs::Measure.new(42, "km")
     b = DataSpecs::Measure.new(42, "km")
     a.hash.should == b.hash
-    a.hash.should be_an_instance_of(Integer)
+    a.hash.should.instance_of?(Integer)
   end
 
   it "returns different hashes for objects with different values" do
diff --git a/spec/ruby/core/data/initialize_spec.rb b/spec/ruby/core/data/initialize_spec.rb
index c2100ec44ec..63d49e9c84d 100644
--- a/spec/ruby/core/data/initialize_spec.rb
+++ b/spec/ruby/core/data/initialize_spec.rb
@@ -2,6 +2,16 @@
 require_relative 'fixtures/classes'
 
 describe "Data#initialize" do
+  context "with no members" do
+    ruby_bug "#21819", ""..."4.0.1" do
+      it "is frozen" do
+        data = Data.define
+
+        data.new.should.frozen?
+      end
+    end
+  end
+
   it "accepts positional arguments" do
     data = DataSpecs::Measure.new(42, "km")
 
@@ -51,7 +61,7 @@
   it "raises ArgumentError if no arguments are given" do
     -> {
       DataSpecs::Measure.new
-    }.should raise_error(ArgumentError) { |e|
+    }.should.raise(ArgumentError) { |e|
       e.message.should.include?("missing keywords: :amount, :unit")
     }
   end
@@ -59,7 +69,7 @@
   it "raises ArgumentError if at least one argument is missing" do
     -> {
       DataSpecs::Measure.new(unit: "km")
-    }.should raise_error(ArgumentError) { |e|
+    }.should.raise(ArgumentError) { |e|
       e.message.should.include?("missing keyword: :amount")
     }
   end
@@ -67,7 +77,7 @@
   it "raises ArgumentError if unknown keyword is given" do
     -> {
       DataSpecs::Measure.new(amount: 42, unit: "km", system: "metric")
-    }.should raise_error(ArgumentError) { |e|
+    }.should.raise(ArgumentError) { |e|
       e.message.should.include?("unknown keyword: :system")
     }
   end
@@ -80,7 +90,7 @@
   end
 
   it "supports Data with no fields" do
-    -> { DataSpecs::Empty.new }.should_not raise_error
+    -> { DataSpecs::Empty.new }.should_not.raise
   end
 
   it "can be overridden" do
@@ -122,16 +132,16 @@ def initialize(*, **)
       ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
     end
 
-      it "accepts positional arguments with empty keyword arguments" do
-        data = DataSpecs::SingleWithOverriddenName.new(42, **{})
+    it "accepts positional arguments with empty keyword arguments" do
+      data = DataSpecs::SingleWithOverriddenName.new(42, **{})
 
-        data.value.should == 42
+      data.value.should == 42
 
-        data = DataSpecs::MeasureWithOverriddenName.new(42, "km", **{})
+      data = DataSpecs::MeasureWithOverriddenName.new(42, "km", **{})
 
-        data.amount.should == 42
-        data.unit.should == "km"
-      end
+      data.amount.should == 42
+      data.unit.should == "km"
+    end
 
     # See https://github.com/ruby/psych/pull/765
     it "can be deserialized by calling Data.instance_method(:initialize)" do
diff --git a/spec/ruby/core/data/to_h_spec.rb b/spec/ruby/core/data/to_h_spec.rb
index 64816b72510..41925cf3b24 100644
--- a/spec/ruby/core/data/to_h_spec.rb
+++ b/spec/ruby/core/data/to_h_spec.rb
@@ -28,18 +28,18 @@
       data = DataSpecs::Measure.new(amount: 42, unit: 'km')
       -> do
         data.to_h { |k, v| [k.to_s, v*v, 1] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
 
       -> do
         data.to_h { |k, v| [k] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
     end
 
     it "raises TypeError if block returns something other than Array" do
       data = DataSpecs::Measure.new(amount: 42, unit: 'km')
       -> do
         data.to_h { |k, v| "not-array" }
-      end.should raise_error(TypeError, /wrong element type String/)
+      end.should.raise(TypeError, /wrong element type String/)
     end
 
     it "coerces returned pair to Array with #to_ary" do
@@ -57,7 +57,7 @@
 
       -> do
         data.to_h { |k| x }
-      end.should raise_error(TypeError, /wrong element type MockObject/)
+      end.should.raise(TypeError, /wrong element type MockObject/)
     end
   end
 end
diff --git a/spec/ruby/core/data/with_spec.rb b/spec/ruby/core/data/with_spec.rb
index 83cb97fa607..b74df185c72 100644
--- a/spec/ruby/core/data/with_spec.rb
+++ b/spec/ruby/core/data/with_spec.rb
@@ -28,7 +28,7 @@
 
     -> {
       data.with(4, "m")
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 0)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 0)")
   end
 
   it "does not depend on the Data.new method" do
diff --git a/spec/ruby/core/dir/chdir_spec.rb b/spec/ruby/core/dir/chdir_spec.rb
index fd277e4e1d6..2dc598e2a95 100644
--- a/spec/ruby/core/dir/chdir_spec.rb
+++ b/spec/ruby/core/dir/chdir_spec.rb
@@ -90,8 +90,8 @@ def to_str;  DirSpecs.mock_dir; end
   end
 
   it "raises an Errno::ENOENT if the directory does not exist" do
-    -> { Dir.chdir DirSpecs.nonexistent }.should raise_error(Errno::ENOENT)
-    -> { Dir.chdir(DirSpecs.nonexistent) { } }.should raise_error(Errno::ENOENT)
+    -> { Dir.chdir DirSpecs.nonexistent }.should.raise(Errno::ENOENT)
+    -> { Dir.chdir(DirSpecs.nonexistent) { } }.should.raise(Errno::ENOENT)
   end
 
   it "raises an Errno::ENOENT if the original directory no longer exists" do
@@ -106,7 +106,7 @@ def to_str;  DirSpecs.mock_dir; end
         Dir.chdir dir1 do
           Dir.chdir(dir2) { Dir.unlink dir1 }
         end
-      }.should raise_error(Errno::ENOENT)
+      }.should.raise(Errno::ENOENT)
     ensure
       Dir.unlink dir1 if Dir.exist?(dir1)
       Dir.unlink dir2 if Dir.exist?(dir2)
diff --git a/spec/ruby/core/dir/children_spec.rb b/spec/ruby/core/dir/children_spec.rb
index 0ad3df4669e..6e6da1dd443 100644
--- a/spec/ruby/core/dir/children_spec.rb
+++ b/spec/ruby/core/dir/children_spec.rb
@@ -47,25 +47,25 @@
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      children.should include("こんにちは.txt".dup.force_encoding(encoding))
+      children.should.include?("こんにちは.txt".dup.force_encoding(encoding))
     end
-    children.first.encoding.should equal(Encoding.find("filesystem"))
+    children.first.encoding.should.equal?(Encoding.find("filesystem"))
   end
 
   it "returns children encoded with the specified encoding" do
     dir = File.join(DirSpecs.mock_dir, 'special')
     children = Dir.children(dir, encoding: "euc-jp").sort
-    children.first.encoding.should equal(Encoding::EUC_JP)
+    children.first.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "returns children transcoded to the default internal encoding" do
     Encoding.default_internal = Encoding::EUC_KR
     children = Dir.children(File.join(DirSpecs.mock_dir, 'special')).sort
-    children.first.encoding.should equal(Encoding::EUC_KR)
+    children.first.encoding.should.equal?(Encoding::EUC_KR)
   end
 
   it "raises a SystemCallError if called with a nonexistent directory" do
-    -> { Dir.children DirSpecs.nonexistent }.should raise_error(SystemCallError)
+    -> { Dir.children DirSpecs.nonexistent }.should.raise(SystemCallError)
   end
 end
 
@@ -113,23 +113,23 @@
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      children.should include("こんにちは.txt".dup.force_encoding(encoding))
+      children.should.include?("こんにちは.txt".dup.force_encoding(encoding))
     end
-    children.first.encoding.should equal(Encoding.find("filesystem"))
+    children.first.encoding.should.equal?(Encoding.find("filesystem"))
   end
 
   it "returns children encoded with the specified encoding" do
     path = File.join(DirSpecs.mock_dir, 'special')
     @dir = Dir.new(path, encoding: "euc-jp")
     children = @dir.children.sort
-    children.first.encoding.should equal(Encoding::EUC_JP)
+    children.first.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "returns children transcoded to the default internal encoding" do
     Encoding.default_internal = Encoding::EUC_KR
     @dir = Dir.new(File.join(DirSpecs.mock_dir, 'special'))
     children = @dir.children.sort
-    children.first.encoding.should equal(Encoding::EUC_KR)
+    children.first.encoding.should.equal?(Encoding::EUC_KR)
   end
 
   it "returns the same result when called repeatedly" do
diff --git a/spec/ruby/core/dir/chroot_spec.rb b/spec/ruby/core/dir/chroot_spec.rb
index a5ca8943fcd..79ad9759b06 100644
--- a/spec/ruby/core/dir/chroot_spec.rb
+++ b/spec/ruby/core/dir/chroot_spec.rb
@@ -21,17 +21,17 @@
         end
 
         it "raises an Errno::EPERM exception if the directory exists" do
-          -> { Dir.chroot('.') }.should raise_error(Errno::EPERM)
+          -> { Dir.chroot('.') }.should.raise(Errno::EPERM)
         end
 
         it "raises a SystemCallError if the directory doesn't exist" do
-          -> { Dir.chroot('xgwhwhsjai2222jg') }.should raise_error(SystemCallError)
+          -> { Dir.chroot('xgwhwhsjai2222jg') }.should.raise(SystemCallError)
         end
 
         it "calls #to_path on non-String argument" do
           p = mock('path')
           p.should_receive(:to_path).and_return('.')
-          -> { Dir.chroot(p) }.should raise_error(Errno::EPERM)
+          -> { Dir.chroot(p) }.should.raise(Errno::EPERM)
         end
       end
     end
diff --git a/spec/ruby/core/dir/close_spec.rb b/spec/ruby/core/dir/close_spec.rb
index 10ad1369c84..9902d98934b 100644
--- a/spec/ruby/core/dir/close_spec.rb
+++ b/spec/ruby/core/dir/close_spec.rb
@@ -15,7 +15,7 @@
     dir.close.should == nil
 
     platform_is_not :windows do
-      -> { dir.fileno }.should raise_error(IOError, /closed directory/)
+      -> { dir.fileno }.should.raise(IOError, /closed directory/)
     end
   end
 
@@ -33,8 +33,8 @@
         dir.close
         dir_new.close
 
-        -> { dir.fileno }.should raise_error(IOError, /closed directory/)
-        -> { dir_new.fileno }.should raise_error(IOError, /closed directory/)
+        -> { dir.fileno }.should.raise(IOError, /closed directory/)
+        -> { dir_new.fileno }.should.raise(IOError, /closed directory/)
       end
     end
   end
@@ -46,7 +46,7 @@
         dir_new = Dir.for_fd(dir.fileno)
         dir.close
 
-        -> { dir_new.close }.should raise_error(Errno::EBADF, 'Bad file descriptor - closedir')
+        -> { dir_new.close }.should.raise(Errno::EBADF, 'Bad file descriptor - closedir')
       end
     end
   end
diff --git a/spec/ruby/core/dir/each_child_spec.rb b/spec/ruby/core/dir/each_child_spec.rb
index 7194273b952..4d6575df39d 100644
--- a/spec/ruby/core/dir/each_child_spec.rb
+++ b/spec/ruby/core/dir/each_child_spec.rb
@@ -36,12 +36,12 @@
   end
 
   it "raises a SystemCallError if passed a nonexistent directory" do
-    -> { Dir.each_child(DirSpecs.nonexistent) {} }.should raise_error(SystemCallError)
+    -> { Dir.each_child(DirSpecs.nonexistent) {} }.should.raise(SystemCallError)
   end
 
   describe "when no block is given" do
     it "returns an Enumerator" do
-      Dir.each_child(DirSpecs.mock_dir).should be_an_instance_of(Enumerator)
+      Dir.each_child(DirSpecs.mock_dir).should.instance_of?(Enumerator)
       Dir.each_child(DirSpecs.mock_dir).to_a.sort.should == DirSpecs.expected_paths - %w[. ..]
     end
 
@@ -103,7 +103,7 @@
     it "returns an Enumerator" do
       @dir = Dir.new(DirSpecs.mock_dir)
 
-      @dir.each_child.should be_an_instance_of(Enumerator)
+      @dir.each_child.should.instance_of?(Enumerator)
       @dir.each_child.to_a.sort.should == DirSpecs.expected_paths - %w|. ..|
     end
 
diff --git a/spec/ruby/core/dir/each_spec.rb b/spec/ruby/core/dir/each_spec.rb
index 7674663d82b..e997e340b12 100644
--- a/spec/ruby/core/dir/each_spec.rb
+++ b/spec/ruby/core/dir/each_spec.rb
@@ -32,7 +32,7 @@
     @dir.each {}.should == @dir
     @dir.read.should == nil
     @dir.rewind
-    ls.should include(@dir.read)
+    ls.should.include?(@dir.read)
   end
 
   it "returns the same result when called repeatedly" do
@@ -48,7 +48,7 @@
 
   describe "when no block is given" do
     it "returns an Enumerator" do
-      @dir.each.should be_an_instance_of(Enumerator)
+      @dir.each.should.instance_of?(Enumerator)
       @dir.each.to_a.sort.should == DirSpecs.expected_paths
     end
 
diff --git a/spec/ruby/core/dir/empty_spec.rb b/spec/ruby/core/dir/empty_spec.rb
index 8cc87577983..3b6b2bac853 100644
--- a/spec/ruby/core/dir/empty_spec.rb
+++ b/spec/ruby/core/dir/empty_spec.rb
@@ -12,20 +12,20 @@
 
   it "returns true for empty directories" do
     result = Dir.empty? @empty_dir
-    result.should be_true
+    result.should == true
   end
 
   it "returns false for non-empty directories" do
     result = Dir.empty? __dir__
-    result.should be_false
+    result.should == false
   end
 
   it "returns false for a non-directory" do
     result = Dir.empty? __FILE__
-    result.should be_false
+    result.should == false
   end
 
   it "raises ENOENT for nonexistent directories" do
-    -> { Dir.empty? tmp("nonexistent") }.should raise_error(Errno::ENOENT)
+    -> { Dir.empty? tmp("nonexistent") }.should.raise(Errno::ENOENT)
   end
 end
diff --git a/spec/ruby/core/dir/entries_spec.rb b/spec/ruby/core/dir/entries_spec.rb
index 7462542acf4..f3ca49b26d4 100644
--- a/spec/ruby/core/dir/entries_spec.rb
+++ b/spec/ruby/core/dir/entries_spec.rb
@@ -47,24 +47,24 @@
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      entries.should include("こんにちは.txt".dup.force_encoding(encoding))
+      entries.should.include?("こんにちは.txt".dup.force_encoding(encoding))
     end
-    entries.first.encoding.should equal(Encoding.find("filesystem"))
+    entries.first.encoding.should.equal?(Encoding.find("filesystem"))
   end
 
   it "returns entries encoded with the specified encoding" do
     dir = File.join(DirSpecs.mock_dir, 'special')
     entries = Dir.entries(dir, encoding: "euc-jp").sort
-    entries.first.encoding.should equal(Encoding::EUC_JP)
+    entries.first.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "returns entries transcoded to the default internal encoding" do
     Encoding.default_internal = Encoding::EUC_KR
     entries = Dir.entries(File.join(DirSpecs.mock_dir, 'special')).sort
-    entries.first.encoding.should equal(Encoding::EUC_KR)
+    entries.first.encoding.should.equal?(Encoding::EUC_KR)
   end
 
   it "raises a SystemCallError if called with a nonexistent directory" do
-    -> { Dir.entries DirSpecs.nonexistent }.should raise_error(SystemCallError)
+    -> { Dir.entries DirSpecs.nonexistent }.should.raise(SystemCallError)
   end
 end
diff --git a/spec/ruby/core/dir/fchdir_spec.rb b/spec/ruby/core/dir/fchdir_spec.rb
index d5e77f7f03f..bd1a92b05ef 100644
--- a/spec/ruby/core/dir/fchdir_spec.rb
+++ b/spec/ruby/core/dir/fchdir_spec.rb
@@ -50,13 +50,13 @@
     end
 
     it "raises a SystemCallError if the file descriptor given is not valid" do
-      -> { Dir.fchdir(-1) }.should raise_error(SystemCallError, "Bad file descriptor - fchdir")
-      -> { Dir.fchdir(-1) { } }.should raise_error(SystemCallError, "Bad file descriptor - fchdir")
+      -> { Dir.fchdir(-1) }.should.raise(SystemCallError, "Bad file descriptor - fchdir")
+      -> { Dir.fchdir(-1) { } }.should.raise(SystemCallError, "Bad file descriptor - fchdir")
     end
 
     it "raises a SystemCallError if the file descriptor given is not for a directory" do
-      -> { Dir.fchdir $stdout.fileno }.should raise_error(SystemCallError, /(Not a directory|Invalid argument) - fchdir/)
-      -> { Dir.fchdir($stdout.fileno) { } }.should raise_error(SystemCallError, /(Not a directory|Invalid argument) - fchdir/)
+      -> { Dir.fchdir $stdout.fileno }.should.raise(SystemCallError, /(Not a directory|Invalid argument) - fchdir/)
+      -> { Dir.fchdir($stdout.fileno) { } }.should.raise(SystemCallError, /(Not a directory|Invalid argument) - fchdir/)
     end
   end
 end
@@ -64,8 +64,8 @@
 platform_is :windows do
   describe "Dir.fchdir" do
     it "raises NotImplementedError" do
-      -> { Dir.fchdir 1 }.should raise_error(NotImplementedError)
-      -> { Dir.fchdir(1) { } }.should raise_error(NotImplementedError)
+      -> { Dir.fchdir 1 }.should.raise(NotImplementedError)
+      -> { Dir.fchdir(1) { } }.should.raise(NotImplementedError)
     end
   end
 end
diff --git a/spec/ruby/core/dir/fileno_spec.rb b/spec/ruby/core/dir/fileno_spec.rb
index bb84ef5378f..3b563eb18fd 100644
--- a/spec/ruby/core/dir/fileno_spec.rb
+++ b/spec/ruby/core/dir/fileno_spec.rb
@@ -27,11 +27,11 @@
 
   if has_dir_fileno
     it "returns the file descriptor of the dir" do
-      @dir.fileno.should be_kind_of(Integer)
+      @dir.fileno.should.is_a?(Integer)
     end
   else
     it "raises an error when not implemented on the platform" do
-      -> { @dir.fileno }.should raise_error(NotImplementedError)
+      -> { @dir.fileno }.should.raise(NotImplementedError)
     end
   end
 end
diff --git a/spec/ruby/core/dir/fixtures/common.rb b/spec/ruby/core/dir/fixtures/common.rb
index 848656c9b9a..cfec91f68fa 100644
--- a/spec/ruby/core/dir/fixtures/common.rb
+++ b/spec/ruby/core/dir/fixtures/common.rb
@@ -115,6 +115,7 @@ def self.mock_dir_links
   end
 
   def self.create_mock_dirs
+    delete_mock_dirs
     mock_dir_files.each do |name|
       file = File.join mock_dir, name
       mkdir_p File.dirname(file)
@@ -172,24 +173,28 @@ def self.rmdir_dirs(create = true)
     end
   end
 
+  def self.expected_paths_with_type
+    [
+      [".", :directory],
+      ["..", :directory],
+      [".dotfile", :file],
+      [".dotsubdir", :directory],
+      ["brace", :directory],
+      ["deeply", :directory],
+      ["dir", :directory],
+      ["dir_filename_ordering", :file],
+      ["file_one.ext", :file],
+      ["file_two.ext", :file],
+      ["nested", :directory],
+      ["nondotfile", :file],
+      ["special", :directory],
+      ["subdir_one", :directory],
+      ["subdir_two", :directory],
+   ]
+  end
+
   def self.expected_paths
-    %w[
-      .
-      ..
-      .dotfile
-      .dotsubdir
-      brace
-      deeply
-      dir
-      dir_filename_ordering
-      file_one.ext
-      file_two.ext
-      nested
-      nondotfile
-      special
-      subdir_one
-      subdir_two
-    ]
+    expected_paths_with_type.map(&:first)
   end
 
   def self.expected_glob_paths
diff --git a/spec/ruby/core/dir/for_fd_spec.rb b/spec/ruby/core/dir/for_fd_spec.rb
index 1559e1baa43..bbc75e0f8f1 100644
--- a/spec/ruby/core/dir/for_fd_spec.rb
+++ b/spec/ruby/core/dir/for_fd_spec.rb
@@ -54,15 +54,15 @@
     it "raises TypeError when value cannot be converted to Integer" do
       -> {
         Dir.for_fd(nil)
-      }.should raise_error(TypeError, "no implicit conversion from nil to integer")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of nil into Integer")
     end
 
     it "raises a SystemCallError if the file descriptor given is not valid" do
-      -> { Dir.for_fd(-1) }.should raise_error(SystemCallError, "Bad file descriptor - fdopendir")
+      -> { Dir.for_fd(-1) }.should.raise(SystemCallError, "Bad file descriptor - fdopendir")
     end
 
     it "raises a SystemCallError if the file descriptor given is not for a directory" do
-      -> { Dir.for_fd $stdout.fileno }.should raise_error(SystemCallError, "Not a directory - fdopendir")
+      -> { Dir.for_fd $stdout.fileno }.should.raise(SystemCallError, "Not a directory - fdopendir")
     end
   end
 end
@@ -70,7 +70,7 @@
 platform_is :windows do
   describe "Dir.for_fd" do
     it "raises NotImplementedError" do
-      -> { Dir.for_fd 1 }.should raise_error(NotImplementedError)
+      -> { Dir.for_fd 1 }.should.raise(NotImplementedError)
     end
   end
 end
diff --git a/spec/ruby/core/dir/foreach_spec.rb b/spec/ruby/core/dir/foreach_spec.rb
index 9cf34b1d71c..2a2265a0298 100644
--- a/spec/ruby/core/dir/foreach_spec.rb
+++ b/spec/ruby/core/dir/foreach_spec.rb
@@ -31,11 +31,11 @@
   end
 
   it "raises a SystemCallError if passed a nonexistent directory" do
-    -> { Dir.foreach(DirSpecs.nonexistent) {} }.should raise_error(SystemCallError)
+    -> { Dir.foreach(DirSpecs.nonexistent) {} }.should.raise(SystemCallError)
   end
 
   it "returns an Enumerator if no block given" do
-    Dir.foreach(DirSpecs.mock_dir).should be_an_instance_of(Enumerator)
+    Dir.foreach(DirSpecs.mock_dir).should.instance_of?(Enumerator)
     Dir.foreach(DirSpecs.mock_dir).to_a.sort.should == DirSpecs.expected_paths
   end
 
@@ -53,7 +53,7 @@
 
   describe "when no block is given" do
     it "returns an Enumerator" do
-      Dir.foreach(DirSpecs.mock_dir).should be_an_instance_of(Enumerator)
+      Dir.foreach(DirSpecs.mock_dir).should.instance_of?(Enumerator)
       Dir.foreach(DirSpecs.mock_dir).to_a.sort.should == DirSpecs.expected_paths
     end
 
diff --git a/spec/ruby/core/dir/glob_spec.rb b/spec/ruby/core/dir/glob_spec.rb
index a60b233bc0f..9e81feb15fc 100644
--- a/spec/ruby/core/dir/glob_spec.rb
+++ b/spec/ruby/core/dir/glob_spec.rb
@@ -149,7 +149,7 @@
   it "accepts a block and yields it with each elements" do
     ary = []
     ret = Dir.glob(["file_o*", "file_t*"]) { |t| ary << t }
-    ret.should be_nil
+    ret.should == nil
     ary.should == %w!file_one.ext file_two.ext!
   end
 
diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb
index 966ac38af3e..f0b20e06877 100644
--- a/spec/ruby/core/dir/home_spec.rb
+++ b/spec/ruby/core/dir/home_spec.rb
@@ -74,7 +74,7 @@
   end
 
   it "raises an ArgumentError if the named user doesn't exist" do
-    -> { Dir.home('geuw2n288dh2k') }.should raise_error(ArgumentError)
+    -> { Dir.home('geuw2n288dh2k') }.should.raise(ArgumentError)
   end
 
   describe "when called with a nil user name" do
diff --git a/spec/ruby/core/dir/inspect_spec.rb b/spec/ruby/core/dir/inspect_spec.rb
index 37338a97d4f..eabaa54ce03 100644
--- a/spec/ruby/core/dir/inspect_spec.rb
+++ b/spec/ruby/core/dir/inspect_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "returns a String" do
-    @dir.inspect.should be_an_instance_of(String)
+    @dir.inspect.should.instance_of?(String)
   end
 
   it "includes the class name" do
@@ -19,6 +19,6 @@
   end
 
   it "includes the directory name" do
-    @dir.inspect.should include(Dir.getwd)
+    @dir.inspect.should.include?(Dir.getwd)
   end
 end
diff --git a/spec/ruby/core/dir/mkdir_spec.rb b/spec/ruby/core/dir/mkdir_spec.rb
index 076ec19dd96..37513e417ad 100644
--- a/spec/ruby/core/dir/mkdir_spec.rb
+++ b/spec/ruby/core/dir/mkdir_spec.rb
@@ -67,19 +67,19 @@
     path = DirSpecs.mock_dir('nonexisting')
     permissions = Object.new
 
-    -> { Dir.mkdir(path, permissions) }.should raise_error(TypeError, 'no implicit conversion of Object into Integer')
+    -> { Dir.mkdir(path, permissions) }.should.raise(TypeError, 'no implicit conversion of Object into Integer')
   end
 
   it "raises a SystemCallError if any of the directories in the path before the last does not exist" do
-    -> { Dir.mkdir "#{DirSpecs.nonexistent}/subdir" }.should raise_error(SystemCallError)
+    -> { Dir.mkdir "#{DirSpecs.nonexistent}/subdir" }.should.raise(SystemCallError)
   end
 
   it "raises Errno::EEXIST if the specified directory already exists" do
-    -> { Dir.mkdir("#{DirSpecs.mock_dir}/dir") }.should raise_error(Errno::EEXIST)
+    -> { Dir.mkdir("#{DirSpecs.mock_dir}/dir") }.should.raise(Errno::EEXIST)
   end
 
   it "raises Errno::EEXIST if the argument points to the existing file" do
-    -> { Dir.mkdir("#{DirSpecs.mock_dir}/file_one.ext") }.should raise_error(Errno::EEXIST)
+    -> { Dir.mkdir("#{DirSpecs.mock_dir}/file_one.ext") }.should.raise(Errno::EEXIST)
   end
 end
 
@@ -100,7 +100,7 @@
       it "raises a SystemCallError when lacking adequate permissions in the parent dir" do
         Dir.mkdir @dir, 0000
 
-        -> { Dir.mkdir "#{@dir}/subdir" }.should raise_error(SystemCallError)
+        -> { Dir.mkdir "#{@dir}/subdir" }.should.raise(SystemCallError)
       end
     end
   end
diff --git a/spec/ruby/core/dir/read_spec.rb b/spec/ruby/core/dir/read_spec.rb
index 276930c6b7e..3f842457f4d 100644
--- a/spec/ruby/core/dir/read_spec.rb
+++ b/spec/ruby/core/dir/read_spec.rb
@@ -15,7 +15,7 @@
     # an FS does not necessarily impose order
     ls = Dir.entries DirSpecs.mock_dir
     dir = Dir.open DirSpecs.mock_dir
-    ls.should include(dir.read)
+    ls.should.include?(dir.read)
     dir.close
   end
 
@@ -61,7 +61,7 @@
             while entry = d.read
               shift_jis_entries << entry
             end
-          }.should_not raise_error
+          }.should_not.raise
         end
       ensure
         Encoding.default_internal = old_internal_encoding
diff --git a/spec/ruby/core/dir/scan_spec.rb b/spec/ruby/core/dir/scan_spec.rb
new file mode 100644
index 00000000000..3aa071337b9
--- /dev/null
+++ b/spec/ruby/core/dir/scan_spec.rb
@@ -0,0 +1,224 @@
+# encoding: utf-8
+
+require_relative '../../spec_helper'
+require_relative 'fixtures/common'
+require_relative '../file/fixtures/file_types'
+
+ruby_version_is "4.1" do
+  describe "Dir.scan" do
+    before :all do
+      FileSpecs.configure_types
+    end
+
+    before :all do
+      DirSpecs.create_mock_dirs
+    end
+
+    after :all do
+      DirSpecs.delete_mock_dirs
+    end
+
+    before :each do
+      @internal = Encoding.default_internal
+    end
+
+    after :each do
+      Encoding.default_internal = @internal
+    end
+
+    it "returns an Array of filename and type pairs in an existing directory including dotfiles" do
+      a = Dir.scan(DirSpecs.mock_dir).sort
+
+      a.should == DirSpecs.expected_paths_with_type - [[".", :directory], ["..", :directory]]
+
+      a = Dir.scan("#{DirSpecs.mock_dir}/deeply/nested").sort
+      a.should == [[".dotfile.ext", :file], ["directory", :directory]]
+    end
+
+    it "yields filename and type in an existing directory including dotfiles" do
+      a = []
+      Dir.scan(DirSpecs.mock_dir) do |n, t|
+        a << [n, t]
+      end
+      a.sort!
+      a.should == DirSpecs.expected_paths_with_type - [[".", :directory], ["..", :directory]]
+
+      a = []
+      Dir.scan("#{DirSpecs.mock_dir}/deeply/nested") do |n, t|
+        a << [n, t]
+      end
+      a.sort!
+      a.should == [[".dotfile.ext", :file], ["directory", :directory]]
+    end
+
+    it "calls #to_path on non-String arguments" do
+      p = mock('path')
+      p.should_receive(:to_path).and_return(DirSpecs.mock_dir)
+      Dir.scan(p)
+    end
+
+    it "accepts an options Hash" do
+      a = Dir.scan("#{DirSpecs.mock_dir}/deeply/nested", encoding: "utf-8").sort
+      a.should == [[".dotfile.ext", :file], ["directory", :directory]]
+    end
+
+    it "returns children names encoded with the filesystem encoding by default" do
+      # This spec depends on the locale not being US-ASCII because if it is, the
+      # children that are not ascii_only? will be BINARY encoded.
+      children = Dir.scan(File.join(DirSpecs.mock_dir, 'special')).sort
+      encoding = Encoding.find("filesystem")
+      encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
+      platform_is_not :windows do
+        children.should.include?(["こんにちは.txt".dup.force_encoding(encoding), :file])
+      end
+      children.first.first.encoding.should.equal?(Encoding.find("filesystem"))
+    end
+
+    it "returns children names encoded with the specified encoding" do
+      dir = File.join(DirSpecs.mock_dir, 'special')
+      children = Dir.scan(dir, encoding: "euc-jp").sort
+      children.first.first.encoding.should.equal?(Encoding::EUC_JP)
+    end
+
+    it "returns children names transcoded to the default internal encoding" do
+      Encoding.default_internal = Encoding::EUC_KR
+      children = Dir.scan(File.join(DirSpecs.mock_dir, 'special')).sort
+      children.first.first.encoding.should.equal?(Encoding::EUC_KR)
+    end
+
+    it "raises a SystemCallError if called with a nonexistent directory" do
+      -> { Dir.scan DirSpecs.nonexistent }.should.raise(SystemCallError)
+    end
+
+    it "handles symlink" do
+      FileSpecs.symlink do |path|
+        Dir.scan(File.dirname(path)).map(&:last).should.include?(:link)
+      end
+    end
+
+    platform_is_not :windows do
+      it "handles socket" do
+        FileSpecs.socket do |path|
+          Dir.scan(File.dirname(path)).map(&:last).should.include?(:socket)
+        end
+      end
+
+      it "handles FIFO" do
+        FileSpecs.fifo do |path|
+          Dir.scan(File.dirname(path)).map(&:last).should.include?(:fifo)
+        end
+      end
+
+      it "handles character devices" do
+        FileSpecs.character_device do |path|
+          Dir.scan(File.dirname(path)).map(&:last).should.include?(:characterSpecial)
+        end
+      end
+    end
+
+    platform_is_not :freebsd, :windows do
+      with_block_device do
+        it "handles block devices" do
+          FileSpecs.block_device do |path|
+            Dir.scan(File.dirname(path)).map(&:last).should.include?(:blockSpecial)
+          end
+        end
+      end
+    end
+  end
+
+  describe "Dir#scan" do
+    before :all do
+      DirSpecs.create_mock_dirs
+    end
+
+    after :all do
+      DirSpecs.delete_mock_dirs
+    end
+
+    before :each do
+      @internal = Encoding.default_internal
+    end
+
+    after :each do
+      Encoding.default_internal = @internal
+      @dir.close if @dir
+    end
+
+    it "returns an Array of filenames in an existing directory including dotfiles" do
+      @dir = Dir.new(DirSpecs.mock_dir)
+      a = @dir.scan.sort
+      @dir.close
+
+      a.should == DirSpecs.expected_paths_with_type - [[".", :directory], ["..", :directory]]
+
+      @dir = Dir.new("#{DirSpecs.mock_dir}/deeply/nested")
+      a = @dir.scan.sort
+      a.should == [[".dotfile.ext", :file], ["directory", :directory]]
+    end
+
+    it "yields filename and type in an existing directory including dotfiles" do
+      @dir = Dir.new(DirSpecs.mock_dir)
+      a = []
+      @dir.scan do |n, t|
+        a << [n, t]
+      end
+      a.sort!
+      a.should == DirSpecs.expected_paths_with_type - [[".", :directory], ["..", :directory]]
+
+      @dir = Dir.new("#{DirSpecs.mock_dir}/deeply/nested")
+      a = []
+      @dir.scan do |n, t|
+        a << [n, t]
+      end
+      a.sort!
+      a.should == [[".dotfile.ext", :file], ["directory", :directory]]
+    end
+
+    it "accepts an encoding keyword for the encoding of the entries" do
+      @dir = Dir.new("#{DirSpecs.mock_dir}/deeply/nested", encoding: "utf-8")
+      dirs = @dir.to_a.sort
+      dirs.each { |d| d.encoding.should == Encoding::UTF_8 }
+    end
+
+    it "returns children names encoded with the filesystem encoding by default" do
+      # This spec depends on the locale not being US-ASCII because if it is, the
+      # children that are not ascii_only? will be BINARY encoded.
+      @dir = Dir.new(File.join(DirSpecs.mock_dir, 'special'))
+      children = @dir.scan.sort
+      encoding = Encoding.find("filesystem")
+      encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
+      platform_is_not :windows do
+        children.should.include?(["こんにちは.txt".dup.force_encoding(encoding), :file])
+      end
+      children.first.first.encoding.should.equal?(Encoding.find("filesystem"))
+    end
+
+    it "returns children names encoded with the specified encoding" do
+      path = File.join(DirSpecs.mock_dir, 'special')
+      @dir = Dir.new(path, encoding: "euc-jp")
+      children = @dir.children.sort
+      children.first.encoding.should.equal?(Encoding::EUC_JP)
+    end
+
+    it "returns children names transcoded to the default internal encoding" do
+      Encoding.default_internal = Encoding::EUC_KR
+      @dir = Dir.new(File.join(DirSpecs.mock_dir, 'special'))
+      children = @dir.scan.sort
+      children.first.first.encoding.should.equal?(Encoding::EUC_KR)
+    end
+
+    it "returns the same result when called repeatedly" do
+      @dir = Dir.open DirSpecs.mock_dir
+
+      a = []
+      @dir.each {|dir| a << dir}
+
+      b = []
+      @dir.each {|dir| b << dir}
+
+      a.sort.should == b.sort
+      a.sort.should == DirSpecs.expected_paths
+    end
+  end
+end
diff --git a/spec/ruby/core/dir/shared/chroot.rb b/spec/ruby/core/dir/shared/chroot.rb
index a8f7c10a199..e4e61037996 100644
--- a/spec/ruby/core/dir/shared/chroot.rb
+++ b/spec/ruby/core/dir/shared/chroot.rb
@@ -18,7 +18,7 @@
   compilations_ci = ENV["GITHUB_WORKFLOW"] == "Compilations"
 
   it "can be used to change the process' root directory" do
-    -> { Dir.send(@method, __dir__) }.should_not raise_error
+    -> { Dir.send(@method, __dir__) }.should_not.raise
     File.should.exist?("/#{File.basename(__FILE__)}")
   end unless compilations_ci
 
@@ -27,7 +27,7 @@
   end
 
   it "raises an Errno::ENOENT exception if the directory doesn't exist" do
-    -> { Dir.send(@method, 'xgwhwhsjai2222jg') }.should raise_error(Errno::ENOENT)
+    -> { Dir.send(@method, 'xgwhwhsjai2222jg') }.should.raise(Errno::ENOENT)
   end
 
   it "can be escaped from with ../" do
diff --git a/spec/ruby/core/dir/shared/closed.rb b/spec/ruby/core/dir/shared/closed.rb
index 17d8332c2a6..c868fd6e6d9 100644
--- a/spec/ruby/core/dir/shared/closed.rb
+++ b/spec/ruby/core/dir/shared/closed.rb
@@ -4,6 +4,6 @@
       dir = Dir.open DirSpecs.mock_dir
       dir.close
       dir.send(@method) {}
-    }.should raise_error(IOError)
+    }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/dir/shared/delete.rb b/spec/ruby/core/dir/shared/delete.rb
index a81b0597593..ba013e8615a 100644
--- a/spec/ruby/core/dir/shared/delete.rb
+++ b/spec/ruby/core/dir/shared/delete.rb
@@ -20,13 +20,13 @@
   it "raises an Errno::ENOTEMPTY when trying to remove a nonempty directory" do
     -> do
       Dir.send @method, DirSpecs.mock_rmdir("nonempty")
-    end.should raise_error(Errno::ENOTEMPTY)
+    end.should.raise(Errno::ENOTEMPTY)
   end
 
   it "raises an Errno::ENOENT when trying to remove a non-existing directory" do
     -> do
       Dir.send @method, DirSpecs.nonexistent
-    end.should raise_error(Errno::ENOENT)
+    end.should.raise(Errno::ENOENT)
   end
 
   it "raises an Errno::ENOTDIR when trying to remove a non-directory" do
@@ -34,7 +34,7 @@
     touch(file)
     -> do
       Dir.send @method, file
-    end.should raise_error(Errno::ENOTDIR)
+    end.should.raise(Errno::ENOTDIR)
   end
 
   # this won't work on Windows, since chmod(0000) does not remove all permissions
@@ -46,7 +46,7 @@
         File.chmod(0000, parent)
         -> do
           Dir.send @method, child
-        end.should raise_error(Errno::EACCES)
+        end.should.raise(Errno::EACCES)
       end
     end
   end
diff --git a/spec/ruby/core/dir/shared/exist.rb b/spec/ruby/core/dir/shared/exist.rb
index 3097f577151..4ceaccea66f 100644
--- a/spec/ruby/core/dir/shared/exist.rb
+++ b/spec/ruby/core/dir/shared/exist.rb
@@ -1,52 +1,52 @@
 describe :dir_exist, shared: true do
   it "returns true if the given directory exists" do
-    Dir.send(@method, __dir__).should be_true
+    Dir.send(@method, __dir__).should == true
   end
 
   it "returns true for '.'" do
-    Dir.send(@method, '.').should be_true
+    Dir.send(@method, '.').should == true
   end
 
   it "returns true for '..'" do
-    Dir.send(@method, '..').should be_true
+    Dir.send(@method, '..').should == true
   end
 
   it "understands non-ASCII paths" do
     subdir = File.join(tmp("\u{9876}\u{665}"))
-    Dir.send(@method, subdir).should be_false
+    Dir.send(@method, subdir).should == false
     Dir.mkdir(subdir)
-    Dir.send(@method, subdir).should be_true
+    Dir.send(@method, subdir).should == true
     Dir.rmdir(subdir)
   end
 
   it "understands relative paths" do
-    Dir.send(@method, __dir__ + '/../').should be_true
+    Dir.send(@method, __dir__ + '/../').should == true
   end
 
   it "returns false if the given directory doesn't exist" do
-    Dir.send(@method, 'y26dg27n2nwjs8a/').should be_false
+    Dir.send(@method, 'y26dg27n2nwjs8a/').should == false
   end
 
   it "doesn't require the name to have a trailing slash" do
     dir = __dir__
     dir.sub!(/\/$/,'')
-    Dir.send(@method, dir).should be_true
+    Dir.send(@method, dir).should == true
   end
 
   it "doesn't expand paths" do
     skip "$HOME not valid directory" unless ENV['HOME'] && File.directory?(ENV['HOME'])
-    Dir.send(@method, File.expand_path('~')).should be_true
-    Dir.send(@method, '~').should be_false
+    Dir.send(@method, File.expand_path('~')).should == true
+    Dir.send(@method, '~').should == false
   end
 
   it "returns false if the argument exists but is a file" do
     File.should.exist?(__FILE__)
-    Dir.send(@method, __FILE__).should be_false
+    Dir.send(@method, __FILE__).should == false
   end
 
   it "doesn't set $! when file doesn't exist" do
     Dir.send(@method, "/path/to/non/existent/dir")
-    $!.should be_nil
+    $!.should == nil
   end
 
   it "calls #to_path on non String arguments" do
diff --git a/spec/ruby/core/dir/shared/glob.rb b/spec/ruby/core/dir/shared/glob.rb
index b1fc924f083..86aa105259a 100644
--- a/spec/ruby/core/dir/shared/glob.rb
+++ b/spec/ruby/core/dir/shared/glob.rb
@@ -13,7 +13,7 @@
 
   it "raises an Encoding::CompatibilityError if the argument encoding is not compatible with US-ASCII" do
     pattern = "files*".dup.force_encoding Encoding::UTF_16BE
-    -> { Dir.send(@method, pattern) }.should raise_error(Encoding::CompatibilityError)
+    -> { Dir.send(@method, pattern) }.should.raise(Encoding::CompatibilityError)
   end
 
   it "calls #to_path to convert a pattern" do
@@ -24,7 +24,7 @@
   end
 
   it "raises an ArgumentError if the string contains \\0" do
-    -> {Dir.send(@method, "file_o*\0file_t*")}.should raise_error ArgumentError, /nul-separated/
+    -> {Dir.send(@method, "file_o*\0file_t*")}.should.raise ArgumentError, /nul-separated/
   end
 
   it "result is sorted by default" do
@@ -43,9 +43,9 @@
   end
 
   it "raises an ArgumentError if sort: is not true or false" do
-    -> { Dir.send(@method, '*', sort: 0) }.should raise_error ArgumentError, /expected true or false/
-    -> { Dir.send(@method, '*', sort: nil) }.should raise_error ArgumentError, /expected true or false/
-    -> { Dir.send(@method, '*', sort: 'false') }.should raise_error ArgumentError, /expected true or false/
+    -> { Dir.send(@method, '*', sort: 0) }.should.raise ArgumentError, /expected true or false/
+    -> { Dir.send(@method, '*', sort: nil) }.should.raise ArgumentError, /expected true or false/
+    -> { Dir.send(@method, '*', sort: 'false') }.should.raise ArgumentError, /expected true or false/
   end
 
   it "matches non-dotfiles with '*'" do
@@ -373,7 +373,7 @@
     it "raises TypeError when cannot convert value to string" do
       -> {
         Dir.send(@method, "*", base: [])
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
     it "handles '' as current directory path" do
diff --git a/spec/ruby/core/dir/shared/open.rb b/spec/ruby/core/dir/shared/open.rb
index 920845cba18..9ac3a406943 100644
--- a/spec/ruby/core/dir/shared/open.rb
+++ b/spec/ruby/core/dir/shared/open.rb
@@ -1,18 +1,18 @@
 describe :dir_open, shared: true do
   it "returns a Dir instance representing the specified directory" do
     dir = Dir.send(@method, DirSpecs.mock_dir)
-    dir.should be_kind_of(Dir)
+    dir.should.is_a?(Dir)
     dir.close
   end
 
   it "raises a SystemCallError if the directory does not exist" do
     -> do
       Dir.send @method, DirSpecs.nonexistent
-    end.should raise_error(SystemCallError)
+    end.should.raise(SystemCallError)
   end
 
   it "may take a block which is yielded to with the Dir instance" do
-    Dir.send(@method, DirSpecs.mock_dir) {|dir| dir.should be_kind_of(Dir)}
+    Dir.send(@method, DirSpecs.mock_dir) {|dir| dir.should.is_a?(Dir)}
   end
 
   it "returns the value of the block if a block is given" do
@@ -21,7 +21,7 @@
 
   it "closes the Dir instance when the block exits if given a block" do
     closed_dir = Dir.send(@method, DirSpecs.mock_dir) { |dir| dir }
-    -> { closed_dir.read }.should raise_error(IOError)
+    -> { closed_dir.read }.should.raise(IOError)
   end
 
   it "closes the Dir instance when the block exits the block even due to an exception" do
@@ -32,9 +32,9 @@
         closed_dir = dir
         raise "dir specs"
       end
-    end.should raise_error(RuntimeError, "dir specs")
+    end.should.raise(RuntimeError, "dir specs")
 
-    -> { closed_dir.read }.should raise_error(IOError)
+    -> { closed_dir.read }.should.raise(IOError)
   end
 
   it "calls #to_path on non-String arguments" do
@@ -45,7 +45,7 @@
 
   it "accepts an options Hash" do
     dir = Dir.send(@method, DirSpecs.mock_dir, encoding: "utf-8") {|d| d }
-    dir.should be_kind_of(Dir)
+    dir.should.is_a?(Dir)
   end
 
   it "calls #to_hash to convert the options object" do
@@ -53,12 +53,12 @@
     options.should_receive(:to_hash).and_return({ encoding: Encoding::UTF_8 })
 
     dir = Dir.send(@method, DirSpecs.mock_dir, **options) {|d| d }
-    dir.should be_kind_of(Dir)
+    dir.should.is_a?(Dir)
   end
 
   it "ignores the :encoding option if it is nil" do
     dir = Dir.send(@method, DirSpecs.mock_dir, encoding: nil) {|d| d }
-    dir.should be_kind_of(Dir)
+    dir.should.is_a?(Dir)
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/core/dir/shared/path.rb b/spec/ruby/core/dir/shared/path.rb
index 494dcca7751..7647c044211 100644
--- a/spec/ruby/core/dir/shared/path.rb
+++ b/spec/ruby/core/dir/shared/path.rb
@@ -22,7 +22,7 @@
     path = DirSpecs.mock_dir.force_encoding Encoding::IBM866
     dir = Dir.open path
     begin
-      dir.send(@method).encoding.should equal(Encoding::IBM866)
+      dir.send(@method).encoding.should.equal?(Encoding::IBM866)
     ensure
       dir.close
     end
diff --git a/spec/ruby/core/dir/shared/pos.rb b/spec/ruby/core/dir/shared/pos.rb
index 2165932d991..11712cc75df 100644
--- a/spec/ruby/core/dir/shared/pos.rb
+++ b/spec/ruby/core/dir/shared/pos.rb
@@ -8,9 +8,9 @@
   end
 
   it "returns an Integer representing the current position in the directory" do
-    @dir.send(@method).should be_kind_of(Integer)
-    @dir.send(@method).should be_kind_of(Integer)
-    @dir.send(@method).should be_kind_of(Integer)
+    @dir.send(@method).should.is_a?(Integer)
+    @dir.send(@method).should.is_a?(Integer)
+    @dir.send(@method).should.is_a?(Integer)
   end
 
   it "returns a different Integer if moved from previous position" do
@@ -18,8 +18,8 @@
     @dir.read
     b = @dir.send(@method)
 
-    a.should be_kind_of(Integer)
-    b.should be_kind_of(Integer)
+    a.should.is_a?(Integer)
+    b.should.is_a?(Integer)
 
     a.should_not == b
   end
diff --git a/spec/ruby/core/dir/shared/pwd.rb b/spec/ruby/core/dir/shared/pwd.rb
index 2a8d7fe790d..ed47fe382af 100644
--- a/spec/ruby/core/dir/shared/pwd.rb
+++ b/spec/ruby/core/dir/shared/pwd.rb
@@ -37,9 +37,9 @@
   it "returns a String with the filesystem encoding" do
     enc = Dir.send(@method).encoding
     if @fs_encoding == Encoding::US_ASCII
-      [Encoding::US_ASCII, Encoding::BINARY].should include(enc)
+      [Encoding::US_ASCII, Encoding::BINARY].should.include?(enc)
     else
-      enc.should equal(@fs_encoding)
+      enc.should.equal?(@fs_encoding)
     end
   end
 end
diff --git a/spec/ruby/core/encoding/aliases_spec.rb b/spec/ruby/core/encoding/aliases_spec.rb
index 786157981a9..12c6c6cf853 100644
--- a/spec/ruby/core/encoding/aliases_spec.rb
+++ b/spec/ruby/core/encoding/aliases_spec.rb
@@ -2,24 +2,24 @@
 
 describe "Encoding.aliases" do
   it "returns a Hash" do
-    Encoding.aliases.should be_an_instance_of(Hash)
+    Encoding.aliases.should.instance_of?(Hash)
   end
 
   it "has Strings as keys" do
     Encoding.aliases.keys.each do |key|
-      key.should be_an_instance_of(String)
+      key.should.instance_of?(String)
     end
   end
 
   it "has Strings as values" do
     Encoding.aliases.values.each do |value|
-      value.should be_an_instance_of(String)
+      value.should.instance_of?(String)
     end
   end
 
   it "has alias names as its keys" do
-    Encoding.aliases.key?('BINARY').should be_true
-    Encoding.aliases.key?('ASCII').should be_true
+    Encoding.aliases.key?('BINARY').should == true
+    Encoding.aliases.key?('ASCII').should == true
   end
 
   it "has the names of the aliased encoding as its values" do
diff --git a/spec/ruby/core/encoding/ascii_compatible_spec.rb b/spec/ruby/core/encoding/ascii_compatible_spec.rb
index bbcc6add9e4..04fc159bb83 100644
--- a/spec/ruby/core/encoding/ascii_compatible_spec.rb
+++ b/spec/ruby/core/encoding/ascii_compatible_spec.rb
@@ -2,11 +2,11 @@
 
 describe "Encoding#ascii_compatible?" do
   it "returns true if self represents an ASCII-compatible encoding" do
-    Encoding::UTF_8.ascii_compatible?.should be_true
+    Encoding::UTF_8.ascii_compatible?.should == true
   end
 
   it "returns false if self does not represent an ASCII-compatible encoding" do
-    Encoding::UTF_16LE.ascii_compatible?.should be_false
+    Encoding::UTF_16LE.ascii_compatible?.should == false
   end
 
   it "returns false for UTF_16 and UTF_32" do
diff --git a/spec/ruby/core/encoding/compatible_spec.rb b/spec/ruby/core/encoding/compatible_spec.rb
index 31376a3b758..0d620e5bf39 100644
--- a/spec/ruby/core/encoding/compatible_spec.rb
+++ b/spec/ruby/core/encoding/compatible_spec.rb
@@ -55,7 +55,7 @@
     it "returns nil if the second's Encoding is not ASCII compatible" do
       a = "abc".dup.force_encoding("UTF-8")
       b = "1234".dup.force_encoding("UTF-16LE")
-      Encoding.compatible?(a, b).should be_nil
+      Encoding.compatible?(a, b).should == nil
     end
   end
 
@@ -69,7 +69,7 @@
     end
 
     it "returns nil if the second encoding is ASCII compatible but neither String's encoding is ASCII only" do
-      Encoding.compatible?("\xff", "\u3042".encode("utf-8")).should be_nil
+      Encoding.compatible?("\xff", "\u3042".encode("utf-8")).should == nil
     end
   end
 
@@ -79,15 +79,15 @@
     end
 
     it "returns nil when the second String is US-ASCII" do
-      Encoding.compatible?(@str, "def".encode("us-ascii")).should be_nil
+      Encoding.compatible?(@str, "def".encode("us-ascii")).should == nil
     end
 
     it "returns nil when the second String is BINARY and ASCII only" do
-      Encoding.compatible?(@str, "\x7f").should be_nil
+      Encoding.compatible?(@str, "\x7f").should == nil
     end
 
     it "returns nil when the second String is BINARY but not ASCII only" do
-      Encoding.compatible?(@str, "\xff").should be_nil
+      Encoding.compatible?(@str, "\xff").should == nil
     end
 
     it "returns the Encoding when the second's Encoding is not ASCII compatible but the same as the first's Encoding" do
@@ -110,15 +110,15 @@
     end
 
     it "returns nil when the second's Encoding is BINARY but not ASCII only" do
-      Encoding.compatible?(@str, "\xff").should be_nil
+      Encoding.compatible?(@str, "\xff").should == nil
     end
 
     it "returns nil when the second's Encoding is invalid and ASCII only" do
-      Encoding.compatible?(@str, "\x7f\x7f".dup.force_encoding("utf-16be")).should be_nil
+      Encoding.compatible?(@str, "\x7f\x7f".dup.force_encoding("utf-16be")).should == nil
     end
 
     it "returns nil when the second's Encoding is invalid and not ASCII only" do
-      Encoding.compatible?(@str, "\xff\xff".dup.force_encoding("utf-16be")).should be_nil
+      Encoding.compatible?(@str, "\xff\xff".dup.force_encoding("utf-16be")).should == nil
     end
 
     it "returns the Encoding when the second's Encoding is invalid but the same as the first" do
@@ -557,6 +557,11 @@
       [Encoding, "\x82\xa0".dup.force_encoding("shift_jis"),  Encoding::Shift_JIS],
     ].should be_computed_by(:compatible?, /abc/)
   end
+
+  it "returns the Regexp's Encoding if the String is ASCII only and the Regexp is not" do
+    r = Regexp.new("\xa4\xa2".dup.force_encoding("euc-jp"))
+    Encoding.compatible?("hello".dup.force_encoding("utf-8"), r).should == Encoding::EUC_JP
+  end
 end
 
 describe "Encoding.compatible? String, Symbol" do
@@ -584,11 +589,11 @@
 
 describe "Encoding.compatible? String, Encoding" do
   it "returns nil if the String's encoding is not ASCII compatible" do
-    Encoding.compatible?("abc".encode("utf-32le"), Encoding::US_ASCII).should be_nil
+    Encoding.compatible?("abc".encode("utf-32le"), Encoding::US_ASCII).should == nil
   end
 
   it "returns nil if the Encoding is not ASCII compatible" do
-    Encoding.compatible?("abc".encode("us-ascii"), Encoding::UTF_32LE).should be_nil
+    Encoding.compatible?("abc".encode("us-ascii"), Encoding::UTF_32LE).should == nil
   end
 
   it "returns the String's encoding if the Encoding is US-ASCII" do
@@ -609,7 +614,7 @@
   end
 
   it "returns nil if the String's encoding is ASCII compatible but the string is not ASCII only" do
-    Encoding.compatible?("\u3042".encode("utf-8"), Encoding::BINARY).should be_nil
+    Encoding.compatible?("\u3042".encode("utf-8"), Encoding::BINARY).should == nil
   end
 end
 
@@ -619,6 +624,15 @@
     Encoding.compatible?(/abc/, str).should == Encoding::US_ASCII
   end
 
+  it "returns the String's Encoding when the String is ASCII only with a different encoding" do
+    r = Regexp.new("\xa4\xa2".dup.force_encoding("euc-jp"))
+    Encoding.compatible?(r, "hello".dup.force_encoding("utf-8")).should == Encoding::UTF_8
+  end
+
+  it "returns the Regexp's Encoding if the String has the same non-ASCII encoding" do
+    r = Regexp.new("\xa4\xa2".dup.force_encoding("euc-jp"))
+    Encoding.compatible?(r, "hello".dup.force_encoding("euc-jp")).should == Encoding::EUC_JP
+  end
 end
 
 describe "Encoding.compatible? Regexp, Regexp" do
@@ -727,32 +741,32 @@
 
 describe "Encoding.compatible? Object, Object" do
   it "returns nil for Object, String" do
-    Encoding.compatible?(Object.new, "abc").should be_nil
+    Encoding.compatible?(Object.new, "abc").should == nil
   end
 
   it "returns nil for Object, Regexp" do
-    Encoding.compatible?(Object.new, /./).should be_nil
+    Encoding.compatible?(Object.new, /./).should == nil
   end
 
   it "returns nil for Object, Symbol" do
-    Encoding.compatible?(Object.new, :sym).should be_nil
+    Encoding.compatible?(Object.new, :sym).should == nil
   end
 
   it "returns nil for String, Object" do
-    Encoding.compatible?("abc", Object.new).should be_nil
+    Encoding.compatible?("abc", Object.new).should == nil
   end
 
   it "returns nil for Regexp, Object" do
-    Encoding.compatible?(/./, Object.new).should be_nil
+    Encoding.compatible?(/./, Object.new).should == nil
   end
 
   it "returns nil for Symbol, Object" do
-    Encoding.compatible?(:sym, Object.new).should be_nil
+    Encoding.compatible?(:sym, Object.new).should == nil
   end
 end
 
 describe "Encoding.compatible? nil, nil" do
   it "returns nil" do
-    Encoding.compatible?(nil, nil).should be_nil
+    Encoding.compatible?(nil, nil).should == nil
   end
 end
diff --git a/spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb b/spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb
index 1beb40af3fb..07c7a883562 100644
--- a/spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb
+++ b/spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb
@@ -24,14 +24,14 @@
   end
 
   it "returns nil when the given encoding is ASCII compatible" do
-    Encoding::Converter.asciicompat_encoding('ASCII').should be_nil
-    Encoding::Converter.asciicompat_encoding('UTF-8').should be_nil
+    Encoding::Converter.asciicompat_encoding('ASCII').should == nil
+    Encoding::Converter.asciicompat_encoding('UTF-8').should == nil
   end
 
   it "handles encoding names who resolve to nil encodings" do
     internal = Encoding.default_internal
     Encoding.default_internal = nil
-    Encoding::Converter.asciicompat_encoding('internal').should be_nil
+    Encoding::Converter.asciicompat_encoding('internal').should == nil
     Encoding.default_internal = internal
   end
 end
diff --git a/spec/ruby/core/encoding/converter/constants_spec.rb b/spec/ruby/core/encoding/converter/constants_spec.rb
index 7d29bdb2785..e2d21b54293 100644
--- a/spec/ruby/core/encoding/converter/constants_spec.rb
+++ b/spec/ruby/core/encoding/converter/constants_spec.rb
@@ -2,130 +2,130 @@
 
 describe "Encoding::Converter::INVALID_MASK" do
   it "exists" do
-    Encoding::Converter.should have_constant(:INVALID_MASK)
+    Encoding::Converter.should.const_defined?(:INVALID_MASK, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::INVALID_MASK.should be_an_instance_of(Integer)
+    Encoding::Converter::INVALID_MASK.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::INVALID_REPLACE" do
   it "exists" do
-    Encoding::Converter.should have_constant(:INVALID_REPLACE)
+    Encoding::Converter.should.const_defined?(:INVALID_REPLACE, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::INVALID_REPLACE.should be_an_instance_of(Integer)
+    Encoding::Converter::INVALID_REPLACE.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::UNDEF_MASK" do
   it "exists" do
-    Encoding::Converter.should have_constant(:UNDEF_MASK)
+    Encoding::Converter.should.const_defined?(:UNDEF_MASK, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::UNDEF_MASK.should be_an_instance_of(Integer)
+    Encoding::Converter::UNDEF_MASK.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::UNDEF_REPLACE" do
   it "exists" do
-    Encoding::Converter.should have_constant(:UNDEF_REPLACE)
+    Encoding::Converter.should.const_defined?(:UNDEF_REPLACE, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::UNDEF_REPLACE.should be_an_instance_of(Integer)
+    Encoding::Converter::UNDEF_REPLACE.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::UNDEF_HEX_CHARREF" do
   it "exists" do
-    Encoding::Converter.should have_constant(:UNDEF_HEX_CHARREF)
+    Encoding::Converter.should.const_defined?(:UNDEF_HEX_CHARREF, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::UNDEF_HEX_CHARREF.should be_an_instance_of(Integer)
+    Encoding::Converter::UNDEF_HEX_CHARREF.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::PARTIAL_INPUT" do
   it "exists" do
-    Encoding::Converter.should have_constant(:PARTIAL_INPUT)
+    Encoding::Converter.should.const_defined?(:PARTIAL_INPUT, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::PARTIAL_INPUT.should be_an_instance_of(Integer)
+    Encoding::Converter::PARTIAL_INPUT.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::AFTER_OUTPUT" do
   it "exists" do
-    Encoding::Converter.should have_constant(:AFTER_OUTPUT)
+    Encoding::Converter.should.const_defined?(:AFTER_OUTPUT, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::AFTER_OUTPUT.should be_an_instance_of(Integer)
+    Encoding::Converter::AFTER_OUTPUT.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::UNIVERSAL_NEWLINE_DECORATOR" do
   it "exists" do
-    Encoding::Converter.should have_constant(:UNIVERSAL_NEWLINE_DECORATOR)
+    Encoding::Converter.should.const_defined?(:UNIVERSAL_NEWLINE_DECORATOR, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::UNIVERSAL_NEWLINE_DECORATOR.should be_an_instance_of(Integer)
+    Encoding::Converter::UNIVERSAL_NEWLINE_DECORATOR.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::CRLF_NEWLINE_DECORATOR" do
   it "exists" do
-    Encoding::Converter.should have_constant(:CRLF_NEWLINE_DECORATOR)
+    Encoding::Converter.should.const_defined?(:CRLF_NEWLINE_DECORATOR, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::CRLF_NEWLINE_DECORATOR.should be_an_instance_of(Integer)
+    Encoding::Converter::CRLF_NEWLINE_DECORATOR.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::CR_NEWLINE_DECORATOR" do
   it "exists" do
-    Encoding::Converter.should have_constant(:CR_NEWLINE_DECORATOR)
+    Encoding::Converter.should.const_defined?(:CR_NEWLINE_DECORATOR, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::CR_NEWLINE_DECORATOR.should be_an_instance_of(Integer)
+    Encoding::Converter::CR_NEWLINE_DECORATOR.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::XML_TEXT_DECORATOR" do
   it "exists" do
-    Encoding::Converter.should have_constant(:XML_TEXT_DECORATOR)
+    Encoding::Converter.should.const_defined?(:XML_TEXT_DECORATOR, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::XML_TEXT_DECORATOR.should be_an_instance_of(Integer)
+    Encoding::Converter::XML_TEXT_DECORATOR.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::XML_ATTR_CONTENT_DECORATOR" do
   it "exists" do
-    Encoding::Converter.should have_constant(:XML_ATTR_CONTENT_DECORATOR)
+    Encoding::Converter.should.const_defined?(:XML_ATTR_CONTENT_DECORATOR, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::XML_ATTR_CONTENT_DECORATOR.should be_an_instance_of(Integer)
+    Encoding::Converter::XML_ATTR_CONTENT_DECORATOR.should.instance_of?(Integer)
   end
 end
 
 describe "Encoding::Converter::XML_ATTR_QUOTE_DECORATOR" do
   it "exists" do
-    Encoding::Converter.should have_constant(:XML_ATTR_QUOTE_DECORATOR)
+    Encoding::Converter.should.const_defined?(:XML_ATTR_QUOTE_DECORATOR, false)
   end
 
   it "has an Integer value" do
-    Encoding::Converter::XML_ATTR_QUOTE_DECORATOR.should be_an_instance_of(Integer)
+    Encoding::Converter::XML_ATTR_QUOTE_DECORATOR.should.instance_of?(Integer)
   end
 end
diff --git a/spec/ruby/core/encoding/converter/convert_spec.rb b/spec/ruby/core/encoding/converter/convert_spec.rb
index 8533af45650..c95e88a4915 100644
--- a/spec/ruby/core/encoding/converter/convert_spec.rb
+++ b/spec/ruby/core/encoding/converter/convert_spec.rb
@@ -5,7 +5,7 @@
 describe "Encoding::Converter#convert" do
   it "returns a String" do
     ec = Encoding::Converter.new('ascii', 'utf-8')
-    ec.convert('glark').should be_an_instance_of(String)
+    ec.convert('glark').should.instance_of?(String)
   end
 
   it "sets the encoding of the result to the target encoding" do
@@ -34,13 +34,12 @@
 
   it "raises UndefinedConversionError if the String contains characters invalid for the target encoding" do
     ec = Encoding::Converter.new('UTF-8', Encoding.find('macCyrillic'))
-    -> { ec.convert("\u{6543}".dup.force_encoding('UTF-8')) }.should \
-      raise_error(Encoding::UndefinedConversionError)
+    -> { ec.convert("\u{6543}".dup.force_encoding('UTF-8')) }.should.raise(Encoding::UndefinedConversionError)
   end
 
   it "raises an ArgumentError if called on a finished stream" do
     ec = Encoding::Converter.new('UTF-8', Encoding.find('macCyrillic'))
     ec.finish
-    -> { ec.convert("\u{65}") }.should raise_error(ArgumentError)
+    -> { ec.convert("\u{65}") }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/encoding/converter/finish_spec.rb b/spec/ruby/core/encoding/converter/finish_spec.rb
index 22e66df38ca..e13b7415f89 100644
--- a/spec/ruby/core/encoding/converter/finish_spec.rb
+++ b/spec/ruby/core/encoding/converter/finish_spec.rb
@@ -7,7 +7,7 @@
 
   it "returns a String" do
     @ec.convert('foo')
-    @ec.finish.should be_an_instance_of(String)
+    @ec.finish.should.instance_of?(String)
   end
 
   it "returns an empty String if there is nothing more to convert" do
diff --git a/spec/ruby/core/encoding/converter/last_error_spec.rb b/spec/ruby/core/encoding/converter/last_error_spec.rb
index ff2a2b4cbe2..3984a628f55 100644
--- a/spec/ruby/core/encoding/converter/last_error_spec.rb
+++ b/spec/ruby/core/encoding/converter/last_error_spec.rb
@@ -4,51 +4,51 @@
 describe "Encoding::Converter#last_error" do
   it "returns nil when the no conversion has been attempted" do
     ec = Encoding::Converter.new('ascii','utf-8')
-    ec.last_error.should be_nil
+    ec.last_error.should == nil
   end
 
   it "returns nil when the last conversion did not produce an error" do
     ec = Encoding::Converter.new('ascii','utf-8')
     ec.convert('a'.dup.force_encoding('ascii'))
-    ec.last_error.should be_nil
+    ec.last_error.should == nil
   end
 
   it "returns nil when #primitive_convert last returned :destination_buffer_full" do
     ec = Encoding::Converter.new("utf-8", "iso-2022-jp")
     ec.primitive_convert(+"\u{9999}", +"", 0, 0, partial_input: false) \
       .should == :destination_buffer_full
-    ec.last_error.should be_nil
+    ec.last_error.should == nil
   end
 
   it "returns nil when #primitive_convert last returned :finished" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
     ec.primitive_convert("glark".dup.force_encoding('utf-8'), +"").should == :finished
-    ec.last_error.should be_nil
+    ec.last_error.should == nil
   end
 
   it "returns nil if the last conversion succeeded but the penultimate failed" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
     ec.primitive_convert(+"\xf1abcd", +"").should == :invalid_byte_sequence
     ec.primitive_convert("glark".dup.force_encoding('utf-8'), +"").should == :finished
-    ec.last_error.should be_nil
+    ec.last_error.should == nil
   end
 
   it "returns an Encoding::InvalidByteSequenceError when #primitive_convert last returned :invalid_byte_sequence" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
     ec.primitive_convert(+"\xf1abcd", +"").should == :invalid_byte_sequence
-    ec.last_error.should be_an_instance_of(Encoding::InvalidByteSequenceError)
+    ec.last_error.should.instance_of?(Encoding::InvalidByteSequenceError)
   end
 
   it "returns an Encoding::UndefinedConversionError when #primitive_convert last returned :undefined_conversion" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
     ec.primitive_convert(+"\u{9876}", +"").should == :undefined_conversion
-    ec.last_error.should be_an_instance_of(Encoding::UndefinedConversionError)
+    ec.last_error.should.instance_of?(Encoding::UndefinedConversionError)
   end
 
   it "returns an Encoding::InvalidByteSequenceError when #primitive_convert last returned :incomplete_input" do
     ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1")
     ec.primitive_convert(+"\xa4", +"", nil, 10).should == :incomplete_input
-    ec.last_error.should be_an_instance_of(Encoding::InvalidByteSequenceError)
+    ec.last_error.should.instance_of?(Encoding::InvalidByteSequenceError)
   end
 
   it "returns an Encoding::InvalidByteSequenceError when the last call to #convert produced one" do
@@ -56,10 +56,10 @@
     exception = nil
     -> {
       ec.convert("\xf1abcd")
-    }.should raise_error(Encoding::InvalidByteSequenceError) { |e|
+    }.should.raise(Encoding::InvalidByteSequenceError) { |e|
       exception = e
     }
-    ec.last_error.should be_an_instance_of(Encoding::InvalidByteSequenceError)
+    ec.last_error.should.instance_of?(Encoding::InvalidByteSequenceError)
     ec.last_error.message.should == exception.message
   end
 
@@ -68,12 +68,12 @@
     exception = nil
     -> {
       ec.convert("\u{9899}")
-    }.should raise_error(Encoding::UndefinedConversionError) { |e|
+    }.should.raise(Encoding::UndefinedConversionError) { |e|
       exception = e
     }
-    ec.last_error.should be_an_instance_of(Encoding::UndefinedConversionError)
+    ec.last_error.should.instance_of?(Encoding::UndefinedConversionError)
     ec.last_error.message.should == exception.message
-    ec.last_error.message.should include "from UTF-8 to ISO-8859-1"
+    ec.last_error.message.should.include? "from UTF-8 to ISO-8859-1"
   end
 
   it "returns the last error of #convert with a message showing the transcoding path" do
@@ -81,11 +81,11 @@
     exception = nil
     -> {
       ec.convert("\xE9") # é in ISO-8859-1
-    }.should raise_error(Encoding::UndefinedConversionError) { |e|
+    }.should.raise(Encoding::UndefinedConversionError) { |e|
       exception = e
     }
-    ec.last_error.should be_an_instance_of(Encoding::UndefinedConversionError)
+    ec.last_error.should.instance_of?(Encoding::UndefinedConversionError)
     ec.last_error.message.should == exception.message
-    ec.last_error.message.should include "from ISO-8859-1 to UTF-8 to Big5"
+    ec.last_error.message.should.include? "from ISO-8859-1 to UTF-8 to Big5"
   end
 end
diff --git a/spec/ruby/core/encoding/converter/new_spec.rb b/spec/ruby/core/encoding/converter/new_spec.rb
index a7bef538092..bbdfb48bce4 100644
--- a/spec/ruby/core/encoding/converter/new_spec.rb
+++ b/spec/ruby/core/encoding/converter/new_spec.rb
@@ -25,7 +25,7 @@
   it "raises an Encoding::ConverterNotFoundError if both encodings are the same" do
     -> do
       Encoding::Converter.new "utf-8", "utf-8"
-    end.should raise_error(Encoding::ConverterNotFoundError)
+    end.should.raise(Encoding::ConverterNotFoundError)
   end
 
   it "calls #to_str to convert the source encoding argument to an encoding name" do
@@ -67,25 +67,25 @@
 
     -> do
       Encoding::Converter.new("us-ascii", "utf-8", replace: obj)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed true for the replacement object" do
     -> do
       Encoding::Converter.new("us-ascii", "utf-8", replace: true)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed false for the replacement object" do
     -> do
       Encoding::Converter.new("us-ascii", "utf-8", replace: false)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an Integer for the replacement object" do
     -> do
       Encoding::Converter.new("us-ascii", "utf-8", replace: 1)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "accepts an empty String for the replacement object" do
diff --git a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb
index e4aeed103e0..ab9ce6a9928 100644
--- a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb
+++ b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb
@@ -8,23 +8,23 @@
   end
 
   it "accepts a nil source buffer" do
-    -> { @ec.primitive_convert(nil,"") }.should_not raise_error
+    -> { @ec.primitive_convert(nil,"") }.should_not.raise
   end
 
   it "accepts a String as the source buffer" do
-    -> { @ec.primitive_convert("","") }.should_not raise_error
+    -> { @ec.primitive_convert("","") }.should_not.raise
   end
 
   it "raises FrozenError when the destination buffer is a frozen String" do
-    -> { @ec.primitive_convert("", "".freeze) }.should raise_error(FrozenError)
+    -> { @ec.primitive_convert("", "".freeze) }.should.raise(FrozenError)
   end
 
   it "accepts nil for the destination byte offset" do
-    -> { @ec.primitive_convert("","", nil) }.should_not raise_error
+    -> { @ec.primitive_convert("","", nil) }.should_not.raise
   end
 
   it "accepts an integer for the destination byte offset" do
-    -> { @ec.primitive_convert("","a", 1) }.should_not raise_error
+    -> { @ec.primitive_convert("","a", 1) }.should_not.raise
   end
 
   it "calls #to_int to convert the destination byte offset" do
@@ -35,10 +35,10 @@
   end
 
   it "raises an ArgumentError if the destination byte offset is greater than the bytesize of the destination buffer" do
-    -> { @ec.primitive_convert("","am", 0) }.should_not raise_error
-    -> { @ec.primitive_convert("","am", 1) }.should_not raise_error
-    -> { @ec.primitive_convert("","am", 2) }.should_not raise_error
-    -> { @ec.primitive_convert("","am", 3) }.should raise_error(ArgumentError)
+    -> { @ec.primitive_convert("","am", 0) }.should_not.raise
+    -> { @ec.primitive_convert("","am", 1) }.should_not.raise
+    -> { @ec.primitive_convert("","am", 2) }.should_not.raise
+    -> { @ec.primitive_convert("","am", 3) }.should.raise(ArgumentError)
   end
 
   it "uses the destination byte offset to determine where to write the result in the destination buffer" do
@@ -54,19 +54,19 @@
   end
 
   it "accepts nil for the destination bytesize" do
-    -> { @ec.primitive_convert("","", nil, nil) }.should_not raise_error
+    -> { @ec.primitive_convert("","", nil, nil) }.should_not.raise
   end
 
   it "accepts an integer for the destination bytesize" do
-    -> { @ec.primitive_convert("","", nil, 0) }.should_not raise_error
+    -> { @ec.primitive_convert("","", nil, 0) }.should_not.raise
   end
 
   it "allows a destination bytesize value greater than the bytesize of the source buffer" do
-    -> { @ec.primitive_convert("am","", nil, 3) }.should_not raise_error
+    -> { @ec.primitive_convert("am","", nil, 3) }.should_not.raise
   end
 
   it "allows a destination bytesize value less than the bytesize of the source buffer" do
-    -> { @ec.primitive_convert("am","", nil, 1) }.should_not raise_error
+    -> { @ec.primitive_convert("am","", nil, 1) }.should_not.raise
   end
 
   it "calls #to_int to convert the destination byte size" do
diff --git a/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb b/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb
index 5ee8b1fecd1..580e2e37e10 100644
--- a/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb
+++ b/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb
@@ -55,7 +55,7 @@
 
   it "returns the state, source encoding, target encoding, erroneous bytes, and the read-again bytes when #convert last raised InvalidByteSequenceError" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
-    -> { ec.convert("\xf1abcd") }.should raise_error(Encoding::InvalidByteSequenceError)
+    -> { ec.convert("\xf1abcd") }.should.raise(Encoding::InvalidByteSequenceError)
     ec.primitive_errinfo.should ==
       [:invalid_byte_sequence, "UTF-8", "ISO-8859-1", "\xF1", "a"]
   end
@@ -63,7 +63,7 @@
   it "returns the state, source encoding, target encoding, erroneous bytes, and the read-again bytes when #finish last raised InvalidByteSequenceError" do
     ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1")
     ec.convert("\xa4")
-    -> { ec.finish }.should raise_error(Encoding::InvalidByteSequenceError)
+    -> { ec.finish }.should.raise(Encoding::InvalidByteSequenceError)
     ec.primitive_errinfo.should == [:incomplete_input, "EUC-JP", "UTF-8", "\xA4", ""]
   end
 end
diff --git a/spec/ruby/core/encoding/converter/putback_spec.rb b/spec/ruby/core/encoding/converter/putback_spec.rb
index 04bb5656553..a85cec51455 100644
--- a/spec/ruby/core/encoding/converter/putback_spec.rb
+++ b/spec/ruby/core/encoding/converter/putback_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns a String" do
-    @ec.putback.should be_an_instance_of(String)
+    @ec.putback.should.instance_of?(String)
   end
 
   it "returns a String in the source encoding" do
diff --git a/spec/ruby/core/encoding/converter/replacement_spec.rb b/spec/ruby/core/encoding/converter/replacement_spec.rb
index ea514ca8ddf..c25ec365174 100644
--- a/spec/ruby/core/encoding/converter/replacement_spec.rb
+++ b/spec/ruby/core/encoding/converter/replacement_spec.rb
@@ -33,7 +33,7 @@
 
   it "raises a TypeError if assigned a non-String argument" do
     ec = Encoding::Converter.new("utf-8", "us-ascii")
-    -> { ec.replacement = nil }.should raise_error(TypeError)
+    -> { ec.replacement = nil }.should.raise(TypeError)
   end
 
   it "sets #replacement" do
@@ -47,16 +47,14 @@
     ec = Encoding::Converter.new("sjis", "ascii")
     utf8_q = "\u{986}".dup.force_encoding('utf-8')
     ec.primitive_convert(utf8_q.dup, +"").should == :undefined_conversion
-    -> { ec.replacement = utf8_q }.should \
-      raise_error(Encoding::UndefinedConversionError)
+    -> { ec.replacement = utf8_q }.should.raise(Encoding::UndefinedConversionError)
   end
 
   it "does not change the replacement character if the argument cannot be converted into the destination encoding" do
     ec = Encoding::Converter.new("sjis", "ascii")
     utf8_q = "\u{986}".dup.force_encoding('utf-8')
     ec.primitive_convert(utf8_q.dup, +"").should == :undefined_conversion
-    -> { ec.replacement = utf8_q }.should \
-      raise_error(Encoding::UndefinedConversionError)
+    -> { ec.replacement = utf8_q }.should.raise(Encoding::UndefinedConversionError)
     ec.replacement.should == "?".dup.force_encoding('us-ascii')
   end
 
diff --git a/spec/ruby/core/encoding/converter/search_convpath_spec.rb b/spec/ruby/core/encoding/converter/search_convpath_spec.rb
index 59fe4520c05..cac44765f8b 100644
--- a/spec/ruby/core/encoding/converter/search_convpath_spec.rb
+++ b/spec/ruby/core/encoding/converter/search_convpath_spec.rb
@@ -25,6 +25,6 @@
   it "raises an Encoding::ConverterNotFoundError if no conversion path exists" do
     -> do
       Encoding::Converter.search_convpath(Encoding::BINARY, Encoding::Emacs_Mule)
-    end.should raise_error(Encoding::ConverterNotFoundError)
+    end.should.raise(Encoding::ConverterNotFoundError)
   end
 end
diff --git a/spec/ruby/core/encoding/default_external_spec.rb b/spec/ruby/core/encoding/default_external_spec.rb
index 9aae4976e04..2a2bd7f6aef 100644
--- a/spec/ruby/core/encoding/default_external_spec.rb
+++ b/spec/ruby/core/encoding/default_external_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "returns an Encoding object" do
-    Encoding.default_external.should be_an_instance_of(Encoding)
+    Encoding.default_external.should.instance_of?(Encoding)
   end
 
   it "returns the default external encoding" do
@@ -60,10 +60,10 @@
   end
 
   it "raises a TypeError unless the argument is an Encoding or convertible to a String" do
-    -> { Encoding.default_external = [] }.should raise_error(TypeError)
+    -> { Encoding.default_external = [] }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError if the argument is nil" do
-    -> { Encoding.default_external = nil }.should raise_error(ArgumentError)
+    -> { Encoding.default_external = nil }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/encoding/default_internal_spec.rb b/spec/ruby/core/encoding/default_internal_spec.rb
index 855f4e9f324..38aef9dce94 100644
--- a/spec/ruby/core/encoding/default_internal_spec.rb
+++ b/spec/ruby/core/encoding/default_internal_spec.rb
@@ -10,17 +10,17 @@
   end
 
   it "is nil by default" do
-    Encoding.default_internal.should be_nil
+    Encoding.default_internal.should == nil
   end
 
   it "returns an Encoding object if a default internal encoding is set" do
     Encoding.default_internal = Encoding::ASCII
-    Encoding.default_internal.should be_an_instance_of(Encoding)
+    Encoding.default_internal.should.instance_of?(Encoding)
   end
 
   it "returns nil if no default internal encoding is set" do
     Encoding.default_internal = nil
-    Encoding.default_internal.should be_nil
+    Encoding.default_internal.should == nil
   end
 
   it "returns the default internal encoding" do
@@ -60,15 +60,15 @@
     obj = mock('string')
     obj.should_receive(:to_str).at_least(1).times.and_return(1)
 
-    -> { Encoding.default_internal = obj }.should raise_error(TypeError)
+    -> { Encoding.default_internal = obj }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed an object not providing #to_str" do
-    -> { Encoding.default_internal = mock("encoding") }.should raise_error(TypeError)
+    -> { Encoding.default_internal = mock("encoding") }.should.raise(TypeError)
   end
 
   it "accepts an argument of nil to unset the default internal encoding" do
     Encoding.default_internal = nil
-    Encoding.default_internal.should be_nil
+    Encoding.default_internal.should == nil
   end
 end
diff --git a/spec/ruby/core/encoding/dummy_spec.rb b/spec/ruby/core/encoding/dummy_spec.rb
index 77caebca9a2..05530a81865 100644
--- a/spec/ruby/core/encoding/dummy_spec.rb
+++ b/spec/ruby/core/encoding/dummy_spec.rb
@@ -2,14 +2,14 @@
 
 describe "Encoding#dummy?" do
   it "returns false for proper encodings" do
-    Encoding::UTF_8.dummy?.should be_false
-    Encoding::ASCII.dummy?.should be_false
+    Encoding::UTF_8.dummy?.should == false
+    Encoding::ASCII.dummy?.should == false
   end
 
   it "returns true for dummy encodings" do
-    Encoding::ISO_2022_JP.dummy?.should be_true
-    Encoding::CP50221.dummy?.should be_true
-    Encoding::UTF_7.dummy?.should be_true
+    Encoding::ISO_2022_JP.dummy?.should == true
+    Encoding::CP50221.dummy?.should == true
+    Encoding::UTF_7.dummy?.should == true
   end
 
   it "returns true for UTF_16 and UTF_32" do
diff --git a/spec/ruby/core/encoding/find_spec.rb b/spec/ruby/core/encoding/find_spec.rb
index 9c34fe0e77f..c5356560ebd 100644
--- a/spec/ruby/core/encoding/find_spec.rb
+++ b/spec/ruby/core/encoding/find_spec.rb
@@ -7,18 +7,18 @@
 
   it "returns the corresponding Encoding object if given a valid encoding name" do
     @encodings.each do |enc|
-      Encoding.find(enc).should be_an_instance_of(Encoding)
+      Encoding.find(enc).should.instance_of?(Encoding)
     end
   end
 
   it "returns the corresponding Encoding object if given a valid alias name" do
     Encoding.aliases.keys.each do |enc_alias|
-      Encoding.find(enc_alias).should be_an_instance_of(Encoding)
+      Encoding.find(enc_alias).should.instance_of?(Encoding)
     end
   end
 
   it "raises a TypeError if passed a Symbol" do
-    -> { Encoding.find(:"utf-8") }.should raise_error(TypeError)
+    -> { Encoding.find(:"utf-8") }.should.raise(TypeError)
   end
 
   it "returns the passed Encoding object" do
@@ -50,7 +50,7 @@ def to_str; @encoding_name; end
   end
 
   it "raises an ArgumentError if the given encoding does not exist" do
-    -> { Encoding.find('dh2dh278d') }.should raise_error(ArgumentError, 'unknown encoding name - dh2dh278d')
+    -> { Encoding.find('dh2dh278d') }.should.raise(ArgumentError, 'unknown encoding name - dh2dh278d')
   end
 
   # Not sure how to do a better test, since locale depends on weird platform-specific stuff
diff --git a/spec/ruby/core/encoding/inspect_spec.rb b/spec/ruby/core/encoding/inspect_spec.rb
index df96141db90..ab7f8cf9fce 100644
--- a/spec/ruby/core/encoding/inspect_spec.rb
+++ b/spec/ruby/core/encoding/inspect_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Encoding#inspect" do
   it "returns a String" do
-    Encoding::UTF_8.inspect.should be_an_instance_of(String)
+    Encoding::UTF_8.inspect.should.instance_of?(String)
   end
 
   ruby_version_is ""..."3.4" do
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb
index 2b15fc1a0f9..7d3cc77c0bd 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb
@@ -8,8 +8,8 @@
   end
 
   it "returns a String" do
-    @exception.destination_encoding_name.should be_an_instance_of(String)
-    @exception2.destination_encoding_name.should be_an_instance_of(String)
+    @exception.destination_encoding_name.should.instance_of?(String)
+    @exception2.destination_encoding_name.should.instance_of?(String)
   end
 
   it "is equal to the destination encoding name of the object that raised it" do
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb
index c2ed6de1d85..264c409b1c2 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb
@@ -8,8 +8,8 @@
   end
 
   it "returns an Encoding object" do
-    @exception.destination_encoding.should be_an_instance_of(Encoding)
-    @exception2.destination_encoding.should be_an_instance_of(Encoding)
+    @exception.destination_encoding.should.instance_of?(Encoding)
+    @exception2.destination_encoding.should.instance_of?(Encoding)
   end
 
   it "is equal to the destination encoding of the object that raised it" do
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb
index 8b7e87960f8..40a9a35caf0 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb
@@ -9,8 +9,8 @@
   end
 
   it "returns a String" do
-    @exception.error_bytes.should be_an_instance_of(String)
-    @exception2.error_bytes.should be_an_instance_of(String)
+    @exception.error_bytes.should.instance_of?(String)
+    @exception2.error_bytes.should.instance_of?(String)
   end
 
   it "returns the bytes that caused the exception" do
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb
index 83606f77b4d..143db7b6da5 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Encoding::InvalidByteSequenceError#incomplete_input?" do
   it "returns nil by default" do
-    Encoding::InvalidByteSequenceError.new.incomplete_input?.should be_nil
+    Encoding::InvalidByteSequenceError.new.incomplete_input?.should == nil
   end
 
   it "returns true if #primitive_convert returned :incomplete_input for the same data" do
@@ -12,7 +12,7 @@
     begin
       ec.convert("\xA1")
     rescue Encoding::InvalidByteSequenceError => e
-      e.incomplete_input?.should be_true
+      e.incomplete_input?.should == true
     end
   end
 
@@ -22,7 +22,7 @@
     begin
       ec.convert("\xfffffffff")
     rescue Encoding::InvalidByteSequenceError => e
-      e.incomplete_input?.should be_false
+      e.incomplete_input?.should == false
     end
   end
 end
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb
index e5ad0a61bd7..e4fc81aac61 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb
@@ -9,8 +9,8 @@
   end
 
   it "returns a String" do
-    @exception.readagain_bytes.should be_an_instance_of(String)
-    @exception2.readagain_bytes.should be_an_instance_of(String)
+    @exception.readagain_bytes.should.instance_of?(String)
+    @exception2.readagain_bytes.should.instance_of?(String)
   end
 
   it "returns the bytes to be read again" do
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb
index a9464114a89..b00e1ad4e80 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns a String" do
-    @exception.source_encoding_name.should be_an_instance_of(String)
+    @exception.source_encoding_name.should.instance_of?(String)
   end
 
   it "is equal to the source encoding name of the object that raised it" do
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb
index 7fdc0a122bf..32ad25dbb50 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb
@@ -8,8 +8,8 @@
   end
 
   it "returns an Encoding object" do
-    @exception.source_encoding.should be_an_instance_of(Encoding)
-    @exception2.source_encoding.should be_an_instance_of(Encoding)
+    @exception.source_encoding.should.instance_of?(Encoding)
+    @exception2.source_encoding.should.instance_of?(Encoding)
   end
 
   it "is equal to the source encoding of the object that raised it" do
diff --git a/spec/ruby/core/encoding/list_spec.rb b/spec/ruby/core/encoding/list_spec.rb
index bd3d5b7bc0d..9fe336c6085 100644
--- a/spec/ruby/core/encoding/list_spec.rb
+++ b/spec/ruby/core/encoding/list_spec.rb
@@ -2,12 +2,12 @@
 
 describe "Encoding.list" do
   it "returns an Array" do
-    Encoding.list.should be_an_instance_of(Array)
+    Encoding.list.should.instance_of?(Array)
   end
 
   it "returns an Array of Encoding objects" do
     Encoding.list.each do |enc|
-      enc.should be_an_instance_of(Encoding)
+      enc.should.instance_of?(Encoding)
     end
   end
 
@@ -17,18 +17,18 @@
   end
 
   it "includes the default external encoding" do
-    Encoding.list.include?(Encoding.default_external).should be_true
+    Encoding.list.include?(Encoding.default_external).should == true
   end
 
   it "does not include any alias names" do
     Encoding.aliases.keys.each do |enc_alias|
-      Encoding.list.include?(enc_alias).should be_false
+      Encoding.list.include?(enc_alias).should == false
     end
   end
 
   it "includes all aliased encodings" do
     Encoding.aliases.values.each do |enc_alias|
-      Encoding.list.include?(Encoding.find(enc_alias)).should be_true
+      Encoding.list.include?(Encoding.find(enc_alias)).should == true
     end
   end
 
diff --git a/spec/ruby/core/encoding/locale_charmap_spec.rb b/spec/ruby/core/encoding/locale_charmap_spec.rb
index 8143b9083a8..0d77bf227b4 100644
--- a/spec/ruby/core/encoding/locale_charmap_spec.rb
+++ b/spec/ruby/core/encoding/locale_charmap_spec.rb
@@ -2,55 +2,55 @@
 
 describe "Encoding.locale_charmap" do
   it "returns a String" do
-    Encoding.locale_charmap.should be_an_instance_of(String)
+    Encoding.locale_charmap.should.instance_of?(String)
   end
 
-  # FIXME: Get this working on Windows
-  platform_is :linux do
-    platform_is_not :android do
-      it "returns a value based on the LC_ALL environment variable" do
-        old_lc_all = ENV['LC_ALL']
-        ENV['LC_ALL'] = 'C'
-        ruby_exe("print Encoding.locale_charmap").should == 'ANSI_X3.4-1968'
-        ENV['LC_ALL'] = old_lc_all
+  describe "when setting LC_ALL=C" do
+    before :each do
+      @old_lc_all = ENV['LC_ALL']
+    end
+
+    after :each do
+      ENV['LC_ALL'] = @old_lc_all
+    end
+
+    # FIXME: Get this working on Windows
+    platform_is :linux do
+      platform_is_not :android do
+        it "returns a value based on the LC_ALL environment variable" do
+          ENV['LC_ALL'] = 'C'
+          ruby_exe("print Encoding.locale_charmap").should == 'ANSI_X3.4-1968'
+        end
       end
     end
-  end
 
-  platform_is :freebsd, :openbsd, :darwin do
-    it "returns a value based on the LC_ALL environment variable" do
-      old_lc_all = ENV['LC_ALL']
-      ENV['LC_ALL'] = 'C'
-      ruby_exe("print Encoding.locale_charmap").should == 'US-ASCII'
-      ENV['LC_ALL'] = old_lc_all
+    platform_is :freebsd, :openbsd, :darwin do
+      it "returns a value based on the LC_ALL environment variable" do
+        ENV['LC_ALL'] = 'C'
+        ruby_exe("print Encoding.locale_charmap").should == 'US-ASCII'
+      end
     end
-  end
 
-  platform_is :netbsd do
-    it "returns a value based on the LC_ALL environment variable" do
-      old_lc_all = ENV['LC_ALL']
-      ENV['LC_ALL'] = 'C'
-      ruby_exe("print Encoding.locale_charmap").should == '646'
-      ENV['LC_ALL'] = old_lc_all
+    platform_is :netbsd do
+      it "returns a value based on the LC_ALL environment variable" do
+        ENV['LC_ALL'] = 'C'
+        ruby_exe("print Encoding.locale_charmap").should == '646'
+      end
     end
-  end
 
-  platform_is :android do
-    it "always returns UTF-8" do
-      old_lc_all = ENV['LC_ALL']
-      ENV['LC_ALL'] = 'C'
-      ruby_exe("print Encoding.locale_charmap").should == 'UTF-8'
-      ENV['LC_ALL'] = old_lc_all
+    platform_is :android do
+      it "always returns UTF-8" do
+        ENV['LC_ALL'] = 'C'
+        ruby_exe("print Encoding.locale_charmap").should == 'UTF-8'
+      end
     end
-  end
 
-  platform_is :bsd, :darwin, :linux do
-    it "is unaffected by assigning to ENV['LC_ALL'] in the same process" do
-      old_charmap = Encoding.locale_charmap
-      old_lc_all = ENV['LC_ALL']
-      ENV['LC_ALL'] = 'C'
-      Encoding.locale_charmap.should == old_charmap
-      ENV['LC_ALL'] = old_lc_all
+    platform_is :bsd, :darwin, :linux do
+      it "is unaffected by assigning to ENV['LC_ALL'] in the same process" do
+        old_charmap = Encoding.locale_charmap
+        ENV['LC_ALL'] = 'C'
+        Encoding.locale_charmap.should == old_charmap
+      end
     end
   end
 end
diff --git a/spec/ruby/core/encoding/name_list_spec.rb b/spec/ruby/core/encoding/name_list_spec.rb
index 836381c4d86..1ba8d383bca 100644
--- a/spec/ruby/core/encoding/name_list_spec.rb
+++ b/spec/ruby/core/encoding/name_list_spec.rb
@@ -2,22 +2,22 @@
 
 describe "Encoding.name_list" do
   it "returns an Array" do
-    Encoding.name_list.should be_an_instance_of(Array)
+    Encoding.name_list.should.instance_of?(Array)
   end
 
   it "returns encoding names as Strings" do
-    Encoding.name_list.each {|e| e.should be_an_instance_of(String) }
+    Encoding.name_list.each {|e| e.should.instance_of?(String) }
   end
 
   it "includes all aliases" do
     Encoding.aliases.keys.each do |enc_alias|
-      Encoding.name_list.include?(enc_alias).should be_true
+      Encoding.name_list.include?(enc_alias).should == true
     end
   end
 
   it "includes all non-dummy encodings" do
     Encoding.list.each do |enc|
-      Encoding.name_list.include?(enc.name).should be_true
+      Encoding.name_list.include?(enc.name).should == true
     end
   end
 end
diff --git a/spec/ruby/core/encoding/names_spec.rb b/spec/ruby/core/encoding/names_spec.rb
index 9ded043bbbb..e6bcbf474a4 100644
--- a/spec/ruby/core/encoding/names_spec.rb
+++ b/spec/ruby/core/encoding/names_spec.rb
@@ -4,7 +4,7 @@
   it "returns an Array" do
     Encoding.name_list.each do |name|
       e = Encoding.find(name) or next
-      e.names.should be_an_instance_of(Array)
+      e.names.should.instance_of?(Array)
     end
   end
 
@@ -12,7 +12,7 @@
     Encoding.name_list.each do |name|
       e = Encoding.find(name) or next
       e.names.each do |this_name|
-        this_name.should be_an_instance_of(String)
+        this_name.should.instance_of?(String)
       end
     end
   end
@@ -29,7 +29,7 @@
       e = Encoding.find(name) or next
       aliases = Encoding.aliases.select{|a,n| n == name}.keys
       names = e.names
-      aliases.each {|a| names.include?(a).should be_true}
+      aliases.each {|a| names.include?(a).should == true}
     end
   end
 end
diff --git a/spec/ruby/core/encoding/shared/name.rb b/spec/ruby/core/encoding/shared/name.rb
index cd37ea06dbc..4d4b860a1f6 100644
--- a/spec/ruby/core/encoding/shared/name.rb
+++ b/spec/ruby/core/encoding/shared/name.rb
@@ -3,7 +3,7 @@
 describe :encoding_name, shared: true do
   it "returns a String" do
     Encoding.list.each do |e|
-      e.send(@method).should be_an_instance_of(String)
+      e.send(@method).should.instance_of?(String)
     end
   end
 
diff --git a/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb
index a51a9f46a00..bc36695ca79 100644
--- a/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb
+++ b/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "returns a String" do
-    @exception.destination_encoding_name.should be_an_instance_of(String)
+    @exception.destination_encoding_name.should.instance_of?(String)
   end
 
   it "is equal to the destination encoding name of the object that raised it" do
diff --git a/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb
index 905556407c9..c0fcf8de58c 100644
--- a/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb
+++ b/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "returns an Encoding object" do
-    @exception.destination_encoding.should be_an_instance_of(Encoding)
+    @exception.destination_encoding.should.instance_of?(Encoding)
   end
 
   it "is equal to the destination encoding of the object that raised it" do
diff --git a/spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb
index 9cb55e6d95e..333acf5ee66 100644
--- a/spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb
+++ b/spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb
@@ -8,8 +8,8 @@
   end
 
   it "returns a String" do
-    @exception.error_char.should be_an_instance_of(String)
-    @exception2.error_char.should be_an_instance_of(String)
+    @exception.error_char.should.instance_of?(String)
+    @exception2.error_char.should.instance_of?(String)
   end
 
   it "returns the one-character String that caused the exception" do
diff --git a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb
index d5e60e78dbd..4932a25ed71 100644
--- a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb
+++ b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns a String" do
-    @exception.source_encoding_name.should be_an_instance_of(String)
+    @exception.source_encoding_name.should.instance_of?(String)
   end
 
   it "is equal to the source encoding name of the object that raised it" do
diff --git a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb
index de456a4b5ad..cf12020ad2f 100644
--- a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb
+++ b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb
@@ -8,8 +8,8 @@
   end
 
   it "returns an Encoding object" do
-    @exception.source_encoding.should be_an_instance_of(Encoding)
-    @exception2.source_encoding.should be_an_instance_of(Encoding)
+    @exception.source_encoding.should.instance_of?(Encoding)
+    @exception2.source_encoding.should.instance_of?(Encoding)
   end
 
   it "is equal to the source encoding of the object that raised it" do
diff --git a/spec/ruby/core/enumerable/all_spec.rb b/spec/ruby/core/enumerable/all_spec.rb
index 160cd52628f..cbdd63f86a9 100644
--- a/spec/ruby/core/enumerable/all_spec.rb
+++ b/spec/ruby/core/enumerable/all_spec.rb
@@ -21,19 +21,19 @@
   end
 
   it "raises an ArgumentError when more than 1 argument is provided" do
-    -> { @enum.all?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { [].all?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { {}.all?(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { @enum.all?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { [].all?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { {}.all?(1, 2, 3) }.should.raise(ArgumentError)
   end
 
   it "does not hide exceptions out of #each" do
     -> {
       EnumerableSpecs::ThrowingEach.new.all?
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
 
     -> {
       EnumerableSpecs::ThrowingEach.new.all? { false }
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
   end
 
   describe "with no block" do
@@ -60,7 +60,7 @@
 
     it "gathers whole arrays as elements when each yields multiple" do
       multi = EnumerableSpecs::YieldsMultiWithFalse.new
-      multi.all?.should be_true
+      multi.all?.should == true
     end
   end
 
@@ -106,7 +106,7 @@
     it "does not hide exceptions out of the block" do
       -> {
         @enum.all? { raise "from block" }
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "gathers initial args as elements when each yields multiple" do
@@ -125,7 +125,7 @@
   end
 
   describe 'when given a pattern argument' do
-    it "calls `===` on the pattern the return value " do
+    it "calls `===` on the pattern the return value" do
       pattern = EnumerableSpecs::Pattern.new { |x| x >= 0 }
       @enum1.all?(pattern).should == false
       pattern.yielded.should == [[0], [1], [2], [-1]]
@@ -140,7 +140,7 @@
     it "does not hide exceptions out of #each" do
       -> {
         EnumerableSpecs::ThrowingEach.new.all?(Integer)
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "returns true if the pattern never returns false or nil" do
@@ -168,7 +168,7 @@
       pattern = EnumerableSpecs::Pattern.new { raise "from pattern" }
       -> {
         @enum.all?(pattern)
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "calls the pattern with gathered array when yielded with multiple arguments" do
diff --git a/spec/ruby/core/enumerable/any_spec.rb b/spec/ruby/core/enumerable/any_spec.rb
index 243f8735d5e..4405d4740a5 100644
--- a/spec/ruby/core/enumerable/any_spec.rb
+++ b/spec/ruby/core/enumerable/any_spec.rb
@@ -21,19 +21,19 @@
   end
 
   it "raises an ArgumentError when more than 1 argument is provided" do
-    -> { @enum.any?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { [].any?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { {}.any?(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { @enum.any?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { [].any?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { {}.any?(1, 2, 3) }.should.raise(ArgumentError)
   end
 
   it "does not hide exceptions out of #each" do
     -> {
       EnumerableSpecs::ThrowingEach.new.any?
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
 
     -> {
       EnumerableSpecs::ThrowingEach.new.any? { false }
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
   end
 
   describe "with no block" do
@@ -60,7 +60,7 @@
 
     it "gathers whole arrays as elements when each yields multiple" do
       multi = EnumerableSpecs::YieldsMultiWithFalse.new
-      multi.any?.should be_true
+      multi.any?.should == true
     end
   end
 
@@ -120,7 +120,7 @@
     it "does not hide exceptions out of the block" do
       -> {
         @enum.any? { raise "from block" }
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "gathers initial args as elements when each yields multiple" do
@@ -139,7 +139,7 @@
   end
 
   describe 'when given a pattern argument' do
-    it "calls `===` on the pattern the return value " do
+    it "calls `===` on the pattern the return value" do
       pattern = EnumerableSpecs::Pattern.new { |x| x == 2 }
       @enum1.any?(pattern).should == true
       pattern.yielded.should == [[0], [1], [2]]
@@ -154,7 +154,7 @@
     it "does not hide exceptions out of #each" do
       -> {
         EnumerableSpecs::ThrowingEach.new.any?(Integer)
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "returns true if the pattern ever returns a truthy value" do
@@ -181,7 +181,7 @@
       pattern = EnumerableSpecs::Pattern.new { raise "from pattern" }
       -> {
         @enum.any?(pattern)
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "calls the pattern with gathered array when yielded with multiple arguments" do
diff --git a/spec/ruby/core/enumerable/chain_spec.rb b/spec/ruby/core/enumerable/chain_spec.rb
index 5e2105d2946..a0597e46a1b 100644
--- a/spec/ruby/core/enumerable/chain_spec.rb
+++ b/spec/ruby/core/enumerable/chain_spec.rb
@@ -18,6 +18,6 @@
   end
 
   it "returns an Enumerator::Chain if given a block" do
-    EnumerableSpecs::Numerous.new.chain.should be_an_instance_of(Enumerator::Chain)
+    EnumerableSpecs::Numerous.new.chain.should.instance_of?(Enumerator::Chain)
   end
 end
diff --git a/spec/ruby/core/enumerable/chunk_spec.rb b/spec/ruby/core/enumerable/chunk_spec.rb
index ed6304307fe..7c9b31c991e 100644
--- a/spec/ruby/core/enumerable/chunk_spec.rb
+++ b/spec/ruby/core/enumerable/chunk_spec.rb
@@ -8,13 +8,13 @@
 
   it "returns an Enumerator if called without a block" do
     chunk = EnumerableSpecs::Numerous.new(1, 2, 3, 1, 2).chunk
-    chunk.should be_an_instance_of(Enumerator)
+    chunk.should.instance_of?(Enumerator)
     result = chunk.with_index {|elt, i| elt - i }.to_a
     result.should == [[1, [1, 2, 3]], [-2, [1, 2]]]
   end
 
   it "returns an Enumerator if given a block" do
-    EnumerableSpecs::Numerous.new.chunk {}.should be_an_instance_of(Enumerator)
+    EnumerableSpecs::Numerous.new.chunk {}.should.instance_of?(Enumerator)
   end
 
   it "yields the current element and the current chunk to the block" do
@@ -59,14 +59,14 @@
 
   it "raises a RuntimeError if the block returns a Symbol starting with an underscore other than :_alone or :_separator" do
     e = EnumerableSpecs::Numerous.new(1, 2, 3, 2, 1)
-    -> { e.chunk { |x| :_arbitrary }.to_a }.should raise_error(RuntimeError)
+    -> { e.chunk { |x| :_arbitrary }.to_a }.should.raise(RuntimeError)
   end
 
   it "does not accept arguments" do
     e = EnumerableSpecs::Numerous.new(1, 2, 3)
     -> {
       e.chunk(1) {}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it 'returned Enumerator size returns nil' do
diff --git a/spec/ruby/core/enumerable/chunk_while_spec.rb b/spec/ruby/core/enumerable/chunk_while_spec.rb
index 26bcc983db9..286f7174428 100644
--- a/spec/ruby/core/enumerable/chunk_while_spec.rb
+++ b/spec/ruby/core/enumerable/chunk_while_spec.rb
@@ -11,7 +11,7 @@
 
   context "when given a block" do
     it "returns an enumerator" do
-      @result.should be_an_instance_of(Enumerator)
+      @result.should.instance_of?(Enumerator)
     end
 
     it "splits chunks between adjacent elements i and j where the block returns false" do
@@ -30,7 +30,7 @@
 
   context "when not given a block" do
     it "raises an ArgumentError" do
-      -> { @enum.chunk_while }.should raise_error(ArgumentError)
+      -> { @enum.chunk_while }.should.raise(ArgumentError)
     end
   end
 
diff --git a/spec/ruby/core/enumerable/cycle_spec.rb b/spec/ruby/core/enumerable/cycle_spec.rb
index 487086cba3e..1fb3cc3d419 100644
--- a/spec/ruby/core/enumerable/cycle_spec.rb
+++ b/spec/ruby/core/enumerable/cycle_spec.rb
@@ -17,7 +17,7 @@
 
     it "returns nil if there are no elements" do
       out = EnumerableSpecs::Empty.new.cycle { break :nope }
-      out.should be_nil
+      out.should == nil
     end
 
     it "yields successive elements of the array repeatedly" do
@@ -44,8 +44,8 @@
 
   describe "passed a number n as an argument" do
     it "returns nil and does nothing for non positive n" do
-      EnumerableSpecs::ThrowingEach.new.cycle(0) {}.should be_nil
-      EnumerableSpecs::NoEach.new.cycle(-22) {}.should be_nil
+      EnumerableSpecs::ThrowingEach.new.cycle(0) {}.should == nil
+      EnumerableSpecs::NoEach.new.cycle(-22) {}.should == nil
     end
 
     it "calls each at most once" do
@@ -71,12 +71,12 @@
 
     it "raises a TypeError when the passed n cannot be coerced to Integer" do
       enum = EnumerableSpecs::Numerous.new
-      ->{ enum.cycle("cat"){} }.should raise_error(TypeError)
+      ->{ enum.cycle("cat"){} }.should.raise(TypeError)
     end
 
     it "raises an ArgumentError if more arguments are passed" do
       enum = EnumerableSpecs::Numerous.new
-      ->{ enum.cycle(1, 2) {} }.should raise_error(ArgumentError)
+      ->{ enum.cycle(1, 2) {} }.should.raise(ArgumentError)
     end
 
     it "gathers whole arrays as elements when each yields multiple" do
diff --git a/spec/ruby/core/enumerable/drop_spec.rb b/spec/ruby/core/enumerable/drop_spec.rb
index 423cc0088bb..8d95f464b35 100644
--- a/spec/ruby/core/enumerable/drop_spec.rb
+++ b/spec/ruby/core/enumerable/drop_spec.rb
@@ -7,13 +7,13 @@
   end
 
   it "requires exactly one argument" do
-    ->{ @enum.drop{} }.should raise_error(ArgumentError)
-    ->{ @enum.drop(1, 2){} }.should raise_error(ArgumentError)
+    ->{ @enum.drop{} }.should.raise(ArgumentError)
+    ->{ @enum.drop(1, 2){} }.should.raise(ArgumentError)
   end
 
   describe "passed a number n as an argument" do
     it "raises ArgumentError if n < 0" do
-      ->{ @enum.drop(-1) }.should raise_error(ArgumentError)
+      ->{ @enum.drop(-1) }.should.raise(ArgumentError)
     end
 
     it "tries to convert n to an Integer using #to_int" do
@@ -35,8 +35,8 @@
     end
 
     it "raises a TypeError when the passed n cannot be coerced to Integer" do
-      ->{ @enum.drop("hat") }.should raise_error(TypeError)
-      ->{ @enum.drop(nil) }.should raise_error(TypeError)
+      ->{ @enum.drop("hat") }.should.raise(TypeError)
+      ->{ @enum.drop(nil) }.should.raise(TypeError)
     end
 
   end
diff --git a/spec/ruby/core/enumerable/drop_while_spec.rb b/spec/ruby/core/enumerable/drop_while_spec.rb
index 636c3d284a1..4b4fdf2d4f7 100644
--- a/spec/ruby/core/enumerable/drop_while_spec.rb
+++ b/spec/ruby/core/enumerable/drop_while_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns an Enumerator if no block given" do
-    @enum.drop_while.should be_an_instance_of(Enumerator)
+    @enum.drop_while.should.instance_of?(Enumerator)
   end
 
   it "returns no/all elements for {true/false} block" do
@@ -38,7 +38,7 @@
 
   it "doesn't return self when it could" do
     a = [1,2,3]
-    a.drop_while{false}.should_not equal(a)
+    a.drop_while{false}.should_not.equal?(a)
   end
 
   it "gathers whole arrays as elements when each yields multiple" do
diff --git a/spec/ruby/core/enumerable/each_cons_spec.rb b/spec/ruby/core/enumerable/each_cons_spec.rb
index ed777418624..c5e299fd004 100644
--- a/spec/ruby/core/enumerable/each_cons_spec.rb
+++ b/spec/ruby/core/enumerable/each_cons_spec.rb
@@ -15,14 +15,14 @@
   end
 
   it "raises an ArgumentError if there is not a single parameter > 0" do
-    ->{ @enum.each_cons(0){}    }.should raise_error(ArgumentError)
-    ->{ @enum.each_cons(-2){}   }.should raise_error(ArgumentError)
-    ->{ @enum.each_cons{}       }.should raise_error(ArgumentError)
-    ->{ @enum.each_cons(2,2){}  }.should raise_error(ArgumentError)
-    ->{ @enum.each_cons(0)      }.should raise_error(ArgumentError)
-    ->{ @enum.each_cons(-2)     }.should raise_error(ArgumentError)
-    ->{ @enum.each_cons         }.should raise_error(ArgumentError)
-    ->{ @enum.each_cons(2,2)    }.should raise_error(ArgumentError)
+    ->{ @enum.each_cons(0){}    }.should.raise(ArgumentError)
+    ->{ @enum.each_cons(-2){}   }.should.raise(ArgumentError)
+    ->{ @enum.each_cons{}       }.should.raise(ArgumentError)
+    ->{ @enum.each_cons(2,2){}  }.should.raise(ArgumentError)
+    ->{ @enum.each_cons(0)      }.should.raise(ArgumentError)
+    ->{ @enum.each_cons(-2)     }.should.raise(ArgumentError)
+    ->{ @enum.each_cons         }.should.raise(ArgumentError)
+    ->{ @enum.each_cons(2,2)    }.should.raise(ArgumentError)
   end
 
   it "tries to convert n to an Integer using #to_int" do
@@ -63,7 +63,7 @@
   describe "when no block is given" do
     it "returns an enumerator" do
       e = @enum.each_cons(3)
-      e.should be_an_instance_of(Enumerator)
+      e.should.instance_of?(Enumerator)
       e.to_a.should == @in_threes
     end
 
diff --git a/spec/ruby/core/enumerable/each_entry_spec.rb b/spec/ruby/core/enumerable/each_entry_spec.rb
index edf00f31374..9dc89ec28e1 100644
--- a/spec/ruby/core/enumerable/each_entry_spec.rb
+++ b/spec/ruby/core/enumerable/each_entry_spec.rb
@@ -11,13 +11,13 @@
 
   it "yields multiple arguments as an array" do
     acc = []
-    @enum.each_entry {|g| acc << g}.should equal(@enum)
+    @enum.each_entry {|g| acc << g}.should.equal?(@enum)
     acc.should == @entries
   end
 
   it "returns an enumerator if no block" do
     e = @enum.each_entry
-    e.should be_an_instance_of(Enumerator)
+    e.should.instance_of?(Enumerator)
     e.to_a.should == @entries
   end
 
@@ -27,8 +27,8 @@
   end
 
   it "raises an ArgumentError when extra arguments" do
-    -> { @enum.each_entry("one").to_a   }.should raise_error(ArgumentError)
-    -> { @enum.each_entry("one"){}.to_a }.should raise_error(ArgumentError)
+    -> { @enum.each_entry("one").to_a   }.should.raise(ArgumentError)
+    -> { @enum.each_entry("one"){}.to_a }.should.raise(ArgumentError)
   end
 
   it "passes extra arguments to #each" do
diff --git a/spec/ruby/core/enumerable/each_slice_spec.rb b/spec/ruby/core/enumerable/each_slice_spec.rb
index 47b8c9ba334..d05abad1e9f 100644
--- a/spec/ruby/core/enumerable/each_slice_spec.rb
+++ b/spec/ruby/core/enumerable/each_slice_spec.rb
@@ -15,14 +15,14 @@
   end
 
   it "raises an ArgumentError if there is not a single parameter > 0" do
-    ->{ @enum.each_slice(0){}    }.should raise_error(ArgumentError)
-    ->{ @enum.each_slice(-2){}   }.should raise_error(ArgumentError)
-    ->{ @enum.each_slice{}       }.should raise_error(ArgumentError)
-    ->{ @enum.each_slice(2,2){}  }.should raise_error(ArgumentError)
-    ->{ @enum.each_slice(0)      }.should raise_error(ArgumentError)
-    ->{ @enum.each_slice(-2)     }.should raise_error(ArgumentError)
-    ->{ @enum.each_slice         }.should raise_error(ArgumentError)
-    ->{ @enum.each_slice(2,2)    }.should raise_error(ArgumentError)
+    ->{ @enum.each_slice(0){}    }.should.raise(ArgumentError)
+    ->{ @enum.each_slice(-2){}   }.should.raise(ArgumentError)
+    ->{ @enum.each_slice{}       }.should.raise(ArgumentError)
+    ->{ @enum.each_slice(2,2){}  }.should.raise(ArgumentError)
+    ->{ @enum.each_slice(0)      }.should.raise(ArgumentError)
+    ->{ @enum.each_slice(-2)     }.should.raise(ArgumentError)
+    ->{ @enum.each_slice         }.should.raise(ArgumentError)
+    ->{ @enum.each_slice(2,2)    }.should.raise(ArgumentError)
   end
 
   it "tries to convert n to an Integer using #to_int" do
@@ -53,7 +53,7 @@
 
   it "returns an enumerator if no block" do
     e = @enum.each_slice(3)
-    e.should be_an_instance_of(Enumerator)
+    e.should.instance_of?(Enumerator)
     e.to_a.should == @sliced
   end
 
@@ -69,7 +69,7 @@
   describe "when no block is given" do
     it "returns an enumerator" do
       e = @enum.each_slice(3)
-      e.should be_an_instance_of(Enumerator)
+      e.should.instance_of?(Enumerator)
       e.to_a.should == @sliced
     end
 
diff --git a/spec/ruby/core/enumerable/each_with_index_spec.rb b/spec/ruby/core/enumerable/each_with_index_spec.rb
index 122e88eab7e..fcb2f82f84f 100644
--- a/spec/ruby/core/enumerable/each_with_index_spec.rb
+++ b/spec/ruby/core/enumerable/each_with_index_spec.rb
@@ -26,19 +26,19 @@
     acc = []
     res = @b.each_with_index {|a,i| acc << [a,i]}
     [[2, 0], [5, 1], [3, 2], [6, 3], [1, 4], [4, 5]].should == acc
-    res.should eql(@b)
+    res.should.eql?(@b)
   end
 
   it "binds splat arguments properly" do
     acc = []
     res = @b.each_with_index { |*b| c,d = b; acc << c; acc << d }
     [2, 0, 5, 1, 3, 2, 6, 3, 1, 4, 4, 5].should == acc
-    res.should eql(@b)
+    res.should.eql?(@b)
   end
 
   it "returns an enumerator if no block" do
     e = @b.each_with_index
-    e.should be_an_instance_of(Enumerator)
+    e.should.instance_of?(Enumerator)
     e.to_a.should == [[2, 0], [5, 1], [3, 2], [6, 3], [1, 4], [4, 5]]
   end
 
diff --git a/spec/ruby/core/enumerable/each_with_object_spec.rb b/spec/ruby/core/enumerable/each_with_object_spec.rb
index 35665e7019a..1760d3b267d 100644
--- a/spec/ruby/core/enumerable/each_with_object_spec.rb
+++ b/spec/ruby/core/enumerable/each_with_object_spec.rb
@@ -12,10 +12,10 @@
   it "passes each element and its argument to the block" do
     acc = []
     @enum.each_with_object(@initial) do |elem, obj|
-      obj.should equal(@initial)
+      obj.should.equal?(@initial)
       obj = 42
       acc << elem
-    end.should equal(@initial)
+    end.should.equal?(@initial)
     acc.should == @values
   end
 
@@ -23,10 +23,10 @@
     acc = []
     e = @enum.each_with_object(@initial)
     e.each do |elem, obj|
-      obj.should equal(@initial)
+      obj.should.equal?(@initial)
       obj = 42
       acc << elem
-    end.should equal(@initial)
+    end.should.equal?(@initial)
     acc.should == @values
   end
 
diff --git a/spec/ruby/core/enumerable/filter_map_spec.rb b/spec/ruby/core/enumerable/filter_map_spec.rb
index aa4894230b5..1ed131a9601 100644
--- a/spec/ruby/core/enumerable/filter_map_spec.rb
+++ b/spec/ruby/core/enumerable/filter_map_spec.rb
@@ -19,6 +19,6 @@
   end
 
   it 'returns an enumerator when no block given' do
-    @numerous.filter_map.should be_an_instance_of(Enumerator)
+    @numerous.filter_map.should.instance_of?(Enumerator)
   end
 end
diff --git a/spec/ruby/core/enumerable/find_index_spec.rb b/spec/ruby/core/enumerable/find_index_spec.rb
index 542660fe04d..2e714367baa 100644
--- a/spec/ruby/core/enumerable/find_index_spec.rb
+++ b/spec/ruby/core/enumerable/find_index_spec.rb
@@ -47,7 +47,7 @@
   end
 
   it "returns an Enumerator if no block given" do
-    @numerous.find_index.should be_an_instance_of(Enumerator)
+    @numerous.find_index.should.instance_of?(Enumerator)
   end
 
   it "uses #== for testing equality" do
diff --git a/spec/ruby/core/enumerable/first_spec.rb b/spec/ruby/core/enumerable/first_spec.rb
index ed1ba599b49..592dff1ebc4 100644
--- a/spec/ruby/core/enumerable/first_spec.rb
+++ b/spec/ruby/core/enumerable/first_spec.rb
@@ -19,7 +19,7 @@
 
   it "raises a RangeError when passed a Bignum" do
     enum = EnumerableSpecs::Empty.new
-    -> { enum.first(bignum_value) }.should raise_error(RangeError)
+    -> { enum.first(bignum_value) }.should.raise(RangeError)
   end
 
   describe "when passed an argument" do
diff --git a/spec/ruby/core/enumerable/grep_spec.rb b/spec/ruby/core/enumerable/grep_spec.rb
index 989358f01b5..965e1837667 100644
--- a/spec/ruby/core/enumerable/grep_spec.rb
+++ b/spec/ruby/core/enumerable/grep_spec.rb
@@ -81,7 +81,7 @@ def (@odd_matcher = BasicObject.new).===(obj)
     end
 
     it "raises an ArgumentError when not given a pattern" do
-      -> { @numerous.grep { |e| e } }.should raise_error(ArgumentError)
+      -> { @numerous.grep { |e| e } }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/enumerable/grep_v_spec.rb b/spec/ruby/core/enumerable/grep_v_spec.rb
index ba192169684..ee99a77ac1e 100644
--- a/spec/ruby/core/enumerable/grep_v_spec.rb
+++ b/spec/ruby/core/enumerable/grep_v_spec.rb
@@ -55,7 +55,7 @@ def o.to_str
     end
 
     it "raises an ArgumentError when not given a pattern" do
-      -> { @numerous.grep_v }.should raise_error(ArgumentError)
+      -> { @numerous.grep_v }.should.raise(ArgumentError)
     end
   end
 
@@ -70,7 +70,7 @@ def o.to_str
     end
 
     it "raises an ArgumentError when not given a pattern" do
-      -> { @numerous.grep_v { |e| e } }.should raise_error(ArgumentError)
+      -> { @numerous.grep_v { |e| e } }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/enumerable/group_by_spec.rb b/spec/ruby/core/enumerable/group_by_spec.rb
index 4fd1603819f..904e5d6c689 100644
--- a/spec/ruby/core/enumerable/group_by_spec.rb
+++ b/spec/ruby/core/enumerable/group_by_spec.rb
@@ -16,13 +16,13 @@
   it "returns a hash without default_proc" do
     e = EnumerableSpecs::Numerous.new("foo", "bar", "baz")
     h = e.group_by { |word| word[0..0].to_sym }
-    h[:some].should be_nil
-    h.default_proc.should be_nil
-    h.default.should be_nil
+    h[:some].should == nil
+    h.default_proc.should == nil
+    h.default.should == nil
   end
 
   it "returns an Enumerator if called without a block" do
-    EnumerableSpecs::Numerous.new.group_by.should be_an_instance_of(Enumerator)
+    EnumerableSpecs::Numerous.new.group_by.should.instance_of?(Enumerator)
   end
 
   it "gathers whole arrays as elements when each yields multiple" do
diff --git a/spec/ruby/core/enumerable/lazy_spec.rb b/spec/ruby/core/enumerable/lazy_spec.rb
index 9a9ead81a00..935e5740672 100644
--- a/spec/ruby/core/enumerable/lazy_spec.rb
+++ b/spec/ruby/core/enumerable/lazy_spec.rb
@@ -5,6 +5,6 @@
 
 describe "Enumerable#lazy" do
   it "returns an instance of Enumerator::Lazy" do
-    EnumerableSpecs::Numerous.new.lazy.should be_an_instance_of(Enumerator::Lazy)
+    EnumerableSpecs::Numerous.new.lazy.should.instance_of?(Enumerator::Lazy)
   end
 end
diff --git a/spec/ruby/core/enumerable/max_by_spec.rb b/spec/ruby/core/enumerable/max_by_spec.rb
index ec1738ea3bc..f67b5d15ea4 100644
--- a/spec/ruby/core/enumerable/max_by_spec.rb
+++ b/spec/ruby/core/enumerable/max_by_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Enumerable#max_by" do
   it "returns an enumerator if no block" do
-    EnumerableSpecs::Numerous.new(42).max_by.should be_an_instance_of(Enumerator)
+    EnumerableSpecs::Numerous.new(42).max_by.should.instance_of?(Enumerator)
   end
 
   it "returns nil if #each yields no objects" do
@@ -18,7 +18,7 @@
 
   it "returns the object that appears first in #each in case of a tie" do
     a, b, c = '1', '2', '2'
-    EnumerableSpecs::Numerous.new(a, b, c).max_by {|obj| obj.to_i }.should equal(b)
+    EnumerableSpecs::Numerous.new(a, b, c).max_by {|obj| obj.to_i }.should.equal?(b)
   end
 
   it "uses max.<=>(current) to determine order" do
@@ -48,7 +48,7 @@
 
     context "without a block" do
       it "returns an enumerator" do
-        @enum.max_by(2).should be_an_instance_of(Enumerator)
+        @enum.max_by(2).should.instance_of?(Enumerator)
       end
     end
 
@@ -67,7 +67,7 @@
 
       context "when n is negative" do
         it "raises an ArgumentError" do
-          -> { @enum.max_by(-1) { |i| i.to_s } }.should raise_error(ArgumentError)
+          -> { @enum.max_by(-1) { |i| i.to_s } }.should.raise(ArgumentError)
         end
       end
     end
diff --git a/spec/ruby/core/enumerable/max_spec.rb b/spec/ruby/core/enumerable/max_spec.rb
index 0c11ca0969c..d92700258bc 100644
--- a/spec/ruby/core/enumerable/max_spec.rb
+++ b/spec/ruby/core/enumerable/max_spec.rb
@@ -38,16 +38,16 @@
   it "raises a NoMethodError for elements without #<=>" do
     -> do
       EnumerableSpecs::EachDefiner.new(BasicObject.new, BasicObject.new).max
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 
   it "raises an ArgumentError for incomparable elements" do
     -> do
       EnumerableSpecs::EachDefiner.new(11,"22").max
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
     -> do
       EnumerableSpecs::EachDefiner.new(11,12,22,33).max{|a, b| nil}
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   context "when passed a block" do
@@ -106,7 +106,7 @@
 
     context "that is negative" do
       it "raises an ArgumentError" do
-        -> { @e_ints.max(-1) }.should raise_error(ArgumentError)
+        -> { @e_ints.max(-1) }.should.raise(ArgumentError)
       end
     end
   end
diff --git a/spec/ruby/core/enumerable/min_by_spec.rb b/spec/ruby/core/enumerable/min_by_spec.rb
index 3ff87e49d80..4f949e21309 100644
--- a/spec/ruby/core/enumerable/min_by_spec.rb
+++ b/spec/ruby/core/enumerable/min_by_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Enumerable#min_by" do
   it "returns an enumerator if no block" do
-    EnumerableSpecs::Numerous.new(42).min_by.should be_an_instance_of(Enumerator)
+    EnumerableSpecs::Numerous.new(42).min_by.should.instance_of?(Enumerator)
   end
 
   it "returns nil if #each yields no objects" do
@@ -18,7 +18,7 @@
 
   it "returns the object that appears first in #each in case of a tie" do
     a, b, c = '2', '1', '1'
-    EnumerableSpecs::Numerous.new(a, b, c).min_by {|obj| obj.to_i }.should equal(b)
+    EnumerableSpecs::Numerous.new(a, b, c).min_by {|obj| obj.to_i }.should.equal?(b)
   end
 
   it "uses min.<=>(current) to determine order" do
@@ -48,7 +48,7 @@
 
     context "without a block" do
       it "returns an enumerator" do
-        @enum.min_by(2).should be_an_instance_of(Enumerator)
+        @enum.min_by(2).should.instance_of?(Enumerator)
       end
     end
 
@@ -67,7 +67,7 @@
 
       context "when n is negative" do
         it "raises an ArgumentError" do
-          -> { @enum.min_by(-1) { |i| i.to_s } }.should raise_error(ArgumentError)
+          -> { @enum.min_by(-1) { |i| i.to_s } }.should.raise(ArgumentError)
         end
       end
     end
diff --git a/spec/ruby/core/enumerable/min_spec.rb b/spec/ruby/core/enumerable/min_spec.rb
index 4b6ae248fab..f05d59c2c98 100644
--- a/spec/ruby/core/enumerable/min_spec.rb
+++ b/spec/ruby/core/enumerable/min_spec.rb
@@ -32,22 +32,22 @@
   end
 
   it "returns nil for an empty Enumerable" do
-    EnumerableSpecs::EachDefiner.new.min.should be_nil
+    EnumerableSpecs::EachDefiner.new.min.should == nil
   end
 
   it "raises a NoMethodError for elements without #<=>" do
     -> do
       EnumerableSpecs::EachDefiner.new(BasicObject.new, BasicObject.new).min
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 
   it "raises an ArgumentError for incomparable elements" do
     -> do
       EnumerableSpecs::EachDefiner.new(11,"22").min
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
     -> do
       EnumerableSpecs::EachDefiner.new(11,12,22,33).min{|a, b| nil}
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "returns the minimum when using a block rule" do
@@ -110,7 +110,7 @@
 
     context "that is negative" do
       it "raises an ArgumentError" do
-        -> { @e_ints.min(-1) }.should raise_error(ArgumentError)
+        -> { @e_ints.min(-1) }.should.raise(ArgumentError)
       end
     end
   end
diff --git a/spec/ruby/core/enumerable/minmax_by_spec.rb b/spec/ruby/core/enumerable/minmax_by_spec.rb
index a6a92492701..30c88cfcfb5 100644
--- a/spec/ruby/core/enumerable/minmax_by_spec.rb
+++ b/spec/ruby/core/enumerable/minmax_by_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Enumerable#minmax_by" do
   it "returns an enumerator if no block" do
-    EnumerableSpecs::Numerous.new(42).minmax_by.should be_an_instance_of(Enumerator)
+    EnumerableSpecs::Numerous.new(42).minmax_by.should.instance_of?(Enumerator)
   end
 
   it "returns nil if #each yields no objects" do
@@ -19,8 +19,8 @@
   it "returns the object that appears first in #each in case of a tie" do
     a, b, c, d = '1', '1', '2', '2'
     mm = EnumerableSpecs::Numerous.new(a, b, c, d).minmax_by {|obj| obj.to_i }
-    mm[0].should equal(a)
-    mm[1].should equal(c)
+    mm[0].should.equal?(a)
+    mm[1].should.equal?(c)
   end
 
   it "uses min/max.<=>(current) to determine order" do
diff --git a/spec/ruby/core/enumerable/none_spec.rb b/spec/ruby/core/enumerable/none_spec.rb
index fb42f13386d..d9ee0b441e4 100644
--- a/spec/ruby/core/enumerable/none_spec.rb
+++ b/spec/ruby/core/enumerable/none_spec.rb
@@ -15,35 +15,35 @@
   end
 
   it "raises an ArgumentError when more than 1 argument is provided" do
-    -> { @enum.none?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { [].none?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { {}.none?(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { @enum.none?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { [].none?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { {}.none?(1, 2, 3) }.should.raise(ArgumentError)
   end
 
   it "does not hide exceptions out of #each" do
     -> {
       EnumerableSpecs::ThrowingEach.new.none?
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
 
     -> {
       EnumerableSpecs::ThrowingEach.new.none? { false }
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
   end
 
   describe "with no block" do
     it "returns true if none of the elements in self are true" do
       e = EnumerableSpecs::Numerous.new(false, nil, false)
-      e.none?.should be_true
+      e.none?.should == true
     end
 
     it "returns false if at least one of the elements in self are true" do
       e = EnumerableSpecs::Numerous.new(false, nil, true, false)
-      e.none?.should be_false
+      e.none?.should == false
     end
 
     it "gathers whole arrays as elements when each yields multiple" do
       multi = EnumerableSpecs::YieldsMultiWithFalse.new
-      multi.none?.should be_false
+      multi.none?.should == false
     end
   end
 
@@ -65,17 +65,17 @@
     end
 
     it "returns true if the block never returns true" do
-      @e.none? {|e| false }.should be_true
+      @e.none? {|e| false }.should == true
     end
 
     it "returns false if the block ever returns true" do
-      @e.none? {|e| e == 3 ? true : false }.should be_false
+      @e.none? {|e| e == 3 ? true : false }.should == false
     end
 
     it "does not hide exceptions out of the block" do
       -> {
         @enum.none? { raise "from block" }
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "gathers initial args as elements when each yields multiple" do
@@ -94,7 +94,7 @@
   end
 
   describe 'when given a pattern argument' do
-    it "calls `===` on the pattern the return value " do
+    it "calls `===` on the pattern the return value" do
       pattern = EnumerableSpecs::Pattern.new { |x| x == 3 }
       @enum1.none?(pattern).should == true
       pattern.yielded.should == [[0], [1], [2], [-1]]
@@ -109,7 +109,7 @@
     it "does not hide exceptions out of #each" do
       -> {
         EnumerableSpecs::ThrowingEach.new.none?(Integer)
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "returns true if the pattern never returns a truthy value" do
@@ -134,7 +134,7 @@
       pattern = EnumerableSpecs::Pattern.new { raise "from pattern" }
       -> {
         @enum.none?(pattern)
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "calls the pattern with gathered array when yielded with multiple arguments" do
diff --git a/spec/ruby/core/enumerable/one_spec.rb b/spec/ruby/core/enumerable/one_spec.rb
index 4bf8623d2e6..cf966d4a9bc 100644
--- a/spec/ruby/core/enumerable/one_spec.rb
+++ b/spec/ruby/core/enumerable/one_spec.rb
@@ -15,57 +15,57 @@
   end
 
   it "raises an ArgumentError when more than 1 argument is provided" do
-    -> { @enum.one?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { [].one?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { {}.one?(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { @enum.one?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { [].one?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { {}.one?(1, 2, 3) }.should.raise(ArgumentError)
   end
 
   it "does not hide exceptions out of #each" do
     -> {
       EnumerableSpecs::ThrowingEach.new.one?
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
 
     -> {
       EnumerableSpecs::ThrowingEach.new.one? { false }
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
   end
 
   describe "with no block" do
     it "returns true if only one element evaluates to true" do
-      [false, nil, true].one?.should be_true
+      [false, nil, true].one?.should == true
     end
 
     it "returns false if two elements evaluate to true" do
-      [false, :value, nil, true].one?.should be_false
+      [false, :value, nil, true].one?.should == false
     end
 
     it "returns false if all elements evaluate to false" do
-      [false, nil, false].one?.should be_false
+      [false, nil, false].one?.should == false
     end
 
     it "gathers whole arrays as elements when each yields multiple" do
       multi = EnumerableSpecs::YieldsMultiWithSingleTrue.new
-      multi.one?.should be_false
+      multi.one?.should == false
     end
   end
 
   describe "with a block" do
     it "returns true if block returns true once" do
-      [:a, :b, :c].one? { |s| s == :a }.should be_true
+      [:a, :b, :c].one? { |s| s == :a }.should == true
     end
 
     it "returns false if the block returns true more than once" do
-      [:a, :b, :c].one? { |s| s == :a || s == :b }.should be_false
+      [:a, :b, :c].one? { |s| s == :a || s == :b }.should == false
     end
 
     it "returns false if the block only returns false" do
-      [:a, :b, :c].one? { |s| s == :d }.should be_false
+      [:a, :b, :c].one? { |s| s == :d }.should == false
     end
 
     it "does not hide exceptions out of the block" do
       -> {
         @enum.one? { raise "from block" }
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "gathers initial args as elements when each yields multiple" do
@@ -84,7 +84,7 @@
   end
 
   describe 'when given a pattern argument' do
-    it "calls `===` on the pattern the return value " do
+    it "calls `===` on the pattern the return value" do
       pattern = EnumerableSpecs::Pattern.new { |x| x == 1 }
       @enum1.one?(pattern).should == true
       pattern.yielded.should == [[0], [1], [2], [-1]]
@@ -99,7 +99,7 @@
     it "does not hide exceptions out of #each" do
       -> {
         EnumerableSpecs::ThrowingEach.new.one?(Integer)
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "returns true if the pattern returns a truthy value only once" do
@@ -135,7 +135,7 @@
       pattern = EnumerableSpecs::Pattern.new { raise "from pattern" }
       -> {
         @enum.one?(pattern)
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "calls the pattern with gathered array when yielded with multiple arguments" do
diff --git a/spec/ruby/core/enumerable/partition_spec.rb b/spec/ruby/core/enumerable/partition_spec.rb
index d3d220b4b44..8272ee189e1 100644
--- a/spec/ruby/core/enumerable/partition_spec.rb
+++ b/spec/ruby/core/enumerable/partition_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns an Enumerator if called without a block" do
-    EnumerableSpecs::Numerous.new.partition.should be_an_instance_of(Enumerator)
+    EnumerableSpecs::Numerous.new.partition.should.instance_of?(Enumerator)
   end
 
   it "gathers whole arrays as elements when each yields multiple" do
diff --git a/spec/ruby/core/enumerable/reject_spec.rb b/spec/ruby/core/enumerable/reject_spec.rb
index 0d86b49ea22..31e89f5b0e5 100644
--- a/spec/ruby/core/enumerable/reject_spec.rb
+++ b/spec/ruby/core/enumerable/reject_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it "returns an Enumerator if called without a block" do
-    EnumerableSpecs::Numerous.new.reject.should be_an_instance_of(Enumerator)
+    EnumerableSpecs::Numerous.new.reject.should.instance_of?(Enumerator)
   end
 
   it "gathers whole arrays as elements when each yields multiple" do
diff --git a/spec/ruby/core/enumerable/reverse_each_spec.rb b/spec/ruby/core/enumerable/reverse_each_spec.rb
index 2b1c2334888..47539567248 100644
--- a/spec/ruby/core/enumerable/reverse_each_spec.rb
+++ b/spec/ruby/core/enumerable/reverse_each_spec.rb
@@ -11,7 +11,7 @@
 
   it "returns an Enumerator if no block given" do
     enum = EnumerableSpecs::Numerous.new.reverse_each
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == [4, 1, 6, 3, 5, 2]
   end
 
diff --git a/spec/ruby/core/enumerable/shared/collect.rb b/spec/ruby/core/enumerable/shared/collect.rb
index 6df1a616ebe..4696d324544 100644
--- a/spec/ruby/core/enumerable/shared/collect.rb
+++ b/spec/ruby/core/enumerable/shared/collect.rb
@@ -30,7 +30,7 @@
 
   it "returns an enumerator when no block given" do
     enum = EnumerableSpecs::Numerous.new.send(@method)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.each { |i| -i }.should == [-2, -5, -3, -6, -1, -4]
   end
 
@@ -86,7 +86,7 @@ def register(a, b, c)
 
     -> do
       { 1 => 'a', 2 => 'b' }.map(&m)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "calls the each method on sub-classes" do
diff --git a/spec/ruby/core/enumerable/shared/collect_concat.rb b/spec/ruby/core/enumerable/shared/collect_concat.rb
index ddd431baeb4..1694e3fdce6 100644
--- a/spec/ruby/core/enumerable/shared/collect_concat.rb
+++ b/spec/ruby/core/enumerable/shared/collect_concat.rb
@@ -41,12 +41,12 @@
     obj = mock("to_ary defined")
     obj.should_receive(:to_ary).and_return("array")
 
-    -> { [1, obj, 3].send(@method) { |i| i } }.should raise_error(TypeError)
+    -> { [1, obj, 3].send(@method) { |i| i } }.should.raise(TypeError)
   end
 
   it "returns an enumerator when no block given" do
     enum = EnumerableSpecs::Numerous.new(1, 2).send(@method)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.each{ |i| [i] * i }.should == [1, 2, 2]
   end
 
diff --git a/spec/ruby/core/enumerable/shared/find.rb b/spec/ruby/core/enumerable/shared/find.rb
index 61d63ba3d58..cdff6404151 100644
--- a/spec/ruby/core/enumerable/shared/find.rb
+++ b/spec/ruby/core/enumerable/shared/find.rb
@@ -59,7 +59,7 @@
   end
 
   it "returns an enumerator when no block given" do
-    @numerous.send(@method).should be_an_instance_of(Enumerator)
+    @numerous.send(@method).should.instance_of?(Enumerator)
   end
 
   it "passes the ifnone proc to the enumerator" do
diff --git a/spec/ruby/core/enumerable/shared/find_all.rb b/spec/ruby/core/enumerable/shared/find_all.rb
index 1bbe71f3727..27f01de6e01 100644
--- a/spec/ruby/core/enumerable/shared/find_all.rb
+++ b/spec/ruby/core/enumerable/shared/find_all.rb
@@ -14,7 +14,7 @@
   end
 
   it "returns an enumerator when no block given" do
-    @numerous.send(@method).should be_an_instance_of(Enumerator)
+    @numerous.send(@method).should.instance_of?(Enumerator)
   end
 
   it "passes through the values yielded by #each_with_index" do
diff --git a/spec/ruby/core/enumerable/shared/include.rb b/spec/ruby/core/enumerable/shared/include.rb
index 569f350fd52..ea250f032bb 100644
--- a/spec/ruby/core/enumerable/shared/include.rb
+++ b/spec/ruby/core/enumerable/shared/include.rb
@@ -28,7 +28,7 @@ class EnumerableSpecIncludeP11; def ==(obj); obj == '11'; end; end
 
   it "gathers whole arrays as elements when each yields multiple" do
     multi = EnumerableSpecs::YieldsMulti.new
-    multi.send(@method, [1,2]).should be_true
+    multi.send(@method, [1,2]).should == true
   end
 
 end
diff --git a/spec/ruby/core/enumerable/shared/inject.rb b/spec/ruby/core/enumerable/shared/inject.rb
index 8fb7e98c2b2..7da4f0ca993 100644
--- a/spec/ruby/core/enumerable/shared/inject.rb
+++ b/spec/ruby/core/enumerable/shared/inject.rb
@@ -31,8 +31,8 @@ def name.to_str; "-"; end
   end
 
   it "raises TypeError when the second argument is not Symbol or String and it cannot be converted to String if two arguments" do
-    -> { EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
-    -> { [1, 2, 3].send(@method, 10, Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
+    -> { EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, Object.new) }.should.raise(TypeError, /is not a symbol nor a string/)
+    -> { [1, 2, 3].send(@method, 10, Object.new) }.should.raise(TypeError, /is not a symbol nor a string/)
   end
 
   it "ignores the block if two arguments" do
@@ -73,8 +73,8 @@ def name.to_str; "-"; end
   end
 
   it "raises TypeError when passed not Symbol or String method name argument and it cannot be converted to String" do
-    -> { EnumerableSpecs::Numerous.new(10, 1, 2, 3).send(@method, Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
-    -> { [10, 1, 2, 3].send(@method, Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
+    -> { EnumerableSpecs::Numerous.new(10, 1, 2, 3).send(@method, Object.new) }.should.raise(TypeError, /is not a symbol nor a string/)
+    -> { [10, 1, 2, 3].send(@method, Object.new) }.should.raise(TypeError, /is not a symbol nor a string/)
   end
 
   it "without argument takes a block with an accumulator (with first element as initial value) and the current element. Value of block becomes new accumulator" do
@@ -136,7 +136,7 @@ def name.to_str; "-"; end
   end
 
   it "raises an ArgumentError when no parameters or block is given" do
-    -> { [1,2].send(@method) }.should raise_error(ArgumentError)
-    -> { {one: 1, two: 2}.send(@method) }.should raise_error(ArgumentError)
+    -> { [1,2].send(@method) }.should.raise(ArgumentError)
+    -> { {one: 1, two: 2}.send(@method) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/enumerable/shared/take.rb b/spec/ruby/core/enumerable/shared/take.rb
index ce2ace20fa5..a6da06325ff 100644
--- a/spec/ruby/core/enumerable/shared/take.rb
+++ b/spec/ruby/core/enumerable/shared/take.rb
@@ -25,7 +25,7 @@
   end
 
   it "raises an ArgumentError when count is negative" do
-    -> { @enum.send(@method, -1) }.should raise_error(ArgumentError)
+    -> { @enum.send(@method, -1) }.should.raise(ArgumentError)
   end
 
   it "returns the entire array when count > length" do
@@ -40,11 +40,11 @@
   end
 
   it "raises a TypeError if the passed argument is not numeric" do
-    -> { @enum.send(@method, nil) }.should raise_error(TypeError)
-    -> { @enum.send(@method, "a") }.should raise_error(TypeError)
+    -> { @enum.send(@method, nil) }.should.raise(TypeError)
+    -> { @enum.send(@method, "a") }.should.raise(TypeError)
 
     obj = mock("nonnumeric")
-    -> { @enum.send(@method, obj) }.should raise_error(TypeError)
+    -> { @enum.send(@method, obj) }.should.raise(TypeError)
   end
 
   it "gathers whole arrays as elements when each yields multiple" do
diff --git a/spec/ruby/core/enumerable/slice_after_spec.rb b/spec/ruby/core/enumerable/slice_after_spec.rb
index 0e46688db14..1ef37195e5e 100644
--- a/spec/ruby/core/enumerable/slice_after_spec.rb
+++ b/spec/ruby/core/enumerable/slice_after_spec.rb
@@ -11,7 +11,7 @@
       arg = mock("filter")
       arg.should_receive(:===).and_return(false, true, false, false, false, true, false)
       e = @enum.slice_after(arg)
-      e.should be_an_instance_of(Enumerator)
+      e.should.instance_of?(Enumerator)
       e.to_a.should == [[7, 6], [5, 4, 3, 2], [1]]
     end
 
@@ -34,21 +34,21 @@
     describe "and no argument" do
       it "calls the block to determine when to yield" do
         e = @enum.slice_after{ |i| i == 6 || i == 2 }
-        e.should be_an_instance_of(Enumerator)
+        e.should.instance_of?(Enumerator)
         e.to_a.should == [[7, 6], [5, 4, 3, 2], [1]]
       end
     end
 
     describe "and an argument" do
       it "raises an ArgumentError" do
-        -> { @enum.slice_after(42) { |i| i == 6 } }.should raise_error(ArgumentError)
+        -> { @enum.slice_after(42) { |i| i == 6 } }.should.raise(ArgumentError)
       end
     end
   end
 
   it "raises an ArgumentError when given an incorrect number of arguments" do
-    -> { @enum.slice_after("one", "two") }.should raise_error(ArgumentError)
-    -> { @enum.slice_after }.should raise_error(ArgumentError)
+    -> { @enum.slice_after("one", "two") }.should.raise(ArgumentError)
+    -> { @enum.slice_after }.should.raise(ArgumentError)
   end
 end
 
diff --git a/spec/ruby/core/enumerable/slice_before_spec.rb b/spec/ruby/core/enumerable/slice_before_spec.rb
index f9b33f7b280..7eb4410a256 100644
--- a/spec/ruby/core/enumerable/slice_before_spec.rb
+++ b/spec/ruby/core/enumerable/slice_before_spec.rb
@@ -12,7 +12,7 @@
       arg = mock "filter"
       arg.should_receive(:===).and_return(false, true, false, false, false, true, false)
       e = @enum.slice_before(arg)
-      e.should be_an_instance_of(Enumerator)
+      e.should.instance_of?(Enumerator)
       e.to_a.should == [[7], [6, 5, 4, 3], [2, 1]]
     end
 
@@ -35,7 +35,7 @@
     describe "and no argument" do
       it "calls the block to determine when to yield" do
         e = @enum.slice_before{|i| i == 6 || i == 2}
-        e.should be_an_instance_of(Enumerator)
+        e.should.instance_of?(Enumerator)
         e.to_a.should == [[7], [6, 5, 4, 3], [2, 1]]
       end
     end
@@ -43,13 +43,13 @@
     it "does not accept arguments" do
       -> {
         @enum.slice_before(1) {}
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
   it "raises an ArgumentError when given an incorrect number of arguments" do
-    -> { @enum.slice_before("one", "two") }.should raise_error(ArgumentError)
-    -> { @enum.slice_before }.should raise_error(ArgumentError)
+    -> { @enum.slice_before("one", "two") }.should.raise(ArgumentError)
+    -> { @enum.slice_before }.should.raise(ArgumentError)
   end
 
   describe "when an iterator method yields more than one value" do
diff --git a/spec/ruby/core/enumerable/slice_when_spec.rb b/spec/ruby/core/enumerable/slice_when_spec.rb
index 6b8ea0923e4..fe1ecd31e24 100644
--- a/spec/ruby/core/enumerable/slice_when_spec.rb
+++ b/spec/ruby/core/enumerable/slice_when_spec.rb
@@ -11,7 +11,7 @@
 
   context "when given a block" do
     it "returns an enumerator" do
-      @result.should be_an_instance_of(Enumerator)
+      @result.should.instance_of?(Enumerator)
     end
 
     it "splits chunks between adjacent elements i and j where the block returns true" do
@@ -39,7 +39,7 @@
 
   context "when not given a block" do
     it "raises an ArgumentError" do
-      -> { @enum.slice_when }.should raise_error(ArgumentError)
+      -> { @enum.slice_when }.should.raise(ArgumentError)
     end
   end
 
diff --git a/spec/ruby/core/enumerable/sort_by_spec.rb b/spec/ruby/core/enumerable/sort_by_spec.rb
index 8fdd923fb44..62cf38ce3ef 100644
--- a/spec/ruby/core/enumerable/sort_by_spec.rb
+++ b/spec/ruby/core/enumerable/sort_by_spec.rb
@@ -18,7 +18,7 @@
 
   it "returns an Enumerator when a block is not supplied" do
     a = EnumerableSpecs::Numerous.new("a","b")
-    a.sort_by.should be_an_instance_of(Enumerator)
+    a.sort_by.should.instance_of?(Enumerator)
     a.to_a.should == ["a", "b"]
   end
 
diff --git a/spec/ruby/core/enumerable/sort_spec.rb b/spec/ruby/core/enumerable/sort_spec.rb
index 6fc64f325e4..427b1cd8f12 100644
--- a/spec/ruby/core/enumerable/sort_spec.rb
+++ b/spec/ruby/core/enumerable/sort_spec.rb
@@ -16,7 +16,7 @@
   it "raises a NoMethodError if elements do not define <=>" do
     -> do
       EnumerableSpecs::Numerous.new(BasicObject.new, BasicObject.new, BasicObject.new).sort
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 
   it "sorts enumerables that contain nils" do
@@ -35,12 +35,12 @@
     }.should == [6, 5, 4, 3, 2, 1]
     -> {
       EnumerableSpecs::Numerous.new.sort { |n, m| (n <=> m).to_s }
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error if objects can't be compared" do
     a=EnumerableSpecs::Numerous.new(EnumerableSpecs::Uncomparable.new, EnumerableSpecs::Uncomparable.new)
-    -> {a.sort}.should raise_error(ArgumentError)
+    -> {a.sort}.should.raise(ArgumentError)
   end
 
   it "gathers whole arrays as elements when each yields multiple" do
diff --git a/spec/ruby/core/enumerable/take_spec.rb b/spec/ruby/core/enumerable/take_spec.rb
index 41a7438330f..8cc746f88d9 100644
--- a/spec/ruby/core/enumerable/take_spec.rb
+++ b/spec/ruby/core/enumerable/take_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Enumerable#take" do
   it "requires an argument" do
-    ->{ EnumerableSpecs::Numerous.new.take}.should raise_error(ArgumentError)
+    ->{ EnumerableSpecs::Numerous.new.take}.should.raise(ArgumentError)
   end
 
   describe "when passed an argument" do
diff --git a/spec/ruby/core/enumerable/take_while_spec.rb b/spec/ruby/core/enumerable/take_while_spec.rb
index 26db39ac4bf..918bfc897d3 100644
--- a/spec/ruby/core/enumerable/take_while_spec.rb
+++ b/spec/ruby/core/enumerable/take_while_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns an Enumerator if no block given" do
-    @enum.take_while.should be_an_instance_of(Enumerator)
+    @enum.take_while.should.instance_of?(Enumerator)
   end
 
   it "returns no/all elements for {true/false} block" do
@@ -38,7 +38,7 @@
 
   it "doesn't return self when it could" do
     a = [1,2,3]
-    a.take_while{true}.should_not equal(a)
+    a.take_while{true}.should_not.equal?(a)
   end
 
   it "calls the block with initial args when yielded with multiple arguments" do
diff --git a/spec/ruby/core/enumerable/tally_spec.rb b/spec/ruby/core/enumerable/tally_spec.rb
index 95c64c12949..deef7414071 100644
--- a/spec/ruby/core/enumerable/tally_spec.rb
+++ b/spec/ruby/core/enumerable/tally_spec.rb
@@ -13,8 +13,8 @@
 
   it "returns a hash without default" do
     hash = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz').tally
-    hash.default_proc.should be_nil
-    hash.default.should be_nil
+    hash.default_proc.should == nil
+    hash.default.should == nil
   end
 
   it "returns an empty hash for empty enumerables" do
@@ -45,7 +45,7 @@
   it "returns the given hash" do
     enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
     hash = { 'foo' => 1 }
-    enum.tally(hash).should equal(hash)
+    enum.tally(hash).should.equal?(hash)
   end
 
   it "calls #to_hash to convert argument to Hash implicitly if passed not a Hash" do
@@ -58,14 +58,14 @@ def object.to_hash; { 'foo' => 1 }; end
   it "raises a FrozenError and does not update the given hash when the hash is frozen" do
     enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
     hash = { 'foo' => 1 }.freeze
-    -> { enum.tally(hash) }.should raise_error(FrozenError)
+    -> { enum.tally(hash) }.should.raise(FrozenError)
     hash.should == { 'foo' => 1 }
   end
 
   it "raises a FrozenError even if enumerable is empty" do
     enum = EnumerableSpecs::Numerous.new()
     hash = { 'foo' => 1 }.freeze
-    -> { enum.tally(hash) }.should raise_error(FrozenError)
+    -> { enum.tally(hash) }.should.raise(FrozenError)
   end
 
   it "does not call given block" do
@@ -86,6 +86,6 @@ def object.to_hash; { 'foo' => 1 }; end
 
   it "needs the values counting each elements to be an integer" do
     enum = EnumerableSpecs::Numerous.new('foo')
-    -> { enum.tally({ 'foo' => 'bar' }) }.should raise_error(TypeError)
+    -> { enum.tally({ 'foo' => 'bar' }) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/enumerable/to_h_spec.rb b/spec/ruby/core/enumerable/to_h_spec.rb
index 11a4933c10c..38847eccfb9 100644
--- a/spec/ruby/core/enumerable/to_h_spec.rb
+++ b/spec/ruby/core/enumerable/to_h_spec.rb
@@ -36,12 +36,12 @@ def enum.each(*args)
 
   it "raises TypeError if an element is not an array" do
     enum = EnumerableSpecs::EachDefiner.new(:x)
-    -> { enum.to_h }.should raise_error(TypeError)
+    -> { enum.to_h }.should.raise(TypeError)
   end
 
   it "raises ArgumentError if an element is not a [key, value] pair" do
     enum = EnumerableSpecs::EachDefiner.new([:x])
-    -> { enum.to_h }.should raise_error(ArgumentError)
+    -> { enum.to_h }.should.raise(ArgumentError)
   end
 
   context "with block" do
@@ -64,17 +64,17 @@ def enum.each(*args)
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         @enum.to_h { |k| [k, k.to_s, 1] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
 
       -> do
         @enum.to_h { |k| [k] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
     end
 
     it "raises TypeError if block returns something other than Array" do
       -> do
         @enum.to_h { |k| "not-array" }
-      end.should raise_error(TypeError, /wrong element type String/)
+      end.should.raise(TypeError, /wrong element type String/)
     end
 
     it "coerces returned pair to Array with #to_ary" do
@@ -90,7 +90,7 @@ def enum.each(*args)
 
       -> do
         @enum.to_h { |k| x }
-      end.should raise_error(TypeError, /wrong element type MockObject/)
+      end.should.raise(TypeError, /wrong element type MockObject/)
     end
   end
 end
diff --git a/spec/ruby/core/enumerable/to_set_spec.rb b/spec/ruby/core/enumerable/to_set_spec.rb
index c02ead11fa4..7b04c72bce6 100644
--- a/spec/ruby/core/enumerable/to_set_spec.rb
+++ b/spec/ruby/core/enumerable/to_set_spec.rb
@@ -15,7 +15,7 @@
     it "instantiates an object of provided as the first argument set class" do
       set = nil
       proc{set = [1, 2, 3].to_set(EnumerableSpecs::SetSubclass)}.should complain(/Enumerable#to_set/)
-      set.should be_kind_of(EnumerableSpecs::SetSubclass)
+      set.should.is_a?(EnumerableSpecs::SetSubclass)
       set.to_a.sort.should == [1, 2, 3]
     end
   end
@@ -23,7 +23,7 @@
   ruby_version_is ""..."4.0" do
     it "instantiates an object of provided as the first argument set class" do
       set = [1, 2, 3].to_set(EnumerableSpecs::SetSubclass)
-      set.should be_kind_of(EnumerableSpecs::SetSubclass)
+      set.should.is_a?(EnumerableSpecs::SetSubclass)
       set.to_a.sort.should == [1, 2, 3]
     end
   end
diff --git a/spec/ruby/core/enumerable/zip_spec.rb b/spec/ruby/core/enumerable/zip_spec.rb
index ab148f2a6e0..c5f9a3e4d4c 100644
--- a/spec/ruby/core/enumerable/zip_spec.rb
+++ b/spec/ruby/core/enumerable/zip_spec.rb
@@ -39,8 +39,8 @@
   end
 
   it "raises TypeError when some argument isn't Array and doesn't respond to #to_ary and #to_enum" do
-    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(Object.new) }.should raise_error(TypeError, "wrong argument type Object (must respond to :each)")
-    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(1) }.should raise_error(TypeError, "wrong argument type Integer (must respond to :each)")
-    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(true) }.should raise_error(TypeError, "wrong argument type TrueClass (must respond to :each)")
+    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(Object.new) }.should.raise(TypeError, "wrong argument type Object (must respond to :each)")
+    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(1) }.should.raise(TypeError, "wrong argument type Integer (must respond to :each)")
+    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(true) }.should.raise(TypeError, "wrong argument type TrueClass (must respond to :each)")
   end
 end
diff --git a/spec/ruby/core/enumerator/arithmetic_sequence/each_spec.rb b/spec/ruby/core/enumerator/arithmetic_sequence/each_spec.rb
index d4fff3e01f0..0a83019d49b 100644
--- a/spec/ruby/core/enumerator/arithmetic_sequence/each_spec.rb
+++ b/spec/ruby/core/enumerator/arithmetic_sequence/each_spec.rb
@@ -12,6 +12,6 @@
   end
 
   it "returns self" do
-    @seq.each { |item| }.should equal(@seq)
+    @seq.each { |item| }.should.equal?(@seq)
   end
 end
diff --git a/spec/ruby/core/enumerator/arithmetic_sequence/hash_spec.rb b/spec/ruby/core/enumerator/arithmetic_sequence/hash_spec.rb
index bdb308074b5..a18c554fb39 100644
--- a/spec/ruby/core/enumerator/arithmetic_sequence/hash_spec.rb
+++ b/spec/ruby/core/enumerator/arithmetic_sequence/hash_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Enumerator::ArithmeticSequence#hash" do
   it "is based on begin, end, step and exclude_end?" do
-    1.step(10).hash.should be_an_instance_of(Integer)
+    1.step(10).hash.should.instance_of?(Integer)
 
     1.step(10).hash.should == 1.step(10).hash
     1.step(10, 5).hash.should == 1.step(10, 5).hash
diff --git a/spec/ruby/core/enumerator/arithmetic_sequence/new_spec.rb b/spec/ruby/core/enumerator/arithmetic_sequence/new_spec.rb
index 20159838261..1bd2f7f0f70 100644
--- a/spec/ruby/core/enumerator/arithmetic_sequence/new_spec.rb
+++ b/spec/ruby/core/enumerator/arithmetic_sequence/new_spec.rb
@@ -4,7 +4,7 @@
   it "is not defined" do
     -> {
       Enumerator::ArithmeticSequence.new
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 end
 
@@ -12,6 +12,6 @@
   it "is not defined" do
     -> {
       Enumerator::ArithmeticSequence.allocate
-    }.should raise_error(TypeError, 'allocator undefined for Enumerator::ArithmeticSequence')
+    }.should.raise(TypeError, 'allocator undefined for Enumerator::ArithmeticSequence')
   end
 end
diff --git a/spec/ruby/core/enumerator/chain/initialize_spec.rb b/spec/ruby/core/enumerator/chain/initialize_spec.rb
index daa30351d78..1df1dec5f82 100644
--- a/spec/ruby/core/enumerator/chain/initialize_spec.rb
+++ b/spec/ruby/core/enumerator/chain/initialize_spec.rb
@@ -6,26 +6,26 @@
   end
 
   it "is a private method" do
-    Enumerator::Chain.should have_private_instance_method(:initialize, false)
+    Enumerator::Chain.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "returns self" do
-    @uninitialized.send(:initialize).should equal(@uninitialized)
+    @uninitialized.send(:initialize).should.equal?(@uninitialized)
   end
 
   it "accepts many arguments" do
-    @uninitialized.send(:initialize, 0..1, 2..3, 4..5).should equal(@uninitialized)
+    @uninitialized.send(:initialize, 0..1, 2..3, 4..5).should.equal?(@uninitialized)
   end
 
   it "accepts arguments that are not Enumerable nor responding to :each" do
-    @uninitialized.send(:initialize, Object.new).should equal(@uninitialized)
+    @uninitialized.send(:initialize, Object.new).should.equal?(@uninitialized)
   end
 
   describe "on frozen instance" do
     it "raises a FrozenError" do
       -> {
         @uninitialized.freeze.send(:initialize)
-      }.should raise_error(FrozenError)
+      }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/enumerator/chain/rewind_spec.rb b/spec/ruby/core/enumerator/chain/rewind_spec.rb
index 5f51ce2cf17..4525b82f7b3 100644
--- a/spec/ruby/core/enumerator/chain/rewind_spec.rb
+++ b/spec/ruby/core/enumerator/chain/rewind_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "returns self" do
-    @enum.rewind.should equal @enum
+    @enum.rewind.should.equal? @enum
   end
 
   it "does nothing if receiver has not been iterated" do
@@ -35,7 +35,7 @@
     @obj.should_not_receive(:rewind)
     @second.should_receive(:rewind).and_raise(RuntimeError)
     @enum.each {}
-    -> { @enum.rewind }.should raise_error(RuntimeError)
+    -> { @enum.rewind }.should.raise(RuntimeError)
   end
 
   it "calls rewind only for objects that have actually been iterated on" do
@@ -45,7 +45,7 @@
 
     @obj.should_receive(:rewind)
     @second.should_not_receive(:rewind)
-    -> { @enum.each {} }.should raise_error(RuntimeError)
+    -> { @enum.each {} }.should.raise(RuntimeError)
     @enum.rewind
   end
 end
diff --git a/spec/ruby/core/enumerator/each_spec.rb b/spec/ruby/core/enumerator/each_spec.rb
index 8c9785cc85f..03be53fe055 100644
--- a/spec/ruby/core/enumerator/each_spec.rb
+++ b/spec/ruby/core/enumerator/each_spec.rb
@@ -51,17 +51,17 @@ def object_each_with_arguments.each_with_arguments(arg, *args)
     enum = Object.new.to_enum
     -> do
       enum.each { |e| e }
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 
   it "returns self if not given arguments and not given a block" do
-    @enum_with_arguments.each.should equal(@enum_with_arguments)
+    @enum_with_arguments.each.should.equal?(@enum_with_arguments)
 
-    @enum_with_yielder.each.should equal(@enum_with_yielder)
+    @enum_with_yielder.each.should.equal?(@enum_with_yielder)
   end
 
   it "returns the same value from receiver.each if block is given" do
-    @enum_with_arguments.each {}.should equal(:method_returned)
+    @enum_with_arguments.each {}.should.equal?(:method_returned)
   end
 
   it "passes given arguments at initialized to receiver.each" do
@@ -78,13 +78,13 @@ def object_each_with_arguments.each_with_arguments(arg, *args)
   end
 
   it "returns the same value from receiver.each if block and arguments are given" do
-    @enum_with_arguments.each(:each1, :each2) {}.should equal(:method_returned)
+    @enum_with_arguments.each(:each1, :each2) {}.should.equal?(:method_returned)
   end
 
   it "returns new Enumerator if given arguments but not given a block" do
     ret = @enum_with_arguments.each 1
-    ret.should be_an_instance_of(Enumerator)
-    ret.should_not equal(@enum_with_arguments)
+    ret.should.instance_of?(Enumerator)
+    ret.should_not.equal?(@enum_with_arguments)
   end
 
   it "does not destructure yielded array values when chaining each.map" do
diff --git a/spec/ruby/core/enumerator/each_with_index_spec.rb b/spec/ruby/core/enumerator/each_with_index_spec.rb
index 4898e86fa9c..0630b7045ec 100644
--- a/spec/ruby/core/enumerator/each_with_index_spec.rb
+++ b/spec/ruby/core/enumerator/each_with_index_spec.rb
@@ -9,14 +9,14 @@
   it "returns a new Enumerator when no block is given" do
     enum1 = [1,2,3].select
     enum2 = enum1.each_with_index
-    enum2.should be_an_instance_of(Enumerator)
+    enum2.should.instance_of?(Enumerator)
     enum1.should_not == enum2
   end
 
   it "raises an ArgumentError if passed extra arguments" do
     -> do
       [1].to_enum.each_with_index(:glark)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "passes on the given block's return value" do
diff --git a/spec/ruby/core/enumerator/feed_spec.rb b/spec/ruby/core/enumerator/feed_spec.rb
index e387c6cd394..781947a8c75 100644
--- a/spec/ruby/core/enumerator/feed_spec.rb
+++ b/spec/ruby/core/enumerator/feed_spec.rb
@@ -33,20 +33,20 @@
   end
 
   it "returns nil" do
-    @enum.feed(:a).should be_nil
+    @enum.feed(:a).should == nil
   end
 
   it "raises a TypeError if called more than once without advancing the enumerator" do
     @enum.feed :a
     @enum.next
-    -> { @enum.feed :b }.should raise_error(TypeError)
+    -> { @enum.feed :b }.should.raise(TypeError)
   end
 
   it "sets the return value of Yielder#yield" do
     enum = Enumerator.new { |y| ScratchPad << y.yield }
     enum.next
     enum.feed :a
-    -> { enum.next }.should raise_error(StopIteration)
+    -> { enum.next }.should.raise(StopIteration)
     ScratchPad.recorded.should == [:a]
   end
 end
diff --git a/spec/ruby/core/enumerator/generator/each_spec.rb b/spec/ruby/core/enumerator/generator/each_spec.rb
index a43805dd16f..41a494298b8 100644
--- a/spec/ruby/core/enumerator/generator/each_spec.rb
+++ b/spec/ruby/core/enumerator/generator/each_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "is an enumerable" do
-    @generator.should be_kind_of(Enumerable)
+    @generator.should.is_a?(Enumerable)
   end
 
   it "supports enumeration with a block" do
@@ -21,11 +21,11 @@
   end
 
   it "raises a LocalJumpError if no block given" do
-    -> { @generator.each }.should raise_error(LocalJumpError)
+    -> { @generator.each }.should.raise(LocalJumpError)
   end
 
   it "returns the block returned value" do
-    @generator.each {}.should equal(:block_returned)
+    @generator.each {}.should.equal?(:block_returned)
   end
 
   it "requires multiple arguments" do
diff --git a/spec/ruby/core/enumerator/generator/initialize_spec.rb b/spec/ruby/core/enumerator/generator/initialize_spec.rb
index acc11742533..0f77d591d90 100644
--- a/spec/ruby/core/enumerator/generator/initialize_spec.rb
+++ b/spec/ruby/core/enumerator/generator/initialize_spec.rb
@@ -9,18 +9,18 @@
   end
 
   it "is a private method" do
-    @class.should have_private_instance_method(:initialize, false)
+    @class.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "returns self when given a block" do
-    @uninitialized.send(:initialize) {}.should equal(@uninitialized)
+    @uninitialized.send(:initialize) {}.should.equal?(@uninitialized)
   end
 
   describe "on frozen instance" do
     it "raises a FrozenError" do
       -> {
         @uninitialized.freeze.send(:initialize) {}
-      }.should raise_error(FrozenError)
+      }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/enumerator/initialize_spec.rb b/spec/ruby/core/enumerator/initialize_spec.rb
index 5e0256ca468..9929494b5a8 100644
--- a/spec/ruby/core/enumerator/initialize_spec.rb
+++ b/spec/ruby/core/enumerator/initialize_spec.rb
@@ -8,11 +8,11 @@
   end
 
   it "is a private method" do
-    Enumerator.should have_private_instance_method(:initialize, false)
+    Enumerator.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "returns self when given a block" do
-    @uninitialized.send(:initialize) {}.should equal(@uninitialized)
+    @uninitialized.send(:initialize) {}.should.equal?(@uninitialized)
   end
 
   # Maybe spec should be broken up?
@@ -21,22 +21,22 @@
       r = yielder.yield 3
       yielder << r << 2 << 1
     end
-    @uninitialized.should be_an_instance_of(Enumerator)
+    @uninitialized.should.instance_of?(Enumerator)
     r = []
     @uninitialized.each{|x| r << x; x * 2}
     r.should == [3, 6, 2, 1]
   end
 
   it "sets size to nil if size is not given" do
-    @uninitialized.send(:initialize) {}.size.should be_nil
+    @uninitialized.send(:initialize) {}.size.should == nil
   end
 
   it "sets size to nil if the given size is nil" do
-    @uninitialized.send(:initialize, nil) {}.size.should be_nil
+    @uninitialized.send(:initialize, nil) {}.size.should == nil
   end
 
   it "sets size to the given size if the given size is Float::INFINITY" do
-    @uninitialized.send(:initialize, Float::INFINITY) {}.size.should equal(Float::INFINITY)
+    @uninitialized.send(:initialize, Float::INFINITY) {}.size.should.equal?(Float::INFINITY)
   end
 
   it "sets size to the given size if the given size is an Integer" do
@@ -51,7 +51,7 @@
     it "raises a FrozenError" do
       -> {
         @uninitialized.freeze.send(:initialize) {}
-      }.should raise_error(FrozenError)
+      }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/enumerator/lazy/chunk_spec.rb b/spec/ruby/core/enumerator/lazy/chunk_spec.rb
index 87d2b0c206b..d0179d32b60 100644
--- a/spec/ruby/core/enumerator/lazy/chunk_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/chunk_spec.rb
@@ -17,8 +17,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.chunk {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets #size to nil" do
@@ -27,7 +27,7 @@
 
   it "returns an Enumerator if called without a block" do
     chunk = @yieldsmixed.chunk
-    chunk.should be_an_instance_of(Enumerator::Lazy)
+    chunk.should.instance_of?(Enumerator::Lazy)
 
     res = chunk.each { |v| true }.force
     res.should == [[true, EnumeratorLazySpecs::YieldsMixed.gathered_yields]]
diff --git a/spec/ruby/core/enumerator/lazy/chunk_while_spec.rb b/spec/ruby/core/enumerator/lazy/chunk_while_spec.rb
index 772bd42de91..edba8e1363a 100644
--- a/spec/ruby/core/enumerator/lazy/chunk_while_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/chunk_while_spec.rb
@@ -9,6 +9,6 @@
 
   it "should return a lazy enumerator" do
     s = 0..Float::INFINITY
-    s.lazy.chunk_while { |a, b| false }.should be_kind_of(Enumerator::Lazy)
+    s.lazy.chunk_while { |a, b| false }.should.is_a?(Enumerator::Lazy)
   end
 end
diff --git a/spec/ruby/core/enumerator/lazy/compact_spec.rb b/spec/ruby/core/enumerator/lazy/compact_spec.rb
index 65c544f0629..7305e1c9c4b 100644
--- a/spec/ruby/core/enumerator/lazy/compact_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/compact_spec.rb
@@ -4,7 +4,7 @@
 describe "Enumerator::Lazy#compact" do
   it 'returns array without nil elements' do
     arr = [1, nil, 3, false, 5].to_enum.lazy.compact
-    arr.should be_an_instance_of(Enumerator::Lazy)
+    arr.should.instance_of?(Enumerator::Lazy)
     arr.force.should == [1, 3, false, 5]
   end
 
diff --git a/spec/ruby/core/enumerator/lazy/drop_spec.rb b/spec/ruby/core/enumerator/lazy/drop_spec.rb
index 822b8034fb8..95ac7e9ecce 100644
--- a/spec/ruby/core/enumerator/lazy/drop_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/drop_spec.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.drop(1)
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets difference of given count with old size to new size" do
diff --git a/spec/ruby/core/enumerator/lazy/drop_while_spec.rb b/spec/ruby/core/enumerator/lazy/drop_while_spec.rb
index 4f6e366f880..65f3007dec2 100644
--- a/spec/ruby/core/enumerator/lazy/drop_while_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/drop_while_spec.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.drop_while {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets #size to nil" do
@@ -40,7 +40,7 @@
   end
 
   it "raises an ArgumentError when not given a block" do
-    -> { @yieldsmixed.drop_while }.should raise_error(ArgumentError)
+    -> { @yieldsmixed.drop_while }.should.raise(ArgumentError)
   end
 
   describe "on a nested Lazy" do
diff --git a/spec/ruby/core/enumerator/lazy/grep_spec.rb b/spec/ruby/core/enumerator/lazy/grep_spec.rb
index e67686c9a3f..383f80a918c 100644
--- a/spec/ruby/core/enumerator/lazy/grep_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/grep_spec.rb
@@ -20,12 +20,12 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.grep(Object) {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
 
     ret = @yieldsmixed.grep(Object)
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets #size to nil" do
diff --git a/spec/ruby/core/enumerator/lazy/grep_v_spec.rb b/spec/ruby/core/enumerator/lazy/grep_v_spec.rb
index 67173021bb4..19c917f2543 100644
--- a/spec/ruby/core/enumerator/lazy/grep_v_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/grep_v_spec.rb
@@ -18,12 +18,12 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.grep_v(Object) {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
 
     ret = @yieldsmixed.grep_v(Object)
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets #size to nil" do
diff --git a/spec/ruby/core/enumerator/lazy/initialize_spec.rb b/spec/ruby/core/enumerator/lazy/initialize_spec.rb
index e1e0b1d6083..47765d32c38 100644
--- a/spec/ruby/core/enumerator/lazy/initialize_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/initialize_spec.rb
@@ -16,11 +16,11 @@ def receiver.each
   end
 
   it "is a private method" do
-    Enumerator::Lazy.should have_private_instance_method(:initialize, false)
+    Enumerator::Lazy.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "returns self" do
-    @uninitialized.send(:initialize, @receiver) {}.should equal(@uninitialized)
+    @uninitialized.send(:initialize, @receiver) {}.should.equal?(@uninitialized)
   end
 
   describe "when the returned lazy enumerator is evaluated by Enumerable#first" do
@@ -32,15 +32,15 @@ def receiver.each
   end
 
   it "sets #size to nil if not given a size" do
-    @uninitialized.send(:initialize, @receiver) {}.size.should be_nil
+    @uninitialized.send(:initialize, @receiver) {}.size.should == nil
   end
 
   it "sets #size to nil if given size is nil" do
-    @uninitialized.send(:initialize, @receiver, nil) {}.size.should be_nil
+    @uninitialized.send(:initialize, @receiver, nil) {}.size.should == nil
   end
 
   it "sets given size to own size if the given size is Float::INFINITY" do
-    @uninitialized.send(:initialize, @receiver, Float::INFINITY) {}.size.should equal(Float::INFINITY)
+    @uninitialized.send(:initialize, @receiver, Float::INFINITY) {}.size.should.equal?(Float::INFINITY)
   end
 
   it "sets given size to own size if the given size is an Integer" do
@@ -52,12 +52,12 @@ def receiver.each
   end
 
   it "raises an ArgumentError when block is not given" do
-    -> {  @uninitialized.send :initialize, @receiver }.should raise_error(ArgumentError)
+    -> {  @uninitialized.send :initialize, @receiver }.should.raise(ArgumentError)
   end
 
   describe "on frozen instance" do
     it "raises a FrozenError" do
-      -> {  @uninitialized.freeze.send(:initialize, @receiver) {} }.should raise_error(FrozenError)
+      -> {  @uninitialized.freeze.send(:initialize, @receiver) {} }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/enumerator/lazy/lazy_spec.rb b/spec/ruby/core/enumerator/lazy/lazy_spec.rb
index b43864b6739..12107383d68 100644
--- a/spec/ruby/core/enumerator/lazy/lazy_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/lazy_spec.rb
@@ -4,24 +4,24 @@
 
 describe "Enumerator::Lazy" do
   it "is a subclass of Enumerator" do
-    Enumerator::Lazy.superclass.should equal(Enumerator)
+    Enumerator::Lazy.superclass.should.equal?(Enumerator)
   end
 
   it "defines lazy versions of a whitelist of Enumerator methods" do
-    lazy_methods = [
+    lazy_methods = Set[
       :chunk, :chunk_while, :collect, :collect_concat, :compact, :drop, :drop_while, :enum_for,
       :find_all, :flat_map, :force, :grep, :grep_v, :lazy, :map, :reject,
       :select, :slice_after, :slice_before, :slice_when, :take, :take_while,
       :to_enum, :uniq, :zip
     ]
 
-    Enumerator::Lazy.instance_methods(false).should include(*lazy_methods)
+    Enumerator::Lazy.instance_methods(false).to_set.should >= lazy_methods
   end
 end
 
 describe "Enumerator::Lazy#lazy" do
   it "returns self" do
     lazy = (1..3).to_enum.lazy
-    lazy.lazy.should equal(lazy)
+    lazy.lazy.should.equal?(lazy)
   end
 end
diff --git a/spec/ruby/core/enumerator/lazy/reject_spec.rb b/spec/ruby/core/enumerator/lazy/reject_spec.rb
index 0e1632d667a..374d4df14ed 100644
--- a/spec/ruby/core/enumerator/lazy/reject_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/reject_spec.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.reject {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets #size to nil" do
@@ -42,7 +42,7 @@
 
     -> {
       lazy.first
-    }.should raise_error(RuntimeError, "foo")
+    }.should.raise(RuntimeError, "foo")
   end
 
   it "calls the block with a gathered array when yield with multiple arguments" do
@@ -52,7 +52,7 @@
   end
 
   it "raises an ArgumentError when not given a block" do
-    -> { @yieldsmixed.reject }.should raise_error(ArgumentError)
+    -> { @yieldsmixed.reject }.should.raise(ArgumentError)
   end
 
   describe "on a nested Lazy" do
diff --git a/spec/ruby/core/enumerator/lazy/shared/collect.rb b/spec/ruby/core/enumerator/lazy/shared/collect.rb
index 5690255a0cf..0ed04c8e02d 100644
--- a/spec/ruby/core/enumerator/lazy/shared/collect.rb
+++ b/spec/ruby/core/enumerator/lazy/shared/collect.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.send(@method) {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "keeps size" do
diff --git a/spec/ruby/core/enumerator/lazy/shared/collect_concat.rb b/spec/ruby/core/enumerator/lazy/shared/collect_concat.rb
index 00d7941a61e..685e6d05948 100644
--- a/spec/ruby/core/enumerator/lazy/shared/collect_concat.rb
+++ b/spec/ruby/core/enumerator/lazy/shared/collect_concat.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.send(@method) {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets #size to nil" do
@@ -34,7 +34,7 @@
 
     it "flattens elements when the given block returned an array or responding to .each and .force" do
       (0..Float::INFINITY).lazy.send(@method) { |n| (n * 10).to_s.chars }.first(6).should == %w[0 1 0 2 0 3]
-      (0..Float::INFINITY).lazy.send(@method) { |n| (n * 10).to_s.each_char }.first(6).all? { |o| o.instance_of? Enumerator }.should be_true
+      (0..Float::INFINITY).lazy.send(@method) { |n| (n * 10).to_s.each_char }.first(6).all? { |o| o.instance_of? Enumerator }.should == true
       (0..Float::INFINITY).lazy.send(@method) { |n| (n * 10).to_s.each_char.lazy }.first(6).should == %w[0 1 0 2 0 3]
     end
   end
@@ -46,7 +46,7 @@
   end
 
   it "raises an ArgumentError when not given a block" do
-    -> { @yieldsmixed.send(@method) }.should raise_error(ArgumentError)
+    -> { @yieldsmixed.send(@method) }.should.raise(ArgumentError)
   end
 
   describe "on a nested Lazy" do
@@ -64,7 +64,7 @@
 
       it "flattens elements when the given block returned an array or responding to .each and .force" do
         (0..Float::INFINITY).lazy.map {|n| n * 10 }.send(@method) { |n| n.to_s.chars }.first(6).should == %w[0 1 0 2 0 3]
-        (0..Float::INFINITY).lazy.map {|n| n * 10 }.send(@method) { |n| n.to_s.each_char }.first(6).all? { |o| o.instance_of? Enumerator }.should be_true
+        (0..Float::INFINITY).lazy.map {|n| n * 10 }.send(@method) { |n| n.to_s.each_char }.first(6).all? { |o| o.instance_of? Enumerator }.should == true
         (0..Float::INFINITY).lazy.map {|n| n * 10 }.send(@method) { |n| n.to_s.each_char.lazy }.first(6).should == %w[0 1 0 2 0 3]
       end
     end
diff --git a/spec/ruby/core/enumerator/lazy/shared/select.rb b/spec/ruby/core/enumerator/lazy/shared/select.rb
index 50a00bcbf45..2d151766201 100644
--- a/spec/ruby/core/enumerator/lazy/shared/select.rb
+++ b/spec/ruby/core/enumerator/lazy/shared/select.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.send(@method) {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets #size to nil" do
@@ -40,7 +40,7 @@
   end
 
   it "raises an ArgumentError when not given a block" do
-    -> { @yieldsmixed.send(@method) }.should raise_error(ArgumentError)
+    -> { @yieldsmixed.send(@method) }.should.raise(ArgumentError)
   end
 
   describe "on a nested Lazy" do
diff --git a/spec/ruby/core/enumerator/lazy/shared/to_enum.rb b/spec/ruby/core/enumerator/lazy/shared/to_enum.rb
index 0c91ea55b95..75b9aefe8c1 100644
--- a/spec/ruby/core/enumerator/lazy/shared/to_enum.rb
+++ b/spec/ruby/core/enumerator/lazy/shared/to_enum.rb
@@ -13,8 +13,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @infinite.send @method
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@infinite)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@infinite)
   end
 
   it "sets #size to nil when not given a block" do
@@ -43,7 +43,7 @@
       each_entry: [],
       each_cons: [2]
     }.each_pair do |method, args|
-      @infinite.send(method, *args).should be_an_instance_of(Enumerator::Lazy)
+      @infinite.send(method, *args).should.instance_of?(Enumerator::Lazy)
     end
   end
 
diff --git a/spec/ruby/core/enumerator/lazy/slice_after_spec.rb b/spec/ruby/core/enumerator/lazy/slice_after_spec.rb
index 8b08a1ecfd7..f8cd97178f6 100644
--- a/spec/ruby/core/enumerator/lazy/slice_after_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/slice_after_spec.rb
@@ -9,6 +9,6 @@
 
   it "should return a lazy enumerator" do
     s = 0..Float::INFINITY
-    s.lazy.slice_after { |n| true }.should be_kind_of(Enumerator::Lazy)
+    s.lazy.slice_after { |n| true }.should.is_a?(Enumerator::Lazy)
   end
 end
diff --git a/spec/ruby/core/enumerator/lazy/slice_before_spec.rb b/spec/ruby/core/enumerator/lazy/slice_before_spec.rb
index 9c1ec9ba4ab..192e853343d 100644
--- a/spec/ruby/core/enumerator/lazy/slice_before_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/slice_before_spec.rb
@@ -9,6 +9,6 @@
 
   it "should return a lazy enumerator" do
     s = 0..Float::INFINITY
-    s.lazy.slice_before { |n| true }.should be_kind_of(Enumerator::Lazy)
+    s.lazy.slice_before { |n| true }.should.is_a?(Enumerator::Lazy)
   end
 end
diff --git a/spec/ruby/core/enumerator/lazy/slice_when_spec.rb b/spec/ruby/core/enumerator/lazy/slice_when_spec.rb
index f83403425db..fc9d5f50696 100644
--- a/spec/ruby/core/enumerator/lazy/slice_when_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/slice_when_spec.rb
@@ -9,6 +9,6 @@
 
   it "should return a lazy enumerator" do
     s = 0..Float::INFINITY
-    s.lazy.slice_when { |a, b| true }.should be_kind_of(Enumerator::Lazy)
+    s.lazy.slice_when { |a, b| true }.should.is_a?(Enumerator::Lazy)
   end
 end
diff --git a/spec/ruby/core/enumerator/lazy/take_spec.rb b/spec/ruby/core/enumerator/lazy/take_spec.rb
index 9fc17e969f4..f92360f543e 100644
--- a/spec/ruby/core/enumerator/lazy/take_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/take_spec.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.take(1)
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets given count to size if the given count is less than old size" do
diff --git a/spec/ruby/core/enumerator/lazy/take_while_spec.rb b/spec/ruby/core/enumerator/lazy/take_while_spec.rb
index bcea0b1419f..c369712c56c 100644
--- a/spec/ruby/core/enumerator/lazy/take_while_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/take_while_spec.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.take_while {}
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "sets #size to nil" do
@@ -40,7 +40,7 @@
   end
 
   it "raises an ArgumentError when not given a block" do
-    -> { @yieldsmixed.take_while }.should raise_error(ArgumentError)
+    -> { @yieldsmixed.take_while }.should.raise(ArgumentError)
   end
 
   describe "on a nested Lazy" do
diff --git a/spec/ruby/core/enumerator/lazy/uniq_spec.rb b/spec/ruby/core/enumerator/lazy/uniq_spec.rb
index ce67ace5abd..d30ed8df2f2 100644
--- a/spec/ruby/core/enumerator/lazy/uniq_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/uniq_spec.rb
@@ -8,7 +8,7 @@
     end
 
     it 'returns a lazy enumerator' do
-      @lazy.should be_an_instance_of(Enumerator::Lazy)
+      @lazy.should.instance_of?(Enumerator::Lazy)
       @lazy.force.should == [0, 1]
     end
 
@@ -28,7 +28,7 @@
     end
 
     it 'returns a lazy enumerator' do
-      @lazy.should be_an_instance_of(Enumerator::Lazy)
+      @lazy.should.instance_of?(Enumerator::Lazy)
       @lazy.force.should == [0, 1]
     end
 
diff --git a/spec/ruby/core/enumerator/lazy/with_index_spec.rb b/spec/ruby/core/enumerator/lazy/with_index_spec.rb
index a6b5c38777a..2e983fd3b15 100644
--- a/spec/ruby/core/enumerator/lazy/with_index_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/with_index_spec.rb
@@ -17,7 +17,7 @@
   end
 
   it "raises TypeError when offset does not convert to Integer" do
-    -> { (0..Float::INFINITY).lazy.with_index(false).map { |i, idx| i }.first(3) }.should raise_error(TypeError)
+    -> { (0..Float::INFINITY).lazy.with_index(false).map { |i, idx| i }.first(3) }.should.raise(TypeError)
   end
 
   it "enumerates with a given block" do
diff --git a/spec/ruby/core/enumerator/lazy/zip_spec.rb b/spec/ruby/core/enumerator/lazy/zip_spec.rb
index 5a828c1dccd..9f612542d71 100644
--- a/spec/ruby/core/enumerator/lazy/zip_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/zip_spec.rb
@@ -16,8 +16,8 @@
 
   it "returns a new instance of Enumerator::Lazy" do
     ret = @yieldsmixed.zip []
-    ret.should be_an_instance_of(Enumerator::Lazy)
-    ret.should_not equal(@yieldsmixed)
+    ret.should.instance_of?(Enumerator::Lazy)
+    ret.should_not.equal?(@yieldsmixed)
   end
 
   it "keeps size" do
@@ -40,11 +40,11 @@
   end
 
   it "returns a Lazy when no arguments given" do
-    @yieldsmixed.zip.should be_an_instance_of(Enumerator::Lazy)
+    @yieldsmixed.zip.should.instance_of?(Enumerator::Lazy)
   end
 
   it "raises a TypeError if arguments contain non-list object" do
-    -> { @yieldsmixed.zip [], Object.new, [] }.should raise_error(TypeError)
+    -> { @yieldsmixed.zip [], Object.new, [] }.should.raise(TypeError)
   end
 
   describe "on a nested Lazy" do
diff --git a/spec/ruby/core/enumerator/new_spec.rb b/spec/ruby/core/enumerator/new_spec.rb
index 671912224f9..539328a6c9d 100644
--- a/spec/ruby/core/enumerator/new_spec.rb
+++ b/spec/ruby/core/enumerator/new_spec.rb
@@ -3,7 +3,7 @@
 describe "Enumerator.new" do
   context "no block given" do
     it "raises" do
-      -> { Enumerator.new(1, :upto, 3) }.should raise_error(ArgumentError)
+      -> { Enumerator.new(1, :upto, 3) }.should.raise(ArgumentError)
     end
   end
 
diff --git a/spec/ruby/core/enumerator/next_spec.rb b/spec/ruby/core/enumerator/next_spec.rb
index a5e01a399d4..77e79185a97 100644
--- a/spec/ruby/core/enumerator/next_spec.rb
+++ b/spec/ruby/core/enumerator/next_spec.rb
@@ -13,14 +13,14 @@
 
   it "raises a StopIteration exception at the end of the stream" do
     3.times { @enum.next }
-    -> { @enum.next }.should raise_error(StopIteration)
+    -> { @enum.next }.should.raise(StopIteration)
   end
 
   it "cannot be called again until the enumerator is rewound" do
     3.times { @enum.next }
-    -> { @enum.next }.should raise_error(StopIteration)
-    -> { @enum.next }.should raise_error(StopIteration)
-    -> { @enum.next }.should raise_error(StopIteration)
+    -> { @enum.next }.should.raise(StopIteration)
+    -> { @enum.next }.should.raise(StopIteration)
+    -> { @enum.next }.should.raise(StopIteration)
     @enum.rewind
     @enum.next.should == 1
   end
diff --git a/spec/ruby/core/enumerator/next_values_spec.rb b/spec/ruby/core/enumerator/next_values_spec.rb
index 2202700c588..63e024e2b44 100644
--- a/spec/ruby/core/enumerator/next_values_spec.rb
+++ b/spec/ruby/core/enumerator/next_values_spec.rb
@@ -56,6 +56,6 @@ def o.each
 
   it "raises StopIteration if called on a finished enumerator" do
     8.times { @e.next }
-    -> { @e.next_values }.should raise_error(StopIteration)
+    -> { @e.next_values }.should.raise(StopIteration)
   end
 end
diff --git a/spec/ruby/core/enumerator/peek_spec.rb b/spec/ruby/core/enumerator/peek_spec.rb
index 2334385437f..096fd2b10c0 100644
--- a/spec/ruby/core/enumerator/peek_spec.rb
+++ b/spec/ruby/core/enumerator/peek_spec.rb
@@ -31,6 +31,6 @@
 
   it "raises StopIteration if called on a finished enumerator" do
     5.times { @e.next }
-    -> { @e.peek }.should raise_error(StopIteration)
+    -> { @e.peek }.should.raise(StopIteration)
   end
 end
diff --git a/spec/ruby/core/enumerator/peek_values_spec.rb b/spec/ruby/core/enumerator/peek_values_spec.rb
index 8b84fc8afcd..63f7988bcd2 100644
--- a/spec/ruby/core/enumerator/peek_values_spec.rb
+++ b/spec/ruby/core/enumerator/peek_values_spec.rb
@@ -58,6 +58,6 @@ def o.each
 
   it "raises StopIteration if called on a finished enumerator" do
     8.times { @e.next }
-    -> { @e.peek_values }.should raise_error(StopIteration)
+    -> { @e.peek_values }.should.raise(StopIteration)
   end
 end
diff --git a/spec/ruby/core/enumerator/plus_spec.rb b/spec/ruby/core/enumerator/plus_spec.rb
index 755be5b4ebe..d6c0fa93acd 100644
--- a/spec/ruby/core/enumerator/plus_spec.rb
+++ b/spec/ruby/core/enumerator/plus_spec.rb
@@ -12,7 +12,7 @@
 
     chain = one + two + three
 
-    chain.should be_an_instance_of(Enumerator::Chain)
+    chain.should.instance_of?(Enumerator::Chain)
     chain.each { |item| ScratchPad << item }
     ScratchPad.recorded.should == [1, 2, 3]
   end
diff --git a/spec/ruby/core/enumerator/product/each_spec.rb b/spec/ruby/core/enumerator/product/each_spec.rb
index 88f115a7124..164998404d4 100644
--- a/spec/ruby/core/enumerator/product/each_spec.rb
+++ b/spec/ruby/core/enumerator/product/each_spec.rb
@@ -33,7 +33,7 @@ def object2.each_entry
   it "raises a NoMethodError if the object doesn't respond to #each_entry" do
     -> {
       Enumerator::Product.new(Object.new).each {}
-    }.should raise_error(NoMethodError, /undefined method [`']each_entry' for/)
+    }.should.raise(NoMethodError, /undefined method [`']each_entry' for/)
   end
 
   it "returns enumerator if not given a block" do
diff --git a/spec/ruby/core/enumerator/product/initialize_copy_spec.rb b/spec/ruby/core/enumerator/product/initialize_copy_spec.rb
index b1b9f3ca9b9..b5d2b345a9f 100644
--- a/spec/ruby/core/enumerator/product/initialize_copy_spec.rb
+++ b/spec/ruby/core/enumerator/product/initialize_copy_spec.rb
@@ -17,7 +17,7 @@
   end
 
   it "is a private method" do
-    Enumerator::Product.should have_private_instance_method(:initialize_copy, false)
+    Enumerator::Product.private_instance_methods(false).should.include?(:initialize_copy)
   end
 
   it "does nothing if the argument is the same as the receiver" do
@@ -32,21 +32,21 @@
     enum = Enumerator::Product.new(1..2)
     enum2 = Enumerator::Product.new(3..4)
 
-    -> { enum.freeze.send(:initialize_copy, enum2) }.should raise_error(FrozenError)
+    -> { enum.freeze.send(:initialize_copy, enum2) }.should.raise(FrozenError)
   end
 
   it "raises TypeError if the objects are of different class" do
     enum = Enumerator::Product.new(1..2)
     enum2 = Class.new(Enumerator::Product).new(3..4)
 
-    -> { enum.send(:initialize_copy, enum2) }.should raise_error(TypeError, 'initialize_copy should take same class object')
-    -> { enum2.send(:initialize_copy, enum) }.should raise_error(TypeError, 'initialize_copy should take same class object')
+    -> { enum.send(:initialize_copy, enum2) }.should.raise(TypeError, 'initialize_copy should take same class object')
+    -> { enum2.send(:initialize_copy, enum) }.should.raise(TypeError, 'initialize_copy should take same class object')
   end
 
   it "raises ArgumentError if the argument is not initialized yet" do
     enum = Enumerator::Product.new(1..2)
     enum2 = Enumerator::Product.allocate
 
-    -> { enum.send(:initialize_copy, enum2) }.should raise_error(ArgumentError, 'uninitialized product')
+    -> { enum.send(:initialize_copy, enum2) }.should.raise(ArgumentError, 'uninitialized product')
   end
 end
diff --git a/spec/ruby/core/enumerator/product/initialize_spec.rb b/spec/ruby/core/enumerator/product/initialize_spec.rb
index ed2a8a2a135..8814f9d3c7b 100644
--- a/spec/ruby/core/enumerator/product/initialize_spec.rb
+++ b/spec/ruby/core/enumerator/product/initialize_spec.rb
@@ -6,26 +6,26 @@
   end
 
   it "is a private method" do
-    Enumerator::Product.should have_private_instance_method(:initialize, false)
+    Enumerator::Product.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "returns self" do
-    @uninitialized.send(:initialize).should equal(@uninitialized)
+    @uninitialized.send(:initialize).should.equal?(@uninitialized)
   end
 
   it "accepts many arguments" do
-    @uninitialized.send(:initialize, 0..1, 2..3, 4..5).should equal(@uninitialized)
+    @uninitialized.send(:initialize, 0..1, 2..3, 4..5).should.equal?(@uninitialized)
   end
 
   it "accepts arguments that are not Enumerable nor responding to :each_entry" do
-    @uninitialized.send(:initialize, Object.new).should equal(@uninitialized)
+    @uninitialized.send(:initialize, Object.new).should.equal?(@uninitialized)
   end
 
   describe "on frozen instance" do
     it "raises a FrozenError" do
       -> {
         @uninitialized.freeze.send(:initialize, 0..1)
-      }.should raise_error(FrozenError)
+      }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/enumerator/product_spec.rb b/spec/ruby/core/enumerator/product_spec.rb
index 83c7cb8e0e8..0f37ef76e7f 100644
--- a/spec/ruby/core/enumerator/product_spec.rb
+++ b/spec/ruby/core/enumerator/product_spec.rb
@@ -51,7 +51,7 @@
   it "reject keyword arguments" do
     -> {
       Enumerator.product(1..3, foo: 1, bar: 2)
-    }.should raise_error(ArgumentError, "unknown keywords: :foo, :bar")
+    }.should.raise(ArgumentError, "unknown keywords: :foo, :bar")
   end
 
   it "calls only #each_entry method on arguments" do
@@ -68,11 +68,11 @@ def object.each_entry
   it "raises NoMethodError when argument doesn't respond to #each_entry" do
     -> {
       Enumerator.product(Object.new).to_a
-    }.should raise_error(NoMethodError, /undefined method [`']each_entry' for/)
+    }.should.raise(NoMethodError, /undefined method [`']each_entry' for/)
   end
 
   it "calls #each_entry lazily" do
-    Enumerator.product(Object.new).should be_kind_of(Enumerator)
+    Enumerator.product(Object.new).should.is_a?(Enumerator)
   end
 
   it "iterates through consuming enumerator elements only once" do
diff --git a/spec/ruby/core/enumerator/shared/enum_for.rb b/spec/ruby/core/enumerator/shared/enum_for.rb
index a67a76c4613..4388103ecf4 100644
--- a/spec/ruby/core/enumerator/shared/enum_for.rb
+++ b/spec/ruby/core/enumerator/shared/enum_for.rb
@@ -1,10 +1,10 @@
 describe :enum_for, shared: true do
   it "is defined in Kernel" do
-    Kernel.method_defined?(@method).should be_true
+    Kernel.method_defined?(@method).should == true
   end
 
   it "returns a new enumerator" do
-    "abc".send(@method).should be_an_instance_of(Enumerator)
+    "abc".send(@method).should.instance_of?(Enumerator)
   end
 
   it "defaults the first argument to :each" do
@@ -49,7 +49,7 @@ def o.each
       100
     end
 
-    ScratchPad.recorded.should be_empty
+    ScratchPad.recorded.should.empty?
 
     enum.size
     ScratchPad.recorded.should == [:called]
diff --git a/spec/ruby/core/enumerator/shared/with_index.rb b/spec/ruby/core/enumerator/shared/with_index.rb
index 78771ffe82d..0992397e958 100644
--- a/spec/ruby/core/enumerator/shared/with_index.rb
+++ b/spec/ruby/core/enumerator/shared/with_index.rb
@@ -16,7 +16,7 @@
   end
 
   it "returns the object being enumerated when given a block" do
-    @enum.send(@method) { |o, i| :glark }.should equal(@origin)
+    @enum.send(@method) { |o, i| :glark }.should.equal?(@origin)
   end
 
   it "binds splat arguments properly" do
@@ -27,7 +27,7 @@
 
   it "returns an enumerator if no block is supplied" do
     ewi = @enum.send(@method)
-    ewi.should be_an_instance_of(Enumerator)
+    ewi.should.instance_of?(Enumerator)
     ewi.to_a.should == [[1, 0], [2, 1], [3, 2], [4, 3]]
   end
 end
diff --git a/spec/ruby/core/enumerator/shared/with_object.rb b/spec/ruby/core/enumerator/shared/with_object.rb
index d8e9d8e9f7b..50d4f24eb34 100644
--- a/spec/ruby/core/enumerator/shared/with_object.rb
+++ b/spec/ruby/core/enumerator/shared/with_object.rb
@@ -16,18 +16,18 @@
       ret = @enum.send(@method, @memo) do |elm, memo|
         # nothing
       end
-      ret.should equal(@memo)
+      ret.should.equal?(@memo)
     end
 
     context "the block parameter" do
       it "passes each element to first parameter" do
-        @block_params[0][0].should equal(:a)
-        @block_params[1][0].should equal(:b)
+        @block_params[0][0].should.equal?(:a)
+        @block_params[1][0].should.equal?(:b)
       end
 
       it "passes the given object to last parameter" do
-        @block_params[0][1].should equal(@memo)
-        @block_params[1][1].should equal(@memo)
+        @block_params[0][1].should.equal?(@memo)
+        @block_params[1][1].should.equal?(@memo)
       end
     end
   end
@@ -35,8 +35,8 @@
   context "without block" do
     it "returns new Enumerator" do
       ret = @enum.send(@method, @memo)
-      ret.should be_an_instance_of(Enumerator)
-      ret.should_not equal(@enum)
+      ret.should.instance_of?(Enumerator)
+      ret.should_not.equal?(@enum)
     end
   end
 end
diff --git a/spec/ruby/core/enumerator/size_spec.rb b/spec/ruby/core/enumerator/size_spec.rb
index 6accd26a4e3..4b2beffbbe5 100644
--- a/spec/ruby/core/enumerator/size_spec.rb
+++ b/spec/ruby/core/enumerator/size_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "returns nil if set size is nil" do
-    Enumerator.new(nil) {}.size.should be_nil
+    Enumerator.new(nil) {}.size.should == nil
   end
 
   it "returns returning value from size.call if set size is a Proc" do
diff --git a/spec/ruby/core/enumerator/with_index_spec.rb b/spec/ruby/core/enumerator/with_index_spec.rb
index e49aa7a939b..ca90fd18f7f 100644
--- a/spec/ruby/core/enumerator/with_index_spec.rb
+++ b/spec/ruby/core/enumerator/with_index_spec.rb
@@ -9,20 +9,20 @@
   it "returns a new Enumerator when no block is given" do
     enum1 = [1,2,3].select
     enum2 = enum1.with_index
-    enum2.should be_an_instance_of(Enumerator)
+    enum2.should.instance_of?(Enumerator)
     enum1.should_not === enum2
   end
 
   it "accepts an optional argument when given a block" do
     -> do
       @enum.with_index(1) { |f| f}
-    end.should_not raise_error(ArgumentError)
+    end.should_not.raise(ArgumentError)
   end
 
   it "accepts an optional argument when not given a block" do
     -> do
       @enum.with_index(1)
-    end.should_not raise_error(ArgumentError)
+    end.should_not.raise(ArgumentError)
   end
 
   it "numbers indices from the given index when given an offset but no block" do
@@ -38,7 +38,7 @@
   it "raises a TypeError when the argument cannot be converted to numeric" do
     -> do
       @enum.with_index('1') {|*i| i}
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "converts non-numeric arguments to Integer via #to_int" do
diff --git a/spec/ruby/core/enumerator/yielder/append_spec.rb b/spec/ruby/core/enumerator/yielder/append_spec.rb
index a36e5d64b6c..2e1f5203d94 100644
--- a/spec/ruby/core/enumerator/yielder/append_spec.rb
+++ b/spec/ruby/core/enumerator/yielder/append_spec.rb
@@ -19,7 +19,7 @@
 
   it "returns self" do
     y = Enumerator::Yielder.new {|x| x + 1}
-    (y << 1).should equal(y)
+    (y << 1).should.equal?(y)
   end
 
   context "when multiple arguments passed" do
@@ -29,7 +29,7 @@
 
       -> {
         y.<<(1, 2)
-      }.should raise_error(ArgumentError, /wrong number of arguments/)
+      }.should.raise(ArgumentError, /wrong number of arguments/)
     end
   end
 end
diff --git a/spec/ruby/core/enumerator/yielder/initialize_spec.rb b/spec/ruby/core/enumerator/yielder/initialize_spec.rb
index 5a6eee2d0f3..925f561ec43 100644
--- a/spec/ruby/core/enumerator/yielder/initialize_spec.rb
+++ b/spec/ruby/core/enumerator/yielder/initialize_spec.rb
@@ -9,10 +9,10 @@
   end
 
   it "is a private method" do
-    @class.should have_private_instance_method(:initialize, false)
+    @class.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "returns self when given a block" do
-    @uninitialized.send(:initialize) {}.should equal(@uninitialized)
+    @uninitialized.send(:initialize) {}.should.equal?(@uninitialized)
   end
 end
diff --git a/spec/ruby/core/env/assoc_spec.rb b/spec/ruby/core/env/assoc_spec.rb
index c7a388db754..b81be7ddf22 100644
--- a/spec/ruby/core/env/assoc_spec.rb
+++ b/spec/ruby/core/env/assoc_spec.rb
@@ -26,6 +26,6 @@
   end
 
   it "raises TypeError if the argument is not a String and does not respond to #to_str" do
-    -> { ENV.assoc(Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.assoc(Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 end
diff --git a/spec/ruby/core/env/clear_spec.rb b/spec/ruby/core/env/clear_spec.rb
index 48b034ba1d9..c0d20193ad2 100644
--- a/spec/ruby/core/env/clear_spec.rb
+++ b/spec/ruby/core/env/clear_spec.rb
@@ -4,7 +4,7 @@
   it "deletes all environment variables" do
     orig = ENV.to_hash
     begin
-      ENV.clear.should equal(ENV)
+      ENV.clear.should.equal?(ENV)
 
       # This used 'env' the helper before. That shells out to 'env' which
       # itself sets up certain environment variables before it runs, because
diff --git a/spec/ruby/core/env/clone_spec.rb b/spec/ruby/core/env/clone_spec.rb
index 01a29c6ab48..bb3c7ff2f86 100644
--- a/spec/ruby/core/env/clone_spec.rb
+++ b/spec/ruby/core/env/clone_spec.rb
@@ -4,18 +4,18 @@
   it "raises ArgumentError when keyword argument 'freeze' is neither nil nor boolean" do
     -> {
       ENV.clone(freeze: 1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when keyword argument is not 'freeze'" do
     -> {
       ENV.clone(foo: nil)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises TypeError" do
     -> {
       ENV.clone
-    }.should raise_error(TypeError, /Cannot clone ENV, use ENV.to_h to get a copy of ENV as a hash/)
+    }.should.raise(TypeError, /Cannot clone ENV, use ENV.to_h to get a copy of ENV as a hash/)
   end
 end
diff --git a/spec/ruby/core/env/delete_if_spec.rb b/spec/ruby/core/env/delete_if_spec.rb
index d2de51c2253..4b05064eba2 100644
--- a/spec/ruby/core/env/delete_if_spec.rb
+++ b/spec/ruby/core/env/delete_if_spec.rb
@@ -22,15 +22,15 @@
   end
 
   it "returns ENV when block given" do
-    ENV.delete_if { |k, v| ["foo", "bar"].include?(k) }.should equal(ENV)
+    ENV.delete_if { |k, v| ["foo", "bar"].include?(k) }.should.equal?(ENV)
   end
 
   it "returns ENV even if nothing deleted" do
-    ENV.delete_if { false }.should equal(ENV)
+    ENV.delete_if { false }.should.equal?(ENV)
   end
 
   it "returns an Enumerator if no block given" do
-    ENV.delete_if.should be_an_instance_of(Enumerator)
+    ENV.delete_if.should.instance_of?(Enumerator)
   end
 
   it "deletes pairs through enumerator" do
@@ -42,12 +42,12 @@
 
   it "returns ENV from enumerator" do
     enum = ENV.delete_if
-    enum.each { |k, v| ["foo", "bar"].include?(k) }.should equal(ENV)
+    enum.each { |k, v| ["foo", "bar"].include?(k) }.should.equal?(ENV)
   end
 
   it "returns ENV from enumerator even if nothing deleted" do
     enum = ENV.delete_if
-    enum.each { false }.should equal(ENV)
+    enum.each { false }.should.equal?(ENV)
   end
 
   it_behaves_like :enumeratorized_with_origin_size, :delete_if, ENV
diff --git a/spec/ruby/core/env/delete_spec.rb b/spec/ruby/core/env/delete_spec.rb
index f28ac979111..db6d07b057e 100644
--- a/spec/ruby/core/env/delete_spec.rb
+++ b/spec/ruby/core/env/delete_spec.rb
@@ -50,6 +50,6 @@
   end
 
   it "raises TypeError if the argument is not a String and does not respond to #to_str" do
-    -> { ENV.delete(Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.delete(Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 end
diff --git a/spec/ruby/core/env/dup_spec.rb b/spec/ruby/core/env/dup_spec.rb
index ac66b455cde..d8cfac891da 100644
--- a/spec/ruby/core/env/dup_spec.rb
+++ b/spec/ruby/core/env/dup_spec.rb
@@ -4,6 +4,6 @@
   it "raises TypeError" do
     -> {
       ENV.dup
-    }.should raise_error(TypeError, /Cannot dup ENV, use ENV.to_h to get a copy of ENV as a hash/)
+    }.should.raise(TypeError, /Cannot dup ENV, use ENV.to_h to get a copy of ENV as a hash/)
   end
 end
diff --git a/spec/ruby/core/env/each_key_spec.rb b/spec/ruby/core/env/each_key_spec.rb
index 0efcb09900d..ad2cb560a09 100644
--- a/spec/ruby/core/env/each_key_spec.rb
+++ b/spec/ruby/core/env/each_key_spec.rb
@@ -10,9 +10,9 @@
       ENV.clear
       ENV["1"] = "3"
       ENV["2"] = "4"
-      ENV.each_key { |k| e << k }.should equal(ENV)
-      e.should include("1")
-      e.should include("2")
+      ENV.each_key { |k| e << k }.should.equal?(ENV)
+      e.should.include?("1")
+      e.should.include?("2")
     ensure
       ENV.replace orig
     end
@@ -20,7 +20,7 @@
 
   it "returns an Enumerator if called without a block" do
     enum = ENV.each_key
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == ENV.keys
   end
 
diff --git a/spec/ruby/core/env/each_value_spec.rb b/spec/ruby/core/env/each_value_spec.rb
index cc3c9ebfb8c..6f65e923e68 100644
--- a/spec/ruby/core/env/each_value_spec.rb
+++ b/spec/ruby/core/env/each_value_spec.rb
@@ -10,9 +10,9 @@
       ENV.clear
       ENV["1"] = "3"
       ENV["2"] = "4"
-      ENV.each_value { |v| e << v }.should equal(ENV)
-      e.should include("3")
-      e.should include("4")
+      ENV.each_value { |v| e << v }.should.equal?(ENV)
+      e.should.include?("3")
+      e.should.include?("4")
     ensure
       ENV.replace orig
     end
@@ -20,7 +20,7 @@
 
   it "returns an Enumerator if called without a block" do
     enum = ENV.each_value
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == ENV.values
   end
 
diff --git a/spec/ruby/core/env/element_reference_spec.rb b/spec/ruby/core/env/element_reference_spec.rb
index 66a9bc96906..e3ac9794189 100644
--- a/spec/ruby/core/env/element_reference_spec.rb
+++ b/spec/ruby/core/env/element_reference_spec.rb
@@ -28,7 +28,7 @@
   end
 
   it "raises TypeError if the argument is not a String and does not respond to #to_str" do
-    -> { ENV[Object.new] }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV[Object.new] }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   platform_is :windows do
@@ -71,6 +71,6 @@
     ENV[@variable] = ""
     Encoding.default_internal = Encoding::IBM437
 
-    ENV[@variable].encoding.should equal(Encoding::IBM437)
+    ENV[@variable].encoding.should.equal?(Encoding::IBM437)
   end
 end
diff --git a/spec/ruby/core/env/fetch_spec.rb b/spec/ruby/core/env/fetch_spec.rb
index 2c5d7cc3a00..a2ec79c62bc 100644
--- a/spec/ruby/core/env/fetch_spec.rb
+++ b/spec/ruby/core/env/fetch_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it "raises a TypeError if the key is not a String" do
-    -> { ENV.fetch Object.new }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.fetch Object.new }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   context "when the key is not found" do
@@ -25,7 +25,7 @@
     it "formats the object with #inspect in the KeyError message" do
       -> {
         ENV.fetch('foo')
-      }.should raise_error(KeyError, 'key not found: "foo"')
+      }.should.raise(KeyError, 'key not found: "foo"')
     end
   end
 
diff --git a/spec/ruby/core/env/fetch_values_spec.rb b/spec/ruby/core/env/fetch_values_spec.rb
new file mode 100644
index 00000000000..302cde2fd15
--- /dev/null
+++ b/spec/ruby/core/env/fetch_values_spec.rb
@@ -0,0 +1,51 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/common'
+
+ruby_version_is "4.1" do
+  describe "ENV.fetch_values" do
+    before :each do
+      @saved_foo = ENV["foo"]
+      @saved_bar = ENV["bar"]
+      ENV.delete("foo")
+      ENV.delete("bar")
+    end
+
+    after :each do
+      ENV["foo"] = @saved_foo
+      ENV["bar"] = @saved_bar
+    end
+
+    it "returns an array of the values corresponding to the given keys" do
+      ENV["foo"] = "oof"
+      ENV["bar"] = "rab"
+      ENV.fetch_values("bar", "foo").should == ["rab", "oof"]
+    end
+
+    it "returns the default value from block" do
+      ENV["foo"] = "oof"
+      ENV.fetch_values("bar") { |key| "`#{key}' is not found" }.should == ["`bar' is not found"]
+      ENV.fetch_values("bar", "foo") { |key| "`#{key}' is not found" }.should == ["`bar' is not found", "oof"]
+    end
+
+    it "returns an empty array if no keys specified" do
+      ENV.fetch_values.should == []
+    end
+
+    it "raises KeyError when there is no matching key" do
+      ENV["foo"] = "oof"
+      ENV["bar"] = "rab"
+      -> {
+        ENV.fetch_values("bar", "y", "foo", "z")
+      }.should.raise(KeyError, 'key not found: "y"')
+    end
+
+    it "uses the locale encoding" do
+      ENV.fetch_values(ENV.keys.first).first.encoding.should == ENVSpecs.encoding
+    end
+
+    it "raises TypeError when a key is not coercible to String" do
+      ENV["foo"] = "oof"
+      -> { ENV.fetch_values("foo", Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
+    end
+  end
+end
diff --git a/spec/ruby/core/env/keep_if_spec.rb b/spec/ruby/core/env/keep_if_spec.rb
index 64b6a207d00..f24981e2166 100644
--- a/spec/ruby/core/env/keep_if_spec.rb
+++ b/spec/ruby/core/env/keep_if_spec.rb
@@ -22,15 +22,15 @@
   end
 
   it "returns ENV when block given" do
-    ENV.keep_if { |k, v| !["foo", "bar"].include?(k) }.should equal(ENV)
+    ENV.keep_if { |k, v| !["foo", "bar"].include?(k) }.should.equal?(ENV)
   end
 
   it "returns ENV even if nothing deleted" do
-    ENV.keep_if { true }.should equal(ENV)
+    ENV.keep_if { true }.should.equal?(ENV)
   end
 
   it "returns an Enumerator if no block given" do
-    ENV.keep_if.should be_an_instance_of(Enumerator)
+    ENV.keep_if.should.instance_of?(Enumerator)
   end
 
   it "deletes pairs through enumerator" do
@@ -42,12 +42,12 @@
 
   it "returns ENV from enumerator" do
     enum = ENV.keep_if
-    enum.each { |k, v| !["foo", "bar"].include?(k) }.should equal(ENV)
+    enum.each { |k, v| !["foo", "bar"].include?(k) }.should.equal?(ENV)
   end
 
   it "returns ENV from enumerator even if nothing deleted" do
     enum = ENV.keep_if
-    enum.each { true }.should equal(ENV)
+    enum.each { true }.should.equal?(ENV)
   end
 
   it_behaves_like :enumeratorized_with_origin_size, :keep_if, ENV
diff --git a/spec/ruby/core/env/key_spec.rb b/spec/ruby/core/env/key_spec.rb
index cf702864090..677cf35216c 100644
--- a/spec/ruby/core/env/key_spec.rb
+++ b/spec/ruby/core/env/key_spec.rb
@@ -21,7 +21,7 @@
 
   it "returns nil if the passed value is not found" do
     ENV.delete("foo")
-    ENV.key("foo").should be_nil
+    ENV.key("foo").should == nil
   end
 
   it "coerces the key element with #to_str" do
@@ -34,6 +34,6 @@
   it "raises TypeError if the argument is not a String and does not respond to #to_str" do
     -> {
       ENV.key(Object.new)
-    }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 end
diff --git a/spec/ruby/core/env/rassoc_spec.rb b/spec/ruby/core/env/rassoc_spec.rb
index ab9fe680881..e4ac5ce5e27 100644
--- a/spec/ruby/core/env/rassoc_spec.rb
+++ b/spec/ruby/core/env/rassoc_spec.rb
@@ -22,7 +22,7 @@
     [
         ["foo", "bar"],
         ["baz", "bar"],
-    ].should include(ENV.rassoc("bar"))
+    ].should.include?(ENV.rassoc("bar"))
   end
 
   it "returns nil if no environment variable with the given value exists" do
diff --git a/spec/ruby/core/env/reject_spec.rb b/spec/ruby/core/env/reject_spec.rb
index 6a9794925dd..4df864493d2 100644
--- a/spec/ruby/core/env/reject_spec.rb
+++ b/spec/ruby/core/env/reject_spec.rb
@@ -25,15 +25,15 @@
   it "returns itself or nil" do
     ENV.reject! { false }.should == nil
     ENV["foo"] = "bar"
-    ENV.reject! { |k, v| k == "foo" }.should equal(ENV)
+    ENV.reject! { |k, v| k == "foo" }.should.equal?(ENV)
     ENV["foo"].should == nil
   end
 
   it "returns an Enumerator if called without a block" do
     ENV["foo"] = "bar"
     enum = ENV.reject!
-    enum.should be_an_instance_of(Enumerator)
-    enum.each { |k, v| k == "foo" }.should equal(ENV)
+    enum.should.instance_of?(Enumerator)
+    enum.each { |k, v| k == "foo" }.should.equal?(ENV)
     ENV["foo"].should == nil
   end
 
@@ -41,7 +41,7 @@
     orig = ENV.to_hash
     begin
       ENV.clear
-      -> { ENV.reject! }.should_not raise_error(LocalJumpError)
+      -> { ENV.reject! }.should_not.raise(LocalJumpError)
     ensure
       ENV.replace orig
     end
@@ -76,13 +76,13 @@
   end
 
   it "returns a Hash" do
-    ENV.reject { false }.should be_kind_of(Hash)
+    ENV.reject { false }.should.is_a?(Hash)
   end
 
   it "returns an Enumerator if called without a block" do
     ENV["foo"] = "bar"
     enum = ENV.reject
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.each { |k, v| k == "foo"}
     ENV["foo"] = nil
   end
@@ -91,7 +91,7 @@
     orig = ENV.to_hash
     begin
       ENV.clear
-      -> { ENV.reject }.should_not raise_error(LocalJumpError)
+      -> { ENV.reject }.should_not.raise(LocalJumpError)
     ensure
       ENV.replace orig
     end
diff --git a/spec/ruby/core/env/replace_spec.rb b/spec/ruby/core/env/replace_spec.rb
index 9fc67643d13..27eb3e45dd1 100644
--- a/spec/ruby/core/env/replace_spec.rb
+++ b/spec/ruby/core/env/replace_spec.rb
@@ -11,41 +11,41 @@
   end
 
   it "replaces ENV with a Hash" do
-    ENV.replace("foo" => "0", "bar" => "1").should equal(ENV)
+    ENV.replace("foo" => "0", "bar" => "1").should.equal?(ENV)
     ENV.size.should == 2
     ENV["foo"].should == "0"
     ENV["bar"].should == "1"
   end
 
   it "raises TypeError if the argument is not a Hash" do
-    -> { ENV.replace(Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into Hash")
+    -> { ENV.replace(Object.new) }.should.raise(TypeError, "no implicit conversion of Object into Hash")
     ENV.to_hash.should == @orig
   end
 
   it "raises TypeError if a key is not a String" do
-    -> { ENV.replace(Object.new => "0") }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.replace(Object.new => "0") }.should.raise(TypeError, "no implicit conversion of Object into String")
     ENV.to_hash.should == @orig
   end
 
   it "raises TypeError if a value is not a String" do
-    -> { ENV.replace("foo" => Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.replace("foo" => Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
     ENV.to_hash.should == @orig
   end
 
   it "raises Errno::EINVAL when the key contains the '=' character" do
-    -> { ENV.replace("foo=" =>"bar") }.should raise_error(Errno::EINVAL)
+    -> { ENV.replace("foo=" =>"bar") }.should.raise(Errno::EINVAL)
   end
 
   it "raises Errno::EINVAL when the key is an empty string" do
-    -> { ENV.replace("" => "bar") }.should raise_error(Errno::EINVAL)
+    -> { ENV.replace("" => "bar") }.should.raise(Errno::EINVAL)
   end
 
   it "does not accept good data preceding an error" do
-    -> { ENV.replace("foo" => "1", Object.new => Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.replace("foo" => "1", Object.new => Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "does not accept good data following an error" do
-    -> { ENV.replace(Object.new => Object.new, "foo" => "0") }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.replace(Object.new => Object.new, "foo" => "0") }.should.raise(TypeError, "no implicit conversion of Object into String")
     ENV.to_hash.should == @orig
   end
 end
diff --git a/spec/ruby/core/env/shared/each.rb b/spec/ruby/core/env/shared/each.rb
index d901b854c42..0661ca924ce 100644
--- a/spec/ruby/core/env/shared/each.rb
+++ b/spec/ruby/core/env/shared/each.rb
@@ -8,9 +8,9 @@
       ENV.clear
       ENV["foo"] = "bar"
       ENV["baz"] = "boo"
-      ENV.send(@method) { |k, v| e << [k, v] }.should equal(ENV)
-      e.should include(["foo", "bar"])
-      e.should include(["baz", "boo"])
+      ENV.send(@method) { |k, v| e << [k, v] }.should.equal?(ENV)
+      e.should.include?(["foo", "bar"])
+      e.should.include?(["baz", "boo"])
     ensure
       ENV.replace orig
     end
@@ -18,7 +18,7 @@
 
   it "returns an Enumerator if called without a block" do
     enum = ENV.send(@method)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.each do |name, value|
       ENV[name].should == value
     end
@@ -55,9 +55,9 @@
       Encoding.default_internal = internal = Encoding::IBM437
 
       ENV.send(@method) do |key, value|
-        key.encoding.should equal(internal)
+        key.encoding.should.equal?(internal)
         if value.ascii_only?
-          value.encoding.should equal(internal)
+          value.encoding.should.equal?(internal)
         end
       end
     end
diff --git a/spec/ruby/core/env/shared/include.rb b/spec/ruby/core/env/shared/include.rb
index 70aa5553017..ceca02e3ebb 100644
--- a/spec/ruby/core/env/shared/include.rb
+++ b/spec/ruby/core/env/shared/include.rb
@@ -25,6 +25,6 @@
   end
 
   it "raises TypeError if the argument is not a String and does not respond to #to_str" do
-    -> { ENV.send(@method, Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.send(@method, Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 end
diff --git a/spec/ruby/core/env/shared/select.rb b/spec/ruby/core/env/shared/select.rb
index 75ba112a323..8ec648a637f 100644
--- a/spec/ruby/core/env/shared/select.rb
+++ b/spec/ruby/core/env/shared/select.rb
@@ -14,7 +14,7 @@
 
   it "returns an Enumerator when no block is given" do
     enum = ENV.send(@method)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
   end
 
   it "selects via the enumerator" do
@@ -49,7 +49,7 @@
   end
 
   it "returns an Enumerator if called without a block" do
-    ENV.send(@method).should be_an_instance_of(Enumerator)
+    ENV.send(@method).should.instance_of?(Enumerator)
   end
 
   it "selects via the enumerator" do
diff --git a/spec/ruby/core/env/shared/store.rb b/spec/ruby/core/env/shared/store.rb
index d6265c66a50..388208a8ac1 100644
--- a/spec/ruby/core/env/shared/store.rb
+++ b/spec/ruby/core/env/shared/store.rb
@@ -14,13 +14,13 @@
 
   it "returns the value" do
     value = "bar"
-    ENV.send(@method, "foo", value).should equal(value)
+    ENV.send(@method, "foo", value).should.equal?(value)
   end
 
   it "deletes the environment variable when the value is nil" do
     ENV["foo"] = "bar"
     ENV.send(@method, "foo", nil)
-    ENV.key?("foo").should be_false
+    ENV.key?("foo").should == false
   end
 
   it "coerces the key argument with #to_str" do
@@ -38,23 +38,23 @@
   end
 
   it "raises TypeError when the key is not coercible to String" do
-    -> { ENV.send(@method, Object.new, "bar") }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.send(@method, Object.new, "bar") }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "raises TypeError when the value is not coercible to String" do
-    -> { ENV.send(@method, "foo", Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.send(@method, "foo", Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "raises Errno::EINVAL when the key contains the '=' character" do
-    -> { ENV.send(@method, "foo=", "bar") }.should raise_error(Errno::EINVAL)
+    -> { ENV.send(@method, "foo=", "bar") }.should.raise(Errno::EINVAL)
   end
 
   it "raises Errno::EINVAL when the key is an empty string" do
-    -> { ENV.send(@method, "", "bar") }.should raise_error(Errno::EINVAL)
+    -> { ENV.send(@method, "", "bar") }.should.raise(Errno::EINVAL)
   end
 
   it "does nothing when the key is not a valid environment variable key and the value is nil" do
     ENV.send(@method, "foo=", nil)
-    ENV.key?("foo=").should be_false
+    ENV.key?("foo=").should == false
   end
 end
diff --git a/spec/ruby/core/env/shared/to_hash.rb b/spec/ruby/core/env/shared/to_hash.rb
index a0d4d7ce694..7868690c38d 100644
--- a/spec/ruby/core/env/shared/to_hash.rb
+++ b/spec/ruby/core/env/shared/to_hash.rb
@@ -10,7 +10,7 @@
   it "returns the ENV as a hash" do
     ENV["foo"] = "bar"
     h = ENV.send(@method)
-    h.should be_an_instance_of(Hash)
+    h.should.instance_of?(Hash)
     h["foo"].should == "bar"
   end
 
@@ -24,7 +24,7 @@
 
   it "duplicates the ENV when converting to a Hash" do
     h = ENV.send(@method)
-    h.should_not equal ENV
+    h.should_not.equal? ENV
     h.size.should == ENV.size
     h.each_pair do |k, v|
       ENV[k].should == v
diff --git a/spec/ruby/core/env/shared/update.rb b/spec/ruby/core/env/shared/update.rb
index e1b1c9c290e..112cc2505d0 100644
--- a/spec/ruby/core/env/shared/update.rb
+++ b/spec/ruby/core/env/shared/update.rb
@@ -10,19 +10,19 @@
   end
 
   it "adds the parameter hash to ENV, returning ENV" do
-    ENV.send(@method, "foo" => "0", "bar" => "1").should equal(ENV)
+    ENV.send(@method, "foo" => "0", "bar" => "1").should.equal?(ENV)
     ENV["foo"].should == "0"
     ENV["bar"].should == "1"
   end
 
   it "adds the multiple parameter hashes to ENV, returning ENV" do
-    ENV.send(@method, {"foo" => "multi1"}, {"bar" => "multi2"}).should equal(ENV)
+    ENV.send(@method, {"foo" => "multi1"}, {"bar" => "multi2"}).should.equal?(ENV)
     ENV["foo"].should == "multi1"
     ENV["bar"].should == "multi2"
   end
 
   it "returns ENV when no block given" do
-    ENV.send(@method, {"foo" => "0", "bar" => "1"}).should equal(ENV)
+    ENV.send(@method, {"foo" => "0", "bar" => "1"}).should.equal?(ENV)
   end
 
   it "yields key, the old value and the new value when replacing an entry" do
@@ -63,23 +63,23 @@
   end
 
   it "returns ENV when block given" do
-    ENV.send(@method, {"foo" => "0", "bar" => "1"}){}.should equal(ENV)
+    ENV.send(@method, {"foo" => "0", "bar" => "1"}){}.should.equal?(ENV)
   end
 
   it "raises TypeError when a name is not coercible to String" do
-    -> { ENV.send @method, Object.new => "0" }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.send @method, Object.new => "0" }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "raises TypeError when a value is not coercible to String" do
-    -> { ENV.send @method, "foo" => Object.new }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.send @method, "foo" => Object.new }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "raises Errno::EINVAL when a name contains the '=' character" do
-    -> { ENV.send(@method, "foo=" => "bar") }.should raise_error(Errno::EINVAL)
+    -> { ENV.send(@method, "foo=" => "bar") }.should.raise(Errno::EINVAL)
   end
 
   it "raises Errno::EINVAL when a name is an empty string" do
-    -> { ENV.send(@method, "" => "bar") }.should raise_error(Errno::EINVAL)
+    -> { ENV.send(@method, "" => "bar") }.should.raise(Errno::EINVAL)
   end
 
   it "updates good data preceding an error" do
diff --git a/spec/ruby/core/env/shift_spec.rb b/spec/ruby/core/env/shift_spec.rb
index 1b92e5d1e4e..52bd0f91395 100644
--- a/spec/ruby/core/env/shift_spec.rb
+++ b/spec/ruby/core/env/shift_spec.rb
@@ -33,15 +33,15 @@
     Encoding.default_internal = nil
 
     pair = ENV.shift
-    pair.first.encoding.should equal(ENVSpecs.encoding)
-    pair.last.encoding.should equal(ENVSpecs.encoding)
+    pair.first.encoding.should.equal?(ENVSpecs.encoding)
+    pair.last.encoding.should.equal?(ENVSpecs.encoding)
   end
 
   it "transcodes from the locale encoding to Encoding.default_internal if set" do
     Encoding.default_internal = Encoding::IBM437
 
     pair = ENV.shift
-    pair.first.encoding.should equal(Encoding::IBM437)
-    pair.last.encoding.should equal(Encoding::IBM437)
+    pair.first.encoding.should.equal?(Encoding::IBM437)
+    pair.last.encoding.should.equal?(Encoding::IBM437)
   end
 end
diff --git a/spec/ruby/core/env/slice_spec.rb b/spec/ruby/core/env/slice_spec.rb
index 959239d2b2f..4c0416547d2 100644
--- a/spec/ruby/core/env/slice_spec.rb
+++ b/spec/ruby/core/env/slice_spec.rb
@@ -32,6 +32,6 @@
   end
 
   it "raises TypeError if any argument is not a String and does not respond to #to_str" do
-    -> { ENV.slice(Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.slice(Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 end
diff --git a/spec/ruby/core/env/to_h_spec.rb b/spec/ruby/core/env/to_h_spec.rb
index 58ea2d2030e..7e0fef21205 100644
--- a/spec/ruby/core/env/to_h_spec.rb
+++ b/spec/ruby/core/env/to_h_spec.rb
@@ -38,17 +38,17 @@
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         ENV.to_h { |k, v| [k, v.upcase, 1] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
 
       -> do
         ENV.to_h { |k, v| [k] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
     end
 
     it "raises TypeError if block returns something other than Array" do
       -> do
         ENV.to_h { |k, v| "not-array" }
-      end.should raise_error(TypeError, /wrong element type String/)
+      end.should.raise(TypeError, /wrong element type String/)
     end
 
     it "coerces returned pair to Array with #to_ary" do
@@ -64,7 +64,7 @@
 
       -> do
         ENV.to_h { |k| x }
-      end.should raise_error(TypeError, /wrong element type MockObject/)
+      end.should.raise(TypeError, /wrong element type MockObject/)
     end
   end
 end
diff --git a/spec/ruby/core/env/values_at_spec.rb b/spec/ruby/core/env/values_at_spec.rb
index 338680e8208..4a733f4ed51 100644
--- a/spec/ruby/core/env/values_at_spec.rb
+++ b/spec/ruby/core/env/values_at_spec.rb
@@ -33,6 +33,6 @@
   end
 
   it "raises TypeError when a key is not coercible to String" do
-    -> { ENV.values_at("foo", Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.values_at("foo", Object.new) }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 end
diff --git a/spec/ruby/core/exception/backtrace_locations_spec.rb b/spec/ruby/core/exception/backtrace_locations_spec.rb
index 86eb9d3413d..62eab8a0f31 100644
--- a/spec/ruby/core/exception/backtrace_locations_spec.rb
+++ b/spec/ruby/core/exception/backtrace_locations_spec.rb
@@ -7,15 +7,15 @@
   end
 
   it "returns nil if no backtrace was set" do
-    Exception.new.backtrace_locations.should be_nil
+    Exception.new.backtrace_locations.should == nil
   end
 
   it "returns an Array" do
-    @backtrace.should be_an_instance_of(Array)
+    @backtrace.should.instance_of?(Array)
   end
 
   it "sets each element to a Thread::Backtrace::Location" do
-    @backtrace.each {|l| l.should be_an_instance_of(Thread::Backtrace::Location)}
+    @backtrace.each {|l| l.should.instance_of?(Thread::Backtrace::Location)}
   end
 
   it "produces a backtrace for an exception captured using $!" do
diff --git a/spec/ruby/core/exception/backtrace_spec.rb b/spec/ruby/core/exception/backtrace_spec.rb
index 9a65ea3820e..a4a8272030f 100644
--- a/spec/ruby/core/exception/backtrace_spec.rb
+++ b/spec/ruby/core/exception/backtrace_spec.rb
@@ -7,15 +7,15 @@
   end
 
   it "returns nil if no backtrace was set" do
-    Exception.new.backtrace.should be_nil
+    Exception.new.backtrace.should == nil
   end
 
   it "returns an Array" do
-    @backtrace.should be_an_instance_of(Array)
+    @backtrace.should.instance_of?(Array)
   end
 
   it "sets each element to a String" do
-    @backtrace.each {|l| l.should be_an_instance_of(String)}
+    @backtrace.each {|l| l.should.instance_of?(String)}
   end
 
   it "includes the filename of the location where self raised in the first element" do
@@ -94,13 +94,13 @@
       raise
     rescue RuntimeError => err
       bt = err.backtrace
-      err.dup.backtrace.should equal(bt)
+      err.dup.backtrace.should.equal?(bt)
 
       new_bt = ['hi']
       err.set_backtrace new_bt
 
       err.backtrace.should == new_bt
-      err.dup.backtrace.should equal(new_bt)
+      err.dup.backtrace.should.equal?(new_bt)
     end
   end
 end
diff --git a/spec/ruby/core/exception/cause_spec.rb b/spec/ruby/core/exception/cause_spec.rb
index cf4aaeb1880..cfc15bdda38 100644
--- a/spec/ruby/core/exception/cause_spec.rb
+++ b/spec/ruby/core/exception/cause_spec.rb
@@ -4,53 +4,35 @@
   it "returns the active exception when an exception is raised" do
     begin
       raise Exception, "the cause"
-    rescue Exception
-      begin
+    rescue Exception => cause
+      -> {
         raise RuntimeError, "the consequence"
-      rescue RuntimeError => e
-        e.should be_an_instance_of(RuntimeError)
-        e.message.should == "the consequence"
-
-        e.cause.should be_an_instance_of(Exception)
-        e.cause.message.should == "the cause"
-      end
+      }.should.raise(RuntimeError, "the consequence", cause:)
     end
   end
 
   it "is set for user errors caused by internal errors" do
-    -> {
-      begin
-        1 / 0
-      rescue
-        raise "foo"
-      end
-    }.should raise_error(RuntimeError) { |e|
-      e.cause.should be_kind_of(ZeroDivisionError)
-    }
+    begin
+      1 / 0
+    rescue => cause
+      -> { raise "foo" }.should.raise(RuntimeError, cause:)
+    end
   end
 
   it "is set for internal errors caused by user errors" do
     cause = RuntimeError.new "cause"
-    -> {
-      begin
-        raise cause
-      rescue
-        1 / 0
-      end
-    }.should raise_error(ZeroDivisionError) { |e|
-      e.cause.should equal(cause)
-    }
+    begin
+      raise cause
+    rescue
+      -> { 1 / 0 }.should.raise(ZeroDivisionError, cause:)
+    end
   end
 
   it "is not set to the exception itself when it is re-raised" do
-    -> {
-      begin
-        raise RuntimeError
-      rescue RuntimeError => e
-        raise e
-      end
-    }.should raise_error(RuntimeError) { |e|
-      e.cause.should == nil
-    }
+    begin
+      raise RuntimeError
+    rescue RuntimeError => e
+      -> { raise e }.should.raise(RuntimeError, cause: nil)
+    end
   end
 end
diff --git a/spec/ruby/core/exception/dup_spec.rb b/spec/ruby/core/exception/dup_spec.rb
index edd54bfb37a..b53ad79bf30 100644
--- a/spec/ruby/core/exception/dup_spec.rb
+++ b/spec/ruby/core/exception/dup_spec.rb
@@ -20,7 +20,7 @@
   it "does not copy singleton methods" do
     def @obj.special() :the_one end
     dup = @obj.dup
-    -> { dup.special }.should raise_error(NameError)
+    -> { dup.special }.should.raise(NameError)
   end
 
   it "does not copy modules included in the singleton class" do
@@ -29,7 +29,7 @@ class << @obj
     end
 
     dup = @obj.dup
-    -> { dup.repr }.should raise_error(NameError)
+    -> { dup.repr }.should.raise(NameError)
   end
 
   it "does not copy constants defined in the singleton class" do
@@ -38,7 +38,7 @@ class << @obj
     end
 
     dup = @obj.dup
-    -> { class << dup; CLONE; end }.should raise_error(NameError)
+    -> { class << dup; CLONE; end }.should.raise(NameError)
   end
 
   it "does copy the message" do
@@ -61,13 +61,13 @@ class << @obj
 
   it "does copy the cause" do
     begin
-      raise StandardError, "the cause"
+      raise StandardError
     rescue StandardError => cause
       begin
-        raise RuntimeError, "the consequence"
+        raise RuntimeError
       rescue RuntimeError => e
-        e.cause.should equal(cause)
-        e.dup.cause.should equal(cause)
+        e.cause.should.equal?(cause)
+        e.dup.cause.should.equal?(cause)
       end
     end
   end
diff --git a/spec/ruby/core/exception/equal_value_spec.rb b/spec/ruby/core/exception/equal_value_spec.rb
index e8f3ce0f8d7..b76b3bcd4a1 100644
--- a/spec/ruby/core/exception/equal_value_spec.rb
+++ b/spec/ruby/core/exception/equal_value_spec.rb
@@ -31,10 +31,10 @@
   it "returns false if the two exceptions inherit from Exception but have different classes" do
     one = RuntimeError.new("message")
     one.set_backtrace [__dir__]
-    one.should be_kind_of(Exception)
+    one.should.is_a?(Exception)
     two = TypeError.new("message")
     two.set_backtrace [__dir__]
-    two.should be_kind_of(Exception)
+    two.should.is_a?(Exception)
     one.should_not == two
   end
 
diff --git a/spec/ruby/core/exception/errno_spec.rb b/spec/ruby/core/exception/errno_spec.rb
index 1ab42777004..36beae99762 100644
--- a/spec/ruby/core/exception/errno_spec.rb
+++ b/spec/ruby/core/exception/errno_spec.rb
@@ -4,21 +4,21 @@
 describe "Errno::EINVAL.new" do
   it "can be called with no arguments" do
     exc = Errno::EINVAL.new
-    exc.should be_an_instance_of(Errno::EINVAL)
+    exc.should.instance_of?(Errno::EINVAL)
     exc.errno.should == Errno::EINVAL::Errno
     exc.message.should == "Invalid argument"
   end
 
   it "accepts an optional custom message" do
     exc = Errno::EINVAL.new('custom message')
-    exc.should be_an_instance_of(Errno::EINVAL)
+    exc.should.instance_of?(Errno::EINVAL)
     exc.errno.should == Errno::EINVAL::Errno
     exc.message.should == "Invalid argument - custom message"
   end
 
   it "accepts an optional custom message and location" do
     exc = Errno::EINVAL.new('custom message', 'location')
-    exc.should be_an_instance_of(Errno::EINVAL)
+    exc.should.instance_of?(Errno::EINVAL)
     exc.errno.should == Errno::EINVAL::Errno
     exc.message.should == "Invalid argument @ location - custom message"
   end
@@ -28,7 +28,7 @@
   it "can be subclassed" do
     ExceptionSpecs::EMFILESub = Class.new(Errno::EMFILE)
     exc = ExceptionSpecs::EMFILESub.new
-    exc.should be_an_instance_of(ExceptionSpecs::EMFILESub)
+    exc.should.instance_of?(ExceptionSpecs::EMFILESub)
   ensure
     ExceptionSpecs.send(:remove_const, :EMFILESub)
   end
@@ -47,7 +47,7 @@
 
 describe "Errno::ENOTSUP" do
   it "is defined" do
-    Errno.should have_constant(:ENOTSUP)
+    Errno.should.const_defined?(:ENOTSUP, false)
   end
 
   it "is the same class as Errno::EOPNOTSUPP if they represent the same errno value" do
diff --git a/spec/ruby/core/exception/exception_spec.rb b/spec/ruby/core/exception/exception_spec.rb
index d6f5283bd9e..f5424cdabdf 100644
--- a/spec/ruby/core/exception/exception_spec.rb
+++ b/spec/ruby/core/exception/exception_spec.rb
@@ -20,7 +20,7 @@
   it "returns an exception of the same class as self with the message given as argument" do
     e = RuntimeError.new
     e2 = e.exception("message")
-    e2.should be_an_instance_of(RuntimeError)
+    e2.should.instance_of?(RuntimeError)
     e2.message.should == "message"
   end
 
@@ -62,7 +62,7 @@ def initialize(val)
   it "returns an exception of the same class as self with the message given as argument, but without reinitializing" do
     e = CustomArgumentError.new(:boom)
     e2 = e.exception("message")
-    e2.should be_an_instance_of(CustomArgumentError)
+    e2.should.instance_of?(CustomArgumentError)
     e2.val.should == :boom
     e2.message.should == "message"
   end
diff --git a/spec/ruby/core/exception/exit_value_spec.rb b/spec/ruby/core/exception/exit_value_spec.rb
index 99987dd1bcb..bb6cff18312 100644
--- a/spec/ruby/core/exception/exit_value_spec.rb
+++ b/spec/ruby/core/exception/exit_value_spec.rb
@@ -6,7 +6,7 @@ def get_me_a_return
   end
 
   it "returns the value given to return" do
-    -> { get_me_a_return.call }.should raise_error(LocalJumpError) { |e|
+    -> { get_me_a_return.call }.should.raise(LocalJumpError) { |e|
       e.exit_value.should == 42
     }
   end
diff --git a/spec/ruby/core/exception/frozen_error_spec.rb b/spec/ruby/core/exception/frozen_error_spec.rb
index af2e9256619..a28f524b540 100644
--- a/spec/ruby/core/exception/frozen_error_spec.rb
+++ b/spec/ruby/core/exception/frozen_error_spec.rb
@@ -3,7 +3,7 @@
 describe "FrozenError.new" do
   it "should take optional receiver argument" do
     o = Object.new
-    FrozenError.new("msg", receiver: o).receiver.should equal(o)
+    FrozenError.new("msg", receiver: o).receiver.should.equal?(o)
   end
 end
 
@@ -13,8 +13,8 @@
     begin
       def o.x; end
     rescue => e
-      e.should be_kind_of(FrozenError)
-      e.receiver.should equal(o)
+      e.should.is_a?(FrozenError)
+      e.receiver.should.equal?(o)
     else
       raise
     end
@@ -30,10 +30,10 @@ def o.x; end
 
     -> {
       def object.x; end
-    }.should raise_error(FrozenError, "can't modify frozen #{msg_class}: #{object}")
+    }.should.raise(FrozenError, "can't modify frozen #{msg_class}: #{object}")
 
     object = [].freeze
-    -> { object << nil }.should raise_error(FrozenError, "can't modify frozen Array: []")
+    -> { object << nil }.should.raise(FrozenError, "can't modify frozen Array: []")
   end
 end
 
@@ -48,7 +48,7 @@ def object.modify; @a = 2 end
 
       # CRuby's message contains multiple whitespaces before '...'.
       # So handle both multiple and single whitespace.
-      -> { object.modify }.should raise_error(FrozenError, /can't modify frozen .*?: \s*.../)
+      -> { object.modify }.should.raise(FrozenError, /can't modify frozen .*?: \s*.../)
     end
   end
 end
diff --git a/spec/ruby/core/exception/full_message_spec.rb b/spec/ruby/core/exception/full_message_spec.rb
index 0761d2b40ce..5a5e0a2b3a0 100644
--- a/spec/ruby/core/exception/full_message_spec.rb
+++ b/spec/ruby/core/exception/full_message_spec.rb
@@ -6,10 +6,10 @@
     e.set_backtrace(["a.rb:1", "b.rb:2"])
 
     full_message = e.full_message
-    full_message.should include "RuntimeError"
-    full_message.should include "Some runtime error"
-    full_message.should include "a.rb:1"
-    full_message.should include "b.rb:2"
+    full_message.should.include? "RuntimeError"
+    full_message.should.include? "Some runtime error"
+    full_message.should.include? "a.rb:1"
+    full_message.should.include? "b.rb:2"
   end
 
   it "supports :highlight option and adds escape sequences to highlight some strings" do
@@ -141,8 +141,8 @@
       exception = e
     end
 
-    exception.full_message.should include "main exception"
-    exception.full_message.should include "the cause"
+    exception.full_message.should.include? "main exception"
+    exception.full_message.should.include? "the cause"
   end
 
   it 'contains all the chain of exceptions' do
@@ -160,9 +160,9 @@
       exception = e
     end
 
-    exception.full_message.should include "last exception"
-    exception.full_message.should include "intermediate exception"
-    exception.full_message.should include "origin exception"
+    exception.full_message.should.include? "last exception"
+    exception.full_message.should.include? "intermediate exception"
+    exception.full_message.should.include? "origin exception"
   end
 
   it "relies on #detailed_message" do
@@ -219,8 +219,8 @@ class << e
     end
 
     full_message = e.full_message
-    full_message.should include "RuntimeError"
-    full_message.should include "Some runtime error"
-    full_message.should include "Some other runtime error"
+    full_message.should.include? "RuntimeError"
+    full_message.should.include? "Some runtime error"
+    full_message.should.include? "Some other runtime error"
   end
 end
diff --git a/spec/ruby/core/exception/io_error_spec.rb b/spec/ruby/core/exception/io_error_spec.rb
index ab8a72518ff..940d5be8761 100644
--- a/spec/ruby/core/exception/io_error_spec.rb
+++ b/spec/ruby/core/exception/io_error_spec.rb
@@ -3,14 +3,14 @@
 describe "IO::EAGAINWaitReadable" do
   it "combines Errno::EAGAIN and IO::WaitReadable" do
     IO::EAGAINWaitReadable.superclass.should == Errno::EAGAIN
-    IO::EAGAINWaitReadable.ancestors.should include IO::WaitReadable
+    IO::EAGAINWaitReadable.ancestors.should.include? IO::WaitReadable
   end
 
   it "is the same as IO::EWOULDBLOCKWaitReadable if Errno::EAGAIN is the same as Errno::EWOULDBLOCK" do
     if Errno::EAGAIN.equal? Errno::EWOULDBLOCK
-      IO::EAGAINWaitReadable.should equal IO::EWOULDBLOCKWaitReadable
+      IO::EAGAINWaitReadable.should.equal? IO::EWOULDBLOCKWaitReadable
     else
-      IO::EAGAINWaitReadable.should_not equal IO::EWOULDBLOCKWaitReadable
+      IO::EAGAINWaitReadable.should_not.equal? IO::EWOULDBLOCKWaitReadable
     end
   end
 end
@@ -18,21 +18,21 @@
 describe "IO::EWOULDBLOCKWaitReadable" do
   it "combines Errno::EWOULDBLOCK and IO::WaitReadable" do
     IO::EWOULDBLOCKWaitReadable.superclass.should == Errno::EWOULDBLOCK
-    IO::EAGAINWaitReadable.ancestors.should include IO::WaitReadable
+    IO::EAGAINWaitReadable.ancestors.should.include? IO::WaitReadable
   end
 end
 
 describe "IO::EAGAINWaitWritable" do
   it "combines Errno::EAGAIN and IO::WaitWritable" do
     IO::EAGAINWaitWritable.superclass.should == Errno::EAGAIN
-    IO::EAGAINWaitWritable.ancestors.should include IO::WaitWritable
+    IO::EAGAINWaitWritable.ancestors.should.include? IO::WaitWritable
   end
 
   it "is the same as IO::EWOULDBLOCKWaitWritable if Errno::EAGAIN is the same as Errno::EWOULDBLOCK" do
     if Errno::EAGAIN.equal? Errno::EWOULDBLOCK
-      IO::EAGAINWaitWritable.should equal IO::EWOULDBLOCKWaitWritable
+      IO::EAGAINWaitWritable.should.equal? IO::EWOULDBLOCKWaitWritable
     else
-      IO::EAGAINWaitWritable.should_not equal IO::EWOULDBLOCKWaitWritable
+      IO::EAGAINWaitWritable.should_not.equal? IO::EWOULDBLOCKWaitWritable
     end
   end
 end
@@ -40,6 +40,6 @@
 describe "IO::EWOULDBLOCKWaitWritable" do
   it "combines Errno::EWOULDBLOCK and IO::WaitWritable" do
     IO::EWOULDBLOCKWaitWritable.superclass.should == Errno::EWOULDBLOCK
-    IO::EAGAINWaitWritable.ancestors.should include IO::WaitWritable
+    IO::EAGAINWaitWritable.ancestors.should.include? IO::WaitWritable
   end
 end
diff --git a/spec/ruby/core/exception/name_spec.rb b/spec/ruby/core/exception/name_spec.rb
index c8a49b40e21..6e0e99d1941 100644
--- a/spec/ruby/core/exception/name_spec.rb
+++ b/spec/ruby/core/exception/name_spec.rb
@@ -4,25 +4,25 @@
   it "returns a method name as a symbol" do
     -> {
       doesnt_exist
-    }.should raise_error(NameError) {|e| e.name.should == :doesnt_exist }
+    }.should.raise(NameError) {|e| e.name.should == :doesnt_exist }
   end
 
   it "returns a constant name as a symbol" do
     -> {
       DoesntExist
-    }.should raise_error(NameError) {|e| e.name.should == :DoesntExist }
+    }.should.raise(NameError) {|e| e.name.should == :DoesntExist }
   end
 
   it "returns a constant name without namespace as a symbol" do
     -> {
       Object::DoesntExist
-    }.should raise_error(NameError) {|e| e.name.should == :DoesntExist }
+    }.should.raise(NameError) {|e| e.name.should == :DoesntExist }
   end
 
   it "returns a class variable name as a symbol" do
     -> {
       eval("class singleton_class::A; @@doesnt_exist end", binding, __FILE__, __LINE__)
-    }.should raise_error(NameError) { |e| e.name.should == :@@doesnt_exist }
+    }.should.raise(NameError) { |e| e.name.should == :@@doesnt_exist }
   end
 
   it "returns the first argument passed to the method when a NameError is raised from #instance_variable_get" do
@@ -30,7 +30,7 @@
 
     -> {
       Object.new.instance_variable_get(invalid_ivar_name)
-    }.should raise_error(NameError) {|e| e.name.should equal(invalid_ivar_name) }
+    }.should.raise(NameError) {|e| e.name.should.equal?(invalid_ivar_name) }
   end
 
   it "returns the first argument passed to the method when a NameError is raised from #class_variable_get" do
@@ -38,6 +38,6 @@
 
     -> {
       Object.class_variable_get(invalid_cvar_name)
-    }.should raise_error(NameError) {|e| e.name.should equal(invalid_cvar_name) }
+    }.should.raise(NameError) {|e| e.name.should.equal?(invalid_cvar_name) }
   end
 end
diff --git a/spec/ruby/core/exception/no_method_error_spec.rb b/spec/ruby/core/exception/no_method_error_spec.rb
index d20878c6e33..9f921040820 100644
--- a/spec/ruby/core/exception/no_method_error_spec.rb
+++ b/spec/ruby/core/exception/no_method_error_spec.rb
@@ -35,7 +35,7 @@
       NoMethodErrorSpecs::NoMethodErrorB.new.foo(1,a)
     rescue Exception => e
       e.args.should == [1,a]
-      e.args[1].should equal a
+      e.args[1].should.equal? a
     end
   end
 end
@@ -45,7 +45,7 @@
     begin
       NoMethodErrorSpecs::NoMethodErrorD.new.foo
     rescue Exception => e
-      e.should be_kind_of(NoMethodError)
+      e.should.is_a?(NoMethodError)
     end
   end
 
@@ -53,7 +53,7 @@
     begin
       NoMethodErrorSpecs::NoMethodErrorC.new.a_protected_method
     rescue Exception => e
-      e.should be_kind_of(NoMethodError)
+      e.should.is_a?(NoMethodError)
     end
   end
 
@@ -61,7 +61,7 @@
     begin
       NoMethodErrorSpecs::NoMethodErrorC.new.a_private_method
     rescue Exception => e
-      e.should be_kind_of(NoMethodError)
+      e.should.is_a?(NoMethodError)
       e.message.lines[0].should =~ /private method [`']a_private_method' called for /
     end
   end
diff --git a/spec/ruby/core/exception/reason_spec.rb b/spec/ruby/core/exception/reason_spec.rb
index 210bbc9725e..d7022768b63 100644
--- a/spec/ruby/core/exception/reason_spec.rb
+++ b/spec/ruby/core/exception/reason_spec.rb
@@ -6,7 +6,7 @@ def get_me_a_return
   end
 
   it "returns 'return' for a return" do
-    -> { get_me_a_return.call }.should raise_error(LocalJumpError) { |e|
+    -> { get_me_a_return.call }.should.raise(LocalJumpError) { |e|
       e.reason.should == :return
     }
   end
diff --git a/spec/ruby/core/exception/receiver_spec.rb b/spec/ruby/core/exception/receiver_spec.rb
index d1c23b67be9..6ecf640ad8e 100644
--- a/spec/ruby/core/exception/receiver_spec.rb
+++ b/spec/ruby/core/exception/receiver_spec.rb
@@ -11,31 +11,31 @@ def call_undefined_class_variable; @@doesnt_exist end
 
     -> {
       receiver.doesnt_exist
-    }.should raise_error(NameError) {|e| e.receiver.should equal(receiver) }
+    }.should.raise(NameError) {|e| e.receiver.should.equal?(receiver) }
   end
 
   it "returns the Object class when an undefined constant is called without namespace" do
     -> {
       DoesntExist
-    }.should raise_error(NameError) {|e| e.receiver.should equal(Object) }
+    }.should.raise(NameError) {|e| e.receiver.should.equal?(Object) }
   end
 
   it "returns a class when an undefined constant is called" do
     -> {
       NameErrorSpecs::ReceiverClass::DoesntExist
-    }.should raise_error(NameError) {|e| e.receiver.should equal(NameErrorSpecs::ReceiverClass) }
+    }.should.raise(NameError) {|e| e.receiver.should.equal?(NameErrorSpecs::ReceiverClass) }
   end
 
   it "returns the Object class when an undefined class variable is called" do
     -> {
       eval("class singleton_class::A; @@doesnt_exist end", binding, __FILE__, __LINE__)
-    }.should raise_error(NameError) {|e| e.receiver.should equal(singleton_class::A) }
+    }.should.raise(NameError) {|e| e.receiver.should.equal?(singleton_class::A) }
   end
 
   it "returns a class when an undefined class variable is called in a subclass' namespace" do
     -> {
       NameErrorSpecs::ReceiverClass.new.call_undefined_class_variable
-    }.should raise_error(NameError) {|e| e.receiver.should equal(NameErrorSpecs::ReceiverClass) }
+    }.should.raise(NameError) {|e| e.receiver.should.equal?(NameErrorSpecs::ReceiverClass) }
   end
 
   it "returns the receiver when raised from #instance_variable_get" do
@@ -43,16 +43,16 @@ def call_undefined_class_variable; @@doesnt_exist end
 
     -> {
       receiver.instance_variable_get("invalid_ivar_name")
-    }.should raise_error(NameError) {|e| e.receiver.should equal(receiver) }
+    }.should.raise(NameError) {|e| e.receiver.should.equal?(receiver) }
   end
 
   it "returns the receiver when raised from #class_variable_get" do
     -> {
       Object.class_variable_get("invalid_cvar_name")
-    }.should raise_error(NameError) {|e| e.receiver.should equal(Object) }
+    }.should.raise(NameError) {|e| e.receiver.should.equal?(Object) }
   end
 
   it "raises an ArgumentError when the receiver is none" do
-    -> { NameError.new.receiver }.should raise_error(ArgumentError)
+    -> { NameError.new.receiver }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/exception/result_spec.rb b/spec/ruby/core/exception/result_spec.rb
index d42fcdffcb9..451ff43af5c 100644
--- a/spec/ruby/core/exception/result_spec.rb
+++ b/spec/ruby/core/exception/result_spec.rb
@@ -14,8 +14,8 @@ def obj.each
   it "returns the method-returned-object from an Enumerator" do
     @enum.next
     @enum.next
-    -> { @enum.next }.should raise_error(StopIteration) { |error|
-      error.result.should equal(:method_returned)
+    -> { @enum.next }.should.raise(StopIteration) { |error|
+      error.result.should.equal?(:method_returned)
     }
   end
 end
diff --git a/spec/ruby/core/exception/shared/new.rb b/spec/ruby/core/exception/shared/new.rb
index bcde8ee4b29..048fd14dd2d 100644
--- a/spec/ruby/core/exception/shared/new.rb
+++ b/spec/ruby/core/exception/shared/new.rb
@@ -1,6 +1,6 @@
 describe :exception_new, shared: true do
   it "creates a new instance of Exception" do
-    Exception.should be_ancestor_of(Exception.send(@method).class)
+    Exception.send(@method).class.ancestors.should.include?(Exception)
   end
 
   it "sets the message of the Exception when passes a message" do
@@ -12,7 +12,7 @@
   end
 
   it "returns the exception when it has a custom constructor" do
-    ExceptionSpecs::ConstructorException.send(@method).should be_kind_of(ExceptionSpecs::ConstructorException)
+    ExceptionSpecs::ConstructorException.send(@method).should.is_a?(ExceptionSpecs::ConstructorException)
   end
 
 end
diff --git a/spec/ruby/core/exception/shared/set_backtrace.rb b/spec/ruby/core/exception/shared/set_backtrace.rb
index c6213b42b48..934bf3dc5f1 100644
--- a/spec/ruby/core/exception/shared/set_backtrace.rb
+++ b/spec/ruby/core/exception/shared/set_backtrace.rb
@@ -43,22 +43,22 @@
 
   it "accepts nil" do
     err = @method.call(nil)
-    err.backtrace.should be_nil
+    err.backtrace.should == nil
   end
 
   it "raises a TypeError when passed a Symbol" do
-    -> { @method.call(:unhappy) }.should raise_error(TypeError)
+    -> { @method.call(:unhappy) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the Array contains a Symbol" do
-    -> { @method.call(["String", :unhappy]) }.should raise_error(TypeError)
+    -> { @method.call(["String", :unhappy]) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the array contains nil" do
-    -> { @method.call(["String", nil]) }.should raise_error(TypeError)
+    -> { @method.call(["String", nil]) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the argument is a nested array" do
-    -> { @method.call(["String", ["String"]]) }.should raise_error(TypeError)
+    -> { @method.call(["String", ["String"]]) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/exception/signal_exception_spec.rb b/spec/ruby/core/exception/signal_exception_spec.rb
index 1a0940743f7..010181bc557 100644
--- a/spec/ruby/core/exception/signal_exception_spec.rb
+++ b/spec/ruby/core/exception/signal_exception_spec.rb
@@ -9,7 +9,7 @@
   end
 
   it "raises an exception with an invalid signal number" do
-    -> { SignalException.new(100000) }.should raise_error(ArgumentError)
+    -> { SignalException.new(100000) }.should.raise(ArgumentError)
   end
 
   it "takes a signal name without SIG prefix as the first argument" do
@@ -27,11 +27,11 @@
   end
 
   it "raises an exception with an invalid signal name" do
-    -> { SignalException.new("NONEXISTENT") }.should raise_error(ArgumentError)
+    -> { SignalException.new("NONEXISTENT") }.should.raise(ArgumentError)
   end
 
   it "raises an exception with an invalid first argument type" do
-    -> { SignalException.new(Object.new) }.should raise_error(ArgumentError)
+    -> { SignalException.new(Object.new) }.should.raise(ArgumentError)
   end
 
   it "takes a signal symbol without SIG prefix as the first argument" do
@@ -49,7 +49,7 @@
   end
 
   it "raises an exception with an invalid signal name" do
-    -> { SignalException.new(:NONEXISTENT) }.should raise_error(ArgumentError)
+    -> { SignalException.new(:NONEXISTENT) }.should.raise(ArgumentError)
   end
 
   it "takes an optional message argument with a signal number" do
@@ -60,7 +60,7 @@
   end
 
   it "raises an exception for an optional argument with a signal name" do
-    -> { SignalException.new("INT","name") }.should raise_error(ArgumentError)
+    -> { SignalException.new("INT","name") }.should.raise(ArgumentError)
   end
 end
 
diff --git a/spec/ruby/core/exception/signm_spec.rb b/spec/ruby/core/exception/signm_spec.rb
index 4adff3b5eea..cabcc7ad584 100644
--- a/spec/ruby/core/exception/signm_spec.rb
+++ b/spec/ruby/core/exception/signm_spec.rb
@@ -2,7 +2,7 @@
 
 describe "SignalException#signm" do
   it "returns the signal name" do
-    -> { Process.kill(:TERM, Process.pid) }.should raise_error(SignalException) { |e|
+    -> { Process.kill(:TERM, Process.pid) }.should.raise(SignalException) { |e|
       e.signm.should == 'SIGTERM'
     }
   end
diff --git a/spec/ruby/core/exception/signo_spec.rb b/spec/ruby/core/exception/signo_spec.rb
index 62fc321516c..46e79a8daf1 100644
--- a/spec/ruby/core/exception/signo_spec.rb
+++ b/spec/ruby/core/exception/signo_spec.rb
@@ -2,7 +2,7 @@
 
 describe "SignalException#signo" do
   it "returns the signal number" do
-    -> { Process.kill(:TERM, Process.pid) }.should raise_error(SignalException) { |e|
+    -> { Process.kill(:TERM, Process.pid) }.should.raise(SignalException) { |e|
       e.signo.should == Signal.list['TERM']
     }
   end
diff --git a/spec/ruby/core/exception/standard_error_spec.rb b/spec/ruby/core/exception/standard_error_spec.rb
index 17e98ce7f02..b05d247f676 100644
--- a/spec/ruby/core/exception/standard_error_spec.rb
+++ b/spec/ruby/core/exception/standard_error_spec.rb
@@ -18,6 +18,6 @@
   end
 
   it "does not rescue superclass of StandardError" do
-    -> { begin; raise Exception; rescue; end }.should raise_error(Exception)
+    -> { begin; raise Exception; rescue; end }.should.raise(Exception)
   end
 end
diff --git a/spec/ruby/core/exception/status_spec.rb b/spec/ruby/core/exception/status_spec.rb
index 8ace00fe100..7369b0815d4 100644
--- a/spec/ruby/core/exception/status_spec.rb
+++ b/spec/ruby/core/exception/status_spec.rb
@@ -2,7 +2,7 @@
 
 describe "SystemExit#status" do
   it "returns the exit status" do
-    -> { exit 42 }.should raise_error(SystemExit) { |e|
+    -> { exit 42 }.should.raise(SystemExit) { |e|
       e.status.should == 42
     }
   end
diff --git a/spec/ruby/core/exception/success_spec.rb b/spec/ruby/core/exception/success_spec.rb
index 6f217433401..5ab8f94454b 100644
--- a/spec/ruby/core/exception/success_spec.rb
+++ b/spec/ruby/core/exception/success_spec.rb
@@ -2,13 +2,13 @@
 
 describe "SystemExit#success?" do
   it "returns true if the process exited successfully" do
-    -> { exit 0 }.should raise_error(SystemExit) { |e|
+    -> { exit 0 }.should.raise(SystemExit) { |e|
       e.should.success?
     }
   end
 
   it "returns false if the process exited unsuccessfully" do
-    -> { exit(-1) }.should raise_error(SystemExit) { |e|
+    -> { exit(-1) }.should.raise(SystemExit) { |e|
       e.should_not.success?
     }
   end
diff --git a/spec/ruby/core/exception/syntax_error_spec.rb b/spec/ruby/core/exception/syntax_error_spec.rb
index 4c713a35077..66eb5649aa4 100644
--- a/spec/ruby/core/exception/syntax_error_spec.rb
+++ b/spec/ruby/core/exception/syntax_error_spec.rb
@@ -6,7 +6,7 @@
 
     -> {
       eval("if true", TOPLEVEL_BINDING, filename)
-    }.should raise_error(SyntaxError) { |e|
+    }.should.raise(SyntaxError) { |e|
       e.path.should == filename
     }
   end
@@ -16,7 +16,7 @@
 
     -> {
       require_relative "fixtures/syntax_error"
-    }.should raise_error(SyntaxError) { |e| e.path.should == expected_path }
+    }.should.raise(SyntaxError) { |e| e.path.should == expected_path }
   end
 
   it "returns nil when constructed directly" do
diff --git a/spec/ruby/core/exception/system_call_error_spec.rb b/spec/ruby/core/exception/system_call_error_spec.rb
index 4fe51901c84..da01c5b6b0f 100644
--- a/spec/ruby/core/exception/system_call_error_spec.rb
+++ b/spec/ruby/core/exception/system_call_error_spec.rb
@@ -14,8 +14,8 @@ def initialize
     end
 
     exc = ExceptionSpecs::SCESub.new
-    ScratchPad.recorded.should equal(:initialize)
-    exc.should be_an_instance_of(ExceptionSpecs::SCESub)
+    ScratchPad.recorded.should.equal?(:initialize)
+    exc.should.instance_of?(ExceptionSpecs::SCESub)
   ensure
     ExceptionSpecs.send(:remove_const, :SCESub)
   end
@@ -31,7 +31,7 @@ def initialize
   end
 
   it "requires at least one argument" do
-    -> { SystemCallError.new }.should raise_error(ArgumentError)
+    -> { SystemCallError.new }.should.raise(ArgumentError)
   end
 
   it "accepts single Integer argument as errno" do
@@ -44,16 +44,16 @@ def initialize
   end
 
   it "constructs a SystemCallError for an unknown error number" do
-    SystemCallError.new(-2**24).should be_an_instance_of(SystemCallError)
-    SystemCallError.new(-1).should be_an_instance_of(SystemCallError)
-    SystemCallError.new(@unknown_errno).should be_an_instance_of(SystemCallError)
-    SystemCallError.new(2**24).should be_an_instance_of(SystemCallError)
+    SystemCallError.new(-2**24).should.instance_of?(SystemCallError)
+    SystemCallError.new(-1).should.instance_of?(SystemCallError)
+    SystemCallError.new(@unknown_errno).should.instance_of?(SystemCallError)
+    SystemCallError.new(2**24).should.instance_of?(SystemCallError)
   end
 
   it "constructs the appropriate Errno class" do
     e = SystemCallError.new(@example_errno)
-    e.should be_kind_of(SystemCallError)
-    e.should be_an_instance_of(@example_errno_class)
+    e.should.is_a?(SystemCallError)
+    e.should.instance_of?(@example_errno_class)
   end
 
   it "sets an error message corresponding to an appropriate Errno class" do
@@ -63,14 +63,14 @@ def initialize
 
   it "accepts an optional custom message preceding the errno" do
     exc = SystemCallError.new("custom message", @example_errno)
-    exc.should be_an_instance_of(@example_errno_class)
+    exc.should.instance_of?(@example_errno_class)
     exc.errno.should == @example_errno
     exc.message.should == 'Invalid argument - custom message'
   end
 
   it "accepts an optional third argument specifying the location" do
     exc = SystemCallError.new("custom message", @example_errno, "location")
-    exc.should be_an_instance_of(@example_errno_class)
+    exc.should.instance_of?(@example_errno_class)
     exc.errno.should == @example_errno
     exc.message.should == 'Invalid argument @ location - custom message'
   end
@@ -90,7 +90,7 @@ def initialize
   end
 
   it "treats nil errno as unknown error value" do
-    SystemCallError.new(nil).should be_an_instance_of(SystemCallError)
+    SystemCallError.new(nil).should.instance_of?(SystemCallError)
   end
 
   it "treats nil custom message as if it is not passed at all" do
@@ -111,15 +111,15 @@ def initialize
   end
 
   it "raises TypeError if message is not a String" do
-    -> { SystemCallError.new(:foo, 1) }.should raise_error(TypeError, /no implicit conversion of Symbol into String/)
+    -> { SystemCallError.new(:foo, 1) }.should.raise(TypeError, /no implicit conversion of Symbol into String/)
   end
 
   it "raises TypeError if errno is not an Integer" do
-    -> { SystemCallError.new('foo', 'bar') }.should raise_error(TypeError, /no implicit conversion of String into Integer/)
+    -> { SystemCallError.new('foo', 'bar') }.should.raise(TypeError, /no implicit conversion of String into Integer/)
   end
 
   it "raises RangeError if errno is a Complex not convertible to Integer" do
-    -> { SystemCallError.new('foo', Complex(2.9, 1)) }.should raise_error(RangeError, /can't convert/)
+    -> { SystemCallError.new('foo', Complex(2.9, 1)) }.should.raise(RangeError, /can't convert/)
   end
 end
 
diff --git a/spec/ruby/core/false/dup_spec.rb b/spec/ruby/core/false/dup_spec.rb
index 1a569a2f4fd..b0eb85529ec 100644
--- a/spec/ruby/core/false/dup_spec.rb
+++ b/spec/ruby/core/false/dup_spec.rb
@@ -2,6 +2,6 @@
 
 describe "FalseClass#dup" do
   it "returns self" do
-    false.dup.should equal(false)
+    false.dup.should.equal?(false)
   end
 end
diff --git a/spec/ruby/core/false/falseclass_spec.rb b/spec/ruby/core/false/falseclass_spec.rb
index c018ef2421e..8dfe5ae891e 100644
--- a/spec/ruby/core/false/falseclass_spec.rb
+++ b/spec/ruby/core/false/falseclass_spec.rb
@@ -4,12 +4,12 @@
   it ".allocate raises a TypeError" do
     -> do
       FalseClass.allocate
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it ".new is undefined" do
     -> do
       FalseClass.new
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/false/singleton_method_spec.rb b/spec/ruby/core/false/singleton_method_spec.rb
index 16dc85d67c6..72aee8609a9 100644
--- a/spec/ruby/core/false/singleton_method_spec.rb
+++ b/spec/ruby/core/false/singleton_method_spec.rb
@@ -2,10 +2,10 @@
 
 describe "FalseClass#singleton_method" do
   it "raises regardless of whether FalseClass defines the method" do
-    -> { false.singleton_method(:foo) }.should raise_error(NameError)
+    -> { false.singleton_method(:foo) }.should.raise(NameError)
     begin
       def (false).foo; end
-      -> { false.singleton_method(:foo) }.should raise_error(NameError)
+      -> { false.singleton_method(:foo) }.should.raise(NameError)
     ensure
       FalseClass.send(:remove_method, :foo)
     end
diff --git a/spec/ruby/core/false/to_s_spec.rb b/spec/ruby/core/false/to_s_spec.rb
index 62f67f6f55c..9e24be26a20 100644
--- a/spec/ruby/core/false/to_s_spec.rb
+++ b/spec/ruby/core/false/to_s_spec.rb
@@ -10,6 +10,6 @@
   end
 
   it "always returns the same string" do
-    false.to_s.should equal(false.to_s)
+    false.to_s.should.equal?(false.to_s)
   end
 end
diff --git a/spec/ruby/core/fiber/alive_spec.rb b/spec/ruby/core/fiber/alive_spec.rb
index a1df5824356..6fb1229d950 100644
--- a/spec/ruby/core/fiber/alive_spec.rb
+++ b/spec/ruby/core/fiber/alive_spec.rb
@@ -3,18 +3,18 @@
 describe "Fiber#alive?" do
   it "returns true for a Fiber that hasn't had #resume called" do
     fiber = Fiber.new { true }
-    fiber.alive?.should be_true
+    fiber.alive?.should == true
   end
 
   # FIXME: Better description?
   it "returns true for a Fiber that's yielded to the caller" do
     fiber = Fiber.new { Fiber.yield }
     fiber.resume
-    fiber.alive?.should be_true
+    fiber.alive?.should == true
   end
 
   it "returns true when called from its Fiber" do
-    fiber = Fiber.new { fiber.alive?.should be_true }
+    fiber = Fiber.new { fiber.alive?.should == true }
     fiber.resume
   end
 
@@ -28,17 +28,17 @@
   it "returns false for a Fiber that's dead" do
     fiber = Fiber.new { true }
     fiber.resume
-    -> { fiber.resume }.should raise_error(FiberError)
-    fiber.alive?.should be_false
+    -> { fiber.resume }.should.raise(FiberError)
+    fiber.alive?.should == false
   end
 
   it "always returns false for a dead Fiber" do
     fiber = Fiber.new { true }
     fiber.resume
-    -> { fiber.resume }.should raise_error(FiberError)
-    fiber.alive?.should be_false
-    -> { fiber.resume }.should raise_error(FiberError)
-    fiber.alive?.should be_false
-    fiber.alive?.should be_false
+    -> { fiber.resume }.should.raise(FiberError)
+    fiber.alive?.should == false
+    -> { fiber.resume }.should.raise(FiberError)
+    fiber.alive?.should == false
+    fiber.alive?.should == false
   end
 end
diff --git a/spec/ruby/core/fiber/current_spec.rb b/spec/ruby/core/fiber/current_spec.rb
index b93df77a899..cc5c9117b62 100644
--- a/spec/ruby/core/fiber/current_spec.rb
+++ b/spec/ruby/core/fiber/current_spec.rb
@@ -3,20 +3,20 @@
 describe "Fiber.current" do
   it "returns the root Fiber when called outside of a Fiber" do
     root = Fiber.current
-    root.should be_an_instance_of(Fiber)
+    root.should.instance_of?(Fiber)
     # We can always transfer to the root Fiber; it will never die
     5.times do
-      root.transfer.should be_nil
-      root.alive?.should be_true
+      root.transfer.should == nil
+      root.alive?.should == true
     end
   end
 
   it "returns the current Fiber when called from a Fiber" do
     fiber = Fiber.new do
       this = Fiber.current
-      this.should be_an_instance_of(Fiber)
+      this.should.instance_of?(Fiber)
       this.should == fiber
-      this.alive?.should be_true
+      this.alive?.should == true
     end
     fiber.resume
   end
@@ -26,9 +26,9 @@
     fiber = Fiber.new do
       states << :fiber
       this = Fiber.current
-      this.should be_an_instance_of(Fiber)
+      this.should.instance_of?(Fiber)
       this.should == fiber
-      this.alive?.should be_true
+      this.alive?.should == true
     end
 
     fiber2 = Fiber.new do
diff --git a/spec/ruby/core/fiber/new_spec.rb b/spec/ruby/core/fiber/new_spec.rb
index b43c1386be9..d31167496d0 100644
--- a/spec/ruby/core/fiber/new_spec.rb
+++ b/spec/ruby/core/fiber/new_spec.rb
@@ -4,7 +4,7 @@
   it "creates a fiber from the given block" do
     fiber = Fiber.new {}
     fiber.resume
-    fiber.should be_an_instance_of(Fiber)
+    fiber.should.instance_of?(Fiber)
   end
 
   it "creates a fiber from a subclass" do
@@ -12,17 +12,17 @@ class MyFiber < Fiber
     end
     fiber = MyFiber.new {}
     fiber.resume
-    fiber.should be_an_instance_of(MyFiber)
+    fiber.should.instance_of?(MyFiber)
   end
 
   it "raises an ArgumentError if called without a block" do
-    -> { Fiber.new }.should raise_error(ArgumentError)
+    -> { Fiber.new }.should.raise(ArgumentError)
   end
 
   it "does not invoke the block" do
     invoked = false
     fiber = Fiber.new { invoked = true }
-    invoked.should be_false
+    invoked.should == false
     fiber.resume
   end
 
diff --git a/spec/ruby/core/fiber/raise_spec.rb b/spec/ruby/core/fiber/raise_spec.rb
index 896f760290a..107e5bd4ce0 100644
--- a/spec/ruby/core/fiber/raise_spec.rb
+++ b/spec/ruby/core/fiber/raise_spec.rb
@@ -3,57 +3,62 @@
 require_relative '../../shared/kernel/raise'
 
 describe "Fiber#raise" do
+  it "is a public method" do
+    Fiber.public_instance_methods.should.include?(:raise)
+  end
+
   it_behaves_like :kernel_raise, :raise, FiberSpecs::NewFiberToRaise
   it_behaves_like :kernel_raise_across_contexts, :raise, FiberSpecs::NewFiberToRaise
-end
+  ruby_version_is "4.0" do
+    it_behaves_like :kernel_raise_with_cause, :raise, FiberSpecs::NewFiberToRaise
+  end
 
-describe "Fiber#raise" do
   it 'raises RuntimeError by default' do
-    -> { FiberSpecs::NewFiberToRaise.raise }.should raise_error(RuntimeError)
+    -> { FiberSpecs::NewFiberToRaise.raise }.should.raise(RuntimeError)
   end
 
   it "raises FiberError if Fiber is not born" do
     fiber = Fiber.new { true }
-    -> { fiber.raise }.should raise_error(FiberError, "cannot raise exception on unborn fiber")
+    -> { fiber.raise }.should.raise(FiberError, "cannot raise exception on unborn fiber")
   end
 
   it "raises FiberError if Fiber is dead" do
     fiber = Fiber.new { true }
     fiber.resume
-    -> { fiber.raise }.should raise_error(FiberError, /dead fiber called|attempt to resume a terminated fiber/)
+    -> { fiber.raise }.should.raise(FiberError, /dead fiber called|attempt to resume a terminated fiber/)
   end
 
   it 'accepts error class' do
-    -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError }.should raise_error(FiberSpecs::CustomError)
+    -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError }.should.raise(FiberSpecs::CustomError)
   end
 
   it 'accepts error message' do
-    -> { FiberSpecs::NewFiberToRaise.raise "error message" }.should raise_error(RuntimeError, "error message")
+    -> { FiberSpecs::NewFiberToRaise.raise "error message" }.should.raise(RuntimeError, "error message")
   end
 
   it 'does not accept array of backtrace information only' do
-    -> { FiberSpecs::NewFiberToRaise.raise ['foo'] }.should raise_error(TypeError)
+    -> { FiberSpecs::NewFiberToRaise.raise ['foo'] }.should.raise(TypeError)
   end
 
   it 'does not accept integer' do
-    -> { FiberSpecs::NewFiberToRaise.raise 100 }.should raise_error(TypeError)
+    -> { FiberSpecs::NewFiberToRaise.raise 100 }.should.raise(TypeError)
   end
 
   it 'accepts error class with error message' do
-    -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error' }.should raise_error(FiberSpecs::CustomError, 'test error')
+    -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error' }.should.raise(FiberSpecs::CustomError, 'test error')
   end
 
   it 'accepts error class with error message and backtrace information' do
     -> {
       FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error', ['foo', 'boo']
-    }.should raise_error(FiberSpecs::CustomError) { |e|
+    }.should.raise(FiberSpecs::CustomError) { |e|
       e.message.should == 'test error'
       e.backtrace.should == ['foo', 'boo']
     }
   end
 
   it 'does not accept only error message and backtrace information' do
-    -> { FiberSpecs::NewFiberToRaise.raise 'test error', ['foo', 'boo'] }.should raise_error(TypeError)
+    -> { FiberSpecs::NewFiberToRaise.raise 'test error', ['foo', 'boo'] }.should.raise(TypeError)
   end
 
   it "raises a FiberError if invoked from a different Thread" do
@@ -62,15 +67,15 @@
     Thread.new do
       -> {
         fiber.raise
-      }.should raise_error(FiberError, "fiber called across threads")
+      }.should.raise(FiberError, "fiber called across threads")
     end.join
   end
 
   it "kills Fiber" do
     fiber = Fiber.new { Fiber.yield :first; :second }
     fiber.resume
-    -> { fiber.raise }.should raise_error
-    -> { fiber.resume }.should raise_error(FiberError, /dead fiber called|attempt to resume a terminated fiber/)
+    -> { fiber.raise }.should.raise
+    -> { fiber.resume }.should.raise(FiberError, /dead fiber called|attempt to resume a terminated fiber/)
   end
 
   it "returns to calling fiber after raise" do
@@ -102,13 +107,13 @@
 
       -> do
         f2.raise(RuntimeError, "Expected error")
-      end.should raise_error(RuntimeError, "Expected error")
+      end.should.raise(RuntimeError, "Expected error")
     end
 
     it "raises on itself" do
       -> do
         Fiber.current.raise(RuntimeError, "Expected error")
-      end.should raise_error(RuntimeError, "Expected error")
+      end.should.raise(RuntimeError, "Expected error")
     end
 
     it "should raise on parent fiber" do
@@ -123,17 +128,14 @@
 
       -> do
         f2.resume
-      end.should raise_error(RuntimeError, "Expected error")
+      end.should.raise(RuntimeError, "Expected error")
     end
   end
-end
 
-
-describe "Fiber#raise" do
   it "transfers and raises on a transferring fiber" do
     root = Fiber.current
     fiber = Fiber.new { root.transfer }
     fiber.transfer
-    -> { fiber.raise "msg" }.should raise_error(RuntimeError, "msg")
+    -> { fiber.raise "msg" }.should.raise(RuntimeError, "msg")
   end
 end
diff --git a/spec/ruby/core/fiber/resume_spec.rb b/spec/ruby/core/fiber/resume_spec.rb
index 4b20f4b4bfb..e183cc10d99 100644
--- a/spec/ruby/core/fiber/resume_spec.rb
+++ b/spec/ruby/core/fiber/resume_spec.rb
@@ -30,7 +30,7 @@
 
   it "raises a FiberError if the Fiber tries to resume itself" do
     fiber = Fiber.new { fiber.resume }
-    -> { fiber.resume }.should raise_error(FiberError, /current fiber/)
+    -> { fiber.resume }.should.raise(FiberError, /current fiber/)
   end
 
   it "returns control to the calling Fiber if called from one" do
@@ -78,6 +78,6 @@
   it "raises a FiberError if the Fiber attempts to resume a resuming fiber" do
     root_fiber = Fiber.current
     fiber1 = Fiber.new { root_fiber.resume }
-    -> { fiber1.resume }.should raise_error(FiberError, /attempt to resume a resuming fiber/)
+    -> { fiber1.resume }.should.raise(FiberError, /attempt to resume a resuming fiber/)
   end
 end
diff --git a/spec/ruby/core/fiber/shared/resume.rb b/spec/ruby/core/fiber/shared/resume.rb
index 5ee27d1d24f..ff4bb72c73c 100644
--- a/spec/ruby/core/fiber/shared/resume.rb
+++ b/spec/ruby/core/fiber/shared/resume.rb
@@ -9,7 +9,7 @@
     Thread.new do
       -> {
         fiber.send(@method)
-      }.should raise_error(FiberError)
+      }.should.raise(FiberError)
     end.join
 
     # Check the Fiber can still be used
@@ -20,12 +20,12 @@
     invoked = false
     fiber = Fiber.new { invoked = true }
     fiber.send(@method)
-    invoked.should be_true
+    invoked.should == true
   end
 
   it "returns the last value encountered on first invocation" do
     fiber = Fiber.new { 1+1; true }
-    fiber.send(@method).should be_true
+    fiber.send(@method).should == true
   end
 
   it "runs until the end of the block" do
@@ -37,22 +37,22 @@
 
   it "accepts any number of arguments" do
     fiber = Fiber.new { |a| }
-    -> { fiber.send(@method, *(1..10).to_a) }.should_not raise_error
+    -> { fiber.send(@method, *(1..10).to_a) }.should_not.raise
   end
 
   it "raises a FiberError if the Fiber is dead" do
     fiber = Fiber.new { true }
     fiber.send(@method)
-    -> { fiber.send(@method) }.should raise_error(FiberError)
+    -> { fiber.send(@method) }.should.raise(FiberError)
   end
 
   it "raises a LocalJumpError if the block includes a return statement" do
     fiber = Fiber.new { return; }
-    -> { fiber.send(@method) }.should raise_error(LocalJumpError)
+    -> { fiber.send(@method) }.should.raise(LocalJumpError)
   end
 
   it "raises a LocalJumpError if the block includes a break statement" do
     fiber = Fiber.new { break; }
-    -> { fiber.send(@method) }.should raise_error(LocalJumpError)
+    -> { fiber.send(@method) }.should.raise(LocalJumpError)
   end
 end
diff --git a/spec/ruby/core/fiber/shared/scheduler.rb b/spec/ruby/core/fiber/shared/scheduler.rb
index 19bfb75e3e1..04bdded53a0 100644
--- a/spec/ruby/core/fiber/shared/scheduler.rb
+++ b/spec/ruby/core/fiber/shared/scheduler.rb
@@ -8,7 +8,7 @@
       end
       -> {
         suppress_warning { Fiber.set_scheduler(scheduler) }
-      }.should raise_error(ArgumentError, /Scheduler must implement ##{missing_method}/)
+      }.should.raise(ArgumentError, /Scheduler must implement ##{missing_method}/)
     end
   end
 
@@ -40,12 +40,12 @@
     end
     suppress_warning { Fiber.set_scheduler(scheduler) }
     Fiber.set_scheduler(nil)
-    Fiber.scheduler.should be_nil
+    Fiber.scheduler.should == nil
   end
 
   it "can assign a nil scheduler multiple times" do
     Fiber.set_scheduler(nil)
     Fiber.set_scheduler(nil)
-    Fiber.scheduler.should be_nil
+    Fiber.scheduler.should == nil
   end
 end
diff --git a/spec/ruby/core/fiber/storage_spec.rb b/spec/ruby/core/fiber/storage_spec.rb
index 6ffc13ee283..a3f6bf9cad0 100644
--- a/spec/ruby/core/fiber/storage_spec.rb
+++ b/spec/ruby/core/fiber/storage_spec.rb
@@ -19,15 +19,15 @@
   end
 
   it "cannot create a fiber with non-hash storage" do
-    -> { Fiber.new(storage: 42) {} }.should raise_error(TypeError)
+    -> { Fiber.new(storage: 42) {} }.should.raise(TypeError)
   end
 
   it "cannot create a fiber with a frozen hash as storage" do
-    -> { Fiber.new(storage: {life: 43}.freeze) {} }.should raise_error(FrozenError)
+    -> { Fiber.new(storage: {life: 43}.freeze) {} }.should.raise(FrozenError)
   end
 
   it "cannot create a fiber with a storage hash with non-symbol keys" do
-    -> { Fiber.new(storage: {life: 43, Object.new => 44}) {} }.should raise_error(TypeError)
+    -> { Fiber.new(storage: {life: 43, Object.new => 44}) {} }.should.raise(TypeError)
   end
 end
 
@@ -36,7 +36,7 @@
     f = Fiber.new(storage: {life: 42}) { nil }
     -> {
       f.storage
-    }.should raise_error(ArgumentError, /Fiber storage can only be accessed from the Fiber it belongs to/)
+    }.should.raise(ArgumentError, /Fiber storage can only be accessed from the Fiber it belongs to/)
   end
 end
 
@@ -59,15 +59,15 @@
   end
 
   it "can't set the storage of the fiber to non-hash" do
-    -> { Fiber.current.storage = 42 }.should raise_error(TypeError)
+    -> { Fiber.current.storage = 42 }.should.raise(TypeError)
   end
 
   it "can't set the storage of the fiber to a frozen hash" do
-    -> { Fiber.current.storage = {life: 43}.freeze }.should raise_error(FrozenError)
+    -> { Fiber.current.storage = {life: 43}.freeze }.should.raise(FrozenError)
   end
 
   it "can't set the storage of the fiber to a hash with non-symbol keys" do
-    -> { Fiber.current.storage = {life: 43, Object.new => 44} }.should raise_error(TypeError)
+    -> { Fiber.current.storage = {life: 43, Object.new => 44} }.should.raise(TypeError)
   end
 end
 
@@ -77,24 +77,22 @@
   end
 
   it "returns nil if the key is not present in the storage of the current fiber" do
-    Fiber.new(storage: {life: 42}) { Fiber[:death] }.resume.should be_nil
+    Fiber.new(storage: {life: 42}) { Fiber[:death] }.resume.should == nil
   end
 
   it "returns nil if the current fiber has no storage" do
-    Fiber.new { Fiber[:life] }.resume.should be_nil
+    Fiber.new { Fiber[:life] }.resume.should == nil
   end
 
-  ruby_version_is "3.2.3" do
-    it "can use dynamically defined keys" do
-      key = :"#{self.class.name}#.#{self.object_id}"
-      Fiber.new { Fiber[key] = 42; Fiber[key] }.resume.should == 42
-    end
+  it "can use dynamically defined keys" do
+    key = :"#{self.class.name}#.#{self.object_id}"
+    Fiber.new { Fiber[key] = 42; Fiber[key] }.resume.should == 42
+  end
 
-    it "can't use invalid keys" do
-      invalid_keys = [Object.new, 12]
-      invalid_keys.each do |key|
-        -> { Fiber[key] }.should raise_error(TypeError)
-      end
+  it "can't use invalid keys" do
+    invalid_keys = [Object.new, 12]
+    invalid_keys.each do |key|
+      -> { Fiber[key] }.should.raise(TypeError)
     end
   end
 
@@ -120,7 +118,7 @@ def key.to_str; "Foo"; end
   it "does not call #to_sym on the key" do
     key = mock("key")
     key.should_not_receive(:to_sym)
-    -> { Fiber[key] }.should raise_error(TypeError)
+    -> { Fiber[key] }.should.raise(TypeError)
   end
 
   it "can access the storage of the parent fiber" do
@@ -131,7 +129,7 @@ def key.to_str; "Foo"; end
   end
 
   it "can't access the storage of the fiber with non-symbol keys" do
-    -> { Fiber[Object.new] }.should raise_error(TypeError)
+    -> { Fiber[Object.new] }.should.raise(TypeError)
   end
 end
 
@@ -158,7 +156,7 @@ def key.to_str; "Foo"; end
   end
 
   it "can't access the storage of the fiber with non-symbol keys" do
-    -> { Fiber[Object.new] = 44 }.should raise_error(TypeError)
+    -> { Fiber[Object.new] = 44 }.should.raise(TypeError)
   end
 
   it "deletes the fiber storage key when assigning nil" do
diff --git a/spec/ruby/core/fiber/transfer_spec.rb b/spec/ruby/core/fiber/transfer_spec.rb
index 238721475dd..d8737aeeb3b 100644
--- a/spec/ruby/core/fiber/transfer_spec.rb
+++ b/spec/ruby/core/fiber/transfer_spec.rb
@@ -37,12 +37,12 @@
     fiber1 = Fiber.new { states << :fiber1 }
     fiber2 = Fiber.new { states << :fiber2_start; Fiber.yield fiber1.transfer; states << :fiber2_end}
     fiber2.resume.should == [:fiber2_start, :fiber1]
-    -> { fiber2.transfer }.should raise_error(FiberError)
+    -> { fiber2.transfer }.should.raise(FiberError)
   end
 
   it "raises a FiberError when transferring to a Fiber which resumes itself" do
     fiber = Fiber.new { fiber.resume }
-    -> { fiber.transfer }.should raise_error(FiberError)
+    -> { fiber.transfer }.should.raise(FiberError)
   end
 
   it "works if Fibers in different Threads each transfer to a Fiber in the same Thread" do
@@ -58,7 +58,7 @@
         end
         io_fiber.transfer(Fiber.current)
         value = Object.new
-        io_fiber.transfer(value).should equal value
+        io_fiber.transfer(value).should.equal? value
       end.join
     end
   end
diff --git a/spec/ruby/core/fiber/yield_spec.rb b/spec/ruby/core/fiber/yield_spec.rb
index b010912c872..12ec6ebcef7 100644
--- a/spec/ruby/core/fiber/yield_spec.rb
+++ b/spec/ruby/core/fiber/yield_spec.rb
@@ -18,7 +18,7 @@
 
   it "returns nil to the caller if given no arguments" do
     fiber = Fiber.new { true; Fiber.yield; true }
-    fiber.resume.should be_nil
+    fiber.resume.should == nil
     fiber.resume
   end
 
@@ -44,6 +44,6 @@
   end
 
   it "raises a FiberError if called from the root Fiber" do
-    ->{ Fiber.yield }.should raise_error(FiberError)
+    ->{ Fiber.yield }.should.raise(FiberError)
   end
 end
diff --git a/spec/ruby/core/file/absolute_path_spec.rb b/spec/ruby/core/file/absolute_path_spec.rb
index 315eead34fe..fc12985a75b 100644
--- a/spec/ruby/core/file/absolute_path_spec.rb
+++ b/spec/ruby/core/file/absolute_path_spec.rb
@@ -6,47 +6,47 @@
   end
 
   it "returns true if it's an absolute pathname" do
-    File.absolute_path?(@abs).should be_true
+    File.absolute_path?(@abs).should == true
   end
 
   it "returns false if it's a relative path" do
-    File.absolute_path?(File.basename(__FILE__)).should be_false
+    File.absolute_path?(File.basename(__FILE__)).should == false
   end
 
   it "returns false if it's a tricky relative path" do
-    File.absolute_path?("C:foo\\bar").should be_false
+    File.absolute_path?("C:foo\\bar").should == false
   end
 
   it "does not expand '~' to a home directory." do
-    File.absolute_path?('~').should be_false
+    File.absolute_path?('~').should == false
   end
 
   it "does not expand '~user' to a home directory." do
     path = File.dirname(@abs)
     Dir.chdir(path) do
-      File.absolute_path?('~user').should be_false
+      File.absolute_path?('~user').should == false
     end
   end
 
   it "calls #to_path on its argument" do
     mock = mock_to_path(File.expand_path(__FILE__))
 
-    File.absolute_path?(mock).should be_true
+    File.absolute_path?(mock).should == true
   end
 
   platform_is_not :windows do
     it "takes into consideration the platform's root" do
-      File.absolute_path?("C:\\foo\\bar").should be_false
-      File.absolute_path?("C:/foo/bar").should be_false
-      File.absolute_path?("/foo/bar\\baz").should be_true
+      File.absolute_path?("C:\\foo\\bar").should == false
+      File.absolute_path?("C:/foo/bar").should == false
+      File.absolute_path?("/foo/bar\\baz").should == true
     end
   end
 
   platform_is :windows do
     it "takes into consideration the platform path separator(s)" do
-      File.absolute_path?("C:\\foo\\bar").should be_true
-      File.absolute_path?("C:/foo/bar").should be_true
-      File.absolute_path?("/foo/bar\\baz").should be_false
+      File.absolute_path?("C:\\foo\\bar").should == true
+      File.absolute_path?("C:/foo/bar").should == true
+      File.absolute_path?("/foo/bar\\baz").should == false
     end
   end
 end
diff --git a/spec/ruby/core/file/atime_spec.rb b/spec/ruby/core/file/atime_spec.rb
index e47e70e5acf..5c6c110eec4 100644
--- a/spec/ruby/core/file/atime_spec.rb
+++ b/spec/ruby/core/file/atime_spec.rb
@@ -12,7 +12,7 @@
 
   it "returns the last access time for the named file as a Time object" do
     File.atime(@file)
-    File.atime(@file).should be_kind_of(Time)
+    File.atime(@file).should.is_a?(Time)
   end
 
   platform_is :linux, :windows do
@@ -35,7 +35,7 @@
   end
 
   it "raises an Errno::ENOENT exception if the file is not found" do
-    -> { File.atime('a_fake_file') }.should raise_error(Errno::ENOENT)
+    -> { File.atime('a_fake_file') }.should.raise(Errno::ENOENT)
   end
 
   it "accepts an object that has a #to_path method" do
@@ -55,6 +55,6 @@
 
   it "returns the last access time to self" do
     @file.atime
-    @file.atime.should be_kind_of(Time)
+    @file.atime.should.is_a?(Time)
   end
 end
diff --git a/spec/ruby/core/file/basename_spec.rb b/spec/ruby/core/file/basename_spec.rb
index 66a5b56ed9a..77afe5c22fb 100644
--- a/spec/ruby/core/file/basename_spec.rb
+++ b/spec/ruby/core/file/basename_spec.rb
@@ -42,7 +42,7 @@
   end
 
   it "returns an string" do
-    File.basename("foo").should be_kind_of(String)
+    File.basename("foo").should.is_a?(String)
   end
 
   it "returns the basename for unix format" do
@@ -105,10 +105,10 @@
   end
 
   it "raises a TypeError if the arguments are not String types" do
-    -> { File.basename(nil)          }.should raise_error(TypeError)
-    -> { File.basename(1)            }.should raise_error(TypeError)
-    -> { File.basename("bar.txt", 1) }.should raise_error(TypeError)
-    -> { File.basename(true)         }.should raise_error(TypeError)
+    -> { File.basename(nil)          }.should.raise(TypeError)
+    -> { File.basename(1)            }.should.raise(TypeError)
+    -> { File.basename("bar.txt", 1) }.should.raise(TypeError)
+    -> { File.basename(true)         }.should.raise(TypeError)
   end
 
   it "accepts an object that has a #to_path method" do
@@ -116,7 +116,7 @@
   end
 
   it "raises an ArgumentError if passed more than two arguments" do
-    -> { File.basename('bar.txt', '.txt', '.txt') }.should raise_error(ArgumentError)
+    -> { File.basename('bar.txt', '.txt', '.txt') }.should.raise(ArgumentError)
   end
 
   # specific to MS Windows
@@ -155,7 +155,7 @@
     it "handles Shift JIS 0x5C (\\) as second byte of a multi-byte sequence" do
       # dir\fileソname.txt
       path = "dir\\file\x83\x5cname.txt".b.force_encoding(Encoding::SHIFT_JIS)
-      path.valid_encoding?.should be_true
+      path.valid_encoding?.should == true
       File.basename(path).should == "file\x83\x5cname.txt".b.force_encoding(Encoding::SHIFT_JIS)
     end
   end
@@ -166,7 +166,7 @@
 
       -> {
         File.basename(path)
-      }.should raise_error(Encoding::CompatibilityError)
+      }.should.raise(Encoding::CompatibilityError)
     end
   end
 
@@ -196,7 +196,7 @@
                  else
                    File.basename(original)
                  end
-        result.should_not equal(original)
+        result.should_not.equal?(original)
         result.frozen?.should == false
       end
     end
diff --git a/spec/ruby/core/file/birthtime_spec.rb b/spec/ruby/core/file/birthtime_spec.rb
index f82eaf7ccaf..039fd7572c2 100644
--- a/spec/ruby/core/file/birthtime_spec.rb
+++ b/spec/ruby/core/file/birthtime_spec.rb
@@ -17,7 +17,7 @@
 
     it "returns the birth time for the named file as a Time object" do
       File.birthtime(@file)
-      File.birthtime(@file).should be_kind_of(Time)
+      File.birthtime(@file).should.is_a?(Time)
     rescue NotImplementedError => e
       e.message.should.start_with?(*not_implemented_messages)
     end
@@ -30,7 +30,7 @@
     end
 
     it "raises an Errno::ENOENT exception if the file is not found" do
-      -> { File.birthtime('bogus') }.should raise_error(Errno::ENOENT)
+      -> { File.birthtime('bogus') }.should.raise(Errno::ENOENT)
     rescue NotImplementedError => e
       e.message.should.start_with?(*not_implemented_messages)
     end
@@ -48,7 +48,7 @@
 
     it "returns the birth time for self" do
       @file.birthtime
-      @file.birthtime.should be_kind_of(Time)
+      @file.birthtime.should.is_a?(Time)
     rescue NotImplementedError => e
       e.message.should.start_with?(*not_implemented_messages)
     end
diff --git a/spec/ruby/core/file/chmod_spec.rb b/spec/ruby/core/file/chmod_spec.rb
index 5ca15c97486..e0fd10ceb1e 100644
--- a/spec/ruby/core/file/chmod_spec.rb
+++ b/spec/ruby/core/file/chmod_spec.rb
@@ -16,8 +16,8 @@
   end
 
   it "raises RangeError with too large values" do
-    -> { @file.chmod(2**64) }.should raise_error(RangeError)
-    -> { @file.chmod(-2**63 - 1) }.should raise_error(RangeError)
+    -> { @file.chmod(2**64) }.should.raise(RangeError)
+    -> { @file.chmod(-2**63 - 1) }.should.raise(RangeError)
   end
 
   it "invokes to_int on non-integer argument" do
@@ -97,8 +97,8 @@
   end
 
   it "raises RangeError with too large values" do
-    -> { File.chmod(2**64, @file) }.should raise_error(RangeError)
-    -> { File.chmod(-2**63 - 1, @file) }.should raise_error(RangeError)
+    -> { File.chmod(2**64, @file) }.should.raise(RangeError)
+    -> { File.chmod(-2**63 - 1, @file) }.should.raise(RangeError)
   end
 
   it "accepts an object that has a #to_path method" do
@@ -106,13 +106,13 @@
   end
 
   it "throws a TypeError if the given path is not coercible into a string" do
-    -> { File.chmod(0, []) }.should raise_error(TypeError)
+    -> { File.chmod(0, []) }.should.raise(TypeError)
   end
 
   it "raises an error for a non existent path" do
     -> {
       File.chmod(0644, "#{@file}.not.existing")
-    }.should raise_error(Errno::ENOENT)
+    }.should.raise(Errno::ENOENT)
   end
 
   it "invokes to_int on non-integer argument" do
diff --git a/spec/ruby/core/file/chown_spec.rb b/spec/ruby/core/file/chown_spec.rb
index 4db0e3712c2..3353aafc700 100644
--- a/spec/ruby/core/file/chown_spec.rb
+++ b/spec/ruby/core/file/chown_spec.rb
@@ -68,7 +68,7 @@
     it "raises an error for a non existent path" do
       -> {
         File.chown(nil, nil, "#{@fname}_not_existing")
-      }.should raise_error(Errno::ENOENT)
+      }.should.raise(Errno::ENOENT)
     end
   end
 
diff --git a/spec/ruby/core/file/constants/constants_spec.rb b/spec/ruby/core/file/constants/constants_spec.rb
index bba248c21e2..9d9c1c3b250 100644
--- a/spec/ruby/core/file/constants/constants_spec.rb
+++ b/spec/ruby/core/file/constants/constants_spec.rb
@@ -7,7 +7,7 @@
   "RDWR", "TRUNC", "WRONLY", "SHARE_DELETE"].each do |const|
   describe "File::Constants::#{const}" do
     it "is defined" do
-      File::Constants.const_defined?(const).should be_true
+      File::Constants.const_defined?(const).should == true
     end
   end
 end
@@ -15,7 +15,7 @@
 platform_is :windows do
   describe "File::Constants::BINARY" do
     it "is defined" do
-      File::Constants.const_defined?(:BINARY).should be_true
+      File::Constants.const_defined?(:BINARY).should == true
     end
   end
 end
@@ -24,7 +24,7 @@
   ["NOCTTY", "SYNC"].each do |const|
     describe "File::Constants::#{const}" do
       it "is defined" do
-        File::Constants.const_defined?(const).should be_true
+        File::Constants.const_defined?(const).should == true
       end
     end
   end
diff --git a/spec/ruby/core/file/ctime_spec.rb b/spec/ruby/core/file/ctime_spec.rb
index 718f26d5cc9..cf37d1f4eec 100644
--- a/spec/ruby/core/file/ctime_spec.rb
+++ b/spec/ruby/core/file/ctime_spec.rb
@@ -11,7 +11,7 @@
 
   it "returns the change time for the named file (the time at which directory information about the file was changed, not the file itself)." do
     File.ctime(@file)
-    File.ctime(@file).should be_kind_of(Time)
+    File.ctime(@file).should.is_a?(Time)
   end
 
   platform_is :linux, :windows do
@@ -33,7 +33,7 @@
   end
 
   it "raises an Errno::ENOENT exception if the file is not found" do
-    -> { File.ctime('bogus') }.should raise_error(Errno::ENOENT)
+    -> { File.ctime('bogus') }.should.raise(Errno::ENOENT)
   end
 end
 
@@ -49,6 +49,6 @@
 
   it "returns the change time for the named file (the time at which directory information about the file was changed, not the file itself)." do
     @file.ctime
-    @file.ctime.should be_kind_of(Time)
+    @file.ctime.should.is_a?(Time)
   end
 end
diff --git a/spec/ruby/core/file/dirname_spec.rb b/spec/ruby/core/file/dirname_spec.rb
index 1b006af7839..855148a6844 100644
--- a/spec/ruby/core/file/dirname_spec.rb
+++ b/spec/ruby/core/file/dirname_spec.rb
@@ -25,7 +25,7 @@
     it "raises ArgumentError if the level is negative" do
       -> {
         File.dirname('/home/jason', -1)
-      }.should raise_error(ArgumentError, "negative level: -1")
+      }.should.raise(ArgumentError, "negative level: -1")
     end
 
     it "returns '/' when level exceeds the number of segments in the path" do
@@ -41,7 +41,7 @@ def object.to_int; 2; end
   end
 
   it "returns a String" do
-    File.dirname("foo").should be_kind_of(String)
+    File.dirname("foo").should.is_a?(String)
   end
 
   it "does not modify its argument" do
@@ -83,7 +83,7 @@ def object.to_int; 2; end
       path = "/foo/bar".encode(enc)
       -> {
         File.dirname(path)
-      }.should raise_error(Encoding::CompatibilityError)
+      }.should.raise(Encoding::CompatibilityError)
     end
   end
 
@@ -96,7 +96,7 @@ def object.to_int; 2; end
   it "handles Shift JIS 0x5C (\\) as second byte of a multi-byte sequence" do
     # dir/fileソname.txt
     path = "dir/file\x83\x5cname.txt".b.force_encoding(Encoding::SHIFT_JIS)
-    path.valid_encoding?.should be_true
+    path.valid_encoding?.should == true
     File.dirname(path).should == "dir"
   end
 
@@ -124,7 +124,7 @@ def object.to_int; 2; end
     it "handles Shift JIS 0x5C (\\) as second byte of a multi-byte sequence (windows)" do
       # dir\fileソname.txt
       path = "dir\\file\x83\x5cname.txt".b.force_encoding(Encoding::SHIFT_JIS)
-      path.valid_encoding?.should be_true
+      path.valid_encoding?.should == true
       File.dirname(path).should == "dir"
     end
   end
@@ -134,10 +134,10 @@ def object.to_int; 2; end
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { File.dirname(nil)   }.should raise_error(TypeError)
-    -> { File.dirname(0)     }.should raise_error(TypeError)
-    -> { File.dirname(true)  }.should raise_error(TypeError)
-    -> { File.dirname(false) }.should raise_error(TypeError)
+    -> { File.dirname(nil)   }.should.raise(TypeError)
+    -> { File.dirname(0)     }.should.raise(TypeError)
+    -> { File.dirname(true)  }.should.raise(TypeError)
+    -> { File.dirname(false) }.should.raise(TypeError)
   end
 
   # Windows specific tests
diff --git a/spec/ruby/core/file/expand_path_spec.rb b/spec/ruby/core/file/expand_path_spec.rb
index 1abcf93900c..160494f1453 100644
--- a/spec/ruby/core/file/expand_path_spec.rb
+++ b/spec/ruby/core/file/expand_path_spec.rb
@@ -92,7 +92,7 @@
     end
 
     it "raises an ArgumentError if the path is not valid" do
-      -> { File.expand_path("~a_not_existing_user") }.should raise_error(ArgumentError)
+      -> { File.expand_path("~a_not_existing_user") }.should.raise(ArgumentError)
     end
 
     it "expands ~ENV['USER'] to the user's home directory" do
@@ -117,9 +117,9 @@
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { File.expand_path(1)    }.should raise_error(TypeError)
-    -> { File.expand_path(nil)  }.should raise_error(TypeError)
-    -> { File.expand_path(true) }.should raise_error(TypeError)
+    -> { File.expand_path(1)    }.should.raise(TypeError)
+    -> { File.expand_path(nil)  }.should.raise(TypeError)
+    -> { File.expand_path(true) }.should.raise(TypeError)
   end
 
   platform_is_not :windows do
@@ -138,10 +138,10 @@
     Encoding.default_external = Encoding::SHIFT_JIS
 
     path = "./a".dup.force_encoding Encoding::CP1251
-    File.expand_path(path).encoding.should equal(Encoding::CP1251)
+    File.expand_path(path).encoding.should.equal?(Encoding::CP1251)
 
     weird_path = [222, 173, 190, 175].pack('C*')
-    File.expand_path(weird_path).encoding.should equal(Encoding::BINARY)
+    File.expand_path(weird_path).encoding.should.equal?(Encoding::BINARY)
   end
 
   platform_is_not :windows do
@@ -159,7 +159,7 @@
   platform_is_not :windows do
     it "raises an Encoding::CompatibilityError if the external encoding is not compatible" do
       Encoding.default_external = Encoding::UTF_16BE
-      -> { File.expand_path("./a") }.should raise_error(Encoding::CompatibilityError)
+      -> { File.expand_path("./a") }.should.raise(Encoding::CompatibilityError)
     end
   end
 
@@ -179,7 +179,7 @@
     str = FileSpecs::SubString.new "./a/b/../c"
     path = File.expand_path(str, @base)
     path.should == "#{@base}/a/c"
-    path.should be_an_instance_of(String)
+    path.should.instance_of?(String)
   end
 end
 
@@ -244,7 +244,7 @@
 
     it "raises an ArgumentError when passed '~' if HOME == ''" do
       ENV["HOME"] = ""
-      -> { File.expand_path("~") }.should raise_error(ArgumentError)
+      -> { File.expand_path("~") }.should.raise(ArgumentError)
     end
   end
 
@@ -259,7 +259,7 @@
 
     it "raises an ArgumentError" do
       ENV["HOME"] = "non-absolute"
-      -> { File.expand_path("~") }.should raise_error(ArgumentError, 'non-absolute home')
+      -> { File.expand_path("~") }.should.raise(ArgumentError, 'non-absolute home')
     end
   end
 end
diff --git a/spec/ruby/core/file/extname_spec.rb b/spec/ruby/core/file/extname_spec.rb
index d20cf813d9c..995d0ea31a0 100644
--- a/spec/ruby/core/file/extname_spec.rb
+++ b/spec/ruby/core/file/extname_spec.rb
@@ -57,15 +57,15 @@
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { File.extname(nil)   }.should raise_error(TypeError)
-    -> { File.extname(0)     }.should raise_error(TypeError)
-    -> { File.extname(true)  }.should raise_error(TypeError)
-    -> { File.extname(false) }.should raise_error(TypeError)
+    -> { File.extname(nil)   }.should.raise(TypeError)
+    -> { File.extname(0)     }.should.raise(TypeError)
+    -> { File.extname(true)  }.should.raise(TypeError)
+    -> { File.extname(false) }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { File.extname }.should raise_error(ArgumentError)
-    -> { File.extname("foo.bar", "foo.baz") }.should raise_error(ArgumentError)
+    -> { File.extname }.should.raise(ArgumentError)
+    -> { File.extname("foo.bar", "foo.baz") }.should.raise(ArgumentError)
   end
 
 
diff --git a/spec/ruby/core/file/ftype_spec.rb b/spec/ruby/core/file/ftype_spec.rb
index cdddc404dc1..ab9f76b79b8 100644
--- a/spec/ruby/core/file/ftype_spec.rb
+++ b/spec/ruby/core/file/ftype_spec.rb
@@ -7,19 +7,19 @@
   end
 
   it "raises ArgumentError if not given exactly one filename" do
-    -> { File.ftype }.should raise_error(ArgumentError)
-    -> { File.ftype('blah', 'bleh') }.should raise_error(ArgumentError)
+    -> { File.ftype }.should.raise(ArgumentError)
+    -> { File.ftype('blah', 'bleh') }.should.raise(ArgumentError)
   end
 
   it "raises Errno::ENOENT if the file is not valid" do
     -> {
       File.ftype("/#{$$}#{Time.now.to_f}")
-    }.should raise_error(Errno::ENOENT)
+    }.should.raise(Errno::ENOENT)
   end
 
   it "returns a String" do
     FileSpecs.normal_file do |file|
-      File.ftype(file).should be_kind_of(String)
+      File.ftype(file).should.is_a?(String)
     end
   end
 
diff --git a/spec/ruby/core/file/inspect_spec.rb b/spec/ruby/core/file/inspect_spec.rb
index 148e789c62c..fe87429e8dc 100644
--- a/spec/ruby/core/file/inspect_spec.rb
+++ b/spec/ruby/core/file/inspect_spec.rb
@@ -12,6 +12,6 @@
   end
 
   it "returns a String" do
-    @file.inspect.should be_an_instance_of(String)
+    @file.inspect.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/core/file/join_spec.rb b/spec/ruby/core/file/join_spec.rb
index 0feedbae93c..0f0911ea310 100644
--- a/spec/ruby/core/file/join_spec.rb
+++ b/spec/ruby/core/file/join_spec.rb
@@ -52,7 +52,7 @@
   it "returns a duplicate string when given a single argument" do
     str = "usr"
     File.join(str).should == str
-    File.join(str).should_not equal(str)
+    File.join(str).should_not.equal?(str)
   end
 
   it "supports any number of arguments" do
@@ -104,15 +104,15 @@
   it "raises an ArgumentError if passed a recursive array" do
     a = ["a"]
     a << a
-    -> { File.join a }.should raise_error(ArgumentError)
+    -> { File.join a }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError exception when args are nil" do
-    -> { File.join nil }.should raise_error(TypeError)
+    -> { File.join nil }.should.raise(TypeError)
   end
 
   it "calls #to_str" do
-    -> { File.join(mock('x')) }.should raise_error(TypeError)
+    -> { File.join(mock('x')) }.should.raise(TypeError)
 
     bin = mock("bin")
     bin.should_receive(:to_str).exactly(:twice).and_return("bin")
@@ -129,7 +129,7 @@
   end
 
   it "calls #to_path" do
-    -> { File.join(mock('x')) }.should raise_error(TypeError)
+    -> { File.join(mock('x')) }.should.raise(TypeError)
 
     bin = mock("bin")
     bin.should_receive(:to_path).exactly(:twice).and_return("bin")
@@ -138,10 +138,10 @@
   end
 
   it "raises errors for null bytes" do
-    -> { File.join("\x00x", "metadata.gz") }.should raise_error(ArgumentError) { |e|
+    -> { File.join("\x00x", "metadata.gz") }.should.raise(ArgumentError) { |e|
       e.message.should == 'string contains null byte'
     }
-    -> { File.join("metadata.gz", "\x00x") }.should raise_error(ArgumentError) { |e|
+    -> { File.join("metadata.gz", "\x00x") }.should.raise(ArgumentError) { |e|
       e.message.should == 'string contains null byte'
     }
   end
diff --git a/spec/ruby/core/file/link_spec.rb b/spec/ruby/core/file/link_spec.rb
index a5d5b4815fa..768ee4b0fac 100644
--- a/spec/ruby/core/file/link_spec.rb
+++ b/spec/ruby/core/file/link_spec.rb
@@ -22,18 +22,18 @@
 
     it "raises an Errno::EEXIST if the target already exists" do
       File.link(@file, @link)
-      -> { File.link(@file, @link) }.should raise_error(Errno::EEXIST)
+      -> { File.link(@file, @link) }.should.raise(Errno::EEXIST)
     end
 
     it "raises an ArgumentError if not passed two arguments" do
-      -> { File.link                      }.should raise_error(ArgumentError)
-      -> { File.link(@file)               }.should raise_error(ArgumentError)
-      -> { File.link(@file, @link, @file) }.should raise_error(ArgumentError)
+      -> { File.link                      }.should.raise(ArgumentError)
+      -> { File.link(@file)               }.should.raise(ArgumentError)
+      -> { File.link(@file, @link, @file) }.should.raise(ArgumentError)
     end
 
     it "raises a TypeError if not passed String types" do
-      -> { File.link(@file, nil) }.should raise_error(TypeError)
-      -> { File.link(@file, 1)   }.should raise_error(TypeError)
+      -> { File.link(@file, nil) }.should.raise(TypeError)
+      -> { File.link(@file, 1)   }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/file/mkfifo_spec.rb b/spec/ruby/core/file/mkfifo_spec.rb
index 19298c967c7..ce4a67fe310 100644
--- a/spec/ruby/core/file/mkfifo_spec.rb
+++ b/spec/ruby/core/file/mkfifo_spec.rb
@@ -19,13 +19,13 @@
 
     context "when path passed is not a String value" do
       it "raises a TypeError" do
-        -> { File.mkfifo(:"/tmp/fifo") }.should raise_error(TypeError)
+        -> { File.mkfifo(:"/tmp/fifo") }.should.raise(TypeError)
       end
     end
 
     context "when path does not exist" do
       it "raises an Errno::ENOENT exception" do
-        -> { File.mkfifo("/bogus/path") }.should raise_error(Errno::ENOENT)
+        -> { File.mkfifo("/bogus/path") }.should.raise(Errno::ENOENT)
       end
     end
 
diff --git a/spec/ruby/core/file/mtime_spec.rb b/spec/ruby/core/file/mtime_spec.rb
index 0e9c95caee3..d83725e25d9 100644
--- a/spec/ruby/core/file/mtime_spec.rb
+++ b/spec/ruby/core/file/mtime_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "returns the modification Time of the file" do
-    File.mtime(@filename).should be_kind_of(Time)
+    File.mtime(@filename).should.is_a?(Time)
     File.mtime(@filename).should be_close(@mtime, TIME_TOLERANCE)
   end
 
@@ -34,7 +34,7 @@
   end
 
   it "raises an Errno::ENOENT exception if the file is not found" do
-    -> { File.mtime('bogus') }.should raise_error(Errno::ENOENT)
+    -> { File.mtime('bogus') }.should.raise(Errno::ENOENT)
   end
 end
 
@@ -50,7 +50,7 @@
   end
 
   it "returns the modification Time of the file" do
-    @f.mtime.should be_kind_of(Time)
+    @f.mtime.should.is_a?(Time)
   end
 
 end
diff --git a/spec/ruby/core/file/new_spec.rb b/spec/ruby/core/file/new_spec.rb
index 1e82a070b10..4cd2cb5dcb9 100644
--- a/spec/ruby/core/file/new_spec.rb
+++ b/spec/ruby/core/file/new_spec.rb
@@ -16,13 +16,13 @@
 
   it "returns a new File with mode string" do
     @fh = File.new(@file, 'w')
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "returns a new File with mode num" do
     @fh = File.new(@file, @flags)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
@@ -30,7 +30,7 @@
     rm_r @file
     File.umask(0011)
     @fh = File.new(@file, @flags, 0755)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     platform_is_not :windows do
       File.stat(@file).mode.to_s(8).should == "100744"
     end
@@ -44,7 +44,7 @@
     rm_r @file
     begin
       f = File.new(@file, "w", 0444)
-      -> { f.puts("test") }.should_not raise_error(IOError)
+      -> { f.puts("test") }.should_not.raise(IOError)
     ensure
       f.close
     end
@@ -74,14 +74,14 @@
     @fh = File.new(@file)
     fh_copy = File.new(@fh.fileno)
     fh_copy.autoclose = false
-    fh_copy.should be_kind_of(File)
+    fh_copy.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "returns a new read-only File when mode is not specified" do
     @fh = File.new(@file)
 
-    -> { @fh.puts("test") }.should raise_error(IOError)
+    -> { @fh.puts("test") }.should.raise(IOError)
     @fh.read.should == ""
     File.should.exist?(@file)
   end
@@ -89,68 +89,68 @@
   it "returns a new read-only File when mode is not specified but flags option is present" do
     @fh = File.new(@file, flags: File::CREAT)
 
-    -> { @fh.puts("test") }.should raise_error(IOError)
+    -> { @fh.puts("test") }.should.raise(IOError)
     @fh.read.should == ""
     File.should.exist?(@file)
   end
 
   it "creates a new file when use File::EXCL mode" do
     @fh = File.new(@file, File::EXCL)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "raises an Errno::EEXIST if the file exists when create a new file with File::CREAT|File::EXCL" do
-    -> { @fh = File.new(@file, File::CREAT|File::EXCL) }.should raise_error(Errno::EEXIST)
+    -> { @fh = File.new(@file, File::CREAT|File::EXCL) }.should.raise(Errno::EEXIST)
   end
 
   it "creates a new file when use File::WRONLY|File::APPEND mode" do
     @fh = File.new(@file, File::WRONLY|File::APPEND)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "returns a new File when use File::APPEND mode" do
     @fh = File.new(@file, File::APPEND)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "returns a new File when use File::RDONLY|File::APPEND mode" do
     @fh = File.new(@file, File::RDONLY|File::APPEND)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "returns a new File when use File::RDONLY|File::WRONLY mode" do
     @fh = File.new(@file, File::RDONLY|File::WRONLY)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "creates a new file when use File::WRONLY|File::TRUNC mode" do
     @fh = File.new(@file, File::WRONLY|File::TRUNC)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "returns a new read-only File when use File::RDONLY|File::CREAT mode" do
     @fh = File.new(@file, File::RDONLY|File::CREAT)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
 
     # it's read-only
-    -> { @fh.puts("test") }.should raise_error(IOError)
+    -> { @fh.puts("test") }.should.raise(IOError)
     @fh.read.should == ""
   end
 
   it "returns a new read-only File when use File::CREAT mode" do
     @fh = File.new(@file, File::CREAT)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
 
     # it's read-only
-    -> { @fh.puts("test") }.should raise_error(IOError)
+    -> { @fh.puts("test") }.should.raise(IOError)
     @fh.read.should == ""
   end
 
@@ -170,22 +170,22 @@
 
   it "accepts options as a keyword argument" do
     @fh = File.new(@file, 'w', 0755, flags: @flags)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     @fh.close
 
     -> {
       @fh = File.new(@file, 'w', 0755, {flags: @flags})
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
   end
 
   it "bitwise-ORs mode and flags option" do
     -> {
       @fh = File.new(@file, 'w', flags: File::EXCL)
-    }.should raise_error(Errno::EEXIST, /File exists/)
+    }.should.raise(Errno::EEXIST, /File exists/)
 
     -> {
       @fh = File.new(@file, mode: 'w', flags: File::EXCL)
-    }.should raise_error(Errno::EEXIST, /File exists/)
+    }.should.raise(Errno::EEXIST, /File exists/)
   end
 
   it "does not use the given block and warns to use File::open" do
@@ -195,16 +195,16 @@
   end
 
   it "raises a TypeError if the first parameter can't be coerced to a string" do
-    -> { File.new(true) }.should raise_error(TypeError)
-    -> { File.new(false) }.should raise_error(TypeError)
+    -> { File.new(true) }.should.raise(TypeError)
+    -> { File.new(false) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the first parameter is nil" do
-    -> { File.new(nil) }.should raise_error(TypeError)
+    -> { File.new(nil) }.should.raise(TypeError)
   end
 
   it "raises an Errno::EBADF if the first parameter is an invalid file descriptor" do
-    -> { File.new(-1) }.should raise_error(Errno::EBADF)
+    -> { File.new(-1) }.should.raise(Errno::EBADF)
   end
 
   platform_is_not :windows do
@@ -213,7 +213,7 @@
       -> {
         f = File.new(@fh.fileno, @flags)
         f.autoclose = false
-      }.should raise_error(Errno::EINVAL)
+      }.should.raise(Errno::EINVAL)
     end
   end
 
diff --git a/spec/ruby/core/file/open_spec.rb b/spec/ruby/core/file/open_spec.rb
index 6bfc16bbf97..7318c316367 100644
--- a/spec/ruby/core/file/open_spec.rb
+++ b/spec/ruby/core/file/open_spec.rb
@@ -40,7 +40,7 @@
     it "propagates non-StandardErrors produced by close" do
       -> {
         File.open(@file, 'r') { |f| FileSpecs.make_closer f, Exception }
-      }.should raise_error(Exception)
+      }.should.raise(Exception)
 
       ScratchPad.recorded.should == [:file_opened, :file_closed]
     end
@@ -48,7 +48,7 @@
     it "propagates StandardErrors produced by close" do
       -> {
         File.open(@file, 'r') { |f| FileSpecs.make_closer f, StandardError }
-      }.should raise_error(StandardError)
+      }.should.raise(StandardError)
 
       ScratchPad.recorded.should == [:file_opened, :file_closed]
     end
@@ -62,13 +62,13 @@
 
   it "opens the file (basic case)" do
     @fh = File.open(@file)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "opens the file with unicode characters" do
     @fh = File.open(@unicode_path, "w")
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@unicode_path)
   end
 
@@ -79,7 +79,7 @@
 
   it "opens with mode string" do
     @fh = File.open(@file, 'w')
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
@@ -90,7 +90,7 @@
 
   it "opens a file with mode num" do
     @fh = File.open(@file, @flags)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
@@ -101,7 +101,7 @@
 
   it "opens a file with mode and permission as nil" do
     @fh = File.open(@file, nil, nil)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
   end
 
   # For this test we delete the file first to reset the perms
@@ -109,7 +109,7 @@
     rm_r @file
     File.umask(0011)
     @fh = File.open(@file, @flags, 0755)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     platform_is_not :windows do
       @fh.lstat.mode.to_s(8).should == "100744"
     end
@@ -161,69 +161,69 @@
     @fh = File.open(@file)
     fh_copy = File.open(@fh.fileno)
     fh_copy.autoclose = false
-    fh_copy.should be_kind_of(File)
+    fh_copy.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "opens a file that no exists when use File::WRONLY mode" do
-    -> { File.open(@nonexistent, File::WRONLY) }.should raise_error(Errno::ENOENT)
+    -> { File.open(@nonexistent, File::WRONLY) }.should.raise(Errno::ENOENT)
   end
 
   it "opens a file that no exists when use File::RDONLY mode" do
-    -> { File.open(@nonexistent, File::RDONLY) }.should raise_error(Errno::ENOENT)
+    -> { File.open(@nonexistent, File::RDONLY) }.should.raise(Errno::ENOENT)
   end
 
   it "opens a file that no exists when use 'r' mode" do
-    -> { File.open(@nonexistent, 'r') }.should raise_error(Errno::ENOENT)
+    -> { File.open(@nonexistent, 'r') }.should.raise(Errno::ENOENT)
   end
 
   it "opens a file that no exists when use File::EXCL mode" do
-    -> { File.open(@nonexistent, File::EXCL) }.should raise_error(Errno::ENOENT)
+    -> { File.open(@nonexistent, File::EXCL) }.should.raise(Errno::ENOENT)
   end
 
   it "opens a file that no exists when use File::NONBLOCK mode" do
-    -> { File.open(@nonexistent, File::NONBLOCK) }.should raise_error(Errno::ENOENT)
+    -> { File.open(@nonexistent, File::NONBLOCK) }.should.raise(Errno::ENOENT)
   end
 
   platform_is_not :openbsd, :windows do
     it "opens a file that no exists when use File::TRUNC mode" do
-      -> { File.open(@nonexistent, File::TRUNC) }.should raise_error(Errno::ENOENT)
+      -> { File.open(@nonexistent, File::TRUNC) }.should.raise(Errno::ENOENT)
     end
   end
 
   platform_is :openbsd, :windows do
     it "does not open a file that does no exists when using File::TRUNC mode" do
-      -> { File.open(@nonexistent, File::TRUNC) }.should raise_error(Errno::EINVAL)
+      -> { File.open(@nonexistent, File::TRUNC) }.should.raise(Errno::EINVAL)
     end
   end
 
   platform_is_not :windows do
     it "opens a file that no exists when use File::NOCTTY mode" do
-      -> { File.open(@nonexistent, File::NOCTTY) }.should raise_error(Errno::ENOENT)
+      -> { File.open(@nonexistent, File::NOCTTY) }.should.raise(Errno::ENOENT)
     end
   end
 
   it "opens a file that no exists when use File::CREAT mode" do
     @fh = File.open(@nonexistent, File::CREAT) { |f| f }
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "opens a file that no exists when use 'a' mode" do
     @fh = File.open(@nonexistent, 'a') { |f| f }
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "opens a file that no exists when use 'w' mode" do
     @fh = File.open(@nonexistent, 'w') { |f| f }
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   # Check the grants associated to the different open modes combinations.
   it "raises an ArgumentError exception when call with an unknown mode" do
-    -> { File.open(@file, "q") }.should raise_error(ArgumentError)
+    -> { File.open(@file, "q") }.should.raise(ArgumentError)
   end
 
   it "can read in a block when call open with RDONLY mode" do
@@ -240,13 +240,13 @@
 
   it "raises an IO exception when write in a block opened with RDONLY mode" do
     File.open(@file, File::RDONLY) do |f|
-      -> { f.puts "writing ..." }.should raise_error(IOError)
+      -> { f.puts "writing ..." }.should.raise(IOError)
     end
   end
 
   it "raises an IO exception when write in a block opened with 'r' mode" do
     File.open(@file, "r") do |f|
-      -> { f.puts "writing ..." }.should raise_error(IOError)
+      -> { f.puts "writing ..." }.should.raise(IOError)
     end
   end
 
@@ -261,7 +261,7 @@
       File.open(@file, File::WRONLY|File::RDONLY ) do |f|
         f.gets.should == nil
       end
-    }.should raise_error(IOError)
+    }.should.raise(IOError)
   end
 
   it "can write in a block when call open with WRONLY mode" do
@@ -278,39 +278,39 @@
 
   it "raises an IOError when read in a block opened with WRONLY mode" do
     File.open(@file, File::WRONLY) do |f|
-      -> { f.gets  }.should raise_error(IOError)
+      -> { f.gets  }.should.raise(IOError)
     end
   end
 
   it "raises an IOError when read in a block opened with 'w' mode" do
     File.open(@file, "w") do |f|
-      -> { f.gets   }.should raise_error(IOError)
+      -> { f.gets   }.should.raise(IOError)
     end
   end
 
   it "raises an IOError when read in a block opened with 'a' mode" do
     File.open(@file, "a") do |f|
-      -> { f.gets  }.should raise_error(IOError)
+      -> { f.gets  }.should.raise(IOError)
     end
   end
 
   it "raises an IOError when read in a block opened with 'a' mode" do
     File.open(@file, "a") do |f|
       f.puts("writing").should == nil
-      -> { f.gets }.should raise_error(IOError)
+      -> { f.gets }.should.raise(IOError)
     end
   end
 
   it "raises an IOError when read in a block opened with 'a' mode" do
     File.open(@file, File::WRONLY|File::APPEND ) do |f|
-      -> { f.gets }.should raise_error(IOError)
+      -> { f.gets }.should.raise(IOError)
     end
   end
 
   it "raises an IOError when read in a block opened with File::WRONLY|File::APPEND mode" do
     File.open(@file, File::WRONLY|File::APPEND ) do |f|
       f.puts("writing").should == nil
-      -> { f.gets }.should raise_error(IOError)
+      -> { f.gets }.should.raise(IOError)
     end
   end
 
@@ -319,7 +319,7 @@
       File.open(@file, File::RDONLY|File::APPEND ) do |f|
         f.puts("writing")
       end
-    }.should raise_error(IOError)
+    }.should.raise(IOError)
   end
 
   it "can read and write in a block when call open with RDWR mode" do
@@ -336,7 +336,7 @@
       File.open(@file, File::EXCL) do |f|
         f.puts("writing").should == nil
       end
-    }.should raise_error(IOError)
+    }.should.raise(IOError)
   end
 
   it "can read in a block when call open with File::EXCL mode" do
@@ -359,12 +359,12 @@
       File.open(@file, File::CREAT|File::EXCL) do |f|
         f.puts("writing")
       end
-    }.should raise_error(Errno::EEXIST)
+    }.should.raise(Errno::EEXIST)
   end
 
   it "creates a new file when use File::WRONLY|File::APPEND mode" do
     @fh = File.open(@file, File::WRONLY|File::APPEND)
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
@@ -386,7 +386,7 @@
       File.open(@file, File::RDONLY|File::APPEND) do |f|
         f.puts("writing").should == nil
       end
-    }.should raise_error(IOError)
+    }.should.raise(IOError)
   end
 
   platform_is_not :openbsd, :windows do
@@ -407,7 +407,7 @@
     fh1 = File.open(@file, "w")
     begin
       @fh = File.open(@file, File::WRONLY|File::TRUNC)
-      @fh.should be_kind_of(File)
+      @fh.should.is_a?(File)
       File.should.exist?(@file)
     ensure
       fh1.close
@@ -420,7 +420,7 @@
         File.open(@file, File::TRUNC) do |f|
           f.puts("writing")
         end
-      }.should raise_error(IOError)
+      }.should.raise(IOError)
     end
 
     it "raises an Errno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
@@ -428,7 +428,7 @@
         File.open(@file, File::RDONLY|File::TRUNC) do |f|
           f.puts("writing").should == nil
         end
-      }.should raise_error(IOError)
+      }.should.raise(IOError)
     end
   end
 
@@ -438,7 +438,7 @@
         File.open(@file, File::TRUNC) do |f|
           f.puts("writing")
         end
-      }.should raise_error(Errno::EINVAL)
+      }.should.raise(Errno::EINVAL)
     end
 
     it "raises an Errno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
@@ -446,7 +446,7 @@
         File.open(@file, File::RDONLY|File::TRUNC) do |f|
           f.puts("writing").should == nil
         end
-      }.should raise_error(Errno::EINVAL)
+      }.should.raise(Errno::EINVAL)
     end
   end
 
@@ -455,7 +455,7 @@
       it "raises an Errno::EACCES when opening non-permitted file" do
         @fh = File.open(@file, "w")
         @fh.chmod(000)
-        -> { fh1 = File.open(@file); fh1.close }.should raise_error(Errno::EACCES)
+        -> { fh1 = File.open(@file); fh1.close }.should.raise(Errno::EACCES)
       end
     end
   end
@@ -464,19 +464,19 @@
     it "raises an Errno::EACCES when opening read-only file" do
       @fh = File.open(@file, "w")
       @fh.chmod(0444)
-      -> { File.open(@file, "w") }.should raise_error(Errno::EACCES)
+      -> { File.open(@file, "w") }.should.raise(Errno::EACCES)
     end
   end
 
   it "opens a file for binary read" do
     @fh = File.open(@file, "rb")
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
   it "opens a file for binary write" do
     @fh = File.open(@file, "wb")
-    @fh.should be_kind_of(File)
+    @fh.should.is_a?(File)
     File.should.exist?(@file)
   end
 
@@ -543,21 +543,21 @@
   end
 
   it "raises a TypeError if passed a filename that is not a String or Integer type" do
-    -> { File.open(true)  }.should raise_error(TypeError)
-    -> { File.open(false) }.should raise_error(TypeError)
-    -> { File.open(nil)   }.should raise_error(TypeError)
+    -> { File.open(true)  }.should.raise(TypeError)
+    -> { File.open(false) }.should.raise(TypeError)
+    -> { File.open(nil)   }.should.raise(TypeError)
   end
 
   it "raises a SystemCallError if passed an invalid Integer type" do
-    -> { File.open(-1)    }.should raise_error(SystemCallError)
+    -> { File.open(-1)    }.should.raise(SystemCallError)
   end
 
   it "raises an ArgumentError if passed the wrong number of arguments" do
-    -> { File.open(@file, File::CREAT, 0755, 'test') }.should raise_error(ArgumentError)
+    -> { File.open(@file, File::CREAT, 0755, 'test') }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if passed an invalid string for mode" do
-    -> { File.open(@file, 'fake') }.should raise_error(ArgumentError)
+    -> { File.open(@file, 'fake') }.should.raise(ArgumentError)
   end
 
   it "defaults external_encoding to BINARY for binary modes" do
@@ -567,16 +567,16 @@
 
   it "accepts options as a keyword argument" do
     @fh = File.open(@file, 'w', 0755, flags: File::CREAT)
-    @fh.should be_an_instance_of(File)
+    @fh.should.instance_of?(File)
 
     -> {
       File.open(@file, 'w', 0755, {flags: File::CREAT})
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
   end
 
   it "uses the second argument as an options Hash" do
     @fh = File.open(@file, mode: "r")
-    @fh.should be_an_instance_of(File)
+    @fh.should.instance_of?(File)
   end
 
   it "calls #to_hash to convert the second argument to a Hash" do
@@ -589,17 +589,17 @@
   it "accepts extra flags as a keyword argument and combine with a string mode" do
     -> {
       File.open(@file, "w", flags: File::EXCL) { }
-    }.should raise_error(Errno::EEXIST)
+    }.should.raise(Errno::EEXIST)
 
     -> {
       File.open(@file, mode: "w", flags: File::EXCL) { }
-    }.should raise_error(Errno::EEXIST)
+    }.should.raise(Errno::EEXIST)
   end
 
   it "accepts extra flags as a keyword argument and combine with an integer mode" do
     -> {
       File.open(@file, File::WRONLY | File::CREAT, flags: File::EXCL) { }
-    }.should raise_error(Errno::EEXIST)
+    }.should.raise(Errno::EEXIST)
   end
 
   platform_is_not :windows do
@@ -643,7 +643,7 @@
   it "raises ArgumentError if mixing :newline and binary mode" do
     -> {
       File.open(@file, "rb", newline: :universal) {}
-    }.should raise_error(ArgumentError, "newline decorator with binary mode")
+    }.should.raise(ArgumentError, "newline decorator with binary mode")
   end
 
   context "'x' flag" do
@@ -663,12 +663,12 @@
 
     it "throws a Errno::EEXIST error if the file exists" do
       touch @xfile
-      -> { File.open(@xfile, "wx") }.should raise_error(Errno::EEXIST)
+      -> { File.open(@xfile, "wx") }.should.raise(Errno::EEXIST)
     end
 
     it "can't be used with 'r' and 'a' flags" do
-      -> { File.open(@xfile, "rx") }.should raise_error(ArgumentError, 'invalid access mode rx')
-      -> { File.open(@xfile, "ax") }.should raise_error(ArgumentError, 'invalid access mode ax')
+      -> { File.open(@xfile, "rx") }.should.raise(ArgumentError, 'invalid access mode rx')
+      -> { File.open(@xfile, "ax") }.should.raise(ArgumentError, 'invalid access mode ax')
     end
   end
 end
@@ -688,8 +688,8 @@
 
   it "opens a file" do
     @file = File.open(@fd, "w")
-    @file.should be_an_instance_of(File)
-    @file.fileno.should equal(@fd)
+    @file.should.instance_of?(File)
+    @file.fileno.should.equal?(@fd)
     @file.write @content
     @file.flush
     File.read(@name).should == @content
@@ -697,8 +697,8 @@
 
   it "opens a file when passed a block" do
     @file = File.open(@fd, "w") do |f|
-      f.should be_an_instance_of(File)
-      f.fileno.should equal(@fd)
+      f.should.instance_of?(File)
+      f.fileno.should.equal?(@fd)
       f.write @content
       f
     end
diff --git a/spec/ruby/core/file/path_spec.rb b/spec/ruby/core/file/path_spec.rb
index 726febcc2bd..ce78dbeede3 100644
--- a/spec/ruby/core/file/path_spec.rb
+++ b/spec/ruby/core/file/path_spec.rb
@@ -41,41 +41,41 @@
   it "raises TypeError when #to_path result is not a string" do
     path = mock("path")
     path.should_receive(:to_path).and_return(nil)
-    -> { File.path(path) }.should raise_error TypeError
+    -> { File.path(path) }.should.raise TypeError
 
     path = mock("path")
     path.should_receive(:to_path).and_return(42)
-    -> { File.path(path) }.should raise_error TypeError
+    -> { File.path(path) }.should.raise TypeError
   end
 
   it "raises ArgumentError for string argument contains NUL character" do
-    -> { File.path("\0") }.should raise_error ArgumentError
-    -> { File.path("a\0") }.should raise_error ArgumentError
-    -> { File.path("a\0c") }.should raise_error ArgumentError
+    -> { File.path("\0") }.should.raise ArgumentError
+    -> { File.path("a\0") }.should.raise ArgumentError
+    -> { File.path("a\0c") }.should.raise ArgumentError
   end
 
   it "raises ArgumentError when #to_path result contains NUL character" do
     path = mock("path")
     path.should_receive(:to_path).and_return("\0")
-    -> { File.path(path) }.should raise_error ArgumentError
+    -> { File.path(path) }.should.raise ArgumentError
 
     path = mock("path")
     path.should_receive(:to_path).and_return("a\0")
-    -> { File.path(path) }.should raise_error ArgumentError
+    -> { File.path(path) }.should.raise ArgumentError
 
     path = mock("path")
     path.should_receive(:to_path).and_return("a\0c")
-    -> { File.path(path) }.should raise_error ArgumentError
+    -> { File.path(path) }.should.raise ArgumentError
   end
 
   it "raises Encoding::CompatibilityError for ASCII-incompatible string argument" do
     path = "abc".encode(Encoding::UTF_32BE)
-    -> { File.path(path) }.should raise_error Encoding::CompatibilityError
+    -> { File.path(path) }.should.raise Encoding::CompatibilityError
   end
 
   it "raises Encoding::CompatibilityError when #to_path result is ASCII-incompatible" do
     path = mock("path")
     path.should_receive(:to_path).and_return("abc".encode(Encoding::UTF_32BE))
-    -> { File.path(path) }.should raise_error Encoding::CompatibilityError
+    -> { File.path(path) }.should.raise Encoding::CompatibilityError
   end
 end
diff --git a/spec/ruby/core/file/readlink_spec.rb b/spec/ruby/core/file/readlink_spec.rb
index 20741ba121f..568692b9b62 100644
--- a/spec/ruby/core/file/readlink_spec.rb
+++ b/spec/ruby/core/file/readlink_spec.rb
@@ -26,12 +26,12 @@
 
       it "raises an Errno::ENOENT if there is no such file" do
         # TODO: missing_file
-        -> { File.readlink("/this/surely/does/not/exist") }.should raise_error(Errno::ENOENT)
+        -> { File.readlink("/this/surely/does/not/exist") }.should.raise(Errno::ENOENT)
       end
 
       it "raises an Errno::EINVAL if called with a normal file" do
         touch @file
-        -> { File.readlink(@file) }.should raise_error(Errno::EINVAL)
+        -> { File.readlink(@file) }.should.raise(Errno::EINVAL)
       end
     end
 
@@ -49,7 +49,7 @@
       it "returns the name of the file referenced by the given link" do
         touch @file
         result = File.readlink(@link)
-        result.encoding.should equal Encoding.find('filesystem')
+        result.encoding.should.equal? Encoding.find('filesystem')
         result.should == @file.dup.force_encoding(Encoding.find('filesystem'))
       end
     end
diff --git a/spec/ruby/core/file/realdirpath_spec.rb b/spec/ruby/core/file/realdirpath_spec.rb
index 74053afce39..ecf1e0c6d94 100644
--- a/spec/ruby/core/file/realdirpath_spec.rb
+++ b/spec/ruby/core/file/realdirpath_spec.rb
@@ -61,7 +61,7 @@
     it "raises an Errno::ELOOP if the symlink points to itself" do
       File.unlink @link
       File.symlink(@link, @link)
-      -> { File.realdirpath(@link) }.should raise_error(Errno::ELOOP)
+      -> { File.realdirpath(@link) }.should.raise(Errno::ELOOP)
     end
 
     it "returns the real (absolute) pathname if the file is absent" do
@@ -69,7 +69,7 @@
     end
 
     it "raises Errno::ENOENT if the directory is absent" do
-      -> { File.realdirpath(@fake_file_in_fake_dir) }.should raise_error(Errno::ENOENT)
+      -> { File.realdirpath(@fake_file_in_fake_dir) }.should.raise(Errno::ENOENT)
     end
 
     it "returns the real (absolute) pathname if the symlink points to an absent file" do
@@ -77,7 +77,7 @@
     end
 
     it "raises Errno::ENOENT if the symlink points to an absent directory" do
-      -> { File.realdirpath(@fake_link_to_fake_dir) }.should raise_error(Errno::ENOENT)
+      -> { File.realdirpath(@fake_link_to_fake_dir) }.should.raise(Errno::ENOENT)
     end
   end
 end
diff --git a/spec/ruby/core/file/realpath_spec.rb b/spec/ruby/core/file/realpath_spec.rb
index bd25bfdecf9..ccb981eff16 100644
--- a/spec/ruby/core/file/realpath_spec.rb
+++ b/spec/ruby/core/file/realpath_spec.rb
@@ -61,15 +61,15 @@
     it "raises an Errno::ELOOP if the symlink points to itself" do
       File.unlink @link
       File.symlink(@link, @link)
-      -> { File.realpath(@link) }.should raise_error(Errno::ELOOP)
+      -> { File.realpath(@link) }.should.raise(Errno::ELOOP)
     end
 
     it "raises Errno::ENOENT if the file is absent" do
-      -> { File.realpath(@fake_file) }.should raise_error(Errno::ENOENT)
+      -> { File.realpath(@fake_file) }.should.raise(Errno::ENOENT)
     end
 
     it "raises Errno::ENOENT if the symlink points to an absent file" do
-      -> { File.realpath(@fake_link) }.should raise_error(Errno::ENOENT)
+      -> { File.realpath(@fake_link) }.should.raise(Errno::ENOENT)
     end
 
     it "converts the argument with #to_path" do
diff --git a/spec/ruby/core/file/rename_spec.rb b/spec/ruby/core/file/rename_spec.rb
index f2c18d4905b..70ea669a68c 100644
--- a/spec/ruby/core/file/rename_spec.rb
+++ b/spec/ruby/core/file/rename_spec.rb
@@ -23,15 +23,15 @@
 
   it "raises an Errno::ENOENT if the source does not exist" do
     rm_r @old
-    -> { File.rename(@old, @new) }.should raise_error(Errno::ENOENT)
+    -> { File.rename(@old, @new) }.should.raise(Errno::ENOENT)
   end
 
   it "raises an ArgumentError if not passed two arguments" do
-    -> { File.rename        }.should raise_error(ArgumentError)
-    -> { File.rename(@file) }.should raise_error(ArgumentError)
+    -> { File.rename        }.should.raise(ArgumentError)
+    -> { File.rename(@file) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed String types" do
-    -> { File.rename(1, 2)  }.should raise_error(TypeError)
+    -> { File.rename(1, 2)  }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/file/shared/fnmatch.rb b/spec/ruby/core/file/shared/fnmatch.rb
index db4b5c5d8c6..b9140d027d2 100644
--- a/spec/ruby/core/file/shared/fnmatch.rb
+++ b/spec/ruby/core/file/shared/fnmatch.rb
@@ -222,48 +222,48 @@
 
   it "returns false if '/' in pattern do not match '/' in path when flags includes FNM_PATHNAME" do
     pattern = '*/*'
-    File.send(@method, pattern, 'dave/.profile', File::FNM_PATHNAME).should be_false
+    File.send(@method, pattern, 'dave/.profile', File::FNM_PATHNAME).should == false
 
     pattern = '**/foo'
-    File.send(@method, pattern, 'a/.b/c/foo', File::FNM_PATHNAME).should be_false
+    File.send(@method, pattern, 'a/.b/c/foo', File::FNM_PATHNAME).should == false
   end
 
   it "returns true if '/' in pattern match '/' in path when flags includes FNM_PATHNAME" do
     pattern = '*/*'
-    File.send(@method, pattern, 'dave/.profile', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+    File.send(@method, pattern, 'dave/.profile', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == true
 
     pattern = '**/foo'
-    File.send(@method, pattern, 'a/b/c/foo', File::FNM_PATHNAME).should be_true
-    File.send(@method, pattern, '/a/b/c/foo', File::FNM_PATHNAME).should be_true
-    File.send(@method, pattern, 'c:/a/b/c/foo', File::FNM_PATHNAME).should be_true
-    File.send(@method, pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+    File.send(@method, pattern, 'a/b/c/foo', File::FNM_PATHNAME).should == true
+    File.send(@method, pattern, '/a/b/c/foo', File::FNM_PATHNAME).should == true
+    File.send(@method, pattern, 'c:/a/b/c/foo', File::FNM_PATHNAME).should == true
+    File.send(@method, pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == true
   end
 
   it "has special handling for ./ when using * and FNM_PATHNAME" do
-    File.send(@method, './*', '.', File::FNM_PATHNAME).should be_false
-    File.send(@method, './*', './', File::FNM_PATHNAME).should be_true
-    File.send(@method, './*/', './', File::FNM_PATHNAME).should be_false
-    File.send(@method, './**', './', File::FNM_PATHNAME).should be_true
-    File.send(@method, './**/', './', File::FNM_PATHNAME).should be_true
-    File.send(@method, './*', '.', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_false
-    File.send(@method, './*', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
-    File.send(@method, './*/', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_false
-    File.send(@method, './**', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
-    File.send(@method, './**/', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+    File.send(@method, './*', '.', File::FNM_PATHNAME).should == false
+    File.send(@method, './*', './', File::FNM_PATHNAME).should == true
+    File.send(@method, './*/', './', File::FNM_PATHNAME).should == false
+    File.send(@method, './**', './', File::FNM_PATHNAME).should == true
+    File.send(@method, './**/', './', File::FNM_PATHNAME).should == true
+    File.send(@method, './*', '.', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == false
+    File.send(@method, './*', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == true
+    File.send(@method, './*/', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == false
+    File.send(@method, './**', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == true
+    File.send(@method, './**/', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == true
   end
 
   it "matches **/* with FNM_PATHNAME to recurse directories" do
-    File.send(@method, 'nested/**/*', 'nested/subdir', File::FNM_PATHNAME).should be_true
-    File.send(@method, 'nested/**/*', 'nested/subdir/file', File::FNM_PATHNAME).should be_true
-    File.send(@method, 'nested/**/*', 'nested/.dotsubdir', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
-    File.send(@method, 'nested/**/*', 'nested/.dotsubir/.dotfile', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+    File.send(@method, 'nested/**/*', 'nested/subdir', File::FNM_PATHNAME).should == true
+    File.send(@method, 'nested/**/*', 'nested/subdir/file', File::FNM_PATHNAME).should == true
+    File.send(@method, 'nested/**/*', 'nested/.dotsubdir', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == true
+    File.send(@method, 'nested/**/*', 'nested/.dotsubir/.dotfile', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == true
   end
 
   it "matches ** with FNM_PATHNAME only in current directory" do
-    File.send(@method, 'nested/**', 'nested/subdir', File::FNM_PATHNAME).should be_true
-    File.send(@method, 'nested/**', 'nested/subdir/file', File::FNM_PATHNAME).should be_false
-    File.send(@method, 'nested/**', 'nested/.dotsubdir', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
-    File.send(@method, 'nested/**', 'nested/.dotsubir/.dotfile', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_false
+    File.send(@method, 'nested/**', 'nested/subdir', File::FNM_PATHNAME).should == true
+    File.send(@method, 'nested/**', 'nested/subdir/file', File::FNM_PATHNAME).should == false
+    File.send(@method, 'nested/**', 'nested/.dotsubdir', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == true
+    File.send(@method, 'nested/**', 'nested/.dotsubir/.dotfile', File::FNM_PATHNAME | File::FNM_DOTMATCH).should == false
   end
 
   it "accepts an object that has a #to_path method" do
@@ -271,21 +271,21 @@
   end
 
   it "raises a TypeError if the first and second arguments are not string-like" do
-    -> { File.send(@method, nil, nil, 0, 0) }.should raise_error(ArgumentError)
-    -> { File.send(@method, 1, 'some/thing') }.should raise_error(TypeError)
-    -> { File.send(@method, 'some/thing', 1) }.should raise_error(TypeError)
-    -> { File.send(@method, 1, 1) }.should raise_error(TypeError)
+    -> { File.send(@method, nil, nil, 0, 0) }.should.raise(ArgumentError)
+    -> { File.send(@method, 1, 'some/thing') }.should.raise(TypeError)
+    -> { File.send(@method, 'some/thing', 1) }.should.raise(TypeError)
+    -> { File.send(@method, 1, 1) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the third argument is not an Integer" do
-    -> { File.send(@method, "*/place", "path/to/file", "flags") }.should raise_error(TypeError)
-    -> { File.send(@method, "*/place", "path/to/file", nil) }.should raise_error(TypeError)
+    -> { File.send(@method, "*/place", "path/to/file", "flags") }.should.raise(TypeError)
+    -> { File.send(@method, "*/place", "path/to/file", nil) }.should.raise(TypeError)
   end
 
   it "does not raise a TypeError if the third argument can be coerced to an Integer" do
     flags = mock("flags")
     flags.should_receive(:to_int).and_return(10)
-    -> { File.send(@method, "*/place", "path/to/file", flags) }.should_not raise_error
+    -> { File.send(@method, "*/place", "path/to/file", flags) }.should_not.raise
   end
 
   it "matches multibyte characters" do
diff --git a/spec/ruby/core/file/shared/open.rb b/spec/ruby/core/file/shared/open.rb
index 677a82a3516..67149235ca9 100644
--- a/spec/ruby/core/file/shared/open.rb
+++ b/spec/ruby/core/file/shared/open.rb
@@ -4,7 +4,7 @@
   it "opens directories" do
     file = File.send(@method, tmp(""))
     begin
-      file.should be_kind_of(File)
+      file.should.is_a?(File)
     ensure
       file.close
     end
diff --git a/spec/ruby/core/file/shared/path.rb b/spec/ruby/core/file/shared/path.rb
index 5a9fe1b0c50..6c6f7d4234a 100644
--- a/spec/ruby/core/file/shared/path.rb
+++ b/spec/ruby/core/file/shared/path.rb
@@ -12,7 +12,7 @@
 
   it "returns a String" do
     @file = File.new @path
-    @file.send(@method).should be_an_instance_of(String)
+    @file.send(@method).should.instance_of?(String)
   end
 
   it "returns a different String on every call" do
diff --git a/spec/ruby/core/file/shared/read.rb b/spec/ruby/core/file/shared/read.rb
index f2322352984..f60800bb2f3 100644
--- a/spec/ruby/core/file/shared/read.rb
+++ b/spec/ruby/core/file/shared/read.rb
@@ -3,13 +3,13 @@
 describe :file_read_directory, shared: true do
   platform_is :darwin, :linux, :freebsd, :openbsd, :windows do
     it "raises an Errno::EISDIR when passed a path that is a directory" do
-      -> { @object.send(@method, ".") }.should raise_error(Errno::EISDIR)
+      -> { @object.send(@method, ".") }.should.raise(Errno::EISDIR)
     end
   end
 
   platform_is :netbsd do
     it "does not raises any exception when passed a path that is a directory" do
-      -> { @object.send(@method, ".") }.should_not raise_error
+      -> { @object.send(@method, ".") }.should_not.raise
     end
   end
 end
diff --git a/spec/ruby/core/file/shared/stat.rb b/spec/ruby/core/file/shared/stat.rb
index fdaf97ea61a..879a7f11ffc 100644
--- a/spec/ruby/core/file/shared/stat.rb
+++ b/spec/ruby/core/file/shared/stat.rb
@@ -10,13 +10,13 @@
 
   it "returns a File::Stat object if the given file exists" do
     st = File.send(@method, @file)
-    st.should be_an_instance_of(File::Stat)
+    st.should.instance_of?(File::Stat)
   end
 
   it "returns a File::Stat object when called on an instance of File" do
     File.open(@file) do |f|
       st = f.send(@method)
-      st.should be_an_instance_of(File::Stat)
+      st.should.instance_of?(File::Stat)
     end
   end
 
@@ -27,6 +27,6 @@
   it "raises an Errno::ENOENT if the file does not exist" do
     -> {
       File.send(@method, "fake_file")
-    }.should raise_error(Errno::ENOENT)
+    }.should.raise(Errno::ENOENT)
   end
 end
diff --git a/spec/ruby/core/file/shared/unlink.rb b/spec/ruby/core/file/shared/unlink.rb
index e339e932713..0032907ba26 100644
--- a/spec/ruby/core/file/shared/unlink.rb
+++ b/spec/ruby/core/file/shared/unlink.rb
@@ -31,11 +31,11 @@
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { File.send(@method, 1) }.should raise_error(TypeError)
+    -> { File.send(@method, 1) }.should.raise(TypeError)
   end
 
   it "raises an Errno::ENOENT when the given file doesn't exist" do
-    -> { File.send(@method, 'bogus') }.should raise_error(Errno::ENOENT)
+    -> { File.send(@method, 'bogus') }.should.raise(Errno::ENOENT)
   end
 
   it "coerces a given parameter into a string if possible" do
diff --git a/spec/ruby/core/file/size_spec.rb b/spec/ruby/core/file/size_spec.rb
index 11d20cbacbb..784c18c26ef 100644
--- a/spec/ruby/core/file/size_spec.rb
+++ b/spec/ruby/core/file/size_spec.rb
@@ -56,11 +56,11 @@
   end
 
   it "is an instance method" do
-    @file.respond_to?(:size).should be_true
+    @file.respond_to?(:size).should == true
   end
 
   it "returns the file's size as an Integer" do
-    @file.size.should be_an_instance_of(Integer)
+    @file.size.should.instance_of?(Integer)
   end
 
   it "returns the file's size in bytes" do
@@ -81,7 +81,7 @@
 
   it "raises an IOError on a closed file" do
     @file.close
-    -> { @file.size }.should raise_error(IOError)
+    -> { @file.size }.should.raise(IOError)
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/core/file/split_spec.rb b/spec/ruby/core/file/split_spec.rb
index 7b958621b9e..e989a6b86ed 100644
--- a/spec/ruby/core/file/split_spec.rb
+++ b/spec/ruby/core/file/split_spec.rb
@@ -44,12 +44,12 @@
   end
 
   it "raises an ArgumentError when not passed a single argument" do
-    -> { File.split }.should raise_error(ArgumentError)
-    -> { File.split('string', 'another string') }.should raise_error(ArgumentError)
+    -> { File.split }.should.raise(ArgumentError)
+    -> { File.split('string', 'another string') }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if the argument is not a String type" do
-    -> { File.split(1) }.should raise_error(TypeError)
+    -> { File.split(1) }.should.raise(TypeError)
   end
 
   it "coerces the argument with to_str if it is not a String type" do
diff --git a/spec/ruby/core/file/stat/atime_spec.rb b/spec/ruby/core/file/stat/atime_spec.rb
index 9f1111ced1a..2fecaed3000 100644
--- a/spec/ruby/core/file/stat/atime_spec.rb
+++ b/spec/ruby/core/file/stat/atime_spec.rb
@@ -12,7 +12,7 @@
 
   it "returns the atime of a File::Stat object" do
     st = File.stat(@file)
-    st.atime.should be_kind_of(Time)
+    st.atime.should.is_a?(Time)
     st.atime.should <= Time.now
   end
 end
diff --git a/spec/ruby/core/file/stat/birthtime_spec.rb b/spec/ruby/core/file/stat/birthtime_spec.rb
index 9aa39297b24..728f6353971 100644
--- a/spec/ruby/core/file/stat/birthtime_spec.rb
+++ b/spec/ruby/core/file/stat/birthtime_spec.rb
@@ -20,7 +20,7 @@
 
     it "returns the birthtime of a File::Stat object" do
       st = File.stat(@file)
-      st.birthtime.should be_kind_of(Time)
+      st.birthtime.should.is_a?(Time)
       st.birthtime.should <= Time.now
     rescue NotImplementedError => e
       e.message.should.start_with?(*not_implemented_messages)
diff --git a/spec/ruby/core/file/stat/blocks_spec.rb b/spec/ruby/core/file/stat/blocks_spec.rb
index f3f903d0f72..5e0efc8bc26 100644
--- a/spec/ruby/core/file/stat/blocks_spec.rb
+++ b/spec/ruby/core/file/stat/blocks_spec.rb
@@ -21,7 +21,7 @@
   platform_is :windows do
     it "returns nil" do
       st = File.stat(@file)
-      st.blocks.should be_nil
+      st.blocks.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/ctime_spec.rb b/spec/ruby/core/file/stat/ctime_spec.rb
index fd50487a0a4..dbf43a74536 100644
--- a/spec/ruby/core/file/stat/ctime_spec.rb
+++ b/spec/ruby/core/file/stat/ctime_spec.rb
@@ -12,7 +12,7 @@
 
   it "returns the ctime of a File::Stat object" do
     st = File.stat(@file)
-    st.ctime.should be_kind_of(Time)
+    st.ctime.should.is_a?(Time)
     st.ctime.should <= Time.now
   end
 end
diff --git a/spec/ruby/core/file/stat/dev_major_spec.rb b/spec/ruby/core/file/stat/dev_major_spec.rb
index 4966d609e29..a199eaaa11d 100644
--- a/spec/ruby/core/file/stat/dev_major_spec.rb
+++ b/spec/ruby/core/file/stat/dev_major_spec.rb
@@ -11,13 +11,13 @@
 
   platform_is_not :windows do
     it "returns the major part of File::Stat#dev" do
-      File.stat(@name).dev_major.should be_kind_of(Integer)
+      File.stat(@name).dev_major.should.is_a?(Integer)
     end
   end
 
   platform_is :windows do
     it "returns nil" do
-      File.stat(@name).dev_major.should be_nil
+      File.stat(@name).dev_major.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/dev_minor_spec.rb b/spec/ruby/core/file/stat/dev_minor_spec.rb
index ea79c12b998..8ce94778cae 100644
--- a/spec/ruby/core/file/stat/dev_minor_spec.rb
+++ b/spec/ruby/core/file/stat/dev_minor_spec.rb
@@ -11,13 +11,13 @@
 
   platform_is_not :windows do
     it "returns the minor part of File::Stat#dev" do
-      File.stat(@name).dev_minor.should be_kind_of(Integer)
+      File.stat(@name).dev_minor.should.is_a?(Integer)
     end
   end
 
   platform_is :windows do
     it "returns nil" do
-      File.stat(@name).dev_minor.should be_nil
+      File.stat(@name).dev_minor.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/dev_spec.rb b/spec/ruby/core/file/stat/dev_spec.rb
index e953fcaa582..cd5e3d175e9 100644
--- a/spec/ruby/core/file/stat/dev_spec.rb
+++ b/spec/ruby/core/file/stat/dev_spec.rb
@@ -10,6 +10,6 @@
   end
 
   it "returns the number of the device on which the file exists" do
-    File.stat(@name).dev.should be_kind_of(Integer)
+    File.stat(@name).dev.should.is_a?(Integer)
   end
 end
diff --git a/spec/ruby/core/file/stat/ftype_spec.rb b/spec/ruby/core/file/stat/ftype_spec.rb
index eb892eae5fa..df2e3ada1ed 100644
--- a/spec/ruby/core/file/stat/ftype_spec.rb
+++ b/spec/ruby/core/file/stat/ftype_spec.rb
@@ -8,7 +8,7 @@
 
   it "returns a String" do
     FileSpecs.normal_file do |file|
-      File.lstat(file).ftype.should be_kind_of(String)
+      File.lstat(file).ftype.should.is_a?(String)
     end
   end
 
diff --git a/spec/ruby/core/file/stat/ino_spec.rb b/spec/ruby/core/file/stat/ino_spec.rb
index 42370aecb72..c09b6448c71 100644
--- a/spec/ruby/core/file/stat/ino_spec.rb
+++ b/spec/ruby/core/file/stat/ino_spec.rb
@@ -13,7 +13,7 @@
   platform_is_not :windows do
     it "returns the ino of a File::Stat object" do
       st = File.stat(@file)
-      st.ino.should be_kind_of(Integer)
+      st.ino.should.is_a?(Integer)
       st.ino.should > 0
     end
   end
@@ -21,7 +21,7 @@
   platform_is :windows do
     it "returns BY_HANDLE_FILE_INFORMATION.nFileIndexHigh/Low of a File::Stat object" do
       st = File.stat(@file)
-      st.ino.should be_kind_of(Integer)
+      st.ino.should.is_a?(Integer)
       st.ino.should > 0
     end
   end
diff --git a/spec/ruby/core/file/stat/mtime_spec.rb b/spec/ruby/core/file/stat/mtime_spec.rb
index 08a2b83463b..7844491212b 100644
--- a/spec/ruby/core/file/stat/mtime_spec.rb
+++ b/spec/ruby/core/file/stat/mtime_spec.rb
@@ -12,7 +12,7 @@
 
   it "returns the mtime of a File::Stat object" do
     st = File.stat(@file)
-    st.mtime.should be_kind_of(Time)
+    st.mtime.should.is_a?(Time)
     st.mtime.should <= Time.now
   end
 end
diff --git a/spec/ruby/core/file/stat/new_spec.rb b/spec/ruby/core/file/stat/new_spec.rb
index c0d9432ac81..b8c36000284 100644
--- a/spec/ruby/core/file/stat/new_spec.rb
+++ b/spec/ruby/core/file/stat/new_spec.rb
@@ -15,12 +15,12 @@
   it "raises an exception if the file doesn't exist" do
     -> {
       File::Stat.new(tmp("i_am_a_dummy_file_that_doesnt_exist"))
-    }.should raise_error(Errno::ENOENT)
+    }.should.raise(Errno::ENOENT)
   end
 
   it "creates a File::Stat object for the given file" do
     st = File::Stat.new(@file)
-    st.should be_kind_of(File::Stat)
+    st.should.is_a?(File::Stat)
     st.ftype.should == 'file'
   end
 
diff --git a/spec/ruby/core/file/stat/rdev_major_spec.rb b/spec/ruby/core/file/stat/rdev_major_spec.rb
index e08d19c03ad..e1b44fc2d0d 100644
--- a/spec/ruby/core/file/stat/rdev_major_spec.rb
+++ b/spec/ruby/core/file/stat/rdev_major_spec.rb
@@ -12,13 +12,13 @@
 
   platform_is_not :windows do
     it "returns the major part of File::Stat#rdev" do
-      File.stat(@name).rdev_major.should be_kind_of(Integer)
+      File.stat(@name).rdev_major.should.is_a?(Integer)
     end
   end
 
   platform_is :windows do
     it "returns nil" do
-      File.stat(@name).rdev_major.should be_nil
+      File.stat(@name).rdev_major.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/rdev_minor_spec.rb b/spec/ruby/core/file/stat/rdev_minor_spec.rb
index ace5b8a7320..8af3b9f5878 100644
--- a/spec/ruby/core/file/stat/rdev_minor_spec.rb
+++ b/spec/ruby/core/file/stat/rdev_minor_spec.rb
@@ -12,13 +12,13 @@
 
   platform_is_not :windows do
     it "returns the minor part of File::Stat#rdev" do
-      File.stat(@name).rdev_minor.should be_kind_of(Integer)
+      File.stat(@name).rdev_minor.should.is_a?(Integer)
     end
   end
 
   platform_is :windows do
     it "returns nil" do
-      File.stat(@name).rdev_minor.should be_nil
+      File.stat(@name).rdev_minor.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/rdev_spec.rb b/spec/ruby/core/file/stat/rdev_spec.rb
index 9e1aee692dc..7e4252fcc64 100644
--- a/spec/ruby/core/file/stat/rdev_spec.rb
+++ b/spec/ruby/core/file/stat/rdev_spec.rb
@@ -10,6 +10,6 @@
   end
 
   it "returns the number of the device this file represents which the file exists" do
-    File.stat(@name).rdev.should be_kind_of(Integer)
+    File.stat(@name).rdev.should.is_a?(Integer)
   end
 end
diff --git a/spec/ruby/core/file/stat_spec.rb b/spec/ruby/core/file/stat_spec.rb
index 63655000573..d5238b63317 100644
--- a/spec/ruby/core/file/stat_spec.rb
+++ b/spec/ruby/core/file/stat_spec.rb
@@ -28,9 +28,9 @@
         st.size.should == 8
         st.size?.should == 8
         st.blksize.should >= 0
-        st.atime.should be_kind_of(Time)
-        st.ctime.should be_kind_of(Time)
-        st.mtime.should be_kind_of(Time)
+        st.atime.should.is_a?(Time)
+        st.ctime.should.is_a?(Time)
+        st.mtime.should.is_a?(Time)
       end
     end
 
@@ -46,9 +46,9 @@
       missing_path = "/missingfilepath\xE3E4".b
       -> {
         File.stat(missing_path)
-      }.should raise_error(SystemCallError) { |e|
-        [Errno::ENOENT, Errno::EILSEQ].should include(e.class)
-        e.message.should include(missing_path)
+      }.should.raise(SystemCallError) { |e|
+        [Errno::ENOENT, Errno::EILSEQ].should.include?(e.class)
+        e.message.should.include?(missing_path)
       }
     end
   end
diff --git a/spec/ruby/core/file/symlink_spec.rb b/spec/ruby/core/file/symlink_spec.rb
index 0e8b0a5a201..4ceeb28c847 100644
--- a/spec/ruby/core/file/symlink_spec.rb
+++ b/spec/ruby/core/file/symlink_spec.rb
@@ -32,18 +32,18 @@
 
     it "raises an Errno::EEXIST if the target already exists" do
       File.symlink(@file, @link)
-      -> { File.symlink(@file, @link) }.should raise_error(Errno::EEXIST)
+      -> { File.symlink(@file, @link) }.should.raise(Errno::EEXIST)
     end
 
     it "raises an ArgumentError if not called with two arguments" do
-      -> { File.symlink        }.should raise_error(ArgumentError)
-      -> { File.symlink(@file) }.should raise_error(ArgumentError)
+      -> { File.symlink        }.should.raise(ArgumentError)
+      -> { File.symlink(@file) }.should.raise(ArgumentError)
     end
 
     it "raises a TypeError if not called with String types" do
-      -> { File.symlink(@file, nil) }.should raise_error(TypeError)
-      -> { File.symlink(@file, 1)   }.should raise_error(TypeError)
-      -> { File.symlink(1, 1)       }.should raise_error(TypeError)
+      -> { File.symlink(@file, nil) }.should.raise(TypeError)
+      -> { File.symlink(@file, 1)   }.should.raise(TypeError)
+      -> { File.symlink(1, 1)       }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/file/truncate_spec.rb b/spec/ruby/core/file/truncate_spec.rb
index b4a2e3e5772..5f37f341554 100644
--- a/spec/ruby/core/file/truncate_spec.rb
+++ b/spec/ruby/core/file/truncate_spec.rb
@@ -54,29 +54,29 @@
     rm_r not_existing_file
 
     begin
-      -> { File.truncate(not_existing_file, 5) }.should raise_error(Errno::ENOENT)
+      -> { File.truncate(not_existing_file, 5) }.should.raise(Errno::ENOENT)
     ensure
       rm_r not_existing_file
     end
   end
 
   it "raises an ArgumentError if not passed two arguments" do
-    -> { File.truncate        }.should raise_error(ArgumentError)
-    -> { File.truncate(@name) }.should raise_error(ArgumentError)
+    -> { File.truncate        }.should.raise(ArgumentError)
+    -> { File.truncate(@name) }.should.raise(ArgumentError)
   end
 
   platform_is_not :netbsd, :openbsd do
     it "raises an Errno::EINVAL if the length argument is not valid" do
-      -> { File.truncate(@name, -1)  }.should raise_error(Errno::EINVAL) # May fail
+      -> { File.truncate(@name, -1)  }.should.raise(Errno::EINVAL) # May fail
     end
   end
 
   it "raises a TypeError if not passed a String type for the first argument" do
-    -> { File.truncate(1, 1) }.should raise_error(TypeError)
+    -> { File.truncate(1, 1) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if not passed an Integer type for the second argument" do
-    -> { File.truncate(@name, nil) }.should raise_error(TypeError)
+    -> { File.truncate(@name, nil) }.should.raise(TypeError)
   end
 
   it "accepts an object that has a #to_path method" do
@@ -149,29 +149,29 @@
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { @file.truncate        }.should raise_error(ArgumentError)
-    -> { @file.truncate(1) }.should_not raise_error(ArgumentError)
+    -> { @file.truncate        }.should.raise(ArgumentError)
+    -> { @file.truncate(1) }.should_not.raise(ArgumentError)
   end
 
   platform_is_not :netbsd do
     it "raises an Errno::EINVAL if the length argument is not valid" do
-      -> { @file.truncate(-1)  }.should raise_error(Errno::EINVAL) # May fail
+      -> { @file.truncate(-1)  }.should.raise(Errno::EINVAL) # May fail
     end
   end
 
   it "raises an IOError if file is closed" do
     @file.close
     @file.should.closed?
-    -> { @file.truncate(42) }.should raise_error(IOError)
+    -> { @file.truncate(42) }.should.raise(IOError)
   end
 
   it "raises an IOError if file is not opened for writing" do
     File.open(@name, 'r') do |file|
-      -> { file.truncate(42) }.should raise_error(IOError)
+      -> { file.truncate(42) }.should.raise(IOError)
     end
   end
 
   it "raises a TypeError if not passed an Integer type for the for the argument" do
-    -> { @file.truncate(nil) }.should raise_error(TypeError)
+    -> { @file.truncate(nil) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/file/umask_spec.rb b/spec/ruby/core/file/umask_spec.rb
index 7f7e40abbc5..fea8cf76332 100644
--- a/spec/ruby/core/file/umask_spec.rb
+++ b/spec/ruby/core/file/umask_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it "returns an Integer" do
-    File.umask.should be_kind_of(Integer)
+    File.umask.should.is_a?(Integer)
   end
 
   platform_is_not :windows do
@@ -47,11 +47,11 @@
   end
 
   it "raises RangeError with too large values" do
-    -> { File.umask(2**64) }.should raise_error(RangeError)
-    -> { File.umask(-2**63 - 1) }.should raise_error(RangeError)
+    -> { File.umask(2**64) }.should.raise(RangeError)
+    -> { File.umask(-2**63 - 1) }.should.raise(RangeError)
   end
 
   it "raises ArgumentError when more than one argument is provided" do
-    -> { File.umask(022, 022) }.should raise_error(ArgumentError)
+    -> { File.umask(022, 022) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/file/world_readable_spec.rb b/spec/ruby/core/file/world_readable_spec.rb
index 11b8e67d0bf..0f5e0b13d7f 100644
--- a/spec/ruby/core/file/world_readable_spec.rb
+++ b/spec/ruby/core/file/world_readable_spec.rb
@@ -7,6 +7,6 @@
   it "returns nil if the file does not exist" do
     file = rand.to_s + $$.to_s
     File.should_not.exist?(file)
-    File.world_readable?(file).should be_nil
+    File.world_readable?(file).should == nil
   end
 end
diff --git a/spec/ruby/core/file/world_writable_spec.rb b/spec/ruby/core/file/world_writable_spec.rb
index d378cf2eb93..46ba6832f98 100644
--- a/spec/ruby/core/file/world_writable_spec.rb
+++ b/spec/ruby/core/file/world_writable_spec.rb
@@ -7,6 +7,6 @@
   it "returns nil if the file does not exist" do
     file = rand.to_s + $$.to_s
     File.should_not.exist?(file)
-    File.world_writable?(file).should be_nil
+    File.world_writable?(file).should == nil
   end
 end
diff --git a/spec/ruby/core/filetest/grpowned_spec.rb b/spec/ruby/core/filetest/grpowned_spec.rb
index d073cb9770e..d6bd6abd71d 100644
--- a/spec/ruby/core/filetest/grpowned_spec.rb
+++ b/spec/ruby/core/filetest/grpowned_spec.rb
@@ -5,6 +5,6 @@
   it_behaves_like :file_grpowned, :grpowned?, FileTest
 
   it "returns false if the file doesn't exist" do
-    FileTest.grpowned?("xxx-tmp-doesnt_exist-blah").should be_false
+    FileTest.grpowned?("xxx-tmp-doesnt_exist-blah").should == false
   end
 end
diff --git a/spec/ruby/core/float/ceil_spec.rb b/spec/ruby/core/float/ceil_spec.rb
index 5236a133f5d..efd1e6feb2e 100644
--- a/spec/ruby/core/float/ceil_spec.rb
+++ b/spec/ruby/core/float/ceil_spec.rb
@@ -7,22 +7,22 @@
   end
 
   it "returns the smallest Integer greater than or equal to self" do
-    -1.2.ceil.should eql( -1)
-    -1.0.ceil.should eql( -1)
-    0.0.ceil.should  eql( 0 )
-    1.3.ceil.should  eql( 2 )
-    3.0.ceil.should  eql( 3 )
-    -9223372036854775808.1.ceil.should eql(-9223372036854775808)
-    +9223372036854775808.1.ceil.should eql(+9223372036854775808)
+    -1.2.ceil.should.eql?( -1)
+    -1.0.ceil.should.eql?( -1)
+    0.0.ceil.should.eql?( 0 )
+    1.3.ceil.should.eql?( 2 )
+    3.0.ceil.should.eql?( 3 )
+    -9223372036854775808.1.ceil.should.eql?(-9223372036854775808)
+    +9223372036854775808.1.ceil.should.eql?(+9223372036854775808)
   end
 
   it "returns the smallest number greater than or equal to self with an optionally given precision" do
-    2.1679.ceil(0).should   eql(3)
-    214.94.ceil(-1).should  eql(220)
-    7.0.ceil(1).should      eql(7.0)
-    200.0.ceil(-2).should   eql(200)
-    -1.234.ceil(2).should   eql(-1.23)
-    5.123812.ceil(4).should eql(5.1239)
-    10.00001.ceil(5).should eql(10.00001)
+    2.1679.ceil(0).should.eql?(3)
+    214.94.ceil(-1).should.eql?(220)
+    7.0.ceil(1).should.eql?(7.0)
+    200.0.ceil(-2).should.eql?(200)
+    -1.234.ceil(2).should.eql?(-1.23)
+    5.123812.ceil(4).should.eql?(5.1239)
+    10.00001.ceil(5).should.eql?(10.00001)
   end
 end
diff --git a/spec/ruby/core/float/comparison_spec.rb b/spec/ruby/core/float/comparison_spec.rb
index 0cd290f4ad4..e9adf2fd6aa 100644
--- a/spec/ruby/core/float/comparison_spec.rb
+++ b/spec/ruby/core/float/comparison_spec.rb
@@ -29,10 +29,10 @@
   end
 
   it "returns nil when the given argument is not a Float" do
-    (1.0 <=> "1").should be_nil
-    (1.0 <=> "1".freeze).should be_nil
-    (1.0 <=> :one).should be_nil
-    (1.0 <=> true).should be_nil
+    (1.0 <=> "1").should == nil
+    (1.0 <=> "1".freeze).should == nil
+    (1.0 <=> :one).should == nil
+    (1.0 <=> true).should == nil
   end
 
   it "compares using #coerce when argument is not a Float" do
@@ -62,7 +62,7 @@ def coerce(other)
     bad_coercible = klass.new
     -> {
       4.2 <=> bad_coercible
-    }.should raise_error(TypeError, "coerce must return [x, y]")
+    }.should.raise(TypeError, "coerce must return [x, y]")
   end
 
   it "returns the correct result when one side is infinite" do
diff --git a/spec/ruby/core/float/constants_spec.rb b/spec/ruby/core/float/constants_spec.rb
index 497e0ae1884..1b71ee8adfd 100644
--- a/spec/ruby/core/float/constants_spec.rb
+++ b/spec/ruby/core/float/constants_spec.rb
@@ -50,6 +50,6 @@
   end
 
   it "NAN is 'not a number'" do
-    Float::NAN.nan?.should be_true
+    Float::NAN.nan?.should == true
   end
 end
diff --git a/spec/ruby/core/float/denominator_spec.rb b/spec/ruby/core/float/denominator_spec.rb
index 6f4fcfcf230..85beaa98cd1 100644
--- a/spec/ruby/core/float/denominator_spec.rb
+++ b/spec/ruby/core/float/denominator_spec.rb
@@ -12,7 +12,7 @@
 
   it "returns an Integer" do
     @numbers.each do |number|
-      number.denominator.should be_kind_of(Integer)
+      number.denominator.should.is_a?(Integer)
     end
   end
 
diff --git a/spec/ruby/core/float/divide_spec.rb b/spec/ruby/core/float/divide_spec.rb
index 72ab7527bd5..68a2c550a75 100644
--- a/spec/ruby/core/float/divide_spec.rb
+++ b/spec/ruby/core/float/divide_spec.rb
@@ -16,25 +16,25 @@
   end
 
   it "returns +Infinity when dividing non-zero by zero of the same sign" do
-    (1.0 / 0.0).should be_positive_infinity
-    (-1.0 / -0.0).should be_positive_infinity
+    (1.0 / 0.0).should.infinite? == 1
+    (-1.0 / -0.0).should.infinite? == 1
   end
 
   it "returns -Infinity when dividing non-zero by zero of opposite sign" do
-    (-1.0 / 0.0).should be_negative_infinity
-    (1.0 / -0.0).should be_negative_infinity
+    (-1.0 / 0.0).should.infinite? == -1
+    (1.0 / -0.0).should.infinite? == -1
   end
 
   it "returns NaN when dividing zero by zero" do
-    (0.0 / 0.0).should be_nan
-    (-0.0 / 0.0).should be_nan
-    (0.0 / -0.0).should be_nan
-    (-0.0 / -0.0).should be_nan
+    (0.0 / 0.0).should.nan?
+    (-0.0 / 0.0).should.nan?
+    (0.0 / -0.0).should.nan?
+    (-0.0 / -0.0).should.nan?
   end
 
   it "raises a TypeError when given a non-Numeric" do
-    -> { 13.0 / "10"    }.should raise_error(TypeError)
-    -> { 13.0 / :symbol }.should raise_error(TypeError)
+    -> { 13.0 / "10"    }.should.raise(TypeError)
+    -> { 13.0 / :symbol }.should.raise(TypeError)
   end
 
   it "divides correctly by Rational numbers" do
diff --git a/spec/ruby/core/float/divmod_spec.rb b/spec/ruby/core/float/divmod_spec.rb
index dad45a9b896..7ed6cd34870 100644
--- a/spec/ruby/core/float/divmod_spec.rb
+++ b/spec/ruby/core/float/divmod_spec.rb
@@ -3,41 +3,41 @@
 describe "Float#divmod" do
   it "returns an [quotient, modulus] from dividing self by other" do
     values = 3.14.divmod(2)
-    values[0].should eql(1)
+    values[0].should.eql?(1)
     values[1].should be_close(1.14, TOLERANCE)
     values = 2.8284.divmod(3.1415)
-    values[0].should eql(0)
+    values[0].should.eql?(0)
     values[1].should be_close(2.8284, TOLERANCE)
     values = -1.0.divmod(bignum_value)
-    values[0].should eql(-1)
+    values[0].should.eql?(-1)
     values[1].should be_close(18446744073709551616.0, TOLERANCE)
     values = -1.0.divmod(1)
-    values[0].should eql(-1)
-    values[1].should eql(0.0)
+    values[0].should.eql?(-1)
+    values[1].should.eql?(0.0)
   end
 
   # Behaviour established as correct in r23953
   it "raises a FloatDomainError if self is NaN" do
-    -> { nan_value.divmod(1) }.should raise_error(FloatDomainError)
+    -> { nan_value.divmod(1) }.should.raise(FloatDomainError)
   end
 
   # Behaviour established as correct in r23953
   it "raises a FloatDomainError if other is NaN" do
-    -> { 1.0.divmod(nan_value) }.should raise_error(FloatDomainError)
+    -> { 1.0.divmod(nan_value) }.should.raise(FloatDomainError)
   end
 
   # Behaviour established as correct in r23953
   it "raises a FloatDomainError if self is Infinity" do
-    -> { infinity_value.divmod(1) }.should raise_error(FloatDomainError)
+    -> { infinity_value.divmod(1) }.should.raise(FloatDomainError)
   end
 
   it "raises a ZeroDivisionError if other is zero" do
-    -> { 1.0.divmod(0)   }.should raise_error(ZeroDivisionError)
-    -> { 1.0.divmod(0.0) }.should raise_error(ZeroDivisionError)
+    -> { 1.0.divmod(0)   }.should.raise(ZeroDivisionError)
+    -> { 1.0.divmod(0.0) }.should.raise(ZeroDivisionError)
   end
 
   # redmine #5276"
   it "returns the correct [quotient, modulus] even for large quotient" do
-    0.59.divmod(7.761021455128987e-11).first.should eql(7602092113)
+    0.59.divmod(7.761021455128987e-11).first.should.eql?(7602092113)
   end
 end
diff --git a/spec/ruby/core/float/dup_spec.rb b/spec/ruby/core/float/dup_spec.rb
index 294da8e2bcd..b474e21325e 100644
--- a/spec/ruby/core/float/dup_spec.rb
+++ b/spec/ruby/core/float/dup_spec.rb
@@ -3,6 +3,6 @@
 describe "Float#dup" do
   it "returns self" do
     float = 2.4
-    float.dup.should equal(float)
+    float.dup.should.equal?(float)
   end
 end
diff --git a/spec/ruby/core/float/eql_spec.rb b/spec/ruby/core/float/eql_spec.rb
index 6b5f91db336..cf1ad8416f5 100644
--- a/spec/ruby/core/float/eql_spec.rb
+++ b/spec/ruby/core/float/eql_spec.rb
@@ -2,15 +2,15 @@
 
 describe "Float#eql?" do
   it "returns true if other is a Float equal to self" do
-    0.0.eql?(0.0).should be_true
+    0.0.eql?(0.0).should == true
   end
 
   it "returns false if other is a Float not equal to self" do
-    1.0.eql?(1.1).should be_false
+    1.0.eql?(1.1).should == false
   end
 
   it "returns false if other is not a Float" do
-    1.0.eql?(1).should be_false
-    1.0.eql?(:one).should be_false
+    1.0.eql?(1).should == false
+    1.0.eql?(:one).should == false
   end
 end
diff --git a/spec/ruby/core/float/float_spec.rb b/spec/ruby/core/float/float_spec.rb
index 263ae820792..46b2eff372b 100644
--- a/spec/ruby/core/float/float_spec.rb
+++ b/spec/ruby/core/float/float_spec.rb
@@ -8,12 +8,12 @@
   it ".allocate raises a TypeError" do
     -> do
       Float.allocate
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it ".new is undefined" do
     -> do
       Float.new
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/float/floor_spec.rb b/spec/ruby/core/float/floor_spec.rb
index 1fafdadee9b..f77300eb048 100644
--- a/spec/ruby/core/float/floor_spec.rb
+++ b/spec/ruby/core/float/floor_spec.rb
@@ -7,22 +7,22 @@
   end
 
   it "returns the largest Integer less than or equal to self" do
-    -1.2.floor.should eql( -2)
-    -1.0.floor.should eql( -1)
-    0.0.floor.should  eql( 0 )
-    1.0.floor.should  eql( 1 )
-    5.9.floor.should  eql( 5 )
-    -9223372036854775808.1.floor.should eql(-9223372036854775808)
-    +9223372036854775808.1.floor.should eql(+9223372036854775808)
+    -1.2.floor.should.eql?( -2)
+    -1.0.floor.should.eql?( -1)
+    0.0.floor.should.eql?( 0 )
+    1.0.floor.should.eql?( 1 )
+    5.9.floor.should.eql?( 5 )
+    -9223372036854775808.1.floor.should.eql?(-9223372036854775808)
+    +9223372036854775808.1.floor.should.eql?(+9223372036854775808)
   end
 
   it "returns the largest number less than or equal to self with an optionally given precision" do
-    2.1679.floor(0).should   eql(2)
-    214.94.floor(-1).should  eql(210)
-    7.0.floor(1).should      eql(7.0)
-    200.0.floor(-2).should   eql(200)
-    -1.234.floor(2).should   eql(-1.24)
-    5.123812.floor(4).should eql(5.1238)
-    10.00001.floor(5).should eql(10.00001)
+    2.1679.floor(0).should.eql?(2)
+    214.94.floor(-1).should.eql?(210)
+    7.0.floor(1).should.eql?(7.0)
+    200.0.floor(-2).should.eql?(200)
+    -1.234.floor(2).should.eql?(-1.24)
+    5.123812.floor(4).should.eql?(5.1238)
+    10.00001.floor(5).should.eql?(10.00001)
   end
 end
diff --git a/spec/ruby/core/float/gt_spec.rb b/spec/ruby/core/float/gt_spec.rb
index 33078e07cee..5194796b468 100644
--- a/spec/ruby/core/float/gt_spec.rb
+++ b/spec/ruby/core/float/gt_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it "raises an ArgumentError when given a non-Numeric" do
-    -> { 5.0 > "4"       }.should raise_error(ArgumentError)
-    -> { 5.0 > mock('x') }.should raise_error(ArgumentError)
+    -> { 5.0 > "4"       }.should.raise(ArgumentError)
+    -> { 5.0 > mock('x') }.should.raise(ArgumentError)
   end
 
   it "returns false if one side is NaN" do
diff --git a/spec/ruby/core/float/gte_spec.rb b/spec/ruby/core/float/gte_spec.rb
index 44c0a81b43c..4a62725d539 100644
--- a/spec/ruby/core/float/gte_spec.rb
+++ b/spec/ruby/core/float/gte_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it "raises an ArgumentError when given a non-Numeric" do
-    -> { 5.0 >= "4"       }.should raise_error(ArgumentError)
-    -> { 5.0 >= mock('x') }.should raise_error(ArgumentError)
+    -> { 5.0 >= "4"       }.should.raise(ArgumentError)
+    -> { 5.0 >= mock('x') }.should.raise(ArgumentError)
   end
 
   it "returns false if one side is NaN" do
diff --git a/spec/ruby/core/float/lt_spec.rb b/spec/ruby/core/float/lt_spec.rb
index 94dcfc42f88..0f0e1752bd8 100644
--- a/spec/ruby/core/float/lt_spec.rb
+++ b/spec/ruby/core/float/lt_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it "raises an ArgumentError when given a non-Numeric" do
-    -> { 5.0 < "4"       }.should raise_error(ArgumentError)
-    -> { 5.0 < mock('x') }.should raise_error(ArgumentError)
+    -> { 5.0 < "4"       }.should.raise(ArgumentError)
+    -> { 5.0 < mock('x') }.should.raise(ArgumentError)
   end
 
   it "returns false if one side is NaN" do
diff --git a/spec/ruby/core/float/lte_spec.rb b/spec/ruby/core/float/lte_spec.rb
index 7b5a86ee76d..afb64ade097 100644
--- a/spec/ruby/core/float/lte_spec.rb
+++ b/spec/ruby/core/float/lte_spec.rb
@@ -12,8 +12,8 @@
   end
 
   it "raises an ArgumentError when given a non-Numeric" do
-    -> { 5.0 <= "4"       }.should raise_error(ArgumentError)
-    -> { 5.0 <= mock('x') }.should raise_error(ArgumentError)
+    -> { 5.0 <= "4"       }.should.raise(ArgumentError)
+    -> { 5.0 <= mock('x') }.should.raise(ArgumentError)
   end
 
   it "returns false if one side is NaN" do
diff --git a/spec/ruby/core/float/multiply_spec.rb b/spec/ruby/core/float/multiply_spec.rb
index 2adb8796cde..edaaba7e612 100644
--- a/spec/ruby/core/float/multiply_spec.rb
+++ b/spec/ruby/core/float/multiply_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "raises a TypeError when given a non-Numeric" do
-    -> { 13.0 * "10"    }.should raise_error(TypeError)
-    -> { 13.0 * :symbol }.should raise_error(TypeError)
+    -> { 13.0 * "10"    }.should.raise(TypeError)
+    -> { 13.0 * :symbol }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/float/negative_spec.rb b/spec/ruby/core/float/negative_spec.rb
index 511d92ade6d..484e636adbc 100644
--- a/spec/ruby/core/float/negative_spec.rb
+++ b/spec/ruby/core/float/negative_spec.rb
@@ -3,31 +3,31 @@
 describe "Float#negative?" do
   describe "on positive numbers" do
     it "returns false" do
-      0.1.negative?.should be_false
+      0.1.negative?.should == false
     end
   end
 
   describe "on zero" do
     it "returns false" do
-      0.0.negative?.should be_false
+      0.0.negative?.should == false
     end
   end
 
   describe "on negative zero" do
     it "returns false" do
-      -0.0.negative?.should be_false
+      -0.0.negative?.should == false
     end
   end
 
   describe "on negative numbers" do
     it "returns true" do
-      -0.1.negative?.should be_true
+      -0.1.negative?.should == true
     end
   end
 
   describe "on NaN" do
     it "returns false" do
-      nan_value.negative?.should be_false
+      nan_value.negative?.should == false
     end
   end
 end
diff --git a/spec/ruby/core/float/next_float_spec.rb b/spec/ruby/core/float/next_float_spec.rb
index 29e2d311463..59892be343f 100644
--- a/spec/ruby/core/float/next_float_spec.rb
+++ b/spec/ruby/core/float/next_float_spec.rb
@@ -9,7 +9,7 @@
     barely_positive.should < barely_positive.next_float
 
     midpoint = barely_positive / 2
-    [0.0, barely_positive].should include midpoint
+    [0.0, barely_positive].should.include? midpoint
   end
 
   it "returns Float::INFINITY for Float::INFINITY" do
diff --git a/spec/ruby/core/float/numerator_spec.rb b/spec/ruby/core/float/numerator_spec.rb
index 7832e8f0565..53b32fdd3d6 100644
--- a/spec/ruby/core/float/numerator_spec.rb
+++ b/spec/ruby/core/float/numerator_spec.rb
@@ -15,7 +15,7 @@
 
   it "converts self to a Rational object then returns its numerator" do
     @numbers.each do |number|
-      number.infinite?.should be_nil
+      number.infinite?.should == nil
       number.numerator.should == Rational(number).numerator
     end
   end
@@ -25,7 +25,7 @@
   end
 
   it "returns NaN for NaN" do
-    nan_value.numerator.nan?.should be_true
+    nan_value.numerator.nan?.should == true
   end
 
   it "returns Infinity for Infinity" do
diff --git a/spec/ruby/core/float/positive_spec.rb b/spec/ruby/core/float/positive_spec.rb
index 575f92a720f..aa87c03151f 100644
--- a/spec/ruby/core/float/positive_spec.rb
+++ b/spec/ruby/core/float/positive_spec.rb
@@ -3,31 +3,31 @@
 describe "Float#positive?" do
   describe "on positive numbers" do
     it "returns true" do
-      0.1.positive?.should be_true
+      0.1.positive?.should == true
     end
   end
 
   describe "on zero" do
     it "returns false" do
-      0.0.positive?.should be_false
+      0.0.positive?.should == false
     end
   end
 
   describe "on negative zero" do
     it "returns false" do
-      -0.0.positive?.should be_false
+      -0.0.positive?.should == false
     end
   end
 
   describe "on negative numbers" do
     it "returns false" do
-      -0.1.positive?.should be_false
+      -0.1.positive?.should == false
     end
   end
 
   describe "on NaN" do
     it "returns false" do
-      nan_value.positive?.should be_false
+      nan_value.positive?.should == false
     end
   end
 end
diff --git a/spec/ruby/core/float/prev_float_spec.rb b/spec/ruby/core/float/prev_float_spec.rb
index 5e50269da76..2d1f136254a 100644
--- a/spec/ruby/core/float/prev_float_spec.rb
+++ b/spec/ruby/core/float/prev_float_spec.rb
@@ -9,7 +9,7 @@
     barely_negative.should > barely_negative.prev_float
 
     midpoint = barely_negative / 2
-    [0.0, barely_negative].should include midpoint
+    [0.0, barely_negative].should.include? midpoint
   end
 
   it "returns -Float::INFINITY for -Float::INFINITY" do
diff --git a/spec/ruby/core/float/rationalize_spec.rb b/spec/ruby/core/float/rationalize_spec.rb
index 0c5bef7ac44..fa8fb5c841a 100644
--- a/spec/ruby/core/float/rationalize_spec.rb
+++ b/spec/ruby/core/float/rationalize_spec.rb
@@ -29,15 +29,15 @@
   end
 
   it "raises a FloatDomainError for Infinity" do
-    -> {infinity_value.rationalize}.should raise_error(FloatDomainError)
+    -> {infinity_value.rationalize}.should.raise(FloatDomainError)
   end
 
   it "raises a FloatDomainError for NaN" do
-    -> { nan_value.rationalize }.should raise_error(FloatDomainError)
+    -> { nan_value.rationalize }.should.raise(FloatDomainError)
   end
 
   it "raises ArgumentError when passed more than one argument" do
-    -> { 0.3.rationalize(0.1, 0.1) }.should raise_error(ArgumentError)
-    -> { 0.3.rationalize(0.1, 0.1, 2) }.should raise_error(ArgumentError)
+    -> { 0.3.rationalize(0.1, 0.1) }.should.raise(ArgumentError)
+    -> { 0.3.rationalize(0.1, 0.1, 2) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/float/round_spec.rb b/spec/ruby/core/float/round_spec.rb
index 3e6575100bd..63c1d5689cb 100644
--- a/spec/ruby/core/float/round_spec.rb
+++ b/spec/ruby/core/float/round_spec.rb
@@ -16,17 +16,17 @@
   end
 
   it "raises FloatDomainError for exceptional values" do
-    -> { (+infinity_value).round }.should raise_error(FloatDomainError)
-    -> { (-infinity_value).round }.should raise_error(FloatDomainError)
-    -> { nan_value.round }.should raise_error(FloatDomainError)
+    -> { (+infinity_value).round }.should.raise(FloatDomainError)
+    -> { (-infinity_value).round }.should.raise(FloatDomainError)
+    -> { nan_value.round }.should.raise(FloatDomainError)
   end
 
   it "rounds self to an optionally given precision" do
-    5.5.round(0).should eql(6)
-    5.7.round(1).should eql(5.7)
+    5.5.round(0).should.eql?(6)
+    5.7.round(1).should.eql?(5.7)
     1.2345678.round(2).should == 1.23
-    123456.78.round(-2).should eql(123500) # rounded up
-    -123456.78.round(-2).should eql(-123500)
+    123456.78.round(-2).should.eql?(123500) # rounded up
+    -123456.78.round(-2).should.eql?(-123500)
     12.345678.round(3.999).should == 12.346
   end
 
@@ -36,37 +36,37 @@
   end
 
   it "returns zero when passed a negative argument with magnitude greater than magnitude of the whole number portion of the Float" do
-    0.8346268.round(-1).should eql(0)
+    0.8346268.round(-1).should.eql?(0)
   end
 
   it "raises a TypeError when its argument can not be converted to an Integer" do
-    -> { 1.0.round("4") }.should raise_error(TypeError)
-    -> { 1.0.round(nil) }.should raise_error(TypeError)
+    -> { 1.0.round("4") }.should.raise(TypeError)
+    -> { 1.0.round(nil) }.should.raise(TypeError)
   end
 
   it "raises FloatDomainError for exceptional values when passed a non-positive precision" do
-    -> { Float::INFINITY.round( 0) }.should raise_error(FloatDomainError)
-    -> { Float::INFINITY.round(-2) }.should raise_error(FloatDomainError)
-    -> { (-Float::INFINITY).round( 0) }.should raise_error(FloatDomainError)
-    -> { (-Float::INFINITY).round(-2) }.should raise_error(FloatDomainError)
+    -> { Float::INFINITY.round( 0) }.should.raise(FloatDomainError)
+    -> { Float::INFINITY.round(-2) }.should.raise(FloatDomainError)
+    -> { (-Float::INFINITY).round( 0) }.should.raise(FloatDomainError)
+    -> { (-Float::INFINITY).round(-2) }.should.raise(FloatDomainError)
   end
 
   it "raises RangeError for NAN when passed a non-positive precision" do
-    -> { Float::NAN.round(0) }.should raise_error(RangeError)
-    -> { Float::NAN.round(-2) }.should raise_error(RangeError)
+    -> { Float::NAN.round(0) }.should.raise(RangeError)
+    -> { Float::NAN.round(-2) }.should.raise(RangeError)
   end
 
   it "returns self for exceptional values when passed a non-negative precision" do
     Float::INFINITY.round(2).should == Float::INFINITY
     (-Float::INFINITY).round(2).should == -Float::INFINITY
-    Float::NAN.round(2).should be_nan
+    Float::NAN.round(2).should.nan?
   end
 
   # redmine:5227
   it "works for corner cases" do
-    42.0.round(308).should eql(42.0)
-    1.0e307.round(2).should eql(1.0e307)
-    120.0.round(-1).should eql(120)
+    42.0.round(308).should.eql?(42.0)
+    1.0e307.round(2).should.eql?(1.0e307)
+    120.0.round(-1).should.eql?(120)
   end
 
   # redmine:5271
@@ -79,71 +79,71 @@
   end
 
   it "returns big values rounded to nearest" do
-    +2.5e20.round(-20).should   eql( +3 * 10 ** 20  )
-    -2.5e20.round(-20).should   eql( -3 * 10 ** 20  )
+    +2.5e20.round(-20).should.eql?( +3 * 10 ** 20  )
+    -2.5e20.round(-20).should.eql?( -3 * 10 ** 20  )
   end
 
   # redmine #5272
   it "returns rounded values for big values" do
-    +2.4e20.round(-20).should   eql( +2 * 10 ** 20  )
-    -2.4e20.round(-20).should   eql( -2 * 10 ** 20  )
-    +2.5e200.round(-200).should eql( +3 * 10 ** 200 )
-    +2.4e200.round(-200).should eql( +2 * 10 ** 200 )
-    -2.5e200.round(-200).should eql( -3 * 10 ** 200 )
-    -2.4e200.round(-200).should eql( -2 * 10 ** 200 )
+    +2.4e20.round(-20).should.eql?( +2 * 10 ** 20  )
+    -2.4e20.round(-20).should.eql?( -2 * 10 ** 20  )
+    +2.5e200.round(-200).should.eql?( +3 * 10 ** 200 )
+    +2.4e200.round(-200).should.eql?( +2 * 10 ** 200 )
+    -2.5e200.round(-200).should.eql?( -3 * 10 ** 200 )
+    -2.4e200.round(-200).should.eql?( -2 * 10 ** 200 )
   end
 
   it "returns different rounded values depending on the half option" do
-    2.5.round(half: nil).should      eql(3)
-    2.5.round(half: :up).should      eql(3)
-    2.5.round(half: :down).should    eql(2)
-    2.5.round(half: :even).should    eql(2)
-    3.5.round(half: nil).should      eql(4)
-    3.5.round(half: :up).should      eql(4)
-    3.5.round(half: :down).should    eql(3)
-    3.5.round(half: :even).should    eql(4)
-    (-2.5).round(half: nil).should   eql(-3)
-    (-2.5).round(half: :up).should   eql(-3)
-    (-2.5).round(half: :down).should eql(-2)
-    (-2.5).round(half: :even).should eql(-2)
+    2.5.round(half: nil).should.eql?(3)
+    2.5.round(half: :up).should.eql?(3)
+    2.5.round(half: :down).should.eql?(2)
+    2.5.round(half: :even).should.eql?(2)
+    3.5.round(half: nil).should.eql?(4)
+    3.5.round(half: :up).should.eql?(4)
+    3.5.round(half: :down).should.eql?(3)
+    3.5.round(half: :even).should.eql?(4)
+    (-2.5).round(half: nil).should.eql?(-3)
+    (-2.5).round(half: :up).should.eql?(-3)
+    (-2.5).round(half: :down).should.eql?(-2)
+    (-2.5).round(half: :even).should.eql?(-2)
   end
 
   it "rounds self to an optionally given precision with a half option" do
-    5.55.round(1, half: nil).should eql(5.6)
-    5.55.round(1, half: :up).should eql(5.6)
-    5.55.round(1, half: :down).should eql(5.5)
-    5.55.round(1, half: :even).should eql(5.6)
-    -5.55.round(1, half: nil).should eql(-5.6)
-    -5.55.round(1, half: :up).should eql(-5.6)
-    -5.55.round(1, half: :down).should eql(-5.5)
-    -5.55.round(1, half: :even).should eql(-5.6)
+    5.55.round(1, half: nil).should.eql?(5.6)
+    5.55.round(1, half: :up).should.eql?(5.6)
+    5.55.round(1, half: :down).should.eql?(5.5)
+    5.55.round(1, half: :even).should.eql?(5.6)
+    -5.55.round(1, half: nil).should.eql?(-5.6)
+    -5.55.round(1, half: :up).should.eql?(-5.6)
+    -5.55.round(1, half: :down).should.eql?(-5.5)
+    -5.55.round(1, half: :even).should.eql?(-5.6)
   end
 
   it "preserves cases where neighbouring floating pointer number increase the decimal places" do
-    4.8100000000000005.round(5, half: nil).should eql(4.81)
-    4.8100000000000005.round(5, half: :up).should eql(4.81)
-    4.8100000000000005.round(5, half: :down).should eql(4.81)
-    4.8100000000000005.round(5, half: :even).should eql(4.81)
-    -4.8100000000000005.round(5, half: nil).should eql(-4.81)
-    -4.8100000000000005.round(5, half: :up).should eql(-4.81)
-    -4.8100000000000005.round(5, half: :down).should eql(-4.81)
-    -4.8100000000000005.round(5, half: :even).should eql(-4.81)
-    4.81.round(5, half: nil).should eql(4.81)
-    4.81.round(5, half: :up).should eql(4.81)
-    4.81.round(5, half: :down).should eql(4.81)
-    4.81.round(5, half: :even).should eql(4.81)
-    -4.81.round(5, half: nil).should eql(-4.81)
-    -4.81.round(5, half: :up).should eql(-4.81)
-    -4.81.round(5, half: :down).should eql(-4.81)
-    -4.81.round(5, half: :even).should eql(-4.81)
-    4.809999999999999.round(5, half: nil).should eql(4.81)
-    4.809999999999999.round(5, half: :up).should eql(4.81)
-    4.809999999999999.round(5, half: :down).should eql(4.81)
-    4.809999999999999.round(5, half: :even).should eql(4.81)
-    -4.809999999999999.round(5, half: nil).should eql(-4.81)
-    -4.809999999999999.round(5, half: :up).should eql(-4.81)
-    -4.809999999999999.round(5, half: :down).should eql(-4.81)
-    -4.809999999999999.round(5, half: :even).should eql(-4.81)
+    4.8100000000000005.round(5, half: nil).should.eql?(4.81)
+    4.8100000000000005.round(5, half: :up).should.eql?(4.81)
+    4.8100000000000005.round(5, half: :down).should.eql?(4.81)
+    4.8100000000000005.round(5, half: :even).should.eql?(4.81)
+    -4.8100000000000005.round(5, half: nil).should.eql?(-4.81)
+    -4.8100000000000005.round(5, half: :up).should.eql?(-4.81)
+    -4.8100000000000005.round(5, half: :down).should.eql?(-4.81)
+    -4.8100000000000005.round(5, half: :even).should.eql?(-4.81)
+    4.81.round(5, half: nil).should.eql?(4.81)
+    4.81.round(5, half: :up).should.eql?(4.81)
+    4.81.round(5, half: :down).should.eql?(4.81)
+    4.81.round(5, half: :even).should.eql?(4.81)
+    -4.81.round(5, half: nil).should.eql?(-4.81)
+    -4.81.round(5, half: :up).should.eql?(-4.81)
+    -4.81.round(5, half: :down).should.eql?(-4.81)
+    -4.81.round(5, half: :even).should.eql?(-4.81)
+    4.809999999999999.round(5, half: nil).should.eql?(4.81)
+    4.809999999999999.round(5, half: :up).should.eql?(4.81)
+    4.809999999999999.round(5, half: :down).should.eql?(4.81)
+    4.809999999999999.round(5, half: :even).should.eql?(4.81)
+    -4.809999999999999.round(5, half: nil).should.eql?(-4.81)
+    -4.809999999999999.round(5, half: :up).should.eql?(-4.81)
+    -4.809999999999999.round(5, half: :down).should.eql?(-4.81)
+    -4.809999999999999.round(5, half: :even).should.eql?(-4.81)
   end
 
   # These numbers are neighbouring floating point numbers round a
@@ -151,40 +151,40 @@
   # round that value and precision is not lost which might cause
   # incorrect results.
   it "does not lose precision during the rounding process" do
-    767573.1875850001.round(5, half: nil).should eql(767573.18759)
-    767573.1875850001.round(5, half: :up).should eql(767573.18759)
-    767573.1875850001.round(5, half: :down).should eql(767573.18759)
-    767573.1875850001.round(5, half: :even).should eql(767573.18759)
-    -767573.1875850001.round(5, half: nil).should eql(-767573.18759)
-    -767573.1875850001.round(5, half: :up).should eql(-767573.18759)
-    -767573.1875850001.round(5, half: :down).should eql(-767573.18759)
-    -767573.1875850001.round(5, half: :even).should eql(-767573.18759)
-    767573.187585.round(5, half: nil).should eql(767573.18759)
-    767573.187585.round(5, half: :up).should eql(767573.18759)
-    767573.187585.round(5, half: :down).should eql(767573.18758)
-    767573.187585.round(5, half: :even).should eql(767573.18758)
-    -767573.187585.round(5, half: nil).should eql(-767573.18759)
-    -767573.187585.round(5, half: :up).should eql(-767573.18759)
-    -767573.187585.round(5, half: :down).should eql(-767573.18758)
-    -767573.187585.round(5, half: :even).should eql(-767573.18758)
-    767573.1875849998.round(5, half: nil).should eql(767573.18758)
-    767573.1875849998.round(5, half: :up).should eql(767573.18758)
-    767573.1875849998.round(5, half: :down).should eql(767573.18758)
-    767573.1875849998.round(5, half: :even).should eql(767573.18758)
-    -767573.1875849998.round(5, half: nil).should eql(-767573.18758)
-    -767573.1875849998.round(5, half: :up).should eql(-767573.18758)
-    -767573.1875849998.round(5, half: :down).should eql(-767573.18758)
-    -767573.1875849998.round(5, half: :even).should eql(-767573.18758)
+    767573.1875850001.round(5, half: nil).should.eql?(767573.18759)
+    767573.1875850001.round(5, half: :up).should.eql?(767573.18759)
+    767573.1875850001.round(5, half: :down).should.eql?(767573.18759)
+    767573.1875850001.round(5, half: :even).should.eql?(767573.18759)
+    -767573.1875850001.round(5, half: nil).should.eql?(-767573.18759)
+    -767573.1875850001.round(5, half: :up).should.eql?(-767573.18759)
+    -767573.1875850001.round(5, half: :down).should.eql?(-767573.18759)
+    -767573.1875850001.round(5, half: :even).should.eql?(-767573.18759)
+    767573.187585.round(5, half: nil).should.eql?(767573.18759)
+    767573.187585.round(5, half: :up).should.eql?(767573.18759)
+    767573.187585.round(5, half: :down).should.eql?(767573.18758)
+    767573.187585.round(5, half: :even).should.eql?(767573.18758)
+    -767573.187585.round(5, half: nil).should.eql?(-767573.18759)
+    -767573.187585.round(5, half: :up).should.eql?(-767573.18759)
+    -767573.187585.round(5, half: :down).should.eql?(-767573.18758)
+    -767573.187585.round(5, half: :even).should.eql?(-767573.18758)
+    767573.1875849998.round(5, half: nil).should.eql?(767573.18758)
+    767573.1875849998.round(5, half: :up).should.eql?(767573.18758)
+    767573.1875849998.round(5, half: :down).should.eql?(767573.18758)
+    767573.1875849998.round(5, half: :even).should.eql?(767573.18758)
+    -767573.1875849998.round(5, half: nil).should.eql?(-767573.18758)
+    -767573.1875849998.round(5, half: :up).should.eql?(-767573.18758)
+    -767573.1875849998.round(5, half: :down).should.eql?(-767573.18758)
+    -767573.1875849998.round(5, half: :even).should.eql?(-767573.18758)
   end
 
   it "raises FloatDomainError for exceptional values with a half option" do
-    -> { (+infinity_value).round(half: :up) }.should raise_error(FloatDomainError)
-    -> { (-infinity_value).round(half: :down) }.should raise_error(FloatDomainError)
-    -> { nan_value.round(half: :even) }.should raise_error(FloatDomainError)
+    -> { (+infinity_value).round(half: :up) }.should.raise(FloatDomainError)
+    -> { (-infinity_value).round(half: :down) }.should.raise(FloatDomainError)
+    -> { nan_value.round(half: :even) }.should.raise(FloatDomainError)
   end
 
   it "raise for a non-existent round mode" do
-    -> { 14.2.round(half: :nonsense) }.should raise_error(ArgumentError, "invalid rounding mode: nonsense")
+    -> { 14.2.round(half: :nonsense) }.should.raise(ArgumentError, "invalid rounding mode: nonsense")
   end
 
   describe "when 0.0 is given" do
diff --git a/spec/ruby/core/float/shared/abs.rb b/spec/ruby/core/float/shared/abs.rb
index 607983322d2..ab21480e24f 100644
--- a/spec/ruby/core/float/shared/abs.rb
+++ b/spec/ruby/core/float/shared/abs.rb
@@ -16,6 +16,6 @@
   end
 
   it "returns NaN if NaN" do
-    nan_value.send(@method).nan?.should be_true
+    nan_value.send(@method).nan?.should == true
   end
 end
diff --git a/spec/ruby/core/float/shared/arg.rb b/spec/ruby/core/float/shared/arg.rb
index 136cf19ec89..de0024313da 100644
--- a/spec/ruby/core/float/shared/arg.rb
+++ b/spec/ruby/core/float/shared/arg.rb
@@ -1,12 +1,12 @@
 describe :float_arg, shared: true do
   it "returns NaN if NaN" do
     f = nan_value
-    f.send(@method).nan?.should be_true
+    f.send(@method).nan?.should == true
   end
 
   it "returns self if NaN" do
     f = nan_value
-    f.send(@method).should equal(f)
+    f.send(@method).should.equal?(f)
   end
 
   it "returns 0 if positive" do
diff --git a/spec/ruby/core/float/shared/arithmetic_exception_in_coerce.rb b/spec/ruby/core/float/shared/arithmetic_exception_in_coerce.rb
index eec92d858ff..bd3bf9019fe 100644
--- a/spec/ruby/core/float/shared/arithmetic_exception_in_coerce.rb
+++ b/spec/ruby/core/float/shared/arithmetic_exception_in_coerce.rb
@@ -6,6 +6,6 @@
     b.should_receive(:coerce).and_raise(FloatSpecs::CoerceError)
 
     # e.g. 1.0 > b
-    -> { 1.0.send(@method, b) }.should raise_error(FloatSpecs::CoerceError)
+    -> { 1.0.send(@method, b) }.should.raise(FloatSpecs::CoerceError)
   end
 end
diff --git a/spec/ruby/core/float/shared/comparison_exception_in_coerce.rb b/spec/ruby/core/float/shared/comparison_exception_in_coerce.rb
index 3e2c1e28dd0..eec5d8daf9e 100644
--- a/spec/ruby/core/float/shared/comparison_exception_in_coerce.rb
+++ b/spec/ruby/core/float/shared/comparison_exception_in_coerce.rb
@@ -6,6 +6,6 @@
     b.should_receive(:coerce).and_raise(FloatSpecs::CoerceError)
 
     # e.g. 1.0 > b
-    -> { 1.0.send(@method, b) }.should raise_error(FloatSpecs::CoerceError)
+    -> { 1.0.send(@method, b) }.should.raise(FloatSpecs::CoerceError)
   end
 end
diff --git a/spec/ruby/core/float/shared/modulo.rb b/spec/ruby/core/float/shared/modulo.rb
index 6700bd4f4ec..1efee1476d3 100644
--- a/spec/ruby/core/float/shared/modulo.rb
+++ b/spec/ruby/core/float/shared/modulo.rb
@@ -16,13 +16,13 @@
   end
 
   it "returns NaN when called on NaN or Infinities" do
-    Float::NAN.send(@method, 42).should be_nan
-    Float::INFINITY.send(@method, 42).should be_nan
-    (-Float::INFINITY).send(@method, 42).should be_nan
+    Float::NAN.send(@method, 42).should.nan?
+    Float::INFINITY.send(@method, 42).should.nan?
+    (-Float::INFINITY).send(@method, 42).should.nan?
   end
 
   it "returns NaN when modulus is NaN" do
-    4.2.send(@method, Float::NAN).should be_nan
+    4.2.send(@method, Float::NAN).should.nan?
   end
 
   it "returns -0.0 when called on -0.0 with a non zero modulus" do
@@ -42,7 +42,7 @@
   end
 
   it "raises a ZeroDivisionError if other is zero" do
-    -> { 1.0.send(@method, 0) }.should raise_error(ZeroDivisionError)
-    -> { 1.0.send(@method, 0.0) }.should raise_error(ZeroDivisionError)
+    -> { 1.0.send(@method, 0) }.should.raise(ZeroDivisionError)
+    -> { 1.0.send(@method, 0.0) }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/core/float/shared/quo.rb b/spec/ruby/core/float/shared/quo.rb
index 0c90171b87d..930187aaf7b 100644
--- a/spec/ruby/core/float/shared/quo.rb
+++ b/spec/ruby/core/float/shared/quo.rb
@@ -12,8 +12,8 @@
   end
 
   it "returns NaN when the argument is NaN" do
-    -1819.999999.send(@method, nan_value).nan?.should be_true
-    11109.1981271.send(@method, nan_value).nan?.should be_true
+    -1819.999999.send(@method, nan_value).nan?.should == true
+    11109.1981271.send(@method, nan_value).nan?.should == true
   end
 
   it "returns Infinity when the argument is 0.0" do
@@ -50,10 +50,10 @@
   end
 
   it "raises a TypeError when argument isn't numeric" do
-    -> { 27292.2.send(@method, mock('non-numeric')) }.should raise_error(TypeError)
+    -> { 27292.2.send(@method, mock('non-numeric')) }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when passed multiple arguments" do
-    -> { 272.221.send(@method, 6,0.2) }.should raise_error(ArgumentError)
+    -> { 272.221.send(@method, 6,0.2) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/float/shared/to_i.rb b/spec/ruby/core/float/shared/to_i.rb
index 33b32ca5332..1e6f9414671 100644
--- a/spec/ruby/core/float/shared/to_i.rb
+++ b/spec/ruby/core/float/shared/to_i.rb
@@ -1,14 +1,14 @@
 describe :float_to_i, shared: true do
   it "returns self truncated to an Integer" do
-    899.2.send(@method).should eql(899)
-    -1.122256e-45.send(@method).should eql(0)
-    5_213_451.9201.send(@method).should eql(5213451)
-    1.233450999123389e+12.send(@method).should eql(1233450999123)
-    -9223372036854775808.1.send(@method).should eql(-9223372036854775808)
-    9223372036854775808.1.send(@method).should eql(9223372036854775808)
+    899.2.send(@method).should.eql?(899)
+    -1.122256e-45.send(@method).should.eql?(0)
+    5_213_451.9201.send(@method).should.eql?(5213451)
+    1.233450999123389e+12.send(@method).should.eql?(1233450999123)
+    -9223372036854775808.1.send(@method).should.eql?(-9223372036854775808)
+    9223372036854775808.1.send(@method).should.eql?(9223372036854775808)
   end
 
   it "raises a FloatDomainError for NaN" do
-    -> { nan_value.send(@method) }.should raise_error(FloatDomainError)
+    -> { nan_value.send(@method) }.should.raise(FloatDomainError)
   end
 end
diff --git a/spec/ruby/core/float/shared/to_s.rb b/spec/ruby/core/float/shared/to_s.rb
index 0925efc0f75..81ffdd9e814 100644
--- a/spec/ruby/core/float/shared/to_s.rb
+++ b/spec/ruby/core/float/shared/to_s.rb
@@ -297,12 +297,12 @@
 
     it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
-      1.23.send(@method).encoding.should equal(Encoding::US_ASCII)
+      1.23.send(@method).encoding.should.equal?(Encoding::US_ASCII)
     end
 
     it "returns a String in US-ASCII encoding when Encoding.default_internal is not nil" do
       Encoding.default_internal = Encoding::IBM437
-      5.47.send(@method).encoding.should equal(Encoding::US_ASCII)
+      5.47.send(@method).encoding.should.equal?(Encoding::US_ASCII)
     end
   end
 end
diff --git a/spec/ruby/core/float/truncate_spec.rb b/spec/ruby/core/float/truncate_spec.rb
index 2c80145f9f8..1750e3fdbc0 100644
--- a/spec/ruby/core/float/truncate_spec.rb
+++ b/spec/ruby/core/float/truncate_spec.rb
@@ -5,10 +5,10 @@
   it_behaves_like :float_to_i, :truncate
 
   it "returns self truncated to an optionally given precision" do
-    2.1679.truncate(0).should   eql(2)
-    7.1.truncate(1).should      eql(7.1)
-    214.94.truncate(-1).should  eql(210)
-    -1.234.truncate(2).should   eql(-1.23)
-    5.123812.truncate(4).should eql(5.1238)
+    2.1679.truncate(0).should.eql?(2)
+    7.1.truncate(1).should.eql?(7.1)
+    214.94.truncate(-1).should.eql?(210)
+    -1.234.truncate(2).should.eql?(-1.23)
+    5.123812.truncate(4).should.eql?(5.1238)
   end
 end
diff --git a/spec/ruby/core/float/uplus_spec.rb b/spec/ruby/core/float/uplus_spec.rb
index 936123558c1..b979b2717a4 100644
--- a/spec/ruby/core/float/uplus_spec.rb
+++ b/spec/ruby/core/float/uplus_spec.rb
@@ -4,6 +4,6 @@
   it "returns the same value with same sign (twos complement)" do
     34.56.send(:+@).should == 34.56
     -34.56.send(:+@).should == -34.56
-    0.0.send(:+@).should eql(0.0)
+    0.0.send(:+@).should.eql?(0.0)
   end
 end
diff --git a/spec/ruby/core/gc/config_spec.rb b/spec/ruby/core/gc/config_spec.rb
index db452b0907f..57160f122ca 100644
--- a/spec/ruby/core/gc/config_spec.rb
+++ b/spec/ruby/core/gc/config_spec.rb
@@ -4,12 +4,12 @@
   describe "GC.config" do
     context "without arguments" do
       it "returns a hash of current settings" do
-        GC.config.should be_kind_of(Hash)
+        GC.config.should.is_a?(Hash)
       end
 
       it "includes the name of currently loaded GC implementation as a global key" do
-        GC.config.should include(:implementation)
-        GC.config[:implementation].should be_kind_of(String)
+        GC.config.should.include?(:implementation)
+        GC.config[:implementation].should.is_a?(String)
       end
     end
 
@@ -55,7 +55,7 @@
       end
 
       it "raises an ArgumentError if options include global keys" do
-        -> { GC.config(implementation: "default") }.should raise_error(ArgumentError, 'Attempting to set read-only key "Implementation"')
+        -> { GC.config(implementation: "default") }.should.raise(ArgumentError, 'Attempting to set read-only key "Implementation"')
       end
     end
 
@@ -65,9 +65,9 @@
       end
 
       it "raises ArgumentError for all other arguments" do
-        -> { GC.config([]) }.should raise_error(ArgumentError)
-        -> { GC.config("default") }.should raise_error(ArgumentError)
-        -> { GC.config(1) }.should raise_error(ArgumentError)
+        -> { GC.config([]) }.should.raise(ArgumentError)
+        -> { GC.config("default") }.should.raise(ArgumentError)
+        -> { GC.config(1) }.should.raise(ArgumentError)
       end
     end
 
@@ -82,8 +82,8 @@
         end
 
         it "includes :rgengc_allow_full_mark option, true by default" do
-          GC.config.should include(:rgengc_allow_full_mark)
-          GC.config[:rgengc_allow_full_mark].should be_true
+          GC.config.should.include?(:rgengc_allow_full_mark)
+          GC.config[:rgengc_allow_full_mark].should == true
         end
 
         it "allows to set :rgengc_allow_full_mark" do
diff --git a/spec/ruby/core/gc/count_spec.rb b/spec/ruby/core/gc/count_spec.rb
index af2fbbe713d..fe20c4ed2bf 100644
--- a/spec/ruby/core/gc/count_spec.rb
+++ b/spec/ruby/core/gc/count_spec.rb
@@ -2,7 +2,7 @@
 
 describe "GC.count" do
   it "returns an integer" do
-    GC.count.should be_kind_of(Integer)
+    GC.count.should.is_a?(Integer)
   end
 
   it "increases as collections are run" do
diff --git a/spec/ruby/core/gc/profiler/enabled_spec.rb b/spec/ruby/core/gc/profiler/enabled_spec.rb
index 23677be555f..cfcd0951f0f 100644
--- a/spec/ruby/core/gc/profiler/enabled_spec.rb
+++ b/spec/ruby/core/gc/profiler/enabled_spec.rb
@@ -11,11 +11,11 @@
 
   it "reports as enabled when enabled" do
     GC::Profiler.enable
-    GC::Profiler.enabled?.should be_true
+    GC::Profiler.enabled?.should == true
   end
 
   it "reports as disabled when disabled" do
     GC::Profiler.disable
-    GC::Profiler.enabled?.should be_false
+    GC::Profiler.enabled?.should == false
   end
 end
diff --git a/spec/ruby/core/gc/profiler/result_spec.rb b/spec/ruby/core/gc/profiler/result_spec.rb
index 2ab46a83710..e888f975dc2 100644
--- a/spec/ruby/core/gc/profiler/result_spec.rb
+++ b/spec/ruby/core/gc/profiler/result_spec.rb
@@ -2,6 +2,6 @@
 
 describe "GC::Profiler.result" do
   it "returns a string" do
-    GC::Profiler.result.should be_kind_of(String)
+    GC::Profiler.result.should.is_a?(String)
   end
 end
diff --git a/spec/ruby/core/gc/profiler/total_time_spec.rb b/spec/ruby/core/gc/profiler/total_time_spec.rb
index 7709f168dd5..a351e922af6 100644
--- a/spec/ruby/core/gc/profiler/total_time_spec.rb
+++ b/spec/ruby/core/gc/profiler/total_time_spec.rb
@@ -2,6 +2,6 @@
 
 describe "GC::Profiler.total_time" do
   it "returns an float" do
-    GC::Profiler.total_time.should be_kind_of(Float)
+    GC::Profiler.total_time.should.is_a?(Float)
   end
 end
diff --git a/spec/ruby/core/gc/stat_spec.rb b/spec/ruby/core/gc/stat_spec.rb
index 3b43b28a920..6e4800b3e3d 100644
--- a/spec/ruby/core/gc/stat_spec.rb
+++ b/spec/ruby/core/gc/stat_spec.rb
@@ -3,7 +3,7 @@
 describe "GC.stat" do
   it "returns hash of values" do
     stat = GC.stat
-    stat.should be_kind_of(Hash)
+    stat.should.is_a?(Hash)
     stat.keys.should.include?(:count)
   end
 
@@ -11,18 +11,18 @@
     hash = { count: "hello", __other__: "world" }
     stat = GC.stat(hash)
 
-    stat.should be_kind_of(Hash)
-    stat.should equal hash
-    stat[:count].should be_kind_of(Integer)
+    stat.should.is_a?(Hash)
+    stat.should.equal? hash
+    stat[:count].should.is_a?(Integer)
     stat[:__other__].should == "world"
   end
 
   it "the values are all Integer since rb_gc_stat() returns size_t" do
-    GC.stat.values.each { |value| value.should be_kind_of(Integer) }
+    GC.stat.values.each { |value| value.should.is_a?(Integer) }
   end
 
   it "can return a single value" do
-    GC.stat(:count).should be_kind_of(Integer)
+    GC.stat(:count).should.is_a?(Integer)
   end
 
   it "increases count after GC is run" do
@@ -38,25 +38,25 @@
   end
 
   it "provides some number for count" do
-    GC.stat(:count).should be_kind_of(Integer)
-    GC.stat[:count].should be_kind_of(Integer)
+    GC.stat(:count).should.is_a?(Integer)
+    GC.stat[:count].should.is_a?(Integer)
   end
 
   it "provides some number for heap_free_slots" do
-    GC.stat(:heap_free_slots).should be_kind_of(Integer)
-    GC.stat[:heap_free_slots].should be_kind_of(Integer)
+    GC.stat(:heap_free_slots).should.is_a?(Integer)
+    GC.stat[:heap_free_slots].should.is_a?(Integer)
   end
 
   it "provides some number for total_allocated_objects" do
-    GC.stat(:total_allocated_objects).should be_kind_of(Integer)
-    GC.stat[:total_allocated_objects].should be_kind_of(Integer)
+    GC.stat(:total_allocated_objects).should.is_a?(Integer)
+    GC.stat[:total_allocated_objects].should.is_a?(Integer)
   end
 
   it "raises an error if argument is not nil, a symbol, or a hash" do
-    -> { GC.stat(7) }.should raise_error(TypeError, "non-hash or symbol given")
+    -> { GC.stat(7) }.should.raise(TypeError, "non-hash or symbol given")
   end
 
   it "raises an error if an unknown key is given" do
-    -> { GC.stat(:foo) }.should raise_error(ArgumentError, "unknown key: foo")
+    -> { GC.stat(:foo) }.should.raise(ArgumentError, "unknown key: foo")
   end
 end
diff --git a/spec/ruby/core/gc/stress_spec.rb b/spec/ruby/core/gc/stress_spec.rb
index ca62c0cb4eb..227a795e7f9 100644
--- a/spec/ruby/core/gc/stress_spec.rb
+++ b/spec/ruby/core/gc/stress_spec.rb
@@ -7,11 +7,11 @@
   end
 
   it "returns current status of GC stress mode" do
-    GC.stress.should be_false
+    GC.stress.should == false
     GC.stress = true
-    GC.stress.should be_true
+    GC.stress.should == true
     GC.stress = false
-    GC.stress.should be_false
+    GC.stress.should == false
   end
 end
 
@@ -22,6 +22,6 @@
 
   it "sets the stress mode" do
     GC.stress = true
-    GC.stress.should be_true
+    GC.stress.should == true
   end
 end
diff --git a/spec/ruby/core/gc/total_time_spec.rb b/spec/ruby/core/gc/total_time_spec.rb
index a8430fbe9ad..f10e0ad742b 100644
--- a/spec/ruby/core/gc/total_time_spec.rb
+++ b/spec/ruby/core/gc/total_time_spec.rb
@@ -2,7 +2,7 @@
 
 describe "GC.total_time" do
   it "returns an Integer" do
-    GC.total_time.should be_kind_of(Integer)
+    GC.total_time.should.is_a?(Integer)
   end
 
   it "increases as collections are run" do
diff --git a/spec/ruby/core/hash/allocate_spec.rb b/spec/ruby/core/hash/allocate_spec.rb
index 93420de8668..a92accc1619 100644
--- a/spec/ruby/core/hash/allocate_spec.rb
+++ b/spec/ruby/core/hash/allocate_spec.rb
@@ -3,7 +3,7 @@
 describe "Hash.allocate" do
   it "returns an instance of Hash" do
     hsh = Hash.allocate
-    hsh.should be_an_instance_of(Hash)
+    hsh.should.instance_of?(Hash)
   end
 
   it "returns a fully-formed instance of Hash" do
diff --git a/spec/ruby/core/hash/assoc_spec.rb b/spec/ruby/core/hash/assoc_spec.rb
index 62b2a11b300..51af51a20f7 100644
--- a/spec/ruby/core/hash/assoc_spec.rb
+++ b/spec/ruby/core/hash/assoc_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "returns an Array if the argument is == to a key of the Hash" do
-    @h.assoc(:apple).should be_an_instance_of(Array)
+    @h.assoc(:apple).should.instance_of?(Array)
   end
 
   it "returns a 2-element Array if the argument is == to a key of the Hash" do
@@ -40,11 +40,11 @@
   end
 
   it "returns nil if the argument is not a key of the Hash" do
-    @h.assoc(:green).should be_nil
+    @h.assoc(:green).should == nil
   end
 
   it "returns nil if the argument is not a key of the Hash even when there is a default" do
-    Hash.new(42).merge!( foo: :bar ).assoc(42).should be_nil
-    Hash.new{|h, k| h[k] = 42}.merge!( foo: :bar ).assoc(42).should be_nil
+    Hash.new(42).merge!( foo: :bar ).assoc(42).should == nil
+    Hash.new{|h, k| h[k] = 42}.merge!( foo: :bar ).assoc(42).should == nil
   end
 end
diff --git a/spec/ruby/core/hash/clear_spec.rb b/spec/ruby/core/hash/clear_spec.rb
index cf05e36ac9f..beff925a631 100644
--- a/spec/ruby/core/hash/clear_spec.rb
+++ b/spec/ruby/core/hash/clear_spec.rb
@@ -4,7 +4,7 @@
 describe "Hash#clear" do
   it "removes all key, value pairs" do
     h = { 1 => 2, 3 => 4 }
-    h.clear.should equal(h)
+    h.clear.should.equal?(h)
     h.should == {}
   end
 
@@ -26,7 +26,7 @@
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.clear  }.should raise_error(FrozenError)
-    -> { HashSpecs.empty_frozen_hash.clear }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.clear  }.should.raise(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.clear }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/clone_spec.rb b/spec/ruby/core/hash/clone_spec.rb
index 6c96fc0c673..d135a844536 100644
--- a/spec/ruby/core/hash/clone_spec.rb
+++ b/spec/ruby/core/hash/clone_spec.rb
@@ -7,6 +7,6 @@
     clone = hash.clone
 
     clone.should == hash
-    clone.should_not equal hash
+    clone.should_not.equal? hash
   end
 end
diff --git a/spec/ruby/core/hash/compact_spec.rb b/spec/ruby/core/hash/compact_spec.rb
index 48f8bb7cae1..de83dabed38 100644
--- a/spec/ruby/core/hash/compact_spec.rb
+++ b/spec/ruby/core/hash/compact_spec.rb
@@ -10,7 +10,7 @@
 
   it "returns new object that rejects pair has nil value" do
     ret = @hash.compact
-    ret.should_not equal(@hash)
+    ret.should_not.equal?(@hash)
     ret.should == @compact
   end
 
@@ -50,7 +50,7 @@
   end
 
   it "returns self" do
-    @hash.compact!.should equal(@hash)
+    @hash.compact!.should.equal?(@hash)
   end
 
   it "rejects own pair has nil value" do
@@ -64,7 +64,7 @@
     end
 
     it "returns nil" do
-      @hash.compact!.should be_nil
+      @hash.compact!.should == nil
     end
   end
 
@@ -74,7 +74,7 @@
     end
 
     it "keeps pairs and raises a FrozenError" do
-      ->{ @hash.compact! }.should raise_error(FrozenError)
+      ->{ @hash.compact! }.should.raise(FrozenError)
       @hash.should == @initial_pairs
     end
   end
diff --git a/spec/ruby/core/hash/compare_by_identity_spec.rb b/spec/ruby/core/hash/compare_by_identity_spec.rb
index 2975526a97a..1abf9d56662 100644
--- a/spec/ruby/core/hash/compare_by_identity_spec.rb
+++ b/spec/ruby/core/hash/compare_by_identity_spec.rb
@@ -11,7 +11,7 @@
     @h[[1]] = :a
     @h[[1]].should == :a
     @h.compare_by_identity
-    @h[[1].dup].should be_nil
+    @h[[1].dup].should == nil
   end
 
   it "rehashes internally so that old keys can be looked up" do
@@ -27,21 +27,21 @@ def o.hash; 123; end
   it "returns self" do
     h = {}
     h[:foo] = :bar
-    h.compare_by_identity.should equal h
+    h.compare_by_identity.should.equal? h
   end
 
   it "has no effect on an already compare_by_identity hash" do
     @idh[:foo] = :bar
-    @idh.compare_by_identity.should equal @idh
+    @idh.compare_by_identity.should.equal? @idh
     @idh.should.compare_by_identity?
     @idh[:foo].should == :bar
   end
 
   it "uses the semantics of BasicObject#equal? to determine key identity" do
-    [1].should_not equal([1])
+    [1].should_not.equal?([1])
     @idh[[1]] = :c
     @idh[[1]] = :d
-    :bar.should equal(:bar)
+    :bar.should.equal?(:bar)
     @idh[:bar] = :e
     @idh[:bar] = :f
     @idh.values.should == [:c, :d, :f]
@@ -64,13 +64,13 @@ def o.hash; 123; end
   it "regards #dup'd objects as having different identities" do
     key = ['foo']
     @idh[key.dup] = :str
-    @idh[key].should be_nil
+    @idh[key].should == nil
   end
 
   it "regards #clone'd objects as having different identities" do
     key = ['foo']
     @idh[key.clone] = :str
-    @idh[key].should be_nil
+    @idh[key].should == nil
   end
 
   it "regards references to the same object as having the same identity" do
@@ -82,7 +82,7 @@ def o.hash; 123; end
 
   it "raises a FrozenError on frozen hashes" do
     @h = @h.freeze
-    -> { @h.compare_by_identity }.should raise_error(FrozenError)
+    -> { @h.compare_by_identity }.should.raise(FrozenError)
   end
 
   # Behaviour confirmed in https://bugs.ruby-lang.org/issues/1871
@@ -107,7 +107,7 @@ def o.hash; 123; end
     @idh[foo] = true
     @idh[foo] = true
     @idh.size.should == 1
-    @idh.keys.first.should equal foo
+    @idh.keys.first.should.equal? foo
   end
 
   # Check `#[]=` call with a String literal.
@@ -128,20 +128,20 @@ def o.hash; 123; end
 describe "Hash#compare_by_identity?" do
   it "returns false by default" do
     h = {}
-    h.compare_by_identity?.should be_false
+    h.compare_by_identity?.should == false
   end
 
   it "returns true once #compare_by_identity has been invoked on self" do
     h = {}
     h.compare_by_identity
-    h.compare_by_identity?.should be_true
+    h.compare_by_identity?.should == true
   end
 
   it "returns true when called multiple times on the same ident hash" do
     h = {}
     h.compare_by_identity
-    h.compare_by_identity?.should be_true
-    h.compare_by_identity?.should be_true
-    h.compare_by_identity?.should be_true
+    h.compare_by_identity?.should == true
+    h.compare_by_identity?.should == true
+    h.compare_by_identity?.should == true
   end
 end
diff --git a/spec/ruby/core/hash/constructor_spec.rb b/spec/ruby/core/hash/constructor_spec.rb
index 301f8675ce2..c16f373160d 100644
--- a/spec/ruby/core/hash/constructor_spec.rb
+++ b/spec/ruby/core/hash/constructor_spec.rb
@@ -45,22 +45,22 @@
   it "raises for elements that are not arrays" do
     -> {
       Hash[[:a]]
-    }.should raise_error(ArgumentError, "wrong element type Symbol at 0 (expected array)")
+    }.should.raise(ArgumentError, "wrong element type Symbol at 0 (expected array)")
     -> {
       Hash[[nil]]
-    }.should raise_error(ArgumentError, "wrong element type nil at 0 (expected array)")
+    }.should.raise(ArgumentError, "wrong element type nil at 0 (expected array)")
   end
 
   it "raises an ArgumentError for arrays of more than 2 elements" do
     ->{
       Hash[[[:a, :b, :c]]]
-    }.should raise_error(ArgumentError, "invalid number of elements (3 for 1..2)")
+    }.should.raise(ArgumentError, "invalid number of elements (3 for 1..2)")
   end
 
   it "raises an ArgumentError when passed a list of value-invalid-pairs in an array" do
     -> {
       Hash[[[:a, 1], [:b], 42, [:d, 2], [:e, 2, 3], []]]
-    }.should raise_error(ArgumentError, "wrong element type Integer at 2 (expected array)")
+    }.should.raise(ArgumentError, "wrong element type Integer at 2 (expected array)")
   end
 
   describe "passed a single argument which responds to #to_hash" do
@@ -71,13 +71,13 @@
 
       result = Hash[to_hash]
       result.should == h
-      result.should_not equal(h)
+      result.should_not.equal?(h)
     end
   end
 
   it "raises an ArgumentError when passed an odd number of arguments" do
-    -> { Hash[1, 2, 3] }.should raise_error(ArgumentError)
-    -> { Hash[1, 2, { 3 => 4 }] }.should raise_error(ArgumentError)
+    -> { Hash[1, 2, 3] }.should.raise(ArgumentError)
+    -> { Hash[1, 2, { 3 => 4 }] }.should.raise(ArgumentError)
   end
 
   it "calls to_hash" do
@@ -87,34 +87,34 @@ def obj.to_hash() { 1 => 2, 3 => 4 } end
   end
 
   it "returns an instance of a subclass when passed an Array" do
-    HashSpecs::MyHash[1,2,3,4].should be_an_instance_of(HashSpecs::MyHash)
+    HashSpecs::MyHash[1,2,3,4].should.instance_of?(HashSpecs::MyHash)
   end
 
   it "returns instances of subclasses" do
-    HashSpecs::MyHash[].should be_an_instance_of(HashSpecs::MyHash)
+    HashSpecs::MyHash[].should.instance_of?(HashSpecs::MyHash)
   end
 
   it "returns an instance of the class it's called on" do
     Hash[HashSpecs::MyHash[1, 2]].class.should == Hash
-    HashSpecs::MyHash[Hash[1, 2]].should be_an_instance_of(HashSpecs::MyHash)
+    HashSpecs::MyHash[Hash[1, 2]].should.instance_of?(HashSpecs::MyHash)
   end
 
   it "does not call #initialize on the subclass instance" do
-    HashSpecs::MyInitializerHash[Hash[1, 2]].should be_an_instance_of(HashSpecs::MyInitializerHash)
+    HashSpecs::MyInitializerHash[Hash[1, 2]].should.instance_of?(HashSpecs::MyInitializerHash)
   end
 
   it "does not retain the default value" do
     hash = Hash.new(1)
-    Hash[hash].default.should be_nil
+    Hash[hash].default.should == nil
     hash[:a] = 1
-    Hash[hash].default.should be_nil
+    Hash[hash].default.should == nil
   end
 
   it "does not retain the default_proc" do
     hash = Hash.new { |h, k| h[k] = [] }
-    Hash[hash].default_proc.should be_nil
+    Hash[hash].default_proc.should == nil
     hash[:a] = 1
-    Hash[hash].default_proc.should be_nil
+    Hash[hash].default_proc.should == nil
   end
 
   it "does not retain compare_by_identity flag" do
diff --git a/spec/ruby/core/hash/deconstruct_keys_spec.rb b/spec/ruby/core/hash/deconstruct_keys_spec.rb
index bbcd8932e58..f6ff3a28187 100644
--- a/spec/ruby/core/hash/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/hash/deconstruct_keys_spec.rb
@@ -4,13 +4,13 @@
   it "returns self" do
     hash = {a: 1, b: 2}
 
-    hash.deconstruct_keys([:a, :b]).should equal hash
+    hash.deconstruct_keys([:a, :b]).should.equal? hash
   end
 
   it "requires one argument" do
     -> {
       {a: 1}.deconstruct_keys
-    }.should raise_error(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
+    }.should.raise(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
   end
 
   it "ignores argument" do
diff --git a/spec/ruby/core/hash/default_proc_spec.rb b/spec/ruby/core/hash/default_proc_spec.rb
index f4e48036327..4830e02acd2 100644
--- a/spec/ruby/core/hash/default_proc_spec.rb
+++ b/spec/ruby/core/hash/default_proc_spec.rb
@@ -25,24 +25,24 @@
     h = Hash.new { 'Paris' }
     obj = mock('to_proc')
     obj.should_receive(:to_proc).and_return(Proc.new { 'Montreal' })
-    (h.default_proc = obj).should equal(obj)
+    (h.default_proc = obj).should.equal?(obj)
     h[:cool_city].should == 'Montreal'
   end
 
   it "overrides the static default" do
     h = Hash.new(42)
     h.default_proc = Proc.new { 6 }
-    h.default.should be_nil
+    h.default.should == nil
     h.default_proc.call.should == 6
   end
 
   it "raises an error if passed stuff not convertible to procs" do
-    ->{{}.default_proc = 42}.should raise_error(TypeError)
+    ->{{}.default_proc = 42}.should.raise(TypeError)
   end
 
   it "returns the passed Proc" do
     new_proc = Proc.new {}
-    ({}.default_proc = new_proc).should equal(new_proc)
+    ({}.default_proc = new_proc).should.equal?(new_proc)
   end
 
   it "clears the default proc if passed nil" do
@@ -53,28 +53,28 @@
   end
 
   it "returns nil if passed nil" do
-    ({}.default_proc = nil).should be_nil
+    ({}.default_proc = nil).should == nil
   end
 
   it "accepts a lambda with an arity of 2" do
     h = {}
     -> do
       h.default_proc = -> a, b { }
-    end.should_not raise_error(TypeError)
+    end.should_not.raise(TypeError)
   end
 
   it "raises a TypeError if passed a lambda with an arity other than 2" do
     h = {}
     -> do
       h.default_proc = -> a { }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
     -> do
       h.default_proc = -> a, b, c { }
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a FrozenError if self is frozen" do
-    -> { {}.freeze.default_proc = Proc.new {} }.should raise_error(FrozenError)
-    -> { {}.freeze.default_proc = nil }.should raise_error(FrozenError)
+    -> { {}.freeze.default_proc = Proc.new {} }.should.raise(FrozenError)
+    -> { {}.freeze.default_proc = nil }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/default_spec.rb b/spec/ruby/core/hash/default_spec.rb
index d8b62ea1960..17ee032e2bf 100644
--- a/spec/ruby/core/hash/default_spec.rb
+++ b/spec/ruby/core/hash/default_spec.rb
@@ -40,7 +40,7 @@
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.default = nil }.should raise_error(FrozenError)
-    -> { HashSpecs.empty_frozen_hash.default = nil }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.default = nil }.should.raise(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.default = nil }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/delete_if_spec.rb b/spec/ruby/core/hash/delete_if_spec.rb
index c9e670ffc30..3090633d88f 100644
--- a/spec/ruby/core/hash/delete_if_spec.rb
+++ b/spec/ruby/core/hash/delete_if_spec.rb
@@ -12,13 +12,13 @@
 
   it "removes every entry for which block is true and returns self" do
     h = { a: 1, b: 2, c: 3, d: 4 }
-    h.delete_if { |k,v| v % 2 == 1 }.should equal(h)
+    h.delete_if { |k,v| v % 2 == 1 }.should.equal?(h)
     h.should == { b: 2, d: 4 }
   end
 
   it "removes all entries if the block is true" do
     h = { a: 1, b: 2, c: 3 }
-    h.delete_if { |k,v| true }.should equal(h)
+    h.delete_if { |k,v| true }.should.equal?(h)
     h.should == {}
   end
 
@@ -35,8 +35,8 @@
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.delete_if { false } }.should raise_error(FrozenError)
-    -> { HashSpecs.empty_frozen_hash.delete_if { true } }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.delete_if { false } }.should.raise(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.delete_if { true } }.should.raise(FrozenError)
   end
 
   it_behaves_like :hash_iteration_no_block, :delete_if
diff --git a/spec/ruby/core/hash/delete_spec.rb b/spec/ruby/core/hash/delete_spec.rb
index 3e3479c69c9..33ff01bf365 100644
--- a/spec/ruby/core/hash/delete_spec.rb
+++ b/spec/ruby/core/hash/delete_spec.rb
@@ -52,7 +52,7 @@
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.delete("foo") }.should raise_error(FrozenError)
-    -> { HashSpecs.empty_frozen_hash.delete("foo") }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.delete("foo") }.should.raise(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.delete("foo") }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/dig_spec.rb b/spec/ruby/core/hash/dig_spec.rb
index aa0ecadd2f6..94ac94e8507 100644
--- a/spec/ruby/core/hash/dig_spec.rb
+++ b/spec/ruby/core/hash/dig_spec.rb
@@ -5,16 +5,16 @@
   it "returns #[] with one arg" do
     h = { 0 => false, a: 1 }
     h.dig(:a).should == 1
-    h.dig(0).should be_false
-    h.dig(1).should be_nil
+    h.dig(0).should == false
+    h.dig(1).should == nil
   end
 
   it "returns the nested value specified by the sequence of keys" do
     h = { foo: { bar: { baz: 1 } } }
     h.dig(:foo, :bar, :baz).should == 1
-    h.dig(:foo, :bar, :nope).should be_nil
-    h.dig(:foo, :baz).should be_nil
-    h.dig(:bar, :baz, :foo).should be_nil
+    h.dig(:foo, :bar, :nope).should == nil
+    h.dig(:foo, :baz).should == nil
+    h.dig(:bar, :baz, :foo).should == nil
   end
 
   it "returns the nested value specified if the sequence includes an index" do
@@ -28,7 +28,7 @@
   end
 
   it "raises an ArgumentError if no arguments provided" do
-    -> { { the: 'borg' }.dig() }.should raise_error(ArgumentError)
+    -> { { the: 'borg' }.dig() }.should.raise(ArgumentError)
   end
 
   it "handles type-mixed deep digging" do
@@ -47,8 +47,8 @@ def obj.dig(*args); [ 42 ] end
   it "raises TypeError if an intermediate element does not respond to #dig" do
     h = {}
     h[:foo] = [ { bar: [ 1 ] }, [ nil, 'str' ] ]
-    -> { h.dig(:foo, 0, :bar, 0, 0) }.should raise_error(TypeError)
-    -> { h.dig(:foo, 1, 1, 0) }.should raise_error(TypeError)
+    -> { h.dig(:foo, 0, :bar, 0, 0) }.should.raise(TypeError)
+    -> { h.dig(:foo, 1, 1, 0) }.should.raise(TypeError)
   end
 
   it "calls #dig on the result of #[] with the remaining arguments" do
@@ -60,7 +60,7 @@ def obj.dig(*args); [ 42 ] end
   it "respects Hash's default" do
     default = {bar: 42}
     h = Hash.new(default)
-    h.dig(:foo).should equal default
+    h.dig(:foo).should.equal? default
     h.dig(:foo, :bar).should == 42
   end
 end
diff --git a/spec/ruby/core/hash/each_key_spec.rb b/spec/ruby/core/hash/each_key_spec.rb
index c84dd696d5e..5b2e9deb635 100644
--- a/spec/ruby/core/hash/each_key_spec.rb
+++ b/spec/ruby/core/hash/each_key_spec.rb
@@ -7,7 +7,7 @@
   it "calls block once for each key, passing key" do
     r = {}
     h = { 1 => -1, 2 => -2, 3 => -3, 4 => -4 }
-    h.each_key { |k| r[k] = k }.should equal(h)
+    h.each_key { |k| r[k] = k }.should.equal?(h)
     r.should == { 1 => 1, 2 => 2, 3 => 3, 4 => 4 }
   end
 
diff --git a/spec/ruby/core/hash/each_value_spec.rb b/spec/ruby/core/hash/each_value_spec.rb
index 19b076730d1..2df95a8789c 100644
--- a/spec/ruby/core/hash/each_value_spec.rb
+++ b/spec/ruby/core/hash/each_value_spec.rb
@@ -7,7 +7,7 @@
   it "calls block once for each key, passing value" do
     r = []
     h = { a: -5, b: -3, c: -2, d: -1, e: -1 }
-    h.each_value { |v| r << v }.should equal(h)
+    h.each_value { |v| r << v }.should.equal?(h)
     r.sort.should == [-5, -3, -2, -1, -1]
   end
 
diff --git a/spec/ruby/core/hash/element_reference_spec.rb b/spec/ruby/core/hash/element_reference_spec.rb
index d5859cb3427..3d074b346d0 100644
--- a/spec/ruby/core/hash/element_reference_spec.rb
+++ b/spec/ruby/core/hash/element_reference_spec.rb
@@ -36,7 +36,7 @@
     b = h[:b]
     a << "bar"
 
-    a.should equal(b)
+    a.should.equal?(b)
     a.should == "foobar"
     b.should == "foobar"
   end
diff --git a/spec/ruby/core/hash/equal_value_spec.rb b/spec/ruby/core/hash/equal_value_spec.rb
index ae13a42679a..ab14f814893 100644
--- a/spec/ruby/core/hash/equal_value_spec.rb
+++ b/spec/ruby/core/hash/equal_value_spec.rb
@@ -13,6 +13,6 @@
 
     l_val.should_receive(:==).with(r_val).and_return(true)
 
-    ({ 1 => l_val } == { 1 => r_val }).should be_true
+    ({ 1 => l_val } == { 1 => r_val }).should == true
   end
 end
diff --git a/spec/ruby/core/hash/except_spec.rb b/spec/ruby/core/hash/except_spec.rb
index 026e454b13c..77a020e9b7f 100644
--- a/spec/ruby/core/hash/except_spec.rb
+++ b/spec/ruby/core/hash/except_spec.rb
@@ -7,7 +7,7 @@
 
   it "returns a new duplicate hash without arguments" do
     ret = @hash.except
-    ret.should_not equal(@hash)
+    ret.should_not.equal?(@hash)
     ret.should == @hash
   end
 
@@ -21,17 +21,17 @@
 
   it "does not retain the default value" do
     h = Hash.new(1)
-    h.except(:a).default.should be_nil
+    h.except(:a).default.should == nil
     h[:a] = 1
-    h.except(:a).default.should be_nil
+    h.except(:a).default.should == nil
   end
 
   it "does not retain the default_proc" do
     pr = proc { |h, k| h[k] = [] }
     h = Hash.new(&pr)
-    h.except(:a).default_proc.should be_nil
+    h.except(:a).default_proc.should == nil
     h[:a] = 1
-    h.except(:a).default_proc.should be_nil
+    h.except(:a).default_proc.should == nil
   end
 
   it "retains compare_by_identity flag" do
diff --git a/spec/ruby/core/hash/fetch_spec.rb b/spec/ruby/core/hash/fetch_spec.rb
index 6e0d2072240..f9b80b6c497 100644
--- a/spec/ruby/core/hash/fetch_spec.rb
+++ b/spec/ruby/core/hash/fetch_spec.rb
@@ -12,7 +12,7 @@
     it "formats the object with #inspect in the KeyError message" do
       -> {
         {}.fetch('foo')
-      }.should raise_error(KeyError, 'key not found: "foo"')
+      }.should.raise(KeyError, 'key not found: "foo"')
     end
   end
 
@@ -38,7 +38,7 @@
   end
 
   it "raises an ArgumentError when not passed one or two arguments" do
-    -> { {}.fetch()        }.should raise_error(ArgumentError)
-    -> { {}.fetch(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { {}.fetch()        }.should.raise(ArgumentError)
+    -> { {}.fetch(1, 2, 3) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/hash/flatten_spec.rb b/spec/ruby/core/hash/flatten_spec.rb
index 825da15bfc5..18e9a7b56a0 100644
--- a/spec/ruby/core/hash/flatten_spec.rb
+++ b/spec/ruby/core/hash/flatten_spec.rb
@@ -9,7 +9,7 @@
   end
 
   it "returns an Array" do
-    {}.flatten.should be_an_instance_of(Array)
+    {}.flatten.should.instance_of?(Array)
   end
 
   it "returns an empty Array for an empty Hash" do
@@ -57,6 +57,6 @@
   it "raises a TypeError if given a non-Integer argument" do
     -> do
       @h.flatten(Object.new)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/hash/gt_spec.rb b/spec/ruby/core/hash/gt_spec.rb
index cd541d4d831..69d23b7d293 100644
--- a/spec/ruby/core/hash/gt_spec.rb
+++ b/spec/ruby/core/hash/gt_spec.rb
@@ -8,7 +8,7 @@
 
   it "returns false if both hashes are identical" do
     h = { a: 1, b: 2 }
-    (h > h).should be_false
+    (h > h).should == false
   end
 end
 
diff --git a/spec/ruby/core/hash/gte_spec.rb b/spec/ruby/core/hash/gte_spec.rb
index 99b89e72178..be5060ea4f1 100644
--- a/spec/ruby/core/hash/gte_spec.rb
+++ b/spec/ruby/core/hash/gte_spec.rb
@@ -8,7 +8,7 @@
 
   it "returns true if both hashes are identical" do
     h = { a: 1, b: 2 }
-    (h >= h).should be_true
+    (h >= h).should == true
   end
 end
 
diff --git a/spec/ruby/core/hash/initialize_spec.rb b/spec/ruby/core/hash/initialize_spec.rb
index d13496ba3b6..cdba5988138 100644
--- a/spec/ruby/core/hash/initialize_spec.rb
+++ b/spec/ruby/core/hash/initialize_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Hash#initialize" do
   it "is private" do
-    Hash.should have_private_instance_method("initialize")
+    Hash.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "can be used to reset default_proc" do
@@ -42,20 +42,20 @@
 
   it "returns self" do
     h = Hash.new
-    h.send(:initialize).should equal(h)
+    h.send(:initialize).should.equal?(h)
   end
 
   it "raises a FrozenError if called on a frozen instance" do
     block = -> { HashSpecs.frozen_hash.instance_eval { initialize() }}
-    block.should raise_error(FrozenError)
+    block.should.raise(FrozenError)
 
     block = -> { HashSpecs.frozen_hash.instance_eval { initialize(nil) }  }
-    block.should raise_error(FrozenError)
+    block.should.raise(FrozenError)
 
     block = -> { HashSpecs.frozen_hash.instance_eval { initialize(5) }    }
-    block.should raise_error(FrozenError)
+    block.should.raise(FrozenError)
 
     block = -> { HashSpecs.frozen_hash.instance_eval { initialize { 5 } } }
-    block.should raise_error(FrozenError)
+    block.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/invert_spec.rb b/spec/ruby/core/hash/invert_spec.rb
index c06e15ff7cf..ea441751f2a 100644
--- a/spec/ruby/core/hash/invert_spec.rb
+++ b/spec/ruby/core/hash/invert_spec.rb
@@ -27,17 +27,17 @@
 
   it "does not retain the default value" do
     h = Hash.new(1)
-    h.invert.default.should be_nil
+    h.invert.default.should == nil
     h[:a] = 1
-    h.invert.default.should be_nil
+    h.invert.default.should == nil
   end
 
   it "does not retain the default_proc" do
     pr = proc { |h, k| h[k] = [] }
     h = Hash.new(&pr)
-    h.invert.default_proc.should be_nil
+    h.invert.default_proc.should == nil
     h[:a] = 1
-    h.invert.default_proc.should be_nil
+    h.invert.default_proc.should == nil
   end
 
   it "does not retain compare_by_identity flag" do
diff --git a/spec/ruby/core/hash/keep_if_spec.rb b/spec/ruby/core/hash/keep_if_spec.rb
index d50d9694679..c975efc5f84 100644
--- a/spec/ruby/core/hash/keep_if_spec.rb
+++ b/spec/ruby/core/hash/keep_if_spec.rb
@@ -12,24 +12,24 @@
 
   it "keeps every entry for which block is true and returns self" do
     h = { a: 1, b: 2, c: 3, d: 4 }
-    h.keep_if { |k,v| v % 2 == 0 }.should equal(h)
+    h.keep_if { |k,v| v % 2 == 0 }.should.equal?(h)
     h.should == { b: 2, d: 4 }
   end
 
   it "removes all entries if the block is false" do
     h = { a: 1, b: 2, c: 3 }
-    h.keep_if { |k,v| false }.should equal(h)
+    h.keep_if { |k,v| false }.should.equal?(h)
     h.should == {}
   end
 
   it "returns self even if unmodified" do
     h = { 1 => 2, 3 => 4 }
-    h.keep_if { true }.should equal(h)
+    h.keep_if { true }.should.equal?(h)
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.keep_if { true } }.should raise_error(FrozenError)
-    -> { HashSpecs.empty_frozen_hash.keep_if { false } }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.keep_if { true } }.should.raise(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.keep_if { false } }.should.raise(FrozenError)
   end
 
   it_behaves_like :hash_iteration_no_block, :keep_if
diff --git a/spec/ruby/core/hash/keys_spec.rb b/spec/ruby/core/hash/keys_spec.rb
index 9a067085e5a..789c413bee0 100644
--- a/spec/ruby/core/hash/keys_spec.rb
+++ b/spec/ruby/core/hash/keys_spec.rb
@@ -5,11 +5,11 @@
 
   it "returns an array with the keys in the order they were inserted" do
     {}.keys.should == []
-    {}.keys.should be_kind_of(Array)
+    {}.keys.should.is_a?(Array)
     Hash.new(5).keys.should == []
     Hash.new { 5 }.keys.should == []
     { 1 => 2, 4 => 8, 2 => 4 }.keys.should == [1, 4, 2]
-    { 1 => 2, 2 => 4, 4 => 8 }.keys.should be_kind_of(Array)
+    { 1 => 2, 2 => 4, 4 => 8 }.keys.should.is_a?(Array)
     { nil => nil }.keys.should == [nil]
   end
 
diff --git a/spec/ruby/core/hash/lt_spec.rb b/spec/ruby/core/hash/lt_spec.rb
index 22196158803..4ca326d0774 100644
--- a/spec/ruby/core/hash/lt_spec.rb
+++ b/spec/ruby/core/hash/lt_spec.rb
@@ -8,7 +8,7 @@
 
   it "returns false if both hashes are identical" do
     h = { a: 1, b: 2 }
-    (h < h).should be_false
+    (h < h).should == false
   end
 end
 
diff --git a/spec/ruby/core/hash/lte_spec.rb b/spec/ruby/core/hash/lte_spec.rb
index a166e5bca49..29e60273d17 100644
--- a/spec/ruby/core/hash/lte_spec.rb
+++ b/spec/ruby/core/hash/lte_spec.rb
@@ -8,7 +8,7 @@
 
   it "returns true if both hashes are identical" do
     h = { a: 1, b: 2 }
-    (h <= h).should be_true
+    (h <= h).should == true
   end
 end
 
diff --git a/spec/ruby/core/hash/merge_spec.rb b/spec/ruby/core/hash/merge_spec.rb
index 6710d121efb..5fb278ad471 100644
--- a/spec/ruby/core/hash/merge_spec.rb
+++ b/spec/ruby/core/hash/merge_spec.rb
@@ -30,7 +30,7 @@
 
     -> {
       h1.merge(h2) { |k, x, y| raise(IndexError) }
-    }.should raise_error(IndexError)
+    }.should.raise(IndexError)
 
     r = h1.merge(h1) { |k,x,y| :x }
     r.should == { a: :x, b: :x, d: :x }
@@ -47,8 +47,8 @@
   end
 
   it "returns subclass instance for subclasses" do
-    HashSpecs::MyHash[1 => 2, 3 => 4].merge({ 1 => 2 }).should be_an_instance_of(HashSpecs::MyHash)
-    HashSpecs::MyHash[].merge({ 1 => 2 }).should be_an_instance_of(HashSpecs::MyHash)
+    HashSpecs::MyHash[1 => 2, 3 => 4].merge({ 1 => 2 }).should.instance_of?(HashSpecs::MyHash)
+    HashSpecs::MyHash[].merge({ 1 => 2 }).should.instance_of?(HashSpecs::MyHash)
 
     { 1 => 2, 3 => 4 }.merge(HashSpecs::MyHash[1 => 2]).class.should == Hash
     {}.merge(HashSpecs::MyHash[1 => 2]).class.should == Hash
@@ -90,8 +90,8 @@
     hash = { a: 1 }
     merged = hash.merge
 
-    merged.should eql(hash)
-    merged.should_not equal(hash)
+    merged.should.eql?(hash)
+    merged.should_not.equal?(hash)
   end
 
   it "retains the default value" do
diff --git a/spec/ruby/core/hash/new_spec.rb b/spec/ruby/core/hash/new_spec.rb
index 8de44ec9411..207fc2931f8 100644
--- a/spec/ruby/core/hash/new_spec.rb
+++ b/spec/ruby/core/hash/new_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
+# Actually these are specs of Hash#initialize, there is no Hash.new it's just Class.new.
 describe "Hash.new" do
   it "creates an empty Hash if passed no arguments" do
     Hash.new.should == {}
@@ -14,7 +15,7 @@
 
   it "does not create a copy of the default argument" do
     str = "foo"
-    Hash.new(str).default.should equal(str)
+    Hash.new(str).default.should.equal?(str)
   end
 
   it "creates a Hash with a default_proc if passed a block" do
@@ -26,12 +27,12 @@
   end
 
   it "raises an ArgumentError if more than one argument is passed" do
-    -> { Hash.new(5,6) }.should raise_error(ArgumentError)
+    -> { Hash.new(5,6) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if passed both default argument and default block" do
-    -> { Hash.new(5) { 0 }   }.should raise_error(ArgumentError)
-    -> { Hash.new(nil) { 0 } }.should raise_error(ArgumentError)
+    -> { Hash.new(5) { 0 }   }.should.raise(ArgumentError)
+    -> { Hash.new(nil) { 0 } }.should.raise(ArgumentError)
   end
 
   ruby_version_is ""..."3.4" do
@@ -40,8 +41,8 @@
         Regexp.new(Regexp.escape("Calling Hash.new with keyword arguments is deprecated and will be removed in Ruby 3.4; use Hash.new({ key: value }) instead"))
       )
 
-      -> { Hash.new(1, unknown: true) }.should raise_error(ArgumentError)
-      -> { Hash.new(unknown: true) { 0 } }.should raise_error(ArgumentError)
+      -> { Hash.new(1, unknown: true) }.should.raise(ArgumentError)
+      -> { Hash.new(unknown: true) { 0 } }.should.raise(ArgumentError)
 
       Hash.new({ unknown: true }).default.should == { unknown: true }
     end
@@ -55,13 +56,13 @@
     end
 
     it "ignores negative capacity" do
-      -> { Hash.new(capacity: -42) }.should_not raise_error
+      -> { Hash.new(capacity: -42) }.should_not.raise
     end
 
     it "raises an error if unknown keyword arguments are passed" do
-      -> { Hash.new(unknown: true) }.should raise_error(ArgumentError)
-      -> { Hash.new(1, unknown: true) }.should raise_error(ArgumentError)
-      -> { Hash.new(unknown: true) { 0 } }.should raise_error(ArgumentError)
+      -> { Hash.new(unknown: true) }.should.raise(ArgumentError)
+      -> { Hash.new(1, unknown: true) }.should.raise(ArgumentError)
+      -> { Hash.new(unknown: true) { 0 } }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/hash/rassoc_spec.rb b/spec/ruby/core/hash/rassoc_spec.rb
index f3b2a6de20c..73379f68679 100644
--- a/spec/ruby/core/hash/rassoc_spec.rb
+++ b/spec/ruby/core/hash/rassoc_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "returns an Array if the argument is a value of the Hash" do
-    @h.rassoc(:green).should be_an_instance_of(Array)
+    @h.rassoc(:green).should.instance_of?(Array)
   end
 
   it "returns a 2-element Array if the argument is a value of the Hash" do
@@ -28,15 +28,15 @@
   it "uses #== to compare the argument to the values" do
     @h[:key] = 1.0
     1.should == 1.0
-    @h.rassoc(1).should eql [:key, 1.0]
+    @h.rassoc(1).should.eql? [:key, 1.0]
   end
 
   it "returns nil if the argument is not a value of the Hash" do
-    @h.rassoc(:banana).should be_nil
+    @h.rassoc(:banana).should == nil
   end
 
   it "returns nil if the argument is not a value of the Hash even when there is a default" do
-    Hash.new(42).merge!( foo: :bar ).rassoc(42).should be_nil
-    Hash.new{|h, k| h[k] = 42}.merge!( foo: :bar ).rassoc(42).should be_nil
+    Hash.new(42).merge!( foo: :bar ).rassoc(42).should == nil
+    Hash.new{|h, k| h[k] = 42}.merge!( foo: :bar ).rassoc(42).should == nil
   end
 end
diff --git a/spec/ruby/core/hash/rehash_spec.rb b/spec/ruby/core/hash/rehash_spec.rb
index db3e91b166e..fcd5a037bdc 100644
--- a/spec/ruby/core/hash/rehash_spec.rb
+++ b/spec/ruby/core/hash/rehash_spec.rb
@@ -20,7 +20,7 @@ def k1.hash; 1; end
 
     h.keys.include?(k1).should == true
 
-    h.rehash.should equal(h)
+    h.rehash.should.equal?(h)
     h.key?(k1).should == true
     h[k1].should == :v1
   end
@@ -108,7 +108,7 @@ def eql?(other)
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.rehash  }.should raise_error(FrozenError)
-    -> { HashSpecs.empty_frozen_hash.rehash }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.rehash  }.should.raise(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.rehash }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/reject_spec.rb b/spec/ruby/core/hash/reject_spec.rb
index 8381fc7fc1b..aa1a0748973 100644
--- a/spec/ruby/core/hash/reject_spec.rb
+++ b/spec/ruby/core/hash/reject_spec.rb
@@ -28,8 +28,8 @@ def h.to_a() end
 
   context "with extra state" do
     it "returns Hash instance for subclasses" do
-      HashSpecs::MyHash[1 => 2, 3 => 4].reject { false }.should be_kind_of(Hash)
-      HashSpecs::MyHash[1 => 2, 3 => 4].reject { true }.should be_kind_of(Hash)
+      HashSpecs::MyHash[1 => 2, 3 => 4].reject { false }.should.is_a?(Hash)
+      HashSpecs::MyHash[1 => 2, 3 => 4].reject { true }.should.is_a?(Hash)
     end
   end
 
@@ -46,17 +46,17 @@ def h.to_a() end
 
   it "does not retain the default value" do
     h = Hash.new(1)
-    h.reject { false }.default.should be_nil
+    h.reject { false }.default.should == nil
     h[:a] = 1
-    h.reject { false }.default.should be_nil
+    h.reject { false }.default.should == nil
   end
 
   it "does not retain the default_proc" do
     pr = proc { |h, k| h[k] = [] }
     h = Hash.new(&pr)
-    h.reject { false }.default_proc.should be_nil
+    h.reject { false }.default_proc.should == nil
     h[:a] = 1
-    h.reject { false }.default_proc.should be_nil
+    h.reject { false }.default_proc.should == nil
   end
 
   it "retains compare_by_identity flag" do
@@ -79,7 +79,7 @@ def h.to_a() end
 
   it "removes all entries if the block is true" do
     h = { a: 1, b: 2, c: 3 }
-    h.reject! { |k,v| true }.should equal(h)
+    h.reject! { |k,v| true }.should.equal?(h)
     h.should == {}
   end
 
@@ -104,11 +104,11 @@ def h.to_a() end
   end
 
   it "raises a FrozenError if called on a frozen instance that is modified" do
-    -> { HashSpecs.empty_frozen_hash.reject! { true } }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.reject! { true } }.should.raise(FrozenError)
   end
 
   it "raises a FrozenError if called on a frozen instance that would not be modified" do
-    -> { HashSpecs.frozen_hash.reject! { false } }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.reject! { false } }.should.raise(FrozenError)
   end
 
   it_behaves_like :hash_iteration_no_block, :reject!
diff --git a/spec/ruby/core/hash/replace_spec.rb b/spec/ruby/core/hash/replace_spec.rb
index db30145e1a7..4dacbf97791 100644
--- a/spec/ruby/core/hash/replace_spec.rb
+++ b/spec/ruby/core/hash/replace_spec.rb
@@ -4,7 +4,7 @@
 describe "Hash#replace" do
   it "replaces the contents of self with other" do
     h = { a: 1, b: 2 }
-    h.replace(c: -1, d: -2).should equal(h)
+    h.replace(c: -1, d: -2).should.equal?(h)
     h.should == { c: -1, d: -2 }
   end
 
@@ -25,7 +25,7 @@
 
   it "does not retain the default value" do
     hash = Hash.new(1)
-    hash.replace(b: 2).default.should be_nil
+    hash.replace(b: 2).default.should == nil
   end
 
   it "transfers the default value of an argument" do
@@ -36,7 +36,7 @@
   it "does not retain the default_proc" do
     pr = proc { |h, k| h[k] = [] }
     hash = Hash.new(&pr)
-    hash.replace(b: 2).default_proc.should be_nil
+    hash.replace(b: 2).default_proc.should == nil
   end
 
   it "transfers the default_proc of an argument" do
@@ -68,12 +68,12 @@
   it "raises a FrozenError if called on a frozen instance that would not be modified" do
     -> do
       HashSpecs.frozen_hash.replace(HashSpecs.frozen_hash)
-    end.should raise_error(FrozenError)
+    end.should.raise(FrozenError)
   end
 
   it "raises a FrozenError if called on a frozen instance that is modified" do
     -> do
       HashSpecs.frozen_hash.replace(HashSpecs.empty_frozen_hash)
-    end.should raise_error(FrozenError)
+    end.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb b/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
index ddf90388000..609a53f81fc 100644
--- a/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
+++ b/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it "raises TypeError for non-Hash" do
-    -> { Hash.ruby2_keywords_hash?(nil) }.should raise_error(TypeError)
+    -> { Hash.ruby2_keywords_hash?(nil) }.should.raise(TypeError)
   end
 end
 
@@ -54,7 +54,7 @@
   end
 
   it "raises TypeError for non-Hash" do
-    -> { Hash.ruby2_keywords_hash(nil) }.should raise_error(TypeError)
+    -> { Hash.ruby2_keywords_hash(nil) }.should.raise(TypeError)
   end
 
   it "retains the default value" do
diff --git a/spec/ruby/core/hash/shared/comparison.rb b/spec/ruby/core/hash/shared/comparison.rb
index 07564e4ceca..2b628372320 100644
--- a/spec/ruby/core/hash/shared/comparison.rb
+++ b/spec/ruby/core/hash/shared/comparison.rb
@@ -1,15 +1,15 @@
 describe :hash_comparison, shared: true do
   it "raises a TypeError if the right operand is not a hash" do
-    -> { { a: 1 }.send(@method, 1) }.should raise_error(TypeError)
-    -> { { a: 1 }.send(@method, nil) }.should raise_error(TypeError)
-    -> { { a: 1 }.send(@method, []) }.should raise_error(TypeError)
+    -> { { a: 1 }.send(@method, 1) }.should.raise(TypeError)
+    -> { { a: 1 }.send(@method, nil) }.should.raise(TypeError)
+    -> { { a: 1 }.send(@method, []) }.should.raise(TypeError)
   end
 
   it "returns false if both hashes have the same keys but different values" do
     h1 = { a: 1 }
     h2 = { a: 2 }
 
-    h1.send(@method, h2).should be_false
-    h2.send(@method, h1).should be_false
+    h1.send(@method, h2).should == false
+    h2.send(@method, h1).should == false
   end
 end
diff --git a/spec/ruby/core/hash/shared/each.rb b/spec/ruby/core/hash/shared/each.rb
index f9839ff58fa..657c5d2c529 100644
--- a/spec/ruby/core/hash/shared/each.rb
+++ b/spec/ruby/core/hash/shared/each.rb
@@ -10,7 +10,7 @@
   it "yields the key and value of each pair to a block expecting |key, value|" do
     r = {}
     h = { a: 1, b: 2, c: 3, d: 5 }
-    h.send(@method) { |k,v| r[k.to_s] = v.to_s }.should equal(h)
+    h.send(@method) { |k,v| r[k.to_s] = v.to_s }.should.equal?(h)
     r.should == { "a" => "1", "b" => "2", "c" => "3", "d" => "5" }
   end
 
@@ -28,11 +28,11 @@ def obj.foo(key, value)
 
     -> {
       { "a" => 1 }.send(@method, &obj.method(:foo))
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       { "a" => 1 }.send(@method, &-> key, value { })
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "yields an Array of 2 elements when given a callable of arity 1" do
@@ -53,7 +53,7 @@ def obj.foo(key, value, extra)
 
     -> {
       { "a" => 1 }.send(@method, &obj.method(:foo))
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "uses the same order as keys() and values()" do
diff --git a/spec/ruby/core/hash/shared/eql.rb b/spec/ruby/core/hash/shared/eql.rb
index 68db49f76d0..512e1ad016a 100644
--- a/spec/ruby/core/hash/shared/eql.rb
+++ b/spec/ruby/core/hash/shared/eql.rb
@@ -3,7 +3,7 @@
     value = mock('x')
     value.should_not_receive(:==)
     value.should_not_receive(:eql?)
-    { 1 => value }.send(@method, { 2 => value }).should be_false
+    { 1 => value }.send(@method, { 2 => value }).should == false
   end
 
   it "returns false when the numbers of keys differ without comparing any elements" do
@@ -13,8 +13,8 @@
     obj.should_not_receive(:==)
     obj.should_not_receive(:eql?)
 
-    {}.send(@method, h).should be_false
-    h.send(@method, {}).should be_false
+    {}.send(@method, h).should == false
+    h.send(@method, {}).should == false
   end
 
   it "first compares keys via hash" do
@@ -23,7 +23,7 @@
     y = mock('y')
     y.should_receive(:hash).any_number_of_times.and_return(0)
 
-    { x => 1 }.send(@method, { y => 1 }).should be_false
+    { x => 1 }.send(@method, { y => 1 }).should == false
   end
 
   it "does not compare keys with different hash codes via eql?" do
@@ -35,39 +35,39 @@
     x.should_receive(:hash).any_number_of_times.and_return(0)
     y.should_receive(:hash).any_number_of_times.and_return(1)
 
-    { x => 1 }.send(@method, { y => 1 }).should be_false
+    { x => 1 }.send(@method, { y => 1 }).should == false
   end
 
   it "computes equality for recursive hashes" do
     h = {}
     h[:a] = h
-    h.send(@method, h[:a]).should be_true
-    (h == h[:a]).should be_true
+    h.send(@method, h[:a]).should == true
+    (h == h[:a]).should == true
   end
 
   it "doesn't call to_hash on objects" do
     mock_hash = mock("fake hash")
     def mock_hash.to_hash() {} end
-    {}.send(@method, mock_hash).should be_false
+    {}.send(@method, mock_hash).should == false
   end
 
   it "computes equality for complex recursive hashes" do
     a, b = {}, {}
     a.merge! self: a, other: b
     b.merge! self: b, other: a
-    a.send(@method, b).should be_true # they both have the same structure!
+    a.send(@method, b).should == true # they both have the same structure!
 
     c = {}
     c.merge! other: c, self: c
-    c.send(@method, a).should be_true # subtle, but they both have the same structure!
+    c.send(@method, a).should == true # subtle, but they both have the same structure!
     a[:delta] = c[:delta] = a
-    c.send(@method, a).should be_false # not quite the same structure, as a[:other][:delta] = nil
+    c.send(@method, a).should == false # not quite the same structure, as a[:other][:delta] = nil
     c[:delta] = 42
-    c.send(@method, a).should be_false
+    c.send(@method, a).should == false
     a[:delta] = 42
-    c.send(@method, a).should be_false
+    c.send(@method, a).should == false
     b[:delta] = 42
-    c.send(@method, a).should be_true
+    c.send(@method, a).should == true
   end
 
   it "computes equality for recursive hashes & arrays" do
@@ -76,19 +76,19 @@ def mock_hash.to_hash() {} end
     x << a
     y << c
     z << b
-    b.send(@method, c).should be_true # they clearly have the same structure!
-    y.send(@method, z).should be_true
-    a.send(@method, b).should be_true # subtle, but they both have the same structure!
-    x.send(@method, y).should be_true
+    b.send(@method, c).should == true # they clearly have the same structure!
+    y.send(@method, z).should == true
+    a.send(@method, b).should == true # subtle, but they both have the same structure!
+    x.send(@method, y).should == true
     y << x
-    y.send(@method, z).should be_false
+    y.send(@method, z).should == false
     z << x
-    y.send(@method, z).should be_true
+    y.send(@method, z).should == true
 
     a[:foo], a[:bar] = a[:bar], a[:foo]
-    a.send(@method, b).should be_false
+    a.send(@method, b).should == false
     b[:bar] = b[:foo]
-    b.send(@method, c).should be_false
+    b.send(@method, c).should == false
   end
 end
 
@@ -100,7 +100,7 @@ def x.==(o) false end
     def y.==(o) false end
     def x.eql?(o) false end
     def y.eql?(o) false end
-    { 1 => x }.send(@method, { 1 => y }).should be_false
+    { 1 => x }.send(@method, { 1 => y }).should == false
 
     x = mock('x')
     y = mock('y')
@@ -108,45 +108,45 @@ def x.==(o) true end
     def y.==(o) true end
     def x.eql?(o) true end
     def y.eql?(o) true end
-    { 1 => x }.send(@method, { 1 => y }).should be_true
+    { 1 => x }.send(@method, { 1 => y }).should == true
   end
 
   it "compares keys with eql? semantics" do
-    { 1.0 => "x" }.send(@method, { 1.0 => "x" }).should be_true
-    { 1.0 => "x" }.send(@method, { 1.0 => "x" }).should be_true
-    { 1 => "x" }.send(@method, { 1.0 => "x" }).should be_false
-    { 1.0 => "x" }.send(@method, { 1 => "x" }).should be_false
+    { 1.0 => "x" }.send(@method, { 1.0 => "x" }).should == true
+    { 1.0 => "x" }.send(@method, { 1.0 => "x" }).should == true
+    { 1 => "x" }.send(@method, { 1.0 => "x" }).should == false
+    { 1.0 => "x" }.send(@method, { 1 => "x" }).should == false
   end
 
   it "returns true if and only if other Hash has the same number of keys and each key-value pair matches" do
     a = { a: 5 }
     b = {}
-    a.send(@method, b).should be_false
+    a.send(@method, b).should == false
 
     b[:a] = 5
-    a.send(@method, b).should be_true
+    a.send(@method, b).should == true
 
     not_supported_on :opal do
       c = { "a" => 5 }
-      a.send(@method, c).should be_false
+      a.send(@method, c).should == false
     end
 
     c = { "A" => 5 }
-    a.send(@method, c).should be_false
+    a.send(@method, c).should == false
 
     c = { a: 6 }
-    a.send(@method, c).should be_false
+    a.send(@method, c).should == false
   end
 
   it "does not call to_hash on hash subclasses" do
-    { 5 => 6 }.send(@method, HashSpecs::ToHashHash[5 => 6]).should be_true
+    { 5 => 6 }.send(@method, HashSpecs::ToHashHash[5 => 6]).should == true
   end
 
   it "ignores hash class differences" do
     h = { 1 => 2, 3 => 4 }
-    HashSpecs::MyHash[h].send(@method, h).should be_true
-    HashSpecs::MyHash[h].send(@method, HashSpecs::MyHash[h]).should be_true
-    h.send(@method, HashSpecs::MyHash[h]).should be_true
+    HashSpecs::MyHash[h].send(@method, h).should == true
+    HashSpecs::MyHash[h].send(@method, HashSpecs::MyHash[h]).should == true
+    h.send(@method, HashSpecs::MyHash[h]).should == true
   end
 
   # Why isn't this true of eql? too ?
@@ -163,7 +163,7 @@ def obj.eql?(o)
       obj
     end
 
-    { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_false
+    { a[0] => 1 }.send(@method, { a[1] => 1 }).should == false
 
     a = Array.new(2) do
       obj = mock('0')
@@ -176,7 +176,7 @@ def obj.eql?(o)
       obj
     end
 
-    { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_true
+    { a[0] => 1 }.send(@method, { a[1] => 1 }).should == true
   end
 
   it "compares the values in self to values in other hash" do
@@ -185,20 +185,20 @@ def obj.eql?(o)
 
     l_val.should_receive(:eql?).with(r_val).and_return(true)
 
-    { 1 => l_val }.eql?({ 1 => r_val }).should be_true
+    { 1 => l_val }.eql?({ 1 => r_val }).should == true
   end
 end
 
 describe :hash_eql_additional_more, shared: true do
   it "returns true if other Hash has the same number of keys and each key-value pair matches, even though the default-value are not same" do
-    Hash.new(5).send(@method, Hash.new(1)).should be_true
-    Hash.new {|h, k| 1}.send(@method, Hash.new {}).should be_true
-    Hash.new {|h, k| 1}.send(@method, Hash.new(2)).should be_true
+    Hash.new(5).send(@method, Hash.new(1)).should == true
+    Hash.new {|h, k| 1}.send(@method, Hash.new {}).should == true
+    Hash.new {|h, k| 1}.send(@method, Hash.new(2)).should == true
 
     d = Hash.new {|h, k| 1}
     e = Hash.new {}
     d[1] = 2
     e[1] = 2
-    d.send(@method, e).should be_true
+    d.send(@method, e).should == true
   end
 end
diff --git a/spec/ruby/core/hash/shared/greater_than.rb b/spec/ruby/core/hash/shared/greater_than.rb
index 1f8b9fcfb7c..dfe0b802505 100644
--- a/spec/ruby/core/hash/shared/greater_than.rb
+++ b/spec/ruby/core/hash/shared/greater_than.rb
@@ -5,11 +5,11 @@
   end
 
   it "returns true if the other hash is a subset of self" do
-    @h1.send(@method, @h2).should be_true
+    @h1.send(@method, @h2).should == true
   end
 
   it "returns false if the other hash is not a subset of self" do
-    @h2.send(@method, @h1).should be_false
+    @h2.send(@method, @h1).should == false
   end
 
   it "converts the right operand to a hash before comparing" do
@@ -18,6 +18,6 @@ def o.to_hash
       { a: 1, b: 2 }
     end
 
-    @h1.send(@method, o).should be_true
+    @h1.send(@method, o).should == true
   end
 end
diff --git a/spec/ruby/core/hash/shared/index.rb b/spec/ruby/core/hash/shared/index.rb
index 7f6a186464b..dd4e89a9b47 100644
--- a/spec/ruby/core/hash/shared/index.rb
+++ b/spec/ruby/core/hash/shared/index.rb
@@ -10,13 +10,13 @@
 
   it "returns nil if the value is not found" do
     suppress_warning do # for Hash#index
-      { a: -1, b: 3.14, c: 2.718 }.send(@method, 1).should be_nil
+      { a: -1, b: 3.14, c: 2.718 }.send(@method, 1).should == nil
     end
   end
 
   it "doesn't return default value if the value is not found" do
     suppress_warning do # for Hash#index
-      Hash.new(5).send(@method, 5).should be_nil
+      Hash.new(5).send(@method, 5).should == nil
     end
   end
 
diff --git a/spec/ruby/core/hash/shared/iteration.rb b/spec/ruby/core/hash/shared/iteration.rb
index d27c2443f8c..322e4b9a2f2 100644
--- a/spec/ruby/core/hash/shared/iteration.rb
+++ b/spec/ruby/core/hash/shared/iteration.rb
@@ -5,15 +5,15 @@
   end
 
   it "returns an Enumerator if called on a non-empty hash without a block" do
-    @hsh.send(@method).should be_an_instance_of(Enumerator)
+    @hsh.send(@method).should.instance_of?(Enumerator)
   end
 
   it "returns an Enumerator if called on an empty hash without a block" do
-    @empty.send(@method).should be_an_instance_of(Enumerator)
+    @empty.send(@method).should.instance_of?(Enumerator)
   end
 
   it "returns an Enumerator if called on a frozen instance" do
     @hsh.freeze
-    @hsh.send(@method).should be_an_instance_of(Enumerator)
+    @hsh.send(@method).should.instance_of?(Enumerator)
   end
 end
diff --git a/spec/ruby/core/hash/shared/less_than.rb b/spec/ruby/core/hash/shared/less_than.rb
index cdc6f145466..071b3e97bb9 100644
--- a/spec/ruby/core/hash/shared/less_than.rb
+++ b/spec/ruby/core/hash/shared/less_than.rb
@@ -5,11 +5,11 @@
   end
 
   it "returns true if self is a subset of the other hash" do
-    @h1.send(@method, @h2).should be_true
+    @h1.send(@method, @h2).should == true
   end
 
   it "returns false if self is not a subset of the other hash" do
-    @h2.send(@method, @h1).should be_false
+    @h2.send(@method, @h1).should == false
   end
 
   it "converts the right operand to a hash before comparing" do
@@ -18,6 +18,6 @@ def o.to_hash
       { a: 1, b: 2, c: 3 }
     end
 
-    @h1.send(@method, o).should be_true
+    @h1.send(@method, o).should == true
   end
 end
diff --git a/spec/ruby/core/hash/shared/select.rb b/spec/ruby/core/hash/shared/select.rb
index fbeff073304..b4f6d1b3acb 100644
--- a/spec/ruby/core/hash/shared/select.rb
+++ b/spec/ruby/core/hash/shared/select.rb
@@ -17,7 +17,7 @@
 
   it "returns a Hash of entries for which block is true" do
     a_pairs = { 'a' => 9, 'c' => 4, 'b' => 5, 'd' => 2 }.send(@method) { |k,v| v % 2 == 0 }
-    a_pairs.should be_an_instance_of(Hash)
+    a_pairs.should.instance_of?(Hash)
     a_pairs.sort.should == [['c', 4], ['d', 2]]
   end
 
@@ -33,26 +33,26 @@
   end
 
   it "returns an Enumerator when called on a non-empty hash without a block" do
-    @hsh.send(@method).should be_an_instance_of(Enumerator)
+    @hsh.send(@method).should.instance_of?(Enumerator)
   end
 
   it "returns an Enumerator when called on an empty hash without a block" do
-    @empty.send(@method).should be_an_instance_of(Enumerator)
+    @empty.send(@method).should.instance_of?(Enumerator)
   end
 
   it "does not retain the default value" do
     h = Hash.new(1)
-    h.send(@method) { true }.default.should be_nil
+    h.send(@method) { true }.default.should == nil
     h[:a] = 1
-    h.send(@method) { true }.default.should be_nil
+    h.send(@method) { true }.default.should == nil
   end
 
   it "does not retain the default_proc" do
     pr = proc { |h, k| h[k] = [] }
     h = Hash.new(&pr)
-    h.send(@method) { true }.default_proc.should be_nil
+    h.send(@method) { true }.default_proc.should == nil
     h[:a] = 1
-    h.send(@method) { true }.default_proc.should be_nil
+    h.send(@method) { true }.default_proc.should == nil
   end
 
   it "retains compare_by_identity flag" do
@@ -77,7 +77,7 @@
 
   it "is equivalent to keep_if if changes are made" do
     h = { a: 2 }
-    h.send(@method) { |k,v| v <= 1 }.should equal h
+    h.send(@method) { |k,v| v <= 1 }.should.equal? h
 
     h = { 1 => 2, 3 => 4 }
     all_args_select = []
@@ -87,7 +87,7 @@
 
   it "removes all entries if the block is false" do
     h = { a: 1, b: 2, c: 3 }
-    h.send(@method) { |k,v| false }.should equal(h)
+    h.send(@method) { |k,v| false }.should.equal?(h)
     h.should == {}
   end
 
@@ -96,11 +96,11 @@
   end
 
   it "raises a FrozenError if called on an empty frozen instance" do
-    -> { HashSpecs.empty_frozen_hash.send(@method) { false } }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.send(@method) { false } }.should.raise(FrozenError)
   end
 
   it "raises a FrozenError if called on a frozen instance that would not be modified" do
-    -> { HashSpecs.frozen_hash.send(@method) { true } }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.send(@method) { true } }.should.raise(FrozenError)
   end
 
   it_should_behave_like :hash_iteration_no_block
diff --git a/spec/ruby/core/hash/shared/store.rb b/spec/ruby/core/hash/shared/store.rb
index 72a462a42f4..05ef63face6 100644
--- a/spec/ruby/core/hash/shared/store.rb
+++ b/spec/ruby/core/hash/shared/store.rb
@@ -57,7 +57,7 @@ def key.reverse() "bar" end
     key = "foo".freeze
     h = {}
     h.send(@method, key, 0)
-    h.keys[0].should equal(key)
+    h.keys[0].should.equal?(key)
   end
 
   it "keeps the existing key in the hash if there is a matching one" do
@@ -66,28 +66,28 @@ def key.reverse() "bar" end
     key2 = HashSpecs::ByValueKey.new(13)
     h[key1] = 41
     key_in_hash = h.keys.last
-    key_in_hash.should equal(key1)
+    key_in_hash.should.equal?(key1)
     h[key2] = 42
     last_key = h.keys.last
-    last_key.should equal(key_in_hash)
-    last_key.should_not equal(key2)
+    last_key.should.equal?(key_in_hash)
+    last_key.should_not.equal?(key2)
   end
 
   it "keeps the existing String key in the hash if there is a matching one" do
     h = { "a" => 1, "b" => 2, "c" => 3, "d" => 4 }
     key1 = "foo".dup
     key2 = "foo".dup
-    key1.should_not equal(key2)
+    key1.should_not.equal?(key2)
     h[key1] = 41
     frozen_key = h.keys.last
-    frozen_key.should_not equal(key1)
+    frozen_key.should_not.equal?(key1)
     h[key2] = 42
-    h.keys.last.should equal(frozen_key)
-    h.keys.last.should_not equal(key2)
+    h.keys.last.should.equal?(frozen_key)
+    h.keys.last.should_not.equal?(key2)
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.send(@method, 1, 2) }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.send(@method, 1, 2) }.should.raise(FrozenError)
   end
 
   it "does not raise an exception if changing the value of an existing key during iteration" do
diff --git a/spec/ruby/core/hash/shared/to_s.rb b/spec/ruby/core/hash/shared/to_s.rb
index 38dd2c44360..f88ca738a59 100644
--- a/spec/ruby/core/hash/shared/to_s.rb
+++ b/spec/ruby/core/hash/shared/to_s.rb
@@ -54,7 +54,7 @@
     obj.should_receive(:inspect).and_return(obj)
     obj.should_receive(:to_s).and_raise(Exception)
 
-    -> { { a: obj }.send(@method) }.should raise_error(Exception)
+    -> { { a: obj }.send(@method) }.should.raise(Exception)
   end
 
   it "handles hashes with recursive values" do
diff --git a/spec/ruby/core/hash/shared/update.rb b/spec/ruby/core/hash/shared/update.rb
index 1b0eb809bf8..6dbad1d6d01 100644
--- a/spec/ruby/core/hash/shared/update.rb
+++ b/spec/ruby/core/hash/shared/update.rb
@@ -1,14 +1,14 @@
 describe :hash_update, shared: true do
   it "adds the entries from other, overwriting duplicate keys. Returns self" do
     h = { _1: 'a', _2: '3' }
-    h.send(@method, _1: '9', _9: 2).should equal(h)
+    h.send(@method, _1: '9', _9: 2).should.equal?(h)
     h.should == { _1: "9", _2: "3", _9: 2 }
   end
 
   it "sets any duplicate key to the value of block if passed a block" do
     h1 = { a: 2, b: -1 }
     h2 = { a: -2, c: 1 }
-    h1.send(@method, h2) { |k,x,y| 3.14 }.should equal(h1)
+    h1.send(@method, h2) { |k,x,y| 3.14 }.should.equal?(h1)
     h1.should == { c: 1, b: -1, a: 3.14 }
 
     h1.send(@method, h1) { nil }
@@ -37,7 +37,7 @@
   it "raises a FrozenError on a frozen instance that is modified" do
     -> do
       HashSpecs.frozen_hash.send(@method, 1 => 2)
-    end.should raise_error(FrozenError)
+    end.should.raise(FrozenError)
   end
 
   it "checks frozen status before coercing an object with #to_hash" do
@@ -47,14 +47,14 @@
     def obj.to_hash() raise Exception, "should not receive #to_hash" end
     obj.freeze
 
-    -> { HashSpecs.frozen_hash.send(@method, obj) }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.send(@method, obj) }.should.raise(FrozenError)
   end
 
   # see redmine #1571
   it "raises a FrozenError on a frozen instance that would not be modified" do
     -> do
       HashSpecs.frozen_hash.send(@method, HashSpecs.empty_frozen_hash)
-    end.should raise_error(FrozenError)
+    end.should.raise(FrozenError)
   end
 
   it "does not raise an exception if changing the value of an existing key during iteration" do
@@ -71,6 +71,6 @@ def obj.to_hash() raise Exception, "should not receive #to_hash" end
 
   it "accepts zero arguments" do
     hash = { a: 1 }
-    hash.send(@method).should eql(hash)
+    hash.send(@method).should.eql?(hash)
   end
 end
diff --git a/spec/ruby/core/hash/shared/values_at.rb b/spec/ruby/core/hash/shared/values_at.rb
index ef3b0e8ba00..4e4e60e7d6b 100644
--- a/spec/ruby/core/hash/shared/values_at.rb
+++ b/spec/ruby/core/hash/shared/values_at.rb
@@ -1,9 +1,9 @@
 describe :hash_values_at, shared: true do
   it "returns an array of values for the given keys" do
     h = { a: 9, b: 'a', c: -10, d: nil }
-    h.send(@method).should be_kind_of(Array)
+    h.send(@method).should.is_a?(Array)
     h.send(@method).should == []
-    h.send(@method, :a, :d, :b).should be_kind_of(Array)
+    h.send(@method, :a, :d, :b).should.is_a?(Array)
     h.send(@method, :a, :d, :b).should == [9, nil, 'a']
   end
 end
diff --git a/spec/ruby/core/hash/shift_spec.rb b/spec/ruby/core/hash/shift_spec.rb
index 3f31b9864cd..6095d2e55f2 100644
--- a/spec/ruby/core/hash/shift_spec.rb
+++ b/spec/ruby/core/hash/shift_spec.rb
@@ -8,7 +8,7 @@
 
     h.size.times do |i|
       r = h.shift
-      r.should be_kind_of(Array)
+      r.should.is_a?(Array)
       h2[r.first].should == r.last
       h.size.should == h2.size - i - 1
     end
@@ -57,8 +57,8 @@ def h.default(key)
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.shift  }.should raise_error(FrozenError)
-    -> { HashSpecs.empty_frozen_hash.shift }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.shift  }.should.raise(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.shift }.should.raise(FrozenError)
   end
 
   it "works when the hash is at capacity" do
diff --git a/spec/ruby/core/hash/slice_spec.rb b/spec/ruby/core/hash/slice_spec.rb
index 4fcc01f9a6f..fd932545178 100644
--- a/spec/ruby/core/hash/slice_spec.rb
+++ b/spec/ruby/core/hash/slice_spec.rb
@@ -7,8 +7,8 @@
 
   it "returns a new empty hash without arguments" do
     ret = @hash.slice
-    ret.should_not equal(@hash)
-    ret.should be_an_instance_of(Hash)
+    ret.should_not.equal?(@hash)
+    ret.should.instance_of?(Hash)
     ret.should == {}
   end
 
@@ -53,17 +53,17 @@ def [](value)
 
   it "does not retain the default value" do
     h = Hash.new(1)
-    h.slice(:a).default.should be_nil
+    h.slice(:a).default.should == nil
     h[:a] = 1
-    h.slice(:a).default.should be_nil
+    h.slice(:a).default.should == nil
   end
 
   it "does not retain the default_proc" do
     pr = proc { |h, k| h[k] = [] }
     h = Hash.new(&pr)
-    h.slice(:a).default_proc.should be_nil
+    h.slice(:a).default_proc.should == nil
     h[:a] = 1
-    h.slice(:a).default_proc.should be_nil
+    h.slice(:a).default_proc.should == nil
   end
 
   it "retains compare_by_identity flag" do
diff --git a/spec/ruby/core/hash/to_a_spec.rb b/spec/ruby/core/hash/to_a_spec.rb
index 5baf677929f..8c638db6c3a 100644
--- a/spec/ruby/core/hash/to_a_spec.rb
+++ b/spec/ruby/core/hash/to_a_spec.rb
@@ -10,7 +10,7 @@
       pairs << [key, value]
     end
 
-    h.to_a.should be_kind_of(Array)
+    h.to_a.should.is_a?(Array)
     h.to_a.should == pairs
   end
 
@@ -23,7 +23,7 @@
     end
 
     ent = h.entries
-    ent.should be_kind_of(Array)
+    ent.should.is_a?(Array)
     ent.should == pairs
   end
 end
diff --git a/spec/ruby/core/hash/to_h_spec.rb b/spec/ruby/core/hash/to_h_spec.rb
index f84fd7b503d..5d5a280dac4 100644
--- a/spec/ruby/core/hash/to_h_spec.rb
+++ b/spec/ruby/core/hash/to_h_spec.rb
@@ -4,7 +4,7 @@
 describe "Hash#to_h" do
   it "returns self for Hash instances" do
     h = {}
-    h.to_h.should equal(h)
+    h.to_h.should.equal?(h)
   end
 
   describe "when called on a subclass of Hash" do
@@ -14,7 +14,7 @@
     end
 
     it "returns a new Hash instance" do
-      @h.to_h.should be_an_instance_of(Hash)
+      @h.to_h.should.instance_of?(Hash)
       @h.to_h.should == @h
       @h[:foo].should == :bar
     end
@@ -55,17 +55,17 @@
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         { a: 1, b: 2 }.to_h { |k, v| [k.to_s, v*v, 1] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
 
       -> do
         { a: 1, b: 2 }.to_h { |k, v| [k] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
     end
 
     it "raises TypeError if block returns something other than Array" do
       -> do
         { a: 1, b: 2 }.to_h { |k, v| "not-array" }
-      end.should raise_error(TypeError, /wrong element type String/)
+      end.should.raise(TypeError, /wrong element type String/)
     end
 
     it "coerces returned pair to Array with #to_ary" do
@@ -81,20 +81,20 @@
 
       -> do
         { a: 1 }.to_h { |k| x }
-      end.should raise_error(TypeError, /wrong element type MockObject/)
+      end.should.raise(TypeError, /wrong element type MockObject/)
     end
 
     it "does not retain the default value" do
       h = Hash.new(1)
       h2 = h.to_h { |k, v| [k.to_s, v*v]}
-      h2.default.should be_nil
+      h2.default.should == nil
     end
 
     it "does not retain the default_proc" do
       pr = proc { |h, k| h[k] = [] }
       h = Hash.new(&pr)
       h2 = h.to_h { |k, v| [k.to_s, v*v]}
-      h2.default_proc.should be_nil
+      h2.default_proc.should == nil
     end
 
     it "does not retain compare_by_identity flag" do
diff --git a/spec/ruby/core/hash/to_hash_spec.rb b/spec/ruby/core/hash/to_hash_spec.rb
index f479fa1fb28..f5622b3d9c3 100644
--- a/spec/ruby/core/hash/to_hash_spec.rb
+++ b/spec/ruby/core/hash/to_hash_spec.rb
@@ -4,11 +4,11 @@
 describe "Hash#to_hash" do
   it "returns self for Hash instances" do
     h = {}
-    h.to_hash.should equal(h)
+    h.to_hash.should.equal?(h)
   end
 
   it "returns self for instances of subclasses of Hash" do
     h = HashSpecs::MyHash.new
-    h.to_hash.should equal(h)
+    h.to_hash.should.equal?(h)
   end
 end
diff --git a/spec/ruby/core/hash/to_proc_spec.rb b/spec/ruby/core/hash/to_proc_spec.rb
index 9dbc79e5eba..bc4756600d3 100644
--- a/spec/ruby/core/hash/to_proc_spec.rb
+++ b/spec/ruby/core/hash/to_proc_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "returns an instance of Proc" do
-    @hash.to_proc.should be_an_instance_of Proc
+    @hash.to_proc.should.instance_of? Proc
   end
 
   describe "the returned proc" do
@@ -30,22 +30,22 @@
     it "raises ArgumentError if not passed exactly one argument" do
       -> {
         @proc.call
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
 
       -> {
         @proc.call 1, 2
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
 
     context "with a stored key" do
       it "returns the paired value" do
-        @proc.call(@key).should equal(@value)
+        @proc.call(@key).should.equal?(@value)
       end
     end
 
     context "passed as a block" do
       it "retrieves the hash's values" do
-        [@key].map(&@proc)[0].should equal(@value)
+        [@key].map(&@proc)[0].should.equal?(@value)
       end
 
       context "to instance_exec" do
@@ -63,7 +63,7 @@
 
     context "with no stored key" do
       it "returns nil" do
-        @proc.call(@unstored).should be_nil
+        @proc.call(@unstored).should == nil
       end
 
       context "when the hash has a default value" do
@@ -72,7 +72,7 @@
         end
 
         it "returns the default value" do
-          @proc.call(@unstored).should equal(@default)
+          @proc.call(@unstored).should.equal?(@default)
         end
       end
 
@@ -85,7 +85,7 @@
     end
 
     it "raises an ArgumentError when calling #call on the Proc with no arguments" do
-      -> { @hash.to_proc.call }.should raise_error(ArgumentError)
+      -> { @hash.to_proc.call }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/hash/transform_keys_spec.rb b/spec/ruby/core/hash/transform_keys_spec.rb
index e2eeab1813f..d37a2b86163 100644
--- a/spec/ruby/core/hash/transform_keys_spec.rb
+++ b/spec/ruby/core/hash/transform_keys_spec.rb
@@ -7,8 +7,8 @@
 
   it "returns new hash" do
     ret = @hash.transform_keys(&:succ)
-    ret.should_not equal(@hash)
-    ret.should be_an_instance_of(Hash)
+    ret.should_not.equal?(@hash)
+    ret.should.instance_of?(Hash)
   end
 
   it "sets the result as transformed keys with the given block" do
@@ -22,13 +22,13 @@
   it "makes both hashes to share values" do
     value = [1, 2, 3]
     new_hash = { a: value }.transform_keys(&:upcase)
-    new_hash[:A].should equal(value)
+    new_hash[:A].should.equal?(value)
   end
 
   context "when no block is given" do
     it "returns a sized Enumerator" do
       enumerator = @hash.transform_keys
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
       enumerator.size.should == @hash.size
       enumerator.each(&:succ).should == { b: 1, c: 2, d: 3 }
     end
@@ -57,17 +57,17 @@
 
   it "does not retain the default value" do
     h = Hash.new(1)
-    h.transform_keys(&:succ).default.should be_nil
+    h.transform_keys(&:succ).default.should == nil
     h[:a] = 1
-    h.transform_keys(&:succ).default.should be_nil
+    h.transform_keys(&:succ).default.should == nil
   end
 
   it "does not retain the default_proc" do
     pr = proc { |h, k| h[k] = [] }
     h = Hash.new(&pr)
-    h.transform_values(&:succ).default_proc.should be_nil
+    h.transform_values(&:succ).default_proc.should == nil
     h[:a] = 1
-    h.transform_values(&:succ).default_proc.should be_nil
+    h.transform_values(&:succ).default_proc.should == nil
   end
 
   it "does not retain compare_by_identity flag" do
@@ -84,7 +84,7 @@
   end
 
   it "returns self" do
-    @hash.transform_keys!(&:succ).should equal(@hash)
+    @hash.transform_keys!(&:succ).should.equal?(@hash)
   end
 
   it "updates self as transformed values with the given block" do
@@ -112,7 +112,7 @@
   context "when no block is given" do
     it "returns a sized Enumerator" do
       enumerator = @hash.transform_keys!
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
       enumerator.size.should == @hash.size
       enumerator.each(&:upcase).should == { A: 1, B: 2, C: 3, D: 4 }
     end
@@ -129,21 +129,21 @@
     end
 
     it "raises a FrozenError on an empty hash" do
-      ->{ {}.freeze.transform_keys!(&:upcase) }.should raise_error(FrozenError)
+      ->{ {}.freeze.transform_keys!(&:upcase) }.should.raise(FrozenError)
     end
 
     it "keeps pairs and raises a FrozenError" do
-      ->{ @hash.transform_keys!(&:upcase) }.should raise_error(FrozenError)
+      ->{ @hash.transform_keys!(&:upcase) }.should.raise(FrozenError)
       @hash.should == @initial_pairs
     end
 
     it "raises a FrozenError on hash argument" do
-      ->{ @hash.transform_keys!({ a: :A, b: :B, c: :C }) }.should raise_error(FrozenError)
+      ->{ @hash.transform_keys!({ a: :A, b: :B, c: :C }) }.should.raise(FrozenError)
     end
 
     context "when no block is given" do
       it "does not raise an exception" do
-        @hash.transform_keys!.should be_an_instance_of(Enumerator)
+        @hash.transform_keys!.should.instance_of?(Enumerator)
       end
     end
   end
diff --git a/spec/ruby/core/hash/transform_values_spec.rb b/spec/ruby/core/hash/transform_values_spec.rb
index 4a0ae8a5a57..b19543a9f42 100644
--- a/spec/ruby/core/hash/transform_values_spec.rb
+++ b/spec/ruby/core/hash/transform_values_spec.rb
@@ -7,8 +7,8 @@
 
   it "returns new hash" do
     ret = @hash.transform_values(&:succ)
-    ret.should_not equal(@hash)
-    ret.should be_an_instance_of(Hash)
+    ret.should_not.equal?(@hash)
+    ret.should.instance_of?(Hash)
   end
 
   it "sets the result as transformed values with the given block" do
@@ -19,13 +19,13 @@
     key = [1, 2, 3]
     new_hash = { key => 1 }.transform_values(&:succ)
     new_hash[key].should == 2
-    new_hash.keys[0].should equal(key)
+    new_hash.keys[0].should.equal?(key)
   end
 
   context "when no block is given" do
     it "returns a sized Enumerator" do
       enumerator = @hash.transform_values
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
       enumerator.size.should == @hash.size
       enumerator.each(&:succ).should == { a: 2, b: 3, c: 4 }
     end
@@ -42,17 +42,17 @@
 
   it "does not retain the default value" do
     h = Hash.new(1)
-    h.transform_values(&:succ).default.should be_nil
+    h.transform_values(&:succ).default.should == nil
     h[:a] = 1
-    h.transform_values(&:succ).default.should be_nil
+    h.transform_values(&:succ).default.should == nil
   end
 
   it "does not retain the default_proc" do
     pr = proc { |h, k| h[k] = [] }
     h = Hash.new(&pr)
-    h.transform_values(&:succ).default_proc.should be_nil
+    h.transform_values(&:succ).default_proc.should == nil
     h[:a] = 1
-    h.transform_values(&:succ).default_proc.should be_nil
+    h.transform_values(&:succ).default_proc.should == nil
   end
 
   it "retains compare_by_identity flag" do
@@ -69,7 +69,7 @@
   end
 
   it "returns self" do
-    @hash.transform_values!(&:succ).should equal(@hash)
+    @hash.transform_values!(&:succ).should.equal?(@hash)
   end
 
   it "updates self as transformed values with the given block" do
@@ -88,7 +88,7 @@
   context "when no block is given" do
     it "returns a sized Enumerator" do
       enumerator = @hash.transform_values!
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
       enumerator.size.should == @hash.size
       enumerator.each(&:succ)
       @hash.should == { a: 2, b: 3, c: 4 }
@@ -101,17 +101,17 @@
     end
 
     it "raises a FrozenError on an empty hash" do
-      ->{ {}.freeze.transform_values!(&:succ) }.should raise_error(FrozenError)
+      ->{ {}.freeze.transform_values!(&:succ) }.should.raise(FrozenError)
     end
 
     it "keeps pairs and raises a FrozenError" do
-      ->{ @hash.transform_values!(&:succ) }.should raise_error(FrozenError)
+      ->{ @hash.transform_values!(&:succ) }.should.raise(FrozenError)
       @hash.should == @initial_pairs
     end
 
     context "when no block is given" do
       it "does not raise an exception" do
-        @hash.transform_values!.should be_an_instance_of(Enumerator)
+        @hash.transform_values!.should.instance_of?(Enumerator)
       end
     end
   end
diff --git a/spec/ruby/core/hash/try_convert_spec.rb b/spec/ruby/core/hash/try_convert_spec.rb
index d359ae49d8c..c321183356a 100644
--- a/spec/ruby/core/hash/try_convert_spec.rb
+++ b/spec/ruby/core/hash/try_convert_spec.rb
@@ -4,47 +4,47 @@
 describe "Hash.try_convert" do
   it "returns the argument if it's a Hash" do
     x = Hash.new
-    Hash.try_convert(x).should equal(x)
+    Hash.try_convert(x).should.equal?(x)
   end
 
   it "returns the argument if it's a kind of Hash" do
     x = HashSpecs::MyHash.new
-    Hash.try_convert(x).should equal(x)
+    Hash.try_convert(x).should.equal?(x)
   end
 
   it "returns nil when the argument does not respond to #to_hash" do
-    Hash.try_convert(Object.new).should be_nil
+    Hash.try_convert(Object.new).should == nil
   end
 
   it "sends #to_hash to the argument and returns the result if it's nil" do
     obj = mock("to_hash")
     obj.should_receive(:to_hash).and_return(nil)
-    Hash.try_convert(obj).should be_nil
+    Hash.try_convert(obj).should == nil
   end
 
   it "sends #to_hash to the argument and returns the result if it's a Hash" do
     x = Hash.new
     obj = mock("to_hash")
     obj.should_receive(:to_hash).and_return(x)
-    Hash.try_convert(obj).should equal(x)
+    Hash.try_convert(obj).should.equal?(x)
   end
 
   it "sends #to_hash to the argument and returns the result if it's a kind of Hash" do
     x = HashSpecs::MyHash.new
     obj = mock("to_hash")
     obj.should_receive(:to_hash).and_return(x)
-    Hash.try_convert(obj).should equal(x)
+    Hash.try_convert(obj).should.equal?(x)
   end
 
   it "sends #to_hash to the argument and raises TypeError if it's not a kind of Hash" do
     obj = mock("to_hash")
     obj.should_receive(:to_hash).and_return(Object.new)
-    -> { Hash.try_convert obj }.should raise_error(TypeError, "can't convert MockObject to Hash (MockObject#to_hash gives Object)")
+    -> { Hash.try_convert obj }.should raise_consistent_error(TypeError, "can't convert MockObject into Hash (MockObject#to_hash gives Object)")
   end
 
   it "does not rescue exceptions raised by #to_hash" do
     obj = mock("to_hash")
     obj.should_receive(:to_hash).and_raise(RuntimeError)
-    -> { Hash.try_convert obj }.should raise_error(RuntimeError)
+    -> { Hash.try_convert obj }.should.raise(RuntimeError)
   end
 end
diff --git a/spec/ruby/core/hash/values_spec.rb b/spec/ruby/core/hash/values_spec.rb
index 9f2a481a485..1fe5f48ad62 100644
--- a/spec/ruby/core/hash/values_spec.rb
+++ b/spec/ruby/core/hash/values_spec.rb
@@ -4,7 +4,7 @@
 describe "Hash#values" do
   it "returns an array of values" do
     h = { 1 => :a, 'a' => :a, 'the' => 'lang' }
-    h.values.should be_kind_of(Array)
+    h.values.should.is_a?(Array)
     h.values.sort {|a, b| a.to_s <=> b.to_s}.should == [:a, :a, 'lang']
   end
 end
diff --git a/spec/ruby/core/integer/allbits_spec.rb b/spec/ruby/core/integer/allbits_spec.rb
index edce4b15e75..6023cc32bf2 100644
--- a/spec/ruby/core/integer/allbits_spec.rb
+++ b/spec/ruby/core/integer/allbits_spec.rb
@@ -30,8 +30,8 @@
     -> {
       (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
       13.allbits?(obj)
-    }.should raise_error(TypeError)
-    -> { 13.allbits?("10")    }.should raise_error(TypeError)
-    -> { 13.allbits?(:symbol) }.should raise_error(TypeError)
+    }.should.raise(TypeError)
+    -> { 13.allbits?("10")    }.should.raise(TypeError)
+    -> { 13.allbits?(:symbol) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/integer/anybits_spec.rb b/spec/ruby/core/integer/anybits_spec.rb
index e0449074a28..1ea47b76dc2 100644
--- a/spec/ruby/core/integer/anybits_spec.rb
+++ b/spec/ruby/core/integer/anybits_spec.rb
@@ -29,8 +29,8 @@
     -> {
       (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
       13.anybits?(obj)
-    }.should raise_error(TypeError)
-    -> { 13.anybits?("10")    }.should raise_error(TypeError)
-    -> { 13.anybits?(:symbol) }.should raise_error(TypeError)
+    }.should.raise(TypeError)
+    -> { 13.anybits?("10")    }.should.raise(TypeError)
+    -> { 13.anybits?(:symbol) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/integer/bit_and_spec.rb b/spec/ruby/core/integer/bit_and_spec.rb
index e7face39ac6..4098ad7c7b5 100644
--- a/spec/ruby/core/integer/bit_and_spec.rb
+++ b/spec/ruby/core/integer/bit_and_spec.rb
@@ -35,14 +35,14 @@
     end
 
     it "raises a TypeError when passed a Float" do
-      -> { (3 & 3.4) }.should raise_error(TypeError)
+      -> { (3 & 3.4) }.should.raise(TypeError)
     end
 
     it "raises a TypeError and does not call #to_int when defined on an object" do
       obj = mock("fixnum bit and")
       obj.should_not_receive(:to_int)
 
-      -> { 3 & obj }.should raise_error(TypeError)
+      -> { 3 & obj }.should.raise(TypeError)
     end
   end
 
@@ -84,14 +84,14 @@
     end
 
     it "raises a TypeError when passed a Float" do
-      -> { (@bignum & 3.4) }.should raise_error(TypeError)
+      -> { (@bignum & 3.4) }.should.raise(TypeError)
     end
 
     it "raises a TypeError and does not call #to_int when defined on an object" do
       obj = mock("bignum bit and")
       obj.should_not_receive(:to_int)
 
-      -> { @bignum & obj }.should raise_error(TypeError)
+      -> { @bignum & obj }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/bit_or_spec.rb b/spec/ruby/core/integer/bit_or_spec.rb
index fdf8a191e5a..c380cd729ef 100644
--- a/spec/ruby/core/integer/bit_or_spec.rb
+++ b/spec/ruby/core/integer/bit_or_spec.rb
@@ -36,14 +36,14 @@
     end
 
     it "raises a TypeError when passed a Float" do
-      -> { (3 | 3.4) }.should raise_error(TypeError)
+      -> { (3 | 3.4) }.should.raise(TypeError)
     end
 
     it "raises a TypeError and does not call #to_int when defined on an object" do
       obj = mock("integer bit or")
       obj.should_not_receive(:to_int)
 
-      -> { 3 | obj }.should raise_error(TypeError)
+      -> { 3 | obj }.should.raise(TypeError)
     end
   end
 
@@ -74,16 +74,16 @@
       not_supported_on :opal do
         -> {
           bignum_value | bignum_value(0xffff).to_f
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
       end
-      -> { @bignum | 9.9 }.should raise_error(TypeError)
+      -> { @bignum | 9.9 }.should.raise(TypeError)
     end
 
     it "raises a TypeError and does not call #to_int when defined on an object" do
       obj = mock("bignum bit or")
       obj.should_not_receive(:to_int)
 
-      -> { @bignum | obj }.should raise_error(TypeError)
+      -> { @bignum | obj }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/bit_xor_spec.rb b/spec/ruby/core/integer/bit_xor_spec.rb
index 1f46bc52f35..c0cf8405f7e 100644
--- a/spec/ruby/core/integer/bit_xor_spec.rb
+++ b/spec/ruby/core/integer/bit_xor_spec.rb
@@ -34,14 +34,14 @@
     end
 
     it "raises a TypeError when passed a Float" do
-      -> { (3 ^ 3.4) }.should raise_error(TypeError)
+      -> { (3 ^ 3.4) }.should.raise(TypeError)
     end
 
     it "raises a TypeError and does not call #to_int when defined on an object" do
       obj = mock("integer bit xor")
       obj.should_not_receive(:to_int)
 
-      -> { 3 ^ obj }.should raise_error(TypeError)
+      -> { 3 ^ obj }.should.raise(TypeError)
     end
   end
 
@@ -78,16 +78,16 @@
       not_supported_on :opal do
         -> {
           bignum_value ^ bignum_value(0xffff).to_f
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
       end
-      -> { @bignum ^ 14.5 }.should raise_error(TypeError)
+      -> { @bignum ^ 14.5 }.should.raise(TypeError)
     end
 
     it "raises a TypeError and does not call #to_int when defined on an object" do
       obj = mock("bignum bit xor")
       obj.should_not_receive(:to_int)
 
-      -> { @bignum ^ obj }.should raise_error(TypeError)
+      -> { @bignum ^ obj }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/ceildiv_spec.rb b/spec/ruby/core/integer/ceildiv_spec.rb
index c6e22a457dd..91f63832f8e 100644
--- a/spec/ruby/core/integer/ceildiv_spec.rb
+++ b/spec/ruby/core/integer/ceildiv_spec.rb
@@ -2,19 +2,19 @@
 
 describe "Integer#ceildiv" do
   it "returns a quotient of division which is rounded up to the nearest integer" do
-    0.ceildiv(3).should eql(0)
-    1.ceildiv(3).should eql(1)
-    3.ceildiv(3).should eql(1)
-    4.ceildiv(3).should eql(2)
+    0.ceildiv(3).should.eql?(0)
+    1.ceildiv(3).should.eql?(1)
+    3.ceildiv(3).should.eql?(1)
+    4.ceildiv(3).should.eql?(2)
 
-    4.ceildiv(-3).should eql(-1)
-    -4.ceildiv(3).should eql(-1)
-    -4.ceildiv(-3).should eql(2)
+    4.ceildiv(-3).should.eql?(-1)
+    -4.ceildiv(3).should.eql?(-1)
+    -4.ceildiv(-3).should.eql?(2)
 
-    3.ceildiv(1.2).should eql(3)
-    3.ceildiv(6/5r).should eql(3)
+    3.ceildiv(1.2).should.eql?(3)
+    3.ceildiv(6/5r).should.eql?(3)
 
-    (10**100-11).ceildiv(10**99-1).should eql(10)
-    (10**100-9).ceildiv(10**99-1).should eql(11)
+    (10**100-11).ceildiv(10**99-1).should.eql?(10)
+    (10**100-9).ceildiv(10**99-1).should.eql?(11)
   end
 end
diff --git a/spec/ruby/core/integer/chr_spec.rb b/spec/ruby/core/integer/chr_spec.rb
index 39cafe28745..72784e18334 100644
--- a/spec/ruby/core/integer/chr_spec.rb
+++ b/spec/ruby/core/integer/chr_spec.rb
@@ -2,20 +2,20 @@
 
 describe "Integer#chr without argument" do
   it "returns a String" do
-    17.chr.should be_an_instance_of(String)
+    17.chr.should.instance_of?(String)
   end
 
   it "returns a new String for each call" do
-    82.chr.should_not equal(82.chr)
+    82.chr.should_not.equal?(82.chr)
   end
 
   it "raises a RangeError is self is less than 0" do
-    -> { -1.chr }.should raise_error(RangeError, /-1 out of char range/)
-    -> { (-bignum_value).chr }.should raise_error(RangeError, /bignum out of char range/)
+    -> { -1.chr }.should.raise(RangeError, /-1 out of char range/)
+    -> { (-bignum_value).chr }.should.raise(RangeError, /bignum out of char range/)
   end
 
   it "raises a RangeError if self is too large" do
-    -> { 2206368128.chr(Encoding::UTF_8) }.should raise_error(RangeError, /2206368128 out of char range/)
+    -> { 2206368128.chr(Encoding::UTF_8) }.should.raise(RangeError, /2206368128 out of char range/)
   end
 
   describe "when Encoding.default_internal is nil" do
@@ -48,8 +48,8 @@
     end
 
     it "raises a RangeError is self is greater than 255" do
-      -> { 256.chr }.should raise_error(RangeError, /256 out of char range/)
-      -> { bignum_value.chr }.should raise_error(RangeError, /bignum out of char range/)
+      -> { 256.chr }.should.raise(RangeError, /256 out of char range/)
+      -> { bignum_value.chr }.should.raise(RangeError, /bignum out of char range/)
     end
   end
 
@@ -137,7 +137,7 @@
           [620,    "TIS-620"]
         ].each do |integer, encoding_name|
           Encoding.default_internal = Encoding.find(encoding_name)
-          -> { integer.chr }.should raise_error(RangeError, /(invalid codepoint|out of char range)/)
+          -> { integer.chr }.should.raise(RangeError, /(invalid codepoint|out of char range)/)
         end
       end
     end
@@ -146,15 +146,15 @@
 
 describe "Integer#chr with an encoding argument" do
   it "returns a String" do
-    900.chr(Encoding::UTF_8).should be_an_instance_of(String)
+    900.chr(Encoding::UTF_8).should.instance_of?(String)
   end
 
   it "returns a new String for each call" do
-    8287.chr(Encoding::UTF_8).should_not equal(8287.chr(Encoding::UTF_8))
+    8287.chr(Encoding::UTF_8).should_not.equal?(8287.chr(Encoding::UTF_8))
   end
 
   it "accepts a String as an argument" do
-    -> { 0xA4A2.chr('euc-jp') }.should_not raise_error
+    -> { 0xA4A2.chr('euc-jp') }.should_not.raise
   end
 
   it "converts a String to an Encoding as Encoding.find does" do
@@ -165,12 +165,12 @@
 
   # http://redmine.ruby-lang.org/issues/4869
   it "raises a RangeError is self is less than 0" do
-    -> { -1.chr(Encoding::UTF_8) }.should raise_error(RangeError, /-1 out of char range/)
-    -> { (-bignum_value).chr(Encoding::EUC_JP) }.should raise_error(RangeError, /bignum out of char range/)
+    -> { -1.chr(Encoding::UTF_8) }.should.raise(RangeError, /-1 out of char range/)
+    -> { (-bignum_value).chr(Encoding::EUC_JP) }.should.raise(RangeError, /bignum out of char range/)
   end
 
   it "raises a RangeError if self is too large" do
-    -> { 2206368128.chr(Encoding::UTF_8) }.should raise_error(RangeError, /2206368128 out of char range/)
+    -> { 2206368128.chr(Encoding::UTF_8) }.should.raise(RangeError, /2206368128 out of char range/)
   end
 
   it "returns a String with the specified encoding" do
@@ -223,25 +223,25 @@
 
   # #5864
   it "raises RangeError if self is invalid as a codepoint in the specified encoding" do
-    -> { 0x80.chr("US-ASCII") }.should raise_error(RangeError)
-    -> { 0x0100.chr("BINARY") }.should raise_error(RangeError)
-    -> { 0x0100.chr("EUC-JP") }.should raise_error(RangeError)
-    -> { 0xA1A0.chr("EUC-JP") }.should raise_error(RangeError)
-    -> { 0xA1.chr("EUC-JP") }.should raise_error(RangeError)
-    -> { 0x80.chr("SHIFT_JIS") }.should raise_error(RangeError)
-    -> { 0xE0.chr("SHIFT_JIS") }.should raise_error(RangeError)
-    -> { 0x0100.chr("ISO-8859-9") }.should raise_error(RangeError)
-    -> { 620.chr("TIS-620") }.should raise_error(RangeError)
+    -> { 0x80.chr("US-ASCII") }.should.raise(RangeError)
+    -> { 0x0100.chr("BINARY") }.should.raise(RangeError)
+    -> { 0x0100.chr("EUC-JP") }.should.raise(RangeError)
+    -> { 0xA1A0.chr("EUC-JP") }.should.raise(RangeError)
+    -> { 0xA1.chr("EUC-JP") }.should.raise(RangeError)
+    -> { 0x80.chr("SHIFT_JIS") }.should.raise(RangeError)
+    -> { 0xE0.chr("SHIFT_JIS") }.should.raise(RangeError)
+    -> { 0x0100.chr("ISO-8859-9") }.should.raise(RangeError)
+    -> { 620.chr("TIS-620") }.should.raise(RangeError)
     # UTF-16 surrogate range
-    -> { 0xD800.chr("UTF-8") }.should raise_error(RangeError)
-    -> { 0xDBFF.chr("UTF-8") }.should raise_error(RangeError)
-    -> { 0xDC00.chr("UTF-8") }.should raise_error(RangeError)
-    -> { 0xDFFF.chr("UTF-8") }.should raise_error(RangeError)
+    -> { 0xD800.chr("UTF-8") }.should.raise(RangeError)
+    -> { 0xDBFF.chr("UTF-8") }.should.raise(RangeError)
+    -> { 0xDC00.chr("UTF-8") }.should.raise(RangeError)
+    -> { 0xDFFF.chr("UTF-8") }.should.raise(RangeError)
     # UTF-16 surrogate range
-    -> { 0xD800.chr("UTF-16") }.should raise_error(RangeError)
-    -> { 0xDBFF.chr("UTF-16") }.should raise_error(RangeError)
-    -> { 0xDC00.chr("UTF-16") }.should raise_error(RangeError)
-    -> { 0xDFFF.chr("UTF-16") }.should raise_error(RangeError)
+    -> { 0xD800.chr("UTF-16") }.should.raise(RangeError)
+    -> { 0xDBFF.chr("UTF-16") }.should.raise(RangeError)
+    -> { 0xDC00.chr("UTF-16") }.should.raise(RangeError)
+    -> { 0xDFFF.chr("UTF-16") }.should.raise(RangeError)
   end
 
   it 'returns a String encoding self interpreted as a codepoint in the CESU-8 encoding' do
diff --git a/spec/ruby/core/integer/coerce_spec.rb b/spec/ruby/core/integer/coerce_spec.rb
index 1d6dc9713f5..c0e642da032 100644
--- a/spec/ruby/core/integer/coerce_spec.rb
+++ b/spec/ruby/core/integer/coerce_spec.rb
@@ -11,7 +11,7 @@
 
     describe "when given a String" do
       it "raises an ArgumentError when trying to coerce with a non-number String" do
-        -> { 1.coerce(":)") }.should raise_error(ArgumentError)
+        -> { 1.coerce(":)") }.should.raise(ArgumentError)
       end
 
       it "returns  an array containing two Floats" do
@@ -21,7 +21,7 @@
     end
 
     it "raises a TypeError when trying to coerce with nil" do
-      -> { 1.coerce(nil) }.should raise_error(TypeError)
+      -> { 1.coerce(nil) }.should.raise(TypeError)
     end
 
     it "tries to convert the given Object into a Float by using #to_f" do
@@ -29,13 +29,13 @@
       2.coerce(obj).should == [1.0, 2.0]
 
       (obj = mock('0')).should_receive(:to_f).and_return('0')
-      -> { 2.coerce(obj).should == [1.0, 2.0] }.should raise_error(TypeError)
+      -> { 2.coerce(obj).should == [1.0, 2.0] }.should.raise(TypeError)
     end
 
     it "raises a TypeError when given an Object that does not respond to #to_f" do
-      -> { 1.coerce(mock('x'))  }.should raise_error(TypeError)
-      -> { 1.coerce(1..4)       }.should raise_error(TypeError)
-      -> { 1.coerce(:test)      }.should raise_error(TypeError)
+      -> { 1.coerce(mock('x'))  }.should.raise(TypeError)
+      -> { 1.coerce(1..4)       }.should.raise(TypeError)
+      -> { 1.coerce(:test)      }.should.raise(TypeError)
     end
   end
 
@@ -44,8 +44,8 @@
       a = bignum_value
       ary = a.coerce(2)
 
-      ary[0].should be_kind_of(Integer)
-      ary[1].should be_kind_of(Integer)
+      ary[0].should.is_a?(Integer)
+      ary[1].should.is_a?(Integer)
       ary.should == [2, a]
     end
 
@@ -54,18 +54,18 @@
       b = bignum_value
       ary = a.coerce(b)
 
-      ary[0].should be_kind_of(Integer)
-      ary[1].should be_kind_of(Integer)
+      ary[0].should.is_a?(Integer)
+      ary[1].should.is_a?(Integer)
       ary.should == [b, a]
     end
 
     it "raises a TypeError when not passed a Fixnum or Bignum" do
       a = bignum_value
 
-      -> { a.coerce(nil)         }.should raise_error(TypeError)
-      -> { a.coerce(mock('str')) }.should raise_error(TypeError)
-      -> { a.coerce(1..4)        }.should raise_error(TypeError)
-      -> { a.coerce(:test)       }.should raise_error(TypeError)
+      -> { a.coerce(nil)         }.should.raise(TypeError)
+      -> { a.coerce(mock('str')) }.should.raise(TypeError)
+      -> { a.coerce(1..4)        }.should.raise(TypeError)
+      -> { a.coerce(:test)       }.should.raise(TypeError)
     end
 
     it "coerces both values to Floats and returns [other, self] when passed a Float" do
diff --git a/spec/ruby/core/integer/comparison_spec.rb b/spec/ruby/core/integer/comparison_spec.rb
index 408c8e52ce8..cc5cbe2506b 100644
--- a/spec/ruby/core/integer/comparison_spec.rb
+++ b/spec/ruby/core/integer/comparison_spec.rb
@@ -128,17 +128,17 @@
         @num.should_receive(:coerce).with(@big).and_raise(RuntimeError.new("my error"))
         -> {
           @big <=> @num
-        }.should raise_error(RuntimeError, "my error")
+        }.should.raise(RuntimeError, "my error")
       end
 
       it "raises an exception if #coerce raises a non-StandardError exception" do
         @num.should_receive(:coerce).with(@big).and_raise(Exception)
-        -> { @big <=> @num }.should raise_error(Exception)
+        -> { @big <=> @num }.should.raise(Exception)
       end
 
       it "returns nil if #coerce does not return an Array" do
         @num.should_receive(:coerce).with(@big).and_return(nil)
-        (@big <=> @num).should be_nil
+        (@big <=> @num).should == nil
       end
 
       it "returns -1 if the coerced value is larger" do
@@ -157,6 +157,14 @@
       end
     end
 
+    describe "with a Float" do
+      it "does not lose precision for values that don't fit in a double" do
+        (bignum_value(1) <=> bignum_value.to_f).should == 1
+        (bignum_value <=> bignum_value.to_f).should == 0
+        ((bignum_value - 1) <=> bignum_value.to_f).should == -1
+      end
+    end
+
     # The tests below are taken from matz's revision 23730 for Ruby trunk
     it "returns 1 when self is Infinity and other is a Bignum" do
       (infinity_value <=> Float::MAX.to_i*2).should == 1
diff --git a/spec/ruby/core/integer/digits_spec.rb b/spec/ruby/core/integer/digits_spec.rb
index 3d0a64c25f5..c4ebf2cd886 100644
--- a/spec/ruby/core/integer/digits_spec.rb
+++ b/spec/ruby/core/integer/digits_spec.rb
@@ -19,15 +19,15 @@
   end
 
   it "raises ArgumentError when calling with a radix less than 2" do
-    -> { 12345.digits(1) }.should raise_error(ArgumentError)
+    -> { 12345.digits(1) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when calling with a negative radix" do
-    -> { 12345.digits(-2) }.should raise_error(ArgumentError)
+    -> { 12345.digits(-2) }.should.raise(ArgumentError)
   end
 
   it "raises Math::DomainError when calling digits on a negative number" do
-    -> { -12345.digits(7) }.should raise_error(Math::DomainError)
+    -> { -12345.digits(7) }.should.raise(Math::DomainError)
   end
 
   it "returns integer values > 9 when base is above 10" do
diff --git a/spec/ruby/core/integer/div_spec.rb b/spec/ruby/core/integer/div_spec.rb
index 2eb9c0623bf..220ca4a73ea 100644
--- a/spec/ruby/core/integer/div_spec.rb
+++ b/spec/ruby/core/integer/div_spec.rb
@@ -46,21 +46,21 @@
     end
 
     it "raises a ZeroDivisionError when the given argument is 0 and a Float" do
-      -> { 0.div(0.0)   }.should raise_error(ZeroDivisionError)
-      -> { 10.div(0.0)  }.should raise_error(ZeroDivisionError)
-      -> { -10.div(0.0) }.should raise_error(ZeroDivisionError)
+      -> { 0.div(0.0)   }.should.raise(ZeroDivisionError)
+      -> { 10.div(0.0)  }.should.raise(ZeroDivisionError)
+      -> { -10.div(0.0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a ZeroDivisionError when the given argument is 0 and not a Float" do
-      -> { 13.div(0) }.should raise_error(ZeroDivisionError)
-      -> { 13.div(-0) }.should raise_error(ZeroDivisionError)
+      -> { 13.div(0) }.should.raise(ZeroDivisionError)
+      -> { 13.div(-0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a TypeError when given a non-numeric argument" do
-      -> { 13.div(mock('10')) }.should raise_error(TypeError)
-      -> { 5.div("2") }.should raise_error(TypeError)
-      -> { 5.div(:"2") }.should raise_error(TypeError)
-      -> { 5.div([]) }.should raise_error(TypeError)
+      -> { 13.div(mock('10')) }.should.raise(TypeError)
+      -> { 5.div("2") }.should.raise(TypeError)
+      -> { 5.div(:"2") }.should.raise(TypeError)
+      -> { 5.div([]) }.should.raise(TypeError)
     end
   end
 
@@ -118,29 +118,29 @@
     end
 
     it "raises a TypeError when given a non-numeric" do
-      -> { @bignum.div(mock("10")) }.should raise_error(TypeError)
-      -> { @bignum.div("2") }.should raise_error(TypeError)
-      -> { @bignum.div(:symbol) }.should raise_error(TypeError)
+      -> { @bignum.div(mock("10")) }.should.raise(TypeError)
+      -> { @bignum.div("2") }.should.raise(TypeError)
+      -> { @bignum.div(:symbol) }.should.raise(TypeError)
     end
 
     it "returns a result of integer division of self by a float argument" do
-      @bignum.div(4294967295.5).should eql(4294967296)
+      @bignum.div(4294967295.5).should.eql?(4294967296)
       not_supported_on :opal do
-        @bignum.div(4294967295.0).should eql(4294967297)
-        @bignum.div(bignum_value(88).to_f).should eql(1)
-        @bignum.div((-bignum_value(88)).to_f).should eql(-1)
+        @bignum.div(4294967295.0).should.eql?(4294967297)
+        @bignum.div(bignum_value(88).to_f).should.eql?(1)
+        @bignum.div((-bignum_value(88)).to_f).should.eql?(-1)
       end
     end
 
     # #5490
     it "raises ZeroDivisionError if the argument is 0 and is a Float" do
-      -> { @bignum.div(0.0) }.should raise_error(ZeroDivisionError)
-      -> { @bignum.div(-0.0) }.should raise_error(ZeroDivisionError)
+      -> { @bignum.div(0.0) }.should.raise(ZeroDivisionError)
+      -> { @bignum.div(-0.0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises ZeroDivisionError if the argument is 0 and is not a Float" do
-      -> { @bignum.div(0) }.should raise_error(ZeroDivisionError)
-      -> { @bignum.div(-0) }.should raise_error(ZeroDivisionError)
+      -> { @bignum.div(0) }.should.raise(ZeroDivisionError)
+      -> { @bignum.div(-0) }.should.raise(ZeroDivisionError)
     end
   end
 
diff --git a/spec/ruby/core/integer/divide_spec.rb b/spec/ruby/core/integer/divide_spec.rb
index 0d5e16e9868..e75432fd833 100644
--- a/spec/ruby/core/integer/divide_spec.rb
+++ b/spec/ruby/core/integer/divide_spec.rb
@@ -32,7 +32,7 @@
     end
 
     it "raises a ZeroDivisionError if the given argument is zero and not a Float" do
-      -> { 1 / 0 }.should raise_error(ZeroDivisionError)
+      -> { 1 / 0 }.should.raise(ZeroDivisionError)
     end
 
     it "does NOT raise ZeroDivisionError if the given argument is zero and is a Float" do
@@ -46,9 +46,9 @@
     end
 
     it "raises a TypeError when given a non-Integer" do
-      -> { 13 / mock('10') }.should raise_error(TypeError)
-      -> { 13 / "10"       }.should raise_error(TypeError)
-      -> { 13 / :symbol    }.should raise_error(TypeError)
+      -> { 13 / mock('10') }.should.raise(TypeError)
+      -> { 13 / "10"       }.should.raise(TypeError)
+      -> { 13 / :symbol    }.should.raise(TypeError)
     end
   end
 
@@ -97,13 +97,13 @@
     end
 
     it "raises a ZeroDivisionError if other is zero and not a Float" do
-      -> { @bignum / 0 }.should raise_error(ZeroDivisionError)
+      -> { @bignum / 0 }.should.raise(ZeroDivisionError)
     end
 
     it "raises a TypeError when given a non-numeric" do
-      -> { @bignum / mock('10') }.should raise_error(TypeError)
-      -> { @bignum / "2" }.should raise_error(TypeError)
-      -> { @bignum / :symbol }.should raise_error(TypeError)
+      -> { @bignum / mock('10') }.should.raise(TypeError)
+      -> { @bignum / "2" }.should.raise(TypeError)
+      -> { @bignum / :symbol }.should.raise(TypeError)
     end
   end
 
diff --git a/spec/ruby/core/integer/divmod_spec.rb b/spec/ruby/core/integer/divmod_spec.rb
index 7a489e93441..db470c57315 100644
--- a/spec/ruby/core/integer/divmod_spec.rb
+++ b/spec/ruby/core/integer/divmod_spec.rb
@@ -14,24 +14,24 @@
     end
 
     it "raises a ZeroDivisionError when the given argument is 0" do
-      -> { 13.divmod(0)  }.should raise_error(ZeroDivisionError)
-      -> { 0.divmod(0)   }.should raise_error(ZeroDivisionError)
-      -> { -10.divmod(0) }.should raise_error(ZeroDivisionError)
+      -> { 13.divmod(0)  }.should.raise(ZeroDivisionError)
+      -> { 0.divmod(0)   }.should.raise(ZeroDivisionError)
+      -> { -10.divmod(0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a ZeroDivisionError when the given argument is 0 and a Float" do
-      -> { 0.divmod(0.0)   }.should raise_error(ZeroDivisionError)
-      -> { 10.divmod(0.0)  }.should raise_error(ZeroDivisionError)
-      -> { -10.divmod(0.0) }.should raise_error(ZeroDivisionError)
+      -> { 0.divmod(0.0)   }.should.raise(ZeroDivisionError)
+      -> { 10.divmod(0.0)  }.should.raise(ZeroDivisionError)
+      -> { -10.divmod(0.0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a TypeError when given a non-Integer" do
       -> {
         (obj = mock('10')).should_receive(:to_int).any_number_of_times.and_return(10)
         13.divmod(obj)
-      }.should raise_error(TypeError)
-      -> { 13.divmod("10")    }.should raise_error(TypeError)
-      -> { 13.divmod(:symbol) }.should raise_error(TypeError)
+      }.should.raise(TypeError)
+      -> { 13.divmod("10")    }.should.raise(TypeError)
+      -> { 13.divmod(:symbol) }.should.raise(TypeError)
     end
   end
 
@@ -94,24 +94,24 @@
     end
 
     it "raises a ZeroDivisionError when the given argument is 0" do
-      -> { @bignum.divmod(0) }.should raise_error(ZeroDivisionError)
-      -> { (-@bignum).divmod(0) }.should raise_error(ZeroDivisionError)
+      -> { @bignum.divmod(0) }.should.raise(ZeroDivisionError)
+      -> { (-@bignum).divmod(0) }.should.raise(ZeroDivisionError)
     end
 
     # Behaviour established as correct in r23953
     it "raises a FloatDomainError if other is NaN" do
-      -> { @bignum.divmod(nan_value) }.should raise_error(FloatDomainError)
+      -> { @bignum.divmod(nan_value) }.should.raise(FloatDomainError)
     end
 
     it "raises a ZeroDivisionError when the given argument is 0 and a Float" do
-      -> { @bignum.divmod(0.0) }.should raise_error(ZeroDivisionError)
-      -> { (-@bignum).divmod(0.0) }.should raise_error(ZeroDivisionError)
+      -> { @bignum.divmod(0.0) }.should.raise(ZeroDivisionError)
+      -> { (-@bignum).divmod(0.0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a TypeError when the given argument is not an Integer" do
-      -> { @bignum.divmod(mock('10')) }.should raise_error(TypeError)
-      -> { @bignum.divmod("10") }.should raise_error(TypeError)
-      -> { @bignum.divmod(:symbol) }.should raise_error(TypeError)
+      -> { @bignum.divmod(mock('10')) }.should.raise(TypeError)
+      -> { @bignum.divmod("10") }.should.raise(TypeError)
+      -> { @bignum.divmod(:symbol) }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/downto_spec.rb b/spec/ruby/core/integer/downto_spec.rb
index 987704b02ea..a244d3df551 100644
--- a/spec/ruby/core/integer/downto_spec.rb
+++ b/spec/ruby/core/integer/downto_spec.rb
@@ -27,8 +27,8 @@
   end
 
   it "raises an ArgumentError for invalid endpoints" do
-    -> {1.downto("A") {|x| p x } }.should raise_error(ArgumentError)
-    -> {1.downto(nil) {|x| p x } }.should raise_error(ArgumentError)
+    -> {1.downto("A") {|x| p x } }.should.raise(ArgumentError)
+    -> {1.downto(nil) {|x| p x } }.should.raise(ArgumentError)
   end
 
   describe "when no block is given" do
@@ -45,9 +45,9 @@
       describe "size" do
         it "raises an ArgumentError for invalid endpoints" do
           enum = 1.downto("A")
-          -> { enum.size }.should raise_error(ArgumentError)
+          -> { enum.size }.should.raise(ArgumentError)
           enum = 1.downto(nil)
-          -> { enum.size }.should raise_error(ArgumentError)
+          -> { enum.size }.should.raise(ArgumentError)
         end
 
         it "returns self - stop + 1" do
diff --git a/spec/ruby/core/integer/dup_spec.rb b/spec/ruby/core/integer/dup_spec.rb
index 7f4d5124654..3e5739ad37a 100644
--- a/spec/ruby/core/integer/dup_spec.rb
+++ b/spec/ruby/core/integer/dup_spec.rb
@@ -3,11 +3,11 @@
 describe "Integer#dup" do
   it "returns self for small integers" do
     integer = 1_000
-    integer.dup.should equal(integer)
+    integer.dup.should.equal?(integer)
   end
 
   it "returns self for large integers" do
     integer = 4_611_686_018_427_387_905
-    integer.dup.should equal(integer)
+    integer.dup.should.equal?(integer)
   end
 end
diff --git a/spec/ruby/core/integer/element_reference_spec.rb b/spec/ruby/core/integer/element_reference_spec.rb
index cb7e0dc9b07..c69ec2315df 100644
--- a/spec/ruby/core/integer/element_reference_spec.rb
+++ b/spec/ruby/core/integer/element_reference_spec.rb
@@ -59,13 +59,13 @@
     end
 
     it "raises a TypeError when passed a String" do
-      -> { 3["3"] }.should raise_error(TypeError)
+      -> { 3["3"] }.should.raise(TypeError)
     end
 
     it "raises a TypeError when #to_int does not return an Integer" do
       obj = mock('asdf')
       obj.should_receive(:to_int).and_return("asdf")
-      -> { 3[obj] }.should raise_error(TypeError)
+      -> { 3[obj] }.should.raise(TypeError)
     end
 
     it "calls #to_int to coerce a String to a Bignum and returns 0" do
@@ -137,8 +137,8 @@
       end
 
       it "raises FloatDomainError if any boundary is infinity" do
-        -> { 0x0001[3..Float::INFINITY] }.should raise_error(FloatDomainError, /Infinity/)
-        -> { 0x0001[-Float::INFINITY..3] }.should raise_error(FloatDomainError, /-Infinity/)
+        -> { 0x0001[3..Float::INFINITY] }.should.raise(FloatDomainError, /Infinity/)
+        -> { 0x0001[-Float::INFINITY..3] }.should.raise(FloatDomainError, /-Infinity/)
       end
 
       context "when passed (..i)" do
@@ -151,7 +151,7 @@
         it "raises ArgumentError if any of i bit equals 1" do
           -> {
             eval("0b111110[..3]")
-          }.should raise_error(ArgumentError, /The beginless range for Integer#\[\] results in infinity/)
+          }.should.raise(ArgumentError, /The beginless range for Integer#\[\] results in infinity/)
         end
       end
     end
@@ -179,10 +179,10 @@
 
     it "raises a TypeError when the given argument can't be converted to Integer" do
       obj = mock('asdf')
-      -> { @bignum[obj] }.should raise_error(TypeError)
+      -> { @bignum[obj] }.should.raise(TypeError)
 
       obj.should_receive(:to_int).and_return("asdf")
-      -> { @bignum[obj] }.should raise_error(TypeError)
+      -> { @bignum[obj] }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/eql_spec.rb b/spec/ruby/core/integer/eql_spec.rb
new file mode 100644
index 00000000000..9c801732067
--- /dev/null
+++ b/spec/ruby/core/integer/eql_spec.rb
@@ -0,0 +1,25 @@
+require_relative '../../spec_helper'
+
+describe "Integer#eql?" do
+  context "bignum" do
+    it "returns true for the same value" do
+      bignum_value.eql?(bignum_value).should == true
+    end
+
+    it "returns false for a different Integer value" do
+      bignum_value.eql?(bignum_value(1)).should == false
+    end
+
+    it "returns false for a Float with the same numeric value" do
+      bignum_value.eql?(bignum_value.to_f).should == false
+    end
+
+    it "returns false for a Rational with the same numeric value" do
+      bignum_value.eql?(Rational(bignum_value)).should == false
+    end
+
+    it "returns false for a Fixnum-range Integer" do
+      bignum_value.eql?(42).should == false
+    end
+  end
+end
diff --git a/spec/ruby/core/integer/even_spec.rb b/spec/ruby/core/integer/even_spec.rb
index a314cc6b197..578979320eb 100644
--- a/spec/ruby/core/integer/even_spec.rb
+++ b/spec/ruby/core/integer/even_spec.rb
@@ -3,38 +3,38 @@
 describe "Integer#even?" do
   context "fixnum" do
     it "returns true for a Fixnum when it is an even number" do
-      (-2).even?.should be_true
-      (-1).even?.should be_false
+      (-2).even?.should == true
+      (-1).even?.should == false
 
-      0.even?.should be_true
-      1.even?.should be_false
-      2.even?.should be_true
+      0.even?.should == true
+      1.even?.should == false
+      2.even?.should == true
     end
 
     it "returns true for a Bignum when it is an even number" do
-      bignum_value(0).even?.should be_true
-      bignum_value(1).even?.should be_false
+      bignum_value(0).even?.should == true
+      bignum_value(1).even?.should == false
 
-      (-bignum_value(0)).even?.should be_true
-      (-bignum_value(1)).even?.should be_false
+      (-bignum_value(0)).even?.should == true
+      (-bignum_value(1)).even?.should == false
     end
   end
 
   context "bignum" do
     it "returns true if self is even and positive" do
-      (10000**10).even?.should be_true
+      (10000**10).even?.should == true
     end
 
     it "returns true if self is even and negative" do
-      (-10000**10).even?.should be_true
+      (-10000**10).even?.should == true
     end
 
     it "returns false if self is odd and positive" do
-      (9879**976).even?.should be_false
+      (9879**976).even?.should == false
     end
 
     it "returns false if self is odd and negative" do
-      (-9879**976).even?.should be_false
+      (-9879**976).even?.should == false
     end
   end
 end
diff --git a/spec/ruby/core/integer/fdiv_spec.rb b/spec/ruby/core/integer/fdiv_spec.rb
index d9ea2fdf8d5..7854d66dece 100644
--- a/spec/ruby/core/integer/fdiv_spec.rb
+++ b/spec/ruby/core/integer/fdiv_spec.rb
@@ -65,8 +65,8 @@
   end
 
   it "returns NaN when the argument is NaN" do
-    -1.fdiv(nan_value).nan?.should be_true
-    1.fdiv(nan_value).nan?.should be_true
+    -1.fdiv(nan_value).nan?.should == true
+    1.fdiv(nan_value).nan?.should == true
   end
 
   it "returns Infinity when the argument is 0" do
@@ -86,11 +86,11 @@
   end
 
   it "raises a TypeError when argument isn't numeric" do
-    -> { 1.fdiv(mock('non-numeric')) }.should raise_error(TypeError)
+    -> { 1.fdiv(mock('non-numeric')) }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when passed multiple arguments" do
-    -> { 1.fdiv(6,0.2) }.should raise_error(ArgumentError)
+    -> { 1.fdiv(6,0.2) }.should.raise(ArgumentError)
   end
 
   it "follows the coercion protocol" do
diff --git a/spec/ruby/core/integer/fixtures/classes.rb b/spec/ruby/core/integer/fixtures/classes.rb
index 6ebfbd15658..65948efb9f1 100644
--- a/spec/ruby/core/integer/fixtures/classes.rb
+++ b/spec/ruby/core/integer/fixtures/classes.rb
@@ -1,4 +1,14 @@
 module IntegerSpecs
   class CoerceError < StandardError
   end
+
+  class CoercibleNumeric
+    def initialize(v) @v = v end
+    def coerce(other) [self.class.new(other), self] end
+    def >(other)  @v.to_i > other.to_i  end
+    def >=(other) @v.to_i >= other.to_i end
+    def <(other)  @v.to_i < other.to_i  end
+    def <=(other) @v.to_i <= other.to_i end
+    def to_i()    @v.to_i               end
+  end
 end
diff --git a/spec/ruby/core/integer/gcd_spec.rb b/spec/ruby/core/integer/gcd_spec.rb
index 961f1c5c2e2..1fff7859278 100644
--- a/spec/ruby/core/integer/gcd_spec.rb
+++ b/spec/ruby/core/integer/gcd_spec.rb
@@ -7,8 +7,8 @@
   end
 
   it "returns an Integer" do
-    36.gcd(6).should be_kind_of(Integer)
-    4.gcd(20981).should be_kind_of(Integer)
+    36.gcd(6).should.is_a?(Integer)
+    4.gcd(20981).should.is_a?(Integer)
   end
 
   it "returns the greatest common divisor of self and argument" do
@@ -33,13 +33,13 @@
 
   it "accepts a Bignum argument" do
     bignum = 9999**99
-    bignum.should be_kind_of(Integer)
+    bignum.should.is_a?(Integer)
     99.gcd(bignum).should == 99
   end
 
   it "works if self is a Bignum" do
     bignum = 9999**99
-    bignum.should be_kind_of(Integer)
+    bignum.should.is_a?(Integer)
     bignum.gcd(99).should == 99
   end
 
@@ -55,15 +55,15 @@
   end
 
   it "raises an ArgumentError if not given an argument" do
-    -> { 12.gcd }.should raise_error(ArgumentError)
+    -> { 12.gcd }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if given more than one argument" do
-    -> { 12.gcd(30, 20) }.should raise_error(ArgumentError)
+    -> { 12.gcd(30, 20) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError unless the argument is an Integer" do
-    -> { 39.gcd(3.8)   }.should raise_error(TypeError)
-    -> { 45872.gcd([]) }.should raise_error(TypeError)
+    -> { 39.gcd(3.8)   }.should.raise(TypeError)
+    -> { 45872.gcd([]) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/integer/gcdlcm_spec.rb b/spec/ruby/core/integer/gcdlcm_spec.rb
index ebf45e55a1b..419bf9f275f 100644
--- a/spec/ruby/core/integer/gcdlcm_spec.rb
+++ b/spec/ruby/core/integer/gcdlcm_spec.rb
@@ -7,8 +7,8 @@
   end
 
   it "returns an Array" do
-    36.gcdlcm(6).should be_kind_of(Array)
-    4.gcdlcm(20981).should be_kind_of(Array)
+    36.gcdlcm(6).should.is_a?(Array)
+    4.gcdlcm(20981).should.is_a?(Array)
   end
 
   it "returns a two-element Array" do
@@ -28,26 +28,26 @@
 
   it "accepts a Bignum argument" do
     bignum = 91999**99
-    bignum.should be_kind_of(Integer)
+    bignum.should.is_a?(Integer)
     99.gcdlcm(bignum).should == [99.gcd(bignum), 99.lcm(bignum)]
   end
 
   it "works if self is a Bignum" do
     bignum = 9999**89
-    bignum.should be_kind_of(Integer)
+    bignum.should.is_a?(Integer)
     bignum.gcdlcm(99).should == [bignum.gcd(99), bignum.lcm(99)]
   end
 
   it "raises an ArgumentError if not given an argument" do
-    -> { 12.gcdlcm }.should raise_error(ArgumentError)
+    -> { 12.gcdlcm }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if given more than one argument" do
-    -> { 12.gcdlcm(30, 20) }.should raise_error(ArgumentError)
+    -> { 12.gcdlcm(30, 20) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError unless the argument is an Integer" do
-    -> { 39.gcdlcm(3.8)   }.should raise_error(TypeError)
-    -> { 45872.gcdlcm([]) }.should raise_error(TypeError)
+    -> { 39.gcdlcm(3.8)   }.should.raise(TypeError)
+    -> { 45872.gcdlcm([]) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/integer/gt_spec.rb b/spec/ruby/core/integer/gt_spec.rb
index f0179e566d7..75436144cf3 100644
--- a/spec/ruby/core/integer/gt_spec.rb
+++ b/spec/ruby/core/integer/gt_spec.rb
@@ -17,8 +17,8 @@
     end
 
     it "raises an ArgumentError when given a non-Integer" do
-      -> { 5 > "4"       }.should raise_error(ArgumentError)
-      -> { 5 > mock('x') }.should raise_error(ArgumentError)
+      -> { 5 > "4"       }.should.raise(ArgumentError)
+      -> { 5 > mock('x') }.should.raise(ArgumentError)
     end
   end
 
@@ -36,8 +36,13 @@
     end
 
     it "raises an ArgumentError when given a non-Integer" do
-      -> { @bignum > "4" }.should raise_error(ArgumentError)
-      -> { @bignum > mock('str') }.should raise_error(ArgumentError)
+      -> { @bignum > "4" }.should.raise(ArgumentError)
+      -> { @bignum > mock('str') }.should.raise(ArgumentError)
+    end
+
+    it "dispatches the correct operator after coercion" do
+      (bignum_value > IntegerSpecs::CoercibleNumeric.new(1)).should == true
+      (bignum_value > IntegerSpecs::CoercibleNumeric.new(bignum_value * 2)).should == false
     end
   end
 end
diff --git a/spec/ruby/core/integer/gte_spec.rb b/spec/ruby/core/integer/gte_spec.rb
index 6237fc2c514..e5cb892efda 100644
--- a/spec/ruby/core/integer/gte_spec.rb
+++ b/spec/ruby/core/integer/gte_spec.rb
@@ -18,8 +18,8 @@
     end
 
     it "raises an ArgumentError when given a non-Integer" do
-      -> { 5 >= "4"       }.should raise_error(ArgumentError)
-      -> { 5 >= mock('x') }.should raise_error(ArgumentError)
+      -> { 5 >= "4"       }.should.raise(ArgumentError)
+      -> { 5 >= mock('x') }.should.raise(ArgumentError)
     end
   end
 
@@ -36,8 +36,13 @@
     end
 
     it "raises an ArgumentError when given a non-Integer" do
-      -> { @bignum >= "4" }.should raise_error(ArgumentError)
-      -> { @bignum >= mock('str') }.should raise_error(ArgumentError)
+      -> { @bignum >= "4" }.should.raise(ArgumentError)
+      -> { @bignum >= mock('str') }.should.raise(ArgumentError)
+    end
+
+    it "dispatches the correct operator after coercion" do
+      (bignum_value >= IntegerSpecs::CoercibleNumeric.new(1)).should == true
+      (bignum_value >= IntegerSpecs::CoercibleNumeric.new(bignum_value * 2)).should == false
     end
   end
 end
diff --git a/spec/ruby/core/integer/integer_spec.rb b/spec/ruby/core/integer/integer_spec.rb
index 2d5d2e3e92d..19a962d548b 100644
--- a/spec/ruby/core/integer/integer_spec.rb
+++ b/spec/ruby/core/integer/integer_spec.rb
@@ -6,8 +6,8 @@
   end
 
   it "is the class of both small and large integers" do
-    42.class.should equal(Integer)
-    bignum_value.class.should equal(Integer)
+    42.class.should.equal?(Integer)
+    bignum_value.class.should.equal?(Integer)
   end
 end
 
diff --git a/spec/ruby/core/integer/lcm_spec.rb b/spec/ruby/core/integer/lcm_spec.rb
index 296a001c8cb..6659247d1ea 100644
--- a/spec/ruby/core/integer/lcm_spec.rb
+++ b/spec/ruby/core/integer/lcm_spec.rb
@@ -7,8 +7,8 @@
   end
 
   it "returns an Integer" do
-    36.lcm(6).should be_kind_of(Integer)
-    4.lcm(20981).should be_kind_of(Integer)
+    36.lcm(6).should.is_a?(Integer)
+    4.lcm(20981).should.is_a?(Integer)
   end
 
   it "returns the least common multiple of self and argument" do
@@ -33,26 +33,26 @@
 
   it "accepts a Bignum argument" do
     bignum = 9999**99
-    bignum.should be_kind_of(Integer)
+    bignum.should.is_a?(Integer)
     99.lcm(bignum).should == bignum
   end
 
   it "works if self is a Bignum" do
     bignum = 9999**99
-    bignum.should be_kind_of(Integer)
+    bignum.should.is_a?(Integer)
     bignum.lcm(99).should == bignum
   end
 
   it "raises an ArgumentError if not given an argument" do
-    -> { 12.lcm }.should raise_error(ArgumentError)
+    -> { 12.lcm }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if given more than one argument" do
-    -> { 12.lcm(30, 20) }.should raise_error(ArgumentError)
+    -> { 12.lcm(30, 20) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError unless the argument is an Integer" do
-    -> { 39.lcm(3.8)   }.should raise_error(TypeError)
-    -> { 45872.lcm([]) }.should raise_error(TypeError)
+    -> { 39.lcm(3.8)   }.should.raise(TypeError)
+    -> { 45872.lcm([]) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/integer/left_shift_spec.rb b/spec/ruby/core/integer/left_shift_spec.rb
index 86c2b18ae29..7eedb91228b 100644
--- a/spec/ruby/core/integer/left_shift_spec.rb
+++ b/spec/ruby/core/integer/left_shift_spec.rb
@@ -58,13 +58,13 @@
 
     it "returns a Bignum == fixnum_max * 2 when fixnum_max << 1 and n > 0" do
       result = fixnum_max << 1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_max * 2
     end
 
     it "returns a Bignum == fixnum_min * 2 when fixnum_min << 1 and n < 0" do
       result = fixnum_min << 1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_min * 2
     end
 
@@ -82,15 +82,15 @@
       obj = mock("a string")
       obj.should_receive(:to_int).and_return("asdf")
 
-      -> { 3 << obj }.should raise_error(TypeError)
+      -> { 3 << obj }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed nil" do
-      -> { 3 << nil }.should raise_error(TypeError)
+      -> { 3 << nil }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed a String" do
-      -> { 3 << "4" }.should raise_error(TypeError)
+      -> { 3 << "4" }.should.raise(TypeError)
     end
   end
 
@@ -129,13 +129,13 @@
 
     it "returns a Fixnum == fixnum_max when (fixnum_max * 2) << -1 and n > 0" do
       result = (fixnum_max * 2) << -1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_max
     end
 
     it "returns a Fixnum == fixnum_min when (fixnum_min * 2) << -1 and n < 0" do
       result = (fixnum_min * 2) << -1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_min
     end
 
@@ -150,15 +150,15 @@
       obj = mock("a string")
       obj.should_receive(:to_int).and_return("asdf")
 
-      -> { @bignum << obj }.should raise_error(TypeError)
+      -> { @bignum << obj }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed nil" do
-      -> { @bignum << nil }.should raise_error(TypeError)
+      -> { @bignum << nil }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed a String" do
-      -> { @bignum << "4" }.should raise_error(TypeError)
+      -> { @bignum << "4" }.should.raise(TypeError)
     end
   end
 
@@ -201,10 +201,10 @@
       exps << bignum_value << coerce_bignum if bignum_value >= limit
 
       exps.each { |exp|
-        -> { (1 << exp) }.should raise_error(RangeError, 'shift width too big')
-        -> { (-1 << exp) }.should raise_error(RangeError, 'shift width too big')
-        -> { (bignum_value << exp) }.should raise_error(RangeError, 'shift width too big')
-        -> { (-bignum_value << exp) }.should raise_error(RangeError, 'shift width too big')
+        -> { (1 << exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (-1 << exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (bignum_value << exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (-bignum_value << exp) }.should.raise(RangeError, 'shift width too big')
       }
     end
   end
diff --git a/spec/ruby/core/integer/lt_spec.rb b/spec/ruby/core/integer/lt_spec.rb
index c182f82555c..dd1391d0932 100644
--- a/spec/ruby/core/integer/lt_spec.rb
+++ b/spec/ruby/core/integer/lt_spec.rb
@@ -17,8 +17,8 @@
     end
 
     it "raises an ArgumentError when given a non-Integer" do
-      -> { 5 < "4"       }.should raise_error(ArgumentError)
-      -> { 5 < mock('x') }.should raise_error(ArgumentError)
+      -> { 5 < "4"       }.should.raise(ArgumentError)
+      -> { 5 < mock('x') }.should.raise(ArgumentError)
     end
   end
 
@@ -38,8 +38,13 @@
     end
 
     it "raises an ArgumentError when given a non-Integer" do
-      -> { @bignum < "4" }.should raise_error(ArgumentError)
-      -> { @bignum < mock('str') }.should raise_error(ArgumentError)
+      -> { @bignum < "4" }.should.raise(ArgumentError)
+      -> { @bignum < mock('str') }.should.raise(ArgumentError)
+    end
+
+    it "dispatches the correct operator after coercion" do
+      (bignum_value < IntegerSpecs::CoercibleNumeric.new(bignum_value * 2)).should == true
+      (bignum_value < IntegerSpecs::CoercibleNumeric.new(1)).should == false
     end
   end
 end
diff --git a/spec/ruby/core/integer/lte_spec.rb b/spec/ruby/core/integer/lte_spec.rb
index 65b71d77f22..9ef1c9f6045 100644
--- a/spec/ruby/core/integer/lte_spec.rb
+++ b/spec/ruby/core/integer/lte_spec.rb
@@ -18,8 +18,8 @@
     end
 
     it "raises an ArgumentError when given a non-Integer" do
-      -> { 5 <= "4"       }.should raise_error(ArgumentError)
-      -> { 5 <= mock('x') }.should raise_error(ArgumentError)
+      -> { 5 <= "4"       }.should.raise(ArgumentError)
+      -> { 5 <= mock('x') }.should.raise(ArgumentError)
     end
   end
 
@@ -46,8 +46,13 @@
     end
 
     it "raises an ArgumentError when given a non-Integer" do
-      -> { @bignum <= "4" }.should raise_error(ArgumentError)
-      -> { @bignum <= mock('str') }.should raise_error(ArgumentError)
+      -> { @bignum <= "4" }.should.raise(ArgumentError)
+      -> { @bignum <= mock('str') }.should.raise(ArgumentError)
+    end
+
+    it "dispatches the correct operator after coercion" do
+      (bignum_value <= IntegerSpecs::CoercibleNumeric.new(bignum_value * 2)).should == true
+      (bignum_value <= IntegerSpecs::CoercibleNumeric.new(1)).should == false
     end
   end
 end
diff --git a/spec/ruby/core/integer/minus_spec.rb b/spec/ruby/core/integer/minus_spec.rb
index 6072ba7c8b8..5fd3a81a722 100644
--- a/spec/ruby/core/integer/minus_spec.rb
+++ b/spec/ruby/core/integer/minus_spec.rb
@@ -17,9 +17,9 @@
       -> {
         (obj = mock('10')).should_receive(:to_int).any_number_of_times.and_return(10)
         13 - obj
-      }.should raise_error(TypeError)
-      -> { 13 - "10"    }.should raise_error(TypeError)
-      -> { 13 - :symbol }.should raise_error(TypeError)
+      }.should.raise(TypeError)
+      -> { 13 - "10"    }.should.raise(TypeError)
+      -> { 13 - :symbol }.should.raise(TypeError)
     end
   end
 
@@ -35,9 +35,9 @@
     end
 
     it "raises a TypeError when given a non-Integer" do
-      -> { @bignum - mock('10') }.should raise_error(TypeError)
-      -> { @bignum - "10" }.should raise_error(TypeError)
-      -> { @bignum - :symbol }.should raise_error(TypeError)
+      -> { @bignum - mock('10') }.should.raise(TypeError)
+      -> { @bignum - "10" }.should.raise(TypeError)
+      -> { @bignum - :symbol }.should.raise(TypeError)
     end
   end
 
diff --git a/spec/ruby/core/integer/multiply_spec.rb b/spec/ruby/core/integer/multiply_spec.rb
index 5037d27458a..7f30eebaa59 100644
--- a/spec/ruby/core/integer/multiply_spec.rb
+++ b/spec/ruby/core/integer/multiply_spec.rb
@@ -18,9 +18,9 @@
       -> {
         (obj = mock('10')).should_receive(:to_int).any_number_of_times.and_return(10)
         13 * obj
-      }.should raise_error(TypeError)
-      -> { 13 * "10"    }.should raise_error(TypeError)
-      -> { 13 * :symbol }.should raise_error(TypeError)
+      }.should.raise(TypeError)
+      -> { 13 * "10"    }.should.raise(TypeError)
+      -> { 13 * :symbol }.should.raise(TypeError)
     end
   end
 
@@ -37,9 +37,9 @@
     end
 
     it "raises a TypeError when given a non-Integer" do
-      -> { @bignum * mock('10') }.should raise_error(TypeError)
-      -> { @bignum * "10" }.should raise_error(TypeError)
-      -> { @bignum * :symbol }.should raise_error(TypeError)
+      -> { @bignum * mock('10') }.should.raise(TypeError)
+      -> { @bignum * "10" }.should.raise(TypeError)
+      -> { @bignum * :symbol }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/nobits_spec.rb b/spec/ruby/core/integer/nobits_spec.rb
index 685759ffa36..f1a3aca9d5e 100644
--- a/spec/ruby/core/integer/nobits_spec.rb
+++ b/spec/ruby/core/integer/nobits_spec.rb
@@ -29,8 +29,8 @@
     -> {
       (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
       13.nobits?(obj)
-    }.should raise_error(TypeError)
-    -> { 13.nobits?("10")    }.should raise_error(TypeError)
-    -> { 13.nobits?(:symbol) }.should raise_error(TypeError)
+    }.should.raise(TypeError)
+    -> { 13.nobits?("10")    }.should.raise(TypeError)
+    -> { 13.nobits?(:symbol) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/integer/odd_spec.rb b/spec/ruby/core/integer/odd_spec.rb
index dd779fa44be..f9e50ec790c 100644
--- a/spec/ruby/core/integer/odd_spec.rb
+++ b/spec/ruby/core/integer/odd_spec.rb
@@ -3,36 +3,36 @@
 describe "Integer#odd?" do
   context "fixnum" do
     it "returns true when self is an odd number" do
-      (-2).odd?.should be_false
-      (-1).odd?.should be_true
+      (-2).odd?.should == false
+      (-1).odd?.should == true
 
-      0.odd?.should be_false
-      1.odd?.should be_true
-      2.odd?.should be_false
+      0.odd?.should == false
+      1.odd?.should == true
+      2.odd?.should == false
 
-      bignum_value(0).odd?.should be_false
-      bignum_value(1).odd?.should be_true
+      bignum_value(0).odd?.should == false
+      bignum_value(1).odd?.should == true
 
-      (-bignum_value(0)).odd?.should be_false
-      (-bignum_value(1)).odd?.should be_true
+      (-bignum_value(0)).odd?.should == false
+      (-bignum_value(1)).odd?.should == true
     end
   end
 
   context "bignum" do
     it "returns true if self is odd and positive" do
-      (987279**19).odd?.should be_true
+      (987279**19).odd?.should == true
     end
 
     it "returns true if self is odd and negative" do
-      (-9873389**97).odd?.should be_true
+      (-9873389**97).odd?.should == true
     end
 
     it "returns false if self is even and positive" do
-      (10000000**10).odd?.should be_false
+      (10000000**10).odd?.should == false
     end
 
     it "returns false if self is even and negative" do
-      (-1000000**100).odd?.should be_false
+      (-1000000**100).odd?.should == false
     end
   end
 end
diff --git a/spec/ruby/core/integer/ord_spec.rb b/spec/ruby/core/integer/ord_spec.rb
index bcb57bea989..8b7dfe460db 100644
--- a/spec/ruby/core/integer/ord_spec.rb
+++ b/spec/ruby/core/integer/ord_spec.rb
@@ -2,16 +2,16 @@
 
 describe "Integer#ord" do
   it "returns self" do
-    20.ord.should eql(20)
-    40.ord.should eql(40)
+    20.ord.should.eql?(20)
+    40.ord.should.eql?(40)
 
-    0.ord.should eql(0)
-    (-10).ord.should eql(-10)
+    0.ord.should.eql?(0)
+    (-10).ord.should.eql?(-10)
 
-    ?a.ord.should eql(97)
-    ?Z.ord.should eql(90)
+    ?a.ord.should.eql?(97)
+    ?Z.ord.should.eql?(90)
 
-    bignum_value.ord.should eql(bignum_value)
-    (-bignum_value).ord.should eql(-bignum_value)
+    bignum_value.ord.should.eql?(bignum_value)
+    (-bignum_value).ord.should.eql?(-bignum_value)
   end
 end
diff --git a/spec/ruby/core/integer/plus_spec.rb b/spec/ruby/core/integer/plus_spec.rb
index 38428e56c5b..b684377bd5a 100644
--- a/spec/ruby/core/integer/plus_spec.rb
+++ b/spec/ruby/core/integer/plus_spec.rb
@@ -17,9 +17,9 @@
       -> {
         (obj = mock('10')).should_receive(:to_int).any_number_of_times.and_return(10)
         13 + obj
-      }.should raise_error(TypeError)
-      -> { 13 + "10"    }.should raise_error(TypeError)
-      -> { 13 + :symbol }.should raise_error(TypeError)
+      }.should.raise(TypeError)
+      -> { 13 + "10"    }.should.raise(TypeError)
+      -> { 13 + :symbol }.should.raise(TypeError)
     end
   end
 
@@ -35,9 +35,9 @@
     end
 
     it "raises a TypeError when given a non-Integer" do
-      -> { @bignum + mock('10') }.should raise_error(TypeError)
-      -> { @bignum + "10" }.should raise_error(TypeError)
-      -> { @bignum + :symbol}.should raise_error(TypeError)
+      -> { @bignum + mock('10') }.should.raise(TypeError)
+      -> { @bignum + "10" }.should.raise(TypeError)
+      -> { @bignum + :symbol}.should.raise(TypeError)
     end
   end
 
diff --git a/spec/ruby/core/integer/pow_spec.rb b/spec/ruby/core/integer/pow_spec.rb
index ecaca01eff3..12a3839c409 100644
--- a/spec/ruby/core/integer/pow_spec.rb
+++ b/spec/ruby/core/integer/pow_spec.rb
@@ -16,10 +16,10 @@
     end
 
     it "works well with bignums" do
-      2.pow(61, 5843009213693951).should eql 3697379018277258
-      2.pow(62, 5843009213693952).should eql 1551748822859776
-      2.pow(63, 5843009213693953).should eql 3103497645717974
-      2.pow(64, 5843009213693954).should eql 363986077738838
+      2.pow(61, 5843009213693951).should.eql? 3697379018277258
+      2.pow(62, 5843009213693952).should.eql? 1551748822859776
+      2.pow(63, 5843009213693953).should.eql? 3103497645717974
+      2.pow(64, 5843009213693954).should.eql? 363986077738838
     end
 
     it "handles sign like #divmod does" do
@@ -30,22 +30,22 @@
     end
 
     it "ensures all arguments are integers" do
-      -> { 2.pow(5, 12.0) }.should raise_error(TypeError, /2nd argument not allowed unless all arguments are integers/)
-      -> { 2.pow(5, Rational(12, 1)) }.should raise_error(TypeError, /2nd argument not allowed unless all arguments are integers/)
+      -> { 2.pow(5, 12.0) }.should.raise(TypeError, /2nd argument not allowed unless all arguments are integers/)
+      -> { 2.pow(5, Rational(12, 1)) }.should.raise(TypeError, /2nd argument not allowed unless all arguments are integers/)
     end
 
     it "raises TypeError for non-numeric value" do
-      -> { 2.pow(5, "12") }.should raise_error(TypeError)
-      -> { 2.pow(5, []) }.should raise_error(TypeError)
-      -> { 2.pow(5, nil) }.should raise_error(TypeError)
+      -> { 2.pow(5, "12") }.should.raise(TypeError)
+      -> { 2.pow(5, []) }.should.raise(TypeError)
+      -> { 2.pow(5, nil) }.should.raise(TypeError)
     end
 
     it "raises a ZeroDivisionError when the given argument is 0" do
-      -> { 2.pow(5, 0) }.should raise_error(ZeroDivisionError)
+      -> { 2.pow(5, 0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a RangeError when the first argument is negative and the second argument is present" do
-      -> { 2.pow(-5, 1) }.should raise_error(RangeError)
+      -> { 2.pow(-5, 1) }.should.raise(RangeError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/pred_spec.rb b/spec/ruby/core/integer/pred_spec.rb
index 86750ebfd1a..fce536b5a23 100644
--- a/spec/ruby/core/integer/pred_spec.rb
+++ b/spec/ruby/core/integer/pred_spec.rb
@@ -2,10 +2,10 @@
 
 describe "Integer#pred" do
   it "returns the Integer equal to self - 1" do
-    0.pred.should eql(-1)
-    -1.pred.should eql(-2)
-    bignum_value.pred.should eql(bignum_value(-1))
-    fixnum_min.pred.should eql(fixnum_min - 1)
-    20.pred.should eql(19)
+    0.pred.should.eql?(-1)
+    -1.pred.should.eql?(-2)
+    bignum_value.pred.should.eql?(bignum_value(-1))
+    fixnum_min.pred.should.eql?(fixnum_min - 1)
+    20.pred.should.eql?(19)
   end
 end
diff --git a/spec/ruby/core/integer/rationalize_spec.rb b/spec/ruby/core/integer/rationalize_spec.rb
index 09d741af333..272eca69110 100644
--- a/spec/ruby/core/integer/rationalize_spec.rb
+++ b/spec/ruby/core/integer/rationalize_spec.rb
@@ -12,7 +12,7 @@
 
   it "returns a Rational object" do
     @numbers.each do |number|
-      number.rationalize.should be_an_instance_of(Rational)
+      number.rationalize.should.instance_of?(Rational)
     end
   end
 
@@ -33,7 +33,7 @@
   end
 
   it "raises ArgumentError when passed more than one argument" do
-    -> { 1.rationalize(0.1, 0.1) }.should raise_error(ArgumentError)
-    -> { 1.rationalize(0.1, 0.1, 2) }.should raise_error(ArgumentError)
+    -> { 1.rationalize(0.1, 0.1) }.should.raise(ArgumentError)
+    -> { 1.rationalize(0.1, 0.1, 2) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/integer/remainder_spec.rb b/spec/ruby/core/integer/remainder_spec.rb
index 757e42fbe84..deb81fb2a56 100644
--- a/spec/ruby/core/integer/remainder_spec.rb
+++ b/spec/ruby/core/integer/remainder_spec.rb
@@ -22,10 +22,10 @@
     end
 
     it "raises TypeError if passed non-numeric argument" do
-      -> { 5.remainder("3") }.should raise_error(TypeError)
-      -> { 5.remainder(:"3") }.should raise_error(TypeError)
-      -> { 5.remainder([]) }.should raise_error(TypeError)
-      -> { 5.remainder(nil) }.should raise_error(TypeError)
+      -> { 5.remainder("3") }.should.raise(TypeError)
+      -> { 5.remainder(:"3") }.should.raise(TypeError)
+      -> { 5.remainder([]) }.should.raise(TypeError)
+      -> { 5.remainder(nil) }.should.raise(TypeError)
     end
   end
 
@@ -38,14 +38,14 @@
     end
 
     it "raises a ZeroDivisionError if other is zero and not a Float" do
-      -> { bignum_value(66).remainder(0) }.should raise_error(ZeroDivisionError)
+      -> { bignum_value(66).remainder(0) }.should.raise(ZeroDivisionError)
     end
 
     it "does raises ZeroDivisionError if other is zero and a Float" do
       a = bignum_value(7)
       b = bignum_value(32)
-      -> { a.remainder(0.0) }.should raise_error(ZeroDivisionError)
-      -> { b.remainder(-0.0) }.should raise_error(ZeroDivisionError)
+      -> { a.remainder(0.0) }.should.raise(ZeroDivisionError)
+      -> { b.remainder(-0.0) }.should.raise(ZeroDivisionError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/right_shift_spec.rb b/spec/ruby/core/integer/right_shift_spec.rb
index c902674e2f3..4281d3b7ab3 100644
--- a/spec/ruby/core/integer/right_shift_spec.rb
+++ b/spec/ruby/core/integer/right_shift_spec.rb
@@ -54,13 +54,13 @@
 
     it "returns a Bignum == fixnum_max * 2 when fixnum_max >> -1 and n > 0" do
       result = fixnum_max >> -1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_max * 2
     end
 
     it "returns a Bignum == fixnum_min * 2 when fixnum_min >> -1 and n < 0" do
       result = fixnum_min >> -1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_min * 2
     end
 
@@ -78,15 +78,15 @@
       obj = mock("a string")
       obj.should_receive(:to_int).and_return("asdf")
 
-      -> { 3 >> obj }.should raise_error(TypeError)
+      -> { 3 >> obj }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed nil" do
-      -> { 3 >> nil }.should raise_error(TypeError)
+      -> { 3 >> nil }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed a String" do
-      -> { 3 >> "4" }.should raise_error(TypeError)
+      -> { 3 >> "4" }.should.raise(TypeError)
     end
   end
 
@@ -151,13 +151,13 @@
 
     it "returns a Fixnum == fixnum_max when (fixnum_max * 2) >> 1 and n > 0" do
       result = (fixnum_max * 2) >> 1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_max
     end
 
     it "returns a Fixnum == fixnum_min when (fixnum_min * 2) >> 1 and n < 0" do
       result = (fixnum_min * 2) >> 1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_min
     end
 
@@ -172,15 +172,15 @@
       obj = mock("a string")
       obj.should_receive(:to_int).and_return("asdf")
 
-      -> { @bignum >> obj }.should raise_error(TypeError)
+      -> { @bignum >> obj }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed nil" do
-      -> { @bignum >> nil }.should raise_error(TypeError)
+      -> { @bignum >> nil }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed a String" do
-      -> { @bignum >> "4" }.should raise_error(TypeError)
+      -> { @bignum >> "4" }.should.raise(TypeError)
     end
   end
 
@@ -223,10 +223,10 @@
       exps << -bignum_value << coerce_bignum if bignum_value >= limit
 
       exps.each { |exp|
-        -> { (1 >> exp) }.should raise_error(RangeError, 'shift width too big')
-        -> { (-1 >> exp) }.should raise_error(RangeError, 'shift width too big')
-        -> { (bignum_value >> exp) }.should raise_error(RangeError, 'shift width too big')
-        -> { (-bignum_value >> exp) }.should raise_error(RangeError, 'shift width too big')
+        -> { (1 >> exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (-1 >> exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (bignum_value >> exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (-bignum_value >> exp) }.should.raise(RangeError, 'shift width too big')
       }
     end
   end
diff --git a/spec/ruby/core/integer/round_spec.rb b/spec/ruby/core/integer/round_spec.rb
index 189384f11ad..a3f11e7a761 100644
--- a/spec/ruby/core/integer/round_spec.rb
+++ b/spec/ruby/core/integer/round_spec.rb
@@ -8,37 +8,37 @@
 
   # redmine:5228
   it "returns itself rounded if passed a negative value" do
-    +249.round(-2).should eql(+200)
-    -249.round(-2).should eql(-200)
-    (+25 * 10**70 - 1).round(-71).should eql(+20 * 10**70)
-    (-25 * 10**70 + 1).round(-71).should eql(-20 * 10**70)
+    +249.round(-2).should.eql?(+200)
+    -249.round(-2).should.eql?(-200)
+    (+25 * 10**70 - 1).round(-71).should.eql?(+20 * 10**70)
+    (-25 * 10**70 + 1).round(-71).should.eql?(-20 * 10**70)
   end
 
   it "returns itself rounded to nearest if passed a negative value" do
-    +250.round(-2).should eql(+300)
-    -250.round(-2).should eql(-300)
-    (+25 * 10**70).round(-71).should eql(+30 * 10**70)
-    (-25 * 10**70).round(-71).should eql(-30 * 10**70)
+    +250.round(-2).should.eql?(+300)
+    -250.round(-2).should.eql?(-300)
+    (+25 * 10**70).round(-71).should.eql?(+30 * 10**70)
+    (-25 * 10**70).round(-71).should.eql?(-30 * 10**70)
   end
 
   it "raises a RangeError when passed a big negative value" do
-    -> { 42.round(min_long - 1) }.should raise_error(RangeError)
+    -> { 42.round(min_long - 1) }.should.raise(RangeError)
   end
 
   it "raises a RangeError when passed Float::INFINITY" do
-    -> { 42.round(Float::INFINITY) }.should raise_error(RangeError)
+    -> { 42.round(Float::INFINITY) }.should.raise(RangeError)
   end
 
   it "raises a RangeError when passed a beyond signed int" do
-    -> { 42.round(1<<31) }.should raise_error(RangeError)
+    -> { 42.round(1<<31) }.should.raise(RangeError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { 42.round("4") }.should raise_error(TypeError)
+    -> { 42.round("4") }.should.raise(TypeError)
   end
 
   it "raises a TypeError when its argument cannot be converted to an Integer" do
-    -> { 42.round(nil) }.should raise_error(TypeError)
+    -> { 42.round(nil) }.should.raise(TypeError)
   end
 
   it "calls #to_int on the argument to convert it to an Integer" do
@@ -50,32 +50,32 @@
   it "raises a TypeError when #to_int does not return an Integer" do
     obj = mock("Object")
     obj.stub!(:to_int).and_return([])
-    -> { 42.round(obj) }.should raise_error(TypeError)
+    -> { 42.round(obj) }.should.raise(TypeError)
   end
 
   it "returns different rounded values depending on the half option" do
-    25.round(-1, half: :up).should      eql(30)
-    25.round(-1, half: :down).should    eql(20)
-    25.round(-1, half: :even).should    eql(20)
-    25.round(-1, half: nil).should      eql(30)
-    35.round(-1, half: :up).should      eql(40)
-    35.round(-1, half: :down).should    eql(30)
-    35.round(-1, half: :even).should    eql(40)
-    35.round(-1, half: nil).should      eql(40)
-    (-25).round(-1, half: :up).should   eql(-30)
-    (-25).round(-1, half: :down).should eql(-20)
-    (-25).round(-1, half: :even).should eql(-20)
-    (-25).round(-1, half: nil).should   eql(-30)
+    25.round(-1, half: :up).should.eql?(30)
+    25.round(-1, half: :down).should.eql?(20)
+    25.round(-1, half: :even).should.eql?(20)
+    25.round(-1, half: nil).should.eql?(30)
+    35.round(-1, half: :up).should.eql?(40)
+    35.round(-1, half: :down).should.eql?(30)
+    35.round(-1, half: :even).should.eql?(40)
+    35.round(-1, half: nil).should.eql?(40)
+    (-25).round(-1, half: :up).should.eql?(-30)
+    (-25).round(-1, half: :down).should.eql?(-20)
+    (-25).round(-1, half: :even).should.eql?(-20)
+    (-25).round(-1, half: nil).should.eql?(-30)
   end
 
   it "returns itself if passed a positive precision and the half option" do
-    35.round(1, half: :up).should      eql(35)
-    35.round(1, half: :down).should    eql(35)
-    35.round(1, half: :even).should    eql(35)
+    35.round(1, half: :up).should.eql?(35)
+    35.round(1, half: :down).should.eql?(35)
+    35.round(1, half: :even).should.eql?(35)
   end
 
   it "raises ArgumentError for an unknown rounding mode" do
-    -> { 42.round(-1, half: :foo) }.should raise_error(ArgumentError, /invalid rounding mode: foo/)
-    -> { 42.round(1, half: :foo) }.should raise_error(ArgumentError, /invalid rounding mode: foo/)
+    -> { 42.round(-1, half: :foo) }.should.raise(ArgumentError, /invalid rounding mode: foo/)
+    -> { 42.round(1, half: :foo) }.should.raise(ArgumentError, /invalid rounding mode: foo/)
   end
 end
diff --git a/spec/ruby/core/integer/shared/arithmetic_coerce.rb b/spec/ruby/core/integer/shared/arithmetic_coerce.rb
index 1260192df19..561b18fe52a 100644
--- a/spec/ruby/core/integer/shared/arithmetic_coerce.rb
+++ b/spec/ruby/core/integer/shared/arithmetic_coerce.rb
@@ -6,6 +6,6 @@
     b.should_receive(:coerce).and_raise(IntegerSpecs::CoerceError)
 
     # e.g. 1 + b
-    -> { 1.send(@method, b) }.should raise_error(IntegerSpecs::CoerceError)
+    -> { 1.send(@method, b) }.should.raise(IntegerSpecs::CoerceError)
   end
 end
diff --git a/spec/ruby/core/integer/shared/comparison_coerce.rb b/spec/ruby/core/integer/shared/comparison_coerce.rb
index af52f5e99b0..4bb74041836 100644
--- a/spec/ruby/core/integer/shared/comparison_coerce.rb
+++ b/spec/ruby/core/integer/shared/comparison_coerce.rb
@@ -6,6 +6,6 @@
     b.should_receive(:coerce).and_raise(IntegerSpecs::CoerceError)
 
     # e.g. 1 > b
-    -> { 1.send(@method, b) }.should raise_error(IntegerSpecs::CoerceError)
+    -> { 1.send(@method, b) }.should.raise(IntegerSpecs::CoerceError)
   end
 end
diff --git a/spec/ruby/core/integer/shared/equal.rb b/spec/ruby/core/integer/shared/equal.rb
index ecee17831c0..c621ba3f81a 100644
--- a/spec/ruby/core/integer/shared/equal.rb
+++ b/spec/ruby/core/integer/shared/equal.rb
@@ -54,5 +54,10 @@
       @bignum.send(@method, obj).should == true
       @bignum.send(@method, obj).should == false
     end
+
+    it "does not lose precision when comparing with a Float" do
+      (bignum_value(1).send(@method, bignum_value.to_f)).should == false
+      (bignum_value.send(@method, bignum_value.to_f)).should == true
+    end
   end
 end
diff --git a/spec/ruby/core/integer/shared/exponent.rb b/spec/ruby/core/integer/shared/exponent.rb
index 5ef6d686d80..0be13859f93 100644
--- a/spec/ruby/core/integer/shared/exponent.rb
+++ b/spec/ruby/core/integer/shared/exponent.rb
@@ -1,51 +1,51 @@
 describe :integer_exponent, shared: true do
   context "fixnum" do
     it "returns self raised to the given power" do
-      2.send(@method, 0).should eql 1
-      2.send(@method, 1).should eql 2
-      2.send(@method, 2).should eql 4
+      2.send(@method, 0).should.eql? 1
+      2.send(@method, 1).should.eql? 2
+      2.send(@method, 2).should.eql? 4
 
-      9.send(@method, 0.5).should eql 3.0
-      9.send(@method, Rational(1, 2)).should eql 3.0
+      9.send(@method, 0.5).should.eql? 3.0
+      9.send(@method, Rational(1, 2)).should.eql? 3.0
       5.send(@method, -1).to_f.to_s.should == '0.2'
 
-      2.send(@method, 40).should eql 1099511627776
+      2.send(@method, 40).should.eql? 1099511627776
     end
 
     it "overflows the answer to a bignum transparently" do
-      2.send(@method, 29).should eql 536870912
-      2.send(@method, 30).should eql 1073741824
-      2.send(@method, 31).should eql 2147483648
-      2.send(@method, 32).should eql 4294967296
+      2.send(@method, 29).should.eql? 536870912
+      2.send(@method, 30).should.eql? 1073741824
+      2.send(@method, 31).should.eql? 2147483648
+      2.send(@method, 32).should.eql? 4294967296
 
-      2.send(@method, 61).should eql 2305843009213693952
-      2.send(@method, 62).should eql 4611686018427387904
-      2.send(@method, 63).should eql 9223372036854775808
-      2.send(@method, 64).should eql 18446744073709551616
-      8.send(@method, 23).should eql 590295810358705651712
+      2.send(@method, 61).should.eql? 2305843009213693952
+      2.send(@method, 62).should.eql? 4611686018427387904
+      2.send(@method, 63).should.eql? 9223372036854775808
+      2.send(@method, 64).should.eql? 18446744073709551616
+      8.send(@method, 23).should.eql? 590295810358705651712
     end
 
     it "raises negative numbers to the given power" do
-      (-2).send(@method, 29).should eql(-536870912)
-      (-2).send(@method, 30).should eql(1073741824)
-      (-2).send(@method, 31).should eql(-2147483648)
-      (-2).send(@method, 32).should eql(4294967296)
-      (-2).send(@method, 33).should eql(-8589934592)
+      (-2).send(@method, 29).should.eql?(-536870912)
+      (-2).send(@method, 30).should.eql?(1073741824)
+      (-2).send(@method, 31).should.eql?(-2147483648)
+      (-2).send(@method, 32).should.eql?(4294967296)
+      (-2).send(@method, 33).should.eql?(-8589934592)
 
-      (-2).send(@method, 61).should eql(-2305843009213693952)
-      (-2).send(@method, 62).should eql(4611686018427387904)
-      (-2).send(@method, 63).should eql(-9223372036854775808)
-      (-2).send(@method, 64).should eql(18446744073709551616)
-      (-2).send(@method, 65).should eql(-36893488147419103232)
+      (-2).send(@method, 61).should.eql?(-2305843009213693952)
+      (-2).send(@method, 62).should.eql?(4611686018427387904)
+      (-2).send(@method, 63).should.eql?(-9223372036854775808)
+      (-2).send(@method, 64).should.eql?(18446744073709551616)
+      (-2).send(@method, 65).should.eql?(-36893488147419103232)
     end
 
     it "can raise 1 to a bignum safely" do
-      1.send(@method, 4611686018427387904).should eql 1
+      1.send(@method, 4611686018427387904).should.eql? 1
     end
 
     it "can raise -1 to a bignum safely" do
-      (-1).send(@method, 4611686018427387904).should eql(1)
-      (-1).send(@method, 4611686018427387905).should eql(-1)
+      (-1).send(@method, 4611686018427387904).should.eql?(1)
+      (-1).send(@method, 4611686018427387905).should.eql?(-1)
     end
 
     ruby_version_is ""..."3.4" do
@@ -57,14 +57,22 @@
     end
 
     ruby_version_is "3.4" do
-      it "raises an ArgumentError when the number is too big" do
-        -> { 100000000.send(@method, 1000000000) }.should raise_error(ArgumentError)
+      it "returns an Integer for results larger than the old 32MB limit" do
+        # 2 ** 40000000 requires 40000001 bits
+        # This exceeds the old 32MB limit but is within the new 16GB limit
+        result = 2.send(@method, 40000000)
+        result.should.is_a?(Integer)
+        result.bit_length.should == 40000001
+      end
+
+      it "raises an ArgumentError when the result size exceeds the limit" do
+        -> { 100000000.send(@method, 1000000000) }.should.raise(ArgumentError)
       end
     end
 
     it "raises a ZeroDivisionError for 0 ** -1" do
-      -> { 0.send(@method, -1) }.should raise_error(ZeroDivisionError)
-      -> { 0.send(@method, Rational(-1, 1)) }.should raise_error(ZeroDivisionError)
+      -> { 0.send(@method, -1) }.should.raise(ZeroDivisionError)
+      -> { 0.send(@method, Rational(-1, 1)) }.should.raise(ZeroDivisionError)
     end
 
     it "returns Float::INFINITY for 0 ** -1.0" do
@@ -72,9 +80,9 @@
     end
 
     it "raises a TypeError when given a non-numeric power" do
-      -> { 13.send(@method, "10") }.should raise_error(TypeError)
-      -> { 13.send(@method, :symbol) }.should raise_error(TypeError)
-      -> { 13.send(@method, nil) }.should raise_error(TypeError)
+      -> { 13.send(@method, "10") }.should.raise(TypeError)
+      -> { 13.send(@method, :symbol) }.should.raise(TypeError)
+      -> { 13.send(@method, nil) }.should.raise(TypeError)
     end
 
     it "coerces power and calls #**" do
@@ -111,9 +119,9 @@
     end
 
     it "raises a TypeError when given a non-Integer" do
-      -> { @bignum.send(@method, mock('10')) }.should raise_error(TypeError)
-      -> { @bignum.send(@method, "10") }.should raise_error(TypeError)
-      -> { @bignum.send(@method, :symbol) }.should raise_error(TypeError)
+      -> { @bignum.send(@method, mock('10')) }.should.raise(TypeError)
+      -> { @bignum.send(@method, "10") }.should.raise(TypeError)
+      -> { @bignum.send(@method, :symbol) }.should.raise(TypeError)
     end
 
     ruby_version_is ""..."3.4" do
@@ -122,16 +130,26 @@
         -> {
           flt = @bignum.send(@method, @bignum)
         }.should complain(/warning: in a\*\*b, b may be too big/)
-        flt.should be_kind_of(Float)
+        flt.should.is_a?(Float)
         flt.infinite?.should == 1
       end
     end
 
     ruby_version_is "3.4" do
-      it "does not switch to a Float when the values is too big" do
+      it "returns an Integer for large Bignum results exceeding the old limit" do
+        # (2 ** 70) ** 500000 requires 35000001 bits
+        # This exceeds the old 32MB limit but is within the new 16GB limit
+        bignum_base = 2 ** 70
+        result = bignum_base.send(@method, 500000)
+        result.should.is_a?(Integer)
+        result.bit_length.should == 35000001
+      end
+
+      it "raises an ArgumentError when Bignum result exceeds the limit" do
+        # @bignum ** @bignum would require enormous memory
         -> {
           @bignum.send(@method, @bignum)
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
     end
 
diff --git a/spec/ruby/core/integer/shared/integer_rounding.rb b/spec/ruby/core/integer/shared/integer_rounding.rb
index 56d1819f840..92f2a2327c1 100644
--- a/spec/ruby/core/integer/shared/integer_rounding.rb
+++ b/spec/ruby/core/integer/shared/integer_rounding.rb
@@ -1,19 +1,19 @@
 describe :integer_rounding_positive_precision, shared: true do
   it "returns self if not passed a precision" do
     [2, -4, 10**70, -10**100].each do |v|
-      v.send(@method).should eql(v)
+      v.send(@method).should.eql?(v)
     end
   end
 
   it "returns self if passed a precision of zero" do
     [2, -4, 10**70, -10**100].each do |v|
-      v.send(@method, 0).should eql(v)
+      v.send(@method, 0).should.eql?(v)
     end
   end
 
   it "returns itself if passed a positive precision" do
     [2, -4, 10**70, -10**100].each do |v|
-      v.send(@method, 42).should eql(v)
+      v.send(@method, 42).should.eql?(v)
     end
   end
 end
diff --git a/spec/ruby/core/integer/shared/modulo.rb b/spec/ruby/core/integer/shared/modulo.rb
index d91af1e9241..d0b5e26ed53 100644
--- a/spec/ruby/core/integer/shared/modulo.rb
+++ b/spec/ruby/core/integer/shared/modulo.rb
@@ -41,24 +41,24 @@
     end
 
     it "raises a ZeroDivisionError when the given argument is 0" do
-      -> { 13.send(@method, 0)  }.should raise_error(ZeroDivisionError)
-      -> { 0.send(@method, 0)   }.should raise_error(ZeroDivisionError)
-      -> { -10.send(@method, 0) }.should raise_error(ZeroDivisionError)
+      -> { 13.send(@method, 0)  }.should.raise(ZeroDivisionError)
+      -> { 0.send(@method, 0)   }.should.raise(ZeroDivisionError)
+      -> { -10.send(@method, 0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a ZeroDivisionError when the given argument is 0 and a Float" do
-      -> { 0.send(@method, 0.0) }.should raise_error(ZeroDivisionError)
-      -> { 10.send(@method, 0.0) }.should raise_error(ZeroDivisionError)
-      -> { -10.send(@method, 0.0) }.should raise_error(ZeroDivisionError)
+      -> { 0.send(@method, 0.0) }.should.raise(ZeroDivisionError)
+      -> { 10.send(@method, 0.0) }.should.raise(ZeroDivisionError)
+      -> { -10.send(@method, 0.0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a TypeError when given a non-Integer" do
       -> {
         (obj = mock('10')).should_receive(:to_int).any_number_of_times.and_return(10)
         13.send(@method, obj)
-      }.should raise_error(TypeError)
-      -> { 13.send(@method, "10")    }.should raise_error(TypeError)
-      -> { 13.send(@method, :symbol) }.should raise_error(TypeError)
+      }.should.raise(TypeError)
+      -> { 13.send(@method, "10")    }.should.raise(TypeError)
+      -> { 13.send(@method, :symbol) }.should.raise(TypeError)
     end
   end
 
@@ -96,19 +96,19 @@
     end
 
     it "raises a ZeroDivisionError when the given argument is 0" do
-      -> { @bignum.send(@method, 0) }.should raise_error(ZeroDivisionError)
-      -> { (-@bignum).send(@method, 0) }.should raise_error(ZeroDivisionError)
+      -> { @bignum.send(@method, 0) }.should.raise(ZeroDivisionError)
+      -> { (-@bignum).send(@method, 0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a ZeroDivisionError when the given argument is 0 and a Float" do
-      -> { @bignum.send(@method, 0.0) }.should raise_error(ZeroDivisionError)
-      -> { -@bignum.send(@method, 0.0) }.should raise_error(ZeroDivisionError)
+      -> { @bignum.send(@method, 0.0) }.should.raise(ZeroDivisionError)
+      -> { -@bignum.send(@method, 0.0) }.should.raise(ZeroDivisionError)
     end
 
     it "raises a TypeError when given a non-Integer" do
-      -> { @bignum.send(@method, mock('10')) }.should raise_error(TypeError)
-      -> { @bignum.send(@method, "10") }.should raise_error(TypeError)
-      -> { @bignum.send(@method, :symbol) }.should raise_error(TypeError)
+      -> { @bignum.send(@method, mock('10')) }.should.raise(TypeError)
+      -> { @bignum.send(@method, "10") }.should.raise(TypeError)
+      -> { @bignum.send(@method, :symbol) }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/integer/shared/to_i.rb b/spec/ruby/core/integer/shared/to_i.rb
index 7b974cd3a7e..2b6a50484a6 100644
--- a/spec/ruby/core/integer/shared/to_i.rb
+++ b/spec/ruby/core/integer/shared/to_i.rb
@@ -1,8 +1,8 @@
 describe :integer_to_i, shared: true do
   it "returns self" do
-    10.send(@method).should eql(10)
-    (-15).send(@method).should eql(-15)
-    bignum_value.send(@method).should eql(bignum_value)
-    (-bignum_value).send(@method).should eql(-bignum_value)
+    10.send(@method).should.eql?(10)
+    (-15).send(@method).should.eql?(-15)
+    bignum_value.send(@method).should.eql?(bignum_value)
+    (-bignum_value).send(@method).should.eql?(-bignum_value)
   end
 end
diff --git a/spec/ruby/core/integer/sqrt_spec.rb b/spec/ruby/core/integer/sqrt_spec.rb
index 4149ca2cc9c..bf90ea747ed 100644
--- a/spec/ruby/core/integer/sqrt_spec.rb
+++ b/spec/ruby/core/integer/sqrt_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Integer.sqrt" do
   it "returns an integer" do
-    Integer.sqrt(10).should be_kind_of(Integer)
+    Integer.sqrt(10).should.is_a?(Integer)
   end
 
   it "returns the integer square root of the argument" do
@@ -14,7 +14,7 @@
   end
 
   it "raises a Math::DomainError if the argument is negative" do
-    -> { Integer.sqrt(-4) }.should raise_error(Math::DomainError)
+    -> { Integer.sqrt(-4) }.should.raise(Math::DomainError)
   end
 
   it "accepts any argument that can be coerced to Integer" do
@@ -26,6 +26,6 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced to Integer" do
-    -> { Integer.sqrt("test") }.should raise_error(TypeError)
+    -> { Integer.sqrt("test") }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/integer/to_f_spec.rb b/spec/ruby/core/integer/to_f_spec.rb
index 9f1df9ada93..06812360951 100644
--- a/spec/ruby/core/integer/to_f_spec.rb
+++ b/spec/ruby/core/integer/to_f_spec.rb
@@ -11,9 +11,9 @@
 
   context "bignum" do
     it "returns self converted to a Float" do
-      bignum_value(0x4000_0aa0_0bb0_0000).to_f.should eql(23_058_441_774_644_068_352.0)
-      bignum_value(0x8000_0000_0000_0ccc).to_f.should eql(27_670_116_110_564_330_700.0)
-      (-bignum_value(99)).to_f.should eql(-18_446_744_073_709_551_715.0)
+      bignum_value(0x4000_0aa0_0bb0_0000).to_f.should.eql?(23_058_441_774_644_068_352.0)
+      bignum_value(0x8000_0000_0000_0ccc).to_f.should.eql?(27_670_116_110_564_330_700.0)
+      (-bignum_value(99)).to_f.should.eql?(-18_446_744_073_709_551_715.0)
     end
 
     it "converts number close to Float::MAX without exceeding MAX or producing NaN" do
diff --git a/spec/ruby/core/integer/to_r_spec.rb b/spec/ruby/core/integer/to_r_spec.rb
index 7732bedca16..2649c7c78d7 100644
--- a/spec/ruby/core/integer/to_r_spec.rb
+++ b/spec/ruby/core/integer/to_r_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Integer#to_r" do
   it "returns a Rational object" do
-    309.to_r.should be_an_instance_of(Rational)
+    309.to_r.should.instance_of?(Rational)
   end
 
   it "constructs a rational number with self as the numerator" do
@@ -15,12 +15,12 @@
 
   it "works even if self is a Bignum" do
     bignum = 99999**999
-    bignum.should be_an_instance_of(Integer)
+    bignum.should.instance_of?(Integer)
     bignum.to_r.should == Rational(bignum, 1)
   end
 
   it "raises an ArgumentError if given any arguments" do
-    -> { 287.to_r(2) }.should raise_error(ArgumentError)
-    -> { 9102826.to_r(309, [], 71) }.should raise_error(ArgumentError)
+    -> { 287.to_r(2) }.should.raise(ArgumentError)
+    -> { 9102826.to_r(309, [], 71) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/integer/to_s_spec.rb b/spec/ruby/core/integer/to_s_spec.rb
index ca08dad95c7..4970a2a12fb 100644
--- a/spec/ruby/core/integer/to_s_spec.rb
+++ b/spec/ruby/core/integer/to_s_spec.rb
@@ -13,10 +13,10 @@
       end
 
       it "raises an ArgumentError if the base is less than 2 or higher than 36" do
-        -> { 123.to_s(-1) }.should raise_error(ArgumentError)
-        -> { 123.to_s(0)  }.should raise_error(ArgumentError)
-        -> { 123.to_s(1)  }.should raise_error(ArgumentError)
-        -> { 123.to_s(37) }.should raise_error(ArgumentError)
+        -> { 123.to_s(-1) }.should.raise(ArgumentError)
+        -> { 123.to_s(0)  }.should.raise(ArgumentError)
+        -> { 123.to_s(1)  }.should.raise(ArgumentError)
+        -> { 123.to_s(37) }.should.raise(ArgumentError)
       end
     end
 
@@ -39,12 +39,12 @@
 
     it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
-      1.to_s.encoding.should equal(Encoding::US_ASCII)
+      1.to_s.encoding.should.equal?(Encoding::US_ASCII)
     end
 
     it "returns a String in US-ASCII encoding when Encoding.default_internal is not nil" do
       Encoding.default_internal = Encoding::IBM437
-      1.to_s.encoding.should equal(Encoding::US_ASCII)
+      1.to_s.encoding.should.equal?(Encoding::US_ASCII)
     end
   end
 
@@ -59,10 +59,10 @@
       end
 
       it "raises an ArgumentError if the base is less than 2 or higher than 36" do
-        -> { 123.to_s(-1) }.should raise_error(ArgumentError)
-        -> { 123.to_s(0) }.should raise_error(ArgumentError)
-        -> { 123.to_s(1) }.should raise_error(ArgumentError)
-        -> { 123.to_s(37) }.should raise_error(ArgumentError)
+        -> { 123.to_s(-1) }.should.raise(ArgumentError)
+        -> { 123.to_s(0) }.should.raise(ArgumentError)
+        -> { 123.to_s(1) }.should.raise(ArgumentError)
+        -> { 123.to_s(37) }.should.raise(ArgumentError)
       end
     end
 
@@ -84,12 +84,12 @@
 
     it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
-      bignum_value.to_s.encoding.should equal(Encoding::US_ASCII)
+      bignum_value.to_s.encoding.should.equal?(Encoding::US_ASCII)
     end
 
     it "returns a String in US-ASCII encoding when Encoding.default_internal is not nil" do
       Encoding.default_internal = Encoding::IBM437
-      bignum_value.to_s.encoding.should equal(Encoding::US_ASCII)
+      bignum_value.to_s.encoding.should.equal?(Encoding::US_ASCII)
     end
   end
 end
diff --git a/spec/ruby/core/integer/truncate_spec.rb b/spec/ruby/core/integer/truncate_spec.rb
index db16e74be4d..b95c183cf3d 100644
--- a/spec/ruby/core/integer/truncate_spec.rb
+++ b/spec/ruby/core/integer/truncate_spec.rb
@@ -8,12 +8,12 @@
 
   context "precision argument specified as part of the truncate method is negative" do
     it "returns an integer with at least precision.abs trailing zeros" do
-      1832.truncate(-1).should eql(1830)
-      1832.truncate(-2).should eql(1800)
-      1832.truncate(-3).should eql(1000)
-      -1832.truncate(-1).should eql(-1830)
-      -1832.truncate(-2).should eql(-1800)
-      -1832.truncate(-3).should eql(-1000)
+      1832.truncate(-1).should.eql?(1830)
+      1832.truncate(-2).should.eql?(1800)
+      1832.truncate(-3).should.eql?(1000)
+      -1832.truncate(-1).should.eql?(-1830)
+      -1832.truncate(-2).should.eql?(-1800)
+      -1832.truncate(-3).should.eql?(-1000)
     end
   end
 end
diff --git a/spec/ruby/core/integer/try_convert_spec.rb b/spec/ruby/core/integer/try_convert_spec.rb
index 8a0ca671a93..8c9b4276b94 100644
--- a/spec/ruby/core/integer/try_convert_spec.rb
+++ b/spec/ruby/core/integer/try_convert_spec.rb
@@ -4,24 +4,24 @@
 describe "Integer.try_convert" do
   it "returns the argument if it's an Integer" do
     x = 42
-    Integer.try_convert(x).should equal(x)
+    Integer.try_convert(x).should.equal?(x)
   end
 
   it "returns nil when the argument does not respond to #to_int" do
-    Integer.try_convert(Object.new).should be_nil
+    Integer.try_convert(Object.new).should == nil
   end
 
   it "sends #to_int to the argument and returns the result if it's nil" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return(nil)
-    Integer.try_convert(obj).should be_nil
+    Integer.try_convert(obj).should == nil
   end
 
   it "sends #to_int to the argument and returns the result if it's an Integer" do
     x = 234
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return(x)
-    Integer.try_convert(obj).should equal(x)
+    Integer.try_convert(obj).should.equal?(x)
   end
 
   it "sends #to_int to the argument and raises TypeError if it's not a kind of Integer" do
@@ -29,7 +29,7 @@
     obj.should_receive(:to_int).and_return(Object.new)
     -> {
       Integer.try_convert obj
-    }.should raise_error(TypeError, "can't convert MockObject to Integer (MockObject#to_int gives Object)")
+    }.should raise_consistent_error(TypeError, "can't convert MockObject into Integer (MockObject#to_int gives Object)")
   end
 
   it "responds with a different error message when it raises a TypeError, depending on the type of the non-Integer object :to_int returns" do
@@ -37,12 +37,12 @@
     obj.should_receive(:to_int).and_return("A String")
     -> {
       Integer.try_convert obj
-    }.should raise_error(TypeError, "can't convert MockObject to Integer (MockObject#to_int gives String)")
+    }.should raise_consistent_error(TypeError, "can't convert MockObject into Integer (MockObject#to_int gives String)")
   end
 
   it "does not rescue exceptions raised by #to_int" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_raise(RuntimeError)
-    -> { Integer.try_convert obj }.should raise_error(RuntimeError)
+    -> { Integer.try_convert obj }.should.raise(RuntimeError)
   end
 end
diff --git a/spec/ruby/core/integer/upto_spec.rb b/spec/ruby/core/integer/upto_spec.rb
index dd6995e94b4..ba63dcc9ea1 100644
--- a/spec/ruby/core/integer/upto_spec.rb
+++ b/spec/ruby/core/integer/upto_spec.rb
@@ -27,8 +27,8 @@
   end
 
   it "raises an ArgumentError for non-numeric endpoints" do
-    -> { 1.upto("A") {|x| p x} }.should raise_error(ArgumentError)
-    -> { 1.upto(nil) {|x| p x} }.should raise_error(ArgumentError)
+    -> { 1.upto("A") {|x| p x} }.should.raise(ArgumentError)
+    -> { 1.upto(nil) {|x| p x} }.should.raise(ArgumentError)
   end
 
   describe "when no block is given" do
@@ -45,9 +45,9 @@
       describe "size" do
         it "raises an ArgumentError for non-numeric endpoints" do
           enum = 1.upto("A")
-          -> { enum.size }.should raise_error(ArgumentError)
+          -> { enum.size }.should.raise(ArgumentError)
           enum = 1.upto(nil)
-          -> { enum.size }.should raise_error(ArgumentError)
+          -> { enum.size }.should.raise(ArgumentError)
         end
 
         it "returns stop - self + 1" do
diff --git a/spec/ruby/core/io/advise_spec.rb b/spec/ruby/core/io/advise_spec.rb
index 651fc523780..b77ed53ad4d 100644
--- a/spec/ruby/core/io/advise_spec.rb
+++ b/spec/ruby/core/io/advise_spec.rb
@@ -14,73 +14,73 @@
   it "raises a TypeError if advise is not a Symbol" do
     -> {
       @io.advise("normal")
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises a TypeError if offset cannot be coerced to an Integer" do
     -> {
       @io.advise(:normal, "wat")
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises a TypeError if len cannot be coerced to an Integer" do
     -> {
       @io.advise(:normal, 0, "wat")
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises a RangeError if offset is too big" do
     -> {
       @io.advise(:normal, 10 ** 32)
-    }.should raise_error(RangeError)
+    }.should.raise(RangeError)
   end
 
   it "raises a RangeError if len is too big" do
     -> {
       @io.advise(:normal, 0, 10 ** 32)
-    }.should raise_error(RangeError)
+    }.should.raise(RangeError)
   end
 
   it "raises a NotImplementedError if advise is not recognized" do
     ->{
       @io.advise(:foo)
-    }.should raise_error(NotImplementedError)
+    }.should.raise(NotImplementedError)
   end
 
   it "supports the normal advice type" do
-    @io.advise(:normal).should be_nil
+    @io.advise(:normal).should == nil
   end
 
   it "supports the sequential advice type" do
-    @io.advise(:sequential).should be_nil
+    @io.advise(:sequential).should == nil
   end
 
   it "supports the random advice type" do
-    @io.advise(:random).should be_nil
+    @io.advise(:random).should == nil
   end
 
   it "supports the dontneed advice type" do
-    @io.advise(:dontneed).should be_nil
+    @io.advise(:dontneed).should == nil
   end
 
   it "supports the noreuse advice type" do
-    @io.advise(:noreuse).should be_nil
+    @io.advise(:noreuse).should == nil
   end
 
   platform_is_not :linux do
     it "supports the willneed advice type" do
-      @io.advise(:willneed).should be_nil
+      @io.advise(:willneed).should == nil
     end
   end
 
   guard -> { platform_is :linux and kernel_version_is '3.6' } do # [ruby-core:65355] tmpfs is not supported
     it "supports the willneed advice type" do
-      @io.advise(:willneed).should be_nil
+      @io.advise(:willneed).should == nil
     end
   end
 
   it "raises an IOError if the stream is closed" do
     @io.close
-    -> { @io.advise(:normal) }.should raise_error(IOError)
+    -> { @io.advise(:normal) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/autoclose_spec.rb b/spec/ruby/core/io/autoclose_spec.rb
index 715ada7c934..596f3d6934f 100644
--- a/spec/ruby/core/io/autoclose_spec.rb
+++ b/spec/ruby/core/io/autoclose_spec.rb
@@ -17,7 +17,7 @@
 
   it "cannot be queried on a closed IO object" do
     @io.close
-    -> { @io.autoclose? }.should raise_error(IOError, /closed stream/)
+    -> { @io.autoclose? }.should.raise(IOError, /closed stream/)
   end
 end
 
@@ -72,6 +72,6 @@
 
   it "cannot be set on a closed IO object" do
     @io.close
-    -> { @io.autoclose = false }.should raise_error(IOError, /closed stream/)
+    -> { @io.autoclose = false }.should.raise(IOError, /closed stream/)
   end
 end
diff --git a/spec/ruby/core/io/binmode_spec.rb b/spec/ruby/core/io/binmode_spec.rb
index 342cac2a9b6..8117229c914 100644
--- a/spec/ruby/core/io/binmode_spec.rb
+++ b/spec/ruby/core/io/binmode_spec.rb
@@ -13,11 +13,11 @@
 
   it "returns self" do
     @io = new_io(@name)
-    @io.binmode.should equal(@io)
+    @io.binmode.should.equal?(@io)
   end
 
   it "raises an IOError on closed stream" do
-    -> { IOSpecs.closed_io.binmode }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.binmode }.should.raise(IOError)
   end
 
   it "sets external encoding to binary" do
@@ -47,9 +47,9 @@
   end
 
   it "is true after a call to IO#binmode" do
-    @file.binmode?.should be_false
+    @file.binmode?.should == false
     @file.binmode
-    @file.binmode?.should be_true
+    @file.binmode?.should == true
   end
 
   it "propagates to dup'ed IO objects" do
@@ -59,6 +59,6 @@
   end
 
   it "raises an IOError on closed stream" do
-    -> { IOSpecs.closed_io.binmode? }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.binmode? }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/binread_spec.rb b/spec/ruby/core/io/binread_spec.rb
index e4576c1aa1e..3023c7f177a 100644
--- a/spec/ruby/core/io/binread_spec.rb
+++ b/spec/ruby/core/io/binread_spec.rb
@@ -38,11 +38,11 @@
   end
 
   it "raises an ArgumentError when not passed a valid length" do
-    -> { IO.binread @fname, -1 }.should raise_error(ArgumentError)
+    -> { IO.binread @fname, -1 }.should.raise(ArgumentError)
   end
 
   it "raises an Errno::EINVAL when not passed a valid offset" do
-    -> { IO.binread @fname, 0, -1  }.should raise_error(Errno::EINVAL)
+    -> { IO.binread @fname, 0, -1  }.should.raise(Errno::EINVAL)
   end
 
   ruby_version_is ""..."4.0" do
diff --git a/spec/ruby/core/io/buffer/and_spec.rb b/spec/ruby/core/io/buffer/and_spec.rb
new file mode 100644
index 00000000000..3cea163b0ec
--- /dev/null
+++ b/spec/ruby/core/io/buffer/and_spec.rb
@@ -0,0 +1,62 @@
+require_relative '../../../spec_helper'
+
+describe :io_buffer_and, shared: true do
+  it "applies the argument buffer as an AND bit mask across the whole buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer.send(@method, mask)
+        result.get_string.should == "\x30\x02\x30\x04\x30".b
+        result.free
+      end
+    end
+  end
+
+  it "ignores extra parts of mask if it is longer than source buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F\x00\x00\x00\xFF\xFF") do |mask|
+        result = buffer.send(@method, mask)
+        result.get_string.should == "\x30\x02\x00\x00\x00".b
+        result.free
+      end
+    end
+  end
+
+  it "raises TypeError if mask is not an IO::Buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      -> { buffer.send(@method, "\xF8\x8F") }.should.raise(TypeError, "wrong argument type String (expected IO::Buffer)")
+      -> { buffer.send(@method, 0xF8) }.should.raise(TypeError, "wrong argument type Integer (expected IO::Buffer)")
+      -> { buffer.send(@method, nil) }.should.raise(TypeError, "wrong argument type nil (expected IO::Buffer)")
+    end
+  end
+end
+
+describe "IO::Buffer#&" do
+  it_behaves_like :io_buffer_and, :&
+
+  it "creates a new internal buffer of the same size" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer & mask
+        result.should_not.equal? buffer
+        result.should.internal?
+        result.size.should == buffer.size
+        result.free
+        buffer.get_string.should == "12345".b
+      end
+    end
+  end
+end
+
+describe "IO::Buffer#and!" do
+  it_behaves_like :io_buffer_and, :and!
+
+  it "modifies the buffer in place" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer.and!(mask)
+        result.should.equal? buffer
+        result.should.external?
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/io/buffer/bit_count_spec.rb b/spec/ruby/core/io/buffer/bit_count_spec.rb
new file mode 100644
index 00000000000..62f56f5b985
--- /dev/null
+++ b/spec/ruby/core/io/buffer/bit_count_spec.rb
@@ -0,0 +1,64 @@
+require_relative '../../../spec_helper'
+
+ruby_version_is "4.1" do
+  describe "IO::Buffer#bit_count" do
+    it "counts all set bits in the whole buffer" do
+      IO::Buffer.for(+"\xFF\x00\x0F") do |buffer|
+        buffer.bit_count.should == 12
+      end
+    end
+
+    it "returns 0 for a buffer of all zero bytes" do
+      IO::Buffer.for(+"\x00\x00\x00") do |buffer|
+        buffer.bit_count.should == 0
+      end
+    end
+
+    it "returns 8 * size for a buffer of all 0xFF bytes" do
+      IO::Buffer.for(+"\xFF" * 9) do |buffer|
+        buffer.bit_count.should == 72
+      end
+    end
+
+    it "returns 0 for an empty buffer" do
+      IO::Buffer.new(0).bit_count.should == 0
+    end
+
+    it "accepts an offset to start counting from (length defaults to remaining bytes)" do
+      IO::Buffer.for(+"\xFF\x00\x0F") do |buffer|
+        buffer.bit_count(0).should == 12  # offset=0 => entire buffer
+        buffer.bit_count(1).should == 4   # offset=1 => 0x00 + 0x0F
+        buffer.bit_count(2).should == 4   # offset=2 => 0x0F only
+      end
+    end
+
+    it "accepts an offset and length to restrict the counted region" do
+      IO::Buffer.for(+"\xFF\x00\x0F") do |buffer|
+        buffer.bit_count(0, 1).should == 8  # just 0xFF
+        buffer.bit_count(1, 1).should == 0  # just 0x00
+        buffer.bit_count(2, 1).should == 4  # just 0x0F
+        buffer.bit_count(1, 2).should == 4  # 0x00 + 0x0F
+      end
+    end
+
+    it "handles 8-byte aligned buffers efficiently" do
+      IO::Buffer.for(+"\xAA" * 8) do |buffer|
+        # 0xAA = 10101010 => 4 bits per byte => 32 total
+        buffer.bit_count.should == 32
+      end
+    end
+
+    it "raises ArgumentError when offset + length exceeds buffer size" do
+      IO::Buffer.for(+"\xFF") do |buffer|
+        -> { buffer.bit_count(0, 2) }.should.raise(ArgumentError)
+        -> { buffer.bit_count(1, 1) }.should.raise(ArgumentError)
+      end
+    end
+
+    it "returns an Integer" do
+      IO::Buffer.for(+"\xFF") do |buffer|
+        buffer.bit_count.should.is_a?(Integer)
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/io/buffer/empty_spec.rb b/spec/ruby/core/io/buffer/empty_spec.rb
index 788b23f88f0..4cceb4dc0db 100644
--- a/spec/ruby/core/io/buffer/empty_spec.rb
+++ b/spec/ruby/core/io/buffer/empty_spec.rb
@@ -11,17 +11,17 @@
 
   it "is true for a 0-length String-backed buffer created with .for" do
     @buffer = IO::Buffer.for("")
-    @buffer.empty?.should be_true
+    @buffer.empty?.should == true
   end
 
   it "is true for a 0-length String-backed buffer created with .string" do
     IO::Buffer.string(0) do |buffer|
-      buffer.empty?.should be_true
+      buffer.empty?.should == true
     end
   end
 
   it "is true for a 0-length slice of a buffer with size > 0" do
     @buffer = IO::Buffer.new(4)
-    @buffer.slice(3, 0).empty?.should be_true
+    @buffer.slice(3, 0).empty?.should == true
   end
 end
diff --git a/spec/ruby/core/io/buffer/external_spec.rb b/spec/ruby/core/io/buffer/external_spec.rb
index 10bb51053d4..18b2ee0d06a 100644
--- a/spec/ruby/core/io/buffer/external_spec.rb
+++ b/spec/ruby/core/io/buffer/external_spec.rb
@@ -8,16 +8,16 @@
 
   it "is true for a buffer with externally-managed memory" do
     @buffer = IO::Buffer.for("string")
-    @buffer.external?.should be_true
+    @buffer.external?.should == true
   end
 
   it "is false for a buffer with self-managed memory" do
     @buffer = IO::Buffer.new(12, IO::Buffer::MAPPED)
-    @buffer.external?.should be_false
+    @buffer.external?.should == false
   end
 
   it "is false for a null buffer" do
     @buffer = IO::Buffer.new(0)
-    @buffer.external?.should be_false
+    @buffer.external?.should == false
   end
 end
diff --git a/spec/ruby/core/io/buffer/for_spec.rb b/spec/ruby/core/io/buffer/for_spec.rb
index d59a2a033af..7971ce0b719 100644
--- a/spec/ruby/core/io/buffer/for_spec.rb
+++ b/spec/ruby/core/io/buffer/for_spec.rb
@@ -20,7 +20,7 @@
       @string[0] = "d"
       @buffer.get_string(0, 1).should == "f".b
 
-      -> { @buffer.set_string("d") }.should raise_error(IO::Buffer::AccessError, "Buffer is not writable!")
+      -> { @buffer.set_string("d") }.should.raise(IO::Buffer::AccessError, "Buffer is not writable!")
     end
 
     it "creates an external, read-only buffer" do
@@ -74,7 +74,7 @@
 
       it "locks the original string to prevent modification" do
         IO::Buffer.for(@string) do |_buffer|
-          -> { @string[0] = "t" }.should raise_error(RuntimeError, "can't modify string; temporarily locked")
+          -> { @string[0] = "t" }.should.raise(RuntimeError, "can't modify string; temporarily locked")
         end
         @string[1] = "u"
         @string.should == "fur striñg"
@@ -86,7 +86,7 @@
         IO::Buffer.for(@string.freeze) do |buffer|
           buffer.should.readonly?
 
-          -> { buffer.set_string("ghost shell") }.should raise_error(IO::Buffer::AccessError, "Buffer is not writable!")
+          -> { buffer.set_string("ghost shell") }.should.raise(IO::Buffer::AccessError, "Buffer is not writable!")
         end
       end
     end
diff --git a/spec/ruby/core/io/buffer/free_spec.rb b/spec/ruby/core/io/buffer/free_spec.rb
index 9a141e11f6b..20fb7b901f4 100644
--- a/spec/ruby/core/io/buffer/free_spec.rb
+++ b/spec/ruby/core/io/buffer/free_spec.rb
@@ -5,13 +5,13 @@
     it "frees internal memory and nullifies the buffer" do
       buffer = IO::Buffer.new(4)
       buffer.free
-      buffer.null?.should be_true
+      buffer.null?.should == true
     end
 
     it "frees mapped memory and nullifies the buffer" do
       buffer = IO::Buffer.new(4, IO::Buffer::MAPPED)
       buffer.free
-      buffer.null?.should be_true
+      buffer.null?.should == true
     end
   end
 
@@ -20,7 +20,7 @@
       File.open(__FILE__, "r") do |file|
         buffer = IO::Buffer.map(file, nil, 0, IO::Buffer::READONLY)
         buffer.free
-        buffer.null?.should be_true
+        buffer.null?.should == true
       end
     end
   end
@@ -32,7 +32,7 @@
         buffer = IO::Buffer.for(string)
         # Read-only buffer, can't modify the string.
         buffer.free
-        buffer.null?.should be_true
+        buffer.null?.should == true
       end
     end
 
@@ -42,7 +42,7 @@
         IO::Buffer.for(string) do |buffer|
           buffer.set_string("meat")
           buffer.free
-          buffer.null?.should be_true
+          buffer.null?.should == true
         end
         string.should == "meat"
       end
@@ -55,7 +55,7 @@
         IO::Buffer.string(4) do |buffer|
           buffer.set_string("meat")
           buffer.free
-          buffer.null?.should be_true
+          buffer.null?.should == true
         end
       string.should == "meat"
     end
@@ -64,18 +64,18 @@
   it "can be called repeatedly without an error" do
     buffer = IO::Buffer.new(4)
     buffer.free
-    buffer.null?.should be_true
+    buffer.null?.should == true
     buffer.free
-    buffer.null?.should be_true
+    buffer.null?.should == true
   end
 
   it "is disallowed while locked, raising IO::Buffer::LockedError" do
     buffer = IO::Buffer.new(4)
     buffer.locked do
-      -> { buffer.free }.should raise_error(IO::Buffer::LockedError, "Buffer is locked!")
+      -> { buffer.free }.should.raise(IO::Buffer::LockedError, "Buffer is locked!")
     end
     buffer.free
-    buffer.null?.should be_true
+    buffer.null?.should == true
   end
 
   context "with a slice of a buffer" do
@@ -84,8 +84,8 @@
       slice = buffer.slice(0, 2)
 
       slice.free
-      slice.null?.should be_true
-      buffer.null?.should be_false
+      slice.null?.should == true
+      buffer.null?.should == false
 
       buffer.free
     end
@@ -95,8 +95,8 @@
       slice = buffer.slice(0, 2)
 
       buffer.free
-      slice.null?.should be_false
-      slice.valid?.should be_false
+      slice.null?.should == false
+      slice.valid?.should == false
     end
   end
 end
diff --git a/spec/ruby/core/io/buffer/initialize_spec.rb b/spec/ruby/core/io/buffer/initialize_spec.rb
index 90b501f53d9..dba6fddc799 100644
--- a/spec/ruby/core/io/buffer/initialize_spec.rb
+++ b/spec/ruby/core/io/buffer/initialize_spec.rb
@@ -56,12 +56,12 @@
     end
 
     it "raises TypeError if size is not an Integer" do
-      -> { IO::Buffer.new(nil) }.should raise_error(TypeError, "not an Integer")
-      -> { IO::Buffer.new(10.0) }.should raise_error(TypeError, "not an Integer")
+      -> { IO::Buffer.new(nil) }.should.raise(TypeError, "not an Integer")
+      -> { IO::Buffer.new(10.0) }.should.raise(TypeError, "not an Integer")
     end
 
     it "raises ArgumentError if size is negative" do
-      -> { IO::Buffer.new(-1) }.should raise_error(ArgumentError, "Size can't be negative!")
+      -> { IO::Buffer.new(-1) }.should.raise(ArgumentError, "Size can't be negative!")
     end
   end
 
@@ -104,16 +104,16 @@
     end
 
     it "raises IO::Buffer::AllocationError if neither IO::Buffer::MAPPED nor IO::Buffer::INTERNAL is given" do
-      -> { IO::Buffer.new(10, IO::Buffer::READONLY) }.should raise_error(IO::Buffer::AllocationError, "Could not allocate buffer!")
-      -> { IO::Buffer.new(10, 0) }.should raise_error(IO::Buffer::AllocationError, "Could not allocate buffer!")
+      -> { IO::Buffer.new(10, IO::Buffer::READONLY) }.should.raise(IO::Buffer::AllocationError, "Could not allocate buffer!")
+      -> { IO::Buffer.new(10, 0) }.should.raise(IO::Buffer::AllocationError, "Could not allocate buffer!")
     end
 
     it "raises ArgumentError if flags is negative" do
-      -> { IO::Buffer.new(10, -1) }.should raise_error(ArgumentError, "Flags can't be negative!")
+      -> { IO::Buffer.new(10, -1) }.should.raise(ArgumentError, "Flags can't be negative!")
     end
 
     it "raises TypeError with non-Integer flags" do
-      -> { IO::Buffer.new(10, 0.0) }.should raise_error(TypeError, "not an Integer")
+      -> { IO::Buffer.new(10, 0.0) }.should.raise(TypeError, "not an Integer")
     end
   end
 end
diff --git a/spec/ruby/core/io/buffer/internal_spec.rb b/spec/ruby/core/io/buffer/internal_spec.rb
index 40dc633d5d7..73e19eb85e6 100644
--- a/spec/ruby/core/io/buffer/internal_spec.rb
+++ b/spec/ruby/core/io/buffer/internal_spec.rb
@@ -8,16 +8,16 @@
 
   it "is true for an internally-allocated buffer" do
     @buffer = IO::Buffer.new(12)
-    @buffer.internal?.should be_true
+    @buffer.internal?.should == true
   end
 
   it "is false for an externally-allocated buffer" do
     @buffer = IO::Buffer.new(12, IO::Buffer::MAPPED)
-    @buffer.internal?.should be_false
+    @buffer.internal?.should == false
   end
 
   it "is false for a null buffer" do
     @buffer = IO::Buffer.new(0)
-    @buffer.internal?.should be_false
+    @buffer.internal?.should == false
   end
 end
diff --git a/spec/ruby/core/io/buffer/locked_spec.rb b/spec/ruby/core/io/buffer/locked_spec.rb
index 4ffa569fd20..249026aa8a9 100644
--- a/spec/ruby/core/io/buffer/locked_spec.rb
+++ b/spec/ruby/core/io/buffer/locked_spec.rb
@@ -21,7 +21,7 @@
       @buffer = IO::Buffer.new(4)
       @buffer.locked do
         # Just an example, each method is responsible for checking the lock state.
-        -> { @buffer.resize(8) }.should raise_error(IO::Buffer::LockedError)
+        -> { @buffer.resize(8) }.should.raise(IO::Buffer::LockedError)
       end
     end
   end
@@ -29,7 +29,7 @@
   it "disallows reentrant locking, raising IO::Buffer::LockedError" do
     @buffer = IO::Buffer.new(4)
     @buffer.locked do
-      -> { @buffer.locked {} }.should raise_error(IO::Buffer::LockedError, "Buffer already locked!")
+      -> { @buffer.locked {} }.should.raise(IO::Buffer::LockedError, "Buffer already locked!")
     end
   end
 
@@ -37,9 +37,9 @@
     @buffer = IO::Buffer.new(4)
     slice = @buffer.slice(0, 2)
     @buffer.locked do
-      @buffer.locked?.should be_true
-      slice.locked?.should be_false
-      slice.locked { slice.locked?.should be_true }
+      @buffer.locked?.should == true
+      slice.locked?.should == false
+      slice.locked { slice.locked?.should == true }
     end
   end
 
@@ -47,9 +47,9 @@
     @buffer = IO::Buffer.new(4)
     slice = @buffer.slice(0, 2)
     slice.locked do
-      slice.locked?.should be_true
-      @buffer.locked?.should be_false
-      @buffer.locked { @buffer.locked?.should be_true }
+      slice.locked?.should == true
+      @buffer.locked?.should == false
+      @buffer.locked { @buffer.locked?.should == true }
     end
   end
 end
@@ -62,14 +62,14 @@
 
   it "is false by default" do
     @buffer = IO::Buffer.new(4)
-    @buffer.locked?.should be_false
+    @buffer.locked?.should == false
   end
 
   it "is true only inside of #locked block" do
     @buffer = IO::Buffer.new(4)
     @buffer.locked do
-      @buffer.locked?.should be_true
+      @buffer.locked?.should == true
     end
-    @buffer.locked?.should be_false
+    @buffer.locked?.should == false
   end
 end
diff --git a/spec/ruby/core/io/buffer/map_spec.rb b/spec/ruby/core/io/buffer/map_spec.rb
index d980eb0ae04..23e837ce078 100644
--- a/spec/ruby/core/io/buffer/map_spec.rb
+++ b/spec/ruby/core/io/buffer/map_spec.rb
@@ -2,21 +2,33 @@
 
 describe "IO::Buffer.map" do
   before :all do
-    @big_file_name = tmp("big_file")
-    # Usually 4 kibibytes + 16 bytes
-    File.write(@big_file_name, "12345678" * (IO::Buffer::PAGE_SIZE / 8 + 2))
+    @tmp_files = []
+
+    @big_file_name = nil
+    @small_file_name = nil
   end
 
   after :all do
-    File.delete(@big_file_name)
+    @tmp_files.each {|file| File.delete(file)}
   end
 
   def open_fixture
-    File.open("#{__dir__}/../fixtures/read_text.txt", "r+")
+    unless @small_file_name
+      @small_file_name = tmp("read_text.txt")
+      File.copy_stream(fixture(__dir__, "read_text.txt"), @small_file_name)
+      @tmp_files << @small_file_name
+    end
+    File.open(@small_file_name, "rb+")
   end
 
   def open_big_file_fixture
-    File.open(@big_file_name, "r+")
+    unless @big_file_name
+      @big_file_name = tmp("big_file")
+      # Usually 4 kibibytes + 16 bytes
+      File.write(@big_file_name, "12345678" * (IO::Buffer::PAGE_SIZE / 8 + 2))
+      @tmp_files << @big_file_name
+    end
+    File.open(@big_file_name, "rb+")
   end
 
   after :each do
@@ -61,7 +73,7 @@ def open_big_file_fixture
     @buffer.should.valid?
   end
 
-  platform_is_not :windows do
+  platform_is_not :windows, :openbsd do
     it "is shareable across processes" do
       file_name = tmp("shared_buffer")
       @file = File.open(file_name, "w+")
@@ -89,25 +101,20 @@ def open_big_file_fixture
   end
 
   context "with an empty file" do
-    ruby_version_is ""..."4.0" do
-      it "raises a SystemCallError" do
-        @file = File.open("#{__dir__}/../fixtures/empty.txt", "r+")
-        -> { IO::Buffer.map(@file) }.should raise_error(SystemCallError)
-      end
-    end
-
     ruby_version_is "4.0" do
       it "raises ArgumentError" do
-        @file = File.open("#{__dir__}/../fixtures/empty.txt", "r+")
-        -> { IO::Buffer.map(@file) }.should raise_error(ArgumentError, "Invalid negative or zero file size!")
+        file_name = tmp("empty.txt")
+        @file = File.open(file_name, "wb+")
+        @tmp_files << file_name
+        -> { IO::Buffer.map(@file) }.should.raise(ArgumentError, "Invalid negative or zero file size!")
       end
     end
   end
 
   context "with a file opened only for reading" do
-    it "raises a SystemCallError if no flags are used" do
-      @file = File.open("#{__dir__}/../fixtures/read_text.txt", "r")
-      -> { IO::Buffer.map(@file) }.should raise_error(SystemCallError)
+    it "raises a SystemCallError unless read-only" do
+      @file = File.open(fixture(__dir__, "read_text.txt"), "rb")
+      -> { IO::Buffer.map(@file) }.should.raise(SystemCallError)
     end
   end
 
@@ -128,32 +135,23 @@ def open_big_file_fixture
     end
 
     context "if size is 0" do
-      ruby_version_is ""..."4.0" do
-        platform_is_not :windows do
-          it "raises a SystemCallError" do
-            @file = open_fixture
-            -> { IO::Buffer.map(@file, 0) }.should raise_error(SystemCallError)
-          end
-        end
-      end
-
       ruby_version_is "4.0" do
         it "raises ArgumentError" do
           @file = open_fixture
-          -> { IO::Buffer.map(@file, 0) }.should raise_error(ArgumentError, "Size can't be zero!")
+          -> { IO::Buffer.map(@file, 0) }.should.raise(ArgumentError, "Size can't be zero!")
         end
       end
     end
 
     it "raises TypeError if size is not an Integer or nil" do
       @file = open_fixture
-      -> { IO::Buffer.map(@file, "10") }.should raise_error(TypeError, "not an Integer")
-      -> { IO::Buffer.map(@file, 10.0) }.should raise_error(TypeError, "not an Integer")
+      -> { IO::Buffer.map(@file, "10") }.should.raise(TypeError, "not an Integer")
+      -> { IO::Buffer.map(@file, 10.0) }.should.raise(TypeError, "not an Integer")
     end
 
     it "raises ArgumentError if size is negative" do
       @file = open_fixture
-      -> { IO::Buffer.map(@file, -1) }.should raise_error(ArgumentError, "Size can't be negative!")
+      -> { IO::Buffer.map(@file, -1) }.should.raise(ArgumentError, "Size can't be negative!")
     end
 
     ruby_version_is ""..."4.0" do
@@ -164,7 +162,7 @@ def open_big_file_fixture
     ruby_version_is "4.0" do
       it "raises ArgumentError if size is larger than file size" do
         @file = open_fixture
-        -> { IO::Buffer.map(@file, 8192) }.should raise_error(ArgumentError, "Size can't be larger than file size!")
+        -> { IO::Buffer.map(@file, 8192) }.should.raise(ArgumentError, "Size can't be larger than file size!")
       end
     end
   end
@@ -234,7 +232,7 @@ def open_big_file_fixture
     ruby_version_is "4.0" do
       it "raises ArgumentError if offset+size is larger than file size" do
         @file = open_big_file_fixture
-        -> { IO::Buffer.map(@file, 17, IO::Buffer::PAGE_SIZE) }.should raise_error(ArgumentError, "Offset too large!")
+        -> { IO::Buffer.map(@file, 17, IO::Buffer::PAGE_SIZE) }.should.raise(ArgumentError, "Offset too large!")
       ensure
         # Windows requires the file to be closed before deletion.
         @file.close unless @file.closed?
@@ -243,26 +241,14 @@ def open_big_file_fixture
 
     it "raises TypeError if offset is not convertible to Integer" do
       @file = open_fixture
-      -> { IO::Buffer.map(@file, 4, "4096") }.should raise_error(TypeError, /no implicit conversion/)
-      -> { IO::Buffer.map(@file, 4, nil) }.should raise_error(TypeError, /no implicit conversion/)
-    end
-
-    it "raises a SystemCallError if offset is not an allowed value" do
-      @file = open_fixture
-      -> { IO::Buffer.map(@file, 4, 3) }.should raise_error(SystemCallError)
-    end
-
-    ruby_version_is ""..."4.0" do
-      it "raises a SystemCallError if offset is negative" do
-        @file = open_fixture
-        -> { IO::Buffer.map(@file, 4, -1) }.should raise_error(SystemCallError)
-      end
+      -> { IO::Buffer.map(@file, 4, "4096") }.should.raise(TypeError, /no implicit conversion/)
+      -> { IO::Buffer.map(@file, 4, nil) }.should.raise(TypeError, /no implicit conversion/)
     end
 
     ruby_version_is "4.0" do
       it "raises ArgumentError if offset is negative" do
         @file = open_fixture
-        -> { IO::Buffer.map(@file, 4, -1) }.should raise_error(ArgumentError, "Offset can't be negative!")
+        -> { IO::Buffer.map(@file, 4, -1) }.should.raise(ArgumentError, "Offset can't be negative!")
       end
     end
   end
@@ -279,7 +265,7 @@ def open_big_file_fixture
       end
 
       it "allows mapping read-only files" do
-        @file = File.open("#{__dir__}/../fixtures/read_text.txt", "r")
+        @file = File.open(fixture(__dir__, "read_text.txt"), "rb")
         @buffer = IO::Buffer.map(@file, nil, 0, IO::Buffer::READONLY)
 
         @buffer.should.readonly?
@@ -291,7 +277,7 @@ def open_big_file_fixture
         @file = open_fixture
         @buffer = IO::Buffer.map(@file, nil, 0, IO::Buffer::READONLY)
 
-        -> { @buffer.set_string("test") }.should raise_error(IO::Buffer::AccessError, "Buffer is not writable!")
+        -> { @buffer.set_string("test") }.should.raise(IO::Buffer::AccessError, "Buffer is not writable!")
       end
     end
 
@@ -308,11 +294,11 @@ def open_big_file_fixture
         @buffer.set_string("test12345")
         @buffer.get_string.should == "test12345".b
 
-        @file.read.should == "abcâdef\n"
+        @file.read.should == "abcâdef\n".b
       end
 
       it "allows mapping read-only files and modifying the buffer" do
-        @file = File.open("#{__dir__}/../fixtures/read_text.txt", "r")
+        @file = File.open(fixture(__dir__, "read_text.txt"), "rb")
         @buffer = IO::Buffer.map(@file, nil, 0, IO::Buffer::PRIVATE)
 
         @buffer.should.private?
@@ -323,7 +309,7 @@ def open_big_file_fixture
         @buffer.set_string("test12345")
         @buffer.get_string.should == "test12345".b
 
-        @file.read.should == "abcâdef\n"
+        @file.read.should == "abcâdef\n".b
       end
 
       platform_is_not :windows do
diff --git a/spec/ruby/core/io/buffer/mapped_spec.rb b/spec/ruby/core/io/buffer/mapped_spec.rb
index 13dc548ed26..0decb97704e 100644
--- a/spec/ruby/core/io/buffer/mapped_spec.rb
+++ b/spec/ruby/core/io/buffer/mapped_spec.rb
@@ -8,16 +8,16 @@
 
   it "is true for a buffer with mapped memory" do
     @buffer = IO::Buffer.new(12, IO::Buffer::MAPPED)
-    @buffer.mapped?.should be_true
+    @buffer.mapped?.should == true
   end
 
   it "is false for a buffer with non-mapped memory" do
     @buffer = IO::Buffer.for("string")
-    @buffer.mapped?.should be_false
+    @buffer.mapped?.should == false
   end
 
   it "is false for a null buffer" do
     @buffer = IO::Buffer.new(0)
-    @buffer.mapped?.should be_false
+    @buffer.mapped?.should == false
   end
 end
diff --git a/spec/ruby/core/io/buffer/not_spec.rb b/spec/ruby/core/io/buffer/not_spec.rb
new file mode 100644
index 00000000000..4737a30bde6
--- /dev/null
+++ b/spec/ruby/core/io/buffer/not_spec.rb
@@ -0,0 +1,37 @@
+require_relative '../../../spec_helper'
+
+describe :io_buffer_not, shared: true do
+  it "inverts every bit of the buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      result = buffer.send(@method)
+      result.get_string.should == "\xCE\xCD\xCC\xCB\xCA".b
+      result.free
+    end
+  end
+end
+
+describe "IO::Buffer#~" do
+  it_behaves_like :io_buffer_not, :~
+
+  it "creates a new internal buffer of the same size" do
+    IO::Buffer.for(+"12345") do |buffer|
+      result = ~buffer
+      result.should_not.equal? buffer
+      result.should.internal?
+      result.size.should == buffer.size
+      result.free
+    end
+  end
+end
+
+describe "IO::Buffer#not!" do
+  it_behaves_like :io_buffer_not, :not!
+
+  it "modifies the buffer in place" do
+    IO::Buffer.for(+"12345") do |buffer|
+      result = buffer.not!
+      result.should.equal? buffer
+      result.should.external?
+    end
+  end
+end
diff --git a/spec/ruby/core/io/buffer/null_spec.rb b/spec/ruby/core/io/buffer/null_spec.rb
index 3a0e7f841bf..380a98bde1d 100644
--- a/spec/ruby/core/io/buffer/null_spec.rb
+++ b/spec/ruby/core/io/buffer/null_spec.rb
@@ -11,17 +11,17 @@
 
   it "is false for a 0-length String-backed buffer created with .for" do
     @buffer = IO::Buffer.for("")
-    @buffer.null?.should be_false
+    @buffer.null?.should == false
   end
 
   it "is false for a 0-length String-backed buffer created with .string" do
     IO::Buffer.string(0) do |buffer|
-      buffer.null?.should be_false
+      buffer.null?.should == false
     end
   end
 
   it "is false for a 0-length slice of a buffer with size > 0" do
     @buffer = IO::Buffer.new(4)
-    @buffer.slice(3, 0).null?.should be_false
+    @buffer.slice(3, 0).null?.should == false
   end
 end
diff --git a/spec/ruby/core/io/buffer/or_spec.rb b/spec/ruby/core/io/buffer/or_spec.rb
new file mode 100644
index 00000000000..3e627c216c0
--- /dev/null
+++ b/spec/ruby/core/io/buffer/or_spec.rb
@@ -0,0 +1,62 @@
+require_relative '../../../spec_helper'
+
+describe :io_buffer_or, shared: true do
+  it "applies the argument buffer as an OR bit mask across the whole buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer.send(@method, mask)
+        result.get_string.should == "\xF9\xBF\xFB\xBF\xFD".b
+        result.free
+      end
+    end
+  end
+
+  it "ignores extra parts of mask if it is longer than source buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F\x00\x00\x00\xFF\xFF") do |mask|
+        result = buffer.send(@method, mask)
+        result.get_string.should == "\xF9\xBF345".b
+        result.free
+      end
+    end
+  end
+
+  it "raises TypeError if mask is not an IO::Buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      -> { buffer.send(@method, "\xF8\x8F") }.should.raise(TypeError, "wrong argument type String (expected IO::Buffer)")
+      -> { buffer.send(@method, 0xF8) }.should.raise(TypeError, "wrong argument type Integer (expected IO::Buffer)")
+      -> { buffer.send(@method, nil) }.should.raise(TypeError, "wrong argument type nil (expected IO::Buffer)")
+    end
+  end
+end
+
+describe "IO::Buffer#|" do
+  it_behaves_like :io_buffer_or, :|
+
+  it "creates a new internal buffer of the same size" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer | mask
+        result.should_not.equal? buffer
+        result.should.internal?
+        result.size.should == buffer.size
+        result.free
+        buffer.get_string.should == "12345".b
+      end
+    end
+  end
+end
+
+describe "IO::Buffer#or!" do
+  it_behaves_like :io_buffer_or, :or!
+
+  it "modifies the buffer in place" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer.or!(mask)
+        result.should.equal? buffer
+        result.should.external?
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/io/buffer/private_spec.rb b/spec/ruby/core/io/buffer/private_spec.rb
index 86b7a7a0d0b..6e6afee34ca 100644
--- a/spec/ruby/core/io/buffer/private_spec.rb
+++ b/spec/ruby/core/io/buffer/private_spec.rb
@@ -8,16 +8,16 @@
 
   it "is true for a buffer created with PRIVATE flag" do
     @buffer = IO::Buffer.new(12, IO::Buffer::INTERNAL | IO::Buffer::PRIVATE)
-    @buffer.private?.should be_true
+    @buffer.private?.should == true
   end
 
   it "is false for a buffer created without PRIVATE flag" do
     @buffer = IO::Buffer.new(12, IO::Buffer::INTERNAL)
-    @buffer.private?.should be_false
+    @buffer.private?.should == false
   end
 
   it "is false for a null buffer" do
     @buffer = IO::Buffer.new(0)
-    @buffer.private?.should be_false
+    @buffer.private?.should == false
   end
 end
diff --git a/spec/ruby/core/io/buffer/readonly_spec.rb b/spec/ruby/core/io/buffer/readonly_spec.rb
index 2fc7d340b77..4eefc9f29fa 100644
--- a/spec/ruby/core/io/buffer/readonly_spec.rb
+++ b/spec/ruby/core/io/buffer/readonly_spec.rb
@@ -8,21 +8,21 @@
 
   it "is true for a buffer created with READONLY flag" do
     @buffer = IO::Buffer.new(12, IO::Buffer::INTERNAL | IO::Buffer::READONLY)
-    @buffer.readonly?.should be_true
+    @buffer.readonly?.should == true
   end
 
   it "is true for a buffer that is non-writable" do
     @buffer = IO::Buffer.for("string")
-    @buffer.readonly?.should be_true
+    @buffer.readonly?.should == true
   end
 
   it "is false for a modifiable buffer" do
     @buffer = IO::Buffer.new(12)
-    @buffer.readonly?.should be_false
+    @buffer.readonly?.should == false
   end
 
   it "is false for a null buffer" do
     @buffer = IO::Buffer.new(0)
-    @buffer.readonly?.should be_false
+    @buffer.readonly?.should == false
   end
 end
diff --git a/spec/ruby/core/io/buffer/resize_spec.rb b/spec/ruby/core/io/buffer/resize_spec.rb
index a5e80439dac..6e684475f34 100644
--- a/spec/ruby/core/io/buffer/resize_spec.rb
+++ b/spec/ruby/core/io/buffer/resize_spec.rb
@@ -11,8 +11,8 @@
       @buffer = IO::Buffer.new(4)
       @buffer.resize(IO::Buffer::PAGE_SIZE)
       @buffer.size.should == IO::Buffer::PAGE_SIZE
-      @buffer.internal?.should be_true
-      @buffer.mapped?.should be_false
+      @buffer.internal?.should == true
+      @buffer.mapped?.should == false
     end
 
     platform_is :linux do
@@ -20,8 +20,8 @@
         @buffer = IO::Buffer.new(IO::Buffer::PAGE_SIZE, IO::Buffer::MAPPED)
         @buffer.resize(4)
         @buffer.size.should == 4
-        @buffer.internal?.should be_false
-        @buffer.mapped?.should be_true
+        @buffer.internal?.should == false
+        @buffer.mapped?.should == true
       end
     end
 
@@ -30,8 +30,8 @@
         @buffer = IO::Buffer.new(IO::Buffer::PAGE_SIZE, IO::Buffer::MAPPED)
         @buffer.resize(4)
         @buffer.size.should == 4
-        @buffer.internal?.should be_true
-        @buffer.mapped?.should be_false
+        @buffer.internal?.should == true
+        @buffer.mapped?.should == false
       end
     end
   end
@@ -40,7 +40,7 @@
     it "disallows resizing shared buffer, raising IO::Buffer::AccessError" do
       File.open(__FILE__, "r+") do |file|
         @buffer = IO::Buffer.map(file)
-        -> { @buffer.resize(10) }.should raise_error(IO::Buffer::AccessError, "Cannot resize external buffer!")
+        -> { @buffer.resize(10) }.should.raise(IO::Buffer::AccessError, "Cannot resize external buffer!")
       end
     end
 
@@ -61,14 +61,14 @@
     context "without a block" do
       it "disallows resizing, raising IO::Buffer::AccessError" do
         @buffer = IO::Buffer.for(+"test")
-        -> { @buffer.resize(10) }.should raise_error(IO::Buffer::AccessError, "Cannot resize external buffer!")
+        -> { @buffer.resize(10) }.should.raise(IO::Buffer::AccessError, "Cannot resize external buffer!")
       end
     end
 
     context "with a block" do
       it "disallows resizing, raising IO::Buffer::AccessError" do
         IO::Buffer.for(+'test') do |buffer|
-          -> { buffer.resize(10) }.should raise_error(IO::Buffer::AccessError, "Cannot resize external buffer!")
+          -> { buffer.resize(10) }.should.raise(IO::Buffer::AccessError, "Cannot resize external buffer!")
         end
       end
     end
@@ -77,7 +77,7 @@
   context "with a String-backed buffer created with .string" do
     it "disallows resizing, raising IO::Buffer::AccessError" do
       IO::Buffer.string(4) do |buffer|
-        -> { buffer.resize(10) }.should raise_error(IO::Buffer::AccessError, "Cannot resize external buffer!")
+        -> { buffer.resize(10) }.should.raise(IO::Buffer::AccessError, "Cannot resize external buffer!")
       end
     end
   end
@@ -87,8 +87,8 @@
       @buffer = IO::Buffer.new(0)
       @buffer.resize(IO::Buffer::PAGE_SIZE)
       @buffer.size.should == IO::Buffer::PAGE_SIZE
-      @buffer.internal?.should be_false
-      @buffer.mapped?.should be_true
+      @buffer.internal?.should == false
+      @buffer.mapped?.should == true
     end
 
     it "allows resizing after a free, creating a regular buffer according to new size" do
@@ -96,15 +96,15 @@
       @buffer.free
       @buffer.resize(10)
       @buffer.size.should == 10
-      @buffer.internal?.should be_true
-      @buffer.mapped?.should be_false
+      @buffer.internal?.should == true
+      @buffer.mapped?.should == false
     end
   end
 
   it "allows resizing to 0, freeing memory" do
     @buffer = IO::Buffer.new(4)
     @buffer.resize(0)
-    @buffer.null?.should be_true
+    @buffer.null?.should == true
   end
 
   it "can be called repeatedly" do
@@ -128,19 +128,19 @@
   it "is disallowed while locked, raising IO::Buffer::LockedError" do
     @buffer = IO::Buffer.new(4)
     @buffer.locked do
-      -> { @buffer.resize(10) }.should raise_error(IO::Buffer::LockedError, "Cannot resize locked buffer!")
+      -> { @buffer.resize(10) }.should.raise(IO::Buffer::LockedError, "Cannot resize locked buffer!")
     end
   end
 
   it "raises ArgumentError if size is negative" do
     @buffer = IO::Buffer.new(4)
-    -> { @buffer.resize(-1) }.should raise_error(ArgumentError, "Size can't be negative!")
+    -> { @buffer.resize(-1) }.should.raise(ArgumentError, "Size can't be negative!")
   end
 
   it "raises TypeError if size is not an Integer" do
     @buffer = IO::Buffer.new(4)
-    -> { @buffer.resize(nil) }.should raise_error(TypeError, "not an Integer")
-    -> { @buffer.resize(10.0) }.should raise_error(TypeError, "not an Integer")
+    -> { @buffer.resize(nil) }.should.raise(TypeError, "not an Integer")
+    -> { @buffer.resize(10.0) }.should.raise(TypeError, "not an Integer")
   end
 
   context "with a slice of a buffer" do
diff --git a/spec/ruby/core/io/buffer/shared/null_and_empty.rb b/spec/ruby/core/io/buffer/shared/null_and_empty.rb
index 2ff5cf8f410..f8abc5f0fcf 100644
--- a/spec/ruby/core/io/buffer/shared/null_and_empty.rb
+++ b/spec/ruby/core/io/buffer/shared/null_and_empty.rb
@@ -1,57 +1,57 @@
 describe :io_buffer_null_and_empty, shared: true do
   it "is false for a buffer with size > 0" do
     @buffer = IO::Buffer.new(1)
-    @buffer.send(@method).should be_false
+    @buffer.send(@method).should == false
   end
 
   it "is false for a slice with length > 0" do
     @buffer = IO::Buffer.new(4)
-    @buffer.slice(1, 2).send(@method).should be_false
+    @buffer.slice(1, 2).send(@method).should == false
   end
 
   it "is false for a file-mapped buffer" do
     File.open(__FILE__, "rb") do |file|
       @buffer = IO::Buffer.map(file, nil, 0, IO::Buffer::READONLY)
-      @buffer.send(@method).should be_false
+      @buffer.send(@method).should == false
     end
   end
 
   it "is false for a non-empty String-backed buffer created with .for" do
     @buffer = IO::Buffer.for("test")
-    @buffer.send(@method).should be_false
+    @buffer.send(@method).should == false
   end
 
   it "is false for a non-empty String-backed buffer created with .string" do
     IO::Buffer.string(4) do |buffer|
-      buffer.send(@method).should be_false
+      buffer.send(@method).should == false
     end
   end
 
   it "is true for a 0-sized buffer" do
     @buffer = IO::Buffer.new(0)
-    @buffer.send(@method).should be_true
+    @buffer.send(@method).should == true
   end
 
   it "is true for a slice of a 0-sized buffer" do
     @buffer = IO::Buffer.new(0)
-    @buffer.slice(0, 0).send(@method).should be_true
+    @buffer.slice(0, 0).send(@method).should == true
   end
 
   it "is true for a freed buffer" do
     @buffer = IO::Buffer.new(1)
     @buffer.free
-    @buffer.send(@method).should be_true
+    @buffer.send(@method).should == true
   end
 
   it "is true for a buffer resized to 0" do
     @buffer = IO::Buffer.new(1)
     @buffer.resize(0)
-    @buffer.send(@method).should be_true
+    @buffer.send(@method).should == true
   end
 
   it "is true for a buffer whose memory was transferred" do
     buffer = IO::Buffer.new(1)
     @buffer = buffer.transfer
-    buffer.send(@method).should be_true
+    buffer.send(@method).should == true
   end
 end
diff --git a/spec/ruby/core/io/buffer/shared_spec.rb b/spec/ruby/core/io/buffer/shared_spec.rb
index 4f3bce5448f..daaa66c5ad8 100644
--- a/spec/ruby/core/io/buffer/shared_spec.rb
+++ b/spec/ruby/core/io/buffer/shared_spec.rb
@@ -8,23 +8,28 @@
 
   it "is true for a buffer created with SHARED flag" do
     @buffer = IO::Buffer.new(12, IO::Buffer::INTERNAL | IO::Buffer::SHARED)
-    @buffer.shared?.should be_true
+    @buffer.shared?.should == true
   end
 
   it "is true for a non-private buffer created with .map" do
-    file = File.open("#{__dir__}/../fixtures/read_text.txt", "r+")
+    path = tmp("read_text.txt")
+    File.copy_stream(fixture(__dir__, "read_text.txt"), path)
+    file = File.open(path, "r+")
     @buffer = IO::Buffer.map(file)
+    @buffer.shared?.should == true
+  ensure
+    @buffer.free
     file.close
-    @buffer.shared?.should be_true
+    File.unlink(path)
   end
 
   it "is false for an unshared buffer" do
     @buffer = IO::Buffer.new(12)
-    @buffer.shared?.should be_false
+    @buffer.shared?.should == false
   end
 
   it "is false for a null buffer" do
     @buffer = IO::Buffer.new(0)
-    @buffer.shared?.should be_false
+    @buffer.shared?.should == false
   end
 end
diff --git a/spec/ruby/core/io/buffer/string_spec.rb b/spec/ruby/core/io/buffer/string_spec.rb
index bc7a73075e3..4c73ba5e1e8 100644
--- a/spec/ruby/core/io/buffer/string_spec.rb
+++ b/spec/ruby/core/io/buffer/string_spec.rb
@@ -49,14 +49,14 @@
   end
 
   it "raises ArgumentError if size is negative" do
-    -> { IO::Buffer.string(-1) {} }.should raise_error(ArgumentError, "negative string size (or size too big)")
+    -> { IO::Buffer.string(-1) {} }.should.raise(ArgumentError, "negative string size (or size too big)")
   end
 
   it "raises RangeError if size is too large" do
-    -> { IO::Buffer.string(2 ** 232) {} }.should raise_error(RangeError, /\Abignum too big to convert into [`']long'\z/)
+    -> { IO::Buffer.string(2 ** 232) {} }.should.raise(RangeError, /\Abignum too big to convert into [`']long'\z/)
   end
 
   it "raises LocalJumpError if no block is given" do
-    -> { IO::Buffer.string(7) }.should raise_error(LocalJumpError, "no block given")
+    -> { IO::Buffer.string(7) }.should.raise(LocalJumpError, "no block given")
   end
 end
diff --git a/spec/ruby/core/io/buffer/transfer_spec.rb b/spec/ruby/core/io/buffer/transfer_spec.rb
index 5b7b63e3339..02e029016ad 100644
--- a/spec/ruby/core/io/buffer/transfer_spec.rb
+++ b/spec/ruby/core/io/buffer/transfer_spec.rb
@@ -12,7 +12,7 @@
       info = buffer.to_s
       @buffer = buffer.transfer
       @buffer.to_s.should == info
-      buffer.null?.should be_true
+      buffer.null?.should == true
     end
 
     it "transfers mapped memory to a new buffer, nullifying the original" do
@@ -20,7 +20,7 @@
       info = buffer.to_s
       @buffer = buffer.transfer
       @buffer.to_s.should == info
-      buffer.null?.should be_true
+      buffer.null?.should == true
     end
   end
 
@@ -31,7 +31,7 @@
         info = buffer.to_s
         @buffer = buffer.transfer
         @buffer.to_s.should == info
-        buffer.null?.should be_true
+        buffer.null?.should == true
       end
     end
   end
@@ -43,7 +43,7 @@
         info = buffer.to_s
         @buffer = buffer.transfer
         @buffer.to_s.should == info
-        buffer.null?.should be_true
+        buffer.null?.should == true
       end
     end
 
@@ -53,9 +53,9 @@
           info = buffer.to_s
           @buffer = buffer.transfer
           @buffer.to_s.should == info
-          buffer.null?.should be_true
+          buffer.null?.should == true
         end
-        @buffer.null?.should be_false
+        @buffer.null?.should == false
       end
     end
   end
@@ -66,9 +66,9 @@
         info = buffer.to_s
         @buffer = buffer.transfer
         @buffer.to_s.should == info
-        buffer.null?.should be_true
+        buffer.null?.should == true
       end
-      @buffer.null?.should be_false
+      @buffer.null?.should == false
     end
   end
 
@@ -76,15 +76,15 @@
     buffer_1 = IO::Buffer.new(4)
     buffer_2 = buffer_1.transfer
     @buffer = buffer_2.transfer
-    buffer_1.null?.should be_true
-    buffer_2.null?.should be_true
-    @buffer.null?.should be_false
+    buffer_1.null?.should == true
+    buffer_2.null?.should == true
+    @buffer.null?.should == false
   end
 
   it "is disallowed while locked, raising IO::Buffer::LockedError" do
     @buffer = IO::Buffer.new(4)
     @buffer.locked do
-      -> { @buffer.transfer }.should raise_error(IO::Buffer::LockedError, "Cannot transfer ownership of locked buffer!")
+      -> { @buffer.transfer }.should.raise(IO::Buffer::LockedError, "Cannot transfer ownership of locked buffer!")
     end
   end
 
@@ -95,9 +95,9 @@
       @buffer.set_string("test")
 
       new_slice = slice.transfer
-      slice.null?.should be_true
-      new_slice.null?.should be_false
-      @buffer.null?.should be_false
+      slice.null?.should == true
+      new_slice.null?.should == false
+      @buffer.null?.should == false
 
       new_slice.set_string("ea")
       @buffer.get_string.should == "east"
@@ -108,9 +108,9 @@
       slice = buffer.slice(0, 2)
       @buffer = buffer.transfer
 
-      slice.null?.should be_false
-      slice.valid?.should be_false
-      -> { slice.get_string }.should raise_error(IO::Buffer::InvalidatedError, "Buffer has been invalidated!")
+      slice.null?.should == false
+      slice.valid?.should == false
+      -> { slice.get_string }.should.raise(IO::Buffer::InvalidatedError, "Buffer has been invalidated!")
     end
   end
 end
diff --git a/spec/ruby/core/io/buffer/valid_spec.rb b/spec/ruby/core/io/buffer/valid_spec.rb
index 680a35ae9ad..0a401728696 100644
--- a/spec/ruby/core/io/buffer/valid_spec.rb
+++ b/spec/ruby/core/io/buffer/valid_spec.rb
@@ -10,34 +10,34 @@
   context "with a non-slice buffer" do
     it "is true for a regular buffer" do
       @buffer = IO::Buffer.new(4)
-      @buffer.valid?.should be_true
+      @buffer.valid?.should == true
     end
 
     it "is true for a 0-size buffer" do
       @buffer = IO::Buffer.new(0)
-      @buffer.valid?.should be_true
+      @buffer.valid?.should == true
     end
 
     it "is true for a freed buffer" do
       @buffer = IO::Buffer.new(4)
       @buffer.free
-      @buffer.valid?.should be_true
+      @buffer.valid?.should == true
     end
 
     it "is true for a freed file-backed buffer" do
       File.open(__FILE__, "r") do |file|
         @buffer = IO::Buffer.map(file, nil, 0, IO::Buffer::READONLY)
-        @buffer.valid?.should be_true
+        @buffer.valid?.should == true
         @buffer.free
-        @buffer.valid?.should be_true
+        @buffer.valid?.should == true
       end
     end
 
     it "is true for a freed string-backed buffer" do
       @buffer = IO::Buffer.for("hello")
-      @buffer.valid?.should be_true
+      @buffer.valid?.should == true
       @buffer.free
-      @buffer.valid?.should be_true
+      @buffer.valid?.should == true
     end
   end
 
@@ -47,7 +47,7 @@
     it "is true for a slice of a live buffer" do
       @buffer = IO::Buffer.new(4)
       slice = @buffer.slice(0, 2)
-      slice.valid?.should be_true
+      slice.valid?.should == true
     end
 
     context "when buffer is resized" do
@@ -55,7 +55,7 @@
         @buffer = IO::Buffer.new(4)
         slice = @buffer.slice(2, 2)
         @buffer.resize(3)
-        slice.valid?.should be_false
+        slice.valid?.should == false
       end
 
       platform_is_not :linux do
@@ -65,7 +65,7 @@
           @buffer = IO::Buffer.new(4, IO::Buffer::MAPPED)
           slice = @buffer.slice(0, 2)
           @buffer.resize(8)
-          slice.valid?.should be_false
+          slice.valid?.should == false
         end
       end
     end
@@ -74,32 +74,32 @@
       buffer = IO::Buffer.new(4)
       slice = buffer.slice(0, 2)
       @buffer = buffer.transfer
-      slice.valid?.should be_false
+      slice.valid?.should == false
     end
 
     it "is false for a slice of a freed buffer" do
       @buffer = IO::Buffer.new(4)
       slice = @buffer.slice(0, 2)
       @buffer.free
-      slice.valid?.should be_false
+      slice.valid?.should == false
     end
 
     it "is false for a slice of a freed file-backed buffer" do
       File.open(__FILE__, "r") do |file|
         @buffer = IO::Buffer.map(file, nil, 0, IO::Buffer::READONLY)
         slice = @buffer.slice(0, 2)
-        slice.valid?.should be_true
+        slice.valid?.should == true
         @buffer.free
-        slice.valid?.should be_false
+        slice.valid?.should == false
       end
     end
 
     it "is true for a slice of a freed string-backed buffer while string is alive" do
       @buffer = IO::Buffer.for("alive")
       slice = @buffer.slice(0, 2)
-      slice.valid?.should be_true
+      slice.valid?.should == true
       @buffer.free
-      slice.valid?.should be_true
+      slice.valid?.should == true
     end
 
     # There probably should be a test with a garbage-collected string,
diff --git a/spec/ruby/core/io/buffer/xor_spec.rb b/spec/ruby/core/io/buffer/xor_spec.rb
new file mode 100644
index 00000000000..9287611f7fc
--- /dev/null
+++ b/spec/ruby/core/io/buffer/xor_spec.rb
@@ -0,0 +1,62 @@
+require_relative '../../../spec_helper'
+
+describe :io_buffer_xor, shared: true do
+  it "applies the argument buffer as an XOR bit mask across the whole buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer.send(@method, mask)
+        result.get_string.should == "\xC9\xBD\xCB\xBB\xCD".b
+        result.free
+      end
+    end
+  end
+
+  it "ignores extra parts of mask if it is longer than source buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F\x00\x00\x00\xFF\xFF") do |mask|
+        result = buffer.send(@method, mask)
+        result.get_string.should == "\xC9\xBD345".b
+        result.free
+      end
+    end
+  end
+
+  it "raises TypeError if mask is not an IO::Buffer" do
+    IO::Buffer.for(+"12345") do |buffer|
+      -> { buffer.send(@method, "\xF8\x8F") }.should.raise(TypeError, "wrong argument type String (expected IO::Buffer)")
+      -> { buffer.send(@method, 0xF8) }.should.raise(TypeError, "wrong argument type Integer (expected IO::Buffer)")
+      -> { buffer.send(@method, nil) }.should.raise(TypeError, "wrong argument type nil (expected IO::Buffer)")
+    end
+  end
+end
+
+describe "IO::Buffer#^" do
+  it_behaves_like :io_buffer_xor, :^
+
+  it "creates a new internal buffer of the same size" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer ^ mask
+        result.should_not.equal? buffer
+        result.should.internal?
+        result.size.should == buffer.size
+        result.free
+        buffer.get_string.should == "12345".b
+      end
+    end
+  end
+end
+
+describe "IO::Buffer#xor!" do
+  it_behaves_like :io_buffer_xor, :xor!
+
+  it "modifies the buffer in place" do
+    IO::Buffer.for(+"12345") do |buffer|
+      IO::Buffer.for(+"\xF8\x8F") do |mask|
+        result = buffer.xor!(mask)
+        result.should.equal? buffer
+        result.should.external?
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/io/close_on_exec_spec.rb b/spec/ruby/core/io/close_on_exec_spec.rb
index 4e89e08d61c..28cdb967b92 100644
--- a/spec/ruby/core/io/close_on_exec_spec.rb
+++ b/spec/ruby/core/io/close_on_exec_spec.rb
@@ -42,7 +42,7 @@
 
     it "raises IOError if called on a closed IO" do
       @io.close
-      -> { @io.close_on_exec = true }.should raise_error(IOError)
+      -> { @io.close_on_exec = true }.should.raise(IOError)
     end
   end
 end
@@ -70,7 +70,7 @@
 
     it "raises IOError if called on a closed IO" do
       @io.close
-      -> { @io.close_on_exec? }.should raise_error(IOError)
+      -> { @io.close_on_exec? }.should.raise(IOError)
     end
   end
 end
diff --git a/spec/ruby/core/io/close_read_spec.rb b/spec/ruby/core/io/close_read_spec.rb
index e700e85bd99..c505289d72d 100644
--- a/spec/ruby/core/io/close_read_spec.rb
+++ b/spec/ruby/core/io/close_read_spec.rb
@@ -17,26 +17,26 @@
   it "closes the read end of a duplex I/O stream" do
     @io.close_read
 
-    -> { @io.read }.should raise_error(IOError)
+    -> { @io.read }.should.raise(IOError)
   end
 
   it "does nothing on subsequent invocations" do
     @io.close_read
 
-    @io.close_read.should be_nil
+    @io.close_read.should == nil
   end
 
   it "allows subsequent invocation of close" do
     @io.close_read
 
-    -> { @io.close }.should_not raise_error
+    -> { @io.close }.should_not.raise
   end
 
   it "raises an IOError if the stream is writable and not duplexed" do
     io = File.open @path, 'w'
 
     begin
-      -> { io.close_read }.should raise_error(IOError)
+      -> { io.close_read }.should.raise(IOError)
     ensure
       io.close unless io.closed?
     end
@@ -56,6 +56,6 @@
   it "does nothing on closed stream" do
     @io.close
 
-    @io.close_read.should be_nil
+    @io.close_read.should == nil
   end
 end
diff --git a/spec/ruby/core/io/close_spec.rb b/spec/ruby/core/io/close_spec.rb
index 3a44cc8b17f..afd84ba101b 100644
--- a/spec/ruby/core/io/close_spec.rb
+++ b/spec/ruby/core/io/close_spec.rb
@@ -23,25 +23,25 @@
 
   it "raises an IOError reading from a closed IO" do
     @io.close
-    -> { @io.read }.should raise_error(IOError)
+    -> { @io.read }.should.raise(IOError)
   end
 
   it "raises an IOError writing to a closed IO" do
     @io.close
-    -> { @io.write "data" }.should raise_error(IOError)
+    -> { @io.write "data" }.should.raise(IOError)
   end
 
   it 'does not close the stream if autoclose is false' do
     other_io = IO.new(@io.fileno)
     other_io.autoclose = false
     other_io.close
-    -> { @io.write "data" }.should_not raise_error(IOError)
+    -> { @io.write "data" }.should_not.raise(IOError)
   end
 
   it "does nothing if already closed" do
     @io.close
 
-    @io.close.should be_nil
+    @io.close.should == nil
   end
 
   it "does not call the #flush method but flushes the stream internally" do
@@ -80,7 +80,7 @@
 
         matching_exception&.tap {|ex| raise ex}
       end
-    end.should raise_error(IOError, IOSpecs::THREAD_CLOSE_ERROR_MESSAGE)
+    end.should.raise(IOError, IOSpecs::THREAD_CLOSE_ERROR_MESSAGE)
   end
 end
 
@@ -93,7 +93,7 @@
 
     io.close
 
-    -> { io.pid }.should raise_error(IOError)
+    -> { io.pid }.should.raise(IOError)
   end
 
   it "sets $?" do
diff --git a/spec/ruby/core/io/close_write_spec.rb b/spec/ruby/core/io/close_write_spec.rb
index 70610a3e9d6..60b41505c3f 100644
--- a/spec/ruby/core/io/close_write_spec.rb
+++ b/spec/ruby/core/io/close_write_spec.rb
@@ -16,26 +16,26 @@
   it "closes the write end of a duplex I/O stream" do
     @io.close_write
 
-    -> { @io.write "attempt to write" }.should raise_error(IOError)
+    -> { @io.write "attempt to write" }.should.raise(IOError)
   end
 
   it "does nothing on subsequent invocations" do
     @io.close_write
 
-    @io.close_write.should be_nil
+    @io.close_write.should == nil
   end
 
   it "allows subsequent invocation of close" do
     @io.close_write
 
-    -> { @io.close }.should_not raise_error
+    -> { @io.close }.should_not.raise
   end
 
   it "raises an IOError if the stream is readable and not duplexed" do
     io = File.open @path, 'w+'
 
     begin
-      -> { io.close_write }.should raise_error(IOError)
+      -> { io.close_write }.should.raise(IOError)
     ensure
       io.close unless io.closed?
     end
@@ -63,6 +63,6 @@
   it "does nothing on closed stream" do
     @io.close
 
-    @io.close_write.should be_nil
+    @io.close_write.should == nil
   end
 end
diff --git a/spec/ruby/core/io/closed_spec.rb b/spec/ruby/core/io/closed_spec.rb
index 7316546a0dd..1f10858e288 100644
--- a/spec/ruby/core/io/closed_spec.rb
+++ b/spec/ruby/core/io/closed_spec.rb
@@ -11,10 +11,10 @@
   end
 
   it "returns true on closed stream" do
-    IOSpecs.closed_io.closed?.should be_true
+    IOSpecs.closed_io.closed?.should == true
   end
 
   it "returns false on open stream" do
-    @io.closed?.should be_false
+    @io.closed?.should == false
   end
 end
diff --git a/spec/ruby/core/io/copy_stream_spec.rb b/spec/ruby/core/io/copy_stream_spec.rb
index ffa2ea992ce..31383f9b0f1 100644
--- a/spec/ruby/core/io/copy_stream_spec.rb
+++ b/spec/ruby/core/io/copy_stream_spec.rb
@@ -31,7 +31,7 @@
     obj = mock("io_copy_stream_to")
     obj.should_receive(:to_path).and_return(1)
 
-    -> { IO.copy_stream(@object.from, obj) }.should raise_error(TypeError)
+    -> { IO.copy_stream(@object.from, obj) }.should.raise(TypeError)
   end
 end
 
@@ -71,7 +71,7 @@
   it "raises an IOError if the destination IO is not open for writing" do
     to_io = new_io __FILE__, "r"
     begin
-      -> { IO.copy_stream @object.from, to_io }.should raise_error(IOError)
+      -> { IO.copy_stream @object.from, to_io }.should.raise(IOError)
     ensure
       to_io.close
     end
@@ -79,7 +79,7 @@
 
   it "does not close the destination IO" do
     IO.copy_stream(@object.from, @to_io)
-    @to_io.closed?.should be_false
+    @to_io.closed?.should == false
   end
 
   it "copies only length bytes when specified" do
@@ -129,12 +129,12 @@
     it "raises an IOError if the source IO is not open for reading" do
       @from_io.close
       @from_io = new_io @from_bigfile, "a"
-      -> { IO.copy_stream @from_io, @to_name }.should raise_error(IOError)
+      -> { IO.copy_stream @from_io, @to_name }.should.raise(IOError)
     end
 
     it "does not close the source IO" do
       IO.copy_stream(@from_io, @to_name)
-      @from_io.closed?.should be_false
+      @from_io.closed?.should == false
     end
 
     platform_is_not :windows do
@@ -206,7 +206,7 @@
       obj = mock("io_copy_stream_from")
       obj.should_receive(:to_path).and_return(1)
 
-      -> { IO.copy_stream(obj, @to_name) }.should raise_error(TypeError)
+      -> { IO.copy_stream(obj, @to_name) }.should.raise(TypeError)
     end
 
     describe "to a file name" do
@@ -240,12 +240,12 @@
 
     it "does not close the source IO" do
       IO.copy_stream(@from_io, @to_name)
-      @from_io.closed?.should be_false
+      @from_io.closed?.should == false
     end
 
     platform_is_not :windows do
       it "raises an error when an offset is specified" do
-        -> { IO.copy_stream(@from_io, @to_name, 8, 4) }.should raise_error(Errno::ESPIPE)
+        -> { IO.copy_stream(@from_io, @to_name, 8, 4) }.should.raise(Errno::ESPIPE)
       end
     end
 
@@ -300,6 +300,14 @@
       @io.should_not_receive(:pos)
       IO.copy_stream(@io, @to_name)
     end
+
+    it "does not call #read on the source or #write on the destination if zero length is given" do
+      from = mock("io_copy_stream_to_object_zero_length_read")
+      to = mock("io_copy_stream_to_object_zero_length_write")
+      from.should_not_receive(:read)
+      to.should_not_receive(:write)
+      IO.copy_stream(from, to, 0)
+    end
   end
 
   describe "with a destination that does partial reads" do
diff --git a/spec/ruby/core/io/dup_spec.rb b/spec/ruby/core/io/dup_spec.rb
index 564e0074387..db4e9fe6413 100644
--- a/spec/ruby/core/io/dup_spec.rb
+++ b/spec/ruby/core/io/dup_spec.rb
@@ -49,7 +49,7 @@
 
   it "allows closing the new IO without affecting the original" do
     @i.close
-    -> { @f.gets }.should_not raise_error(Exception)
+    -> { @f.gets }.should_not.raise(Exception)
 
     @i.should.closed?
     @f.should_not.closed?
@@ -57,14 +57,14 @@
 
   it "allows closing the original IO without affecting the new one" do
     @f.close
-    -> { @i.gets }.should_not raise_error(Exception)
+    -> { @i.gets }.should_not.raise(Exception)
 
     @i.should_not.closed?
     @f.should.closed?
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.dup }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.dup }.should.raise(IOError)
   end
 
   it "always sets the close-on-exec flag for the new IO object" do
diff --git a/spec/ruby/core/io/each_byte_spec.rb b/spec/ruby/core/io/each_byte_spec.rb
index ea618e8c0cd..fe299f0fba6 100644
--- a/spec/ruby/core/io/each_byte_spec.rb
+++ b/spec/ruby/core/io/each_byte_spec.rb
@@ -12,7 +12,7 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.each_byte {} }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.each_byte {} }.should.raise(IOError)
   end
 
   it "yields each byte" do
@@ -28,7 +28,7 @@
   describe "when no block is given" do
     it "returns an Enumerator" do
       enum = @io.each_byte
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
       enum.first(5).should == [86, 111, 105, 99, 105]
     end
 
@@ -52,6 +52,6 @@
   end
 
   it "returns self on an empty stream" do
-    @io.each_byte { |b| }.should equal(@io)
+    @io.each_byte { |b| }.should.equal?(@io)
   end
 end
diff --git a/spec/ruby/core/io/each_codepoint_spec.rb b/spec/ruby/core/io/each_codepoint_spec.rb
index 07a4037c8a7..26cc87fc0e4 100644
--- a/spec/ruby/core/io/each_codepoint_spec.rb
+++ b/spec/ruby/core/io/each_codepoint_spec.rb
@@ -24,7 +24,7 @@
   end
 
   it "returns self" do
-    @io.each_codepoint { |l| l }.should equal(@io)
+    @io.each_codepoint { |l| l }.should.equal?(@io)
   end
 end
 
@@ -38,6 +38,6 @@
   end
 
   it "raises an exception at incomplete character before EOF when conversion takes place" do
-    -> { @io.each_codepoint {} }.should raise_error(ArgumentError)
+    -> { @io.each_codepoint {} }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/io/eof_spec.rb b/spec/ruby/core/io/eof_spec.rb
index b4850df437e..c8955abde0e 100644
--- a/spec/ruby/core/io/eof_spec.rb
+++ b/spec/ruby/core/io/eof_spec.rb
@@ -18,7 +18,7 @@
   it "raises IOError on stream not opened for reading" do
     -> do
       File.open(@name, "w") { |f| f.eof? }
-    end.should raise_error(IOError)
+    end.should.raise(IOError)
   end
 end
 
@@ -67,12 +67,12 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.eof? }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.eof? }.should.raise(IOError)
   end
 
   it "raises IOError on stream closed for reading by close_read" do
     @io.close_read
-    -> { @io.eof? }.should raise_error(IOError)
+    -> { @io.eof? }.should.raise(IOError)
   end
 
   it "returns true on one-byte stream after single-byte read" do
diff --git a/spec/ruby/core/io/external_encoding_spec.rb b/spec/ruby/core/io/external_encoding_spec.rb
index 7765c6c0f51..72d246cc2bd 100644
--- a/spec/ruby/core/io/external_encoding_spec.rb
+++ b/spec/ruby/core/io/external_encoding_spec.rb
@@ -10,19 +10,19 @@
     it "returns nil" do
       @io = new_io @name, @object
       Encoding.default_external = Encoding::IBM437
-      @io.external_encoding.should be_nil
+      @io.external_encoding.should == nil
     end
 
     it "returns the external encoding specified when the instance was created" do
       @io = new_io @name, "#{@object}:ibm866"
       Encoding.default_external = Encoding::IBM437
-      @io.external_encoding.should equal(Encoding::IBM866)
+      @io.external_encoding.should.equal?(Encoding::IBM866)
     end
 
     it "returns the encoding set by #set_encoding" do
       @io = new_io @name, "#{@object}:ibm866"
       @io.set_encoding Encoding::EUC_JP, nil
-      @io.external_encoding.should equal(Encoding::EUC_JP)
+      @io.external_encoding.should.equal?(Encoding::EUC_JP)
     end
   end
 
@@ -35,19 +35,19 @@
     it "returns the value of Encoding.default_external when the instance was created" do
       @io = new_io @name, @object
       Encoding.default_external = Encoding::UTF_8
-      @io.external_encoding.should equal(Encoding::IBM437)
+      @io.external_encoding.should.equal?(Encoding::IBM437)
     end
 
     it "returns the external encoding specified when the instance was created" do
       @io = new_io @name, "#{@object}:ibm866"
       Encoding.default_external = Encoding::IBM437
-      @io.external_encoding.should equal(Encoding::IBM866)
+      @io.external_encoding.should.equal?(Encoding::IBM866)
     end
 
     it "returns the encoding set by #set_encoding" do
       @io = new_io @name, "#{@object}:ibm866"
       @io.set_encoding Encoding::EUC_JP, nil
-      @io.external_encoding.should equal(Encoding::EUC_JP)
+      @io.external_encoding.should.equal?(Encoding::EUC_JP)
     end
   end
 
@@ -60,19 +60,19 @@
     it "returns the value of Encoding.default_external when the instance was created" do
       @io = new_io @name, @object
       Encoding.default_external = Encoding::UTF_8
-      @io.external_encoding.should equal(Encoding::IBM866)
+      @io.external_encoding.should.equal?(Encoding::IBM866)
     end
 
     it "returns the external encoding specified when the instance was created" do
       @io = new_io @name, "#{@object}:ibm866"
       Encoding.default_external = Encoding::IBM437
-      @io.external_encoding.should equal(Encoding::IBM866)
+      @io.external_encoding.should.equal?(Encoding::IBM866)
     end
 
     it "returns the encoding set by #set_encoding" do
       @io = new_io @name, "#{@object}:ibm866"
       @io.set_encoding Encoding::EUC_JP, nil
-      @io.external_encoding.should equal(Encoding::EUC_JP)
+      @io.external_encoding.should.equal?(Encoding::EUC_JP)
     end
   end
 end
@@ -97,7 +97,7 @@
   it "can be retrieved from a closed stream" do
     io = IOSpecs.io_fixture("lines.txt", "r")
     io.close
-    io.external_encoding.should equal(Encoding.default_external)
+    io.external_encoding.should.equal?(Encoding.default_external)
   end
 
   describe "with 'r' mode" do
@@ -109,25 +109,25 @@
 
       it "returns Encoding.default_external if the external encoding is not set" do
         @io = new_io @name, "r"
-        @io.external_encoding.should equal(Encoding::IBM866)
+        @io.external_encoding.should.equal?(Encoding::IBM866)
       end
 
       it "returns Encoding.default_external when that encoding is changed after the instance is created" do
         @io = new_io @name, "r"
         Encoding.default_external = Encoding::IBM437
-        @io.external_encoding.should equal(Encoding::IBM437)
+        @io.external_encoding.should.equal?(Encoding::IBM437)
       end
 
       it "returns the external encoding specified when the instance was created" do
         @io = new_io @name, "r:utf-8"
         Encoding.default_external = Encoding::IBM437
-        @io.external_encoding.should equal(Encoding::UTF_8)
+        @io.external_encoding.should.equal?(Encoding::UTF_8)
       end
 
       it "returns the encoding set by #set_encoding" do
         @io = new_io @name, "r:utf-8"
         @io.set_encoding Encoding::EUC_JP, nil
-        @io.external_encoding.should equal(Encoding::EUC_JP)
+        @io.external_encoding.should.equal?(Encoding::EUC_JP)
       end
     end
 
@@ -140,19 +140,19 @@
       it "returns the value of Encoding.default_external when the instance was created" do
         @io = new_io @name, "r"
         Encoding.default_external = Encoding::IBM437
-        @io.external_encoding.should equal(Encoding::IBM866)
+        @io.external_encoding.should.equal?(Encoding::IBM866)
       end
 
       it "returns the external encoding specified when the instance was created" do
         @io = new_io @name, "r:utf-8"
         Encoding.default_external = Encoding::IBM437
-        @io.external_encoding.should equal(Encoding::UTF_8)
+        @io.external_encoding.should.equal?(Encoding::UTF_8)
       end
 
       it "returns the encoding set by #set_encoding" do
         @io = new_io @name, "r:utf-8"
         @io.set_encoding Encoding::EUC_JP, nil
-        @io.external_encoding.should equal(Encoding::EUC_JP)
+        @io.external_encoding.should.equal?(Encoding::EUC_JP)
       end
     end
 
@@ -166,13 +166,13 @@
       it "returns the external encoding specified when the instance was created" do
         @io = new_io @name, "r:utf-8"
         Encoding.default_external = Encoding::IBM437
-        @io.external_encoding.should equal(Encoding::UTF_8)
+        @io.external_encoding.should.equal?(Encoding::UTF_8)
       end
 
       it "returns the encoding set by #set_encoding" do
         @io = new_io @name, "r:utf-8"
         @io.set_encoding Encoding::EUC_JP, nil
-        @io.external_encoding.should equal(Encoding::EUC_JP)
+        @io.external_encoding.should.equal?(Encoding::EUC_JP)
       end
     end
   end
@@ -180,12 +180,12 @@
   describe "with 'rb' mode" do
     it "returns Encoding::BINARY" do
       @io = new_io @name, "rb"
-      @io.external_encoding.should equal(Encoding::BINARY)
+      @io.external_encoding.should.equal?(Encoding::BINARY)
     end
 
     it "returns the external encoding specified by the mode argument" do
       @io = new_io @name, "rb:ibm437"
-      @io.external_encoding.should equal(Encoding::IBM437)
+      @io.external_encoding.should.equal?(Encoding::IBM437)
     end
   end
 
@@ -200,12 +200,12 @@
   describe "with 'wb' mode" do
     it "returns Encoding::BINARY" do
       @io = new_io @name, "wb"
-      @io.external_encoding.should equal(Encoding::BINARY)
+      @io.external_encoding.should.equal?(Encoding::BINARY)
     end
 
     it "returns the external encoding specified by the mode argument" do
       @io = new_io @name, "wb:ibm437"
-      @io.external_encoding.should equal(Encoding::IBM437)
+      @io.external_encoding.should.equal?(Encoding::IBM437)
     end
   end
 
diff --git a/spec/ruby/core/io/fcntl_spec.rb b/spec/ruby/core/io/fcntl_spec.rb
index 30b4876fe3e..be6d06c6721 100644
--- a/spec/ruby/core/io/fcntl_spec.rb
+++ b/spec/ruby/core/io/fcntl_spec.rb
@@ -3,6 +3,6 @@
 
 describe "IO#fcntl" do
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.fcntl(5, 5) }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.fcntl(5, 5) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/fileno_spec.rb b/spec/ruby/core/io/fileno_spec.rb
index 647609bf42e..22fd68d166f 100644
--- a/spec/ruby/core/io/fileno_spec.rb
+++ b/spec/ruby/core/io/fileno_spec.rb
@@ -7,6 +7,6 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.fileno }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.fileno }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/flush_spec.rb b/spec/ruby/core/io/flush_spec.rb
index f7d5ba77fce..4c3e8d12af7 100644
--- a/spec/ruby/core/io/flush_spec.rb
+++ b/spec/ruby/core/io/flush_spec.rb
@@ -3,7 +3,7 @@
 
 describe "IO#flush" do
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.flush }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.flush }.should.raise(IOError)
   end
 
   describe "on a pipe" do
@@ -29,8 +29,8 @@
         @w.write "foo"
         @r.close
 
-        -> { @w.flush }.should raise_error(Errno::EPIPE, /Broken pipe/)
-        -> { @w.close }.should raise_error(Errno::EPIPE, /Broken pipe/)
+        -> { @w.flush }.should.raise(Errno::EPIPE, /Broken pipe/)
+        -> { @w.close }.should.raise(Errno::EPIPE, /Broken pipe/)
       end
     end
   end
diff --git a/spec/ruby/core/io/foreach_spec.rb b/spec/ruby/core/io/foreach_spec.rb
index 28d6fef7ae5..015988f9fb1 100644
--- a/spec/ruby/core/io/foreach_spec.rb
+++ b/spec/ruby/core/io/foreach_spec.rb
@@ -73,12 +73,12 @@
   it "sets $_ to nil" do
     $_ = "test"
     IO.foreach(@name) { }
-    $_.should be_nil
+    $_.should == nil
   end
 
   describe "when no block is given" do
     it "returns an Enumerator" do
-      IO.foreach(@name).should be_an_instance_of(Enumerator)
+      IO.foreach(@name).should.instance_of?(Enumerator)
       IO.foreach(@name).to_a.should == IOSpecs.lines
     end
 
diff --git a/spec/ruby/core/io/fsync_spec.rb b/spec/ruby/core/io/fsync_spec.rb
index 6e6123de94d..0317cbc8055 100644
--- a/spec/ruby/core/io/fsync_spec.rb
+++ b/spec/ruby/core/io/fsync_spec.rb
@@ -12,7 +12,7 @@
   end
 
   it "raises an IOError on closed stream" do
-    -> { IOSpecs.closed_io.fsync }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.fsync }.should.raise(IOError)
   end
 
   it "writes the buffered data to permanent storage" do
diff --git a/spec/ruby/core/io/getbyte_spec.rb b/spec/ruby/core/io/getbyte_spec.rb
index b4351160e6b..668d81519c4 100644
--- a/spec/ruby/core/io/getbyte_spec.rb
+++ b/spec/ruby/core/io/getbyte_spec.rb
@@ -23,7 +23,7 @@
   end
 
   it "raises an IOError on closed stream" do
-    -> { IOSpecs.closed_io.getbyte }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.getbyte }.should.raise(IOError)
   end
 end
 
@@ -53,6 +53,6 @@
   end
 
   it "raises an IOError if the stream is not readable" do
-    -> { @io.getbyte }.should raise_error(IOError)
+    -> { @io.getbyte }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/getc_spec.rb b/spec/ruby/core/io/getc_spec.rb
index 3949b5cb284..3be86203c01 100644
--- a/spec/ruby/core/io/getc_spec.rb
+++ b/spec/ruby/core/io/getc_spec.rb
@@ -19,11 +19,11 @@
 
   it "returns nil when invoked at the end of the stream" do
     @io.read
-    @io.getc.should be_nil
+    @io.getc.should == nil
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.getc }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.getc }.should.raise(IOError)
   end
 end
 
@@ -37,6 +37,6 @@
   end
 
   it "returns nil on empty stream" do
-    @io.getc.should be_nil
+    @io.getc.should == nil
   end
 end
diff --git a/spec/ruby/core/io/gets_spec.rb b/spec/ruby/core/io/gets_spec.rb
index 0587fa07c43..ce3ee73b944 100644
--- a/spec/ruby/core/io/gets_spec.rb
+++ b/spec/ruby/core/io/gets_spec.rb
@@ -27,7 +27,7 @@
   it "sets $_ to nil after the last line has been read" do
     while @io.gets
     end
-    $_.should be_nil
+    $_.should == nil
   end
 
   it "returns nil if called at the end of the stream" do
@@ -36,7 +36,7 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.gets }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.gets }.should.raise(IOError)
   end
 
   describe "with no separator" do
@@ -156,11 +156,11 @@
     end
 
     it "raises exception when options passed as Hash" do
-      -> { @io.gets({ chomp: true }) }.should raise_error(TypeError)
+      -> { @io.gets({ chomp: true }) }.should.raise(TypeError)
 
       -> {
         @io.gets("\n", 1, { chomp: true })
-      }.should raise_error(ArgumentError, "wrong number of arguments (given 3, expected 0..2)")
+      }.should.raise(ArgumentError, "wrong number of arguments (given 3, expected 0..2)")
     end
   end
 end
@@ -175,11 +175,11 @@
   end
 
   it "raises an IOError if the stream is opened for append only" do
-    -> { File.open(@name, "a:utf-8") { |f| f.gets } }.should raise_error(IOError)
+    -> { File.open(@name, "a:utf-8") { |f| f.gets } }.should.raise(IOError)
   end
 
   it "raises an IOError if the stream is opened for writing only" do
-    -> { File.open(@name, "w:utf-8") { |f| f.gets } }.should raise_error(IOError)
+    -> { File.open(@name, "w:utf-8") { |f| f.gets } }.should.raise(IOError)
   end
 end
 
@@ -251,7 +251,7 @@
   end
 
   it "does not accept limit that doesn't fit in a C off_t" do
-    -> { @io.gets(2**128) }.should raise_error(RangeError)
+    -> { @io.gets(2**128) }.should.raise(RangeError)
   end
 end
 
diff --git a/spec/ruby/core/io/initialize_spec.rb b/spec/ruby/core/io/initialize_spec.rb
index 026252a13d1..3425e5ac379 100644
--- a/spec/ruby/core/io/initialize_spec.rb
+++ b/spec/ruby/core/io/initialize_spec.rb
@@ -35,26 +35,26 @@
 
     -> {
       @io.send(:initialize, fd, "w", {flags: File::CREAT})
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 3, expected 1..2)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 3, expected 1..2)")
   end
 
   it "raises a TypeError when passed an IO" do
-    -> { @io.send :initialize, STDOUT, 'w' }.should raise_error(TypeError)
+    -> { @io.send :initialize, STDOUT, 'w' }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { @io.send :initialize, nil, 'w' }.should raise_error(TypeError)
+    -> { @io.send :initialize, nil, 'w' }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { @io.send :initialize, "4", 'w' }.should raise_error(TypeError)
+    -> { @io.send :initialize, "4", 'w' }.should.raise(TypeError)
   end
 
   it "raises IOError on closed stream" do
-    -> { @io.send :initialize, IOSpecs.closed_io.fileno }.should raise_error(IOError)
+    -> { @io.send :initialize, IOSpecs.closed_io.fileno }.should.raise(IOError)
   end
 
   it "raises an Errno::EBADF when given an invalid file descriptor" do
-    -> { @io.send :initialize, -1, 'w' }.should raise_error(Errno::EBADF)
+    -> { @io.send :initialize, -1, 'w' }.should.raise(Errno::EBADF)
   end
 end
diff --git a/spec/ruby/core/io/inspect_spec.rb b/spec/ruby/core/io/inspect_spec.rb
index c653c307c41..37dc459f22c 100644
--- a/spec/ruby/core/io/inspect_spec.rb
+++ b/spec/ruby/core/io/inspect_spec.rb
@@ -8,13 +8,13 @@
 
   it "contains the file descriptor number" do
     @r, @w = IO.pipe
-    @r.inspect.should include("fd #{@r.fileno}")
+    @r.inspect.should.include?("fd #{@r.fileno}")
   end
 
   it "contains \"(closed)\" if the stream is closed" do
     @r, @w = IO.pipe
     @r.close
-    @r.inspect.should include("(closed)")
+    @r.inspect.should.include?("(closed)")
   end
 
   it "reports IO as its Method object's owner" do
diff --git a/spec/ruby/core/io/internal_encoding_spec.rb b/spec/ruby/core/io/internal_encoding_spec.rb
index 7a583d4bcb1..9963a93f332 100644
--- a/spec/ruby/core/io/internal_encoding_spec.rb
+++ b/spec/ruby/core/io/internal_encoding_spec.rb
@@ -9,25 +9,25 @@
 
     it "returns nil if the internal encoding is not set" do
       @io = new_io @name, @object
-      @io.internal_encoding.should be_nil
+      @io.internal_encoding.should == nil
     end
 
     it "returns nil if Encoding.default_internal is changed after the instance is created" do
       @io = new_io @name, @object
       Encoding.default_internal = Encoding::IBM437
-      @io.internal_encoding.should be_nil
+      @io.internal_encoding.should == nil
     end
 
     it "returns the value set when the instance was created" do
       @io = new_io @name, "#{@object}:utf-8:euc-jp"
       Encoding.default_internal = Encoding::IBM437
-      @io.internal_encoding.should equal(Encoding::EUC_JP)
+      @io.internal_encoding.should.equal?(Encoding::EUC_JP)
     end
 
     it "returns the value set by #set_encoding" do
       @io = new_io @name, @object
       @io.set_encoding(Encoding::US_ASCII, Encoding::IBM437)
-      @io.internal_encoding.should equal(Encoding::IBM437)
+      @io.internal_encoding.should.equal?(Encoding::IBM437)
     end
   end
 
@@ -39,13 +39,13 @@
 
     it "returns nil" do
       @io = new_io @name, @object
-      @io.internal_encoding.should be_nil
+      @io.internal_encoding.should == nil
     end
 
     it "returns nil regardless of Encoding.default_internal changes" do
       @io = new_io @name, @object
       Encoding.default_internal = Encoding::IBM437
-      @io.internal_encoding.should be_nil
+      @io.internal_encoding.should == nil
     end
   end
 
@@ -57,41 +57,41 @@
 
     it "returns the value of Encoding.default_internal when the instance was created if the internal encoding is not set" do
       @io = new_io @name, @object
-      @io.internal_encoding.should equal(Encoding::IBM866)
+      @io.internal_encoding.should.equal?(Encoding::IBM866)
     end
 
     it "does not change when Encoding.default_internal is changed" do
       @io = new_io @name, @object
       Encoding.default_internal = Encoding::IBM437
-      @io.internal_encoding.should equal(Encoding::IBM866)
+      @io.internal_encoding.should.equal?(Encoding::IBM866)
     end
 
     it "returns the internal encoding set when the instance was created" do
       @io = new_io @name, "#{@object}:utf-8:euc-jp"
-      @io.internal_encoding.should equal(Encoding::EUC_JP)
+      @io.internal_encoding.should.equal?(Encoding::EUC_JP)
     end
 
     it "does not change when set and Encoding.default_internal is changed" do
       @io = new_io @name, "#{@object}:utf-8:euc-jp"
       Encoding.default_internal = Encoding::IBM437
-      @io.internal_encoding.should equal(Encoding::EUC_JP)
+      @io.internal_encoding.should.equal?(Encoding::EUC_JP)
     end
 
     it "returns the value set by #set_encoding" do
       @io = new_io @name, @object
       @io.set_encoding(Encoding::US_ASCII, Encoding::IBM437)
-      @io.internal_encoding.should equal(Encoding::IBM437)
+      @io.internal_encoding.should.equal?(Encoding::IBM437)
     end
 
     it "returns nil when Encoding.default_external is BINARY and the internal encoding is not set" do
       Encoding.default_external = Encoding::BINARY
       @io = new_io @name, @object
-      @io.internal_encoding.should be_nil
+      @io.internal_encoding.should == nil
     end
 
     it "returns nil when the external encoding is BINARY and the internal encoding is not set" do
       @io = new_io @name, "#{@object}:binary"
-      @io.internal_encoding.should be_nil
+      @io.internal_encoding.should == nil
     end
   end
 end
@@ -116,7 +116,7 @@
   it "can be retrieved from a closed stream" do
     io = IOSpecs.io_fixture("lines.txt", "r")
     io.close
-    io.internal_encoding.should equal(Encoding.default_internal)
+    io.internal_encoding.should.equal?(Encoding.default_internal)
   end
 
   describe "with 'r' mode" do
diff --git a/spec/ruby/core/io/ioctl_spec.rb b/spec/ruby/core/io/ioctl_spec.rb
index 3f7b5ad5d7c..15a5d6ec225 100644
--- a/spec/ruby/core/io/ioctl_spec.rb
+++ b/spec/ruby/core/io/ioctl_spec.rb
@@ -4,7 +4,7 @@
 describe "IO#ioctl" do
   platform_is_not :windows do
     it "raises IOError on closed stream" do
-      -> { IOSpecs.closed_io.ioctl(5, 5) }.should raise_error(IOError)
+      -> { IOSpecs.closed_io.ioctl(5, 5) }.should.raise(IOError)
     end
   end
 
@@ -15,7 +15,7 @@
           buffer = +''
           # FIONREAD in /usr/include/asm-generic/ioctls.h
           f.ioctl 0x541B, buffer
-          buffer.unpack('I').first.should be_kind_of(Integer)
+          buffer.unpack('I').first.should.is_a?(Integer)
         end
       end
     end
@@ -25,7 +25,7 @@
         -> {
           # TIOCGWINSZ in /usr/include/asm-generic/ioctls.h
           f.ioctl 0x5413, nil
-        }.should raise_error(SystemCallError)
+        }.should.raise(SystemCallError)
       end
     end
   end
diff --git a/spec/ruby/core/io/lineno_spec.rb b/spec/ruby/core/io/lineno_spec.rb
index e82cdd9f17e..93b505652ab 100644
--- a/spec/ruby/core/io/lineno_spec.rb
+++ b/spec/ruby/core/io/lineno_spec.rb
@@ -11,14 +11,14 @@
   end
 
   it "raises an IOError on a closed stream" do
-    -> { IOSpecs.closed_io.lineno }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.lineno }.should.raise(IOError)
   end
 
   it "raises an IOError on a write-only stream" do
     name = tmp("io_lineno.txt")
     begin
       File.open(name, 'w') do |f|
-        -> { f.lineno }.should raise_error(IOError)
+        -> { f.lineno }.should.raise(IOError)
       end
     ensure
       rm_r name
@@ -29,7 +29,7 @@
     cmd = platform_is(:windows) ? 'rem' : 'cat'
     IO.popen(cmd, 'r+') do |p|
       p.close_read
-      -> { p.lineno }.should raise_error(IOError)
+      -> { p.lineno }.should.raise(IOError)
     end
   end
 
@@ -56,14 +56,14 @@
   end
 
   it "raises an IOError on a closed stream" do
-    -> { IOSpecs.closed_io.lineno = 5 }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.lineno = 5 }.should.raise(IOError)
   end
 
   it "raises an IOError on a write-only stream" do
     name = tmp("io_lineno.txt")
     begin
       File.open(name, 'w') do |f|
-        -> { f.lineno = 0 }.should raise_error(IOError)
+        -> { f.lineno = 0 }.should.raise(IOError)
       end
     ensure
       rm_r name
@@ -74,7 +74,7 @@
     cmd = platform_is(:windows) ? 'rem' : 'cat'
     IO.popen(cmd, 'r+') do |p|
       p.close_read
-      -> { p.lineno = 0 }.should raise_error(IOError)
+      -> { p.lineno = 0 }.should.raise(IOError)
     end
   end
 
@@ -95,12 +95,12 @@
   end
 
   it "raises TypeError if cannot convert argument to Integer implicitly" do
-    -> { @io.lineno = "1" }.should raise_error(TypeError, 'no implicit conversion of String into Integer')
-    -> { @io.lineno = nil }.should raise_error(TypeError, 'no implicit conversion from nil to integer')
+    -> { @io.lineno = "1" }.should.raise(TypeError, 'no implicit conversion of String into Integer')
+    -> { @io.lineno = nil }.should raise_consistent_error(TypeError, 'no implicit conversion of nil into Integer')
   end
 
   it "does not accept Integers that don't fit in a C int" do
-    -> { @io.lineno = 2**32 }.should raise_error(RangeError)
+    -> { @io.lineno = 2**32 }.should.raise(RangeError)
   end
 
   it "sets the current line number to the given value" do
diff --git a/spec/ruby/core/io/open_spec.rb b/spec/ruby/core/io/open_spec.rb
index d151da9ce5a..ff22d146858 100644
--- a/spec/ruby/core/io/open_spec.rb
+++ b/spec/ruby/core/io/open_spec.rb
@@ -32,7 +32,7 @@
         super()
         ScratchPad.record :called
       end
-      io.closed?.should be_false
+      io.closed?.should == false
     end
     ScratchPad.recorded.should == :called
   end
@@ -46,7 +46,7 @@
         end
         raise Exception
       end
-    end.should raise_error(Exception)
+    end.should.raise(Exception)
     ScratchPad.recorded.should == :called
   end
 
@@ -59,7 +59,7 @@
           raise Exception
         end
       end
-    end.should raise_error(Exception)
+    end.should.raise(Exception)
     ScratchPad.recorded.should == :called
   end
 
@@ -72,7 +72,7 @@
           raise StandardError
         end
       end
-    end.should raise_error(StandardError)
+    end.should.raise(StandardError)
     ScratchPad.recorded.should == :called
   end
 
diff --git a/spec/ruby/core/io/output_spec.rb b/spec/ruby/core/io/output_spec.rb
index 2aafb305f4b..0decf8c95b2 100644
--- a/spec/ruby/core/io/output_spec.rb
+++ b/spec/ruby/core/io/output_spec.rb
@@ -16,7 +16,7 @@
 
   it "raises an error if the stream is closed" do
     io = IOSpecs.closed_io
-    -> { io << "test" }.should raise_error(IOError)
+    -> { io << "test" }.should.raise(IOError)
   end
 
   it "returns self" do
diff --git a/spec/ruby/core/io/pid_spec.rb b/spec/ruby/core/io/pid_spec.rb
index bc09fe7c3b8..04956887ffe 100644
--- a/spec/ruby/core/io/pid_spec.rb
+++ b/spec/ruby/core/io/pid_spec.rb
@@ -25,11 +25,11 @@
   end
 
   it "returns the ID of a process associated with stream" do
-    @io.pid.should_not be_nil
+    @io.pid.should_not == nil
   end
 
   it "raises an IOError on closed stream" do
     @io.close
-    -> { @io.pid }.should raise_error(IOError)
+    -> { @io.pid }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/pipe_spec.rb b/spec/ruby/core/io/pipe_spec.rb
index aee0d9003f4..9f1b01a5cd8 100644
--- a/spec/ruby/core/io/pipe_spec.rb
+++ b/spec/ruby/core/io/pipe_spec.rb
@@ -16,14 +16,14 @@
 
   it "returns two IO objects" do
     @r, @w = IO.pipe
-    @r.should be_kind_of(IO)
-    @w.should be_kind_of(IO)
+    @r.should.is_a?(IO)
+    @w.should.is_a?(IO)
   end
 
   it "returns instances of a subclass when called on a subclass" do
     @r, @w = IOSpecs::SubIO.pipe
-    @r.should be_an_instance_of(IOSpecs::SubIO)
-    @w.should be_an_instance_of(IOSpecs::SubIO)
+    @r.should.instance_of?(IOSpecs::SubIO)
+    @w.should.instance_of?(IOSpecs::SubIO)
   end
 
   it "does not use IO.new method to create pipes and allows its overriding" do
@@ -33,8 +33,8 @@
     @r, @w = IOSpecs::SubIOWithRedefinedNew.pipe
     ScratchPad.recorded.should == [:call_original_initialize, :call_original_initialize] # called 2 times - for each pipe (r and w)
 
-    @r.should be_an_instance_of(IOSpecs::SubIOWithRedefinedNew)
-    @w.should be_an_instance_of(IOSpecs::SubIOWithRedefinedNew)
+    @r.should.instance_of?(IOSpecs::SubIOWithRedefinedNew)
+    @w.should.instance_of?(IOSpecs::SubIOWithRedefinedNew)
   end
 end
 
@@ -42,8 +42,8 @@
   describe "passed a block" do
     it "yields two IO objects" do
       IO.pipe do |r, w|
-        r.should be_kind_of(IO)
-        w.should be_kind_of(IO)
+        r.should.is_a?(IO)
+        w.should.is_a?(IO)
       end
     end
 
@@ -67,7 +67,7 @@
           w = _w
           raise RuntimeError
         end
-      end.should raise_error(RuntimeError)
+      end.should.raise(RuntimeError)
       r.should.closed?
       w.should.closed?
     end
@@ -100,7 +100,7 @@
 
     IO.pipe do |r, w|
       r.external_encoding.should == Encoding::ISO_8859_1
-      r.internal_encoding.should be_nil
+      r.internal_encoding.should == nil
     end
   end
 
@@ -120,14 +120,14 @@
 
     IO.pipe do |r, w|
       r.external_encoding.should == Encoding::UTF_8
-      r.internal_encoding.should be_nil
+      r.internal_encoding.should == nil
     end
   end
 
   it "sets the external encoding of the read end when passed an Encoding argument" do
     IO.pipe(Encoding::UTF_8) do |r, w|
       r.external_encoding.should == Encoding::UTF_8
-      r.internal_encoding.should be_nil
+      r.internal_encoding.should == nil
     end
   end
 
@@ -141,14 +141,14 @@
   it "sets the external encoding of the read end when passed the name of an Encoding" do
     IO.pipe("UTF-8") do |r, w|
       r.external_encoding.should == Encoding::UTF_8
-      r.internal_encoding.should be_nil
+      r.internal_encoding.should == nil
     end
   end
 
   it "accepts 'bom|' prefix for external encoding" do
     IO.pipe("BOM|UTF-8") do |r, w|
       r.external_encoding.should == Encoding::UTF_8
-      r.internal_encoding.should be_nil
+      r.internal_encoding.should == nil
     end
   end
 
@@ -213,13 +213,13 @@
 
   it "sets no external encoding for the write end" do
     IO.pipe(Encoding::UTF_8) do |r, w|
-      w.external_encoding.should be_nil
+      w.external_encoding.should == nil
     end
   end
 
   it "sets no internal encoding for the write end" do
     IO.pipe(Encoding::UTF_8) do |r, w|
-      w.external_encoding.should be_nil
+      w.external_encoding.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/io/popen_spec.rb b/spec/ruby/core/io/popen_spec.rb
index 6043862614b..b5747bf2554 100644
--- a/spec/ruby/core/io/popen_spec.rb
+++ b/spec/ruby/core/io/popen_spec.rb
@@ -21,7 +21,7 @@
 
   it "returns an open IO" do
     @io = IO.popen(ruby_cmd('exit'), "r")
-    @io.closed?.should be_false
+    @io.closed?.should == false
   end
 
   it "reads a read-only pipe" do
@@ -31,7 +31,7 @@
 
   it "raises IOError when writing a read-only pipe" do
     @io = IO.popen('echo foo', "r")
-    -> { @io.write('bar') }.should raise_error(IOError)
+    -> { @io.write('bar') }.should.raise(IOError)
     @io.read.should == "foo\n"
   end
 
@@ -52,7 +52,7 @@
 
   it "raises IOError when reading a write-only pipe" do
     @io = IO.popen(ruby_cmd('IO.copy_stream(STDIN,STDOUT)'), "w")
-    -> { @io.read }.should raise_error(IOError)
+    -> { @io.read }.should.raise(IOError)
   end
 
   it "reads and writes a read/write pipe" do
@@ -86,7 +86,7 @@
 
   it "returns an instance of a subclass when called on a subclass" do
     @io = IOSpecs::SubIO.popen(ruby_cmd('exit'), "r")
-    @io.should be_an_instance_of(IOSpecs::SubIO)
+    @io.should.instance_of?(IOSpecs::SubIO)
   end
 
   it "coerces mode argument with #to_str" do
@@ -114,24 +114,24 @@
   describe "with a block" do
     it "yields an open IO to the block" do
       IO.popen(ruby_cmd('exit'), "r") do |io|
-        io.closed?.should be_false
+        io.closed?.should == false
       end
     end
 
     it "yields an instance of a subclass when called on a subclass" do
       IOSpecs::SubIO.popen(ruby_cmd('exit'), "r") do |io|
-        io.should be_an_instance_of(IOSpecs::SubIO)
+        io.should.instance_of?(IOSpecs::SubIO)
       end
     end
 
     it "closes the IO after yielding" do
       io = IO.popen(ruby_cmd('exit'), "r") { |_io| _io }
-      io.closed?.should be_true
+      io.closed?.should == true
     end
 
     it "allows the IO to be closed inside the block" do
       io = IO.popen(ruby_cmd('exit'), 'r') { |_io| _io.close; _io }
-      io.closed?.should be_true
+      io.closed?.should == true
     end
 
     it "returns the value of the block" do
@@ -169,7 +169,7 @@
   it "sets the internal encoding to nil if it's the same as the external encoding" do
     @io = IO.popen(ruby_cmd('exit'), external_encoding: Encoding::EUC_JP,
                           internal_encoding: Encoding::EUC_JP)
-    @io.internal_encoding.should be_nil
+    @io.internal_encoding.should == nil
   end
 
   context "with a leading ENV Hash" do
diff --git a/spec/ruby/core/io/pread_spec.rb b/spec/ruby/core/io/pread_spec.rb
index 8f7d9b2521d..cfb8dc4c68b 100644
--- a/spec/ruby/core/io/pread_spec.rb
+++ b/spec/ruby/core/io/pread_spec.rb
@@ -99,40 +99,40 @@
 
   it "raises TypeError if maxlen is not an Integer and cannot be coerced into Integer" do
     maxlen = Object.new
-    -> { @file.pread(maxlen, 0) }.should raise_error(TypeError, 'no implicit conversion of Object into Integer')
+    -> { @file.pread(maxlen, 0) }.should.raise(TypeError, 'no implicit conversion of Object into Integer')
   end
 
   it "raises TypeError if offset is not an Integer and cannot be coerced into Integer" do
     offset = Object.new
-    -> { @file.pread(4, offset) }.should raise_error(TypeError, 'no implicit conversion of Object into Integer')
+    -> { @file.pread(4, offset) }.should.raise(TypeError, 'no implicit conversion of Object into Integer')
   end
 
   it "raises ArgumentError for negative values of maxlen" do
-    -> { @file.pread(-4, 0) }.should raise_error(ArgumentError, 'negative string size (or size too big)')
+    -> { @file.pread(-4, 0) }.should.raise(ArgumentError, 'negative string size (or size too big)')
   end
 
   it "raised Errno::EINVAL for negative values of offset" do
-    -> { @file.pread(4, -1) }.should raise_error(Errno::EINVAL, /Invalid argument/)
+    -> { @file.pread(4, -1) }.should.raise(Errno::EINVAL, /Invalid argument/)
   end
 
   it "raises TypeError if the buffer is not a String and cannot be coerced into String" do
     buffer = Object.new
-    -> { @file.pread(4, 0, buffer) }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+    -> { @file.pread(4, 0, buffer) }.should.raise(TypeError, 'no implicit conversion of Object into String')
   end
 
   it "raises EOFError if end-of-file is reached" do
-    -> { @file.pread(1, 10) }.should raise_error(EOFError)
+    -> { @file.pread(1, 10) }.should.raise(EOFError)
   end
 
   it "raises IOError when file is not open in read mode" do
     File.open(@fname, "w") do |file|
-      -> { file.pread(1, 1) }.should raise_error(IOError)
+      -> { file.pread(1, 1) }.should.raise(IOError)
     end
   end
 
   it "raises IOError when file is closed" do
     file = File.open(@fname, "r+")
     file.close
-    -> { file.pread(1, 1) }.should raise_error(IOError)
+    -> { file.pread(1, 1) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/print_spec.rb b/spec/ruby/core/io/print_spec.rb
index 085852024c9..065cb3b8cb7 100644
--- a/spec/ruby/core/io/print_spec.rb
+++ b/spec/ruby/core/io/print_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "returns nil" do
-    touch(@name) { |f| f.print.should be_nil }
+    touch(@name) { |f| f.print.should == nil }
   end
 
   it "writes $_.to_s followed by $\\ (if any) to the stream if no arguments given" do
@@ -61,6 +61,6 @@ def o2.to_s(); 'o2'; end
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.print("stuff") }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.print("stuff") }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/printf_spec.rb b/spec/ruby/core/io/printf_spec.rb
index baa00f14ced..d5519bdaa38 100644
--- a/spec/ruby/core/io/printf_spec.rb
+++ b/spec/ruby/core/io/printf_spec.rb
@@ -27,6 +27,6 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.printf("stuff") }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.printf("stuff") }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/puts_spec.rb b/spec/ruby/core/io/puts_spec.rb
index a186ddaa5d8..df526ea56aa 100644
--- a/spec/ruby/core/io/puts_spec.rb
+++ b/spec/ruby/core/io/puts_spec.rb
@@ -111,7 +111,7 @@ def @io.write(str)
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.puts("stuff") }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.puts("stuff") }.should.raise(IOError)
   end
 
   it "writes crlf when IO is opened with newline: :crlf" do
diff --git a/spec/ruby/core/io/pwrite_spec.rb b/spec/ruby/core/io/pwrite_spec.rb
index fd0b6cf380c..c318d551bc3 100644
--- a/spec/ruby/core/io/pwrite_spec.rb
+++ b/spec/ruby/core/io/pwrite_spec.rb
@@ -43,25 +43,25 @@
 
   it "raises IOError when file is not open in write mode" do
     File.open(@fname, "r") do |file|
-      -> { file.pwrite("foo", 1) }.should raise_error(IOError, "not opened for writing")
+      -> { file.pwrite("foo", 1) }.should.raise(IOError, "not opened for writing")
     end
   end
 
   it "raises IOError when file is closed" do
     file = File.open(@fname, "w+")
     file.close
-    -> { file.pwrite("foo", 1) }.should raise_error(IOError, "closed stream")
+    -> { file.pwrite("foo", 1) }.should.raise(IOError, "closed stream")
   end
 
   it "raises a NoMethodError if object does not respond to #to_s" do
     -> {
       @file.pwrite(BasicObject.new, 0)
-    }.should raise_error(NoMethodError, /undefined method [`']to_s'/)
+    }.should.raise(NoMethodError, /undefined method [`']to_s'/)
   end
 
   it "raises a TypeError if the offset cannot be converted to an Integer" do
     -> {
       @file.pwrite("foo", Object.new)
-    }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+    }.should.raise(TypeError, "no implicit conversion of Object into Integer")
   end
 end
diff --git a/spec/ruby/core/io/read_nonblock_spec.rb b/spec/ruby/core/io/read_nonblock_spec.rb
index 51e7cd6bd2f..511cf03263c 100644
--- a/spec/ruby/core/io/read_nonblock_spec.rb
+++ b/spec/ruby/core/io/read_nonblock_spec.rb
@@ -12,12 +12,12 @@
   end
 
   it "raises an exception extending IO::WaitReadable when there is no data" do
-    -> { @read.read_nonblock(5) }.should raise_error(IO::WaitReadable) { |e|
+    -> { @read.read_nonblock(5) }.should.raise(IO::WaitReadable) { |e|
       platform_is_not :windows do
-        e.should be_kind_of(Errno::EAGAIN)
+        e.should.is_a?(Errno::EAGAIN)
       end
       platform_is :windows do
-        e.should be_kind_of(Errno::EWOULDBLOCK)
+        e.should.is_a?(Errno::EWOULDBLOCK)
       end
     }
   end
@@ -36,7 +36,7 @@
 
         @read.read_nonblock(5)
 
-        @read.read_nonblock(5, exception: false).should be_nil
+        @read.read_nonblock(5, exception: false).should == nil
       end
     end
   end
@@ -73,7 +73,7 @@
     )
     c = @read.getc
     @read.ungetc(c)
-    -> { @read.read_nonblock(3).should == "foo" }.should raise_error(IOError)
+    -> { @read.read_nonblock(3).should == "foo" }.should.raise(IOError)
   end
 
   it "returns less data if that is all that is available" do
@@ -92,7 +92,7 @@
   end
 
   it "raises ArgumentError when length is less than 0" do
-    -> { @read.read_nonblock(-1) }.should raise_error(ArgumentError)
+    -> { @read.read_nonblock(-1) }.should.raise(ArgumentError)
   end
 
   it "reads into the passed buffer" do
@@ -106,7 +106,7 @@
     buffer = +""
     @write.write("1")
     output = @read.read_nonblock(1, buffer)
-    output.should equal(buffer)
+    output.should.equal?(buffer)
   end
 
   it "discards the existing buffer content upon successful read" do
@@ -120,12 +120,12 @@
   it "discards the existing buffer content upon error" do
     buffer = +"existing content"
     @write.close
-    -> { @read.read_nonblock(1, buffer) }.should raise_error(EOFError)
-    buffer.should be_empty
+    -> { @read.read_nonblock(1, buffer) }.should.raise(EOFError)
+    buffer.should.empty?
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.read_nonblock(5) }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.read_nonblock(5) }.should.raise(IOError)
   end
 
   it "raises EOFError when the end is reached" do
@@ -134,7 +134,7 @@
 
     @read.read_nonblock(5)
 
-    -> { @read.read_nonblock(5) }.should raise_error(EOFError)
+    -> { @read.read_nonblock(5) }.should.raise(EOFError)
   end
 
   it "preserves the encoding of the given buffer" do
diff --git a/spec/ruby/core/io/read_spec.rb b/spec/ruby/core/io/read_spec.rb
index dfb42e09db7..dd787c9b60d 100644
--- a/spec/ruby/core/io/read_spec.rb
+++ b/spec/ruby/core/io/read_spec.rb
@@ -29,7 +29,7 @@
 
     -> {
       IO.read(@fname, 3, 0, {mode: "r+"})
-    }.should raise_error(ArgumentError, /wrong number of arguments/)
+    }.should.raise(ArgumentError, /wrong number of arguments/)
   end
 
   it "accepts an empty options Hash" do
@@ -45,11 +45,11 @@
   end
 
   it "raises an IOError if the options Hash specifies write mode" do
-    -> { IO.read(@fname, 3, 0, mode: "w") }.should raise_error(IOError)
+    -> { IO.read(@fname, 3, 0, mode: "w") }.should.raise(IOError)
   end
 
   it "raises an IOError if the options Hash specifies append only mode" do
-    -> { IO.read(@fname, mode: "a") }.should raise_error(IOError)
+    -> { IO.read(@fname, mode: "a") }.should.raise(IOError)
   end
 
   it "reads the file if the options Hash includes read mode" do
@@ -115,20 +115,20 @@
 
   it "raises an Errno::ENOENT when the requested file does not exist" do
     rm_r @fname
-    -> { IO.read @fname }.should raise_error(Errno::ENOENT)
+    -> { IO.read @fname }.should.raise(Errno::ENOENT)
   end
 
   it "raises a TypeError when not passed a String type" do
-    -> { IO.read nil }.should raise_error(TypeError)
+    -> { IO.read nil }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when not passed a valid length" do
-    -> { IO.read @fname, -1 }.should raise_error(ArgumentError)
+    -> { IO.read @fname, -1 }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when not passed a valid offset" do
-    -> { IO.read @fname, 0, -1  }.should raise_error(ArgumentError)
-    -> { IO.read @fname, -1, -1 }.should raise_error(ArgumentError)
+    -> { IO.read @fname, 0, -1  }.should.raise(ArgumentError)
+    -> { IO.read @fname, -1, -1 }.should.raise(ArgumentError)
   end
 
   it "uses the external encoding specified via the :external_encoding option" do
@@ -196,7 +196,7 @@
           suppress_warning do # https://bugs.ruby-lang.org/issues/19630
             IO.read("|sh -c 'echo hello'", 1, 1)
           end
-        }.should raise_error(Errno::ESPIPE)
+        }.should.raise(Errno::ESPIPE)
       end
     end
 
@@ -209,7 +209,7 @@
             suppress_warning do # https://bugs.ruby-lang.org/issues/19630
               IO.read("|cmd.exe /C echo hello", 1, 1)
             end
-          }.should raise_error(Errno::EINVAL)
+          }.should.raise(Errno::EINVAL)
         end
       end
     end
@@ -270,7 +270,7 @@
   end
 
   it "raises an ArgumentError when not passed a valid length" do
-    -> { @io.read(-1) }.should raise_error(ArgumentError)
+    -> { @io.read(-1) }.should.raise(ArgumentError)
   end
 
   it "clears the output buffer if there is nothing to read" do
@@ -297,14 +297,14 @@
 
   it "raise FrozenError if the output buffer is frozen" do
     @io.read
-    -> { @io.read(0, 'frozen-string'.freeze) }.should raise_error(FrozenError)
-    -> { @io.read(1, 'frozen-string'.freeze) }.should raise_error(FrozenError)
-    -> { @io.read(nil, 'frozen-string'.freeze) }.should raise_error(FrozenError)
+    -> { @io.read(0, 'frozen-string'.freeze) }.should.raise(FrozenError)
+    -> { @io.read(1, 'frozen-string'.freeze) }.should.raise(FrozenError)
+    -> { @io.read(nil, 'frozen-string'.freeze) }.should.raise(FrozenError)
   end
 
   it "raise FrozenError if the output buffer is frozen (2)" do
     @io.read
-    -> { @io.read(1, ''.freeze) }.should raise_error(FrozenError)
+    -> { @io.read(1, ''.freeze) }.should.raise(FrozenError)
   end
 
   it "consumes zero bytes when reading zero bytes" do
@@ -374,14 +374,14 @@
   it "returns the given buffer" do
     buf = +""
 
-    @io.read(nil, buf).should equal buf
+    @io.read(nil, buf).should.equal? buf
   end
 
   it "returns the given buffer when there is nothing to read" do
     buf = +""
 
     @io.read
-    @io.read(nil, buf).should equal buf
+    @io.read(nil, buf).should.equal? buf
   end
 
   it "coerces the second argument to string and uses it as a buffer" do
@@ -389,7 +389,7 @@
     obj = mock("buff")
     obj.should_receive(:to_str).any_number_of_times.and_return(buf)
 
-    @io.read(15, obj).should_not equal obj
+    @io.read(15, obj).should_not.equal? obj
     buf.should == @contents
   end
 
@@ -423,11 +423,11 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.read }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.read }.should.raise(IOError)
   end
 
   it "raises ArgumentError when length is less than 0" do
-    -> { @io.read(-1) }.should raise_error(ArgumentError)
+    -> { @io.read(-1) }.should.raise(ArgumentError)
   end
 
   platform_is_not :windows do
@@ -444,7 +444,7 @@
       Thread.pass until t.stop?
       r.close
       t.join
-      t.value.should be_kind_of(IOError)
+      t.value.should.is_a?(IOError)
       w.close
     end
   end
@@ -578,20 +578,20 @@
   end
 
   it "sets the String encoding to the internal encoding" do
-    @io.read.encoding.should equal(Encoding::UTF_8)
+    @io.read.encoding.should.equal?(Encoding::UTF_8)
   end
 
   describe "when passed nil for limit" do
     it "sets the buffer to a transcoded String" do
       result = @io.read(nil, buf = +"")
-      buf.should equal(result)
+      buf.should.equal?(result)
       buf.should == "ありがとう\n"
     end
 
     it "sets the buffer's encoding to the internal encoding" do
       buf = "".dup.force_encoding Encoding::ISO_8859_1
       @io.read(nil, buf)
-      buf.encoding.should equal(Encoding::UTF_8)
+      buf.encoding.should.equal?(Encoding::UTF_8)
     end
   end
 end
@@ -602,24 +602,24 @@
   end
 
   it "returns a String in BINARY when passed a size" do
-    @io.read(4).encoding.should equal(Encoding::BINARY)
-    @io.read(0).encoding.should equal(Encoding::BINARY)
+    @io.read(4).encoding.should.equal?(Encoding::BINARY)
+    @io.read(0).encoding.should.equal?(Encoding::BINARY)
   end
 
   it "does not change the buffer's encoding when passed a limit" do
     buf = "".dup.force_encoding Encoding::ISO_8859_1
     @io.read(4, buf)
     buf.should == [164, 162, 164, 234].pack('C*').force_encoding(Encoding::ISO_8859_1)
-    buf.encoding.should equal(Encoding::ISO_8859_1)
+    buf.encoding.should.equal?(Encoding::ISO_8859_1)
   end
 
   it "truncates the buffer but does not change the buffer's encoding when no data remains" do
     buf = "abc".dup.force_encoding Encoding::ISO_8859_1
     @io.read
 
-    @io.read(1, buf).should be_nil
+    @io.read(1, buf).should == nil
     buf.size.should == 0
-    buf.encoding.should equal(Encoding::ISO_8859_1)
+    buf.encoding.should.equal?(Encoding::ISO_8859_1)
   end
 end
 
@@ -637,7 +637,7 @@
     end
 
     it "sets the String encoding to Encoding.default_external" do
-      @io.read.encoding.should equal(Encoding.default_external)
+      @io.read.encoding.should.equal?(Encoding.default_external)
     end
   end
 
@@ -656,7 +656,7 @@
       end
 
       it "sets the String encoding to the external encoding" do
-        @io.read.encoding.should equal(Encoding::EUC_JP)
+        @io.read.encoding.should.equal?(Encoding::EUC_JP)
       end
 
       it_behaves_like :io_read_size_internal_encoding, nil
diff --git a/spec/ruby/core/io/readbyte_spec.rb b/spec/ruby/core/io/readbyte_spec.rb
index 14426c28ac9..07da1da9196 100644
--- a/spec/ruby/core/io/readbyte_spec.rb
+++ b/spec/ruby/core/io/readbyte_spec.rb
@@ -19,6 +19,6 @@
     @io.seek(999999)
     -> do
       @io.readbyte
-    end.should raise_error EOFError
+    end.should.raise EOFError
   end
 end
diff --git a/spec/ruby/core/io/readchar_spec.rb b/spec/ruby/core/io/readchar_spec.rb
index a66773851ad..29d14880fff 100644
--- a/spec/ruby/core/io/readchar_spec.rb
+++ b/spec/ruby/core/io/readchar_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "sets the String encoding to the internal encoding" do
-    @io.readchar.encoding.should equal(Encoding::UTF_8)
+    @io.readchar.encoding.should.equal?(Encoding::UTF_8)
   end
 end
 
@@ -31,11 +31,11 @@
 
   it "raises an EOFError when invoked at the end of the stream" do
     @io.read
-    -> { @io.readchar }.should raise_error(EOFError)
+    -> { @io.readchar }.should.raise(EOFError)
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.readchar }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.readchar }.should.raise(IOError)
   end
 end
 
@@ -54,7 +54,7 @@
     end
 
     it "sets the String encoding to the external encoding" do
-      @io.readchar.encoding.should equal(Encoding::EUC_JP)
+      @io.readchar.encoding.should.equal?(Encoding::EUC_JP)
     end
   end
 
@@ -105,6 +105,6 @@
   end
 
   it "raises EOFError on empty stream" do
-    -> { @io.readchar }.should raise_error(EOFError)
+    -> { @io.readchar }.should.raise(EOFError)
   end
 end
diff --git a/spec/ruby/core/io/readline_spec.rb b/spec/ruby/core/io/readline_spec.rb
index a814c1be908..009687710a4 100644
--- a/spec/ruby/core/io/readline_spec.rb
+++ b/spec/ruby/core/io/readline_spec.rb
@@ -29,11 +29,11 @@
 
   it "raises EOFError on end of stream" do
     IOSpecs.lines.length.times { @io.readline }
-    -> { @io.readline }.should raise_error(EOFError)
+    -> { @io.readline }.should.raise(EOFError)
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.readline }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.readline }.should.raise(IOError)
   end
 
   it "assigns the returned line to $_" do
@@ -53,7 +53,7 @@
     end
 
     it "does not accept Integers that don't fit in a C off_t" do
-      -> { @io.readline(2**128) }.should raise_error(RangeError)
+      -> { @io.readline(2**128) }.should.raise(RangeError)
     end
   end
 
@@ -74,11 +74,11 @@
     end
 
     it "raises exception when options passed as Hash" do
-      -> { @io.readline({ chomp: true }) }.should raise_error(TypeError)
+      -> { @io.readline({ chomp: true }) }.should.raise(TypeError)
 
       -> {
         @io.readline("\n", 1, { chomp: true })
-      }.should raise_error(ArgumentError, "wrong number of arguments (given 3, expected 0..2)")
+      }.should.raise(ArgumentError, "wrong number of arguments (given 3, expected 0..2)")
     end
   end
 end
diff --git a/spec/ruby/core/io/readlines_spec.rb b/spec/ruby/core/io/readlines_spec.rb
index 07d29ea5317..640e2532004 100644
--- a/spec/ruby/core/io/readlines_spec.rb
+++ b/spec/ruby/core/io/readlines_spec.rb
@@ -17,7 +17,7 @@
 
   it "raises an IOError if the stream is closed" do
     @io.close
-    -> { @io.readlines }.should raise_error(IOError)
+    -> { @io.readlines }.should.raise(IOError)
   end
 
   describe "when passed no arguments" do
@@ -37,12 +37,12 @@
   describe "when passed no arguments" do
     it "updates self's position" do
       @io.readlines
-      @io.pos.should eql(137)
+      @io.pos.should.eql?(137)
     end
 
     it "updates self's lineno based on the number of lines read" do
       @io.readlines
-      @io.lineno.should eql(9)
+      @io.lineno.should.eql?(9)
     end
 
     it "does not change $_" do
@@ -81,12 +81,12 @@
 
     it "updates self's lineno based on the number of lines read" do
       @io.readlines("r")
-      @io.lineno.should eql(5)
+      @io.lineno.should.eql?(5)
     end
 
     it "updates self's position based on the number of characters read" do
       @io.readlines("r")
-      @io.pos.should eql(137)
+      @io.pos.should.eql?(137)
     end
 
     it "does not change $_" do
@@ -104,11 +104,11 @@
 
   describe "when passed limit" do
     it "raises ArgumentError when passed 0 as a limit" do
-      -> { @io.readlines(0) }.should raise_error(ArgumentError)
+      -> { @io.readlines(0) }.should.raise(ArgumentError)
     end
 
     it "does not accept Integers that don't fit in a C off_t" do
-      -> { @io.readlines(2**128) }.should raise_error(RangeError)
+      -> { @io.readlines(2**128) }.should.raise(RangeError)
     end
   end
 
@@ -118,11 +118,11 @@
     end
 
     it "raises exception when options passed as Hash" do
-      -> { @io.readlines({ chomp: true }) }.should raise_error(TypeError)
+      -> { @io.readlines({ chomp: true }) }.should.raise(TypeError)
 
       -> {
         @io.readlines("\n", 1, { chomp: true })
-      }.should raise_error(ArgumentError, "wrong number of arguments (given 3, expected 0..2)")
+      }.should.raise(ArgumentError, "wrong number of arguments (given 3, expected 0..2)")
     end
   end
 
@@ -145,13 +145,13 @@
   it "raises an IOError if the stream is opened for append only" do
     -> do
       File.open(@name, "a:utf-8") { |f| f.readlines }
-    end.should raise_error(IOError)
+    end.should.raise(IOError)
   end
 
   it "raises an IOError if the stream is opened for write only" do
     -> do
       File.open(@name, "w:utf-8") { |f| f.readlines }
-    end.should raise_error(IOError)
+    end.should.raise(IOError)
   end
 end
 
@@ -237,7 +237,7 @@
   it "encodes lines using the default external encoding" do
     Encoding.default_external = Encoding::UTF_8
     lines = IO.readlines(@name)
-    lines.all? { |s| s.encoding == Encoding::UTF_8 }.should be_true
+    lines.all? { |s| s.encoding == Encoding::UTF_8 }.should == true
   end
 
   it "encodes lines using the default internal encoding, when set" do
@@ -245,13 +245,13 @@
     Encoding.default_internal = Encoding::UTF_16
     suppress_warning {$/ = $/.encode Encoding::UTF_16}
     lines = IO.readlines(@name)
-    lines.all? { |s| s.encoding == Encoding::UTF_16 }.should be_true
+    lines.all? { |s| s.encoding == Encoding::UTF_16 }.should == true
   end
 
   it "ignores the default internal encoding if the external encoding is BINARY" do
     Encoding.default_external = Encoding::BINARY
     Encoding.default_internal = Encoding::UTF_8
     lines = IO.readlines(@name)
-    lines.all? { |s| s.encoding == Encoding::BINARY }.should be_true
+    lines.all? { |s| s.encoding == Encoding::BINARY }.should == true
   end
 end
diff --git a/spec/ruby/core/io/readpartial_spec.rb b/spec/ruby/core/io/readpartial_spec.rb
index 176c33cf9e4..d3f5545c8fc 100644
--- a/spec/ruby/core/io/readpartial_spec.rb
+++ b/spec/ruby/core/io/readpartial_spec.rb
@@ -15,10 +15,10 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.readpartial(10) }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.readpartial(10) }.should.raise(IOError)
 
     @rd.close
-    -> { @rd.readpartial(10) }.should raise_error(IOError)
+    -> { @rd.readpartial(10) }.should.raise(IOError)
   end
 
   it "reads at most the specified number of bytes" do
@@ -70,23 +70,23 @@
     @wr.write("abc")
     @wr.close
     @rd.readpartial(10).should == 'abc'
-    -> { @rd.readpartial(10) }.should raise_error(EOFError)
+    -> { @rd.readpartial(10) }.should.raise(EOFError)
   end
 
   it "discards the existing buffer content upon error" do
     buffer = +'hello'
     @wr.close
-    -> { @rd.readpartial(1, buffer) }.should raise_error(EOFError)
-    buffer.should be_empty
+    -> { @rd.readpartial(1, buffer) }.should.raise(EOFError)
+    buffer.should.empty?
   end
 
   it "raises IOError if the stream is closed" do
     @wr.close
-    -> { @rd.readpartial(1) }.should raise_error(IOError)
+    -> { @rd.readpartial(1) }.should.raise(IOError)
   end
 
   it "raises ArgumentError if the negative argument is provided" do
-    -> { @rd.readpartial(-1) }.should raise_error(ArgumentError)
+    -> { @rd.readpartial(-1) }.should.raise(ArgumentError)
   end
 
   it "immediately returns an empty string if the length argument is 0" do
@@ -95,7 +95,7 @@
 
   it "raises IOError if the stream is closed and the length argument is 0" do
     @rd.close
-    -> { @rd.readpartial(0) }.should raise_error(IOError, "closed stream")
+    -> { @rd.readpartial(0) }.should.raise(IOError, "closed stream")
   end
 
   it "clears and returns the given buffer if the length argument is 0" do
diff --git a/spec/ruby/core/io/reopen_spec.rb b/spec/ruby/core/io/reopen_spec.rb
index 8ff0f217f44..3b972d8978e 100644
--- a/spec/ruby/core/io/reopen_spec.rb
+++ b/spec/ruby/core/io/reopen_spec.rb
@@ -27,35 +27,35 @@
   it "changes the class of the instance to the class of the object returned by #to_io" do
     obj = mock("io")
     obj.should_receive(:to_io).and_return(@other_io)
-    @io.reopen(obj).should be_an_instance_of(File)
+    @io.reopen(obj).should.instance_of?(File)
   end
 
   it "raises an IOError if the object returned by #to_io is closed" do
     obj = mock("io")
     obj.should_receive(:to_io).and_return(IOSpecs.closed_io)
-    -> { @io.reopen obj }.should raise_error(IOError)
+    -> { @io.reopen obj }.should.raise(IOError)
   end
 
   it "raises a TypeError if #to_io does not return an IO instance" do
     obj = mock("io")
     obj.should_receive(:to_io).and_return("something else")
-    -> { @io.reopen obj }.should raise_error(TypeError)
+    -> { @io.reopen obj }.should.raise(TypeError)
   end
 
   it "raises an IOError when called on a closed stream with an object" do
     @io.close
     obj = mock("io")
     obj.should_not_receive(:to_io)
-    -> { @io.reopen(STDOUT) }.should raise_error(IOError)
+    -> { @io.reopen(STDOUT) }.should.raise(IOError)
   end
 
   it "raises an IOError if the IO argument is closed" do
-    -> { @io.reopen(IOSpecs.closed_io) }.should raise_error(IOError)
+    -> { @io.reopen(IOSpecs.closed_io) }.should.raise(IOError)
   end
 
   it "raises an IOError when called on a closed stream with an IO" do
     @io.close
-    -> { @io.reopen(STDOUT) }.should raise_error(IOError)
+    -> { @io.reopen(STDOUT) }.should.raise(IOError)
   end
 end
 
@@ -77,12 +77,12 @@
   it "does not raise an exception when called on a closed stream with a path" do
     @io.close
     @io.reopen @name, "r"
-    @io.closed?.should be_false
+    @io.closed?.should == false
     @io.gets.should == "Line 1: One\n"
   end
 
   it "returns self" do
-    @io.reopen(@name).should equal(@io)
+    @io.reopen(@name).should.equal?(@io)
   end
 
   it "positions a newly created instance at the beginning of the new stream" do
@@ -188,7 +188,7 @@
 
   it "raises an Errno::ENOENT if the file does not exist and the IO is not opened in write mode" do
     @io = new_io @name, "r"
-    -> { @io.reopen(@other_name) }.should raise_error(Errno::ENOENT)
+    -> { @io.reopen(@other_name) }.should.raise(Errno::ENOENT)
   end
 end
 
@@ -214,9 +214,9 @@
   end
 
   it "resets the EOF status to false" do
-    @io.eof?.should be_true
+    @io.eof?.should == true
     @io.reopen @other_io
-    @io.eof?.should be_false
+    @io.eof?.should == false
   end
 end
 
@@ -244,7 +244,7 @@
     # MRI actually changes the class of @io in the call to #reopen
     # but does not preserve the existing singleton class of @io.
     def @io.to_io; flunk; end
-    @io.reopen(@other_io).should be_an_instance_of(IO)
+    @io.reopen(@other_io).should.instance_of?(IO)
   end
 
   it "does not change the object_id" do
@@ -303,7 +303,7 @@ def @io.to_io; flunk; end
 
   it "may change the class of the instance" do
     @io.reopen @other_io
-    @io.should be_an_instance_of(File)
+    @io.should.instance_of?(File)
   end
 
   it "sets path equals to the other IO's path if other IO is File" do
diff --git a/spec/ruby/core/io/rewind_spec.rb b/spec/ruby/core/io/rewind_spec.rb
index 5579cbd9886..43834ef3071 100644
--- a/spec/ruby/core/io/rewind_spec.rb
+++ b/spec/ruby/core/io/rewind_spec.rb
@@ -48,6 +48,6 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.rewind }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.rewind }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/seek_spec.rb b/spec/ruby/core/io/seek_spec.rb
index 2fa4a73ac9e..d26629fb892 100644
--- a/spec/ruby/core/io/seek_spec.rb
+++ b/spec/ruby/core/io/seek_spec.rb
@@ -17,7 +17,7 @@
   end
 
   it "moves the read position relative to the current position with SEEK_CUR" do
-    -> { @io.seek(-1) }.should raise_error(Errno::EINVAL)
+    -> { @io.seek(-1) }.should.raise(Errno::EINVAL)
     @io.seek(10, IO::SEEK_CUR)
     @io.readline.should == "igne une.\n"
     @io.seek(-5, IO::SEEK_CUR)
diff --git a/spec/ruby/core/io/select_spec.rb b/spec/ruby/core/io/select_spec.rb
index 9fdb7e12c93..0a43fc6f5fc 100644
--- a/spec/ruby/core/io/select_spec.rb
+++ b/spec/ruby/core/io/select_spec.rb
@@ -18,6 +18,10 @@
     @wr.syswrite("be ready")
     IO.pipe do |_, wr|
       result = IO.select [@rd], [wr], nil, 0
+      unless result
+        # On some platforms (e.g., Windows), pipe readiness may not be immediate
+        result = IO.select [@rd], [wr], nil, 2
+      end
       result.should == [[@rd], [wr], []]
     end
   end
@@ -91,28 +95,38 @@
   end
 
   it "raises TypeError if supplied objects are not IO" do
-    -> { IO.select([Object.new]) }.should raise_error(TypeError)
-    -> { IO.select(nil, [Object.new]) }.should raise_error(TypeError)
+    -> { IO.select([Object.new]) }.should.raise(TypeError)
+    -> { IO.select(nil, [Object.new]) }.should.raise(TypeError)
 
     obj = mock("io")
     obj.should_receive(:to_io).any_number_of_times.and_return(nil)
 
-    -> { IO.select([obj]) }.should raise_error(TypeError)
-    -> { IO.select(nil, [obj]) }.should raise_error(TypeError)
+    -> { IO.select([obj]) }.should.raise(TypeError)
+    -> { IO.select(nil, [obj]) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the specified timeout value is not Numeric" do
-    -> { IO.select([@rd], nil, nil, Object.new) }.should raise_error(TypeError)
+    -> { IO.select([@rd], nil, nil, Object.new) }.should.raise(TypeError)
   end
 
   it "raises TypeError if the first three arguments are not Arrays" do
-    -> { IO.select(Object.new)}.should raise_error(TypeError)
-    -> { IO.select(nil, Object.new)}.should raise_error(TypeError)
-    -> { IO.select(nil, nil, Object.new)}.should raise_error(TypeError)
+    -> { IO.select(Object.new)}.should.raise(TypeError)
+    -> { IO.select(nil, Object.new)}.should.raise(TypeError)
+    -> { IO.select(nil, nil, Object.new)}.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when passed a negative timeout" do
-    -> { IO.select(nil, nil, nil, -5)}.should raise_error(ArgumentError)
+    -> { IO.select(nil, nil, nil, -5)}.should.raise(ArgumentError, "time interval must not be negative")
+  end
+
+  ruby_version_is "4.0" do
+    it "raises an ArgumentError when passed negative infinity as timeout" do
+      -> { IO.select(nil, nil, nil, -Float::INFINITY)}.should.raise(ArgumentError, "time interval must not be negative")
+    end
+  end
+
+  it "raises an RangeError when passed NaN as timeout" do
+    -> { IO.select(nil, nil, nil, Float::NAN)}.should.raise(RangeError, "NaN out of Time range")
   end
 
   describe "returns the available descriptors when the file descriptor" do
diff --git a/spec/ruby/core/io/set_encoding_by_bom_spec.rb b/spec/ruby/core/io/set_encoding_by_bom_spec.rb
index 30d5ce5a5af..5436879f11a 100644
--- a/spec/ruby/core/io/set_encoding_by_bom_spec.rb
+++ b/spec/ruby/core/io/set_encoding_by_bom_spec.rb
@@ -15,7 +15,7 @@
   it "returns nil if not readable" do
     not_readable_io = new_io(@name, 'wb')
 
-    not_readable_io.set_encoding_by_bom.should be_nil
+    not_readable_io.set_encoding_by_bom.should == nil
     not_readable_io.external_encoding.should == Encoding::ASCII_8BIT
   ensure
     not_readable_io.close
@@ -102,7 +102,7 @@
   end
 
   it "returns nil if io is empty" do
-    @io.set_encoding_by_bom.should be_nil
+    @io.set_encoding_by_bom.should == nil
     @io.external_encoding.should == Encoding::ASCII_8BIT
   end
 
@@ -243,7 +243,7 @@
   it 'returns exception if io not in binary mode' do
     not_binary_io = new_io(@name, 'r')
 
-    -> { not_binary_io.set_encoding_by_bom }.should raise_error(ArgumentError, 'ASCII incompatible encoding needs binmode')
+    -> { not_binary_io.set_encoding_by_bom }.should.raise(ArgumentError, 'ASCII incompatible encoding needs binmode')
   ensure
     not_binary_io.close
   end
@@ -251,12 +251,12 @@
   it 'returns exception if encoding already set' do
     @io.set_encoding("utf-8")
 
-    -> { @io.set_encoding_by_bom }.should raise_error(ArgumentError, 'encoding is set to UTF-8 already')
+    -> { @io.set_encoding_by_bom }.should.raise(ArgumentError, 'encoding is set to UTF-8 already')
   end
 
   it 'returns exception if encoding conversion is already set' do
     @io.set_encoding(Encoding::UTF_8, Encoding::UTF_16BE)
 
-    -> { @io.set_encoding_by_bom }.should raise_error(ArgumentError, 'encoding conversion is set')
+    -> { @io.set_encoding_by_bom }.should.raise(ArgumentError, 'encoding conversion is set')
   end
 end
diff --git a/spec/ruby/core/io/set_encoding_spec.rb b/spec/ruby/core/io/set_encoding_spec.rb
index 22d90176357..237251de5b4 100644
--- a/spec/ruby/core/io/set_encoding_spec.rb
+++ b/spec/ruby/core/io/set_encoding_spec.rb
@@ -5,21 +5,21 @@
     @io = new_io @name, "#{@object}:ibm437:ibm866"
     @io.set_encoding nil, nil
 
-    @io.external_encoding.should be_nil
-    @io.internal_encoding.should be_nil
+    @io.external_encoding.should == nil
+    @io.internal_encoding.should == nil
   end
 
   it "sets the encodings to nil when the IO is built with no explicit encoding" do
     @io = new_io @name, @object
 
     # Checking our assumptions first
-    @io.external_encoding.should be_nil
-    @io.internal_encoding.should be_nil
+    @io.external_encoding.should == nil
+    @io.internal_encoding.should == nil
 
     @io.set_encoding nil, nil
 
-    @io.external_encoding.should be_nil
-    @io.internal_encoding.should be_nil
+    @io.external_encoding.should == nil
+    @io.internal_encoding.should == nil
   end
 
   it "prevents the encodings from changing when Encoding defaults are changed" do
@@ -29,8 +29,8 @@
     Encoding.default_external = Encoding::IBM437
     Encoding.default_internal = Encoding::IBM866
 
-    @io.external_encoding.should be_nil
-    @io.internal_encoding.should be_nil
+    @io.external_encoding.should == nil
+    @io.internal_encoding.should == nil
   end
 
   it "sets the encodings to the current Encoding defaults" do
@@ -75,8 +75,8 @@
       Encoding.default_internal = Encoding::IBM866
 
       @io.set_encoding nil, nil
-      @io.external_encoding.should equal(Encoding::IBM437)
-      @io.internal_encoding.should equal(Encoding::IBM866)
+      @io.external_encoding.should.equal?(Encoding::IBM437)
+      @io.internal_encoding.should.equal?(Encoding::IBM866)
     end
 
     it "prevents the #internal_encoding from changing when Encoding.default_internal is changed" do
@@ -85,7 +85,7 @@
 
       Encoding.default_internal = Encoding::IBM437
 
-      @io.internal_encoding.should be_nil
+      @io.internal_encoding.should == nil
     end
 
     it "allows the #external_encoding to change when Encoding.default_external is changed" do
@@ -94,17 +94,17 @@
 
       Encoding.default_external = Encoding::IBM437
 
-      @io.external_encoding.should equal(Encoding::IBM437)
+      @io.external_encoding.should.equal?(Encoding::IBM437)
     end
   end
 
   describe "with 'rb' mode" do
     it "returns Encoding.default_external" do
       @io = new_io @name, "rb"
-      @io.external_encoding.should equal(Encoding::BINARY)
+      @io.external_encoding.should.equal?(Encoding::BINARY)
 
       @io.set_encoding nil, nil
-      @io.external_encoding.should equal(Encoding.default_external)
+      @io.external_encoding.should.equal?(Encoding.default_external)
     end
   end
 
@@ -158,13 +158,13 @@
   end
 
   it "returns self" do
-    @io.set_encoding(Encoding::UTF_8).should equal(@io)
+    @io.set_encoding(Encoding::UTF_8).should.equal?(@io)
   end
 
   it "sets the external encoding when passed an Encoding argument" do
     @io.set_encoding(Encoding::UTF_8)
     @io.external_encoding.should == Encoding::UTF_8
-    @io.internal_encoding.should be_nil
+    @io.internal_encoding.should == nil
   end
 
   it "sets the external and internal encoding when passed two Encoding arguments" do
@@ -176,19 +176,19 @@
   it "sets the external encoding when passed the name of an Encoding" do
     @io.set_encoding("utf-8")
     @io.external_encoding.should == Encoding::UTF_8
-    @io.internal_encoding.should be_nil
+    @io.internal_encoding.should == nil
   end
 
   it "ignores the internal encoding if the same as external when passed Encoding objects" do
     @io.set_encoding(Encoding::UTF_8, Encoding::UTF_8)
     @io.external_encoding.should == Encoding::UTF_8
-    @io.internal_encoding.should be_nil
+    @io.internal_encoding.should == nil
   end
 
   it "ignores the internal encoding if the same as external when passed encoding names separated by ':'" do
     @io.set_encoding("utf-8:utf-8")
     @io.external_encoding.should == Encoding::UTF_8
-    @io.internal_encoding.should be_nil
+    @io.internal_encoding.should == nil
   end
 
   it "sets the external and internal encoding when passed the names of Encodings separated by ':'" do
@@ -229,10 +229,10 @@
   end
 
   it "raises ArgumentError when no arguments are given" do
-    -> { @io.set_encoding() }.should raise_error(ArgumentError)
+    -> { @io.set_encoding() }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when too many arguments are given" do
-    -> { @io.set_encoding(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { @io.set_encoding(1, 2, 3) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/io/shared/binwrite.rb b/spec/ruby/core/io/shared/binwrite.rb
index e51093329b4..64793b19365 100644
--- a/spec/ruby/core/io/shared/binwrite.rb
+++ b/spec/ruby/core/io/shared/binwrite.rb
@@ -26,7 +26,7 @@
 
     -> {
       IO.send(@method, @filename, "hi", 0, {flags: File::CREAT})
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 2..3)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 2..3)")
   end
 
   it "creates a file if missing" do
@@ -81,7 +81,7 @@
   end
 
   it "raises an error if readonly mode is specified" do
-    -> { IO.send(@method, @filename, "abcde", mode: "r") }.should raise_error(IOError)
+    -> { IO.send(@method, @filename, "abcde", mode: "r") }.should.raise(IOError)
   end
 
   it "truncates if empty :opts provided and offset skipped" do
diff --git a/spec/ruby/core/io/shared/chars.rb b/spec/ruby/core/io/shared/chars.rb
index 266566f221e..efd4d5ee104 100644
--- a/spec/ruby/core/io/shared/chars.rb
+++ b/spec/ruby/core/io/shared/chars.rb
@@ -24,7 +24,7 @@
   describe "when no block is given" do
     it "returns an Enumerator" do
       enum = @io.send(@method)
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
       enum.first(5).should == ["V", "o", "i", "c", "i"]
     end
 
@@ -38,19 +38,19 @@
   end
 
   it "returns itself" do
-    @io.send(@method) { |c| }.should equal(@io)
+    @io.send(@method) { |c| }.should.equal?(@io)
   end
 
   it "returns an enumerator for a closed stream" do
-    IOSpecs.closed_io.send(@method).should be_an_instance_of(Enumerator)
+    IOSpecs.closed_io.send(@method).should.instance_of?(Enumerator)
   end
 
   it "raises an IOError when an enumerator created on a closed stream is accessed" do
-    -> { IOSpecs.closed_io.send(@method).first }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.send(@method).first }.should.raise(IOError)
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.send(@method) {} }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.send(@method) {} }.should.raise(IOError)
   end
 end
 
diff --git a/spec/ruby/core/io/shared/codepoints.rb b/spec/ruby/core/io/shared/codepoints.rb
index 6872846c1a1..21c756986f6 100644
--- a/spec/ruby/core/io/shared/codepoints.rb
+++ b/spec/ruby/core/io/shared/codepoints.rb
@@ -13,7 +13,7 @@
 
   describe "when no block is given" do
     it "returns an Enumerator" do
-      @enum.should be_an_instance_of(Enumerator)
+      @enum.should.instance_of?(Enumerator)
     end
 
     describe "returned Enumerator" do
@@ -39,7 +39,7 @@
 
   it "raises an error if reading invalid sequence" do
     @io.pos = 60  # inside of a multibyte sequence
-    -> { @enum.first }.should raise_error(ArgumentError)
+    -> { @enum.first }.should.raise(ArgumentError)
   end
 
   it "does not change $_" do
@@ -49,6 +49,6 @@
   end
 
   it "raises an IOError when self is not readable" do
-    -> { IOSpecs.closed_io.send(@method).to_a }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.send(@method).to_a }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/shared/each.rb b/spec/ruby/core/io/shared/each.rb
index 0747f31b8a8..ae60c3506aa 100644
--- a/spec/ruby/core/io/shared/each.rb
+++ b/spec/ruby/core/io/shared/each.rb
@@ -24,7 +24,7 @@
     end
 
     it "returns self" do
-      @io.send(@method) { |l| l }.should equal(@io)
+      @io.send(@method) { |l| l }.should.equal?(@io)
     end
 
     it "does not change $_" do
@@ -34,7 +34,7 @@
     end
 
     it "raises an IOError when self is not readable" do
-      -> { IOSpecs.closed_io.send(@method) {} }.should raise_error(IOError)
+      -> { IOSpecs.closed_io.send(@method) {} }.should.raise(IOError)
     end
 
     it "makes line count accessible via lineno" do
@@ -50,7 +50,7 @@
     describe "when no block is given" do
       it "returns an Enumerator" do
         enum = @io.send(@method)
-        enum.should be_an_instance_of(Enumerator)
+        enum.should.instance_of?(Enumerator)
 
         enum.each { |l| ScratchPad << l }
         ScratchPad.recorded.should == IOSpecs.lines
@@ -70,12 +70,12 @@
     describe "when limit is 0" do
       it "raises an ArgumentError" do
         # must pass block so Enumerator is evaluated and raises
-        -> { @io.send(@method, 0){} }.should raise_error(ArgumentError)
+        -> { @io.send(@method, 0){} }.should.raise(ArgumentError)
       end
     end
 
     it "does not accept Integers that don't fit in a C off_t" do
-      -> { @io.send(@method, 2**128){} }.should raise_error(RangeError)
+      -> { @io.send(@method, 2**128){} }.should.raise(RangeError)
     end
   end
 
@@ -126,7 +126,7 @@
     describe "when no block is given" do
       it "returns an Enumerator" do
         enum = @io.send(@method, nil, 1024)
-        enum.should be_an_instance_of(Enumerator)
+        enum.should.instance_of?(Enumerator)
 
         enum.each { |l| ScratchPad << l }
         ScratchPad.recorded.should == [IOSpecs.lines.join]
@@ -143,7 +143,7 @@
 
     describe "when a block is given" do
       it "accepts an empty block" do
-        @io.send(@method, nil, 1024) {}.should equal(@io)
+        @io.send(@method, nil, 1024) {}.should.equal?(@io)
       end
 
       describe "when passed nil as a separator" do
@@ -179,11 +179,11 @@
     it "raises exception when options passed as Hash" do
       -> {
         @io.send(@method, { chomp: true }) { |s| }
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
 
       -> {
         @io.send(@method, "\n", 1, { chomp: true }) { |s| }
-      }.should raise_error(ArgumentError, "wrong number of arguments (given 3, expected 0..2)")
+      }.should.raise(ArgumentError, "wrong number of arguments (given 3, expected 0..2)")
     end
   end
 
@@ -227,7 +227,7 @@
     it "raises ArgumentError" do
       -> {
         @io.send(@method, "", 1, "excess argument", chomp: true) {}
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/io/shared/new.rb b/spec/ruby/core/io/shared/new.rb
index e84133493c8..6f318ddee50 100644
--- a/spec/ruby/core/io/shared/new.rb
+++ b/spec/ruby/core/io/shared/new.rb
@@ -22,7 +22,7 @@
 
   it "creates an IO instance from an Integer argument" do
     @io = IO.send(@method, @fd, "w")
-    @io.should be_an_instance_of(IO)
+    @io.should.instance_of?(IO)
   end
 
   it "creates an IO instance when STDOUT is closed" do
@@ -32,7 +32,7 @@
 
       begin
         @io = IO.send(@method, @fd, "w")
-        @io.should be_an_instance_of(IO)
+        @io.should.instance_of?(IO)
       ensure
         STDOUT = stdout
         rm_r stdout_file
@@ -49,7 +49,7 @@
 
       begin
         @io = IO.send(@method, @fd, "w")
-        @io.should be_an_instance_of(IO)
+        @io.should.instance_of?(IO)
       ensure
         STDERR = stderr
         rm_r stderr_file
@@ -61,7 +61,7 @@
     obj = mock("file descriptor")
     obj.should_receive(:to_int).and_return(@fd)
     @io = IO.send(@method, obj, "w")
-    @io.should be_an_instance_of(IO)
+    @io.should.instance_of?(IO)
   end
 
   it "accepts options as keyword arguments" do
@@ -70,7 +70,7 @@
 
     -> {
       IO.send(@method, @fd, "w", {flags: File::CREAT})
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 3, expected 1..2)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 3, expected 1..2)")
   end
 
   it "accepts a :mode option" do
@@ -231,7 +231,7 @@
   it "raises ArgumentError for nil options" do
     -> {
       IO.send(@method, @fd, 'w', nil)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "coerces mode with #to_str" do
@@ -314,100 +314,100 @@
   end
 
   it "raises an Errno::EBADF if the file descriptor is not valid" do
-    -> { IO.send(@method, -1, "w") }.should raise_error(Errno::EBADF)
+    -> { IO.send(@method, -1, "w") }.should.raise(Errno::EBADF)
   end
 
   it "raises an IOError if passed a closed stream" do
-    -> { IO.send(@method, IOSpecs.closed_io.fileno, 'w') }.should raise_error(IOError)
+    -> { IO.send(@method, IOSpecs.closed_io.fileno, 'w') }.should.raise(IOError)
   end
 
   platform_is_not :windows do
     it "raises an Errno::EINVAL if the new mode is not compatible with the descriptor's current mode" do
-      -> { IO.send(@method, @fd, "r") }.should raise_error(Errno::EINVAL)
+      -> { IO.send(@method, @fd, "r") }.should.raise(Errno::EINVAL)
     end
   end
 
   it "raises ArgumentError if passed an empty mode string" do
-    -> { IO.send(@method, @fd, "") }.should raise_error(ArgumentError)
+    -> { IO.send(@method, @fd, "") }.should.raise(ArgumentError)
   end
 
   it "raises an error if passed modes two ways" do
     -> {
       IO.send(@method, @fd, "w", mode: "w")
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error if passed encodings two ways" do
     -> {
       @io = IO.send(@method, @fd, 'w:ISO-8859-1', encoding: 'ISO-8859-1')
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, 'w:ISO-8859-1', external_encoding: 'ISO-8859-1')
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, 'w:ISO-8859-1', internal_encoding: 'ISO-8859-1')
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, 'w:ISO-8859-1:UTF-8', internal_encoding: 'ISO-8859-1')
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error if passed matching binary/text mode two ways" do
     -> {
       @io = IO.send(@method, @fd, "wb", binmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, "wt", textmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       @io = IO.send(@method, @fd, "wb", textmode: false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, "wt", binmode: false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error if passed conflicting binary/text mode two ways" do
     -> {
       @io = IO.send(@method, @fd, "wb", binmode: false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, "wt", textmode: false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       @io = IO.send(@method, @fd, "wb", textmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, "wt", binmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error when trying to set both binmode and textmode" do
     -> {
       @io = IO.send(@method, @fd, "w", textmode: true, binmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, File::Constants::WRONLY, textmode: true, binmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if not passed a hash or nil for options" do
     -> {
       @io = IO.send(@method, @fd, 'w', false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, false, false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = IO.send(@method, @fd, nil, false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if passed a hash for mode and nil for options" do
     -> {
       @io = IO.send(@method, @fd, {mode: 'w'}, nil)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/io/shared/pos.rb b/spec/ruby/core/io/shared/pos.rb
index 3fdd3eb2b32..f4d04058637 100644
--- a/spec/ruby/core/io/shared/pos.rb
+++ b/spec/ruby/core/io/shared/pos.rb
@@ -19,7 +19,7 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.send(@method) }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.send(@method) }.should.raise(IOError)
   end
 
   it "resets #eof?" do
@@ -62,17 +62,17 @@
 
   it "raises TypeError when cannot convert implicitly argument to Integer" do
     File.open @fname do |io|
-      -> { io.send @method, Object.new }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+      -> { io.send @method, Object.new }.should.raise(TypeError, "no implicit conversion of Object into Integer")
     end
   end
 
   it "does not accept Integers that don't fit in a C off_t" do
     File.open @fname do |io|
-      -> { io.send @method, 2**128 }.should raise_error(RangeError)
+      -> { io.send @method, 2**128 }.should.raise(RangeError)
     end
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.send @method, 0 }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.send @method, 0 }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/shared/readlines.rb b/spec/ruby/core/io/shared/readlines.rb
index 77eb9cbd65c..f54fccc2e3f 100644
--- a/spec/ruby/core/io/shared/readlines.rb
+++ b/spec/ruby/core/io/shared/readlines.rb
@@ -1,11 +1,11 @@
 describe :io_readlines, shared: true do
   it "raises TypeError if the first parameter is nil" do
-    -> { IO.send(@method, nil, &@object) }.should raise_error(TypeError)
+    -> { IO.send(@method, nil, &@object) }.should.raise(TypeError)
   end
 
   it "raises an Errno::ENOENT if the file does not exist" do
     name = tmp("nonexistent.txt")
-    -> { IO.send(@method, name, &@object) }.should raise_error(Errno::ENOENT)
+    -> { IO.send(@method, name, &@object) }.should.raise(Errno::ENOENT)
   end
 
   it "yields a single string with entire content when the separator is nil" do
@@ -80,12 +80,12 @@
       end
 
       it "does not accept Integers that don't fit in a C off_t" do
-        -> { IO.send(@method, @name, 2**128, &@object) }.should raise_error(RangeError)
+        -> { IO.send(@method, @name, 2**128, &@object) }.should.raise(RangeError)
       end
 
       describe "when passed limit" do
         it "raises ArgumentError when passed 0 as a limit" do
-          -> { IO.send(@method, @name, 0, &@object) }.should raise_error(ArgumentError)
+          -> { IO.send(@method, @name, 0, &@object) }.should.raise(ArgumentError)
         end
       end
     end
@@ -106,7 +106,7 @@
       it "raises TypeError exception" do
         -> {
           IO.send(@method, @name, { chomp: true }, &@object)
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
       end
     end
 
@@ -116,7 +116,7 @@
 
         -> {
           IO.send(@method, @name, obj, &@object)
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
       end
     end
   end
@@ -170,7 +170,7 @@
 
         -> {
           IO.send(@method, @name, " ", obj, &@object)
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
       end
     end
 
@@ -178,7 +178,7 @@
       it "raises TypeError exception" do
         -> {
           IO.send(@method, @name, "", { chomp: true }, &@object)
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
       end
     end
   end
@@ -188,7 +188,7 @@
       it "uses the keyword arguments as options" do
         -> do
           IO.send(@method, @filename, 10, mode: "w", &@object)
-        end.should raise_error(IOError)
+        end.should.raise(IOError)
       end
     end
 
@@ -196,7 +196,7 @@
       it "uses the keyword arguments as options" do
         -> do
           IO.send(@method, @filename, " ", mode: "w", &@object)
-        end.should raise_error(IOError)
+        end.should.raise(IOError)
       end
     end
 
@@ -207,7 +207,7 @@
 
         -> do
           IO.send(@method, @filename, sep, mode: "w", &@object)
-        end.should raise_error(IOError)
+        end.should.raise(IOError)
       end
     end
   end
@@ -237,7 +237,7 @@
     it "uses the keyword arguments as options" do
       -> do
         IO.send(@method, @filename, " ", 10, mode: "w", &@object)
-      end.should raise_error(IOError)
+      end.should.raise(IOError)
     end
 
     describe "when passed chomp, nil as a separator, and a limit" do
diff --git a/spec/ruby/core/io/shared/tty.rb b/spec/ruby/core/io/shared/tty.rb
index 89ac08ec86a..1dc0e95739f 100644
--- a/spec/ruby/core/io/shared/tty.rb
+++ b/spec/ruby/core/io/shared/tty.rb
@@ -19,6 +19,6 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.send @method }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.send @method }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/shared/write.rb b/spec/ruby/core/io/shared/write.rb
index 964064746a1..5de9fe43352 100644
--- a/spec/ruby/core/io/shared/write.rb
+++ b/spec/ruby/core/io/shared/write.rb
@@ -23,7 +23,7 @@
   end
 
   it "checks if the file is writable if writing more than zero bytes" do
-    -> { @readonly_file.send(@method, "abcde") }.should raise_error(IOError)
+    -> { @readonly_file.send(@method, "abcde") }.should.raise(IOError)
   end
 
   it "returns the number of bytes written" do
@@ -66,7 +66,7 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.send(@method, "hello") }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.send(@method, "hello") }.should.raise(IOError)
   end
 
   describe "on a pipe" do
@@ -92,7 +92,7 @@
     guard_not -> { defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? } do
       it "raises Errno::EPIPE if the read end is closed and does not die from SIGPIPE" do
         @r.close
-        -> { @w.send(@method, "foo") }.should raise_error(Errno::EPIPE, /Broken pipe/)
+        -> { @w.send(@method, "foo") }.should.raise(Errno::EPIPE, /Broken pipe/)
       end
     end
   end
@@ -126,7 +126,7 @@
 
     File.open(@transcode_filename, "w", external_encoding: Encoding::UTF_16BE) do |file|
       file.external_encoding.should == Encoding::UTF_16BE
-      -> { file.send(@method, str) }.should raise_error(Encoding::UndefinedConversionError)
+      -> { file.send(@method, str) }.should.raise(Encoding::UndefinedConversionError)
     end
   end
 end
diff --git a/spec/ruby/core/io/stat_spec.rb b/spec/ruby/core/io/stat_spec.rb
index 717c45d0a3f..f9fc232ee00 100644
--- a/spec/ruby/core/io/stat_spec.rb
+++ b/spec/ruby/core/io/stat_spec.rb
@@ -12,14 +12,14 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.stat }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.stat }.should.raise(IOError)
   end
 
   it "returns a File::Stat object for the stream" do
-    STDOUT.stat.should be_an_instance_of(File::Stat)
+    STDOUT.stat.should.instance_of?(File::Stat)
   end
 
   it "can stat pipes" do
-    @io.stat.should be_an_instance_of(File::Stat)
+    @io.stat.should.instance_of?(File::Stat)
   end
 end
diff --git a/spec/ruby/core/io/sync_spec.rb b/spec/ruby/core/io/sync_spec.rb
index 993b7ee244d..b537db335bb 100644
--- a/spec/ruby/core/io/sync_spec.rb
+++ b/spec/ruby/core/io/sync_spec.rb
@@ -27,7 +27,7 @@
   end
 
   it "raises an IOError on closed stream" do
-    -> { IOSpecs.closed_io.sync = true }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.sync = true }.should.raise(IOError)
   end
 end
 
@@ -45,7 +45,7 @@
   end
 
   it "raises an IOError on closed stream" do
-    -> { IOSpecs.closed_io.sync }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.sync }.should.raise(IOError)
   end
 end
 
diff --git a/spec/ruby/core/io/sysopen_spec.rb b/spec/ruby/core/io/sysopen_spec.rb
index 7ad379df3ab..325d51ed23e 100644
--- a/spec/ruby/core/io/sysopen_spec.rb
+++ b/spec/ruby/core/io/sysopen_spec.rb
@@ -13,16 +13,16 @@
 
   it "returns the file descriptor for a given path" do
     @fd = IO.sysopen(@filename, "w")
-    @fd.should be_kind_of(Integer)
-    @fd.should_not equal(0)
+    @fd.should.is_a?(Integer)
+    @fd.should_not.equal?(0)
   end
 
   # opening a directory is not supported on Windows
   platform_is_not :windows do
     it "works on directories" do
       @fd = IO.sysopen(tmp(""))    # /tmp
-      @fd.should be_kind_of(Integer)
-      @fd.should_not equal(0)
+      @fd.should.is_a?(Integer)
+      @fd.should_not.equal?(0)
     end
   end
 
@@ -33,18 +33,18 @@
   end
 
   it "accepts a mode as second argument" do
-    -> { @fd = IO.sysopen(@filename, "w") }.should_not raise_error
-    @fd.should_not equal(0)
+    -> { @fd = IO.sysopen(@filename, "w") }.should_not.raise
+    @fd.should_not.equal?(0)
   end
 
   it "accepts permissions as third argument" do
     @fd = IO.sysopen(@filename, "w", 777)
-    @fd.should_not equal(0)
+    @fd.should_not.equal?(0)
   end
 
   it "accepts mode & permission that are nil" do
     touch @filename # create the file
     @fd = IO.sysopen(@filename, nil, nil)
-    @fd.should_not equal(0)
+    @fd.should_not.equal?(0)
   end
 end
diff --git a/spec/ruby/core/io/sysread_spec.rb b/spec/ruby/core/io/sysread_spec.rb
index d56a27b3af3..2d58db22504 100644
--- a/spec/ruby/core/io/sysread_spec.rb
+++ b/spec/ruby/core/io/sysread_spec.rb
@@ -52,7 +52,7 @@
 
   it "raises an error when called after buffered reads" do
     @file.readline
-    -> { @file.sysread(5) }.should raise_error(IOError)
+    -> { @file.sysread(5) }.should.raise(IOError)
   end
 
   it "reads normally even when called immediately after a buffered IO#read" do
@@ -63,13 +63,13 @@
   it "does not raise error if called after IO#read followed by IO#write" do
     @file.read(5)
     @file.write("abcde")
-    -> { @file.sysread(5) }.should_not raise_error(IOError)
+    -> { @file.sysread(5) }.should_not.raise(IOError)
   end
 
   it "does not raise error if called after IO#read followed by IO#syswrite" do
     @file.read(5)
     @file.syswrite("abcde")
-    -> { @file.sysread(5) }.should_not raise_error(IOError)
+    -> { @file.sysread(5) }.should_not.raise(IOError)
   end
 
   it "reads updated content after the flushed buffered IO#write" do
@@ -82,7 +82,7 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.sysread(5) }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.sysread(5) }.should.raise(IOError)
   end
 
   it "immediately returns an empty string if the length argument is 0" do
@@ -104,8 +104,8 @@
   it "discards the existing buffer content upon error" do
     buffer = +"existing content"
     @file.seek(0, :END)
-    -> { @file.sysread(1, buffer) }.should raise_error(EOFError)
-    buffer.should be_empty
+    -> { @file.sysread(1, buffer) }.should.raise(EOFError)
+    buffer.should.empty?
   end
 
   it "preserves the encoding of the given buffer" do
@@ -132,6 +132,6 @@
   end
 
   it "raises ArgumentError when length is less than 0" do
-    -> { @read.sysread(-1) }.should raise_error(ArgumentError)
+    -> { @read.sysread(-1) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/io/sysseek_spec.rb b/spec/ruby/core/io/sysseek_spec.rb
index 002f2a14ebe..2384895dc5d 100644
--- a/spec/ruby/core/io/sysseek_spec.rb
+++ b/spec/ruby/core/io/sysseek_spec.rb
@@ -23,7 +23,7 @@
 
   it "raises an error when called after buffered reads" do
     @io.readline
-    -> { @io.sysseek(-5, IO::SEEK_CUR) }.should raise_error(IOError)
+    -> { @io.sysseek(-5, IO::SEEK_CUR) }.should.raise(IOError)
   end
 
   it "seeks normally even when called immediately after a buffered IO#read" do
@@ -41,7 +41,7 @@
 
     # this is the safest way of checking the EOF when
     # sys-* methods are invoked
-    -> { @io.sysread(1) }.should raise_error(EOFError)
+    -> { @io.sysread(1) }.should.raise(EOFError)
 
     @io.sysseek(-25, IO::SEEK_END)
     @io.sysread(7).should == "cinco.\n"
diff --git a/spec/ruby/core/io/to_i_spec.rb b/spec/ruby/core/io/to_i_spec.rb
index acf138c6630..1d0cf2a1f6b 100644
--- a/spec/ruby/core/io/to_i_spec.rb
+++ b/spec/ruby/core/io/to_i_spec.rb
@@ -7,6 +7,6 @@
   end
 
   it "raises IOError on closed stream" do
-    -> { IOSpecs.closed_io.to_i }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.to_i }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/to_io_spec.rb b/spec/ruby/core/io/to_io_spec.rb
index 55a09777404..0b1809dffa6 100644
--- a/spec/ruby/core/io/to_io_spec.rb
+++ b/spec/ruby/core/io/to_io_spec.rb
@@ -11,11 +11,11 @@
   end
 
   it "returns self for open stream" do
-    @io.to_io.should equal(@io)
+    @io.to_io.should.equal?(@io)
   end
 
   it "returns self for closed stream" do
     io = IOSpecs.closed_io
-    io.to_io.should equal(io)
+    io.to_io.should.equal?(io)
   end
 end
diff --git a/spec/ruby/core/io/try_convert_spec.rb b/spec/ruby/core/io/try_convert_spec.rb
index a9e99de7aaa..7600b01b754 100644
--- a/spec/ruby/core/io/try_convert_spec.rb
+++ b/spec/ruby/core/io/try_convert_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it "returns the passed IO object" do
-    IO.try_convert(@io).should equal(@io)
+    IO.try_convert(@io).should.equal?(@io)
   end
 
   it "does not call #to_io on an IO instance" do
@@ -24,26 +24,26 @@
   it "calls #to_io to coerce an object" do
     obj = mock("io")
     obj.should_receive(:to_io).and_return(@io)
-    IO.try_convert(obj).should equal(@io)
+    IO.try_convert(obj).should.equal?(@io)
   end
 
   it "returns nil when the passed object does not respond to #to_io" do
-    IO.try_convert(mock("io")).should be_nil
+    IO.try_convert(mock("io")).should == nil
   end
 
   it "return nil when BasicObject is passed" do
-    IO.try_convert(BasicObject.new).should be_nil
+    IO.try_convert(BasicObject.new).should == nil
   end
 
   it "raises a TypeError if the object does not return an IO from #to_io" do
     obj = mock("io")
     obj.should_receive(:to_io).and_return("io")
-    -> { IO.try_convert(obj) }.should raise_error(TypeError, "can't convert MockObject to IO (MockObject#to_io gives String)")
+    -> { IO.try_convert(obj) }.should raise_consistent_error(TypeError, "can't convert MockObject into IO (MockObject#to_io gives String)")
   end
 
   it "propagates an exception raised by #to_io" do
     obj = mock("io")
     obj.should_receive(:to_io).and_raise(TypeError.new)
-    ->{ IO.try_convert(obj) }.should raise_error(TypeError)
+    ->{ IO.try_convert(obj) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/io/ungetbyte_spec.rb b/spec/ruby/core/io/ungetbyte_spec.rb
index 716743a6aff..e0615cd76c9 100644
--- a/spec/ruby/core/io/ungetbyte_spec.rb
+++ b/spec/ruby/core/io/ungetbyte_spec.rb
@@ -13,12 +13,12 @@
   end
 
   it "does nothing when passed nil" do
-    @io.ungetbyte(nil).should be_nil
+    @io.ungetbyte(nil).should == nil
     @io.getbyte.should == 97
   end
 
   it "puts back each byte in a String argument" do
-    @io.ungetbyte("cat").should be_nil
+    @io.ungetbyte("cat").should == nil
     @io.getbyte.should == 99
     @io.getbyte.should == 97
     @io.getbyte.should == 116
@@ -29,7 +29,7 @@
     str = mock("io ungetbyte")
     str.should_receive(:to_str).and_return("dog")
 
-    @io.ungetbyte(str).should be_nil
+    @io.ungetbyte(str).should == nil
     @io.getbyte.should == 100
     @io.getbyte.should == 111
     @io.getbyte.should == 103
@@ -38,17 +38,17 @@
 
   it "never raises RangeError" do
     for i in [4095, 0x4f7574206f6620636861722072616e67ff] do
-      @io.ungetbyte(i).should be_nil
+      @io.ungetbyte(i).should == nil
       @io.getbyte.should == 255
     end
   end
 
   it "raises IOError on stream not opened for reading" do
-    -> { STDOUT.ungetbyte(42) }.should raise_error(IOError, "not opened for reading")
+    -> { STDOUT.ungetbyte(42) }.should.raise(IOError, "not opened for reading")
   end
 
   it "raises an IOError if the IO is closed" do
     @io.close
-    -> { @io.ungetbyte(42) }.should raise_error(IOError)
+    -> { @io.ungetbyte(42) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/ungetc_spec.rb b/spec/ruby/core/io/ungetc_spec.rb
index 47a4e99ebf4..4a9e67f126b 100644
--- a/spec/ruby/core/io/ungetc_spec.rb
+++ b/spec/ruby/core/io/ungetc_spec.rb
@@ -100,17 +100,17 @@
   it "makes subsequent unbuffered operations to raise IOError" do
     @io.getc
     @io.ungetc(100)
-    -> { @io.sysread(1) }.should raise_error(IOError)
+    -> { @io.sysread(1) }.should.raise(IOError)
   end
 
   it "raises TypeError if passed nil" do
     @io.getc.should == ?V
-    proc{@io.ungetc(nil)}.should raise_error(TypeError)
+    proc{@io.ungetc(nil)}.should.raise(TypeError)
   end
 
   it "puts one or more characters back in the stream" do
     @io.gets
-    @io.ungetc("Aquí ").should be_nil
+    @io.ungetc("Aquí ").should == nil
     @io.gets.chomp.should == "Aquí Qui è la linea due."
   end
 
@@ -118,21 +118,21 @@
     chars = mock("io ungetc")
     chars.should_receive(:to_str).and_return("Aquí ")
 
-    @io.ungetc(chars).should be_nil
+    @io.ungetc(chars).should == nil
     @io.gets.chomp.should == "Aquí Voici la ligne une."
   end
 
   it "returns nil when invoked on stream that was not yet read" do
-    @io.ungetc(100).should be_nil
+    @io.ungetc(100).should == nil
   end
 
   it "raises IOError on stream not opened for reading" do
-    -> { STDOUT.ungetc(100) }.should raise_error(IOError, "not opened for reading")
+    -> { STDOUT.ungetc(100) }.should.raise(IOError, "not opened for reading")
   end
 
   it "raises IOError on closed stream" do
     @io.getc
     @io.close
-    -> { @io.ungetc(100) }.should raise_error(IOError)
+    -> { @io.ungetc(100) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/core/io/write_nonblock_spec.rb b/spec/ruby/core/io/write_nonblock_spec.rb
index 5bfc690f9ba..a6bd43c0581 100644
--- a/spec/ruby/core/io/write_nonblock_spec.rb
+++ b/spec/ruby/core/io/write_nonblock_spec.rb
@@ -44,7 +44,7 @@
     it "checks if the file is writable if writing zero bytes" do
       -> {
         @readonly_file.write_nonblock("")
-      }.should raise_error(IOError)
+      }.should.raise(IOError)
     end
   end
 
@@ -67,12 +67,12 @@
   it "raises an exception extending IO::WaitWritable when the write would block" do
     -> {
       loop { @write.write_nonblock('a' * 10_000) }
-    }.should raise_error(IO::WaitWritable) { |e|
+    }.should.raise(IO::WaitWritable) { |e|
       platform_is_not :windows do
-        e.should be_kind_of(Errno::EAGAIN)
+        e.should.is_a?(Errno::EAGAIN)
       end
       platform_is :windows do
-        e.should be_kind_of(Errno::EWOULDBLOCK)
+        e.should.is_a?(Errno::EWOULDBLOCK)
       end
     }
   end
diff --git a/spec/ruby/core/io/write_spec.rb b/spec/ruby/core/io/write_spec.rb
index 95e6371985b..1a745ba0124 100644
--- a/spec/ruby/core/io/write_spec.rb
+++ b/spec/ruby/core/io/write_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "does not check if the file is writable if writing zero bytes" do
-    -> { @readonly_file.write("") }.should_not raise_error
+    -> { @readonly_file.write("") }.should_not.raise
   end
 
   before :each do
@@ -113,7 +113,7 @@
     # pack "\xFEhi" to avoid utf-8 conflict
     xFEhi = ([254].pack('C*') + 'hi').force_encoding('utf-8')
     File.open(@filename, "w", encoding: Encoding::US_ASCII) do |file|
-      -> { file.write(xFEhi) }.should raise_error(Encoding::InvalidByteSequenceError)
+      -> { file.write(xFEhi) }.should.raise(Encoding::InvalidByteSequenceError)
     end
   end
 
@@ -157,7 +157,7 @@
   it "requires mode to be specified in :open_args" do
     -> {
       IO.write(@filename, 'hi', open_args: [{encoding: Encoding::UTF_32LE, binmode: true}])
-    }.should raise_error(IOError, "not opened for writing")
+    }.should.raise(IOError, "not opened for writing")
 
     IO.write(@filename, 'hi', open_args: ["w", {encoding: Encoding::UTF_32LE, binmode: true}]).should == 8
     IO.write(@filename, 'hi', open_args: [{encoding: Encoding::UTF_32LE, binmode: true, mode: "w"}]).should == 8
@@ -166,7 +166,7 @@
   it "requires mode to be specified in :open_args even if flags option passed" do
     -> {
       IO.write(@filename, 'hi', open_args: [{encoding: Encoding::UTF_32LE, binmode: true, flags: File::CREAT}])
-    }.should raise_error(IOError, "not opened for writing")
+    }.should.raise(IOError, "not opened for writing")
 
     IO.write(@filename, 'hi', open_args: ["w", {encoding: Encoding::UTF_32LE, binmode: true, flags: File::CREAT}]).should == 8
     IO.write(@filename, 'hi', open_args: [{encoding: Encoding::UTF_32LE, binmode: true, flags: File::CREAT, mode: "w"}]).should == 8
@@ -179,11 +179,11 @@
   it "raises ArgumentError if encoding is specified in mode parameter and is given as :encoding option" do
     -> {
       IO.write(@filename, 'hi', mode: "w:UTF-16LE:UTF-16BE", encoding: Encoding::UTF_32LE)
-    }.should raise_error(ArgumentError, "encoding specified twice")
+    }.should.raise(ArgumentError, "encoding specified twice")
 
     -> {
       IO.write(@filename, 'hi', mode: "w:UTF-16BE", encoding: Encoding::UTF_32LE)
-    }.should raise_error(ArgumentError, "encoding specified twice")
+    }.should.raise(ArgumentError, "encoding specified twice")
   end
 
   it "writes the file with the permissions in the :perm parameter" do
diff --git a/spec/ruby/core/kernel/Array_spec.rb b/spec/ruby/core/kernel/Array_spec.rb
index b4a8bb75991..063faf70971 100644
--- a/spec/ruby/core/kernel/Array_spec.rb
+++ b/spec/ruby/core/kernel/Array_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel" do
   it "has private instance method Array()" do
-    Kernel.should have_private_instance_method(:Array)
+    Kernel.private_instance_methods(false).should.include?(:Array)
   end
 end
 
@@ -77,14 +77,14 @@
     obj = mock("Array() string")
     obj.should_receive(:to_ary).and_return("string")
 
-    -> { @object.send(@method, obj) }.should raise_error(TypeError)
+    -> { @object.send(@method, obj) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_a does not return an Array" do
     obj = mock("Array() string")
     obj.should_receive(:to_a).and_return("string")
 
-    -> { @object.send(@method, obj) }.should raise_error(TypeError)
+    -> { @object.send(@method, obj) }.should.raise(TypeError)
   end
 end
 
diff --git a/spec/ruby/core/kernel/Complex_spec.rb b/spec/ruby/core/kernel/Complex_spec.rb
index 346d50ab5e5..92ce183cc8b 100644
--- a/spec/ruby/core/kernel/Complex_spec.rb
+++ b/spec/ruby/core/kernel/Complex_spec.rb
@@ -19,19 +19,19 @@
 
   describe "when passed [Integer, Integer]" do
     it "returns a new Complex number" do
-      Complex(1, 2).should be_an_instance_of(Complex)
+      Complex(1, 2).should.instance_of?(Complex)
       Complex(1, 2).real.should == 1
       Complex(1, 2).imag.should == 2
 
-      Complex(-3, -5).should be_an_instance_of(Complex)
+      Complex(-3, -5).should.instance_of?(Complex)
       Complex(-3, -5).real.should == -3
       Complex(-3, -5).imag.should == -5
 
-      Complex(3.5, -4.5).should be_an_instance_of(Complex)
+      Complex(3.5, -4.5).should.instance_of?(Complex)
       Complex(3.5, -4.5).real.should == 3.5
       Complex(3.5, -4.5).imag.should == -4.5
 
-      Complex(bignum_value, 30).should be_an_instance_of(Complex)
+      Complex(bignum_value, 30).should.instance_of?(Complex)
       Complex(bignum_value, 30).real.should == bignum_value
       Complex(bignum_value, 30).imag.should == 30
     end
@@ -41,19 +41,19 @@
     it "returns a new Complex number with 0 as the imaginary component" do
       # Guard against the Mathn library
       guard -> { !defined?(Math.rsqrt) } do
-        Complex(1).should be_an_instance_of(Complex)
+        Complex(1).should.instance_of?(Complex)
         Complex(1).imag.should == 0
         Complex(1).real.should == 1
 
-        Complex(-3).should be_an_instance_of(Complex)
+        Complex(-3).should.instance_of?(Complex)
         Complex(-3).imag.should == 0
         Complex(-3).real.should == -3
 
-        Complex(-4.5).should be_an_instance_of(Complex)
+        Complex(-4.5).should.instance_of?(Complex)
         Complex(-4.5).imag.should == 0
         Complex(-4.5).real.should == -4.5
 
-        Complex(bignum_value).should be_an_instance_of(Complex)
+        Complex(bignum_value).should.instance_of?(Complex)
         Complex(bignum_value).imag.should == 0
         Complex(bignum_value).real.should == bignum_value
       end
@@ -67,47 +67,47 @@
       it "raises Encoding::CompatibilityError if String is in not ASCII-compatible encoding" do
         -> {
           Complex("79+4i".encode("UTF-16"))
-        }.should raise_error(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
+        }.should.raise(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
       end
 
       it "raises ArgumentError for unrecognised Strings" do
         -> {
           Complex("ruby")
-        }.should raise_error(ArgumentError, 'invalid value for convert(): "ruby"')
+        }.should.raise(ArgumentError, 'invalid value for convert(): "ruby"')
       end
 
       it "raises ArgumentError for trailing garbage" do
         -> {
           Complex("79+4iruby")
-        }.should raise_error(ArgumentError, 'invalid value for convert(): "79+4iruby"')
+        }.should.raise(ArgumentError, 'invalid value for convert(): "79+4iruby"')
       end
 
       it "does not understand Float::INFINITY" do
         -> {
           Complex("Infinity")
-        }.should raise_error(ArgumentError, 'invalid value for convert(): "Infinity"')
+        }.should.raise(ArgumentError, 'invalid value for convert(): "Infinity"')
 
         -> {
           Complex("-Infinity")
-        }.should raise_error(ArgumentError, 'invalid value for convert(): "-Infinity"')
+        }.should.raise(ArgumentError, 'invalid value for convert(): "-Infinity"')
       end
 
       it "does not understand Float::NAN" do
         -> {
           Complex("NaN")
-        }.should raise_error(ArgumentError, 'invalid value for convert(): "NaN"')
+        }.should.raise(ArgumentError, 'invalid value for convert(): "NaN"')
       end
 
       it "does not understand a sequence of _" do
         -> {
           Complex("7__9+4__0i")
-        }.should raise_error(ArgumentError, 'invalid value for convert(): "7__9+4__0i"')
+        }.should.raise(ArgumentError, 'invalid value for convert(): "7__9+4__0i"')
       end
 
       it "does not allow null-byte" do
         -> {
           Complex("1-2i\0")
-        }.should raise_error(ArgumentError, "string contains null byte")
+        }.should.raise(ArgumentError, "string contains null byte")
       end
     end
 
@@ -115,7 +115,7 @@
       it "raises Encoding::CompatibilityError if String is in not ASCII-compatible encoding" do
         -> {
           Complex("79+4i".encode("UTF-16"), exception: false)
-        }.should raise_error(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
+        }.should.raise(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
       end
 
       it "returns nil for unrecognised Strings" do
@@ -160,7 +160,7 @@
     it "returns the passed argument" do
       n = mock_numeric("unreal")
       n.should_receive(:real?).any_number_of_times.and_return(false)
-      Complex(n).should equal(n)
+      Complex(n).should.equal?(n)
     end
   end
 
@@ -169,8 +169,8 @@
       n = mock_numeric("real")
       n.should_receive(:real?).any_number_of_times.and_return(true)
       result = Complex(n)
-      result.real.should equal(n)
-      result.imag.should equal(0)
+      result.real.should.equal?(n)
+      result.imag.should.equal?(0)
     end
   end
 
@@ -185,7 +185,7 @@
         n2.should_receive(:real?).any_number_of_times.and_return(r2)
         n2.should_receive(:*).with(Complex(0, 1)).and_return(n3)
         n1.should_receive(:+).with(n3).and_return(n4)
-        Complex(n1, n2).should equal(n4)
+        Complex(n1, n2).should.equal?(n4)
       end
     end
   end
@@ -197,8 +197,8 @@
       n1.should_receive(:real?).any_number_of_times.and_return(true)
       n2.should_receive(:real?).any_number_of_times.and_return(true)
       result = Complex(n1, n2)
-      result.real.should equal(n1)
-      result.imag.should equal(n2)
+      result.real.should.equal?(n1)
+      result.imag.should.equal?(n2)
     end
   end
 
@@ -207,22 +207,22 @@
       n = mock("n")
       c = Complex(0, 0)
       n.should_receive(:to_c).and_return(c)
-      Complex(n).should equal(c)
+      Complex(n).should.equal?(c)
     end
   end
 
   describe "when passed a non-Numeric second argument" do
     it "raises TypeError" do
-      -> { Complex(:sym, :sym) }.should raise_error(TypeError)
-      -> { Complex(0,    :sym) }.should raise_error(TypeError)
+      -> { Complex(:sym, :sym) }.should.raise(TypeError)
+      -> { Complex(0,    :sym) }.should.raise(TypeError)
     end
   end
 
   describe "when passed nil" do
     it "raises TypeError" do
-      -> { Complex(nil) }.should raise_error(TypeError, "can't convert nil into Complex")
-      -> { Complex(0, nil) }.should raise_error(TypeError, "can't convert nil into Complex")
-      -> { Complex(nil, 0) }.should raise_error(TypeError, "can't convert nil into Complex")
+      -> { Complex(nil) }.should.raise(TypeError, "can't convert nil into Complex")
+      -> { Complex(0, nil) }.should.raise(TypeError, "can't convert nil into Complex")
+      -> { Complex(nil, 0) }.should.raise(TypeError, "can't convert nil into Complex")
     end
   end
 
@@ -241,7 +241,7 @@
 
     describe "and [non-Numeric, Numeric] argument" do
       it "throws a TypeError" do
-        -> { Complex(:sym, 0, exception: false) }.should raise_error(TypeError, "not a real")
+        -> { Complex(:sym, 0, exception: false) }.should.raise(TypeError, "not a real")
       end
     end
 
diff --git a/spec/ruby/core/kernel/Float_spec.rb b/spec/ruby/core/kernel/Float_spec.rb
index 9c436b05f73..f5566067ba8 100644
--- a/spec/ruby/core/kernel/Float_spec.rb
+++ b/spec/ruby/core/kernel/Float_spec.rb
@@ -6,7 +6,7 @@
     float = 1.12
     float2 = @object.send(:Float, float)
     float2.should == float
-    float2.should equal float
+    float2.should.equal? float
   end
 
   it "returns a Float for Fixnums" do
@@ -22,22 +22,22 @@
   end
 
   it "raises an ArgumentError for nil" do
-    -> { @object.send(:Float, nil) }.should raise_error(TypeError)
+    -> { @object.send(:Float, nil) }.should.raise(TypeError)
   end
 
   it "returns the identical NaN for NaN" do
     nan = nan_value
-    nan.nan?.should be_true
+    nan.nan?.should == true
     nan2 = @object.send(:Float, nan)
-    nan2.nan?.should be_true
-    nan2.should equal(nan)
+    nan2.nan?.should == true
+    nan2.should.equal?(nan)
   end
 
   it "returns the same Infinity for Infinity" do
     infinity = infinity_value
     infinity2 = @object.send(:Float, infinity)
     infinity2.should == infinity_value
-    infinity.should equal(infinity2)
+    infinity.should.equal?(infinity2)
   end
 
   it "converts Strings to floats without calling #to_f" do
@@ -51,30 +51,30 @@
   end
 
   it "raises an ArgumentError for a String of word characters" do
-    -> { @object.send(:Float, "float") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "float") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String with string in error message" do
-    -> { @object.send(:Float, "foo") }.should raise_error(ArgumentError) { |e|
+    -> { @object.send(:Float, "foo") }.should.raise(ArgumentError) { |e|
       e.message.should == 'invalid value for Float(): "foo"'
     }
   end
 
   it "raises an ArgumentError if there are two decimal points in the String" do
-    -> { @object.send(:Float, "10.0.0") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "10.0.0") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String of numbers followed by word characters" do
-    -> { @object.send(:Float, "10D") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "10D") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String of word characters followed by numbers" do
-    -> { @object.send(:Float, "D10") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "D10") }.should.raise(ArgumentError)
   end
 
   it "is strict about the string form even across newlines" do
-    -> { @object.send(:Float, "not a number\n10") }.should raise_error(ArgumentError)
-    -> { @object.send(:Float, "10\nnot a number") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "not a number\n10") }.should.raise(ArgumentError)
+    -> { @object.send(:Float, "10\nnot a number") }.should.raise(ArgumentError)
   end
 
   it "converts String subclasses to floats without calling #to_f" do
@@ -96,17 +96,17 @@ def to_f() 1.2 end
   end
 
   it "raises an ArgumentError if a + or - is embedded in a String" do
-    -> { @object.send(:Float, "1+1") }.should raise_error(ArgumentError)
-    -> { @object.send(:Float, "1-1") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "1+1") }.should.raise(ArgumentError)
+    -> { @object.send(:Float, "1-1") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if a String has a trailing + or -" do
-    -> { @object.send(:Float, "11+") }.should raise_error(ArgumentError)
-    -> { @object.send(:Float, "11-") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "11+") }.should.raise(ArgumentError)
+    -> { @object.send(:Float, "11-") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String with a leading _" do
-    -> { @object.send(:Float, "_1") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "_1") }.should.raise(ArgumentError)
   end
 
   it "returns a value for a String with an embedded _" do
@@ -114,31 +114,31 @@ def to_f() 1.2 end
   end
 
   it "raises an ArgumentError for a String with a trailing _" do
-    -> { @object.send(:Float, "10_") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "10_") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String of \\0" do
-    -> { @object.send(:Float, "\0") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "\0") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String with a leading \\0" do
-    -> { @object.send(:Float, "\01") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "\01") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String with an embedded \\0" do
-    -> { @object.send(:Float, "1\01") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "1\01") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String with a trailing \\0" do
-    -> { @object.send(:Float, "1\0") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "1\0") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String that is just an empty space" do
-    -> { @object.send(:Float, " ") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, " ") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a String that with an embedded space" do
-    -> { @object.send(:Float, "1 2") }.should raise_error(ArgumentError)
+    -> { @object.send(:Float, "1 2") }.should.raise(ArgumentError)
   end
 
   it "returns a value for a String with a leading space" do
@@ -159,11 +159,11 @@ def to_f() 1.2 end
 
   ruby_version_is ""..."3.4" do
     it "raises ArgumentError if a fractional part is missing" do
-      -> { @object.send(:Float, "1.") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "+1.") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "-1.") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "1.e+0") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "1.e-2") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "1.") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "+1.") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "-1.") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "1.e+0") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "1.e-2") }.should.raise(ArgumentError)
     end
   end
 
@@ -179,11 +179,11 @@ def to_f() 1.2 end
 
   %w(e E).each do |e|
     it "raises an ArgumentError if #{e} is the trailing character" do
-      -> { @object.send(:Float, "2#{e}") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "2#{e}") }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError if #{e} is the leading character" do
-      -> { @object.send(:Float, "#{e}2") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "#{e}2") }.should.raise(ArgumentError)
     end
 
     it "returns Infinity for '2#{e}1000'" do
@@ -201,18 +201,18 @@ def to_f() 1.2 end
     end
 
     it "raises an exception if a space is embedded on either side of the '#{e}'" do
-      -> { @object.send(:Float, "2 0#{e}100") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "20#{e}1 00") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "2 0#{e}100") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "20#{e}1 00") }.should.raise(ArgumentError)
     end
 
     it "raises an exception if there's a leading _ on either side of the '#{e}'" do
-      -> { @object.send(:Float, "_20#{e}100") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "20#{e}_100") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "_20#{e}100") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "20#{e}_100") }.should.raise(ArgumentError)
     end
 
     it "raises an exception if there's a trailing _ on either side of the '#{e}'" do
-      -> { @object.send(:Float, "20_#{e}100") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "20#{e}100_") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "20_#{e}100") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "20#{e}100_") }.should.raise(ArgumentError)
     end
 
     it "allows decimal points on the left side of the '#{e}'" do
@@ -220,7 +220,7 @@ def to_f() 1.2 end
     end
 
     it "raises an ArgumentError if there's a decimal point on the right side of the '#{e}'" do
-      -> { @object.send(:Float, "20#{e}2.0") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "20#{e}2.0") }.should.raise(ArgumentError)
     end
   end
 
@@ -241,8 +241,8 @@ def to_f() 1.2 end
 
     ruby_version_is ""..."3.4.3" do
       it "does not accept embedded _ if the number contains a-f" do
-        -> { @object.send(:Float, "0x1_0a") }.should raise_error(ArgumentError)
-        @object.send(:Float, "0x1_0a", exception: false).should be_nil
+        -> { @object.send(:Float, "0x1_0a") }.should.raise(ArgumentError)
+        @object.send(:Float, "0x1_0a", exception: false).should == nil
       end
     end
 
@@ -253,12 +253,12 @@ def to_f() 1.2 end
     end
 
     it "does not accept _ before, after or inside the 0x prefix" do
-      -> { @object.send(:Float, "_0x10") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "0_x10") }.should raise_error(ArgumentError)
-      -> { @object.send(:Float, "0x_10") }.should raise_error(ArgumentError)
-      @object.send(:Float, "_0x10", exception: false).should be_nil
-      @object.send(:Float, "0_x10", exception: false).should be_nil
-      @object.send(:Float, "0x_10", exception: false).should be_nil
+      -> { @object.send(:Float, "_0x10") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "0_x10") }.should.raise(ArgumentError)
+      -> { @object.send(:Float, "0x_10") }.should.raise(ArgumentError)
+      @object.send(:Float, "_0x10", exception: false).should == nil
+      @object.send(:Float, "0_x10", exception: false).should == nil
+      @object.send(:Float, "0x_10", exception: false).should == nil
     end
 
     it "parses negative hexadecimal string as negative float" do
@@ -282,11 +282,11 @@ def to_f() 1.2 end
         end
 
         it "raises an ArgumentError if #{p} is the trailing character" do
-          -> { @object.send(:Float, "0x1#{p}") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x1#{p}") }.should.raise(ArgumentError)
         end
 
         it "raises an ArgumentError if #{p} is the leading character" do
-          -> { @object.send(:Float, "0x#{p}1") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x#{p}1") }.should.raise(ArgumentError)
         end
 
         it "returns Infinity for '0x1#{p}10000'" do
@@ -304,18 +304,18 @@ def to_f() 1.2 end
         end
 
         it "raises an exception if a space is embedded on either side of the '#{p}'" do
-          -> { @object.send(:Float, "0x1 0#{p}10") }.should raise_error(ArgumentError)
-          -> { @object.send(:Float, "0x10#{p}1 0") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x1 0#{p}10") }.should.raise(ArgumentError)
+          -> { @object.send(:Float, "0x10#{p}1 0") }.should.raise(ArgumentError)
         end
 
         it "raises an exception if there's a leading _ on either side of the '#{p}'" do
-          -> { @object.send(:Float, "0x_10#{p}10") }.should raise_error(ArgumentError)
-          -> { @object.send(:Float, "0x10#{p}_10") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x_10#{p}10") }.should.raise(ArgumentError)
+          -> { @object.send(:Float, "0x10#{p}_10") }.should.raise(ArgumentError)
         end
 
         it "raises an exception if there's a trailing _ on either side of the '#{p}'" do
-          -> { @object.send(:Float, "0x10_#{p}10") }.should raise_error(ArgumentError)
-          -> { @object.send(:Float, "0x10#{p}10_") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x10_#{p}10") }.should.raise(ArgumentError)
+          -> { @object.send(:Float, "0x10#{p}10_") }.should.raise(ArgumentError)
         end
 
         it "allows hexadecimal points on the left side of the '#{p}'" do
@@ -323,7 +323,7 @@ def to_f() 1.2 end
         end
 
         it "raises an ArgumentError if there's a decimal point on the right side of the '#{p}'" do
-          -> { @object.send(:Float, "0x1#{p}1.0") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x1#{p}1.0") }.should.raise(ArgumentError)
         end
       end
     end
@@ -344,34 +344,34 @@ def to_f() 1.2 end
     nan = nan_value
     (nan_to_f = mock('NaN')).should_receive(:to_f).once.and_return(nan)
     nan2 = @object.send(:Float, nan_to_f)
-    nan2.nan?.should be_true
-    nan2.should equal(nan)
+    nan2.nan?.should == true
+    nan2.should.equal?(nan)
   end
 
   it "returns the identical Infinity if #to_f is called and it returns Infinity" do
     infinity = infinity_value
     (infinity_to_f = mock('Infinity')).should_receive(:to_f).once.and_return(infinity)
     infinity2 = @object.send(:Float, infinity_to_f)
-    infinity2.should equal(infinity)
+    infinity2.should.equal?(infinity)
   end
 
   it "raises a TypeError if #to_f is not provided" do
-    -> { @object.send(:Float, mock('x')) }.should raise_error(TypeError)
+    -> { @object.send(:Float, mock('x')) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_f returns a String" do
     (obj = mock('ha!')).should_receive(:to_f).once.and_return('ha!')
-    -> { @object.send(:Float, obj) }.should raise_error(TypeError)
+    -> { @object.send(:Float, obj) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_f returns an Integer" do
     (obj = mock('123')).should_receive(:to_f).once.and_return(123)
-    -> { @object.send(:Float, obj) }.should raise_error(TypeError)
+    -> { @object.send(:Float, obj) }.should.raise(TypeError)
   end
 
   it "raises a RangeError when passed a Complex argument" do
     c = Complex(2, 3)
-    -> { @object.send(:Float, c) }.should raise_error(RangeError)
+    -> { @object.send(:Float, c) }.should.raise(RangeError)
   end
 
   describe "when passed exception: false" do
@@ -408,6 +408,6 @@ def to_f() 1.2 end
 
 describe "Kernel#Float" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:Float)
+    Kernel.private_instance_methods(false).should.include?(:Float)
   end
 end
diff --git a/spec/ruby/core/kernel/Hash_spec.rb b/spec/ruby/core/kernel/Hash_spec.rb
index cbe098a8ac2..ee16f56a90e 100644
--- a/spec/ruby/core/kernel/Hash_spec.rb
+++ b/spec/ruby/core/kernel/Hash_spec.rb
@@ -13,7 +13,7 @@
 
 describe "Kernel" do
   it "has private instance method Hash()" do
-    Kernel.should have_private_instance_method(:Hash)
+    Kernel.private_instance_methods(false).should.include?(:Hash)
   end
 end
 
@@ -43,14 +43,14 @@
   end
 
   it "raises a TypeError if it doesn't respond to #to_hash" do
-    -> { @object.send(@method, mock("")) }.should raise_error(TypeError)
+    -> { @object.send(@method, mock("")) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_hash does not return an Hash" do
     obj = mock("Hash() string")
     obj.should_receive(:to_hash).and_return("string")
 
-    -> { @object.send(@method, obj) }.should raise_error(TypeError)
+    -> { @object.send(@method, obj) }.should.raise(TypeError)
   end
 end
 
diff --git a/spec/ruby/core/kernel/Integer_spec.rb b/spec/ruby/core/kernel/Integer_spec.rb
index c62b8b08013..f61cca74633 100644
--- a/spec/ruby/core/kernel/Integer_spec.rb
+++ b/spec/ruby/core/kernel/Integer_spec.rb
@@ -14,7 +14,7 @@
     obj = mock("object")
     obj.should_receive(:to_int).and_return("1")
     obj.should_receive(:to_i).and_return(nil)
-    -> { Integer(obj) }.should raise_error(TypeError)
+    -> { Integer(obj) }.should.raise(TypeError)
   end
 
   it "return a result of to_i when to_int does not return an Integer" do
@@ -25,12 +25,12 @@
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Integer(nil) }.should raise_error(TypeError)
+    -> { Integer(nil) }.should.raise(TypeError)
   end
 
   it "returns an Integer object" do
-    Integer(2).should be_an_instance_of(Integer)
-    Integer(9**99).should be_an_instance_of(Integer)
+    Integer(2).should.instance_of?(Integer)
+    Integer(9**99).should.instance_of?(Integer)
   end
 
   it "truncates Floats" do
@@ -67,26 +67,26 @@
   it "raises a TypeError if to_i returns a value that is not an Integer" do
     obj = mock("object")
     obj.should_receive(:to_i).and_return("1")
-    -> { Integer(obj) }.should raise_error(TypeError)
+    -> { Integer(obj) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if no to_int or to_i methods exist" do
     obj = mock("object")
-    -> { Integer(obj) }.should raise_error(TypeError)
+    -> { Integer(obj) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if to_int returns nil and no to_i exists" do
     obj = mock("object")
     obj.should_receive(:to_i).and_return(nil)
-    -> { Integer(obj) }.should raise_error(TypeError)
+    -> { Integer(obj) }.should.raise(TypeError)
   end
 
   it "raises a FloatDomainError when passed NaN" do
-    -> { Integer(nan_value) }.should raise_error(FloatDomainError)
+    -> { Integer(nan_value) }.should.raise(FloatDomainError)
   end
 
   it "raises a FloatDomainError when passed Infinity" do
-    -> { Integer(infinity_value) }.should raise_error(FloatDomainError)
+    -> { Integer(infinity_value) }.should.raise(FloatDomainError)
   end
 
   describe "when passed exception: false" do
@@ -147,19 +147,19 @@
 
 describe :kernel_integer_string, shared: true do
   it "raises an ArgumentError if the String is a null byte" do
-    -> { Integer("\0") }.should raise_error(ArgumentError)
+    -> { Integer("\0") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the String starts with a null byte" do
-    -> { Integer("\01") }.should raise_error(ArgumentError)
+    -> { Integer("\01") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the String ends with a null byte" do
-    -> { Integer("1\0") }.should raise_error(ArgumentError)
+    -> { Integer("1\0") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the String contains a null byte" do
-    -> { Integer("1\01") }.should raise_error(ArgumentError)
+    -> { Integer("1\01") }.should.raise(ArgumentError)
   end
 
   it "ignores leading whitespace" do
@@ -175,13 +175,13 @@
   end
 
   it "raises an ArgumentError if there are leading _s" do
-    -> { Integer("_1") }.should raise_error(ArgumentError)
-    -> { Integer("___1") }.should raise_error(ArgumentError)
+    -> { Integer("_1") }.should.raise(ArgumentError)
+    -> { Integer("___1") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there are trailing _s" do
-    -> { Integer("1_") }.should raise_error(ArgumentError)
-    -> { Integer("1___") }.should raise_error(ArgumentError)
+    -> { Integer("1_") }.should.raise(ArgumentError)
+    -> { Integer("1___") }.should.raise(ArgumentError)
   end
 
   it "ignores an embedded _" do
@@ -189,8 +189,8 @@
   end
 
   it "raises an ArgumentError if there are multiple embedded _s" do
-    -> { Integer("1__1") }.should raise_error(ArgumentError)
-    -> { Integer("1___1") }.should raise_error(ArgumentError)
+    -> { Integer("1__1") }.should.raise(ArgumentError)
+    -> { Integer("1___1") }.should.raise(ArgumentError)
   end
 
   it "ignores a single leading +" do
@@ -198,17 +198,17 @@
   end
 
   it "raises an ArgumentError if there is a space between the + and number" do
-    -> { Integer("+ 1") }.should raise_error(ArgumentError)
+    -> { Integer("+ 1") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there are multiple leading +s" do
-    -> { Integer("++1") }.should raise_error(ArgumentError)
-    -> { Integer("+++1") }.should raise_error(ArgumentError)
+    -> { Integer("++1") }.should.raise(ArgumentError)
+    -> { Integer("+++1") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there are trailing +s" do
-    -> { Integer("1+") }.should raise_error(ArgumentError)
-    -> { Integer("1+++") }.should raise_error(ArgumentError)
+    -> { Integer("1+") }.should.raise(ArgumentError)
+    -> { Integer("1+++") }.should.raise(ArgumentError)
   end
 
   it "makes the number negative if there's a leading -" do
@@ -216,21 +216,21 @@
   end
 
   it "raises an ArgumentError if there are multiple leading -s" do
-    -> { Integer("--1") }.should raise_error(ArgumentError)
-    -> { Integer("---1") }.should raise_error(ArgumentError)
+    -> { Integer("--1") }.should.raise(ArgumentError)
+    -> { Integer("---1") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there are trailing -s" do
-    -> { Integer("1-") }.should raise_error(ArgumentError)
-    -> { Integer("1---") }.should raise_error(ArgumentError)
+    -> { Integer("1-") }.should.raise(ArgumentError)
+    -> { Integer("1---") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there is a period" do
-    -> { Integer("0.0") }.should raise_error(ArgumentError)
+    -> { Integer("0.0") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for an empty String" do
-    -> { Integer("") }.should raise_error(ArgumentError)
+    -> { Integer("") }.should.raise(ArgumentError)
   end
 
   describe "when passed exception: false" do
@@ -280,7 +280,7 @@
     end
 
     it "raises an ArgumentError if the number cannot be parsed as hex" do
-      -> { Integer("0#{x}g") }.should raise_error(ArgumentError)
+      -> { Integer("0#{x}g") }.should.raise(ArgumentError)
     end
   end
 
@@ -301,7 +301,7 @@
     end
 
     it "raises an ArgumentError if the number cannot be parsed as binary" do
-      -> { Integer("0#{b}2") }.should raise_error(ArgumentError)
+      -> { Integer("0#{b}2") }.should.raise(ArgumentError)
     end
   end
 
@@ -322,7 +322,7 @@
     end
 
     it "raises an ArgumentError if the number cannot be parsed as octal" do
-      -> { Integer("0#{o}9") }.should raise_error(ArgumentError)
+      -> { Integer("0#{o}9") }.should.raise(ArgumentError)
     end
   end
 
@@ -343,26 +343,26 @@
     end
 
     it "raises an ArgumentError if the number cannot be parsed as decimal" do
-      -> { Integer("0#{d}a") }.should raise_error(ArgumentError)
+      -> { Integer("0#{d}a") }.should.raise(ArgumentError)
     end
   end
 end
 
 describe :kernel_integer_string_base, shared: true do
   it "raises an ArgumentError if the String is a null byte" do
-    -> { Integer("\0", 2) }.should raise_error(ArgumentError)
+    -> { Integer("\0", 2) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the String starts with a null byte" do
-    -> { Integer("\01", 3) }.should raise_error(ArgumentError)
+    -> { Integer("\01", 3) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the String ends with a null byte" do
-    -> { Integer("1\0", 4) }.should raise_error(ArgumentError)
+    -> { Integer("1\0", 4) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the String contains a null byte" do
-    -> { Integer("1\01", 5) }.should raise_error(ArgumentError)
+    -> { Integer("1\01", 5) }.should.raise(ArgumentError)
   end
 
   it "ignores leading whitespace" do
@@ -378,13 +378,13 @@
   end
 
   it "raises an ArgumentError if there are leading _s" do
-    -> { Integer("_1", 7) }.should raise_error(ArgumentError)
-    -> { Integer("___1", 7) }.should raise_error(ArgumentError)
+    -> { Integer("_1", 7) }.should.raise(ArgumentError)
+    -> { Integer("___1", 7) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there are trailing _s" do
-    -> { Integer("1_", 12) }.should raise_error(ArgumentError)
-    -> { Integer("1___", 12) }.should raise_error(ArgumentError)
+    -> { Integer("1_", 12) }.should.raise(ArgumentError)
+    -> { Integer("1___", 12) }.should.raise(ArgumentError)
   end
 
   it "ignores an embedded _" do
@@ -392,8 +392,8 @@
   end
 
   it "raises an ArgumentError if there are multiple embedded _s" do
-    -> { Integer("1__1", 4) }.should raise_error(ArgumentError)
-    -> { Integer("1___1", 4) }.should raise_error(ArgumentError)
+    -> { Integer("1__1", 4) }.should.raise(ArgumentError)
+    -> { Integer("1___1", 4) }.should.raise(ArgumentError)
   end
 
   it "ignores a single leading +" do
@@ -401,17 +401,17 @@
   end
 
   it "raises an ArgumentError if there is a space between the + and number" do
-    -> { Integer("+ 1", 3) }.should raise_error(ArgumentError)
+    -> { Integer("+ 1", 3) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there are multiple leading +s" do
-    -> { Integer("++1", 3) }.should raise_error(ArgumentError)
-    -> { Integer("+++1", 3) }.should raise_error(ArgumentError)
+    -> { Integer("++1", 3) }.should.raise(ArgumentError)
+    -> { Integer("+++1", 3) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there are trailing +s" do
-    -> { Integer("1+", 3) }.should raise_error(ArgumentError)
-    -> { Integer("1+++", 12) }.should raise_error(ArgumentError)
+    -> { Integer("1+", 3) }.should.raise(ArgumentError)
+    -> { Integer("1+++", 12) }.should.raise(ArgumentError)
   end
 
   it "makes the number negative if there's a leading -" do
@@ -419,29 +419,29 @@
   end
 
   it "raises an ArgumentError if there are multiple leading -s" do
-    -> { Integer("--1", 9) }.should raise_error(ArgumentError)
-    -> { Integer("---1", 9) }.should raise_error(ArgumentError)
+    -> { Integer("--1", 9) }.should.raise(ArgumentError)
+    -> { Integer("---1", 9) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there are trailing -s" do
-    -> { Integer("1-", 12) }.should raise_error(ArgumentError)
-    -> { Integer("1---", 12) }.should raise_error(ArgumentError)
+    -> { Integer("1-", 12) }.should.raise(ArgumentError)
+    -> { Integer("1---", 12) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if there is a period" do
-    -> { Integer("0.0", 3) }.should raise_error(ArgumentError)
+    -> { Integer("0.0", 3) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for an empty String" do
-    -> { Integer("", 12) }.should raise_error(ArgumentError)
+    -> { Integer("", 12) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a base of 1" do
-    -> { Integer("1", 1) }.should raise_error(ArgumentError)
+    -> { Integer("1", 1) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for a base of 37" do
-    -> { Integer("1", 37) }.should raise_error(ArgumentError)
+    -> { Integer("1", 37) }.should.raise(ArgumentError)
   end
 
   it "accepts wholly lowercase alphabetic strings for bases > 10" do
@@ -469,8 +469,8 @@
   end
 
   it "raises an ArgumentError for letters invalid in the given base" do
-    -> { Integer('z',19) }.should raise_error(ArgumentError)
-    -> { Integer('c00o',2) }.should raise_error(ArgumentError)
+    -> { Integer('z',19) }.should.raise(ArgumentError)
+    -> { Integer('c00o',2) }.should.raise(ArgumentError)
   end
 
   %w(x X).each do |x|
@@ -491,12 +491,12 @@
 
     2.upto(15) do |base|
       it "raises an ArgumentError if the number begins with 0#{x} and the base is #{base}" do
-        -> { Integer("0#{x}1", base) }.should raise_error(ArgumentError)
+        -> { Integer("0#{x}1", base) }.should.raise(ArgumentError)
       end
     end
 
     it "raises an ArgumentError if the number cannot be parsed as hex and the base is 16" do
-      -> { Integer("0#{x}g", 16) }.should raise_error(ArgumentError)
+      -> { Integer("0#{x}g", 16) }.should.raise(ArgumentError)
     end
   end
 
@@ -517,7 +517,7 @@
     end
 
     it "raises an ArgumentError if the number cannot be parsed as binary and the base is 2" do
-      -> { Integer("0#{b}2", 2) }.should raise_error(ArgumentError)
+      -> { Integer("0#{b}2", 2) }.should.raise(ArgumentError)
     end
   end
 
@@ -538,12 +538,12 @@
     end
 
     it "raises an ArgumentError if the number cannot be parsed as octal and the base is 8" do
-      -> { Integer("0#{o}9", 8) }.should raise_error(ArgumentError)
+      -> { Integer("0#{o}9", 8) }.should.raise(ArgumentError)
     end
 
     2.upto(7) do |base|
       it "raises an ArgumentError if the number begins with 0#{o} and the base is #{base}" do
-        -> { Integer("0#{o}1", base) }.should raise_error(ArgumentError)
+        -> { Integer("0#{o}1", base) }.should.raise(ArgumentError)
       end
     end
   end
@@ -565,18 +565,18 @@
     end
 
     it "raises an ArgumentError if the number cannot be parsed as decimal and the base is 10" do
-      -> { Integer("0#{d}a", 10) }.should raise_error(ArgumentError)
+      -> { Integer("0#{d}a", 10) }.should.raise(ArgumentError)
     end
 
     2.upto(9) do |base|
       it "raises an ArgumentError if the number begins with 0#{d} and the base is #{base}" do
-        -> { Integer("0#{d}1", base) }.should raise_error(ArgumentError)
+        -> { Integer("0#{d}1", base) }.should.raise(ArgumentError)
       end
     end
   end
 
   it "raises an ArgumentError if a base is given for a non-String value" do
-    -> { Integer(98, 15) }.should raise_error(ArgumentError)
+    -> { Integer(98, 15) }.should.raise(ArgumentError)
   end
 
   it "tries to convert the base to an integer using to_int" do
@@ -589,7 +589,7 @@
   it "raises a TypeError if it is not an integer and does not respond to #to_i" do
     -> {
       Integer("777", "8")
-    }.should raise_error(TypeError, "no implicit conversion of String into Integer")
+    }.should.raise(TypeError, "no implicit conversion of String into Integer")
   end
 
   describe "when passed exception: false" do
@@ -612,176 +612,176 @@
 describe :kernel_Integer, shared: true do
   it "raises an ArgumentError when the String contains digits out of range of radix 2" do
     str = "23456789abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 2) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 2) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 3" do
     str = "3456789abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 3) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 3) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 4" do
     str = "456789abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 4) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 4) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 5" do
     str = "56789abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 5) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 5) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 6" do
     str = "6789abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 6) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 6) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 7" do
     str = "789abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 7) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 7) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 8" do
     str = "89abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 8) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 8) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 9" do
     str = "9abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 9) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 9) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 10" do
     str = "abcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 10) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 10) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 11" do
     str = "bcdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 11) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 11) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 12" do
     str = "cdefghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 12) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 12) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 13" do
     str = "defghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 13) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 13) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 14" do
     str = "efghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 14) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 14) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 15" do
     str = "fghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 15) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 15) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 16" do
     str = "ghijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 16) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 16) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 17" do
     str = "hijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 17) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 17) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 18" do
     str = "ijklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 18) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 18) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 19" do
     str = "jklmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 19) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 19) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 20" do
     str = "klmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 20) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 20) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 21" do
     str = "lmnopqrstuvwxyz"
-    -> { @object.send(@method, str, 21) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 21) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 22" do
     str = "mnopqrstuvwxyz"
-    -> { @object.send(@method, str, 22) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 22) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 23" do
     str = "nopqrstuvwxyz"
-    -> { @object.send(@method, str, 23) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 23) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 24" do
     str = "opqrstuvwxyz"
-    -> { @object.send(@method, str, 24) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 24) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 25" do
     str = "pqrstuvwxyz"
-    -> { @object.send(@method, str, 25) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 25) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 26" do
     str = "qrstuvwxyz"
-    -> { @object.send(@method, str, 26) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 26) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 27" do
     str = "rstuvwxyz"
-    -> { @object.send(@method, str, 27) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 27) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 28" do
     str = "stuvwxyz"
-    -> { @object.send(@method, str, 28) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 28) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 29" do
     str = "tuvwxyz"
-    -> { @object.send(@method, str, 29) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 29) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 30" do
     str = "uvwxyz"
-    -> { @object.send(@method, str, 30) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 30) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 31" do
     str = "vwxyz"
-    -> { @object.send(@method, str, 31) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 31) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 32" do
     str = "wxyz"
-    -> { @object.send(@method, str, 32) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 32) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 33" do
     str = "xyz"
-    -> { @object.send(@method, str, 33) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 33) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 34" do
     str = "yz"
-    -> { @object.send(@method, str, 34) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 34) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 35" do
     str = "z"
-    -> { @object.send(@method, str, 35) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, str, 35) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the String contains digits out of range of radix 36" do
-    -> { @object.send(@method, "{", 36) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, "{", 36) }.should.raise(ArgumentError)
   end
 end
 
@@ -809,6 +809,6 @@
   it_behaves_like :kernel_integer_string_base, :Integer
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:Integer)
+    Kernel.private_instance_methods(false).should.include?(:Integer)
   end
 end
diff --git a/spec/ruby/core/kernel/Rational_spec.rb b/spec/ruby/core/kernel/Rational_spec.rb
index cc11a354515..b13ab4cf551 100644
--- a/spec/ruby/core/kernel/Rational_spec.rb
+++ b/spec/ruby/core/kernel/Rational_spec.rb
@@ -6,9 +6,9 @@
     # Guard against the Mathn library
     guard -> { !defined?(Math.rsqrt) } do
       it "returns a new Rational number with 1 as the denominator" do
-        Rational(1).should eql(Rational(1, 1))
-        Rational(-3).should eql(Rational(-3, 1))
-        Rational(bignum_value).should eql(Rational(bignum_value, 1))
+        Rational(1).should.eql?(Rational(1, 1))
+        Rational(-3).should.eql?(Rational(-3, 1))
+        Rational(bignum_value).should.eql?(Rational(bignum_value, 1))
       end
     end
   end
@@ -18,17 +18,17 @@
       rat = Rational(1, 2)
       rat.numerator.should == 1
       rat.denominator.should == 2
-      rat.should be_an_instance_of(Rational)
+      rat.should.instance_of?(Rational)
 
       rat = Rational(-3, -5)
       rat.numerator.should == 3
       rat.denominator.should == 5
-      rat.should be_an_instance_of(Rational)
+      rat.should.instance_of?(Rational)
 
       rat = Rational(bignum_value, 3)
       rat.numerator.should == bignum_value
       rat.denominator.should == 3
-      rat.should be_an_instance_of(Rational)
+      rat.should.instance_of?(Rational)
     end
 
     it "reduces the Rational" do
@@ -82,7 +82,7 @@
       end
 
       it "raises a RangeError if the imaginary part is not 0" do
-        -> { Rational(Complex(1, 2)) }.should raise_error(RangeError, "can't convert 1+2i into Rational")
+        -> { Rational(Complex(1, 2)) }.should.raise(RangeError, "can't convert 1+2i into Rational")
       end
     end
 
@@ -113,47 +113,47 @@ def obj.to_int; 1; end
     end
 
     it "raises TypeError if it neither responds to #to_r nor #to_int method" do
-      -> { Rational([]) }.should raise_error(TypeError, "can't convert Array into Rational")
-      -> { Rational({}) }.should raise_error(TypeError, "can't convert Hash into Rational")
-      -> { Rational(nil) }.should raise_error(TypeError, "can't convert nil into Rational")
+      -> { Rational([]) }.should.raise(TypeError, "can't convert Array into Rational")
+      -> { Rational({}) }.should.raise(TypeError, "can't convert Hash into Rational")
+      -> { Rational(nil) }.should.raise(TypeError, "can't convert nil into Rational")
     end
 
     it "swallows exception raised in #to_int method" do
       object = Object.new
       def object.to_int() raise NoMethodError; end
 
-      -> { Rational(object) }.should raise_error(TypeError)
-      -> { Rational(object, 1) }.should raise_error(TypeError)
-      -> { Rational(1, object) }.should raise_error(TypeError)
+      -> { Rational(object) }.should.raise(TypeError)
+      -> { Rational(object, 1) }.should.raise(TypeError)
+      -> { Rational(1, object) }.should.raise(TypeError)
     end
 
     it "raises TypeError if #to_r does not return Rational" do
       obj = Object.new
       def obj.to_r; []; end
 
-      -> { Rational(obj) }.should raise_error(TypeError, "can't convert Object to Rational (Object#to_r gives Array)")
+      -> { Rational(obj) }.should raise_consistent_error(TypeError, "can't convert Object into Rational (Object#to_r gives Array)")
     end
   end
 
   it "raises a ZeroDivisionError if the second argument is 0" do
-    -> { Rational(1, 0) }.should raise_error(ZeroDivisionError, "divided by 0")
-    -> { Rational(1, 0.0) }.should raise_error(ZeroDivisionError, "divided by 0")
+    -> { Rational(1, 0) }.should.raise(ZeroDivisionError, "divided by 0")
+    -> { Rational(1, 0.0) }.should.raise(ZeroDivisionError, "divided by 0")
   end
 
   it "raises a TypeError if the first argument is nil" do
-    -> { Rational(nil) }.should raise_error(TypeError, "can't convert nil into Rational")
+    -> { Rational(nil) }.should.raise(TypeError, "can't convert nil into Rational")
   end
 
   it "raises a TypeError if the second argument is nil" do
-    -> { Rational(1, nil) }.should raise_error(TypeError, "can't convert nil into Rational")
+    -> { Rational(1, nil) }.should.raise(TypeError, "can't convert nil into Rational")
   end
 
   it "raises a TypeError if the first argument is a Symbol" do
-    -> { Rational(:sym) }.should raise_error(TypeError)
+    -> { Rational(:sym) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the second argument is a Symbol" do
-    -> { Rational(1, :sym) }.should raise_error(TypeError)
+    -> { Rational(1, :sym) }.should.raise(TypeError)
   end
 
   describe "when passed exception: false" do
diff --git a/spec/ruby/core/kernel/String_spec.rb b/spec/ruby/core/kernel/String_spec.rb
index 7caec6eda5c..a9b0758ad70 100644
--- a/spec/ruby/core/kernel/String_spec.rb
+++ b/spec/ruby/core/kernel/String_spec.rb
@@ -32,7 +32,7 @@ class << obj
       undef_method :to_s
     end
 
-    -> { @object.send(@method, obj) }.should raise_error(TypeError)
+    -> { @object.send(@method, obj) }.should.raise(TypeError)
   end
 
   # #5158
@@ -44,7 +44,7 @@ def respond_to?(meth, include_private=false)
       end
     end
 
-    -> { @object.send(@method, obj) }.should raise_error(TypeError)
+    -> { @object.send(@method, obj) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_s is not defined, even though #respond_to?(:to_s) returns true" do
@@ -57,7 +57,7 @@ def respond_to?(meth, include_private=false)
       end
     end
 
-    -> { @object.send(@method, obj) }.should raise_error(TypeError)
+    -> { @object.send(@method, obj) }.should.raise(TypeError)
   end
 
   it "calls #to_s if #respond_to?(:to_s) returns true" do
@@ -74,14 +74,14 @@ def method_missing(meth, *args)
 
   it "raises a TypeError if #to_s does not return a String" do
     (obj = mock('123')).should_receive(:to_s).and_return(123)
-    -> { @object.send(@method, obj) }.should raise_error(TypeError)
+    -> { @object.send(@method, obj) }.should.raise(TypeError)
   end
 
   it "returns the same object if it is already a String" do
     string = +"Hello"
     string.should_not_receive(:to_s)
     string2 = @object.send(@method, string)
-    string.should equal(string2)
+    string.should.equal?(string2)
   end
 
   it "returns the same object if it is an instance of a String subclass" do
@@ -89,7 +89,7 @@ def method_missing(meth, *args)
     string = subklass.new("Hello")
     string.should_not_receive(:to_s)
     string2 = @object.send(@method, string)
-    string.should equal(string2)
+    string.should.equal?(string2)
   end
 end
 
@@ -101,6 +101,6 @@ def method_missing(meth, *args)
   it_behaves_like :kernel_String, :String, Object.new
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:String)
+    Kernel.private_instance_methods(false).should.include?(:String)
   end
 end
diff --git a/spec/ruby/core/kernel/abort_spec.rb b/spec/ruby/core/kernel/abort_spec.rb
index f8152718c5b..b75138182d4 100644
--- a/spec/ruby/core/kernel/abort_spec.rb
+++ b/spec/ruby/core/kernel/abort_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Kernel#abort" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:abort)
+    Kernel.private_instance_methods(false).should.include?(:abort)
   end
 
   it_behaves_like :process_abort, :abort, KernelSpecs::Method.new
diff --git a/spec/ruby/core/kernel/at_exit_spec.rb b/spec/ruby/core/kernel/at_exit_spec.rb
index ebd9a71d15f..fdb0eaf34c4 100644
--- a/spec/ruby/core/kernel/at_exit_spec.rb
+++ b/spec/ruby/core/kernel/at_exit_spec.rb
@@ -6,11 +6,11 @@
   it_behaves_like :kernel_at_exit, :at_exit
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:at_exit)
+    Kernel.private_instance_methods(false).should.include?(:at_exit)
   end
 
   it "raises ArgumentError if called without a block" do
-    -> { at_exit }.should raise_error(ArgumentError, "called without a block")
+    -> { at_exit }.should.raise(ArgumentError, "called without a block")
   end
 end
 
diff --git a/spec/ruby/core/kernel/autoload_relative_spec.rb b/spec/ruby/core/kernel/autoload_relative_spec.rb
new file mode 100644
index 00000000000..7d03da8a407
--- /dev/null
+++ b/spec/ruby/core/kernel/autoload_relative_spec.rb
@@ -0,0 +1,114 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+# Specs for Kernel#autoload_relative
+
+ruby_version_is "4.1" do
+  describe "Kernel#autoload_relative" do
+    before :each do
+      @loaded_features = $".dup
+    end
+
+    after :each do
+      $".replace @loaded_features
+      # Clean up constants defined by these tests
+      [:KSAutoloadRelativeA, :KSAutoloadRelativeB, :KSAutoloadRelativeC,
+       :KSAutoloadRelativeE, :KSAutoloadRelativeF, :KSAutoloadRelativeG,
+       :KSAutoloadRelativeH, :KSAutoloadRelativeI].each do |const|
+        KernelSpecs.send(:remove_const, const) if KernelSpecs.const_defined?(const, false)
+      end
+      [:KSAutoloadRelativeD, :NestedTest].each do |const|
+        Object.send(:remove_const, const) if Object.const_defined?(const, false)
+      end
+    end
+
+    it "is a private method" do
+      Kernel.private_instance_methods(false).should.include?(:autoload_relative)
+    end
+
+    it "registers a file to load relative to the current file" do
+      KernelSpecs.autoload_relative :KSAutoloadRelativeA, "fixtures/autoload_relative_b.rb"
+      path = KernelSpecs.autoload?(:KSAutoloadRelativeA)
+      path.should_not == nil
+      path.should.end_with?("autoload_relative_b.rb")
+      File.exist?(path).should == true
+    end
+
+    it "loads the file when the constant is accessed" do
+      KernelSpecs.autoload_relative :KSAutoloadRelativeB, "fixtures/autoload_relative_b.rb"
+      KernelSpecs::KSAutoloadRelativeB.loaded.should == :ksautoload_b
+    end
+
+    it "sets the autoload constant in the constant table" do
+      KernelSpecs.autoload_relative :KSAutoloadRelativeC, "fixtures/autoload_relative_b.rb"
+      KernelSpecs.should.const_defined?(:KSAutoloadRelativeC, false)
+    end
+
+    it "can autoload in instance_eval with a file context" do
+      result = Object.new.instance_eval(<<-CODE, __FILE__, __LINE__)
+        autoload_relative :KSAutoloadRelativeD, "fixtures/autoload_relative_d.rb"
+        KSAutoloadRelativeD.loaded
+      CODE
+      result.should == :ksautoload_d
+    end
+
+    it "raises LoadError if called from eval without file context" do
+      -> {
+        eval('autoload_relative :Foo, "foo.rb"')
+      }.should.raise(LoadError, /autoload_relative called without file context/)
+    end
+
+    it "accepts both string and symbol for constant name" do
+      KernelSpecs.autoload_relative :KSAutoloadRelativeE, "fixtures/autoload_relative_b.rb"
+      KernelSpecs.autoload_relative "KSAutoloadRelativeF", "fixtures/autoload_relative_b.rb"
+
+      KernelSpecs.should.const_defined?(:KSAutoloadRelativeE, false)
+      KernelSpecs.should.const_defined?(:KSAutoloadRelativeF, false)
+    end
+
+    it "returns nil" do
+      KernelSpecs.autoload_relative(:KSAutoloadRelativeG, "fixtures/autoload_relative_b.rb").should == nil
+    end
+
+    it "resolves nested directory paths correctly" do
+      -> {
+        autoload_relative :NestedTest, "../kernel/fixtures/autoload_relative_b.rb"
+        autoload?(:NestedTest)
+      }.should_not.raise
+    end
+
+    it "resolves paths starting with ./" do
+      KernelSpecs.autoload_relative :KSAutoloadRelativeH, "./fixtures/autoload_relative_b.rb"
+      path = KernelSpecs.autoload?(:KSAutoloadRelativeH)
+      path.should_not == nil
+      path.should.end_with?("autoload_relative_b.rb")
+    end
+
+    it "ignores $LOAD_PATH and uses only relative path resolution" do
+      original_load_path = $LOAD_PATH.dup
+      $LOAD_PATH.clear
+      begin
+        KernelSpecs.autoload_relative :KSAutoloadRelativeI, "fixtures/autoload_relative_b.rb"
+        path = KernelSpecs.autoload?(:KSAutoloadRelativeI)
+        path.should_not == nil
+        # Should still resolve even with empty $LOAD_PATH
+        File.exist?(path).should == true
+      ensure
+        $LOAD_PATH.replace(original_load_path)
+      end
+    end
+
+    describe "when Object is frozen" do
+      it "raises a FrozenError before defining the constant" do
+        ruby_exe(<<-RUBY).should.include?("FrozenError")
+          Object.freeze
+          begin
+            autoload_relative :Foo, "autoload_b.rb"
+          rescue => e
+            puts e.class
+          end
+        RUBY
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/kernel/autoload_spec.rb b/spec/ruby/core/kernel/autoload_spec.rb
index 5edb70541d1..46783734c43 100644
--- a/spec/ruby/core/kernel/autoload_spec.rb
+++ b/spec/ruby/core/kernel/autoload_spec.rb
@@ -25,7 +25,7 @@ def check_autoload(const)
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:autoload)
+    Kernel.private_instance_methods(false).should.include?(:autoload)
   end
 
   it "registers a file to load the first time the named constant is accessed" do
@@ -37,7 +37,7 @@ def check_autoload(const)
   end
 
   it "sets the autoload constant in Object's constant table" do
-    Object.should have_constant(:KSAutoloadA)
+    Object.should.const_defined?(:KSAutoloadA, false)
   end
 
   it "loads the file when the constant is accessed" do
@@ -49,7 +49,7 @@ def check_autoload(const)
     main = TOPLEVEL_BINDING.eval("self")
     main.should_receive(:require).with("main_autoload_not_exist.rb")
     # The constant won't be defined since require is mocked to do nothing
-    -> { KSAutoloadCallsRequire }.should raise_error(NameError)
+    -> { KSAutoloadCallsRequire }.should.raise(NameError)
   end
 
   it "can autoload in instance_eval" do
@@ -102,7 +102,7 @@ def go
 
 describe "Kernel#autoload?" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:autoload?)
+    Kernel.private_instance_methods(false).should.include?(:autoload?)
   end
 
   it "returns the name of the file that will be autoloaded" do
@@ -110,7 +110,7 @@ def go
   end
 
   it "returns nil if no file has been registered for a constant" do
-    check_autoload(:Manualload).should be_nil
+    check_autoload(:Manualload).should == nil
   end
 end
 
@@ -137,7 +137,7 @@ def go
   end
 
   it "sets the autoload constant in Object's constant table" do
-    Object.should have_constant(:KSAutoloadBB)
+    Object.should.const_defined?(:KSAutoloadBB, false)
   end
 
   it "calls #to_path on non-String filenames" do
@@ -173,6 +173,6 @@ def go
   end
 
   it "returns nil if no file has been registered for a constant" do
-    Kernel.autoload?(:Manualload).should be_nil
+    Kernel.autoload?(:Manualload).should == nil
   end
 end
diff --git a/spec/ruby/core/kernel/backtick_spec.rb b/spec/ruby/core/kernel/backtick_spec.rb
index 834d5636c1d..42e0f975f59 100644
--- a/spec/ruby/core/kernel/backtick_spec.rb
+++ b/spec/ruby/core/kernel/backtick_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:`)
+    Kernel.private_instance_methods(false).should.include?(:`)
   end
 
   it "returns the standard output of the executed sub-process" do
@@ -28,11 +28,11 @@
 
   it "produces a String in the default external encoding" do
     Encoding.default_external = Encoding::SHIFT_JIS
-    `echo disc`.encoding.should equal(Encoding::SHIFT_JIS)
+    `echo disc`.encoding.should.equal?(Encoding::SHIFT_JIS)
   end
 
   it "raises an Errno::ENOENT if the command is not executable" do
-    -> { `nonexistent_command` }.should raise_error(Errno::ENOENT)
+    -> { `nonexistent_command` }.should.raise(Errno::ENOENT)
   end
 
   platform_is_not :windows do
@@ -43,13 +43,13 @@
     it "sets $? to the exit status of the executed sub-process" do
       ip = 'world'
       `echo disc #{ip}`
-      $?.should be_kind_of(Process::Status)
+      $?.should.is_a?(Process::Status)
       $?.should_not.stopped?
       $?.should.exited?
       $?.exitstatus.should == 0
       $?.should.success?
       `echo disc #{ip}; exit 99`
-      $?.should be_kind_of(Process::Status)
+      $?.should.is_a?(Process::Status)
       $?.should_not.stopped?
       $?.should.exited?
       $?.exitstatus.should == 99
@@ -61,13 +61,13 @@
     it "sets $? to the exit status of the executed sub-process" do
       ip = 'world'
       `echo disc #{ip}`
-      $?.should be_kind_of(Process::Status)
+      $?.should.is_a?(Process::Status)
       $?.should_not.stopped?
       $?.should.exited?
       $?.exitstatus.should == 0
       $?.should.success?
       `echo disc #{ip}& exit 99`
-      $?.should be_kind_of(Process::Status)
+      $?.should.is_a?(Process::Status)
       $?.should_not.stopped?
       $?.should.exited?
       $?.exitstatus.should == 99
diff --git a/spec/ruby/core/kernel/binding_spec.rb b/spec/ruby/core/kernel/binding_spec.rb
index f1c9c6ec9f2..6f27b26f379 100644
--- a/spec/ruby/core/kernel/binding_spec.rb
+++ b/spec/ruby/core/kernel/binding_spec.rb
@@ -9,7 +9,7 @@
 
 describe "Kernel#binding" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:binding)
+    Kernel.private_instance_methods(false).should.include?(:binding)
   end
 
   before :each do
@@ -35,7 +35,7 @@
   end
 
   it "raises a NameError on undefined variable" do
-    -> { eval("a_fake_variable", @b1) }.should raise_error(NameError)
+    -> { eval("a_fake_variable", @b1) }.should.raise(NameError)
   end
 
   it "uses the closure's self as self in the binding" do
diff --git a/spec/ruby/core/kernel/block_given_spec.rb b/spec/ruby/core/kernel/block_given_spec.rb
index aece4c821d1..20bb90ae96d 100644
--- a/spec/ruby/core/kernel/block_given_spec.rb
+++ b/spec/ruby/core/kernel/block_given_spec.rb
@@ -30,7 +30,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:block_given?)
+    Kernel.private_instance_methods(false).should.include?(:block_given?)
   end
 end
 
diff --git a/spec/ruby/core/kernel/caller_locations_spec.rb b/spec/ruby/core/kernel/caller_locations_spec.rb
index a917dba504a..24ee0745321 100644
--- a/spec/ruby/core/kernel/caller_locations_spec.rb
+++ b/spec/ruby/core/kernel/caller_locations_spec.rb
@@ -3,7 +3,7 @@
 
 describe 'Kernel#caller_locations' do
   it 'is a private method' do
-    Kernel.should have_private_instance_method(:caller_locations)
+    Kernel.private_instance_methods(false).should.include?(:caller_locations)
   end
 
   it 'returns an Array of caller locations' do
diff --git a/spec/ruby/core/kernel/caller_spec.rb b/spec/ruby/core/kernel/caller_spec.rb
index df051ef07f2..5e0c7907302 100644
--- a/spec/ruby/core/kernel/caller_spec.rb
+++ b/spec/ruby/core/kernel/caller_spec.rb
@@ -3,7 +3,7 @@
 
 describe 'Kernel#caller' do
   it 'is a private method' do
-    Kernel.should have_private_instance_method(:caller)
+    Kernel.private_instance_methods(false).should.include?(:caller)
   end
 
   it 'returns an Array of caller locations' do
@@ -32,7 +32,7 @@
     locations = KernelSpecs::CallerTest.locations
     line      = __LINE__ - 1
 
-    locations[0].should include("#{__FILE__}:#{line}:in")
+    locations[0].should.include?("#{__FILE__}:#{line}:in")
   end
 
   it "returns an Array with the block given to #at_exit at the base of the stack" do
diff --git a/spec/ruby/core/kernel/case_compare_spec.rb b/spec/ruby/core/kernel/case_compare_spec.rb
index b8d30960e88..c74bbf63b9d 100644
--- a/spec/ruby/core/kernel/case_compare_spec.rb
+++ b/spec/ruby/core/kernel/case_compare_spec.rb
@@ -58,18 +58,18 @@ def equal?(other)
   end
 
   it "returns true if #== returns true even if #equal? is false" do
-    @o1.should_not equal(@o2)
+    @o1.should_not.equal?(@o2)
     (@o1 == @o2).should == true
     (@o1 === @o2).should == true
   end
 
   it "returns true if #equal? returns true" do
-    @o1.should equal(@o1)
+    @o1.should.equal?(@o1)
     (@o1 === @o1).should == true
   end
 
   it "returns false if neither #== nor #equal? returns true" do
-    @o1.should_not equal(@o)
+    @o1.should_not.equal?(@o)
     (@o1 == @o).should == false
     (@o1 === @o).should == false
   end
@@ -83,13 +83,13 @@ def equal?(other)
   end
 
   it "returns true if #== returns true even if #equal? is false" do
-    @o1.should_not equal(@o1)
+    @o1.should_not.equal?(@o1)
     (@o1 == @o1).should == true
     (@o1 === @o1).should == true
   end
 
   it "returns false if neither #== nor #equal? returns true" do
-    @o1.should_not equal(@o)
+    @o1.should_not.equal?(@o)
     (@o1 == @o).should == false
     (@o1 === @o).should == false
   end
@@ -105,7 +105,7 @@ def equal?(other)
   it "returns true if the object id is the same even if both #== and #equal? return false" do
     @o1.object_id.should == @o1.object_id
 
-    @o1.should_not equal(@o1)
+    @o1.should_not.equal?(@o1)
     (@o1 == @o1).should == false
 
     (@o1 === @o1).should == true
@@ -114,7 +114,7 @@ def equal?(other)
   it "returns false if the object id is not the same and both #== and #equal? return false" do
     @o1.object_id.should_not == @o2.object_id
 
-    @o1.should_not equal(@o2)
+    @o1.should_not.equal?(@o2)
     (@o1 == @o2).should == false
 
     (@o1 === @o2).should == false
diff --git a/spec/ruby/core/kernel/catch_spec.rb b/spec/ruby/core/kernel/catch_spec.rb
index 9f59d3b384e..9f023036782 100644
--- a/spec/ruby/core/kernel/catch_spec.rb
+++ b/spec/ruby/core/kernel/catch_spec.rb
@@ -31,11 +31,11 @@
   end
 
   it "raises an ArgumentError if a Symbol is thrown for a String catch value" do
-    -> { catch("exit") { throw :exit } }.should raise_error(ArgumentError)
+    -> { catch("exit") { throw :exit } }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if a String with different identity is thrown" do
-    -> { catch("exit".dup) { throw "exit".dup } }.should raise_error(ArgumentError)
+    -> { catch("exit".dup) { throw "exit".dup } }.should.raise(ArgumentError)
   end
 
   it "catches a Symbol when thrown a matching Symbol" do
@@ -60,7 +60,7 @@
   end
 
   it "yields an object when called without arguments" do
-    catch { |tag| tag }.should be_an_instance_of(Object)
+    catch { |tag| tag }.should.instance_of?(Object)
   end
 
   it "can be used even in a method different from where throw is called" do
@@ -116,12 +116,12 @@ def self.catching_method
   end
 
   it "raises LocalJumpError if no block is given" do
-    -> { catch :blah }.should raise_error(LocalJumpError)
+    -> { catch :blah }.should.raise(LocalJumpError)
   end
 end
 
 describe "Kernel#catch" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:catch)
+    Kernel.private_instance_methods(false).should.include?(:catch)
   end
 end
diff --git a/spec/ruby/core/kernel/chomp_spec.rb b/spec/ruby/core/kernel/chomp_spec.rb
index d30e77c35a7..434bf652f98 100644
--- a/spec/ruby/core/kernel/chomp_spec.rb
+++ b/spec/ruby/core/kernel/chomp_spec.rb
@@ -26,7 +26,7 @@
 
 describe :kernel_chomp_private, shared: true do
   it "is a private method" do
-    KernelSpecs.has_private_method(@method).should be_true
+    KernelSpecs.has_private_method(@method).should == true
   end
 end
 
diff --git a/spec/ruby/core/kernel/chop_spec.rb b/spec/ruby/core/kernel/chop_spec.rb
index 9b91c011bcc..bbf3c3f7248 100644
--- a/spec/ruby/core/kernel/chop_spec.rb
+++ b/spec/ruby/core/kernel/chop_spec.rb
@@ -14,7 +14,7 @@
 
 describe :kernel_chop_private, shared: true do
   it "is a private method" do
-    KernelSpecs.has_private_method(@method).should be_true
+    KernelSpecs.has_private_method(@method).should == true
   end
 end
 
diff --git a/spec/ruby/core/kernel/class_spec.rb b/spec/ruby/core/kernel/class_spec.rb
index b1d9df16718..0a7f774d143 100644
--- a/spec/ruby/core/kernel/class_spec.rb
+++ b/spec/ruby/core/kernel/class_spec.rb
@@ -3,24 +3,24 @@
 
 describe "Kernel#class" do
   it "returns the class of the object" do
-    Object.new.class.should equal(Object)
+    Object.new.class.should.equal?(Object)
 
-    1.class.should equal(Integer)
-    3.14.class.should equal(Float)
-    :hello.class.should equal(Symbol)
-    "hello".class.should equal(String)
-    [1, 2].class.should equal(Array)
-    { 1 => 2 }.class.should equal(Hash)
+    1.class.should.equal?(Integer)
+    3.14.class.should.equal?(Float)
+    :hello.class.should.equal?(Symbol)
+    "hello".class.should.equal?(String)
+    [1, 2].class.should.equal?(Array)
+    { 1 => 2 }.class.should.equal?(Hash)
   end
 
   it "returns Class for a class" do
-    BasicObject.class.should equal(Class)
-    String.class.should equal(Class)
+    BasicObject.class.should.equal?(Class)
+    String.class.should.equal?(Class)
   end
 
   it "returns the first non-singleton class" do
     a = +"hello"
     def a.my_singleton_method; end
-    a.class.should equal(String)
+    a.class.should.equal?(String)
   end
 end
diff --git a/spec/ruby/core/kernel/clone_spec.rb b/spec/ruby/core/kernel/clone_spec.rb
index 5adcbbe6033..4ddb23d6e6e 100644
--- a/spec/ruby/core/kernel/clone_spec.rb
+++ b/spec/ruby/core/kernel/clone_spec.rb
@@ -25,7 +25,7 @@ def klass.allocate
     end
 
     clone = instance.clone
-    clone.class.should equal klass
+    clone.class.should.equal? klass
   end
 
   describe "with no arguments" do
@@ -40,7 +40,7 @@ def klass.allocate
 
     it 'copies frozen?' do
       o = ''.freeze.clone
-      o.frozen?.should be_true
+      o.frozen?.should == true
     end
   end
 
@@ -56,7 +56,7 @@ def klass.allocate
 
     it "copies frozen?" do
       o = "".freeze.clone(freeze: nil)
-      o.frozen?.should be_true
+      o.frozen?.should == true
     end
   end
 
@@ -78,7 +78,7 @@ def klass.allocate
 
     it "calls #initialize_clone with kwargs freeze: true even if #initialize_clone only takes a single argument" do
       obj = KernelSpecs::Clone.new
-      -> { obj.clone(freeze: true) }.should raise_error(ArgumentError, 'wrong number of arguments (given 2, expected 1)')
+      -> { obj.clone(freeze: true) }.should.raise(ArgumentError, 'wrong number of arguments (given 2, expected 1)')
     end
   end
 
@@ -100,15 +100,15 @@ def klass.allocate
 
     it "calls #initialize_clone with kwargs freeze: false even if #initialize_clone only takes a single argument" do
       obj = KernelSpecs::Clone.new
-      -> { obj.clone(freeze: false) }.should raise_error(ArgumentError, 'wrong number of arguments (given 2, expected 1)')
+      -> { obj.clone(freeze: false) }.should.raise(ArgumentError, 'wrong number of arguments (given 2, expected 1)')
     end
   end
 
   describe "with freeze: anything else" do
     it 'raises ArgumentError when passed not true/false/nil' do
-      -> { @obj.clone(freeze: 1) }.should raise_error(ArgumentError, /unexpected value for freeze: Integer/)
-      -> { @obj.clone(freeze: "") }.should raise_error(ArgumentError, /unexpected value for freeze: String/)
-      -> { @obj.clone(freeze: Object.new) }.should raise_error(ArgumentError, /unexpected value for freeze: Object/)
+      -> { @obj.clone(freeze: 1) }.should.raise(ArgumentError, /unexpected value for freeze: Integer/)
+      -> { @obj.clone(freeze: "") }.should.raise(ArgumentError, /unexpected value for freeze: String/)
+      -> { @obj.clone(freeze: Object.new) }.should.raise(ArgumentError, /unexpected value for freeze: Object/)
     end
   end
 
diff --git a/spec/ruby/core/kernel/comparison_spec.rb b/spec/ruby/core/kernel/comparison_spec.rb
index affdc5c00d2..48f17e11727 100644
--- a/spec/ruby/core/kernel/comparison_spec.rb
+++ b/spec/ruby/core/kernel/comparison_spec.rb
@@ -15,17 +15,17 @@
   it "returns nil if self is eql? but not == to the argument" do
     obj = mock('has eql?')
     obj.should_not_receive(:eql?)
-    obj.<=>(Object.new).should be_nil
+    obj.<=>(Object.new).should == nil
   end
 
   it "returns nil if self.==(arg) returns nil" do
     obj = mock('wrong ==')
     obj.should_receive(:==).and_return(nil)
-    obj.<=>(Object.new).should be_nil
+    obj.<=>(Object.new).should == nil
   end
 
   it "returns nil if self is not == to the argument" do
     obj = Object.new
-    obj.<=>(3.14).should be_nil
+    obj.<=>(3.14).should == nil
   end
 end
diff --git a/spec/ruby/core/kernel/define_singleton_method_spec.rb b/spec/ruby/core/kernel/define_singleton_method_spec.rb
index 24acec84f59..ec48581db80 100644
--- a/spec/ruby/core/kernel/define_singleton_method_spec.rb
+++ b/spec/ruby/core/kernel/define_singleton_method_spec.rb
@@ -14,14 +14,14 @@ class DefineSingletonMethodSpecClass
     end
 
     it "adds the new method to the methods list" do
-      DefineSingletonMethodSpecClass.should have_method(:another_test_method)
+      DefineSingletonMethodSpecClass.should.respond_to?(:another_test_method)
     end
 
     it "defines any Child class method from any Parent's class methods" do
       um = KernelSpecs::Parent.method(:parent_class_method).unbind
       KernelSpecs::Child.send :define_singleton_method, :child_class_method, um
       KernelSpecs::Child.child_class_method.should == :foo
-      ->{KernelSpecs::Parent.child_class_method}.should raise_error(NoMethodError)
+      ->{KernelSpecs::Parent.child_class_method}.should.raise(NoMethodError)
     end
 
     it "will raise when attempting to define an object's singleton method from another object's singleton method" do
@@ -33,7 +33,7 @@ def singleton_method
         end
       end
       um = p.method(:singleton_method).unbind
-      ->{ other.send :define_singleton_method, :other_singleton_method, um }.should raise_error(TypeError)
+      ->{ other.send :define_singleton_method, :other_singleton_method, um }.should.raise(TypeError)
     end
 
   end
@@ -52,11 +52,11 @@ class DefineSingletonMethodSpecClass
   it "raises a TypeError when the given method is no Method/Proc" do
     -> {
       Class.new { define_singleton_method(:test, "self") }
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
 
     -> {
       Class.new { define_singleton_method(:test, 1234) }
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "defines a new singleton method for objects" do
@@ -65,7 +65,7 @@ class DefineSingletonMethodSpecClass
     obj.test.should == "world!"
     -> {
       Object.new.test
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   it "maintains the Proc's scope" do
@@ -83,7 +83,7 @@ class DefineMethodByProcClass
     obj = Object.new
     -> {
       obj.define_singleton_method(:test)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "does not use the caller block when no block is given" do
@@ -94,7 +94,7 @@ def o.define(name)
 
     -> {
       o.define(:foo) { raise "not used" }
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "always defines the method with public visibility" do
@@ -109,12 +109,12 @@ def cls.define(name, &block)
         cls.define(:foo) { :ok }
       end
       cls.foo.should == :ok
-    }.should_not raise_error(NoMethodError)
+    }.should_not.raise(NoMethodError)
   end
 
   it "cannot define a singleton method with a frozen singleton class" do
     o = Object.new
     o.freeze
-    -> { o.define_singleton_method(:foo) { 1 } }.should raise_error(FrozenError)
+    -> { o.define_singleton_method(:foo) { 1 } }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/kernel/dup_spec.rb b/spec/ruby/core/kernel/dup_spec.rb
index 70198abdb75..99de5e37327 100644
--- a/spec/ruby/core/kernel/dup_spec.rb
+++ b/spec/ruby/core/kernel/dup_spec.rb
@@ -25,7 +25,7 @@ def klass.allocate
     end
 
     dup = instance.dup
-    dup.class.should equal klass
+    dup.class.should.equal? klass
   end
 
   it "does not copy frozen state from the original" do
@@ -44,7 +44,7 @@ def klass.allocate
   it "does not copy singleton methods" do
     def @obj.special() :the_one end
     dup = @obj.dup
-    -> { dup.special }.should raise_error(NameError)
+    -> { dup.special }.should.raise(NameError)
   end
 
   it "does not copy modules included in the singleton class" do
@@ -53,7 +53,7 @@ class << @obj
     end
 
     dup = @obj.dup
-    -> { dup.repr }.should raise_error(NameError)
+    -> { dup.repr }.should.raise(NameError)
   end
 
   it "does not copy constants defined in the singleton class" do
@@ -62,6 +62,6 @@ class << @obj
     end
 
     dup = @obj.dup
-    -> { class << dup; CLONE; end }.should raise_error(NameError)
+    -> { class << dup; CLONE; end }.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/kernel/eql_spec.rb b/spec/ruby/core/kernel/eql_spec.rb
index e62a601a793..b3289090e5c 100644
--- a/spec/ruby/core/kernel/eql_spec.rb
+++ b/spec/ruby/core/kernel/eql_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#eql?" do
   it "is a public instance method" do
-    Kernel.should have_public_instance_method(:eql?)
+    Kernel.public_instance_methods(false).should.include?(:eql?)
   end
 
   it_behaves_like :object_equal, :eql?
diff --git a/spec/ruby/core/kernel/eval_spec.rb b/spec/ruby/core/kernel/eval_spec.rb
index c1136efd699..f9ca47866e0 100644
--- a/spec/ruby/core/kernel/eval_spec.rb
+++ b/spec/ruby/core/kernel/eval_spec.rb
@@ -5,7 +5,7 @@
 
 describe "Kernel#eval" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:eval)
+    Kernel.private_instance_methods(false).should.include?(:eval)
   end
 
   it "is a module function" do
@@ -76,12 +76,12 @@
     x = 1
     bind = proc {}
 
-    -> { eval("x", bind) }.should raise_error(TypeError)
+    -> { eval("x", bind) }.should.raise(TypeError)
   end
 
   it "does not make Proc locals visible to evaluated code" do
     bind = proc { inner = 4 }
-    -> { eval("inner", bind.binding) }.should raise_error(NameError)
+    -> { eval("inner", bind.binding) }.should.raise(NameError)
   end
 
   # REWRITE ME: This obscures the real behavior of where locals are stored
@@ -119,7 +119,7 @@
     outer_binding = binding
 
     eval("if false; a = 1; end", outer_binding)
-    eval("a", outer_binding).should be_nil
+    eval("a", outer_binding).should == nil
   end
 
   it "allows creating a new class in a binding" do
@@ -136,7 +136,7 @@
     expected = 'speccing.rb'
     -> {
       eval('if true', TOPLEVEL_BINDING, expected)
-    }.should raise_error(SyntaxError) { |e|
+    }.should.raise(SyntaxError) { |e|
       e.message.should =~ /#{expected}:1:.+/
     }
   end
@@ -145,7 +145,7 @@
     expected_file = 'speccing.rb'
     -> {
       eval('if true', TOPLEVEL_BINDING, expected_file, -100)
-    }.should raise_error(SyntaxError) { |e|
+    }.should.raise(SyntaxError) { |e|
       e.message.should =~ /#{expected_file}:-100:.+/
     }
   end
@@ -263,14 +263,14 @@ def foo(a, b:, &block)
 
   # See http://jira.codehaus.org/browse/JRUBY-5163
   it "uses the receiver as self inside the eval" do
-    eval("self").should equal(self)
-    Kernel.eval("self").should equal(Kernel)
+    eval("self").should.equal?(self)
+    Kernel.eval("self").should.equal?(Kernel)
   end
 
   it "does not pass the block to the method being eval'ed" do
     -> {
       eval('KernelSpecs::EvalTest.call_yield') { "content" }
-    }.should raise_error(LocalJumpError)
+    }.should.raise(LocalJumpError)
   end
 
   it "returns from the scope calling #eval when evaluating 'return'" do
@@ -308,7 +308,7 @@ def eval_return(n)
   it "has the correct default definee when called through Method#call" do
     class EvalSpecs
       method(:eval).call("def eval_spec_method_call; end")
-      EvalSpecs.should have_instance_method(:eval_spec_method_call)
+      EvalSpecs.should.method_defined?(:eval_spec_method_call, false)
     end
   end
 
@@ -362,7 +362,7 @@ class EvalSpecs
 CODE
       code.encoding.should == Encoding::BINARY
       eval(code)
-      EvalSpecs.constants(false).should include(:"Vπ")
+      EvalSpecs.constants(false).should.include?(:"Vπ")
       EvalSpecs::Vπ.should == 3.14
     ensure
       EvalSpecs.send(:remove_const, :Vπ)
@@ -377,7 +377,7 @@ class EvalSpecs
 CODE
       code.encoding.should == Encoding::BINARY
       eval(code)
-      EvalSpecs.constants(false).should include(:"Vπemacs")
+      EvalSpecs.constants(false).should.include?(:"Vπemacs")
       EvalSpecs::Vπemacs.should == 3.14
     ensure
       EvalSpecs.send(:remove_const, :Vπemacs)
@@ -392,7 +392,7 @@ class EvalSpecs
 CODE
       code.encoding.should == Encoding::BINARY
       eval(code)
-      EvalSpecs.constants(false).should include(:"Vπspaces")
+      EvalSpecs.constants(false).should.include?(:"Vπspaces")
       EvalSpecs::Vπspaces.should == 3.14
     ensure
       EvalSpecs.send(:remove_const, :Vπspaces)
@@ -408,7 +408,7 @@ class EvalSpecs
 CODE
       code.encoding.should == Encoding::BINARY
       eval(code)
-      EvalSpecs.constants(false).should include(:"Vπshebang")
+      EvalSpecs.constants(false).should.include?(:"Vπshebang")
       EvalSpecs::Vπshebang.should == 3.14
     ensure
       EvalSpecs.send(:remove_const, :Vπshebang)
@@ -424,7 +424,7 @@ class EvalSpecs
 CODE
       code.encoding.should == Encoding::BINARY
       eval(code)
-      EvalSpecs.constants(false).should include(:"Vπshebang_spaces")
+      EvalSpecs.constants(false).should.include?(:"Vπshebang_spaces")
       EvalSpecs::Vπshebang_spaces.should == 3.14
     ensure
       EvalSpecs.send(:remove_const, :Vπshebang_spaces)
@@ -442,7 +442,7 @@ class EvalSpecs
 CODE
       code.encoding.should == Encoding::BINARY
       eval(code)
-      EvalSpecs.constants(false).should include(:"Vπstring")
+      EvalSpecs.constants(false).should.include?(:"Vπstring")
       EvalSpecs::Vπstring.should == "frozen"
       EvalSpecs::Vπstring.encoding.should == Encoding::UTF_8
       EvalSpecs::Vπstring.frozen?.should == !frozen_string_default
@@ -459,10 +459,10 @@ class EvalSpecs
 CODE
       code.encoding.should == Encoding::BINARY
       eval(code)
-      EvalSpecs.constants(false).should include(:"Vπsame_line")
+      EvalSpecs.constants(false).should.include?(:"Vπsame_line")
       EvalSpecs::Vπsame_line.should == "frozen"
       EvalSpecs::Vπsame_line.encoding.should == Encoding::UTF_8
-      EvalSpecs::Vπsame_line.frozen?.should be_true
+      EvalSpecs::Vπsame_line.frozen?.should == true
     ensure
       EvalSpecs.send(:remove_const, :Vπsame_line)
     end
@@ -478,9 +478,9 @@ class EvalSpecs
 CODE
       code.encoding.should == Encoding::BINARY
       eval(code)
-      EvalSpecs.constants(false).should_not include(:"Vπfrozen_first")
+      EvalSpecs.constants(false).should_not.include?(:"Vπfrozen_first")
       binary_constant = "Vπfrozen_first".b.to_sym
-      EvalSpecs.constants(false).should include(binary_constant)
+      EvalSpecs.constants(false).should.include?(binary_constant)
       value = EvalSpecs.const_get(binary_constant)
       value.should == "frozen"
       value.encoding.should == Encoding::BINARY
diff --git a/spec/ruby/core/kernel/exec_spec.rb b/spec/ruby/core/kernel/exec_spec.rb
index 3d9520ad67a..fd8485791a3 100644
--- a/spec/ruby/core/kernel/exec_spec.rb
+++ b/spec/ruby/core/kernel/exec_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#exec" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:exec)
+    Kernel.private_instance_methods(false).should.include?(:exec)
   end
 
   it "runs the specified command, replacing current process" do
diff --git a/spec/ruby/core/kernel/exit_spec.rb b/spec/ruby/core/kernel/exit_spec.rb
index 93cec3fee5c..864ff84449e 100644
--- a/spec/ruby/core/kernel/exit_spec.rb
+++ b/spec/ruby/core/kernel/exit_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Kernel#exit" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:exit)
+    Kernel.private_instance_methods(false).should.include?(:exit)
   end
 
   it_behaves_like :process_exit, :exit, KernelSpecs::Method.new
@@ -16,7 +16,7 @@
 
 describe "Kernel#exit!" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:exit!)
+    Kernel.private_instance_methods(false).should.include?(:exit!)
   end
 
   it_behaves_like :process_exit!, :exit!, "self"
diff --git a/spec/ruby/core/kernel/extend_spec.rb b/spec/ruby/core/kernel/extend_spec.rb
index 6342d8cae15..a344c7b5ca2 100644
--- a/spec/ruby/core/kernel/extend_spec.rb
+++ b/spec/ruby/core/kernel/extend_spec.rb
@@ -53,13 +53,13 @@ def self.append_features(o)
   end
 
   it "raises an ArgumentError when no arguments given" do
-    -> { Object.new.extend }.should raise_error(ArgumentError)
+    -> { Object.new.extend }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError when the argument is not a Module" do
     o = mock('o')
     klass = Class.new
-    -> { o.extend(klass) }.should raise_error(TypeError)
+    -> { o.extend(klass) }.should.raise(TypeError)
   end
 
   describe "on frozen instance" do
@@ -69,11 +69,11 @@ def self.append_features(o)
     end
 
     it "raises an ArgumentError when no arguments given" do
-      -> { @frozen.extend }.should raise_error(ArgumentError)
+      -> { @frozen.extend }.should.raise(ArgumentError)
     end
 
     it "raises a FrozenError" do
-      -> { @frozen.extend @module }.should raise_error(FrozenError)
+      -> { @frozen.extend @module }.should.raise(FrozenError)
     end
   end
 
diff --git a/spec/ruby/core/kernel/fail_spec.rb b/spec/ruby/core/kernel/fail_spec.rb
index fab622037eb..ac379b67d51 100644
--- a/spec/ruby/core/kernel/fail_spec.rb
+++ b/spec/ruby/core/kernel/fail_spec.rb
@@ -3,11 +3,11 @@
 
 describe "Kernel#fail" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:fail)
+    Kernel.private_instance_methods(false).should.include?(:fail)
   end
 
   it "raises a RuntimeError" do
-    -> { fail }.should raise_error(RuntimeError)
+    -> { fail }.should.raise(RuntimeError)
   end
 
   it "accepts an Object with an exception method returning an Exception" do
@@ -15,12 +15,12 @@
     def obj.exception(msg)
       StandardError.new msg
     end
-    -> { fail obj, "..." }.should raise_error(StandardError, "...")
+    -> { fail obj, "..." }.should.raise(StandardError, "...")
   end
 
   it "instantiates the specified exception class" do
     error_class = Class.new(RuntimeError)
-    -> { fail error_class }.should raise_error(error_class)
+    -> { fail error_class }.should.raise(error_class)
   end
 
   it "uses the specified message" do
@@ -33,7 +33,7 @@ def obj.exception(msg)
       else
         raise Exception
       end
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
   end
 end
 
diff --git a/spec/ruby/core/kernel/fixtures/autoload_relative_b.rb b/spec/ruby/core/kernel/fixtures/autoload_relative_b.rb
new file mode 100644
index 00000000000..6de6f5091d4
--- /dev/null
+++ b/spec/ruby/core/kernel/fixtures/autoload_relative_b.rb
@@ -0,0 +1,7 @@
+module KernelSpecs
+  module KSAutoloadRelativeB
+    def self.loaded
+      :ksautoload_b
+    end
+  end
+end
diff --git a/spec/ruby/core/kernel/fixtures/autoload_relative_d.rb b/spec/ruby/core/kernel/fixtures/autoload_relative_d.rb
new file mode 100644
index 00000000000..5b6b5e1fa2f
--- /dev/null
+++ b/spec/ruby/core/kernel/fixtures/autoload_relative_d.rb
@@ -0,0 +1,5 @@
+module KSAutoloadRelativeD
+  def self.loaded
+    :ksautoload_d
+  end
+end
diff --git a/spec/ruby/core/kernel/fixtures/classes.rb b/spec/ruby/core/kernel/fixtures/classes.rb
index 0e2b81988fd..ad82f3cef57 100644
--- a/spec/ruby/core/kernel/fixtures/classes.rb
+++ b/spec/ruby/core/kernel/fixtures/classes.rb
@@ -180,6 +180,25 @@ class B < A
     alias aliased_pub_method pub_method
   end
 
+  class BasicA < BasicObject
+    define_method(:respond_to?, ::Kernel.instance_method(:respond_to?))
+
+    def pub_method; :public_method; end
+
+    def undefed_method; :undefed_method; end
+    undef_method :undefed_method
+
+    protected
+    def protected_method; :protected_method; end
+
+    private
+    def private_method; :private_method; end
+  end
+
+  class MissingA < A
+    undef :respond_to_missing?
+  end
+
   class VisibilityChange
     class << self
       private :new
diff --git a/spec/ruby/core/kernel/fork_spec.rb b/spec/ruby/core/kernel/fork_spec.rb
index b37f9980e0d..4a2c8482020 100644
--- a/spec/ruby/core/kernel/fork_spec.rb
+++ b/spec/ruby/core/kernel/fork_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Kernel#fork" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:fork)
+    Kernel.private_instance_methods(false).should.include?(:fork)
   end
 
   it_behaves_like :process_fork, :fork, KernelSpecs::Method.new
diff --git a/spec/ruby/core/kernel/format_spec.rb b/spec/ruby/core/kernel/format_spec.rb
index 1d0c000c158..35c752b1abd 100644
--- a/spec/ruby/core/kernel/format_spec.rb
+++ b/spec/ruby/core/kernel/format_spec.rb
@@ -4,7 +4,7 @@
 # NOTE: most specs are in sprintf_spec.rb, this is just an alias
 describe "Kernel#format" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:format)
+    Kernel.private_instance_methods(false).should.include?(:format)
   end
 end
 
@@ -20,7 +20,7 @@
         format("test", 1)
       RUBY
 
-      ruby_exe(code, args: "2>&1").should include("warning: too many arguments for format string")
+      ruby_exe(code, args: "2>&1").should.include?("warning: too many arguments for format string")
     end
 
     it "does not warns if too many keyword arguments are passed" do
@@ -29,7 +29,7 @@
         format("test %{test}", test: 1, unused: 2)
       RUBY
 
-      ruby_exe(code, args: "2>&1").should_not include("warning")
+      ruby_exe(code, args: "2>&1").should_not.include?("warning")
     end
 
     ruby_bug "#20593", ""..."3.4" do
@@ -40,7 +40,7 @@
           format("test", {})
         RUBY
 
-        ruby_exe(code, args: "2>&1").should_not include("warning")
+        ruby_exe(code, args: "2>&1").should_not.include?("warning")
       end
     end
   end
diff --git a/spec/ruby/core/kernel/freeze_spec.rb b/spec/ruby/core/kernel/freeze_spec.rb
index fa32d321cff..079617dce49 100644
--- a/spec/ruby/core/kernel/freeze_spec.rb
+++ b/spec/ruby/core/kernel/freeze_spec.rb
@@ -4,46 +4,46 @@
 describe "Kernel#freeze" do
   it "prevents self from being further modified" do
     o = mock('o')
-    o.frozen?.should be_false
+    o.frozen?.should == false
     o.freeze
-    o.frozen?.should be_true
+    o.frozen?.should == true
   end
 
   it "returns self" do
     o = Object.new
-    o.freeze.should equal(o)
+    o.freeze.should.equal?(o)
   end
 
   describe "on integers" do
     it "has no effect since they are already frozen" do
-      1.frozen?.should be_true
+      1.frozen?.should == true
       1.freeze
 
       bignum = bignum_value
-      bignum.frozen?.should be_true
+      bignum.frozen?.should == true
       bignum.freeze
     end
   end
 
   describe "on a Float" do
     it "has no effect since it is already frozen" do
-      1.2.frozen?.should be_true
+      1.2.frozen?.should == true
       1.2.freeze
     end
   end
 
   describe "on a Symbol" do
     it "has no effect since it is already frozen" do
-      :sym.frozen?.should be_true
+      :sym.frozen?.should == true
       :sym.freeze
     end
   end
 
   describe "on true, false and nil" do
     it "has no effect since they are already frozen" do
-      nil.frozen?.should be_true
-      true.frozen?.should be_true
-      false.frozen?.should be_true
+      nil.frozen?.should == true
+      true.frozen?.should == true
+      false.frozen?.should == true
 
       nil.freeze
       true.freeze
@@ -54,7 +54,7 @@
   describe "on a Complex" do
     it "has no effect since it is already frozen" do
       c = Complex(1.3, 3.1)
-      c.frozen?.should be_true
+      c.frozen?.should == true
       c.freeze
     end
   end
@@ -62,7 +62,7 @@
   describe "on a Rational" do
     it "has no effect since it is already frozen" do
       r = Rational(1, 3)
-      r.frozen?.should be_true
+      r.frozen?.should == true
       r.freeze
     end
   end
@@ -72,13 +72,13 @@
       def mutate; @foo = 1; end
     end.new
     o.freeze
-    -> {o.mutate}.should raise_error(RuntimeError)
+    -> {o.mutate}.should.raise(RuntimeError)
   end
 
   it "causes instance_variable_set to raise RuntimeError" do
     o = Object.new
     o.freeze
-    -> {o.instance_variable_set(:@foo, 1)}.should raise_error(RuntimeError)
+    -> {o.instance_variable_set(:@foo, 1)}.should.raise(RuntimeError)
   end
 
   it "freezes an object's singleton class" do
diff --git a/spec/ruby/core/kernel/frozen_spec.rb b/spec/ruby/core/kernel/frozen_spec.rb
index a4cec4263db..8b8fad3de71 100644
--- a/spec/ruby/core/kernel/frozen_spec.rb
+++ b/spec/ruby/core/kernel/frozen_spec.rb
@@ -12,9 +12,9 @@
 
   describe "on true, false and nil" do
     it "returns true" do
-      true.frozen?.should be_true
-      false.frozen?.should be_true
-      nil.frozen?.should be_true
+      true.frozen?.should == true
+      false.frozen?.should == true
+      nil.frozen?.should == true
     end
   end
 
@@ -25,8 +25,8 @@
     end
 
     it "returns true" do
-      @fixnum.frozen?.should be_true
-      @bignum.frozen?.should be_true
+      @fixnum.frozen?.should == true
+      @bignum.frozen?.should == true
     end
   end
 
@@ -36,7 +36,7 @@
     end
 
     it "returns true" do
-      @float.frozen?.should be_true
+      @float.frozen?.should == true
     end
   end
 
@@ -46,31 +46,31 @@
     end
 
     it "returns true" do
-      @symbol.frozen?.should be_true
+      @symbol.frozen?.should == true
     end
   end
 
   describe "on a Complex" do
     it "returns true" do
       c = Complex(1.3, 3.1)
-      c.frozen?.should be_true
+      c.frozen?.should == true
     end
 
     it "literal returns true" do
       c = eval "1.3i"
-      c.frozen?.should be_true
+      c.frozen?.should == true
     end
   end
 
   describe "on a Rational" do
     it "returns true" do
       r = Rational(1, 3)
-      r.frozen?.should be_true
+      r.frozen?.should == true
     end
 
     it "literal returns true" do
       r = eval "1/3r"
-      r.frozen?.should be_true
+      r.frozen?.should == true
     end
   end
 end
diff --git a/spec/ruby/core/kernel/gets_spec.rb b/spec/ruby/core/kernel/gets_spec.rb
index 104613dbfac..1b2b36fbb96 100644
--- a/spec/ruby/core/kernel/gets_spec.rb
+++ b/spec/ruby/core/kernel/gets_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#gets" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:gets)
+    Kernel.private_instance_methods(false).should.include?(:gets)
   end
 
   it "calls ARGF.gets" do
diff --git a/spec/ruby/core/kernel/global_variables_spec.rb b/spec/ruby/core/kernel/global_variables_spec.rb
index 8bce8e25b7e..d41bdff49a4 100644
--- a/spec/ruby/core/kernel/global_variables_spec.rb
+++ b/spec/ruby/core/kernel/global_variables_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel.global_variables" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:global_variables)
+    Kernel.private_instance_methods(false).should.include?(:global_variables)
   end
 
   before :all do
@@ -11,13 +11,13 @@
   end
 
   it "finds subset starting with std" do
-    global_variables.grep(/std/).should include(:$stderr, :$stdin, :$stdout)
+    global_variables.grep(/std/).to_set.should >= Set[:$stderr, :$stdin, :$stdout]
     a = global_variables.size
     gvar_name = "$foolish_global_var#{@i += 1}"
     global_variables.include?(gvar_name.to_sym).should == false
     eval("#{gvar_name} = 1")
     global_variables.size.should == a+1
-    global_variables.should include(gvar_name.to_sym)
+    global_variables.should.include?(gvar_name.to_sym)
   end
 end
 
diff --git a/spec/ruby/core/kernel/gsub_spec.rb b/spec/ruby/core/kernel/gsub_spec.rb
index a0cb9f2a706..e05349e2b58 100644
--- a/spec/ruby/core/kernel/gsub_spec.rb
+++ b/spec/ruby/core/kernel/gsub_spec.rb
@@ -6,20 +6,20 @@
 ruby_version_is ""..."1.9" do
   describe "Kernel#gsub" do
     it "is a private method" do
-      Kernel.should have_private_instance_method(:gsub)
+      Kernel.private_instance_methods(false).should.include?(:gsub)
     end
 
     it "raises a TypeError if $_ is not a String" do
       -> {
         $_ = 123
         gsub(/./, "!")
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
     it "when matches sets $_ to a new string, leaving the former value unaltered" do
       orig_value = $_ = "hello"
       gsub("ello", "ola")
-      $_.should_not equal(orig_value)
+      $_.should_not.equal?(orig_value)
       $_.should == "hola"
       orig_value.should == "hello"
     end
@@ -86,7 +86,7 @@
 
   describe "Kernel#gsub!" do
     it "is a private method" do
-      Kernel.should have_private_instance_method(:gsub!)
+      Kernel.private_instance_methods(false).should.include?(:gsub!)
     end
   end
 
diff --git a/spec/ruby/core/kernel/initialize_clone_spec.rb b/spec/ruby/core/kernel/initialize_clone_spec.rb
index 21a90c19f0e..0033eadffbb 100644
--- a/spec/ruby/core/kernel/initialize_clone_spec.rb
+++ b/spec/ruby/core/kernel/initialize_clone_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Kernel#initialize_clone" do
   it "is a private instance method" do
-    Kernel.should have_private_instance_method(:initialize_clone)
+    Kernel.private_instance_methods(false).should.include?(:initialize_clone)
   end
 
   it "returns the receiver" do
diff --git a/spec/ruby/core/kernel/initialize_copy_spec.rb b/spec/ruby/core/kernel/initialize_copy_spec.rb
index d71ca9f60f6..ebac0c14de4 100644
--- a/spec/ruby/core/kernel/initialize_copy_spec.rb
+++ b/spec/ruby/core/kernel/initialize_copy_spec.rb
@@ -17,8 +17,8 @@
   end
 
   it "raises FrozenError if the receiver is frozen" do
-    -> { Object.new.freeze.send(:initialize_copy, Object.new) }.should raise_error(FrozenError)
-    -> { 1.send(:initialize_copy, Object.new) }.should raise_error(FrozenError)
+    -> { Object.new.freeze.send(:initialize_copy, Object.new) }.should.raise(FrozenError)
+    -> { 1.send(:initialize_copy, Object.new) }.should.raise(FrozenError)
   end
 
   it "raises TypeError if the objects are of different class" do
@@ -27,10 +27,10 @@
     a = klass.new
     b = sub.new
     message = 'initialize_copy should take same class object'
-    -> { a.send(:initialize_copy, b) }.should raise_error(TypeError, message)
-    -> { b.send(:initialize_copy, a) }.should raise_error(TypeError, message)
+    -> { a.send(:initialize_copy, b) }.should.raise(TypeError, message)
+    -> { b.send(:initialize_copy, a) }.should.raise(TypeError, message)
 
-    -> { a.send(:initialize_copy, 1) }.should raise_error(TypeError, message)
-    -> { a.send(:initialize_copy, 1.0) }.should raise_error(TypeError, message)
+    -> { a.send(:initialize_copy, 1) }.should.raise(TypeError, message)
+    -> { a.send(:initialize_copy, 1.0) }.should.raise(TypeError, message)
   end
 end
diff --git a/spec/ruby/core/kernel/initialize_dup_spec.rb b/spec/ruby/core/kernel/initialize_dup_spec.rb
index 6dff34b7ad8..f144647eb8b 100644
--- a/spec/ruby/core/kernel/initialize_dup_spec.rb
+++ b/spec/ruby/core/kernel/initialize_dup_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Kernel#initialize_dup" do
   it "is a private instance method" do
-    Kernel.should have_private_instance_method(:initialize_dup)
+    Kernel.private_instance_methods(false).should.include?(:initialize_dup)
   end
 
   it "returns the receiver" do
diff --git a/spec/ruby/core/kernel/inspect_spec.rb b/spec/ruby/core/kernel/inspect_spec.rb
index 1fa66cab98a..9808341139d 100644
--- a/spec/ruby/core/kernel/inspect_spec.rb
+++ b/spec/ruby/core/kernel/inspect_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#inspect" do
   it "returns a String" do
-    Object.new.inspect.should be_an_instance_of(String)
+    Object.new.inspect.should.instance_of?(String)
   end
 
   it "does not call #to_s if it is defined" do
@@ -26,7 +26,7 @@
     class << obj
       undef_method :class
     end
-    obj.inspect.should be_kind_of(String)
+    obj.inspect.should.is_a?(String)
   end
 
   ruby_version_is "4.0" do
@@ -84,7 +84,7 @@ class << obj
         private def instance_variables_to_inspect = {}
       end
 
-      ->{ obj.inspect }.should raise_error(TypeError, "Expected #instance_variables_to_inspect to return an Array or nil, but it returned Hash")
+      ->{ obj.inspect }.should.raise(TypeError, "Expected #instance_variables_to_inspect to return an Array or nil, but it returned Hash")
     end
   end
 end
diff --git a/spec/ruby/core/kernel/instance_of_spec.rb b/spec/ruby/core/kernel/instance_of_spec.rb
index d1170d50473..8d19974aa31 100644
--- a/spec/ruby/core/kernel/instance_of_spec.rb
+++ b/spec/ruby/core/kernel/instance_of_spec.rb
@@ -33,8 +33,8 @@
   end
 
   it "raises a TypeError if given an object that is not a Class nor a Module" do
-    -> { @o.instance_of?(Object.new) }.should raise_error(TypeError)
-    -> { @o.instance_of?('KernelSpecs::InstanceClass') }.should raise_error(TypeError)
-    -> { @o.instance_of?(1) }.should raise_error(TypeError)
+    -> { @o.instance_of?(Object.new) }.should.raise(TypeError)
+    -> { @o.instance_of?('KernelSpecs::InstanceClass') }.should.raise(TypeError)
+    -> { @o.instance_of?(1) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/kernel/instance_variable_defined_spec.rb b/spec/ruby/core/kernel/instance_variable_defined_spec.rb
index 2ebb582b43d..512f811393e 100644
--- a/spec/ruby/core/kernel/instance_variable_defined_spec.rb
+++ b/spec/ruby/core/kernel/instance_variable_defined_spec.rb
@@ -8,21 +8,21 @@
 
   describe "when passed a String" do
     it "returns false if the instance variable is not defined" do
-      @instance.instance_variable_defined?("@goodbye").should be_false
+      @instance.instance_variable_defined?("@goodbye").should == false
     end
 
     it "returns true if the instance variable is defined" do
-      @instance.instance_variable_defined?("@greeting").should be_true
+      @instance.instance_variable_defined?("@greeting").should == true
     end
   end
 
   describe "when passed a Symbol" do
     it "returns false if the instance variable is not defined" do
-      @instance.instance_variable_defined?(:@goodbye).should be_false
+      @instance.instance_variable_defined?(:@goodbye).should == false
     end
 
     it "returns true if the instance variable is defined" do
-      @instance.instance_variable_defined?(:@greeting).should be_true
+      @instance.instance_variable_defined?(:@greeting).should == true
     end
   end
 
@@ -30,12 +30,12 @@
     -> do
       obj = mock("kernel instance_variable_defined?")
       @instance.instance_variable_defined? obj
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "returns false if the instance variable is not defined for different types" do
     [nil, false, true, 1, 2.0, :test, "test"].each do |obj|
-      obj.instance_variable_defined?("@goodbye").should be_false
+      obj.instance_variable_defined?("@goodbye").should == false
     end
   end
 end
diff --git a/spec/ruby/core/kernel/instance_variable_get_spec.rb b/spec/ruby/core/kernel/instance_variable_get_spec.rb
index f1d2a45df8d..8404c94192f 100644
--- a/spec/ruby/core/kernel/instance_variable_get_spec.rb
+++ b/spec/ruby/core/kernel/instance_variable_get_spec.rb
@@ -20,29 +20,29 @@
   end
 
   it "returns nil when the referred instance variable does not exist" do
-    @obj.instance_variable_get(:@does_not_exist).should be_nil
+    @obj.instance_variable_get(:@does_not_exist).should == nil
   end
 
   it "raises a TypeError when the passed argument does not respond to #to_str" do
-    -> { @obj.instance_variable_get(Object.new) }.should raise_error(TypeError)
+    -> { @obj.instance_variable_get(Object.new) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the passed argument can't be converted to a String" do
     obj = mock("to_str")
     obj.stub!(:to_str).and_return(123)
-    -> { @obj.instance_variable_get(obj) }.should raise_error(TypeError)
+    -> { @obj.instance_variable_get(obj) }.should.raise(TypeError)
   end
 
   it "raises a NameError when the conversion result does not start with an '@'" do
     obj = mock("to_str")
     obj.stub!(:to_str).and_return("test")
-    -> { @obj.instance_variable_get(obj) }.should raise_error(NameError)
+    -> { @obj.instance_variable_get(obj) }.should.raise(NameError)
   end
 
   it "raises a NameError when passed just '@'" do
     obj = mock("to_str")
     obj.stub!(:to_str).and_return('@')
-    -> { @obj.instance_variable_get(obj) }.should raise_error(NameError)
+    -> { @obj.instance_variable_get(obj) }.should.raise(NameError)
   end
 end
 
@@ -57,20 +57,20 @@
   end
 
   it "raises a NameError when passed :@ as an instance variable name" do
-    -> { @obj.instance_variable_get(:"@") }.should raise_error(NameError)
+    -> { @obj.instance_variable_get(:"@") }.should.raise(NameError)
   end
 
   it "raises a NameError when the passed Symbol does not start with an '@'" do
-    -> { @obj.instance_variable_get(:test) }.should raise_error(NameError)
+    -> { @obj.instance_variable_get(:test) }.should.raise(NameError)
   end
 
   it "raises a NameError when the passed Symbol is an invalid instance variable name" do
-    -> { @obj.instance_variable_get(:"@0") }.should raise_error(NameError)
+    -> { @obj.instance_variable_get(:"@0") }.should.raise(NameError)
   end
 
   it "returns nil or raises for frozen objects" do
     nil.instance_variable_get(:@foo).should == nil
-    -> { nil.instance_variable_get(:foo) }.should raise_error(NameError)
+    -> { nil.instance_variable_get(:foo) }.should.raise(NameError)
     :foo.instance_variable_get(:@foo).should == nil
   end
 end
@@ -86,15 +86,15 @@
   end
 
   it "raises a NameError when the passed String does not start with an '@'" do
-    -> { @obj.instance_variable_get("test") }.should raise_error(NameError)
+    -> { @obj.instance_variable_get("test") }.should.raise(NameError)
   end
 
   it "raises a NameError when the passed String is an invalid instance variable name" do
-    -> { @obj.instance_variable_get("@0") }.should raise_error(NameError)
+    -> { @obj.instance_variable_get("@0") }.should.raise(NameError)
   end
 
   it "raises a NameError when passed '@' as an instance variable name" do
-    -> { @obj.instance_variable_get("@") }.should raise_error(NameError)
+    -> { @obj.instance_variable_get("@") }.should.raise(NameError)
   end
 end
 
@@ -105,7 +105,7 @@
   end
 
   it "raises a TypeError" do
-    -> { @obj.instance_variable_get(10) }.should raise_error(TypeError)
-    -> { @obj.instance_variable_get(-10) }.should raise_error(TypeError)
+    -> { @obj.instance_variable_get(10) }.should.raise(TypeError)
+    -> { @obj.instance_variable_get(-10) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/kernel/instance_variable_set_spec.rb b/spec/ruby/core/kernel/instance_variable_set_spec.rb
index 2c25f4366fa..bf165a824e9 100644
--- a/spec/ruby/core/kernel/instance_variable_set_spec.rb
+++ b/spec/ruby/core/kernel/instance_variable_set_spec.rb
@@ -18,26 +18,26 @@ def initialize(p1, p2)
 
   it "raises a NameError exception if the argument is not of form '@x'" do
     no_dog = Class.new
-    -> { no_dog.new.instance_variable_set(:c, "cat") }.should raise_error(NameError)
+    -> { no_dog.new.instance_variable_set(:c, "cat") }.should.raise(NameError)
   end
 
   it "raises a NameError exception if the argument is an invalid instance variable name" do
     digit_dog = Class.new
-    -> { digit_dog.new.instance_variable_set(:"@0", "cat") }.should raise_error(NameError)
+    -> { digit_dog.new.instance_variable_set(:"@0", "cat") }.should.raise(NameError)
   end
 
   it "raises a NameError when the argument is '@'" do
     dog_at = Class.new
-    -> { dog_at.new.instance_variable_set(:"@", "cat") }.should raise_error(NameError)
+    -> { dog_at.new.instance_variable_set(:"@", "cat") }.should.raise(NameError)
   end
 
   it "raises a TypeError if the instance variable name is an Integer" do
-    -> { "".instance_variable_set(1, 2) }.should raise_error(TypeError)
+    -> { "".instance_variable_set(1, 2) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the instance variable name is an object that does not respond to to_str" do
     class KernelSpecs::A; end
-    -> { "".instance_variable_set(KernelSpecs::A.new, 3) }.should raise_error(TypeError)
+    -> { "".instance_variable_set(KernelSpecs::A.new, 3) }.should.raise(TypeError)
   end
 
   it "raises a NameError if the passed object, when coerced with to_str, does not start with @" do
@@ -46,11 +46,11 @@ def to_str
         ":c"
       end
     end
-    -> { "".instance_variable_set(KernelSpecs::B.new, 4) }.should raise_error(NameError)
+    -> { "".instance_variable_set(KernelSpecs::B.new, 4) }.should.raise(NameError)
   end
 
   it "raises a NameError if pass an object that cannot be a symbol" do
-    -> { "".instance_variable_set(:c, 1) }.should raise_error(NameError)
+    -> { "".instance_variable_set(:c, 1) }.should.raise(NameError)
   end
 
   it "accepts as instance variable name any instance of a class that responds to to_str" do
@@ -78,16 +78,16 @@ def initialize
     end
 
     it "keeps stored object after any exceptions" do
-      -> { @frozen.instance_variable_set(:@ivar, :replacement) }.should raise_error(Exception)
-      @frozen.ivar.should equal(:origin)
+      -> { @frozen.instance_variable_set(:@ivar, :replacement) }.should.raise(Exception)
+      @frozen.ivar.should.equal?(:origin)
     end
 
     it "raises a FrozenError when passed replacement is identical to stored object" do
-      -> { @frozen.instance_variable_set(:@ivar, :origin) }.should raise_error(FrozenError)
+      -> { @frozen.instance_variable_set(:@ivar, :origin) }.should.raise(FrozenError)
     end
 
     it "raises a FrozenError when passed replacement is different from stored object" do
-      -> { @frozen.instance_variable_set(:@ivar, :replacement) }.should raise_error(FrozenError)
+      -> { @frozen.instance_variable_set(:@ivar, :replacement) }.should.raise(FrozenError)
     end
 
     it "accepts unicode instance variable names" do
@@ -97,9 +97,9 @@ def initialize
     end
 
     it "raises for frozen objects" do
-      -> { nil.instance_variable_set(:@foo, 42) }.should raise_error(FrozenError)
-      -> { nil.instance_variable_set(:foo, 42) }.should raise_error(NameError)
-      -> { :foo.instance_variable_set(:@foo, 42) }.should raise_error(FrozenError)
+      -> { nil.instance_variable_set(:@foo, 42) }.should.raise(FrozenError)
+      -> { nil.instance_variable_set(:foo, 42) }.should.raise(NameError)
+      -> { :foo.instance_variable_set(:@foo, 42) }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/kernel/instance_variables_spec.rb b/spec/ruby/core/kernel/instance_variables_spec.rb
index 677d8bb7b2b..75c1d8f752f 100644
--- a/spec/ruby/core/kernel/instance_variables_spec.rb
+++ b/spec/ruby/core/kernel/instance_variables_spec.rb
@@ -11,7 +11,7 @@
 
     it "returns the correct array if an instance variable is added" do
       a = 0
-      ->{ a.instance_variable_set("@test", 1) }.should raise_error(RuntimeError)
+      ->{ a.instance_variable_set("@test", 1) }.should.raise(RuntimeError)
     end
   end
 
diff --git a/spec/ruby/core/kernel/itself_spec.rb b/spec/ruby/core/kernel/itself_spec.rb
index c906d7c3e88..c1f01fdc5e9 100644
--- a/spec/ruby/core/kernel/itself_spec.rb
+++ b/spec/ruby/core/kernel/itself_spec.rb
@@ -4,6 +4,6 @@
 describe "Kernel#itself" do
   it "returns the receiver itself" do
     foo = Object.new
-    foo.itself.should equal foo
+    foo.itself.should.equal? foo
   end
 end
diff --git a/spec/ruby/core/kernel/lambda_spec.rb b/spec/ruby/core/kernel/lambda_spec.rb
index fa0e17b7489..6ab89c2bbb9 100644
--- a/spec/ruby/core/kernel/lambda_spec.rb
+++ b/spec/ruby/core/kernel/lambda_spec.rb
@@ -8,52 +8,52 @@
   it_behaves_like :kernel_lambda, :lambda
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:lambda)
+    Kernel.private_instance_methods(false).should.include?(:lambda)
   end
 
   it "creates a lambda-style Proc if given a literal block" do
     l = lambda { 42 }
-    l.lambda?.should be_true
+    l.lambda?.should == true
   end
 
   it "creates a lambda-style Proc if given a literal block via #send" do
     l = send(:lambda) { 42 }
-    l.lambda?.should be_true
+    l.lambda?.should == true
   end
 
   it "creates a lambda-style Proc if given a literal block via #__send__" do
     l = __send__(:lambda) { 42 }
-    l.lambda?.should be_true
+    l.lambda?.should == true
   end
 
   it "checks the arity of the call when no args are specified" do
     l = lambda { :called }
     l.call.should == :called
 
-    lambda { l.call(1) }.should raise_error(ArgumentError)
-    lambda { l.call(1, 2) }.should raise_error(ArgumentError)
+    lambda { l.call(1) }.should.raise(ArgumentError)
+    lambda { l.call(1, 2) }.should.raise(ArgumentError)
   end
 
   it "checks the arity when 1 arg is specified" do
     l = lambda { |a| :called }
     l.call(1).should == :called
 
-    lambda { l.call }.should raise_error(ArgumentError)
-    lambda { l.call(1, 2) }.should raise_error(ArgumentError)
+    lambda { l.call }.should.raise(ArgumentError)
+    lambda { l.call(1, 2) }.should.raise(ArgumentError)
   end
 
   it "does not check the arity when passing a Proc with &" do
     l = lambda { || :called }
     p = proc { || :called }
 
-    lambda { l.call(1) }.should raise_error(ArgumentError)
+    lambda { l.call(1) }.should.raise(ArgumentError)
     p.call(1).should == :called
   end
 
   it "accepts 0 arguments when used with ||" do
     lambda {
       lambda { || }.call(1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "strictly checks the arity when 0 or 2..inf args are specified" do
@@ -61,15 +61,15 @@
 
     lambda {
       l.call
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     lambda {
       l.call(1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     lambda {
       l.call(1,2)
-    }.should_not raise_error(ArgumentError)
+    }.should_not.raise(ArgumentError)
   end
 
   it "returns from the lambda itself, not the creation site of the lambda" do
@@ -79,7 +79,7 @@ def test
       @reached_end_of_method = true
     end
     test
-    @reached_end_of_method.should be_true
+    @reached_end_of_method.should == true
   end
 
   it "allows long returns to flow through it" do
@@ -94,13 +94,13 @@ def ret
         2
       end
     end
-    klass.new.lambda { 42 }.should be_an_instance_of Proc
+    klass.new.lambda { 42 }.should.instance_of? Proc
     klass.new.ret.should == 1
   end
 
   context "when called without a literal block" do
     it "raises when proc isn't a lambda" do
-      -> { lambda(&proc{}) }.should raise_error(ArgumentError, /the lambda method requires a literal block/)
+      -> { lambda(&proc{}) }.should.raise(ArgumentError, /the lambda method requires a literal block/)
     end
 
     it "doesn't warn when proc is lambda" do
diff --git a/spec/ruby/core/kernel/load_spec.rb b/spec/ruby/core/kernel/load_spec.rb
index a165cc4acd4..890aab8c27b 100644
--- a/spec/ruby/core/kernel/load_spec.rb
+++ b/spec/ruby/core/kernel/load_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:load)
+    Kernel.private_instance_methods(false).should.include?(:load)
   end
 
   it_behaves_like :kernel_require_basic, :load, CodeLoadingSpecs::Method.new
diff --git a/spec/ruby/core/kernel/local_variables_spec.rb b/spec/ruby/core/kernel/local_variables_spec.rb
index f6f1e15f52f..40c343f7e46 100644
--- a/spec/ruby/core/kernel/local_variables_spec.rb
+++ b/spec/ruby/core/kernel/local_variables_spec.rb
@@ -7,14 +7,13 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:local_variables)
+    Kernel.private_instance_methods(false).should.include?(:local_variables)
   end
 
   it "contains locals as they are added" do
     a = 1
     b = 2
-    local_variables.should include(:a, :b)
-    local_variables.length.should == 2
+    local_variables.sort.should == [:a, :b]
   end
 
   it "is accessible from bindings" do
@@ -25,14 +24,12 @@ def local_var_foo
     end
     foo_binding = local_var_foo()
     res = eval("local_variables",foo_binding)
-    res.should include(:a, :b)
-    res.length.should == 2
+    res.sort.should == [:a, :b]
   end
 
   it "is accessible in eval" do
     eval "a=1; b=2; ScratchPad.record local_variables"
-    ScratchPad.recorded.should include(:a, :b)
-    ScratchPad.recorded.length.should == 2
+    ScratchPad.recorded.sort.should == [:a, :b]
   end
 
   it "includes only unique variable names" do
diff --git a/spec/ruby/core/kernel/loop_spec.rb b/spec/ruby/core/kernel/loop_spec.rb
index 7c76c7d28ed..c2976e5cc5b 100644
--- a/spec/ruby/core/kernel/loop_spec.rb
+++ b/spec/ruby/core/kernel/loop_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel.loop" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:loop)
+    Kernel.private_instance_methods(false).should.include?(:loop)
   end
 
   it "calls block until it is terminated by a break" do
@@ -30,7 +30,7 @@
 
   it "returns an enumerator if no block given" do
     enum = loop
-    enum.instance_of?(Enumerator).should be_true
+    enum.instance_of?(Enumerator).should == true
     cnt = 0
     enum.each do |*args|
       raise "Args should be empty #{args.inspect}" unless args.empty?
@@ -55,7 +55,7 @@
   end
 
   it "does not rescue other errors" do
-    ->{ loop do raise StandardError end }.should raise_error( StandardError )
+    ->{ loop do raise StandardError end }.should.raise( StandardError )
   end
 
   it "returns StopIteration#result, the result value of a finished iterator" do
diff --git a/spec/ruby/core/kernel/method_spec.rb b/spec/ruby/core/kernel/method_spec.rb
index 3fc566d6a6f..9187b8c7e7a 100644
--- a/spec/ruby/core/kernel/method_spec.rb
+++ b/spec/ruby/core/kernel/method_spec.rb
@@ -11,12 +11,12 @@
 
   it "can be called on a private method" do
     @obj.send(:private_method).should == :private_method
-    @obj.method(:private_method).should be_an_instance_of(Method)
+    @obj.method(:private_method).should.instance_of?(Method)
   end
 
   it "can be called on a protected method" do
     @obj.send(:protected_method).should == :protected_method
-    @obj.method(:protected_method).should be_an_instance_of(Method)
+    @obj.method(:protected_method).should.instance_of?(Method)
   end
 
   it "will see an alias of the original method as == when in a derived class" do
@@ -31,7 +31,7 @@
 
   it "can be called even if we only respond_to_missing? method, true" do
     m = KernelSpecs::RespondViaMissing.new.method(:handled_privately)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     m.call(1, 2, 3).should == "Done handled_privately([1, 2, 3])"
   end
 
@@ -45,7 +45,7 @@ def method_missing
       end
     end
     m = cls.new.method(:foo)
-    -> { m.call }.should raise_error(ArgumentError)
+    -> { m.call }.should.raise(ArgumentError)
 
     cls = Class.new do
       def respond_to_missing?(name, *)
@@ -67,14 +67,22 @@ def method_missing(m)
     end
 
     it "raises a TypeError if the given name can't be converted to a String" do
-      -> { Object.method(nil) }.should raise_error(TypeError)
-      -> { Object.method([])  }.should raise_error(TypeError)
+      -> { Object.method(nil) }.should.raise(TypeError)
+      -> { Object.method([])  }.should.raise(TypeError)
     end
 
     it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to a String" do
       name = mock("method-name")
       name.should_receive(:to_str).and_raise(NoMethodError)
-      -> { Object.method(name) }.should raise_error(NoMethodError)
+      -> { Object.method(name) }.should.raise(NoMethodError)
+
+      name = mock("method-name")
+      name.should_receive(:to_str).and_raise(NoMethodError)
+      begin
+        raise RuntimeError.new
+      rescue => cause
+        -> { Object.method(name) }.should.raise(NoMethodError, cause:)
+      end
     end
   end
 end
diff --git a/spec/ruby/core/kernel/methods_spec.rb b/spec/ruby/core/kernel/methods_spec.rb
index fb7a7e8be94..cfa22aa05a5 100644
--- a/spec/ruby/core/kernel/methods_spec.rb
+++ b/spec/ruby/core/kernel/methods_spec.rb
@@ -5,67 +5,67 @@
 # TODO: rewrite
 describe "Kernel#methods" do
   it "returns singleton methods defined by obj.meth" do
-    KernelSpecs::Methods.methods(false).should include(:ichi)
+    KernelSpecs::Methods.methods(false).should.include?(:ichi)
   end
 
   it "returns singleton methods defined in 'class << self'" do
-    KernelSpecs::Methods.methods(false).should include(:san)
+    KernelSpecs::Methods.methods(false).should.include?(:san)
   end
 
   it "returns private singleton methods defined by obj.meth" do
-    KernelSpecs::Methods.methods(false).should include(:shi)
+    KernelSpecs::Methods.methods(false).should.include?(:shi)
   end
 
   it "returns singleton methods defined in 'class << self' when it follows 'private'" do
-    KernelSpecs::Methods.methods(false).should include(:roku)
+    KernelSpecs::Methods.methods(false).should.include?(:roku)
   end
 
   it "does not return private singleton methods defined in 'class << self'" do
-    KernelSpecs::Methods.methods(false).should_not include(:shichi)
+    KernelSpecs::Methods.methods(false).should_not.include?(:shichi)
   end
 
   it "returns the publicly accessible methods of the object" do
     meths =  KernelSpecs::Methods.methods(false)
-    meths.should include(:hachi, :ichi, :juu, :juu_ichi,
-                         :juu_ni, :roku, :san, :shi)
+    meths.to_set.should >= Set[:hachi, :ichi, :juu, :juu_ichi,
+                               :juu_ni, :roku, :san, :shi]
 
     KernelSpecs::Methods.new.methods(false).should == []
   end
 
   it "returns the publicly accessible methods in the object, its ancestors and mixed-in modules" do
     meths = KernelSpecs::Methods.methods(false) & KernelSpecs::Methods.methods
-    meths.should include(:hachi, :ichi, :juu, :juu_ichi,
-                         :juu_ni, :roku, :san, :shi)
+    meths.to_set.should >= Set[:hachi, :ichi, :juu, :juu_ichi,
+                               :juu_ni, :roku, :san, :shi]
 
-    KernelSpecs::Methods.new.methods.should include(:ku, :ni, :juu_san)
+    KernelSpecs::Methods.new.methods.to_set.should >= Set[:ku, :ni, :juu_san]
   end
 
   it "returns methods added to the metaclass through extend" do
     meth = KernelSpecs::Methods.new
-    meth.methods.should_not include(:peekaboo)
+    meth.methods.should_not.include?(:peekaboo)
     meth.extend(KernelSpecs::Methods::MetaclassMethods)
-    meth.methods.should include(:peekaboo)
+    meth.methods.should.include?(:peekaboo)
   end
 
   it "does not return undefined singleton methods defined by obj.meth" do
     o = KernelSpecs::Child.new
     def o.single; end
-    o.methods.should include(:single)
+    o.methods.should.include?(:single)
 
     class << o; self; end.send :undef_method, :single
-    o.methods.should_not include(:single)
+    o.methods.should_not.include?(:single)
   end
 
   it "does not return superclass methods undefined in the object's class" do
-    KernelSpecs::Child.new.methods.should_not include(:parent_method)
+    KernelSpecs::Child.new.methods.should_not.include?(:parent_method)
   end
 
   it "does not return superclass methods undefined in a superclass" do
-    KernelSpecs::Grandchild.new.methods.should_not include(:parent_method)
+    KernelSpecs::Grandchild.new.methods.should_not.include?(:parent_method)
   end
 
   it "does not return included module methods undefined in the object's class" do
-    KernelSpecs::Grandchild.new.methods.should_not include(:parent_mixin_method)
+    KernelSpecs::Grandchild.new.methods.should_not.include?(:parent_mixin_method)
   end
 end
 
diff --git a/spec/ruby/core/kernel/not_match_spec.rb b/spec/ruby/core/kernel/not_match_spec.rb
index 082e56fed7d..4ed7ea7b42a 100644
--- a/spec/ruby/core/kernel/not_match_spec.rb
+++ b/spec/ruby/core/kernel/not_match_spec.rb
@@ -15,7 +15,7 @@ def !~(obj)
   end
 
   it "raises NoMethodError if self does not respond to #=~" do
-    -> { Object.new !~ :foo }.should raise_error(NoMethodError)
+    -> { Object.new !~ :foo }.should.raise(NoMethodError)
   end
 
   it 'can be overridden in subclasses' do
diff --git a/spec/ruby/core/kernel/open_spec.rb b/spec/ruby/core/kernel/open_spec.rb
index 9d3f3760b96..14a3c43cad2 100644
--- a/spec/ruby/core/kernel/open_spec.rb
+++ b/spec/ruby/core/kernel/open_spec.rb
@@ -15,12 +15,12 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:open)
+    Kernel.private_instance_methods(false).should.include?(:open)
   end
 
   it "opens a file when given a valid filename" do
     @file = open(@name)
-    @file.should be_kind_of(File)
+    @file.should.is_a?(File)
   end
 
   it "opens a file when called with a block" do
@@ -34,7 +34,7 @@
           @io = open("|date")
         end
         begin
-          @io.should be_kind_of(IO)
+          @io.should.is_a?(IO)
           @io.read
         ensure
           @io.close
@@ -64,7 +64,7 @@
           @io = open("|date /t")
         end
         begin
-          @io.should be_kind_of(IO)
+          @io.should.is_a?(IO)
           @io.read
         ensure
           @io.close
@@ -89,16 +89,16 @@
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { open }.should raise_error(ArgumentError)
+    -> { open }.should.raise(ArgumentError)
   end
 
   it "accepts options as keyword arguments" do
     @file = open(@name, "r", 0666, flags: File::CREAT)
-    @file.should be_kind_of(File)
+    @file.should.is_a?(File)
 
     -> {
       open(@name, "r", 0666, {flags: File::CREAT})
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
   end
 
   describe "when given an object that responds to to_open" do
@@ -126,7 +126,7 @@
       @file = File.open(@name)
       obj.should_receive(:to_open).and_return(@file)
       @file = open(obj)
-      @file.should be_kind_of(File)
+      @file.should.is_a?(File)
     end
 
     it "returns the value from #to_open" do
@@ -167,9 +167,9 @@ def obj.to_open(*args, **kw)
 
   it "raises a TypeError if passed a non-String that does not respond to #to_open" do
     obj = mock('non-fileish')
-    -> { open(obj) }.should raise_error(TypeError)
-    -> { open(nil) }.should raise_error(TypeError)
-    -> { open(7)   }.should raise_error(TypeError)
+    -> { open(obj) }.should.raise(TypeError)
+    -> { open(nil) }.should.raise(TypeError)
+    -> { open(7)   }.should.raise(TypeError)
   end
 
   it "accepts nil for mode and permission" do
diff --git a/spec/ruby/core/kernel/p_spec.rb b/spec/ruby/core/kernel/p_spec.rb
index eae191aa54c..f89716899a8 100644
--- a/spec/ruby/core/kernel/p_spec.rb
+++ b/spec/ruby/core/kernel/p_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:p)
+    Kernel.private_instance_methods(false).should.include?(:p)
   end
 
   # TODO: fix
diff --git a/spec/ruby/core/kernel/print_spec.rb b/spec/ruby/core/kernel/print_spec.rb
index 7e7c9b822db..5473d22f71c 100644
--- a/spec/ruby/core/kernel/print_spec.rb
+++ b/spec/ruby/core/kernel/print_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#print" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:print)
+    Kernel.private_instance_methods(false).should.include?(:print)
   end
 
   it "delegates to $stdout" do
diff --git a/spec/ruby/core/kernel/printf_spec.rb b/spec/ruby/core/kernel/printf_spec.rb
index 61bf955c259..50939b3794b 100644
--- a/spec/ruby/core/kernel/printf_spec.rb
+++ b/spec/ruby/core/kernel/printf_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Kernel#printf" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:printf)
+    Kernel.private_instance_methods(false).should.include?(:printf)
   end
 end
 
diff --git a/spec/ruby/core/kernel/private_methods_spec.rb b/spec/ruby/core/kernel/private_methods_spec.rb
index 041634d1e52..b0e6d042a97 100644
--- a/spec/ruby/core/kernel/private_methods_spec.rb
+++ b/spec/ruby/core/kernel/private_methods_spec.rb
@@ -6,23 +6,23 @@
 describe "Kernel#private_methods" do
   it "returns a list of the names of privately accessible methods in the object" do
     m = KernelSpecs::Methods.private_methods(false)
-    m.should include(:shichi)
+    m.should.include?(:shichi)
     m = KernelSpecs::Methods.new.private_methods(false)
-    m.should include(:juu_shi)
+    m.should.include?(:juu_shi)
   end
 
   it "returns a list of the names of privately accessible methods in the object and its ancestors and mixed-in modules" do
     m = (KernelSpecs::Methods.private_methods(false) & KernelSpecs::Methods.private_methods)
 
-    m.should include(:shichi)
+    m.should.include?(:shichi)
     m = KernelSpecs::Methods.new.private_methods
-    m.should include(:juu_shi)
+    m.should.include?(:juu_shi)
   end
 
   it "returns private methods mixed in to the metaclass" do
     m = KernelSpecs::Methods.new
     m.extend(KernelSpecs::Methods::MetaclassMethods)
-    m.private_methods.should include(:shoo)
+    m.private_methods.should.include?(:shoo)
   end
 end
 
diff --git a/spec/ruby/core/kernel/proc_spec.rb b/spec/ruby/core/kernel/proc_spec.rb
index 6553b8fd04b..1ba662177b2 100644
--- a/spec/ruby/core/kernel/proc_spec.rb
+++ b/spec/ruby/core/kernel/proc_spec.rb
@@ -6,20 +6,20 @@
 
 describe "Kernel.proc" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:proc)
+    Kernel.private_instance_methods(false).should.include?(:proc)
   end
 
   it "creates a proc-style Proc if given a literal block" do
     l = proc { 42 }
-    l.lambda?.should be_false
+    l.lambda?.should == false
   end
 
   it "returned the passed Proc if given an existing Proc" do
     some_lambda = -> {}
-    some_lambda.lambda?.should be_true
+    some_lambda.lambda?.should == true
     l = proc(&some_lambda)
-    l.should equal(some_lambda)
-    l.lambda?.should be_true
+    l.should.equal?(some_lambda)
+    l.lambda?.should == true
   end
 
   it_behaves_like :kernel_lambda, :proc
@@ -31,7 +31,7 @@ def test
       @reached_end_of_method = true
     end
     test
-    @reached_end_of_method.should be_nil
+    @reached_end_of_method.should == nil
   end
 end
 
@@ -43,6 +43,6 @@ def some_method
   it "raises an ArgumentError when passed no block" do
     -> {
       some_method { "hello" }
-    }.should raise_error(ArgumentError, 'tried to create Proc object without a block')
+    }.should.raise(ArgumentError, 'tried to create Proc object without a block')
   end
 end
diff --git a/spec/ruby/core/kernel/protected_methods_spec.rb b/spec/ruby/core/kernel/protected_methods_spec.rb
index d3334e886b3..aecb9f5ffb3 100644
--- a/spec/ruby/core/kernel/protected_methods_spec.rb
+++ b/spec/ruby/core/kernel/protected_methods_spec.rb
@@ -8,21 +8,21 @@
 # You should use have_protected_method() with the exception of this spec.
 describe "Kernel#protected_methods" do
   it "returns a list of the names of protected methods accessible in the object" do
-    KernelSpecs::Methods.protected_methods(false).sort.should include(:juu_ichi)
-    KernelSpecs::Methods.new.protected_methods(false).should include(:ku)
+    KernelSpecs::Methods.protected_methods(false).sort.should.include?(:juu_ichi)
+    KernelSpecs::Methods.new.protected_methods(false).should.include?(:ku)
   end
 
   it "returns a list of the names of protected methods accessible in the object and from its ancestors and mixed-in modules" do
     l1 = KernelSpecs::Methods.protected_methods(false)
     l2 = KernelSpecs::Methods.protected_methods
-    (l1 & l2).should include(:juu_ichi)
-    KernelSpecs::Methods.new.protected_methods.should include(:ku)
+    (l1 & l2).should.include?(:juu_ichi)
+    KernelSpecs::Methods.new.protected_methods.should.include?(:ku)
   end
 
   it "returns methods mixed in to the metaclass" do
     m = KernelSpecs::Methods.new
     m.extend(KernelSpecs::Methods::MetaclassMethods)
-    m.protected_methods.should include(:nopeeking)
+    m.protected_methods.should.include?(:nopeeking)
   end
 end
 
diff --git a/spec/ruby/core/kernel/public_method_spec.rb b/spec/ruby/core/kernel/public_method_spec.rb
index c5d54c777ef..42b8f797d3c 100644
--- a/spec/ruby/core/kernel/public_method_spec.rb
+++ b/spec/ruby/core/kernel/public_method_spec.rb
@@ -13,20 +13,20 @@
     @obj.send(:private_method).should == :private_method
     -> do
       @obj.public_method(:private_method)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError when called on a protected method" do
     @obj.send(:protected_method).should == :protected_method
     -> {
       @obj.public_method(:protected_method)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "raises a NameError if we only repond_to_missing? method, true" do
     obj = KernelSpecs::RespondViaMissing.new
     -> do
       obj.public_method(:handled_privately)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/kernel/public_methods_spec.rb b/spec/ruby/core/kernel/public_methods_spec.rb
index a5512784fb9..e334ac9a55f 100644
--- a/spec/ruby/core/kernel/public_methods_spec.rb
+++ b/spec/ruby/core/kernel/public_methods_spec.rb
@@ -5,31 +5,30 @@
 # TODO: rewrite
 describe "Kernel#public_methods" do
   it "returns a list of the names of publicly accessible methods in the object" do
-    KernelSpecs::Methods.public_methods(false).sort.should include(:hachi,
-      :ichi, :juu, :juu_ni, :roku, :san, :shi)
-    KernelSpecs::Methods.new.public_methods(false).sort.should include(:juu_san, :ni)
+    KernelSpecs::Methods.public_methods(false).to_set.should >= Set[:hachi, :ichi, :juu, :juu_ni, :roku, :san, :shi]
+    KernelSpecs::Methods.new.public_methods(false).to_set.should >= Set[:juu_san, :ni]
   end
 
   it "returns a list of names without protected accessible methods in the object" do
-    KernelSpecs::Methods.public_methods(false).sort.should_not include(:juu_ichi)
-    KernelSpecs::Methods.new.public_methods(false).sort.should_not include(:ku)
+    KernelSpecs::Methods.public_methods(false).sort.should_not.include?(:juu_ichi)
+    KernelSpecs::Methods.new.public_methods(false).sort.should_not.include?(:ku)
   end
 
   it "returns a list of the names of publicly accessible methods in the object and its ancestors and mixed-in modules" do
-    (KernelSpecs::Methods.public_methods(false) & KernelSpecs::Methods.public_methods).sort.should include(
-      :hachi, :ichi, :juu, :juu_ni, :roku, :san, :shi)
+    (KernelSpecs::Methods.public_methods(false) & KernelSpecs::Methods.public_methods).to_set.should >= Set[
+      :hachi, :ichi, :juu, :juu_ni, :roku, :san, :shi]
     m = KernelSpecs::Methods.new.public_methods
-    m.should include(:ni, :juu_san)
+    m.to_set.should >= Set[:ni, :juu_san]
   end
 
   it "returns methods mixed in to the metaclass" do
     m = KernelSpecs::Methods.new
     m.extend(KernelSpecs::Methods::MetaclassMethods)
-    m.public_methods.should include(:peekaboo)
+    m.public_methods.should.include?(:peekaboo)
   end
 
   it "returns public methods for immediates" do
-    10.public_methods.should include(:divmod)
+    10.public_methods.should.include?(:divmod)
   end
 end
 
diff --git a/spec/ruby/core/kernel/public_send_spec.rb b/spec/ruby/core/kernel/public_send_spec.rb
index b684b1729c7..6a4a969c77f 100644
--- a/spec/ruby/core/kernel/public_send_spec.rb
+++ b/spec/ruby/core/kernel/public_send_spec.rb
@@ -29,7 +29,7 @@ def bar
         'done'
       end
     end
-    -> { KernelSpecs::Foo.new.public_send(:bar)}.should raise_error(NoMethodError)
+    -> { KernelSpecs::Foo.new.public_send(:bar)}.should.raise(NoMethodError)
   end
 
   it "raises a NoMethodError if the named method is private" do
@@ -41,7 +41,7 @@ def bar
     end
     -> {
       KernelSpecs::Foo.new.public_send(:bar)
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   context 'called from own public method' do
@@ -70,11 +70,11 @@ def private_method
     end
 
     it "raises a NoMethodError if the method is protected" do
-      -> { @receiver.call_protected_method }.should raise_error(NoMethodError)
+      -> { @receiver.call_protected_method }.should.raise(NoMethodError)
     end
 
     it "raises a NoMethodError if the method is private" do
-      -> { @receiver.call_private_method }.should raise_error(NoMethodError)
+      -> { @receiver.call_private_method }.should.raise(NoMethodError)
     end
   end
 
@@ -88,7 +88,7 @@ def bar
     end
     -> {
       KernelSpecs::Foo.new.public_send(:aka)
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   it "raises a NoMethodError if the named method is an alias of a protected method" do
@@ -101,15 +101,15 @@ def bar
     end
     -> {
       KernelSpecs::Foo.new.public_send(:aka)
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   it "includes `public_send` in the backtrace when passed not enough arguments" do
-    -> { public_send() }.should raise_error(ArgumentError) { |e| e.backtrace[0].should =~ /[`'](?:Kernel#)?public_send'/ }
+    -> { public_send() }.should.raise(ArgumentError) { |e| e.backtrace[0].should =~ /[`'](?:Kernel#)?public_send'/ }
   end
 
   it "includes `public_send` in the backtrace when passed a single incorrect argument" do
-    -> { public_send(Object.new) }.should raise_error(TypeError) { |e| e.backtrace[0].should =~ /[`'](?:Kernel#)?public_send'/ }
+    -> { public_send(Object.new) }.should.raise(TypeError) { |e| e.backtrace[0].should =~ /[`'](?:Kernel#)?public_send'/ }
   end
 
   it_behaves_like :basicobject_send, :public_send
diff --git a/spec/ruby/core/kernel/putc_spec.rb b/spec/ruby/core/kernel/putc_spec.rb
index 74bd3765db7..e6a20a9af18 100644
--- a/spec/ruby/core/kernel/putc_spec.rb
+++ b/spec/ruby/core/kernel/putc_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Kernel#putc" do
   it "is a private instance method" do
-    Kernel.should have_private_instance_method(:putc)
+    Kernel.private_instance_methods(false).should.include?(:putc)
   end
 end
 
diff --git a/spec/ruby/core/kernel/puts_spec.rb b/spec/ruby/core/kernel/puts_spec.rb
index 6eb38e8fcfd..eed18fcd50e 100644
--- a/spec/ruby/core/kernel/puts_spec.rb
+++ b/spec/ruby/core/kernel/puts_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:puts)
+    Kernel.private_instance_methods(false).should.include?(:puts)
   end
 
   it "delegates to $stdout.puts" do
diff --git a/spec/ruby/core/kernel/raise_spec.rb b/spec/ruby/core/kernel/raise_spec.rb
index fcd011d4e62..6162677e170 100644
--- a/spec/ruby/core/kernel/raise_spec.rb
+++ b/spec/ruby/core/kernel/raise_spec.rb
@@ -4,9 +4,19 @@
 
 describe "Kernel#raise" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:raise)
+    Kernel.private_instance_methods.should.include?(:raise)
   end
 
+  # Shared specs expect a public #raise method.
+  public_raiser = Object.new
+  class << public_raiser
+    public :raise
+  end
+  it_behaves_like :kernel_raise, :raise, public_raiser
+  it_behaves_like :kernel_raise_with_cause, :raise, public_raiser
+end
+
+describe "Kernel#raise with previously rescued exception" do
   it "re-raises the previously rescued exception if no exception is specified" do
     ScratchPad.record nil
 
@@ -23,90 +33,9 @@
         raise
         ScratchPad.record :no_reraise
       end
-    end.should raise_error(Exception, "outer")
-
-    ScratchPad.recorded.should be_nil
-  end
-
-  it "accepts a cause keyword argument that sets the cause" do
-    cause = StandardError.new
-    -> { raise("error", cause: cause) }.should raise_error(RuntimeError) { |e| e.cause.should == cause }
-  end
-
-  it "accepts a cause keyword argument that overrides the last exception" do
-    begin
-      raise "first raise"
-    rescue => ignored
-      cause = StandardError.new
-      -> { raise("error", cause: cause) }.should raise_error(RuntimeError) { |e| e.cause.should == cause }
-    end
-  end
-
-  it "raises an ArgumentError when only cause is given" do
-    cause = StandardError.new
-    -> { raise(cause: cause) }.should raise_error(ArgumentError, "only cause is given with no arguments")
-  end
-
-  it "raises an ArgumentError when only cause is given even if it has nil value" do
-    -> { raise(cause: nil) }.should raise_error(ArgumentError, "only cause is given with no arguments")
-  end
-
-  it "raises a TypeError when given cause is not an instance of Exception" do
-    -> { raise "message", cause: Object.new }.should raise_error(TypeError, "exception object expected")
-  end
-
-  it "doesn't raise a TypeError when given cause is nil" do
-    -> { raise "message", cause: nil }.should raise_error(RuntimeError, "message")
-  end
-
-  it "allows cause equal an exception" do
-    e = RuntimeError.new("message")
-    -> { raise e, cause: e }.should raise_error(e)
-  end
+    end.should.raise(Exception, "outer")
 
-  it "doesn't set given cause when it equals an exception" do
-    e = RuntimeError.new("message")
-
-    begin
-      raise e, cause: e
-    rescue
-    end
-
-    e.cause.should == nil
-  end
-
-  it "raises ArgumentError when exception is part of the cause chain" do
-    -> {
-      begin
-        raise "Error 1"
-      rescue => e1
-        begin
-          raise "Error 2"
-        rescue => e2
-          begin
-            raise "Error 3"
-          rescue => e3
-            raise e1, cause: e3
-          end
-        end
-      end
-    }.should raise_error(ArgumentError, "circular causes")
-  end
-
-  it "re-raises a rescued exception" do
-    -> do
-      begin
-        raise StandardError, "aaa"
-      rescue Exception
-        begin
-          raise ArgumentError
-        rescue ArgumentError
-        end
-
-        # should raise StandardError "aaa"
-        raise
-      end
-    end.should raise_error(StandardError, "aaa")
+    ScratchPad.recorded.should == nil
   end
 
   it "re-raises a previously rescued exception without overwriting the cause" do
@@ -283,10 +212,11 @@
   end
 end
 
-describe "Kernel#raise" do
-  it_behaves_like :kernel_raise, :raise, Kernel
-end
-
 describe "Kernel.raise" do
-  it "needs to be reviewed for spec completeness"
+  it "is a public method" do
+    Kernel.singleton_class.should.public_method_defined?(:raise)
+  end
+
+  it_behaves_like :kernel_raise, :raise, Kernel
+  it_behaves_like :kernel_raise_with_cause, :raise, Kernel
 end
diff --git a/spec/ruby/core/kernel/rand_spec.rb b/spec/ruby/core/kernel/rand_spec.rb
index 355e425792e..1bf5e225d9f 100644
--- a/spec/ruby/core/kernel/rand_spec.rb
+++ b/spec/ruby/core/kernel/rand_spec.rb
@@ -3,42 +3,42 @@
 
 describe "Kernel#rand" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:rand)
+    Kernel.private_instance_methods(false).should.include?(:rand)
   end
 
   it "returns a float if no argument is passed" do
-    rand.should be_kind_of(Float)
+    rand.should.is_a?(Float)
   end
 
   it "returns an integer for an integer argument" do
-    rand(77).should be_kind_of(Integer)
+    rand(77).should.is_a?(Integer)
   end
 
   it "returns an integer for a float argument greater than 1" do
-    rand(1.3).should be_kind_of(Integer)
+    rand(1.3).should.is_a?(Integer)
   end
 
   it "returns a float for an argument between -1 and 1" do
-    rand(-0.999).should be_kind_of(Float)
-    rand(-0.01).should be_kind_of(Float)
-    rand(0).should be_kind_of(Float)
-    rand(0.01).should be_kind_of(Float)
-    rand(0.999).should be_kind_of(Float)
+    rand(-0.999).should.is_a?(Float)
+    rand(-0.01).should.is_a?(Float)
+    rand(0).should.is_a?(Float)
+    rand(0.01).should.is_a?(Float)
+    rand(0.999).should.is_a?(Float)
   end
 
   it "ignores the sign of the argument" do
-    [0, 1, 2, 3].should include(rand(-4))
+    [0, 1, 2, 3].should.include?(rand(-4))
   end
 
   it "never returns a value greater or equal to 1.0 with no arguments" do
     1000.times do
-      (0...1.0).should include(rand)
+      (0...1.0).should.include?(rand)
     end
   end
 
   it "never returns a value greater or equal to any passed in max argument" do
     1000.times do
-      (0...100).to_a.should include(rand(100))
+      (0...100).to_a.should.include?(rand(100))
     end
   end
 
@@ -53,32 +53,32 @@
     it "returns an Integer between the two Integers" do
       1000.times do
         x = rand(4...6)
-        x.should be_kind_of(Integer)
-        (4...6).should include(x)
+        x.should.is_a?(Integer)
+        (4...6).should.include?(x)
       end
     end
 
     it "returns a Float between the given Integer and Float" do
       1000.times do
         x = rand(4...6.5)
-        x.should be_kind_of(Float)
-        (4...6.5).should include(x)
+        x.should.is_a?(Float)
+        (4...6.5).should.include?(x)
       end
     end
 
     it "returns a Float between the given Float and Integer" do
       1000.times do
         x = rand(3.5...6)
-        x.should be_kind_of(Float)
-        (3.5...6).should include(x)
+        x.should.is_a?(Float)
+        (3.5...6).should.include?(x)
       end
     end
 
     it "returns a Float between the two given Floats" do
       1000.times do
         x = rand(3.5...6.5)
-        x.should be_kind_of(Float)
-        (3.5...6.5).should include(x)
+        x.should.is_a?(Float)
+        (3.5...6.5).should.include?(x)
       end
     end
   end
@@ -87,32 +87,32 @@
     it "returns an Integer between the two Integers" do
       1000.times do
         x = rand(4..6)
-        x.should be_kind_of(Integer)
-        (4..6).should include(x)
+        x.should.is_a?(Integer)
+        (4..6).should.include?(x)
       end
     end
 
     it "returns a Float between the given Integer and Float" do
       1000.times do
         x = rand(4..6.5)
-        x.should be_kind_of(Float)
-        (4..6.5).should include(x)
+        x.should.is_a?(Float)
+        (4..6.5).should.include?(x)
       end
     end
 
     it "returns a Float between the given Float and Integer" do
       1000.times do
         x = rand(3.5..6)
-        x.should be_kind_of(Float)
-        (3.5..6).should include(x)
+        x.should.is_a?(Float)
+        (3.5..6).should.include?(x)
       end
     end
 
     it "returns a Float between the two given Floats" do
       1000.times do
         x = rand(3.5..6.5)
-        x.should be_kind_of(Float)
-        (3.5..6.5).should include(x)
+        x.should.is_a?(Float)
+        (3.5..6.5).should.include?(x)
       end
     end
   end
@@ -120,8 +120,8 @@
   context "given an inclusive range between 0 and 1" do
     it "returns an Integer between the two Integers" do
       x = rand(0..1)
-      x.should be_kind_of(Integer)
-      (0..1).should include(x)
+      x.should.is_a?(Integer)
+      (0..1).should.include?(x)
     end
 
     it "returns a Float if at least one side is Float" do
@@ -130,19 +130,19 @@
       x2 = Random.new(seed).rand(0.0..1.0)
       x3 = Random.new(seed).rand(0.0..1)
 
-      x3.should be_kind_of(Float)
-      x1.should eql(x3)
-      x2.should eql(x3)
+      x3.should.is_a?(Float)
+      x1.should.eql?(x3)
+      x2.should.eql?(x3)
 
-      (0.0..1.0).should include(x3)
+      (0.0..1.0).should.include?(x3)
     end
   end
 
   context "given an exclusive range between 0 and 1" do
     it "returns zero as an Integer" do
       x = rand(0...1)
-      x.should be_kind_of(Integer)
-      x.should eql(0)
+      x.should.is_a?(Integer)
+      x.should.eql?(0)
     end
 
     it "returns a Float if at least one side is Float" do
@@ -151,34 +151,34 @@
       x2 = Random.new(seed).rand(0.0...1.0)
       x3 = Random.new(seed).rand(0.0...1)
 
-      x3.should be_kind_of(Float)
-      x1.should eql(x3)
-      x2.should eql(x3)
+      x3.should.is_a?(Float)
+      x1.should.eql?(x3)
+      x2.should.eql?(x3)
 
-      (0.0...1.0).should include(x3)
+      (0.0...1.0).should.include?(x3)
     end
   end
 
   it "returns a numeric for an range argument where max is < 1" do
-    rand(0.25..0.75).should be_kind_of(Numeric)
+    rand(0.25..0.75).should.is_a?(Numeric)
   end
 
   it "returns nil when range is backwards" do
-    rand(1..0).should be_nil
+    rand(1..0).should == nil
   end
 
   it "returns the range start/end when Float range is 0" do
-    rand(1.0..1.0).should eql(1.0)
+    rand(1.0..1.0).should.eql?(1.0)
   end
 
   it "returns the range start/end when Integer range is 0" do
-    rand(42..42).should eql(42)
+    rand(42..42).should.eql?(42)
   end
 
   it "supports custom object types" do
-    rand(KernelSpecs::CustomRangeInteger.new(1)..KernelSpecs::CustomRangeInteger.new(42)).should be_an_instance_of(KernelSpecs::CustomRangeInteger)
-    rand(KernelSpecs::CustomRangeFloat.new(1.0)..KernelSpecs::CustomRangeFloat.new(42.0)).should be_an_instance_of(KernelSpecs::CustomRangeFloat)
-    rand(Time.now..Time.now).should be_an_instance_of(Time)
+    rand(KernelSpecs::CustomRangeInteger.new(1)..KernelSpecs::CustomRangeInteger.new(42)).should.instance_of?(KernelSpecs::CustomRangeInteger)
+    rand(KernelSpecs::CustomRangeFloat.new(1.0)..KernelSpecs::CustomRangeFloat.new(42.0)).should.instance_of?(KernelSpecs::CustomRangeFloat)
+    rand(Time.now..Time.now).should.instance_of?(Time)
   end
 
   it "is random on boot" do
diff --git a/spec/ruby/core/kernel/readline_spec.rb b/spec/ruby/core/kernel/readline_spec.rb
index dce7b03dc8b..86899d78d26 100644
--- a/spec/ruby/core/kernel/readline_spec.rb
+++ b/spec/ruby/core/kernel/readline_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#readline" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:readline)
+    Kernel.private_instance_methods(false).should.include?(:readline)
   end
 end
 
diff --git a/spec/ruby/core/kernel/readlines_spec.rb b/spec/ruby/core/kernel/readlines_spec.rb
index 2b6d65fff2e..c758014aabe 100644
--- a/spec/ruby/core/kernel/readlines_spec.rb
+++ b/spec/ruby/core/kernel/readlines_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#readlines" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:readlines)
+    Kernel.private_instance_methods(false).should.include?(:readlines)
   end
 end
 
diff --git a/spec/ruby/core/kernel/remove_instance_variable_spec.rb b/spec/ruby/core/kernel/remove_instance_variable_spec.rb
index 4e5ba5e0189..114536064f4 100644
--- a/spec/ruby/core/kernel/remove_instance_variable_spec.rb
+++ b/spec/ruby/core/kernel/remove_instance_variable_spec.rb
@@ -9,7 +9,7 @@
 
   it "removes the instance variable" do
     @instance.send :remove_instance_variable, @object
-    @instance.instance_variable_defined?(@object).should be_false
+    @instance.instance_variable_defined?(@object).should == false
   end
 end
 
@@ -19,39 +19,39 @@
   end
 
   it "is a public method" do
-    Kernel.should have_public_instance_method(:remove_instance_variable, false)
+    Kernel.public_instance_methods(false).should.include?(:remove_instance_variable)
   end
 
   it "raises a NameError if the instance variable is not defined" do
     -> do
       @instance.send :remove_instance_variable, :@unknown
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError if the argument is not a valid instance variable name" do
     -> do
       @instance.send :remove_instance_variable, :"@0"
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a TypeError if passed an Object not defining #to_str" do
     -> do
       obj = mock("kernel remove_instance_variable")
       @instance.send :remove_instance_variable, obj
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a FrozenError if self is frozen" do
     o = Object.new
     o.freeze
-    -> { o.remove_instance_variable(:@foo) }.should raise_error(FrozenError)
-    -> { o.remove_instance_variable(:foo) }.should raise_error(NameError)
+    -> { o.remove_instance_variable(:@foo) }.should.raise(FrozenError)
+    -> { o.remove_instance_variable(:foo) }.should.raise(NameError)
   end
 
   it "raises for frozen objects" do
-    -> { nil.remove_instance_variable(:@foo) }.should raise_error(FrozenError)
-    -> { nil.remove_instance_variable(:foo) }.should raise_error(NameError)
-    -> { :foo.remove_instance_variable(:@foo) }.should raise_error(FrozenError)
+    -> { nil.remove_instance_variable(:@foo) }.should.raise(FrozenError)
+    -> { nil.remove_instance_variable(:foo) }.should.raise(NameError)
+    -> { :foo.remove_instance_variable(:@foo) }.should.raise(FrozenError)
   end
 
   describe "when passed a String" do
diff --git a/spec/ruby/core/kernel/require_relative_spec.rb b/spec/ruby/core/kernel/require_relative_spec.rb
index 6188d13a4e4..332045b2006 100644
--- a/spec/ruby/core/kernel/require_relative_spec.rb
+++ b/spec/ruby/core/kernel/require_relative_spec.rb
@@ -27,14 +27,14 @@
       end
 
       it "loads a path relative to current file" do
-        require_relative(@link).should be_true
+        require_relative(@link).should == true
         ScratchPad.recorded.should == [:loaded]
       end
     end
   end
 
   it "loads a path relative to the current file" do
-    require_relative(@path).should be_true
+    require_relative(@path).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
@@ -42,14 +42,14 @@
 
     it "synthetic file base name loads a file base name relative to the working directory" do
       Dir.chdir @abs_dir do
-        Object.new.instance_eval("require_relative(#{File.basename(@path).inspect})", "foo.rb").should be_true
+        Object.new.instance_eval("require_relative(#{File.basename(@path).inspect})", "foo.rb").should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "synthetic file path loads a relative path relative to the working directory plus the directory of the synthetic path" do
       Dir.chdir @abs_dir do
-        Object.new.instance_eval("require_relative(File.join('..', #{File.basename(@path).inspect}))", "bar/foo.rb").should be_true
+        Object.new.instance_eval("require_relative(File.join('..', #{File.basename(@path).inspect}))", "bar/foo.rb").should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
@@ -57,14 +57,14 @@
     platform_is_not :windows do
       it "synthetic relative file path with a Windows path separator specified loads a relative path relative to the working directory" do
         Dir.chdir @abs_dir do
-          Object.new.instance_eval("require_relative(#{File.basename(@path).inspect})", "bar\\foo.rb").should be_true
+          Object.new.instance_eval("require_relative(#{File.basename(@path).inspect})", "bar\\foo.rb").should == true
         end
         ScratchPad.recorded.should == [:loaded]
       end
     end
 
     it "absolute file path loads a path relative to the absolute path" do
-      Object.new.instance_eval("require_relative(#{@path.inspect})", __FILE__).should be_true
+      Object.new.instance_eval("require_relative(#{@path.inspect})", __FILE__).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -74,34 +74,34 @@
         root = File.dirname(root)
       end
       root_relative = @abs_path[root.size..-1]
-      Object.new.instance_eval("require_relative(#{root_relative.inspect})", "/").should be_true
+      Object.new.instance_eval("require_relative(#{root_relative.inspect})", "/").should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
   end
 
   it "loads a file defining many methods" do
-    require_relative("#{@dir}/methods_fixture.rb").should be_true
+    require_relative("#{@dir}/methods_fixture.rb").should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
   it "raises a LoadError if the file does not exist" do
-    -> { require_relative("#{@dir}/nonexistent.rb") }.should raise_error(LoadError)
+    -> { require_relative("#{@dir}/nonexistent.rb") }.should.raise(LoadError)
     ScratchPad.recorded.should == []
   end
 
   it "raises a LoadError that includes the missing path" do
     missing_path = "#{@dir}/nonexistent.rb"
     expanded_missing_path = File.expand_path(missing_path, __dir__)
-    -> { require_relative(missing_path) }.should raise_error(LoadError) { |e|
-      e.message.should include(expanded_missing_path)
+    -> { require_relative(missing_path) }.should.raise(LoadError) { |e|
+      e.message.should.include?(expanded_missing_path)
       e.path.should == expanded_missing_path
     }
     ScratchPad.recorded.should == []
   end
 
   it "raises a LoadError if basepath does not exist" do
-    -> { eval("require_relative('#{@dir}/nonexistent.rb')") }.should raise_error(LoadError)
+    -> { eval("require_relative('#{@dir}/nonexistent.rb')") }.should.raise(LoadError)
   end
 
   it "stores the missing path in a LoadError object" do
@@ -117,34 +117,34 @@
   it "calls #to_str on non-String objects" do
     name = mock("load_fixture.rb mock")
     name.should_receive(:to_str).and_return(@path)
-    require_relative(name).should be_true
+    require_relative(name).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
   it "raises a TypeError if argument does not respond to #to_str" do
-    -> { require_relative(nil) }.should raise_error(TypeError)
-    -> { require_relative(42) }.should raise_error(TypeError)
+    -> { require_relative(nil) }.should.raise(TypeError)
+    -> { require_relative(42) }.should.raise(TypeError)
     -> {
       require_relative([@path,@path])
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an object that has #to_s but not #to_str" do
     name = mock("load_fixture.rb mock")
     name.stub!(:to_s).and_return(@path)
-    -> { require_relative(name) }.should raise_error(TypeError)
+    -> { require_relative(name) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_str does not return a String" do
     name = mock("#to_str returns nil")
     name.should_receive(:to_str).at_least(1).times.and_return(nil)
-    -> { require_relative(name) }.should raise_error(TypeError)
+    -> { require_relative(name) }.should.raise(TypeError)
   end
 
   it "calls #to_path on non-String objects" do
     name = mock("load_fixture.rb mock")
     name.should_receive(:to_path).and_return(@path)
-    require_relative(name).should be_true
+    require_relative(name).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
@@ -153,13 +153,13 @@
     to_path = mock("load_fixture_rb #to_path mock")
     name.should_receive(:to_path).and_return(to_path)
     to_path.should_receive(:to_str).and_return(@path)
-    require_relative(name).should be_true
+    require_relative(name).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
   describe "(file extensions)" do
     it "loads a .rb extensioned file when passed a non-extensioned path" do
-      require_relative("#{@dir}/load_fixture").should be_true
+      require_relative("#{@dir}/load_fixture").should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -168,20 +168,20 @@
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.dylib"
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.so"
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.dll"
-      require_relative(@path).should be_true
+      require_relative(@path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "does not load a C-extension file if a .rb extensioned file is already loaded" do
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.rb"
-      require_relative("#{@dir}/load_fixture").should be_false
+      require_relative("#{@dir}/load_fixture").should == false
       ScratchPad.recorded.should == []
     end
 
     it "loads a .rb extensioned file when passed a non-.rb extensioned path" do
-      require_relative("#{@dir}/load_fixture.ext").should be_true
+      require_relative("#{@dir}/load_fixture.ext").should == true
       ScratchPad.recorded.should == [:loaded]
-      $LOADED_FEATURES.should include "#{@abs_dir}/load_fixture.ext.rb"
+      $LOADED_FEATURES.should.include? "#{@abs_dir}/load_fixture.ext.rb"
     end
 
     it "loads a .rb extensioned file when a complex-extensioned C-extension file of the same name is loaded" do
@@ -189,22 +189,22 @@
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.ext.dylib"
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.ext.so"
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.ext.dll"
-      require_relative("#{@dir}/load_fixture.ext").should be_true
+      require_relative("#{@dir}/load_fixture.ext").should == true
       ScratchPad.recorded.should == [:loaded]
-      $LOADED_FEATURES.should include "#{@abs_dir}/load_fixture.ext.rb"
+      $LOADED_FEATURES.should.include? "#{@abs_dir}/load_fixture.ext.rb"
     end
 
     it "does not load a C-extension file if a complex-extensioned .rb file is already loaded" do
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.ext.rb"
-      require_relative("#{@dir}/load_fixture.ext").should be_false
+      require_relative("#{@dir}/load_fixture.ext").should == false
       ScratchPad.recorded.should == []
     end
   end
 
   describe "($LOADED_FEATURES)" do
     it "stores an absolute path" do
-      require_relative(@path).should be_true
-      $LOADED_FEATURES.should include(@abs_path)
+      require_relative(@path).should == true
+      $LOADED_FEATURES.should.include?(@abs_path)
     end
 
     platform_is_not :windows, :wasi do
@@ -231,8 +231,8 @@
           ScratchPad.recorded.should == [:loaded]
 
           features = $LOADED_FEATURES.select { |path| path.end_with?('load_fixture.rb') }
-          features.should include(absolute_path)
-          features.should_not include(canonical_path)
+          features.should.include?(absolute_path)
+          features.should_not.include?(canonical_path)
         end
 
         it "stores the same path that __FILE__ returns in the required file" do
@@ -249,26 +249,26 @@
 
     it "does not store the path if the load fails" do
       saved_loaded_features = $LOADED_FEATURES.dup
-      -> { require_relative("#{@dir}/raise_fixture.rb") }.should raise_error(RuntimeError)
+      -> { require_relative("#{@dir}/raise_fixture.rb") }.should.raise(RuntimeError)
       $LOADED_FEATURES.should == saved_loaded_features
     end
 
     it "does not load an absolute path that is already stored" do
       $LOADED_FEATURES << @abs_path
-      require_relative(@path).should be_false
+      require_relative(@path).should == false
       ScratchPad.recorded.should == []
     end
 
     it "adds the suffix of the resolved filename" do
-      require_relative("#{@dir}/load_fixture").should be_true
-      $LOADED_FEATURES.should include("#{@abs_dir}/load_fixture.rb")
+      require_relative("#{@dir}/load_fixture").should == true
+      $LOADED_FEATURES.should.include?("#{@abs_dir}/load_fixture.rb")
     end
 
     it "loads a path for a file already loaded with a relative path" do
       $LOAD_PATH << File.expand_path(@dir)
       $LOADED_FEATURES << "load_fixture.rb" << "load_fixture"
-      require_relative(@path).should be_true
-      $LOADED_FEATURES.should include(@abs_path)
+      require_relative(@path).should == true
+      $LOADED_FEATURES.should.include?(@abs_path)
       ScratchPad.recorded.should == [:loaded]
     end
   end
@@ -288,22 +288,22 @@
   end
 
   it "loads a path relative to the current file" do
-    require_relative(@path).should be_true
+    require_relative(@path).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
   it "loads a file defining many methods" do
-    require_relative("#{@dir}/methods_fixture.rb").should be_true
+    require_relative("#{@dir}/methods_fixture.rb").should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
   it "raises a LoadError if the file does not exist" do
-    -> { require_relative("#{@dir}/nonexistent.rb") }.should raise_error(LoadError)
+    -> { require_relative("#{@dir}/nonexistent.rb") }.should.raise(LoadError)
     ScratchPad.recorded.should == []
   end
 
   it "raises a LoadError if basepath does not exist" do
-    -> { eval("require_relative('#{@dir}/nonexistent.rb')") }.should raise_error(LoadError)
+    -> { eval("require_relative('#{@dir}/nonexistent.rb')") }.should.raise(LoadError)
   end
 
   it "stores the missing path in a LoadError object" do
@@ -319,34 +319,34 @@
   it "calls #to_str on non-String objects" do
     name = mock("load_fixture.rb mock")
     name.should_receive(:to_str).and_return(@path)
-    require_relative(name).should be_true
+    require_relative(name).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
   it "raises a TypeError if argument does not respond to #to_str" do
-    -> { require_relative(nil) }.should raise_error(TypeError)
-    -> { require_relative(42) }.should raise_error(TypeError)
+    -> { require_relative(nil) }.should.raise(TypeError)
+    -> { require_relative(42) }.should.raise(TypeError)
     -> {
       require_relative([@path,@path])
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an object that has #to_s but not #to_str" do
     name = mock("load_fixture.rb mock")
     name.stub!(:to_s).and_return(@path)
-    -> { require_relative(name) }.should raise_error(TypeError)
+    -> { require_relative(name) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_str does not return a String" do
     name = mock("#to_str returns nil")
     name.should_receive(:to_str).at_least(1).times.and_return(nil)
-    -> { require_relative(name) }.should raise_error(TypeError)
+    -> { require_relative(name) }.should.raise(TypeError)
   end
 
   it "calls #to_path on non-String objects" do
     name = mock("load_fixture.rb mock")
     name.should_receive(:to_path).and_return(@path)
-    require_relative(name).should be_true
+    require_relative(name).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
@@ -355,13 +355,13 @@
     to_path = mock("load_fixture_rb #to_path mock")
     name.should_receive(:to_path).and_return(to_path)
     to_path.should_receive(:to_str).and_return(@path)
-    require_relative(name).should be_true
+    require_relative(name).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
   describe "(file extensions)" do
     it "loads a .rb extensioned file when passed a non-extensioned path" do
-      require_relative("#{@dir}/load_fixture").should be_true
+      require_relative("#{@dir}/load_fixture").should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -370,20 +370,20 @@
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.dylib"
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.so"
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.dll"
-      require_relative(@path).should be_true
+      require_relative(@path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "does not load a C-extension file if a .rb extensioned file is already loaded" do
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.rb"
-      require_relative("#{@dir}/load_fixture").should be_false
+      require_relative("#{@dir}/load_fixture").should == false
       ScratchPad.recorded.should == []
     end
 
     it "loads a .rb extensioned file when passed a non-.rb extensioned path" do
-      require_relative("#{@dir}/load_fixture.ext").should be_true
+      require_relative("#{@dir}/load_fixture.ext").should == true
       ScratchPad.recorded.should == [:loaded]
-      $LOADED_FEATURES.should include "#{@abs_dir}/load_fixture.ext.rb"
+      $LOADED_FEATURES.should.include? "#{@abs_dir}/load_fixture.ext.rb"
     end
 
     it "loads a .rb extensioned file when a complex-extensioned C-extension file of the same name is loaded" do
@@ -391,46 +391,46 @@
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.ext.dylib"
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.ext.so"
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.ext.dll"
-      require_relative("#{@dir}/load_fixture.ext").should be_true
+      require_relative("#{@dir}/load_fixture.ext").should == true
       ScratchPad.recorded.should == [:loaded]
-      $LOADED_FEATURES.should include "#{@abs_dir}/load_fixture.ext.rb"
+      $LOADED_FEATURES.should.include? "#{@abs_dir}/load_fixture.ext.rb"
     end
 
     it "does not load a C-extension file if a complex-extensioned .rb file is already loaded" do
       $LOADED_FEATURES << "#{@abs_dir}/load_fixture.ext.rb"
-      require_relative("#{@dir}/load_fixture.ext").should be_false
+      require_relative("#{@dir}/load_fixture.ext").should == false
       ScratchPad.recorded.should == []
     end
   end
 
   describe "($LOAD_FEATURES)" do
     it "stores an absolute path" do
-      require_relative(@path).should be_true
-      $LOADED_FEATURES.should include(@abs_path)
+      require_relative(@path).should == true
+      $LOADED_FEATURES.should.include?(@abs_path)
     end
 
     it "does not store the path if the load fails" do
       saved_loaded_features = $LOADED_FEATURES.dup
-      -> { require_relative("#{@dir}/raise_fixture.rb") }.should raise_error(RuntimeError)
+      -> { require_relative("#{@dir}/raise_fixture.rb") }.should.raise(RuntimeError)
       $LOADED_FEATURES.should == saved_loaded_features
     end
 
     it "does not load an absolute path that is already stored" do
       $LOADED_FEATURES << @abs_path
-      require_relative(@path).should be_false
+      require_relative(@path).should == false
       ScratchPad.recorded.should == []
     end
 
     it "adds the suffix of the resolved filename" do
-      require_relative("#{@dir}/load_fixture").should be_true
-      $LOADED_FEATURES.should include("#{@abs_dir}/load_fixture.rb")
+      require_relative("#{@dir}/load_fixture").should == true
+      $LOADED_FEATURES.should.include?("#{@abs_dir}/load_fixture.rb")
     end
 
     it "loads a path for a file already loaded with a relative path" do
       $LOAD_PATH << File.expand_path(@dir)
       $LOADED_FEATURES << "load_fixture.rb" << "load_fixture"
-      require_relative(@path).should be_true
-      $LOADED_FEATURES.should include(@abs_path)
+      require_relative(@path).should == true
+      $LOADED_FEATURES.should.include?(@abs_path)
       ScratchPad.recorded.should == [:loaded]
     end
   end
diff --git a/spec/ruby/core/kernel/require_spec.rb b/spec/ruby/core/kernel/require_spec.rb
index 60d17242fe1..19c19e55948 100644
--- a/spec/ruby/core/kernel/require_spec.rb
+++ b/spec/ruby/core/kernel/require_spec.rb
@@ -13,28 +13,41 @@
 
   # if this fails, update your rubygems
   it "is a private method" do
-    Kernel.should have_private_instance_method(:require)
+    Kernel.private_instance_methods(false).should.include?(:require)
   end
 
-  provided = %w[complex enumerator fiber rational thread ruby2_keywords]
-  ruby_version_is "4.0" do
-    provided << "set"
-    provided << "pathname"
-  end
+  it "provided features are already required" do
+    provided = %w[complex enumerator fiber rational thread ruby2_keywords]
+    ruby_version_is "4.0" do
+      provided += %w[set pathname]
+    end
+    ruby_version_is "4.1" do
+      provided += %w[monitor]
+    end
 
-  it "#{provided.join(', ')} are already required" do
     out = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems --disable-did-you-mean')
     features = out.lines.map { |line| File.basename(line.chomp, '.*') }
 
-    # Ignore CRuby internals
-    features -= %w[encdb transdb windows_1252 windows_31j]
+    # Ignore engine-specific internals
+    case RUBY_ENGINE
+    when "jruby"
+      features -= %w[java util]
+    else
+      features -= %w[encdb transdb windows_1252 windows_31]
+    end
     features.reject! { |feature| feature.end_with?('-fake') }
 
     features.sort.should == provided.sort
 
     requires = provided
     ruby_version_is "4.0" do
-      requires = requires.map { |f| f == "pathname" ? "pathname.so" : f }
+      if RUBY_ENGINE != "jruby"
+        requires = requires.map { |f| f == "pathname" ? "pathname.so" : f }
+      end
+    end
+
+    ruby_version_is "4.1" do
+      requires = requires.map { |f| f == "monitor" ? "monitor.so" : f }
     end
 
     code = requires.map { |f| "puts require #{f.inspect}\n" }.join
diff --git a/spec/ruby/core/kernel/respond_to_missing_spec.rb b/spec/ruby/core/kernel/respond_to_missing_spec.rb
index cc82031e26b..08c9184fb49 100644
--- a/spec/ruby/core/kernel/respond_to_missing_spec.rb
+++ b/spec/ruby/core/kernel/respond_to_missing_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:respond_to_missing?, false)
+    Kernel.private_instance_methods(false).should.include?(:respond_to_missing?)
   end
 
   it "is only an instance method" do
@@ -18,7 +18,7 @@
     obj = mock('object')
     obj.stub!(:glark)
     obj.should_not_receive(:respond_to_missing?)
-    obj.respond_to?(:glark).should be_true
+    obj.respond_to?(:glark).should == true
   end
 
   it "is called with a 2nd argument of false when #respond_to? is" do
@@ -48,39 +48,39 @@
   it "causes #respond_to? to return true if called and not returning false" do
     obj = mock('object')
     obj.should_receive(:respond_to_missing?).with(:undefined_method, false).and_return(:glark)
-    obj.respond_to?(:undefined_method).should be_true
+    obj.respond_to?(:undefined_method).should == true
   end
 
   it "causes #respond_to? to return false if called and returning false" do
     obj = mock('object')
     obj.should_receive(:respond_to_missing?).with(:undefined_method, false).and_return(false)
-    obj.respond_to?(:undefined_method).should be_false
+    obj.respond_to?(:undefined_method).should == false
   end
 
   it "causes #respond_to? to return false if called and returning nil" do
     obj = mock('object')
     obj.should_receive(:respond_to_missing?).with(:undefined_method, false).and_return(nil)
-    obj.respond_to?(:undefined_method).should be_false
+    obj.respond_to?(:undefined_method).should == false
   end
 
   it "isn't called when obj responds to the given public method" do
     @a.should_not_receive(:respond_to_missing?)
-    @a.respond_to?(:pub_method).should be_true
+    @a.respond_to?(:pub_method).should == true
   end
 
   it "isn't called when obj responds to the given public method, include_private = true" do
     @a.should_not_receive(:respond_to_missing?)
-    @a.respond_to?(:pub_method, true).should be_true
+    @a.respond_to?(:pub_method, true).should == true
   end
 
   it "is called when obj responds to the given protected method, include_private = false" do
     @a.should_receive(:respond_to_missing?)
-    @a.respond_to?(:protected_method, false).should be_false
+    @a.respond_to?(:protected_method, false).should == false
   end
 
   it "isn't called when obj responds to the given protected method, include_private = true" do
     @a.should_not_receive(:respond_to_missing?)
-    @a.respond_to?(:protected_method, true).should be_true
+    @a.respond_to?(:protected_method, true).should == true
   end
 
   it "is called when obj responds to the given private method, include_private = false" do
@@ -90,7 +90,7 @@
 
   it "isn't called when obj responds to the given private method, include_private = true" do
     @a.should_not_receive(:respond_to_missing?)
-    @a.respond_to?(:private_method, true).should be_true
+    @a.respond_to?(:private_method, true).should == true
   end
 
   it "is called for missing class methods" do
diff --git a/spec/ruby/core/kernel/respond_to_spec.rb b/spec/ruby/core/kernel/respond_to_spec.rb
index 5b3ea3f6517..72ab4eebe14 100644
--- a/spec/ruby/core/kernel/respond_to_spec.rb
+++ b/spec/ruby/core/kernel/respond_to_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "is a public method" do
-    Kernel.should have_public_instance_method(:respond_to?, false)
+    Kernel.public_instance_methods(false).should.include?(:respond_to?)
   end
 
   it "is only an instance method" do
@@ -25,7 +25,7 @@
   end
 
   it "throws a type error if argument can't be coerced into a Symbol" do
-    -> { @a.respond_to?(Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
+    -> { @a.respond_to?(Object.new) }.should.raise(TypeError, /is not a symbol nor a string/)
   end
 
   it "returns false if obj responds to the given protected method" do
@@ -61,7 +61,7 @@
   it "does not change method visibility when finding private method" do
     KernelSpecs::VisibilityChange.respond_to?(:new, false).should == false
     KernelSpecs::VisibilityChange.respond_to?(:new, true).should == true
-    -> { KernelSpecs::VisibilityChange.new }.should raise_error(NoMethodError)
+    -> { KernelSpecs::VisibilityChange.new }.should.raise(NoMethodError)
   end
 
   it "indicates if an object responds to a particular message" do
@@ -69,4 +69,31 @@ class KernelSpecs::Foo; def bar; 'done'; end; end
     KernelSpecs::Foo.new.respond_to?(:bar).should == true
     KernelSpecs::Foo.new.respond_to?(:invalid_and_silly_method_name).should == false
   end
+
+  context "if object does not have #respond_to_missing?" do
+    it "returns true if object responds to the given public method" do
+      KernelSpecs::BasicA.new.respond_to?(:pub_method).should == true
+      KernelSpecs::MissingA.new.respond_to?(:pub_method).should == true
+    end
+
+    it "returns false if object responds to the given protected method" do
+      KernelSpecs::BasicA.new.respond_to?(:protected_method).should == false
+      KernelSpecs::MissingA.new.respond_to?(:protected_method).should == false
+    end
+
+    it "returns false if object responds to the given private method" do
+      KernelSpecs::BasicA.new.respond_to?(:private_method).should == false
+      KernelSpecs::MissingA.new.respond_to?(:private_method).should == false
+    end
+
+    it "returns false if the given method was undefined" do
+      KernelSpecs::BasicA.new.respond_to?(:undefed_method).should == false
+      KernelSpecs::MissingA.new.respond_to?(:undefed_method).should == false
+    end
+
+    it "returns false if the given method never existed" do
+      KernelSpecs::BasicA.new.respond_to?(:invalid_and_silly_method_name).should == false
+      KernelSpecs::MissingA.new.respond_to?(:invalid_and_silly_method_name).should == false
+    end
+  end
 end
diff --git a/spec/ruby/core/kernel/select_spec.rb b/spec/ruby/core/kernel/select_spec.rb
index df23414b284..58c963c1a4a 100644
--- a/spec/ruby/core/kernel/select_spec.rb
+++ b/spec/ruby/core/kernel/select_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#select" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:select)
+    Kernel.private_instance_methods(false).should.include?(:select)
   end
 end
 
diff --git a/spec/ruby/core/kernel/set_trace_func_spec.rb b/spec/ruby/core/kernel/set_trace_func_spec.rb
index 1f43e7a0098..5201812f2f5 100644
--- a/spec/ruby/core/kernel/set_trace_func_spec.rb
+++ b/spec/ruby/core/kernel/set_trace_func_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#set_trace_func" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:set_trace_func)
+    Kernel.private_instance_methods(false).should.include?(:set_trace_func)
   end
 end
 
diff --git a/spec/ruby/core/kernel/shared/dup_clone.rb b/spec/ruby/core/kernel/shared/dup_clone.rb
index 4fac6006e10..3fbf918283d 100644
--- a/spec/ruby/core/kernel/shared/dup_clone.rb
+++ b/spec/ruby/core/kernel/shared/dup_clone.rb
@@ -40,7 +40,7 @@ def initialize_copy(original)
     o.obj = array
 
     o2 = o.send(@method)
-    o2.obj.should equal(o.obj)
+    o2.obj.should.equal?(o.obj)
   end
 
   it "calls #initialize_copy on the NEW object if available, passing in original object" do
@@ -49,7 +49,7 @@ def initialize_copy(original)
 
     o.obj.should == :original
     o2.obj.should == :init_copy
-    o2.original.should equal(o)
+    o2.original.should.equal?(o)
   end
 
   it "does not preserve the object_id" do
@@ -81,11 +81,11 @@ def initialize_copy(original)
 
   it "returns self for Complex" do
     c = Complex(1.3, 3.1)
-    c.send(@method).should equal c
+    c.send(@method).should.equal? c
   end
 
   it "returns self for Rational" do
     r = Rational(1, 3)
-    r.send(@method).should equal r
+    r.send(@method).should.equal? r
   end
 end
diff --git a/spec/ruby/core/kernel/shared/kind_of.rb b/spec/ruby/core/kernel/shared/kind_of.rb
index aef6f1c1d86..a5e0eab08f8 100644
--- a/spec/ruby/core/kernel/shared/kind_of.rb
+++ b/spec/ruby/core/kernel/shared/kind_of.rb
@@ -40,10 +40,10 @@
   end
 
   it "raises a TypeError if given an object that is not a Class nor a Module" do
-    -> { @o.send(@method, 1) }.should raise_error(TypeError)
-    -> { @o.send(@method, 'KindaClass') }.should raise_error(TypeError)
-    -> { @o.send(@method, :KindaClass) }.should raise_error(TypeError)
-    -> { @o.send(@method, Object.new) }.should raise_error(TypeError)
+    -> { @o.send(@method, 1) }.should.raise(TypeError)
+    -> { @o.send(@method, 'KindaClass') }.should.raise(TypeError)
+    -> { @o.send(@method, :KindaClass) }.should.raise(TypeError)
+    -> { @o.send(@method, Object.new) }.should.raise(TypeError)
   end
 
   it "does not take into account `class` method overriding" do
diff --git a/spec/ruby/core/kernel/shared/lambda.rb b/spec/ruby/core/kernel/shared/lambda.rb
index c70640082a1..83de06bb417 100644
--- a/spec/ruby/core/kernel/shared/lambda.rb
+++ b/spec/ruby/core/kernel/shared/lambda.rb
@@ -5,7 +5,7 @@
 
   it "raises an ArgumentError when no block is given" do
     suppress_warning do
-      -> { send(@method) }.should raise_error(ArgumentError)
+      -> { send(@method) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/kernel/shared/load.rb b/spec/ruby/core/kernel/shared/load.rb
index 62c5c7be9bf..20d23a623e6 100644
--- a/spec/ruby/core/kernel/shared/load.rb
+++ b/spec/ruby/core/kernel/shared/load.rb
@@ -15,19 +15,19 @@
     # This behavior is specific to Kernel#load, it differs for Kernel#require
     it "loads a non-extensioned file as a Ruby source file" do
       path = File.expand_path "load_fixture", CODE_LOADING_DIR
-      @object.load(path).should be_true
+      @object.load(path).should == true
       ScratchPad.recorded.should == [:no_ext]
     end
 
     it "loads a non .rb extensioned file as a Ruby source file" do
       path = File.expand_path "load_fixture.ext", CODE_LOADING_DIR
-      @object.load(path).should be_true
+      @object.load(path).should == true
       ScratchPad.recorded.should == [:no_rb_ext]
     end
 
     it "loads from the current working directory" do
       Dir.chdir CODE_LOADING_DIR do
-        @object.load("load_fixture.rb").should be_true
+        @object.load("load_fixture.rb").should == true
         ScratchPad.recorded.should == [:loaded]
       end
     end
@@ -35,88 +35,88 @@
     # This behavior is specific to Kernel#load, it differs for Kernel#require
     it "does not look for a c-extension file when passed a path without extension (when no .rb is present)" do
       path = File.join CODE_LOADING_DIR, "a", "load_fixture"
-      -> { @object.send(@method, path) }.should raise_error(LoadError)
+      -> { @object.send(@method, path) }.should.raise(LoadError)
     end
   end
 
   it "loads a file that recursively requires itself" do
     path = File.expand_path "recursive_require_fixture.rb", CODE_LOADING_DIR
     -> {
-      @object.load(path).should be_true
+      @object.load(path).should == true
     }.should complain(/circular require considered harmful/, verbose: true)
     ScratchPad.recorded.should == [:loaded, :loaded]
   end
 
   it "loads a file that recursively loads itself" do
     path = File.expand_path "recursive_load_fixture.rb", CODE_LOADING_DIR
-    @object.load(path).should be_true
+    @object.load(path).should == true
     ScratchPad.recorded.should == [:loaded, :loaded]
   end
 
   it "loads a file each time the method is called" do
-    @object.load(@path).should be_true
-    @object.load(@path).should be_true
+    @object.load(@path).should == true
+    @object.load(@path).should == true
     ScratchPad.recorded.should == [:loaded, :loaded]
   end
 
   it "loads a file even when the name appears in $LOADED_FEATURES" do
     $LOADED_FEATURES << @path
-    @object.load(@path).should be_true
+    @object.load(@path).should == true
     ScratchPad.recorded.should == [:loaded]
   end
 
   it "loads a file that has been loaded by #require" do
-    @object.require(@path).should be_true
-    @object.load(@path).should be_true
+    @object.require(@path).should == true
+    @object.load(@path).should == true
     ScratchPad.recorded.should == [:loaded, :loaded]
   end
 
   it "loads file even after $LOAD_PATH change" do
     $LOAD_PATH << CODE_LOADING_DIR
-    @object.load("load_fixture.rb").should be_true
+    @object.load("load_fixture.rb").should == true
     $LOAD_PATH.unshift CODE_LOADING_DIR + "/gem"
-    @object.load("load_fixture.rb").should be_true
+    @object.load("load_fixture.rb").should == true
     ScratchPad.recorded.should == [:loaded, :loaded_gem]
   end
 
   it "does not cause #require with the same path to fail" do
-    @object.load(@path).should be_true
-    @object.require(@path).should be_true
+    @object.load(@path).should == true
+    @object.require(@path).should == true
     ScratchPad.recorded.should == [:loaded, :loaded]
   end
 
   it "does not add the loaded path to $LOADED_FEATURES" do
     saved_loaded_features = $LOADED_FEATURES.dup
-    @object.load(@path).should be_true
+    @object.load(@path).should == true
     $LOADED_FEATURES.should == saved_loaded_features
   end
 
   it "raises a LoadError if passed a non-extensioned path that does not exist but a .rb extensioned path does exist" do
     path = File.expand_path "load_ext_fixture", CODE_LOADING_DIR
-    -> { @object.load(path) }.should raise_error(LoadError)
+    -> { @object.load(path) }.should.raise(LoadError)
   end
 
   describe "when passed true for 'wrap'" do
     it "loads from an existing path" do
       path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
-      @object.load(path, true).should be_true
+      @object.load(path, true).should == true
     end
 
     it "sets the enclosing scope to an anonymous module" do
       path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
       @object.load(path, true)
 
-      Object.const_defined?(:LoadSpecWrap).should be_false
+      Object.const_defined?(:LoadSpecWrap).should == false
 
       wrap_module = ScratchPad.recorded[1]
-      wrap_module.should be_an_instance_of(Module)
+      wrap_module.should.instance_of?(Module)
     end
 
     it "allows referencing outside namespaces" do
       path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
       @object.load(path, true)
 
-      ScratchPad.recorded[0].should equal(String)
+      ScratchPad.recorded[0].should.equal?(String)
     end
 
     it "sets self as a copy of the top-level main" do
@@ -126,8 +126,8 @@
       top_level = ScratchPad.recorded[2]
       top_level.to_s.should == "main"
       top_level.method(:to_s).owner.should == top_level.singleton_class
-      top_level.should_not equal(main)
-      top_level.should be_an_instance_of(Object)
+      top_level.should_not.equal?(main)
+      top_level.should.instance_of?(Object)
     end
 
     it "includes modules included in main's singleton class in self's class" do
@@ -159,7 +159,7 @@
       end
 
       it "does not pollute the receiver" do
-        -> { @object.send(:top_level_method) }.should raise_error(NameError)
+        -> { @object.send(:top_level_method) }.should.raise(NameError)
       end
     end
   end
@@ -170,8 +170,8 @@
       mod = Module.new
       @object.load(path, mod)
 
-      Object.const_defined?(:LoadSpecWrap).should be_false
-      mod.const_defined?(:LoadSpecWrap).should be_true
+      Object.const_defined?(:LoadSpecWrap).should == false
+      mod.const_defined?(:LoadSpecWrap).should == true
 
       wrap_module = ScratchPad.recorded[1]
       wrap_module.should == mod
@@ -208,7 +208,7 @@
     end
 
     it "expands a tilde to the HOME environment variable as the path to load" do
-      @object.require("~/load_fixture.rb").should be_true
+      @object.require("~/load_fixture.rb").should == true
       ScratchPad.recorded.should == [:loaded]
     end
   end
diff --git a/spec/ruby/core/kernel/shared/method.rb b/spec/ruby/core/kernel/shared/method.rb
index 8b6ab23fd39..82abc287d10 100644
--- a/spec/ruby/core/kernel/shared/method.rb
+++ b/spec/ruby/core/kernel/shared/method.rb
@@ -4,26 +4,26 @@
   it "returns a method object for a valid method" do
     class KernelSpecs::Foo; def bar; 'done'; end; end
     m = KernelSpecs::Foo.new.send(@method, :bar)
-    m.should be_an_instance_of Method
+    m.should.instance_of? Method
     m.call.should == 'done'
   end
 
   it "returns a method object for a valid singleton method" do
     class KernelSpecs::Foo; def self.bar; 'class done'; end; end
     m = KernelSpecs::Foo.send(@method, :bar)
-    m.should be_an_instance_of Method
+    m.should.instance_of? Method
     m.call.should == 'class done'
   end
 
   it "returns a method object if respond_to_missing?(method) is true" do
     m = KernelSpecs::RespondViaMissing.new.send(@method, :handled_publicly)
-    m.should be_an_instance_of Method
+    m.should.instance_of? Method
     m.call(42).should == "Done handled_publicly([42])"
   end
 
   it "the returned method object if respond_to_missing?(method) calls #method_missing with a Symbol name" do
     m = KernelSpecs::RespondViaMissing.new.send(@method, "handled_publicly")
-    m.should be_an_instance_of Method
+    m.should.instance_of? Method
     m.call(42).should == "Done handled_publicly([42])"
   end
 
@@ -31,12 +31,12 @@ class KernelSpecs::Foo; def self.bar; 'class done'; end; end
     class KernelSpecs::Foo; def bar; 'done'; end; end
     -> {
       KernelSpecs::Foo.new.send(@method, :invalid_and_silly_method_name)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "raises a NameError for an invalid singleton method name" do
     class KernelSpecs::Foo; def self.bar; 'done'; end; end
-    -> { KernelSpecs::Foo.send(@method, :baz) }.should raise_error(NameError)
+    -> { KernelSpecs::Foo.send(@method, :baz) }.should.raise(NameError)
   end
 
   it "changes the method called for super on a target aliased method" do
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index ef5b9486c61..6272b00665d 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -2,26 +2,26 @@
   describe "(path resolution)" do
     it "loads an absolute path" do
       path = File.expand_path "load_fixture.rb", CODE_LOADING_DIR
-      @object.send(@method, path).should be_true
+      @object.send(@method, path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "loads a non-canonical absolute path" do
       path = File.join CODE_LOADING_DIR, "..", "code", "load_fixture.rb"
-      @object.send(@method, path).should be_true
+      @object.send(@method, path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "loads a file defining many methods" do
       path = File.expand_path "methods_fixture.rb", CODE_LOADING_DIR
-      @object.send(@method, path).should be_true
+      @object.send(@method, path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "raises a LoadError if the file does not exist" do
       path = File.expand_path "nonexistent.rb", CODE_LOADING_DIR
       File.should_not.exist?(path)
-      -> { @object.send(@method, path) }.should raise_error(LoadError)
+      -> { @object.send(@method, path) }.should.raise(LoadError)
       ScratchPad.recorded.should == []
     end
 
@@ -42,7 +42,7 @@
 
           it "raises a LoadError" do
             File.should.exist?(@path)
-            -> { @object.send(@method, @path) }.should raise_error(LoadError)
+            -> { @object.send(@method, @path) }.should.raise(LoadError)
           end
         end
       end
@@ -52,24 +52,24 @@
       path = File.expand_path "load_fixture.rb", CODE_LOADING_DIR
       name = mock("load_fixture.rb mock")
       name.should_receive(:to_str).and_return(path)
-      @object.send(@method, name).should be_true
+      @object.send(@method, name).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "raises a TypeError if passed nil" do
-      -> { @object.send(@method, nil) }.should raise_error(TypeError)
+      -> { @object.send(@method, nil) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if passed an Integer" do
-      -> { @object.send(@method, 42) }.should raise_error(TypeError)
+      -> { @object.send(@method, 42) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if passed an Array" do
-      -> { @object.send(@method, []) }.should raise_error(TypeError)
+      -> { @object.send(@method, []) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if passed an object that does not provide #to_str" do
-      -> { @object.send(@method, mock("not a filename")) }.should raise_error(TypeError)
+      -> { @object.send(@method, mock("not a filename")) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if passed an object that has #to_s but not #to_str" do
@@ -77,14 +77,14 @@
       name.stub!(:to_s).and_return("load_fixture.rb")
       $LOAD_PATH << "."
       Dir.chdir CODE_LOADING_DIR do
-        -> { @object.send(@method, name) }.should raise_error(TypeError)
+        -> { @object.send(@method, name) }.should.raise(TypeError)
       end
     end
 
     it "raises a TypeError if #to_str does not return a String" do
       name = mock("#to_str returns nil")
       name.should_receive(:to_str).at_least(1).times.and_return(nil)
-      -> { @object.send(@method, name) }.should raise_error(TypeError)
+      -> { @object.send(@method, name) }.should.raise(TypeError)
     end
 
     it "calls #to_path on non-String objects" do
@@ -92,7 +92,7 @@
       name.stub!(:to_path).and_return("load_fixture.rb")
       $LOAD_PATH << "."
       Dir.chdir CODE_LOADING_DIR do
-        @object.send(@method, name).should be_true
+        @object.send(@method, name).should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
@@ -101,7 +101,7 @@
       path = File.expand_path "load_fixture.rb", CODE_LOADING_DIR
       str = mock("load_fixture.rb mock")
       str.should_receive(:to_path).and_return(path)
-      @object.send(@method, str).should be_true
+      @object.send(@method, str).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -111,21 +111,21 @@
       to_path = mock("load_fixture_rb #to_path mock")
       name.should_receive(:to_path).and_return(to_path)
       to_path.should_receive(:to_str).and_return(path)
-      @object.send(@method, name).should be_true
+      @object.send(@method, name).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     # "http://redmine.ruby-lang.org/issues/show/2578"
     it "loads a ./ relative path from the current working directory with empty $LOAD_PATH" do
       Dir.chdir CODE_LOADING_DIR do
-        @object.send(@method, "./load_fixture.rb").should be_true
+        @object.send(@method, "./load_fixture.rb").should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "loads a ../ relative path from the current working directory with empty $LOAD_PATH" do
       Dir.chdir CODE_LOADING_DIR do
-        @object.send(@method, "../code/load_fixture.rb").should be_true
+        @object.send(@method, "../code/load_fixture.rb").should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
@@ -133,7 +133,7 @@
     it "loads a ./ relative path from the current working directory with non-empty $LOAD_PATH" do
       $LOAD_PATH << "an_irrelevant_dir"
       Dir.chdir CODE_LOADING_DIR do
-        @object.send(@method, "./load_fixture.rb").should be_true
+        @object.send(@method, "./load_fixture.rb").should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
@@ -141,7 +141,7 @@
     it "loads a ../ relative path from the current working directory with non-empty $LOAD_PATH" do
       $LOAD_PATH << "an_irrelevant_dir"
       Dir.chdir CODE_LOADING_DIR do
-        @object.send(@method, "../code/load_fixture.rb").should be_true
+        @object.send(@method, "../code/load_fixture.rb").should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
@@ -149,14 +149,14 @@
     it "loads a non-canonical path from the current working directory with non-empty $LOAD_PATH" do
       $LOAD_PATH << "an_irrelevant_dir"
       Dir.chdir CODE_LOADING_DIR do
-        @object.send(@method, "../code/../code/load_fixture.rb").should be_true
+        @object.send(@method, "../code/../code/load_fixture.rb").should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "resolves a filename against $LOAD_PATH entries" do
       $LOAD_PATH << CODE_LOADING_DIR
-      @object.send(@method, "load_fixture.rb").should be_true
+      @object.send(@method, "load_fixture.rb").should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -164,15 +164,15 @@
       obj = mock("to_path")
       obj.should_receive(:to_path).at_least(:once).and_return(CODE_LOADING_DIR)
       $LOAD_PATH << obj
-      @object.send(@method, "load_fixture.rb").should be_true
+      @object.send(@method, "load_fixture.rb").should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "does not require file twice after $LOAD_PATH change" do
       $LOAD_PATH << CODE_LOADING_DIR
-      @object.require("load_fixture.rb").should be_true
+      @object.require("load_fixture.rb").should == true
       $LOAD_PATH.push CODE_LOADING_DIR + "/gem"
-      @object.require("load_fixture.rb").should be_false
+      @object.require("load_fixture.rb").should == false
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -180,7 +180,7 @@
       $LOAD_PATH << CODE_LOADING_DIR
       -> do
         @object.send(@method, "./load_fixture.rb")
-      end.should raise_error(LoadError)
+      end.should.raise(LoadError)
       ScratchPad.recorded.should == []
     end
 
@@ -188,13 +188,13 @@
       $LOAD_PATH << CODE_LOADING_DIR
       -> do
         @object.send(@method, "../code/load_fixture.rb")
-      end.should raise_error(LoadError)
+      end.should.raise(LoadError)
       ScratchPad.recorded.should == []
     end
 
     it "resolves a non-canonical path against $LOAD_PATH entries" do
       $LOAD_PATH << File.dirname(CODE_LOADING_DIR)
-      @object.send(@method, "code/../code/load_fixture.rb").should be_true
+      @object.send(@method, "code/../code/load_fixture.rb").should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -203,7 +203,7 @@
       sep = File::Separator + File::Separator
       path = ["..", "code", "load_fixture.rb"].join(sep)
       Dir.chdir CODE_LOADING_DIR do
-        @object.send(@method, path).should be_true
+        @object.send(@method, path).should == true
       end
       ScratchPad.recorded.should == [:loaded]
     end
@@ -214,7 +214,7 @@
   describe "(path resolution)" do
     it "loads .rb file when passed absolute path without extension" do
       path = File.expand_path "load_fixture", CODE_LOADING_DIR
-      @object.send(@method, path).should be_true
+      @object.send(@method, path).should == true
       # This should _not_ be [:no_ext]
       ScratchPad.recorded.should == [:loaded]
     end
@@ -223,7 +223,7 @@
       it "loads c-extension file when passed absolute path without extension when no .rb is present" do
         # the error message is specific to what dlerror() returns
         path = File.join CODE_LOADING_DIR, "a", "load_fixture"
-        -> { @object.send(@method, path) }.should raise_error(LoadError)
+        -> { @object.send(@method, path) }.should.raise(LoadError)
       end
     end
 
@@ -231,20 +231,20 @@
       it "loads .bundle file when passed absolute path with .so" do
         # the error message is specific to what dlerror() returns
         path = File.join CODE_LOADING_DIR, "a", "load_fixture.so"
-        -> { @object.send(@method, path) }.should raise_error(LoadError)
+        -> { @object.send(@method, path) }.should.raise(LoadError)
       end
     end
 
     it "does not try an extra .rb if the path already ends in .rb" do
       path = File.join CODE_LOADING_DIR, "d", "load_fixture.rb"
-      -> { @object.send(@method, path) }.should raise_error(LoadError)
+      -> { @object.send(@method, path) }.should.raise(LoadError)
     end
 
     # For reference see [ruby-core:24155] in which matz confirms this feature is
     # intentional for security reasons.
     it "does not load a bare filename unless the current working directory is in $LOAD_PATH" do
       Dir.chdir CODE_LOADING_DIR do
-        -> { @object.require("load_fixture.rb") }.should raise_error(LoadError)
+        -> { @object.require("load_fixture.rb") }.should.raise(LoadError)
         ScratchPad.recorded.should == []
       end
     end
@@ -253,7 +253,7 @@
       Dir.chdir File.dirname(CODE_LOADING_DIR) do
         -> do
           @object.require("code/load_fixture.rb")
-        end.should raise_error(LoadError)
+        end.should.raise(LoadError)
         ScratchPad.recorded.should == []
       end
     end
@@ -261,7 +261,7 @@
     it "loads a file that recursively requires itself" do
       path = File.expand_path "recursive_require_fixture.rb", CODE_LOADING_DIR
       -> {
-        @object.require(path).should be_true
+        @object.require(path).should == true
       }.should complain(/circular require considered harmful/, verbose: true)
       ScratchPad.recorded.should == [:loaded]
     end
@@ -284,15 +284,15 @@
     end
 
     it "loads a .rb extensioned file when a C-extension file exists on an earlier load path" do
-      @object.require("load_fixture").should be_true
+      @object.require("load_fixture").should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "does not load a feature twice when $LOAD_PATH has been modified" do
       $LOAD_PATH.replace [CODE_LOADING_DIR]
-      @object.require("load_fixture").should be_true
+      @object.require("load_fixture").should == true
       $LOAD_PATH.replace [File.expand_path("b", CODE_LOADING_DIR), CODE_LOADING_DIR]
-      @object.require("load_fixture").should be_false
+      @object.require("load_fixture").should == false
     end
 
     it "stores the missing path in a LoadError object" do
@@ -300,7 +300,7 @@
 
       -> {
         @object.send(@method, path)
-      }.should raise_error(LoadError) { |e|
+      }.should.raise(LoadError) { |e|
         e.path.should == path
       }
     end
@@ -310,7 +310,7 @@
     it "loads a .rb extensioned file when passed a non-extensioned path" do
       path = File.expand_path "load_fixture", CODE_LOADING_DIR
       File.should.exist?(path)
-      @object.require(path).should be_true
+      @object.require(path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -320,21 +320,21 @@
       $LOADED_FEATURES << File.expand_path("load_fixture.so", CODE_LOADING_DIR)
       $LOADED_FEATURES << File.expand_path("load_fixture.dll", CODE_LOADING_DIR)
       path = File.expand_path "load_fixture", CODE_LOADING_DIR
-      @object.require(path).should be_true
+      @object.require(path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "does not load a C-extension file if a .rb extensioned file is already loaded" do
       $LOADED_FEATURES << File.expand_path("load_fixture.rb", CODE_LOADING_DIR)
       path = File.expand_path "load_fixture", CODE_LOADING_DIR
-      @object.require(path).should be_false
+      @object.require(path).should == false
       ScratchPad.recorded.should == []
     end
 
     it "loads a .rb extensioned file when passed a non-.rb extensioned path" do
       path = File.expand_path "load_fixture.ext", CODE_LOADING_DIR
       File.should.exist?(path)
-      @object.require(path).should be_true
+      @object.require(path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
@@ -344,14 +344,14 @@
       $LOADED_FEATURES << File.expand_path("load_fixture.ext.so", CODE_LOADING_DIR)
       $LOADED_FEATURES << File.expand_path("load_fixture.ext.dll", CODE_LOADING_DIR)
       path = File.expand_path "load_fixture.ext", CODE_LOADING_DIR
-      @object.require(path).should be_true
+      @object.require(path).should == true
       ScratchPad.recorded.should == [:loaded]
     end
 
     it "does not load a C-extension file if a complex-extensioned .rb file is already loaded" do
       $LOADED_FEATURES << File.expand_path("load_fixture.ext.rb", CODE_LOADING_DIR)
       path = File.expand_path "load_fixture.ext", CODE_LOADING_DIR
-      @object.require(path).should be_false
+      @object.require(path).should == false
       ScratchPad.recorded.should == []
     end
   end
@@ -362,8 +362,8 @@
     end
 
     it "stores an absolute path" do
-      @object.require(@path).should be_true
-      $LOADED_FEATURES.should include(@path)
+      @object.require(@path).should == true
+      $LOADED_FEATURES.should.include?(@path)
     end
 
     platform_is_not :windows do
@@ -383,23 +383,23 @@
         it "does not canonicalize the path and stores a path with symlinks" do
           symlink_path = "#{@symlink_to_code_dir}/load_fixture.rb"
           canonical_path = "#{CODE_LOADING_DIR}/load_fixture.rb"
-          @object.require(symlink_path).should be_true
+          @object.require(symlink_path).should == true
           ScratchPad.recorded.should == [:loaded]
 
           features = $LOADED_FEATURES.select { |path| path.end_with?('load_fixture.rb') }
-          features.should include(symlink_path)
-          features.should_not include(canonical_path)
+          features.should.include?(symlink_path)
+          features.should_not.include?(canonical_path)
         end
 
         it "stores the same path that __FILE__ returns in the required file" do
           symlink_path = "#{@symlink_to_code_dir}/load_fixture_and__FILE__.rb"
-          @object.require(symlink_path).should be_true
+          @object.require(symlink_path).should == true
           loaded_feature = $LOADED_FEATURES.last
           ScratchPad.recorded.should == [loaded_feature]
         end
 
         it "requires only once when a new matching file added to path" do
-          @object.require('load_fixture').should be_true
+          @object.require('load_fixture').should == true
           ScratchPad.recorded.should == [:loaded]
 
           symlink_to_code_dir_two = tmp("codesymlinktwo")
@@ -407,7 +407,7 @@
           begin
             $LOAD_PATH.unshift(symlink_to_code_dir_two)
 
-            @object.require('load_fixture').should be_false
+            @object.require('load_fixture').should == false
           ensure
             rm_r symlink_to_code_dir_two
           end
@@ -433,7 +433,7 @@
 
         it "canonicalizes the entry in $LOAD_PATH but not the filename passed to #require" do
           $LOAD_PATH.unshift(@symlink_to_dir)
-          @object.require("symfile").should be_true
+          @object.require("symfile").should == true
           loaded_feature = "#{@dir}/symfile.rb"
           ScratchPad.recorded.should == [loaded_feature]
           $".last.should == loaded_feature
@@ -445,20 +445,20 @@
     it "does not store the path if the load fails" do
       $LOAD_PATH << CODE_LOADING_DIR
       saved_loaded_features = $LOADED_FEATURES.dup
-      -> { @object.require("raise_fixture.rb") }.should raise_error(RuntimeError)
+      -> { @object.require("raise_fixture.rb") }.should.raise(RuntimeError)
       $LOADED_FEATURES.should == saved_loaded_features
     end
 
     it "does not load an absolute path that is already stored" do
       $LOADED_FEATURES << @path
-      @object.require(@path).should be_false
+      @object.require(@path).should == false
       ScratchPad.recorded.should == []
     end
 
     it "does not load a ./ relative path that is already stored" do
       $LOADED_FEATURES << "./load_fixture.rb"
       Dir.chdir CODE_LOADING_DIR do
-        @object.require("./load_fixture.rb").should be_false
+        @object.require("./load_fixture.rb").should == false
       end
       ScratchPad.recorded.should == []
     end
@@ -466,7 +466,7 @@
     it "does not load a ../ relative path that is already stored" do
       $LOADED_FEATURES << "../load_fixture.rb"
       Dir.chdir CODE_LOADING_DIR do
-        @object.require("../load_fixture.rb").should be_false
+        @object.require("../load_fixture.rb").should == false
       end
       ScratchPad.recorded.should == []
     end
@@ -474,27 +474,27 @@
     it "does not load a non-canonical path that is already stored" do
       $LOADED_FEATURES << "code/../code/load_fixture.rb"
       $LOAD_PATH << File.dirname(CODE_LOADING_DIR)
-      @object.require("code/../code/load_fixture.rb").should be_false
+      @object.require("code/../code/load_fixture.rb").should == false
       ScratchPad.recorded.should == []
     end
 
     it "respects being replaced with a new array" do
       prev = $LOADED_FEATURES.dup
 
-      @object.require(@path).should be_true
-      $LOADED_FEATURES.should include(@path)
+      @object.require(@path).should == true
+      $LOADED_FEATURES.should.include?(@path)
 
       $LOADED_FEATURES.replace(prev)
 
-      $LOADED_FEATURES.should_not include(@path)
-      @object.require(@path).should be_true
-      $LOADED_FEATURES.should include(@path)
+      $LOADED_FEATURES.should_not.include?(@path)
+      @object.require(@path).should == true
+      $LOADED_FEATURES.should.include?(@path)
     end
 
     it "does not load twice the same file with and without extension" do
       $LOAD_PATH << CODE_LOADING_DIR
-      @object.require("load_fixture.rb").should be_true
-      @object.require("load_fixture").should be_false
+      @object.require("load_fixture.rb").should == true
+      @object.require("load_fixture").should == false
     end
 
     describe "when a non-extensioned file is in $LOADED_FEATURES" do
@@ -504,19 +504,19 @@
 
       it "loads a .rb extensioned file when a non extensioned file is in $LOADED_FEATURES" do
         $LOAD_PATH << CODE_LOADING_DIR
-        @object.require("load_fixture").should be_true
+        @object.require("load_fixture").should == true
         ScratchPad.recorded.should == [:loaded]
       end
 
       it "loads a .rb extensioned file from a subdirectory" do
         $LOAD_PATH << File.dirname(CODE_LOADING_DIR)
-        @object.require("code/load_fixture").should be_true
+        @object.require("code/load_fixture").should == true
         ScratchPad.recorded.should == [:loaded]
       end
 
       it "returns false if the file is not found" do
         Dir.chdir File.dirname(CODE_LOADING_DIR) do
-          @object.require("load_fixture").should be_false
+          @object.require("load_fixture").should == false
           ScratchPad.recorded.should == []
         end
       end
@@ -524,7 +524,7 @@
       it "returns false when passed a path and the file is not found" do
         $LOADED_FEATURES << "code/load_fixture"
         Dir.chdir CODE_LOADING_DIR do
-          @object.require("code/load_fixture").should be_false
+          @object.require("code/load_fixture").should == false
           ScratchPad.recorded.should == []
         end
       end
@@ -532,16 +532,16 @@
 
     it "stores ../ relative paths as absolute paths" do
       Dir.chdir CODE_LOADING_DIR do
-        @object.require("../code/load_fixture.rb").should be_true
+        @object.require("../code/load_fixture.rb").should == true
       end
-      $LOADED_FEATURES.should include(@path)
+      $LOADED_FEATURES.should.include?(@path)
     end
 
     it "stores ./ relative paths as absolute paths" do
       Dir.chdir CODE_LOADING_DIR do
-        @object.require("./load_fixture.rb").should be_true
+        @object.require("./load_fixture.rb").should == true
       end
-      $LOADED_FEATURES.should include(@path)
+      $LOADED_FEATURES.should.include?(@path)
     end
 
     it "collapses duplicate path separators" do
@@ -549,27 +549,27 @@
       sep = File::Separator + File::Separator
       path = ["..", "code", "load_fixture.rb"].join(sep)
       Dir.chdir CODE_LOADING_DIR do
-        @object.require(path).should be_true
+        @object.require(path).should == true
       end
-      $LOADED_FEATURES.should include(@path)
+      $LOADED_FEATURES.should.include?(@path)
     end
 
     it "expands absolute paths containing .." do
       path = File.join CODE_LOADING_DIR, "..", "code", "load_fixture.rb"
-      @object.require(path).should be_true
-      $LOADED_FEATURES.should include(@path)
+      @object.require(path).should == true
+      $LOADED_FEATURES.should.include?(@path)
     end
 
     it "adds the suffix of the resolved filename" do
       $LOAD_PATH << CODE_LOADING_DIR
-      @object.require("load_fixture").should be_true
-      $LOADED_FEATURES.should include(@path)
+      @object.require("load_fixture").should == true
+      $LOADED_FEATURES.should.include?(@path)
     end
 
     it "does not load a non-canonical path for a file already loaded" do
       $LOADED_FEATURES << @path
       $LOAD_PATH << File.dirname(CODE_LOADING_DIR)
-      @object.require("code/../code/load_fixture.rb").should be_false
+      @object.require("code/../code/load_fixture.rb").should == false
       ScratchPad.recorded.should == []
     end
 
@@ -577,7 +577,7 @@
       $LOADED_FEATURES << @path
       $LOAD_PATH << "an_irrelevant_dir"
       Dir.chdir CODE_LOADING_DIR do
-        @object.require("./load_fixture.rb").should be_false
+        @object.require("./load_fixture.rb").should == false
       end
       ScratchPad.recorded.should == []
     end
@@ -586,7 +586,7 @@
       $LOADED_FEATURES << @path
       $LOAD_PATH << "an_irrelevant_dir"
       Dir.chdir CODE_LOADING_DIR do
-        @object.require("../code/load_fixture.rb").should be_false
+        @object.require("../code/load_fixture.rb").should == false
       end
       ScratchPad.recorded.should == []
     end
@@ -594,26 +594,26 @@
     it "unicode_normalize is part of core and not $LOADED_FEATURES" do
       features = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems')
       features.lines.each { |feature|
-        feature.should_not include("unicode_normalize")
+        feature.should_not.include?("unicode_normalize")
       }
 
-      -> { @object.require("unicode_normalize") }.should raise_error(LoadError)
+      -> { @object.require("unicode_normalize") }.should.raise(LoadError)
     end
 
     it "does not load a file earlier on the $LOAD_PATH when other similar features were already loaded" do
       Dir.chdir CODE_LOADING_DIR do
-        @object.send(@method, "../code/load_fixture").should be_true
+        @object.send(@method, "../code/load_fixture").should == true
       end
       ScratchPad.recorded.should == [:loaded]
 
       $LOAD_PATH.unshift "#{CODE_LOADING_DIR}/b"
       # This loads because the above load was not on the $LOAD_PATH
-      @object.send(@method, "load_fixture").should be_true
+      @object.send(@method, "load_fixture").should == true
       ScratchPad.recorded.should == [:loaded, :loaded]
 
       $LOAD_PATH.unshift "#{CODE_LOADING_DIR}/c"
       # This does not load because the above load was on the $LOAD_PATH
-      @object.send(@method, "load_fixture").should be_false
+      @object.send(@method, "load_fixture").should == false
       ScratchPad.recorded.should == [:loaded, :loaded]
     end
   end
@@ -631,13 +631,13 @@
 
     # "#3171"
     it "performs tilde expansion on a .rb file before storing paths in $LOADED_FEATURES" do
-      @object.require("~/load_fixture.rb").should be_true
-      $LOADED_FEATURES.should include(@path)
+      @object.require("~/load_fixture.rb").should == true
+      $LOADED_FEATURES.should.include?(@path)
     end
 
     it "performs tilde expansion on a non-extensioned file before storing paths in $LOADED_FEATURES" do
-      @object.require("~/load_fixture").should be_true
-      $LOADED_FEATURES.should include(@path)
+      @object.require("~/load_fixture").should == true
+      $LOADED_FEATURES.should.include?(@path)
     end
   end
 
@@ -694,8 +694,8 @@
       t1.join
       t2.join
 
-      t1_res.should be_true
-      t2_res.should be_false
+      t1_res.should == true
+      t2_res.should == false
 
       ScratchPad.recorded.should == [:con_pre, :con_post, :t2_post, :t1_post]
     end
@@ -719,8 +719,8 @@
       t1.join
       t2.join
 
-      t1_res.should be_true
-      t2_res.should be_true
+      t1_res.should == true
+      t2_res.should == true
 
       ScratchPad.recorded.should == [:con2_pre, :con3, :con2_post]
     end
@@ -738,7 +738,7 @@
 
         -> {
           @object.require(@path)
-        }.should raise_error(RuntimeError)
+        }.should.raise(RuntimeError)
 
         Thread.pass until fin
         ScratchPad.recorded << :t1_post
@@ -759,7 +759,7 @@
       t1.join
       t2.join
 
-      t2_res.should be_true
+      t2_res.should == true
 
       ScratchPad.recorded.should == [:con_pre, :con_pre, :con_post, :t2_post, :t1_post]
     end
@@ -779,7 +779,7 @@
 
         -> {
           @object.require(@path)
-        }.should raise_error(RuntimeError)
+        }.should.raise(RuntimeError)
 
         raised = true
 
@@ -807,8 +807,8 @@
       t1.join
       t2.join
 
-      t1_res.should be_false
-      t2_res.should be_true
+      t1_res.should == false
+      t2_res.should == true
 
       ScratchPad.recorded.should == [:con_pre, :con_pre, :con_post, :t2_post, :t1_post]
     end
@@ -819,7 +819,7 @@
 
     -> {
       @object.send(@method, path)
-    }.should raise_error(LoadError) { |e|
+    }.should.raise(LoadError) { |e|
       e.path.should == path
     }
   end
@@ -828,7 +828,7 @@
     it "does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path without extension" do
       # the error message is specific to what dlerror() returns
       path = File.join CODE_LOADING_DIR, "a", "load_fixture"
-      -> { @object.send(@method, path) }.should raise_error(LoadError) { |e|
+      -> { @object.send(@method, path) }.should.raise(LoadError) { |e|
         e.path.should == nil
       }
     end
@@ -838,7 +838,7 @@
     it "does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path with extension" do
       # the error message is specific to what dlerror() returns
       path = File.join CODE_LOADING_DIR, "a", "load_fixture.bundle"
-      -> { @object.send(@method, path) }.should raise_error(LoadError) { |e|
+      -> { @object.send(@method, path) }.should.raise(LoadError) { |e|
         e.path.should == nil
       }
     end
diff --git a/spec/ruby/core/kernel/shared/sprintf.rb b/spec/ruby/core/kernel/shared/sprintf.rb
index 2b2c6c9b63f..fe77b5f45bc 100644
--- a/spec/ruby/core/kernel/shared/sprintf.rb
+++ b/spec/ruby/core/kernel/shared/sprintf.rb
@@ -28,7 +28,7 @@ def obj.to_i; 10; end
     it "raises TypeError exception if cannot convert to Integer" do
       -> {
         @method.call("%b", Object.new)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
     ["b", "B"].each do |f|
@@ -122,7 +122,7 @@ def obj.to_i; 10; end
     it "raises TypeError exception if cannot convert to Float" do
       -> {
         @method.call("%f", Object.new)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
     {"e" => "e", "E" => "E"}.each_pair do |f, exp|
@@ -306,13 +306,13 @@ def obj.to_i; 10; end
       it "raises TypeError if argument is not String or Integer and cannot be converted to them" do
         -> {
           @method.call("%c", [])
-        }.should raise_error(TypeError, /no implicit conversion of Array into Integer/)
+        }.should raise_consistent_error(TypeError, /no implicit conversion of Array into Integer/)
       end
 
       it "raises TypeError if argument is nil" do
         -> {
           @method.call("%c", nil)
-        }.should raise_error(TypeError, /no implicit conversion from nil to integer/)
+        }.should raise_consistent_error(TypeError, /no implicit conversion of nil into Integer/)
       end
 
       it "tries to convert argument to String with to_str" do
@@ -341,7 +341,7 @@ def obj.to_str
 
         -> {
           @method.call("%c", obj)
-        }.should raise_error(TypeError, /can't convert BasicObject to String/)
+        }.should raise_consistent_error(TypeError, /can't convert BasicObject into String/)
       end
 
       it "raises TypeError if converting to Integer with to_int returns non-Integer" do
@@ -352,7 +352,7 @@ def obj.to_int
 
         -> {
           @method.call("%c", obj)
-        }.should raise_error(TypeError, /can't convert BasicObject to Integer/)
+        }.should raise_consistent_error(TypeError, /can't convert BasicObject into Integer/)
       end
     end
 
@@ -391,7 +391,7 @@ def obj.to_str
 
         -> {
           @method.call("%s", obj)
-        }.should raise_error(NoMethodError)
+        }.should.raise(NoMethodError)
       end
 
       it "formats a partial substring without including omitted characters" do
@@ -444,7 +444,7 @@ def obj.to_str
       it "alone raises an ArgumentError" do
         -> {
           @method.call("%")
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
 
       it "is escaped by %" do
@@ -551,7 +551,7 @@ def obj.to_str
       it "raises exception if argument number is bigger than actual arguments list" do
         -> {
           @method.call("%4$d", 1, 2, 3)
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
 
       it "ignores '-' sign" do
@@ -562,7 +562,7 @@ def obj.to_str
       it "raises ArgumentError exception when absolute and relative argument numbers are mixed" do
         -> {
           @method.call("%1$d %d", 1, 2)
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
     end
 
@@ -812,7 +812,7 @@ def obj.to_str
       it "raises ArgumentError when is mixed with width" do
         -> {
           @method.call("%*10d", 10, 112)
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
     end
   end
@@ -911,7 +911,7 @@ def obj.to_str
       it "cannot be mixed with unnamed style" do
         -> {
           @method.call("%d %<foo>d", 1, foo: "123")
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
     end
 
@@ -931,13 +931,30 @@ def obj.to_str
       it "cannot be mixed with unnamed style" do
         -> {
           @method.call("%d %{foo}", 1, foo: "123")
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
 
-      it "raises KeyError when there is no matching key" do
+      it "respects Hash#default when there is no set key" do
+        @method.call("%{foo}", Hash.new(123)).should == "123"
+        @method.call("%{foo}", Hash.new { 123 }).should == "123"
+      end
+
+      it "raises KeyError when Hash#default returns nil" do
         -> {
           @method.call("%{foo}", {})
-        }.should raise_error(KeyError)
+        }.should.raise(KeyError, 'key{foo} not found')
+
+        -> {
+          @method.call("%{foo}", Hash.new(nil))
+        }.should.raise(KeyError, 'key{foo} not found')
+
+        -> {
+          @method.call("%{foo}", Hash.new { nil })
+        }.should.raise(KeyError, 'key{foo} not found')
+      end
+
+      it "accepts a nil value for an existing key" do
+        @method.call("%{foo}", { foo: nil }).should == ""
       end
 
       it "converts value to String with to_s" do
@@ -961,21 +978,21 @@ def obj.to_str; end
     it "raises a KeyError" do
       -> {
         @method.call("%<foo>s", @object)
-      }.should raise_error(KeyError)
+      }.should.raise(KeyError)
     end
 
     it "sets the Hash as the receiver of KeyError" do
       -> {
         @method.call("%<foo>s", @object)
-      }.should raise_error(KeyError) { |err|
-        err.receiver.should equal(@object)
+      }.should.raise(KeyError) { |err|
+        err.receiver.should.equal?(@object)
       }
     end
 
     it "sets the unmatched key as the key of KeyError" do
       -> {
         @method.call("%<foo>s", @object)
-      }.should raise_error(KeyError) { |err|
+      }.should.raise(KeyError) { |err|
         err.key.to_s.should == 'foo'
       }
     end
diff --git a/spec/ruby/core/kernel/shared/sprintf_encoding.rb b/spec/ruby/core/kernel/shared/sprintf_encoding.rb
index 7ec0fe4c48c..849c95cbb76 100644
--- a/spec/ruby/core/kernel/shared/sprintf_encoding.rb
+++ b/spec/ruby/core/kernel/shared/sprintf_encoding.rb
@@ -4,19 +4,19 @@
   it "can produce a string with valid encoding" do
     string = @method.call("good day %{valid}", valid: "e")
     string.encoding.should == Encoding::UTF_8
-    string.valid_encoding?.should be_true
+    string.valid_encoding?.should == true
   end
 
   it "can produce a string with invalid encoding" do
     string = @method.call("good day %{invalid}", invalid: "\x80")
     string.encoding.should == Encoding::UTF_8
-    string.valid_encoding?.should be_false
+    string.valid_encoding?.should == false
   end
 
   it "returns a String in the same encoding as the format String if compatible" do
     string = "%s".dup.force_encoding(Encoding::KOI8_U)
     result = @method.call(string, "dogs")
-    result.encoding.should equal(Encoding::KOI8_U)
+    result.encoding.should.equal?(Encoding::KOI8_U)
   end
 
   it "returns a String in the argument's encoding if format encoding is more restrictive" do
@@ -24,7 +24,7 @@
     argument = "b\303\274r".dup.force_encoding(Encoding::UTF_8)
 
     result = @method.call(string, argument)
-    result.encoding.should equal(Encoding::UTF_8)
+    result.encoding.should.equal?(Encoding::UTF_8)
   end
 
   it "raises Encoding::CompatibilityError if both encodings are ASCII compatible and there are not ASCII characters" do
@@ -33,7 +33,7 @@
 
     -> {
       @method.call(string, argument)
-    }.should raise_error(Encoding::CompatibilityError)
+    }.should.raise(Encoding::CompatibilityError)
   end
 
   describe "%c" do
@@ -52,7 +52,7 @@
 
       -> {
         @method.call(format, 1286)
-      }.should raise_error(RangeError, /out of char range/)
+      }.should.raise(RangeError, /out of char range/)
     end
 
     it "uses the encoding of the format string to interpret codepoints" do
diff --git a/spec/ruby/core/kernel/shared/then.rb b/spec/ruby/core/kernel/shared/then.rb
index b52075371fc..c71393bf507 100644
--- a/spec/ruby/core/kernel/shared/then.rb
+++ b/spec/ruby/core/kernel/shared/then.rb
@@ -1,20 +1,20 @@
 describe :kernel_then, shared: true do
   it "yields self" do
     object = Object.new
-    object.send(@method) { |o| o.should equal object }
+    object.send(@method) { |o| o.should.equal? object }
   end
 
   it "returns the block return value" do
     object = Object.new
-    object.send(@method) { 42 }.should equal 42
+    object.send(@method) { 42 }.should.equal? 42
   end
 
   it "returns a sized Enumerator when no block given" do
     object = Object.new
     enum = object.send(@method)
-    enum.should be_an_instance_of Enumerator
-    enum.size.should equal 1
-    enum.peek.should equal object
-    enum.first.should equal object
+    enum.should.instance_of? Enumerator
+    enum.size.should.equal? 1
+    enum.peek.should.equal? object
+    enum.first.should.equal? object
   end
 end
diff --git a/spec/ruby/core/kernel/singleton_class_spec.rb b/spec/ruby/core/kernel/singleton_class_spec.rb
index 23c400f9bd7..7915272937d 100644
--- a/spec/ruby/core/kernel/singleton_class_spec.rb
+++ b/spec/ruby/core/kernel/singleton_class_spec.rb
@@ -21,27 +21,27 @@
   end
 
   it "raises TypeError for Integer" do
-    -> { 123.singleton_class }.should raise_error(TypeError, "can't define singleton")
+    -> { 123.singleton_class }.should.raise(TypeError, "can't define singleton")
   end
 
   it "raises TypeError for Float" do
-    -> { 3.14.singleton_class }.should raise_error(TypeError, "can't define singleton")
+    -> { 3.14.singleton_class }.should.raise(TypeError, "can't define singleton")
   end
 
   it "raises TypeError for Symbol" do
-    -> { :foo.singleton_class }.should raise_error(TypeError, "can't define singleton")
+    -> { :foo.singleton_class }.should.raise(TypeError, "can't define singleton")
   end
 
   it "raises TypeError for a frozen deduplicated String" do
-    -> { (-"string").singleton_class }.should raise_error(TypeError, "can't define singleton")
-    -> { a = -"string"; a.singleton_class }.should raise_error(TypeError, "can't define singleton")
-    -> { a = "string"; (-a).singleton_class }.should raise_error(TypeError, "can't define singleton")
+    -> { (-"string").singleton_class }.should.raise(TypeError, "can't define singleton")
+    -> { a = -"string"; a.singleton_class }.should.raise(TypeError, "can't define singleton")
+    -> { a = "string"; (-a).singleton_class }.should.raise(TypeError, "can't define singleton")
   end
 
   it "returns a frozen singleton class if object is frozen" do
     obj = Object.new
     obj.freeze
-    obj.singleton_class.frozen?.should be_true
+    obj.singleton_class.frozen?.should == true
   end
 
   context "for an IO object with a replaced singleton class" do
diff --git a/spec/ruby/core/kernel/singleton_method_spec.rb b/spec/ruby/core/kernel/singleton_method_spec.rb
index 7d63fa7cc61..fe8e23eb021 100644
--- a/spec/ruby/core/kernel/singleton_method_spec.rb
+++ b/spec/ruby/core/kernel/singleton_method_spec.rb
@@ -4,7 +4,7 @@
   it "finds a method defined on the singleton class" do
     obj = Object.new
     def obj.foo; end
-    obj.singleton_method(:foo).should be_an_instance_of(Method)
+    obj.singleton_method(:foo).should.instance_of?(Method)
   end
 
   it "returns a Method which can be called" do
@@ -23,7 +23,7 @@ def foo
     obj.foo.should == 42
     -> {
       obj.singleton_method(:foo)
-    }.should raise_error(NameError) { |e|
+    }.should.raise(NameError) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -33,7 +33,7 @@ def foo
     obj = Object.new
     -> {
       obj.singleton_method(:not_existing)
-    }.should raise_error(NameError) { |e|
+    }.should.raise(NameError) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -50,7 +50,7 @@ def foo
       obj = Object.new
       obj.singleton_class.include(m)
 
-      obj.singleton_method(:foo).should be_an_instance_of(Method)
+      obj.singleton_method(:foo).should.instance_of?(Method)
       obj.singleton_method(:foo).call.should == :foo
     end
 
@@ -64,7 +64,7 @@ def foo
       obj = Object.new
       obj.singleton_class.prepend(m)
 
-      obj.singleton_method(:foo).should be_an_instance_of(Method)
+      obj.singleton_method(:foo).should.instance_of?(Method)
       obj.singleton_method(:foo).call.should == :foo
     end
 
@@ -78,7 +78,7 @@ def foo
       obj = Object.new
       obj.extend(m)
 
-      obj.singleton_method(:foo).should be_an_instance_of(Method)
+      obj.singleton_method(:foo).should.instance_of?(Method)
       obj.singleton_method(:foo).call.should == :foo
     end
   end
diff --git a/spec/ruby/core/kernel/singleton_methods_spec.rb b/spec/ruby/core/kernel/singleton_methods_spec.rb
index a127a439de2..a7f6969519a 100644
--- a/spec/ruby/core/kernel/singleton_methods_spec.rb
+++ b/spec/ruby/core/kernel/singleton_methods_spec.rb
@@ -8,33 +8,33 @@
   end
 
   it "returns the names of module methods for a module" do
-    ReflectSpecs::M.singleton_methods(*@object).should include(:ms_pro, :ms_pub)
+    ReflectSpecs::M.singleton_methods(*@object).to_set.should >= Set[:ms_pro, :ms_pub]
   end
 
   it "does not return private module methods for a module" do
-    ReflectSpecs::M.singleton_methods(*@object).should_not include(:ms_pri)
+    ReflectSpecs::M.singleton_methods(*@object).should_not.include?(:ms_pri)
   end
 
   it "returns the names of class methods for a class" do
-    ReflectSpecs::A.singleton_methods(*@object).should include(:as_pro, :as_pub)
+    ReflectSpecs::A.singleton_methods(*@object).to_set.should >= Set[:as_pro, :as_pub]
   end
 
   it "does not return private class methods for a class" do
-    ReflectSpecs::A.singleton_methods(*@object).should_not include(:as_pri)
+    ReflectSpecs::A.singleton_methods(*@object).should_not.include?(:as_pri)
   end
 
   it "returns the names of singleton methods for an object" do
-    ReflectSpecs.os.singleton_methods(*@object).should include(:os_pro, :os_pub)
+    ReflectSpecs.os.singleton_methods(*@object).to_set.should >= Set[:os_pro, :os_pub]
   end
 end
 
 describe :kernel_singleton_methods_modules, shared: true do
   it "does not return any included methods for a module including a module" do
-    ReflectSpecs::N.singleton_methods(*@object).should include(:ns_pro, :ns_pub)
+    ReflectSpecs::N.singleton_methods(*@object).to_set.should >= Set[:ns_pro, :ns_pub]
   end
 
   it "does not return any included methods for a class including a module" do
-    ReflectSpecs::D.singleton_methods(*@object).should include(:ds_pro, :ds_pub)
+    ReflectSpecs::D.singleton_methods(*@object).to_set.should >= Set[:ds_pro, :ds_pub]
   end
 
   it "for a module does not return methods in a module prepended to Module itself" do
@@ -44,7 +44,7 @@
 
     ancestors = mod.singleton_class.ancestors
     ancestors[0...2].should == [ mod.singleton_class, mod ]
-    ancestors.should include(SingletonMethodsSpecs::Prepended)
+    ancestors.should.include?(SingletonMethodsSpecs::Prepended)
 
     # Do not search prepended modules of `Module`, as that's a non-singleton class
     mod.singleton_methods.should == []
@@ -53,7 +53,7 @@
 
 describe :kernel_singleton_methods_supers, shared: true do
   it "returns the names of singleton methods for an object extended with a module" do
-    ReflectSpecs.oe.singleton_methods(*@object).should include(:m_pro, :m_pub)
+    ReflectSpecs.oe.singleton_methods(*@object).to_set.should >= Set[:m_pro, :m_pub]
   end
 
   it "returns a unique list for an object extended with a module" do
@@ -63,15 +63,15 @@
   end
 
   it "returns the names of singleton methods for an object extended with two modules" do
-    ReflectSpecs.oee.singleton_methods(*@object).should include(:m_pro, :m_pub, :n_pro, :n_pub)
+    ReflectSpecs.oee.singleton_methods(*@object).to_set.should >= Set[:m_pro, :m_pub, :n_pro, :n_pub]
   end
 
   it "returns the names of singleton methods for an object extended with a module including a module" do
-    ReflectSpecs.oei.singleton_methods(*@object).should include(:n_pro, :n_pub, :m_pro, :m_pub)
+    ReflectSpecs.oei.singleton_methods(*@object).to_set.should >= Set[:n_pro, :n_pub, :m_pro, :m_pub]
   end
 
   it "returns the names of inherited singleton methods for a subclass" do
-    ReflectSpecs::B.singleton_methods(*@object).should include(:as_pro, :as_pub, :bs_pro, :bs_pub)
+    ReflectSpecs::B.singleton_methods(*@object).to_set.should >= Set[:as_pro, :as_pub, :bs_pro, :bs_pub]
   end
 
   it "returns a unique list for a subclass" do
@@ -81,7 +81,7 @@
   end
 
   it "returns the names of inherited singleton methods for a subclass including a module" do
-    ReflectSpecs::C.singleton_methods(*@object).should include(:as_pro, :as_pub, :cs_pro, :cs_pub)
+    ReflectSpecs::C.singleton_methods(*@object).to_set.should >= Set[:as_pro, :as_pub, :cs_pro, :cs_pub]
   end
 
   it "returns a unique list for a subclass including a module" do
@@ -91,57 +91,62 @@
   end
 
   it "returns the names of inherited singleton methods for a subclass of a class including a module" do
-    ReflectSpecs::E.singleton_methods(*@object).should include(:ds_pro, :ds_pub, :es_pro, :es_pub)
+    ReflectSpecs::E.singleton_methods(*@object).to_set.should >= Set[:ds_pro, :ds_pub, :es_pro, :es_pub]
   end
 
   it "returns the names of inherited singleton methods for a subclass of a class that includes a module, where the subclass also includes a module" do
-    ReflectSpecs::F.singleton_methods(*@object).should include(:ds_pro, :ds_pub, :fs_pro, :fs_pub)
+    ReflectSpecs::F.singleton_methods(*@object).to_set.should >= Set[:ds_pro, :ds_pub, :fs_pro, :fs_pub]
   end
 
   it "returns the names of inherited singleton methods for a class extended with a module" do
-    ReflectSpecs::P.singleton_methods(*@object).should include(:m_pro, :m_pub)
+    ReflectSpecs::P.singleton_methods(*@object).to_set.should >= Set[:m_pro, :m_pub]
   end
 end
 
 describe :kernel_singleton_methods_private_supers, shared: true do
   it "does not return private singleton methods for an object extended with a module" do
-    ReflectSpecs.oe.singleton_methods(*@object).should_not include(:m_pri)
+    ReflectSpecs.oe.singleton_methods(*@object).should_not.include?(:m_pri)
   end
 
   it "does not return private singleton methods for an object extended with two modules" do
-    ReflectSpecs.oee.singleton_methods(*@object).should_not include(:m_pri)
+    ReflectSpecs.oee.singleton_methods(*@object).should_not.include?(:m_pri)
   end
 
   it "does not return private singleton methods for an object extended with a module including a module" do
-    ReflectSpecs.oei.singleton_methods(*@object).should_not include(:n_pri, :m_pri)
+    ReflectSpecs.oei.singleton_methods(*@object).should_not.include?(:n_pri)
+    ReflectSpecs.oei.singleton_methods(*@object).should_not.include?(:m_pri)
   end
 
   it "does not return private singleton methods for a class extended with a module" do
-    ReflectSpecs::P.singleton_methods(*@object).should_not include(:m_pri)
+    ReflectSpecs::P.singleton_methods(*@object).should_not.include?(:m_pri)
   end
 
   it "does not return private inherited singleton methods for a module including a module" do
-    ReflectSpecs::N.singleton_methods(*@object).should_not include(:ns_pri)
+    ReflectSpecs::N.singleton_methods(*@object).should_not.include?(:ns_pri)
   end
 
   it "does not return private inherited singleton methods for a class including a module" do
-    ReflectSpecs::D.singleton_methods(*@object).should_not include(:ds_pri)
+    ReflectSpecs::D.singleton_methods(*@object).should_not.include?(:ds_pri)
   end
 
   it "does not return private inherited singleton methods for a subclass" do
-    ReflectSpecs::B.singleton_methods(*@object).should_not include(:as_pri, :bs_pri)
+    ReflectSpecs::B.singleton_methods(*@object).should_not.include?(:as_pri)
+    ReflectSpecs::B.singleton_methods(*@object).should_not.include?(:bs_pri)
   end
 
   it "does not return private inherited singleton methods for a subclass including a module" do
-    ReflectSpecs::C.singleton_methods(*@object).should_not include(:as_pri, :cs_pri)
+    ReflectSpecs::C.singleton_methods(*@object).should_not.include?(:as_pri)
+    ReflectSpecs::C.singleton_methods(*@object).should_not.include?(:cs_pri)
   end
 
   it "does not return private inherited singleton methods for a subclass of a class including a module" do
-    ReflectSpecs::E.singleton_methods(*@object).should_not include(:ds_pri, :es_pri)
+    ReflectSpecs::E.singleton_methods(*@object).should_not.include?(:ds_pri)
+    ReflectSpecs::E.singleton_methods(*@object).should_not.include?(:es_pri)
   end
 
   it "does not return private inherited singleton methods for a subclass of a class that includes a module, where the subclass also includes a module" do
-    ReflectSpecs::F.singleton_methods(*@object).should_not include(:ds_pri, :fs_pri)
+    ReflectSpecs::F.singleton_methods(*@object).should_not.include?(:ds_pri)
+    ReflectSpecs::F.singleton_methods(*@object).should_not.include?(:fs_pri)
   end
 end
 
@@ -178,15 +183,17 @@
     end
 
     it "returns the names of singleton methods of the subclass" do
-      ReflectSpecs::B.singleton_methods(false).should include(:bs_pro, :bs_pub)
+      ReflectSpecs::B.singleton_methods(false).to_set.should >= Set[:bs_pro, :bs_pub]
     end
 
     it "does not return names of inherited singleton methods for a subclass" do
-      ReflectSpecs::B.singleton_methods(false).should_not include(:as_pro, :as_pub)
+      ReflectSpecs::B.singleton_methods(false).should_not.include?(:as_pro)
+      ReflectSpecs::B.singleton_methods(false).should_not.include?(:as_pub)
     end
 
     it "does not return the names of inherited singleton methods for a class extended with a module" do
-      ReflectSpecs::P.singleton_methods(false).should_not include(:m_pro, :m_pub)
+      ReflectSpecs::P.singleton_methods(false).should_not.include?(:m_pro)
+      ReflectSpecs::P.singleton_methods(false).should_not.include?(:m_pub)
     end
   end
 end
diff --git a/spec/ruby/core/kernel/sleep_spec.rb b/spec/ruby/core/kernel/sleep_spec.rb
index 0b003ad189a..61d8cc23804 100644
--- a/spec/ruby/core/kernel/sleep_spec.rb
+++ b/spec/ruby/core/kernel/sleep_spec.rb
@@ -3,11 +3,11 @@
 
 describe "Kernel#sleep" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:sleep)
+    Kernel.private_instance_methods(false).should.include?(:sleep)
   end
 
   it "returns an Integer" do
-    sleep(0.001).should be_kind_of(Integer)
+    sleep(0.001).should.is_a?(Integer)
   end
 
   it "accepts a Float" do
@@ -29,12 +29,12 @@ def o.divmod(*); [0, 0.001]; end
   end
 
   it "raises an ArgumentError when passed a negative duration" do
-    -> { sleep(-0.1) }.should raise_error(ArgumentError)
-    -> { sleep(-1) }.should raise_error(ArgumentError)
+    -> { sleep(-0.1) }.should.raise(ArgumentError)
+    -> { sleep(-1) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { sleep('2')   }.should raise_error(TypeError)
+    -> { sleep('2')   }.should.raise(TypeError)
   end
 
   it "pauses execution indefinitely if not given a duration" do
diff --git a/spec/ruby/core/kernel/spawn_spec.rb b/spec/ruby/core/kernel/spawn_spec.rb
index ba05b629d50..3432fc31da7 100644
--- a/spec/ruby/core/kernel/spawn_spec.rb
+++ b/spec/ruby/core/kernel/spawn_spec.rb
@@ -6,7 +6,7 @@
 # run here as it is redundant and takes too long for little gain.
 describe "Kernel#spawn" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:spawn)
+    Kernel.private_instance_methods(false).should.include?(:spawn)
   end
 
   it "executes the given command" do
diff --git a/spec/ruby/core/kernel/srand_spec.rb b/spec/ruby/core/kernel/srand_spec.rb
index 95bb406f464..cbc3a7f4b80 100644
--- a/spec/ruby/core/kernel/srand_spec.rb
+++ b/spec/ruby/core/kernel/srand_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:srand)
+    Kernel.private_instance_methods(false).should.include?(:srand)
   end
 
   it "returns the previous seed value" do
@@ -31,7 +31,7 @@
   end
 
   it "defaults number to a random value" do
-    -> { srand }.should_not raise_error
+    -> { srand }.should_not.raise
     srand.should_not == 0
   end
 
@@ -60,11 +60,11 @@
   end
 
   it "raises a TypeError when passed nil" do
-    -> { srand(nil) }.should raise_error(TypeError)
+    -> { srand(nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { srand("7") }.should raise_error(TypeError)
+    -> { srand("7") }.should.raise(TypeError)
   end
 end
 
diff --git a/spec/ruby/core/kernel/sub_spec.rb b/spec/ruby/core/kernel/sub_spec.rb
index 9130bd159c9..b175e371dc6 100644
--- a/spec/ruby/core/kernel/sub_spec.rb
+++ b/spec/ruby/core/kernel/sub_spec.rb
@@ -6,13 +6,13 @@
 ruby_version_is ""..."1.9" do
   describe "Kernel#sub" do
     it "is a private method" do
-      Kernel.should have_private_instance_method(:sub)
+      Kernel.private_instance_methods(false).should.include?(:sub)
     end
   end
 
   describe "Kernel#sub!" do
     it "is a private method" do
-      Kernel.should have_private_instance_method(:sub!)
+      Kernel.private_instance_methods(false).should.include?(:sub!)
     end
   end
 
diff --git a/spec/ruby/core/kernel/syscall_spec.rb b/spec/ruby/core/kernel/syscall_spec.rb
index 32d07b3ae29..63943cdad5d 100644
--- a/spec/ruby/core/kernel/syscall_spec.rb
+++ b/spec/ruby/core/kernel/syscall_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#syscall" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:syscall)
+    Kernel.private_instance_methods(false).should.include?(:syscall)
   end
 end
 
diff --git a/spec/ruby/core/kernel/system_spec.rb b/spec/ruby/core/kernel/system_spec.rb
index 9bc03924dd8..b24956104ab 100644
--- a/spec/ruby/core/kernel/system_spec.rb
+++ b/spec/ruby/core/kernel/system_spec.rb
@@ -5,14 +5,14 @@
   it "executes the specified command in a subprocess" do
     -> { @object.system("echo a") }.should output_to_fd("a\n")
 
-    $?.should be_an_instance_of Process::Status
+    $?.should.instance_of? Process::Status
     $?.should.success?
   end
 
   it "returns true when the command exits with a zero exit status" do
     @object.system(ruby_cmd('exit 0')).should == true
 
-    $?.should be_an_instance_of Process::Status
+    $?.should.instance_of? Process::Status
     $?.should.success?
     $?.exitstatus.should == 0
   end
@@ -20,24 +20,24 @@
   it "returns false when the command exits with a non-zero exit status" do
     @object.system(ruby_cmd('exit 1')).should == false
 
-    $?.should be_an_instance_of Process::Status
+    $?.should.instance_of? Process::Status
     $?.should_not.success?
     $?.exitstatus.should == 1
   end
 
   it "raises RuntimeError when `exception: true` is given and the command exits with a non-zero exit status" do
-    -> { @object.system(ruby_cmd('exit 1'), exception: true) }.should raise_error(RuntimeError)
+    -> { @object.system(ruby_cmd('exit 1'), exception: true) }.should.raise(RuntimeError)
   end
 
   it "raises Errno::ENOENT when `exception: true` is given and the specified command does not exist" do
-    -> { @object.system('feature_14386', exception: true) }.should raise_error(Errno::ENOENT)
+    -> { @object.system('feature_14386', exception: true) }.should.raise(Errno::ENOENT)
   end
 
   it "returns nil when command execution fails" do
-    @object.system("sad").should be_nil
+    @object.system("sad").should == nil
 
-    $?.should be_an_instance_of Process::Status
-    $?.pid.should be_kind_of(Integer)
+    $?.should.instance_of? Process::Status
+    $?.pid.should.is_a?(Integer)
     $?.should_not.success?
   end
 
@@ -121,7 +121,7 @@
 
 describe "Kernel#system" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:system)
+    Kernel.private_instance_methods(false).should.include?(:system)
   end
 
   it_behaves_like :kernel_system, :system, KernelSpecs::Method.new
diff --git a/spec/ruby/core/kernel/tap_spec.rb b/spec/ruby/core/kernel/tap_spec.rb
index f7720a6dc7d..453b9b84d5b 100644
--- a/spec/ruby/core/kernel/tap_spec.rb
+++ b/spec/ruby/core/kernel/tap_spec.rb
@@ -4,10 +4,10 @@
 describe "Kernel#tap" do
   it "always yields self and returns self" do
     a = KernelSpecs::A.new
-    a.tap{|o| o.should equal(a); 42}.should equal(a)
+    a.tap{|o| o.should.equal?(a); 42}.should.equal?(a)
   end
 
   it "raises a LocalJumpError when no block given" do
-    -> { 3.tap }.should raise_error(LocalJumpError)
+    -> { 3.tap }.should.raise(LocalJumpError)
   end
 end
diff --git a/spec/ruby/core/kernel/test_spec.rb b/spec/ruby/core/kernel/test_spec.rb
index d26dc06361b..30717dfd98e 100644
--- a/spec/ruby/core/kernel/test_spec.rb
+++ b/spec/ruby/core/kernel/test_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:test)
+    Kernel.private_instance_methods(false).should.include?(:test)
   end
 
   it "returns true when passed ?f if the argument is a regular file" do
@@ -28,7 +28,7 @@
       link = tmp("file_symlink.lnk")
       File.symlink(@file, link)
       begin
-        Kernel.test(?l, link).should be_true
+        Kernel.test(?l, link).should == true
       ensure
         rm_r link
       end
@@ -36,11 +36,11 @@
   end
 
   it "returns true when passed ?r if the argument is readable by the effective uid" do
-    Kernel.test(?r, @file).should be_true
+    Kernel.test(?r, @file).should == true
   end
 
   it "returns true when passed ?R if the argument is readable by the real uid" do
-    Kernel.test(?R, @file).should be_true
+    Kernel.test(?R, @file).should == true
   end
 
   context "writable test" do
@@ -54,11 +54,11 @@
     end
 
     it "returns true when passed ?w if the argument is readable by the effective uid" do
-      Kernel.test(?w, @tmp_file).should be_true
+      Kernel.test(?w, @tmp_file).should == true
     end
 
     it "returns true when passed ?W if the argument is readable by the real uid" do
-      Kernel.test(?W, @tmp_file).should be_true
+      Kernel.test(?W, @tmp_file).should == true
     end
   end
 
diff --git a/spec/ruby/core/kernel/throw_spec.rb b/spec/ruby/core/kernel/throw_spec.rb
index 64bfccb4139..1086126176f 100644
--- a/spec/ruby/core/kernel/throw_spec.rb
+++ b/spec/ruby/core/kernel/throw_spec.rb
@@ -7,7 +7,7 @@
       :value
       throw :blah
       fail("throw didn't transfer the control")
-    end.should be_nil
+    end.should == nil
   end
 
   it "transfers control to the innermost catch block waiting for the same symbol" do
@@ -42,11 +42,11 @@
   end
 
   it "raises an ArgumentError if there is no catch block for the symbol" do
-    -> { throw :blah }.should raise_error(ArgumentError)
+    -> { throw :blah }.should.raise(ArgumentError)
   end
 
   it "raises an UncaughtThrowError if there is no catch block for the symbol" do
-    -> { throw :blah }.should raise_error(UncaughtThrowError)
+    -> { throw :blah }.should.raise(UncaughtThrowError)
   end
 
   it "raises ArgumentError if 3 or more arguments provided" do
@@ -54,13 +54,13 @@
       catch :blah do
         throw :blah, :return_value, 2
       end
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       catch :blah do
         throw :blah, :return_value, 2, 3, 4, 5
       end
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "can throw an object" do
@@ -69,12 +69,12 @@
       catch obj do
         throw obj
       end
-    }.should_not raise_error(NameError)
+    }.should_not.raise(NameError)
   end
 end
 
 describe "Kernel#throw" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:throw)
+    Kernel.private_instance_methods(false).should.include?(:throw)
   end
 end
diff --git a/spec/ruby/core/kernel/trace_var_spec.rb b/spec/ruby/core/kernel/trace_var_spec.rb
index 3c84aa5e603..150c3da2661 100644
--- a/spec/ruby/core/kernel/trace_var_spec.rb
+++ b/spec/ruby/core/kernel/trace_var_spec.rb
@@ -14,7 +14,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:trace_var)
+    Kernel.private_instance_methods(false).should.include?(:trace_var)
   end
 
   it "hooks assignments to a global variable" do
@@ -49,6 +49,6 @@
   it "raises ArgumentError if no block or proc is provided" do
     -> do
       trace_var :$Kernel_trace_var_global
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/kernel/trap_spec.rb b/spec/ruby/core/kernel/trap_spec.rb
index 4c801a7215e..8f44f3af4b6 100644
--- a/spec/ruby/core/kernel/trap_spec.rb
+++ b/spec/ruby/core/kernel/trap_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Kernel#trap" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:trap)
+    Kernel.private_instance_methods(false).should.include?(:trap)
   end
 
   # Behaviour is specified for Signal.trap
diff --git a/spec/ruby/core/kernel/untrace_var_spec.rb b/spec/ruby/core/kernel/untrace_var_spec.rb
index 1925a3a8360..8b219801c84 100644
--- a/spec/ruby/core/kernel/untrace_var_spec.rb
+++ b/spec/ruby/core/kernel/untrace_var_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Kernel#untrace_var" do
   it "is a private method" do
-    Kernel.should have_private_instance_method(:untrace_var)
+    Kernel.private_instance_methods(false).should.include?(:untrace_var)
   end
 end
 
diff --git a/spec/ruby/core/kernel/warn_spec.rb b/spec/ruby/core/kernel/warn_spec.rb
index e03498c6dc4..189129dd313 100644
--- a/spec/ruby/core/kernel/warn_spec.rb
+++ b/spec/ruby/core/kernel/warn_spec.rb
@@ -14,7 +14,7 @@
   end
 
   it "is a private method" do
-    Kernel.should have_private_instance_method(:warn)
+    Kernel.private_instance_methods(false).should.include?(:warn)
   end
 
   it "accepts multiple arguments" do
@@ -161,7 +161,7 @@ def o.to_sym; :deprecated; end
       -> {
         $VERBOSE = true
         warn("message", category: Object.new)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
     it "converts first arg using to_s" do
@@ -194,19 +194,19 @@ def o.to_sym; :deprecated; end
     end
 
     it "raises ArgumentError if passed negative value" do
-      -> { warn "", uplevel: -2 }.should raise_error(ArgumentError)
-      -> { warn "", uplevel: -100 }.should raise_error(ArgumentError)
+      -> { warn "", uplevel: -2 }.should.raise(ArgumentError)
+      -> { warn "", uplevel: -100 }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if passed -1" do
-      -> { warn "", uplevel: -1 }.should raise_error(ArgumentError)
+      -> { warn "", uplevel: -1 }.should.raise(ArgumentError)
     end
 
     it "raises TypeError if passed not Integer" do
-      -> { warn "", uplevel: "" }.should raise_error(TypeError)
-      -> { warn "", uplevel: [] }.should raise_error(TypeError)
-      -> { warn "", uplevel: {} }.should raise_error(TypeError)
-      -> { warn "", uplevel: Object.new }.should raise_error(TypeError)
+      -> { warn "", uplevel: "" }.should.raise(TypeError)
+      -> { warn "", uplevel: [] }.should.raise(TypeError)
+      -> { warn "", uplevel: {} }.should.raise(TypeError)
+      -> { warn "", uplevel: Object.new }.should.raise(TypeError)
     end
   end
 
diff --git a/spec/ruby/core/main/define_method_spec.rb b/spec/ruby/core/main/define_method_spec.rb
index d85c5e81192..5279d078c3e 100644
--- a/spec/ruby/core/main/define_method_spec.rb
+++ b/spec/ruby/core/main/define_method_spec.rb
@@ -14,15 +14,15 @@
 
   it 'creates a public method in TOPLEVEL_BINDING' do
     eval @code, TOPLEVEL_BINDING
-    Object.should have_method :boom
+    Object.should.respond_to? :boom
   end
 
   it 'creates a public method in script binding' do
     eval @code, script_binding
-    Object.should have_method :boom
+    Object.should.respond_to? :boom
   end
 
   it 'returns the method name as symbol' do
-    eval(@code, TOPLEVEL_BINDING).should equal :boom
+    eval(@code, TOPLEVEL_BINDING).should.equal? :boom
   end
 end
diff --git a/spec/ruby/core/main/include_spec.rb b/spec/ruby/core/main/include_spec.rb
index 9f5a5f54eaf..09f8d4d3b5d 100644
--- a/spec/ruby/core/main/include_spec.rb
+++ b/spec/ruby/core/main/include_spec.rb
@@ -4,13 +4,13 @@
 describe "main#include" do
   it "includes the given Module in Object" do
     eval "include MainSpecs::Module", TOPLEVEL_BINDING
-    Object.ancestors.should include(MainSpecs::Module)
+    Object.ancestors.should.include?(MainSpecs::Module)
   end
 
   context "in a file loaded with wrapping" do
     it "includes the given Module in the load wrapper" do
       load(File.expand_path("../fixtures/wrapped_include.rb", __FILE__), true)
-      Object.ancestors.should_not include(MainSpecs::WrapIncludeModule)
+      Object.ancestors.should_not.include?(MainSpecs::WrapIncludeModule)
     end
   end
 end
diff --git a/spec/ruby/core/main/private_spec.rb b/spec/ruby/core/main/private_spec.rb
index 76895fd6493..56a39ae3c15 100644
--- a/spec/ruby/core/main/private_spec.rb
+++ b/spec/ruby/core/main/private_spec.rb
@@ -10,33 +10,33 @@
   context "when single argument is passed and it is not an array" do
     it "sets the visibility of the given methods to private" do
       eval "private :main_public_method", TOPLEVEL_BINDING
-      Object.should have_private_method(:main_public_method)
+      Object.private_methods(true).should.include?(:main_public_method)
     end
   end
 
   context "when multiple arguments are passed" do
     it "sets the visibility of the given methods to private" do
       eval "private :main_public_method, :main_public_method2", TOPLEVEL_BINDING
-      Object.should have_private_method(:main_public_method)
-      Object.should have_private_method(:main_public_method2)
+      Object.private_methods(true).should.include?(:main_public_method)
+      Object.private_methods(true).should.include?(:main_public_method2)
     end
   end
 
   context "when single argument is passed and is an array" do
     it "sets the visibility of the given methods to private" do
       eval "private [:main_public_method, :main_public_method2]", TOPLEVEL_BINDING
-      Object.should have_private_method(:main_public_method)
-      Object.should have_private_method(:main_public_method2)
+      Object.private_methods(true).should.include?(:main_public_method)
+      Object.private_methods(true).should.include?(:main_public_method2)
     end
   end
 
   it "returns argument" do
-    eval("private :main_public_method", TOPLEVEL_BINDING).should equal(:main_public_method)
+    eval("private :main_public_method", TOPLEVEL_BINDING).should.equal?(:main_public_method)
   end
 
   it "raises a NameError when at least one of given method names is undefined" do
     -> do
       eval "private :main_public_method, :main_undefined_method", TOPLEVEL_BINDING
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/main/public_spec.rb b/spec/ruby/core/main/public_spec.rb
index 3c77798fbcf..89368ebb0db 100644
--- a/spec/ruby/core/main/public_spec.rb
+++ b/spec/ruby/core/main/public_spec.rb
@@ -10,34 +10,34 @@
   context "when single argument is passed and it is not an array" do
     it "sets the visibility of the given methods to public" do
       eval "public :main_private_method", TOPLEVEL_BINDING
-      Object.should_not have_private_method(:main_private_method)
+      Object.private_methods(true).should_not.include?(:main_private_method)
     end
   end
 
   context "when multiple arguments are passed" do
     it "sets the visibility of the given methods to public" do
       eval "public :main_private_method, :main_private_method2", TOPLEVEL_BINDING
-      Object.should_not have_private_method(:main_private_method)
-      Object.should_not have_private_method(:main_private_method2)
+      Object.private_methods(true).should_not.include?(:main_private_method)
+      Object.private_methods(true).should_not.include?(:main_private_method2)
     end
   end
 
   context "when single argument is passed and is an array" do
     it "sets the visibility of the given methods to public" do
       eval "public [:main_private_method, :main_private_method2]", TOPLEVEL_BINDING
-      Object.should_not have_private_method(:main_private_method)
-      Object.should_not have_private_method(:main_private_method2)
+      Object.private_methods(true).should_not.include?(:main_private_method)
+      Object.private_methods(true).should_not.include?(:main_private_method2)
     end
   end
 
   it "returns argument" do
-    eval("public :main_private_method", TOPLEVEL_BINDING).should equal(:main_private_method)
+    eval("public :main_private_method", TOPLEVEL_BINDING).should.equal?(:main_private_method)
   end
 
 
   it "raises a NameError when given an undefined name" do
     -> do
       eval "public :main_undefined_method", TOPLEVEL_BINDING
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/main/ruby2_keywords_spec.rb b/spec/ruby/core/main/ruby2_keywords_spec.rb
index 27ceae3253f..d12c0ed4e43 100644
--- a/spec/ruby/core/main/ruby2_keywords_spec.rb
+++ b/spec/ruby/core/main/ruby2_keywords_spec.rb
@@ -4,6 +4,6 @@
 describe "main.ruby2_keywords" do
   it "is the same as Object.ruby2_keywords" do
     main = TOPLEVEL_BINDING.receiver
-    main.should have_private_method(:ruby2_keywords)
+    main.private_methods(false).should.include?(:ruby2_keywords)
   end
 end
diff --git a/spec/ruby/core/main/using_spec.rb b/spec/ruby/core/main/using_spec.rb
index 5b9a7515954..314a6be4161 100644
--- a/spec/ruby/core/main/using_spec.rb
+++ b/spec/ruby/core/main/using_spec.rb
@@ -5,11 +5,11 @@
   it "requires one Module argument" do
     -> do
       eval('using', TOPLEVEL_BINDING)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
 
     -> do
       eval('using "foo"', TOPLEVEL_BINDING)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "uses refinements from the given module only in the target file" do
@@ -19,7 +19,7 @@
     MainSpecs::DATA[:toplevel].should == 'foo'
     -> do
       'hello'.foo
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 
   it "uses refinements from the given module for method calls in the target file" do
@@ -27,7 +27,7 @@
     load File.expand_path('../fixtures/string_refinement_user.rb', __FILE__)
     -> do
       'hello'.foo
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
     MainSpecs.call_foo('hello').should == 'foo'
   end
 
@@ -133,18 +133,18 @@ def bar; 'quux'; end
   it "raises error when called from method in wrapped script" do
     -> do
       load File.expand_path('../fixtures/using_in_method.rb', __FILE__), true
-    end.should raise_error(RuntimeError)
+    end.should.raise(RuntimeError)
   end
 
   it "raises error when called on toplevel from module" do
     -> do
       load File.expand_path('../fixtures/using_in_main.rb', __FILE__), true
-    end.should raise_error(RuntimeError)
+    end.should.raise(RuntimeError)
   end
 
   it "does not raise error when wrapped with module" do
     -> do
       load File.expand_path('../fixtures/using.rb', __FILE__), true
-    end.should_not raise_error
+    end.should_not.raise
   end
 end
diff --git a/spec/ruby/core/marshal/dump_spec.rb b/spec/ruby/core/marshal/dump_spec.rb
index ff9b9214faf..9bbb7809af3 100644
--- a/spec/ruby/core/marshal/dump_spec.rb
+++ b/spec/ruby/core/marshal/dump_spec.rb
@@ -116,7 +116,7 @@
     end
 
     it "raises TypeError if an Object is an instance of an anonymous class" do
-      -> { Marshal.dump(Class.new(UserMarshal).new) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(Class.new(UserMarshal).new) }.should.raise(TypeError, /can't dump anonymous class/)
     end
 
     it "uses object links for objects repeatedly dumped" do
@@ -157,11 +157,11 @@
     it "raises a TypeError if _dump returns a non-string" do
       m = mock("marshaled")
       m.should_receive(:_dump).and_return(0)
-      -> { Marshal.dump(m) }.should raise_error(TypeError)
+      -> { Marshal.dump(m) }.should.raise(TypeError)
     end
 
     it "raises TypeError if an Object is an instance of an anonymous class" do
-      -> { Marshal.dump(Class.new(UserDefined).new) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(Class.new(UserDefined).new) }.should.raise(TypeError, /can't dump anonymous class/)
     end
 
     it "favors marshal_dump over _dump" do
@@ -244,11 +244,11 @@ def _dump(level)
     end
 
     it "raises TypeError with an anonymous Class" do
-      -> { Marshal.dump(Class.new) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(Class.new) }.should.raise(TypeError, /can't dump anonymous class/)
     end
 
     it "raises TypeError with a singleton Class" do
-      -> { Marshal.dump(class << self; self end) }.should raise_error(TypeError)
+      -> { Marshal.dump(class << self; self end) }.should.raise(TypeError)
     end
   end
 
@@ -274,7 +274,7 @@ def _dump(level)
     end
 
     it "raises TypeError with an anonymous Module" do
-      -> { Marshal.dump(Module.new) }.should raise_error(TypeError, /can't dump anonymous module/)
+      -> { Marshal.dump(Module.new) }.should.raise(TypeError, /can't dump anonymous module/)
     end
   end
 
@@ -388,7 +388,7 @@ def _dump(level)
     end
 
     it "raises TypeError with an anonymous Struct" do
-      -> { Marshal.dump(Data.define(:a).new(1)) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(Data.define(:a).new(1)) }.should.raise(TypeError, /can't dump anonymous class/)
     end
   end
 
@@ -473,14 +473,26 @@ def _dump(level)
       Marshal.dump(//im).should == "\x04\bI/\x00\x05\x06:\x06EF"
     end
 
-    it "dumps a Regexp with instance variables" do
-      o = Regexp.new("")
+    it "dumps a Regexp subclass with instance variables" do
+      o = UserRegexp.new("")
       o.instance_variable_set(:@ivar, :ivar)
-      Marshal.dump(o).should == "\x04\bI/\x00\x00\a:\x06EF:\n@ivar:\tivar"
+      Marshal.dump(o).should == "\x04\bIC:\x0FUserRegexp/\x00\x00\a:\x06EF:\n@ivar:\tivar"
     end
 
-    it "dumps an extended Regexp" do
-      Marshal.dump(Regexp.new("").extend(Meths)).should == "\x04\bIe:\nMeths/\x00\x00\x06:\x06EF"
+    it "dumps an extended Regexp subclass" do
+      Marshal.dump(UserRegexp.new("").extend(Meths)).should == "\x04\bIe:\nMethsC:\x0FUserRegexp/\x00\x00\x06:\x06EF"
+    end
+
+    ruby_version_is ""..."4.1" do
+      it "dumps a Regexp with instance variables" do
+        o = Regexp.new("")
+        o.instance_variable_set(:@ivar, :ivar)
+        Marshal.dump(o).should == "\x04\bI/\x00\x00\a:\x06EF:\n@ivar:\tivar"
+      end
+
+      it "dumps an extended Regexp" do
+        Marshal.dump(Regexp.new("").extend(Meths)).should == "\x04\bIe:\nMeths/\x00\x00\x06:\x06EF"
+      end
     end
 
     it "dumps a Regexp subclass" do
@@ -618,7 +630,7 @@ def _dump(level)
     end
 
     it "raises a TypeError with hash having default proc" do
-      -> { Marshal.dump(Hash.new {}) }.should raise_error(TypeError, "can't dump hash with default proc")
+      -> { Marshal.dump(Hash.new {}) }.should.raise(TypeError, "can't dump hash with default proc")
     end
 
     it "dumps a Hash with instance variables" do
@@ -694,7 +706,7 @@ def _dump(level)
     end
 
     it "raises TypeError with an anonymous Struct" do
-      -> { Marshal.dump(Struct.new(:a).new(1)) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(Struct.new(:a).new(1)) }.should.raise(TypeError, /can't dump anonymous class/)
     end
 
     it "adds instance variables after the object itself into the objects table" do
@@ -753,7 +765,7 @@ def _dump(level)
       def obj.foo; end
       -> {
         Marshal.dump(obj)
-      }.should raise_error(TypeError, "singleton can't be dumped")
+      }.should.raise(TypeError, "singleton can't be dumped")
     end
 
     it "raises TypeError if an Object has a singleton class and singleton instance variables" do
@@ -764,14 +776,14 @@ class << obj
 
       -> {
         Marshal.dump(obj)
-      }.should raise_error(TypeError, "singleton can't be dumped")
+      }.should.raise(TypeError, "singleton can't be dumped")
     end
 
     it "raises TypeError if an Object is an instance of an anonymous class" do
       anonymous_class = Class.new
       obj = anonymous_class.new
 
-      -> { Marshal.dump(obj) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(obj) }.should.raise(TypeError, /can't dump anonymous class/)
     end
 
     it "raises TypeError if an Object extends an anonymous module" do
@@ -779,7 +791,7 @@ class << obj
       obj = Object.new
       obj.extend(anonymous_module)
 
-      -> { Marshal.dump(obj) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(obj) }.should.raise(TypeError, /can't dump anonymous class/)
     end
 
     it "dumps a BasicObject subclass if it defines respond_to?" do
@@ -835,7 +847,7 @@ def finalizer.noop(_)
     end
 
     it "raises TypeError with an anonymous Range subclass" do
-      -> { Marshal.dump(Class.new(Range).new(1, 2)) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(Class.new(Range).new(1, 2)) }.should.raise(TypeError, /can't dump anonymous class/)
     end
   end
 
@@ -865,7 +877,7 @@ def finalizer.noop(_)
         base = "\x04\bIu:\tTime\r#{@t_dump}\a"
         offset = ":\voffseti\x020*"
         zone = ":\tzoneI\"\bAST\x06:\x06EF" # Last is 'F' (US-ASCII)
-        [ "#{base}#{offset}#{zone}", "#{base}#{zone}#{offset}" ].should include(dump)
+        [ "#{base}#{offset}#{zone}", "#{base}#{zone}#{offset}" ].should.include?(dump)
       end
     end
 
@@ -877,7 +889,7 @@ def finalizer.noop(_)
 
     it "ignores overridden name method" do
       obj = MarshalSpec::TimeWithOverriddenName.new
-      Marshal.dump(obj).should include("MarshalSpec::TimeWithOverriddenName")
+      Marshal.dump(obj).should.include?("MarshalSpec::TimeWithOverriddenName")
     end
 
     ruby_version_is "4.0" do
@@ -909,7 +921,7 @@ def finalizer.noop(_)
     end
 
     it "raises TypeError with an anonymous Time subclass" do
-      -> { Marshal.dump(Class.new(Time).now) }.should raise_error(TypeError)
+      -> { Marshal.dump(Class.new(Time).now) }.should.raise(TypeError)
     end
   end
 
@@ -942,13 +954,13 @@ def finalizer.noop(_)
         begin
           raise RuntimeError, "the consequence"
         rescue RuntimeError => e
-          e.cause.should equal(cause)
+          e.cause.should.equal?(cause)
           exc = e
         end
       end
 
       reloaded = Marshal.load(Marshal.dump(exc))
-      reloaded.cause.should be_an_instance_of(StandardError)
+      reloaded.cause.should.instance_of?(StandardError)
       reloaded.cause.message.should == "the cause"
     end
 
@@ -981,7 +993,7 @@ def finalizer.noop(_)
       anonymous_class = Class.new(Exception)
       obj = anonymous_class.new
 
-      -> { Marshal.dump(obj) }.should raise_error(TypeError, /can't dump anonymous class/)
+      -> { Marshal.dump(obj) }.should.raise(TypeError, /can't dump anonymous class/)
     end
   end
 
@@ -1002,10 +1014,10 @@ def finalizer.noop(_)
 
   it "raises an ArgumentError when the recursion limit is exceeded" do
     h = {'one' => {'two' => {'three' => 0}}}
-    -> { Marshal.dump(h, 3) }.should raise_error(ArgumentError)
-    -> { Marshal.dump([h], 4) }.should raise_error(ArgumentError)
-    -> { Marshal.dump([], 0) }.should raise_error(ArgumentError)
-    -> { Marshal.dump([[[]]], 1) }.should raise_error(ArgumentError)
+    -> { Marshal.dump(h, 3) }.should.raise(ArgumentError)
+    -> { Marshal.dump([h], 4) }.should.raise(ArgumentError)
+    -> { Marshal.dump([], 0) }.should.raise(ArgumentError)
+    -> { Marshal.dump([[[]]], 1) }.should.raise(ArgumentError)
   end
 
   it "ignores the recursion limit if the limit is negative" do
@@ -1027,7 +1039,7 @@ def finalizer.noop(_)
 
     it "raises an Error when the IO-Object does not respond to #write" do
       obj = mock('test')
-      -> { Marshal.dump("test", obj) }.should raise_error(TypeError)
+      -> { Marshal.dump("test", obj) }.should.raise(TypeError)
     end
 
 
@@ -1042,29 +1054,29 @@ def finalizer.noop(_)
   describe "when passed a StringIO" do
     it "should raise an error" do
       require "stringio"
-      -> { Marshal.dump(StringIO.new) }.should raise_error(TypeError)
+      -> { Marshal.dump(StringIO.new) }.should.raise(TypeError)
     end
   end
 
   it "raises a TypeError if marshalling a Method instance" do
-    -> { Marshal.dump(Marshal.method(:dump)) }.should raise_error(TypeError)
+    -> { Marshal.dump(Marshal.method(:dump)) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if marshalling a Proc" do
-    -> { Marshal.dump(proc {}) }.should raise_error(TypeError)
+    -> { Marshal.dump(proc {}) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if dumping a IO/File instance" do
-    -> { Marshal.dump(STDIN) }.should raise_error(TypeError)
-    -> { File.open(__FILE__) { |f| Marshal.dump(f) } }.should raise_error(TypeError)
+    -> { Marshal.dump(STDIN) }.should.raise(TypeError)
+    -> { File.open(__FILE__) { |f| Marshal.dump(f) } }.should.raise(TypeError)
   end
 
   it "raises a TypeError if dumping a MatchData instance" do
-    -> { Marshal.dump(/(.)/.match("foo")) }.should raise_error(TypeError)
+    -> { Marshal.dump(/(.)/.match("foo")) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if dumping a Mutex instance" do
     m = Mutex.new
-    -> { Marshal.dump(m) }.should raise_error(TypeError)
+    -> { Marshal.dump(m) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/marshal/float_spec.rb b/spec/ruby/core/marshal/float_spec.rb
index 5793bbd5649..5b2d68d6e1c 100644
--- a/spec/ruby/core/marshal/float_spec.rb
+++ b/spec/ruby/core/marshal/float_spec.rb
@@ -40,7 +40,7 @@
 
 describe "Marshal.load with Float" do
   it "loads NaN" do
-    Marshal.load("\004\bf\bnan").should be_nan
+    Marshal.load("\004\bf\bnan").should.nan?
   end
 
   it "loads +Infinity" do
diff --git a/spec/ruby/core/marshal/shared/load.rb b/spec/ruby/core/marshal/shared/load.rb
index 692c14cfa10..02c8e7f0b17 100644
--- a/spec/ruby/core/marshal/shared/load.rb
+++ b/spec/ruby/core/marshal/shared/load.rb
@@ -8,11 +8,11 @@
 
   it "raises an ArgumentError when the dumped data is truncated" do
     obj = {first: 1, second: 2, third: 3}
-    -> { Marshal.send(@method, Marshal.dump(obj)[0, 5]) }.should raise_error(ArgumentError, "marshal data too short")
+    -> { Marshal.send(@method, Marshal.dump(obj)[0, 5]) }.should.raise(ArgumentError, "marshal data too short")
   end
 
   it "raises an ArgumentError when the argument is empty String" do
-    -> { Marshal.send(@method, "") }.should raise_error(ArgumentError, "marshal data too short")
+    -> { Marshal.send(@method, "") }.should.raise(ArgumentError, "marshal data too short")
   end
 
   it "raises an ArgumentError when the dumped class is missing" do
@@ -20,7 +20,7 @@
     kaboom = Marshal.dump(KaBoom.new)
     Object.send(:remove_const, :KaBoom)
 
-    -> { Marshal.send(@method, kaboom) }.should raise_error(ArgumentError)
+    -> { Marshal.send(@method, kaboom) }.should.raise(ArgumentError)
   end
 
   describe "when called with freeze: true" do
@@ -111,7 +111,7 @@
         source_object = ["foo" + "bar", "foobar"]
         object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
 
-        object[0].should equal(object[1])
+        object[0].should.equal?(object[1])
       end
     end
 
@@ -297,9 +297,9 @@
       UserPreviouslyDefinedWithInitializedIvar.should_receive(:_load).and_return(UserPreviouslyDefinedWithInitializedIvar.new)
       marshaled_obj = Marshal.send(@method, dump_str)
 
-      marshaled_obj.should be_an_instance_of(UserPreviouslyDefinedWithInitializedIvar)
-      marshaled_obj.field1.should be_nil
-      marshaled_obj.field2.should be_nil
+      marshaled_obj.should.instance_of?(UserPreviouslyDefinedWithInitializedIvar)
+      marshaled_obj.field1.should == nil
+      marshaled_obj.field2.should == nil
     end
 
     it "loads the String in non US-ASCII and non UTF-8 encoding" do
@@ -403,20 +403,20 @@
     marshal_data[0] = (Marshal::MAJOR_VERSION).chr
     marshal_data[1] = (Marshal::MINOR_VERSION + 1).chr
 
-    -> { Marshal.send(@method, marshal_data) }.should raise_error(TypeError)
+    -> { Marshal.send(@method, marshal_data) }.should.raise(TypeError)
 
     marshal_data = +'\xff\xff'
     marshal_data[0] = (Marshal::MAJOR_VERSION - 1).chr
     marshal_data[1] = (Marshal::MINOR_VERSION).chr
 
-    -> { Marshal.send(@method, marshal_data) }.should raise_error(TypeError)
+    -> { Marshal.send(@method, marshal_data) }.should.raise(TypeError)
   end
 
   it "raises EOFError on loading an empty file" do
     temp_file = tmp("marshal.rubyspec.tmp.#{Process.pid}")
     file = File.new(temp_file, "w+")
     begin
-      -> { Marshal.send(@method, file) }.should raise_error(EOFError)
+      -> { Marshal.send(@method, file) }.should.raise(EOFError)
     ensure
       file.close
       rm_r temp_file
@@ -462,7 +462,7 @@
       obj.instance_variable_set(:@mix, s)
       new_obj = Marshal.send(@method, "\004\bI[\b\"\0065I\"\twell\006:\t@fooi\017\"\ahi\006:\t@mix@\a")
       new_obj.should == obj
-      new_obj.instance_variable_get(:@mix).should equal new_obj[1]
+      new_obj.instance_variable_get(:@mix).should.equal? new_obj[1]
       new_obj[1].instance_variable_get(:@foo).should == 10
     end
 
@@ -613,7 +613,7 @@
 
       -> {
         Marshal.send(@method, "\x04\b:\nhel")
-      }.should raise_error(ArgumentError, "marshal data too short")
+      }.should.raise(ArgumentError, "marshal data too short")
     end
   end
 
@@ -633,7 +633,7 @@
     it "sets binmode if it is loading through StringIO stream" do
       io = StringIO.new("\004\b:\vsymbol")
       def io.binmode; raise "binmode"; end
-      -> { Marshal.load(io) }.should raise_error(RuntimeError, "binmode")
+      -> { Marshal.load(io) }.should.raise(RuntimeError, "binmode")
     end
 
     it "loads a string with an ivar" do
@@ -643,7 +643,7 @@ def io.binmode; raise "binmode"; end
 
     it "loads a String subclass with custom constructor" do
       str = Marshal.send(@method, "\x04\bC: UserCustomConstructorString\"\x00")
-      str.should be_an_instance_of(UserCustomConstructorString)
+      str.should.instance_of?(UserCustomConstructorString)
     end
 
     it "loads a US-ASCII String" do
@@ -651,7 +651,7 @@ def io.binmode; raise "binmode"; end
       data = "\x04\bI\"\babc\x06:\x06EF"
       result = Marshal.send(@method, data)
       result.should == str
-      result.encoding.should equal(Encoding::US_ASCII)
+      result.encoding.should.equal?(Encoding::US_ASCII)
     end
 
     it "loads a UTF-8 String" do
@@ -659,7 +659,7 @@ def io.binmode; raise "binmode"; end
       data = "\x04\bI\"\vm\xC3\xB6hre\x06:\x06ET"
       result = Marshal.send(@method, data)
       result.should == str
-      result.encoding.should equal(Encoding::UTF_8)
+      result.encoding.should.equal?(Encoding::UTF_8)
     end
 
     it "loads a String in another encoding" do
@@ -667,7 +667,7 @@ def io.binmode; raise "binmode"; end
       data = "\x04\bI\"\x0Fm\x00\xF6\x00h\x00r\x00e\x00\x06:\rencoding\"\rUTF-16LE"
       result = Marshal.send(@method, data)
       result.should == str
-      result.encoding.should equal(Encoding::UTF_16LE)
+      result.encoding.should.equal?(Encoding::UTF_16LE)
     end
 
     it "loads a String as BINARY if no encoding is specified at the end" do
@@ -683,7 +683,7 @@ def io.binmode; raise "binmode"; end
 
       -> {
         Marshal.send(@method, "\x04\b\"\nhel")
-      }.should raise_error(ArgumentError, "marshal data too short")
+      }.should.raise(ArgumentError, "marshal data too short")
     end
   end
 
@@ -807,7 +807,7 @@ def io.binmode; raise "binmode"; end
 
   describe "for an Object" do
     it "loads an object" do
-      Marshal.send(@method, "\004\bo:\vObject\000").should be_kind_of(Object)
+      Marshal.send(@method, "\004\bo:\vObject\000").should.is_a?(Object)
     end
 
     it "loads an extended Object" do
@@ -843,7 +843,7 @@ def io.binmode; raise "binmode"; end
     it "raises ArgumentError if the object from an 'o' stream is not dumpable as 'o' type user class" do
       -> do
         Marshal.send(@method, "\x04\bo:\tFile\001\001:\001\005@path\"\x10/etc/passwd")
-      end.should raise_error(ArgumentError)
+      end.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError when end of byte sequence reached before class name end" do
@@ -851,7 +851,7 @@ def io.binmode; raise "binmode"; end
 
       -> {
         Marshal.send(@method, "\x04\bo:\vObj")
-      }.should raise_error(ArgumentError, "marshal data too short")
+      }.should.raise(ArgumentError, "marshal data too short")
     end
   end
 
@@ -879,7 +879,7 @@ def io.binmode; raise "binmode"; end
     end
 
     it "loads a UserObject" do
-      Marshal.send(@method, "\004\bo:\017UserObject\000").should be_kind_of(UserObject)
+      Marshal.send(@method, "\004\bo:\017UserObject\000").should.is_a?(UserObject)
     end
 
     describe "that extends a core type other than Object or BasicObject" do
@@ -892,23 +892,61 @@ def io.binmode; raise "binmode"; end
         data = Marshal.dump(MarshalSpec::SwappedClass.new)
 
         MarshalSpec.set_swapped_class(Class.new(Array))
-        -> { Marshal.send(@method, data) }.should raise_error(ArgumentError)
+        -> { Marshal.send(@method, data) }.should.raise(ArgumentError)
 
         MarshalSpec.set_swapped_class(Class.new)
-        -> { Marshal.send(@method, data) }.should raise_error(ArgumentError)
+        -> { Marshal.send(@method, data) }.should.raise(ArgumentError)
       end
     end
   end
 
   describe "for a Regexp" do
-    it "loads an extended Regexp" do
-      obj = /[a-z]/.dup.extend(Meths, MethsMore)
-      new_obj = Marshal.send(@method, "\004\be:\nMethse:\016MethsMore/\n[a-z]\000")
+    ruby_version_is "4.1" do
+      it "raises FrozenError for an extended Regexp" do
+        -> {
+          Marshal.send(@method, "\004\be:\nMethse:\016MethsMore/\n[a-z]\000")
+        }.should.raise(FrozenError)
+      end
+
+      it "raises FrozenError when regexp has instance variables" do
+        -> {
+          Marshal.send(@method, "\x04\bI/\nhello\x00\a:\x06EF:\x11@regexp_ivar[\x06i/")
+        }.should.raise(FrozenError)
+      end
+    end
+
+    ruby_version_is ""..."4.1" do
+      it "loads an extended Regexp" do
+        obj = /[a-z]/.dup.extend(Meths, MethsMore)
+        new_obj = Marshal.send(@method, "\004\be:\nMethse:\016MethsMore/\n[a-z]\000")
+
+        new_obj.should == obj
+        new_obj_metaclass_ancestors = class << new_obj; ancestors; end
+        new_obj_metaclass_ancestors[@num_self_class, 3].should ==
+          [Meths, MethsMore, Regexp]
+      end
+
+      it "restore the regexp instance variables" do
+        obj = Regexp.new("hello")
+        obj.instance_variable_set(:@regexp_ivar, [42])
+
+        new_obj = Marshal.send(@method, "\x04\bI/\nhello\x00\a:\x06EF:\x11@regexp_ivar[\x06i/")
+        new_obj.instance_variables.should == [:@regexp_ivar]
+        new_obj.instance_variable_get(:@regexp_ivar).should == [42]
+      end
+    end
+
+    it "loads a Regexp subclass instance variables" do
+      obj = UserRegexp.new('abc')
+      obj.instance_variable_set(:@noise, 'much')
+
+      new_obj = Marshal.send(@method, Marshal.dump(obj))
 
       new_obj.should == obj
+      new_obj.instance_variable_get(:@noise).should == 'much'
       new_obj_metaclass_ancestors = class << new_obj; ancestors; end
-      new_obj_metaclass_ancestors[@num_self_class, 3].should ==
-        [Meths, MethsMore, Regexp]
+      new_obj_metaclass_ancestors[@num_self_class, 2].should ==
+        [UserRegexp, Regexp]
     end
 
     it "loads a Regexp subclass instance variables when it is extended with a module" do
@@ -924,15 +962,6 @@ def io.binmode; raise "binmode"; end
         [Meths, UserRegexp, Regexp]
     end
 
-    it "restore the regexp instance variables" do
-      obj = Regexp.new("hello")
-      obj.instance_variable_set(:@regexp_ivar, [42])
-
-      new_obj = Marshal.send(@method, "\x04\bI/\nhello\x00\a:\x06EF:\x11@regexp_ivar[\x06i/")
-      new_obj.instance_variables.should == [:@regexp_ivar]
-      new_obj.instance_variable_get(:@regexp_ivar).should == [42]
-    end
-
     it "preserves Regexp encoding" do
       source_object = Regexp.new("a".encode("utf-32le"))
       regexp = Marshal.send(@method, Marshal.dump(source_object))
@@ -946,7 +975,7 @@ def io.binmode; raise "binmode"; end
 
       -> {
         Marshal.send(@method, "\x04\bI/\x10hel")
-      }.should raise_error(ArgumentError, "marshal data too short")
+      }.should.raise(ArgumentError, "marshal data too short")
     end
   end
 
@@ -975,7 +1004,7 @@ def io.binmode; raise "binmode"; end
 
       -> {
         Marshal.send(@method, "\004\bf\v1")
-      }.should raise_error(ArgumentError, "marshal data too short")
+      }.should.raise(ArgumentError, "marshal data too short")
     end
   end
 
@@ -1029,7 +1058,7 @@ def io.binmode; raise "binmode"; end
        "\004\bi\004\0",
        "\004\bi\004\0\0",
        "\004\bi\004\0\0\0"].each do |invalid|
-        -> { Marshal.send(@method, invalid) }.should raise_error(ArgumentError)
+        -> { Marshal.send(@method, invalid) }.should.raise(ArgumentError)
       end
     end
 
@@ -1090,7 +1119,7 @@ def io.binmode; raise "binmode"; end
       t = Time.new
 
       t1, t2 = Marshal.send(@method, Marshal.dump([t, t]))
-      t1.should equal t2
+      t1.should.equal? t2
     end
 
     it "keeps the local zone" do
@@ -1138,19 +1167,19 @@ def io.binmode; raise "binmode"; end
 
   describe "for nil" do
     it "loads" do
-      Marshal.send(@method, "\x04\b0").should be_nil
+      Marshal.send(@method, "\x04\b0").should == nil
     end
   end
 
   describe "for true" do
     it "loads" do
-      Marshal.send(@method, "\x04\bT").should be_true
+      Marshal.send(@method, "\x04\bT").should == true
     end
   end
 
   describe "for false" do
     it "loads" do
-      Marshal.send(@method, "\x04\bF").should be_false
+      Marshal.send(@method, "\x04\bF").should == false
     end
   end
 
@@ -1160,11 +1189,11 @@ def io.binmode; raise "binmode"; end
     end
 
     it "raises ArgumentError if given the name of a non-Module" do
-      -> { Marshal.send(@method, "\x04\bc\vKernel") }.should raise_error(ArgumentError)
+      -> { Marshal.send(@method, "\x04\bc\vKernel") }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if given a nonexistent class" do
-      -> { Marshal.send(@method, "\x04\bc\vStrung") }.should raise_error(ArgumentError)
+      -> { Marshal.send(@method, "\x04\bc\vStrung") }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError when end of byte sequence reached before class name end" do
@@ -1172,7 +1201,7 @@ def io.binmode; raise "binmode"; end
 
       -> {
         Marshal.send(@method, "\x04\bc\vStr")
-      }.should raise_error(ArgumentError, "marshal data too short")
+      }.should.raise(ArgumentError, "marshal data too short")
     end
   end
 
@@ -1182,7 +1211,7 @@ def io.binmode; raise "binmode"; end
     end
 
     it "raises ArgumentError if given the name of a non-Class" do
-      -> { Marshal.send(@method, "\x04\bm\vString") }.should raise_error(ArgumentError)
+      -> { Marshal.send(@method, "\x04\bm\vString") }.should.raise(ArgumentError)
     end
 
     it "loads an old module" do
@@ -1194,7 +1223,7 @@ def io.binmode; raise "binmode"; end
 
       -> {
         Marshal.send(@method, "\x04\bm\vKer")
-      }.should raise_error(ArgumentError, "marshal data too short")
+      }.should.raise(ArgumentError, "marshal data too short")
     end
   end
 
@@ -1229,13 +1258,13 @@ def _dump_data
 
       data = "\x04\bd:\x1AUnloadableDumpableDirI\"\x06.\x06:\x06ET"
 
-      -> { Marshal.send(@method, data) }.should raise_error(TypeError)
+      -> { Marshal.send(@method, data) }.should.raise(TypeError)
     end
 
     it "raises ArgumentError when the local class is a regular object" do
       data = "\004\bd:\020UserDefined\0"
 
-      -> { Marshal.send(@method, data) }.should raise_error(ArgumentError)
+      -> { Marshal.send(@method, data) }.should.raise(ArgumentError)
     end
   end
 
@@ -1248,7 +1277,7 @@ def _dump_data
 
     it "raises an ArgumentError" do
       message = "undefined class/module NamespaceTest::SameName"
-      -> { Marshal.send(@method, @data) }.should raise_error(ArgumentError, message)
+      -> { Marshal.send(@method, @data) }.should.raise(ArgumentError, message)
     end
   end
 
@@ -1257,6 +1286,6 @@ def _dump_data
     @data = Marshal.dump(NamespaceTest::KaBoom.new)
     NamespaceTest.send(:remove_const, :KaBoom)
 
-    -> { Marshal.send(@method, @data) }.should raise_error(ArgumentError, /NamespaceTest::KaBoom/)
+    -> { Marshal.send(@method, @data) }.should.raise(ArgumentError, /NamespaceTest::KaBoom/)
   end
 end
diff --git a/spec/ruby/core/matchdata/allocate_spec.rb b/spec/ruby/core/matchdata/allocate_spec.rb
index 142ce639c20..f41e2d54810 100644
--- a/spec/ruby/core/matchdata/allocate_spec.rb
+++ b/spec/ruby/core/matchdata/allocate_spec.rb
@@ -3,6 +3,6 @@
 describe "MatchData.allocate" do
   it "is undefined" do
     # https://bugs.ruby-lang.org/issues/16294
-    -> { MatchData.allocate }.should raise_error(NoMethodError)
+    -> { MatchData.allocate }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/matchdata/begin_spec.rb b/spec/ruby/core/matchdata/begin_spec.rb
index 54b4e0a33fe..b4be077ae41 100644
--- a/spec/ruby/core/matchdata/begin_spec.rb
+++ b/spec/ruby/core/matchdata/begin_spec.rb
@@ -12,7 +12,7 @@
 
     it "returns nil when the nth match isn't found" do
       match_data = /something is( not)? (right)/.match("something is right")
-      match_data.begin(1).should be_nil
+      match_data.begin(1).should == nil
     end
 
     it "returns the character offset for multi-byte strings" do
@@ -42,11 +42,11 @@
 
       -> {
         match_data.begin(-1)
-      }.should raise_error(IndexError, "index -1 out of matches")
+      }.should.raise(IndexError, "index -1 out of matches")
 
       -> {
         match_data.begin(3)
-      }.should raise_error(IndexError, "index 3 out of matches")
+      }.should.raise(IndexError, "index 3 out of matches")
     end
   end
 
@@ -86,7 +86,7 @@
 
       -> {
         match_data.begin("y")
-      }.should raise_error(IndexError, "undefined group name reference: y")
+      }.should.raise(IndexError, "undefined group name reference: y")
     end
   end
 
@@ -126,7 +126,7 @@
 
       -> {
         match_data.begin(:y)
-      }.should raise_error(IndexError, "undefined group name reference: y")
+      }.should.raise(IndexError, "undefined group name reference: y")
     end
   end
 end
diff --git a/spec/ruby/core/matchdata/bytebegin_spec.rb b/spec/ruby/core/matchdata/bytebegin_spec.rb
index 08c1fd6d1ea..fa44ec3b41e 100644
--- a/spec/ruby/core/matchdata/bytebegin_spec.rb
+++ b/spec/ruby/core/matchdata/bytebegin_spec.rb
@@ -11,7 +11,7 @@
 
       it "returns nil when the nth match isn't found" do
         match_data = /something is( not)? (right)/.match("something is right")
-        match_data.bytebegin(1).should be_nil
+        match_data.bytebegin(1).should == nil
       end
 
       it "returns the byte-based offset for multi-byte strings" do
@@ -41,11 +41,11 @@
 
         -> {
           match_data.bytebegin(-1)
-        }.should raise_error(IndexError, "index -1 out of matches")
+        }.should.raise(IndexError, "index -1 out of matches")
 
         -> {
           match_data.bytebegin(3)
-        }.should raise_error(IndexError, "index 3 out of matches")
+        }.should.raise(IndexError, "index 3 out of matches")
       end
     end
 
@@ -85,7 +85,7 @@
 
         -> {
           match_data.bytebegin("y")
-        }.should raise_error(IndexError, "undefined group name reference: y")
+        }.should.raise(IndexError, "undefined group name reference: y")
       end
     end
 
@@ -125,7 +125,7 @@
 
         -> {
           match_data.bytebegin(:y)
-        }.should raise_error(IndexError, "undefined group name reference: y")
+        }.should.raise(IndexError, "undefined group name reference: y")
       end
     end
   end
diff --git a/spec/ruby/core/matchdata/byteend_spec.rb b/spec/ruby/core/matchdata/byteend_spec.rb
index 98015e287d5..e77cbf8b0d8 100644
--- a/spec/ruby/core/matchdata/byteend_spec.rb
+++ b/spec/ruby/core/matchdata/byteend_spec.rb
@@ -11,7 +11,7 @@
 
       it "returns nil when the nth match isn't found" do
         match_data = /something is( not)? (right)/.match("something is right")
-        match_data.byteend(1).should be_nil
+        match_data.byteend(1).should == nil
       end
 
       it "returns the byte-based offset for multi-byte strings" do
diff --git a/spec/ruby/core/matchdata/byteoffset_spec.rb b/spec/ruby/core/matchdata/byteoffset_spec.rb
index fb8f5fb67d4..062e84027cc 100644
--- a/spec/ruby/core/matchdata/byteoffset_spec.rb
+++ b/spec/ruby/core/matchdata/byteoffset_spec.rb
@@ -64,11 +64,11 @@ def obj.to_int; 2; end
 
     -> {
       m.byteoffset("y")
-    }.should raise_error(IndexError, "undefined group name reference: y")
+    }.should.raise(IndexError, "undefined group name reference: y")
 
     -> {
       m.byteoffset(:y)
-    }.should raise_error(IndexError, "undefined group name reference: y")
+    }.should.raise(IndexError, "undefined group name reference: y")
   end
 
   it "raises IndexError if index is out of bounds" do
@@ -76,11 +76,11 @@ def obj.to_int; 2; end
 
     -> {
       m.byteoffset(-1)
-    }.should raise_error(IndexError, "index -1 out of matches")
+    }.should.raise(IndexError, "index -1 out of matches")
 
     -> {
       m.byteoffset(3)
-    }.should raise_error(IndexError, "index 3 out of matches")
+    }.should.raise(IndexError, "index 3 out of matches")
   end
 
   it "raises TypeError if can't convert argument into Integer" do
@@ -88,6 +88,6 @@ def obj.to_int; 2; end
 
     -> {
       m.byteoffset([])
-    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+    }.should.raise(TypeError, "no implicit conversion of Array into Integer")
   end
 end
diff --git a/spec/ruby/core/matchdata/deconstruct_keys_spec.rb b/spec/ruby/core/matchdata/deconstruct_keys_spec.rb
index bf22bc33ff7..9126d203944 100644
--- a/spec/ruby/core/matchdata/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/matchdata/deconstruct_keys_spec.rb
@@ -18,16 +18,16 @@
 
     -> {
       m.deconstruct_keys
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 0, expected 1)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 0, expected 1)")
   end
 
   it "it raises error when argument is neither nil nor array" do
     m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-    -> { m.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array)")
-    -> { m.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array)")
-    -> { m.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array)")
-    -> { m.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array)")
+    -> { m.deconstruct_keys(1) }.should.raise(TypeError, "wrong argument type Integer (expected Array)")
+    -> { m.deconstruct_keys("asd") }.should.raise(TypeError, "wrong argument type String (expected Array)")
+    -> { m.deconstruct_keys(:x) }.should.raise(TypeError, "wrong argument type Symbol (expected Array)")
+    -> { m.deconstruct_keys({}) }.should.raise(TypeError, "wrong argument type Hash (expected Array)")
   end
 
   it "returns {} when passed []" do
@@ -41,7 +41,7 @@
 
     -> {
       m.deconstruct_keys(['year', :foo])
-    }.should raise_error(TypeError, "wrong argument type String (expected Symbol)")
+    }.should.raise(TypeError, "wrong argument type String (expected Symbol)")
   end
 
   it "process keys till the first non-existing one" do
@@ -60,4 +60,19 @@
     m = /(?<f>foo)(?<b>bar)/.match("foobar")
     m.deconstruct_keys([:f, :b, :c]).should == {}
   end
+
+  it "includes non-participating captures as nil for nil argument" do
+    m = "hello".match(/(?<a>hello)(?<b>world)?/)
+    m.deconstruct_keys(nil).should == { a: "hello", b: nil }
+  end
+
+  it "includes non-participating captures as nil for explicit keys" do
+    m = "hello".match(/(?<a>hello)(?<b>world)?/)
+    m.deconstruct_keys([:a, :b]).should == { a: "hello", b: nil }
+  end
+
+  it "does not stop iterating at a non-participating capture" do
+    m = "hello!".match(/(?<a>hello)(?<b>world)?(?<c>!)/)
+    m.deconstruct_keys([:b, :c, :a]).should == { b: nil, c: "!", a: "hello" }
+  end
 end
diff --git a/spec/ruby/core/matchdata/element_reference_spec.rb b/spec/ruby/core/matchdata/element_reference_spec.rb
index 0924be0aaec..5509371cd21 100644
--- a/spec/ruby/core/matchdata/element_reference_spec.rb
+++ b/spec/ruby/core/matchdata/element_reference_spec.rb
@@ -55,7 +55,7 @@
 
   it "returns instances of String when given a String subclass" do
     str = MatchDataSpecs::MyString.new("THX1138.")
-    /(.)(.)(\d+)(\d)/.match(str)[0..-1].each { |m| m.should be_an_instance_of(String) }
+    /(.)(.)(\d+)(\d)/.match(str)[0..-1].each { |m| m.should.instance_of?(String) }
   end
 end
 
@@ -108,12 +108,12 @@
 
   it "raises an IndexError if there is no named match corresponding to the Symbol" do
     md = 'haystack'.match(/(?<t>t(?<a>ack))/)
-    -> { md[:baz] }.should raise_error(IndexError, /baz/)
+    -> { md[:baz] }.should.raise(IndexError, /baz/)
   end
 
   it "raises an IndexError if there is no named match corresponding to the String" do
     md = 'haystack'.match(/(?<t>t(?<a>ack))/)
-    -> { md['baz'] }.should raise_error(IndexError, /baz/)
+    -> { md['baz'] }.should.raise(IndexError, /baz/)
   end
 
   it "returns matches in the String's encoding" do
diff --git a/spec/ruby/core/matchdata/end_spec.rb b/spec/ruby/core/matchdata/end_spec.rb
index d01b0a8b304..4fee24a763f 100644
--- a/spec/ruby/core/matchdata/end_spec.rb
+++ b/spec/ruby/core/matchdata/end_spec.rb
@@ -12,7 +12,7 @@
 
     it "returns nil when the nth match isn't found" do
       match_data = /something is( not)? (right)/.match("something is right")
-      match_data.end(1).should be_nil
+      match_data.end(1).should == nil
     end
 
     it "returns the character offset for multi-byte strings" do
diff --git a/spec/ruby/core/matchdata/inspect_spec.rb b/spec/ruby/core/matchdata/inspect_spec.rb
index 53152576770..cacbe10c5db 100644
--- a/spec/ruby/core/matchdata/inspect_spec.rb
+++ b/spec/ruby/core/matchdata/inspect_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "returns a String" do
-    @match_data.inspect.should be_kind_of(String)
+    @match_data.inspect.should.is_a?(String)
   end
 
   it "returns a human readable representation that contains entire matched string and the captures" do
diff --git a/spec/ruby/core/matchdata/integer_at_spec.rb b/spec/ruby/core/matchdata/integer_at_spec.rb
new file mode 100644
index 00000000000..65f73a7bee6
--- /dev/null
+++ b/spec/ruby/core/matchdata/integer_at_spec.rb
@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+
+require_relative '../../spec_helper'
+
+ruby_version_is "4.1" do
+  describe "MatchData#integer_at" do
+    it "converts the corresponding match to an Integer and returns it when given an Integer" do
+      md = /(\d{4})(\d{2})(\d{2})/.match("20260308")
+      md.integer_at(0).should == 20260308
+      md.integer_at(1).should == 2026
+      md.integer_at(2).should == 3
+    end
+
+    it "returns nil on non-matching index matches" do
+      md = /\b(\d)?\b/.match("THX1138.")
+      md.integer_at(1).should == nil
+    end
+
+    it "returns nil on non-integer matches" do
+      md = /(\w)?/.match("THX1138.")
+      md.integer_at(1).should == nil
+    end
+
+    it "converts the match to an Integer in the given base" do
+      md = /\w+/.match("0c")
+      md.integer_at(0).should == 0
+      md.integer_at(0, 16).should == 12
+    end
+
+    it "converts the match to an Integer in the prefix when given base is zero" do
+      /\w+/.match("010").integer_at(0, 0).should == 010
+      /\w+/.match("0x10").integer_at(0, 0).should == 0x10
+      /\w+/.match("0d10").integer_at(0, 0).should == 0d10
+      /\w+/.match("0o10").integer_at(0, 0).should == 0o10
+      /\w+/.match("0b10").integer_at(0, 0).should == 0b10
+    end
+  end
+end
diff --git a/spec/ruby/core/matchdata/names_spec.rb b/spec/ruby/core/matchdata/names_spec.rb
index 25ca06ced9f..dca15985b08 100644
--- a/spec/ruby/core/matchdata/names_spec.rb
+++ b/spec/ruby/core/matchdata/names_spec.rb
@@ -3,12 +3,12 @@
 describe "MatchData#names" do
   it "returns an Array" do
     md = 'haystack'.match(/(?<yellow>hay)/)
-    md.names.should be_an_instance_of(Array)
+    md.names.should.instance_of?(Array)
   end
 
   it "sets each element to a String" do
     'haystack'.match(/(?<yellow>hay)/).names.all? do |e|
-      e.should be_an_instance_of(String)
+      e.should.instance_of?(String)
     end
   end
 
diff --git a/spec/ruby/core/matchdata/offset_spec.rb b/spec/ruby/core/matchdata/offset_spec.rb
index a03d58aad15..5a923d6ce0e 100644
--- a/spec/ruby/core/matchdata/offset_spec.rb
+++ b/spec/ruby/core/matchdata/offset_spec.rb
@@ -73,11 +73,11 @@ def obj.to_int; 2; end
 
     -> {
       m.offset("y")
-    }.should raise_error(IndexError, "undefined group name reference: y")
+    }.should.raise(IndexError, "undefined group name reference: y")
 
     -> {
       m.offset(:y)
-    }.should raise_error(IndexError, "undefined group name reference: y")
+    }.should.raise(IndexError, "undefined group name reference: y")
   end
 
   it "raises IndexError if index is out of bounds" do
@@ -85,11 +85,11 @@ def obj.to_int; 2; end
 
     -> {
       m.offset(-1)
-    }.should raise_error(IndexError, "index -1 out of matches")
+    }.should.raise(IndexError, "index -1 out of matches")
 
     -> {
       m.offset(3)
-    }.should raise_error(IndexError, "index 3 out of matches")
+    }.should.raise(IndexError, "index 3 out of matches")
   end
 
   it "raises TypeError if can't convert argument into Integer" do
@@ -97,6 +97,6 @@ def obj.to_int; 2; end
 
     -> {
       m.offset([])
-    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+    }.should.raise(TypeError, "no implicit conversion of Array into Integer")
   end
 end
diff --git a/spec/ruby/core/matchdata/post_match_spec.rb b/spec/ruby/core/matchdata/post_match_spec.rb
index 7bfe6df119b..b50d637124d 100644
--- a/spec/ruby/core/matchdata/post_match_spec.rb
+++ b/spec/ruby/core/matchdata/post_match_spec.rb
@@ -9,16 +9,16 @@
 
   it "sets the encoding to the encoding of the source String" do
     str = "abc".dup.force_encoding Encoding::EUC_JP
-    str.match(/b/).post_match.encoding.should equal(Encoding::EUC_JP)
+    str.match(/b/).post_match.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "sets an empty result to the encoding of the source String" do
     str = "abc".dup.force_encoding Encoding::ISO_8859_1
-    str.match(/c/).post_match.encoding.should equal(Encoding::ISO_8859_1)
+    str.match(/c/).post_match.encoding.should.equal?(Encoding::ISO_8859_1)
   end
 
   it "returns an instance of String when given a String subclass" do
     str = MatchDataSpecs::MyString.new("THX1138: The Movie")
-    /(.)(.)(\d+)(\d)/.match(str).post_match.should be_an_instance_of(String)
+    /(.)(.)(\d+)(\d)/.match(str).post_match.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/core/matchdata/pre_match_spec.rb b/spec/ruby/core/matchdata/pre_match_spec.rb
index 2f1ba9b8f64..106612a4f70 100644
--- a/spec/ruby/core/matchdata/pre_match_spec.rb
+++ b/spec/ruby/core/matchdata/pre_match_spec.rb
@@ -9,16 +9,16 @@
 
   it "sets the encoding to the encoding of the source String" do
     str = "abc".dup.force_encoding Encoding::EUC_JP
-    str.match(/b/).pre_match.encoding.should equal(Encoding::EUC_JP)
+    str.match(/b/).pre_match.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "sets an empty result to the encoding of the source String" do
     str = "abc".dup.force_encoding Encoding::ISO_8859_1
-    str.match(/a/).pre_match.encoding.should equal(Encoding::ISO_8859_1)
+    str.match(/a/).pre_match.encoding.should.equal?(Encoding::ISO_8859_1)
   end
 
   it "returns an instance of String when given a String subclass" do
     str = MatchDataSpecs::MyString.new("THX1138: The Movie")
-    /(.)(.)(\d+)(\d)/.match(str).pre_match.should be_an_instance_of(String)
+    /(.)(.)(\d+)(\d)/.match(str).pre_match.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/core/matchdata/regexp_spec.rb b/spec/ruby/core/matchdata/regexp_spec.rb
index 099b59c5591..7dcb0e62db5 100644
--- a/spec/ruby/core/matchdata/regexp_spec.rb
+++ b/spec/ruby/core/matchdata/regexp_spec.rb
@@ -3,7 +3,7 @@
 describe "MatchData#regexp" do
   it "returns a Regexp object" do
     m = 'haystack'.match(/hay/)
-    m.regexp.should be_an_instance_of(Regexp)
+    m.regexp.should.instance_of?(Regexp)
   end
 
   it "returns the pattern used in the match" do
diff --git a/spec/ruby/core/matchdata/shared/captures.rb b/spec/ruby/core/matchdata/shared/captures.rb
index 33f834561af..de5870f543a 100644
--- a/spec/ruby/core/matchdata/shared/captures.rb
+++ b/spec/ruby/core/matchdata/shared/captures.rb
@@ -8,6 +8,6 @@
 
   it "returns instances of String when given a String subclass" do
     str = MatchDataSpecs::MyString.new("THX1138: The Movie")
-    /(.)(.)(\d+)(\d)/.match(str).send(@method).each { |c| c.should be_an_instance_of(String) }
+    /(.)(.)(\d+)(\d)/.match(str).send(@method).each { |c| c.should.instance_of?(String) }
   end
 end
diff --git a/spec/ruby/core/matchdata/shared/eql.rb b/spec/ruby/core/matchdata/shared/eql.rb
index e021baa1784..e4bb8797b7d 100644
--- a/spec/ruby/core/matchdata/shared/eql.rb
+++ b/spec/ruby/core/matchdata/shared/eql.rb
@@ -4,23 +4,23 @@
   it "returns true if both operands have equal target strings, patterns, and match positions" do
     a = 'haystack'.match(/hay/)
     b = 'haystack'.match(/hay/)
-    a.send(@method, b).should be_true
+    a.send(@method, b).should == true
   end
 
   it "returns false if the operands have different target strings" do
     a = 'hay'.match(/hay/)
     b = 'haystack'.match(/hay/)
-    a.send(@method, b).should be_false
+    a.send(@method, b).should == false
   end
 
   it "returns false if the operands have different patterns" do
     a = 'haystack'.match(/h.y/)
     b = 'haystack'.match(/hay/)
-    a.send(@method, b).should be_false
+    a.send(@method, b).should == false
   end
 
   it "returns false if the argument is not a MatchData object" do
     a = 'haystack'.match(/hay/)
-    a.send(@method, Object.new).should be_false
+    a.send(@method, Object.new).should == false
   end
 end
diff --git a/spec/ruby/core/matchdata/string_spec.rb b/spec/ruby/core/matchdata/string_spec.rb
index 952e9533184..50bbb5a64f0 100644
--- a/spec/ruby/core/matchdata/string_spec.rb
+++ b/spec/ruby/core/matchdata/string_spec.rb
@@ -14,7 +14,7 @@
 
   it "returns the same frozen string for every call" do
     md = /(.)(.)(\d+)(\d)/.match("THX1138.")
-    md.string.should equal(md.string)
+    md.string.should.equal?(md.string)
   end
 
   it "returns a frozen copy of the matched string for gsub!(String)" do
diff --git a/spec/ruby/core/matchdata/to_a_spec.rb b/spec/ruby/core/matchdata/to_a_spec.rb
index 4fa11ff6041..c77fc4ab37b 100644
--- a/spec/ruby/core/matchdata/to_a_spec.rb
+++ b/spec/ruby/core/matchdata/to_a_spec.rb
@@ -8,6 +8,6 @@
 
   it "returns instances of String when given a String subclass" do
     str = MatchDataSpecs::MyString.new("THX1138.")
-    /(.)(.)(\d+)(\d)/.match(str)[0..-1].to_a.each { |m| m.should be_an_instance_of(String) }
+    /(.)(.)(\d+)(\d)/.match(str)[0..-1].to_a.each { |m| m.should.instance_of?(String) }
   end
 end
diff --git a/spec/ruby/core/matchdata/to_s_spec.rb b/spec/ruby/core/matchdata/to_s_spec.rb
index cd1c4dbca28..cbcc5e8a214 100644
--- a/spec/ruby/core/matchdata/to_s_spec.rb
+++ b/spec/ruby/core/matchdata/to_s_spec.rb
@@ -8,6 +8,6 @@
 
   it "returns an instance of String when given a String subclass" do
     str = MatchDataSpecs::MyString.new("THX1138.")
-    /(.)(.)(\d+)(\d)/.match(str).to_s.should be_an_instance_of(String)
+    /(.)(.)(\d+)(\d)/.match(str).to_s.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/core/matchdata/values_at_spec.rb b/spec/ruby/core/matchdata/values_at_spec.rb
index 535719a2ee3..ba5b0e662cf 100644
--- a/spec/ruby/core/matchdata/values_at_spec.rb
+++ b/spec/ruby/core/matchdata/values_at_spec.rb
@@ -26,7 +26,7 @@
     end
 
     it "raises RangeError if any element of the range is negative and out of range" do
-      -> { /(.)(.)(\d+)(\d)/.match("THX1138: The Movie").values_at(-6..3) }.should raise_error(RangeError, "-6..3 out of range")
+      -> { /(.)(.)(\d+)(\d)/.match("THX1138: The Movie").values_at(-6..3) }.should.raise(RangeError, "-6..3 out of range")
     end
 
     it "supports endless Range" do
@@ -71,6 +71,6 @@
   it "fails when passed arguments of unsupported types" do
     -> {
       /(.)(.)(\d+)(\d)/.match("THX1138: The Movie").values_at(Object.new)
-    }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+    }.should.raise(TypeError, "no implicit conversion of Object into Integer")
   end
 end
diff --git a/spec/ruby/core/math/acos_spec.rb b/spec/ruby/core/math/acos_spec.rb
index 8b321ab29be..4649dc527c4 100644
--- a/spec/ruby/core/math/acos_spec.rb
+++ b/spec/ruby/core/math/acos_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns a float" do
-    Math.acos(1).should be_kind_of(Float )
+    Math.acos(1).should.is_a?(Float )
   end
 
   it "returns the arccosine of the argument" do
@@ -21,27 +21,27 @@
   end
 
   it "raises an Math::DomainError if the argument is greater than 1.0" do
-    -> { Math.acos(1.0001) }.should raise_error(Math::DomainError)
+    -> { Math.acos(1.0001) }.should.raise(Math::DomainError)
   end
 
   it "raises an Math::DomainError if the argument is less than -1.0" do
-    -> { Math.acos(-1.0001) }.should raise_error(Math::DomainError)
+    -> { Math.acos(-1.0001) }.should.raise(Math::DomainError)
   end
 
   it "raises a TypeError if the string argument cannot be coerced with Float()" do
-    -> { Math.acos("test") }.should raise_error(TypeError)
+    -> { Math.acos("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.acos(nan_value).nan?.should be_true
+    Math.acos(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.acos(MathSpecs::UserClass.new) }.should raise_error(TypeError)
+    -> { Math.acos(MathSpecs::UserClass.new) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.acos(nil) }.should raise_error(TypeError)
+    -> { Math.acos(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/acosh_spec.rb b/spec/ruby/core/math/acosh_spec.rb
index 6707de95d32..ccacda37e08 100644
--- a/spec/ruby/core/math/acosh_spec.rb
+++ b/spec/ruby/core/math/acosh_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.acosh" do
   it "returns a float" do
-    Math.acosh(1.0).should be_kind_of(Float)
+    Math.acosh(1.0).should.is_a?(Float)
   end
 
   it "returns the principle value of the inverse hyperbolic cosine of the argument" do
@@ -12,21 +12,21 @@
   end
 
   it "raises Math::DomainError if the passed argument is less than -1.0 or greater than 1.0" do
-    -> { Math.acosh(1.0 - TOLERANCE) }.should raise_error(Math::DomainError)
-    -> { Math.acosh(0) }.should raise_error(Math::DomainError)
-    -> { Math.acosh(-1.0) }.should raise_error(Math::DomainError)
+    -> { Math.acosh(1.0 - TOLERANCE) }.should.raise(Math::DomainError)
+    -> { Math.acosh(0) }.should.raise(Math::DomainError)
+    -> { Math.acosh(-1.0) }.should.raise(Math::DomainError)
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.acosh("test") }.should raise_error(TypeError)
+    -> { Math.acosh("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.acosh(nan_value).nan?.should be_true
+    Math.acosh(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.acosh(nil) }.should raise_error(TypeError)
+    -> { Math.acosh(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/asin_spec.rb b/spec/ruby/core/math/asin_spec.rb
index 3a674a1147a..1386bccc063 100644
--- a/spec/ruby/core/math/asin_spec.rb
+++ b/spec/ruby/core/math/asin_spec.rb
@@ -4,7 +4,7 @@
 # arcsine : (-1.0, 1.0) --> (-PI/2, PI/2)
 describe "Math.asin" do
   it "returns a float" do
-    Math.asin(1).should be_kind_of(Float)
+    Math.asin(1).should.is_a?(Float)
   end
 
   it "returns the arcsine of the argument" do
@@ -17,23 +17,23 @@
   end
 
   it "raises an Math::DomainError if the argument is greater than 1.0" do
-    -> { Math.asin(1.0001) }.should raise_error( Math::DomainError)
+    -> { Math.asin(1.0001) }.should.raise( Math::DomainError)
   end
 
   it "raises an Math::DomainError if the argument is less than -1.0" do
-    -> { Math.asin(-1.0001) }.should raise_error( Math::DomainError)
+    -> { Math.asin(-1.0001) }.should.raise( Math::DomainError)
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.asin("test") }.should raise_error(TypeError)
+    -> { Math.asin("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.asin(nan_value).nan?.should be_true
+    Math.asin(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.asin(nil) }.should raise_error(TypeError)
+    -> { Math.asin(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/asinh_spec.rb b/spec/ruby/core/math/asinh_spec.rb
index ff8210df0a1..8aa019f05f4 100644
--- a/spec/ruby/core/math/asinh_spec.rb
+++ b/spec/ruby/core/math/asinh_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.asinh" do
   it "returns a float" do
-    Math.asinh(1.5).should be_kind_of(Float)
+    Math.asinh(1.5).should.is_a?(Float)
   end
 
   it "returns the inverse hyperbolic sin of the argument" do
@@ -19,15 +19,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.asinh("test") }.should raise_error(TypeError)
+    -> { Math.asinh("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.asinh(nan_value).nan?.should be_true
+    Math.asinh(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.asinh(nil) }.should raise_error(TypeError)
+    -> { Math.asinh(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/atan2_spec.rb b/spec/ruby/core/math/atan2_spec.rb
index d4ef369d2af..1f1de506c58 100644
--- a/spec/ruby/core/math/atan2_spec.rb
+++ b/spec/ruby/core/math/atan2_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.atan2" do
   it "returns a float" do
-    Math.atan2(1.2, 0.5).should be_kind_of(Float)
+    Math.atan2(1.2, 0.5).should.is_a?(Float)
   end
 
   it "returns the arc tangent of y, x" do
@@ -14,15 +14,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.atan2(1.0, "test")    }.should raise_error(TypeError)
-    -> { Math.atan2("test", 0.0)    }.should raise_error(TypeError)
-    -> { Math.atan2("test", "this") }.should raise_error(TypeError)
+    -> { Math.atan2(1.0, "test")    }.should.raise(TypeError)
+    -> { Math.atan2("test", 0.0)    }.should.raise(TypeError)
+    -> { Math.atan2("test", "this") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.atan2(nil, 1.0)  }.should raise_error(TypeError)
-    -> { Math.atan2(-1.0, nil) }.should raise_error(TypeError)
-    -> { Math.atan2(nil, nil)  }.should raise_error(TypeError)
+    -> { Math.atan2(nil, 1.0)  }.should.raise(TypeError)
+    -> { Math.atan2(-1.0, nil) }.should.raise(TypeError)
+    -> { Math.atan2(nil, nil)  }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/atan_spec.rb b/spec/ruby/core/math/atan_spec.rb
index 15edf68c051..07d04cdf824 100644
--- a/spec/ruby/core/math/atan_spec.rb
+++ b/spec/ruby/core/math/atan_spec.rb
@@ -4,7 +4,7 @@
 # arctangent : (-Inf, Inf) --> (-PI/2, PI/2)
 describe "Math.atan" do
   it "returns a float" do
-    Math.atan(1).should be_kind_of(Float)
+    Math.atan(1).should.is_a?(Float)
   end
 
   it "returns the arctangent of the argument" do
@@ -17,15 +17,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.atan("test") }.should raise_error(TypeError)
+    -> { Math.atan("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.atan(nan_value).nan?.should be_true
+    Math.atan(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.atan(nil) }.should raise_error(TypeError)
+    -> { Math.atan(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/cbrt_spec.rb b/spec/ruby/core/math/cbrt_spec.rb
index 01cf923c71c..4e2383043b5 100644
--- a/spec/ruby/core/math/cbrt_spec.rb
+++ b/spec/ruby/core/math/cbrt_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.cbrt" do
   it "returns a float" do
-    Math.cbrt(1).should be_an_instance_of(Float)
+    Math.cbrt(1).should.instance_of?(Float)
   end
 
   it "returns the cubic root of the argument" do
@@ -14,11 +14,11 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.cbrt("foobar") }.should raise_error(TypeError)
+    -> { Math.cbrt("foobar") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.cbrt(nil) }.should raise_error(TypeError)
+    -> { Math.cbrt(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/cos_spec.rb b/spec/ruby/core/math/cos_spec.rb
index 006afeb2ccb..e8602cde3c3 100644
--- a/spec/ruby/core/math/cos_spec.rb
+++ b/spec/ruby/core/math/cos_spec.rb
@@ -4,7 +4,7 @@
 # cosine : (-Inf, Inf) --> (-1.0, 1.0)
 describe "Math.cos" do
   it "returns a float" do
-    Math.cos(Math::PI).should be_kind_of(Float)
+    Math.cos(Math::PI).should.is_a?(Float)
   end
 
   it "returns the cosine of the argument expressed in radians" do
@@ -16,11 +16,11 @@
   end
 
   it "raises a TypeError unless the argument is Numeric and has #to_f" do
-    -> { Math.cos("test") }.should raise_error(TypeError)
+    -> { Math.cos("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.cos(nan_value).nan?.should be_true
+    Math.cos(nan_value).nan?.should == true
   end
 
   describe "coerces its argument with #to_f" do
@@ -31,14 +31,14 @@
     end
 
     it "raises a TypeError if the given argument can't be converted to a Float" do
-      -> { Math.cos(nil) }.should raise_error(TypeError)
-      -> { Math.cos(:abc) }.should raise_error(TypeError)
+      -> { Math.cos(nil) }.should.raise(TypeError)
+      -> { Math.cos(:abc) }.should.raise(TypeError)
     end
 
     it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to a Float" do
       object = mock_numeric('mock-float')
       object.should_receive(:to_f).and_raise(NoMethodError)
-      -> { Math.cos(object) }.should raise_error(NoMethodError)
+      -> { Math.cos(object) }.should.raise(NoMethodError)
     end
   end
 end
diff --git a/spec/ruby/core/math/cosh_spec.rb b/spec/ruby/core/math/cosh_spec.rb
index 049e117e56e..2093d8a74a1 100644
--- a/spec/ruby/core/math/cosh_spec.rb
+++ b/spec/ruby/core/math/cosh_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.cosh" do
   it "returns a float" do
-    Math.cosh(1.0).should be_kind_of(Float)
+    Math.cosh(1.0).should.is_a?(Float)
   end
 
   it "returns the hyperbolic cosine of the argument" do
@@ -14,15 +14,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.cosh("test") }.should raise_error(TypeError)
+    -> { Math.cosh("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.cosh(nan_value).nan?.should be_true
+    Math.cosh(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.cosh(nil) }.should raise_error(TypeError)
+    -> { Math.cosh(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/erf_spec.rb b/spec/ruby/core/math/erf_spec.rb
index b4e6248e43d..5384e73ae98 100644
--- a/spec/ruby/core/math/erf_spec.rb
+++ b/spec/ruby/core/math/erf_spec.rb
@@ -5,7 +5,7 @@
 # distribution (which is a normalized form of the Gaussian function).
 describe "Math.erf" do
   it "returns a float" do
-    Math.erf(1).should be_kind_of(Float)
+    Math.erf(1).should.is_a?(Float)
   end
 
   it "returns the error function of the argument" do
@@ -21,15 +21,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.erf("test") }.should raise_error(TypeError)
+    -> { Math.erf("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.erf(nan_value).nan?.should be_true
+    Math.erf(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.erf(nil) }.should raise_error(TypeError)
+    -> { Math.erf(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/erfc_spec.rb b/spec/ruby/core/math/erfc_spec.rb
index e465f5cf586..4e09a68d1ef 100644
--- a/spec/ruby/core/math/erfc_spec.rb
+++ b/spec/ruby/core/math/erfc_spec.rb
@@ -4,7 +4,7 @@
 # erfc is the complementary error function
 describe "Math.erfc" do
   it "returns a float" do
-    Math.erf(1).should be_kind_of(Float)
+    Math.erf(1).should.is_a?(Float)
   end
 
   it "returns the complementary error function of the argument" do
@@ -20,15 +20,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.erfc("test") }.should raise_error(TypeError)
+    -> { Math.erfc("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.erfc(nan_value).nan?.should be_true
+    Math.erfc(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.erfc(nil) }.should raise_error(TypeError)
+    -> { Math.erfc(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/exp_spec.rb b/spec/ruby/core/math/exp_spec.rb
index 36eb49a8c71..3688482457e 100644
--- a/spec/ruby/core/math/exp_spec.rb
+++ b/spec/ruby/core/math/exp_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.exp" do
   it "returns a float" do
-    Math.exp(1.0).should be_kind_of(Float)
+    Math.exp(1.0).should.is_a?(Float)
   end
 
   it "returns the base-e exponential of the argument" do
@@ -14,15 +14,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.exp("test") }.should raise_error(TypeError)
+    -> { Math.exp("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.exp(nan_value).nan?.should be_true
+    Math.exp(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.exp(nil) }.should raise_error(TypeError)
+    -> { Math.exp(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/expm1_spec.rb b/spec/ruby/core/math/expm1_spec.rb
index 5725319abbb..35f62b5dbd4 100644
--- a/spec/ruby/core/math/expm1_spec.rb
+++ b/spec/ruby/core/math/expm1_spec.rb
@@ -13,15 +13,15 @@
     end
 
     it "raises a TypeError if the argument cannot be coerced with Float()" do
-      -> { Math.expm1("test") }.should raise_error(TypeError, "can't convert String into Float")
+      -> { Math.expm1("test") }.should.raise(TypeError, "can't convert String into Float")
     end
 
     it "returns NaN given NaN" do
-      Math.expm1(nan_value).nan?.should be_true
+      Math.expm1(nan_value).nan?.should == true
     end
 
     it "raises a TypeError if the argument is nil" do
-      -> { Math.expm1(nil) }.should raise_error(TypeError, "can't convert nil into Float")
+      -> { Math.expm1(nil) }.should.raise(TypeError, "can't convert nil into Float")
     end
 
     it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/frexp_spec.rb b/spec/ruby/core/math/frexp_spec.rb
index 7dfb493d20a..6853e4672fe 100644
--- a/spec/ruby/core/math/frexp_spec.rb
+++ b/spec/ruby/core/math/frexp_spec.rb
@@ -9,16 +9,16 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.frexp("test") }.should raise_error(TypeError)
+    -> { Math.frexp("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
     frac, _exp = Math.frexp(nan_value)
-    frac.nan?.should be_true
+    frac.nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.frexp(nil) }.should raise_error(TypeError)
+    -> { Math.frexp(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/gamma_spec.rb b/spec/ruby/core/math/gamma_spec.rb
index 386162a0875..9a0b14448a7 100644
--- a/spec/ruby/core/math/gamma_spec.rb
+++ b/spec/ruby/core/math/gamma_spec.rb
@@ -51,7 +51,7 @@
   end
 
   it "raises Math::DomainError given -1" do
-    -> { Math.gamma(-1) }.should raise_error(Math::DomainError)
+    -> { Math.gamma(-1) }.should.raise(Math::DomainError)
   end
 
   # See https://bugs.ruby-lang.org/issues/10642
@@ -60,10 +60,10 @@
   end
 
   it "raises Math::DomainError given negative infinity" do
-    -> { Math.gamma(-Float::INFINITY) }.should raise_error(Math::DomainError)
+    -> { Math.gamma(-Float::INFINITY) }.should.raise(Math::DomainError)
   end
 
   it "returns NaN given NaN" do
-    Math.gamma(nan_value).nan?.should be_true
+    Math.gamma(nan_value).nan?.should == true
   end
 end
diff --git a/spec/ruby/core/math/hypot_spec.rb b/spec/ruby/core/math/hypot_spec.rb
index 3e0ce745974..4ab5bd4e88b 100644
--- a/spec/ruby/core/math/hypot_spec.rb
+++ b/spec/ruby/core/math/hypot_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.hypot" do
   it "returns a float" do
-    Math.hypot(3, 4).should be_kind_of(Float)
+    Math.hypot(3, 4).should.is_a?(Float)
   end
 
   it "returns the length of the hypotenuse of a right triangle with legs given by the arguments" do
@@ -16,17 +16,17 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.hypot("test", "this") }.should raise_error(TypeError)
+    -> { Math.hypot("test", "this") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.hypot(nan_value, 0).nan?.should be_true
-    Math.hypot(0, nan_value).nan?.should be_true
-    Math.hypot(nan_value, nan_value).nan?.should be_true
+    Math.hypot(nan_value, 0).nan?.should == true
+    Math.hypot(0, nan_value).nan?.should == true
+    Math.hypot(nan_value, nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.hypot(nil, nil) }.should raise_error(TypeError)
+    -> { Math.hypot(nil, nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/ldexp_spec.rb b/spec/ruby/core/math/ldexp_spec.rb
index 6dcf94a663c..1864b7455ad 100644
--- a/spec/ruby/core/math/ldexp_spec.rb
+++ b/spec/ruby/core/math/ldexp_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.ldexp" do
   it "returns a float" do
-    Math.ldexp(1.0, 2).should be_kind_of(Float)
+    Math.ldexp(1.0, 2).should.is_a?(Float)
   end
 
   it "returns the argument multiplied by 2**n" do
@@ -15,27 +15,27 @@
   end
 
   it "raises a TypeError if the first argument cannot be coerced with Float()" do
-    -> { Math.ldexp("test", 2) }.should raise_error(TypeError)
+    -> { Math.ldexp("test", 2) }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.ldexp(nan_value, 0).nan?.should be_true
+    Math.ldexp(nan_value, 0).nan?.should == true
   end
 
   it "raises RangeError if NaN is given as the second arg" do
-    -> { Math.ldexp(0, nan_value) }.should raise_error(RangeError)
+    -> { Math.ldexp(0, nan_value) }.should.raise(RangeError)
   end
 
   it "raises a TypeError if the second argument cannot be coerced with Integer()" do
-    -> { Math.ldexp(3.2, "this") }.should raise_error(TypeError)
+    -> { Math.ldexp(3.2, "this") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the first argument is nil" do
-    -> { Math.ldexp(nil, 2) }.should raise_error(TypeError)
+    -> { Math.ldexp(nil, 2) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the second argument is nil" do
-    -> { Math.ldexp(3.1, nil) }.should raise_error(TypeError)
+    -> { Math.ldexp(3.1, nil) }.should.raise(TypeError)
   end
 
   it "accepts any first argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/lgamma_spec.rb b/spec/ruby/core/math/lgamma_spec.rb
index 2bf350993e5..38f07d0bf87 100644
--- a/spec/ruby/core/math/lgamma_spec.rb
+++ b/spec/ruby/core/math/lgamma_spec.rb
@@ -38,7 +38,7 @@
   end
 
   it "raises Math::DomainError when passed -Infinity" do
-    -> { Math.lgamma(-infinity_value) }.should raise_error(Math::DomainError)
+    -> { Math.lgamma(-infinity_value) }.should.raise(Math::DomainError)
   end
 
   it "returns [Infinity, 1] when passed Infinity" do
diff --git a/spec/ruby/core/math/log10_spec.rb b/spec/ruby/core/math/log10_spec.rb
index f3bd7fd4b86..7576a670027 100644
--- a/spec/ruby/core/math/log10_spec.rb
+++ b/spec/ruby/core/math/log10_spec.rb
@@ -4,7 +4,7 @@
 # The common logarithm, having base 10
 describe "Math.log10" do
   it "returns a float" do
-    Math.log10(1).should be_kind_of(Float)
+    Math.log10(1).should.is_a?(Float)
   end
 
   it "returns the base-10 logarithm of the argument" do
@@ -16,23 +16,23 @@
   end
 
   it "raises an Math::DomainError if the argument is less than 0" do
-    -> { Math.log10(-1e-15) }.should raise_error(Math::DomainError)
+    -> { Math.log10(-1e-15) }.should.raise(Math::DomainError)
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.log10("test") }.should raise_error(TypeError)
+    -> { Math.log10("test") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed a numerical argument as a string" do
-    -> { Math.log10("1.0") }.should raise_error(TypeError)
+    -> { Math.log10("1.0") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.log10(nan_value).nan?.should be_true
+    Math.log10(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.log10(nil) }.should raise_error(TypeError)
+    -> { Math.log10(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/log1p_spec.rb b/spec/ruby/core/math/log1p_spec.rb
index 216358a3c47..181b462dede 100644
--- a/spec/ruby/core/math/log1p_spec.rb
+++ b/spec/ruby/core/math/log1p_spec.rb
@@ -13,27 +13,27 @@
     end
 
     it "raises an Math::DomainError if the argument is less than 1" do
-      -> { Math.log1p(-1-1e-15) }.should raise_error(Math::DomainError, "Numerical argument is out of domain - log1p")
+      -> { Math.log1p(-1-1e-15) }.should.raise(Math::DomainError, "Numerical argument is out of domain - log1p")
     end
 
     it "raises a TypeError if the argument cannot be coerced with Float()" do
-      -> { Math.log1p("test") }.should raise_error(TypeError, "can't convert String into Float")
+      -> { Math.log1p("test") }.should.raise(TypeError, "can't convert String into Float")
     end
 
     it "raises a TypeError for numerical values passed as string" do
-      -> { Math.log1p("10") }.should raise_error(TypeError, "can't convert String into Float")
+      -> { Math.log1p("10") }.should.raise(TypeError, "can't convert String into Float")
     end
 
     it "does not accept a second argument for the base" do
-      -> { Math.log1p(9, 3) }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+      -> { Math.log1p(9, 3) }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 1)")
     end
 
     it "returns NaN given NaN" do
-      Math.log1p(nan_value).nan?.should be_true
+      Math.log1p(nan_value).nan?.should == true
     end
 
     it "raises a TypeError if the argument is nil" do
-      -> { Math.log1p(nil) }.should raise_error(TypeError, "can't convert nil into Float")
+      -> { Math.log1p(nil) }.should.raise(TypeError, "can't convert nil into Float")
     end
 
     it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/log2_spec.rb b/spec/ruby/core/math/log2_spec.rb
index 3d4d41d1305..e38a8bb67fa 100644
--- a/spec/ruby/core/math/log2_spec.rb
+++ b/spec/ruby/core/math/log2_spec.rb
@@ -16,23 +16,23 @@
   end
 
   it "raises Math::DomainError if the argument is less than 0" do
-    -> { Math.log2(-1e-15) }.should raise_error( Math::DomainError)
+    -> { Math.log2(-1e-15) }.should.raise( Math::DomainError)
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.log2("test") }.should raise_error(TypeError)
+    -> { Math.log2("test") }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed a numerical argument as a string" do
-    -> { Math.log2("1.0") }.should raise_error(TypeError)
+    -> { Math.log2("1.0") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.log2(nan_value).nan?.should be_true
+    Math.log2(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.log2(nil) }.should raise_error(TypeError)
+    -> { Math.log2(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/log_spec.rb b/spec/ruby/core/math/log_spec.rb
index 6c5036ba81c..7e0bc13bc62 100644
--- a/spec/ruby/core/math/log_spec.rb
+++ b/spec/ruby/core/math/log_spec.rb
@@ -4,7 +4,7 @@
 # The natural logarithm, having base Math::E
 describe "Math.log" do
   it "returns a float" do
-    Math.log(1).should be_kind_of(Float)
+    Math.log(1).should.is_a?(Float)
   end
 
   it "returns the natural logarithm of the argument" do
@@ -16,15 +16,15 @@
   end
 
   it "raises an Math::DomainError if the argument is less than 0" do
-    -> { Math.log(-1e-15) }.should raise_error(Math::DomainError)
+    -> { Math.log(-1e-15) }.should.raise(Math::DomainError)
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.log("test") }.should raise_error(TypeError)
+    -> { Math.log("test") }.should.raise(TypeError)
   end
 
   it "raises a TypeError for numerical values passed as string" do
-    -> { Math.log("10") }.should raise_error(TypeError)
+    -> { Math.log("10") }.should.raise(TypeError)
   end
 
   it "accepts a second argument for the base" do
@@ -33,16 +33,16 @@
   end
 
   it "raises a TypeError when the numerical base cannot be coerced to a float" do
-    -> { Math.log(10, "2") }.should raise_error(TypeError)
-    -> { Math.log(10, nil) }.should raise_error(TypeError)
+    -> { Math.log(10, "2") }.should.raise(TypeError)
+    -> { Math.log(10, nil) }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.log(nan_value).nan?.should be_true
+    Math.log(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.log(nil) }.should raise_error(TypeError)
+    -> { Math.log(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/shared/atanh.rb b/spec/ruby/core/math/shared/atanh.rb
index 3fb64153a0c..48a6bf836eb 100644
--- a/spec/ruby/core/math/shared/atanh.rb
+++ b/spec/ruby/core/math/shared/atanh.rb
@@ -1,6 +1,6 @@
 describe :math_atanh_base, shared: true do
   it "returns a float" do
-    @object.send(@method, 0.5).should be_an_instance_of(Float)
+    @object.send(@method, 0.5).should.instance_of?(Float)
   end
 
   it "returns the inverse hyperbolic tangent of the argument" do
@@ -11,11 +11,11 @@
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { @object.send(@method, nil) }.should raise_error(TypeError)
+    -> { @object.send(@method, nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the argument is not a Numeric" do
-    -> { @object.send(@method, "test") }.should raise_error(TypeError)
+    -> { @object.send(@method, "test") }.should.raise(TypeError)
   end
 
   it "returns Infinity if x == 1.0" do
@@ -29,16 +29,16 @@
 
 describe :math_atanh_private, shared: true do
   it "is a private instance method" do
-    Math.should have_private_instance_method(@method)
+    Math.private_instance_methods(false).should.include?(@method)
   end
 end
 
 describe :math_atanh_no_complex, shared: true do
   it "raises a Math::DomainError for arguments greater than 1.0" do
-    -> { @object.send(@method, 1.0 + Float::EPSILON)  }.should raise_error(Math::DomainError)
+    -> { @object.send(@method, 1.0 + Float::EPSILON)  }.should.raise(Math::DomainError)
   end
 
   it "raises a Math::DomainError for arguments less than -1.0" do
-    -> { @object.send(@method, -1.0 - Float::EPSILON) }.should raise_error(Math::DomainError)
+    -> { @object.send(@method, -1.0 - Float::EPSILON) }.should.raise(Math::DomainError)
   end
 end
diff --git a/spec/ruby/core/math/sin_spec.rb b/spec/ruby/core/math/sin_spec.rb
index 8e944bc95fc..a9479e3aec5 100644
--- a/spec/ruby/core/math/sin_spec.rb
+++ b/spec/ruby/core/math/sin_spec.rb
@@ -4,7 +4,7 @@
 # sine : (-Inf, Inf) --> (-1.0, 1.0)
 describe "Math.sin" do
   it "returns a float" do
-    Math.sin(Math::PI).should be_kind_of(Float)
+    Math.sin(Math::PI).should.is_a?(Float)
   end
 
   it "returns the sine of the argument expressed in radians" do
@@ -16,15 +16,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.sin("test") }.should raise_error(TypeError)
+    -> { Math.sin("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.sin(nan_value).nan?.should be_true
+    Math.sin(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.sin(nil) }.should raise_error(TypeError)
+    -> { Math.sin(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/sinh_spec.rb b/spec/ruby/core/math/sinh_spec.rb
index 027c2395a71..de0f06affaf 100644
--- a/spec/ruby/core/math/sinh_spec.rb
+++ b/spec/ruby/core/math/sinh_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.sinh" do
   it "returns a float" do
-    Math.sinh(1.2).should be_kind_of(Float)
+    Math.sinh(1.2).should.is_a?(Float)
   end
 
   it "returns the hyperbolic sin of the argument" do
@@ -14,15 +14,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.sinh("test") }.should raise_error(TypeError)
+    -> { Math.sinh("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.sinh(nan_value).nan?.should be_true
+    Math.sinh(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.sinh(nil) }.should raise_error(TypeError)
+    -> { Math.sinh(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/sqrt_spec.rb b/spec/ruby/core/math/sqrt_spec.rb
index 918e7c3a17e..545fa4d1c26 100644
--- a/spec/ruby/core/math/sqrt_spec.rb
+++ b/spec/ruby/core/math/sqrt_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.sqrt" do
   it "returns a float" do
-    Math.sqrt(1).should be_kind_of(Float)
+    Math.sqrt(1).should.is_a?(Float)
   end
 
   it "returns the square root of the argument" do
@@ -13,15 +13,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.sqrt("test") }.should raise_error(TypeError)
+    -> { Math.sqrt("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.sqrt(nan_value).nan?.should be_true
+    Math.sqrt(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.sqrt(nil) }.should raise_error(TypeError)
+    -> { Math.sqrt(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
@@ -29,7 +29,7 @@
   end
 
   it "raises a Math::DomainError when given a negative number" do
-    -> { Math.sqrt(-1) }.should raise_error(Math::DomainError)
+    -> { Math.sqrt(-1) }.should.raise(Math::DomainError)
   end
 end
 
diff --git a/spec/ruby/core/math/tan_spec.rb b/spec/ruby/core/math/tan_spec.rb
index 67307f1e6e3..c3e773f318b 100644
--- a/spec/ruby/core/math/tan_spec.rb
+++ b/spec/ruby/core/math/tan_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.tan" do
   it "returns a float" do
-    Math.tan(1.35).should be_kind_of(Float)
+    Math.tan(1.35).should.is_a?(Float)
   end
 
   it "returns the tangent of the argument" do
@@ -19,15 +19,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.tan("test") }.should raise_error(TypeError)
+    -> { Math.tan("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.tan(nan_value).nan?.should be_true
+    Math.tan(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.tan(nil) }.should raise_error(TypeError)
+    -> { Math.tan(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/math/tanh_spec.rb b/spec/ruby/core/math/tanh_spec.rb
index 568f8dfa775..74a938ffd8e 100644
--- a/spec/ruby/core/math/tanh_spec.rb
+++ b/spec/ruby/core/math/tanh_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Math.tanh" do
   it "returns a float" do
-    Math.tanh(0.5).should be_kind_of(Float)
+    Math.tanh(0.5).should.is_a?(Float)
   end
 
   it "returns the hyperbolic tangent of the argument" do
@@ -16,15 +16,15 @@
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    -> { Math.tanh("test") }.should raise_error(TypeError)
+    -> { Math.tanh("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.tanh(nan_value).nan?.should be_true
+    Math.tanh(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    -> { Math.tanh(nil) }.should raise_error(TypeError)
+    -> { Math.tanh(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do
diff --git a/spec/ruby/core/method/curry_spec.rb b/spec/ruby/core/method/curry_spec.rb
index 219de0f6b56..79c5d7c662e 100644
--- a/spec/ruby/core/method/curry_spec.rb
+++ b/spec/ruby/core/method/curry_spec.rb
@@ -7,7 +7,7 @@
     def x.foo(a,b,c); [a,b,c]; end
 
     c = x.method(:foo).curry
-    c.should be_kind_of(Proc)
+    c.should.is_a?(Proc)
     c.call(1).call(2, 3).should == [1,2,3]
   end
 
@@ -17,20 +17,20 @@ def x.foo(a,b,c); [a,b,c]; end
     end
 
     it "returns a curried proc when given correct arity" do
-      @obj.method(:one_req).curry(1).should be_kind_of(Proc)
-      @obj.method(:zero_with_splat).curry(100).should be_kind_of(Proc)
-      @obj.method(:two_req_with_splat).curry(2).should be_kind_of(Proc)
+      @obj.method(:one_req).curry(1).should.is_a?(Proc)
+      @obj.method(:zero_with_splat).curry(100).should.is_a?(Proc)
+      @obj.method(:two_req_with_splat).curry(2).should.is_a?(Proc)
     end
 
     it "raises ArgumentError when the method requires less arguments than the given arity" do
-      -> { @obj.method(:zero).curry(1) }.should raise_error(ArgumentError)
-      -> { @obj.method(:one_req_one_opt).curry(3) }.should raise_error(ArgumentError)
-      -> { @obj.method(:two_req_one_opt_with_block).curry(4) }.should raise_error(ArgumentError)
+      -> { @obj.method(:zero).curry(1) }.should.raise(ArgumentError)
+      -> { @obj.method(:one_req_one_opt).curry(3) }.should.raise(ArgumentError)
+      -> { @obj.method(:two_req_one_opt_with_block).curry(4) }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError when the method requires more arguments than the given arity" do
-      -> { @obj.method(:two_req_with_splat).curry(1) }.should raise_error(ArgumentError)
-      -> { @obj.method(:one_req).curry(0) }.should raise_error(ArgumentError)
+      -> { @obj.method(:two_req_with_splat).curry(1) }.should.raise(ArgumentError)
+      -> { @obj.method(:one_req).curry(0) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/method/fixtures/classes.rb b/spec/ruby/core/method/fixtures/classes.rb
index 464a519aeac..41904df1d16 100644
--- a/spec/ruby/core/method/fixtures/classes.rb
+++ b/spec/ruby/core/method/fixtures/classes.rb
@@ -27,6 +27,7 @@ def foo
 
     alias bar foo
     alias baz bar
+    alias qux baz
 
     def same_as_foo
       true
diff --git a/spec/ruby/core/method/original_name_spec.rb b/spec/ruby/core/method/original_name_spec.rb
index 676fdaedb46..8fec0e7c33c 100644
--- a/spec/ruby/core/method/original_name_spec.rb
+++ b/spec/ruby/core/method/original_name_spec.rb
@@ -19,4 +19,25 @@
     obj.method(:baz).original_name.should == :foo
     obj.method(:baz).unbind.bind(obj).original_name.should == :foo
   end
+
+  it "returns the original name even when aliased thrice" do
+    obj = MethodSpecs::Methods.new
+    obj.method(:qux).original_name.should == :foo
+    obj.method(:qux).unbind.bind(obj).original_name.should == :foo
+  end
+
+  it "returns the source UnboundMethod's name (not the name given to define_method)" do
+    klass = Class.new { define_method(:my_inspect, ::Kernel.instance_method(:inspect)) }
+    klass.new.method(:my_inspect).original_name.should == :inspect
+  end
+
+  it "preserves the source method's name through define_method and alias" do
+    source = Class.new { def my_method; end }
+    klass = Class.new(source) do
+      define_method(:renamed, source.instance_method(:my_method))
+      alias aliased renamed
+    end
+    klass.new.method(:renamed).original_name.should == :my_method
+    klass.new.method(:aliased).original_name.should == :my_method
+  end
 end
diff --git a/spec/ruby/core/method/parameters_spec.rb b/spec/ruby/core/method/parameters_spec.rb
index f1c2523cf0c..fd88e8dcb86 100644
--- a/spec/ruby/core/method/parameters_spec.rb
+++ b/spec/ruby/core/method/parameters_spec.rb
@@ -22,6 +22,12 @@ def one_splat_one_block(*args, &block)
       local_is_not_parameter = {}
     end
 
+    ruby_version_is "4.1" do
+      eval <<-RUBY
+        def one_noblock(&nil); end
+      RUBY
+    end
+
     def forward_parameters(...) end
 
     def underscore_parameters(_, _, _ = 1, *_, _:, _: 2, **_, &_); end
@@ -187,6 +193,13 @@ def underscore_parameters(_, _, _ = 1, *_, _:, _: 2, **_, &_); end
     m.parameters.should == [[:nokey]]
   end
 
+  ruby_version_is "4.1" do
+    it "returns [[:noblock]] for a method with a single &nil parameter" do
+      m = MethodSpecs::Methods.instance_method(:one_noblock)
+      m.parameters.should == [[:noblock]]
+    end
+  end
+
   it "works with ->(){} as the value of an optional argument" do
     m = MethodSpecs::Methods.instance_method(:one_opt_with_stabby)
     m.parameters.should == [[:opt,:a]]
@@ -295,7 +308,7 @@ def object.foo(&)
     [
       [[:rest]],
       [[:opt]]
-    ].should include([].method(:pop).parameters)
+    ].should.include?([].method(:pop).parameters)
   end
 
   it "returns [[:req]] for each parameter for core methods with fixed-length argument lists" do
diff --git a/spec/ruby/core/method/receiver_spec.rb b/spec/ruby/core/method/receiver_spec.rb
index 2b2e11dd2e4..315a08d2885 100644
--- a/spec/ruby/core/method/receiver_spec.rb
+++ b/spec/ruby/core/method/receiver_spec.rb
@@ -4,19 +4,19 @@
 describe "Method#receiver" do
   it "returns the receiver of the method" do
     s = "abc"
-    s.method(:upcase).receiver.should equal(s)
+    s.method(:upcase).receiver.should.equal?(s)
   end
 
   it "returns the right receiver even when aliased" do
     obj = MethodSpecs::Methods.new
-    obj.method(:foo).receiver.should equal(obj)
-    obj.method(:bar).receiver.should equal(obj)
+    obj.method(:foo).receiver.should.equal?(obj)
+    obj.method(:bar).receiver.should.equal?(obj)
   end
 
   describe "for a Method generated by respond_to_missing?" do
     it "returns the receiver of the method" do
       m = MethodSpecs::Methods.new
-      m.method(:handled_via_method_missing).receiver.should equal(m)
+      m.method(:handled_via_method_missing).receiver.should.equal?(m)
     end
   end
 end
diff --git a/spec/ruby/core/method/shared/call.rb b/spec/ruby/core/method/shared/call.rb
index f26e373695d..41ee2b06cb9 100644
--- a/spec/ruby/core/method/shared/call.rb
+++ b/spec/ruby/core/method/shared/call.rb
@@ -11,10 +11,10 @@
   it "raises an ArgumentError when given incorrect number of arguments" do
     -> {
       MethodSpecs::Methods.new.method(:two_req).send(@method, 1, 2, 3)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       MethodSpecs::Methods.new.method(:two_req).send(@method, 1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   describe "for a Method generated by respond_to_missing?" do
diff --git a/spec/ruby/core/method/shared/dup.rb b/spec/ruby/core/method/shared/dup.rb
index c74847083f8..eee790890a2 100644
--- a/spec/ruby/core/method/shared/dup.rb
+++ b/spec/ruby/core/method/shared/dup.rb
@@ -4,7 +4,7 @@
     b = a.send(@method)
 
     a.should == b
-    a.should_not equal(b)
+    a.should_not.equal?(b)
   end
 
   ruby_version_is "3.4" do
diff --git a/spec/ruby/core/method/shared/eql.rb b/spec/ruby/core/method/shared/eql.rb
index 5c720cbac15..3c340202b75 100644
--- a/spec/ruby/core/method/shared/eql.rb
+++ b/spec/ruby/core/method/shared/eql.rb
@@ -12,54 +12,54 @@
   it "returns true if methods are the same" do
     m2 = @m.method(:foo)
 
-    @m_foo.send(@method, @m_foo).should be_true
-    @m_foo.send(@method, m2).should be_true
+    @m_foo.send(@method, @m_foo).should == true
+    @m_foo.send(@method, m2).should == true
   end
 
   it "returns true on aliased methods" do
     m_bar = @m.method(:bar)
 
-    m_bar.send(@method, @m_foo).should be_true
+    m_bar.send(@method, @m_foo).should == true
   end
 
   it "returns true if the two core methods are aliases" do
     s = "hello"
     a = s.method(:size)
     b = s.method(:length)
-    a.send(@method, b).should be_true
+    a.send(@method, b).should == true
   end
 
   it "returns false on a method which is neither aliased nor the same method" do
     m2 = @m.method(:zero)
 
-    @m_foo.send(@method, m2).should be_false
+    @m_foo.send(@method, m2).should == false
   end
 
   it "returns false for a method which is not bound to the same object" do
     m2_foo = @m2.method(:foo)
     a_baz = @a.method(:baz)
 
-    @m_foo.send(@method, m2_foo).should be_false
-    @m_foo.send(@method, a_baz).should be_false
+    @m_foo.send(@method, m2_foo).should == false
+    @m_foo.send(@method, a_baz).should == false
   end
 
   it "returns false if the two methods are bound to the same object but were defined independently" do
     m2 = @m.method(:same_as_foo)
-    @m_foo.send(@method, m2).should be_false
+    @m_foo.send(@method, m2).should == false
   end
 
   it "returns true if a method was defined using the other one" do
     MethodSpecs::Methods.send :define_method, :defined_foo, MethodSpecs::Methods.instance_method(:foo)
     m2 = @m.method(:defined_foo)
-    @m_foo.send(@method, m2).should be_true
+    @m_foo.send(@method, m2).should == true
   end
 
   it "returns false if comparing a method defined via define_method and def" do
     defn = @m.method(:zero)
     defined = @m.method(:zero_defined_method)
 
-    defn.send(@method, defined).should be_false
-    defined.send(@method, defn).should be_false
+    defn.send(@method, defined).should == false
+    defined.send(@method, defn).should == false
   end
 
   describe 'missing methods' do
@@ -68,8 +68,8 @@
       miss1bis = @m.method(:handled_via_method_missing)
       miss2 = @m.method(:also_handled)
 
-      miss1.send(@method, miss1bis).should be_true
-      miss1.send(@method, miss2).should be_false
+      miss1.send(@method, miss1bis).should == true
+      miss1.send(@method, miss2).should == false
     end
 
     it 'calls respond_to_missing? with true to include private methods' do
@@ -81,14 +81,14 @@
   it "returns false if the two methods are bound to different objects, have the same names, and identical bodies" do
     a = MethodSpecs::Eql.instance_method(:same_body)
     b = MethodSpecs::Eql2.instance_method(:same_body)
-    a.send(@method, b).should be_false
+    a.send(@method, b).should == false
   end
 
   it "returns false if the argument is not a Method object" do
-    String.instance_method(:size).send(@method, 7).should be_false
+    String.instance_method(:size).send(@method, 7).should == false
   end
 
   it "returns false if the argument is an unbound version of self" do
-    method(:load).send(@method, method(:load).unbind).should be_false
+    method(:load).send(@method, method(:load).unbind).should == false
   end
 end
diff --git a/spec/ruby/core/method/shared/to_s.rb b/spec/ruby/core/method/shared/to_s.rb
index b2d27d370f1..bfb58e6896c 100644
--- a/spec/ruby/core/method/shared/to_s.rb
+++ b/spec/ruby/core/method/shared/to_s.rb
@@ -8,12 +8,12 @@
   end
 
   it "returns a String" do
-    @m.send(@method).should be_kind_of(String)
+    @m.send(@method).should.is_a?(String)
   end
 
   it "returns a String for methods defined with attr_accessor" do
     m = MethodSpecs::Methods.new.method :attr
-    m.send(@method).should be_kind_of(String)
+    m.send(@method).should.is_a?(String)
   end
 
   it "returns a String containing 'Method'" do
diff --git a/spec/ruby/core/method/source_location_spec.rb b/spec/ruby/core/method/source_location_spec.rb
index 87413a2ab67..22fcb98c742 100644
--- a/spec/ruby/core/method/source_location_spec.rb
+++ b/spec/ruby/core/method/source_location_spec.rb
@@ -7,27 +7,27 @@
   end
 
   it "returns an Array" do
-    @method.source_location.should be_an_instance_of(Array)
+    @method.source_location.should.instance_of?(Array)
   end
 
   it "sets the first value to the path of the file in which the method was defined" do
-    file = @method.source_location[0]
-    file.should be_an_instance_of(String)
+    file = @method.source_location.first
+    file.should.instance_of?(String)
     file.should == File.realpath('fixtures/classes.rb', __dir__)
   end
 
   it "sets the last value to an Integer representing the line on which the method was defined" do
-    line = @method.source_location[1]
-    line.should be_an_instance_of(Integer)
+    line = @method.source_location.last
+    line.should.instance_of?(Integer)
     line.should == 5
   end
 
   it "returns the last place the method was defined" do
-    MethodSpecs::SourceLocation.method(:redefined).source_location[1].should == 13
+    MethodSpecs::SourceLocation.method(:redefined).source_location.last.should == 13
   end
 
   it "returns the location of the original method even if it was aliased" do
-    MethodSpecs::SourceLocation.new.method(:aka).source_location[1].should == 17
+    MethodSpecs::SourceLocation.new.method(:aka).source_location.last.should == 17
   end
 
   it "works for methods defined with a block" do
@@ -92,7 +92,7 @@ def f
       loc.should == nil
     else
       loc[0].should.start_with?('<internal:')
-      loc[1].should be_kind_of(Integer)
+      loc[1].should.is_a?(Integer)
     end
 
     loc = method(:tap).source_location
@@ -100,7 +100,7 @@ def f
       loc.should == nil
     else
       loc[0].should.start_with?('<internal:')
-      loc[1].should be_kind_of(Integer)
+      loc[1].should.is_a?(Integer)
     end
   end
 
@@ -108,19 +108,13 @@ def f
     c = Class.new do
       eval('def self.m; end', nil, "foo", 100)
     end
-    location = c.method(:m).source_location
-    ruby_version_is(""..."4.1") do
-      location.should == ["foo", 100]
-    end
-    ruby_version_is("4.1") do
-      location.should == ["foo", 100, 0, 100, 15]
-    end
+    c.method(:m).source_location.should == ["foo", 100]
   end
 
   describe "for a Method generated by respond_to_missing?" do
     it "returns nil" do
       m = MethodSpecs::Methods.new
-      m.method(:handled_via_method_missing).source_location.should be_nil
+      m.method(:handled_via_method_missing).source_location.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/method/unbind_spec.rb b/spec/ruby/core/method/unbind_spec.rb
index 0b630e4d883..994c3a88798 100644
--- a/spec/ruby/core/method/unbind_spec.rb
+++ b/spec/ruby/core/method/unbind_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "returns an UnboundMethod" do
-    @normal_um.should be_kind_of(UnboundMethod)
+    @normal_um.should.is_a?(UnboundMethod)
   end
 
   describe "#inspect" do
diff --git a/spec/ruby/core/module/alias_method_spec.rb b/spec/ruby/core/module/alias_method_spec.rb
index c36dedd2d82..852879cc8a9 100644
--- a/spec/ruby/core/module/alias_method_spec.rb
+++ b/spec/ruby/core/module/alias_method_spec.rb
@@ -28,12 +28,12 @@
 
   it "retains method visibility" do
     @class.make_alias :private_ichi, :private_one
-    -> { @object.private_one  }.should raise_error(NameError)
-    -> { @object.private_ichi }.should raise_error(NameError)
+    -> { @object.private_one  }.should.raise(NameError)
+    -> { @object.private_ichi }.should.raise(NameError)
     @class.make_alias :public_ichi, :public_one
     @object.public_ichi.should == @object.public_one
     @class.make_alias :protected_ichi, :protected_one
-    -> { @object.protected_ichi }.should raise_error(NameError)
+    -> { @object.protected_ichi }.should.raise(NameError)
   end
 
   it "handles aliasing a stub that changes visibility" do
@@ -55,7 +55,7 @@ def uno_refined_method
   end
 
   it "fails if origin method not found" do
-    -> { @class.make_alias :ni, :san }.should raise_error(NameError) { |e|
+    -> { @class.make_alias :ni, :san }.should.raise(NameError) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -63,7 +63,7 @@ def uno_refined_method
 
   it "raises FrozenError if frozen" do
     @class.freeze
-    -> { @class.make_alias :uno, :public_one }.should raise_error(FrozenError)
+    -> { @class.make_alias :uno, :public_one }.should.raise(FrozenError)
   end
 
   it "converts the names using #to_str" do
@@ -78,23 +78,23 @@ def uno_refined_method
   end
 
   it "raises a TypeError when the given name can't be converted using to_str" do
-    -> { @class.make_alias mock('x'), :public_one }.should raise_error(TypeError)
+    -> { @class.make_alias mock('x'), :public_one }.should.raise(TypeError)
   end
 
   it "raises a NoMethodError if the given name raises a NoMethodError during type coercion using to_str" do
     obj = mock("mock-name")
     obj.should_receive(:to_str).and_raise(NoMethodError)
-    -> { @class.make_alias obj, :public_one }.should raise_error(NoMethodError)
+    -> { @class.make_alias obj, :public_one }.should.raise(NoMethodError)
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:alias_method, false)
+    Module.public_instance_methods(false).should.include?(:alias_method)
   end
 
   describe "returned value" do
     it "returns symbol of the defined method name" do
-      @class.send(:alias_method, :checking_return_value, :public_one).should equal(:checking_return_value)
-      @class.send(:alias_method, 'checking_return_value', :public_one).should equal(:checking_return_value)
+      @class.send(:alias_method, :checking_return_value, :public_one).should.equal?(:checking_return_value)
+      @class.send(:alias_method, 'checking_return_value', :public_one).should.equal?(:checking_return_value)
     end
   end
 
@@ -104,14 +104,14 @@ def uno_refined_method
 
   it "works on private module methods in a module that has been reopened" do
     ModuleSpecs::ReopeningModule.foo.should == true
-    -> { ModuleSpecs::ReopeningModule.foo2 }.should_not raise_error(NoMethodError)
+    -> { ModuleSpecs::ReopeningModule.foo2 }.should_not.raise(NoMethodError)
   end
 
   it "accesses a method defined on Object from Kernel" do
-    Kernel.should_not have_public_instance_method(:module_specs_public_method_on_object)
+    Kernel.public_instance_methods(true).should_not.include?(:module_specs_public_method_on_object)
 
-    Kernel.should have_public_instance_method(:module_specs_alias_on_kernel)
-    Object.should have_public_instance_method(:module_specs_alias_on_kernel)
+    Kernel.public_instance_methods(false).should.include?(:module_specs_alias_on_kernel)
+    Object.public_instance_methods(true).should.include?(:module_specs_alias_on_kernel)
   end
 
   it "can call a method with super aliased twice" do
@@ -130,42 +130,42 @@ def uno_refined_method
 
     it "keeps initialize private when aliasing" do
       @class.make_alias(:initialize, :public_one)
-      @class.private_instance_methods.include?(:initialize).should be_true
+      @class.private_instance_methods.include?(:initialize).should == true
 
       @subclass.make_alias(:initialize, :public_one)
-      @subclass.private_instance_methods.include?(:initialize).should be_true
+      @subclass.private_instance_methods.include?(:initialize).should == true
     end
 
     it "keeps initialize_copy private when aliasing" do
       @class.make_alias(:initialize_copy, :public_one)
-      @class.private_instance_methods.include?(:initialize_copy).should be_true
+      @class.private_instance_methods.include?(:initialize_copy).should == true
 
       @subclass.make_alias(:initialize_copy, :public_one)
-      @subclass.private_instance_methods.include?(:initialize_copy).should be_true
+      @subclass.private_instance_methods.include?(:initialize_copy).should == true
     end
 
     it "keeps initialize_clone private when aliasing" do
       @class.make_alias(:initialize_clone, :public_one)
-      @class.private_instance_methods.include?(:initialize_clone).should be_true
+      @class.private_instance_methods.include?(:initialize_clone).should == true
 
       @subclass.make_alias(:initialize_clone, :public_one)
-      @subclass.private_instance_methods.include?(:initialize_clone).should be_true
+      @subclass.private_instance_methods.include?(:initialize_clone).should == true
     end
 
     it "keeps initialize_dup private when aliasing" do
       @class.make_alias(:initialize_dup, :public_one)
-      @class.private_instance_methods.include?(:initialize_dup).should be_true
+      @class.private_instance_methods.include?(:initialize_dup).should == true
 
       @subclass.make_alias(:initialize_dup, :public_one)
-      @subclass.private_instance_methods.include?(:initialize_dup).should be_true
+      @subclass.private_instance_methods.include?(:initialize_dup).should == true
     end
 
     it "keeps respond_to_missing? private when aliasing" do
       @class.make_alias(:respond_to_missing?, :public_one)
-      @class.private_instance_methods.include?(:respond_to_missing?).should be_true
+      @class.private_instance_methods.include?(:respond_to_missing?).should == true
 
       @subclass.make_alias(:respond_to_missing?, :public_one)
-      @subclass.private_instance_methods.include?(:respond_to_missing?).should be_true
+      @subclass.private_instance_methods.include?(:respond_to_missing?).should == true
     end
   end
 end
diff --git a/spec/ruby/core/module/ancestors_spec.rb b/spec/ruby/core/module/ancestors_spec.rb
index 90c26941d14..f85884a4f3e 100644
--- a/spec/ruby/core/module/ancestors_spec.rb
+++ b/spec/ruby/core/module/ancestors_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "returns only modules and classes" do
-    class << ModuleSpecs::Child; self; end.ancestors.should include(ModuleSpecs::Internal, Class, Module, Object, Kernel)
+    class << ModuleSpecs::Child; self; end.ancestors.to_set.should >= Set[ModuleSpecs::Internal, Class, Module, Object, Kernel]
   end
 
   it "has 1 entry per module or class" do
@@ -45,7 +45,7 @@ class << ModuleSpecs::Child; self; end.ancestors.should include(ModuleSpecs::Int
       child   = Class.new(parent)
       schild  = child.singleton_class
 
-      schild.ancestors.should include(schild,
+      schild.ancestors.to_set.should >= Set[schild,
                                       parent.singleton_class,
                                       Object.singleton_class,
                                       BasicObject.singleton_class,
@@ -53,14 +53,14 @@ class << ModuleSpecs::Child; self; end.ancestors.should include(ModuleSpecs::Int
                                       Module,
                                       Object,
                                       Kernel,
-                                      BasicObject)
+                                      BasicObject]
 
     end
 
     describe 'for a standalone module' do
       it 'does not include Class' do
         s_mod = ModuleSpecs.singleton_class
-        s_mod.ancestors.should_not include(Class)
+        s_mod.ancestors.should_not.include?(Class)
       end
 
       it 'does not include other singleton classes' do
@@ -69,19 +69,19 @@ class << ModuleSpecs::Child; self; end.ancestors.should include(ModuleSpecs::Int
         s_object = Object.singleton_class
         s_basic_object = BasicObject.singleton_class
 
-        s_standalone_mod.ancestors.should_not include(s_module, s_object, s_basic_object)
+        (s_standalone_mod.ancestors & [s_module, s_object, s_basic_object]).should.empty?
       end
 
       it 'includes its own singleton class' do
         s_mod = ModuleSpecs.singleton_class
 
-        s_mod.ancestors.should include(s_mod)
+        s_mod.ancestors.should.include?(s_mod)
       end
 
       it 'includes standard chain' do
         s_mod = ModuleSpecs.singleton_class
 
-        s_mod.ancestors.should include(Module, Object, Kernel, BasicObject)
+        s_mod.ancestors.to_set.should >= Set[Module, Object, Kernel, BasicObject]
       end
     end
   end
diff --git a/spec/ruby/core/module/append_features_spec.rb b/spec/ruby/core/module/append_features_spec.rb
index 1724cde5d60..4d2207330d6 100644
--- a/spec/ruby/core/module/append_features_spec.rb
+++ b/spec/ruby/core/module/append_features_spec.rb
@@ -3,18 +3,18 @@
 
 describe "Module#append_features" do
   it "is a private method" do
-    Module.should have_private_instance_method(:append_features)
+    Module.private_instance_methods(false).should.include?(:append_features)
   end
 
   describe "on Class" do
     it "is undefined" do
-      Class.should_not have_private_instance_method(:append_features, true)
+      Class.private_instance_methods(true).should_not.include?(:append_features)
     end
 
     it "raises a TypeError if calling after rebinded to Class" do
       -> {
         Module.instance_method(:append_features).bind(Class.new).call Module.new
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 
@@ -39,11 +39,11 @@ def self.append_features(mod)
   it "raises an ArgumentError on a cyclic include" do
     -> {
       ModuleSpecs::CyclicAppendA.send(:append_features, ModuleSpecs::CyclicAppendA)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       ModuleSpecs::CyclicAppendB.send(:append_features, ModuleSpecs::CyclicAppendA)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
   end
 
@@ -54,8 +54,8 @@ def self.append_features(mod)
     end
 
     it "raises a FrozenError before appending self" do
-      -> { @receiver.send(:append_features, @other) }.should raise_error(FrozenError)
-      @other.ancestors.should_not include(@receiver)
+      -> { @receiver.send(:append_features, @other) }.should.raise(FrozenError)
+      @other.ancestors.should_not.include?(@receiver)
     end
   end
 end
diff --git a/spec/ruby/core/module/attr_accessor_spec.rb b/spec/ruby/core/module/attr_accessor_spec.rb
index 503dccc61ed..a608760cf25 100644
--- a/spec/ruby/core/module/attr_accessor_spec.rb
+++ b/spec/ruby/core/module/attr_accessor_spec.rb
@@ -34,7 +34,7 @@ class TrueClass
       attr_accessor :spec_attr_accessor
     end
 
-    -> { true.spec_attr_accessor = "a" }.should raise_error(FrozenError)
+    -> { true.spec_attr_accessor = "a" }.should.raise(FrozenError)
   end
 
   it "raises FrozenError if the receiver if frozen" do
@@ -46,7 +46,7 @@ class TrueClass
     obj.foo.should == 1
 
     obj.freeze
-    -> { obj.foo = 42 }.should raise_error(FrozenError)
+    -> { obj.foo = 42 }.should.raise(FrozenError)
     obj.foo.should == 1
   end
 
@@ -62,9 +62,9 @@ class TrueClass
 
   it "raises a TypeError when the given names can't be converted to strings using to_str" do
     o = mock('o')
-    -> { Class.new { attr_accessor o } }.should raise_error(TypeError)
+    -> { Class.new { attr_accessor o } }.should.raise(TypeError)
     (o = mock('123')).should_receive(:to_str).and_return(123)
-    -> { Class.new { attr_accessor o } }.should raise_error(TypeError)
+    -> { Class.new { attr_accessor o } }.should.raise(TypeError)
   end
 
   it "applies current visibility to methods created" do
@@ -73,12 +73,12 @@ class TrueClass
       attr_accessor :foo
     end
 
-    -> { c.new.foo }.should raise_error(NoMethodError)
-    -> { c.new.foo=1 }.should raise_error(NoMethodError)
+    -> { c.new.foo }.should.raise(NoMethodError)
+    -> { c.new.foo=1 }.should.raise(NoMethodError)
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:attr_accessor, false)
+    Module.public_instance_methods(false).should.include?(:attr_accessor)
   end
 
   it "returns an array of defined method names as symbols" do
@@ -104,7 +104,7 @@ class Integer
     end
 
     it "can read through the accessor" do
-      1.foobar.should be_nil
+      1.foobar.should == nil
     end
   end
 
diff --git a/spec/ruby/core/module/attr_reader_spec.rb b/spec/ruby/core/module/attr_reader_spec.rb
index 37fd537ff5c..2b4ca2100e5 100644
--- a/spec/ruby/core/module/attr_reader_spec.rb
+++ b/spec/ruby/core/module/attr_reader_spec.rb
@@ -30,7 +30,7 @@ class TrueClass
       attr_reader :spec_attr_reader
     end
 
-    -> { true.instance_variable_set("@spec_attr_reader", "a") }.should raise_error(RuntimeError)
+    -> { true.instance_variable_set("@spec_attr_reader", "a") }.should.raise(RuntimeError)
   end
 
   it "converts non string/symbol names to strings using to_str" do
@@ -45,9 +45,9 @@ class TrueClass
 
   it "raises a TypeError when the given names can't be converted to strings using to_str" do
     o = mock('o')
-    -> { Class.new { attr_reader o } }.should raise_error(TypeError)
+    -> { Class.new { attr_reader o } }.should.raise(TypeError)
     (o = mock('123')).should_receive(:to_str).and_return(123)
-    -> { Class.new { attr_reader o } }.should raise_error(TypeError)
+    -> { Class.new { attr_reader o } }.should.raise(TypeError)
   end
 
   it "applies current visibility to methods created" do
@@ -56,11 +56,11 @@ class TrueClass
       attr_reader :foo
     end
 
-    -> { c.new.foo }.should raise_error(NoMethodError)
+    -> { c.new.foo }.should.raise(NoMethodError)
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:attr_reader, false)
+    Module.public_instance_methods(false).should.include?(:attr_reader)
   end
 
   it "returns an array of defined method names as symbols" do
diff --git a/spec/ruby/core/module/attr_spec.rb b/spec/ruby/core/module/attr_spec.rb
index 2f9f4e26dc5..d6968649558 100644
--- a/spec/ruby/core/module/attr_spec.rb
+++ b/spec/ruby/core/module/attr_spec.rb
@@ -90,8 +90,8 @@ def initialize
       attr :foo, true
     end
 
-    -> { c.new.foo }.should raise_error(NoMethodError)
-    -> { c.new.foo=1 }.should raise_error(NoMethodError)
+    -> { c.new.foo }.should.raise(NoMethodError)
+    -> { c.new.foo=1 }.should.raise(NoMethodError)
   end
 
   it "creates a getter but no setter for all given attribute names" do
@@ -121,8 +121,8 @@ def initialize
       attr :foo, :bar
     end
 
-    -> { c.new.foo }.should raise_error(NoMethodError)
-    -> { c.new.bar }.should raise_error(NoMethodError)
+    -> { c.new.foo }.should.raise(NoMethodError)
+    -> { c.new.bar }.should.raise(NoMethodError)
   end
 
   it "converts non string/symbol names to strings using to_str" do
@@ -132,9 +132,9 @@ def initialize
 
   it "raises a TypeError when the given names can't be converted to strings using to_str" do
     o = mock('o')
-    -> { Class.new { attr o } }.should raise_error(TypeError)
+    -> { Class.new { attr o } }.should.raise(TypeError)
     (o = mock('123')).should_receive(:to_str).and_return(123)
-    -> { Class.new { attr o } }.should raise_error(TypeError)
+    -> { Class.new { attr o } }.should.raise(TypeError)
   end
 
   it "with a boolean argument emits a warning when $VERBOSE is true" do
@@ -144,7 +144,7 @@ def initialize
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:attr, false)
+    Module.public_instance_methods(false).should.include?(:attr)
   end
 
   it "returns an array of defined method names as symbols" do
diff --git a/spec/ruby/core/module/attr_writer_spec.rb b/spec/ruby/core/module/attr_writer_spec.rb
index 5b863ef88c1..6089b52495b 100644
--- a/spec/ruby/core/module/attr_writer_spec.rb
+++ b/spec/ruby/core/module/attr_writer_spec.rb
@@ -30,7 +30,7 @@ class TrueClass
       attr_writer :spec_attr_writer
     end
 
-    -> { true.spec_attr_writer = "a" }.should raise_error(FrozenError)
+    -> { true.spec_attr_writer = "a" }.should.raise(FrozenError)
   end
 
   it "raises FrozenError if the receiver if frozen" do
@@ -40,7 +40,7 @@ class TrueClass
     obj = c.new
     obj.freeze
 
-    -> { obj.foo = 42 }.should raise_error(FrozenError)
+    -> { obj.foo = 42 }.should.raise(FrozenError)
   end
 
   it "converts non string/symbol names to strings using to_str" do
@@ -55,9 +55,9 @@ class TrueClass
 
   it "raises a TypeError when the given names can't be converted to strings using to_str" do
     o = mock('test1')
-    -> { Class.new { attr_writer o } }.should raise_error(TypeError)
+    -> { Class.new { attr_writer o } }.should.raise(TypeError)
     (o = mock('123')).should_receive(:to_str).and_return(123)
-    -> { Class.new { attr_writer o } }.should raise_error(TypeError)
+    -> { Class.new { attr_writer o } }.should.raise(TypeError)
   end
 
   it "applies current visibility to methods created" do
@@ -66,11 +66,11 @@ class TrueClass
       attr_writer :foo
     end
 
-    -> { c.new.foo=1 }.should raise_error(NoMethodError)
+    -> { c.new.foo=1 }.should.raise(NoMethodError)
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:attr_writer, false)
+    Module.public_instance_methods(false).should.include?(:attr_writer)
   end
 
   it "returns an array of defined method names as symbols" do
diff --git a/spec/ruby/core/module/autoload_relative_spec.rb b/spec/ruby/core/module/autoload_relative_spec.rb
new file mode 100644
index 00000000000..2e7d85496b6
--- /dev/null
+++ b/spec/ruby/core/module/autoload_relative_spec.rb
@@ -0,0 +1,128 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+# Specs for Module#autoload_relative
+module ModuleSpecs
+  module AutoloadRelative
+    # Will be used for testing
+  end
+end
+
+ruby_version_is "4.1" do
+  describe "Module#autoload_relative" do
+    before :each do
+      @loaded_features = $".dup
+    end
+
+    after :each do
+      $".replace @loaded_features
+    end
+
+    it "is a public method" do
+      Module.public_instance_methods(false).should.include?(:autoload_relative)
+    end
+
+    it "registers a file to load relative to the current file the first time the named constant is accessed" do
+      ModuleSpecs::Autoload.autoload_relative :AutoloadRelativeA, "fixtures/autoload_relative_a.rb"
+      path = ModuleSpecs::Autoload.autoload?(:AutoloadRelativeA)
+      path.should_not == nil
+      path.should.end_with?("autoload_relative_a.rb")
+      File.exist?(path).should == true
+    end
+
+    it "loads the registered file when the constant is accessed" do
+      ModuleSpecs::Autoload.autoload_relative :AutoloadRelativeB, "fixtures/autoload_relative_a.rb"
+      ModuleSpecs::Autoload::AutoloadRelativeB.should.is_a?(Module)
+    end
+
+    it "returns nil" do
+      ModuleSpecs::Autoload.autoload_relative(:AutoloadRelativeC, "fixtures/autoload_relative_a.rb").should == nil
+    end
+
+    it "registers a file to load the first time the named constant is accessed" do
+      module ModuleSpecs::Autoload::AutoloadRelativeTest
+        autoload_relative :D, "fixtures/autoload_relative_a.rb"
+      end
+      path = ModuleSpecs::Autoload::AutoloadRelativeTest.autoload?(:D)
+      path.should_not == nil
+      path.should.end_with?("autoload_relative_a.rb")
+    end
+
+    it "sets the autoload constant in the constants table" do
+      ModuleSpecs::Autoload.autoload_relative :AutoloadRelativeTableTest, "fixtures/autoload_relative_a.rb"
+      ModuleSpecs::Autoload.should.const_defined?(:AutoloadRelativeTableTest, false)
+    end
+
+    it "calls #to_path on non-String filenames" do
+      name = mock("autoload_relative mock")
+      name.should_receive(:to_path).and_return("fixtures/autoload_relative_a.rb")
+      ModuleSpecs::Autoload.autoload_relative :AutoloadRelativeToPath, name
+      ModuleSpecs::Autoload.autoload?(:AutoloadRelativeToPath).should_not == nil
+    end
+
+    it "calls #to_str on non-String filenames" do
+      name = mock("autoload_relative mock")
+      name.should_receive(:to_str).and_return("fixtures/autoload_relative_a.rb")
+      ModuleSpecs::Autoload.autoload_relative :AutoloadRelativeToStr, name
+      ModuleSpecs::Autoload.autoload?(:AutoloadRelativeToStr).should_not == nil
+    end
+
+    it "raises a TypeError if the filename argument is not a String or pathname" do
+      -> {
+        ModuleSpecs::Autoload.autoload_relative :AutoloadRelativeTypError, nil
+      }.should.raise(TypeError)
+    end
+
+    it "raises a NameError if the constant name is not valid" do
+      -> {
+        ModuleSpecs::Autoload.autoload_relative :invalid_name, "fixtures/autoload_relative_a.rb"
+      }.should.raise(NameError)
+    end
+
+    it "raises an ArgumentError if the constant name starts with a lowercase letter" do
+      -> {
+        ModuleSpecs::Autoload.autoload_relative :autoload, "fixtures/autoload_relative_a.rb"
+      }.should.raise(NameError)
+    end
+
+    it "raises LoadError if called from eval without file context" do
+      -> {
+        ModuleSpecs::Autoload.module_eval('autoload_relative :EvalTest, "fixtures/autoload_relative_a.rb"')
+      }.should.raise(LoadError, /autoload_relative called without file context/)
+    end
+
+    it "can autoload in instance_eval with a file context" do
+      path = nil
+      ModuleSpecs::Autoload.instance_eval(<<-CODE, __FILE__, __LINE__)
+        autoload_relative :InstanceEvalTest, "fixtures/autoload_relative_a.rb"
+        path = autoload?(:InstanceEvalTest)
+      CODE
+      path.should_not == nil
+      path.should.end_with?("autoload_relative_a.rb")
+    end
+
+    it "resolves paths relative to the file where it's called" do
+      # Using fixtures/autoload_relative_a.rb which exists
+      ModuleSpecs::Autoload.autoload_relative :RelativePathTest, "fixtures/autoload_relative_a.rb"
+      path = ModuleSpecs::Autoload.autoload?(:RelativePathTest)
+      path.should.include?("fixtures")
+      path.should.end_with?("autoload_relative_a.rb")
+    end
+
+    it "can load nested directory paths" do
+      ModuleSpecs::Autoload.autoload_relative :NestedPath, "fixtures/autoload_relative_a.rb"
+      path = ModuleSpecs::Autoload.autoload?(:NestedPath)
+      path.should_not == nil
+      File.exist?(path).should == true
+    end
+
+    describe "interoperability with autoload?" do
+      it "returns the absolute path with autoload?" do
+        ModuleSpecs::Autoload.autoload_relative :QueryTest, "fixtures/autoload_relative_a.rb"
+        path = ModuleSpecs::Autoload.autoload?(:QueryTest)
+        # Should be an absolute path
+        Pathname.new(path).absolute?.should == true
+      end
+    end
+end
+end
diff --git a/spec/ruby/core/module/autoload_spec.rb b/spec/ruby/core/module/autoload_spec.rb
index 625d945686a..057237a92fd 100644
--- a/spec/ruby/core/module/autoload_spec.rb
+++ b/spec/ruby/core/module/autoload_spec.rb
@@ -9,7 +9,7 @@
   end
 
   it "returns nil if no file has been registered for a constant" do
-    ModuleSpecs::Autoload.autoload?(:Manualload).should be_nil
+    ModuleSpecs::Autoload.autoload?(:Manualload).should == nil
   end
 
   it "returns the name of the file that will be autoloaded if an ancestor defined that autoload" do
@@ -19,7 +19,7 @@
 
   it "returns nil if an ancestor defined that autoload but recursion is disabled" do
     ModuleSpecs::Autoload::Parent.autoload :InheritedAutoload, "inherited_autoload.rb"
-    ModuleSpecs::Autoload::Child.autoload?(:InheritedAutoload, false).should be_nil
+    ModuleSpecs::Autoload::Child.autoload?(:InheritedAutoload, false).should == nil
   end
 
   it "returns the name of the file that will be loaded if recursion is disabled but the autoload is defined on the class itself" do
@@ -55,7 +55,7 @@
 
   it "sets the autoload constant in the constants table" do
     ModuleSpecs::Autoload.autoload :B, @non_existent
-    ModuleSpecs::Autoload.should have_constant(:B)
+    ModuleSpecs::Autoload.should.const_defined?(:B, false)
   end
 
   it "can be overridden with a second autoload on the same constant" do
@@ -71,7 +71,7 @@
   end
 
   it "loads the registered constant when it is accessed" do
-    ModuleSpecs::Autoload.should_not have_constant(:X)
+    ModuleSpecs::Autoload.should_not.const_defined?(:X)
     ModuleSpecs::Autoload.autoload :X, fixture(__FILE__, "autoload_x.rb")
     @remove << :X
     ModuleSpecs::Autoload::X.should == :x
@@ -82,7 +82,7 @@
     ModuleSpecs::Autoload::DynClass = cls
     @remove << :DynClass
 
-    ScratchPad.recorded.should be_nil
+    ScratchPad.recorded.should == nil
     ModuleSpecs::Autoload::DynClass::C.new.loaded.should == :dynclass_c
     ScratchPad.recorded.should == :loaded
   end
@@ -92,7 +92,7 @@
     ModuleSpecs::Autoload::DynModule = mod
     @remove << :DynModule
 
-    ScratchPad.recorded.should be_nil
+    ScratchPad.recorded.should == nil
     ModuleSpecs::Autoload::DynModule::D.new.loaded.should == :dynmodule_d
     ScratchPad.recorded.should == :loaded
   end
@@ -131,7 +131,7 @@ class ModuleSpecs::Autoload::HClass
     @remove << :I
     ModuleSpecs::Autoload.const_set :I, 3
     ModuleSpecs::Autoload::I.should == 3
-    ScratchPad.recorded.should be_nil
+    ScratchPad.recorded.should == nil
   end
 
   it "loads a file with .rb extension when passed the name without the extension" do
@@ -144,7 +144,7 @@ class ModuleSpecs::Autoload::HClass
     main = TOPLEVEL_BINDING.eval("self")
     main.should_receive(:require).with("module_autoload_not_exist.rb")
     # The constant won't be defined since require is mocked to do nothing
-    -> { ModuleSpecs::Autoload::ModuleAutoloadCallsRequire }.should raise_error(NameError)
+    -> { ModuleSpecs::Autoload::ModuleAutoloadCallsRequire }.should.raise(NameError)
   end
 
   it "does not load the file if the file is manually required" do
@@ -156,9 +156,9 @@ class ModuleSpecs::Autoload::HClass
     ScratchPad.recorded.should == :loaded
     ScratchPad.clear
 
-    ModuleSpecs::Autoload::KHash.should be_kind_of(Class)
+    ModuleSpecs::Autoload::KHash.should.is_a?(Class)
     ModuleSpecs::Autoload::KHash::K.should == :autoload_k
-    ScratchPad.recorded.should be_nil
+    ScratchPad.recorded.should == nil
   end
 
   it "ignores the autoload request if the file is already loaded" do
@@ -171,7 +171,7 @@ class ModuleSpecs::Autoload::HClass
 
     ModuleSpecs::Autoload.autoload :S, filename
     @remove << :S
-    ModuleSpecs::Autoload.autoload?(:S).should be_nil
+    ModuleSpecs::Autoload.autoload?(:S).should == nil
   end
 
   it "retains the autoload even if the request to require fails" do
@@ -182,7 +182,7 @@ class ModuleSpecs::Autoload::HClass
 
     -> {
       require filename
-    }.should raise_error(LoadError)
+    }.should.raise(LoadError)
 
     ModuleSpecs::Autoload.autoload?(:NotThere).should == filename
   end
@@ -205,7 +205,7 @@ class ModuleSpecs::Autoload::HClass
     filename = fixture(__FILE__, "autoload_during_require_current_file.rb")
     require filename
 
-    ScratchPad.recorded.should be_nil
+    ScratchPad.recorded.should == nil
   end
 
   describe "interacting with defined?" do
@@ -215,9 +215,9 @@ module ModuleSpecs::Autoload::Dog
       end
 
       defined?(ModuleSpecs::Autoload::Dog::R).should == "constant"
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
 
-      ModuleSpecs::Autoload::Dog.should have_constant(:R)
+      ModuleSpecs::Autoload::Dog.should.const_defined?(:R, false)
     end
 
     it "loads an autoloaded parent when referencing a nested constant" do
@@ -235,7 +235,7 @@ module ModuleSpecs::Autoload
         autoload :BadParent, fixture(__FILE__, "autoload_exception.rb")
       end
 
-      defined?(ModuleSpecs::Autoload::BadParent::Nested).should be_nil
+      defined?(ModuleSpecs::Autoload::BadParent::Nested).should == nil
       ScratchPad.recorded.should == :exception
     end
   end
@@ -454,16 +454,16 @@ def check_before_during_thread_after(const, &check)
     ModuleSpecs::Autoload.autoload :Fail, @non_existent
 
     ModuleSpecs::Autoload.const_defined?(:Fail).should == true
-    ModuleSpecs::Autoload.should have_constant(:Fail)
+    ModuleSpecs::Autoload.should.const_defined?(:Fail, false)
     ModuleSpecs::Autoload.autoload?(:Fail).should == @non_existent
 
-    -> { ModuleSpecs::Autoload::Fail }.should raise_error(LoadError)
+    -> { ModuleSpecs::Autoload::Fail }.should.raise(LoadError)
 
-    ModuleSpecs::Autoload.should have_constant(:Fail)
+    ModuleSpecs::Autoload.should.const_defined?(:Fail, false)
     ModuleSpecs::Autoload.const_defined?(:Fail).should == true
     ModuleSpecs::Autoload.autoload?(:Fail).should == @non_existent
 
-    -> { ModuleSpecs::Autoload::Fail }.should raise_error(LoadError)
+    -> { ModuleSpecs::Autoload::Fail }.should.raise(LoadError)
   end
 
   it "does not remove the constant from Module#constants if load raises a RuntimeError and keeps it as an autoload" do
@@ -472,17 +472,17 @@ def check_before_during_thread_after(const, &check)
     ModuleSpecs::Autoload.autoload :Raise, path
 
     ModuleSpecs::Autoload.const_defined?(:Raise).should == true
-    ModuleSpecs::Autoload.should have_constant(:Raise)
+    ModuleSpecs::Autoload.should.const_defined?(:Raise, false)
     ModuleSpecs::Autoload.autoload?(:Raise).should == path
 
-    -> { ModuleSpecs::Autoload::Raise }.should raise_error(RuntimeError)
+    -> { ModuleSpecs::Autoload::Raise }.should.raise(RuntimeError)
     ScratchPad.recorded.should == [:raise]
 
-    ModuleSpecs::Autoload.should have_constant(:Raise)
+    ModuleSpecs::Autoload.should.const_defined?(:Raise, false)
     ModuleSpecs::Autoload.const_defined?(:Raise).should == true
     ModuleSpecs::Autoload.autoload?(:Raise).should == path
 
-    -> { ModuleSpecs::Autoload::Raise }.should raise_error(RuntimeError)
+    -> { ModuleSpecs::Autoload::Raise }.should.raise(RuntimeError)
     ScratchPad.recorded.should == [:raise, :raise]
   end
 
@@ -492,15 +492,15 @@ def check_before_during_thread_after(const, &check)
     ModuleSpecs::Autoload.autoload :O, path
 
     ModuleSpecs::Autoload.const_defined?(:O).should == true
-    ModuleSpecs::Autoload.should have_constant(:O)
+    ModuleSpecs::Autoload.should.const_defined?(:O, false)
     ModuleSpecs::Autoload.autoload?(:O).should == path
 
-    -> { ModuleSpecs::Autoload::O }.should raise_error(NameError)
+    -> { ModuleSpecs::Autoload::O }.should.raise(NameError)
 
     ModuleSpecs::Autoload.const_defined?(:O).should == false
-    ModuleSpecs::Autoload.should_not have_constant(:O)
+    ModuleSpecs::Autoload.should_not.const_defined?(:O)
     ModuleSpecs::Autoload.autoload?(:O).should == nil
-    -> { ModuleSpecs::Autoload.const_get(:O) }.should raise_error(NameError)
+    -> { ModuleSpecs::Autoload.const_get(:O) }.should.raise(NameError)
   end
 
   it "does not try to load the file again if the loaded file did not define the constant" do
@@ -508,13 +508,13 @@ def check_before_during_thread_after(const, &check)
     ScratchPad.record []
     ModuleSpecs::Autoload.autoload :NotDefinedByFile, path
 
-    -> { ModuleSpecs::Autoload::NotDefinedByFile }.should raise_error(NameError)
+    -> { ModuleSpecs::Autoload::NotDefinedByFile }.should.raise(NameError)
     ScratchPad.recorded.should == [:loaded]
-    -> { ModuleSpecs::Autoload::NotDefinedByFile }.should raise_error(NameError)
+    -> { ModuleSpecs::Autoload::NotDefinedByFile }.should.raise(NameError)
     ScratchPad.recorded.should == [:loaded]
 
     Thread.new {
-      -> { ModuleSpecs::Autoload::NotDefinedByFile }.should raise_error(NameError)
+      -> { ModuleSpecs::Autoload::NotDefinedByFile }.should.raise(NameError)
     }.join
     ScratchPad.recorded.should == [:loaded]
   end
@@ -524,7 +524,7 @@ module ModuleSpecs::Autoload::Q
       autoload :R, fixture(__FILE__, "autoload.rb")
       defined?(R).should == 'constant'
     end
-    ModuleSpecs::Autoload::Q.should have_constant(:R)
+    ModuleSpecs::Autoload::Q.should.const_defined?(:R, false)
   end
 
   it "does not load the file when removing an autoload constant" do
@@ -532,13 +532,13 @@ module ModuleSpecs::Autoload::Q
       autoload :R, fixture(__FILE__, "autoload.rb")
       remove_const :R
     end
-    ModuleSpecs::Autoload::Q.should_not have_constant(:R)
+    ModuleSpecs::Autoload::Q.should_not.const_defined?(:R)
   end
 
   it "does not load the file when accessing the constants table of the module" do
     ModuleSpecs::Autoload.autoload :P, @non_existent
-    ModuleSpecs::Autoload.const_defined?(:P).should be_true
-    ModuleSpecs::Autoload.const_defined?("P").should be_true
+    ModuleSpecs::Autoload.const_defined?(:P).should == true
+    ModuleSpecs::Autoload.const_defined?("P").should == true
   end
 
   it "loads the file when opening a module that is the autoloaded constant" do
@@ -573,8 +573,8 @@ class LexicalScope
           DeclaredAndDefinedInParent.should == :declared_and_defined_in_parent
 
           # The constant is really in Autoload, not Autoload::LexicalScope
-          self.should_not have_constant(:DeclaredAndDefinedInParent)
-          -> { const_get(:DeclaredAndDefinedInParent) }.should raise_error(NameError)
+          self.should_not.const_defined?(:DeclaredAndDefinedInParent)
+          -> { const_get(:DeclaredAndDefinedInParent) }.should.raise(NameError)
         end
         DeclaredAndDefinedInParent.should == :declared_and_defined_in_parent
       end
@@ -597,7 +597,7 @@ class LexicalScope
         # Basically, the parent autoload constant remains in a "undefined" state
         self.autoload?(:DeclaredInParentDefinedInCurrent).should == nil
         const_defined?(:DeclaredInParentDefinedInCurrent).should == false
-        -> { DeclaredInParentDefinedInCurrent }.should raise_error(NameError)
+        -> { DeclaredInParentDefinedInCurrent }.should.raise(NameError)
 
         ModuleSpecs::Autoload::LexicalScope.send(:remove_const, :DeclaredInParentDefinedInCurrent)
       end
@@ -640,11 +640,11 @@ module ModuleSpecs::Autoload
 
         class LexicalScope
           autoload :DeclaredInCurrentDefinedInParent, fixture(__FILE__, "autoload_callback.rb")
-          -> { DeclaredInCurrentDefinedInParent }.should_not raise_error(NameError)
+          -> { DeclaredInCurrentDefinedInParent }.should_not.raise(NameError)
           # Basically, the autoload constant remains in a "undefined" state
           self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
           const_defined?(:DeclaredInCurrentDefinedInParent).should == false
-          -> { const_get(:DeclaredInCurrentDefinedInParent) }.should raise_error(NameError)
+          -> { const_get(:DeclaredInCurrentDefinedInParent) }.should.raise(NameError)
         end
 
         DeclaredInCurrentDefinedInParent.should == :declared_in_current_defined_in_parent
@@ -714,7 +714,7 @@ def r
           end
         end
       end
-      ModuleSpecs::Autoload.r.should be_kind_of(ModuleSpecs::Autoload::MetaScope)
+      ModuleSpecs::Autoload.r.should.is_a?(ModuleSpecs::Autoload::MetaScope)
     end
   end
 
@@ -724,13 +724,13 @@ module ModuleSpecs::Autoload
       autoload :DynClass, fixture(__FILE__, "autoload_c.rb")
       private_constant :DynClass
 
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
 
       DynClass::C.new.loaded.should == :dynclass_c
       ScratchPad.recorded.should == :loaded
     end
 
-    -> { ModuleSpecs::Autoload::DynClass }.should raise_error(NameError, /private constant/)
+    -> { ModuleSpecs::Autoload::DynClass }.should.raise(NameError, /private constant/)
   end
 
   # [ruby-core:19127] [ruby-core:29941]
@@ -745,7 +745,7 @@ class Y
     end
     @remove << :W
 
-    ModuleSpecs::Autoload::W::Y.should be_kind_of(Class)
+    ModuleSpecs::Autoload::W::Y.should.is_a?(Class)
     ScratchPad.recorded.should == :loaded
   end
 
@@ -760,7 +760,7 @@ module ModuleSpecs::Autoload
     -> {
       Kernel.require fixture(__FILE__, "autoload_during_require.rb")
     }.should_not complain(verbose: true)
-    ModuleSpecs::Autoload::AutoloadDuringRequire.should be_kind_of(Class)
+    ModuleSpecs::Autoload::AutoloadDuringRequire.should.is_a?(Class)
   end
 
   it "does not call #require a second time and does not warn if feature sets and trigger autoload on itself" do
@@ -770,15 +770,15 @@ module ModuleSpecs::Autoload
     -> {
       Kernel.require fixture(__FILE__, "autoload_self_during_require.rb")
     }.should_not complain(verbose: true)
-    ModuleSpecs::Autoload::AutoloadSelfDuringRequire.should be_kind_of(Class)
+    ModuleSpecs::Autoload::AutoloadSelfDuringRequire.should.is_a?(Class)
   end
 
   it "handles multiple autoloads in the same file" do
     $LOAD_PATH.unshift(File.expand_path('../fixtures/multi', __FILE__))
     begin
       require 'foo/bar_baz'
-      ModuleSpecs::Autoload::Foo::Bar.should be_kind_of(Class)
-      ModuleSpecs::Autoload::Foo::Baz.should be_kind_of(Class)
+      ModuleSpecs::Autoload::Foo::Bar.should.is_a?(Class)
+      ModuleSpecs::Autoload::Foo::Baz.should.is_a?(Class)
     ensure
       $LOAD_PATH.shift
     end
@@ -791,19 +791,19 @@ module ModuleSpecs::Autoload
   end
 
   it "raises an ArgumentError when an empty filename is given" do
-    -> { ModuleSpecs.autoload :A, "" }.should raise_error(ArgumentError)
+    -> { ModuleSpecs.autoload :A, "" }.should.raise(ArgumentError)
   end
 
   it "raises a NameError when the constant name starts with a lower case letter" do
-    -> { ModuleSpecs.autoload "a", @non_existent }.should raise_error(NameError)
+    -> { ModuleSpecs.autoload "a", @non_existent }.should.raise(NameError)
   end
 
   it "raises a NameError when the constant name starts with a number" do
-    -> { ModuleSpecs.autoload "1two", @non_existent }.should raise_error(NameError)
+    -> { ModuleSpecs.autoload "1two", @non_existent }.should.raise(NameError)
   end
 
   it "raises a NameError when the constant name has a space in it" do
-    -> { ModuleSpecs.autoload "a name", @non_existent }.should raise_error(NameError)
+    -> { ModuleSpecs.autoload "a name", @non_existent }.should.raise(NameError)
   end
 
   it "shares the autoload request across dup'ed copies of modules" do
@@ -820,7 +820,7 @@ module ModuleSpecs::Autoload
     mod2.autoload?(:T).should == filename
 
     mod1::T.should == :autoload_t
-    -> { mod2::T }.should raise_error(NameError)
+    -> { mod2::T }.should.raise(NameError)
   end
 
   it "raises a TypeError if opening a class with a different superclass than the class defined in the autoload file" do
@@ -831,27 +831,27 @@ class ModuleSpecs::Autoload::ZZ
     -> do
       class ModuleSpecs::Autoload::Z < ModuleSpecs::Autoload::ZZ
       end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if not passed a String or object responding to #to_path for the filename" do
     name = mock("autoload_name.rb")
 
-    -> { ModuleSpecs::Autoload.autoload :Str, name }.should raise_error(TypeError)
+    -> { ModuleSpecs::Autoload.autoload :Str, name }.should.raise(TypeError)
   end
 
   it "calls #to_path on non-String filename arguments" do
     name = mock("autoload_name.rb")
     name.should_receive(:to_path).and_return("autoload_name.rb")
 
-    -> { ModuleSpecs::Autoload.autoload :Str, name }.should_not raise_error
+    -> { ModuleSpecs::Autoload.autoload :Str, name }.should_not.raise
   end
 
   describe "on a frozen module" do
     it "raises a FrozenError before setting the name" do
       frozen_module = Module.new.freeze
-      -> { frozen_module.autoload :Foo, @non_existent }.should raise_error(FrozenError)
-      frozen_module.should_not have_constant(:Foo)
+      -> { frozen_module.autoload :Foo, @non_existent }.should.raise(FrozenError)
+      frozen_module.should_not.const_defined?(:Foo)
     end
   end
 
@@ -916,7 +916,7 @@ class ModuleSpecs::Autoload::Z < ModuleSpecs::Autoload::ZZ
       t1_val.should == 1
       t2_val.should == t1_val
 
-      t2_exc.should be_nil
+      t2_exc.should == nil
     end
 
     # https://bugs.ruby-lang.org/issues/10892
@@ -948,7 +948,7 @@ class ModuleSpecs::Autoload::Z < ModuleSpecs::Autoload::ZZ
 
             begin
               Object.const_get(mod_name).foo
-            rescue NoMethodError
+            rescue NameError, NoMethodError # rubocop:disable Lint/ShadowedException
               barrier.disable!
               break false
             end
@@ -956,8 +956,8 @@ class ModuleSpecs::Autoload::Z < ModuleSpecs::Autoload::ZZ
         end
       end
 
-      # check that no thread got a NoMethodError because of partially loaded module
-      threads.all? {|t| t.value}.should be_true
+      # check that no thread got a NameError or NoMethodError because of partially loaded module
+      threads.all? {|t| t.value}.should == true
 
       # check that the autoloaded file was evaled exactly once
       ScratchPad.recorded.get.should == mod_count
@@ -965,6 +965,8 @@ class ModuleSpecs::Autoload::Z < ModuleSpecs::Autoload::ZZ
       mod_names.each do |mod_name|
         Object.send(:remove_const, mod_name)
       end
+    ensure
+      threads.each(&:join) if threads
     end
 
     it "raises a NameError in each thread if the constant is not set" do
@@ -988,7 +990,7 @@ class ModuleSpecs::Autoload::Z < ModuleSpecs::Autoload::ZZ
 
       start = true
       threads.each { |t|
-        t.value.should be_an_instance_of(NameError)
+        t.value.should.instance_of?(NameError)
       }
     end
 
@@ -1013,7 +1015,7 @@ class ModuleSpecs::Autoload::Z < ModuleSpecs::Autoload::ZZ
 
       start = true
       threads.each { |t|
-        t.value.should be_an_instance_of(LoadError)
+        t.value.should.instance_of?(LoadError)
       }
     end
   end
diff --git a/spec/ruby/core/module/class_variable_defined_spec.rb b/spec/ruby/core/module/class_variable_defined_spec.rb
index c0f2072a371..dedce9589aa 100644
--- a/spec/ruby/core/module/class_variable_defined_spec.rb
+++ b/spec/ruby/core/module/class_variable_defined_spec.rb
@@ -19,13 +19,13 @@
     obj = mock("metaclass class variable")
     meta = obj.singleton_class
     meta.send :class_variable_set, :@@var, 1
-    meta.send(:class_variable_defined?, :@@var).should be_true
+    meta.send(:class_variable_defined?, :@@var).should == true
   end
 
   it "returns false if the class variable is not defined in a metaclass" do
     obj = mock("metaclass class variable")
     meta = obj.singleton_class
-    meta.class_variable_defined?(:@@var).should be_false
+    meta.class_variable_defined?(:@@var).should == false
   end
 
   it "returns true if a class variables with the given name is defined in an included module" do
@@ -44,11 +44,11 @@
 
     -> {
       c.class_variable_defined?(:invalid_name)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
 
     -> {
       c.class_variable_defined?("@invalid_name")
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "converts a non string/symbol name to string using to_str" do
@@ -62,11 +62,11 @@
     o = mock('123')
     -> {
       c.class_variable_defined?(o)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
 
     o.should_receive(:to_str).and_return(123)
     -> {
       c.class_variable_defined?(o)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/class_variable_get_spec.rb b/spec/ruby/core/module/class_variable_get_spec.rb
index e5d06731ec4..13f06cb94ad 100644
--- a/spec/ruby/core/module/class_variable_get_spec.rb
+++ b/spec/ruby/core/module/class_variable_get_spec.rb
@@ -15,8 +15,8 @@
 
   it "raises a NameError for a class variable named '@@'" do
     c = Class.new
-    -> { c.send(:class_variable_get, "@@") }.should raise_error(NameError)
-    -> { c.send(:class_variable_get, :"@@") }.should raise_error(NameError)
+    -> { c.send(:class_variable_get, "@@") }.should.raise(NameError)
+    -> { c.send(:class_variable_get, :"@@") }.should.raise(NameError)
   end
 
   it "raises a NameError for a class variables with the given name defined in an extended module" do
@@ -24,7 +24,7 @@
     c.extend ModuleSpecs::MVars
     -> {
       c.send(:class_variable_get, "@@mvar")
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "returns class variables defined in the class body and accessed in the metaclass" do
@@ -49,15 +49,15 @@
   it "raises a NameError when an uninitialized class variable is accessed" do
     c = Class.new
     [:@@no_class_var, "@@no_class_var"].each do |cvar|
-      ->  { c.send(:class_variable_get, cvar) }.should raise_error(NameError)
+      ->  { c.send(:class_variable_get, cvar) }.should.raise(NameError)
     end
   end
 
   it "raises a NameError when the given name is not allowed" do
     c = Class.new
 
-    -> { c.send(:class_variable_get, :invalid_name)   }.should raise_error(NameError)
-    -> { c.send(:class_variable_get, "@invalid_name") }.should raise_error(NameError)
+    -> { c.send(:class_variable_get, :invalid_name)   }.should.raise(NameError)
+    -> { c.send(:class_variable_get, "@invalid_name") }.should.raise(NameError)
   end
 
   it "converts a non string/symbol name to string using to_str" do
@@ -69,8 +69,8 @@
   it "raises a TypeError when the given names can't be converted to strings using to_str" do
     c = Class.new { class_variable_set :@@class_var, "test" }
     o = mock('123')
-    -> { c.send(:class_variable_get, o) }.should raise_error(TypeError)
+    -> { c.send(:class_variable_get, o) }.should.raise(TypeError)
     o.should_receive(:to_str).and_return(123)
-    -> { c.send(:class_variable_get, o) }.should raise_error(TypeError)
+    -> { c.send(:class_variable_get, o) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/class_variable_set_spec.rb b/spec/ruby/core/module/class_variable_set_spec.rb
index 63f32f5389d..a3d759767b0 100644
--- a/spec/ruby/core/module/class_variable_set_spec.rb
+++ b/spec/ruby/core/module/class_variable_set_spec.rb
@@ -28,10 +28,10 @@
   it "raises a FrozenError when self is frozen" do
     -> {
       Class.new.freeze.send(:class_variable_set, :@@test, "test")
-    }.should raise_error(FrozenError)
+    }.should.raise(FrozenError)
     -> {
       Module.new.freeze.send(:class_variable_set, :@@test, "test")
-    }.should raise_error(FrozenError)
+    }.should.raise(FrozenError)
   end
 
   it "raises a NameError when the given name is not allowed" do
@@ -39,10 +39,10 @@
 
     -> {
       c.send(:class_variable_set, :invalid_name, "test")
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
     -> {
       c.send(:class_variable_set, "@invalid_name", "test")
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "converts a non string/symbol name to string using to_str" do
@@ -55,8 +55,8 @@
   it "raises a TypeError when the given names can't be converted to strings using to_str" do
     c = Class.new { class_variable_set :@@class_var, "test" }
     o = mock('123')
-    -> { c.send(:class_variable_set, o, "test") }.should raise_error(TypeError)
+    -> { c.send(:class_variable_set, o, "test") }.should.raise(TypeError)
     o.should_receive(:to_str).and_return(123)
-    -> { c.send(:class_variable_set, o, "test") }.should raise_error(TypeError)
+    -> { c.send(:class_variable_set, o, "test") }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/class_variables_spec.rb b/spec/ruby/core/module/class_variables_spec.rb
index e155f1deac2..9529df48aec 100644
--- a/spec/ruby/core/module/class_variables_spec.rb
+++ b/spec/ruby/core/module/class_variables_spec.rb
@@ -3,8 +3,8 @@
 
 describe "Module#class_variables" do
   it "returns an Array with the names of class variables of self" do
-    ModuleSpecs::ClassVars::A.class_variables.should include(:@@a_cvar)
-    ModuleSpecs::ClassVars::M.class_variables.should include(:@@m_cvar)
+    ModuleSpecs::ClassVars::A.class_variables.should.include?(:@@a_cvar)
+    ModuleSpecs::ClassVars::M.class_variables.should.include?(:@@m_cvar)
   end
 
   it "returns an Array of Symbols of class variable names defined in a metaclass" do
@@ -15,13 +15,13 @@
   end
 
   it "returns an Array with names of class variables defined in metaclasses" do
-    ModuleSpecs::CVars.class_variables.should include(:@@cls, :@@meta)
+    ModuleSpecs::CVars.class_variables.to_set.should >= Set[:@@cls, :@@meta]
   end
 
   it "does not return class variables defined in extended modules" do
     c = Class.new
     c.extend ModuleSpecs::MVars
-    c.class_variables.should_not include(:@@mvar)
+    c.class_variables.should_not.include?(:@@mvar)
   end
 
   it "returns the correct class variables when inherit is given" do
diff --git a/spec/ruby/core/module/const_added_spec.rb b/spec/ruby/core/module/const_added_spec.rb
index 90cd36551aa..b60af7a2e81 100644
--- a/spec/ruby/core/module/const_added_spec.rb
+++ b/spec/ruby/core/module/const_added_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Module#const_added" do
   it "is a private instance method" do
-    Module.should have_private_instance_method(:const_added)
+    Module.private_instance_methods(false).should.include?(:const_added)
   end
 
   it "returns nil in the default implementation" do
diff --git a/spec/ruby/core/module/const_defined_spec.rb b/spec/ruby/core/module/const_defined_spec.rb
index 8b137cd1340..9d973c2b2b1 100644
--- a/spec/ruby/core/module/const_defined_spec.rb
+++ b/spec/ruby/core/module/const_defined_spec.rb
@@ -14,40 +14,40 @@
 
   it "returns true if the constant is defined in the receiver's superclass" do
     # CS_CONST4 is defined in the superclass of ChildA
-    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4).should be_true
+    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4).should == true
   end
 
   it "returns true if the constant is defined in a mixed-in module of the receiver's parent" do
     # CS_CONST10 is defined in a module included by ChildA
-    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST10).should be_true
+    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST10).should == true
   end
 
   it "returns true if the constant is defined in a mixed-in module (with prepends) of the receiver" do
     # CS_CONST11 is defined in the module included by ContainerPrepend
-    ConstantSpecs::ContainerPrepend.const_defined?(:CS_CONST11).should be_true
+    ConstantSpecs::ContainerPrepend.const_defined?(:CS_CONST11).should == true
   end
 
   it "returns true if the constant is defined in Object and the receiver is a module" do
     # CS_CONST1 is defined in Object
-    ConstantSpecs::ModuleA.const_defined?(:CS_CONST1).should be_true
+    ConstantSpecs::ModuleA.const_defined?(:CS_CONST1).should == true
   end
 
   it "returns true if the constant is defined in Object and the receiver is a class that has Object among its ancestors" do
     # CS_CONST1 is defined in Object
-    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST1).should be_true
+    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST1).should == true
   end
 
   it "returns false if the constant is defined in the receiver's superclass and the inherit flag is false" do
-    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4, false).should be_false
+    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4, false).should == false
   end
 
   it "returns true if the constant is defined in the receiver's superclass and the inherit flag is true" do
-    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4, true).should be_true
+    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4, true).should == true
   end
 
   it "coerces the inherit flag to a boolean" do
-    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4, nil).should be_false
-    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4, :true).should be_true
+    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4, nil).should == false
+    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4, :true).should == true
   end
 
   it "returns true if the given String names a constant defined in the receiver" do
@@ -58,23 +58,23 @@
   end
 
   it "returns true when passed a constant name with unicode characters" do
-    ConstantUnicodeSpecs.const_defined?("CS_CONSTλ").should be_true
+    ConstantUnicodeSpecs.const_defined?("CS_CONSTλ").should == true
   end
 
   it "returns true when passed a constant name with EUC-JP characters" do
     str = "CS_CONSTλ".encode("euc-jp")
     ConstantSpecs.const_set str, 1
-    ConstantSpecs.const_defined?(str).should be_true
+    ConstantSpecs.const_defined?(str).should == true
   ensure
     ConstantSpecs.send(:remove_const, str)
   end
 
   it "returns false if the constant is not defined in the receiver, its superclass, or any included modules" do
     # The following constant isn't defined at all.
-    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4726).should be_false
+    ConstantSpecs::ContainerA::ChildA.const_defined?(:CS_CONST4726).should == false
     # DETACHED_CONSTANT is defined in ConstantSpecs::Detached, which isn't
     # included by or inherited from ParentA
-    ConstantSpecs::ParentA.const_defined?(:DETACHED_CONSTANT).should be_false
+    ConstantSpecs::ParentA.const_defined?(:DETACHED_CONSTANT).should == false
   end
 
   it "does not call #const_missing if the constant is not defined in the receiver" do
@@ -90,59 +90,59 @@
     end
 
     it "raises a TypeError if the given name can't be converted to a String" do
-      -> { ConstantSpecs.const_defined?(nil) }.should raise_error(TypeError)
-      -> { ConstantSpecs.const_defined?([])  }.should raise_error(TypeError)
+      -> { ConstantSpecs.const_defined?(nil) }.should.raise(TypeError)
+      -> { ConstantSpecs.const_defined?([])  }.should.raise(TypeError)
     end
 
     it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to a String" do
       name = mock("classA")
       name.should_receive(:to_str).and_raise(NoMethodError)
-      -> { ConstantSpecs.const_defined?(name) }.should raise_error(NoMethodError)
+      -> { ConstantSpecs.const_defined?(name) }.should.raise(NoMethodError)
     end
   end
 
   it "special cases Object and checks it's included Modules" do
-    Object.const_defined?(:CS_CONST10).should be_true
+    Object.const_defined?(:CS_CONST10).should == true
   end
 
   it "returns true for toplevel constant when the name begins with '::'" do
-    ConstantSpecs.const_defined?("::Array").should be_true
+    ConstantSpecs.const_defined?("::Array").should == true
   end
 
   it "returns true when passed a scoped constant name" do
-    ConstantSpecs.const_defined?("ClassC::CS_CONST1").should be_true
+    ConstantSpecs.const_defined?("ClassC::CS_CONST1").should == true
   end
 
   it "returns true when passed a scoped constant name for a constant in the inheritance hierarchy and the inherited flag is default" do
-    ConstantSpecs::ClassD.const_defined?("ClassE::CS_CONST2").should be_true
+    ConstantSpecs::ClassD.const_defined?("ClassE::CS_CONST2").should == true
   end
 
   it "returns true when passed a scoped constant name for a constant in the inheritance hierarchy and the inherited flag is true" do
-    ConstantSpecs::ClassD.const_defined?("ClassE::CS_CONST2", true).should be_true
+    ConstantSpecs::ClassD.const_defined?("ClassE::CS_CONST2", true).should == true
   end
 
   it "returns false when passed a scoped constant name for a constant in the inheritance hierarchy and the inherited flag is false" do
-    ConstantSpecs::ClassD.const_defined?("ClassE::CS_CONST2", false).should be_false
+    ConstantSpecs::ClassD.const_defined?("ClassE::CS_CONST2", false).should == false
   end
 
   it "returns false when the name begins with '::' and the toplevel constant does not exist" do
-    ConstantSpecs.const_defined?("::Name").should be_false
+    ConstantSpecs.const_defined?("::Name").should == false
   end
 
   it "raises a NameError if the name does not start with a capital letter" do
-    -> { ConstantSpecs.const_defined? "name" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_defined? "name" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name starts with '_'" do
-    -> { ConstantSpecs.const_defined? "__CONSTX__" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_defined? "__CONSTX__" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name starts with '@'" do
-    -> { ConstantSpecs.const_defined? "@Name" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_defined? "@Name" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name starts with '!'" do
-    -> { ConstantSpecs.const_defined? "!Name" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_defined? "!Name" }.should.raise(NameError)
   end
 
   it "returns true or false for the nested name" do
@@ -155,15 +155,15 @@
 
   it "raises a NameError if the name contains non-alphabetic characters except '_'" do
     ConstantSpecs.const_defined?("CS_CONSTX").should == false
-    -> { ConstantSpecs.const_defined? "Name=" }.should raise_error(NameError)
-    -> { ConstantSpecs.const_defined? "Name?" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_defined? "Name=" }.should.raise(NameError)
+    -> { ConstantSpecs.const_defined? "Name?" }.should.raise(NameError)
   end
 
   it "raises a TypeError if conversion to a String by calling #to_str fails" do
     name = mock('123')
-    -> { ConstantSpecs.const_defined? name }.should raise_error(TypeError)
+    -> { ConstantSpecs.const_defined? name }.should.raise(TypeError)
 
     name.should_receive(:to_str).and_return(123)
-    -> { ConstantSpecs.const_defined? name }.should raise_error(TypeError)
+    -> { ConstantSpecs.const_defined? name }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/const_get_spec.rb b/spec/ruby/core/module/const_get_spec.rb
index 4b53cbe7b3f..68b5594faa6 100644
--- a/spec/ruby/core/module/const_get_spec.rb
+++ b/spec/ruby/core/module/const_get_spec.rb
@@ -9,28 +9,28 @@
   end
 
   it "raises a NameError if no constant is defined in the search path" do
-    -> { ConstantSpecs.const_get :CS_CONSTX }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get :CS_CONSTX }.should.raise(NameError)
   end
 
   it "raises a NameError with the not found constant symbol" do
     error_inspection = -> e { e.name.should == :CS_CONSTX }
-    -> { ConstantSpecs.const_get :CS_CONSTX }.should raise_error(NameError, &error_inspection)
+    -> { ConstantSpecs.const_get :CS_CONSTX }.should.raise(NameError, &error_inspection)
   end
 
   it "raises a NameError if the name does not start with a capital letter" do
-    -> { ConstantSpecs.const_get "name" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get "name" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name starts with a non-alphabetic character" do
-    -> { ConstantSpecs.const_get "__CONSTX__" }.should raise_error(NameError)
-    -> { ConstantSpecs.const_get "@CS_CONST1" }.should raise_error(NameError)
-    -> { ConstantSpecs.const_get "!CS_CONST1" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get "__CONSTX__" }.should.raise(NameError)
+    -> { ConstantSpecs.const_get "@CS_CONST1" }.should.raise(NameError)
+    -> { ConstantSpecs.const_get "!CS_CONST1" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name contains non-alphabetic characters except '_'" do
     Object.const_get("CS_CONST1").should == :const1
-    -> { ConstantSpecs.const_get "CS_CONST1=" }.should raise_error(NameError)
-    -> { ConstantSpecs.const_get "CS_CONST1?" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get "CS_CONST1=" }.should.raise(NameError)
+    -> { ConstantSpecs.const_get "CS_CONST1?" }.should.raise(NameError)
   end
 
   it "calls #to_str to convert the given name to a String" do
@@ -41,10 +41,10 @@
 
   it "raises a TypeError if conversion to a String by calling #to_str fails" do
     name = mock('123')
-    -> { ConstantSpecs.const_get(name) }.should raise_error(TypeError)
+    -> { ConstantSpecs.const_get(name) }.should.raise(TypeError)
 
     name.should_receive(:to_str).and_return(123)
-    -> { ConstantSpecs.const_get(name) }.should raise_error(TypeError)
+    -> { ConstantSpecs.const_get(name) }.should.raise(TypeError)
   end
 
   it "calls #const_missing on the receiver if unable to locate the constant" do
@@ -55,21 +55,21 @@
   it "does not search the singleton class of a Class or Module" do
     -> do
       ConstantSpecs::ContainerA::ChildA.const_get(:CS_CONST14)
-    end.should raise_error(NameError)
-    -> { ConstantSpecs.const_get(:CS_CONST14) }.should raise_error(NameError)
+    end.should.raise(NameError)
+    -> { ConstantSpecs.const_get(:CS_CONST14) }.should.raise(NameError)
   end
 
   it "does not search the containing scope" do
     ConstantSpecs::ContainerA::ChildA.const_get(:CS_CONST20).should == :const20_2
     -> do
       ConstantSpecs::ContainerA::ChildA.const_get(:CS_CONST5)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError if the constant is defined in the receiver's superclass and the inherit flag is false" do
     -> do
       ConstantSpecs::ContainerA::ChildA.const_get(:CS_CONST4, false)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "searches into the receiver superclasses if the inherit flag is true" do
@@ -79,13 +79,13 @@
   it "raises a NameError when the receiver is a Module, the constant is defined at toplevel and the inherit flag is false" do
     -> do
       ConstantSpecs::ModuleA.const_get(:CS_CONST1, false)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError when the receiver is a Class, the constant is defined at toplevel and the inherit flag is false" do
     -> do
       ConstantSpecs::ContainerA::ChildA.const_get(:CS_CONST1, false)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "coerces the inherit flag to a boolean" do
@@ -93,7 +93,7 @@
 
     -> do
       ConstantSpecs::ContainerA::ChildA.const_get(:CS_CONST1, nil)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "accepts a toplevel scope qualifier" do
@@ -102,7 +102,7 @@
 
   it "accepts a toplevel scope qualifier when inherit is false" do
     ConstantSpecs.const_get("::CS_CONST1", false).should == :const1
-    -> { ConstantSpecs.const_get("CS_CONST1", false) }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get("CS_CONST1", false) }.should.raise(NameError)
   end
 
   it "returns a constant whose module is defined the toplevel" do
@@ -115,19 +115,19 @@
   end
 
   it "raises a NameError if the name includes two successive scope separators" do
-    -> { ConstantSpecs.const_get("ClassA::::CS_CONST10") }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get("ClassA::::CS_CONST10") }.should.raise(NameError)
   end
 
   it "raises a NameError if only '::' is passed" do
-    -> { ConstantSpecs.const_get("::") }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get("::") }.should.raise(NameError)
   end
 
   it "raises a NameError if a Symbol has a toplevel scope qualifier" do
-    -> { ConstantSpecs.const_get(:'::CS_CONST1') }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get(:'::CS_CONST1') }.should.raise(NameError)
   end
 
   it "raises a NameError if a Symbol is a scoped constant name" do
-    -> { ConstantSpecs.const_get(:'ClassA::CS_CONST10') }.should raise_error(NameError)
+    -> { ConstantSpecs.const_get(:'ClassA::CS_CONST10') }.should.raise(NameError)
   end
 
   it "does read private constants" do
@@ -151,7 +151,7 @@
   end
 
   it "raises a NameError when the nested constant does not exist on the module but exists in Object" do
-    -> { Object.const_get('ConstantSpecs::CS_CONST1') }.should raise_error(NameError)
+    -> { Object.const_get('ConstantSpecs::CS_CONST1') }.should.raise(NameError)
   end
 
   describe "with statically assigned constants" do
diff --git a/spec/ruby/core/module/const_missing_spec.rb b/spec/ruby/core/module/const_missing_spec.rb
index 742218281c7..80a2caccabd 100644
--- a/spec/ruby/core/module/const_missing_spec.rb
+++ b/spec/ruby/core/module/const_missing_spec.rb
@@ -13,7 +13,7 @@
   it "raises NameError and includes the name of the value that wasn't found" do
     -> {
       ConstantSpecs.const_missing("HelloMissing")
-    }.should raise_error(NameError, /ConstantSpecs::HelloMissing/)
+    }.should.raise(NameError, /ConstantSpecs::HelloMissing/)
   end
 
   it "raises NameError and does not include toplevel Object" do
diff --git a/spec/ruby/core/module/const_set_spec.rb b/spec/ruby/core/module/const_set_spec.rb
index 823768b882a..aa3c6bbcfc4 100644
--- a/spec/ruby/core/module/const_set_spec.rb
+++ b/spec/ruby/core/module/const_set_spec.rb
@@ -50,20 +50,20 @@
   end
 
   it "raises a NameError if the name does not start with a capital letter" do
-    -> { ConstantSpecs.const_set "name", 1 }.should raise_error(NameError)
+    -> { ConstantSpecs.const_set "name", 1 }.should.raise(NameError)
   end
 
   it "raises a NameError if the name starts with a non-alphabetic character" do
-    -> { ConstantSpecs.const_set "__CONSTX__", 1 }.should raise_error(NameError)
-    -> { ConstantSpecs.const_set "@Name", 1 }.should raise_error(NameError)
-    -> { ConstantSpecs.const_set "!Name", 1 }.should raise_error(NameError)
-    -> { ConstantSpecs.const_set "::Name", 1 }.should raise_error(NameError)
+    -> { ConstantSpecs.const_set "__CONSTX__", 1 }.should.raise(NameError)
+    -> { ConstantSpecs.const_set "@Name", 1 }.should.raise(NameError)
+    -> { ConstantSpecs.const_set "!Name", 1 }.should.raise(NameError)
+    -> { ConstantSpecs.const_set "::Name", 1 }.should.raise(NameError)
   end
 
   it "raises a NameError if the name contains non-alphabetic characters except '_'" do
     ConstantSpecs.const_set("CS_CONST404", :const404).should == :const404
-    -> { ConstantSpecs.const_set "Name=", 1 }.should raise_error(NameError)
-    -> { ConstantSpecs.const_set "Name?", 1 }.should raise_error(NameError)
+    -> { ConstantSpecs.const_set "Name=", 1 }.should.raise(NameError)
+    -> { ConstantSpecs.const_set "Name?", 1 }.should.raise(NameError)
   ensure
     ConstantSpecs.send(:remove_const, :CS_CONST404)
   end
@@ -79,10 +79,10 @@
 
   it "raises a TypeError if conversion to a String by calling #to_str fails" do
     name = mock('123')
-    -> { ConstantSpecs.const_set name, 1 }.should raise_error(TypeError)
+    -> { ConstantSpecs.const_set name, 1 }.should.raise(TypeError)
 
     name.should_receive(:to_str).and_return(123)
-    -> { ConstantSpecs.const_set name, 1 }.should raise_error(TypeError)
+    -> { ConstantSpecs.const_set name, 1 }.should.raise(TypeError)
   end
 
   describe "when overwriting an existing constant" do
@@ -110,7 +110,7 @@
       mod = Module.new
 
       mod.autoload :Foo, path
-      -> { mod::Foo }.should raise_error(NameError)
+      -> { mod::Foo }.should.raise(NameError)
 
       mod.const_defined?(:Foo).should == false
       mod.autoload?(:Foo).should == nil
@@ -138,8 +138,8 @@
     end
 
     it "raises a FrozenError before setting the name" do
-      -> { @frozen.const_set @name, nil }.should raise_error(FrozenError)
-      @frozen.should_not have_constant(@name)
+      -> { @frozen.const_set @name, nil }.should.raise(FrozenError)
+      @frozen.should_not.const_defined?(@name)
     end
   end
 end
diff --git a/spec/ruby/core/module/const_source_location_spec.rb b/spec/ruby/core/module/const_source_location_spec.rb
index 96649ea10bd..e6cef727e27 100644
--- a/spec/ruby/core/module/const_source_location_spec.rb
+++ b/spec/ruby/core/module/const_source_location_spec.rb
@@ -142,19 +142,19 @@
   end
 
   it "raises a NameError if the name does not start with a capital letter" do
-    -> { ConstantSpecs.const_source_location "name" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_source_location "name" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name starts with a non-alphabetic character" do
-    -> { ConstantSpecs.const_source_location "__CONSTX__" }.should raise_error(NameError)
-    -> { ConstantSpecs.const_source_location "@CS_CONST1" }.should raise_error(NameError)
-    -> { ConstantSpecs.const_source_location "!CS_CONST1" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_source_location "__CONSTX__" }.should.raise(NameError)
+    -> { ConstantSpecs.const_source_location "@CS_CONST1" }.should.raise(NameError)
+    -> { ConstantSpecs.const_source_location "!CS_CONST1" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name contains non-alphabetic characters except '_'" do
     Object.const_source_location("CS_CONST1").should == [@constants_fixture_path, CS_CONST1_LINE]
-    -> { ConstantSpecs.const_source_location "CS_CONST1=" }.should raise_error(NameError)
-    -> { ConstantSpecs.const_source_location "CS_CONST1?" }.should raise_error(NameError)
+    -> { ConstantSpecs.const_source_location "CS_CONST1=" }.should.raise(NameError)
+    -> { ConstantSpecs.const_source_location "CS_CONST1?" }.should.raise(NameError)
   end
 
   it "calls #to_str to convert the given name to a String" do
@@ -165,10 +165,10 @@
 
   it "raises a TypeError if conversion to a String by calling #to_str fails" do
     name = mock('123')
-    -> { ConstantSpecs.const_source_location(name) }.should raise_error(TypeError)
+    -> { ConstantSpecs.const_source_location(name) }.should.raise(TypeError)
 
     name.should_receive(:to_str).and_return(123)
-    -> { ConstantSpecs.const_source_location(name) }.should raise_error(TypeError)
+    -> { ConstantSpecs.const_source_location(name) }.should.raise(TypeError)
   end
 
   it "does not search the singleton class of a Class or Module" do
@@ -213,19 +213,19 @@
   end
 
   it "raises a NameError if the name includes two successive scope separators" do
-    -> { ConstantSpecs.const_source_location("ClassA::::CS_CONST10") }.should raise_error(NameError)
+    -> { ConstantSpecs.const_source_location("ClassA::::CS_CONST10") }.should.raise(NameError)
   end
 
   it "raises a NameError if only '::' is passed" do
-    -> { ConstantSpecs.const_source_location("::") }.should raise_error(NameError)
+    -> { ConstantSpecs.const_source_location("::") }.should.raise(NameError)
   end
 
   it "raises a NameError if a Symbol has a toplevel scope qualifier" do
-    -> { ConstantSpecs.const_source_location(:'::CS_CONST1') }.should raise_error(NameError)
+    -> { ConstantSpecs.const_source_location(:'::CS_CONST1') }.should.raise(NameError)
   end
 
   it "raises a NameError if a Symbol is a scoped constant name" do
-    -> { ConstantSpecs.const_source_location(:'ClassA::CS_CONST10') }.should raise_error(NameError)
+    -> { ConstantSpecs.const_source_location(:'ClassA::CS_CONST10') }.should.raise(NameError)
   end
 
   it "does search private constants path" do
diff --git a/spec/ruby/core/module/constants_spec.rb b/spec/ruby/core/module/constants_spec.rb
index 330da1cc88f..f2f12761e33 100644
--- a/spec/ruby/core/module/constants_spec.rb
+++ b/spec/ruby/core/module/constants_spec.rb
@@ -13,12 +13,13 @@ module ConstantSpecsAdded
 
   it "returns an array of Symbol names" do
     # This in NOT an exhaustive list
-    Module.constants.should include(:Array, :Class, :Comparable, :Dir,
+    Module.constants.to_set.should >= Set[
+                                    :Array, :Class, :Comparable, :Dir,
                                     :Enumerable, :ENV, :Exception, :FalseClass,
                                     :File, :Float, :Hash, :Integer, :IO,
                                     :Kernel, :Math, :Method, :Module, :NilClass,
                                     :Numeric, :Object, :Range, :Regexp, :String,
-                                    :Symbol, :Thread, :Time, :TrueClass)
+                                    :Symbol, :Thread, :Time, :TrueClass]
   end
 
   it "returns Module's constants when given a parameter" do
@@ -92,6 +93,6 @@ class Module
   end
 
   it "includes names of constants defined after a module is included" do
-    ConstantSpecs::ContainerA.constants.should include(:CS_CONST251)
+    ConstantSpecs::ContainerA.constants.should.include?(:CS_CONST251)
   end
 end
diff --git a/spec/ruby/core/module/define_method_spec.rb b/spec/ruby/core/module/define_method_spec.rb
index c5dfc53764a..f838e2b85fe 100644
--- a/spec/ruby/core/module/define_method_spec.rb
+++ b/spec/ruby/core/module/define_method_spec.rb
@@ -12,7 +12,7 @@ class DefineMethodSpecClass
   end
 
   it "raises an ArgumentError when passed zero arguments" do
-    -> { @klass.new.m }.should raise_error(ArgumentError)
+    -> { @klass.new.m }.should.raise(ArgumentError)
   end
 
   it "has a default value for b when passed one argument" do
@@ -24,7 +24,7 @@ class DefineMethodSpecClass
   end
 
   it "raises an ArgumentError when passed three arguments" do
-    -> { @klass.new.m(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { @klass.new.m(1, 2, 3) }.should.raise(ArgumentError)
   end
 end
 
@@ -47,7 +47,7 @@ def test_method(arg1, arg2)
       end
       define_method(:another_test_method, instance_method(:test_method))
     end
-    klass.new.should have_method(:another_test_method)
+    klass.new.should.respond_to?(:another_test_method)
   end
 
   describe "defining a method on a singleton class" do
@@ -83,7 +83,7 @@ def ziggy
       define_method :piggy, instance_method(:ziggy)
     end
 
-    -> { foo.new.ziggy }.should raise_error(NoMethodError)
+    -> { foo.new.ziggy }.should.raise(NoMethodError)
     foo.new.piggy.should == 'piggy'
   end
 end
@@ -115,8 +115,8 @@ class << klass
           define_method(:baz, ModuleSpecs::EmptyFooMethod)
         end
 
-        klass.should have_public_instance_method(:bar)
-        klass.should have_private_instance_method(:baz)
+        klass.public_instance_methods(false).should.include?(:bar)
+        klass.private_instance_methods(false).should.include?(:baz)
       end
     end
 
@@ -129,8 +129,8 @@ class << klass
           klass.send(:define_method, :baz, ModuleSpecs::EmptyFooMethod)
         end
 
-        klass.should have_public_instance_method(:bar)
-        klass.should have_public_instance_method(:baz)
+        klass.public_instance_methods(false).should.include?(:bar)
+        klass.public_instance_methods(false).should.include?(:baz)
       end
     end
 
@@ -155,8 +155,8 @@ def bar; end
           define_method(:baz) {}
         end
 
-        klass.should have_public_instance_method(:bar)
-        klass.should have_private_instance_method(:baz)
+        klass.public_instance_methods(false).should.include?(:bar)
+        klass.private_instance_methods(false).should.include?(:baz)
       end
     end
 
@@ -169,8 +169,8 @@ def bar; end
           klass.send(:define_method, :baz) {}
         end
 
-        klass.should have_public_instance_method(:bar)
-        klass.should have_public_instance_method(:baz)
+        klass.public_instance_methods(false).should.include?(:bar)
+        klass.public_instance_methods(false).should.include?(:baz)
       end
     end
   end
@@ -182,7 +182,7 @@ def bar; end
       klass = Class.new do
         define_method(:initialize) { }
       end
-      klass.should have_private_instance_method(:initialize)
+      klass.private_instance_methods(false).should.include?(:initialize)
     end
   end
 
@@ -193,7 +193,7 @@ def test_method
         end
         define_method(:initialize, instance_method(:test_method))
       end
-      klass.should have_private_instance_method(:initialize)
+      klass.private_instance_methods(false).should.include?(:initialize)
     end
   end
 end
@@ -233,11 +233,11 @@ class DefineMethodSpecClass
   it "raises TypeError if name cannot converted to String" do
     -> {
       Class.new { define_method(1001, -> {}) }
-    }.should raise_error(TypeError, /is not a symbol nor a string/)
+    }.should.raise(TypeError, /is not a symbol nor a string/)
 
     -> {
       Class.new { define_method([], -> {}) }
-    }.should raise_error(TypeError, /is not a symbol nor a string/)
+    }.should.raise(TypeError, /is not a symbol nor a string/)
   end
 
   it "converts non-String name to String with #to_str" do
@@ -254,21 +254,21 @@ def obj.to_str() [] end
 
     -> {
       Class.new { define_method(obj, -> {}) }
-    }.should raise_error(TypeError, /can't convert Object to String/)
+    }.should raise_consistent_error(TypeError, /can't convert Object into String/)
   end
 
   it "raises a TypeError when the given method is no Method/Proc" do
     -> {
       Class.new { define_method(:test, "self") }
-    }.should raise_error(TypeError, "wrong argument type String (expected Proc/Method/UnboundMethod)")
+    }.should.raise(TypeError, "wrong argument type String (expected Proc/Method/UnboundMethod)")
 
     -> {
       Class.new { define_method(:test, 1234) }
-    }.should raise_error(TypeError, "wrong argument type Integer (expected Proc/Method/UnboundMethod)")
+    }.should.raise(TypeError, "wrong argument type Integer (expected Proc/Method/UnboundMethod)")
 
     -> {
       Class.new { define_method(:test, nil) }
-    }.should raise_error(TypeError, "wrong argument type NilClass (expected Proc/Method/UnboundMethod)")
+    }.should.raise(TypeError, "wrong argument type NilClass (expected Proc/Method/UnboundMethod)")
   end
 
   it "uses provided Method/Proc even if block is specified" do
@@ -284,7 +284,7 @@ def obj.to_str() [] end
   it "raises an ArgumentError when no block is given" do
     -> {
       Class.new { define_method(:test) }
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "does not use the caller block when no block is given" do
@@ -297,7 +297,7 @@ def o.define(name)
 
     -> {
       o.define(:foo) { raise "not used" }
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "does not change the arity check style of the original proc" do
@@ -307,13 +307,13 @@ class DefineMethodSpecClass
     end
 
     obj = DefineMethodSpecClass.new
-    -> { obj.proc_style_test :arg }.should raise_error(ArgumentError)
+    -> { obj.proc_style_test :arg }.should.raise(ArgumentError)
   end
 
   it "raises a FrozenError if frozen" do
     -> {
       Class.new { freeze; define_method(:foo) {} }
-    }.should raise_error(FrozenError)
+    }.should.raise(FrozenError)
   end
 
   it "accepts a Method (still bound)" do
@@ -326,13 +326,13 @@ def inspect_data
     o = DefineMethodSpecClass.new
     o.data = :foo
     m = o.method(:inspect_data)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     klass = Class.new(DefineMethodSpecClass)
     klass.send(:define_method,:other_inspect, m)
     c = klass.new
     c.data = :bar
     c.other_inspect.should == "data is bar"
-    ->{o.other_inspect}.should raise_error(NoMethodError)
+    ->{o.other_inspect}.should.raise(NoMethodError)
   end
 
   it "raises a TypeError when a Method from a singleton class is defined on another class" do
@@ -346,7 +346,7 @@ def foo
 
     -> {
       Class.new { define_method :bar, m }
-    }.should raise_error(TypeError, /can't bind singleton method to a different class/)
+    }.should.raise(TypeError, /can't bind singleton method to a different class/)
   end
 
   it "raises a TypeError when a Method from one class is defined on an unrelated class" do
@@ -358,7 +358,7 @@ def foo
 
     -> {
       Class.new { define_method :bar, m }
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "accepts an UnboundMethod from an attr_accessor method" do
@@ -370,7 +370,7 @@ class DefineMethodSpecClass
     o = DefineMethodSpecClass.new
 
     DefineMethodSpecClass.send(:undef_method, :accessor_method)
-    -> { o.accessor_method }.should raise_error(NoMethodError)
+    -> { o.accessor_method }.should.raise(NoMethodError)
 
     DefineMethodSpecClass.send(:define_method, :accessor_method, m)
 
@@ -415,7 +415,7 @@ class DefineMethodByProcClass
     end
 
     o = DefineMethodByProcClass.new
-    o.proc_test.should be_true
+    o.proc_test.should == true
   end
 
   it "accepts a String method name" do
@@ -429,7 +429,7 @@ class DefineMethodByProcClass
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:define_method)
+    Module.public_instance_methods(false).should.include?(:define_method)
   end
 
   it "returns its symbol" do
@@ -443,7 +443,7 @@ class DefineMethodSpecClass
     klass = Class.new {
       define_method :bar, ModuleSpecs::UnboundMethodTest.instance_method(:foo)
     }
-    klass.new.should respond_to(:bar)
+    klass.new.should.respond_to?(:bar)
   end
 
   it "allows an UnboundMethod from a parent class to be defined on a child class" do
@@ -451,7 +451,7 @@ class DefineMethodSpecClass
     child = Class.new(parent) {
       define_method :baz, parent.instance_method(:foo)
     }
-    child.new.should respond_to(:baz)
+    child.new.should.respond_to?(:baz)
   end
 
   it "allows an UnboundMethod from a module to be defined on another unrelated module" do
@@ -459,7 +459,7 @@ class DefineMethodSpecClass
       define_method :bar, ModuleSpecs::UnboundMethodTest.instance_method(:foo)
     }
     klass = Class.new { include mod }
-    klass.new.should respond_to(:bar)
+    klass.new.should.respond_to?(:bar)
   end
 
 
@@ -475,7 +475,7 @@ class DefineMethodSpecClass
       ParentClass = Class.new { define_method(:foo) { :bar } }
       ChildClass = Class.new(ParentClass) { define_method(:foo) { :baz } }
       ParentClass.send :define_method, :foo, ChildClass.instance_method(:foo)
-    }.should raise_error(TypeError, /bind argument must be a subclass of ChildClass/)
+    }.should.raise(TypeError, /bind argument must be a subclass of ChildClass/)
   ensure
     Object.send(:remove_const, :ParentClass)
     Object.send(:remove_const, :ChildClass)
@@ -486,7 +486,7 @@ class DefineMethodSpecClass
       DestinationClass = Class.new {
         define_method :bar, ModuleSpecs::InstanceMeth.instance_method(:foo)
       }
-    }.should raise_error(TypeError, /bind argument must be a subclass of ModuleSpecs::InstanceMeth/)
+    }.should.raise(TypeError, /bind argument must be a subclass of ModuleSpecs::InstanceMeth/)
   end
 
   it "raises a TypeError when an UnboundMethod from a singleton class is defined on another class" do
@@ -500,7 +500,7 @@ def foo
 
     -> {
       Class.new { define_method :bar, m }
-    }.should raise_error(TypeError, /can't bind singleton method to a different class/)
+    }.should.raise(TypeError, /can't bind singleton method to a different class/)
   end
 
   it "defines a new method with public visibility when a Method passed and the class/module of the context isn't equal to the receiver of #define_method" do
@@ -527,7 +527,7 @@ def foo; end
       define_method(:bar, c.new.method(:foo))
     end
 
-    -> { object.bar }.should raise_error(NoMethodError)
+    -> { object.bar }.should.raise(NoMethodError)
   end
 end
 
@@ -544,11 +544,11 @@ def foo; end
     end
 
     it "raises an ArgumentError when passed one argument" do
-      -> { @klass.new.m 1 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1 }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed two arguments" do
-      -> { @klass.new.m 1, 2 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1, 2 }.should.raise(ArgumentError)
     end
   end
 
@@ -564,11 +564,11 @@ def foo; end
     end
 
     it "raises an ArgumentError when passed one argument" do
-      -> { @klass.new.m 1 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1 }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed two arguments" do
-      -> { @klass.new.m 1, 2 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1, 2 }.should.raise(ArgumentError)
     end
   end
 
@@ -580,15 +580,15 @@ def foo; end
     end
 
     it "raises an ArgumentError when passed zero arguments" do
-      -> { @klass.new.m }.should raise_error(ArgumentError)
+      -> { @klass.new.m }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed zero arguments and a block" do
-      -> { @klass.new.m { :computed } }.should raise_error(ArgumentError)
+      -> { @klass.new.m { :computed } }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed two arguments" do
-      -> { @klass.new.m 1, 2 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1, 2 }.should.raise(ArgumentError)
     end
 
     it "receives the value passed as the argument when passed one argument" do
@@ -604,15 +604,15 @@ def foo; end
     end
 
     it "raises an ArgumentError when passed zero arguments" do
-      -> { @klass.new.m }.should raise_error(ArgumentError)
+      -> { @klass.new.m }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed zero arguments and a block" do
-      -> { @klass.new.m { :computed } }.should raise_error(ArgumentError)
+      -> { @klass.new.m { :computed } }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed two arguments" do
-      -> { @klass.new.m 1, 2 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1, 2 }.should.raise(ArgumentError)
     end
 
     it "receives the value passed as the argument when passed one argument" do
@@ -654,7 +654,7 @@ def foo; end
     end
 
     it "raises an ArgumentError when passed zero arguments" do
-      -> { @klass.new.m }.should raise_error(ArgumentError)
+      -> { @klass.new.m }.should.raise(ArgumentError)
     end
 
     it "returns the value computed by the block when passed one argument" do
@@ -682,19 +682,19 @@ def foo; end
     end
 
     it "raises an ArgumentError when passed zero arguments" do
-      -> { @klass.new.m }.should raise_error(ArgumentError)
+      -> { @klass.new.m }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed one argument" do
-      -> { @klass.new.m 1 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1 }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed one argument and a block" do
-      -> { @klass.new.m(1) { } }.should raise_error(ArgumentError)
+      -> { @klass.new.m(1) { } }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed three arguments" do
-      -> { @klass.new.m 1, 2, 3 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1, 2, 3 }.should.raise(ArgumentError)
     end
   end
 
@@ -706,15 +706,15 @@ def foo; end
     end
 
     it "raises an ArgumentError when passed zero arguments" do
-      -> { @klass.new.m }.should raise_error(ArgumentError)
+      -> { @klass.new.m }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed one argument" do
-      -> { @klass.new.m 1 }.should raise_error(ArgumentError)
+      -> { @klass.new.m 1 }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed one argument and a block" do
-      -> { @klass.new.m(1) { } }.should raise_error(ArgumentError)
+      -> { @klass.new.m(1) { } }.should.raise(ArgumentError)
     end
 
     it "receives an empty array as the third argument when passed two arguments" do
@@ -795,7 +795,7 @@ def nested_method_in_proc_for_define_method
 
       o = c.new
       o.test
-      o.should_not have_method :nested_method_in_proc_for_define_method
+      o.should_not.respond_to? :nested_method_in_proc_for_define_method
 
       t.new.nested_method_in_proc_for_define_method.should == 42
     end
diff --git a/spec/ruby/core/module/deprecate_constant_spec.rb b/spec/ruby/core/module/deprecate_constant_spec.rb
index ec0de6782ff..597379eb87b 100644
--- a/spec/ruby/core/module/deprecate_constant_spec.rb
+++ b/spec/ruby/core/module/deprecate_constant_spec.rb
@@ -19,9 +19,9 @@
       -> {
         value = @module::PUBLIC1
       }.should complain(/warning: constant .+::PUBLIC1 is deprecated/)
-      value.should equal(@value)
+      value.should.equal?(@value)
 
-      -> { @module::PRIVATE }.should raise_error(NameError)
+      -> { @module::PRIVATE }.should.raise(NameError)
     end
 
     it "warns with a message" do
@@ -61,10 +61,10 @@
   end
 
   it "returns self" do
-    @module.deprecate_constant(:PUBLIC1).should equal(@module)
+    @module.deprecate_constant(:PUBLIC1).should.equal?(@module)
   end
 
   it "raises a NameError when given an undefined name" do
-    -> { @module.deprecate_constant :UNDEFINED }.should raise_error(NameError)
+    -> { @module.deprecate_constant :UNDEFINED }.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/module/extend_object_spec.rb b/spec/ruby/core/module/extend_object_spec.rb
index 1fd1abc0b52..b428eb7924f 100644
--- a/spec/ruby/core/module/extend_object_spec.rb
+++ b/spec/ruby/core/module/extend_object_spec.rb
@@ -7,18 +7,18 @@
   end
 
   it "is a private method" do
-    Module.should have_private_instance_method(:extend_object)
+    Module.private_instance_methods(false).should.include?(:extend_object)
   end
 
   describe "on Class" do
     it "is undefined" do
-      Class.should_not have_private_instance_method(:extend_object, true)
+      Class.private_instance_methods(true).should_not.include?(:extend_object)
     end
 
     it "raises a TypeError if calling after rebinded to Class" do
       -> {
         Module.instance_method(:extend_object).bind(Class.new).call Object.new
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 
@@ -49,8 +49,8 @@
     end
 
     it "raises a RuntimeError before extending the object" do
-      -> { @receiver.send(:extend_object, @object) }.should raise_error(RuntimeError)
-      @object.should_not be_kind_of(@receiver)
+      -> { @receiver.send(:extend_object, @object) }.should.raise(RuntimeError)
+      @object.should_not.is_a?(@receiver)
     end
   end
 end
diff --git a/spec/ruby/core/module/extended_spec.rb b/spec/ruby/core/module/extended_spec.rb
index c6300ffa0bb..a4ec5a4ba7f 100644
--- a/spec/ruby/core/module/extended_spec.rb
+++ b/spec/ruby/core/module/extended_spec.rb
@@ -39,6 +39,6 @@ def self.extended(o)
   end
 
   it "is private in its default implementation" do
-    Module.new.private_methods.should include(:extended)
+    Module.new.private_methods.should.include?(:extended)
   end
 end
diff --git a/spec/ruby/core/module/fixtures/autoload_relative_a.rb b/spec/ruby/core/module/fixtures/autoload_relative_a.rb
new file mode 100644
index 00000000000..494181adc2c
--- /dev/null
+++ b/spec/ruby/core/module/fixtures/autoload_relative_a.rb
@@ -0,0 +1,9 @@
+module ModuleSpecs
+  module Autoload
+    class AutoloadRelativeA
+    end
+
+    class AutoloadRelativeB
+    end
+  end
+end
diff --git a/spec/ruby/core/module/gt_spec.rb b/spec/ruby/core/module/gt_spec.rb
index b8a73c9ff93..04cdd90efb0 100644
--- a/spec/ruby/core/module/gt_spec.rb
+++ b/spec/ruby/core/module/gt_spec.rb
@@ -3,10 +3,10 @@
 
 describe "Module#>" do
   it "returns false if self is a subclass of or includes the given module" do
-    (ModuleSpecs::Child > ModuleSpecs::Parent).should be_false
-    (ModuleSpecs::Child > ModuleSpecs::Basic).should be_false
-    (ModuleSpecs::Child > ModuleSpecs::Super).should be_false
-    (ModuleSpecs::Super > ModuleSpecs::Basic).should be_false
+    (ModuleSpecs::Child > ModuleSpecs::Parent).should == false
+    (ModuleSpecs::Child > ModuleSpecs::Basic).should == false
+    (ModuleSpecs::Child > ModuleSpecs::Super).should == false
+    (ModuleSpecs::Super > ModuleSpecs::Basic).should == false
   end
 
   it "returns true if self is a superclass of or included by the given module" do
@@ -31,6 +31,6 @@
   end
 
   it "raises a TypeError if the argument is not a class/module" do
-    -> { ModuleSpecs::Parent > mock('x') }.should raise_error(TypeError)
+    -> { ModuleSpecs::Parent > mock('x') }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/gte_spec.rb b/spec/ruby/core/module/gte_spec.rb
index 18c60ba5864..b19fc9fac34 100644
--- a/spec/ruby/core/module/gte_spec.rb
+++ b/spec/ruby/core/module/gte_spec.rb
@@ -28,6 +28,6 @@
   end
 
   it "raises a TypeError if the argument is not a class/module" do
-    -> { ModuleSpecs::Parent >= mock('x') }.should raise_error(TypeError)
+    -> { ModuleSpecs::Parent >= mock('x') }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/include_spec.rb b/spec/ruby/core/module/include_spec.rb
index 210918b2e7a..b6201550e42 100644
--- a/spec/ruby/core/module/include_spec.rb
+++ b/spec/ruby/core/module/include_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Module#include" do
   it "is a public method" do
-    Module.should have_public_instance_method(:include, false)
+    Module.public_instance_methods(false).should.include?(:include)
   end
 
   it "calls #append_features(self) in reversed order on each module" do
@@ -33,20 +33,20 @@ def self.append_features(mod)
   end
 
   it "adds all ancestor modules when a previously included module is included again" do
-    ModuleSpecs::MultipleIncludes.ancestors.should include(ModuleSpecs::MA, ModuleSpecs::MB)
+    ModuleSpecs::MultipleIncludes.ancestors.to_set.should >= Set[ModuleSpecs::MA, ModuleSpecs::MB]
     ModuleSpecs::MB.include(ModuleSpecs::MC)
     ModuleSpecs::MultipleIncludes.include(ModuleSpecs::MB)
-    ModuleSpecs::MultipleIncludes.ancestors.should include(ModuleSpecs::MA, ModuleSpecs::MB, ModuleSpecs::MC)
+    ModuleSpecs::MultipleIncludes.ancestors.to_set.should >= Set[ModuleSpecs::MA, ModuleSpecs::MB, ModuleSpecs::MC]
   end
 
   it "raises a TypeError when the argument is not a Module" do
-    -> { ModuleSpecs::Basic.include(Class.new) }.should raise_error(TypeError)
+    -> { ModuleSpecs::Basic.include(Class.new) }.should.raise(TypeError)
   end
 
   it "does not raise a TypeError when the argument is an instance of a subclass of Module" do
     class ModuleSpecs::SubclassSpec::AClass
     end
-    -> { ModuleSpecs::SubclassSpec::AClass.include(ModuleSpecs::Subclass.new) }.should_not raise_error(TypeError)
+    -> { ModuleSpecs::SubclassSpec::AClass.include(ModuleSpecs::Subclass.new) }.should_not.raise(TypeError)
   ensure
     ModuleSpecs::SubclassSpec.send(:remove_const, :AClass)
   end
@@ -60,13 +60,13 @@ class ModuleSpecs::SubclassSpec::AClass
       end
     end
 
-    -> { ModuleSpecs::Basic.include(refinement) }.should raise_error(TypeError, "Cannot include refinement")
+    -> { ModuleSpecs::Basic.include(refinement) }.should.raise(TypeError, "Cannot include refinement")
   end
 
   it "imports constants to modules and classes" do
-    ModuleSpecs::A.constants.should include(:CONSTANT_A)
-    ModuleSpecs::B.constants.should include(:CONSTANT_A, :CONSTANT_B)
-    ModuleSpecs::C.constants.should include(:CONSTANT_A, :CONSTANT_B)
+    ModuleSpecs::A.constants.should.include?(:CONSTANT_A)
+    ModuleSpecs::B.constants.to_set.should >= Set[:CONSTANT_A, :CONSTANT_B]
+    ModuleSpecs::C.constants.to_set.should >= Set[:CONSTANT_A, :CONSTANT_B]
   end
 
   it "shadows constants from ancestors" do
@@ -84,9 +84,9 @@ class ModuleSpecs::SubclassSpec::AClass
   end
 
   it "imports instance methods to modules and classes" do
-    ModuleSpecs::A.instance_methods.should include(:ma)
-    ModuleSpecs::B.instance_methods.should include(:ma,:mb)
-    ModuleSpecs::C.instance_methods.should include(:ma,:mb)
+    ModuleSpecs::A.instance_methods.should.include?(:ma)
+    ModuleSpecs::B.instance_methods.to_set.should >= Set[:ma,:mb]
+    ModuleSpecs::C.instance_methods.to_set.should >= Set[:ma,:mb]
   end
 
   it "does not import methods to modules and classes" do
@@ -146,7 +146,7 @@ module V; include X, U, Y; end
 
       anc = B.ancestors
       [B, U, V, W, A, X].each do |i|
-        anc.include?(i).should be_true
+        anc.include?(i).should == true
       end
 
       class B; include V; end
@@ -154,7 +154,7 @@ class B; include V; end
       # the only new module is Y, it is added after U since it follows U in V mixin list:
       anc = B.ancestors
       [B, U, Y, V, W, A, X].each do |i|
-        anc.include?(i).should be_true
+        anc.include?(i).should == true
       end
     end
   end
@@ -178,7 +178,7 @@ module M3; include M2; end
       module ModuleSpecs::M
         include ModuleSpecs::M
       end
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "doesn't accept no-arguments" do
@@ -186,7 +186,7 @@ module ModuleSpecs::M
       Module.new do
         include
       end
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "returns the class it's included into" do
@@ -622,7 +622,7 @@ def m4; [:m4]; end
   end
 
   it "raises a TypeError when no module was given" do
-    -> { ModuleSpecs::Child.include?("Test") }.should raise_error(TypeError)
-    -> { ModuleSpecs::Child.include?(ModuleSpecs::Parent) }.should raise_error(TypeError)
+    -> { ModuleSpecs::Child.include?("Test") }.should.raise(TypeError)
+    -> { ModuleSpecs::Child.include?(ModuleSpecs::Parent) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/included_modules_spec.rb b/spec/ruby/core/module/included_modules_spec.rb
index ce94ed12855..e22ee5e6cf4 100644
--- a/spec/ruby/core/module/included_modules_spec.rb
+++ b/spec/ruby/core/module/included_modules_spec.rb
@@ -5,10 +5,10 @@
   it "returns a list of modules included in self" do
     ModuleSpecs.included_modules.should == []
 
-    ModuleSpecs::Child.included_modules.should include(ModuleSpecs::Super, ModuleSpecs::Basic, Kernel)
-    ModuleSpecs::Parent.included_modules.should include(Kernel)
+    ModuleSpecs::Child.included_modules.to_set.should >= Set[ModuleSpecs::Super, ModuleSpecs::Basic, Kernel]
+    ModuleSpecs::Parent.included_modules.should.include?(Kernel)
     ModuleSpecs::Basic.included_modules.should == []
-    ModuleSpecs::Super.included_modules.should include(ModuleSpecs::Basic)
-    ModuleSpecs::WithPrependedModule.included_modules.should include(ModuleSpecs::ModuleWithPrepend)
+    ModuleSpecs::Super.included_modules.should.include?(ModuleSpecs::Basic)
+    ModuleSpecs::WithPrependedModule.included_modules.should.include?(ModuleSpecs::ModuleWithPrepend)
   end
 end
diff --git a/spec/ruby/core/module/included_spec.rb b/spec/ruby/core/module/included_spec.rb
index 2fdd4325f2d..d8a6c3f839a 100644
--- a/spec/ruby/core/module/included_spec.rb
+++ b/spec/ruby/core/module/included_spec.rb
@@ -34,7 +34,7 @@ def test
   end
 
   it "is private in its default implementation" do
-    Module.should have_private_instance_method(:included)
+    Module.private_instance_methods(false).should.include?(:included)
   end
 
   it "works with super using a singleton class" do
diff --git a/spec/ruby/core/module/instance_method_spec.rb b/spec/ruby/core/module/instance_method_spec.rb
index 182cdf5c543..8615e352f63 100644
--- a/spec/ruby/core/module/instance_method_spec.rb
+++ b/spec/ruby/core/module/instance_method_spec.rb
@@ -9,7 +9,7 @@
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:instance_method, false)
+    Module.public_instance_methods(false).should.include?(:instance_method)
   end
 
   it "requires an argument" do
@@ -17,26 +17,26 @@
   end
 
   it "returns an UnboundMethod corresponding to the given name" do
-    @parent_um.should be_kind_of(UnboundMethod)
+    @parent_um.should.is_a?(UnboundMethod)
     @parent_um.bind(ModuleSpecs::InstanceMeth.new).call.should == :foo
   end
 
   it "returns an UnboundMethod corresponding to the given name from a superclass" do
-    @child_um.should be_kind_of(UnboundMethod)
+    @child_um.should.is_a?(UnboundMethod)
     @child_um.bind(ModuleSpecs::InstanceMethChild.new).call.should == :foo
   end
 
   it "returns an UnboundMethod corresponding to the given name from an included Module" do
-    @mod_um.should be_kind_of(UnboundMethod)
+    @mod_um.should.is_a?(UnboundMethod)
     @mod_um.bind(ModuleSpecs::InstanceMethChild.new).call.should == :bar
   end
 
   it "returns an UnboundMethod when given a protected method name" do
-    ModuleSpecs::Basic.instance_method(:protected_module).should be_an_instance_of(UnboundMethod)
+    ModuleSpecs::Basic.instance_method(:protected_module).should.instance_of?(UnboundMethod)
   end
 
   it "returns an UnboundMethod when given a private method name" do
-    ModuleSpecs::Basic.instance_method(:private_module).should be_an_instance_of(UnboundMethod)
+    ModuleSpecs::Basic.instance_method(:private_module).should.instance_of?(UnboundMethod)
   end
 
   it "gives UnboundMethod method name, Module defined in and Module extracted from" do
@@ -51,20 +51,20 @@
   end
 
   it "raises a TypeError if the given name is not a String/Symbol" do
-    -> { Object.instance_method([]) }.should raise_error(TypeError, /is not a symbol nor a string/)
-    -> { Object.instance_method(0) }.should raise_error(TypeError, /is not a symbol nor a string/)
-    -> { Object.instance_method(nil) }.should raise_error(TypeError, /is not a symbol nor a string/)
-    -> { Object.instance_method(mock('x')) }.should raise_error(TypeError, /is not a symbol nor a string/)
+    -> { Object.instance_method([]) }.should.raise(TypeError, /is not a symbol nor a string/)
+    -> { Object.instance_method(0) }.should.raise(TypeError, /is not a symbol nor a string/)
+    -> { Object.instance_method(nil) }.should.raise(TypeError, /is not a symbol nor a string/)
+    -> { Object.instance_method(mock('x')) }.should.raise(TypeError, /is not a symbol nor a string/)
   end
 
   it "accepts String name argument" do
     method = ModuleSpecs::InstanceMeth.instance_method(:foo)
-    method.should be_kind_of(UnboundMethod)
+    method.should.is_a?(UnboundMethod)
   end
 
   it "accepts Symbol name argument"  do
     method = ModuleSpecs::InstanceMeth.instance_method("foo")
-    method.should be_kind_of(UnboundMethod)
+    method.should.is_a?(UnboundMethod)
   end
 
   it "converts non-String name by calling #to_str method" do
@@ -72,14 +72,14 @@
     def obj.to_str() "foo" end
 
     method = ModuleSpecs::InstanceMeth.instance_method(obj)
-    method.should be_kind_of(UnboundMethod)
+    method.should.is_a?(UnboundMethod)
   end
 
   it "raises TypeError when passed non-String name and #to_str returns non-String value" do
     obj = Object.new
     def obj.to_str() [] end
 
-    -> { ModuleSpecs::InstanceMeth.instance_method(obj) }.should raise_error(TypeError, /can't convert Object to String/)
+    -> { ModuleSpecs::InstanceMeth.instance_method(obj) }.should raise_consistent_error(TypeError, /can't convert Object into String/)
   end
 
   it "raises a NameError if the method has been undefined" do
@@ -89,11 +89,11 @@ def obj.to_str() [] end
     um.should == @parent_um
     -> do
       child.instance_method(:foo)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError if the method does not exist" do
-    -> { Object.instance_method(:missing) }.should raise_error(NameError)
+    -> { Object.instance_method(:missing) }.should.raise(NameError)
   end
 
   it "sets the NameError#name attribute to the name of the missing method" do
diff --git a/spec/ruby/core/module/instance_methods_spec.rb b/spec/ruby/core/module/instance_methods_spec.rb
index d2d38cdda2f..dbb6df8c34e 100644
--- a/spec/ruby/core/module/instance_methods_spec.rb
+++ b/spec/ruby/core/module/instance_methods_spec.rb
@@ -4,21 +4,22 @@
 describe "Module#instance_methods" do
   it "does not return methods undefined in a superclass" do
     methods = ModuleSpecs::Parent.instance_methods(false)
-    methods.should_not include(:undefed_method)
+    methods.should_not.include?(:undefed_method)
   end
 
   it "only includes module methods on an included module" do
     methods = ModuleSpecs::Basic.instance_methods(false)
-    methods.should include(:public_module)
+    methods.should.include?(:public_module)
     # Child is an including class
     methods = ModuleSpecs::Child.instance_methods(false)
-    methods.should include(:public_child)
-    methods.should_not include(:public_module)
+    methods.should.include?(:public_child)
+    methods.should_not.include?(:public_module)
   end
 
   it "does not return methods undefined in a subclass" do
     methods = ModuleSpecs::Grandchild.instance_methods
-    methods.should_not include(:parent_method, :another_parent_method)
+    methods.should_not.include?(:parent_method)
+    methods.should_not.include?(:another_parent_method)
   end
 
   it "does not return methods undefined in the current class" do
@@ -28,34 +29,35 @@ def undefed_child
     end
     ModuleSpecs::Child.send(:undef_method, :undefed_child)
     methods = ModuleSpecs::Child.instance_methods
-    methods.should_not include(:undefed_method, :undefed_child)
+    methods.should_not.include?(:undefed_method)
+    methods.should_not.include?(:undefed_child)
   end
 
   it "does not return methods from an included module that are undefined in the class" do
-    ModuleSpecs::Grandchild.instance_methods.should_not include(:super_included_method)
+    ModuleSpecs::Grandchild.instance_methods.should_not.include?(:super_included_method)
   end
 
   it "returns the public and protected methods of self if include_super is false" do
     methods = ModuleSpecs::Parent.instance_methods(false)
-    methods.should include(:protected_parent, :public_parent)
+    methods.to_set.should >= Set[:protected_parent, :public_parent]
 
     methods = ModuleSpecs::Child.instance_methods(false)
-    methods.should include(:protected_child, :public_child)
+    methods.to_set.should >= Set[:protected_child, :public_child]
   end
 
   it "returns the public and protected methods of self and it's ancestors" do
     methods = ModuleSpecs::Basic.instance_methods
-    methods.should include(:protected_module, :public_module)
+    methods.to_set.should >= Set[:protected_module, :public_module]
 
     methods = ModuleSpecs::Super.instance_methods
-    methods.should include(:protected_module, :protected_super_module,
-                           :public_module, :public_super_module)
+    methods.to_set.should >= Set[:protected_module, :protected_super_module,
+                                 :public_module, :public_super_module]
   end
 
   it "makes a private Object instance method public in Kernel" do
     methods = Kernel.instance_methods
-    methods.should include(:module_specs_private_method_on_object_for_kernel_public)
+    methods.should.include?(:module_specs_private_method_on_object_for_kernel_public)
     methods = Object.instance_methods
-    methods.should_not include(:module_specs_private_method_on_object_for_kernel_public)
+    methods.should_not.include?(:module_specs_private_method_on_object_for_kernel_public)
   end
 end
diff --git a/spec/ruby/core/module/lt_spec.rb b/spec/ruby/core/module/lt_spec.rb
index d7771e07a87..8567a249938 100644
--- a/spec/ruby/core/module/lt_spec.rb
+++ b/spec/ruby/core/module/lt_spec.rb
@@ -10,10 +10,10 @@
   end
 
   it "returns false if self is a superclass of or included by the given module" do
-    (ModuleSpecs::Parent < ModuleSpecs::Child).should be_false
-    (ModuleSpecs::Basic < ModuleSpecs::Child).should be_false
-    (ModuleSpecs::Super < ModuleSpecs::Child).should be_false
-    (ModuleSpecs::Basic < ModuleSpecs::Super).should be_false
+    (ModuleSpecs::Parent < ModuleSpecs::Child).should == false
+    (ModuleSpecs::Basic < ModuleSpecs::Child).should == false
+    (ModuleSpecs::Super < ModuleSpecs::Child).should == false
+    (ModuleSpecs::Basic < ModuleSpecs::Super).should == false
   end
 
   it "returns false if self is the same as the given module" do
@@ -31,6 +31,6 @@
   end
 
   it "raises a TypeError if the argument is not a class/module" do
-    -> { ModuleSpecs::Parent < mock('x') }.should raise_error(TypeError)
+    -> { ModuleSpecs::Parent < mock('x') }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/lte_spec.rb b/spec/ruby/core/module/lte_spec.rb
index 7a0e8496b85..c6aab94e9f4 100644
--- a/spec/ruby/core/module/lte_spec.rb
+++ b/spec/ruby/core/module/lte_spec.rb
@@ -28,6 +28,6 @@
   end
 
   it "raises a TypeError if the argument is not a class/module" do
-    -> { ModuleSpecs::Parent <= mock('x') }.should raise_error(TypeError)
+    -> { ModuleSpecs::Parent <= mock('x') }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/module/method_added_spec.rb b/spec/ruby/core/module/method_added_spec.rb
index ec92cddc1e4..996a14eb868 100644
--- a/spec/ruby/core/module/method_added_spec.rb
+++ b/spec/ruby/core/module/method_added_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "is a private instance method" do
-    Module.should have_private_instance_method(:method_added)
+    Module.private_instance_methods(false).should.include?(:method_added)
   end
 
   it "returns nil in the default implementation" do
@@ -57,7 +57,7 @@ def self.method_added(name)
 
       undef_method :method_to_undef
     end
-    m.should_not have_method(:method_to_undef)
+    m.should_not.respond_to?(:method_to_undef)
   end
 
   it "is not called when a method changes visibility" do
diff --git a/spec/ruby/core/module/method_defined_spec.rb b/spec/ruby/core/module/method_defined_spec.rb
index bc5b420e118..e6b4c7b8176 100644
--- a/spec/ruby/core/module/method_defined_spec.rb
+++ b/spec/ruby/core/module/method_defined_spec.rb
@@ -27,17 +27,17 @@
   it "does not search Object or Kernel when called on a module" do
     m = Module.new
 
-    m.method_defined?(:module_specs_public_method_on_kernel).should be_false
+    m.method_defined?(:module_specs_public_method_on_kernel).should == false
   end
 
   it "raises a TypeError when the given object is not a string/symbol" do
     c = Class.new
     o = mock('123')
 
-    -> { c.method_defined?(o) }.should raise_error(TypeError)
+    -> { c.method_defined?(o) }.should.raise(TypeError)
 
     o.should_receive(:to_str).and_return(123)
-    -> { c.method_defined?(o) }.should raise_error(TypeError)
+    -> { c.method_defined?(o) }.should.raise(TypeError)
   end
 
   it "converts the given name to a string using to_str" do
diff --git a/spec/ruby/core/module/method_removed_spec.rb b/spec/ruby/core/module/method_removed_spec.rb
index 9b39eb77a60..80e546406c9 100644
--- a/spec/ruby/core/module/method_removed_spec.rb
+++ b/spec/ruby/core/module/method_removed_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Module#method_removed" do
   it "is a private instance method" do
-    Module.should have_private_instance_method(:method_removed)
+    Module.private_instance_methods(false).should.include?(:method_removed)
   end
 
   it "returns nil in the default implementation" do
diff --git a/spec/ruby/core/module/method_undefined_spec.rb b/spec/ruby/core/module/method_undefined_spec.rb
index a94388fe0ad..596c5c50e26 100644
--- a/spec/ruby/core/module/method_undefined_spec.rb
+++ b/spec/ruby/core/module/method_undefined_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Module#method_undefined" do
   it "is a private instance method" do
-    Module.should have_private_instance_method(:method_undefined)
+    Module.private_instance_methods(false).should.include?(:method_undefined)
   end
 
   it "returns nil in the default implementation" do
diff --git a/spec/ruby/core/module/module_function_spec.rb b/spec/ruby/core/module/module_function_spec.rb
index 51f647142e7..41bd152608b 100644
--- a/spec/ruby/core/module/module_function_spec.rb
+++ b/spec/ruby/core/module/module_function_spec.rb
@@ -3,22 +3,22 @@
 
 describe "Module#module_function" do
   it "is a private method" do
-    Module.should have_private_instance_method(:module_function)
+    Module.private_instance_methods(false).should.include?(:module_function)
   end
 
   describe "on Class" do
     it "is undefined" do
-      Class.should_not have_private_instance_method(:module_function, true)
+      Class.private_instance_methods(true).should_not.include?(:module_function)
     end
 
     it "raises a TypeError if calling after rebinded to Class" do
       -> {
         Module.instance_method(:module_function).bind(Class.new).call
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
 
       -> {
         Module.instance_method(:module_function).bind(Class.new).call :foo
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 end
@@ -41,7 +41,7 @@ def test3() end
   it "returns argument or arguments if given" do
     Module.new do
       def foo; end
-      module_function(:foo).should equal(:foo)
+      module_function(:foo).should.equal?(:foo)
       module_function(:foo, :foo).should == [:foo, :foo]
     end
   end
@@ -83,9 +83,9 @@ def test() "hello" end
 
     (o = mock('x')).extend(m)
     o.respond_to?(:test).should == false
-    m.should have_private_instance_method(:test)
+    m.private_instance_methods(false).should.include?(:test)
     o.send(:test).should == "hello"
-    -> { o.test }.should raise_error(NoMethodError)
+    -> { o.test }.should.raise(NoMethodError)
   end
 
   it "makes the new Module methods public" do
@@ -114,17 +114,17 @@ def test2() end
   it "raises a TypeError when the given names can't be converted to string using to_str" do
     o = mock('123')
 
-    -> { Module.new { module_function(o) } }.should raise_error(TypeError)
+    -> { Module.new { module_function(o) } }.should.raise(TypeError)
 
     o.should_receive(:to_str).and_return(123)
-    -> { Module.new { module_function(o) } }.should raise_error(TypeError)
+    -> { Module.new { module_function(o) } }.should.raise(TypeError)
   end
 
   it "can make accessible private methods" do # JRUBY-4214
     m = Module.new do
       module_function :require
     end
-    m.respond_to?(:require).should be_true
+    m.respond_to?(:require).should == true
   end
 
   it "creates Module methods that super up the singleton class of the module" do
@@ -207,7 +207,7 @@ def test2() end
 
   it "returns nil" do
     Module.new do
-      module_function.should equal(nil)
+      module_function.should.equal?(nil)
     end
   end
 
diff --git a/spec/ruby/core/module/name_spec.rb b/spec/ruby/core/module/name_spec.rb
index d3318e16451..332c08d782e 100644
--- a/spec/ruby/core/module/name_spec.rb
+++ b/spec/ruby/core/module/name_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Module#name" do
   it "is nil for an anonymous module" do
-    Module.new.name.should be_nil
+    Module.new.name.should == nil
   end
 
   it "is not nil when assigned to a constant in an anonymous module" do
@@ -19,9 +19,9 @@ module m::N; end
   end
 
   it "returns nil for a singleton class" do
-    Module.new.singleton_class.name.should be_nil
-    String.singleton_class.name.should be_nil
-    Object.new.singleton_class.name.should be_nil
+    Module.new.singleton_class.name.should == nil
+    String.singleton_class.name.should == nil
+    Object.new.singleton_class.name.should == nil
   end
 
   it "changes when the module is reachable through a constant path" do
@@ -148,7 +148,7 @@ module ModuleSpecs::Anonymous
       "ModuleSpecs::Anonymous::StoredInMultiplePlaces::N",
       "ModuleSpecs::Anonymous::StoredInMultiplePlaces::O"
     ]
-    valid_names.should include(m::N.name) # You get one of the two, but you don't know which one.
+    valid_names.should.include?(m::N.name) # You get one of the two, but you don't know which one.
   ensure
     ModuleSpecs::Anonymous.send(:remove_const, :StoredInMultiplePlaces)
   end
@@ -200,6 +200,6 @@ module self::B
   it "always returns the same String for a given Module" do
     s1 = ModuleSpecs.name
     s2 = ModuleSpecs.name
-    s1.should equal(s2)
+    s1.should.equal?(s2)
   end
 end
diff --git a/spec/ruby/core/module/new_spec.rb b/spec/ruby/core/module/new_spec.rb
index ec521360bd7..ec7a0cfa778 100644
--- a/spec/ruby/core/module/new_spec.rb
+++ b/spec/ruby/core/module/new_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "creates a module without a name" do
-    Module.new.name.should be_nil
+    Module.new.name.should == nil
   end
 
   it "creates a new Module and passes it to the provided block" do
diff --git a/spec/ruby/core/module/prepend_features_spec.rb b/spec/ruby/core/module/prepend_features_spec.rb
index 09c15c5c155..3a50f2c2a43 100644
--- a/spec/ruby/core/module/prepend_features_spec.rb
+++ b/spec/ruby/core/module/prepend_features_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Module#prepend_features" do
   it "is a private method" do
-    Module.should have_private_instance_method(:prepend_features, true)
+    Module.private_instance_methods(false).should.include?(:prepend_features)
   end
 
   it "gets called when self is included in another module/class" do
@@ -25,7 +25,7 @@ def self.prepend_features(mod)
   it "raises an ArgumentError on a cyclic prepend" do
     -> {
       ModuleSpecs::CyclicPrepend.send(:prepend_features, ModuleSpecs::CyclicPrepend)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "clears caches of the given module" do
@@ -52,13 +52,13 @@ def foo; :fooo; end
 
   describe "on Class" do
     it "is undefined" do
-      Class.should_not have_private_instance_method(:prepend_features, true)
+      Class.private_instance_methods(true).should_not.include?(:prepend_features)
     end
 
     it "raises a TypeError if calling after rebinded to Class" do
       -> {
         Module.instance_method(:prepend_features).bind(Class.new).call Module.new
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/module/prepend_spec.rb b/spec/ruby/core/module/prepend_spec.rb
index 71e82c513ea..f7887e6d6ab 100644
--- a/spec/ruby/core/module/prepend_spec.rb
+++ b/spec/ruby/core/module/prepend_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Module#prepend" do
   it "is a public method" do
-    Module.should have_public_instance_method(:prepend, false)
+    Module.public_instance_methods(false).should.include?(:prepend)
   end
 
   it "does not affect the superclass" do
@@ -444,13 +444,13 @@ module M
   end
 
   it "raises a TypeError when the argument is not a Module" do
-    -> { ModuleSpecs::Basic.prepend(Class.new) }.should raise_error(TypeError)
+    -> { ModuleSpecs::Basic.prepend(Class.new) }.should.raise(TypeError)
   end
 
   it "does not raise a TypeError when the argument is an instance of a subclass of Module" do
     class ModuleSpecs::SubclassSpec::AClass
     end
-    -> { ModuleSpecs::SubclassSpec::AClass.prepend(ModuleSpecs::Subclass.new) }.should_not raise_error(TypeError)
+    -> { ModuleSpecs::SubclassSpec::AClass.prepend(ModuleSpecs::Subclass.new) }.should_not.raise(TypeError)
   ensure
     ModuleSpecs::SubclassSpec.send(:remove_const, :AClass)
   end
@@ -464,22 +464,22 @@ class ModuleSpecs::SubclassSpec::AClass
       end
     end
 
-    -> { ModuleSpecs::Basic.prepend(refinement) }.should raise_error(TypeError, "Cannot prepend refinement")
+    -> { ModuleSpecs::Basic.prepend(refinement) }.should.raise(TypeError, "Cannot prepend refinement")
   end
 
   it "imports constants" do
     m1 = Module.new
     m1::MY_CONSTANT = 1
     m2 = Module.new { prepend(m1) }
-    m2.constants.should include(:MY_CONSTANT)
+    m2.constants.should.include?(:MY_CONSTANT)
   end
 
   it "imports instance methods" do
-    Module.new { prepend ModuleSpecs::A }.instance_methods.should include(:ma)
+    Module.new { prepend ModuleSpecs::A }.instance_methods.should.include?(:ma)
   end
 
   it "does not import methods to modules and classes" do
-    Module.new { prepend ModuleSpecs::A }.methods.should_not include(:ma)
+    Module.new { prepend ModuleSpecs::A }.methods.should_not.include?(:ma)
   end
 
   it "allows wrapping methods" do
@@ -505,7 +505,7 @@ class ModuleSpecs::SubclassSpec::AClass
 
   it "includes prepended modules in ancestors" do
     m = Module.new
-    Class.new { prepend(m) }.ancestors.should include(m)
+    Class.new { prepend(m) }.ancestors.should.include?(m)
   end
 
   it "reports the prepended module as the method owner" do
@@ -542,13 +542,13 @@ class ModuleSpecs::SubclassSpec::AClass
   it "sees an instance of a prepended class as kind of the prepended module" do
     m = Module.new
     c = Class.new { prepend(m) }
-    c.new.should be_kind_of(m)
+    c.new.should.is_a?(m)
   end
 
   it "keeps the module in the chain when dupping the class" do
     m = Module.new
     c = Class.new { prepend(m) }
-    c.dup.new.should be_kind_of(m)
+    c.dup.new.should.is_a?(m)
   end
 
   it "uses only new module when dupping the module" do
@@ -559,14 +559,14 @@ class ModuleSpecs::SubclassSpec::AClass
     m2dup.ancestors.should == [m1,m2dup]
     c2 = Class.new { prepend(m2dup) }
     c1.ancestors[0,3].should == [m1,m2,c1]
-    c1.new.should be_kind_of(m1)
+    c1.new.should.is_a?(m1)
     c2.ancestors[0,3].should == [m1,m2dup,c2]
-    c2.new.should be_kind_of(m1)
+    c2.new.should.is_a?(m1)
   end
 
   it "depends on prepend_features to add the module" do
     m = Module.new { def self.prepend_features(mod) end }
-    Class.new { prepend(m) }.ancestors.should_not include(m)
+    Class.new { prepend(m) }.ancestors.should_not.include?(m)
   end
 
   it "adds the module in the subclass chains" do
@@ -627,7 +627,7 @@ def chain
         super << :class
       end
     end
-    -> { c.new.chain }.should raise_error(NoMethodError)
+    -> { c.new.chain }.should.raise(NoMethodError)
   end
 
   it "calls prepended after prepend_features" do
@@ -663,7 +663,7 @@ class B < A; prepend M; end
       module ModuleSpecs::P
         prepend ModuleSpecs::P
       end
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "doesn't accept no-arguments" do
@@ -671,7 +671,7 @@ module ModuleSpecs::P
       Module.new do
         prepend
       end
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "returns the class it's included into" do
@@ -817,7 +817,7 @@ def foo; end
       pre = Module.new
       mod.prepend pre
 
-      cls.instance_methods.should include(:foo)
+      cls.instance_methods.should.include?(:foo)
     end
   end
 end
diff --git a/spec/ruby/core/module/prepended_spec.rb b/spec/ruby/core/module/prepended_spec.rb
index bd95d8fd051..ccd450d668f 100644
--- a/spec/ruby/core/module/prepended_spec.rb
+++ b/spec/ruby/core/module/prepended_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "is a private method" do
-    Module.should have_private_instance_method(:prepended, true)
+    Module.private_instance_methods(false).should.include?(:prepended)
   end
 
   it "is invoked when self is prepended to another module or class" do
diff --git a/spec/ruby/core/module/private_class_method_spec.rb b/spec/ruby/core/module/private_class_method_spec.rb
index f899c71a57e..7ce07f16004 100644
--- a/spec/ruby/core/module/private_class_method_spec.rb
+++ b/spec/ruby/core/module/private_class_method_spec.rb
@@ -22,11 +22,11 @@ class << ModuleSpecs::Parent
   it "makes an existing class method private" do
     ModuleSpecs::Parent.private_method_1.should == nil
     ModuleSpecs::Parent.private_class_method :private_method_1
-    -> { ModuleSpecs::Parent.private_method_1  }.should raise_error(NoMethodError)
+    -> { ModuleSpecs::Parent.private_method_1  }.should.raise(NoMethodError)
 
     # Technically above we're testing the Singleton classes, class method(right?).
     # Try a "real" class method set private.
-    -> { ModuleSpecs::Parent.private_method }.should raise_error(NoMethodError)
+    -> { ModuleSpecs::Parent.private_method }.should.raise(NoMethodError)
   end
 
   it "makes an existing class method private up the inheritance tree" do
@@ -34,8 +34,8 @@ class << ModuleSpecs::Parent
     ModuleSpecs::Child.private_method_1.should == nil
     ModuleSpecs::Child.private_class_method :private_method_1
 
-    -> { ModuleSpecs::Child.private_method_1 }.should raise_error(NoMethodError)
-    -> { ModuleSpecs::Child.private_method   }.should raise_error(NoMethodError)
+    -> { ModuleSpecs::Child.private_method_1 }.should.raise(NoMethodError)
+    -> { ModuleSpecs::Child.private_method   }.should.raise(NoMethodError)
   end
 
   it "accepts more than one method at a time" do
@@ -44,14 +44,14 @@ class << ModuleSpecs::Parent
 
     ModuleSpecs::Child.private_class_method :private_method_1, :private_method_2
 
-    -> { ModuleSpecs::Child.private_method_1 }.should raise_error(NoMethodError)
-    -> { ModuleSpecs::Child.private_method_2 }.should raise_error(NoMethodError)
+    -> { ModuleSpecs::Child.private_method_1 }.should.raise(NoMethodError)
+    -> { ModuleSpecs::Child.private_method_2 }.should.raise(NoMethodError)
   end
 
   it "raises a NameError if class method doesn't exist" do
     -> do
       ModuleSpecs.private_class_method :no_method_here
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "makes a class method private" do
@@ -59,7 +59,7 @@ class << ModuleSpecs::Parent
       def self.foo() "foo" end
       private_class_method :foo
     end
-    -> { c.foo }.should raise_error(NoMethodError)
+    -> { c.foo }.should.raise(NoMethodError)
   end
 
   it "raises a NameError when the given name is not a method" do
@@ -67,7 +67,7 @@ def self.foo() "foo" end
       Class.new do
         private_class_method :foo
       end
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError when the given name is an instance method" do
@@ -76,7 +76,7 @@ def self.foo() "foo" end
         def foo() "foo" end
         private_class_method :foo
       end
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   context "when single argument is passed and is an array" do
@@ -85,7 +85,7 @@ def foo() "foo" end
         def self.foo() "foo" end
         private_class_method [:foo]
       end
-      -> { c.foo }.should raise_error(NoMethodError)
+      -> { c.foo }.should.raise(NoMethodError)
     end
   end
 end
diff --git a/spec/ruby/core/module/private_constant_spec.rb b/spec/ruby/core/module/private_constant_spec.rb
index 3a91b3c3cda..ca0df48c0b0 100644
--- a/spec/ruby/core/module/private_constant_spec.rb
+++ b/spec/ruby/core/module/private_constant_spec.rb
@@ -8,7 +8,7 @@
 
     -> do
       cls2.send :private_constant, :Foo
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "accepts strings as constant names" do
@@ -16,7 +16,7 @@
     cls.const_set :Foo, true
     cls.send :private_constant, "Foo"
 
-    -> { cls::Foo }.should raise_error(NameError)
+    -> { cls::Foo }.should.raise(NameError)
   end
 
   it "accepts multiple names" do
@@ -26,7 +26,7 @@
 
     mod.send :private_constant, :Foo, :Bar
 
-    -> {mod::Foo}.should raise_error(NameError)
-    -> {mod::Bar}.should raise_error(NameError)
+    -> {mod::Foo}.should.raise(NameError)
+    -> {mod::Bar}.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/module/private_instance_methods_spec.rb b/spec/ruby/core/module/private_instance_methods_spec.rb
index cce0f001bfb..ae0f21d1dda 100644
--- a/spec/ruby/core/module/private_instance_methods_spec.rb
+++ b/spec/ruby/core/module/private_instance_methods_spec.rb
@@ -5,20 +5,20 @@
 # TODO: rewrite
 describe "Module#private_instance_methods" do
   it "returns a list of private methods in module and its ancestors" do
-    ModuleSpecs::CountsMixin.should have_private_instance_method(:private_3)
+    ModuleSpecs::CountsMixin.private_instance_methods(false).should.include?(:private_3)
 
-    ModuleSpecs::CountsParent.should have_private_instance_method(:private_2)
-    ModuleSpecs::CountsParent.should have_private_instance_method(:private_3)
+    ModuleSpecs::CountsParent.private_instance_methods(false).should.include?(:private_2)
+    ModuleSpecs::CountsParent.private_instance_methods(true).should.include?(:private_3)
 
-    ModuleSpecs::CountsChild.should have_private_instance_method(:private_1)
-    ModuleSpecs::CountsChild.should have_private_instance_method(:private_2)
-    ModuleSpecs::CountsChild.should have_private_instance_method(:private_3)
+    ModuleSpecs::CountsChild.private_instance_methods(false).should.include?(:private_1)
+    ModuleSpecs::CountsChild.private_instance_methods(true).should.include?(:private_2)
+    ModuleSpecs::CountsChild.private_instance_methods(true).should.include?(:private_3)
   end
 
   it "when passed false as a parameter, should return only methods defined in that module" do
-    ModuleSpecs::CountsMixin.should have_private_instance_method(:private_3, false)
-    ModuleSpecs::CountsParent.should have_private_instance_method(:private_2, false)
-    ModuleSpecs::CountsChild.should have_private_instance_method(:private_1, false)
+    ModuleSpecs::CountsMixin.private_instance_methods(false).should.include?(:private_3)
+    ModuleSpecs::CountsParent.private_instance_methods(false).should.include?(:private_2)
+    ModuleSpecs::CountsChild.private_instance_methods(false).should.include?(:private_1)
   end
 
   it "default list should be the same as passing true as an argument" do
diff --git a/spec/ruby/core/module/private_method_defined_spec.rb b/spec/ruby/core/module/private_method_defined_spec.rb
index 01fc8f8fb99..f730decc0a7 100644
--- a/spec/ruby/core/module/private_method_defined_spec.rb
+++ b/spec/ruby/core/module/private_method_defined_spec.rb
@@ -34,25 +34,25 @@
   it "raises a TypeError if passed an Integer" do
     -> do
       ModuleSpecs::CountsMixin.private_method_defined?(1)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed nil" do
     -> do
       ModuleSpecs::CountsMixin.private_method_defined?(nil)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed false" do
     -> do
       ModuleSpecs::CountsMixin.private_method_defined?(false)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an object that does not defined #to_str" do
     -> do
       ModuleSpecs::CountsMixin.private_method_defined?(mock('x'))
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an object that defines #to_sym" do
@@ -61,7 +61,7 @@ def sym.to_sym() :private_3 end
 
     -> do
       ModuleSpecs::CountsMixin.private_method_defined?(sym)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "calls #to_str to convert an Object" do
diff --git a/spec/ruby/core/module/private_spec.rb b/spec/ruby/core/module/private_spec.rb
index 9e1a297eea1..e60fdb24ccd 100644
--- a/spec/ruby/core/module/private_spec.rb
+++ b/spec/ruby/core/module/private_spec.rb
@@ -17,7 +17,7 @@ class << obj
       private :foo
     end
 
-    -> { obj.foo }.should raise_error(NoMethodError)
+    -> { obj.foo }.should.raise(NoMethodError)
   end
 
   it "makes a public Object instance method private in a new module" do
@@ -25,33 +25,33 @@ class << obj
       private :module_specs_public_method_on_object
     end
 
-    m.should have_private_instance_method(:module_specs_public_method_on_object)
+    m.private_instance_methods(false).should.include?(:module_specs_public_method_on_object)
 
     # Ensure we did not change Object's method
-    Object.should_not have_private_instance_method(:module_specs_public_method_on_object)
+    Object.private_instance_methods(true).should_not.include?(:module_specs_public_method_on_object)
   end
 
   it "makes a public Object instance method private in Kernel" do
-    Kernel.should have_private_instance_method(
+    Kernel.private_instance_methods(false).should.include?(
                   :module_specs_public_method_on_object_for_kernel_private)
-    Object.should_not have_private_instance_method(
+    Object.private_instance_methods(true).should_not.include?(
                   :module_specs_public_method_on_object_for_kernel_private)
   end
 
   it "returns argument or arguments if given" do
     (class << Object.new; self; end).class_eval do
       def foo; end
-      private(:foo).should equal(:foo)
+      private(:foo).should.equal?(:foo)
       private([:foo, :foo]).should == [:foo, :foo]
       private(:foo, :foo).should == [:foo, :foo]
-      private.should equal(nil)
+      private.should.equal?(nil)
     end
   end
 
   it "raises a NameError when given an undefined name" do
     -> do
       Module.new.send(:private, :undefined)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "only makes the method private in the class it is called on" do
@@ -71,7 +71,7 @@ def wrapped
     base.new.wrapped.should == 1
     -> do
       klass.new.wrapped
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "continues to allow a prepended module method to call super" do
diff --git a/spec/ruby/core/module/protected_instance_methods_spec.rb b/spec/ruby/core/module/protected_instance_methods_spec.rb
index 78ce7e788f4..ea7ded030eb 100644
--- a/spec/ruby/core/module/protected_instance_methods_spec.rb
+++ b/spec/ruby/core/module/protected_instance_methods_spec.rb
@@ -6,16 +6,16 @@
 describe "Module#protected_instance_methods" do
   it "returns a list of protected methods in module and its ancestors" do
     methods = ModuleSpecs::CountsMixin.protected_instance_methods
-    methods.should include(:protected_3)
+    methods.should.include?(:protected_3)
 
     methods = ModuleSpecs::CountsParent.protected_instance_methods
-    methods.should include(:protected_3)
-    methods.should include(:protected_2)
+    methods.should.include?(:protected_3)
+    methods.should.include?(:protected_2)
 
     methods = ModuleSpecs::CountsChild.protected_instance_methods
-    methods.should include(:protected_3)
-    methods.should include(:protected_2)
-    methods.should include(:protected_1)
+    methods.should.include?(:protected_3)
+    methods.should.include?(:protected_2)
+    methods.should.include?(:protected_1)
   end
 
   it "when passed false as a parameter, should return only methods defined in that module" do
diff --git a/spec/ruby/core/module/protected_method_defined_spec.rb b/spec/ruby/core/module/protected_method_defined_spec.rb
index 31e24a16c1c..78ba120c2fb 100644
--- a/spec/ruby/core/module/protected_method_defined_spec.rb
+++ b/spec/ruby/core/module/protected_method_defined_spec.rb
@@ -34,25 +34,25 @@
   it "raises a TypeError if passed an Integer" do
     -> do
       ModuleSpecs::CountsMixin.protected_method_defined?(1)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed nil" do
     -> do
       ModuleSpecs::CountsMixin.protected_method_defined?(nil)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed false" do
     -> do
       ModuleSpecs::CountsMixin.protected_method_defined?(false)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an object that does not defined #to_str" do
     -> do
       ModuleSpecs::CountsMixin.protected_method_defined?(mock('x'))
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an object that defines #to_sym" do
@@ -61,7 +61,7 @@ def sym.to_sym() :protected_3 end
 
     -> do
       ModuleSpecs::CountsMixin.protected_method_defined?(sym)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "calls #to_str to convert an Object" do
diff --git a/spec/ruby/core/module/protected_spec.rb b/spec/ruby/core/module/protected_spec.rb
index 9e37223e181..3ef6c76fae7 100644
--- a/spec/ruby/core/module/protected_spec.rb
+++ b/spec/ruby/core/module/protected_spec.rb
@@ -18,7 +18,7 @@ class << ModuleSpecs::Parent
       protected :protected_method_1
     end
 
-    -> { ModuleSpecs::Parent.protected_method_1 }.should raise_error(NoMethodError)
+    -> { ModuleSpecs::Parent.protected_method_1 }.should.raise(NoMethodError)
   end
 
   it "makes a public Object instance method protected in a new module" do
@@ -26,32 +26,32 @@ class << ModuleSpecs::Parent
       protected :module_specs_public_method_on_object
     end
 
-    m.should have_protected_instance_method(:module_specs_public_method_on_object)
+    m.protected_instance_methods(false).should.include?(:module_specs_public_method_on_object)
 
     # Ensure we did not change Object's method
-    Object.should_not have_protected_instance_method(:module_specs_public_method_on_object)
+    Object.protected_instance_methods(true).should_not.include?(:module_specs_public_method_on_object)
   end
 
   it "makes a public Object instance method protected in Kernel" do
-    Kernel.should have_protected_instance_method(
+    Kernel.protected_instance_methods(false).should.include?(
                   :module_specs_public_method_on_object_for_kernel_protected)
-    Object.should_not have_protected_instance_method(
+    Object.protected_instance_methods(true).should_not.include?(
                   :module_specs_public_method_on_object_for_kernel_protected)
   end
 
   it "returns argument or arguments if given" do
     (class << Object.new; self; end).class_eval do
       def foo; end
-      protected(:foo).should equal(:foo)
+      protected(:foo).should.equal?(:foo)
       protected([:foo, :foo]).should == [:foo, :foo]
       protected(:foo, :foo).should == [:foo, :foo]
-      protected.should equal(nil)
+      protected.should.equal?(nil)
     end
   end
 
   it "raises a NameError when given an undefined name" do
     -> do
       Module.new.send(:protected, :undefined)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/module/public_class_method_spec.rb b/spec/ruby/core/module/public_class_method_spec.rb
index 71b20acda50..4aca4d43119 100644
--- a/spec/ruby/core/module/public_class_method_spec.rb
+++ b/spec/ruby/core/module/public_class_method_spec.rb
@@ -18,7 +18,7 @@ class << ModuleSpecs::Parent
   end
 
   it "makes an existing class method public" do
-    -> { ModuleSpecs::Parent.public_method_1 }.should raise_error(NoMethodError)
+    -> { ModuleSpecs::Parent.public_method_1 }.should.raise(NoMethodError)
     ModuleSpecs::Parent.public_class_method :public_method_1
     ModuleSpecs::Parent.public_method_1.should == nil
 
@@ -29,7 +29,7 @@ class << ModuleSpecs::Parent
 
   it "makes an existing class method public up the inheritance tree" do
     ModuleSpecs::Child.private_class_method :public_method_1
-    -> { ModuleSpecs::Child.public_method_1 }.should raise_error(NoMethodError)
+    -> { ModuleSpecs::Child.public_method_1 }.should.raise(NoMethodError)
     ModuleSpecs::Child.public_class_method :public_method_1
 
     ModuleSpecs::Child.public_method_1.should == nil
@@ -37,8 +37,8 @@ class << ModuleSpecs::Parent
   end
 
   it "accepts more than one method at a time" do
-    -> { ModuleSpecs::Parent.public_method_1 }.should raise_error(NameError)
-    -> { ModuleSpecs::Parent.public_method_2 }.should raise_error(NameError)
+    -> { ModuleSpecs::Parent.public_method_1 }.should.raise(NameError)
+    -> { ModuleSpecs::Parent.public_method_2 }.should.raise(NameError)
 
     ModuleSpecs::Child.public_class_method :public_method_1, :public_method_2
 
@@ -49,7 +49,7 @@ class << ModuleSpecs::Parent
   it "raises a NameError if class method doesn't exist" do
     -> do
       ModuleSpecs.public_class_method :no_method_here
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "makes a class method public" do
@@ -66,7 +66,7 @@ def self.foo() "foo" end
       Class.new do
         public_class_method :foo
       end
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError when the given name is an instance method" do
@@ -75,7 +75,7 @@ def self.foo() "foo" end
         def foo() "foo" end
         public_class_method :foo
       end
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   context "when single argument is passed and is an array" do
diff --git a/spec/ruby/core/module/public_constant_spec.rb b/spec/ruby/core/module/public_constant_spec.rb
index e624d45fd22..87a051f1250 100644
--- a/spec/ruby/core/module/public_constant_spec.rb
+++ b/spec/ruby/core/module/public_constant_spec.rb
@@ -8,7 +8,7 @@
 
     -> do
       cls2.send :public_constant, :Foo
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "accepts strings as constant names" do
diff --git a/spec/ruby/core/module/public_instance_method_spec.rb b/spec/ruby/core/module/public_instance_method_spec.rb
index ba19ad0404d..87c1bae5995 100644
--- a/spec/ruby/core/module/public_instance_method_spec.rb
+++ b/spec/ruby/core/module/public_instance_method_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Module#public_instance_method" do
   it "is a public method" do
-    Module.should have_public_instance_method(:public_instance_method, false)
+    Module.public_instance_methods(false).should.include?(:public_instance_method)
   end
 
   it "requires an argument" do
@@ -13,12 +13,12 @@
   describe "when given a public method name" do
     it "returns an UnboundMethod corresponding to the defined Module" do
       ret = ModuleSpecs::Super.public_instance_method(:public_module)
-      ret.should be_an_instance_of(UnboundMethod)
-      ret.owner.should equal(ModuleSpecs::Basic)
+      ret.should.instance_of?(UnboundMethod)
+      ret.owner.should.equal?(ModuleSpecs::Basic)
 
       ret = ModuleSpecs::Super.public_instance_method(:public_super_module)
-      ret.should be_an_instance_of(UnboundMethod)
-      ret.owner.should equal(ModuleSpecs::Super)
+      ret.should.instance_of?(UnboundMethod)
+      ret.owner.should.equal?(ModuleSpecs::Super)
     end
 
     it "accepts if the name is a Symbol or String" do
@@ -28,31 +28,31 @@
   end
 
   it "raises a TypeError when given a name is not Symbol or String" do
-    -> { Module.new.public_instance_method(nil) }.should raise_error(TypeError)
+    -> { Module.new.public_instance_method(nil) }.should.raise(TypeError)
   end
 
   it "raises a NameError when given a protected method name" do
     -> do
       ModuleSpecs::Basic.public_instance_method(:protected_module)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError if the method is private" do
     -> do
       ModuleSpecs::Basic.public_instance_method(:private_module)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError if the method has been undefined" do
     -> do
       ModuleSpecs::Parent.public_instance_method(:undefed_method)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "raises a NameError if the method does not exist" do
     -> do
       Module.new.public_instance_method(:missing)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "sets the NameError#name attribute to the name of the missing method" do
diff --git a/spec/ruby/core/module/public_instance_methods_spec.rb b/spec/ruby/core/module/public_instance_methods_spec.rb
index ae7d9b5ffb4..edea00d9271 100644
--- a/spec/ruby/core/module/public_instance_methods_spec.rb
+++ b/spec/ruby/core/module/public_instance_methods_spec.rb
@@ -7,19 +7,19 @@
 describe "Module#public_instance_methods" do
   it "returns a list of public methods in module and its ancestors" do
     methods = ModuleSpecs::CountsMixin.public_instance_methods
-    methods.should include(:public_3)
+    methods.should.include?(:public_3)
 
     methods = ModuleSpecs::CountsParent.public_instance_methods
-    methods.should include(:public_3)
-    methods.should include(:public_2)
+    methods.should.include?(:public_3)
+    methods.should.include?(:public_2)
 
     methods = ModuleSpecs::CountsChild.public_instance_methods
-    methods.should include(:public_3)
-    methods.should include(:public_2)
-    methods.should include(:public_1)
+    methods.should.include?(:public_3)
+    methods.should.include?(:public_2)
+    methods.should.include?(:public_1)
 
     methods = ModuleSpecs::Child2.public_instance_methods
-    methods.should include(:foo)
+    methods.should.include?(:foo)
   end
 
   it "when passed false as a parameter, should return only methods defined in that module" do
diff --git a/spec/ruby/core/module/public_method_defined_spec.rb b/spec/ruby/core/module/public_method_defined_spec.rb
index 5c9bdf1ccc6..70cd9923581 100644
--- a/spec/ruby/core/module/public_method_defined_spec.rb
+++ b/spec/ruby/core/module/public_method_defined_spec.rb
@@ -34,25 +34,25 @@
   it "raises a TypeError if passed an Integer" do
     -> do
       ModuleSpecs::CountsMixin.public_method_defined?(1)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed nil" do
     -> do
       ModuleSpecs::CountsMixin.public_method_defined?(nil)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed false" do
     -> do
       ModuleSpecs::CountsMixin.public_method_defined?(false)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an object that does not defined #to_str" do
     -> do
       ModuleSpecs::CountsMixin.public_method_defined?(mock('x'))
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an object that defines #to_sym" do
@@ -61,7 +61,7 @@ def sym.to_sym() :public_3 end
 
     -> do
       ModuleSpecs::CountsMixin.public_method_defined?(sym)
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "calls #to_str to convert an Object" do
diff --git a/spec/ruby/core/module/public_spec.rb b/spec/ruby/core/module/public_spec.rb
index ce31eb5d0e7..f35c64143b8 100644
--- a/spec/ruby/core/module/public_spec.rb
+++ b/spec/ruby/core/module/public_spec.rb
@@ -14,32 +14,32 @@
       public :module_specs_private_method_on_object
     end
 
-    m.should have_public_instance_method(:module_specs_private_method_on_object)
+    m.public_instance_methods(false).should.include?(:module_specs_private_method_on_object)
 
     # Ensure we did not change Object's method
-    Object.should_not have_public_instance_method(:module_specs_private_method_on_object)
+    Object.public_instance_methods(true).should_not.include?(:module_specs_private_method_on_object)
   end
 
   it "makes a private Object instance method public in Kernel" do
-    Kernel.should have_public_instance_method(
+    Kernel.public_instance_methods(false).should.include?(
                   :module_specs_private_method_on_object_for_kernel_public)
-    Object.should_not have_public_instance_method(
+    Object.public_instance_methods(true).should_not.include?(
                   :module_specs_private_method_on_object_for_kernel_public)
   end
 
   it "returns argument or arguments if given" do
     (class << Object.new; self; end).class_eval do
       def foo; end
-      public(:foo).should equal(:foo)
+      public(:foo).should.equal?(:foo)
       public([:foo, :foo]).should == [:foo, :foo]
       public(:foo, :foo).should == [:foo, :foo]
-      public.should equal(nil)
+      public.should.equal?(nil)
     end
   end
 
   it "raises a NameError when given an undefined name" do
     -> do
       Module.new.send(:public, :undefined)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/module/refine_spec.rb b/spec/ruby/core/module/refine_spec.rb
index d219b988250..d0fc7015f8b 100644
--- a/spec/ruby/core/module/refine_spec.rb
+++ b/spec/ruby/core/module/refine_spec.rb
@@ -11,7 +11,7 @@
     end
 
     mod.should_not == inner_self
-    inner_self.should be_kind_of(Module)
+    inner_self.should.is_a?(Module)
     inner_self.name.should == nil
   end
 
@@ -43,7 +43,7 @@ def blah
       end
     end
 
-    inner_self.public_instance_methods.should include(:blah)
+    inner_self.public_instance_methods.should.include?(:blah)
   end
 
   it "returns created anonymous module" do
@@ -63,7 +63,7 @@ def blah
       Module.new do
         refine {}
       end
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises TypeError if not passed a class" do
@@ -71,7 +71,7 @@ def blah
       Module.new do
         refine("foo") {}
       end
-    end.should raise_error(TypeError, "wrong argument type String (expected Class or Module)")
+    end.should.raise(TypeError, "wrong argument type String (expected Class or Module)")
   end
 
   it "accepts a module as argument" do
@@ -84,7 +84,7 @@ def blah
       end
     end
 
-    inner_self.public_instance_methods.should include(:blah)
+    inner_self.public_instance_methods.should.include?(:blah)
   end
 
   it "applies refinements to the module" do
@@ -117,7 +117,7 @@ def result
       Module.new do
         refine String
       end
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "applies refinements to calls in the refine block" do
@@ -136,7 +136,7 @@ def foo; "foo"; end
       refine(String) {def foo; "foo"; end}
       -> {
         "hello".foo
-      }.should raise_error(NoMethodError)
+      }.should.raise(NoMethodError)
     end
   end
 
@@ -145,7 +145,7 @@ def foo; "foo"; end
       refine(String) {def foo; 'foo'; end}
     end
 
-    -> {"hello".foo}.should raise_error(NoMethodError)
+    -> {"hello".foo}.should.raise(NoMethodError)
   end
 
   # When defining multiple refinements in the same module,
@@ -209,7 +209,7 @@ def to_json_format
 
         [1, 2].to_json_format
       end
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   # method lookup:
@@ -596,7 +596,7 @@ def bar
         using refinement_with_super
         -> {
           refined_class.new.bar
-        }.should raise_error(NoMethodError)
+        }.should.raise(NoMethodError)
       end
     end
   end
@@ -610,7 +610,7 @@ def bar
       }
       [1,2].orig_count.should == 2
     end
-    -> { [1,2].orig_count }.should raise_error(NoMethodError)
+    -> { [1,2].orig_count }.should.raise(NoMethodError)
   end
 
   it 'and alias_method aliases a method within a refinement module, but not outside it' do
@@ -622,7 +622,7 @@ def bar
       }
       [1,2].orig_count.should == 2
     end
-    -> { [1,2].orig_count }.should raise_error(NoMethodError)
+    -> { [1,2].orig_count }.should.raise(NoMethodError)
   end
 
   it "and instance_methods returns a list of methods including those of the refined module" do
@@ -704,11 +704,10 @@ def refinement_only_method
         end
       end
     end
-    spec = self
-    klass = Class.new { instance_methods.should_not spec.send(:include, :refinement_only_method) }
+    klass = Class.new { instance_methods.should_not.include?(:refinement_only_method) }
     instance = klass.new
-    instance.methods.should_not include :refinement_only_method
+    instance.methods.should_not.include? :refinement_only_method
     instance.respond_to?(:refinement_only_method).should == false
-    -> { instance.method :refinement_only_method }.should raise_error(NameError)
+    -> { instance.method :refinement_only_method }.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/core/module/remove_class_variable_spec.rb b/spec/ruby/core/module/remove_class_variable_spec.rb
index ab9514adf66..fccb29f52d1 100644
--- a/spec/ruby/core/module/remove_class_variable_spec.rb
+++ b/spec/ruby/core/module/remove_class_variable_spec.rb
@@ -18,27 +18,27 @@
     meta = obj.singleton_class
     meta.send :class_variable_set, :@@var, 1
     meta.send(:remove_class_variable, :@@var).should == 1
-    meta.class_variable_defined?(:@@var).should be_false
+    meta.class_variable_defined?(:@@var).should == false
   end
 
   it "raises a NameError when removing class variable declared in included module" do
     c = ModuleSpecs::RemoveClassVariable.new { include ModuleSpecs::MVars.dup }
-    -> { c.send(:remove_class_variable, :@@mvar) }.should raise_error(NameError)
+    -> { c.send(:remove_class_variable, :@@mvar) }.should.raise(NameError)
   end
 
   it "raises a NameError when passed a symbol with one leading @" do
-    -> { ModuleSpecs::MVars.send(:remove_class_variable, :@mvar) }.should raise_error(NameError)
+    -> { ModuleSpecs::MVars.send(:remove_class_variable, :@mvar) }.should.raise(NameError)
   end
 
   it "raises a NameError when passed a symbol with no leading @" do
-    -> { ModuleSpecs::MVars.send(:remove_class_variable, :mvar)  }.should raise_error(NameError)
+    -> { ModuleSpecs::MVars.send(:remove_class_variable, :mvar)  }.should.raise(NameError)
   end
 
   it "raises a NameError when an uninitialized class variable is given" do
-    -> { ModuleSpecs::MVars.send(:remove_class_variable, :@@nonexisting_class_variable) }.should raise_error(NameError)
+    -> { ModuleSpecs::MVars.send(:remove_class_variable, :@@nonexisting_class_variable) }.should.raise(NameError)
   end
 
   it "is public" do
-    Module.should_not have_private_instance_method(:remove_class_variable)
+    Module.private_instance_methods(true).should_not.include?(:remove_class_variable)
   end
 end
diff --git a/spec/ruby/core/module/remove_const_spec.rb b/spec/ruby/core/module/remove_const_spec.rb
index 35a9d65105d..4e4b9fcb45c 100644
--- a/spec/ruby/core/module/remove_const_spec.rb
+++ b/spec/ruby/core/module/remove_const_spec.rb
@@ -7,13 +7,13 @@
     ConstantSpecs::ModuleM::CS_CONST252.should == :const252
 
     ConstantSpecs::ModuleM.send :remove_const, :CS_CONST252
-    -> { ConstantSpecs::ModuleM::CS_CONST252 }.should raise_error(NameError)
+    -> { ConstantSpecs::ModuleM::CS_CONST252 }.should.raise(NameError)
 
     ConstantSpecs::ModuleM::CS_CONST253 = :const253
     ConstantSpecs::ModuleM::CS_CONST253.should == :const253
 
     ConstantSpecs::ModuleM.send :remove_const, "CS_CONST253"
-    -> { ConstantSpecs::ModuleM::CS_CONST253 }.should raise_error(NameError)
+    -> { ConstantSpecs::ModuleM::CS_CONST253 }.should.raise(NameError)
   end
 
   it "returns the value of the removed constant" do
@@ -23,7 +23,7 @@
 
   it "raises a NameError and does not call #const_missing if the constant is not defined" do
     ConstantSpecs.should_not_receive(:const_missing)
-    -> { ConstantSpecs.send(:remove_const, :Nonexistent) }.should raise_error(NameError)
+    -> { ConstantSpecs.send(:remove_const, :Nonexistent) }.should.raise(NameError)
   end
 
   it "raises a NameError and does not call #const_missing if the constant is not defined directly in the module" do
@@ -34,28 +34,28 @@
 
       -> do
         ConstantSpecs::ContainerA.send :remove_const, :CS_CONST255
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     ensure
       ConstantSpecs::ModuleM.send :remove_const, "CS_CONST255"
     end
   end
 
   it "raises a NameError if the name does not start with a capital letter" do
-    -> { ConstantSpecs.send :remove_const, "name" }.should raise_error(NameError)
+    -> { ConstantSpecs.send :remove_const, "name" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name starts with a non-alphabetic character" do
-    -> { ConstantSpecs.send :remove_const, "__CONSTX__" }.should raise_error(NameError)
-    -> { ConstantSpecs.send :remove_const, "@Name" }.should raise_error(NameError)
-    -> { ConstantSpecs.send :remove_const, "!Name" }.should raise_error(NameError)
-    -> { ConstantSpecs.send :remove_const, "::Name" }.should raise_error(NameError)
+    -> { ConstantSpecs.send :remove_const, "__CONSTX__" }.should.raise(NameError)
+    -> { ConstantSpecs.send :remove_const, "@Name" }.should.raise(NameError)
+    -> { ConstantSpecs.send :remove_const, "!Name" }.should.raise(NameError)
+    -> { ConstantSpecs.send :remove_const, "::Name" }.should.raise(NameError)
   end
 
   it "raises a NameError if the name contains non-alphabetic characters except '_'" do
     ConstantSpecs::ModuleM::CS_CONST256 = :const256
     ConstantSpecs::ModuleM.send :remove_const, "CS_CONST256"
-    -> { ConstantSpecs.send :remove_const, "Name=" }.should raise_error(NameError)
-    -> { ConstantSpecs.send :remove_const, "Name?" }.should raise_error(NameError)
+    -> { ConstantSpecs.send :remove_const, "Name=" }.should.raise(NameError)
+    -> { ConstantSpecs.send :remove_const, "Name?" }.should.raise(NameError)
   end
 
   it "calls #to_str to convert the given name to a String" do
@@ -67,19 +67,19 @@
 
   it "raises a TypeError if conversion to a String by calling #to_str fails" do
     name = mock('123')
-    -> { ConstantSpecs.send :remove_const, name }.should raise_error(TypeError)
+    -> { ConstantSpecs.send :remove_const, name }.should.raise(TypeError)
 
     name.should_receive(:to_str).and_return(123)
-    -> { ConstantSpecs.send :remove_const, name }.should raise_error(TypeError)
+    -> { ConstantSpecs.send :remove_const, name }.should.raise(TypeError)
   end
 
   it "is a private method" do
-    Module.private_methods.should include(:remove_const)
+    Module.private_methods.should.include?(:remove_const)
   end
 
   it "returns nil when removing autoloaded constant" do
     ConstantSpecs.autoload :AutoloadedConstant, 'a_file'
-    ConstantSpecs.send(:remove_const, :AutoloadedConstant).should be_nil
+    ConstantSpecs.send(:remove_const, :AutoloadedConstant).should == nil
   end
 
   it "updates the constant value" do
diff --git a/spec/ruby/core/module/remove_method_spec.rb b/spec/ruby/core/module/remove_method_spec.rb
index 94b255df620..39add01e360 100644
--- a/spec/ruby/core/module/remove_method_spec.rb
+++ b/spec/ruby/core/module/remove_method_spec.rb
@@ -21,7 +21,7 @@ def method_to_remove; 2; end
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:remove_method, false)
+    Module.public_instance_methods(false).should.include?(:remove_method)
   end
 
   it "removes the method from a class" do
@@ -88,14 +88,14 @@ def method_to_remove_2; 2; end
   end
 
   it "returns self" do
-    @module.send(:remove_method, :method_to_remove).should equal(@module)
+    @module.send(:remove_method, :method_to_remove).should.equal?(@module)
   end
 
   it "raises a NameError when attempting to remove method further up the inheritance tree" do
     Class.new(ModuleSpecs::Second) do
       -> {
         remove_method :method_to_remove
-      }.should raise_error(NameError)
+      }.should.raise(NameError)
     end
   end
 
@@ -103,7 +103,7 @@ def method_to_remove_2; 2; end
     Class.new(ModuleSpecs::Second) do
       -> {
         remove_method :blah
-      }.should raise_error(NameError)
+      }.should.raise(NameError)
     end
   end
 
@@ -113,19 +113,19 @@ def method_to_remove_2; 2; end
     end
 
     it "raises a FrozenError when passed a name" do
-      -> { @frozen.send :remove_method, :method_to_remove }.should raise_error(FrozenError)
+      -> { @frozen.send :remove_method, :method_to_remove }.should.raise(FrozenError)
     end
 
     it "raises a FrozenError when passed a missing name" do
-      -> { @frozen.send :remove_method, :not_exist }.should raise_error(FrozenError)
+      -> { @frozen.send :remove_method, :not_exist }.should.raise(FrozenError)
     end
 
     it "raises a TypeError when passed a not name" do
-      -> { @frozen.send :remove_method, Object.new }.should raise_error(TypeError)
+      -> { @frozen.send :remove_method, Object.new }.should.raise(TypeError)
     end
 
     it "does not raise exceptions when no arguments given" do
-      @frozen.send(:remove_method).should equal(@frozen)
+      @frozen.send(:remove_method).should.equal?(@frozen)
     end
   end
 end
diff --git a/spec/ruby/core/module/ruby2_keywords_spec.rb b/spec/ruby/core/module/ruby2_keywords_spec.rb
index 652f9f70839..e3926429784 100644
--- a/spec/ruby/core/module/ruby2_keywords_spec.rb
+++ b/spec/ruby/core/module/ruby2_keywords_spec.rb
@@ -175,7 +175,7 @@ def foo(*a) end
       obj.singleton_class.class_exec do
         ruby2_keywords :not_existing
       end
-    }.should raise_error(NameError, /undefined method [`']not_existing'/)
+    }.should.raise(NameError, /undefined method [`']not_existing'/)
   end
 
   it "accepts String as well" do
@@ -197,7 +197,7 @@ def foo(*a) a.last end
       obj.singleton_class.class_exec do
         ruby2_keywords Object.new
       end
-    }.should raise_error(TypeError, /is not a symbol nor a string/)
+    }.should.raise(TypeError, /is not a symbol nor a string/)
   end
 
   it "prints warning when a method does not accept argument splat" do
diff --git a/spec/ruby/core/module/set_temporary_name_spec.rb b/spec/ruby/core/module/set_temporary_name_spec.rb
index 0b96b869c90..7c159121fae 100644
--- a/spec/ruby/core/module/set_temporary_name_spec.rb
+++ b/spec/ruby/core/module/set_temporary_name_spec.rb
@@ -4,13 +4,13 @@
 describe "Module#set_temporary_name" do
   it "can assign a temporary name" do
     m = Module.new
-    m.name.should be_nil
+    m.name.should == nil
 
     m.set_temporary_name("fake_name")
     m.name.should == "fake_name"
 
     m.set_temporary_name(nil)
-    m.name.should be_nil
+    m.name.should == nil
   end
 
   it "returns self" do
@@ -45,23 +45,23 @@
 
   it "can't assign empty string as name" do
     m = Module.new
-    -> { m.set_temporary_name("") }.should raise_error(ArgumentError, "empty class/module name")
+    -> { m.set_temporary_name("") }.should.raise(ArgumentError, "empty class/module name")
   end
 
   it "can't assign a constant name as a temporary name" do
     m = Module.new
-    -> { m.set_temporary_name("Object") }.should raise_error(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
+    -> { m.set_temporary_name("Object") }.should.raise(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
   end
 
   it "can't assign a constant path as a temporary name" do
     m = Module.new
-    -> { m.set_temporary_name("A::B") }.should raise_error(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
-    -> { m.set_temporary_name("::A") }.should raise_error(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
-    -> { m.set_temporary_name("::A::B") }.should raise_error(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
+    -> { m.set_temporary_name("A::B") }.should.raise(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
+    -> { m.set_temporary_name("::A") }.should.raise(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
+    -> { m.set_temporary_name("::A::B") }.should.raise(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
   end
 
   it "can't assign name to permanent module" do
-    -> { Object.set_temporary_name("fake_name") }.should raise_error(RuntimeError, "can't change permanent name")
+    -> { Object.set_temporary_name("fake_name") }.should.raise(RuntimeError, "can't change permanent name")
   end
 
   it "can assign a temporary name to a module nested into an anonymous module" do
@@ -73,7 +73,7 @@ module m::N; end
     m::N.name.should == "fake_name"
 
     m::N.set_temporary_name(nil)
-    m::N.name.should be_nil
+    m::N.name.should == nil
   end
 
   it "discards a temporary name when an outer anonymous module gets a permanent name" do
diff --git a/spec/ruby/core/module/shared/class_eval.rb b/spec/ruby/core/module/shared/class_eval.rb
index 526d0a20363..ee2860449ae 100644
--- a/spec/ruby/core/module/shared/class_eval.rb
+++ b/spec/ruby/core/module/shared/class_eval.rb
@@ -14,7 +14,7 @@ def foo
         'foo'
       end
     end
-    -> {42.foo}.should raise_error(NoMethodError)
+    -> {42.foo}.should.raise(NoMethodError)
   end
 
   it "resolves constants in the caller scope" do
@@ -45,7 +45,7 @@ def foo
     ModuleSpecs.send(@method) do |block_parameter|
       given = block_parameter
     end
-    given.should equal ModuleSpecs
+    given.should.equal? ModuleSpecs
   end
 
   it "uses the optional filename and lineno parameters for error messages" do
@@ -66,7 +66,7 @@ def foo
 
   it "raises a TypeError when the given filename can't be converted to string using to_str" do
     (file = mock('123')).should_receive(:to_str).and_return(123)
-    -> { ModuleSpecs.send(@method, "1+1", file) }.should raise_error(TypeError, /can't convert MockObject to String/)
+    -> { ModuleSpecs.send(@method, "1+1", file) }.should raise_consistent_error(TypeError, /can't convert MockObject into String/)
   end
 
   it "converts non string eval-string to string using to_str" do
@@ -82,26 +82,26 @@ def foo
 
   it "raises a TypeError when the given eval-string can't be converted to string using to_str" do
     o = mock('x')
-    -> { ModuleSpecs.send(@method, o) }.should raise_error(TypeError, "no implicit conversion of MockObject into String")
+    -> { ModuleSpecs.send(@method, o) }.should.raise(TypeError, "no implicit conversion of MockObject into String")
 
     (o = mock('123')).should_receive(:to_str).and_return(123)
-    -> { ModuleSpecs.send(@method, o) }.should raise_error(TypeError, /can't convert MockObject to String/)
+    -> { ModuleSpecs.send(@method, o) }.should raise_consistent_error(TypeError, /can't convert MockObject into String/)
   end
 
   it "raises an ArgumentError when no arguments and no block are given" do
-    -> { ModuleSpecs.send(@method) }.should raise_error(ArgumentError, "wrong number of arguments (given 0, expected 1..3)")
+    -> { ModuleSpecs.send(@method) }.should.raise(ArgumentError, "wrong number of arguments (given 0, expected 1..3)")
   end
 
   it "raises an ArgumentError when more than 3 arguments are given" do
     -> {
       ModuleSpecs.send(@method, "1 + 1", "some file", 0, "bogus")
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 1..3)")
   end
 
   it "raises an ArgumentError when a block and normal arguments are given" do
     -> {
       ModuleSpecs.send(@method, "1 + 1") { 1 + 1 }
-    }.should raise_error(ArgumentError, "wrong number of arguments (given 1, expected 0)")
+    }.should.raise(ArgumentError, "wrong number of arguments (given 1, expected 0)")
   end
 
   # This case was found because Rubinius was caching the compiled
diff --git a/spec/ruby/core/module/shared/class_exec.rb b/spec/ruby/core/module/shared/class_exec.rb
index c7a9e5297f5..e51af1966dd 100644
--- a/spec/ruby/core/module/shared/class_exec.rb
+++ b/spec/ruby/core/module/shared/class_exec.rb
@@ -5,7 +5,7 @@ def foo
         'foo'
       end
     end
-    -> {42.foo}.should raise_error(NoMethodError)
+    -> {42.foo}.should.raise(NoMethodError)
   end
 
   it "defines method in the receiver's scope" do
@@ -19,11 +19,17 @@ def foo
   end
 
   it "raises a LocalJumpError when no block is given" do
-    -> { ModuleSpecs::Subclass.send(@method) }.should raise_error(LocalJumpError)
+    -> { ModuleSpecs::Subclass.send(@method) }.should.raise(LocalJumpError)
   end
 
   it "passes arguments to the block" do
     a = ModuleSpecs::Subclass
-    a.send(@method, 1) { |b| b }.should equal(1)
+    a.send(@method, 1) { |b| b }.should.equal?(1)
+  end
+
+  describe "with optional argument" do
+    it "does not destructure a single array argument" do
+      ModuleSpecs::Subclass.send(@method, [1, 2, 3]) { |a = 99| a }.should == [1, 2, 3]
+    end
   end
 end
diff --git a/spec/ruby/core/module/shared/set_visibility.rb b/spec/ruby/core/module/shared/set_visibility.rb
index a1586dd2bda..38cc2ad260d 100644
--- a/spec/ruby/core/module/shared/set_visibility.rb
+++ b/spec/ruby/core/module/shared/set_visibility.rb
@@ -2,7 +2,7 @@
 
 describe :set_visibility, shared: true do
   it "is a private method" do
-    Module.should have_private_instance_method(@method, false)
+    Module.private_instance_methods(false).should.include?(@method)
   end
 
   describe "with argument" do
@@ -17,8 +17,8 @@ def test1() end
           def test2() end
           send visibility, :test1, :test2
         }
-        mod.should send(:"have_#{visibility}_instance_method", :test1, false)
-        mod.should send(:"have_#{visibility}_instance_method", :test2, false)
+        mod.send(:"#{visibility}_instance_methods", false).should.include?(:test1)
+        mod.send(:"#{visibility}_instance_methods", false).should.include?(:test2)
       end
     end
 
@@ -33,8 +33,8 @@ def test1() end
           def test2() end
           send visibility, [:test1, :test2]
         }
-        mod.should send(:"have_#{visibility}_instance_method", :test1, false)
-        mod.should send(:"have_#{visibility}_instance_method", :test2, false)
+        mod.send(:"#{visibility}_instance_methods", false).should.include?(:test1)
+        mod.send(:"#{visibility}_instance_methods", false).should.include?(:test2)
       end
     end
 
@@ -50,7 +50,7 @@ def test_method; end
         send(visibility, :test_method)
       }
 
-      child.should_not send(:"have_#{visibility}_instance_method", :test_method, false)
+      child.send(:"#{visibility}_instance_methods", false).should_not.include?(:test_method)
     end
   end
 
@@ -64,8 +64,8 @@ def test1() end
         def test2() end
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test1, false)
-      mod.should send(:"have_#{@method}_instance_method", :test2, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test2)
     end
 
     it "stops setting visibility if the body encounters other visibility setters without arguments" do
@@ -78,7 +78,7 @@ def test2() end
         def test1() end
       }
 
-      mod.should send(:"have_#{new_visibility}_instance_method", :test1, false)
+      mod.send(:"#{new_visibility}_instance_methods", false).should.include?(:test1)
     end
 
     it "continues setting visibility if the body encounters other visibility setters with arguments" do
@@ -90,7 +90,7 @@ def test1() end
         def test2() end
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test2, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test2)
     end
 
     it "does not affect module_evaled method definitions when itself is outside the eval" do
@@ -102,8 +102,8 @@ def test2() end
         module_eval " def test2() end "
       }
 
-      mod.should have_public_instance_method(:test1, false)
-      mod.should have_public_instance_method(:test2, false)
+      mod.public_instance_methods(false).should.include?(:test1)
+      mod.public_instance_methods(false).should.include?(:test2)
     end
 
     it "does not affect outside method definitions when itself is inside a module_eval" do
@@ -114,7 +114,7 @@ def test2() end
         def test1() end
       }
 
-      mod.should have_public_instance_method(:test1, false)
+      mod.public_instance_methods(false).should.include?(:test1)
     end
 
     it "affects normally if itself and method definitions are inside a module_eval" do
@@ -127,7 +127,7 @@ def test1() end
         }
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test1, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
     end
 
     it "does not affect method definitions when itself is inside an eval and method definitions are outside" do
@@ -140,7 +140,7 @@ def test1() end
         def test1() end
       }
 
-      mod.should send(:"have_#{initialized_visibility}_instance_method", :test1, false)
+      mod.send(:"#{initialized_visibility}_instance_methods", false).should.include?(:test1)
     end
 
     it "affects evaled method definitions when itself is outside the eval" do
@@ -151,7 +151,7 @@ def test1() end
         eval "def test1() end"
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test1, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
     end
 
     it "affects normally if itself and following method definitions are inside a eval" do
@@ -164,7 +164,7 @@ def test1() end
         CODE
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test1, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
     end
 
     describe "within a closure" do
@@ -177,7 +177,7 @@ def test1() end
           def test1() end
         }
 
-        mod.should send(:"have_#{@method}_instance_method", :test1, false)
+        mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
       end
     end
   end
diff --git a/spec/ruby/core/module/undef_method_spec.rb b/spec/ruby/core/module/undef_method_spec.rb
index d4efcd51cbe..d77640cb7e6 100644
--- a/spec/ruby/core/module/undef_method_spec.rb
+++ b/spec/ruby/core/module/undef_method_spec.rb
@@ -19,7 +19,7 @@ def another_method_to_undef() 1 end
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:undef_method, false)
+    Module.public_instance_methods(false).should.include?(:undef_method)
   end
 
   it "requires multiple arguments" do
@@ -34,8 +34,8 @@ def another_method_to_undef() 1 end
     x = klass.new
     klass.send(:undef_method, :method_to_undef, :another_method_to_undef)
 
-    -> { x.method_to_undef }.should raise_error(NoMethodError)
-    -> { x.another_method_to_undef }.should raise_error(NoMethodError)
+    -> { x.method_to_undef }.should.raise(NoMethodError)
+    -> { x.another_method_to_undef }.should.raise(NoMethodError)
   end
 
   it "does not undef any instance methods when argument not given" do
@@ -46,11 +46,11 @@ def another_method_to_undef() 1 end
   end
 
   it "returns self" do
-    @module.send(:undef_method, :method_to_undef).should equal(@module)
+    @module.send(:undef_method, :method_to_undef).should.equal?(@module)
   end
 
   it "raises a NameError when passed a missing name for a module" do
-    -> { @module.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method [`']not_exist' for module [`']#{@module}'/) { |e|
+    -> { @module.send :undef_method, :not_exist }.should.raise(NameError, /undefined method [`']not_exist' for module [`']#{@module}'/) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -58,7 +58,7 @@ def another_method_to_undef() 1 end
 
   it "raises a NameError when passed a missing name for a class" do
     klass = Class.new
-    -> { klass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method [`']not_exist' for class [`']#{klass}'/) { |e|
+    -> { klass.send :undef_method, :not_exist }.should.raise(NameError, /undefined method [`']not_exist' for class [`']#{klass}'/) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -69,7 +69,7 @@ def another_method_to_undef() 1 end
     obj = klass.new
     sclass = obj.singleton_class
 
-    -> { sclass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method [`']not_exist' for class [`']#{sclass}'/) { |e|
+    -> { sclass.send :undef_method, :not_exist }.should.raise(NameError, /undefined method [`']not_exist' for class [`']#{sclass}'/) { |e|
       e.message.should =~ /[`']#<Class:#<#<Class:/
 
       # a NameError and not a NoMethodError
@@ -79,7 +79,7 @@ def another_method_to_undef() 1 end
 
   it "raises a NameError when passed a missing name for a metaclass" do
     klass = String.singleton_class
-    -> { klass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method [`']not_exist' for class [`']String'/) { |e|
+    -> { klass.send :undef_method, :not_exist }.should.raise(NameError, /undefined method [`']not_exist' for class [`']String'/) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -91,19 +91,19 @@ def another_method_to_undef() 1 end
     end
 
     it "raises a FrozenError when passed a name" do
-      -> { @frozen.send :undef_method, :method_to_undef }.should raise_error(FrozenError)
+      -> { @frozen.send :undef_method, :method_to_undef }.should.raise(FrozenError)
     end
 
     it "raises a FrozenError when passed a missing name" do
-      -> { @frozen.send :undef_method, :not_exist }.should raise_error(FrozenError)
+      -> { @frozen.send :undef_method, :not_exist }.should.raise(FrozenError)
     end
 
     it "raises a TypeError when passed a not name" do
-      -> { @frozen.send :undef_method, Object.new }.should raise_error(TypeError)
+      -> { @frozen.send :undef_method, Object.new }.should.raise(TypeError)
     end
 
     it "does not raise exceptions when no arguments given" do
-      @frozen.send(:undef_method).should equal(@frozen)
+      @frozen.send(:undef_method).should.equal?(@frozen)
     end
   end
 end
@@ -120,7 +120,7 @@ def another_method_to_undef() 1 end
 
     klass.send :undef_method, :method_to_undef
 
-    -> { x.method_to_undef }.should raise_error(NoMethodError)
+    -> { x.method_to_undef }.should.raise(NoMethodError)
   end
 
   it "removes a method defined in a super class" do
@@ -130,7 +130,7 @@ def another_method_to_undef() 1 end
 
     child_class.send :undef_method, :method_to_undef
 
-    -> { child.method_to_undef }.should raise_error(NoMethodError)
+    -> { child.method_to_undef }.should.raise(NoMethodError)
   end
 
   it "does not remove a method defined in a super class when removed from a subclass" do
@@ -156,7 +156,7 @@ def another_method_to_undef() 1 end
 
     klass.send :undef_method, 'another_method_to_undef'
 
-    -> { x.another_method_to_undef }.should raise_error(NoMethodError)
+    -> { x.another_method_to_undef }.should.raise(NoMethodError)
   end
 
   it "removes a method defined in a super class" do
@@ -166,7 +166,7 @@ def another_method_to_undef() 1 end
 
     child_class.send :undef_method, 'another_method_to_undef'
 
-    -> { child.another_method_to_undef }.should raise_error(NoMethodError)
+    -> { child.another_method_to_undef }.should.raise(NoMethodError)
   end
 
   it "does not remove a method defined in a super class when removed from a subclass" do
diff --git a/spec/ruby/core/module/undefined_instance_methods_spec.rb b/spec/ruby/core/module/undefined_instance_methods_spec.rb
index d33ee93fc11..9f731c6adfd 100644
--- a/spec/ruby/core/module/undefined_instance_methods_spec.rb
+++ b/spec/ruby/core/module/undefined_instance_methods_spec.rb
@@ -9,16 +9,17 @@
 
   it "returns inherited methods undefined in the class" do
     methods = ModuleSpecs::UndefinedInstanceMethods::Child.undefined_instance_methods
-    methods.should include(:parent_method, :another_parent_method)
+    methods.to_set.should >= Set[:parent_method, :another_parent_method]
   end
 
   it "returns methods from an included module that are undefined in the class" do
     methods = ModuleSpecs::UndefinedInstanceMethods::Grandchild.undefined_instance_methods
-    methods.should include(:super_included_method)
+    methods.should.include?(:super_included_method)
   end
 
   it "does not returns ancestors undefined methods" do
     methods = ModuleSpecs::UndefinedInstanceMethods::Grandchild.undefined_instance_methods
-    methods.should_not include(:parent_method, :another_parent_method)
+    methods.should_not.include?(:parent_method)
+    methods.should_not.include?(:another_parent_method)
   end
 end
diff --git a/spec/ruby/core/module/using_spec.rb b/spec/ruby/core/module/using_spec.rb
index a908363c960..cff0edef284 100644
--- a/spec/ruby/core/module/using_spec.rb
+++ b/spec/ruby/core/module/using_spec.rb
@@ -28,7 +28,7 @@ def foo; "foo"; end
       Module.new do
         using refinement
       end
-    }.should_not raise_error
+    }.should_not.raise
   end
 
   it "accepts module without refinements" do
@@ -38,7 +38,7 @@ def foo; "foo"; end
       Module.new do
         using mod
       end
-    }.should_not raise_error
+    }.should_not.raise
   end
 
   it "does not accept class" do
@@ -48,7 +48,7 @@ def foo; "foo"; end
       Module.new do
         using klass
       end
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises TypeError if passed something other than module" do
@@ -56,7 +56,7 @@ def foo; "foo"; end
       Module.new do
         using "foo"
       end
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "returns self" do
@@ -67,7 +67,7 @@ def foo; "foo"; end
       result = using refinement
     end
 
-    result.should equal(mod)
+    result.should.equal?(mod)
   end
 
   it "works in classes too" do
@@ -95,7 +95,7 @@ def self.foo
 
     -> {
       mod.foo
-    }.should raise_error(RuntimeError, /Module#using is not permitted in methods/)
+    }.should.raise(RuntimeError, /Module#using is not permitted in methods/)
   end
 
   it "activates refinement even for existed objects" do
diff --git a/spec/ruby/core/mutex/lock_spec.rb b/spec/ruby/core/mutex/lock_spec.rb
index c55854ddb5e..4fee29091aa 100644
--- a/spec/ruby/core/mutex/lock_spec.rb
+++ b/spec/ruby/core/mutex/lock_spec.rb
@@ -25,7 +25,7 @@
     m.lock
     -> {
       m.lock
-    }.should raise_error(ThreadError, /deadlock/)
+    }.should.raise(ThreadError, /deadlock/)
   end
 
   it "raises a deadlock ThreadError when multiple fibers from the same thread try to lock" do
@@ -35,7 +35,7 @@
     f0 = Fiber.new do
       m.lock
     end
-    -> { f0.resume }.should raise_error(ThreadError, /deadlock/)
+    -> { f0.resume }.should.raise(ThreadError, /deadlock/)
 
     m.unlock
     f1 = Fiber.new do
@@ -46,6 +46,47 @@
       m.lock
     end
     f1.resume
-    -> { f2.resume }.should raise_error(ThreadError, /deadlock/)
+    -> { f2.resume }.should.raise(ThreadError, /deadlock/)
+  end
+
+  it "does not raise deadlock if a fiber's attempt to lock was interrupted" do
+    lock = Mutex.new
+    main = Thread.current
+
+    t2 = nil
+    t1 = Thread.new do
+      loop do
+        # interrupt fiber below looping on synchronize
+        sleep 0.01
+        t2.raise if t2
+      end
+    end
+
+    # loop ten times to try to handle the interrupt during synchronize
+    t2 = Thread.new do
+      10.times do
+        Fiber.new do
+          begin
+            loop { lock.synchronize {} }
+          rescue RuntimeError
+          end
+        end.resume
+
+        Fiber.new do
+          -> do
+            lock.synchronize {}
+          end.should_not.raise(ThreadError)
+        end.resume
+      rescue RuntimeError
+        retry
+      end
+    end
+    t2.join
+  ensure
+    t1.kill rescue nil
+    t2.kill rescue nil
+
+    t1.join
+    t2.join
   end
 end
diff --git a/spec/ruby/core/mutex/locked_spec.rb b/spec/ruby/core/mutex/locked_spec.rb
index 1bf3ed63943..1818cdb4f3c 100644
--- a/spec/ruby/core/mutex/locked_spec.rb
+++ b/spec/ruby/core/mutex/locked_spec.rb
@@ -4,12 +4,12 @@
   it "returns true if locked" do
     m = Mutex.new
     m.lock
-    m.locked?.should be_true
+    m.locked?.should == true
   end
 
   it "returns false if unlocked" do
     m = Mutex.new
-    m.locked?.should be_false
+    m.locked?.should == false
   end
 
   it "returns the status of the lock" do
@@ -27,10 +27,10 @@
 
     Thread.pass until m1_locked
 
-    m1.locked?.should be_true
+    m1.locked?.should == true
     m2.unlock # release th
     th.join
     # A Thread releases its locks upon termination
-    m1.locked?.should be_false
+    m1.locked?.should == false
   end
 end
diff --git a/spec/ruby/core/mutex/owned_spec.rb b/spec/ruby/core/mutex/owned_spec.rb
index 7bfc7d8f833..ea7d5faf1c1 100644
--- a/spec/ruby/core/mutex/owned_spec.rb
+++ b/spec/ruby/core/mutex/owned_spec.rb
@@ -4,7 +4,7 @@
   describe "when unlocked" do
     it "returns false" do
       m = Mutex.new
-      m.owned?.should be_false
+      m.owned?.should == false
     end
   end
 
@@ -12,7 +12,7 @@
     it "returns true" do
       m = Mutex.new
       m.lock
-      m.owned?.should be_true
+      m.owned?.should == true
     end
   end
 
@@ -37,7 +37,7 @@
       end
 
       Thread.pass until locked
-      m.owned?.should be_false
+      m.owned?.should == false
     end
   end
 
diff --git a/spec/ruby/core/mutex/sleep_spec.rb b/spec/ruby/core/mutex/sleep_spec.rb
index 9832e3125e2..a78e4c4b623 100644
--- a/spec/ruby/core/mutex/sleep_spec.rb
+++ b/spec/ruby/core/mutex/sleep_spec.rb
@@ -4,21 +4,21 @@
   describe "when not locked by the current thread" do
     it "raises a ThreadError" do
       m = Mutex.new
-      -> { m.sleep }.should raise_error(ThreadError)
+      -> { m.sleep }.should.raise(ThreadError)
     end
 
     it "raises an ArgumentError if passed a negative duration" do
       m = Mutex.new
-      -> { m.sleep(-0.1) }.should raise_error(ArgumentError)
-      -> { m.sleep(-1) }.should raise_error(ArgumentError)
+      -> { m.sleep(-0.1) }.should.raise(ArgumentError)
+      -> { m.sleep(-1) }.should.raise(ArgumentError)
     end
   end
 
   it "raises an ArgumentError if passed a negative duration" do
     m = Mutex.new
     m.lock
-    -> { m.sleep(-0.1) }.should raise_error(ArgumentError)
-    -> { m.sleep(-1) }.should raise_error(ArgumentError)
+    -> { m.sleep(-0.1) }.should.raise(ArgumentError)
+    -> { m.sleep(-1) }.should.raise(ArgumentError)
   end
 
   it "pauses execution for approximately the duration requested" do
@@ -38,7 +38,7 @@
     th = Thread.new { m.lock; locked = true; m.sleep }
     Thread.pass until locked
     Thread.pass until th.stop?
-    m.locked?.should be_false
+    m.locked?.should == false
     th.run
     th.join
   end
@@ -47,7 +47,7 @@
     m = Mutex.new
     m.lock
     m.sleep(0.001)
-    m.locked?.should be_true
+    m.locked?.should == true
   end
 
   it "relocks the mutex when woken by an exception being raised" do
@@ -65,7 +65,7 @@
     Thread.pass until locked
     Thread.pass until th.stop?
     th.raise(Exception)
-    th.value.should be_true
+    th.value.should == true
   end
 
   it "returns the rounded number of seconds asleep" do
@@ -79,7 +79,7 @@
     Thread.pass until locked
     Thread.pass until th.stop?
     th.wakeup
-    th.value.should be_kind_of(Integer)
+    th.value.should.is_a?(Integer)
   end
 
   it "wakes up when requesting sleep times near or equal to zero" do
@@ -97,7 +97,7 @@
     m.lock
     times.each do |time|
       # just testing that sleep completes
-      -> {m.sleep(time)}.should_not raise_error
+      -> {m.sleep(time)}.should_not.raise
     end
   end
 end
diff --git a/spec/ruby/core/mutex/synchronize_spec.rb b/spec/ruby/core/mutex/synchronize_spec.rb
index 7942885197c..823f29a6342 100644
--- a/spec/ruby/core/mutex/synchronize_spec.rb
+++ b/spec/ruby/core/mutex/synchronize_spec.rb
@@ -14,15 +14,15 @@
           m2.lock
           raise Exception
         end
-      end.should raise_error(Exception)
+      end.should.raise(Exception)
     end
 
     Thread.pass until synchronized
 
-    m1.locked?.should be_true
+    m1.locked?.should == true
     m2.unlock
     th.join
-    m1.locked?.should be_false
+    m1.locked?.should == false
   end
 
   it "blocks the caller if already locked" do
@@ -60,7 +60,7 @@
     m = Mutex.new
 
     m.synchronize do
-      -> { m.synchronize { } }.should raise_error(ThreadError)
+      -> { m.synchronize { } }.should.raise(ThreadError)
     end
   end
 end
diff --git a/spec/ruby/core/mutex/try_lock_spec.rb b/spec/ruby/core/mutex/try_lock_spec.rb
index 8d521f4c6b7..1da0735d6a4 100644
--- a/spec/ruby/core/mutex/try_lock_spec.rb
+++ b/spec/ruby/core/mutex/try_lock_spec.rb
@@ -4,13 +4,13 @@
   describe "when unlocked" do
     it "returns true" do
       m = Mutex.new
-      m.try_lock.should be_true
+      m.try_lock.should == true
     end
 
     it "locks the mutex" do
       m = Mutex.new
       m.try_lock
-      m.locked?.should be_true
+      m.locked?.should == true
     end
   end
 
@@ -18,7 +18,7 @@
     it "returns false" do
       m = Mutex.new
       m.lock
-      m.try_lock.should be_false
+      m.try_lock.should == false
     end
   end
 
@@ -26,7 +26,7 @@
     it "returns false" do
       m = Mutex.new
       m.lock
-      Thread.new { m.try_lock }.value.should be_false
+      Thread.new { m.try_lock }.value.should == false
     end
   end
 end
diff --git a/spec/ruby/core/mutex/unlock_spec.rb b/spec/ruby/core/mutex/unlock_spec.rb
index d999e668426..ed493cf84a5 100644
--- a/spec/ruby/core/mutex/unlock_spec.rb
+++ b/spec/ruby/core/mutex/unlock_spec.rb
@@ -3,7 +3,7 @@
 describe "Mutex#unlock" do
   it "raises ThreadError unless Mutex is locked" do
     mutex = Mutex.new
-    -> { mutex.unlock }.should raise_error(ThreadError)
+    -> { mutex.unlock }.should.raise(ThreadError)
   end
 
   it "raises ThreadError unless thread owns Mutex" do
@@ -19,7 +19,7 @@
     Thread.pass until mutex.locked?
     Thread.pass until th.stop?
 
-    -> { mutex.unlock }.should raise_error(ThreadError)
+    -> { mutex.unlock }.should.raise(ThreadError)
 
     wait.unlock
     th.join
@@ -33,6 +33,6 @@
 
     th.join
 
-    -> { mutex.unlock }.should raise_error(ThreadError)
+    -> { mutex.unlock }.should.raise(ThreadError)
   end
 end
diff --git a/spec/ruby/core/nil/dup_spec.rb b/spec/ruby/core/nil/dup_spec.rb
index 0324b3f1f44..e0be9540a62 100644
--- a/spec/ruby/core/nil/dup_spec.rb
+++ b/spec/ruby/core/nil/dup_spec.rb
@@ -2,6 +2,6 @@
 
 describe "NilClass#dup" do
   it "returns self" do
-    nil.dup.should equal(nil)
+    nil.dup.should.equal?(nil)
   end
 end
diff --git a/spec/ruby/core/nil/match_spec.rb b/spec/ruby/core/nil/match_spec.rb
index bc1c591793d..27ebc53c3d2 100644
--- a/spec/ruby/core/nil/match_spec.rb
+++ b/spec/ruby/core/nil/match_spec.rb
@@ -5,13 +5,13 @@
     o = nil
 
     suppress_warning do
-      (o =~ /Object/).should   be_nil
-      (o =~ 'Object').should   be_nil
-      (o =~ Object).should     be_nil
-      (o =~ Object.new).should be_nil
-      (o =~ nil).should        be_nil
-      (o =~ false).should      be_nil
-      (o =~ true).should       be_nil
+      (o =~ /Object/).should == nil
+      (o =~ 'Object').should == nil
+      (o =~ Object).should == nil
+      (o =~ Object.new).should == nil
+      (o =~ nil).should == nil
+      (o =~ false).should == nil
+      (o =~ true).should == nil
     end
   end
 
diff --git a/spec/ruby/core/nil/nilclass_spec.rb b/spec/ruby/core/nil/nilclass_spec.rb
index 7f6d8af25d0..55c5d0eba7f 100644
--- a/spec/ruby/core/nil/nilclass_spec.rb
+++ b/spec/ruby/core/nil/nilclass_spec.rb
@@ -4,12 +4,12 @@
   it ".allocate raises a TypeError" do
     -> do
       NilClass.allocate
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it ".new is undefined" do
     -> do
       NilClass.new
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/nil/rationalize_spec.rb b/spec/ruby/core/nil/rationalize_spec.rb
index 84d6e6f056f..69fb257a7fe 100644
--- a/spec/ruby/core/nil/rationalize_spec.rb
+++ b/spec/ruby/core/nil/rationalize_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "raises ArgumentError when passed more than one argument" do
-    -> { nil.rationalize(0.1, 0.1) }.should raise_error(ArgumentError)
-    -> { nil.rationalize(0.1, 0.1, 2) }.should raise_error(ArgumentError)
+    -> { nil.rationalize(0.1, 0.1) }.should.raise(ArgumentError)
+    -> { nil.rationalize(0.1, 0.1, 2) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/nil/singleton_method_spec.rb b/spec/ruby/core/nil/singleton_method_spec.rb
index fb47af0c3e8..f121b42f815 100644
--- a/spec/ruby/core/nil/singleton_method_spec.rb
+++ b/spec/ruby/core/nil/singleton_method_spec.rb
@@ -2,10 +2,10 @@
 
 describe "NilClass#singleton_method" do
   it "raises regardless of whether NilClass defines the method" do
-    -> { nil.singleton_method(:foo) }.should raise_error(NameError)
+    -> { nil.singleton_method(:foo) }.should.raise(NameError)
     begin
       def (nil).foo; end
-      -> { nil.singleton_method(:foo) }.should raise_error(NameError)
+      -> { nil.singleton_method(:foo) }.should.raise(NameError)
     ensure
       NilClass.send(:remove_method, :foo)
     end
diff --git a/spec/ruby/core/nil/to_c_spec.rb b/spec/ruby/core/nil/to_c_spec.rb
index e0052be5bd9..f449ddb6a3d 100644
--- a/spec/ruby/core/nil/to_c_spec.rb
+++ b/spec/ruby/core/nil/to_c_spec.rb
@@ -2,6 +2,6 @@
 
 describe "NilClass#to_c" do
   it "returns Complex(0, 0)" do
-    nil.to_c.should eql(Complex(0, 0))
+    nil.to_c.should.eql?(Complex(0, 0))
   end
 end
diff --git a/spec/ruby/core/nil/to_s_spec.rb b/spec/ruby/core/nil/to_s_spec.rb
index fa0b9296779..016ba4165a3 100644
--- a/spec/ruby/core/nil/to_s_spec.rb
+++ b/spec/ruby/core/nil/to_s_spec.rb
@@ -10,6 +10,6 @@
   end
 
   it "always returns the same string" do
-    nil.to_s.should equal(nil.to_s)
+    nil.to_s.should.equal?(nil.to_s)
   end
 end
diff --git a/spec/ruby/core/numeric/abs2_spec.rb b/spec/ruby/core/numeric/abs2_spec.rb
index 0e60cd0ae70..12866f9c47c 100644
--- a/spec/ruby/core/numeric/abs2_spec.rb
+++ b/spec/ruby/core/numeric/abs2_spec.rb
@@ -18,7 +18,7 @@
 
   it "returns the square of the absolute value of self" do
     @numbers.each do |number|
-      number.abs2.should eql(number.abs ** 2)
+      number.abs2.should.eql?(number.abs ** 2)
     end
   end
 
@@ -29,6 +29,6 @@
   end
 
   it "returns NaN when self is NaN" do
-    nan_value.abs2.nan?.should be_true
+    nan_value.abs2.nan?.should == true
   end
 end
diff --git a/spec/ruby/core/numeric/clone_spec.rb b/spec/ruby/core/numeric/clone_spec.rb
index 423cec85ddd..1d06fdb0506 100644
--- a/spec/ruby/core/numeric/clone_spec.rb
+++ b/spec/ruby/core/numeric/clone_spec.rb
@@ -3,11 +3,11 @@
 describe "Numeric#clone" do
   it "returns self" do
     value = 1
-    value.clone.should equal(value)
+    value.clone.should.equal?(value)
 
     subclass = Class.new(Numeric)
     value = subclass.new
-    value.clone.should equal(value)
+    value.clone.should.equal?(value)
   end
 
   it "does not change frozen status" do
@@ -16,15 +16,15 @@
 
   it "accepts optional keyword argument :freeze" do
     value = 1
-    value.clone(freeze: true).should equal(value)
+    value.clone(freeze: true).should.equal?(value)
   end
 
   it "raises ArgumentError if passed freeze: false" do
-    -> { 1.clone(freeze: false) }.should raise_error(ArgumentError, /can't unfreeze/)
+    -> { 1.clone(freeze: false) }.should.raise(ArgumentError, /can't unfreeze/)
   end
 
   it "does not change frozen status if passed freeze: nil" do
     value = 1
-    value.clone(freeze: nil).should equal(value)
+    value.clone(freeze: nil).should.equal?(value)
   end
 end
diff --git a/spec/ruby/core/numeric/coerce_spec.rb b/spec/ruby/core/numeric/coerce_spec.rb
index 4c4416d30b6..9344d99ee62 100644
--- a/spec/ruby/core/numeric/coerce_spec.rb
+++ b/spec/ruby/core/numeric/coerce_spec.rb
@@ -25,7 +25,7 @@
       class << a; true; end
 
       # watch it explode
-      -> { a.coerce(b) }.should raise_error(TypeError)
+      -> { a.coerce(b) }.should.raise(TypeError)
     end
   end
 
@@ -38,22 +38,22 @@ class << a; true; end
 
   it "raise TypeError if they are instances of different classes and other does not respond to #to_f" do
     other = mock("numeric")
-    -> { @obj.coerce(other)   }.should raise_error(TypeError)
+    -> { @obj.coerce(other)   }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { @obj.coerce(nil)     }.should raise_error(TypeError)
+    -> { @obj.coerce(nil)     }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a boolean" do
-    -> { @obj.coerce(false)   }.should raise_error(TypeError)
+    -> { @obj.coerce(false)   }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a Symbol" do
-    -> { @obj.coerce(:symbol) }.should raise_error(TypeError)
+    -> { @obj.coerce(:symbol) }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when passed a non-numeric String" do
-    -> { @obj.coerce("test")  }.should raise_error(ArgumentError)
+    -> { @obj.coerce("test")  }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/numeric/comparison_spec.rb b/spec/ruby/core/numeric/comparison_spec.rb
index 4b4d52501ac..b0a9390cc03 100644
--- a/spec/ruby/core/numeric/comparison_spec.rb
+++ b/spec/ruby/core/numeric/comparison_spec.rb
@@ -26,22 +26,22 @@
     end
 
     it "is called when instances are compared with #<" do
-      (@a < @b).should be_false
+      (@a < @b).should == false
       ScratchPad.recorded.should == :numeric_comparison
     end
 
     it "is called when instances are compared with #<=" do
-      (@a <= @b).should be_false
+      (@a <= @b).should == false
       ScratchPad.recorded.should == :numeric_comparison
     end
 
     it "is called when instances are compared with #>" do
-      (@a > @b).should be_true
+      (@a > @b).should == true
       ScratchPad.recorded.should == :numeric_comparison
     end
 
     it "is called when instances are compared with #>=" do
-      (@a >= @b).should be_true
+      (@a >= @b).should == true
       ScratchPad.recorded.should == :numeric_comparison
     end
   end
diff --git a/spec/ruby/core/numeric/div_spec.rb b/spec/ruby/core/numeric/div_spec.rb
index 53917b84c9d..a17961850cf 100644
--- a/spec/ruby/core/numeric/div_spec.rb
+++ b/spec/ruby/core/numeric/div_spec.rb
@@ -15,8 +15,8 @@
   end
 
   it "raises ZeroDivisionError for 0" do
-    -> { @obj.div(0) }.should raise_error(ZeroDivisionError)
-    -> { @obj.div(0.0) }.should raise_error(ZeroDivisionError)
-    -> { @obj.div(Complex(0,0)) }.should raise_error(ZeroDivisionError)
+    -> { @obj.div(0) }.should.raise(ZeroDivisionError)
+    -> { @obj.div(0.0) }.should.raise(ZeroDivisionError)
+    -> { @obj.div(Complex(0,0)) }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/core/numeric/dup_spec.rb b/spec/ruby/core/numeric/dup_spec.rb
index 189a7ef44d9..c158c618de3 100644
--- a/spec/ruby/core/numeric/dup_spec.rb
+++ b/spec/ruby/core/numeric/dup_spec.rb
@@ -3,11 +3,11 @@
 describe "Numeric#dup" do
   it "returns self" do
     value = 1
-    value.dup.should equal(value)
+    value.dup.should.equal?(value)
 
     subclass = Class.new(Numeric)
     value = subclass.new
-    value.dup.should equal(value)
+    value.dup.should.equal?(value)
   end
 
   it "does not change frozen status" do
diff --git a/spec/ruby/core/numeric/eql_spec.rb b/spec/ruby/core/numeric/eql_spec.rb
index b33e00e51ff..80c58caef48 100644
--- a/spec/ruby/core/numeric/eql_spec.rb
+++ b/spec/ruby/core/numeric/eql_spec.rb
@@ -7,16 +7,16 @@
   end
 
   it "returns false if self's and other's types don't match" do
-    @obj.should_not eql(1)
-    @obj.should_not eql(-1.5)
-    @obj.should_not eql(bignum_value)
-    @obj.should_not eql(:sym)
+    @obj.should_not.eql?(1)
+    @obj.should_not.eql?(-1.5)
+    @obj.should_not.eql?(bignum_value)
+    @obj.should_not.eql?(:sym)
   end
 
   it "returns the result of calling self#== with other when self's and other's types match" do
     other = NumericSpecs::Subclass.new
     @obj.should_receive(:==).with(other).and_return("result", nil)
-    @obj.should eql(other)
-    @obj.should_not eql(other)
+    @obj.should.eql?(other)
+    @obj.should_not.eql?(other)
   end
 end
diff --git a/spec/ruby/core/numeric/fdiv_spec.rb b/spec/ruby/core/numeric/fdiv_spec.rb
index e97fa77f79a..2c22c6a86a1 100644
--- a/spec/ruby/core/numeric/fdiv_spec.rb
+++ b/spec/ruby/core/numeric/fdiv_spec.rb
@@ -18,7 +18,7 @@
   end
 
   it "returns a Float" do
-    bignum_value.fdiv(Float::MAX).should be_an_instance_of(Float)
+    bignum_value.fdiv(Float::MAX).should.instance_of?(Float)
   end
 
   it "returns Infinity if other is 0" do
@@ -26,6 +26,6 @@
   end
 
   it "returns NaN if other is NaN" do
-    3334.fdiv(nan_value).nan?.should be_true
+    3334.fdiv(nan_value).nan?.should == true
   end
 end
diff --git a/spec/ruby/core/numeric/finite_spec.rb b/spec/ruby/core/numeric/finite_spec.rb
index 05b5eebbd68..2c18c894665 100644
--- a/spec/ruby/core/numeric/finite_spec.rb
+++ b/spec/ruby/core/numeric/finite_spec.rb
@@ -3,6 +3,6 @@
 describe "Numeric#finite?" do
   it "returns true by default" do
     o = mock_numeric("finite")
-    o.finite?.should be_true
+    o.finite?.should == true
   end
 end
diff --git a/spec/ruby/core/numeric/i_spec.rb b/spec/ruby/core/numeric/i_spec.rb
index 621ecc09ec8..f5fb99dfd31 100644
--- a/spec/ruby/core/numeric/i_spec.rb
+++ b/spec/ruby/core/numeric/i_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Numeric#i" do
   it "returns a Complex object" do
-    34.i.should be_an_instance_of(Complex)
+    34.i.should.instance_of?(Complex)
   end
 
   it "sets the real part to 0" do
diff --git a/spec/ruby/core/numeric/negative_spec.rb b/spec/ruby/core/numeric/negative_spec.rb
index 9c6f95fd873..f2d8a847da4 100644
--- a/spec/ruby/core/numeric/negative_spec.rb
+++ b/spec/ruby/core/numeric/negative_spec.rb
@@ -4,22 +4,22 @@
 describe "Numeric#negative?" do
   describe "on positive numbers" do
     it "returns false" do
-      1.negative?.should be_false
-      0.1.negative?.should be_false
+      1.negative?.should == false
+      0.1.negative?.should == false
     end
   end
 
   describe "on zero" do
     it "returns false" do
-      0.negative?.should be_false
-      0.0.negative?.should be_false
+      0.negative?.should == false
+      0.0.negative?.should == false
     end
   end
 
   describe "on negative numbers" do
     it "returns true" do
-      -1.negative?.should be_true
-      -0.1.negative?.should be_true
+      -1.negative?.should == true
+      -0.1.negative?.should == true
     end
   end
 end
diff --git a/spec/ruby/core/numeric/polar_spec.rb b/spec/ruby/core/numeric/polar_spec.rb
index b594e408b28..0695d7afb24 100644
--- a/spec/ruby/core/numeric/polar_spec.rb
+++ b/spec/ruby/core/numeric/polar_spec.rb
@@ -17,7 +17,7 @@
 
   it "returns a two-element Array" do
     @numbers.each do |number|
-      number.polar.should be_an_instance_of(Array)
+      number.polar.should.instance_of?(Array)
       number.polar.size.should == 2
     end
   end
@@ -44,7 +44,7 @@
 
   it "returns [NaN, NaN] if self is NaN" do
     nan_value.polar.size.should == 2
-    nan_value.polar.first.nan?.should be_true
-    nan_value.polar.last.nan?.should be_true
+    nan_value.polar.first.nan?.should == true
+    nan_value.polar.last.nan?.should == true
   end
 end
diff --git a/spec/ruby/core/numeric/positive_spec.rb b/spec/ruby/core/numeric/positive_spec.rb
index 3b831b4d341..7c8d15cd9fa 100644
--- a/spec/ruby/core/numeric/positive_spec.rb
+++ b/spec/ruby/core/numeric/positive_spec.rb
@@ -4,22 +4,22 @@
 describe "Numeric#positive?" do
   describe "on positive numbers" do
     it "returns true" do
-      1.positive?.should be_true
-      0.1.positive?.should be_true
+      1.positive?.should == true
+      0.1.positive?.should == true
     end
   end
 
   describe "on zero" do
     it "returns false" do
-      0.positive?.should be_false
-      0.0.positive?.should be_false
+      0.positive?.should == false
+      0.0.positive?.should == false
     end
   end
 
   describe "on negative numbers" do
     it "returns false" do
-      -1.positive?.should be_false
-      -0.1.positive?.should be_false
+      -1.positive?.should == false
+      -0.1.positive?.should == false
     end
   end
 end
diff --git a/spec/ruby/core/numeric/quo_spec.rb b/spec/ruby/core/numeric/quo_spec.rb
index 6e3ce7a3745..66ff0192311 100644
--- a/spec/ruby/core/numeric/quo_spec.rb
+++ b/spec/ruby/core/numeric/quo_spec.rb
@@ -3,11 +3,11 @@
 
 describe "Numeric#quo" do
   it "returns the result of self divided by the given Integer as a Rational" do
-    5.quo(2).should eql(Rational(5,2))
+    5.quo(2).should.eql?(Rational(5,2))
   end
 
   it "returns the result of self divided by the given Float as a Float" do
-    2.quo(2.5).should eql(0.8)
+    2.quo(2.5).should.eql?(0.8)
   end
 
   it "returns the result of self divided by the given Bignum as a Float" do
@@ -15,11 +15,11 @@
   end
 
   it "raises a ZeroDivisionError when the given Integer is 0" do
-    -> { 0.quo(0) }.should raise_error(ZeroDivisionError)
-    -> { 10.quo(0) }.should raise_error(ZeroDivisionError)
-    -> { -10.quo(0) }.should raise_error(ZeroDivisionError)
-    -> { bignum_value.quo(0) }.should raise_error(ZeroDivisionError)
-    -> { (-bignum_value).quo(0) }.should raise_error(ZeroDivisionError)
+    -> { 0.quo(0) }.should.raise(ZeroDivisionError)
+    -> { 10.quo(0) }.should.raise(ZeroDivisionError)
+    -> { -10.quo(0) }.should.raise(ZeroDivisionError)
+    -> { bignum_value.quo(0) }.should.raise(ZeroDivisionError)
+    -> { (-bignum_value).quo(0) }.should.raise(ZeroDivisionError)
   end
 
   it "calls #to_r to convert the object to a Rational" do
@@ -33,16 +33,16 @@
     obj = NumericSpecs::Subclass.new
     obj.should_receive(:to_r).and_return(1)
 
-    -> { obj.quo(19) }.should raise_error(TypeError)
+    -> { obj.quo(19) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when given a non-Integer" do
     -> {
       (obj = mock('x')).should_not_receive(:to_int)
       13.quo(obj)
-    }.should raise_error(TypeError)
-    -> { 13.quo("10")    }.should raise_error(TypeError)
-    -> { 13.quo(:symbol) }.should raise_error(TypeError)
+    }.should.raise(TypeError)
+    -> { 13.quo("10")    }.should.raise(TypeError)
+    -> { 13.quo(:symbol) }.should.raise(TypeError)
   end
 
   it "returns the result of calling self#/ with other" do
@@ -53,7 +53,7 @@
   end
 
   it "raises a ZeroDivisionError if the given argument is zero and not a Float" do
-    -> { 1.quo(0) }.should raise_error(ZeroDivisionError)
+    -> { 1.quo(0) }.should.raise(ZeroDivisionError)
   end
 
   it "returns infinity if the given argument is zero and is a Float" do
diff --git a/spec/ruby/core/numeric/real_spec.rb b/spec/ruby/core/numeric/real_spec.rb
index 2d2499bcce5..09d482a6917 100644
--- a/spec/ruby/core/numeric/real_spec.rb
+++ b/spec/ruby/core/numeric/real_spec.rb
@@ -16,7 +16,7 @@
   it "returns self" do
     @numbers.each do |number|
       if number.to_f.nan?
-        number.real.nan?.should be_true
+        number.real.nan?.should == true
       else
         number.real.should == number
       end
@@ -25,7 +25,7 @@
 
   it "raises an ArgumentError if given any arguments" do
     @numbers.each do |number|
-      -> { number.real(number) }.should raise_error(ArgumentError)
+      -> { number.real(number) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/numeric/remainder_spec.rb b/spec/ruby/core/numeric/remainder_spec.rb
index 29654310d23..bdf7358b21a 100644
--- a/spec/ruby/core/numeric/remainder_spec.rb
+++ b/spec/ruby/core/numeric/remainder_spec.rb
@@ -13,7 +13,7 @@
     @obj.should_receive(:%).with(@other).and_return(@result)
     @result.should_receive(:==).with(0).and_return(true)
 
-    @obj.remainder(@other).should equal(@result)
+    @obj.remainder(@other).should.equal?(@result)
   end
 
   it "returns the result of calling self#% with other if self and other are greater than 0" do
@@ -25,7 +25,7 @@
     @obj.should_receive(:>).with(0).and_return(true)
     @other.should_receive(:<).with(0).and_return(false)
 
-    @obj.remainder(@other).should equal(@result)
+    @obj.remainder(@other).should.equal?(@result)
   end
 
   it "returns the result of calling self#% with other if self and other are less than 0" do
@@ -37,7 +37,7 @@
 
     @obj.should_receive(:>).with(0).and_return(false)
 
-    @obj.remainder(@other).should equal(@result)
+    @obj.remainder(@other).should.equal?(@result)
   end
 
   it "returns the result of calling self#% with other - other if self is greater than 0 and other is less than 0" do
diff --git a/spec/ruby/core/numeric/shared/conj.rb b/spec/ruby/core/numeric/shared/conj.rb
index 6d5197ecabe..1a661fbbe86 100644
--- a/spec/ruby/core/numeric/shared/conj.rb
+++ b/spec/ruby/core/numeric/shared/conj.rb
@@ -14,7 +14,7 @@
 
   it "returns self" do
     @numbers.each do |number|
-      number.send(@method).should equal(number)
+      number.send(@method).should.equal?(number)
     end
   end
 end
diff --git a/spec/ruby/core/numeric/shared/imag.rb b/spec/ruby/core/numeric/shared/imag.rb
index 4f117e243ad..605a23d8c64 100644
--- a/spec/ruby/core/numeric/shared/imag.rb
+++ b/spec/ruby/core/numeric/shared/imag.rb
@@ -20,7 +20,7 @@
 
   it "raises an ArgumentError if given any arguments" do
     @numbers.each do |number|
-      -> { number.send(@method, number) }.should raise_error(ArgumentError)
+      -> { number.send(@method, number) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/numeric/shared/rect.rb b/spec/ruby/core/numeric/shared/rect.rb
index 120a69b1c48..32d03e45d2e 100644
--- a/spec/ruby/core/numeric/shared/rect.rb
+++ b/spec/ruby/core/numeric/shared/rect.rb
@@ -14,7 +14,7 @@
 
   it "returns an Array" do
     @numbers.each do |number|
-      number.send(@method).should be_an_instance_of(Array)
+      number.send(@method).should.instance_of?(Array)
     end
   end
 
@@ -27,7 +27,7 @@
   it "returns self as the first element" do
     @numbers.each do |number|
       if Float === number and number.nan?
-        number.send(@method).first.nan?.should be_true
+        number.send(@method).first.nan?.should == true
       else
         number.send(@method).first.should == number
       end
@@ -42,7 +42,7 @@
 
   it "raises an ArgumentError if given any arguments" do
     @numbers.each do |number|
-      -> { number.send(@method, number) }.should raise_error(ArgumentError)
+      -> { number.send(@method, number) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/numeric/shared/step.rb b/spec/ruby/core/numeric/shared/step.rb
index 977ec6de025..66b8c1af0d9 100644
--- a/spec/ruby/core/numeric/shared/step.rb
+++ b/spec/ruby/core/numeric/shared/step.rb
@@ -13,7 +13,7 @@
 
   it "defaults to step = 1" do
     @step.call(1, 5, &@prc)
-    ScratchPad.recorded.should eql [1, 2, 3, 4, 5]
+    ScratchPad.recorded.should.eql? [1, 2, 3, 4, 5]
   end
 
   it "defaults to an infinite limit with a step size of 1 for Integers" do
@@ -26,35 +26,35 @@
 
   describe "when self, stop and step are Integers" do
     it "yields only Integers" do
-      @step.call(1, 5, 1) { |x| x.should be_an_instance_of(Integer) }
+      @step.call(1, 5, 1) { |x| x.should.instance_of?(Integer) }
     end
 
     describe "with a positive step" do
       it "yields while increasing self by step until stop is reached" do
         @step.call(1, 5, 1, &@prc)
-        ScratchPad.recorded.should eql [1, 2, 3, 4, 5]
+        ScratchPad.recorded.should.eql? [1, 2, 3, 4, 5]
       end
 
       it "yields once when self equals stop" do
         @step.call(1, 1, 1, &@prc)
-        ScratchPad.recorded.should eql [1]
+        ScratchPad.recorded.should.eql? [1]
       end
 
       it "does not yield when self is greater than stop" do
         @step.call(2, 1, 1, &@prc)
-        ScratchPad.recorded.should eql []
+        ScratchPad.recorded.should.eql? []
       end
     end
 
     describe "with a negative step" do
       it "yields while decreasing self by step until stop is reached" do
         @step.call(5, 1, -1, &@prc)
-        ScratchPad.recorded.should eql [5, 4, 3, 2, 1]
+        ScratchPad.recorded.should.eql? [5, 4, 3, 2, 1]
       end
 
       it "yields once when self equals stop" do
         @step.call(5, 5, -1, &@prc)
-        ScratchPad.recorded.should eql [5]
+        ScratchPad.recorded.should.eql? [5]
       end
 
       it "does not yield when self is less than stop" do
@@ -66,26 +66,26 @@
 
   describe "when at least one of self, stop or step is a Float" do
     it "yields Floats even if only self is a Float" do
-      @step.call(1.5, 5, 1) { |x| x.should be_an_instance_of(Float) }
+      @step.call(1.5, 5, 1) { |x| x.should.instance_of?(Float) }
     end
 
     it "yields Floats even if only stop is a Float" do
-      @step.call(1, 5.0, 1) { |x| x.should be_an_instance_of(Float) }
+      @step.call(1, 5.0, 1) { |x| x.should.instance_of?(Float) }
     end
 
     it "yields Floats even if only step is a Float" do
-      @step.call(1, 5, 1.0) { |x| x.should be_an_instance_of(Float) }
+      @step.call(1, 5, 1.0) { |x| x.should.instance_of?(Float) }
     end
 
     describe "with a positive step" do
       it "yields while increasing self by step while < stop" do
         @step.call(1.5, 5, 1, &@prc)
-        ScratchPad.recorded.should eql [1.5, 2.5, 3.5, 4.5]
+        ScratchPad.recorded.should.eql? [1.5, 2.5, 3.5, 4.5]
       end
 
       it "yields once when self equals stop" do
         @step.call(1.5, 1.5, 1, &@prc)
-        ScratchPad.recorded.should eql [1.5]
+        ScratchPad.recorded.should.eql? [1.5]
       end
 
       it "does not yield when self is greater than stop" do
@@ -96,19 +96,19 @@
       it "is careful about not yielding a value greater than limit" do
         # As 9*1.3+1.0 == 12.700000000000001 > 12.7, we test:
         @step.call(1.0, 12.7, 1.3, &@prc)
-        ScratchPad.recorded.should eql [1.0, 2.3, 3.6, 4.9, 6.2, 7.5, 8.8, 10.1, 11.4, 12.7]
+        ScratchPad.recorded.should.eql? [1.0, 2.3, 3.6, 4.9, 6.2, 7.5, 8.8, 10.1, 11.4, 12.7]
       end
     end
 
     describe "with a negative step" do
       it "yields while decreasing self by step while self > stop" do
         @step.call(5, 1.5, -1, &@prc)
-        ScratchPad.recorded.should eql [5.0, 4.0, 3.0, 2.0]
+        ScratchPad.recorded.should.eql? [5.0, 4.0, 3.0, 2.0]
       end
 
       it "yields once when self equals stop" do
         @step.call(1.5, 1.5, -1, &@prc)
-        ScratchPad.recorded.should eql [1.5]
+        ScratchPad.recorded.should.eql? [1.5]
       end
 
       it "does not yield when self is less than stop" do
@@ -119,24 +119,24 @@
       it "is careful about not yielding a value smaller than limit" do
         # As -9*1.3-1.0 == -12.700000000000001 < -12.7, we test:
         @step.call(-1.0, -12.7, -1.3, &@prc)
-        ScratchPad.recorded.should eql [-1.0, -2.3, -3.6, -4.9, -6.2, -7.5, -8.8, -10.1, -11.4, -12.7]
+        ScratchPad.recorded.should.eql? [-1.0, -2.3, -3.6, -4.9, -6.2, -7.5, -8.8, -10.1, -11.4, -12.7]
       end
     end
 
     describe "with a positive Infinity step" do
       it "yields once if self < stop" do
         @step.call(42, 100, infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when stop is Infinity" do
         @step.call(42, infinity_value, infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when self equals stop" do
         @step.call(42, 42, infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when self and stop are Infinity" do
@@ -159,17 +159,17 @@
     describe "with a negative Infinity step" do
       it "yields once if self > stop" do
         @step.call(42, 6, -infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once if stop is -Infinity" do
         @step.call(42, -infinity_value, -infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when self equals stop" do
         @step.call(42, 42, -infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when self and stop are Infinity" do
@@ -226,60 +226,60 @@
   describe "when step is a String" do
     describe "with self and stop as Integers" do
       it "raises an ArgumentError when step is a numeric representation" do
-        -> { @step.call(1, 5, "1") {} }.should raise_error(ArgumentError)
-        -> { @step.call(1, 5, "0.1") {} }.should raise_error(ArgumentError)
-        -> { @step.call(1, 5, "1/3") {} }.should raise_error(ArgumentError)
+        -> { @step.call(1, 5, "1") {} }.should.raise(ArgumentError)
+        -> { @step.call(1, 5, "0.1") {} }.should.raise(ArgumentError)
+        -> { @step.call(1, 5, "1/3") {} }.should.raise(ArgumentError)
       end
       it "raises an ArgumentError with step as an alphanumeric string" do
-        -> { @step.call(1, 5, "foo") {} }.should raise_error(ArgumentError)
+        -> { @step.call(1, 5, "foo") {} }.should.raise(ArgumentError)
       end
     end
 
     describe "with self and stop as Floats" do
       it "raises an ArgumentError when step is a numeric representation" do
-        -> { @step.call(1.1, 5.1, "1") {} }.should raise_error(ArgumentError)
-        -> { @step.call(1.1, 5.1, "0.1") {} }.should raise_error(ArgumentError)
-        -> { @step.call(1.1, 5.1, "1/3") {} }.should raise_error(ArgumentError)
+        -> { @step.call(1.1, 5.1, "1") {} }.should.raise(ArgumentError)
+        -> { @step.call(1.1, 5.1, "0.1") {} }.should.raise(ArgumentError)
+        -> { @step.call(1.1, 5.1, "1/3") {} }.should.raise(ArgumentError)
       end
       it "raises an ArgumentError with step as an alphanumeric string" do
-        -> { @step.call(1.1, 5.1, "foo") {} }.should raise_error(ArgumentError)
+        -> { @step.call(1.1, 5.1, "foo") {} }.should.raise(ArgumentError)
       end
     end
   end
 
   it "does not rescue ArgumentError exceptions" do
-    -> { @step.call(1, 2) { raise ArgumentError, "" }}.should raise_error(ArgumentError)
+    -> { @step.call(1, 2) { raise ArgumentError, "" }}.should.raise(ArgumentError)
   end
 
   it "does not rescue TypeError exceptions" do
-    -> { @step.call(1, 2) { raise TypeError, "" } }.should raise_error(TypeError)
+    -> { @step.call(1, 2) { raise TypeError, "" } }.should.raise(TypeError)
   end
 
   describe "when no block is given" do
     step_enum_class = Enumerator::ArithmeticSequence
 
     it "returns an #{step_enum_class} when not passed a block and self > stop" do
-      @step.call(1, 0, 2).should be_an_instance_of(step_enum_class)
+      @step.call(1, 0, 2).should.instance_of?(step_enum_class)
     end
 
     it "returns an #{step_enum_class} when not passed a block and self < stop" do
-      @step.call(1, 2, 3).should be_an_instance_of(step_enum_class)
+      @step.call(1, 2, 3).should.instance_of?(step_enum_class)
     end
 
     it "returns an #{step_enum_class} that uses the given step" do
-      @step.call(0, 5, 2).to_a.should eql [0, 2, 4]
+      @step.call(0, 5, 2).to_a.should.eql? [0, 2, 4]
     end
 
     describe "when step is a String" do
       describe "with self and stop as Integers" do
         it "returns an Enumerator" do
-          @step.call(1, 5, "foo").should be_an_instance_of(Enumerator)
+          @step.call(1, 5, "foo").should.instance_of?(Enumerator)
         end
       end
 
       describe "with self and stop as Floats" do
         it "returns an Enumerator" do
-          @step.call(1.1, 5.1, "foo").should be_an_instance_of(Enumerator)
+          @step.call(1.1, 5.1, "foo").should.instance_of?(Enumerator)
         end
       end
     end
@@ -289,23 +289,23 @@
         describe "when step is a String" do
           describe "with self and stop as Integers" do
             it "raises an ArgumentError when step is a numeric representation" do
-              -> { @step.call(1, 5, "1").size }.should raise_error(ArgumentError)
-              -> { @step.call(1, 5, "0.1").size }.should raise_error(ArgumentError)
-              -> { @step.call(1, 5, "1/3").size }.should raise_error(ArgumentError)
+              -> { @step.call(1, 5, "1").size }.should.raise(ArgumentError)
+              -> { @step.call(1, 5, "0.1").size }.should.raise(ArgumentError)
+              -> { @step.call(1, 5, "1/3").size }.should.raise(ArgumentError)
             end
             it "raises an ArgumentError with step as an alphanumeric string" do
-              -> { @step.call(1, 5, "foo").size }.should raise_error(ArgumentError)
+              -> { @step.call(1, 5, "foo").size }.should.raise(ArgumentError)
             end
           end
 
           describe "with self and stop as Floats" do
             it "raises an ArgumentError when step is a numeric representation" do
-              -> { @step.call(1.1, 5.1, "1").size }.should raise_error(ArgumentError)
-              -> { @step.call(1.1, 5.1, "0.1").size }.should raise_error(ArgumentError)
-              -> { @step.call(1.1, 5.1, "1/3").size }.should raise_error(ArgumentError)
+              -> { @step.call(1.1, 5.1, "1").size }.should.raise(ArgumentError)
+              -> { @step.call(1.1, 5.1, "0.1").size }.should.raise(ArgumentError)
+              -> { @step.call(1.1, 5.1, "1/3").size }.should.raise(ArgumentError)
             end
             it "raises an ArgumentError with step as an alphanumeric string" do
-              -> { @step.call(1.1, 5.1, "foo").size }.should raise_error(ArgumentError)
+              -> { @step.call(1.1, 5.1, "foo").size }.should.raise(ArgumentError)
             end
           end
         end
diff --git a/spec/ruby/core/numeric/singleton_method_added_spec.rb b/spec/ruby/core/numeric/singleton_method_added_spec.rb
index 2091398e5dd..327bb5662a7 100644
--- a/spec/ruby/core/numeric/singleton_method_added_spec.rb
+++ b/spec/ruby/core/numeric/singleton_method_added_spec.rb
@@ -21,21 +21,21 @@ def singleton_method_added(val)
     -> do
       a = NumericSpecs::Subclass.new
       def a.test; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
 
     -> do
       a = 1
       def a.test; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
 
     -> do
       a = 1.5
       def a.test; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
 
     -> do
       a = bignum_value
       def a.test; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/numeric/step_spec.rb b/spec/ruby/core/numeric/step_spec.rb
index 1705fb1b4ed..6896009eb66 100644
--- a/spec/ruby/core/numeric/step_spec.rb
+++ b/spec/ruby/core/numeric/step_spec.rb
@@ -6,11 +6,11 @@
 
   describe 'with positional args' do
     it "raises an ArgumentError when step is 0" do
-      -> { 1.step(5, 0) {} }.should raise_error(ArgumentError)
+      -> { 1.step(5, 0) {} }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when step is 0.0" do
-      -> { 1.step(2, 0.0) {} }.should raise_error(ArgumentError)
+      -> { 1.step(2, 0.0) {} }.should.raise(ArgumentError)
     end
 
     before :all do
@@ -81,19 +81,19 @@
 
   describe 'with mixed arguments' do
     it " raises an ArgumentError when step is 0" do
-      -> { 1.step(5, by: 0) { break } }.should raise_error(ArgumentError)
+      -> { 1.step(5, by: 0) { break } }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when step is 0.0" do
-      -> { 1.step(2, by: 0.0) { break } }.should raise_error(ArgumentError)
+      -> { 1.step(2, by: 0.0) { break } }.should.raise(ArgumentError)
     end
 
     it "raises a ArgumentError when limit and to are defined" do
-      -> { 1.step(5, 1, to: 5) { break } }.should raise_error(ArgumentError)
+      -> { 1.step(5, 1, to: 5) { break } }.should.raise(ArgumentError)
     end
 
     it "raises a ArgumentError when step and by are defined" do
-      -> { 1.step(5, 1, by: 5) { break } }.should raise_error(ArgumentError)
+      -> { 1.step(5, 1, by: 5) { break } }.should.raise(ArgumentError)
     end
 
     describe "when no block is given" do
diff --git a/spec/ruby/core/numeric/to_c_spec.rb b/spec/ruby/core/numeric/to_c_spec.rb
index 75245a612e1..70b7a9dd0c5 100644
--- a/spec/ruby/core/numeric/to_c_spec.rb
+++ b/spec/ruby/core/numeric/to_c_spec.rb
@@ -22,7 +22,7 @@
 
   it "returns a Complex object" do
     @numbers.each do |number|
-      number.to_c.should be_an_instance_of(Complex)
+      number.to_c.should.instance_of?(Complex)
     end
   end
 
@@ -30,7 +30,7 @@
     @numbers.each do |number|
       real = number.to_c.real
       if Float === number and number.nan?
-        real.nan?.should be_true
+        real.nan?.should == true
       else
         real.should == number
       end
diff --git a/spec/ruby/core/objectspace/_id2ref_spec.rb b/spec/ruby/core/objectspace/_id2ref_spec.rb
index 1ae3230bdf3..a9fd526b7d0 100644
--- a/spec/ruby/core/objectspace/_id2ref_spec.rb
+++ b/spec/ruby/core/objectspace/_id2ref_spec.rb
@@ -59,7 +59,7 @@
     end
 
     it 'raises RangeError when an object could not be found' do
-      proc { ObjectSpace._id2ref(1 << 60) }.should raise_error(RangeError)
+      proc { ObjectSpace._id2ref(1 << 60) }.should.raise(RangeError)
     end
   end
 end
diff --git a/spec/ruby/core/objectspace/define_finalizer_spec.rb b/spec/ruby/core/objectspace/define_finalizer_spec.rb
index 0f4b54c3458..5441cb4a218 100644
--- a/spec/ruby/core/objectspace/define_finalizer_spec.rb
+++ b/spec/ruby/core/objectspace/define_finalizer_spec.rb
@@ -13,7 +13,7 @@
   it "raises an ArgumentError if the action does not respond to call" do
     -> {
       ObjectSpace.define_finalizer(Object.new, mock("ObjectSpace.define_finalizer no #call"))
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "accepts an object and a proc" do
@@ -42,7 +42,7 @@ def handler.call(id) end
   it "raises ArgumentError trying to define a finalizer on a non-reference" do
     -> {
       ObjectSpace.define_finalizer(:blah) { 1 }
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   # see [ruby-core:24095]
@@ -57,7 +57,7 @@ def scoped
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("finalizer run\n")
+    ruby_exe(code, :args => "2>&1").should.include?("finalizer run\n")
   end
 
   it "warns if the finalizer has the object as the receiver" do
@@ -73,7 +73,7 @@ def initialize
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("warning: finalizer references object to be finalized\n")
+    ruby_exe(code, :args => "2>&1").should.include?("warning: finalizer references object to be finalized\n")
   end
 
   it "warns if the finalizer is a method bound to the receiver" do
@@ -90,7 +90,7 @@ def finalize(id)
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("warning: finalizer references object to be finalized\n")
+    ruby_exe(code, :args => "2>&1").should.include?("warning: finalizer references object to be finalized\n")
   end
 
   it "warns if the finalizer was a block in the receiver" do
@@ -106,7 +106,7 @@ def initialize
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("warning: finalizer references object to be finalized\n")
+    ruby_exe(code, :args => "2>&1").should.include?("warning: finalizer references object to be finalized\n")
   end
 
   it "calls a finalizer at exit even if it is self-referencing" do
@@ -117,7 +117,7 @@ def initialize
       exit 0
     RUBY
 
-    ruby_exe(code).should include("finalizer run\n")
+    ruby_exe(code).should.include?("finalizer run\n")
   end
 
   it "calls a finalizer at exit even if it is indirectly self-referencing" do
@@ -136,7 +136,7 @@ def finalizer(zelf)
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("finalizer run\n")
+    ruby_exe(code, :args => "2>&1").should.include?("finalizer run\n")
   end
 
   it "calls a finalizer defined in a finalizer running at exit" do
@@ -152,7 +152,7 @@ def finalizer(zelf)
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("finalizer 2 run\n")
+    ruby_exe(code, :args => "2>&1").should.include?("finalizer 2 run\n")
   end
 
   it "allows multiple finalizers with different 'callables' to be defined" do
@@ -199,7 +199,9 @@ def finalizer(zelf)
         ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
       RUBY
 
-      ruby_exe(code, args: "2>&1").should include("warning: Exception in finalizer", "finalizing")
+      out = ruby_exe(code, args: "2>&1")
+      out.should.include?("warning: Exception in finalizer")
+      out.should.include?("finalizing")
     end
   end
 
diff --git a/spec/ruby/core/objectspace/each_object_spec.rb b/spec/ruby/core/objectspace/each_object_spec.rb
index 09a582afaf9..aee0fd629ca 100644
--- a/spec/ruby/core/objectspace/each_object_spec.rb
+++ b/spec/ruby/core/objectspace/each_object_spec.rb
@@ -39,7 +39,7 @@
     new_obj = klass.new
 
     counter = ObjectSpace.each_object(klass)
-    counter.should be_an_instance_of(Enumerator)
+    counter.should.instance_of?(Enumerator)
     counter.each{}.should == 1
     # this is needed to prevent the new_obj from being GC'd too early
     new_obj.should_not == nil
@@ -47,20 +47,20 @@
 
   it "finds an object stored in a global variable" do
     $object_space_global_variable = ObjectSpaceFixtures::ObjectToBeFound.new(:global)
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:global)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:global)
   end
 
   it "finds an object stored in a top-level constant" do
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:top_level_constant)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:top_level_constant)
   end
 
   it "finds an object stored in a second-level constant" do
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:second_level_constant)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:second_level_constant)
   end
 
   it "finds an object stored in a local variable" do
     local = ObjectSpaceFixtures::ObjectToBeFound.new(:local)
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:local)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:local)
   end
 
   it "finds an object stored in a local variable captured in a block explicitly" do
@@ -69,7 +69,7 @@
       Proc.new { local_in_block }
     }.call
 
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:local_in_block_explicit)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:local_in_block_explicit)
   end
 
   it "finds an object stored in a local variable captured in a block implicitly" do
@@ -78,11 +78,11 @@
       Proc.new { }
     }.call
 
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:local_in_block_implicit)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:local_in_block_implicit)
   end
 
   it "finds an object stored in a local variable captured in by a method defined with a block" do
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:captured_by_define_method)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:captured_by_define_method)
   end
 
   it "finds an object stored in a local variable captured in a Proc#binding" do
@@ -91,7 +91,7 @@
       Proc.new { }.binding
     }.call
 
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:local_in_proc_binding)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:local_in_proc_binding)
   end
 
   it "finds an object stored in a local variable captured in a Kernel#binding" do
@@ -100,45 +100,45 @@
       binding
     }.call
 
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:local_in_kernel_binding)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:local_in_kernel_binding)
   end
 
   it "finds an object stored in a local variable set in a binding manually" do
     b = binding
     b.eval("local = ObjectSpaceFixtures::ObjectToBeFound.new(:local_in_manual_binding)")
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:local_in_manual_binding)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:local_in_manual_binding)
   end
 
   it "finds an object stored in an array" do
     array = [ObjectSpaceFixtures::ObjectToBeFound.new(:array)]
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:array)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:array)
   end
 
   it "finds an object stored in a hash key" do
     hash = {ObjectSpaceFixtures::ObjectToBeFound.new(:hash_key) => :value}
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:hash_key)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:hash_key)
   end
 
   it "finds an object stored in a hash value" do
     hash = {a: ObjectSpaceFixtures::ObjectToBeFound.new(:hash_value)}
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:hash_value)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:hash_value)
   end
 
   it "finds an object stored in an instance variable" do
     local = ObjectSpaceFixtures::ObjectWithInstanceVariable.new
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:instance_variable)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:instance_variable)
   end
 
   it "finds an object stored in a thread local" do
     thread = Thread.new {}
     thread.thread_variable_set(:object_space_thread_local, ObjectSpaceFixtures::ObjectToBeFound.new(:thread_local))
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:thread_local)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:thread_local)
     thread.join
   end
 
   it "finds an object stored in a fiber local" do
     Thread.current[:object_space_fiber_local] = ObjectSpaceFixtures::ObjectToBeFound.new(:fiber_local)
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:fiber_local)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:fiber_local)
   end
 
   it "finds an object captured in an at_exit handler" do
@@ -150,7 +150,7 @@
       end
     }.call
 
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:at_exit)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:at_exit)
   end
 
   it "finds an object captured in finalizer" do
@@ -164,9 +164,9 @@
       })
     }.call
 
-    ObjectSpaceFixtures.to_be_found_symbols.should include(:finalizer)
+    ObjectSpaceFixtures.to_be_found_symbols.should.include?(:finalizer)
 
-    alive.should_not be_nil
+    alive.should_not == nil
   end
 
   describe "on singleton classes" do
@@ -185,8 +185,8 @@
     end
 
     it "walks singleton classes" do
-      @sclass.should be_kind_of(@meta)
-      ObjectSpace.each_object(@meta).to_a.should include(@sclass)
+      @sclass.should.is_a?(@meta)
+      ObjectSpace.each_object(@meta).to_a.should.include?(@sclass)
     end
   end
 
@@ -202,7 +202,7 @@
     expected = [ a, b, c, d ]
 
     expected << c_sclass
-    c_sclass.should be_kind_of(a.singleton_class)
+    c_sclass.should.is_a?(a.singleton_class)
 
     b.extend Enumerable # included modules should not be walked
 
diff --git a/spec/ruby/core/objectspace/garbage_collect_spec.rb b/spec/ruby/core/objectspace/garbage_collect_spec.rb
index 521eaa87858..d2db22e0aa6 100644
--- a/spec/ruby/core/objectspace/garbage_collect_spec.rb
+++ b/spec/ruby/core/objectspace/garbage_collect_spec.rb
@@ -3,7 +3,7 @@
 describe "ObjectSpace.garbage_collect" do
 
   it "can be invoked without any exceptions" do
-    -> { ObjectSpace.garbage_collect }.should_not raise_error
+    -> { ObjectSpace.garbage_collect }.should_not.raise
   end
 
   it "accepts keyword arguments" do
@@ -11,7 +11,7 @@
   end
 
   it "ignores the supplied block" do
-    -> { ObjectSpace.garbage_collect {} }.should_not raise_error
+    -> { ObjectSpace.garbage_collect {} }.should_not.raise
   end
 
   it "always returns nil" do
diff --git a/spec/ruby/core/objectspace/undefine_finalizer_spec.rb b/spec/ruby/core/objectspace/undefine_finalizer_spec.rb
index f57d5a78452..98ffc6a9861 100644
--- a/spec/ruby/core/objectspace/undefine_finalizer_spec.rb
+++ b/spec/ruby/core/objectspace/undefine_finalizer_spec.rb
@@ -28,6 +28,6 @@
   it "should raise when removing finalizers for a frozen object" do
     obj = Object.new
     obj.freeze
-    -> { ObjectSpace.undefine_finalizer(obj) }.should raise_error(FrozenError)
+    -> { ObjectSpace.undefine_finalizer(obj) }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/objectspace/weakkeymap/element_set_spec.rb b/spec/ruby/core/objectspace/weakkeymap/element_set_spec.rb
index c480aa661ae..cf59aebc6fa 100644
--- a/spec/ruby/core/objectspace/weakkeymap/element_set_spec.rb
+++ b/spec/ruby/core/objectspace/weakkeymap/element_set_spec.rb
@@ -19,7 +19,7 @@ def should_accept(map, key, value)
 
   it "requires the keys to implement #hash" do
     map = ObjectSpace::WeakKeyMap.new
-    -> { map[BasicObject.new] = 1 }.should raise_error(NoMethodError, /undefined method [`']hash' for an instance of BasicObject/)
+    -> { map[BasicObject.new] = 1 }.should.raise(NoMethodError, /undefined method [`']hash' for an instance of BasicObject/)
   end
 
   it "accepts frozen keys or values" do
@@ -49,32 +49,32 @@ def should_accept(map, key, value)
   context "a key cannot be garbage collected" do
     it "raises ArgumentError when Integer is used as a key" do
       map = ObjectSpace::WeakKeyMap.new
-      -> { map[1] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      -> { map[1] = "x" }.should.raise(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
     end
 
     it "raises ArgumentError when Float is used as a key" do
       map = ObjectSpace::WeakKeyMap.new
-      -> { map[1.0] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      -> { map[1.0] = "x" }.should.raise(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
     end
 
     it "raises ArgumentError when Symbol is used as a key" do
       map = ObjectSpace::WeakKeyMap.new
-      -> { map[:a] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      -> { map[:a] = "x" }.should.raise(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
     end
 
     it "raises ArgumentError when true is used as a key" do
       map = ObjectSpace::WeakKeyMap.new
-      -> { map[true] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      -> { map[true] = "x" }.should.raise(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
     end
 
     it "raises ArgumentError when false is used as a key" do
       map = ObjectSpace::WeakKeyMap.new
-      -> { map[false] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      -> { map[false] = "x" }.should.raise(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
     end
 
     it "raises ArgumentError when nil is used as a key" do
       map = ObjectSpace::WeakKeyMap.new
-      -> { map[nil] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      -> { map[nil] = "x" }.should.raise(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
     end
   end
 end
diff --git a/spec/ruby/core/objectspace/weakkeymap/getkey_spec.rb b/spec/ruby/core/objectspace/weakkeymap/getkey_spec.rb
index 0c8dec8aea5..798a2e2cda5 100644
--- a/spec/ruby/core/objectspace/weakkeymap/getkey_spec.rb
+++ b/spec/ruby/core/objectspace/weakkeymap/getkey_spec.rb
@@ -6,7 +6,7 @@
     key1, key2 = %w[a a].map(&:upcase)
 
     map[key1] = true
-    map.getkey(key2).should equal(key1)
+    map.getkey(key2).should.equal?(key1)
     map.getkey("X").should == nil
 
     key1.should == "A" # keep the key alive until here to keep the map entry
diff --git a/spec/ruby/core/objectspace/weakmap/shared/each.rb b/spec/ruby/core/objectspace/weakmap/shared/each.rb
index 3d43a193479..771c416dde1 100644
--- a/spec/ruby/core/objectspace/weakmap/shared/each.rb
+++ b/spec/ruby/core/objectspace/weakmap/shared/each.rb
@@ -5,6 +5,6 @@
     ref = "x"
     map.send(@method).should == map
     map[key] = ref
-    -> { map.send(@method) }.should raise_error(LocalJumpError)
+    -> { map.send(@method) }.should.raise(LocalJumpError)
   end
 end
diff --git a/spec/ruby/core/proc/allocate_spec.rb b/spec/ruby/core/proc/allocate_spec.rb
index 54e1b69df9f..96c4eb9fa8f 100644
--- a/spec/ruby/core/proc/allocate_spec.rb
+++ b/spec/ruby/core/proc/allocate_spec.rb
@@ -4,6 +4,6 @@
   it "raises a TypeError" do
     -> {
       Proc.allocate
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/proc/binding_spec.rb b/spec/ruby/core/proc/binding_spec.rb
index 86ab6bd400b..d643cbf89cf 100644
--- a/spec/ruby/core/proc/binding_spec.rb
+++ b/spec/ruby/core/proc/binding_spec.rb
@@ -3,7 +3,7 @@
 describe "Proc#binding" do
   it "returns a Binding instance" do
     [Proc.new{}, -> {}, proc {}].each { |p|
-      p.binding.should be_kind_of(Binding)
+      p.binding.should.is_a?(Binding)
     }
   end
 
diff --git a/spec/ruby/core/proc/block_pass_spec.rb b/spec/ruby/core/proc/block_pass_spec.rb
index 411c0bf3dbe..82c08db8a71 100644
--- a/spec/ruby/core/proc/block_pass_spec.rb
+++ b/spec/ruby/core/proc/block_pass_spec.rb
@@ -8,14 +8,14 @@ def revivify(&b)
   it "remains the same object if re-vivified by the target method" do
     p = Proc.new {}
     p2 = revivify(&p)
-    p.should equal p2
+    p.should.equal? p2
     p.should == p2
   end
 
   it "remains the same object if reconstructed with Proc.new" do
     p = Proc.new {}
     p2 = Proc.new(&p)
-    p.should equal p2
+    p.should.equal? p2
     p.should == p2
   end
 end
diff --git a/spec/ruby/core/proc/clone_spec.rb b/spec/ruby/core/proc/clone_spec.rb
index 7d47f2cde5b..aee4873e099 100644
--- a/spec/ruby/core/proc/clone_spec.rb
+++ b/spec/ruby/core/proc/clone_spec.rb
@@ -18,7 +18,7 @@
     obj = ProcSpecs::MyProc2.new(:a, 2) { }
     dup = obj.clone
 
-    dup.should_not equal(obj)
+    dup.should_not.equal?(obj)
     dup.class.should == ProcSpecs::MyProc2
 
     dup.first.should == :a
diff --git a/spec/ruby/core/proc/curry_spec.rb b/spec/ruby/core/proc/curry_spec.rb
index 6daabe0ee17..de13983ca63 100644
--- a/spec/ruby/core/proc/curry_spec.rb
+++ b/spec/ruby/core/proc/curry_spec.rb
@@ -8,12 +8,12 @@
 
   it "returns a Proc when called on a proc" do
     p = proc { true }
-    p.curry.should be_an_instance_of(Proc)
+    p.curry.should.instance_of?(Proc)
   end
 
   it "returns a Proc when called on a lambda" do
     p = -> { true }
-    p.curry.should be_an_instance_of(Proc)
+    p.curry.should.instance_of?(Proc)
   end
 
   it "calls the curried proc with the arguments if sufficient arguments have been given" do
@@ -23,11 +23,11 @@
 
   it "returns a Proc that consumes the remainder of the arguments unless sufficient arguments have been given" do
     proc2 = @proc_add.curry[1][2]
-    proc2.should be_an_instance_of(Proc)
+    proc2.should.instance_of?(Proc)
     proc2.call(3).should == 6
 
     lambda2 = @lambda_add.curry[1][2]
-    lambda2.should be_an_instance_of(Proc)
+    lambda2.should.instance_of?(Proc)
     lambda2.call(3).should == 6
 
     @proc_add.curry.call(1,2,3).should == 6
@@ -36,10 +36,10 @@
 
   it "can be called multiple times on the same Proc" do
     @proc_add.curry
-    -> { @proc_add.curry }.should_not raise_error
+    -> { @proc_add.curry }.should_not.raise
 
     @lambda_add.curry
-    -> { @lambda_add.curry }.should_not raise_error
+    -> { @lambda_add.curry }.should_not.raise
   end
 
   it "can be passed superfluous arguments if created from a proc" do
@@ -49,8 +49,8 @@
   end
 
   it "raises an ArgumentError if passed superfluous arguments when created from a lambda" do
-    -> { @lambda_add.curry[1,2,3,4] }.should raise_error(ArgumentError)
-    -> { @lambda_add.curry[1,2].curry[3,4,5,6] }.should raise_error(ArgumentError)
+    -> { @lambda_add.curry[1,2,3,4] }.should.raise(ArgumentError)
+    -> { @lambda_add.curry[1,2].curry[3,4,5,6] }.should.raise(ArgumentError)
   end
 
   it "returns Procs with arities of -1" do
@@ -63,7 +63,7 @@
   it "produces Procs that raise ArgumentError for #binding" do
     -> do
       @proc_add.curry.binding
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "produces Procs that return [[:rest]] for #parameters" do
@@ -98,41 +98,41 @@
   end
 
   it "accepts an optional Integer argument for the arity" do
-    -> { @proc_add.curry(3) }.should_not raise_error
-    -> { @lambda_add.curry(3) }.should_not raise_error
+    -> { @proc_add.curry(3) }.should_not.raise
+    -> { @lambda_add.curry(3) }.should_not.raise
   end
 
   it "returns a Proc when called on a proc" do
-    @proc_add.curry(3).should be_an_instance_of(Proc)
+    @proc_add.curry(3).should.instance_of?(Proc)
   end
 
   it "returns a Proc when called on a lambda" do
-    @lambda_add.curry(3).should be_an_instance_of(Proc)
+    @lambda_add.curry(3).should.instance_of?(Proc)
   end
 
   # [ruby-core:24127]
   it "retains the lambda-ness of the Proc on which its called" do
-    @lambda_add.curry(3).lambda?.should be_true
-    @proc_add.curry(3).lambda?.should be_false
+    @lambda_add.curry(3).lambda?.should == true
+    @proc_add.curry(3).lambda?.should == false
   end
 
   it "raises an ArgumentError if called on a lambda that requires more than _arity_ arguments" do
-    -> { @lambda_add.curry(2) }.should raise_error(ArgumentError)
-    -> { -> x, y, z, *more{}.curry(2) }.should raise_error(ArgumentError)
+    -> { @lambda_add.curry(2) }.should.raise(ArgumentError)
+    -> { -> x, y, z, *more{}.curry(2) }.should.raise(ArgumentError)
   end
 
   it 'returns a Proc if called on a lambda that requires fewer than _arity_ arguments but may take more' do
-    -> a, b, c, d=nil, e=nil {}.curry(4).should be_an_instance_of(Proc)
-    -> a, b, c, d=nil, *e {}.curry(4).should be_an_instance_of(Proc)
-    -> a, b, c, *d {}.curry(4).should be_an_instance_of(Proc)
+    -> a, b, c, d=nil, e=nil {}.curry(4).should.instance_of?(Proc)
+    -> a, b, c, d=nil, *e {}.curry(4).should.instance_of?(Proc)
+    -> a, b, c, *d {}.curry(4).should.instance_of?(Proc)
   end
 
   it "raises an ArgumentError if called on a lambda that requires fewer than _arity_ arguments" do
-    -> { @lambda_add.curry(4) }.should raise_error(ArgumentError)
-    -> { -> { true }.curry(1) }.should raise_error(ArgumentError)
-    -> { -> a, b=nil {}.curry(5) }.should raise_error(ArgumentError)
-    -> { -> a, &b {}.curry(2) }.should raise_error(ArgumentError)
-    -> { -> a, b=nil, &c {}.curry(3) }.should raise_error(ArgumentError)
+    -> { @lambda_add.curry(4) }.should.raise(ArgumentError)
+    -> { -> { true }.curry(1) }.should.raise(ArgumentError)
+    -> { -> a, b=nil {}.curry(5) }.should.raise(ArgumentError)
+    -> { -> a, &b {}.curry(2) }.should.raise(ArgumentError)
+    -> { -> a, b=nil, &c {}.curry(3) }.should.raise(ArgumentError)
   end
 
   it "calls the curried proc with the arguments if _arity_ arguments have been given" do
@@ -142,20 +142,20 @@
 
   it "returns a Proc that consumes the remainder of the arguments when fewer than _arity_ arguments are given" do
     proc2 = @proc_add.curry(3)[1][2]
-    proc2.should be_an_instance_of(Proc)
+    proc2.should.instance_of?(Proc)
     proc2.call(3).should == 6
 
     lambda2 = @lambda_add.curry(3)[1][2]
-    lambda2.should be_an_instance_of(Proc)
+    lambda2.should.instance_of?(Proc)
     lambda2.call(3).should == 6
   end
 
   it "can be specified multiple times on the same Proc" do
     @proc_add.curry(2)
-    -> { @proc_add.curry(1) }.should_not raise_error
+    -> { @proc_add.curry(1) }.should_not.raise
 
     @lambda_add.curry(3)
-    -> { @lambda_add.curry(3) }.should_not raise_error
+    -> { @lambda_add.curry(3) }.should_not.raise
   end
 
   it "can be passed more than _arity_ arguments if created from a proc" do
@@ -165,8 +165,8 @@
   end
 
   it "raises an ArgumentError if passed more than _arity_ arguments when created from a lambda" do
-    -> { @lambda_add.curry(3)[1,2,3,4] }.should raise_error(ArgumentError)
-    -> { @lambda_add.curry(3)[1,2].curry(3)[3,4,5,6] }.should raise_error(ArgumentError)
+    -> { @lambda_add.curry(3)[1,2,3,4] }.should.raise(ArgumentError)
+    -> { @lambda_add.curry(3)[1,2].curry(3)[3,4,5,6] }.should.raise(ArgumentError)
   end
 
   it "returns Procs with arities of -1 regardless of the value of _arity_" do
diff --git a/spec/ruby/core/proc/dup_spec.rb b/spec/ruby/core/proc/dup_spec.rb
index bdb7d8ab5a4..86043894222 100644
--- a/spec/ruby/core/proc/dup_spec.rb
+++ b/spec/ruby/core/proc/dup_spec.rb
@@ -16,7 +16,7 @@
     obj = ProcSpecs::MyProc2.new(:a, 2) { }
     dup = obj.dup
 
-    dup.should_not equal(obj)
+    dup.should_not.equal?(obj)
     dup.class.should == ProcSpecs::MyProc2
 
     dup.first.should == :a
diff --git a/spec/ruby/core/proc/element_reference_spec.rb b/spec/ruby/core/proc/element_reference_spec.rb
index 81ceb91af5c..ea3a915a112 100644
--- a/spec/ruby/core/proc/element_reference_spec.rb
+++ b/spec/ruby/core/proc/element_reference_spec.rb
@@ -19,9 +19,9 @@
 
 describe "Proc#[] with frozen_string_literal: true/false" do
   it "doesn't duplicate frozen strings" do
-    ProcArefSpecs.aref.frozen?.should be_false
-    ProcArefSpecs.aref_freeze.frozen?.should be_true
-    ProcArefFrozenSpecs.aref.frozen?.should be_true
-    ProcArefFrozenSpecs.aref_freeze.frozen?.should be_true
+    ProcArefSpecs.aref.frozen?.should == false
+    ProcArefSpecs.aref_freeze.frozen?.should == true
+    ProcArefFrozenSpecs.aref.frozen?.should == true
+    ProcArefFrozenSpecs.aref_freeze.frozen?.should == true
   end
 end
diff --git a/spec/ruby/core/proc/hash_spec.rb b/spec/ruby/core/proc/hash_spec.rb
index ebe0fde1a0c..adcb1ccb78e 100644
--- a/spec/ruby/core/proc/hash_spec.rb
+++ b/spec/ruby/core/proc/hash_spec.rb
@@ -2,12 +2,12 @@
 
 describe "Proc#hash" do
   it "is provided" do
-    proc {}.respond_to?(:hash).should be_true
-    -> {}.respond_to?(:hash).should be_true
+    proc {}.respond_to?(:hash).should == true
+    -> {}.respond_to?(:hash).should == true
   end
 
   it "returns an Integer" do
-    proc { 1 + 489 }.hash.should be_kind_of(Integer)
+    proc { 1 + 489 }.hash.should.is_a?(Integer)
   end
 
   it "is stable" do
diff --git a/spec/ruby/core/proc/lambda_spec.rb b/spec/ruby/core/proc/lambda_spec.rb
index 67ee4645cd1..1ff6147319d 100644
--- a/spec/ruby/core/proc/lambda_spec.rb
+++ b/spec/ruby/core/proc/lambda_spec.rb
@@ -3,53 +3,53 @@
 
 describe "Proc#lambda?" do
   it "returns true if the Proc was created from a block with the lambda keyword" do
-    -> {}.lambda?.should be_true
+    -> {}.lambda?.should == true
   end
 
   it "returns false if the Proc was created from a block with the proc keyword" do
-    proc {}.lambda?.should be_false
+    proc {}.lambda?.should == false
   end
 
   it "returns false if the Proc was created from a block with Proc.new" do
-    Proc.new {}.lambda?.should be_false
+    Proc.new {}.lambda?.should == false
   end
 
   it "is preserved when passing a Proc with & to the proc keyword" do
-    proc(&->{}).lambda?.should be_true
-    proc(&proc{}).lambda?.should be_false
+    proc(&->{}).lambda?.should == true
+    proc(&proc{}).lambda?.should == false
   end
 
   it "is preserved when passing a Proc with & to Proc.new" do
-    Proc.new(&->{}).lambda?.should be_true
-    Proc.new(&proc{}).lambda?.should be_false
+    Proc.new(&->{}).lambda?.should == true
+    Proc.new(&proc{}).lambda?.should == false
   end
 
   it "returns false if the Proc was created from a block with &" do
-    ProcSpecs.new_proc_from_amp{}.lambda?.should be_false
+    ProcSpecs.new_proc_from_amp{}.lambda?.should == false
   end
 
   it "is preserved when the Proc was passed using &" do
-    ProcSpecs.new_proc_from_amp(&->{}).lambda?.should be_true
-    ProcSpecs.new_proc_from_amp(&proc{}).lambda?.should be_false
-    ProcSpecs.new_proc_from_amp(&Proc.new{}).lambda?.should be_false
+    ProcSpecs.new_proc_from_amp(&->{}).lambda?.should == true
+    ProcSpecs.new_proc_from_amp(&proc{}).lambda?.should == false
+    ProcSpecs.new_proc_from_amp(&Proc.new{}).lambda?.should == false
   end
 
   it "returns true for a Method converted to a Proc" do
     m = :foo.method(:to_s)
-    m.to_proc.lambda?.should be_true
-    ProcSpecs.new_proc_from_amp(&m).lambda?.should be_true
+    m.to_proc.lambda?.should == true
+    ProcSpecs.new_proc_from_amp(&m).lambda?.should == true
   end
 
   # [ruby-core:24127]
   it "is preserved when a Proc is curried" do
-    ->{}.curry.lambda?.should be_true
-    proc{}.curry.lambda?.should be_false
-    Proc.new{}.curry.lambda?.should be_false
+    ->{}.curry.lambda?.should == true
+    proc{}.curry.lambda?.should == false
+    Proc.new{}.curry.lambda?.should == false
   end
 
   it "is preserved when a curried Proc is called without enough arguments" do
-    -> x, y{}.curry.call(42).lambda?.should be_true
-    proc{|x,y|}.curry.call(42).lambda?.should be_false
-    Proc.new{|x,y|}.curry.call(42).lambda?.should be_false
+    -> x, y{}.curry.call(42).lambda?.should == true
+    proc{|x,y|}.curry.call(42).lambda?.should == false
+    Proc.new{|x,y|}.curry.call(42).lambda?.should == false
   end
 end
diff --git a/spec/ruby/core/proc/new_spec.rb b/spec/ruby/core/proc/new_spec.rb
index b2b73877561..f0b817f0cbe 100644
--- a/spec/ruby/core/proc/new_spec.rb
+++ b/spec/ruby/core/proc/new_spec.rb
@@ -71,7 +71,7 @@ def some_method
     end
     res = some_method()
 
-    -> { res.call }.should raise_error(LocalJumpError)
+    -> { res.call }.should.raise(LocalJumpError)
   end
 
   it "returns from within enclosing method when 'return' is used in the block" do
@@ -86,7 +86,7 @@ def some_method
 
   it "returns a subclass of Proc" do
     obj = ProcSpecs::MyProc.new { }
-    obj.should be_kind_of(ProcSpecs::MyProc)
+    obj.should.is_a?(ProcSpecs::MyProc)
   end
 
   it "calls initialize on the Proc object" do
@@ -101,7 +101,7 @@ def some_method
     passed_prc = Proc.new { "hello".size }
     prc = Proc.new(&passed_prc)
 
-    prc.should equal(passed_prc)
+    prc.should.equal?(passed_prc)
     prc.call.should == 5
   end
 
@@ -110,7 +110,7 @@ def some_method
     passed_prc = Proc.new(&method)
     prc = Proc.new(&passed_prc)
 
-    prc.should equal(passed_prc)
+    prc.should.equal?(passed_prc)
     prc.call.should == 5
   end
 
@@ -118,7 +118,7 @@ def some_method
     passed_prc = Proc.new(&:size)
     prc = Proc.new(&passed_prc)
 
-    prc.should equal(passed_prc)
+    prc.should.equal?(passed_prc)
     prc.call("hello").should == 5
   end
 end
@@ -129,7 +129,7 @@ def some_method
     passed_prc.class.should == ProcSpecs::MyProc
     prc = ProcSpecs::MyProc.new(&passed_prc)
 
-    prc.should equal(passed_prc)
+    prc.should.equal?(passed_prc)
     prc.call.should == 5
   end
 
@@ -139,7 +139,7 @@ def some_method
     passed_prc.class.should == ProcSpecs::MyProc
     prc = ProcSpecs::MyProc.new(&passed_prc)
 
-    prc.should equal(passed_prc)
+    prc.should.equal?(passed_prc)
     prc.call.should == 5
   end
 
@@ -148,22 +148,22 @@ def some_method
     passed_prc.class.should == ProcSpecs::MyProc
     prc = ProcSpecs::MyProc.new(&passed_prc)
 
-    prc.should equal(passed_prc)
+    prc.should.equal?(passed_prc)
     prc.call("hello").should == 5
   end
 end
 
 describe "Proc.new without a block" do
   it "raises an ArgumentError" do
-    -> { Proc.new }.should raise_error(ArgumentError)
+    -> { Proc.new }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if invoked from within a method with no block" do
-    -> { ProcSpecs.new_proc_in_method }.should raise_error(ArgumentError)
+    -> { ProcSpecs.new_proc_in_method }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if invoked on a subclass from within a method with no block" do
-    -> { ProcSpecs.new_proc_subclass_in_method }.should raise_error(ArgumentError)
+    -> { ProcSpecs.new_proc_subclass_in_method }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when passed no block" do
@@ -171,8 +171,8 @@ def some_method
       Proc.new
     end
 
-    -> { ProcSpecs.new_proc_in_method { "hello" } }.should raise_error(ArgumentError, 'tried to create Proc object without a block')
-    -> { ProcSpecs.new_proc_subclass_in_method { "hello" } }.should raise_error(ArgumentError, 'tried to create Proc object without a block')
-    -> { some_method { "hello" } }.should raise_error(ArgumentError, 'tried to create Proc object without a block')
+    -> { ProcSpecs.new_proc_in_method { "hello" } }.should.raise(ArgumentError, 'tried to create Proc object without a block')
+    -> { ProcSpecs.new_proc_subclass_in_method { "hello" } }.should.raise(ArgumentError, 'tried to create Proc object without a block')
+    -> { some_method { "hello" } }.should.raise(ArgumentError, 'tried to create Proc object without a block')
   end
 end
diff --git a/spec/ruby/core/proc/parameters_spec.rb b/spec/ruby/core/proc/parameters_spec.rb
index cf8a8f5b12b..ac8c6e35601 100644
--- a/spec/ruby/core/proc/parameters_spec.rb
+++ b/spec/ruby/core/proc/parameters_spec.rb
@@ -7,8 +7,8 @@
 
   it "returns an Array of Arrays for a proc expecting parameters" do
     p = proc {|x| }
-    p.parameters.should be_an_instance_of(Array)
-    p.parameters.first.should be_an_instance_of(Array)
+    p.parameters.should.instance_of?(Array)
+    p.parameters.first.should.instance_of?(Array)
   end
 
   it "sets the first element of each sub-Array to :opt for optional arguments" do
@@ -172,4 +172,12 @@
       eval("lambda { it }").parameters.should == [[:req]]
     end
   end
+
+  ruby_version_is "4.1" do
+    it "returns :noblock for &nil parameter" do
+      eval <<~RUBY
+        proc { |&nil| }.parameters.should == [[:noblock]]
+      RUBY
+    end
+  end
 end
diff --git a/spec/ruby/core/proc/ruby2_keywords_spec.rb b/spec/ruby/core/proc/ruby2_keywords_spec.rb
index d7f8f592e1d..e06fad8693d 100644
--- a/spec/ruby/core/proc/ruby2_keywords_spec.rb
+++ b/spec/ruby/core/proc/ruby2_keywords_spec.rb
@@ -27,7 +27,7 @@
 
   it "returns self" do
     f = -> *a { }
-    f.ruby2_keywords.should equal f
+    f.ruby2_keywords.should.equal? f
   end
 
   it "prints warning when a proc does not accept argument splat" do
diff --git a/spec/ruby/core/proc/shared/call.rb b/spec/ruby/core/proc/shared/call.rb
index dbec34df4bf..fae2331b68e 100644
--- a/spec/ruby/core/proc/shared/call.rb
+++ b/spec/ruby/core/proc/shared/call.rb
@@ -70,21 +70,21 @@
   it "raises an ArgumentError on excess arguments when self is a lambda" do
     -> {
       -> x { x }.send(@method, 1, 2)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       -> x { x }.send(@method, 1, 2, 3)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError on missing arguments when self is a lambda" do
     -> {
       -> x { x }.send(@method)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       -> x, y { [x,y] }.send(@method, 1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "treats a single Array argument as a single argument when self is a lambda" do
diff --git a/spec/ruby/core/proc/shared/compose.rb b/spec/ruby/core/proc/shared/compose.rb
index 3d3f3b310d4..c004cec7c93 100644
--- a/spec/ruby/core/proc/shared/compose.rb
+++ b/spec/ruby/core/proc/shared/compose.rb
@@ -5,7 +5,7 @@
 
     -> {
       lhs.send(@method, not_callable)
-    }.should raise_error(TypeError, "callable object is expected")
+    }.should.raise(TypeError, "callable object is expected")
 
   end
 
@@ -17,6 +17,6 @@ def succ.to_proc(s); s.succ; end
 
     -> {
       lhs.send(@method, succ)
-    }.should raise_error(TypeError, "callable object is expected")
+    }.should.raise(TypeError, "callable object is expected")
   end
 end
diff --git a/spec/ruby/core/proc/shared/dup.rb b/spec/ruby/core/proc/shared/dup.rb
index 1266337f94b..2821d2e00f2 100644
--- a/spec/ruby/core/proc/shared/dup.rb
+++ b/spec/ruby/core/proc/shared/dup.rb
@@ -3,7 +3,7 @@
     a = -> { "hello" }
     b = a.send(@method)
 
-    a.should_not equal(b)
+    a.should_not.equal?(b)
 
     a.call.should == b.call
   end
diff --git a/spec/ruby/core/proc/shared/equal.rb b/spec/ruby/core/proc/shared/equal.rb
index d0503fb0641..4f6f6c41be0 100644
--- a/spec/ruby/core/proc/shared/equal.rb
+++ b/spec/ruby/core/proc/shared/equal.rb
@@ -3,29 +3,29 @@
 
 describe :proc_equal, shared: true do
   it "is a public method" do
-    Proc.should have_public_instance_method(@method, false)
+    Proc.public_instance_methods(false).should.include?(@method)
   end
 
   it "returns true if self and other are the same object" do
     p = proc { :foo }
-    p.send(@method, p).should be_true
+    p.send(@method, p).should == true
 
     p = Proc.new { :foo }
-    p.send(@method, p).should be_true
+    p.send(@method, p).should == true
 
     p = -> { :foo }
-    p.send(@method, p).should be_true
+    p.send(@method, p).should == true
   end
 
   it "returns true if other is a dup of the original" do
     p = proc { :foo }
-    p.send(@method, p.dup).should be_true
+    p.send(@method, p.dup).should == true
 
     p = Proc.new { :foo }
-    p.send(@method, p.dup).should be_true
+    p.send(@method, p.dup).should == true
 
     p = -> { :foo }
-    p.send(@method, p.dup).should be_true
+    p.send(@method, p.dup).should == true
   end
 
   # identical here means the same method invocation.
@@ -33,51 +33,51 @@
     a = ProcSpecs.proc_for_1
     b = ProcSpecs.proc_for_1
 
-    a.send(@method, b).should be_false
+    a.send(@method, b).should == false
   end
 
   it "returns false if procs are distinct but have the same body and environment" do
     p = proc { :foo }
     p2 = proc { :foo }
-    p.send(@method, p2).should be_false
+    p.send(@method, p2).should == false
   end
 
   it "returns false if lambdas are distinct but have same body and environment" do
     x = -> { :foo }
     x2 = -> { :foo }
-    x.send(@method, x2).should be_false
+    x.send(@method, x2).should == false
   end
 
   it "returns false if using comparing lambda to proc, even with the same body and env" do
     p = -> { :foo }
     p2 = proc { :foo }
-    p.send(@method, p2).should be_false
+    p.send(@method, p2).should == false
 
     x = proc { :bar }
     x2 = -> { :bar }
-    x.send(@method, x2).should be_false
+    x.send(@method, x2).should == false
   end
 
   it "returns false if other is not a Proc" do
     p = proc { :foo }
-    p.send(@method, []).should be_false
+    p.send(@method, []).should == false
 
     p = Proc.new { :foo }
-    p.send(@method, Object.new).should be_false
+    p.send(@method, Object.new).should == false
 
     p = -> { :foo }
-    p.send(@method, :foo).should be_false
+    p.send(@method, :foo).should == false
   end
 
   it "returns false if self and other are both procs but have different bodies" do
     p = proc { :bar }
     p2 = proc { :foo }
-    p.send(@method, p2).should be_false
+    p.send(@method, p2).should == false
   end
 
   it "returns false if self and other are both lambdas but have different bodies" do
     p = -> { :foo }
     p2 = -> { :bar }
-    p.send(@method, p2).should be_false
+    p.send(@method, p2).should == false
   end
 end
diff --git a/spec/ruby/core/proc/source_location_spec.rb b/spec/ruby/core/proc/source_location_spec.rb
index fd33f21a26e..d27ad0559e1 100644
--- a/spec/ruby/core/proc/source_location_spec.rb
+++ b/spec/ruby/core/proc/source_location_spec.rb
@@ -10,71 +10,64 @@
   end
 
   it "returns an Array" do
-    @proc.source_location.should be_an_instance_of(Array)
-    @proc_new.source_location.should be_an_instance_of(Array)
-    @lambda.source_location.should be_an_instance_of(Array)
-    @method.source_location.should be_an_instance_of(Array)
+    @proc.source_location.should.instance_of?(Array)
+    @proc_new.source_location.should.instance_of?(Array)
+    @lambda.source_location.should.instance_of?(Array)
+    @method.source_location.should.instance_of?(Array)
   end
 
   it "sets the first value to the path of the file in which the proc was defined" do
-    file = @proc.source_location[0]
-    file.should be_an_instance_of(String)
+    file = @proc.source_location.first
+    file.should.instance_of?(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @proc_new.source_location[0]
-    file.should be_an_instance_of(String)
+    file = @proc_new.source_location.first
+    file.should.instance_of?(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @lambda.source_location[0]
-    file.should be_an_instance_of(String)
+    file = @lambda.source_location.first
+    file.should.instance_of?(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @method.source_location[0]
-    file.should be_an_instance_of(String)
+    file = @method.source_location.first
+    file.should.instance_of?(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
   end
 
-  it "sets the second value to an Integer representing the line on which the proc was defined" do
-    line = @proc.source_location[1]
-    line.should be_an_instance_of(Integer)
+  it "sets the last value to an Integer representing the line on which the proc was defined" do
+    line = @proc.source_location.last
+    line.should.instance_of?(Integer)
     line.should == 4
 
-    line = @proc_new.source_location[1]
-    line.should be_an_instance_of(Integer)
+    line = @proc_new.source_location.last
+    line.should.instance_of?(Integer)
     line.should == 12
 
-    line = @lambda.source_location[1]
-    line.should be_an_instance_of(Integer)
+    line = @lambda.source_location.last
+    line.should.instance_of?(Integer)
     line.should == 8
 
-    line = @method.source_location[1]
-    line.should be_an_instance_of(Integer)
+    line = @method.source_location.last
+    line.should.instance_of?(Integer)
     line.should == 15
   end
 
   it "works even if the proc was created on the same line" do
-    ruby_version_is(""..."4.1") do
-      proc { true }.source_location.should == [__FILE__, __LINE__]
-      Proc.new { true }.source_location.should == [__FILE__, __LINE__]
-      -> { true }.source_location.should == [__FILE__, __LINE__]
-    end
-    ruby_version_is("4.1") do
-      proc { true }.source_location.should == [__FILE__, __LINE__, 11, __LINE__, 19]
-      Proc.new { true }.source_location.should == [__FILE__, __LINE__, 15, __LINE__, 23]
-      -> { true }.source_location.should == [__FILE__, __LINE__, 6, __LINE__, 17]
-    end
+    proc { true }.source_location.should == [__FILE__, __LINE__]
+    Proc.new { true }.source_location.should == [__FILE__, __LINE__]
+    -> { true }.source_location.should == [__FILE__, __LINE__]
   end
 
   it "returns the first line of a multi-line proc (i.e. the line containing 'proc do')" do
-    ProcSpecs::SourceLocation.my_multiline_proc.source_location[1].should == 20
-    ProcSpecs::SourceLocation.my_multiline_proc_new.source_location[1].should == 34
-    ProcSpecs::SourceLocation.my_multiline_lambda.source_location[1].should == 27
+    ProcSpecs::SourceLocation.my_multiline_proc.source_location.last.should == 20
+    ProcSpecs::SourceLocation.my_multiline_proc_new.source_location.last.should == 34
+    ProcSpecs::SourceLocation.my_multiline_lambda.source_location.last.should == 27
   end
 
   it "returns the location of the proc's body; not necessarily the proc itself" do
-    ProcSpecs::SourceLocation.my_detached_proc.source_location[1].should == 41
-    ProcSpecs::SourceLocation.my_detached_proc_new.source_location[1].should == 51
-    ProcSpecs::SourceLocation.my_detached_lambda.source_location[1].should == 46
+    ProcSpecs::SourceLocation.my_detached_proc.source_location.last.should == 41
+    ProcSpecs::SourceLocation.my_detached_proc_new.source_location.last.should == 51
+    ProcSpecs::SourceLocation.my_detached_lambda.source_location.last.should == 46
   end
 
   it "returns the same value for a proc-ified method as the method reports" do
@@ -93,12 +86,6 @@
 
   it "works for eval with a given line" do
     proc = eval('-> {}', nil, "foo", 100)
-    location = proc.source_location
-    ruby_version_is(""..."4.1") do
-      location.should == ["foo", 100]
-    end
-    ruby_version_is("4.1") do
-      location.should == ["foo", 100, 0, 100, 5]
-    end
+    proc.source_location.should == ["foo", 100]
   end
 end
diff --git a/spec/ruby/core/proc/to_proc_spec.rb b/spec/ruby/core/proc/to_proc_spec.rb
index ffaa34929b9..7f35a4f19bf 100644
--- a/spec/ruby/core/proc/to_proc_spec.rb
+++ b/spec/ruby/core/proc/to_proc_spec.rb
@@ -3,7 +3,7 @@
 describe "Proc#to_proc" do
   it "returns self" do
     [Proc.new {}, -> {}, proc {}].each { |p|
-      p.to_proc.should equal(p)
+      p.to_proc.should.equal?(p)
     }
   end
 end
diff --git a/spec/ruby/core/process/_fork_spec.rb b/spec/ruby/core/process/_fork_spec.rb
index e1f45e2656d..620f243ce5d 100644
--- a/spec/ruby/core/process/_fork_spec.rb
+++ b/spec/ruby/core/process/_fork_spec.rb
@@ -9,7 +9,7 @@
   # are that _fork is implemented if and only if fork is (see above).
   guard_not -> { Process.respond_to?(:fork) } do
     it "raises a NotImplementedError when called" do
-      -> { Process._fork }.should raise_error(NotImplementedError)
+      -> { Process._fork }.should.raise(NotImplementedError)
     end
   end
 
@@ -18,7 +18,7 @@
       Process.should_receive(:_fork).once.and_return(42)
 
       pid = Process.fork {}
-      pid.should equal(42)
+      pid.should.equal?(42)
     end
   end
 end
diff --git a/spec/ruby/core/process/argv0_spec.rb b/spec/ruby/core/process/argv0_spec.rb
index 9cba382c009..4c7a2c9ecbf 100644
--- a/spec/ruby/core/process/argv0_spec.rb
+++ b/spec/ruby/core/process/argv0_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Process.argv0" do
   it "returns a String" do
-    Process.argv0.should be_kind_of(String)
+    Process.argv0.should.is_a?(String)
   end
 
   it "is the path given as the main script and the same as __FILE__" do
diff --git a/spec/ruby/core/process/clock_gettime_spec.rb b/spec/ruby/core/process/clock_gettime_spec.rb
index 6c1a52f21ed..88158904e14 100644
--- a/spec/ruby/core/process/clock_gettime_spec.rb
+++ b/spec/ruby/core/process/clock_gettime_spec.rb
@@ -4,31 +4,31 @@
 describe "Process.clock_gettime" do
   ProcessSpecs.clock_constants.each do |name, value|
     it "can be called with Process::#{name}" do
-      Process.clock_gettime(value).should be_an_instance_of(Float)
+      Process.clock_gettime(value).should.instance_of?(Float)
     end
   end
 
   describe 'time units' do
     it 'handles a fixed set of time units' do
       [:nanosecond, :microsecond, :millisecond, :second].each do |unit|
-        Process.clock_gettime(Process::CLOCK_MONOTONIC, unit).should be_kind_of(Integer)
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, unit).should.is_a?(Integer)
       end
 
       [:float_microsecond, :float_millisecond, :float_second].each do |unit|
-        Process.clock_gettime(Process::CLOCK_MONOTONIC, unit).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, unit).should.instance_of?(Float)
       end
     end
 
     it 'raises an ArgumentError for an invalid time unit' do
-      -> { Process.clock_gettime(Process::CLOCK_MONOTONIC, :bad) }.should raise_error(ArgumentError)
+      -> { Process.clock_gettime(Process::CLOCK_MONOTONIC, :bad) }.should.raise(ArgumentError)
     end
 
     it 'defaults to :float_second' do
       t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       t2 = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
 
-      t1.should be_an_instance_of(Float)
-      t2.should be_an_instance_of(Float)
+      t1.should.instance_of?(Float)
+      t2.should.instance_of?(Float)
       t2.should be_close(t1, TIME_TOLERANCE)
     end
 
@@ -36,116 +36,116 @@
       t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC, nil)
       t2 = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
 
-      t1.should be_an_instance_of(Float)
-      t2.should be_an_instance_of(Float)
+      t1.should.instance_of?(Float)
+      t2.should.instance_of?(Float)
       t2.should be_close(t1, TIME_TOLERANCE)
     end
   end
 
   describe "supports the platform clocks mentioned in the documentation" do
     it "CLOCK_REALTIME" do
-      Process.clock_gettime(Process::CLOCK_REALTIME).should be_an_instance_of(Float)
+      Process.clock_gettime(Process::CLOCK_REALTIME).should.instance_of?(Float)
     end
 
     it "CLOCK_MONOTONIC" do
-      Process.clock_gettime(Process::CLOCK_MONOTONIC).should be_an_instance_of(Float)
+      Process.clock_gettime(Process::CLOCK_MONOTONIC).should.instance_of?(Float)
     end
 
     # These specs need macOS 10.12+ / darwin 16+
     guard -> { platform_is_not(:darwin) or kernel_version_is '16' } do
       platform_is :linux, :openbsd, :darwin do
         it "CLOCK_PROCESS_CPUTIME_ID" do
-          Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID).should be_an_instance_of(Float)
+          Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID).should.instance_of?(Float)
         end
       end
 
       platform_is :linux, :freebsd, :openbsd, :darwin do
         it "CLOCK_THREAD_CPUTIME_ID" do
-          Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID).should be_an_instance_of(Float)
+          Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID).should.instance_of?(Float)
         end
       end
 
       platform_is :linux, :darwin do
         it "CLOCK_MONOTONIC_RAW" do
-          Process.clock_gettime(Process::CLOCK_MONOTONIC_RAW).should be_an_instance_of(Float)
+          Process.clock_gettime(Process::CLOCK_MONOTONIC_RAW).should.instance_of?(Float)
         end
       end
 
       platform_is :darwin do
         it "CLOCK_MONOTONIC_RAW_APPROX" do
-          Process.clock_gettime(Process::CLOCK_MONOTONIC_RAW_APPROX).should be_an_instance_of(Float)
+          Process.clock_gettime(Process::CLOCK_MONOTONIC_RAW_APPROX).should.instance_of?(Float)
         end
 
         it "CLOCK_UPTIME_RAW and CLOCK_UPTIME_RAW_APPROX" do
-          Process.clock_gettime(Process::CLOCK_UPTIME_RAW).should be_an_instance_of(Float)
-          Process.clock_gettime(Process::CLOCK_UPTIME_RAW_APPROX).should be_an_instance_of(Float)
+          Process.clock_gettime(Process::CLOCK_UPTIME_RAW).should.instance_of?(Float)
+          Process.clock_gettime(Process::CLOCK_UPTIME_RAW_APPROX).should.instance_of?(Float)
         end
       end
     end
 
     platform_is :freebsd do
       it "CLOCK_VIRTUAL" do
-        Process.clock_gettime(Process::CLOCK_VIRTUAL).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_VIRTUAL).should.instance_of?(Float)
       end
 
       it "CLOCK_PROF" do
-        Process.clock_gettime(Process::CLOCK_PROF).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_PROF).should.instance_of?(Float)
       end
     end
 
     platform_is :freebsd, :openbsd do
       it "CLOCK_UPTIME" do
-        Process.clock_gettime(Process::CLOCK_UPTIME).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_UPTIME).should.instance_of?(Float)
       end
     end
 
     platform_is :freebsd do
       it "CLOCK_REALTIME_FAST and CLOCK_REALTIME_PRECISE" do
-        Process.clock_gettime(Process::CLOCK_REALTIME_FAST).should be_an_instance_of(Float)
-        Process.clock_gettime(Process::CLOCK_REALTIME_PRECISE).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_REALTIME_FAST).should.instance_of?(Float)
+        Process.clock_gettime(Process::CLOCK_REALTIME_PRECISE).should.instance_of?(Float)
       end
 
       it "CLOCK_MONOTONIC_FAST and CLOCK_MONOTONIC_PRECISE" do
-        Process.clock_gettime(Process::CLOCK_MONOTONIC_FAST).should be_an_instance_of(Float)
-        Process.clock_gettime(Process::CLOCK_MONOTONIC_PRECISE).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_MONOTONIC_FAST).should.instance_of?(Float)
+        Process.clock_gettime(Process::CLOCK_MONOTONIC_PRECISE).should.instance_of?(Float)
       end
 
       it "CLOCK_UPTIME_FAST and CLOCK_UPTIME_PRECISE" do
-        Process.clock_gettime(Process::CLOCK_UPTIME_FAST).should be_an_instance_of(Float)
-        Process.clock_gettime(Process::CLOCK_UPTIME_PRECISE).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_UPTIME_FAST).should.instance_of?(Float)
+        Process.clock_gettime(Process::CLOCK_UPTIME_PRECISE).should.instance_of?(Float)
       end
 
       it "CLOCK_SECOND" do
-        Process.clock_gettime(Process::CLOCK_SECOND).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_SECOND).should.instance_of?(Float)
       end
     end
 
     guard -> { platform_is :linux and kernel_version_is '2.6.32' } do
       it "CLOCK_REALTIME_COARSE" do
-        Process.clock_gettime(Process::CLOCK_REALTIME_COARSE).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_REALTIME_COARSE).should.instance_of?(Float)
       end
 
       it "CLOCK_MONOTONIC_COARSE" do
-        Process.clock_gettime(Process::CLOCK_MONOTONIC_COARSE).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_MONOTONIC_COARSE).should.instance_of?(Float)
       end
     end
 
     guard -> { platform_is :linux and kernel_version_is '2.6.39' } do
       it "CLOCK_BOOTTIME" do
         skip "No Process::CLOCK_BOOTTIME" unless defined?(Process::CLOCK_BOOTTIME)
-        Process.clock_gettime(Process::CLOCK_BOOTTIME).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_BOOTTIME).should.instance_of?(Float)
       end
     end
 
     guard -> { platform_is "x86_64-linux" and kernel_version_is '3.0' } do
       it "CLOCK_REALTIME_ALARM" do
         skip "No Process::CLOCK_REALTIME_ALARM" unless defined?(Process::CLOCK_REALTIME_ALARM)
-        Process.clock_gettime(Process::CLOCK_REALTIME_ALARM).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_REALTIME_ALARM).should.instance_of?(Float)
       end
 
       it "CLOCK_BOOTTIME_ALARM" do
         skip "No Process::CLOCK_BOOTTIME_ALARM" unless defined?(Process::CLOCK_BOOTTIME_ALARM)
-        Process.clock_gettime(Process::CLOCK_BOOTTIME_ALARM).should be_an_instance_of(Float)
+        Process.clock_gettime(Process::CLOCK_BOOTTIME_ALARM).should.instance_of?(Float)
       end
     end
   end
diff --git a/spec/ruby/core/process/constants_spec.rb b/spec/ruby/core/process/constants_spec.rb
index 57cacadef2b..5a4c478e749 100644
--- a/spec/ruby/core/process/constants_spec.rb
+++ b/spec/ruby/core/process/constants_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Process::Constants" do
   platform_is :darwin, :netbsd, :freebsd do
-    it "are all present on BSD-like systems" do
+    describe "on BSD-like systems" do
       %i[
           WNOHANG
           WUNTRACED
@@ -20,27 +20,31 @@
           RLIMIT_NPROC
           RLIMIT_NOFILE
       ].each do |const|
-        Process.const_defined?(const).should be_true
-        Process.const_get(const).should be_an_instance_of(Integer)
+        it "defines #{const}" do
+          Process.const_defined?(const).should == true
+          Process.const_get(const).should.instance_of?(Integer)
+        end
       end
     end
   end
 
   platform_is :darwin do
-    it "are all present on Darwin" do
+    describe "on Darwin" do
       %i[
         RLIM_SAVED_MAX
         RLIM_SAVED_CUR
         RLIMIT_AS
       ].each do |const|
-        Process.const_defined?(const).should be_true
-        Process.const_get(const).should be_an_instance_of(Integer)
+        it "defines #{const}" do
+          Process.const_defined?(const).should == true
+          Process.const_get(const).should.instance_of?(Integer)
+        end
       end
     end
   end
 
   platform_is :linux do
-    it "are all present on Linux" do
+    describe "on Linux" do
       %i[
         WNOHANG
         WUNTRACED
@@ -61,37 +65,43 @@
         RLIM_SAVED_MAX
         RLIM_SAVED_CUR
       ].each do |const|
-        Process.const_defined?(const).should be_true
-        Process.const_get(const).should be_an_instance_of(Integer)
+        it "defines #{const}" do
+          Process.const_defined?(const).should == true
+          Process.const_get(const).should.instance_of?(Integer)
+        end
       end
     end
   end
 
   platform_is :netbsd, :freebsd do
-    it "are all present on NetBSD and FreeBSD" do
+    describe "on NetBSD and FreeBSD" do
       %i[
         RLIMIT_SBSIZE
         RLIMIT_AS
       ].each do |const|
-        Process.const_defined?(const).should be_true
-        Process.const_get(const).should be_an_instance_of(Integer)
+        it "defines #{const}" do
+          Process.const_defined?(const).should == true
+          Process.const_get(const).should.instance_of?(Integer)
+        end
       end
     end
   end
 
   platform_is :freebsd do
-    it "are all present on FreeBSD" do
+    describe "on FreeBSD" do
       %i[
         RLIMIT_NPTS
       ].each do |const|
-        Process.const_defined?(const).should be_true
-        Process.const_get(const).should be_an_instance_of(Integer)
+        it "defines #{const}" do
+          Process.const_defined?(const).should == true
+          Process.const_get(const).should.instance_of?(Integer)
+        end
       end
     end
   end
 
   platform_is :windows do
-    it "does not define RLIMIT constants" do
+    describe "on Windows" do
       %i[
           RLIMIT_CPU
           RLIMIT_FSIZE
@@ -107,7 +117,9 @@
           RLIM_SAVED_MAX
           RLIM_SAVED_CUR
       ].each do |const|
-        Process.const_defined?(const).should be_false
+        it "does not define #{const}" do
+          Process.const_defined?(const).should == false
+        end
       end
     end
   end
diff --git a/spec/ruby/core/process/daemon_spec.rb b/spec/ruby/core/process/daemon_spec.rb
index 20b0d743b9a..9b7eba14118 100644
--- a/spec/ruby/core/process/daemon_spec.rb
+++ b/spec/ruby/core/process/daemon_spec.rb
@@ -112,7 +112,7 @@
     it "raises a NotImplementedError" do
       -> {
         Process.daemon
-      }.should raise_error(NotImplementedError)
+      }.should.raise(NotImplementedError)
     end
   end
 end
diff --git a/spec/ruby/core/process/detach_spec.rb b/spec/ruby/core/process/detach_spec.rb
index f13bda1f5d1..33c674394e2 100644
--- a/spec/ruby/core/process/detach_spec.rb
+++ b/spec/ruby/core/process/detach_spec.rb
@@ -5,7 +5,7 @@
     it "returns a thread" do
       pid = Process.fork { Process.exit! }
       thr = Process.detach(pid)
-      thr.should be_kind_of(Thread)
+      thr.should.is_a?(Thread)
       thr.join
     end
 
@@ -15,7 +15,7 @@
       thr.join
 
       status = thr.value
-      status.should be_kind_of(Process::Status)
+      status.should.is_a?(Process::Status)
       status.pid.should == pid
     end
 
@@ -23,7 +23,7 @@
       it "reaps the child process's status automatically" do
         pid = Process.fork { Process.exit! }
         Process.detach(pid).join
-        -> { Process.waitpid(pid) }.should raise_error(Errno::ECHILD)
+        -> { Process.waitpid(pid) }.should.raise(Errno::ECHILD)
       end
     end
 
@@ -52,12 +52,12 @@
       # Command `kill 0 pid`:
       # - returns "1" if a process exists and
       # - raises Errno::ESRCH otherwise
-      -> {  Process.kill(0, pid_not_existing) }.should raise_error(Errno::ESRCH)
+      -> {  Process.kill(0, pid_not_existing) }.should.raise(Errno::ESRCH)
 
       thr = Process.detach(pid_not_existing)
       thr.join
 
-      thr.should be_kind_of(Thread)
+      thr.should.is_a?(Thread)
     end
 
     it "calls #to_int to implicitly convert non-Integer pid to Integer" do
@@ -68,14 +68,14 @@
     end
 
     it "raises TypeError when pid argument does not have #to_int method" do
-      -> { Process.detach(Object.new) }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+      -> { Process.detach(Object.new) }.should.raise(TypeError, "no implicit conversion of Object into Integer")
     end
 
     it "raises TypeError when #to_int returns non-Integer value" do
       pid = MockObject.new('mock-enumerable')
       pid.should_receive(:to_int).and_return(:symbol)
 
-      -> { Process.detach(pid) }.should raise_error(TypeError, "can't convert MockObject to Integer (MockObject#to_int gives Symbol)")
+      -> { Process.detach(pid) }.should raise_consistent_error(TypeError, "can't convert MockObject into Integer (MockObject#to_int gives Symbol)")
     end
   end
 end
diff --git a/spec/ruby/core/process/egid_spec.rb b/spec/ruby/core/process/egid_spec.rb
index a67b623d5c0..69c86bebe22 100644
--- a/spec/ruby/core/process/egid_spec.rb
+++ b/spec/ruby/core/process/egid_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Process.egid" do
   it "returns the effective group ID for this process" do
-    Process.egid.should be_kind_of(Integer)
+    Process.egid.should.is_a?(Integer)
   end
 
   it "also goes by Process::GID.eid" do
@@ -18,7 +18,7 @@
 
   platform_is_not :windows do
     it "raises TypeError if not passed an Integer or String" do
-      -> { Process.egid = Object.new }.should raise_error(TypeError)
+      -> { Process.egid = Object.new }.should.raise(TypeError)
     end
 
     it "sets the effective group id to its own gid if given the username corresponding to its own gid" do
@@ -33,12 +33,12 @@
 
     as_user do
       it "raises Errno::ERPERM if run by a non superuser trying to set the root group id" do
-        -> { Process.egid = 0 }.should raise_error(Errno::EPERM)
+        -> { Process.egid = 0 }.should.raise(Errno::EPERM)
       end
 
       platform_is :linux do
         it "raises Errno::ERPERM if run by a non superuser trying to set the group id from group name" do
-          -> { Process.egid = "root" }.should raise_error(Errno::EPERM)
+          -> { Process.egid = "root" }.should.raise(Errno::EPERM)
         end
       end
     end
diff --git a/spec/ruby/core/process/euid_spec.rb b/spec/ruby/core/process/euid_spec.rb
index c1ec4171d0d..da76f06e597 100644
--- a/spec/ruby/core/process/euid_spec.rb
+++ b/spec/ruby/core/process/euid_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Process.euid" do
   it "returns the effective user ID for this process" do
-    Process.euid.should be_kind_of(Integer)
+    Process.euid.should.is_a?(Integer)
   end
 
   it "also goes by Process::UID.eid" do
@@ -18,7 +18,7 @@
 
   platform_is_not :windows do
     it "raises TypeError if not passed an Integer" do
-      -> { Process.euid = Object.new }.should raise_error(TypeError)
+      -> { Process.euid = Object.new }.should.raise(TypeError)
     end
 
     it "sets the effective user id to its own uid if given the username corresponding to its own uid" do
@@ -33,11 +33,11 @@
 
     as_user do
       it "raises Errno::ERPERM if run by a non superuser trying to set the superuser id" do
-        -> { Process.euid = 0 }.should raise_error(Errno::EPERM)
+        -> { Process.euid = 0 }.should.raise(Errno::EPERM)
       end
 
       it "raises Errno::ERPERM if run by a non superuser trying to set the superuser id from username" do
-        -> { Process.euid = "root" }.should raise_error(Errno::EPERM)
+        -> { Process.euid = "root" }.should.raise(Errno::EPERM)
       end
     end
 
diff --git a/spec/ruby/core/process/exec_spec.rb b/spec/ruby/core/process/exec_spec.rb
index 0f371b39c81..a48d461b026 100644
--- a/spec/ruby/core/process/exec_spec.rb
+++ b/spec/ruby/core/process/exec_spec.rb
@@ -2,35 +2,35 @@
 
 describe "Process.exec" do
   it "raises Errno::ENOENT for an empty string" do
-    -> { Process.exec "" }.should raise_error(Errno::ENOENT)
+    -> { Process.exec "" }.should.raise(Errno::ENOENT)
   end
 
   it "raises Errno::ENOENT for a command which does not exist" do
-    -> { Process.exec "bogus-noent-script.sh" }.should raise_error(Errno::ENOENT)
+    -> { Process.exec "bogus-noent-script.sh" }.should.raise(Errno::ENOENT)
   end
 
   it "raises an ArgumentError if the command includes a null byte" do
-    -> { Process.exec "\000" }.should raise_error(ArgumentError)
+    -> { Process.exec "\000" }.should.raise(ArgumentError)
   end
 
   unless File.executable?(__FILE__) # Some FS (e.g. vboxfs) locate all files executable
     platform_is_not :windows do
       it "raises Errno::EACCES when the file does not have execute permissions" do
-        -> { Process.exec __FILE__ }.should raise_error(Errno::EACCES)
+        -> { Process.exec __FILE__ }.should.raise(Errno::EACCES)
       end
     end
 
     platform_is :windows do
       it "raises Errno::EACCES or Errno::ENOEXEC when the file is not an executable file" do
-        -> { Process.exec __FILE__ }.should raise_error(SystemCallError) { |e|
-          [Errno::EACCES, Errno::ENOEXEC].should include(e.class)
+        -> { Process.exec __FILE__ }.should.raise(SystemCallError) { |e|
+          [Errno::EACCES, Errno::ENOEXEC].should.include?(e.class)
         }
       end
     end
   end
 
   it "raises Errno::EACCES when passed a directory" do
-    -> { Process.exec __dir__ }.should raise_error(Errno::EACCES)
+    -> { Process.exec __dir__ }.should.raise(Errno::EACCES)
   end
 
   it "runs the specified command, replacing current process" do
@@ -171,9 +171,9 @@
     end
 
     it "raises an ArgumentError if the Array does not have exactly two elements" do
-      -> { Process.exec([]) }.should raise_error(ArgumentError)
-      -> { Process.exec([:a]) }.should raise_error(ArgumentError)
-      -> { Process.exec([:a, :b, :c]) }.should raise_error(ArgumentError)
+      -> { Process.exec([]) }.should.raise(ArgumentError)
+      -> { Process.exec([:a]) }.should.raise(ArgumentError)
+      -> { Process.exec([:a, :b, :c]) }.should.raise(ArgumentError)
     end
   end
 
diff --git a/spec/ruby/core/process/getpriority_spec.rb b/spec/ruby/core/process/getpriority_spec.rb
index a35e5956a58..53fe7bfe207 100644
--- a/spec/ruby/core/process/getpriority_spec.rb
+++ b/spec/ruby/core/process/getpriority_spec.rb
@@ -5,19 +5,19 @@
 
     it "coerces arguments to Integers" do
       ret = Process.getpriority mock_int(Process::PRIO_PROCESS), mock_int(0)
-      ret.should be_kind_of(Integer)
+      ret.should.is_a?(Integer)
     end
 
     it "gets the scheduling priority for a specified process" do
-      Process.getpriority(Process::PRIO_PROCESS, 0).should be_kind_of(Integer)
+      Process.getpriority(Process::PRIO_PROCESS, 0).should.is_a?(Integer)
     end
 
     it "gets the scheduling priority for a specified process group" do
-      Process.getpriority(Process::PRIO_PGRP, 0).should be_kind_of(Integer)
+      Process.getpriority(Process::PRIO_PGRP, 0).should.is_a?(Integer)
     end
 
     it "gets the scheduling priority for a specified user" do
-      Process.getpriority(Process::PRIO_USER, 0).should be_kind_of(Integer)
+      Process.getpriority(Process::PRIO_USER, 0).should.is_a?(Integer)
     end
   end
 end
diff --git a/spec/ruby/core/process/getrlimit_spec.rb b/spec/ruby/core/process/getrlimit_spec.rb
index 883b8fac48b..d36d8c3335d 100644
--- a/spec/ruby/core/process/getrlimit_spec.rb
+++ b/spec/ruby/core/process/getrlimit_spec.rb
@@ -16,8 +16,8 @@
     it "returns a two-element Array of Integers" do
       result = Process.getrlimit Process::RLIMIT_CORE
       result.size.should == 2
-      result.first.should be_kind_of(Integer)
-      result.last.should be_kind_of(Integer)
+      result.first.should.is_a?(Integer)
+      result.last.should.is_a?(Integer)
     end
 
     context "when passed an Object" do
@@ -36,7 +36,7 @@
         obj = mock("process getrlimit integer")
         obj.should_receive(:to_int).and_return(nil)
 
-        -> { Process.getrlimit(obj) }.should raise_error(TypeError)
+        -> { Process.getrlimit(obj) }.should.raise(TypeError)
       end
     end
 
@@ -49,7 +49,7 @@
       end
 
       it "raises ArgumentError when passed an unknown resource" do
-        -> { Process.getrlimit(:FOO) }.should raise_error(ArgumentError)
+        -> { Process.getrlimit(:FOO) }.should.raise(ArgumentError)
       end
     end
 
@@ -62,7 +62,7 @@
       end
 
       it "raises ArgumentError when passed an unknown resource" do
-        -> { Process.getrlimit("FOO") }.should raise_error(ArgumentError)
+        -> { Process.getrlimit("FOO") }.should.raise(ArgumentError)
       end
     end
 
@@ -91,10 +91,10 @@
 
   platform_is :windows do
     it "is not implemented" do
-      Process.respond_to?(:getrlimit).should be_false
+      Process.respond_to?(:getrlimit).should == false
       -> do
         Process.getrlimit(nil)
-      end.should raise_error NotImplementedError
+      end.should.raise NotImplementedError
     end
   end
 end
diff --git a/spec/ruby/core/process/groups_spec.rb b/spec/ruby/core/process/groups_spec.rb
index 33e0f9d7b3d..fa916671a49 100644
--- a/spec/ruby/core/process/groups_spec.rb
+++ b/spec/ruby/core/process/groups_spec.rb
@@ -50,7 +50,7 @@
           Process.groups.should == [ Process.gid ]
           supplementary = groups - [ Process.gid ]
           if supplementary.length > 0
-            -> { Process.groups = supplementary }.should raise_error(Errno::EPERM)
+            -> { Process.groups = supplementary }.should.raise(Errno::EPERM)
           end
         end
       end
@@ -59,7 +59,7 @@
         it "raises Errno::EPERM" do
           -> {
             Process.groups = [0]
-          }.should raise_error(Errno::EPERM)
+          }.should.raise(Errno::EPERM)
         end
       end
     end
diff --git a/spec/ruby/core/process/initgroups_spec.rb b/spec/ruby/core/process/initgroups_spec.rb
index ffc7f282b69..d9f31936cbd 100644
--- a/spec/ruby/core/process/initgroups_spec.rb
+++ b/spec/ruby/core/process/initgroups_spec.rb
@@ -14,7 +14,7 @@
           Process.groups.sort.should == augmented_groups.sort
           Process.groups = groups
         else
-          -> { Process.initgroups(name, gid) }.should raise_error(Errno::EPERM)
+          -> { Process.initgroups(name, gid) }.should.raise(Errno::EPERM)
         end
       end
     end
diff --git a/spec/ruby/core/process/kill_spec.rb b/spec/ruby/core/process/kill_spec.rb
index af9c9e6debc..885c2bf2b79 100644
--- a/spec/ruby/core/process/kill_spec.rb
+++ b/spec/ruby/core/process/kill_spec.rb
@@ -9,18 +9,18 @@
   end
 
   it "raises an ArgumentError for unknown signals" do
-    -> { Process.kill("FOO", @pid) }.should raise_error(ArgumentError)
+    -> { Process.kill("FOO", @pid) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if passed a lowercase signal name" do
-    -> { Process.kill("term", @pid) }.should raise_error(ArgumentError)
+    -> { Process.kill("term", @pid) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if signal is not an Integer or String" do
     signal = mock("process kill signal")
     signal.should_not_receive(:to_int)
 
-    -> { Process.kill(signal, @pid) }.should raise_error(ArgumentError)
+    -> { Process.kill(signal, @pid) }.should.raise(ArgumentError)
   end
 
   it "raises Errno::ESRCH if the process does not exist" do
@@ -29,7 +29,7 @@
     Process.wait(pid)
     -> {
       Process.kill("SIGKILL", pid)
-    }.should raise_error(Errno::ESRCH)
+    }.should.raise(Errno::ESRCH)
   end
 
   it "checks for existence and permissions to signal a process, but does not actually signal it, when using signal 0" do
diff --git a/spec/ruby/core/process/last_status_spec.rb b/spec/ruby/core/process/last_status_spec.rb
index 2372f2aae3b..1bd8adf7989 100644
--- a/spec/ruby/core/process/last_status_spec.rb
+++ b/spec/ruby/core/process/last_status_spec.rb
@@ -13,6 +13,6 @@
   end
 
   it 'raises an ArgumentError if any arguments are provided' do
-    -> { Process.last_status(1) }.should raise_error(ArgumentError)
+    -> { Process.last_status(1) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/process/maxgroups_spec.rb b/spec/ruby/core/process/maxgroups_spec.rb
index 2549a7a9718..895b384bd03 100644
--- a/spec/ruby/core/process/maxgroups_spec.rb
+++ b/spec/ruby/core/process/maxgroups_spec.rb
@@ -3,7 +3,7 @@
 platform_is_not :windows do
   describe "Process.maxgroups" do
     it "returns the maximum number of gids allowed in the supplemental group access list" do
-      Process.maxgroups.should be_kind_of(Integer)
+      Process.maxgroups.should.is_a?(Integer)
     end
 
     it "sets the maximum number of gids allowed in the supplemental group access list" do
diff --git a/spec/ruby/core/process/pid_spec.rb b/spec/ruby/core/process/pid_spec.rb
index 2d008bc4b74..42b0b918b94 100644
--- a/spec/ruby/core/process/pid_spec.rb
+++ b/spec/ruby/core/process/pid_spec.rb
@@ -3,7 +3,7 @@
 describe "Process.pid" do
   it "returns the process id of this process" do
     pid = Process.pid
-    pid.should be_kind_of(Integer)
+    pid.should.is_a?(Integer)
     Process.pid.should == pid
   end
 end
diff --git a/spec/ruby/core/process/set_proctitle_spec.rb b/spec/ruby/core/process/set_proctitle_spec.rb
index d022f2021c3..28a0fa6cee2 100644
--- a/spec/ruby/core/process/set_proctitle_spec.rb
+++ b/spec/ruby/core/process/set_proctitle_spec.rb
@@ -17,7 +17,7 @@
       title = 'rubyspec-proctitle-test'
 
       Process.setproctitle(title).should == title
-      `ps -ocommand= -p#{$$}`.should include(title)
+      `ps -ocommand= -p#{$$}`.should.include?(title)
     end
   end
 end
diff --git a/spec/ruby/core/process/setrlimit_spec.rb b/spec/ruby/core/process/setrlimit_spec.rb
index ba8d1e04ca0..f02ab46fca5 100644
--- a/spec/ruby/core/process/setrlimit_spec.rb
+++ b/spec/ruby/core/process/setrlimit_spec.rb
@@ -9,196 +9,196 @@
       end
 
       it "calls #to_int to convert resource to an Integer" do
-        Process.setrlimit(mock_int(@resource), @limit, @max).should be_nil
+        Process.setrlimit(mock_int(@resource), @limit, @max).should == nil
       end
 
       it "raises a TypeError if #to_int for resource does not return an Integer" do
         obj = mock("process getrlimit integer")
         obj.should_receive(:to_int).and_return(nil)
 
-        -> { Process.setrlimit(obj, @limit, @max) }.should raise_error(TypeError)
+        -> { Process.setrlimit(obj, @limit, @max) }.should.raise(TypeError)
       end
 
       it "calls #to_int to convert the soft limit to an Integer" do
-        Process.setrlimit(@resource, mock_int(@limit), @max).should be_nil
+        Process.setrlimit(@resource, mock_int(@limit), @max).should == nil
       end
 
       it "raises a TypeError if #to_int for resource does not return an Integer" do
         obj = mock("process getrlimit integer")
         obj.should_receive(:to_int).and_return(nil)
 
-        -> { Process.setrlimit(@resource, obj, @max) }.should raise_error(TypeError)
+        -> { Process.setrlimit(@resource, obj, @max) }.should.raise(TypeError)
       end
 
       it "calls #to_int to convert the hard limit to an Integer" do
-        Process.setrlimit(@resource, @limit, mock_int(@max)).should be_nil
+        Process.setrlimit(@resource, @limit, mock_int(@max)).should == nil
       end
 
       it "raises a TypeError if #to_int for resource does not return an Integer" do
         obj = mock("process getrlimit integer")
         obj.should_receive(:to_int).and_return(nil)
 
-        -> { Process.setrlimit(@resource, @limit, obj) }.should raise_error(TypeError)
+        -> { Process.setrlimit(@resource, @limit, obj) }.should.raise(TypeError)
       end
     end
 
     context "when passed a Symbol" do
       platform_is_not :openbsd do
         it "coerces :AS into RLIMIT_AS" do
-          Process.setrlimit(:AS, *Process.getrlimit(Process::RLIMIT_AS)).should be_nil
+          Process.setrlimit(:AS, *Process.getrlimit(Process::RLIMIT_AS)).should == nil
         end
       end
 
       it "coerces :CORE into RLIMIT_CORE" do
-        Process.setrlimit(:CORE, *Process.getrlimit(Process::RLIMIT_CORE)).should be_nil
+        Process.setrlimit(:CORE, *Process.getrlimit(Process::RLIMIT_CORE)).should == nil
       end
 
       it "coerces :CPU into RLIMIT_CPU" do
-        Process.setrlimit(:CPU, *Process.getrlimit(Process::RLIMIT_CPU)).should be_nil
+        Process.setrlimit(:CPU, *Process.getrlimit(Process::RLIMIT_CPU)).should == nil
       end
 
       it "coerces :DATA into RLIMIT_DATA" do
-        Process.setrlimit(:DATA, *Process.getrlimit(Process::RLIMIT_DATA)).should be_nil
+        Process.setrlimit(:DATA, *Process.getrlimit(Process::RLIMIT_DATA)).should == nil
       end
 
       it "coerces :FSIZE into RLIMIT_FSIZE" do
-        Process.setrlimit(:FSIZE, *Process.getrlimit(Process::RLIMIT_FSIZE)).should be_nil
+        Process.setrlimit(:FSIZE, *Process.getrlimit(Process::RLIMIT_FSIZE)).should == nil
       end
 
       it "coerces :NOFILE into RLIMIT_NOFILE" do
-        Process.setrlimit(:NOFILE, *Process.getrlimit(Process::RLIMIT_NOFILE)).should be_nil
+        Process.setrlimit(:NOFILE, *Process.getrlimit(Process::RLIMIT_NOFILE)).should == nil
       end
 
       it "coerces :STACK into RLIMIT_STACK" do
-        Process.setrlimit(:STACK, *Process.getrlimit(Process::RLIMIT_STACK)).should be_nil
+        Process.setrlimit(:STACK, *Process.getrlimit(Process::RLIMIT_STACK)).should == nil
       end
 
       platform_is_not :aix do
         it "coerces :MEMLOCK into RLIMIT_MEMLOCK" do
-          Process.setrlimit(:MEMLOCK, *Process.getrlimit(Process::RLIMIT_MEMLOCK)).should be_nil
+          Process.setrlimit(:MEMLOCK, *Process.getrlimit(Process::RLIMIT_MEMLOCK)).should == nil
         end
       end
 
       it "coerces :NPROC into RLIMIT_NPROC" do
-        Process.setrlimit(:NPROC, *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
+        Process.setrlimit(:NPROC, *Process.getrlimit(Process::RLIMIT_NPROC)).should == nil
       end
 
       it "coerces :RSS into RLIMIT_RSS" do
-        Process.setrlimit(:RSS, *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
+        Process.setrlimit(:RSS, *Process.getrlimit(Process::RLIMIT_RSS)).should == nil
       end
 
       platform_is :netbsd, :freebsd do
         it "coerces :SBSIZE into RLIMIT_SBSIZE" do
-          Process.setrlimit(:SBSIZE, *Process.getrlimit(Process::RLIMIT_SBSIZE)).should be_nil
+          Process.setrlimit(:SBSIZE, *Process.getrlimit(Process::RLIMIT_SBSIZE)).should == nil
         end
       end
 
       platform_is :linux do
         it "coerces :RTPRIO into RLIMIT_RTPRIO" do
-          Process.setrlimit(:RTPRIO, *Process.getrlimit(Process::RLIMIT_RTPRIO)).should be_nil
+          Process.setrlimit(:RTPRIO, *Process.getrlimit(Process::RLIMIT_RTPRIO)).should == nil
         end
 
         guard -> { defined?(Process::RLIMIT_RTTIME) } do
           it "coerces :RTTIME into RLIMIT_RTTIME" do
-            Process.setrlimit(:RTTIME, *Process.getrlimit(Process::RLIMIT_RTTIME)).should be_nil
+            Process.setrlimit(:RTTIME, *Process.getrlimit(Process::RLIMIT_RTTIME)).should == nil
           end
         end
 
         it "coerces :SIGPENDING into RLIMIT_SIGPENDING" do
-          Process.setrlimit(:SIGPENDING, *Process.getrlimit(Process::RLIMIT_SIGPENDING)).should be_nil
+          Process.setrlimit(:SIGPENDING, *Process.getrlimit(Process::RLIMIT_SIGPENDING)).should == nil
         end
 
         it "coerces :MSGQUEUE into RLIMIT_MSGQUEUE" do
-          Process.setrlimit(:MSGQUEUE, *Process.getrlimit(Process::RLIMIT_MSGQUEUE)).should be_nil
+          Process.setrlimit(:MSGQUEUE, *Process.getrlimit(Process::RLIMIT_MSGQUEUE)).should == nil
         end
 
         it "coerces :NICE into RLIMIT_NICE" do
-          Process.setrlimit(:NICE, *Process.getrlimit(Process::RLIMIT_NICE)).should be_nil
+          Process.setrlimit(:NICE, *Process.getrlimit(Process::RLIMIT_NICE)).should == nil
         end
       end
 
       it "raises ArgumentError when passed an unknown resource" do
-        -> { Process.setrlimit(:FOO, 1, 1) }.should raise_error(ArgumentError)
+        -> { Process.setrlimit(:FOO, 1, 1) }.should.raise(ArgumentError)
       end
     end
 
     context "when passed a String" do
       platform_is_not :openbsd do
         it "coerces 'AS' into RLIMIT_AS" do
-          Process.setrlimit("AS", *Process.getrlimit(Process::RLIMIT_AS)).should be_nil
+          Process.setrlimit("AS", *Process.getrlimit(Process::RLIMIT_AS)).should == nil
         end
       end
 
       it "coerces 'CORE' into RLIMIT_CORE" do
-        Process.setrlimit("CORE", *Process.getrlimit(Process::RLIMIT_CORE)).should be_nil
+        Process.setrlimit("CORE", *Process.getrlimit(Process::RLIMIT_CORE)).should == nil
       end
 
       it "coerces 'CPU' into RLIMIT_CPU" do
-        Process.setrlimit("CPU", *Process.getrlimit(Process::RLIMIT_CPU)).should be_nil
+        Process.setrlimit("CPU", *Process.getrlimit(Process::RLIMIT_CPU)).should == nil
       end
 
       it "coerces 'DATA' into RLIMIT_DATA" do
-        Process.setrlimit("DATA", *Process.getrlimit(Process::RLIMIT_DATA)).should be_nil
+        Process.setrlimit("DATA", *Process.getrlimit(Process::RLIMIT_DATA)).should == nil
       end
 
       it "coerces 'FSIZE' into RLIMIT_FSIZE" do
-        Process.setrlimit("FSIZE", *Process.getrlimit(Process::RLIMIT_FSIZE)).should be_nil
+        Process.setrlimit("FSIZE", *Process.getrlimit(Process::RLIMIT_FSIZE)).should == nil
       end
 
       it "coerces 'NOFILE' into RLIMIT_NOFILE" do
-        Process.setrlimit("NOFILE", *Process.getrlimit(Process::RLIMIT_NOFILE)).should be_nil
+        Process.setrlimit("NOFILE", *Process.getrlimit(Process::RLIMIT_NOFILE)).should == nil
       end
 
       it "coerces 'STACK' into RLIMIT_STACK" do
-        Process.setrlimit("STACK", *Process.getrlimit(Process::RLIMIT_STACK)).should be_nil
+        Process.setrlimit("STACK", *Process.getrlimit(Process::RLIMIT_STACK)).should == nil
       end
 
       platform_is_not :aix do
         it "coerces 'MEMLOCK' into RLIMIT_MEMLOCK" do
-          Process.setrlimit("MEMLOCK", *Process.getrlimit(Process::RLIMIT_MEMLOCK)).should be_nil
+          Process.setrlimit("MEMLOCK", *Process.getrlimit(Process::RLIMIT_MEMLOCK)).should == nil
         end
       end
 
       it "coerces 'NPROC' into RLIMIT_NPROC" do
-        Process.setrlimit("NPROC", *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
+        Process.setrlimit("NPROC", *Process.getrlimit(Process::RLIMIT_NPROC)).should == nil
       end
 
       it "coerces 'RSS' into RLIMIT_RSS" do
-        Process.setrlimit("RSS", *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
+        Process.setrlimit("RSS", *Process.getrlimit(Process::RLIMIT_RSS)).should == nil
       end
 
       platform_is :netbsd, :freebsd do
         it "coerces 'SBSIZE' into RLIMIT_SBSIZE" do
-          Process.setrlimit("SBSIZE", *Process.getrlimit(Process::RLIMIT_SBSIZE)).should be_nil
+          Process.setrlimit("SBSIZE", *Process.getrlimit(Process::RLIMIT_SBSIZE)).should == nil
         end
       end
 
       platform_is :linux do
         it "coerces 'RTPRIO' into RLIMIT_RTPRIO" do
-          Process.setrlimit("RTPRIO", *Process.getrlimit(Process::RLIMIT_RTPRIO)).should be_nil
+          Process.setrlimit("RTPRIO", *Process.getrlimit(Process::RLIMIT_RTPRIO)).should == nil
         end
 
         guard -> { defined?(Process::RLIMIT_RTTIME) } do
           it "coerces 'RTTIME' into RLIMIT_RTTIME" do
-            Process.setrlimit("RTTIME", *Process.getrlimit(Process::RLIMIT_RTTIME)).should be_nil
+            Process.setrlimit("RTTIME", *Process.getrlimit(Process::RLIMIT_RTTIME)).should == nil
           end
         end
 
         it "coerces 'SIGPENDING' into RLIMIT_SIGPENDING" do
-          Process.setrlimit("SIGPENDING", *Process.getrlimit(Process::RLIMIT_SIGPENDING)).should be_nil
+          Process.setrlimit("SIGPENDING", *Process.getrlimit(Process::RLIMIT_SIGPENDING)).should == nil
         end
 
         it "coerces 'MSGQUEUE' into RLIMIT_MSGQUEUE" do
-          Process.setrlimit("MSGQUEUE", *Process.getrlimit(Process::RLIMIT_MSGQUEUE)).should be_nil
+          Process.setrlimit("MSGQUEUE", *Process.getrlimit(Process::RLIMIT_MSGQUEUE)).should == nil
         end
 
         it "coerces 'NICE' into RLIMIT_NICE" do
-          Process.setrlimit("NICE", *Process.getrlimit(Process::RLIMIT_NICE)).should be_nil
+          Process.setrlimit("NICE", *Process.getrlimit(Process::RLIMIT_NICE)).should == nil
         end
       end
 
       it "raises ArgumentError when passed an unknown resource" do
-        -> { Process.setrlimit("FOO", 1, 1) }.should raise_error(ArgumentError)
+        -> { Process.setrlimit("FOO", 1, 1) }.should.raise(ArgumentError)
       end
     end
 
@@ -213,7 +213,7 @@
         obj.should_receive(:to_str).and_return("CORE")
         obj.should_not_receive(:to_int)
 
-        Process.setrlimit(obj, @limit, @max).should be_nil
+        Process.setrlimit(obj, @limit, @max).should == nil
       end
 
       it "calls #to_int if #to_str does not return a String" do
@@ -221,17 +221,17 @@
         obj.should_receive(:to_str).and_return(nil)
         obj.should_receive(:to_int).and_return(@resource)
 
-        Process.setrlimit(obj, @limit, @max).should be_nil
+        Process.setrlimit(obj, @limit, @max).should == nil
       end
     end
   end
 
   platform_is :windows do
     it "is not implemented" do
-      Process.respond_to?(:setrlimit).should be_false
+      Process.respond_to?(:setrlimit).should == false
       -> do
         Process.setrlimit(nil, nil)
-      end.should raise_error NotImplementedError
+      end.should.raise NotImplementedError
     end
   end
 end
diff --git a/spec/ruby/core/process/spawn_spec.rb b/spec/ruby/core/process/spawn_spec.rb
index 283a7f033dc..fb619dce427 100644
--- a/spec/ruby/core/process/spawn_spec.rb
+++ b/spec/ruby/core/process/spawn_spec.rb
@@ -51,7 +51,7 @@
   it "returns the process ID of the new process as an Integer" do
     pid = Process.spawn(*ruby_exe, "-e", "exit")
     Process.wait pid
-    pid.should be_an_instance_of(Integer)
+    pid.should.instance_of?(Integer)
   end
 
   it "returns immediately" do
@@ -93,11 +93,11 @@
     end
 
     it "raises an ArgumentError if the command includes a null byte" do
-      -> { Process.spawn "\000" }.should raise_error(ArgumentError)
+      -> { Process.spawn "\000" }.should.raise(ArgumentError)
     end
 
     it "raises a TypeError if the argument does not respond to #to_str" do
-      -> { Process.spawn :echo }.should raise_error(TypeError)
+      -> { Process.spawn :echo }.should.raise(TypeError)
     end
   end
 
@@ -122,11 +122,11 @@
     end
 
     it "raises an ArgumentError if an argument includes a null byte" do
-      -> { Process.spawn "echo", "\000" }.should raise_error(ArgumentError)
+      -> { Process.spawn "echo", "\000" }.should.raise(ArgumentError)
     end
 
     it "raises a TypeError if an argument does not respond to #to_str" do
-      -> { Process.spawn "echo", :foo }.should raise_error(TypeError)
+      -> { Process.spawn "echo", :foo }.should.raise(TypeError)
     end
   end
 
@@ -178,19 +178,19 @@
     end
 
     it "raises an ArgumentError if the Array does not have exactly two elements" do
-      -> { Process.spawn([]) }.should raise_error(ArgumentError)
-      -> { Process.spawn([:a]) }.should raise_error(ArgumentError)
-      -> { Process.spawn([:a, :b, :c]) }.should raise_error(ArgumentError)
+      -> { Process.spawn([]) }.should.raise(ArgumentError)
+      -> { Process.spawn([:a]) }.should.raise(ArgumentError)
+      -> { Process.spawn([:a, :b, :c]) }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError if the Strings in the Array include a null byte" do
-      -> { Process.spawn ["\000", "echo"] }.should raise_error(ArgumentError)
-      -> { Process.spawn ["echo", "\000"] }.should raise_error(ArgumentError)
+      -> { Process.spawn ["\000", "echo"] }.should.raise(ArgumentError)
+      -> { Process.spawn ["echo", "\000"] }.should.raise(ArgumentError)
     end
 
     it "raises a TypeError if an element in the Array does not respond to #to_str" do
-      -> { Process.spawn ["echo", :echo] }.should raise_error(TypeError)
-      -> { Process.spawn [:echo, "echo"] }.should raise_error(TypeError)
+      -> { Process.spawn ["echo", :echo] }.should.raise(TypeError)
+      -> { Process.spawn [:echo, "echo"] }.should.raise(TypeError)
     end
   end
 
@@ -256,19 +256,19 @@
   it "raises an ArgumentError if an environment key includes an equals sign" do
     -> do
       Process.spawn({"FOO=" => "BAR"}, "echo #{@var}>#{@name}")
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if an environment key includes a null byte" do
     -> do
       Process.spawn({"\000" => "BAR"}, "echo #{@var}>#{@name}")
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if an environment value includes a null byte" do
     -> do
       Process.spawn({"FOO" => "\000"}, "echo #{@var}>#{@name}")
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   # :unsetenv_others
@@ -285,7 +285,7 @@
     it "unsets other environment variables when given a true :unsetenv_others option" do
       ENV["FOO"] = "BAR"
       Process.wait Process.spawn(*@common_env_spawn_args, unsetenv_others: true)
-      $?.success?.should be_true
+      $?.success?.should == true
       File.read(@name).should == "\n"
     end
   end
@@ -293,7 +293,7 @@
   it "does not unset other environment variables when given a false :unsetenv_others option" do
     ENV["FOO"] = "BAR"
     Process.wait Process.spawn(*@common_env_spawn_args, unsetenv_others: false)
-    $?.success?.should be_true
+    $?.success?.should == true
     File.read(@name).should == "BAR\n"
   end
 
@@ -301,7 +301,7 @@
     it "does not unset environment variables included in the environment hash" do
       env = @minimal_env.merge({"FOO" => "BAR"})
       Process.wait Process.spawn(env, "echo #{@var}>#{@name}", unsetenv_others: true)
-      $?.success?.should be_true
+      $?.success?.should == true
       File.read(@name).should == "BAR\n"
     end
   end
@@ -363,17 +363,17 @@
     end
 
     it "raises an ArgumentError if given a negative :pgroup option" do
-      -> { Process.spawn("echo", pgroup: -1) }.should raise_error(ArgumentError)
+      -> { Process.spawn("echo", pgroup: -1) }.should.raise(ArgumentError)
     end
 
     it "raises a TypeError if given a symbol as :pgroup option" do
-      -> { Process.spawn("echo", pgroup: :true) }.should raise_error(TypeError)
+      -> { Process.spawn("echo", pgroup: :true) }.should.raise(TypeError)
     end
   end
 
   platform_is :windows do
     it "raises an ArgumentError if given :pgroup option" do
-      -> { Process.spawn("echo", pgroup: false) }.should raise_error(ArgumentError)
+      -> { Process.spawn("echo", pgroup: false) }.should.raise(ArgumentError)
     end
   end
 
@@ -452,7 +452,7 @@ def child_pids(pid)
           children.each do |child|
             -> do
               Process.kill("TERM", child)
-            end.should raise_error(Errno::ESRCH)
+            end.should.raise(Errno::ESRCH)
           end
         end
       end
@@ -678,53 +678,93 @@ def child_pids(pid)
   # error handling
 
   it "raises an ArgumentError if passed no command arguments" do
-    -> { Process.spawn }.should raise_error(ArgumentError)
+    -> { Process.spawn }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if passed env or options but no command arguments" do
-    -> { Process.spawn({}) }.should raise_error(ArgumentError)
+    -> { Process.spawn({}) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if passed env and options but no command arguments" do
-    -> { Process.spawn({}, {}) }.should raise_error(ArgumentError)
+    -> { Process.spawn({}, {}) }.should.raise(ArgumentError)
   end
 
   it "raises an Errno::ENOENT for an empty string" do
-    -> { Process.spawn "" }.should raise_error(Errno::ENOENT)
+    -> { Process.spawn "" }.should.raise(Errno::ENOENT)
   end
 
   it "raises an Errno::ENOENT if the command does not exist" do
-    -> { Process.spawn "nonesuch" }.should raise_error(Errno::ENOENT)
+    -> { Process.spawn "nonesuch" }.should.raise(Errno::ENOENT, "No such file or directory - nonesuch")
+  end
+
+  it "sets $? to exit status 127 when the command does not exist" do
+    Process.spawn("nonesuch") rescue nil
+    $?.exitstatus.should == 127
+  end
+
+  it "raises an Errno::ENOENT if the file does not exist" do
+    -> { Process.spawn "./nonesuch" }.should.raise(Errno::ENOENT, "No such file or directory - ./nonesuch")
+  end
+
+  it "sets $? to exit status 127 when the file does not exist" do
+    Process.spawn("./nonesuch") rescue nil
+    $?.exitstatus.should == 127
+  end
+
+  platform_is_not :windows do
+    it "raises an Errno::EACCES when the path is a directory" do
+      -> { Process.spawn "./" }.should.raise(Errno::EACCES, "Permission denied - ./")
+    end
   end
 
   unless File.executable?(__FILE__) # Some FS (e.g. vboxfs) locate all files executable
     platform_is_not :windows do
       it "raises an Errno::EACCES when the file does not have execute permissions" do
-        -> { Process.spawn __FILE__ }.should raise_error(Errno::EACCES)
+        -> { Process.spawn __FILE__ }.should.raise(Errno::EACCES, "Permission denied - #{__FILE__}")
+      end
+
+      it "sets $? to exit status 127 when the file does not have execute permissions" do
+        Process.spawn(__FILE__) rescue nil
+        $?.exitstatus.should == 127
+      end
+
+      it "raises an Errno::ENOENT when a non-executable file is found in PATH" do
+        dir = tmp("spawn_path_non_executable_dir")
+        mkdir_p dir
+        begin
+          exe = 'process-spawn-non-executable-in-path'
+          File.write("#{dir}/#{exe}", "#!/bin/sh\necho hi")
+          File.chmod(0644, "#{dir}/#{exe}")
+          env = { "PATH" => "#{dir}#{File::PATH_SEPARATOR}#{ENV['PATH']}" }
+          -> { Process.spawn(env, exe) }.should.raise(Errno::ENOENT, "No such file or directory - #{exe}")
+          $?.exitstatus.should == 127
+        ensure
+          rm_r dir
+        end
       end
     end
 
     platform_is :windows do
       it "raises Errno::EACCES or Errno::ENOEXEC when the file is not an executable file" do
-        -> { Process.spawn __FILE__ }.should raise_error(SystemCallError) { |e|
-          [Errno::EACCES, Errno::ENOEXEC].should include(e.class)
+        -> { Process.spawn __FILE__ }.should.raise(SystemCallError) { |e|
+          [Errno::EACCES, Errno::ENOEXEC].should.include?(e.class)
         }
       end
     end
   end
 
   it "raises an Errno::EACCES or Errno::EISDIR when passed a directory" do
-    -> { Process.spawn __dir__ }.should raise_error(SystemCallError) { |e|
-      [Errno::EACCES, Errno::EISDIR].should include(e.class)
+    -> { Process.spawn __dir__ }.should.raise(SystemCallError) { |e|
+      [Errno::EACCES, Errno::EISDIR].should.include?(e.class)
     }
   end
 
   it "raises an ArgumentError when passed a string key in options" do
-    -> { Process.spawn("echo", "chdir" => Dir.pwd) }.should raise_error(ArgumentError)
+    -> { Process.spawn("echo", "chdir" => Dir.pwd) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when passed an unknown option key" do
-    -> { Process.spawn("echo", nonesuch: :foo) }.should raise_error(ArgumentError)
+    -> { Process.spawn("echo", nonesuch: :foo) }.should.raise(ArgumentError)
   end
 
   platform_is_not :windows, :aix do
diff --git a/spec/ruby/core/process/status/bit_and_spec.rb b/spec/ruby/core/process/status/bit_and_spec.rb
index 9fd1425a976..a5b1123e907 100644
--- a/spec/ruby/core/process/status/bit_and_spec.rb
+++ b/spec/ruby/core/process/status/bit_and_spec.rb
@@ -23,7 +23,7 @@
           ruby_exe("exit(0)")
           -> {
             $? & -1
-          }.should raise_error(ArgumentError, 'negative mask value: -1')
+          }.should.raise(ArgumentError, 'negative mask value: -1')
         end
       end
 
diff --git a/spec/ruby/core/process/status/exited_spec.rb b/spec/ruby/core/process/status/exited_spec.rb
index a61292b146a..ad14b35000d 100644
--- a/spec/ruby/core/process/status/exited_spec.rb
+++ b/spec/ruby/core/process/status/exited_spec.rb
@@ -7,7 +7,7 @@
     end
 
     it "returns true" do
-      $?.exited?.should be_true
+      $?.exited?.should == true
     end
   end
 
@@ -19,13 +19,13 @@
 
     platform_is_not :windows do
       it "returns false" do
-        $?.exited?.should be_false
+        $?.exited?.should == false
       end
     end
 
     platform_is :windows do
       it "always returns true" do
-        $?.exited?.should be_true
+        $?.exited?.should == true
       end
     end
   end
diff --git a/spec/ruby/core/process/status/right_shift_spec.rb b/spec/ruby/core/process/status/right_shift_spec.rb
index 3eaedf50550..5689526f547 100644
--- a/spec/ruby/core/process/status/right_shift_spec.rb
+++ b/spec/ruby/core/process/status/right_shift_spec.rb
@@ -22,7 +22,7 @@
           ruby_exe("exit(0)")
           -> {
             $? >> -1
-          }.should raise_error(ArgumentError, 'negative shift value: -1')
+          }.should.raise(ArgumentError, 'negative shift value: -1')
         end
       end
 
diff --git a/spec/ruby/core/process/status/signaled_spec.rb b/spec/ruby/core/process/status/signaled_spec.rb
index c0de7b8006e..8cf409bb42b 100644
--- a/spec/ruby/core/process/status/signaled_spec.rb
+++ b/spec/ruby/core/process/status/signaled_spec.rb
@@ -7,7 +7,7 @@
     end
 
     it "returns false" do
-      $?.signaled?.should be_false
+      $?.signaled?.should == false
     end
   end
 
@@ -18,13 +18,13 @@
 
     platform_is_not :windows do
       it "returns true" do
-        $?.signaled?.should be_true
+        $?.signaled?.should == true
       end
     end
 
     platform_is :windows do
       it "always returns false" do
-        $?.signaled?.should be_false
+        $?.signaled?.should == false
       end
     end
   end
diff --git a/spec/ruby/core/process/status/success_spec.rb b/spec/ruby/core/process/status/success_spec.rb
index 3589cc611f0..f61243c6670 100644
--- a/spec/ruby/core/process/status/success_spec.rb
+++ b/spec/ruby/core/process/status/success_spec.rb
@@ -7,7 +7,7 @@
     end
 
     it "returns true" do
-      $?.success?.should be_true
+      $?.success?.should == true
     end
   end
 
@@ -17,7 +17,7 @@
     end
 
     it "returns false" do
-      $?.success?.should be_false
+      $?.success?.should == false
     end
   end
 
@@ -28,13 +28,13 @@
 
     platform_is_not :windows do
       it "returns nil" do
-        $?.success?.should be_nil
+        $?.success?.should == nil
       end
     end
 
     platform_is :windows do
       it "always returns true" do
-        $?.success?.should be_true
+        $?.success?.should == true
       end
     end
   end
diff --git a/spec/ruby/core/process/status/termsig_spec.rb b/spec/ruby/core/process/status/termsig_spec.rb
index 9a22dbea718..1d57724d120 100644
--- a/spec/ruby/core/process/status/termsig_spec.rb
+++ b/spec/ruby/core/process/status/termsig_spec.rb
@@ -7,7 +7,7 @@
     end
 
     it "returns nil" do
-      $?.termsig.should be_nil
+      $?.termsig.should == nil
     end
   end
 
@@ -36,7 +36,7 @@
 
     platform_is :windows do
       it "always returns nil" do
-        $?.termsig.should be_nil
+        $?.termsig.should == nil
       end
     end
   end
diff --git a/spec/ruby/core/process/status/to_i_spec.rb b/spec/ruby/core/process/status/to_i_spec.rb
index 39f8e2d84c0..0bfb883d230 100644
--- a/spec/ruby/core/process/status/to_i_spec.rb
+++ b/spec/ruby/core/process/status/to_i_spec.rb
@@ -3,11 +3,11 @@
 describe "Process::Status#to_i" do
   it "returns an integer when the child exits" do
     ruby_exe('exit 48', exit_status: 48)
-    $?.to_i.should be_an_instance_of(Integer)
+    $?.to_i.should.instance_of?(Integer)
   end
 
   it "returns an integer when the child is signaled" do
     ruby_exe('raise SignalException, "TERM"', exit_status: platform_is(:windows) ? 3 : :SIGTERM)
-    $?.to_i.should be_an_instance_of(Integer)
+    $?.to_i.should.instance_of?(Integer)
   end
 end
diff --git a/spec/ruby/core/process/status/wait_spec.rb b/spec/ruby/core/process/status/wait_spec.rb
index 57d56209a9e..18ecc14f6fa 100644
--- a/spec/ruby/core/process/status/wait_spec.rb
+++ b/spec/ruby/core/process/status/wait_spec.rb
@@ -21,14 +21,14 @@
     it "returns a status with its child pid" do
       pid = Process.spawn(ruby_cmd('exit'))
       status = Process::Status.wait
-      status.should be_an_instance_of(Process::Status)
+      status.should.instance_of?(Process::Status)
       status.pid.should == pid
     end
 
     it "should not set $? to the Process::Status" do
       pid = Process.spawn(ruby_cmd('exit'))
       status = Process::Status.wait
-      $?.should_not equal(status)
+      $?.should_not.equal?(status)
     end
 
     it "should not change the value of $?" do
@@ -36,13 +36,13 @@
       Process.wait
       status = $?
       Process::Status.wait
-      status.should equal($?)
+      status.should.equal?($?)
     end
 
     it "waits for any child process if no pid is given" do
       pid = Process.spawn(ruby_cmd('exit'))
       Process::Status.wait.pid.should == pid
-      -> { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid) }.should.raise(Errno::ESRCH)
     end
 
     it "waits for a specific child if a pid is given" do
@@ -50,14 +50,14 @@
       pid2 = Process.spawn(ruby_cmd('exit'))
       Process::Status.wait(pid2).pid.should == pid2
       Process::Status.wait(pid1).pid.should == pid1
-      -> { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
-      -> { Process.kill(0, pid2) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid1) }.should.raise(Errno::ESRCH)
+      -> { Process.kill(0, pid2) }.should.raise(Errno::ESRCH)
     end
 
     it "coerces the pid to an Integer" do
       pid1 = Process.spawn(ruby_cmd('exit'))
       Process::Status.wait(mock_int(pid1)).pid.should == pid1
-      -> { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid1) }.should.raise(Errno::ESRCH)
     end
 
     # This spec is probably system-dependent.
@@ -80,7 +80,7 @@
         sleep
       end
 
-      Process::Status.wait(pid, Process::WNOHANG).should be_nil
+      Process::Status.wait(pid, Process::WNOHANG).should == nil
 
       # wait for the child to setup its TERM handler
       write.close
@@ -94,7 +94,7 @@
     it "always accepts flags=0" do
       pid = Process.spawn(ruby_cmd('exit'))
       Process::Status.wait(-1, 0).pid.should == pid
-      -> { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid) }.should.raise(Errno::ESRCH)
     end
   end
 end
diff --git a/spec/ruby/core/process/times_spec.rb b/spec/ruby/core/process/times_spec.rb
index d3bff2cda9f..a7ffbb79e57 100644
--- a/spec/ruby/core/process/times_spec.rb
+++ b/spec/ruby/core/process/times_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Process.times" do
   it "returns a Process::Tms" do
-    Process.times.should be_kind_of(Process::Tms)
+    Process.times.should.is_a?(Process::Tms)
   end
 
   # TODO: Intel C Compiler does not work this example
diff --git a/spec/ruby/core/process/uid_spec.rb b/spec/ruby/core/process/uid_spec.rb
index a068b1a2c1a..1e218ef4fe5 100644
--- a/spec/ruby/core/process/uid_spec.rb
+++ b/spec/ruby/core/process/uid_spec.rb
@@ -20,16 +20,16 @@
 describe "Process.uid=" do
   platform_is_not :windows do
     it "raises TypeError if not passed an Integer" do
-      -> { Process.uid = Object.new }.should raise_error(TypeError)
+      -> { Process.uid = Object.new }.should.raise(TypeError)
     end
 
     as_user do
       it "raises Errno::ERPERM if run by a non privileged user trying to set the superuser id" do
-        -> { (Process.uid = 0)}.should raise_error(Errno::EPERM)
+        -> { (Process.uid = 0)}.should.raise(Errno::EPERM)
       end
 
       it "raises Errno::ERPERM if run by a non privileged user trying to set the superuser id from username" do
-        -> { Process.uid = "root" }.should raise_error(Errno::EPERM)
+        -> { Process.uid = "root" }.should.raise(Errno::EPERM)
       end
     end
 
diff --git a/spec/ruby/core/process/wait2_spec.rb b/spec/ruby/core/process/wait2_spec.rb
index 8ba429dc96b..5c57dd40fb7 100644
--- a/spec/ruby/core/process/wait2_spec.rb
+++ b/spec/ruby/core/process/wait2_spec.rb
@@ -12,7 +12,7 @@
       leaked = Process.waitall
       $stderr.puts "leaked before wait2 specs: #{leaked}" unless leaked.empty?
       # Ruby-space should not see PIDs used by rjit
-      leaked.should be_empty
+      leaked.should.empty?
     rescue Errno::ECHILD # No child processes
     rescue NotImplementedError
     end
@@ -30,15 +30,15 @@
   end
 
   it "raises a StandardError if no child processes exist" do
-    -> { Process.wait2 }.should raise_error(Errno::ECHILD)
-    -> { Process.wait2 }.should raise_error(StandardError)
+    -> { Process.wait2 }.should.raise(Errno::ECHILD)
+    -> { Process.wait2 }.should.raise(StandardError)
   end
 
   it "returns nil if the child process is still running when given the WNOHANG flag" do
     IO.popen(ruby_cmd('STDIN.getbyte'), "w") do |io|
       pid, status = Process.wait2(io.pid, Process::WNOHANG)
-      pid.should be_nil
-      status.should be_nil
+      pid.should == nil
+      status.should == nil
       io.write('a')
     end
   end
diff --git a/spec/ruby/core/process/wait_spec.rb b/spec/ruby/core/process/wait_spec.rb
index 385acc99285..0b2e715f65d 100644
--- a/spec/ruby/core/process/wait_spec.rb
+++ b/spec/ruby/core/process/wait_spec.rb
@@ -14,7 +14,7 @@
   end
 
   it "raises an Errno::ECHILD if there are no child processes" do
-    -> { Process.wait }.should raise_error(Errno::ECHILD)
+    -> { Process.wait }.should.raise(Errno::ECHILD)
   end
 
   platform_is_not :windows do
@@ -26,14 +26,14 @@
     it "sets $? to a Process::Status" do
       pid = Process.spawn(ruby_cmd('exit'))
       Process.wait
-      $?.should be_kind_of(Process::Status)
+      $?.should.is_a?(Process::Status)
       $?.pid.should == pid
     end
 
     it "waits for any child process if no pid is given" do
       pid = Process.spawn(ruby_cmd('exit'))
       Process.wait.should == pid
-      -> { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid) }.should.raise(Errno::ESRCH)
     end
 
     it "waits for a specific child if a pid is given" do
@@ -41,14 +41,14 @@
       pid2 = Process.spawn(ruby_cmd('exit'))
       Process.wait(pid2).should == pid2
       Process.wait(pid1).should == pid1
-      -> { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
-      -> { Process.kill(0, pid2) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid1) }.should.raise(Errno::ESRCH)
+      -> { Process.kill(0, pid2) }.should.raise(Errno::ESRCH)
     end
 
     it "coerces the pid to an Integer" do
       pid1 = Process.spawn(ruby_cmd('exit'))
       Process.wait(mock_int(pid1)).should == pid1
-      -> { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid1) }.should.raise(Errno::ESRCH)
     end
 
     # This spec is probably system-dependent.
@@ -71,7 +71,7 @@
         sleep
       end
 
-      Process.wait(pid, Process::WNOHANG).should be_nil
+      Process.wait(pid, Process::WNOHANG).should == nil
 
       # wait for the child to setup its TERM handler
       write.close
@@ -85,7 +85,7 @@
     it "always accepts flags=0" do
       pid = Process.spawn(ruby_cmd('exit'))
       Process.wait(-1, 0).should == pid
-      -> { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid) }.should.raise(Errno::ESRCH)
     end
   end
 end
diff --git a/spec/ruby/core/process/waitall_spec.rb b/spec/ruby/core/process/waitall_spec.rb
index 6cf4e32bc90..a77873f553c 100644
--- a/spec/ruby/core/process/waitall_spec.rb
+++ b/spec/ruby/core/process/waitall_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it "takes no arguments" do
-    -> { Process.waitall(0) }.should raise_error(ArgumentError)
+    -> { Process.waitall(0) }.should.raise(ArgumentError)
   end
 
   platform_is_not :windows do
@@ -24,7 +24,7 @@
       pids << Process.fork { Process.exit! 0 }
       Process.waitall
       pids.each { |pid|
-        -> { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+        -> { Process.kill(0, pid) }.should.raise(Errno::ESRCH)
       }
     end
 
@@ -34,14 +34,14 @@
       pids << Process.fork { Process.exit! 1 }
       pids << Process.fork { Process.exit! 0 }
       a = Process.waitall
-      a.should be_kind_of(Array)
+      a.should.is_a?(Array)
       a.size.should == 3
       pids.each { |pid|
         pid_status = a.assoc(pid)
-        pid_status.should be_kind_of(Array)
+        pid_status.should.is_a?(Array)
         pid_status.size.should == 2
         pid_status.first.should == pid
-        pid_status.last.should be_kind_of(Process::Status)
+        pid_status.last.should.is_a?(Process::Status)
       }
     end
   end
diff --git a/spec/ruby/core/queue/initialize_spec.rb b/spec/ruby/core/queue/initialize_spec.rb
index 592fbe24870..080e4d0abd7 100644
--- a/spec/ruby/core/queue/initialize_spec.rb
+++ b/spec/ruby/core/queue/initialize_spec.rb
@@ -35,26 +35,26 @@
     end
 
     it "raises a TypeError if the given argument can't be converted to an Array" do
-      -> { Queue.new(42) }.should raise_error(TypeError)
-      -> { Queue.new(:abc) }.should raise_error(TypeError)
+      -> { Queue.new(42) }.should.raise(TypeError)
+      -> { Queue.new(:abc) }.should.raise(TypeError)
     end
 
     it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to an Array" do
       enumerable = MockObject.new('mock-enumerable')
       enumerable.should_receive(:to_a).and_raise(NoMethodError)
-      -> { Queue.new(enumerable) }.should raise_error(NoMethodError)
+      -> { Queue.new(enumerable) }.should.raise(NoMethodError)
     end
   end
 
   it "raises TypeError if the provided Enumerable does not respond to #to_a" do
     enumerable = MockObject.new('mock-enumerable')
-    -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject into Array")
+    -> { Queue.new(enumerable) }.should.raise(TypeError, "can't convert MockObject into Array")
   end
 
   it "raises TypeError if #to_a does not return Array" do
     enumerable = MockObject.new('mock-enumerable')
     enumerable.should_receive(:to_a).and_return("string")
 
-    -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject to Array (MockObject#to_a gives String)")
+    -> { Queue.new(enumerable) }.should raise_consistent_error(TypeError, "can't convert MockObject into Array (MockObject#to_a gives String)")
   end
 end
diff --git a/spec/ruby/core/random/new_seed_spec.rb b/spec/ruby/core/random/new_seed_spec.rb
index 7a93da99aa0..b2741aaa31e 100644
--- a/spec/ruby/core/random/new_seed_spec.rb
+++ b/spec/ruby/core/random/new_seed_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Random.new_seed" do
   it "returns an Integer" do
-    Random.new_seed.should be_an_instance_of(Integer)
+    Random.new_seed.should.instance_of?(Integer)
   end
 
   it "returns an arbitrary seed value each time" do
diff --git a/spec/ruby/core/random/new_spec.rb b/spec/ruby/core/random/new_spec.rb
index 69210cef03b..e20d4871372 100644
--- a/spec/ruby/core/random/new_spec.rb
+++ b/spec/ruby/core/random/new_spec.rb
@@ -1,11 +1,11 @@
 require_relative "../../spec_helper"
 describe "Random.new" do
   it "returns a new instance of Random" do
-    Random.new.should be_an_instance_of(Random)
+    Random.new.should.instance_of?(Random)
   end
 
   it "uses a random seed value if none is supplied" do
-    Random.new.seed.should be_an_instance_of(Integer)
+    Random.new.seed.should.instance_of?(Integer)
   end
 
   it "returns Random instances initialized with different seeds" do
@@ -33,6 +33,6 @@
   it "raises a RangeError if passed a Complex (with imaginary part) seed value as an argument" do
     -> do
       Random.new(Complex(20,2))
-    end.should raise_error(RangeError)
+    end.should.raise(RangeError)
   end
 end
diff --git a/spec/ruby/core/random/rand_spec.rb b/spec/ruby/core/random/rand_spec.rb
index 9244177ab5a..c882db63811 100644
--- a/spec/ruby/core/random/rand_spec.rb
+++ b/spec/ruby/core/random/rand_spec.rb
@@ -45,13 +45,13 @@
   it "coerces arguments to Integers with #to_int" do
     obj = mock_numeric('int')
     obj.should_receive(:to_int).and_return(99)
-    Random.rand(obj).should be_kind_of(Integer)
+    Random.rand(obj).should.is_a?(Integer)
   end
 end
 
 describe "Random#rand with Fixnum" do
   it "returns an Integer" do
-    Random.new.rand(20).should be_an_instance_of(Integer)
+    Random.new.rand(20).should.instance_of?(Integer)
   end
 
   it "returns a Fixnum greater than or equal to 0" do
@@ -82,20 +82,20 @@
   it "raises an ArgumentError when the argument is 0" do
     -> do
       Random.new.rand(0)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the argument is negative" do
     -> do
       Random.new.rand(-12)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 end
 
 describe "Random#rand with Bignum" do
   it "typically returns a Bignum" do
     rnd = Random.new(1)
-    10.times.map{ rnd.rand(bignum_value*2) }.max.should be_an_instance_of(Integer)
+    10.times.map{ rnd.rand(bignum_value*2) }.max.should.instance_of?(Integer)
   end
 
   it "returns a Bignum greater than or equal to 0" do
@@ -121,13 +121,13 @@
   it "raises an ArgumentError when the argument is negative" do
     -> do
       Random.new.rand(-bignum_value)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 end
 
 describe "Random#rand with Float" do
   it "returns a Float" do
-    Random.new.rand(20.43).should be_an_instance_of(Float)
+    Random.new.rand(20.43).should.instance_of?(Float)
   end
 
   it "returns a Float greater than or equal to 0.0" do
@@ -153,25 +153,25 @@
   it "raises an ArgumentError when the argument is negative" do
     -> do
       Random.new.rand(-1.234567)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 end
 
 describe "Random#rand with Range" do
   it "returns an element from the Range" do
-    Random.new.rand(20..43).should be_an_instance_of(Integer)
+    Random.new.rand(20..43).should.instance_of?(Integer)
   end
 
   it "supports custom object types" do
-    rand(RandomSpecs::CustomRangeInteger.new(1)..RandomSpecs::CustomRangeInteger.new(42)).should be_an_instance_of(RandomSpecs::CustomRangeInteger)
-    rand(RandomSpecs::CustomRangeFloat.new(1.0)..RandomSpecs::CustomRangeFloat.new(42.0)).should be_an_instance_of(RandomSpecs::CustomRangeFloat)
-    rand(Time.now..Time.now).should be_an_instance_of(Time)
+    rand(RandomSpecs::CustomRangeInteger.new(1)..RandomSpecs::CustomRangeInteger.new(42)).should.instance_of?(RandomSpecs::CustomRangeInteger)
+    rand(RandomSpecs::CustomRangeFloat.new(1.0)..RandomSpecs::CustomRangeFloat.new(42.0)).should.instance_of?(RandomSpecs::CustomRangeFloat)
+    rand(Time.now..Time.now).should.instance_of?(Time)
   end
 
   it "returns an object that is a member of the Range" do
     prng = Random.new
     r = 20..30
-    20.times { r.member?(prng.rand(r)).should be_true }
+    20.times { r.member?(prng.rand(r)).should == true }
   end
 
   it "works with inclusive ranges" do
@@ -201,8 +201,8 @@
   end
 
   it "considers Integers as Floats if one end point is a float" do
-    Random.new(42).rand(0.0..1).should be_kind_of(Float)
-    Random.new(42).rand(0..1.0).should be_kind_of(Float)
+    Random.new(42).rand(0.0..1).should.is_a?(Float)
+    Random.new(42).rand(0..1.0).should.is_a?(Float)
   end
 
   it "returns a float within a given float range" do
@@ -213,12 +213,12 @@
   it "raises an ArgumentError when the startpoint lacks #+ and #- methods" do
     -> do
       Random.new.rand(Object.new..67)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the endpoint lacks #+ and #- methods" do
     -> do
       Random.new.rand(68..Object.new)
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/random/seed_spec.rb b/spec/ruby/core/random/seed_spec.rb
index bf4524fdd9e..6529b2c8733 100644
--- a/spec/ruby/core/random/seed_spec.rb
+++ b/spec/ruby/core/random/seed_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Random#seed" do
   it "returns an Integer" do
-    Random.new.seed.should be_kind_of(Integer)
+    Random.new.seed.should.is_a?(Integer)
   end
 
   it "returns an arbitrary seed if the constructor was called without arguments" do
diff --git a/spec/ruby/core/random/shared/bytes.rb b/spec/ruby/core/random/shared/bytes.rb
index 9afad3b7f8f..86c64d56968 100644
--- a/spec/ruby/core/random/shared/bytes.rb
+++ b/spec/ruby/core/random/shared/bytes.rb
@@ -1,6 +1,6 @@
 describe :random_bytes, shared: true do
   it "returns a String" do
-    @object.send(@method, 1).should be_an_instance_of(String)
+    @object.send(@method, 1).should.instance_of?(String)
   end
 
   it "returns a String of the length given as argument" do
diff --git a/spec/ruby/core/random/shared/rand.rb b/spec/ruby/core/random/shared/rand.rb
index d3b24b88514..655c75c9f18 100644
--- a/spec/ruby/core/random/shared/rand.rb
+++ b/spec/ruby/core/random/shared/rand.rb
@@ -1,9 +1,9 @@
 describe :random_number, shared: true do
   it "returns a Float if no max argument is passed" do
-    @object.send(@method).should be_kind_of(Float)
+    @object.send(@method).should.is_a?(Float)
   end
 
   it "returns an Integer if an Integer argument is passed" do
-    @object.send(@method, 20).should be_kind_of(Integer)
+    @object.send(@method, 20).should.is_a?(Integer)
   end
 end
diff --git a/spec/ruby/core/random/urandom_spec.rb b/spec/ruby/core/random/urandom_spec.rb
index 6f180e54ac8..94e9423a063 100644
--- a/spec/ruby/core/random/urandom_spec.rb
+++ b/spec/ruby/core/random/urandom_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Random.urandom" do
   it "returns a String" do
-    Random.urandom(1).should be_an_instance_of(String)
+    Random.urandom(1).should.instance_of?(String)
   end
 
   it "returns a String of the length given as argument" do
@@ -12,7 +12,7 @@
   it "raises an ArgumentError on a negative size" do
     -> {
       Random.urandom(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "returns a binary String" do
diff --git a/spec/ruby/core/range/bsearch_spec.rb b/spec/ruby/core/range/bsearch_spec.rb
index 5254ab756cb..151a1798cf1 100644
--- a/spec/ruby/core/range/bsearch_spec.rb
+++ b/spec/ruby/core/range/bsearch_spec.rb
@@ -3,46 +3,46 @@
 
 describe "Range#bsearch" do
   it "returns an Enumerator when not passed a block" do
-    (0..1).bsearch.should be_an_instance_of(Enumerator)
+    (0..1).bsearch.should.instance_of?(Enumerator)
   end
 
   it_behaves_like :enumeratorized_with_unknown_size, :bsearch, (1..3)
 
   it "raises a TypeError if the block returns an Object" do
-    -> { (0..1).bsearch { Object.new } }.should raise_error(TypeError, "wrong argument type Object (must be numeric, true, false or nil)")
+    -> { (0..1).bsearch { Object.new } }.should.raise(TypeError, "wrong argument type Object (must be numeric, true, false or nil)")
   end
 
   it "raises a TypeError if the block returns a String and boundaries are Integer values" do
-    -> { (0..1).bsearch { "1" } }.should raise_error(TypeError, "wrong argument type String (must be numeric, true, false or nil)")
+    -> { (0..1).bsearch { "1" } }.should.raise(TypeError, "wrong argument type String (must be numeric, true, false or nil)")
   end
 
   it "raises a TypeError if the block returns a String and boundaries are Float values" do
-    -> { (0.0..1.0).bsearch { "1" } }.should raise_error(TypeError, "wrong argument type String (must be numeric, true, false or nil)")
+    -> { (0.0..1.0).bsearch { "1" } }.should.raise(TypeError, "wrong argument type String (must be numeric, true, false or nil)")
   end
 
   it "raises a TypeError if the Range has Object values" do
     value = mock("range bsearch")
     r = Range.new value, value
 
-    -> { r.bsearch { true } }.should raise_error(TypeError, "can't do binary search for MockObject")
+    -> { r.bsearch { true } }.should.raise(TypeError, "can't do binary search for MockObject")
   end
 
   it "raises a TypeError if the Range has String values" do
-    -> { ("a".."e").bsearch { true } }.should raise_error(TypeError, "can't do binary search for String")
+    -> { ("a".."e").bsearch { true } }.should.raise(TypeError, "can't do binary search for String")
   end
 
   it "raises TypeError when non-Numeric begin/end and block not passed" do
-    -> { ("a".."e").bsearch }.should raise_error(TypeError, "can't do binary search for String")
+    -> { ("a".."e").bsearch }.should.raise(TypeError, "can't do binary search for String")
   end
 
   context "with Integer values" do
     context "with a block returning true or false" do
       it "returns nil if the block returns false for every element" do
-        (0...3).bsearch { |x| x > 3 }.should be_nil
+        (0...3).bsearch { |x| x > 3 }.should == nil
       end
 
       it "returns nil if the block returns nil for every element" do
-        (0..3).bsearch { |x| nil }.should be_nil
+        (0..3).bsearch { |x| nil }.should == nil
       end
 
       it "returns minimum element if the block returns true for every element" do
@@ -62,21 +62,21 @@
 
     context "with a block returning negative, zero, positive numbers" do
       it "returns nil if the block returns less than zero for every element" do
-        (0..3).bsearch { |x| x <=> 5 }.should be_nil
+        (0..3).bsearch { |x| x <=> 5 }.should == nil
       end
 
       it "returns nil if the block returns greater than zero for every element" do
-        (0..3).bsearch { |x| x <=> -1 }.should be_nil
+        (0..3).bsearch { |x| x <=> -1 }.should == nil
 
       end
 
       it "returns nil if the block never returns zero" do
-        (0..3).bsearch { |x| x < 2 ? 1 : -1 }.should be_nil
+        (0..3).bsearch { |x| x < 2 ? 1 : -1 }.should == nil
       end
 
       it "accepts (+/-)Float::INFINITY from the block" do
-        (0..4).bsearch { |x| Float::INFINITY }.should be_nil
-        (0..4).bsearch { |x| -Float::INFINITY }.should be_nil
+        (0..4).bsearch { |x| Float::INFINITY }.should == nil
+        (0..4).bsearch { |x| -Float::INFINITY }.should == nil
       end
 
       it "returns an element at an index for which block returns 0.0" do
@@ -86,7 +86,7 @@
 
       it "returns an element at an index for which block returns 0" do
         result = (0..4).bsearch { |x| x < 1 ? 1 : x > 3 ? -1 : 0 }
-        [1, 2].should include(result)
+        [1, 2].should.include?(result)
       end
     end
 
@@ -111,11 +111,11 @@
   context "with Float values" do
     context "with a block returning true or false" do
       it "returns nil if the block returns false for every element" do
-        (0.1...2.3).bsearch { |x| x > 3 }.should be_nil
+        (0.1...2.3).bsearch { |x| x > 3 }.should == nil
       end
 
       it "returns nil if the block returns nil for every element" do
-        (-0.0..2.3).bsearch { |x| nil }.should be_nil
+        (-0.0..2.3).bsearch { |x| nil }.should == nil
       end
 
       it "returns minimum element if the block returns true for every element" do
@@ -163,20 +163,20 @@
 
     context "with a block returning negative, zero, positive numbers" do
       it "returns nil if the block returns less than zero for every element" do
-        (-2.0..3.2).bsearch { |x| x <=> 5 }.should be_nil
+        (-2.0..3.2).bsearch { |x| x <=> 5 }.should == nil
       end
 
       it "returns nil if the block returns greater than zero for every element" do
-        (0.3..3.0).bsearch { |x| x <=> -1 }.should be_nil
+        (0.3..3.0).bsearch { |x| x <=> -1 }.should == nil
       end
 
       it "returns nil if the block never returns zero" do
-        (0.2..2.3).bsearch { |x| x < 2 ? 1 : -1 }.should be_nil
+        (0.2..2.3).bsearch { |x| x < 2 ? 1 : -1 }.should == nil
       end
 
       it "accepts (+/-)Float::INFINITY from the block" do
-        (0.1..4.5).bsearch { |x| Float::INFINITY }.should be_nil
-        (-5.0..4.0).bsearch { |x| -Float::INFINITY }.should be_nil
+        (0.1..4.5).bsearch { |x| Float::INFINITY }.should == nil
+        (-5.0..4.0).bsearch { |x| -Float::INFINITY }.should == nil
       end
 
       it "returns an element at an index for which block returns 0.0" do
@@ -244,15 +244,15 @@
 
     context "with a block returning negative, zero, positive numbers" do
       it "returns nil if the block returns less than zero for every element" do
-        eval("(0..)").bsearch { |x| -1 }.should be_nil
+        eval("(0..)").bsearch { |x| -1 }.should == nil
       end
 
       it "returns nil if the block never returns zero" do
-        eval("(0..)").bsearch { |x| x > 5 ? -1 : 1 }.should be_nil
+        eval("(0..)").bsearch { |x| x > 5 ? -1 : 1 }.should == nil
       end
 
       it "accepts -Float::INFINITY from the block" do
-        eval("(0..)").bsearch { |x| -Float::INFINITY }.should be_nil
+        eval("(0..)").bsearch { |x| -Float::INFINITY }.should == nil
       end
 
       it "returns an element at an index for which block returns 0.0" do
@@ -262,7 +262,7 @@
 
       it "returns an element at an index for which block returns 0" do
         result = eval("(0..)").bsearch { |x| x < 1 ? 1 : x > 3 ? -1 : 0 }
-        [1, 2, 3].should include(result)
+        [1, 2, 3].should.include?(result)
       end
     end
 
@@ -274,13 +274,13 @@
   context "with endless ranges and Float values" do
     context "with a block returning true or false" do
       it "returns nil if the block returns false for every element" do
-        eval("(0.1..)").bsearch { |x| x < 0.0 }.should be_nil
-        eval("(0.1...)").bsearch { |x| x < 0.0 }.should be_nil
+        eval("(0.1..)").bsearch { |x| x < 0.0 }.should == nil
+        eval("(0.1...)").bsearch { |x| x < 0.0 }.should == nil
       end
 
       it "returns nil if the block returns nil for every element" do
-        eval("(-0.0..)").bsearch { |x| nil }.should be_nil
-        eval("(-0.0...)").bsearch { |x| nil }.should be_nil
+        eval("(-0.0..)").bsearch { |x| nil }.should == nil
+        eval("(-0.0...)").bsearch { |x| nil }.should == nil
       end
 
       it "returns minimum element if the block returns true for every element" do
@@ -304,22 +304,22 @@
 
     context "with a block returning negative, zero, positive numbers" do
       it "returns nil if the block returns less than zero for every element" do
-        eval("(-2.0..)").bsearch { |x| -1 }.should be_nil
-        eval("(-2.0...)").bsearch { |x| -1 }.should be_nil
+        eval("(-2.0..)").bsearch { |x| -1 }.should == nil
+        eval("(-2.0...)").bsearch { |x| -1 }.should == nil
       end
 
       it "returns nil if the block returns greater than zero for every element" do
-        eval("(0.3..)").bsearch { |x| 1 }.should be_nil
-        eval("(0.3...)").bsearch { |x| 1 }.should be_nil
+        eval("(0.3..)").bsearch { |x| 1 }.should == nil
+        eval("(0.3...)").bsearch { |x| 1 }.should == nil
       end
 
       it "returns nil if the block never returns zero" do
-        eval("(0.2..)").bsearch { |x| x < 2 ? 1 : -1 }.should be_nil
+        eval("(0.2..)").bsearch { |x| x < 2 ? 1 : -1 }.should == nil
       end
 
       it "accepts (+/-)Float::INFINITY from the block" do
-        eval("(0.1..)").bsearch { |x| Float::INFINITY }.should be_nil
-        eval("(-5.0..)").bsearch { |x| -Float::INFINITY }.should be_nil
+        eval("(0.1..)").bsearch { |x| Float::INFINITY }.should == nil
+        eval("(-5.0..)").bsearch { |x| -Float::INFINITY }.should == nil
       end
 
       it "returns an element at an index for which block returns 0.0" do
@@ -362,15 +362,15 @@
 
     context "with a block returning negative, zero, positive numbers" do
       it "returns nil if the block returns greater than zero for every element" do
-        (..0).bsearch { |x| 1 }.should be_nil
+        (..0).bsearch { |x| 1 }.should == nil
       end
 
       it "returns nil if the block never returns zero" do
-        (..0).bsearch { |x| x > 5 ? -1 : 1 }.should be_nil
+        (..0).bsearch { |x| x > 5 ? -1 : 1 }.should == nil
       end
 
       it "accepts Float::INFINITY from the block" do
-        (..0).bsearch { |x| Float::INFINITY }.should be_nil
+        (..0).bsearch { |x| Float::INFINITY }.should == nil
       end
 
       it "returns an element at an index for which block returns 0.0" do
@@ -380,7 +380,7 @@
 
       it "returns an element at an index for which block returns 0" do
         result = (...10).bsearch { |x| x < 1 ? 1 : x > 3 ? -1 : 0 }
-        [1, 2, 3].should include(result)
+        [1, 2, 3].should.include?(result)
       end
     end
 
@@ -392,13 +392,13 @@
   context "with beginless ranges and Float values" do
     context "with a block returning true or false" do
       it "returns nil if the block returns true for every element" do
-        (..-0.1).bsearch { |x| x > 0.0 }.should be_nil
-        (...-0.1).bsearch { |x| x > 0.0 }.should be_nil
+        (..-0.1).bsearch { |x| x > 0.0 }.should == nil
+        (...-0.1).bsearch { |x| x > 0.0 }.should == nil
       end
 
       it "returns nil if the block returns nil for every element" do
-        (..-0.1).bsearch { |x| nil }.should be_nil
-        (...-0.1).bsearch { |x| nil }.should be_nil
+        (..-0.1).bsearch { |x| nil }.should == nil
+        (...-0.1).bsearch { |x| nil }.should == nil
       end
 
       it "returns the smallest element for which block returns true" do
@@ -417,22 +417,22 @@
 
     context "with a block returning negative, zero, positive numbers" do
       it "returns nil if the block returns less than zero for every element" do
-        (..5.0).bsearch { |x| -1 }.should be_nil
-        (...5.0).bsearch { |x| -1 }.should be_nil
+        (..5.0).bsearch { |x| -1 }.should == nil
+        (...5.0).bsearch { |x| -1 }.should == nil
       end
 
       it "returns nil if the block returns greater than zero for every element" do
-        (..1.1).bsearch { |x| 1 }.should be_nil
-        (...1.1).bsearch { |x| 1 }.should be_nil
+        (..1.1).bsearch { |x| 1 }.should == nil
+        (...1.1).bsearch { |x| 1 }.should == nil
       end
 
       it "returns nil if the block never returns zero" do
-        (..6.3).bsearch { |x| x < 2 ? 1 : -1 }.should be_nil
+        (..6.3).bsearch { |x| x < 2 ? 1 : -1 }.should == nil
       end
 
       it "accepts (+/-)Float::INFINITY from the block" do
-        (..5.0).bsearch { |x| Float::INFINITY }.should be_nil
-        (..7.0).bsearch { |x| -Float::INFINITY }.should be_nil
+        (..5.0).bsearch { |x| Float::INFINITY }.should == nil
+        (..7.0).bsearch { |x| -Float::INFINITY }.should == nil
       end
 
       it "returns an element at an index for which block returns 0.0" do
diff --git a/spec/ruby/core/range/cover_spec.rb b/spec/ruby/core/range/cover_spec.rb
index c05bb50614e..eb8d5453bf8 100644
--- a/spec/ruby/core/range/cover_spec.rb
+++ b/spec/ruby/core/range/cover_spec.rb
@@ -9,6 +9,6 @@
   it_behaves_like :range_cover_subrange, :cover?
 
   it "covers U+9995 in the range U+0999..U+9999" do
-    ("\u{999}".."\u{9999}").cover?("\u{9995}").should be_true
+    ("\u{999}".."\u{9999}").cover?("\u{9995}").should == true
   end
 end
diff --git a/spec/ruby/core/range/each_spec.rb b/spec/ruby/core/range/each_spec.rb
index f10330d61d7..b4389f864da 100644
--- a/spec/ruby/core/range/each_spec.rb
+++ b/spec/ruby/core/range/each_spec.rb
@@ -59,26 +59,26 @@
   end
 
   it "raises a TypeError beginless ranges" do
-    -> { (..2).each { |x| x } }.should raise_error(TypeError)
+    -> { (..2).each { |x| x } }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the first element does not respond to #succ" do
-    -> { (0.5..2.4).each { |i| i } }.should raise_error(TypeError)
+    -> { (0.5..2.4).each { |i| i } }.should.raise(TypeError)
 
     b = mock('x')
     (a = mock('1')).should_receive(:<=>).with(b).and_return(1)
 
-    -> { (a..b).each { |i| i } }.should raise_error(TypeError)
+    -> { (a..b).each { |i| i } }.should.raise(TypeError)
   end
 
   it "returns self" do
     range = 1..10
-    range.each{}.should equal(range)
+    range.each{}.should.equal?(range)
   end
 
   it "returns an enumerator when no block given" do
     enum = (1..3).each
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == [1, 2, 3]
   end
 
diff --git a/spec/ruby/core/range/eql_spec.rb b/spec/ruby/core/range/eql_spec.rb
index fa6c71840e9..cdc19c9331e 100644
--- a/spec/ruby/core/range/eql_spec.rb
+++ b/spec/ruby/core/range/eql_spec.rb
@@ -5,6 +5,6 @@
   it_behaves_like :range_eql, :eql?
 
   it "returns false if the endpoints are not eql?" do
-    (0..1).should_not eql(0..1.0)
+    (0..1).should_not.eql?(0..1.0)
   end
 end
diff --git a/spec/ruby/core/range/first_spec.rb b/spec/ruby/core/range/first_spec.rb
index 2af935f439a..54bd73a4e8f 100644
--- a/spec/ruby/core/range/first_spec.rb
+++ b/spec/ruby/core/range/first_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "raises an ArgumentError when count is negative" do
-    -> { (0..2).first(-1) }.should raise_error(ArgumentError)
+    -> { (0..2).first(-1) }.should.raise(ArgumentError)
   end
 
   it "calls #to_int to convert the argument" do
@@ -32,7 +32,7 @@
   it "raises a TypeError if #to_int does not return an Integer" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return("1")
-    -> { (2..3).first(obj) }.should raise_error(TypeError)
+    -> { (2..3).first(obj) }.should.raise(TypeError)
   end
 
   it "truncates the value when passed a Float" do
@@ -40,14 +40,14 @@
   end
 
   it "raises a TypeError when passed nil" do
-    -> { (2..3).first(nil) }.should raise_error(TypeError)
+    -> { (2..3).first(nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { (2..3).first("1") }.should raise_error(TypeError)
+    -> { (2..3).first("1") }.should.raise(TypeError)
   end
 
   it "raises a RangeError when called on an beginless range" do
-    -> { (..1).first }.should raise_error(RangeError)
+    -> { (..1).first }.should.raise(RangeError)
   end
 end
diff --git a/spec/ruby/core/range/hash_spec.rb b/spec/ruby/core/range/hash_spec.rb
index 4f2681e86ed..087f5d6de8a 100644
--- a/spec/ruby/core/range/hash_spec.rb
+++ b/spec/ruby/core/range/hash_spec.rb
@@ -15,10 +15,10 @@
   end
 
   it "generates an Integer for the hash value" do
-    (0..0).hash.should be_an_instance_of(Integer)
-    (0..1).hash.should be_an_instance_of(Integer)
-    (0...10).hash.should be_an_instance_of(Integer)
-    (0..10).hash.should be_an_instance_of(Integer)
+    (0..0).hash.should.instance_of?(Integer)
+    (0..1).hash.should.instance_of?(Integer)
+    (0...10).hash.should.instance_of?(Integer)
+    (0..10).hash.should.instance_of?(Integer)
   end
 
 end
diff --git a/spec/ruby/core/range/include_spec.rb b/spec/ruby/core/range/include_spec.rb
index 449e18985b9..66a049a90db 100644
--- a/spec/ruby/core/range/include_spec.rb
+++ b/spec/ruby/core/range/include_spec.rb
@@ -9,6 +9,6 @@
   it_behaves_like :range_include, :include?
 
   it "does not include U+9995 in the range U+0999..U+9999" do
-    ("\u{999}".."\u{9999}").include?("\u{9995}").should be_false
+    ("\u{999}".."\u{9999}").include?("\u{9995}").should == false
   end
 end
diff --git a/spec/ruby/core/range/initialize_spec.rb b/spec/ruby/core/range/initialize_spec.rb
index c653caf0c6f..b1a0565ab25 100644
--- a/spec/ruby/core/range/initialize_spec.rb
+++ b/spec/ruby/core/range/initialize_spec.rb
@@ -6,36 +6,36 @@
   end
 
   it "is private" do
-    Range.should have_private_instance_method("initialize")
+    Range.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "initializes correctly the Range object when given 2 arguments" do
-    -> { @range.send(:initialize, 0, 1) }.should_not raise_error
+    -> { @range.send(:initialize, 0, 1) }.should_not.raise
   end
 
   it "initializes correctly the Range object when given 3 arguments" do
-    -> { @range.send(:initialize, 0, 1, true) }.should_not raise_error
+    -> { @range.send(:initialize, 0, 1, true) }.should_not.raise
   end
 
   it "raises an ArgumentError if passed without or with only one argument" do
-    -> { @range.send(:initialize) }.should raise_error(ArgumentError)
-    -> { @range.send(:initialize, 1) }.should raise_error(ArgumentError)
+    -> { @range.send(:initialize) }.should.raise(ArgumentError)
+    -> { @range.send(:initialize, 1) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if passed with four or more arguments" do
-    -> { @range.send(:initialize, 1, 3, 5, 7) }.should raise_error(ArgumentError)
-    -> { @range.send(:initialize, 1, 3, 5, 7, 9) }.should raise_error(ArgumentError)
+    -> { @range.send(:initialize, 1, 3, 5, 7) }.should.raise(ArgumentError)
+    -> { @range.send(:initialize, 1, 3, 5, 7, 9) }.should.raise(ArgumentError)
   end
 
   it "raises a FrozenError if called on an already initialized Range" do
-    -> { (0..1).send(:initialize, 1, 3) }.should raise_error(FrozenError)
-    -> { (0..1).send(:initialize, 1, 3, true) }.should raise_error(FrozenError)
+    -> { (0..1).send(:initialize, 1, 3) }.should.raise(FrozenError)
+    -> { (0..1).send(:initialize, 1, 3, true) }.should.raise(FrozenError)
   end
 
   it "raises an ArgumentError if arguments don't respond to <=>" do
     o1 = Object.new
     o2 = Object.new
 
-    -> { @range.send(:initialize, o1, o2) }.should raise_error(ArgumentError)
+    -> { @range.send(:initialize, o1, o2) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/range/last_spec.rb b/spec/ruby/core/range/last_spec.rb
index 82b3e2ff534..a7db7f85a7b 100644
--- a/spec/ruby/core/range/last_spec.rb
+++ b/spec/ruby/core/range/last_spec.rb
@@ -25,7 +25,7 @@
   end
 
   it "raises an ArgumentError when count is negative" do
-    -> { (0..2).last(-1) }.should raise_error(ArgumentError)
+    -> { (0..2).last(-1) }.should.raise(ArgumentError)
   end
 
   it "calls #to_int to convert the argument" do
@@ -36,7 +36,7 @@
   it "raises a TypeError if #to_int does not return an Integer" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return("1")
-    -> { (2..3).last(obj) }.should raise_error(TypeError)
+    -> { (2..3).last(obj) }.should.raise(TypeError)
   end
 
   it "truncates the value when passed a Float" do
@@ -44,14 +44,14 @@
   end
 
   it "raises a TypeError when passed nil" do
-    -> { (2..3).last(nil) }.should raise_error(TypeError)
+    -> { (2..3).last(nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { (2..3).last("1") }.should raise_error(TypeError)
+    -> { (2..3).last("1") }.should.raise(TypeError)
   end
 
   it "raises a RangeError when called on an endless range" do
-    -> { eval("(1..)").last }.should raise_error(RangeError)
+    -> { eval("(1..)").last }.should.raise(RangeError)
   end
 end
diff --git a/spec/ruby/core/range/max_spec.rb b/spec/ruby/core/range/max_spec.rb
index 09371f52987..57714967ce0 100644
--- a/spec/ruby/core/range/max_spec.rb
+++ b/spec/ruby/core/range/max_spec.rb
@@ -14,40 +14,40 @@
   end
 
   it "raises TypeError when called on an exclusive range and a non Integer value" do
-    -> { (303.20...908.1111).max }.should raise_error(TypeError)
+    -> { (303.20...908.1111).max }.should.raise(TypeError)
   end
 
   it "returns nil when the endpoint is less than the start point" do
-    (100..10).max.should be_nil
-    ('z'..'l').max.should be_nil
+    (100..10).max.should == nil
+    ('z'..'l').max.should == nil
   end
 
   it "returns nil when the endpoint equals the start point and the range is exclusive" do
-    (5...5).max.should be_nil
+    (5...5).max.should == nil
   end
 
   it "returns the endpoint when the endpoint equals the start point and the range is inclusive" do
-    (5..5).max.should equal(5)
+    (5..5).max.should.equal?(5)
   end
 
   it "returns nil when the endpoint is less than the start point in a Float range" do
-    (3003.20..908.1111).max.should be_nil
+    (3003.20..908.1111).max.should == nil
   end
 
   it "returns end point when the range is Time..Time(included end point)" do
     time_start = Time.now
     time_end = Time.now + 1.0
-    (time_start..time_end).max.should equal(time_end)
+    (time_start..time_end).max.should.equal?(time_end)
   end
 
   it "raises TypeError when called on a Time...Time(excluded end point)" do
     time_start = Time.now
     time_end = Time.now + 1.0
-    -> { (time_start...time_end).max  }.should raise_error(TypeError)
+    -> { (time_start...time_end).max  }.should.raise(TypeError)
   end
 
   it "raises RangeError when called on an endless range" do
-    -> { eval("(1..)").max }.should raise_error(RangeError)
+    -> { eval("(1..)").max }.should.raise(RangeError)
   end
 
   it "returns the end point for beginless ranges" do
@@ -59,7 +59,7 @@
     it "raises for an exclusive beginless Integer range" do
       -> {
         (...1).max
-      }.should raise_error(TypeError, 'cannot exclude end value with non Integer begin value')
+      }.should.raise(TypeError, 'cannot exclude end value with non Integer begin value')
     end
   end
 
@@ -72,7 +72,7 @@
   it "raises for an exclusive beginless non Integer range" do
     -> {
       (...1.0).max
-    }.should raise_error(TypeError, 'cannot exclude non Integer end value')
+    }.should.raise(TypeError, 'cannot exclude non Integer end value')
   end
 end
 
@@ -82,7 +82,7 @@
     (1..10).max {|a,b| acc << [a,b]; a }
     acc.flatten!
     (1..10).each do |value|
-      acc.include?(value).should be_true
+      acc.include?(value).should == true
     end
   end
 
@@ -104,12 +104,12 @@
   end
 
   it "returns nil when the endpoint is less than the start point" do
-    (100..10).max {|x,y| x <=> y}.should be_nil
-    ('z'..'l').max {|x,y| x <=> y}.should be_nil
-    (5...5).max {|x,y| x <=> y}.should be_nil
+    (100..10).max {|x,y| x <=> y}.should == nil
+    ('z'..'l').max {|x,y| x <=> y}.should == nil
+    (5...5).max {|x,y| x <=> y}.should == nil
   end
 
   it "raises RangeError when called with custom comparison method on an beginless range" do
-    -> { (..1).max {|a, b| a} }.should raise_error(RangeError)
+    -> { (..1).max {|a, b| a} }.should.raise(RangeError)
   end
 end
diff --git a/spec/ruby/core/range/min_spec.rb b/spec/ruby/core/range/min_spec.rb
index 89310ee589a..9c83d3decae 100644
--- a/spec/ruby/core/range/min_spec.rb
+++ b/spec/ruby/core/range/min_spec.rb
@@ -11,32 +11,32 @@
   end
 
   it "returns nil when the start point is greater than the endpoint" do
-    (100..10).min.should be_nil
-    ('z'..'l').min.should be_nil
+    (100..10).min.should == nil
+    ('z'..'l').min.should == nil
   end
 
   it "returns nil when the endpoint equals the start point and the range is exclusive" do
-    (7...7).min.should be_nil
+    (7...7).min.should == nil
   end
 
   it "returns the start point when the endpoint equals the start point and the range is inclusive" do
-    (7..7).min.should equal(7)
+    (7..7).min.should.equal?(7)
   end
 
   it "returns nil when the start point is greater than the endpoint in a Float range" do
-    (3003.20..908.1111).min.should be_nil
+    (3003.20..908.1111).min.should == nil
   end
 
   it "returns start point when the range is Time..Time(included end point)" do
     time_start = Time.now
     time_end = Time.now + 1.0
-    (time_start..time_end).min.should equal(time_start)
+    (time_start..time_end).min.should.equal?(time_start)
   end
 
   it "returns start point when the range is Time...Time(excluded end point)" do
     time_start = Time.now
     time_end = Time.now + 1.0
-    (time_start...time_end).min.should equal(time_start)
+    (time_start...time_end).min.should.equal?(time_start)
   end
 
   it "returns the start point for endless ranges" do
@@ -45,7 +45,7 @@
   end
 
   it "raises RangeError when called on an beginless range" do
-    -> { (..1).min }.should raise_error(RangeError)
+    -> { (..1).min }.should.raise(RangeError)
   end
 end
 
@@ -55,7 +55,7 @@
     (1..10).min {|a,b| acc << [a,b]; a }
     acc.flatten!
     (1..10).each do |value|
-      acc.include?(value).should be_true
+      acc.include?(value).should == true
     end
   end
 
@@ -77,12 +77,12 @@
   end
 
   it "returns nil when the start point is greater than the endpoint" do
-    (100..10).min {|x,y| x <=> y}.should be_nil
-    ('z'..'l').min {|x,y| x <=> y}.should be_nil
-    (7...7).min {|x,y| x <=> y}.should be_nil
+    (100..10).min {|x,y| x <=> y}.should == nil
+    ('z'..'l').min {|x,y| x <=> y}.should == nil
+    (7...7).min {|x,y| x <=> y}.should == nil
   end
 
   it "raises RangeError when called with custom comparison method on an endless range" do
-    -> { eval("(1..)").min {|a, b| a} }.should raise_error(RangeError)
+    -> { eval("(1..)").min {|a, b| a} }.should.raise(RangeError)
   end
 end
diff --git a/spec/ruby/core/range/minmax_spec.rb b/spec/ruby/core/range/minmax_spec.rb
index 6651ae3726d..16c7626ea34 100644
--- a/spec/ruby/core/range/minmax_spec.rb
+++ b/spec/ruby/core/range/minmax_spec.rb
@@ -17,19 +17,19 @@
 
       range = (@x..)
 
-      -> { range.minmax }.should raise_error(RangeError, 'cannot get the maximum of endless range')
+      -> { range.minmax }.should.raise(RangeError, 'cannot get the maximum of endless range')
     end
 
     it 'raises RangeError or ArgumentError on a beginless range' do
       range = (..@x)
 
-      -> { range.minmax }.should raise_error(StandardError) { |e|
+      -> { range.minmax }.should.raise(StandardError) { |e|
         if RangeError === e
           # error from #min
-          -> { raise e }.should raise_error(RangeError, 'cannot get the minimum of beginless range')
+          -> { raise e }.should.raise(RangeError, 'cannot get the minimum of beginless range')
         else
           # error from #max
-          -> { raise e }.should raise_error(ArgumentError, 'comparison of NilClass with MockObject failed')
+          -> { raise e }.should.raise(ArgumentError, 'comparison of NilClass with MockObject failed')
         end
       }
     end
@@ -76,13 +76,13 @@
       @x.should_not_receive(:succ)
       range = (@x...)
 
-      -> { range.minmax }.should raise_error(RangeError, 'cannot get the maximum of endless range')
+      -> { range.minmax }.should.raise(RangeError, 'cannot get the maximum of endless range')
     end
 
     it 'should raise RangeError on a beginless range' do
       range = (...@x)
 
-      -> { range.minmax }.should raise_error(RangeError,
+      -> { range.minmax }.should.raise(RangeError,
         /cannot get the maximum of beginless range with custom comparison method|cannot get the minimum of beginless range/)
     end
 
@@ -118,7 +118,7 @@
 
     it 'raises TypeError if the end value is not an integer' do
       range = (0...Float::INFINITY)
-      -> { range.minmax }.should raise_error(TypeError, 'cannot exclude non Integer end value')
+      -> { range.minmax }.should.raise(TypeError, 'cannot exclude non Integer end value')
     end
 
     it 'should return the minimum and maximum values according to the provided block by iterating the range' do
diff --git a/spec/ruby/core/range/new_spec.rb b/spec/ruby/core/range/new_spec.rb
index 3cab8877995..9a35f28c7ed 100644
--- a/spec/ruby/core/range/new_spec.rb
+++ b/spec/ruby/core/range/new_spec.rb
@@ -25,12 +25,12 @@
   end
 
   it "raises an ArgumentError when the given start and end can't be compared by using #<=>" do
-    -> { Range.new(1, mock('x'))         }.should raise_error(ArgumentError)
-    -> { Range.new(mock('x'), mock('y')) }.should raise_error(ArgumentError)
+    -> { Range.new(1, mock('x'))         }.should.raise(ArgumentError)
+    -> { Range.new(mock('x'), mock('y')) }.should.raise(ArgumentError)
 
     b = mock('x')
     (a = mock('nil')).should_receive(:<=>).with(b).and_return(nil)
-    -> { Range.new(a, b) }.should raise_error(ArgumentError)
+    -> { Range.new(a, b) }.should.raise(ArgumentError)
   end
 
   it "does not rescue exception raised in #<=> when compares the given start and end" do
@@ -38,7 +38,7 @@
     a = mock('b')
     a.should_receive(:<=>).with(b).and_raise(RangeSpecs::ComparisonError)
 
-    -> { Range.new(a, b) }.should raise_error(RangeSpecs::ComparisonError)
+    -> { Range.new(a, b) }.should.raise(RangeSpecs::ComparisonError)
   end
 
   describe "beginless/endless range" do
diff --git a/spec/ruby/core/range/overlap_spec.rb b/spec/ruby/core/range/overlap_spec.rb
index 3e7d2bdda8a..201cd2b1ff7 100644
--- a/spec/ruby/core/range/overlap_spec.rb
+++ b/spec/ruby/core/range/overlap_spec.rb
@@ -21,7 +21,7 @@
   it "raises TypeError when called with non-Range argument" do
     -> {
       (0..2).overlap?(1)
-    }.should raise_error(TypeError, "wrong argument type Integer (expected Range)")
+    }.should.raise(TypeError, "wrong argument type Integer (expected Range)")
   end
 
   it "returns true when beginningless and endless Ranges overlap" do
diff --git a/spec/ruby/core/range/reverse_each_spec.rb b/spec/ruby/core/range/reverse_each_spec.rb
index 16aaace6afa..49790e8b0a2 100644
--- a/spec/ruby/core/range/reverse_each_spec.rb
+++ b/spec/ruby/core/range/reverse_each_spec.rb
@@ -13,25 +13,25 @@
 
   it "returns self" do
     r = (1..3)
-    r.reverse_each { |x| }.should equal(r)
+    r.reverse_each { |x| }.should.equal?(r)
   end
 
   it "returns an Enumerator if no block given" do
     enum = (1..3).reverse_each
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == [3, 2, 1]
   end
 
   it "raises a TypeError for endless Ranges of Integers" do
     -> {
       (1..).reverse_each.take(3)
-    }.should raise_error(TypeError, "can't iterate from NilClass")
+    }.should.raise(TypeError, "can't iterate from NilClass")
   end
 
   it "raises a TypeError for endless Ranges of non-Integers" do
     -> {
       ("a"..).reverse_each.take(3)
-    }.should raise_error(TypeError, "can't iterate from NilClass")
+    }.should.raise(TypeError, "can't iterate from NilClass")
   end
 
   context "Integer boundaries" do
@@ -69,15 +69,15 @@
     end
 
     it "raises a TypeError when `begin` value does not respond to #succ" do
-      -> { (Time.now..Time.now).reverse_each { |x| x } }.should raise_error(TypeError, /can't iterate from Time/)
-      -> { (//..//).reverse_each { |x| x } }.should raise_error(TypeError, /can't iterate from Regexp/)
-      -> { ([]..[]).reverse_each { |x| x } }.should raise_error(TypeError, /can't iterate from Array/)
+      -> { (Time.now..Time.now).reverse_each { |x| x } }.should.raise(TypeError, /can't iterate from Time/)
+      -> { (//..//).reverse_each { |x| x } }.should.raise(TypeError, /can't iterate from Regexp/)
+      -> { ([]..[]).reverse_each { |x| x } }.should.raise(TypeError, /can't iterate from Array/)
     end
 
     it "does not support beginningless Ranges" do
       -> {
         (..'a').reverse_each { |x| x }
-      }.should raise_error(TypeError, /can't iterate from NilClass/)
+      }.should.raise(TypeError, /can't iterate from NilClass/)
     end
   end
 
@@ -103,11 +103,11 @@
 
       ruby_version_is "3.4" do
         it "raises TypeError when the range is not iterable" do
-          -> { (1.1..3).reverse_each.size }.should raise_error(TypeError, /can't iterate from Integer/)
-          -> { (1.1..3.3).reverse_each.size }.should raise_error(TypeError, /can't iterate from Float/)
-          -> { (1.1..nil).reverse_each.size }.should raise_error(TypeError, /can't iterate from NilClass/)
-          -> { (nil..3.3).reverse_each.size }.should raise_error(TypeError, /can't iterate from Float/)
-          -> { (nil..nil).reverse_each.size }.should raise_error(TypeError, /can't iterate from NilClass/)
+          -> { (1.1..3).reverse_each.size }.should.raise(TypeError, /can't iterate from Integer/)
+          -> { (1.1..3.3).reverse_each.size }.should.raise(TypeError, /can't iterate from Float/)
+          -> { (1.1..nil).reverse_each.size }.should.raise(TypeError, /can't iterate from NilClass/)
+          -> { (nil..3.3).reverse_each.size }.should.raise(TypeError, /can't iterate from Float/)
+          -> { (nil..nil).reverse_each.size }.should.raise(TypeError, /can't iterate from NilClass/)
         end
       end
 
diff --git a/spec/ruby/core/range/shared/cover.rb b/spec/ruby/core/range/shared/cover.rb
index eaefb45942f..189f3da4bf5 100644
--- a/spec/ruby/core/range/shared/cover.rb
+++ b/spec/ruby/core/range/shared/cover.rb
@@ -6,26 +6,26 @@
   it "uses the range element's <=> to make the comparison" do
     a = mock('a')
     a.should_receive(:<=>).twice.and_return(-1,-1)
-    (a..'z').send(@method, 'b').should be_true
+    (a..'z').send(@method, 'b').should == true
   end
 
   it "uses a continuous inclusion test" do
-    ('a'..'f').send(@method, 'aa').should be_true
-    ('a'..'f').send(@method, 'babe').should be_true
-    ('a'..'f').send(@method, 'baby').should be_true
-    ('a'..'f').send(@method, 'ga').should be_false
-    (-10..-2).send(@method, -2.5).should be_true
+    ('a'..'f').send(@method, 'aa').should == true
+    ('a'..'f').send(@method, 'babe').should == true
+    ('a'..'f').send(@method, 'baby').should == true
+    ('a'..'f').send(@method, 'ga').should == false
+    (-10..-2).send(@method, -2.5).should == true
   end
 
   describe "on string elements" do
     it "returns true if other is matched by element.succ" do
-      ('a'..'c').send(@method, 'b').should be_true
-      ('a'...'c').send(@method, 'b').should be_true
+      ('a'..'c').send(@method, 'b').should == true
+      ('a'...'c').send(@method, 'b').should == true
     end
 
     it "returns true if other is not matched by element.succ" do
-      ('a'..'c').send(@method, 'bc').should be_true
-      ('a'...'c').send(@method, 'bc').should be_true
+      ('a'..'c').send(@method, 'bc').should == true
+      ('a'...'c').send(@method, 'bc').should == true
     end
   end
 
@@ -36,27 +36,27 @@
       end
 
       it "returns false if other is less than first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should == false
       end
 
       it "returns true if other is equal as first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should == true
       end
 
       it "returns true if other is matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should == true
       end
 
       it "returns true if other is not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should == true
       end
 
       it "returns true if other is equal as last element but not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should == true
       end
 
       it "returns false if other is greater than last element but matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should == false
       end
     end
 
@@ -66,27 +66,27 @@
       end
 
       it "returns false if other is less than first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should == false
       end
 
       it "returns true if other is equal as first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should == true
       end
 
       it "returns true if other is matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should == true
       end
 
       it "returns true if other is not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should == true
       end
 
       it "returns false if other is equal as last element but not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should == false
       end
 
       it "returns false if other is greater than last element but matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should == false
       end
     end
   end
@@ -95,99 +95,99 @@
 describe :range_cover_subrange, shared: true do
   context "range argument" do
     it "accepts range argument" do
-      (0..10).send(@method, (3..7)).should be_true
-      (0..10).send(@method, (3..15)).should be_false
-      (0..10).send(@method, (-2..7)).should be_false
+      (0..10).send(@method, (3..7)).should == true
+      (0..10).send(@method, (3..15)).should == false
+      (0..10).send(@method, (-2..7)).should == false
 
-      (1.1..7.9).send(@method, (2.5..6.5)).should be_true
-      (1.1..7.9).send(@method, (2.5..8.5)).should be_false
-      (1.1..7.9).send(@method, (0.5..6.5)).should be_false
+      (1.1..7.9).send(@method, (2.5..6.5)).should == true
+      (1.1..7.9).send(@method, (2.5..8.5)).should == false
+      (1.1..7.9).send(@method, (0.5..6.5)).should == false
 
-      ('c'..'i').send(@method, ('d'..'f')).should be_true
-      ('c'..'i').send(@method, ('d'..'z')).should be_false
-      ('c'..'i').send(@method, ('a'..'f')).should be_false
+      ('c'..'i').send(@method, ('d'..'f')).should == true
+      ('c'..'i').send(@method, ('d'..'z')).should == false
+      ('c'..'i').send(@method, ('a'..'f')).should == false
 
       range_10_100 = RangeSpecs::TenfoldSucc.new(10)..RangeSpecs::TenfoldSucc.new(100)
       range_20_90 = RangeSpecs::TenfoldSucc.new(20)..RangeSpecs::TenfoldSucc.new(90)
       range_20_110 = RangeSpecs::TenfoldSucc.new(20)..RangeSpecs::TenfoldSucc.new(110)
       range_0_90 = RangeSpecs::TenfoldSucc.new(0)..RangeSpecs::TenfoldSucc.new(90)
 
-      range_10_100.send(@method, range_20_90).should be_true
-      range_10_100.send(@method, range_20_110).should be_false
-      range_10_100.send(@method, range_0_90).should be_false
+      range_10_100.send(@method, range_20_90).should == true
+      range_10_100.send(@method, range_20_110).should == false
+      range_10_100.send(@method, range_0_90).should == false
     end
 
     it "supports boundaries of different comparable types" do
-      (0..10).send(@method, (3.1..7.9)).should be_true
-      (0..10).send(@method, (3.1..15.9)).should be_false
-      (0..10).send(@method, (-2.1..7.9)).should be_false
+      (0..10).send(@method, (3.1..7.9)).should == true
+      (0..10).send(@method, (3.1..15.9)).should == false
+      (0..10).send(@method, (-2.1..7.9)).should == false
     end
 
     it "returns false if types are not comparable" do
-      (0..10).send(@method, ('a'..'z')).should be_false
-      (0..10).send(@method, (RangeSpecs::TenfoldSucc.new(0)..RangeSpecs::TenfoldSucc.new(100))).should be_false
+      (0..10).send(@method, ('a'..'z')).should == false
+      (0..10).send(@method, (RangeSpecs::TenfoldSucc.new(0)..RangeSpecs::TenfoldSucc.new(100))).should == false
     end
 
     it "honors exclusion of right boundary (:exclude_end option)" do
       # Integer
-      (0..10).send(@method, (0..10)).should be_true
-      (0...10).send(@method, (0...10)).should be_true
+      (0..10).send(@method, (0..10)).should == true
+      (0...10).send(@method, (0...10)).should == true
 
-      (0..10).send(@method, (0...10)).should be_true
-      (0...10).send(@method, (0..10)).should be_false
+      (0..10).send(@method, (0...10)).should == true
+      (0...10).send(@method, (0..10)).should == false
 
-      (0...11).send(@method, (0..10)).should be_true
-      (0..10).send(@method, (0...11)).should be_true
+      (0...11).send(@method, (0..10)).should == true
+      (0..10).send(@method, (0...11)).should == true
 
       # Float
-      (0..10.1).send(@method, (0..10.1)).should be_true
-      (0...10.1).send(@method, (0...10.1)).should be_true
+      (0..10.1).send(@method, (0..10.1)).should == true
+      (0...10.1).send(@method, (0...10.1)).should == true
 
-      (0..10.1).send(@method, (0...10.1)).should be_true
-      (0...10.1).send(@method, (0..10.1)).should be_false
+      (0..10.1).send(@method, (0...10.1)).should == true
+      (0...10.1).send(@method, (0..10.1)).should == false
 
-      (0...11.1).send(@method, (0..10.1)).should be_true
-      (0..10.1).send(@method, (0...11.1)).should be_false
+      (0...11.1).send(@method, (0..10.1)).should == true
+      (0..10.1).send(@method, (0...11.1)).should == false
     end
   end
 
   it "allows self to be a beginless range" do
-    (...10).send(@method, (3..7)).should be_true
-    (...10).send(@method, (3..15)).should be_false
+    (...10).send(@method, (3..7)).should == true
+    (...10).send(@method, (3..15)).should == false
 
-    (..7.9).send(@method, (2.5..6.5)).should be_true
-    (..7.9).send(@method, (2.5..8.5)).should be_false
+    (..7.9).send(@method, (2.5..6.5)).should == true
+    (..7.9).send(@method, (2.5..8.5)).should == false
 
-    (..'i').send(@method, ('d'..'f')).should be_true
-    (..'i').send(@method, ('d'..'z')).should be_false
+    (..'i').send(@method, ('d'..'f')).should == true
+    (..'i').send(@method, ('d'..'z')).should == false
   end
 
   it "allows self to be a endless range" do
-    eval("(0...)").send(@method, (3..7)).should be_true
-    eval("(5...)").send(@method, (3..15)).should be_false
+    eval("(0...)").send(@method, (3..7)).should == true
+    eval("(5...)").send(@method, (3..15)).should == false
 
-    eval("(1.1..)").send(@method, (2.5..6.5)).should be_true
-    eval("(3.3..)").send(@method, (2.5..8.5)).should be_false
+    eval("(1.1..)").send(@method, (2.5..6.5)).should == true
+    eval("(3.3..)").send(@method, (2.5..8.5)).should == false
 
-    eval("('a'..)").send(@method, ('d'..'f')).should be_true
-    eval("('p'..)").send(@method, ('d'..'z')).should be_false
+    eval("('a'..)").send(@method, ('d'..'f')).should == true
+    eval("('p'..)").send(@method, ('d'..'z')).should == false
   end
 
   it "accepts beginless range argument" do
-    (..10).send(@method, (...10)).should be_true
-    (0..10).send(@method, (...10)).should be_false
+    (..10).send(@method, (...10)).should == true
+    (0..10).send(@method, (...10)).should == false
 
-    (1.1..7.9).send(@method, (...10.5)).should be_false
+    (1.1..7.9).send(@method, (...10.5)).should == false
 
-    ('c'..'i').send(@method, (..'i')).should be_false
+    ('c'..'i').send(@method, (..'i')).should == false
   end
 
   it "accepts endless range argument" do
-    eval("(0..)").send(@method, eval("(0...)")).should be_true
-    (0..10).send(@method, eval("(0...)")).should be_false
+    eval("(0..)").send(@method, eval("(0...)")).should == true
+    (0..10).send(@method, eval("(0...)")).should == false
 
-    (1.1..7.9).send(@method, eval("(0.8...)")).should be_false
+    (1.1..7.9).send(@method, eval("(0.8...)")).should == false
 
-    ('c'..'i').send(@method, eval("('a'..)")).should be_false
+    ('c'..'i').send(@method, eval("('a'..)")).should == false
   end
 end
diff --git a/spec/ruby/core/range/shared/cover_and_include.rb b/spec/ruby/core/range/shared/cover_and_include.rb
index 13fc5e17906..97721a73073 100644
--- a/spec/ruby/core/range/shared/cover_and_include.rb
+++ b/spec/ruby/core/range/shared/cover_and_include.rb
@@ -46,41 +46,41 @@
     m.should_receive(:coerce).and_return([1, 2])
     m.should_receive(:<=>).and_return(1)
 
-    rng.send(@method, m).should be_false
+    rng.send(@method, m).should == false
   end
 
   it "raises an ArgumentError without exactly one argument" do
-    ->{ (1..2).send(@method) }.should raise_error(ArgumentError)
-    ->{ (1..2).send(@method, 1, 2) }.should raise_error(ArgumentError)
+    ->{ (1..2).send(@method) }.should.raise(ArgumentError)
+    ->{ (1..2).send(@method, 1, 2) }.should.raise(ArgumentError)
   end
 
   it "returns true if argument is equal to the first value of the range" do
-    (0..5).send(@method, 0).should be_true
-    ('f'..'s').send(@method, 'f').should be_true
+    (0..5).send(@method, 0).should == true
+    ('f'..'s').send(@method, 'f').should == true
   end
 
   it "returns true if argument is equal to the last value of the range" do
-    (0..5).send(@method, 5).should be_true
-    (0...5).send(@method, 4).should be_true
-    ('f'..'s').send(@method, 's').should be_true
+    (0..5).send(@method, 5).should == true
+    (0...5).send(@method, 4).should == true
+    ('f'..'s').send(@method, 's').should == true
   end
 
   it "returns true if argument is less than the last value of the range and greater than the first value" do
-    (20..30).send(@method, 28).should be_true
-    ('e'..'h').send(@method, 'g').should be_true
+    (20..30).send(@method, 28).should == true
+    ('e'..'h').send(@method, 'g').should == true
   end
 
   it "returns true if argument is sole element in the range" do
-    (30..30).send(@method, 30).should be_true
+    (30..30).send(@method, 30).should == true
   end
 
   it "returns false if range is empty" do
-    (30...30).send(@method, 30).should be_false
-    (30...30).send(@method, nil).should be_false
+    (30...30).send(@method, 30).should == false
+    (30...30).send(@method, nil).should == false
   end
 
   it "returns false if the range does not contain the argument" do
-    ('A'..'C').send(@method, 20.9).should be_false
-    ('A'...'C').send(@method, 'C').should be_false
+    ('A'..'C').send(@method, 20.9).should == false
+    ('A'...'C').send(@method, 'C').should == false
   end
 end
diff --git a/spec/ruby/core/range/shared/include.rb b/spec/ruby/core/range/shared/include.rb
index 15a0e5fb9fb..5f0db480081 100644
--- a/spec/ruby/core/range/shared/include.rb
+++ b/spec/ruby/core/range/shared/include.rb
@@ -5,13 +5,13 @@
 describe :range_include, shared: true do
   describe "on string elements" do
     it "returns true if other is matched by element.succ" do
-      ('a'..'c').send(@method, 'b').should be_true
-      ('a'...'c').send(@method, 'b').should be_true
+      ('a'..'c').send(@method, 'b').should == true
+      ('a'...'c').send(@method, 'b').should == true
     end
 
     it "returns false if other is not matched by element.succ" do
-      ('a'..'c').send(@method, 'bc').should be_false
-      ('a'...'c').send(@method, 'bc').should be_false
+      ('a'..'c').send(@method, 'bc').should == false
+      ('a'...'c').send(@method, 'bc').should == false
     end
   end
 
@@ -22,27 +22,27 @@
       end
 
       it "returns false if other is less than first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should == false
       end
 
       it "returns true if other is equal as first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should == true
       end
 
       it "returns true if other is matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should == true
       end
 
       it "returns false if other is not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should == false
       end
 
       it "returns false if other is equal as last element but not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should == false
       end
 
       it "returns false if other is greater than last element but matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should == false
       end
     end
 
@@ -52,27 +52,27 @@
       end
 
       it "returns false if other is less than first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should == false
       end
 
       it "returns true if other is equal as first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should == true
       end
 
       it "returns true if other is matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should == true
       end
 
       it "returns false if other is not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should == false
       end
 
       it "returns false if other is equal as last element but not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should == false
       end
 
       it "returns false if other is greater than last element but matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should == false
       end
     end
   end
diff --git a/spec/ruby/core/range/size_spec.rb b/spec/ruby/core/range/size_spec.rb
index 1a3ddd197e9..3a8843b99d7 100644
--- a/spec/ruby/core/range/size_spec.rb
+++ b/spec/ruby/core/range/size_spec.rb
@@ -67,26 +67,26 @@
 
   ruby_version_is "3.4" do
     it 'raises TypeError if a range is not iterable' do
-      -> { (1.0..16.0).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (1.0...16.0).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (1.0..15.9).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (1.1..16.0).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (1.1..15.9).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (16.0..0.0).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (Float::INFINITY..0).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (-Float::INFINITY..0).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (-Float::INFINITY..Float::INFINITY).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (..1).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (...0.5).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (..nil).size }.should raise_error(TypeError, /can't iterate from/)
-      -> { (...'o').size }.should raise_error(TypeError, /can't iterate from/)
-      -> { eval("(0.5...)").size }.should raise_error(TypeError, /can't iterate from/)
-      -> { eval("([]...)").size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (1.0..16.0).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (1.0...16.0).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (1.0..15.9).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (1.1..16.0).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (1.1..15.9).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (16.0..0.0).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (Float::INFINITY..0).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (-Float::INFINITY..0).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (-Float::INFINITY..Float::INFINITY).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (..1).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (...0.5).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (..nil).size }.should.raise(TypeError, /can't iterate from/)
+      -> { (...'o').size }.should.raise(TypeError, /can't iterate from/)
+      -> { eval("(0.5...)").size }.should.raise(TypeError, /can't iterate from/)
+      -> { eval("([]...)").size }.should.raise(TypeError, /can't iterate from/)
     end
   end
 
   it "returns nil if first and last are not Numeric" do
-    (:a..:z).size.should be_nil
-    ('a'..'z').size.should be_nil
+    (:a..:z).size.should == nil
+    ('a'..'z').size.should == nil
   end
 end
diff --git a/spec/ruby/core/range/step_spec.rb b/spec/ruby/core/range/step_spec.rb
index 0d0caf746d3..faab95d88db 100644
--- a/spec/ruby/core/range/step_spec.rb
+++ b/spec/ruby/core/range/step_spec.rb
@@ -7,7 +7,7 @@
 
   it "returns self" do
     r = 1..2
-    r.step { }.should equal(r)
+    r.step { }.should.equal?(r)
   end
 
   ruby_version_is ""..."3.4" do
@@ -16,27 +16,27 @@
       obj.should_receive(:to_int).and_return(1)
 
       (1..2).step(obj) { |x| ScratchPad << x }
-      ScratchPad.recorded.should eql([1, 2])
+      ScratchPad.recorded.should.eql?([1, 2])
     end
 
     it "raises a TypeError if step does not respond to #to_int" do
       obj = mock("Range#step non-integer")
 
-      -> { (1..2).step(obj) { } }.should raise_error(TypeError)
+      -> { (1..2).step(obj) { } }.should.raise(TypeError)
     end
 
     it "raises a TypeError if #to_int does not return an Integer" do
       obj = mock("Range#step non-integer")
       obj.should_receive(:to_int).and_return("1")
 
-      -> { (1..2).step(obj) { } }.should raise_error(TypeError)
+      -> { (1..2).step(obj) { } }.should.raise(TypeError)
     end
 
     it "raises a TypeError if the first element does not respond to #succ" do
       obj = mock("Range#step non-comparable")
       obj.should_receive(:<=>).with(obj).and_return(1)
 
-      -> { (obj..obj).step { |x| x } }.should raise_error(TypeError)
+      -> { (obj..obj).step { |x| x } }.should.raise(TypeError)
     end
   end
 
@@ -46,34 +46,40 @@
       obj.should_receive(:coerce).at_least(:once).and_return([1, 2])
 
       (1..3).step(obj) { |x| ScratchPad << x }
-      ScratchPad.recorded.should eql([1, 3])
+      ScratchPad.recorded.should.eql?([1, 3])
     end
 
     it "raises a TypeError if step does not respond to #coerce" do
       obj = mock("Range#step non-coercible")
 
-      -> { (1..2).step(obj) { } }.should raise_error(TypeError)
+      -> { (1..2).step(obj) { } }.should.raise(TypeError)
     end
   end
 
   it "raises an ArgumentError if step is 0" do
-    -> { (-1..1).step(0) { |x| x } }.should raise_error(ArgumentError)
+    -> { (-1..1).step(0) { |x| x } }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if step is 0.0" do
-    -> { (-1..1).step(0.0) { |x| x } }.should raise_error(ArgumentError)
+    -> { (-1..1).step(0.0) { |x| x } }.should.raise(ArgumentError)
   end
 
   ruby_version_is "3.4" do
-    it "does not raise an ArgumentError if step is 0 for non-numeric ranges" do
+    it "does not iterate if step is 0 for bounded non-numeric ranges" do
       t = Time.utc(2023, 2, 24)
-      -> { (t..t+1).step(0) { break } }.should_not raise_error(ArgumentError)
+      (t..t + 1).step(0) { |x| ScratchPad << x }
+      ScratchPad.recorded.should == []
+    end
+
+    it "raises an ArgumentError when iterating a beginless range" do
+      -> { (..10).step(1) { break } }.should.raise(ArgumentError,
+        "#step iteration for beginless ranges is meaningless")
     end
   end
 
   ruby_version_is ""..."3.4" do
     it "raises an ArgumentError if step is negative" do
-      -> { (-1..1).step(-2) { |x| x } }.should raise_error(ArgumentError)
+      -> { (-1..1).step(-2) { |x| x } }.should.raise(ArgumentError)
     end
   end
 
@@ -81,28 +87,28 @@
     describe "and Integer values" do
       it "yields Integer values incremented by 1 and less than or equal to end when not passed a step" do
         (-2..2).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2, -1, 0, 1, 2])
+        ScratchPad.recorded.should.eql?([-2, -1, 0, 1, 2])
       end
 
       it "yields Integer values incremented by an Integer step" do
         (-5..5).step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-5, -3, -1, 1, 3, 5])
+        ScratchPad.recorded.should.eql?([-5, -3, -1, 1, 3, 5])
       end
 
       it "yields Float values incremented by a Float step" do
         (-2..2).step(1.5) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -0.5, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -0.5, 1.0])
       end
 
       ruby_version_is "3.4" do
         it "does not iterate if step is negative for forward range" do
           (-1..1).step(-1) { |x| ScratchPad << x }
-          ScratchPad.recorded.should eql([])
+          ScratchPad.recorded.should.eql?([])
         end
 
         it "iterates backward if step is negative for backward range" do
           (1..-1).step(-1) { |x| ScratchPad << x }
-          ScratchPad.recorded.should eql([1, 0, -1])
+          ScratchPad.recorded.should.eql?([1, 0, -1])
         end
       end
     end
@@ -110,67 +116,79 @@
     describe "and Float values" do
       it "yields Float values incremented by 1 and less than or equal to end when not passed a step" do
         (-2.0..2.0).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0, 2.0])
+        ScratchPad.recorded.should.eql?([-2.0, -1.0, 0.0, 1.0, 2.0])
       end
 
       it "yields Float values incremented by an Integer step" do
         (-5.0..5.0).step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0, 5.0])
+        ScratchPad.recorded.should.eql?([-5.0, -3.0, -1.0, 1.0, 3.0, 5.0])
       end
 
       it "yields Float values incremented by a Float step" do
         (-1.0..1.0).step(0.5) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5, 1.0])
+        ScratchPad.recorded.should.eql?([-1.0, -0.5, 0.0, 0.5, 1.0])
       end
 
       it "returns Float values of 'step * n + begin <= end'" do
         (1.0..6.4).step(1.8) { |x| ScratchPad << x }
         (1.0..12.7).step(1.3) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([1.0, 2.8, 4.6, 6.4, 1.0, 2.3, 3.6,
+        ScratchPad.recorded.should.eql?([1.0, 2.8, 4.6, 6.4, 1.0, 2.3, 3.6,
                                        4.9, 6.2, 7.5, 8.8, 10.1, 11.4, 12.7])
       end
 
       it "handles infinite values at either end" do
         (-Float::INFINITY..0.0).step(2) { |x| ScratchPad << x; break if ScratchPad.recorded.size == 3 }
-        ScratchPad.recorded.should eql([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY])
+        ScratchPad.recorded.should.eql?([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY])
 
         ScratchPad.record []
         (0.0..Float::INFINITY).step(2) { |x| ScratchPad << x; break if ScratchPad.recorded.size == 3 }
-        ScratchPad.recorded.should eql([0.0, 2.0, 4.0])
+        ScratchPad.recorded.should.eql?([0.0, 2.0, 4.0])
+      end
+
+      ruby_version_is "3.4" do
+        it "does not iterate if step is negative for forward range" do
+          (-1.0..1.0).step(-0.5) { |x| ScratchPad << x }
+          ScratchPad.recorded.should.eql?([])
+        end
+
+        it "iterates backward if step is negative for backward range" do
+          (1.0..-1.0).step(-0.5) { |x| ScratchPad << x }
+          ScratchPad.recorded.should.eql?([1.0, 0.5, 0.0, -0.5, -1.0])
+        end
       end
     end
 
     describe "and Integer, Float values" do
       it "yields Float values incremented by 1 and less than or equal to end when not passed a step" do
         (-2..2.0).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0, 2.0])
+        ScratchPad.recorded.should.eql?([-2.0, -1.0, 0.0, 1.0, 2.0])
       end
 
       it "yields Float values incremented by an Integer step" do
         (-5..5.0).step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0, 5.0])
+        ScratchPad.recorded.should.eql?([-5.0, -3.0, -1.0, 1.0, 3.0, 5.0])
       end
 
       it "yields Float values incremented by a Float step" do
         (-1..1.0).step(0.5) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5, 1.0])
+        ScratchPad.recorded.should.eql?([-1.0, -0.5, 0.0, 0.5, 1.0])
       end
     end
 
     describe "and Float, Integer values" do
       it "yields Float values incremented by 1 and less than or equal to end when not passed a step" do
         (-2.0..2).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0, 2.0])
+        ScratchPad.recorded.should.eql?([-2.0, -1.0, 0.0, 1.0, 2.0])
       end
 
       it "yields Float values incremented by an Integer step" do
         (-5.0..5).step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0, 5.0])
+        ScratchPad.recorded.should.eql?([-5.0, -3.0, -1.0, 1.0, 3.0, 5.0])
       end
 
       it "yields Float values incremented by a Float step" do
         (-1.0..1).step(0.5) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5, 1.0])
+        ScratchPad.recorded.should.eql?([-1.0, -0.5, 0.0, 0.5, 1.0])
       end
     end
 
@@ -186,7 +204,7 @@
       end
 
       it "raises a TypeError when passed a Float step" do
-        -> { ("A".."G").step(2.0) { } }.should raise_error(TypeError)
+        -> { ("A".."G").step(2.0) { } }.should.raise(TypeError)
       end
 
       ruby_version_is ""..."3.4" do
@@ -207,7 +225,7 @@
         end
 
         it "raises a TypeError when passed an incompatible type step" do
-          -> { ("A".."G").step([]) { } }.should raise_error(TypeError)
+          -> { ("A".."G").step([]) { } }.should.raise(TypeError)
         end
 
         it "calls #+ on begin and each element returned by #+" do
@@ -287,89 +305,96 @@
     describe "and Integer values" do
       it "yields Integer values incremented by 1 and less than end when not passed a step" do
         (-2...2).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2, -1, 0, 1])
+        ScratchPad.recorded.should.eql?([-2, -1, 0, 1])
       end
 
       it "yields Integer values incremented by an Integer step" do
         (-5...5).step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-5, -3, -1, 1, 3])
+        ScratchPad.recorded.should.eql?([-5, -3, -1, 1, 3])
       end
 
       it "yields Float values incremented by a Float step" do
         (-2...2).step(1.5) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -0.5, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -0.5, 1.0])
       end
     end
 
     describe "and Float values" do
       it "yields Float values incremented by 1 and less than end when not passed a step" do
         (-2.0...2.0).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -1.0, 0.0, 1.0])
       end
 
       it "yields Float values incremented by an Integer step" do
         (-5.0...5.0).step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0])
+        ScratchPad.recorded.should.eql?([-5.0, -3.0, -1.0, 1.0, 3.0])
       end
 
       it "yields Float values incremented by a Float step" do
         (-1.0...1.0).step(0.5) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5])
+        ScratchPad.recorded.should.eql?([-1.0, -0.5, 0.0, 0.5])
       end
 
       it "returns Float values of 'step * n + begin < end'" do
         (1.0...6.4).step(1.8) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([1.0, 2.8, 4.6])
+        ScratchPad.recorded.should.eql?([1.0, 2.8, 4.6])
       end
 
       it "correctly handles values near the upper limit" do # https://bugs.ruby-lang.org/issues/16612
         (1.0...55.6).step(18.2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([1.0, 19.2, 37.4, 55.599999999999994])
+        ScratchPad.recorded.should.eql?([1.0, 19.2, 37.4, 55.599999999999994])
 
         (1.0...55.6).step(18.2).size.should == 4
       end
 
       it "handles infinite values at either end" do
         (-Float::INFINITY...0.0).step(2) { |x| ScratchPad << x; break if ScratchPad.recorded.size == 3 }
-        ScratchPad.recorded.should eql([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY])
+        ScratchPad.recorded.should.eql?([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY])
 
         ScratchPad.record []
         (0.0...Float::INFINITY).step(2) { |x| ScratchPad << x; break if ScratchPad.recorded.size == 3 }
-        ScratchPad.recorded.should eql([0.0, 2.0, 4.0])
+        ScratchPad.recorded.should.eql?([0.0, 2.0, 4.0])
+      end
+
+      ruby_version_is "3.4" do
+        it "iterates backward with exclusive end if step is negative" do
+          (1.0...-1.0).step(-0.5) { |x| ScratchPad << x }
+          ScratchPad.recorded.should.eql?([1.0, 0.5, 0.0, -0.5])
+        end
       end
     end
 
     describe "and Integer, Float values" do
       it "yields Float values incremented by 1 and less than end when not passed a step" do
         (-2...2.0).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -1.0, 0.0, 1.0])
       end
 
       it "yields Float values incremented by an Integer step" do
         (-5...5.0).step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0])
+        ScratchPad.recorded.should.eql?([-5.0, -3.0, -1.0, 1.0, 3.0])
       end
 
       it "yields an Float and then Float values incremented by a Float step" do
         (-1...1.0).step(0.5) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5])
+        ScratchPad.recorded.should.eql?([-1.0, -0.5, 0.0, 0.5])
       end
     end
 
     describe "and Float, Integer values" do
       it "yields Float values incremented by 1 and less than end when not passed a step" do
         (-2.0...2).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -1.0, 0.0, 1.0])
       end
 
       it "yields Float values incremented by an Integer step" do
         (-5.0...5).step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0])
+        ScratchPad.recorded.should.eql?([-5.0, -3.0, -1.0, 1.0, 3.0])
       end
 
       it "yields Float values incremented by a Float step" do
         (-1.0...1).step(0.5) { |x| ScratchPad << x }
-        ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5])
+        ScratchPad.recorded.should.eql?([-1.0, -0.5, 0.0, 0.5])
       end
     end
 
@@ -386,7 +411,7 @@
         end
 
         it "raises a TypeError when passed a Float step" do
-          -> { ("A"..."G").step(2.0) { } }.should raise_error(TypeError)
+          -> { ("A"..."G").step(2.0) { } }.should.raise(TypeError)
         end
       end
 
@@ -397,7 +422,7 @@
         end
 
         it "raises a TypeError when passed an incompatible type step" do
-          -> { ("A".."G").step([]) { } }.should raise_error(TypeError)
+          -> { ("A".."G").step([]) { } }.should.raise(TypeError)
         end
       end
     end
@@ -407,67 +432,74 @@
     describe "and Integer values" do
       it "yield Integer values incremented by 1 when not passed a step" do
         (-2..).step { |x| break if x > 2; ScratchPad << x }
-        ScratchPad.recorded.should eql([-2, -1, 0, 1, 2])
+        ScratchPad.recorded.should.eql?([-2, -1, 0, 1, 2])
 
         ScratchPad.record []
         (-2...).step { |x| break if x > 2; ScratchPad << x }
-        ScratchPad.recorded.should eql([-2, -1, 0, 1, 2])
+        ScratchPad.recorded.should.eql?([-2, -1, 0, 1, 2])
       end
 
       it "yields Integer values incremented by an Integer step" do
         (-5..).step(2) { |x| break if x > 3; ScratchPad << x }
-        ScratchPad.recorded.should eql([-5, -3, -1, 1, 3])
+        ScratchPad.recorded.should.eql?([-5, -3, -1, 1, 3])
 
         ScratchPad.record []
         (-5...).step(2) { |x| break if x > 3; ScratchPad << x }
-        ScratchPad.recorded.should eql([-5, -3, -1, 1, 3])
+        ScratchPad.recorded.should.eql?([-5, -3, -1, 1, 3])
       end
 
       it "yields Float values incremented by a Float step" do
         (-2..).step(1.5) { |x| break if x > 1.0; ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -0.5, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -0.5, 1.0])
 
         ScratchPad.record []
         (-2..).step(1.5) { |x| break if x > 1.0; ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -0.5, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -0.5, 1.0])
       end
     end
 
     describe "and Float values" do
       it "yields Float values incremented by 1 and less than end when not passed a step" do
         (-2.0..).step { |x| break if x > 1.5; ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -1.0, 0.0, 1.0])
 
         ScratchPad.record []
         (-2.0...).step { |x| break if x > 1.5; ScratchPad << x }
-        ScratchPad.recorded.should eql([-2.0, -1.0, 0.0, 1.0])
+        ScratchPad.recorded.should.eql?([-2.0, -1.0, 0.0, 1.0])
       end
 
       it "yields Float values incremented by an Integer step" do
         (-5.0..).step(2) { |x| break if x > 3.5; ScratchPad << x }
-        ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0])
+        ScratchPad.recorded.should.eql?([-5.0, -3.0, -1.0, 1.0, 3.0])
 
         ScratchPad.record []
         (-5.0...).step(2) { |x| break if x > 3.5; ScratchPad << x }
-        ScratchPad.recorded.should eql([-5.0, -3.0, -1.0, 1.0, 3.0])
+        ScratchPad.recorded.should.eql?([-5.0, -3.0, -1.0, 1.0, 3.0])
       end
 
       it "yields Float values incremented by a Float step" do
         (-1.0..).step(0.5) { |x| break if x > 0.6; ScratchPad << x }
-        ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5])
+        ScratchPad.recorded.should.eql?([-1.0, -0.5, 0.0, 0.5])
 
         ScratchPad.record []
         (-1.0...).step(0.5) { |x| break if x > 0.6; ScratchPad << x }
-        ScratchPad.recorded.should eql([-1.0, -0.5, 0.0, 0.5])
+        ScratchPad.recorded.should.eql?([-1.0, -0.5, 0.0, 0.5])
+      end
+
+      it "computes each value independently to avoid accumulating floating-point errors" do
+        result = []
+        (0.0..).step(0.1) { |x| result << x; break if result.size == 20 }
+        expected = 20.times.map { |i| i * 0.1 + 0.0 }
+        result.should.eql?(expected)
       end
 
       it "handles infinite values at the start" do
         (-Float::INFINITY..).step(2) { |x| ScratchPad << x; break if ScratchPad.recorded.size == 3 }
-        ScratchPad.recorded.should eql([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY])
+        ScratchPad.recorded.should.eql?([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY])
 
         ScratchPad.record []
         (-Float::INFINITY...).step(2) { |x| ScratchPad << x; break if ScratchPad.recorded.size == 3 }
-        ScratchPad.recorded.should eql([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY])
+        ScratchPad.recorded.should.eql?([-Float::INFINITY, -Float::INFINITY, -Float::INFINITY])
       end
     end
 
@@ -491,8 +523,8 @@
       end
 
       it "raises a TypeError when passed a Float step" do
-        -> { ('A'..).step(2.0) { } }.should raise_error(TypeError)
-        -> { ('A'...).step(2.0) { } }.should raise_error(TypeError)
+        -> { ('A'..).step(2.0) { } }.should.raise(TypeError)
+        -> { ('A'...).step(2.0) { } }.should.raise(TypeError)
       end
 
       ruby_version_is "3.4" do
@@ -506,8 +538,8 @@
         end
 
         it "raises a TypeError when passed an incompatible type step" do
-          -> { ('A'..).step([]) { } }.should raise_error(TypeError)
-          -> { ('A'...).step([]) { } }.should raise_error(TypeError)
+          -> { ('A'..).step([]) { } }.should.raise(TypeError)
+          -> { ('A'...).step([]) { } }.should.raise(TypeError)
         end
       end
     end
@@ -515,7 +547,7 @@
 
   describe "when no block is given" do
     it "raises an ArgumentError if step is 0" do
-      -> { (-1..1).step(0) }.should raise_error(ArgumentError)
+      -> { (-1..1).step(0) }.should.raise(ArgumentError)
     end
 
     describe "returned Enumerator" do
@@ -523,20 +555,20 @@
         ruby_version_is ""..."3.4" do
           it "raises a TypeError if step does not respond to #to_int" do
             obj = mock("Range#step non-integer")
-            -> { (1..2).step(obj) }.should raise_error(TypeError)
+            -> { (1..2).step(obj) }.should.raise(TypeError)
           end
 
           it "raises a TypeError if #to_int does not return an Integer" do
             obj = mock("Range#step non-integer")
             obj.should_receive(:to_int).and_return("1")
-            -> { (1..2).step(obj) }.should raise_error(TypeError)
+            -> { (1..2).step(obj) }.should.raise(TypeError)
           end
         end
 
         ruby_version_is "3.4" do
           it "does not raise if step is incompatible" do
             obj = mock("Range#step non-integer")
-            -> { (1..2).step(obj) }.should_not raise_error
+            -> { (1..2).step(obj) }.should_not.raise
           end
         end
 
@@ -589,7 +621,7 @@
             obj = mock("Range#step non-comparable")
             obj.should_receive(:<=>).with(obj).and_return(1)
             enum = (obj..obj).step
-            -> { enum.size }.should_not raise_error
+            -> { enum.size }.should_not.raise
             enum.size.should == nil
           end
         end
@@ -604,7 +636,7 @@
             obj = mock("Range#step non-comparable")
             obj.should_receive(:<=>).with(obj).and_return(1)
             enum = (obj..obj).step(obj)
-            -> { enum.size }.should_not raise_error
+            -> { enum.size }.should_not.raise
             enum.size.should == nil
           end
         end
@@ -657,7 +689,17 @@
 
           ruby_version_is "3.4" do
             it "raises an ArgumentError" do
-              -> { Range.new(nil, nil).step(1) }.should raise_error(ArgumentError)
+              -> { Range.new(nil, nil).step(1) }.should.raise(ArgumentError,
+                "#step for non-numeric beginless ranges is meaningless")
+            end
+          end
+        end
+
+        context "when range is beginless and finite" do
+          ruby_version_is "3.4" do
+            it "raises an ArgumentError if step is non-numeric" do
+              -> { (..10).step("a") }.should.raise(ArgumentError,
+                "#step for non-numeric beginless ranges is meaningless")
             end
           end
         end
diff --git a/spec/ruby/core/range/to_a_spec.rb b/spec/ruby/core/range/to_a_spec.rb
index b1d3de32dba..6221ae5f71c 100644
--- a/spec/ruby/core/range/to_a_spec.rb
+++ b/spec/ruby/core/range/to_a_spec.rb
@@ -6,7 +6,7 @@
     ('A'..'D').to_a.should == ['A','B','C','D']
     ('A'...'D').to_a.should == ['A','B','C']
     (0xfffd...0xffff).to_a.should == [0xfffd,0xfffe]
-    -> { (0.5..2.4).to_a }.should raise_error(TypeError)
+    -> { (0.5..2.4).to_a }.should.raise(TypeError)
   end
 
   it "returns empty array for descending-ordered" do
@@ -30,10 +30,10 @@
   end
 
   it "throws an exception for endless ranges" do
-    -> { eval("(1..)").to_a }.should raise_error(RangeError)
+    -> { eval("(1..)").to_a }.should.raise(RangeError)
   end
 
   it "throws an exception for beginless ranges" do
-    -> { (..1).to_a }.should raise_error(TypeError)
+    -> { (..1).to_a }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/range/to_set_spec.rb b/spec/ruby/core/range/to_set_spec.rb
index 14e0ce1e31e..ac81d2cc4b9 100644
--- a/spec/ruby/core/range/to_set_spec.rb
+++ b/spec/ruby/core/range/to_set_spec.rb
@@ -14,13 +14,13 @@
   it "raises a TypeError for a beginningless range" do
     -> {
       (..0).to_set
-    }.should raise_error(TypeError, "can't iterate from NilClass")
+    }.should.raise(TypeError, "can't iterate from NilClass")
   end
 
   ruby_version_is "4.0" do
     it "raises a RangeError if the range is endless" do
-      -> { (1..).to_set }.should raise_error(RangeError, "cannot convert endless range to a set")
-      -> { (1...).to_set }.should raise_error(RangeError, "cannot convert endless range to a set")
+      -> { (1..).to_set }.should.raise(RangeError, "cannot convert endless range to a set")
+      -> { (1...).to_set }.should.raise(RangeError, "cannot convert endless range to a set")
     end
   end
 
@@ -28,7 +28,7 @@
     ruby_version_is ""..."4.0" do
       it "instantiates an object of provided as the first argument set class" do
         set = (1..3).to_set(EnumerableSpecs::SetSubclass)
-        set.should be_kind_of(EnumerableSpecs::SetSubclass)
+        set.should.is_a?(EnumerableSpecs::SetSubclass)
         set.to_a.sort.should == [1, 2, 3]
       end
     end
@@ -37,7 +37,7 @@
       it "instantiates an object of provided as the first argument set class and warns" do
         -> {
           set = (1..3).to_set(EnumerableSpecs::SetSubclass)
-          set.should be_kind_of(EnumerableSpecs::SetSubclass)
+          set.should.is_a?(EnumerableSpecs::SetSubclass)
           set.to_a.sort.should == [1, 2, 3]
         }.should complain(/warning: passing arguments to Enumerable#to_set is deprecated/)
       end
@@ -47,7 +47,7 @@
       it "does not accept any positional argument" do
         -> {
           (1..3).to_set(EnumerableSpecs::SetSubclass)
-        }.should raise_error(ArgumentError, "wrong number of arguments (given 1, expected 0)")
+        }.should.raise(ArgumentError, "wrong number of arguments (given 1, expected 0)")
       end
     end
   end
diff --git a/spec/ruby/core/rational/ceil_spec.rb b/spec/ruby/core/rational/ceil_spec.rb
index 0c0327448f3..0464eab1012 100644
--- a/spec/ruby/core/rational/ceil_spec.rb
+++ b/spec/ruby/core/rational/ceil_spec.rb
@@ -12,37 +12,37 @@
 
   describe "with no arguments (precision = 0)" do
     it "returns the Integer value rounded toward positive infinity" do
-      @rational.ceil.should eql 315
+      @rational.ceil.should.eql? 315
 
-      Rational(1, 2).ceil.should eql 1
-      Rational(-1, 2).ceil.should eql 0
-      Rational(1, 1).ceil.should eql 1
+      Rational(1, 2).ceil.should.eql? 1
+      Rational(-1, 2).ceil.should.eql? 0
+      Rational(1, 1).ceil.should.eql? 1
     end
   end
 
   describe "with a precision < 0" do
     it "moves the rounding point n decimal places left, returning an Integer" do
-      @rational.ceil(-3).should eql 1000
-      @rational.ceil(-2).should eql 400
-      @rational.ceil(-1).should eql 320
-
-      Rational(100, 2).ceil(-1).should eql 50
-      Rational(100, 2).ceil(-2).should eql 100
-      Rational(-100, 2).ceil(-1).should eql(-50)
-      Rational(-100, 2).ceil(-2).should eql(0)
+      @rational.ceil(-3).should.eql? 1000
+      @rational.ceil(-2).should.eql? 400
+      @rational.ceil(-1).should.eql? 320
+
+      Rational(100, 2).ceil(-1).should.eql? 50
+      Rational(100, 2).ceil(-2).should.eql? 100
+      Rational(-100, 2).ceil(-1).should.eql?(-50)
+      Rational(-100, 2).ceil(-2).should.eql?(0)
     end
   end
 
   describe "with precision > 0" do
     it "moves the rounding point n decimal places right, returning a Rational" do
-      @rational.ceil(1).should eql Rational(3143, 10)
-      @rational.ceil(2).should eql Rational(31429, 100)
-      @rational.ceil(3).should eql Rational(157143, 500)
-
-      Rational(100, 2).ceil(1).should eql Rational(50, 1)
-      Rational(100, 2).ceil(2).should eql Rational(50, 1)
-      Rational(-100, 2).ceil(1).should eql Rational(-50, 1)
-      Rational(-100, 2).ceil(2).should eql Rational(-50, 1)
+      @rational.ceil(1).should.eql? Rational(3143, 10)
+      @rational.ceil(2).should.eql? Rational(31429, 100)
+      @rational.ceil(3).should.eql? Rational(157143, 500)
+
+      Rational(100, 2).ceil(1).should.eql? Rational(50, 1)
+      Rational(100, 2).ceil(2).should.eql? Rational(50, 1)
+      Rational(-100, 2).ceil(1).should.eql? Rational(-50, 1)
+      Rational(-100, 2).ceil(2).should.eql? Rational(-50, 1)
     end
   end
 end
diff --git a/spec/ruby/core/rational/comparison_spec.rb b/spec/ruby/core/rational/comparison_spec.rb
index c9db60d5c78..482e9049896 100644
--- a/spec/ruby/core/rational/comparison_spec.rb
+++ b/spec/ruby/core/rational/comparison_spec.rb
@@ -3,54 +3,54 @@
 
 describe "Rational#<=> when passed a Rational object" do
   it "returns 1 when self is greater than the passed argument" do
-    (Rational(4, 4) <=> Rational(3, 4)).should equal(1)
-    (Rational(-3, 4) <=> Rational(-4, 4)).should equal(1)
+    (Rational(4, 4) <=> Rational(3, 4)).should.equal?(1)
+    (Rational(-3, 4) <=> Rational(-4, 4)).should.equal?(1)
   end
 
   it "returns 0 when self is equal to the passed argument" do
-    (Rational(4, 4) <=> Rational(4, 4)).should equal(0)
-    (Rational(-3, 4) <=> Rational(-3, 4)).should equal(0)
+    (Rational(4, 4) <=> Rational(4, 4)).should.equal?(0)
+    (Rational(-3, 4) <=> Rational(-3, 4)).should.equal?(0)
   end
 
   it "returns -1 when self is less than the passed argument" do
-    (Rational(3, 4) <=> Rational(4, 4)).should equal(-1)
-    (Rational(-4, 4) <=> Rational(-3, 4)).should equal(-1)
+    (Rational(3, 4) <=> Rational(4, 4)).should.equal?(-1)
+    (Rational(-4, 4) <=> Rational(-3, 4)).should.equal?(-1)
   end
 end
 
 describe "Rational#<=> when passed an Integer object" do
   it "returns 1 when self is greater than the passed argument" do
-    (Rational(4, 4) <=> 0).should equal(1)
-    (Rational(4, 4) <=> -10).should equal(1)
-    (Rational(-3, 4) <=> -1).should equal(1)
+    (Rational(4, 4) <=> 0).should.equal?(1)
+    (Rational(4, 4) <=> -10).should.equal?(1)
+    (Rational(-3, 4) <=> -1).should.equal?(1)
   end
 
   it "returns 0 when self is equal to the passed argument" do
-    (Rational(4, 4) <=> 1).should equal(0)
-    (Rational(-8, 4) <=> -2).should equal(0)
+    (Rational(4, 4) <=> 1).should.equal?(0)
+    (Rational(-8, 4) <=> -2).should.equal?(0)
   end
 
   it "returns -1 when self is less than the passed argument" do
-    (Rational(3, 4) <=> 1).should equal(-1)
-    (Rational(-4, 4) <=> 0).should equal(-1)
+    (Rational(3, 4) <=> 1).should.equal?(-1)
+    (Rational(-4, 4) <=> 0).should.equal?(-1)
   end
 end
 
 describe "Rational#<=> when passed a Float object" do
   it "returns 1 when self is greater than the passed argument" do
-    (Rational(4, 4) <=> 0.5).should equal(1)
-    (Rational(4, 4) <=> -1.5).should equal(1)
-    (Rational(-3, 4) <=> -0.8).should equal(1)
+    (Rational(4, 4) <=> 0.5).should.equal?(1)
+    (Rational(4, 4) <=> -1.5).should.equal?(1)
+    (Rational(-3, 4) <=> -0.8).should.equal?(1)
   end
 
   it "returns 0 when self is equal to the passed argument" do
-    (Rational(4, 4) <=> 1.0).should equal(0)
-    (Rational(-6, 4) <=> -1.5).should equal(0)
+    (Rational(4, 4) <=> 1.0).should.equal?(0)
+    (Rational(-6, 4) <=> -1.5).should.equal?(0)
   end
 
   it "returns -1 when self is less than the passed argument" do
-    (Rational(3, 4) <=> 1.2).should equal(-1)
-    (Rational(-4, 4) <=> 0.5).should equal(-1)
+    (Rational(3, 4) <=> 1.2).should.equal?(-1)
+    (Rational(-4, 4) <=> 0.5).should.equal?(-1)
   end
 end
 
@@ -82,12 +82,12 @@
     b = mock("numeric with failed #coerce")
     b.should_receive(:coerce).and_raise(RationalSpecs::CoerceError)
 
-    -> { Rational(3, 4) <=> b }.should raise_error(RationalSpecs::CoerceError)
+    -> { Rational(3, 4) <=> b }.should.raise(RationalSpecs::CoerceError)
   end
 end
 
 describe "Rational#<=> when passed a non-Numeric Object that doesn't respond to #coerce" do
   it "returns nil" do
-    (Rational <=> mock("Object")).should be_nil
+    (Rational <=> mock("Object")).should == nil
   end
 end
diff --git a/spec/ruby/core/rational/denominator_spec.rb b/spec/ruby/core/rational/denominator_spec.rb
index 46872448939..ba6e936d601 100644
--- a/spec/ruby/core/rational/denominator_spec.rb
+++ b/spec/ruby/core/rational/denominator_spec.rb
@@ -2,8 +2,8 @@
 
 describe "Rational#denominator" do
   it "returns the denominator" do
-    Rational(3, 4).denominator.should equal(4)
-    Rational(3, -4).denominator.should equal(4)
+    Rational(3, 4).denominator.should.equal?(4)
+    Rational(3, -4).denominator.should.equal?(4)
 
     Rational(1, bignum_value).denominator.should == bignum_value
   end
diff --git a/spec/ruby/core/rational/div_spec.rb b/spec/ruby/core/rational/div_spec.rb
index d3adb9b5367..a6796635434 100644
--- a/spec/ruby/core/rational/div_spec.rb
+++ b/spec/ruby/core/rational/div_spec.rb
@@ -2,16 +2,16 @@
 
 describe "Rational#div" do
   it "returns an Integer" do
-    Rational(229, 21).div(82).should be_kind_of(Integer)
+    Rational(229, 21).div(82).should.is_a?(Integer)
   end
 
   it "raises an ArgumentError if passed more than one argument" do
-    -> { Rational(3, 4).div(2,3) }.should raise_error(ArgumentError)
+    -> { Rational(3, 4).div(2,3) }.should.raise(ArgumentError)
   end
 
   # See http://redmine.ruby-lang.org/issues/show/1648
   it "raises a TypeError if passed a non-numeric argument" do
-    -> { Rational(3, 4).div([]) }.should raise_error(TypeError)
+    -> { Rational(3, 4).div([]) }.should.raise(TypeError)
   end
 end
 
@@ -22,11 +22,11 @@
   end
 
   it "raises a ZeroDivisionError when the argument has a numerator of 0" do
-    -> { Rational(3, 4).div(Rational(0, 3)) }.should raise_error(ZeroDivisionError)
+    -> { Rational(3, 4).div(Rational(0, 3)) }.should.raise(ZeroDivisionError)
   end
 
   it "raises a ZeroDivisionError when the argument has a numerator of 0.0" do
-    -> { Rational(3, 4).div(Rational(0.0, 3)) }.should raise_error(ZeroDivisionError)
+    -> { Rational(3, 4).div(Rational(0.0, 3)) }.should.raise(ZeroDivisionError)
   end
 end
 
@@ -37,7 +37,7 @@
   end
 
   it "raises a ZeroDivisionError when the argument is 0" do
-    -> { Rational(3, 4).div(0) }.should raise_error(ZeroDivisionError)
+    -> { Rational(3, 4).div(0) }.should.raise(ZeroDivisionError)
   end
 end
 
@@ -49,6 +49,6 @@
   end
 
   it "raises a ZeroDivisionError when the argument is 0.0" do
-    -> { Rational(3, 4).div(0.0) }.should raise_error(ZeroDivisionError)
+    -> { Rational(3, 4).div(0.0) }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/core/rational/divide_spec.rb b/spec/ruby/core/rational/divide_spec.rb
index 8f5ca1fdec7..c45d1fca2f5 100644
--- a/spec/ruby/core/rational/divide_spec.rb
+++ b/spec/ruby/core/rational/divide_spec.rb
@@ -29,46 +29,46 @@
 
 describe "Rational#/ when passed an Integer" do
   it "returns self divided by other as a Rational" do
-    (Rational(3, 4) / 2).should eql(Rational(3, 8))
-    (Rational(2, 4) / 2).should eql(Rational(1, 4))
-    (Rational(6, 7) / -2).should eql(Rational(-3, 7))
+    (Rational(3, 4) / 2).should.eql?(Rational(3, 8))
+    (Rational(2, 4) / 2).should.eql?(Rational(1, 4))
+    (Rational(6, 7) / -2).should.eql?(Rational(-3, 7))
   end
 
   it "raises a ZeroDivisionError when passed 0" do
-    -> { Rational(3, 4) / 0 }.should raise_error(ZeroDivisionError)
+    -> { Rational(3, 4) / 0 }.should.raise(ZeroDivisionError)
   end
 end
 
 describe "Rational#/ when passed a Rational" do
   it "returns self divided by other as a Rational" do
-    (Rational(3, 4) / Rational(3, 4)).should eql(Rational(1, 1))
-    (Rational(2, 4) / Rational(1, 4)).should eql(Rational(2, 1))
+    (Rational(3, 4) / Rational(3, 4)).should.eql?(Rational(1, 1))
+    (Rational(2, 4) / Rational(1, 4)).should.eql?(Rational(2, 1))
 
     (Rational(2, 4) / 2).should == Rational(1, 4)
     (Rational(6, 7) / -2).should == Rational(-3, 7)
   end
 
   it "raises a ZeroDivisionError when passed a Rational with a numerator of 0" do
-    -> { Rational(3, 4) / Rational(0, 1) }.should raise_error(ZeroDivisionError)
+    -> { Rational(3, 4) / Rational(0, 1) }.should.raise(ZeroDivisionError)
   end
 end
 
 describe "Rational#/ when passed a Float" do
   it "returns self divided by other as a Float" do
-    (Rational(3, 4) / 0.75).should eql(1.0)
-    (Rational(3, 4) / 0.25).should eql(3.0)
-    (Rational(3, 4) / 0.3).should eql(2.5)
+    (Rational(3, 4) / 0.75).should.eql?(1.0)
+    (Rational(3, 4) / 0.25).should.eql?(3.0)
+    (Rational(3, 4) / 0.3).should.eql?(2.5)
 
-    (Rational(-3, 4) / 0.3).should eql(-2.5)
-    (Rational(3, -4) / 0.3).should eql(-2.5)
-    (Rational(3, 4) / -0.3).should eql(-2.5)
+    (Rational(-3, 4) / 0.3).should.eql?(-2.5)
+    (Rational(3, -4) / 0.3).should.eql?(-2.5)
+    (Rational(3, 4) / -0.3).should.eql?(-2.5)
   end
 
   it "returns infinity when passed 0" do
-    (Rational(3, 4) / 0.0).infinite?.should eql(1)
-    (Rational(-3, -4) / 0.0).infinite?.should eql(1)
+    (Rational(3, 4) / 0.0).infinite?.should.eql?(1)
+    (Rational(-3, -4) / 0.0).infinite?.should.eql?(1)
 
-    (Rational(-3, 4) / 0.0).infinite?.should eql(-1)
-    (Rational(3, -4) / 0.0).infinite?.should eql(-1)
+    (Rational(-3, 4) / 0.0).infinite?.should.eql?(-1)
+    (Rational(3, -4) / 0.0).infinite?.should.eql?(-1)
   end
 end
diff --git a/spec/ruby/core/rational/divmod_spec.rb b/spec/ruby/core/rational/divmod_spec.rb
index f0555294a3a..68f8ecfd2de 100644
--- a/spec/ruby/core/rational/divmod_spec.rb
+++ b/spec/ruby/core/rational/divmod_spec.rb
@@ -2,41 +2,41 @@
 
 describe "Rational#divmod when passed a Rational" do
   it "returns the quotient as Integer and the remainder as Rational" do
-    Rational(7, 4).divmod(Rational(1, 2)).should eql([3, Rational(1, 4)])
-    Rational(7, 4).divmod(Rational(-1, 2)).should eql([-4, Rational(-1, 4)])
-    Rational(0, 4).divmod(Rational(4, 3)).should eql([0, Rational(0, 1)])
+    Rational(7, 4).divmod(Rational(1, 2)).should.eql?([3, Rational(1, 4)])
+    Rational(7, 4).divmod(Rational(-1, 2)).should.eql?([-4, Rational(-1, 4)])
+    Rational(0, 4).divmod(Rational(4, 3)).should.eql?([0, Rational(0, 1)])
 
-    Rational(bignum_value, 4).divmod(Rational(4, 3)).should eql([3458764513820540928, Rational(0, 1)])
+    Rational(bignum_value, 4).divmod(Rational(4, 3)).should.eql?([3458764513820540928, Rational(0, 1)])
   end
 
   it "raises a ZeroDivisionError when passed a Rational with a numerator of 0" do
-    -> { Rational(7, 4).divmod(Rational(0, 3)) }.should raise_error(ZeroDivisionError)
+    -> { Rational(7, 4).divmod(Rational(0, 3)) }.should.raise(ZeroDivisionError)
   end
 end
 
 describe "Rational#divmod when passed an Integer" do
   it "returns the quotient as Integer and the remainder as Rational" do
-    Rational(7, 4).divmod(2).should eql([0, Rational(7, 4)])
-    Rational(7, 4).divmod(-2).should eql([-1, Rational(-1, 4)])
+    Rational(7, 4).divmod(2).should.eql?([0, Rational(7, 4)])
+    Rational(7, 4).divmod(-2).should.eql?([-1, Rational(-1, 4)])
 
-    Rational(bignum_value, 4).divmod(3).should eql([1537228672809129301, Rational(1, 1)])
+    Rational(bignum_value, 4).divmod(3).should.eql?([1537228672809129301, Rational(1, 1)])
   end
 
   it "raises a ZeroDivisionError when passed 0" do
-    -> { Rational(7, 4).divmod(0) }.should raise_error(ZeroDivisionError)
+    -> { Rational(7, 4).divmod(0) }.should.raise(ZeroDivisionError)
   end
 end
 
 describe "Rational#divmod when passed a Float" do
   it "returns the quotient as Integer and the remainder as Float" do
-    Rational(7, 4).divmod(0.5).should eql([3, 0.25])
+    Rational(7, 4).divmod(0.5).should.eql?([3, 0.25])
   end
 
   it "returns the quotient as Integer and the remainder as Float" do
-    Rational(7, 4).divmod(-0.5).should eql([-4, -0.25])
+    Rational(7, 4).divmod(-0.5).should.eql?([-4, -0.25])
   end
 
   it "raises a ZeroDivisionError when passed 0" do
-    -> { Rational(7, 4).divmod(0.0) }.should raise_error(ZeroDivisionError)
+    -> { Rational(7, 4).divmod(0.0) }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/core/rational/equal_value_spec.rb b/spec/ruby/core/rational/equal_value_spec.rb
index ba40d29c3b1..1dd077ea41c 100644
--- a/spec/ruby/core/rational/equal_value_spec.rb
+++ b/spec/ruby/core/rational/equal_value_spec.rb
@@ -5,35 +5,35 @@
     obj = mock("Object")
     obj.should_receive(:==).and_return(:result)
 
-    (Rational(3, 4) == obj).should_not be_false
+    (Rational(3, 4) == obj).should_not == false
   end
 end
 
 describe "Rational#== when passed a Rational" do
   it "returns true if self has the same numerator and denominator as the passed argument" do
-    (Rational(3, 4) == Rational(3, 4)).should be_true
-    (Rational(-3, -4) == Rational(3, 4)).should be_true
-    (Rational(-4, 5) == Rational(4, -5)).should be_true
+    (Rational(3, 4) == Rational(3, 4)).should == true
+    (Rational(-3, -4) == Rational(3, 4)).should == true
+    (Rational(-4, 5) == Rational(4, -5)).should == true
 
-    (Rational(bignum_value, 3) == Rational(bignum_value, 3)).should be_true
-    (Rational(-bignum_value, 3) == Rational(bignum_value, -3)).should be_true
+    (Rational(bignum_value, 3) == Rational(bignum_value, 3)).should == true
+    (Rational(-bignum_value, 3) == Rational(bignum_value, -3)).should == true
   end
 end
 
 describe "Rational#== when passed a Float" do
   it "converts self to a Float and compares it with the passed argument" do
-    (Rational(3, 4) == 0.75).should be_true
-    (Rational(4, 2) == 2.0).should be_true
-    (Rational(-4, 2) == -2.0).should be_true
-    (Rational(4, -2) == -2.0).should be_true
+    (Rational(3, 4) == 0.75).should == true
+    (Rational(4, 2) == 2.0).should == true
+    (Rational(-4, 2) == -2.0).should == true
+    (Rational(4, -2) == -2.0).should == true
   end
 end
 
 describe "Rational#== when passed an Integer" do
   it "returns true if self has the passed argument as numerator and a denominator of 1" do
     # Rational(x, y) reduces x and y automatically
-    (Rational(4, 2) == 2).should be_true
-    (Rational(-4, 2) == -2).should be_true
-    (Rational(4, -2) == -2).should be_true
+    (Rational(4, 2) == 2).should == true
+    (Rational(-4, 2) == -2).should == true
+    (Rational(4, -2) == -2).should == true
   end
 end
diff --git a/spec/ruby/core/rational/exponent_spec.rb b/spec/ruby/core/rational/exponent_spec.rb
index 1f8a03740cc..88b4a437966 100644
--- a/spec/ruby/core/rational/exponent_spec.rb
+++ b/spec/ruby/core/rational/exponent_spec.rb
@@ -5,20 +5,20 @@
     # Guard against the Mathn library
     guard -> { !defined?(Math.rsqrt) } do
       it "returns Rational(1) if the exponent is Rational(0)" do
-        (Rational(0) ** Rational(0)).should eql(Rational(1))
-        (Rational(1) ** Rational(0)).should eql(Rational(1))
-        (Rational(3, 4) ** Rational(0)).should eql(Rational(1))
-        (Rational(-1) ** Rational(0)).should eql(Rational(1))
-        (Rational(-3, 4) ** Rational(0)).should eql(Rational(1))
-        (Rational(bignum_value) ** Rational(0)).should eql(Rational(1))
-        (Rational(-bignum_value) ** Rational(0)).should eql(Rational(1))
+        (Rational(0) ** Rational(0)).should.eql?(Rational(1))
+        (Rational(1) ** Rational(0)).should.eql?(Rational(1))
+        (Rational(3, 4) ** Rational(0)).should.eql?(Rational(1))
+        (Rational(-1) ** Rational(0)).should.eql?(Rational(1))
+        (Rational(-3, 4) ** Rational(0)).should.eql?(Rational(1))
+        (Rational(bignum_value) ** Rational(0)).should.eql?(Rational(1))
+        (Rational(-bignum_value) ** Rational(0)).should.eql?(Rational(1))
       end
 
       it "returns self raised to the argument as a Rational if the exponent's denominator is 1" do
-        (Rational(3, 4) ** Rational(1, 1)).should eql(Rational(3, 4))
-        (Rational(3, 4) ** Rational(2, 1)).should eql(Rational(9, 16))
-        (Rational(3, 4) ** Rational(-1, 1)).should eql(Rational(4, 3))
-        (Rational(3, 4) ** Rational(-2, 1)).should eql(Rational(16, 9))
+        (Rational(3, 4) ** Rational(1, 1)).should.eql?(Rational(3, 4))
+        (Rational(3, 4) ** Rational(2, 1)).should.eql?(Rational(9, 16))
+        (Rational(3, 4) ** Rational(-1, 1)).should.eql?(Rational(4, 3))
+        (Rational(3, 4) ** Rational(-2, 1)).should.eql?(Rational(16, 9))
       end
 
       it "returns self raised to the argument as a Float if the exponent's denominator is not 1" do
@@ -49,12 +49,12 @@
     # Guard against the Mathn library
     guard -> { !defined?(Math.rsqrt) } do
       it "returns Rational(1, 1) when the passed argument is 0" do
-        (Rational(3, 4) ** 0).should eql(Rational(1, 1))
-        (Rational(-3, 4) ** 0).should eql(Rational(1, 1))
-        (Rational(3, -4) ** 0).should eql(Rational(1, 1))
+        (Rational(3, 4) ** 0).should.eql?(Rational(1, 1))
+        (Rational(-3, 4) ** 0).should.eql?(Rational(1, 1))
+        (Rational(3, -4) ** 0).should.eql?(Rational(1, 1))
 
-        (Rational(bignum_value, 4) ** 0).should eql(Rational(1, 1))
-        (Rational(3, -bignum_value) ** 0).should eql(Rational(1, 1))
+        (Rational(bignum_value, 4) ** 0).should.eql?(Rational(1, 1))
+        (Rational(3, -bignum_value) ** 0).should.eql?(Rational(1, 1))
       end
     end
   end
@@ -62,26 +62,26 @@
   describe "when passed Bignum" do
     # #5713
     it "returns Rational(0) when self is Rational(0) and the exponent is positive" do
-      (Rational(0) ** bignum_value).should eql(Rational(0))
+      (Rational(0) ** bignum_value).should.eql?(Rational(0))
     end
 
     it "raises ZeroDivisionError when self is Rational(0) and the exponent is negative" do
-      -> { Rational(0) ** -bignum_value }.should raise_error(ZeroDivisionError)
+      -> { Rational(0) ** -bignum_value }.should.raise(ZeroDivisionError)
     end
 
     it "returns Rational(1) when self is Rational(1)" do
-      (Rational(1) **  bignum_value).should eql(Rational(1))
-      (Rational(1) ** -bignum_value).should eql(Rational(1))
+      (Rational(1) **  bignum_value).should.eql?(Rational(1))
+      (Rational(1) ** -bignum_value).should.eql?(Rational(1))
     end
 
     it "returns Rational(1) when self is Rational(-1) and the exponent is positive and even" do
-      (Rational(-1) ** bignum_value(0)).should eql(Rational(1))
-      (Rational(-1) ** bignum_value(2)).should eql(Rational(1))
+      (Rational(-1) ** bignum_value(0)).should.eql?(Rational(1))
+      (Rational(-1) ** bignum_value(2)).should.eql?(Rational(1))
     end
 
     it "returns Rational(-1) when self is Rational(-1) and the exponent is positive and odd" do
-      (Rational(-1) ** bignum_value(1)).should eql(Rational(-1))
-      (Rational(-1) ** bignum_value(3)).should eql(Rational(-1))
+      (Rational(-1) ** bignum_value(1)).should.eql?(Rational(-1))
+      (Rational(-1) ** bignum_value(3)).should.eql?(Rational(-1))
     end
 
     ruby_version_is ""..."3.4" do
@@ -96,10 +96,10 @@
 
       it "returns 0.0 when self is > 1 and the exponent is negative" do
         -> {
-          (Rational(2) ** -bignum_value).should eql(0.0)
+          (Rational(2) ** -bignum_value).should.eql?(0.0)
         }.should complain(/warning: in a\*\*b, b may be too big/)
         -> {
-          (Rational(fixnum_max) ** -bignum_value).should eql(0.0)
+          (Rational(fixnum_max) ** -bignum_value).should.eql?(0.0)
         }.should complain(/warning: in a\*\*b, b may be too big/)
       end
     end
@@ -108,37 +108,37 @@
       it "raises an ArgumentError when self is > 1" do
         -> {
           (Rational(2) ** bignum_value)
-        }.should raise_error(ArgumentError, "exponent is too large")
+        }.should.raise(ArgumentError, "exponent is too large")
         -> {
           (Rational(fixnum_max) ** bignum_value)
-        }.should raise_error(ArgumentError, "exponent is too large")
+        }.should.raise(ArgumentError, "exponent is too large")
       end
 
       it "raises an ArgumentError when self is > 1 and the exponent is negative" do
         -> {
           (Rational(2) ** -bignum_value)
-        }.should raise_error(ArgumentError, "exponent is too large")
+        }.should.raise(ArgumentError, "exponent is too large")
         -> {
           (Rational(fixnum_max) ** -bignum_value)
-        }.should raise_error(ArgumentError, "exponent is too large")
+        }.should.raise(ArgumentError, "exponent is too large")
       end
 
       it "raises an ArgumentError when self is < -1" do
         -> {
           (Rational(-2) ** bignum_value)
-        }.should raise_error(ArgumentError, "exponent is too large")
+        }.should.raise(ArgumentError, "exponent is too large")
         -> {
           (Rational(fixnum_min) ** bignum_value)
-        }.should raise_error(ArgumentError, "exponent is too large")
+        }.should.raise(ArgumentError, "exponent is too large")
       end
 
       it "raises an ArgumentError when self is < -1 and the exponent is negative" do
         -> {
           (Rational(-2) ** -bignum_value)
-        }.should raise_error(ArgumentError, "exponent is too large")
+        }.should.raise(ArgumentError, "exponent is too large")
         -> {
           (Rational(fixnum_min) ** -bignum_value)
-        }.should raise_error(ArgumentError, "exponent is too large")
+        }.should.raise(ArgumentError, "exponent is too large")
       end
     end
 
@@ -159,10 +159,10 @@
 
         it "returns 0.0 when self is < -1 and the exponent is negative" do
           -> {
-            (Rational(-2) ** -bignum_value).should eql(0.0)
+            (Rational(-2) ** -bignum_value).should.eql?(0.0)
           }.should complain(/warning: in a\*\*b, b may be too big/)
           -> {
-            (Rational(fixnum_min) ** -bignum_value).should eql(0.0)
+            (Rational(fixnum_min) ** -bignum_value).should.eql?(0.0)
           }.should complain(/warning: in a\*\*b, b may be too big/)
         end
       end
@@ -171,7 +171,7 @@
 
   describe "when passed Float" do
     it "returns self converted to Float and raised to the passed argument" do
-      (Rational(3, 1) ** 3.0).should eql(27.0)
+      (Rational(3, 1) ** 3.0).should.eql?(27.0)
       (Rational(3, 1) ** 1.5).should be_close(5.19615242270663, TOLERANCE)
       (Rational(3, 1) ** -1.5).should be_close(0.192450089729875, TOLERANCE)
     end
@@ -213,19 +213,19 @@
 
   it "raises ZeroDivisionError for Rational(0, 1) passed a negative Integer" do
     [-1, -4, -9999].each do |exponent|
-      -> { Rational(0, 1) ** exponent }.should raise_error(ZeroDivisionError, "divided by 0")
+      -> { Rational(0, 1) ** exponent }.should.raise(ZeroDivisionError, "divided by 0")
     end
   end
 
   it "raises ZeroDivisionError for Rational(0, 1) passed a negative Rational with denominator 1" do
     [Rational(-1, 1), Rational(-3, 1)].each do |exponent|
-      -> { Rational(0, 1) ** exponent }.should raise_error(ZeroDivisionError, "divided by 0")
+      -> { Rational(0, 1) ** exponent }.should.raise(ZeroDivisionError, "divided by 0")
     end
   end
 
   # #7513
   it "raises ZeroDivisionError for Rational(0, 1) passed a negative Rational" do
-    -> { Rational(0, 1) ** Rational(-3, 2) }.should raise_error(ZeroDivisionError, "divided by 0")
+    -> { Rational(0, 1) ** Rational(-3, 2) }.should.raise(ZeroDivisionError, "divided by 0")
   end
 
   it "returns Infinity for Rational(0, 1) passed a negative Float" do
diff --git a/spec/ruby/core/rational/floor_spec.rb b/spec/ruby/core/rational/floor_spec.rb
index 5108e363f7a..6d4cee79a9f 100644
--- a/spec/ruby/core/rational/floor_spec.rb
+++ b/spec/ruby/core/rational/floor_spec.rb
@@ -13,37 +13,37 @@
   describe "with no arguments (precision = 0)" do
 
     it "returns the Integer value rounded toward negative infinity" do
-      @rational.floor.should eql 314
+      @rational.floor.should.eql? 314
 
-      Rational(1, 2).floor.should eql 0
-      Rational(-1, 2).floor.should eql(-1)
-      Rational(1, 1).floor.should eql 1
+      Rational(1, 2).floor.should.eql? 0
+      Rational(-1, 2).floor.should.eql?(-1)
+      Rational(1, 1).floor.should.eql? 1
     end
   end
 
   describe "with a precision < 0" do
     it "moves the rounding point n decimal places left, returning an Integer" do
-      @rational.floor(-3).should eql 0
-      @rational.floor(-2).should eql 300
-      @rational.floor(-1).should eql 310
-
-      Rational(100, 2).floor(-1).should eql 50
-      Rational(100, 2).floor(-2).should eql 0
-      Rational(-100, 2).floor(-1).should eql(-50)
-      Rational(-100, 2).floor(-2).should eql(-100)
+      @rational.floor(-3).should.eql? 0
+      @rational.floor(-2).should.eql? 300
+      @rational.floor(-1).should.eql? 310
+
+      Rational(100, 2).floor(-1).should.eql? 50
+      Rational(100, 2).floor(-2).should.eql? 0
+      Rational(-100, 2).floor(-1).should.eql?(-50)
+      Rational(-100, 2).floor(-2).should.eql?(-100)
     end
   end
 
   describe "with a precision > 0" do
     it "moves the rounding point n decimal places right, returning a Rational" do
-      @rational.floor(1).should eql Rational(1571, 5)
-      @rational.floor(2).should eql Rational(7857, 25)
-      @rational.floor(3).should eql Rational(62857, 200)
-
-      Rational(100, 2).floor(1).should eql Rational(50, 1)
-      Rational(100, 2).floor(2).should eql Rational(50, 1)
-      Rational(-100, 2).floor(1).should eql Rational(-50, 1)
-      Rational(-100, 2).floor(2).should eql Rational(-50, 1)
+      @rational.floor(1).should.eql? Rational(1571, 5)
+      @rational.floor(2).should.eql? Rational(7857, 25)
+      @rational.floor(3).should.eql? Rational(62857, 200)
+
+      Rational(100, 2).floor(1).should.eql? Rational(50, 1)
+      Rational(100, 2).floor(2).should.eql? Rational(50, 1)
+      Rational(-100, 2).floor(1).should.eql? Rational(-50, 1)
+      Rational(-100, 2).floor(2).should.eql? Rational(-50, 1)
     end
   end
 end
diff --git a/spec/ruby/core/rational/integer_spec.rb b/spec/ruby/core/rational/integer_spec.rb
index be7476a9ddf..cd7fa97fcf4 100644
--- a/spec/ruby/core/rational/integer_spec.rb
+++ b/spec/ruby/core/rational/integer_spec.rb
@@ -3,11 +3,11 @@
   # Guard against the Mathn library
   guard -> { !defined?(Math.rsqrt) } do
     it "returns false for a rational with a numerator and no denominator" do
-      Rational(20).integer?.should be_false
+      Rational(20).integer?.should == false
     end
   end
 
   it "returns false for a rational with a numerator and a denominator" do
-    Rational(20,3).integer?.should be_false
+    Rational(20,3).integer?.should == false
   end
 end
diff --git a/spec/ruby/core/rational/marshal_dump_spec.rb b/spec/ruby/core/rational/marshal_dump_spec.rb
index 17a6107cd52..06bf36f166f 100644
--- a/spec/ruby/core/rational/marshal_dump_spec.rb
+++ b/spec/ruby/core/rational/marshal_dump_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Rational#marshal_dump" do
   it "is a private method" do
-    Rational.should have_private_instance_method(:marshal_dump, false)
+    Rational.private_instance_methods(false).should.include?(:marshal_dump)
   end
 
   it "dumps numerator and denominator" do
diff --git a/spec/ruby/core/rational/minus_spec.rb b/spec/ruby/core/rational/minus_spec.rb
index 8aee85f9dd6..4e10e118b98 100644
--- a/spec/ruby/core/rational/minus_spec.rb
+++ b/spec/ruby/core/rational/minus_spec.rb
@@ -29,23 +29,23 @@
 
 describe "Rational#- passed a Rational" do
   it "returns the result of subtracting other from self as a Rational" do
-    (Rational(3, 4) - Rational(0, 1)).should eql(Rational(3, 4))
-    (Rational(3, 4) - Rational(1, 4)).should eql(Rational(1, 2))
+    (Rational(3, 4) - Rational(0, 1)).should.eql?(Rational(3, 4))
+    (Rational(3, 4) - Rational(1, 4)).should.eql?(Rational(1, 2))
 
-    (Rational(3, 4) - Rational(2, 1)).should eql(Rational(-5, 4))
+    (Rational(3, 4) - Rational(2, 1)).should.eql?(Rational(-5, 4))
   end
 end
 
 describe "Rational#- passed a Float" do
   it "returns the result of subtracting other from self as a Float" do
-    (Rational(3, 4) - 0.2).should eql(0.55)
-    (Rational(3, 4) - 2.5).should eql(-1.75)
+    (Rational(3, 4) - 0.2).should.eql?(0.55)
+    (Rational(3, 4) - 2.5).should.eql?(-1.75)
   end
 end
 
 describe "Rational#- passed an Integer" do
   it "returns the result of subtracting other from self as a Rational" do
-    (Rational(3, 4) - 1).should eql(Rational(-1, 4))
-    (Rational(3, 4) - 2).should eql(Rational(-5, 4))
+    (Rational(3, 4) - 1).should.eql?(Rational(-1, 4))
+    (Rational(3, 4) - 2).should.eql?(Rational(-5, 4))
   end
 end
diff --git a/spec/ruby/core/rational/modulo_spec.rb b/spec/ruby/core/rational/modulo_spec.rb
index 23ed93e118e..6241077f689 100644
--- a/spec/ruby/core/rational/modulo_spec.rb
+++ b/spec/ruby/core/rational/modulo_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it "returns a Float value when the argument is Float" do
-    (Rational(7, 4) % 1.0).should be_kind_of(Float)
+    (Rational(7, 4) % 1.0).should.is_a?(Float)
     (Rational(7, 4) % 1.0).should == 0.75
     (Rational(7, 4) % 0.26).should be_close(0.19, 0.0001)
   end
@@ -24,20 +24,20 @@
   it "raises ZeroDivisionError on zero denominator" do
     -> {
       Rational(3, 5) % Rational(0, 1)
-    }.should raise_error(ZeroDivisionError)
+    }.should.raise(ZeroDivisionError)
 
     -> {
       Rational(0, 1) % Rational(0, 1)
-    }.should raise_error(ZeroDivisionError)
+    }.should.raise(ZeroDivisionError)
 
     -> {
       Rational(3, 5) % 0
-    }.should raise_error(ZeroDivisionError)
+    }.should.raise(ZeroDivisionError)
   end
 
   it "raises a ZeroDivisionError when the argument is 0.0" do
     -> {
       Rational(3, 5) % 0.0
-    }.should raise_error(ZeroDivisionError)
+    }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/core/rational/multiply_spec.rb b/spec/ruby/core/rational/multiply_spec.rb
index 87fb4de2b44..3e059cbc1cc 100644
--- a/spec/ruby/core/rational/multiply_spec.rb
+++ b/spec/ruby/core/rational/multiply_spec.rb
@@ -29,37 +29,37 @@
 
 describe "Rational#* passed a Rational" do
   it "returns self divided by other as a Rational" do
-    (Rational(3, 4) * Rational(3, 4)).should eql(Rational(9, 16))
-    (Rational(2, 4) * Rational(1, 4)).should eql(Rational(1, 8))
+    (Rational(3, 4) * Rational(3, 4)).should.eql?(Rational(9, 16))
+    (Rational(2, 4) * Rational(1, 4)).should.eql?(Rational(1, 8))
 
-    (Rational(3, 4) * Rational(0, 1)).should eql(Rational(0, 4))
+    (Rational(3, 4) * Rational(0, 1)).should.eql?(Rational(0, 4))
   end
 end
 
 describe "Rational#* passed a Float" do
   it "returns self divided by other as a Float" do
-    (Rational(3, 4) * 0.75).should eql(0.5625)
-    (Rational(3, 4) * 0.25).should eql(0.1875)
+    (Rational(3, 4) * 0.75).should.eql?(0.5625)
+    (Rational(3, 4) * 0.25).should.eql?(0.1875)
     (Rational(3, 4) * 0.3).should be_close(0.225, TOLERANCE)
 
     (Rational(-3, 4) * 0.3).should be_close(-0.225, TOLERANCE)
     (Rational(3, -4) * 0.3).should be_close(-0.225, TOLERANCE)
     (Rational(3, 4) * -0.3).should be_close(-0.225, TOLERANCE)
 
-    (Rational(3, 4) * 0.0).should eql(0.0)
-    (Rational(-3, -4) * 0.0).should eql(0.0)
+    (Rational(3, 4) * 0.0).should.eql?(0.0)
+    (Rational(-3, -4) * 0.0).should.eql?(0.0)
 
-    (Rational(-3, 4) * 0.0).should eql(0.0)
-    (Rational(3, -4) * 0.0).should eql(0.0)
+    (Rational(-3, 4) * 0.0).should.eql?(0.0)
+    (Rational(3, -4) * 0.0).should.eql?(0.0)
   end
 end
 
 describe "Rational#* passed an Integer" do
   it "returns self divided by other as a Rational" do
-    (Rational(3, 4) * 2).should eql(Rational(3, 2))
-    (Rational(2, 4) * 2).should eql(Rational(1, 1))
-    (Rational(6, 7) * -2).should eql(Rational(-12, 7))
+    (Rational(3, 4) * 2).should.eql?(Rational(3, 2))
+    (Rational(2, 4) * 2).should.eql?(Rational(1, 1))
+    (Rational(6, 7) * -2).should.eql?(Rational(-12, 7))
 
-    (Rational(3, 4) * 0).should eql(Rational(0, 4))
+    (Rational(3, 4) * 0).should.eql?(Rational(0, 4))
   end
 end
diff --git a/spec/ruby/core/rational/numerator_spec.rb b/spec/ruby/core/rational/numerator_spec.rb
index 2b9fe2ff5c1..631bb4703cd 100644
--- a/spec/ruby/core/rational/numerator_spec.rb
+++ b/spec/ruby/core/rational/numerator_spec.rb
@@ -2,8 +2,8 @@
 
 describe "Rational#numerator" do
   it "returns the numerator" do
-    Rational(3, 4).numerator.should equal(3)
-    Rational(3, -4).numerator.should equal(-3)
+    Rational(3, 4).numerator.should.equal?(3)
+    Rational(3, -4).numerator.should.equal?(-3)
 
     Rational(bignum_value, 1).numerator.should == bignum_value
   end
diff --git a/spec/ruby/core/rational/plus_spec.rb b/spec/ruby/core/rational/plus_spec.rb
index 01df5f67192..92f830a1056 100644
--- a/spec/ruby/core/rational/plus_spec.rb
+++ b/spec/ruby/core/rational/plus_spec.rb
@@ -29,22 +29,22 @@
 
 describe "Rational#+ with a Rational" do
   it "returns the result of subtracting other from self as a Rational" do
-    (Rational(3, 4) + Rational(0, 1)).should eql(Rational(3, 4))
-    (Rational(3, 4) + Rational(1, 4)).should eql(Rational(1, 1))
+    (Rational(3, 4) + Rational(0, 1)).should.eql?(Rational(3, 4))
+    (Rational(3, 4) + Rational(1, 4)).should.eql?(Rational(1, 1))
 
-    (Rational(3, 4) + Rational(2, 1)).should eql(Rational(11, 4))
+    (Rational(3, 4) + Rational(2, 1)).should.eql?(Rational(11, 4))
   end
 end
 describe "Rational#+ with a Float" do
   it "returns the result of subtracting other from self as a Float" do
-    (Rational(3, 4) + 0.2).should eql(0.95)
-    (Rational(3, 4) + 2.5).should eql(3.25)
+    (Rational(3, 4) + 0.2).should.eql?(0.95)
+    (Rational(3, 4) + 2.5).should.eql?(3.25)
   end
 end
 
 describe "Rational#+ with an Integer" do
   it "returns the result of subtracting other from self as a Rational" do
-    (Rational(3, 4) + 1).should eql(Rational(7, 4))
-    (Rational(3, 4) + 2).should eql(Rational(11, 4))
+    (Rational(3, 4) + 1).should.eql?(Rational(7, 4))
+    (Rational(3, 4) + 2).should.eql?(Rational(11, 4))
   end
 end
diff --git a/spec/ruby/core/rational/rational_spec.rb b/spec/ruby/core/rational/rational_spec.rb
index 482deab38d7..278c4116a42 100644
--- a/spec/ruby/core/rational/rational_spec.rb
+++ b/spec/ruby/core/rational/rational_spec.rb
@@ -6,6 +6,6 @@
   end
 
   it "does not respond to new" do
-    -> { Rational.new(1) }.should raise_error(NoMethodError)
+    -> { Rational.new(1) }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/rational/rationalize_spec.rb b/spec/ruby/core/rational/rationalize_spec.rb
index 3db027d446d..9c86824ddd1 100644
--- a/spec/ruby/core/rational/rationalize_spec.rb
+++ b/spec/ruby/core/rational/rationalize_spec.rb
@@ -30,7 +30,7 @@
   end
 
   it "raises ArgumentError when passed more than one argument" do
-    -> { Rational(1,1).rationalize(0.1, 0.1) }.should raise_error(ArgumentError)
-    -> { Rational(1,1).rationalize(0.1, 0.1, 2) }.should raise_error(ArgumentError)
+    -> { Rational(1,1).rationalize(0.1, 0.1) }.should.raise(ArgumentError)
+    -> { Rational(1,1).rationalize(0.1, 0.1, 2) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/rational/round_spec.rb b/spec/ruby/core/rational/round_spec.rb
index ac3dcafe7bd..dd6f66f408a 100644
--- a/spec/ruby/core/rational/round_spec.rb
+++ b/spec/ruby/core/rational/round_spec.rb
@@ -7,9 +7,9 @@
 
   describe "with no arguments (precision = 0)" do
     it "returns an integer" do
-      @rational.round.should be_kind_of(Integer)
-      Rational(0, 1).round(0).should be_kind_of(Integer)
-      Rational(124, 1).round(0).should be_kind_of(Integer)
+      @rational.round.should.is_a?(Integer)
+      Rational(0, 1).round(0).should.is_a?(Integer)
+      Rational(124, 1).round(0).should.is_a?(Integer)
     end
 
     it "returns the truncated value toward the nearest integer" do
@@ -30,10 +30,10 @@
 
   describe "with a precision < 0" do
     it "returns an integer" do
-      @rational.round(-2).should be_kind_of(Integer)
-      @rational.round(-1).should be_kind_of(Integer)
-      Rational(0, 1).round(-1).should be_kind_of(Integer)
-      Rational(2, 1).round(-1).should be_kind_of(Integer)
+      @rational.round(-2).should.is_a?(Integer)
+      @rational.round(-1).should.is_a?(Integer)
+      Rational(0, 1).round(-1).should.is_a?(Integer)
+      Rational(2, 1).round(-1).should.is_a?(Integer)
     end
 
     it "moves the truncation point n decimal places left" do
@@ -45,12 +45,12 @@
 
   describe "with a precision > 0" do
     it "returns a Rational" do
-      @rational.round(1).should be_kind_of(Rational)
-      @rational.round(2).should be_kind_of(Rational)
+      @rational.round(1).should.is_a?(Rational)
+      @rational.round(2).should.is_a?(Rational)
       # Guard against the Mathn library
       guard -> { !defined?(Math.rsqrt) } do
-        Rational(0, 1).round(1).should be_kind_of(Rational)
-        Rational(2, 1).round(1).should be_kind_of(Rational)
+        Rational(0, 1).round(1).should.is_a?(Rational)
+        Rational(2, 1).round(1).should.is_a?(Rational)
       end
     end
 
@@ -100,7 +100,7 @@
     end
 
     it "raise for a non-existent round mode" do
-      -> { Rational(10, 4).round(half: :nonsense) }.should raise_error(ArgumentError, "invalid rounding mode: nonsense")
+      -> { Rational(10, 4).round(half: :nonsense) }.should.raise(ArgumentError, "invalid rounding mode: nonsense")
     end
   end
 end
diff --git a/spec/ruby/core/rational/shared/arithmetic_exception_in_coerce.rb b/spec/ruby/core/rational/shared/arithmetic_exception_in_coerce.rb
index f4cf70d147d..e15169c9123 100644
--- a/spec/ruby/core/rational/shared/arithmetic_exception_in_coerce.rb
+++ b/spec/ruby/core/rational/shared/arithmetic_exception_in_coerce.rb
@@ -6,6 +6,6 @@
     b.should_receive(:coerce).and_raise(RationalSpecs::CoerceError)
 
     # e.g. Rational(3, 4) + b
-    -> { Rational(3, 4).send(@method, b) }.should raise_error(RationalSpecs::CoerceError)
+    -> { Rational(3, 4).send(@method, b) }.should.raise(RationalSpecs::CoerceError)
   end
 end
diff --git a/spec/ruby/core/rational/to_f_spec.rb b/spec/ruby/core/rational/to_f_spec.rb
index d0da49d3772..40e3f11c0cc 100644
--- a/spec/ruby/core/rational/to_f_spec.rb
+++ b/spec/ruby/core/rational/to_f_spec.rb
@@ -2,10 +2,10 @@
 
 describe "Rational#to_f" do
   it "returns self converted to a Float" do
-    Rational(3, 4).to_f.should eql(0.75)
-    Rational(3, -4).to_f.should eql(-0.75)
-    Rational(-1, 4).to_f.should eql(-0.25)
-    Rational(-1, -4).to_f.should eql(0.25)
+    Rational(3, 4).to_f.should.eql?(0.75)
+    Rational(3, -4).to_f.should.eql?(-0.75)
+    Rational(-1, 4).to_f.should.eql?(-0.25)
+    Rational(-1, -4).to_f.should.eql?(0.25)
   end
 
   it "converts to a Float for large numerator and denominator" do
diff --git a/spec/ruby/core/rational/to_i_spec.rb b/spec/ruby/core/rational/to_i_spec.rb
index 520a380b2ae..e61b1b6c3bd 100644
--- a/spec/ruby/core/rational/to_i_spec.rb
+++ b/spec/ruby/core/rational/to_i_spec.rb
@@ -2,11 +2,11 @@
 
 describe "Rational#to_i" do
   it "converts self to an Integer by truncation" do
-    Rational(7, 4).to_i.should eql(1)
-    Rational(11, 4).to_i.should eql(2)
+    Rational(7, 4).to_i.should.eql?(1)
+    Rational(11, 4).to_i.should.eql?(2)
   end
 
   it "converts self to an Integer by truncation" do
-    Rational(-7, 4).to_i.should eql(-1)
+    Rational(-7, 4).to_i.should.eql?(-1)
   end
 end
diff --git a/spec/ruby/core/rational/to_r_spec.rb b/spec/ruby/core/rational/to_r_spec.rb
index 34f16d7890d..eb6097f5954 100644
--- a/spec/ruby/core/rational/to_r_spec.rb
+++ b/spec/ruby/core/rational/to_r_spec.rb
@@ -3,15 +3,15 @@
 describe "Rational#to_r" do
   it "returns self" do
     a = Rational(3, 4)
-    a.to_r.should equal(a)
+    a.to_r.should.equal?(a)
 
     a = Rational(bignum_value, 4)
-    a.to_r.should equal(a)
+    a.to_r.should.equal?(a)
   end
 
   it "raises TypeError trying to convert BasicObject" do
     obj = BasicObject.new
-    -> { Rational(obj) }.should raise_error(TypeError)
+    -> { Rational(obj) }.should.raise(TypeError)
   end
 
   it "works when a BasicObject has to_r" do
@@ -21,6 +21,6 @@
 
   it "fails when a BasicObject's to_r does not return a Rational" do
     obj = BasicObject.new; def obj.to_r; 1 end
-    -> { Rational(obj) }.should raise_error(TypeError)
+    -> { Rational(obj) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/rational/truncate_spec.rb b/spec/ruby/core/rational/truncate_spec.rb
index 728fca34eae..3614431a7f0 100644
--- a/spec/ruby/core/rational/truncate_spec.rb
+++ b/spec/ruby/core/rational/truncate_spec.rb
@@ -7,7 +7,7 @@
 
   describe "with no arguments (precision = 0)" do
     it "returns an integer" do
-      @rational.truncate.should be_kind_of(Integer)
+      @rational.truncate.should.is_a?(Integer)
     end
 
     it "returns the truncated value toward 0" do
@@ -19,7 +19,7 @@
 
   describe "with an explicit precision = 0" do
     it "returns an integer" do
-      @rational.truncate(0).should be_kind_of(Integer)
+      @rational.truncate(0).should.is_a?(Integer)
     end
 
     it "returns the truncated value toward 0" do
@@ -31,8 +31,8 @@
 
   describe "with a precision < 0" do
     it "returns an integer" do
-      @rational.truncate(-2).should be_kind_of(Integer)
-      @rational.truncate(-1).should be_kind_of(Integer)
+      @rational.truncate(-2).should.is_a?(Integer)
+      @rational.truncate(-1).should.is_a?(Integer)
     end
 
     it "moves the truncation point n decimal places left" do
@@ -44,8 +44,8 @@
 
   describe "with a precision > 0" do
     it "returns a Rational" do
-      @rational.truncate(1).should be_kind_of(Rational)
-      @rational.truncate(2).should be_kind_of(Rational)
+      @rational.truncate(1).should.is_a?(Rational)
+      @rational.truncate(2).should.is_a?(Rational)
     end
 
     it "moves the truncation point n decimal places right" do
@@ -57,15 +57,15 @@
 
   describe "with an invalid value for precision" do
     it "raises a TypeError" do
-      -> { @rational.truncate(nil) }.should raise_error(TypeError, "not an integer")
-      -> { @rational.truncate(1.0) }.should raise_error(TypeError, "not an integer")
-      -> { @rational.truncate('') }.should raise_error(TypeError, "not an integer")
+      -> { @rational.truncate(nil) }.should.raise(TypeError, "not an integer")
+      -> { @rational.truncate(1.0) }.should.raise(TypeError, "not an integer")
+      -> { @rational.truncate('') }.should.raise(TypeError, "not an integer")
     end
 
     it "does not call to_int on the argument" do
       object = Object.new
       object.should_not_receive(:to_int)
-      -> { @rational.truncate(object) }.should raise_error(TypeError, "not an integer")
+      -> { @rational.truncate(object) }.should.raise(TypeError, "not an integer")
     end
   end
 end
diff --git a/spec/ruby/core/rational/zero_spec.rb b/spec/ruby/core/rational/zero_spec.rb
index af7fb391acc..2e4f783d5cc 100644
--- a/spec/ruby/core/rational/zero_spec.rb
+++ b/spec/ruby/core/rational/zero_spec.rb
@@ -1,14 +1,14 @@
 require_relative "../../spec_helper"
 describe "Rational#zero?" do
   it "returns true if the numerator is 0" do
-    Rational(0,26).zero?.should be_true
+    Rational(0,26).zero?.should == true
   end
 
   it "returns true if the numerator is 0.0" do
-    Rational(0.0,26).zero?.should be_true
+    Rational(0.0,26).zero?.should == true
   end
 
   it "returns false if the numerator isn't 0" do
-    Rational(26).zero?.should be_false
+    Rational(26).zero?.should == false
   end
 end
diff --git a/spec/ruby/core/refinement/append_features_spec.rb b/spec/ruby/core/refinement/append_features_spec.rb
index f7e5f32bc1d..cffc9ed308b 100644
--- a/spec/ruby/core/refinement/append_features_spec.rb
+++ b/spec/ruby/core/refinement/append_features_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Refinement#append_features" do
   it "is not defined" do
-    Refinement.should_not have_private_instance_method(:append_features)
+    Refinement.private_instance_methods(true).should_not.include?(:append_features)
   end
 
   it "is not called by Module#include" do
@@ -11,7 +11,7 @@
       refine c do
         called = false
         define_method(:append_features){called = true}
-        proc{c.include(self)}.should raise_error(TypeError)
+        proc{c.include(self)}.should.raise(TypeError)
         called.should == false
       end
     end
diff --git a/spec/ruby/core/refinement/extend_object_spec.rb b/spec/ruby/core/refinement/extend_object_spec.rb
index 4da8b359ccc..f6fe2a60ea0 100644
--- a/spec/ruby/core/refinement/extend_object_spec.rb
+++ b/spec/ruby/core/refinement/extend_object_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Refinement#extend_object" do
   it "is not defined" do
-    Refinement.should_not have_private_instance_method(:extend_object)
+    Refinement.private_instance_methods(true).should_not.include?(:extend_object)
   end
 
   it "is not called by Object#extend" do
@@ -13,7 +13,7 @@
         define_method(:extend_object) { called = true }
         -> {
           c.extend(self)
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
         called.should == false
       end
     end
diff --git a/spec/ruby/core/refinement/import_methods_spec.rb b/spec/ruby/core/refinement/import_methods_spec.rb
index dc3e0ea31d3..bcb5e9b066a 100644
--- a/spec/ruby/core/refinement/import_methods_spec.rb
+++ b/spec/ruby/core/refinement/import_methods_spec.rb
@@ -23,7 +23,7 @@ def indent(level)
         refine String do
           -> {
             import_methods Integer
-          }.should raise_error(TypeError, "wrong argument type Class (expected Module)")
+          }.should.raise(TypeError, "wrong argument type Class (expected Module)")
         end
       end
     end
@@ -82,7 +82,7 @@ def indent(level)
         refine String do
           -> {
             import_methods str_utils, Kernel
-          }.should raise_error(ArgumentError)
+          }.should.raise(ArgumentError)
         end
       end
 
@@ -127,7 +127,7 @@ def indent(level)
       using self
       -> {
         "foo".indent(3)
-      }.should raise_error(NoMethodError, /undefined method [`']indent' for ("foo":String|an instance of String)/)
+      }.should.raise(NoMethodError, /undefined method [`']indent' for ("foo":String|an instance of String)/)
     end
   end
 
@@ -142,7 +142,7 @@ def indent(level)
       refine String do
         -> {
           import_methods str_utils, Integer
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
       end
     end
 
@@ -150,7 +150,7 @@ def indent(level)
       using string_refined
       -> {
         "foo".indent(3)
-      }.should raise_error(NoMethodError)
+      }.should.raise(NoMethodError)
     end
   end
 
@@ -213,7 +213,7 @@ def self.indent(level)
       using self
       -> {
         String.indent(3)
-      }.should raise_error(NoMethodError, /undefined method [`']indent' for (String:Class|class String)/)
+      }.should.raise(NoMethodError, /undefined method [`']indent' for (String:Class|class String)/)
     end
   end
 
@@ -268,7 +268,7 @@ def indent(level)
         refine String do
           -> {
             import_methods Kernel
-          }.should raise_error(ArgumentError)
+          }.should.raise(ArgumentError)
         end
       end
     end
@@ -279,7 +279,7 @@ def indent(level)
         refine String do
           -> {
             import_methods Zlib
-          }.should raise_error(ArgumentError, /Can't import method which is not defined with Ruby code: Zlib#*/)
+          }.should.raise(ArgumentError, /Can't import method which is not defined with Ruby code: Zlib#*/)
         end
       end
     end
diff --git a/spec/ruby/core/refinement/include_spec.rb b/spec/ruby/core/refinement/include_spec.rb
index 57451bd9bc9..55ac89ffb57 100644
--- a/spec/ruby/core/refinement/include_spec.rb
+++ b/spec/ruby/core/refinement/include_spec.rb
@@ -6,7 +6,7 @@
       refine String do
         -> {
           include Module.new
-        }.should raise_error(TypeError, "Refinement#include has been removed")
+        }.should.raise(TypeError, "Refinement#include has been removed")
       end
     end
   end
diff --git a/spec/ruby/core/refinement/prepend_features_spec.rb b/spec/ruby/core/refinement/prepend_features_spec.rb
index fbc431bbd23..9dc5838f1fb 100644
--- a/spec/ruby/core/refinement/prepend_features_spec.rb
+++ b/spec/ruby/core/refinement/prepend_features_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Refinement#prepend_features" do
   it "is not defined" do
-    Refinement.should_not have_private_instance_method(:prepend_features)
+    Refinement.private_instance_methods(true).should_not.include?(:prepend_features)
   end
 
   it "is not called by Module#prepend" do
@@ -11,7 +11,7 @@
       refine c do
         called = false
         define_method(:prepend_features){called = true}
-        proc{c.prepend(self)}.should raise_error(TypeError)
+        proc{c.prepend(self)}.should.raise(TypeError)
         called.should == false
       end
     end
diff --git a/spec/ruby/core/refinement/prepend_spec.rb b/spec/ruby/core/refinement/prepend_spec.rb
index 64cf7cd17f7..fd70dd6f976 100644
--- a/spec/ruby/core/refinement/prepend_spec.rb
+++ b/spec/ruby/core/refinement/prepend_spec.rb
@@ -6,7 +6,7 @@
       refine String do
         -> {
           prepend Module.new
-        }.should raise_error(TypeError, "Refinement#prepend has been removed")
+        }.should.raise(TypeError, "Refinement#prepend has been removed")
       end
     end
   end
diff --git a/spec/ruby/core/regexp/case_compare_spec.rb b/spec/ruby/core/regexp/case_compare_spec.rb
index 5ae8b56c6a0..29aada70bc2 100644
--- a/spec/ruby/core/regexp/case_compare_spec.rb
+++ b/spec/ruby/core/regexp/case_compare_spec.rb
@@ -2,25 +2,25 @@
 
 describe "Regexp#===" do
   it "is true if there is a match" do
-    (/abc/ === "aabcc").should be_true
+    (/abc/ === "aabcc").should == true
   end
 
   it "is false if there is no match" do
-    (/abc/ === "xyz").should be_false
+    (/abc/ === "xyz").should == false
   end
 
   it "returns true if it matches a Symbol" do
-    (/a/ === :a).should be_true
+    (/a/ === :a).should == true
   end
 
   it "returns false if it does not match a Symbol" do
-    (/a/ === :b).should be_false
+    (/a/ === :b).should == false
   end
 
   # mirroring https://github.com/ruby/ruby/blob/master/test/ruby/test_regexp.rb
   it "returns false if the other value cannot be coerced to a string" do
-    (/abc/ === nil).should be_false
-    (/abc/ === /abc/).should be_false
+    (/abc/ === nil).should == false
+    (/abc/ === /abc/).should == false
   end
 
   it "uses #to_str on string-like objects" do
@@ -30,6 +30,6 @@ def to_str
       end
     end.new
 
-    (/abc/ === stringlike).should be_true
+    (/abc/ === stringlike).should == true
   end
 end
diff --git a/spec/ruby/core/regexp/encoding_spec.rb b/spec/ruby/core/regexp/encoding_spec.rb
index dfc835b4e42..fb4fdba064e 100644
--- a/spec/ruby/core/regexp/encoding_spec.rb
+++ b/spec/ruby/core/regexp/encoding_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Regexp#encoding" do
   it "returns an Encoding object" do
-    /glar/.encoding.should be_an_instance_of(Encoding)
+    /glar/.encoding.should.instance_of?(Encoding)
   end
 
   it "defaults to US-ASCII if the Regexp contains only US-ASCII character" do
diff --git a/spec/ruby/core/regexp/fixed_encoding_spec.rb b/spec/ruby/core/regexp/fixed_encoding_spec.rb
index 29d0a22c530..5d8b1c28606 100644
--- a/spec/ruby/core/regexp/fixed_encoding_spec.rb
+++ b/spec/ruby/core/regexp/fixed_encoding_spec.rb
@@ -3,34 +3,34 @@
 
 describe "Regexp#fixed_encoding?" do
   it "returns false by default" do
-    /needle/.fixed_encoding?.should be_false
+    /needle/.fixed_encoding?.should == false
   end
 
   it "returns false if the 'n' modifier was supplied to the Regexp" do
-    /needle/n.fixed_encoding?.should be_false
+    /needle/n.fixed_encoding?.should == false
   end
 
   it "returns true if the 'u' modifier was supplied to the Regexp" do
-    /needle/u.fixed_encoding?.should be_true
+    /needle/u.fixed_encoding?.should == true
   end
 
   it "returns true if the 's' modifier was supplied to the Regexp" do
-    /needle/s.fixed_encoding?.should be_true
+    /needle/s.fixed_encoding?.should == true
   end
 
   it "returns true if the 'e' modifier was supplied to the Regexp" do
-    /needle/e.fixed_encoding?.should be_true
+    /needle/e.fixed_encoding?.should == true
   end
 
   it "returns true if the Regexp contains a \\u escape" do
-    /needle \u{8768}/.fixed_encoding?.should be_true
+    /needle \u{8768}/.fixed_encoding?.should == true
   end
 
   it "returns true if the Regexp contains a UTF-8 literal" do
-    /文字化け/.fixed_encoding?.should be_true
+    /文字化け/.fixed_encoding?.should == true
   end
 
   it "returns true if the Regexp was created with the Regexp::FIXEDENCODING option" do
-    Regexp.new("", Regexp::FIXEDENCODING).fixed_encoding?.should be_true
+    Regexp.new("", Regexp::FIXEDENCODING).fixed_encoding?.should == true
   end
 end
diff --git a/spec/ruby/core/regexp/initialize_spec.rb b/spec/ruby/core/regexp/initialize_spec.rb
index dd572922424..1c0133acae4 100644
--- a/spec/ruby/core/regexp/initialize_spec.rb
+++ b/spec/ruby/core/regexp/initialize_spec.rb
@@ -2,14 +2,28 @@
 
 describe "Regexp#initialize" do
   it "is a private method" do
-    Regexp.should have_private_instance_method(:initialize)
+    Regexp.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "raises a FrozenError on a Regexp literal" do
-    -> { //.send(:initialize, "") }.should raise_error(FrozenError)
+    -> { //.send(:initialize, "") }.should.raise(FrozenError)
   end
 
-  it "raises a TypeError on an initialized non-literal Regexp" do
-    -> { Regexp.new("").send(:initialize, "") }.should raise_error(TypeError)
+  ruby_version_is "4.1" do
+    it "raises a FrozenError on an initialized non-literal Regexp" do
+      regexp = Regexp.new("")
+      -> { regexp.send(:initialize, "") }.should.raise(FrozenError)
+    end
+  end
+
+  ruby_version_is ""..."4.1" do
+    it "raises a TypeError on an initialized non-literal Regexp" do
+      -> { Regexp.new("").send(:initialize, "") }.should.raise(TypeError)
+    end
+  end
+
+  it "raises a TypeError on an initialized non-literal Regexp subclass" do
+    r = Class.new(Regexp).new("")
+    -> { r.send(:initialize, "") }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/regexp/last_match_spec.rb b/spec/ruby/core/regexp/last_match_spec.rb
index 0bfed320511..6c256cc1cf4 100644
--- a/spec/ruby/core/regexp/last_match_spec.rb
+++ b/spec/ruby/core/regexp/last_match_spec.rb
@@ -4,7 +4,7 @@
   it "returns MatchData instance when not passed arguments" do
     /c(.)t/ =~ 'cat'
 
-    Regexp.last_match.should be_kind_of(MatchData)
+    Regexp.last_match.should.is_a?(MatchData)
   end
 
   it "returns the nth field in this MatchData when passed an Integer" do
@@ -28,7 +28,7 @@
 
     it "raises an IndexError when given a missing name" do
       /(?<test>[A-Z]+.*)/ =~ "TEST123"
-      -> { Regexp.last_match(:missing) }.should raise_error(IndexError)
+      -> { Regexp.last_match(:missing) }.should.raise(IndexError)
     end
   end
 
@@ -50,7 +50,7 @@
     it "raises a TypeError when unable to coerce" do
       obj = Object.new
       /(?<test>[A-Z]+.*)/ =~ "TEST123"
-      -> { Regexp.last_match(obj) }.should raise_error(TypeError)
+      -> { Regexp.last_match(obj) }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/core/regexp/linear_time_spec.rb b/spec/ruby/core/regexp/linear_time_spec.rb
index 2f3f81ed207..f70021dfed6 100644
--- a/spec/ruby/core/regexp/linear_time_spec.rb
+++ b/spec/ruby/core/regexp/linear_time_spec.rb
@@ -25,7 +25,56 @@
     }.should complain(/warning: flags ignored/)
   end
 
-  it "returns true for positive lookarounds" do
-    Regexp.linear_time?(/(?:(?=a*)a)*/).should == true
+  it "returns true for positive lookahead" do
+    Regexp.linear_time?(/a*(?:(?=a*)a)*b/).should == true
+  end
+
+  it "returns true for positive lookbehind" do
+    Regexp.linear_time?(/a*(?:(?<=a)a*)*b/).should == true
+  end
+
+  it "returns true for negative lookbehind" do
+    Regexp.linear_time?(/a*(?:(?<!a)a*)*b/).should == true
+  end
+
+  # There are two known ways to make Regexp linear:
+  # * Using a DFA (deterministic finite-state automaton) Regexp engine, which always matches in linear time (e.g. TruffleRuby with TRegex)
+  # * Caching position and state to avoid catastrophic backtracking (e.g. CRuby: https://bugs.ruby-lang.org/issues/19104)
+  #
+  # Both approach should be allowed and given that DFA Regexp engines
+  # are much faster there should be no specs preventing using them.
+  uses_regexp_caching = RUBY_ENGINE == 'ruby'
+  uses_dfa_regexp_engine = !uses_regexp_caching
+
+  # The following specs should not be relied upon,
+  # they are here only to illustrate differences between Regexp engines.
+  guard -> { uses_regexp_caching } do
+    it "returns true for negative lookahead" do
+      Regexp.linear_time?(/a*(?:(?!a*)a*)*b/).should == true
+    end
+
+    it "returns true for atomic groups" do
+      Regexp.linear_time?(/a*(?:(?>a)a*)*b/).should == true
+    end
+
+    it "returns true for possessive quantifiers" do
+      Regexp.linear_time?(/a*(?:(?:a)?+a*)*b/).should == true
+    end
+
+    it "returns true for positive lookbehind with capture group" do
+      Regexp.linear_time?(/.(?<=(a))/).should == true
+    end
+  end
+
+  # The following specs should not be relied upon,
+  # they are here only to illustrate differences between Regexp engines.
+  guard -> { uses_dfa_regexp_engine } do
+    it "returns true for non-recursive subexpression call" do
+      Regexp.linear_time?(/(?<a>a){0}\g<a>/).should == true
+    end
+
+    it "returns true for positive lookahead with capture group" do
+      Regexp.linear_time?(/x+(?=(a))/).should == true
+    end
   end
 end
diff --git a/spec/ruby/core/regexp/match_spec.rb b/spec/ruby/core/regexp/match_spec.rb
index 80dbfb4c104..276cecc8e4e 100644
--- a/spec/ruby/core/regexp/match_spec.rb
+++ b/spec/ruby/core/regexp/match_spec.rb
@@ -3,11 +3,11 @@
 
 describe :regexp_match, shared: true do
   it "returns nil if there is no match" do
-    /xyz/.send(@method,"abxyc").should be_nil
+    /xyz/.send(@method,"abxyc").should == nil
   end
 
   it "returns nil if the object is nil" do
-    /\w+/.send(@method, nil).should be_nil
+    /\w+/.send(@method, nil).should == nil
   end
 end
 
@@ -27,19 +27,19 @@
   it_behaves_like :regexp_match, :match
 
   it "returns a MatchData object" do
-    /(.)(.)(.)/.match("abc").should be_kind_of(MatchData)
+    /(.)(.)(.)/.match("abc").should.is_a?(MatchData)
   end
 
   it "returns a MatchData object, when argument is a Symbol" do
-    /(.)(.)(.)/.match(:abc).should be_kind_of(MatchData)
+    /(.)(.)(.)/.match(:abc).should.is_a?(MatchData)
   end
 
   it "raises a TypeError on an uninitialized Regexp" do
-    -> { Regexp.allocate.match('foo') }.should raise_error(TypeError)
+    -> { Regexp.allocate.match('foo') }.should.raise(TypeError)
   end
 
   it "raises TypeError on an uninitialized Regexp" do
-    -> { Regexp.allocate.match('foo'.encode("UTF-16LE")) }.should raise_error(TypeError)
+    -> { Regexp.allocate.match('foo'.encode("UTF-16LE")) }.should.raise(TypeError)
   end
 
   describe "with [string, position]" do
@@ -54,7 +54,7 @@
 
       it "raises an ArgumentError for an invalid encoding" do
         x96 = ([150].pack('C')).force_encoding('utf-8')
-        -> { /(.).(.)/.match("Hello, #{x96} world!", 1) }.should raise_error(ArgumentError)
+        -> { /(.).(.)/.match("Hello, #{x96} world!", 1) }.should.raise(ArgumentError)
       end
     end
 
@@ -69,14 +69,14 @@
 
       it "raises an ArgumentError for an invalid encoding" do
         x96 = ([150].pack('C')).force_encoding('utf-8')
-        -> { /(.).(.)/.match("Hello, #{x96} world!", -1) }.should raise_error(ArgumentError)
+        -> { /(.).(.)/.match("Hello, #{x96} world!", -1) }.should.raise(ArgumentError)
       end
     end
 
     describe "when passed a block" do
       it "yields the MatchData" do
         /./.match("abc") {|m| ScratchPad.record m }
-        ScratchPad.recorded.should be_kind_of(MatchData)
+        ScratchPad.recorded.should.is_a?(MatchData)
       end
 
       it "returns the block result" do
@@ -94,20 +94,20 @@
   it "resets $~ if passed nil" do
     # set $~
     /./.match("a")
-    $~.should be_kind_of(MatchData)
+    $~.should.is_a?(MatchData)
 
     /1/.match(nil)
-    $~.should be_nil
+    $~.should == nil
   end
 
   it "raises TypeError when the given argument cannot be coerced to String" do
     f = 1
-    -> { /foo/.match(f)[0] }.should raise_error(TypeError)
+    -> { /foo/.match(f)[0] }.should.raise(TypeError)
   end
 
   it "raises TypeError when the given argument is an Exception" do
     f = Exception.new("foo")
-    -> { /foo/.match(f)[0] }.should raise_error(TypeError)
+    -> { /foo/.match(f)[0] }.should.raise(TypeError)
   end
 end
 
@@ -119,22 +119,22 @@
 
   context "when matches the given value" do
     it "returns true but does not set Regexp.last_match" do
-      /string/i.match?('string').should be_true
-      Regexp.last_match.should be_nil
+      /string/i.match?('string').should == true
+      Regexp.last_match.should == nil
     end
   end
 
   it "returns false when does not match the given value" do
-    /STRING/.match?('string').should be_false
+    /STRING/.match?('string').should == false
   end
 
   it "takes matching position as the 2nd argument" do
-    /str/i.match?('string', 0).should be_true
-    /str/i.match?('string', 1).should be_false
+    /str/i.match?('string', 0).should == true
+    /str/i.match?('string', 1).should == false
   end
 
   it "returns false when given nil" do
-    /./.match?(nil).should be_false
+    /./.match?(nil).should == false
   end
 end
 
diff --git a/spec/ruby/core/regexp/named_captures_spec.rb b/spec/ruby/core/regexp/named_captures_spec.rb
index 1a68d7877b8..4d3fdd23ab2 100644
--- a/spec/ruby/core/regexp/named_captures_spec.rb
+++ b/spec/ruby/core/regexp/named_captures_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Regexp#named_captures" do
   it "returns a Hash" do
-    /foo/.named_captures.should be_an_instance_of(Hash)
+    /foo/.named_captures.should.instance_of?(Hash)
   end
 
   it "returns an empty Hash when there are no capture groups" do
@@ -17,7 +17,7 @@
   it "sets the values of the Hash to Arrays" do
     rex = /this (?<is>is) [aA] (?<pat>pate?rn)/
     rex.named_captures.values.each do |value|
-      value.should be_an_instance_of(Array)
+      value.should.instance_of?(Array)
     end
   end
 
diff --git a/spec/ruby/core/regexp/names_spec.rb b/spec/ruby/core/regexp/names_spec.rb
index 099768fd263..9013f41e208 100644
--- a/spec/ruby/core/regexp/names_spec.rb
+++ b/spec/ruby/core/regexp/names_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Regexp#names" do
   it "returns an Array" do
-    /foo/.names.should be_an_instance_of(Array)
+    /foo/.names.should.instance_of?(Array)
   end
 
   it "returns an empty Array if there are no named captures" do
@@ -11,7 +11,7 @@
 
   it "returns each named capture as a String" do
     /n(?<cap>ee)d(?<ture>le)/.names.each do |name|
-      name.should be_an_instance_of(String)
+      name.should.instance_of?(String)
     end
   end
 
diff --git a/spec/ruby/core/regexp/options_spec.rb b/spec/ruby/core/regexp/options_spec.rb
index 527b51a3b2d..c3401cee6ed 100644
--- a/spec/ruby/core/regexp/options_spec.rb
+++ b/spec/ruby/core/regexp/options_spec.rb
@@ -2,9 +2,9 @@
 
 describe "Regexp#options" do
   it "returns an Integer bitvector of regexp options for the Regexp object" do
-    /cat/.options.should be_kind_of(Integer)
+    /cat/.options.should.is_a?(Integer)
     not_supported_on :opal do
-      /cat/ix.options.should be_kind_of(Integer)
+      /cat/ix.options.should.is_a?(Integer)
     end
   end
 
@@ -29,7 +29,7 @@
   end
 
   it "raises a TypeError on an uninitialized Regexp" do
-    -> { Regexp.allocate.options }.should raise_error(TypeError)
+    -> { Regexp.allocate.options }.should.raise(TypeError)
   end
 
   it "includes Regexp::FIXEDENCODING for a Regexp literal with the 'u' option" do
diff --git a/spec/ruby/core/regexp/shared/new.rb b/spec/ruby/core/regexp/shared/new.rb
index 12c3d7c9c26..affdaf855ce 100644
--- a/spec/ruby/core/regexp/shared/new.rb
+++ b/spec/ruby/core/regexp/shared/new.rb
@@ -5,6 +5,12 @@
     Regexp.send(@method, '').is_a?(Regexp).should == true
   end
 
+  ruby_version_is "4.1" do
+    it "is frozen" do
+      Regexp.send(@method, '').should.frozen?
+    end
+  end
+
   it "works by default for subclasses with overridden #initialize" do
     class RegexpSpecsSubclass < Regexp
       def initialize(*args)
@@ -17,10 +23,10 @@ def initialize(*args)
 
     class RegexpSpecsSubclassTwo < Regexp; end
 
-    RegexpSpecsSubclass.send(@method, "hi").should be_kind_of(RegexpSpecsSubclass)
+    RegexpSpecsSubclass.send(@method, "hi").should.is_a?(RegexpSpecsSubclass)
     RegexpSpecsSubclass.send(@method, "hi").args.first.should == "hi"
 
-    RegexpSpecsSubclassTwo.send(@method, "hi").should be_kind_of(RegexpSpecsSubclassTwo)
+    RegexpSpecsSubclassTwo.send(@method, "hi").should.is_a?(RegexpSpecsSubclassTwo)
   end
 end
 
@@ -34,19 +40,19 @@ def obj.to_str() "a" end
 
   it "raises TypeError if there is no #to_str method for non-String/Regexp argument" do
     obj = Object.new
-    -> { Regexp.send(@method, obj) }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { Regexp.send(@method, obj) }.should.raise(TypeError, "no implicit conversion of Object into String")
 
-    -> { Regexp.send(@method, 1) }.should raise_error(TypeError, "no implicit conversion of Integer into String")
-    -> { Regexp.send(@method, 1.0) }.should raise_error(TypeError, "no implicit conversion of Float into String")
-    -> { Regexp.send(@method, :symbol) }.should raise_error(TypeError, "no implicit conversion of Symbol into String")
-    -> { Regexp.send(@method, []) }.should raise_error(TypeError, "no implicit conversion of Array into String")
+    -> { Regexp.send(@method, 1) }.should.raise(TypeError, "no implicit conversion of Integer into String")
+    -> { Regexp.send(@method, 1.0) }.should.raise(TypeError, "no implicit conversion of Float into String")
+    -> { Regexp.send(@method, :symbol) }.should.raise(TypeError, "no implicit conversion of Symbol into String")
+    -> { Regexp.send(@method, []) }.should.raise(TypeError, "no implicit conversion of Array into String")
   end
 
   it "raises TypeError if #to_str returns non-String value" do
     obj = Object.new
     def obj.to_str() [] end
 
-    -> { Regexp.send(@method, obj) }.should raise_error(TypeError, /can't convert Object to String/)
+    -> { Regexp.send(@method, obj) }.should raise_consistent_error(TypeError, /can't convert Object into String/)
   end
 end
 
@@ -56,7 +62,7 @@ def obj.to_str() [] end
   end
 
   it "raises a RegexpError when passed an incorrect regexp" do
-    -> { Regexp.send(@method, "^[$", 0) }.should raise_error(RegexpError, Regexp.new(Regexp.escape("premature end of char-class: /^[$/")))
+    -> { Regexp.send(@method, "^[$", 0) }.should.raise(RegexpError, Regexp.new(Regexp.escape("premature end of char-class: /^[$/")))
   end
 
   it "does not set Regexp options if only given one argument" do
@@ -178,21 +184,21 @@ def obj.to_int() ScratchPad.record(:called) end
   end
 
   it "raises an Argument error if the second argument contains unsupported chars" do
-    -> { Regexp.send(@method, 'Hi', 'e') }.should raise_error(ArgumentError, "unknown regexp option: e")
-    -> { Regexp.send(@method, 'Hi', 'n') }.should raise_error(ArgumentError, "unknown regexp option: n")
-    -> { Regexp.send(@method, 'Hi', 's') }.should raise_error(ArgumentError, "unknown regexp option: s")
-    -> { Regexp.send(@method, 'Hi', 'u') }.should raise_error(ArgumentError, "unknown regexp option: u")
-    -> { Regexp.send(@method, 'Hi', 'j') }.should raise_error(ArgumentError, "unknown regexp option: j")
-    -> { Regexp.send(@method, 'Hi', 'mjx') }.should raise_error(ArgumentError, /unknown regexp option: mjx\b/)
+    -> { Regexp.send(@method, 'Hi', 'e') }.should.raise(ArgumentError, "unknown regexp option: e")
+    -> { Regexp.send(@method, 'Hi', 'n') }.should.raise(ArgumentError, "unknown regexp option: n")
+    -> { Regexp.send(@method, 'Hi', 's') }.should.raise(ArgumentError, "unknown regexp option: s")
+    -> { Regexp.send(@method, 'Hi', 'u') }.should.raise(ArgumentError, "unknown regexp option: u")
+    -> { Regexp.send(@method, 'Hi', 'j') }.should.raise(ArgumentError, "unknown regexp option: j")
+    -> { Regexp.send(@method, 'Hi', 'mjx') }.should.raise(ArgumentError, /unknown regexp option: mjx\b/)
   end
 
   describe "with escaped characters" do
     it "raises a Regexp error if there is a trailing backslash" do
-      -> { Regexp.send(@method, "\\") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("too short escape sequence: /\\/")))
+      -> { Regexp.send(@method, "\\") }.should.raise(RegexpError, Regexp.new(Regexp.escape("too short escape sequence: /\\/")))
     end
 
     it "does not raise a Regexp error if there is an escaped trailing backslash" do
-      -> { Regexp.send(@method, "\\\\") }.should_not raise_error(RegexpError)
+      -> { Regexp.send(@method, "\\\\") }.should_not.raise(RegexpError)
     end
 
     it "accepts a backspace followed by a non-special character" do
@@ -200,23 +206,23 @@ def obj.to_int() ScratchPad.record(:called) end
     end
 
     it "raises a RegexpError if \\x is not followed by any hexadecimal digits" do
-      -> { Regexp.send(@method, "\\" + "xn") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid hex escape: /\\xn/")))
+      -> { Regexp.send(@method, "\\" + "xn") }.should.raise(RegexpError, Regexp.new(Regexp.escape("invalid hex escape: /\\xn/")))
     end
 
     it "raises a RegexpError if less than four digits are given for \\uHHHH" do
-      -> { Regexp.send(@method, "\\" + "u304") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode escape: /\\u304/")))
+      -> { Regexp.send(@method, "\\" + "u304") }.should.raise(RegexpError, Regexp.new(Regexp.escape("invalid Unicode escape: /\\u304/")))
     end
 
     it "raises a RegexpError if the \\u{} escape is empty" do
-      -> { Regexp.send(@method, "\\" + "u{}") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode list: /\\u{}/")))
+      -> { Regexp.send(@method, "\\" + "u{}") }.should.raise(RegexpError, Regexp.new(Regexp.escape("invalid Unicode list: /\\u{}/")))
     end
 
     it "raises a RegexpError if the \\u{} escape contains non hexadecimal digits" do
-      -> { Regexp.send(@method, "\\" + "u{abcX}") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode list: /\\u{abcX}/")))
+      -> { Regexp.send(@method, "\\" + "u{abcX}") }.should.raise(RegexpError, Regexp.new(Regexp.escape("invalid Unicode list: /\\u{abcX}/")))
     end
 
     it "raises a RegexpError if more than six hexadecimal digits are given" do
-      -> { Regexp.send(@method, "\\" + "u{0ffffff}") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode range: /\\u{0ffffff}/")))
+      -> { Regexp.send(@method, "\\" + "u{0ffffff}") }.should.raise(RegexpError, Regexp.new(Regexp.escape("invalid Unicode range: /\\u{0ffffff}/")))
     end
 
     it "returns a Regexp with US-ASCII encoding if only 7-bit ASCII characters are present regardless of the input String's encoding" do
diff --git a/spec/ruby/core/regexp/shared/quote.rb b/spec/ruby/core/regexp/shared/quote.rb
index 3f46a18b5bf..083f12d78c1 100644
--- a/spec/ruby/core/regexp/shared/quote.rb
+++ b/spec/ruby/core/regexp/shared/quote.rb
@@ -29,13 +29,13 @@
 
   it "sets the encoding of the result to the encoding of the String if any non-US-ASCII characters are present in an input String with valid encoding" do
     str = "ありがとう".dup.force_encoding("utf-8")
-    str.valid_encoding?.should be_true
+    str.valid_encoding?.should == true
     Regexp.send(@method, str).encoding.should == Encoding::UTF_8
   end
 
   it "sets the encoding of the result to BINARY if any non-US-ASCII characters are present in an input String with invalid encoding" do
     str = "\xff".dup.force_encoding "us-ascii"
-    str.valid_encoding?.should be_false
+    str.valid_encoding?.should == false
     Regexp.send(@method, "\xff").encoding.should == Encoding::BINARY
   end
 end
diff --git a/spec/ruby/core/regexp/source_spec.rb b/spec/ruby/core/regexp/source_spec.rb
index 5f253da9ea0..4eebf280f07 100644
--- a/spec/ruby/core/regexp/source_spec.rb
+++ b/spec/ruby/core/regexp/source_spec.rb
@@ -34,14 +34,14 @@
   not_supported_on :opal do
     it "has US-ASCII encoding when created from an ASCII-only \\u{} literal" do
       re = /[\u{20}-\u{7E}]/
-      re.source.encoding.should equal(Encoding::US_ASCII)
+      re.source.encoding.should.equal?(Encoding::US_ASCII)
     end
   end
 
   not_supported_on :opal do
     it "has UTF-8 encoding when created from a non-ASCII-only \\u{} literal" do
       re = /[\u{20}-\u{7EE}]/
-      re.source.encoding.should equal(Encoding::UTF_8)
+      re.source.encoding.should.equal?(Encoding::UTF_8)
     end
   end
 end
diff --git a/spec/ruby/core/regexp/timeout_spec.rb b/spec/ruby/core/regexp/timeout_spec.rb
index c64103c82cb..a1ec475ef3f 100644
--- a/spec/ruby/core/regexp/timeout_spec.rb
+++ b/spec/ruby/core/regexp/timeout_spec.rb
@@ -17,7 +17,7 @@
     -> {
       # A typical ReDoS case
       /^(a*)*$/ =~ "a" * 1000000 + "x"
-    }.should raise_error(Regexp::TimeoutError, "regexp match timeout")
+    }.should.raise(Regexp::TimeoutError, "regexp match timeout")
   end
 
   it "raises Regexp::TimeoutError after timeout keyword value elapsed" do
@@ -28,6 +28,6 @@
 
     -> {
       re =~ "a" * 1000000 + "x"
-    }.should raise_error(Regexp::TimeoutError, "regexp match timeout")
+    }.should.raise(Regexp::TimeoutError, "regexp match timeout")
   end
 end
diff --git a/spec/ruby/core/regexp/try_convert_spec.rb b/spec/ruby/core/regexp/try_convert_spec.rb
index e775dbe9716..da5e10adcef 100644
--- a/spec/ruby/core/regexp/try_convert_spec.rb
+++ b/spec/ruby/core/regexp/try_convert_spec.rb
@@ -9,7 +9,7 @@
 
   it "returns nil if given an argument that can't be converted to a Regexp" do
     ['', 'glark', [], Object.new, :pat].each do |arg|
-      Regexp.try_convert(arg).should be_nil
+      Regexp.try_convert(arg).should == nil
     end
   end
 
@@ -22,6 +22,6 @@
   it "raises a TypeError if the object does not return an Regexp from #to_regexp" do
     obj = mock("regexp")
     obj.should_receive(:to_regexp).and_return("string")
-    -> { Regexp.try_convert(obj) }.should raise_error(TypeError, "can't convert MockObject to Regexp (MockObject#to_regexp gives String)")
+    -> { Regexp.try_convert(obj) }.should raise_consistent_error(TypeError, "can't convert MockObject into Regexp (MockObject#to_regexp gives String)")
   end
 end
diff --git a/spec/ruby/core/regexp/union_spec.rb b/spec/ruby/core/regexp/union_spec.rb
index ea5a5053f72..c0a9d12fedf 100644
--- a/spec/ruby/core/regexp/union_spec.rb
+++ b/spec/ruby/core/regexp/union_spec.rb
@@ -75,83 +75,83 @@
   it "raises ArgumentError if the arguments include conflicting ASCII-incompatible Strings" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), "b".encode("UTF-16BE"))
-    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and UTF-16BE')
+    }.should.raise(ArgumentError, 'incompatible encodings: UTF-16LE and UTF-16BE')
   end
 
   it "raises ArgumentError if the arguments include conflicting ASCII-incompatible Regexps" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")),
                    Regexp.new("b".encode("UTF-16BE")))
-    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and UTF-16BE')
+    }.should.raise(ArgumentError, 'incompatible encodings: UTF-16LE and UTF-16BE')
   end
 
   it "raises ArgumentError if the arguments include conflicting fixed encoding Regexps" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-8"),    Regexp::FIXEDENCODING),
                    Regexp.new("b".encode("US-ASCII"), Regexp::FIXEDENCODING))
-    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-8 and US-ASCII')
+    }.should.raise(ArgumentError, 'incompatible encodings: UTF-8 and US-ASCII')
   end
 
   it "raises ArgumentError if the arguments include a fixed encoding Regexp and a String containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-8"), Regexp::FIXEDENCODING),
                    "\u00A9".encode("ISO-8859-1"))
-    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-8 and ISO-8859-1')
+    }.should.raise(ArgumentError, 'incompatible encodings: UTF-8 and ISO-8859-1')
   end
 
   it "raises ArgumentError if the arguments include a String containing non-ASCII-compatible characters and a fixed encoding Regexp in a different encoding" do
     -> {
       Regexp.union("\u00A9".encode("ISO-8859-1"),
                    Regexp.new("a".encode("UTF-8"), Regexp::FIXEDENCODING))
-    }.should raise_error(ArgumentError, 'incompatible encodings: ISO-8859-1 and UTF-8')
+    }.should.raise(ArgumentError, 'incompatible encodings: ISO-8859-1 and UTF-8')
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible String and an ASCII-only String" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), "b".encode("UTF-8"))
-    }.should raise_error(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
+    }.should.raise(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible Regexp and an ASCII-only String" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")), "b".encode("UTF-8"))
-    }.should raise_error(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
+    }.should.raise(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible String and an ASCII-only Regexp" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), Regexp.new("b".encode("UTF-8")))
-    }.should raise_error(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
+    }.should.raise(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible Regexp and an ASCII-only Regexp" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")), Regexp.new("b".encode("UTF-8")))
-    }.should raise_error(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
+    }.should.raise(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible String and a String containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), "\u00A9".encode("ISO-8859-1"))
-    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
+    }.should.raise(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible Regexp and a String containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")), "\u00A9".encode("ISO-8859-1"))
-    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
+    }.should.raise(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible String and a Regexp containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), Regexp.new("\u00A9".encode("ISO-8859-1")))
-    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
+    }.should.raise(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible Regexp and a Regexp containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")), Regexp.new("\u00A9".encode("ISO-8859-1")))
-    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
+    }.should.raise(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
   end
 
   it "uses to_str to convert arguments (if not Regexp)" do
@@ -177,6 +177,6 @@
     end
     -> {
       Regexp.union(["skiing", "sledding"], [/dogs/, /cats/i])
-    }.should raise_error(TypeError, 'no implicit conversion of Array into String')
+    }.should.raise(TypeError, 'no implicit conversion of Array into String')
   end
 end
diff --git a/spec/ruby/core/set/add_spec.rb b/spec/ruby/core/set/add_spec.rb
index 0fe1a0926ce..1ce03b1eabb 100644
--- a/spec/ruby/core/set/add_spec.rb
+++ b/spec/ruby/core/set/add_spec.rb
@@ -12,22 +12,22 @@
 
   it "adds the passed Object to self" do
     @set.add?("cat")
-    @set.should include("cat")
+    @set.should.include?("cat")
   end
 
   it "returns self when the Object has not yet been added to self" do
-    @set.add?("cat").should equal(@set)
+    @set.add?("cat").should.equal?(@set)
   end
 
   it "returns nil when the Object has already been added to self" do
     @set.add?("cat")
-    @set.add?("cat").should be_nil
+    @set.add?("cat").should == nil
   end
 
   it "raises RuntimeError when called during iteration" do
     set = Set[:a, :b, :c, :d, :e, :f]
     set.each do |_m|
-      -> { set << 1 }.should raise_error(RuntimeError, /iteration/)
+      -> { set << 1 }.should.raise(RuntimeError, /iteration/)
     end
     set.should == Set[:a, :b, :c, :d, :e, :f]
   end
diff --git a/spec/ruby/core/set/classify_spec.rb b/spec/ruby/core/set/classify_spec.rb
index d86ea2722d8..a225ab7cbb9 100644
--- a/spec/ruby/core/set/classify_spec.rb
+++ b/spec/ruby/core/set/classify_spec.rb
@@ -13,7 +13,7 @@
 
   it "returns an Enumerator when passed no block" do
     enum = @set.classify
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
 
     classified = enum.each { |x| x.length }
     classified.should == { 3 => Set["one", "two"], 4 => Set["four"], 5 => Set["three"] }
diff --git a/spec/ruby/core/set/clear_spec.rb b/spec/ruby/core/set/clear_spec.rb
index ebeac211d3f..c61a0d78f2c 100644
--- a/spec/ruby/core/set/clear_spec.rb
+++ b/spec/ruby/core/set/clear_spec.rb
@@ -7,10 +7,10 @@
 
   it "removes all elements from self" do
     @set.clear
-    @set.should be_empty
+    @set.should.empty?
   end
 
   it "returns self" do
-    @set.clear.should equal(@set)
+    @set.clear.should.equal?(@set)
   end
 end
diff --git a/spec/ruby/core/set/compare_by_identity_spec.rb b/spec/ruby/core/set/compare_by_identity_spec.rb
index 238dc117a6c..458e760da0f 100644
--- a/spec/ruby/core/set/compare_by_identity_spec.rb
+++ b/spec/ruby/core/set/compare_by_identity_spec.rb
@@ -16,9 +16,9 @@
     elt = [1]
     set = Set.new
     set << elt
-    set.member?(elt.dup).should be_true
+    set.member?(elt.dup).should == true
     set.compare_by_identity
-    set.member?(elt.dup).should be_false
+    set.member?(elt.dup).should == false
   end
 
   it "rehashes internally so that old members can be looked up" do
@@ -28,19 +28,19 @@
     def o.hash; 123; end
     set << o
     set.compare_by_identity
-    set.member?(o).should be_true
+    set.member?(o).should == true
   end
 
   it "returns self" do
     set = Set.new
     result = set.compare_by_identity
-    result.should equal(set)
+    result.should.equal?(set)
   end
 
   it "is idempotent and has no effect on an already compare_by_identity set" do
     set = Set.new.compare_by_identity
     set << :foo
-    set.compare_by_identity.should equal(set)
+    set.compare_by_identity.should.equal?(set)
     set.should.compare_by_identity?
     set.to_a.should == [:foo]
   end
@@ -69,7 +69,7 @@ def o.hash; 123; end
     elt.should_not_receive(:hash)
     set = Set.new.compare_by_identity
     set << elt
-    set.member?(elt).should be_true
+    set.member?(elt).should == true
   end
 
   it "regards #dup'd objects as having different identities" do
@@ -95,7 +95,7 @@ def o.hash; 123; end
       set = Set.new.freeze
       -> {
         set.compare_by_identity
-      }.should raise_error(FrozenError, /can't modify frozen Set: (#<)?Set(\[|: {)[\]}]>?/)
+      }.should.raise(FrozenError, /can't modify frozen Set: (#<)?Set(\[|: {)[\]}]>?/)
     end
   end
 
@@ -104,7 +104,7 @@ def o.hash; 123; end
       set = Set.new.freeze
       -> {
         set.compare_by_identity
-      }.should raise_error(FrozenError, /frozen Hash/)
+      }.should.raise(FrozenError, /frozen Hash/)
     end
   end
 
diff --git a/spec/ruby/core/set/comparison_spec.rb b/spec/ruby/core/set/comparison_spec.rb
index 62059b70b3b..eb18a198e5f 100644
--- a/spec/ruby/core/set/comparison_spec.rb
+++ b/spec/ruby/core/set/comparison_spec.rb
@@ -17,10 +17,10 @@
   end
 
   it "returns nil if the set has unique elements" do
-    (Set[1, 2, 3] <=> Set[:a, :b, :c]).should be_nil
+    (Set[1, 2, 3] <=> Set[:a, :b, :c]).should == nil
   end
 
   it "returns nil when the argument is not set-like" do
-    (Set[] <=> false).should be_nil
+    (Set[] <=> false).should == nil
   end
 end
diff --git a/spec/ruby/core/set/constructor_spec.rb b/spec/ruby/core/set/constructor_spec.rb
index 365081ad39b..11138f3a5b8 100644
--- a/spec/ruby/core/set/constructor_spec.rb
+++ b/spec/ruby/core/set/constructor_spec.rb
@@ -4,11 +4,11 @@
   it "returns a new Set populated with the passed Objects" do
     set = Set[1, 2, 3]
 
-    set.instance_of?(Set).should be_true
-    set.size.should eql(3)
+    set.instance_of?(Set).should == true
+    set.size.should.eql?(3)
 
-    set.should include(1)
-    set.should include(2)
-    set.should include(3)
+    set.should.include?(1)
+    set.should.include?(2)
+    set.should.include?(3)
   end
 end
diff --git a/spec/ruby/core/set/delete_if_spec.rb b/spec/ruby/core/set/delete_if_spec.rb
index beda73a5e5f..b231dff50da 100644
--- a/spec/ruby/core/set/delete_if_spec.rb
+++ b/spec/ruby/core/set/delete_if_spec.rb
@@ -13,25 +13,25 @@
 
   it "deletes every element from self for which the passed block returns true" do
     @set.delete_if { |x| x.size == 3 }
-    @set.size.should eql(1)
+    @set.size.should.eql?(1)
 
-    @set.should_not include("one")
-    @set.should_not include("two")
-    @set.should include("three")
+    @set.should_not.include?("one")
+    @set.should_not.include?("two")
+    @set.should.include?("three")
   end
 
   it "returns self" do
-    @set.delete_if { |x| x }.should equal(@set)
+    @set.delete_if { |x| x }.should.equal?(@set)
   end
 
   it "returns an Enumerator when passed no block" do
     enum = @set.delete_if
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
 
     enum.each { |x| x.size == 3 }
 
-    @set.should_not include("one")
-    @set.should_not include("two")
-    @set.should include("three")
+    @set.should_not.include?("one")
+    @set.should_not.include?("two")
+    @set.should.include?("three")
   end
 end
diff --git a/spec/ruby/core/set/delete_spec.rb b/spec/ruby/core/set/delete_spec.rb
index a2543ecbee7..cdc6dd7b369 100644
--- a/spec/ruby/core/set/delete_spec.rb
+++ b/spec/ruby/core/set/delete_spec.rb
@@ -7,12 +7,12 @@
 
   it "deletes the passed Object from self" do
     @set.delete("a")
-    @set.should_not include("a")
+    @set.should_not.include?("a")
   end
 
   it "returns self" do
-    @set.delete("a").should equal(@set)
-    @set.delete("x").should equal(@set)
+    @set.delete("a").should.equal?(@set)
+    @set.delete("x").should.equal?(@set)
   end
 end
 
@@ -23,14 +23,14 @@
 
   it "deletes the passed Object from self" do
     @set.delete?("a")
-    @set.should_not include("a")
+    @set.should_not.include?("a")
   end
 
   it "returns self when the passed Object is in self" do
-    @set.delete?("a").should equal(@set)
+    @set.delete?("a").should.equal?(@set)
   end
 
   it "returns nil when the passed Object is not in self" do
-    @set.delete?("x").should be_nil
+    @set.delete?("x").should == nil
   end
 end
diff --git a/spec/ruby/core/set/disjoint_spec.rb b/spec/ruby/core/set/disjoint_spec.rb
index 89a3c4b1577..d415c210454 100644
--- a/spec/ruby/core/set/disjoint_spec.rb
+++ b/spec/ruby/core/set/disjoint_spec.rb
@@ -12,11 +12,11 @@
 
   context "when comparing to a Set-like object" do
     it "returns false when a Set has at least one element in common with a Set-like object" do
-      Set[1, 2].disjoint?(SetSpecs::SetLike.new([2, 3])).should be_false
+      Set[1, 2].disjoint?(SetSpecs::SetLike.new([2, 3])).should == false
     end
 
     it "returns true when a Set has no element in common with a Set-like object" do
-      Set[1, 2].disjoint?(SetSpecs::SetLike.new([3, 4])).should be_true
+      Set[1, 2].disjoint?(SetSpecs::SetLike.new([3, 4])).should == true
     end
   end
 end
diff --git a/spec/ruby/core/set/divide_spec.rb b/spec/ruby/core/set/divide_spec.rb
index c6c6003e99d..409a22df756 100644
--- a/spec/ruby/core/set/divide_spec.rb
+++ b/spec/ruby/core/set/divide_spec.rb
@@ -14,7 +14,7 @@
 
   it "returns an enumerator when not passed a block" do
     ret = Set[1, 2, 3, 4].divide
-    ret.should be_kind_of(Enumerator)
+    ret.should.is_a?(Enumerator)
     ret.each(&:even?).should == Set[Set[1, 3], Set[2, 4]]
   end
 end
@@ -43,7 +43,7 @@
 
   it "returns an enumerator when not passed a block" do
     ret = Set[1, 2, 3, 4].divide
-    ret.should be_kind_of(Enumerator)
+    ret.should.is_a?(Enumerator)
     ret.each { |a, b| (a + b).even? }.should == Set[Set[1, 3], Set[2, 4]]
   end
 end
@@ -51,8 +51,8 @@
 describe "Set#divide when passed a block with an arity of > 2" do
   it "only uses the first element if the arity > 2" do
     set = Set["one", "two", "three", "four", "five"].divide do |x, y, z|
-      y.should be_nil
-      z.should be_nil
+      y.should == nil
+      z.should == nil
       x.length
     end
     set.map { |x| x.to_a.sort }.sort.should == [["five", "four"], ["one", "two"], ["three"]]
diff --git a/spec/ruby/core/set/each_spec.rb b/spec/ruby/core/set/each_spec.rb
index 3d9cdc2d468..bdafc995716 100644
--- a/spec/ruby/core/set/each_spec.rb
+++ b/spec/ruby/core/set/each_spec.rb
@@ -12,12 +12,12 @@
   end
 
   it "returns self" do
-    @set.each { |x| x }.should equal(@set)
+    @set.each { |x| x }.should.equal?(@set)
   end
 
   it "returns an Enumerator when not passed a block" do
     enum = @set.each
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
 
     ret = []
     enum.each { |x| ret << x }
diff --git a/spec/ruby/core/set/empty_spec.rb b/spec/ruby/core/set/empty_spec.rb
index 4b55658e20f..c71f2ce18da 100644
--- a/spec/ruby/core/set/empty_spec.rb
+++ b/spec/ruby/core/set/empty_spec.rb
@@ -2,8 +2,8 @@
 
 describe "Set#empty?" do
   it "returns true if self is empty" do
-    Set[].empty?.should be_true
-    Set[1].empty?.should be_false
-    Set[1,2,3].empty?.should be_false
+    Set[].empty?.should == true
+    Set[1].empty?.should == false
+    Set[1,2,3].empty?.should == false
   end
 end
diff --git a/spec/ruby/core/set/eql_spec.rb b/spec/ruby/core/set/eql_spec.rb
index 4ad5c3aa5a1..6862ed4edad 100644
--- a/spec/ruby/core/set/eql_spec.rb
+++ b/spec/ruby/core/set/eql_spec.rb
@@ -2,13 +2,13 @@
 
 describe "Set#eql?" do
   it "returns true when the passed argument is a Set and contains the same elements" do
-    Set[].should eql(Set[])
-    Set[1, 2, 3].should eql(Set[1, 2, 3])
-    Set[1, 2, 3].should eql(Set[3, 2, 1])
-    Set["a", :b, ?c].should eql(Set[?c, :b, "a"])
+    Set[].should.eql?(Set[])
+    Set[1, 2, 3].should.eql?(Set[1, 2, 3])
+    Set[1, 2, 3].should.eql?(Set[3, 2, 1])
+    Set["a", :b, ?c].should.eql?(Set[?c, :b, "a"])
 
-    Set[1, 2, 3].should_not eql(Set[1.0, 2, 3])
-    Set[1, 2, 3].should_not eql(Set[2, 3])
-    Set[1, 2, 3].should_not eql(Set[])
+    Set[1, 2, 3].should_not.eql?(Set[1.0, 2, 3])
+    Set[1, 2, 3].should_not.eql?(Set[2, 3])
+    Set[1, 2, 3].should_not.eql?(Set[])
   end
 end
diff --git a/spec/ruby/core/set/exclusion_spec.rb b/spec/ruby/core/set/exclusion_spec.rb
index bbc29afa95e..52ee34fe786 100644
--- a/spec/ruby/core/set/exclusion_spec.rb
+++ b/spec/ruby/core/set/exclusion_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "raises an ArgumentError when passed a non-Enumerable" do
-    -> { @set ^ 3 }.should raise_error(ArgumentError)
-    -> { @set ^ Object.new }.should raise_error(ArgumentError)
+    -> { @set ^ 3 }.should.raise(ArgumentError)
+    -> { @set ^ Object.new }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/set/flatten_merge_spec.rb b/spec/ruby/core/set/flatten_merge_spec.rb
index 13cedeead95..3904d969aee 100644
--- a/spec/ruby/core/set/flatten_merge_spec.rb
+++ b/spec/ruby/core/set/flatten_merge_spec.rb
@@ -3,7 +3,7 @@
 describe "Set#flatten_merge" do
   ruby_version_is ""..."4.0" do
     it "is protected" do
-      Set.should have_protected_instance_method("flatten_merge")
+      Set.protected_instance_methods(false).should.include?(:flatten_merge)
     end
 
     it "flattens the passed Set and merges it into self" do
@@ -18,7 +18,7 @@
       set2 = Set[5, 6, 7]
       set2 << set2
 
-      -> { set1.send(:flatten_merge, set2) }.should raise_error(ArgumentError)
+      -> { set1.send(:flatten_merge, set2) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/set/flatten_spec.rb b/spec/ruby/core/set/flatten_spec.rb
index b26bc8481af..ca6323fac8b 100644
--- a/spec/ruby/core/set/flatten_spec.rb
+++ b/spec/ruby/core/set/flatten_spec.rb
@@ -7,13 +7,13 @@
     set = Set[1, 2, Set[3, 4, Set[5, 6, Set[7, 8]]], 9, 10]
     flattened_set = set.flatten
 
-    flattened_set.should_not equal(set)
+    flattened_set.should_not.equal?(set)
     flattened_set.should == Set[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
   end
 
   it "raises an ArgumentError when self is recursive" do
     (set = Set[]) << set
-    -> { set.flatten }.should raise_error(ArgumentError)
+    -> { set.flatten }.should.raise(ArgumentError)
   end
 
   ruby_version_is ""..."4.0" do
@@ -34,16 +34,16 @@
 
   it "returns self when self was modified" do
     set = Set[1, 2, Set[3, 4]]
-    set.flatten!.should equal(set)
+    set.flatten!.should.equal?(set)
   end
 
   it "returns nil when self was not modified" do
     set = Set[1, 2, 3, 4]
-    set.flatten!.should be_nil
+    set.flatten!.should == nil
   end
 
   it "raises an ArgumentError when self is recursive" do
     (set = Set[]) << set
-    -> { set.flatten! }.should raise_error(ArgumentError)
+    -> { set.flatten! }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/set/initialize_spec.rb b/spec/ruby/core/set/initialize_spec.rb
index ad9e1bd8c9d..45538b38fb8 100644
--- a/spec/ruby/core/set/initialize_spec.rb
+++ b/spec/ruby/core/set/initialize_spec.rb
@@ -2,71 +2,87 @@
 
 describe "Set#initialize" do
   it "is private" do
-    Set.should have_private_instance_method(:initialize)
+    Set.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "adds all elements of the passed Enumerable to self" do
     s = Set.new([1, 2, 3])
-    s.size.should eql(3)
-    s.should include(1)
-    s.should include(2)
-    s.should include(3)
+    s.size.should.eql?(3)
+    s.should.include?(1)
+    s.should.include?(2)
+    s.should.include?(3)
   end
 
   it "uses #each_entry on the provided Enumerable" do
     enumerable = MockObject.new('mock-enumerable')
     enumerable.should_receive(:each_entry).and_yield(1).and_yield(2).and_yield(3)
     s = Set.new(enumerable)
-    s.size.should eql(3)
-    s.should include(1)
-    s.should include(2)
-    s.should include(3)
+    s.size.should.eql?(3)
+    s.should.include?(1)
+    s.should.include?(2)
+    s.should.include?(3)
   end
 
   it "uses #each on the provided Enumerable if it does not respond to #each_entry" do
     enumerable = MockObject.new('mock-enumerable')
     enumerable.should_receive(:each).and_yield(1).and_yield(2).and_yield(3)
     s = Set.new(enumerable)
-    s.size.should eql(3)
-    s.should include(1)
-    s.should include(2)
-    s.should include(3)
+    s.size.should.eql?(3)
+    s.should.include?(1)
+    s.should.include?(2)
+    s.should.include?(3)
   end
 
   it "raises if the provided Enumerable does not respond to #each_entry or #each" do
     enumerable = MockObject.new('mock-enumerable')
-    -> { Set.new(enumerable) }.should raise_error(ArgumentError, "value must be enumerable")
+    -> { Set.new(enumerable) }.should.raise(ArgumentError, "value must be enumerable")
   end
 
   it "should initialize with empty array and set" do
     s = Set.new([])
-    s.size.should eql(0)
+    s.size.should.eql?(0)
 
     s = Set.new({})
-    s.size.should eql(0)
+    s.size.should.eql?(0)
   end
 
   it "preprocesses all elements by a passed block before adding to self" do
     s = Set.new([1, 2, 3]) { |x| x * x }
-    s.size.should eql(3)
-    s.should include(1)
-    s.should include(4)
-    s.should include(9)
+    s.size.should.eql?(3)
+    s.should.include?(1)
+    s.should.include?(4)
+    s.should.include?(9)
   end
 
   it "should initialize with empty array and block" do
     s = Set.new([]) { |x| x * x }
-    s.size.should eql(0)
+    s.size.should.eql?(0)
   end
 
   it "should initialize with empty set and block" do
     s = Set.new(Set.new) { |x| x * x }
-    s.size.should eql(0)
+    s.size.should.eql?(0)
+  end
+
+  it "should initialize with set" do
+    o = Set.new([1, 2])
+    s = Set.new(o)
+    s.size.should.eql?(2)
+    s.should.include?(1)
+    s.should.include?(2)
+  end
+
+  it "should initialize with set and block" do
+    o = Set.new([1, 2])
+    s = Set.new(o) { |e| e + 2 }
+    s.size.should.eql?(2)
+    s.should.include?(3)
+    s.should.include?(4)
   end
 
   it "should initialize with just block" do
     s = Set.new { |x| x * x }
-    s.size.should eql(0)
-    s.should eql(Set.new)
+    s.size.should.eql?(0)
+    s.should.eql?(Set.new)
   end
 end
diff --git a/spec/ruby/core/set/intersect_spec.rb b/spec/ruby/core/set/intersect_spec.rb
index 0736dea5fd0..d04a1af4416 100644
--- a/spec/ruby/core/set/intersect_spec.rb
+++ b/spec/ruby/core/set/intersect_spec.rb
@@ -12,11 +12,11 @@
 
   context "when comparing to a Set-like object" do
     it "returns true when a Set has at least one element in common with a Set-like object" do
-      Set[1, 2].intersect?(SetSpecs::SetLike.new([2, 3])).should be_true
+      Set[1, 2].intersect?(SetSpecs::SetLike.new([2, 3])).should == true
     end
 
     it "returns false when a Set has no element in common with a Set-like object" do
-      Set[1, 2].intersect?(SetSpecs::SetLike.new([3, 4])).should be_false
+      Set[1, 2].intersect?(SetSpecs::SetLike.new([3, 4])).should == false
     end
   end
 end
diff --git a/spec/ruby/core/set/keep_if_spec.rb b/spec/ruby/core/set/keep_if_spec.rb
index d6abdd6adc6..7ca5d0cd439 100644
--- a/spec/ruby/core/set/keep_if_spec.rb
+++ b/spec/ruby/core/set/keep_if_spec.rb
@@ -13,25 +13,25 @@
 
   it "keeps every element from self for which the passed block returns true" do
     @set.keep_if { |x| x.size != 3 }
-    @set.size.should eql(1)
+    @set.size.should.eql?(1)
 
-    @set.should_not include("one")
-    @set.should_not include("two")
-    @set.should include("three")
+    @set.should_not.include?("one")
+    @set.should_not.include?("two")
+    @set.should.include?("three")
   end
 
   it "returns self" do
-    @set.keep_if {}.should equal(@set)
+    @set.keep_if {}.should.equal?(@set)
   end
 
   it "returns an Enumerator when passed no block" do
     enum = @set.keep_if
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
 
     enum.each { |x| x.size != 3 }
 
-    @set.should_not include("one")
-    @set.should_not include("two")
-    @set.should include("three")
+    @set.should_not.include?("one")
+    @set.should_not.include?("two")
+    @set.should.include?("three")
   end
 end
diff --git a/spec/ruby/core/set/merge_spec.rb b/spec/ruby/core/set/merge_spec.rb
index bf945cdcc02..a2c1a7e7069 100644
--- a/spec/ruby/core/set/merge_spec.rb
+++ b/spec/ruby/core/set/merge_spec.rb
@@ -8,18 +8,18 @@
 
   it "returns self" do
     set = Set[1, 2]
-    set.merge([3, 4]).should equal(set)
+    set.merge([3, 4]).should.equal?(set)
   end
 
   it "raises an ArgumentError when passed a non-Enumerable" do
-    -> { Set[1, 2].merge(1) }.should raise_error(ArgumentError)
-    -> { Set[1, 2].merge(Object.new) }.should raise_error(ArgumentError)
+    -> { Set[1, 2].merge(1) }.should.raise(ArgumentError)
+    -> { Set[1, 2].merge(Object.new) }.should.raise(ArgumentError)
   end
 
   it "raises RuntimeError when called during iteration" do
     set = Set[:a, :b]
     set.each do |_m|
-      -> { set.merge([1, 2]) }.should raise_error(RuntimeError, /iteration/)
+      -> { set.merge([1, 2]) }.should.raise(RuntimeError, /iteration/)
     end
   end
 
diff --git a/spec/ruby/core/set/proper_subset_spec.rb b/spec/ruby/core/set/proper_subset_spec.rb
index 6f99447019b..3fd27da131d 100644
--- a/spec/ruby/core/set/proper_subset_spec.rb
+++ b/spec/ruby/core/set/proper_subset_spec.rb
@@ -8,28 +8,28 @@
   end
 
   it "returns true if passed a Set that self is a proper subset of" do
-    Set[].proper_subset?(@set).should be_true
-    Set[].proper_subset?(Set[1, 2, 3]).should be_true
-    Set[].proper_subset?(Set["a", :b, ?c]).should be_true
+    Set[].proper_subset?(@set).should == true
+    Set[].proper_subset?(Set[1, 2, 3]).should == true
+    Set[].proper_subset?(Set["a", :b, ?c]).should == true
 
-    Set[1, 2, 3].proper_subset?(@set).should be_true
-    Set[1, 3].proper_subset?(@set).should be_true
-    Set[1, 2].proper_subset?(@set).should be_true
-    Set[1].proper_subset?(@set).should be_true
+    Set[1, 2, 3].proper_subset?(@set).should == true
+    Set[1, 3].proper_subset?(@set).should == true
+    Set[1, 2].proper_subset?(@set).should == true
+    Set[1].proper_subset?(@set).should == true
 
-    Set[5].proper_subset?(@set).should be_false
-    Set[1, 5].proper_subset?(@set).should be_false
-    Set[nil].proper_subset?(@set).should be_false
-    Set["test"].proper_subset?(@set).should be_false
+    Set[5].proper_subset?(@set).should == false
+    Set[1, 5].proper_subset?(@set).should == false
+    Set[nil].proper_subset?(@set).should == false
+    Set["test"].proper_subset?(@set).should == false
 
-    @set.proper_subset?(@set).should be_false
-    Set[].proper_subset?(Set[]).should be_false
+    @set.proper_subset?(@set).should == false
+    Set[].proper_subset?(Set[]).should == false
   end
 
   it "raises an ArgumentError when passed a non-Set" do
-    -> { Set[].proper_subset?([]) }.should raise_error(ArgumentError)
-    -> { Set[].proper_subset?(1) }.should raise_error(ArgumentError)
-    -> { Set[].proper_subset?("test") }.should raise_error(ArgumentError)
-    -> { Set[].proper_subset?(Object.new) }.should raise_error(ArgumentError)
+    -> { Set[].proper_subset?([]) }.should.raise(ArgumentError)
+    -> { Set[].proper_subset?(1) }.should.raise(ArgumentError)
+    -> { Set[].proper_subset?("test") }.should.raise(ArgumentError)
+    -> { Set[].proper_subset?(Object.new) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/set/proper_superset_spec.rb b/spec/ruby/core/set/proper_superset_spec.rb
index dc1e87e2308..e95c67ef0e5 100644
--- a/spec/ruby/core/set/proper_superset_spec.rb
+++ b/spec/ruby/core/set/proper_superset_spec.rb
@@ -7,35 +7,35 @@
   end
 
   it "returns true if passed a Set that self is a proper superset of" do
-    @set.proper_superset?(Set[]).should be_true
-    Set[1, 2, 3].proper_superset?(Set[]).should be_true
-    Set["a", :b, ?c].proper_superset?(Set[]).should be_true
+    @set.proper_superset?(Set[]).should == true
+    Set[1, 2, 3].proper_superset?(Set[]).should == true
+    Set["a", :b, ?c].proper_superset?(Set[]).should == true
 
-    @set.proper_superset?(Set[1, 2, 3]).should be_true
-    @set.proper_superset?(Set[1, 3]).should be_true
-    @set.proper_superset?(Set[1, 2]).should be_true
-    @set.proper_superset?(Set[1]).should be_true
+    @set.proper_superset?(Set[1, 2, 3]).should == true
+    @set.proper_superset?(Set[1, 3]).should == true
+    @set.proper_superset?(Set[1, 2]).should == true
+    @set.proper_superset?(Set[1]).should == true
 
-    @set.proper_superset?(Set[5]).should be_false
-    @set.proper_superset?(Set[1, 5]).should be_false
-    @set.proper_superset?(Set[nil]).should be_false
-    @set.proper_superset?(Set["test"]).should be_false
+    @set.proper_superset?(Set[5]).should == false
+    @set.proper_superset?(Set[1, 5]).should == false
+    @set.proper_superset?(Set[nil]).should == false
+    @set.proper_superset?(Set["test"]).should == false
 
-    @set.proper_superset?(@set).should be_false
-    Set[].proper_superset?(Set[]).should be_false
+    @set.proper_superset?(@set).should == false
+    Set[].proper_superset?(Set[]).should == false
   end
 
   it "raises an ArgumentError when passed a non-Set" do
-    -> { Set[].proper_superset?([]) }.should raise_error(ArgumentError)
-    -> { Set[].proper_superset?(1) }.should raise_error(ArgumentError)
-    -> { Set[].proper_superset?("test") }.should raise_error(ArgumentError)
-    -> { Set[].proper_superset?(Object.new) }.should raise_error(ArgumentError)
+    -> { Set[].proper_superset?([]) }.should.raise(ArgumentError)
+    -> { Set[].proper_superset?(1) }.should.raise(ArgumentError)
+    -> { Set[].proper_superset?("test") }.should.raise(ArgumentError)
+    -> { Set[].proper_superset?(Object.new) }.should.raise(ArgumentError)
   end
 
   ruby_version_is ""..."4.0" do
     context "when comparing to a Set-like object" do
       it "returns true if passed a Set-like object that self is a proper superset of" do
-        Set[1, 2, 3, 4].proper_superset?(SetSpecs::SetLike.new([1, 2, 3])).should be_true
+        Set[1, 2, 3, 4].proper_superset?(SetSpecs::SetLike.new([1, 2, 3])).should == true
       end
     end
   end
diff --git a/spec/ruby/core/set/reject_spec.rb b/spec/ruby/core/set/reject_spec.rb
index 91d02934158..b00a36812b9 100644
--- a/spec/ruby/core/set/reject_spec.rb
+++ b/spec/ruby/core/set/reject_spec.rb
@@ -13,29 +13,29 @@
 
   it "deletes every element from self for which the passed block returns true" do
     @set.reject! { |x| x.size == 3 }
-    @set.size.should eql(1)
+    @set.size.should.eql?(1)
 
-    @set.should_not include("one")
-    @set.should_not include("two")
-    @set.should include("three")
+    @set.should_not.include?("one")
+    @set.should_not.include?("two")
+    @set.should.include?("three")
   end
 
   it "returns self when self was modified" do
-    @set.reject! { |x| true }.should equal(@set)
+    @set.reject! { |x| true }.should.equal?(@set)
   end
 
   it "returns nil when self was not modified" do
-    @set.reject! { |x| false }.should be_nil
+    @set.reject! { |x| false }.should == nil
   end
 
   it "returns an Enumerator when passed no block" do
     enum = @set.reject!
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
 
     enum.each { |x| x.size == 3 }
 
-    @set.should_not include("one")
-    @set.should_not include("two")
-    @set.should include("three")
+    @set.should_not.include?("one")
+    @set.should_not.include?("two")
+    @set.should.include?("three")
   end
 end
diff --git a/spec/ruby/core/set/replace_spec.rb b/spec/ruby/core/set/replace_spec.rb
index c66a2d0ec36..2a51a024dcb 100644
--- a/spec/ruby/core/set/replace_spec.rb
+++ b/spec/ruby/core/set/replace_spec.rb
@@ -13,7 +13,7 @@
   it "raises RuntimeError when called during iteration" do
     set = Set[:a, :b, :c, :d, :e, :f]
     set.each do |_m|
-      -> { set.replace(Set[1, 2, 3]) }.should raise_error(RuntimeError, /iteration/)
+      -> { set.replace(Set[1, 2, 3]) }.should.raise(RuntimeError, /iteration/)
     end
     set.should == Set[:a, :b, :c, :d, :e, :f]
   end
diff --git a/spec/ruby/core/set/shared/add.rb b/spec/ruby/core/set/shared/add.rb
index 9e797f5df96..8d6d83434f5 100644
--- a/spec/ruby/core/set/shared/add.rb
+++ b/spec/ruby/core/set/shared/add.rb
@@ -5,10 +5,10 @@
 
   it "adds the passed Object to self" do
     @set.send(@method, "dog")
-    @set.should include("dog")
+    @set.should.include?("dog")
   end
 
   it "returns self" do
-    @set.send(@method, "dog").should equal(@set)
+    @set.send(@method, "dog").should.equal?(@set)
   end
 end
diff --git a/spec/ruby/core/set/shared/collect.rb b/spec/ruby/core/set/shared/collect.rb
index bc58c231be8..ad5c5afa590 100644
--- a/spec/ruby/core/set/shared/collect.rb
+++ b/spec/ruby/core/set/shared/collect.rb
@@ -10,7 +10,7 @@
   end
 
   it "returns self" do
-    @set.send(@method) { |x| x }.should equal(@set)
+    @set.send(@method) { |x| x }.should.equal?(@set)
   end
 
   it "replaces self with the return values of the block" do
diff --git a/spec/ruby/core/set/shared/difference.rb b/spec/ruby/core/set/shared/difference.rb
index f88987ed2aa..8a17056a823 100644
--- a/spec/ruby/core/set/shared/difference.rb
+++ b/spec/ruby/core/set/shared/difference.rb
@@ -9,7 +9,7 @@
   end
 
   it "raises an ArgumentError when passed a non-Enumerable" do
-    -> { @set.send(@method, 1) }.should raise_error(ArgumentError)
-    -> { @set.send(@method, Object.new) }.should raise_error(ArgumentError)
+    -> { @set.send(@method, 1) }.should.raise(ArgumentError)
+    -> { @set.send(@method, Object.new) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/set/shared/include.rb b/spec/ruby/core/set/shared/include.rb
index b4d95cde248..82755ccf593 100644
--- a/spec/ruby/core/set/shared/include.rb
+++ b/spec/ruby/core/set/shared/include.rb
@@ -1,8 +1,8 @@
 describe :set_include, shared: true do
   it "returns true when self contains the passed Object" do
     set = Set[:a, :b, :c]
-    set.send(@method, :a).should be_true
-    set.send(@method, :e).should be_false
+    set.send(@method, :a).should == true
+    set.send(@method, :e).should == false
   end
 
   describe "member equality" do
diff --git a/spec/ruby/core/set/shared/inspect.rb b/spec/ruby/core/set/shared/inspect.rb
index a90af66c980..31bd8accfd0 100644
--- a/spec/ruby/core/set/shared/inspect.rb
+++ b/spec/ruby/core/set/shared/inspect.rb
@@ -1,10 +1,10 @@
 describe :set_inspect, shared: true do
   it "returns a String representation of self" do
-    Set[].send(@method).should be_kind_of(String)
-    Set[nil, false, true].send(@method).should be_kind_of(String)
-    Set[1, 2, 3].send(@method).should be_kind_of(String)
-    Set["1", "2", "3"].send(@method).should be_kind_of(String)
-    Set[:a, "b", Set[?c]].send(@method).should be_kind_of(String)
+    Set[].send(@method).should.is_a?(String)
+    Set[nil, false, true].send(@method).should.is_a?(String)
+    Set[1, 2, 3].send(@method).should.is_a?(String)
+    Set["1", "2", "3"].send(@method).should.is_a?(String)
+    Set[:a, "b", Set[?c]].send(@method).should.is_a?(String)
   end
 
   ruby_version_is "4.0" do
@@ -20,7 +20,7 @@
   end
 
   it "puts spaces between the elements" do
-    Set["1", "2"].send(@method).should include('", "')
+    Set["1", "2"].send(@method).should.include?('", "')
   end
 
   ruby_version_is "4.0" do
@@ -28,8 +28,8 @@
       set1 = Set[]
       set2 = Set[set1]
       set1 << set2
-      set1.send(@method).should be_kind_of(String)
-      set1.send(@method).should include("Set[...]")
+      set1.send(@method).should.is_a?(String)
+      set1.send(@method).should.include?("Set[...]")
     end
   end
 
@@ -38,8 +38,8 @@
       set1 = Set[]
       set2 = Set[set1]
       set1 << set2
-      set1.send(@method).should be_kind_of(String)
-      set1.send(@method).should include("#<Set: {...}>")
+      set1.send(@method).should.is_a?(String)
+      set1.send(@method).should.include?("#<Set: {...}>")
     end
   end
 end
diff --git a/spec/ruby/core/set/shared/intersection.rb b/spec/ruby/core/set/shared/intersection.rb
index 5ae4199c941..978a4924ef8 100644
--- a/spec/ruby/core/set/shared/intersection.rb
+++ b/spec/ruby/core/set/shared/intersection.rb
@@ -9,7 +9,7 @@
   end
 
   it "raises an ArgumentError when passed a non-Enumerable" do
-    -> { @set.send(@method, 1) }.should raise_error(ArgumentError)
-    -> { @set.send(@method, Object.new) }.should raise_error(ArgumentError)
+    -> { @set.send(@method, 1) }.should.raise(ArgumentError)
+    -> { @set.send(@method, Object.new) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/set/shared/select.rb b/spec/ruby/core/set/shared/select.rb
index 467b236ed39..0d4a53fffd1 100644
--- a/spec/ruby/core/set/shared/select.rb
+++ b/spec/ruby/core/set/shared/select.rb
@@ -13,29 +13,29 @@
 
   it "keeps every element from self for which the passed block returns true" do
     @set.send(@method) { |x| x.size != 3 }
-    @set.size.should eql(1)
+    @set.size.should.eql?(1)
 
-    @set.should_not include("one")
-    @set.should_not include("two")
-    @set.should include("three")
+    @set.should_not.include?("one")
+    @set.should_not.include?("two")
+    @set.should.include?("three")
   end
 
   it "returns self when self was modified" do
-    @set.send(@method) { false }.should equal(@set)
+    @set.send(@method) { false }.should.equal?(@set)
   end
 
   it "returns nil when self was not modified" do
-    @set.send(@method) { true }.should be_nil
+    @set.send(@method) { true }.should == nil
   end
 
   it "returns an Enumerator when passed no block" do
     enum = @set.send(@method)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
 
     enum.each { |x| x.size != 3 }
 
-    @set.should_not include("one")
-    @set.should_not include("two")
-    @set.should include("three")
+    @set.should_not.include?("one")
+    @set.should_not.include?("two")
+    @set.should.include?("three")
   end
 end
diff --git a/spec/ruby/core/set/shared/union.rb b/spec/ruby/core/set/shared/union.rb
index 314f0e852db..dddf1716e5e 100644
--- a/spec/ruby/core/set/shared/union.rb
+++ b/spec/ruby/core/set/shared/union.rb
@@ -9,7 +9,7 @@
   end
 
   it "raises an ArgumentError when passed a non-Enumerable" do
-    -> { @set.send(@method, 1) }.should raise_error(ArgumentError)
-    -> { @set.send(@method, Object.new) }.should raise_error(ArgumentError)
+    -> { @set.send(@method, 1) }.should.raise(ArgumentError)
+    -> { @set.send(@method, Object.new) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/set/sortedset/sortedset_spec.rb b/spec/ruby/core/set/sortedset/sortedset_spec.rb
index f3c1ec058d8..c8f65f08516 100644
--- a/spec/ruby/core/set/sortedset/sortedset_spec.rb
+++ b/spec/ruby/core/set/sortedset/sortedset_spec.rb
@@ -5,7 +5,7 @@
     it "raises error including message that it has been extracted from the set stdlib" do
       -> {
         SortedSet
-      }.should raise_error(RuntimeError) { |e|
+      }.should.raise(RuntimeError) { |e|
         e.message.should.include?("The `SortedSet` class has been extracted from the `set` library")
       }
     end
diff --git a/spec/ruby/core/set/subset_spec.rb b/spec/ruby/core/set/subset_spec.rb
index da80d174da4..81869d4993b 100644
--- a/spec/ruby/core/set/subset_spec.rb
+++ b/spec/ruby/core/set/subset_spec.rb
@@ -8,28 +8,28 @@
   end
 
   it "returns true if passed a Set that is equal to self or self is a subset of" do
-    @set.subset?(@set).should be_true
-    Set[].subset?(Set[]).should be_true
+    @set.subset?(@set).should == true
+    Set[].subset?(Set[]).should == true
 
-    Set[].subset?(@set).should be_true
-    Set[].subset?(Set[1, 2, 3]).should be_true
-    Set[].subset?(Set["a", :b, ?c]).should be_true
+    Set[].subset?(@set).should == true
+    Set[].subset?(Set[1, 2, 3]).should == true
+    Set[].subset?(Set["a", :b, ?c]).should == true
 
-    Set[1, 2, 3].subset?(@set).should be_true
-    Set[1, 3].subset?(@set).should be_true
-    Set[1, 2].subset?(@set).should be_true
-    Set[1].subset?(@set).should be_true
+    Set[1, 2, 3].subset?(@set).should == true
+    Set[1, 3].subset?(@set).should == true
+    Set[1, 2].subset?(@set).should == true
+    Set[1].subset?(@set).should == true
 
-    Set[5].subset?(@set).should be_false
-    Set[1, 5].subset?(@set).should be_false
-    Set[nil].subset?(@set).should be_false
-    Set["test"].subset?(@set).should be_false
+    Set[5].subset?(@set).should == false
+    Set[1, 5].subset?(@set).should == false
+    Set[nil].subset?(@set).should == false
+    Set["test"].subset?(@set).should == false
   end
 
   it "raises an ArgumentError when passed a non-Set" do
-    -> { Set[].subset?([]) }.should raise_error(ArgumentError)
-    -> { Set[].subset?(1) }.should raise_error(ArgumentError)
-    -> { Set[].subset?("test") }.should raise_error(ArgumentError)
-    -> { Set[].subset?(Object.new) }.should raise_error(ArgumentError)
+    -> { Set[].subset?([]) }.should.raise(ArgumentError)
+    -> { Set[].subset?(1) }.should.raise(ArgumentError)
+    -> { Set[].subset?("test") }.should.raise(ArgumentError)
+    -> { Set[].subset?(Object.new) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/set/superset_spec.rb b/spec/ruby/core/set/superset_spec.rb
index 9b3df2d047d..7e7db2b1791 100644
--- a/spec/ruby/core/set/superset_spec.rb
+++ b/spec/ruby/core/set/superset_spec.rb
@@ -7,35 +7,35 @@
   end
 
   it "returns true if passed a Set that equals self or self is a proper superset of" do
-    @set.superset?(@set).should be_true
-    Set[].superset?(Set[]).should be_true
+    @set.superset?(@set).should == true
+    Set[].superset?(Set[]).should == true
 
-    @set.superset?(Set[]).should be_true
-    Set[1, 2, 3].superset?(Set[]).should be_true
-    Set["a", :b, ?c].superset?(Set[]).should be_true
+    @set.superset?(Set[]).should == true
+    Set[1, 2, 3].superset?(Set[]).should == true
+    Set["a", :b, ?c].superset?(Set[]).should == true
 
-    @set.superset?(Set[1, 2, 3]).should be_true
-    @set.superset?(Set[1, 3]).should be_true
-    @set.superset?(Set[1, 2]).should be_true
-    @set.superset?(Set[1]).should be_true
+    @set.superset?(Set[1, 2, 3]).should == true
+    @set.superset?(Set[1, 3]).should == true
+    @set.superset?(Set[1, 2]).should == true
+    @set.superset?(Set[1]).should == true
 
-    @set.superset?(Set[5]).should be_false
-    @set.superset?(Set[1, 5]).should be_false
-    @set.superset?(Set[nil]).should be_false
-    @set.superset?(Set["test"]).should be_false
+    @set.superset?(Set[5]).should == false
+    @set.superset?(Set[1, 5]).should == false
+    @set.superset?(Set[nil]).should == false
+    @set.superset?(Set["test"]).should == false
   end
 
   it "raises an ArgumentError when passed a non-Set" do
-    -> { Set[].superset?([]) }.should raise_error(ArgumentError)
-    -> { Set[].superset?(1) }.should raise_error(ArgumentError)
-    -> { Set[].superset?("test") }.should raise_error(ArgumentError)
-    -> { Set[].superset?(Object.new) }.should raise_error(ArgumentError)
+    -> { Set[].superset?([]) }.should.raise(ArgumentError)
+    -> { Set[].superset?(1) }.should.raise(ArgumentError)
+    -> { Set[].superset?("test") }.should.raise(ArgumentError)
+    -> { Set[].superset?(Object.new) }.should.raise(ArgumentError)
   end
 
   ruby_version_is ""..."4.0" do
     context "when comparing to a Set-like object" do
       it "returns true if passed a Set-like object that self is a superset of" do
-        Set[1, 2, 3, 4].superset?(SetSpecs::SetLike.new([1, 2, 3])).should be_true
+        Set[1, 2, 3, 4].superset?(SetSpecs::SetLike.new([1, 2, 3])).should == true
       end
     end
   end
diff --git a/spec/ruby/core/signal/signame_spec.rb b/spec/ruby/core/signal/signame_spec.rb
index adfe895d97f..82f040a6f90 100644
--- a/spec/ruby/core/signal/signame_spec.rb
+++ b/spec/ruby/core/signal/signame_spec.rb
@@ -16,13 +16,13 @@
   end
 
   it "raises a TypeError when the passed argument can't be coerced to Integer" do
-    -> { Signal.signame("hello") }.should raise_error(TypeError)
+    -> { Signal.signame("hello") }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the passed argument responds to #to_int but does not return an Integer" do
     obj = mock('signal')
     obj.should_receive(:to_int).and_return('not an int')
-    -> { Signal.signame(obj) }.should raise_error(TypeError)
+    -> { Signal.signame(obj) }.should.raise(TypeError)
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/core/signal/trap_spec.rb b/spec/ruby/core/signal/trap_spec.rb
index 6d654a99be6..5d3105fee8d 100644
--- a/spec/ruby/core/signal/trap_spec.rb
+++ b/spec/ruby/core/signal/trap_spec.rb
@@ -14,7 +14,7 @@
     end
 
     it "returns the previous handler" do
-      Signal.trap(:HUP, @saved_trap).should equal(@proc)
+      Signal.trap(:HUP, @saved_trap).should.equal?(@proc)
     end
 
     it "accepts a block" do
@@ -97,7 +97,7 @@
       -> {
         Process.kill :HUP, Process.pid
         loop { Thread.pass }
-      }.should raise_error(NoMethodError)
+      }.should.raise(NoMethodError)
     end
 
     it "accepts a non-callable that becomes callable when used" do
@@ -134,7 +134,7 @@
       Process.kill :HUP, Process.pid
       Thread.pass until done
 
-      ScratchPad.recorded.should be_true
+      ScratchPad.recorded.should == true
     end
 
     it "registers an handler doing nothing with :IGNORE" do
@@ -158,7 +158,7 @@
 
     it "ignores the signal when passed nil" do
       Signal.trap :HUP, nil
-      Signal.trap(:HUP, @saved_trap).should be_nil
+      Signal.trap(:HUP, @saved_trap).should == nil
     end
 
     it "accepts :DEFAULT in place of a proc" do
@@ -203,53 +203,53 @@
 
     it "accepts long names as Strings" do
       Signal.trap "SIGHUP", @proc
-      Signal.trap("SIGHUP", @saved_trap).should equal(@proc)
+      Signal.trap("SIGHUP", @saved_trap).should.equal?(@proc)
     end
 
     it "accepts short names as Strings" do
       Signal.trap "HUP", @proc
-      Signal.trap("HUP", @saved_trap).should equal(@proc)
+      Signal.trap("HUP", @saved_trap).should.equal?(@proc)
     end
 
     it "accepts long names as Symbols" do
       Signal.trap :SIGHUP, @proc
-      Signal.trap(:SIGHUP, @saved_trap).should equal(@proc)
+      Signal.trap(:SIGHUP, @saved_trap).should.equal?(@proc)
     end
 
     it "accepts short names as Symbols" do
       Signal.trap :HUP, @proc
-      Signal.trap(:HUP, @saved_trap).should equal(@proc)
+      Signal.trap(:HUP, @saved_trap).should.equal?(@proc)
     end
 
     it "calls #to_str on an object to convert to a String" do
       obj = mock("signal")
       obj.should_receive(:to_str).exactly(2).times.and_return("HUP")
       Signal.trap obj, @proc
-      Signal.trap(obj, @saved_trap).should equal(@proc)
+      Signal.trap(obj, @saved_trap).should.equal?(@proc)
     end
 
     it "accepts Integer values" do
       hup = Signal.list["HUP"]
       Signal.trap hup, @proc
-      Signal.trap(hup, @saved_trap).should equal(@proc)
+      Signal.trap(hup, @saved_trap).should.equal?(@proc)
     end
 
     it "does not call #to_int on an object to convert to an Integer" do
       obj = mock("signal")
       obj.should_not_receive(:to_int)
-      -> { Signal.trap obj, @proc }.should raise_error(ArgumentError, /bad signal type/)
+      -> { Signal.trap obj, @proc }.should.raise(ArgumentError, /bad signal type/)
     end
 
     it "raises ArgumentError when passed unknown signal" do
-      -> { Signal.trap(300) { } }.should raise_error(ArgumentError, "invalid signal number (300)")
-      -> { Signal.trap("USR10") { } }.should raise_error(ArgumentError, /\Aunsupported signal [`']SIGUSR10'\z/)
-      -> { Signal.trap("SIGUSR10") { } }.should raise_error(ArgumentError, /\Aunsupported signal [`']SIGUSR10'\z/)
+      -> { Signal.trap(300) { } }.should.raise(ArgumentError, "invalid signal number (300)")
+      -> { Signal.trap("USR10") { } }.should.raise(ArgumentError, /\Aunsupported signal [`']SIGUSR10'\z/)
+      -> { Signal.trap("SIGUSR10") { } }.should.raise(ArgumentError, /\Aunsupported signal [`']SIGUSR10'\z/)
     end
 
     it "raises ArgumentError when passed signal is not Integer, String or Symbol" do
-      -> { Signal.trap(nil) { } }.should raise_error(ArgumentError, "bad signal type NilClass")
-      -> { Signal.trap(100.0) { } }.should raise_error(ArgumentError, "bad signal type Float")
-      -> { Signal.trap(Rational(100)) { } }.should raise_error(ArgumentError, "bad signal type Rational")
+      -> { Signal.trap(nil) { } }.should.raise(ArgumentError, "bad signal type NilClass")
+      -> { Signal.trap(100.0) { } }.should.raise(ArgumentError, "bad signal type Float")
+      -> { Signal.trap(Rational(100)) { } }.should.raise(ArgumentError, "bad signal type Rational")
     end
 
     # See man 2 signal
@@ -257,8 +257,8 @@
       it "raises ArgumentError or Errno::EINVAL for SIG#{signal}" do
         -> {
           Signal.trap(signal, -> {})
-        }.should raise_error(StandardError) { |e|
-          [ArgumentError, Errno::EINVAL].should include(e.class)
+        }.should.raise(StandardError) { |e|
+          [ArgumentError, Errno::EINVAL].should.include?(e.class)
           e.message.should =~ /Invalid argument|Signal already used by VM or OS/
         }
       end
@@ -268,7 +268,7 @@
       it "raises ArgumentError for SIG#{signal} which is reserved by Ruby" do
         -> {
           Signal.trap(signal, -> {})
-        }.should raise_error(ArgumentError, "can't trap reserved signal: SIG#{signal}")
+        }.should.raise(ArgumentError, "can't trap reserved signal: SIG#{signal}")
       end
     end
 
diff --git a/spec/ruby/core/string/allocate_spec.rb b/spec/ruby/core/string/allocate_spec.rb
index 30d5f605947..00dadaf076d 100644
--- a/spec/ruby/core/string/allocate_spec.rb
+++ b/spec/ruby/core/string/allocate_spec.rb
@@ -3,7 +3,7 @@
 describe "String.allocate" do
   it "returns an instance of String" do
     str = String.allocate
-    str.should be_an_instance_of(String)
+    str.should.instance_of?(String)
   end
 
   it "returns a fully-formed String" do
diff --git a/spec/ruby/core/string/append_as_bytes_spec.rb b/spec/ruby/core/string/append_as_bytes_spec.rb
index def663d5ce2..feead646150 100644
--- a/spec/ruby/core/string/append_as_bytes_spec.rb
+++ b/spec/ruby/core/string/append_as_bytes_spec.rb
@@ -4,7 +4,7 @@
   ruby_version_is "3.4" do
     it "doesn't allow to mutate frozen strings" do
       str = "hello".freeze
-      -> { str.append_as_bytes("\xE2\x82") }.should raise_error(FrozenError)
+      -> { str.append_as_bytes("\xE2\x82") }.should.raise(FrozenError)
     end
 
     it "allows creating broken strings in UTF8" do
@@ -54,7 +54,7 @@
       to_str.should_not_receive(:to_int)
 
       str = +"hello"
-      -> { str.append_as_bytes(to_str) }.should raise_error(TypeError, "wrong argument type MockObject (expected String or Integer)")
+      -> { str.append_as_bytes(to_str) }.should.raise(TypeError, "wrong argument type MockObject (expected String or Integer)")
     end
   end
 end
diff --git a/spec/ruby/core/string/append_spec.rb b/spec/ruby/core/string/append_spec.rb
index 8497ce82622..e0f71b7c978 100644
--- a/spec/ruby/core/string/append_spec.rb
+++ b/spec/ruby/core/string/append_spec.rb
@@ -8,7 +8,7 @@
   it_behaves_like :string_concat_type_coercion, :<<
 
   it "raises an ArgumentError when given the incorrect number of arguments" do
-    -> { "hello".send(:<<) }.should raise_error(ArgumentError)
-    -> { "hello".send(:<<, "one", "two") }.should raise_error(ArgumentError)
+    -> { "hello".send(:<<) }.should.raise(ArgumentError)
+    -> { "hello".send(:<<, "one", "two") }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/ascii_only_spec.rb b/spec/ruby/core/string/ascii_only_spec.rb
index 88a0559cfda..9af663beb8c 100644
--- a/spec/ruby/core/string/ascii_only_spec.rb
+++ b/spec/ruby/core/string/ascii_only_spec.rb
@@ -12,13 +12,13 @@
     end
 
     it "returns true if the encoding is US-ASCII" do
-      "hello".dup.force_encoding(Encoding::US_ASCII).ascii_only?.should be_true
-      "hello".encode(Encoding::US_ASCII).ascii_only?.should be_true
+      "hello".dup.force_encoding(Encoding::US_ASCII).ascii_only?.should == true
+      "hello".encode(Encoding::US_ASCII).ascii_only?.should == true
     end
 
     it "returns true for all single-character UTF-8 Strings" do
       0.upto(127) do |n|
-        n.chr.ascii_only?.should be_true
+        n.chr.ascii_only?.should == true
       end
     end
   end
@@ -27,7 +27,7 @@
     it "returns false if the encoding is BINARY" do
       chr = 128.chr
       chr.encoding.should == Encoding::BINARY
-      chr.ascii_only?.should be_false
+      chr.ascii_only?.should == false
     end
 
     it "returns false if the String contains any non-ASCII characters" do
@@ -46,37 +46,37 @@
   end
 
   it "returns true for the empty String with an ASCII-compatible encoding" do
-    "".ascii_only?.should be_true
-    "".encode('UTF-8').ascii_only?.should be_true
+    "".ascii_only?.should == true
+    "".encode('UTF-8').ascii_only?.should == true
   end
 
   it "returns false for the empty String with a non-ASCII-compatible encoding" do
-    "".dup.force_encoding('UTF-16LE').ascii_only?.should be_false
-    "".encode('UTF-16BE').ascii_only?.should be_false
+    "".dup.force_encoding('UTF-16LE').ascii_only?.should == false
+    "".encode('UTF-16BE').ascii_only?.should == false
   end
 
   it "returns false for a non-empty String with non-ASCII-compatible encoding" do
-    "\x78\x00".dup.force_encoding("UTF-16LE").ascii_only?.should be_false
+    "\x78\x00".dup.force_encoding("UTF-16LE").ascii_only?.should == false
   end
 
   it "returns false when interpolating non ascii strings" do
     base = "EU currency is".dup.force_encoding(Encoding::US_ASCII)
     euro = "\u20AC"
     interp = "#{base} #{euro}"
-    euro.ascii_only?.should be_false
-    base.ascii_only?.should be_true
-    interp.ascii_only?.should be_false
+    euro.ascii_only?.should == false
+    base.ascii_only?.should == true
+    interp.ascii_only?.should == false
   end
 
   it "returns false after appending non ASCII characters to an empty String" do
-    ("".dup << "λ").ascii_only?.should be_false
+    ("".dup << "λ").ascii_only?.should == false
   end
 
   it "returns false when concatenating an ASCII and non-ASCII String" do
-    "".dup.concat("λ").ascii_only?.should be_false
+    "".dup.concat("λ").ascii_only?.should == false
   end
 
   it "returns false when replacing an ASCII String with a non-ASCII String" do
-    "".dup.replace("λ").ascii_only?.should be_false
+    "".dup.replace("λ").ascii_only?.should == false
   end
 end
diff --git a/spec/ruby/core/string/b_spec.rb b/spec/ruby/core/string/b_spec.rb
index 4b1fafff117..d181447709e 100644
--- a/spec/ruby/core/string/b_spec.rb
+++ b/spec/ruby/core/string/b_spec.rb
@@ -10,7 +10,7 @@
 
   it "returns new string without modifying self" do
     str = "こんちには"
-    str.b.should_not equal(str)
+    str.b.should_not.equal?(str)
     str.should == "こんちには"
   end
 end
diff --git a/spec/ruby/core/string/byteindex_spec.rb b/spec/ruby/core/string/byteindex_spec.rb
index d420f3f6830..f4c64087907 100644
--- a/spec/ruby/core/string/byteindex_spec.rb
+++ b/spec/ruby/core/string/byteindex_spec.rb
@@ -149,7 +149,7 @@
     char = "れ".encode Encoding::EUC_JP
     -> do
       "あれ".byteindex(char)
-    end.should raise_error(Encoding::CompatibilityError)
+    end.should.raise(Encoding::CompatibilityError)
   end
 
   it "handles a substring in a superset encoding" do
@@ -255,7 +255,7 @@
   end
 
   it "returns nil if the Regexp matches the empty string and the offset is out of range" do
-    "ruby".byteindex(//, 12).should be_nil
+    "ruby".byteindex(//, 12).should == nil
   end
 
   it "supports \\G which matches at the given start offset" do
diff --git a/spec/ruby/core/string/byterindex_spec.rb b/spec/ruby/core/string/byterindex_spec.rb
index 983222e35de..569820463d2 100644
--- a/spec/ruby/core/string/byterindex_spec.rb
+++ b/spec/ruby/core/string/byterindex_spec.rb
@@ -184,7 +184,7 @@ def obj.method_missing(*args) 5 end
   end
 
   it "raises a TypeError when given offset is nil" do
-    -> { "str".byterindex("st", nil) }.should raise_error(TypeError)
+    -> { "str".byterindex("st", nil) }.should.raise(TypeError)
   end
 
   it "handles a substring in a superset encoding" do
@@ -338,7 +338,7 @@ def obj.method_missing(*args); 5; end
   end
 
   it "raises a TypeError when given offset is nil" do
-    -> { "str".byterindex(/../, nil) }.should raise_error(TypeError)
+    -> { "str".byterindex(/../, nil) }.should.raise(TypeError)
   end
 
   it "returns the reverse byte index of a multibyte character" do
diff --git a/spec/ruby/core/string/bytes_spec.rb b/spec/ruby/core/string/bytes_spec.rb
index 02151eebbcc..e6019fb9872 100644
--- a/spec/ruby/core/string/bytes_spec.rb
+++ b/spec/ruby/core/string/bytes_spec.rb
@@ -9,7 +9,7 @@
   end
 
   it "returns an Array when no block is given" do
-    @utf8.bytes.should be_an_instance_of(Array)
+    @utf8.bytes.should.instance_of?(Array)
   end
 
   it "yields each byte to a block if one is given, returning self" do
@@ -23,8 +23,8 @@
   end
 
   it "returns bytes as Integers" do
-    @ascii.bytes.to_a.each {|b| b.should be_an_instance_of(Integer)}
-    @utf8_ascii.bytes { |b| b.should be_an_instance_of(Integer) }
+    @ascii.bytes.to_a.each {|b| b.should.instance_of?(Integer)}
+    @utf8_ascii.bytes { |b| b.should.instance_of?(Integer) }
   end
 
   it "agrees with #unpack('C*')" do
diff --git a/spec/ruby/core/string/bytesplice_spec.rb b/spec/ruby/core/string/bytesplice_spec.rb
index cfd9e3ea9a7..3e5e6fe1ee9 100644
--- a/spec/ruby/core/string/bytesplice_spec.rb
+++ b/spec/ruby/core/string/bytesplice_spec.rb
@@ -4,15 +4,15 @@
 
 describe "String#bytesplice" do
   it "raises IndexError when index is less than -bytesize" do
-    -> { "hello".bytesplice(-6, 0, "xxx") }.should raise_error(IndexError, "index -6 out of string")
+    -> { "hello".bytesplice(-6, 0, "xxx") }.should.raise(IndexError, "index -6 out of string")
   end
 
   it "raises IndexError when index is greater than bytesize" do
-    -> { "hello".bytesplice(6, 0, "xxx") }.should raise_error(IndexError, "index 6 out of string")
+    -> { "hello".bytesplice(6, 0, "xxx") }.should.raise(IndexError, "index 6 out of string")
   end
 
   it "raises IndexError for negative length" do
-    -> { "abc".bytesplice(0, -2, "") }.should raise_error(IndexError, "negative length -2")
+    -> { "abc".bytesplice(0, -2, "") }.should.raise(IndexError, "negative length -2")
   end
 
   it "replaces with integer indices" do
@@ -24,7 +24,7 @@
   end
 
   it "raises RangeError when range left boundary is less than -bytesize" do
-    -> { "hello".bytesplice(-6...-6, "xxx") }.should raise_error(RangeError, "-6...-6 out of range")
+    -> { "hello".bytesplice(-6...-6, "xxx") }.should.raise(RangeError, "-6...-6 out of range")
   end
 
   it "replaces with ranges" do
@@ -39,7 +39,7 @@
   end
 
   it "raises TypeError when integer index is provided without length argument" do
-    -> { "hello".bytesplice(0, "xxx") }.should raise_error(TypeError, "wrong argument type Integer (expected Range)")
+    -> { "hello".bytesplice(0, "xxx") }.should.raise(TypeError, "wrong argument type Integer (expected Range)")
   end
 
   it "replaces on an empty string" do
@@ -54,19 +54,19 @@
 
   it "raises when string is frozen" do
     s = "hello".freeze
-    -> { s.bytesplice(2, 1, "xxx") }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
+    -> { s.bytesplice(2, 1, "xxx") }.should.raise(FrozenError, "can't modify frozen String: \"hello\"")
   end
 
   it "raises IndexError when str_index is less than -bytesize" do
-    -> { "hello".bytesplice(2, 1, "HELLO", -6, 0) }.should raise_error(IndexError, "index -6 out of string")
+    -> { "hello".bytesplice(2, 1, "HELLO", -6, 0) }.should.raise(IndexError, "index -6 out of string")
   end
 
   it "raises IndexError when str_index is greater than bytesize" do
-    -> { "hello".bytesplice(2, 1, "HELLO", 6, 0) }.should raise_error(IndexError, "index 6 out of string")
+    -> { "hello".bytesplice(2, 1, "HELLO", 6, 0) }.should.raise(IndexError, "index 6 out of string")
   end
 
   it "raises IndexError for negative str length" do
-    -> { "abc".bytesplice(0, 1, "", 0, -2) }.should raise_error(IndexError, "negative length -2")
+    -> { "abc".bytesplice(0, 1, "", 0, -2) }.should.raise(IndexError, "negative length -2")
   end
 
   it "replaces with integer str indices" do
@@ -78,7 +78,7 @@
   end
 
   it "raises RangeError when str range left boundary is less than -bytesize" do
-    -> { "hello".bytesplice(0..1, "HELLO", -6...-6) }.should raise_error(RangeError, "-6...-6 out of range")
+    -> { "hello".bytesplice(0..1, "HELLO", -6...-6) }.should.raise(RangeError, "-6...-6 out of range")
   end
 
   it "replaces with str ranges" do
@@ -93,7 +93,7 @@
   end
 
   it "raises ArgumentError when integer str index is provided without str length argument" do
-    -> { "hello".bytesplice(0, 1, "xxx", 0) }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 2, 3, or 5)")
+    -> { "hello".bytesplice(0, 1, "xxx", 0) }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 2, 3, or 5)")
   end
 
   it "replaces on an empty string with str index/length" do
@@ -109,7 +109,7 @@
 
   it "raises when string is frozen and str index/length" do
     s = "hello".freeze
-    -> { s.bytesplice(2, 1, "xxx", 0, 1) }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
+    -> { s.bytesplice(2, 1, "xxx", 0, 1) }.should.raise(FrozenError, "can't modify frozen String: \"hello\"")
   end
 
   it "replaces on an empty string with str range" do
@@ -125,22 +125,22 @@
 
   it "raises when string is frozen and str range" do
     s = "hello".freeze
-    -> { s.bytesplice(2..2, "yzx", 0..1) }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
+    -> { s.bytesplice(2..2, "yzx", 0..1) }.should.raise(FrozenError, "can't modify frozen String: \"hello\"")
   end
 end
 
 describe "String#bytesplice with multibyte characters" do
   it "raises IndexError when index is out of byte size boundary" do
-    -> { "こんにちは".bytesplice(-16, 0, "xxx") }.should raise_error(IndexError, "index -16 out of string")
+    -> { "こんにちは".bytesplice(-16, 0, "xxx") }.should.raise(IndexError, "index -16 out of string")
   end
 
   it "raises IndexError when index is not on a codepoint boundary" do
-    -> { "こんにちは".bytesplice(1, 0, "xxx") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(1, 0, "xxx") }.should.raise(IndexError, "offset 1 does not land on character boundary")
   end
 
   it "raises IndexError when length is not matching the codepoint boundary" do
-    -> { "こんにちは".bytesplice(0, 1, "xxx") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-    -> { "こんにちは".bytesplice(0, 2, "xxx") }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+    -> { "こんにちは".bytesplice(0, 1, "xxx") }.should.raise(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(0, 2, "xxx") }.should.raise(IndexError, "offset 2 does not land on character boundary")
   end
 
   it "replaces with integer indices" do
@@ -169,14 +169,14 @@
   end
 
   it "raises when ranges not match codepoint boundaries" do
-    -> { "こんにちは".bytesplice(0..0, "x") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-    -> { "こんにちは".bytesplice(0..1, "x") }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+    -> { "こんにちは".bytesplice(0..0, "x") }.should.raise(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(0..1, "x") }.should.raise(IndexError, "offset 2 does not land on character boundary")
     # Begin is incorrect
-    -> { "こんにちは".bytesplice(-4..-1, "x") }.should raise_error(IndexError, "offset 11 does not land on character boundary")
-    -> { "こんにちは".bytesplice(-5..-1, "x") }.should raise_error(IndexError, "offset 10 does not land on character boundary")
+    -> { "こんにちは".bytesplice(-4..-1, "x") }.should.raise(IndexError, "offset 11 does not land on character boundary")
+    -> { "こんにちは".bytesplice(-5..-1, "x") }.should.raise(IndexError, "offset 10 does not land on character boundary")
     # End is incorrect
-    -> { "こんにちは".bytesplice(-3..-2, "x") }.should raise_error(IndexError, "offset 14 does not land on character boundary")
-    -> { "こんにちは".bytesplice(-3..-3, "x") }.should raise_error(IndexError, "offset 13 does not land on character boundary")
+    -> { "こんにちは".bytesplice(-3..-2, "x") }.should.raise(IndexError, "offset 14 does not land on character boundary")
+    -> { "こんにちは".bytesplice(-3..-3, "x") }.should.raise(IndexError, "offset 13 does not land on character boundary")
   end
 
   it "deals with a different encoded argument" do
@@ -200,16 +200,16 @@
   end
 
   it "raises IndexError when str_index is out of byte size boundary" do
-    -> { "こんにちは".bytesplice(3, 3, "こんにちは", -16, 0) }.should raise_error(IndexError, "index -16 out of string")
+    -> { "こんにちは".bytesplice(3, 3, "こんにちは", -16, 0) }.should.raise(IndexError, "index -16 out of string")
   end
 
   it "raises IndexError when str_index is not on a codepoint boundary" do
-    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 1, 0) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 1, 0) }.should.raise(IndexError, "offset 1 does not land on character boundary")
   end
 
   it "raises IndexError when str_length is not matching the codepoint boundary" do
-    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 1) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 2) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 1) }.should.raise(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 2) }.should.raise(IndexError, "offset 2 does not land on character boundary")
   end
 
   it "replaces with integer str indices" do
@@ -238,14 +238,14 @@
   end
 
   it "raises when ranges not match codepoint boundaries in str" do
-    -> { "こんにちは".bytesplice(3...3, "こ", 0..0) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-    -> { "こんにちは".bytesplice(3...3, "こ", 0..1) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こ", 0..0) }.should.raise(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こ", 0..1) }.should.raise(IndexError, "offset 2 does not land on character boundary")
     # Begin is incorrect
-    -> { "こんにちは".bytesplice(3...3, "こんにちは", -4..-1) }.should raise_error(IndexError, "offset 11 does not land on character boundary")
-    -> { "こんにちは".bytesplice(3...3, "こんにちは", -5..-1) }.should raise_error(IndexError, "offset 10 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こんにちは", -4..-1) }.should.raise(IndexError, "offset 11 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こんにちは", -5..-1) }.should.raise(IndexError, "offset 10 does not land on character boundary")
     # End is incorrect
-    -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-2) }.should raise_error(IndexError, "offset 14 does not land on character boundary")
-    -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-3) }.should raise_error(IndexError, "offset 13 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-2) }.should.raise(IndexError, "offset 14 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-3) }.should.raise(IndexError, "offset 13 does not land on character boundary")
   end
 
   it "deals with a different encoded argument with str index/length" do
diff --git a/spec/ruby/core/string/capitalize_spec.rb b/spec/ruby/core/string/capitalize_spec.rb
index 5e59b656c52..12b1675c2e0 100644
--- a/spec/ruby/core/string/capitalize_spec.rb
+++ b/spec/ruby/core/string/capitalize_spec.rb
@@ -28,7 +28,7 @@
       capitalized.should == "Sset"
       capitalized.size.should == 4
       capitalized.bytesize.should == 4
-      capitalized.ascii_only?.should be_true
+      capitalized.ascii_only?.should == true
     end
   end
 
@@ -52,7 +52,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { "iSa".capitalize(:turkic, :ascii) }.should raise_error(ArgumentError)
+      -> { "iSa".capitalize(:turkic, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -66,21 +66,21 @@
     end
 
     it "does not allow any other additional option" do
-      -> { "iß".capitalize(:lithuanian, :ascii) }.should raise_error(ArgumentError)
+      -> { "iß".capitalize(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
   it "does not allow the :fold option for upcasing" do
-    -> { "abc".capitalize(:fold) }.should raise_error(ArgumentError)
+    -> { "abc".capitalize(:fold) }.should.raise(ArgumentError)
   end
 
   it "does not allow invalid options" do
-    -> { "abc".capitalize(:invalid_option) }.should raise_error(ArgumentError)
+    -> { "abc".capitalize(:invalid_option) }.should.raise(ArgumentError)
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("hello").capitalize.should be_an_instance_of(String)
-    StringSpecs::MyString.new("Hello").capitalize.should be_an_instance_of(String)
+    StringSpecs::MyString.new("hello").capitalize.should.instance_of?(String)
+    StringSpecs::MyString.new("Hello").capitalize.should.instance_of?(String)
   end
 
   it "returns a String in the same encoding as self" do
@@ -91,7 +91,7 @@
 describe "String#capitalize!" do
   it "capitalizes self in place" do
     a = +"hello"
-    a.capitalize!.should equal(a)
+    a.capitalize!.should.equal?(a)
     a.should == "Hello"
   end
 
@@ -127,7 +127,7 @@
       capitalized.should == "Sset"
       capitalized.size.should == 4
       capitalized.bytesize.should == 4
-      capitalized.ascii_only?.should be_true
+      capitalized.ascii_only?.should == true
     end
   end
 
@@ -159,7 +159,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { a = "iSa"; a.capitalize!(:turkic, :ascii) }.should raise_error(ArgumentError)
+      -> { a = "iSa"; a.capitalize!(:turkic, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -177,16 +177,16 @@
     end
 
     it "does not allow any other additional option" do
-      -> { a = "iß"; a.capitalize!(:lithuanian, :ascii) }.should raise_error(ArgumentError)
+      -> { a = "iß"; a.capitalize!(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
   it "does not allow the :fold option for upcasing" do
-    -> { a = "abc"; a.capitalize!(:fold) }.should raise_error(ArgumentError)
+    -> { a = "abc"; a.capitalize!(:fold) }.should.raise(ArgumentError)
   end
 
   it "does not allow invalid options" do
-    -> { a = "abc"; a.capitalize!(:invalid_option) }.should raise_error(ArgumentError)
+    -> { a = "abc"; a.capitalize!(:invalid_option) }.should.raise(ArgumentError)
   end
 
   it "returns nil when no changes are made" do
@@ -201,7 +201,7 @@
   it "raises a FrozenError when self is frozen" do
     ["", "Hello", "hello"].each do |a|
       a.freeze
-      -> { a.capitalize! }.should raise_error(FrozenError)
+      -> { a.capitalize! }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/string/casecmp_spec.rb b/spec/ruby/core/string/casecmp_spec.rb
index 81ebea557c7..90577aaac06 100644
--- a/spec/ruby/core/string/casecmp_spec.rb
+++ b/spec/ruby/core/string/casecmp_spec.rb
@@ -26,11 +26,11 @@
   end
 
   it "returns nil if other can't be converted to a string" do
-    "abc".casecmp(mock('abc')).should be_nil
+    "abc".casecmp(mock('abc')).should == nil
   end
 
   it "returns nil if incompatible encodings" do
-    "あれ".casecmp("れ".encode(Encoding::EUC_JP)).should be_nil
+    "あれ".casecmp("れ".encode(Encoding::EUC_JP)).should == nil
   end
 
   describe "in UTF-8 mode" do
@@ -143,7 +143,7 @@
   end
 
   it "returns nil if incompatible encodings" do
-    "あれ".casecmp?("れ".encode(Encoding::EUC_JP)).should be_nil
+    "あれ".casecmp?("れ".encode(Encoding::EUC_JP)).should == nil
   end
 
   describe 'for UNICODE characters' do
@@ -190,11 +190,11 @@
   end
 
   it "case folds" do
-    "ß".casecmp?("ss").should be_true
+    "ß".casecmp?("ss").should == true
   end
 
   it "returns nil if other can't be converted to a string" do
-    "abc".casecmp?(mock('abc')).should be_nil
+    "abc".casecmp?(mock('abc')).should == nil
   end
 
   it "returns true for empty strings in different encodings" do
diff --git a/spec/ruby/core/string/center_spec.rb b/spec/ruby/core/string/center_spec.rb
index 1667b59327d..ac5b8a2ff3c 100644
--- a/spec/ruby/core/string/center_spec.rb
+++ b/spec/ruby/core/string/center_spec.rb
@@ -57,10 +57,10 @@
   end
 
   it "raises a TypeError when length can't be converted to an integer" do
-    -> { "hello".center("x")       }.should raise_error(TypeError)
-    -> { "hello".center("x", "y")  }.should raise_error(TypeError)
-    -> { "hello".center([])        }.should raise_error(TypeError)
-    -> { "hello".center(mock('x')) }.should raise_error(TypeError)
+    -> { "hello".center("x")       }.should.raise(TypeError)
+    -> { "hello".center("x", "y")  }.should.raise(TypeError)
+    -> { "hello".center([])        }.should.raise(TypeError)
+    -> { "hello".center(mock('x')) }.should.raise(TypeError)
   end
 
   it "calls #to_str to convert padstr to a String" do
@@ -71,23 +71,23 @@
   end
 
   it "raises a TypeError when padstr can't be converted to a string" do
-    -> { "hello".center(20, 100)       }.should raise_error(TypeError)
-    -> { "hello".center(20, [])      }.should raise_error(TypeError)
-    -> { "hello".center(20, mock('x')) }.should raise_error(TypeError)
+    -> { "hello".center(20, 100)       }.should.raise(TypeError)
+    -> { "hello".center(20, [])      }.should.raise(TypeError)
+    -> { "hello".center(20, mock('x')) }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError if padstr is empty" do
-    -> { "hello".center(10, "") }.should raise_error(ArgumentError)
-    -> { "hello".center(0, "")  }.should raise_error(ArgumentError)
+    -> { "hello".center(10, "") }.should.raise(ArgumentError)
+    -> { "hello".center(0, "")  }.should.raise(ArgumentError)
   end
 
   it "returns String instances when called on subclasses" do
-    StringSpecs::MyString.new("").center(10).should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").center(10).should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").center(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
+    StringSpecs::MyString.new("").center(10).should.instance_of?(String)
+    StringSpecs::MyString.new("foo").center(10).should.instance_of?(String)
+    StringSpecs::MyString.new("foo").center(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
 
-    "".center(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
-    "foo".center(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
+    "".center(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
+    "foo".center(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
   end
 
   describe "with width" do
@@ -95,7 +95,7 @@
       str = "abc".dup.force_encoding Encoding::IBM437
       result = str.center 6
       result.should == " abc  "
-      result.encoding.should equal(Encoding::IBM437)
+      result.encoding.should.equal?(Encoding::IBM437)
     end
   end
 
@@ -104,14 +104,14 @@
       str = "abc".dup.force_encoding Encoding::IBM437
       result = str.center 6, "あ"
       result.should == "あabcああ"
-      result.encoding.should equal(Encoding::UTF_8)
+      result.encoding.should.equal?(Encoding::UTF_8)
     end
 
     it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
       pat = "ア".encode Encoding::EUC_JP
       -> do
         "あれ".center 5, pat
-      end.should raise_error(Encoding::CompatibilityError)
+      end.should.raise(Encoding::CompatibilityError)
     end
   end
 end
diff --git a/spec/ruby/core/string/chilled_string_spec.rb b/spec/ruby/core/string/chilled_string_spec.rb
index 73d055cbdf2..6a5e846db26 100644
--- a/spec/ruby/core/string/chilled_string_spec.rb
+++ b/spec/ruby/core/string/chilled_string_spec.rb
@@ -73,7 +73,7 @@
           -> {
             -> {
               input << "mutated"
-            }.should raise_error(FrozenError)
+            }.should.raise(FrozenError)
           }.should_not complain(/literal string will be frozen in the future/)
         end
       end
@@ -142,7 +142,7 @@
           -> {
             -> {
               input << "mutated"
-            }.should raise_error(FrozenError)
+            }.should.raise(FrozenError)
           }.should_not complain(/string returned by :chilled\.to_s will be frozen in the future/)
         end
       end
diff --git a/spec/ruby/core/string/chomp_spec.rb b/spec/ruby/core/string/chomp_spec.rb
index d27c84c6f6a..3a8550892f5 100644
--- a/spec/ruby/core/string/chomp_spec.rb
+++ b/spec/ruby/core/string/chomp_spec.rb
@@ -22,7 +22,7 @@
 
     it "returns a copy of the String when it is not modified" do
       str = "abc"
-      str.chomp.should_not equal(str)
+      str.chomp.should_not.equal?(str)
     end
 
     it "removes one trailing newline" do
@@ -47,7 +47,7 @@
 
     it "returns String instances when called on a subclass" do
       str = StringSpecs::MyString.new("hello\n").chomp
-      str.should be_an_instance_of(String)
+      str.should.instance_of?(String)
     end
 
     it "removes trailing characters that match $/ when it has been assigned a value" do
@@ -67,7 +67,7 @@
 
     it "returns a copy of the String" do
       str = "abc"
-      str.chomp(nil).should_not equal(str)
+      str.chomp(nil).should_not.equal?(str)
     end
 
     it "returns an empty String when self is empty" do
@@ -133,7 +133,7 @@
     it "raises a TypeError if #to_str does not return a String" do
       arg = mock("string chomp")
       arg.should_receive(:to_str).and_return(1)
-      -> { "abc".chomp(arg) }.should raise_error(TypeError)
+      -> { "abc".chomp(arg) }.should.raise(TypeError)
     end
   end
 
@@ -171,11 +171,11 @@
 
     it "modifies self" do
       str = "abc\n"
-      str.chomp!.should equal(str)
+      str.chomp!.should.equal?(str)
     end
 
     it "returns nil if self is not modified" do
-      "abc".chomp!.should be_nil
+      "abc".chomp!.should == nil
     end
 
     it "removes one trailing newline" do
@@ -191,12 +191,12 @@
     end
 
     it "returns nil when self is empty" do
-      "".chomp!.should be_nil
+      "".chomp!.should == nil
     end
 
     it "returns subclass instances when called on a subclass" do
       str = StringSpecs::MyString.new("hello\n").chomp!
-      str.should be_an_instance_of(StringSpecs::MyString)
+      str.should.instance_of?(StringSpecs::MyString)
     end
 
     it "removes trailing characters that match $/ when it has been assigned a value" do
@@ -207,11 +207,11 @@
 
   describe "when passed nil" do
     it "returns nil" do
-      "abc\r\n".chomp!(nil).should be_nil
+      "abc\r\n".chomp!(nil).should == nil
     end
 
     it "returns nil when self is empty" do
-      "".chomp!(nil).should be_nil
+      "".chomp!(nil).should == nil
     end
   end
 
@@ -225,7 +225,7 @@
     end
 
     it "does not remove a final carriage return" do
-      "abc\r".chomp!("").should be_nil
+      "abc\r".chomp!("").should == nil
     end
 
     it "removes more than one trailing newlines" do
@@ -237,7 +237,7 @@
     end
 
     it "returns nil when self is empty" do
-      "".chomp!("").should be_nil
+      "".chomp!("").should == nil
     end
   end
 
@@ -255,7 +255,7 @@
     end
 
     it "returns nil when self is empty" do
-      "".chomp!("\n").should be_nil
+      "".chomp!("\n").should == nil
     end
   end
 
@@ -269,7 +269,7 @@
     it "raises a TypeError if #to_str does not return a String" do
       arg = mock("string chomp")
       arg.should_receive(:to_str).and_return(1)
-      -> { "abc".chomp!(arg) }.should raise_error(TypeError)
+      -> { "abc".chomp!(arg) }.should.raise(TypeError)
     end
   end
 
@@ -279,11 +279,11 @@
     end
 
     it "returns nil if the argument does not match the trailing characters" do
-      "abc".chomp!("def").should be_nil
+      "abc".chomp!("def").should == nil
     end
 
     it "returns nil when self is empty" do
-      "".chomp!("abc").should be_nil
+      "".chomp!("abc").should == nil
     end
   end
 
@@ -291,15 +291,15 @@
     a = "string\n\r"
     a.freeze
 
-    -> { a.chomp! }.should raise_error(FrozenError)
+    -> { a.chomp! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError on a frozen instance when it would not be modified" do
     a = "string\n\r"
     a.freeze
-    -> { a.chomp!(nil) }.should raise_error(FrozenError)
-    -> { a.chomp!("x") }.should raise_error(FrozenError)
+    -> { a.chomp!(nil) }.should.raise(FrozenError)
+    -> { a.chomp!("x") }.should.raise(FrozenError)
   end
 end
 
@@ -346,7 +346,7 @@
   end
 
   it "returns nil when the String is not modified" do
-    "あれ".chomp!.should be_nil
+    "あれ".chomp!.should == nil
   end
 
   it "removes the final carriage return, newline from a multibyte String" do
diff --git a/spec/ruby/core/string/chop_spec.rb b/spec/ruby/core/string/chop_spec.rb
index 99c2c821909..2113da543b1 100644
--- a/spec/ruby/core/string/chop_spec.rb
+++ b/spec/ruby/core/string/chop_spec.rb
@@ -47,11 +47,11 @@
 
   it "returns a new string when applied to an empty string" do
     s = ""
-    s.chop.should_not equal(s)
+    s.chop.should_not.equal?(s)
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("hello\n").chop.should be_an_instance_of(String)
+    StringSpecs::MyString.new("hello\n").chop.should.instance_of?(String)
   end
 
   it "returns a String in the same encoding as self" do
@@ -99,21 +99,21 @@
 
   it "returns self if modifications were made" do
     str = "hello"
-    str.chop!.should equal(str)
+    str.chop!.should.equal?(str)
   end
 
   it "returns nil when called on an empty string" do
-    "".chop!.should be_nil
+    "".chop!.should == nil
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "string\n\r".freeze.chop! }.should raise_error(FrozenError)
+    -> { "string\n\r".freeze.chop! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError on a frozen instance that would not be modified" do
     a = ""
     a.freeze
-    -> { a.chop! }.should raise_error(FrozenError)
+    -> { a.chop! }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/chr_spec.rb b/spec/ruby/core/string/chr_spec.rb
index 9ed29542e6a..26c7d51202b 100644
--- a/spec/ruby/core/string/chr_spec.rb
+++ b/spec/ruby/core/string/chr_spec.rb
@@ -3,11 +3,11 @@
 describe "String#chr" do
   it "returns a copy of self" do
     s = 'e'
-    s.should_not equal s.chr
+    s.should_not.equal? s.chr
   end
 
   it "returns a String" do
-    'glark'.chr.should be_an_instance_of(String)
+    'glark'.chr.should.instance_of?(String)
   end
 
   it "returns an empty String if self is an empty String" do
diff --git a/spec/ruby/core/string/clear_spec.rb b/spec/ruby/core/string/clear_spec.rb
index 152986fd0fe..d4688d36892 100644
--- a/spec/ruby/core/string/clear_spec.rb
+++ b/spec/ruby/core/string/clear_spec.rb
@@ -14,7 +14,7 @@
   it "returns self after emptying it" do
     cleared = @s.clear
     cleared.should == ""
-    cleared.should equal @s
+    cleared.should.equal? @s
   end
 
   it "preserves its encoding" do
@@ -32,7 +32,7 @@
 
   it "raises a FrozenError if self is frozen" do
     @s.freeze
-    -> { @s.clear        }.should raise_error(FrozenError)
-    -> { "".freeze.clear }.should raise_error(FrozenError)
+    -> { @s.clear        }.should.raise(FrozenError)
+    -> { "".freeze.clear }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/clone_spec.rb b/spec/ruby/core/string/clone_spec.rb
index a2ba2f98776..2cb289d2c1f 100644
--- a/spec/ruby/core/string/clone_spec.rb
+++ b/spec/ruby/core/string/clone_spec.rb
@@ -43,8 +43,8 @@ class << @obj
   end
 
   it "copies frozen state" do
-    @obj.freeze.clone.frozen?.should be_true
-    "".freeze.clone.frozen?.should be_true
+    @obj.freeze.clone.frozen?.should == true
+    "".freeze.clone.frozen?.should == true
   end
 
   it "does not modify the original string when changing cloned string" do
diff --git a/spec/ruby/core/string/codepoints_spec.rb b/spec/ruby/core/string/codepoints_spec.rb
index 12a5bf5892b..51bd57d127b 100644
--- a/spec/ruby/core/string/codepoints_spec.rb
+++ b/spec/ruby/core/string/codepoints_spec.rb
@@ -12,7 +12,7 @@
 
   it "raises an ArgumentError when no block is given if self has an invalid encoding" do
     s = "\xDF".dup.force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.codepoints }.should raise_error(ArgumentError)
+    s.valid_encoding?.should == false
+    -> { s.codepoints }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/comparison_spec.rb b/spec/ruby/core/string/comparison_spec.rb
index 9db0cff5ee2..0737c131bbe 100644
--- a/spec/ruby/core/string/comparison_spec.rb
+++ b/spec/ruby/core/string/comparison_spec.rb
@@ -85,7 +85,7 @@
 # just using it as an indicator.
 describe "String#<=>" do
   it "returns nil if its argument provides neither #to_str nor #<=>" do
-    ("abc" <=> mock('x')).should be_nil
+    ("abc" <=> mock('x')).should == nil
   end
 
   it "uses the result of calling #to_str for comparison when #to_str is defined" do
@@ -107,6 +107,6 @@
     def obj.<=>(other); other <=> self; end
     obj.should_receive(:<=>).once
 
-    ("abc" <=> obj).should be_nil
+    ("abc" <=> obj).should == nil
   end
 end
diff --git a/spec/ruby/core/string/concat_spec.rb b/spec/ruby/core/string/concat_spec.rb
index cbd7df54e2b..0194a357a0d 100644
--- a/spec/ruby/core/string/concat_spec.rb
+++ b/spec/ruby/core/string/concat_spec.rb
@@ -21,7 +21,7 @@
 
   it "returns self when given no arguments" do
     str = +"hello"
-    str.concat.should equal(str)
+    str.concat.should.equal?(str)
     str.should == "hello"
   end
 end
diff --git a/spec/ruby/core/string/count_spec.rb b/spec/ruby/core/string/count_spec.rb
index e614e901ddb..fd127c6ff21 100644
--- a/spec/ruby/core/string/count_spec.rb
+++ b/spec/ruby/core/string/count_spec.rb
@@ -23,7 +23,7 @@
   end
 
   it "raises an ArgumentError when given no arguments" do
-    -> { "hell yeah".count }.should raise_error(ArgumentError)
+    -> { "hell yeah".count }.should.raise(ArgumentError)
   end
 
   it "negates sets starting with ^" do
@@ -76,8 +76,8 @@
   it "raises if the given sequences are invalid" do
     s = "hel-[()]-lo012^"
 
-    -> { s.count("h-e") }.should raise_error(ArgumentError)
-    -> { s.count("^h-e") }.should raise_error(ArgumentError)
+    -> { s.count("h-e") }.should.raise(ArgumentError)
+    -> { s.count("^h-e") }.should.raise(ArgumentError)
   end
 
   it 'returns the number of occurrences of a multi-byte character' do
@@ -98,8 +98,8 @@
   end
 
   it "raises a TypeError when a set arg can't be converted to a string" do
-    -> { "hello world".count(100)       }.should raise_error(TypeError)
-    -> { "hello world".count([])        }.should raise_error(TypeError)
-    -> { "hello world".count(mock('x')) }.should raise_error(TypeError)
+    -> { "hello world".count(100)       }.should.raise(TypeError)
+    -> { "hello world".count([])        }.should.raise(TypeError)
+    -> { "hello world".count(mock('x')) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/string/crypt_spec.rb b/spec/ruby/core/string/crypt_spec.rb
index 06f84c70a46..924b4d48cfc 100644
--- a/spec/ruby/core/string/crypt_spec.rb
+++ b/spec/ruby/core/string/crypt_spec.rb
@@ -15,7 +15,7 @@
     end
 
     it "raises Errno::EINVAL when the salt is shorter than 29 characters" do
-      -> { "mypassword".crypt("$2a$04$0WVaz0pV3jzfZ5G5tpmHW") }.should raise_error(Errno::EINVAL)
+      -> { "mypassword".crypt("$2a$04$0WVaz0pV3jzfZ5G5tpmHW") }.should.raise(Errno::EINVAL)
     end
 
     it "calls #to_str to converts the salt arg to a String" do
@@ -26,9 +26,9 @@
     end
 
     it "doesn't return subclass instances" do
-      StringSpecs::MyString.new("mypassword").crypt("$2a$04$0WVaz0pV3jzfZ5G5tpmHWu").should be_an_instance_of(String)
-      "mypassword".crypt(StringSpecs::MyString.new("$2a$04$0WVaz0pV3jzfZ5G5tpmHWu")).should be_an_instance_of(String)
-      StringSpecs::MyString.new("mypassword").crypt(StringSpecs::MyString.new("$2a$04$0WVaz0pV3jzfZ5G5tpmHWu")).should be_an_instance_of(String)
+      StringSpecs::MyString.new("mypassword").crypt("$2a$04$0WVaz0pV3jzfZ5G5tpmHWu").should.instance_of?(String)
+      "mypassword".crypt(StringSpecs::MyString.new("$2a$04$0WVaz0pV3jzfZ5G5tpmHWu")).should.instance_of?(String)
+      StringSpecs::MyString.new("mypassword").crypt(StringSpecs::MyString.new("$2a$04$0WVaz0pV3jzfZ5G5tpmHWu")).should.instance_of?(String)
     end
   end
 
@@ -60,7 +60,7 @@
     end
 
     it "raises an ArgumentError when the string contains NUL character" do
-      -> { "poison\0null".crypt("aa") }.should raise_error(ArgumentError)
+      -> { "poison\0null".crypt("aa") }.should.raise(ArgumentError)
     end
 
     it "calls #to_str to converts the salt arg to a String" do
@@ -71,22 +71,22 @@
     end
 
     it "doesn't return subclass instances" do
-      StringSpecs::MyString.new("hello").crypt("aa").should be_an_instance_of(String)
-      "hello".crypt(StringSpecs::MyString.new("aa")).should be_an_instance_of(String)
-      StringSpecs::MyString.new("hello").crypt(StringSpecs::MyString.new("aa")).should be_an_instance_of(String)
+      StringSpecs::MyString.new("hello").crypt("aa").should.instance_of?(String)
+      "hello".crypt(StringSpecs::MyString.new("aa")).should.instance_of?(String)
+      StringSpecs::MyString.new("hello").crypt(StringSpecs::MyString.new("aa")).should.instance_of?(String)
     end
 
     it "raises an ArgumentError when the salt is shorter than two characters" do
-      -> { "hello".crypt("")  }.should raise_error(ArgumentError)
-      -> { "hello".crypt("f") }.should raise_error(ArgumentError)
-      -> { "hello".crypt("\x00\x00") }.should raise_error(ArgumentError)
-      -> { "hello".crypt("\x00a") }.should raise_error(ArgumentError)
-      -> { "hello".crypt("a\x00") }.should raise_error(ArgumentError)
+      -> { "hello".crypt("")  }.should.raise(ArgumentError)
+      -> { "hello".crypt("f") }.should.raise(ArgumentError)
+      -> { "hello".crypt("\x00\x00") }.should.raise(ArgumentError)
+      -> { "hello".crypt("\x00a") }.should.raise(ArgumentError)
+      -> { "hello".crypt("a\x00") }.should.raise(ArgumentError)
     end
   end
 
   it "raises a type error when the salt arg can't be converted to a string" do
-    -> { "".crypt(5)         }.should raise_error(TypeError)
-    -> { "".crypt(mock('x')) }.should raise_error(TypeError)
+    -> { "".crypt(5)         }.should.raise(TypeError)
+    -> { "".crypt(mock('x')) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/string/delete_prefix_spec.rb b/spec/ruby/core/string/delete_prefix_spec.rb
index ee7f0449057..fc69adcbadf 100644
--- a/spec/ruby/core/string/delete_prefix_spec.rb
+++ b/spec/ruby/core/string/delete_prefix_spec.rb
@@ -12,13 +12,13 @@
   it "returns a copy of the string, when the prefix isn't found" do
     s = 'hello'
     r = s.delete_prefix('hello!')
-    r.should_not equal s
+    r.should_not.equal? s
     r.should == s
     r = s.delete_prefix('ell')
-    r.should_not equal s
+    r.should_not.equal? s
     r.should == s
     r = s.delete_prefix('')
-    r.should_not equal s
+    r.should_not.equal? s
     r.should == s
   end
 
@@ -41,7 +41,7 @@
 
   it "returns a String instance when called on a subclass instance" do
     s = StringSpecs::MyString.new('hello')
-    s.delete_prefix('hell').should be_an_instance_of(String)
+    s.delete_prefix('hell').should.instance_of?(String)
   end
 
   it "returns a String in the same encoding as self" do
@@ -52,7 +52,7 @@
 describe "String#delete_prefix!" do
   it "removes the found prefix" do
     s = 'hello'
-    s.delete_prefix!('hell').should equal(s)
+    s.delete_prefix!('hell').should.equal?(s)
     s.should == 'o'
   end
 
@@ -76,8 +76,8 @@
   end
 
   it "raises a FrozenError when self is frozen" do
-    -> { 'hello'.freeze.delete_prefix!('hell') }.should raise_error(FrozenError)
-    -> { 'hello'.freeze.delete_prefix!('') }.should raise_error(FrozenError)
-    -> { ''.freeze.delete_prefix!('') }.should raise_error(FrozenError)
+    -> { 'hello'.freeze.delete_prefix!('hell') }.should.raise(FrozenError)
+    -> { 'hello'.freeze.delete_prefix!('') }.should.raise(FrozenError)
+    -> { ''.freeze.delete_prefix!('') }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/delete_spec.rb b/spec/ruby/core/string/delete_spec.rb
index 6d359776e45..adb5150cff0 100644
--- a/spec/ruby/core/string/delete_spec.rb
+++ b/spec/ruby/core/string/delete_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it "raises an ArgumentError when given no arguments" do
-    -> { "hell yeah".delete }.should raise_error(ArgumentError)
+    -> { "hell yeah".delete }.should.raise(ArgumentError)
   end
 
   it "negates sets starting with ^" do
@@ -63,10 +63,10 @@
     not_supported_on :opal do
       xFF = [0xFF].pack('C')
       range = "\x00 - #{xFF}".force_encoding('utf-8')
-      -> { "hello".delete(range).should == "" }.should raise_error(ArgumentError)
+      -> { "hello".delete(range).should == "" }.should.raise(ArgumentError)
     end
-    -> { "hello".delete("h-e") }.should raise_error(ArgumentError)
-    -> { "hello".delete("^h-e") }.should raise_error(ArgumentError)
+    -> { "hello".delete("h-e") }.should.raise(ArgumentError)
+    -> { "hello".delete("^h-e") }.should.raise(ArgumentError)
   end
 
   it "tries to convert each set arg to a string using to_str" do
@@ -80,13 +80,13 @@
   end
 
   it "raises a TypeError when one set arg can't be converted to a string" do
-    -> { "hello world".delete(100)       }.should raise_error(TypeError)
-    -> { "hello world".delete([])        }.should raise_error(TypeError)
-    -> { "hello world".delete(mock('x')) }.should raise_error(TypeError)
+    -> { "hello world".delete(100)       }.should.raise(TypeError)
+    -> { "hello world".delete([])        }.should.raise(TypeError)
+    -> { "hello world".delete(mock('x')) }.should.raise(TypeError)
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("oh no!!!").delete("!").should be_an_instance_of(String)
+    StringSpecs::MyString.new("oh no!!!").delete("!").should.instance_of?(String)
   end
 
   it "returns a String in the same encoding as self" do
@@ -97,7 +97,7 @@
 describe "String#delete!" do
   it "modifies self in place and returns self" do
     a = "hello"
-    a.delete!("aeiou", "^e").should equal(a)
+    a.delete!("aeiou", "^e").should.equal?(a)
     a.should == "hell"
   end
 
@@ -111,7 +111,7 @@
     a = "hello"
     a.freeze
 
-    -> { a.delete!("")            }.should raise_error(FrozenError)
-    -> { a.delete!("aeiou", "^e") }.should raise_error(FrozenError)
+    -> { a.delete!("")            }.should.raise(FrozenError)
+    -> { a.delete!("aeiou", "^e") }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/delete_suffix_spec.rb b/spec/ruby/core/string/delete_suffix_spec.rb
index 1842d75aa5e..11d8fbbac16 100644
--- a/spec/ruby/core/string/delete_suffix_spec.rb
+++ b/spec/ruby/core/string/delete_suffix_spec.rb
@@ -12,13 +12,13 @@
   it "returns a copy of the string, when the suffix isn't found" do
     s = 'hello'
     r = s.delete_suffix('!hello')
-    r.should_not equal s
+    r.should_not.equal? s
     r.should == s
     r = s.delete_suffix('ell')
-    r.should_not equal s
+    r.should_not.equal? s
     r.should == s
     r = s.delete_suffix('')
-    r.should_not equal s
+    r.should_not.equal? s
     r.should == s
   end
 
@@ -41,7 +41,7 @@
 
   it "returns a String instance when called on a subclass instance" do
     s = StringSpecs::MyString.new('hello')
-    s.delete_suffix('ello').should be_an_instance_of(String)
+    s.delete_suffix('ello').should.instance_of?(String)
   end
 
   it "returns a String in the same encoding as self" do
@@ -52,7 +52,7 @@
 describe "String#delete_suffix!" do
   it "removes the found prefix" do
     s = 'hello'
-    s.delete_suffix!('ello').should equal(s)
+    s.delete_suffix!('ello').should.equal?(s)
     s.should == 'h'
   end
 
@@ -76,8 +76,8 @@
   end
 
   it "raises a FrozenError when self is frozen" do
-    -> { 'hello'.freeze.delete_suffix!('ello') }.should raise_error(FrozenError)
-    -> { 'hello'.freeze.delete_suffix!('') }.should raise_error(FrozenError)
-    -> { ''.freeze.delete_suffix!('') }.should raise_error(FrozenError)
+    -> { 'hello'.freeze.delete_suffix!('ello') }.should.raise(FrozenError)
+    -> { 'hello'.freeze.delete_suffix!('') }.should.raise(FrozenError)
+    -> { ''.freeze.delete_suffix!('') }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/downcase_spec.rb b/spec/ruby/core/string/downcase_spec.rb
index 2d260f23f18..4f7f44e5d46 100644
--- a/spec/ruby/core/string/downcase_spec.rb
+++ b/spec/ruby/core/string/downcase_spec.rb
@@ -24,7 +24,7 @@
       downcased.should == "king"
       downcased.size.should == 4
       downcased.bytesize.should == 4
-      downcased.ascii_only?.should be_true
+      downcased.ascii_only?.should == true
     end
   end
 
@@ -48,7 +48,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { "İ".downcase(:turkic, :ascii) }.should raise_error(ArgumentError)
+      -> { "İ".downcase(:turkic, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -62,7 +62,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { "İS".downcase(:lithuanian, :ascii) }.should raise_error(ArgumentError)
+      -> { "İS".downcase(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -74,18 +74,18 @@
   end
 
   it "does not allow invalid options" do
-    -> { "ABC".downcase(:invalid_option) }.should raise_error(ArgumentError)
+    -> { "ABC".downcase(:invalid_option) }.should.raise(ArgumentError)
   end
 
   it "returns a String instance for subclasses" do
-    StringSpecs::MyString.new("FOObar").downcase.should be_an_instance_of(String)
+    StringSpecs::MyString.new("FOObar").downcase.should.instance_of?(String)
   end
 end
 
 describe "String#downcase!" do
   it "modifies self in place" do
     a = "HeLlO"
-    a.downcase!.should equal(a)
+    a.downcase!.should.equal?(a)
     a.should == "hello"
   end
 
@@ -109,7 +109,7 @@
       downcased.should == "king"
       downcased.size.should == 4
       downcased.bytesize.should == 4
-      downcased.ascii_only?.should be_true
+      downcased.ascii_only?.should == true
     end
   end
 
@@ -141,7 +141,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { a = "İ"; a.downcase!(:turkic, :ascii) }.should raise_error(ArgumentError)
+      -> { a = "İ"; a.downcase!(:turkic, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -159,7 +159,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { a = "İS"; a.downcase!(:lithuanian, :ascii) }.should raise_error(ArgumentError)
+      -> { a = "İS"; a.downcase!(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -175,7 +175,7 @@
   end
 
   it "does not allow invalid options" do
-    -> { a = "ABC"; a.downcase!(:invalid_option) }.should raise_error(ArgumentError)
+    -> { a = "ABC"; a.downcase!(:invalid_option) }.should.raise(ArgumentError)
   end
 
   it "returns nil if no modifications were made" do
@@ -185,11 +185,11 @@
   end
 
   it "raises a FrozenError when self is frozen" do
-    -> { "HeLlo".freeze.downcase! }.should raise_error(FrozenError)
-    -> { "hello".freeze.downcase! }.should raise_error(FrozenError)
+    -> { "HeLlo".freeze.downcase! }.should.raise(FrozenError)
+    -> { "hello".freeze.downcase! }.should.raise(FrozenError)
   end
 
   it "sets the result String encoding to the source String encoding" do
-    "ABC".downcase.encoding.should equal(Encoding::UTF_8)
+    "ABC".downcase.encoding.should.equal?(Encoding::UTF_8)
   end
 end
diff --git a/spec/ruby/core/string/dump_spec.rb b/spec/ruby/core/string/dump_spec.rb
index cab8beff5ad..176be79db2d 100644
--- a/spec/ruby/core/string/dump_spec.rb
+++ b/spec/ruby/core/string/dump_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns a String instance" do
-    StringSpecs::MyString.new.dump.should be_an_instance_of(String)
+    StringSpecs::MyString.new.dump.should.instance_of?(String)
   end
 
   it "wraps string with \"" do
diff --git a/spec/ruby/core/string/dup_spec.rb b/spec/ruby/core/string/dup_spec.rb
index 073802d84b4..e367f7a3110 100644
--- a/spec/ruby/core/string/dup_spec.rb
+++ b/spec/ruby/core/string/dup_spec.rb
@@ -21,7 +21,7 @@
   it "does not copy singleton methods" do
     def @obj.special() :the_one end
     dup = @obj.dup
-    -> { dup.special }.should raise_error(NameError)
+    -> { dup.special }.should.raise(NameError)
   end
 
   it "does not copy modules included in the singleton class" do
@@ -30,7 +30,7 @@ class << @obj
     end
 
     dup = @obj.dup
-    -> { dup.repr }.should raise_error(NameError)
+    -> { dup.repr }.should.raise(NameError)
   end
 
   it "does not copy constants defined in the singleton class" do
@@ -39,7 +39,7 @@ class << @obj
     end
 
     dup = @obj.dup
-    -> { class << dup; CLONE; end }.should raise_error(NameError)
+    -> { class << dup; CLONE; end }.should.raise(NameError)
   end
 
   it "does not modify the original string when changing dupped string" do
diff --git a/spec/ruby/core/string/each_byte_spec.rb b/spec/ruby/core/string/each_byte_spec.rb
index 7b3db265ac2..1884df416b5 100644
--- a/spec/ruby/core/string/each_byte_spec.rb
+++ b/spec/ruby/core/string/each_byte_spec.rb
@@ -35,13 +35,13 @@
 
   it "returns self" do
     s = "hello"
-    (s.each_byte {}).should equal(s)
+    (s.each_byte {}).should.equal?(s)
   end
 
   describe "when no block is given" do
     it "returns an enumerator" do
       enum = "hello".each_byte
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
       enum.to_a.should == [104, 101, 108, 108, 111]
     end
 
diff --git a/spec/ruby/core/string/element_set_spec.rb b/spec/ruby/core/string/element_set_spec.rb
index e7599f832c0..2abc5117aa8 100644
--- a/spec/ruby/core/string/element_set_spec.rb
+++ b/spec/ruby/core/string/element_set_spec.rb
@@ -18,13 +18,13 @@
   it "raises an IndexError without changing self if idx is outside of self" do
     str = "hello"
 
-    -> { str[20] = "bam" }.should raise_error(IndexError)
+    -> { str[20] = "bam" }.should.raise(IndexError)
     str.should == "hello"
 
-    -> { str[-20] = "bam" }.should raise_error(IndexError)
+    -> { str[-20] = "bam" }.should.raise(IndexError)
     str.should == "hello"
 
-    -> { ""[-1] = "bam" }.should raise_error(IndexError)
+    -> { ""[-1] = "bam" }.should.raise(IndexError)
   end
 
   # Behaviour is verified by matz in
@@ -37,7 +37,7 @@
 
   it "raises IndexError if the string index doesn't match a position in the string" do
     str = "hello"
-    -> { str['y'] = "bam" }.should raise_error(IndexError)
+    -> { str['y'] = "bam" }.should.raise(IndexError)
     str.should == "hello"
   end
 
@@ -45,7 +45,7 @@
     a = "hello"
     a.freeze
 
-    -> { a[0] = "bam" }.should raise_error(FrozenError)
+    -> { a[0] = "bam" }.should.raise(FrozenError)
   end
 
   it "calls to_int on index" do
@@ -69,17 +69,17 @@
   end
 
   it "raises a TypeError if other_str can't be converted to a String" do
-    -> { "test"[1] = []        }.should raise_error(TypeError)
-    -> { "test"[1] = mock('x') }.should raise_error(TypeError)
-    -> { "test"[1] = nil       }.should raise_error(TypeError)
+    -> { "test"[1] = []        }.should.raise(TypeError)
+    -> { "test"[1] = mock('x') }.should.raise(TypeError)
+    -> { "test"[1] = nil       }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed an Integer replacement" do
-    -> { "abc"[1] = 65 }.should raise_error(TypeError)
+    -> { "abc"[1] = 65 }.should.raise(TypeError)
   end
 
   it "raises an IndexError if the index is greater than character size" do
-    -> { "あれ"[4] = "a" }.should raise_error(IndexError)
+    -> { "あれ"[4] = "a" }.should.raise(IndexError)
   end
 
   it "calls #to_int to convert the index" do
@@ -95,14 +95,14 @@
     index = mock("string element set")
     index.should_receive(:to_int).and_return('1')
 
-    -> { "abc"[index] = "d" }.should raise_error(TypeError)
+    -> { "abc"[index] = "d" }.should.raise(TypeError)
   end
 
   it "raises an IndexError if #to_int returns a value out of range" do
     index = mock("string element set")
     index.should_receive(:to_int).and_return(4)
 
-    -> { "ab"[index] = "c" }.should raise_error(IndexError)
+    -> { "ab"[index] = "c" }.should.raise(IndexError)
   end
 
   it "replaces a character with a multibyte character" do
@@ -127,7 +127,7 @@
     str = " ".force_encoding Encoding::US_ASCII
     rep = [160].pack('C').force_encoding Encoding::BINARY
     str[0] = rep
-    str.encoding.should equal(Encoding::BINARY)
+    str.encoding.should.equal?(Encoding::BINARY)
   end
 
   it "updates the string to a compatible encoding" do
@@ -139,7 +139,7 @@
   it "raises an Encoding::CompatibilityError if the replacement encoding is incompatible" do
     str = "あれ"
     rep = "が".encode Encoding::EUC_JP
-    -> { str[0] = rep }.should raise_error(Encoding::CompatibilityError)
+    -> { str[0] = rep }.should.raise(Encoding::CompatibilityError)
   end
 end
 
@@ -164,7 +164,7 @@
 
   it "raises an IndexError if the search String is not found" do
     str = "abcde"
-    -> { str["g"] = "h" }.should raise_error(IndexError)
+    -> { str["g"] = "h" }.should.raise(IndexError)
   end
 
   it "replaces characters with a multibyte character" do
@@ -189,13 +189,13 @@
     str = " ".force_encoding Encoding::US_ASCII
     rep = [160].pack('C').force_encoding Encoding::BINARY
     str[" "] = rep
-    str.encoding.should equal(Encoding::BINARY)
+    str.encoding.should.equal?(Encoding::BINARY)
   end
 
   it "raises an Encoding::CompatibilityError if the replacement encoding is incompatible" do
     str = "あれ"
     rep = "が".encode Encoding::EUC_JP
-    -> { str["れ"] = rep }.should raise_error(Encoding::CompatibilityError)
+    -> { str["れ"] = rep }.should.raise(Encoding::CompatibilityError)
   end
 end
 
@@ -208,7 +208,7 @@
 
   it "raises IndexError if the regexp index doesn't match a position in the string" do
     str = "hello"
-    -> { str[/y/] = "bam" }.should raise_error(IndexError)
+    -> { str[/y/] = "bam" }.should.raise(IndexError)
     str.should == "hello"
   end
 
@@ -225,7 +225,7 @@
     rep = mock("string element set regexp")
     rep.should_not_receive(:to_str)
 
-    -> { "abc"[/def/] = rep }.should raise_error(IndexError)
+    -> { "abc"[/def/] = rep }.should.raise(IndexError)
   end
 
   describe "with 3 arguments" do
@@ -242,7 +242,7 @@
       ref = mock("string element set regexp ref")
       ref.should_receive(:to_int).and_return(nil)
 
-      -> { "abc"[/a(b)/, ref] = "x" }.should raise_error(TypeError)
+      -> { "abc"[/a(b)/, ref] = "x" }.should.raise(TypeError)
     end
 
     it "uses the 2nd of 3 arguments as which capture should be replaced" do
@@ -261,20 +261,20 @@
       rep = mock("string element set regexp")
       rep.should_not_receive(:to_str)
 
-      -> { "abc"[/a(b)/, 2] = rep }.should raise_error(IndexError)
+      -> { "abc"[/a(b)/, 2] = rep }.should.raise(IndexError)
     end
 
     it "raises IndexError if the specified capture isn't available" do
       str = "aaa bbb ccc"
-      -> { str[/a (bbb) c/,  2] = "ddd" }.should raise_error(IndexError)
-      -> { str[/a (bbb) c/, -2] = "ddd" }.should raise_error(IndexError)
+      -> { str[/a (bbb) c/,  2] = "ddd" }.should.raise(IndexError)
+      -> { str[/a (bbb) c/, -2] = "ddd" }.should.raise(IndexError)
     end
 
     describe "when the optional capture does not match" do
       it "raises an IndexError before setting the replacement" do
         str1 = "a b c"
         str2 = str1.dup
-        -> { str2[/a (b) (Z)?/,  2] = "d" }.should raise_error(IndexError)
+        -> { str2[/a (b) (Z)?/,  2] = "d" }.should.raise(IndexError)
         str2.should == str1
       end
     end
@@ -302,13 +302,13 @@
     str = " ".force_encoding Encoding::US_ASCII
     rep = [160].pack('C').force_encoding Encoding::BINARY
     str[/ /] = rep
-    str.encoding.should equal(Encoding::BINARY)
+    str.encoding.should.equal?(Encoding::BINARY)
   end
 
   it "raises an Encoding::CompatibilityError if the replacement encoding is incompatible" do
     str = "あれ"
     rep = "が".encode Encoding::EUC_JP
-    -> { str[/れ/] = rep }.should raise_error(Encoding::CompatibilityError)
+    -> { str[/れ/] = rep }.should.raise(Encoding::CompatibilityError)
   end
 end
 
@@ -358,11 +358,11 @@
   end
 
   it "raises a RangeError if negative Range begin is out of range" do
-    -> { "abc"[-4..-2] = "x" }.should raise_error(RangeError, "-4..-2 out of range")
+    -> { "abc"[-4..-2] = "x" }.should.raise(RangeError, "-4..-2 out of range")
   end
 
   it "raises a RangeError if positive Range begin is greater than String size" do
-    -> { "abc"[4..2] = "x" }.should raise_error(RangeError, "4..2 out of range")
+    -> { "abc"[4..2] = "x" }.should.raise(RangeError, "4..2 out of range")
   end
 
   it "uses the Range end as an index rather than a count" do
@@ -423,13 +423,13 @@
     str = " ".force_encoding Encoding::US_ASCII
     rep = [160].pack('C').force_encoding Encoding::BINARY
     str[0..1] = rep
-    str.encoding.should equal(Encoding::BINARY)
+    str.encoding.should.equal?(Encoding::BINARY)
   end
 
   it "raises an Encoding::CompatibilityError if the replacement encoding is incompatible" do
     str = "あれ"
     rep = "が".encode Encoding::EUC_JP
-    -> { str[0..1] = rep }.should raise_error(Encoding::CompatibilityError)
+    -> { str[0..1] = rep }.should.raise(Encoding::CompatibilityError)
   end
 end
 
@@ -498,14 +498,14 @@
     index = mock("string element set index")
     index.should_receive(:to_int).and_return("1")
 
-    -> { "abc"[index, 2] = "xyz" }.should raise_error(TypeError)
+    -> { "abc"[index, 2] = "xyz" }.should.raise(TypeError)
   end
 
   it "raises a TypeError if #to_int for count does not return an Integer" do
     count = mock("string element set count")
     count.should_receive(:to_int).and_return("1")
 
-    -> { "abc"[1, count] = "xyz" }.should raise_error(TypeError)
+    -> { "abc"[1, count] = "xyz" }.should.raise(TypeError)
   end
 
   it "calls #to_str to convert the replacement object" do
@@ -521,23 +521,23 @@
     r = mock("string element set replacement")
     r.should_receive(:to_str).and_return(nil)
 
-    -> { "abc"[1, 1] = r }.should raise_error(TypeError)
+    -> { "abc"[1, 1] = r }.should.raise(TypeError)
   end
 
   it "raises an IndexError if |idx| is greater than the length of the string" do
-    -> { "hello"[6, 0] = "bob"  }.should raise_error(IndexError)
-    -> { "hello"[-6, 0] = "bob" }.should raise_error(IndexError)
+    -> { "hello"[6, 0] = "bob"  }.should.raise(IndexError)
+    -> { "hello"[-6, 0] = "bob" }.should.raise(IndexError)
   end
 
   it "raises an IndexError if count < 0" do
-    -> { "hello"[0, -1] = "bob" }.should raise_error(IndexError)
-    -> { "hello"[1, -1] = "bob" }.should raise_error(IndexError)
+    -> { "hello"[0, -1] = "bob" }.should.raise(IndexError)
+    -> { "hello"[1, -1] = "bob" }.should.raise(IndexError)
   end
 
   it "raises a TypeError if other_str is a type other than String" do
-    -> { "hello"[0, 2] = nil  }.should raise_error(TypeError)
-    -> { "hello"[0, 2] = []   }.should raise_error(TypeError)
-    -> { "hello"[0, 2] = 33   }.should raise_error(TypeError)
+    -> { "hello"[0, 2] = nil  }.should.raise(TypeError)
+    -> { "hello"[0, 2] = []   }.should.raise(TypeError)
+    -> { "hello"[0, 2] = 33   }.should.raise(TypeError)
   end
 
   it "replaces characters with a multibyte character" do
@@ -571,19 +571,19 @@
   end
 
   it "raises an IndexError if the character index is out of range of a multibyte String" do
-    -> { "あれ"[3, 0] = "り" }.should raise_error(IndexError)
+    -> { "あれ"[3, 0] = "り" }.should.raise(IndexError)
   end
 
   it "encodes the String in an encoding compatible with the replacement" do
     str = " ".force_encoding Encoding::US_ASCII
     rep = [160].pack('C').force_encoding Encoding::BINARY
     str[0, 1] = rep
-    str.encoding.should equal(Encoding::BINARY)
+    str.encoding.should.equal?(Encoding::BINARY)
   end
 
   it "raises an Encoding::CompatibilityError if the replacement encoding is incompatible" do
     str = "あれ"
     rep = "が".encode Encoding::EUC_JP
-    -> { str[0, 1] = rep }.should raise_error(Encoding::CompatibilityError)
+    -> { str[0, 1] = rep }.should.raise(Encoding::CompatibilityError)
   end
 end
diff --git a/spec/ruby/core/string/encode_spec.rb b/spec/ruby/core/string/encode_spec.rb
index cd449498a35..ab096f4041a 100644
--- a/spec/ruby/core/string/encode_spec.rb
+++ b/spec/ruby/core/string/encode_spec.rb
@@ -20,7 +20,7 @@
       Encoding.default_internal = nil
       str = "あ"
       encoded = str.encode
-      encoded.should_not equal(str)
+      encoded.should_not.equal?(str)
       encoded.should == str
     end
 
@@ -28,7 +28,7 @@
       Encoding.default_internal = nil
       str = "abc"
       encoded = str.encode
-      encoded.should_not equal(str)
+      encoded.should_not.equal?(str)
       encoded.should == str
     end
 
@@ -36,7 +36,7 @@
       x82 = [0x82].pack('C')
       str =  "#{x82}foo".dup.force_encoding("binary")[1..-1].encode("utf-8")
       str.should == "foo".dup.force_encoding("utf-8")
-      str.encoding.should equal(Encoding::UTF_8)
+      str.encoding.should.equal?(Encoding::UTF_8)
     end
   end
 
@@ -44,7 +44,7 @@
     it "returns a copy when passed the same encoding as the String" do
       str = "あ"
       encoded = str.encode(Encoding::UTF_8)
-      encoded.should_not equal(str)
+      encoded.should_not.equal?(str)
       encoded.should == str
     end
 
@@ -58,7 +58,7 @@
     it "returns a copy when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
       str = "あ"
-      str.encode(invalid: :replace).should_not equal(str)
+      str.encode(invalid: :replace).should_not.equal?(str)
     end
 
     it "normalizes newlines with cr_newline option" do
@@ -137,7 +137,7 @@
       str = "あ".dup.force_encoding("binary")
       encoded = str.encode("utf-8", "utf-8")
 
-      encoded.should_not equal(str)
+      encoded.should_not.equal?(str)
       encoded.should == str.force_encoding("utf-8")
       encoded.encoding.should == Encoding::UTF_8
     end
@@ -152,7 +152,7 @@
     it "returns a copy when the destination encoding is the same as the String encoding" do
       str = "あ"
       encoded = str.encode(Encoding::UTF_8, undef: :replace)
-      encoded.should_not equal(str)
+      encoded.should_not.equal?(str)
       encoded.should == str
     end
   end
@@ -161,7 +161,7 @@
     it "returns a copy when both encodings are the same" do
       str = "あ"
       encoded = str.encode("utf-8", "utf-8", invalid: :replace)
-      encoded.should_not equal(str)
+      encoded.should_not.equal?(str)
       encoded.should == str
     end
 
@@ -169,7 +169,7 @@
       str = "あ".dup.force_encoding("binary")
       encoded = str.encode("utf-8", "utf-8", invalid: :replace)
 
-      encoded.should_not equal(str)
+      encoded.should_not.equal?(str)
       encoded.should == str.force_encoding("utf-8")
       encoded.encoding.should == Encoding::UTF_8
     end
@@ -190,25 +190,25 @@
   it_behaves_like :string_encode, :encode!
 
   it "raises a FrozenError when called on a frozen String" do
-    -> { "foo".freeze.encode!("euc-jp") }.should raise_error(FrozenError)
+    -> { "foo".freeze.encode!("euc-jp") }.should.raise(FrozenError)
   end
 
   # http://redmine.ruby-lang.org/issues/show/1836
   it "raises a FrozenError when called on a frozen String when it's a no-op" do
-    -> { "foo".freeze.encode!("utf-8") }.should raise_error(FrozenError)
+    -> { "foo".freeze.encode!("utf-8") }.should.raise(FrozenError)
   end
 
   describe "when passed no options" do
     it "returns self when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
       str = +"あ"
-      str.encode!.should equal(str)
+      str.encode!.should.equal?(str)
     end
 
     it "returns self for a ASCII-only String when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
       str = +"abc"
-      str.encode!.should equal(str)
+      str.encode!.should.equal?(str)
     end
   end
 
@@ -216,7 +216,7 @@
     it "returns self for ASCII-only String when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
       str = +"abc"
-      str.encode!(invalid: :replace).should equal(str)
+      str.encode!(invalid: :replace).should.equal?(str)
     end
   end
 
@@ -224,8 +224,8 @@
     it "returns self" do
       str = +"abc"
       result = str.encode!(Encoding::BINARY)
-      result.encoding.should equal(Encoding::BINARY)
-      result.should equal(str)
+      result.encoding.should.equal?(Encoding::BINARY)
+      result.should.equal?(str)
     end
   end
 
@@ -233,8 +233,8 @@
     it "returns self" do
       str = +"ああ"
       result = str.encode!("euc-jp", "utf-8")
-      result.encoding.should equal(Encoding::EUC_JP)
-      result.should equal(str)
+      result.encoding.should.equal?(Encoding::EUC_JP)
+      result.should.equal?(str)
     end
   end
 end
diff --git a/spec/ruby/core/string/encoding_spec.rb b/spec/ruby/core/string/encoding_spec.rb
index f6e8fd34702..aa0e4765ed0 100644
--- a/spec/ruby/core/string/encoding_spec.rb
+++ b/spec/ruby/core/string/encoding_spec.rb
@@ -4,7 +4,7 @@
 
 describe "String#encoding" do
   it "returns an Encoding object" do
-    String.new.encoding.should be_an_instance_of(Encoding)
+    String.new.encoding.should.instance_of?(Encoding)
   end
 
   it "is equal to the source encoding by default" do
@@ -70,13 +70,13 @@
 
   it "returns US-ASCII if self is US-ASCII only" do
     s = "\u{40}"
-    s.ascii_only?.should be_true
+    s.ascii_only?.should == true
     s.encoding.should == Encoding::US_ASCII
   end
 
   it "returns UTF-8 if self isn't US-ASCII only" do
     s = "\u{4076}\u{619}"
-    s.ascii_only?.should be_false
+    s.ascii_only?.should == false
     s.encoding.should == Encoding::UTF_8
   end
 
@@ -122,7 +122,7 @@
 
   it "returns US-ASCII if self is US-ASCII only" do
     s = "\x61"
-    s.ascii_only?.should be_true
+    s.ascii_only?.should == true
     s.encoding.should == Encoding::US_ASCII
   end
 
@@ -131,7 +131,7 @@
     str = " "
     str.encoding.should == Encoding::US_ASCII
     str += [0xDF].pack('C')
-    str.ascii_only?.should be_false
+    str.ascii_only?.should == false
     str.encoding.should == Encoding::BINARY
   end
 
@@ -140,7 +140,7 @@
   it "returns the source encoding when an escape creates a byte with the 8th bit set if the source encoding isn't US-ASCII" do
     fixture  = StringSpecs::ISO88599Encoding.new
     fixture.source_encoding.should == Encoding::ISO8859_9
-    fixture.x_escape.ascii_only?.should be_false
+    fixture.x_escape.ascii_only?.should == false
     fixture.x_escape.encoding.should == Encoding::ISO8859_9
   end
 
diff --git a/spec/ruby/core/string/eql_spec.rb b/spec/ruby/core/string/eql_spec.rb
index 397974d9fb6..46ebeda5099 100644
--- a/spec/ruby/core/string/eql_spec.rb
+++ b/spec/ruby/core/string/eql_spec.rb
@@ -6,16 +6,16 @@
 
   describe "when given a non-String" do
     it "returns false" do
-      'hello'.should_not eql(5)
+      'hello'.should_not.eql?(5)
       not_supported_on :opal do
-        'hello'.should_not eql(:hello)
+        'hello'.should_not.eql?(:hello)
       end
-      'hello'.should_not eql(mock('x'))
+      'hello'.should_not.eql?(mock('x'))
     end
 
     it "does not try to call #to_str on the given argument" do
       (obj = mock('x')).should_not_receive(:to_str)
-      'hello'.should_not eql(obj)
+      'hello'.should_not.eql?(obj)
     end
   end
 end
diff --git a/spec/ruby/core/string/force_encoding_spec.rb b/spec/ruby/core/string/force_encoding_spec.rb
index 2259dcf3cf8..fc6914213f5 100644
--- a/spec/ruby/core/string/force_encoding_spec.rb
+++ b/spec/ruby/core/string/force_encoding_spec.rb
@@ -41,23 +41,23 @@
     obj = mock("force_encoding")
     obj.should_receive(:to_str).and_return(1)
 
-    -> { "abc".force_encoding(obj) }.should raise_error(TypeError)
+    -> { "abc".force_encoding(obj) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed nil" do
-    -> { "abc".force_encoding(nil) }.should raise_error(TypeError)
+    -> { "abc".force_encoding(nil) }.should.raise(TypeError)
   end
 
   it "returns self" do
     str = "abc"
-    str.force_encoding('utf-8').should equal(str)
+    str.force_encoding('utf-8').should.equal?(str)
   end
 
   it "sets the encoding even if the String contents are invalid in that encoding" do
     str = "\u{9765}"
     str.force_encoding('euc-jp')
     str.encoding.should == Encoding::EUC_JP
-    str.valid_encoding?.should be_false
+    str.valid_encoding?.should == false
   end
 
   it "does not transcode self" do
@@ -67,6 +67,6 @@
 
   it "raises a FrozenError if self is frozen" do
     str = "abcd".freeze
-    -> { str.force_encoding(str.encoding) }.should raise_error(FrozenError)
+    -> { str.force_encoding(str.encoding) }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/freeze_spec.rb b/spec/ruby/core/string/freeze_spec.rb
index 2e8e70386dc..8485e8de214 100644
--- a/spec/ruby/core/string/freeze_spec.rb
+++ b/spec/ruby/core/string/freeze_spec.rb
@@ -4,11 +4,11 @@
 describe "String#freeze" do
 
   it "produces the same object whenever called on an instance of a literal in the source" do
-    "abc".freeze.should equal "abc".freeze
+    "abc".freeze.should.equal? "abc".freeze
   end
 
   it "doesn't produce the same object for different instances of literals in the source" do
-    "abc".should_not equal "abc"
+    "abc".should_not.equal? "abc"
   end
 
   it "being a special form doesn't change the value of defined?" do
diff --git a/spec/ruby/core/string/getbyte_spec.rb b/spec/ruby/core/string/getbyte_spec.rb
index 27b7d826eac..d4619dca617 100644
--- a/spec/ruby/core/string/getbyte_spec.rb
+++ b/spec/ruby/core/string/getbyte_spec.rb
@@ -3,7 +3,7 @@
 
 describe "String#getbyte" do
   it "returns an Integer if given a valid index" do
-    "a".getbyte(0).should be_kind_of(Integer)
+    "a".getbyte(0).should.is_a?(Integer)
   end
 
   it "starts indexing at 0" do
@@ -51,19 +51,19 @@
   end
 
   it "returns nil for out-of-bound indexes" do
-    "g".getbyte(1).should be_nil
+    "g".getbyte(1).should == nil
   end
 
   it "regards the empty String as containing no bytes" do
-    "".getbyte(0).should be_nil
+    "".getbyte(0).should == nil
   end
 
   it "raises an ArgumentError unless given one argument" do
-    -> { "glark".getbyte     }.should raise_error(ArgumentError)
-    -> { "food".getbyte(0,0) }.should raise_error(ArgumentError)
+    -> { "glark".getbyte     }.should.raise(ArgumentError)
+    -> { "food".getbyte(0,0) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError unless its argument can be coerced into an Integer" do
-    -> { "a".getbyte('a') }.should raise_error(TypeError)
+    -> { "a".getbyte('a') }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/string/gsub_spec.rb b/spec/ruby/core/string/gsub_spec.rb
index 0d9f32eca2e..d0e1c30bd22 100644
--- a/spec/ruby/core/string/gsub_spec.rb
+++ b/spec/ruby/core/string/gsub_spec.rb
@@ -175,9 +175,9 @@ def pattern.to_str() "." end
   end
 
   it "raises a TypeError when pattern can't be converted to a string" do
-    -> { "hello".gsub([], "x")            }.should raise_error(TypeError)
-    -> { "hello".gsub(Object.new, "x")    }.should raise_error(TypeError)
-    -> { "hello".gsub(nil, "x")           }.should raise_error(TypeError)
+    -> { "hello".gsub([], "x")            }.should.raise(TypeError)
+    -> { "hello".gsub(Object.new, "x")    }.should.raise(TypeError)
+    -> { "hello".gsub(nil, "x")           }.should.raise(TypeError)
   end
 
   it "tries to convert replacement to a string using to_str" do
@@ -188,16 +188,16 @@ def replacement.to_str() "hello_replacement" end
   end
 
   it "raises a TypeError when replacement can't be converted to a string" do
-    -> { "hello".gsub(/[aeiou]/, [])            }.should raise_error(TypeError)
-    -> { "hello".gsub(/[aeiou]/, Object.new)    }.should raise_error(TypeError)
-    -> { "hello".gsub(/[aeiou]/, nil)           }.should raise_error(TypeError)
+    -> { "hello".gsub(/[aeiou]/, [])            }.should.raise(TypeError)
+    -> { "hello".gsub(/[aeiou]/, Object.new)    }.should.raise(TypeError)
+    -> { "hello".gsub(/[aeiou]/, nil)           }.should.raise(TypeError)
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("").gsub(//, "").should be_an_instance_of(String)
-    StringSpecs::MyString.new("").gsub(/foo/, "").should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").gsub(/foo/, "").should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").gsub("foo", "").should be_an_instance_of(String)
+    StringSpecs::MyString.new("").gsub(//, "").should.instance_of?(String)
+    StringSpecs::MyString.new("").gsub(/foo/, "").should.instance_of?(String)
+    StringSpecs::MyString.new("foo").gsub(/foo/, "").should.instance_of?(String)
+    StringSpecs::MyString.new("foo").gsub("foo", "").should.instance_of?(String)
   end
 
   it "sets $~ to MatchData of last match and nil when there's none" do
@@ -450,8 +450,8 @@ def obj.to_s() "ok" end
     s = "hllëllo"
     s2 = "hellö"
 
-    -> { s.gsub(/l/) { |bar| "Русский".force_encoding("iso-8859-5") } }.should raise_error(Encoding::CompatibilityError)
-    -> { s2.gsub(/l/) { |bar| "Русский".force_encoding("iso-8859-5") } }.should raise_error(Encoding::CompatibilityError)
+    -> { s.gsub(/l/) { |bar| "Русский".force_encoding("iso-8859-5") } }.should.raise(Encoding::CompatibilityError)
+    -> { s2.gsub(/l/) { |bar| "Русский".force_encoding("iso-8859-5") } }.should.raise(Encoding::CompatibilityError)
   end
 
   it "replaces the incompatible part properly even if the encodings are not compatible" do
@@ -463,7 +463,7 @@ def obj.to_s() "ok" end
   not_supported_on :opal do
     it "raises an ArgumentError if encoding is not valid" do
       x92 = [0x92].pack('C').force_encoding('utf-8')
-      -> { "a#{x92}b".gsub(/[^\x00-\x7f]/u, '') }.should raise_error(ArgumentError)
+      -> { "a#{x92}b".gsub(/[^\x00-\x7f]/u, '') }.should.raise(ArgumentError)
     end
   end
 end
@@ -471,7 +471,7 @@ def obj.to_s() "ok" end
 describe "String#gsub with pattern and without replacement and block" do
   it "returns an enumerator" do
     enum = "abca".gsub(/a/)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == ["a", "a"]
   end
 
@@ -495,13 +495,13 @@ def obj.to_s() "ok" end
 describe "String#gsub! with pattern and replacement" do
   it "modifies self in place and returns self" do
     a = "hello"
-    a.gsub!(/[aeiou]/, '*').should equal(a)
+    a.gsub!(/[aeiou]/, '*').should.equal?(a)
     a.should == "h*ll*"
   end
 
   it "modifies self in place with multi-byte characters and returns self" do
     a = "¿por qué?"
-    a.gsub!(/([a-z\d]*)/, "*").should equal(a)
+    a.gsub!(/([a-z\d]*)/, "*").should.equal?(a)
     a.should == "*¿** **é*?*"
   end
 
@@ -517,9 +517,9 @@ def obj.to_s() "ok" end
     s = "hello"
     s.freeze
 
-    -> { s.gsub!(/ROAR/, "x")    }.should raise_error(FrozenError)
-    -> { s.gsub!(/e/, "e")       }.should raise_error(FrozenError)
-    -> { s.gsub!(/[aeiou]/, '*') }.should raise_error(FrozenError)
+    -> { s.gsub!(/ROAR/, "x")    }.should.raise(FrozenError)
+    -> { s.gsub!(/e/, "e")       }.should.raise(FrozenError)
+    -> { s.gsub!(/[aeiou]/, '*') }.should.raise(FrozenError)
   end
 
   it "handles a pattern in a superset encoding" do
@@ -547,7 +547,7 @@ def obj.to_s() "ok" end
 describe "String#gsub! with pattern and block" do
   it "modifies self in place and returns self" do
     a = "hello"
-    a.gsub!(/[aeiou]/) { '*' }.should equal(a)
+    a.gsub!(/[aeiou]/) { '*' }.should.equal?(a)
     a.should == "h*ll*"
   end
 
@@ -563,9 +563,9 @@ def obj.to_s() "ok" end
     s = "hello"
     s.freeze
 
-    -> { s.gsub!(/ROAR/)    { "x" } }.should raise_error(FrozenError)
-    -> { s.gsub!(/e/)       { "e" } }.should raise_error(FrozenError)
-    -> { s.gsub!(/[aeiou]/) { '*' } }.should raise_error(FrozenError)
+    -> { s.gsub!(/ROAR/)    { "x" } }.should.raise(FrozenError)
+    -> { s.gsub!(/e/)       { "e" } }.should.raise(FrozenError)
+    -> { s.gsub!(/[aeiou]/) { '*' } }.should.raise(FrozenError)
   end
 
   it "uses the compatible encoding if they are compatible" do
@@ -580,8 +580,8 @@ def obj.to_s() "ok" end
     s = "hllëllo"
     s2 = "hellö"
 
-    -> { s.gsub!(/l/) { |bar| "Русский".force_encoding("iso-8859-5") } }.should raise_error(Encoding::CompatibilityError)
-    -> { s2.gsub!(/l/) { |bar| "Русский".force_encoding("iso-8859-5") } }.should raise_error(Encoding::CompatibilityError)
+    -> { s.gsub!(/l/) { |bar| "Русский".force_encoding("iso-8859-5") } }.should.raise(Encoding::CompatibilityError)
+    -> { s2.gsub!(/l/) { |bar| "Русский".force_encoding("iso-8859-5") } }.should.raise(Encoding::CompatibilityError)
   end
 
   it "replaces the incompatible part properly even if the encodings are not compatible" do
@@ -593,7 +593,7 @@ def obj.to_s() "ok" end
   not_supported_on :opal do
     it "raises an ArgumentError if encoding is not valid" do
       x92 = [0x92].pack('C').force_encoding('utf-8')
-      -> { "a#{x92}b".gsub!(/[^\x00-\x7f]/u, '') }.should raise_error(ArgumentError)
+      -> { "a#{x92}b".gsub!(/[^\x00-\x7f]/u, '') }.should.raise(ArgumentError)
     end
   end
 end
@@ -601,7 +601,7 @@ def obj.to_s() "ok" end
 describe "String#gsub! with pattern and without replacement and block" do
   it "returns an enumerator" do
     enum = "abca".gsub!(/a/)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == ["a", "a"]
   end
 
diff --git a/spec/ruby/core/string/include_spec.rb b/spec/ruby/core/string/include_spec.rb
index 9781140a55e..d9434303354 100644
--- a/spec/ruby/core/string/include_spec.rb
+++ b/spec/ruby/core/string/include_spec.rb
@@ -35,15 +35,15 @@
   end
 
   it "raises a TypeError if other can't be converted to string" do
-    -> { "hello".include?([])       }.should raise_error(TypeError)
-    -> { "hello".include?('h'.ord)  }.should raise_error(TypeError)
-    -> { "hello".include?(mock('x')) }.should raise_error(TypeError)
+    -> { "hello".include?([])       }.should.raise(TypeError)
+    -> { "hello".include?('h'.ord)  }.should.raise(TypeError)
+    -> { "hello".include?(mock('x')) }.should.raise(TypeError)
   end
 
   it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
     pat = "ア".encode Encoding::EUC_JP
     -> do
       "あれ".include?(pat)
-    end.should raise_error(Encoding::CompatibilityError)
+    end.should.raise(Encoding::CompatibilityError)
   end
 end
diff --git a/spec/ruby/core/string/index_spec.rb b/spec/ruby/core/string/index_spec.rb
index 01e6a6a4009..3f82181b984 100644
--- a/spec/ruby/core/string/index_spec.rb
+++ b/spec/ruby/core/string/index_spec.rb
@@ -4,15 +4,15 @@
 
 describe "String#index" do
   it "raises a TypeError if passed nil" do
-    -> { "abc".index nil }.should raise_error(TypeError)
+    -> { "abc".index nil }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed a boolean" do
-    -> { "abc".index true }.should raise_error(TypeError)
+    -> { "abc".index true }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed a Symbol" do
-    -> { "abc".index :a }.should raise_error(TypeError)
+    -> { "abc".index :a }.should.raise(TypeError)
   end
 
   it "calls #to_str to convert the first argument" do
@@ -28,7 +28,7 @@
   end
 
   it "raises a TypeError if passed an Integer" do
-    -> { "abc".index 97 }.should raise_error(TypeError)
+    -> { "abc".index 97 }.should.raise(TypeError)
   end
 end
 
@@ -157,7 +157,7 @@
     char = "れ".encode Encoding::EUC_JP
     -> do
       "あれ".index char
-    end.should raise_error(Encoding::CompatibilityError)
+    end.should.raise(Encoding::CompatibilityError)
   end
 
   it "handles a substring in a superset encoding" do
@@ -172,7 +172,7 @@
     str = 'abc'.dup.force_encoding("ISO-2022-JP")
     pattern = 'b'.dup.force_encoding("EUC-JP")
 
-    -> { str.index(pattern) }.should raise_error(Encoding::CompatibilityError, "incompatible character encodings: ISO-2022-JP and EUC-JP")
+    -> { str.index(pattern) }.should.raise(Encoding::CompatibilityError, "incompatible character encodings: ISO-2022-JP and EUC-JP")
   end
 end
 
@@ -287,7 +287,7 @@
   end
 
   it "returns nil if the Regexp matches the empty string and the offset is out of range" do
-    "ruby".index(//,12).should be_nil
+    "ruby".index(//,12).should == nil
   end
 
   it "supports \\G which matches at the given start offset" do
@@ -332,6 +332,6 @@
     re = Regexp.new "れ".encode(Encoding::EUC_JP)
     -> do
       "あれ".index re
-    end.should raise_error(Encoding::CompatibilityError, "incompatible encoding regexp match (EUC-JP regexp with UTF-8 string)")
+    end.should.raise(Encoding::CompatibilityError, "incompatible encoding regexp match (EUC-JP regexp with UTF-8 string)")
   end
 end
diff --git a/spec/ruby/core/string/initialize_spec.rb b/spec/ruby/core/string/initialize_spec.rb
index 08734cc916f..b0c1e2e573a 100644
--- a/spec/ruby/core/string/initialize_spec.rb
+++ b/spec/ruby/core/string/initialize_spec.rb
@@ -4,7 +4,7 @@
 
 describe "String#initialize" do
   it "is a private method" do
-    String.should have_private_instance_method(:initialize)
+    String.private_instance_methods(false).should.include?(:initialize)
   end
 
   describe "with no arguments" do
@@ -16,7 +16,7 @@
 
     it "does not raise an exception when frozen" do
       a = "hello".freeze
-      a.send(:initialize).should equal(a)
+      a.send(:initialize).should.equal?(a)
     end
   end
 
diff --git a/spec/ruby/core/string/insert_spec.rb b/spec/ruby/core/string/insert_spec.rb
index 483f3c9367b..c89793a8ca9 100644
--- a/spec/ruby/core/string/insert_spec.rb
+++ b/spec/ruby/core/string/insert_spec.rb
@@ -23,8 +23,8 @@
   end
 
   it "raises an IndexError if the index is beyond string" do
-    -> { "abcd".insert(5, 'X')  }.should raise_error(IndexError)
-    -> { "abcd".insert(-6, 'X') }.should raise_error(IndexError)
+    -> { "abcd".insert(5, 'X')  }.should.raise(IndexError)
+    -> { "abcd".insert(-6, 'X') }.should.raise(IndexError)
   end
 
   it "converts index to an integer using to_int" do
@@ -42,15 +42,15 @@
   end
 
   it "raises a TypeError if other can't be converted to string" do
-    -> { "abcd".insert(-6, Object.new)}.should raise_error(TypeError)
-    -> { "abcd".insert(-6, [])        }.should raise_error(TypeError)
-    -> { "abcd".insert(-6, mock('x')) }.should raise_error(TypeError)
+    -> { "abcd".insert(-6, Object.new)}.should.raise(TypeError)
+    -> { "abcd".insert(-6, [])        }.should.raise(TypeError)
+    -> { "abcd".insert(-6, mock('x')) }.should.raise(TypeError)
   end
 
   it "raises a FrozenError if self is frozen" do
     str = "abcd".freeze
-    -> { str.insert(4, '')  }.should raise_error(FrozenError)
-    -> { str.insert(4, 'X') }.should raise_error(FrozenError)
+    -> { str.insert(4, '')  }.should.raise(FrozenError)
+    -> { str.insert(4, 'X') }.should.raise(FrozenError)
   end
 
   it "inserts a character into a multibyte encoded string" do
@@ -67,7 +67,7 @@
     pat = "ア".encode Encoding::EUC_JP
     -> do
       "あれ".insert 0, pat
-    end.should raise_error(Encoding::CompatibilityError)
+    end.should.raise(Encoding::CompatibilityError)
   end
 
   it "should not call subclassed string methods" do
diff --git a/spec/ruby/core/string/inspect_spec.rb b/spec/ruby/core/string/inspect_spec.rb
index 15db06c7f5f..8b91ce2f842 100644
--- a/spec/ruby/core/string/inspect_spec.rb
+++ b/spec/ruby/core/string/inspect_spec.rb
@@ -4,7 +4,7 @@
 
 describe "String#inspect" do
   it "does not return a subclass instance" do
-    StringSpecs::MyString.new.inspect.should be_an_instance_of(String)
+    StringSpecs::MyString.new.inspect.should.instance_of?(String)
   end
 
   it "returns a string with special characters replaced with \\<char> notation" do
diff --git a/spec/ruby/core/string/ljust_spec.rb b/spec/ruby/core/string/ljust_spec.rb
index 47324c59d2f..0b2aab2638d 100644
--- a/spec/ruby/core/string/ljust_spec.rb
+++ b/spec/ruby/core/string/ljust_spec.rb
@@ -41,10 +41,10 @@
   end
 
   it "raises a TypeError when length can't be converted to an integer" do
-    -> { "hello".ljust("x")       }.should raise_error(TypeError)
-    -> { "hello".ljust("x", "y")  }.should raise_error(TypeError)
-    -> { "hello".ljust([])        }.should raise_error(TypeError)
-    -> { "hello".ljust(mock('x')) }.should raise_error(TypeError)
+    -> { "hello".ljust("x")       }.should.raise(TypeError)
+    -> { "hello".ljust("x", "y")  }.should.raise(TypeError)
+    -> { "hello".ljust([])        }.should.raise(TypeError)
+    -> { "hello".ljust(mock('x')) }.should.raise(TypeError)
   end
 
   it "tries to convert padstr to a string using to_str" do
@@ -55,22 +55,22 @@
   end
 
   it "raises a TypeError when padstr can't be converted" do
-    -> { "hello".ljust(20, [])        }.should raise_error(TypeError)
-    -> { "hello".ljust(20, Object.new)}.should raise_error(TypeError)
-    -> { "hello".ljust(20, mock('x')) }.should raise_error(TypeError)
+    -> { "hello".ljust(20, [])        }.should.raise(TypeError)
+    -> { "hello".ljust(20, Object.new)}.should.raise(TypeError)
+    -> { "hello".ljust(20, mock('x')) }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when padstr is empty" do
-    -> { "hello".ljust(10, '') }.should raise_error(ArgumentError)
+    -> { "hello".ljust(10, '') }.should.raise(ArgumentError)
   end
 
   it "returns String instances when called on subclasses" do
-    StringSpecs::MyString.new("").ljust(10).should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").ljust(10).should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").ljust(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
+    StringSpecs::MyString.new("").ljust(10).should.instance_of?(String)
+    StringSpecs::MyString.new("foo").ljust(10).should.instance_of?(String)
+    StringSpecs::MyString.new("foo").ljust(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
 
-    "".ljust(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
-    "foo".ljust(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
+    "".ljust(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
+    "foo".ljust(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
   end
 
   describe "with width" do
@@ -78,7 +78,7 @@
       str = "abc".dup.force_encoding Encoding::IBM437
       result = str.ljust 5
       result.should == "abc  "
-      result.encoding.should equal(Encoding::IBM437)
+      result.encoding.should.equal?(Encoding::IBM437)
     end
   end
 
@@ -87,14 +87,14 @@
       str = "abc".dup.force_encoding Encoding::IBM437
       result = str.ljust 5, "あ"
       result.should == "abcああ"
-      result.encoding.should equal(Encoding::UTF_8)
+      result.encoding.should.equal?(Encoding::UTF_8)
     end
 
     it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
       pat = "ア".encode Encoding::EUC_JP
       -> do
         "あれ".ljust 5, pat
-      end.should raise_error(Encoding::CompatibilityError)
+      end.should.raise(Encoding::CompatibilityError)
     end
   end
 end
diff --git a/spec/ruby/core/string/lstrip_spec.rb b/spec/ruby/core/string/lstrip_spec.rb
index c83650207e2..5896f8d7da6 100644
--- a/spec/ruby/core/string/lstrip_spec.rb
+++ b/spec/ruby/core/string/lstrip_spec.rb
@@ -30,7 +30,7 @@
 describe "String#lstrip!" do
   it "modifies self in place and returns self" do
     a = "  hello  "
-    a.lstrip!.should equal(a)
+    a.lstrip!.should.equal?(a)
     a.should == "hello  "
   end
 
@@ -53,22 +53,22 @@
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "  hello  ".freeze.lstrip! }.should raise_error(FrozenError)
+    -> { "  hello  ".freeze.lstrip! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23657]
   it "raises a FrozenError on a frozen instance that would not be modified" do
-    -> { "hello".freeze.lstrip! }.should raise_error(FrozenError)
-    -> { "".freeze.lstrip!      }.should raise_error(FrozenError)
+    -> { "hello".freeze.lstrip! }.should.raise(FrozenError)
+    -> { "".freeze.lstrip!      }.should.raise(FrozenError)
   end
 
   it "raises an ArgumentError if the first non-space codepoint is invalid" do
     s = "\xDFabc".force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.lstrip! }.should raise_error(ArgumentError)
+    s.valid_encoding?.should == false
+    -> { s.lstrip! }.should.raise(ArgumentError)
 
     s = "   \xDFabc".force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.lstrip! }.should raise_error(ArgumentError)
+    s.valid_encoding?.should == false
+    -> { s.lstrip! }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/match_spec.rb b/spec/ruby/core/string/match_spec.rb
index 5e988f34cae..3ea8d90aa8f 100644
--- a/spec/ruby/core/string/match_spec.rb
+++ b/spec/ruby/core/string/match_spec.rb
@@ -19,8 +19,8 @@
   end
 
   it "raises a TypeError if a obj is a string" do
-    -> { "some string" =~ "another string" }.should raise_error(TypeError)
-    -> { "a" =~ StringSpecs::MyString.new("b")          }.should raise_error(TypeError)
+    -> { "some string" =~ "another string" }.should.raise(TypeError)
+    -> { "a" =~ StringSpecs::MyString.new("b")          }.should.raise(TypeError)
   end
 
   it "invokes obj.=~ with self if obj is neither a string nor regexp" do
@@ -81,7 +81,7 @@
   describe "when passed a block" do
     it "yields the MatchData" do
       "abc".match(/./) {|m| ScratchPad.record m }
-      ScratchPad.recorded.should be_kind_of(MatchData)
+      ScratchPad.recorded.should.is_a?(MatchData)
     end
 
     it "returns the block result" do
@@ -107,9 +107,9 @@ def obj.method_missing(*args) "." end
   end
 
   it "raises a TypeError if pattern is not a regexp or a string" do
-    -> { 'hello'.match(10)   }.should raise_error(TypeError)
+    -> { 'hello'.match(10)   }.should.raise(TypeError)
     not_supported_on :opal do
-      -> { 'hello'.match(:ell) }.should raise_error(TypeError)
+      -> { 'hello'.match(:ell) }.should.raise(TypeError)
     end
   end
 
@@ -137,9 +137,17 @@ def obj.method_missing(*args) "." end
   end
 
   it "calls match on the regular expression" do
-    regexp = /./.dup
-    regexp.should_receive(:match).and_return(:foo)
-    'hello'.match(regexp).should == :foo
+    # Can't use regexp.should_receive(:match).and_return(:foo) since regexps are frozen
+    ScratchPad.clear
+    regexp = Class.new(Regexp) {
+      def match(*args)
+        ScratchPad.record [:match, *args]
+        super(*args)
+      end
+    }.new('.')
+
+    'hello'.match(regexp)
+    ScratchPad.recorded.should == [:match, 'hello']
   end
 end
 
@@ -151,17 +159,17 @@ def obj.method_missing(*args) "." end
 
   context "when matches the given regex" do
     it "returns true but does not set Regexp.last_match" do
-      'string'.match?(/string/i).should be_true
-      Regexp.last_match.should be_nil
+      'string'.match?(/string/i).should == true
+      Regexp.last_match.should == nil
     end
   end
 
   it "returns false when does not match the given regex" do
-    'string'.match?(/STRING/).should be_false
+    'string'.match?(/STRING/).should == false
   end
 
   it "takes matching position as the 2nd argument" do
-    'string'.match?(/str/i, 0).should be_true
-    'string'.match?(/str/i, 1).should be_false
+    'string'.match?(/str/i, 0).should == true
+    'string'.match?(/str/i, 1).should == false
   end
 end
diff --git a/spec/ruby/core/string/modulo_spec.rb b/spec/ruby/core/string/modulo_spec.rb
index 46e0aa0f361..f93ec4bcf8f 100644
--- a/spec/ruby/core/string/modulo_spec.rb
+++ b/spec/ruby/core/string/modulo_spec.rb
@@ -46,13 +46,13 @@
     end
 
     it "raises if a compatible encoding can't be found" do
-      -> { "hello %s".encode("utf-8") % "world".encode("UTF-16LE") }.should raise_error(Encoding::CompatibilityError)
+      -> { "hello %s".encode("utf-8") % "world".encode("UTF-16LE") }.should.raise(Encoding::CompatibilityError)
     end
   end
 
   it "raises an error if single % appears at the end" do
-    -> { ("%" % []) }.should raise_error(ArgumentError)
-    -> { ("foo%" % [])}.should raise_error(ArgumentError)
+    -> { ("%" % []) }.should.raise(ArgumentError)
+    -> { ("foo%" % [])}.should.raise(ArgumentError)
   end
 
   ruby_version_is ""..."3.4" do
@@ -69,18 +69,18 @@
     end
 
     it "raises an error if single % appears anywhere else" do
-      -> { (" % " % []) }.should raise_error(ArgumentError)
-      -> { ("foo%quux" % []) }.should raise_error(ArgumentError)
+      -> { (" % " % []) }.should.raise(ArgumentError)
+      -> { ("foo%quux" % []) }.should.raise(ArgumentError)
     end
 
     it "raises an error if NULL or \\n appear anywhere else in the format string" do
       begin
         old_debug, $DEBUG = $DEBUG, false
 
-        -> { "%.\n3f" % 1.2 }.should raise_error(ArgumentError)
-        -> { "%.3\nf" % 1.2 }.should raise_error(ArgumentError)
-        -> { "%.\03f" % 1.2 }.should raise_error(ArgumentError)
-        -> { "%.3\0f" % 1.2 }.should raise_error(ArgumentError)
+        -> { "%.\n3f" % 1.2 }.should.raise(ArgumentError)
+        -> { "%.3\nf" % 1.2 }.should.raise(ArgumentError)
+        -> { "%.\03f" % 1.2 }.should.raise(ArgumentError)
+        -> { "%.3\0f" % 1.2 }.should.raise(ArgumentError)
       ensure
         $DEBUG = old_debug
       end
@@ -89,14 +89,14 @@
 
   ruby_version_is "3.4" do
     it "raises an ArgumentError if % is not followed by a conversion specifier" do
-      -> { "%" % [] }.should raise_error(ArgumentError)
-      -> { "%\n" % [] }.should raise_error(ArgumentError)
-      -> { "%\0" % [] }.should raise_error(ArgumentError)
-      -> { " % " % [] }.should raise_error(ArgumentError)
-      -> { "%.\n3f" % 1.2 }.should raise_error(ArgumentError)
-      -> { "%.3\nf" % 1.2 }.should raise_error(ArgumentError)
-      -> { "%.\03f" % 1.2 }.should raise_error(ArgumentError)
-      -> { "%.3\0f" % 1.2 }.should raise_error(ArgumentError)
+      -> { "%" % [] }.should.raise(ArgumentError)
+      -> { "%\n" % [] }.should.raise(ArgumentError)
+      -> { "%\0" % [] }.should.raise(ArgumentError)
+      -> { " % " % [] }.should.raise(ArgumentError)
+      -> { "%.\n3f" % 1.2 }.should.raise(ArgumentError)
+      -> { "%.3\nf" % 1.2 }.should.raise(ArgumentError)
+      -> { "%.\03f" % 1.2 }.should.raise(ArgumentError)
+      -> { "%.3\0f" % 1.2 }.should.raise(ArgumentError)
     end
   end
 
@@ -119,8 +119,8 @@
       s = $stderr
       $stderr = IOStub.new
 
-      -> { "" % [1, 2, 3]   }.should raise_error(ArgumentError)
-      -> { "%s" % [1, 2, 3] }.should raise_error(ArgumentError)
+      -> { "" % [1, 2, 3]   }.should.raise(ArgumentError)
+      -> { "%s" % [1, 2, 3] }.should.raise(ArgumentError)
     ensure
       $DEBUG = old_debug
       $stderr = s
@@ -148,26 +148,26 @@
 
   ruby_version_is "3.4" do
     it "raises an ArgumentError if absolute argument specifier is followed by a conversion specifier" do
-      -> { "hello %1$" % "foo" }.should raise_error(ArgumentError)
+      -> { "hello %1$" % "foo" }.should.raise(ArgumentError)
     end
   end
 
   it "raises an ArgumentError when given invalid argument specifiers" do
-    -> { "%1" % [] }.should raise_error(ArgumentError)
-    -> { "%+" % [] }.should raise_error(ArgumentError)
-    -> { "%-" % [] }.should raise_error(ArgumentError)
-    -> { "%#" % [] }.should raise_error(ArgumentError)
-    -> { "%0" % [] }.should raise_error(ArgumentError)
-    -> { "%*" % [] }.should raise_error(ArgumentError)
-    -> { "%." % [] }.should raise_error(ArgumentError)
-    -> { "%_" % [] }.should raise_error(ArgumentError)
-    -> { "%0$s" % "x"              }.should raise_error(ArgumentError)
-    -> { "%*0$s" % [5, "x"]        }.should raise_error(ArgumentError)
-    -> { "%*1$.*0$1$s" % [1, 2, 3] }.should raise_error(ArgumentError)
+    -> { "%1" % [] }.should.raise(ArgumentError)
+    -> { "%+" % [] }.should.raise(ArgumentError)
+    -> { "%-" % [] }.should.raise(ArgumentError)
+    -> { "%#" % [] }.should.raise(ArgumentError)
+    -> { "%0" % [] }.should.raise(ArgumentError)
+    -> { "%*" % [] }.should.raise(ArgumentError)
+    -> { "%." % [] }.should.raise(ArgumentError)
+    -> { "%_" % [] }.should.raise(ArgumentError)
+    -> { "%0$s" % "x"              }.should.raise(ArgumentError)
+    -> { "%*0$s" % [5, "x"]        }.should.raise(ArgumentError)
+    -> { "%*1$.*0$1$s" % [1, 2, 3] }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when multiple positional argument tokens are given for one format specifier" do
-    -> { "%1$1$s" % "foo" }.should raise_error(ArgumentError)
+    -> { "%1$1$s" % "foo" }.should.raise(ArgumentError)
   end
 
   it "respects positional arguments and precision tokens given for one format specifier" do
@@ -183,36 +183,36 @@
   end
 
   it "raises an ArgumentError when multiple width star tokens are given for one format specifier" do
-    -> { "%**s" % [5, 5, 5] }.should raise_error(ArgumentError)
+    -> { "%**s" % [5, 5, 5] }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when a width star token is seen after a width token" do
-    -> { "%5*s" % [5, 5] }.should raise_error(ArgumentError)
+    -> { "%5*s" % [5, 5] }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when multiple precision tokens are given" do
-    -> { "%.5.5s" % 5      }.should raise_error(ArgumentError)
-    -> { "%.5.*s" % [5, 5] }.should raise_error(ArgumentError)
-    -> { "%.*.5s" % [5, 5] }.should raise_error(ArgumentError)
+    -> { "%.5.5s" % 5      }.should.raise(ArgumentError)
+    -> { "%.5.*s" % [5, 5] }.should.raise(ArgumentError)
+    -> { "%.*.5s" % [5, 5] }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when there are less arguments than format specifiers" do
     ("foo" % []).should == "foo"
-    -> { "%s" % []     }.should raise_error(ArgumentError)
-    -> { "%s %s" % [1] }.should raise_error(ArgumentError)
+    -> { "%s" % []     }.should.raise(ArgumentError)
+    -> { "%s %s" % [1] }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when absolute and relative argument numbers are mixed" do
-    -> { "%s %1$s" % "foo" }.should raise_error(ArgumentError)
-    -> { "%1$s %s" % "foo" }.should raise_error(ArgumentError)
+    -> { "%s %1$s" % "foo" }.should.raise(ArgumentError)
+    -> { "%1$s %s" % "foo" }.should.raise(ArgumentError)
 
-    -> { "%s %2$s" % ["foo", "bar"] }.should raise_error(ArgumentError)
-    -> { "%2$s %s" % ["foo", "bar"] }.should raise_error(ArgumentError)
+    -> { "%s %2$s" % ["foo", "bar"] }.should.raise(ArgumentError)
+    -> { "%2$s %s" % ["foo", "bar"] }.should.raise(ArgumentError)
 
-    -> { "%*2$s" % [5, 5, 5]     }.should raise_error(ArgumentError)
-    -> { "%*.*2$s" % [5, 5, 5]   }.should raise_error(ArgumentError)
-    -> { "%*2$.*2$s" % [5, 5, 5] }.should raise_error(ArgumentError)
-    -> { "%*.*2$s" % [5, 5, 5]   }.should raise_error(ArgumentError)
+    -> { "%*2$s" % [5, 5, 5]     }.should.raise(ArgumentError)
+    -> { "%*.*2$s" % [5, 5, 5]   }.should.raise(ArgumentError)
+    -> { "%*2$.*2$s" % [5, 5, 5] }.should.raise(ArgumentError)
+    -> { "%*.*2$s" % [5, 5, 5]   }.should.raise(ArgumentError)
   end
 
   it "allows reuse of the one argument multiple via absolute argument numbers" do
@@ -221,13 +221,13 @@
   end
 
   it "always interprets an array argument as a list of argument parameters" do
-    -> { "%p" % [] }.should raise_error(ArgumentError)
+    -> { "%p" % [] }.should.raise(ArgumentError)
     ("%p" % [1]).should == "1"
     ("%p %p" % [1, 2]).should == "1 2"
   end
 
   it "always interprets an array subclass argument as a list of argument parameters" do
-    -> { "%p" % StringSpecs::MyArray[] }.should raise_error(ArgumentError)
+    -> { "%p" % StringSpecs::MyArray[] }.should.raise(ArgumentError)
     ("%p" % StringSpecs::MyArray[1]).should == "1"
     ("%p %p" % StringSpecs::MyArray[1, 2]).should == "1 2"
   end
@@ -298,7 +298,7 @@
     x = mock("string modulo to_ary")
     x.should_receive(:to_ary).and_return("x")
 
-    -> { "%s" % x }.should raise_error(TypeError)
+    -> { "%s" % x }.should.raise(TypeError)
   end
 
   it "tries to convert the argument to Array by calling #to_ary" do
@@ -321,7 +321,7 @@ def universal.to_f() 0.0 end
       "%f", "%g", "%G", "%i", "%o", "%p",
       "%s", "%u", "%x", "%X"
     ].each do |format|
-      (StringSpecs::MyString.new(format) % universal).should be_an_instance_of(String)
+      (StringSpecs::MyString.new(format) % universal).should.instance_of?(String)
     end
   end
 
@@ -384,7 +384,7 @@ def universal.to_f() 0.0 end
     ("%*c" % [10, 3]).should == "         \003"
     ("%c" % 42).should == "*"
 
-    -> { "%c" % Object }.should raise_error(TypeError)
+    -> { "%c" % Object }.should.raise(TypeError)
   end
 
   it "supports single character strings as argument for %c" do
@@ -610,7 +610,7 @@ def obj.to_s() "obj" end
   # See http://groups.google.com/group/ruby-core-google/t/c285c18cd94c216d
   it "raises an ArgumentError for huge precisions for %s" do
     block = -> { "%.25555555555555555555555555555555555555s" % "hello world" }
-    block.should raise_error(ArgumentError)
+    block.should.raise(ArgumentError)
   end
 
   # Note: %u has been changed to an alias for %d in 1.9.
@@ -705,16 +705,16 @@ def obj.to_s() "obj" end
       -> {
         # see [ruby-core:14139] for more details
         (format % "0777").should == (format % Kernel.Integer("0777"))
-      }.should_not raise_error(ArgumentError)
+      }.should_not.raise(ArgumentError)
 
-      -> { format % "0__7_7_7" }.should raise_error(ArgumentError)
+      -> { format % "0__7_7_7" }.should.raise(ArgumentError)
 
-      -> { format % "" }.should raise_error(ArgumentError)
-      -> { format % "x" }.should raise_error(ArgumentError)
-      -> { format % "5x" }.should raise_error(ArgumentError)
-      -> { format % "08" }.should raise_error(ArgumentError)
-      -> { format % "0b2" }.should raise_error(ArgumentError)
-      -> { format % "123__456" }.should raise_error(ArgumentError)
+      -> { format % "" }.should.raise(ArgumentError)
+      -> { format % "x" }.should.raise(ArgumentError)
+      -> { format % "5x" }.should.raise(ArgumentError)
+      -> { format % "08" }.should.raise(ArgumentError)
+      -> { format % "0b2" }.should.raise(ArgumentError)
+      -> { format % "123__456" }.should.raise(ArgumentError)
 
       obj = mock('5')
       obj.should_receive(:to_i).and_return(5)
@@ -752,14 +752,14 @@ def obj.to_s() "obj" end
 
       (format % "0777").should == (format % 777)
 
-      -> { format % "" }.should raise_error(ArgumentError)
-      -> { format % "x" }.should raise_error(ArgumentError)
-      -> { format % "." }.should raise_error(ArgumentError)
-      -> { format % "5x" }.should raise_error(ArgumentError)
-      -> { format % "0b1" }.should raise_error(ArgumentError)
-      -> { format % "10e10.5" }.should raise_error(ArgumentError)
-      -> { format % "10__10" }.should raise_error(ArgumentError)
-      -> { format % "10.10__10" }.should raise_error(ArgumentError)
+      -> { format % "" }.should.raise(ArgumentError)
+      -> { format % "x" }.should.raise(ArgumentError)
+      -> { format % "." }.should.raise(ArgumentError)
+      -> { format % "5x" }.should.raise(ArgumentError)
+      -> { format % "0b1" }.should.raise(ArgumentError)
+      -> { format % "10e10.5" }.should.raise(ArgumentError)
+      -> { format % "10__10" }.should.raise(ArgumentError)
+      -> { format % "10.10__10" }.should.raise(ArgumentError)
 
       obj = mock('5.0')
       obj.should_receive(:to_f).and_return(5.0)
@@ -777,7 +777,7 @@ def obj.to_s() "obj" end
     end
 
     it "should raise ArgumentError if no hash given" do
-      -> {"%{foo}" % []}.should raise_error(ArgumentError)
+      -> {"%{foo}" % []}.should.raise(ArgumentError)
     end
   end
 
@@ -787,11 +787,11 @@ def obj.to_s() "obj" end
     end
 
     it "raises KeyError if key is missing from passed-in hash" do
-      -> {"%<foo>d" % {}}.should raise_error(KeyError)
+      -> {"%<foo>d" % {}}.should.raise(KeyError)
     end
 
     it "should raise ArgumentError if no hash given" do
-      -> {"%<foo>" % []}.should raise_error(ArgumentError)
+      -> {"%<foo>" % []}.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/string/new_spec.rb b/spec/ruby/core/string/new_spec.rb
index ca678f53238..aadf1e0e467 100644
--- a/spec/ruby/core/string/new_spec.rb
+++ b/spec/ruby/core/string/new_spec.rb
@@ -4,7 +4,7 @@
 describe "String.new" do
   it "returns an instance of String" do
     str = String.new
-    str.should be_an_instance_of(String)
+    str.should.instance_of?(String)
   end
 
   it "accepts an encoding argument" do
@@ -28,7 +28,7 @@
   it "returns a new string given a string argument" do
     str1 = "test"
     str = String.new(str1)
-    str.should be_an_instance_of(String)
+    str.should.instance_of?(String)
     str.should == str1
     str << "more"
     str.should == "testmore"
@@ -36,7 +36,7 @@
 
   it "returns an instance of a subclass" do
     a = StringSpecs::MyString.new("blah")
-    a.should be_an_instance_of(StringSpecs::MyString)
+    a.should.instance_of?(StringSpecs::MyString)
     a.should == "blah"
   end
 
@@ -51,8 +51,8 @@
   end
 
   it "raises TypeError on inconvertible object" do
-    -> { String.new 5 }.should raise_error(TypeError)
-    -> { String.new nil }.should raise_error(TypeError)
+    -> { String.new 5 }.should.raise(TypeError)
+    -> { String.new nil }.should.raise(TypeError)
   end
 
   it "returns a binary String" do
diff --git a/spec/ruby/core/string/ord_spec.rb b/spec/ruby/core/string/ord_spec.rb
index 35af3b5458e..5a17fc1d873 100644
--- a/spec/ruby/core/string/ord_spec.rb
+++ b/spec/ruby/core/string/ord_spec.rb
@@ -2,7 +2,7 @@
 
 describe "String#ord" do
   it "returns an Integer" do
-    'a'.ord.should be_an_instance_of(Integer)
+    'a'.ord.should.instance_of?(Integer)
   end
 
   it "returns the codepoint of the first character in the String" do
@@ -23,11 +23,11 @@
   end
 
   it "raises an ArgumentError if called on an empty String" do
-    -> { ''.ord }.should raise_error(ArgumentError)
+    -> { ''.ord }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the character is broken" do
     s = "©".dup.force_encoding("US-ASCII")
-    -> { s.ord }.should raise_error(ArgumentError, "invalid byte sequence in US-ASCII")
+    -> { s.ord }.should.raise(ArgumentError, "invalid byte sequence in US-ASCII")
   end
 end
diff --git a/spec/ruby/core/string/partition_spec.rb b/spec/ruby/core/string/partition_spec.rb
index d5370dcc735..29fe910b39b 100644
--- a/spec/ruby/core/string/partition_spec.rb
+++ b/spec/ruby/core/string/partition_spec.rb
@@ -31,8 +31,8 @@
   end
 
   it "raises an error if not convertible to string" do
-    ->{ "hello".partition(5) }.should raise_error(TypeError)
-    ->{ "hello".partition(nil) }.should raise_error(TypeError)
+    ->{ "hello".partition(5) }.should.raise(TypeError)
+    ->{ "hello".partition(nil) }.should.raise(TypeError)
   end
 
   it "takes precedence over a given block" do
diff --git a/spec/ruby/core/string/plus_spec.rb b/spec/ruby/core/string/plus_spec.rb
index 9da17451c69..0464141c378 100644
--- a/spec/ruby/core/string/plus_spec.rb
+++ b/spec/ruby/core/string/plus_spec.rb
@@ -21,17 +21,17 @@
   end
 
   it "raises a TypeError when given any object that fails #to_str" do
-    -> { "" + Object.new }.should raise_error(TypeError)
-    -> { "" + 65 }.should raise_error(TypeError)
+    -> { "" + Object.new }.should.raise(TypeError)
+    -> { "" + 65 }.should.raise(TypeError)
   end
 
   it "doesn't return subclass instances" do
-    (StringSpecs::MyString.new("hello") + "").should be_an_instance_of(String)
-    (StringSpecs::MyString.new("hello") + "foo").should be_an_instance_of(String)
-    (StringSpecs::MyString.new("hello") + StringSpecs::MyString.new("foo")).should be_an_instance_of(String)
-    (StringSpecs::MyString.new("hello") + StringSpecs::MyString.new("")).should be_an_instance_of(String)
-    (StringSpecs::MyString.new("") + StringSpecs::MyString.new("")).should be_an_instance_of(String)
-    ("hello" + StringSpecs::MyString.new("foo")).should be_an_instance_of(String)
-    ("hello" + StringSpecs::MyString.new("")).should be_an_instance_of(String)
+    (StringSpecs::MyString.new("hello") + "").should.instance_of?(String)
+    (StringSpecs::MyString.new("hello") + "foo").should.instance_of?(String)
+    (StringSpecs::MyString.new("hello") + StringSpecs::MyString.new("foo")).should.instance_of?(String)
+    (StringSpecs::MyString.new("hello") + StringSpecs::MyString.new("")).should.instance_of?(String)
+    (StringSpecs::MyString.new("") + StringSpecs::MyString.new("")).should.instance_of?(String)
+    ("hello" + StringSpecs::MyString.new("foo")).should.instance_of?(String)
+    ("hello" + StringSpecs::MyString.new("")).should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/core/string/prepend_spec.rb b/spec/ruby/core/string/prepend_spec.rb
index 5248ea8056b..a8da4e62cbb 100644
--- a/spec/ruby/core/string/prepend_spec.rb
+++ b/spec/ruby/core/string/prepend_spec.rb
@@ -5,7 +5,7 @@
 describe "String#prepend" do
   it "prepends the given argument to self and returns self" do
     str = "world"
-    str.prepend("hello ").should equal(str)
+    str.prepend("hello ").should.equal?(str)
     str.should == "hello world"
   end
 
@@ -17,16 +17,16 @@
   end
 
   it "raises a TypeError if the given argument can't be converted to a String" do
-    -> { "hello ".prepend [] }.should raise_error(TypeError)
-    -> { 'hello '.prepend mock('x') }.should raise_error(TypeError)
+    -> { "hello ".prepend [] }.should.raise(TypeError)
+    -> { 'hello '.prepend mock('x') }.should.raise(TypeError)
   end
 
   it "raises a FrozenError when self is frozen" do
     a = "hello"
     a.freeze
 
-    -> { a.prepend "" }.should raise_error(FrozenError)
-    -> { a.prepend "test" }.should raise_error(FrozenError)
+    -> { a.prepend "" }.should.raise(FrozenError)
+    -> { a.prepend "test" }.should.raise(FrozenError)
   end
 
   it "works when given a subclass instance" do
@@ -49,7 +49,7 @@
 
   it "returns self when given no arguments" do
     str = "hello"
-    str.prepend.should equal(str)
+    str.prepend.should.equal?(str)
     str.should == "hello"
   end
 end
diff --git a/spec/ruby/core/string/reverse_spec.rb b/spec/ruby/core/string/reverse_spec.rb
index aa6abe6036e..e37c1125db7 100644
--- a/spec/ruby/core/string/reverse_spec.rb
+++ b/spec/ruby/core/string/reverse_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("stressed").reverse.should be_an_instance_of(String)
-    StringSpecs::MyString.new("m").reverse.should be_an_instance_of(String)
-    StringSpecs::MyString.new("").reverse.should be_an_instance_of(String)
+    StringSpecs::MyString.new("stressed").reverse.should.instance_of?(String)
+    StringSpecs::MyString.new("m").reverse.should.instance_of?(String)
+    StringSpecs::MyString.new("").reverse.should.instance_of?(String)
   end
 
   it "reverses a string with multi byte characters" do
@@ -24,7 +24,7 @@
   it "works with a broken string" do
     str = "微軟\xDF\xDE正黑體".force_encoding(Encoding::UTF_8)
 
-    str.valid_encoding?.should be_false
+    str.valid_encoding?.should == false
 
     str.reverse.should == "體黑正\xDE\xDF軟微"
   end
@@ -37,20 +37,20 @@
 describe "String#reverse!" do
   it "reverses self in place and always returns self" do
     a = "stressed"
-    a.reverse!.should equal(a)
+    a.reverse!.should.equal?(a)
     a.should == "desserts"
 
     "".reverse!.should == ""
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "anna".freeze.reverse!  }.should raise_error(FrozenError)
-    -> { "hello".freeze.reverse! }.should raise_error(FrozenError)
+    -> { "anna".freeze.reverse!  }.should.raise(FrozenError)
+    -> { "hello".freeze.reverse! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError on a frozen instance that would not be modified" do
-    -> { "".freeze.reverse! }.should raise_error(FrozenError)
+    -> { "".freeze.reverse! }.should.raise(FrozenError)
   end
 
   it "reverses a string with multi byte characters" do
@@ -62,7 +62,7 @@
   it "works with a broken string" do
     str = "微軟\xDF\xDE正黑體".force_encoding(Encoding::UTF_8)
 
-    str.valid_encoding?.should be_false
+    str.valid_encoding?.should == false
     str.reverse!
 
     str.should == "體黑正\xDE\xDF軟微"
diff --git a/spec/ruby/core/string/rindex_spec.rb b/spec/ruby/core/string/rindex_spec.rb
index 0863a9c3bed..acecec224f4 100644
--- a/spec/ruby/core/string/rindex_spec.rb
+++ b/spec/ruby/core/string/rindex_spec.rb
@@ -5,19 +5,19 @@
 describe "String#rindex with object" do
   it "raises a TypeError if obj isn't a String or Regexp" do
     not_supported_on :opal do
-      -> { "hello".rindex(:sym) }.should raise_error(TypeError)
+      -> { "hello".rindex(:sym) }.should.raise(TypeError)
     end
-    -> { "hello".rindex(mock('x')) }.should raise_error(TypeError)
+    -> { "hello".rindex(mock('x')) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if obj is an Integer" do
-    -> { "hello".rindex(42) }.should raise_error(TypeError)
+    -> { "hello".rindex(42) }.should.raise(TypeError)
   end
 
   it "doesn't try to convert obj to an integer via to_int" do
     obj = mock('x')
     obj.should_not_receive(:to_int)
-    -> { "hello".rindex(obj) }.should raise_error(TypeError)
+    -> { "hello".rindex(obj) }.should.raise(TypeError)
   end
 
   it "tries to convert obj to a string via to_str" do
@@ -193,7 +193,7 @@ def obj.method_missing(*args) 5 end
   end
 
   it "raises a TypeError when given offset is nil" do
-    -> { "str".rindex("st", nil) }.should raise_error(TypeError)
+    -> { "str".rindex("st", nil) }.should.raise(TypeError)
   end
 
   it "handles a substring in a superset encoding" do
@@ -208,7 +208,7 @@ def obj.method_missing(*args) 5 end
     str = 'abc'.dup.force_encoding("ISO-2022-JP")
     pattern = 'b'.dup.force_encoding("EUC-JP")
 
-    -> { str.rindex(pattern) }.should raise_error(Encoding::CompatibilityError, "incompatible character encodings: ISO-2022-JP and EUC-JP")
+    -> { str.rindex(pattern) }.should.raise(Encoding::CompatibilityError, "incompatible character encodings: ISO-2022-JP and EUC-JP")
   end
 end
 
@@ -362,7 +362,7 @@ def obj.method_missing(*args); 5; end
   end
 
   it "raises a TypeError when given offset is nil" do
-    -> { "str".rindex(/../, nil) }.should raise_error(TypeError)
+    -> { "str".rindex(/../, nil) }.should.raise(TypeError)
   end
 
   it "returns the reverse character index of a multibyte character" do
@@ -379,6 +379,6 @@ def obj.method_missing(*args); 5; end
     re = Regexp.new "れ".encode(Encoding::EUC_JP)
     -> do
       "あれ".rindex re
-    end.should raise_error(Encoding::CompatibilityError, "incompatible encoding regexp match (EUC-JP regexp with UTF-8 string)")
+    end.should.raise(Encoding::CompatibilityError, "incompatible encoding regexp match (EUC-JP regexp with UTF-8 string)")
   end
 end
diff --git a/spec/ruby/core/string/rjust_spec.rb b/spec/ruby/core/string/rjust_spec.rb
index 4ad3e54aea2..9f9c369745e 100644
--- a/spec/ruby/core/string/rjust_spec.rb
+++ b/spec/ruby/core/string/rjust_spec.rb
@@ -41,10 +41,10 @@
   end
 
   it "raises a TypeError when length can't be converted to an integer" do
-    -> { "hello".rjust("x")       }.should raise_error(TypeError)
-    -> { "hello".rjust("x", "y")  }.should raise_error(TypeError)
-    -> { "hello".rjust([])        }.should raise_error(TypeError)
-    -> { "hello".rjust(mock('x')) }.should raise_error(TypeError)
+    -> { "hello".rjust("x")       }.should.raise(TypeError)
+    -> { "hello".rjust("x", "y")  }.should.raise(TypeError)
+    -> { "hello".rjust([])        }.should.raise(TypeError)
+    -> { "hello".rjust(mock('x')) }.should.raise(TypeError)
   end
 
   it "tries to convert padstr to a string using to_str" do
@@ -55,22 +55,22 @@
   end
 
   it "raises a TypeError when padstr can't be converted" do
-    -> { "hello".rjust(20, [])        }.should raise_error(TypeError)
-    -> { "hello".rjust(20, Object.new)}.should raise_error(TypeError)
-    -> { "hello".rjust(20, mock('x')) }.should raise_error(TypeError)
+    -> { "hello".rjust(20, [])        }.should.raise(TypeError)
+    -> { "hello".rjust(20, Object.new)}.should.raise(TypeError)
+    -> { "hello".rjust(20, mock('x')) }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when padstr is empty" do
-    -> { "hello".rjust(10, '') }.should raise_error(ArgumentError)
+    -> { "hello".rjust(10, '') }.should.raise(ArgumentError)
   end
 
   it "returns String instances when called on subclasses" do
-    StringSpecs::MyString.new("").rjust(10).should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").rjust(10).should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").rjust(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
+    StringSpecs::MyString.new("").rjust(10).should.instance_of?(String)
+    StringSpecs::MyString.new("foo").rjust(10).should.instance_of?(String)
+    StringSpecs::MyString.new("foo").rjust(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
 
-    "".rjust(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
-    "foo".rjust(10, StringSpecs::MyString.new("x")).should be_an_instance_of(String)
+    "".rjust(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
+    "foo".rjust(10, StringSpecs::MyString.new("x")).should.instance_of?(String)
   end
 
   describe "with width" do
@@ -78,7 +78,7 @@
       str = "abc".dup.force_encoding Encoding::IBM437
       result = str.rjust 5
       result.should == "  abc"
-      result.encoding.should equal(Encoding::IBM437)
+      result.encoding.should.equal?(Encoding::IBM437)
     end
   end
 
@@ -87,14 +87,14 @@
       str = "abc".dup.force_encoding Encoding::IBM437
       result = str.rjust 5, "あ"
       result.should == "ああabc"
-      result.encoding.should equal(Encoding::UTF_8)
+      result.encoding.should.equal?(Encoding::UTF_8)
     end
 
     it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
       pat = "ア".encode Encoding::EUC_JP
       -> do
         "あれ".rjust 5, pat
-      end.should raise_error(Encoding::CompatibilityError)
+      end.should.raise(Encoding::CompatibilityError)
     end
   end
 end
diff --git a/spec/ruby/core/string/rpartition_spec.rb b/spec/ruby/core/string/rpartition_spec.rb
index cef0384c739..a7dd7430b73 100644
--- a/spec/ruby/core/string/rpartition_spec.rb
+++ b/spec/ruby/core/string/rpartition_spec.rb
@@ -43,8 +43,8 @@
   end
 
   it "raises an error if not convertible to string" do
-    ->{ "hello".rpartition(5) }.should raise_error(TypeError)
-    ->{ "hello".rpartition(nil) }.should raise_error(TypeError)
+    ->{ "hello".rpartition(5) }.should.raise(TypeError)
+    ->{ "hello".rpartition(nil) }.should.raise(TypeError)
   end
 
   it "handles a pattern in a superset encoding" do
diff --git a/spec/ruby/core/string/rstrip_spec.rb b/spec/ruby/core/string/rstrip_spec.rb
index 55773f52380..1638ea375d9 100644
--- a/spec/ruby/core/string/rstrip_spec.rb
+++ b/spec/ruby/core/string/rstrip_spec.rb
@@ -30,7 +30,7 @@
 describe "String#rstrip!" do
   it "modifies self in place and returns self" do
     a = "  hello  "
-    a.rstrip!.should equal(a)
+    a.rstrip!.should.equal?(a)
     a.should == "  hello"
   end
 
@@ -59,22 +59,22 @@
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "  hello  ".freeze.rstrip! }.should raise_error(FrozenError)
+    -> { "  hello  ".freeze.rstrip! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError on a frozen instance that would not be modified" do
-    -> { "hello".freeze.rstrip! }.should raise_error(FrozenError)
-    -> { "".freeze.rstrip!      }.should raise_error(FrozenError)
+    -> { "hello".freeze.rstrip! }.should.raise(FrozenError)
+    -> { "".freeze.rstrip!      }.should.raise(FrozenError)
   end
 
   it "raises an Encoding::CompatibilityError if the last non-space codepoint is invalid" do
     s = "abc\xDF".force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.rstrip! }.should raise_error(Encoding::CompatibilityError)
+    s.valid_encoding?.should == false
+    -> { s.rstrip! }.should.raise(Encoding::CompatibilityError)
 
     s = "abc\xDF   ".force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.rstrip! }.should raise_error(Encoding::CompatibilityError)
+    s.valid_encoding?.should == false
+    -> { s.rstrip! }.should.raise(Encoding::CompatibilityError)
   end
 end
diff --git a/spec/ruby/core/string/scan_spec.rb b/spec/ruby/core/string/scan_spec.rb
index bbe843b591d..47fa7214c24 100644
--- a/spec/ruby/core/string/scan_spec.rb
+++ b/spec/ruby/core/string/scan_spec.rb
@@ -58,11 +58,11 @@
   end
 
   it "raises a TypeError if pattern isn't a Regexp and can't be converted to a String" do
-    -> { "cruel world".scan(5)         }.should raise_error(TypeError)
+    -> { "cruel world".scan(5)         }.should.raise(TypeError)
     not_supported_on :opal do
-      -> { "cruel world".scan(:test)   }.should raise_error(TypeError)
+      -> { "cruel world".scan(:test)   }.should.raise(TypeError)
     end
-    -> { "cruel world".scan(mock('x')) }.should raise_error(TypeError)
+    -> { "cruel world".scan(mock('x')) }.should.raise(TypeError)
   end
 
   # jruby/jruby#5513
@@ -80,8 +80,8 @@
 describe "String#scan with pattern and block" do
   it "returns self" do
     s = "foo"
-    s.scan(/./) {}.should equal(s)
-    s.scan(/roar/) {}.should equal(s)
+    s.scan(/./) {}.should.equal?(s)
+    s.scan(/roar/) {}.should.equal?(s)
   end
 
   it "passes each match to the block as one argument: an array" do
diff --git a/spec/ruby/core/string/scrub_spec.rb b/spec/ruby/core/string/scrub_spec.rb
index b9ef0f1a16e..9dc55dbef7f 100644
--- a/spec/ruby/core/string/scrub_spec.rb
+++ b/spec/ruby/core/string/scrub_spec.rb
@@ -38,9 +38,9 @@
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("foo").scrub.should be_an_instance_of(String)
+    StringSpecs::MyString.new("foo").scrub.should.instance_of?(String)
     input = [0x81].pack('C').force_encoding('utf-8')
-    StringSpecs::MyString.new(input).scrub.should be_an_instance_of(String)
+    StringSpecs::MyString.new(input).scrub.should.instance_of?(String)
   end
 end
 
@@ -75,7 +75,7 @@
     xE4 = [0xE4].pack('C').force_encoding('utf-8')
     block = -> { "foo#{x81}".scrub(xE4) }
 
-    block.should raise_error(ArgumentError)
+    block.should.raise(ArgumentError)
   end
 
   it "returns a String in the same encoding as self" do
@@ -87,13 +87,13 @@
     x81 = [0x81].pack('C').force_encoding('utf-8')
     block = -> { "foo#{x81}".scrub(1) }
 
-    block.should raise_error(TypeError)
+    block.should.raise(TypeError)
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("foo").scrub("*").should be_an_instance_of(String)
+    StringSpecs::MyString.new("foo").scrub("*").should.instance_of?(String)
     input = [0x81].pack('C').force_encoding('utf-8')
-    StringSpecs::MyString.new(input).scrub("*").should be_an_instance_of(String)
+    StringSpecs::MyString.new(input).scrub("*").should.instance_of?(String)
   end
 end
 
@@ -121,9 +121,9 @@
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("foo").scrub { |b| "*" }.should be_an_instance_of(String)
+    StringSpecs::MyString.new("foo").scrub { |b| "*" }.should.instance_of?(String)
     input = [0x81].pack('C').force_encoding('utf-8')
-    StringSpecs::MyString.new(input).scrub { |b| "<#{b.unpack("H*")[0]}>" }.should be_an_instance_of(String)
+    StringSpecs::MyString.new(input).scrub { |b| "<#{b.unpack("H*")[0]}>" }.should.instance_of?(String)
   end
 end
 
@@ -146,7 +146,7 @@
     input = "a"
     input.freeze
     input.scrub!
-    input.frozen?.should be_true
+    input.frozen?.should == true
   end
 
   it "preserves the instance variables of already valid strings" do
diff --git a/spec/ruby/core/string/setbyte_spec.rb b/spec/ruby/core/string/setbyte_spec.rb
index 85403ca62c6..d9fcc279c02 100644
--- a/spec/ruby/core/string/setbyte_spec.rb
+++ b/spec/ruby/core/string/setbyte_spec.rb
@@ -4,7 +4,7 @@
 
 describe "String#setbyte" do
   it "returns an Integer" do
-    "a".setbyte(0,1).should be_kind_of(Integer)
+    "a".setbyte(0,1).should.is_a?(Integer)
   end
 
   it "modifies the receiver" do
@@ -34,9 +34,9 @@
 
   it "can invalidate a String's encoding" do
     str = "glark"
-    str.valid_encoding?.should be_true
+    str.valid_encoding?.should == true
     str.setbyte(2,253)
-    str.valid_encoding?.should be_false
+    str.valid_encoding?.should == false
 
     str = "ABC"
     str.setbyte(0, 0x20) # ' '
@@ -58,11 +58,11 @@
   end
 
   it "raises an IndexError if the index is greater than the String bytesize" do
-    -> { "?".setbyte(1, 97) }.should raise_error(IndexError)
+    -> { "?".setbyte(1, 97) }.should.raise(IndexError)
   end
 
   it "raises an IndexError if the negative index is greater magnitude than the String bytesize" do
-    -> { "???".setbyte(-5, 97) }.should raise_error(IndexError)
+    -> { "???".setbyte(-5, 97) }.should.raise(IndexError)
   end
 
   it "sets a byte at an index greater than String size" do
@@ -84,12 +84,12 @@
 
   it "raises a FrozenError if self is frozen" do
     str = "cold".freeze
-    str.frozen?.should be_true
-    -> { str.setbyte(3,96) }.should raise_error(FrozenError)
+    str.frozen?.should == true
+    -> { str.setbyte(3,96) }.should.raise(FrozenError)
   end
 
   it "raises a TypeError unless the second argument is an Integer" do
-    -> { "a".setbyte(0,'a') }.should raise_error(TypeError)
+    -> { "a".setbyte(0,'a') }.should.raise(TypeError)
   end
 
   it "calls #to_int to convert the index" do
diff --git a/spec/ruby/core/string/shared/byte_index_common.rb b/spec/ruby/core/string/shared/byte_index_common.rb
index 3de1453f4f9..bae6cff49f9 100644
--- a/spec/ruby/core/string/shared/byte_index_common.rb
+++ b/spec/ruby/core/string/shared/byte_index_common.rb
@@ -4,43 +4,43 @@
 describe :byte_index_common, shared: true do
   describe "raises on type errors" do
     it "raises a TypeError if passed nil" do
-      -> { "abc".send(@method, nil) }.should raise_error(TypeError, "no implicit conversion of nil into String")
+      -> { "abc".send(@method, nil) }.should.raise(TypeError, "no implicit conversion of nil into String")
     end
 
     it "raises a TypeError if passed a boolean" do
-      -> { "abc".send(@method, true) }.should raise_error(TypeError, "no implicit conversion of true into String")
+      -> { "abc".send(@method, true) }.should.raise(TypeError, "no implicit conversion of true into String")
     end
 
     it "raises a TypeError if passed a Symbol" do
       not_supported_on :opal do
-        -> { "abc".send(@method, :a) }.should raise_error(TypeError, "no implicit conversion of Symbol into String")
+        -> { "abc".send(@method, :a) }.should.raise(TypeError, "no implicit conversion of Symbol into String")
       end
     end
 
     it "raises a TypeError if passed a Symbol" do
       obj = mock('x')
       obj.should_not_receive(:to_int)
-      -> { "hello".send(@method, obj) }.should raise_error(TypeError, "no implicit conversion of MockObject into String")
+      -> { "hello".send(@method, obj) }.should.raise(TypeError, "no implicit conversion of MockObject into String")
     end
 
     it "raises a TypeError if passed an Integer" do
-      -> { "abc".send(@method, 97) }.should raise_error(TypeError, "no implicit conversion of Integer into String")
+      -> { "abc".send(@method, 97) }.should.raise(TypeError, "no implicit conversion of Integer into String")
     end
   end
 
   describe "with multibyte codepoints" do
     it "raises an IndexError when byte offset lands in the middle of a multibyte character" do
-      -> { "わ".send(@method, "", 1) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-      -> { "わ".send(@method, "", 2) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
-      -> { "わ".send(@method, "", -1) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
-      -> { "わ".send(@method, "", -2) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+      -> { "わ".send(@method, "", 1) }.should.raise(IndexError, "offset 1 does not land on character boundary")
+      -> { "わ".send(@method, "", 2) }.should.raise(IndexError, "offset 2 does not land on character boundary")
+      -> { "わ".send(@method, "", -1) }.should.raise(IndexError, "offset 2 does not land on character boundary")
+      -> { "わ".send(@method, "", -2) }.should.raise(IndexError, "offset 1 does not land on character boundary")
     end
 
     it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
       re = Regexp.new "れ".encode(Encoding::EUC_JP)
       -> do
         "あれ".send(@method, re)
-      end.should raise_error(Encoding::CompatibilityError, "incompatible encoding regexp match (EUC-JP regexp with UTF-8 string)")
+      end.should.raise(Encoding::CompatibilityError, "incompatible encoding regexp match (EUC-JP regexp with UTF-8 string)")
     end
   end
 
diff --git a/spec/ruby/core/string/shared/chars.rb b/spec/ruby/core/string/shared/chars.rb
index 74a32fb513f..826d4035899 100644
--- a/spec/ruby/core/string/shared/chars.rb
+++ b/spec/ruby/core/string/shared/chars.rb
@@ -11,7 +11,7 @@
 
   it "returns self" do
     s = StringSpecs::MyString.new "hello"
-    s.send(@method){}.should equal(s)
+    s.send(@method){}.should.equal?(s)
   end
 
   it "is unicode aware" do
@@ -33,7 +33,7 @@
   it "works if the String's contents is invalid for its encoding" do
     xA4 = [0xA4].pack('C')
     xA4.force_encoding('UTF-8')
-    xA4.valid_encoding?.should be_false
+    xA4.valid_encoding?.should == false
     xA4.send(@method).to_a.should == [xA4.force_encoding("UTF-8")]
   end
 
diff --git a/spec/ruby/core/string/shared/codepoints.rb b/spec/ruby/core/string/shared/codepoints.rb
index ecdf7d719db..b6abf6a3ffe 100644
--- a/spec/ruby/core/string/shared/codepoints.rb
+++ b/spec/ruby/core/string/shared/codepoints.rb
@@ -3,13 +3,13 @@
   it "returns self" do
     s = "foo"
     result = s.send(@method) {}
-    result.should equal s
+    result.should.equal? s
   end
 
   it "raises an ArgumentError when self has an invalid encoding and a method is called on the returned Enumerator" do
     s = "\xDF".dup.force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.send(@method).to_a }.should raise_error(ArgumentError)
+    s.valid_encoding?.should == false
+    -> { s.send(@method).to_a }.should.raise(ArgumentError)
   end
 
   it "yields each codepoint to the block if one is given" do
@@ -22,13 +22,13 @@
 
   it "raises an ArgumentError if self's encoding is invalid and a block is given" do
     s = "\xDF".dup.force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.send(@method) { } }.should raise_error(ArgumentError)
+    s.valid_encoding?.should == false
+    -> { s.send(@method) { } }.should.raise(ArgumentError)
   end
 
   it "yields codepoints as Integers" do
     "glark\u{20}".send(@method).to_a.each do |codepoint|
-      codepoint.should be_an_instance_of(Integer)
+      codepoint.should.instance_of?(Integer)
     end
   end
 
@@ -56,7 +56,7 @@
 
   it "is synonymous with #bytes for Strings which are single-byte optimizable" do
     s = "(){}".encode('ascii')
-    s.ascii_only?.should be_true
+    s.ascii_only?.should == true
     s.send(@method).to_a.should == s.bytes.to_a
   end
 
diff --git a/spec/ruby/core/string/shared/concat.rb b/spec/ruby/core/string/shared/concat.rb
index dded9a69e73..60cd0e12d49 100644
--- a/spec/ruby/core/string/shared/concat.rb
+++ b/spec/ruby/core/string/shared/concat.rb
@@ -2,7 +2,7 @@
 describe :string_concat, shared: true do
   it "concatenates the given argument to self and returns self" do
     str = 'hello '
-    str.send(@method, 'world').should equal(str)
+    str.send(@method, 'world').should.equal?(str)
     str.should == "hello world"
   end
 
@@ -10,22 +10,22 @@
     a = "hello"
     a.freeze
 
-    -> { a.send(@method, "")     }.should raise_error(FrozenError)
-    -> { a.send(@method, "test") }.should raise_error(FrozenError)
+    -> { a.send(@method, "")     }.should.raise(FrozenError)
+    -> { a.send(@method, "test") }.should.raise(FrozenError)
   end
 
   it "returns a String when given a subclass instance" do
     a = "hello"
     a.send(@method, StringSpecs::MyString.new(" world"))
     a.should == "hello world"
-    a.should be_an_instance_of(String)
+    a.should.instance_of?(String)
   end
 
   it "returns an instance of same class when called on a subclass" do
     str = StringSpecs::MyString.new("hello")
     str.send(@method, " world")
     str.should == "hello world"
-    str.should be_an_instance_of(StringSpecs::MyString)
+    str.should.instance_of?(StringSpecs::MyString)
   end
 
   describe "with Integer" do
@@ -50,28 +50,28 @@
     end
 
     it "raises RangeError if the argument is an invalid codepoint for self's encoding" do
-      -> { "".encode(Encoding::US_ASCII).send(@method, 256) }.should raise_error(RangeError)
-      -> { "".encode(Encoding::EUC_JP).send(@method, 0x81)  }.should raise_error(RangeError)
+      -> { "".encode(Encoding::US_ASCII).send(@method, 256) }.should.raise(RangeError)
+      -> { "".encode(Encoding::EUC_JP).send(@method, 0x81)  }.should.raise(RangeError)
     end
 
     it "raises RangeError if the argument is negative" do
-      -> { "".send(@method, -200)          }.should raise_error(RangeError)
-      -> { "".send(@method, -bignum_value) }.should raise_error(RangeError)
+      -> { "".send(@method, -200)          }.should.raise(RangeError)
+      -> { "".send(@method, -bignum_value) }.should.raise(RangeError)
     end
 
     it "doesn't call to_int on its argument" do
       x = mock('x')
       x.should_not_receive(:to_int)
 
-      -> { "".send(@method, x) }.should raise_error(TypeError)
+      -> { "".send(@method, x) }.should.raise(TypeError)
     end
 
     it "raises a FrozenError when self is frozen" do
       a = "hello"
       a.freeze
 
-      -> { a.send(@method, 0)  }.should raise_error(FrozenError)
-      -> { a.send(@method, 33) }.should raise_error(FrozenError)
+      -> { a.send(@method, 0)  }.should.raise(FrozenError)
+      -> { a.send(@method, 33) }.should.raise(FrozenError)
     end
   end
 end
@@ -91,7 +91,7 @@
     end
 
     it "raises Encoding::CompatibilityError if neither are empty" do
-      -> { "x".encode("UTF-16LE").send(@method, "y".encode("UTF-8")) }.should raise_error(Encoding::CompatibilityError)
+      -> { "x".encode("UTF-16LE").send(@method, "y".encode("UTF-8")) }.should.raise(Encoding::CompatibilityError)
     end
   end
 
@@ -109,7 +109,7 @@
     end
 
     it "raises Encoding::CompatibilityError if neither are empty" do
-      -> { "x".encode("UTF-8").send(@method, "y".encode("UTF-16LE")) }.should raise_error(Encoding::CompatibilityError)
+      -> { "x".encode("UTF-8").send(@method, "y".encode("UTF-16LE")) }.should.raise(Encoding::CompatibilityError)
     end
   end
 
@@ -127,7 +127,7 @@
     end
 
     it "raises Encoding::CompatibilityError if neither are ASCII-only" do
-      -> { "\u00E9".encode("UTF-8").send(@method, "\u00E9".encode("ISO-8859-1")) }.should raise_error(Encoding::CompatibilityError)
+      -> { "\u00E9".encode("UTF-8").send(@method, "\u00E9".encode("ISO-8859-1")) }.should.raise(Encoding::CompatibilityError)
     end
   end
 
@@ -147,13 +147,13 @@
   end
 
   it "raises a TypeError if the given argument can't be converted to a String" do
-    -> { 'hello '.send(@method, [])        }.should raise_error(TypeError)
-    -> { 'hello '.send(@method, mock('x')) }.should raise_error(TypeError)
+    -> { 'hello '.send(@method, [])        }.should.raise(TypeError)
+    -> { 'hello '.send(@method, mock('x')) }.should.raise(TypeError)
   end
 
   it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to a String" do
     obj = mock('world!')
     obj.should_receive(:to_str).and_raise(NoMethodError)
-    -> { 'hello '.send(@method, obj) }.should raise_error(NoMethodError)
+    -> { 'hello '.send(@method, obj) }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/string/shared/dedup.rb b/spec/ruby/core/string/shared/dedup.rb
index 1ffd6aa0fd0..59506c29014 100644
--- a/spec/ruby/core/string/shared/dedup.rb
+++ b/spec/ruby/core/string/shared/dedup.rb
@@ -4,7 +4,7 @@
     input  = 'foo'.freeze
     output = input.send(@method)
 
-    output.should equal(input)
+    output.should.equal?(input)
     output.should.frozen?
   end
 
@@ -13,7 +13,7 @@
     output = input.send(@method)
 
     output.should.frozen?
-    output.should_not equal(input)
+    output.should_not.equal?(input)
     output.should == 'foo'
   end
 
@@ -21,22 +21,22 @@
     origin = "this is a string"
     dynamic = %w(this is a string).join(' ')
 
-    origin.should_not equal(dynamic)
-    origin.send(@method).should equal(dynamic.send(@method))
+    origin.should_not.equal?(dynamic)
+    origin.send(@method).should.equal?(dynamic.send(@method))
   end
 
   it "returns the same object when it's called on the same String literal" do
-    "unfrozen string".send(@method).should equal("unfrozen string".send(@method))
-    "unfrozen string".send(@method).should_not equal("another unfrozen string".send(@method))
+    "unfrozen string".send(@method).should.equal?("unfrozen string".send(@method))
+    "unfrozen string".send(@method).should_not.equal?("another unfrozen string".send(@method))
   end
 
   it "deduplicates frozen strings" do
     dynamic = %w(this string is frozen).join(' ').freeze
 
-    dynamic.should_not equal("this string is frozen".freeze)
+    dynamic.should_not.equal?("this string is frozen".freeze)
 
-    dynamic.send(@method).should equal("this string is frozen".freeze)
-    dynamic.send(@method).should equal("this string is frozen".send(@method).freeze)
+    dynamic.send(@method).should.equal?("this string is frozen".freeze)
+    dynamic.send(@method).should.equal?("this string is frozen".send(@method).freeze)
   end
 
   it "does not deduplicate a frozen string when it has instance variables" do
@@ -44,8 +44,8 @@
     dynamic.instance_variable_set(:@a, 1)
     dynamic.freeze
 
-    dynamic.send(@method).should_not equal("this string is frozen".freeze)
-    dynamic.send(@method).should_not equal("this string is frozen".send(@method).freeze)
-    dynamic.send(@method).should equal(dynamic)
+    dynamic.send(@method).should_not.equal?("this string is frozen".freeze)
+    dynamic.send(@method).should_not.equal?("this string is frozen".send(@method).freeze)
+    dynamic.send(@method).should.equal?(dynamic)
   end
 end
diff --git a/spec/ruby/core/string/shared/each_char_without_block.rb b/spec/ruby/core/string/shared/each_char_without_block.rb
index 397100ce0eb..3c32bae42b9 100644
--- a/spec/ruby/core/string/shared/each_char_without_block.rb
+++ b/spec/ruby/core/string/shared/each_char_without_block.rb
@@ -6,7 +6,7 @@
   describe "when no block is given" do
     it "returns an enumerator" do
       enum = "hello".send(@method)
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
       enum.to_a.should == ['h', 'e', 'l', 'l', 'o']
     end
 
diff --git a/spec/ruby/core/string/shared/each_codepoint_without_block.rb b/spec/ruby/core/string/shared/each_codepoint_without_block.rb
index c88e5c54c75..60d603954c3 100644
--- a/spec/ruby/core/string/shared/each_codepoint_without_block.rb
+++ b/spec/ruby/core/string/shared/each_codepoint_without_block.rb
@@ -2,13 +2,13 @@
 describe :string_each_codepoint_without_block, shared: true do
   describe "when no block is given" do
     it "returns an Enumerator" do
-      "".send(@method).should be_an_instance_of(Enumerator)
+      "".send(@method).should.instance_of?(Enumerator)
     end
 
     it "returns an Enumerator even when self has an invalid encoding" do
       s = "\xDF".dup.force_encoding(Encoding::UTF_8)
-      s.valid_encoding?.should be_false
-      s.send(@method).should be_an_instance_of(Enumerator)
+      s.valid_encoding?.should == false
+      s.send(@method).should.instance_of?(Enumerator)
     end
 
     describe "returned Enumerator" do
@@ -24,7 +24,7 @@
 
         it "should return the size of the string even when the string has an invalid encoding" do
           s = "\xDF".dup.force_encoding(Encoding::UTF_8)
-          s.valid_encoding?.should be_false
+          s.valid_encoding?.should == false
           s.send(@method).size.should == 1
         end
       end
diff --git a/spec/ruby/core/string/shared/each_line.rb b/spec/ruby/core/string/shared/each_line.rb
index c2f3abfa80e..d79c2b74c4a 100644
--- a/spec/ruby/core/string/shared/each_line.rb
+++ b/spec/ruby/core/string/shared/each_line.rb
@@ -93,7 +93,7 @@
 
   it "returns self" do
     s = "hello\nworld"
-    (s.send(@method) {}).should equal(s)
+    (s.send(@method) {}).should.equal?(s)
   end
 
   it "tries to convert the separator to a string using to_str" do
@@ -119,8 +119,8 @@
   end
 
   it "raises a TypeError when the separator can't be converted to a string" do
-    -> { "hello world".send(@method, false) {}     }.should raise_error(TypeError)
-    -> { "hello world".send(@method, mock('x')) {} }.should raise_error(TypeError)
+    -> { "hello world".send(@method, false) {}     }.should.raise(TypeError)
+    -> { "hello world".send(@method, mock('x')) {} }.should.raise(TypeError)
   end
 
   it "accepts a string separator" do
@@ -128,7 +128,7 @@
   end
 
   it "raises a TypeError when the separator is a symbol" do
-    -> { "hello world".send(@method, :o).to_a }.should raise_error(TypeError)
+    -> { "hello world".send(@method, :o).to_a }.should.raise(TypeError)
   end
 
   context "when `chomp` keyword argument is passed" do
@@ -171,6 +171,6 @@
 
   it "raises Encoding::ConverterNotFoundError for dummy UTF-7" do
     str = "a\nb".dup.force_encoding(Encoding::UTF_7)
-    -> { str.lines }.should raise_error(Encoding::ConverterNotFoundError)
+    -> { str.lines }.should.raise(Encoding::ConverterNotFoundError)
   end
 end
diff --git a/spec/ruby/core/string/shared/each_line_without_block.rb b/spec/ruby/core/string/shared/each_line_without_block.rb
index 8e08b0390c9..af0ab69c005 100644
--- a/spec/ruby/core/string/shared/each_line_without_block.rb
+++ b/spec/ruby/core/string/shared/each_line_without_block.rb
@@ -2,7 +2,7 @@
   describe "when no block is given" do
     it "returns an enumerator" do
       enum = "hello world".send(@method, ' ')
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
       enum.to_a.should == ["hello ", "world"]
     end
 
diff --git a/spec/ruby/core/string/shared/encode.rb b/spec/ruby/core/string/shared/encode.rb
index 51a117c90ed..7f644c26d9a 100644
--- a/spec/ruby/core/string/shared/encode.rb
+++ b/spec/ruby/core/string/shared/encode.rb
@@ -11,7 +11,7 @@
     it "transcodes a 7-bit String despite no generic converting being available" do
       -> do
         Encoding::Converter.new Encoding::Emacs_Mule, Encoding::BINARY
-      end.should raise_error(Encoding::ConverterNotFoundError)
+      end.should.raise(Encoding::ConverterNotFoundError)
 
       Encoding.default_internal = Encoding::Emacs_Mule
       str = "\x79".force_encoding Encoding::BINARY
@@ -22,7 +22,7 @@
     it "raises an Encoding::ConverterNotFoundError when no conversion is possible" do
       Encoding.default_internal = Encoding::Emacs_Mule
       str = [0x80].pack('C').force_encoding Encoding::BINARY
-      -> { str.send(@method) }.should raise_error(Encoding::ConverterNotFoundError)
+      -> { str.send(@method) }.should.raise(Encoding::ConverterNotFoundError)
     end
   end
 
@@ -54,7 +54,7 @@
     it "transcodes a 7-bit String despite no generic converting being available" do
       -> do
         Encoding::Converter.new Encoding::Emacs_Mule, Encoding::BINARY
-      end.should raise_error(Encoding::ConverterNotFoundError)
+      end.should.raise(Encoding::ConverterNotFoundError)
 
       str = "\x79".force_encoding Encoding::BINARY
       str.send(@method, Encoding::Emacs_Mule).should == "y".force_encoding(Encoding::BINARY)
@@ -64,13 +64,13 @@
       str = [0x80].pack('C').force_encoding Encoding::BINARY
       -> do
         str.send(@method, Encoding::Emacs_Mule)
-      end.should raise_error(Encoding::ConverterNotFoundError)
+      end.should.raise(Encoding::ConverterNotFoundError)
     end
 
     it "raises an Encoding::ConverterNotFoundError for an invalid encoding" do
       -> do
         "abc".send(@method, "xyz")
-      end.should raise_error(Encoding::ConverterNotFoundError)
+      end.should.raise(Encoding::ConverterNotFoundError)
     end
 
     it "raises an Encoding::UndefinedConversionError when a character cannot be represented in the destination encoding" do
@@ -78,7 +78,7 @@
       str = "test\u0100".force_encoding('utf-8')
       -> {
         str.send(@method, Encoding::Windows_1252)
-      }.should raise_error(Encoding::UndefinedConversionError)
+      }.should.raise(Encoding::UndefinedConversionError)
     end
   end
 
@@ -107,7 +107,7 @@
       str = [0x80].pack('C').force_encoding Encoding::BINARY
       -> do
         str.send(@method, invalid: :replace, undef: :replace)
-      end.should raise_error(Encoding::ConverterNotFoundError)
+      end.should.raise(Encoding::ConverterNotFoundError)
     end
 
     it "replaces invalid characters when replacing Emacs-Mule encoded strings" do
@@ -155,7 +155,7 @@
       str = "test\u0100".force_encoding('utf-8')
       -> {
         str.send(@method, Encoding::Windows_1252, invalid: :replace, replace: "")
-      }.should raise_error(Encoding::UndefinedConversionError)
+      }.should.raise(Encoding::UndefinedConversionError)
     end
 
     it "calls #to_hash to convert the options object" do
@@ -229,19 +229,19 @@
         obj.should_not_receive(:to_s)
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: { "\ufffd" => obj })
-        }.should raise_error(TypeError, "no implicit conversion of Object into String")
+        }.should.raise(TypeError, "no implicit conversion of Object into String")
       end
 
       it "raises an error if the key is not present in the hash" do
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: { "foo" => "bar" })
-        }.should raise_error(Encoding::UndefinedConversionError, "U+FFFD from UTF-8 to US-ASCII")
+        }.should.raise(Encoding::UndefinedConversionError, "U+FFFD from UTF-8 to US-ASCII")
       end
 
       it "raises an error if the value is itself invalid" do
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: { "\ufffd" => "\uffee" })
-        }.should raise_error(ArgumentError, "too big fallback string")
+        }.should.raise(ArgumentError, "too big fallback string")
       end
 
       it "uses the hash's default value if set" do
@@ -294,7 +294,7 @@ def [](c) = c.bytes.inspect
       it "raises an error" do
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: @non_hash_like)
-        }.should raise_error(Encoding::UndefinedConversionError, "U+FFFD from UTF-8 to US-ASCII")
+        }.should.raise(Encoding::UndefinedConversionError, "U+FFFD from UTF-8 to US-ASCII")
       end
     end
 
@@ -316,13 +316,13 @@ def [](c) = c.bytes.inspect
         obj.should_not_receive(:to_s)
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: proc { |c| obj })
-        }.should raise_error(TypeError, "no implicit conversion of Object into String")
+        }.should.raise(TypeError, "no implicit conversion of Object into String")
       end
 
       it "raises an error if the returned value is itself invalid" do
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: -> c { "\uffee" })
-        }.should raise_error(ArgumentError, "too big fallback string")
+        }.should.raise(ArgumentError, "too big fallback string")
       end
     end
 
@@ -344,13 +344,13 @@ def [](c) = c.bytes.inspect
         obj.should_not_receive(:to_s)
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: -> c { obj })
-        }.should raise_error(TypeError, "no implicit conversion of Object into String")
+        }.should.raise(TypeError, "no implicit conversion of Object into String")
       end
 
       it "raises an error if the returned value is itself invalid" do
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: -> c { "\uffee" })
-        }.should raise_error(ArgumentError, "too big fallback string")
+        }.should.raise(ArgumentError, "too big fallback string")
       end
     end
 
@@ -383,13 +383,13 @@ def replace_to_s(c)
       it "does not call to_s on the returned value" do
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: method(:replace_to_s))
-        }.should raise_error(TypeError, "no implicit conversion of Object into String")
+        }.should.raise(TypeError, "no implicit conversion of Object into String")
       end
 
       it "raises an error if the returned value is itself invalid" do
         -> {
           "B\ufffd".encode(Encoding::US_ASCII, fallback: method(:replace_bad))
-        }.should raise_error(ArgumentError, "too big fallback string")
+        }.should.raise(ArgumentError, "too big fallback string")
       end
     end
   end
@@ -443,6 +443,6 @@ def replace_to_s(c)
   end
 
   it "raises ArgumentError if the value of the :xml option is not :text or :attr" do
-    -> { ''.send(@method, "UTF-8", xml: :other) }.should raise_error(ArgumentError)
+    -> { ''.send(@method, "UTF-8", xml: :other) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/shared/eql.rb b/spec/ruby/core/string/shared/eql.rb
index d5af337d53c..0e356c69e85 100644
--- a/spec/ruby/core/string/shared/eql.rb
+++ b/spec/ruby/core/string/shared/eql.rb
@@ -4,32 +4,32 @@
 
 describe :string_eql_value, shared: true do
   it "returns true if self <=> string returns 0" do
-    'hello'.send(@method, 'hello').should be_true
+    'hello'.send(@method, 'hello').should == true
   end
 
   it "returns false if self <=> string does not return 0" do
-    "more".send(@method, "MORE").should be_false
-    "less".send(@method, "greater").should be_false
+    "more".send(@method, "MORE").should == false
+    "less".send(@method, "greater").should == false
   end
 
   it "ignores encoding difference of compatible string" do
-    "hello".dup.force_encoding("utf-8").send(@method, "hello".dup.force_encoding("iso-8859-1")).should be_true
+    "hello".dup.force_encoding("utf-8").send(@method, "hello".dup.force_encoding("iso-8859-1")).should == true
   end
 
   it "considers encoding difference of incompatible string" do
-    "\xff".dup.force_encoding("utf-8").send(@method, "\xff".dup.force_encoding("iso-8859-1")).should be_false
+    "\xff".dup.force_encoding("utf-8").send(@method, "\xff".dup.force_encoding("iso-8859-1")).should == false
   end
 
   it "considers encoding compatibility" do
-    "abcd".dup.force_encoding("utf-8").send(@method, "abcd".dup.force_encoding("utf-32le")).should be_false
+    "abcd".dup.force_encoding("utf-8").send(@method, "abcd".dup.force_encoding("utf-32le")).should == false
   end
 
   it "ignores subclass differences" do
     a = "hello"
     b = StringSpecs::MyString.new("hello")
 
-    a.send(@method, b).should be_true
-    b.send(@method, a).should be_true
+    a.send(@method, b).should == true
+    b.send(@method, a).should == true
   end
 
   it "returns true when comparing 2 empty strings but one is not ASCII-compatible" do
diff --git a/spec/ruby/core/string/shared/equal_value.rb b/spec/ruby/core/string/shared/equal_value.rb
index fccafb5821b..dfc5c7cd29e 100644
--- a/spec/ruby/core/string/shared/equal_value.rb
+++ b/spec/ruby/core/string/shared/equal_value.rb
@@ -3,11 +3,11 @@
 
 describe :string_equal_value, shared: true do
   it "returns false if obj does not respond to to_str" do
-    'hello'.send(@method, 5).should be_false
+    'hello'.send(@method, 5).should == false
     not_supported_on :opal do
-      'hello'.send(@method, :hello).should be_false
+      'hello'.send(@method, :hello).should == false
     end
-    'hello'.send(@method, mock('x')).should be_false
+    'hello'.send(@method, mock('x')).should == false
   end
 
   it "returns obj == self if obj responds to to_str" do
@@ -20,10 +20,10 @@
     # Don't use @method for :== in `obj.should_receive(:==)`
     obj.should_receive(:==).and_return(true)
 
-    'hello'.send(@method, obj).should be_true
+    'hello'.send(@method, obj).should == true
   end
 
   it "is not fooled by NUL characters" do
-    "abc\0def".send(@method, "abc\0xyz").should be_false
+    "abc\0def".send(@method, "abc\0xyz").should == false
   end
 end
diff --git a/spec/ruby/core/string/shared/grapheme_clusters.rb b/spec/ruby/core/string/shared/grapheme_clusters.rb
index 985b558f08a..dd8c7ed5fef 100644
--- a/spec/ruby/core/string/shared/grapheme_clusters.rb
+++ b/spec/ruby/core/string/shared/grapheme_clusters.rb
@@ -20,6 +20,6 @@
 
   it "returns self" do
     s = StringSpecs::MyString.new "ab\u{1f3f3}\u{fe0f}\u{200d}\u{1f308}\u{1F43E}"
-    s.send(@method) {}.should equal(s)
+    s.send(@method) {}.should.equal?(s)
   end
 end
diff --git a/spec/ruby/core/string/shared/partition.rb b/spec/ruby/core/string/shared/partition.rb
index 4cac149ce57..3f7e606eb31 100644
--- a/spec/ruby/core/string/shared/partition.rb
+++ b/spec/ruby/core/string/shared/partition.rb
@@ -4,15 +4,15 @@
 describe :string_partition, shared: true do
   it "returns String instances when called on a subclass" do
     StringSpecs::MyString.new("hello").send(@method, "l").each do |item|
-      item.should be_an_instance_of(String)
+      item.should.instance_of?(String)
     end
 
     StringSpecs::MyString.new("hello").send(@method, "x").each do |item|
-      item.should be_an_instance_of(String)
+      item.should.instance_of?(String)
     end
 
     StringSpecs::MyString.new("hello").send(@method, /l./).each do |item|
-      item.should be_an_instance_of(String)
+      item.should.instance_of?(String)
     end
   end
 
diff --git a/spec/ruby/core/string/shared/replace.rb b/spec/ruby/core/string/shared/replace.rb
index 24dac0eb270..73b26351f1d 100644
--- a/spec/ruby/core/string/shared/replace.rb
+++ b/spec/ruby/core/string/shared/replace.rb
@@ -2,7 +2,7 @@
 describe :string_replace, shared: true do
   it "returns self" do
     a = "a"
-    a.send(@method, "b").should equal(a)
+    a.send(@method, "b").should.equal?(a)
   end
 
   it "replaces the content of self with other" do
@@ -20,7 +20,7 @@
 
   it "carries over the encoding invalidity" do
     a = "\u{8765}".force_encoding('ascii')
-    "".send(@method, a).valid_encoding?.should be_false
+    "".send(@method, a).valid_encoding?.should == false
   end
 
   it "tries to convert other to string using to_str" do
@@ -30,19 +30,19 @@
   end
 
   it "raises a TypeError if other can't be converted to string" do
-    -> { "hello".send(@method, 123)       }.should raise_error(TypeError)
-    -> { "hello".send(@method, [])        }.should raise_error(TypeError)
-    -> { "hello".send(@method, mock('x')) }.should raise_error(TypeError)
+    -> { "hello".send(@method, 123)       }.should.raise(TypeError)
+    -> { "hello".send(@method, [])        }.should.raise(TypeError)
+    -> { "hello".send(@method, mock('x')) }.should.raise(TypeError)
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
     a = "hello".freeze
-    -> { a.send(@method, "world") }.should raise_error(FrozenError)
+    -> { a.send(@method, "world") }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
   it "raises a FrozenError on a frozen instance when self-replacing" do
     a = "hello".freeze
-    -> { a.send(@method, a) }.should raise_error(FrozenError)
+    -> { a.send(@method, a) }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/shared/slice.rb b/spec/ruby/core/string/shared/slice.rb
index 7b9b9f6a14c..d296ab66803 100644
--- a/spec/ruby/core/string/shared/slice.rb
+++ b/spec/ruby/core/string/shared/slice.rb
@@ -21,17 +21,17 @@
   end
 
   it "raises a TypeError if the given index is nil" do
-    -> { "hello".send(@method, nil) }.should raise_error(TypeError)
+    -> { "hello".send(@method, nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the given index can't be converted to an Integer" do
-    -> { "hello".send(@method, mock('x')) }.should raise_error(TypeError)
-    -> { "hello".send(@method, {})        }.should raise_error(TypeError)
-    -> { "hello".send(@method, [])        }.should raise_error(TypeError)
+    -> { "hello".send(@method, mock('x')) }.should.raise(TypeError)
+    -> { "hello".send(@method, {})        }.should.raise(TypeError)
+    -> { "hello".send(@method, [])        }.should.raise(TypeError)
   end
 
   it "raises a RangeError if the index is too big" do
-    -> { "hello".send(@method, bignum_value) }.should raise_error(RangeError)
+    -> { "hello".send(@method, bignum_value) }.should.raise(RangeError)
   end
 end
 
@@ -145,35 +145,35 @@
   end
 
   it "raises a TypeError when idx or length can't be converted to an integer" do
-    -> { "hello".send(@method, mock('x'), 0) }.should raise_error(TypeError)
-    -> { "hello".send(@method, 0, mock('x')) }.should raise_error(TypeError)
+    -> { "hello".send(@method, mock('x'), 0) }.should.raise(TypeError)
+    -> { "hello".send(@method, 0, mock('x')) }.should.raise(TypeError)
 
     # I'm deliberately including this here.
     # It means that str.send(@method, other, idx) isn't supported.
-    -> { "hello".send(@method, "", 0) }.should raise_error(TypeError)
+    -> { "hello".send(@method, "", 0) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the given index or the given length is nil" do
-    -> { "hello".send(@method, 1, nil)   }.should raise_error(TypeError)
-    -> { "hello".send(@method, nil, 1)   }.should raise_error(TypeError)
-    -> { "hello".send(@method, nil, nil) }.should raise_error(TypeError)
+    -> { "hello".send(@method, 1, nil)   }.should.raise(TypeError)
+    -> { "hello".send(@method, nil, 1)   }.should.raise(TypeError)
+    -> { "hello".send(@method, nil, nil) }.should.raise(TypeError)
   end
 
   it "raises a RangeError if the index or length is too big" do
-    -> { "hello".send(@method, bignum_value, 1) }.should raise_error(RangeError)
-    -> { "hello".send(@method, 0, bignum_value) }.should raise_error(RangeError)
+    -> { "hello".send(@method, bignum_value, 1) }.should.raise(RangeError)
+    -> { "hello".send(@method, 0, bignum_value) }.should.raise(RangeError)
   end
 
   it "raises a RangeError if the index or length is too small" do
-    -> { "hello".send(@method, -bignum_value, 1) }.should raise_error(RangeError)
-    -> { "hello".send(@method, 0, -bignum_value) }.should raise_error(RangeError)
+    -> { "hello".send(@method, -bignum_value, 1) }.should.raise(RangeError)
+    -> { "hello".send(@method, 0, -bignum_value) }.should.raise(RangeError)
   end
 
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
-    s.send(@method, 0,0).should be_an_instance_of(String)
-    s.send(@method, 0,4).should be_an_instance_of(String)
-    s.send(@method, 1,4).should be_an_instance_of(String)
+    s.send(@method, 0,0).should.instance_of?(String)
+    s.send(@method, 0,4).should.instance_of?(String)
+    s.send(@method, 1,4).should.instance_of?(String)
   end
 
   it "handles repeated application" do
@@ -250,9 +250,9 @@
 
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
-    s.send(@method, 0...0).should be_an_instance_of(String)
-    s.send(@method, 0..4).should be_an_instance_of(String)
-    s.send(@method, 1..4).should be_an_instance_of(String)
+    s.send(@method, 0...0).should.instance_of?(String)
+    s.send(@method, 0..4).should.instance_of?(String)
+    s.send(@method, 1..4).should.instance_of?(String)
   end
 
   it "calls to_int on range arguments" do
@@ -293,12 +293,12 @@
   end
 
   it "raises a type error if a range is passed with a length" do
-    ->{ "hello".send(@method, 1..2, 1) }.should raise_error(TypeError)
+    ->{ "hello".send(@method, 1..2, 1) }.should.raise(TypeError)
   end
 
   it "raises a RangeError if one of the bound is too big" do
-    -> { "hello".send(@method, bignum_value..(bignum_value + 1)) }.should raise_error(RangeError)
-    -> { "hello".send(@method, 0..bignum_value) }.should raise_error(RangeError)
+    -> { "hello".send(@method, bignum_value..(bignum_value + 1)) }.should.raise(RangeError)
+    -> { "hello".send(@method, 0..bignum_value) }.should.raise(RangeError)
   end
 
   it "works with endless ranges" do
@@ -333,8 +333,8 @@
 
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
-    s.send(@method, //).should be_an_instance_of(String)
-    s.send(@method, /../).should be_an_instance_of(String)
+    s.send(@method, //).should.instance_of?(String)
+    s.send(@method, /../).should.instance_of?(String)
   end
 
   it "sets $~ to MatchData when there is a match and nil when there's none" do
@@ -394,19 +394,19 @@
   end
 
   it "raises a TypeError when the given index can't be converted to Integer" do
-    -> { "hello".send(@method, /(.)(.)(.)/, mock('x')) }.should raise_error(TypeError)
-    -> { "hello".send(@method, /(.)(.)(.)/, {})        }.should raise_error(TypeError)
-    -> { "hello".send(@method, /(.)(.)(.)/, [])        }.should raise_error(TypeError)
+    -> { "hello".send(@method, /(.)(.)(.)/, mock('x')) }.should.raise(TypeError)
+    -> { "hello".send(@method, /(.)(.)(.)/, {})        }.should.raise(TypeError)
+    -> { "hello".send(@method, /(.)(.)(.)/, [])        }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the given index is nil" do
-    -> { "hello".send(@method, /(.)(.)(.)/, nil) }.should raise_error(TypeError)
+    -> { "hello".send(@method, /(.)(.)(.)/, nil) }.should.raise(TypeError)
   end
 
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
-    s.send(@method, /(.)(.)/, 0).should be_an_instance_of(String)
-    s.send(@method, /(.)(.)/, 1).should be_an_instance_of(String)
+    s.send(@method, /(.)(.)/, 0).should.instance_of?(String)
+    s.send(@method, /(.)(.)/, 1).should.instance_of?(String)
   end
 
   it "sets $~ to MatchData when there is a match and nil when there's none" do
@@ -442,14 +442,14 @@
     o = mock('x')
     o.should_not_receive(:to_str)
 
-    -> { "hello".send(@method, o) }.should raise_error(TypeError)
+    -> { "hello".send(@method, o) }.should.raise(TypeError)
   end
 
   it "returns a String instance when given a subclass instance" do
     s = StringSpecs::MyString.new("el")
     r = "hello".send(@method, s)
     r.should == "el"
-    r.should be_an_instance_of(String)
+    r.should.instance_of?(String)
   end
 end
 
@@ -476,28 +476,28 @@
     end
 
     it "returns nil if there is no match" do
-      "hello there".send(@method, /(?<whut>what?)/, 'whut').should be_nil
+      "hello there".send(@method, /(?<whut>what?)/, 'whut').should == nil
     end
 
     it "raises an IndexError if there is no capture for the given name" do
       -> do
         "hello there".send(@method, /[aeiou](.)\1/, 'non')
-      end.should raise_error(IndexError)
+      end.should.raise(IndexError)
     end
 
     it "raises a TypeError when the given name is not a String" do
-      -> { "hello".send(@method, /(?<q>.)/, mock('x')) }.should raise_error(TypeError)
-      -> { "hello".send(@method, /(?<q>.)/, {})        }.should raise_error(TypeError)
-      -> { "hello".send(@method, /(?<q>.)/, [])        }.should raise_error(TypeError)
+      -> { "hello".send(@method, /(?<q>.)/, mock('x')) }.should.raise(TypeError)
+      -> { "hello".send(@method, /(?<q>.)/, {})        }.should.raise(TypeError)
+      -> { "hello".send(@method, /(?<q>.)/, [])        }.should.raise(TypeError)
     end
 
     it "raises an IndexError when given the empty String as a group name" do
-      -> { "hello".send(@method, /(?<q>)/, '') }.should raise_error(IndexError)
+      -> { "hello".send(@method, /(?<q>)/, '') }.should.raise(IndexError)
     end
 
     it "returns String instances" do
       s = StringSpecs::MyString.new("hello")
-      s.send(@method, /(?<q>.)/, 'q').should be_an_instance_of(String)
+      s.send(@method, /(?<q>.)/, 'q').should.instance_of?(String)
     end
 
     it "sets $~ to MatchData when there is a match and nil when there's none" do
@@ -505,13 +505,13 @@
       $~[0].should == 'he'
 
       'hello'.send(@method, /(?<non>not)/, 'non')
-      $~.should be_nil
+      $~.should == nil
     end
   end
 end
 
 describe :string_slice_symbol, shared: true do
   it "raises TypeError" do
-    -> { 'hello'.send(@method, :hello) }.should raise_error(TypeError)
+    -> { 'hello'.send(@method, :hello) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/string/shared/strip.rb b/spec/ruby/core/string/shared/strip.rb
index 3af77b50fe6..39c7232ff99 100644
--- a/spec/ruby/core/string/shared/strip.rb
+++ b/spec/ruby/core/string/shared/strip.rb
@@ -7,8 +7,8 @@
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new(" hello ").send(@method).should be_an_instance_of(String)
-    StringSpecs::MyString.new(" ").send(@method).should be_an_instance_of(String)
-    StringSpecs::MyString.new("").send(@method).should be_an_instance_of(String)
+    StringSpecs::MyString.new(" hello ").send(@method).should.instance_of?(String)
+    StringSpecs::MyString.new(" ").send(@method).should.instance_of?(String)
+    StringSpecs::MyString.new("").send(@method).should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/core/string/shared/succ.rb b/spec/ruby/core/string/shared/succ.rb
index 7c68345f109..8f1d327741f 100644
--- a/spec/ruby/core/string/shared/succ.rb
+++ b/spec/ruby/core/string/shared/succ.rb
@@ -60,9 +60,9 @@
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("").send(@method).should be_an_instance_of(String)
-    StringSpecs::MyString.new("a").send(@method).should be_an_instance_of(String)
-    StringSpecs::MyString.new("z").send(@method).should be_an_instance_of(String)
+    StringSpecs::MyString.new("").send(@method).should.instance_of?(String)
+    StringSpecs::MyString.new("a").send(@method).should.instance_of?(String)
+    StringSpecs::MyString.new("z").send(@method).should.instance_of?(String)
   end
 
   it "returns a String in the same encoding as self" do
@@ -75,13 +75,13 @@
     ["", "abcd", "THX1138"].each do |s|
       s = +s
       r = s.dup.send(@method)
-      s.send(@method).should equal(s)
+      s.send(@method).should.equal?(s)
       s.should == r
     end
   end
 
   it "raises a FrozenError if self is frozen" do
-    -> { "".freeze.send(@method)     }.should raise_error(FrozenError)
-    -> { "abcd".freeze.send(@method) }.should raise_error(FrozenError)
+    -> { "".freeze.send(@method)     }.should.raise(FrozenError)
+    -> { "abcd".freeze.send(@method) }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/shared/to_s.rb b/spec/ruby/core/string/shared/to_s.rb
index 4b87a6cbe15..96c59470d60 100644
--- a/spec/ruby/core/string/shared/to_s.rb
+++ b/spec/ruby/core/string/shared/to_s.rb
@@ -1,13 +1,13 @@
 describe :string_to_s, shared: true do
   it "returns self when self.class == String" do
     a = "a string"
-    a.should equal(a.send(@method))
+    a.should.equal?(a.send(@method))
   end
 
   it "returns a new instance of String when called on a subclass" do
     a = StringSpecs::MyString.new("a string")
     s = a.send(@method)
     s.should == "a string"
-    s.should be_an_instance_of(String)
+    s.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/core/string/shared/to_sym.rb b/spec/ruby/core/string/shared/to_sym.rb
index 833eae100e4..2a8a2e31821 100644
--- a/spec/ruby/core/string/shared/to_sym.rb
+++ b/spec/ruby/core/string/shared/to_sym.rb
@@ -1,42 +1,42 @@
 describe :string_to_sym, shared: true do
   it "returns the symbol corresponding to self" do
-    "Koala".send(@method).should equal :Koala
-    'cat'.send(@method).should equal :cat
-    '@cat'.send(@method).should equal :@cat
-    'cat and dog'.send(@method).should equal :"cat and dog"
-    "abc=".send(@method).should equal :abc=
+    "Koala".send(@method).should.equal? :Koala
+    'cat'.send(@method).should.equal? :cat
+    '@cat'.send(@method).should.equal? :@cat
+    'cat and dog'.send(@method).should.equal? :"cat and dog"
+    "abc=".send(@method).should.equal? :abc=
   end
 
   it "does not special case +(binary) and -(binary)" do
-    "+(binary)".send(@method).should equal :"+(binary)"
-    "-(binary)".send(@method).should equal :"-(binary)"
+    "+(binary)".send(@method).should.equal? :"+(binary)"
+    "-(binary)".send(@method).should.equal? :"-(binary)"
   end
 
   it "does not special case certain operators" do
-    "!@".send(@method).should equal :"!@"
-    "~@".send(@method).should equal :"~@"
-    "!(unary)".send(@method).should equal :"!(unary)"
-    "~(unary)".send(@method).should equal :"~(unary)"
-    "+(unary)".send(@method).should equal :"+(unary)"
-    "-(unary)".send(@method).should equal :"-(unary)"
+    "!@".send(@method).should.equal? :"!@"
+    "~@".send(@method).should.equal? :"~@"
+    "!(unary)".send(@method).should.equal? :"!(unary)"
+    "~(unary)".send(@method).should.equal? :"~(unary)"
+    "+(unary)".send(@method).should.equal? :"+(unary)"
+    "-(unary)".send(@method).should.equal? :"-(unary)"
   end
 
   it "returns a US-ASCII Symbol for a UTF-8 String containing only US-ASCII characters" do
     sym = "foobar".send(@method)
     sym.encoding.should == Encoding::US_ASCII
-    sym.should equal :"foobar"
+    sym.should.equal? :"foobar"
   end
 
   it "returns a US-ASCII Symbol for a binary String containing only US-ASCII characters" do
     sym = "foobar".b.send(@method)
     sym.encoding.should == Encoding::US_ASCII
-    sym.should equal :"foobar"
+    sym.should.equal? :"foobar"
   end
 
   it "returns a UTF-8 Symbol for a UTF-8 String containing non US-ASCII characters" do
     sym = "il était une fois".send(@method)
     sym.encoding.should == Encoding::UTF_8
-    sym.should equal :"il était une #{'fois'}"
+    sym.should.equal? :"il était une #{'fois'}"
   end
 
   it "returns a UTF-16LE Symbol for a UTF-16LE String containing non US-ASCII characters" do
@@ -67,6 +67,6 @@
     invalid_utf8.should_not.valid_encoding?
     -> {
       invalid_utf8.send(@method)
-    }.should raise_error(EncodingError, 'invalid symbol in encoding UTF-8 :"\xC3"')
+    }.should.raise(EncodingError, 'invalid symbol in encoding UTF-8 :"\xC3"')
   end
 end
diff --git a/spec/ruby/core/string/slice_spec.rb b/spec/ruby/core/string/slice_spec.rb
index 5aba2d3be06..14e2251b3f7 100644
--- a/spec/ruby/core/string/slice_spec.rb
+++ b/spec/ruby/core/string/slice_spec.rb
@@ -54,9 +54,9 @@
   end
 
   it "raises a FrozenError if self is frozen" do
-    -> { "hello".freeze.slice!(1)  }.should raise_error(FrozenError)
-    -> { "hello".freeze.slice!(10) }.should raise_error(FrozenError)
-    -> { "".freeze.slice!(0)       }.should raise_error(FrozenError)
+    -> { "hello".freeze.slice!(1)  }.should.raise(FrozenError)
+    -> { "hello".freeze.slice!(10) }.should.raise(FrozenError)
+    -> { "".freeze.slice!(0)       }.should.raise(FrozenError)
   end
 
   it "calls to_int on index" do
@@ -110,13 +110,13 @@
   end
 
   it "raises a FrozenError if self is frozen" do
-    -> { "hello".freeze.slice!(1, 2)  }.should raise_error(FrozenError)
-    -> { "hello".freeze.slice!(10, 3) }.should raise_error(FrozenError)
-    -> { "hello".freeze.slice!(-10, 3)}.should raise_error(FrozenError)
-    -> { "hello".freeze.slice!(4, -3) }.should raise_error(FrozenError)
-    -> { "hello".freeze.slice!(10, 3) }.should raise_error(FrozenError)
-    -> { "hello".freeze.slice!(-10, 3)}.should raise_error(FrozenError)
-    -> { "hello".freeze.slice!(4, -3) }.should raise_error(FrozenError)
+    -> { "hello".freeze.slice!(1, 2)  }.should.raise(FrozenError)
+    -> { "hello".freeze.slice!(10, 3) }.should.raise(FrozenError)
+    -> { "hello".freeze.slice!(-10, 3)}.should.raise(FrozenError)
+    -> { "hello".freeze.slice!(4, -3) }.should.raise(FrozenError)
+    -> { "hello".freeze.slice!(10, 3) }.should.raise(FrozenError)
+    -> { "hello".freeze.slice!(-10, 3)}.should.raise(FrozenError)
+    -> { "hello".freeze.slice!(4, -3) }.should.raise(FrozenError)
   end
 
   it "calls to_int on idx and length" do
@@ -134,8 +134,8 @@ def obj.method_missing(name, *) name == :to_int ? 2 : super; end
 
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
-    s.slice!(0, 0).should be_an_instance_of(String)
-    s.slice!(0, 4).should be_an_instance_of(String)
+    s.slice!(0, 0).should.instance_of?(String)
+    s.slice!(0, 4).should.instance_of?(String)
   end
 
   it "returns the substring given by the character offsets" do
@@ -177,8 +177,8 @@ def obj.method_missing(name, *) name == :to_int ? 2 : super; end
 
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
-    s.slice!(0...0).should be_an_instance_of(String)
-    s.slice!(0..4).should be_an_instance_of(String)
+    s.slice!(0...0).should.instance_of?(String)
+    s.slice!(0..4).should.instance_of?(String)
   end
 
   it "calls to_int on range arguments" do
@@ -228,12 +228,12 @@ def to.method_missing(name) name == :to_int ? -2 : super; end
 
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "hello".freeze.slice!(1..3)  }.should raise_error(FrozenError)
+    -> { "hello".freeze.slice!(1..3)  }.should.raise(FrozenError)
   end
 
   # see redmine #1551
   it "raises a FrozenError on a frozen instance that would not be modified" do
-    -> { "hello".freeze.slice!(10..20)}.should raise_error(FrozenError)
+    -> { "hello".freeze.slice!(10..20)}.should.raise(FrozenError)
   end
 end
 
@@ -256,8 +256,8 @@ def to.method_missing(name) name == :to_int ? -2 : super; end
 
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
-    s.slice!(//).should be_an_instance_of(String)
-    s.slice!(/../).should be_an_instance_of(String)
+    s.slice!(//).should.instance_of?(String)
+    s.slice!(/../).should.instance_of?(String)
   end
 
   it "returns the matching portion of self with a multi byte character" do
@@ -274,11 +274,11 @@ def to.method_missing(name) name == :to_int ? -2 : super; end
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "this is a string".freeze.slice!(/s.*t/) }.should raise_error(FrozenError)
+    -> { "this is a string".freeze.slice!(/s.*t/) }.should.raise(FrozenError)
   end
 
   it "raises a FrozenError on a frozen instance that would not be modified" do
-    -> { "this is a string".freeze.slice!(/zzz/)  }.should raise_error(FrozenError)
+    -> { "this is a string".freeze.slice!(/zzz/)  }.should.raise(FrozenError)
   end
 end
 
@@ -316,8 +316,8 @@ def to.method_missing(name) name == :to_int ? -2 : super; end
 
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
-    s.slice!(/(.)(.)/, 0).should be_an_instance_of(String)
-    s.slice!(/(.)(.)/, 1).should be_an_instance_of(String)
+    s.slice!(/(.)(.)/, 0).should.instance_of?(String)
+    s.slice!(/(.)(.)/, 1).should.instance_of?(String)
   end
 
   it "returns the encoding aware capture for the given index" do
@@ -342,9 +342,9 @@ def to.method_missing(name) name == :to_int ? -2 : super; end
   end
 
   it "raises a FrozenError if self is frozen" do
-    -> { "this is a string".freeze.slice!(/s.*t/)  }.should raise_error(FrozenError)
-    -> { "this is a string".freeze.slice!(/zzz/, 0)}.should raise_error(FrozenError)
-    -> { "this is a string".freeze.slice!(/(.)/, 2)}.should raise_error(FrozenError)
+    -> { "this is a string".freeze.slice!(/s.*t/)  }.should.raise(FrozenError)
+    -> { "this is a string".freeze.slice!(/zzz/, 0)}.should.raise(FrozenError)
+    -> { "this is a string".freeze.slice!(/(.)/, 2)}.should.raise(FrozenError)
   end
 end
 
@@ -372,19 +372,19 @@ def to.method_missing(name) name == :to_int ? -2 : super; end
     o = mock('x')
     o.should_not_receive(:to_str)
 
-    -> { "hello".slice!(o) }.should raise_error(TypeError)
+    -> { "hello".slice!(o) }.should.raise(TypeError)
   end
 
   it "returns a subclass instance when given a subclass instance" do
     s = StringSpecs::MyString.new("el")
     r = "hello".slice!(s)
     r.should == "el"
-    r.should be_an_instance_of(String)
+    r.should.instance_of?(String)
   end
 
   it "raises a FrozenError if self is frozen" do
-    -> { "hello hello".freeze.slice!('llo')     }.should raise_error(FrozenError)
-    -> { "this is a string".freeze.slice!('zzz')}.should raise_error(FrozenError)
-    -> { "this is a string".freeze.slice!('zzz')}.should raise_error(FrozenError)
+    -> { "hello hello".freeze.slice!('llo')     }.should.raise(FrozenError)
+    -> { "this is a string".freeze.slice!('zzz')}.should.raise(FrozenError)
+    -> { "this is a string".freeze.slice!('zzz')}.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/split_spec.rb b/spec/ruby/core/string/split_spec.rb
index 3c6d1864d17..6e8c1c6219b 100644
--- a/spec/ruby/core/string/split_spec.rb
+++ b/spec/ruby/core/string/split_spec.rb
@@ -6,15 +6,15 @@
   it "throws an ArgumentError if the string  is not a valid" do
     s = "\xDF".dup.force_encoding(Encoding::UTF_8)
 
-    -> { s.split }.should raise_error(ArgumentError)
-    -> { s.split(':') }.should raise_error(ArgumentError)
+    -> { s.split }.should.raise(ArgumentError)
+    -> { s.split(':') }.should.raise(ArgumentError)
   end
 
   it "throws an ArgumentError if the pattern is not a valid string" do
     str = 'проверка'
     broken_str = "\xDF".dup.force_encoding(Encoding::UTF_8)
 
-    -> { str.split(broken_str) }.should raise_error(ArgumentError)
+    -> { str.split(broken_str) }.should.raise(ArgumentError)
   end
 
   it "splits on multibyte characters" do
@@ -94,7 +94,7 @@
   end
 
   it "raises a RangeError when the limit is larger than int" do
-    -> { "a,b".split(" ", 2147483649) }.should raise_error(RangeError)
+    -> { "a,b".split(" ", 2147483649) }.should.raise(RangeError)
   end
 
   it "defaults to $; when string isn't given or nil" do
@@ -119,21 +119,21 @@
         $; = old_fs
       end
     end
+  end
 
-    context "when $; is not nil" do
-      before do
-        suppress_warning do
-          @old_value, $; = $;, 'foobar'
-        end
+  context "when $; is not nil" do
+    before do
+      suppress_warning do
+        @old_value, $; = $;, 'foobar'
       end
+    end
 
-      after do
-        $; = @old_value
-      end
+    after do
+      $; = @old_value
+    end
 
-      it "warns" do
-        -> { "".split }.should complain(/warning: \$; is set to non-nil value/)
-      end
+    it "warns" do
+      -> { "".split }.should complain(/warning: \$; is set to non-nil value/)
     end
   end
 
@@ -197,11 +197,11 @@
       ["", ".", " "].each do |pat|
         [-1, 0, 1, 2].each do |limit|
           StringSpecs::MyString.new(str).split(pat, limit).each do |x|
-            x.should be_an_instance_of(String)
+            x.should.instance_of?(String)
           end
 
           str.split(StringSpecs::MyString.new(pat), limit).each do |x|
-            x.should be_an_instance_of(String)
+            x.should.instance_of?(String)
           end
         end
       end
@@ -231,7 +231,7 @@
   it "throws an ArgumentError if the string  is not a valid" do
     s = "\xDF".dup.force_encoding(Encoding::UTF_8)
 
-    -> { s.split(/./) }.should raise_error(ArgumentError)
+    -> { s.split(/./) }.should.raise(ArgumentError)
   end
 
   it "divides self on regexp matches" do
@@ -367,8 +367,8 @@
   end
 
   it "returns a type error if limit can't be converted to an integer" do
-    -> {"1.2.3.4".split(".", "three")}.should raise_error(TypeError)
-    -> {"1.2.3.4".split(".", nil)    }.should raise_error(TypeError)
+    -> {"1.2.3.4".split(".", "three")}.should.raise(TypeError)
+    -> {"1.2.3.4".split(".", nil)    }.should.raise(TypeError)
   end
 
   it "doesn't set $~" do
@@ -391,7 +391,7 @@
       [//, /:/, /\s+/].each do |pat|
         [-1, 0, 1, 2].each do |limit|
           StringSpecs::MyString.new(str).split(pat, limit).each do |x|
-            x.should be_an_instance_of(String)
+            x.should.instance_of?(String)
           end
         end
       end
@@ -413,7 +413,7 @@
     broken_str.force_encoding('binary')
     broken_str.chop!
     broken_str.force_encoding('utf-8')
-    ->{ broken_str.split(/\r\n|\r|\n/) }.should raise_error(ArgumentError)
+    ->{ broken_str.split(/\r\n|\r|\n/) }.should.raise(ArgumentError)
   end
 
   # See https://bugs.ruby-lang.org/issues/12689 and https://github.com/jruby/jruby/issues/4868
@@ -522,19 +522,19 @@
       StringSpecs::MyString.new("a|b").split("|") { |str| a << str }
       first, last = a
 
-      first.should be_an_instance_of(String)
+      first.should.instance_of?(String)
       first.should == "a"
 
-      last.should be_an_instance_of(String)
+      last.should.instance_of?(String)
       last.should == "b"
     end
   end
 
   it "raises a TypeError when not called with nil, String, or Regexp" do
-    -> { "hello".split(42) }.should raise_error(TypeError)
-    -> { "hello".split(:ll) }.should raise_error(TypeError)
-    -> { "hello".split(false) }.should raise_error(TypeError)
-    -> { "hello".split(Object.new) }.should raise_error(TypeError)
+    -> { "hello".split(42) }.should.raise(TypeError)
+    -> { "hello".split(:ll) }.should.raise(TypeError)
+    -> { "hello".split(false) }.should.raise(TypeError)
+    -> { "hello".split(Object.new) }.should.raise(TypeError)
   end
 
   it "returns Strings in the same encoding as self" do
diff --git a/spec/ruby/core/string/squeeze_spec.rb b/spec/ruby/core/string/squeeze_spec.rb
index 981d480684c..52b6e1eed44 100644
--- a/spec/ruby/core/string/squeeze_spec.rb
+++ b/spec/ruby/core/string/squeeze_spec.rb
@@ -51,8 +51,8 @@
 
   it "raises an ArgumentError when the parameter is out of sequence" do
     s = "--subbookkeeper--"
-    -> { s.squeeze("e-b") }.should raise_error(ArgumentError)
-    -> { s.squeeze("^e-b") }.should raise_error(ArgumentError)
+    -> { s.squeeze("e-b") }.should.raise(ArgumentError)
+    -> { s.squeeze("^e-b") }.should.raise(ArgumentError)
   end
 
   it "tries to convert each set arg to a string using to_str" do
@@ -71,20 +71,20 @@
   end
 
   it "raises a TypeError when one set arg can't be converted to a string" do
-    -> { "hello world".squeeze([])        }.should raise_error(TypeError)
-    -> { "hello world".squeeze(Object.new)}.should raise_error(TypeError)
-    -> { "hello world".squeeze(mock('x')) }.should raise_error(TypeError)
+    -> { "hello world".squeeze([])        }.should.raise(TypeError)
+    -> { "hello world".squeeze(Object.new)}.should.raise(TypeError)
+    -> { "hello world".squeeze(mock('x')) }.should.raise(TypeError)
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("oh no!!!").squeeze("!").should be_an_instance_of(String)
+    StringSpecs::MyString.new("oh no!!!").squeeze("!").should.instance_of?(String)
   end
 end
 
 describe "String#squeeze!" do
   it "modifies self in place and returns self" do
     a = "yellow moon"
-    a.squeeze!.should equal(a)
+    a.squeeze!.should.equal?(a)
     a.should == "yelow mon"
   end
 
@@ -97,15 +97,15 @@
 
   it "raises an ArgumentError when the parameter is out of sequence" do
     s = "--subbookkeeper--"
-    -> { s.squeeze!("e-b") }.should raise_error(ArgumentError)
-    -> { s.squeeze!("^e-b") }.should raise_error(ArgumentError)
+    -> { s.squeeze!("e-b") }.should.raise(ArgumentError)
+    -> { s.squeeze!("^e-b") }.should.raise(ArgumentError)
   end
 
   it "raises a FrozenError when self is frozen" do
     a = "yellow moon"
     a.freeze
 
-    -> { a.squeeze!("") }.should raise_error(FrozenError)
-    -> { a.squeeze!     }.should raise_error(FrozenError)
+    -> { a.squeeze!("") }.should.raise(FrozenError)
+    -> { a.squeeze!     }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/strip_spec.rb b/spec/ruby/core/string/strip_spec.rb
index edb6ea3b444..81994a7f2e2 100644
--- a/spec/ruby/core/string/strip_spec.rb
+++ b/spec/ruby/core/string/strip_spec.rb
@@ -20,7 +20,7 @@
 describe "String#strip!" do
   it "modifies self in place and returns self" do
     a = "   hello   "
-    a.strip!.should equal(a)
+    a.strip!.should.equal?(a)
     a.should == "hello"
 
     a = "\tgoodbye\r\v\n"
@@ -47,12 +47,12 @@
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "  hello  ".freeze.strip! }.should raise_error(FrozenError)
+    -> { "  hello  ".freeze.strip! }.should.raise(FrozenError)
   end
 
   # see #1552
   it "raises a FrozenError on a frozen instance that would not be modified" do
-    -> {"hello".freeze.strip! }.should raise_error(FrozenError)
-    -> {"".freeze.strip!      }.should raise_error(FrozenError)
+    -> {"hello".freeze.strip! }.should.raise(FrozenError)
+    -> {"".freeze.strip!      }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/sub_spec.rb b/spec/ruby/core/string/sub_spec.rb
index 6ff28ec851e..f0082fba593 100644
--- a/spec/ruby/core/string/sub_spec.rb
+++ b/spec/ruby/core/string/sub_spec.rb
@@ -7,7 +7,7 @@
     a = "hello"
     b = a.sub(/w.*$/, "*")
 
-    b.should_not equal(a)
+    b.should_not.equal?(a)
     b.should == "hello"
   end
 
@@ -147,16 +147,16 @@
 
   not_supported_on :opal do
     it "raises a TypeError when pattern is a Symbol" do
-      -> { "hello".sub(:woot, "x") }.should raise_error(TypeError)
+      -> { "hello".sub(:woot, "x") }.should.raise(TypeError)
     end
   end
 
   it "raises a TypeError when pattern is an Array" do
-    -> { "hello".sub([], "x") }.should raise_error(TypeError)
+    -> { "hello".sub([], "x") }.should.raise(TypeError)
   end
 
   it "raises a TypeError when pattern can't be converted to a string" do
-    -> { "hello".sub(Object.new, nil) }.should raise_error(TypeError)
+    -> { "hello".sub(Object.new, nil) }.should.raise(TypeError)
   end
 
   it "tries to convert replacement to a string using to_str" do
@@ -167,15 +167,15 @@
   end
 
   it "raises a TypeError when replacement can't be converted to a string" do
-    -> { "hello".sub(/[aeiou]/, []) }.should raise_error(TypeError)
-    -> { "hello".sub(/[aeiou]/, 99) }.should raise_error(TypeError)
+    -> { "hello".sub(/[aeiou]/, []) }.should.raise(TypeError)
+    -> { "hello".sub(/[aeiou]/, 99) }.should.raise(TypeError)
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("").sub(//, "").should be_an_instance_of(String)
-    StringSpecs::MyString.new("").sub(/foo/, "").should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").sub(/foo/, "").should be_an_instance_of(String)
-    StringSpecs::MyString.new("foo").sub("foo", "").should be_an_instance_of(String)
+    StringSpecs::MyString.new("").sub(//, "").should.instance_of?(String)
+    StringSpecs::MyString.new("").sub(/foo/, "").should.instance_of?(String)
+    StringSpecs::MyString.new("foo").sub(/foo/, "").should.instance_of?(String)
+    StringSpecs::MyString.new("foo").sub("foo", "").should.instance_of?(String)
   end
 
   it "sets $~ to MatchData of match and nil when there's none" do
@@ -281,7 +281,7 @@
 describe "String#sub! with pattern, replacement" do
   it "modifies self in place and returns self" do
     a = "hello"
-    a.sub!(/[aeiou]/, '*').should equal(a)
+    a.sub!(/[aeiou]/, '*').should.equal?(a)
     a.should == "h*llo"
   end
 
@@ -296,9 +296,9 @@
     s = "hello"
     s.freeze
 
-    -> { s.sub!(/ROAR/, "x")    }.should raise_error(FrozenError)
-    -> { s.sub!(/e/, "e")       }.should raise_error(FrozenError)
-    -> { s.sub!(/[aeiou]/, '*') }.should raise_error(FrozenError)
+    -> { s.sub!(/ROAR/, "x")    }.should.raise(FrozenError)
+    -> { s.sub!(/e/, "e")       }.should.raise(FrozenError)
+    -> { s.sub!(/[aeiou]/, '*') }.should.raise(FrozenError)
   end
 
   it "handles a pattern in a superset encoding" do
@@ -326,7 +326,7 @@
 describe "String#sub! with pattern and block" do
   it "modifies self in place and returns self" do
     a = "hello"
-    a.sub!(/[aeiou]/) { '*' }.should equal(a)
+    a.sub!(/[aeiou]/) { '*' }.should.equal?(a)
     a.should == "h*llo"
   end
 
@@ -357,16 +357,16 @@
 
   it "raises a RuntimeError if the string is modified while substituting" do
     str = "hello"
-    -> { str.sub!(//) { str << 'x' } }.should raise_error(RuntimeError)
+    -> { str.sub!(//) { str << 'x' } }.should.raise(RuntimeError)
   end
 
   it "raises a FrozenError when self is frozen" do
     s = "hello"
     s.freeze
 
-    -> { s.sub!(/ROAR/) { "x" }    }.should raise_error(FrozenError)
-    -> { s.sub!(/e/) { "e" }       }.should raise_error(FrozenError)
-    -> { s.sub!(/[aeiou]/) { '*' } }.should raise_error(FrozenError)
+    -> { s.sub!(/ROAR/) { "x" }    }.should.raise(FrozenError)
+    -> { s.sub!(/e/) { "e" }       }.should.raise(FrozenError)
+    -> { s.sub!(/[aeiou]/) { '*' } }.should.raise(FrozenError)
   end
 end
 
@@ -501,12 +501,12 @@
 
 describe "String#sub with pattern and without replacement and block" do
   it "raises a ArgumentError" do
-    -> { "abca".sub(/a/) }.should raise_error(ArgumentError)
+    -> { "abca".sub(/a/) }.should.raise(ArgumentError)
   end
 end
 
 describe "String#sub! with pattern and without replacement and block" do
   it "raises a ArgumentError" do
-    -> { "abca".sub!(/a/) }.should raise_error(ArgumentError)
+    -> { "abca".sub!(/a/) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/swapcase_spec.rb b/spec/ruby/core/string/swapcase_spec.rb
index 011a2135016..f0e6e0182cb 100644
--- a/spec/ruby/core/string/swapcase_spec.rb
+++ b/spec/ruby/core/string/swapcase_spec.rb
@@ -25,7 +25,7 @@
       swapcased.should == "aSSET"
       swapcased.size.should == 5
       swapcased.bytesize.should == 5
-      swapcased.ascii_only?.should be_true
+      swapcased.ascii_only?.should == true
     end
   end
 
@@ -49,7 +49,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { "aiS".swapcase(:turkic, :ascii) }.should raise_error(ArgumentError)
+      -> { "aiS".swapcase(:turkic, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -63,28 +63,28 @@
     end
 
     it "does not allow any other additional option" do
-      -> { "aiS".swapcase(:lithuanian, :ascii) }.should raise_error(ArgumentError)
+      -> { "aiS".swapcase(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
   it "does not allow the :fold option for upcasing" do
-    -> { "abc".swapcase(:fold) }.should raise_error(ArgumentError)
+    -> { "abc".swapcase(:fold) }.should.raise(ArgumentError)
   end
 
   it "does not allow invalid options" do
-    -> { "abc".swapcase(:invalid_option) }.should raise_error(ArgumentError)
+    -> { "abc".swapcase(:invalid_option) }.should.raise(ArgumentError)
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("").swapcase.should be_an_instance_of(String)
-    StringSpecs::MyString.new("hello").swapcase.should be_an_instance_of(String)
+    StringSpecs::MyString.new("").swapcase.should.instance_of?(String)
+    StringSpecs::MyString.new("hello").swapcase.should.instance_of?(String)
   end
 end
 
 describe "String#swapcase!" do
   it "modifies self in place" do
     a = "cYbEr_PuNk11"
-    a.swapcase!.should equal(a)
+    a.swapcase!.should.equal?(a)
     a.should == "CyBeR_pUnK11"
   end
 
@@ -114,7 +114,7 @@
       swapcased.should == "aSSET"
       swapcased.size.should == 5
       swapcased.bytesize.should == 5
-      swapcased.ascii_only?.should be_true
+      swapcased.ascii_only?.should == true
     end
   end
 
@@ -146,7 +146,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { a = "aiS"; a.swapcase!(:turkic, :ascii) }.should raise_error(ArgumentError)
+      -> { a = "aiS"; a.swapcase!(:turkic, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -164,16 +164,16 @@
     end
 
     it "does not allow any other additional option" do
-      -> { a = "aiS"; a.swapcase!(:lithuanian, :ascii) }.should raise_error(ArgumentError)
+      -> { a = "aiS"; a.swapcase!(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
   it "does not allow the :fold option for upcasing" do
-    -> { a = "abc"; a.swapcase!(:fold) }.should raise_error(ArgumentError)
+    -> { a = "abc"; a.swapcase!(:fold) }.should.raise(ArgumentError)
   end
 
   it "does not allow invalid options" do
-    -> { a = "abc"; a.swapcase!(:invalid_option) }.should raise_error(ArgumentError)
+    -> { a = "abc"; a.swapcase!(:invalid_option) }.should.raise(ArgumentError)
   end
 
   it "returns nil if no modifications were made" do
@@ -187,7 +187,7 @@
   it "raises a FrozenError when self is frozen" do
     ["", "hello"].each do |a|
       a.freeze
-      -> { a.swapcase! }.should raise_error(FrozenError)
+      -> { a.swapcase! }.should.raise(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/string/to_c_spec.rb b/spec/ruby/core/string/to_c_spec.rb
index 1813890e722..9cd0ed44014 100644
--- a/spec/ruby/core/string/to_c_spec.rb
+++ b/spec/ruby/core/string/to_c_spec.rb
@@ -38,7 +38,7 @@
   it "raises Encoding::CompatibilityError if String is in not ASCII-compatible encoding" do
     -> {
       '79+4i'.encode("UTF-16").to_c
-    }.should raise_error(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
+    }.should.raise(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
   end
 
   it "treats a sequence of underscores as an end of Complex string" do
diff --git a/spec/ruby/core/string/to_f_spec.rb b/spec/ruby/core/string/to_f_spec.rb
index abfd2517b69..bb09e4f2f31 100644
--- a/spec/ruby/core/string/to_f_spec.rb
+++ b/spec/ruby/core/string/to_f_spec.rb
@@ -120,12 +120,10 @@
     "\3771.2".b.to_f.should == 0
   end
 
-  ruby_version_is "3.2.3" do
-    it "raises Encoding::CompatibilityError if String is in not ASCII-compatible encoding" do
-      -> {
-        '1.2'.encode("UTF-16").to_f
-      }.should raise_error(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
-    end
+  it "raises Encoding::CompatibilityError if String is in not ASCII-compatible encoding" do
+    -> {
+      '1.2'.encode("UTF-16").to_f
+    }.should.raise(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
   end
 
   it "allows String representation without a fractional part" do
diff --git a/spec/ruby/core/string/to_i_spec.rb b/spec/ruby/core/string/to_i_spec.rb
index 39f69acda31..629750bd732 100644
--- a/spec/ruby/core/string/to_i_spec.rb
+++ b/spec/ruby/core/string/to_i_spec.rb
@@ -138,31 +138,31 @@
   end
 
   it "raises an ArgumentError for illegal bases (1, < 0 or > 36)" do
-    -> { "".to_i(1)  }.should raise_error(ArgumentError)
-    -> { "".to_i(-1) }.should raise_error(ArgumentError)
-    -> { "".to_i(37) }.should raise_error(ArgumentError)
+    -> { "".to_i(1)  }.should.raise(ArgumentError)
+    -> { "".to_i(-1) }.should.raise(ArgumentError)
+    -> { "".to_i(37) }.should.raise(ArgumentError)
   end
 
   it "returns an Integer for long strings with trailing spaces" do
     "0                             ".to_i.should == 0
-    "0                             ".to_i.should be_an_instance_of(Integer)
+    "0                             ".to_i.should.instance_of?(Integer)
 
     "10                             ".to_i.should == 10
-    "10                             ".to_i.should be_an_instance_of(Integer)
+    "10                             ".to_i.should.instance_of?(Integer)
 
     "-10                            ".to_i.should == -10
-    "-10                            ".to_i.should be_an_instance_of(Integer)
+    "-10                            ".to_i.should.instance_of?(Integer)
   end
 
   it "returns an Integer for long strings with leading spaces" do
     "                             0".to_i.should == 0
-    "                             0".to_i.should be_an_instance_of(Integer)
+    "                             0".to_i.should.instance_of?(Integer)
 
     "                             10".to_i.should == 10
-    "                             10".to_i.should be_an_instance_of(Integer)
+    "                             10".to_i.should.instance_of?(Integer)
 
     "                            -10".to_i.should == -10
-    "                            -10".to_i.should be_an_instance_of(Integer)
+    "                            -10".to_i.should.instance_of?(Integer)
   end
 
   it "returns the correct Integer for long strings" do
diff --git a/spec/ruby/core/string/to_r_spec.rb b/spec/ruby/core/string/to_r_spec.rb
index 4ffbb10d987..fb7c9d108ee 100644
--- a/spec/ruby/core/string/to_r_spec.rb
+++ b/spec/ruby/core/string/to_r_spec.rb
@@ -2,7 +2,7 @@
 
 describe "String#to_r" do
   it "returns a Rational object" do
-    String.new.to_r.should be_an_instance_of(Rational)
+    String.new.to_r.should.instance_of?(Rational)
   end
 
   it "returns (0/1) for the empty String" do
diff --git a/spec/ruby/core/string/tr_s_spec.rb b/spec/ruby/core/string/tr_s_spec.rb
index 693ff8ace21..22a193ec4be 100644
--- a/spec/ruby/core/string/tr_s_spec.rb
+++ b/spec/ruby/core/string/tr_s_spec.rb
@@ -54,7 +54,7 @@
   end
 
   it "returns String instances when called on a subclass" do
-    StringSpecs::MyString.new("hello").tr_s("e", "a").should be_an_instance_of(String)
+    StringSpecs::MyString.new("hello").tr_s("e", "a").should.instance_of?(String)
   end
 
   # http://redmine.ruby-lang.org/issues/show/1839
@@ -124,8 +124,8 @@
 
   it "raises a FrozenError if self is frozen" do
     s = "hello".freeze
-    -> { s.tr_s!("el", "ar") }.should raise_error(FrozenError)
-    -> { s.tr_s!("l", "r")   }.should raise_error(FrozenError)
-    -> { s.tr_s!("", "")     }.should raise_error(FrozenError)
+    -> { s.tr_s!("el", "ar") }.should.raise(FrozenError)
+    -> { s.tr_s!("l", "r")   }.should.raise(FrozenError)
+    -> { s.tr_s!("", "")     }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/tr_spec.rb b/spec/ruby/core/string/tr_spec.rb
index 8478ccc9d28..cb57c3851ee 100644
--- a/spec/ruby/core/string/tr_spec.rb
+++ b/spec/ruby/core/string/tr_spec.rb
@@ -30,11 +30,11 @@
   end
 
   it "raises an ArgumentError a descending range in the replacement as containing just the start character" do
-    -> { "hello".tr("a-y", "z-b") }.should raise_error(ArgumentError)
+    -> { "hello".tr("a-y", "z-b") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError a descending range in the source as empty" do
-    -> { "hello".tr("l-a", "z") }.should raise_error(ArgumentError)
+    -> { "hello".tr("l-a", "z") }.should.raise(ArgumentError)
   end
 
   it "translates chars not in from_string when it starts with a ^" do
@@ -66,7 +66,7 @@
   end
 
   it "returns Stringinstances when called on a subclass" do
-    StringSpecs::MyString.new("hello").tr("e", "a").should be_an_instance_of(String)
+    StringSpecs::MyString.new("hello").tr("e", "a").should.instance_of?(String)
   end
 
   # http://redmine.ruby-lang.org/issues/show/1839
@@ -119,8 +119,8 @@
 
   it "raises a FrozenError if self is frozen" do
     s = "abcdefghijklmnopqR".freeze
-    -> { s.tr!("cdefg", "12") }.should raise_error(FrozenError)
-    -> { s.tr!("R", "S")      }.should raise_error(FrozenError)
-    -> { s.tr!("", "")        }.should raise_error(FrozenError)
+    -> { s.tr!("cdefg", "12") }.should.raise(FrozenError)
+    -> { s.tr!("R", "S")      }.should.raise(FrozenError)
+    -> { s.tr!("", "")        }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/try_convert_spec.rb b/spec/ruby/core/string/try_convert_spec.rb
index 72ce5dd8b23..0c0219cd2e2 100644
--- a/spec/ruby/core/string/try_convert_spec.rb
+++ b/spec/ruby/core/string/try_convert_spec.rb
@@ -4,47 +4,47 @@
 describe "String.try_convert" do
   it "returns the argument if it's a String" do
     x = String.new
-    String.try_convert(x).should equal(x)
+    String.try_convert(x).should.equal?(x)
   end
 
   it "returns the argument if it's a kind of String" do
     x = StringSpecs::MyString.new
-    String.try_convert(x).should equal(x)
+    String.try_convert(x).should.equal?(x)
   end
 
   it "returns nil when the argument does not respond to #to_str" do
-    String.try_convert(Object.new).should be_nil
+    String.try_convert(Object.new).should == nil
   end
 
   it "sends #to_str to the argument and returns the result if it's nil" do
     obj = mock("to_str")
     obj.should_receive(:to_str).and_return(nil)
-    String.try_convert(obj).should be_nil
+    String.try_convert(obj).should == nil
   end
 
   it "sends #to_str to the argument and returns the result if it's a String" do
     x = String.new
     obj = mock("to_str")
     obj.should_receive(:to_str).and_return(x)
-    String.try_convert(obj).should equal(x)
+    String.try_convert(obj).should.equal?(x)
   end
 
   it "sends #to_str to the argument and returns the result if it's a kind of String" do
     x = StringSpecs::MyString.new
     obj = mock("to_str")
     obj.should_receive(:to_str).and_return(x)
-    String.try_convert(obj).should equal(x)
+    String.try_convert(obj).should.equal?(x)
   end
 
   it "sends #to_str to the argument and raises TypeError if it's not a kind of String" do
     obj = mock("to_str")
     obj.should_receive(:to_str).and_return(Object.new)
-    -> { String.try_convert obj }.should raise_error(TypeError, "can't convert MockObject to String (MockObject#to_str gives Object)")
+    -> { String.try_convert obj }.should raise_consistent_error(TypeError, "can't convert MockObject into String (MockObject#to_str gives Object)")
   end
 
   it "does not rescue exceptions raised by #to_str" do
     obj = mock("to_str")
     obj.should_receive(:to_str).and_raise(RuntimeError)
-    -> { String.try_convert obj }.should raise_error(RuntimeError)
+    -> { String.try_convert obj }.should.raise(RuntimeError)
   end
 end
diff --git a/spec/ruby/core/string/undump_spec.rb b/spec/ruby/core/string/undump_spec.rb
index 6ff220161c1..8516e24b3b0 100644
--- a/spec/ruby/core/string/undump_spec.rb
+++ b/spec/ruby/core/string/undump_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "always returns String instance" do
-    StringSpecs::MyString.new('"foo"').undump.should be_an_instance_of(String)
+    StringSpecs::MyString.new('"foo"').undump.should.instance_of?(String)
   end
 
   it "strips outer \"" do
@@ -396,46 +396,46 @@
 
   describe "Limitations" do
     it "cannot undump non ASCII-compatible string" do
-      -> { '"foo"'.encode('utf-16le').undump }.should raise_error(Encoding::CompatibilityError)
+      -> { '"foo"'.encode('utf-16le').undump }.should.raise(Encoding::CompatibilityError)
     end
   end
 
   describe "invalid dump" do
     it "raises RuntimeError exception if wrapping \" are missing" do
-      -> { 'foo'.undump }.should raise_error(RuntimeError, /invalid dumped string/)
-      -> { '"foo'.undump }.should raise_error(RuntimeError, /unterminated dumped string/)
-      -> { 'foo"'.undump }.should raise_error(RuntimeError, /invalid dumped string/)
-      -> { "'foo'".undump }.should raise_error(RuntimeError, /invalid dumped string/)
+      -> { 'foo'.undump }.should.raise(RuntimeError, /invalid dumped string/)
+      -> { '"foo'.undump }.should.raise(RuntimeError, /unterminated dumped string/)
+      -> { 'foo"'.undump }.should.raise(RuntimeError, /invalid dumped string/)
+      -> { "'foo'".undump }.should.raise(RuntimeError, /invalid dumped string/)
     end
 
     it "raises RuntimeError if there is incorrect \\x sequence" do
-      -> { '"\x"'.undump }.should raise_error(RuntimeError, /invalid hex escape/)
-      -> { '"\\x3y"'.undump }.should raise_error(RuntimeError, /invalid hex escape/)
+      -> { '"\x"'.undump }.should.raise(RuntimeError, /invalid hex escape/)
+      -> { '"\\x3y"'.undump }.should.raise(RuntimeError, /invalid hex escape/)
     end
 
     it "raises RuntimeError in there is incorrect \\u sequence" do
-      -> { '"\\u"'.undump }.should raise_error(RuntimeError, /invalid Unicode escape/)
-      -> { '"\\u{"'.undump }.should raise_error(RuntimeError, /invalid Unicode escape/)
-      -> { '"\\u{3042"'.undump }.should raise_error(RuntimeError, /invalid Unicode escape/)
-      -> { '"\\u"'.undump }.should raise_error(RuntimeError, /invalid Unicode escape/)
+      -> { '"\\u"'.undump }.should.raise(RuntimeError, /invalid Unicode escape/)
+      -> { '"\\u{"'.undump }.should.raise(RuntimeError, /invalid Unicode escape/)
+      -> { '"\\u{3042"'.undump }.should.raise(RuntimeError, /invalid Unicode escape/)
+      -> { '"\\u"'.undump }.should.raise(RuntimeError, /invalid Unicode escape/)
     end
 
     it "raises RuntimeError if there is malformed dump of non ASCII-compatible string" do
-      -> { '"".force_encoding("BINARY"'.undump }.should raise_error(RuntimeError, /invalid dumped string/)
-      -> { '"".force_encoding("Unknown")'.undump }.should raise_error(RuntimeError, /dumped string has unknown encoding name/)
-      -> { '"".force_encoding()'.undump }.should raise_error(RuntimeError, /invalid dumped string/)
+      -> { '"".force_encoding("BINARY"'.undump }.should.raise(RuntimeError, /invalid dumped string/)
+      -> { '"".force_encoding("Unknown")'.undump }.should.raise(RuntimeError, /dumped string has unknown encoding name/)
+      -> { '"".force_encoding()'.undump }.should.raise(RuntimeError, /invalid dumped string/)
     end
 
     it "raises RuntimeError if string contains \0 character" do
-      -> { "\"foo\0\"".undump }.should raise_error(RuntimeError, /string contains null byte/)
+      -> { "\"foo\0\"".undump }.should.raise(RuntimeError, /string contains null byte/)
     end
 
     it "raises RuntimeError if string contains non ASCII character" do
-      -> { "\"\u3042\"".undump }.should raise_error(RuntimeError, /non-ASCII character detected/)
+      -> { "\"\u3042\"".undump }.should.raise(RuntimeError, /non-ASCII character detected/)
     end
 
     it "raises RuntimeError if there are some excessive \"" do
-      -> { '" "" "'.undump }.should raise_error(RuntimeError, /invalid dumped string/)
+      -> { '" "" "'.undump }.should.raise(RuntimeError, /invalid dumped string/)
     end
   end
 end
diff --git a/spec/ruby/core/string/unicode_normalize_spec.rb b/spec/ruby/core/string/unicode_normalize_spec.rb
index 2e7d22394a2..92b3a46b43a 100644
--- a/spec/ruby/core/string/unicode_normalize_spec.rb
+++ b/spec/ruby/core/string/unicode_normalize_spec.rb
@@ -51,13 +51,13 @@
   it "raises an Encoding::CompatibilityError if string is not in an unicode encoding" do
     -> do
       [0xE0].pack('C').force_encoding("ISO-8859-1").unicode_normalize(:nfd)
-    end.should raise_error(Encoding::CompatibilityError)
+    end.should.raise(Encoding::CompatibilityError)
   end
 
   it "raises an ArgumentError if the specified form is invalid" do
     -> {
       @angstrom.unicode_normalize(:invalid_form)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
 
@@ -104,13 +104,13 @@
   it "raises an Encoding::CompatibilityError if the string is not in an unicode encoding" do
     -> {
       [0xE0].pack('C').force_encoding("ISO-8859-1").unicode_normalize!
-    }.should raise_error(Encoding::CompatibilityError)
+    }.should.raise(Encoding::CompatibilityError)
   end
 
   it "raises an ArgumentError if the specified form is invalid" do
     ohm = "\u2126"
     -> {
       ohm.unicode_normalize!(:invalid_form)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/unicode_normalized_spec.rb b/spec/ruby/core/string/unicode_normalized_spec.rb
index 91cf2086b25..3ca27d35ddf 100644
--- a/spec/ruby/core/string/unicode_normalized_spec.rb
+++ b/spec/ruby/core/string/unicode_normalized_spec.rb
@@ -38,38 +38,38 @@
   end
 
   it "raises an Encoding::CompatibilityError if the string is not in an unicode encoding" do
-    -> { @nfc_normalized_str.force_encoding("ISO-8859-1").unicode_normalized? }.should raise_error(Encoding::CompatibilityError)
+    -> { @nfc_normalized_str.force_encoding("ISO-8859-1").unicode_normalized? }.should.raise(Encoding::CompatibilityError)
   end
 
   it "raises an ArgumentError if the specified form is invalid" do
-    -> { @nfc_normalized_str.unicode_normalized?(:invalid_form) }.should raise_error(ArgumentError)
+    -> { @nfc_normalized_str.unicode_normalized?(:invalid_form) }.should.raise(ArgumentError)
   end
 
   it "returns true if str is in Unicode normalization form (nfc)" do
     str = "a\u0300"
-    str.unicode_normalized?(:nfc).should be_false
+    str.unicode_normalized?(:nfc).should == false
     str.unicode_normalize!(:nfc)
-    str.unicode_normalized?(:nfc).should be_true
+    str.unicode_normalized?(:nfc).should == true
   end
 
   it "returns true if str is in Unicode normalization form (nfd)" do
     str = "a\u00E0"
-    str.unicode_normalized?(:nfd).should be_false
+    str.unicode_normalized?(:nfd).should == false
     str.unicode_normalize!(:nfd)
-    str.unicode_normalized?(:nfd).should be_true
+    str.unicode_normalized?(:nfd).should == true
   end
 
   it "returns true if str is in Unicode normalization form (nfkc)" do
     str = "a\u0300"
-    str.unicode_normalized?(:nfkc).should be_false
+    str.unicode_normalized?(:nfkc).should == false
     str.unicode_normalize!(:nfkc)
-    str.unicode_normalized?(:nfkc).should be_true
+    str.unicode_normalized?(:nfkc).should == true
   end
 
   it "returns true if str is in Unicode normalization form (nfkd)" do
     str = "a\u00E0"
-    str.unicode_normalized?(:nfkd).should be_false
+    str.unicode_normalized?(:nfkd).should == false
     str.unicode_normalize!(:nfkd)
-    str.unicode_normalized?(:nfkd).should be_true
+    str.unicode_normalized?(:nfkd).should == true
   end
 end
diff --git a/spec/ruby/core/string/unpack/at_spec.rb b/spec/ruby/core/string/unpack/at_spec.rb
index d4133c23ee5..f4999f5922b 100644
--- a/spec/ruby/core/string/unpack/at_spec.rb
+++ b/spec/ruby/core/string/unpack/at_spec.rb
@@ -24,6 +24,6 @@
   end
 
   it "raises an ArgumentError if the count exceeds the size of the String" do
-    -> { "\x01\x02\x03\x04".unpack("C2@5C") }.should raise_error(ArgumentError)
+    -> { "\x01\x02\x03\x04".unpack("C2@5C") }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/unpack/b_spec.rb b/spec/ruby/core/string/unpack/b_spec.rb
index 70ea1cb6ad9..fac6ef5151e 100644
--- a/spec/ruby/core/string/unpack/b_spec.rb
+++ b/spec/ruby/core/string/unpack/b_spec.rb
@@ -89,7 +89,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "\x80\x00".unpack("B\x00B")
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -187,7 +187,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "\x01\x00".unpack("b\x00b")
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/string/unpack/c_spec.rb b/spec/ruby/core/string/unpack/c_spec.rb
index e42b027c7b8..d881015b5e0 100644
--- a/spec/ruby/core/string/unpack/c_spec.rb
+++ b/spec/ruby/core/string/unpack/c_spec.rb
@@ -38,7 +38,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "abc".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/string/unpack/carret_spec.rb b/spec/ruby/core/string/unpack/carret_spec.rb
new file mode 100644
index 00000000000..815df0c7185
--- /dev/null
+++ b/spec/ruby/core/string/unpack/carret_spec.rb
@@ -0,0 +1,43 @@
+# encoding: binary
+ruby_version_is "4.1" do
+  require_relative '../../../spec_helper'
+  require_relative '../fixtures/classes'
+  require_relative 'shared/basic'
+
+  describe "String#unpack with format '^'" do
+    it_behaves_like :string_unpack_basic, '^'
+    it_behaves_like :string_unpack_no_platform, '^'
+
+    it "returns the current offset that start from 0" do
+      "".unpack("^").should == [0]
+    end
+
+    it "returns the current offset after the last decode ended" do
+      "a".unpack("CC^").should == [97, nil, 1]
+    end
+
+    it "returns the current offset that start from the given offset" do
+      "abc".unpack("^", offset: 1).should == [1]
+    end
+
+    it "returns the offset moved by 'X'" do
+      "\x01\x02\x03\x04".unpack("C3X2^").should == [1, 2, 3, 1]
+    end
+
+    it "returns the offset moved by 'x'" do
+      "\x01\x02\x03\x04".unpack("Cx2^").should == [1, 3]
+    end
+
+    it "returns the offset to the position the previous decode ended" do
+      "foo".unpack("A4^").should == ["foo", 3]
+      "foo".unpack("a4^").should == ["foo", 3]
+      "foo".unpack("Z5^").should == ["foo", 3]
+    end
+
+    it "returns the offset including truncated part" do
+      "foo   ".unpack("A*^").should == ["foo", 6]
+      "foo\0".unpack("Z*^").should == ["foo", 4]
+      "foo\0\0\0".unpack("Z5^").should == ["foo", 5]
+    end
+  end
+end
diff --git a/spec/ruby/core/string/unpack/h_spec.rb b/spec/ruby/core/string/unpack/h_spec.rb
index 130b36401a7..0cf8d943a7f 100644
--- a/spec/ruby/core/string/unpack/h_spec.rb
+++ b/spec/ruby/core/string/unpack/h_spec.rb
@@ -59,7 +59,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "\x01\x10".unpack("H\x00H")
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -126,7 +126,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "\x01\x10".unpack("h\x00h")
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/string/unpack/m_spec.rb b/spec/ruby/core/string/unpack/m_spec.rb
index 357987a053d..c1c1eea629c 100644
--- a/spec/ruby/core/string/unpack/m_spec.rb
+++ b/spec/ruby/core/string/unpack/m_spec.rb
@@ -186,7 +186,7 @@
     end
 
     it "raises an ArgumentError for an invalid base64 character" do
-      -> { "dGV%zdA==".unpack("m0") }.should raise_error(ArgumentError)
+      -> { "dGV%zdA==".unpack("m0") }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/string/unpack/p_spec.rb b/spec/ruby/core/string/unpack/p_spec.rb
index cd48c0523d6..4103730269b 100644
--- a/spec/ruby/core/string/unpack/p_spec.rb
+++ b/spec/ruby/core/string/unpack/p_spec.rb
@@ -15,7 +15,7 @@
     packed = ["hello"].pack("P")
     packed.unpack("P5").should == ["hello"]
     packed.dup.unpack("P5").should == ["hello"]
-    -> { packed.to_sym.to_s.unpack("P5") }.should raise_error(ArgumentError, /no associated pointer/)
+    -> { packed.to_sym.to_s.unpack("P5") }.should.raise(ArgumentError, /no associated pointer/)
   end
 
   it "reads as many characters as specified" do
@@ -39,6 +39,6 @@
     packed = ["hello"].pack("p")
     packed.unpack("p").should == ["hello"]
     packed.dup.unpack("p").should == ["hello"]
-    -> { packed.to_sym.to_s.unpack("p") }.should raise_error(ArgumentError, /no associated pointer/)
+    -> { packed.to_sym.to_s.unpack("p") }.should.raise(ArgumentError, /no associated pointer/)
   end
 end
diff --git a/spec/ruby/core/string/unpack/percent_spec.rb b/spec/ruby/core/string/unpack/percent_spec.rb
index 0e27663195b..7142bbf2418 100644
--- a/spec/ruby/core/string/unpack/percent_spec.rb
+++ b/spec/ruby/core/string/unpack/percent_spec.rb
@@ -2,6 +2,6 @@
 
 describe "String#unpack with format '%'" do
   it "raises an Argument Error" do
-    -> { "abc".unpack("%") }.should raise_error(ArgumentError)
+    -> { "abc".unpack("%") }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/unpack/r_spec.rb b/spec/ruby/core/string/unpack/r_spec.rb
new file mode 100644
index 00000000000..a385951aa85
--- /dev/null
+++ b/spec/ruby/core/string/unpack/r_spec.rb
@@ -0,0 +1,85 @@
+# encoding: binary
+require_relative '../../../spec_helper'
+require_relative '../fixtures/classes'
+require_relative 'shared/basic'
+
+ruby_version_is "4.1" do
+  describe "String#unpack with format 'R'" do
+    it_behaves_like :string_unpack_basic, 'R'
+    it_behaves_like :string_unpack_no_platform, 'R'
+
+    it "decodes a ULEB128 integer" do
+      [ ["\x00",                                     [0]],
+        ["\x01",                                     [1]],
+        ["\x7f",                                     [127]],
+        ["\x80\x01",                                 [128]],
+        ["\xff\x7f",                                 [0x3fff]],
+        ["\x80\x80\x01",                             [0x4000]],
+        ["\xff\xff\xff\xff\x0f",                     [0xffffffff]],
+        ["\x80\x80\x80\x80\x10",                     [0x100000000]],
+        ["\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01", [0xffff_ffff_ffff_ffff]],
+      ].should be_computed_by(:unpack, "R")
+    end
+
+    it "decodes multiple values with '*' modifier" do
+      "\x01\x02".unpack("R*").should == [1, 2]
+      "\x7f\x80\x01".unpack("R*").should == [127, 128]
+    end
+
+    it "returns nil for incomplete data" do
+      "\xFF".unpack("R").should == [nil]
+      "\xFF".unpack1("R").should == nil
+    end
+
+    it "returns nil for remaining incomplete values after a valid one" do
+      bytes = [256].pack("R")
+      (bytes + "\xFF").unpack("RRRR").should == [256, nil, nil, nil]
+    end
+
+    it "skips incomplete values with '*' modifier" do
+      "\xFF".unpack("R*").should == []
+    end
+  end
+
+  describe "String#unpack with format 'r'" do
+    it_behaves_like :string_unpack_basic, 'r'
+    it_behaves_like :string_unpack_no_platform, 'r'
+
+    it "decodes a SLEB128 integer" do
+      [ ["\x00",      [0]],
+        ["\x01",      [1]],
+        ["\x7f",      [-1]],
+        ["\x7e",      [-2]],
+        ["\xff\x00",  [127]],
+        ["\x80\x01",  [128]],
+        ["\x81\x7f",  [-127]],
+        ["\x80\x7f",  [-128]],
+      ].should be_computed_by(:unpack, "r")
+    end
+
+    it "decodes larger numbers" do
+      "\xff\xff\x00".unpack("r").should == [0x3fff]
+      "\x80\x80\x01".unpack("r").should == [0x4000]
+      "\x81\x80\x7f".unpack("r").should == [-0x3fff]
+      "\x80\x80\x7f".unpack("r").should == [-0x4000]
+    end
+
+    it "decodes multiple values with '*' modifier" do
+      "\x00\x01\x7f".unpack("r*").should == [0, 1, -1]
+    end
+
+    it "returns nil for incomplete data" do
+      "\xFF".unpack("r").should == [nil]
+      "\xFF".unpack1("r").should == nil
+    end
+
+    it "returns nil for remaining incomplete values after a valid one" do
+      bytes = [256].pack("r")
+      (bytes + "\xFF").unpack("rrrr").should == [256, nil, nil, nil]
+    end
+
+    it "skips incomplete values with '*' modifier" do
+      "\xFF".unpack("r*").should == []
+    end
+  end
+end
diff --git a/spec/ruby/core/string/unpack/shared/basic.rb b/spec/ruby/core/string/unpack/shared/basic.rb
index 132c4ef08ac..2ee2d6899a7 100644
--- a/spec/ruby/core/string/unpack/shared/basic.rb
+++ b/spec/ruby/core/string/unpack/shared/basic.rb
@@ -1,27 +1,27 @@
 describe :string_unpack_basic, shared: true do
   it "ignores whitespace in the format string" do
-    "abc".unpack("a \t\n\v\f\r"+unpack_format).should be_an_instance_of(Array)
+    "abc".unpack("a \t\n\v\f\r"+unpack_format).should.instance_of?(Array)
   end
 
   it "calls #to_str to coerce the directives string" do
     d = mock("unpack directive")
     d.should_receive(:to_str).and_return("a"+unpack_format)
-    "abc".unpack(d).should be_an_instance_of(Array)
+    "abc".unpack(d).should.instance_of?(Array)
   end
 
   it "raises ArgumentError when a directive is unknown" do
-    -> { "abcdefgh".unpack("a K" + unpack_format) }.should raise_error(ArgumentError, "unknown unpack directive 'K' in 'a K#{unpack_format}'")
-    -> { "abcdefgh".unpack("a 0" + unpack_format) }.should raise_error(ArgumentError, "unknown unpack directive '0' in 'a 0#{unpack_format}'")
-    -> { "abcdefgh".unpack("a :" + unpack_format) }.should raise_error(ArgumentError, "unknown unpack directive ':' in 'a :#{unpack_format}'")
+    -> { "abcdefgh".unpack("a K" + unpack_format) }.should.raise(ArgumentError, "unknown unpack directive 'K' in 'a K#{unpack_format}'")
+    -> { "abcdefgh".unpack("a 0" + unpack_format) }.should.raise(ArgumentError, "unknown unpack directive '0' in 'a 0#{unpack_format}'")
+    -> { "abcdefgh".unpack("a :" + unpack_format) }.should.raise(ArgumentError, "unknown unpack directive ':' in 'a :#{unpack_format}'")
   end
 end
 
 describe :string_unpack_no_platform, shared: true do
   it "raises an ArgumentError when the format modifier is '_'" do
-    -> { "abcdefgh".unpack(unpack_format("_")) }.should raise_error(ArgumentError)
+    -> { "abcdefgh".unpack(unpack_format("_")) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when the format modifier is '!'" do
-    -> { "abcdefgh".unpack(unpack_format("!")) }.should raise_error(ArgumentError)
+    -> { "abcdefgh".unpack(unpack_format("!")) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/unpack/shared/float.rb b/spec/ruby/core/string/unpack/shared/float.rb
index 0133be2ecb4..5525c3fe73d 100644
--- a/spec/ruby/core/string/unpack/shared/float.rb
+++ b/spec/ruby/core/string/unpack/shared/float.rb
@@ -53,13 +53,13 @@
 
   it "decodes NaN" do
     # mumble mumble NaN mumble https://bugs.ruby-lang.org/issues/5884
-    [nan_value].pack(unpack_format).unpack(unpack_format).first.nan?.should be_true
+    [nan_value].pack(unpack_format).unpack(unpack_format).first.nan?.should == true
   end
 
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "\x9a\x999@33\xb3?".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -121,13 +121,13 @@
 
   it "decodes NaN" do
     # mumble mumble NaN mumble https://bugs.ruby-lang.org/issues/5884
-    [nan_value].pack(unpack_format).unpack(unpack_format).first.nan?.should be_true
+    [nan_value].pack(unpack_format).unpack(unpack_format).first.nan?.should == true
   end
 
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "@9\x99\x9a?\xb333".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -192,13 +192,13 @@
 
   it "decodes NaN" do
     # mumble mumble NaN mumble https://bugs.ruby-lang.org/issues/5884
-    [nan_value].pack(unpack_format).unpack(unpack_format).first.nan?.should be_true
+    [nan_value].pack(unpack_format).unpack(unpack_format).first.nan?.should == true
   end
 
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "333333\x07@ffffff\xf6?".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -262,13 +262,13 @@
 
   it "decodes NaN" do
     # mumble mumble NaN mumble https://bugs.ruby-lang.org/issues/5884
-    [nan_value].pack(unpack_format).unpack(unpack_format).first.nan?.should be_true
+    [nan_value].pack(unpack_format).unpack(unpack_format).first.nan?.should == true
   end
 
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "@\x07333333?\xf6ffffff".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/string/unpack/shared/integer.rb b/spec/ruby/core/string/unpack/shared/integer.rb
index eb994562251..c66156536b3 100644
--- a/spec/ruby/core/string/unpack/shared/integer.rb
+++ b/spec/ruby/core/string/unpack/shared/integer.rb
@@ -35,7 +35,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "abcd".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -90,7 +90,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "badc".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -146,7 +146,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "abcdefgh".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -202,7 +202,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "dcbahgfe".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -254,7 +254,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "badc".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
@@ -317,7 +317,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "hgfedcbadcfehgba".unpack(unpack_format("\000", 2))
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/string/unpack/shared/unicode.rb b/spec/ruby/core/string/unpack/shared/unicode.rb
index b056aaed0be..9b4e0c09de4 100644
--- a/spec/ruby/core/string/unpack/shared/unicode.rb
+++ b/spec/ruby/core/string/unpack/shared/unicode.rb
@@ -53,7 +53,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "\x01\x02".unpack("U\x00U")
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/string/unpack/u_spec.rb b/spec/ruby/core/string/unpack/u_spec.rb
index 68c8f6f11c1..720c1b85832 100644
--- a/spec/ruby/core/string/unpack/u_spec.rb
+++ b/spec/ruby/core/string/unpack/u_spec.rb
@@ -12,11 +12,11 @@
   it_behaves_like :string_unpack_taint, 'U'
 
   it "raises ArgumentError on a malformed byte sequence" do
-    -> { "\xE3".unpack('U') }.should raise_error(ArgumentError)
+    -> { "\xE3".unpack('U') }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError on a malformed byte sequence and doesn't continue when used with the * modifier" do
-    -> { "\xE3".unpack('U*') }.should raise_error(ArgumentError)
+    -> { "\xE3".unpack('U*') }.should.raise(ArgumentError)
   end
 end
 
diff --git a/spec/ruby/core/string/unpack/w_spec.rb b/spec/ruby/core/string/unpack/w_spec.rb
index d2ad657b09c..cc9aecac9c9 100644
--- a/spec/ruby/core/string/unpack/w_spec.rb
+++ b/spec/ruby/core/string/unpack/w_spec.rb
@@ -18,7 +18,7 @@
   it "raise ArgumentError for NULL bytes between directives" do
     -> {
       "\x01\x02\x03".unpack("w\x00w")
-    }.should raise_error(ArgumentError, /unknown unpack directive/)
+    }.should.raise(ArgumentError, /unknown unpack directive/)
   end
 
   it "ignores spaces between directives" do
diff --git a/spec/ruby/core/string/unpack/x_spec.rb b/spec/ruby/core/string/unpack/x_spec.rb
index 2926ebbe0f3..fb2e79fc1f7 100644
--- a/spec/ruby/core/string/unpack/x_spec.rb
+++ b/spec/ruby/core/string/unpack/x_spec.rb
@@ -24,11 +24,11 @@
   end
 
   it "raises an ArgumentError when passed the '*' modifier if the remaining bytes exceed the bytes from the index to the start of the String" do
-    -> { "abcd".unpack("CX*C") }.should raise_error(ArgumentError)
+    -> { "abcd".unpack("CX*C") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the count exceeds the bytes from current index to the start of the String" do
-    -> { "\x01\x02\x03\x04".unpack("C3X4C") }.should raise_error(ArgumentError)
+    -> { "\x01\x02\x03\x04".unpack("C3X4C") }.should.raise(ArgumentError)
   end
 end
 
@@ -57,6 +57,6 @@
   end
 
   it "raises an ArgumentError if the count exceeds the size of the String" do
-    -> { "\x01\x02\x03\x04".unpack("C2x3C") }.should raise_error(ArgumentError)
+    -> { "\x01\x02\x03\x04".unpack("C2x3C") }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/string/unpack1_spec.rb b/spec/ruby/core/string/unpack1_spec.rb
index cfb47fe6953..3b0fa90900a 100644
--- a/spec/ruby/core/string/unpack1_spec.rb
+++ b/spec/ruby/core/string/unpack1_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "raises an ArgumentError when the offset is negative" do
-    -> { "a".unpack1("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
+    -> { "a".unpack1("C", offset: -1) }.should.raise(ArgumentError, "offset can't be negative")
   end
 
   it "returns nil if the offset is at the end of the string" do
@@ -29,7 +29,7 @@
   end
 
   it "raises an ArgumentError when the offset is larger than the string bytesize" do
-    -> { "a".unpack1("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
+    -> { "a".unpack1("C", offset: 2) }.should.raise(ArgumentError, "offset outside of string")
   end
 
   context "with format 'm0'" do
@@ -41,7 +41,7 @@
     end
 
     it "raises an ArgumentError for an invalid base64 character" do
-      -> { "dGV%zdA==".unpack1("m0") }.should raise_error(ArgumentError)
+      -> { "dGV%zdA==".unpack1("m0") }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/string/unpack_spec.rb b/spec/ruby/core/string/unpack_spec.rb
index a0abf8fa994..28dbbc14c41 100644
--- a/spec/ruby/core/string/unpack_spec.rb
+++ b/spec/ruby/core/string/unpack_spec.rb
@@ -2,11 +2,11 @@
 
 describe "String#unpack" do
   it "raises a TypeError when passed nil" do
-    -> { "abc".unpack(nil) }.should raise_error(TypeError)
+    -> { "abc".unpack(nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed an Integer" do
-    -> { "abc".unpack(1) }.should raise_error(TypeError)
+    -> { "abc".unpack(1) }.should.raise(TypeError)
   end
 
   it "starts unpacking from the given offset" do
@@ -19,7 +19,7 @@
   end
 
   it "raises an ArgumentError when the offset is negative" do
-    -> { "a".unpack("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
+    -> { "a".unpack("C", offset: -1) }.should.raise(ArgumentError, "offset can't be negative")
   end
 
   it "returns nil if the offset is at the end of the string" do
@@ -27,6 +27,6 @@
   end
 
   it "raises an ArgumentError when the offset is larger than the string" do
-    -> { "a".unpack("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
+    -> { "a".unpack("C", offset: 2) }.should.raise(ArgumentError, "offset outside of string")
   end
 end
diff --git a/spec/ruby/core/string/upcase_spec.rb b/spec/ruby/core/string/upcase_spec.rb
index 652de5c2ef0..a6e18692672 100644
--- a/spec/ruby/core/string/upcase_spec.rb
+++ b/spec/ruby/core/string/upcase_spec.rb
@@ -24,7 +24,7 @@
       upcased.should == "ASSET"
       upcased.size.should == 5
       upcased.bytesize.should == 5
-      upcased.ascii_only?.should be_true
+      upcased.ascii_only?.should == true
     end
   end
 
@@ -48,7 +48,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { "i".upcase(:turkic, :ascii) }.should raise_error(ArgumentError)
+      -> { "i".upcase(:turkic, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -62,27 +62,27 @@
     end
 
     it "does not allow any other additional option" do
-      -> { "iß".upcase(:lithuanian, :ascii) }.should raise_error(ArgumentError)
+      -> { "iß".upcase(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
   it "does not allow the :fold option for upcasing" do
-    -> { "abc".upcase(:fold) }.should raise_error(ArgumentError)
+    -> { "abc".upcase(:fold) }.should.raise(ArgumentError)
   end
 
   it "does not allow invalid options" do
-    -> { "abc".upcase(:invalid_option) }.should raise_error(ArgumentError)
+    -> { "abc".upcase(:invalid_option) }.should.raise(ArgumentError)
   end
 
   it "returns a String instance for subclasses" do
-    StringSpecs::MyString.new("fooBAR").upcase.should be_an_instance_of(String)
+    StringSpecs::MyString.new("fooBAR").upcase.should.instance_of?(String)
   end
 end
 
 describe "String#upcase!" do
   it "modifies self in place" do
     a = "HeLlO"
-    a.upcase!.should equal(a)
+    a.upcase!.should.equal?(a)
     a.should == "HELLO"
   end
 
@@ -112,7 +112,7 @@
       upcased.should == "ASSET"
       upcased.size.should == 5
       upcased.bytesize.should == 5
-      upcased.ascii_only?.should be_true
+      upcased.ascii_only?.should == true
     end
   end
 
@@ -144,7 +144,7 @@
     end
 
     it "does not allow any other additional option" do
-      -> { a = "i"; a.upcase!(:turkic, :ascii) }.should raise_error(ArgumentError)
+      -> { a = "i"; a.upcase!(:turkic, :ascii) }.should.raise(ArgumentError)
     end
   end
 
@@ -162,16 +162,16 @@
     end
 
     it "does not allow any other additional option" do
-      -> { a = "iß"; a.upcase!(:lithuanian, :ascii) }.should raise_error(ArgumentError)
+      -> { a = "iß"; a.upcase!(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
   it "does not allow the :fold option for upcasing" do
-    -> { a = "abc"; a.upcase!(:fold) }.should raise_error(ArgumentError)
+    -> { a = "abc"; a.upcase!(:fold) }.should.raise(ArgumentError)
   end
 
   it "does not allow invalid options" do
-    -> { a = "abc"; a.upcase!(:invalid_option) }.should raise_error(ArgumentError)
+    -> { a = "abc"; a.upcase!(:invalid_option) }.should.raise(ArgumentError)
   end
 
   it "returns nil if no modifications were made" do
@@ -181,7 +181,7 @@
   end
 
   it "raises a FrozenError when self is frozen" do
-    -> { "HeLlo".freeze.upcase! }.should raise_error(FrozenError)
-    -> { "HELLO".freeze.upcase! }.should raise_error(FrozenError)
+    -> { "HeLlo".freeze.upcase! }.should.raise(FrozenError)
+    -> { "HELLO".freeze.upcase! }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/string/upto_spec.rb b/spec/ruby/core/string/upto_spec.rb
index 8bc847d5ac1..2eea06fd013 100644
--- a/spec/ruby/core/string/upto_spec.rb
+++ b/spec/ruby/core/string/upto_spec.rb
@@ -53,13 +53,13 @@ def other.to_str() "abd" end
   end
 
   it "raises a TypeError if other can't be converted to a string" do
-    -> { "abc".upto(123) { }      }.should raise_error(TypeError)
-    -> { "abc".upto(mock('x')){ } }.should raise_error(TypeError)
+    -> { "abc".upto(123) { }      }.should.raise(TypeError)
+    -> { "abc".upto(mock('x')){ } }.should.raise(TypeError)
   end
 
 
   it "does not work with symbols" do
-    -> { "a".upto(:c).to_a }.should raise_error(TypeError)
+    -> { "a".upto(:c).to_a }.should.raise(TypeError)
   end
 
   it "returns non-alphabetic characters in the ASCII range for single letters" do
@@ -83,7 +83,7 @@ def other.to_str() "abd" end
   it "raises Encoding::CompatibilityError when incompatible characters are given" do
     char1 = 'a'.dup.force_encoding("EUC-JP")
     char2 = 'b'.dup.force_encoding("ISO-2022-JP")
-    -> { char1.upto(char2) {} }.should raise_error(Encoding::CompatibilityError, "incompatible character encodings: EUC-JP and ISO-2022-JP")
+    -> { char1.upto(char2) {} }.should.raise(Encoding::CompatibilityError, "incompatible character encodings: EUC-JP and ISO-2022-JP")
   end
 
   describe "on sequence of numbers" do
@@ -95,7 +95,7 @@ def other.to_str() "abd" end
   describe "when no block is given" do
     it "returns an enumerator" do
       enum = "aaa".upto("baa", true)
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
       enum.count.should == 26**2
     end
 
diff --git a/spec/ruby/core/string/valid_encoding_spec.rb b/spec/ruby/core/string/valid_encoding_spec.rb
index 375035cd949..f29220fc999 100644
--- a/spec/ruby/core/string/valid_encoding_spec.rb
+++ b/spec/ruby/core/string/valid_encoding_spec.rb
@@ -2,132 +2,132 @@
 
 describe "String#valid_encoding?" do
   it "returns true if the String's encoding is valid" do
-    "a".valid_encoding?.should be_true
-    "\u{8365}\u{221}".valid_encoding?.should be_true
+    "a".valid_encoding?.should == true
+    "\u{8365}\u{221}".valid_encoding?.should == true
   end
 
   it "returns true if self is valid in the current encoding and other encodings" do
     str = +"\x77"
-    str.force_encoding('utf-8').valid_encoding?.should be_true
-    str.force_encoding('binary').valid_encoding?.should be_true
+    str.force_encoding('utf-8').valid_encoding?.should == true
+    str.force_encoding('binary').valid_encoding?.should == true
   end
 
   it "returns true for all encodings self is valid in" do
     str = +"\xE6\x9D\x94"
-    str.force_encoding('BINARY').valid_encoding?.should be_true
-    str.force_encoding('UTF-8').valid_encoding?.should be_true
-    str.force_encoding('US-ASCII').valid_encoding?.should be_false
-    str.force_encoding('Big5').valid_encoding?.should be_false
-    str.force_encoding('CP949').valid_encoding?.should be_false
-    str.force_encoding('Emacs-Mule').valid_encoding?.should be_false
-    str.force_encoding('EUC-JP').valid_encoding?.should be_false
-    str.force_encoding('EUC-KR').valid_encoding?.should be_false
-    str.force_encoding('EUC-TW').valid_encoding?.should be_false
-    str.force_encoding('GB18030').valid_encoding?.should be_false
-    str.force_encoding('GBK').valid_encoding?.should be_false
-    str.force_encoding('ISO-8859-1').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-2').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-3').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-4').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-5').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-6').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-7').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-8').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-9').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-10').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-11').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-13').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-14').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-15').valid_encoding?.should be_true
-    str.force_encoding('ISO-8859-16').valid_encoding?.should be_true
-    str.force_encoding('KOI8-R').valid_encoding?.should be_true
-    str.force_encoding('KOI8-U').valid_encoding?.should be_true
-    str.force_encoding('Shift_JIS').valid_encoding?.should be_false
-    "\xD8\x00".dup.force_encoding('UTF-16BE').valid_encoding?.should be_false
-    "\x00\xD8".dup.force_encoding('UTF-16LE').valid_encoding?.should be_false
-    "\x04\x03\x02\x01".dup.force_encoding('UTF-32BE').valid_encoding?.should be_false
-    "\x01\x02\x03\x04".dup.force_encoding('UTF-32LE').valid_encoding?.should be_false
-    str.force_encoding('Windows-1251').valid_encoding?.should be_true
-    str.force_encoding('IBM437').valid_encoding?.should be_true
-    str.force_encoding('IBM737').valid_encoding?.should be_true
-    str.force_encoding('IBM775').valid_encoding?.should be_true
-    str.force_encoding('CP850').valid_encoding?.should be_true
-    str.force_encoding('IBM852').valid_encoding?.should be_true
-    str.force_encoding('CP852').valid_encoding?.should be_true
-    str.force_encoding('IBM855').valid_encoding?.should be_true
-    str.force_encoding('CP855').valid_encoding?.should be_true
-    str.force_encoding('IBM857').valid_encoding?.should be_true
-    str.force_encoding('IBM860').valid_encoding?.should be_true
-    str.force_encoding('IBM861').valid_encoding?.should be_true
-    str.force_encoding('IBM862').valid_encoding?.should be_true
-    str.force_encoding('IBM863').valid_encoding?.should be_true
-    str.force_encoding('IBM864').valid_encoding?.should be_true
-    str.force_encoding('IBM865').valid_encoding?.should be_true
-    str.force_encoding('IBM866').valid_encoding?.should be_true
-    str.force_encoding('IBM869').valid_encoding?.should be_true
-    str.force_encoding('Windows-1258').valid_encoding?.should be_true
-    str.force_encoding('GB1988').valid_encoding?.should be_true
-    str.force_encoding('macCentEuro').valid_encoding?.should be_true
-    str.force_encoding('macCroatian').valid_encoding?.should be_true
-    str.force_encoding('macCyrillic').valid_encoding?.should be_true
-    str.force_encoding('macGreek').valid_encoding?.should be_true
-    str.force_encoding('macIceland').valid_encoding?.should be_true
-    str.force_encoding('macRoman').valid_encoding?.should be_true
-    str.force_encoding('macRomania').valid_encoding?.should be_true
-    str.force_encoding('macThai').valid_encoding?.should be_true
-    str.force_encoding('macTurkish').valid_encoding?.should be_true
-    str.force_encoding('macUkraine').valid_encoding?.should be_true
-    str.force_encoding('stateless-ISO-2022-JP').valid_encoding?.should be_false
-    str.force_encoding('eucJP-ms').valid_encoding?.should be_false
-    str.force_encoding('CP51932').valid_encoding?.should be_false
-    str.force_encoding('GB2312').valid_encoding?.should be_false
-    str.force_encoding('GB12345').valid_encoding?.should be_false
-    str.force_encoding('ISO-2022-JP').valid_encoding?.should be_true
-    str.force_encoding('ISO-2022-JP-2').valid_encoding?.should be_true
-    str.force_encoding('CP50221').valid_encoding?.should be_true
-    str.force_encoding('Windows-1252').valid_encoding?.should be_true
-    str.force_encoding('Windows-1250').valid_encoding?.should be_true
-    str.force_encoding('Windows-1256').valid_encoding?.should be_true
-    str.force_encoding('Windows-1253').valid_encoding?.should be_true
-    str.force_encoding('Windows-1255').valid_encoding?.should be_true
-    str.force_encoding('Windows-1254').valid_encoding?.should be_true
-    str.force_encoding('TIS-620').valid_encoding?.should be_true
-    str.force_encoding('Windows-874').valid_encoding?.should be_true
-    str.force_encoding('Windows-1257').valid_encoding?.should be_true
-    str.force_encoding('Windows-31J').valid_encoding?.should be_false
-    str.force_encoding('MacJapanese').valid_encoding?.should be_false
-    str.force_encoding('UTF-7').valid_encoding?.should be_true
-    str.force_encoding('UTF8-MAC').valid_encoding?.should be_true
+    str.force_encoding('BINARY').valid_encoding?.should == true
+    str.force_encoding('UTF-8').valid_encoding?.should == true
+    str.force_encoding('US-ASCII').valid_encoding?.should == false
+    str.force_encoding('Big5').valid_encoding?.should == false
+    str.force_encoding('CP949').valid_encoding?.should == false
+    str.force_encoding('Emacs-Mule').valid_encoding?.should == false
+    str.force_encoding('EUC-JP').valid_encoding?.should == false
+    str.force_encoding('EUC-KR').valid_encoding?.should == false
+    str.force_encoding('EUC-TW').valid_encoding?.should == false
+    str.force_encoding('GB18030').valid_encoding?.should == false
+    str.force_encoding('GBK').valid_encoding?.should == false
+    str.force_encoding('ISO-8859-1').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-2').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-3').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-4').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-5').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-6').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-7').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-8').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-9').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-10').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-11').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-13').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-14').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-15').valid_encoding?.should == true
+    str.force_encoding('ISO-8859-16').valid_encoding?.should == true
+    str.force_encoding('KOI8-R').valid_encoding?.should == true
+    str.force_encoding('KOI8-U').valid_encoding?.should == true
+    str.force_encoding('Shift_JIS').valid_encoding?.should == false
+    "\xD8\x00".dup.force_encoding('UTF-16BE').valid_encoding?.should == false
+    "\x00\xD8".dup.force_encoding('UTF-16LE').valid_encoding?.should == false
+    "\x04\x03\x02\x01".dup.force_encoding('UTF-32BE').valid_encoding?.should == false
+    "\x01\x02\x03\x04".dup.force_encoding('UTF-32LE').valid_encoding?.should == false
+    str.force_encoding('Windows-1251').valid_encoding?.should == true
+    str.force_encoding('IBM437').valid_encoding?.should == true
+    str.force_encoding('IBM737').valid_encoding?.should == true
+    str.force_encoding('IBM775').valid_encoding?.should == true
+    str.force_encoding('CP850').valid_encoding?.should == true
+    str.force_encoding('IBM852').valid_encoding?.should == true
+    str.force_encoding('CP852').valid_encoding?.should == true
+    str.force_encoding('IBM855').valid_encoding?.should == true
+    str.force_encoding('CP855').valid_encoding?.should == true
+    str.force_encoding('IBM857').valid_encoding?.should == true
+    str.force_encoding('IBM860').valid_encoding?.should == true
+    str.force_encoding('IBM861').valid_encoding?.should == true
+    str.force_encoding('IBM862').valid_encoding?.should == true
+    str.force_encoding('IBM863').valid_encoding?.should == true
+    str.force_encoding('IBM864').valid_encoding?.should == true
+    str.force_encoding('IBM865').valid_encoding?.should == true
+    str.force_encoding('IBM866').valid_encoding?.should == true
+    str.force_encoding('IBM869').valid_encoding?.should == true
+    str.force_encoding('Windows-1258').valid_encoding?.should == true
+    str.force_encoding('GB1988').valid_encoding?.should == true
+    str.force_encoding('macCentEuro').valid_encoding?.should == true
+    str.force_encoding('macCroatian').valid_encoding?.should == true
+    str.force_encoding('macCyrillic').valid_encoding?.should == true
+    str.force_encoding('macGreek').valid_encoding?.should == true
+    str.force_encoding('macIceland').valid_encoding?.should == true
+    str.force_encoding('macRoman').valid_encoding?.should == true
+    str.force_encoding('macRomania').valid_encoding?.should == true
+    str.force_encoding('macThai').valid_encoding?.should == true
+    str.force_encoding('macTurkish').valid_encoding?.should == true
+    str.force_encoding('macUkraine').valid_encoding?.should == true
+    str.force_encoding('stateless-ISO-2022-JP').valid_encoding?.should == false
+    str.force_encoding('eucJP-ms').valid_encoding?.should == false
+    str.force_encoding('CP51932').valid_encoding?.should == false
+    str.force_encoding('GB2312').valid_encoding?.should == false
+    str.force_encoding('GB12345').valid_encoding?.should == false
+    str.force_encoding('ISO-2022-JP').valid_encoding?.should == true
+    str.force_encoding('ISO-2022-JP-2').valid_encoding?.should == true
+    str.force_encoding('CP50221').valid_encoding?.should == true
+    str.force_encoding('Windows-1252').valid_encoding?.should == true
+    str.force_encoding('Windows-1250').valid_encoding?.should == true
+    str.force_encoding('Windows-1256').valid_encoding?.should == true
+    str.force_encoding('Windows-1253').valid_encoding?.should == true
+    str.force_encoding('Windows-1255').valid_encoding?.should == true
+    str.force_encoding('Windows-1254').valid_encoding?.should == true
+    str.force_encoding('TIS-620').valid_encoding?.should == true
+    str.force_encoding('Windows-874').valid_encoding?.should == true
+    str.force_encoding('Windows-1257').valid_encoding?.should == true
+    str.force_encoding('Windows-31J').valid_encoding?.should == false
+    str.force_encoding('MacJapanese').valid_encoding?.should == false
+    str.force_encoding('UTF-7').valid_encoding?.should == true
+    str.force_encoding('UTF8-MAC').valid_encoding?.should == true
   end
 
   it "returns true for IBM720 encoding self is valid in" do
     str = +"\xE6\x9D\x94"
-    str.force_encoding('IBM720').valid_encoding?.should be_true
-    str.force_encoding('CP720').valid_encoding?.should be_true
+    str.force_encoding('IBM720').valid_encoding?.should == true
+    str.force_encoding('CP720').valid_encoding?.should == true
   end
 
   it "returns false if self is valid in one encoding, but invalid in the one it's tagged with" do
     str = +"\u{8765}"
-    str.valid_encoding?.should be_true
+    str.valid_encoding?.should == true
     str.force_encoding('ascii')
-    str.valid_encoding?.should be_false
+    str.valid_encoding?.should == false
   end
 
   it "returns false if self contains a character invalid in the associated encoding" do
-    "abc#{[0x80].pack('C')}".dup.force_encoding('ascii').valid_encoding?.should be_false
+    "abc#{[0x80].pack('C')}".dup.force_encoding('ascii').valid_encoding?.should == false
   end
 
   it "returns false if a valid String had an invalid character appended to it" do
     str = +"a"
-    str.valid_encoding?.should be_true
+    str.valid_encoding?.should == true
     str << [0xDD].pack('C').force_encoding('utf-8')
-    str.valid_encoding?.should be_false
+    str.valid_encoding?.should == false
   end
 
   it "returns true if an invalid string is appended another invalid one but both make a valid string" do
     str = [0xD0].pack('C').force_encoding('utf-8')
-    str.valid_encoding?.should be_false
+    str.valid_encoding?.should == false
     str << [0xBF].pack('C').force_encoding('utf-8')
-    str.valid_encoding?.should be_true
+    str.valid_encoding?.should == true
   end
 end
diff --git a/spec/ruby/core/struct/deconstruct_keys_spec.rb b/spec/ruby/core/struct/deconstruct_keys_spec.rb
index e16b50f930c..590e1ab40b1 100644
--- a/spec/ruby/core/struct/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/struct/deconstruct_keys_spec.rb
@@ -14,7 +14,7 @@
 
     -> {
       obj.deconstruct_keys
-    }.should raise_error(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
+    }.should.raise(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
   end
 
   it "returns only specified keys" do
@@ -106,7 +106,7 @@
 
     -> {
       s.deconstruct_keys([key])
-    }.should raise_error(TypeError, /can't convert MockObject to Integer/)
+    }.should raise_consistent_error(TypeError, /can't convert MockObject into Integer/)
   end
 
   it "raises TypeError if index is not a String, a Symbol and not convertible to Integer" do
@@ -115,16 +115,16 @@
 
     -> {
       s.deconstruct_keys([0, []])
-    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+    }.should.raise(TypeError, "no implicit conversion of Array into Integer")
   end
 
   it "raise TypeError if passed anything except nil or array" do
     struct = Struct.new(:x, :y)
     s = struct.new(1, 2)
 
-    -> { s.deconstruct_keys('x') }.should raise_error(TypeError, /expected Array or nil/)
-    -> { s.deconstruct_keys(1)   }.should raise_error(TypeError, /expected Array or nil/)
-    -> { s.deconstruct_keys(:x)  }.should raise_error(TypeError, /expected Array or nil/)
-    -> { s.deconstruct_keys({})  }.should raise_error(TypeError, /expected Array or nil/)
+    -> { s.deconstruct_keys('x') }.should.raise(TypeError, /expected Array or nil/)
+    -> { s.deconstruct_keys(1)   }.should.raise(TypeError, /expected Array or nil/)
+    -> { s.deconstruct_keys(:x)  }.should.raise(TypeError, /expected Array or nil/)
+    -> { s.deconstruct_keys({})  }.should.raise(TypeError, /expected Array or nil/)
   end
 end
diff --git a/spec/ruby/core/struct/dig_spec.rb b/spec/ruby/core/struct/dig_spec.rb
index 93a52dbbe15..52e4d1dd9ae 100644
--- a/spec/ruby/core/struct/dig_spec.rb
+++ b/spec/ruby/core/struct/dig_spec.rb
@@ -32,11 +32,11 @@
     instance = @klass.new(1)
     -> {
       instance.dig(:a, 3)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError if no arguments provided" do
-    -> { @instance.dig }.should raise_error(ArgumentError)
+    -> { @instance.dig }.should.raise(ArgumentError)
   end
 
   it "calls #dig on any intermediate step with the rest of the sequence as arguments" do
diff --git a/spec/ruby/core/struct/each_pair_spec.rb b/spec/ruby/core/struct/each_pair_spec.rb
index 1230ca90263..db146c81e9c 100644
--- a/spec/ruby/core/struct/each_pair_spec.rb
+++ b/spec/ruby/core/struct/each_pair_spec.rb
@@ -21,11 +21,11 @@
   end
 
   it "returns self if passed a block" do
-    @car.each_pair {}.should equal(@car)
+    @car.each_pair {}.should.equal?(@car)
   end
 
   it "returns an Enumerator if not passed a block" do
-    @car.each_pair.should be_an_instance_of(Enumerator)
+    @car.each_pair.should.instance_of?(Enumerator)
   end
 
   it_behaves_like :struct_accessor, :each_pair
diff --git a/spec/ruby/core/struct/each_spec.rb b/spec/ruby/core/struct/each_spec.rb
index 41c0fbd4d0d..4fbdfee02a9 100644
--- a/spec/ruby/core/struct/each_spec.rb
+++ b/spec/ruby/core/struct/each_spec.rb
@@ -19,7 +19,7 @@
 
   it "returns an Enumerator if not passed a block" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    car.each.should be_an_instance_of(Enumerator)
+    car.each.should.instance_of?(Enumerator)
   end
 
   it_behaves_like :struct_accessor, :each
diff --git a/spec/ruby/core/struct/element_reference_spec.rb b/spec/ruby/core/struct/element_reference_spec.rb
index 0f6d547f665..b94f3aae8cb 100644
--- a/spec/ruby/core/struct/element_reference_spec.rb
+++ b/spec/ruby/core/struct/element_reference_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Struct[]" do
   it "is a synonym for new" do
-    StructClasses::Ruby['2.0', 'i686'].should be_kind_of(StructClasses::Ruby)
+    StructClasses::Ruby['2.0', 'i686'].should.is_a?(StructClasses::Ruby)
   end
 end
 
@@ -26,20 +26,20 @@
 
   it "fails when it does not know about the requested attribute" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    -> { car[3]        }.should raise_error(IndexError)
-    -> { car[-4]       }.should raise_error(IndexError)
-    -> { car[:body]    }.should raise_error(NameError)
-    -> { car['wheels'] }.should raise_error(NameError)
+    -> { car[3]        }.should.raise(IndexError)
+    -> { car[-4]       }.should.raise(IndexError)
+    -> { car[:body]    }.should.raise(NameError)
+    -> { car['wheels'] }.should.raise(NameError)
   end
 
   it "fails if passed too many arguments" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    -> { car[:make, :model] }.should raise_error(ArgumentError)
+    -> { car[:make, :model] }.should.raise(ArgumentError)
   end
 
   it "fails if not passed a string, symbol, or integer" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    -> { car[Object.new] }.should raise_error(TypeError)
+    -> { car[Object.new] }.should.raise(TypeError)
   end
 
   it "returns attribute names that contain hyphens" do
diff --git a/spec/ruby/core/struct/element_set_spec.rb b/spec/ruby/core/struct/element_set_spec.rb
index 0a0e34a5eee..e5438ca09a0 100644
--- a/spec/ruby/core/struct/element_set_spec.rb
+++ b/spec/ruby/core/struct/element_set_spec.rb
@@ -21,16 +21,16 @@
   it "fails when trying to assign attributes which don't exist" do
     car = StructClasses::Car.new('Ford', 'Ranger')
 
-    -> { car[:something] = true }.should raise_error(NameError)
-    -> { car[3] = true          }.should raise_error(IndexError)
-    -> { car[-4] = true         }.should raise_error(IndexError)
-    -> { car[Object.new] = true }.should raise_error(TypeError)
+    -> { car[:something] = true }.should.raise(NameError)
+    -> { car[3] = true          }.should.raise(IndexError)
+    -> { car[-4] = true         }.should.raise(IndexError)
+    -> { car[Object.new] = true }.should.raise(TypeError)
   end
 
   it "raises a FrozenError on a frozen struct" do
     car = StructClasses::Car.new('Ford', 'Ranger')
     car.freeze
 
-    -> { car[:model] = 'Escape' }.should raise_error(FrozenError)
+    -> { car[:model] = 'Escape' }.should.raise(FrozenError)
   end
 end
diff --git a/spec/ruby/core/struct/eql_spec.rb b/spec/ruby/core/struct/eql_spec.rb
index c864b2b943c..327c9272782 100644
--- a/spec/ruby/core/struct/eql_spec.rb
+++ b/spec/ruby/core/struct/eql_spec.rb
@@ -8,6 +8,6 @@
   it "returns false if any corresponding elements are not #eql?" do
     car = StructClasses::Car.new("Honda", "Accord", 1998)
     similar_car = StructClasses::Car.new("Honda", "Accord", 1998.0)
-    car.should_not eql(similar_car)
+    car.should_not.eql?(similar_car)
   end
 end
diff --git a/spec/ruby/core/struct/hash_spec.rb b/spec/ruby/core/struct/hash_spec.rb
index 53361eb7a95..750387b326e 100644
--- a/spec/ruby/core/struct/hash_spec.rb
+++ b/spec/ruby/core/struct/hash_spec.rb
@@ -8,14 +8,14 @@
     [StructClasses::Ruby.new("1.8.6", "PPC"),
      StructClasses::Car.new("Hugo", "Foo", "1972")].each do |stc|
       stc.hash.should == stc.dup.hash
-      stc.hash.should be_kind_of(Integer)
+      stc.hash.should.is_a?(Integer)
     end
   end
 
   it "returns the same value if structs are #eql?" do
     car = StructClasses::Car.new("Honda", "Accord", "1998")
     similar_car = StructClasses::Car.new("Honda", "Accord", "1998")
-    car.should eql(similar_car)
+    car.should.eql?(similar_car)
     car.hash.should == similar_car.hash
   end
 
diff --git a/spec/ruby/core/struct/initialize_spec.rb b/spec/ruby/core/struct/initialize_spec.rb
index 096566558bf..c824f52e13c 100644
--- a/spec/ruby/core/struct/initialize_spec.rb
+++ b/spec/ruby/core/struct/initialize_spec.rb
@@ -4,7 +4,7 @@
 describe "Struct#initialize" do
 
   it "is private" do
-    StructClasses::Car.should have_private_instance_method(:initialize)
+    StructClasses::Car.private_instance_methods(true).should.include?(:initialize)
   end
 
   it 'allows valid Ruby method names for members' do
@@ -59,4 +59,16 @@
     data.version.should == "3.2"
     data.platform.should == "OS"
   end
+
+  it "can be called via delegated ... from a prepended module" do
+    wrapper = Module.new do
+      def initialize(...)
+        super(...)
+      end
+    end
+
+    klass = Class.new(Struct.new(:a)) { prepend wrapper }
+    s = klass.new("x")
+    s.a.should == "x"
+  end
 end
diff --git a/spec/ruby/core/struct/instance_variable_get_spec.rb b/spec/ruby/core/struct/instance_variable_get_spec.rb
index e4a3ea87dc4..e3555cd246e 100644
--- a/spec/ruby/core/struct/instance_variable_get_spec.rb
+++ b/spec/ruby/core/struct/instance_variable_get_spec.rb
@@ -4,7 +4,7 @@
 describe "Struct#instance_variable_get" do
   it "returns nil for attributes" do
     car = StructClasses::Car.new("Hugo", "Foo", "1972")
-    car.instance_variable_get(:@make).should be_nil
+    car.instance_variable_get(:@make).should == nil
   end
 
   it "returns a user value for variables with the same name as attributes" do
diff --git a/spec/ruby/core/struct/keyword_init_spec.rb b/spec/ruby/core/struct/keyword_init_spec.rb
index 536b82041ae..42fcd3cc290 100644
--- a/spec/ruby/core/struct/keyword_init_spec.rb
+++ b/spec/ruby/core/struct/keyword_init_spec.rb
@@ -5,36 +5,36 @@
 describe "StructClass#keyword_init?" do
   it "returns true for a struct that accepts keyword arguments to initialize" do
     struct = Struct.new(:arg, keyword_init: true)
-    struct.keyword_init?.should be_true
+    struct.keyword_init?.should == true
   end
 
   it "returns false for a struct that does not accept keyword arguments to initialize" do
     struct = Struct.new(:arg, keyword_init: false)
-    struct.keyword_init?.should be_false
+    struct.keyword_init?.should == false
   end
 
   it "returns nil for a struct that did not explicitly specify keyword_init" do
     struct = Struct.new(:arg)
-    struct.keyword_init?.should be_nil
+    struct.keyword_init?.should == nil
   end
 
   it "returns nil for a struct that does specify keyword_init to be nil" do
     struct = Struct.new(:arg, keyword_init: nil)
-    struct.keyword_init?.should be_nil
+    struct.keyword_init?.should == nil
   end
 
   it "returns true for any truthy value, not just for true" do
     struct = Struct.new(:arg, keyword_init: 1)
-    struct.keyword_init?.should be_true
+    struct.keyword_init?.should == true
 
     struct = Struct.new(:arg, keyword_init: "")
-    struct.keyword_init?.should be_true
+    struct.keyword_init?.should == true
 
     struct = Struct.new(:arg, keyword_init: [])
-    struct.keyword_init?.should be_true
+    struct.keyword_init?.should == true
 
     struct = Struct.new(:arg, keyword_init: {})
-    struct.keyword_init?.should be_true
+    struct.keyword_init?.should == true
   end
 
   context "class inheriting Struct" do
diff --git a/spec/ruby/core/struct/new_spec.rb b/spec/ruby/core/struct/new_spec.rb
index 741d6889af0..b3ece2efed5 100644
--- a/spec/ruby/core/struct/new_spec.rb
+++ b/spec/ruby/core/struct/new_spec.rb
@@ -38,19 +38,19 @@ def obj.to_str() "Foo" end
   it "creates a new anonymous class with nil first argument" do
     struct = Struct.new(nil, :foo)
     struct.new("bar").foo.should == "bar"
-    struct.should be_kind_of(Class)
-    struct.name.should be_nil
+    struct.should.is_a?(Class)
+    struct.name.should == nil
   end
 
   it "creates a new anonymous class with symbol arguments" do
     struct = Struct.new(:make, :model)
-    struct.should be_kind_of(Class)
+    struct.should.is_a?(Class)
     struct.name.should == nil
   end
 
   it "does not create a constant with symbol as first argument" do
     Struct.new(:Animal2, :name, :legs, :eyeballs)
-    Struct.const_defined?("Animal2").should be_false
+    Struct.const_defined?("Animal2").should == false
   end
 
   it "allows non-ASCII member name" do
@@ -60,42 +60,42 @@ def obj.to_str() "Foo" end
   end
 
   it "fails with invalid constant name as first argument" do
-    -> { Struct.new('animal', :name, :legs, :eyeballs) }.should raise_error(NameError)
+    -> { Struct.new('animal', :name, :legs, :eyeballs) }.should.raise(NameError)
   end
 
   it "raises a TypeError if object doesn't respond to to_sym" do
-    -> { Struct.new(:animal, mock('giraffe'))      }.should raise_error(TypeError)
-    -> { Struct.new(:animal, 1.0)                  }.should raise_error(TypeError)
-    -> { Struct.new(:animal, Time.now)             }.should raise_error(TypeError)
-    -> { Struct.new(:animal, Class)                }.should raise_error(TypeError)
-    -> { Struct.new(:animal, nil)                  }.should raise_error(TypeError)
-    -> { Struct.new(:animal, true)                 }.should raise_error(TypeError)
-    -> { Struct.new(:animal, ['chris', 'evan'])    }.should raise_error(TypeError)
+    -> { Struct.new(:animal, mock('giraffe'))      }.should.raise(TypeError)
+    -> { Struct.new(:animal, 1.0)                  }.should.raise(TypeError)
+    -> { Struct.new(:animal, Time.now)             }.should.raise(TypeError)
+    -> { Struct.new(:animal, Class)                }.should.raise(TypeError)
+    -> { Struct.new(:animal, nil)                  }.should.raise(TypeError)
+    -> { Struct.new(:animal, true)                 }.should.raise(TypeError)
+    -> { Struct.new(:animal, ['chris', 'evan'])    }.should.raise(TypeError)
   end
 
   it "raises a TypeError if passed a Hash with an unknown key" do
-    -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(TypeError)
+    -> { Struct.new(:animal, { name: 'chris' }) }.should.raise(TypeError)
   end
 
   it "works when not provided any arguments" do
     c = Struct.new
-    c.should be_kind_of(Class)
+    c.should.is_a?(Class)
     c.superclass.should == Struct
   end
 
   it "raises ArgumentError when there is a duplicate member" do
-    -> { Struct.new(:foo, :foo) }.should raise_error(ArgumentError, "duplicate member: foo")
+    -> { Struct.new(:foo, :foo) }.should.raise(ArgumentError, "duplicate member: foo")
   end
 
   it "raises a TypeError if object is not a Symbol" do
     obj = mock(':ruby')
     def obj.to_sym() :ruby end
-    -> { Struct.new(:animal, obj) }.should raise_error(TypeError)
+    -> { Struct.new(:animal, obj) }.should.raise(TypeError)
   end
 
   it "processes passed block with instance_eval" do
     klass = Struct.new(:something) { @something_else = 'something else entirely!' }
-    klass.instance_variables.should include(:@something_else)
+    klass.instance_variables.should.include?(:@something_else)
   end
 
   context "with a block" do
@@ -116,7 +116,7 @@ def platform
       klass = Struct.new(:attr) do |block_parameter|
         given = block_parameter
       end
-      klass.should equal(given)
+      klass.should.equal?(given)
     end
   end
 
@@ -133,17 +133,17 @@ def platform
     end
 
     it "creates reader methods" do
-      StructClasses::Ruby.new.should have_method(:version)
-      StructClasses::Ruby.new.should have_method(:platform)
+      StructClasses::Ruby.new.should.respond_to?(:version)
+      StructClasses::Ruby.new.should.respond_to?(:platform)
     end
 
     it "creates writer methods" do
-      StructClasses::Ruby.new.should have_method(:version=)
-      StructClasses::Ruby.new.should have_method(:platform=)
+      StructClasses::Ruby.new.should.respond_to?(:version=)
+      StructClasses::Ruby.new.should.respond_to?(:platform=)
     end
 
     it "fails with too many arguments" do
-      -> { StructClasses::Ruby.new('2.0', 'i686', true) }.should raise_error(ArgumentError)
+      -> { StructClasses::Ruby.new('2.0', 'i686', true) }.should.raise(ArgumentError)
     end
 
     it "accepts keyword arguments to initialize" do
@@ -182,7 +182,7 @@ def platform
 
       it "raises ArgumentError when all struct attribute values are specified" do
         type = Struct.new(:a, :b)
-        -> { type.new("a", "b", c: "c") }.should raise_error(ArgumentError, "struct size differs")
+        -> { type.new("a", "b", c: "c") }.should.raise(ArgumentError, "struct size differs")
       end
     end
   end
@@ -199,7 +199,7 @@ def platform
     end
 
     it "raises when there is a duplicate member" do
-      -> { Struct.new(:foo, :foo, keyword_init: true) }.should raise_error(ArgumentError, "duplicate member: foo")
+      -> { Struct.new(:foo, :foo, keyword_init: true) }.should.raise(ArgumentError, "duplicate member: foo")
     end
 
     describe "new class instantiation" do
@@ -212,31 +212,31 @@ def platform
       it "allows missing arguments" do
         obj = @struct_with_kwa.new(name: "elefant")
         obj.name.should == "elefant"
-        obj.legs.should be_nil
+        obj.legs.should == nil
       end
 
       it "allows no arguments" do
         obj = @struct_with_kwa.new
-        obj.name.should be_nil
-        obj.legs.should be_nil
+        obj.name.should == nil
+        obj.legs.should == nil
       end
 
       it "raises ArgumentError when passed not declared keyword argument" do
         -> {
           @struct_with_kwa.new(name: "elefant", legs: 4, foo: "bar")
-        }.should raise_error(ArgumentError, /unknown keywords: foo/)
+        }.should.raise(ArgumentError, /unknown keywords: foo/)
       end
 
       it "raises ArgumentError when passed a list of arguments" do
         -> {
           @struct_with_kwa.new("elefant", 4)
-        }.should raise_error(ArgumentError, /wrong number of arguments/)
+        }.should.raise(ArgumentError, /wrong number of arguments/)
       end
 
       it "raises ArgumentError when passed a single non-hash argument" do
         -> {
           @struct_with_kwa.new("elefant")
-        }.should raise_error(ArgumentError, /wrong number of arguments/)
+        }.should.raise(ArgumentError, /wrong number of arguments/)
       end
     end
   end
diff --git a/spec/ruby/core/struct/shared/select.rb b/spec/ruby/core/struct/shared/select.rb
index 35abee461b3..dfa1a809fe7 100644
--- a/spec/ruby/core/struct/shared/select.rb
+++ b/spec/ruby/core/struct/shared/select.rb
@@ -4,7 +4,7 @@
 describe :struct_select, shared: true do
   it "raises an ArgumentError if given any non-block arguments" do
     struct = StructClasses::Car.new
-    -> { struct.send(@method, 1) { } }.should raise_error(ArgumentError)
+    -> { struct.send(@method, 1) { } }.should.raise(ArgumentError)
   end
 
   it "returns a new array of elements for which block is true" do
@@ -14,13 +14,13 @@
 
   it "returns an instance of Array" do
     struct = StructClasses::Car.new("Ford", "Escort", "1995")
-    struct.send(@method) { true }.should be_an_instance_of(Array)
+    struct.send(@method) { true }.should.instance_of?(Array)
   end
 
   describe "without block" do
     it "returns an instance of Enumerator" do
       struct = Struct.new(:foo).new
-      struct.send(@method).should be_an_instance_of(Enumerator)
+      struct.send(@method).should.instance_of?(Enumerator)
     end
   end
 end
diff --git a/spec/ruby/core/struct/struct_spec.rb b/spec/ruby/core/struct/struct_spec.rb
index 1b6a4488ce9..9fab9c0629d 100644
--- a/spec/ruby/core/struct/struct_spec.rb
+++ b/spec/ruby/core/struct/struct_spec.rb
@@ -21,7 +21,7 @@
 
   it "reader method should not interfere with undefined methods" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    -> { car.something_weird }.should raise_error(NoMethodError)
+    -> { car.something_weird }.should.raise(NoMethodError)
   end
 
   it "writer method be a synonym for []=" do
@@ -38,7 +38,7 @@
     car = StructClasses::Car.new('Ford', 'Ranger')
     car.freeze
 
-    -> { car.model = 'Escape' }.should raise_error(FrozenError)
+    -> { car.model = 'Escape' }.should.raise(FrozenError)
   end
 end
 
diff --git a/spec/ruby/core/struct/to_h_spec.rb b/spec/ruby/core/struct/to_h_spec.rb
index 861ce3f49df..e0846ef268f 100644
--- a/spec/ruby/core/struct/to_h_spec.rb
+++ b/spec/ruby/core/struct/to_h_spec.rb
@@ -36,17 +36,17 @@
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         StructClasses::Car.new.to_h { |k, v| [k.to_s, "#{v}".downcase, 1] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
 
       -> do
         StructClasses::Car.new.to_h { |k, v| [k] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
     end
 
     it "raises TypeError if block returns something other than Array" do
       -> do
         StructClasses::Car.new.to_h { |k, v| "not-array" }
-      end.should raise_error(TypeError, /wrong element type String/)
+      end.should.raise(TypeError, /wrong element type String/)
     end
 
     it "coerces returned pair to Array with #to_ary" do
@@ -62,7 +62,7 @@
 
       -> do
         StructClasses::Car.new.to_h { |k| x }
-      end.should raise_error(TypeError, /wrong element type MockObject/)
+      end.should.raise(TypeError, /wrong element type MockObject/)
     end
   end
 end
diff --git a/spec/ruby/core/struct/values_at_spec.rb b/spec/ruby/core/struct/values_at_spec.rb
index 5e5a496600f..6aac5d96b32 100644
--- a/spec/ruby/core/struct/values_at_spec.rb
+++ b/spec/ruby/core/struct/values_at_spec.rb
@@ -14,8 +14,8 @@
     end
 
     it "raises IndexError if any of integers is out of range" do
-      -> { @movie.values_at(3) }.should raise_error(IndexError, "offset 3 too large for struct(size:3)")
-      -> { @movie.values_at(-4) }.should raise_error(IndexError, "offset -4 too small for struct(size:3)")
+      -> { @movie.values_at(3) }.should.raise(IndexError, "offset 3 too large for struct(size:3)")
+      -> { @movie.values_at(-4) }.should.raise(IndexError, "offset -4 too small for struct(size:3)")
     end
   end
 
@@ -29,7 +29,7 @@
     end
 
     it "raises RangeError if any element of the range is negative and out of range" do
-      -> { @movie.values_at(-4..3) }.should raise_error(RangeError, "-4..3 out of range")
+      -> { @movie.values_at(-4..3) }.should.raise(RangeError, "-4..3 out of range")
     end
 
     it "supports endless Range" do
@@ -54,6 +54,6 @@
   end
 
   it "fails when passed unsupported types" do
-    -> { @movie.values_at('make') }.should raise_error(TypeError, "no implicit conversion of String into Integer")
+    -> { @movie.values_at('make') }.should.raise(TypeError, "no implicit conversion of String into Integer")
   end
 end
diff --git a/spec/ruby/core/symbol/all_symbols_spec.rb b/spec/ruby/core/symbol/all_symbols_spec.rb
index 1e218090932..689f6211def 100644
--- a/spec/ruby/core/symbol/all_symbols_spec.rb
+++ b/spec/ruby/core/symbol/all_symbols_spec.rb
@@ -3,17 +3,17 @@
 describe "Symbol.all_symbols" do
   it "returns an array of Symbols" do
     all_symbols = Symbol.all_symbols
-    all_symbols.should be_an_instance_of(Array)
-    all_symbols.each { |s| s.should be_an_instance_of(Symbol) }
+    all_symbols.should.instance_of?(Array)
+    all_symbols.each { |s| s.should.instance_of?(Symbol) }
   end
 
   it "includes symbols that are strongly referenced" do
     symbol = "symbol_specs_#{rand(5_000_000)}".to_sym
-    Symbol.all_symbols.should include(symbol)
+    Symbol.all_symbols.should.include?(symbol)
   end
 
   it "includes symbols that are referenced in source code but not yet executed" do
-    Symbol.all_symbols.any? { |s| s.to_s == 'symbol_specs_referenced_in_source_code' }.should be_true
+    Symbol.all_symbols.any? { |s| s.to_s == 'symbol_specs_referenced_in_source_code' }.should == true
     :symbol_specs_referenced_in_source_code
   end
 end
diff --git a/spec/ruby/core/symbol/capitalize_spec.rb b/spec/ruby/core/symbol/capitalize_spec.rb
index a84bcf280a1..a93d951e6a6 100644
--- a/spec/ruby/core/symbol/capitalize_spec.rb
+++ b/spec/ruby/core/symbol/capitalize_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Symbol#capitalize" do
   it "returns a Symbol" do
-    :glark.capitalize.should be_an_instance_of(Symbol)
+    :glark.capitalize.should.instance_of?(Symbol)
   end
 
   it "converts the first character to uppercase if it is ASCII" do
diff --git a/spec/ruby/core/symbol/casecmp_spec.rb b/spec/ruby/core/symbol/casecmp_spec.rb
index 662a29a2847..dcb77a8350f 100644
--- a/spec/ruby/core/symbol/casecmp_spec.rb
+++ b/spec/ruby/core/symbol/casecmp_spec.rb
@@ -64,16 +64,16 @@
 
 describe "Symbol#casecmp" do
   it "returns nil if other is a String" do
-    :abc.casecmp("abc").should be_nil
+    :abc.casecmp("abc").should == nil
   end
 
   it "returns nil if other is an Integer" do
-    :abc.casecmp(1).should be_nil
+    :abc.casecmp(1).should == nil
   end
 
   it "returns nil if other is an object" do
     obj = mock("string <=>")
-    :abc.casecmp(obj).should be_nil
+    :abc.casecmp(obj).should == nil
   end
 end
 
diff --git a/spec/ruby/core/symbol/comparison_spec.rb b/spec/ruby/core/symbol/comparison_spec.rb
index 613177be056..6d56176e975 100644
--- a/spec/ruby/core/symbol/comparison_spec.rb
+++ b/spec/ruby/core/symbol/comparison_spec.rb
@@ -37,15 +37,15 @@
 
 describe "Symbol#<=>" do
   it "returns nil if other is a String" do
-    (:abc <=> "abc").should be_nil
+    (:abc <=> "abc").should == nil
   end
 
   it "returns nil if other is an Integer" do
-    (:abc <=> 1).should be_nil
+    (:abc <=> 1).should == nil
   end
 
   it "returns nil if other is an object" do
     obj = mock("string <=>")
-    (:abc <=> obj).should be_nil
+    (:abc <=> obj).should == nil
   end
 end
diff --git a/spec/ruby/core/symbol/downcase_spec.rb b/spec/ruby/core/symbol/downcase_spec.rb
index 7e94c669cc5..76418aa9da5 100644
--- a/spec/ruby/core/symbol/downcase_spec.rb
+++ b/spec/ruby/core/symbol/downcase_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Symbol#downcase" do
   it "returns a Symbol" do
-    :glark.downcase.should be_an_instance_of(Symbol)
+    :glark.downcase.should.instance_of?(Symbol)
   end
 
   it "converts uppercase ASCII characters to their lowercase equivalents" do
diff --git a/spec/ruby/core/symbol/dup_spec.rb b/spec/ruby/core/symbol/dup_spec.rb
index 8b35917c27e..eef30780308 100644
--- a/spec/ruby/core/symbol/dup_spec.rb
+++ b/spec/ruby/core/symbol/dup_spec.rb
@@ -2,6 +2,6 @@
 
 describe "Symbol#dup" do
   it "returns self" do
-    :a_symbol.dup.should equal(:a_symbol)
+    :a_symbol.dup.should.equal?(:a_symbol)
   end
 end
diff --git a/spec/ruby/core/symbol/empty_spec.rb b/spec/ruby/core/symbol/empty_spec.rb
index 19c23cfe5f5..1d90a59a5b2 100644
--- a/spec/ruby/core/symbol/empty_spec.rb
+++ b/spec/ruby/core/symbol/empty_spec.rb
@@ -2,10 +2,10 @@
 
 describe "Symbol#empty?" do
   it "returns true if self is empty" do
-    :"".empty?.should be_true
+    :"".empty?.should == true
   end
 
   it "returns false if self is non-empty" do
-    :"a".empty?.should be_false
+    :"a".empty?.should == false
   end
 end
diff --git a/spec/ruby/core/symbol/intern_spec.rb b/spec/ruby/core/symbol/intern_spec.rb
index ea04b87e8a6..9d0914c7fbe 100644
--- a/spec/ruby/core/symbol/intern_spec.rb
+++ b/spec/ruby/core/symbol/intern_spec.rb
@@ -6,6 +6,6 @@
   end
 
   it "returns a Symbol" do
-    :foo.intern.should be_kind_of(Symbol)
+    :foo.intern.should.is_a?(Symbol)
   end
 end
diff --git a/spec/ruby/core/symbol/match_spec.rb b/spec/ruby/core/symbol/match_spec.rb
index 41e058f9777..7b165218c64 100644
--- a/spec/ruby/core/symbol/match_spec.rb
+++ b/spec/ruby/core/symbol/match_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "returns nil if there is no match" do
-    :a.send(@method, /b/).should be_nil
+    :a.send(@method, /b/).should == nil
   end
 
   it "sets the last match pseudo-variables" do
@@ -22,12 +22,12 @@
 describe "Symbol#match" do
   it "returns the MatchData" do
     result = :abc.match(/b/)
-    result.should be_kind_of(MatchData)
+    result.should.is_a?(MatchData)
     result[0].should == 'b'
   end
 
   it "returns nil if there is no match" do
-    :a.match(/b/).should be_nil
+    :a.match(/b/).should == nil
   end
 
   it "sets the last match pseudo-variables" do
@@ -38,7 +38,7 @@
   describe "when passed a block" do
     it "yields the MatchData" do
       :abc.match(/./) {|m| ScratchPad.record m }
-      ScratchPad.recorded.should be_kind_of(MatchData)
+      ScratchPad.recorded.should.is_a?(MatchData)
     end
 
     it "returns the block result" do
@@ -61,17 +61,17 @@
 
   context "when matches the given regex" do
     it "returns true but does not set Regexp.last_match" do
-      :string.match?(/string/i).should be_true
-      Regexp.last_match.should be_nil
+      :string.match?(/string/i).should == true
+      Regexp.last_match.should == nil
     end
   end
 
   it "returns false when does not match the given regex" do
-    :string.match?(/STRING/).should be_false
+    :string.match?(/STRING/).should == false
   end
 
   it "takes matching position as the 2nd argument" do
-    :string.match?(/str/i, 0).should be_true
-    :string.match?(/str/i, 1).should be_false
+    :string.match?(/str/i, 0).should == true
+    :string.match?(/str/i, 1).should == false
   end
 end
diff --git a/spec/ruby/core/symbol/shared/slice.rb b/spec/ruby/core/symbol/shared/slice.rb
index d3d4aad617c..4e3a35240cc 100644
--- a/spec/ruby/core/symbol/shared/slice.rb
+++ b/spec/ruby/core/symbol/shared/slice.rb
@@ -7,11 +7,11 @@
     end
 
     it "returns nil if the index starts from the end and is greater than the length" do
-      :symbol.send(@method, -10).should be_nil
+      :symbol.send(@method, -10).should == nil
     end
 
     it "returns nil if the index is greater than the length" do
-      :symbol.send(@method, 42).should be_nil
+      :symbol.send(@method, 42).should == nil
     end
   end
 
@@ -31,14 +31,14 @@
       end
 
       it "returns nil if the index is greater than the length" do
-        :symbol.send(@method, 10,1).should be_nil
+        :symbol.send(@method, 10,1).should == nil
       end
     end
 
     describe "and a positive index and negative length" do
       it "returns nil" do
-        :symbol.send(@method, 0,-1).should be_nil
-        :symbol.send(@method, 1,-1).should be_nil
+        :symbol.send(@method, 0,-1).should == nil
+        :symbol.send(@method, 1,-1).should == nil
       end
     end
 
@@ -56,13 +56,13 @@
       end
 
       it "returns nil if the index is past the start" do
-        :symbol.send(@method, -10,1).should be_nil
+        :symbol.send(@method, -10,1).should == nil
       end
     end
 
     describe "and a negative index and negative length" do
       it "returns nil" do
-        :symbol.send(@method, -1,-1).should be_nil
+        :symbol.send(@method, -1,-1).should == nil
       end
     end
 
@@ -74,21 +74,21 @@
 
     describe "and a nil length" do
       it "raises a TypeError" do
-        -> { :symbol.send(@method, 1,nil) }.should raise_error(TypeError)
+        -> { :symbol.send(@method, 1,nil) }.should.raise(TypeError)
       end
     end
 
     describe "and a length that cannot be converted into an Integer" do
       it "raises a TypeError when given an Array" do
-        -> { :symbol.send(@method, 1,Array.new) }.should raise_error(TypeError)
+        -> { :symbol.send(@method, 1,Array.new) }.should.raise(TypeError)
       end
 
       it "raises a TypeError when given an Hash" do
-        -> { :symbol.send(@method, 1,Hash.new) }.should raise_error(TypeError)
+        -> { :symbol.send(@method, 1,Hash.new) }.should.raise(TypeError)
       end
 
       it "raises a TypeError when given an Object" do
-        -> { :symbol.send(@method, 1,Object.new) }.should raise_error(TypeError)
+        -> { :symbol.send(@method, 1,Object.new) }.should.raise(TypeError)
       end
     end
   end
@@ -101,21 +101,21 @@
 
   describe "with a nil index" do
     it "raises a TypeError" do
-      -> { :symbol.send(@method, nil) }.should raise_error(TypeError)
+      -> { :symbol.send(@method, nil) }.should.raise(TypeError)
     end
   end
 
   describe "with an index that cannot be converted into an Integer" do
     it "raises a TypeError when given an Array" do
-      -> { :symbol.send(@method, Array.new) }.should raise_error(TypeError)
+      -> { :symbol.send(@method, Array.new) }.should.raise(TypeError)
     end
 
     it "raises a TypeError when given an Hash" do
-      -> { :symbol.send(@method, Hash.new) }.should raise_error(TypeError)
+      -> { :symbol.send(@method, Hash.new) }.should.raise(TypeError)
     end
 
     it "raises a TypeError when given an Object" do
-      -> { :symbol.send(@method, Object.new) }.should raise_error(TypeError)
+      -> { :symbol.send(@method, Object.new) }.should.raise(TypeError)
     end
   end
 
@@ -136,7 +136,7 @@
 
     describe "that is out of bounds" do
       it "returns nil if the first range value begins past the end" do
-        :symbol.send(@method, 10..12).should be_nil
+        :symbol.send(@method, 10..12).should == nil
       end
 
       it "returns a blank string if the first range value is within bounds and the last range value is not" do
@@ -145,11 +145,11 @@
       end
 
       it "returns nil if the first range value starts from the end and is within bounds and the last value starts from the end and is greater than the length" do
-        :symbol.send(@method, -10..-12).should be_nil
+        :symbol.send(@method, -10..-12).should == nil
       end
 
       it "returns nil if the first range value starts from the end and is out of bounds and the last value starts from the end and is less than the length" do
-        :symbol.send(@method, -10..-2).should be_nil
+        :symbol.send(@method, -10..-2).should == nil
       end
     end
 
@@ -178,7 +178,7 @@
       end
 
       it "returns nil if the expression does not match" do
-        :symbol.send(@method, /0-9/).should be_nil
+        :symbol.send(@method, /0-9/).should == nil
       end
 
       it "sets $~ to the MatchData if there is a match" do
@@ -188,7 +188,7 @@
 
       it "does not set $~ if there if there is not a match" do
         :symbol.send(@method, /[0-9]+/)
-        $~.should be_nil
+        $~.should == nil
       end
     end
 
@@ -203,8 +203,8 @@
       end
 
       it "returns nil if there is no capture for the index" do
-        :symbol.send(@method, /(sy)(mb)(ol)/, 4).should be_nil
-        :symbol.send(@method, /(sy)(mb)(ol)/, -4).should be_nil
+        :symbol.send(@method, /(sy)(mb)(ol)/, 4).should == nil
+        :symbol.send(@method, /(sy)(mb)(ol)/, -4).should == nil
       end
 
       it "converts the index to an Integer" do
@@ -213,20 +213,20 @@
 
       describe "and an index that cannot be converted to an Integer" do
         it "raises a TypeError when given an Hash" do
-          -> { :symbol.send(@method, /(sy)(mb)(ol)/, Hash.new) }.should raise_error(TypeError)
+          -> { :symbol.send(@method, /(sy)(mb)(ol)/, Hash.new) }.should.raise(TypeError)
         end
 
         it "raises a TypeError when given an Array" do
-          -> { :symbol.send(@method, /(sy)(mb)(ol)/, Array.new) }.should raise_error(TypeError)
+          -> { :symbol.send(@method, /(sy)(mb)(ol)/, Array.new) }.should.raise(TypeError)
         end
 
         it "raises a TypeError when given an Object" do
-          -> { :symbol.send(@method, /(sy)(mb)(ol)/, Object.new) }.should raise_error(TypeError)
+          -> { :symbol.send(@method, /(sy)(mb)(ol)/, Object.new) }.should.raise(TypeError)
         end
       end
 
       it "raises a TypeError if the index is nil" do
-        -> { :symbol.send(@method, /(sy)(mb)(ol)/, nil) }.should raise_error(TypeError)
+        -> { :symbol.send(@method, /(sy)(mb)(ol)/, nil) }.should.raise(TypeError)
       end
 
       it "sets $~ to the MatchData if there is a match" do
@@ -239,7 +239,7 @@
 
       it "does not set $~ to the MatchData if there is not a match" do
         :symbol.send(@method, /0-9/, 0)
-        $~.should be_nil
+        $~.should == nil
       end
     end
   end
@@ -248,7 +248,7 @@
     it "does not set $~" do
       $~ = nil
       :symbol.send(@method, "sym")
-      $~.should be_nil
+      $~.should == nil
     end
 
     it "returns a string if there is match" do
@@ -256,7 +256,7 @@
     end
 
     it "returns nil if there is not a match" do
-      :symbol.send(@method, "foo").should be_nil
+      :symbol.send(@method, "foo").should == nil
     end
   end
 end
diff --git a/spec/ruby/core/symbol/swapcase_spec.rb b/spec/ruby/core/symbol/swapcase_spec.rb
index 24709cac30f..95fc29e32b7 100644
--- a/spec/ruby/core/symbol/swapcase_spec.rb
+++ b/spec/ruby/core/symbol/swapcase_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Symbol#swapcase" do
   it "returns a Symbol" do
-    :glark.swapcase.should be_an_instance_of(Symbol)
+    :glark.swapcase.should.instance_of?(Symbol)
   end
 
   it "converts lowercase ASCII characters to their uppercase equivalents" do
diff --git a/spec/ruby/core/symbol/symbol_spec.rb b/spec/ruby/core/symbol/symbol_spec.rb
index cefe70bc99f..3534686a08b 100644
--- a/spec/ruby/core/symbol/symbol_spec.rb
+++ b/spec/ruby/core/symbol/symbol_spec.rb
@@ -8,12 +8,12 @@
   it ".allocate raises a TypeError" do
     -> do
       Symbol.allocate
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it ".new is undefined" do
     -> do
       Symbol.new
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/symbol/to_proc_spec.rb b/spec/ruby/core/symbol/to_proc_spec.rb
index def5d6d3444..93ed1e9e9b9 100644
--- a/spec/ruby/core/symbol/to_proc_spec.rb
+++ b/spec/ruby/core/symbol/to_proc_spec.rb
@@ -3,7 +3,7 @@
 describe "Symbol#to_proc" do
   it "returns a new Proc" do
     proc = :to_s.to_proc
-    proc.should be_kind_of(Proc)
+    proc.should.is_a?(Proc)
   end
 
   it "sends self to arguments passed when calling #call on the Proc" do
@@ -38,8 +38,8 @@
     @a = []
     singleton_class.class_eval(&body)
     tap(&:pub)
-    proc{tap(&:pro)}.should raise_error(NoMethodError, /protected method [`']pro' called/)
-    proc{tap(&:pri)}.should raise_error(NoMethodError, /private method [`']pri' called/)
+    proc{tap(&:pro)}.should.raise(NoMethodError, /protected method [`']pro' called/)
+    proc{tap(&:pri)}.should.raise(NoMethodError, /private method [`']pri' called/)
     @a.should == [:pub]
 
     @a = []
@@ -47,15 +47,15 @@
     o = c.new
     o.instance_variable_set(:@a, [])
     o.tap(&:pub)
-    proc{tap(&:pro)}.should raise_error(NoMethodError, /protected method [`']pro' called/)
-    proc{o.tap(&:pri)}.should raise_error(NoMethodError, /private method [`']pri' called/)
+    proc{tap(&:pro)}.should.raise(NoMethodError, /protected method [`']pro' called/)
+    proc{o.tap(&:pri)}.should.raise(NoMethodError, /private method [`']pri' called/)
     o.a.should == [:pub]
   end
 
   it "raises an ArgumentError when calling #call on the Proc without receiver" do
     -> {
       :object_id.to_proc.call
-    }.should raise_error(ArgumentError, /no receiver given|wrong number of arguments \(given 0, expected 1\+\)/)
+    }.should.raise(ArgumentError, /no receiver given|wrong number of arguments \(given 0, expected 1\+\)/)
   end
 
   it "passes along the block passed to Proc#call" do
diff --git a/spec/ruby/core/symbol/upcase_spec.rb b/spec/ruby/core/symbol/upcase_spec.rb
index f704bdcbf34..3895d95efb4 100644
--- a/spec/ruby/core/symbol/upcase_spec.rb
+++ b/spec/ruby/core/symbol/upcase_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Symbol#upcase" do
   it "returns a Symbol" do
-    :glark.upcase.should be_an_instance_of(Symbol)
+    :glark.upcase.should.instance_of?(Symbol)
   end
 
   it "converts lowercase ASCII characters to their uppercase equivalents" do
diff --git a/spec/ruby/core/thread/abort_on_exception_spec.rb b/spec/ruby/core/thread/abort_on_exception_spec.rb
index 49be84ea9f1..aeca50e5c17 100644
--- a/spec/ruby/core/thread/abort_on_exception_spec.rb
+++ b/spec/ruby/core/thread/abort_on_exception_spec.rb
@@ -13,12 +13,12 @@
   end
 
   it "is false by default" do
-    @thread.abort_on_exception.should be_false
+    @thread.abort_on_exception.should == false
   end
 
   it "returns true when #abort_on_exception= is passed true" do
     @thread.abort_on_exception = true
-    @thread.abort_on_exception.should be_true
+    @thread.abort_on_exception.should == true
   end
 end
 
@@ -39,7 +39,7 @@
         ThreadSpecs.state = :run
         # Wait for the main thread to be interrupted
         sleep
-      end.should raise_error(RuntimeError, "Thread#abort_on_exception= specs")
+      end.should.raise(RuntimeError, "Thread#abort_on_exception= specs")
 
       ScratchPad << :after
     rescue Exception => e
@@ -81,7 +81,7 @@
 
   it "returns true when .abort_on_exception= is passed true" do
     Thread.abort_on_exception = true
-    Thread.abort_on_exception.should be_true
+    Thread.abort_on_exception.should == true
   end
 end
 
diff --git a/spec/ruby/core/thread/allocate_spec.rb b/spec/ruby/core/thread/allocate_spec.rb
index cfd556812f3..0b4e4f1b1fa 100644
--- a/spec/ruby/core/thread/allocate_spec.rb
+++ b/spec/ruby/core/thread/allocate_spec.rb
@@ -4,6 +4,6 @@
   it "raises a TypeError" do
     -> {
       Thread.allocate
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb b/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb
index 68a69049d93..6d9482f2ae1 100644
--- a/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb
+++ b/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb
@@ -42,7 +42,7 @@
       locations = ScratchPad.recorded
       locations[0].absolute_path.should == path
       # Make sure it's from the class body, not from the file top-level
-      locations[0].label.should include 'MethodAddedAbsolutePath'
+      locations[0].label.should.include? 'MethodAddedAbsolutePath'
     end
   end
 
diff --git a/spec/ruby/core/thread/backtrace/location/inspect_spec.rb b/spec/ruby/core/thread/backtrace/location/inspect_spec.rb
index 20e477a5a62..4df88a2f331 100644
--- a/spec/ruby/core/thread/backtrace/location/inspect_spec.rb
+++ b/spec/ruby/core/thread/backtrace/location/inspect_spec.rb
@@ -8,6 +8,6 @@
   end
 
   it 'converts the call frame to a String' do
-    @frame.inspect.should include("#{__FILE__}:#{@line}:in ")
+    @frame.inspect.should.include?("#{__FILE__}:#{@line}:in ")
   end
 end
diff --git a/spec/ruby/core/thread/backtrace/location/label_spec.rb b/spec/ruby/core/thread/backtrace/location/label_spec.rb
index 7d358b45ea8..5f6a7b73dfe 100644
--- a/spec/ruby/core/thread/backtrace/location/label_spec.rb
+++ b/spec/ruby/core/thread/backtrace/location/label_spec.rb
@@ -3,7 +3,7 @@
 
 describe 'Thread::Backtrace::Location#label' do
   it 'returns the base label of the call frame' do
-    ThreadBacktraceLocationSpecs.locations[0].label.should include('<top (required)>')
+    ThreadBacktraceLocationSpecs.locations[0].label.should.include?('<top (required)>')
   end
 
   it 'returns the method name for a method location' do
diff --git a/spec/ruby/core/thread/backtrace/location/to_s_spec.rb b/spec/ruby/core/thread/backtrace/location/to_s_spec.rb
index 5911cdced0c..983ce4c3f8c 100644
--- a/spec/ruby/core/thread/backtrace/location/to_s_spec.rb
+++ b/spec/ruby/core/thread/backtrace/location/to_s_spec.rb
@@ -8,6 +8,6 @@
   end
 
   it 'converts the call frame to a String' do
-    @frame.to_s.should include("#{__FILE__}:#{@line}:in ")
+    @frame.to_s.should.include?("#{__FILE__}:#{@line}:in ")
   end
 end
diff --git a/spec/ruby/core/thread/backtrace_locations_spec.rb b/spec/ruby/core/thread/backtrace_locations_spec.rb
index 09fe622e0da..28a488f3116 100644
--- a/spec/ruby/core/thread/backtrace_locations_spec.rb
+++ b/spec/ruby/core/thread/backtrace_locations_spec.rb
@@ -3,20 +3,20 @@
 describe "Thread#backtrace_locations" do
   it "returns an Array" do
     locations = Thread.current.backtrace_locations
-    locations.should be_an_instance_of(Array)
-    locations.should_not be_empty
+    locations.should.instance_of?(Array)
+    locations.should_not.empty?
   end
 
   it "sets each element to a Thread::Backtrace::Location" do
     locations = Thread.current.backtrace_locations
-    locations.each { |loc| loc.should be_an_instance_of(Thread::Backtrace::Location) }
+    locations.each { |loc| loc.should.instance_of?(Thread::Backtrace::Location) }
   end
 
   it "can be called on any Thread" do
     locations = Thread.new { Thread.current.backtrace_locations }.value
-    locations.should be_an_instance_of(Array)
-    locations.should_not be_empty
-    locations.each { |loc| loc.should be_an_instance_of(Thread::Backtrace::Location) }
+    locations.should.instance_of?(Array)
+    locations.should_not.empty?
+    locations.each { |loc| loc.should.instance_of?(Thread::Backtrace::Location) }
   end
 
   it "can be called with a number of locations to omit" do
diff --git a/spec/ruby/core/thread/backtrace_spec.rb b/spec/ruby/core/thread/backtrace_spec.rb
index 15bb29a349a..770c300f06a 100644
--- a/spec/ruby/core/thread/backtrace_spec.rb
+++ b/spec/ruby/core/thread/backtrace_spec.rb
@@ -12,7 +12,7 @@
     Thread.pass while t.status && t.status != 'sleep'
 
     backtrace = t.backtrace
-    backtrace.should be_kind_of(Array)
+    backtrace.should.is_a?(Array)
     backtrace.first.should =~ /[`'](?:Kernel#)?sleep'/
 
     t.raise 'finish the thread'
@@ -30,7 +30,7 @@
     backtrace = t.backtrace
     t.kill
     t.join
-    backtrace.should be_kind_of(Array)
+    backtrace.should.is_a?(Array)
   end
 
   it "can be called with a number of locations to omit" do
diff --git a/spec/ruby/core/thread/current_spec.rb b/spec/ruby/core/thread/current_spec.rb
index f5ed1d95cd3..f893f078ba3 100644
--- a/spec/ruby/core/thread/current_spec.rb
+++ b/spec/ruby/core/thread/current_spec.rb
@@ -4,13 +4,13 @@
 describe "Thread.current" do
   it "returns a thread" do
     current = Thread.current
-    current.should be_kind_of(Thread)
+    current.should.is_a?(Thread)
   end
 
   it "returns the current thread" do
     t = Thread.new { Thread.current }
-    t.value.should equal(t)
-    Thread.current.should_not equal(t.value)
+    t.value.should.equal?(t)
+    Thread.current.should_not.equal?(t.value)
   end
 
   it "returns the correct thread in a Fiber" do
@@ -22,10 +22,10 @@
         cur = Thread.current
         Fiber.new {
           Thread.current
-        }.resume.should equal cur
+        }.resume.should.equal? cur
         cur
       }
-      t.value.should equal t
+      t.value.should.equal? t
     end
   end
 end
diff --git a/spec/ruby/core/thread/each_caller_location_spec.rb b/spec/ruby/core/thread/each_caller_location_spec.rb
index aa7423675b5..15fda1a37ba 100644
--- a/spec/ruby/core/thread/each_caller_location_spec.rb
+++ b/spec/ruby/core/thread/each_caller_location_spec.rb
@@ -6,7 +6,7 @@
     Thread.each_caller_location { |l| ScratchPad << l; }
 
     ScratchPad.recorded.map(&:to_s).should == caller_locations.map(&:to_s)
-    ScratchPad.recorded[0].should be_kind_of(Thread::Backtrace::Location)
+    ScratchPad.recorded[0].should.is_a?(Thread::Backtrace::Location)
   end
 
   it "returns subset of 'Thread.to_enum(:each_caller_location)' locations" do
@@ -26,7 +26,7 @@
     end
 
     ar.map(&:to_s).should == caller_locations(1, 2).map(&:to_s)
-    ecl.should be_kind_of(Thread::Backtrace::Location)
+    ecl.should.is_a?(Thread::Backtrace::Location)
   end
 
   it "returns nil" do
@@ -36,12 +36,12 @@
   it "raises LocalJumpError when called without a block" do
     -> {
       Thread.each_caller_location
-    }.should raise_error(LocalJumpError, "no block given")
+    }.should.raise(LocalJumpError, "no block given")
   end
 
   it "doesn't accept keyword arguments" do
     -> {
       Thread.each_caller_location(12, foo: 10) {}
-    }.should raise_error(ArgumentError);
+    }.should.raise(ArgumentError);
   end
 end
diff --git a/spec/ruby/core/thread/element_reference_spec.rb b/spec/ruby/core/thread/element_reference_spec.rb
index fde9d1f4401..72892f6c509 100644
--- a/spec/ruby/core/thread/element_reference_spec.rb
+++ b/spec/ruby/core/thread/element_reference_spec.rb
@@ -49,7 +49,7 @@
   end
 
   it "raises exceptions on the wrong type of keys" do
-    -> { Thread.current[nil] }.should raise_error(TypeError)
-    -> { Thread.current[5] }.should raise_error(TypeError)
+    -> { Thread.current[nil] }.should.raise(TypeError)
+    -> { Thread.current[5] }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/thread/element_set_spec.rb b/spec/ruby/core/thread/element_set_spec.rb
index f2051773041..97d6c239804 100644
--- a/spec/ruby/core/thread/element_set_spec.rb
+++ b/spec/ruby/core/thread/element_set_spec.rb
@@ -12,7 +12,7 @@
       th.freeze
       -> {
         th[:foo] = "bar"
-      }.should raise_error(FrozenError, "can't modify frozen thread locals")
+      }.should.raise(FrozenError, "can't modify frozen thread locals")
     end.join
   end
 
@@ -40,8 +40,8 @@
   end
 
   it "raises exceptions on the wrong type of keys" do
-    -> { Thread.current[nil] = true }.should raise_error(TypeError)
-    -> { Thread.current[5] = true }.should raise_error(TypeError)
+    -> { Thread.current[nil] = true }.should.raise(TypeError)
+    -> { Thread.current[5] = true }.should.raise(TypeError)
   end
 
   it "is not shared across fibers" do
@@ -51,7 +51,7 @@
       Thread.current[:value].should == 1
     end
     fib.resume
-    Thread.current[:value].should be_nil
+    Thread.current[:value].should == nil
     Thread.current[:value] = 2
     fib.resume
     Thread.current[:value] = 2
diff --git a/spec/ruby/core/thread/exit_spec.rb b/spec/ruby/core/thread/exit_spec.rb
index c3f710920e2..b2e923c680c 100644
--- a/spec/ruby/core/thread/exit_spec.rb
+++ b/spec/ruby/core/thread/exit_spec.rb
@@ -10,6 +10,6 @@
   it "causes the current thread to exit" do
     thread = Thread.new { Thread.exit; sleep }
     thread.join
-    thread.status.should be_false
+    thread.status.should == false
   end
 end
diff --git a/spec/ruby/core/thread/fetch_spec.rb b/spec/ruby/core/thread/fetch_spec.rb
index 85ffb718748..fe27dec4a28 100644
--- a/spec/ruby/core/thread/fetch_spec.rb
+++ b/spec/ruby/core/thread/fetch_spec.rb
@@ -19,7 +19,7 @@
     it 'raises a KeyError when the Thread does not have a fiber-local variable of the same name' do
       th = Thread.new {}
       th.join
-      -> { th.fetch(:cat) }.should raise_error(KeyError)
+      -> { th.fetch(:cat) }.should.raise(KeyError)
     end
 
     it 'returns the value of the fiber-local variable if value has been assigned' do
@@ -60,7 +60,7 @@
   end
 
   it 'raises an ArgumentError when not passed one or two arguments' do
-    -> { Thread.current.fetch() }.should raise_error(ArgumentError)
-    -> { Thread.current.fetch(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { Thread.current.fetch() }.should.raise(ArgumentError)
+    -> { Thread.current.fetch(1, 2, 3) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/thread/fixtures/classes.rb b/spec/ruby/core/thread/fixtures/classes.rb
index 7c485660a8f..14d5d2f7bfb 100644
--- a/spec/ruby/core/thread/fixtures/classes.rb
+++ b/spec/ruby/core/thread/fixtures/classes.rb
@@ -207,7 +207,7 @@ def self.dying_thread_with_outer_ensure(kill_method_name=:kill)
 
   def self.join_dying_thread_with_outer_ensure(kill_method_name=:kill)
     t = dying_thread_with_outer_ensure(kill_method_name) { yield }
-    -> { t.join }.should raise_error(RuntimeError, "In dying thread")
+    -> { t.join }.should.raise(RuntimeError, "In dying thread")
     return t
   end
 
diff --git a/spec/ruby/core/thread/handle_interrupt_spec.rb b/spec/ruby/core/thread/handle_interrupt_spec.rb
index ea7e81cb989..aa03d4c66d2 100644
--- a/spec/ruby/core/thread/handle_interrupt_spec.rb
+++ b/spec/ruby/core/thread/handle_interrupt_spec.rb
@@ -75,7 +75,7 @@ def make_handle_interrupt_thread(interrupt_config, blocking = true)
         Thread.handle_interrupt(RuntimeError => :immediate) {
           flunk "not reached"
         }
-      }.should raise_error(RuntimeError, "interrupt immediate")
+      }.should.raise(RuntimeError, "interrupt immediate")
       Thread.pending_interrupt?.should == false
     end
   end
@@ -95,7 +95,7 @@ def make_handle_interrupt_thread(interrupt_config, blocking = true)
         Thread.handle_interrupt(RuntimeError => :immediate) {
           flunk "not reached"
         }
-      }.should raise_error(RuntimeError, "interrupt with fibers")
+      }.should.raise(RuntimeError, "interrupt with fibers")
       Thread.pending_interrupt?.should == false
     end
 
@@ -115,7 +115,7 @@ def make_handle_interrupt_thread(interrupt_config, blocking = true)
         executed = true
         raise "regular exception"
       end
-    }.should raise_error(RuntimeError, "interrupt exception")
+    }.should.raise(RuntimeError, "interrupt exception")
     executed.should == true
   end
 
diff --git a/spec/ruby/core/thread/initialize_spec.rb b/spec/ruby/core/thread/initialize_spec.rb
index 4fca900cd81..b9a94560ee4 100644
--- a/spec/ruby/core/thread/initialize_spec.rb
+++ b/spec/ruby/core/thread/initialize_spec.rb
@@ -19,7 +19,7 @@
         @t.instance_eval do
           initialize {}
         end
-      }.should raise_error(ThreadError)
+      }.should.raise(ThreadError)
     end
 
   end
diff --git a/spec/ruby/core/thread/join_spec.rb b/spec/ruby/core/thread/join_spec.rb
index 213fe2e5051..f4332167f10 100644
--- a/spec/ruby/core/thread/join_spec.rb
+++ b/spec/ruby/core/thread/join_spec.rb
@@ -4,28 +4,28 @@
 describe "Thread#join" do
   it "returns the thread when it is finished" do
     t = Thread.new {}
-    t.join.should equal(t)
+    t.join.should.equal?(t)
   end
 
   it "returns the thread when it is finished when given a timeout" do
     t = Thread.new {}
     t.join
-    t.join(0).should equal(t)
+    t.join(0).should.equal?(t)
   end
 
   it "coerces timeout to a Float if it is not nil" do
     t = Thread.new {}
     t.join
-    t.join(0).should equal(t)
-    t.join(0.0).should equal(t)
-    t.join(nil).should equal(t)
+    t.join(0).should.equal?(t)
+    t.join(0.0).should.equal?(t)
+    t.join(nil).should.equal?(t)
   end
 
   it "raises TypeError if the argument is not a valid timeout" do
     t = Thread.new { }
     t.join
-    -> { t.join(:foo) }.should raise_error TypeError
-    -> { t.join("bar") }.should raise_error TypeError
+    -> { t.join(:foo) }.should.raise TypeError
+    -> { t.join("bar") }.should.raise TypeError
   end
 
   it "returns nil if it is not finished when given a timeout" do
@@ -55,16 +55,16 @@
       Thread.current.report_on_exception = false
       raise NotImplementedError.new("Just kidding")
     }
-    -> { t.join }.should raise_error(NotImplementedError)
+    -> { t.join }.should.raise(NotImplementedError)
   end
 
   it "returns the dead thread" do
     t = Thread.new { Thread.current.kill }
-    t.join.should equal(t)
+    t.join.should.equal?(t)
   end
 
   it "raises any uncaught exception encountered in ensure block" do
     t = ThreadSpecs.dying_thread_ensures { raise NotImplementedError.new("Just kidding") }
-    -> { t.join }.should raise_error(NotImplementedError)
+    -> { t.join }.should.raise(NotImplementedError)
   end
 end
diff --git a/spec/ruby/core/thread/key_spec.rb b/spec/ruby/core/thread/key_spec.rb
index 339fa98f533..a14aeb8d314 100644
--- a/spec/ruby/core/thread/key_spec.rb
+++ b/spec/ruby/core/thread/key_spec.rb
@@ -24,30 +24,30 @@
   end
 
   it "raises exceptions on the wrong type of keys" do
-    -> { Thread.current.key? nil }.should raise_error(TypeError)
-    -> { Thread.current.key? 5 }.should raise_error(TypeError)
+    -> { Thread.current.key? nil }.should.raise(TypeError)
+    -> { Thread.current.key? 5 }.should.raise(TypeError)
   end
 
   it "is not shared across fibers" do
     fib = Fiber.new do
       Thread.current[:val1] = 1
       Fiber.yield
-      Thread.current.key?(:val1).should be_true
-      Thread.current.key?(:val2).should be_false
+      Thread.current.key?(:val1).should == true
+      Thread.current.key?(:val2).should == false
     end
-    Thread.current.key?(:val1).should_not be_true
+    Thread.current.key?(:val1).should_not == true
     fib.resume
     Thread.current[:val2] = 2
     fib.resume
-    Thread.current.key?(:val1).should be_false
-    Thread.current.key?(:val2).should be_true
+    Thread.current.key?(:val1).should == false
+    Thread.current.key?(:val2).should == true
   end
 
   it "stores a local in another thread when in a fiber" do
     fib = Fiber.new do
       t = Thread.new do
         sleep
-        Thread.current.key?(:value).should be_true
+        Thread.current.key?(:value).should == true
       end
 
       Thread.pass while t.status and t.status != "sleep"
diff --git a/spec/ruby/core/thread/keys_spec.rb b/spec/ruby/core/thread/keys_spec.rb
index 15efda51d6c..3a2edd24566 100644
--- a/spec/ruby/core/thread/keys_spec.rb
+++ b/spec/ruby/core/thread/keys_spec.rb
@@ -16,22 +16,22 @@
     fib = Fiber.new do
       Thread.current[:val1] = 1
       Fiber.yield
-      Thread.current.keys.should include(:val1)
-      Thread.current.keys.should_not include(:val2)
+      Thread.current.keys.should.include?(:val1)
+      Thread.current.keys.should_not.include?(:val2)
     end
-    Thread.current.keys.should_not include(:val1)
+    Thread.current.keys.should_not.include?(:val1)
     fib.resume
     Thread.current[:val2] = 2
     fib.resume
-    Thread.current.keys.should include(:val2)
-    Thread.current.keys.should_not include(:val1)
+    Thread.current.keys.should.include?(:val2)
+    Thread.current.keys.should_not.include?(:val1)
   end
 
   it "stores a local in another thread when in a fiber" do
     fib = Fiber.new do
       t = Thread.new do
         sleep
-        Thread.current.keys.should include(:value)
+        Thread.current.keys.should.include?(:value)
       end
 
       Thread.pass while t.status and t.status != "sleep"
diff --git a/spec/ruby/core/thread/kill_spec.rb b/spec/ruby/core/thread/kill_spec.rb
index 4b62c686c7d..f9f1f467444 100644
--- a/spec/ruby/core/thread/kill_spec.rb
+++ b/spec/ruby/core/thread/kill_spec.rb
@@ -15,7 +15,7 @@
       Thread.pass while thread.status and thread.status != "sleep"
       Thread.kill(thread).should == thread
       thread.join
-      thread.status.should be_false
+      thread.status.should == false
     end
   end
 end
diff --git a/spec/ruby/core/thread/list_spec.rb b/spec/ruby/core/thread/list_spec.rb
index 3c6f70c13e2..5036841d581 100644
--- a/spec/ruby/core/thread/list_spec.rb
+++ b/spec/ruby/core/thread/list_spec.rb
@@ -3,15 +3,15 @@
 
 describe "Thread.list" do
   it "includes the current and main thread" do
-    Thread.list.should include(Thread.current)
-    Thread.list.should include(Thread.main)
+    Thread.list.should.include?(Thread.current)
+    Thread.list.should.include?(Thread.main)
   end
 
   it "includes threads of non-default thread groups" do
     t = Thread.new { sleep }
     begin
       ThreadGroup.new.add(t)
-      Thread.list.should include(t)
+      Thread.list.should.include?(t)
     ensure
       t.kill
       t.join
@@ -21,7 +21,7 @@
   it "does not include deceased threads" do
     t = Thread.new { 1; }
     t.join
-    Thread.list.should_not include(t)
+    Thread.list.should_not.include?(t)
   end
 
   it "includes waiting threads" do
@@ -29,7 +29,7 @@
     t = Thread.new { q.pop }
     begin
       Thread.pass while t.status and t.status != 'sleep'
-      Thread.list.should include(t)
+      Thread.list.should.include?(t)
     ensure
       q << nil
       t.join
@@ -45,7 +45,7 @@
 
     begin
       Thread.list.each { |th|
-        th.should be_kind_of(Thread)
+        th.should.is_a?(Thread)
       }
     end while spawner.alive?
 
diff --git a/spec/ruby/core/thread/name_spec.rb b/spec/ruby/core/thread/name_spec.rb
index 9b3d2f4b09c..47d807be4d2 100644
--- a/spec/ruby/core/thread/name_spec.rb
+++ b/spec/ruby/core/thread/name_spec.rb
@@ -36,7 +36,7 @@
   it "raises an ArgumentError if the name includes a null byte" do
     -> {
       @thread.name = "new thread\0name"
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "can be reset to nil" do
diff --git a/spec/ruby/core/thread/native_thread_id_spec.rb b/spec/ruby/core/thread/native_thread_id_spec.rb
index 65d1b5b318d..cc72e0b8537 100644
--- a/spec/ruby/core/thread/native_thread_id_spec.rb
+++ b/spec/ruby/core/thread/native_thread_id_spec.rb
@@ -3,7 +3,7 @@
 platform_is :linux, :darwin, :windows, :freebsd do
   describe "Thread#native_thread_id" do
     it "returns an integer when the thread is alive" do
-      Thread.current.native_thread_id.should be_kind_of(Integer)
+      Thread.current.native_thread_id.should.is_a?(Integer)
     end
 
     it "returns nil when the thread is not running" do
@@ -19,7 +19,7 @@
       t_thread_id = t.native_thread_id
 
       # native_thread_id can be nil on a M:N scheduler
-      t_thread_id.should be_kind_of(Integer) if t_thread_id != nil
+      t_thread_id.should.is_a?(Integer) if t_thread_id != nil
 
       main_thread_id.should_not == t_thread_id
 
diff --git a/spec/ruby/core/thread/new_spec.rb b/spec/ruby/core/thread/new_spec.rb
index 47a836201c0..acb6cd4e305 100644
--- a/spec/ruby/core/thread/new_spec.rb
+++ b/spec/ruby/core/thread/new_spec.rb
@@ -18,7 +18,7 @@
   end
 
   it "raises an exception when not given a block" do
-    -> { Thread.new }.should raise_error(ThreadError)
+    -> { Thread.new }.should.raise(ThreadError)
   end
 
   it "creates a subclass of thread calls super with a block in initialize" do
@@ -36,7 +36,7 @@ def initialize
 
     -> {
       c.new
-    }.should raise_error(ThreadError)
+    }.should.raise(ThreadError)
   end
 
   it "calls and respects #initialize for the block to use" do
diff --git a/spec/ruby/core/thread/pending_interrupt_spec.rb b/spec/ruby/core/thread/pending_interrupt_spec.rb
index cd565d92a48..5fbe7422a9a 100644
--- a/spec/ruby/core/thread/pending_interrupt_spec.rb
+++ b/spec/ruby/core/thread/pending_interrupt_spec.rb
@@ -19,7 +19,7 @@
         Thread.pending_interrupt?.should == true
         executed = true
       end
-    }.should raise_error(RuntimeError, "interrupt")
+    }.should.raise(RuntimeError, "interrupt")
     executed.should == true
     Thread.pending_interrupt?.should == false
   end
diff --git a/spec/ruby/core/thread/priority_spec.rb b/spec/ruby/core/thread/priority_spec.rb
index e13ad478b54..970f7f99710 100644
--- a/spec/ruby/core/thread/priority_spec.rb
+++ b/spec/ruby/core/thread/priority_spec.rb
@@ -15,19 +15,19 @@
   end
 
   it "inherits the priority of the current thread while running" do
-    @thread.alive?.should be_true
+    @thread.alive?.should == true
     @thread.priority.should == @current_priority
   end
 
   it "maintain the priority of the current thread after death" do
     ThreadSpecs.state = :exit
     @thread.join
-    @thread.alive?.should be_false
+    @thread.alive?.should == false
     @thread.priority.should == @current_priority
   end
 
   it "returns an integer" do
-    @thread.priority.should be_kind_of(Integer)
+    @thread.priority.should.is_a?(Integer)
   end
 end
 
@@ -59,7 +59,7 @@
 
   describe "when set with a non-integer" do
     it "raises a type error" do
-      ->{ @thread.priority = Object.new }.should raise_error(TypeError)
+      ->{ @thread.priority = Object.new }.should.raise(TypeError)
     end
   end
 
diff --git a/spec/ruby/core/thread/raise_spec.rb b/spec/ruby/core/thread/raise_spec.rb
index b473eabd42c..3b02a2e0054 100644
--- a/spec/ruby/core/thread/raise_spec.rb
+++ b/spec/ruby/core/thread/raise_spec.rb
@@ -3,8 +3,15 @@
 require_relative '../../shared/kernel/raise'
 
 describe "Thread#raise" do
+  it "is a public method" do
+    Thread.public_instance_methods.should.include?(:raise)
+  end
+
   it_behaves_like :kernel_raise, :raise, ThreadSpecs::NewThreadToRaise
   it_behaves_like :kernel_raise_across_contexts, :raise, ThreadSpecs::NewThreadToRaise
+  ruby_version_is "4.0" do
+    it_behaves_like :kernel_raise_with_cause, :raise, ThreadSpecs::NewThreadToRaise
+  end
 
   it "ignores dead threads and returns nil" do
     t = Thread.new { :dead }
@@ -29,27 +36,27 @@
   it "raises a RuntimeError if no exception class is given" do
     @thr.raise
     Thread.pass while @thr.status
-    ScratchPad.recorded.should be_kind_of(RuntimeError)
+    ScratchPad.recorded.should.is_a?(RuntimeError)
   end
 
   it "raises the given exception" do
     @thr.raise Exception
     Thread.pass while @thr.status
-    ScratchPad.recorded.should be_kind_of(Exception)
+    ScratchPad.recorded.should.is_a?(Exception)
   end
 
   it "raises the given exception with the given message" do
     @thr.raise Exception, "get to work"
     Thread.pass while @thr.status
-    ScratchPad.recorded.should be_kind_of(Exception)
+    ScratchPad.recorded.should.is_a?(Exception)
     ScratchPad.recorded.message.should == "get to work"
   end
 
   it "raises the given exception and the backtrace is the one of the interrupted thread" do
     @thr.raise Exception
     Thread.pass while @thr.status
-    ScratchPad.recorded.should be_kind_of(Exception)
-    ScratchPad.recorded.backtrace[0].should include("sleep")
+    ScratchPad.recorded.should.is_a?(Exception)
+    ScratchPad.recorded.backtrace[0].should.include?("sleep")
   end
 
   it "is captured and raised by Thread#value" do
@@ -61,7 +68,7 @@
     ThreadSpecs.spin_until_sleeping(t)
 
     t.raise
-    -> { t.value }.should raise_error(RuntimeError)
+    -> { t.value }.should.raise(RuntimeError)
   end
 
   it "raises a RuntimeError when called with no arguments inside rescue" do
@@ -79,7 +86,7 @@
       ThreadSpecs.spin_until_sleeping(t)
       t.raise
     end
-    -> { t.value }.should raise_error(RuntimeError)
+    -> { t.value }.should.raise(RuntimeError)
   end
 
   it "re-raises a previously rescued exception without overwriting the backtrace" do
@@ -101,8 +108,8 @@
       raise_again_line = __LINE__; t.raise raised
       raised_again = t.value
 
-      raised_again.backtrace.first.should include("#{__FILE__}:#{initial_raise_line}:")
-      raised_again.backtrace.first.should_not include("#{__FILE__}:#{raise_again_line}:")
+      raised_again.backtrace.first.should.include?("#{__FILE__}:#{initial_raise_line}:")
+      raised_again.backtrace.first.should_not.include?("#{__FILE__}:#{raise_again_line}:")
     end
   end
 
@@ -148,19 +155,19 @@ def exception(*args)
   it "raises a RuntimeError if no exception class is given" do
     @thr.raise
     Thread.pass while @thr.status
-    ScratchPad.recorded.should be_kind_of(RuntimeError)
+    ScratchPad.recorded.should.is_a?(RuntimeError)
   end
 
   it "raises the given exception" do
     @thr.raise Exception
     Thread.pass while @thr.status
-    ScratchPad.recorded.should be_kind_of(Exception)
+    ScratchPad.recorded.should.is_a?(Exception)
   end
 
   it "raises the given exception with the given message" do
     @thr.raise Exception, "get to work"
     Thread.pass while @thr.status
-    ScratchPad.recorded.should be_kind_of(Exception)
+    ScratchPad.recorded.should.is_a?(Exception)
     ScratchPad.recorded.message.should == "get to work"
   end
 
@@ -174,7 +181,7 @@ def exception(*args)
 
     q.pop # wait for `report_on_exception = false`.
     t.raise
-    -> { t.value }.should raise_error(RuntimeError)
+    -> { t.value }.should.raise(RuntimeError)
   end
 
   it "raises the given argument even when there is an active exception" do
@@ -193,7 +200,7 @@ def exception(*args)
     rescue
       Thread.pass until raised
       t.raise RangeError
-      -> { t.value }.should raise_error(RangeError)
+      -> { t.value }.should.raise(RangeError)
     end
   end
 
@@ -214,7 +221,7 @@ def exception(*args)
       Thread.pass until raised
       t.raise
     end
-    -> { t.value }.should raise_error(RuntimeError)
+    -> { t.value }.should.raise(RuntimeError)
   end
 end
 
@@ -230,6 +237,6 @@ def exception(*args)
         Thread.current.raise
       end
     end
-    -> { t.value }.should raise_error(RuntimeError, '')
+    -> { t.value }.should.raise(RuntimeError, '')
   end
 end
diff --git a/spec/ruby/core/thread/report_on_exception_spec.rb b/spec/ruby/core/thread/report_on_exception_spec.rb
index d9daa041cd9..9cf52608085 100644
--- a/spec/ruby/core/thread/report_on_exception_spec.rb
+++ b/spec/ruby/core/thread/report_on_exception_spec.rb
@@ -58,7 +58,7 @@
 
       -> {
         t.join
-      }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
+      }.should.raise(RuntimeError, "Thread#report_on_exception specs")
     end
 
     it "prints a backtrace on $stderr in the regular backtrace order" do
@@ -86,7 +86,7 @@ def foo
 
       -> {
         t.join
-      }.should raise_error(RuntimeError, "Thread#report_on_exception specs backtrace order")
+      }.should.raise(RuntimeError, "Thread#report_on_exception specs backtrace order")
     end
 
     it "prints the backtrace even if the thread was killed just after Thread#raise" do
@@ -107,7 +107,7 @@ def foo
 
       -> {
         t.join
-      }.should raise_error(RuntimeError, "Thread#report_on_exception before kill spec")
+      }.should.raise(RuntimeError, "Thread#report_on_exception before kill spec")
     end
   end
 
@@ -124,7 +124,7 @@ def foo
 
       -> {
         t.join
-      }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
+      }.should.raise(RuntimeError, "Thread#report_on_exception specs")
     end
   end
 
@@ -144,12 +144,12 @@ def foo
 
         -> {
           mutex.sleep(5)
-        }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
+        }.should.raise(RuntimeError, "Thread#report_on_exception specs")
       }.should output("", /Thread.+terminated with exception.+Thread#report_on_exception specs/m)
 
       -> {
         t.join
-      }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
+      }.should.raise(RuntimeError, "Thread#report_on_exception specs")
     end
   end
 end
diff --git a/spec/ruby/core/thread/shared/exit.rb b/spec/ruby/core/thread/shared/exit.rb
index 13e88326842..a294c3a4d63 100644
--- a/spec/ruby/core/thread/shared/exit.rb
+++ b/spec/ruby/core/thread/shared/exit.rb
@@ -56,8 +56,8 @@
     Thread.pass while @inner.status and @inner.status != "sleep"
     @outer.send(@method)
     @outer.join
-    ScratchPad.recorded.should include(:inner_ensure_clause)
-    ScratchPad.recorded.should include(:outer_ensure_clause)
+    ScratchPad.recorded.should.include?(:inner_ensure_clause)
+    ScratchPad.recorded.should.include?(:outer_ensure_clause)
   end
 
   it "does not set $!" do
@@ -155,7 +155,7 @@
 
     it "propagates inner exception to Thread.join if there is an outer ensure clause" do
       thread = ThreadSpecs.dying_thread_with_outer_ensure(@method) { }
-      -> { thread.join }.should raise_error(RuntimeError, "In dying thread")
+      -> { thread.join }.should.raise(RuntimeError, "In dying thread")
     end
 
     it "runs all outer ensure clauses even if inner ensure clause raises exception" do
diff --git a/spec/ruby/core/thread/shared/start.rb b/spec/ruby/core/thread/shared/start.rb
index 2ba926bf005..c5d62ab0984 100644
--- a/spec/ruby/core/thread/shared/start.rb
+++ b/spec/ruby/core/thread/shared/start.rb
@@ -6,22 +6,22 @@
   it "raises an ArgumentError if not passed a block" do
     -> {
       Thread.send(@method)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "spawns a new Thread running the block" do
     run = false
     t = Thread.send(@method) { run = true }
-    t.should be_kind_of(Thread)
+    t.should.is_a?(Thread)
     t.join
 
-    run.should be_true
+    run.should == true
   end
 
   it "respects Thread subclasses" do
     c = Class.new(Thread)
     t = c.send(@method) { }
-    t.should be_kind_of(c)
+    t.should.is_a?(c)
 
     t.join
   end
diff --git a/spec/ruby/core/thread/shared/to_s.rb b/spec/ruby/core/thread/shared/to_s.rb
index 43640deb33a..27e53ba4b83 100644
--- a/spec/ruby/core/thread/shared/to_s.rb
+++ b/spec/ruby/core/thread/shared/to_s.rb
@@ -12,42 +12,42 @@
   end
 
   it "can check it's own status" do
-    ThreadSpecs.status_of_current_thread.send(@method).should include('run')
+    ThreadSpecs.status_of_current_thread.send(@method).should.include?('run')
   end
 
   it "describes a running thread" do
-    ThreadSpecs.status_of_running_thread.send(@method).should include('run')
+    ThreadSpecs.status_of_running_thread.send(@method).should.include?('run')
   end
 
   it "describes a sleeping thread" do
-    ThreadSpecs.status_of_sleeping_thread.send(@method).should include('sleep')
+    ThreadSpecs.status_of_sleeping_thread.send(@method).should.include?('sleep')
   end
 
   it "describes a blocked thread" do
-    ThreadSpecs.status_of_blocked_thread.send(@method).should include('sleep')
+    ThreadSpecs.status_of_blocked_thread.send(@method).should.include?('sleep')
   end
 
   it "describes a completed thread" do
-    ThreadSpecs.status_of_completed_thread.send(@method).should include('dead')
+    ThreadSpecs.status_of_completed_thread.send(@method).should.include?('dead')
   end
 
   it "describes a killed thread" do
-    ThreadSpecs.status_of_killed_thread.send(@method).should include('dead')
+    ThreadSpecs.status_of_killed_thread.send(@method).should.include?('dead')
   end
 
   it "describes a thread with an uncaught exception" do
-    ThreadSpecs.status_of_thread_with_uncaught_exception.send(@method).should include('dead')
+    ThreadSpecs.status_of_thread_with_uncaught_exception.send(@method).should.include?('dead')
   end
 
   it "describes a dying sleeping thread" do
-    ThreadSpecs.status_of_dying_sleeping_thread.send(@method).should include('sleep')
+    ThreadSpecs.status_of_dying_sleeping_thread.send(@method).should.include?('sleep')
   end
 
   it "reports aborting on a killed thread" do
-    ThreadSpecs.status_of_dying_running_thread.send(@method).should include('aborting')
+    ThreadSpecs.status_of_dying_running_thread.send(@method).should.include?('aborting')
   end
 
   it "reports aborting on a killed thread after sleep" do
-    ThreadSpecs.status_of_dying_thread_after_sleep.send(@method).should include('aborting')
+    ThreadSpecs.status_of_dying_thread_after_sleep.send(@method).should.include?('aborting')
   end
 end
diff --git a/spec/ruby/core/thread/shared/wakeup.rb b/spec/ruby/core/thread/shared/wakeup.rb
index 6f010fea254..c89235ba600 100644
--- a/spec/ruby/core/thread/shared/wakeup.rb
+++ b/spec/ruby/core/thread/shared/wakeup.rb
@@ -57,6 +57,6 @@
   it "raises a ThreadError when trying to wake up a dead thread" do
     t = Thread.new { 1 }
     t.join
-    -> { t.send @method }.should raise_error(ThreadError)
+    -> { t.send @method }.should.raise(ThreadError)
   end
 end
diff --git a/spec/ruby/core/thread/thread_variable_get_spec.rb b/spec/ruby/core/thread/thread_variable_get_spec.rb
index 1ea34cf2b31..3d92cd54797 100644
--- a/spec/ruby/core/thread/thread_variable_get_spec.rb
+++ b/spec/ruby/core/thread/thread_variable_get_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "returns nil if the variable is not set" do
-    @t.thread_variable_get(:a).should be_nil
+    @t.thread_variable_get(:a).should == nil
   end
 
   it "returns the value previously set by #thread_variable_set" do
@@ -20,7 +20,7 @@
 
   it "returns a value private to self" do
     @t.thread_variable_set(:thread_variable_get_spec, 82)
-    Thread.current.thread_variable_get(:thread_variable_get_spec).should be_nil
+    Thread.current.thread_variable_get(:thread_variable_get_spec).should == nil
   end
 
   it "accepts String and Symbol keys interchangeably" do
@@ -38,23 +38,23 @@
 
   it "does not raise FrozenError if the thread is frozen" do
     @t.freeze
-    @t.thread_variable_get(:a).should be_nil
+    @t.thread_variable_get(:a).should == nil
   end
 
   it "raises a TypeError if the key is neither Symbol nor String when thread variables are already set" do
     @t.thread_variable_set(:a, 49)
-    -> { @t.thread_variable_get(123) }.should raise_error(TypeError, /123 is not a symbol/)
+    -> { @t.thread_variable_get(123) }.should.raise(TypeError, /123 is not a symbol/)
   end
 
   ruby_version_is '3.4' do
     it "raises a TypeError if the key is neither Symbol nor String when no thread variables are set" do
-      -> { @t.thread_variable_get(123) }.should raise_error(TypeError, /123 is not a symbol/)
+      -> { @t.thread_variable_get(123) }.should.raise(TypeError, /123 is not a symbol/)
     end
 
     it "raises a TypeError if the key is neither Symbol nor String without calling #to_sym" do
       key = mock('key')
       key.should_not_receive(:to_sym)
-      -> { @t.thread_variable_get(key) }.should raise_error(TypeError, /#{Regexp.escape(key.inspect)} is not a symbol/)
+      -> { @t.thread_variable_get(key) }.should.raise(TypeError, /#{Regexp.escape(key.inspect)} is not a symbol/)
     end
   end
 end
diff --git a/spec/ruby/core/thread/thread_variable_set_spec.rb b/spec/ruby/core/thread/thread_variable_set_spec.rb
index eadee76afba..f8d25364ae9 100644
--- a/spec/ruby/core/thread/thread_variable_set_spec.rb
+++ b/spec/ruby/core/thread/thread_variable_set_spec.rb
@@ -21,7 +21,7 @@
   it "sets a value private to self" do
     @t.thread_variable_set(:thread_variable_get_spec, 82)
     @t.thread_variable_get(:thread_variable_get_spec).should == 82
-    Thread.current.thread_variable_get(:thread_variable_get_spec).should be_nil
+    Thread.current.thread_variable_get(:thread_variable_get_spec).should == nil
   end
 
   it "accepts String and Symbol keys interchangeably" do
@@ -42,21 +42,21 @@
   it "removes a key if the value is nil" do
     @t.thread_variable_set(:a, 52)
     @t.thread_variable_set(:a, nil)
-    @t.thread_variable?(:a).should be_false
+    @t.thread_variable?(:a).should == false
   end
 
   it "raises a FrozenError if the thread is frozen" do
     @t.freeze
-    -> { @t.thread_variable_set(:a, 1) }.should raise_error(FrozenError, "can't modify frozen thread locals")
+    -> { @t.thread_variable_set(:a, 1) }.should.raise(FrozenError, "can't modify frozen thread locals")
   end
 
   it "raises a TypeError if the key is neither Symbol nor String, nor responds to #to_str" do
-    -> { @t.thread_variable_set(123, 1) }.should raise_error(TypeError, /123 is not a symbol/)
+    -> { @t.thread_variable_set(123, 1) }.should.raise(TypeError, /123 is not a symbol/)
   end
 
   it "does not try to convert the key with #to_sym" do
     key = mock('key')
     key.should_not_receive(:to_sym)
-    -> { @t.thread_variable_set(key, 42) }.should raise_error(TypeError, /#{Regexp.quote(key.inspect)} is not a symbol/)
+    -> { @t.thread_variable_set(key, 42) }.should.raise(TypeError, /#{Regexp.quote(key.inspect)} is not a symbol/)
   end
 end
diff --git a/spec/ruby/core/thread/thread_variable_spec.rb b/spec/ruby/core/thread/thread_variable_spec.rb
index 1b021e94044..ebafd4f3ebb 100644
--- a/spec/ruby/core/thread/thread_variable_spec.rb
+++ b/spec/ruby/core/thread/thread_variable_spec.rb
@@ -11,50 +11,50 @@
 
   it "returns false if the thread variables do not contain 'key'" do
     @t.thread_variable_set(:a, 2)
-    @t.thread_variable?(:b).should be_false
+    @t.thread_variable?(:b).should == false
   end
 
   it "returns true if the thread variables contain 'key'" do
     @t.thread_variable_set(:a, 2)
-    @t.thread_variable?(:a).should be_true
+    @t.thread_variable?(:a).should == true
   end
 
   it "accepts String and Symbol keys interchangeably" do
-    @t.thread_variable?('a').should be_false
-    @t.thread_variable?(:a).should be_false
+    @t.thread_variable?('a').should == false
+    @t.thread_variable?(:a).should == false
 
     @t.thread_variable_set(:a, 49)
 
-    @t.thread_variable?('a').should be_true
-    @t.thread_variable?(:a).should be_true
+    @t.thread_variable?('a').should == true
+    @t.thread_variable?(:a).should == true
   end
 
   it "converts a key that is neither String nor Symbol with #to_str" do
     key = mock('key')
     key.should_receive(:to_str).and_return('a')
     @t.thread_variable_set(:a, 49)
-    @t.thread_variable?(key).should be_true
+    @t.thread_variable?(key).should == true
   end
 
   it "does not raise FrozenError if the thread is frozen" do
     @t.freeze
-    @t.thread_variable?(:a).should be_false
+    @t.thread_variable?(:a).should == false
   end
 
   it "raises a TypeError if the key is neither Symbol nor String when thread variables are already set" do
     @t.thread_variable_set(:a, 49)
-    -> { @t.thread_variable?(123) }.should raise_error(TypeError, /123 is not a symbol/)
+    -> { @t.thread_variable?(123) }.should.raise(TypeError, /123 is not a symbol/)
   end
 
   ruby_version_is '3.4' do
     it "raises a TypeError if the key is neither Symbol nor String when no thread variables are set" do
-      -> { @t.thread_variable?(123) }.should raise_error(TypeError, /123 is not a symbol/)
+      -> { @t.thread_variable?(123) }.should.raise(TypeError, /123 is not a symbol/)
     end
 
     it "raises a TypeError if the key is neither Symbol nor String without calling #to_sym" do
       key = mock('key')
       key.should_not_receive(:to_sym)
-      -> { @t.thread_variable?(key) }.should raise_error(TypeError, /#{Regexp.escape(key.inspect)} is not a symbol/)
+      -> { @t.thread_variable?(key) }.should.raise(TypeError, /#{Regexp.escape(key.inspect)} is not a symbol/)
     end
   end
 end
diff --git a/spec/ruby/core/thread/thread_variables_spec.rb b/spec/ruby/core/thread/thread_variables_spec.rb
index 51ceef3376e..f15c681a8fc 100644
--- a/spec/ruby/core/thread/thread_variables_spec.rb
+++ b/spec/ruby/core/thread/thread_variables_spec.rb
@@ -19,7 +19,8 @@
   it "returns the keys private to self" do
     @t.thread_variable_set(:a, 82)
     @t.thread_variable_set(:b, 82)
-    Thread.current.thread_variables.should_not include(:a, :b)
+    Thread.current.thread_variables.should_not.include?(:a)
+    Thread.current.thread_variables.should_not.include?(:b)
   end
 
   it "only contains user thread variables and is empty initially" do
diff --git a/spec/ruby/core/thread/value_spec.rb b/spec/ruby/core/thread/value_spec.rb
index 30e43abd1a8..50c823171d1 100644
--- a/spec/ruby/core/thread/value_spec.rb
+++ b/spec/ruby/core/thread/value_spec.rb
@@ -11,7 +11,7 @@
       Thread.current.report_on_exception = false
       raise "Hello"
     }
-    -> { t.value }.should raise_error(RuntimeError, "Hello")
+    -> { t.value }.should.raise(RuntimeError, "Hello")
   end
 
   it "is nil for a killed thread" do
diff --git a/spec/ruby/core/threadgroup/default_spec.rb b/spec/ruby/core/threadgroup/default_spec.rb
index d7d4726cc2b..4f57508abfa 100644
--- a/spec/ruby/core/threadgroup/default_spec.rb
+++ b/spec/ruby/core/threadgroup/default_spec.rb
@@ -2,7 +2,7 @@
 
 describe "ThreadGroup::Default" do
   it "is a ThreadGroup instance" do
-    ThreadGroup::Default.should be_kind_of(ThreadGroup)
+    ThreadGroup::Default.should.is_a?(ThreadGroup)
   end
 
   it "is the ThreadGroup of the main thread" do
diff --git a/spec/ruby/core/threadgroup/enclose_spec.rb b/spec/ruby/core/threadgroup/enclose_spec.rb
index dd9a7a362da..6f703d4ce29 100644
--- a/spec/ruby/core/threadgroup/enclose_spec.rb
+++ b/spec/ruby/core/threadgroup/enclose_spec.rb
@@ -19,6 +19,6 @@
     thread_group.enclose
     -> do
       default_group.add(@thread)
-    end.should raise_error(ThreadError)
+    end.should.raise(ThreadError)
   end
 end
diff --git a/spec/ruby/core/threadgroup/enclosed_spec.rb b/spec/ruby/core/threadgroup/enclosed_spec.rb
index a734256a649..cf8a5bb4c63 100644
--- a/spec/ruby/core/threadgroup/enclosed_spec.rb
+++ b/spec/ruby/core/threadgroup/enclosed_spec.rb
@@ -3,12 +3,12 @@
 describe "ThreadGroup#enclosed?" do
   it "returns false when a ThreadGroup has not been enclosed (default state)" do
     thread_group = ThreadGroup.new
-    thread_group.enclosed?.should be_false
+    thread_group.enclosed?.should == false
   end
 
   it "returns true when a ThreadGroup is enclosed" do
     thread_group = ThreadGroup.new
     thread_group.enclose
-    thread_group.enclosed?.should be_true
+    thread_group.enclosed?.should == true
   end
 end
diff --git a/spec/ruby/core/threadgroup/list_spec.rb b/spec/ruby/core/threadgroup/list_spec.rb
index b2ac64324ab..ef601d75eab 100644
--- a/spec/ruby/core/threadgroup/list_spec.rb
+++ b/spec/ruby/core/threadgroup/list_spec.rb
@@ -7,13 +7,13 @@
     q.pop.should == :go
     tg = ThreadGroup.new
     tg.add(th1)
-    tg.list.should include(th1)
+    tg.list.should.include?(th1)
 
     th2 = Thread.new { q << :go; sleep }
     q.pop.should == :go
 
     tg.add(th2)
-    (tg.list & [th1, th2]).should include(th1, th2)
+    (tg.list & [th1, th2]).to_set.should == Set[th1, th2]
 
     Thread.pass while th1.status and th1.status != 'sleep'
     Thread.pass while th2.status and th2.status != 'sleep'
diff --git a/spec/ruby/core/time/_dump_spec.rb b/spec/ruby/core/time/_dump_spec.rb
index 852f9a07abf..21f08063270 100644
--- a/spec/ruby/core/time/_dump_spec.rb
+++ b/spec/ruby/core/time/_dump_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "is a private method" do
-    Time.should have_private_instance_method(:_dump, false)
+    Time.private_instance_methods(false).should.include?(:_dump)
   end
 
   # http://redmine.ruby-lang.org/issues/show/627
@@ -25,7 +25,7 @@
   end
 
   it "dumps a Time object to a bytestring" do
-    @s.should be_an_instance_of(String)
+    @s.should.instance_of?(String)
     @s.should == [3222863947, 2235564032].pack("VV")
   end
 
diff --git a/spec/ruby/core/time/_load_spec.rb b/spec/ruby/core/time/_load_spec.rb
index 30899de2625..a74e3dc1292 100644
--- a/spec/ruby/core/time/_load_spec.rb
+++ b/spec/ruby/core/time/_load_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Time._load" do
   it "is a private method" do
-    Time.should have_private_method(:_load, false)
+    Time.private_methods(false).should.include?(:_load)
   end
 
   # http://redmine.ruby-lang.org/issues/show/627
diff --git a/spec/ruby/core/time/at_spec.rb b/spec/ruby/core/time/at_spec.rb
index 97906b8c8c2..10d4d36a68f 100644
--- a/spec/ruby/core/time/at_spec.rb
+++ b/spec/ruby/core/time/at_spec.rb
@@ -20,7 +20,7 @@
     it "returns a subclass instance on a Time subclass" do
       c = Class.new(Time)
       t = c.at(0)
-      t.should be_an_instance_of(c)
+      t.should.instance_of?(c)
     end
 
     it "roundtrips a Rational produced by #to_r" do
@@ -56,7 +56,7 @@
     it "creates a dup time object with the value given by time" do
       t1 = Time.new
       t2 = Time.at(t1)
-      t1.should_not equal t2
+      t1.should_not.equal? t2
     end
 
     it "returns a UTC time if the argument is UTC" do
@@ -72,17 +72,17 @@
     it "returns a subclass instance" do
       c = Class.new(Time)
       t = c.at(Time.now)
-      t.should be_an_instance_of(c)
+      t.should.instance_of?(c)
     end
   end
 
   describe "passed non-Time, non-Numeric" do
     it "raises a TypeError with a String argument" do
-      -> { Time.at("0") }.should raise_error(TypeError)
+      -> { Time.at("0") }.should.raise(TypeError)
     end
 
     it "raises a TypeError with a nil argument" do
-      -> { Time.at(nil) }.should raise_error(TypeError)
+      -> { Time.at(nil) }.should.raise(TypeError)
     end
 
     describe "with an argument that responds to #to_int" do
@@ -103,7 +103,7 @@
       it "needs for the argument to respond to #to_int too" do
         o = mock('rational-but-no-to_int')
         def o.to_r; Rational(5, 2) end
-        -> { Time.at(o) }.should raise_error(TypeError, "can't convert MockObject into an exact number")
+        -> { Time.at(o) }.should.raise(TypeError, "can't convert MockObject into an exact number")
       end
     end
   end
@@ -140,20 +140,20 @@ def o.to_r; Rational(5, 2) end
 
   describe "passed [Integer, nil]" do
     it "raises a TypeError" do
-      -> { Time.at(0, nil) }.should raise_error(TypeError)
+      -> { Time.at(0, nil) }.should.raise(TypeError)
     end
   end
 
   describe "passed [Integer, String]" do
     it "raises a TypeError" do
-      -> { Time.at(0, "0") }.should raise_error(TypeError)
+      -> { Time.at(0, "0") }.should.raise(TypeError)
     end
   end
 
   describe "passed [Time, Integer]" do
     # #8173
     it "raises a TypeError" do
-      -> { Time.at(Time.now, 500000) }.should raise_error(TypeError)
+      -> { Time.at(Time.now, 500000) }.should.raise(TypeError)
     end
   end
 
@@ -190,15 +190,15 @@ def o.to_r; Rational(5, 2) end
 
     context "not supported format" do
       it "raises ArgumentError" do
-        -> { Time.at(0, 123456, 2) }.should raise_error(ArgumentError)
-        -> { Time.at(0, 123456, nil) }.should raise_error(ArgumentError)
-        -> { Time.at(0, 123456, :invalid) }.should raise_error(ArgumentError)
+        -> { Time.at(0, 123456, 2) }.should.raise(ArgumentError)
+        -> { Time.at(0, 123456, nil) }.should.raise(ArgumentError)
+        -> { Time.at(0, 123456, :invalid) }.should.raise(ArgumentError)
       end
 
       it "does not try to convert format to Symbol with #to_sym" do
         format = +"usec"
         format.should_not_receive(:to_sym)
-        -> { Time.at(0, 123456, format) }.should raise_error(ArgumentError)
+        -> { Time.at(0, 123456, format) }.should.raise(ArgumentError)
       end
     end
 
@@ -283,33 +283,33 @@ def o.to_r; Rational(5, 2) end
     end
 
     it "raises ArgumentError if format is invalid" do
-      -> { Time.at(@epoch_time, in: "+09:99") }.should raise_error(ArgumentError)
-      -> { Time.at(@epoch_time, in: "ABC") }.should raise_error(ArgumentError)
+      -> { Time.at(@epoch_time, in: "+09:99") }.should.raise(ArgumentError)
+      -> { Time.at(@epoch_time, in: "ABC") }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if hours greater than 23" do # TODO
-      -> { Time.at(@epoch_time, in: "+24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-      -> { Time.at(@epoch_time, in: "+2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.at(@epoch_time, in: "+24:00") }.should.raise(ArgumentError, "utc_offset out of range")
+      -> { Time.at(@epoch_time, in: "+2400") }.should.raise(ArgumentError, "utc_offset out of range")
 
-      -> { Time.at(@epoch_time, in: "+99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-      -> { Time.at(@epoch_time, in: "+9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.at(@epoch_time, in: "+99:00") }.should.raise(ArgumentError, "utc_offset out of range")
+      -> { Time.at(@epoch_time, in: "+9900") }.should.raise(ArgumentError, "utc_offset out of range")
     end
 
     it "raises ArgumentError if minutes greater than 59" do # TODO
-      -> { Time.at(@epoch_time, in: "+00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
-      -> { Time.at(@epoch_time, in: "+0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+      -> { Time.at(@epoch_time, in: "+00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+      -> { Time.at(@epoch_time, in: "+0060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
 
-      -> { Time.at(@epoch_time, in: "+00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
-      -> { Time.at(@epoch_time, in: "+0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+      -> { Time.at(@epoch_time, in: "+00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+      -> { Time.at(@epoch_time, in: "+0099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
     end
 
     ruby_bug '#20797', ''...'3.4' do
       it "raises ArgumentError if seconds greater than 59" do
-        -> { Time.at(@epoch_time, in: "+00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
-        -> { Time.at(@epoch_time, in: "+000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+        -> { Time.at(@epoch_time, in: "+00:00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+        -> { Time.at(@epoch_time, in: "+000060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
 
-        -> { Time.at(@epoch_time, in: "+00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
-        -> { Time.at(@epoch_time, in: "+000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+        -> { Time.at(@epoch_time, in: "+00:00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+        -> { Time.at(@epoch_time, in: "+000099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
       end
     end
   end
diff --git a/spec/ruby/core/time/ceil_spec.rb b/spec/ruby/core/time/ceil_spec.rb
index 9d624a1ed09..18e26f99945 100644
--- a/spec/ruby/core/time/ceil_spec.rb
+++ b/spec/ruby/core/time/ceil_spec.rb
@@ -28,8 +28,8 @@
   it "returns an instance of Time, even if #ceil is called on a subclass" do
     subclass = Class.new(Time)
     instance = subclass.at(0)
-    instance.class.should equal subclass
-    instance.ceil.should be_an_instance_of(Time)
+    instance.class.should.equal? subclass
+    instance.ceil.should.instance_of?(Time)
   end
 
   it "copies own timezone to the returning value" do
diff --git a/spec/ruby/core/time/comparison_spec.rb b/spec/ruby/core/time/comparison_spec.rb
index 866fbea72ef..0790088f9eb 100644
--- a/spec/ruby/core/time/comparison_spec.rb
+++ b/spec/ruby/core/time/comparison_spec.rb
@@ -124,7 +124,7 @@
       def r.<=>(other); other <=> self; end
       r.should_receive(:<=>).once
 
-      (t <=> r).should be_nil
+      (t <=> r).should == nil
     end
   end
 end
diff --git a/spec/ruby/core/time/deconstruct_keys_spec.rb b/spec/ruby/core/time/deconstruct_keys_spec.rb
index b5cfdaa93f8..9918728c1d9 100644
--- a/spec/ruby/core/time/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/time/deconstruct_keys_spec.rb
@@ -16,16 +16,16 @@
   it "requires one argument" do
     -> {
       Time.new(2022, 10, 5, 13, 30).deconstruct_keys
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "it raises error when argument is neither nil nor array" do
     d = Time.new(2022, 10, 5, 13, 30)
 
-    -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
-    -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
-    -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
-    -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
+    -> { d.deconstruct_keys(1) }.should.raise(TypeError, "wrong argument type Integer (expected Array or nil)")
+    -> { d.deconstruct_keys("asd") }.should.raise(TypeError, "wrong argument type String (expected Array or nil)")
+    -> { d.deconstruct_keys(:x) }.should.raise(TypeError, "wrong argument type Symbol (expected Array or nil)")
+    -> { d.deconstruct_keys({}) }.should.raise(TypeError, "wrong argument type Hash (expected Array or nil)")
   end
 
   it "returns {} when passed []" do
diff --git a/spec/ruby/core/time/dup_spec.rb b/spec/ruby/core/time/dup_spec.rb
index 5d6621beaa8..33aa1304ef9 100644
--- a/spec/ruby/core/time/dup_spec.rb
+++ b/spec/ruby/core/time/dup_spec.rb
@@ -22,25 +22,25 @@
     c = Class.new(Time)
     t = c.now
 
-    t.should be_an_instance_of(c)
-    t.dup.should be_an_instance_of(c)
+    t.should.instance_of?(c)
+    t.dup.should.instance_of?(c)
   end
 
   it "returns a clone of Time instance" do
     c = Time.dup
     t = c.now
 
-    t.should be_an_instance_of(c)
-    t.should_not be_an_instance_of(Time)
+    t.should.instance_of?(c)
+    t.should_not.instance_of?(Time)
 
-    t.dup.should be_an_instance_of(c)
-    t.dup.should_not be_an_instance_of(Time)
+    t.dup.should.instance_of?(c)
+    t.dup.should_not.instance_of?(Time)
   end
 
   it "does not copy frozen status from the original" do
     t = Time.now
     t.freeze
     t2 = t.dup
-    t2.frozen?.should be_false
+    t2.frozen?.should == false
   end
 end
diff --git a/spec/ruby/core/time/eql_spec.rb b/spec/ruby/core/time/eql_spec.rb
index 2ffb4eec962..b7505969ddf 100644
--- a/spec/ruby/core/time/eql_spec.rb
+++ b/spec/ruby/core/time/eql_spec.rb
@@ -2,28 +2,28 @@
 
 describe "Time#eql?" do
   it "returns true if self and other have the same whole number of seconds" do
-    Time.at(100).should eql(Time.at(100))
+    Time.at(100).should.eql?(Time.at(100))
   end
 
   it "returns false if self and other have differing whole numbers of seconds" do
-    Time.at(100).should_not eql(Time.at(99))
+    Time.at(100).should_not.eql?(Time.at(99))
   end
 
   it "returns true if self and other have the same number of microseconds" do
-    Time.at(100, 100).should eql(Time.at(100, 100))
+    Time.at(100, 100).should.eql?(Time.at(100, 100))
   end
 
   it "returns false if self and other have differing numbers of microseconds" do
-    Time.at(100, 100).should_not eql(Time.at(100, 99))
+    Time.at(100, 100).should_not.eql?(Time.at(100, 99))
   end
 
   it "returns false if self and other have differing fractional microseconds" do
-    Time.at(100, Rational(100,1000)).should_not eql(Time.at(100, Rational(99,1000)))
+    Time.at(100, Rational(100,1000)).should_not.eql?(Time.at(100, Rational(99,1000)))
   end
 
   it "returns false when given a non-time value" do
-    Time.at(100, 100).should_not eql("100")
-    Time.at(100, 100).should_not eql(100)
-    Time.at(100, 100).should_not eql(100.1)
+    Time.at(100, 100).should_not.eql?("100")
+    Time.at(100, 100).should_not.eql?(100)
+    Time.at(100, 100).should_not.eql?(100.1)
   end
 end
diff --git a/spec/ruby/core/time/floor_spec.rb b/spec/ruby/core/time/floor_spec.rb
index b0003469c95..41e5142b19a 100644
--- a/spec/ruby/core/time/floor_spec.rb
+++ b/spec/ruby/core/time/floor_spec.rb
@@ -20,8 +20,8 @@
   it "returns an instance of Time, even if #floor is called on a subclass" do
     subclass = Class.new(Time)
     instance = subclass.at(0)
-    instance.class.should equal subclass
-    instance.floor.should be_an_instance_of(Time)
+    instance.class.should.equal? subclass
+    instance.floor.should.instance_of?(Time)
   end
 
   it "copies own timezone to the returning value" do
diff --git a/spec/ruby/core/time/getlocal_spec.rb b/spec/ruby/core/time/getlocal_spec.rb
index 398596f4004..7e5334c3033 100644
--- a/spec/ruby/core/time/getlocal_spec.rb
+++ b/spec/ruby/core/time/getlocal_spec.rb
@@ -14,7 +14,7 @@
     t = Time.gm(2007, 1, 9, 12, 0, 0).getlocal(3630)
     t.should == Time.new(2007, 1, 9, 13, 0, 30, 3630)
     t.utc_offset.should == 3630
-    t.zone.should be_nil
+    t.zone.should == nil
   end
 
   platform_is_not :windows do
@@ -41,7 +41,7 @@
   it "returns a Time with a UTC offset of the specified number of Rational seconds" do
     t = Time.gm(2007, 1, 9, 12, 0, 0).getlocal(Rational(7201, 2))
     t.should == Time.new(2007, 1, 9, 13, 0, Rational(1, 2), Rational(7201, 2))
-    t.utc_offset.should eql(Rational(7201, 2))
+    t.utc_offset.should.eql?(Rational(7201, 2))
   end
 
   describe "with an argument that responds to #to_r" do
@@ -50,7 +50,7 @@
       o.should_receive(:to_r).and_return(Rational(7201, 2))
       t = Time.gm(2007, 1, 9, 12, 0, 0).getlocal(o)
       t.should == Time.new(2007, 1, 9, 13, 0, Rational(1, 2), Rational(7201, 2))
-      t.utc_offset.should eql(Rational(7201, 2))
+      t.utc_offset.should.eql?(Rational(7201, 2))
     end
   end
 
@@ -90,49 +90,49 @@
 
   it "raises ArgumentError if the String argument is not of the form (+|-)HH:MM" do
     t = Time.now
-    -> { t.getlocal("3600") }.should raise_error(ArgumentError)
+    -> { t.getlocal("3600") }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the String argument is not in an ASCII-compatible encoding" do
     t = Time.now
-    -> { t.getlocal("-01:00".encode("UTF-16LE")) }.should raise_error(ArgumentError)
+    -> { t.getlocal("-01:00".encode("UTF-16LE")) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the argument represents a value less than or equal to -86400 seconds" do
     t = Time.new
     t.getlocal(-86400 + 1).utc_offset.should == (-86400 + 1)
-    -> { t.getlocal(-86400) }.should raise_error(ArgumentError)
+    -> { t.getlocal(-86400) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the argument represents a value greater than or equal to 86400 seconds" do
     t = Time.new
     t.getlocal(86400 - 1).utc_offset.should == (86400 - 1)
-    -> { t.getlocal(86400) }.should raise_error(ArgumentError)
+    -> { t.getlocal(86400) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if String argument and hours greater than 23" do
-    -> { Time.now.getlocal("+24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-    -> { Time.now.getlocal("+2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+    -> { Time.now.getlocal("+24:00") }.should.raise(ArgumentError, "utc_offset out of range")
+    -> { Time.now.getlocal("+2400") }.should.raise(ArgumentError, "utc_offset out of range")
 
-    -> { Time.now.getlocal("+99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-    -> { Time.now.getlocal("+9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+    -> { Time.now.getlocal("+99:00") }.should.raise(ArgumentError, "utc_offset out of range")
+    -> { Time.now.getlocal("+9900") }.should.raise(ArgumentError, "utc_offset out of range")
   end
 
   it "raises ArgumentError if String argument and minutes greater than 59" do
-    -> { Time.now.getlocal("+00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
-    -> { Time.now.getlocal("+0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+    -> { Time.now.getlocal("+00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+    -> { Time.now.getlocal("+0060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
 
-    -> { Time.now.getlocal("+00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
-    -> { Time.now.getlocal("+0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+    -> { Time.now.getlocal("+00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+    -> { Time.now.getlocal("+0099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
   end
 
   ruby_bug '#20797', ''...'3.4' do
     it "raises ArgumentError if String argument and seconds greater than 59" do
-      -> { Time.now.getlocal("+00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
-      -> { Time.now.getlocal("+000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+      -> { Time.now.getlocal("+00:00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+      -> { Time.now.getlocal("+000060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
 
-      -> { Time.now.getlocal("+00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
-      -> { Time.now.getlocal("+000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+      -> { Time.now.getlocal("+00:00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+      -> { Time.now.getlocal("+000099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
     end
   end
 
@@ -155,8 +155,8 @@ def zone.local_to_utc(time)
       end
 
       -> {
-        Time.utc(2000, 1, 1, 12, 0, 0).getlocal(zone).should be_kind_of(Time)
-      }.should_not raise_error
+        Time.utc(2000, 1, 1, 12, 0, 0).getlocal(zone).should.is_a?(Time)
+      }.should_not.raise
     end
 
     it "raises TypeError if timezone does not implement #utc_to_local method" do
@@ -167,7 +167,7 @@ def zone.local_to_utc(time)
 
       -> {
         Time.utc(2000, 1, 1, 12, 0, 0).getlocal(zone)
-      }.should raise_error(TypeError, /can't convert \w+ into an exact number/)
+      }.should.raise(TypeError, /can't convert \w+ into an exact number/)
     end
 
     it "does not raise exception if timezone does not implement #local_to_utc method" do
@@ -177,18 +177,18 @@ def zone.utc_to_local(time)
       end
 
       -> {
-        Time.utc(2000, 1, 1, 12, 0, 0).getlocal(zone).should be_kind_of(Time)
-      }.should_not raise_error
+        Time.utc(2000, 1, 1, 12, 0, 0).getlocal(zone).should.is_a?(Time)
+      }.should_not.raise
     end
 
     context "subject's class implements .find_timezone method" do
       it "calls .find_timezone to build a time object if passed zone name as a timezone argument" do
         time = TimeSpecs::TimeWithFindTimezone.utc(2000, 1, 1, 12, 0, 0).getlocal("Asia/Colombo")
-        time.zone.should be_kind_of TimeSpecs::TimezoneWithName
+        time.zone.should.is_a? TimeSpecs::TimezoneWithName
         time.zone.name.should == "Asia/Colombo"
 
         time = TimeSpecs::TimeWithFindTimezone.utc(2000, 1, 1, 12, 0, 0).getlocal("some invalid zone name")
-        time.zone.should be_kind_of TimeSpecs::TimezoneWithName
+        time.zone.should.is_a? TimeSpecs::TimezoneWithName
         time.zone.name.should == "some invalid zone name"
       end
 
@@ -198,7 +198,7 @@ def zone.utc_to_local(time)
 
           -> {
             time.getlocal(zone)
-          }.should raise_error(TypeError, /can't convert \w+ into an exact number/)
+          }.should.raise(TypeError, /can't convert \w+ into an exact number/)
         end
       end
     end
diff --git a/spec/ruby/core/time/hash_spec.rb b/spec/ruby/core/time/hash_spec.rb
index 4f4d11a2cd8..1cfc56eab06 100644
--- a/spec/ruby/core/time/hash_spec.rb
+++ b/spec/ruby/core/time/hash_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Time#hash" do
   it "returns an Integer" do
-    Time.at(100).hash.should be_an_instance_of(Integer)
+    Time.at(100).hash.should.instance_of?(Integer)
   end
 
   it "is stable" do
diff --git a/spec/ruby/core/time/localtime_spec.rb b/spec/ruby/core/time/localtime_spec.rb
index 71c0dfebde7..1c0b11b7a62 100644
--- a/spec/ruby/core/time/localtime_spec.rb
+++ b/spec/ruby/core/time/localtime_spec.rb
@@ -12,7 +12,7 @@
 
   it "returns self" do
     t = Time.gm(2007, 1, 9, 12, 0, 0)
-    t.localtime.should equal(t)
+    t.localtime.should.equal?(t)
   end
 
   it "converts time to the UTC offset specified as an Integer number of seconds" do
@@ -26,13 +26,13 @@
     it "does not raise an error if already in the right time zone" do
       time = Time.now
       time.freeze
-      time.localtime.should equal(time)
+      time.localtime.should.equal?(time)
     end
 
     it "raises a FrozenError if the time has a different time zone" do
       time = Time.gm(2007, 1, 9, 12, 0, 0)
       time.freeze
-      -> { time.localtime }.should raise_error(FrozenError)
+      -> { time.localtime }.should.raise(FrozenError)
     end
   end
 
@@ -51,7 +51,7 @@
     t = Time.gm(2007, 1, 9, 12, 0, 0)
     t.localtime(Rational(7201, 2))
     t.should == Time.new(2007, 1, 9, 13, 0, Rational(1, 2), Rational(7201, 2))
-    t.utc_offset.should eql(Rational(7201, 2))
+    t.utc_offset.should.eql?(Rational(7201, 2))
   end
 
   describe "with an argument that responds to #to_r" do
@@ -61,7 +61,7 @@
       t = Time.gm(2007, 1, 9, 12, 0, 0)
       t.localtime(o)
       t.should == Time.new(2007, 1, 9, 13, 0, Rational(1, 2), Rational(7201, 2))
-      t.utc_offset.should eql(Rational(7201, 2))
+      t.utc_offset.should.eql?(Rational(7201, 2))
     end
   end
 
@@ -106,28 +106,28 @@
   end
 
   it "raises ArgumentError if String argument and hours greater than 23" do
-    -> { Time.now.localtime("+24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-    -> { Time.now.localtime("+2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+    -> { Time.now.localtime("+24:00") }.should.raise(ArgumentError, "utc_offset out of range")
+    -> { Time.now.localtime("+2400") }.should.raise(ArgumentError, "utc_offset out of range")
 
-    -> { Time.now.localtime("+99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-    -> { Time.now.localtime("+9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+    -> { Time.now.localtime("+99:00") }.should.raise(ArgumentError, "utc_offset out of range")
+    -> { Time.now.localtime("+9900") }.should.raise(ArgumentError, "utc_offset out of range")
   end
 
   it "raises ArgumentError if String argument and minutes greater than 59" do
-    -> { Time.now.localtime("+00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
-    -> { Time.now.localtime("+0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+    -> { Time.now.localtime("+00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+    -> { Time.now.localtime("+0060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
 
-    -> { Time.now.localtime("+00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
-    -> { Time.now.localtime("+0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+    -> { Time.now.localtime("+00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+    -> { Time.now.localtime("+0099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
   end
 
   ruby_bug '#20797', ''...'3.4' do
     it "raises ArgumentError if String argument and seconds greater than 59" do
-      -> { Time.now.localtime("+00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
-      -> { Time.now.localtime("+000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+      -> { Time.now.localtime("+00:00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+      -> { Time.now.localtime("+000060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
 
-      -> { Time.now.localtime("+00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
-      -> { Time.now.localtime("+000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+      -> { Time.now.localtime("+00:00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+      -> { Time.now.localtime("+000099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
     end
   end
 
@@ -181,23 +181,23 @@
 
   it "raises ArgumentError if the String argument is not of the form (+|-)HH:MM" do
     t = Time.now
-    -> { t.localtime("3600") }.should raise_error(ArgumentError)
+    -> { t.localtime("3600") }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the String argument is not in an ASCII-compatible encoding" do
     t = Time.now
-    -> { t.localtime("-01:00".encode("UTF-16LE")) }.should raise_error(ArgumentError)
+    -> { t.localtime("-01:00".encode("UTF-16LE")) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the argument represents a value less than or equal to -86400 seconds" do
     t = Time.new
     t.localtime(-86400 + 1).utc_offset.should == (-86400 + 1)
-    -> { t.localtime(-86400) }.should raise_error(ArgumentError)
+    -> { t.localtime(-86400) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the argument represents a value greater than or equal to 86400 seconds" do
     t = Time.new
     t.localtime(86400 - 1).utc_offset.should == (86400 - 1)
-    -> { t.localtime(86400) }.should raise_error(ArgumentError)
+    -> { t.localtime(86400) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/time/minus_spec.rb b/spec/ruby/core/time/minus_spec.rb
index 9182d996529..ee3d8acda8f 100644
--- a/spec/ruby/core/time/minus_spec.rb
+++ b/spec/ruby/core/time/minus_spec.rb
@@ -20,18 +20,18 @@
   end
 
   it "raises a TypeError if given argument is a coercible String" do
-    -> { Time.now - "1" }.should raise_error(TypeError)
-    -> { Time.now - "0.1" }.should raise_error(TypeError)
-    -> { Time.now - "1/3" }.should raise_error(TypeError)
+    -> { Time.now - "1" }.should.raise(TypeError)
+    -> { Time.now - "0.1" }.should.raise(TypeError)
+    -> { Time.now - "1/3" }.should.raise(TypeError)
   end
 
   it "raises TypeError on argument that can't be coerced" do
-    -> { Time.now - Object.new }.should raise_error(TypeError)
-    -> { Time.now - "stuff" }.should raise_error(TypeError)
+    -> { Time.now - Object.new }.should.raise(TypeError)
+    -> { Time.now - "stuff" }.should.raise(TypeError)
   end
 
   it "raises TypeError on nil argument" do
-    -> { Time.now - nil }.should raise_error(TypeError)
+    -> { Time.now - nil }.should.raise(TypeError)
   end
 
   it "tracks microseconds" do
@@ -110,7 +110,7 @@
   it "does not return a subclass instance" do
     c = Class.new(Time)
     x = c.now - 1
-    x.should be_an_instance_of(Time)
+    x.should.instance_of?(Time)
   end
 
   it "returns a time with nanoseconds precision between two time objects" do
diff --git a/spec/ruby/core/time/new_spec.rb b/spec/ruby/core/time/new_spec.rb
index f3b5d014204..91ce4b2e3a7 100644
--- a/spec/ruby/core/time/new_spec.rb
+++ b/spec/ruby/core/time/new_spec.rb
@@ -31,14 +31,14 @@
   end
 
   it "returns a Time with a UTC offset of the specified number of Rational seconds" do
-    Time.new(2000, 1, 1, 0, 0, 0, Rational(5, 2)).utc_offset.should eql(Rational(5, 2))
+    Time.new(2000, 1, 1, 0, 0, 0, Rational(5, 2)).utc_offset.should.eql?(Rational(5, 2))
   end
 
   describe "with an argument that responds to #to_r" do
     it "coerces using #to_r" do
       o = mock_numeric('rational')
       o.should_receive(:to_r).and_return(Rational(5, 2))
-      Time.new(2000, 1, 1, 0, 0, 0, o).utc_offset.should eql(Rational(5, 2))
+      Time.new(2000, 1, 1, 0, 0, 0, o).utc_offset.should.eql?(Rational(5, 2))
     end
   end
 
@@ -129,7 +129,7 @@
 
   it "raises ArgumentError if the string argument is J" do
     message = '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: J'
-    -> { Time.new(2000, 1, 1, 0, 0, 0, "J") }.should raise_error(ArgumentError, message)
+    -> { Time.new(2000, 1, 1, 0, 0, 0, "J") }.should.raise(ArgumentError, message)
   end
 
   it "returns a local Time if the argument is nil" do
@@ -144,18 +144,18 @@
   it "disallows a value for minutes greater than 59" do
     -> {
       Time.new(2000, 1, 1, 0, 0, 0, "+01:60")
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       Time.new(2000, 1, 1, 0, 0, 0, "+01:99")
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the String argument is not of the form (+|-)HH:MM" do
-    -> { Time.new(2000, 1, 1, 0, 0, 0, "3600") }.should raise_error(ArgumentError)
+    -> { Time.new(2000, 1, 1, 0, 0, 0, "3600") }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the hour value is greater than 23" do
-    -> { Time.new(2000, 1, 1, 0, 0, 0, "+24:00") }.should raise_error(ArgumentError)
+    -> { Time.new(2000, 1, 1, 0, 0, 0, "+24:00") }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the String argument is not in an ASCII-compatible encoding" do
@@ -164,21 +164,21 @@
     # - '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset'
     -> {
       Time.new(2000, 1, 1, 0, 0, 0, "-04:10".encode("UTF-16LE"))
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the argument represents a value less than or equal to -86400 seconds" do
     Time.new(2000, 1, 1, 0, 0, 0, -86400 + 1).utc_offset.should == (-86400 + 1)
-    -> { Time.new(2000, 1, 1, 0, 0, 0, -86400) }.should raise_error(ArgumentError)
+    -> { Time.new(2000, 1, 1, 0, 0, 0, -86400) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the argument represents a value greater than or equal to 86400 seconds" do
     Time.new(2000, 1, 1, 0, 0, 0, 86400 - 1).utc_offset.should == (86400 - 1)
-    -> { Time.new(2000, 1, 1, 0, 0, 0, 86400) }.should raise_error(ArgumentError)
+    -> { Time.new(2000, 1, 1, 0, 0, 0, 86400) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if the utc_offset argument is greater than or equal to 10e9" do
-    -> { Time.new(2000, 1, 1, 0, 0, 0, 1000000000) }.should raise_error(ArgumentError)
+    -> { Time.new(2000, 1, 1, 0, 0, 0, 1000000000) }.should.raise(ArgumentError)
   end
 end
 
@@ -203,7 +203,7 @@ def zone.local_to_utc(time)
       time
     end
 
-    Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
+    Time.new(2000, 1, 1, 12, 0, 0, zone).should.is_a?(Time)
   end
 
   it "raises TypeError if timezone does not implement #local_to_utc method" do
@@ -214,7 +214,7 @@ def zone.utc_to_local(time)
 
     -> {
       Time.new(2000, 1, 1, 12, 0, 0, zone)
-    }.should raise_error(TypeError, /can't convert Object into an exact number/)
+    }.should.raise(TypeError, /can't convert Object into an exact number/)
   end
 
   it "does not raise exception if timezone does not implement #utc_to_local method" do
@@ -223,7 +223,7 @@ def zone.local_to_utc(time)
       time
     end
 
-    Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
+    Time.new(2000, 1, 1, 12, 0, 0, zone).should.is_a?(Time)
   end
 
   # The result also should be a Time or Time-like object (not necessary to be the same class)
@@ -236,7 +236,7 @@ def zone.local_to_utc(t)
         time - 60 * 60 # - 1 hour
       end
 
-      Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
+      Time.new(2000, 1, 1, 12, 0, 0, zone).should.is_a?(Time)
       Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
     end
 
@@ -248,7 +248,7 @@ def zone.local_to_utc(t)
         Class.new(Time).utc(time.year, time.mon, time.day, time.hour, t.min, t.sec)
       end
 
-      Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
+      Time.new(2000, 1, 1, 12, 0, 0, zone).should.is_a?(Time)
       Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
     end
 
@@ -260,7 +260,7 @@ def zone.local_to_utc(time)
         obj
       end
 
-      Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
+      Time.new(2000, 1, 1, 12, 0, 0, zone).should.is_a?(Time)
       Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
     end
 
@@ -294,7 +294,7 @@ def zone.local_to_utc(t)
 
       -> {
         Time.new(2000, 1, 1, 12, 0, 0, zone)
-      }.should raise_error(ArgumentError, "utc_offset out of range")
+      }.should.raise(ArgumentError, "utc_offset out of range")
     end
   end
 
@@ -348,7 +348,7 @@ def zone.local_to_utc(t)
 
       -> {
         Marshal.dump(time)
-      }.should raise_error(NoMethodError, /undefined method [`']name' for/)
+      }.should.raise(NoMethodError, /undefined method [`']name' for/)
     end
   end
 
@@ -369,18 +369,18 @@ def zone.local_to_utc(t)
       time = TimeSpecs::TimeWithFindTimezone.new(2000, 1, 1, 12, 0, 0, zone)
       time_loaded = Marshal.load(Marshal.dump(time))
 
-      time_loaded.zone.should be_kind_of TimeSpecs::TimezoneWithName
+      time_loaded.zone.should.is_a? TimeSpecs::TimezoneWithName
       time_loaded.zone.name.should == "Asia/Colombo"
       time_loaded.utc_offset.should == 5*3600+30*60
     end
 
     it "calls .find_timezone to build a time object if passed zone name as a timezone argument" do
       time = TimeSpecs::TimeWithFindTimezone.new(2000, 1, 1, 12, 0, 0, "Asia/Colombo")
-      time.zone.should be_kind_of TimeSpecs::TimezoneWithName
+      time.zone.should.is_a? TimeSpecs::TimezoneWithName
       time.zone.name.should == "Asia/Colombo"
 
       time = TimeSpecs::TimeWithFindTimezone.new(2000, 1, 1, 12, 0, 0, "some invalid zone name")
-      time.zone.should be_kind_of TimeSpecs::TimezoneWithName
+      time.zone.should.is_a? TimeSpecs::TimezoneWithName
       time.zone.name.should == "some invalid zone name"
     end
 
@@ -388,7 +388,7 @@ def zone.local_to_utc(t)
       [Object.new, [], {}, :"some zone"].each do |zone|
         -> {
           TimeSpecs::TimeWithFindTimezone.new(2000, 1, 1, 12, 0, 0, zone)
-        }.should raise_error(TypeError, /can't convert \w+ into an exact number/)
+        }.should.raise(TypeError, /can't convert \w+ into an exact number/)
       end
     end
   end
@@ -456,14 +456,14 @@ def zone.local_to_utc(t)
     end
 
     it "raises ArgumentError if format is invalid" do
-      -> { Time.new(2000, 1, 1, 12, 0, 0, in: "+09:99") }.should raise_error(ArgumentError)
-      -> { Time.new(2000, 1, 1, 12, 0, 0, in: "ABC") }.should raise_error(ArgumentError)
+      -> { Time.new(2000, 1, 1, 12, 0, 0, in: "+09:99") }.should.raise(ArgumentError)
+      -> { Time.new(2000, 1, 1, 12, 0, 0, in: "ABC") }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if two offset arguments are given" do
       -> {
         Time.new(2000, 1, 1, 12, 0, 0, "+05:00", in: "+05:00")
-      }.should raise_error(ArgumentError, "timezone argument given as positional and keyword arguments")
+      }.should.raise(ArgumentError, "timezone argument given as positional and keyword arguments")
     end
   end
 
@@ -557,187 +557,183 @@ def obj.to_int; 3; end
     it "raise TypeError is can't convert precision keyword argument into Integer" do
       -> {
         Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: "")
-      }.should raise_error(TypeError, "no implicit conversion of String into Integer")
+      }.should.raise(TypeError, "no implicit conversion of String into Integer")
     end
 
     it "raises ArgumentError if part of time string is missing" do
       -> {
         Time.new("2020-12-25 00:56 +09:00")
-      }.should raise_error(ArgumentError, /missing sec part: 00:56 |can't parse:/)
+      }.should.raise(ArgumentError, /missing sec part: 00:56 |can't parse:/)
 
       -> {
         Time.new("2020-12-25 00 +09:00")
-      }.should raise_error(ArgumentError, /missing min part: 00 |can't parse:/)
+      }.should.raise(ArgumentError, /missing min part: 00 |can't parse:/)
     end
 
-    ruby_version_is "3.2.3" do
-      it "raises ArgumentError if the time part is missing" do
-        -> {
-          Time.new("2020-12-25")
-        }.should raise_error(ArgumentError, /no time information|can't parse:/)
-      end
+    it "raises ArgumentError if the time part is missing" do
+      -> {
+        Time.new("2020-12-25")
+      }.should.raise(ArgumentError, /no time information|can't parse:/)
+    end
 
-      it "raises ArgumentError if day is missing" do
-        -> {
-          Time.new("2020-12")
-        }.should raise_error(ArgumentError, /no time information|can't parse:/)
-      end
+    it "raises ArgumentError if day is missing" do
+      -> {
+        Time.new("2020-12")
+      }.should.raise(ArgumentError, /no time information|can't parse:/)
     end
 
     it "raises ArgumentError if subsecond is missing after dot" do
       -> {
         Time.new("2020-12-25 00:56:17. +0900")
-      }.should raise_error(ArgumentError, /subsecond expected after dot: 00:56:17. |can't parse:/)
+      }.should.raise(ArgumentError, /subsecond expected after dot: 00:56:17. |can't parse:/)
     end
 
     it "raises ArgumentError if String argument is not in the supported format" do
       -> {
         Time.new("021-12-25 00:00:00.123456 +09:00")
-      }.should raise_error(ArgumentError, /year must be 4 or more digits: 021|can't parse:/)
+      }.should.raise(ArgumentError, /year must be 4 or more digits: 021|can't parse:/)
 
       -> {
         Time.new("2020-012-25 00:56:17 +0900")
-      }.should raise_error(ArgumentError, /\Atwo digits mon is expected after [`']-': -012-25 00:\z|can't parse:/)
+      }.should.raise(ArgumentError, /\Atwo digits mon is expected after [`']-': -012-25 00:\z|can't parse:/)
 
       -> {
         Time.new("2020-2-25 00:56:17 +0900")
-      }.should raise_error(ArgumentError, /\Atwo digits mon is expected after [`']-': -2-25 00:56\z|can't parse:/)
+      }.should.raise(ArgumentError, /\Atwo digits mon is expected after [`']-': -2-25 00:56\z|can't parse:/)
 
       -> {
         Time.new("2020-12-215 00:56:17 +0900")
-      }.should raise_error(ArgumentError, /\Atwo digits mday is expected after [`']-': -215 00:56:\z|can't parse:/)
+      }.should.raise(ArgumentError, /\Atwo digits mday is expected after [`']-': -215 00:56:\z|can't parse:/)
 
       -> {
         Time.new("2020-12-25 000:56:17 +0900")
-      }.should raise_error(ArgumentError, /two digits hour is expected:  000:56:17 |can't parse:/)
+      }.should.raise(ArgumentError, /two digits hour is expected:  000:56:17 |can't parse:/)
 
       -> {
         Time.new("2020-12-25 0:56:17 +0900")
-      }.should raise_error(ArgumentError, /two digits hour is expected:  0:56:17 \+0|can't parse:/)
+      }.should.raise(ArgumentError, /two digits hour is expected:  0:56:17 \+0|can't parse:/)
 
       -> {
         Time.new("2020-12-25 00:516:17 +0900")
-      }.should raise_error(ArgumentError, /\Atwo digits min is expected after [`']:': :516:17 \+09\z|can't parse:/)
+      }.should.raise(ArgumentError, /\Atwo digits min is expected after [`']:': :516:17 \+09\z|can't parse:/)
 
       -> {
         Time.new("2020-12-25 00:6:17 +0900")
-      }.should raise_error(ArgumentError, /\Atwo digits min is expected after [`']:': :6:17 \+0900\z|can't parse:/)
+      }.should.raise(ArgumentError, /\Atwo digits min is expected after [`']:': :6:17 \+0900\z|can't parse:/)
 
       -> {
         Time.new("2020-12-25 00:56:137 +0900")
-      }.should raise_error(ArgumentError, /\Atwo digits sec is expected after [`']:': :137 \+0900\z|can't parse:/)
+      }.should.raise(ArgumentError, /\Atwo digits sec is expected after [`']:': :137 \+0900\z|can't parse:/)
 
       -> {
         Time.new("2020-12-25 00:56:7 +0900")
-      }.should raise_error(ArgumentError, /\Atwo digits sec is expected after [`']:': :7 \+0900\z|can't parse:/)
+      }.should.raise(ArgumentError, /\Atwo digits sec is expected after [`']:': :7 \+0900\z|can't parse:/)
 
       -> {
         Time.new("2020-12-25 00:56. +0900")
-      }.should raise_error(ArgumentError, /fraction min is not supported: 00:56\.|can't parse:/)
+      }.should.raise(ArgumentError, /fraction min is not supported: 00:56\.|can't parse:/)
 
       -> {
         Time.new("2020-12-25 00. +0900")
-      }.should raise_error(ArgumentError, /fraction hour is not supported: 00\.|can't parse:/)
+      }.should.raise(ArgumentError, /fraction hour is not supported: 00\.|can't parse:/)
     end
 
     it "raises ArgumentError if date/time parts values are not valid" do
       -> {
         Time.new("2020-13-25 00:56:17 +09:00")
-      }.should raise_error(ArgumentError, /(mon|argument) out of range/)
+      }.should.raise(ArgumentError, /(mon|argument) out of range/)
 
       -> {
         Time.new("2020-12-32 00:56:17 +09:00")
-      }.should raise_error(ArgumentError, /(mday|argument) out of range/)
+      }.should.raise(ArgumentError, /(mday|argument) out of range/)
 
       -> {
         Time.new("2020-12-25 25:56:17 +09:00")
-      }.should raise_error(ArgumentError, /(hour|argument) out of range/)
+      }.should.raise(ArgumentError, /(hour|argument) out of range/)
 
       -> {
         Time.new("2020-12-25 00:61:17 +09:00")
-      }.should raise_error(ArgumentError, /(min|argument) out of range/)
+      }.should.raise(ArgumentError, /(min|argument) out of range/)
 
       -> {
         Time.new("2020-12-25 00:56:61 +09:00")
-      }.should raise_error(ArgumentError, /(sec|argument) out of range/)
+      }.should.raise(ArgumentError, /(sec|argument) out of range/)
 
       -> {
         Time.new("2020-12-25 00:56:17 +23:59:60")
-      }.should raise_error(ArgumentError, /utc_offset|argument out of range/)
+      }.should.raise(ArgumentError, /utc_offset|argument out of range/)
 
       -> {
         Time.new("2020-12-25 00:56:17 +24:00")
-      }.should raise_error(ArgumentError, /(utc_offset|argument) out of range/)
+      }.should.raise(ArgumentError, /(utc_offset|argument) out of range/)
 
       -> {
         Time.new("2020-12-25 00:56:17 +23:61")
-      }.should raise_error(ArgumentError, /utc_offset/)
+      }.should.raise(ArgumentError, /utc_offset/)
 
       ruby_bug '#20797', ''...'3.4' do
         -> {
           Time.new("2020-12-25 00:56:17 +00:23:61")
-        }.should raise_error(ArgumentError, /utc_offset/)
+        }.should.raise(ArgumentError, /utc_offset/)
       end
     end
 
     it "raises ArgumentError if utc offset parts are not valid" do
-      -> { Time.new("2020-12-25 00:56:17 +24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-      -> { Time.new("2020-12-25 00:56:17 +2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.new("2020-12-25 00:56:17 +24:00") }.should.raise(ArgumentError, "utc_offset out of range")
+      -> { Time.new("2020-12-25 00:56:17 +2400") }.should.raise(ArgumentError, "utc_offset out of range")
 
-      -> { Time.new("2020-12-25 00:56:17 +99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-      -> { Time.new("2020-12-25 00:56:17 +9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.new("2020-12-25 00:56:17 +99:00") }.should.raise(ArgumentError, "utc_offset out of range")
+      -> { Time.new("2020-12-25 00:56:17 +9900") }.should.raise(ArgumentError, "utc_offset out of range")
 
-      -> { Time.new("2020-12-25 00:56:17 +00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
-      -> { Time.new("2020-12-25 00:56:17 +0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+      -> { Time.new("2020-12-25 00:56:17 +00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+      -> { Time.new("2020-12-25 00:56:17 +0060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
 
-      -> { Time.new("2020-12-25 00:56:17 +00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
-      -> { Time.new("2020-12-25 00:56:17 +0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+      -> { Time.new("2020-12-25 00:56:17 +00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+      -> { Time.new("2020-12-25 00:56:17 +0099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
 
       ruby_bug '#20797', ''...'3.4' do
-        -> { Time.new("2020-12-25 00:56:17 +00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
-        -> { Time.new("2020-12-25 00:56:17 +000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+        -> { Time.new("2020-12-25 00:56:17 +00:00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+        -> { Time.new("2020-12-25 00:56:17 +000060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
 
-        -> { Time.new("2020-12-25 00:56:17 +00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
-        -> { Time.new("2020-12-25 00:56:17 +000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+        -> { Time.new("2020-12-25 00:56:17 +00:00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+        -> { Time.new("2020-12-25 00:56:17 +000099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
       end
     end
 
     it "raises ArgumentError if string has not ascii-compatible encoding" do
       -> {
         Time.new("2021-11-31 00:00:60 +09:00".encode("utf-32le"))
-      }.should raise_error(ArgumentError, "time string should have ASCII compatible encoding")
+      }.should.raise(ArgumentError, "time string should have ASCII compatible encoding")
     end
 
     it "raises ArgumentError if string doesn't start with year" do
       -> {
         Time.new("a\nb")
-      }.should raise_error(ArgumentError, "can't parse: \"a\\nb\"")
+      }.should.raise(ArgumentError, "can't parse: \"a\\nb\"")
     end
 
     it "raises ArgumentError if string has extra characters after offset" do
       -> {
         Time.new("2021-11-31 00:00:59 +09:00 abc")
-      }.should raise_error(ArgumentError, /can't parse.+ abc/)
+      }.should.raise(ArgumentError, /can't parse.+ abc/)
     end
 
-    ruby_version_is "3.2.3" do
-      it "raises ArgumentError when there are leading space characters" do
-        -> { Time.new(" 2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("\t2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("\n2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("\v2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("\f2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("\r2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
-      end
+    it "raises ArgumentError when there are leading space characters" do
+      -> { Time.new(" 2020-12-02 00:00:00") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("\t2020-12-02 00:00:00") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("\n2020-12-02 00:00:00") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("\v2020-12-02 00:00:00") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("\f2020-12-02 00:00:00") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("\r2020-12-02 00:00:00") }.should.raise(ArgumentError, /can't parse/)
+    end
 
-      it "raises ArgumentError when there are trailing whitespaces" do
-        -> { Time.new("2020-12-02 00:00:00 ") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("2020-12-02 00:00:00\t") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("2020-12-02 00:00:00\n") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("2020-12-02 00:00:00\v") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("2020-12-02 00:00:00\f") }.should raise_error(ArgumentError, /can't parse/)
-        -> { Time.new("2020-12-02 00:00:00\r") }.should raise_error(ArgumentError, /can't parse/)
-      end
+    it "raises ArgumentError when there are trailing whitespaces" do
+      -> { Time.new("2020-12-02 00:00:00 ") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("2020-12-02 00:00:00\t") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("2020-12-02 00:00:00\n") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("2020-12-02 00:00:00\v") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("2020-12-02 00:00:00\f") }.should.raise(ArgumentError, /can't parse/)
+      -> { Time.new("2020-12-02 00:00:00\r") }.should.raise(ArgumentError, /can't parse/)
     end
   end
 end
diff --git a/spec/ruby/core/time/now_spec.rb b/spec/ruby/core/time/now_spec.rb
index e3fe6edad66..533cf683804 100644
--- a/spec/ruby/core/time/now_spec.rb
+++ b/spec/ruby/core/time/now_spec.rb
@@ -53,33 +53,33 @@
     end
 
     it "raises ArgumentError if format is invalid" do
-      -> { Time.now(in: "+09:99") }.should raise_error(ArgumentError)
-      -> { Time.now(in: "ABC") }.should raise_error(ArgumentError)
+      -> { Time.now(in: "+09:99") }.should.raise(ArgumentError)
+      -> { Time.now(in: "ABC") }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if String argument and hours greater than 23" do
-      -> { Time.now(in: "+24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-      -> { Time.now(in: "+2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.now(in: "+24:00") }.should.raise(ArgumentError, "utc_offset out of range")
+      -> { Time.now(in: "+2400") }.should.raise(ArgumentError, "utc_offset out of range")
 
-      -> { Time.now(in: "+99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
-      -> { Time.now(in: "+9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.now(in: "+99:00") }.should.raise(ArgumentError, "utc_offset out of range")
+      -> { Time.now(in: "+9900") }.should.raise(ArgumentError, "utc_offset out of range")
     end
 
     it "raises ArgumentError if String argument and minutes greater than 59" do
-      -> { Time.now(in: "+00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
-      -> { Time.now(in: "+0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+      -> { Time.now(in: "+00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+      -> { Time.now(in: "+0060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
 
-      -> { Time.now(in: "+00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
-      -> { Time.now(in: "+0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+      -> { Time.now(in: "+00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+      -> { Time.now(in: "+0099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
     end
 
     ruby_bug '#20797', ''...'3.4' do
       it "raises ArgumentError if String argument and seconds greater than 59" do
-        -> { Time.now(in: "+00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
-        -> { Time.now(in: "+000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+        -> { Time.now(in: "+00:00:60") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+        -> { Time.now(in: "+000060") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
 
-        -> { Time.now(in: "+00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
-        -> { Time.now(in: "+000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+        -> { Time.now(in: "+00:00:99") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+        -> { Time.now(in: "+000099") }.should.raise(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
       end
     end
   end
@@ -93,7 +93,7 @@ def zone.local_to_utc(time)
 
       -> {
         Time.now(in: zone)
-      }.should raise_error(TypeError, /can't convert Object into an exact number/)
+      }.should.raise(TypeError, /can't convert Object into an exact number/)
     end
 
     it "does not raise exception if timezone does not implement #local_to_utc method" do
@@ -102,7 +102,7 @@ def zone.utc_to_local(time)
         time
       end
 
-      Time.now(in: zone).should be_kind_of(Time)
+      Time.now(in: zone).should.is_a?(Time)
     end
 
     # The result also should be a Time or Time-like object (not necessary to be the same class)
@@ -115,7 +115,7 @@ def zone.utc_to_local(t)
           time + 60 * 60 # + 1 hour
         end
 
-        Time.now(in: zone).should be_kind_of(Time)
+        Time.now(in: zone).should.is_a?(Time)
         Time.now(in: zone).utc_offset.should == 3600
       end
 
@@ -128,7 +128,7 @@ def zone.utc_to_local(t)
           Class.new(Time).new(time.year, time.mon, time.day, time.hour, time.min, time.sec, time.utc_offset)
         end
 
-        Time.now(in: zone).should be_kind_of(Time)
+        Time.now(in: zone).should.is_a?(Time)
         Time.now(in: zone).utc_offset.should == 3600
       end
 
@@ -138,7 +138,7 @@ def zone.utc_to_local(time)
           time.to_i + 60*60
         end
 
-        Time.now(in: zone).should be_kind_of(Time)
+        Time.now(in: zone).should.is_a?(Time)
         Time.now(in: zone).utc_offset.should == 60*60
       end
 
@@ -174,7 +174,7 @@ def zone.utc_to_local(t)
 
         -> {
           Time.now(in: zone)
-        }.should raise_error(ArgumentError, "utc_offset out of range")
+        }.should.raise(ArgumentError, "utc_offset out of range")
       end
     end
   end
diff --git a/spec/ruby/core/time/plus_spec.rb b/spec/ruby/core/time/plus_spec.rb
index 642393b615c..6bd01bcdf34 100644
--- a/spec/ruby/core/time/plus_spec.rb
+++ b/spec/ruby/core/time/plus_spec.rb
@@ -17,9 +17,9 @@
   end
 
   it "raises a TypeError if given argument is a coercible String" do
-    -> { Time.now + "1" }.should raise_error(TypeError)
-    -> { Time.now + "0.1" }.should raise_error(TypeError)
-    -> { Time.now + "1/3" }.should raise_error(TypeError)
+    -> { Time.now + "1" }.should.raise(TypeError)
+    -> { Time.now + "0.1" }.should.raise(TypeError)
+    -> { Time.now + "1/3" }.should.raise(TypeError)
   end
 
   it "increments the time by the specified amount as rational numbers" do
@@ -32,8 +32,8 @@
   end
 
   it "raises TypeError on argument that can't be coerced into Rational" do
-    -> { Time.now + Object.new }.should raise_error(TypeError)
-    -> { Time.now + "stuff" }.should raise_error(TypeError)
+    -> { Time.now + Object.new }.should.raise(TypeError)
+    -> { Time.now + "stuff" }.should.raise(TypeError)
   end
 
   it "returns a UTC time if self is UTC" do
@@ -68,15 +68,15 @@
   it "does not return a subclass instance" do
     c = Class.new(Time)
     x = c.now + 1
-    x.should be_an_instance_of(Time)
+    x.should.instance_of?(Time)
   end
 
   it "raises TypeError on Time argument" do
-    -> { Time.now + Time.now }.should raise_error(TypeError)
+    -> { Time.now + Time.now }.should.raise(TypeError)
   end
 
   it "raises TypeError on nil argument" do
-    -> { Time.now + nil }.should raise_error(TypeError)
+    -> { Time.now + nil }.should.raise(TypeError)
   end
 
   #see [ruby-dev:38446]
diff --git a/spec/ruby/core/time/round_spec.rb b/spec/ruby/core/time/round_spec.rb
index 0cbed04adeb..a739cabfdf8 100644
--- a/spec/ruby/core/time/round_spec.rb
+++ b/spec/ruby/core/time/round_spec.rb
@@ -20,8 +20,8 @@
   it "returns an instance of Time, even if #round is called on a subclass" do
     subclass = Class.new(Time)
     instance = subclass.at(0)
-    instance.class.should equal subclass
-    instance.round.should be_an_instance_of(Time)
+    instance.class.should.equal? subclass
+    instance.round.should.instance_of?(Time)
   end
 
   it "copies own timezone to the returning value" do
diff --git a/spec/ruby/core/time/shared/gmtime.rb b/spec/ruby/core/time/shared/gmtime.rb
index 7b4f65f0b79..aa76b436ccc 100644
--- a/spec/ruby/core/time/shared/gmtime.rb
+++ b/spec/ruby/core/time/shared/gmtime.rb
@@ -18,7 +18,7 @@
   it "returns self" do
     with_timezone("CST", -6) do
       t = Time.local(2007, 1, 9, 12, 0, 0)
-      t.send(@method).should equal(t)
+      t.send(@method).should.equal?(t)
     end
   end
 
@@ -26,14 +26,14 @@
     it "does not raise an error if already in UTC" do
       time = Time.gm(2007, 1, 9, 12, 0, 0)
       time.freeze
-      time.send(@method).should equal(time)
+      time.send(@method).should.equal?(time)
     end
 
     it "raises a FrozenError if the time is not UTC" do
       with_timezone("CST", -6) do
         time = Time.now
         time.freeze
-        -> { time.send(@method) }.should raise_error(FrozenError)
+        -> { time.send(@method) }.should.raise(FrozenError)
       end
     end
   end
diff --git a/spec/ruby/core/time/shared/inspect.rb b/spec/ruby/core/time/shared/inspect.rb
index 41336719247..82f7f3c686f 100644
--- a/spec/ruby/core/time/shared/inspect.rb
+++ b/spec/ruby/core/time/shared/inspect.rb
@@ -16,6 +16,6 @@
   end
 
   it "returns a US-ASCII encoded string" do
-    Time.now.send(@method).encoding.should equal(Encoding::US_ASCII)
+    Time.now.send(@method).encoding.should.equal?(Encoding::US_ASCII)
   end
 end
diff --git a/spec/ruby/core/time/shared/now.rb b/spec/ruby/core/time/shared/now.rb
index f4018d72f44..839cfdcd2ab 100644
--- a/spec/ruby/core/time/shared/now.rb
+++ b/spec/ruby/core/time/shared/now.rb
@@ -2,8 +2,8 @@
 
 describe :time_now, shared: true do
   it "creates a subclass instance if called on a subclass" do
-    TimeSpecs::SubTime.send(@method).should be_an_instance_of(TimeSpecs::SubTime)
-    TimeSpecs::MethodHolder.send(@method).should be_an_instance_of(Time)
+    TimeSpecs::SubTime.send(@method).should.instance_of?(TimeSpecs::SubTime)
+    TimeSpecs::MethodHolder.send(@method).should.instance_of?(Time)
   end
 
   it "sets the current time" do
diff --git a/spec/ruby/core/time/shared/time_params.rb b/spec/ruby/core/time/shared/time_params.rb
index 9832fd17fe1..f0de986b8ec 100644
--- a/spec/ruby/core/time/shared/time_params.rb
+++ b/spec/ruby/core/time/shared/time_params.rb
@@ -30,7 +30,7 @@
   end
 
   it "raises a TypeError if the year is nil" do
-    -> { Time.send(@method, nil) }.should raise_error(TypeError)
+    -> { Time.send(@method, nil) }.should.raise(TypeError)
   end
 
   it "accepts nil month, day, hour, minute, and second" do
@@ -148,52 +148,52 @@
     # For some reason MRI uses a different message for month in 13-15 and month>=16
     -> {
       Time.send(@method, 2008, 16, 31, 23, 59, 59)
-    }.should raise_error(ArgumentError, /(mon|argument) out of range/)
+    }.should.raise(ArgumentError, /(mon|argument) out of range/)
   end
 
   it "raises an ArgumentError for out of range day" do
     -> {
       Time.send(@method, 2008, 12, 32, 23, 59, 59)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for out of range hour" do
     -> {
       Time.send(@method, 2008, 12, 31, 25, 59, 59)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for out of range minute" do
     -> {
       Time.send(@method, 2008, 12, 31, 23, 61, 59)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError for out of range second" do
     # For some reason MRI uses different messages for seconds 61-63 and seconds >= 64
     -> {
       Time.send(@method, 2008, 12, 31, 23, 59, 61)
-    }.should raise_error(ArgumentError, /(sec|argument) out of range/)
+    }.should.raise(ArgumentError, /(sec|argument) out of range/)
     -> {
       Time.send(@method, 2008, 12, 31, 23, 59, -1)
-    }.should raise_error(ArgumentError, "argument out of range")
+    }.should.raise(ArgumentError, "argument out of range")
   end
 
   it "raises ArgumentError when given 8 arguments" do
-    -> { Time.send(@method, *[0]*8) }.should raise_error(ArgumentError)
+    -> { Time.send(@method, *[0]*8) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when given 9 arguments" do
-    -> { Time.send(@method, *[0]*9) }.should raise_error(ArgumentError)
+    -> { Time.send(@method, *[0]*9) }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when given 11 arguments" do
-    -> { Time.send(@method, *[0]*11) }.should raise_error(ArgumentError)
+    -> { Time.send(@method, *[0]*11) }.should.raise(ArgumentError)
   end
 
   it "returns subclass instances" do
     c = Class.new(Time)
-    c.send(@method, 2008, "12").should be_an_instance_of(c)
+    c.send(@method, 2008, "12").should.instance_of?(c)
   end
 end
 
@@ -213,23 +213,23 @@
   it "raises an ArgumentError for out of range values" do
     -> {
       Time.send(@method, 61, 59, 23, 31, 12, 2008, :ignored, :ignored, :ignored, :ignored)
-    }.should raise_error(ArgumentError) # sec
+    }.should.raise(ArgumentError) # sec
 
     -> {
       Time.send(@method, 59, 61, 23, 31, 12, 2008, :ignored, :ignored, :ignored, :ignored)
-    }.should raise_error(ArgumentError) # min
+    }.should.raise(ArgumentError) # min
 
     -> {
       Time.send(@method, 59, 59, 25, 31, 12, 2008, :ignored, :ignored, :ignored, :ignored)
-    }.should raise_error(ArgumentError) # hour
+    }.should.raise(ArgumentError) # hour
 
     -> {
       Time.send(@method, 59, 59, 23, 32, 12, 2008, :ignored, :ignored, :ignored, :ignored)
-    }.should raise_error(ArgumentError) # day
+    }.should.raise(ArgumentError) # day
 
     -> {
       Time.send(@method, 59, 59, 23, 31, 13, 2008, :ignored, :ignored, :ignored, :ignored)
-    }.should raise_error(ArgumentError) # month
+    }.should.raise(ArgumentError) # month
   end
 end
 
@@ -240,7 +240,7 @@
   end
 
   it "raises an ArgumentError for out of range microsecond" do
-    -> { Time.send(@method, 2000, 1, 1, 20, 15, 1, 1000000) }.should raise_error(ArgumentError)
+    -> { Time.send(@method, 2000, 1, 1, 20, 15, 1, 1000000) }.should.raise(ArgumentError)
   end
 
   it "handles fractional microseconds as a Float" do
diff --git a/spec/ruby/core/time/strftime_spec.rb b/spec/ruby/core/time/strftime_spec.rb
index fd233f3577b..1528a668a1c 100644
--- a/spec/ruby/core/time/strftime_spec.rb
+++ b/spec/ruby/core/time/strftime_spec.rb
@@ -25,7 +25,7 @@
 
   # Differences with date
   it "requires an argument" do
-    -> { @time.strftime }.should raise_error(ArgumentError)
+    -> { @time.strftime }.should.raise(ArgumentError)
   end
 
   # %Z is zone name or empty for Time
diff --git a/spec/ruby/core/time/subsec_spec.rb b/spec/ruby/core/time/subsec_spec.rb
index 0f2c4eb856a..3ed1bf5dd18 100644
--- a/spec/ruby/core/time/subsec_spec.rb
+++ b/spec/ruby/core/time/subsec_spec.rb
@@ -2,26 +2,26 @@
 
 describe "Time#subsec" do
   it "returns 0 as an Integer for a Time with a whole number of seconds" do
-    Time.at(100).subsec.should eql(0)
+    Time.at(100).subsec.should.eql?(0)
   end
 
   it "returns the fractional seconds as a Rational for a Time constructed with a Rational number of seconds" do
-    Time.at(Rational(3, 2)).subsec.should eql(Rational(1, 2))
+    Time.at(Rational(3, 2)).subsec.should.eql?(Rational(1, 2))
   end
 
   it "returns the fractional seconds as a Rational for a Time constructed with a Float number of seconds" do
-    Time.at(10.75).subsec.should eql(Rational(3, 4))
+    Time.at(10.75).subsec.should.eql?(Rational(3, 4))
   end
 
   it "returns the fractional seconds as a Rational for a Time constructed with an Integer number of microseconds" do
-    Time.at(0, 999999).subsec.should eql(Rational(999999, 1000000))
+    Time.at(0, 999999).subsec.should.eql?(Rational(999999, 1000000))
   end
 
   it "returns the fractional seconds as a Rational for a Time constructed with an Rational number of microseconds" do
-    Time.at(0, Rational(9, 10)).subsec.should eql(Rational(9, 10000000))
+    Time.at(0, Rational(9, 10)).subsec.should.eql?(Rational(9, 10000000))
   end
 
   it "returns the fractional seconds as a Rational for a Time constructed with an Float number of microseconds" do
-    Time.at(0, 0.75).subsec.should eql(Rational(3, 4000000))
+    Time.at(0, 0.75).subsec.should.eql?(Rational(3, 4000000))
   end
 end
diff --git a/spec/ruby/core/time/to_r_spec.rb b/spec/ruby/core/time/to_r_spec.rb
index 6af2d9b7ea2..e30f5d8f94e 100644
--- a/spec/ruby/core/time/to_r_spec.rb
+++ b/spec/ruby/core/time/to_r_spec.rb
@@ -2,10 +2,10 @@
 
 describe "Time#to_r" do
   it "returns the a Rational representing seconds and subseconds since the epoch" do
-    Time.at(Rational(11, 10)).to_r.should eql(Rational(11, 10))
+    Time.at(Rational(11, 10)).to_r.should.eql?(Rational(11, 10))
   end
 
   it "returns a Rational even for a whole number of seconds" do
-    Time.at(2).to_r.should eql(Rational(2))
+    Time.at(2).to_r.should.eql?(Rational(2))
   end
 end
diff --git a/spec/ruby/core/time/zone_spec.rb b/spec/ruby/core/time/zone_spec.rb
index 9a15bd569b4..2cb3c5e7bb7 100644
--- a/spec/ruby/core/time/zone_spec.rb
+++ b/spec/ruby/core/time/zone_spec.rb
@@ -6,7 +6,7 @@
       with_timezone("America/New_York") do
         Time.new(2001, 1, 1, 0, 0, 0).zone.should == "EST"
         Time.new(2001, 7, 1, 0, 0, 0).zone.should == "EDT"
-        %w[EST EDT].should include Time.now.zone
+        %w[EST EDT].should.include? Time.now.zone
       end
     end
   end
@@ -29,7 +29,7 @@
     t = Time.new(2005, 2, 27, 22, 50, 0, -3600)
 
     with_timezone("America/New_York") do
-      t.getlocal("+05:00").zone.should be_nil
+      t.getlocal("+05:00").zone.should == nil
     end
   end
 
diff --git a/spec/ruby/core/tracepoint/allow_reentry_spec.rb b/spec/ruby/core/tracepoint/allow_reentry_spec.rb
index 75e9e859a91..475cca29a98 100644
--- a/spec/ruby/core/tracepoint/allow_reentry_spec.rb
+++ b/spec/ruby/core/tracepoint/allow_reentry_spec.rb
@@ -25,6 +25,6 @@
   it 'raises RuntimeError when not called inside a TracePoint' do
     -> {
       TracePoint.allow_reentry{}
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
   end
 end
diff --git a/spec/ruby/core/tracepoint/binding_spec.rb b/spec/ruby/core/tracepoint/binding_spec.rb
index 6a7ef5f85a6..6de6e47d7d9 100644
--- a/spec/ruby/core/tracepoint/binding_spec.rb
+++ b/spec/ruby/core/tracepoint/binding_spec.rb
@@ -15,7 +15,7 @@ def test
       test
     }
     bindings.size.should == 1
-    bindings[0].should be_kind_of(Binding)
+    bindings[0].should.is_a?(Binding)
     bindings[0].local_variables.should == [:secret]
   end
 end
diff --git a/spec/ruby/core/tracepoint/defined_class_spec.rb b/spec/ruby/core/tracepoint/defined_class_spec.rb
index 4593db6d1f4..53c86a82106 100644
--- a/spec/ruby/core/tracepoint/defined_class_spec.rb
+++ b/spec/ruby/core/tracepoint/defined_class_spec.rb
@@ -9,19 +9,19 @@
       last_class_name = tp.defined_class
     end.enable do
       TracePointSpec::B.new.foo
-      last_class_name.should equal(TracePointSpec::B)
+      last_class_name.should.equal?(TracePointSpec::B)
 
       TracePointSpec::B.new.bar
-      last_class_name.should equal(TracePointSpec::A)
+      last_class_name.should.equal?(TracePointSpec::A)
 
       c = TracePointSpec::C.new
-      last_class_name.should equal(TracePointSpec::C)
+      last_class_name.should.equal?(TracePointSpec::C)
 
       c.foo
-      last_class_name.should equal(TracePointSpec::B)
+      last_class_name.should.equal?(TracePointSpec::B)
 
       c.bar
-      last_class_name.should equal(TracePointSpec::A)
+      last_class_name.should.equal?(TracePointSpec::A)
     end
   end
 end
diff --git a/spec/ruby/core/tracepoint/enable_spec.rb b/spec/ruby/core/tracepoint/enable_spec.rb
index 93a6b281e35..bf61c35154a 100644
--- a/spec/ruby/core/tracepoint/enable_spec.rb
+++ b/spec/ruby/core/tracepoint/enable_spec.rb
@@ -54,7 +54,7 @@
       TracePoint.new(:line) do |tp|
         next unless TracePointSpec.target_thread?
         event_name = tp.event
-      end.enable { event_name.should equal(:line) }
+      end.enable { event_name.should.equal?(:line) }
     end
 
     it 'enables the trace object only for the current thread' do
@@ -85,7 +85,7 @@
         event_name = tp.event
       end
       trace.enable do |*args|
-        event_name.should equal(:line)
+        event_name.should.equal?(:line)
         args.should == []
       end
       trace.should_not.enabled?
@@ -301,7 +301,7 @@ def foo; end
         end
 
         ScratchPad.recorded.should == [lineno]
-        lineno.should be_kind_of(Integer)
+        lineno.should.is_a?(Integer)
       end
     end
 
@@ -317,7 +317,7 @@ def foo; end
         trace.enable(target: block) do
           block.call # triggers :b_call and :b_return events
         end
-      }.should raise_error(ArgumentError, /can not enable any hooks/)
+      }.should.raise(ArgumentError, /can not enable any hooks/)
     end
 
     it "raises ArgumentError if passed not Method/UnboundMethod/Proc" do
@@ -326,7 +326,7 @@ def foo; end
       -> {
         trace.enable(target: Object.new) do
         end
-      }.should raise_error(ArgumentError, /specified target is not supported/)
+      }.should.raise(ArgumentError, /specified target is not supported/)
     end
 
     context "nested enabling and disabling" do
@@ -338,7 +338,7 @@ def foo; end
             trace.enable(target: -> {}) do
             end
           end
-        }.should raise_error(ArgumentError, /can't nest-enable a targett?ing TracePoint/)
+        }.should.raise(ArgumentError, /can't nest-enable a targett?ing TracePoint/)
       end
 
       it "raises ArgumentError if trace point already enabled without target is re-enabled with target" do
@@ -349,7 +349,7 @@ def foo; end
             trace.enable(target: -> {}) do
             end
           end
-        }.should raise_error(ArgumentError, /can't nest-enable a targett?ing TracePoint/)
+        }.should.raise(ArgumentError, /can't nest-enable a targett?ing TracePoint/)
       end
 
       it "raises ArgumentError if trace point already enabled with target is re-enabled without target" do
@@ -360,7 +360,7 @@ def foo; end
             trace.enable do
             end
           end
-        }.should raise_error(ArgumentError, /can't nest-enable a targett?ing TracePoint/)
+        }.should.raise(ArgumentError, /can't nest-enable a targett?ing TracePoint/)
       end
 
       it "raises ArgumentError if trace point already enabled with target is disabled with block" do
@@ -371,7 +371,7 @@ def foo; end
             trace.disable do
             end
           end
-        }.should raise_error(ArgumentError, /can't disable a targett?ing TracePoint in a block/)
+        }.should.raise(ArgumentError, /can't disable a targett?ing TracePoint in a block/)
       end
 
       it "traces events when trace point with target is enabled in another trace point enabled without target" do
@@ -474,7 +474,7 @@ def foo; end
       -> {
         trace.enable(target_line: 67) do
         end
-      }.should raise_error(ArgumentError, /only target_line is specified/)
+      }.should.raise(ArgumentError, /only target_line is specified/)
     end
 
     it "raises ArgumentError if :line event isn't registered" do
@@ -491,7 +491,7 @@ def foo; end
       -> {
         trace.enable(target_line: target_line, target: target) do
         end
-      }.should raise_error(ArgumentError, /target_line is specified, but line event is not specified/)
+      }.should.raise(ArgumentError, /target_line is specified, but line event is not specified/)
     end
 
     it "raises ArgumentError if :target_line value is out of target code lines range" do
@@ -500,7 +500,7 @@ def foo; end
       -> {
         trace.enable(target_line: 1, target: -> { }) do
         end
-      }.should raise_error(ArgumentError, /can not enable any hooks/)
+      }.should.raise(ArgumentError, /can not enable any hooks/)
     end
 
     it "raises TypeError if :target_line value couldn't be coerced to Integer" do
@@ -509,7 +509,7 @@ def foo; end
       -> {
         trace.enable(target_line: Object.new, target: -> { }) do
         end
-      }.should raise_error(TypeError, /no implicit conversion of \w+? into Integer/)
+      }.should.raise(TypeError, /no implicit conversion of \w+? into Integer/)
     end
 
     it "raises ArgumentError if :target_line value is negative" do
@@ -518,7 +518,7 @@ def foo; end
       -> {
         trace.enable(target_line: -2, target: -> { }) do
         end
-      }.should raise_error(ArgumentError, /can not enable any hooks/)
+      }.should.raise(ArgumentError, /can not enable any hooks/)
     end
 
     it "accepts value that could be coerced to Integer" do
diff --git a/spec/ruby/core/tracepoint/event_spec.rb b/spec/ruby/core/tracepoint/event_spec.rb
index 9dea24d1258..58017dc98de 100644
--- a/spec/ruby/core/tracepoint/event_spec.rb
+++ b/spec/ruby/core/tracepoint/event_spec.rb
@@ -9,13 +9,13 @@
       event_name = tp.event
     end.enable do
       TracePointSpec.test
-      event_name.should equal(:call)
+      event_name.should.equal?(:call)
 
       TracePointSpec::B.new.foo
-      event_name.should equal(:call)
+      event_name.should.equal?(:call)
 
       class TracePointSpec::B; end
-      event_name.should equal(:end)
+      event_name.should.equal?(:end)
     end
 
   end
diff --git a/spec/ruby/core/tracepoint/lineno_spec.rb b/spec/ruby/core/tracepoint/lineno_spec.rb
index 77b3ac8b549..7c46d5222bc 100644
--- a/spec/ruby/core/tracepoint/lineno_spec.rb
+++ b/spec/ruby/core/tracepoint/lineno_spec.rb
@@ -15,6 +15,6 @@
 
   it 'raises RuntimeError if accessed from outside' do
     tp = TracePoint.new(:line) {}
-    -> { tp.lineno }.should raise_error(RuntimeError, 'access from outside')
+    -> { tp.lineno }.should.raise(RuntimeError, 'access from outside')
   end
 end
diff --git a/spec/ruby/core/tracepoint/method_id_spec.rb b/spec/ruby/core/tracepoint/method_id_spec.rb
index 43e23248b7e..67740f2d7d3 100644
--- a/spec/ruby/core/tracepoint/method_id_spec.rb
+++ b/spec/ruby/core/tracepoint/method_id_spec.rb
@@ -9,7 +9,7 @@
       method_name = tp.method_id
     }.enable do
       TracePointSpec.test
-      method_name.should equal(:test)
+      method_name.should.equal?(:test)
     end
   end
 end
diff --git a/spec/ruby/core/tracepoint/new_spec.rb b/spec/ruby/core/tracepoint/new_spec.rb
index e53c2b04a24..763b35292b9 100644
--- a/spec/ruby/core/tracepoint/new_spec.rb
+++ b/spec/ruby/core/tracepoint/new_spec.rb
@@ -3,7 +3,7 @@
 
 describe 'TracePoint.new' do
   it 'returns a new TracePoint object, not enabled by default' do
-    TracePoint.new(:line) {}.enabled?.should be_false
+    TracePoint.new(:line) {}.enabled?.should == false
   end
 
   it 'includes :line event when event is not specified' do
@@ -12,15 +12,15 @@
       next unless TracePointSpec.target_thread?
       event_name = tp.event
     }.enable do
-      event_name.should equal(:line)
+      event_name.should.equal?(:line)
 
       event_name = nil
       TracePointSpec.test
-      event_name.should equal(:line)
+      event_name.should.equal?(:line)
 
       event_name = nil
       TracePointSpec::B.new.foo
-      event_name.should equal(:line)
+      event_name.should.equal?(:line)
     end
   end
 
@@ -44,29 +44,29 @@
       event_name = tp.event
     end.enable do
       TracePointSpec.test
-      event_name.should equal(:call)
+      event_name.should.equal?(:call)
 
       TracePointSpec::B.new.foo
-      event_name.should equal(:call)
+      event_name.should.equal?(:call)
 
       class TracePointSpec::B; end
-      event_name.should equal(:end)
+      event_name.should.equal?(:end)
     end
   end
 
   it 'raises a TypeError when the given object is not a string/symbol' do
     o = mock('123')
-    -> { TracePoint.new(o) {} }.should raise_error(TypeError)
+    -> { TracePoint.new(o) {} }.should.raise(TypeError)
 
     o.should_receive(:to_sym).and_return(123)
-    -> { TracePoint.new(o) {} }.should raise_error(TypeError)
+    -> { TracePoint.new(o) {} }.should.raise(TypeError)
   end
 
   it 'expects to be called with a block' do
-    -> { TracePoint.new(:line) }.should raise_error(ArgumentError, "must be called with a block")
+    -> { TracePoint.new(:line) }.should.raise(ArgumentError, "must be called with a block")
   end
 
   it "raises a Argument error when the given argument doesn't match an event name" do
-    -> { TracePoint.new(:test) }.should raise_error(ArgumentError, "unknown event: test")
+    -> { TracePoint.new(:test) }.should.raise(ArgumentError, "unknown event: test")
   end
 end
diff --git a/spec/ruby/core/tracepoint/raised_exception_spec.rb b/spec/ruby/core/tracepoint/raised_exception_spec.rb
index e74afa9abc9..b1199902f27 100644
--- a/spec/ruby/core/tracepoint/raised_exception_spec.rb
+++ b/spec/ruby/core/tracepoint/raised_exception_spec.rb
@@ -14,7 +14,7 @@
       rescue => e
         error_result = e
       end
-      raised_exception.should equal(error_result)
+      raised_exception.should.equal?(error_result)
     end
   end
 
@@ -30,7 +30,7 @@
       rescue => e
         error_result = e
       end
-      raised_exception.should equal(error_result)
+      raised_exception.should.equal?(error_result)
     end
   end
 end
diff --git a/spec/ruby/core/tracepoint/self_spec.rb b/spec/ruby/core/tracepoint/self_spec.rb
index 2098860e592..bf9a2b6a451 100644
--- a/spec/ruby/core/tracepoint/self_spec.rb
+++ b/spec/ruby/core/tracepoint/self_spec.rb
@@ -8,7 +8,7 @@
       next unless TracePointSpec.target_thread?
       trace = tp.self
     }.enable do
-      trace.equal?(self).should be_true
+      trace.equal?(self).should == true
     end
   end
 
@@ -21,6 +21,6 @@
       class TracePointSpec::C
       end
     end
-    trace.should equal TracePointSpec::C
+    trace.should.equal? TracePointSpec::C
   end
 end
diff --git a/spec/ruby/core/true/dup_spec.rb b/spec/ruby/core/true/dup_spec.rb
index 351457ed229..2628f6d3747 100644
--- a/spec/ruby/core/true/dup_spec.rb
+++ b/spec/ruby/core/true/dup_spec.rb
@@ -2,6 +2,6 @@
 
 describe "TrueClass#dup" do
   it "returns self" do
-    true.dup.should equal(true)
+    true.dup.should.equal?(true)
   end
 end
diff --git a/spec/ruby/core/true/singleton_method_spec.rb b/spec/ruby/core/true/singleton_method_spec.rb
index 575c504b728..58689fb6e5a 100644
--- a/spec/ruby/core/true/singleton_method_spec.rb
+++ b/spec/ruby/core/true/singleton_method_spec.rb
@@ -2,10 +2,10 @@
 
 describe "TrueClass#singleton_method" do
   it "raises regardless of whether TrueClass defines the method" do
-    -> { true.singleton_method(:foo) }.should raise_error(NameError)
+    -> { true.singleton_method(:foo) }.should.raise(NameError)
     begin
       def (true).foo; end
-      -> { true.singleton_method(:foo) }.should raise_error(NameError)
+      -> { true.singleton_method(:foo) }.should.raise(NameError)
     ensure
       TrueClass.send(:remove_method, :foo)
     end
diff --git a/spec/ruby/core/true/to_s_spec.rb b/spec/ruby/core/true/to_s_spec.rb
index fa1b53a580c..2c6f3889e94 100644
--- a/spec/ruby/core/true/to_s_spec.rb
+++ b/spec/ruby/core/true/to_s_spec.rb
@@ -10,6 +10,6 @@
   end
 
   it "always returns the same string" do
-    true.to_s.should equal(true.to_s)
+    true.to_s.should.equal?(true.to_s)
   end
 end
diff --git a/spec/ruby/core/true/trueclass_spec.rb b/spec/ruby/core/true/trueclass_spec.rb
index 02af649d090..1c1a0ddbe27 100644
--- a/spec/ruby/core/true/trueclass_spec.rb
+++ b/spec/ruby/core/true/trueclass_spec.rb
@@ -4,12 +4,12 @@
   it ".allocate raises a TypeError" do
     -> do
       TrueClass.allocate
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it ".new is undefined" do
     -> do
       TrueClass.new
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/unboundmethod/bind_call_spec.rb b/spec/ruby/core/unboundmethod/bind_call_spec.rb
index 80b2095d860..ee1dad9c9ef 100644
--- a/spec/ruby/core/unboundmethod/bind_call_spec.rb
+++ b/spec/ruby/core/unboundmethod/bind_call_spec.rb
@@ -12,7 +12,7 @@
   end
 
   it "raises TypeError if object is not kind_of? the Module the method defined in" do
-    -> { @normal_um.bind_call(UnboundMethodSpecs::B.new) }.should raise_error(TypeError)
+    -> { @normal_um.bind_call(UnboundMethodSpecs::B.new) }.should.raise(TypeError)
   end
 
   it "binds and calls the method if object is kind_of the Module the method defined in" do
@@ -47,7 +47,7 @@ def singleton_method
       end
     end
     um = p.method(:singleton_method).unbind
-    ->{ um.bind_call(other) }.should raise_error(TypeError)
+    ->{ um.bind_call(other) }.should.raise(TypeError)
   end
 
   it "allows calling super for module methods bound to hierarchies that do not already have that module" do
diff --git a/spec/ruby/core/unboundmethod/bind_spec.rb b/spec/ruby/core/unboundmethod/bind_spec.rb
index 7658b664e53..087994ff572 100644
--- a/spec/ruby/core/unboundmethod/bind_spec.rb
+++ b/spec/ruby/core/unboundmethod/bind_spec.rb
@@ -12,15 +12,15 @@
   end
 
   it "raises TypeError if object is not kind_of? the Module the method defined in" do
-    -> { @normal_um.bind(UnboundMethodSpecs::B.new) }.should raise_error(TypeError)
+    -> { @normal_um.bind(UnboundMethodSpecs::B.new) }.should.raise(TypeError)
   end
 
   it "returns Method for any object that is kind_of? the Module method was extracted from" do
-    @normal_um.bind(UnboundMethodSpecs::Methods.new).should be_kind_of(Method)
+    @normal_um.bind(UnboundMethodSpecs::Methods.new).should.is_a?(Method)
   end
 
   it "returns Method on any object when UnboundMethod is unbound from a module" do
-    UnboundMethodSpecs::Mod.instance_method(:from_mod).bind(Object.new).should be_kind_of(Method)
+    UnboundMethodSpecs::Mod.instance_method(:from_mod).bind(Object.new).should.is_a?(Method)
   end
 
   it "the returned Method is equal to the one directly returned by obj.method" do
@@ -29,9 +29,9 @@
   end
 
   it "returns Method for any object kind_of? the Module the method is defined in" do
-    @parent_um.bind(UnboundMethodSpecs::Child1.new).should be_kind_of(Method)
-    @child1_um.bind(UnboundMethodSpecs::Parent.new).should be_kind_of(Method)
-    @child2_um.bind(UnboundMethodSpecs::Child1.new).should be_kind_of(Method)
+    @parent_um.bind(UnboundMethodSpecs::Child1.new).should.is_a?(Method)
+    @child1_um.bind(UnboundMethodSpecs::Parent.new).should.is_a?(Method)
+    @child2_um.bind(UnboundMethodSpecs::Child1.new).should.is_a?(Method)
   end
 
   it "allows binding a Kernel method retrieved from Object on BasicObject" do
@@ -45,7 +45,7 @@
 
   it "binds a Parent's class method to any Child's class methods" do
     m = UnboundMethodSpecs::Parent.method(:class_method).unbind.bind(UnboundMethodSpecs::Child1)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     m.call.should == "I am UnboundMethodSpecs::Child1"
   end
 
@@ -58,7 +58,7 @@ def singleton_method
       end
     end
     um = p.method(:singleton_method).unbind
-    ->{ um.bind(other) }.should raise_error(TypeError)
+    ->{ um.bind(other) }.should.raise(TypeError)
   end
 
   it "allows calling super for module methods bound to hierarchies that do not already have that module" do
diff --git a/spec/ruby/core/unboundmethod/equal_value_spec.rb b/spec/ruby/core/unboundmethod/equal_value_spec.rb
index c9f7ad45dac..24d5233299f 100644
--- a/spec/ruby/core/unboundmethod/equal_value_spec.rb
+++ b/spec/ruby/core/unboundmethod/equal_value_spec.rb
@@ -3,8 +3,8 @@
 
 context "Creating UnboundMethods" do
   specify "there is no difference between Method#unbind and Module#instance_method" do
-    UnboundMethodSpecs::Methods.instance_method(:foo).should be_kind_of(UnboundMethod)
-    UnboundMethodSpecs::Methods.new.method(:foo).unbind.should be_kind_of(UnboundMethod)
+    UnboundMethodSpecs::Methods.instance_method(:foo).should.is_a?(UnboundMethod)
+    UnboundMethodSpecs::Methods.new.method(:foo).unbind.should.is_a?(UnboundMethod)
   end
 end
 
@@ -35,6 +35,12 @@
 
     @method_one = UnboundMethodSpecs::Methods.instance_method(:one)
     @method_two = UnboundMethodSpecs::Methods.instance_method(:two)
+
+    @mixin = UnboundMethodSpecs::Mixin.instance_method(:mixin_method)
+    @includer_base = UnboundMethodSpecs::IncluderBase.new.method(:mixin_method).unbind
+    @includer_child = UnboundMethodSpecs::IncluderChild.new.method(:mixin_method).unbind
+    @extender_base = UnboundMethodSpecs::ExtenderBase.method(:mixin_method).unbind
+    @extender_child = UnboundMethodSpecs::ExtenderChild.method(:mixin_method).unbind
   end
 
   it "returns true if objects refer to the same method" do
@@ -91,6 +97,30 @@
     (@includer == @includee).should == true
   end
 
+  ruby_bug "#21873", ""..."4.1" do
+    it "returns true if same method is present in an object through module inclusion" do
+      (@mixin == @includer_base).should == true
+      (@includer_base == @mixin).should == true
+
+      (@mixin == @includer_child).should == true
+      (@includer_child == @mixin).should == true
+
+      (@includer_base == @includer_child).should == true
+      (@includer_child == @includer_base).should == true
+    end
+
+    it "returns true if same method is present in an object through module extension" do
+      (@mixin == @extender_base).should == true
+      (@extender_base == @mixin).should == true
+
+      (@mixin == @extender_child).should == true
+      (@extender_child == @mixin).should == true
+
+      (@extender_base == @extender_child).should == true
+      (@extender_child == @extender_base).should == true
+    end
+  end
+
   it "returns false if both have same Module, same name, identical body but not the same" do
     class UnboundMethodSpecs::Methods
       def discard_1; :discard; end
diff --git a/spec/ruby/core/unboundmethod/fixtures/classes.rb b/spec/ruby/core/unboundmethod/fixtures/classes.rb
index 28d8e0a9655..58120c2f88a 100644
--- a/spec/ruby/core/unboundmethod/fixtures/classes.rb
+++ b/spec/ruby/core/unboundmethod/fixtures/classes.rb
@@ -36,6 +36,7 @@ def with_block(&block); end
 
     alias bar foo
     alias baz bar
+    alias qux baz
     alias alias_1 foo
     alias alias_2 foo
 
@@ -80,6 +81,22 @@ class << self
     end
   end
 
+  module Mixin
+    def mixin_method; end
+  end
+
+  class IncluderBase
+    include Mixin
+  end
+
+  class IncluderChild < IncluderBase; end
+
+  class ExtenderBase
+    extend Mixin
+  end
+
+  class ExtenderChild < ExtenderBase; end
+
   class A
     def baz(a, b)
       return [__FILE__, self.class]
diff --git a/spec/ruby/core/unboundmethod/original_name_spec.rb b/spec/ruby/core/unboundmethod/original_name_spec.rb
index 7280dcb2b49..fa9a6fcc637 100644
--- a/spec/ruby/core/unboundmethod/original_name_spec.rb
+++ b/spec/ruby/core/unboundmethod/original_name_spec.rb
@@ -19,4 +19,25 @@
     obj.method(:baz).unbind.original_name.should == :foo
     UnboundMethodSpecs::Methods.instance_method(:baz).original_name.should == :foo
   end
+
+  it "returns the original name even when aliased thrice" do
+    obj = UnboundMethodSpecs::Methods.new
+    obj.method(:qux).unbind.original_name.should == :foo
+    UnboundMethodSpecs::Methods.instance_method(:qux).original_name.should == :foo
+  end
+
+  it "returns the source UnboundMethod's name (not the name given to define_method)" do
+    klass = Class.new { define_method(:my_inspect, ::Kernel.instance_method(:inspect)) }
+    klass.instance_method(:my_inspect).original_name.should == :inspect
+  end
+
+  it "preserves the source method's name through define_method and alias" do
+    source = Class.new { def my_method; end }
+    klass = Class.new(source) do
+      define_method(:renamed, source.instance_method(:my_method))
+      alias aliased renamed
+    end
+    klass.instance_method(:renamed).original_name.should == :my_method
+    klass.instance_method(:aliased).original_name.should == :my_method
+  end
 end
diff --git a/spec/ruby/core/unboundmethod/shared/dup.rb b/spec/ruby/core/unboundmethod/shared/dup.rb
index 194e2cc1a18..fd30f75c5bc 100644
--- a/spec/ruby/core/unboundmethod/shared/dup.rb
+++ b/spec/ruby/core/unboundmethod/shared/dup.rb
@@ -4,7 +4,7 @@
     b = a.send(@method)
 
     a.should == b
-    a.should_not equal(b)
+    a.should_not.equal?(b)
   end
 
   ruby_version_is "3.4" do
diff --git a/spec/ruby/core/unboundmethod/shared/to_s.rb b/spec/ruby/core/unboundmethod/shared/to_s.rb
index 6b2c9c3e793..848c1eba2e3 100644
--- a/spec/ruby/core/unboundmethod/shared/to_s.rb
+++ b/spec/ruby/core/unboundmethod/shared/to_s.rb
@@ -8,8 +8,8 @@
   end
 
   it "returns a String" do
-    @from_module.send(@method).should be_kind_of(String)
-    @from_method.send(@method).should be_kind_of(String)
+    @from_module.send(@method).should.is_a?(String)
+    @from_method.send(@method).should.is_a?(String)
   end
 
   it "the String reflects that this is an UnboundMethod object" do
diff --git a/spec/ruby/core/unboundmethod/source_location_spec.rb b/spec/ruby/core/unboundmethod/source_location_spec.rb
index 9cc21980173..927600bfcbe 100644
--- a/spec/ruby/core/unboundmethod/source_location_spec.rb
+++ b/spec/ruby/core/unboundmethod/source_location_spec.rb
@@ -7,23 +7,23 @@
   end
 
   it "sets the first value to the path of the file in which the method was defined" do
-    file = @method.source_location[0]
-    file.should be_an_instance_of(String)
+    file = @method.source_location.first
+    file.should.instance_of?(String)
     file.should == File.realpath('fixtures/classes.rb', __dir__)
   end
 
-  it "sets the second value to an Integer representing the line on which the method was defined" do
-    line = @method.source_location[1]
-    line.should be_an_instance_of(Integer)
+  it "sets the last value to an Integer representing the line on which the method was defined" do
+    line = @method.source_location.last
+    line.should.instance_of?(Integer)
     line.should == 5
   end
 
   it "returns the last place the method was defined" do
-    UnboundMethodSpecs::SourceLocation.method(:redefined).unbind.source_location[1].should == 13
+    UnboundMethodSpecs::SourceLocation.method(:redefined).unbind.source_location.last.should == 13
   end
 
   it "returns the location of the original method even if it was aliased" do
-    UnboundMethodSpecs::SourceLocation.instance_method(:aka).source_location[1].should == 17
+    UnboundMethodSpecs::SourceLocation.instance_method(:aka).source_location.last.should == 17
   end
 
   it "works for define_method methods" do
@@ -54,12 +54,6 @@
     c = Class.new do
       eval('def m; end', nil, "foo", 100)
     end
-    location = c.instance_method(:m).source_location
-    ruby_version_is(""..."4.1") do
-      location.should == ["foo", 100]
-    end
-    ruby_version_is("4.1") do
-      location.should == ["foo", 100, 0, 100, 10]
-    end
+    c.instance_method(:m).source_location.should == ["foo", 100]
   end
 end
diff --git a/spec/ruby/core/warning/element_reference_spec.rb b/spec/ruby/core/warning/element_reference_spec.rb
index 6179c578646..5f977759ecc 100644
--- a/spec/ruby/core/warning/element_reference_spec.rb
+++ b/spec/ruby/core/warning/element_reference_spec.rb
@@ -16,12 +16,12 @@
   end
 
   it "raises for unknown category" do
-    -> { Warning[:noop] }.should raise_error(ArgumentError, /unknown category: noop/)
+    -> { Warning[:noop] }.should.raise(ArgumentError, /unknown category: noop/)
   end
 
   it "raises for non-Symbol category" do
-    -> { Warning[42] }.should raise_error(TypeError)
-    -> { Warning[false] }.should raise_error(TypeError)
-    -> { Warning["noop"] }.should raise_error(TypeError)
+    -> { Warning[42] }.should.raise(TypeError)
+    -> { Warning[false] }.should.raise(TypeError)
+    -> { Warning["noop"] }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/warning/element_set_spec.rb b/spec/ruby/core/warning/element_set_spec.rb
index 1dbc66ce26c..3c8ceb721e8 100644
--- a/spec/ruby/core/warning/element_set_spec.rb
+++ b/spec/ruby/core/warning/element_set_spec.rb
@@ -28,12 +28,12 @@
   end
 
   it "raises for unknown category" do
-    -> { Warning[:noop] = false }.should raise_error(ArgumentError, /unknown category: noop/)
+    -> { Warning[:noop] = false }.should.raise(ArgumentError, /unknown category: noop/)
   end
 
   it "raises for non-Symbol category" do
-    -> { Warning[42] = false }.should raise_error(TypeError)
-    -> { Warning[false] = false }.should raise_error(TypeError)
-    -> { Warning["noop"] = false }.should raise_error(TypeError)
+    -> { Warning[42] = false }.should.raise(TypeError)
+    -> { Warning[false] = false }.should.raise(TypeError)
+    -> { Warning["noop"] = false }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/warning/warn_spec.rb b/spec/ruby/core/warning/warn_spec.rb
index 2e4a822e026..62f36e34547 100644
--- a/spec/ruby/core/warning/warn_spec.rb
+++ b/spec/ruby/core/warning/warn_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it "extends itself" do
-    Warning.singleton_class.ancestors.should include(Warning)
+    Warning.singleton_class.ancestors.should.include?(Warning)
   end
 
   it "has Warning as the method owner" do
diff --git a/spec/ruby/language/BEGIN_spec.rb b/spec/ruby/language/BEGIN_spec.rb
index 5aef5a1d7cc..25db32b96ac 100644
--- a/spec/ruby/language/BEGIN_spec.rb
+++ b/spec/ruby/language/BEGIN_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it "must appear in a top-level context" do
-    -> { eval "1.times { BEGIN { 1 } }" }.should raise_error(SyntaxError)
+    -> { eval "1.times { BEGIN { 1 } }" }.should.raise(SyntaxError)
   end
 
   it "uses top-level for self" do
diff --git a/spec/ruby/language/alias_spec.rb b/spec/ruby/language/alias_spec.rb
index 61fddb01849..4b3d36d3085 100644
--- a/spec/ruby/language/alias_spec.rb
+++ b/spec/ruby/language/alias_spec.rb
@@ -140,7 +140,7 @@ def self.klass_method; 7; end
     end
 
     @obj.__value.should == 5
-    -> { AliasObject.new.__value }.should raise_error(NoMethodError)
+    -> { AliasObject.new.__value }.should.raise(NoMethodError)
   end
 
   it "operates on the class/module metaclass when used in instance_eval" do
@@ -149,7 +149,7 @@ def self.klass_method; 7; end
     end
 
     AliasObject.__klass_method.should == 7
-    -> { Object.__klass_method }.should raise_error(NoMethodError)
+    -> { Object.__klass_method }.should.raise(NoMethodError)
   end
 
   it "operates on the class/module metaclass when used in instance_exec" do
@@ -158,7 +158,7 @@ def self.klass_method; 7; end
     end
 
     AliasObject.__klass_method2.should == 7
-    -> { Object.__klass_method2 }.should raise_error(NoMethodError)
+    -> { Object.__klass_method2 }.should.raise(NoMethodError)
   end
 
   it "operates on methods defined via attr, attr_reader, and attr_accessor" do
@@ -241,13 +241,13 @@ def test_with_check(*args)
       1.instance_eval do
         alias :foo :to_s
       end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
 
     -> do
       :blah.instance_eval do
         alias :foo :to_s
       end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "on top level defines the alias on Object" do
@@ -256,7 +256,7 @@ def test_with_check(*args)
   end
 
   it "raises a NameError when passed a missing name" do
-    -> { @meta.class_eval { alias undef_method not_exist } }.should raise_error(NameError) { |e|
+    -> { @meta.class_eval { alias undef_method not_exist } }.should.raise(NameError) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -272,7 +272,7 @@ def parent_method
     end
 
     child.instance_method(:parent_method_alias).owner.should == child
-    child.instance_methods(false).should include(:parent_method_alias)
+    child.instance_methods(false).should.include?(:parent_method_alias)
   end
 end
 
diff --git a/spec/ruby/language/and_spec.rb b/spec/ruby/language/and_spec.rb
index 55a2a3103a1..c5c255989b7 100644
--- a/spec/ruby/language/and_spec.rb
+++ b/spec/ruby/language/and_spec.rb
@@ -5,7 +5,7 @@
   it "short-circuits evaluation at the first condition to be false" do
     x = nil
     true && false && x = 1
-    x.should be_nil
+    x.should == nil
   end
 
   it "evaluates to the first condition not to be true" do
@@ -33,9 +33,9 @@
   end
 
   it "treats empty expressions as nil" do
-    (() && true).should be_nil
-    (true && ()).should be_nil
-    (() && ()).should be_nil
+    (() && true).should == nil
+    (true && ()).should == nil
+    (() && ()).should == nil
   end
 
 end
@@ -44,7 +44,7 @@
   it "short-circuits evaluation at the first condition to be false" do
     x = nil
     true and false and x = 1
-    x.should be_nil
+    x.should == nil
   end
 
   it "evaluates to the first condition not to be true" do
@@ -72,9 +72,9 @@
   end
 
   it "treats empty expressions as nil" do
-    (() and true).should be_nil
-    (true and ()).should be_nil
-    (() and ()).should be_nil
+    (() and true).should == nil
+    (true and ()).should == nil
+    (() and ()).should == nil
   end
 
 end
diff --git a/spec/ruby/language/array_spec.rb b/spec/ruby/language/array_spec.rb
index 2583cffbf70..3601eb0e00b 100644
--- a/spec/ruby/language/array_spec.rb
+++ b/spec/ruby/language/array_spec.rb
@@ -4,7 +4,7 @@
 describe "Array literals" do
   it "[] should return a new array populated with the given elements" do
     array = [1, 'a', nil]
-    array.should be_kind_of(Array)
+    array.should.is_a?(Array)
     array[0].should == 1
     array[1].should == 'a'
     array[2].should == nil
@@ -12,7 +12,7 @@
 
   it "[] treats empty expressions as nil elements" do
     array = [0, (), 2, (), 4]
-    array.should be_kind_of(Array)
+    array.should.is_a?(Array)
     array[0].should == 0
     array[1].should == nil
     array[2].should == 2
@@ -89,7 +89,7 @@
   it "returns a new array containing the same values when applied to an array inside an empty array" do
     splatted_array = [3, 4, 5]
     [*splatted_array].should == splatted_array
-    [*splatted_array].should_not equal(splatted_array)
+    [*splatted_array].should_not.equal?(splatted_array)
   end
 
   it "unpacks the start and count arguments in an array slice assignment" do
@@ -135,7 +135,7 @@
 
   it "when applied to a non-Array value uses it unchanged if it does not respond_to?(:to_a)" do
     obj = Object.new
-    obj.should_not respond_to(:to_a)
+    obj.should_not.respond_to?(:to_a)
     [1, *obj].should == [1, obj]
   end
 
diff --git a/spec/ruby/language/assignments_spec.rb b/spec/ruby/language/assignments_spec.rb
index 58a244b7c27..d621c9f0c62 100644
--- a/spec/ruby/language/assignments_spec.rb
+++ b/spec/ruby/language/assignments_spec.rb
@@ -36,7 +36,7 @@ def object.[]=(_, _) end
 
         -> {
           (:not_a_module)::A = (ScratchPad << :rhs; :value)
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
 
         ScratchPad.recorded.should == [:rhs]
       end
@@ -68,7 +68,7 @@ def []=(k, v, &block) @h[k] = v; end
 
           -> {
             eval "obj[:a, &block] = 2"
-          }.should raise_error(SyntaxError, /unexpected block arg given in index assignment|block arg given in index assignment/)
+          }.should.raise(SyntaxError, /unexpected block arg given in index assignment|block arg given in index assignment/)
         end
       end
     end
@@ -95,7 +95,7 @@ def []=(*args, **kw)
       ruby_version_is "3.4" do
         it "raises SyntaxError when given keyword arguments in index assignments" do
           a = @klass.new
-          -> { eval "a[1, 2, 3, b: 4] = 5" }.should raise_error(SyntaxError,
+          -> { eval "a[1, 2, 3, b: 4] = 5" }.should.raise(SyntaxError,
             /keywords are not allowed in index assignment expressions|keyword arg given in index assignment/) # prism|parse.y
         end
       end
@@ -199,7 +199,7 @@ def []=(k, v, &block) @h[k] = v; end
 
             -> {
               eval "obj[:a, &block] += 2"
-            }.should raise_error(SyntaxError, /unexpected block arg given in index assignment|block arg given in index assignment/)
+            }.should.raise(SyntaxError, /unexpected block arg given in index assignment|block arg given in index assignment/)
           end
         end
       end
@@ -230,7 +230,7 @@ def []=(*args, **kw)
         ruby_version_is "3.4" do
           it "raises SyntaxError when given keyword arguments in index assignments" do
             a = @klass.new
-            -> { eval "a[1, 2, 3, b: 4] += 5" }.should raise_error(SyntaxError,
+            -> { eval "a[1, 2, 3, b: 4] += 5" }.should.raise(SyntaxError,
               /keywords are not allowed in index assignment expressions|keyword arg given in index assignment/) # prism|parse.y
           end
         end
diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb
index 67aad76c57e..5bdb993aea6 100644
--- a/spec/ruby/language/block_spec.rb
+++ b/spec/ruby/language/block_spec.rb
@@ -13,7 +13,7 @@ def m(a) yield a end
 
     it "receives the identical Array object" do
       ary = [1, 2]
-      m(ary) { |a| a }.should equal(ary)
+      m(ary) { |a| a }.should.equal?(ary)
     end
 
     it "assigns the Array to a single rest argument" do
@@ -73,7 +73,7 @@ def m(a) yield a end
     it "raises error when required keyword arguments are present" do
       -> {
         m([1, 2]) { |a, b:, c:| [a, b, c] }
-      }.should raise_error(ArgumentError, "missing keywords: :b, :c")
+      }.should.raise(ArgumentError, "missing keywords: :b, :c")
     end
 
     it "assigns elements to mixed argument types" do
@@ -234,14 +234,14 @@ def obj.respond_to_missing?(name, include_private)
       obj = mock("destructure block arguments")
       obj.should_receive(:to_ary).and_return(1)
 
-      -> { m(obj) { |a, b| } }.should raise_error(TypeError)
+      -> { m(obj) { |a, b| } }.should.raise(TypeError)
     end
 
     it "raises error transparently if #to_ary raises error on its own" do
       obj = Object.new
       def obj.to_ary; raise "Exception raised in #to_ary" end
 
-      -> { m(obj) { |a, b| } }.should raise_error(RuntimeError, "Exception raised in #to_ary")
+      -> { m(obj) { |a, b| } }.should.raise(RuntimeError, "Exception raised in #to_ary")
     end
   end
 end
@@ -311,7 +311,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
 
   describe "taking |a| arguments" do
     it "assigns nil to the argument when no values are yielded" do
-      @y.z { |a| a }.should be_nil
+      @y.z { |a| a }.should == nil
     end
 
     it "assigns the value yielded to the argument" do
@@ -322,7 +322,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
       obj = mock("block yield to_ary")
       obj.should_not_receive(:to_ary)
 
-      @y.s(obj) { |a| a }.should equal(obj)
+      @y.s(obj) { |a| a }.should.equal?(obj)
     end
 
     it "assigns the first value yielded to the argument" do
@@ -398,14 +398,14 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
       obj = mock("block yield to_ary invalid")
       obj.should_receive(:to_ary).and_return(1)
 
-      -> { @y.s(obj) { |a, b| } }.should raise_error(TypeError)
+      -> { @y.s(obj) { |a, b| } }.should.raise(TypeError)
     end
 
     it "raises the original exception if #to_ary raises an exception" do
       obj = mock("block yield to_ary raising an exception")
       obj.should_receive(:to_ary).and_raise(ZeroDivisionError)
 
-      -> { @y.s(obj) { |a, b| } }.should raise_error(ZeroDivisionError)
+      -> { @y.s(obj) { |a, b| } }.should.raise(ZeroDivisionError)
     end
   end
 
@@ -461,7 +461,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
       obj = mock("block yield to_ary invalid")
       obj.should_receive(:to_ary).and_return(1)
 
-      -> { @y.s(obj) { |a, *b| } }.should raise_error(TypeError)
+      -> { @y.s(obj) { |a, *b| } }.should.raise(TypeError)
     end
   end
 
@@ -539,7 +539,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
 
   describe "taking |a, | arguments" do
     it "assigns nil to the argument when no values are yielded" do
-      @y.z { |a, | a }.should be_nil
+      @y.z { |a, | a }.should == nil
     end
 
     it "assigns the argument a single value yielded" do
@@ -555,7 +555,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
     end
 
     it "assigns nil to the argument when passed an empty Array" do
-      @y.s([]) { |a, | a }.should be_nil
+      @y.s([]) { |a, | a }.should == nil
     end
 
     it "assigns the argument the first element of the Array when passed a single Array" do
@@ -586,7 +586,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
       obj = mock("block yield to_ary invalid")
       obj.should_receive(:to_ary).and_return(1)
 
-      -> { @y.s(obj) { |a, | } }.should raise_error(TypeError)
+      -> { @y.s(obj) { |a, | } }.should.raise(TypeError)
     end
   end
 
@@ -628,7 +628,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
       obj = mock("block yield to_ary invalid")
       obj.should_receive(:to_ary).and_return(1)
 
-      -> { @y.s(obj) { |(a, b)| } }.should raise_error(TypeError)
+      -> { @y.s(obj) { |(a, b)| } }.should.raise(TypeError)
     end
   end
 
@@ -669,7 +669,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
       obj = mock("block yield to_ary invalid")
       obj.should_receive(:to_ary).and_return(1)
 
-      -> { @y.s(obj) { |(a, b), c| } }.should raise_error(TypeError)
+      -> { @y.s(obj) { |(a, b), c| } }.should.raise(TypeError)
     end
   end
 
@@ -728,15 +728,15 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
 
   describe "taking identically-named arguments" do
     it "raises a SyntaxError for standard arguments" do
-      -> { eval "lambda { |x,x| }" }.should raise_error(SyntaxError)
-      -> { eval "->(x,x) {}" }.should raise_error(SyntaxError)
-      -> { eval "Proc.new { |x,x| }" }.should raise_error(SyntaxError)
+      -> { eval "lambda { |x,x| }" }.should.raise(SyntaxError)
+      -> { eval "->(x,x) {}" }.should.raise(SyntaxError)
+      -> { eval "Proc.new { |x,x| }" }.should.raise(SyntaxError)
     end
 
     it "accepts unnamed arguments" do
-      lambda { |_,_| }.should be_an_instance_of(Proc) # rubocop:disable Style/Lambda
-      -> _,_ {}.should be_an_instance_of(Proc)
-      Proc.new { |_,_| }.should be_an_instance_of(Proc)
+      lambda { |_,_| }.should.instance_of?(Proc) # rubocop:disable Style/Lambda
+      -> _,_ {}.should.instance_of?(Proc)
+      Proc.new { |_,_| }.should.instance_of?(Proc)
     end
   end
 
@@ -787,29 +787,29 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
   end
 
   it "can not have the same name as one of the standard parameters" do
-    -> { eval "[1].each {|foo; foo| }" }.should raise_error(SyntaxError)
-    -> { eval "[1].each {|foo, bar; glark, bar| }" }.should raise_error(SyntaxError)
+    -> { eval "[1].each {|foo; foo| }" }.should.raise(SyntaxError)
+    -> { eval "[1].each {|foo, bar; glark, bar| }" }.should.raise(SyntaxError)
   end
 
   it "can not be prefixed with an asterisk" do
-    -> { eval "[1].each {|foo; *bar| }" }.should raise_error(SyntaxError)
+    -> { eval "[1].each {|foo; *bar| }" }.should.raise(SyntaxError)
     -> do
       eval "[1].each {|foo, bar; glark, *fnord| }"
-    end.should raise_error(SyntaxError)
+    end.should.raise(SyntaxError)
   end
 
   it "can not be prefixed with an ampersand" do
-    -> { eval "[1].each {|foo; &bar| }" }.should raise_error(SyntaxError)
+    -> { eval "[1].each {|foo; &bar| }" }.should.raise(SyntaxError)
     -> do
       eval "[1].each {|foo, bar; glark, &fnord| }"
-    end.should raise_error(SyntaxError)
+    end.should.raise(SyntaxError)
   end
 
   it "can not be assigned default values" do
-    -> { eval "[1].each {|foo; bar=1| }" }.should raise_error(SyntaxError)
+    -> { eval "[1].each {|foo; bar=1| }" }.should.raise(SyntaxError)
     -> do
       eval "[1].each {|foo, bar; glark, fnord=:fnord| }"
-    end.should raise_error(SyntaxError)
+    end.should.raise(SyntaxError)
   end
 
   it "need not be preceded by standard parameters" do
@@ -818,8 +818,8 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
   end
 
   it "only allow a single semi-colon in the parameter list" do
-    -> { eval "[1].each {|foo; bar; glark| }" }.should raise_error(SyntaxError)
-    -> { eval "[1].each {|; bar; glark| }" }.should raise_error(SyntaxError)
+    -> { eval "[1].each {|foo; bar; glark| }" }.should.raise(SyntaxError)
+    -> { eval "[1].each {|; bar; glark| }" }.should.raise(SyntaxError)
   end
 
   it "override shadowed variables from the outer scope" do
@@ -844,21 +844,21 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
   end
 
   it "are not automatically instantiated in the outer scope" do
-    defined?(glark).should be_nil
+    defined?(glark).should == nil
     [1].each {|;glark| 1}
-    defined?(glark).should be_nil
+    defined?(glark).should == nil
   end
 
   it "are automatically instantiated in the block" do
     [1].each do |;glark|
-      glark.should be_nil
+      glark.should == nil
     end
   end
 
   it "are visible in deeper scopes before initialization" do
     [1].each {|;glark|
       [1].each {
-        defined?(glark).should_not be_nil
+        defined?(glark).should_not == nil
         glark = 1
       }
       glark.should == 1
@@ -886,7 +886,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
       -> *a, b do
         [a, b]
       end.call
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "are assigned to nil when not enough arguments are given to a proc" do
@@ -962,7 +962,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
           a = 1
           -> {
             eval "proc { |a=a| a }"
-          }.should raise_error(SyntaxError)
+          }.should.raise(SyntaxError)
         end
       end
 
@@ -1006,7 +1006,7 @@ def c(&); yield :non_null end
   end
 
   it "requires the anonymous block parameter to be declared if directly passing a block" do
-    -> { eval "def a; b(&); end; def b; end" }.should raise_error(SyntaxError)
+    -> { eval "def a; b(&); end; def b; end" }.should.raise(SyntaxError)
   end
 
   it "works when it's the only declared parameter" do
@@ -1110,6 +1110,17 @@ def o.it
       end
     end
   end
+
+  ruby_version_is "4.1" do
+    it "works alongside disallowed block argument" do
+      no_block = eval <<-EOF
+        proc {|arg1, &nil| arg1}
+      EOF
+
+      no_block.call(:a).should == :a
+      -> { no_block.call(:a) {} }.should.raise(ArgumentError, 'no block accepted')
+    end
+  end
 end
 
 # Duplicates specs in language/it_parameter_spec.rb
@@ -1125,3 +1136,13 @@ def o.it
     proc { it = 5; it }.call(0).should == 5
   end
 end
+
+describe "Block-parameter destructuring" do
+  it "does not warn about unused inner names in verbose mode" do
+    -> {
+      eval <<~RUBY, binding, __FILE__, __LINE__ + 1
+        proc { |key, (val1, val2)| [key, val2] }
+      RUBY
+    }.should_not complain(verbose: true)
+  end
+end
diff --git a/spec/ruby/language/break_spec.rb b/spec/ruby/language/break_spec.rb
index 7e5b6fb3285..5c9b8060c35 100644
--- a/spec/ruby/language/break_spec.rb
+++ b/spec/ruby/language/break_spec.rb
@@ -52,29 +52,29 @@
 
   describe "when the invocation of the scope creating the block is still active" do
     it "raises a LocalJumpError when invoking the block from the scope creating the block" do
-      -> { @program.break_in_method }.should raise_error(LocalJumpError)
+      -> { @program.break_in_method }.should.raise(LocalJumpError)
       ScratchPad.recorded.should == [:a, :xa, :d, :b]
     end
 
     it "raises a LocalJumpError when invoking the block from a method" do
-      -> { @program.break_in_nested_method }.should raise_error(LocalJumpError)
+      -> { @program.break_in_nested_method }.should.raise(LocalJumpError)
       ScratchPad.recorded.should == [:a, :xa, :cc, :aa, :b]
     end
 
     it "raises a LocalJumpError when yielding to the block" do
-      -> { @program.break_in_yielding_method }.should raise_error(LocalJumpError)
+      -> { @program.break_in_yielding_method }.should.raise(LocalJumpError)
       ScratchPad.recorded.should == [:a, :xa, :cc, :aa, :b]
     end
   end
 
   describe "from a scope that has returned" do
     it "raises a LocalJumpError when calling the block from a method" do
-      -> { @program.break_in_method_captured }.should raise_error(LocalJumpError)
+      -> { @program.break_in_method_captured }.should.raise(LocalJumpError)
       ScratchPad.recorded.should == [:a, :za, :xa, :zd, :zb]
     end
 
     it "raises a LocalJumpError when yielding to the block" do
-      -> { @program.break_in_yield_captured }.should raise_error(LocalJumpError)
+      -> { @program.break_in_yield_captured }.should.raise(LocalJumpError)
       ScratchPad.recorded.should == [:a, :za, :xa, :zd, :aa, :zb]
     end
   end
@@ -88,7 +88,7 @@
           e
         end
       end
-      thread_with_break.value.should be_an_instance_of(LocalJumpError)
+      thread_with_break.value.should.instance_of?(LocalJumpError)
     end
   end
 end
@@ -256,7 +256,7 @@ def mid(&b)
   it "is invalid and raises a SyntaxError" do
     -> {
       eval("def m; break; end")
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 end
 
@@ -268,7 +268,7 @@ module BreakSpecs:ModuleWithBreak
       end
     RUBY
 
-    -> { eval(code) }.should raise_error(SyntaxError)
+    -> { eval(code) }.should.raise(SyntaxError)
   end
 end
 
@@ -388,7 +388,7 @@ def three
 
     -> do
       cls2.new.foo.should == 1
-    end.should_not raise_error
+    end.should_not.raise
   end
 
   it "raises LocalJumpError when converted into a proc during a super call" do
@@ -397,6 +397,6 @@ def three
 
     -> do
       cls2.new.foo
-    end.should raise_error(LocalJumpError)
+    end.should.raise(LocalJumpError)
   end
 end
diff --git a/spec/ruby/language/case_spec.rb b/spec/ruby/language/case_spec.rb
index 464d06e46a4..8355062e446 100644
--- a/spec/ruby/language/case_spec.rb
+++ b/spec/ruby/language/case_spec.rb
@@ -94,12 +94,12 @@ def bar; @calls << :bar; end
   it "tests with matching regexps and sets $~ and captures" do
     case "foo42"
     when /oo(\d+)/
-      $~.should be_kind_of(MatchData)
+      $~.should.is_a?(MatchData)
       $1.should == "42"
     else
       flunk
     end
-    $~.should be_kind_of(MatchData)
+    $~.should.is_a?(MatchData)
     $1.should == "42"
   end
 
@@ -107,12 +107,12 @@ def bar; @calls << :bar; end
     digits = '\d+'
     case "foo44"
     when /oo(#{digits})/
-      $~.should be_kind_of(MatchData)
+      $~.should.is_a?(MatchData)
       $1.should == "44"
     else
       flunk
     end
-    $~.should be_kind_of(MatchData)
+    $~.should.is_a?(MatchData)
     $1.should == "44"
   end
 
@@ -120,12 +120,12 @@ def bar; @calls << :bar; end
     digits_regexp = /\d+/
     case "foo43"
     when /oo(#{digits_regexp})/
-      $~.should be_kind_of(MatchData)
+      $~.should.is_a?(MatchData)
       $1.should == "43"
     else
       flunk
     end
-    $~.should be_kind_of(MatchData)
+    $~.should.is_a?(MatchData)
     $1.should == "43"
   end
 
@@ -268,7 +268,7 @@ def bar; @calls << :bar; end
         true
       end
       CODE
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 
   it "raises a SyntaxError when 'else' is used before a 'when' was given" do
@@ -280,7 +280,7 @@ def bar; @calls << :bar; end
       when 4; false
       end
       CODE
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 
   it "supports nested case statements" do
diff --git a/spec/ruby/language/class_spec.rb b/spec/ruby/language/class_spec.rb
index 6fb785fd568..7ea48575144 100644
--- a/spec/ruby/language/class_spec.rb
+++ b/spec/ruby/language/class_spec.rb
@@ -10,23 +10,23 @@ module ClassSpecs
 describe "The class keyword" do
   it "creates a new class with semicolon" do
     class ClassSpecsKeywordWithSemicolon; end
-    ClassSpecsKeywordWithSemicolon.should be_an_instance_of(Class)
+    ClassSpecsKeywordWithSemicolon.should.instance_of?(Class)
   end
 
   it "does not raise a SyntaxError when opening a class without a semicolon" do
     eval "class ClassSpecsKeywordWithoutSemicolon end"
-    ClassSpecsKeywordWithoutSemicolon.should be_an_instance_of(Class)
+    ClassSpecsKeywordWithoutSemicolon.should.instance_of?(Class)
   end
 
   it "can redefine a class when called from a block" do
     ClassSpecs::DEFINE_CLASS.call
-    A.should be_an_instance_of(Class)
+    A.should.instance_of?(Class)
 
     Object.send(:remove_const, :A)
-    defined?(A).should be_nil
+    defined?(A).should == nil
 
     ClassSpecs::DEFINE_CLASS.call
-    A.should be_an_instance_of(Class)
+    A.should.instance_of?(Class)
   ensure
     Object.send(:remove_const, :A) if defined?(::A)
   end
@@ -34,8 +34,8 @@ class ClassSpecsKeywordWithSemicolon; end
 
 describe "A class definition" do
   it "creates a new class" do
-    ClassSpecs::A.should be_kind_of(Class)
-    ClassSpecs::A.new.should be_kind_of(ClassSpecs::A)
+    ClassSpecs::A.should.is_a?(Class)
+    ClassSpecs::A.new.should.is_a?(ClassSpecs::A)
   end
 
   it "has no class variables" do
@@ -46,14 +46,14 @@ class ClassSpecsKeywordWithSemicolon; end
     -> {
       class ClassSpecsNumber
       end
-    }.should raise_error(TypeError, /\AClassSpecsNumber is not a class/)
+    }.should.raise(TypeError, /\AClassSpecsNumber is not a class/)
   end
 
   it "raises TypeError if constant given as class name exists and is a Module but not a Class" do
     -> {
       class ClassSpecs
       end
-    }.should raise_error(TypeError, /\AClassSpecs is not a class/)
+    }.should.raise(TypeError, /\AClassSpecs is not a class/)
   end
 
   # test case known to be detecting bugs (JRuby, MRI)
@@ -61,19 +61,19 @@ class ClassSpecs
     -> {
       class nil::Foo
       end
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises TypeError if any constant qualifying the class is not a Module" do
     -> {
       class ClassSpecs::Number::MyClass
       end
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
 
     -> {
       class ClassSpecsNumber::MyClass
       end
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "inherits from Object by default" do
@@ -87,7 +87,7 @@ class SuperclassResetToSubclass < L
       -> {
         class SuperclassResetToSubclass < M
         end
-      }.should raise_error(TypeError, /superclass mismatch/)
+      }.should.raise(TypeError, /superclass mismatch/)
     end
   end
 
@@ -100,7 +100,7 @@ class SuperclassReopenedBasicObject < A
       -> {
         class SuperclassReopenedBasicObject < BasicObject
         end
-      }.should raise_error(TypeError, /superclass mismatch/)
+      }.should.raise(TypeError, /superclass mismatch/)
       SuperclassReopenedBasicObject.superclass.should == A
     end
   end
@@ -115,7 +115,7 @@ class SuperclassReopenedObject < A
       -> {
         class SuperclassReopenedObject < Object
         end
-      }.should raise_error(TypeError, /superclass mismatch/)
+      }.should.raise(TypeError, /superclass mismatch/)
       SuperclassReopenedObject.superclass.should == A
     end
   end
@@ -140,7 +140,7 @@ class NoSuperclassSet
       -> {
         class NoSuperclassSet < String
         end
-      }.should raise_error(TypeError, /superclass mismatch/)
+      }.should.raise(TypeError, /superclass mismatch/)
     end
   end
 
@@ -149,7 +149,7 @@ class NoSuperclassSet < String
 
     -> {
       class ShouldNotWork < self; end
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "first evaluates the superclass before checking if the class already exists" do
@@ -168,7 +168,7 @@ class SuperclassEvaluatedFirst < remove_const(:SuperclassEvaluatedFirst)
   it "raises a TypeError if inheriting from a metaclass" do
     obj = mock("metaclass super")
     meta = obj.singleton_class
-    -> { class ClassSpecs::MetaclassSuper < meta; end }.should raise_error(TypeError)
+    -> { class ClassSpecs::MetaclassSuper < meta; end }.should.raise(TypeError)
   end
 
   it "allows the declaration of class variables in the body" do
@@ -177,7 +177,7 @@ class SuperclassEvaluatedFirst < remove_const(:SuperclassEvaluatedFirst)
   end
 
   it "stores instance variables defined in the class body in the class object" do
-    ClassSpecs.string_instance_variables(ClassSpecs::B).should include("@ivar")
+    ClassSpecs.string_instance_variables(ClassSpecs::B).should.include?("@ivar")
     ClassSpecs::B.instance_variable_get(:@ivar).should == :ivar
   end
 
@@ -189,9 +189,9 @@ class SuperclassEvaluatedFirst < remove_const(:SuperclassEvaluatedFirst)
   end
 
   it "allows the definition of class-level instance variables in a class method" do
-    ClassSpecs.string_instance_variables(ClassSpecs::C).should_not include("@civ")
+    ClassSpecs.string_instance_variables(ClassSpecs::C).should_not.include?("@civ")
     ClassSpecs::C.make_class_instance_variable
-    ClassSpecs.string_instance_variables(ClassSpecs::C).should include("@civ")
+    ClassSpecs.string_instance_variables(ClassSpecs::C).should.include?("@civ")
     ClassSpecs::C.remove_instance_variable :@civ
   end
 
@@ -286,7 +286,8 @@ def self.get_class_name
 
 describe "An outer class definition" do
   it "contains the inner classes" do
-    ClassSpecs::Container.constants.should include(:A, :B)
+    ClassSpecs::Container.constants.should.include?(:A)
+    ClassSpecs::Container.constants.should.include?(:B)
   end
 end
 
@@ -304,23 +305,23 @@ def xyz
           end
         end
       CODE
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises a TypeError when trying to extend non-Class" do
     error_msg = /superclass must be a.* Class/
-    -> { class TestClass < "";              end }.should raise_error(TypeError, error_msg)
-    -> { class TestClass < 1;               end }.should raise_error(TypeError, error_msg)
-    -> { class TestClass < :symbol;         end }.should raise_error(TypeError, error_msg)
-    -> { class TestClass < mock('o');       end }.should raise_error(TypeError, error_msg)
-    -> { class TestClass < Module.new;      end }.should raise_error(TypeError, error_msg)
-    -> { class TestClass < BasicObject.new; end }.should raise_error(TypeError, error_msg)
+    -> { class TestClass < "";              end }.should.raise(TypeError, error_msg)
+    -> { class TestClass < 1;               end }.should.raise(TypeError, error_msg)
+    -> { class TestClass < :symbol;         end }.should.raise(TypeError, error_msg)
+    -> { class TestClass < mock('o');       end }.should.raise(TypeError, error_msg)
+    -> { class TestClass < Module.new;      end }.should.raise(TypeError, error_msg)
+    -> { class TestClass < BasicObject.new; end }.should.raise(TypeError, error_msg)
   end
 
   it "does not allow accessing the block of the original scope" do
     -> {
       ClassSpecs.sclass_with_block { 123 }
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 
   it "can use return to cause the enclosing method to return" do
@@ -340,11 +341,11 @@ def xyz
   end
 
   it "raises a TypeError when superclasses mismatch" do
-    -> { class ClassSpecs::A < Array; end }.should raise_error(TypeError)
+    -> { class ClassSpecs::A < Array; end }.should.raise(TypeError)
   end
 
   it "adds new methods to subclasses" do
-    -> { ClassSpecs::M.m }.should raise_error(NoMethodError)
+    -> { ClassSpecs::M.m }.should.raise(NoMethodError)
     class ClassSpecs::L
       def self.m
         1
diff --git a/spec/ruby/language/class_variable_spec.rb b/spec/ruby/language/class_variable_spec.rb
index a26a3fb8deb..84a7684c6da 100644
--- a/spec/ruby/language/class_variable_spec.rb
+++ b/spec/ruby/language/class_variable_spec.rb
@@ -30,19 +30,19 @@
   end
 
   it "is not defined in these classes" do
-    ClassVariablesSpec::ClassC.cvar_defined?.should be_false
+    ClassVariablesSpec::ClassC.cvar_defined?.should == false
   end
 
   it "is only updated in the module a method defined in the module is used" do
     ClassVariablesSpec::ClassC.cvar_m = "new value"
     ClassVariablesSpec::ClassC.cvar_m.should == "new value"
 
-    ClassVariablesSpec::ClassC.cvar_defined?.should be_false
+    ClassVariablesSpec::ClassC.cvar_defined?.should == false
   end
 
   it "is updated in the class when a Method defined in the class is used" do
     ClassVariablesSpec::ClassC.cvar_c = "new value"
-    ClassVariablesSpec::ClassC.cvar_defined?.should be_true
+    ClassVariablesSpec::ClassC.cvar_defined?.should == true
   end
 
   it "can be accessed inside the class using the module methods" do
@@ -55,11 +55,11 @@
   end
 
   it "is defined in the extended module" do
-    ClassVariablesSpec::ModuleN.class_variable_defined?(:@@cvar_n).should be_true
+    ClassVariablesSpec::ModuleN.class_variable_defined?(:@@cvar_n).should == true
   end
 
   it "is not defined in the extending module" do
-    ClassVariablesSpec::ModuleO.class_variable_defined?(:@@cvar_n).should be_false
+    ClassVariablesSpec::ModuleO.class_variable_defined?(:@@cvar_n).should == false
   end
 end
 
@@ -70,14 +70,14 @@
     c = Class.new(b)
     b.class_variable_set(:@@cv, :value)
 
-    -> { a.class_variable_get(:@@cv) }.should raise_error(NameError)
+    -> { a.class_variable_get(:@@cv) }.should.raise(NameError)
     b.class_variable_get(:@@cv).should == :value
     c.class_variable_get(:@@cv).should == :value
 
     # updates the same variable
     c.class_variable_set(:@@cv, :next)
 
-    -> { a.class_variable_get(:@@cv) }.should raise_error(NameError)
+    -> { a.class_variable_get(:@@cv) }.should.raise(NameError)
     b.class_variable_get(:@@cv).should == :next
     c.class_variable_get(:@@cv).should == :next
   end
@@ -87,16 +87,16 @@
   it "raises a RuntimeError when accessed from the toplevel scope (not in some module or class)" do
     -> {
       eval "@@cvar_toplevel1"
-    }.should raise_error(RuntimeError, 'class variable access from toplevel')
+    }.should.raise(RuntimeError, 'class variable access from toplevel')
     -> {
       eval "@@cvar_toplevel2 = 2"
-    }.should raise_error(RuntimeError, 'class variable access from toplevel')
+    }.should.raise(RuntimeError, 'class variable access from toplevel')
   end
 
   it "does not raise an error when checking if defined from the toplevel scope" do
     -> {
       eval "defined?(@@cvar_toplevel1)"
-    }.should_not raise_error
+    }.should_not.raise
   end
 
   it "raises a RuntimeError when a class variable is overtaken in an ancestor class" do
@@ -107,7 +107,7 @@
 
     -> {
       subclass.class_variable_get(:@@cvar_overtaken)
-    }.should raise_error(RuntimeError, /class variable @@cvar_overtaken of .+ is overtaken by .+/)
+    }.should.raise(RuntimeError, /class variable @@cvar_overtaken of .+ is overtaken by .+/)
 
     parent.class_variable_get(:@@cvar_overtaken).should == :parent
   end
diff --git a/spec/ruby/language/constants_spec.rb b/spec/ruby/language/constants_spec.rb
index 063c52c4226..0880230a36d 100644
--- a/spec/ruby/language/constants_spec.rb
+++ b/spec/ruby/language/constants_spec.rb
@@ -51,8 +51,8 @@ module ConstantSpecs::SpecAdded1
     it "does not search the singleton class of the class or module" do
       -> do
         ConstantSpecs::ContainerA::ChildA::CS_CONST14
-      end.should raise_error(NameError)
-      -> { ConstantSpecs::CS_CONST14 }.should raise_error(NameError)
+      end.should.raise(NameError)
+      -> { ConstantSpecs::CS_CONST14 }.should.raise(NameError)
     end
   end
 
@@ -135,7 +135,7 @@ class << ConstantSpecs::ContainerB::ChildB
 
       -> do
         ConstantSpecs::ContainerB::ChildB::CS_CONST108
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
 
       module ConstantSpecs
         class << self
@@ -143,7 +143,7 @@ class << self
         end
       end
 
-      -> { ConstantSpecs::CS_CONST108 }.should raise_error(NameError)
+      -> { ConstantSpecs::CS_CONST108 }.should.raise(NameError)
     ensure
       ConstantSpecs::ContainerB::ChildB.singleton_class.send(:remove_const, :CS_CONST108)
       ConstantSpecs.singleton_class.send(:remove_const, :CS_CONST108)
@@ -175,7 +175,7 @@ class << self
   end
 
   it "raises a NameError if no constant is defined in the search path" do
-    -> { ConstantSpecs::ParentA::CS_CONSTX }.should raise_error(NameError)
+    -> { ConstantSpecs::ParentA::CS_CONSTX }.should.raise(NameError)
   end
 
   it "uses the module or class #name to craft the error message" do
@@ -189,7 +189,7 @@ def self.inspect
       end
     end
 
-    -> { mod::DOES_NOT_EXIST }.should raise_error(NameError, /uninitialized constant ModuleName::DOES_NOT_EXIST/)
+    -> { mod::DOES_NOT_EXIST }.should.raise(NameError, /uninitialized constant ModuleName::DOES_NOT_EXIST/)
   end
 
   it "uses the module or class #inspect to craft the error message if they are anonymous" do
@@ -203,7 +203,7 @@ def self.inspect
       end
     end
 
-    -> { mod::DOES_NOT_EXIST }.should raise_error(NameError, /uninitialized constant <unusable info>::DOES_NOT_EXIST/)
+    -> { mod::DOES_NOT_EXIST }.should.raise(NameError, /uninitialized constant <unusable info>::DOES_NOT_EXIST/)
   end
 
   it "sends #const_missing to the original class or module scope" do
@@ -215,10 +215,10 @@ def self.inspect
   end
 
   it "raises a TypeError if a non-class or non-module qualifier is given" do
-    -> { CS_CONST1::CS_CONST }.should raise_error(TypeError)
-    -> { 1::CS_CONST         }.should raise_error(TypeError)
-    -> { "mod"::CS_CONST     }.should raise_error(TypeError)
-    -> { false::CS_CONST     }.should raise_error(TypeError)
+    -> { CS_CONST1::CS_CONST }.should.raise(TypeError)
+    -> { 1::CS_CONST         }.should.raise(TypeError)
+    -> { "mod"::CS_CONST     }.should.raise(TypeError)
+    -> { false::CS_CONST     }.should.raise(TypeError)
   end
 end
 
@@ -264,7 +264,7 @@ def self.inspect
     end
 
     it "does not search the lexical scope of the caller" do
-      -> { ConstantSpecs::ClassA.const16 }.should raise_error(NameError)
+      -> { ConstantSpecs::ClassA.const16 }.should.raise(NameError)
     end
 
     it "searches the lexical scope of a block" do
@@ -279,7 +279,7 @@ def self.inspect
     it "does not search the lexical scope of qualifying modules" do
       -> do
         ConstantSpecs::ContainerA::ChildA.const23
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
   end
 
@@ -377,7 +377,7 @@ class << self
     it "does not search the lexical scope of the caller" do
       ConstantSpecs::ClassB::CS_CONST209 = :const209
 
-      -> { ConstantSpecs::ClassB.const209 }.should raise_error(NameError)
+      -> { ConstantSpecs::ClassB.const209 }.should.raise(NameError)
     ensure
       ConstantSpecs::ClassB.send(:remove_const, :CS_CONST209)
     end
@@ -426,14 +426,14 @@ class << self
 
       -> do
         ConstantSpecs::ContainerB::ChildB.const214
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     ensure
       ConstantSpecs::ContainerB.send(:remove_const, :CS_CONST214)
     end
   end
 
   it "raises a NameError if no constant is defined in the search path" do
-    -> { ConstantSpecs::ParentA.constx }.should raise_error(NameError)
+    -> { ConstantSpecs::ParentA.constx }.should.raise(NameError)
   end
 
   it "sends #const_missing to the original class or module scope" do
@@ -456,7 +456,7 @@ class << self
   it "uses its own namespace for nested modules" do
     a = ConstantSpecs::CS_SINGLETON3[0].x
     b = ConstantSpecs::CS_SINGLETON3[1].x
-    a.should_not equal(b)
+    a.should_not.equal?(b)
   end
 
   it "allows nested modules to have proper resolution" do
@@ -469,12 +469,12 @@ class << self
 describe "top-level constant lookup" do
   context "on a class" do
     it "does not search Object after searching other scopes" do
-      -> { String::Hash }.should raise_error(NameError)
+      -> { String::Hash }.should.raise(NameError)
     end
   end
 
   it "searches Object unsuccessfully when searches on a module" do
-    -> { Enumerable::Hash }.should raise_error(NameError)
+    -> { Enumerable::Hash }.should.raise(NameError)
   end
 end
 
@@ -488,7 +488,7 @@ class << self
       mod.const_set :Foo, false
     }.should complain(/already initialized constant/)
 
-    -> {mod::Foo}.should raise_error(NameError)
+    -> {mod::Foo}.should.raise(NameError)
   end
 
   it "sends #const_missing to the original class or module" do
@@ -506,19 +506,19 @@ def mod.const_missing(name)
     it "cannot be accessed from outside the module" do
       -> do
         ConstantVisibility::PrivConstModule::PRIVATE_CONSTANT_MODULE
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
 
     it "cannot be reopened as a module from scope where constant would be private" do
       -> do
         module ConstantVisibility::ModuleContainer::PrivateModule; end
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
 
     it "cannot be reopened as a class from scope where constant would be private" do
       -> do
         class ConstantVisibility::ModuleContainer::PrivateClass; end
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
 
     it "can be reopened as a module where constant is not private" do
@@ -554,7 +554,7 @@ module ::ConstantVisibility::ModuleContainer
     end
 
     it "can be accessed from the module itself" do
-      ConstantVisibility::PrivConstModule.private_constant_from_self.should be_true
+      ConstantVisibility::PrivConstModule.private_constant_from_self.should == true
     end
 
     it "is defined? from the module itself" do
@@ -562,7 +562,7 @@ module ::ConstantVisibility::ModuleContainer
     end
 
     it "can be accessed from lexical scope" do
-      ConstantVisibility::PrivConstModule::Nested.private_constant_from_scope.should be_true
+      ConstantVisibility::PrivConstModule::Nested.private_constant_from_scope.should == true
     end
 
     it "is defined? from lexical scope" do
@@ -570,20 +570,20 @@ module ::ConstantVisibility::ModuleContainer
     end
 
     it "can be accessed from classes that include the module" do
-      ConstantVisibility::ClassIncludingPrivConstModule.new.private_constant_from_include.should be_true
+      ConstantVisibility::ClassIncludingPrivConstModule.new.private_constant_from_include.should == true
     end
 
     it "can be accessed from modules that include the module" do
-      ConstantVisibility::ModuleIncludingPrivConstModule.private_constant_from_include.should be_true
+      ConstantVisibility::ModuleIncludingPrivConstModule.private_constant_from_include.should == true
     end
 
     it "raises a NameError when accessed directly from modules that include the module" do
       -> do
         ConstantVisibility::ModuleIncludingPrivConstModule.private_constant_self_from_include
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
       -> do
         ConstantVisibility::ModuleIncludingPrivConstModule.private_constant_named_from_include
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
 
     it "is defined? from classes that include the module" do
@@ -595,19 +595,19 @@ module ::ConstantVisibility::ModuleContainer
     it "cannot be accessed from outside the class" do
       -> do
         ConstantVisibility::PrivConstClass::PRIVATE_CONSTANT_CLASS
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
 
     it "cannot be reopened as a module" do
       -> do
         module ConstantVisibility::ClassContainer::PrivateModule; end
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
 
     it "cannot be reopened as a class" do
       -> do
         class ConstantVisibility::ClassContainer::PrivateClass; end
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
 
     it "can be reopened as a module where constant is not private" do
@@ -643,7 +643,7 @@ class ::ConstantVisibility::ClassContainer
     end
 
     it "can be accessed from the class itself" do
-      ConstantVisibility::PrivConstClass.private_constant_from_self.should be_true
+      ConstantVisibility::PrivConstClass.private_constant_from_self.should == true
     end
 
     it "is defined? from the class itself" do
@@ -651,7 +651,7 @@ class ::ConstantVisibility::ClassContainer
     end
 
     it "can be accessed from lexical scope" do
-      ConstantVisibility::PrivConstClass::Nested.private_constant_from_scope.should be_true
+      ConstantVisibility::PrivConstClass::Nested.private_constant_from_scope.should == true
     end
 
     it "is defined? from lexical scope" do
@@ -659,7 +659,7 @@ class ::ConstantVisibility::ClassContainer
     end
 
     it "can be accessed from subclasses" do
-      ConstantVisibility::PrivConstClassChild.new.private_constant_from_subclass.should be_true
+      ConstantVisibility::PrivConstClassChild.new.private_constant_from_subclass.should == true
     end
 
     it "is defined? from subclasses" do
@@ -671,7 +671,7 @@ class ::ConstantVisibility::ClassContainer
     it "cannot be accessed using ::Const form" do
       -> do
         ::PRIVATE_CONSTANT_IN_OBJECT
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
     end
 
     it "is not defined? using ::Const form" do
@@ -691,14 +691,14 @@ class ::ConstantVisibility::ClassContainer
     it "has :receiver and :name attributes" do
       -> do
         ConstantVisibility::PrivConstClass::PRIVATE_CONSTANT_CLASS
-      end.should raise_error(NameError) {|e|
+      end.should.raise(NameError) {|e|
         e.receiver.should == ConstantVisibility::PrivConstClass
         e.name.should == :PRIVATE_CONSTANT_CLASS
       }
 
       -> do
         ConstantVisibility::PrivConstModule::PRIVATE_CONSTANT_MODULE
-      end.should raise_error(NameError) {|e|
+      end.should.raise(NameError) {|e|
         e.receiver.should == ConstantVisibility::PrivConstModule
         e.name.should == :PRIVATE_CONSTANT_MODULE
       }
@@ -707,14 +707,14 @@ class ::ConstantVisibility::ClassContainer
     it "has the defined class as the :name attribute" do
       -> do
         ConstantVisibility::PrivConstClassChild::PRIVATE_CONSTANT_CLASS
-      end.should raise_error(NameError) {|e|
+      end.should.raise(NameError) {|e|
         e.receiver.should == ConstantVisibility::PrivConstClass
         e.name.should == :PRIVATE_CONSTANT_CLASS
       }
 
       -> do
         ConstantVisibility::ClassIncludingPrivConstModule::PRIVATE_CONSTANT_MODULE
-      end.should raise_error(NameError) {|e|
+      end.should.raise(NameError) {|e|
         e.receiver.should == ConstantVisibility::PrivConstModule
         e.name.should == :PRIVATE_CONSTANT_MODULE
       }
@@ -783,7 +783,7 @@ class ::ConstantVisibility::ClassContainer
   it 'does not allow not ASCII characters that cannot be upcased or lowercased at the beginning' do
     -> do
       Module.new.const_set("થBB", 1)
-    end.should raise_error(NameError, /wrong constant name/)
+    end.should.raise(NameError, /wrong constant name/)
   end
 
   it 'allows not ASCII upcased characters at the beginning' do
@@ -803,7 +803,7 @@ def test
             B = 1
           end
         CODE
-      end.should raise_error(SyntaxError, /dynamic constant assignment/)
+      end.should.raise(SyntaxError, /dynamic constant assignment/)
     end
   end
 end
diff --git a/spec/ruby/language/def_spec.rb b/spec/ruby/language/def_spec.rb
index 0cf1790791a..82c89a0d081 100644
--- a/spec/ruby/language/def_spec.rb
+++ b/spec/ruby/language/def_spec.rb
@@ -14,11 +14,11 @@ def barfoo; 200; end
 
 describe "Defining a method at the top-level" do
   it "defines it on Object with private visibility by default" do
-    Object.should have_private_instance_method(:some_toplevel_method, false)
+    Object.private_instance_methods(false).should.include?(:some_toplevel_method)
   end
 
   it "defines it on Object with public visibility after calling public" do
-    Object.should have_public_instance_method(:public_toplevel_method, false)
+    Object.public_instance_methods(false).should.include?(:public_toplevel_method)
   end
 end
 
@@ -28,7 +28,7 @@ class DefInitializeSpec
       def initialize
       end
     end
-    DefInitializeSpec.should have_private_instance_method(:initialize, false)
+    DefInitializeSpec.private_instance_methods(false).should.include?(:initialize)
   end
 end
 
@@ -38,7 +38,7 @@ class DefInitializeCopySpec
       def initialize_copy
       end
     end
-    DefInitializeCopySpec.should have_private_instance_method(:initialize_copy, false)
+    DefInitializeCopySpec.private_instance_methods(false).should.include?(:initialize_copy)
   end
 end
 
@@ -48,7 +48,7 @@ class DefInitializeDupSpec
       def initialize_dup
       end
     end
-    DefInitializeDupSpec.should have_private_instance_method(:initialize_dup, false)
+    DefInitializeDupSpec.private_instance_methods(false).should.include?(:initialize_dup)
   end
 end
 
@@ -58,7 +58,7 @@ class DefInitializeCloneSpec
       def initialize_clone
       end
     end
-    DefInitializeCloneSpec.should have_private_instance_method(:initialize_clone, false)
+    DefInitializeCloneSpec.private_instance_methods(false).should.include?(:initialize_clone)
   end
 end
 
@@ -68,7 +68,7 @@ class DefRespondToMissingPSpec
       def respond_to_missing?
       end
     end
-    DefRespondToMissingPSpec.should have_private_instance_method(:respond_to_missing?, false)
+    DefRespondToMissingPSpec.private_instance_methods(false).should.include?(:respond_to_missing?)
   end
 end
 
@@ -82,12 +82,12 @@ def respond_to_missing?
 describe "An instance method" do
   it "raises an error with too few arguments" do
     def foo(a, b); end
-    -> { foo 1 }.should raise_error(ArgumentError, 'wrong number of arguments (given 1, expected 2)')
+    -> { foo 1 }.should.raise(ArgumentError, 'wrong number of arguments (given 1, expected 2)')
   end
 
   it "raises an error with too many arguments" do
     def foo(a); end
-    -> { foo 1, 2 }.should raise_error(ArgumentError, 'wrong number of arguments (given 2, expected 1)')
+    -> { foo 1, 2 }.should.raise(ArgumentError, 'wrong number of arguments (given 2, expected 1)')
   end
 
   it "raises FrozenError with the correct class name" do
@@ -96,7 +96,7 @@ def foo(a); end
         self.freeze
         def foo; end
       end
-    }.should raise_error(FrozenError) { |e|
+    }.should.raise(FrozenError) { |e|
       msg_class = ruby_version_is("4.0") ? "Module" : "module"
       e.message.should == "can't modify frozen #{msg_class}: #{e.receiver}"
     }
@@ -106,7 +106,7 @@ def foo; end
         self.freeze
         def foo; end
       end
-    }.should raise_error(FrozenError){ |e|
+    }.should.raise(FrozenError){ |e|
       msg_class = ruby_version_is("4.0") ? "Class" : "class"
       e.message.should == "can't modify frozen #{msg_class}: #{e.receiver}"
     }
@@ -135,12 +135,12 @@ def foo(a, b, c, d, e, *f); [a, b, c, d, e, f]; end
   end
 
   it "allows only a single * argument" do
-    -> { eval 'def foo(a, *b, *c); end' }.should raise_error(SyntaxError)
+    -> { eval 'def foo(a, *b, *c); end' }.should.raise(SyntaxError)
   end
 
   it "requires the presence of any arguments that precede the *" do
     def foo(a, b, *c); end
-    -> { foo 1 }.should raise_error(ArgumentError, 'wrong number of arguments (given 1, expected 2+)')
+    -> { foo 1 }.should.raise(ArgumentError, 'wrong number of arguments (given 1, expected 2+)')
   end
 end
 
@@ -173,7 +173,7 @@ def foo(a = 1, *b)
     def foo(a, b = 2)
       [a,b]
     end
-    -> { foo }.should raise_error(ArgumentError, 'wrong number of arguments (given 0, expected 1..2)')
+    -> { foo }.should.raise(ArgumentError, 'wrong number of arguments (given 0, expected 1..2)')
     foo(1).should == [1, 2]
   end
 
@@ -181,7 +181,7 @@ def foo(a, b = 2)
     def foo(a, b = 2, *c)
       [a,b,c]
     end
-    -> { foo }.should raise_error(ArgumentError, 'wrong number of arguments (given 0, expected 1+)')
+    -> { foo }.should.raise(ArgumentError, 'wrong number of arguments (given 0, expected 1+)')
     foo(1).should == [1,2,[]]
   end
 
@@ -205,7 +205,7 @@ def foo(a, b = 2, *args)
         eval "def foo(bar = bar)
           bar
         end"
-      }.should raise_error(SyntaxError)
+      }.should.raise(SyntaxError)
     end
   end
 
@@ -279,27 +279,27 @@ def obj.==(other)
   it "raises FrozenError if frozen" do
     obj = Object.new
     obj.freeze
-    -> { def obj.foo; end }.should raise_error(FrozenError)
+    -> { def obj.foo; end }.should.raise(FrozenError)
   end
 
   it "raises FrozenError with the correct class name" do
     obj = Object.new
     obj.freeze
     msg_class = ruby_version_is("4.0") ? "Object" : "object"
-    -> { def obj.foo; end }.should raise_error(FrozenError, "can't modify frozen #{msg_class}: #{obj}")
+    -> { def obj.foo; end }.should.raise(FrozenError, "can't modify frozen #{msg_class}: #{obj}")
 
     obj = Object.new
     c = obj.singleton_class
     c.singleton_class.freeze
-    -> { def c.foo; end }.should raise_error(FrozenError, "can't modify frozen Class: #{c}")
+    -> { def c.foo; end }.should.raise(FrozenError, "can't modify frozen Class: #{c}")
 
     c = Class.new
     c.freeze
-    -> { def c.foo; end }.should raise_error(FrozenError, "can't modify frozen Class: #{c}")
+    -> { def c.foo; end }.should.raise(FrozenError, "can't modify frozen Class: #{c}")
 
     m = Module.new
     m.freeze
-    -> { def m.foo; end }.should raise_error(FrozenError, "can't modify frozen Module: #{m}")
+    -> { def m.foo; end }.should.raise(FrozenError, "can't modify frozen Module: #{m}")
   end
 end
 
@@ -434,7 +434,7 @@ def a_class_method;self;end
     end
 
     DefSpecSingleton.a_class_method.should == DefSpecSingleton
-    -> { Object.a_class_method }.should raise_error(NoMethodError)
+    -> { Object.a_class_method }.should.raise(NoMethodError)
   end
 
   it "can create a singleton method" do
@@ -444,7 +444,7 @@ def a_singleton_method;self;end
     end
 
     obj.a_singleton_method.should == obj
-    -> { Object.new.a_singleton_method }.should raise_error(NoMethodError)
+    -> { Object.new.a_singleton_method }.should.raise(NoMethodError)
   end
 
   it "raises FrozenError if frozen" do
@@ -452,7 +452,7 @@ def a_singleton_method;self;end
     obj.freeze
 
     class << obj
-      -> { def foo; end }.should raise_error(FrozenError)
+      -> { def foo; end }.should.raise(FrozenError)
     end
   end
 end
@@ -473,7 +473,7 @@ def an_instance_method;self;end
     other = DefSpecNested.new
     other.an_instance_method.should == other
 
-    DefSpecNested.should have_instance_method(:an_instance_method)
+    DefSpecNested.should.method_defined?(:an_instance_method, false)
   end
 
   it "creates a class method when evaluated in a class method" do
@@ -488,11 +488,11 @@ def a_class_method;self;end
       end
     end
 
-    -> { DefSpecNested.a_class_method }.should raise_error(NoMethodError)
+    -> { DefSpecNested.a_class_method }.should.raise(NoMethodError)
     DefSpecNested.create_class_method.should == DefSpecNested
     DefSpecNested.a_class_method.should == DefSpecNested
-    -> { Object.a_class_method }.should raise_error(NoMethodError)
-    -> { DefSpecNested.new.a_class_method }.should raise_error(NoMethodError)
+    -> { Object.a_class_method }.should.raise(NoMethodError)
+    -> { DefSpecNested.new.a_class_method }.should.raise(NoMethodError)
   end
 
   it "creates a singleton method when evaluated in the metaclass of an instance" do
@@ -510,7 +510,7 @@ def a_singleton_method;self;end
     obj.a_singleton_method.should == obj
 
     other = DefSpecNested.new
-    -> { other.a_singleton_method }.should raise_error(NoMethodError)
+    -> { other.a_singleton_method }.should.raise(NoMethodError)
   end
 
   it "creates a method in the surrounding context when evaluated in a def expr.method" do
@@ -522,8 +522,8 @@ def inherited_method;self;end
     end
 
     DefSpecNested::TARGET.defs_method
-    DefSpecNested.should have_instance_method :inherited_method
-    DefSpecNested::TARGET.should_not have_method :inherited_method
+    DefSpecNested.should.method_defined?(:inherited_method, false)
+    DefSpecNested::TARGET.should_not.respond_to? :inherited_method
 
     obj = DefSpecNested.new
     obj.inherited_method.should == obj
@@ -545,11 +545,11 @@ def body_method; end
     obj = DefSpecNested::OBJ
     obj.create_method_in_instance_eval
 
-    obj.should have_method :arg_method
-    obj.should have_method :body_method
+    obj.should.respond_to? :arg_method
+    obj.should.respond_to? :body_method
 
-    DefSpecNested.should_not have_instance_method :arg_method
-    DefSpecNested.should_not have_instance_method :body_method
+    DefSpecNested.should_not.method_defined? :arg_method
+    DefSpecNested.should_not.method_defined? :body_method
   ensure
     DefSpecNested.send(:remove_const, :OBJ)
   end
@@ -569,7 +569,7 @@ def new_def
 
     cls.new.new_def.should == 1
 
-    -> { Object.new.new_def }.should raise_error(NoMethodError)
+    -> { Object.new.new_def }.should.raise(NoMethodError)
   end
 end
 
@@ -585,18 +585,18 @@ def new_def
     end
 
     obj = cls.new
-    -> { obj.do_def }.should raise_error(NoMethodError, /private/)
+    -> { obj.do_def }.should.raise(NoMethodError, /private/)
     obj.send :do_def
     obj.new_def.should == 1
 
     cls.new.new_def.should == 1
 
-    -> { Object.new.new_def }.should raise_error(NoMethodError)
+    -> { Object.new.new_def }.should.raise(NoMethodError)
   end
 
   it "at the toplevel" do
     obj = Object.new
-    -> { obj.toplevel_define_other_method }.should raise_error(NoMethodError, /private/)
+    -> { obj.toplevel_define_other_method }.should.raise(NoMethodError, /private/)
     toplevel_define_other_method
     nested_method_in_toplevel_method.should == 42
 
@@ -613,7 +613,7 @@ def an_instance_eval_method;self;end
     obj.an_instance_eval_method.should == obj
 
     other = Object.new
-    -> { other.an_instance_eval_method }.should raise_error(NoMethodError)
+    -> { other.an_instance_eval_method }.should.raise(NoMethodError)
   end
 
   it "creates a singleton method when evaluated inside a metaclass" do
@@ -626,7 +626,7 @@ def a_metaclass_eval_method;self;end
     obj.a_metaclass_eval_method.should == obj
 
     other = Object.new
-    -> { other.a_metaclass_eval_method }.should raise_error(NoMethodError)
+    -> { other.a_metaclass_eval_method }.should.raise(NoMethodError)
   end
 
   it "creates a class method when the receiver is a class" do
@@ -635,7 +635,7 @@ def an_instance_eval_class_method;self;end
     end
 
     DefSpecNested.an_instance_eval_class_method.should == DefSpecNested
-    -> { Object.an_instance_eval_class_method }.should raise_error(NoMethodError)
+    -> { Object.an_instance_eval_class_method }.should.raise(NoMethodError)
   end
 
   it "creates a class method when the receiver is an anonymous class" do
@@ -647,7 +647,7 @@ def klass_method
     end
 
     m.klass_method.should == :test
-    -> { Object.klass_method }.should raise_error(NoMethodError)
+    -> { Object.klass_method }.should.raise(NoMethodError)
   end
 
   it "creates a class method when instance_eval is within class" do
@@ -660,7 +660,7 @@ def klass_method
     end
 
     m.klass_method.should == :test
-    -> { Object.klass_method }.should raise_error(NoMethodError)
+    -> { Object.klass_method }.should.raise(NoMethodError)
   end
 end
 
@@ -673,7 +673,7 @@ def an_instance_exec_class_method; @stuff; end
     end
 
     DefSpecNested.an_instance_exec_class_method.should == 1
-    -> { Object.an_instance_exec_class_method }.should raise_error(NoMethodError)
+    -> { Object.an_instance_exec_class_method }.should.raise(NoMethodError)
   end
 
   it "creates a class method when the receiver is an anonymous class" do
@@ -687,7 +687,7 @@ def klass_method
     end
 
     m.klass_method.should == 1
-    -> { Object.klass_method }.should raise_error(NoMethodError)
+    -> { Object.klass_method }.should.raise(NoMethodError)
   end
 
   it "creates a class method when instance_exec is within class" do
@@ -702,7 +702,7 @@ def klass_method
     end
 
     m.klass_method.should == 2
-    -> { Object.klass_method }.should raise_error(NoMethodError)
+    -> { Object.klass_method }.should.raise(NoMethodError)
   end
 end
 
@@ -722,7 +722,7 @@ def eval_instance_method
     other = DefSpecNested.new
     other.an_eval_instance_method.should == other
 
-    -> { Object.new.an_eval_instance_method }.should raise_error(NoMethodError)
+    -> { Object.new.an_eval_instance_method }.should.raise(NoMethodError)
   end
 
   it "creates a class method" do
@@ -738,8 +738,8 @@ def eval_class_method
     DefSpecNestedB.eval_class_method.should == DefSpecNestedB
     DefSpecNestedB.an_eval_class_method.should == DefSpecNestedB
 
-    -> { Object.an_eval_class_method }.should raise_error(NoMethodError)
-    -> { DefSpecNestedB.new.an_eval_class_method}.should raise_error(NoMethodError)
+    -> { Object.an_eval_class_method }.should.raise(NoMethodError)
+    -> { DefSpecNestedB.new.an_eval_class_method}.should.raise(NoMethodError)
   end
 
   it "creates a singleton method" do
@@ -757,7 +757,7 @@ class << self
     obj.an_eval_singleton_method.should == obj
 
     other = DefSpecNested.new
-    -> { other.an_eval_singleton_method }.should raise_error(NoMethodError)
+    -> { other.an_eval_singleton_method }.should.raise(NoMethodError)
   end
 end
 
@@ -768,8 +768,8 @@ def foo(a=b=c={})
   it "assigns them all the same object by default" do
     foo.should == [{},{},{}]
     a, b, c = foo
-    a.should eql(b)
-    a.should eql(c)
+    a.should.eql?(b)
+    a.should.eql?(c)
   end
 
   it "allows the first argument to be given, and sets the rest to null" do
@@ -779,11 +779,11 @@ def foo(a=b=c={})
   it "assigns the parameters different objects across different default calls" do
     a, _b, _c = foo
     d, _e, _f = foo
-    a.should_not equal(d)
+    a.should_not.equal?(d)
   end
 
   it "only allows overriding the default value of the first such parameter in each set" do
-    -> { foo(1,2) }.should raise_error(ArgumentError, 'wrong number of arguments (given 2, expected 0..1)')
+    -> { foo(1,2) }.should.raise(ArgumentError, 'wrong number of arguments (given 2, expected 0..1)')
   end
 
   def bar(a=b=c=1,d=2)
@@ -794,7 +794,7 @@ def bar(a=b=c=1,d=2)
     bar.should == [1,1,1,2]
     bar(3).should == [3,nil,nil,2]
     bar(3,4).should == [3,nil,nil,4]
-    -> { bar(3,4,5) }.should raise_error(ArgumentError, 'wrong number of arguments (given 3, expected 0..2)')
+    -> { bar(3,4,5) }.should.raise(ArgumentError, 'wrong number of arguments (given 3, expected 0..2)')
   end
 end
 
@@ -809,7 +809,7 @@ def some_method; end
         }.call
       end
 
-      DefSpecsLambdaVisibility.should have_private_instance_method("some_method")
+      DefSpecsLambdaVisibility.private_instance_methods(false).should.include?(:some_method)
     end
   end
 end
diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb
index 80ad1818b11..3fd611d09e6 100644
--- a/spec/ruby/language/defined_spec.rb
+++ b/spec/ruby/language/defined_spec.rb
@@ -70,7 +70,7 @@
     end
 
     it "returns nil if the method is not defined" do
-      defined?(defined_specs_undefined_method).should be_nil
+      defined?(defined_specs_undefined_method).should == nil
     end
 
     it "returns 'method' if the method is defined and private" do
@@ -90,23 +90,23 @@
     end
 
     it "returns nil if the method is private" do
-      defined?(Object.print).should be_nil
+      defined?(Object.print).should == nil
     end
 
     it "returns nil if the method is protected" do
-      defined?(DefinedSpecs::Basic.new.protected_method).should be_nil
+      defined?(DefinedSpecs::Basic.new.protected_method).should == nil
     end
 
     it "returns nil if the method is not defined" do
-      defined?(Kernel.defined_specs_undefined_method).should be_nil
+      defined?(Kernel.defined_specs_undefined_method).should == nil
     end
 
     it "returns nil if the class is not defined" do
-      defined?(DefinedSpecsUndefined.puts).should be_nil
+      defined?(DefinedSpecsUndefined.puts).should == nil
     end
 
     it "returns nil if the subclass is not defined" do
-      defined?(DefinedSpecs::Undefined.puts).should be_nil
+      defined?(DefinedSpecs::Undefined.puts).should == nil
     end
   end
 
@@ -123,11 +123,11 @@
 
     it "returns nil if the method is not defined" do
       obj = DefinedSpecs::Basic.new
-      defined?(obj.an_undefined_method).should be_nil
+      defined?(obj.an_undefined_method).should == nil
     end
 
     it "returns nil if the variable does not exist" do
-      defined?(nonexistent_local_variable.some_method).should be_nil
+      defined?(nonexistent_local_variable.some_method).should == nil
     end
 
     it "calls #respond_to_missing?" do
@@ -145,11 +145,11 @@
 
     it "returns nil if the method is not defined" do
       @defined_specs_obj = DefinedSpecs::Basic.new
-      defined?(@defined_specs_obj.an_undefined_method).should be_nil
+      defined?(@defined_specs_obj.an_undefined_method).should == nil
     end
 
     it "returns nil if the variable does not exist" do
-      defined?(@nonexistent_instance_variable.some_method).should be_nil
+      defined?(@nonexistent_instance_variable.some_method).should == nil
     end
   end
 
@@ -161,22 +161,22 @@
 
     it "returns nil if the method is not defined" do
       $defined_specs_obj = DefinedSpecs::Basic.new
-      defined?($defined_specs_obj.an_undefined_method).should be_nil
+      defined?($defined_specs_obj.an_undefined_method).should == nil
     end
 
     it "returns nil if the variable does not exist" do
-      defined?($nonexistent_global_variable.some_method).should be_nil
+      defined?($nonexistent_global_variable.some_method).should == nil
     end
   end
 
   describe "having a method call as a receiver" do
     it "returns nil if evaluating the receiver raises an exception" do
-      defined?(DefinedSpecs.exception_method / 2).should be_nil
+      defined?(DefinedSpecs.exception_method / 2).should == nil
       ScratchPad.recorded.should == :defined_specs_exception
     end
 
     it "returns nil if the method is not defined on the object the receiver returns" do
-      defined?(DefinedSpecs.side_effects / 2).should be_nil
+      defined?(DefinedSpecs.side_effects / 2).should == nil
       ScratchPad.recorded.should == :defined_specs_side_effects
     end
 
@@ -403,15 +403,15 @@
   end
 
   it "returns nil for an expression with == and an undefined method" do
-    defined?(defined_specs_undefined_method == 2).should be_nil
+    defined?(defined_specs_undefined_method == 2).should == nil
   end
 
   it "returns nil for an expression with != and an undefined method" do
-    defined?(defined_specs_undefined_method != 2).should be_nil
+    defined?(defined_specs_undefined_method != 2).should == nil
   end
 
   it "returns nil for an expression with !~ and an undefined method" do
-    defined?(defined_specs_undefined_method !~ 2).should be_nil
+    defined?(defined_specs_undefined_method !~ 2).should == nil
   end
 
   it "returns 'method' for an expression with '=='" do
@@ -431,25 +431,25 @@
 
   describe "with logical connectives" do
     it "returns nil for an expression with '!' and an undefined method" do
-      defined?(!defined_specs_undefined_method).should be_nil
+      defined?(!defined_specs_undefined_method).should == nil
     end
 
     it "returns nil for an expression with '!' and an unset class variable" do
       @result = eval("class singleton_class::A; defined?(!@@doesnt_exist) end", binding, __FILE__, __LINE__)
-      @result.should be_nil
+      @result.should == nil
     end
 
     it "returns nil for an expression with 'not' and an undefined method" do
-      defined?(not defined_specs_undefined_method).should be_nil
+      defined?(not defined_specs_undefined_method).should == nil
     end
 
     it "returns nil for an expression with 'not' and an unset class variable" do
       @result = eval("class singleton_class::A; defined?(not @@doesnt_exist) end", binding, __FILE__, __LINE__)
-      @result.should be_nil
+      @result.should == nil
     end
 
     it "does not propagate an exception raised by a method in a 'not' expression" do
-      defined?(not DefinedSpecs.exception_method).should be_nil
+      defined?(not DefinedSpecs.exception_method).should == nil
       ScratchPad.recorded.should == :defined_specs_exception
     end
 
@@ -488,11 +488,11 @@
     end
 
     it "returns nil for an expression with '!' and an unset global variable" do
-      defined?(!$defined_specs_undefined_global_variable).should be_nil
+      defined?(!$defined_specs_undefined_global_variable).should == nil
     end
 
     it "returns nil for an expression with '!' and an unset instance variable" do
-      defined?(!@defined_specs_undefined_instance_variable).should be_nil
+      defined?(!@defined_specs_undefined_instance_variable).should == nil
     end
 
     it "returns 'method' for a 'not' expression with a method" do
@@ -505,11 +505,11 @@
     end
 
     it "returns nil for an expression with 'not' and an unset global variable" do
-      defined?(not $defined_specs_undefined_global_variable).should be_nil
+      defined?(not $defined_specs_undefined_global_variable).should == nil
     end
 
     it "returns nil for an expression with 'not' and an unset instance variable" do
-      defined?(not @defined_specs_undefined_instance_variable).should be_nil
+      defined?(not @defined_specs_undefined_instance_variable).should == nil
     end
 
     it "returns 'expression' for an expression with '&&/and' and an undefined method" do
@@ -524,12 +524,12 @@
 
     it "does not call a method in an '&&' expression and returns 'expression'" do
       defined?(DefinedSpecs.side_effects && true).should == "expression"
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "does not call a method in an 'and' expression and returns 'expression'" do
       defined?(DefinedSpecs.side_effects and true).should == "expression"
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "returns 'expression' for an expression with '||/or' and an undefined method" do
@@ -544,12 +544,12 @@
 
     it "does not call a method in an '||' expression and returns 'expression'" do
       defined?(DefinedSpecs.side_effects || true).should == "expression"
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
 
     it "does not call a method in an 'or' expression and returns 'expression'" do
       defined?(DefinedSpecs.side_effects or true).should == "expression"
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
   end
 
@@ -572,7 +572,7 @@
 
     it "does not call the method in the String" do
       defined?("garble #{DefinedSpecs.dynamic_string}").should == "expression"
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
   end
 
@@ -591,7 +591,7 @@
 
     it "does not call the method in the Regexp" do
       defined?(/garble #{DefinedSpecs.dynamic_string}/).should == "expression"
-      ScratchPad.recorded.should be_nil
+      ScratchPad.recorded.should == nil
     end
   end
 
@@ -640,11 +640,11 @@
   end
 
   it "returns nil for an instance variable that has not been read" do
-    DefinedSpecs::Basic.new.instance_variable_undefined.should be_nil
+    DefinedSpecs::Basic.new.instance_variable_undefined.should == nil
   end
 
   it "returns nil for an instance variable that has been read but not assigned to" do
-    DefinedSpecs::Basic.new.instance_variable_read.should be_nil
+    DefinedSpecs::Basic.new.instance_variable_read.should == nil
   end
 
   it "returns 'instance-variable' for an instance variable that has been assigned" do
@@ -658,11 +658,11 @@
   end
 
   it "returns nil for a global variable that has not been read" do
-    DefinedSpecs::Basic.new.global_variable_undefined.should be_nil
+    DefinedSpecs::Basic.new.global_variable_undefined.should == nil
   end
 
   it "returns nil for a global variable that has been read but not assigned to" do
-    DefinedSpecs::Basic.new.global_variable_read.should be_nil
+    DefinedSpecs::Basic.new.global_variable_read.should == nil
   end
 
   it "returns 'global-variable' for a global variable that has been assigned nil" do
@@ -694,27 +694,27 @@
     end
 
     it "returns nil for $&" do
-      defined?($&).should be_nil
+      defined?($&).should == nil
     end
 
     it "returns nil for $`" do
-      defined?($`).should be_nil
+      defined?($`).should == nil
     end
 
     it "returns nil for $'" do
-      defined?($').should be_nil
+      defined?($').should == nil
     end
 
     it "returns nil for $+" do
-      defined?($+).should be_nil
+      defined?($+).should == nil
     end
 
     it "returns nil for any last match global" do
-      defined?($1).should be_nil
-      defined?($4).should be_nil
-      defined?($7).should be_nil
-      defined?($10).should be_nil
-      defined?($200).should be_nil
+      defined?($1).should == nil
+      defined?($4).should == nil
+      defined?($7).should == nil
+      defined?($10).should == nil
+      defined?($200).should == nil
     end
   end
 
@@ -749,10 +749,10 @@
     end
 
     it "returns nil for non-captures" do
-      defined?($4).should be_nil
-      defined?($7).should be_nil
-      defined?($10).should be_nil
-      defined?($200).should be_nil
+      defined?($4).should == nil
+      defined?($7).should == nil
+      defined?($10).should == nil
+      defined?($200).should == nil
     end
   end
 
@@ -766,27 +766,27 @@
     end
 
     it "returns nil for $&" do
-      defined?($&).should be_nil
+      defined?($&).should == nil
     end
 
     it "returns nil for $`" do
-      defined?($`).should be_nil
+      defined?($`).should == nil
     end
 
     it "returns nil for $'" do
-      defined?($').should be_nil
+      defined?($').should == nil
     end
 
     it "returns nil for $+" do
-      defined?($+).should be_nil
+      defined?($+).should == nil
     end
 
     it "returns nil for any last match global" do
-      defined?($1).should be_nil
-      defined?($4).should be_nil
-      defined?($7).should be_nil
-      defined?($10).should be_nil
-      defined?($200).should be_nil
+      defined?($1).should == nil
+      defined?($4).should == nil
+      defined?($7).should == nil
+      defined?($10).should == nil
+      defined?($200).should == nil
     end
   end
 
@@ -821,10 +821,10 @@
     end
 
     it "returns nil for non-captures" do
-      defined?($4).should be_nil
-      defined?($7).should be_nil
-      defined?($10).should be_nil
-      defined?($200).should be_nil
+      defined?($4).should == nil
+      defined?($7).should == nil
+      defined?($10).should == nil
+      defined?($200).should == nil
     end
   end
   it "returns 'global-variable' for a global variable that has been assigned" do
@@ -832,7 +832,7 @@
   end
 
   it "returns nil for a class variable that has not been read" do
-    DefinedSpecs::Basic.new.class_variable_undefined.should be_nil
+    DefinedSpecs::Basic.new.class_variable_undefined.should == nil
   end
 
   # There is no spec for a class variable that is read before being assigned
@@ -859,12 +859,12 @@
   end
 
   it "returns nil when the constant is not defined" do
-    defined?(DefinedSpecsUndefined).should be_nil
+    defined?(DefinedSpecsUndefined).should == nil
   end
 
   it "does not call Object.const_missing if the constant is not defined" do
     Object.should_not_receive(:const_missing)
-    defined?(DefinedSpecsUndefined).should be_nil
+    defined?(DefinedSpecsUndefined).should == nil
   end
 
   it "returns 'constant' for an included module" do
@@ -882,12 +882,12 @@
   end
 
   it "returns nil if the constant is not defined" do
-    defined?(::DefinedSpecsUndefined).should be_nil
+    defined?(::DefinedSpecsUndefined).should == nil
   end
 
   it "does not call Object.const_missing if the constant is not defined" do
     Object.should_not_receive(:const_missing)
-    defined?(::DefinedSpecsUndefined).should be_nil
+    defined?(::DefinedSpecsUndefined).should == nil
   end
 end
 
@@ -897,37 +897,37 @@
   end
 
   it "returns nil when the scoped constant is not defined" do
-    defined?(DefinedSpecs::Undefined).should be_nil
+    defined?(DefinedSpecs::Undefined).should == nil
   end
 
   it "returns nil when the constant is not defined and the outer module implements .const_missing" do
-    defined?(DefinedSpecs::ModuleWithConstMissing::Undefined).should be_nil
+    defined?(DefinedSpecs::ModuleWithConstMissing::Undefined).should == nil
   end
 
   it "does not call .const_missing if the constant is not defined" do
     DefinedSpecs.should_not_receive(:const_missing)
-    defined?(DefinedSpecs::UnknownChild).should be_nil
+    defined?(DefinedSpecs::UnknownChild).should == nil
   end
 
   it "returns nil when an undefined constant is scoped to a defined constant" do
-    defined?(DefinedSpecs::Child::Undefined).should be_nil
+    defined?(DefinedSpecs::Child::Undefined).should == nil
   end
 
   it "returns nil when a constant is scoped to an undefined constant" do
     Object.should_not_receive(:const_missing)
-    defined?(Undefined::Object).should be_nil
+    defined?(Undefined::Object).should == nil
   end
 
   it "returns nil when the undefined constant is scoped to an undefined constant" do
-    defined?(DefinedSpecs::Undefined::Undefined).should be_nil
+    defined?(DefinedSpecs::Undefined::Undefined).should == nil
   end
 
   it "returns nil when a constant is defined on top-level but not on the module" do
-    defined?(DefinedSpecs::String).should be_nil
+    defined?(DefinedSpecs::String).should == nil
   end
 
   it "returns nil when a constant is defined on top-level but not on the class" do
-    defined?(DefinedSpecs::Basic::String).should be_nil
+    defined?(DefinedSpecs::Basic::String).should == nil
   end
 
   it "returns 'constant' if the scoped-scoped constant is defined" do
@@ -941,15 +941,15 @@
   end
 
   it "returns nil when the scoped constant is not defined" do
-    defined?(::DefinedSpecs::Undefined).should be_nil
+    defined?(::DefinedSpecs::Undefined).should == nil
   end
 
   it "returns nil when an undefined constant is scoped to a defined constant" do
-    defined?(::DefinedSpecs::Child::Undefined).should be_nil
+    defined?(::DefinedSpecs::Child::Undefined).should == nil
   end
 
   it "returns nil when the undefined constant is scoped to an undefined constant" do
-    defined?(::DefinedSpecs::Undefined::Undefined).should be_nil
+    defined?(::DefinedSpecs::Undefined::Undefined).should == nil
   end
 
   it "returns 'constant' if the scoped-scoped constant is defined" do
@@ -959,7 +959,7 @@
 
 describe "The defined? keyword for a self-send method call scoped constant" do
   it "returns nil if the constant is not defined in the scope of the method's value" do
-    defined?(defined_specs_method::Undefined).should be_nil
+    defined?(defined_specs_method::Undefined).should == nil
   end
 
   it "returns 'constant' if the constant is defined in the scope of the method's value" do
@@ -967,11 +967,11 @@
   end
 
   it "returns nil if the last constant is not defined in the scope chain" do
-    defined?(defined_specs_method::Basic::Undefined).should be_nil
+    defined?(defined_specs_method::Basic::Undefined).should == nil
   end
 
   it "returns nil if the middle constant is not defined in the scope chain" do
-    defined?(defined_specs_method::Undefined::Undefined).should be_nil
+    defined?(defined_specs_method::Undefined::Undefined).should == nil
   end
 
   it "returns 'constant' if all the constants in the scope chain are defined" do
@@ -981,7 +981,7 @@
 
 describe "The defined? keyword for a receiver method call scoped constant" do
   it "returns nil if the constant is not defined in the scope of the method's value" do
-    defined?(defined_specs_receiver.defined_method::Undefined).should be_nil
+    defined?(defined_specs_receiver.defined_method::Undefined).should == nil
   end
 
   it "returns 'constant' if the constant is defined in the scope of the method's value" do
@@ -989,11 +989,11 @@
   end
 
   it "returns nil if the last constant is not defined in the scope chain" do
-    defined?(defined_specs_receiver.defined_method::Basic::Undefined).should be_nil
+    defined?(defined_specs_receiver.defined_method::Basic::Undefined).should == nil
   end
 
   it "returns nil if the middle constant is not defined in the scope chain" do
-    defined?(defined_specs_receiver.defined_method::Undefined::Undefined).should be_nil
+    defined?(defined_specs_receiver.defined_method::Undefined::Undefined).should == nil
   end
 
   it "returns 'constant' if all the constants in the scope chain are defined" do
@@ -1003,7 +1003,7 @@
 
 describe "The defined? keyword for a module method call scoped constant" do
   it "returns nil if the constant is not defined in the scope of the method's value" do
-    defined?(DefinedSpecs.defined_method::Undefined).should be_nil
+    defined?(DefinedSpecs.defined_method::Undefined).should == nil
   end
 
   it "returns 'constant' if the constant scoped by the method's value is defined" do
@@ -1011,11 +1011,11 @@
   end
 
   it "returns nil if the last constant in the scope chain is not defined" do
-    defined?(DefinedSpecs.defined_method::Basic::Undefined).should be_nil
+    defined?(DefinedSpecs.defined_method::Basic::Undefined).should == nil
   end
 
   it "returns nil if the middle constant in the scope chain is not defined" do
-    defined?(DefinedSpecs.defined_method::Undefined::Undefined).should be_nil
+    defined?(DefinedSpecs.defined_method::Undefined::Undefined).should == nil
   end
 
   it "returns 'constant' if all the constants in the scope chain are defined" do
@@ -1023,11 +1023,11 @@
   end
 
   it "returns nil if the outer scope constant in the receiver is not defined" do
-    defined?(Undefined::DefinedSpecs.defined_method::Basic).should be_nil
+    defined?(Undefined::DefinedSpecs.defined_method::Basic).should == nil
   end
 
   it "returns nil if the scoped constant in the receiver is not defined" do
-    defined?(DefinedSpecs::Undefined.defined_method::Basic).should be_nil
+    defined?(DefinedSpecs::Undefined.defined_method::Basic).should == nil
   end
 
   it "returns 'constant' if all the constants in the receiver are defined" do
@@ -1048,7 +1048,7 @@
 
   it "returns nil if the instance scoped constant is not defined" do
     @defined_specs_obj = DefinedSpecs::Basic
-    defined?(@defined_specs_obj::Undefined).should be_nil
+    defined?(@defined_specs_obj::Undefined).should == nil
   end
 
   it "returns 'constant' if the constant is defined in the scope of the instance variable" do
@@ -1058,7 +1058,7 @@
 
   it "returns nil if the global scoped constant is not defined" do
     $defined_specs_obj = DefinedSpecs::Basic
-    defined?($defined_specs_obj::Undefined).should be_nil
+    defined?($defined_specs_obj::Undefined).should == nil
   end
 
   it "returns 'constant' if the constant is defined in the scope of the global variable" do
@@ -1070,7 +1070,7 @@
     eval(<<-END, binding, __FILE__, __LINE__)
       class singleton_class::A
         @@defined_specs_obj = DefinedSpecs::Basic
-        defined?(@@defined_specs_obj::Undefined).should be_nil
+        defined?(@@defined_specs_obj::Undefined).should == nil
       end
     END
   end
@@ -1086,7 +1086,7 @@ class singleton_class::A
 
   it "returns nil if the local scoped constant is not defined" do
     defined_specs_obj = DefinedSpecs::Basic
-    defined?(defined_specs_obj::Undefined).should be_nil
+    defined?(defined_specs_obj::Undefined).should == nil
   end
 
   it "returns 'constant' if the constant is defined in the scope of the local variable" do
@@ -1107,11 +1107,11 @@ class singleton_class::A
 
 describe "The defined? keyword for yield" do
   it "returns nil if no block is passed to a method not taking a block parameter" do
-    DefinedSpecs::Basic.new.no_yield_block.should be_nil
+    DefinedSpecs::Basic.new.no_yield_block.should == nil
   end
 
   it "returns nil if no block is passed to a method taking a block parameter" do
-    DefinedSpecs::Basic.new.no_yield_block_parameter.should be_nil
+    DefinedSpecs::Basic.new.no_yield_block_parameter.should == nil
   end
 
   it "returns 'yield' if a block is passed to a method not taking a block parameter" do
@@ -1139,24 +1139,24 @@ def call_defined
 
 describe "The defined? keyword for super" do
   it "returns nil when a superclass undef's the method" do
-    DefinedSpecs::ClassWithoutMethod.new.test.should be_nil
+    DefinedSpecs::ClassWithoutMethod.new.test.should == nil
   end
 
   describe "for a method taking no arguments" do
     it "returns nil when no superclass method exists" do
-      DefinedSpecs::Super.new.no_super_method_no_args.should be_nil
+      DefinedSpecs::Super.new.no_super_method_no_args.should == nil
     end
 
     it "returns nil from a block when no superclass method exists" do
-      DefinedSpecs::Super.new.no_super_method_block_no_args.should be_nil
+      DefinedSpecs::Super.new.no_super_method_block_no_args.should == nil
     end
 
     it "returns nil from a #define_method when no superclass method exists" do
-      DefinedSpecs::Super.new.no_super_define_method_no_args.should be_nil
+      DefinedSpecs::Super.new.no_super_define_method_no_args.should == nil
     end
 
     it "returns nil from a block in a #define_method when no superclass method exists" do
-      DefinedSpecs::Super.new.no_super_define_method_block_no_args.should be_nil
+      DefinedSpecs::Super.new.no_super_define_method_block_no_args.should == nil
     end
 
     it "returns 'super' when a superclass method exists" do
@@ -1184,19 +1184,19 @@ def call_defined
 
   describe "for a method taking arguments" do
     it "returns nil when no superclass method exists" do
-      DefinedSpecs::Super.new.no_super_method_args.should be_nil
+      DefinedSpecs::Super.new.no_super_method_args.should == nil
     end
 
     it "returns nil from a block when no superclass method exists" do
-      DefinedSpecs::Super.new.no_super_method_block_args.should be_nil
+      DefinedSpecs::Super.new.no_super_method_block_args.should == nil
     end
 
     it "returns nil from a #define_method when no superclass method exists" do
-      DefinedSpecs::Super.new.no_super_define_method_args.should be_nil
+      DefinedSpecs::Super.new.no_super_define_method_args.should == nil
     end
 
     it "returns nil from a block in a #define_method when no superclass method exists" do
-      DefinedSpecs::Super.new.no_super_define_method_block_args.should be_nil
+      DefinedSpecs::Super.new.no_super_define_method_block_args.should == nil
     end
 
     it "returns 'super' when a superclass method exists" do
@@ -1231,7 +1231,7 @@ def call_defined
   end
 
   it "returns nil if not assigned" do
-    defined?(@unassigned_ivar).should be_nil
+    defined?(@unassigned_ivar).should == nil
   end
 end
 
diff --git a/spec/ruby/language/delegation_spec.rb b/spec/ruby/language/delegation_spec.rb
index cd44956f5d1..3d917993f54 100644
--- a/spec/ruby/language/delegation_spec.rb
+++ b/spec/ruby/language/delegation_spec.rb
@@ -113,7 +113,7 @@ def delegate(*)
     it "does not allow delegating rest" do
       -> {
         eval "def m(*); proc { |*| n(*) } end"
-      }.should raise_error(SyntaxError, /anonymous rest parameter is also used within block/)
+      }.should.raise(SyntaxError, /anonymous rest parameter is also used within block/)
     end
   end
 end
@@ -134,7 +134,7 @@ def delegate(**)
     it "does not allow delegating kwargs" do
       -> {
         eval "def m(**); proc { |**| n(**) } end"
-      }.should raise_error(SyntaxError, /anonymous keyword rest parameter is also used within block/)
+      }.should.raise(SyntaxError, /anonymous keyword rest parameter is also used within block/)
     end
   end
 end
@@ -156,7 +156,7 @@ def delegate(&)
     it "does not allow delegating a block" do
       -> {
         eval "def m(&); proc { |&| n(&) } end"
-      }.should raise_error(SyntaxError, /anonymous block parameter is also used within block/)
+      }.should.raise(SyntaxError, /anonymous block parameter is also used within block/)
     end
   end
 end
diff --git a/spec/ruby/language/encoding_spec.rb b/spec/ruby/language/encoding_spec.rb
index e761a53cb69..116f53a77de 100644
--- a/spec/ruby/language/encoding_spec.rb
+++ b/spec/ruby/language/encoding_spec.rb
@@ -5,7 +5,7 @@
 
 describe "The __ENCODING__ pseudo-variable" do
   it "is an instance of Encoding" do
-    __ENCODING__.should be_kind_of(Encoding)
+    __ENCODING__.should.is_a?(Encoding)
   end
 
   it "is US-ASCII by default" do
@@ -31,6 +31,6 @@
   end
 
   it "raises a SyntaxError if assigned to" do
-    -> { eval("__ENCODING__ = 1") }.should raise_error(SyntaxError)
+    -> { eval("__ENCODING__ = 1") }.should.raise(SyntaxError)
   end
 end
diff --git a/spec/ruby/language/ensure_spec.rb b/spec/ruby/language/ensure_spec.rb
index b76292c0075..04ff0305abd 100644
--- a/spec/ruby/language/ensure_spec.rb
+++ b/spec/ruby/language/ensure_spec.rb
@@ -6,7 +6,7 @@
     ScratchPad.record []
   end
 
-  it "is executed when an exception is raised in it's corresponding begin block" do
+  it "is executed when an exception is raised in its corresponding begin block" do
     -> {
       begin
         ScratchPad << :begin
@@ -14,12 +14,12 @@
       ensure
         ScratchPad << :ensure
       end
-    }.should raise_error(EnsureSpec::Error)
+    }.should.raise(EnsureSpec::Error)
 
     ScratchPad.recorded.should == [:begin, :ensure]
   end
 
-  it "is executed when an exception is raised and rescued in it's corresponding begin block" do
+  it "is executed when an exception is raised and rescued in its corresponding begin block" do
     begin
       ScratchPad << :begin
       raise "An exception occurred!"
@@ -32,7 +32,7 @@
     ScratchPad.recorded.should == [:begin, :rescue, :ensure]
   end
 
-  it "is executed even when a symbol is thrown in it's corresponding begin block" do
+  it "is executed even when a symbol is thrown in its corresponding begin block" do
     catch(:symbol) do
       begin
         ScratchPad << :begin
@@ -47,7 +47,7 @@
     ScratchPad.recorded.should == [:begin, :ensure]
   end
 
-  it "is executed when nothing is raised or thrown in it's corresponding begin block" do
+  it "is executed when nothing is raised or thrown in its corresponding begin block" do
     begin
       ScratchPad << :begin
     rescue
@@ -74,7 +74,7 @@
       ensure
         raise "from ensure"
       end
-    }.should raise_error(RuntimeError, "from ensure") { |e|
+    }.should.raise(RuntimeError, "from ensure") { |e|
       e.cause.message.should == "from block"
     }
   end
@@ -108,7 +108,7 @@
   end
 
   it "is executed when an exception is raised in the method" do
-    -> { @obj.raise_in_method_with_ensure }.should raise_error(EnsureSpec::Error)
+    -> { @obj.raise_in_method_with_ensure }.should.raise(EnsureSpec::Error)
     @obj.executed.should == [:method, :ensure]
   end
 
@@ -149,13 +149,13 @@
   it "overrides exception raised in rescue if raises exception itself" do
     -> {
       @obj.raise_in_rescue_and_raise_in_ensure
-    }.should raise_error(RuntimeError, "raised in ensure")
+    }.should.raise(RuntimeError, "raised in ensure")
   end
 
   it "suppresses exception raised in method if raises exception itself" do
     -> {
       @obj.raise_in_method_and_raise_in_ensure
-    }.should raise_error(RuntimeError, "raised in ensure")
+    }.should.raise(RuntimeError, "raised in ensure")
   end
 end
 
@@ -174,7 +174,7 @@ class EnsureInClassExample
           ScratchPad << :ensure
         end
       ruby
-    }.should raise_error(EnsureSpec::Error)
+    }.should.raise(EnsureSpec::Error)
 
     ScratchPad.recorded.should == [:class, :ensure]
   end
@@ -247,7 +247,7 @@ class EnsureInClassExample
         ensure
         }
       ruby
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 end
 
@@ -256,7 +256,7 @@ class EnsureInClassExample
     ScratchPad.record []
   end
 
-  it "is executed when an exception is raised in it's corresponding begin block" do
+  it "is executed when an exception is raised in its corresponding begin block" do
     -> {
       eval(<<-ruby).call
         lambda do
@@ -266,12 +266,12 @@ class EnsureInClassExample
           ScratchPad << :ensure
         end
       ruby
-    }.should raise_error(EnsureSpec::Error)
+    }.should.raise(EnsureSpec::Error)
 
     ScratchPad.recorded.should == [:begin, :ensure]
   end
 
-  it "is executed when an exception is raised and rescued in it's corresponding begin block" do
+  it "is executed when an exception is raised and rescued in its corresponding begin block" do
     eval(<<-ruby).call
       lambda do
         ScratchPad << :begin
@@ -286,7 +286,7 @@ class EnsureInClassExample
     ScratchPad.recorded.should == [:begin, :rescue, :ensure]
   end
 
-  it "is executed even when a symbol is thrown in it's corresponding begin block" do
+  it "is executed even when a symbol is thrown in its corresponding begin block" do
     catch(:symbol) do
       eval(<<-ruby).call
         lambda do
@@ -303,7 +303,7 @@ class EnsureInClassExample
     ScratchPad.recorded.should == [:begin, :ensure]
   end
 
-  it "is executed when nothing is raised or thrown in it's corresponding begin block" do
+  it "is executed when nothing is raised or thrown in its corresponding begin block" do
     eval(<<-ruby).call
       lambda do
         ScratchPad << :begin
diff --git a/spec/ruby/language/file_spec.rb b/spec/ruby/language/file_spec.rb
index 36fd329bf6a..dd89ce23852 100644
--- a/spec/ruby/language/file_spec.rb
+++ b/spec/ruby/language/file_spec.rb
@@ -4,7 +4,7 @@
 
 describe "The __FILE__ pseudo-variable" do
   it "raises a SyntaxError if assigned to" do
-    -> { eval("__FILE__ = 1") }.should raise_error(SyntaxError)
+    -> { eval("__FILE__ = 1") }.should.raise(SyntaxError)
   end
 
   it "equals (eval at __FILE__:__LINE__) inside an eval" do
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_across_files.rb b/spec/ruby/language/fixtures/freeze_magic_comment_across_files.rb
index 3aed2f29b61..f3ef666a3c4 100644
--- a/spec/ruby/language/fixtures/freeze_magic_comment_across_files.rb
+++ b/spec/ruby/language/fixtures/freeze_magic_comment_across_files.rb
@@ -2,4 +2,5 @@
 
 require_relative 'freeze_magic_comment_required'
 
-p "abc".object_id == $second_literal_id
+p "abc".equal?($second_literal)
+$second_literal = nil
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_across_files_diff_enc.rb b/spec/ruby/language/fixtures/freeze_magic_comment_across_files_diff_enc.rb
index 53ef9599700..e9ca35e7c8e 100644
--- a/spec/ruby/language/fixtures/freeze_magic_comment_across_files_diff_enc.rb
+++ b/spec/ruby/language/fixtures/freeze_magic_comment_across_files_diff_enc.rb
@@ -2,4 +2,5 @@
 
 require_relative 'freeze_magic_comment_required_diff_enc'
 
-p "abc".object_id != $second_literal_id
+p !"abc".equal?($second_literal)
+$second_literal = nil
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_across_files_no_comment.rb b/spec/ruby/language/fixtures/freeze_magic_comment_across_files_no_comment.rb
index fc6cd5bf82f..c9eaab46a27 100644
--- a/spec/ruby/language/fixtures/freeze_magic_comment_across_files_no_comment.rb
+++ b/spec/ruby/language/fixtures/freeze_magic_comment_across_files_no_comment.rb
@@ -2,4 +2,5 @@
 
 require_relative 'freeze_magic_comment_required_no_comment'
 
-p "abc".object_id != $second_literal_id
+p !"abc".equal?($second_literal)
+$second_literal = nil
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_one_literal.rb b/spec/ruby/language/fixtures/freeze_magic_comment_one_literal.rb
index d35905b3326..c175b2b7a2f 100644
--- a/spec/ruby/language/fixtures/freeze_magic_comment_one_literal.rb
+++ b/spec/ruby/language/fixtures/freeze_magic_comment_one_literal.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-ids = Array.new(2) { "abc".object_id }
-p ids.first == ids.last
+objs = Array.new(2) { "abc" }
+p objs.first.equal?(objs.last)
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_required.rb b/spec/ruby/language/fixtures/freeze_magic_comment_required.rb
index a4ff4459b1d..f75acb2ce31 100644
--- a/spec/ruby/language/fixtures/freeze_magic_comment_required.rb
+++ b/spec/ruby/language/fixtures/freeze_magic_comment_required.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-$second_literal_id = "abc".object_id
+$second_literal = "abc"
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_required_diff_enc.rb b/spec/ruby/language/fixtures/freeze_magic_comment_required_diff_enc.rb
index f72a32e8791..739e96e99ac 100644
--- a/spec/ruby/language/fixtures/freeze_magic_comment_required_diff_enc.rb
+++ b/spec/ruby/language/fixtures/freeze_magic_comment_required_diff_enc.rb
@@ -1,4 +1,4 @@
 # encoding: euc-jp # built-in for old regexp option
 # frozen_string_literal: true
 
-$second_literal_id = "abc".object_id
+$second_literal = "abc"
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_required_no_comment.rb b/spec/ruby/language/fixtures/freeze_magic_comment_required_no_comment.rb
index e09232a5f44..6fbe175b42f 100644
--- a/spec/ruby/language/fixtures/freeze_magic_comment_required_no_comment.rb
+++ b/spec/ruby/language/fixtures/freeze_magic_comment_required_no_comment.rb
@@ -1 +1 @@
-$second_literal_id = "abc".object_id
+$second_literal = "abc"
diff --git a/spec/ruby/language/fixtures/super.rb b/spec/ruby/language/fixtures/super.rb
index c5bdcf0e402..b6d4218b034 100644
--- a/spec/ruby/language/fixtures/super.rb
+++ b/spec/ruby/language/fixtures/super.rb
@@ -266,7 +266,7 @@ def name
 
       # Use this so that we can see collect all supers that we see.
       # One bug that arises is that we call Alias2#name from Alias2#name
-      # as it's superclass. In that case, either we get a runaway recursion
+      # as its superclass. In that case, either we get a runaway recursion
       # super OR we get the return value being [:alias2, :alias2, :alias1]
       # rather than [:alias2, :alias1].
       #
diff --git a/spec/ruby/language/for_spec.rb b/spec/ruby/language/for_spec.rb
index 7fc6751d070..b0f3aef4056 100644
--- a/spec/ruby/language/for_spec.rb
+++ b/spec/ruby/language/for_spec.rb
@@ -155,7 +155,7 @@ class OFor
         n += 1
       end
     RUBY
-    ofor.should be_nil
+    ofor.should == nil
     n.should == 3
   end
 
@@ -215,7 +215,15 @@ def each
     j.should == 6
   end
 
-  it "executes code in containing variable scope" do
+  it "declares iteration variables in the surrounding variable scope" do
+    for a, b in [[1,2]]
+    end
+
+    a.should == 1
+    b.should == 2
+  end
+
+  it "declares variables in the body in the surrounding variable scope" do
     for i in 1..2
       a = 123
     end
@@ -223,7 +231,7 @@ def each
     a.should == 123
   end
 
-  it "executes code in containing variable scope with 'do'" do
+  it "declares variables in the body in the surrounding variable scope with 'do'" do
     for i in 1..2 do
       a = 123
     end
@@ -231,6 +239,96 @@ def each
     a.should == 123
   end
 
+  it "declares variables inside a block as normal" do
+    for i in 1..2 do
+      proc {
+        inside_proc = 42
+      }.call
+    end
+    local_variables.should == [:i]
+  end
+
+  it "declares variables inside a lambda as normal" do
+    for i in 1..2 do
+      -> {
+        inside_proc = 42
+      }.call
+    end
+    local_variables.should == [:i]
+  end
+
+  it "can be nested" do
+    for a in [6]
+      for b in [7]
+        c = a * b
+      end
+    end
+    local_variables.sort.should == [:a, :b, :c]
+    c.should == 42
+  end
+
+  it "can be nested with blocks in between" do
+    # This is an edge case spec for Ruby implementations which have
+    # their own runtime scope per for loop body (like YARV and TruffleRuby)
+    for a in [1]
+      a1 = a
+      a1.should == a
+      for b in [2]
+        b1 = b
+        a1.should == a
+        b1.should == b
+        proc {
+          inside_proc = 42
+
+          a1.should == a
+          b1.should == b
+          inside_proc.should == 42
+
+          for c in [3].map { |enum_var|
+            a1.should == a
+            b1.should == b
+            inside_proc.should == 42
+            enum_var
+          }
+            c1 = c
+
+            a1.should == a
+            b1.should == b
+            c1.should == c
+            inside_proc.should == 42
+
+            for d in [4]
+              d1 = d
+
+              a1.should == a
+              b1.should == b
+              c1.should == c
+              d1.should == d
+              inside_proc.should == 42
+            end
+          end
+          local_variables.sort.should == [:a, :a1, :b, :b1, :c, :c1, :d, :d1, :inside_proc]
+        }.call
+      end
+    end
+    local_variables.sort.should == [:a, :a1, :b, :b1]
+  end
+
+  it "can be nested with forward arguments" do
+    def bar(*args)
+      args
+    end
+
+    def foo(...)
+      for a in [1]
+        r = bar(...)
+      end
+      r
+    end
+
+    foo(2, 3).should == [2, 3]
+  end
+
   it "does not try to access variables outside the method" do
     ForSpecs::ForInClassMethod.foo.should == [:bar, :baz]
     ForSpecs::ForInClassMethod::READER.call.should == :same_variable_set_outside
diff --git a/spec/ruby/language/hash_spec.rb b/spec/ruby/language/hash_spec.rb
index c7e1bf2d88b..7a4a2e37c98 100644
--- a/spec/ruby/language/hash_spec.rb
+++ b/spec/ruby/language/hash_spec.rb
@@ -81,7 +81,7 @@
   end
 
   it "with '==>' in the middle raises SyntaxError" do
-    -> { eval("{:a ==> 1}") }.should raise_error(SyntaxError)
+    -> { eval("{:a ==> 1}") }.should.raise(SyntaxError)
   end
 
   it "recognizes '!' at the end of the key" do
@@ -93,7 +93,7 @@
   end
 
   it "raises a SyntaxError if there is no space between `!` and `=>`" do
-    -> { eval("{:a!=> 1}") }.should raise_error(SyntaxError)
+    -> { eval("{:a!=> 1}") }.should.raise(SyntaxError)
   end
 
   it "recognizes '?' at the end of the key" do
@@ -105,7 +105,7 @@
   end
 
   it "raises a SyntaxError if there is no space between `?` and `=>`" do
-    -> { eval("{:a?=> 1}") }.should raise_error(SyntaxError)
+    -> { eval("{:a?=> 1}") }.should.raise(SyntaxError)
   end
 
   it "constructs a new hash with the given elements" do
@@ -152,9 +152,9 @@ def h.to_hash; {:b => 2, :c => 3}; end
   ruby_version_is ""..."3.4" do
     it "does not expand nil using ** into {} and raises TypeError" do
       h = nil
-      -> { {a: 1, **h} }.should raise_error(TypeError, "no implicit conversion of nil into Hash")
+      -> { {a: 1, **h} }.should.raise(TypeError, "no implicit conversion of nil into Hash")
 
-      -> { {a: 1, **nil} }.should raise_error(TypeError, "no implicit conversion of nil into Hash")
+      -> { {a: 1, **nil} }.should.raise(TypeError, "no implicit conversion of nil into Hash")
     end
   end
 
@@ -223,13 +223,13 @@ def h.to_hash; {:b => 2, :c => 3}; end
     obj = mock("hash splat")
     obj.should_receive(:to_hash).and_return(obj)
 
-    -> { {**obj} }.should raise_error(TypeError)
+    -> { {**obj} }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the object does not respond to #to_hash" do
     obj = 42
-    -> { {**obj} }.should raise_error(TypeError)
-    -> { {a: 1, **obj} }.should raise_error(TypeError)
+    -> { {**obj} }.should.raise(TypeError)
+    -> { {a: 1, **obj} }.should.raise(TypeError)
   end
 
   it "does not change encoding of literal string keys during creation" do
@@ -249,7 +249,7 @@ def h.to_hash; {:b => 2, :c => 3}; end
       ScratchPad.record []
       -> {
         eval 'ScratchPad << 1; {:"\xC3" => 1}'
-      }.should raise_error(SyntaxError, /invalid symbol/)
+      }.should.raise(SyntaxError, /invalid symbol/)
       ScratchPad.recorded.should == []
     end
 
@@ -257,7 +257,7 @@ def h.to_hash; {:b => 2, :c => 3}; end
       ScratchPad.record []
       -> {
         eval 'ScratchPad << 1; {"\xC3": 1}'
-      }.should raise_error(SyntaxError, /invalid symbol/)
+      }.should.raise(SyntaxError, /invalid symbol/)
       ScratchPad.recorded.should == []
     end
   end
@@ -323,11 +323,11 @@ def foo(val)
     end
 
     it "raises a SyntaxError when the hash key ends with `!`" do
-      -> { eval("{a!:}") }.should raise_error(SyntaxError, /identifier a! is not valid to get/)
+      -> { eval("{a!:}") }.should.raise(SyntaxError, /identifier a! is not valid to get/)
     end
 
     it "raises a SyntaxError when the hash key ends with `?`" do
-      -> { eval("{a?:}") }.should raise_error(SyntaxError, /identifier a\? is not valid to get/)
+      -> { eval("{a?:}") }.should.raise(SyntaxError, /identifier a\? is not valid to get/)
     end
   end
 end
diff --git a/spec/ruby/language/heredoc_spec.rb b/spec/ruby/language/heredoc_spec.rb
index 47ee9c2c519..535f18cba88 100644
--- a/spec/ruby/language/heredoc_spec.rb
+++ b/spec/ruby/language/heredoc_spec.rb
@@ -62,7 +62,7 @@
   it 'raises SyntaxError if quoted HEREDOC identifier is ending not on same line' do
     -> {
       eval %{<<"HERE\n"\nraises syntax error\nHERE}
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 
   it "allows HEREDOC with <<~'identifier', allowing to indent identifier and content" do
@@ -114,6 +114,6 @@
         b
         #{c}
       HERE
-    }.should raise_error(NameError) { |e| e.backtrace[0].should.start_with?("#{__FILE__}:#{__LINE__ - 2}") }
+    }.should.raise(NameError) { |e| e.backtrace[0].should.start_with?("#{__FILE__}:#{__LINE__ - 2}") }
   end
 end
diff --git a/spec/ruby/language/if_spec.rb b/spec/ruby/language/if_spec.rb
index 2d1a89f081f..53fcb853d5b 100644
--- a/spec/ruby/language/if_spec.rb
+++ b/spec/ruby/language/if_spec.rb
@@ -330,7 +330,7 @@ def m
           a
         end
         RUBY
-      }.should raise_error(SyntaxError, /void value expression/)
+      }.should.raise(SyntaxError, /void value expression/)
     end
 
     it "does not raise SyntaxError if one branch returns a value" do
diff --git a/spec/ruby/language/it_parameter_spec.rb b/spec/ruby/language/it_parameter_spec.rb
index 58ec3a6faf0..6ba67cbb4f2 100644
--- a/spec/ruby/language/it_parameter_spec.rb
+++ b/spec/ruby/language/it_parameter_spec.rb
@@ -43,27 +43,27 @@ def o.it
     end
 
     it "raises SyntaxError when block parameters are specified explicitly" do
-      -> { eval("-> () { it }")         }.should raise_error(SyntaxError, /ordinary parameter is defined/)
-      -> { eval("-> (x) { it }")        }.should raise_error(SyntaxError, /ordinary parameter is defined/)
+      -> { eval("-> () { it }")         }.should.raise(SyntaxError, /ordinary parameter is defined/)
+      -> { eval("-> (x) { it }")        }.should.raise(SyntaxError, /ordinary parameter is defined/)
 
-      -> { eval("proc { || it }")       }.should raise_error(SyntaxError, /ordinary parameter is defined/)
-      -> { eval("proc { |x| it }")      }.should raise_error(SyntaxError, /ordinary parameter is defined/)
+      -> { eval("proc { || it }")       }.should.raise(SyntaxError, /ordinary parameter is defined/)
+      -> { eval("proc { |x| it }")      }.should.raise(SyntaxError, /ordinary parameter is defined/)
 
-      -> { eval("lambda { || it }")     }.should raise_error(SyntaxError, /ordinary parameter is defined/)
-      -> { eval("lambda { |x| it }")    }.should raise_error(SyntaxError, /ordinary parameter is defined/)
+      -> { eval("lambda { || it }")     }.should.raise(SyntaxError, /ordinary parameter is defined/)
+      -> { eval("lambda { |x| it }")    }.should.raise(SyntaxError, /ordinary parameter is defined/)
 
-      -> { eval("['a'].map { || it }")  }.should raise_error(SyntaxError, /ordinary parameter is defined/)
-      -> { eval("['a'].map { |x| it }") }.should raise_error(SyntaxError, /ordinary parameter is defined/)
+      -> { eval("['a'].map { || it }")  }.should.raise(SyntaxError, /ordinary parameter is defined/)
+      -> { eval("['a'].map { |x| it }") }.should.raise(SyntaxError, /ordinary parameter is defined/)
     end
 
     it "cannot be mixed with numbered parameters" do
       -> {
         eval("proc { it + _1 }")
-      }.should raise_error(SyntaxError, /numbered parameters are not allowed when 'it' is already used|'it' is already used in/)
+      }.should.raise(SyntaxError, /numbered parameters are not allowed when 'it' is already used|'it' is already used in/)
 
       -> {
         eval("proc { _1 + it }")
-      }.should raise_error(SyntaxError, /numbered parameter is already used in|'it' is not allowed when a numbered parameter is already used/)
+      }.should.raise(SyntaxError, /numbered parameter is already used in|'it' is not allowed when a numbered parameter is already used/)
     end
 
     it "affects block arity" do
@@ -90,7 +90,7 @@ def o.it
       obj = Object.new
       def obj.foo; it; end
 
-      -> { obj.foo("a") }.should raise_error(ArgumentError, /wrong number of arguments/)
+      -> { obj.foo("a") }.should.raise(ArgumentError, /wrong number of arguments/)
     end
 
     context "given multiple arguments" do
@@ -99,8 +99,8 @@ def obj.foo; it; end
       end
 
       it "raises ArgumentError for a proc" do
-        -> { -> { it }.call("a", "b") }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 1)")
-        -> { lambda { it }.call("a", "b") }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+        -> { -> { it }.call("a", "b") }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+        -> { lambda { it }.call("a", "b") }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 1)")
       end
     end
   end
diff --git a/spec/ruby/language/keyword_arguments_spec.rb b/spec/ruby/language/keyword_arguments_spec.rb
index d769839bdaa..38edc24414d 100644
--- a/spec/ruby/language/keyword_arguments_spec.rb
+++ b/spec/ruby/language/keyword_arguments_spec.rb
@@ -55,9 +55,9 @@ def m(*a, kw:)
     end
 
     m(kw: 1).should == []
-    -> { m(kw: 1, kw2: 2) }.should raise_error(ArgumentError, 'unknown keyword: :kw2')
-    -> { m(kw: 1, true => false) }.should raise_error(ArgumentError, 'unknown keyword: true')
-    -> { m(kw: 1, a: 1, b: 2, c: 3) }.should raise_error(ArgumentError, 'unknown keywords: :a, :b, :c')
+    -> { m(kw: 1, kw2: 2) }.should.raise(ArgumentError, 'unknown keyword: :kw2')
+    -> { m(kw: 1, true => false) }.should.raise(ArgumentError, 'unknown keyword: true')
+    -> { m(kw: 1, a: 1, b: 2, c: 3) }.should.raise(ArgumentError, 'unknown keywords: :a, :b, :c')
   end
 
   it "raises ArgumentError exception when required keyword argument is not passed" do
@@ -65,8 +65,8 @@ def m(a:, b:, c:)
       [a, b, c]
     end
 
-    -> { m(a: 1, b: 2) }.should raise_error(ArgumentError, /missing keyword: :c/)
-    -> { m() }.should raise_error(ArgumentError, /missing keywords: :a, :b, :c/)
+    -> { m(a: 1, b: 2) }.should.raise(ArgumentError, /missing keyword: :c/)
+    -> { m() }.should.raise(ArgumentError, /missing keywords: :a, :b, :c/)
   end
 
   it "raises ArgumentError for missing keyword arguments even if there are extra ones" do
@@ -74,7 +74,7 @@ def m(a:)
       a
     end
 
-    -> { m(b: 1) }.should raise_error(ArgumentError, /missing keyword: :a/)
+    -> { m(b: 1) }.should.raise(ArgumentError, /missing keyword: :a/)
   end
 
   it "handle * and ** at the same call site" do
@@ -95,7 +95,7 @@ def bar(a)
       end
 
       h2 = bar(h)
-      h2.should equal(h)
+      h2.should.equal?(h)
       Hash.ruby2_keywords_hash?(h).should == true
     end
   end
diff --git a/spec/ruby/language/lambda_spec.rb b/spec/ruby/language/lambda_spec.rb
index ed5a1c69e84..2a2953bd97a 100644
--- a/spec/ruby/language/lambda_spec.rb
+++ b/spec/ruby/language/lambda_spec.rb
@@ -11,23 +11,23 @@ def create_lambda
       end
     end
 
-    klass.new.create_lambda.should be_an_instance_of(Proc)
+    klass.new.create_lambda.should.instance_of?(Proc)
   end
 
   it "does not execute the block" do
-    -> { fail }.should be_an_instance_of(Proc)
+    -> { fail }.should.instance_of?(Proc)
   end
 
   it "returns a lambda" do
-    -> { }.lambda?.should be_true
+    -> { }.lambda?.should == true
   end
 
   it "may include a rescue clause" do
-    eval('-> do raise ArgumentError; rescue ArgumentError; 7; end').should be_an_instance_of(Proc)
+    eval('-> do raise ArgumentError; rescue ArgumentError; 7; end').should.instance_of?(Proc)
   end
 
   it "may include a ensure clause" do
-    eval('-> do 1; ensure; 2; end').should be_an_instance_of(Proc)
+    eval('-> do 1; ensure; 2; end').should.instance_of?(Proc)
   end
 
   it "has its own scope for local variables" do
@@ -48,10 +48,10 @@ def create_lambda
         @d = -> do end
       ruby
 
-      @a.().should be_nil
-      @b.().should be_nil
-      @c.().should be_nil
-      @d.().should be_nil
+      @a.().should == nil
+      @b.().should == nil
+      @c.().should == nil
+      @d.().should == nil
     end
   end
 
@@ -91,9 +91,9 @@ def create_lambda
         @a = -> (*) { }
       ruby
 
-      @a.().should be_nil
-      @a.(1).should be_nil
-      @a.(1, 2, 3).should be_nil
+      @a.().should == nil
+      @a.(1).should == nil
+      @a.(1, 2, 3).should == nil
     end
 
     evaluate <<-ruby do
@@ -109,7 +109,7 @@ def create_lambda
         @a = -> (a:) { a }
       ruby
 
-      -> { @a.() }.should raise_error(ArgumentError)
+      -> { @a.() }.should.raise(ArgumentError)
       @a.(a: 1).should == 1
     end
 
@@ -125,9 +125,9 @@ def create_lambda
         @a = -> (**) {  }
       ruby
 
-      @a.().should be_nil
-      @a.(a: 1, b: 2).should be_nil
-      -> { @a.(1) }.should raise_error(ArgumentError)
+      @a.().should == nil
+      @a.(a: 1, b: 2).should == nil
+      -> { @a.(1) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -142,8 +142,8 @@ def create_lambda
         @a = -> (&b) { b  }
       ruby
 
-      @a.().should be_nil
-      @a.() { }.should be_an_instance_of(Proc)
+      @a.().should == nil
+      @a.() { }.should.instance_of?(Proc)
     end
 
     evaluate <<-ruby do
@@ -151,8 +151,8 @@ def create_lambda
       ruby
 
       @a.(1, 2).should == [1, 2]
-      -> { @a.() }.should raise_error(ArgumentError)
-      -> { @a.(1) }.should raise_error(ArgumentError)
+      -> { @a.() }.should.raise(ArgumentError)
+      -> { @a.(1) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -193,9 +193,9 @@ def create_lambda
         @a = -> (*, &b) { b }
       ruby
 
-      @a.().should be_nil
-      @a.(1, 2, 3, 4).should be_nil
-      @a.(&(l = ->{})).should equal(l)
+      @a.().should == nil
+      @a.(1, 2, 3, 4).should == nil
+      @a.(&(l = ->{})).should.equal?(l)
     end
 
     evaluate <<-ruby do
@@ -268,7 +268,7 @@ def create_lambda
           a = 1
           -> {
             eval "-> (a=a) { a }"
-          }.should raise_error(SyntaxError)
+          }.should.raise(SyntaxError)
         end
       end
 
@@ -286,6 +286,24 @@ def a; 1; end
       end
     end
   end
+
+  evaluate <<-ruby do
+    @a = -> (**nil) { :ok }
+    ruby
+
+    @a.call().should == :ok
+    -> { @a.call(a: 1) }.should.raise(ArgumentError, 'no keywords accepted')
+    -> { @a.call(**{a: 1}) }.should.raise(ArgumentError, 'no keywords accepted')
+    -> { @a.call("a" => 1) }.should.raise(ArgumentError, 'no keywords accepted')
+  end
+
+  evaluate <<-ruby do
+    @a = -> (a, **nil) { a }
+    ruby
+
+    @a.call({a: 1}).should == {a: 1}
+    -> { @a.call(a: 1) }.should.raise(ArgumentError, 'no keywords accepted')
+  end
 end
 
 describe "A lambda expression 'lambda { ... }'" do
@@ -299,25 +317,25 @@ def obj.define
       lambda { }
     end
 
-    obj.define.should equal(obj)
+    obj.define.should.equal?(obj)
   end
 
   it "does not execute the block" do
-    lambda { fail }.should be_an_instance_of(Proc)
+    lambda { fail }.should.instance_of?(Proc)
   end
 
   it "returns a lambda" do
-    lambda { }.lambda?.should be_true
+    lambda { }.lambda?.should == true
   end
 
   it "requires a block" do
     suppress_warning do
-      lambda { lambda }.should raise_error(ArgumentError)
+      lambda { lambda }.should.raise(ArgumentError)
     end
   end
 
   it "may include a rescue clause" do
-    eval('lambda do raise ArgumentError; rescue ArgumentError; 7; end').should be_an_instance_of(Proc)
+    eval('lambda do raise ArgumentError; rescue ArgumentError; 7; end').should.instance_of?(Proc)
   end
 
   context "with an implicit block" do
@@ -330,7 +348,7 @@ def meth; lambda; end
       suppress_warning do
         -> {
           meth { 1 }
-        }.should raise_error(ArgumentError, /tried to create Proc object without a block/)
+        }.should.raise(ArgumentError, /tried to create Proc object without a block/)
       end
     end
   end
@@ -341,8 +359,8 @@ def meth; lambda; end
         @b = lambda { || }
       ruby
 
-      @a.().should be_nil
-      @b.().should be_nil
+      @a.().should == nil
+      @b.().should == nil
     end
   end
 
@@ -359,8 +377,8 @@ def m(*a) yield(*a) end
         @a = lambda { |a| a }
       ruby
 
-      lambda { m(&@a) }.should raise_error(ArgumentError)
-      lambda { m(1, 2, &@a) }.should raise_error(ArgumentError)
+      lambda { m(&@a) }.should.raise(ArgumentError)
+      lambda { m(1, 2, &@a) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -370,8 +388,8 @@ def m(*a) yield(*a) end
       @a.(1).should == 1
       @a.([1, 2]).should == [1, 2]
 
-      lambda { @a.() }.should raise_error(ArgumentError)
-      lambda { @a.(1, 2) }.should raise_error(ArgumentError)
+      lambda { @a.() }.should.raise(ArgumentError)
+      lambda { @a.(1, 2) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -384,7 +402,7 @@ def m2() yield end
       m(1, &@a).should == 1
       m([1, 2], &@a).should == [1, 2]
 
-      lambda { m2(&@a) }.should raise_error(ArgumentError)
+      lambda { m2(&@a) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -415,9 +433,9 @@ def m2() yield end
         @a = lambda { |*| }
       ruby
 
-      @a.().should be_nil
-      @a.(1).should be_nil
-      @a.(1, 2, 3).should be_nil
+      @a.().should == nil
+      @a.(1).should == nil
+      @a.(1, 2, 3).should == nil
     end
 
     evaluate <<-ruby do
@@ -433,7 +451,7 @@ def m2() yield end
         @a = lambda { |a:| a }
       ruby
 
-      lambda { @a.() }.should raise_error(ArgumentError)
+      lambda { @a.() }.should.raise(ArgumentError)
       @a.(a: 1).should == 1
     end
 
@@ -449,9 +467,9 @@ def m2() yield end
         @a = lambda { |**|  }
       ruby
 
-      @a.().should be_nil
-      @a.(a: 1, b: 2).should be_nil
-      lambda { @a.(1) }.should raise_error(ArgumentError)
+      @a.().should == nil
+      @a.(a: 1, b: 2).should == nil
+      lambda { @a.(1) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -466,8 +484,8 @@ def m2() yield end
         @a = lambda { |&b| b  }
       ruby
 
-      @a.().should be_nil
-      @a.() { }.should be_an_instance_of(Proc)
+      @a.().should == nil
+      @a.() { }.should.instance_of?(Proc)
     end
 
     evaluate <<-ruby do
@@ -515,9 +533,9 @@ def m2() yield end
         @a = lambda { |*, &b| b }
       ruby
 
-      @a.().should be_nil
-      @a.(1, 2, 3, 4).should be_nil
-      @a.(&(l = ->{})).should equal(l)
+      @a.().should == nil
+      @a.(1, 2, 3, 4).should == nil
+      @a.(&(l = ->{})).should.equal?(l)
     end
 
     evaluate <<-ruby do
@@ -583,5 +601,23 @@ def m2() yield end
       result = @a.(1, 2, e: 3, g: 4, h: 5, i: 6, &(l = ->{}))
       result.should == [1, 1, [], 2, 3, 2, 4, { h: 5, i: 6 }, l]
     end
+
+    evaluate <<-ruby do
+      @a = lambda { |**nil| :ok }
+      ruby
+
+      @a.call().should == :ok
+      -> { @a.call(a: 1) }.should.raise(ArgumentError, 'no keywords accepted')
+      -> { @a.call(**{a: 1}) }.should.raise(ArgumentError, 'no keywords accepted')
+      -> { @a.call("a" => 1) }.should.raise(ArgumentError, 'no keywords accepted')
+    end
+
+    evaluate <<-ruby do
+      @a = lambda { |a, **nil| a }
+      ruby
+
+      @a.call({a: 1}).should == {a: 1}
+      -> { @a.call(a: 1) }.should.raise(ArgumentError, 'no keywords accepted')
+    end
   end
 end
diff --git a/spec/ruby/language/line_spec.rb b/spec/ruby/language/line_spec.rb
index fcadaa71d70..2864798079c 100644
--- a/spec/ruby/language/line_spec.rb
+++ b/spec/ruby/language/line_spec.rb
@@ -4,7 +4,7 @@
 
 describe "The __LINE__ pseudo-variable" do
   it "raises a SyntaxError if assigned to" do
-    -> { eval("__LINE__ = 1") }.should raise_error(SyntaxError)
+    -> { eval("__LINE__ = 1") }.should.raise(SyntaxError)
   end
 
   before :each do
diff --git a/spec/ruby/language/loop_spec.rb b/spec/ruby/language/loop_spec.rb
index fd17b539103..9b12765a5fe 100644
--- a/spec/ruby/language/loop_spec.rb
+++ b/spec/ruby/language/loop_spec.rb
@@ -15,7 +15,7 @@
       inner_loop = 123
       break
     end
-    -> { inner_loop }.should raise_error(NameError)
+    -> { inner_loop }.should.raise(NameError)
   end
 
   it "returns the value passed to break if interrupted by break" do
diff --git a/spec/ruby/language/match_spec.rb b/spec/ruby/language/match_spec.rb
index ebf677cabc3..096ebee022f 100644
--- a/spec/ruby/language/match_spec.rb
+++ b/spec/ruby/language/match_spec.rb
@@ -46,6 +46,14 @@
       matched.should == "foo"
       unmatched.should == nil
     end
+
+    it "sets existing local variables if declared in a higher scope" do
+      a = 42
+      1.times do
+        /(?<a>foo)/ =~ @string
+      end
+      a.should == "foo"
+    end
   end
 
   describe "on syntax of 'string_literal' =~ /regexp/" do
diff --git a/spec/ruby/language/metaclass_spec.rb b/spec/ruby/language/metaclass_spec.rb
index fc830679775..3bee823a751 100644
--- a/spec/ruby/language/metaclass_spec.rb
+++ b/spec/ruby/language/metaclass_spec.rb
@@ -16,17 +16,17 @@ class << nil; self; end.should == NilClass
   end
 
   it "raises a TypeError for numbers" do
-    -> { class << 1; self; end }.should raise_error(TypeError)
+    -> { class << 1; self; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError for symbols" do
-    -> { class << :symbol; self; end }.should raise_error(TypeError)
+    -> { class << :symbol; self; end }.should.raise(TypeError)
   end
 
   it "is a singleton Class instance" do
     cls = class << mock('x'); self; end
     cls.is_a?(Class).should == true
-    cls.should_not equal(Object)
+    cls.should_not.equal?(Object)
   end
 end
 
@@ -57,20 +57,20 @@ class << @object
   end
 
   it "is not defined on the object's class" do
-    @object.class.const_defined?(:CONST).should be_false
+    @object.class.const_defined?(:CONST).should == false
   end
 
   it "is not defined in the metaclass opener's scope" do
     class << @object
       CONST
     end
-    -> { CONST }.should raise_error(NameError)
+    -> { CONST }.should.raise(NameError)
   end
 
   it "cannot be accessed via object::CONST" do
     -> do
       @object::CONST
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a NameError for anonymous_module::CONST" do
@@ -81,16 +81,16 @@ class << @object
 
     -> do
       @object::CONST
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "appears in the metaclass constant list" do
     constants = class << @object; constants; end
-    constants.should include(:CONST)
+    constants.should.include?(:CONST)
   end
 
   it "does not appear in the object's class constant list" do
-    @object.class.constants.should_not include(:CONST)
+    @object.class.constants.should_not.include?(:CONST)
   end
 
   it "is not preserved when the object is duped" do
@@ -98,14 +98,14 @@ class << @object
 
     -> do
       class << @object; CONST; end
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "is preserved when the object is cloned" do
     @object = @object.clone
 
     class << @object
-      CONST.should_not be_nil
+      CONST.should_not == nil
     end
   end
 end
diff --git a/spec/ruby/language/method_spec.rb b/spec/ruby/language/method_spec.rb
index 8f9f094fd89..324bd6cea5c 100644
--- a/spec/ruby/language/method_spec.rb
+++ b/spec/ruby/language/method_spec.rb
@@ -19,7 +19,7 @@ def m(a) a end
       x = mock("splat argument")
       x.should_not_receive(:to_ary)
 
-      m(*x).should equal(x)
+      m(*x).should.equal?(x)
     end
 
     it "calls #to_a" do
@@ -40,7 +40,7 @@ def m(a) a end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { m(*x) }.should raise_error(TypeError)
+      -> { m(*x) }.should.raise(TypeError)
     end
   end
 
@@ -74,7 +74,7 @@ def m(a, b, *c, d, e) [a, b, c, d, e] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { m(*x, 2, 3) }.should raise_error(TypeError)
+      -> { m(*x, 2, 3) }.should.raise(TypeError)
     end
   end
 
@@ -108,13 +108,13 @@ def m(a, b, *c, d, e) [a, b, c, d, e] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { m(1, *x, 2, 3) }.should raise_error(TypeError)
+      -> { m(1, *x, 2, 3) }.should.raise(TypeError)
     end
 
     it "copies the splatted array" do
       args = [3, 4]
       m(1, 2, *args, 4, 5).should == [1, 2, [3, 4], 4, 5]
-      m(1, 2, *args, 4, 5)[2].should_not equal(args)
+      m(1, 2, *args, 4, 5)[2].should_not.equal?(args)
     end
 
     it "allows an array being splatted to be modified by another argument" do
@@ -153,7 +153,7 @@ def m(a, *b, c) [a, b, c] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { m(1, 2, *x) }.should raise_error(TypeError)
+      -> { m(1, 2, *x) }.should.raise(TypeError)
     end
   end
 
@@ -217,7 +217,7 @@ def @o.[]=(a, b) ScratchPad.record [a, b] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { @o[*x] = 1 }.should raise_error(TypeError)
+      -> { @o[*x] = 1 }.should.raise(TypeError)
     end
   end
 
@@ -255,7 +255,7 @@ def @o.[]=(a, b, *c, d, e) ScratchPad.record [a, b, c, d, e] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { @o[*x, 2, 3] = 4 }.should raise_error(TypeError)
+      -> { @o[*x, 2, 3] = 4 }.should.raise(TypeError)
     end
   end
 
@@ -293,7 +293,7 @@ def @o.[]=(a, b, *c, d, e) ScratchPad.record [a, b, c, d, e] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { @o[1, 2, *x, 3] = 4 }.should raise_error(TypeError)
+      -> { @o[1, 2, *x, 3] = 4 }.should.raise(TypeError)
     end
   end
 
@@ -331,7 +331,7 @@ def @o.[]=(a, b, *c, d, e) ScratchPad.record [a, b, c, d, e] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { @o[1, 2, 3, *x] = 4 }.should raise_error(TypeError)
+      -> { @o[1, 2, 3, *x] = 4 }.should.raise(TypeError)
     end
   end
 end
@@ -368,7 +368,7 @@ def @o.m=(a, b) [a, b] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { @o.send :m=, *x, 1 }.should raise_error(TypeError)
+      -> { @o.send :m=, *x, 1 }.should.raise(TypeError)
     end
   end
 
@@ -403,7 +403,7 @@ def @o.m=(a, b, *c, d, e) [a, b, c, d, e] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { @o.send :m=, *x, 2, 3, 4 }.should raise_error(TypeError)
+      -> { @o.send :m=, *x, 2, 3, 4 }.should.raise(TypeError)
     end
   end
 
@@ -438,7 +438,7 @@ def @o.m=(a, b, *c, d, e) [a, b, c, d, e] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { @o.send :m=, 1, 2, *x, 3, 4 }.should raise_error(TypeError)
+      -> { @o.send :m=, 1, 2, *x, 3, 4 }.should.raise(TypeError)
     end
   end
 
@@ -473,7 +473,7 @@ def @o.m=(a, b, *c, d, e) [a, b, c, d, e] end
       x = mock("splat argument")
       x.should_receive(:to_a).and_return(1)
 
-      -> { @o.send :m=, 1, 2, 3, *x, 4 }.should raise_error(TypeError)
+      -> { @o.send :m=, 1, 2, 3, *x, 4 }.should.raise(TypeError)
     end
   end
 end
@@ -487,7 +487,7 @@ def m
         end
       ruby
 
-      m.should be_nil
+      m.should == nil
     end
 
     evaluate <<-ruby do
@@ -495,7 +495,7 @@ def m()
         end
       ruby
 
-      m.should be_nil
+      m.should == nil
     end
   end
 
@@ -504,7 +504,7 @@ def m()
         def m(a) a end
       ruby
 
-      m((args = 1, 2, 3)).should equal(args)
+      m((args = 1, 2, 3)).should.equal?(args)
     end
 
     evaluate <<-ruby do
@@ -535,18 +535,18 @@ def m(a=1) a end
         def m() end
       ruby
 
-      m().should be_nil
-      m(*[]).should be_nil
-      m(**{}).should be_nil
+      m().should == nil
+      m(*[]).should == nil
+      m(**{}).should == nil
     end
 
     evaluate <<-ruby do
         def m(*) end
       ruby
 
-      m().should be_nil
-      m(1).should be_nil
-      m(1, 2, 3).should be_nil
+      m().should == nil
+      m(1).should == nil
+      m(1, 2, 3).should == nil
     end
 
     evaluate <<-ruby do
@@ -564,10 +564,10 @@ def m(*a) a end
         def m(a:) a end
       ruby
 
-      -> { m() }.should raise_error(ArgumentError)
+      -> { m() }.should.raise(ArgumentError)
       m(a: 1).should == 1
       suppress_keyword_warning do
-        -> { m("a" => 1, a: 1) }.should raise_error(ArgumentError)
+        -> { m("a" => 1, a: 1) }.should.raise(ArgumentError)
       end
     end
 
@@ -575,7 +575,7 @@ def m(a:) a end
         def m(a:, **kw) [a, kw] end
       ruby
 
-      -> { m(b: 1) }.should raise_error(ArgumentError)
+      -> { m(b: 1) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -590,9 +590,9 @@ def m(a: 1) a end
         def m(**) end
       ruby
 
-      m().should be_nil
-      m(a: 1, b: 2).should be_nil
-      -> { m(1) }.should raise_error(ArgumentError)
+      m().should == nil
+      m(a: 1, b: 2).should == nil
+      -> { m(1) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -606,7 +606,7 @@ def m(**k) k end
       suppress_warning {
         eval "m(**{a: 1, b: 2}, **{a: 4, c: 7})"
       }.should == { a: 4, b: 2, c: 7 }
-      -> { m(2) }.should raise_error(ArgumentError)
+      -> { m(2) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -620,7 +620,7 @@ def m(**k); k end;
         def m(&b) b end
       ruby
 
-      m { }.should be_an_instance_of(Proc)
+      m { }.should.instance_of?(Proc)
     end
 
     evaluate <<-ruby do
@@ -650,9 +650,9 @@ def m((a), (b)) [a, b] end
         def m((*), (*)) end
       ruby
 
-      m(2, 3).should be_nil
-      m([2, 3, 4], [5, 6]).should be_nil
-      -> { m a: 1 }.should raise_error(ArgumentError)
+      m(2, 3).should == nil
+      m([2, 3, 4], [5, 6]).should == nil
+      -> { m a: 1 }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -745,7 +745,7 @@ def m(a, b:) [a, b] end
 
       m(1, b: 2).should == [1, 2]
       suppress_keyword_warning do
-        -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError)
+        -> { m("a" => 1, b: 2) }.should.raise(ArgumentError)
       end
     end
 
@@ -755,7 +755,7 @@ def m(a, b: 1) [a, b] end
 
       m(2).should == [2, 1]
       m(1, b: 2).should == [1, 2]
-      -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError)
+      -> { m("a" => 1, b: 2) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -764,7 +764,7 @@ def m(a, **) a end
 
       m(1).should == 1
       m(1, a: 2, b: 3).should == 1
-      -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError)
+      -> { m("a" => 1, b: 2) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -773,7 +773,7 @@ def m(a, **k) [a, k] end
 
       m(1).should == [1, {}]
       m(1, a: 2, b: 3).should == [1, {a: 2, b: 3}]
-      -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError)
+      -> { m("a" => 1, b: 2) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -848,8 +848,8 @@ def m(a=1, (b), (c)) [a, b, c] end
         def m(a=1, (*b), (*c)) [a, b, c] end
       ruby
 
-      -> { m() }.should raise_error(ArgumentError)
-      -> { m(2) }.should raise_error(ArgumentError)
+      -> { m() }.should.raise(ArgumentError)
+      -> { m(2) }.should.raise(ArgumentError)
       m(2, 3).should == [1, [2], [3]]
       m(2, [3, 4], [5, 6]).should == [2, [3, 4], [5, 6]]
     end
@@ -890,7 +890,7 @@ def m(a=1, b:) [a, b] end
 
       m(b: 2).should == [1, 2]
       m(2, b: 1).should == [2, 1]
-      -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError)
+      -> { m("a" => 1, b: 2) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -900,7 +900,7 @@ def m(a=1, b: 2) [a, b] end
       m().should == [1, 2]
       m(2).should == [2, 2]
       m(b: 3).should == [1, 3]
-      -> { m("a" => 1, b: 2) }.should raise_error(ArgumentError)
+      -> { m("a" => 1, b: 2) }.should.raise(ArgumentError)
     end
 
     evaluate <<-ruby do
@@ -953,9 +953,9 @@ def m(*a, b) [a, b] end
         def m(*, &b) b end
       ruby
 
-      m().should be_nil
-      m(1, 2, 3, 4).should be_nil
-      m(&(l = ->{})).should equal(l)
+      m().should == nil
+      m(1, 2, 3, 4).should == nil
+      m(&(l = ->{})).should.equal?(l)
     end
 
     evaluate <<-ruby do
@@ -973,7 +973,7 @@ def m(a:, b:) [a, b] end
 
       m(a: 1, b: 2).should == [1, 2]
       suppress_keyword_warning do
-        -> { m("a" => 1, a: 1, b: 2) }.should raise_error(ArgumentError)
+        -> { m("a" => 1, a: 1, b: 2) }.should.raise(ArgumentError)
       end
     end
 
@@ -984,7 +984,7 @@ def m(a:, b: 1) [a, b] end
       m(a: 1).should == [1, 1]
       m(a: 1, b: 2).should == [1, 2]
       suppress_keyword_warning do
-        -> { m("a" => 1, a: 1, b: 2) }.should raise_error(ArgumentError)
+        -> { m("a" => 1, a: 1, b: 2) }.should.raise(ArgumentError)
       end
     end
 
@@ -1100,6 +1100,16 @@ def m(a, b=1, *c, d, e:, f: 2, g:, **k, &l)
       result.should == [1, 1, [], 2, 3, 2, 4, { h: 5, i: 6 }, l]
     end
 
+    evaluate <<-ruby do
+      def m(**nil); :ok; end;
+      ruby
+
+      m().should == :ok
+      -> { m(a: 1) }.should.raise(ArgumentError, 'no keywords accepted')
+      -> { m(**{a: 1}) }.should.raise(ArgumentError, 'no keywords accepted')
+      -> { m("a" => 1) }.should.raise(ArgumentError, 'no keywords accepted')
+    end
+
     evaluate <<-ruby do
       def m(a, **nil); a end;
       ruby
@@ -1107,9 +1117,9 @@ def m(a, **nil); a end;
       m({a: 1}).should == {a: 1}
       m({"a" => 1}).should == {"a" => 1}
 
-      -> { m(a: 1) }.should raise_error(ArgumentError, 'no keywords accepted')
-      -> { m(**{a: 1}) }.should raise_error(ArgumentError, 'no keywords accepted')
-      -> { m("a" => 1) }.should raise_error(ArgumentError, 'no keywords accepted')
+      -> { m(a: 1) }.should.raise(ArgumentError, 'no keywords accepted')
+      -> { m(**{a: 1}) }.should.raise(ArgumentError, 'no keywords accepted')
+      -> { m("a" => 1) }.should.raise(ArgumentError, 'no keywords accepted')
     end
 
     evaluate <<-ruby do
@@ -1127,6 +1137,18 @@ def m(a, b = nil, c = nil, d, e: nil, **f)
       result = m(1, {foo: :bar})
       result.should == [1, nil, nil, {foo: :bar}, nil, {}]
     end
+
+    ruby_version_is "4.1" do
+      evaluate <<-ruby do
+        def m(a, &nil); a end;
+        ruby
+
+        m(1).should == 1
+
+        -> { m(1) {} }.should.raise(ArgumentError, 'no block accepted')
+        -> { m(1, &proc {}) }.should.raise(ArgumentError, 'no block accepted')
+      end
+    end
   end
 
   context 'when passing an empty keyword splat to a method that does not accept keywords' do
@@ -1147,7 +1169,7 @@ def m(a); a; end
 
       -> do
         m(**h).should == {}
-      end.should raise_error(ArgumentError)
+      end.should.raise(ArgumentError)
     end
   end
 
@@ -1159,7 +1181,7 @@ def m(a: nil); a; end
       options = {a: 1}.freeze
       -> do
         m(options)
-      end.should raise_error(ArgumentError)
+      end.should.raise(ArgumentError)
     end
   end
 
@@ -1181,8 +1203,8 @@ def m(a = nil, b = {}, v: false)
       def m(**kw) kw; end
 
       h = nil
-      -> { m(a: 1, **h) }.should raise_error(TypeError, "no implicit conversion of nil into Hash")
-      -> { m(a: 1, **nil) }.should raise_error(TypeError, "no implicit conversion of nil into Hash")
+      -> { m(a: 1, **h) }.should.raise(TypeError, "no implicit conversion of nil into Hash")
+      -> { m(a: 1, **nil) }.should.raise(TypeError, "no implicit conversion of nil into Hash")
     end
   end
 
@@ -1255,11 +1277,11 @@ def n(value, &block)
     it "raises a syntax error" do
       -> {
         eval("m (1, 2)")
-      }.should raise_error(SyntaxError)
+      }.should.raise(SyntaxError)
 
       -> {
         eval("m (1, 2, 3)")
-      }.should raise_error(SyntaxError)
+      }.should.raise(SyntaxError)
     end
   end
 
@@ -1409,7 +1431,7 @@ def foo(a, b, c, **hsh)
 
       -> {
         foo(1, 2, 3, { key: 42 })
-      }.should raise_error(ArgumentError, 'wrong number of arguments (given 4, expected 3)')
+      }.should.raise(ArgumentError, 'wrong number of arguments (given 4, expected 3)')
     end
   end
 
@@ -1422,7 +1444,7 @@ def foo(a, b, c, key: 1)
 
         -> {
           foo(1, 2, 3, { key: 42 })
-        }.should raise_error(ArgumentError, 'wrong number of arguments (given 4, expected 3)')
+        }.should.raise(ArgumentError, 'wrong number of arguments (given 4, expected 3)')
       end
     end
 
diff --git a/spec/ruby/language/module_spec.rb b/spec/ruby/language/module_spec.rb
index fba4aa8c6e6..2f22e383d54 100644
--- a/spec/ruby/language/module_spec.rb
+++ b/spec/ruby/language/module_spec.rb
@@ -4,28 +4,28 @@
 describe "The module keyword" do
   it "creates a new module without semicolon" do
     module ModuleSpecsKeywordWithoutSemicolon end
-    ModuleSpecsKeywordWithoutSemicolon.should be_an_instance_of(Module)
+    ModuleSpecsKeywordWithoutSemicolon.should.instance_of?(Module)
   end
 
   it "creates a new module with a non-qualified constant name" do
     module ModuleSpecsToplevel; end
-    ModuleSpecsToplevel.should be_an_instance_of(Module)
+    ModuleSpecsToplevel.should.instance_of?(Module)
   end
 
   it "creates a new module with a qualified constant name" do
     module ModuleSpecs::Nested; end
-    ModuleSpecs::Nested.should be_an_instance_of(Module)
+    ModuleSpecs::Nested.should.instance_of?(Module)
   end
 
   it "creates a new module with a variable qualified constant name" do
     m = Module.new
     module m::N; end
-    m::N.should be_an_instance_of(Module)
+    m::N.should.instance_of?(Module)
   end
 
   it "reopens an existing module" do
     module ModuleSpecs; Reopened = true; end
-    ModuleSpecs::Reopened.should be_true
+    ModuleSpecs::Reopened.should == true
   ensure
     ModuleSpecs.send(:remove_const, :Reopened)
   end
@@ -64,34 +64,34 @@ module IncludedModule; end
   it "raises a TypeError if the constant is a Class" do
     -> do
       module ModuleSpecs::Modules::Klass; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is a String" do
-    -> { module ModuleSpecs::Modules::A; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::A; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is an Integer" do
-    -> { module ModuleSpecs::Modules::B; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::B; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is nil" do
-    -> { module ModuleSpecs::Modules::C; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::C; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is true" do
-    -> { module ModuleSpecs::Modules::D; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::D; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is false" do
-    -> { module ModuleSpecs::Modules::D; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::D; end }.should.raise(TypeError)
   end
 end
 
 describe "Assigning an anonymous module to a constant" do
   it "sets the name of the module" do
     mod = Module.new
-    mod.name.should be_nil
+    mod.name.should == nil
 
     ::ModuleSpecs_CS1 = mod
     mod.name.should == "ModuleSpecs_CS1"
diff --git a/spec/ruby/language/next_spec.rb b/spec/ruby/language/next_spec.rb
index 6fbfc4a54d8..eac151eeb30 100644
--- a/spec/ruby/language/next_spec.rb
+++ b/spec/ruby/language/next_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "causes block to return nil if invoked with an empty expression" do
-    -> { next (); 456 }.call.should be_nil
+    -> { next (); 456 }.call.should == nil
   end
 
   it "returns the argument passed" do
@@ -111,7 +111,7 @@ def self.enclosing_method
     it "is invalid and raises a SyntaxError" do
       -> {
         eval("def m; next; end")
-      }.should raise_error(SyntaxError)
+      }.should.raise(SyntaxError)
     end
   end
 end
diff --git a/spec/ruby/language/not_spec.rb b/spec/ruby/language/not_spec.rb
index 052af9b2568..23411a8e1dd 100644
--- a/spec/ruby/language/not_spec.rb
+++ b/spec/ruby/language/not_spec.rb
@@ -2,50 +2,50 @@
 
 describe "The not keyword" do
   it "negates a `true' value" do
-    (not true).should be_false
-    (not 'true').should be_false
+    (not true).should == false
+    (not 'true').should == false
   end
 
   it "negates a `false' value" do
-    (not false).should be_true
-    (not nil).should be_true
+    (not false).should == true
+    (not nil).should == true
   end
 
   it "accepts an argument" do
-    not(true).should be_false
+    not(true).should == false
   end
 
   it "returns false if the argument is true" do
-    (not(true)).should be_false
+    (not(true)).should == false
   end
 
   it "returns true if the argument is false" do
-    (not(false)).should be_true
+    (not(false)).should == true
   end
 
   it "returns true if the argument is nil" do
-    (not(nil)).should be_true
+    (not(nil)).should == true
   end
 end
 
 describe "The `!' keyword" do
   it "negates a `true' value" do
-    (!true).should be_false
-    (!'true').should be_false
+    (!true).should == false
+    (!'true').should == false
   end
 
   it "negates a `false' value" do
-    (!false).should be_true
-    (!nil).should be_true
+    (!false).should == true
+    (!nil).should == true
   end
 
   it "doubled turns a truthful object into `true'" do
-    (!!true).should be_true
-    (!!'true').should be_true
+    (!!true).should == true
+    (!!'true').should == true
   end
 
   it "doubled turns a not truthful object into `false'" do
-    (!!false).should be_false
-    (!!nil).should be_false
+    (!!false).should == false
+    (!!nil).should == false
   end
 end
diff --git a/spec/ruby/language/numbered_parameters_spec.rb b/spec/ruby/language/numbered_parameters_spec.rb
index de532c326d4..23e89a14be9 100644
--- a/spec/ruby/language/numbered_parameters_spec.rb
+++ b/spec/ruby/language/numbered_parameters_spec.rb
@@ -22,13 +22,13 @@
   it "does not support more than 9 parameters" do
     -> {
       proc { [_10] }.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
-    }.should raise_error(NameError, /undefined local variable or method [`']_10'/)
+    }.should.raise(NameError, /undefined local variable or method [`']_10'/)
   end
 
   it "can not be used in both outer and nested blocks at the same time" do
     -> {
       eval("-> { _1; -> { _2 } }")
-    }.should raise_error(SyntaxError, /numbered parameter is already used in/m)
+    }.should.raise(SyntaxError, /numbered parameter is already used in/m)
   end
 
   it "cannot be overwritten with local variable" do
@@ -37,32 +37,32 @@
         _1 = 0
         proc { _1 }.call("a").should == 0
       CODE
-    }.should raise_error(SyntaxError, /_1 is reserved for numbered parameter/)
+    }.should.raise(SyntaxError, /_1 is reserved for numbered parameter/)
   end
 
   it "errors when numbered parameter is overwritten with local variable" do
     -> {
       eval("_1 = 0")
-    }.should raise_error(SyntaxError, /_1 is reserved for numbered parameter/)
+    }.should.raise(SyntaxError, /_1 is reserved for numbered parameter/)
   end
 
   it "raises SyntaxError when block parameters are specified explicitly" do
-    -> { eval("-> () { _1 }")         }.should raise_error(SyntaxError, /ordinary parameter is defined/)
-    -> { eval("-> (x) { _1 }")        }.should raise_error(SyntaxError, /ordinary parameter is defined/)
+    -> { eval("-> () { _1 }")         }.should.raise(SyntaxError, /ordinary parameter is defined/)
+    -> { eval("-> (x) { _1 }")        }.should.raise(SyntaxError, /ordinary parameter is defined/)
 
-    -> { eval("proc { || _1 }")       }.should raise_error(SyntaxError, /ordinary parameter is defined/)
-    -> { eval("proc { |x| _1 }")      }.should raise_error(SyntaxError, /ordinary parameter is defined/)
+    -> { eval("proc { || _1 }")       }.should.raise(SyntaxError, /ordinary parameter is defined/)
+    -> { eval("proc { |x| _1 }")      }.should.raise(SyntaxError, /ordinary parameter is defined/)
 
-    -> { eval("lambda { || _1 }")     }.should raise_error(SyntaxError, /ordinary parameter is defined/)
-    -> { eval("lambda { |x| _1 }")    }.should raise_error(SyntaxError, /ordinary parameter is defined/)
+    -> { eval("lambda { || _1 }")     }.should.raise(SyntaxError, /ordinary parameter is defined/)
+    -> { eval("lambda { |x| _1 }")    }.should.raise(SyntaxError, /ordinary parameter is defined/)
 
-    -> { eval("['a'].map { || _1 }")  }.should raise_error(SyntaxError, /ordinary parameter is defined/)
-    -> { eval("['a'].map { |x| _1 }") }.should raise_error(SyntaxError, /ordinary parameter is defined/)
+    -> { eval("['a'].map { || _1 }")  }.should.raise(SyntaxError, /ordinary parameter is defined/)
+    -> { eval("['a'].map { |x| _1 }") }.should.raise(SyntaxError, /ordinary parameter is defined/)
   end
 
   describe "assigning to a numbered parameter" do
     it "raises SyntaxError" do
-      -> { eval("proc { _1 = 0 }") }.should raise_error(SyntaxError, /_1 is reserved for numbered parameter/)
+      -> { eval("proc { _1 = 0 }") }.should.raise(SyntaxError, /_1 is reserved for numbered parameter/)
     end
   end
 
@@ -108,6 +108,6 @@
     obj = Object.new
     def obj.foo; _1 end
 
-    -> { obj.foo("a") }.should raise_error(ArgumentError, /wrong number of arguments/)
+    -> { obj.foo("a") }.should.raise(ArgumentError, /wrong number of arguments/)
   end
 end
diff --git a/spec/ruby/language/numbers_spec.rb b/spec/ruby/language/numbers_spec.rb
index a8e023efb6a..ed0e49c048d 100644
--- a/spec/ruby/language/numbers_spec.rb
+++ b/spec/ruby/language/numbers_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it "cannot have a leading underscore" do
-    -> { eval("_4_2") }.should raise_error(NameError)
+    -> { eval("_4_2") }.should.raise(NameError)
   end
 
   it "can have a decimal point" do
@@ -20,8 +20,8 @@
 
   it "must have a digit before the decimal point" do
     0.75.should == 0.75
-    -> { eval(".75")  }.should raise_error(SyntaxError)
-    -> { eval("-.75") }.should raise_error(SyntaxError)
+    -> { eval(".75")  }.should.raise(SyntaxError)
+    -> { eval("-.75") }.should.raise(SyntaxError)
   end
 
   it "can have an exponent" do
diff --git a/spec/ruby/language/optional_assignments_spec.rb b/spec/ruby/language/optional_assignments_spec.rb
index 5fe3e3671b4..ebb5d363517 100644
--- a/spec/ruby/language/optional_assignments_spec.rb
+++ b/spec/ruby/language/optional_assignments_spec.rb
@@ -603,7 +603,7 @@ def []=(k1, k2, k3, v)
     end
 
     it 'with &&= assignments will fail with non-existent constants' do
-      -> { Object::A &&= 10 }.should raise_error(NameError)
+      -> { Object::A &&= 10 }.should.raise(NameError)
     end
 
     it 'with operator assignments' do
@@ -615,7 +615,7 @@ def []=(k1, k2, k3, v)
     end
 
     it 'with operator assignments will fail with non-existent constants' do
-      -> { Object::A += 10 }.should raise_error(NameError)
+      -> { Object::A += 10 }.should.raise(NameError)
     end
   end
 end
@@ -623,7 +623,7 @@ def []=(k1, k2, k3, v)
 describe 'Optional constant assignment' do
   describe 'with ||=' do
     it "assigns a scoped constant if previously undefined" do
-      ConstantSpecs.should_not have_constant(:OpAssignUndefined)
+      ConstantSpecs.should_not.const_defined?(:OpAssignUndefined)
       module ConstantSpecs
         OpAssignUndefined ||= 42
       end
@@ -679,7 +679,7 @@ module ConstantSpecs
 
       -> {
         (x += 1; raise Exception; ConstantSpecs::ClassA)::OR_ASSIGNED_CONSTANT3 ||= (y += 1; :assigned)
-      }.should raise_error(Exception)
+      }.should.raise(Exception)
 
       x.should == 1
       y.should == 0
@@ -693,7 +693,7 @@ module ConstantSpecs
 
       -> {
         (x += 1; raise Exception; ConstantSpecs::ClassA)::NIL_OR_ASSIGNED_CONSTANT3 ||= (y += 1; :assigned)
-      }.should raise_error(Exception)
+      }.should.raise(Exception)
 
       x.should == 1
       y.should == 0
diff --git a/spec/ruby/language/or_spec.rb b/spec/ruby/language/or_spec.rb
index fb75e788f16..8ae577a142b 100644
--- a/spec/ruby/language/or_spec.rb
+++ b/spec/ruby/language/or_spec.rb
@@ -26,24 +26,24 @@
   end
 
   it "treats empty expressions as nil" do
-    (() || true).should be_true
-    (() || false).should be_false
-    (true || ()).should be_true
-    (false || ()).should be_nil
-    (() || ()).should be_nil
+    (() || true).should == true
+    (() || false).should == false
+    (true || ()).should == true
+    (false || ()).should == nil
+    (() || ()).should == nil
   end
 
   it "has a higher precedence than 'break' in 'break true || false'" do
     # see also 'break true or false' below
-    -> { break false || true }.call.should be_true
+    -> { break false || true }.call.should == true
   end
 
   it "has a higher precedence than 'next' in 'next true || false'" do
-    -> { next false || true }.call.should be_true
+    -> { next false || true }.call.should == true
   end
 
   it "has a higher precedence than 'return' in 'return true || false'" do
-    -> { return false || true }.call.should be_true
+    -> { return false || true }.call.should == true
   end
 end
 
@@ -68,23 +68,23 @@
   end
 
   it "treats empty expressions as nil" do
-    (() or true).should be_true
-    (() or false).should be_false
-    (true or ()).should be_true
-    (false or ()).should be_nil
-    (() or ()).should be_nil
+    (() or true).should == true
+    (() or false).should == false
+    (true or ()).should == true
+    (false or ()).should == nil
+    (() or ()).should == nil
   end
 
   it "has a lower precedence than 'break' in 'break true or false'" do
     # see also 'break true || false' above
-    -> { eval "break true or false" }.should raise_error(SyntaxError, /void value expression/)
+    -> { eval "break true or false" }.should.raise(SyntaxError, /void value expression/)
   end
 
   it "has a lower precedence than 'next' in 'next true or false'" do
-    -> { eval "next true or false" }.should raise_error(SyntaxError, /void value expression/)
+    -> { eval "next true or false" }.should.raise(SyntaxError, /void value expression/)
   end
 
   it "has a lower precedence than 'return' in 'return true or false'" do
-    -> { eval "return true or false" }.should raise_error(SyntaxError, /void value expression/)
+    -> { eval "return true or false" }.should.raise(SyntaxError, /void value expression/)
   end
 end
diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb
index c1a6f0e4d63..a24500c9fd0 100644
--- a/spec/ruby/language/pattern_matching_spec.rb
+++ b/spec/ruby/language/pattern_matching_spec.rb
@@ -185,7 +185,7 @@
         in []
         end
       RUBY
-    }.should raise_error(SyntaxError, /syntax error, unexpected `in'|\(eval\):3: syntax error, unexpected keyword_in|unexpected 'in'/)
+    }.should.raise(SyntaxError, /syntax error, unexpected `in'|\(eval\):3: syntax error, unexpected keyword_in|unexpected 'in'/)
 
     -> {
       eval <<~RUBY
@@ -194,7 +194,7 @@
         when 1 == 1
         end
       RUBY
-    }.should raise_error(SyntaxError, /syntax error, unexpected `when'|\(eval\):3: syntax error, unexpected keyword_when|unexpected 'when'/)
+    }.should.raise(SyntaxError, /syntax error, unexpected `when'|\(eval\):3: syntax error, unexpected keyword_when|unexpected 'when'/)
   end
 
   it "checks patterns until the first matching" do
@@ -222,14 +222,14 @@
       case [0, 1]
       in [0]
       end
-    }.should raise_error(NoMatchingPatternError, /\[0, 1\]/)
+    }.should.raise(NoMatchingPatternError, /\[0, 1\]/)
 
     error_pattern = ruby_version_is("3.4") ? /\{a: 0, b: 1\}/ : /\{:a=>0, :b=>1\}/
     -> {
       case {a: 0, b: 1}
       in a: 1, b: 1
       end
-    }.should raise_error(NoMatchingPatternError, error_pattern)
+    }.should.raise(NoMatchingPatternError, error_pattern)
   end
 
   it "raises NoMatchingPatternError if no pattern matches and evaluates the expression only once" do
@@ -238,7 +238,7 @@
       case (evals += 1; [0, 1])
       in [0]
       end
-    }.should raise_error(NoMatchingPatternError, /\[0, 1\]/)
+    }.should.raise(NoMatchingPatternError, /\[0, 1\]/)
     evals.should == 1
   end
 
@@ -250,7 +250,7 @@
           true
         end
       RUBY
-    }.should raise_error(SyntaxError, /unexpected|expected a delimiter after the patterns of an `in` clause/)
+    }.should.raise(SyntaxError, /unexpected|expected a delimiter after the patterns of an `in` clause/)
   end
 
   it "evaluates the case expression once for multiple patterns, caching the result" do
@@ -336,7 +336,7 @@
         case [0, 1]
         in [0, 1] if false
         end
-      }.should raise_error(NoMatchingPatternError, /\[0, 1\]/)
+      }.should.raise(NoMatchingPatternError, /\[0, 1\]/)
     end
   end
 
@@ -438,7 +438,7 @@
           in [a, a]
           end
         RUBY
-      }.should raise_error(SyntaxError, /duplicated variable name/)
+      }.should.raise(SyntaxError, /duplicated variable name/)
     end
 
     it "supports existing variables in a pattern specified with ^ operator" do
@@ -474,7 +474,7 @@
             false
           end
         RUBY
-      }.should raise_error(SyntaxError, /n: no such local variable/)
+      }.should.raise(SyntaxError, /n: no such local variable/)
     end
   end
 
@@ -493,7 +493,7 @@
           in [0, 0] | [0, a]
           end
         RUBY
-      }.should raise_error(SyntaxError)
+      }.should.raise(SyntaxError)
     end
 
     it "support underscore prefixed variables in alternation" do
@@ -674,7 +674,7 @@ def obj.deconstruct
         in Object[]
         else
         end
-      }.should raise_error(TypeError, /deconstruct must return Array/)
+      }.should.raise(TypeError, /deconstruct must return Array/)
     end
 
     it "accepts a subclass of Array from #deconstruct" do
@@ -870,7 +870,7 @@ def obj.deconstruct
           in {"a" => 1}
           end
         RUBY
-      }.should raise_error(SyntaxError, /unexpected|expected a label as the key in the hash pattern/)
+      }.should.raise(SyntaxError, /unexpected|expected a label as the key in the hash pattern/)
     end
 
     it "does not support string interpolation in keys" do
@@ -880,7 +880,7 @@ def obj.deconstruct
           in {"#{x}": 1}
           end
         RUBY
-      }.should raise_error(SyntaxError, /symbol literal with interpolation is not allowed|expected a label as the key in the hash pattern/)
+      }.should.raise(SyntaxError, /symbol literal with interpolation is not allowed|expected a label as the key in the hash pattern/)
     end
 
     it "raise SyntaxError when keys duplicate in pattern" do
@@ -890,7 +890,7 @@ def obj.deconstruct
           in {a: 1, b: 2, a: 3}
           end
         RUBY
-      }.should raise_error(SyntaxError, /duplicated key name/)
+      }.should.raise(SyntaxError, /duplicated key name/)
     end
 
     it "matches an object with #deconstruct_keys method which returns a Hash with equal keys and each value in Hash matches value in pattern" do
@@ -969,7 +969,7 @@ def obj.deconstruct_keys(*)
         case obj
         in Object[a: 1]
         end
-      }.should raise_error(TypeError, /deconstruct_keys must return Hash/)
+      }.should.raise(TypeError, /deconstruct_keys must return Hash/)
     end
 
     it "does not match object if #deconstruct_keys method returns Hash with non-symbol keys" do
diff --git a/spec/ruby/language/precedence_spec.rb b/spec/ruby/language/precedence_spec.rb
index 5e606c16d86..edb990525ee 100644
--- a/spec/ruby/language/precedence_spec.rb
+++ b/spec/ruby/language/precedence_spec.rb
@@ -251,12 +251,12 @@ def >=(a); 0; end;
   end
 
   it "<=> == === != =~ !~ are non-associative" do
-    -> { eval("1 <=> 2 <=> 3")  }.should raise_error(SyntaxError)
-    -> { eval("1 == 2 == 3")  }.should raise_error(SyntaxError)
-    -> { eval("1 === 2 === 3")  }.should raise_error(SyntaxError)
-    -> { eval("1 != 2 != 3")  }.should raise_error(SyntaxError)
-    -> { eval("1 =~ 2 =~ 3")  }.should raise_error(SyntaxError)
-    -> { eval("1 !~ 2 !~ 3")  }.should raise_error(SyntaxError)
+    -> { eval("1 <=> 2 <=> 3")  }.should.raise(SyntaxError)
+    -> { eval("1 == 2 == 3")  }.should.raise(SyntaxError)
+    -> { eval("1 === 2 === 3")  }.should.raise(SyntaxError)
+    -> { eval("1 != 2 != 3")  }.should.raise(SyntaxError)
+    -> { eval("1 =~ 2 =~ 3")  }.should.raise(SyntaxError)
+    -> { eval("1 !~ 2 !~ 3")  }.should.raise(SyntaxError)
   end
 
   it "<=> == === != =~ !~ have higher precedence than &&" do
@@ -290,8 +290,8 @@ class FalseClass; undef_method :=~; end
   end
 
   it ".. ... are non-associative" do
-    -> { eval("1..2..3")  }.should raise_error(SyntaxError)
-    -> { eval("1...2...3")  }.should raise_error(SyntaxError)
+    -> { eval("1..2..3")  }.should.raise(SyntaxError)
+    -> { eval("1...2...3")  }.should.raise(SyntaxError)
   end
 
   it ".. ... have higher precedence than ? :" do
diff --git a/spec/ruby/language/predefined_spec.rb b/spec/ruby/language/predefined_spec.rb
index fc1667a38fe..d57b924bcf6 100644
--- a/spec/ruby/language/predefined_spec.rb
+++ b/spec/ruby/language/predefined_spec.rb
@@ -40,12 +40,12 @@
 describe "Predefined global $~" do
   it "is set to contain the MatchData object of the last match if successful" do
     md = /foo/.match 'foo'
-    $~.should be_kind_of(MatchData)
-    $~.should equal md
+    $~.should.is_a?(MatchData)
+    $~.should.equal? md
 
     /bar/ =~ 'bar'
-    $~.should be_kind_of(MatchData)
-    $~.should_not equal md
+    $~.should.is_a?(MatchData)
+    $~.should_not.equal? md
   end
 
   it "is set to nil if the last match was unsuccessful" do
@@ -87,10 +87,10 @@ def obj.foo2(&proc); proc.call; end
     $~ = nil
     $~.should == nil
     $~ = /foo/.match("foo")
-    $~.should be_an_instance_of(MatchData)
+    $~.should.instance_of?(MatchData)
 
-    -> { $~ = Object.new }.should raise_error(TypeError, 'wrong argument type Object (expected MatchData)')
-    -> { $~ = 1 }.should raise_error(TypeError, 'wrong argument type Integer (expected MatchData)')
+    -> { $~ = Object.new }.should.raise(TypeError, 'wrong argument type Object (expected MatchData)')
+    -> { $~ = 1 }.should.raise(TypeError, 'wrong argument type Integer (expected MatchData)')
   end
 
   it "changes the value of derived capture globals when assigned" do
@@ -135,20 +135,20 @@ def obj.foo2(&proc); proc.call; end
 
   it "sets the encoding to the encoding of the source String" do
     "abc".dup.force_encoding(Encoding::EUC_JP) =~ /b/
-    $&.encoding.should equal(Encoding::EUC_JP)
+    $&.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "is read-only" do
     -> {
       eval %q{$& = ""}
-    }.should raise_error(SyntaxError, /Can't set variable \$&/)
+    }.should.raise(SyntaxError, /Can't set variable \$&/)
   end
 
   it "is read-only when aliased" do
     alias $predefined_spec_ampersand $&
     -> {
       $predefined_spec_ampersand = ""
-    }.should raise_error(NameError, '$predefined_spec_ampersand is a read-only variable')
+    }.should.raise(NameError, '$predefined_spec_ampersand is a read-only variable')
   end
 end
 
@@ -161,25 +161,25 @@ def obj.foo2(&proc); proc.call; end
 
   it "sets the encoding to the encoding of the source String" do
     "abc".dup.force_encoding(Encoding::EUC_JP) =~ /b/
-    $`.encoding.should equal(Encoding::EUC_JP)
+    $`.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "sets an empty result to the encoding of the source String" do
     "abc".dup.force_encoding(Encoding::ISO_8859_1) =~ /a/
-    $`.encoding.should equal(Encoding::ISO_8859_1)
+    $`.encoding.should.equal?(Encoding::ISO_8859_1)
   end
 
   it "is read-only" do
     -> {
       eval %q{$` = ""}
-    }.should raise_error(SyntaxError, /Can't set variable \$`/)
+    }.should.raise(SyntaxError, /Can't set variable \$`/)
   end
 
   it "is read-only when aliased" do
     alias $predefined_spec_backquote $`
     -> {
       $predefined_spec_backquote = ""
-    }.should raise_error(NameError, '$predefined_spec_backquote is a read-only variable')
+    }.should.raise(NameError, '$predefined_spec_backquote is a read-only variable')
   end
 end
 
@@ -192,25 +192,25 @@ def obj.foo2(&proc); proc.call; end
 
   it "sets the encoding to the encoding of the source String" do
     "abc".dup.force_encoding(Encoding::EUC_JP) =~ /b/
-    $'.encoding.should equal(Encoding::EUC_JP)
+    $'.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "sets an empty result to the encoding of the source String" do
     "abc".dup.force_encoding(Encoding::ISO_8859_1) =~ /c/
-    $'.encoding.should equal(Encoding::ISO_8859_1)
+    $'.encoding.should.equal?(Encoding::ISO_8859_1)
   end
 
   it "is read-only" do
     -> {
       eval %q{$' = ""}
-    }.should raise_error(SyntaxError, /Can't set variable \$'/)
+    }.should.raise(SyntaxError, /Can't set variable \$'/)
   end
 
   it "is read-only when aliased" do
     alias $predefined_spec_single_quote $'
     -> {
       $predefined_spec_single_quote = ""
-    }.should raise_error(NameError, '$predefined_spec_single_quote is a read-only variable')
+    }.should.raise(NameError, '$predefined_spec_single_quote is a read-only variable')
   end
 end
 
@@ -228,20 +228,20 @@ def obj.foo2(&proc); proc.call; end
 
   it "sets the encoding to the encoding of the source String" do
     "abc".dup.force_encoding(Encoding::EUC_JP) =~ /(b)/
-    $+.encoding.should equal(Encoding::EUC_JP)
+    $+.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "is read-only" do
     -> {
       eval %q{$+ = ""}
-    }.should raise_error(SyntaxError, /Can't set variable \$\+/)
+    }.should.raise(SyntaxError, /Can't set variable \$\+/)
   end
 
   it "is read-only when aliased" do
     alias $predefined_spec_plus $+
     -> {
       $predefined_spec_plus = ""
-    }.should raise_error(NameError, '$predefined_spec_plus is a read-only variable')
+    }.should.raise(NameError, '$predefined_spec_plus is a read-only variable')
   end
 end
 
@@ -268,7 +268,7 @@ def test(arg)
 
   it "sets the encoding to the encoding of the source String" do
     "abc".dup.force_encoding(Encoding::EUC_JP) =~ /(b)/
-    $1.encoding.should equal(Encoding::EUC_JP)
+    $1.encoding.should.equal?(Encoding::EUC_JP)
   end
 end
 
@@ -282,16 +282,16 @@ def test(arg)
   end
 
   it "raises TypeError error if assigned to nil" do
-    -> { $stdout = nil }.should raise_error(TypeError, '$stdout must have write method, NilClass given')
+    -> { $stdout = nil }.should.raise(TypeError, '$stdout must have write method, NilClass given')
   end
 
   it "raises TypeError error if assigned to object that doesn't respond to #write" do
     obj = mock('object')
-    -> { $stdout = obj }.should raise_error(TypeError)
+    -> { $stdout = obj }.should.raise(TypeError)
 
     obj.stub!(:write)
     $stdout = obj
-    $stdout.should equal(obj)
+    $stdout.should.equal?(obj)
   end
 end
 
@@ -309,7 +309,7 @@ def test(arg)
   it "is read-only" do
     -> {
       $! = []
-    }.should raise_error(NameError, '$! is a read-only variable')
+    }.should.raise(NameError, '$! is a read-only variable')
   end
 
   # See http://jira.codehaus.org/browse/JRUBY-5550
@@ -586,7 +586,7 @@ def foo
     begin
       raise
     rescue
-      $@.should be_an_instance_of(Array)
+      $@.should.instance_of?(Array)
       $@.should == $!.backtrace
     end
   end
@@ -608,7 +608,7 @@ def foo
     begin
       raise
     rescue
-      $@.should be_an_instance_of(Array)
+      $@.should.instance_of?(Array)
       $@.should == $!.backtrace
     end
   end
@@ -636,7 +636,7 @@ def foo
   it "cannot be assigned when there is no a rescued exception" do
     -> {
       $@ = []
-    }.should raise_error(ArgumentError, '$! not set')
+    }.should.raise(ArgumentError, '$! not set')
   end
 end
 
@@ -691,7 +691,7 @@ def foo
     it "can be assigned a String" do
       str = +"abc"
       $/ = str
-      $/.should equal(str)
+      $/.should.equal?(str)
     end
   end
 
@@ -702,7 +702,7 @@ def foo
       str.instance_variable_set(:@ivar, 1)
       $/ = str
       $/.should.frozen?
-      $/.should be_an_instance_of(String)
+      $/.should.instance_of?(String)
       $/.should_not.instance_variable_defined?(:@ivar)
       $/.should == str
     end
@@ -717,12 +717,13 @@ def foo
     it "assigns the given String if it's frozen and has no instance variables" do
       str = "abc".freeze
       $/ = str
-      $/.should equal(str)
+      $/.should.equal?(str)
     end
   end
+
   it "can be assigned nil" do
     $/ = nil
-    $/.should be_nil
+    $/.should == nil
   end
 
   it "returns the value assigned" do
@@ -731,22 +732,22 @@ def foo
 
   it "changes $-0" do
     $/ = "xyz"
-    $-0.should equal($/)
+    $-0.should.equal?($/)
   end
 
   it "does not call #to_str to convert the object to a String" do
     obj = mock("$/ value")
     obj.should_not_receive(:to_str)
 
-    -> { $/ = obj }.should raise_error(TypeError, 'value of $/ must be String')
+    -> { $/ = obj }.should.raise(TypeError, 'value of $/ must be String')
   end
 
   it "raises a TypeError if assigned an Integer" do
-    -> { $/ = 1 }.should raise_error(TypeError, 'value of $/ must be String')
+    -> { $/ = 1 }.should.raise(TypeError, 'value of $/ must be String')
   end
 
   it "raises a TypeError if assigned a boolean" do
-    -> { $/ = true }.should raise_error(TypeError, 'value of $/ must be String')
+    -> { $/ = true }.should.raise(TypeError, 'value of $/ must be String')
   end
 
   it "warns if assigned non-nil" do
@@ -771,7 +772,7 @@ def foo
     it "can be assigned a String" do
       str = +"abc"
       $-0 = str
-      $-0.should equal(str)
+      $-0.should.equal?(str)
     end
   end
 
@@ -782,7 +783,7 @@ def foo
       str.instance_variable_set(:@ivar, 1)
       $-0 = str
       $-0.should.frozen?
-      $-0.should be_an_instance_of(String)
+      $-0.should.instance_of?(String)
       $-0.should_not.instance_variable_defined?(:@ivar)
       $-0.should == str
     end
@@ -797,13 +798,13 @@ def foo
     it "assigns the given String if it's frozen and has no instance variables" do
       str = "abc".freeze
       $-0 = str
-      $-0.should equal(str)
+      $-0.should.equal?(str)
     end
   end
 
   it "can be assigned nil" do
     $-0 = nil
-    $-0.should be_nil
+    $-0.should == nil
   end
 
   it "returns the value assigned" do
@@ -812,22 +813,22 @@ def foo
 
   it "changes $/" do
     $-0 = "xyz"
-    $/.should equal($-0)
+    $/.should.equal?($-0)
   end
 
   it "does not call #to_str to convert the object to a String" do
     obj = mock("$-0 value")
     obj.should_not_receive(:to_str)
 
-    -> { $-0 = obj }.should raise_error(TypeError, 'value of $-0 must be String')
+    -> { $-0 = obj }.should.raise(TypeError, 'value of $-0 must be String')
   end
 
   it "raises a TypeError if assigned an Integer" do
-    -> { $-0 = 1 }.should raise_error(TypeError, 'value of $-0 must be String')
+    -> { $-0 = 1 }.should.raise(TypeError, 'value of $-0 must be String')
   end
 
   it "raises a TypeError if assigned a boolean" do
-    -> { $-0 = true }.should raise_error(TypeError, 'value of $-0 must be String')
+    -> { $-0 = true }.should.raise(TypeError, 'value of $-0 must be String')
   end
 
   it "warns if assigned non-nil" do
@@ -849,12 +850,12 @@ def foo
   it "can be assigned a String" do
     str = "abc"
     $\ = str
-    $\.should equal(str)
+    $\.should.equal?(str)
   end
 
   it "can be assigned nil" do
     $\ = nil
-    $\.should be_nil
+    $\.should == nil
   end
 
   it "returns the value assigned" do
@@ -865,12 +866,12 @@ def foo
     obj = mock("$\\ value")
     obj.should_not_receive(:to_str)
 
-    -> { $\ = obj }.should raise_error(TypeError, 'value of $\ must be String')
+    -> { $\ = obj }.should.raise(TypeError, 'value of $\ must be String')
   end
 
   it "raises a TypeError if assigned not String" do
-    -> { $\ = 1 }.should raise_error(TypeError, 'value of $\ must be String')
-    -> { $\ = true }.should raise_error(TypeError, 'value of $\ must be String')
+    -> { $\ = 1 }.should.raise(TypeError, 'value of $\ must be String')
+    -> { $\ = true }.should.raise(TypeError, 'value of $\ must be String')
   end
 
   it "warns if assigned non-nil" do
@@ -884,11 +885,11 @@ def foo
   end
 
   it "defaults to nil" do
-    $,.should be_nil
+    $,.should == nil
   end
 
   it "raises TypeError if assigned a non-String" do
-    -> { $, = Object.new }.should raise_error(TypeError, 'value of $, must be String')
+    -> { $, = Object.new }.should.raise(TypeError, 'value of $, must be String')
   end
 
   it "warns if assigned non-nil" do
@@ -919,7 +920,7 @@ def foo
     obj = mock("bad-value")
     obj.should_receive(:to_int).and_return('abc')
 
-    -> { $. = obj }.should raise_error(TypeError)
+    -> { $. = obj }.should.raise(TypeError)
   end
 end
 
@@ -984,7 +985,7 @@ def obj.foo2; yield; end
     end
 
     Thread.pass until running
-    $_.should be_nil
+    $_.should == nil
 
     thr.join
   end
@@ -1055,7 +1056,7 @@ def obj.foo2; yield; end
   end
 
   it "does not include the current directory" do
-    $:.should_not include(".")
+    $:.should_not.include?(".")
   end
 
   it "is the same object as $LOAD_PATH and $-I" do
@@ -1065,7 +1066,7 @@ def obj.foo2; yield; end
 
   it "can be changed via <<" do
     $: << "foo"
-    $:.should include("foo")
+    $:.should.include?("foo")
   ensure
     $:.delete("foo")
   end
@@ -1073,15 +1074,15 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $: = []
-    }.should raise_error(NameError, '$: is a read-only variable')
+    }.should.raise(NameError, '$: is a read-only variable')
 
     -> {
       $LOAD_PATH = []
-    }.should raise_error(NameError, '$LOAD_PATH is a read-only variable')
+    }.should.raise(NameError, '$LOAD_PATH is a read-only variable')
 
     -> {
       $-I = []
-    }.should raise_error(NameError, '$-I is a read-only variable')
+    }.should.raise(NameError, '$-I is a read-only variable')
   end
 
   it "default $LOAD_PATH entries until sitelibdir included have @gem_prelude_index set" do
@@ -1096,24 +1097,24 @@ def obj.foo2; yield; end
       idx = $:.index(RbConfig::CONFIG['sitelibdir'])
     end
 
-    $:[idx..-1].all? { |p| p.instance_variable_defined?(:@gem_prelude_index) }.should be_true
-    $:[0...idx].all? { |p| !p.instance_variable_defined?(:@gem_prelude_index) }.should be_true
+    $:[idx..-1].all? { |p| p.instance_variable_defined?(:@gem_prelude_index) }.should == true
+    $:[0...idx].all? { |p| !p.instance_variable_defined?(:@gem_prelude_index) }.should == true
   end
 end
 
 describe "Global variable $\"" do
   it "is an alias for $LOADED_FEATURES" do
-    $".should equal $LOADED_FEATURES
+    $".should.equal? $LOADED_FEATURES
   end
 
   it "is read-only" do
     -> {
       $" = []
-    }.should raise_error(NameError, '$" is a read-only variable')
+    }.should.raise(NameError, '$" is a read-only variable')
 
     -> {
       $LOADED_FEATURES = []
-    }.should raise_error(NameError, '$LOADED_FEATURES is a read-only variable')
+    }.should.raise(NameError, '$LOADED_FEATURES is a read-only variable')
   end
 end
 
@@ -1121,7 +1122,7 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $< = nil
-    }.should raise_error(NameError, '$< is a read-only variable')
+    }.should.raise(NameError, '$< is a read-only variable')
   end
 end
 
@@ -1129,7 +1130,7 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $FILENAME = "-"
-    }.should raise_error(NameError, '$FILENAME is a read-only variable')
+    }.should.raise(NameError, '$FILENAME is a read-only variable')
   end
 end
 
@@ -1137,30 +1138,30 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $? = nil
-    }.should raise_error(NameError, '$? is a read-only variable')
+    }.should.raise(NameError, '$? is a read-only variable')
   end
 
   it "is thread-local" do
     system(ruby_cmd('exit 0'))
-    Thread.new { $?.should be_nil }.join
+    Thread.new { $?.should == nil }.join
   end
 end
 
 describe "Global variable $-a" do
   it "is read-only" do
-    -> { $-a = true }.should raise_error(NameError, '$-a is a read-only variable')
+    -> { $-a = true }.should.raise(NameError, '$-a is a read-only variable')
   end
 end
 
 describe "Global variable $-l" do
   it "is read-only" do
-    -> { $-l = true }.should raise_error(NameError, '$-l is a read-only variable')
+    -> { $-l = true }.should.raise(NameError, '$-l is a read-only variable')
   end
 end
 
 describe "Global variable $-p" do
   it "is read-only" do
-    -> { $-p = true }.should raise_error(NameError, '$-p is a read-only variable')
+    -> { $-p = true }.should.raise(NameError, '$-p is a read-only variable')
   end
 end
 
@@ -1175,9 +1176,9 @@ def obj.foo2; yield; end
 
   it "is an alias of $DEBUG" do
     $DEBUG = true
-    $-d.should be_true
+    $-d.should == true
     $-d = false
-    $DEBUG.should be_false
+    $DEBUG.should == false
   end
 end
 
@@ -1191,24 +1192,24 @@ def obj.foo2; yield; end
   end
 
   it "is false by default" do
-    $VERBOSE.should be_false
+    $VERBOSE.should == false
   end
 
   it "converts truthy values to true" do
     [true, 1, 0, [], ""].each do |true_value|
       $VERBOSE = true_value
-      $VERBOSE.should be_true
+      $VERBOSE.should == true
     end
   end
 
   it "allows false" do
     $VERBOSE = false
-    $VERBOSE.should be_false
+    $VERBOSE.should == false
   end
 
   it "allows nil without coercing to false" do
     $VERBOSE = nil
-    $VERBOSE.should be_nil
+    $VERBOSE.should == nil
   end
 end
 
@@ -1223,9 +1224,9 @@ def obj.foo2; yield; end
 
   it "is an alias of $VERBOSE" do
     $VERBOSE = true
-    eval(@method).should be_true
+    eval(@method).should == true
     eval("#{@method} = false")
-    $VERBOSE.should be_false
+    $VERBOSE.should == false
   end
 end
 
@@ -1262,7 +1263,7 @@ def obj.foo2; yield; end
     it "actually sets the program name" do
       title = "rubyspec-dollar0-test"
       $0 = title
-      `ps -ocommand= -p#{$$}`.should include(title)
+      `ps -ocommand= -p#{$$}`.should.include?(title)
     end
   end
 
@@ -1271,7 +1272,7 @@ def obj.foo2; yield; end
   end
 
   it "raises a TypeError when not given an object that can be coerced to a String" do
-    -> { $0 = nil }.should raise_error(TypeError)
+    -> { $0 = nil }.should.raise(TypeError)
   end
 end
 
@@ -1307,37 +1308,37 @@ def obj.foo2; yield; end
 
 describe "The predefined standard object nil" do
   it "is an instance of NilClass" do
-    nil.should be_kind_of(NilClass)
+    nil.should.is_a?(NilClass)
   end
 
   it "raises a SyntaxError if assigned to" do
-    -> { eval("nil = true") }.should raise_error(SyntaxError, /Can't assign to nil/)
+    -> { eval("nil = true") }.should.raise(SyntaxError, /Can't assign to nil/)
   end
 end
 
 describe "The predefined standard object true" do
   it "is an instance of TrueClass" do
-    true.should be_kind_of(TrueClass)
+    true.should.is_a?(TrueClass)
   end
 
   it "raises a SyntaxError if assigned to" do
-    -> { eval("true = false") }.should raise_error(SyntaxError, /Can't assign to true/)
+    -> { eval("true = false") }.should.raise(SyntaxError, /Can't assign to true/)
   end
 end
 
 describe "The predefined standard object false" do
   it "is an instance of FalseClass" do
-    false.should be_kind_of(FalseClass)
+    false.should.is_a?(FalseClass)
   end
 
   it "raises a SyntaxError if assigned to" do
-    -> { eval("false = nil") }.should raise_error(SyntaxError, /Can't assign to false/)
+    -> { eval("false = nil") }.should.raise(SyntaxError, /Can't assign to false/)
   end
 end
 
 describe "The self pseudo-variable" do
   it "raises a SyntaxError if assigned to" do
-    -> { eval("self = 1") }.should raise_error(SyntaxError, /Can't change the value of self/)
+    -> { eval("self = 1") }.should.raise(SyntaxError, /Can't change the value of self/)
   end
 end
 
@@ -1432,21 +1433,21 @@ def obj.foo2; yield; end
   describe "STDIN" do
     platform_is_not :windows do
       it "has the same external encoding as Encoding.default_external" do
-        STDIN.external_encoding.should equal(Encoding.default_external)
+        STDIN.external_encoding.should.equal?(Encoding.default_external)
       end
 
       it "has the same external encoding as Encoding.default_external when that encoding is changed" do
         Encoding.default_external = Encoding::ISO_8859_16
-        STDIN.external_encoding.should equal(Encoding::ISO_8859_16)
+        STDIN.external_encoding.should.equal?(Encoding::ISO_8859_16)
       end
 
       it "has nil for the internal encoding" do
-        STDIN.internal_encoding.should be_nil
+        STDIN.internal_encoding.should == nil
       end
 
       it "has nil for the internal encoding despite Encoding.default_internal being changed" do
         Encoding.default_internal = Encoding::IBM437
-        STDIN.internal_encoding.should be_nil
+        STDIN.internal_encoding.should == nil
       end
     end
 
@@ -1466,12 +1467,12 @@ def obj.foo2; yield; end
 
   describe "STDOUT" do
     it "has nil for the external encoding" do
-      STDOUT.external_encoding.should be_nil
+      STDOUT.external_encoding.should == nil
     end
 
     it "has nil for the external encoding despite Encoding.default_external being changed" do
       Encoding.default_external = Encoding::ISO_8859_1
-      STDOUT.external_encoding.should be_nil
+      STDOUT.external_encoding.should == nil
     end
 
     it "has the encodings set by #set_encoding" do
@@ -1481,23 +1482,23 @@ def obj.foo2; yield; end
     end
 
     it "has nil for the internal encoding" do
-      STDOUT.internal_encoding.should be_nil
+      STDOUT.internal_encoding.should == nil
     end
 
     it "has nil for the internal encoding despite Encoding.default_internal being changed" do
       Encoding.default_internal = Encoding::IBM437
-      STDOUT.internal_encoding.should be_nil
+      STDOUT.internal_encoding.should == nil
     end
   end
 
   describe "STDERR" do
     it "has nil for the external encoding" do
-      STDERR.external_encoding.should be_nil
+      STDERR.external_encoding.should == nil
     end
 
     it "has nil for the external encoding despite Encoding.default_external being changed" do
       Encoding.default_external = Encoding::ISO_8859_1
-      STDERR.external_encoding.should be_nil
+      STDERR.external_encoding.should == nil
     end
 
     it "has the encodings set by #set_encoding" do
@@ -1507,12 +1508,12 @@ def obj.foo2; yield; end
     end
 
     it "has nil for the internal encoding" do
-      STDERR.internal_encoding.should be_nil
+      STDERR.internal_encoding.should == nil
     end
 
     it "has nil for the internal encoding despite Encoding.default_internal being changed" do
       Encoding.default_internal = Encoding::IBM437
-      STDERR.internal_encoding.should be_nil
+      STDERR.internal_encoding.should == nil
     end
   end
 
@@ -1543,7 +1544,7 @@ def obj.foo2; yield; end
   end
 
   it "return nil if feature cannot be found" do
-    $LOAD_PATH.resolve_feature_path('noop').should be_nil
+    $LOAD_PATH.resolve_feature_path('noop').should == nil
   end
 end
 
diff --git a/spec/ruby/language/private_spec.rb b/spec/ruby/language/private_spec.rb
index b04aa25c9e5..94b56fee5bb 100644
--- a/spec/ruby/language/private_spec.rb
+++ b/spec/ruby/language/private_spec.rb
@@ -4,12 +4,12 @@
 describe "The private keyword" do
   it "marks following methods as being private" do
     a = Private::A.new
-    a.methods.should_not include(:bar)
-    -> { a.bar }.should raise_error(NoMethodError)
+    a.methods.should_not.include?(:bar)
+    -> { a.bar }.should.raise(NoMethodError)
 
     b = Private::B.new
-    b.methods.should_not include(:bar)
-    -> { b.bar }.should raise_error(NoMethodError)
+    b.methods.should_not.include?(:bar)
+    -> { b.bar }.should.raise(NoMethodError)
   end
 
   # def expr.meth() methods are always public
@@ -19,15 +19,15 @@
 
   it "is overridden when a new class is opened" do
     c = Private::B::C.new
-    c.methods.should include(:baz)
+    c.methods.should.include?(:baz)
     c.baz
     Private::B.public_class_method1.should == 1
-    -> { Private::B.private_class_method1 }.should raise_error(NoMethodError)
+    -> { Private::B.private_class_method1 }.should.raise(NoMethodError)
   end
 
   it "is no longer in effect when the class is closed" do
     b = Private::B.new
-    b.methods.should include(:foo)
+    b.methods.should.include?(:foo)
     b.foo
   end
 
@@ -42,7 +42,7 @@ def foo
     klass.class_eval do
       private :foo
     end
-    -> { f.foo }.should raise_error(NoMethodError)
+    -> { f.foo }.should.raise(NoMethodError)
   end
 
   it "changes visibility of previously called methods with same send/call site" do
@@ -56,12 +56,12 @@ class G
           end
         end
       end
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   it "changes the visibility of the existing method in the subclass" do
     ::Private::A.new.foo.should == 'foo'
-    -> { ::Private::H.new.foo }.should raise_error(NoMethodError)
+    -> { ::Private::H.new.foo }.should.raise(NoMethodError)
     ::Private::H.new.send(:foo).should == 'foo'
   end
 end
diff --git a/spec/ruby/language/proc_spec.rb b/spec/ruby/language/proc_spec.rb
index ca9a13aa615..53a21d6b85a 100644
--- a/spec/ruby/language/proc_spec.rb
+++ b/spec/ruby/language/proc_spec.rb
@@ -22,7 +22,7 @@
     end
 
     it "raises an ArgumentError if a value is passed" do
-      lambda { @l.call(0) }.should raise_error(ArgumentError)
+      lambda { @l.call(0) }.should.raise(ArgumentError)
     end
   end
 
@@ -36,7 +36,7 @@
     end
 
     it "raises an ArgumentError if a value is passed" do
-      lambda { @l.call(0) }.should raise_error(ArgumentError)
+      lambda { @l.call(0) }.should.raise(ArgumentError)
     end
   end
 
@@ -57,11 +57,11 @@
       obj = mock("block yield to_ary")
       obj.should_not_receive(:to_ary)
 
-      @l.call(obj).should equal(obj)
+      @l.call(obj).should.equal?(obj)
     end
 
     it "raises an ArgumentError if no value is passed" do
-      lambda { @l.call }.should raise_error(ArgumentError)
+      lambda { @l.call }.should.raise(ArgumentError)
     end
   end
 
@@ -71,11 +71,11 @@
     end
 
     it "raises an ArgumentError if passed no values" do
-      lambda { @l.call }.should raise_error(ArgumentError)
+      lambda { @l.call }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError if passed one value" do
-      lambda { @l.call(0) }.should raise_error(ArgumentError)
+      lambda { @l.call(0) }.should.raise(ArgumentError)
     end
 
     it "assigns the values passed to the arguments" do
@@ -86,7 +86,7 @@
       obj = mock("proc call to_ary")
       obj.should_not_receive(:to_ary)
 
-      lambda { @l.call(obj) }.should raise_error(ArgumentError)
+      lambda { @l.call(obj) }.should.raise(ArgumentError)
     end
   end
 
@@ -96,7 +96,7 @@
     end
 
     it "raises an ArgumentError if passed no values" do
-      lambda { @l.call }.should raise_error(ArgumentError)
+      lambda { @l.call }.should.raise(ArgumentError)
     end
 
     it "does not destructure a single Array value yielded" do
@@ -179,11 +179,11 @@
     end
 
     it "raises an ArgumentError when passed no values" do
-      lambda { @l.call }.should raise_error(ArgumentError)
+      lambda { @l.call }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when passed more than one value" do
-      lambda { @l.call(1, 2) }.should raise_error(ArgumentError)
+      lambda { @l.call(1, 2) }.should.raise(ArgumentError)
     end
 
     it "assigns the argument the value passed" do
@@ -208,7 +208,7 @@
     end
 
     it "raises an ArgumentError when passed no values" do
-      lambda { @l.call }.should raise_error(ArgumentError)
+      lambda { @l.call }.should.raise(ArgumentError)
     end
 
     it "destructures a single Array value yielded" do
@@ -226,7 +226,7 @@
       obj = mock("block yield to_ary invalid")
       obj.should_receive(:to_ary).and_return(1)
 
-      lambda { @l.call(obj) }.should raise_error(TypeError)
+      lambda { @l.call(obj) }.should.raise(TypeError)
     end
   end
 
@@ -243,7 +243,25 @@
   describe "taking |required keyword arguments, **kw| arguments" do
     it "raises ArgumentError for missing required argument" do
       p = proc { |a:, **kw| [a, kw] }
-      -> { p.call() }.should raise_error(ArgumentError)
+      -> { p.call() }.should.raise(ArgumentError)
     end
   end
+
+  evaluate <<-ruby do
+    @p = proc { |**nil| :ok }
+    ruby
+
+    @p.call().should == :ok
+    -> { @p.call(a: 1) }.should.raise(ArgumentError, 'no keywords accepted')
+    -> { @p.call(**{a: 1}) }.should.raise(ArgumentError, 'no keywords accepted')
+    -> { @p.call("a" => 1) }.should.raise(ArgumentError, 'no keywords accepted')
+  end
+
+  evaluate <<-ruby do
+    @p = proc { |a, **nil| a }
+    ruby
+
+    @p.call({a: 1}).should == {a: 1}
+    -> { @p.call(a: 1) }.should.raise(ArgumentError, 'no keywords accepted')
+  end
 end
diff --git a/spec/ruby/language/redo_spec.rb b/spec/ruby/language/redo_spec.rb
index 57532553b34..9b14c5add13 100644
--- a/spec/ruby/language/redo_spec.rb
+++ b/spec/ruby/language/redo_spec.rb
@@ -60,7 +60,7 @@
     it "is invalid and raises a SyntaxError" do
       -> {
         eval("def m; redo; end")
-      }.should raise_error(SyntaxError)
+      }.should.raise(SyntaxError)
     end
   end
 end
diff --git a/spec/ruby/language/regexp/anchors_spec.rb b/spec/ruby/language/regexp/anchors_spec.rb
index cdc06c0b4d3..8e597b65e8b 100644
--- a/spec/ruby/language/regexp/anchors_spec.rb
+++ b/spec/ruby/language/regexp/anchors_spec.rb
@@ -7,8 +7,8 @@
     /^foo/.match("foo").to_a.should == ["foo"]
     /^bar/.match("foo\nbar").to_a.should == ["bar"]
     # Basic non-matching
-    /^foo/.match(" foo").should be_nil
-    /foo^/.match("foo\n\n\n").should be_nil
+    /^foo/.match(" foo").should == nil
+    /foo^/.match("foo\n\n\n").should == nil
 
     # A bit advanced
     /^^^foo/.match("foo").to_a.should == ["foo"]
@@ -16,8 +16,8 @@
     (/($^)($^)/ =~ "foo\n\n").should == "foo\n".size and $~.to_a.should == ["", "", ""]
 
     # Different start of line chars
-    /^bar/.match("foo\rbar").should be_nil
-    /^bar/.match("foo\0bar").should be_nil
+    /^bar/.match("foo\rbar").should == nil
+    /^bar/.match("foo\0bar").should == nil
 
     # Trivial
     /^/.match("foo").to_a.should == [""]
@@ -29,7 +29,7 @@
   end
 
   it "does not match ^ after trailing \\n" do
-    /^(?!\A)/.match("foo\n").should be_nil # There is no (empty) line after a trailing \n
+    /^(?!\A)/.match("foo\n").should == nil # There is no (empty) line after a trailing \n
   end
 
   it "supports $ (line end anchor)" do
@@ -37,16 +37,16 @@
     /foo$/.match("foo").to_a.should == ["foo"]
     /foo$/.match("foo\nbar").to_a.should == ["foo"]
     # Basic non-matching
-    /foo$/.match("foo ").should be_nil
-    /$foo/.match("\n\n\nfoo").should be_nil
+    /foo$/.match("foo ").should == nil
+    /$foo/.match("\n\n\nfoo").should == nil
 
     # A bit advanced
     /foo$$$/.match("foo").to_a.should == ["foo"]
     (/[^o]$/ =~ "foo\n\n").should == ("foo\n".size - 1) and $~.to_a.should == ["\n"]
 
     # Different end of line chars
-    /foo$/.match("foo\r\nbar").should be_nil
-    /foo$/.match("foo\0bar").should be_nil
+    /foo$/.match("foo\r\nbar").should == nil
+    /foo$/.match("foo\0bar").should == nil
 
     # Trivial
     (/$/ =~ "foo").should == "foo".size and $~.to_a.should == [""]
@@ -61,15 +61,15 @@
     # Basic matching
     /\Afoo/.match("foo").to_a.should == ["foo"]
     # Basic non-matching
-    /\Abar/.match("foo\nbar").should be_nil
-    /\Afoo/.match(" foo").should be_nil
+    /\Abar/.match("foo\nbar").should == nil
+    /\Afoo/.match(" foo").should == nil
 
     # A bit advanced
     /\A\A\Afoo/.match("foo").to_a.should == ["foo"]
     /(\A\Z)(\A\Z)/.match("").to_a.should == ["", "", ""]
 
     # Different start of line chars
-    /\Abar/.match("foo\0bar").should be_nil
+    /\Abar/.match("foo\0bar").should == nil
 
     # Grouping
     /(\Afoo)/.match("foo").to_a.should == ["foo", "foo"]
@@ -81,8 +81,8 @@
     /foo\Z/.match("foo").to_a.should == ["foo"]
     /foo\Z/.match("foo\n").to_a.should == ["foo"]
     # Basic non-matching
-    /foo\Z/.match("foo\nbar").should be_nil
-    /foo\Z/.match("foo ").should be_nil
+    /foo\Z/.match("foo\nbar").should == nil
+    /foo\Z/.match("foo ").should == nil
 
     # A bit advanced
     /foo\Z\Z\Z/.match("foo\n").to_a.should == ["foo"]
@@ -90,8 +90,8 @@
     (/(\z\Z)(\z\Z)/ =~ "foo\n").should == "foo\n".size and $~.to_a.should == ["", "", ""]
 
     # Different end of line chars
-    /foo\Z/.match("foo\0bar").should be_nil
-    /foo\Z/.match("foo\r\n").should be_nil
+    /foo\Z/.match("foo\0bar").should == nil
+    /foo\Z/.match("foo\r\n").should == nil
 
     # Grouping
     /(foo\Z)/.match("foo").to_a.should == ["foo", "foo"]
@@ -102,17 +102,17 @@
     # Basic matching
     /foo\z/.match("foo").to_a.should == ["foo"]
     # Basic non-matching
-    /foo\z/.match("foo\nbar").should be_nil
-    /foo\z/.match("foo\n").should be_nil
-    /foo\z/.match("foo ").should be_nil
+    /foo\z/.match("foo\nbar").should == nil
+    /foo\z/.match("foo\n").should == nil
+    /foo\z/.match("foo ").should == nil
 
     # A bit advanced
     /foo\z\z\z/.match("foo").to_a.should == ["foo"]
     (/($\z)($\z)/ =~ "foo").should == "foo".size and $~.to_a.should == ["", "", ""]
 
     # Different end of line chars
-    /foo\z/.match("foo\0bar").should be_nil
-    /foo\z/.match("foo\r\nbar").should be_nil
+    /foo\z/.match("foo\0bar").should == nil
+    /foo\z/.match("foo\r\nbar").should == nil
 
     # Grouping
     /(foo\z)/.match("foo").to_a.should == ["foo", "foo"]
@@ -131,9 +131,9 @@
     end
     /foo\b/.match("foo\0").to_a.should == ["foo"]
     # Basic non-matching
-    /foo\b/.match("foobar").should be_nil
-    /foo\b/.match("foo123").should be_nil
-    /foo\b/.match("foo_").should be_nil
+    /foo\b/.match("foobar").should == nil
+    /foo\b/.match("foo123").should == nil
+    /foo\b/.match("foo_").should == nil
   end
 
   it "supports \\B (non-word-boundary)" do
@@ -142,15 +142,15 @@
     /foo\B/.match("foo123").to_a.should == ["foo"]
     /foo\B/.match("foo_").to_a.should == ["foo"]
     # Basic non-matching
-    /foo\B/.match("foo").should be_nil
-    /foo\B/.match("foo\n").should be_nil
+    /foo\B/.match("foo").should == nil
+    /foo\B/.match("foo\n").should == nil
     LanguageSpecs.white_spaces.scan(/./).each do |c|
-      /foo\B/.match("foo" + c).should be_nil
+      /foo\B/.match("foo" + c).should == nil
     end
     LanguageSpecs.non_alphanum_non_space.scan(/./).each do |c|
-      /foo\B/.match("foo" + c).should be_nil
+      /foo\B/.match("foo" + c).should == nil
     end
-    /foo\B/.match("foo\0").should be_nil
+    /foo\B/.match("foo\0").should == nil
   end
 
   it "supports (?= ) (positive lookahead)" do
diff --git a/spec/ruby/language/regexp/back-references_spec.rb b/spec/ruby/language/regexp/back-references_spec.rb
index 627c8daacef..3b4c5656a20 100644
--- a/spec/ruby/language/regexp/back-references_spec.rb
+++ b/spec/ruby/language/regexp/back-references_spec.rb
@@ -49,7 +49,7 @@
 
   it "supports \<n> (backreference to previous group match)" do
     /(foo.)\1/.match("foo1foo1").to_a.should == ["foo1foo1", "foo1"]
-    /(foo.)\1/.match("foo1foo2").should be_nil
+    /(foo.)\1/.match("foo1foo2").should == nil
   end
 
   it "resets nested \<n> backreference before match of outer subexpression" do
@@ -82,7 +82,7 @@
   end
 
   it "0 is not a valid backreference" do
-    -> { Regexp.new("\\k<0>") }.should raise_error(RegexpError)
+    -> { Regexp.new("\\k<0>") }.should.raise(RegexpError)
   end
 
   it "allows numeric conditional backreferences" do
@@ -92,7 +92,7 @@
   end
 
   it "allows either <> or '' in named conditional backreferences" do
-    -> { Regexp.new("(?<a>a)(?(a)a|b)") }.should raise_error(RegexpError)
+    -> { Regexp.new("(?<a>a)(?(a)a|b)") }.should.raise(RegexpError)
     /(?<a>a)(?(<a>)a|b)/.match("aa").to_a.should == [ "aa", "a" ]
     /(?<a>a)(?('a')a|b)/.match("aa").to_a.should == [ "aa", "a" ]
   end
@@ -118,32 +118,32 @@
   end
 
   it "named capture groups invalidate numeric backreferences" do
-    -> { Regexp.new("(?<a>a)\\1") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a>a)\\k<1>") }.should raise_error(RegexpError)
-    -> { Regexp.new("(a)(?<a>a)\\1") }.should raise_error(RegexpError)
-    -> { Regexp.new("(a)(?<a>a)\\k<1>") }.should raise_error(RegexpError)
+    -> { Regexp.new("(?<a>a)\\1") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a>a)\\k<1>") }.should.raise(RegexpError)
+    -> { Regexp.new("(a)(?<a>a)\\1") }.should.raise(RegexpError)
+    -> { Regexp.new("(a)(?<a>a)\\k<1>") }.should.raise(RegexpError)
   end
 
   it "treats + or - as the beginning of a level specifier in \\k<> backreferences and (?(...)...|...) conditional backreferences" do
-    -> { Regexp.new("(?<a+>a)\\k<a+>") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a+b>a)\\k<a+b>") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a+1>a)\\k<a+1>") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a->a)\\k<a->") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a-b>a)\\k<a-b>") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a-1>a)\\k<a-1>") }.should raise_error(RegexpError)
-
-    -> { Regexp.new("(?<a+>a)(?(<a+>)a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a+b>a)(?(<a+b>)a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a+1>a)(?(<a+1>)a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a->a)(?(<a->)a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a-b>a)(?(<a-b>)a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a-1>a)(?(<a-1>)a|b)") }.should raise_error(RegexpError)
-
-    -> { Regexp.new("(?<a+>a)(?('a+')a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a+b>a)(?('a+b')a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a+1>a)(?('a+1')a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a->a)(?('a-')a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a-b>a)(?('a-b')a|b)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<a-1>a)(?('a-1')a|b)") }.should raise_error(RegexpError)
+    -> { Regexp.new("(?<a+>a)\\k<a+>") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a+b>a)\\k<a+b>") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a+1>a)\\k<a+1>") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a->a)\\k<a->") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a-b>a)\\k<a-b>") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a-1>a)\\k<a-1>") }.should.raise(RegexpError)
+
+    -> { Regexp.new("(?<a+>a)(?(<a+>)a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a+b>a)(?(<a+b>)a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a+1>a)(?(<a+1>)a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a->a)(?(<a->)a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a-b>a)(?(<a-b>)a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a-1>a)(?(<a-1>)a|b)") }.should.raise(RegexpError)
+
+    -> { Regexp.new("(?<a+>a)(?('a+')a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a+b>a)(?('a+b')a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a+1>a)(?('a+1')a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a->a)(?('a-')a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a-b>a)(?('a-b')a|b)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<a-1>a)(?('a-1')a|b)") }.should.raise(RegexpError)
   end
 end
diff --git a/spec/ruby/language/regexp/character_classes_spec.rb b/spec/ruby/language/regexp/character_classes_spec.rb
index 018757db41f..c6ed92b78e9 100644
--- a/spec/ruby/language/regexp/character_classes_spec.rb
+++ b/spec/ruby/language/regexp/character_classes_spec.rb
@@ -9,9 +9,9 @@
     /\w/.match("_").to_a.should == ["_"]
 
     # Non-matches
-    /\w/.match(LanguageSpecs.white_spaces).should be_nil
-    /\w/.match(LanguageSpecs.non_alphanum_non_space).should be_nil
-    /\w/.match("\0").should be_nil
+    /\w/.match(LanguageSpecs.white_spaces).should == nil
+    /\w/.match(LanguageSpecs.non_alphanum_non_space).should == nil
+    /\w/.match("\0").should == nil
   end
 
   it "supports \\W (non-word character)" do
@@ -20,19 +20,19 @@
     /\W/.match("\0").to_a.should == ["\0"]
 
     # Non-matches
-    /\W/.match("a").should be_nil
-    /\W/.match("1").should be_nil
-    /\W/.match("_").should be_nil
+    /\W/.match("a").should == nil
+    /\W/.match("1").should == nil
+    /\W/.match("_").should == nil
   end
 
   it "supports \\s (space character)" do
     /\s+/.match(LanguageSpecs.white_spaces).to_a.should == [LanguageSpecs.white_spaces]
 
     # Non-matches
-    /\s/.match("a").should be_nil
-    /\s/.match("1").should be_nil
-    /\s/.match(LanguageSpecs.non_alphanum_non_space).should be_nil
-    /\s/.match("\0").should be_nil
+    /\s/.match("a").should == nil
+    /\s/.match("1").should == nil
+    /\s/.match(LanguageSpecs.non_alphanum_non_space).should == nil
+    /\s/.match("\0").should == nil
   end
 
   it "supports \\S (non-space character)" do
@@ -42,17 +42,17 @@
     /\S/.match("\0").to_a.should == ["\0"]
 
     # Non-matches
-    /\S/.match(LanguageSpecs.white_spaces).should be_nil
+    /\S/.match(LanguageSpecs.white_spaces).should == nil
   end
 
   it "supports \\d (numeric digit)" do
     /\d/.match("1").to_a.should == ["1"]
 
     # Non-matches
-    /\d/.match("a").should be_nil
-    /\d/.match(LanguageSpecs.white_spaces).should be_nil
-    /\d/.match(LanguageSpecs.non_alphanum_non_space).should be_nil
-    /\d/.match("\0").should be_nil
+    /\d/.match("a").should == nil
+    /\d/.match(LanguageSpecs.white_spaces).should == nil
+    /\d/.match(LanguageSpecs.non_alphanum_non_space).should == nil
+    /\d/.match("\0").should == nil
   end
 
   it "supports \\D (non-digit)" do
@@ -62,7 +62,7 @@
     /\D/.match("\0").to_a.should == ["\0"]
 
     # Non-matches
-    /\D/.match("1").should be_nil
+    /\D/.match("1").should == nil
   end
 
   it "supports [] (character class)" do
@@ -89,7 +89,7 @@
     /[^[:lower:]A-C]+/.match("abcABCDEF123def").to_a.should == ["DEF123"] # negated character class
     /[:alnum:]+/.match("a:l:n:u:m").to_a.should == ["a:l:n:u:m"] # should behave like regular character class composed of the individual letters
     /[\[:alnum:]+/.match("[:a:l:n:u:m").to_a.should == ["[:a:l:n:u:m"] # should behave like regular character class composed of the individual letters
-    -> { eval('/[[:alpha:]-[:digit:]]/') }.should raise_error(SyntaxError) # can't use character class as a start value of range
+    -> { eval('/[[:alpha:]-[:digit:]]/') }.should.raise(SyntaxError) # can't use character class as a start value of range
   end
 
   it "matches ASCII characters with [[:ascii:]]" do
@@ -99,8 +99,8 @@
 
   not_supported_on :opal do
     it "doesn't match non-ASCII characters with [[:ascii:]]" do
-      /[[:ascii:]]/.match("\u{80}").should be_nil
-      /[[:ascii:]]/.match("\u{9898}").should be_nil
+      /[[:ascii:]]/.match("\u{80}").should == nil
+      /[[:ascii:]]/.match("\u{9898}").should == nil
     end
   end
 
@@ -113,7 +113,7 @@
   end
 
   it "doesn't matches Unicode marks with [[:alnum:]]" do
-    "\u{3099}".match(/[[:alnum:]]/).should be_nil
+    "\u{3099}".match(/[[:alnum:]]/).should == nil
   end
 
   it "doesn't match Unicode control characters with [[:alnum:]]" do
@@ -133,7 +133,7 @@
   end
 
   it "doesn't matches Unicode marks with [[:alpha:]]" do
-    "\u{3099}".match(/[[:alpha:]]/).should be_nil
+    "\u{3099}".match(/[[:alpha:]]/).should == nil
   end
 
   it "doesn't match Unicode control characters with [[:alpha:]]" do
@@ -149,39 +149,39 @@
   end
 
   it "doesn't match Unicode control characters with [[:blank:]]" do
-    "\u{16}".match(/[[:blank:]]/).should be_nil
+    "\u{16}".match(/[[:blank:]]/).should == nil
   end
 
   it "doesn't match Unicode punctuation characters with [[:blank:]]" do
-    "\u{3F}".match(/[[:blank:]]/).should be_nil
+    "\u{3F}".match(/[[:blank:]]/).should == nil
   end
 
   it "doesn't match Unicode letter characters with [[:blank:]]" do
-    "à".match(/[[:blank:]]/).should be_nil
+    "à".match(/[[:blank:]]/).should == nil
   end
 
   it "doesn't match Unicode digits with [[:blank:]]" do
-    "\u{0660}".match(/[[:blank:]]/).should be_nil
+    "\u{0660}".match(/[[:blank:]]/).should == nil
   end
 
   it "doesn't match Unicode marks with [[:blank:]]" do
-    "\u{36F}".match(/[[:blank:]]/).should be_nil
+    "\u{36F}".match(/[[:blank:]]/).should == nil
   end
 
   it "doesn't Unicode letter characters with [[:cntrl:]]" do
-    "à".match(/[[:cntrl:]]/).should be_nil
+    "à".match(/[[:cntrl:]]/).should == nil
   end
 
   it "doesn't match Unicode digits with [[:cntrl:]]" do
-    "\u{0660}".match(/[[:cntrl:]]/).should be_nil
+    "\u{0660}".match(/[[:cntrl:]]/).should == nil
   end
 
   it "doesn't match Unicode marks with [[:cntrl:]]" do
-    "\u{36F}".match(/[[:cntrl:]]/).should be_nil
+    "\u{36F}".match(/[[:cntrl:]]/).should == nil
   end
 
   it "doesn't match Unicode punctuation characters with [[:cntrl:]]" do
-    "\u{3F}".match(/[[:cntrl:]]/).should be_nil
+    "\u{3F}".match(/[[:cntrl:]]/).should == nil
   end
 
   it "matches Unicode control characters with [[:cntrl:]]" do
@@ -189,15 +189,15 @@
   end
 
   it "doesn't match Unicode format characters with [[:cntrl:]]" do
-    "\u{2060}".match(/[[:cntrl:]]/).should be_nil
+    "\u{2060}".match(/[[:cntrl:]]/).should == nil
   end
 
   it "doesn't match Unicode private-use characters with [[:cntrl:]]" do
-    "\u{E001}".match(/[[:cntrl:]]/).should be_nil
+    "\u{E001}".match(/[[:cntrl:]]/).should == nil
   end
 
   it "doesn't match Unicode letter characters with [[:digit:]]" do
-    "à".match(/[[:digit:]]/).should be_nil
+    "à".match(/[[:digit:]]/).should == nil
   end
 
   it "matches Unicode digits with [[:digit:]]" do
@@ -206,23 +206,23 @@
   end
 
   it "doesn't match Unicode marks with [[:digit:]]" do
-    "\u{36F}".match(/[[:digit:]]/).should be_nil
+    "\u{36F}".match(/[[:digit:]]/).should == nil
   end
 
   it "doesn't match Unicode punctuation characters with [[:digit:]]" do
-    "\u{3F}".match(/[[:digit:]]/).should be_nil
+    "\u{3F}".match(/[[:digit:]]/).should == nil
   end
 
   it "doesn't match Unicode control characters with [[:digit:]]" do
-    "\u{16}".match(/[[:digit:]]/).should be_nil
+    "\u{16}".match(/[[:digit:]]/).should == nil
   end
 
   it "doesn't match Unicode format characters with [[:digit:]]" do
-    "\u{2060}".match(/[[:digit:]]/).should be_nil
+    "\u{2060}".match(/[[:digit:]]/).should == nil
   end
 
   it "doesn't match Unicode private-use characters with [[:digit:]]" do
-    "\u{E001}".match(/[[:digit:]]/).should be_nil
+    "\u{E001}".match(/[[:digit:]]/).should == nil
   end
 
   it "matches Unicode letter characters with [[:graph:]]" do
@@ -243,7 +243,7 @@
   end
 
   it "doesn't match Unicode control characters with [[:graph:]]" do
-    "\u{16}".match(/[[:graph:]]/).should be_nil
+    "\u{16}".match(/[[:graph:]]/).should == nil
   end
 
   it "match Unicode format characters with [[:graph:]]" do
@@ -261,40 +261,40 @@
   end
 
   it "doesn't match Unicode uppercase letter characters with [[:lower:]]" do
-    "\u{100}".match(/[[:lower:]]/).should be_nil
-    "\u{130}".match(/[[:lower:]]/).should be_nil
-    "\u{405}".match(/[[:lower:]]/).should be_nil
+    "\u{100}".match(/[[:lower:]]/).should == nil
+    "\u{130}".match(/[[:lower:]]/).should == nil
+    "\u{405}".match(/[[:lower:]]/).should == nil
   end
 
   it "doesn't match Unicode title-case characters with [[:lower:]]" do
-    "\u{1F88}".match(/[[:lower:]]/).should be_nil
-    "\u{1FAD}".match(/[[:lower:]]/).should be_nil
-    "\u{01C5}".match(/[[:lower:]]/).should be_nil
+    "\u{1F88}".match(/[[:lower:]]/).should == nil
+    "\u{1FAD}".match(/[[:lower:]]/).should == nil
+    "\u{01C5}".match(/[[:lower:]]/).should == nil
   end
 
   it "doesn't match Unicode digits with [[:lower:]]" do
-    "\u{0660}".match(/[[:lower:]]/).should be_nil
-    "\u{FF12}".match(/[[:lower:]]/).should be_nil
+    "\u{0660}".match(/[[:lower:]]/).should == nil
+    "\u{FF12}".match(/[[:lower:]]/).should == nil
   end
 
   it "doesn't match Unicode marks with [[:lower:]]" do
-    "\u{36F}".match(/[[:lower:]]/).should be_nil
+    "\u{36F}".match(/[[:lower:]]/).should == nil
   end
 
   it "doesn't match Unicode punctuation characters with [[:lower:]]" do
-    "\u{3F}".match(/[[:lower:]]/).should be_nil
+    "\u{3F}".match(/[[:lower:]]/).should == nil
   end
 
   it "doesn't match Unicode control characters with [[:lower:]]" do
-    "\u{16}".match(/[[:lower:]]/).should be_nil
+    "\u{16}".match(/[[:lower:]]/).should == nil
   end
 
   it "doesn't match Unicode format characters with [[:lower:]]" do
-    "\u{2060}".match(/[[:lower:]]/).should be_nil
+    "\u{2060}".match(/[[:lower:]]/).should == nil
   end
 
   it "doesn't match Unicode private-use characters with [[:lower:]]" do
-    "\u{E001}".match(/[[:lower:]]/).should be_nil
+    "\u{E001}".match(/[[:lower:]]/).should == nil
   end
 
   it "matches Unicode lowercase letter characters with [[:print:]]" do
@@ -329,7 +329,7 @@
   end
 
   it "doesn't match Unicode control characters with [[:print:]]" do
-    "\u{16}".match(/[[:print:]]/).should be_nil
+    "\u{16}".match(/[[:print:]]/).should == nil
   end
 
   it "match Unicode format characters with [[:print:]]" do
@@ -342,30 +342,30 @@
 
 
   it "doesn't match Unicode lowercase letter characters with [[:punct:]]" do
-    "\u{FF41}".match(/[[:punct:]]/).should be_nil
-    "\u{1D484}".match(/[[:punct:]]/).should be_nil
-    "\u{E8}".match(/[[:punct:]]/).should be_nil
+    "\u{FF41}".match(/[[:punct:]]/).should == nil
+    "\u{1D484}".match(/[[:punct:]]/).should == nil
+    "\u{E8}".match(/[[:punct:]]/).should == nil
   end
 
   it "doesn't match Unicode uppercase letter characters with [[:punct:]]" do
-    "\u{100}".match(/[[:punct:]]/).should be_nil
-    "\u{130}".match(/[[:punct:]]/).should be_nil
-    "\u{405}".match(/[[:punct:]]/).should be_nil
+    "\u{100}".match(/[[:punct:]]/).should == nil
+    "\u{130}".match(/[[:punct:]]/).should == nil
+    "\u{405}".match(/[[:punct:]]/).should == nil
   end
 
   it "doesn't match Unicode title-case characters with [[:punct:]]" do
-    "\u{1F88}".match(/[[:punct:]]/).should be_nil
-    "\u{1FAD}".match(/[[:punct:]]/).should be_nil
-    "\u{01C5}".match(/[[:punct:]]/).should be_nil
+    "\u{1F88}".match(/[[:punct:]]/).should == nil
+    "\u{1FAD}".match(/[[:punct:]]/).should == nil
+    "\u{01C5}".match(/[[:punct:]]/).should == nil
   end
 
   it "doesn't match Unicode digits with [[:punct:]]" do
-    "\u{0660}".match(/[[:punct:]]/).should be_nil
-    "\u{FF12}".match(/[[:punct:]]/).should be_nil
+    "\u{0660}".match(/[[:punct:]]/).should == nil
+    "\u{FF12}".match(/[[:punct:]]/).should == nil
   end
 
   it "doesn't match Unicode marks with [[:punct:]]" do
-    "\u{36F}".match(/[[:punct:]]/).should be_nil
+    "\u{36F}".match(/[[:punct:]]/).should == nil
   end
 
   it "matches Unicode Pc characters with [[:punct:]]" do
@@ -398,38 +398,38 @@
   end
 
   it "doesn't match Unicode format characters with [[:punct:]]" do
-    "\u{2060}".match(/[[:punct:]]/).should be_nil
+    "\u{2060}".match(/[[:punct:]]/).should == nil
   end
 
   it "doesn't match Unicode private-use characters with [[:punct:]]" do
-    "\u{E001}".match(/[[:punct:]]/).should be_nil
+    "\u{E001}".match(/[[:punct:]]/).should == nil
   end
 
   it "doesn't match Unicode lowercase letter characters with [[:space:]]" do
-    "\u{FF41}".match(/[[:space:]]/).should be_nil
-    "\u{1D484}".match(/[[:space:]]/).should be_nil
-    "\u{E8}".match(/[[:space:]]/).should be_nil
+    "\u{FF41}".match(/[[:space:]]/).should == nil
+    "\u{1D484}".match(/[[:space:]]/).should == nil
+    "\u{E8}".match(/[[:space:]]/).should == nil
   end
 
   it "doesn't match Unicode uppercase letter characters with [[:space:]]" do
-    "\u{100}".match(/[[:space:]]/).should be_nil
-    "\u{130}".match(/[[:space:]]/).should be_nil
-    "\u{405}".match(/[[:space:]]/).should be_nil
+    "\u{100}".match(/[[:space:]]/).should == nil
+    "\u{130}".match(/[[:space:]]/).should == nil
+    "\u{405}".match(/[[:space:]]/).should == nil
   end
 
   it "doesn't match Unicode title-case characters with [[:space:]]" do
-    "\u{1F88}".match(/[[:space:]]/).should be_nil
-    "\u{1FAD}".match(/[[:space:]]/).should be_nil
-    "\u{01C5}".match(/[[:space:]]/).should be_nil
+    "\u{1F88}".match(/[[:space:]]/).should == nil
+    "\u{1FAD}".match(/[[:space:]]/).should == nil
+    "\u{01C5}".match(/[[:space:]]/).should == nil
   end
 
   it "doesn't match Unicode digits with [[:space:]]" do
-    "\u{0660}".match(/[[:space:]]/).should be_nil
-    "\u{FF12}".match(/[[:space:]]/).should be_nil
+    "\u{0660}".match(/[[:space:]]/).should == nil
+    "\u{FF12}".match(/[[:space:]]/).should == nil
   end
 
   it "doesn't match Unicode marks with [[:space:]]" do
-    "\u{36F}".match(/[[:space:]]/).should be_nil
+    "\u{36F}".match(/[[:space:]]/).should == nil
   end
 
   it "matches Unicode Zs characters with [[:space:]]" do
@@ -445,17 +445,17 @@
   end
 
   it "doesn't match Unicode format characters with [[:space:]]" do
-    "\u{2060}".match(/[[:space:]]/).should be_nil
+    "\u{2060}".match(/[[:space:]]/).should == nil
   end
 
   it "doesn't match Unicode private-use characters with [[:space:]]" do
-    "\u{E001}".match(/[[:space:]]/).should be_nil
+    "\u{E001}".match(/[[:space:]]/).should == nil
   end
 
   it "doesn't match Unicode lowercase characters with [[:upper:]]" do
-    "\u{FF41}".match(/[[:upper:]]/).should be_nil
-    "\u{1D484}".match(/[[:upper:]]/).should be_nil
-    "\u{E8}".match(/[[:upper:]]/).should be_nil
+    "\u{FF41}".match(/[[:upper:]]/).should == nil
+    "\u{1D484}".match(/[[:upper:]]/).should == nil
+    "\u{E8}".match(/[[:upper:]]/).should == nil
   end
 
   it "matches Unicode uppercase characters with [[:upper:]]" do
@@ -465,40 +465,40 @@
   end
 
   it "doesn't match Unicode title-case characters with [[:upper:]]" do
-    "\u{1F88}".match(/[[:upper:]]/).should be_nil
-    "\u{1FAD}".match(/[[:upper:]]/).should be_nil
-    "\u{01C5}".match(/[[:upper:]]/).should be_nil
+    "\u{1F88}".match(/[[:upper:]]/).should == nil
+    "\u{1FAD}".match(/[[:upper:]]/).should == nil
+    "\u{01C5}".match(/[[:upper:]]/).should == nil
   end
 
   it "doesn't match Unicode digits with [[:upper:]]" do
-    "\u{0660}".match(/[[:upper:]]/).should be_nil
-    "\u{FF12}".match(/[[:upper:]]/).should be_nil
+    "\u{0660}".match(/[[:upper:]]/).should == nil
+    "\u{FF12}".match(/[[:upper:]]/).should == nil
   end
 
   it "doesn't match Unicode marks with [[:upper:]]" do
-    "\u{36F}".match(/[[:upper:]]/).should be_nil
+    "\u{36F}".match(/[[:upper:]]/).should == nil
   end
 
   it "doesn't match Unicode punctuation characters with [[:upper:]]" do
-    "\u{3F}".match(/[[:upper:]]/).should be_nil
+    "\u{3F}".match(/[[:upper:]]/).should == nil
   end
 
   it "doesn't match Unicode control characters with [[:upper:]]" do
-    "\u{16}".match(/[[:upper:]]/).should be_nil
+    "\u{16}".match(/[[:upper:]]/).should == nil
   end
 
   it "doesn't match Unicode format characters with [[:upper:]]" do
-    "\u{2060}".match(/[[:upper:]]/).should be_nil
+    "\u{2060}".match(/[[:upper:]]/).should == nil
   end
 
   it "doesn't match Unicode private-use characters with [[:upper:]]" do
-    "\u{E001}".match(/[[:upper:]]/).should be_nil
+    "\u{E001}".match(/[[:upper:]]/).should == nil
   end
 
   it "doesn't match Unicode letter characters [^a-fA-F] with [[:xdigit:]]" do
-    "à".match(/[[:xdigit:]]/).should be_nil
-    "g".match(/[[:xdigit:]]/).should be_nil
-    "X".match(/[[:xdigit:]]/).should be_nil
+    "à".match(/[[:xdigit:]]/).should == nil
+    "g".match(/[[:xdigit:]]/).should == nil
+    "X".match(/[[:xdigit:]]/).should == nil
   end
 
   it "matches Unicode letter characters [a-fA-F] with [[:xdigit:]]" do
@@ -507,28 +507,28 @@
   end
 
   it "doesn't match Unicode digits [^0-9] with [[:xdigit:]]" do
-    "\u{0660}".match(/[[:xdigit:]]/).should be_nil
-    "\u{FF12}".match(/[[:xdigit:]]/).should be_nil
+    "\u{0660}".match(/[[:xdigit:]]/).should == nil
+    "\u{FF12}".match(/[[:xdigit:]]/).should == nil
   end
 
   it "doesn't match Unicode marks with [[:xdigit:]]" do
-    "\u{36F}".match(/[[:xdigit:]]/).should be_nil
+    "\u{36F}".match(/[[:xdigit:]]/).should == nil
   end
 
   it "doesn't match Unicode punctuation characters with [[:xdigit:]]" do
-    "\u{3F}".match(/[[:xdigit:]]/).should be_nil
+    "\u{3F}".match(/[[:xdigit:]]/).should == nil
   end
 
   it "doesn't match Unicode control characters with [[:xdigit:]]" do
-    "\u{16}".match(/[[:xdigit:]]/).should be_nil
+    "\u{16}".match(/[[:xdigit:]]/).should == nil
   end
 
   it "doesn't match Unicode format characters with [[:xdigit:]]" do
-    "\u{2060}".match(/[[:xdigit:]]/).should be_nil
+    "\u{2060}".match(/[[:xdigit:]]/).should == nil
   end
 
   it "doesn't match Unicode private-use characters with [[:xdigit:]]" do
-    "\u{E001}".match(/[[:xdigit:]]/).should be_nil
+    "\u{E001}".match(/[[:xdigit:]]/).should == nil
   end
 
   it "matches Unicode lowercase characters with [[:word:]]" do
@@ -570,22 +570,22 @@
   end
 
   it "doesn't match Unicode No characters with [[:word:]]" do
-    "\u{17F0}".match(/[[:word:]]/).should be_nil
+    "\u{17F0}".match(/[[:word:]]/).should == nil
   end
   it "doesn't match Unicode punctuation characters with [[:word:]]" do
-    "\u{3F}".match(/[[:word:]]/).should be_nil
+    "\u{3F}".match(/[[:word:]]/).should == nil
   end
 
   it "doesn't match Unicode control characters with [[:word:]]" do
-    "\u{16}".match(/[[:word:]]/).should be_nil
+    "\u{16}".match(/[[:word:]]/).should == nil
   end
 
   it "doesn't match Unicode format characters with [[:word:]]" do
-    "\u{2060}".match(/[[:word:]]/).should be_nil
+    "\u{2060}".match(/[[:word:]]/).should == nil
   end
 
   it "doesn't match Unicode private-use characters with [[:word:]]" do
-    "\u{E001}".match(/[[:word:]]/).should be_nil
+    "\u{E001}".match(/[[:word:]]/).should == nil
   end
 
   it "matches unicode named character properties" do
@@ -617,12 +617,12 @@
   end
 
   it "supports negated property condition" do
-    "a".match(eval("/\P{L}/")).should be_nil
-    "1".match(eval("/\P{N}/")).should be_nil
+    "a".match(eval("/\P{L}/")).should == nil
+    "1".match(eval("/\P{N}/")).should == nil
   end
 
   it "raises a RegexpError for an unterminated unicode property" do
-    -> { Regexp.new('\p{') }.should raise_error(RegexpError)
+    -> { Regexp.new('\p{') }.should.raise(RegexpError)
   end
 
   it "supports \\X (unicode 9.0 with UTR #51 workarounds)" do
diff --git a/spec/ruby/language/regexp/encoding_spec.rb b/spec/ruby/language/regexp/encoding_spec.rb
index ceb9cf823ac..81e845af0c1 100644
--- a/spec/ruby/language/regexp/encoding_spec.rb
+++ b/spec/ruby/language/regexp/encoding_spec.rb
@@ -114,28 +114,28 @@
   end
 
   it "raises Encoding::CompatibilityError when trying match against different encodings" do
-    -> { /\A[[:space:]]*\z/.match(" ".encode("UTF-16LE")) }.should raise_error(Encoding::CompatibilityError)
+    -> { /\A[[:space:]]*\z/.match(" ".encode("UTF-16LE")) }.should.raise(Encoding::CompatibilityError)
   end
 
   it "raises Encoding::CompatibilityError when trying match? against different encodings" do
-    -> { /\A[[:space:]]*\z/.match?(" ".encode("UTF-16LE")) }.should raise_error(Encoding::CompatibilityError)
+    -> { /\A[[:space:]]*\z/.match?(" ".encode("UTF-16LE")) }.should.raise(Encoding::CompatibilityError)
   end
 
   it "raises Encoding::CompatibilityError when trying =~ against different encodings" do
-    -> { /\A[[:space:]]*\z/ =~ " ".encode("UTF-16LE") }.should raise_error(Encoding::CompatibilityError)
+    -> { /\A[[:space:]]*\z/ =~ " ".encode("UTF-16LE") }.should.raise(Encoding::CompatibilityError)
   end
 
   it "raises Encoding::CompatibilityError when the regexp has a fixed, non-ASCII-compatible encoding" do
-    -> { Regexp.new("".dup.force_encoding("UTF-16LE"), Regexp::FIXEDENCODING) =~ " ".encode("UTF-8") }.should raise_error(Encoding::CompatibilityError)
+    -> { Regexp.new("".dup.force_encoding("UTF-16LE"), Regexp::FIXEDENCODING) =~ " ".encode("UTF-8") }.should.raise(Encoding::CompatibilityError)
   end
 
   it "raises Encoding::CompatibilityError when the regexp has a fixed encoding and the match string has non-ASCII characters" do
-    -> { Regexp.new("".dup.force_encoding("US-ASCII"), Regexp::FIXEDENCODING) =~ "\303\251".dup.force_encoding('UTF-8') }.should raise_error(Encoding::CompatibilityError)
+    -> { Regexp.new("".dup.force_encoding("US-ASCII"), Regexp::FIXEDENCODING) =~ "\303\251".dup.force_encoding('UTF-8') }.should.raise(Encoding::CompatibilityError)
   end
 
   it "raises ArgumentError when trying to match a broken String" do
     s = "\x80".dup.force_encoding('UTF-8')
-    -> { s =~ /./ }.should raise_error(ArgumentError, "invalid byte sequence in UTF-8")
+    -> { s =~ /./ }.should.raise(ArgumentError, "invalid byte sequence in UTF-8")
   end
 
   it "computes the Regexp Encoding for each interpolated Regexp instance" do
diff --git a/spec/ruby/language/regexp/escapes_spec.rb b/spec/ruby/language/regexp/escapes_spec.rb
index 541998b9373..4a0e6115409 100644
--- a/spec/ruby/language/regexp/escapes_spec.rb
+++ b/spec/ruby/language/regexp/escapes_spec.rb
@@ -116,11 +116,11 @@
   it "supports \\x (hex characters)" do
     /\xA/.match("\nxyz").to_a.should == ["\n"]
     /\x0A/.match("\n").to_a.should == ["\n"]
-    /\xAA/.match("\nA").should be_nil
+    /\xAA/.match("\nA").should == nil
     /\x0AA/.match("\nA").to_a.should == ["\nA"]
     /\xAG/.match("\nG").to_a.should == ["\nG"]
     # Non-matches
-    -> { eval('/\xG/') }.should raise_error(SyntaxError)
+    -> { eval('/\xG/') }.should.raise(SyntaxError)
 
     # \x{7HHHHHHH} wide hexadecimal char (character code point value)
   end
@@ -136,14 +136,14 @@
     /\c,\cL\cl/.match("\f\f\f").to_a.should == ["\f\f\f"]
     /\c-\cM\cm/.match("\r\r\r").to_a.should == ["\r\r\r"]
 
-    /\cJ/.match("\r").should be_nil
+    /\cJ/.match("\r").should == nil
 
     # Parsing precedence
     /\cJ+/.match("\n\n").to_a.should == ["\n\n"] # Quantifiers apply to entire escape sequence
     /\\cJ/.match("\\cJ").to_a.should == ["\\cJ"]
-    -> { eval('/[abc\x]/') }.should raise_error(SyntaxError) # \x is treated as a escape sequence even inside a character class
+    -> { eval('/[abc\x]/') }.should.raise(SyntaxError) # \x is treated as a escape sequence even inside a character class
     # Syntax error
-    -> { eval('/\c/') }.should raise_error(SyntaxError)
+    -> { eval('/\c/') }.should.raise(SyntaxError)
 
     # \cx          control char          (character code point value)
     # \C-x         control char          (character code point value)
diff --git a/spec/ruby/language/regexp/grouping_spec.rb b/spec/ruby/language/regexp/grouping_spec.rb
index 313858f7141..80ad7460da8 100644
--- a/spec/ruby/language/regexp/grouping_spec.rb
+++ b/spec/ruby/language/regexp/grouping_spec.rb
@@ -12,7 +12,7 @@
   end
 
   it "raises a SyntaxError when parentheses aren't balanced" do
-    -> { eval "/(hay(st)ack/" }.should raise_error(SyntaxError)
+    -> { eval "/(hay(st)ack/" }.should.raise(SyntaxError)
   end
 
   it "supports (?: ) (non-capturing group)" do
@@ -22,8 +22,8 @@
   end
 
   it "group names cannot start with digits or minus" do
-    -> { Regexp.new("(?<1a>a)") }.should raise_error(RegexpError)
-    -> { Regexp.new("(?<-a>a)") }.should raise_error(RegexpError)
+    -> { Regexp.new("(?<1a>a)") }.should.raise(RegexpError)
+    -> { Regexp.new("(?<-a>a)") }.should.raise(RegexpError)
   end
 
   it "ignore capture groups in line comments" do
diff --git a/spec/ruby/language/regexp/interpolation_spec.rb b/spec/ruby/language/regexp/interpolation_spec.rb
index 6951fd38cad..f771d0a3959 100644
--- a/spec/ruby/language/regexp/interpolation_spec.rb
+++ b/spec/ruby/language/regexp/interpolation_spec.rb
@@ -36,14 +36,14 @@ def o.to_s
 
   it "gives precedence to escape sequences over substitution" do
     str = "J"
-    /\c#{str}/.to_s.should include('{str}')
+    /\c#{str}/.to_s.should.include?('{str}')
   end
 
   it "throws RegexpError for malformed interpolation" do
     s = ""
-    -> { /(#{s}/ }.should raise_error(RegexpError)
+    -> { /(#{s}/ }.should.raise(RegexpError)
     s = "("
-    -> { /#{s}/ }.should raise_error(RegexpError)
+    -> { /#{s}/ }.should.raise(RegexpError)
   end
 
   it "allows interpolation in extended mode" do
diff --git a/spec/ruby/language/regexp/modifiers_spec.rb b/spec/ruby/language/regexp/modifiers_spec.rb
index 2f5522bc8ae..c96fbfa983d 100644
--- a/spec/ruby/language/regexp/modifiers_spec.rb
+++ b/spec/ruby/language/regexp/modifiers_spec.rb
@@ -8,7 +8,7 @@
 
   it "supports /m (multiline)" do
     /foo.bar/m.match("foo\nbar").to_a.should == ["foo\nbar"]
-    /foo.bar/.match("foo\nbar").should be_nil
+    /foo.bar/.match("foo\nbar").should == nil
   end
 
   it "supports /x (extended syntax)" do
@@ -36,7 +36,7 @@ def o.to_s
     /foo/imox.match("foo").to_a.should == ["foo"]
     /foo/imoximox.match("foo").to_a.should == ["foo"]
 
-    -> { eval('/foo/a') }.should raise_error(SyntaxError)
+    -> { eval('/foo/a') }.should.raise(SyntaxError)
   end
 
   it "supports (?~) (absent operator)" do
@@ -46,57 +46,57 @@ def o.to_s
 
   it "supports (?imx-imx) (inline modifiers)" do
     /(?i)foo/.match("FOO").to_a.should == ["FOO"]
-    /foo(?i)/.match("FOO").should be_nil
+    /foo(?i)/.match("FOO").should == nil
     # Interaction with /i
-    /(?-i)foo/i.match("FOO").should be_nil
+    /(?-i)foo/i.match("FOO").should == nil
     /foo(?-i)/i.match("FOO").to_a.should == ["FOO"]
     # Multiple uses
     /foo (?i)bar (?-i)baz/.match("foo BAR baz").to_a.should == ["foo BAR baz"]
-    /foo (?i)bar (?-i)baz/.match("foo BAR BAZ").should be_nil
+    /foo (?i)bar (?-i)baz/.match("foo BAR BAZ").should == nil
 
     /(?m)./.match("\n").to_a.should == ["\n"]
-    /.(?m)/.match("\n").should be_nil
+    /.(?m)/.match("\n").should == nil
     # Interaction with /m
-    /(?-m)./m.match("\n").should be_nil
+    /(?-m)./m.match("\n").should == nil
     /.(?-m)/m.match("\n").to_a.should == ["\n"]
     # Multiple uses
     /. (?m). (?-m)./.match(". \n .").to_a.should == [". \n ."]
-    /. (?m). (?-m)./.match(". \n \n").should be_nil
+    /. (?m). (?-m)./.match(". \n \n").should == nil
 
     /(?x) foo /.match("foo").to_a.should == ["foo"]
-    / foo (?x)/.match("foo").should be_nil
+    / foo (?x)/.match("foo").should == nil
     # Interaction with /x
-    /(?-x) foo /x.match("foo").should be_nil
+    /(?-x) foo /x.match("foo").should == nil
     / foo (?-x)/x.match("foo").to_a.should == ["foo"]
     # Multiple uses
     /( foo )(?x)( bar )(?-x)( baz )/.match(" foo bar baz ").to_a.should == [" foo bar baz ", " foo ", "bar", " baz "]
-    /( foo )(?x)( bar )(?-x)( baz )/.match(" foo barbaz").should be_nil
+    /( foo )(?x)( bar )(?-x)( baz )/.match(" foo barbaz").should == nil
 
     # Parsing
-    /(?i-i)foo/.match("FOO").should be_nil
+    /(?i-i)foo/.match("FOO").should == nil
     /(?ii)foo/.match("FOO").to_a.should == ["FOO"]
     /(?-)foo/.match("foo").to_a.should == ["foo"]
-    -> { eval('/(?o)/') }.should raise_error(SyntaxError)
+    -> { eval('/(?o)/') }.should.raise(SyntaxError)
   end
 
   it "supports (?imx-imx:expr) (scoped inline modifiers)" do
     /foo (?i:bar) baz/.match("foo BAR baz").to_a.should == ["foo BAR baz"]
-    /foo (?i:bar) baz/.match("foo BAR BAZ").should be_nil
-    /foo (?-i:bar) baz/i.match("foo BAR BAZ").should be_nil
+    /foo (?i:bar) baz/.match("foo BAR BAZ").should == nil
+    /foo (?-i:bar) baz/i.match("foo BAR BAZ").should == nil
 
     /. (?m:.) ./.match(". \n .").to_a.should == [". \n ."]
-    /. (?m:.) ./.match(". \n \n").should be_nil
-    /. (?-m:.) ./m.match("\n \n \n").should be_nil
+    /. (?m:.) ./.match(". \n \n").should == nil
+    /. (?-m:.) ./m.match("\n \n \n").should == nil
 
     /( foo )(?x: bar )( baz )/.match(" foo bar baz ").to_a.should == [" foo bar baz ", " foo ", " baz "]
-    /( foo )(?x: bar )( baz )/.match(" foo barbaz").should be_nil
+    /( foo )(?x: bar )( baz )/.match(" foo barbaz").should == nil
     /( foo )(?-x: bar )( baz )/x.match("foo bar baz").to_a.should == ["foo bar baz", "foo", "baz"]
 
     # Parsing
-    /(?i-i:foo)/.match("FOO").should be_nil
+    /(?i-i:foo)/.match("FOO").should == nil
     /(?ii:foo)/.match("FOO").to_a.should == ["FOO"]
     /(?-:)foo/.match("foo").to_a.should == ["foo"]
-    -> { eval('/(?o:)/') }.should raise_error(SyntaxError)
+    -> { eval('/(?o:)/') }.should.raise(SyntaxError)
   end
 
   it "supports . with /m" do
diff --git a/spec/ruby/language/regexp/repetition_spec.rb b/spec/ruby/language/regexp/repetition_spec.rb
index d76619688f4..f24323de5c8 100644
--- a/spec/ruby/language/regexp/repetition_spec.rb
+++ b/spec/ruby/language/regexp/repetition_spec.rb
@@ -15,7 +15,7 @@
 
   it "supports + (1 or more of previous subexpression)" do
     /a+/.match("aaa").to_a.should == ["aaa"]
-    /a+/.match("bbb").should be_nil
+    /a+/.match("bbb").should == nil
     /<.+>/.match("<a>foo</a>").to_a.should == ["<a>foo</a>"] # it is greedy
   end
 
diff --git a/spec/ruby/language/regexp_spec.rb b/spec/ruby/language/regexp_spec.rb
index ce344b5b05f..1452b01935f 100644
--- a/spec/ruby/language/regexp_spec.rb
+++ b/spec/ruby/language/regexp_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it "yields a Regexp" do
-    /Hello/.should be_kind_of(Regexp)
+    /Hello/.should.is_a?(Regexp)
   end
 
   it "is frozen" do
@@ -27,11 +27,11 @@
     2.times do |i|
       rs << /foo/
     end
-    rs[0].should equal(rs[1])
+    rs[0].should.equal?(rs[1])
   end
 
   it "throws SyntaxError for malformed literals" do
-    -> { eval('/(/') }.should raise_error(SyntaxError)
+    -> { eval('/(/') }.should.raise(SyntaxError)
   end
 
   #############################################################################
@@ -58,7 +58,7 @@
 
   it "disallows first part of paired delimiters to be used as non-paired delimiters" do
     LanguageSpecs.paired_delimiters.each do |p0, p1|
-      -> { eval("%r#{p0} foo #{p0}") }.should raise_error(SyntaxError)
+      -> { eval("%r#{p0} foo #{p0}") }.should.raise(SyntaxError)
     end
   end
 
@@ -69,11 +69,11 @@
   end
 
   it "disallows alphabets as non-paired delimiter with %r" do
-    -> { eval('%ra foo a') }.should raise_error(SyntaxError)
+    -> { eval('%ra foo a') }.should.raise(SyntaxError)
   end
 
   it "disallows spaces after %r and delimiter" do
-    -> { eval('%r !foo!') }.should raise_error(SyntaxError)
+    -> { eval('%r !foo!') }.should.raise(SyntaxError)
   end
 
   it "allows unescaped / to be used with %r" do
@@ -89,8 +89,8 @@
     # Basic matching
     /./.match("foo").to_a.should == ["f"]
     # Basic non-matching
-    /./.match("").should be_nil
-    /./.match("\n").should be_nil
+    /./.match("").should == nil
+    /./.match("\n").should == nil
     /./.match("\0").to_a.should == ["\0"]
   end
 
@@ -100,7 +100,7 @@
 
   it "supports (?> ) (embedded subexpression)" do
     /(?>foo)(?>bar)/.match("foobar").to_a.should == ["foobar"]
-    /(?>foo*)obar/.match("foooooooobar").should be_nil # it is possessive
+    /(?>foo*)obar/.match("foooooooobar").should == nil # it is possessive
   end
 
   it "supports (?# )" do
@@ -135,9 +135,9 @@
   it "supports possessive quantifiers" do
     /fooA++bar/.match("fooAAAbar").to_a.should == ["fooAAAbar"]
 
-    /fooA++Abar/.match("fooAAAbar").should be_nil
-    /fooA?+Abar/.match("fooAAAbar").should be_nil
-    /fooA*+Abar/.match("fooAAAbar").should be_nil
+    /fooA++Abar/.match("fooAAAbar").should == nil
+    /fooA?+Abar/.match("fooAAAbar").should == nil
+    /fooA*+Abar/.match("fooAAAbar").should == nil
   end
 
   it "supports conditional regular expressions with positional capture groups" do
diff --git a/spec/ruby/language/rescue_spec.rb b/spec/ruby/language/rescue_spec.rb
index 6be3bfd023a..cf16d8f6f85 100644
--- a/spec/ruby/language/rescue_spec.rb
+++ b/spec/ruby/language/rescue_spec.rb
@@ -59,7 +59,7 @@ class ArbitraryException < StandardError
       rescue SpecificExampleException => target&.captured_error
         :caught
       end.should == :caught
-      target.should be_nil
+      target.should == nil
     end
 
     it 'using a setter method' do
@@ -186,7 +186,7 @@ class << Object.new
     rescue *exception_list
       caught_it = true
     end
-    caught_it.should be_true
+    caught_it.should == true
     caught = []
     [->{raise ArbitraryException}, ->{raise SpecificExampleException}].each do |block|
       begin
@@ -197,7 +197,7 @@ class << Object.new
     end
     caught.size.should == 2
     exception_list.each do |exception_class|
-      caught.map{|e| e.class}.should include(exception_class)
+      caught.map{|e| e.class}.should.include?(exception_class)
     end
   end
 
@@ -210,7 +210,7 @@ class << Object.new
     rescue *exceptions
       caught_it = true
     end
-    caught_it.should be_true
+    caught_it.should == true
   end
 
   it "can combine a splatted list of exceptions with a literal list of exceptions" do
@@ -220,7 +220,7 @@ class << Object.new
     rescue ArbitraryException, *exception_list
       caught_it = true
     end
-    caught_it.should be_true
+    caught_it.should == true
     caught = []
     [->{raise ArbitraryException}, ->{raise SpecificExampleException}].each do |block|
       begin
@@ -231,7 +231,7 @@ class << Object.new
     end
     caught.size.should == 2
     exception_list.each do |exception_class|
-      caught.map{|e| e.class}.should include(exception_class)
+      caught.map{|e| e.class}.should.include?(exception_class)
     end
   end
 
@@ -241,7 +241,7 @@ class << Object.new
         raise OtherCustomException, "not rescued!"
       rescue *exception_list
       end
-    end.should raise_error(OtherCustomException)
+    end.should.raise(OtherCustomException)
   end
 
   it "can rescue different types of exceptions in different ways" do
@@ -345,7 +345,7 @@ class << Object.new
           ScratchPad << :else
         end
       ruby
-    }.should raise_error(SyntaxError, /else without rescue is useless/)
+    }.should.raise(SyntaxError, /else without rescue is useless/)
   end
 
   it "will not execute an else block if an exception was raised" do
@@ -413,7 +413,7 @@ class << Object.new
         ScratchPad << :two
         raise SpecificExampleException, "an error from else"
       end
-    end.should raise_error(SpecificExampleException)
+    end.should.raise(SpecificExampleException)
     ScratchPad.recorded.should == [:one, :two]
   end
 
@@ -445,7 +445,7 @@ class << Object.new
           rescue
             ScratchPad << :caught
           end
-        }.should raise_error(exception.class)
+        }.should.raise(exception.class)
       end
       ScratchPad.recorded.should == []
     end
@@ -476,7 +476,7 @@ def rescuer.===(exception)
         raise "error"
       rescue rescuer
       end
-    }.should raise_error(TypeError) { |e|
+    }.should.raise(TypeError) { |e|
       e.message.should =~ /class or module required for rescue clause/
     }
   end
@@ -488,7 +488,7 @@ def rescuer.===(exception)
         raise "error"
       rescue *rescuer
       end
-    }.should raise_error(TypeError) { |e|
+    }.should.raise(TypeError) { |e|
       e.message.should =~ /class or module required for rescue clause/
     }
   end
@@ -508,7 +508,7 @@ def rescuer.===(exception)
         raise "from block"
       rescue (raise "from rescue expression")
       end
-    }.should raise_error(RuntimeError, "from rescue expression") { |e|
+    }.should.raise(RuntimeError, "from rescue expression") { |e|
       e.cause.message.should == "from block"
     }
   end
@@ -542,7 +542,7 @@ class RescueInClassExample
           :caught
         }
       ruby
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 
   it "allows rescue in 'do end' block" do
@@ -563,7 +563,7 @@ class RescueInClassExample
   end
 
   it "requires the 'rescue' in method arguments to be wrapped in parens" do
-    -> { eval '1.+(1 rescue 1)' }.should raise_error(SyntaxError)
+    -> { eval '1.+(1 rescue 1)' }.should.raise(SyntaxError)
     eval('1.+((1 rescue 1))').should == 2
   end
 
@@ -593,7 +593,7 @@ def foo
         eval <<-ruby
           a = 1 rescue RuntimeError 2
         ruby
-      }.should raise_error(SyntaxError)
+      }.should.raise(SyntaxError)
     end
 
     it "rescues only StandardError and its subclasses" do
@@ -602,7 +602,7 @@ def foo
 
       -> {
         a = raise(Exception) rescue 1
-      }.should raise_error(Exception)
+      }.should.raise(Exception)
     end
 
     it "rescues with multiple assignment" do
diff --git a/spec/ruby/language/reserved_keywords.rb b/spec/ruby/language/reserved_keywords.rb
index 6c40e34cccc..bd1a55feec6 100644
--- a/spec/ruby/language/reserved_keywords.rb
+++ b/spec/ruby/language/reserved_keywords.rb
@@ -49,20 +49,20 @@
   keywords.each do |name|
     describe "keyword '#{name}'" do
       it "can't be used as local variable name" do
-        -> { eval(<<~RUBY) }.should raise_error(SyntaxError)
+        -> { eval(<<~RUBY) }.should.raise(SyntaxError)
             #{name} = :local_variable
         RUBY
       end
 
       if name == "defined?"
         it "can't be used as an instance variable name" do
-          -> { eval(<<~RUBY) }.should raise_error(SyntaxError)
+          -> { eval(<<~RUBY) }.should.raise(SyntaxError)
             @#{name} = :instance_variable
           RUBY
         end
 
         it "can't be used as a class variable name" do
-          -> { eval(<<~RUBY) }.should raise_error(SyntaxError)
+          -> { eval(<<~RUBY) }.should.raise(SyntaxError)
             class C
               @@#{name} = :class_variable
             end
@@ -70,7 +70,7 @@ class C
         end
 
         it "can't be used as a global variable name" do
-          -> { eval(<<~RUBY) }.should raise_error(SyntaxError)
+          -> { eval(<<~RUBY) }.should.raise(SyntaxError)
             $#{name} = :global_variable
           RUBY
         end
@@ -106,7 +106,7 @@ class C
       end
 
       it "can't be used as a positional parameter name" do
-        -> { eval(<<~RUBY) }.should raise_error(SyntaxError)
+        -> { eval(<<~RUBY) }.should.raise(SyntaxError)
           def x(#{name}); end
         RUBY
       end
@@ -115,7 +115,7 @@ def x(#{name}); end
 
       if invalid_kw_param_names.include?(name)
         it "can't be used a keyword parameter name" do
-          -> { eval(<<~RUBY) }.should raise_error(SyntaxError)
+          -> { eval(<<~RUBY) }.should.raise(SyntaxError)
             def m(#{name}:); end
           RUBY
         end
diff --git a/spec/ruby/language/retry_spec.rb b/spec/ruby/language/retry_spec.rb
index 669d5f0ff51..39e58b7b5d4 100644
--- a/spec/ruby/language/retry_spec.rb
+++ b/spec/ruby/language/retry_spec.rb
@@ -32,10 +32,10 @@
   end
 
   it "raises a SyntaxError when used outside of a rescue statement" do
-    -> { eval 'retry' }.should raise_error(SyntaxError)
-    -> { eval 'begin; retry; end' }.should raise_error(SyntaxError)
-    -> { eval 'def m; retry; end' }.should raise_error(SyntaxError)
-    -> { eval 'module RetrySpecs; retry; end' }.should raise_error(SyntaxError)
+    -> { eval 'retry' }.should.raise(SyntaxError)
+    -> { eval 'begin; retry; end' }.should.raise(SyntaxError)
+    -> { eval 'def m; retry; end' }.should.raise(SyntaxError)
+    -> { eval 'module RetrySpecs; retry; end' }.should.raise(SyntaxError)
   end
 end
 
diff --git a/spec/ruby/language/return_spec.rb b/spec/ruby/language/return_spec.rb
index a62ed1242d7..36a3cba4d7f 100644
--- a/spec/ruby/language/return_spec.rb
+++ b/spec/ruby/language/return_spec.rb
@@ -19,7 +19,7 @@ def r; return [1,2]; end
 
   it "returns nil by default" do
     def r; return; end
-    r().should be_nil
+    r().should == nil
   end
 
   describe "in a Thread" do
@@ -31,7 +31,7 @@ def r; return; end
           e
         end
       }
-      t.value.should be_an_instance_of(LocalJumpError)
+      t.value.should.instance_of?(LocalJumpError)
     end
   end
 
@@ -176,11 +176,11 @@ def f()
     end
 
     it "causes lambda to return nil if invoked without any arguments" do
-      -> { return; 456 }.call.should be_nil
+      -> { return; 456 }.call.should == nil
     end
 
     it "causes lambda to return nil if invoked with an empty expression" do
-      -> { return (); 456 }.call.should be_nil
+      -> { return (); 456 }.call.should == nil
     end
 
     it "causes lambda to return the value passed to return" do
@@ -229,7 +229,7 @@ def b
       def f
         1.times { 1.times {return true}; false}; false
       end
-      f.should be_true
+      f.should == true
     end
   end
 
@@ -417,7 +417,7 @@ class ReturnSpecs::A
           end
         END_OF_CODE
 
-        -> { load @filename }.should raise_error(SyntaxError)
+        -> { load @filename }.should.raise(SyntaxError)
       end
     end
 
@@ -431,7 +431,7 @@ class ReturnSpecs::A
           end
         END_OF_CODE
 
-        -> { load @filename }.should raise_error(LocalJumpError)
+        -> { load @filename }.should.raise(LocalJumpError)
       end
     end
 
diff --git a/spec/ruby/language/safe_navigator_spec.rb b/spec/ruby/language/safe_navigator_spec.rb
index b1e28c3963f..e8b429631d8 100644
--- a/spec/ruby/language/safe_navigator_spec.rb
+++ b/spec/ruby/language/safe_navigator_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Safe navigator" do
   it "requires a method name to be provided" do
-    -> { eval("obj&. {}") }.should raise_error(SyntaxError)
+    -> { eval("obj&. {}") }.should.raise(SyntaxError)
   end
 
   context "when context is nil" do
@@ -26,7 +26,7 @@
     it "calls the method" do
       false&.to_s.should == "false"
 
-      -> { false&.unknown }.should raise_error(NoMethodError)
+      -> { false&.unknown }.should.raise(NoMethodError)
     end
   end
 
@@ -34,7 +34,7 @@
     it "calls the method" do
       1&.to_s.should == "1"
 
-      -> { 1&.unknown }.should raise_error(NoMethodError)
+      -> { 1&.unknown }.should.raise(NoMethodError)
     end
   end
 
@@ -140,7 +140,7 @@ def foo
 
     -> {
       obj&.foo += 3
-    }.should raise_error(NoMethodError) { |e|
+    }.should.raise(NoMethodError) { |e|
       e.name.should == :+
     }
   end
diff --git a/spec/ruby/language/send_spec.rb b/spec/ruby/language/send_spec.rb
index 5d6340ffc55..f56a77d529f 100644
--- a/spec/ruby/language/send_spec.rb
+++ b/spec/ruby/language/send_spec.rb
@@ -22,7 +22,7 @@
     it "raises ArgumentError if the method has a positive arity" do
       -> {
         specs.fooM1
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -38,7 +38,7 @@
     it "raises ArgumentError if the methods arity doesn't match" do
       -> {
         specs.fooM1(1,2)
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -54,7 +54,7 @@
     it "raises ArgumentError if extra arguments are passed" do
       -> {
         specs.fooM0O1(2,3)
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -66,13 +66,13 @@
     it "raises an ArgumentError if there are no values for the mandatory args" do
       -> {
         specs.fooM1O1
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError if too many values are passed" do
       -> {
         specs.fooM1O1(1,2,3)
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -94,7 +94,7 @@
 
   it "with a block converts the block to a Proc" do
     prc = specs.makeproc { "hello" }
-    prc.should be_kind_of(Proc)
+    prc.should.is_a?(Proc)
     prc.call.should == "hello"
   end
 
@@ -112,7 +112,7 @@
 
       -> {
         specs.makeproc(&o)
-      }.should raise_error(TypeError, "can't convert LangSendSpecs::RawToProc to Proc (LangSendSpecs::RawToProc#to_proc gives Integer)")
+      }.should raise_consistent_error(TypeError, "can't convert LangSendSpecs::RawToProc into Proc (LangSendSpecs::RawToProc#to_proc gives Integer)")
     end
 
     it "raises TypeError if block object isn't a Proc and doesn't respond to `to_proc`" do
@@ -120,14 +120,14 @@
 
       -> {
         specs.makeproc(&o)
-      }.should raise_error(TypeError, "no implicit conversion of Object into Proc")
+      }.should.raise(TypeError, "no implicit conversion of Object into Proc")
     end
   end
 
   it "raises a SyntaxError with both a literal block and an object as block" do
     -> {
       eval "specs.oneb(10, &l){ 42 }"
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 
   it "with same names as existing variables is ok" do
@@ -212,21 +212,42 @@ def foobar; 200; end
       o.args.should == [1,2]
     end
 
-    it "raises NameError if invoked as a vcall" do
-      -> { no_such_method }.should raise_error NameError
+    describe "if invoked as a vcall" do
+      it "raises NameError" do
+        -> { no_such_method }.should.raise NameError
+      end
+
+      it "raises NameError with $! as a cause" do
+        begin
+          raise RuntimeError.new
+        rescue => cause
+          -> { no_such_method }.should.raise(NameError, cause:)
+        end
+      end
     end
 
     it "should omit the method_missing call from the backtrace for NameError" do
-      -> { no_such_method }.should raise_error { |e| e.backtrace.first.should_not include("method_missing") }
+      -> { no_such_method }.should.raise { |e| e.backtrace.first.should_not.include?("method_missing") }
     end
 
-    it "raises NoMethodError if invoked as an unambiguous method call" do
-      -> { no_such_method() }.should raise_error NoMethodError
-      -> { no_such_method(1,2,3) }.should raise_error NoMethodError
+    describe "if invoked as an unambiguous method call" do
+      it "raises NoMethodError" do
+        -> { no_such_method() }.should.raise NoMethodError
+        -> { no_such_method(1,2,3) }.should.raise NoMethodError
+      end
+
+      it "raises NoMethodError with $! as a cause" do
+        begin
+          raise
+        rescue => cause
+          -> { no_such_method() }.should.raise(NoMethodError, cause:)
+          -> { no_such_method(1,2,3) }.should.raise(NoMethodError, cause:)
+        end
+      end
     end
 
     it "should omit the method_missing call from the backtrace for NoMethodError" do
-      -> { no_such_method() }.should raise_error { |e| e.backtrace.first.should_not include("method_missing") }
+      -> { no_such_method() }.should.raise { |e| e.backtrace.first.should_not.include?("method_missing") }
     end
   end
 
@@ -355,7 +376,7 @@ def []=(*)
 
   it "with splat operator * and non-Array value uses value unchanged if it does not respond_to?(:to_ary)" do
     obj = Object.new
-    obj.should_not respond_to(:to_a)
+    obj.should_not.respond_to?(:to_a)
 
     specs.fooM0R(*obj).should == [obj]
     specs.fooM1R(1,*obj).should == [1, [obj]]
diff --git a/spec/ruby/language/shared/__FILE__.rb b/spec/ruby/language/shared/__FILE__.rb
index 3e4f5c958df..7e2e8719328 100644
--- a/spec/ruby/language/shared/__FILE__.rb
+++ b/spec/ruby/language/shared/__FILE__.rb
@@ -9,14 +9,14 @@
   end
 
   it "equals the absolute path of a file loaded by an absolute path" do
-    @object.send(@method, @path).should be_true
+    @object.send(@method, @path).should == true
     ScratchPad.recorded.should == [@path]
   end
 
   it "equals the absolute path of a file loaded by a relative path" do
     $LOAD_PATH << "."
     Dir.chdir CODE_LOADING_DIR do
-      @object.send(@method, "file_fixture.rb").should be_true
+      @object.send(@method, "file_fixture.rb").should == true
     end
     ScratchPad.recorded.should == [@path]
   end
diff --git a/spec/ruby/language/shared/__LINE__.rb b/spec/ruby/language/shared/__LINE__.rb
index 076b74b3bac..6bfc8c1c179 100644
--- a/spec/ruby/language/shared/__LINE__.rb
+++ b/spec/ruby/language/shared/__LINE__.rb
@@ -9,7 +9,7 @@
   end
 
   it "equals the line number of the text in a loaded file" do
-    @object.send(@method, @path).should be_true
+    @object.send(@method, @path).should == true
     ScratchPad.recorded.should == [1, 5]
   end
 end
diff --git a/spec/ruby/language/singleton_class_spec.rb b/spec/ruby/language/singleton_class_spec.rb
index 45e1f7f3ad5..20256a323ce 100644
--- a/spec/ruby/language/singleton_class_spec.rb
+++ b/spec/ruby/language/singleton_class_spec.rb
@@ -15,39 +15,39 @@
   end
 
   it "raises a TypeError for Integer's" do
-    -> { 1.singleton_class }.should raise_error(TypeError)
+    -> { 1.singleton_class }.should.raise(TypeError)
   end
 
   it "raises a TypeError for symbols" do
-    -> { :symbol.singleton_class }.should raise_error(TypeError)
+    -> { :symbol.singleton_class }.should.raise(TypeError)
   end
 
   it "is a singleton Class instance" do
     o = mock('x')
-    o.singleton_class.should be_kind_of(Class)
-    o.singleton_class.should_not equal(Object)
-    o.should be_kind_of(o.singleton_class)
+    o.singleton_class.should.is_a?(Class)
+    o.singleton_class.should_not.equal?(Object)
+    o.should.is_a?(o.singleton_class)
   end
 
   it "is a Class for classes" do
-    ClassSpecs::A.singleton_class.should be_kind_of(Class)
+    ClassSpecs::A.singleton_class.should.is_a?(Class)
   end
 
   it "inherits from Class for classes" do
-    Class.should be_ancestor_of(Object.singleton_class)
+    Object.singleton_class.ancestors.should.include?(Class)
   end
 
   it "is a subclass of Class's singleton class" do
     ec = ClassSpecs::A.singleton_class
-    ec.should be_kind_of(Class.singleton_class)
+    ec.should.is_a?(Class.singleton_class)
   end
 
   it "is a subclass of the same level of Class's singleton class" do
     ecec = ClassSpecs::A.singleton_class.singleton_class
     class_ec = Class.singleton_class
 
-    ecec.should be_kind_of(class_ec.singleton_class)
-    ecec.should be_kind_of(class_ec)
+    ecec.should.is_a?(class_ec.singleton_class)
+    ecec.should.is_a?(class_ec)
   end
 
   it "is a subclass of a superclass's singleton class" do
@@ -60,7 +60,7 @@
       ClassSpecs::H.singleton_class.singleton_class
   end
 
-  it "for BasicObject has Class as it's superclass" do
+  it "for BasicObject has Class as its superclass" do
     BasicObject.singleton_class.superclass.should == Class
   end
 
@@ -74,7 +74,7 @@
   end
 
   it "doesn't have singleton class" do
-    -> { bignum_value.singleton_class }.should raise_error(TypeError)
+    -> { bignum_value.singleton_class }.should.raise(TypeError)
   end
 end
 
@@ -105,20 +105,20 @@ class << @object
   end
 
   it "is not defined on the object's class" do
-    @object.class.const_defined?(:CONST).should be_false
+    @object.class.const_defined?(:CONST).should == false
   end
 
   it "is not defined in the singleton class opener's scope" do
     class << @object
       CONST
     end
-    -> { CONST }.should raise_error(NameError)
+    -> { CONST }.should.raise(NameError)
   end
 
   it "cannot be accessed via object::CONST" do
     -> do
       @object::CONST
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a NameError for anonymous_module::CONST" do
@@ -129,15 +129,15 @@ class << @object
 
     -> do
       @object::CONST
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "appears in the singleton class constant list" do
-    @object.singleton_class.should have_constant(:CONST)
+    @object.singleton_class.should.const_defined?(:CONST, false)
   end
 
   it "does not appear in the object's class constant list" do
-    @object.class.should_not have_constant(:CONST)
+    @object.class.should_not.const_defined?(:CONST)
   end
 
   it "is not preserved when the object is duped" do
@@ -145,14 +145,14 @@ class << @object
 
     -> do
       class << @object; CONST; end
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
   it "is preserved when the object is cloned" do
     @object = @object.clone
 
     class << @object
-      CONST.should_not be_nil
+      CONST.should_not == nil
     end
   end
 end
@@ -168,7 +168,7 @@ def singleton_method; 1 end
   end
 
   it "defines public methods" do
-    @k_sc.should have_public_instance_method(:singleton_method)
+    @k_sc.public_instance_methods(false).should.include?(:singleton_method)
   end
 end
 
@@ -181,46 +181,46 @@ def singleton_method; 1 end
   end
 
   it "include ones of the object's class" do
-    @k_sc.should have_instance_method(:example_instance_method)
+    @k_sc.should.method_defined?(:example_instance_method, true)
   end
 
   it "does not include class methods of the object's class" do
-    @k_sc.should_not have_instance_method(:example_class_method)
+    @k_sc.should_not.method_defined?(:example_class_method)
   end
 
   it "include instance methods of Object" do
-    @a_sc.should have_instance_method(:example_instance_method_of_object)
+    @a_sc.should.method_defined?(:example_instance_method_of_object, true)
   end
 
   it "does not include class methods of Object" do
-    @a_sc.should_not have_instance_method(:example_class_method_of_object)
+    @a_sc.should_not.method_defined?(:example_class_method_of_object)
   end
 
   describe "for a class" do
     it "include instance methods of Class" do
-      @a_c_sc.should have_instance_method(:example_instance_method_of_class)
+      @a_c_sc.should.method_defined?(:example_instance_method_of_class, true)
     end
 
     it "does not include class methods of Class" do
-      @a_c_sc.should_not have_instance_method(:example_class_method_of_class)
+      @a_c_sc.should_not.method_defined?(:example_class_method_of_class)
     end
 
     it "does not include instance methods of the singleton class of Class" do
-      @a_c_sc.should_not have_instance_method(:example_instance_method_of_singleton_class)
+      @a_c_sc.should_not.method_defined?(:example_instance_method_of_singleton_class)
     end
 
     it "does not include class methods of the singleton class of Class" do
-      @a_c_sc.should_not have_instance_method(:example_class_method_of_singleton_class)
+      @a_c_sc.should_not.method_defined?(:example_class_method_of_singleton_class)
     end
   end
 
   describe "for a singleton class" do
     it "includes instance methods of the singleton class of Class" do
-      @a_c_sc.singleton_class.should have_instance_method(:example_instance_method_of_singleton_class)
+      @a_c_sc.singleton_class.should.method_defined?(:example_instance_method_of_singleton_class, true)
     end
 
     it "does not include class methods of the singleton class of Class" do
-      @a_c_sc.singleton_class.should_not have_instance_method(:example_class_method_of_singleton_class)
+      @a_c_sc.singleton_class.should_not.method_defined?(:example_class_method_of_singleton_class)
     end
   end
 end
@@ -234,46 +234,46 @@ def singleton_method; 1 end
   end
 
   it "include ones of the object's class" do
-    @k_sc.should have_method(:example_class_method)
+    @k_sc.should.respond_to?(:example_class_method)
   end
 
   it "does not include instance methods of the object's class" do
-    @k_sc.should_not have_method(:example_instance_method)
+    @k_sc.should_not.respond_to?(:example_instance_method)
   end
 
   it "include instance methods of Class" do
-    @a_sc.should have_method(:example_instance_method_of_class)
+    @a_sc.should.respond_to?(:example_instance_method_of_class)
   end
 
   it "does not include class methods of Class" do
-    @a_sc.should_not have_method(:example_class_method_of_class)
+    @a_sc.should_not.respond_to?(:example_class_method_of_class)
   end
 
   describe "for a class" do
     it "include instance methods of Class" do
-      @a_c_sc.should have_method(:example_instance_method_of_class)
+      @a_c_sc.should.respond_to?(:example_instance_method_of_class)
     end
 
     it "include class methods of Class" do
-      @a_c_sc.should have_method(:example_class_method_of_class)
+      @a_c_sc.should.respond_to?(:example_class_method_of_class)
     end
 
     it "include instance methods of the singleton class of Class" do
-      @a_c_sc.should have_method(:example_instance_method_of_singleton_class)
+      @a_c_sc.should.respond_to?(:example_instance_method_of_singleton_class)
     end
 
     it "does not include class methods of the singleton class of Class" do
-      @a_c_sc.should_not have_method(:example_class_method_of_singleton_class)
+      @a_c_sc.should_not.respond_to?(:example_class_method_of_singleton_class)
     end
   end
 
   describe "for a singleton class" do
     it "include instance methods of the singleton class of Class" do
-      @a_c_sc.singleton_class.should have_method(:example_instance_method_of_singleton_class)
+      @a_c_sc.singleton_class.should.respond_to?(:example_instance_method_of_singleton_class)
     end
 
     it "include class methods of the singleton class of Class" do
-      @a_c_sc.singleton_class.should have_method(:example_class_method_of_singleton_class)
+      @a_c_sc.singleton_class.should.respond_to?(:example_class_method_of_singleton_class)
     end
   end
 end
@@ -282,13 +282,13 @@ def singleton_method; 1 end
   it "raises a TypeError when new is called" do
     -> {
       Object.new.singleton_class.new
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises a TypeError when allocate is called" do
     -> {
       Object.new.singleton_class.allocate
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 end
 
diff --git a/spec/ruby/language/source_encoding_spec.rb b/spec/ruby/language/source_encoding_spec.rb
index 7135bc0a700..5a243fa2c3c 100644
--- a/spec/ruby/language/source_encoding_spec.rb
+++ b/spec/ruby/language/source_encoding_spec.rb
@@ -29,7 +29,7 @@
 
       touch(path, "wb") { |f| f.write source }
       begin
-        ruby_exe(path, args: "2>&1", exit_status: 1).should =~ /invalid multibyte char/
+        ruby_exe(path, args: "2>&1", exit_status: 1).b.should =~ /invalid multibyte char/
       ensure
         rm_r path
       end
@@ -51,7 +51,7 @@
 
       touch(path, "wb") { |f| f.write source }
       begin
-        ruby_exe(path, args: "2>&1", exit_status: 1).should =~ /invalid multibyte char/
+        ruby_exe(path, args: "2>&1", exit_status: 1).b.should =~ /invalid multibyte char/
       ensure
         rm_r path
       end
diff --git a/spec/ruby/language/string_spec.rb b/spec/ruby/language/string_spec.rb
index 050ffaa4e77..163063032f6 100644
--- a/spec/ruby/language/string_spec.rb
+++ b/spec/ruby/language/string_spec.rb
@@ -136,7 +136,7 @@ class << obj
   it "raise NoMethodError when #to_s is not defined for the object" do
     obj = BasicObject.new
 
-    -> { "#{obj}" }.should raise_error(NoMethodError)
+    -> { "#{obj}" }.should.raise(NoMethodError)
   end
 
   it "uses an internal representation when #to_s doesn't return a String" do
@@ -149,7 +149,7 @@ class << obj
     # is that if you interpolate an object that fails to return
     # a String, you will still get a String and not raise an
     # exception.
-    "#{obj}".should be_an_instance_of(String)
+    "#{obj}".should.instance_of?(String)
   end
 
   it "allows a dynamic string to parse a nested do...end block as an argument to a call without parens, interpolated" do
@@ -287,7 +287,7 @@ def long_string_literals
     a = "\u3042"
     b = "\xff".dup.force_encoding "binary"
 
-    -> { "#{a} #{b}" }.should raise_error(Encoding::CompatibilityError)
+    -> { "#{a} #{b}" }.should.raise(Encoding::CompatibilityError)
   end
 
   it "creates a non-frozen String" do
diff --git a/spec/ruby/language/super_spec.rb b/spec/ruby/language/super_spec.rb
index 7d9e896d8b1..f595d49395d 100644
--- a/spec/ruby/language/super_spec.rb
+++ b/spec/ruby/language/super_spec.rb
@@ -83,8 +83,8 @@ def foo
       end
     end
 
-    -> {sub_normal.new.foo}.should raise_error(NoMethodError, /super/)
-    -> {sub_zsuper.new.foo}.should raise_error(NoMethodError, /super/)
+    -> {sub_normal.new.foo}.should.raise(NoMethodError, /super/)
+    -> {sub_zsuper.new.foo}.should.raise(NoMethodError, /super/)
   end
 
   it "uses given block even if arguments are passed explicitly" do
@@ -130,7 +130,7 @@ def m(v)
       end
     end
 
-    c2.new.m('a') { raise }.should be_false
+    c2.new.m('a') { raise }.should == false
   end
 
   it "uses block argument given to method when used in a block" do
@@ -200,7 +200,7 @@ def a(arg)
       end
     end
 
-    -> { klass.new.a(:a_called) }.should raise_error(RuntimeError)
+    -> { klass.new.a(:a_called) }.should.raise(RuntimeError)
   end
 
   it "is able to navigate to super, when a method is defined dynamically on the singleton class" do
@@ -461,4 +461,18 @@ def obj.foobar(array)
       @all.foo('a', b: 'b').should == [['a'], {b: 'b'}]
     end
   end
+
+  it "works in method definitions using **nil" do
+    parent = Class.new do
+      def m(*args, **kwargs)
+        [args, kwargs]
+      end
+    end
+    child = Class.new(parent) do
+      def m(*args, **nil)
+        super
+      end
+    end
+    child.new.m(1, 2).should == [[1, 2], {}]
+  end
 end
diff --git a/spec/ruby/language/symbol_spec.rb b/spec/ruby/language/symbol_spec.rb
index 0801d3223ec..81fe06b50bd 100644
--- a/spec/ruby/language/symbol_spec.rb
+++ b/spec/ruby/language/symbol_spec.rb
@@ -3,7 +3,7 @@
 describe "A Symbol literal" do
   it "is a ':' followed by any number of valid characters" do
     a = :foo
-    a.should be_kind_of(Symbol)
+    a.should.is_a?(Symbol)
     a.inspect.should == ':foo'
   end
 
@@ -21,7 +21,7 @@
       :_Foo,
       :&,
       :_9
-    ].each { |s| s.should be_kind_of(Symbol) }
+    ].each { |s| s.should.is_a?(Symbol) }
   end
 
   it "is a ':' followed by a single- or double-quoted string that may contain otherwise invalid characters" do
@@ -31,7 +31,7 @@
       [:"foo #{1 + 1}", ':"foo 2"'],
       [:"foo\nbar",     ':"foo\nbar"'],
     ].each { |sym, str|
-      sym.should be_kind_of(Symbol)
+      sym.should.is_a?(Symbol)
       sym.inspect.should == str
     }
   end
@@ -42,22 +42,22 @@
   end
 
   it "may contain '::' in the string" do
-    :'Some::Class'.should be_kind_of(Symbol)
+    :'Some::Class'.should.is_a?(Symbol)
   end
 
   it "is converted to a literal, unquoted representation if the symbol contains only valid characters" do
     a, b, c = :'foo', :'+', :'Foo__9'
-    a.should be_kind_of(Symbol)
+    a.should.is_a?(Symbol)
     a.inspect.should == ':foo'
-    b.should be_kind_of(Symbol)
+    b.should.is_a?(Symbol)
     b.inspect.should == ':+'
-    c.should be_kind_of(Symbol)
+    c.should.is_a?(Symbol)
     c.inspect.should == ':Foo__9'
   end
 
   it "can be created by the %s-delimited expression" do
     a, b = :'foo bar', %s{foo bar}
-    b.should be_kind_of(Symbol)
+    b.should.is_a?(Symbol)
     b.inspect.should == ':"foo bar"'
     b.should == a
   end
@@ -68,7 +68,7 @@
       [:'a string', :'a string'],
       [:"#{var}", :"#{var}"]
     ].each { |a, b|
-      a.should equal(b)
+      a.should.equal?(b)
     }
   end
 
@@ -78,7 +78,7 @@
 
   it "can be an empty string" do
     c = :''
-    c.should be_kind_of(Symbol)
+    c.should.is_a?(Symbol)
     c.inspect.should == ':""'
   end
 
@@ -101,7 +101,7 @@
       ScratchPad.record []
       -> {
         eval 'ScratchPad << 1; :"\xC3"'
-      }.should raise_error(SyntaxError, /invalid symbol/)
+      }.should.raise(SyntaxError, /invalid symbol/)
       ScratchPad.recorded.should == []
     end
   end
diff --git a/spec/ruby/language/throw_spec.rb b/spec/ruby/language/throw_spec.rb
index d7238436886..73f64de17db 100644
--- a/spec/ruby/language/throw_spec.rb
+++ b/spec/ruby/language/throw_spec.rb
@@ -35,7 +35,7 @@
         throw :exit
       end
     end
-    $!.should be_nil
+    $!.should == nil
   end
 
   it "allows any object as its argument" do
@@ -45,7 +45,7 @@
   end
 
   it "does not convert strings to a symbol" do
-    -> { catch(:exit) { throw "exit" } }.should raise_error(ArgumentError)
+    -> { catch(:exit) { throw "exit" } }.should.raise(ArgumentError)
   end
 
   it "unwinds stack from within a method" do
@@ -64,8 +64,8 @@ def throw_method(handler, val)
   end
 
   it "raises an ArgumentError if outside of scope of a matching catch" do
-    -> { throw :test, 5 }.should raise_error(ArgumentError)
-    -> { catch(:different) { throw :test, 5 } }.should raise_error(ArgumentError)
+    -> { throw :test, 5 }.should.raise(ArgumentError)
+    -> { catch(:different) { throw :test, 5 } }.should.raise(ArgumentError)
   end
 
   it "raises an UncaughtThrowError if used to exit a thread" do
@@ -73,7 +73,7 @@ def throw_method(handler, val)
       t = Thread.new {
         -> {
           throw :what
-        }.should raise_error(UncaughtThrowError)
+        }.should.raise(UncaughtThrowError)
       }
       t.join
     end
diff --git a/spec/ruby/language/undef_spec.rb b/spec/ruby/language/undef_spec.rb
index 268c0b84c39..98ecd99c214 100644
--- a/spec/ruby/language/undef_spec.rb
+++ b/spec/ruby/language/undef_spec.rb
@@ -14,42 +14,42 @@ def meth(o); o; end
       @undef_class.class_eval do
         undef meth
       end
-      -> { @obj.meth(5) }.should raise_error(NoMethodError)
+      -> { @obj.meth(5) }.should.raise(NoMethodError)
     end
 
     it "with a simple symbol" do
       @undef_class.class_eval do
         undef :meth
       end
-      -> { @obj.meth(5) }.should raise_error(NoMethodError)
+      -> { @obj.meth(5) }.should.raise(NoMethodError)
     end
 
     it "with a single quoted symbol" do
       @undef_class.class_eval do
         undef :'meth'
       end
-      -> { @obj.meth(5) }.should raise_error(NoMethodError)
+      -> { @obj.meth(5) }.should.raise(NoMethodError)
     end
 
     it "with a double quoted symbol" do
       @undef_class.class_eval do
         undef :"meth"
       end
-      -> { @obj.meth(5) }.should raise_error(NoMethodError)
+      -> { @obj.meth(5) }.should.raise(NoMethodError)
     end
 
     it "with an interpolated symbol" do
       @undef_class.class_eval do
         undef :"#{'meth'}"
       end
-      -> { @obj.meth(5) }.should raise_error(NoMethodError)
+      -> { @obj.meth(5) }.should.raise(NoMethodError)
     end
 
     it "with an interpolated symbol when interpolated expression is not a String literal" do
       @undef_class.class_eval do
         undef :"#{'meth'.to_sym}"
       end
-      -> { @obj.meth(5) }.should raise_error(NoMethodError)
+      -> { @obj.meth(5) }.should.raise(NoMethodError)
     end
   end
 
@@ -70,7 +70,7 @@ def method2; :nope; end
     Class.new do
       -> {
         undef not_exist
-      }.should raise_error(NameError) { |e|
+      }.should.raise(NameError) { |e|
         # a NameError and not a NoMethodError
         e.class.should == NameError
       }
diff --git a/spec/ruby/language/variables_spec.rb b/spec/ruby/language/variables_spec.rb
index e1342719394..e01e03f01e0 100644
--- a/spec/ruby/language/variables_spec.rb
+++ b/spec/ruby/language/variables_spec.rb
@@ -91,7 +91,7 @@ class << x; private :to_ary; end
       x = mock("multi-assign single RHS")
       x.should_receive(:to_ary).and_return(1)
 
-      -> { a, b, c = x }.should raise_error(TypeError)
+      -> { a, b, c = x }.should.raise(TypeError)
     end
 
     it "does not call #to_a to convert an Object RHS when assigning a simple MLHS" do
@@ -122,7 +122,7 @@ class << x; private :to_ary; end
       ary = [1, 2]
 
       x = (a, b = ary)
-      x.should equal(ary)
+      x.should.equal?(ary)
     end
 
     it "returns the RHS when it is an Array subclass" do
@@ -130,7 +130,7 @@ class << x; private :to_ary; end
       ary = cls.new [1, 2]
 
       x = (a, b = ary)
-      x.should equal(ary)
+      x.should.equal?(ary)
     end
 
     it "does not call #to_ary on an Array subclass instance" do
@@ -172,7 +172,7 @@ class << x; private :to_ary; end
       x = mock("multi-assign splat")
       x.should_receive(:to_ary).and_return(1)
 
-      -> { *a = x }.should raise_error(TypeError)
+      -> { *a = x }.should.raise(TypeError)
     end
 
     it "does not call #to_ary on an Array subclass" do
@@ -189,8 +189,8 @@ class << x; private :to_ary; end
       ary = cls.new [1, 2]
 
       x = (*a = ary)
-      x.should equal(ary)
-      a.should be_an_instance_of(Array)
+      x.should.equal?(ary)
+      a.should.instance_of?(Array)
     end
 
     it "calls #to_ary to convert an Object RHS with MLHS" do
@@ -205,7 +205,7 @@ class << x; private :to_ary; end
       x = mock("multi-assign splat")
       x.should_receive(:to_ary).and_return(1)
 
-      -> { a, *b, c = x }.should raise_error(TypeError)
+      -> { a, *b, c = x }.should.raise(TypeError)
     end
 
     it "does not call #to_a to convert an Object RHS with a MLHS" do
@@ -301,7 +301,7 @@ def x(a) a end
       x = mock("multi-assign attributes")
       x.should_receive(:m).and_return(y)
 
-      -> { a, b = x.m }.should raise_error(TypeError)
+      -> { a, b = x.m }.should.raise(TypeError)
     end
 
     it "assigns values from a RHS method call with receiver and arguments" do
@@ -393,7 +393,7 @@ module VariableSpecs
       ary = [1, 2]
 
       (a = *ary).should == [1, 2]
-      a.should_not equal(ary)
+      a.should_not.equal?(ary)
     end
 
     it "does not call #to_a on an Array subclass" do
@@ -412,10 +412,10 @@ module VariableSpecs
       x = (a = *ary)
 
       x.should == [1, 2]
-      x.should be_an_instance_of(Array)
+      x.should.instance_of?(Array)
 
       a.should == [1, 2]
-      a.should be_an_instance_of(Array)
+      a.should.instance_of?(Array)
     end
 
     it "unfreezes the array returned from calling 'to_a' on the splatted value" do
@@ -481,7 +481,7 @@ class << x; private :to_a; end
       x = mock("multi-assign RHS splat")
       x.should_receive(:to_a).and_return(1)
 
-      -> { *a = *x }.should raise_error(TypeError)
+      -> { *a = *x }.should.raise(TypeError)
     end
 
     it "does not call #to_ary to convert an Object RHS with a single splat LHS" do
@@ -527,7 +527,7 @@ class << x; private :to_a; end
       x = mock("multi-assign splat")
       x.should_receive(:to_a).and_return(1)
 
-      -> { a = *x }.should raise_error(TypeError)
+      -> { a = *x }.should.raise(TypeError)
     end
 
     it "calls #to_a to convert an Object splat RHS when assigned to a simple MLHS" do
@@ -542,7 +542,7 @@ class << x; private :to_a; end
       x = mock("multi-assign splat")
       x.should_receive(:to_a).and_return(1)
 
-      -> { a, b, c = *x }.should raise_error(TypeError)
+      -> { a, b, c = *x }.should.raise(TypeError)
     end
 
     it "does not call #to_ary to convert an Object splat RHS when assigned to a simple MLHS" do
@@ -565,7 +565,7 @@ class << x; private :to_a; end
       x = mock("multi-assign splat")
       x.should_receive(:to_a).and_return(1)
 
-      -> { a, *b, c = *x }.should raise_error(TypeError)
+      -> { a, *b, c = *x }.should.raise(TypeError)
     end
 
     it "does not call #to_ary to convert an Object RHS with a MLHS" do
@@ -645,7 +645,7 @@ module VariableSpecs
       x = mock("multi-assign splat MRHS")
       x.should_receive(:to_a).and_return(1)
 
-      -> { a, *b = 1, *x }.should raise_error(TypeError)
+      -> { a, *b = 1, *x }.should.raise(TypeError)
     end
 
     it "does not call #to_ary to convert a splatted Object as part of a MRHS with a splat MRHS" do
@@ -668,7 +668,7 @@ module VariableSpecs
       x = mock("multi-assign splat MRHS")
       x.should_receive(:to_a).and_return(1)
 
-      -> { a, *b = *x, 1 }.should raise_error(TypeError)
+      -> { a, *b = *x, 1 }.should.raise(TypeError)
     end
 
     it "does not call #to_ary to convert a splatted Object with a splat MRHS" do
@@ -717,7 +717,7 @@ module VariableSpecs
       x = mock("multi-assign mixed RHS")
       x.should_receive(:to_ary).and_return(x)
 
-      -> { a, (b, c), d = 1, x, 3, 4 }.should raise_error(TypeError)
+      -> { a, (b, c), d = 1, x, 3, 4 }.should.raise(TypeError)
     end
 
     it "calls #to_a to convert a splatted Object value in a MRHS" do
@@ -741,7 +741,7 @@ module VariableSpecs
       x = mock("multi-assign mixed splatted RHS")
       x.should_receive(:to_ary).and_return(x)
 
-      -> { a, *b, (c, d) = 1, 2, 3, *x }.should raise_error(TypeError)
+      -> { a, *b, (c, d) = 1, 2, 3, *x }.should.raise(TypeError)
     end
 
     it "does not call #to_ary to convert an Object when the position receiving the value is a simple variable" do
@@ -889,7 +889,7 @@ def test
           ἍBB = 1
         end
       CODE
-    end.should raise_error(SyntaxError, /dynamic constant assignment/)
+    end.should.raise(SyntaxError, /dynamic constant assignment/)
   end
 end
 
diff --git a/spec/ruby/language/while_spec.rb b/spec/ruby/language/while_spec.rb
index e172453ca6d..b9bf32047d9 100644
--- a/spec/ruby/language/while_spec.rb
+++ b/spec/ruby/language/while_spec.rb
@@ -88,7 +88,7 @@
           break if c
           c = false
         )
-    end.should be_nil
+    end.should == nil
   end
 
   it "stops running body if interrupted by break in a begin ... end element op-assign-or value" do
@@ -99,7 +99,7 @@
         break if c
         c = false
       end
-    end.should be_nil
+    end.should == nil
   end
 
   it "stops running body if interrupted by break in a parenthesized element op-assign value" do
@@ -111,7 +111,7 @@
           break if c
           c = false
         )
-    end.should be_nil
+    end.should == nil
     a.should == [1, 2]
   end
 
@@ -123,7 +123,7 @@
         break if c
         c = false
       end
-    end.should be_nil
+    end.should == nil
     a.should == [1, 2]
   end
 
@@ -139,7 +139,7 @@
           break unless d
           d = false
         )
-    end.should be_nil
+    end.should == nil
   end
 
   it "stops running body if interrupted by break with unless in a begin ... end attribute op-assign-or value" do
@@ -153,7 +153,7 @@
         break unless d
         d = false
       end
-    end.should be_nil
+    end.should == nil
   end
 
   it "stops running body if interrupted by break in a parenthesized attribute op-assign-or value" do
@@ -168,7 +168,7 @@
           break if c
           c = false
         )
-    end.should be_nil
+    end.should == nil
   end
 
   it "stops running body if interrupted by break in a begin ... end attribute op-assign-or value" do
@@ -182,7 +182,7 @@
         break if c
         c = false
       end
-    end.should be_nil
+    end.should == nil
   end
 
   it "returns value passed to break if interrupted by break" do
diff --git a/spec/ruby/language/yield_spec.rb b/spec/ruby/language/yield_spec.rb
index 3b1313914f2..3173f41b0c3 100644
--- a/spec/ruby/language/yield_spec.rb
+++ b/spec/ruby/language/yield_spec.rb
@@ -13,7 +13,7 @@
 
   describe "taking no arguments" do
     it "raises a LocalJumpError when the method is not passed a block" do
-      -> { @y.z }.should raise_error(LocalJumpError)
+      -> { @y.z }.should.raise(LocalJumpError)
     end
 
     it "ignores assignment to the explicit block argument and calls the passed block" do
@@ -28,7 +28,7 @@
   describe "taking a single argument" do
     describe "when no block is given" do
       it "raises a LocalJumpError" do
-        -> { @y.s(1) }.should raise_error(LocalJumpError)
+        -> { @y.s(1) }.should.raise(LocalJumpError)
       end
     end
 
@@ -76,20 +76,20 @@
       it "raises an ArgumentError if too few arguments are passed" do
         -> {
           @y.s(1, &-> a, b { [a,b] })
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
 
       it "should not destructure an Array into multiple arguments" do
         -> {
           @y.s([1, 2], &-> a, b { [a,b] })
-        }.should raise_error(ArgumentError)
+        }.should.raise(ArgumentError)
       end
     end
   end
 
   describe "taking multiple arguments" do
     it "raises a LocalJumpError when the method is not passed a block" do
-      -> { @y.m(1, 2, 3) }.should raise_error(LocalJumpError)
+      -> { @y.m(1, 2, 3) }.should.raise(LocalJumpError)
     end
 
     it "passes the arguments to the block" do
@@ -103,19 +103,19 @@
     it "raises an ArgumentError if too many arguments are passed to a lambda" do
       -> {
         @y.m(1, 2, 3, &-> a { })
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError if too few arguments are passed to a lambda" do
       -> {
         @y.m(1, 2, 3, &-> a, b, c, d { })
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
   describe "taking a single splatted argument" do
     it "raises a LocalJumpError when the method is not passed a block" do
-      -> { @y.r(0) }.should raise_error(LocalJumpError)
+      -> { @y.r(0) }.should.raise(LocalJumpError)
     end
 
     it "passes a single value" do
@@ -147,7 +147,7 @@
 
   describe "taking multiple arguments with a splat" do
     it "raises a LocalJumpError when the method is not passed a block" do
-      -> { @y.rs(1, 2, [3, 4]) }.should raise_error(LocalJumpError)
+      -> { @y.rs(1, 2, [3, 4]) }.should.raise(LocalJumpError)
     end
 
     it "passes the arguments to the block" do
@@ -172,7 +172,7 @@
 
   describe "taking matching arguments with splats and post args" do
     it "raises a LocalJumpError when the method is not passed a block" do
-      -> { @y.rs(1, 2, [3, 4]) }.should raise_error(LocalJumpError)
+      -> { @y.rs(1, 2, [3, 4]) }.should.raise(LocalJumpError)
     end
 
     it "passes the arguments to the block" do
@@ -199,7 +199,7 @@ class << Object.new
       end
     RUBY
 
-    -> { eval(code) }.should raise_error(SyntaxError, /Invalid yield/)
+    -> { eval(code) }.should.raise(SyntaxError, /Invalid yield/)
   end
 end
 
@@ -209,7 +209,7 @@ class << Object.new
         1.times { yield }
       RUBY
 
-    -> { eval(code) }.should raise_error(SyntaxError, /Invalid yield/)
+    -> { eval(code) }.should.raise(SyntaxError, /Invalid yield/)
   end
 end
 
@@ -221,6 +221,6 @@ module YieldSpecs::ModuleWithYield
       end
     RUBY
 
-    -> { eval(code) }.should raise_error(SyntaxError, /Invalid yield/)
+    -> { eval(code) }.should.raise(SyntaxError, /Invalid yield/)
   end
 end
diff --git a/spec/ruby/library/English/English_spec.rb b/spec/ruby/library/English/English_spec.rb
index 166785f0666..bdc3774608a 100644
--- a/spec/ruby/library/English/English_spec.rb
+++ b/spec/ruby/library/English/English_spec.rb
@@ -7,26 +7,26 @@
     begin
       raise "error"
     rescue
-      $ERROR_INFO.should_not be_nil
+      $ERROR_INFO.should_not == nil
       $ERROR_INFO.should == $!
     end
-    $ERROR_INFO.should be_nil
+    $ERROR_INFO.should == nil
   end
 
   it "aliases $ERROR_POSITION to $@" do
     begin
       raise "error"
     rescue
-      $ERROR_POSITION.should_not be_nil
+      $ERROR_POSITION.should_not == nil
       $ERROR_POSITION.should == $@
     end
-    $ERROR_POSITION.should be_nil
+    $ERROR_POSITION.should == nil
   end
 
   it "aliases $FS to $;" do
     original = $;
     suppress_warning {$; = ","}
-    $FS.should_not be_nil
+    $FS.should_not == nil
     $FS.should == $;
     suppress_warning {$; = original}
   end
@@ -34,7 +34,7 @@
   it "aliases $FIELD_SEPARATOR to $;" do
     original = $;
     suppress_warning {$; = ","}
-    $FIELD_SEPARATOR.should_not be_nil
+    $FIELD_SEPARATOR.should_not == nil
     $FIELD_SEPARATOR.should == $;
     suppress_warning {$; = original}
   end
@@ -42,7 +42,7 @@
   it "aliases $OFS to $," do
     original = $,
     suppress_warning {$, = "|"}
-    $OFS.should_not be_nil
+    $OFS.should_not == nil
     $OFS.should == $,
     suppress_warning {$, = original}
   end
@@ -50,25 +50,25 @@
   it "aliases $OUTPUT_FIELD_SEPARATOR to $," do
     original = $,
     suppress_warning {$, = "|"}
-    $OUTPUT_FIELD_SEPARATOR.should_not be_nil
+    $OUTPUT_FIELD_SEPARATOR.should_not == nil
     $OUTPUT_FIELD_SEPARATOR.should == $,
     suppress_warning {$, = original}
   end
 
   it "aliases $RS to $/" do
-    $RS.should_not be_nil
+    $RS.should_not == nil
     $RS.should == $/
   end
 
   it "aliases $INPUT_RECORD_SEPARATOR to $/" do
-    $INPUT_RECORD_SEPARATOR.should_not be_nil
+    $INPUT_RECORD_SEPARATOR.should_not == nil
     $INPUT_RECORD_SEPARATOR.should == $/
   end
 
   it "aliases $ORS to $\\" do
     original = $\
     suppress_warning {$\ = "\t"}
-    $ORS.should_not be_nil
+    $ORS.should_not == nil
     $ORS.should == $\
     suppress_warning {$\ = original}
   end
@@ -76,86 +76,86 @@
   it "aliases $OUTPUT_RECORD_SEPARATOR to $\\" do
     original = $\
     suppress_warning {$\ = "\t"}
-    $OUTPUT_RECORD_SEPARATOR.should_not be_nil
+    $OUTPUT_RECORD_SEPARATOR.should_not == nil
     $OUTPUT_RECORD_SEPARATOR.should == $\
     suppress_warning {$\ = original}
   end
 
   it "aliases $INPUT_LINE_NUMBER to $." do
-    $INPUT_LINE_NUMBER.should_not be_nil
+    $INPUT_LINE_NUMBER.should_not == nil
     $INPUT_LINE_NUMBER.should == $.
   end
 
   it "aliases $NR to $." do
-    $NR.should_not be_nil
+    $NR.should_not == nil
     $NR.should == $.
   end
 
   it "aliases $LAST_READ_LINE to $_ needs to be reviewed for spec completeness"
 
   it "aliases $DEFAULT_OUTPUT to $>" do
-    $DEFAULT_OUTPUT.should_not be_nil
+    $DEFAULT_OUTPUT.should_not == nil
     $DEFAULT_OUTPUT.should == $>
   end
 
   it "aliases $DEFAULT_INPUT to $<" do
-    $DEFAULT_INPUT.should_not be_nil
+    $DEFAULT_INPUT.should_not == nil
     $DEFAULT_INPUT.should == $<
   end
 
   it "aliases $PID to $$" do
-    $PID.should_not be_nil
+    $PID.should_not == nil
     $PID.should == $$
   end
 
   it "aliases $PID to $$" do
-    $PID.should_not be_nil
+    $PID.should_not == nil
     $PID.should == $$
   end
 
   it "aliases $PROCESS_ID to $$" do
-    $PROCESS_ID.should_not be_nil
+    $PROCESS_ID.should_not == nil
     $PROCESS_ID.should == $$
   end
 
   it "aliases $CHILD_STATUS to $?" do
     ruby_exe('exit 0')
-    $CHILD_STATUS.should_not be_nil
+    $CHILD_STATUS.should_not == nil
     $CHILD_STATUS.should == $?
   end
 
   it "aliases $LAST_MATCH_INFO to $~" do
     /c(a)t/ =~ "cat"
-    $LAST_MATCH_INFO.should_not be_nil
+    $LAST_MATCH_INFO.should_not == nil
     $LAST_MATCH_INFO.should == $~
   end
 
   it "aliases $ARGV to $*" do
-    $ARGV.should_not be_nil
+    $ARGV.should_not == nil
     $ARGV.should == $*
   end
 
   it "aliases $MATCH to $&" do
     /c(a)t/ =~ "cat"
-    $MATCH.should_not be_nil
+    $MATCH.should_not == nil
     $MATCH.should == $&
   end
 
   it "aliases $PREMATCH to $`" do
     /c(a)t/ =~ "cat"
-    $PREMATCH.should_not be_nil
+    $PREMATCH.should_not == nil
     $PREMATCH.should == $`
   end
 
   it "aliases $POSTMATCH to $'" do
     /c(a)t/ =~ "cat"
-    $POSTMATCH.should_not be_nil
+    $POSTMATCH.should_not == nil
     $POSTMATCH.should == $'
   end
 
   it "aliases $LAST_PAREN_MATCH to $+" do
     /c(a)t/ =~ "cat"
-    $LAST_PAREN_MATCH.should_not be_nil
+    $LAST_PAREN_MATCH.should_not == nil
     $LAST_PAREN_MATCH.should == $+
   end
 end
diff --git a/spec/ruby/library/English/alias_spec.rb b/spec/ruby/library/English/alias_spec.rb
index 78ccfb43989..3ff92f964d9 100644
--- a/spec/ruby/library/English/alias_spec.rb
+++ b/spec/ruby/library/English/alias_spec.rb
@@ -4,11 +4,11 @@
 describe "English" do
   it "aliases $! to $ERROR_INFO and $ERROR_INFO still returns an Exception with a backtrace" do
     exception = (1 / 0 rescue $ERROR_INFO)
-    exception.should be_kind_of(Exception)
-    exception.backtrace.should be_kind_of(Array)
+    exception.should.is_a?(Exception)
+    exception.backtrace.should.is_a?(Array)
   end
 
   it "aliases $@ to $ERROR_POSITION and $ERROR_POSITION still returns a backtrace" do
-    (1 / 0 rescue $ERROR_POSITION).should be_kind_of(Array)
+    (1 / 0 rescue $ERROR_POSITION).should.is_a?(Array)
   end
 end
diff --git a/spec/ruby/library/base64/strict_decode64_spec.rb b/spec/ruby/library/base64/strict_decode64_spec.rb
index d258223c827..7b52f0c9222 100644
--- a/spec/ruby/library/base64/strict_decode64_spec.rb
+++ b/spec/ruby/library/base64/strict_decode64_spec.rb
@@ -14,25 +14,25 @@
   it "raises ArgumentError when the given string contains CR" do
     -> do
       Base64.strict_decode64("U2VuZCByZWluZm9yY2VtZW50cw==\r")
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when the given string contains LF" do
     -> do
       Base64.strict_decode64("U2VuZCByZWluZm9yY2VtZW50cw==\n")
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when the given string has wrong padding" do
     -> do
       Base64.strict_decode64("=U2VuZCByZWluZm9yY2VtZW50cw==")
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when the given string contains an invalid character" do
     -> do
       Base64.strict_decode64("%3D")
-    end.should raise_error(ArgumentError)
+    end.should.raise(ArgumentError)
   end
 
   it "returns a binary encoded string" do
diff --git a/spec/ruby/library/bigdecimal/BigDecimal_spec.rb b/spec/ruby/library/bigdecimal/BigDecimal_spec.rb
index 8596356abdb..6adebabe842 100644
--- a/spec/ruby/library/bigdecimal/BigDecimal_spec.rb
+++ b/spec/ruby/library/bigdecimal/BigDecimal_spec.rb
@@ -10,7 +10,7 @@
 describe "Kernel#BigDecimal" do
 
   it "creates a new object of class BigDecimal" do
-    BigDecimal("3.14159").should be_kind_of(BigDecimal)
+    BigDecimal("3.14159").should.is_a?(BigDecimal)
     (0..9).each {|i|
       BigDecimal("1#{i}").should == 10 + i
       BigDecimal("-1#{i}").should == -10 - i
@@ -53,15 +53,15 @@
   end
 
   it "does not ignores trailing garbage" do
-    -> { BigDecimal("123E45ruby") }.should raise_error(ArgumentError)
-    -> { BigDecimal("123x45") }.should raise_error(ArgumentError)
-    -> { BigDecimal("123.4%E5") }.should raise_error(ArgumentError)
-    -> { BigDecimal("1E2E3E4E5E") }.should raise_error(ArgumentError)
+    -> { BigDecimal("123E45ruby") }.should.raise(ArgumentError)
+    -> { BigDecimal("123x45") }.should.raise(ArgumentError)
+    -> { BigDecimal("123.4%E5") }.should.raise(ArgumentError)
+    -> { BigDecimal("1E2E3E4E5E") }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError for invalid strings" do
-    -> { BigDecimal("ruby") }.should raise_error(ArgumentError)
-    -> { BigDecimal("  \t\n \r-\t\t\tInfinity   \n") }.should raise_error(ArgumentError)
+    -> { BigDecimal("ruby") }.should.raise(ArgumentError)
+    -> { BigDecimal("  \t\n \r-\t\t\tInfinity   \n") }.should.raise(ArgumentError)
   end
 
   it "allows omitting the integer part" do
@@ -72,8 +72,8 @@
     reference = BigDecimal("12345.67E89")
 
     BigDecimal("12_345.67E89").should == reference
-    -> { BigDecimal("1_2_3_4_5_._6____7_E89") }.should raise_error(ArgumentError)
-    -> { BigDecimal("12345_.67E_8__9_") }.should raise_error(ArgumentError)
+    -> { BigDecimal("1_2_3_4_5_._6____7_E89") }.should.raise(ArgumentError)
+    -> { BigDecimal("12345_.67E_8__9_") }.should.raise(ArgumentError)
   end
 
   it "accepts NaN and [+-]Infinity" do
@@ -91,13 +91,13 @@
 
   describe "with exception: false" do
     it "returns nil for invalid strings" do
-      BigDecimal("invalid", exception: false).should be_nil
-      BigDecimal("0invalid", exception: false).should be_nil
-      BigDecimal("invalid0", exception: false).should be_nil
+      BigDecimal("invalid", exception: false).should == nil
+      BigDecimal("0invalid", exception: false).should == nil
+      BigDecimal("invalid0", exception: false).should == nil
       if BigDecimal::VERSION >= "3.1.9"
         BigDecimal("0.", exception: false).to_i.should == 0
       else
-        BigDecimal("0.", exception: false).should be_nil
+        BigDecimal("0.", exception: false).should == nil
       end
     end
   end
diff --git a/spec/ruby/library/bigdecimal/add_spec.rb b/spec/ruby/library/bigdecimal/add_spec.rb
index 9cdab7d9108..a4237298f40 100644
--- a/spec/ruby/library/bigdecimal/add_spec.rb
+++ b/spec/ruby/library/bigdecimal/add_spec.rb
@@ -165,21 +165,21 @@
   it "raises TypeError when adds nil" do
     -> {
       @one.add(nil, 10)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
     -> {
       @one.add(nil, 0)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises TypeError when precision parameter is nil" do
     -> {
       @one.add(@one, nil)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises ArgumentError when precision parameter is negative" do
     -> {
       @one.add(@one, -10)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/ceil_spec.rb b/spec/ruby/library/bigdecimal/ceil_spec.rb
index 60e71b12fb1..3d94b8e578d 100644
--- a/spec/ruby/library/bigdecimal/ceil_spec.rb
+++ b/spec/ruby/library/bigdecimal/ceil_spec.rb
@@ -48,9 +48,9 @@
   end
 
   it "raise exception, if self is special value" do
-    -> { @infinity.ceil }.should raise_error(FloatDomainError)
-    -> { @infinity_neg.ceil }.should raise_error(FloatDomainError)
-    -> { @nan.ceil }.should raise_error(FloatDomainError)
+    -> { @infinity.ceil }.should.raise(FloatDomainError)
+    -> { @infinity_neg.ceil }.should.raise(FloatDomainError)
+    -> { @nan.ceil }.should.raise(FloatDomainError)
   end
 
   it "returns n digits right of the decimal point if given n > 0" do
diff --git a/spec/ruby/library/bigdecimal/constants_spec.rb b/spec/ruby/library/bigdecimal/constants_spec.rb
index 8d879c036ac..f2cc42dfc9e 100644
--- a/spec/ruby/library/bigdecimal/constants_spec.rb
+++ b/spec/ruby/library/bigdecimal/constants_spec.rb
@@ -3,17 +3,17 @@
 
 describe "BigDecimal constants" do
   it "defines a VERSION value" do
-    BigDecimal.const_defined?(:VERSION).should be_true
+    BigDecimal.const_defined?(:VERSION).should == true
   end
 
   it "has a BASE value" do
     # The actual one is decided based on HAVE_INT64_T in MRI,
     # which is hard to check here.
-    [10000, 1000000000].should include(BigDecimal::BASE)
+    [10000, 1000000000].should.include?(BigDecimal::BASE)
   end
 
   it "has a NaN value" do
-    BigDecimal::NAN.nan?.should be_true
+    BigDecimal::NAN.nan?.should == true
   end
 
   it "has an INFINITY value" do
diff --git a/spec/ruby/library/bigdecimal/core_spec.rb b/spec/ruby/library/bigdecimal/core_spec.rb
index 5097d708656..8f64fdf388d 100644
--- a/spec/ruby/library/bigdecimal/core_spec.rb
+++ b/spec/ruby/library/bigdecimal/core_spec.rb
@@ -25,7 +25,7 @@
       # log(BigDecimal(r, 1000), 50)
       result2 = BigDecimal('0.22314354220170971436137296411949880462556361100853e0')
       r = Rational(1_234_567_890, 987_654_321)
-      [result1, result2].should include(BigMath.log(r, 50).mult(1, 50))
+      [result1, result2].should.include?(BigMath.log(r, 50).mult(1, 50))
     end
   end
 
@@ -33,15 +33,15 @@
     it "returns the passed argument, self as Float, when given a Float" do
       result = Rational(3, 4).coerce(1.0)
       result.should == [1.0, 0.75]
-      result.first.is_a?(Float).should be_true
-      result.last.is_a?(Float).should be_true
+      result.first.is_a?(Float).should == true
+      result.last.is_a?(Float).should == true
     end
 
     it "returns the passed argument, self as Rational, when given an Integer" do
       result = Rational(3, 4).coerce(10)
       result.should == [Rational(10, 1), Rational(3, 4)]
-      result.first.is_a?(Rational).should be_true
-      result.last.is_a?(Rational).should be_true
+      result.first.is_a?(Rational).should == true
+      result.last.is_a?(Rational).should == true
     end
 
     it "coerces to Rational, when given a Complex" do
@@ -56,7 +56,7 @@
     it "raises an error when passed a BigDecimal" do
       -> {
         Rational(500, 3).coerce(BigDecimal('166.666666666'))
-      }.should raise_error(TypeError, /BigDecimal can't be coerced into Rational/)
+      }.should.raise(TypeError, /BigDecimal can't be coerced into Rational/)
     end
   end
 end
diff --git a/spec/ruby/library/bigdecimal/div_spec.rb b/spec/ruby/library/bigdecimal/div_spec.rb
index 53ad6d04184..967d8b5221e 100644
--- a/spec/ruby/library/bigdecimal/div_spec.rb
+++ b/spec/ruby/library/bigdecimal/div_spec.rb
@@ -51,9 +51,9 @@
   end
 
   it "raises FloatDomainError if NaN is involved" do
-    -> { @one.div(@nan) }.should raise_error(FloatDomainError)
-    -> { @nan.div(@one) }.should raise_error(FloatDomainError)
-    -> { @nan.div(@nan) }.should raise_error(FloatDomainError)
+    -> { @one.div(@nan) }.should.raise(FloatDomainError)
+    -> { @nan.div(@one) }.should.raise(FloatDomainError)
+    -> { @nan.div(@nan) }.should.raise(FloatDomainError)
   end
 
   it "returns 0 if divided by Infinity and no precision given" do
@@ -69,14 +69,14 @@
   end
 
   it "raises ZeroDivisionError if divided by zero and no precision given" do
-    -> { @one.div(@zero) }.should raise_error(ZeroDivisionError)
-    -> { @one.div(@zero_plus) }.should raise_error(ZeroDivisionError)
-    -> { @one.div(@zero_minus) }.should raise_error(ZeroDivisionError)
-
-    -> { @zero.div(@zero) }.should raise_error(ZeroDivisionError)
-    -> { @zero_minus.div(@zero_plus) }.should raise_error(ZeroDivisionError)
-    -> { @zero_minus.div(@zero_minus) }.should raise_error(ZeroDivisionError)
-    -> { @zero_plus.div(@zero_minus) }.should raise_error(ZeroDivisionError)
+    -> { @one.div(@zero) }.should.raise(ZeroDivisionError)
+    -> { @one.div(@zero_plus) }.should.raise(ZeroDivisionError)
+    -> { @one.div(@zero_minus) }.should.raise(ZeroDivisionError)
+
+    -> { @zero.div(@zero) }.should.raise(ZeroDivisionError)
+    -> { @zero_minus.div(@zero_plus) }.should.raise(ZeroDivisionError)
+    -> { @zero_minus.div(@zero_minus) }.should.raise(ZeroDivisionError)
+    -> { @zero_plus.div(@zero_minus) }.should.raise(ZeroDivisionError)
   end
 
   it "returns NaN if zero is divided by zero" do
@@ -90,9 +90,9 @@
   end
 
   it "raises FloatDomainError if (+|-) Infinity divided by 1 and no precision given" do
-    -> { @infinity_minus.div(@one) }.should raise_error(FloatDomainError)
-    -> { @infinity.div(@one) }.should raise_error(FloatDomainError)
-    -> { @infinity_minus.div(@one_minus) }.should raise_error(FloatDomainError)
+    -> { @infinity_minus.div(@one) }.should.raise(FloatDomainError)
+    -> { @infinity.div(@one) }.should.raise(FloatDomainError)
+    -> { @infinity_minus.div(@one_minus) }.should.raise(FloatDomainError)
   end
 
   it "returns (+|-)Infinity if (+|-)Infinity by 1 and precision given" do
diff --git a/spec/ruby/library/bigdecimal/divmod_spec.rb b/spec/ruby/library/bigdecimal/divmod_spec.rb
index 85c014bb8c0..d170c6f8456 100644
--- a/spec/ruby/library/bigdecimal/divmod_spec.rb
+++ b/spec/ruby/library/bigdecimal/divmod_spec.rb
@@ -40,9 +40,9 @@ class BigDecimal
   it "raises ZeroDivisionError if other is zero" do
     bd5667 = BigDecimal("5667.19")
     zero = BigDecimal("0")
-    -> { bd5667.mod_part_of_divmod(0) }.should raise_error(ZeroDivisionError)
-    -> { bd5667.mod_part_of_divmod(BigDecimal("0")) }.should raise_error(ZeroDivisionError)
-    -> { zero.mod_part_of_divmod(zero) }.should raise_error(ZeroDivisionError)
+    -> { bd5667.mod_part_of_divmod(0) }.should.raise(ZeroDivisionError)
+    -> { bd5667.mod_part_of_divmod(BigDecimal("0")) }.should.raise(ZeroDivisionError)
+    -> { zero.mod_part_of_divmod(zero) }.should.raise(ZeroDivisionError)
   end
 end
 
@@ -145,8 +145,8 @@ class BigDecimal
   version_is BigDecimal::VERSION, "4.0.0" do
     it "raise FloatDomainError error if NaN is involved" do
       (@special_vals + @regular_vals + @zeroes).each do |val|
-        -> { val.divmod(@nan) }.should raise_error(FloatDomainError)
-        -> { @nan.divmod(val) }.should raise_error(FloatDomainError)
+        -> { val.divmod(@nan) }.should.raise(FloatDomainError)
+        -> { @nan.divmod(val) }.should.raise(FloatDomainError)
       end
     end
   end
@@ -163,7 +163,7 @@ class BigDecimal
   it "raises ZeroDivisionError if the divisor is zero" do
     (@special_vals + @regular_vals + @zeroes - [@nan]).each do |val|
       @zeroes.each do |zero|
-        -> { val.divmod(zero) }.should raise_error(ZeroDivisionError)
+        -> { val.divmod(zero) }.should.raise(ZeroDivisionError)
       end
     end
   end
@@ -206,7 +206,7 @@ class BigDecimal
   it "raises TypeError if the argument cannot be coerced to BigDecimal" do
     -> {
       @one.divmod('1')
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
 end
diff --git a/spec/ruby/library/bigdecimal/fix_spec.rb b/spec/ruby/library/bigdecimal/fix_spec.rb
index 2c6276899ed..dceb2ce8677 100644
--- a/spec/ruby/library/bigdecimal/fix_spec.rb
+++ b/spec/ruby/library/bigdecimal/fix_spec.rb
@@ -51,7 +51,7 @@
   it "does not allow any arguments" do
     -> {
       @mixed.fix(10)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
 end
diff --git a/spec/ruby/library/bigdecimal/floor_spec.rb b/spec/ruby/library/bigdecimal/floor_spec.rb
index a7dfec2c9a1..c0666c668c1 100644
--- a/spec/ruby/library/bigdecimal/floor_spec.rb
+++ b/spec/ruby/library/bigdecimal/floor_spec.rb
@@ -41,9 +41,9 @@
   end
 
   it "raise exception, if self is special value" do
-    -> { @infinity.floor }.should raise_error(FloatDomainError)
-    -> { @infinity_neg.floor }.should raise_error(FloatDomainError)
-    -> { @nan.floor }.should raise_error(FloatDomainError)
+    -> { @infinity.floor }.should.raise(FloatDomainError)
+    -> { @infinity_neg.floor }.should.raise(FloatDomainError)
+    -> { @nan.floor }.should.raise(FloatDomainError)
   end
 
   it "returns n digits right of the decimal point if given n > 0" do
diff --git a/spec/ruby/library/bigdecimal/gt_spec.rb b/spec/ruby/library/bigdecimal/gt_spec.rb
index 78547fb85f1..e9c9a60e756 100644
--- a/spec/ruby/library/bigdecimal/gt_spec.rb
+++ b/spec/ruby/library/bigdecimal/gt_spec.rb
@@ -86,11 +86,11 @@ def >(other)
   end
 
   it "raises an ArgumentError if the argument can't be coerced into a BigDecimal" do
-    -> {@zero         > nil }.should raise_error(ArgumentError)
-    -> {@infinity     > nil }.should raise_error(ArgumentError)
-    -> {@infinity_neg > nil }.should raise_error(ArgumentError)
-    -> {@mixed        > nil }.should raise_error(ArgumentError)
-    -> {@pos_int      > nil }.should raise_error(ArgumentError)
-    -> {@neg_frac     > nil }.should raise_error(ArgumentError)
+    -> {@zero         > nil }.should.raise(ArgumentError)
+    -> {@infinity     > nil }.should.raise(ArgumentError)
+    -> {@infinity_neg > nil }.should.raise(ArgumentError)
+    -> {@mixed        > nil }.should.raise(ArgumentError)
+    -> {@pos_int      > nil }.should.raise(ArgumentError)
+    -> {@neg_frac     > nil }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/gte_spec.rb b/spec/ruby/library/bigdecimal/gte_spec.rb
index 2a5cc025ba3..548f3efe4c1 100644
--- a/spec/ruby/library/bigdecimal/gte_spec.rb
+++ b/spec/ruby/library/bigdecimal/gte_spec.rb
@@ -90,11 +90,11 @@ def >=(other)
   end
 
   it "returns nil if the argument is nil" do
-    -> {@zero         >= nil }.should raise_error(ArgumentError)
-    -> {@infinity     >= nil }.should raise_error(ArgumentError)
-    -> {@infinity_neg >= nil }.should raise_error(ArgumentError)
-    -> {@mixed        >= nil }.should raise_error(ArgumentError)
-    -> {@pos_int      >= nil }.should raise_error(ArgumentError)
-    -> {@neg_frac     >= nil }.should raise_error(ArgumentError)
+    -> {@zero         >= nil }.should.raise(ArgumentError)
+    -> {@infinity     >= nil }.should.raise(ArgumentError)
+    -> {@infinity_neg >= nil }.should.raise(ArgumentError)
+    -> {@mixed        >= nil }.should.raise(ArgumentError)
+    -> {@pos_int      >= nil }.should.raise(ArgumentError)
+    -> {@neg_frac     >= nil }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/lt_spec.rb b/spec/ruby/library/bigdecimal/lt_spec.rb
index 02390e76e33..c3f35732478 100644
--- a/spec/ruby/library/bigdecimal/lt_spec.rb
+++ b/spec/ruby/library/bigdecimal/lt_spec.rb
@@ -84,11 +84,11 @@ def <(other)
   end
 
   it "raises an ArgumentError if the argument can't be coerced into a BigDecimal" do
-    -> {@zero         < nil }.should raise_error(ArgumentError)
-    -> {@infinity     < nil }.should raise_error(ArgumentError)
-    -> {@infinity_neg < nil }.should raise_error(ArgumentError)
-    -> {@mixed        < nil }.should raise_error(ArgumentError)
-    -> {@pos_int      < nil }.should raise_error(ArgumentError)
-    -> {@neg_frac     < nil }.should raise_error(ArgumentError)
+    -> {@zero         < nil }.should.raise(ArgumentError)
+    -> {@infinity     < nil }.should.raise(ArgumentError)
+    -> {@infinity_neg < nil }.should.raise(ArgumentError)
+    -> {@mixed        < nil }.should.raise(ArgumentError)
+    -> {@pos_int      < nil }.should.raise(ArgumentError)
+    -> {@neg_frac     < nil }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/lte_spec.rb b/spec/ruby/library/bigdecimal/lte_spec.rb
index b92be04123f..7918bde88b6 100644
--- a/spec/ruby/library/bigdecimal/lte_spec.rb
+++ b/spec/ruby/library/bigdecimal/lte_spec.rb
@@ -90,11 +90,11 @@ def <=(other)
   end
 
   it "raises an ArgumentError if the argument can't be coerced into a BigDecimal" do
-    -> {@zero         <= nil }.should raise_error(ArgumentError)
-    -> {@infinity     <= nil }.should raise_error(ArgumentError)
-    -> {@infinity_neg <= nil }.should raise_error(ArgumentError)
-    -> {@mixed        <= nil }.should raise_error(ArgumentError)
-    -> {@pos_int      <= nil }.should raise_error(ArgumentError)
-    -> {@neg_frac     <= nil }.should raise_error(ArgumentError)
+    -> {@zero         <= nil }.should.raise(ArgumentError)
+    -> {@infinity     <= nil }.should.raise(ArgumentError)
+    -> {@infinity_neg <= nil }.should.raise(ArgumentError)
+    -> {@mixed        <= nil }.should.raise(ArgumentError)
+    -> {@pos_int      <= nil }.should.raise(ArgumentError)
+    -> {@neg_frac     <= nil }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/mode_spec.rb b/spec/ruby/library/bigdecimal/mode_spec.rb
index 73fa1a118ea..26e6d0ea752 100644
--- a/spec/ruby/library/bigdecimal/mode_spec.rb
+++ b/spec/ruby/library/bigdecimal/mode_spec.rb
@@ -24,13 +24,13 @@
 
   it "raise an exception if the flag is true" do
     BigDecimal.mode(BigDecimal::EXCEPTION_NaN, true)
-    -> { BigDecimal("NaN").add(BigDecimal("1"),0) }.should raise_error(FloatDomainError)
+    -> { BigDecimal("NaN").add(BigDecimal("1"),0) }.should.raise(FloatDomainError)
     BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, true)
-    -> { BigDecimal("0").add(BigDecimal("Infinity"),0) }.should raise_error(FloatDomainError)
+    -> { BigDecimal("0").add(BigDecimal("Infinity"),0) }.should.raise(FloatDomainError)
     BigDecimal.mode(BigDecimal::EXCEPTION_ZERODIVIDE, true)
-    -> { BigDecimal("1").quo(BigDecimal("0")) }.should raise_error(FloatDomainError)
+    -> { BigDecimal("1").quo(BigDecimal("0")) }.should.raise(FloatDomainError)
     BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, true)
-    -> { BigDecimal("1E11111111111111111111") }.should raise_error(FloatDomainError)
-    -> { (BigDecimal("1E1000000000000000000")**10) }.should raise_error(FloatDomainError)
+    -> { BigDecimal("1E11111111111111111111") }.should.raise(FloatDomainError)
+    -> { (BigDecimal("1E1000000000000000000")**10) }.should.raise(FloatDomainError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/nonzero_spec.rb b/spec/ruby/library/bigdecimal/nonzero_spec.rb
index f43c4393cd3..31421ebdf43 100644
--- a/spec/ruby/library/bigdecimal/nonzero_spec.rb
+++ b/spec/ruby/library/bigdecimal/nonzero_spec.rb
@@ -10,11 +10,11 @@
     infinity = BigDecimal("Infinity")
     infinity_minus = BigDecimal("-Infinity")
     nan = BigDecimal("NaN")
-    infinity.nonzero?.should equal(infinity)
-    infinity_minus.nonzero?.should equal(infinity_minus)
-    nan.nonzero?.should equal(nan)
-    e3_minus.nonzero?.should equal(e3_minus)
-    e2_plus.nonzero?.should equal(e2_plus)
+    infinity.nonzero?.should.equal?(infinity)
+    infinity_minus.nonzero?.should.equal?(infinity_minus)
+    nan.nonzero?.should.equal?(nan)
+    e3_minus.nonzero?.should.equal?(e3_minus)
+    e2_plus.nonzero?.should.equal?(e2_plus)
   end
 
   it "returns nil otherwise" do
diff --git a/spec/ruby/library/bigdecimal/remainder_spec.rb b/spec/ruby/library/bigdecimal/remainder_spec.rb
index b31967e76bd..27a2986570e 100644
--- a/spec/ruby/library/bigdecimal/remainder_spec.rb
+++ b/spec/ruby/library/bigdecimal/remainder_spec.rb
@@ -39,8 +39,8 @@
 
   version_is BigDecimal::VERSION, "3.3.0" do
     it "raises ZeroDivisionError used with zero" do
-      -> { @mixed.remainder(@zero) }.should raise_error(ZeroDivisionError)
-      -> { @zero.remainder(@zero) }.should raise_error(ZeroDivisionError)
+      -> { @mixed.remainder(@zero) }.should.raise(ZeroDivisionError)
+      -> { @zero.remainder(@zero) }.should.raise(ZeroDivisionError)
     end
   end
 
@@ -71,7 +71,7 @@
   it "raises TypeError if the argument cannot be coerced to BigDecimal" do
     -> {
       @one.remainder('2')
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
 end
diff --git a/spec/ruby/library/bigdecimal/round_spec.rb b/spec/ruby/library/bigdecimal/round_spec.rb
index 6a4d220417c..622e129d932 100644
--- a/spec/ruby/library/bigdecimal/round_spec.rb
+++ b/spec/ruby/library/bigdecimal/round_spec.rb
@@ -217,18 +217,18 @@
   end
 
   it 'raise exception, if self is special value' do
-    -> { BigDecimal('NaN').round }.should raise_error(FloatDomainError)
-    -> { BigDecimal('Infinity').round }.should raise_error(FloatDomainError)
-    -> { BigDecimal('-Infinity').round }.should raise_error(FloatDomainError)
+    -> { BigDecimal('NaN').round }.should.raise(FloatDomainError)
+    -> { BigDecimal('Infinity').round }.should.raise(FloatDomainError)
+    -> { BigDecimal('-Infinity').round }.should.raise(FloatDomainError)
   end
 
   it 'do not raise exception, if self is special value and precision is given' do
-    -> { BigDecimal('NaN').round(2) }.should_not raise_error(FloatDomainError)
-    -> { BigDecimal('Infinity').round(2) }.should_not raise_error(FloatDomainError)
-    -> { BigDecimal('-Infinity').round(2) }.should_not raise_error(FloatDomainError)
+    -> { BigDecimal('NaN').round(2) }.should_not.raise(FloatDomainError)
+    -> { BigDecimal('Infinity').round(2) }.should_not.raise(FloatDomainError)
+    -> { BigDecimal('-Infinity').round(2) }.should_not.raise(FloatDomainError)
   end
 
   it 'raise for a non-existent round mode' do
-    -> { @p1_50.round(0, :nonsense) }.should raise_error(ArgumentError, "invalid rounding mode (nonsense)")
+    -> { @p1_50.round(0, :nonsense) }.should.raise(ArgumentError, "invalid rounding mode (nonsense)")
   end
 end
diff --git a/spec/ruby/library/bigdecimal/shared/clone.rb b/spec/ruby/library/bigdecimal/shared/clone.rb
index 935ef76e7e3..03de6d0fc3a 100644
--- a/spec/ruby/library/bigdecimal/shared/clone.rb
+++ b/spec/ruby/library/bigdecimal/shared/clone.rb
@@ -8,6 +8,6 @@
   it "returns self" do
     copy = @obj.public_send(@method)
 
-    copy.should equal(@obj)
+    copy.should.equal?(@obj)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/shared/modulo.rb b/spec/ruby/library/bigdecimal/shared/modulo.rb
index eeb030fd23c..63470d0977e 100644
--- a/spec/ruby/library/bigdecimal/shared/modulo.rb
+++ b/spec/ruby/library/bigdecimal/shared/modulo.rb
@@ -116,7 +116,7 @@
   it "raises TypeError if the argument cannot be coerced to BigDecimal" do
     -> {
       @one.send(@method, '2')
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 end
 
@@ -124,8 +124,8 @@
   it "raises ZeroDivisionError if other is zero" do
     bd5667 = BigDecimal("5667.19")
 
-    -> { bd5667.send(@method, 0) }.should raise_error(ZeroDivisionError)
-    -> { bd5667.send(@method, BigDecimal("0")) }.should raise_error(ZeroDivisionError)
-    -> { @zero.send(@method, @zero) }.should raise_error(ZeroDivisionError)
+    -> { bd5667.send(@method, 0) }.should.raise(ZeroDivisionError)
+    -> { bd5667.send(@method, BigDecimal("0")) }.should.raise(ZeroDivisionError)
+    -> { @zero.send(@method, @zero) }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/shared/to_int.rb b/spec/ruby/library/bigdecimal/shared/to_int.rb
index 44b6a3c7b28..3c9f3b4f97a 100644
--- a/spec/ruby/library/bigdecimal/shared/to_int.rb
+++ b/spec/ruby/library/bigdecimal/shared/to_int.rb
@@ -2,8 +2,8 @@
 
 describe :bigdecimal_to_int, shared: true do
   it "raises FloatDomainError if BigDecimal is infinity or NaN" do
-    -> { BigDecimal("Infinity").send(@method) }.should raise_error(FloatDomainError)
-    -> { BigDecimal("NaN").send(@method) }.should raise_error(FloatDomainError)
+    -> { BigDecimal("Infinity").send(@method) }.should.raise(FloatDomainError)
+    -> { BigDecimal("NaN").send(@method) }.should.raise(FloatDomainError)
   end
 
   it "returns Integer otherwise" do
diff --git a/spec/ruby/library/bigdecimal/sqrt_spec.rb b/spec/ruby/library/bigdecimal/sqrt_spec.rb
index 42cf4545cb3..1f3ef9a8c35 100644
--- a/spec/ruby/library/bigdecimal/sqrt_spec.rb
+++ b/spec/ruby/library/bigdecimal/sqrt_spec.rb
@@ -45,37 +45,37 @@
   it "raises ArgumentError when no argument is given" do
     -> {
       @one.sqrt
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if a negative number is given" do
     -> {
       @one.sqrt(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError if 2 arguments are given" do
     -> {
       @one.sqrt(1, 1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises TypeError if nil is given" do
     -> {
       @one.sqrt(nil)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises TypeError if a string is given" do
     -> {
       @one.sqrt("stuff")
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises TypeError if a plain Object is given" do
     -> {
       @one.sqrt(Object.new)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "returns 1 if precision is 0 or 1" do
@@ -86,7 +86,7 @@
   it "raises FloatDomainError on negative values" do
     -> {
       BigDecimal('-1').sqrt(10)
-    }.should raise_error(FloatDomainError)
+    }.should.raise(FloatDomainError)
   end
 
   it "returns positive infinity for infinity" do
@@ -96,13 +96,13 @@
   it "raises FloatDomainError for negative infinity" do
     -> {
       @infinity_minus.sqrt(1)
-    }.should raise_error(FloatDomainError)
+    }.should.raise(FloatDomainError)
   end
 
   it "raises FloatDomainError for NaN" do
     -> {
       @nan.sqrt(1)
-    }.should raise_error(FloatDomainError)
+    }.should.raise(FloatDomainError)
   end
 
   it "returns 0 for 0, +0.0 and -0.0" do
diff --git a/spec/ruby/library/bigdecimal/to_f_spec.rb b/spec/ruby/library/bigdecimal/to_f_spec.rb
index 84d4d49de23..f5220d995a9 100644
--- a/spec/ruby/library/bigdecimal/to_f_spec.rb
+++ b/spec/ruby/library/bigdecimal/to_f_spec.rb
@@ -20,9 +20,9 @@
   end
 
   it "returns number of type float" do
-    BigDecimal("3.14159").to_f.should be_kind_of(Float)
-    @vals.each { |val| val.to_f.should be_kind_of(Float) }
-    @spec_vals.each { |val| val.to_f.should be_kind_of(Float) }
+    BigDecimal("3.14159").to_f.should.is_a?(Float)
+    @vals.each { |val| val.to_f.should.is_a?(Float) }
+    @spec_vals.each { |val| val.to_f.should.is_a?(Float) }
   end
 
   it "rounds correctly to Float precision" do
diff --git a/spec/ruby/library/bigdecimal/to_r_spec.rb b/spec/ruby/library/bigdecimal/to_r_spec.rb
index c350beff08c..a112c002ef8 100644
--- a/spec/ruby/library/bigdecimal/to_r_spec.rb
+++ b/spec/ruby/library/bigdecimal/to_r_spec.rb
@@ -4,25 +4,25 @@
 describe "BigDecimal#to_r" do
 
   it "returns a Rational" do
-    BigDecimal("3.14159").to_r.should be_kind_of(Rational)
+    BigDecimal("3.14159").to_r.should.is_a?(Rational)
   end
 
   it "returns a Rational with bignum values" do
     r = BigDecimal("3.141592653589793238462643").to_r
-    r.numerator.should eql(3141592653589793238462643)
-    r.denominator.should eql(1000000000000000000000000)
+    r.numerator.should.eql?(3141592653589793238462643)
+    r.denominator.should.eql?(1000000000000000000000000)
   end
 
   it "returns a Rational from a BigDecimal with an exponent" do
     r = BigDecimal("1E2").to_r
-    r.numerator.should eql(100)
-    r.denominator.should eql(1)
+    r.numerator.should.eql?(100)
+    r.denominator.should.eql?(1)
   end
 
   it "returns a Rational from a negative BigDecimal with an exponent" do
     r = BigDecimal("-1E2").to_r
-    r.numerator.should eql(-100)
-    r.denominator.should eql(1)
+    r.numerator.should.eql?(-100)
+    r.denominator.should.eql?(1)
   end
 
 end
diff --git a/spec/ruby/library/bigdecimal/to_s_spec.rb b/spec/ruby/library/bigdecimal/to_s_spec.rb
index 025057b4d7e..5ec54765b5b 100644
--- a/spec/ruby/library/bigdecimal/to_s_spec.rb
+++ b/spec/ruby/library/bigdecimal/to_s_spec.rb
@@ -31,7 +31,7 @@
   end
 
   it "takes an optional argument" do
-    -> {@bigdec.to_s("F")}.should_not raise_error()
+    -> {@bigdec.to_s("F")}.should_not.raise()
   end
 
   it "starts with + if + is supplied and value is positive" do
@@ -88,11 +88,11 @@
 
   it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do
     Encoding.default_internal = nil
-    BigDecimal('1.23').to_s.encoding.should equal(Encoding::US_ASCII)
+    BigDecimal('1.23').to_s.encoding.should.equal?(Encoding::US_ASCII)
   end
 
   it "returns a String in US-ASCII encoding when Encoding.default_internal is not nil" do
     Encoding.default_internal = Encoding::IBM437
-    BigDecimal('1.23').to_s.encoding.should equal(Encoding::US_ASCII)
+    BigDecimal('1.23').to_s.encoding.should.equal?(Encoding::US_ASCII)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/truncate_spec.rb b/spec/ruby/library/bigdecimal/truncate_spec.rb
index 0ae0421b30f..cedc662aebc 100644
--- a/spec/ruby/library/bigdecimal/truncate_spec.rb
+++ b/spec/ruby/library/bigdecimal/truncate_spec.rb
@@ -74,8 +74,8 @@
   end
 
   it "returns the same value if self is special value" do
-    -> { @nan.truncate }.should raise_error(FloatDomainError)
-    -> { @infinity.truncate }.should raise_error(FloatDomainError)
-    -> { @infinity_negative.truncate }.should raise_error(FloatDomainError)
+    -> { @nan.truncate }.should.raise(FloatDomainError)
+    -> { @infinity.truncate }.should.raise(FloatDomainError)
+    -> { @infinity_negative.truncate }.should.raise(FloatDomainError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/util_spec.rb b/spec/ruby/library/bigdecimal/util_spec.rb
index fc67fcf200b..69663d4bd2a 100644
--- a/spec/ruby/library/bigdecimal/util_spec.rb
+++ b/spec/ruby/library/bigdecimal/util_spec.rb
@@ -20,7 +20,7 @@
 
     it "should define #to_d on BigDecimal" do
       bd = BigDecimal("3.14")
-      bd.to_d.should equal(bd)
+      bd.to_d.should.equal?(bd)
     end
 
     it "should define #to_d on Rational" do
diff --git a/spec/ruby/library/cgi/cookie/domain_spec.rb b/spec/ruby/library/cgi/cookie/domain_spec.rb
index 0ed56d6d614..c118ef6383b 100644
--- a/spec/ruby/library/cgi/cookie/domain_spec.rb
+++ b/spec/ruby/library/cgi/cookie/domain_spec.rb
@@ -6,7 +6,7 @@
   describe "CGI::Cookie#domain" do
     it "returns self's domain" do
       cookie = CGI::Cookie.new("test-cookie")
-      cookie.domain.should be_nil
+      cookie.domain.should == nil
 
       cookie = CGI::Cookie.new("name" => "test-cookie", "domain" => "example.com")
       cookie.domain.should == "example.com"
diff --git a/spec/ruby/library/cgi/cookie/expires_spec.rb b/spec/ruby/library/cgi/cookie/expires_spec.rb
index c5b2c4faf95..b9cc7d5b654 100644
--- a/spec/ruby/library/cgi/cookie/expires_spec.rb
+++ b/spec/ruby/library/cgi/cookie/expires_spec.rb
@@ -6,7 +6,7 @@
   describe "CGI::Cookie#expires" do
     it "returns self's expiration date" do
       cookie = CGI::Cookie.new("test-cookie")
-      cookie.expires.should be_nil
+      cookie.expires.should == nil
 
       cookie = CGI::Cookie.new("name" => "test-cookie", "expires" => Time.at(1196524602))
       cookie.expires.should == Time.at(1196524602)
diff --git a/spec/ruby/library/cgi/cookie/initialize_spec.rb b/spec/ruby/library/cgi/cookie/initialize_spec.rb
index 248f35e78b5..80bc2c21964 100644
--- a/spec/ruby/library/cgi/cookie/initialize_spec.rb
+++ b/spec/ruby/library/cgi/cookie/initialize_spec.rb
@@ -20,7 +20,7 @@
 
     it "sets self to a non-secure cookie" do
       @cookie.send(:initialize, "test")
-      @cookie.secure.should be_false
+      @cookie.secure.should == false
     end
 
     it "does set self's path to an empty String when ENV[\"SCRIPT_NAME\"] is not set" do
@@ -49,11 +49,11 @@
     end
 
     it "does not set self's expiration date" do
-      @cookie.expires.should be_nil
+      @cookie.expires.should == nil
     end
 
     it "does not set self's domain" do
-      @cookie.domain.should be_nil
+      @cookie.domain.should == nil
     end
   end
 
@@ -76,7 +76,7 @@
       @cookie.path.should == "some/path/"
       @cookie.domain.should == "example.com"
       @cookie.expires.should == Time.at(1196524602)
-      @cookie.secure.should be_true
+      @cookie.secure.should == true
     end
 
     it "does set self's path based on ENV[\"SCRIPT_NAME\"] when the Hash has no 'path' entry" do
@@ -122,8 +122,8 @@
     end
 
     it "raises a ArgumentError when the passed Hash has no 'name' entry" do
-      -> { @cookie.send(:initialize, {}) }.should raise_error(ArgumentError)
-      -> { @cookie.send(:initialize, "value" => "test") }.should raise_error(ArgumentError)
+      -> { @cookie.send(:initialize, {}) }.should.raise(ArgumentError)
+      -> { @cookie.send(:initialize, "value" => "test") }.should.raise(ArgumentError)
     end
   end
 
@@ -144,7 +144,7 @@
 
     it "sets self to a non-secure cookie" do
       @cookie.send(:initialize, "test", "one", "two", "three")
-      @cookie.secure.should be_false
+      @cookie.secure.should == false
     end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/secure_spec.rb b/spec/ruby/library/cgi/cookie/secure_spec.rb
index cb38c8c2e0c..233881b173e 100644
--- a/spec/ruby/library/cgi/cookie/secure_spec.rb
+++ b/spec/ruby/library/cgi/cookie/secure_spec.rb
@@ -10,10 +10,10 @@
 
     it "returns whether self is a secure cookie or not" do
       @cookie.secure = true
-      @cookie.secure.should be_true
+      @cookie.secure.should == true
 
       @cookie.secure = false
-      @cookie.secure.should be_false
+      @cookie.secure.should == false
     end
   end
 
@@ -23,12 +23,12 @@
     end
 
     it "returns true" do
-      (@cookie.secure = true).should be_true
+      (@cookie.secure = true).should == true
     end
 
     it "sets self to a secure cookie" do
       @cookie.secure = true
-      @cookie.secure.should be_true
+      @cookie.secure.should == true
     end
   end
 
@@ -38,12 +38,12 @@
     end
 
     it "returns false" do
-      (@cookie.secure = false).should be_false
+      (@cookie.secure = false).should == false
     end
 
     it "sets self to a non-secure cookie" do
       @cookie.secure = false
-      @cookie.secure.should be_false
+      @cookie.secure.should == false
     end
   end
 
@@ -56,18 +56,18 @@
       @cookie.secure = false
 
       @cookie.secure = Object.new
-      @cookie.secure.should be_false
+      @cookie.secure.should == false
 
       @cookie.secure = "Test"
-      @cookie.secure.should be_false
+      @cookie.secure.should == false
 
       @cookie.secure = true
 
       @cookie.secure = Object.new
-      @cookie.secure.should be_true
+      @cookie.secure.should == true
 
       @cookie.secure = "Test"
-      @cookie.secure.should be_true
+      @cookie.secure.should == true
     end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/value_spec.rb b/spec/ruby/library/cgi/cookie/value_spec.rb
index 672653d7f41..45032edcbf9 100644
--- a/spec/ruby/library/cgi/cookie/value_spec.rb
+++ b/spec/ruby/library/cgi/cookie/value_spec.rb
@@ -37,7 +37,7 @@
         cookie2.value.send(method, *args)
         fail << method unless cookie1.value == cookie2.value
       end
-      fail.should be_empty
+      fail.should.empty?
     end
   end
 
diff --git a/spec/ruby/library/cgi/escapeURIComponent_spec.rb b/spec/ruby/library/cgi/escapeURIComponent_spec.rb
index 1cea2b786a6..98efa2e67e1 100644
--- a/spec/ruby/library/cgi/escapeURIComponent_spec.rb
+++ b/spec/ruby/library/cgi/escapeURIComponent_spec.rb
@@ -64,7 +64,7 @@
   it "raises a TypeError with nil" do
     -> {
       CGI.escapeURIComponent(nil)
-    }.should raise_error(TypeError, "no implicit conversion of nil into String")
+    }.should.raise(TypeError, "no implicit conversion of nil into String")
   end
 
   it "uses implicit type conversion to String" do
diff --git a/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb b/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb
index ee1c45b84e2..4b56a7abfe3 100644
--- a/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb
@@ -11,7 +11,7 @@
     end
 
     describe "when passed no arguments" do
-      it "returns a 'form'-element with it's enctype set to multipart" do
+      it "returns a 'form'-element with its enctype set to multipart" do
         output = @html.multipart_form
         output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post" }, "")
       end
diff --git a/spec/ruby/library/cgi/initialize_spec.rb b/spec/ruby/library/cgi/initialize_spec.rb
index b8ecf5cac2b..6135522c54f 100644
--- a/spec/ruby/library/cgi/initialize_spec.rb
+++ b/spec/ruby/library/cgi/initialize_spec.rb
@@ -5,7 +5,7 @@
 
   describe "CGI#initialize" do
     it "is private" do
-      CGI.should have_private_instance_method(:initialize)
+      CGI.private_instance_methods(false).should.include?(:initialize)
     end
   end
 
@@ -21,21 +21,21 @@
 
     it "extends self with CGI::QueryExtension" do
       @cgi.send(:initialize)
-      @cgi.should be_kind_of(CGI::QueryExtension)
+      @cgi.should.is_a?(CGI::QueryExtension)
     end
 
     it "does not extend self with CGI::HtmlExtension" do
       @cgi.send(:initialize)
-      @cgi.should_not be_kind_of(CGI::HtmlExtension)
+      @cgi.should_not.is_a?(CGI::HtmlExtension)
     end
 
     it "does not extend self with any of the other HTML modules" do
       @cgi.send(:initialize)
-      @cgi.should_not be_kind_of(CGI::HtmlExtension)
-      @cgi.should_not be_kind_of(CGI::Html3)
-      @cgi.should_not be_kind_of(CGI::Html4)
-      @cgi.should_not be_kind_of(CGI::Html4Tr)
-      @cgi.should_not be_kind_of(CGI::Html4Fr)
+      @cgi.should_not.is_a?(CGI::HtmlExtension)
+      @cgi.should_not.is_a?(CGI::Html3)
+      @cgi.should_not.is_a?(CGI::Html4)
+      @cgi.should_not.is_a?(CGI::Html4Tr)
+      @cgi.should_not.is_a?(CGI::Html4Fr)
     end
 
     it "sets #cookies based on ENV['HTTP_COOKIE']" do
@@ -86,51 +86,51 @@
 
     it "extends self with CGI::QueryExtension" do
       @cgi.send(:initialize, "test")
-      @cgi.should be_kind_of(CGI::QueryExtension)
+      @cgi.should.is_a?(CGI::QueryExtension)
     end
 
     it "extends self with CGI::QueryExtension, CGI::Html3 and CGI::HtmlExtension when the passed type is 'html3'" do
       @cgi.send(:initialize, "html3")
-      @cgi.should be_kind_of(CGI::Html3)
-      @cgi.should be_kind_of(CGI::HtmlExtension)
-      @cgi.should be_kind_of(CGI::QueryExtension)
+      @cgi.should.is_a?(CGI::Html3)
+      @cgi.should.is_a?(CGI::HtmlExtension)
+      @cgi.should.is_a?(CGI::QueryExtension)
 
-      @cgi.should_not be_kind_of(CGI::Html4)
-      @cgi.should_not be_kind_of(CGI::Html4Tr)
-      @cgi.should_not be_kind_of(CGI::Html4Fr)
+      @cgi.should_not.is_a?(CGI::Html4)
+      @cgi.should_not.is_a?(CGI::Html4Tr)
+      @cgi.should_not.is_a?(CGI::Html4Fr)
     end
 
     it "extends self with CGI::QueryExtension, CGI::Html4 and CGI::HtmlExtension when the passed type is 'html4'" do
       @cgi.send(:initialize, "html4")
-      @cgi.should be_kind_of(CGI::Html4)
-      @cgi.should be_kind_of(CGI::HtmlExtension)
-      @cgi.should be_kind_of(CGI::QueryExtension)
+      @cgi.should.is_a?(CGI::Html4)
+      @cgi.should.is_a?(CGI::HtmlExtension)
+      @cgi.should.is_a?(CGI::QueryExtension)
 
-      @cgi.should_not be_kind_of(CGI::Html3)
-      @cgi.should_not be_kind_of(CGI::Html4Tr)
-      @cgi.should_not be_kind_of(CGI::Html4Fr)
+      @cgi.should_not.is_a?(CGI::Html3)
+      @cgi.should_not.is_a?(CGI::Html4Tr)
+      @cgi.should_not.is_a?(CGI::Html4Fr)
     end
 
     it "extends self with CGI::QueryExtension, CGI::Html4Tr and CGI::HtmlExtension when the passed type is 'html4Tr'" do
       @cgi.send(:initialize, "html4Tr")
-      @cgi.should be_kind_of(CGI::Html4Tr)
-      @cgi.should be_kind_of(CGI::HtmlExtension)
-      @cgi.should be_kind_of(CGI::QueryExtension)
+      @cgi.should.is_a?(CGI::Html4Tr)
+      @cgi.should.is_a?(CGI::HtmlExtension)
+      @cgi.should.is_a?(CGI::QueryExtension)
 
-      @cgi.should_not be_kind_of(CGI::Html3)
-      @cgi.should_not be_kind_of(CGI::Html4)
-      @cgi.should_not be_kind_of(CGI::Html4Fr)
+      @cgi.should_not.is_a?(CGI::Html3)
+      @cgi.should_not.is_a?(CGI::Html4)
+      @cgi.should_not.is_a?(CGI::Html4Fr)
     end
 
     it "extends self with CGI::QueryExtension, CGI::Html4Tr, CGI::Html4Fr and CGI::HtmlExtension when the passed type is 'html4Fr'" do
       @cgi.send(:initialize, "html4Fr")
-      @cgi.should be_kind_of(CGI::Html4Tr)
-      @cgi.should be_kind_of(CGI::Html4Fr)
-      @cgi.should be_kind_of(CGI::HtmlExtension)
-      @cgi.should be_kind_of(CGI::QueryExtension)
+      @cgi.should.is_a?(CGI::Html4Tr)
+      @cgi.should.is_a?(CGI::Html4Fr)
+      @cgi.should.is_a?(CGI::HtmlExtension)
+      @cgi.should.is_a?(CGI::QueryExtension)
 
-      @cgi.should_not be_kind_of(CGI::Html3)
-      @cgi.should_not be_kind_of(CGI::Html4)
+      @cgi.should_not.is_a?(CGI::Html3)
+      @cgi.should_not.is_a?(CGI::Html4)
     end
   end
 end
diff --git a/spec/ruby/library/cgi/out_spec.rb b/spec/ruby/library/cgi/out_spec.rb
index 733e656ea1f..e9eaf5e1511 100644
--- a/spec/ruby/library/cgi/out_spec.rb
+++ b/spec/ruby/library/cgi/out_spec.rb
@@ -48,7 +48,7 @@
     end
 
     it "raises a LocalJumpError" do
-      -> { @cgi.out }.should raise_error(LocalJumpError)
+      -> { @cgi.out }.should.raise(LocalJumpError)
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/content_length_spec.rb b/spec/ruby/library/cgi/queryextension/content_length_spec.rb
index a8b87e148c9..bd02f3d8da3 100644
--- a/spec/ruby/library/cgi/queryextension/content_length_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/content_length_spec.rb
@@ -17,10 +17,10 @@
       old_value = ENV['CONTENT_LENGTH']
       begin
         ENV['CONTENT_LENGTH'] = nil
-        @cgi.content_length.should be_nil
+        @cgi.content_length.should == nil
 
         ENV['CONTENT_LENGTH'] = "100"
-        @cgi.content_length.should eql(100)
+        @cgi.content_length.should.eql?(100)
       ensure
         ENV['CONTENT_LENGTH'] = old_value
       end
diff --git a/spec/ruby/library/cgi/queryextension/element_reference_spec.rb b/spec/ruby/library/cgi/queryextension/element_reference_spec.rb
index 0b57387efc7..c835f385f05 100644
--- a/spec/ruby/library/cgi/queryextension/element_reference_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/element_reference_spec.rb
@@ -24,7 +24,7 @@
     end
 
     it "returns a String" do
-      @cgi["one"].should be_kind_of(String)
+      @cgi["one"].should.is_a?(String)
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/multipart_spec.rb b/spec/ruby/library/cgi/queryextension/multipart_spec.rb
index 281791892c3..1fa771ca1cf 100644
--- a/spec/ruby/library/cgi/queryextension/multipart_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/multipart_spec.rb
@@ -37,7 +37,7 @@
     end
 
     it "returns true if the current Request is a multipart request" do
-      @cgi.multipart?.should be_true
+      @cgi.multipart?.should == true
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/server_port_spec.rb b/spec/ruby/library/cgi/queryextension/server_port_spec.rb
index 60c03ea6392..1c88d3225d8 100644
--- a/spec/ruby/library/cgi/queryextension/server_port_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/server_port_spec.rb
@@ -17,10 +17,10 @@
       old_value = ENV['SERVER_PORT']
       begin
         ENV['SERVER_PORT'] = nil
-        @cgi.server_port.should be_nil
+        @cgi.server_port.should == nil
 
         ENV['SERVER_PORT'] = "3000"
-        @cgi.server_port.should eql(3000)
+        @cgi.server_port.should.eql?(3000)
       ensure
         ENV['SERVER_PORT'] = old_value
       end
diff --git a/spec/ruby/library/cgi/queryextension/shared/has_key.rb b/spec/ruby/library/cgi/queryextension/shared/has_key.rb
index cfac5865fa8..6231cb548e1 100644
--- a/spec/ruby/library/cgi/queryextension/shared/has_key.rb
+++ b/spec/ruby/library/cgi/queryextension/shared/has_key.rb
@@ -12,8 +12,8 @@
   end
 
   it "returns true when the passed key exists in the HTTP Query" do
-    @cgi.send(@method, "one").should be_true
-    @cgi.send(@method, "two").should be_true
-    @cgi.send(@method, "three").should be_false
+    @cgi.send(@method, "one").should == true
+    @cgi.send(@method, "two").should == true
+    @cgi.send(@method, "three").should == false
   end
 end
diff --git a/spec/ruby/library/cgi/shared/http_header.rb b/spec/ruby/library/cgi/shared/http_header.rb
index b225b5925ea..e739fed538a 100644
--- a/spec/ruby/library/cgi/shared/http_header.rb
+++ b/spec/ruby/library/cgi/shared/http_header.rb
@@ -63,11 +63,11 @@
       header.should == "Content-Type: text/plain; charset=UTF-8\r\n\r\n"
 
       header = @cgi.send(@method, "nph" => true)
-      header.should include("HTTP/1.0 200 OK\r\n")
-      header.should include("Date: ")
-      header.should include("Server: ")
-      header.should include("Connection: close\r\n")
-      header.should include("Content-Type: text/html\r\n")
+      header.should.include?("HTTP/1.0 200 OK\r\n")
+      header.should.include?("Date: ")
+      header.should.include?("Server: ")
+      header.should.include?("Connection: close\r\n")
+      header.should.include?("Content-Type: text/html\r\n")
 
       header = @cgi.send(@method, "status" => "OK")
       header.should == "Status: 200 OK\r\nContent-Type: text/html\r\n\r\n"
diff --git a/spec/ruby/library/cgi/unescapeURIComponent_spec.rb b/spec/ruby/library/cgi/unescapeURIComponent_spec.rb
index f80eb1626b4..e0bf4b70e03 100644
--- a/spec/ruby/library/cgi/unescapeURIComponent_spec.rb
+++ b/spec/ruby/library/cgi/unescapeURIComponent_spec.rb
@@ -44,7 +44,7 @@
   end
 
   it "raises ArgumentError if specified encoding is unknown" do
-    -> { CGI.unescapeURIComponent("ABC", "ISO-JOKE-1") }.should raise_error(ArgumentError, "unknown encoding name - ISO-JOKE-1")
+    -> { CGI.unescapeURIComponent("ABC", "ISO-JOKE-1") }.should.raise(ArgumentError, "unknown encoding name - ISO-JOKE-1")
   end
 
   ruby_version_is ""..."4.0" do
@@ -91,7 +91,7 @@
       decoded = CGI.unescapeURIComponent(string, Encoding::US_ASCII)
       decoded.encoding.should == Encoding::SHIFT_JIS
       decoded.should == "｢ｦ｣".encode(Encoding::SHIFT_JIS)
-      decoded.valid_encoding?.should be_true
+      decoded.valid_encoding?.should == true
     end
 
     it "uses source string's encoding even if it's also invalid" do
@@ -99,7 +99,7 @@
       decoded = CGI.unescapeURIComponent(string, Encoding::SHIFT_JIS)
       decoded.encoding.should == Encoding::US_ASCII
       decoded.should == "\xFF".dup.force_encoding(Encoding::US_ASCII)
-      decoded.valid_encoding?.should be_false
+      decoded.valid_encoding?.should == false
     end
   end
 
@@ -114,7 +114,7 @@
   it "raises a TypeError with nil" do
     -> {
       CGI.unescapeURIComponent(nil)
-    }.should raise_error(TypeError, "no implicit conversion of nil into String")
+    }.should.raise(TypeError, "no implicit conversion of nil into String")
   end
 
   it "uses implicit type conversion to String" do
diff --git a/spec/ruby/library/coverage/result_spec.rb b/spec/ruby/library/coverage/result_spec.rb
index 0101eb6a643..2e7d598bb8e 100644
--- a/spec/ruby/library/coverage/result_spec.rb
+++ b/spec/ruby/library/coverage/result_spec.rb
@@ -80,7 +80,7 @@
     Coverage.result
     -> {
       Coverage.result
-    }.should raise_error(RuntimeError, 'coverage measurement is not enabled')
+    }.should.raise(RuntimeError, 'coverage measurement is not enabled')
   end
 
   it 'second run should give same result' do
@@ -108,7 +108,7 @@
 
   it 'does not include the file starting coverage since it is not tracked' do
     require @config_file.chomp('.rb')
-    Coverage.result.should_not include(@config_file)
+    Coverage.result.should_not.include?(@config_file)
   end
 
   it 'returns the correct results when eval coverage is enabled' do
diff --git a/spec/ruby/library/coverage/start_spec.rb b/spec/ruby/library/coverage/start_spec.rb
index c921b854018..11777347a28 100644
--- a/spec/ruby/library/coverage/start_spec.rb
+++ b/spec/ruby/library/coverage/start_spec.rb
@@ -24,7 +24,7 @@
 
     -> {
       Coverage.start
-    }.should raise_error(RuntimeError, 'coverage measurement is already setup')
+    }.should.raise(RuntimeError, 'coverage measurement is already setup')
   end
 
   it "accepts :all optional argument" do
@@ -65,13 +65,13 @@
   it "expects a Hash if not passed :all" do
     -> {
       Coverage.start(42)
-    }.should raise_error(TypeError, "no implicit conversion of Integer into Hash")
+    }.should.raise(TypeError, "no implicit conversion of Integer into Hash")
   end
 
   it "does not accept both lines: and oneshot_lines: keyword arguments" do
     -> {
       Coverage.start(lines: true, oneshot_lines: true)
-    }.should raise_error(RuntimeError, "cannot enable lines and oneshot_lines simultaneously")
+    }.should.raise(RuntimeError, "cannot enable lines and oneshot_lines simultaneously")
   end
 
   it "enables the coverage measurement if passed options with `false` value" do
diff --git a/spec/ruby/library/coverage/supported_spec.rb b/spec/ruby/library/coverage/supported_spec.rb
index 9226548c1f5..fcf8a76d796 100644
--- a/spec/ruby/library/coverage/supported_spec.rb
+++ b/spec/ruby/library/coverage/supported_spec.rb
@@ -17,14 +17,14 @@
   it "raise TypeError if argument is not Symbol" do
     -> {
       Coverage.supported?("lines")
-    }.should raise_error(TypeError, "wrong argument type String (expected Symbol)")
+    }.should.raise(TypeError, "wrong argument type String (expected Symbol)")
 
     -> {
       Coverage.supported?([])
-    }.should raise_error(TypeError, "wrong argument type Array (expected Symbol)")
+    }.should.raise(TypeError, "wrong argument type Array (expected Symbol)")
 
     -> {
       Coverage.supported?(1)
-    }.should raise_error(TypeError, "wrong argument type Integer (expected Symbol)")
+    }.should.raise(TypeError, "wrong argument type Integer (expected Symbol)")
   end
 end
diff --git a/spec/ruby/library/csv/generate_spec.rb b/spec/ruby/library/csv/generate_spec.rb
index b45e2eb95ba..62e19aa6e43 100644
--- a/spec/ruby/library/csv/generate_spec.rb
+++ b/spec/ruby/library/csv/generate_spec.rb
@@ -26,7 +26,7 @@
       csv.add_row [1, 2, 3]
       csv << [4, 5, 6]
     end
-    csv_str.should equal str
+    csv_str.should.equal? str
     str.should == "1,2,3\n4,5,6\n"
   end
 end
diff --git a/spec/ruby/library/csv/parse_spec.rb b/spec/ruby/library/csv/parse_spec.rb
index ef5d4ea3ca1..7000f03cdac 100644
--- a/spec/ruby/library/csv/parse_spec.rb
+++ b/spec/ruby/library/csv/parse_spec.rb
@@ -5,7 +5,7 @@
 
   it "parses '' into []" do
     result = CSV.parse ''
-    result.should be_kind_of(Array)
+    result.should.is_a?(Array)
     result.should == []
   end
 
@@ -82,7 +82,7 @@
   it "raises CSV::MalformedCSVError exception if input is illegal" do
     -> {
       CSV.parse('"quoted" field')
-    }.should raise_error(CSV::MalformedCSVError)
+    }.should.raise(CSV::MalformedCSVError)
   end
 
   it "handles illegal input with the liberal_parsing option" do
diff --git a/spec/ruby/library/csv/readlines_spec.rb b/spec/ruby/library/csv/readlines_spec.rb
index 14dea34381d..624f906489a 100644
--- a/spec/ruby/library/csv/readlines_spec.rb
+++ b/spec/ruby/library/csv/readlines_spec.rb
@@ -23,7 +23,7 @@
 
   it "raises CSV::MalformedCSVError exception if input is illegal" do
     csv = CSV.new('"quoted" field')
-    -> { csv.readlines }.should raise_error(CSV::MalformedCSVError)
+    -> { csv.readlines }.should.raise(CSV::MalformedCSVError)
   end
 
   it "handles illegal input with the liberal_parsing option" do
diff --git a/spec/ruby/library/date/add_month_spec.rb b/spec/ruby/library/date/add_month_spec.rb
index 40833f6487d..ab802ea97a5 100644
--- a/spec/ruby/library/date/add_month_spec.rb
+++ b/spec/ruby/library/date/add_month_spec.rb
@@ -21,18 +21,18 @@
   end
 
   it "raise a TypeError when passed a Symbol" do
-    -> { Date.civil(2007,2,27) >> :hello }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) >> :hello }.should.raise(TypeError)
   end
 
   it "raise a TypeError when passed a String" do
-    -> { Date.civil(2007,2,27) >> "hello" }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) >> "hello" }.should.raise(TypeError)
   end
 
   it "raise a TypeError when passed a Date" do
-    -> { Date.civil(2007,2,27) >> Date.new }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) >> Date.new }.should.raise(TypeError)
   end
 
   it "raise a TypeError when passed an Object" do
-    -> { Date.civil(2007,2,27) >> Object.new }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) >> Object.new }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/date/add_spec.rb b/spec/ruby/library/date/add_spec.rb
index 2b9cc62023e..5e368decdce 100644
--- a/spec/ruby/library/date/add_spec.rb
+++ b/spec/ruby/library/date/add_spec.rb
@@ -13,18 +13,18 @@
   end
 
   it "raises a TypeError when passed a Symbol" do
-    -> { Date.civil(2007,2,27) + :hello }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) + :hello }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { Date.civil(2007,2,27) + "hello" }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) + "hello" }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a Date" do
-    -> { Date.civil(2007,2,27) + Date.new }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) + Date.new }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed an Object" do
-    -> { Date.civil(2007,2,27) + Object.new }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) + Object.new }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/date/constants_spec.rb b/spec/ruby/library/date/constants_spec.rb
index 1d18dd1b0c6..3494b0c296c 100644
--- a/spec/ruby/library/date/constants_spec.rb
+++ b/spec/ruby/library/date/constants_spec.rb
@@ -36,11 +36,11 @@
     [Date::MONTHNAMES, Date::DAYNAMES, Date::ABBR_MONTHNAMES, Date::ABBR_DAYNAMES].each do |ary|
       -> {
         ary << "Unknown"
-      }.should raise_error(FrozenError, /frozen/)
+      }.should.raise(FrozenError, /frozen/)
       ary.compact.each do |name|
         -> {
           name << "modified"
-        }.should raise_error(FrozenError, /frozen/)
+        }.should.raise(FrozenError, /frozen/)
       end
     end
   end
diff --git a/spec/ruby/library/date/deconstruct_keys_spec.rb b/spec/ruby/library/date/deconstruct_keys_spec.rb
index b9dd6b88162..1fa1e702509 100644
--- a/spec/ruby/library/date/deconstruct_keys_spec.rb
+++ b/spec/ruby/library/date/deconstruct_keys_spec.rb
@@ -16,16 +16,16 @@
   it "requires one argument" do
     -> {
       Date.new(2022, 10, 5).deconstruct_keys
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "it raises error when argument is neither nil nor array" do
     d = Date.new(2022, 10, 5)
 
-    -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
-    -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
-    -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
-    -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
+    -> { d.deconstruct_keys(1) }.should.raise(TypeError, "wrong argument type Integer (expected Array or nil)")
+    -> { d.deconstruct_keys("asd") }.should.raise(TypeError, "wrong argument type String (expected Array or nil)")
+    -> { d.deconstruct_keys(:x) }.should.raise(TypeError, "wrong argument type Symbol (expected Array or nil)")
+    -> { d.deconstruct_keys({}) }.should.raise(TypeError, "wrong argument type Hash (expected Array or nil)")
   end
 
   it "returns {} when passed []" do
diff --git a/spec/ruby/library/date/eql_spec.rb b/spec/ruby/library/date/eql_spec.rb
index a1819cae3a6..79fabc47f45 100644
--- a/spec/ruby/library/date/eql_spec.rb
+++ b/spec/ruby/library/date/eql_spec.rb
@@ -3,10 +3,10 @@
 
 describe "Date#eql?" do
   it "returns true if self is equal to another date" do
-    Date.civil(2007, 10, 11).eql?(Date.civil(2007, 10, 11)).should be_true
+    Date.civil(2007, 10, 11).eql?(Date.civil(2007, 10, 11)).should == true
   end
 
   it "returns false if self is not equal to another date" do
-    Date.civil(2007, 10, 11).eql?(Date.civil(2007, 10, 12)).should be_false
+    Date.civil(2007, 10, 11).eql?(Date.civil(2007, 10, 12)).should == false
   end
 end
diff --git a/spec/ruby/library/date/friday_spec.rb b/spec/ruby/library/date/friday_spec.rb
index 3dc040fabeb..62f050346ed 100644
--- a/spec/ruby/library/date/friday_spec.rb
+++ b/spec/ruby/library/date/friday_spec.rb
@@ -3,10 +3,10 @@
 
 describe "Date#friday?" do
   it "should be friday" do
-    Date.new(2000, 1, 7).friday?.should be_true
+    Date.new(2000, 1, 7).friday?.should == true
   end
 
   it "should not be friday" do
-    Date.new(2000, 1, 8).friday?.should be_false
+    Date.new(2000, 1, 8).friday?.should == false
   end
 end
diff --git a/spec/ruby/library/date/gregorian_leap_spec.rb b/spec/ruby/library/date/gregorian_leap_spec.rb
index c3d25cf90f0..c27890faf45 100644
--- a/spec/ruby/library/date/gregorian_leap_spec.rb
+++ b/spec/ruby/library/date/gregorian_leap_spec.rb
@@ -3,13 +3,13 @@
 
 describe "Date#gregorian_leap?" do
   it "returns true if a year is a leap year in the Gregorian calendar" do
-    Date.gregorian_leap?(2000).should be_true
-    Date.gregorian_leap?(2004).should be_true
+    Date.gregorian_leap?(2000).should == true
+    Date.gregorian_leap?(2004).should == true
   end
 
   it "returns false if a year is not a leap year in the Gregorian calendar" do
-    Date.gregorian_leap?(1900).should be_false
-    Date.gregorian_leap?(1999).should be_false
-    Date.gregorian_leap?(2002).should be_false
+    Date.gregorian_leap?(1900).should == false
+    Date.gregorian_leap?(1999).should == false
+    Date.gregorian_leap?(2002).should == false
   end
 end
diff --git a/spec/ruby/library/date/gregorian_spec.rb b/spec/ruby/library/date/gregorian_spec.rb
index ea7ece2adef..bbda13af08d 100644
--- a/spec/ruby/library/date/gregorian_spec.rb
+++ b/spec/ruby/library/date/gregorian_spec.rb
@@ -4,13 +4,13 @@
 describe "Date#gregorian?" do
 
   it "marks a day before the calendar reform as Julian" do
-    Date.civil(1007, 2, 27).gregorian?.should be_false
-    Date.civil(1907, 2, 27, Date.civil(1930, 1, 1).jd).gregorian?.should be_false
+    Date.civil(1007, 2, 27).gregorian?.should == false
+    Date.civil(1907, 2, 27, Date.civil(1930, 1, 1).jd).gregorian?.should == false
   end
 
   it "marks a day after the calendar reform as Julian" do
     Date.civil(2007, 2, 27).should.gregorian?
-    Date.civil(1607, 2, 27, Date.civil(1582, 1, 1).jd).gregorian?.should be_true
+    Date.civil(1607, 2, 27, Date.civil(1582, 1, 1).jd).gregorian?.should == true
   end
 
 end
diff --git a/spec/ruby/library/date/iso8601_spec.rb b/spec/ruby/library/date/iso8601_spec.rb
index af66845a6b4..26815bd76cd 100644
--- a/spec/ruby/library/date/iso8601_spec.rb
+++ b/spec/ruby/library/date/iso8601_spec.rb
@@ -25,17 +25,17 @@
   it "raises a Date::Error if the argument is a invalid Date" do
     -> {
       Date.iso8601('invalid')
-    }.should raise_error(Date::Error, "invalid date")
+    }.should.raise(Date::Error, "invalid date")
   end
 
   it "raises a Date::Error when passed a nil" do
     -> {
       Date.iso8601(nil)
-    }.should raise_error(Date::Error, "invalid date")
+    }.should.raise(Date::Error, "invalid date")
   end
 
   it "raises a TypeError when passed an Object" do
-    -> { Date.iso8601(Object.new) }.should raise_error(TypeError)
+    -> { Date.iso8601(Object.new) }.should.raise(TypeError)
   end
 end
 
@@ -51,6 +51,6 @@
   end
 
   it "raises a TypeError when passed an Object" do
-    -> { Date._iso8601(Object.new) }.should raise_error(TypeError)
+    -> { Date._iso8601(Object.new) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/date/julian_leap_spec.rb b/spec/ruby/library/date/julian_leap_spec.rb
index 2ef2d65d810..42231e012f5 100644
--- a/spec/ruby/library/date/julian_leap_spec.rb
+++ b/spec/ruby/library/date/julian_leap_spec.rb
@@ -3,13 +3,13 @@
 
 describe "Date.julian_leap?" do
   it "determines whether a year is a leap year in the Julian calendar" do
-    Date.julian_leap?(1900).should be_true
-    Date.julian_leap?(2000).should be_true
-    Date.julian_leap?(2004).should be_true
+    Date.julian_leap?(1900).should == true
+    Date.julian_leap?(2000).should == true
+    Date.julian_leap?(2004).should == true
   end
 
   it "determines whether a year is not a leap year in the Julian calendar" do
-    Date.julian_leap?(1999).should be_false
-    Date.julian_leap?(2002).should be_false
+    Date.julian_leap?(1999).should == false
+    Date.julian_leap?(2002).should == false
   end
 end
diff --git a/spec/ruby/library/date/julian_spec.rb b/spec/ruby/library/date/julian_spec.rb
index db2629d1e73..9f8a6708996 100644
--- a/spec/ruby/library/date/julian_spec.rb
+++ b/spec/ruby/library/date/julian_spec.rb
@@ -5,12 +5,12 @@
 
   it "marks a day before the calendar reform as Julian" do
     Date.civil(1007, 2, 27).should.julian?
-    Date.civil(1907, 2, 27, Date.civil(1930, 1, 1).jd).julian?.should be_true
+    Date.civil(1907, 2, 27, Date.civil(1930, 1, 1).jd).julian?.should == true
   end
 
   it "marks a day after the calendar reform as Julian" do
     Date.civil(2007, 2, 27).should_not.julian?
-    Date.civil(1607, 2, 27, Date.civil(1582, 1, 1).jd).julian?.should be_false
+    Date.civil(1607, 2, 27, Date.civil(1582, 1, 1).jd).julian?.should == false
   end
 
 end
diff --git a/spec/ruby/library/date/minus_month_spec.rb b/spec/ruby/library/date/minus_month_spec.rb
index 470c4d8a765..d56e19dc310 100644
--- a/spec/ruby/library/date/minus_month_spec.rb
+++ b/spec/ruby/library/date/minus_month_spec.rb
@@ -14,10 +14,10 @@
   end
 
   it "raises an error on non numeric parameters" do
-    -> { Date.civil(2007,2,27) << :hello }.should raise_error(TypeError)
-    -> { Date.civil(2007,2,27) << "hello" }.should raise_error(TypeError)
-    -> { Date.civil(2007,2,27) << Date.new }.should raise_error(TypeError)
-    -> { Date.civil(2007,2,27) << Object.new }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) << :hello }.should.raise(TypeError)
+    -> { Date.civil(2007,2,27) << "hello" }.should.raise(TypeError)
+    -> { Date.civil(2007,2,27) << Date.new }.should.raise(TypeError)
+    -> { Date.civil(2007,2,27) << Object.new }.should.raise(TypeError)
   end
 
 end
diff --git a/spec/ruby/library/date/minus_spec.rb b/spec/ruby/library/date/minus_spec.rb
index 5a2a29e04a8..c2a08fa5b08 100644
--- a/spec/ruby/library/date/minus_spec.rb
+++ b/spec/ruby/library/date/minus_spec.rb
@@ -22,9 +22,9 @@
   end
 
   it "raises an error for non Numeric arguments" do
-    -> { Date.civil(2007,2,27) - :hello }.should raise_error(TypeError)
-    -> { Date.civil(2007,2,27) - "hello" }.should raise_error(TypeError)
-    -> { Date.civil(2007,2,27) - Object.new }.should raise_error(TypeError)
+    -> { Date.civil(2007,2,27) - :hello }.should.raise(TypeError)
+    -> { Date.civil(2007,2,27) - "hello" }.should.raise(TypeError)
+    -> { Date.civil(2007,2,27) - Object.new }.should.raise(TypeError)
   end
 
 end
diff --git a/spec/ruby/library/date/monday_spec.rb b/spec/ruby/library/date/monday_spec.rb
index 14a117b73c4..61d728f3c50 100644
--- a/spec/ruby/library/date/monday_spec.rb
+++ b/spec/ruby/library/date/monday_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Date#monday?" do
   it "should be monday" do
-    Date.new(2000, 1, 3).monday?.should be_true
+    Date.new(2000, 1, 3).monday?.should == true
   end
 end
diff --git a/spec/ruby/library/date/parse_spec.rb b/spec/ruby/library/date/parse_spec.rb
index 5ef4f6e9b5d..4d655f516e3 100644
--- a/spec/ruby/library/date/parse_spec.rb
+++ b/spec/ruby/library/date/parse_spec.rb
@@ -23,7 +23,7 @@
 
   # Specs using numbers
   it "throws an argument error for a single digit" do
-    ->{ Date.parse("1") }.should raise_error(ArgumentError)
+    ->{ Date.parse("1") }.should.raise(ArgumentError)
   end
 
   it "parses DD as month day number" do
@@ -66,8 +66,8 @@
   end
 
   it "raises a TypeError trying to parse non-String-like object" do
-    -> { Date.parse(1) }.should raise_error(TypeError)
-    -> { Date.parse([]) }.should raise_error(TypeError)
+    -> { Date.parse(1) }.should.raise(TypeError)
+    -> { Date.parse([]) }.should.raise(TypeError)
   end
 
   it "coerces using to_str" do
diff --git a/spec/ruby/library/date/plus_spec.rb b/spec/ruby/library/date/plus_spec.rb
index 0cb99fd4cae..6179370fcac 100644
--- a/spec/ruby/library/date/plus_spec.rb
+++ b/spec/ruby/library/date/plus_spec.rb
@@ -15,6 +15,6 @@
   end
 
   it "raises TypeError if argument is not Numeric" do
-    -> { Date.today + Date.today }.should raise_error(TypeError)
+    -> { Date.today + Date.today }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/date/saturday_spec.rb b/spec/ruby/library/date/saturday_spec.rb
index 1527b71d005..29f8267a2b5 100644
--- a/spec/ruby/library/date/saturday_spec.rb
+++ b/spec/ruby/library/date/saturday_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Date#saturday?" do
   it "should be saturday" do
-    Date.new(2000, 1, 1).saturday?.should be_true
+    Date.new(2000, 1, 1).saturday?.should == true
   end
 end
diff --git a/spec/ruby/library/date/shared/civil.rb b/spec/ruby/library/date/shared/civil.rb
index bbed4a88662..4499cdf8e95 100644
--- a/spec/ruby/library/date/shared/civil.rb
+++ b/spec/ruby/library/date/shared/civil.rb
@@ -36,14 +36,14 @@
   end
 
   it "doesn't create dates for invalid arguments" do
-    -> { Date.send(@method, 2000, 13, 31) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 2000, 12, 32) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 2000,  2, 30) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 1900,  2, 29) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 2000,  2, 29) }.should_not raise_error(ArgumentError)
-
-    -> { Date.send(@method, 1582, 10, 14) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 1582, 10, 15) }.should_not raise_error(ArgumentError)
+    -> { Date.send(@method, 2000, 13, 31) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 2000, 12, 32) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 2000,  2, 30) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 1900,  2, 29) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 2000,  2, 29) }.should_not.raise(ArgumentError)
+
+    -> { Date.send(@method, 1582, 10, 14) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 1582, 10, 15) }.should_not.raise(ArgumentError)
 
   end
 
diff --git a/spec/ruby/library/date/shared/commercial.rb b/spec/ruby/library/date/shared/commercial.rb
index 39c9af47b6c..f53d83235aa 100644
--- a/spec/ruby/library/date/shared/commercial.rb
+++ b/spec/ruby/library/date/shared/commercial.rb
@@ -25,15 +25,15 @@
   end
 
   it "creates only Date objects for valid weeks" do
-    -> { Date.send(@method, 2004, 53, 1) }.should_not raise_error(ArgumentError)
-    -> { Date.send(@method, 2004, 53, 0) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 2004, 53, 8) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 2004, 54, 1) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 2004,  0, 1) }.should raise_error(ArgumentError)
+    -> { Date.send(@method, 2004, 53, 1) }.should_not.raise(ArgumentError)
+    -> { Date.send(@method, 2004, 53, 0) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 2004, 53, 8) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 2004, 54, 1) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 2004,  0, 1) }.should.raise(ArgumentError)
 
-    -> { Date.send(@method, 2003, 52, 1) }.should_not raise_error(ArgumentError)
-    -> { Date.send(@method, 2003, 53, 1) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 2003, 52, 0) }.should raise_error(ArgumentError)
-    -> { Date.send(@method, 2003, 52, 8) }.should raise_error(ArgumentError)
+    -> { Date.send(@method, 2003, 52, 1) }.should_not.raise(ArgumentError)
+    -> { Date.send(@method, 2003, 53, 1) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 2003, 52, 0) }.should.raise(ArgumentError)
+    -> { Date.send(@method, 2003, 52, 8) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/date/shared/valid_civil.rb b/spec/ruby/library/date/shared/valid_civil.rb
index 545c207bbea..425fee4d2d7 100644
--- a/spec/ruby/library/date/shared/valid_civil.rb
+++ b/spec/ruby/library/date/shared/valid_civil.rb
@@ -9,8 +9,8 @@
   #  31
 
   it "returns true if it is a valid civil date" do
-    Date.send(@method, 1582, 10, 15).should be_true
-    Date.send(@method, 1582, 10, 14, Date::ENGLAND).should be_true
+    Date.send(@method, 1582, 10, 15).should == true
+    Date.send(@method, 1582, 10, 14, Date::ENGLAND).should == true
   end
 
   it "returns false if it is not a valid civil date" do
@@ -24,13 +24,13 @@
     #   -15 -14 -13 -12 -11 -10  -9
     #    -8  -7  -6  -5  -4  -3  -2
     #    -1
-    Date.send(@method, 1582, -3, -22).should be_false
-    Date.send(@method, 1582, -3, -21).should be_true
-    Date.send(@method, 1582, -3, -18).should be_true
-    Date.send(@method, 1582, -3, -17).should be_true
+    Date.send(@method, 1582, -3, -22).should == false
+    Date.send(@method, 1582, -3, -21).should == true
+    Date.send(@method, 1582, -3, -18).should == true
+    Date.send(@method, 1582, -3, -17).should == true
 
-    Date.send(@method, 2007, -11, -10).should be_true
-    Date.send(@method, 2008, -11, -10).should be_true
+    Date.send(@method, 2007, -11, -10).should == true
+    Date.send(@method, 2008, -11, -10).should == true
   end
 
 end
diff --git a/spec/ruby/library/date/shared/valid_commercial.rb b/spec/ruby/library/date/shared/valid_commercial.rb
index 117dfe1d3da..573b851fdd4 100644
--- a/spec/ruby/library/date/shared/valid_commercial.rb
+++ b/spec/ruby/library/date/shared/valid_commercial.rb
@@ -6,16 +6,16 @@
     # 39:  1  2  3  4  5  6  7
     # 40:  1  2  3  4  5  6  7
     # 41:  1  2  3  4  5  6  7
-    Date.send(@method, 1582, 39, 4).should be_true
-    Date.send(@method, 1582, 39, 5).should be_true
-    Date.send(@method, 1582, 41, 4).should be_true
-    Date.send(@method, 1582, 41, 5).should be_true
-    Date.send(@method, 1582, 41, 4, Date::ENGLAND).should be_true
-    Date.send(@method, 1752, 37, 4, Date::ENGLAND).should be_true
+    Date.send(@method, 1582, 39, 4).should == true
+    Date.send(@method, 1582, 39, 5).should == true
+    Date.send(@method, 1582, 41, 4).should == true
+    Date.send(@method, 1582, 41, 5).should == true
+    Date.send(@method, 1582, 41, 4, Date::ENGLAND).should == true
+    Date.send(@method, 1752, 37, 4, Date::ENGLAND).should == true
   end
 
   it "returns false it is not a valid commercial date" do
-    Date.send(@method, 1999, 53, 1).should be_false
+    Date.send(@method, 1999, 53, 1).should == false
   end
 
   it "handles negative week and day numbers" do
@@ -24,11 +24,11 @@
     # -12: -7 -6 -5 -4 -3 -2 -1
     # -11: -7 -6 -5 -4 -3 -2 -1
     # -10: -7 -6 -5 -4 -3 -2 -1
-    Date.send(@method, 1582, -12, -4).should be_true
-    Date.send(@method, 1582, -12, -3).should be_true
-    Date.send(@method, 2007, -44, -2).should be_true
-    Date.send(@method, 2008, -44, -2).should be_true
-    Date.send(@method, 1999, -53, -1).should be_false
+    Date.send(@method, 1582, -12, -4).should == true
+    Date.send(@method, 1582, -12, -3).should == true
+    Date.send(@method, 2007, -44, -2).should == true
+    Date.send(@method, 2008, -44, -2).should == true
+    Date.send(@method, 1999, -53, -1).should == false
   end
 
 end
diff --git a/spec/ruby/library/date/shared/valid_jd.rb b/spec/ruby/library/date/shared/valid_jd.rb
index e474dfb4501..0c01710208e 100644
--- a/spec/ruby/library/date/shared/valid_jd.rb
+++ b/spec/ruby/library/date/shared/valid_jd.rb
@@ -1,20 +1,20 @@
 describe :date_valid_jd?, shared: true do
   it "returns true if passed a number value" do
-    Date.send(@method, -100).should be_true
-    Date.send(@method, 100.0).should be_true
-    Date.send(@method, 2**100).should be_true
-    Date.send(@method, Rational(1,2)).should be_true
+    Date.send(@method, -100).should == true
+    Date.send(@method, 100.0).should == true
+    Date.send(@method, 2**100).should == true
+    Date.send(@method, Rational(1,2)).should == true
   end
 
   it "returns false if passed nil" do
-    Date.send(@method, nil).should be_false
+    Date.send(@method, nil).should == false
   end
 
   it "returns false if passed symbol" do
-    Date.send(@method, :number).should be_false
+    Date.send(@method, :number).should == false
   end
 
   it "returns false if passed false" do
-    Date.send(@method, false).should be_false
+    Date.send(@method, false).should == false
   end
 end
diff --git a/spec/ruby/library/date/sunday_spec.rb b/spec/ruby/library/date/sunday_spec.rb
index c3a817fa86b..548f36a4f06 100644
--- a/spec/ruby/library/date/sunday_spec.rb
+++ b/spec/ruby/library/date/sunday_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Date#sunday?" do
   it "should be sunday" do
-    Date.new(2000, 1, 2).sunday?.should be_true
+    Date.new(2000, 1, 2).sunday?.should == true
   end
 end
diff --git a/spec/ruby/library/date/thursday_spec.rb b/spec/ruby/library/date/thursday_spec.rb
index 74b5f403657..4df3b9103ac 100644
--- a/spec/ruby/library/date/thursday_spec.rb
+++ b/spec/ruby/library/date/thursday_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Date#thursday?" do
   it "should be thursday" do
-    Date.new(2000, 1, 6).thursday?.should be_true
+    Date.new(2000, 1, 6).thursday?.should == true
   end
 end
diff --git a/spec/ruby/library/date/today_spec.rb b/spec/ruby/library/date/today_spec.rb
index 7c6ebc9cb48..4be8d8e9314 100644
--- a/spec/ruby/library/date/today_spec.rb
+++ b/spec/ruby/library/date/today_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Date.today" do
   it "returns a Date object" do
-    Date.today.should be_kind_of Date
+    Date.today.should.is_a? Date
   end
 
   it "sets Date object to the current date" do
diff --git a/spec/ruby/library/date/tuesday_spec.rb b/spec/ruby/library/date/tuesday_spec.rb
index 052837b54e0..db31387aedf 100644
--- a/spec/ruby/library/date/tuesday_spec.rb
+++ b/spec/ruby/library/date/tuesday_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Date#tuesday?" do
   it "should be tuesday" do
-    Date.new(2000, 1, 4).tuesday?.should be_true
+    Date.new(2000, 1, 4).tuesday?.should == true
   end
 end
diff --git a/spec/ruby/library/date/wednesday_spec.rb b/spec/ruby/library/date/wednesday_spec.rb
index e80ec23dd20..4bbeead5b8e 100644
--- a/spec/ruby/library/date/wednesday_spec.rb
+++ b/spec/ruby/library/date/wednesday_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Date#wednesday?" do
   it "should be wednesday" do
-    Date.new(2000, 1, 5).wednesday?.should be_true
+    Date.new(2000, 1, 5).wednesday?.should == true
   end
 end
diff --git a/spec/ruby/library/datetime/deconstruct_keys_spec.rb b/spec/ruby/library/datetime/deconstruct_keys_spec.rb
index 154c024a239..07a7bda881a 100644
--- a/spec/ruby/library/datetime/deconstruct_keys_spec.rb
+++ b/spec/ruby/library/datetime/deconstruct_keys_spec.rb
@@ -18,16 +18,16 @@
   it "requires one argument" do
     -> {
       DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "it raises error when argument is neither nil nor array" do
     d = DateTime.new(2022, 10, 5, 13, 30)
 
-    -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
-    -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
-    -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
-    -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
+    -> { d.deconstruct_keys(1) }.should.raise(TypeError, "wrong argument type Integer (expected Array or nil)")
+    -> { d.deconstruct_keys("asd") }.should.raise(TypeError, "wrong argument type String (expected Array or nil)")
+    -> { d.deconstruct_keys(:x) }.should.raise(TypeError, "wrong argument type Symbol (expected Array or nil)")
+    -> { d.deconstruct_keys({}) }.should.raise(TypeError, "wrong argument type Hash (expected Array or nil)")
   end
 
   it "returns {} when passed []" do
diff --git a/spec/ruby/library/datetime/hour_spec.rb b/spec/ruby/library/datetime/hour_spec.rb
index 8efd5f92f06..383a85fe602 100644
--- a/spec/ruby/library/datetime/hour_spec.rb
+++ b/spec/ruby/library/datetime/hour_spec.rb
@@ -15,23 +15,23 @@
   end
 
   it "raises an error for Rational" do
-    -> { new_datetime(hour: 1 + Rational(1,2)) }.should raise_error(ArgumentError)
+    -> { new_datetime(hour: 1 + Rational(1,2)) }.should.raise(ArgumentError)
   end
 
   it "raises an error for Float" do
-    -> { new_datetime(hour: 1.5).hour }.should raise_error(ArgumentError)
+    -> { new_datetime(hour: 1.5).hour }.should.raise(ArgumentError)
   end
 
   it "raises an error for Rational" do
-    -> { new_datetime(day: 1 + Rational(1,2)) }.should raise_error(ArgumentError)
+    -> { new_datetime(day: 1 + Rational(1,2)) }.should.raise(ArgumentError)
   end
 
   it "raises an error, when the hour is smaller than -24" do
-    -> { new_datetime(hour: -25) }.should raise_error(ArgumentError)
+    -> { new_datetime(hour: -25) }.should.raise(ArgumentError)
   end
 
   it "raises an error, when the hour is larger than 24" do
-    -> { new_datetime(hour: 25) }.should raise_error(ArgumentError)
+    -> { new_datetime(hour: 25) }.should.raise(ArgumentError)
   end
 
   it "raises an error for hour fractions smaller than -24" do
diff --git a/spec/ruby/library/datetime/new_spec.rb b/spec/ruby/library/datetime/new_spec.rb
index 6a4dced3845..2b3c3f156cd 100644
--- a/spec/ruby/library/datetime/new_spec.rb
+++ b/spec/ruby/library/datetime/new_spec.rb
@@ -47,6 +47,6 @@
   end
 
   it "raises an error on invalid arguments" do
-    -> { new_datetime(minute: 999) }.should raise_error(ArgumentError)
+    -> { new_datetime(minute: 999) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/datetime/now_spec.rb b/spec/ruby/library/datetime/now_spec.rb
index 9f22153c156..5c0411c2be5 100644
--- a/spec/ruby/library/datetime/now_spec.rb
+++ b/spec/ruby/library/datetime/now_spec.rb
@@ -3,7 +3,7 @@
 
 describe "DateTime.now" do
   it "creates an instance of DateTime" do
-    DateTime.now.should be_an_instance_of(DateTime)
+    DateTime.now.should.instance_of?(DateTime)
   end
 
   it "sets the current date" do
diff --git a/spec/ruby/library/datetime/parse_spec.rb b/spec/ruby/library/datetime/parse_spec.rb
index e9bf4e2ed16..0a965273a08 100644
--- a/spec/ruby/library/datetime/parse_spec.rb
+++ b/spec/ruby/library/datetime/parse_spec.rb
@@ -20,7 +20,7 @@
 
   # Specs using numbers
   it "throws an argument error for a single digit" do
-    ->{ DateTime.parse("1") }.should raise_error(ArgumentError)
+    ->{ DateTime.parse("1") }.should.raise(ArgumentError)
   end
 
   it "parses DD as month day number" do
@@ -54,23 +54,23 @@
     end
 
     it "throws an argument error for invalid month values" do
-      ->{DateTime.parse("2012-13-08T15:43:59")}.should raise_error(ArgumentError)
+      ->{DateTime.parse("2012-13-08T15:43:59")}.should.raise(ArgumentError)
     end
 
     it "throws an argument error for invalid day values" do
-      ->{DateTime.parse("2012-12-32T15:43:59")}.should raise_error(ArgumentError)
+      ->{DateTime.parse("2012-12-32T15:43:59")}.should.raise(ArgumentError)
     end
 
     it "throws an argument error for invalid hour values" do
-      ->{DateTime.parse("2012-12-31T25:43:59")}.should raise_error(ArgumentError)
+      ->{DateTime.parse("2012-12-31T25:43:59")}.should.raise(ArgumentError)
     end
 
     it "throws an argument error for invalid minute values" do
-      ->{DateTime.parse("2012-12-31T25:43:59")}.should raise_error(ArgumentError)
+      ->{DateTime.parse("2012-12-31T25:43:59")}.should.raise(ArgumentError)
     end
 
     it "throws an argument error for invalid second values" do
-      ->{DateTime.parse("2012-11-08T15:43:61")}.should raise_error(ArgumentError)
+      ->{DateTime.parse("2012-11-08T15:43:61")}.should.raise(ArgumentError)
     end
 
   end
diff --git a/spec/ruby/library/datetime/rfc2822_spec.rb b/spec/ruby/library/datetime/rfc2822_spec.rb
index 83f7fa8d5b1..11b79a1e84a 100644
--- a/spec/ruby/library/datetime/rfc2822_spec.rb
+++ b/spec/ruby/library/datetime/rfc2822_spec.rb
@@ -5,6 +5,6 @@
   it "needs to be reviewed for spec completeness"
 
   it "raises DateError if passed nil" do
-    -> { DateTime.rfc2822(nil) }.should raise_error(Date::Error, "invalid date")
+    -> { DateTime.rfc2822(nil) }.should.raise(Date::Error, "invalid date")
   end
 end
diff --git a/spec/ruby/library/datetime/shared/min.rb b/spec/ruby/library/datetime/shared/min.rb
index a35b8392819..04e5f3457a7 100644
--- a/spec/ruby/library/datetime/shared/min.rb
+++ b/spec/ruby/library/datetime/shared/min.rb
@@ -14,23 +14,23 @@
   end
 
   it "raises an error for Rational" do
-    -> { new_datetime minute: 5 + Rational(1,2) }.should raise_error(ArgumentError)
+    -> { new_datetime minute: 5 + Rational(1,2) }.should.raise(ArgumentError)
   end
 
   it "raises an error for Float" do
-    -> { new_datetime minute: 5.5 }.should raise_error(ArgumentError)
+    -> { new_datetime minute: 5.5 }.should.raise(ArgumentError)
   end
 
   it "raises an error for Rational" do
-    -> { new_datetime(hour: 2 + Rational(1,2)) }.should raise_error(ArgumentError)
+    -> { new_datetime(hour: 2 + Rational(1,2)) }.should.raise(ArgumentError)
   end
 
   it "raises an error, when the minute is smaller than -60" do
-    -> { new_datetime(minute: -61) }.should raise_error(ArgumentError)
+    -> { new_datetime(minute: -61) }.should.raise(ArgumentError)
   end
 
   it "raises an error, when the minute is greater or equal than 60" do
-    -> { new_datetime(minute: 60) }.should raise_error(ArgumentError)
+    -> { new_datetime(minute: 60) }.should.raise(ArgumentError)
   end
 
   it "raises an error for minute fractions smaller than -60" do
diff --git a/spec/ruby/library/datetime/shared/sec.rb b/spec/ruby/library/datetime/shared/sec.rb
index 60009213aa5..5af5db4fb2c 100644
--- a/spec/ruby/library/datetime/shared/sec.rb
+++ b/spec/ruby/library/datetime/shared/sec.rb
@@ -23,15 +23,15 @@
   end
 
   it "raises an error when minute is given as a rational" do
-    -> { new_datetime(minute: 5 + Rational(1,2)) }.should raise_error(ArgumentError)
+    -> { new_datetime(minute: 5 + Rational(1,2)) }.should.raise(ArgumentError)
   end
 
   it "raises an error, when the second is smaller than -60" do
-    -> { new_datetime(second: -61) }.should raise_error(ArgumentError)
+    -> { new_datetime(second: -61) }.should.raise(ArgumentError)
   end
 
   it "raises an error, when the second is greater or equal than 60" do
-    -> { new_datetime(second: 60) }.should raise_error(ArgumentError)
+    -> { new_datetime(second: 60) }.should.raise(ArgumentError)
   end
 
   it "raises an error for second fractions smaller than -60" do
diff --git a/spec/ruby/library/datetime/to_date_spec.rb b/spec/ruby/library/datetime/to_date_spec.rb
index 48c05e7fed6..31ccf5ae981 100644
--- a/spec/ruby/library/datetime/to_date_spec.rb
+++ b/spec/ruby/library/datetime/to_date_spec.rb
@@ -4,7 +4,7 @@
 describe "DateTime#to_date" do
   it "returns an instance of Date" do
     dt = DateTime.new(2012, 12, 24, 12, 23, 00, '+05:00')
-    dt.to_date.should be_kind_of(Date)
+    dt.to_date.should.is_a?(Date)
   end
 
   it "maintains the same year" do
diff --git a/spec/ruby/library/datetime/to_s_spec.rb b/spec/ruby/library/datetime/to_s_spec.rb
index 175fb807f41..ed0746f42b0 100644
--- a/spec/ruby/library/datetime/to_s_spec.rb
+++ b/spec/ruby/library/datetime/to_s_spec.rb
@@ -4,7 +4,7 @@
 describe "DateTime#to_s" do
   it "returns a new String object" do
     dt = DateTime.new(2012, 12, 24, 1, 2, 3, "+03:00")
-    dt.to_s.should be_kind_of(String)
+    dt.to_s.should.is_a?(String)
   end
 
   it "maintains timezone regardless of local time" do
diff --git a/spec/ruby/library/datetime/to_time_spec.rb b/spec/ruby/library/datetime/to_time_spec.rb
index 58bb363653b..a3ffc019fb9 100644
--- a/spec/ruby/library/datetime/to_time_spec.rb
+++ b/spec/ruby/library/datetime/to_time_spec.rb
@@ -4,7 +4,7 @@
 
 describe "DateTime#to_time" do
   it "yields a new Time object" do
-    DateTime.now.to_time.should be_kind_of(Time)
+    DateTime.now.to_time.should.is_a?(Time)
   end
 
   it "returns a Time representing the same instant" do
diff --git a/spec/ruby/library/delegate/delegate_class/instance_method_spec.rb b/spec/ruby/library/delegate/delegate_class/instance_method_spec.rb
index 16bf8d734cd..19ffc4cf85e 100644
--- a/spec/ruby/library/delegate/delegate_class/instance_method_spec.rb
+++ b/spec/ruby/library/delegate/delegate_class/instance_method_spec.rb
@@ -9,44 +9,44 @@
 
   it "returns a method object for public instance methods of the delegated class" do
     m = @klass.instance_method(:pub)
-    m.should be_an_instance_of(UnboundMethod)
+    m.should.instance_of?(UnboundMethod)
     m.bind(@obj).call.should == :foo
   end
 
   it "returns a method object for protected instance methods of the delegated class" do
     m = @klass.instance_method(:prot)
-    m.should be_an_instance_of(UnboundMethod)
+    m.should.instance_of?(UnboundMethod)
     m.bind(@obj).call.should == :protected
   end
 
   it "raises a NameError for a private instance methods of the delegated class" do
     -> {
       @klass.instance_method(:priv)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "returns a method object for public instance methods of the DelegateClass class" do
     m = @klass.instance_method(:extra)
-    m.should be_an_instance_of(UnboundMethod)
+    m.should.instance_of?(UnboundMethod)
     m.bind(@obj).call.should == :cheese
   end
 
   it "returns a method object for protected instance methods of the DelegateClass class" do
     m = @klass.instance_method(:extra_protected)
-    m.should be_an_instance_of(UnboundMethod)
+    m.should.instance_of?(UnboundMethod)
     m.bind(@obj).call.should == :baz
   end
 
   it "returns a method object for private instance methods of the DelegateClass class" do
     m = @klass.instance_method(:extra_private)
-    m.should be_an_instance_of(UnboundMethod)
+    m.should.instance_of?(UnboundMethod)
     m.bind(@obj).call.should == :bar
   end
 
   it "raises a NameError for an invalid method name" do
     -> {
       @klass.instance_method(:invalid_and_silly_method_name)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
 end
diff --git a/spec/ruby/library/delegate/delegate_class/instance_methods_spec.rb b/spec/ruby/library/delegate/delegate_class/instance_methods_spec.rb
index 6012ff72de2..586be56cae1 100644
--- a/spec/ruby/library/delegate/delegate_class/instance_methods_spec.rb
+++ b/spec/ruby/library/delegate/delegate_class/instance_methods_spec.rb
@@ -7,20 +7,20 @@
   end
 
   it "includes all public methods of the delegated class" do
-    @methods.should include :pub
+    @methods.should.include? :pub
   end
 
   it "includes all protected methods of the delegated class" do
-    @methods.should include :prot
+    @methods.should.include? :prot
   end
 
   it "includes instance methods of the DelegateClass class" do
-    @methods.should include :extra
-    @methods.should include :extra_protected
+    @methods.should.include? :extra
+    @methods.should.include? :extra_protected
   end
 
   it "does not include private methods" do
-    @methods.should_not include :priv
-    @methods.should_not include :extra_private
+    @methods.should_not.include? :priv
+    @methods.should_not.include? :extra_private
   end
 end
diff --git a/spec/ruby/library/delegate/delegate_class/private_instance_methods_spec.rb b/spec/ruby/library/delegate/delegate_class/private_instance_methods_spec.rb
index 06b2115cc5d..18ca2a4c881 100644
--- a/spec/ruby/library/delegate/delegate_class/private_instance_methods_spec.rb
+++ b/spec/ruby/library/delegate/delegate_class/private_instance_methods_spec.rb
@@ -7,17 +7,17 @@
   end
 
   it "does not include any instance methods of the delegated class" do
-    @methods.should_not include :pub
-    @methods.should_not include :prot
-    @methods.should_not include :priv # since these are not forwarded...
+    @methods.should_not.include? :pub
+    @methods.should_not.include? :prot
+    @methods.should_not.include? :priv # since these are not forwarded...
   end
 
   it "includes private instance methods of the DelegateClass class" do
-    @methods.should include :extra_private
+    @methods.should.include? :extra_private
   end
 
   it "does not include public or protected instance methods of the DelegateClass class" do
-    @methods.should_not include :extra
-    @methods.should_not include :extra_protected
+    @methods.should_not.include? :extra
+    @methods.should_not.include? :extra_protected
   end
 end
diff --git a/spec/ruby/library/delegate/delegate_class/protected_instance_methods_spec.rb b/spec/ruby/library/delegate/delegate_class/protected_instance_methods_spec.rb
index ac6659ec1e4..d540b450650 100644
--- a/spec/ruby/library/delegate/delegate_class/protected_instance_methods_spec.rb
+++ b/spec/ruby/library/delegate/delegate_class/protected_instance_methods_spec.rb
@@ -7,23 +7,23 @@
   end
 
   it "does not include public methods of the delegated class" do
-    @methods.should_not include :pub
+    @methods.should_not.include? :pub
   end
 
   it "includes the protected methods of the delegated class" do
-    @methods.should include :prot
+    @methods.should.include? :prot
   end
 
   it "includes protected instance methods of the DelegateClass class" do
-    @methods.should include :extra_protected
+    @methods.should.include? :extra_protected
   end
 
   it "does not include public instance methods of the DelegateClass class" do
-    @methods.should_not include :extra
+    @methods.should_not.include? :extra
   end
 
   it "does not include private methods" do
-    @methods.should_not include :priv
-    @methods.should_not include :extra_private
+    @methods.should_not.include? :priv
+    @methods.should_not.include? :extra_private
   end
 end
diff --git a/spec/ruby/library/delegate/delegate_class/public_instance_methods_spec.rb b/spec/ruby/library/delegate/delegate_class/public_instance_methods_spec.rb
index 6c0d9bcab1b..124b92de824 100644
--- a/spec/ruby/library/delegate/delegate_class/public_instance_methods_spec.rb
+++ b/spec/ruby/library/delegate/delegate_class/public_instance_methods_spec.rb
@@ -7,19 +7,19 @@
   end
 
   it "includes all public methods of the delegated class" do
-    @methods.should include :pub
+    @methods.should.include? :pub
   end
 
   it "does not include the protected methods of the delegated class" do
-    @methods.should_not include :prot
+    @methods.should_not.include? :prot
   end
 
   it "includes public instance methods of the DelegateClass class" do
-    @methods.should include :extra
+    @methods.should.include? :extra
   end
 
   it "does not include private methods" do
-    @methods.should_not include :priv
-    @methods.should_not include :extra_private
+    @methods.should_not.include? :priv
+    @methods.should_not.include? :extra_private
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/eql_spec.rb b/spec/ruby/library/delegate/delegator/eql_spec.rb
index 34f56f44c95..b302bb70165 100644
--- a/spec/ruby/library/delegate/delegator/eql_spec.rb
+++ b/spec/ruby/library/delegate/delegator/eql_spec.rb
@@ -6,14 +6,14 @@
     base = mock('base')
     delegator = DelegateSpecs::Delegator.new(base)
 
-    delegator.eql?(delegator).should be_true
+    delegator.eql?(delegator).should == true
   end
 
   it "returns true when compared with the inner object" do
     base = mock('base')
     delegator = DelegateSpecs::Delegator.new(base)
 
-    delegator.eql?(base).should be_true
+    delegator.eql?(base).should == true
   end
 
   it "returns false when compared with the delegator with other object" do
@@ -22,7 +22,7 @@
     delegator0 = DelegateSpecs::Delegator.new(base)
     delegator1 = DelegateSpecs::Delegator.new(other)
 
-    delegator0.eql?(delegator1).should be_false
+    delegator0.eql?(delegator1).should == false
   end
 
   it "returns false when compared with the other object" do
@@ -30,6 +30,6 @@
     other = mock('other')
     delegator = DelegateSpecs::Delegator.new(base)
 
-    delegator.eql?(other).should be_false
+    delegator.eql?(other).should == false
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/equal_spec.rb b/spec/ruby/library/delegate/delegator/equal_spec.rb
index c8711c74b5a..97aabebabe2 100644
--- a/spec/ruby/library/delegate/delegator/equal_spec.rb
+++ b/spec/ruby/library/delegate/delegator/equal_spec.rb
@@ -6,8 +6,8 @@
     obj = mock('base')
     delegator = DelegateSpecs::Delegator.new(obj)
     obj.should_not_receive(:equal?)
-    delegator.equal?(obj).should be_false
-    delegator.equal?(nil).should be_false
-    delegator.equal?(delegator).should be_true
+    delegator.equal?(obj).should == false
+    delegator.equal?(nil).should == false
+    delegator.equal?(delegator).should == true
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/equal_value_spec.rb b/spec/ruby/library/delegate/delegator/equal_value_spec.rb
index 0c967d5f944..d70aad1e03d 100644
--- a/spec/ruby/library/delegate/delegator/equal_value_spec.rb
+++ b/spec/ruby/library/delegate/delegator/equal_value_spec.rb
@@ -9,16 +9,16 @@
 
   it "is not delegated when passed self" do
     @base.should_not_receive(:==)
-    (@delegator == @delegator).should be_true
+    (@delegator == @delegator).should == true
   end
 
   it "is delegated when passed the delegated object" do
     @base.should_receive(:==).and_return(false)
-    (@delegator == @base).should be_false
+    (@delegator == @base).should == false
   end
 
   it "is delegated in general" do
     @base.should_receive(:==).and_return(true)
-    (@delegator == 42).should be_true
+    (@delegator == 42).should == true
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/frozen_spec.rb b/spec/ruby/library/delegate/delegator/frozen_spec.rb
index b3145c54b18..ad87dc8bdf5 100644
--- a/spec/ruby/library/delegate/delegator/frozen_spec.rb
+++ b/spec/ruby/library/delegate/delegator/frozen_spec.rb
@@ -10,30 +10,30 @@
 
   it "is still readable" do
     @delegate.should == [42, :hello]
-    @delegate.include?("bar").should be_false
+    @delegate.include?("bar").should == false
   end
 
   it "is frozen" do
-    @delegate.frozen?.should be_true
+    @delegate.frozen?.should == true
   end
 
   it "is not writable" do
-    ->{ @delegate[0] += 2 }.should raise_error( RuntimeError )
+    ->{ @delegate[0] += 2 }.should.raise( RuntimeError )
   end
 
   it "creates a frozen clone" do
-    @delegate.clone.frozen?.should be_true
+    @delegate.clone.frozen?.should == true
   end
 
   it "creates an unfrozen dup" do
-    @delegate.dup.frozen?.should be_false
+    @delegate.dup.frozen?.should == false
   end
 
   it "causes mutative calls to raise RuntimeError" do
-    ->{ @delegate.__setobj__("hola!") }.should raise_error( RuntimeError )
+    ->{ @delegate.__setobj__("hola!") }.should.raise( RuntimeError )
   end
 
   it "returns false if only the delegated object is frozen" do
-    DelegateSpecs::Delegator.new([1,2,3].freeze).frozen?.should be_false
+    DelegateSpecs::Delegator.new([1,2,3].freeze).frozen?.should == false
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/marshal_spec.rb b/spec/ruby/library/delegate/delegator/marshal_spec.rb
index 6c75c8f573c..2817ac7e0b8 100644
--- a/spec/ruby/library/delegate/delegator/marshal_spec.rb
+++ b/spec/ruby/library/delegate/delegator/marshal_spec.rb
@@ -10,7 +10,7 @@
   it "can be marshalled" do
     m = Marshal.load(Marshal.dump(@delegate))
     m.class.should == SimpleDelegator
-    (m == @obj).should be_true
+    (m == @obj).should == true
   end
 
   it "can be marshalled with its instance variables intact" do
diff --git a/spec/ruby/library/delegate/delegator/method_spec.rb b/spec/ruby/library/delegate/delegator/method_spec.rb
index 81c8eea710e..e41d3b4a532 100644
--- a/spec/ruby/library/delegate/delegator/method_spec.rb
+++ b/spec/ruby/library/delegate/delegator/method_spec.rb
@@ -9,7 +9,7 @@
 
   it "returns a method object for public methods of the delegate object" do
     m = @delegate.method(:pub)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     m.call.should == :foo
   end
 
@@ -18,7 +18,7 @@
       -> {
         @delegate.method(:prot)
       }.should complain(/delegator does not forward private method #prot/)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "raises a NameError for a private methods of the delegate object" do
@@ -26,36 +26,36 @@
       -> {
         @delegate.method(:priv)
       }.should complain(/delegator does not forward private method #priv/)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "returns a method object for public methods of the Delegator class" do
     m = @delegate.method(:extra)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     m.call.should == :cheese
   end
 
   it "returns a method object for protected methods of the Delegator class" do
     m = @delegate.method(:extra_protected)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     m.call.should == :baz
   end
 
   it "returns a method object for private methods of the Delegator class" do
     m = @delegate.method(:extra_private)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     m.call.should == :bar
   end
 
   it "raises a NameError for an invalid method name" do
     -> {
       @delegate.method(:invalid_and_silly_method_name)
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "returns a method that respond_to_missing?" do
     m = @delegate.method(:pub_too)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     m.call.should == :pub_too
   end
 
@@ -64,6 +64,6 @@
     @delegate.__setobj__([1,2,3])
     -> {
       m.call
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/methods_spec.rb b/spec/ruby/library/delegate/delegator/methods_spec.rb
index b9942bd230f..928f63f21d3 100644
--- a/spec/ruby/library/delegate/delegator/methods_spec.rb
+++ b/spec/ruby/library/delegate/delegator/methods_spec.rb
@@ -14,24 +14,24 @@ def singleton_method
   end
 
   it "returns singleton methods when passed false" do
-    @delegate.methods(false).should include(:singleton_method)
+    @delegate.methods(false).should.include?(:singleton_method)
   end
 
   it "includes all public methods of the delegate object" do
-    @methods.should include :pub
+    @methods.should.include? :pub
   end
 
   it "includes all protected methods of the delegate object" do
-    @methods.should include :prot
+    @methods.should.include? :prot
   end
 
   it "includes instance methods of the Delegator class" do
-    @methods.should include :extra
-    @methods.should include :extra_protected
+    @methods.should.include? :extra
+    @methods.should.include? :extra_protected
   end
 
   it "does not include private methods" do
-    @methods.should_not include :priv
-    @methods.should_not include :extra_private
+    @methods.should_not.include? :priv
+    @methods.should_not.include? :extra_private
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/not_equal_spec.rb b/spec/ruby/library/delegate/delegator/not_equal_spec.rb
index 6f2df217157..7fd234a6710 100644
--- a/spec/ruby/library/delegate/delegator/not_equal_spec.rb
+++ b/spec/ruby/library/delegate/delegator/not_equal_spec.rb
@@ -9,16 +9,16 @@
 
   it "is not delegated when passed self" do
     @base.should_not_receive(:"!=")
-    (@delegator != @delegator).should be_false
+    (@delegator != @delegator).should == false
   end
 
   it "is delegated when passed the delegated object" do
     @base.should_receive(:"!=").and_return(true)
-    (@delegator != @base).should be_true
+    (@delegator != @base).should == true
   end
 
   it "is delegated in general" do
     @base.should_receive(:"!=").and_return(false)
-    (@delegator != 42).should be_false
+    (@delegator != 42).should == false
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/private_methods_spec.rb b/spec/ruby/library/delegate/delegator/private_methods_spec.rb
index 7724b8d413c..5615ed06689 100644
--- a/spec/ruby/library/delegate/delegator/private_methods_spec.rb
+++ b/spec/ruby/library/delegate/delegator/private_methods_spec.rb
@@ -9,12 +9,12 @@
   end
 
   it "does not include any method of the delegate object" do # since delegates does not forward private calls
-    @methods.should_not include :priv
-    @methods.should_not include :prot
-    @methods.should_not include :pub
+    @methods.should_not.include? :priv
+    @methods.should_not.include? :prot
+    @methods.should_not.include? :pub
   end
 
   it "includes all private instance methods of the Delegate class" do
-    @methods.should include :extra_private
+    @methods.should.include? :extra_private
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/protected_methods_spec.rb b/spec/ruby/library/delegate/delegator/protected_methods_spec.rb
index fd7874fb213..3ee999fdac6 100644
--- a/spec/ruby/library/delegate/delegator/protected_methods_spec.rb
+++ b/spec/ruby/library/delegate/delegator/protected_methods_spec.rb
@@ -9,10 +9,10 @@
   end
 
   it "includes protected methods of the delegate object" do
-    @methods.should include :prot
+    @methods.should.include? :prot
   end
 
   it "includes protected instance methods of the Delegator class" do
-    @methods.should include :extra_protected
+    @methods.should.include? :extra_protected
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/public_methods_spec.rb b/spec/ruby/library/delegate/delegator/public_methods_spec.rb
index 18da16a613f..8cf6621e2dc 100644
--- a/spec/ruby/library/delegate/delegator/public_methods_spec.rb
+++ b/spec/ruby/library/delegate/delegator/public_methods_spec.rb
@@ -9,10 +9,10 @@
   end
 
   it "includes public methods of the delegate object" do
-    @methods.should include :pub
+    @methods.should.include? :pub
   end
 
   it "includes public instance methods of the Delegator class" do
-    @methods.should include :extra
+    @methods.should.include? :extra
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/send_spec.rb b/spec/ruby/library/delegate/delegator/send_spec.rb
index 3022c2ce91b..cc18a2794b6 100644
--- a/spec/ruby/library/delegate/delegator/send_spec.rb
+++ b/spec/ruby/library/delegate/delegator/send_spec.rb
@@ -12,15 +12,15 @@
   end
 
   it "forwards protected method calls" do
-    ->{ @delegate.prot }.should raise_error( NoMethodError )
+    ->{ @delegate.prot }.should.raise( NoMethodError )
   end
 
   it "doesn't forward private method calls" do
-    ->{ @delegate.priv }.should raise_error( NoMethodError )
+    ->{ @delegate.priv }.should.raise( NoMethodError )
   end
 
   it "doesn't forward private method calls even via send or __send__" do
-    ->{ @delegate.send(:priv, 42)     }.should raise_error( NoMethodError )
-    ->{ @delegate.__send__(:priv, 42) }.should raise_error( NoMethodError )
+    ->{ @delegate.send(:priv, 42)     }.should.raise( NoMethodError )
+    ->{ @delegate.__send__(:priv, 42) }.should.raise( NoMethodError )
   end
 end
diff --git a/spec/ruby/library/delegate/delegator/tap_spec.rb b/spec/ruby/library/delegate/delegator/tap_spec.rb
index 34a88fa1d57..916e4a37fe9 100644
--- a/spec/ruby/library/delegate/delegator/tap_spec.rb
+++ b/spec/ruby/library/delegate/delegator/tap_spec.rb
@@ -11,6 +11,6 @@
       yielded << x
     end
     yielded.size.should == 1
-    yielded[0].equal?(delegator).should be_true
+    yielded[0].equal?(delegator).should == true
   end
 end
diff --git a/spec/ruby/library/digest/bubblebabble_spec.rb b/spec/ruby/library/digest/bubblebabble_spec.rb
index bbc11ceec57..44a9bf0e266 100644
--- a/spec/ruby/library/digest/bubblebabble_spec.rb
+++ b/spec/ruby/library/digest/bubblebabble_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Digest.bubblebabble" do
   it "returns a String" do
-    Digest.bubblebabble('').should be_an_instance_of(String)
+    Digest.bubblebabble('').should.instance_of?(String)
   end
 
   it "returns a String in the Bubble Babble Binary Data Encoding format" do
@@ -20,10 +20,10 @@
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Digest.bubblebabble(nil) }.should raise_error(TypeError)
+    -> { Digest.bubblebabble(nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed an Integer" do
-    -> { Digest.bubblebabble(9001) }.should raise_error(TypeError)
+    -> { Digest.bubblebabble(9001) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/digest/hexencode_spec.rb b/spec/ruby/library/digest/hexencode_spec.rb
index 4b6db6eaff3..3359303d15b 100644
--- a/spec/ruby/library/digest/hexencode_spec.rb
+++ b/spec/ruby/library/digest/hexencode_spec.rb
@@ -22,10 +22,10 @@
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Digest.hexencode(nil) }.should raise_error(TypeError)
+    -> { Digest.hexencode(nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed an Integer" do
-    -> { Digest.hexencode(9001) }.should raise_error(TypeError)
+    -> { Digest.hexencode(9001) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/digest/instance/shared/update.rb b/spec/ruby/library/digest/instance/shared/update.rb
index 17779e54a48..e064a90087e 100644
--- a/spec/ruby/library/digest/instance/shared/update.rb
+++ b/spec/ruby/library/digest/instance/shared/update.rb
@@ -3,6 +3,6 @@
     c = Class.new do
       include Digest::Instance
     end
-    -> { c.new.send(@method, "test") }.should raise_error(RuntimeError)
+    -> { c.new.send(@method, "test") }.should.raise(RuntimeError)
   end
 end
diff --git a/spec/ruby/library/digest/md5/file_spec.rb b/spec/ruby/library/digest/md5/file_spec.rb
index 0c8d12cbc93..9a78a8c0559 100644
--- a/spec/ruby/library/digest/md5/file_spec.rb
+++ b/spec/ruby/library/digest/md5/file_spec.rb
@@ -15,7 +15,7 @@
     end
 
     it "returns a Digest::MD5 object" do
-      Digest::MD5.file(@file).should be_kind_of(Digest::MD5)
+      Digest::MD5.file(@file).should.is_a?(Digest::MD5)
     end
 
     it "returns a Digest::MD5 object with the correct digest" do
@@ -26,7 +26,7 @@
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(@file)
       result = Digest::MD5.file(obj)
-      result.should be_kind_of(Digest::MD5)
+      result.should.is_a?(Digest::MD5)
       result.digest.should == MD5Constants::Digest
     end
   end
@@ -34,10 +34,10 @@
   it_behaves_like :file_read_directory, :file, Digest::MD5
 
   it "raises a Errno::ENOENT when passed a path that does not exist" do
-    -> { Digest::MD5.file("") }.should raise_error(Errno::ENOENT)
+    -> { Digest::MD5.file("") }.should.raise(Errno::ENOENT)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Digest::MD5.file(nil) }.should raise_error(TypeError)
+    -> { Digest::MD5.file(nil) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/digest/sha1/file_spec.rb b/spec/ruby/library/digest/sha1/file_spec.rb
index 9c15f5b02f7..d36e560e210 100644
--- a/spec/ruby/library/digest/sha1/file_spec.rb
+++ b/spec/ruby/library/digest/sha1/file_spec.rb
@@ -15,7 +15,7 @@
     end
 
     it "returns a Digest::SHA1 object" do
-      Digest::SHA1.file(@file).should be_kind_of(Digest::SHA1)
+      Digest::SHA1.file(@file).should.is_a?(Digest::SHA1)
     end
 
     it "returns a Digest::SHA1 object with the correct digest" do
@@ -26,7 +26,7 @@
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(@file)
       result = Digest::SHA1.file(obj)
-      result.should be_kind_of(Digest::SHA1)
+      result.should.is_a?(Digest::SHA1)
       result.digest.should == SHA1Constants::Digest
     end
   end
@@ -34,10 +34,10 @@
   it_behaves_like :file_read_directory, :file, Digest::SHA1
 
   it "raises a Errno::ENOENT when passed a path that does not exist" do
-    -> { Digest::SHA1.file("") }.should raise_error(Errno::ENOENT)
+    -> { Digest::SHA1.file("") }.should.raise(Errno::ENOENT)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Digest::SHA1.file(nil) }.should raise_error(TypeError)
+    -> { Digest::SHA1.file(nil) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/digest/sha256/file_spec.rb b/spec/ruby/library/digest/sha256/file_spec.rb
index 8cbc5a27558..d67a9ebcd6b 100644
--- a/spec/ruby/library/digest/sha256/file_spec.rb
+++ b/spec/ruby/library/digest/sha256/file_spec.rb
@@ -15,7 +15,7 @@
     end
 
     it "returns a Digest::SHA256 object" do
-      Digest::SHA256.file(@file).should be_kind_of(Digest::SHA256)
+      Digest::SHA256.file(@file).should.is_a?(Digest::SHA256)
     end
 
     it "returns a Digest::SHA256 object with the correct digest" do
@@ -30,7 +30,7 @@
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(@file)
       result = Digest::SHA256.file(obj)
-      result.should be_kind_of(Digest::SHA256)
+      result.should.is_a?(Digest::SHA256)
       result.digest.should == SHA256Constants::Digest
     end
   end
@@ -38,10 +38,10 @@
   it_behaves_like :file_read_directory, :file, Digest::SHA256
 
   it "raises a Errno::ENOENT when passed a path that does not exist" do
-    -> { Digest::SHA256.file("") }.should raise_error(Errno::ENOENT)
+    -> { Digest::SHA256.file("") }.should.raise(Errno::ENOENT)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Digest::SHA256.file(nil) }.should raise_error(TypeError)
+    -> { Digest::SHA256.file(nil) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/digest/sha384/file_spec.rb b/spec/ruby/library/digest/sha384/file_spec.rb
index 8556f101752..3726ad44235 100644
--- a/spec/ruby/library/digest/sha384/file_spec.rb
+++ b/spec/ruby/library/digest/sha384/file_spec.rb
@@ -15,7 +15,7 @@
     end
 
     it "returns a Digest::SHA384 object" do
-      Digest::SHA384.file(@file).should be_kind_of(Digest::SHA384)
+      Digest::SHA384.file(@file).should.is_a?(Digest::SHA384)
     end
 
     it "returns a Digest::SHA384 object with the correct digest" do
@@ -26,7 +26,7 @@
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(@file)
       result = Digest::SHA384.file(obj)
-      result.should be_kind_of(Digest::SHA384)
+      result.should.is_a?(Digest::SHA384)
       result.digest.should == SHA384Constants::Digest
     end
   end
@@ -34,10 +34,10 @@
   it_behaves_like :file_read_directory, :file, Digest::SHA384
 
   it "raises a Errno::ENOENT when passed a path that does not exist" do
-    -> { Digest::SHA384.file("") }.should raise_error(Errno::ENOENT)
+    -> { Digest::SHA384.file("") }.should.raise(Errno::ENOENT)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Digest::SHA384.file(nil) }.should raise_error(TypeError)
+    -> { Digest::SHA384.file(nil) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/digest/sha512/file_spec.rb b/spec/ruby/library/digest/sha512/file_spec.rb
index 781ec781e50..78d6d3d4f31 100644
--- a/spec/ruby/library/digest/sha512/file_spec.rb
+++ b/spec/ruby/library/digest/sha512/file_spec.rb
@@ -15,7 +15,7 @@
     end
 
     it "returns a Digest::SHA512 object" do
-      Digest::SHA512.file(@file).should be_kind_of(Digest::SHA512)
+      Digest::SHA512.file(@file).should.is_a?(Digest::SHA512)
     end
 
     it "returns a Digest::SHA512 object with the correct digest" do
@@ -26,7 +26,7 @@
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(@file)
       result = Digest::SHA512.file(obj)
-      result.should be_kind_of(Digest::SHA512)
+      result.should.is_a?(Digest::SHA512)
       result.digest.should == SHA512Constants::Digest
     end
   end
@@ -34,10 +34,10 @@
   it_behaves_like :file_read_directory, :file, Digest::SHA512
 
   it "raises a Errno::ENOENT when passed a path that does not exist" do
-    -> { Digest::SHA512.file("") }.should raise_error(Errno::ENOENT)
+    -> { Digest::SHA512.file("") }.should.raise(Errno::ENOENT)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Digest::SHA512.file(nil) }.should raise_error(TypeError)
+    -> { Digest::SHA512.file(nil) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/erb/filename_spec.rb b/spec/ruby/library/erb/filename_spec.rb
index 8ecaed73436..bbd2233bb34 100644
--- a/spec/ruby/library/erb/filename_spec.rb
+++ b/spec/ruby/library/erb/filename_spec.rb
@@ -13,7 +13,7 @@
         @ex = e
         raise e
       end
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
     expected = filename
 
     @ex.message =~ /^(.*?):(\d+): /
@@ -30,7 +30,7 @@
         @ex = e
         raise e
       end
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
     expected = '(erb)'
 
     @ex.message =~ /^(.*?):(\d+): /
diff --git a/spec/ruby/library/erb/new_spec.rb b/spec/ruby/library/erb/new_spec.rb
index f8192bff992..35ac0dfdfe0 100644
--- a/spec/ruby/library/erb/new_spec.rb
+++ b/spec/ruby/library/erb/new_spec.rb
@@ -83,7 +83,7 @@
 
     -> {
       ERBSpecs.new_erb(input, trim_mode: '-').result
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 
   it "regards lines starting with '%' as '<% ... %>' when trim_mode is '%'" do
@@ -136,7 +136,7 @@
 
   it "forget local variables defined previous one" do
     ERB.new(@eruby_str).result
-    ->{ ERB.new("<%= list %>").result }.should raise_error(NameError)
+    ->{ ERB.new("<%= list %>").result }.should.raise(NameError)
   end
 
   version_is ERB.const_get(:VERSION, false), ""..."6.0.0" do
diff --git a/spec/ruby/library/erb/result_spec.rb b/spec/ruby/library/erb/result_spec.rb
index a29c1ccedbe..84333031ec1 100644
--- a/spec/ruby/library/erb/result_spec.rb
+++ b/spec/ruby/library/erb/result_spec.rb
@@ -43,7 +43,7 @@
     input = "<%=h '<>' %>"
     -> {
       ERB.new(input).result()
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
 
@@ -81,6 +81,6 @@ def main2
 
     -> {
       myerb2.new.main2()
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/library/erb/run_spec.rb b/spec/ruby/library/erb/run_spec.rb
index 602e53ab385..d81d5340872 100644
--- a/spec/ruby/library/erb/run_spec.rb
+++ b/spec/ruby/library/erb/run_spec.rb
@@ -54,7 +54,7 @@ def s.write(arg); self << arg.to_s; end
     input = "<%=h '<>' %>"
     -> {
       _steal_stdout { ERB.new(input).run() }
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 
   it "is able to h() or u() if ERB::Util is included" do
@@ -91,6 +91,6 @@ def main2
 
     -> {
       _steal_stdout { myerb2.new.main2() }
-    }.should raise_error(NameError)
+    }.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/library/etc/confstr_spec.rb b/spec/ruby/library/etc/confstr_spec.rb
index 5b434611505..786cb16407b 100644
--- a/spec/ruby/library/etc/confstr_spec.rb
+++ b/spec/ruby/library/etc/confstr_spec.rb
@@ -4,11 +4,11 @@
 platform_is_not :windows, :android do
   describe "Etc.confstr" do
     it "returns a String for Etc::CS_PATH" do
-      Etc.confstr(Etc::CS_PATH).should be_an_instance_of(String)
+      Etc.confstr(Etc::CS_PATH).should.instance_of?(String)
     end
 
     it "raises Errno::EINVAL for unknown configuration variables" do
-      -> { Etc.confstr(-1) }.should raise_error(Errno::EINVAL)
+      -> { Etc.confstr(-1) }.should.raise(Errno::EINVAL)
     end
   end
 end
diff --git a/spec/ruby/library/etc/getgrgid_spec.rb b/spec/ruby/library/etc/getgrgid_spec.rb
index 14da5e041d3..472d4c82c8c 100644
--- a/spec/ruby/library/etc/getgrgid_spec.rb
+++ b/spec/ruby/library/etc/getgrgid_spec.rb
@@ -34,7 +34,7 @@
 
       it "returns the Etc::Group for a given gid if it exists" do
         grp = Etc.getgrgid(@gid)
-        grp.should be_kind_of(Etc::Group)
+        grp.should.is_a?(Etc::Group)
         grp.gid.should == @gid
         grp.name.should == @name
       end
@@ -47,12 +47,12 @@
       end
 
       it "raises if the group does not exist" do
-        -> { Etc.getgrgid(9876)}.should raise_error(ArgumentError)
+        -> { Etc.getgrgid(9876)}.should.raise(ArgumentError)
       end
 
       it "raises a TypeError if not passed an Integer" do
-        -> { Etc.getgrgid("foo") }.should raise_error(TypeError)
-        -> { Etc.getgrgid(nil)   }.should raise_error(TypeError)
+        -> { Etc.getgrgid("foo") }.should.raise(TypeError)
+        -> { Etc.getgrgid(nil)   }.should.raise(TypeError)
       end
 
       it "can be called safely by multiple threads" do
diff --git a/spec/ruby/library/etc/getgrnam_spec.rb b/spec/ruby/library/etc/getgrnam_spec.rb
index fa49f15349b..325ea7b2973 100644
--- a/spec/ruby/library/etc/getgrnam_spec.rb
+++ b/spec/ruby/library/etc/getgrnam_spec.rb
@@ -24,7 +24,7 @@
       -> {
         Etc.getgrnam(123)
         Etc.getgrnam(nil)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/etc/getlogin_spec.rb b/spec/ruby/library/etc/getlogin_spec.rb
index 7a4fd79ae20..2bc598c0af2 100644
--- a/spec/ruby/library/etc/getlogin_spec.rb
+++ b/spec/ruby/library/etc/getlogin_spec.rb
@@ -14,7 +14,7 @@
         if ENV['TRAVIS'] and platform_is(:darwin)
           # See https://travis-ci.org/ruby/spec/jobs/285967744
           # and https://travis-ci.org/ruby/spec/jobs/285999602
-          Etc.getlogin.should be_an_instance_of(String)
+          Etc.getlogin.should.instance_of?(String)
         else
           # Etc.getlogin returns the same result of logname(2)
           # if it returns non NULL
@@ -28,7 +28,7 @@
       else
         # Etc.getlogin may return nil if the login name is not set
         # because of chroot or sudo or something.
-        Etc.getlogin.should be_nil
+        Etc.getlogin.should == nil
         getlogin_null = true
       end
     ensure
diff --git a/spec/ruby/library/etc/getpwnam_spec.rb b/spec/ruby/library/etc/getpwnam_spec.rb
index 3f4416aa9d2..a0b3c9e1fe6 100644
--- a/spec/ruby/library/etc/getpwnam_spec.rb
+++ b/spec/ruby/library/etc/getpwnam_spec.rb
@@ -22,7 +22,7 @@
       -> {
         Etc.getpwnam(123)
         Etc.getpwnam(nil)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/etc/getpwuid_spec.rb b/spec/ruby/library/etc/getpwuid_spec.rb
index 5b98f0f8d9b..3e35dfe6d54 100644
--- a/spec/ruby/library/etc/getpwuid_spec.rb
+++ b/spec/ruby/library/etc/getpwuid_spec.rb
@@ -30,7 +30,7 @@
       -> {
         Etc.getpwuid("foo")
         Etc.getpwuid(nil)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/etc/group_spec.rb b/spec/ruby/library/etc/group_spec.rb
index fda808eec9e..d7addbbec16 100644
--- a/spec/ruby/library/etc/group_spec.rb
+++ b/spec/ruby/library/etc/group_spec.rb
@@ -9,7 +9,7 @@
     it "returns a Etc::Group struct" do
       group = Etc.group
       begin
-        group.should be_an_instance_of(Etc::Group)
+        group.should.instance_of?(Etc::Group)
       ensure
         Etc.endgrent
       end
@@ -21,7 +21,7 @@
           Etc.group do | group2 |
           end
         end
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
   end
 end
diff --git a/spec/ruby/library/etc/nprocessors_spec.rb b/spec/ruby/library/etc/nprocessors_spec.rb
index ec7ffc81da8..482719dde09 100644
--- a/spec/ruby/library/etc/nprocessors_spec.rb
+++ b/spec/ruby/library/etc/nprocessors_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Etc.nprocessors" do
   it "returns the number of online processors" do
-    Etc.nprocessors.should be_kind_of(Integer)
+    Etc.nprocessors.should.is_a?(Integer)
     Etc.nprocessors.should >= 1
   end
 end
diff --git a/spec/ruby/library/etc/passwd_spec.rb b/spec/ruby/library/etc/passwd_spec.rb
index 7157fd3f2e0..0602b7e10bf 100644
--- a/spec/ruby/library/etc/passwd_spec.rb
+++ b/spec/ruby/library/etc/passwd_spec.rb
@@ -6,7 +6,7 @@
     it "returns a Etc::Passwd struct" do
       passwd = Etc.passwd
       begin
-        passwd.should be_an_instance_of(Etc::Passwd)
+        passwd.should.instance_of?(Etc::Passwd)
       ensure
         Etc.endpwent
       end
diff --git a/spec/ruby/library/etc/sysconf_spec.rb b/spec/ruby/library/etc/sysconf_spec.rb
index 1f2c7a770ff..81ce1ca2580 100644
--- a/spec/ruby/library/etc/sysconf_spec.rb
+++ b/spec/ruby/library/etc/sysconf_spec.rb
@@ -14,7 +14,7 @@
         if value.nil?
           value.should == nil
         else
-          value.should be_kind_of(Integer)
+          value.should.is_a?(Integer)
         end
       end
     end
diff --git a/spec/ruby/library/etc/sysconfdir_spec.rb b/spec/ruby/library/etc/sysconfdir_spec.rb
index 8538faa65b2..eb2d6b649ab 100644
--- a/spec/ruby/library/etc/sysconfdir_spec.rb
+++ b/spec/ruby/library/etc/sysconfdir_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Etc.sysconfdir" do
   it "returns a String" do
-    Etc.sysconfdir.should be_an_instance_of(String)
+    Etc.sysconfdir.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/library/etc/systmpdir_spec.rb b/spec/ruby/library/etc/systmpdir_spec.rb
index 5b007aa9f9f..ed34cb43fc7 100644
--- a/spec/ruby/library/etc/systmpdir_spec.rb
+++ b/spec/ruby/library/etc/systmpdir_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Etc.systmpdir" do
   it "returns a String" do
-    Etc.systmpdir.should be_an_instance_of(String)
+    Etc.systmpdir.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/library/etc/uname_spec.rb b/spec/ruby/library/etc/uname_spec.rb
index a42558f5932..1c5fe2a741b 100644
--- a/spec/ruby/library/etc/uname_spec.rb
+++ b/spec/ruby/library/etc/uname_spec.rb
@@ -4,7 +4,7 @@
 describe "Etc.uname" do
   it "returns a Hash with the documented keys" do
     uname = Etc.uname
-    uname.should be_kind_of(Hash)
+    uname.should.is_a?(Hash)
     uname.should.key?(:sysname)
     uname.should.key?(:nodename)
     uname.should.key?(:release)
diff --git a/spec/ruby/library/expect/expect_spec.rb b/spec/ruby/library/expect/expect_spec.rb
index 76ea3d54513..ba705c55355 100644
--- a/spec/ruby/library/expect/expect_spec.rb
+++ b/spec/ruby/library/expect/expect_spec.rb
@@ -40,14 +40,14 @@
 
       -> {
         @read.expect("hello")
-      }.should raise_error(IOError)
+      }.should.raise(IOError)
     end
 
     it "returns nil if eof is hit" do
       @write << "pro"
       @write.close
 
-      @read.expect("prompt").should be_nil
+      @read.expect("prompt").should == nil
     end
 
     it "yields the result if a block is given" do
diff --git a/spec/ruby/library/fiddle/handle/initialize_spec.rb b/spec/ruby/library/fiddle/handle/initialize_spec.rb
index 51c2470efdf..84c809a7271 100644
--- a/spec/ruby/library/fiddle/handle/initialize_spec.rb
+++ b/spec/ruby/library/fiddle/handle/initialize_spec.rb
@@ -5,6 +5,6 @@
   it "raises Fiddle::DLError if the library cannot be found" do
     -> {
       Fiddle::Handle.new("doesnotexist.doesnotexist")
-    }.should raise_error(Fiddle::DLError)
+    }.should.raise(Fiddle::DLError)
   end
 end
diff --git a/spec/ruby/library/find/find_spec.rb b/spec/ruby/library/find/find_spec.rb
index 7cd76fa01b5..c4ccfa76fd1 100644
--- a/spec/ruby/library/find/find_spec.rb
+++ b/spec/ruby/library/find/find_spec.rb
@@ -13,7 +13,7 @@
 
   describe "when called without a block" do
     it "returns an Enumerator" do
-      Find.find(FindDirSpecs.mock_dir).should be_an_instance_of(Enumerator)
+      Find.find(FindDirSpecs.mock_dir).should.instance_of?(Enumerator)
       Find.find(FindDirSpecs.mock_dir).to_a.sort.should == FindDirSpecs.expected_paths
     end
   end
diff --git a/spec/ruby/library/getoptlong/error_message_spec.rb b/spec/ruby/library/getoptlong/error_message_spec.rb
index 1ed9419f6cc..10435b13505 100644
--- a/spec/ruby/library/getoptlong/error_message_spec.rb
+++ b/spec/ruby/library/getoptlong/error_message_spec.rb
@@ -14,7 +14,7 @@
       opts.get
       -> {
         opts.ordering = GetoptLong::PERMUTE
-      }.should raise_error(ArgumentError) { |e|
+      }.should.raise(ArgumentError) { |e|
         e.message.should == "argument error"
         opts.error_message.should == "argument error"
       }
diff --git a/spec/ruby/library/getoptlong/ordering_spec.rb b/spec/ruby/library/getoptlong/ordering_spec.rb
index 695d1cafa75..60ce73afaa0 100644
--- a/spec/ruby/library/getoptlong/ordering_spec.rb
+++ b/spec/ruby/library/getoptlong/ordering_spec.rb
@@ -11,7 +11,7 @@
 
       -> {
         opts.ordering = GetoptLong::PERMUTE
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -20,7 +20,7 @@
 
     -> {
       opts.ordering = 12345
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "does not allow changing ordering to PERMUTE if ENV['POSIXLY_CORRECT'] is set" do
diff --git a/spec/ruby/library/getoptlong/set_options_spec.rb b/spec/ruby/library/getoptlong/set_options_spec.rb
index 36b9c579c41..f60dcc87a39 100644
--- a/spec/ruby/library/getoptlong/set_options_spec.rb
+++ b/spec/ruby/library/getoptlong/set_options_spec.rb
@@ -41,7 +41,7 @@
     argv [] do
       -> {
         @opts.set_options(["--size", GetoptLong::NO_ARGUMENT, GetoptLong::REQUIRED_ARGUMENT])
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -50,7 +50,7 @@
       @opts.get
       -> {
         @opts.set_options()
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
   end
 
@@ -58,7 +58,7 @@
     argv [] do
       -> {
         @opts.set_options(["--size"])
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -68,7 +68,7 @@
         @opts.set_options(
           ["--size", GetoptLong::REQUIRED_ARGUMENT],
           "test")
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -78,13 +78,13 @@
         @opts.set_options(
           ["--size", GetoptLong::NO_ARGUMENT],
           ["--size", GetoptLong::OPTIONAL_ARGUMENT])
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
 
       -> {
         @opts.set_options(
           ["--size", GetoptLong::NO_ARGUMENT],
           ["-s", "--size", GetoptLong::OPTIONAL_ARGUMENT])
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -92,7 +92,7 @@
     argv [] do
       -> {
         @opts.set_options(["-size", GetoptLong::NO_ARGUMENT])
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/library/getoptlong/shared/get.rb b/spec/ruby/library/getoptlong/shared/get.rb
index f44cf583d25..8d24c4c2552 100644
--- a/spec/ruby/library/getoptlong/shared/get.rb
+++ b/spec/ruby/library/getoptlong/shared/get.rb
@@ -49,7 +49,7 @@
 
   it "raises a if an argument was required, but none given" do
     argv [ "--size" ] do
-      -> { @opts.send(@method) }.should raise_error(GetoptLong::MissingArgument)
+      -> { @opts.send(@method) }.should.raise(GetoptLong::MissingArgument)
     end
   end
 
diff --git a/spec/ruby/library/io-wait/wait_spec.rb b/spec/ruby/library/io-wait/wait_spec.rb
index 6a3890a401a..1d784e7aa4f 100644
--- a/spec/ruby/library/io-wait/wait_spec.rb
+++ b/spec/ruby/library/io-wait/wait_spec.rb
@@ -56,12 +56,12 @@
 
     it "raises IOError when io is closed (closed stream (IOError))" do
       @io.close
-      -> { @io.wait(IO::READABLE, 0) }.should raise_error(IOError, "closed stream")
+      -> { @io.wait(IO::READABLE, 0) }.should.raise(IOError, "closed stream")
     end
 
     it "raises ArgumentError when events is not positive" do
-      -> { @w.wait(0, 0) }.should raise_error(ArgumentError, "Events must be positive integer!")
-      -> { @w.wait(-1, 0) }.should raise_error(ArgumentError, "Events must be positive integer!")
+      -> { @w.wait(0, 0) }.should.raise(ArgumentError, "Events must be positive integer!")
+      -> { @w.wait(-1, 0) }.should.raise(ArgumentError, "Events must be positive integer!")
     end
 
     it "changes thread status to 'sleep' when waits for READABLE event" do
@@ -147,16 +147,16 @@
     end
 
     it "raises ArgumentError when passed wrong Symbol value as mode argument" do
-      -> { @io.wait(0, :wrong) }.should raise_error(ArgumentError, "unsupported mode: wrong")
+      -> { @io.wait(0, :wrong) }.should.raise(ArgumentError, "unsupported mode: wrong")
     end
 
     it "raises ArgumentError when several Integer arguments passed" do
-      -> { @w.wait(0, 10, :r) }.should raise_error(ArgumentError, "timeout given more than once")
+      -> { @w.wait(0, 10, :r) }.should.raise(ArgumentError, "timeout given more than once")
     end
 
     it "raises IOError when io is closed (closed stream (IOError))" do
       @io.close
-      -> { @io.wait(0, :r) }.should raise_error(IOError, "closed stream")
+      -> { @io.wait(0, :r) }.should.raise(IOError, "closed stream")
     end
   end
 end
diff --git a/spec/ruby/library/ipaddr/new_spec.rb b/spec/ruby/library/ipaddr/new_spec.rb
index 2c0f44acf2e..7fba2b372ea 100644
--- a/spec/ruby/library/ipaddr/new_spec.rb
+++ b/spec/ruby/library/ipaddr/new_spec.rb
@@ -3,9 +3,9 @@
 
 describe "IPAddr#new" do
   it "initializes IPAddr" do
-    ->{ IPAddr.new("3FFE:505:ffff::/48") }.should_not raise_error
-    ->{ IPAddr.new("0:0:0:1::")          }.should_not raise_error
-    ->{ IPAddr.new("2001:200:300::/48")  }.should_not raise_error
+    ->{ IPAddr.new("3FFE:505:ffff::/48") }.should_not.raise
+    ->{ IPAddr.new("0:0:0:1::")          }.should_not.raise
+    ->{ IPAddr.new("2001:200:300::/48")  }.should_not.raise
   end
 
   it "initializes IPAddr ipv6 address with short notation" do
@@ -86,7 +86,7 @@
     ].each { |args|
       ->{
         IPAddr.new(*args)
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     }
   end
 end
diff --git a/spec/ruby/library/ipaddr/operator_spec.rb b/spec/ruby/library/ipaddr/operator_spec.rb
index f90c56009cf..3337d223009 100644
--- a/spec/ruby/library/ipaddr/operator_spec.rb
+++ b/spec/ruby/library/ipaddr/operator_spec.rb
@@ -66,17 +66,17 @@
   end
 
   it "checks whether an address is included in a range" do
-    @a.should include(IPAddr.new("3ffe:505:2::"))
-    @a.should include(IPAddr.new("3ffe:505:2::1"))
-    @a.should_not include(IPAddr.new("3ffe:505:3::"))
+    @a.should.include?(IPAddr.new("3ffe:505:2::"))
+    @a.should.include?(IPAddr.new("3ffe:505:2::1"))
+    @a.should_not.include?(IPAddr.new("3ffe:505:3::"))
     net1 = IPAddr.new("192.168.2.0/24")
-    net1.should include(IPAddr.new("192.168.2.0"))
-    net1.should include(IPAddr.new("192.168.2.255"))
-    net1.should_not include(IPAddr.new("192.168.3.0"))
+    net1.should.include?(IPAddr.new("192.168.2.0"))
+    net1.should.include?(IPAddr.new("192.168.2.255"))
+    net1.should_not.include?(IPAddr.new("192.168.3.0"))
     # test with integer parameter
     int = (192 << 24) + (168 << 16) + (2 << 8) + 13
 
-    net1.should include(int)
-    net1.should_not include(int+255)
+    net1.should.include?(int)
+    net1.should_not.include?(int+255)
   end
 end
diff --git a/spec/ruby/library/ipaddr/reverse_spec.rb b/spec/ruby/library/ipaddr/reverse_spec.rb
index 6ebb3432698..9bda60ca709 100644
--- a/spec/ruby/library/ipaddr/reverse_spec.rb
+++ b/spec/ruby/library/ipaddr/reverse_spec.rb
@@ -13,7 +13,7 @@
     IPAddr.new("3ffe:505:2::f").ip6_arpa.should == "f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.arpa"
     ->{
       IPAddr.new("192.168.2.1").ip6_arpa
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
 
@@ -22,6 +22,6 @@
     IPAddr.new("3ffe:505:2::f").ip6_int.should == "f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.int"
     ->{
       IPAddr.new("192.168.2.1").ip6_int
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/logger/device/new_spec.rb b/spec/ruby/library/logger/device/new_spec.rb
index 26a38c2b8ce..c943e7fbe27 100644
--- a/spec/ruby/library/logger/device/new_spec.rb
+++ b/spec/ruby/library/logger/device/new_spec.rb
@@ -14,11 +14,11 @@
 
   it "creates a new log device" do
     l = Logger::LogDevice.new(@log_file)
-    l.dev.should be_kind_of(File)
+    l.dev.should.is_a?(File)
   end
 
   it "receives an IO object to log there as first argument" do
-    @log_file.should be_kind_of(IO)
+    @log_file.should.is_a?(IO)
     l = Logger::LogDevice.new(@log_file)
     l.write("foo")
     @log_file.rewind
@@ -33,7 +33,7 @@
 
     File.should.exist?(path)
     File.open(path) do |f|
-      f.readlines.should_not be_empty
+      f.readlines.should_not.empty?
     end
 
     rm_r path
@@ -42,6 +42,6 @@
   it "receives options via a hash as second argument" do
     -> {
       Logger::LogDevice.new(STDERR, shift_age: 8, shift_size: 10)
-    }.should_not raise_error
+    }.should_not.raise
   end
 end
diff --git a/spec/ruby/library/logger/logger/add_spec.rb b/spec/ruby/library/logger/logger/add_spec.rb
index 3f709e18ba2..98ac88f64fa 100644
--- a/spec/ruby/library/logger/logger/add_spec.rb
+++ b/spec/ruby/library/logger/logger/add_spec.rb
@@ -56,7 +56,7 @@
       @logger.log(nil, "test", "TestApp") do
         1+1
       end
-    }.should_not raise_error
+    }.should_not.raise
   end
 
   it "calls the block if message is nil" do
@@ -65,7 +65,7 @@
       @logger.log(nil, nil, "TestApp") do
         temp = 1+1
       end
-    }.should_not raise_error
+    }.should_not.raise
     temp.should == 2
   end
 
@@ -75,7 +75,7 @@
       @logger.log(nil, "not nil", "TestApp") do
         temp = 1+1
       end
-    }.should_not raise_error
+    }.should_not.raise
     temp.should == 0
   end
 end
diff --git a/spec/ruby/library/logger/logger/datetime_format_spec.rb b/spec/ruby/library/logger/logger/datetime_format_spec.rb
index 582b34bfdaf..75a7f6cc037 100644
--- a/spec/ruby/library/logger/logger/datetime_format_spec.rb
+++ b/spec/ruby/library/logger/logger/datetime_format_spec.rb
@@ -49,7 +49,7 @@
   end
 
   it "follows the Time#strftime format" do
-    -> { @logger.datetime_format = "%Y-%m" }.should_not raise_error
+    -> { @logger.datetime_format = "%Y-%m" }.should_not.raise
 
     regex = /\d{4}-\d{2}-\d{2}oo-\w+ar/
     @logger.datetime_format = "%Foo-%Bar"
diff --git a/spec/ruby/library/logger/logger/new_spec.rb b/spec/ruby/library/logger/logger/new_spec.rb
index 3db20e74323..b311c961321 100644
--- a/spec/ruby/library/logger/logger/new_spec.rb
+++ b/spec/ruby/library/logger/logger/new_spec.rb
@@ -28,13 +28,13 @@
   end
 
   it "receives a frequency rotation as second argument" do
-    -> { Logger.new(@log_file, "daily") }.should_not raise_error
-    -> { Logger.new(@log_file, "weekly") }.should_not raise_error
-    -> { Logger.new(@log_file, "monthly") }.should_not raise_error
+    -> { Logger.new(@log_file, "daily") }.should_not.raise
+    -> { Logger.new(@log_file, "weekly") }.should_not.raise
+    -> { Logger.new(@log_file, "monthly") }.should_not.raise
   end
 
   it "also receives a number of log files to keep as second argument" do
-    -> { Logger.new(@log_file, 1).close }.should_not raise_error
+    -> { Logger.new(@log_file, 1).close }.should_not.raise
   end
 
   it "receives a maximum logfile size as third argument" do
@@ -94,7 +94,7 @@ def call(_severity, _time, _progname, _msg); end
     logger.formatter.should == formatter
   end
 
-  it "receives shift_period_suffix " do
+  it "receives shift_period_suffix" do
     shift_period_suffix = "%Y-%m-%d"
     path                = tmp("shift_period_suffix_test.log")
     now                 = Time.now
diff --git a/spec/ruby/library/logger/logger/unknown_spec.rb b/spec/ruby/library/logger/logger/unknown_spec.rb
index b174b8b2c93..4d37c9797ec 100644
--- a/spec/ruby/library/logger/logger/unknown_spec.rb
+++ b/spec/ruby/library/logger/logger/unknown_spec.rb
@@ -29,7 +29,7 @@
   end
 
   it "receives empty messages" do
-    -> { @logger.unknown("") }.should_not raise_error
+    -> { @logger.unknown("") }.should_not.raise
     @log_file.rewind
     LoggerSpecs.strip_date(@log_file.readlines.first).should ==  "ANY -- : \n"
   end
diff --git a/spec/ruby/library/matrix/antisymmetric_spec.rb b/spec/ruby/library/matrix/antisymmetric_spec.rb
index 200df703cb8..b4b8858f32a 100644
--- a/spec/ruby/library/matrix/antisymmetric_spec.rb
+++ b/spec/ruby/library/matrix/antisymmetric_spec.rb
@@ -4,11 +4,11 @@
 
 describe "Matrix#antisymmetric?" do
   it "returns true for an antisymmetric Matrix" do
-    Matrix[[0, -2, Complex(1, 3)], [2, 0, 5], [-Complex(1, 3), -5, 0]].antisymmetric?.should be_true
+    Matrix[[0, -2, Complex(1, 3)], [2, 0, 5], [-Complex(1, 3), -5, 0]].antisymmetric?.should == true
   end
 
   it "returns true for a 0x0 empty matrix" do
-    Matrix.empty.antisymmetric?.should be_true
+    Matrix.empty.antisymmetric?.should == true
   end
 
   it "returns false for non-antisymmetric matrices" do
@@ -17,7 +17,7 @@
       Matrix[[1, -2, 3], [2, 0, 6], [-3, -6, 0]],  # wrong diagonal element
       Matrix[[0, 2, -3], [2, 0, 6], [-3, 6, 0]]    # only signs wrong
     ].each do |matrix|
-      matrix.antisymmetric?.should be_false
+      matrix.antisymmetric?.should == false
     end
   end
 
@@ -30,7 +30,7 @@
     ].each do |rectangular_matrix|
       -> {
         rectangular_matrix.antisymmetric?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/build_spec.rb b/spec/ruby/library/matrix/build_spec.rb
index 6d8017a3dfd..49eb2e69a54 100644
--- a/spec/ruby/library/matrix/build_spec.rb
+++ b/spec/ruby/library/matrix/build_spec.rb
@@ -6,7 +6,7 @@
 
   it "returns a Matrix object of the given size" do
     m = Matrix.build(3, 4){1}
-    m.should be_an_instance_of(Matrix)
+    m.should.instance_of?(Matrix)
     m.row_size.should == 3
     m.column_size.should == 4
   end
@@ -24,32 +24,32 @@
 
   it "returns an Enumerator is no block is given" do
     enum = Matrix.build(2, 1)
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.each{1}.should == Matrix[[1], [1]]
   end
 
   it "requires integers as parameters" do
-    -> { Matrix.build("1", "2"){1} }.should raise_error(TypeError)
-    -> { Matrix.build(nil, nil){1} }.should raise_error(TypeError)
-    -> { Matrix.build(1..2){1} }.should raise_error(TypeError)
+    -> { Matrix.build("1", "2"){1} }.should.raise(TypeError)
+    -> { Matrix.build(nil, nil){1} }.should.raise(TypeError)
+    -> { Matrix.build(1..2){1} }.should.raise(TypeError)
   end
 
   it "requires non-negative integers" do
-    -> { Matrix.build(-1, 1){1} }.should raise_error(ArgumentError)
-    -> { Matrix.build(+1,-1){1} }.should raise_error(ArgumentError)
+    -> { Matrix.build(-1, 1){1} }.should.raise(ArgumentError)
+    -> { Matrix.build(+1,-1){1} }.should.raise(ArgumentError)
   end
 
   it "returns empty Matrix if one argument is zero" do
     m = Matrix.build(0, 3){
       raise "Should not yield"
     }
-    m.should be_empty
+    m.should.empty?
     m.column_size.should == 3
 
     m = Matrix.build(3, 0){
       raise "Should not yield"
     }
-    m.should be_empty
+    m.should.empty?
     m.row_size.should == 3
   end
 
@@ -68,6 +68,6 @@
 
 describe "for a subclass of Matrix" do
   it "returns an instance of that subclass" do
-    MatrixSub.build(3){1}.should be_an_instance_of(MatrixSub)
+    MatrixSub.build(3){1}.should.instance_of?(MatrixSub)
   end
 end
diff --git a/spec/ruby/library/matrix/clone_spec.rb b/spec/ruby/library/matrix/clone_spec.rb
index 74e5bf157e7..51aefc6010b 100644
--- a/spec/ruby/library/matrix/clone_spec.rb
+++ b/spec/ruby/library/matrix/clone_spec.rb
@@ -9,17 +9,17 @@
 
   it "returns a shallow copy of the matrix" do
     b = @a.clone
-    @a.should_not equal(b)
-    b.should be_kind_of(Matrix)
+    @a.should_not.equal?(b)
+    b.should.is_a?(Matrix)
     b.should == @a
     0.upto(@a.row_size - 1) do |i|
-      @a.row(i).should_not equal(b.row(i))
+      @a.row(i).should_not.equal?(b.row(i))
     end
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.clone.should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.clone.should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/coerce_spec.rb b/spec/ruby/library/matrix/coerce_spec.rb
index 4022f00236a..6032dd2f62f 100644
--- a/spec/ruby/library/matrix/coerce_spec.rb
+++ b/spec/ruby/library/matrix/coerce_spec.rb
@@ -2,7 +2,7 @@
 require 'matrix'
 
 describe "Matrix#coerce" do
-  it "allows the division of integer by a Matrix " do
+  it "allows the division of integer by a Matrix" do
     (1/Matrix[[0,1],[-1,0]]).should == Matrix[[0,-1],[1,0]]
   end
 end
diff --git a/spec/ruby/library/matrix/column_spec.rb b/spec/ruby/library/matrix/column_spec.rb
index 1f3c80964a6..d5d8c80c1a9 100644
--- a/spec/ruby/library/matrix/column_spec.rb
+++ b/spec/ruby/library/matrix/column_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "returns self when called with a block" do
-    @m.column(0) { |x| x }.should equal(@m)
+    @m.column(0) { |x| x }.should.equal?(@m)
   end
 
   it "returns nil when out of bounds" do
@@ -29,7 +29,7 @@
   end
 
   it "never yields when out of bounds" do
-    -> { @m.column(3){ raise } }.should_not raise_error
-    -> { @m.column(-4){ raise } }.should_not raise_error
+    -> { @m.column(3){ raise } }.should_not.raise
+    -> { @m.column(-4){ raise } }.should_not.raise
   end
 end
diff --git a/spec/ruby/library/matrix/column_vector_spec.rb b/spec/ruby/library/matrix/column_vector_spec.rb
index 47e866a8d55..d86c3f9e42b 100644
--- a/spec/ruby/library/matrix/column_vector_spec.rb
+++ b/spec/ruby/library/matrix/column_vector_spec.rb
@@ -6,20 +6,20 @@
 
   it "returns a single column Matrix when called with an Array" do
     m = Matrix.column_vector([4,5,6])
-    m.should be_an_instance_of(Matrix)
+    m.should.instance_of?(Matrix)
     m.should == Matrix[ [4],[5],[6] ]
   end
 
   it "returns an empty Matrix when called with an empty Array" do
     m = Matrix.column_vector([])
-    m.should be_an_instance_of(Matrix)
+    m.should.instance_of?(Matrix)
     m.row_size.should == 0
     m.column_size.should == 1
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.column_vector([4,5,6]).should be_an_instance_of(MatrixSub)
+      MatrixSub.column_vector([4,5,6]).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/column_vectors_spec.rb b/spec/ruby/library/matrix/column_vectors_spec.rb
index b0cb6f914cc..7ac6871e7f1 100644
--- a/spec/ruby/library/matrix/column_vectors_spec.rb
+++ b/spec/ruby/library/matrix/column_vectors_spec.rb
@@ -8,11 +8,11 @@
   end
 
   it "returns an Array" do
-    Matrix[ [1,2], [3,4] ].column_vectors.should be_an_instance_of(Array)
+    Matrix[ [1,2], [3,4] ].column_vectors.should.instance_of?(Array)
   end
 
   it "returns an Array of Vectors" do
-    @vectors.all? {|v| v.should be_an_instance_of(Vector)}
+    @vectors.all? {|v| v.should.instance_of?(Vector)}
   end
 
   it "returns each column as a Vector" do
diff --git a/spec/ruby/library/matrix/columns_spec.rb b/spec/ruby/library/matrix/columns_spec.rb
index 3095fdd7afb..ac9587899dd 100644
--- a/spec/ruby/library/matrix/columns_spec.rb
+++ b/spec/ruby/library/matrix/columns_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "creates a Matrix from argument columns" do
-    @m.should be_an_instance_of(Matrix)
+    @m.should.instance_of?(Matrix)
     @m.column(0).to_a.should == @a
     @m.column(1).to_a.should == @b
   end
@@ -36,7 +36,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.columns([[1]]).should be_an_instance_of(MatrixSub)
+      MatrixSub.columns([[1]]).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/constructor_spec.rb b/spec/ruby/library/matrix/constructor_spec.rb
index 70d77babbb9..026525f36da 100644
--- a/spec/ruby/library/matrix/constructor_spec.rb
+++ b/spec/ruby/library/matrix/constructor_spec.rb
@@ -5,10 +5,10 @@
 describe "Matrix.[]" do
 
   it "requires arrays as parameters" do
-    -> { Matrix[5] }.should raise_error(TypeError)
-    -> { Matrix[nil] }.should raise_error(TypeError)
-    -> { Matrix[1..2] }.should raise_error(TypeError)
-    -> { Matrix[[1, 2], 3] }.should raise_error(TypeError)
+    -> { Matrix[5] }.should.raise(TypeError)
+    -> { Matrix[nil] }.should.raise(TypeError)
+    -> { Matrix[1..2] }.should.raise(TypeError)
+    -> { Matrix[[1, 2], 3] }.should.raise(TypeError)
   end
 
   it "creates an empty Matrix with no arguments" do
@@ -18,15 +18,13 @@
   end
 
   it "raises for non-rectangular matrices" do
-    ->{ Matrix[ [0], [0,1] ] }.should \
-      raise_error(Matrix::ErrDimensionMismatch)
-    ->{ Matrix[ [0,1], [0,1,2], [0,1] ]}.should \
-      raise_error(Matrix::ErrDimensionMismatch)
+    ->{ Matrix[ [0], [0,1] ] }.should.raise(Matrix::ErrDimensionMismatch)
+    ->{ Matrix[ [0,1], [0,1,2], [0,1] ]}.should.raise(Matrix::ErrDimensionMismatch)
   end
 
   it "accepts vector arguments" do
     a = Matrix[Vector[1, 2], Vector[3, 4]]
-    a.should be_an_instance_of(Matrix)
+    a.should.instance_of?(Matrix)
     a.should == Matrix[ [1, 2], [3, 4] ]
   end
 
@@ -38,7 +36,7 @@
 
 
   it "returns a Matrix object" do
-    Matrix[ [1] ].should be_an_instance_of(Matrix)
+    Matrix[ [1] ].should.instance_of?(Matrix)
   end
 
   it "can create an nxn Matrix" do
@@ -59,7 +57,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub[ [20,30], [40.5, 9] ].should be_an_instance_of(MatrixSub)
+      MatrixSub[ [20,30], [40.5, 9] ].should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/diagonal_spec.rb b/spec/ruby/library/matrix/diagonal_spec.rb
index ef9738e73e3..ee84ac8c285 100644
--- a/spec/ruby/library/matrix/diagonal_spec.rb
+++ b/spec/ruby/library/matrix/diagonal_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns an object of type Matrix" do
-    @m.should be_kind_of(Matrix)
+    @m.should.is_a?(Matrix)
   end
 
   it "returns a square Matrix of the right size" do
@@ -34,27 +34,27 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.diagonal(1).should be_an_instance_of(MatrixSub)
+      MatrixSub.diagonal(1).should.instance_of?(MatrixSub)
     end
   end
 end
 
 describe "Matrix.diagonal?" do
   it "returns true for a diagonal Matrix" do
-    Matrix.diagonal([1, 2, 3]).diagonal?.should be_true
+    Matrix.diagonal([1, 2, 3]).diagonal?.should == true
   end
 
   it "returns true for a zero square Matrix" do
-    Matrix.zero(3).diagonal?.should be_true
+    Matrix.zero(3).diagonal?.should == true
   end
 
   it "returns false for a non diagonal square Matrix" do
-    Matrix[[0, 1], [0, 0]].diagonal?.should be_false
-    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].diagonal?.should be_false
+    Matrix[[0, 1], [0, 0]].diagonal?.should == false
+    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].diagonal?.should == false
   end
 
   it "returns true for an empty 0x0 matrix" do
-    Matrix.empty(0,0).diagonal?.should be_true
+    Matrix.empty(0,0).diagonal?.should == true
   end
 
   it "raises an error for rectangular matrices" do
@@ -66,7 +66,7 @@
     ].each do |rectangular_matrix|
       -> {
         rectangular_matrix.diagonal?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/divide_spec.rb b/spec/ruby/library/matrix/divide_spec.rb
index 2e3bb85bf65..711a5189e44 100644
--- a/spec/ruby/library/matrix/divide_spec.rb
+++ b/spec/ruby/library/matrix/divide_spec.rb
@@ -30,25 +30,25 @@
   end
 
   it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-    -> { @a / Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+    -> { @a / Matrix[ [1] ] }.should.raise(Matrix::ErrDimensionMismatch)
   end
 
   it "returns an instance of Matrix" do
-    (@a / @b).should be_kind_of(Matrix)
+    (@a / @b).should.is_a?(Matrix)
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
       m = MatrixSub.ins
-      (m/m).should be_an_instance_of(MatrixSub)
-      (m/1).should be_an_instance_of(MatrixSub)
+      (m/m).should.instance_of?(MatrixSub)
+      (m/1).should.instance_of?(MatrixSub)
     end
   end
 
   it "raises a TypeError if other is of wrong type" do
-    -> { @a / nil        }.should raise_error(TypeError)
-    -> { @a / "a"        }.should raise_error(TypeError)
-    -> { @a / [ [1, 2] ] }.should raise_error(TypeError)
-    -> { @a / Object.new }.should raise_error(TypeError)
+    -> { @a / nil        }.should.raise(TypeError)
+    -> { @a / "a"        }.should.raise(TypeError)
+    -> { @a / [ [1, 2] ] }.should.raise(TypeError)
+    -> { @a / Object.new }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/matrix/each_spec.rb b/spec/ruby/library/matrix/each_spec.rb
index f3b0f018678..b4bfd3c76fc 100644
--- a/spec/ruby/library/matrix/each_spec.rb
+++ b/spec/ruby/library/matrix/each_spec.rb
@@ -9,12 +9,12 @@
 
   it "returns an Enumerator when called without a block" do
     enum = @m.each
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == @result
   end
 
   it "returns self" do
-    @m.each{}.should equal(@m)
+    @m.each{}.should.equal?(@m)
   end
 
   it "yields the elements starting with the those of the first row" do
@@ -33,13 +33,13 @@
   it "raises an ArgumentError for unrecognized argument" do
     -> {
       @m.each("all"){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @m.each(nil){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @m.each(:left){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "yields the rights elements when passed :diagonal" do
diff --git a/spec/ruby/library/matrix/each_with_index_spec.rb b/spec/ruby/library/matrix/each_with_index_spec.rb
index a005b886216..17e3f3f44c8 100644
--- a/spec/ruby/library/matrix/each_with_index_spec.rb
+++ b/spec/ruby/library/matrix/each_with_index_spec.rb
@@ -16,12 +16,12 @@
 
   it "returns an Enumerator when called without a block" do
     enum = @m.each_with_index
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == @result
   end
 
   it "returns self" do
-    @m.each_with_index{}.should equal(@m)
+    @m.each_with_index{}.should.equal?(@m)
   end
 
   it "yields the elements starting with the those of the first row" do
@@ -40,13 +40,13 @@
   it "raises an ArgumentError for unrecognized argument" do
     -> {
       @m.each_with_index("all"){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @m.each_with_index(nil){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @m.each_with_index(:left){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "yields the rights elements when passed :diagonal" do
diff --git a/spec/ruby/library/matrix/eigenvalue_decomposition/initialize_spec.rb b/spec/ruby/library/matrix/eigenvalue_decomposition/initialize_spec.rb
index 8438f63133e..cbda82a16ae 100644
--- a/spec/ruby/library/matrix/eigenvalue_decomposition/initialize_spec.rb
+++ b/spec/ruby/library/matrix/eigenvalue_decomposition/initialize_spec.rb
@@ -5,16 +5,16 @@
   it "raises an error if argument is not a matrix" do
     -> {
       Matrix::EigenvalueDecomposition.new([[]])
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
     -> {
       Matrix::EigenvalueDecomposition.new(42)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises an error if matrix is not square" do
     -> {
       Matrix::EigenvalueDecomposition.new(Matrix[[1, 2]])
-    }.should raise_error(Matrix::ErrDimensionMismatch)
+    }.should.raise(Matrix::ErrDimensionMismatch)
   end
 
   it "never hangs" do
diff --git a/spec/ruby/library/matrix/element_reference_spec.rb b/spec/ruby/library/matrix/element_reference_spec.rb
index b950d1c391f..c6804b38460 100644
--- a/spec/ruby/library/matrix/element_reference_spec.rb
+++ b/spec/ruby/library/matrix/element_reference_spec.rb
@@ -16,8 +16,8 @@
   end
 
   it "returns nil for an invalid index pair" do
-    @m[8,1].should be_nil
-    @m[1,8].should be_nil
+    @m[8,1].should == nil
+    @m[1,8].should == nil
   end
 
 end
diff --git a/spec/ruby/library/matrix/empty_spec.rb b/spec/ruby/library/matrix/empty_spec.rb
index 5f294711db1..7b0f0af9ebf 100644
--- a/spec/ruby/library/matrix/empty_spec.rb
+++ b/spec/ruby/library/matrix/empty_spec.rb
@@ -4,20 +4,20 @@
 
 describe "Matrix#empty?" do
   it "returns true when the Matrix is empty" do
-    Matrix[ ].empty?.should be_true
-    Matrix[ [], [], [] ].empty?.should be_true
-    Matrix[ [], [], [] ].transpose.empty?.should be_true
+    Matrix[ ].empty?.should == true
+    Matrix[ [], [], [] ].empty?.should == true
+    Matrix[ [], [], [] ].transpose.empty?.should == true
   end
 
   it "returns false when the Matrix has elements" do
-    Matrix[ [1, 2] ].empty?.should be_false
-    Matrix[ [1], [2] ].empty?.should be_false
+    Matrix[ [1, 2] ].empty?.should == false
+    Matrix[ [1], [2] ].empty?.should == false
   end
 
   it "doesn't accept any parameter" do
     ->{
       Matrix[ [1, 2] ].empty?(42)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
 
@@ -40,29 +40,29 @@
   it "does not accept more than two parameters" do
     ->{
       Matrix.empty(1, 2, 3)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error if both dimensions are > 0" do
     ->{
       Matrix.empty(1, 2)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error if any dimension is < 0" do
     ->{
       Matrix.empty(-2, 0)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     ->{
       Matrix.empty(0, -2)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
 end
 
 describe "for a subclass of Matrix" do
   it "returns an instance of that subclass" do
-    MatrixSub.empty(0, 1).should be_an_instance_of(MatrixSub)
+    MatrixSub.empty(0, 1).should.instance_of?(MatrixSub)
   end
 end
diff --git a/spec/ruby/library/matrix/eql_spec.rb b/spec/ruby/library/matrix/eql_spec.rb
index ea26c3320d2..cda122f4d82 100644
--- a/spec/ruby/library/matrix/eql_spec.rb
+++ b/spec/ruby/library/matrix/eql_spec.rb
@@ -6,6 +6,6 @@
   it_behaves_like :equal, :eql?
 
   it "returns false if some elements are == but not eql?" do
-    Matrix[[1, 2],[3, 4]].eql?(Matrix[[1, 2],[3, 4.0]]).should be_false
+    Matrix[[1, 2],[3, 4]].eql?(Matrix[[1, 2],[3, 4.0]]).should == false
   end
 end
diff --git a/spec/ruby/library/matrix/exponent_spec.rb b/spec/ruby/library/matrix/exponent_spec.rb
index 38cdfa92762..4cbe63587d8 100644
--- a/spec/ruby/library/matrix/exponent_spec.rb
+++ b/spec/ruby/library/matrix/exponent_spec.rb
@@ -17,8 +17,8 @@
 
     it "raises a ErrDimensionMismatch for non square matrices" do
       m = Matrix[ [1, 1], [1, 2], [2, 3]]
-      -> { m ** 3 }.should raise_error(Matrix::ErrDimensionMismatch)
-      -> { m ** 0 }.should raise_error(Matrix::ErrDimensionMismatch)
+      -> { m ** 3 }.should.raise(Matrix::ErrDimensionMismatch)
+      -> { m ** 0 }.should.raise(Matrix::ErrDimensionMismatch)
     end
 
     describe "that is < 0" do
@@ -30,7 +30,7 @@
 
       it "raises a ErrNotRegular for irregular matrices" do
         m = Matrix[ [1, 1], [1, 1] ]
-        -> { m ** -2 }.should raise_error(Matrix::ErrNotRegular)
+        -> { m ** -2 }.should.raise(Matrix::ErrNotRegular)
       end
     end
 
@@ -42,7 +42,7 @@
 
       it "raises an ErrDimensionMismatch for non-square matrices" do
         m = Matrix[ [1, 1] ]
-        -> { m ** 0 }.should raise_error(Matrix::ErrDimensionMismatch)
+        -> { m ** 0 }.should.raise(Matrix::ErrDimensionMismatch)
       end
     end
   end
@@ -56,7 +56,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      (MatrixSub.ins ** 1).should be_an_instance_of(MatrixSub)
+      (MatrixSub.ins ** 1).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/find_index_spec.rb b/spec/ruby/library/matrix/find_index_spec.rb
index c2bfa6d61ab..c7278fd4496 100644
--- a/spec/ruby/library/matrix/find_index_spec.rb
+++ b/spec/ruby/library/matrix/find_index_spec.rb
@@ -8,12 +8,12 @@
 
   it "returns an Enumerator when called without a block" do
     enum = @m.find_index
-    enum.should be_an_instance_of(Enumerator)
+    enum.should.instance_of?(Enumerator)
     enum.to_a.should == [1, 2, 3, 4, 5, 6, 7, 8]
   end
 
   it "returns nil if the block is always false" do
-    @m.find_index{false}.should be_nil
+    @m.find_index{false}.should == nil
   end
 
   it "returns the first index for which the block is true" do
@@ -48,7 +48,7 @@
     it "returns an Enumerator when called without a block" do
       @tests.each do |matrix, h|
         h.each do |selector, result|
-          matrix.find_index(selector).should be_an_instance_of(Enumerator)
+          matrix.find_index(selector).should.instance_of?(Enumerator)
         end
       end
     end
@@ -116,7 +116,7 @@
   end
 
   it "returns nil if the value is not found" do
-    @m.find_index(42).should be_nil
+    @m.find_index(42).should == nil
   end
 
   it "returns the first index for of the requested value" do
@@ -132,15 +132,15 @@
   it "raises an ArgumentError for an unrecognized last argument" do
     -> {
       @m.find_index(1, "all"){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @m.find_index(1, nil){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @m.find_index(1, :left){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @m.find_index(:diagonal, 1){}
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/matrix/hash_spec.rb b/spec/ruby/library/matrix/hash_spec.rb
index 7dabcd3737c..27bf7b97519 100644
--- a/spec/ruby/library/matrix/hash_spec.rb
+++ b/spec/ruby/library/matrix/hash_spec.rb
@@ -4,7 +4,7 @@
 describe "Matrix#hash" do
 
   it "returns an Integer" do
-    Matrix[ [1,2] ].hash.should be_an_instance_of(Integer)
+    Matrix[ [1,2] ].hash.should.instance_of?(Integer)
   end
 
   it "returns the same value for the same matrix" do
diff --git a/spec/ruby/library/matrix/hermitian_spec.rb b/spec/ruby/library/matrix/hermitian_spec.rb
index 177ca64d839..94d0dbe6b62 100644
--- a/spec/ruby/library/matrix/hermitian_spec.rb
+++ b/spec/ruby/library/matrix/hermitian_spec.rb
@@ -3,15 +3,15 @@
 
 describe "Matrix.hermitian?" do
   it "returns true for a hermitian Matrix" do
-    Matrix[[1, 2, Complex(0, 3)], [2, 4, 5], [Complex(0, -3), 5, 6]].hermitian?.should be_true
+    Matrix[[1, 2, Complex(0, 3)], [2, 4, 5], [Complex(0, -3), 5, 6]].hermitian?.should == true
   end
 
   it "returns true for a 0x0 empty matrix" do
-    Matrix.empty.hermitian?.should be_true
+    Matrix.empty.hermitian?.should == true
   end
 
   it "returns false for an asymmetric Matrix" do
-    Matrix[[1, 2],[-2, 1]].hermitian?.should be_false
+    Matrix[[1, 2],[-2, 1]].hermitian?.should == false
   end
 
   it "raises an error for rectangular matrices" do
@@ -23,12 +23,12 @@
     ].each do |rectangular_matrix|
       -> {
         rectangular_matrix.hermitian?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 
   it "returns false for a matrix with complex values on the diagonal" do
-    Matrix[[Complex(1,1)]].hermitian?.should be_false
-    Matrix[[Complex(1,0)]].hermitian?.should be_true
+    Matrix[[Complex(1,1)]].hermitian?.should == false
+    Matrix[[Complex(1,0)]].hermitian?.should == true
   end
 end
diff --git a/spec/ruby/library/matrix/lower_triangular_spec.rb b/spec/ruby/library/matrix/lower_triangular_spec.rb
index f3aa4501f4f..7e8688fd9b3 100644
--- a/spec/ruby/library/matrix/lower_triangular_spec.rb
+++ b/spec/ruby/library/matrix/lower_triangular_spec.rb
@@ -3,22 +3,22 @@
 
 describe "Matrix.lower_triangular?" do
   it "returns true for a square lower triangular Matrix" do
-    Matrix[[1, 0, 0], [1, 2, 0], [1, 2, 3]].lower_triangular?.should be_true
-    Matrix.diagonal([1, 2, 3]).lower_triangular?.should be_true
-    Matrix[[1, 0], [1, 2], [1, 2], [1, 2]].lower_triangular?.should be_true
-    Matrix[[1, 0, 0, 0], [1, 2, 0, 0]].lower_triangular?.should be_true
+    Matrix[[1, 0, 0], [1, 2, 0], [1, 2, 3]].lower_triangular?.should == true
+    Matrix.diagonal([1, 2, 3]).lower_triangular?.should == true
+    Matrix[[1, 0], [1, 2], [1, 2], [1, 2]].lower_triangular?.should == true
+    Matrix[[1, 0, 0, 0], [1, 2, 0, 0]].lower_triangular?.should == true
   end
 
   it "returns true for an empty Matrix" do
-    Matrix.empty(3, 0).lower_triangular?.should be_true
-    Matrix.empty(0, 3).lower_triangular?.should be_true
-    Matrix.empty(0, 0).lower_triangular?.should be_true
+    Matrix.empty(3, 0).lower_triangular?.should == true
+    Matrix.empty(0, 3).lower_triangular?.should == true
+    Matrix.empty(0, 0).lower_triangular?.should == true
   end
 
   it "returns false for a non lower triangular square Matrix" do
-    Matrix[[0, 1], [0, 0]].lower_triangular?.should be_false
-    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].lower_triangular?.should be_false
-    Matrix[[0, 1], [0, 0], [0, 0], [0, 0]].lower_triangular?.should be_false
-    Matrix[[0, 0, 0, 1], [0, 0, 0, 0]].lower_triangular?.should be_false
+    Matrix[[0, 1], [0, 0]].lower_triangular?.should == false
+    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].lower_triangular?.should == false
+    Matrix[[0, 1], [0, 0], [0, 0], [0, 0]].lower_triangular?.should == false
+    Matrix[[0, 0, 0, 1], [0, 0, 0, 0]].lower_triangular?.should == false
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/determinant_spec.rb b/spec/ruby/library/matrix/lup_decomposition/determinant_spec.rb
index 9d733066c17..98ac5c71a34 100644
--- a/spec/ruby/library/matrix/lup_decomposition/determinant_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/determinant_spec.rb
@@ -15,7 +15,7 @@
       lup = m.lup
       -> {
         lup.determinant
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/initialize_spec.rb b/spec/ruby/library/matrix/lup_decomposition/initialize_spec.rb
index 36afb349e60..b813757525e 100644
--- a/spec/ruby/library/matrix/lup_decomposition/initialize_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/initialize_spec.rb
@@ -5,9 +5,9 @@
   it "raises an error if argument is not a matrix" do
     -> {
       Matrix::LUPDecomposition.new([[]])
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
     -> {
       Matrix::LUPDecomposition.new(42)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/l_spec.rb b/spec/ruby/library/matrix/lup_decomposition/l_spec.rb
index 9514ab5d063..0a6797cc853 100644
--- a/spec/ruby/library/matrix/lup_decomposition/l_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/l_spec.rb
@@ -13,6 +13,6 @@
   end
 
   it "returns a lower triangular matrix" do
-    @l.lower_triangular?.should be_true
+    @l.lower_triangular?.should == true
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/p_spec.rb b/spec/ruby/library/matrix/lup_decomposition/p_spec.rb
index c7b5e9196e9..2c44399b79c 100644
--- a/spec/ruby/library/matrix/lup_decomposition/p_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/p_spec.rb
@@ -13,6 +13,6 @@
   end
 
   it "returns a permutation matrix" do
-    @p.permutation?.should be_true
+    @p.permutation?.should == true
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/solve_spec.rb b/spec/ruby/library/matrix/lup_decomposition/solve_spec.rb
index 66242627e96..9927e967277 100644
--- a/spec/ruby/library/matrix/lup_decomposition/solve_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/solve_spec.rb
@@ -8,7 +8,7 @@
       lu = Matrix::LUPDecomposition.new(a)
       -> {
         lu.solve(a)
-      }.should raise_error(Matrix::ErrNotRegular)
+      }.should.raise(Matrix::ErrNotRegular)
     end
 
     describe "for non singular matrices" do
@@ -33,7 +33,7 @@
         values = Matrix[[1, 2, 3, 4], [0, 1, 2, 3]]
         -> {
           @lu.solve(values)
-        }.should raise_error(Matrix::ErrDimensionMismatch)
+        }.should.raise(Matrix::ErrDimensionMismatch)
       end
 
       it "returns the right vector when given a vector of the appropriate size" do
@@ -46,7 +46,7 @@
         values = Vector[14, 55]
         -> {
           @lu.solve(values)
-        }.should raise_error(Matrix::ErrDimensionMismatch)
+        }.should.raise(Matrix::ErrDimensionMismatch)
       end
     end
   end
diff --git a/spec/ruby/library/matrix/lup_decomposition/to_a_spec.rb b/spec/ruby/library/matrix/lup_decomposition/to_a_spec.rb
index 9b1dccbbace..ab59677dd9d 100644
--- a/spec/ruby/library/matrix/lup_decomposition/to_a_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/to_a_spec.rb
@@ -10,9 +10,9 @@
   end
 
   it "returns an array of three matrices" do
-    @to_a.should be_kind_of(Array)
+    @to_a.should.is_a?(Array)
     @to_a.length.should == 3
-    @to_a.each{|m| m.should be_kind_of(Matrix)}
+    @to_a.each{|m| m.should.is_a?(Matrix)}
   end
 
   it "returns [l, u, p] such that l*u == a*p" do
diff --git a/spec/ruby/library/matrix/lup_decomposition/u_spec.rb b/spec/ruby/library/matrix/lup_decomposition/u_spec.rb
index ca3dfc1f00e..967bc669dc0 100644
--- a/spec/ruby/library/matrix/lup_decomposition/u_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/u_spec.rb
@@ -13,6 +13,6 @@
   end
 
   it "returns an upper triangular matrix" do
-    @u.upper_triangular?.should be_true
+    @u.upper_triangular?.should == true
   end
 end
diff --git a/spec/ruby/library/matrix/minor_spec.rb b/spec/ruby/library/matrix/minor_spec.rb
index 009826c3d66..6b29db568b4 100644
--- a/spec/ruby/library/matrix/minor_spec.rb
+++ b/spec/ruby/library/matrix/minor_spec.rb
@@ -79,7 +79,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.minor(0, 1, 0, 1).should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.minor(0, 1, 0, 1).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/minus_spec.rb b/spec/ruby/library/matrix/minus_spec.rb
index 95cf4a60722..7426aa2d2c9 100644
--- a/spec/ruby/library/matrix/minus_spec.rb
+++ b/spec/ruby/library/matrix/minus_spec.rb
@@ -13,30 +13,30 @@
   end
 
   it "returns an instance of Matrix" do
-    (@a - @b).should be_kind_of(Matrix)
+    (@a - @b).should.is_a?(Matrix)
   end
 
   it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-    -> { @a - Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+    -> { @a - Matrix[ [1] ] }.should.raise(Matrix::ErrDimensionMismatch)
   end
 
   it "raises a ExceptionForMatrix::ErrOperationNotDefined if other is a Numeric Type" do
-    -> { @a - 2            }.should raise_error(Matrix::ErrOperationNotDefined)
-    -> { @a - 1.2          }.should raise_error(Matrix::ErrOperationNotDefined)
-    -> { @a - bignum_value }.should raise_error(Matrix::ErrOperationNotDefined)
+    -> { @a - 2            }.should.raise(Matrix::ErrOperationNotDefined)
+    -> { @a - 1.2          }.should.raise(Matrix::ErrOperationNotDefined)
+    -> { @a - bignum_value }.should.raise(Matrix::ErrOperationNotDefined)
   end
 
   it "raises a TypeError if other is of wrong type" do
-    -> { @a - nil        }.should raise_error(TypeError)
-    -> { @a - "a"        }.should raise_error(TypeError)
-    -> { @a - [ [1, 2] ] }.should raise_error(TypeError)
-    -> { @a - Object.new }.should raise_error(TypeError)
+    -> { @a - nil        }.should.raise(TypeError)
+    -> { @a - "a"        }.should.raise(TypeError)
+    -> { @a - [ [1, 2] ] }.should.raise(TypeError)
+    -> { @a - Object.new }.should.raise(TypeError)
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
       m = MatrixSub.ins
-      (m-m).should be_an_instance_of(MatrixSub)
+      (m-m).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/multiply_spec.rb b/spec/ruby/library/matrix/multiply_spec.rb
index 206868af929..6c495c5521b 100644
--- a/spec/ruby/library/matrix/multiply_spec.rb
+++ b/spec/ruby/library/matrix/multiply_spec.rb
@@ -33,7 +33,7 @@
   end
 
   it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-    -> { @a * Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+    -> { @a * Matrix[ [1] ] }.should.raise(Matrix::ErrDimensionMismatch)
   end
 
   it "returns a zero matrix if (nx0) * (0xn)" do
@@ -53,17 +53,17 @@
   end
 
   it "raises a TypeError if other is of wrong type" do
-    -> { @a * nil        }.should raise_error(TypeError)
-    -> { @a * "a"        }.should raise_error(TypeError)
-    -> { @a * [ [1, 2] ] }.should raise_error(TypeError)
-    -> { @a * Object.new }.should raise_error(TypeError)
+    -> { @a * nil        }.should.raise(TypeError)
+    -> { @a * "a"        }.should.raise(TypeError)
+    -> { @a * [ [1, 2] ] }.should.raise(TypeError)
+    -> { @a * Object.new }.should.raise(TypeError)
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
       m = MatrixSub.ins
-      (m*m).should be_an_instance_of(MatrixSub)
-      (m*1).should be_an_instance_of(MatrixSub)
+      (m*m).should.instance_of?(MatrixSub)
+      (m*1).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/new_spec.rb b/spec/ruby/library/matrix/new_spec.rb
index 30050668460..bde9d9f4c89 100644
--- a/spec/ruby/library/matrix/new_spec.rb
+++ b/spec/ruby/library/matrix/new_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Matrix.new" do
   it "is private" do
-    Matrix.should have_private_method(:new)
+    Matrix.private_methods(false).should.include?(:new)
   end
 end
diff --git a/spec/ruby/library/matrix/normal_spec.rb b/spec/ruby/library/matrix/normal_spec.rb
index a9e6c645faf..420d4b011fb 100644
--- a/spec/ruby/library/matrix/normal_spec.rb
+++ b/spec/ruby/library/matrix/normal_spec.rb
@@ -20,7 +20,7 @@
     ].each do |rectangular_matrix|
       -> {
         rectangular_matrix.normal?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/orthogonal_spec.rb b/spec/ruby/library/matrix/orthogonal_spec.rb
index 26afe89ff08..71ac831fe83 100644
--- a/spec/ruby/library/matrix/orthogonal_spec.rb
+++ b/spec/ruby/library/matrix/orthogonal_spec.rb
@@ -20,7 +20,7 @@
     ].each do |rectangular_matrix|
       -> {
         rectangular_matrix.orthogonal?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/permutation_spec.rb b/spec/ruby/library/matrix/permutation_spec.rb
index 825a9d982c5..43727edea1d 100644
--- a/spec/ruby/library/matrix/permutation_spec.rb
+++ b/spec/ruby/library/matrix/permutation_spec.rb
@@ -3,18 +3,18 @@
 
 describe "Matrix#permutation?" do
   it "returns true for a permutation Matrix" do
-    Matrix[[0, 1, 0], [0, 0, 1], [1, 0, 0]].permutation?.should be_true
+    Matrix[[0, 1, 0], [0, 0, 1], [1, 0, 0]].permutation?.should == true
   end
 
   it "returns false for a non permutation square Matrix" do
-    Matrix[[0, 1], [0, 0]].permutation?.should be_false
-    Matrix[[-1, 0], [0, -1]].permutation?.should be_false
-    Matrix[[1, 0], [1, 0]].permutation?.should be_false
-    Matrix[[1, 0], [1, 1]].permutation?.should be_false
+    Matrix[[0, 1], [0, 0]].permutation?.should == false
+    Matrix[[-1, 0], [0, -1]].permutation?.should == false
+    Matrix[[1, 0], [1, 0]].permutation?.should == false
+    Matrix[[1, 0], [1, 1]].permutation?.should == false
   end
 
   it "returns true for an empty 0x0 matrix" do
-    Matrix.empty(0,0).permutation?.should be_true
+    Matrix.empty(0,0).permutation?.should == true
   end
 
   it "raises an error for rectangular matrices" do
@@ -26,7 +26,7 @@
     ].each do |rectangular_matrix|
       -> {
         rectangular_matrix.permutation?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/plus_spec.rb b/spec/ruby/library/matrix/plus_spec.rb
index 2706bad060e..72a9ba8f8fa 100644
--- a/spec/ruby/library/matrix/plus_spec.rb
+++ b/spec/ruby/library/matrix/plus_spec.rb
@@ -13,30 +13,30 @@
   end
 
   it "returns an instance of Matrix" do
-    (@a + @b).should be_kind_of(Matrix)
+    (@a + @b).should.is_a?(Matrix)
   end
 
   it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-    -> { @a + Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+    -> { @a + Matrix[ [1] ] }.should.raise(Matrix::ErrDimensionMismatch)
   end
 
   it "raises a ExceptionForMatrix::ErrOperationNotDefined if other is a Numeric Type" do
-    -> { @a + 2            }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
-    -> { @a + 1.2          }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
-    -> { @a + bignum_value }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
+    -> { @a + 2            }.should.raise(ExceptionForMatrix::ErrOperationNotDefined)
+    -> { @a + 1.2          }.should.raise(ExceptionForMatrix::ErrOperationNotDefined)
+    -> { @a + bignum_value }.should.raise(ExceptionForMatrix::ErrOperationNotDefined)
   end
 
   it "raises a TypeError if other is of wrong type" do
-    -> { @a + nil        }.should raise_error(TypeError)
-    -> { @a + "a"        }.should raise_error(TypeError)
-    -> { @a + [ [1, 2] ] }.should raise_error(TypeError)
-    -> { @a + Object.new }.should raise_error(TypeError)
+    -> { @a + nil        }.should.raise(TypeError)
+    -> { @a + "a"        }.should.raise(TypeError)
+    -> { @a + [ [1, 2] ] }.should.raise(TypeError)
+    -> { @a + Object.new }.should.raise(TypeError)
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
       m = MatrixSub.ins
-      (m+m).should be_an_instance_of(MatrixSub)
+      (m+m).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/real_spec.rb b/spec/ruby/library/matrix/real_spec.rb
index 38033c63c8f..4589dc22a5f 100644
--- a/spec/ruby/library/matrix/real_spec.rb
+++ b/spec/ruby/library/matrix/real_spec.rb
@@ -4,22 +4,22 @@
 
 describe "Matrix#real?" do
   it "returns true for matrices with all real entries" do
-    Matrix[ [1,   2], [3, 4] ].real?.should be_true
-    Matrix[ [1.9, 2], [3, 4] ].real?.should be_true
+    Matrix[ [1,   2], [3, 4] ].real?.should == true
+    Matrix[ [1.9, 2], [3, 4] ].real?.should == true
   end
 
   it "returns true for empty matrices" do
-    Matrix.empty.real?.should be_true
+    Matrix.empty.real?.should == true
   end
 
   it "returns false if one element is a Complex" do
-    Matrix[ [Complex(1,1), 2], [3, 4] ].real?.should be_false
+    Matrix[ [Complex(1,1), 2], [3, 4] ].real?.should == false
   end
 
   # Guard against the Mathn library
   guard -> { !defined?(Math.rsqrt) } do
     it "returns false if one element is a Complex whose imaginary part is 0" do
-      Matrix[ [Complex(1,0), 2], [3, 4] ].real?.should be_false
+      Matrix[ [Complex(1,0), 2], [3, 4] ].real?.should == false
     end
   end
 end
@@ -37,7 +37,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.real.should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.real.should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/regular_spec.rb b/spec/ruby/library/matrix/regular_spec.rb
index 3699d0ef8bd..4cb00819ac7 100644
--- a/spec/ruby/library/matrix/regular_spec.rb
+++ b/spec/ruby/library/matrix/regular_spec.rb
@@ -5,27 +5,27 @@
 
   it "returns false for singular matrices" do
     m = Matrix[ [1,2,3], [3,4,3], [0,0,0] ]
-    m.regular?.should be_false
+    m.regular?.should == false
 
     m = Matrix[ [1,2,9], [3,4,9], [1,2,9] ]
-    m.regular?.should be_false
+    m.regular?.should == false
   end
 
   it "returns true if the Matrix is regular" do
-    Matrix[ [0,1], [1,0] ].regular?.should be_true
+    Matrix[ [0,1], [1,0] ].regular?.should == true
   end
 
   it "returns true for an empty 0x0 matrix" do
-    Matrix.empty(0,0).regular?.should be_true
+    Matrix.empty(0,0).regular?.should == true
   end
 
   it "raises an error for rectangular matrices" do
     -> {
       Matrix[[1], [2], [3]].regular?
-    }.should raise_error(Matrix::ErrDimensionMismatch)
+    }.should.raise(Matrix::ErrDimensionMismatch)
 
     -> {
       Matrix.empty(3,0).regular?
-    }.should raise_error(Matrix::ErrDimensionMismatch)
+    }.should.raise(Matrix::ErrDimensionMismatch)
   end
 end
diff --git a/spec/ruby/library/matrix/round_spec.rb b/spec/ruby/library/matrix/round_spec.rb
index 1dc29df890b..cdec646fa1b 100644
--- a/spec/ruby/library/matrix/round_spec.rb
+++ b/spec/ruby/library/matrix/round_spec.rb
@@ -15,7 +15,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.round.should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.round.should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/row_spec.rb b/spec/ruby/library/matrix/row_spec.rb
index 00b1f02a8e0..8a7662fdf27 100644
--- a/spec/ruby/library/matrix/row_spec.rb
+++ b/spec/ruby/library/matrix/row_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "returns self when called with a block" do
-    @m.row(0) { |x| x }.should equal(@m)
+    @m.row(0) { |x| x }.should.equal?(@m)
   end
 
   it "returns nil when out of bounds" do
@@ -30,7 +30,7 @@
   end
 
   it "never yields when out of bounds" do
-    -> { @m.row(3){ raise } }.should_not raise_error
-    -> { @m.row(-4){ raise } }.should_not raise_error
+    -> { @m.row(3){ raise } }.should_not.raise
+    -> { @m.row(-4){ raise } }.should_not.raise
   end
 end
diff --git a/spec/ruby/library/matrix/row_vector_spec.rb b/spec/ruby/library/matrix/row_vector_spec.rb
index 341437ee05c..f3919fb7d81 100644
--- a/spec/ruby/library/matrix/row_vector_spec.rb
+++ b/spec/ruby/library/matrix/row_vector_spec.rb
@@ -5,7 +5,7 @@
 describe "Matrix.row_vector" do
 
   it "returns a Matrix" do
-    Matrix.row_vector([]).should be_an_instance_of(Matrix)
+    Matrix.row_vector([]).should.instance_of?(Matrix)
   end
 
   it "returns a single-row Matrix with the specified values" do
@@ -18,7 +18,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.row_vector([1]).should be_an_instance_of(MatrixSub)
+      MatrixSub.row_vector([1]).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/row_vectors_spec.rb b/spec/ruby/library/matrix/row_vectors_spec.rb
index 6f99c439a67..4a0db675274 100644
--- a/spec/ruby/library/matrix/row_vectors_spec.rb
+++ b/spec/ruby/library/matrix/row_vectors_spec.rb
@@ -8,11 +8,11 @@
   end
 
   it "returns an Array" do
-    Matrix[ [1,2], [3,4] ].row_vectors.should be_an_instance_of(Array)
+    Matrix[ [1,2], [3,4] ].row_vectors.should.instance_of?(Array)
   end
 
   it "returns an Array of Vectors" do
-    @vectors.all? {|v| v.should be_an_instance_of(Vector)}
+    @vectors.all? {|v| v.should.instance_of?(Vector)}
   end
 
   it "returns each row as a Vector" do
diff --git a/spec/ruby/library/matrix/rows_spec.rb b/spec/ruby/library/matrix/rows_spec.rb
index 41ba6357757..9c248cd8a46 100644
--- a/spec/ruby/library/matrix/rows_spec.rb
+++ b/spec/ruby/library/matrix/rows_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "returns a Matrix" do
-    @m.should be_kind_of(Matrix)
+    @m.should.is_a?(Matrix)
   end
 
   it "creates a matrix from argument rows" do
@@ -21,8 +21,8 @@
   it "copies the original rows by default" do
     @a << 3
     @b << 6
-    @m.row(0).should_not equal(@a)
-    @m.row(1).should_not equal(@b)
+    @m.row(0).should_not.equal?(@a)
+    @m.row(1).should_not.equal?(@b)
   end
 
   it "references the original rows if copy is false" do
@@ -35,7 +35,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.rows([[0, 1], [0, 1]]).should be_an_instance_of(MatrixSub)
+      MatrixSub.rows([[0, 1], [0, 1]]).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/scalar_spec.rb b/spec/ruby/library/matrix/scalar_spec.rb
index 7fdd64c9d95..5b93b60533b 100644
--- a/spec/ruby/library/matrix/scalar_spec.rb
+++ b/spec/ruby/library/matrix/scalar_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "returns a Matrix" do
-    @a.should be_kind_of(Matrix)
+    @a.should.is_a?(Matrix)
   end
 
   it "returns a n x n matrix" do
@@ -41,7 +41,7 @@
   end
 
   it "returns a Matrix" do
-    @a.should be_kind_of(Matrix)
+    @a.should.is_a?(Matrix)
   end
 
   it "returns a square matrix, where the first argument specifies the side of the square" do
diff --git a/spec/ruby/library/matrix/shared/collect.rb b/spec/ruby/library/matrix/shared/collect.rb
index 852f7fd6cfd..3a4dbe3a366 100644
--- a/spec/ruby/library/matrix/shared/collect.rb
+++ b/spec/ruby/library/matrix/shared/collect.rb
@@ -7,7 +7,7 @@
   end
 
   it "returns an instance of Matrix" do
-    @m.send(@method){|n| n * 2 }.should be_kind_of(Matrix)
+    @m.send(@method){|n| n * 2 }.should.is_a?(Matrix)
   end
 
   it "returns a Matrix where each element is the result of the block" do
@@ -15,12 +15,12 @@
   end
 
   it "returns an enumerator if no block is given" do
-    @m.send(@method).should be_an_instance_of(Enumerator)
+    @m.send(@method).should.instance_of?(Enumerator)
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.send(@method){1}.should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.send(@method){1}.should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/shared/conjugate.rb b/spec/ruby/library/matrix/shared/conjugate.rb
index d87658f8558..ffdf5ebca17 100644
--- a/spec/ruby/library/matrix/shared/conjugate.rb
+++ b/spec/ruby/library/matrix/shared/conjugate.rb
@@ -14,7 +14,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.send(@method).should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.send(@method).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/shared/determinant.rb b/spec/ruby/library/matrix/shared/determinant.rb
index 9e0528c24ba..b7c86393baf 100644
--- a/spec/ruby/library/matrix/shared/determinant.rb
+++ b/spec/ruby/library/matrix/shared/determinant.rb
@@ -29,10 +29,10 @@
   it "raises an error for rectangular matrices" do
     -> {
       Matrix[[1], [2], [3]].send(@method)
-    }.should raise_error(Matrix::ErrDimensionMismatch)
+    }.should.raise(Matrix::ErrDimensionMismatch)
 
     -> {
       Matrix.empty(3,0).send(@method)
-    }.should raise_error(Matrix::ErrDimensionMismatch)
+    }.should.raise(Matrix::ErrDimensionMismatch)
   end
 end
diff --git a/spec/ruby/library/matrix/shared/equal_value.rb b/spec/ruby/library/matrix/shared/equal_value.rb
index 2b2311d49e8..9bc6ed908bd 100644
--- a/spec/ruby/library/matrix/shared/equal_value.rb
+++ b/spec/ruby/library/matrix/shared/equal_value.rb
@@ -7,27 +7,27 @@
   end
 
   it "returns true for self" do
-    @matrix.send(@method, @matrix).should be_true
+    @matrix.send(@method, @matrix).should == true
   end
 
   it "returns true for equal matrices" do
-    @matrix.send(@method, Matrix[ [1, 2, 3, 4, 5], [2, 3, 4, 5, 6] ]).should be_true
+    @matrix.send(@method, Matrix[ [1, 2, 3, 4, 5], [2, 3, 4, 5, 6] ]).should == true
   end
 
   it "returns false for different matrices" do
-    @matrix.send(@method, Matrix[ [42, 2, 3, 4, 5], [2, 3, 4, 5, 6] ]).should be_false
-    @matrix.send(@method, Matrix[ [1, 2, 3, 4, 5, 6], [2, 3, 4, 5, 6, 7] ]).should be_false
-    @matrix.send(@method, Matrix[ [1, 2, 3], [2, 3, 4] ]).should be_false
+    @matrix.send(@method, Matrix[ [42, 2, 3, 4, 5], [2, 3, 4, 5, 6] ]).should == false
+    @matrix.send(@method, Matrix[ [1, 2, 3, 4, 5, 6], [2, 3, 4, 5, 6, 7] ]).should == false
+    @matrix.send(@method, Matrix[ [1, 2, 3], [2, 3, 4] ]).should == false
   end
 
   it "returns false for different empty matrices" do
-    Matrix.empty(42, 0).send(@method, Matrix.empty(6, 0)).should be_false
-    Matrix.empty(0, 42).send(@method, Matrix.empty(0, 6)).should be_false
-    Matrix.empty(0, 0).send(@method, Matrix.empty(6, 0)).should be_false
-    Matrix.empty(0, 0).send(@method, Matrix.empty(0, 6)).should be_false
+    Matrix.empty(42, 0).send(@method, Matrix.empty(6, 0)).should == false
+    Matrix.empty(0, 42).send(@method, Matrix.empty(0, 6)).should == false
+    Matrix.empty(0, 0).send(@method, Matrix.empty(6, 0)).should == false
+    Matrix.empty(0, 0).send(@method, Matrix.empty(0, 6)).should == false
   end
 
   it "doesn't distinguish on subclasses" do
-    MatrixSub.ins.send(@method, Matrix.I(2)).should be_true
+    MatrixSub.ins.send(@method, Matrix.I(2)).should == true
   end
 end
diff --git a/spec/ruby/library/matrix/shared/identity.rb b/spec/ruby/library/matrix/shared/identity.rb
index 114f86e7b08..df957b5a750 100644
--- a/spec/ruby/library/matrix/shared/identity.rb
+++ b/spec/ruby/library/matrix/shared/identity.rb
@@ -3,7 +3,7 @@
 
 describe :matrix_identity, shared: true do
   it "returns a Matrix" do
-    Matrix.send(@method, 2).should be_kind_of(Matrix)
+    Matrix.send(@method, 2).should.is_a?(Matrix)
   end
 
   it "returns a n x n identity matrix" do
@@ -13,7 +13,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.send(@method, 2).should be_an_instance_of(MatrixSub)
+      MatrixSub.send(@method, 2).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/shared/imaginary.rb b/spec/ruby/library/matrix/shared/imaginary.rb
index d28ecc69f1a..16615213a24 100644
--- a/spec/ruby/library/matrix/shared/imaginary.rb
+++ b/spec/ruby/library/matrix/shared/imaginary.rb
@@ -14,7 +14,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.send(@method).should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.send(@method).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/shared/inverse.rb b/spec/ruby/library/matrix/shared/inverse.rb
index c8a6b90da59..ac463cf6808 100644
--- a/spec/ruby/library/matrix/shared/inverse.rb
+++ b/spec/ruby/library/matrix/shared/inverse.rb
@@ -4,7 +4,7 @@
 describe :inverse, shared: true do
 
   it "returns a Matrix" do
-    Matrix[ [1,2], [2,1] ].send(@method).should be_an_instance_of(Matrix)
+    Matrix[ [1,2], [2,1] ].send(@method).should.instance_of?(Matrix)
   end
 
   it "returns the inverse of the Matrix" do
@@ -27,12 +27,12 @@
   it "raises a ErrDimensionMismatch if the Matrix is not square" do
     ->{
       Matrix[ [1,2,3], [1,2,3] ].send(@method)
-    }.should raise_error(Matrix::ErrDimensionMismatch)
+    }.should.raise(Matrix::ErrDimensionMismatch)
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.send(@method).should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.send(@method).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/shared/rectangular.rb b/spec/ruby/library/matrix/shared/rectangular.rb
index 3d9a0dfe8af..0229e614c64 100644
--- a/spec/ruby/library/matrix/shared/rectangular.rb
+++ b/spec/ruby/library/matrix/shared/rectangular.rb
@@ -12,7 +12,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns instances of that subclass" do
-      MatrixSub.ins.send(@method).each{|m| m.should be_an_instance_of(MatrixSub) }
+      MatrixSub.ins.send(@method).each{|m| m.should.instance_of?(MatrixSub) }
     end
   end
 end
diff --git a/spec/ruby/library/matrix/shared/trace.rb b/spec/ruby/library/matrix/shared/trace.rb
index 57b89863f8b..c4a5491b226 100644
--- a/spec/ruby/library/matrix/shared/trace.rb
+++ b/spec/ruby/library/matrix/shared/trace.rb
@@ -6,7 +6,7 @@
   end
 
   it "returns the sum of diagonal elements in a rectangular Matrix" do
-    ->{ Matrix[[1,2,3], [4,5,6]].trace}.should raise_error(Matrix::ErrDimensionMismatch)
+    ->{ Matrix[[1,2,3], [4,5,6]].trace}.should.raise(Matrix::ErrDimensionMismatch)
   end
 
 end
diff --git a/spec/ruby/library/matrix/shared/transpose.rb b/spec/ruby/library/matrix/shared/transpose.rb
index 89b1d025be3..a0b495359bb 100644
--- a/spec/ruby/library/matrix/shared/transpose.rb
+++ b/spec/ruby/library/matrix/shared/transpose.rb
@@ -13,7 +13,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.ins.send(@method).should be_an_instance_of(MatrixSub)
+      MatrixSub.ins.send(@method).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/singular_spec.rb b/spec/ruby/library/matrix/singular_spec.rb
index 7bba36a54ac..00b93af4958 100644
--- a/spec/ruby/library/matrix/singular_spec.rb
+++ b/spec/ruby/library/matrix/singular_spec.rb
@@ -4,28 +4,28 @@
 describe "Matrix#singular?" do
   it "returns true for singular matrices" do
     m = Matrix[ [1,2,3], [3,4,3], [0,0,0] ]
-    m.singular?.should be_true
+    m.singular?.should == true
 
     m = Matrix[ [1,2,9], [3,4,9], [1,2,9] ]
-    m.singular?.should be_true
+    m.singular?.should == true
   end
 
   it "returns false if the Matrix is regular" do
-    Matrix[ [0,1], [1,0] ].singular?.should be_false
+    Matrix[ [0,1], [1,0] ].singular?.should == false
   end
 
   it "returns false for an empty 0x0 matrix" do
-    Matrix.empty(0,0).singular?.should be_false
+    Matrix.empty(0,0).singular?.should == false
   end
 
   it "raises an error for rectangular matrices" do
     -> {
       Matrix[[1], [2], [3]].singular?
-    }.should raise_error(Matrix::ErrDimensionMismatch)
+    }.should.raise(Matrix::ErrDimensionMismatch)
 
     -> {
       Matrix.empty(3,0).singular?
-    }.should raise_error(Matrix::ErrDimensionMismatch)
+    }.should.raise(Matrix::ErrDimensionMismatch)
   end
 
 end
diff --git a/spec/ruby/library/matrix/square_spec.rb b/spec/ruby/library/matrix/square_spec.rb
index 25d2d1ad9c2..b8cf4acf44c 100644
--- a/spec/ruby/library/matrix/square_spec.rb
+++ b/spec/ruby/library/matrix/square_spec.rb
@@ -4,25 +4,25 @@
 describe "Matrix#square?" do
 
   it "returns true when the Matrix is square" do
-    Matrix[ [1,2], [2,4] ].square?.should be_true
-    Matrix[ [100,3,5], [9.5, 4.9, 8], [2,0,77] ].square?.should be_true
+    Matrix[ [1,2], [2,4] ].square?.should == true
+    Matrix[ [100,3,5], [9.5, 4.9, 8], [2,0,77] ].square?.should == true
   end
 
   it "returns true when the Matrix has only one element" do
-    Matrix[ [9] ].square?.should be_true
+    Matrix[ [9] ].square?.should == true
   end
 
   it "returns false when the Matrix is rectangular" do
-    Matrix[ [1, 2] ].square?.should be_false
+    Matrix[ [1, 2] ].square?.should == false
   end
 
   it "returns false when the Matrix is rectangular" do
-    Matrix[ [1], [2] ].square?.should be_false
+    Matrix[ [1], [2] ].square?.should == false
   end
 
   it "returns handles empty matrices" do
-    Matrix[].square?.should be_true
-    Matrix[[]].square?.should be_false
-    Matrix.columns([[]]).square?.should be_false
+    Matrix[].square?.should == true
+    Matrix[[]].square?.should == false
+    Matrix.columns([[]]).square?.should == false
   end
 end
diff --git a/spec/ruby/library/matrix/symmetric_spec.rb b/spec/ruby/library/matrix/symmetric_spec.rb
index 6f2a99276ab..4b86c195032 100644
--- a/spec/ruby/library/matrix/symmetric_spec.rb
+++ b/spec/ruby/library/matrix/symmetric_spec.rb
@@ -3,15 +3,15 @@
 
 describe "Matrix.symmetric?" do
   it "returns true for a symmetric Matrix" do
-    Matrix[[1, 2, Complex(0, 3)], [2, 4, 5], [Complex(0, 3), 5, 6]].symmetric?.should be_true
+    Matrix[[1, 2, Complex(0, 3)], [2, 4, 5], [Complex(0, 3), 5, 6]].symmetric?.should == true
   end
 
   it "returns true for a 0x0 empty matrix" do
-    Matrix.empty.symmetric?.should be_true
+    Matrix.empty.symmetric?.should == true
   end
 
   it "returns false for an asymmetric Matrix" do
-    Matrix[[1, 2],[-2, 1]].symmetric?.should be_false
+    Matrix[[1, 2],[-2, 1]].symmetric?.should == false
   end
 
   it "raises an error for rectangular matrices" do
@@ -23,7 +23,7 @@
     ].each do |rectangular_matrix|
       -> {
         rectangular_matrix.symmetric?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/unitary_spec.rb b/spec/ruby/library/matrix/unitary_spec.rb
index c214ee9b2f6..4490e8f8d4e 100644
--- a/spec/ruby/library/matrix/unitary_spec.rb
+++ b/spec/ruby/library/matrix/unitary_spec.rb
@@ -26,7 +26,7 @@
     ].each do |rectangular_matrix|
       -> {
         rectangular_matrix.unitary?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+      }.should.raise(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/upper_triangular_spec.rb b/spec/ruby/library/matrix/upper_triangular_spec.rb
index 2514294a804..0e2bf611e20 100644
--- a/spec/ruby/library/matrix/upper_triangular_spec.rb
+++ b/spec/ruby/library/matrix/upper_triangular_spec.rb
@@ -3,22 +3,22 @@
 
 describe "Matrix.upper_triangular?" do
   it "returns true for an upper triangular Matrix" do
-    Matrix[[1, 2, 3], [0, 2, 3], [0, 0, 3]].upper_triangular?.should be_true
-    Matrix.diagonal([1, 2, 3]).upper_triangular?.should be_true
-    Matrix[[1, 2], [0, 2], [0, 0], [0, 0]].upper_triangular?.should be_true
-    Matrix[[1, 2, 3, 4], [0, 2, 3, 4]].upper_triangular?.should be_true
+    Matrix[[1, 2, 3], [0, 2, 3], [0, 0, 3]].upper_triangular?.should == true
+    Matrix.diagonal([1, 2, 3]).upper_triangular?.should == true
+    Matrix[[1, 2], [0, 2], [0, 0], [0, 0]].upper_triangular?.should == true
+    Matrix[[1, 2, 3, 4], [0, 2, 3, 4]].upper_triangular?.should == true
   end
 
   it "returns false for a non upper triangular square Matrix" do
-    Matrix[[0, 0], [1, 0]].upper_triangular?.should be_false
-    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].upper_triangular?.should be_false
-    Matrix[[0, 0], [0, 0], [0, 0], [0, 1]].upper_triangular?.should be_false
-    Matrix[[0, 0, 0, 0], [1, 0, 0, 0]].upper_triangular?.should be_false
+    Matrix[[0, 0], [1, 0]].upper_triangular?.should == false
+    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].upper_triangular?.should == false
+    Matrix[[0, 0], [0, 0], [0, 0], [0, 1]].upper_triangular?.should == false
+    Matrix[[0, 0, 0, 0], [1, 0, 0, 0]].upper_triangular?.should == false
   end
 
   it "returns true for an empty matrix" do
-    Matrix.empty(3,0).upper_triangular?.should be_true
-    Matrix.empty(0,3).upper_triangular?.should be_true
-    Matrix.empty(0,0).upper_triangular?.should be_true
+    Matrix.empty(3,0).upper_triangular?.should == true
+    Matrix.empty(0,3).upper_triangular?.should == true
+    Matrix.empty(0,0).upper_triangular?.should == true
   end
 end
diff --git a/spec/ruby/library/matrix/vector/cross_product_spec.rb b/spec/ruby/library/matrix/vector/cross_product_spec.rb
index c2698ade4c7..96a462c067d 100644
--- a/spec/ruby/library/matrix/vector/cross_product_spec.rb
+++ b/spec/ruby/library/matrix/vector/cross_product_spec.rb
@@ -9,6 +9,6 @@
   it "raises an error unless both vectors have dimension 3" do
     -> {
       Vector[1, 2, 3].cross_product(Vector[0, -4])
-    }.should raise_error(Vector::ErrDimensionMismatch)
+    }.should.raise(Vector::ErrDimensionMismatch)
   end
 end
diff --git a/spec/ruby/library/matrix/vector/each2_spec.rb b/spec/ruby/library/matrix/vector/each2_spec.rb
index 10d2fc404d4..86e7ed75aa4 100644
--- a/spec/ruby/library/matrix/vector/each2_spec.rb
+++ b/spec/ruby/library/matrix/vector/each2_spec.rb
@@ -8,8 +8,8 @@
   end
 
   it "requires one argument" do
-    -> { @v.each2(@v2, @v2){} }.should raise_error(ArgumentError)
-    -> { @v.each2(){} }.should raise_error(ArgumentError)
+    -> { @v.each2(@v2, @v2){} }.should.raise(ArgumentError)
+    -> { @v.each2(){} }.should.raise(ArgumentError)
   end
 
   describe "given one argument" do
@@ -20,8 +20,8 @@
     end
 
     it "raises a DimensionMismatch error if the Vector size is different" do
-      -> { @v.each2(Vector[1,2]){}     }.should raise_error(Vector::ErrDimensionMismatch)
-      -> { @v.each2(Vector[1,2,3,4]){} }.should raise_error(Vector::ErrDimensionMismatch)
+      -> { @v.each2(Vector[1,2]){}     }.should.raise(Vector::ErrDimensionMismatch)
+      -> { @v.each2(Vector[1,2,3,4]){} }.should.raise(Vector::ErrDimensionMismatch)
     end
 
     it "yields arguments in sequence" do
@@ -37,12 +37,12 @@
     end
 
     it "returns self when given a block" do
-      @v.each2(@v2){}.should equal(@v)
+      @v.each2(@v2){}.should.equal?(@v)
     end
 
     it "returns an enumerator if no block given" do
       enum = @v.each2(@v2)
-      enum.should be_an_instance_of(Enumerator)
+      enum.should.instance_of?(Enumerator)
       enum.to_a.should == [[1, 4], [2, 5], [3, 6]]
     end
   end
diff --git a/spec/ruby/library/matrix/vector/eql_spec.rb b/spec/ruby/library/matrix/vector/eql_spec.rb
index eb2451b550d..6e2cd47b8e4 100644
--- a/spec/ruby/library/matrix/vector/eql_spec.rb
+++ b/spec/ruby/library/matrix/vector/eql_spec.rb
@@ -7,10 +7,10 @@
   end
 
   it "returns true for self" do
-    @vector.eql?(@vector).should be_true
+    @vector.eql?(@vector).should == true
   end
 
   it "returns false when there are a pair corresponding elements which are not equal in the sense of Kernel#eql?" do
-    @vector.eql?(Vector[1, 2, 3, 4, 5.0]).should be_false
+    @vector.eql?(Vector[1, 2, 3, 4, 5.0]).should == false
   end
 end
diff --git a/spec/ruby/library/matrix/vector/inner_product_spec.rb b/spec/ruby/library/matrix/vector/inner_product_spec.rb
index 1cf8771e045..79dee108338 100644
--- a/spec/ruby/library/matrix/vector/inner_product_spec.rb
+++ b/spec/ruby/library/matrix/vector/inner_product_spec.rb
@@ -13,7 +13,7 @@
   it "raises an error for mismatched vectors" do
     -> {
       Vector[1, 2, 3].inner_product(Vector[0, -4])
-    }.should raise_error(Vector::ErrDimensionMismatch)
+    }.should.raise(Vector::ErrDimensionMismatch)
   end
 
   it "uses the conjugate of its argument" do
diff --git a/spec/ruby/library/matrix/vector/normalize_spec.rb b/spec/ruby/library/matrix/vector/normalize_spec.rb
index 527c9260deb..bb1f0467865 100644
--- a/spec/ruby/library/matrix/vector/normalize_spec.rb
+++ b/spec/ruby/library/matrix/vector/normalize_spec.rb
@@ -10,9 +10,9 @@
   it "raises an error for zero vectors" do
     -> {
       Vector[].normalize
-    }.should raise_error(Vector::ZeroVectorError)
+    }.should.raise(Vector::ZeroVectorError)
     -> {
       Vector[0, 0, 0].normalize
-    }.should raise_error(Vector::ZeroVectorError)
+    }.should.raise(Vector::ZeroVectorError)
   end
 end
diff --git a/spec/ruby/library/matrix/zero_spec.rb b/spec/ruby/library/matrix/zero_spec.rb
index 68e8567c260..406bcad6eda 100644
--- a/spec/ruby/library/matrix/zero_spec.rb
+++ b/spec/ruby/library/matrix/zero_spec.rb
@@ -4,7 +4,7 @@
 
 describe "Matrix.zero" do
   it "returns an object of type Matrix" do
-    Matrix.zero(3).should be_kind_of(Matrix)
+    Matrix.zero(3).should.is_a?(Matrix)
   end
 
   it "creates a n x n matrix" do
@@ -30,7 +30,7 @@
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
-      MatrixSub.zero(3).should be_an_instance_of(MatrixSub)
+      MatrixSub.zero(3).should.instance_of?(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/monitor/exit_spec.rb b/spec/ruby/library/monitor/exit_spec.rb
index 952ad9525db..0748a523ace 100644
--- a/spec/ruby/library/monitor/exit_spec.rb
+++ b/spec/ruby/library/monitor/exit_spec.rb
@@ -5,6 +5,6 @@
   it "raises ThreadError when monitor is not entered" do
     m = Monitor.new
 
-    -> { m.exit }.should raise_error(ThreadError)
+    -> { m.exit }.should.raise(ThreadError)
   end
 end
diff --git a/spec/ruby/library/monitor/mon_initialize_spec.rb b/spec/ruby/library/monitor/mon_initialize_spec.rb
index e0fe6c2d979..092aee929c5 100644
--- a/spec/ruby/library/monitor/mon_initialize_spec.rb
+++ b/spec/ruby/library/monitor/mon_initialize_spec.rb
@@ -26,6 +26,6 @@ def initialize_copy(other)
 
     instance = cls.new(1, 2, 3)
     copy = instance.dup
-    copy.should_not equal(instance)
+    copy.should_not.equal?(instance)
   end
 end
diff --git a/spec/ruby/library/monitor/synchronize_spec.rb b/spec/ruby/library/monitor/synchronize_spec.rb
index d78393eb3a4..27cc1258b44 100644
--- a/spec/ruby/library/monitor/synchronize_spec.rb
+++ b/spec/ruby/library/monitor/synchronize_spec.rb
@@ -31,11 +31,11 @@
   end
 
   it "raises a LocalJumpError if not passed a block" do
-    -> { Monitor.new.synchronize }.should raise_error(LocalJumpError)
+    -> { Monitor.new.synchronize }.should.raise(LocalJumpError)
   end
 
   it "raises a thread error if the monitor is not owned on exiting the block" do
     monitor = Monitor.new
-    -> { monitor.synchronize { monitor.exit } }.should raise_error(ThreadError)
+    -> { monitor.synchronize { monitor.exit } }.should.raise(ThreadError)
   end
 end
diff --git a/spec/ruby/library/net-ftp/FTPError_spec.rb b/spec/ruby/library/net-ftp/FTPError_spec.rb
index 0c31b65dcc4..b447e50546c 100644
--- a/spec/ruby/library/net-ftp/FTPError_spec.rb
+++ b/spec/ruby/library/net-ftp/FTPError_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require 'net/ftp'
 
-describe "Net::FTPError" do
-  it "is an Exception" do
-    Net::FTPError.should < Exception
+ruby_version_is ""..."4.1" do
+  require 'net/ftp'
+
+  describe "Net::FTPError" do
+    it "is an Exception" do
+      Net::FTPError.should < Exception
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/FTPPermError_spec.rb b/spec/ruby/library/net-ftp/FTPPermError_spec.rb
index b43e12c5035..b9a2d93aefc 100644
--- a/spec/ruby/library/net-ftp/FTPPermError_spec.rb
+++ b/spec/ruby/library/net-ftp/FTPPermError_spec.rb
@@ -1,12 +1,15 @@
 require_relative '../../spec_helper'
-require 'net/ftp'
 
-describe "Net::FTPPermError" do
-  it "is an Exception" do
-    Net::FTPPermError.should < Exception
-  end
+ruby_version_is ""..."4.1" do
+  require 'net/ftp'
+
+  describe "Net::FTPPermError" do
+    it "is an Exception" do
+      Net::FTPPermError.should < Exception
+    end
 
-  it "is a subclass of Net::FTPError" do
-    Net::FTPPermError.should < Net::FTPError
+    it "is a subclass of Net::FTPError" do
+      Net::FTPPermError.should < Net::FTPError
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/FTPProtoError_spec.rb b/spec/ruby/library/net-ftp/FTPProtoError_spec.rb
index e7abbc0dd81..a1d9e44d637 100644
--- a/spec/ruby/library/net-ftp/FTPProtoError_spec.rb
+++ b/spec/ruby/library/net-ftp/FTPProtoError_spec.rb
@@ -1,12 +1,15 @@
 require_relative '../../spec_helper'
-require 'net/ftp'
 
-describe "Net::FTPProtoError" do
-  it "is an Exception" do
-    Net::FTPProtoError.should < Exception
-  end
+ruby_version_is ""..."4.1" do
+  require 'net/ftp'
+
+  describe "Net::FTPProtoError" do
+    it "is an Exception" do
+      Net::FTPProtoError.should < Exception
+    end
 
-  it "is a subclass of Net::FTPError" do
-    Net::FTPPermError.should < Net::FTPError
+    it "is a subclass of Net::FTPError" do
+      Net::FTPPermError.should < Net::FTPError
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/FTPReplyError_spec.rb b/spec/ruby/library/net-ftp/FTPReplyError_spec.rb
index fcc7501fc11..c9e64683231 100644
--- a/spec/ruby/library/net-ftp/FTPReplyError_spec.rb
+++ b/spec/ruby/library/net-ftp/FTPReplyError_spec.rb
@@ -1,12 +1,15 @@
 require_relative '../../spec_helper'
-require 'net/ftp'
 
-describe "Net::FTPReplyError" do
-  it "is an Exception" do
-    Net::FTPReplyError.should < Exception
-  end
+ruby_version_is ""..."4.1" do
+  require 'net/ftp'
+
+  describe "Net::FTPReplyError" do
+    it "is an Exception" do
+      Net::FTPReplyError.should < Exception
+    end
 
-  it "is a subclass of Net::FTPError" do
-    Net::FTPPermError.should < Net::FTPError
+    it "is a subclass of Net::FTPError" do
+      Net::FTPPermError.should < Net::FTPError
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/FTPTempError_spec.rb b/spec/ruby/library/net-ftp/FTPTempError_spec.rb
index f4b045dfb5b..c0953cb0f23 100644
--- a/spec/ruby/library/net-ftp/FTPTempError_spec.rb
+++ b/spec/ruby/library/net-ftp/FTPTempError_spec.rb
@@ -1,12 +1,15 @@
 require_relative '../../spec_helper'
-require 'net/ftp'
 
-describe "Net::FTPTempError" do
-  it "is an Exception" do
-    Net::FTPTempError.should < Exception
-  end
+ruby_version_is ""..."4.1" do
+  require 'net/ftp'
+
+  describe "Net::FTPTempError" do
+    it "is an Exception" do
+      Net::FTPTempError.should < Exception
+    end
 
-  it "is a subclass of Net::FTPError" do
-    Net::FTPPermError.should < Net::FTPError
+    it "is a subclass of Net::FTPError" do
+      Net::FTPPermError.should < Net::FTPError
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/abort_spec.rb b/spec/ruby/library/net-ftp/abort_spec.rb
index 335d056512a..9e8be53c683 100644
--- a/spec/ruby/library/net-ftp/abort_spec.rb
+++ b/spec/ruby/library/net-ftp/abort_spec.rb
@@ -1,62 +1,65 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#abort" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#abort" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the ABOR command to the server" do
-    -> { @ftp.abort }.should_not raise_error
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "ignores the response" do
-    @ftp.abort
-    @ftp.last_response.should == "220 Dummy FTP Server ready!\n"
-  end
+    it "sends the ABOR command to the server" do
+      -> { @ftp.abort }.should_not.raise
+    end
 
-  it "returns the full response" do
-    @ftp.abort.should == "226 Closing data connection. (ABOR)\n"
-  end
+    it "ignores the response" do
+      @ftp.abort
+      @ftp.last_response.should == "220 Dummy FTP Server ready!\n"
+    end
 
-  it "does not raise any error when the response code is 225" do
-    @server.should_receive(:abor).and_respond("225 Data connection open; no transfer in progress.")
-    -> { @ftp.abort }.should_not raise_error
-  end
+    it "returns the full response" do
+      @ftp.abort.should == "226 Closing data connection. (ABOR)\n"
+    end
 
-  it "does not raise any error when the response code is 226" do
-    @server.should_receive(:abor).and_respond("226 Closing data connection.")
-    -> { @ftp.abort }.should_not raise_error
-  end
+    it "does not raise any error when the response code is 225" do
+      @server.should_receive(:abor).and_respond("225 Data connection open; no transfer in progress.")
+      -> { @ftp.abort }.should_not.raise
+    end
 
-  it "raises a Net::FTPProtoError when the response code is 500" do
-    @server.should_receive(:abor).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
-  end
+    it "does not raise any error when the response code is 226" do
+      @server.should_receive(:abor).and_respond("226 Closing data connection.")
+      -> { @ftp.abort }.should_not.raise
+    end
 
-  it "raises a Net::FTPProtoError when the response code is 501" do
-    @server.should_receive(:abor).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
-  end
+    it "raises a Net::FTPProtoError when the response code is 500" do
+      @server.should_receive(:abor).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.abort }.should.raise(Net::FTPProtoError)
+    end
 
-  it "raises a Net::FTPProtoError when the response code is 502" do
-    @server.should_receive(:abor).and_respond("502 Command not implemented.")
-    -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
-  end
+    it "raises a Net::FTPProtoError when the response code is 501" do
+      @server.should_receive(:abor).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.abort }.should.raise(Net::FTPProtoError)
+    end
+
+    it "raises a Net::FTPProtoError when the response code is 502" do
+      @server.should_receive(:abor).and_respond("502 Command not implemented.")
+      -> { @ftp.abort }.should.raise(Net::FTPProtoError)
+    end
 
-  it "raises a Net::FTPProtoError when the response code is 421" do
-    @server.should_receive(:abor).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
+    it "raises a Net::FTPProtoError when the response code is 421" do
+      @server.should_receive(:abor).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.abort }.should.raise(Net::FTPProtoError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/acct_spec.rb b/spec/ruby/library/net-ftp/acct_spec.rb
index ab093448a26..a64a0f48a82 100644
--- a/spec/ruby/library/net-ftp/acct_spec.rb
+++ b/spec/ruby/library/net-ftp/acct_spec.rb
@@ -1,58 +1,61 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#acct" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "writes the ACCT command to the server" do
-    @ftp.acct("my_account")
-    @ftp.last_response.should == "230 User 'my_account' logged in, proceed. (ACCT)\n"
-  end
-
-  it "returns nil" do
-    @ftp.acct("my_account").should == nil
-  end
-
-  it "does not raise any error when the response code is 230" do
-    @server.should_receive(:acct).and_respond("230 User logged in, proceed.")
-    -> { @ftp.acct("my_account") }.should_not raise_error
-  end
-
-  it "raises a Net::FTPPermError when the response code is 530" do
-    @server.should_receive(:acct).and_respond("530 Not logged in.")
-    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:acct).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:acct).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 503" do
-    @server.should_receive(:acct).and_respond("503 Bad sequence of commands.")
-    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:acct).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPTempError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#acct" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "writes the ACCT command to the server" do
+      @ftp.acct("my_account")
+      @ftp.last_response.should == "230 User 'my_account' logged in, proceed. (ACCT)\n"
+    end
+
+    it "returns nil" do
+      @ftp.acct("my_account").should == nil
+    end
+
+    it "does not raise any error when the response code is 230" do
+      @server.should_receive(:acct).and_respond("230 User logged in, proceed.")
+      -> { @ftp.acct("my_account") }.should_not.raise
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:acct).and_respond("530 Not logged in.")
+      -> { @ftp.acct("my_account") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:acct).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.acct("my_account") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:acct).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.acct("my_account") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 503" do
+      @server.should_receive(:acct).and_respond("503 Bad sequence of commands.")
+      -> { @ftp.acct("my_account") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:acct).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.acct("my_account") }.should.raise(Net::FTPTempError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/binary_spec.rb b/spec/ruby/library/net-ftp/binary_spec.rb
index 1e0585b7954..de8d0ac1038 100644
--- a/spec/ruby/library/net-ftp/binary_spec.rb
+++ b/spec/ruby/library/net-ftp/binary_spec.rb
@@ -1,24 +1,27 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#binary" do
-  it "returns true when self is in binary mode" do
-    ftp = Net::FTP.new
-    ftp.binary.should be_true
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-    ftp.binary = false
-    ftp.binary.should be_false
+  describe "Net::FTP#binary" do
+    it "returns true when self is in binary mode" do
+      ftp = Net::FTP.new
+      ftp.binary.should == true
+
+      ftp.binary = false
+      ftp.binary.should == false
+    end
   end
-end
 
-describe "Net::FTP#binary=" do
-  it "sets self to binary mode when passed true" do
-    ftp = Net::FTP.new
+  describe "Net::FTP#binary=" do
+    it "sets self to binary mode when passed true" do
+      ftp = Net::FTP.new
 
-    ftp.binary = true
-    ftp.binary.should be_true
+      ftp.binary = true
+      ftp.binary.should == true
 
-    ftp.binary = false
-    ftp.binary.should be_false
+      ftp.binary = false
+      ftp.binary.should == false
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/chdir_spec.rb b/spec/ruby/library/net-ftp/chdir_spec.rb
index cc129b5e42c..f8f352158cb 100644
--- a/spec/ruby/library/net-ftp/chdir_spec.rb
+++ b/spec/ruby/library/net-ftp/chdir_spec.rb
@@ -1,99 +1,102 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#chdir" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#chdir" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    describe "when switching to the parent directory" do
+      it "sends the 'CDUP' command to the server" do
+        @ftp.chdir("..")
+        @ftp.last_response.should == "200 Command okay. (CDUP)\n"
+      end
+
+      it "returns nil" do
+        @ftp.chdir("..").should == nil
+      end
+
+      it "does not raise a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:cdup).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.chdir("..") }.should_not.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:cdup).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.chdir("..") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:cdup).and_respond("502 Command not implemented.")
+        -> { @ftp.chdir("..") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:cdup).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.chdir("..") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:cdup).and_respond("530 Not logged in.")
+        -> { @ftp.chdir("..") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 550" do
+        @server.should_receive(:cdup).and_respond("550 Requested action not taken.")
+        -> { @ftp.chdir("..") }.should.raise(Net::FTPPermError)
+      end
+    end
 
-  describe "when switching to the parent directory" do
-    it "sends the 'CDUP' command to the server" do
-      @ftp.chdir("..")
-      @ftp.last_response.should == "200 Command okay. (CDUP)\n"
+    it "writes the 'CWD' command with the passed directory to the socket" do
+      @ftp.chdir("test")
+      @ftp.last_response.should == "200 Command okay. (CWD test)\n"
     end
 
     it "returns nil" do
-      @ftp.chdir("..").should be_nil
+      @ftp.chdir("test").should == nil
     end
 
-    it "does not raise a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:cdup).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.chdir("..") }.should_not raise_error(Net::FTPPermError)
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:cwd).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.chdir("test") }.should.raise(Net::FTPPermError)
     end
 
     it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:cdup).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      @server.should_receive(:cwd).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.chdir("test") }.should.raise(Net::FTPPermError)
     end
 
     it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:cdup).and_respond("502 Command not implemented.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      @server.should_receive(:cwd).and_respond("502 Command not implemented.")
+      -> { @ftp.chdir("test") }.should.raise(Net::FTPPermError)
     end
 
     it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:cdup).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPTempError)
+      @server.should_receive(:cwd).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.chdir("test") }.should.raise(Net::FTPTempError)
     end
 
     it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:cdup).and_respond("530 Not logged in.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      @server.should_receive(:cwd).and_respond("530 Not logged in.")
+      -> { @ftp.chdir("test") }.should.raise(Net::FTPPermError)
     end
 
     it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:cdup).and_respond("550 Requested action not taken.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      @server.should_receive(:cwd).and_respond("550 Requested action not taken.")
+      -> { @ftp.chdir("test") }.should.raise(Net::FTPPermError)
     end
   end
-
-  it "writes the 'CWD' command with the passed directory to the socket" do
-    @ftp.chdir("test")
-    @ftp.last_response.should == "200 Command okay. (CWD test)\n"
-  end
-
-  it "returns nil" do
-    @ftp.chdir("test").should be_nil
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:cwd).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:cwd).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:cwd).and_respond("502 Command not implemented.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:cwd).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 530" do
-    @server.should_receive(:cwd).and_respond("530 Not logged in.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:cwd).and_respond("550 Requested action not taken.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
 end
diff --git a/spec/ruby/library/net-ftp/close_spec.rb b/spec/ruby/library/net-ftp/close_spec.rb
index 183f14a84b5..9d5d4c638ad 100644
--- a/spec/ruby/library/net-ftp/close_spec.rb
+++ b/spec/ruby/library/net-ftp/close_spec.rb
@@ -1,30 +1,33 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#close" do
-  before :each do
-    @socket = mock("Socket")
-    @socket.stub!(:closed?).and_return(false)
-    @socket.stub!(:read_timeout).and_return(60)
-    @socket.stub!(:read_timeout=).and_return(3)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-    @ftp = Net::FTP.new
-    @ftp.instance_variable_set(:@sock, @socket)
-  end
+  describe "Net::FTP#close" do
+    before :each do
+      @socket = mock("Socket")
+      @socket.stub!(:closed?).and_return(false)
+      @socket.stub!(:read_timeout).and_return(60)
+      @socket.stub!(:read_timeout=).and_return(3)
 
-  it "closes the socket" do
-    @socket.should_receive(:close)
-    @ftp.close.should be_nil
-  end
+      @ftp = Net::FTP.new
+      @ftp.instance_variable_set(:@sock, @socket)
+    end
 
-  it "does not try to close the socket if it has already been closed" do
-    @socket.should_receive(:closed?).and_return(true)
-    @socket.should_not_receive(:close)
-    @ftp.close.should be_nil
-  end
+    it "closes the socket" do
+      @socket.should_receive(:close)
+      @ftp.close.should == nil
+    end
+
+    it "does not try to close the socket if it has already been closed" do
+      @socket.should_receive(:closed?).and_return(true)
+      @socket.should_not_receive(:close)
+      @ftp.close.should == nil
+    end
 
-  it "does not try to close the socket if it is nil" do
-    @ftp.instance_variable_set(:@sock, nil)
-    @ftp.close.should be_nil
+    it "does not try to close the socket if it is nil" do
+      @ftp.instance_variable_set(:@sock, nil)
+      @ftp.close.should == nil
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/closed_spec.rb b/spec/ruby/library/net-ftp/closed_spec.rb
index 84001cdc0f5..1c8693932e3 100644
--- a/spec/ruby/library/net-ftp/closed_spec.rb
+++ b/spec/ruby/library/net-ftp/closed_spec.rb
@@ -1,21 +1,24 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#closed?" do
-  before :each do
-    @socket = mock("Socket")
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-    @ftp = Net::FTP.new
-    @ftp.instance_variable_set(:@sock, @socket)
-  end
+  describe "Net::FTP#closed?" do
+    before :each do
+      @socket = mock("Socket")
 
-  it "returns true when the socket is closed" do
-    @socket.should_receive(:closed?).and_return(true)
-    @ftp.closed?.should be_true
-  end
+      @ftp = Net::FTP.new
+      @ftp.instance_variable_set(:@sock, @socket)
+    end
+
+    it "returns true when the socket is closed" do
+      @socket.should_receive(:closed?).and_return(true)
+      @ftp.closed?.should == true
+    end
 
-  it "returns true when the socket is nil" do
-    @ftp.instance_variable_set(:@sock, nil)
-    @ftp.closed?.should be_true
+    it "returns true when the socket is nil" do
+      @ftp.instance_variable_set(:@sock, nil)
+      @ftp.closed?.should == true
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/connect_spec.rb b/spec/ruby/library/net-ftp/connect_spec.rb
index e606b11e2a3..597381f67c9 100644
--- a/spec/ruby/library/net-ftp/connect_spec.rb
+++ b/spec/ruby/library/net-ftp/connect_spec.rb
@@ -1,43 +1,46 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-# TODO: Add specs for using the SOCKSSocket
-describe "Net::FTP#connect" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-  end
-
-  after :each do
-    @server.connect_message = nil
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "tries to connect to the FTP Server on the given host and port" do
-    -> { @ftp.connect(@server.hostname, @server.server_port) }.should_not raise_error
-  end
-
-  it "returns nil" do
-    @ftp.connect(@server.hostname, @server.server_port).should be_nil
-  end
-
-  it "does not raise any error when the response code is 220" do
-    @server.connect_message = "220 Dummy FTP Server ready!"
-    -> { @ftp.connect(@server.hostname, @server.server_port) }.should_not raise_error
-  end
-
-  it "raises a Net::FTPReplyError when the response code is 120" do
-    @server.connect_message = "120 Service ready in nnn minutes."
-    -> { @ftp.connect(@server.hostname, @server.server_port) }.should raise_error(Net::FTPReplyError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.connect_message = "421 Service not available, closing control connection."
-    -> { @ftp.connect(@server.hostname, @server.server_port) }.should raise_error(Net::FTPTempError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  # TODO: Add specs for using the SOCKSSocket
+  describe "Net::FTP#connect" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+    end
+
+    after :each do
+      @server.connect_message = nil
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "tries to connect to the FTP Server on the given host and port" do
+      -> { @ftp.connect(@server.hostname, @server.server_port) }.should_not.raise
+    end
+
+    it "returns nil" do
+      @ftp.connect(@server.hostname, @server.server_port).should == nil
+    end
+
+    it "does not raise any error when the response code is 220" do
+      @server.connect_message = "220 Dummy FTP Server ready!"
+      -> { @ftp.connect(@server.hostname, @server.server_port) }.should_not.raise
+    end
+
+    it "raises a Net::FTPReplyError when the response code is 120" do
+      @server.connect_message = "120 Service ready in nnn minutes."
+      -> { @ftp.connect(@server.hostname, @server.server_port) }.should.raise(Net::FTPReplyError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.connect_message = "421 Service not available, closing control connection."
+      -> { @ftp.connect(@server.hostname, @server.server_port) }.should.raise(Net::FTPTempError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/debug_mode_spec.rb b/spec/ruby/library/net-ftp/debug_mode_spec.rb
index f2ef53c0896..28765b9d1c7 100644
--- a/spec/ruby/library/net-ftp/debug_mode_spec.rb
+++ b/spec/ruby/library/net-ftp/debug_mode_spec.rb
@@ -1,23 +1,26 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#debug_mode" do
-  it "returns true when self is in debug mode" do
-    ftp = Net::FTP.new
-    ftp.debug_mode.should be_false
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-    ftp.debug_mode = true
-    ftp.debug_mode.should be_true
+  describe "Net::FTP#debug_mode" do
+    it "returns true when self is in debug mode" do
+      ftp = Net::FTP.new
+      ftp.debug_mode.should == false
+
+      ftp.debug_mode = true
+      ftp.debug_mode.should == true
+    end
   end
-end
 
-describe "Net::FTP#debug_mode=" do
-  it "sets self into debug mode when passed true" do
-    ftp = Net::FTP.new
-    ftp.debug_mode = true
-    ftp.debug_mode.should be_true
+  describe "Net::FTP#debug_mode=" do
+    it "sets self into debug mode when passed true" do
+      ftp = Net::FTP.new
+      ftp.debug_mode = true
+      ftp.debug_mode.should == true
 
-    ftp.debug_mode = false
-    ftp.debug_mode.should be_false
+      ftp.debug_mode = false
+      ftp.debug_mode.should == false
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/default_passive_spec.rb b/spec/ruby/library/net-ftp/default_passive_spec.rb
index 3f14f6187e6..b47b4e9782e 100644
--- a/spec/ruby/library/net-ftp/default_passive_spec.rb
+++ b/spec/ruby/library/net-ftp/default_passive_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#default_passive" do
-  it "is true by default" do
-    ruby_exe(fixture(__FILE__, "default_passive.rb")).should == "true\ntrue\n"
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+
+  describe "Net::FTP#default_passive" do
+    it "is true by default" do
+      ruby_exe(fixture(__FILE__, "default_passive.rb")).should == "true\ntrue\n"
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/delete_spec.rb b/spec/ruby/library/net-ftp/delete_spec.rb
index bfb7da1ffef..40cd8f1d99a 100644
--- a/spec/ruby/library/net-ftp/delete_spec.rb
+++ b/spec/ruby/library/net-ftp/delete_spec.rb
@@ -1,59 +1,62 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#delete" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "sends the DELE command with the passed filename to the server" do
-    @ftp.delete("test.file")
-    @ftp.last_response.should == "250 Requested file action okay, completed. (DELE test.file)\n"
-  end
-
-  it "raises a Net::FTPTempError when the response code is 450" do
-    @server.should_receive(:dele).and_respond("450 Requested file action not taken.")
-    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:dele).and_respond("550 Requested action not taken.")
-    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:dele).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:dele).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:dele).and_respond("502 Command not implemented.")
-    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:dele).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 530" do
-    @server.should_receive(:dele).and_respond("530 Not logged in.")
-    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#delete" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the DELE command with the passed filename to the server" do
+      @ftp.delete("test.file")
+      @ftp.last_response.should == "250 Requested file action okay, completed. (DELE test.file)\n"
+    end
+
+    it "raises a Net::FTPTempError when the response code is 450" do
+      @server.should_receive(:dele).and_respond("450 Requested file action not taken.")
+      -> { @ftp.delete("test.file") }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:dele).and_respond("550 Requested action not taken.")
+      -> { @ftp.delete("test.file") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:dele).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.delete("test.file") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:dele).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.delete("test.file") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:dele).and_respond("502 Command not implemented.")
+      -> { @ftp.delete("test.file") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:dele).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.delete("test.file") }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:dele).and_respond("530 Not logged in.")
+      -> { @ftp.delete("test.file") }.should.raise(Net::FTPPermError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/dir_spec.rb b/spec/ruby/library/net-ftp/dir_spec.rb
index 894f03dd7b8..af38724fad0 100644
--- a/spec/ruby/library/net-ftp/dir_spec.rb
+++ b/spec/ruby/library/net-ftp/dir_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/list'
 
-describe "Net::FTP#dir" do
-  it_behaves_like :net_ftp_list, :dir
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/list'
+
+  describe "Net::FTP#dir" do
+    it_behaves_like :net_ftp_list, :dir
+  end
 end
diff --git a/spec/ruby/library/net-ftp/fixtures/server.rb b/spec/ruby/library/net-ftp/fixtures/server.rb
index 8b34d3f8bd3..9fc2beb57b2 100644
--- a/spec/ruby/library/net-ftp/fixtures/server.rb
+++ b/spec/ruby/library/net-ftp/fixtures/server.rb
@@ -1,277 +1,279 @@
-module NetFTPSpecs
-  class DummyFTP
-    attr_accessor :connect_message
-    attr_reader :login_user, :login_pass, :login_acct
-
-    # hostname or IP address
-    attr_reader :hostname
-    # port number
-    attr_reader :server_port
-
-    def initialize
-      @hostname = "127.0.0.1"
-      @server = TCPServer.new(@hostname, 0)
-      @server_port = @server.addr[1]
-
-      @handlers = {}
-      @commands = []
-      @connect_message = nil
-    end
+ruby_version_is ""..."4.1" do
+  module NetFTPSpecs
+    class DummyFTP
+      attr_accessor :connect_message
+      attr_reader :login_user, :login_pass, :login_acct
+
+      # hostname or IP address
+      attr_reader :hostname
+      # port number
+      attr_reader :server_port
+
+      def initialize
+        @hostname = "127.0.0.1"
+        @server = TCPServer.new(@hostname, 0)
+        @server_port = @server.addr[1]
+
+        @handlers = {}
+        @commands = []
+        @connect_message = nil
+      end
 
-    def serve_once
-      @thread = Thread.new do
-        @socket = @server.accept
-        @socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 1)
-        begin
-          handle_request
-        ensure
-          @socket.close
+      def serve_once
+        @thread = Thread.new do
+          @socket = @server.accept
+          @socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 1)
+          begin
+            handle_request
+          ensure
+            @socket.close
+          end
         end
       end
-    end
-
-    def handle_request
-      # Send out the welcome message.
-      response @connect_message || "220 Dummy FTP Server ready!"
 
-      begin
-        while command = @socket.gets
-          command, argument = command.chomp.split(" ", 2)
+      def handle_request
+        # Send out the welcome message.
+        response @connect_message || "220 Dummy FTP Server ready!"
 
-          if command == "QUIT"
-            self.response("221 OK, bye")
-            break
-          elsif proc_handler = @handlers[command.downcase.to_sym]
-            if argument.nil?
-              proc_handler.call(self)
-            else
-              proc_handler.call(self, argument)
-            end
-          else
-            if argument.nil?
-              self.send(command.downcase.to_sym)
+        begin
+          while command = @socket.gets
+            command, argument = command.chomp.split(" ", 2)
+
+            if command == "QUIT"
+              self.response("221 OK, bye")
+              break
+            elsif proc_handler = @handlers[command.downcase.to_sym]
+              if argument.nil?
+                proc_handler.call(self)
+              else
+                proc_handler.call(self, argument)
+              end
             else
-              self.send(command.downcase.to_sym, argument)
+              if argument.nil?
+                self.send(command.downcase.to_sym)
+              else
+                self.send(command.downcase.to_sym, argument)
+              end
             end
           end
+        rescue => e
+          self.error_response("Exception: #{e} #{e.backtrace.inspect}")
         end
-      rescue => e
-        self.error_response("Exception: #{e} #{e.backtrace.inspect}")
       end
-    end
 
-    def error_response(text)
-      self.response("451 #{text}")
-    end
+      def error_response(text)
+        self.response("451 #{text}")
+      end
 
-    def response(text)
-      @socket.puts(text) unless @socket.closed?
-    end
+      def response(text)
+        @socket.puts(text) unless @socket.closed?
+      end
 
-    def stop
-      @datasocket.close unless @datasocket.nil? || @datasocket.closed?
-      @server.close
-      @thread.join
-    end
+      def stop
+        @datasocket.close unless @datasocket.nil? || @datasocket.closed?
+        @server.close
+        @thread.join
+      end
 
 
-    ##
-    def handle(sym, &block)
-      @handlers[sym] = block
-    end
+      ##
+      def handle(sym, &block)
+        @handlers[sym] = block
+      end
 
-    def should_receive(method)
-      @handler_for = method
-      self
-    end
+      def should_receive(method)
+        @handler_for = method
+        self
+      end
 
-    def and_respond(text)
-      @handlers[@handler_for] = -> s, *args { s.response(text) }
-    end
+      def and_respond(text)
+        @handlers[@handler_for] = -> s, *args { s.response(text) }
+      end
 
-    ##
-    # FTP methods
-    ##
+      ##
+      # FTP methods
+      ##
 
-    def abor
-      self.response("226 Closing data connection. (ABOR)")
-    end
+      def abor
+        self.response("226 Closing data connection. (ABOR)")
+      end
 
-    def acct(account)
-      @login_acct = account
-      self.response("230 User '#{account}' logged in, proceed. (ACCT)")
-    end
+      def acct(account)
+        @login_acct = account
+        self.response("230 User '#{account}' logged in, proceed. (ACCT)")
+      end
 
-    def cdup
-      self.response("200 Command okay. (CDUP)")
-    end
+      def cdup
+        self.response("200 Command okay. (CDUP)")
+      end
 
-    def cwd(dir)
-      self.response("200 Command okay. (CWD #{dir})")
-    end
+      def cwd(dir)
+        self.response("200 Command okay. (CWD #{dir})")
+      end
 
-    def dele(file)
-      self.response("250 Requested file action okay, completed. (DELE #{file})")
-    end
+      def dele(file)
+        self.response("250 Requested file action okay, completed. (DELE #{file})")
+      end
 
-    def eprt(arg)
-      _, _, host, port = arg.split("|")
+      def eprt(arg)
+        _, _, host, port = arg.split("|")
 
-      @datasocket = TCPSocket.new(host, port)
-      self.response("200 port opened")
-    end
+        @datasocket = TCPSocket.new(host, port)
+        self.response("200 port opened")
+      end
 
-    def help(param = :default)
-      if param == :default
-        self.response("211 System status, or system help reply. (HELP)")
-      else
-        self.response("211 System status, or system help reply. (HELP #{param})")
+      def help(param = :default)
+        if param == :default
+          self.response("211 System status, or system help reply. (HELP)")
+        else
+          self.response("211 System status, or system help reply. (HELP #{param})")
+        end
       end
-    end
 
-    def list(folder)
-      self.response("150 opening ASCII connection for file list")
-      @datasocket.puts("-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb")
-      @datasocket.puts("-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb")
-      @datasocket.puts("-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb")
-      @datasocket.close()
-      self.response("226 transfer complete (LIST #{folder})")
-    end
+      def list(folder)
+        self.response("150 opening ASCII connection for file list")
+        @datasocket.puts("-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb")
+        @datasocket.puts("-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb")
+        @datasocket.puts("-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb")
+        @datasocket.close()
+        self.response("226 transfer complete (LIST #{folder})")
+      end
 
-    def mdtm(filename)
-      self.response("213 19980705132316")
-    end
+      def mdtm(filename)
+        self.response("213 19980705132316")
+      end
 
-    def mkd(foldername)
-      self.response(%Q{257 "#{foldername.gsub('"', '""')}" created.})
-    end
+      def mkd(foldername)
+        self.response(%Q{257 "#{foldername.gsub('"', '""')}" created.})
+      end
 
-    def nlst(folder = nil)
-      self.response("150 opening ASCII connection for file list")
-      @datasocket.puts("last_response_code.rb")
-      @datasocket.puts("list.rb")
-      @datasocket.puts("pwd.rb")
-      @datasocket.close()
-      self.response("226 transfer complete (NLST#{folder ? " #{folder}" : ""})")
-    end
+      def nlst(folder = nil)
+        self.response("150 opening ASCII connection for file list")
+        @datasocket.puts("last_response_code.rb")
+        @datasocket.puts("list.rb")
+        @datasocket.puts("pwd.rb")
+        @datasocket.close()
+        self.response("226 transfer complete (NLST#{folder ? " #{folder}" : ""})")
+      end
 
-    def noop
-      self.response("200 Command okay. (NOOP)")
-    end
+      def noop
+        self.response("200 Command okay. (NOOP)")
+      end
 
-    def pass(password)
-      @login_pass = password
-      self.response("230 User logged in, proceed. (PASS #{password})")
-    end
+      def pass(password)
+        @login_pass = password
+        self.response("230 User logged in, proceed. (PASS #{password})")
+      end
 
-    def port(arg)
-      nums = arg.split(",")
+      def port(arg)
+        nums = arg.split(",")
+
+        if nums[0] == "::1"
+          # IPv6
+          port = nums[1].to_i * 256 + nums[2].to_i
+          host = nums[0]
+        else
+          # IPv4
+          port = nums[4].to_i * 256 + nums[5].to_i
+          host = nums[0..3].join(".")
+        end
 
-      if nums[0] == "::1"
-        # IPv6
-        port = nums[1].to_i * 256 + nums[2].to_i
-        host = nums[0]
-      else
-        # IPv4
-        port = nums[4].to_i * 256 + nums[5].to_i
-        host = nums[0..3].join(".")
+        @datasocket = TCPSocket.new(host, port)
+        self.response("200 port opened")
       end
 
-      @datasocket = TCPSocket.new(host, port)
-      self.response("200 port opened")
-    end
-
-    def pwd
-      self.response('257 "/some/dir/" - current directory')
-    end
+      def pwd
+        self.response('257 "/some/dir/" - current directory')
+      end
 
-    def retr(file)
-      self.response("125 Data transfer starting")
-      if @restart_at && @restart_at == 20
-        @datasocket.puts("of the file named '#{file}'.")
-        @restart_at = nil
-      else
-        @datasocket.puts("This is the content")
-        @datasocket.puts("of the file named '#{file}'.")
-      end
-      @datasocket.close()
-      self.response("226 Closing data connection. (RETR #{file})")
-    end
+      def retr(file)
+        self.response("125 Data transfer starting")
+        if @restart_at && @restart_at == 20
+          @datasocket.puts("of the file named '#{file}'.")
+          @restart_at = nil
+        else
+          @datasocket.puts("This is the content")
+          @datasocket.puts("of the file named '#{file}'.")
+        end
+        @datasocket.close()
+        self.response("226 Closing data connection. (RETR #{file})")
+      end
 
-    def rest(at_bytes)
-      @restart_at = at_bytes.to_i
-      self.response("350 Requested file action pending further information. (REST)")
-    end
+      def rest(at_bytes)
+        @restart_at = at_bytes.to_i
+        self.response("350 Requested file action pending further information. (REST)")
+      end
 
-    def rmd(folder)
-      self.response("250 Requested file action okay, completed. (RMD #{folder})")
-    end
+      def rmd(folder)
+        self.response("250 Requested file action okay, completed. (RMD #{folder})")
+      end
 
-    def rnfr(from)
-      @rename_from = from
-      self.response("350 Requested file action pending further information.")
-    end
+      def rnfr(from)
+        @rename_from = from
+        self.response("350 Requested file action pending further information.")
+      end
 
-    def rnto(to)
-      self.response("250 Requested file action okay, completed. (Renamed #{@rename_from} to #{to})")
-      @rename_from = nil
-    end
+      def rnto(to)
+        self.response("250 Requested file action okay, completed. (Renamed #{@rename_from} to #{to})")
+        @rename_from = nil
+      end
 
-    def site(param)
-      self.response("200 Command okay. (SITE #{param})")
-    end
+      def site(param)
+        self.response("200 Command okay. (SITE #{param})")
+      end
 
-    def size(filename)
-      if filename == "binary"
-        self.response("213 24")
-      else
-        self.response("213 1024")
+      def size(filename)
+        if filename == "binary"
+          self.response("213 24")
+        else
+          self.response("213 1024")
+        end
       end
-    end
 
-    def stat(param = :default)
-      if param == :default
-        self.response("211 System status, or system help reply. (STAT)")
-      else
-        self.response("211 System status, or system help reply. (STAT #{param})")
+      def stat(param = :default)
+        if param == :default
+          self.response("211 System status, or system help reply. (STAT)")
+        else
+          self.response("211 System status, or system help reply. (STAT #{param})")
+        end
       end
-    end
 
-    def stor(file)
-      tmp_file = tmp("#{file}file", false)
+      def stor(file)
+        tmp_file = tmp("#{file}file", false)
 
-      self.response("125 Data transfer starting.")
+        self.response("125 Data transfer starting.")
 
-      mode = @restart_at ? "a" : "w"
+        mode = @restart_at ? "a" : "w"
 
-      File.open(tmp_file, mode + "b") do |f|
-        loop do
-          data = @datasocket.recv(1024)
-          break if !data || data.empty?
-          f << data
+        File.open(tmp_file, mode + "b") do |f|
+          loop do
+            data = @datasocket.recv(1024)
+            break if !data || data.empty?
+            f << data
+          end
         end
-      end
 
-      @datasocket.close()
-      self.response("200 OK, Data received. (STOR #{file})")
-    end
+        @datasocket.close()
+        self.response("200 OK, Data received. (STOR #{file})")
+      end
 
-    def appe(file)
-      @restart_at = true
-      stor(file)
-    end
+      def appe(file)
+        @restart_at = true
+        stor(file)
+      end
 
-    def syst
-      self.response("215 FTP Dummy Server (SYST)")
-    end
+      def syst
+        self.response("215 FTP Dummy Server (SYST)")
+      end
 
-    def type(type)
-      self.response("200 TYPE switched to #{type}")
-    end
+      def type(type)
+        self.response("200 TYPE switched to #{type}")
+      end
 
-    def user(name)
-      @login_user = name
-      self.response("230 User logged in, proceed. (USER #{name})")
+      def user(name)
+        @login_user = name
+        self.response("230 User logged in, proceed. (USER #{name})")
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/get_spec.rb b/spec/ruby/library/net-ftp/get_spec.rb
index 1bc1bd744bb..6a8aa3e206c 100644
--- a/spec/ruby/library/net-ftp/get_spec.rb
+++ b/spec/ruby/library/net-ftp/get_spec.rb
@@ -1,21 +1,24 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/gettextfile'
-require_relative 'shared/getbinaryfile'
 
-describe "Net::FTP#get (binary mode)" do
-  before :each do
-    @binary_mode = true
-  end
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/gettextfile'
+  require_relative 'shared/getbinaryfile'
 
-  it_behaves_like :net_ftp_getbinaryfile, :get
-end
+  describe "Net::FTP#get (binary mode)" do
+    before :each do
+      @binary_mode = true
+    end
 
-describe "Net::FTP#get (text mode)" do
-  before :each do
-    @binary_mode = false
+    it_behaves_like :net_ftp_getbinaryfile, :get
   end
 
-  it_behaves_like :net_ftp_gettextfile, :get
+  describe "Net::FTP#get (text mode)" do
+    before :each do
+      @binary_mode = false
+    end
+
+    it_behaves_like :net_ftp_gettextfile, :get
+  end
 end
diff --git a/spec/ruby/library/net-ftp/getbinaryfile_spec.rb b/spec/ruby/library/net-ftp/getbinaryfile_spec.rb
index e9898fccc7c..6b2d38edf55 100644
--- a/spec/ruby/library/net-ftp/getbinaryfile_spec.rb
+++ b/spec/ruby/library/net-ftp/getbinaryfile_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/getbinaryfile'
 
-describe "Net::FTP#getbinaryfile" do
-  it_behaves_like :net_ftp_getbinaryfile, :getbinaryfile
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/getbinaryfile'
+
+  describe "Net::FTP#getbinaryfile" do
+    it_behaves_like :net_ftp_getbinaryfile, :getbinaryfile
+  end
 end
diff --git a/spec/ruby/library/net-ftp/getdir_spec.rb b/spec/ruby/library/net-ftp/getdir_spec.rb
index 756d6a23af0..2ff62d399de 100644
--- a/spec/ruby/library/net-ftp/getdir_spec.rb
+++ b/spec/ruby/library/net-ftp/getdir_spec.rb
@@ -1,7 +1,10 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'shared/pwd'
 
-describe "Net::FTP#getdir" do
-  it_behaves_like :net_ftp_pwd, :getdir
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'shared/pwd'
+
+  describe "Net::FTP#getdir" do
+    it_behaves_like :net_ftp_pwd, :getdir
+  end
 end
diff --git a/spec/ruby/library/net-ftp/gettextfile_spec.rb b/spec/ruby/library/net-ftp/gettextfile_spec.rb
index cdd1b4c797b..3bb037663b7 100644
--- a/spec/ruby/library/net-ftp/gettextfile_spec.rb
+++ b/spec/ruby/library/net-ftp/gettextfile_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/gettextfile'
 
-describe "Net::FTP#gettextfile" do
-  it_behaves_like :net_ftp_gettextfile, :gettextfile
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/gettextfile'
+
+  describe "Net::FTP#gettextfile" do
+    it_behaves_like :net_ftp_gettextfile, :gettextfile
+  end
 end
diff --git a/spec/ruby/library/net-ftp/help_spec.rb b/spec/ruby/library/net-ftp/help_spec.rb
index c562be50b2b..bb52fb9e696 100644
--- a/spec/ruby/library/net-ftp/help_spec.rb
+++ b/spec/ruby/library/net-ftp/help_spec.rb
@@ -1,66 +1,69 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#help" do
-  def with_connection
-    yield
-  end
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+  describe "Net::FTP#help" do
+    def with_connection
+      yield
+    end
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "writes the HELP command to the server" do
-    @ftp.help
-    @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "returns the server's response" do
-    @ftp.help.should == "211 System status, or system help reply. (HELP)\n"
-  end
+    it "writes the HELP command to the server" do
+      @ftp.help
+      @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
+    end
 
-  it "writes the HELP command with an optional parameter to the socket" do
-    @ftp.help("some parameter").should == "211 System status, or system help reply. (HELP some parameter)\n"
-  end
+    it "returns the server's response" do
+      @ftp.help.should == "211 System status, or system help reply. (HELP)\n"
+    end
 
-  it "does not raise any error when the response code is 211" do
-    @server.should_receive(:help).and_respond("211 System status, or system help reply.")
-    -> { @ftp.help }.should_not raise_error
-  end
+    it "writes the HELP command with an optional parameter to the socket" do
+      @ftp.help("some parameter").should == "211 System status, or system help reply. (HELP some parameter)\n"
+    end
 
-  it "does not raise any error when the response code is 214" do
-    @server.should_receive(:help).and_respond("214 Help message.")
-    -> { @ftp.help }.should_not raise_error
-  end
+    it "does not raise any error when the response code is 211" do
+      @server.should_receive(:help).and_respond("211 System status, or system help reply.")
+      -> { @ftp.help }.should_not.raise
+    end
 
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:help).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.help }.should raise_error(Net::FTPPermError)
-  end
+    it "does not raise any error when the response code is 214" do
+      @server.should_receive(:help).and_respond("214 Help message.")
+      -> { @ftp.help }.should_not.raise
+    end
 
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:help).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.help }.should raise_error(Net::FTPPermError)
-  end
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:help).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.help }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:help).and_respond("502 Command not implemented.")
-    -> { @ftp.help }.should raise_error(Net::FTPPermError)
-  end
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:help).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.help }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:help).and_respond("502 Command not implemented.")
+      -> { @ftp.help }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:help).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.help }.should raise_error(Net::FTPTempError)
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:help).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.help }.should.raise(Net::FTPTempError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/initialize_spec.rb b/spec/ruby/library/net-ftp/initialize_spec.rb
index 4d775e8dc12..9079ad6b795 100644
--- a/spec/ruby/library/net-ftp/initialize_spec.rb
+++ b/spec/ruby/library/net-ftp/initialize_spec.rb
@@ -1,402 +1,405 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-
-describe "Net::FTP#initialize" do
-  before :each do
-    @ftp = Net::FTP.allocate
-    @ftp.stub!(:connect)
-    @port_args = []
-    @port_args << 21
-  end
 
-  it "is private" do
-    Net::FTP.should have_private_instance_method(:initialize)
-  end
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-  it "sets self into binary mode" do
-    @ftp.binary.should be_nil
-    @ftp.send(:initialize)
-    @ftp.binary.should be_true
-  end
-
-  it "sets self into active mode" do
-    @ftp.passive.should be_nil
-    @ftp.send(:initialize)
-    @ftp.passive.should be_false
-  end
+  describe "Net::FTP#initialize" do
+    before :each do
+      @ftp = Net::FTP.allocate
+      @ftp.stub!(:connect)
+      @port_args = []
+      @port_args << 21
+    end
 
-  it "sets self into non-debug mode" do
-    @ftp.debug_mode.should be_nil
-    @ftp.send(:initialize)
-    @ftp.debug_mode.should be_false
-  end
+    it "is private" do
+      Net::FTP.private_instance_methods(false).should.include?(:initialize)
+    end
 
-  it "sets self to not resume file uploads/downloads" do
-    @ftp.resume.should be_nil
-    @ftp.send(:initialize)
-    @ftp.resume.should be_false
-  end
+    it "sets self into binary mode" do
+      @ftp.binary.should == nil
+      @ftp.send(:initialize)
+      @ftp.binary.should == true
+    end
 
-  describe "when passed no arguments" do
-    it "does not try to connect" do
-      @ftp.should_not_receive(:connect)
+    it "sets self into active mode" do
+      @ftp.passive.should == nil
       @ftp.send(:initialize)
+      @ftp.passive.should == false
     end
-  end
 
-  describe "when passed host" do
-    it "tries to connect to the passed host" do
-      @ftp.should_receive(:connect).with("localhost", *@port_args)
-      @ftp.send(:initialize, "localhost")
+    it "sets self into non-debug mode" do
+      @ftp.debug_mode.should == nil
+      @ftp.send(:initialize)
+      @ftp.debug_mode.should == false
     end
-  end
 
-  describe "when passed host, user" do
-    it "tries to connect to the passed host" do
-      @ftp.should_receive(:connect).with("localhost", *@port_args)
-      @ftp.send(:initialize, "localhost")
+    it "sets self to not resume file uploads/downloads" do
+      @ftp.resume.should == nil
+      @ftp.send(:initialize)
+      @ftp.resume.should == false
     end
 
-    it "tries to login with the passed username" do
-      @ftp.should_receive(:login).with("rubyspec", nil, nil)
-      @ftp.send(:initialize, "localhost", "rubyspec")
+    describe "when passed no arguments" do
+      it "does not try to connect" do
+        @ftp.should_not_receive(:connect)
+        @ftp.send(:initialize)
+      end
     end
-  end
 
-  describe "when passed host, user, password" do
-    it "tries to connect to the passed host" do
-      @ftp.should_receive(:connect).with("localhost", *@port_args)
-      @ftp.send(:initialize, "localhost")
+    describe "when passed host" do
+      it "tries to connect to the passed host" do
+        @ftp.should_receive(:connect).with("localhost", *@port_args)
+        @ftp.send(:initialize, "localhost")
+      end
     end
 
-    it "tries to login with the passed username and password" do
-      @ftp.should_receive(:login).with("rubyspec", "rocks", nil)
-      @ftp.send(:initialize, "localhost", "rubyspec", "rocks")
+    describe "when passed host, user" do
+      it "tries to connect to the passed host" do
+        @ftp.should_receive(:connect).with("localhost", *@port_args)
+        @ftp.send(:initialize, "localhost")
+      end
+
+      it "tries to login with the passed username" do
+        @ftp.should_receive(:login).with("rubyspec", nil, nil)
+        @ftp.send(:initialize, "localhost", "rubyspec")
+      end
     end
-  end
 
-  describe "when passed host, user" do
-    it "tries to connect to the passed host" do
-      @ftp.should_receive(:connect).with("localhost", *@port_args)
-      @ftp.send(:initialize, "localhost")
+    describe "when passed host, user, password" do
+      it "tries to connect to the passed host" do
+        @ftp.should_receive(:connect).with("localhost", *@port_args)
+        @ftp.send(:initialize, "localhost")
+      end
+
+      it "tries to login with the passed username and password" do
+        @ftp.should_receive(:login).with("rubyspec", "rocks", nil)
+        @ftp.send(:initialize, "localhost", "rubyspec", "rocks")
+      end
     end
 
-    it "tries to login with the passed username, password and account" do
-      @ftp.should_receive(:login).with("rubyspec", "rocks", "account")
-      @ftp.send(:initialize, "localhost", "rubyspec", "rocks", "account")
+    describe "when passed host, user" do
+      it "tries to connect to the passed host" do
+        @ftp.should_receive(:connect).with("localhost", *@port_args)
+        @ftp.send(:initialize, "localhost")
+      end
+
+      it "tries to login with the passed username, password and account" do
+        @ftp.should_receive(:login).with("rubyspec", "rocks", "account")
+        @ftp.send(:initialize, "localhost", "rubyspec", "rocks", "account")
+      end
     end
-  end
 
-  before :each do
-    @ftp.stub!(:login)
-  end
+    before :each do
+      @ftp.stub!(:login)
+    end
 
-  describe 'when the host' do
-    describe 'is set' do
-      describe 'and port option' do
-        describe 'is set' do
-          it 'tries to connect to the host on the specified port' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ port: 8080 })
-            @ftp.should_receive(:connect).with('localhost', 8080)
+    describe 'when the host' do
+      describe 'is set' do
+        describe 'and port option' do
+          describe 'is set' do
+            it 'tries to connect to the host on the specified port' do
+              options = mock('ftp initialize options')
+              options.should_receive(:to_hash).and_return({ port: 8080 })
+              @ftp.should_receive(:connect).with('localhost', 8080)
 
-            @ftp.send(:initialize, 'localhost', options)
+              @ftp.send(:initialize, 'localhost', options)
+            end
           end
-        end
 
-        describe 'is not set' do
-          it 'tries to connect to the host without a port' do
-            @ftp.should_receive(:connect).with("localhost", *@port_args)
+          describe 'is not set' do
+            it 'tries to connect to the host without a port' do
+              @ftp.should_receive(:connect).with("localhost", *@port_args)
 
-            @ftp.send(:initialize, 'localhost')
+              @ftp.send(:initialize, 'localhost')
+            end
           end
         end
-      end
 
-      describe 'when the username option' do
-        describe 'is set' do
-          describe 'and the password option' do
-            describe 'is set' do
-              describe 'and the account option' do
-                describe 'is set' do
-                  it 'tries to log in with the supplied parameters' do
-                    options = mock('ftp initialize options')
-                    options.should_receive(:to_hash).and_return({ username: 'a', password: 'topsecret', account: 'b' })
-                    @ftp.should_receive(:login).with('a', 'topsecret', 'b')
-
-                    @ftp.send(:initialize, 'localhost', options)
+        describe 'when the username option' do
+          describe 'is set' do
+            describe 'and the password option' do
+              describe 'is set' do
+                describe 'and the account option' do
+                  describe 'is set' do
+                    it 'tries to log in with the supplied parameters' do
+                      options = mock('ftp initialize options')
+                      options.should_receive(:to_hash).and_return({ username: 'a', password: 'topsecret', account: 'b' })
+                      @ftp.should_receive(:login).with('a', 'topsecret', 'b')
+
+                      @ftp.send(:initialize, 'localhost', options)
+                    end
                   end
-                end
 
-                describe 'is unset' do
-                  it 'tries to log in with the supplied parameters' do
-                    options = mock('ftp initialize options')
-                    options.should_receive(:to_hash).and_return({ username: 'a', password: 'topsecret' })
-                    @ftp.should_receive(:login).with('a', 'topsecret', nil)
+                  describe 'is unset' do
+                    it 'tries to log in with the supplied parameters' do
+                      options = mock('ftp initialize options')
+                      options.should_receive(:to_hash).and_return({ username: 'a', password: 'topsecret' })
+                      @ftp.should_receive(:login).with('a', 'topsecret', nil)
 
-                    @ftp.send(:initialize, 'localhost', options)
+                      @ftp.send(:initialize, 'localhost', options)
+                    end
                   end
                 end
               end
-            end
 
-            describe 'is unset' do
-              describe 'and the account option' do
-                describe 'is set' do
-                  it 'tries to log in with the supplied parameters' do
-                    options = mock('ftp initialize options')
-                    options.should_receive(:to_hash).and_return({ username: 'a', account: 'b' })
-                    @ftp.should_receive(:login).with('a', nil, 'b')
+              describe 'is unset' do
+                describe 'and the account option' do
+                  describe 'is set' do
+                    it 'tries to log in with the supplied parameters' do
+                      options = mock('ftp initialize options')
+                      options.should_receive(:to_hash).and_return({ username: 'a', account: 'b' })
+                      @ftp.should_receive(:login).with('a', nil, 'b')
 
-                    @ftp.send(:initialize, 'localhost', options)
+                      @ftp.send(:initialize, 'localhost', options)
+                    end
                   end
-                end
 
-                describe 'is unset' do
-                  it 'tries to log in with the supplied parameters' do
-                    options = mock('ftp initialize options')
-                    options.should_receive(:to_hash).and_return({ username: 'a'})
-                    @ftp.should_receive(:login).with('a', nil, nil)
+                  describe 'is unset' do
+                    it 'tries to log in with the supplied parameters' do
+                      options = mock('ftp initialize options')
+                      options.should_receive(:to_hash).and_return({ username: 'a'})
+                      @ftp.should_receive(:login).with('a', nil, nil)
 
-                    @ftp.send(:initialize, 'localhost', options)
+                      @ftp.send(:initialize, 'localhost', options)
+                    end
                   end
                 end
               end
             end
           end
-        end
 
-        describe 'is not set' do
-          it 'does not try to log in' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({})
-            @ftp.should_not_receive(:login)
+          describe 'is not set' do
+            it 'does not try to log in' do
+              options = mock('ftp initialize options')
+              options.should_receive(:to_hash).and_return({})
+              @ftp.should_not_receive(:login)
 
-            @ftp.send(:initialize, 'localhost', options)
+              @ftp.send(:initialize, 'localhost', options)
+            end
           end
         end
       end
-    end
 
-    describe 'is unset' do
-      it 'does not try to connect' do
-        @ftp.should_not_receive(:connect)
+      describe 'is unset' do
+        it 'does not try to connect' do
+          @ftp.should_not_receive(:connect)
 
-        @ftp.send(:initialize)
-      end
+          @ftp.send(:initialize)
+        end
 
-      it 'does not try to log in' do
-        @ftp.should_not_receive(:login)
+        it 'does not try to log in' do
+          @ftp.should_not_receive(:login)
 
-        @ftp.send(:initialize)
+          @ftp.send(:initialize)
+        end
       end
     end
-  end
 
-  describe 'when the passive option' do
-    describe 'is set' do
-      describe 'to true' do
-        it 'sets passive to true' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ passive: true })
+    describe 'when the passive option' do
+      describe 'is set' do
+        describe 'to true' do
+          it 'sets passive to true' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ passive: true })
 
-          @ftp.send(:initialize, nil, options)
-          @ftp.passive.should == true
+            @ftp.send(:initialize, nil, options)
+            @ftp.passive.should == true
+          end
+        end
+
+        describe 'to false' do
+          it 'sets passive to false' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ passive: false })
+
+            @ftp.send(:initialize, nil, options)
+            @ftp.passive.should == false
+          end
         end
       end
 
-      describe 'to false' do
+      describe 'is unset' do
         it 'sets passive to false' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ passive: false })
-
-          @ftp.send(:initialize, nil, options)
+          @ftp.send(:initialize)
           @ftp.passive.should == false
         end
       end
     end
 
-    describe 'is unset' do
-      it 'sets passive to false' do
-        @ftp.send(:initialize)
-        @ftp.passive.should == false
-      end
-    end
-  end
+    describe 'when the debug_mode option' do
+      describe 'is set' do
+        describe 'to true' do
+          it 'sets debug_mode to true' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ debug_mode: true })
 
-  describe 'when the debug_mode option' do
-    describe 'is set' do
-      describe 'to true' do
-        it 'sets debug_mode to true' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ debug_mode: true })
+            @ftp.send(:initialize, nil, options)
+            @ftp.debug_mode.should == true
+          end
+        end
 
-          @ftp.send(:initialize, nil, options)
-          @ftp.debug_mode.should == true
+        describe 'to false' do
+          it 'sets debug_mode to false' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ debug_mode: false })
+
+            @ftp.send(:initialize, nil, options)
+            @ftp.debug_mode.should == false
+          end
         end
       end
 
-      describe 'to false' do
+      describe 'is unset' do
         it 'sets debug_mode to false' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ debug_mode: false })
-
-          @ftp.send(:initialize, nil, options)
+          @ftp.send(:initialize)
           @ftp.debug_mode.should == false
         end
       end
     end
 
-    describe 'is unset' do
-      it 'sets debug_mode to false' do
-        @ftp.send(:initialize)
-        @ftp.debug_mode.should == false
-      end
-    end
-  end
-
-  describe 'when the open_timeout option' do
-    describe 'is set' do
-      it 'sets open_timeout to the specified value' do
-        options = mock('ftp initialize options')
-        options.should_receive(:to_hash).and_return({ open_timeout: 42 })
+    describe 'when the open_timeout option' do
+      describe 'is set' do
+        it 'sets open_timeout to the specified value' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ open_timeout: 42 })
 
-        @ftp.send(:initialize, nil, options)
-        @ftp.open_timeout.should == 42
+          @ftp.send(:initialize, nil, options)
+          @ftp.open_timeout.should == 42
+        end
       end
-    end
 
-    describe 'is not set' do
-      it 'sets open_timeout to nil' do
-        @ftp.send(:initialize)
-        @ftp.open_timeout.should == nil
+      describe 'is not set' do
+        it 'sets open_timeout to nil' do
+          @ftp.send(:initialize)
+          @ftp.open_timeout.should == nil
+        end
       end
     end
-  end
 
-  describe 'when the read_timeout option' do
-    describe 'is set' do
-      it 'sets read_timeout to the specified value' do
-        options = mock('ftp initialize options')
-        options.should_receive(:to_hash).and_return({ read_timeout: 100 })
+    describe 'when the read_timeout option' do
+      describe 'is set' do
+        it 'sets read_timeout to the specified value' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ read_timeout: 100 })
 
-        @ftp.send(:initialize, nil, options)
-        @ftp.read_timeout.should == 100
+          @ftp.send(:initialize, nil, options)
+          @ftp.read_timeout.should == 100
+        end
       end
-    end
 
-    describe 'is not set' do
-      it 'sets read_timeout to the default value' do
-        @ftp.send(:initialize)
-        @ftp.read_timeout.should == 60
+      describe 'is not set' do
+        it 'sets read_timeout to the default value' do
+          @ftp.send(:initialize)
+          @ftp.read_timeout.should == 60
+        end
       end
     end
-  end
 
-  describe 'when the ssl_handshake_timeout option' do
-    describe 'is set' do
-      it 'sets ssl_handshake_timeout to the specified value' do
-        options = mock('ftp initialize options')
-        options.should_receive(:to_hash).and_return({ ssl_handshake_timeout: 23 })
+    describe 'when the ssl_handshake_timeout option' do
+      describe 'is set' do
+        it 'sets ssl_handshake_timeout to the specified value' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ ssl_handshake_timeout: 23 })
 
-        @ftp.send(:initialize, nil, options)
-        @ftp.ssl_handshake_timeout.should == 23
+          @ftp.send(:initialize, nil, options)
+          @ftp.ssl_handshake_timeout.should == 23
+        end
       end
-    end
 
-    describe 'is not set' do
-      it 'sets ssl_handshake_timeout to nil' do
-        @ftp.send(:initialize)
-        @ftp.ssl_handshake_timeout.should == nil
+      describe 'is not set' do
+        it 'sets ssl_handshake_timeout to nil' do
+          @ftp.send(:initialize)
+          @ftp.ssl_handshake_timeout.should == nil
+        end
       end
     end
-  end
 
-  describe 'when the ssl option' do
-    describe 'is set' do
-      describe "and the ssl option's value is true" do
-        it 'initializes ssl_context to a blank SSLContext object' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ ssl: true })
+    describe 'when the ssl option' do
+      describe 'is set' do
+        describe "and the ssl option's value is true" do
+          it 'initializes ssl_context to a blank SSLContext object' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ ssl: true })
 
-          ssl_context = OpenSSL::SSL::SSLContext.allocate
-          ssl_context.stub!(:set_params)
+            ssl_context = OpenSSL::SSL::SSLContext.allocate
+            ssl_context.stub!(:set_params)
 
-          OpenSSL::SSL::SSLContext.should_receive(:new).and_return(ssl_context)
-          ssl_context.should_receive(:set_params).with({})
+            OpenSSL::SSL::SSLContext.should_receive(:new).and_return(ssl_context)
+            ssl_context.should_receive(:set_params).with({})
 
-          @ftp.send(:initialize, nil, options)
-          @ftp.instance_variable_get(:@ssl_context).should == ssl_context
+            @ftp.send(:initialize, nil, options)
+            @ftp.instance_variable_get(:@ssl_context).should == ssl_context
+          end
         end
-      end
 
-      describe "and the ssl option's value is a hash" do
-        it 'initializes ssl_context to a configured SSLContext object' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ ssl: {key: 'value'} })
+        describe "and the ssl option's value is a hash" do
+          it 'initializes ssl_context to a configured SSLContext object' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ ssl: {key: 'value'} })
 
-          ssl_context = OpenSSL::SSL::SSLContext.allocate
-          ssl_context.stub!(:set_params)
+            ssl_context = OpenSSL::SSL::SSLContext.allocate
+            ssl_context.stub!(:set_params)
 
-          OpenSSL::SSL::SSLContext.should_receive(:new).and_return(ssl_context)
-          ssl_context.should_receive(:set_params).with({key: 'value'})
+            OpenSSL::SSL::SSLContext.should_receive(:new).and_return(ssl_context)
+            ssl_context.should_receive(:set_params).with({key: 'value'})
 
-          @ftp.send(:initialize, nil, options)
-          @ftp.instance_variable_get(:@ssl_context).should == ssl_context
+            @ftp.send(:initialize, nil, options)
+            @ftp.instance_variable_get(:@ssl_context).should == ssl_context
+          end
         end
-      end
 
-      describe 'and private_data_connection' do
-        describe 'is set' do
-          it 'sets private_data_connection to that value' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ ssl: true, private_data_connection: 'true' })
+        describe 'and private_data_connection' do
+          describe 'is set' do
+            it 'sets private_data_connection to that value' do
+              options = mock('ftp initialize options')
+              options.should_receive(:to_hash).and_return({ ssl: true, private_data_connection: 'true' })
 
-            @ftp.send(:initialize, nil, options)
-            @ftp.instance_variable_get(:@private_data_connection).should == 'true'
+              @ftp.send(:initialize, nil, options)
+              @ftp.instance_variable_get(:@private_data_connection).should == 'true'
+            end
           end
-        end
 
-        describe 'is not set' do
-          it 'sets private_data_connection to nil' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ ssl: true })
+          describe 'is not set' do
+            it 'sets private_data_connection to nil' do
+              options = mock('ftp initialize options')
+              options.should_receive(:to_hash).and_return({ ssl: true })
 
-            @ftp.send(:initialize, nil, options)
-            @ftp.instance_variable_get(:@private_data_connection).should == true
+              @ftp.send(:initialize, nil, options)
+              @ftp.instance_variable_get(:@private_data_connection).should == true
+            end
           end
         end
       end
-    end
 
-    describe 'is not set' do
-      it 'sets ssl_context to nil' do
-        options = mock('ftp initialize options')
-        options.should_receive(:to_hash).and_return({})
+      describe 'is not set' do
+        it 'sets ssl_context to nil' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({})
 
-        @ftp.send(:initialize, nil, options)
-        @ftp.instance_variable_get(:@ssl_context).should == nil
-      end
+          @ftp.send(:initialize, nil, options)
+          @ftp.instance_variable_get(:@ssl_context).should == nil
+        end
 
-      describe 'private_data_connection' do
-        describe 'is set' do
-          it 'raises an ArgumentError' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ private_data_connection: true })
+        describe 'private_data_connection' do
+          describe 'is set' do
+            it 'raises an ArgumentError' do
+              options = mock('ftp initialize options')
+              options.should_receive(:to_hash).and_return({ private_data_connection: true })
 
-            -> {
-              @ftp.send(:initialize, nil, options)
-            }.should raise_error(ArgumentError, /private_data_connection can be set to true only when ssl is enabled/)
+              -> {
+                @ftp.send(:initialize, nil, options)
+              }.should.raise(ArgumentError, /private_data_connection can be set to true only when ssl is enabled/)
+            end
           end
-        end
 
-        describe 'is not set' do
-          it 'sets private_data_connection to false' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({})
+          describe 'is not set' do
+            it 'sets private_data_connection to false' do
+              options = mock('ftp initialize options')
+              options.should_receive(:to_hash).and_return({})
 
-            @ftp.send(:initialize, nil, options)
-            @ftp.instance_variable_get(:@private_data_connection).should == false
+              @ftp.send(:initialize, nil, options)
+              @ftp.instance_variable_get(:@private_data_connection).should == false
+            end
           end
         end
       end
diff --git a/spec/ruby/library/net-ftp/last_response_code_spec.rb b/spec/ruby/library/net-ftp/last_response_code_spec.rb
index c17c28f0f8d..03329758b51 100644
--- a/spec/ruby/library/net-ftp/last_response_code_spec.rb
+++ b/spec/ruby/library/net-ftp/last_response_code_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'shared/last_response_code'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#last_response_code" do
-  it_behaves_like :net_ftp_last_response_code, :last_response_code
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'shared/last_response_code'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#last_response_code" do
+    it_behaves_like :net_ftp_last_response_code, :last_response_code
+  end
 end
diff --git a/spec/ruby/library/net-ftp/last_response_spec.rb b/spec/ruby/library/net-ftp/last_response_spec.rb
index c9d9d70f35a..7cda9fa7a4a 100644
--- a/spec/ruby/library/net-ftp/last_response_spec.rb
+++ b/spec/ruby/library/net-ftp/last_response_spec.rb
@@ -1,25 +1,28 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#last_response" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#last_response" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "returns the last response" do
-    @ftp.last_response.should == "220 Dummy FTP Server ready!\n"
-    @ftp.help
-    @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
+    it "returns the last response" do
+      @ftp.last_response.should == "220 Dummy FTP Server ready!\n"
+      @ftp.help
+      @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/lastresp_spec.rb b/spec/ruby/library/net-ftp/lastresp_spec.rb
index e0c1b862a05..c373670ec4e 100644
--- a/spec/ruby/library/net-ftp/lastresp_spec.rb
+++ b/spec/ruby/library/net-ftp/lastresp_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'shared/last_response_code'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#lastresp" do
-  it_behaves_like :net_ftp_last_response_code, :lastresp
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'shared/last_response_code'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#lastresp" do
+    it_behaves_like :net_ftp_last_response_code, :lastresp
+  end
 end
diff --git a/spec/ruby/library/net-ftp/list_spec.rb b/spec/ruby/library/net-ftp/list_spec.rb
index 6cb1bbc4b8e..297d100dd99 100644
--- a/spec/ruby/library/net-ftp/list_spec.rb
+++ b/spec/ruby/library/net-ftp/list_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/list'
 
-describe "Net::FTP#list" do
-  it_behaves_like :net_ftp_list, :list
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/list'
+
+  describe "Net::FTP#list" do
+    it_behaves_like :net_ftp_list, :list
+  end
 end
diff --git a/spec/ruby/library/net-ftp/login_spec.rb b/spec/ruby/library/net-ftp/login_spec.rb
index 0de2f5cc630..05bb6b7f812 100644
--- a/spec/ruby/library/net-ftp/login_spec.rb
+++ b/spec/ruby/library/net-ftp/login_spec.rb
@@ -1,195 +1,198 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#login" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  describe "when passed no arguments" do
-    it "sends the USER command with 'anonymous' as name to the server" do
-      @ftp.login
-      @server.login_user.should == "anonymous"
-    end
-
-    it "sends 'anonymous@' as a password when required" do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @ftp.login
-      @server.login_pass.should == "anonymous@"
-    end
-
-    it "raises a Net::FTPReplyError when the server requests an account" do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @server.should_receive(:pass).and_respond("332 Need account for login.")
-      -> { @ftp.login }.should raise_error(Net::FTPReplyError)
-    end
-  end
-
-  describe "when passed name" do
-    it "sends the USER command with the passed name to the server" do
-      @ftp.login("rubyspec")
-      @server.login_user.should == "rubyspec"
-    end
-
-    it "raises a Net::FTPReplyError when the server requests a password, but none was given" do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      -> { @ftp.login("rubyspec") }.should raise_error(Net::FTPReplyError)
-    end
-
-    it "raises a Net::FTPReplyError when the server requests an account, but none was given" do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @server.should_receive(:pass).and_respond("332 Need account for login.")
-      -> { @ftp.login("rubyspec") }.should raise_error(Net::FTPReplyError)
-    end
-  end
-
-  describe "when passed name, password" do
-    it "sends the USER command with the passed name to the server" do
-      @ftp.login("rubyspec", "rocks")
-      @server.login_user.should == "rubyspec"
-    end
-
-    it "sends the passed password when required" do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @ftp.login("rubyspec", "rocks")
-      @server.login_pass.should == "rocks"
-    end
-
-    it "raises a Net::FTPReplyError when the server requests an account" do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @server.should_receive(:pass).and_respond("332 Need account for login.")
-      -> { @ftp.login("rubyspec", "rocks") }.should raise_error(Net::FTPReplyError)
-    end
-  end
-
-  describe "when passed name, password, account" do
-    it "sends the USER command with the passed name to the server" do
-      @ftp.login("rubyspec", "rocks", "account")
-      @server.login_user.should == "rubyspec"
-    end
-
-    it "sends the passed password when required" do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @ftp.login("rubyspec", "rocks", "account")
-      @server.login_pass.should == "rocks"
-    end
-
-    it "sends the passed account when required" do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @server.should_receive(:pass).and_respond("332 Need account for login.")
-      @ftp.login("rubyspec", "rocks", "account")
-      @server.login_acct.should == "account"
-    end
-  end
-
-  describe "when the USER command fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:user).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:user).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:user).and_respond("502 Command not implemented.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:user).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:user).and_respond("530 Not logged in.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-  end
-
-  describe "when the PASS command fails" do
+  describe "Net::FTP#login" do
     before :each do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-    end
-
-    it "does not raise an Error when the response code is 202" do
-      @server.should_receive(:pass).and_respond("202 Command not implemented, superfluous at this site.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should_not raise_error
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:pass).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:pass).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:pass).and_respond("502 Command not implemented.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:pass).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:pass).and_respond("530 Not logged in.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-  end
-
-  describe "when the ACCT command fails" do
-    before :each do
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @server.should_receive(:pass).and_respond("332 Need account for login.")
-    end
-
-    it "does not raise an Error when the response code is 202" do
-      @server.should_receive(:acct).and_respond("202 Command not implemented, superfluous at this site.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should_not raise_error
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:acct).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:acct).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:acct).and_respond("502 Command not implemented.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:acct).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:acct).and_respond("530 Not logged in.")
-      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    describe "when passed no arguments" do
+      it "sends the USER command with 'anonymous' as name to the server" do
+        @ftp.login
+        @server.login_user.should == "anonymous"
+      end
+
+      it "sends 'anonymous@' as a password when required" do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        @ftp.login
+        @server.login_pass.should == "anonymous@"
+      end
+
+      it "raises a Net::FTPReplyError when the server requests an account" do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        @server.should_receive(:pass).and_respond("332 Need account for login.")
+        -> { @ftp.login }.should.raise(Net::FTPReplyError)
+      end
+    end
+
+    describe "when passed name" do
+      it "sends the USER command with the passed name to the server" do
+        @ftp.login("rubyspec")
+        @server.login_user.should == "rubyspec"
+      end
+
+      it "raises a Net::FTPReplyError when the server requests a password, but none was given" do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        -> { @ftp.login("rubyspec") }.should.raise(Net::FTPReplyError)
+      end
+
+      it "raises a Net::FTPReplyError when the server requests an account, but none was given" do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        @server.should_receive(:pass).and_respond("332 Need account for login.")
+        -> { @ftp.login("rubyspec") }.should.raise(Net::FTPReplyError)
+      end
+    end
+
+    describe "when passed name, password" do
+      it "sends the USER command with the passed name to the server" do
+        @ftp.login("rubyspec", "rocks")
+        @server.login_user.should == "rubyspec"
+      end
+
+      it "sends the passed password when required" do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        @ftp.login("rubyspec", "rocks")
+        @server.login_pass.should == "rocks"
+      end
+
+      it "raises a Net::FTPReplyError when the server requests an account" do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        @server.should_receive(:pass).and_respond("332 Need account for login.")
+        -> { @ftp.login("rubyspec", "rocks") }.should.raise(Net::FTPReplyError)
+      end
+    end
+
+    describe "when passed name, password, account" do
+      it "sends the USER command with the passed name to the server" do
+        @ftp.login("rubyspec", "rocks", "account")
+        @server.login_user.should == "rubyspec"
+      end
+
+      it "sends the passed password when required" do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        @ftp.login("rubyspec", "rocks", "account")
+        @server.login_pass.should == "rocks"
+      end
+
+      it "sends the passed account when required" do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        @server.should_receive(:pass).and_respond("332 Need account for login.")
+        @ftp.login("rubyspec", "rocks", "account")
+        @server.login_acct.should == "account"
+      end
+    end
+
+    describe "when the USER command fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:user).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:user).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:user).and_respond("502 Command not implemented.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:user).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:user).and_respond("530 Not logged in.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+    end
+
+    describe "when the PASS command fails" do
+      before :each do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      end
+
+      it "does not raise an Error when the response code is 202" do
+        @server.should_receive(:pass).and_respond("202 Command not implemented, superfluous at this site.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should_not.raise
+      end
+
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:pass).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:pass).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:pass).and_respond("502 Command not implemented.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:pass).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:pass).and_respond("530 Not logged in.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+    end
+
+    describe "when the ACCT command fails" do
+      before :each do
+        @server.should_receive(:user).and_respond("331 User name okay, need password.")
+        @server.should_receive(:pass).and_respond("332 Need account for login.")
+      end
+
+      it "does not raise an Error when the response code is 202" do
+        @server.should_receive(:acct).and_respond("202 Command not implemented, superfluous at this site.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should_not.raise
+      end
+
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:acct).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:acct).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:acct).and_respond("502 Command not implemented.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:acct).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:acct).and_respond("530 Not logged in.")
+        -> { @ftp.login("rubyspec", "rocks", "account") }.should.raise(Net::FTPPermError)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/ls_spec.rb b/spec/ruby/library/net-ftp/ls_spec.rb
index acd7e9e5236..f8fdb10e8fc 100644
--- a/spec/ruby/library/net-ftp/ls_spec.rb
+++ b/spec/ruby/library/net-ftp/ls_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/list'
 
-describe "Net::FTP#ls" do
-  it_behaves_like :net_ftp_list, :ls
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/list'
+
+  describe "Net::FTP#ls" do
+    it_behaves_like :net_ftp_list, :ls
+  end
 end
diff --git a/spec/ruby/library/net-ftp/mdtm_spec.rb b/spec/ruby/library/net-ftp/mdtm_spec.rb
index a504507c84e..effd22a6e48 100644
--- a/spec/ruby/library/net-ftp/mdtm_spec.rb
+++ b/spec/ruby/library/net-ftp/mdtm_spec.rb
@@ -1,38 +1,41 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#mdtm" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#mdtm" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the MDTM with the passed filename command to the server" do
-    @ftp.mdtm("test.file")
-    @ftp.last_response.should == "213 19980705132316\n"
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "returns the last modification time of the passed file" do
-    @ftp.mdtm("test.file").should == "19980705132316"
-  end
+    it "sends the MDTM with the passed filename command to the server" do
+      @ftp.mdtm("test.file")
+      @ftp.last_response.should == "213 19980705132316\n"
+    end
 
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:mdtm).and_respond("550 Requested action not taken.")
-    -> { @ftp.mdtm("test.file") }.should raise_error(Net::FTPPermError)
-  end
+    it "returns the last modification time of the passed file" do
+      @ftp.mdtm("test.file").should == "19980705132316"
+    end
+
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:mdtm).and_respond("550 Requested action not taken.")
+      -> { @ftp.mdtm("test.file") }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:mdtm).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.mdtm("test.file") }.should raise_error(Net::FTPTempError)
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:mdtm).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.mdtm("test.file") }.should.raise(Net::FTPTempError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/mkdir_spec.rb b/spec/ruby/library/net-ftp/mkdir_spec.rb
index 8cc6ae785e6..6daeb7c0229 100644
--- a/spec/ruby/library/net-ftp/mkdir_spec.rb
+++ b/spec/ruby/library/net-ftp/mkdir_spec.rb
@@ -1,61 +1,64 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#mkdir" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#mkdir" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the MKD command with the passed pathname to the server" do
-    @ftp.mkdir("test.folder")
-    @ftp.last_response.should == %{257 "test.folder" created.\n}
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "returns the path to the newly created directory" do
-    @ftp.mkdir("test.folder").should == "test.folder"
-    @ftp.mkdir("/absolute/path/to/test.folder").should == "/absolute/path/to/test.folder"
-    @ftp.mkdir("relative/path/to/test.folder").should == "relative/path/to/test.folder"
-    @ftp.mkdir('/usr/dm/foo"bar').should == '/usr/dm/foo"bar'
-  end
+    it "sends the MKD command with the passed pathname to the server" do
+      @ftp.mkdir("test.folder")
+      @ftp.last_response.should == %{257 "test.folder" created.\n}
+    end
 
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:mkd).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-  end
+    it "returns the path to the newly created directory" do
+      @ftp.mkdir("test.folder").should == "test.folder"
+      @ftp.mkdir("/absolute/path/to/test.folder").should == "/absolute/path/to/test.folder"
+      @ftp.mkdir("relative/path/to/test.folder").should == "relative/path/to/test.folder"
+      @ftp.mkdir('/usr/dm/foo"bar').should == '/usr/dm/foo"bar'
+    end
 
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:mkd).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-  end
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:mkd).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.mkdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:mkd).and_respond("502 Command not implemented.")
-    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-  end
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:mkd).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.mkdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:mkd).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPTempError)
-  end
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:mkd).and_respond("502 Command not implemented.")
+      -> { @ftp.mkdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPPermError when the response code is 530" do
-    @server.should_receive(:mkd).and_respond("530 Not logged in.")
-    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-  end
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:mkd).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.mkdir("test.folder") }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:mkd).and_respond("530 Not logged in.")
+      -> { @ftp.mkdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:mkd).and_respond("550 Requested action not taken.")
-    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:mkd).and_respond("550 Requested action not taken.")
+      -> { @ftp.mkdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/mtime_spec.rb b/spec/ruby/library/net-ftp/mtime_spec.rb
index 9dde1278a84..694036a2960 100644
--- a/spec/ruby/library/net-ftp/mtime_spec.rb
+++ b/spec/ruby/library/net-ftp/mtime_spec.rb
@@ -1,50 +1,53 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#mtime" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#mtime" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the MDTM with the passed filename command to the server" do
-    @ftp.mtime("test.file")
-    @ftp.last_response.should == "213 19980705132316\n"
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  describe "when passed filename" do
-    it "returns the last modification time of the passed file as a Time object in the local time" do
-      @ftp.mtime("test.file").should == Time.gm("1998", "07", "05", "13", "23", "16")
+    it "sends the MDTM with the passed filename command to the server" do
+      @ftp.mtime("test.file")
+      @ftp.last_response.should == "213 19980705132316\n"
     end
-  end
 
-  describe "when passed filename, local_time" do
-    it "returns the last modification time as a Time object in UTC when local_time is true" do
-      @ftp.mtime("test.file", true).should == Time.local("1998", "07", "05", "13", "23", "16")
+    describe "when passed filename" do
+      it "returns the last modification time of the passed file as a Time object in the local time" do
+        @ftp.mtime("test.file").should == Time.gm("1998", "07", "05", "13", "23", "16")
+      end
     end
 
-    it "returns the last modification time as a Time object in the local time when local_time is false" do
-      @ftp.mtime("test.file", false).should == Time.gm("1998", "07", "05", "13", "23", "16")
+    describe "when passed filename, local_time" do
+      it "returns the last modification time as a Time object in UTC when local_time is true" do
+        @ftp.mtime("test.file", true).should == Time.local("1998", "07", "05", "13", "23", "16")
+      end
+
+      it "returns the last modification time as a Time object in the local time when local_time is false" do
+        @ftp.mtime("test.file", false).should == Time.gm("1998", "07", "05", "13", "23", "16")
+      end
     end
-  end
 
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:mdtm).and_respond("550 Requested action not taken.")
-    -> { @ftp.mtime("test.file") }.should raise_error(Net::FTPPermError)
-  end
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:mdtm).and_respond("550 Requested action not taken.")
+      -> { @ftp.mtime("test.file") }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:mdtm).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.mtime("test.file") }.should raise_error(Net::FTPTempError)
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:mdtm).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.mtime("test.file") }.should.raise(Net::FTPTempError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/nlst_spec.rb b/spec/ruby/library/net-ftp/nlst_spec.rb
index 2f22543af61..87b80b43fde 100644
--- a/spec/ruby/library/net-ftp/nlst_spec.rb
+++ b/spec/ruby/library/net-ftp/nlst_spec.rb
@@ -1,92 +1,95 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#nlst" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.passive = false
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+  describe "Net::FTP#nlst" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  describe "when passed no arguments" do
-    it "returns an Array containing a list of files in the current dir" do
-      @ftp.nlst.should == ["last_response_code.rb", "list.rb", "pwd.rb"]
-      @ftp.last_response.should == "226 transfer complete (NLST)\n"
+      @ftp = Net::FTP.new
+      @ftp.passive = false
+      @ftp.connect(@server.hostname, @server.server_port)
     end
-  end
 
-  describe "when passed dir" do
-    it "returns an Array containing a list of files in the passed dir" do
-      @ftp.nlst("test.folder").should == ["last_response_code.rb", "list.rb", "pwd.rb"]
-      @ftp.last_response.should == "226 transfer complete (NLST test.folder)\n"
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
     end
-  end
 
-  describe "when the NLST command fails" do
-    it "raises a Net::FTPTempError when the response code is 450" do
-      @server.should_receive(:nlst).and_respond("450 Requested file action not taken..")
-      -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
+    describe "when passed no arguments" do
+      it "returns an Array containing a list of files in the current dir" do
+        @ftp.nlst.should == ["last_response_code.rb", "list.rb", "pwd.rb"]
+        @ftp.last_response.should == "226 transfer complete (NLST)\n"
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:nlst).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+    describe "when passed dir" do
+      it "returns an Array containing a list of files in the passed dir" do
+        @ftp.nlst("test.folder").should == ["last_response_code.rb", "list.rb", "pwd.rb"]
+        @ftp.last_response.should == "226 transfer complete (NLST test.folder)\n"
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:nlst).and_respond("501 Syntax error, command unrecognized.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-    end
+    describe "when the NLST command fails" do
+      it "raises a Net::FTPTempError when the response code is 450" do
+        @server.should_receive(:nlst).and_respond("450 Requested file action not taken..")
+        -> { @ftp.nlst }.should.raise(Net::FTPTempError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:nlst).and_respond("502 Command not implemented.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:nlst).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.nlst }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:nlst).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:nlst).and_respond("501 Syntax error, command unrecognized.")
+        -> { @ftp.nlst }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:nlst).and_respond("530 Not logged in.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-    end
-  end
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:nlst).and_respond("502 Command not implemented.")
+        -> { @ftp.nlst }.should.raise(Net::FTPPermError)
+      end
 
-  describe "when opening the data port fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
-      @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:nlst).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.nlst }.should.raise(Net::FTPTempError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
-      @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:nlst).and_respond("530 Not logged in.")
+        -> { @ftp.nlst }.should.raise(Net::FTPPermError)
+      end
     end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
-      @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
-    end
+    describe "when opening the data port fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
+        @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.nlst }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
+        @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.nlst }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
+        @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.nlst }.should.raise(Net::FTPTempError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:eprt).and_respond("530 Not logged in.")
-      @server.should_receive(:port).and_respond("530 Not logged in.")
-      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:eprt).and_respond("530 Not logged in.")
+        @server.should_receive(:port).and_respond("530 Not logged in.")
+        -> { @ftp.nlst }.should.raise(Net::FTPPermError)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/noop_spec.rb b/spec/ruby/library/net-ftp/noop_spec.rb
index 4743a39ef68..43c48e355a3 100644
--- a/spec/ruby/library/net-ftp/noop_spec.rb
+++ b/spec/ruby/library/net-ftp/noop_spec.rb
@@ -1,38 +1,41 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#noop" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#noop" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the NOOP command to the server" do
-    @ftp.noop
-    @ftp.last_response.should == "200 Command okay. (NOOP)\n"
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "returns nil" do
-    @ftp.noop.should be_nil
-  end
+    it "sends the NOOP command to the server" do
+      @ftp.noop
+      @ftp.last_response.should == "200 Command okay. (NOOP)\n"
+    end
 
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:noop).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.noop }.should raise_error(Net::FTPPermError)
-  end
+    it "returns nil" do
+      @ftp.noop.should == nil
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:noop).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.noop }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:noop).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.noop }.should raise_error(Net::FTPTempError)
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:noop).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.noop }.should.raise(Net::FTPTempError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/open_spec.rb b/spec/ruby/library/net-ftp/open_spec.rb
index e59496dc3cf..2d6477ec4d3 100644
--- a/spec/ruby/library/net-ftp/open_spec.rb
+++ b/spec/ruby/library/net-ftp/open_spec.rb
@@ -1,55 +1,58 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP.open" do
-  before :each do
-    @ftp = mock("Net::FTP instance")
-    Net::FTP.stub!(:new).and_return(@ftp)
-  end
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-  describe "when passed no block" do
-    it "returns a new Net::FTP instance" do
-      Net::FTP.open("localhost").should equal(@ftp)
+  describe "Net::FTP.open" do
+    before :each do
+      @ftp = mock("Net::FTP instance")
+      Net::FTP.stub!(:new).and_return(@ftp)
     end
 
-    it "passes the passed arguments down to Net::FTP.new" do
-      Net::FTP.should_receive(:new).with("localhost", "user", "password", "account")
-      Net::FTP.open("localhost", "user", "password", "account")
-    end
-  end
+    describe "when passed no block" do
+      it "returns a new Net::FTP instance" do
+        Net::FTP.open("localhost").should.equal?(@ftp)
+      end
 
-  describe "when passed a block" do
-    before :each do
-      @ftp.stub!(:close)
+      it "passes the passed arguments down to Net::FTP.new" do
+        Net::FTP.should_receive(:new).with("localhost", "user", "password", "account")
+        Net::FTP.open("localhost", "user", "password", "account")
+      end
     end
 
-    it "yields a new Net::FTP instance to the passed block" do
-      yielded = false
-      Net::FTP.open("localhost") do |ftp|
-        yielded = true
-        ftp.should equal(@ftp)
+    describe "when passed a block" do
+      before :each do
+        @ftp.stub!(:close)
       end
-      yielded.should be_true
-    end
 
-    it "closes the Net::FTP instance after yielding" do
-      Net::FTP.open("localhost") do |ftp|
-        ftp.should_receive(:close)
+      it "yields a new Net::FTP instance to the passed block" do
+        yielded = false
+        Net::FTP.open("localhost") do |ftp|
+          yielded = true
+          ftp.should.equal?(@ftp)
+        end
+        yielded.should == true
       end
-    end
 
-    it "closes the Net::FTP instance even if an exception is raised while yielding" do
-      begin
+      it "closes the Net::FTP instance after yielding" do
         Net::FTP.open("localhost") do |ftp|
           ftp.should_receive(:close)
-          raise ArgumentError, "some exception"
         end
-      rescue ArgumentError
       end
-    end
 
-    it "returns the block's return value" do
-      Net::FTP.open("localhost") { :test }.should == :test
+      it "closes the Net::FTP instance even if an exception is raised while yielding" do
+        begin
+          Net::FTP.open("localhost") do |ftp|
+            ftp.should_receive(:close)
+            raise ArgumentError, "some exception"
+          end
+        rescue ArgumentError
+        end
+      end
+
+      it "returns the block's return value" do
+        Net::FTP.open("localhost") { :test }.should == :test
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/passive_spec.rb b/spec/ruby/library/net-ftp/passive_spec.rb
index 97659f1b685..6acabd3f989 100644
--- a/spec/ruby/library/net-ftp/passive_spec.rb
+++ b/spec/ruby/library/net-ftp/passive_spec.rb
@@ -1,28 +1,31 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#passive" do
-  it "returns true when self is in passive mode" do
-    ftp = Net::FTP.new
-    ftp.passive.should be_false
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-    ftp.passive = true
-    ftp.passive.should be_true
-  end
+  describe "Net::FTP#passive" do
+    it "returns true when self is in passive mode" do
+      ftp = Net::FTP.new
+      ftp.passive.should == false
+
+      ftp.passive = true
+      ftp.passive.should == true
+    end
 
-  it "is the value of Net::FTP.default_value by default" do
-    ruby_exe(fixture(__FILE__, "passive.rb")).should == "true"
+    it "is the value of Net::FTP.default_value by default" do
+      ruby_exe(fixture(__FILE__, "passive.rb")).should == "true"
+    end
   end
-end
 
-describe "Net::FTP#passive=" do
-  it "sets self to passive mode when passed true" do
-    ftp = Net::FTP.new
+  describe "Net::FTP#passive=" do
+    it "sets self to passive mode when passed true" do
+      ftp = Net::FTP.new
 
-    ftp.passive = true
-    ftp.passive.should be_true
+      ftp.passive = true
+      ftp.passive.should == true
 
-    ftp.passive = false
-    ftp.passive.should be_false
+      ftp.passive = false
+      ftp.passive.should == false
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/put_spec.rb b/spec/ruby/library/net-ftp/put_spec.rb
index 6d40d3d5b99..603409e2834 100644
--- a/spec/ruby/library/net-ftp/put_spec.rb
+++ b/spec/ruby/library/net-ftp/put_spec.rb
@@ -1,21 +1,24 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/puttextfile'
-require_relative 'shared/putbinaryfile'
 
-describe "Net::FTP#put (binary mode)" do
-  before :each do
-    @binary_mode = true
-  end
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/puttextfile'
+  require_relative 'shared/putbinaryfile'
 
-  it_behaves_like :net_ftp_putbinaryfile, :put
-end
+  describe "Net::FTP#put (binary mode)" do
+    before :each do
+      @binary_mode = true
+    end
 
-describe "Net::FTP#put (text mode)" do
-  before :each do
-    @binary_mode = false
+    it_behaves_like :net_ftp_putbinaryfile, :put
   end
 
-  it_behaves_like :net_ftp_puttextfile, :put
+  describe "Net::FTP#put (text mode)" do
+    before :each do
+      @binary_mode = false
+    end
+
+    it_behaves_like :net_ftp_puttextfile, :put
+  end
 end
diff --git a/spec/ruby/library/net-ftp/putbinaryfile_spec.rb b/spec/ruby/library/net-ftp/putbinaryfile_spec.rb
index d0398229e56..ce8a6f04733 100644
--- a/spec/ruby/library/net-ftp/putbinaryfile_spec.rb
+++ b/spec/ruby/library/net-ftp/putbinaryfile_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/putbinaryfile'
 
-describe "Net::FTP#putbinaryfile" do
-  it_behaves_like :net_ftp_putbinaryfile, :putbinaryfile
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/putbinaryfile'
+
+  describe "Net::FTP#putbinaryfile" do
+    it_behaves_like :net_ftp_putbinaryfile, :putbinaryfile
+  end
 end
diff --git a/spec/ruby/library/net-ftp/puttextfile_spec.rb b/spec/ruby/library/net-ftp/puttextfile_spec.rb
index b8bcac33df6..b4ab86aab1b 100644
--- a/spec/ruby/library/net-ftp/puttextfile_spec.rb
+++ b/spec/ruby/library/net-ftp/puttextfile_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
-require_relative 'shared/puttextfile'
 
-describe "Net::FTP#puttextfile" do
-  it_behaves_like :net_ftp_puttextfile, :puttextfile
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+  require_relative 'shared/puttextfile'
+
+  describe "Net::FTP#puttextfile" do
+    it_behaves_like :net_ftp_puttextfile, :puttextfile
+  end
 end
diff --git a/spec/ruby/library/net-ftp/pwd_spec.rb b/spec/ruby/library/net-ftp/pwd_spec.rb
index 992e2c4ed24..53692b553f3 100644
--- a/spec/ruby/library/net-ftp/pwd_spec.rb
+++ b/spec/ruby/library/net-ftp/pwd_spec.rb
@@ -1,53 +1,56 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#pwd" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "sends the PWD command to the server" do
-    @ftp.pwd
-    @ftp.last_response.should == "257 \"/some/dir/\" - current directory\n"
-  end
-
-  it "returns the current directory" do
-    @ftp.pwd.should == "/some/dir/"
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:pwd).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:pwd).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:pwd).and_respond("502 Command not implemented.")
-    -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:pwd).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.pwd }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:pwd).and_respond("550 Requested action not taken.")
-    -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#pwd" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the PWD command to the server" do
+      @ftp.pwd
+      @ftp.last_response.should == "257 \"/some/dir/\" - current directory\n"
+    end
+
+    it "returns the current directory" do
+      @ftp.pwd.should == "/some/dir/"
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:pwd).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.pwd }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:pwd).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.pwd }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:pwd).and_respond("502 Command not implemented.")
+      -> { @ftp.pwd }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:pwd).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.pwd }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:pwd).and_respond("550 Requested action not taken.")
+      -> { @ftp.pwd }.should.raise(Net::FTPPermError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/quit_spec.rb b/spec/ruby/library/net-ftp/quit_spec.rb
index c5352ceadab..1af0107d344 100644
--- a/spec/ruby/library/net-ftp/quit_spec.rb
+++ b/spec/ruby/library/net-ftp/quit_spec.rb
@@ -1,33 +1,36 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#quit" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#quit" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the QUIT command to the server" do
-    @ftp.quit
-    @ftp.last_response.should == "221 OK, bye\n"
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "does not close the socket automatically" do
-    @ftp.quit
-    @ftp.closed?.should be_false
-  end
+    it "sends the QUIT command to the server" do
+      @ftp.quit
+      @ftp.last_response.should == "221 OK, bye\n"
+    end
+
+    it "does not close the socket automatically" do
+      @ftp.quit
+      @ftp.closed?.should == false
+    end
 
-  it "returns nil" do
-    @ftp.quit.should be_nil
+    it "returns nil" do
+      @ftp.quit.should == nil
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/rename_spec.rb b/spec/ruby/library/net-ftp/rename_spec.rb
index 48f81b7debf..6541fe53013 100644
--- a/spec/ruby/library/net-ftp/rename_spec.rb
+++ b/spec/ruby/library/net-ftp/rename_spec.rb
@@ -1,94 +1,97 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#rename" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  describe "when passed from_name, to_name" do
-    it "sends the RNFR command with the passed from_name and the RNTO command with the passed to_name to the server" do
-      @ftp.rename("from.file", "to.file")
-      @ftp.last_response.should == "250 Requested file action okay, completed. (Renamed from.file to to.file)\n"
-    end
-
-    it "returns something" do
-      @ftp.rename("from.file", "to.file").should be_nil
-    end
-  end
-
-  describe "when the RNFR command fails" do
-    it "raises a Net::FTPTempError when the response code is 450" do
-      @server.should_receive(:rnfr).and_respond("450 Requested file action not taken.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:rnfr).and_respond("550 Requested action not taken.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:rnfr).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-    end
+  describe "Net::FTP#rename" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:rnfr).and_respond("502 Command not implemented.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
     end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:rnfr).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
     end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:rnfr).and_respond("530 Not logged in.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-    end
-  end
-
-  describe "when the RNTO command fails" do
-    it "raises a Net::FTPPermError when the response code is 532" do
-      @server.should_receive(:rnfr).and_respond("532 Need account for storing files.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 553" do
-      @server.should_receive(:rnto).and_respond("553 Requested action not taken.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:rnto).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-    end
+    describe "when passed from_name, to_name" do
+      it "sends the RNFR command with the passed from_name and the RNTO command with the passed to_name to the server" do
+        @ftp.rename("from.file", "to.file")
+        @ftp.last_response.should == "250 Requested file action okay, completed. (Renamed from.file to to.file)\n"
+      end
 
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:rnto).and_respond("502 Command not implemented.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+      it "returns something" do
+        @ftp.rename("from.file", "to.file").should == nil
+      end
     end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:rnto).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
+    describe "when the RNFR command fails" do
+      it "raises a Net::FTPTempError when the response code is 450" do
+        @server.should_receive(:rnfr).and_respond("450 Requested file action not taken.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 550" do
+        @server.should_receive(:rnfr).and_respond("550 Requested action not taken.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:rnfr).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:rnfr).and_respond("502 Command not implemented.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:rnfr).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:rnfr).and_respond("530 Not logged in.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:rnto).and_respond("530 Not logged in.")
-      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    describe "when the RNTO command fails" do
+      it "raises a Net::FTPPermError when the response code is 532" do
+        @server.should_receive(:rnfr).and_respond("532 Need account for storing files.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 553" do
+        @server.should_receive(:rnto).and_respond("553 Requested action not taken.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:rnto).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:rnto).and_respond("502 Command not implemented.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:rnto).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:rnto).and_respond("530 Not logged in.")
+        -> { @ftp.rename("from.file", "to.file") }.should.raise(Net::FTPPermError)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/resume_spec.rb b/spec/ruby/library/net-ftp/resume_spec.rb
index 6592fc5bb03..5ec565d1559 100644
--- a/spec/ruby/library/net-ftp/resume_spec.rb
+++ b/spec/ruby/library/net-ftp/resume_spec.rb
@@ -1,23 +1,26 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#resume" do
-  it "returns true when self is set to resume uploads/downloads" do
-    ftp = Net::FTP.new
-    ftp.resume.should be_false
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-    ftp.resume = true
-    ftp.resume.should be_true
+  describe "Net::FTP#resume" do
+    it "returns true when self is set to resume uploads/downloads" do
+      ftp = Net::FTP.new
+      ftp.resume.should == false
+
+      ftp.resume = true
+      ftp.resume.should == true
+    end
   end
-end
 
-describe "Net::FTP#resume=" do
-  it "sets self to resume uploads/downloads when set to true" do
-    ftp = Net::FTP.new
-    ftp.resume = true
-    ftp.resume.should be_true
+  describe "Net::FTP#resume=" do
+    it "sets self to resume uploads/downloads when set to true" do
+      ftp = Net::FTP.new
+      ftp.resume = true
+      ftp.resume.should == true
 
-    ftp.resume = false
-    ftp.resume.should be_false
+      ftp.resume = false
+      ftp.resume.should == false
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/retrbinary_spec.rb b/spec/ruby/library/net-ftp/retrbinary_spec.rb
index de024208aa4..ff8c8098a4a 100644
--- a/spec/ruby/library/net-ftp/retrbinary_spec.rb
+++ b/spec/ruby/library/net-ftp/retrbinary_spec.rb
@@ -1,30 +1,33 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#retrbinary" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#retrbinary" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the passed command to the server" do
-    @ftp.retrbinary("RETR test", 4096) {}
-    @ftp.last_response.should == "226 Closing data connection. (RETR test)\n"
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the passed command to the server" do
+      @ftp.retrbinary("RETR test", 4096) {}
+      @ftp.last_response.should == "226 Closing data connection. (RETR test)\n"
+    end
 
-  it "yields the received content as binary blocks of the passed size" do
-    res = []
-    @ftp.retrbinary("RETR test", 10) { |bin| res << bin }
-    res.should == [ "This is th", "e content\n", "of the fil", "e named 't", "est'.\n" ]
+    it "yields the received content as binary blocks of the passed size" do
+      res = []
+      @ftp.retrbinary("RETR test", 10) { |bin| res << bin }
+      res.should == [ "This is th", "e content\n", "of the fil", "e named 't", "est'.\n" ]
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/retrlines_spec.rb b/spec/ruby/library/net-ftp/retrlines_spec.rb
index 866ecb5f409..2963da14f72 100644
--- a/spec/ruby/library/net-ftp/retrlines_spec.rb
+++ b/spec/ruby/library/net-ftp/retrlines_spec.rb
@@ -1,34 +1,37 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#retrlines" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#retrlines" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the passed command over the socket" do
-    @ftp.retrlines("LIST test.dir") {}
-    @ftp.last_response.should == "226 transfer complete (LIST test.dir)\n"
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the passed command over the socket" do
+      @ftp.retrlines("LIST test.dir") {}
+      @ftp.last_response.should == "226 transfer complete (LIST test.dir)\n"
+    end
 
-  it "yields each received line to the passed block" do
-    res = []
-    @ftp.retrlines("LIST test.dir") { |x| res << x }
-    res.should == [
-      "-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb",
-      "-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb",
-      "-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb"
-    ]
+    it "yields each received line to the passed block" do
+      res = []
+      @ftp.retrlines("LIST test.dir") { |x| res << x }
+      res.should == [
+        "-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb",
+        "-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb",
+        "-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb"
+      ]
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/return_code_spec.rb b/spec/ruby/library/net-ftp/return_code_spec.rb
index 35a6232f7ee..fcf5a32aa79 100644
--- a/spec/ruby/library/net-ftp/return_code_spec.rb
+++ b/spec/ruby/library/net-ftp/return_code_spec.rb
@@ -1,24 +1,27 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#return_code" do
-  before :each do
-    @ftp = Net::FTP.new
-  end
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
 
-  it "outputs a warning and returns a newline" do
-    -> do
-      @ftp.return_code.should == "\n"
-    end.should complain(/warning: Net::FTP#return_code is obsolete and do nothing/)
-  end
-end
+  describe "Net::FTP#return_code" do
+    before :each do
+      @ftp = Net::FTP.new
+    end
 
-describe "Net::FTP#return_code=" do
-  before :each do
-    @ftp = Net::FTP.new
+    it "outputs a warning and returns a newline" do
+      -> do
+        @ftp.return_code.should == "\n"
+      end.should complain(/warning: Net::FTP#return_code is obsolete and do nothing/)
+    end
   end
 
-  it "outputs a warning" do
-    -> { @ftp.return_code = 123 }.should complain(/warning: Net::FTP#return_code= is obsolete and do nothing/)
+  describe "Net::FTP#return_code=" do
+    before :each do
+      @ftp = Net::FTP.new
+    end
+
+    it "outputs a warning" do
+      -> { @ftp.return_code = 123 }.should complain(/warning: Net::FTP#return_code= is obsolete and do nothing/)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/rmdir_spec.rb b/spec/ruby/library/net-ftp/rmdir_spec.rb
index 400874d60db..23650ebcc86 100644
--- a/spec/ruby/library/net-ftp/rmdir_spec.rb
+++ b/spec/ruby/library/net-ftp/rmdir_spec.rb
@@ -1,58 +1,61 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#rmdir" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "sends the RMD command with the passed pathname to the server" do
-    @ftp.rmdir("test.folder")
-    @ftp.last_response.should == "250 Requested file action okay, completed. (RMD test.folder)\n"
-  end
-
-  it "returns nil" do
-    @ftp.rmdir("test.folder").should be_nil
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:rmd).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:rmd).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:rmd).and_respond("502 Command not implemented.")
-    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:rmd).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 530" do
-    @server.should_receive(:rmd).and_respond("530 Not logged in.")
-    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:rmd).and_respond("550 Requested action not taken.")
-    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#rmdir" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the RMD command with the passed pathname to the server" do
+      @ftp.rmdir("test.folder")
+      @ftp.last_response.should == "250 Requested file action okay, completed. (RMD test.folder)\n"
+    end
+
+    it "returns nil" do
+      @ftp.rmdir("test.folder").should == nil
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:rmd).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.rmdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:rmd).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.rmdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:rmd).and_respond("502 Command not implemented.")
+      -> { @ftp.rmdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:rmd).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.rmdir("test.folder") }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:rmd).and_respond("530 Not logged in.")
+      -> { @ftp.rmdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:rmd).and_respond("550 Requested action not taken.")
+      -> { @ftp.rmdir("test.folder") }.should.raise(Net::FTPPermError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/sendcmd_spec.rb b/spec/ruby/library/net-ftp/sendcmd_spec.rb
index c50b373869d..67dbd3bdb84 100644
--- a/spec/ruby/library/net-ftp/sendcmd_spec.rb
+++ b/spec/ruby/library/net-ftp/sendcmd_spec.rb
@@ -1,54 +1,57 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#sendcmd" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "sends the passed command to the server" do
-    @ftp.sendcmd("HELP")
-    @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
-  end
-
-  it "returns the server's response" do
-    @ftp.sendcmd("HELP").should == "211 System status, or system help reply. (HELP)\n"
-  end
-
-  it "raises no error when the response code is 1xx, 2xx or 3xx" do
-    @server.should_receive(:help).and_respond("120 Service ready in nnn minutes.")
-    -> { @ftp.sendcmd("HELP") }.should_not raise_error
-
-    @server.should_receive(:help).and_respond("200 Command okay.")
-    -> { @ftp.sendcmd("HELP") }.should_not raise_error
-
-    @server.should_receive(:help).and_respond("350 Requested file action pending further information.")
-    -> { @ftp.sendcmd("HELP") }.should_not raise_error
-  end
-
-  it "raises a Net::FTPTempError when the response code is 4xx" do
-    @server.should_receive(:help).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 5xx" do
-    @server.should_receive(:help).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPProtoError when the response code is not between 1xx-5xx" do
-    @server.should_receive(:help).and_respond("999 Invalid response.")
-    -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPProtoError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#sendcmd" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the passed command to the server" do
+      @ftp.sendcmd("HELP")
+      @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
+    end
+
+    it "returns the server's response" do
+      @ftp.sendcmd("HELP").should == "211 System status, or system help reply. (HELP)\n"
+    end
+
+    it "raises no error when the response code is 1xx, 2xx or 3xx" do
+      @server.should_receive(:help).and_respond("120 Service ready in nnn minutes.")
+      -> { @ftp.sendcmd("HELP") }.should_not.raise
+
+      @server.should_receive(:help).and_respond("200 Command okay.")
+      -> { @ftp.sendcmd("HELP") }.should_not.raise
+
+      @server.should_receive(:help).and_respond("350 Requested file action pending further information.")
+      -> { @ftp.sendcmd("HELP") }.should_not.raise
+    end
+
+    it "raises a Net::FTPTempError when the response code is 4xx" do
+      @server.should_receive(:help).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.sendcmd("HELP") }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 5xx" do
+      @server.should_receive(:help).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.sendcmd("HELP") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPProtoError when the response code is not between 1xx-5xx" do
+      @server.should_receive(:help).and_respond("999 Invalid response.")
+      -> { @ftp.sendcmd("HELP") }.should.raise(Net::FTPProtoError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/set_socket_spec.rb b/spec/ruby/library/net-ftp/set_socket_spec.rb
index 8182dd8b338..ad83dfcc4f4 100644
--- a/spec/ruby/library/net-ftp/set_socket_spec.rb
+++ b/spec/ruby/library/net-ftp/set_socket_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
 
-describe "Net::FTP#set_socket" do
-  # TODO: I won't spec this method, as it is not used
-  #       anywhere and it should be private anyway.
-  it "needs to be reviewed for spec completeness"
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+
+  describe "Net::FTP#set_socket" do
+    # TODO: I won't spec this method, as it is not used
+    #       anywhere and it should be private anyway.
+    it "needs to be reviewed for spec completeness"
+  end
 end
diff --git a/spec/ruby/library/net-ftp/shared/getbinaryfile.rb b/spec/ruby/library/net-ftp/shared/getbinaryfile.rb
index ceec8e7cd58..4fc4731c455 100644
--- a/spec/ruby/library/net-ftp/shared/getbinaryfile.rb
+++ b/spec/ruby/library/net-ftp/shared/getbinaryfile.rb
@@ -1,150 +1,152 @@
-describe :net_ftp_getbinaryfile, shared: true do
-  before :each do
-    @fixture_file = __dir__ + "/../fixtures/getbinaryfile"
-    @tmp_file = tmp("getbinaryfile")
+ruby_version_is ""..."4.1" do
+  describe :net_ftp_getbinaryfile, shared: true do
+    before :each do
+      @fixture_file = __dir__ + "/../fixtures/getbinaryfile"
+      @tmp_file = tmp("getbinaryfile")
 
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-    @ftp.binary = @binary_mode
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+      @ftp.binary = @binary_mode
+    end
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
 
-    rm_r @tmp_file
-  end
+      rm_r @tmp_file
+    end
 
-  it "sends the RETR command to the server" do
-    @ftp.send(@method, "test", @tmp_file)
-    @ftp.last_response.should == "226 Closing data connection. (RETR test)\n"
-  end
+    it "sends the RETR command to the server" do
+      @ftp.send(@method, "test", @tmp_file)
+      @ftp.last_response.should == "226 Closing data connection. (RETR test)\n"
+    end
 
-  it "returns nil" do
-    @ftp.send(@method, "test", @tmp_file).should be_nil
-  end
+    it "returns nil" do
+      @ftp.send(@method, "test", @tmp_file).should == nil
+    end
 
-  it "saves the contents of the passed remote file to the passed local file" do
-    @ftp.send(@method, "test", @tmp_file)
-    File.read(@tmp_file).should == "This is the content\nof the file named 'test'.\n"
-  end
+    it "saves the contents of the passed remote file to the passed local file" do
+      @ftp.send(@method, "test", @tmp_file)
+      File.read(@tmp_file).should == "This is the content\nof the file named 'test'.\n"
+    end
 
-  describe "when passed a block" do
-    it "yields the received content as binary blocks of the passed size" do
-      res = []
-      @ftp.send(@method, "test", @tmp_file, 10) { |bin| res << bin }
-      res.should == [ "This is th", "e content\n", "of the fil", "e named 't", "est'.\n" ]
+    describe "when passed a block" do
+      it "yields the received content as binary blocks of the passed size" do
+        res = []
+        @ftp.send(@method, "test", @tmp_file, 10) { |bin| res << bin }
+        res.should == [ "This is th", "e content\n", "of the fil", "e named 't", "est'.\n" ]
+      end
     end
-  end
 
-  describe "when resuming an existing file" do
-    before :each do
-      @tmp_file = tmp("getbinaryfile_resume")
+    describe "when resuming an existing file" do
+      before :each do
+        @tmp_file = tmp("getbinaryfile_resume")
 
-      File.open(@tmp_file, "wb") do |f|
-        f << "This is the content\n"
+        File.open(@tmp_file, "wb") do |f|
+          f << "This is the content\n"
+        end
+
+        @ftp.resume = true
       end
 
-      @ftp.resume = true
-    end
+      it "saves the remaining content of the passed remote file to the passed local file" do
+        @ftp.send(@method, "test", @tmp_file)
+        File.read(@tmp_file).should == "This is the content\nof the file named 'test'.\n"
+      end
 
-    it "saves the remaining content of the passed remote file to the passed local file" do
-      @ftp.send(@method, "test", @tmp_file)
-      File.read(@tmp_file).should == "This is the content\nof the file named 'test'.\n"
+      describe "and the REST command fails" do
+        it "raises a Net::FTPProtoError when the response code is 550" do
+          @server.should_receive(:rest).and_respond("Requested action not taken.")
+          -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPProtoError)
+        end
+
+        it "raises a Net::FTPPermError when the response code is 500" do
+          @server.should_receive(:rest).and_respond("500 Syntax error, command unrecognized.")
+          -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+        end
+
+        it "raises a Net::FTPPermError when the response code is 501" do
+          @server.should_receive(:rest).and_respond("501 Syntax error, command unrecognized.")
+          -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+        end
+
+        it "raises a Net::FTPPermError when the response code is 502" do
+          @server.should_receive(:rest).and_respond("502 Command not implemented.")
+          -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+        end
+
+        it "raises a Net::FTPTempError when the response code is 421" do
+          @server.should_receive(:rest).and_respond("421 Service not available, closing control connection.")
+          -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPTempError)
+        end
+
+        it "raises a Net::FTPPermError when the response code is 530" do
+          @server.should_receive(:rest).and_respond("530 Not logged in.")
+          -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+        end
+      end
     end
 
-    describe "and the REST command fails" do
+    describe "when the RETR command fails" do
+      it "raises a Net::FTPTempError when the response code is 450" do
+        @server.should_receive(:retr).and_respond("450 Requested file action not taken.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPTempError)
+      end
+
       it "raises a Net::FTPProtoError when the response code is 550" do
-        @server.should_receive(:rest).and_respond("Requested action not taken.")
-        -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPProtoError)
+        @server.should_receive(:retr).and_respond("Requested action not taken.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPProtoError)
       end
 
       it "raises a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:rest).and_respond("500 Syntax error, command unrecognized.")
-        -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+        @server.should_receive(:retr).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
       end
 
       it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:rest).and_respond("501 Syntax error, command unrecognized.")
-        -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:rest).and_respond("502 Command not implemented.")
-        -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+        @server.should_receive(:retr).and_respond("501 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
       end
 
       it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:rest).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
+        @server.should_receive(:retr).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPTempError)
       end
 
       it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:rest).and_respond("530 Not logged in.")
-        -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+        @server.should_receive(:retr).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
       end
     end
-  end
-
-  describe "when the RETR command fails" do
-    it "raises a Net::FTPTempError when the response code is 450" do
-      @server.should_receive(:retr).and_respond("450 Requested file action not taken.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPProtoError when the response code is 550" do
-      @server.should_receive(:retr).and_respond("Requested action not taken.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPProtoError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:retr).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:retr).and_respond("501 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:retr).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:retr).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
-  end
 
-  describe "when opening the data port fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
-      @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
+    describe "when opening the data port fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
+        @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
-      @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
+        @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
-      @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
+        @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPTempError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:eprt).and_respond("530 Not logged in.")
-      @server.should_receive(:port).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:eprt).and_respond("530 Not logged in.")
+        @server.should_receive(:port).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/shared/gettextfile.rb b/spec/ruby/library/net-ftp/shared/gettextfile.rb
index 7fe14f7dfb2..562c7a30477 100644
--- a/spec/ruby/library/net-ftp/shared/gettextfile.rb
+++ b/spec/ruby/library/net-ftp/shared/gettextfile.rb
@@ -1,100 +1,102 @@
-describe :net_ftp_gettextfile, shared: true do
-  before :each do
-    @tmp_file = tmp("gettextfile")
+ruby_version_is ""..."4.1" do
+  describe :net_ftp_gettextfile, shared: true do
+    before :each do
+      @tmp_file = tmp("gettextfile")
 
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-    @ftp.binary = @binary_mode
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-
-    rm_r @tmp_file
-  end
-
-  it "sends the RETR command to the server" do
-    @ftp.send(@method, "test", @tmp_file)
-    @ftp.last_response.should == "226 Closing data connection. (RETR test)\n"
-  end
-
-  it "returns nil" do
-    @ftp.send(@method, "test", @tmp_file).should be_nil
-  end
-
-  it "saves the contents of the passed remote file to the passed local file" do
-    @ftp.send(@method, "test", @tmp_file)
-    File.read(@tmp_file).should == "This is the content\nof the file named 'test'.\n"
-  end
-
-  describe "when passed a block" do
-    it "yields each line of the retrieved file to the passed block" do
-      res = []
-      @ftp.send(@method, "test", @tmp_file) { |line| res << line }
-      res.should == [ "This is the content", "of the file named 'test'."]
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+      @ftp.binary = @binary_mode
     end
-  end
 
-  describe "when the RETR command fails" do
-    it "raises a Net::FTPTempError when the response code is 450" do
-      @server.should_receive(:retr).and_respond("450 Requested file action not taken.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
-    end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
 
-    it "raises a Net::FTPProtoError when the response code is 550" do
-      @server.should_receive(:retr).and_respond("Requested action not taken.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPProtoError)
+      rm_r @tmp_file
     end
 
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:retr).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+    it "sends the RETR command to the server" do
+      @ftp.send(@method, "test", @tmp_file)
+      @ftp.last_response.should == "226 Closing data connection. (RETR test)\n"
     end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:retr).and_respond("501 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+    it "returns nil" do
+      @ftp.send(@method, "test", @tmp_file).should == nil
     end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:retr).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:retr).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
-  end
-
-  describe "when opening the data port fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
-      @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+    it "saves the contents of the passed remote file to the passed local file" do
+      @ftp.send(@method, "test", @tmp_file)
+      File.read(@tmp_file).should == "This is the content\nof the file named 'test'.\n"
     end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
-      @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+    describe "when passed a block" do
+      it "yields each line of the retrieved file to the passed block" do
+        res = []
+        @ftp.send(@method, "test", @tmp_file) { |line| res << line }
+        res.should == [ "This is the content", "of the file named 'test'."]
+      end
     end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
-      @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
+    describe "when the RETR command fails" do
+      it "raises a Net::FTPTempError when the response code is 450" do
+        @server.should_receive(:retr).and_respond("450 Requested file action not taken.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPProtoError when the response code is 550" do
+        @server.should_receive(:retr).and_respond("Requested action not taken.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPProtoError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:retr).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:retr).and_respond("501 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:retr).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:retr).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:eprt).and_respond("530 Not logged in.")
-      @server.should_receive(:port).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+    describe "when opening the data port fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
+        @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
+        @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
+        @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:eprt).and_respond("530 Not logged in.")
+        @server.should_receive(:port).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method, "test", @tmp_file) }.should.raise(Net::FTPPermError)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/shared/last_response_code.rb b/spec/ruby/library/net-ftp/shared/last_response_code.rb
index 4fe53677db5..9d36e37f0ca 100644
--- a/spec/ruby/library/net-ftp/shared/last_response_code.rb
+++ b/spec/ruby/library/net-ftp/shared/last_response_code.rb
@@ -1,25 +1,27 @@
-describe :net_ftp_last_response_code, shared: true do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  describe :net_ftp_last_response_code, shared: true do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "returns the response code for the last response" do
-    @server.should_receive(:help).and_respond("200 Command okay.")
-    @ftp.help
-    @ftp.send(@method).should == "200"
+    it "returns the response code for the last response" do
+      @server.should_receive(:help).and_respond("200 Command okay.")
+      @ftp.help
+      @ftp.send(@method).should == "200"
 
-    @server.should_receive(:help).and_respond("212 Directory status.")
-    @ftp.help
-    @ftp.send(@method).should == "212"
+      @server.should_receive(:help).and_respond("212 Directory status.")
+      @ftp.help
+      @ftp.send(@method).should == "212"
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/shared/list.rb b/spec/ruby/library/net-ftp/shared/list.rb
index adc3fa59c10..ec372447e87 100644
--- a/spec/ruby/library/net-ftp/shared/list.rb
+++ b/spec/ruby/library/net-ftp/shared/list.rb
@@ -1,104 +1,106 @@
-describe :net_ftp_list, shared: true do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.passive = false
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  describe "when passed a block" do
-    it "yields each file in the list of files in the passed dir" do
-      expected = [
-        "-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb",
-        "-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb",
-        "-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb"
-      ]
-
-      res = []
-      @ftp.send(@method, "test.folder") { |line| res << line}
-      res.should == expected
-
-      @ftp.last_response.should == "226 transfer complete (LIST test.folder)\n"
+ruby_version_is ""..."4.1" do
+  describe :net_ftp_list, shared: true do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.passive = false
+      @ftp.connect(@server.hostname, @server.server_port)
     end
-  end
-
-  describe "when passed no block" do
-    it "returns an Array containing a list of files in the passed dir" do
-      expected = [
-        "-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb",
-        "-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb",
-        "-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb"
-      ]
 
-      @ftp.send(@method, "test.folder").should == expected
-
-      @ftp.last_response.should == "226 transfer complete (LIST test.folder)\n"
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
     end
-  end
 
-  describe "when the LIST command fails" do
-    it "raises a Net::FTPTempError when the response code is 450" do
-      @server.should_receive(:list).and_respond("450 Requested file action not taken..")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPTempError)
-    end
+    describe "when passed a block" do
+      it "yields each file in the list of files in the passed dir" do
+        expected = [
+          "-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb",
+          "-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb",
+          "-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb"
+        ]
 
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:list).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
-    end
+        res = []
+        @ftp.send(@method, "test.folder") { |line| res << line}
+        res.should == expected
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:list).and_respond("501 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
+        @ftp.last_response.should == "226 transfer complete (LIST test.folder)\n"
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:list).and_respond("502 Command not implemented.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:list).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPTempError)
-    end
+    describe "when passed no block" do
+      it "returns an Array containing a list of files in the passed dir" do
+        expected = [
+          "-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb",
+          "-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb",
+          "-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb"
+        ]
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:list).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
-    end
-  end
-
-  describe "when opening the data port fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
-      @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
-    end
+        @ftp.send(@method, "test.folder").should == expected
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
-      @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
+        @ftp.last_response.should == "226 transfer complete (LIST test.folder)\n"
+      end
     end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
-      @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPTempError)
+    describe "when the LIST command fails" do
+      it "raises a Net::FTPTempError when the response code is 450" do
+        @server.should_receive(:list).and_respond("450 Requested file action not taken..")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:list).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:list).and_respond("501 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:list).and_respond("502 Command not implemented.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:list).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:list).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPPermError)
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:eprt).and_respond("530 Not logged in.")
-      @server.should_receive(:port).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
+    describe "when opening the data port fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
+        @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
+        @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
+        @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:eprt).and_respond("530 Not logged in.")
+        @server.should_receive(:port).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method) }.should.raise(Net::FTPPermError)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/shared/putbinaryfile.rb b/spec/ruby/library/net-ftp/shared/putbinaryfile.rb
index 45f53adc2a6..afbe3c61f81 100644
--- a/spec/ruby/library/net-ftp/shared/putbinaryfile.rb
+++ b/spec/ruby/library/net-ftp/shared/putbinaryfile.rb
@@ -1,167 +1,169 @@
-describe :net_ftp_putbinaryfile, shared: true do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  describe :net_ftp_putbinaryfile, shared: true do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-    @local_fixture_file  = __dir__ + "/../fixtures/putbinaryfile"
-    @remote_tmp_file = tmp("binaryfile", false)
+      @local_fixture_file  = __dir__ + "/../fixtures/putbinaryfile"
+      @remote_tmp_file = tmp("binaryfile", false)
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-    @ftp.binary = @binary_mode
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+      @ftp.binary = @binary_mode
+    end
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
 
-    rm_r @remote_tmp_file
-  end
-
-  it "sends the STOR command to the server" do
-    @ftp.send(@method, @local_fixture_file, "binary")
-    @ftp.last_response.should == "200 OK, Data received. (STOR binary)\n"
-  end
+      rm_r @remote_tmp_file
+    end
 
-  it "sends the contents of the passed local_file, without modifications" do
-    @ftp.send(@method, @local_fixture_file, "binary")
+    it "sends the STOR command to the server" do
+      @ftp.send(@method, @local_fixture_file, "binary")
+      @ftp.last_response.should == "200 OK, Data received. (STOR binary)\n"
+    end
 
-    remote_lines = File.readlines(@remote_tmp_file)
-    local_lines  = File.readlines(@local_fixture_file)
+    it "sends the contents of the passed local_file, without modifications" do
+      @ftp.send(@method, @local_fixture_file, "binary")
 
-    remote_lines.should == local_lines
-  end
+      remote_lines = File.readlines(@remote_tmp_file)
+      local_lines  = File.readlines(@local_fixture_file)
 
-  it "returns nil" do
-    @ftp.send(@method, @local_fixture_file, "binary").should be_nil
-  end
+      remote_lines.should == local_lines
+    end
 
-  describe "when passed a block" do
-    it "yields the transmitted content as binary blocks of the passed size" do
-      res = []
-      @ftp.send(@method, @local_fixture_file, "binary", 10) { |x| res << x }
-      res.should == [
-        "This is an", " example f",
-        "ile\nwhich ", "is going t",
-        "o be trans", "mitted\nusi",
-        "ng #putbin", "aryfile.\n"
-      ]
+    it "returns nil" do
+      @ftp.send(@method, @local_fixture_file, "binary").should == nil
     end
-  end
 
-  describe "when resuming an existing file" do
-    before :each do
-      File.open(@remote_tmp_file, "w") do |f|
-        f << "This is an example file\n"
+    describe "when passed a block" do
+      it "yields the transmitted content as binary blocks of the passed size" do
+        res = []
+        @ftp.send(@method, @local_fixture_file, "binary", 10) { |x| res << x }
+        res.should == [
+          "This is an", " example f",
+          "ile\nwhich ", "is going t",
+          "o be trans", "mitted\nusi",
+          "ng #putbin", "aryfile.\n"
+        ]
       end
-
-      @ftp.resume = true
     end
 
-    it "sends the remaining content of the passed local_file to the passed remote_file" do
-      @ftp.send(@method, @local_fixture_file, "binary")
-      File.read(@remote_tmp_file).should == File.read(@local_fixture_file)
-    end
+    describe "when resuming an existing file" do
+      before :each do
+        File.open(@remote_tmp_file, "w") do |f|
+          f << "This is an example file\n"
+        end
 
-    describe "and the APPE command fails" do
-      it "raises a Net::FTPProtoError when the response code is 550" do
-        @server.should_receive(:appe).and_respond("Requested action not taken.")
-        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPProtoError)
+        @ftp.resume = true
       end
 
-      it "raises a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:appe).and_respond("500 Syntax error, command unrecognized.")
-        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      it "sends the remaining content of the passed local_file to the passed remote_file" do
+        @ftp.send(@method, @local_fixture_file, "binary")
+        File.read(@remote_tmp_file).should == File.read(@local_fixture_file)
       end
 
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:appe).and_respond("501 Syntax error, command unrecognized.")
-        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      describe "and the APPE command fails" do
+        it "raises a Net::FTPProtoError when the response code is 550" do
+          @server.should_receive(:appe).and_respond("Requested action not taken.")
+          -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPProtoError)
+        end
+
+        it "raises a Net::FTPPermError when the response code is 500" do
+          @server.should_receive(:appe).and_respond("500 Syntax error, command unrecognized.")
+          -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+        end
+
+        it "raises a Net::FTPPermError when the response code is 501" do
+          @server.should_receive(:appe).and_respond("501 Syntax error, command unrecognized.")
+          -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+        end
+
+        it "raises a Net::FTPPermError when the response code is 502" do
+          @server.should_receive(:appe).and_respond("502 Command not implemented.")
+          -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+        end
+
+        it "raises a Net::FTPTempError when the response code is 421" do
+          @server.should_receive(:appe).and_respond("421 Service not available, closing control connection.")
+          -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPTempError)
+        end
+
+        it "raises a Net::FTPPermError when the response code is 530" do
+          @server.should_receive(:appe).and_respond("530 Not logged in.")
+          -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+        end
       end
+    end
 
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:appe).and_respond("502 Command not implemented.")
-        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+    describe "when the STOR command fails" do
+      it "raises a Net::FTPPermError when the response code is 532" do
+        @server.should_receive(:stor).and_respond("532 Need account for storing files.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
       end
 
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:appe).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
+      it "raises a Net::FTPTempError when the response code is 450" do
+        @server.should_receive(:stor).and_respond("450 Requested file action not taken.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPTempError)
       end
 
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:appe).and_respond("530 Not logged in.")
-        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPTempError when the response code is 452" do
+        @server.should_receive(:stor).and_respond("452 Requested action not taken.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPTempError)
       end
-    end
-  end
-
-  describe "when the STOR command fails" do
-    it "raises a Net::FTPPermError when the response code is 532" do
-      @server.should_receive(:stor).and_respond("532 Need account for storing files.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 450" do
-      @server.should_receive(:stor).and_respond("450 Requested file action not taken.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 452" do
-      @server.should_receive(:stor).and_respond("452 Requested action not taken.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
-    end
 
-    it "raises a Net::FTPPermError when the response code is 553" do
-      @server.should_receive(:stor).and_respond("553 Requested action not taken.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 553" do
+        @server.should_receive(:stor).and_respond("553 Requested action not taken.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:stor).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:stor).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:stor).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:stor).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:stor).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:stor).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPTempError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:stor).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:stor).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+      end
     end
-  end
 
-  describe "when opening the data port fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
-      @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
+    describe "when opening the data port fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
+        @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
-      @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
+        @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+      end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
-      @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
+        @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPTempError)
+      end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:eprt).and_respond("530 Not logged in.")
-      @server.should_receive(:port).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:eprt).and_respond("530 Not logged in.")
+        @server.should_receive(:port).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method, @local_fixture_file, "binary") }.should.raise(Net::FTPPermError)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/shared/puttextfile.rb b/spec/ruby/library/net-ftp/shared/puttextfile.rb
index e2c04533524..3650cad2305 100644
--- a/spec/ruby/library/net-ftp/shared/puttextfile.rb
+++ b/spec/ruby/library/net-ftp/shared/puttextfile.rb
@@ -1,128 +1,130 @@
-describe :net_ftp_puttextfile, shared: true do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @local_fixture_file  = __dir__ + "/../fixtures/puttextfile"
-    @remote_tmp_file = tmp("textfile", false)
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-    @ftp.binary = @binary_mode
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-
-    rm_r @remote_tmp_file
-  end
-
-  it "sends the STOR command to the server" do
-    @ftp.send(@method, @local_fixture_file, "text")
-    @ftp.last_response.should == "200 OK, Data received. (STOR text)\n"
-  end
-
-  it "sends the contents of the passed local_file, using \\r\\n as the newline separator" do
-    @ftp.send(@method, @local_fixture_file, "text")
-
-    remote_lines = File.binread(@remote_tmp_file)
-    local_lines  = File.binread(@local_fixture_file)
-
-    remote_lines.should_not == local_lines
-    remote_lines.should == local_lines.gsub("\n", "\r\n")
-  end
-
-  guard -> { Net::FTP::VERSION < '0.3.6' } do
-    it "returns nil" do
-      @ftp.send(@method, @local_fixture_file, "text").should be_nil
+ruby_version_is ""..."4.1" do
+  describe :net_ftp_puttextfile, shared: true do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @local_fixture_file  = __dir__ + "/../fixtures/puttextfile"
+      @remote_tmp_file = tmp("textfile", false)
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+      @ftp.binary = @binary_mode
     end
-  end
 
-  guard -> { Net::FTP::VERSION >= '0.3.6' } do
-    it "returns the response" do
-      @ftp.send(@method, @local_fixture_file, "text").should == @ftp.last_response
-    end
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
 
-  describe "when passed a block" do
-    it "yields each transmitted line" do
-      res = []
-      @ftp.send(@method, @local_fixture_file, "text") { |x| res << x }
-      res.should == [
-        "This is an example file\r\n",
-        "which is going to be transmitted\r\n",
-        "using #puttextfile.\r\n"
-      ]
+      rm_r @remote_tmp_file
     end
-  end
 
-  describe "when the STOR command fails" do
-    it "raises a Net::FTPPermError when the response code is 532" do
-      @server.should_receive(:stor).and_respond("532 Need account for storing files.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+    it "sends the STOR command to the server" do
+      @ftp.send(@method, @local_fixture_file, "text")
+      @ftp.last_response.should == "200 OK, Data received. (STOR text)\n"
     end
 
-    it "raises a Net::FTPTempError when the response code is 450" do
-      @server.should_receive(:stor).and_respond("450 Requested file action not taken.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPTempError)
-    end
+    it "sends the contents of the passed local_file, using \\r\\n as the newline separator" do
+      @ftp.send(@method, @local_fixture_file, "text")
 
-    it "raises a Net::FTPTempError when the response code is 452" do
-      @server.should_receive(:stor).and_respond("452 Requested action not taken.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPTempError)
-    end
+      remote_lines = File.binread(@remote_tmp_file)
+      local_lines  = File.binread(@local_fixture_file)
 
-    it "raises a Net::FTPPermError when the response code is 553" do
-      @server.should_receive(:stor).and_respond("553 Requested action not taken.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+      remote_lines.should_not == local_lines
+      remote_lines.should == local_lines.gsub("\n", "\r\n")
     end
 
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:stor).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+    guard -> { Net::FTP::VERSION < '0.3.6' } do
+      it "returns nil" do
+        @ftp.send(@method, @local_fixture_file, "text").should == nil
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:stor).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:stor).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:stor).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
-    end
-  end
-
-  describe "when opening the data port fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
-      @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+    guard -> { Net::FTP::VERSION >= '0.3.6' } do
+      it "returns the response" do
+        @ftp.send(@method, @local_fixture_file, "text").should == @ftp.last_response
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
-      @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+    describe "when passed a block" do
+      it "yields each transmitted line" do
+        res = []
+        @ftp.send(@method, @local_fixture_file, "text") { |x| res << x }
+        res.should == [
+          "This is an example file\r\n",
+          "which is going to be transmitted\r\n",
+          "using #puttextfile.\r\n"
+        ]
+      end
     end
 
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
-      @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPTempError)
+    describe "when the STOR command fails" do
+      it "raises a Net::FTPPermError when the response code is 532" do
+        @server.should_receive(:stor).and_respond("532 Need account for storing files.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 450" do
+        @server.should_receive(:stor).and_respond("450 Requested file action not taken.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 452" do
+        @server.should_receive(:stor).and_respond("452 Requested action not taken.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 553" do
+        @server.should_receive(:stor).and_respond("553 Requested action not taken.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:stor).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:stor).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:stor).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:stor).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPPermError)
+      end
     end
 
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:eprt).and_respond("530 Not logged in.")
-      @server.should_receive(:port).and_respond("530 Not logged in.")
-      -> { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+    describe "when opening the data port fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
+        @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
+        @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
+        @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:eprt).and_respond("530 Not logged in.")
+        @server.should_receive(:port).and_respond("530 Not logged in.")
+        -> { @ftp.send(@method, @local_fixture_file, "text") }.should.raise(Net::FTPPermError)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/shared/pwd.rb b/spec/ruby/library/net-ftp/shared/pwd.rb
index 951d020f2de..db3e587464d 100644
--- a/spec/ruby/library/net-ftp/shared/pwd.rb
+++ b/spec/ruby/library/net-ftp/shared/pwd.rb
@@ -1,3 +1,5 @@
-describe :net_ftp_pwd, shared: true do
+ruby_version_is ""..."4.1" do
+  describe :net_ftp_pwd, shared: true do
 
+  end
 end
diff --git a/spec/ruby/library/net-ftp/site_spec.rb b/spec/ruby/library/net-ftp/site_spec.rb
index c3e589a9204..adc7dfafdfc 100644
--- a/spec/ruby/library/net-ftp/site_spec.rb
+++ b/spec/ruby/library/net-ftp/site_spec.rb
@@ -1,53 +1,56 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#site" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "sends the SITE command with the passed argument to the server" do
-    @ftp.site("param")
-    @ftp.last_response.should == "200 Command okay. (SITE param)\n"
-  end
-
-  it "returns nil" do
-    @ftp.site("param").should be_nil
-  end
-
-  it "does not raise an error when the response code is 202" do
-    @server.should_receive(:site).and_respond("202 Command not implemented, superfluous at this site.")
-    -> { @ftp.site("param") }.should_not raise_error
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:site).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:site).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:site).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.site("param") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 530" do
-    @server.should_receive(:site).and_respond("530 Requested action not taken.")
-    -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#site" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the SITE command with the passed argument to the server" do
+      @ftp.site("param")
+      @ftp.last_response.should == "200 Command okay. (SITE param)\n"
+    end
+
+    it "returns nil" do
+      @ftp.site("param").should == nil
+    end
+
+    it "does not raise an error when the response code is 202" do
+      @server.should_receive(:site).and_respond("202 Command not implemented, superfluous at this site.")
+      -> { @ftp.site("param") }.should_not.raise
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:site).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.site("param") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:site).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.site("param") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:site).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.site("param") }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:site).and_respond("530 Requested action not taken.")
+      -> { @ftp.site("param") }.should.raise(Net::FTPPermError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/size_spec.rb b/spec/ruby/library/net-ftp/size_spec.rb
index 0cf2e244773..dd84e5a4498 100644
--- a/spec/ruby/library/net-ftp/size_spec.rb
+++ b/spec/ruby/library/net-ftp/size_spec.rb
@@ -1,48 +1,51 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#size" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "sends the SIZE command to the server" do
-    @ftp.size("test.file")
-    @ftp.last_response.should == "213 1024\n"
-  end
-
-  it "returns the size of the passed file as Integer" do
-    @ftp.size("test.file").should eql(1024)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:size).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:size).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:size).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.size("test.file") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:size).and_respond("550 Requested action not taken.")
-    -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#size" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the SIZE command to the server" do
+      @ftp.size("test.file")
+      @ftp.last_response.should == "213 1024\n"
+    end
+
+    it "returns the size of the passed file as Integer" do
+      @ftp.size("test.file").should.eql?(1024)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:size).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.size("test.file") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:size).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.size("test.file") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:size).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.size("test.file") }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:size).and_respond("550 Requested action not taken.")
+      -> { @ftp.size("test.file") }.should.raise(Net::FTPPermError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/spec_helper.rb b/spec/ruby/library/net-ftp/spec_helper.rb
index c87d16218b1..7689b4fb0cd 100644
--- a/spec/ruby/library/net-ftp/spec_helper.rb
+++ b/spec/ruby/library/net-ftp/spec_helper.rb
@@ -1,5 +1,7 @@
-require "net/ftp"
+ruby_version_is ""..."4.1" do
+  require "net/ftp"
 
-if defined?(Net::FTP.default_passive)
-  Net::FTP.default_passive = false
+  if defined?(Net::FTP.default_passive)
+    Net::FTP.default_passive = false
+  end
 end
diff --git a/spec/ruby/library/net-ftp/status_spec.rb b/spec/ruby/library/net-ftp/status_spec.rb
index 9d9f86c3816..ce29e215d44 100644
--- a/spec/ruby/library/net-ftp/status_spec.rb
+++ b/spec/ruby/library/net-ftp/status_spec.rb
@@ -1,67 +1,70 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#status" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#status" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-  it "sends the STAT command to the server" do
-    @ftp.status
-    @ftp.last_response.should == "211 System status, or system help reply. (STAT)\n"
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "sends the STAT command with an optional parameter to the server" do
-    @ftp.status("/pub").should == "211 System status, or system help reply. (STAT /pub)\n"
-  end
+    it "sends the STAT command to the server" do
+      @ftp.status
+      @ftp.last_response.should == "211 System status, or system help reply. (STAT)\n"
+    end
 
-  it "returns the received information" do
-    @ftp.status.should == "211 System status, or system help reply. (STAT)\n"
-  end
+    it "sends the STAT command with an optional parameter to the server" do
+      @ftp.status("/pub").should == "211 System status, or system help reply. (STAT /pub)\n"
+    end
 
-  it "does not raise an error when the response code is 212" do
-    @server.should_receive(:stat).and_respond("212 Directory status.")
-    -> { @ftp.status }.should_not raise_error
-  end
+    it "returns the received information" do
+      @ftp.status.should == "211 System status, or system help reply. (STAT)\n"
+    end
 
-  it "does not raise an error when the response code is 213" do
-    @server.should_receive(:stat).and_respond("213 File status.")
-    -> { @ftp.status }.should_not raise_error
-  end
+    it "does not raise an error when the response code is 212" do
+      @server.should_receive(:stat).and_respond("212 Directory status.")
+      -> { @ftp.status }.should_not.raise
+    end
 
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:stat).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.status }.should raise_error(Net::FTPPermError)
-  end
+    it "does not raise an error when the response code is 213" do
+      @server.should_receive(:stat).and_respond("213 File status.")
+      -> { @ftp.status }.should_not.raise
+    end
 
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:stat).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.status }.should raise_error(Net::FTPPermError)
-  end
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:stat).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.status }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:stat).and_respond("502 Command not implemented.")
-    -> { @ftp.status }.should raise_error(Net::FTPPermError)
-  end
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:stat).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.status }.should.raise(Net::FTPPermError)
+    end
 
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:stat).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.status }.should raise_error(Net::FTPTempError)
-  end
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:stat).and_respond("502 Command not implemented.")
+      -> { @ftp.status }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:stat).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.status }.should.raise(Net::FTPTempError)
+    end
 
-  it "raises a Net::FTPPermError when the response code is 530" do
-    @server.should_receive(:stat).and_respond("530 Requested action not taken.")
-    -> { @ftp.status }.should raise_error(Net::FTPPermError)
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:stat).and_respond("530 Requested action not taken.")
+      -> { @ftp.status }.should.raise(Net::FTPPermError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/storbinary_spec.rb b/spec/ruby/library/net-ftp/storbinary_spec.rb
index aa4c51f2e81..a2f81fc669e 100644
--- a/spec/ruby/library/net-ftp/storbinary_spec.rb
+++ b/spec/ruby/library/net-ftp/storbinary_spec.rb
@@ -1,49 +1,52 @@
 require_relative '../../spec_helper'
 
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
+ruby_version_is ""..."4.1" do
 
-describe "Net::FTP#storbinary" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @local_fixture_file  = __dir__ + "/fixtures/putbinaryfile"
-    @tmp_file = tmp("binaryfile", false)
+  describe "Net::FTP#storbinary" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+      @local_fixture_file  = __dir__ + "/fixtures/putbinaryfile"
+      @tmp_file = tmp("binaryfile", false)
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-    rm_r @tmp_file
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
 
-  it "sends the passed command and the passed File object's content to the server" do
-    File.open(@local_fixture_file) do |f|
-      f.binmode
+      rm_r @tmp_file
+    end
+
+    it "sends the passed command and the passed File object's content to the server" do
+      File.open(@local_fixture_file) do |f|
+        f.binmode
 
-      @ftp.storbinary("STOR binary", f, 4096) {}
-      @ftp.last_response.should == "200 OK, Data received. (STOR binary)\n"
+        @ftp.storbinary("STOR binary", f, 4096) {}
+        @ftp.last_response.should == "200 OK, Data received. (STOR binary)\n"
+      end
     end
-  end
 
-  it "yields the transmitted content as binary blocks of the passed size" do
-    File.open(@local_fixture_file) do |f|
-      f.binmode
-
-      res = []
-      @ftp.storbinary("STOR binary", f, 10) { |x| res << x }
-      res.should == [
-        "This is an", " example f",
-        "ile\nwhich ", "is going t",
-        "o be trans", "mitted\nusi",
-        "ng #putbin", "aryfile.\n"
-      ]
+    it "yields the transmitted content as binary blocks of the passed size" do
+      File.open(@local_fixture_file) do |f|
+        f.binmode
+
+        res = []
+        @ftp.storbinary("STOR binary", f, 10) { |x| res << x }
+        res.should == [
+          "This is an", " example f",
+          "ile\nwhich ", "is going t",
+          "o be trans", "mitted\nusi",
+          "ng #putbin", "aryfile.\n"
+        ]
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/storlines_spec.rb b/spec/ruby/library/net-ftp/storlines_spec.rb
index dc6830da7bd..09340bafe99 100644
--- a/spec/ruby/library/net-ftp/storlines_spec.rb
+++ b/spec/ruby/library/net-ftp/storlines_spec.rb
@@ -1,44 +1,47 @@
 require_relative '../../spec_helper'
 
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
+ruby_version_is ""..."4.1" do
 
-describe "Net::FTP#storlines" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @local_fixture_file  = __dir__ + "/fixtures/puttextfile"
-    @tmp_file = tmp("textfile", false)
+  describe "Net::FTP#storlines" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+      @local_fixture_file  = __dir__ + "/fixtures/puttextfile"
+      @tmp_file = tmp("textfile", false)
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
 
-    rm_r @tmp_file
-  end
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
 
-  it "sends the passed command and the passed File object's content to the server" do
-    File.open(@local_fixture_file) do |f|
-      @ftp.storlines("STOR text", f) {}
-      @ftp.last_response.should == "200 OK, Data received. (STOR text)\n"
+      rm_r @tmp_file
+    end
+
+    it "sends the passed command and the passed File object's content to the server" do
+      File.open(@local_fixture_file) do |f|
+        @ftp.storlines("STOR text", f) {}
+        @ftp.last_response.should == "200 OK, Data received. (STOR text)\n"
+      end
     end
-  end
 
-  it "yields each line of the transmitted content" do
-    File.open(@local_fixture_file) do |f|
-      res = []
-      @ftp.storlines("STOR text", f) { |x| res << x }
-      res.should == [
-        "This is an example file\r\n",
-        "which is going to be transmitted\r\n",
-        "using #puttextfile.\r\n"
-      ]
+    it "yields each line of the transmitted content" do
+      File.open(@local_fixture_file) do |f|
+        res = []
+        @ftp.storlines("STOR text", f) { |x| res << x }
+        res.should == [
+          "This is an example file\r\n",
+          "which is going to be transmitted\r\n",
+          "using #puttextfile.\r\n"
+        ]
+      end
     end
   end
 end
diff --git a/spec/ruby/library/net-ftp/system_spec.rb b/spec/ruby/library/net-ftp/system_spec.rb
index 2b7f0d2560b..fa617762828 100644
--- a/spec/ruby/library/net-ftp/system_spec.rb
+++ b/spec/ruby/library/net-ftp/system_spec.rb
@@ -1,48 +1,51 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#system" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "sends the SYST command to the server" do
-    @ftp.system
-    @ftp.last_response.should =~ /\A215 FTP Dummy Server \(SYST\)\Z/
-  end
-
-  it "returns the received information" do
-    @ftp.system.should =~ /\AFTP Dummy Server \(SYST\)\Z/
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:syst).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.system }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:syst).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.system }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:syst).and_respond("502 Command not implemented.")
-    -> { @ftp.system }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:syst).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.system }.should raise_error(Net::FTPTempError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#system" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the SYST command to the server" do
+      @ftp.system
+      @ftp.last_response.should =~ /\A215 FTP Dummy Server \(SYST\)\Z/
+    end
+
+    it "returns the received information" do
+      @ftp.system.should =~ /\AFTP Dummy Server \(SYST\)\Z/
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:syst).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.system }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:syst).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.system }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:syst).and_respond("502 Command not implemented.")
+      -> { @ftp.system }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:syst).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.system }.should.raise(Net::FTPTempError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/voidcmd_spec.rb b/spec/ruby/library/net-ftp/voidcmd_spec.rb
index f2536fe697b..4f74da7a702 100644
--- a/spec/ruby/library/net-ftp/voidcmd_spec.rb
+++ b/spec/ruby/library/net-ftp/voidcmd_spec.rb
@@ -1,54 +1,57 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#voidcmd" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
-
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
-
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
-
-  it "sends the passed command to the server" do
-    @server.should_receive(:help).and_respond("2xx Does not raise.")
-    -> { @ftp.voidcmd("HELP") }.should_not raise_error
-  end
-
-  it "returns nil" do
-    @server.should_receive(:help).and_respond("2xx Does not raise.")
-    @ftp.voidcmd("HELP").should be_nil
-  end
-
-  it "raises a Net::FTPReplyError when the response code is 1xx" do
-    @server.should_receive(:help).and_respond("1xx Does raise a Net::FTPReplyError.")
-    -> { @ftp.voidcmd("HELP")  }.should raise_error(Net::FTPReplyError)
-  end
-
-  it "raises a Net::FTPReplyError when the response code is 3xx" do
-    @server.should_receive(:help).and_respond("3xx Does raise a Net::FTPReplyError.")
-    -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPReplyError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 4xx" do
-    @server.should_receive(:help).and_respond("4xx Does raise a Net::FTPTempError.")
-    -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 5xx" do
-    @server.should_receive(:help).and_respond("5xx Does raise a Net::FTPPermError.")
-    -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPProtoError when the response code is not valid" do
-    @server.should_receive(:help).and_respond("999 Does raise a Net::FTPProtoError.")
-    -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPProtoError)
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
+
+  describe "Net::FTP#voidcmd" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
+
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    it "sends the passed command to the server" do
+      @server.should_receive(:help).and_respond("2xx Does not raise.")
+      -> { @ftp.voidcmd("HELP") }.should_not.raise
+    end
+
+    it "returns nil" do
+      @server.should_receive(:help).and_respond("2xx Does not raise.")
+      @ftp.voidcmd("HELP").should == nil
+    end
+
+    it "raises a Net::FTPReplyError when the response code is 1xx" do
+      @server.should_receive(:help).and_respond("1xx Does raise a Net::FTPReplyError.")
+      -> { @ftp.voidcmd("HELP")  }.should.raise(Net::FTPReplyError)
+    end
+
+    it "raises a Net::FTPReplyError when the response code is 3xx" do
+      @server.should_receive(:help).and_respond("3xx Does raise a Net::FTPReplyError.")
+      -> { @ftp.voidcmd("HELP") }.should.raise(Net::FTPReplyError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 4xx" do
+      @server.should_receive(:help).and_respond("4xx Does raise a Net::FTPTempError.")
+      -> { @ftp.voidcmd("HELP") }.should.raise(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 5xx" do
+      @server.should_receive(:help).and_respond("5xx Does raise a Net::FTPPermError.")
+      -> { @ftp.voidcmd("HELP") }.should.raise(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPProtoError when the response code is not valid" do
+      @server.should_receive(:help).and_respond("999 Does raise a Net::FTPProtoError.")
+      -> { @ftp.voidcmd("HELP") }.should.raise(Net::FTPProtoError)
+    end
   end
 end
diff --git a/spec/ruby/library/net-ftp/welcome_spec.rb b/spec/ruby/library/net-ftp/welcome_spec.rb
index 4279127ce34..761a0f9a3e5 100644
--- a/spec/ruby/library/net-ftp/welcome_spec.rb
+++ b/spec/ruby/library/net-ftp/welcome_spec.rb
@@ -1,25 +1,28 @@
 require_relative '../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#welcome" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."4.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#welcome" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
 
-  it "returns the server's welcome message" do
-    @ftp.welcome.should be_nil
-    @ftp.login
-    @ftp.welcome.should == "230 User logged in, proceed. (USER anonymous)\n"
+    it "returns the server's welcome message" do
+      @ftp.welcome.should == nil
+      @ftp.login
+      @ftp.welcome.should == "230 User logged in, proceed. (USER anonymous)\n"
+    end
   end
 end
diff --git a/spec/ruby/library/net-http/http/Proxy_spec.rb b/spec/ruby/library/net-http/http/Proxy_spec.rb
index a1a04fa00ba..7753ce5e301 100644
--- a/spec/ruby/library/net-http/http/Proxy_spec.rb
+++ b/spec/ruby/library/net-http/http/Proxy_spec.rb
@@ -13,7 +13,7 @@
   it "sets the returned subclasses' proxy options based on the passed arguments" do
     http_with_proxy = Net::HTTP.Proxy("localhost", 1234, "rspec", "rocks")
     http_with_proxy.proxy_address.should == "localhost"
-    http_with_proxy.proxy_port.should eql(1234)
+    http_with_proxy.proxy_port.should.eql?(1234)
     http_with_proxy.proxy_user.should == "rspec"
     http_with_proxy.proxy_pass.should == "rocks"
   end
@@ -22,14 +22,14 @@
 describe "Net::HTTP#proxy?" do
   describe "when self is no proxy class instance" do
     it "returns false" do
-      Net::HTTP.new("localhost", 3333).proxy?.should be_false
+      Net::HTTP.new("localhost", 3333).proxy?.should == false
     end
   end
 
   describe "when self is a proxy class instance" do
     it "returns false" do
       http_with_proxy = Net::HTTP.Proxy("localhost", 1234, "rspec", "rocks")
-      http_with_proxy.new("localhost", 3333).proxy?.should be_true
+      http_with_proxy.new("localhost", 3333).proxy?.should == true
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/copy_spec.rb b/spec/ruby/library/net-http/http/copy_spec.rb
index fba96c0f11c..1f3e25009f2 100644
--- a/spec/ruby/library/net-http/http/copy_spec.rb
+++ b/spec/ruby/library/net-http/http/copy_spec.rb
@@ -15,7 +15,7 @@
 
   it "sends a COPY request to the passed path and returns the response" do
     response = @http.copy("/request")
-    response.should be_kind_of(Net::HTTPResponse)
+    response.should.is_a?(Net::HTTPResponse)
     response.body.should == "Request type: COPY"
   end
 end
diff --git a/spec/ruby/library/net-http/http/default_port_spec.rb b/spec/ruby/library/net-http/http/default_port_spec.rb
index 95b7316a0cf..20407d0b12d 100644
--- a/spec/ruby/library/net-http/http/default_port_spec.rb
+++ b/spec/ruby/library/net-http/http/default_port_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Net::HTTP.default_port" do
   it "returns 80" do
-    Net::HTTP.http_default_port.should eql(80)
+    Net::HTTP.http_default_port.should.eql?(80)
   end
 end
diff --git a/spec/ruby/library/net-http/http/delete_spec.rb b/spec/ruby/library/net-http/http/delete_spec.rb
index d73aa5b375a..09ddd74000f 100644
--- a/spec/ruby/library/net-http/http/delete_spec.rb
+++ b/spec/ruby/library/net-http/http/delete_spec.rb
@@ -15,7 +15,7 @@
 
   it "sends a DELETE request to the passed path and returns the response" do
     response = @http.delete("/request")
-    response.should be_kind_of(Net::HTTPResponse)
+    response.should.is_a?(Net::HTTPResponse)
     response.body.should == "Request type: DELETE"
   end
 end
diff --git a/spec/ruby/library/net-http/http/finish_spec.rb b/spec/ruby/library/net-http/http/finish_spec.rb
index d4aa00dffe1..0d466675f32 100644
--- a/spec/ruby/library/net-http/http/finish_spec.rb
+++ b/spec/ruby/library/net-http/http/finish_spec.rb
@@ -17,13 +17,13 @@
     it "closes the tcp connection" do
       @http.start
       @http.finish
-      @http.started?.should be_false
+      @http.started?.should == false
     end
   end
 
   describe "when self has not been started yet" do
     it "raises an IOError" do
-      -> { @http.finish }.should raise_error(IOError)
+      -> { @http.finish }.should.raise(IOError)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/get_spec.rb b/spec/ruby/library/net-http/http/get_spec.rb
index e64a61c52cf..9be726dc3b4 100644
--- a/spec/ruby/library/net-http/http/get_spec.rb
+++ b/spec/ruby/library/net-http/http/get_spec.rb
@@ -74,7 +74,7 @@ def start_threads
       socket, client_thread = start_threads
       begin
         client_thread.raise my_exception, "my exception"
-        -> { client_thread.value }.should raise_error(my_exception)
+        -> { client_thread.value }.should.raise(my_exception)
       ensure
         socket.close
       end
diff --git a/spec/ruby/library/net-http/http/head_spec.rb b/spec/ruby/library/net-http/http/head_spec.rb
index 64621fa87b5..4824d225341 100644
--- a/spec/ruby/library/net-http/http/head_spec.rb
+++ b/spec/ruby/library/net-http/http/head_spec.rb
@@ -16,10 +16,10 @@
   it "sends a HEAD request to the passed path and returns the response" do
     response = @http.head("/request")
     # HEAD requests have no responses
-    response.body.should be_nil
+    response.body.should == nil
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.head("/request").should be_kind_of(Net::HTTPResponse)
+    @http.head("/request").should.is_a?(Net::HTTPResponse)
   end
 end
diff --git a/spec/ruby/library/net-http/http/http_default_port_spec.rb b/spec/ruby/library/net-http/http/http_default_port_spec.rb
index 3b17bcd0a5c..82c88e58a8e 100644
--- a/spec/ruby/library/net-http/http/http_default_port_spec.rb
+++ b/spec/ruby/library/net-http/http/http_default_port_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Net::HTTP.http_default_port" do
   it "returns 80" do
-    Net::HTTP.http_default_port.should eql(80)
+    Net::HTTP.http_default_port.should.eql?(80)
   end
 end
diff --git a/spec/ruby/library/net-http/http/https_default_port_spec.rb b/spec/ruby/library/net-http/http/https_default_port_spec.rb
index 8c24e1d97cd..24b9c3b4624 100644
--- a/spec/ruby/library/net-http/http/https_default_port_spec.rb
+++ b/spec/ruby/library/net-http/http/https_default_port_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Net::HTTP.https_default_port" do
   it "returns 443" do
-    Net::HTTP.https_default_port.should eql(443)
+    Net::HTTP.https_default_port.should.eql?(443)
   end
 end
diff --git a/spec/ruby/library/net-http/http/initialize_spec.rb b/spec/ruby/library/net-http/http/initialize_spec.rb
index 78aa01e1aae..907314cb258 100644
--- a/spec/ruby/library/net-http/http/initialize_spec.rb
+++ b/spec/ruby/library/net-http/http/initialize_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Net::HTTP#initialize" do
   it "is private" do
-    Net::HTTP.should have_private_instance_method(:initialize)
+    Net::HTTP.private_instance_methods(false).should.include?(:initialize)
   end
 
   describe "when passed address" do
@@ -17,11 +17,11 @@
     end
 
     it "sets the new Net::HTTP instance's port to the default HTTP port" do
-      @net.port.should eql(Net::HTTP.default_port)
+      @net.port.should.eql?(Net::HTTP.default_port)
     end
 
     it "does not start the new Net::HTTP instance" do
-      @net.started?.should be_false
+      @net.started?.should == false
     end
   end
 
@@ -36,11 +36,11 @@
     end
 
     it "sets the new Net::HTTP instance's port to the passed port" do
-      @net.port.should eql(3333)
+      @net.port.should.eql?(3333)
     end
 
     it "does not start the new Net::HTTP instance" do
-      @net.started?.should be_false
+      @net.started?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/inspect_spec.rb b/spec/ruby/library/net-http/http/inspect_spec.rb
index b8f650809e3..fd4e6116c71 100644
--- a/spec/ruby/library/net-http/http/inspect_spec.rb
+++ b/spec/ruby/library/net-http/http/inspect_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it "returns a String representation of self" do
-    @http.inspect.should be_kind_of(String)
+    @http.inspect.should.is_a?(String)
     @http.inspect.should == "#<Net::HTTP localhost:#{@port} open=false>"
 
     @http.start
diff --git a/spec/ruby/library/net-http/http/lock_spec.rb b/spec/ruby/library/net-http/http/lock_spec.rb
index aa1f944196e..12df138ad03 100644
--- a/spec/ruby/library/net-http/http/lock_spec.rb
+++ b/spec/ruby/library/net-http/http/lock_spec.rb
@@ -15,7 +15,7 @@
 
   it "sends a LOCK request to the passed path and returns the response" do
     response = @http.lock("/request", "test=test")
-    response.should be_kind_of(Net::HTTPResponse)
+    response.should.is_a?(Net::HTTPResponse)
     response.body.should == "Request type: LOCK"
   end
 end
diff --git a/spec/ruby/library/net-http/http/mkcol_spec.rb b/spec/ruby/library/net-http/http/mkcol_spec.rb
index f8009f90592..b1a50559827 100644
--- a/spec/ruby/library/net-http/http/mkcol_spec.rb
+++ b/spec/ruby/library/net-http/http/mkcol_spec.rb
@@ -15,7 +15,7 @@
 
   it "sends a MKCOL request to the passed path and returns the response" do
     response = @http.mkcol("/request")
-    response.should be_kind_of(Net::HTTPResponse)
+    response.should.is_a?(Net::HTTPResponse)
     response.body.should == "Request type: MKCOL"
   end
 end
diff --git a/spec/ruby/library/net-http/http/move_spec.rb b/spec/ruby/library/net-http/http/move_spec.rb
index ae43016a2cb..a57c2a0f494 100644
--- a/spec/ruby/library/net-http/http/move_spec.rb
+++ b/spec/ruby/library/net-http/http/move_spec.rb
@@ -20,6 +20,6 @@
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.move("/request").should be_kind_of(Net::HTTPResponse)
+    @http.move("/request").should.is_a?(Net::HTTPResponse)
   end
 end
diff --git a/spec/ruby/library/net-http/http/new_spec.rb b/spec/ruby/library/net-http/http/new_spec.rb
index 1ec6bbd0c04..8feb3d13515 100644
--- a/spec/ruby/library/net-http/http/new_spec.rb
+++ b/spec/ruby/library/net-http/http/new_spec.rb
@@ -8,8 +8,8 @@
     end
 
     it "returns a Net::HTTP instance" do
-      @http.proxy?.should be_false
-      @http.instance_of?(Net::HTTP).should be_true
+      @http.proxy?.should == false
+      @http.instance_of?(Net::HTTP).should == true
     end
 
     it "sets the new Net::HTTP instance's address to the passed address" do
@@ -17,11 +17,11 @@
     end
 
     it "sets the new Net::HTTP instance's port to the default HTTP port" do
-      @http.port.should eql(Net::HTTP.default_port)
+      @http.port.should.eql?(Net::HTTP.default_port)
     end
 
     it "does not start the new Net::HTTP instance" do
-      @http.started?.should be_false
+      @http.started?.should == false
     end
   end
 
@@ -31,8 +31,8 @@
     end
 
     it "returns a Net::HTTP instance" do
-      @http.proxy?.should be_false
-      @http.instance_of?(Net::HTTP).should be_true
+      @http.proxy?.should == false
+      @http.instance_of?(Net::HTTP).should == true
     end
 
     it "sets the new Net::HTTP instance's address to the passed address" do
@@ -40,44 +40,44 @@
     end
 
     it "sets the new Net::HTTP instance's port to the passed port" do
-      @http.port.should eql(3333)
+      @http.port.should.eql?(3333)
     end
 
     it "does not start the new Net::HTTP instance" do
-      @http.started?.should be_false
+      @http.started?.should == false
     end
   end
 
   describe "when passed address, port, *proxy_options" do
     it "returns a Net::HTTP instance" do
       http = Net::HTTP.new("localhost", 3333, "localhost")
-      http.proxy?.should be_true
-      http.instance_of?(Net::HTTP).should be_true
-      http.should be_kind_of(Net::HTTP)
+      http.proxy?.should == true
+      http.instance_of?(Net::HTTP).should == true
+      http.should.is_a?(Net::HTTP)
     end
 
     it "correctly sets the passed Proxy options" do
       http = Net::HTTP.new("localhost", 3333, "localhost")
       http.proxy_address.should == "localhost"
-      http.proxy_port.should eql(80)
-      http.proxy_user.should be_nil
-      http.proxy_pass.should be_nil
+      http.proxy_port.should.eql?(80)
+      http.proxy_user.should == nil
+      http.proxy_pass.should == nil
 
       http = Net::HTTP.new("localhost", 3333, "localhost", 1234)
       http.proxy_address.should == "localhost"
-      http.proxy_port.should eql(1234)
-      http.proxy_user.should be_nil
-      http.proxy_pass.should be_nil
+      http.proxy_port.should.eql?(1234)
+      http.proxy_user.should == nil
+      http.proxy_pass.should == nil
 
       http = Net::HTTP.new("localhost", 3333, "localhost", 1234, "rubyspec")
       http.proxy_address.should == "localhost"
-      http.proxy_port.should eql(1234)
+      http.proxy_port.should.eql?(1234)
       http.proxy_user.should == "rubyspec"
-      http.proxy_pass.should be_nil
+      http.proxy_pass.should == nil
 
       http = Net::HTTP.new("localhost", 3333, "localhost", 1234, "rubyspec", "rocks")
       http.proxy_address.should == "localhost"
-      http.proxy_port.should eql(1234)
+      http.proxy_port.should.eql?(1234)
       http.proxy_user.should == "rubyspec"
       http.proxy_pass.should == "rocks"
     end
diff --git a/spec/ruby/library/net-http/http/newobj_spec.rb b/spec/ruby/library/net-http/http/newobj_spec.rb
index e19b30fca9b..d398fb7d9ae 100644
--- a/spec/ruby/library/net-http/http/newobj_spec.rb
+++ b/spec/ruby/library/net-http/http/newobj_spec.rb
@@ -8,7 +8,7 @@
 
   describe "when passed address" do
     it "returns a new Net::HTTP instance" do
-      @net.should be_kind_of(Net::HTTP)
+      @net.should.is_a?(Net::HTTP)
     end
 
     it "sets the new Net::HTTP instance's address to the passed address" do
@@ -16,11 +16,11 @@
     end
 
     it "sets the new Net::HTTP instance's port to the default HTTP port" do
-      @net.port.should eql(Net::HTTP.default_port)
+      @net.port.should.eql?(Net::HTTP.default_port)
     end
 
     it "does not start the new Net::HTTP instance" do
-      @net.started?.should be_false
+      @net.started?.should == false
     end
   end
 
@@ -30,7 +30,7 @@
     end
 
     it "returns a new Net::HTTP instance" do
-      @net.should be_kind_of(Net::HTTP)
+      @net.should.is_a?(Net::HTTP)
     end
 
     it "sets the new Net::HTTP instance's address to the passed address" do
@@ -38,11 +38,11 @@
     end
 
     it "sets the new Net::HTTP instance's port to the passed port" do
-      @net.port.should eql(3333)
+      @net.port.should.eql?(3333)
     end
 
     it "does not start the new Net::HTTP instance" do
-      @net.started?.should be_false
+      @net.started?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/open_timeout_spec.rb b/spec/ruby/library/net-http/http/open_timeout_spec.rb
index 0d937522718..d00f844b38c 100644
--- a/spec/ruby/library/net-http/http/open_timeout_spec.rb
+++ b/spec/ruby/library/net-http/http/open_timeout_spec.rb
@@ -4,9 +4,9 @@
 describe "Net::HTTP#open_timeout" do
   it "returns the seconds to wait till the connection is open" do
     net = Net::HTTP.new("localhost")
-    net.open_timeout.should eql(60)
+    net.open_timeout.should.eql?(60)
     net.open_timeout = 10
-    net.open_timeout.should eql(10)
+    net.open_timeout.should.eql?(10)
   end
 end
 
@@ -14,11 +14,11 @@
   it "sets the seconds to wait till the connection is open" do
     net = Net::HTTP.new("localhost")
     net.open_timeout = 10
-    net.open_timeout.should eql(10)
+    net.open_timeout.should.eql?(10)
   end
 
   it "returns the newly set value" do
     net = Net::HTTP.new("localhost")
-    (net.open_timeout = 10).should eql(10)
+    (net.open_timeout = 10).should.eql?(10)
   end
 end
diff --git a/spec/ruby/library/net-http/http/options_spec.rb b/spec/ruby/library/net-http/http/options_spec.rb
index 3d9887a557b..3b90573cfa0 100644
--- a/spec/ruby/library/net-http/http/options_spec.rb
+++ b/spec/ruby/library/net-http/http/options_spec.rb
@@ -20,6 +20,6 @@
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.options("/request").should be_kind_of(Net::HTTPResponse)
+    @http.options("/request").should.is_a?(Net::HTTPResponse)
   end
 end
diff --git a/spec/ruby/library/net-http/http/port_spec.rb b/spec/ruby/library/net-http/http/port_spec.rb
index 0984d5e6ce8..edb689f9cab 100644
--- a/spec/ruby/library/net-http/http/port_spec.rb
+++ b/spec/ruby/library/net-http/http/port_spec.rb
@@ -4,6 +4,6 @@
 describe "Net::HTTP#port" do
   it "returns the current port number" do
     net = Net::HTTP.new("localhost", 3333)
-    net.port.should eql(3333)
+    net.port.should.eql?(3333)
   end
 end
diff --git a/spec/ruby/library/net-http/http/post_spec.rb b/spec/ruby/library/net-http/http/post_spec.rb
index b8b8d16ad1a..f2944111972 100644
--- a/spec/ruby/library/net-http/http/post_spec.rb
+++ b/spec/ruby/library/net-http/http/post_spec.rb
@@ -22,13 +22,13 @@
 
   it "returns a Net::HTTPResponse" do
     response = Net::HTTP.post(URI("http://localhost:#{NetHTTPSpecs.port}/request"), "test=test")
-    response.should be_kind_of(Net::HTTPResponse)
+    response.should.is_a?(Net::HTTPResponse)
   end
 
   ruby_version_is ""..."4.0" do
     it "sends Content-Type: application/x-www-form-urlencoded by default" do
       response = Net::HTTP.post(URI("http://localhost:#{NetHTTPSpecs.port}/request/header"), "test=test")
-      response.body.should include({ "Content-Type" => "application/x-www-form-urlencoded" }.inspect.delete("{}"))
+      response.body.should.include?({ "Content-Type" => "application/x-www-form-urlencoded" }.inspect.delete("{}"))
     end
   end
 
@@ -57,7 +57,7 @@
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.post("/request", "test=test").should be_kind_of(Net::HTTPResponse)
+    @http.post("/request", "test=test").should.is_a?(Net::HTTPResponse)
   end
 
   describe "when passed a block" do
@@ -70,7 +70,7 @@
     end
 
     it "returns a Net::HTTPResponse" do
-      @http.post("/request", "test=test") {}.should be_kind_of(Net::HTTPResponse)
+      @http.post("/request", "test=test") {}.should.is_a?(Net::HTTPResponse)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/propfind_spec.rb b/spec/ruby/library/net-http/http/propfind_spec.rb
index f3742d1b1ae..6a1be0392aa 100644
--- a/spec/ruby/library/net-http/http/propfind_spec.rb
+++ b/spec/ruby/library/net-http/http/propfind_spec.rb
@@ -19,6 +19,6 @@
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.propfind("/request", "test=test").should be_kind_of(Net::HTTPResponse)
+    @http.propfind("/request", "test=test").should.is_a?(Net::HTTPResponse)
   end
 end
diff --git a/spec/ruby/library/net-http/http/proppatch_spec.rb b/spec/ruby/library/net-http/http/proppatch_spec.rb
index 0163d24d46a..074dfafaefe 100644
--- a/spec/ruby/library/net-http/http/proppatch_spec.rb
+++ b/spec/ruby/library/net-http/http/proppatch_spec.rb
@@ -19,6 +19,6 @@
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.proppatch("/request", "test=test").should be_kind_of(Net::HTTPResponse)
+    @http.proppatch("/request", "test=test").should.is_a?(Net::HTTPResponse)
   end
 end
diff --git a/spec/ruby/library/net-http/http/proxy_address_spec.rb b/spec/ruby/library/net-http/http/proxy_address_spec.rb
index 5b5efb7ac00..ba040336adc 100644
--- a/spec/ruby/library/net-http/http/proxy_address_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_address_spec.rb
@@ -4,7 +4,7 @@
 describe "Net::HTTP.proxy_address" do
   describe "when self is no proxy class" do
     it "returns nil" do
-      Net::HTTP.proxy_address.should be_nil
+      Net::HTTP.proxy_address.should == nil
     end
   end
 
@@ -18,7 +18,7 @@
 describe "Net::HTTP#proxy_address" do
   describe "when self is no proxy class instance" do
     it "returns nil" do
-      Net::HTTP.new("localhost", 3333).proxy_address.should be_nil
+      Net::HTTP.new("localhost", 3333).proxy_address.should == nil
     end
   end
 
diff --git a/spec/ruby/library/net-http/http/proxy_class_spec.rb b/spec/ruby/library/net-http/http/proxy_class_spec.rb
index 00975aef4ec..eda027c893e 100644
--- a/spec/ruby/library/net-http/http/proxy_class_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_class_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Net::HTTP.proxy_class?" do
   it "returns true if self is a class created with Net::HTTP.Proxy" do
-    Net::HTTP.proxy_class?.should be_false
-    Net::HTTP.Proxy("localhost").proxy_class?.should be_true
+    Net::HTTP.proxy_class?.should == false
+    Net::HTTP.Proxy("localhost").proxy_class?.should == true
   end
 end
diff --git a/spec/ruby/library/net-http/http/proxy_pass_spec.rb b/spec/ruby/library/net-http/http/proxy_pass_spec.rb
index 4e393a53ff8..ad02d896c0f 100644
--- a/spec/ruby/library/net-http/http/proxy_pass_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_pass_spec.rb
@@ -4,13 +4,13 @@
 describe "Net::HTTP.proxy_pass" do
   describe "when self is no proxy class" do
     it "returns nil" do
-      Net::HTTP.proxy_pass.should be_nil
+      Net::HTTP.proxy_pass.should == nil
     end
   end
 
   describe "when self is a proxy class" do
     it "returns nil if no password was set for self's proxy connection" do
-      Net::HTTP.Proxy("localhost").proxy_pass.should be_nil
+      Net::HTTP.Proxy("localhost").proxy_pass.should == nil
     end
 
     it "returns the password for self's proxy connection" do
@@ -22,13 +22,13 @@
 describe "Net::HTTP#proxy_pass" do
   describe "when self is no proxy class instance" do
     it "returns nil" do
-      Net::HTTP.new("localhost", 3333).proxy_pass.should be_nil
+      Net::HTTP.new("localhost", 3333).proxy_pass.should == nil
     end
   end
 
   describe "when self is a proxy class instance" do
     it "returns nil if no password was set for self's proxy connection" do
-      Net::HTTP.Proxy("localhost").new("localhost", 3333).proxy_pass.should be_nil
+      Net::HTTP.Proxy("localhost").new("localhost", 3333).proxy_pass.should == nil
     end
 
     it "returns the password for self's proxy connection" do
diff --git a/spec/ruby/library/net-http/http/proxy_port_spec.rb b/spec/ruby/library/net-http/http/proxy_port_spec.rb
index d7d37f39273..21c1e4180ee 100644
--- a/spec/ruby/library/net-http/http/proxy_port_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_port_spec.rb
@@ -4,17 +4,17 @@
 describe "Net::HTTP.proxy_port" do
   describe "when self is no proxy class" do
     it "returns nil" do
-      Net::HTTP.proxy_port.should be_nil
+      Net::HTTP.proxy_port.should == nil
     end
   end
 
   describe "when self is a proxy class" do
     it "returns 80 if no port was set for self's proxy connection" do
-      Net::HTTP.Proxy("localhost").proxy_port.should eql(80)
+      Net::HTTP.Proxy("localhost").proxy_port.should.eql?(80)
     end
 
     it "returns the port for self's proxy connection" do
-      Net::HTTP.Proxy("localhost", 1234, "rspec", "rocks").proxy_port.should eql(1234)
+      Net::HTTP.Proxy("localhost", 1234, "rspec", "rocks").proxy_port.should.eql?(1234)
     end
   end
 end
@@ -22,18 +22,18 @@
 describe "Net::HTTP#proxy_port" do
   describe "when self is no proxy class instance" do
     it "returns nil" do
-      Net::HTTP.new("localhost", 3333).proxy_port.should be_nil
+      Net::HTTP.new("localhost", 3333).proxy_port.should == nil
     end
   end
 
   describe "when self is a proxy class instance" do
     it "returns 80 if no port was set for self's proxy connection" do
-      Net::HTTP.Proxy("localhost").new("localhost", 3333).proxy_port.should eql(80)
+      Net::HTTP.Proxy("localhost").new("localhost", 3333).proxy_port.should.eql?(80)
     end
 
     it "returns the port for self's proxy connection" do
       http_with_proxy = Net::HTTP.Proxy("localhost", 1234, "rspec", "rocks")
-      http_with_proxy.new("localhost", 3333).proxy_port.should eql(1234)
+      http_with_proxy.new("localhost", 3333).proxy_port.should.eql?(1234)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/proxy_user_spec.rb b/spec/ruby/library/net-http/http/proxy_user_spec.rb
index ef7654425de..492ea2e8ee7 100644
--- a/spec/ruby/library/net-http/http/proxy_user_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_user_spec.rb
@@ -4,13 +4,13 @@
 describe "Net::HTTP.proxy_user" do
   describe "when self is no proxy class" do
     it "returns nil" do
-      Net::HTTP.proxy_user.should be_nil
+      Net::HTTP.proxy_user.should == nil
     end
   end
 
   describe "when self is a proxy class" do
     it "returns nil if no username was set for self's proxy connection" do
-      Net::HTTP.Proxy("localhost").proxy_user.should be_nil
+      Net::HTTP.Proxy("localhost").proxy_user.should == nil
     end
 
     it "returns the username for self's proxy connection" do
@@ -22,13 +22,13 @@
 describe "Net::HTTP#proxy_user" do
   describe "when self is no proxy class instance" do
     it "returns nil" do
-      Net::HTTP.new("localhost", 3333).proxy_user.should be_nil
+      Net::HTTP.new("localhost", 3333).proxy_user.should == nil
     end
   end
 
   describe "when self is a proxy class instance" do
     it "returns nil if no username was set for self's proxy connection" do
-      Net::HTTP.Proxy("localhost").new("localhost", 3333).proxy_user.should be_nil
+      Net::HTTP.Proxy("localhost").new("localhost", 3333).proxy_user.should == nil
     end
 
     it "returns the username for self's proxy connection" do
diff --git a/spec/ruby/library/net-http/http/put_spec.rb b/spec/ruby/library/net-http/http/put_spec.rb
index 75f3c243d4a..7ef9219f637 100644
--- a/spec/ruby/library/net-http/http/put_spec.rb
+++ b/spec/ruby/library/net-http/http/put_spec.rb
@@ -19,6 +19,6 @@
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.put("/request", "test=test").should be_kind_of(Net::HTTPResponse)
+    @http.put("/request", "test=test").should.is_a?(Net::HTTPResponse)
   end
 end
diff --git a/spec/ruby/library/net-http/http/read_timeout_spec.rb b/spec/ruby/library/net-http/http/read_timeout_spec.rb
index 7a0d2f1d72a..81e71337bb6 100644
--- a/spec/ruby/library/net-http/http/read_timeout_spec.rb
+++ b/spec/ruby/library/net-http/http/read_timeout_spec.rb
@@ -4,9 +4,9 @@
 describe "Net::HTTP#read_timeout" do
   it "returns the seconds to wait until reading one block" do
     net = Net::HTTP.new("localhost")
-    net.read_timeout.should eql(60)
+    net.read_timeout.should.eql?(60)
     net.read_timeout = 10
-    net.read_timeout.should eql(10)
+    net.read_timeout.should.eql?(10)
   end
 end
 
@@ -14,11 +14,11 @@
   it "sets the seconds to wait till the connection is open" do
     net = Net::HTTP.new("localhost")
     net.read_timeout = 10
-    net.read_timeout.should eql(10)
+    net.read_timeout.should.eql?(10)
   end
 
   it "returns the newly set value" do
     net = Net::HTTP.new("localhost")
-    (net.read_timeout = 10).should eql(10)
+    (net.read_timeout = 10).should.eql?(10)
   end
 end
diff --git a/spec/ruby/library/net-http/http/request_spec.rb b/spec/ruby/library/net-http/http/request_spec.rb
index 356e605b3b2..e05ee96b556 100644
--- a/spec/ruby/library/net-http/http/request_spec.rb
+++ b/spec/ruby/library/net-http/http/request_spec.rb
@@ -19,7 +19,7 @@
       response.body.should == "Request type: GET"
 
       response = @http.request(Net::HTTP::Head.new("/request"), "test=test")
-      response.body.should be_nil
+      response.body.should == nil
 
       response = @http.request(Net::HTTP::Post.new("/request"), "test=test")
       response.body.should == "Request type: POST"
@@ -38,7 +38,7 @@
 
       # TODO: Does not work?
       #response = @http.request(Net::HTTP::Options.new("/request"), "test=test")
-      #response.body.should be_nil
+      #response.body.should == nil
 
       response = @http.request(Net::HTTP::Propfind.new("/request"), "test=test")
       response.body.should == "Request type: PROPFIND"
@@ -66,7 +66,7 @@
       response.body.should == "test=test"
 
       response = @http.request(Net::HTTP::Head.new("/request/body"), "test=test")
-      response.body.should be_nil
+      response.body.should == nil
 
       response = @http.request(Net::HTTP::Post.new("/request/body"), "test=test")
       response.body.should == "test=test"
@@ -85,7 +85,7 @@
 
       # TODO: Does not work?
       #response = @http.request(Net::HTTP::Options.new("/request/body"), "test=test")
-      #response.body.should be_nil
+      #response.body.should == nil
 
       response = @http.request(Net::HTTP::Propfind.new("/request/body"), "test=test")
       response.body.should == "test=test"
diff --git a/spec/ruby/library/net-http/http/request_types_spec.rb b/spec/ruby/library/net-http/http/request_types_spec.rb
index 53aef1ee585..0adc6259792 100644
--- a/spec/ruby/library/net-http/http/request_types_spec.rb
+++ b/spec/ruby/library/net-http/http/request_types_spec.rb
@@ -11,11 +11,11 @@
   end
 
   it "has no Request Body" do
-    Net::HTTP::Get::REQUEST_HAS_BODY.should be_false
+    Net::HTTP::Get::REQUEST_HAS_BODY.should == false
   end
 
   it "has a Response Body" do
-    Net::HTTP::Get::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Get::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -29,11 +29,11 @@
   end
 
   it "has no Request Body" do
-    Net::HTTP::Head::REQUEST_HAS_BODY.should be_false
+    Net::HTTP::Head::REQUEST_HAS_BODY.should == false
   end
 
   it "has no Response Body" do
-    Net::HTTP::Head::RESPONSE_HAS_BODY.should be_false
+    Net::HTTP::Head::RESPONSE_HAS_BODY.should == false
   end
 end
 
@@ -47,11 +47,11 @@
   end
 
   it "has a Request Body" do
-    Net::HTTP::Post::REQUEST_HAS_BODY.should be_true
+    Net::HTTP::Post::REQUEST_HAS_BODY.should == true
   end
 
   it "has a Response Body" do
-    Net::HTTP::Post::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Post::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -65,11 +65,11 @@
   end
 
   it "has a Request Body" do
-    Net::HTTP::Put::REQUEST_HAS_BODY.should be_true
+    Net::HTTP::Put::REQUEST_HAS_BODY.should == true
   end
 
   it "has a Response Body" do
-    Net::HTTP::Put::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Put::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -83,11 +83,11 @@
   end
 
   it "has no Request Body" do
-    Net::HTTP::Delete::REQUEST_HAS_BODY.should be_false
+    Net::HTTP::Delete::REQUEST_HAS_BODY.should == false
   end
 
   it "has a Response Body" do
-    Net::HTTP::Delete::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Delete::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -101,11 +101,11 @@
   end
 
   it "has no Request Body" do
-    Net::HTTP::Options::REQUEST_HAS_BODY.should be_false
+    Net::HTTP::Options::REQUEST_HAS_BODY.should == false
   end
 
   it "has no Response Body" do
-    Net::HTTP::Options::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Options::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -119,11 +119,11 @@
   end
 
   it "has no Request Body" do
-    Net::HTTP::Trace::REQUEST_HAS_BODY.should be_false
+    Net::HTTP::Trace::REQUEST_HAS_BODY.should == false
   end
 
   it "has a Response Body" do
-    Net::HTTP::Trace::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Trace::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -137,11 +137,11 @@
   end
 
   it "has a Request Body" do
-    Net::HTTP::Propfind::REQUEST_HAS_BODY.should be_true
+    Net::HTTP::Propfind::REQUEST_HAS_BODY.should == true
   end
 
   it "has a Response Body" do
-    Net::HTTP::Propfind::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Propfind::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -155,11 +155,11 @@
   end
 
   it "has a Request Body" do
-    Net::HTTP::Proppatch::REQUEST_HAS_BODY.should be_true
+    Net::HTTP::Proppatch::REQUEST_HAS_BODY.should == true
   end
 
   it "has a Response Body" do
-    Net::HTTP::Proppatch::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Proppatch::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -173,11 +173,11 @@
   end
 
   it "has a Request Body" do
-    Net::HTTP::Mkcol::REQUEST_HAS_BODY.should be_true
+    Net::HTTP::Mkcol::REQUEST_HAS_BODY.should == true
   end
 
   it "has a Response Body" do
-    Net::HTTP::Mkcol::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Mkcol::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -191,11 +191,11 @@
   end
 
   it "has no Request Body" do
-    Net::HTTP::Copy::REQUEST_HAS_BODY.should be_false
+    Net::HTTP::Copy::REQUEST_HAS_BODY.should == false
   end
 
   it "has a Response Body" do
-    Net::HTTP::Copy::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Copy::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -209,11 +209,11 @@
   end
 
   it "has no Request Body" do
-    Net::HTTP::Move::REQUEST_HAS_BODY.should be_false
+    Net::HTTP::Move::REQUEST_HAS_BODY.should == false
   end
 
   it "has a Response Body" do
-    Net::HTTP::Move::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Move::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -227,11 +227,11 @@
   end
 
   it "has a Request Body" do
-    Net::HTTP::Lock::REQUEST_HAS_BODY.should be_true
+    Net::HTTP::Lock::REQUEST_HAS_BODY.should == true
   end
 
   it "has a Response Body" do
-    Net::HTTP::Lock::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Lock::RESPONSE_HAS_BODY.should == true
   end
 end
 
@@ -245,10 +245,10 @@
   end
 
   it "has a Request Body" do
-    Net::HTTP::Unlock::REQUEST_HAS_BODY.should be_true
+    Net::HTTP::Unlock::REQUEST_HAS_BODY.should == true
   end
 
   it "has a Response Body" do
-    Net::HTTP::Unlock::RESPONSE_HAS_BODY.should be_true
+    Net::HTTP::Unlock::RESPONSE_HAS_BODY.should == true
   end
 end
diff --git a/spec/ruby/library/net-http/http/send_request_spec.rb b/spec/ruby/library/net-http/http/send_request_spec.rb
index af35c068cea..e2dfc505b6e 100644
--- a/spec/ruby/library/net-http/http/send_request_spec.rb
+++ b/spec/ruby/library/net-http/http/send_request_spec.rb
@@ -24,7 +24,7 @@
   describe "when passed type, path" do
     it "sends a HTTP Request of the passed type to the passed path" do
       response = @http.send_request("HEAD", "/request")
-      response.body.should be_nil
+      response.body.should == nil
 
       (@methods - %w[POST PUT]).each do |method|
         response = @http.send_request(method, "/request")
@@ -36,7 +36,7 @@
   describe "when passed type, path, body" do
     it "sends a HTTP Request with the passed body" do
       response = @http.send_request("HEAD", "/request/body", "test=test")
-      response.body.should be_nil
+      response.body.should == nil
 
       @methods.each do |method|
         response = @http.send_request(method, "/request/body", "test=test")
@@ -50,11 +50,11 @@
       referer = 'https://www.ruby-lang.org/'.freeze
 
       response = @http.send_request("HEAD", "/request/header", "test=test", "referer" => referer)
-      response.body.should be_nil
+      response.body.should == nil
 
       @methods.each do |method|
         response = @http.send_request(method, "/request/header", "test=test", "referer" => referer)
-        response.body.should include({ "Referer" => referer }.inspect.delete("{}"))
+        response.body.should.include?({ "Referer" => referer }.inspect.delete("{}"))
       end
     end
   end
diff --git a/spec/ruby/library/net-http/http/set_debug_output_spec.rb b/spec/ruby/library/net-http/http/set_debug_output_spec.rb
index 5ceecb39fb9..491ac38b5de 100644
--- a/spec/ruby/library/net-http/http/set_debug_output_spec.rb
+++ b/spec/ruby/library/net-http/http/set_debug_output_spec.rb
@@ -19,7 +19,7 @@
 
     @http.set_debug_output(io)
     @http.start
-    io.string.should_not be_empty
+    io.string.should_not.empty?
     size = io.string.size
 
     @http.get("/")
diff --git a/spec/ruby/library/net-http/http/shared/request_get.rb b/spec/ruby/library/net-http/http/shared/request_get.rb
index d25f32049bf..4f2f152ea4d 100644
--- a/spec/ruby/library/net-http/http/shared/request_get.rb
+++ b/spec/ruby/library/net-http/http/shared/request_get.rb
@@ -17,7 +17,7 @@
 
     it "returns a Net::HTTPResponse object" do
       response = @http.send(@method, "/request")
-      response.should be_kind_of(Net::HTTPResponse)
+      response.should.is_a?(Net::HTTPResponse)
     end
   end
 
@@ -35,7 +35,7 @@
 
     it "returns a Net::HTTPResponse object" do
       response = @http.send(@method, "/request") {}
-      response.should be_kind_of(Net::HTTPResponse)
+      response.should.is_a?(Net::HTTPResponse)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/shared/request_head.rb b/spec/ruby/library/net-http/http/shared/request_head.rb
index 78b555884b8..a5fe787d327 100644
--- a/spec/ruby/library/net-http/http/shared/request_head.rb
+++ b/spec/ruby/library/net-http/http/shared/request_head.rb
@@ -12,30 +12,30 @@
   describe "when passed no block" do
     it "sends a head request to the passed path and returns the response" do
       response = @http.send(@method, "/request")
-      response.body.should be_nil
+      response.body.should == nil
     end
 
     it "returns a Net::HTTPResponse object" do
       response = @http.send(@method, "/request")
-      response.should be_kind_of(Net::HTTPResponse)
+      response.should.is_a?(Net::HTTPResponse)
     end
   end
 
   describe "when passed a block" do
     it "sends a head request to the passed path and returns the response" do
       response = @http.send(@method, "/request") {}
-      response.body.should be_nil
+      response.body.should == nil
     end
 
     it "yields the response to the passed block" do
       @http.send(@method, "/request") do |response|
-        response.body.should be_nil
+        response.body.should == nil
       end
     end
 
     it "returns a Net::HTTPResponse object" do
       response = @http.send(@method, "/request") {}
-      response.should be_kind_of(Net::HTTPResponse)
+      response.should.is_a?(Net::HTTPResponse)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/shared/request_post.rb b/spec/ruby/library/net-http/http/shared/request_post.rb
index e832411c488..73cfd577cff 100644
--- a/spec/ruby/library/net-http/http/shared/request_post.rb
+++ b/spec/ruby/library/net-http/http/shared/request_post.rb
@@ -17,7 +17,7 @@
 
     it "returns a Net::HTTPResponse object" do
       response = @http.send(@method, "/request", "test=test")
-      response.should be_kind_of(Net::HTTPResponse)
+      response.should.is_a?(Net::HTTPResponse)
     end
   end
 
@@ -35,7 +35,7 @@
 
     it "returns a Net::HTTPResponse object" do
       response = @http.send(@method, "/request", "test=test") {}
-      response.should be_kind_of(Net::HTTPResponse)
+      response.should.is_a?(Net::HTTPResponse)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/shared/request_put.rb b/spec/ruby/library/net-http/http/shared/request_put.rb
index 3b902f49572..3b64d7e0557 100644
--- a/spec/ruby/library/net-http/http/shared/request_put.rb
+++ b/spec/ruby/library/net-http/http/shared/request_put.rb
@@ -17,7 +17,7 @@
 
     it "returns a Net::HTTPResponse object" do
       response = @http.send(@method, "/request", "test=test")
-      response.should be_kind_of(Net::HTTPResponse)
+      response.should.is_a?(Net::HTTPResponse)
     end
   end
 
@@ -35,7 +35,7 @@
 
     it "returns a Net::HTTPResponse object" do
       response = @http.send(@method, "/request", "test=test") {}
-      response.should be_kind_of(Net::HTTPResponse)
+      response.should.is_a?(Net::HTTPResponse)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/shared/started.rb b/spec/ruby/library/net-http/http/shared/started.rb
index 9ff6272c314..0ab18a4e83f 100644
--- a/spec/ruby/library/net-http/http/shared/started.rb
+++ b/spec/ruby/library/net-http/http/shared/started.rb
@@ -11,16 +11,16 @@
 
   it "returns true when self has been started" do
     @http.start
-    @http.send(@method).should be_true
+    @http.send(@method).should == true
   end
 
   it "returns false when self has not been started yet" do
-    @http.send(@method).should be_false
+    @http.send(@method).should == false
   end
 
   it "returns false when self has been stopped again" do
     @http.start
     @http.finish
-    @http.send(@method).should be_false
+    @http.send(@method).should == false
   end
 end
diff --git a/spec/ruby/library/net-http/http/shared/version_1_1.rb b/spec/ruby/library/net-http/http/shared/version_1_1.rb
index db3d6a986dd..84e7264eabf 100644
--- a/spec/ruby/library/net-http/http/shared/version_1_1.rb
+++ b/spec/ruby/library/net-http/http/shared/version_1_1.rb
@@ -1,6 +1,6 @@
 describe :net_http_version_1_1_p, shared: true do
   it "returns the state of net/http 1.1 features" do
     Net::HTTP.version_1_2
-    Net::HTTP.send(@method).should be_false
+    Net::HTTP.send(@method).should == false
   end
 end
diff --git a/spec/ruby/library/net-http/http/shared/version_1_2.rb b/spec/ruby/library/net-http/http/shared/version_1_2.rb
index b044182c609..dcf54197045 100644
--- a/spec/ruby/library/net-http/http/shared/version_1_2.rb
+++ b/spec/ruby/library/net-http/http/shared/version_1_2.rb
@@ -1,6 +1,6 @@
 describe :net_http_version_1_2_p, shared: true do
   it "returns the state of net/http 1.2 features" do
     Net::HTTP.version_1_2
-    Net::HTTP.send(@method).should be_true
+    Net::HTTP.send(@method).should == true
   end
 end
diff --git a/spec/ruby/library/net-http/http/start_spec.rb b/spec/ruby/library/net-http/http/start_spec.rb
index 0ce3e792690..1aebc16f4d6 100644
--- a/spec/ruby/library/net-http/http/start_spec.rb
+++ b/spec/ruby/library/net-http/http/start_spec.rb
@@ -22,13 +22,13 @@
     end
 
     it "returns a new Net::HTTP object for the passed address and port" do
-      @http.should be_kind_of(Net::HTTP)
+      @http.should.is_a?(Net::HTTP)
       @http.address.should == "localhost"
       @http.port.should == @port
     end
 
     it "opens the tcp connection" do
-      @http.started?.should be_true
+      @http.started?.should == true
     end
   end
 
@@ -41,19 +41,19 @@
       yielded = false
       Net::HTTP.start("localhost", @port) do |net|
         yielded = true
-        net.should be_kind_of(Net::HTTP)
+        net.should.is_a?(Net::HTTP)
       end
-      yielded.should be_true
+      yielded.should == true
     end
 
     it "opens the tcp connection before yielding" do
-      Net::HTTP.start("localhost", @port) { |http| http.started?.should be_true }
+      Net::HTTP.start("localhost", @port) { |http| http.started?.should == true }
     end
 
     it "closes the tcp connection after yielding" do
       net = nil
       Net::HTTP.start("localhost", @port) { |x| net = x }
-      net.started?.should be_false
+      net.started?.should == false
     end
   end
 end
@@ -70,18 +70,18 @@
   end
 
   it "returns self" do
-    @http.start.should equal(@http)
+    @http.start.should.equal?(@http)
   end
 
   it "opens the tcp connection" do
     @http.start
-    @http.started?.should be_true
+    @http.started?.should == true
   end
 
   describe "when self has already been started" do
     it "raises an IOError" do
       @http.start
-      -> { @http.start }.should raise_error(IOError)
+      -> { @http.start }.should.raise(IOError)
     end
   end
 
@@ -94,18 +94,18 @@
       yielded = false
       @http.start do |http|
         yielded = true
-        http.should equal(@http)
+        http.should.equal?(@http)
       end
-      yielded.should be_true
+      yielded.should == true
     end
 
     it "opens the tcp connection before yielding" do
-      @http.start { |http| http.started?.should be_true }
+      @http.start { |http| http.started?.should == true }
     end
 
     it "closes the tcp connection after yielding" do
       @http.start { }
-      @http.started?.should be_false
+      @http.started?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/net-http/http/trace_spec.rb b/spec/ruby/library/net-http/http/trace_spec.rb
index 9809d537c5e..e0ff741b046 100644
--- a/spec/ruby/library/net-http/http/trace_spec.rb
+++ b/spec/ruby/library/net-http/http/trace_spec.rb
@@ -19,6 +19,6 @@
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.trace("/request").should be_kind_of(Net::HTTPResponse)
+    @http.trace("/request").should.is_a?(Net::HTTPResponse)
   end
 end
diff --git a/spec/ruby/library/net-http/http/unlock_spec.rb b/spec/ruby/library/net-http/http/unlock_spec.rb
index adf0b49f652..cbfc803f09d 100644
--- a/spec/ruby/library/net-http/http/unlock_spec.rb
+++ b/spec/ruby/library/net-http/http/unlock_spec.rb
@@ -19,6 +19,6 @@
   end
 
   it "returns a Net::HTTPResponse" do
-    @http.unlock("/request", "test=test").should be_kind_of(Net::HTTPResponse)
+    @http.unlock("/request", "test=test").should.is_a?(Net::HTTPResponse)
   end
 end
diff --git a/spec/ruby/library/net-http/http/use_ssl_spec.rb b/spec/ruby/library/net-http/http/use_ssl_spec.rb
index 912a62a8ba6..b2836553593 100644
--- a/spec/ruby/library/net-http/http/use_ssl_spec.rb
+++ b/spec/ruby/library/net-http/http/use_ssl_spec.rb
@@ -4,6 +4,6 @@
 describe "Net::HTTP#use_ssl?" do
   it "returns false" do
     http = Net::HTTP.new("localhost")
-    http.use_ssl?.should be_false
+    http.use_ssl?.should == false
   end
 end
diff --git a/spec/ruby/library/net-http/http/version_1_2_spec.rb b/spec/ruby/library/net-http/http/version_1_2_spec.rb
index e994511aea1..4918597234f 100644
--- a/spec/ruby/library/net-http/http/version_1_2_spec.rb
+++ b/spec/ruby/library/net-http/http/version_1_2_spec.rb
@@ -6,12 +6,12 @@
   it "turns on net/http 1.2 features" do
     Net::HTTP.version_1_2
 
-    Net::HTTP.version_1_2?.should be_true
-    Net::HTTP.version_1_1?.should be_false
+    Net::HTTP.version_1_2?.should == true
+    Net::HTTP.version_1_1?.should == false
   end
 
   it "returns true" do
-    Net::HTTP.version_1_2.should be_true
+    Net::HTTP.version_1_2.should == true
   end
 end
 
diff --git a/spec/ruby/library/net-http/httpgenericrequest/body_exist_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/body_exist_spec.rb
index 6c886499ca7..96a761929ea 100644
--- a/spec/ruby/library/net-http/httpgenericrequest/body_exist_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/body_exist_spec.rb
@@ -4,10 +4,10 @@
 describe "Net::HTTPGenericRequest#body_exist?" do
   it "returns true when the response is expected to have a body" do
     request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-    request.body_exist?.should be_true
+    request.body_exist?.should == true
 
     request = Net::HTTPGenericRequest.new("POST", true, false, "/some/path")
-    request.body_exist?.should be_false
+    request.body_exist?.should == false
   end
 
   describe "when $VERBOSE is true" do
diff --git a/spec/ruby/library/net-http/httpgenericrequest/body_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/body_spec.rb
index 5f7315f303b..63cda994e55 100644
--- a/spec/ruby/library/net-http/httpgenericrequest/body_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/body_spec.rb
@@ -5,7 +5,7 @@
 describe "Net::HTTPGenericRequest#body" do
   it "returns self's request body" do
     request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-    request.body.should be_nil
+    request.body.should == nil
 
     request.body = "Some Content"
     request.body.should == "Some Content"
@@ -25,6 +25,6 @@
   it "sets self's body stream to nil" do
     @request.body_stream = StringIO.new("")
     @request.body = "Some Content"
-    @request.body_stream.should be_nil
+    @request.body_stream.should == nil
   end
 end
diff --git a/spec/ruby/library/net-http/httpgenericrequest/body_stream_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/body_stream_spec.rb
index dea1c8c8834..3237dbb8611 100644
--- a/spec/ruby/library/net-http/httpgenericrequest/body_stream_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/body_stream_spec.rb
@@ -5,11 +5,11 @@
 describe "Net::HTTPGenericRequest#body_stream" do
   it "returns self's body stream Object" do
     request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-    request.body_stream.should be_nil
+    request.body_stream.should == nil
 
     stream = StringIO.new("test")
     request.body_stream = stream
-    request.body_stream.should equal(stream)
+    request.body_stream.should.equal?(stream)
   end
 end
 
@@ -21,12 +21,12 @@
 
   it "sets self's body stream to the passed Object" do
     @request.body_stream = @stream
-    @request.body_stream.should equal(@stream)
+    @request.body_stream.should.equal?(@stream)
   end
 
   it "sets self's body to nil" do
     @request.body = "Some Content"
     @request.body_stream = @stream
-    @request.body.should be_nil
+    @request.body.should == nil
   end
 end
diff --git a/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb
index a09f9d5bece..0ccf80e3b69 100644
--- a/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb
@@ -129,7 +129,7 @@
                                             "Content-Type" => "text/html")
       request.body_stream = StringIO.new("Some Content")
 
-      -> { request.exec(@buffered_socket, "1.1", "/some/other/path") }.should raise_error(ArgumentError)
+      -> { request.exec(@buffered_socket, "1.1", "/some/other/path") }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/httpgenericrequest/request_body_permitted_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/request_body_permitted_spec.rb
index 1713b59baf5..ba836e81300 100644
--- a/spec/ruby/library/net-http/httpgenericrequest/request_body_permitted_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/request_body_permitted_spec.rb
@@ -4,9 +4,9 @@
 describe "Net::HTTPGenericRequest#request_body_permitted?" do
   it "returns true when the request is expected to have a body" do
     request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-    request.request_body_permitted?.should be_true
+    request.request_body_permitted?.should == true
 
     request = Net::HTTPGenericRequest.new("POST", false, true, "/some/path")
-    request.request_body_permitted?.should be_false
+    request.request_body_permitted?.should == false
   end
 end
diff --git a/spec/ruby/library/net-http/httpgenericrequest/response_body_permitted_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/response_body_permitted_spec.rb
index 2f0751c344e..067500f60dc 100644
--- a/spec/ruby/library/net-http/httpgenericrequest/response_body_permitted_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/response_body_permitted_spec.rb
@@ -4,9 +4,9 @@
 describe "Net::HTTPGenericRequest#response_body_permitted?" do
   it "returns true when the response is expected to have a body" do
     request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-    request.response_body_permitted?.should be_true
+    request.response_body_permitted?.should == true
 
     request = Net::HTTPGenericRequest.new("POST", true, false, "/some/path")
-    request.response_body_permitted?.should be_false
+    request.response_body_permitted?.should == false
   end
 end
diff --git a/spec/ruby/library/net-http/httpgenericrequest/set_body_internal_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/set_body_internal_spec.rb
index 358aa6cde34..f241d8d698a 100644
--- a/spec/ruby/library/net-http/httpgenericrequest/set_body_internal_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/set_body_internal_spec.rb
@@ -13,9 +13,9 @@
 
   it "raises an ArgumentError when the body or body_stream of self have already been set" do
     @request.body = "Some Content"
-    -> { @request.set_body_internal("Some other Content") }.should raise_error(ArgumentError)
+    -> { @request.set_body_internal("Some other Content") }.should.raise(ArgumentError)
 
     @request.body_stream = "Some Content"
-    -> { @request.set_body_internal("Some other Content") }.should raise_error(ArgumentError)
+    -> { @request.set_body_internal("Some other Content") }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/chunked_spec.rb b/spec/ruby/library/net-http/httpheader/chunked_spec.rb
index b32a0aab388..4da218ae25e 100644
--- a/spec/ruby/library/net-http/httpheader/chunked_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/chunked_spec.rb
@@ -8,15 +8,15 @@
   end
 
   it "returns true if the 'Transfer-Encoding' header entry is set to chunked" do
-    @headers.chunked?.should be_false
+    @headers.chunked?.should == false
 
     @headers["Transfer-Encoding"] = "bla"
-    @headers.chunked?.should be_false
+    @headers.chunked?.should == false
 
     @headers["Transfer-Encoding"] = "blachunkedbla"
-    @headers.chunked?.should be_false
+    @headers.chunked?.should == false
 
     @headers["Transfer-Encoding"] = "chunked"
-    @headers.chunked?.should be_true
+    @headers.chunked?.should == true
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/content_length_spec.rb b/spec/ruby/library/net-http/httpheader/content_length_spec.rb
index f05c5f8d8b3..c66d5673c1d 100644
--- a/spec/ruby/library/net-http/httpheader/content_length_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/content_length_spec.rb
@@ -8,23 +8,23 @@
   end
 
   it "returns nil if no 'Content-Length' header entry is set" do
-    @headers.content_length.should be_nil
+    @headers.content_length.should == nil
   end
 
   it "raises a Net::HTTPHeaderSyntaxError when the 'Content-Length' header entry has an invalid format" do
     @headers["Content-Length"] = "invalid"
-    -> { @headers.content_length }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.content_length }.should.raise(Net::HTTPHeaderSyntaxError)
   end
 
   it "returns the value of the 'Content-Length' header entry as an Integer" do
     @headers["Content-Length"] = "123"
-    @headers.content_length.should eql(123)
+    @headers.content_length.should.eql?(123)
 
     @headers["Content-Length"] = "123valid"
-    @headers.content_length.should eql(123)
+    @headers.content_length.should.eql?(123)
 
     @headers["Content-Length"] = "valid123"
-    @headers.content_length.should eql(123)
+    @headers.content_length.should.eql?(123)
   end
 end
 
@@ -36,7 +36,7 @@
   it "removes the 'Content-Length' entry if passed false or nil" do
     @headers["Content-Length"] = "123"
     @headers.content_length = nil
-    @headers["Content-Length"].should be_nil
+    @headers["Content-Length"].should == nil
   end
 
   it "sets the 'Content-Length' entry to the passed value" do
diff --git a/spec/ruby/library/net-http/httpheader/content_range_spec.rb b/spec/ruby/library/net-http/httpheader/content_range_spec.rb
index 09737141a5c..3635fb3f1b1 100644
--- a/spec/ruby/library/net-http/httpheader/content_range_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/content_range_spec.rb
@@ -16,17 +16,17 @@
   end
 
   it "returns nil when there is no 'Content-Range' header entry" do
-    @headers.content_range.should be_nil
+    @headers.content_range.should == nil
   end
 
   it "raises a Net::HTTPHeaderSyntaxError when the 'Content-Range' has an invalid format" do
     @headers["Content-Range"] = "invalid"
-    -> { @headers.content_range }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.content_range }.should.raise(Net::HTTPHeaderSyntaxError)
 
     @headers["Content-Range"] = "bytes 123-abc"
-    -> { @headers.content_range }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.content_range }.should.raise(Net::HTTPHeaderSyntaxError)
 
     @headers["Content-Range"] = "bytes abc-123"
-    -> { @headers.content_range }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.content_range }.should.raise(Net::HTTPHeaderSyntaxError)
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/content_type_spec.rb b/spec/ruby/library/net-http/httpheader/content_type_spec.rb
index a6e1ae1093a..c9c936ba0f2 100644
--- a/spec/ruby/library/net-http/httpheader/content_type_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/content_type_spec.rb
@@ -17,7 +17,7 @@
   end
 
   it "returns nil if the 'Content-Type' header entry does not exist" do
-    @headers.content_type.should be_nil
+    @headers.content_type.should == nil
   end
 end
 
diff --git a/spec/ruby/library/net-http/httpheader/delete_spec.rb b/spec/ruby/library/net-http/httpheader/delete_spec.rb
index 8d929dbd862..09bae65a139 100644
--- a/spec/ruby/library/net-http/httpheader/delete_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/delete_spec.rb
@@ -11,8 +11,8 @@
     @headers["My-Header"] = "test"
     @headers.delete("My-Header")
 
-    @headers["My-Header"].should be_nil
-    @headers.size.should eql(0)
+    @headers["My-Header"].should == nil
+    @headers.size.should.eql?(0)
   end
 
   it "returns the removed values" do
@@ -24,7 +24,7 @@
     @headers["My-Header"] = "test"
     @headers.delete("my-header")
 
-    @headers["My-Header"].should be_nil
-    @headers.size.should eql(0)
+    @headers["My-Header"].should == nil
+    @headers.size.should.eql?(0)
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/each_capitalized_name_spec.rb b/spec/ruby/library/net-http/httpheader/each_capitalized_name_spec.rb
index 27713577f97..54874c05358 100644
--- a/spec/ruby/library/net-http/httpheader/each_capitalized_name_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/each_capitalized_name_spec.rb
@@ -23,7 +23,7 @@
   describe "when passed no block" do
     it "returns an Enumerator" do
       enumerator = @headers.each_capitalized_name
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
 
       res = []
       enumerator.each do |key|
diff --git a/spec/ruby/library/net-http/httpheader/each_value_spec.rb b/spec/ruby/library/net-http/httpheader/each_value_spec.rb
index b71df58c658..55ba4c1ef86 100644
--- a/spec/ruby/library/net-http/httpheader/each_value_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/each_value_spec.rb
@@ -23,7 +23,7 @@
   describe "when passed no block" do
     it "returns an Enumerator" do
       enumerator = @headers.each_value
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
 
       res = []
       enumerator.each do |key|
diff --git a/spec/ruby/library/net-http/httpheader/element_reference_spec.rb b/spec/ruby/library/net-http/httpheader/element_reference_spec.rb
index 1003c41af93..f12f8494db6 100644
--- a/spec/ruby/library/net-http/httpheader/element_reference_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/element_reference_spec.rb
@@ -33,7 +33,7 @@
   end
 
   it "returns nil for non-existing entries" do
-    @headers["My-Header"].should be_nil
-    @headers["My-Other-Header"].should be_nil
+    @headers["My-Header"].should == nil
+    @headers["My-Other-Header"].should == nil
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/element_set_spec.rb b/spec/ruby/library/net-http/httpheader/element_set_spec.rb
index 376df2f977d..633fe18b2ed 100644
--- a/spec/ruby/library/net-http/httpheader/element_set_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/element_set_spec.rb
@@ -26,16 +26,16 @@
     @headers['MY-HEADER'] = "last one"
 
     @headers["My-Header"].should == "last one"
-    @headers.size.should eql(1)
+    @headers.size.should.eql?(1)
   end
 
   it "removes the header entry with the passed key when the value is false or nil" do
     @headers['My-Header'] = "test"
     @headers['My-Header'] = nil
-    @headers['My-Header'].should be_nil
+    @headers['My-Header'].should == nil
 
     @headers['My-Header'] = "test"
     @headers['My-Header'] = false
-    @headers['My-Header'].should be_nil
+    @headers['My-Header'].should == nil
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/fetch_spec.rb b/spec/ruby/library/net-http/httpheader/fetch_spec.rb
index 58c69c03773..d1c273dada0 100644
--- a/spec/ruby/library/net-http/httpheader/fetch_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/fetch_spec.rb
@@ -25,7 +25,7 @@
     end
 
     it "returns nil when there is no entry for the passed key" do
-      -> { @headers.fetch("my-header") }.should raise_error(IndexError)
+      -> { @headers.fetch("my-header") }.should.raise(IndexError)
     end
   end
 
diff --git a/spec/ruby/library/net-http/httpheader/get_fields_spec.rb b/spec/ruby/library/net-http/httpheader/get_fields_spec.rb
index 0278bcede21..76da63bc314 100644
--- a/spec/ruby/library/net-http/httpheader/get_fields_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/get_fields_spec.rb
@@ -26,8 +26,8 @@
   end
 
   it "returns nil for non-existing header entries" do
-    @headers.get_fields("My-Header").should be_nil
-    @headers.get_fields("My-Other-header").should be_nil
+    @headers.get_fields("My-Header").should == nil
+    @headers.get_fields("My-Other-header").should == nil
   end
 
   it "is case-insensitive" do
diff --git a/spec/ruby/library/net-http/httpheader/key_spec.rb b/spec/ruby/library/net-http/httpheader/key_spec.rb
index 2b7aeb9c2ad..65662591eb4 100644
--- a/spec/ruby/library/net-http/httpheader/key_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/key_spec.rb
@@ -8,14 +8,14 @@
   end
 
   it "returns true if the header entry with the passed key exists" do
-    @headers.key?("My-Header").should be_false
+    @headers.key?("My-Header").should == false
     @headers["My-Header"] = "test"
-    @headers.key?("My-Header").should be_true
+    @headers.key?("My-Header").should == true
   end
 
   it "is case-insensitive" do
     @headers["My-Header"] = "test"
-    @headers.key?("my-header").should be_true
-    @headers.key?("MY-HEADER").should be_true
+    @headers.key?("my-header").should == true
+    @headers.key?("MY-HEADER").should == true
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/main_type_spec.rb b/spec/ruby/library/net-http/httpheader/main_type_spec.rb
index 4dd551d8f4f..af7d3e05a3a 100644
--- a/spec/ruby/library/net-http/httpheader/main_type_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/main_type_spec.rb
@@ -19,6 +19,6 @@
   end
 
   it "returns nil if the 'Content-Type' header entry does not exist" do
-    @headers.main_type.should be_nil
+    @headers.main_type.should == nil
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/range_length_spec.rb b/spec/ruby/library/net-http/httpheader/range_length_spec.rb
index 77323ac8726..34db7e61267 100644
--- a/spec/ruby/library/net-http/httpheader/range_length_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/range_length_spec.rb
@@ -9,24 +9,24 @@
 
   it "returns the length of the Range represented by the 'Content-Range' header entry" do
     @headers["Content-Range"] = "bytes 0-499/1234"
-    @headers.range_length.should eql(500)
+    @headers.range_length.should.eql?(500)
 
     @headers["Content-Range"] = "bytes 500-1233/1234"
-    @headers.range_length.should eql(734)
+    @headers.range_length.should.eql?(734)
   end
 
   it "returns nil when there is no 'Content-Range' header entry" do
-    @headers.range_length.should be_nil
+    @headers.range_length.should == nil
   end
 
   it "raises a Net::HTTPHeaderSyntaxError when the 'Content-Range' has an invalid format" do
     @headers["Content-Range"] = "invalid"
-    -> { @headers.range_length }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.range_length }.should.raise(Net::HTTPHeaderSyntaxError)
 
     @headers["Content-Range"] = "bytes 123-abc"
-    -> { @headers.range_length }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.range_length }.should.raise(Net::HTTPHeaderSyntaxError)
 
     @headers["Content-Range"] = "bytes abc-123"
-    -> { @headers.range_length }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.range_length }.should.raise(Net::HTTPHeaderSyntaxError)
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/range_spec.rb b/spec/ruby/library/net-http/httpheader/range_spec.rb
index 2de80a825e7..0fc0feb5c9b 100644
--- a/spec/ruby/library/net-http/httpheader/range_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/range_spec.rb
@@ -23,23 +23,23 @@
   end
 
   it "returns nil when there is no 'Range' header entry" do
-    @headers.range.should be_nil
+    @headers.range.should == nil
   end
 
   it "raises a Net::HTTPHeaderSyntaxError when the 'Range' has an invalid format" do
     @headers["Range"] = "invalid"
-    -> { @headers.range }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.range }.should.raise(Net::HTTPHeaderSyntaxError)
 
     @headers["Range"] = "bytes 123-abc"
-    -> { @headers.range }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.range }.should.raise(Net::HTTPHeaderSyntaxError)
 
     @headers["Range"] = "bytes abc-123"
-    -> { @headers.range }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.range }.should.raise(Net::HTTPHeaderSyntaxError)
   end
 
   it "raises a Net::HTTPHeaderSyntaxError when the 'Range' was not specified" do
     @headers["Range"] = "bytes=-"
-    -> { @headers.range }.should raise_error(Net::HTTPHeaderSyntaxError)
+    -> { @headers.range }.should.raise(Net::HTTPHeaderSyntaxError)
   end
 end
 
diff --git a/spec/ruby/library/net-http/httpheader/shared/each_capitalized.rb b/spec/ruby/library/net-http/httpheader/shared/each_capitalized.rb
index 3bac4098760..c12df62787e 100644
--- a/spec/ruby/library/net-http/httpheader/shared/each_capitalized.rb
+++ b/spec/ruby/library/net-http/httpheader/shared/each_capitalized.rb
@@ -19,7 +19,7 @@
   describe "when passed no block" do
     it "returns an Enumerator" do
       enumerator = @headers.send(@method)
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
 
       res = []
       enumerator.each do |*key|
diff --git a/spec/ruby/library/net-http/httpheader/shared/each_header.rb b/spec/ruby/library/net-http/httpheader/shared/each_header.rb
index 6bf3a6ddfe6..5913665a4de 100644
--- a/spec/ruby/library/net-http/httpheader/shared/each_header.rb
+++ b/spec/ruby/library/net-http/httpheader/shared/each_header.rb
@@ -19,7 +19,7 @@
   describe "when passed no block" do
     it "returns an Enumerator" do
       enumerator = @headers.send(@method)
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
 
       res = []
       enumerator.each do |*key|
diff --git a/spec/ruby/library/net-http/httpheader/shared/each_name.rb b/spec/ruby/library/net-http/httpheader/shared/each_name.rb
index efc6a09dfd2..29c9400fef1 100644
--- a/spec/ruby/library/net-http/httpheader/shared/each_name.rb
+++ b/spec/ruby/library/net-http/httpheader/shared/each_name.rb
@@ -19,7 +19,7 @@
   describe "when passed no block" do
     it "returns an Enumerator" do
       enumerator = @headers.send(@method)
-      enumerator.should be_an_instance_of(Enumerator)
+      enumerator.should.instance_of?(Enumerator)
 
       res = []
       enumerator.each do |key|
diff --git a/spec/ruby/library/net-http/httpheader/shared/set_range.rb b/spec/ruby/library/net-http/httpheader/shared/set_range.rb
index 87f51d46f35..9ab50a075e8 100644
--- a/spec/ruby/library/net-http/httpheader/shared/set_range.rb
+++ b/spec/ruby/library/net-http/httpheader/shared/set_range.rb
@@ -5,13 +5,13 @@
 
   describe "when passed nil" do
     it "returns nil" do
-      @headers.send(@method, nil).should be_nil
+      @headers.send(@method, nil).should == nil
     end
 
     it "deletes the 'Range' header entry" do
       @headers["Range"] = "bytes 0-499/1234"
       @headers.send(@method, nil)
-      @headers["Range"].should be_nil
+      @headers["Range"].should == nil
     end
   end
 
@@ -50,15 +50,15 @@
     end
 
     it "raises a Net::HTTPHeaderSyntaxError when the first Range element is negative" do
-      -> { @headers.send(@method, -10..5) }.should raise_error(Net::HTTPHeaderSyntaxError)
+      -> { @headers.send(@method, -10..5) }.should.raise(Net::HTTPHeaderSyntaxError)
     end
 
     it "raises a Net::HTTPHeaderSyntaxError when the last Range element is negative" do
-      -> { @headers.send(@method, 10..-5) }.should raise_error(Net::HTTPHeaderSyntaxError)
+      -> { @headers.send(@method, 10..-5) }.should.raise(Net::HTTPHeaderSyntaxError)
     end
 
     it "raises a Net::HTTPHeaderSyntaxError when the last Range element is smaller than the first" do
-      -> { @headers.send(@method, 10..5) }.should raise_error(Net::HTTPHeaderSyntaxError)
+      -> { @headers.send(@method, 10..5) }.should.raise(Net::HTTPHeaderSyntaxError)
     end
   end
 
@@ -75,15 +75,15 @@
     end
 
     it "raises a Net::HTTPHeaderSyntaxError when start is negative" do
-      -> { @headers.send(@method, -10, 5) }.should raise_error(Net::HTTPHeaderSyntaxError)
+      -> { @headers.send(@method, -10, 5) }.should.raise(Net::HTTPHeaderSyntaxError)
     end
 
     it "raises a Net::HTTPHeaderSyntaxError when start + length is negative" do
-      -> { @headers.send(@method, 10, -15) }.should raise_error(Net::HTTPHeaderSyntaxError)
+      -> { @headers.send(@method, 10, -15) }.should.raise(Net::HTTPHeaderSyntaxError)
     end
 
     it "raises a Net::HTTPHeaderSyntaxError when length is negative" do
-      -> { @headers.send(@method, 10, -4) }.should raise_error(Net::HTTPHeaderSyntaxError)
+      -> { @headers.send(@method, 10, -4) }.should.raise(Net::HTTPHeaderSyntaxError)
     end
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/shared/size.rb b/spec/ruby/library/net-http/httpheader/shared/size.rb
index e2b1e4c22b6..b38310a9407 100644
--- a/spec/ruby/library/net-http/httpheader/shared/size.rb
+++ b/spec/ruby/library/net-http/httpheader/shared/size.rb
@@ -4,15 +4,15 @@
   end
 
   it "returns the number of header entries in self" do
-    @headers.send(@method).should eql(0)
+    @headers.send(@method).should.eql?(0)
 
     @headers["a"] = "b"
-    @headers.send(@method).should eql(1)
+    @headers.send(@method).should.eql?(1)
 
     @headers["b"] = "b"
-    @headers.send(@method).should eql(2)
+    @headers.send(@method).should.eql?(2)
 
     @headers["c"] = "c"
-    @headers.send(@method).should eql(3)
+    @headers.send(@method).should.eql?(3)
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/sub_type_spec.rb b/spec/ruby/library/net-http/httpheader/sub_type_spec.rb
index b39b57fe8d4..9e7d2a53687 100644
--- a/spec/ruby/library/net-http/httpheader/sub_type_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/sub_type_spec.rb
@@ -20,13 +20,13 @@
 
   it "returns nil if no 'sub-content-type' is set" do
     @headers["Content-Type"] = "text"
-    @headers.sub_type.should be_nil
+    @headers.sub_type.should == nil
 
     @headers["Content-Type"] = "text;charset=utf-8"
-    @headers.sub_type.should be_nil
+    @headers.sub_type.should == nil
   end
 
   it "returns nil if the 'Content-Type' header entry does not exist" do
-    @headers.sub_type.should be_nil
+    @headers.sub_type.should == nil
   end
 end
diff --git a/spec/ruby/library/net-http/httpheader/to_hash_spec.rb b/spec/ruby/library/net-http/httpheader/to_hash_spec.rb
index 3cebc519a6c..e245c20d4cd 100644
--- a/spec/ruby/library/net-http/httpheader/to_hash_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/to_hash_spec.rb
@@ -20,6 +20,6 @@
   it "does not allow modifying the headers from the returned hash" do
     @headers.to_hash["my-header"] = ["test"]
     @headers.to_hash.should == {}
-    @headers.key?("my-header").should be_false
+    @headers.key?("my-header").should == false
   end
 end
diff --git a/spec/ruby/library/net-http/httprequest/initialize_spec.rb b/spec/ruby/library/net-http/httprequest/initialize_spec.rb
index d009a00ed2e..1229986bef0 100644
--- a/spec/ruby/library/net-http/httprequest/initialize_spec.rb
+++ b/spec/ruby/library/net-http/httprequest/initialize_spec.rb
@@ -21,12 +21,12 @@ class TestRequest < Net::HTTPRequest
 
   it "uses the REQUEST_HAS_BODY to set whether the Request has a body or not" do
     @req.send(:initialize, "/some/path")
-    @req.request_body_permitted?.should be_false
+    @req.request_body_permitted?.should == false
   end
 
   it "uses the RESPONSE_HAS_BODY to set whether the Response can have a body or not" do
     @req.send(:initialize, "/some/path")
-    @req.response_body_permitted?.should be_true
+    @req.response_body_permitted?.should == true
   end
 
   describe "when passed path" do
diff --git a/spec/ruby/library/net-http/httpresponse/error_spec.rb b/spec/ruby/library/net-http/httpresponse/error_spec.rb
index 6ced90fa234..e194df95afd 100644
--- a/spec/ruby/library/net-http/httpresponse/error_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/error_spec.rb
@@ -4,21 +4,21 @@
 describe "Net::HTTPResponse#error!" do
   it "raises self's class 'EXCEPTION_TYPE' Exception" do
     res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    -> { res.error! }.should raise_error(Net::HTTPError)
+    -> { res.error! }.should.raise(Net::HTTPError)
 
     res = Net::HTTPInformation.new("1.0", "1xx", "test response")
-    -> { res.error! }.should raise_error(Net::HTTPError)
+    -> { res.error! }.should.raise(Net::HTTPError)
 
     res = Net::HTTPSuccess.new("1.0", "2xx", "test response")
-    -> { res.error! }.should raise_error(Net::HTTPError)
+    -> { res.error! }.should.raise(Net::HTTPError)
 
     res = Net::HTTPRedirection.new("1.0", "3xx", "test response")
-    -> { res.error! }.should raise_error(Net::HTTPRetriableError)
+    -> { res.error! }.should.raise(Net::HTTPRetriableError)
 
     res = Net::HTTPClientError.new("1.0", "4xx", "test response")
-    -> { res.error! }.should raise_error(Net::HTTPClientException)
+    -> { res.error! }.should.raise(Net::HTTPClientException)
 
     res = Net::HTTPServerError.new("1.0", "5xx", "test response")
-    -> { res.error! }.should raise_error(Net::HTTPFatalError)
+    -> { res.error! }.should.raise(Net::HTTPFatalError)
   end
 end
diff --git a/spec/ruby/library/net-http/httpresponse/header_spec.rb b/spec/ruby/library/net-http/httpresponse/header_spec.rb
index a403dbd2c33..3ddadfb8e4d 100644
--- a/spec/ruby/library/net-http/httpresponse/header_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/header_spec.rb
@@ -4,6 +4,6 @@
 describe "Net::HTTPResponse#header" do
   it "returns self" do
     res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    res.response.should equal(res)
+    res.response.should.equal?(res)
   end
 end
diff --git a/spec/ruby/library/net-http/httpresponse/read_body_spec.rb b/spec/ruby/library/net-http/httpresponse/read_body_spec.rb
index 4530a26bfc2..d8b24186240 100644
--- a/spec/ruby/library/net-http/httpresponse/read_body_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/read_body_spec.rb
@@ -17,7 +17,7 @@
 
     it "returns the previously read body if called a second time" do
       @res.reading_body(@socket, true) do
-        @res.read_body.should equal(@res.read_body)
+        @res.read_body.should.equal?(@res.read_body)
       end
     end
   end
@@ -34,14 +34,14 @@
     it "returns the passed buffer" do
       @res.reading_body(@socket, true) do
         buffer = +""
-        @res.read_body(buffer).should equal(buffer)
+        @res.read_body(buffer).should.equal?(buffer)
       end
     end
 
     it "raises an IOError if called a second time" do
       @res.reading_body(@socket, true) do
         @res.read_body(+"")
-        -> { @res.read_body(+"") }.should raise_error(IOError)
+        -> { @res.read_body(+"") }.should.raise(IOError)
       end
     end
   end
@@ -57,21 +57,21 @@
           buffer << body
         end
 
-        yielded.should be_true
+        yielded.should == true
         buffer.should == "test body"
       end
     end
 
     it "returns the ReadAdapter" do
       @res.reading_body(@socket, true) do
-        @res.read_body { nil }.should be_kind_of(Net::ReadAdapter)
+        @res.read_body { nil }.should.is_a?(Net::ReadAdapter)
       end
     end
 
     it "raises an IOError if called a second time" do
       @res.reading_body(@socket, true) do
         @res.read_body {}
-        -> { @res.read_body {} }.should raise_error(IOError)
+        -> { @res.read_body {} }.should.raise(IOError)
       end
     end
   end
@@ -79,7 +79,7 @@
   describe "when passed buffer and block" do
     it "raises an ArgumentError" do
       @res.reading_body(@socket, true) do
-        -> { @res.read_body(+"") {} }.should raise_error(ArgumentError)
+        -> { @res.read_body(+"") {} }.should.raise(ArgumentError)
       end
     end
   end
diff --git a/spec/ruby/library/net-http/httpresponse/read_header_spec.rb b/spec/ruby/library/net-http/httpresponse/read_header_spec.rb
index 3ea4ee834b4..70ce9885023 100644
--- a/spec/ruby/library/net-http/httpresponse/read_header_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/read_header_spec.rb
@@ -4,6 +4,6 @@
 describe "Net::HTTPResponse#read_header" do
   it "returns self" do
     res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    res.response.should equal(res)
+    res.response.should.equal?(res)
   end
 end
diff --git a/spec/ruby/library/net-http/httpresponse/read_new_spec.rb b/spec/ruby/library/net-http/httpresponse/read_new_spec.rb
index 82f7a47ce8d..3795e29d83d 100644
--- a/spec/ruby/library/net-http/httpresponse/read_new_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/read_new_spec.rb
@@ -12,7 +12,7 @@
 EOS
     response = Net::HTTPResponse.read_new(socket)
 
-    response.should be_kind_of(Net::HTTPOK)
+    response.should.is_a?(Net::HTTPOK)
     response.code.should == "200"
     response["Content-Type"].should == "text/html; charset=utf-8"
 
diff --git a/spec/ruby/library/net-http/httpresponse/reading_body_spec.rb b/spec/ruby/library/net-http/httpresponse/reading_body_spec.rb
index 637a2806f89..a3671d6eb54 100644
--- a/spec/ruby/library/net-http/httpresponse/reading_body_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/reading_body_spec.rb
@@ -22,7 +22,7 @@
         yielded = true
       end
 
-      yielded.should be_true
+      yielded.should == true
     end
 
     describe "but the response type is not allowed to have a body" do
@@ -31,28 +31,28 @@
       end
 
       it "returns nil" do
-        @res.reading_body(@socket, false) {}.should be_nil
-        @res.body.should be_nil
+        @res.reading_body(@socket, false) {}.should == nil
+        @res.body.should == nil
       end
 
       it "yields the passed block" do
         yielded = false
         @res.reading_body(@socket, true) { yielded = true }
-        yielded.should be_true
+        yielded.should == true
       end
     end
   end
 
   describe "when body_allowed is false" do
     it "returns nil" do
-      @res.reading_body(@socket, false) {}.should be_nil
-      @res.body.should be_nil
+      @res.reading_body(@socket, false) {}.should == nil
+      @res.body.should == nil
     end
 
     it "yields the passed block" do
       yielded = false
       @res.reading_body(@socket, true) { yielded = true }
-      yielded.should be_true
+      yielded.should == true
     end
   end
 end
diff --git a/spec/ruby/library/net-http/httpresponse/response_spec.rb b/spec/ruby/library/net-http/httpresponse/response_spec.rb
index caa0ca2d190..440c33c168b 100644
--- a/spec/ruby/library/net-http/httpresponse/response_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/response_spec.rb
@@ -4,6 +4,6 @@
 describe "Net::HTTPResponse#response" do
   it "returns self" do
     res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    res.response.should equal(res)
+    res.response.should.equal?(res)
   end
 end
diff --git a/spec/ruby/library/net-http/httpresponse/shared/body.rb b/spec/ruby/library/net-http/httpresponse/shared/body.rb
index 618e3936fb5..368774fb528 100644
--- a/spec/ruby/library/net-http/httpresponse/shared/body.rb
+++ b/spec/ruby/library/net-http/httpresponse/shared/body.rb
@@ -14,7 +14,7 @@
 
   it "returns the previously read body if called a second time" do
     @res.reading_body(@socket, true) do
-      @res.send(@method).should equal(@res.send(@method))
+      @res.send(@method).should.equal?(@res.send(@method))
     end
   end
 end
diff --git a/spec/ruby/library/net-http/httpresponse/value_spec.rb b/spec/ruby/library/net-http/httpresponse/value_spec.rb
index 2df8beaa10d..e32d37500ab 100644
--- a/spec/ruby/library/net-http/httpresponse/value_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/value_spec.rb
@@ -4,21 +4,21 @@
 describe "Net::HTTPResponse#value" do
   it "raises an HTTP error for non 2xx HTTP Responses" do
     res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    -> { res.value }.should raise_error(Net::HTTPError)
+    -> { res.value }.should.raise(Net::HTTPError)
 
     res = Net::HTTPInformation.new("1.0", "1xx", "test response")
-    -> { res.value }.should raise_error(Net::HTTPError)
+    -> { res.value }.should.raise(Net::HTTPError)
 
     res = Net::HTTPSuccess.new("1.0", "2xx", "test response")
-    -> { res.value }.should_not raise_error(Net::HTTPError)
+    -> { res.value }.should_not.raise(Net::HTTPError)
 
     res = Net::HTTPRedirection.new("1.0", "3xx", "test response")
-    -> { res.value }.should raise_error(Net::HTTPRetriableError)
+    -> { res.value }.should.raise(Net::HTTPRetriableError)
 
     res = Net::HTTPClientError.new("1.0", "4xx", "test response")
-    -> { res.value }.should raise_error(Net::HTTPClientException)
+    -> { res.value }.should.raise(Net::HTTPClientException)
 
     res = Net::HTTPServerError.new("1.0", "5xx", "test response")
-    -> { res.value }.should raise_error(Net::HTTPFatalError)
+    -> { res.value }.should.raise(Net::HTTPFatalError)
   end
 end
diff --git a/spec/ruby/library/objectspace/dump_all_spec.rb b/spec/ruby/library/objectspace/dump_all_spec.rb
index e9b449a9051..c92812ebd5a 100644
--- a/spec/ruby/library/objectspace/dump_all_spec.rb
+++ b/spec/ruby/library/objectspace/dump_all_spec.rb
@@ -82,7 +82,7 @@
       ObjectSpace.dump_all(output: :stdout)
     RUBY
 
-    stdout.should include('"value":"abc"')
+    stdout.should.include?('"value":"abc"')
   end
 
   it "dumps Ruby heap to provided IO when passed output: IO" do
@@ -107,6 +107,6 @@
   end
 
   it "raises ArgumentError when passed not supported :output value" do
-    -> { ObjectSpace.dump_all(output: Object.new) }.should raise_error(ArgumentError, /wrong output option/)
+    -> { ObjectSpace.dump_all(output: Object.new) }.should.raise(ArgumentError, /wrong output option/)
   end
 end
diff --git a/spec/ruby/library/objectspace/dump_spec.rb b/spec/ruby/library/objectspace/dump_spec.rb
index e22ee3df1ed..4b5e0da1984 100644
--- a/spec/ruby/library/objectspace/dump_spec.rb
+++ b/spec/ruby/library/objectspace/dump_spec.rb
@@ -13,23 +13,23 @@
 
   it "dumps to string when passed output: :string" do
     string = ObjectSpace.dump("abc", output: :string)
-    string.should be_kind_of(String)
-    string.should include('"value":"abc"')
+    string.should.is_a?(String)
+    string.should.include?('"value":"abc"')
   end
 
   it "dumps to string when :output not specified" do
     string = ObjectSpace.dump("abc")
-    string.should be_kind_of(String)
-    string.should include('"value":"abc"')
+    string.should.is_a?(String)
+    string.should.include?('"value":"abc"')
   end
 
   it "dumps to a temporary file when passed output: :file" do
     file = ObjectSpace.dump("abc", output: :file)
-    file.should be_kind_of(File)
+    file.should.is_a?(File)
 
     file.rewind
     content = file.read
-    content.should include('"value":"abc"')
+    content.should.include?('"value":"abc"')
   ensure
     file.close
     File.unlink file.path
@@ -37,10 +37,10 @@
 
   it "dumps to a temporary file when passed output: :nil" do
     file = ObjectSpace.dump("abc", output: nil)
-    file.should be_kind_of(File)
+    file.should.is_a?(File)
 
     file.rewind
-    file.read.should include('"value":"abc"')
+    file.read.should.include?('"value":"abc"')
   ensure
     file.close
     File.unlink file.path
@@ -48,7 +48,7 @@
 
   it "dumps to stdout when passed output: :stdout" do
     stdout = ruby_exe('ObjectSpace.dump("abc", output: :stdout)', options: "-robjspace").chomp
-    stdout.should include('"value":"abc"')
+    stdout.should.include?('"value":"abc"')
   end
 
   it "dumps to provided IO when passed output: IO" do
@@ -58,13 +58,13 @@
     result.should.equal? io
 
     io.rewind
-    io.read.should include('"value":"abc"')
+    io.read.should.include?('"value":"abc"')
   ensure
     io.close
     rm_r filename
   end
 
   it "raises ArgumentError when passed not supported :output value" do
-    -> { ObjectSpace.dump("abc", output: Object.new) }.should raise_error(ArgumentError, /wrong output option/)
+    -> { ObjectSpace.dump("abc", output: Object.new) }.should.raise(ArgumentError, /wrong output option/)
   end
 end
diff --git a/spec/ruby/library/objectspace/memsize_of_all_spec.rb b/spec/ruby/library/objectspace/memsize_of_all_spec.rb
index c5a48165ce3..9fc6e8be9dc 100644
--- a/spec/ruby/library/objectspace/memsize_of_all_spec.rb
+++ b/spec/ruby/library/objectspace/memsize_of_all_spec.rb
@@ -3,12 +3,12 @@
 
 describe "ObjectSpace.memsize_of_all" do
   it "returns a non-zero Integer for all objects" do
-    ObjectSpace.memsize_of_all.should be_kind_of(Integer)
+    ObjectSpace.memsize_of_all.should.is_a?(Integer)
     ObjectSpace.memsize_of_all.should > 0
   end
 
   it "returns a non-zero Integer for Class" do
-    ObjectSpace.memsize_of_all(Class).should be_kind_of(Integer)
+    ObjectSpace.memsize_of_all(Class).should.is_a?(Integer)
     ObjectSpace.memsize_of_all(Class).should > 0
   end
 
diff --git a/spec/ruby/library/objectspace/memsize_of_spec.rb b/spec/ruby/library/objectspace/memsize_of_spec.rb
index cbb5a07d54f..9c8aea4e84e 100644
--- a/spec/ruby/library/objectspace/memsize_of_spec.rb
+++ b/spec/ruby/library/objectspace/memsize_of_spec.rb
@@ -18,7 +18,7 @@
 
   it "returns a positive Integer for an Object" do
     obj = Object.new
-    ObjectSpace.memsize_of(obj).should be_kind_of(Integer)
+    ObjectSpace.memsize_of(obj).should.is_a?(Integer)
     ObjectSpace.memsize_of(obj).should > 0
   end
 
diff --git a/spec/ruby/library/objectspace/reachable_objects_from_spec.rb b/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
index dee59616633..4620bdec312 100644
--- a/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
+++ b/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it "enumerates objects directly reachable from a given object" do
-    ObjectSpace.reachable_objects_from(['a', 'b', 'c']).should include(Array, 'a', 'b', 'c')
+    ObjectSpace.reachable_objects_from(['a', 'b', 'c']).to_set.should >= Set[Array, 'a', 'b', 'c']
     ObjectSpace.reachable_objects_from(Object.new).should == [Object]
   end
 
@@ -24,7 +24,7 @@
     obj = Object.new
     ary = [obj]
     reachable = ObjectSpace.reachable_objects_from(ary)
-    reachable.should include(obj)
+    reachable.should.include?(obj)
   end
 
   it "finds an object stored in a copy-on-write Array" do
@@ -33,8 +33,8 @@
     ary = [removed, obj]
     ary.shift
     reachable = ObjectSpace.reachable_objects_from(ary)
-    reachable.should include(obj)
-    reachable.should_not include(removed)
+    reachable.should.include?(obj)
+    reachable.should_not.include?(removed)
   end
 
   it "finds an object stored in a Queue" do
@@ -44,7 +44,7 @@
 
     reachable = ObjectSpace.reachable_objects_from(q)
     reachable = reachable + reachable.flat_map { |r| ObjectSpace.reachable_objects_from(r) }
-    reachable.should include(o)
+    reachable.should.include?(o)
   end
 
   it "finds an object stored in a SizedQueue" do
@@ -54,6 +54,6 @@
 
     reachable = ObjectSpace.reachable_objects_from(q)
     reachable = reachable + reachable.flat_map { |r| ObjectSpace.reachable_objects_from(r) }
-    reachable.should include(o)
+    reachable.should.include?(o)
   end
 end
diff --git a/spec/ruby/library/objectspace/trace_object_allocations_spec.rb b/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
index 0f1e2aa8b93..0bb6efbfa5f 100644
--- a/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
+++ b/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
@@ -74,7 +74,7 @@ def obj_class_path
       o = Object.new
       ObjectSpace.allocation_class_path(o).should == obj_class_path
       ObjectSpace.trace_object_allocations_clear
-      ObjectSpace.allocation_class_path(o).should be_nil
+      ObjectSpace.allocation_class_path(o).should == nil
     end
   end
 
diff --git a/spec/ruby/library/observer/notify_observers_spec.rb b/spec/ruby/library/observer/notify_observers_spec.rb
index 31f82e9266d..6f3f9846377 100644
--- a/spec/ruby/library/observer/notify_observers_spec.rb
+++ b/spec/ruby/library/observer/notify_observers_spec.rb
@@ -18,7 +18,7 @@
   it "verifies observer responds to update" do
     -> {
       @observable.add_observer(@observable)
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   it "receives the callback" do
diff --git a/spec/ruby/library/open3/popen3_spec.rb b/spec/ruby/library/open3/popen3_spec.rb
index d3103ad3cb9..3651bd516ce 100644
--- a/spec/ruby/library/open3/popen3_spec.rb
+++ b/spec/ruby/library/open3/popen3_spec.rb
@@ -5,10 +5,10 @@
   it "returns in, out, err and a thread waiting the process" do
     stdin, out, err, waiter = Open3.popen3(ruby_cmd("print :foo"))
     begin
-      stdin.should be_kind_of IO
-      out.should be_kind_of IO
-      err.should be_kind_of IO
-      waiter.should be_kind_of Thread
+      stdin.should.is_a? IO
+      out.should.is_a? IO
+      err.should.is_a? IO
+      waiter.should.is_a? Thread
 
       out.read.should == "foo"
     ensure
diff --git a/spec/ruby/library/openssl/cipher_spec.rb b/spec/ruby/library/openssl/cipher_spec.rb
index f66f25f9c61..91da1c592cf 100644
--- a/spec/ruby/library/openssl/cipher_spec.rb
+++ b/spec/ruby/library/openssl/cipher_spec.rb
@@ -4,6 +4,6 @@
 
 describe "OpenSSL::Cipher's CipherError" do
   it "exists under OpenSSL::Cipher namespace" do
-    OpenSSL::Cipher.should have_constant :CipherError
+    OpenSSL::Cipher.should.const_defined?(:CipherError, false)
   end
 end
diff --git a/spec/ruby/library/openssl/digest/initialize_spec.rb b/spec/ruby/library/openssl/digest/initialize_spec.rb
index b5911716ca8..e24ab51d145 100644
--- a/spec/ruby/library/openssl/digest/initialize_spec.rb
+++ b/spec/ruby/library/openssl/digest/initialize_spec.rb
@@ -25,12 +25,12 @@
 
     version_is OpenSSL::VERSION, "4.0.0" do
       it "throws an error when called with an unknown digest" do
-        -> { OpenSSL::Digest.new("wd40") }.should raise_error(OpenSSL::Digest::DigestError, /wd40/)
+        -> { OpenSSL::Digest.new("wd40") }.should.raise(OpenSSL::Digest::DigestError, /wd40/)
       end
     end
 
     it "cannot be called with a symbol" do
-      -> { OpenSSL::Digest.new(:SHA1) }.should raise_error(TypeError)
+      -> { OpenSSL::Digest.new(:SHA1) }.should.raise(TypeError)
     end
   end
 
@@ -58,7 +58,7 @@
   end
 
   it "cannot be called with a digest class" do
-    -> { OpenSSL::Digest.new(OpenSSL::Digest::SHA1) }.should raise_error(TypeError)
+    -> { OpenSSL::Digest.new(OpenSSL::Digest::SHA1) }.should.raise(TypeError)
   end
 
   context "when called without an initial String argument" do
diff --git a/spec/ruby/library/openssl/digest/shared/update.rb b/spec/ruby/library/openssl/digest/shared/update.rb
index e5ff9dcb16f..37277c945dc 100644
--- a/spec/ruby/library/openssl/digest/shared/update.rb
+++ b/spec/ruby/library/openssl/digest/shared/update.rb
@@ -96,28 +96,28 @@
       digest = OpenSSL::Digest.new('sha1')
       -> {
         digest.send(@method, Object.new)
-      }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+      }.should.raise(TypeError, 'no implicit conversion of Object into String')
     end
 
     it "raises a TypeError with SHA256" do
       digest = OpenSSL::Digest.new('sha256')
       -> {
         digest.send(@method, Object.new)
-      }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+      }.should.raise(TypeError, 'no implicit conversion of Object into String')
     end
 
     it "raises a TypeError with SHA384" do
       digest = OpenSSL::Digest.new('sha384')
       -> {
         digest.send(@method, Object.new)
-      }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+      }.should.raise(TypeError, 'no implicit conversion of Object into String')
     end
 
     it "raises a TypeError with SHA512" do
       digest = OpenSSL::Digest.new('sha512')
       -> {
         digest.send(@method, Object.new)
-      }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+      }.should.raise(TypeError, 'no implicit conversion of Object into String')
     end
   end
 end
diff --git a/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb b/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb
index 5a2ca168b53..cc638e1f0de 100644
--- a/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb
+++ b/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb
@@ -5,13 +5,13 @@
   it "returns true for two strings with the same content" do
     input1 = "the quick brown fox jumps over the lazy dog"
     input2 = "the quick brown fox jumps over the lazy dog"
-    OpenSSL.fixed_length_secure_compare(input1, input2).should be_true
+    OpenSSL.fixed_length_secure_compare(input1, input2).should == true
   end
 
   it "returns false for two strings of equal size with different content" do
     input1 = "the quick brown fox jumps over the lazy dog"
     input2 = "the lazy dog jumps over the quick brown fox"
-    OpenSSL.fixed_length_secure_compare(input1, input2).should be_false
+    OpenSSL.fixed_length_secure_compare(input1, input2).should == false
   end
 
   it "converts both arguments to strings using #to_str" do
@@ -19,17 +19,17 @@
     input1.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
     input2 = mock("input2")
     input2.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
-    OpenSSL.fixed_length_secure_compare(input1, input2).should be_true
+    OpenSSL.fixed_length_secure_compare(input1, input2).should == true
   end
 
   it "does not accept arguments that are not string and cannot be coerced into strings" do
     -> {
       OpenSSL.fixed_length_secure_compare("input1", :input2)
-    }.should raise_error(TypeError, 'no implicit conversion of Symbol into String')
+    }.should.raise(TypeError, 'no implicit conversion of Symbol into String')
 
     -> {
       OpenSSL.fixed_length_secure_compare(Object.new, "input2")
-    }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+    }.should.raise(TypeError, 'no implicit conversion of Object into String')
   end
 
   it "raises an ArgumentError for two strings of different size" do
@@ -37,6 +37,6 @@
     input2 = "the quick brown fox"
     -> {
       OpenSSL.fixed_length_secure_compare(input1, input2)
-    }.should raise_error(ArgumentError, 'inputs must be of equal length')
+    }.should.raise(ArgumentError, 'inputs must be of equal length')
   end
 end
diff --git a/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb b/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
index 1112972060e..2558dbb9ec9 100644
--- a/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
+++ b/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
@@ -83,80 +83,80 @@
   it "raises a TypeError when password is not a String and does not respond to #to_str" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac(Object.new, **@defaults)
-    }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "raises a TypeError when salt is not a String and does not respond to #to_str" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, salt: Object.new)
-    }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "raises a TypeError when iterations is not an Integer and does not respond to #to_int" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: Object.new)
-    }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+    }.should.raise(TypeError, "no implicit conversion of Object into Integer")
   end
 
   it "raises a TypeError when length is not an Integer and does not respond to #to_int" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, length: Object.new)
-    }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+    }.should.raise(TypeError, "no implicit conversion of Object into Integer")
   end
 
   it "raises a TypeError when hash is neither a String nor an OpenSSL::Digest" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: Object.new)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   version_is OpenSSL::VERSION, "4.0.0" do
     it "raises a OpenSSL::Digest::DigestError for unknown digest algorithms" do
       -> {
         OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: "wd40")
-      }.should raise_error(OpenSSL::Digest::DigestError, /wd40/)
+      }.should.raise(OpenSSL::Digest::DigestError, /wd40/)
     end
   end
 
   it "treats salt as a required keyword" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults.except(:salt))
-    }.should raise_error(ArgumentError, 'missing keyword: :salt')
+    }.should.raise(ArgumentError, 'missing keyword: :salt')
   end
 
   it "treats iterations as a required keyword" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults.except(:iterations))
-    }.should raise_error(ArgumentError, 'missing keyword: :iterations')
+    }.should.raise(ArgumentError, 'missing keyword: :iterations')
   end
 
   it "treats length as a required keyword" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults.except(:length))
-    }.should raise_error(ArgumentError, 'missing keyword: :length')
+    }.should.raise(ArgumentError, 'missing keyword: :length')
   end
 
   it "treats hash as a required keyword" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults.except(:hash))
-    }.should raise_error(ArgumentError, 'missing keyword: :hash')
+    }.should.raise(ArgumentError, 'missing keyword: :hash')
   end
 
   it "treats all keywords as required" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret")
-    }.should raise_error(ArgumentError, 'missing keywords: :salt, :iterations, :length, :hash')
+    }.should.raise(ArgumentError, 'missing keywords: :salt, :iterations, :length, :hash')
   end
 
   guard -> { OpenSSL::OPENSSL_VERSION_NUMBER >= 0x30000000 } do
     it "raises an OpenSSL::KDF::KDFError for 0 or less iterations" do
       -> {
         OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: 0)
-      }.should raise_error(OpenSSL::KDF::KDFError, "PKCS5_PBKDF2_HMAC: invalid iteration count")
+      }.should.raise(OpenSSL::KDF::KDFError, "PKCS5_PBKDF2_HMAC: invalid iteration count")
 
       -> {
         OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: -1)
-      }.should raise_error(OpenSSL::KDF::KDFError, /PKCS5_PBKDF2_HMAC/)
+      }.should.raise(OpenSSL::KDF::KDFError, /PKCS5_PBKDF2_HMAC/)
     end
   end
 end
diff --git a/spec/ruby/library/openssl/kdf/scrypt_spec.rb b/spec/ruby/library/openssl/kdf/scrypt_spec.rb
index e01b8bca8a3..c00f91bb5b9 100644
--- a/spec/ruby/library/openssl/kdf/scrypt_spec.rb
+++ b/spec/ruby/library/openssl/kdf/scrypt_spec.rb
@@ -89,79 +89,79 @@
     it "raises a TypeError when password is not a String and does not respond to #to_str" do
       -> {
         OpenSSL::KDF.scrypt(Object.new, **@defaults)
-      }.should raise_error(TypeError, "no implicit conversion of Object into String")
+      }.should.raise(TypeError, "no implicit conversion of Object into String")
     end
 
     it "raises a TypeError when salt is not a String and does not respond to #to_str" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, salt: Object.new)
-      }.should raise_error(TypeError, "no implicit conversion of Object into String")
+      }.should.raise(TypeError, "no implicit conversion of Object into String")
     end
 
     it "raises a TypeError when N is not an Integer and does not respond to #to_int" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, N: Object.new)
-      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+      }.should.raise(TypeError, "no implicit conversion of Object into Integer")
     end
 
     it "raises a TypeError when r is not an Integer and does not respond to #to_int" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, r: Object.new)
-      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+      }.should.raise(TypeError, "no implicit conversion of Object into Integer")
     end
 
     it "raises a TypeError when p is not an Integer and does not respond to #to_int" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, p: Object.new)
-      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+      }.should.raise(TypeError, "no implicit conversion of Object into Integer")
     end
 
     it "raises a TypeError when length is not an Integer and does not respond to #to_int" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, length: Object.new)
-      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+      }.should.raise(TypeError, "no implicit conversion of Object into Integer")
     end
 
     it "treats salt as a required keyword" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults.except(:salt))
-      }.should raise_error(ArgumentError, 'missing keyword: :salt')
+      }.should.raise(ArgumentError, 'missing keyword: :salt')
     end
 
     it "treats N as a required keyword" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults.except(:N))
-      }.should raise_error(ArgumentError, 'missing keyword: :N')
+      }.should.raise(ArgumentError, 'missing keyword: :N')
     end
 
     it "treats r as a required keyword" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults.except(:r))
-      }.should raise_error(ArgumentError, 'missing keyword: :r')
+      }.should.raise(ArgumentError, 'missing keyword: :r')
     end
 
     it "treats p as a required keyword" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults.except(:p))
-      }.should raise_error(ArgumentError, 'missing keyword: :p')
+      }.should.raise(ArgumentError, 'missing keyword: :p')
     end
 
     it "treats length as a required keyword" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults.except(:length))
-      }.should raise_error(ArgumentError, 'missing keyword: :length')
+      }.should.raise(ArgumentError, 'missing keyword: :length')
     end
 
     it "treats all keywords as required" do
       -> {
         OpenSSL::KDF.scrypt("secret")
-      }.should raise_error(ArgumentError, 'missing keywords: :salt, :N, :r, :p, :length')
+      }.should.raise(ArgumentError, 'missing keywords: :salt, :N, :r, :p, :length')
     end
 
     it "requires N to be a power of 2" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, N: 2**14 - 1)
-      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+      }.should.raise(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
     end
 
     it "requires N to be at least 2" do
@@ -170,41 +170,41 @@
 
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, N: 1)
-      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+      }.should.raise(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
 
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, N: 0)
-      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+      }.should.raise(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
 
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, N: -1)
-      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+      }.should.raise(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
     end
 
     it "requires r to be positive" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, r: 0)
-      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+      }.should.raise(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
 
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, r: -1)
-      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+      }.should.raise(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
     end
 
     it "requires p to be positive" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, p: 0)
-      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+      }.should.raise(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
 
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, p: -1)
-      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+      }.should.raise(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
     end
 
     it "requires length to be not negative" do
       -> {
         OpenSSL::KDF.scrypt("secret", **@defaults, length: -1)
-      }.should raise_error(ArgumentError, "negative string size (or size too big)")
+      }.should.raise(ArgumentError, "negative string size (or size too big)")
     end
   end
 end
diff --git a/spec/ruby/library/openssl/random/shared/random_bytes.rb b/spec/ruby/library/openssl/random/shared/random_bytes.rb
index f97ccd99745..4d1751e57e0 100644
--- a/spec/ruby/library/openssl/random/shared/random_bytes.rb
+++ b/spec/ruby/library/openssl/random/shared/random_bytes.rb
@@ -5,7 +5,7 @@
   it "generates a random binary string of specified length" do
     (1..64).each do |idx|
       bytes = OpenSSL::Random.send(@method, idx)
-      bytes.should be_kind_of(String)
+      bytes.should.is_a?(String)
       bytes.length.should == idx
     end
   end
@@ -24,6 +24,6 @@
   it "raises ArgumentError on negative arguments" do
     -> {
       OpenSSL::Random.send(@method, -1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/openssl/secure_compare_spec.rb b/spec/ruby/library/openssl/secure_compare_spec.rb
index cec48e01e7b..ce2a4a0d433 100644
--- a/spec/ruby/library/openssl/secure_compare_spec.rb
+++ b/spec/ruby/library/openssl/secure_compare_spec.rb
@@ -5,13 +5,13 @@
   it "returns true for two strings with the same content" do
     input1 = "the quick brown fox jumps over the lazy dog"
     input2 = "the quick brown fox jumps over the lazy dog"
-    OpenSSL.secure_compare(input1, input2).should be_true
+    OpenSSL.secure_compare(input1, input2).should == true
   end
 
   it "returns false for two strings with different content" do
     input1 = "the quick brown fox jumps over the lazy dog"
     input2 = "the lazy dog jumps over the quick brown fox"
-    OpenSSL.secure_compare(input1, input2).should be_false
+    OpenSSL.secure_compare(input1, input2).should == false
   end
 
   it "converts both arguments to strings using #to_str, but adds equality check for the original objects" do
@@ -19,20 +19,20 @@
     input1.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
     input2 = mock("input2")
     input2.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
-    OpenSSL.secure_compare(input1, input2).should be_false
+    OpenSSL.secure_compare(input1, input2).should == false
 
     input = mock("input")
     input.should_receive(:to_str).twice.and_return("the quick brown fox jumps over the lazy dog")
-    OpenSSL.secure_compare(input, input).should be_true
+    OpenSSL.secure_compare(input, input).should == true
   end
 
   it "does not accept arguments that are not string and cannot be coerced into strings" do
     -> {
       OpenSSL.secure_compare("input1", :input2)
-    }.should raise_error(TypeError, 'no implicit conversion of Symbol into String')
+    }.should.raise(TypeError, 'no implicit conversion of Symbol into String')
 
     -> {
       OpenSSL.secure_compare(Object.new, "input2")
-    }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+    }.should.raise(TypeError, 'no implicit conversion of Object into String')
   end
 end
diff --git a/spec/ruby/library/openssl/x509/name/parse_spec.rb b/spec/ruby/library/openssl/x509/name/parse_spec.rb
index 6624161d837..84e3d442f64 100644
--- a/spec/ruby/library/openssl/x509/name/parse_spec.rb
+++ b/spec/ruby/library/openssl/x509/name/parse_spec.rb
@@ -37,12 +37,12 @@
   it "raises TypeError if the given string contains no key/value pairs" do
     -> do
       OpenSSL::X509::Name.parse("hello")
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises OpenSSL::X509::NameError if the given string contains invalid keys" do
     -> do
       OpenSSL::X509::Name.parse("hello=goodbye")
-    end.should raise_error(OpenSSL::X509::NameError)
+    end.should.raise(OpenSSL::X509::NameError)
   end
 end
diff --git a/spec/ruby/library/openstruct/delete_field_spec.rb b/spec/ruby/library/openstruct/delete_field_spec.rb
index 9ac80196cc6..12fed6c90df 100644
--- a/spec/ruby/library/openstruct/delete_field_spec.rb
+++ b/spec/ruby/library/openstruct/delete_field_spec.rb
@@ -8,12 +8,12 @@
 
   it "removes the named field from self's method/value table" do
     @os.delete_field(:name)
-    @os[:name].should be_nil
+    @os[:name].should == nil
   end
 
   it "does remove the accessor methods" do
     @os.delete_field(:name)
-    @os.respond_to?(:name).should be_false
-    @os.respond_to?(:name=).should be_false
+    @os.respond_to?(:name).should == false
+    @os.respond_to?(:name=).should == false
   end
 end
diff --git a/spec/ruby/library/openstruct/equal_value_spec.rb b/spec/ruby/library/openstruct/equal_value_spec.rb
index 103ac135886..c72c09ce14a 100644
--- a/spec/ruby/library/openstruct/equal_value_spec.rb
+++ b/spec/ruby/library/openstruct/equal_value_spec.rb
@@ -8,21 +8,21 @@
   end
 
   it "returns false when the passed argument is no OpenStruct" do
-    (@os == Object.new).should be_false
-    (@os == "Test").should be_false
-    (@os == 10).should be_false
-    (@os == :sym).should be_false
+    (@os == Object.new).should == false
+    (@os == "Test").should == false
+    (@os == 10).should == false
+    (@os == :sym).should == false
   end
 
   it "returns true when self and other are equal method/value wise" do
-    (@os == @os).should be_true
-    (@os == OpenStruct.new(name: "John")).should be_true
-    (@os == OpenStructSpecs::OpenStructSub.new(name: "John")).should be_true
+    (@os == @os).should == true
+    (@os == OpenStruct.new(name: "John")).should == true
+    (@os == OpenStructSpecs::OpenStructSub.new(name: "John")).should == true
 
-    (@os == OpenStruct.new(name: "Jonny")).should be_false
-    (@os == OpenStructSpecs::OpenStructSub.new(name: "Jonny")).should be_false
+    (@os == OpenStruct.new(name: "Jonny")).should == false
+    (@os == OpenStructSpecs::OpenStructSub.new(name: "Jonny")).should == false
 
-    (@os == OpenStruct.new(name: "John", age: 20)).should be_false
-    (@os == OpenStructSpecs::OpenStructSub.new(name: "John", age: 20)).should be_false
+    (@os == OpenStruct.new(name: "John", age: 20)).should == false
+    (@os == OpenStructSpecs::OpenStructSub.new(name: "John", age: 20)).should == false
   end
 end
diff --git a/spec/ruby/library/openstruct/frozen_spec.rb b/spec/ruby/library/openstruct/frozen_spec.rb
index c14a4bac55d..c37fd18c8ca 100644
--- a/spec/ruby/library/openstruct/frozen_spec.rb
+++ b/spec/ruby/library/openstruct/frozen_spec.rb
@@ -9,25 +9,25 @@
   # method_missing case handled in method_missing_spec.rb
   #
   it "is still readable" do
-    @os.age.should eql(70)
-    @os.pension.should eql(300)
+    @os.age.should.eql?(70)
+    @os.pension.should.eql?(300)
     @os.name.should == "John Smith"
   end
 
   it "is not writable" do
-    ->{ @os.age = 42 }.should raise_error( RuntimeError )
+    ->{ @os.age = 42 }.should.raise( RuntimeError )
   end
 
   it "cannot create new fields" do
-    ->{ @os.state = :new }.should raise_error( RuntimeError )
+    ->{ @os.state = :new }.should.raise( RuntimeError )
   end
 
   it "creates a frozen clone" do
     f = @os.clone
     f.frozen?.should == true
     f.age.should == 70
-    ->{ f.age = 0 }.should raise_error( RuntimeError )
-    ->{ f.state = :newer }.should raise_error( RuntimeError )
+    ->{ f.age = 0 }.should.raise( RuntimeError )
+    ->{ f.state = :newer }.should.raise( RuntimeError )
   end
 
   it "creates an unfrozen dup" do
diff --git a/spec/ruby/library/openstruct/initialize_spec.rb b/spec/ruby/library/openstruct/initialize_spec.rb
index dee5de48c63..52304cf7809 100644
--- a/spec/ruby/library/openstruct/initialize_spec.rb
+++ b/spec/ruby/library/openstruct/initialize_spec.rb
@@ -3,6 +3,6 @@
 
 describe "OpenStruct#initialize" do
   it "is private" do
-    OpenStruct.should have_private_instance_method(:initialize)
+    OpenStruct.private_instance_methods(false).should.include?(:initialize)
   end
 end
diff --git a/spec/ruby/library/openstruct/marshal_load_spec.rb b/spec/ruby/library/openstruct/marshal_load_spec.rb
index 342e5e68cda..a8cdda3b435 100644
--- a/spec/ruby/library/openstruct/marshal_load_spec.rb
+++ b/spec/ruby/library/openstruct/marshal_load_spec.rb
@@ -6,7 +6,7 @@
     os = OpenStruct.new
     os.send :marshal_load, age: 20, name: "John"
 
-    os.age.should eql(20)
+    os.age.should.eql?(20)
     os.name.should == "John"
   end
 end
diff --git a/spec/ruby/library/openstruct/method_missing_spec.rb b/spec/ruby/library/openstruct/method_missing_spec.rb
index 89f83d07b3c..cf6734d6299 100644
--- a/spec/ruby/library/openstruct/method_missing_spec.rb
+++ b/spec/ruby/library/openstruct/method_missing_spec.rb
@@ -7,18 +7,18 @@
   end
 
   it "raises an ArgumentError when not passed any additional arguments" do
-    -> { @os.send(:test=) }.should raise_error(ArgumentError)
+    -> { @os.send(:test=) }.should.raise(ArgumentError)
   end
 end
 
 describe "OpenStruct#method_missing when passed additional arguments" do
   it "raises a NoMethodError when the key does not exist" do
     os = OpenStruct.new
-    -> { os.test(1, 2, 3) }.should raise_error(NoMethodError)
+    -> { os.test(1, 2, 3) }.should.raise(NoMethodError)
   end
 
   it "raises an ArgumentError when the key exists" do
     os = OpenStruct.new(test: 20)
-    -> { os.test(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { os.test(1, 2, 3) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/openstruct/new_spec.rb b/spec/ruby/library/openstruct/new_spec.rb
index 5d2cacea405..9e53948c82a 100644
--- a/spec/ruby/library/openstruct/new_spec.rb
+++ b/spec/ruby/library/openstruct/new_spec.rb
@@ -7,8 +7,8 @@
   end
 
   it "creates an attribute for each key of the passed Hash" do
-    @os.age.should eql(70)
-    @os.pension.should eql(300)
+    @os.age.should.eql?(70)
+    @os.pension.should.eql?(300)
     @os.name.should == "John Smith"
   end
 end
diff --git a/spec/ruby/library/openstruct/shared/inspect.rb b/spec/ruby/library/openstruct/shared/inspect.rb
index ffcd690e1f8..d5fffa0e2e3 100644
--- a/spec/ruby/library/openstruct/shared/inspect.rb
+++ b/spec/ruby/library/openstruct/shared/inspect.rb
@@ -4,7 +4,7 @@
     os.send(@method).should == "#<OpenStruct name=\"John Smith\">"
 
     os = OpenStruct.new(age: 20, name: "John Smith")
-    os.send(@method).should be_kind_of(String)
+    os.send(@method).should.is_a?(String)
   end
 
   it "correctly handles self-referential OpenStructs" do
diff --git a/spec/ruby/library/openstruct/to_h_spec.rb b/spec/ruby/library/openstruct/to_h_spec.rb
index 6c272bcc713..7d9c7db5dc9 100644
--- a/spec/ruby/library/openstruct/to_h_spec.rb
+++ b/spec/ruby/library/openstruct/to_h_spec.rb
@@ -19,7 +19,7 @@
   end
 
   it "does not return the hash used as initializer" do
-    @to_h.should_not equal(@h)
+    @to_h.should_not.equal?(@h)
   end
 
   it "returns a Hash that is independent from the struct" do
@@ -36,17 +36,17 @@
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         @os.to_h { |k, v| [k.to_s, v*2, 1] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
 
       -> do
         @os.to_h { |k, v| [k] }
-      end.should raise_error(ArgumentError, /element has wrong array length/)
+      end.should.raise(ArgumentError, /element has wrong array length/)
     end
 
     it "raises TypeError if block returns something other than Array" do
       -> do
         @os.to_h { |k, v| "not-array" }
-      end.should raise_error(TypeError, /wrong element type String/)
+      end.should.raise(TypeError, /wrong element type String/)
     end
 
     it "coerces returned pair to Array with #to_ary" do
@@ -62,7 +62,7 @@
 
       -> do
         @os.to_h { |k| x }
-      end.should raise_error(TypeError, /wrong element type MockObject/)
+      end.should.raise(TypeError, /wrong element type MockObject/)
     end
   end
 end
diff --git a/spec/ruby/library/pathname/birthtime_spec.rb b/spec/ruby/library/pathname/birthtime_spec.rb
index 109c1123032..387f0aa54d6 100644
--- a/spec/ruby/library/pathname/birthtime_spec.rb
+++ b/spec/ruby/library/pathname/birthtime_spec.rb
@@ -4,13 +4,13 @@
 describe "Pathname#birthtime" do
   platform_is :windows, :darwin, :freebsd, :netbsd do
     it "returns the birth time for self" do
-      Pathname.new(__FILE__).birthtime.should be_kind_of(Time)
+      Pathname.new(__FILE__).birthtime.should.is_a?(Time)
     end
   end
 
   platform_is :openbsd do
     it "raises an NotImplementedError" do
-      -> { Pathname.new(__FILE__).birthtime }.should raise_error(NotImplementedError)
+      -> { Pathname.new(__FILE__).birthtime }.should.raise(NotImplementedError)
     end
   end
 end
diff --git a/spec/ruby/library/pathname/empty_spec.rb b/spec/ruby/library/pathname/empty_spec.rb
index 4deade5b641..9f0305a0f04 100644
--- a/spec/ruby/library/pathname/empty_spec.rb
+++ b/spec/ruby/library/pathname/empty_spec.rb
@@ -15,18 +15,18 @@
   end
 
   it 'returns true when file is not empty' do
-    Pathname.new(__FILE__).empty?.should be_false
+    Pathname.new(__FILE__).empty?.should == false
   end
 
   it 'returns false when the directory is not empty' do
-    Pathname.new(__dir__).empty?.should be_false
+    Pathname.new(__dir__).empty?.should == false
   end
 
   it 'return true when file is empty' do
-    Pathname.new(@file).empty?.should be_true
+    Pathname.new(@file).empty?.should == true
   end
 
   it 'returns true when directory is empty' do
-    Pathname.new(@dir).empty?.should be_true
+    Pathname.new(@dir).empty?.should == true
   end
 end
diff --git a/spec/ruby/library/pathname/glob_spec.rb b/spec/ruby/library/pathname/glob_spec.rb
index de322bab476..e20e6f8f85e 100644
--- a/spec/ruby/library/pathname/glob_spec.rb
+++ b/spec/ruby/library/pathname/glob_spec.rb
@@ -41,7 +41,7 @@
   it "raises an ArgumentError when supplied a keyword argument other than :base" do
     -> {
       Pathname.glob('*i*.rb', foo: @dir + 'lib')
-    }.should raise_error(ArgumentError, /unknown keyword: :?foo/)
+    }.should.raise(ArgumentError, "unknown keyword: :foo")
   end
 
   it "does not raise an ArgumentError when supplied a flag and :base keyword argument" do
@@ -81,7 +81,7 @@
 
   it 'yields matching file paths to block' do
     ary = []
-    Pathname.new(@dir).glob('lib/*i*.rb') { |p| ary << p }.should be_nil
+    Pathname.new(@dir).glob('lib/*i*.rb') { |p| ary << p }.should == nil
     ary.sort.should == [Pathname.new(@file_1), Pathname.new(@file_2)].sort
   end
 
diff --git a/spec/ruby/library/pathname/inspect_spec.rb b/spec/ruby/library/pathname/inspect_spec.rb
index 304746fbe5c..3abba6cbb5e 100644
--- a/spec/ruby/library/pathname/inspect_spec.rb
+++ b/spec/ruby/library/pathname/inspect_spec.rb
@@ -4,7 +4,7 @@
 describe "Pathname#inspect" do
   it "returns a consistent String" do
     result = Pathname.new('/tmp').inspect
-    result.should be_an_instance_of(String)
+    result.should.instance_of?(String)
     result.should == "#<Pathname:/tmp>"
   end
 end
diff --git a/spec/ruby/library/pathname/new_spec.rb b/spec/ruby/library/pathname/new_spec.rb
index 36226ed515a..3ef9d9b76d4 100644
--- a/spec/ruby/library/pathname/new_spec.rb
+++ b/spec/ruby/library/pathname/new_spec.rb
@@ -3,18 +3,18 @@
 
 describe "Pathname.new" do
   it "returns a new Pathname Object with 1 argument" do
-    Pathname.new('').should be_kind_of(Pathname)
+    Pathname.new('').should.is_a?(Pathname)
   end
 
   it "raises an ArgumentError when called with \0" do
-    -> { Pathname.new("\0")}.should raise_error(ArgumentError)
+    -> { Pathname.new("\0")}.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { Pathname.new(nil)   }.should raise_error(TypeError)
-    -> { Pathname.new(0)     }.should raise_error(TypeError)
-    -> { Pathname.new(true)  }.should raise_error(TypeError)
-    -> { Pathname.new(false) }.should raise_error(TypeError)
+    -> { Pathname.new(nil)   }.should.raise(TypeError)
+    -> { Pathname.new(0)     }.should.raise(TypeError)
+    -> { Pathname.new(true)  }.should.raise(TypeError)
+    -> { Pathname.new(false) }.should.raise(TypeError)
   end
 
   it "initializes with an object with to_path" do
diff --git a/spec/ruby/library/pathname/pathname_spec.rb b/spec/ruby/library/pathname/pathname_spec.rb
index 0fb28814685..6fa6fd2bcba 100644
--- a/spec/ruby/library/pathname/pathname_spec.rb
+++ b/spec/ruby/library/pathname/pathname_spec.rb
@@ -3,11 +3,11 @@
 
 describe "Kernel#Pathname" do
   it "is a private instance method" do
-    Kernel.should have_private_instance_method(:Pathname)
+    Kernel.private_instance_methods(false).should.include?(:Pathname)
   end
 
   it "is also a public method" do
-    Kernel.should have_method(:Pathname)
+    Kernel.should.respond_to?(:Pathname)
   end
 
   it "returns same argument when called with a pathname argument" do
diff --git a/spec/ruby/library/pathname/realdirpath_spec.rb b/spec/ruby/library/pathname/realdirpath_spec.rb
index a9e44e354e2..e50741a737f 100644
--- a/spec/ruby/library/pathname/realdirpath_spec.rb
+++ b/spec/ruby/library/pathname/realdirpath_spec.rb
@@ -4,7 +4,7 @@
 describe "Pathname#realdirpath" do
 
   it "returns a Pathname" do
-    Pathname.pwd.realdirpath.should be_an_instance_of(Pathname)
+    Pathname.pwd.realdirpath.should.instance_of?(Pathname)
   end
 
 end
diff --git a/spec/ruby/library/pathname/realpath_spec.rb b/spec/ruby/library/pathname/realpath_spec.rb
index f2c654308e0..d8b87f57d0f 100644
--- a/spec/ruby/library/pathname/realpath_spec.rb
+++ b/spec/ruby/library/pathname/realpath_spec.rb
@@ -4,7 +4,7 @@
 describe "Pathname#realpath" do
 
   it "returns a Pathname" do
-    Pathname.pwd.realpath.should be_an_instance_of(Pathname)
+    Pathname.pwd.realpath.should.instance_of?(Pathname)
   end
 
 end
diff --git a/spec/ruby/library/pathname/relative_path_from_spec.rb b/spec/ruby/library/pathname/relative_path_from_spec.rb
index 133a149849f..7cbd22c3d68 100644
--- a/spec/ruby/library/pathname/relative_path_from_spec.rb
+++ b/spec/ruby/library/pathname/relative_path_from_spec.rb
@@ -7,11 +7,11 @@ def relative_path_str(dest, base)
   end
 
   it "raises an error when the two paths do not share a common prefix" do
-    -> { relative_path_str('/usr', 'foo') }.should raise_error(ArgumentError)
+    -> { relative_path_str('/usr', 'foo') }.should.raise(ArgumentError)
   end
 
   it "raises an error when the base directory has .." do
-    -> { relative_path_str('a', '..') }.should raise_error(ArgumentError)
+    -> { relative_path_str('a', '..') }.should.raise(ArgumentError)
   end
 
   it "returns a path relative from root" do
diff --git a/spec/ruby/library/prime/each_spec.rb b/spec/ruby/library/prime/each_spec.rb
index b99cf7cf0e0..d81e952a88c 100644
--- a/spec/ruby/library/prime/each_spec.rb
+++ b/spec/ruby/library/prime/each_spec.rb
@@ -32,11 +32,11 @@
       all_prime &&= (2..Math.sqrt(prime)).all? { |d| prime % d != 0 }
     end
 
-    all_prime.should be_true
+    all_prime.should == true
   end
 
   it "returns the last evaluated expression in the passed block" do
-    @object.each { break :value }.should equal(:value)
+    @object.each { break :value }.should.equal?(:value)
   end
 
   describe "when not passed a block" do
@@ -45,23 +45,23 @@
     end
 
     it "returns an object that is Enumerable" do
-      @prime_enum.each.should be_kind_of(Enumerable)
+      @prime_enum.each.should.is_a?(Enumerable)
     end
 
     it "returns an object that responds to #with_index" do
-      @prime_enum.should respond_to(:with_index)
+      @prime_enum.should.respond_to?(:with_index)
     end
 
     it "returns an object that responds to #with_object" do
-      @prime_enum.should respond_to(:with_object)
+      @prime_enum.should.respond_to?(:with_object)
     end
 
     it "returns an object that responds to #next" do
-      @prime_enum.should respond_to(:next)
+      @prime_enum.should.respond_to?(:next)
     end
 
     it "returns an object that responds to #rewind" do
-      @prime_enum.should respond_to(:rewind)
+      @prime_enum.should.respond_to?(:rewind)
     end
 
     it "yields primes starting at 2 independent of prior enumerators" do
@@ -106,13 +106,13 @@
 
     ScratchPad.recorded.all? do |prime|
       (2..Math.sqrt(prime)).all? { |d| prime % d != 0 }
-    end.should be_true
+    end.should == true
 
-    ScratchPad.recorded.all? { |prime| prime <= bound }.should be_true
+    ScratchPad.recorded.all? { |prime| prime <= bound }.should == true
   end
 
   it "returns nil when no prime is generated" do
-    @object.each(1) { :value }.should be_nil
+    @object.each(1) { :value }.should == nil
   end
 
   it "yields primes starting at 2 independent of prior enumeration" do
@@ -132,7 +132,7 @@
   describe "when not passed a block" do
     it "returns an object that returns primes less than or equal to the bound" do
       bound = 100
-      @object.each(bound).all? { |prime| prime <= bound }.should be_true
+      @object.each(bound).all? { |prime| prime <= bound }.should == true
     end
   end
 end
diff --git a/spec/ruby/library/prime/instance_spec.rb b/spec/ruby/library/prime/instance_spec.rb
index 5183f369018..680895eb645 100644
--- a/spec/ruby/library/prime/instance_spec.rb
+++ b/spec/ruby/library/prime/instance_spec.rb
@@ -3,12 +3,12 @@
 
 describe "Prime.instance" do
   it "returns a object representing the set of prime numbers" do
-    Prime.instance.should be_kind_of(Prime)
+    Prime.instance.should.is_a?(Prime)
   end
 
   it "returns a object with no obsolete features" do
-    Prime.instance.should_not respond_to(:succ)
-    Prime.instance.should_not respond_to(:next)
+    Prime.instance.should_not.respond_to?(:succ)
+    Prime.instance.should_not.respond_to?(:next)
   end
 
   it "does not complain anything" do
@@ -16,6 +16,6 @@
   end
 
   it "raises a ArgumentError when is called with some arguments" do
-    -> { Prime.instance(1) }.should raise_error(ArgumentError)
+    -> { Prime.instance(1) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/prime/integer/prime_division_spec.rb b/spec/ruby/library/prime/integer/prime_division_spec.rb
index be03438a6f8..5631b22d0ac 100644
--- a/spec/ruby/library/prime/integer/prime_division_spec.rb
+++ b/spec/ruby/library/prime/integer/prime_division_spec.rb
@@ -14,6 +14,6 @@
     -1.prime_division.should == [[-1, 1]]
   end
   it "raises ZeroDivisionError for 0" do
-    -> { 0.prime_division }.should raise_error(ZeroDivisionError)
+    -> { 0.prime_division }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/library/prime/integer/prime_spec.rb b/spec/ruby/library/prime/integer/prime_spec.rb
index 53de76d5ab3..d24f883b193 100644
--- a/spec/ruby/library/prime/integer/prime_spec.rb
+++ b/spec/ruby/library/prime/integer/prime_spec.rb
@@ -3,15 +3,15 @@
 
 describe "Integer#prime?" do
   it "returns a true value for prime numbers" do
-    2.prime?.should be_true
-    3.prime?.should be_true
-    (2**31-1).prime?.should be_true  # 8th Mersenne prime (M8)
+    2.prime?.should == true
+    3.prime?.should == true
+    (2**31-1).prime?.should == true  # 8th Mersenne prime (M8)
   end
 
   it "returns a false value for composite numbers" do
-    4.prime?.should be_false
-    15.prime?.should be_false
-    (2**32-1).prime?.should be_false
-    ( (2**17-1)*(2**19-1) ).prime?.should be_false  # M6*M7
+    4.prime?.should == false
+    15.prime?.should == false
+    (2**32-1).prime?.should == false
+    ( (2**17-1)*(2**19-1) ).prime?.should == false  # M6*M7
   end
 end
diff --git a/spec/ruby/library/prime/prime_division_spec.rb b/spec/ruby/library/prime/prime_division_spec.rb
index 6293478f592..cc39969a56a 100644
--- a/spec/ruby/library/prime/prime_division_spec.rb
+++ b/spec/ruby/library/prime/prime_division_spec.rb
@@ -16,10 +16,10 @@
   end
 
   it "includes [[-1, 1]] in the divisors of a negative number" do
-    Prime.prime_division(-10).should include([-1, 1])
+    Prime.prime_division(-10).should.include?([-1, 1])
   end
 
   it "raises ZeroDivisionError for 0" do
-    -> { Prime.prime_division(0) }.should raise_error(ZeroDivisionError)
+    -> { Prime.prime_division(0) }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/library/prime/prime_spec.rb b/spec/ruby/library/prime/prime_spec.rb
index 0896c7f0f39..207c763aedf 100644
--- a/spec/ruby/library/prime/prime_spec.rb
+++ b/spec/ruby/library/prime/prime_spec.rb
@@ -3,15 +3,15 @@
 
 describe "Prime#prime?" do
   it "returns a true value for prime numbers" do
-    Prime.prime?(2).should be_true
-    Prime.prime?(3).should be_true
-    Prime.prime?(2**31-1).should be_true  # 8th Mersenne prime (M8)
+    Prime.prime?(2).should == true
+    Prime.prime?(3).should == true
+    Prime.prime?(2**31-1).should == true  # 8th Mersenne prime (M8)
   end
 
   it "returns a false value for composite numbers" do
-    Prime.prime?(4).should be_false
-    Prime.prime?(15).should be_false
-    Prime.prime?(2**32-1).should be_false
-    Prime.prime?( (2**17-1)*(2**19-1) ).should be_false  # M6*M7
+    Prime.prime?(4).should == false
+    Prime.prime?(15).should == false
+    Prime.prime?(2**32-1).should == false
+    Prime.prime?( (2**17-1)*(2**19-1) ).should == false  # M6*M7
   end
 end
diff --git a/spec/ruby/library/random/formatter/alphanumeric_spec.rb b/spec/ruby/library/random/formatter/alphanumeric_spec.rb
index ce45b96dc2b..62a4698d0db 100644
--- a/spec/ruby/library/random/formatter/alphanumeric_spec.rb
+++ b/spec/ruby/library/random/formatter/alphanumeric_spec.rb
@@ -30,7 +30,7 @@
   it "raises an ArgumentError if the size is not numeric" do
     -> {
       @object.alphanumeric("10")
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "does not coerce the size argument with #to_int" do
@@ -38,7 +38,7 @@
     size.should_not_receive(:to_int)
     -> {
       @object.alphanumeric(size)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "accepts a 'chars' argument with the output alphabet" do
diff --git a/spec/ruby/library/rbconfig/rbconfig_spec.rb b/spec/ruby/library/rbconfig/rbconfig_spec.rb
index b9a4588bf0b..4195128a050 100644
--- a/spec/ruby/library/rbconfig/rbconfig_spec.rb
+++ b/spec/ruby/library/rbconfig/rbconfig_spec.rb
@@ -4,8 +4,8 @@
 describe 'RbConfig::CONFIG' do
   it 'values are all strings' do
     RbConfig::CONFIG.each do |k, v|
-      k.should be_kind_of String
-      v.should be_kind_of String
+      k.should.is_a? String
+      v.should.is_a? String
     end
   end
 
@@ -32,7 +32,7 @@
 
     it "['sitelibdir'] is set and is part of $LOAD_PATH" do
       sitelibdir = RbConfig::CONFIG['sitelibdir']
-      sitelibdir.should be_kind_of String
+      sitelibdir.should.is_a? String
       $LOAD_PATH.map{|path| File.realpath(path) rescue path }.should.include? sitelibdir
     end
   end
@@ -80,7 +80,7 @@
       ar = RbConfig::CONFIG.fetch('AR')
       out = `#{ar} --version`
       $?.should.success?
-      out.should_not be_empty
+      out.should_not.empty?
     end
 
     it "['STRIP'] exists and can be executed" do
diff --git a/spec/ruby/library/rbconfig/sizeof/limits_spec.rb b/spec/ruby/library/rbconfig/sizeof/limits_spec.rb
index 776099da27c..08b1185965b 100644
--- a/spec/ruby/library/rbconfig/sizeof/limits_spec.rb
+++ b/spec/ruby/library/rbconfig/sizeof/limits_spec.rb
@@ -3,13 +3,13 @@
 
 describe "RbConfig::LIMITS" do
   it "is a Hash" do
-    RbConfig::LIMITS.should be_kind_of(Hash)
+    RbConfig::LIMITS.should.is_a?(Hash)
   end
 
   it "has string keys and numeric values" do
     RbConfig::LIMITS.each do |key, value|
-      key.should be_kind_of String
-      value.should be_kind_of Numeric
+      key.should.is_a? String
+      value.should.is_a? Numeric
     end
   end
 
diff --git a/spec/ruby/library/rbconfig/sizeof/sizeof_spec.rb b/spec/ruby/library/rbconfig/sizeof/sizeof_spec.rb
index f2582dc4fd9..b74dae51668 100644
--- a/spec/ruby/library/rbconfig/sizeof/sizeof_spec.rb
+++ b/spec/ruby/library/rbconfig/sizeof/sizeof_spec.rb
@@ -3,13 +3,13 @@
 
 describe "RbConfig::SIZEOF" do
   it "is a Hash" do
-    RbConfig::SIZEOF.should be_kind_of(Hash)
+    RbConfig::SIZEOF.should.is_a?(Hash)
   end
 
   it "has string keys and integer values" do
     RbConfig::SIZEOF.each do |key, value|
-      key.should be_kind_of String
-      value.should be_kind_of Integer
+      key.should.is_a? String
+      value.should.is_a? Integer
     end
   end
 
diff --git a/spec/ruby/library/readline/basic_quote_characters_spec.rb b/spec/ruby/library/readline/basic_quote_characters_spec.rb
index 216899d8750..f6467c8be42 100644
--- a/spec/ruby/library/readline/basic_quote_characters_spec.rb
+++ b/spec/ruby/library/readline/basic_quote_characters_spec.rb
@@ -4,7 +4,7 @@
   with_feature :readline do
     describe "Readline.basic_quote_characters" do
       it "returns not nil" do
-        Readline.basic_quote_characters.should_not be_nil
+        Readline.basic_quote_characters.should_not == nil
       end
     end
 
diff --git a/spec/ruby/library/readline/basic_word_break_characters_spec.rb b/spec/ruby/library/readline/basic_word_break_characters_spec.rb
index daa0e1cb760..ef05d6560bc 100644
--- a/spec/ruby/library/readline/basic_word_break_characters_spec.rb
+++ b/spec/ruby/library/readline/basic_word_break_characters_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline.basic_word_break_characters" do
     it "returns not nil" do
-      Readline.basic_word_break_characters.should_not be_nil
+      Readline.basic_word_break_characters.should_not == nil
     end
   end
 
diff --git a/spec/ruby/library/readline/completer_quote_characters_spec.rb b/spec/ruby/library/readline/completer_quote_characters_spec.rb
index 86c58f3cf68..1109ea1f03e 100644
--- a/spec/ruby/library/readline/completer_quote_characters_spec.rb
+++ b/spec/ruby/library/readline/completer_quote_characters_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline.completer_quote_characters" do
     it "returns nil" do
-      Readline.completer_quote_characters.should be_nil
+      Readline.completer_quote_characters.should == nil
     end
   end
 
diff --git a/spec/ruby/library/readline/completer_word_break_characters_spec.rb b/spec/ruby/library/readline/completer_word_break_characters_spec.rb
index c72f1135c4a..91a002b9de5 100644
--- a/spec/ruby/library/readline/completer_word_break_characters_spec.rb
+++ b/spec/ruby/library/readline/completer_word_break_characters_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline.completer_word_break_characters" do
     it "returns nil" do
-      Readline.completer_word_break_characters.should be_nil
+      Readline.completer_word_break_characters.should == nil
     end
   end
 
diff --git a/spec/ruby/library/readline/completion_append_character_spec.rb b/spec/ruby/library/readline/completion_append_character_spec.rb
index 615b523f4e6..2a14d5d30e2 100644
--- a/spec/ruby/library/readline/completion_append_character_spec.rb
+++ b/spec/ruby/library/readline/completion_append_character_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline.completion_append_character" do
     it "returns not nil" do
-      Readline.completion_append_character.should_not be_nil
+      Readline.completion_append_character.should_not == nil
     end
   end
 
diff --git a/spec/ruby/library/readline/completion_case_fold_spec.rb b/spec/ruby/library/readline/completion_case_fold_spec.rb
index 966f5d6c797..b6a4aab101b 100644
--- a/spec/ruby/library/readline/completion_case_fold_spec.rb
+++ b/spec/ruby/library/readline/completion_case_fold_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline.completion_case_fold" do
     it "returns nil" do
-      Readline.completion_case_fold.should be_nil
+      Readline.completion_case_fold.should == nil
     end
   end
 
diff --git a/spec/ruby/library/readline/completion_proc_spec.rb b/spec/ruby/library/readline/completion_proc_spec.rb
index 2d7a353ec52..037fc6de21d 100644
--- a/spec/ruby/library/readline/completion_proc_spec.rb
+++ b/spec/ruby/library/readline/completion_proc_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline.completion_proc" do
     it "returns nil" do
-      Readline.completion_proc.should be_nil
+      Readline.completion_proc.should == nil
     end
   end
 
@@ -16,7 +16,7 @@
     end
 
     it "returns an ArgumentError if not given an Proc or #call" do
-      -> { Readline.completion_proc = "test" }.should raise_error(ArgumentError)
+      -> { Readline.completion_proc = "test" }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/library/readline/constants_spec.rb b/spec/ruby/library/readline/constants_spec.rb
index 8fee2748665..91536ce1cc4 100644
--- a/spec/ruby/library/readline/constants_spec.rb
+++ b/spec/ruby/library/readline/constants_spec.rb
@@ -11,8 +11,8 @@
   describe "Readline::VERSION" do
     it "is defined and is a non-empty String" do
       Readline.const_defined?(:VERSION).should == true
-      Readline::VERSION.should be_kind_of(String)
-      Readline::VERSION.should_not be_empty
+      Readline::VERSION.should.is_a?(String)
+      Readline::VERSION.should_not.empty?
     end
   end
 end
diff --git a/spec/ruby/library/readline/emacs_editing_mode_spec.rb b/spec/ruby/library/readline/emacs_editing_mode_spec.rb
index f7e8eda9828..93ded3d023d 100644
--- a/spec/ruby/library/readline/emacs_editing_mode_spec.rb
+++ b/spec/ruby/library/readline/emacs_editing_mode_spec.rb
@@ -4,7 +4,7 @@
   with_feature :readline do
     describe "Readline.emacs_editing_mode" do
       it "returns nil" do
-        Readline.emacs_editing_mode.should be_nil
+        Readline.emacs_editing_mode.should == nil
       end
     end
   end
diff --git a/spec/ruby/library/readline/filename_quote_characters_spec.rb b/spec/ruby/library/readline/filename_quote_characters_spec.rb
index de8ce700a8f..6bcb04fc790 100644
--- a/spec/ruby/library/readline/filename_quote_characters_spec.rb
+++ b/spec/ruby/library/readline/filename_quote_characters_spec.rb
@@ -4,7 +4,7 @@
   with_feature :readline do
     describe "Readline.filename_quote_characters" do
       it "returns nil" do
-        Readline.filename_quote_characters.should be_nil
+        Readline.filename_quote_characters.should == nil
       end
     end
 
diff --git a/spec/ruby/library/readline/history/append_spec.rb b/spec/ruby/library/readline/history/append_spec.rb
index 53832713745..be0e515b84d 100644
--- a/spec/ruby/library/readline/history/append_spec.rb
+++ b/spec/ruby/library/readline/history/append_spec.rb
@@ -22,7 +22,7 @@
     end
 
     it "raises a TypeError when the passed Object can't be converted to a String" do
-      -> { Readline::HISTORY << mock("Object") }.should raise_error(TypeError)
+      -> { Readline::HISTORY << mock("Object") }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/readline/history/delete_at_spec.rb b/spec/ruby/library/readline/history/delete_at_spec.rb
index 3bd577e75c8..4383ff7e83e 100644
--- a/spec/ruby/library/readline/history/delete_at_spec.rb
+++ b/spec/ruby/library/readline/history/delete_at_spec.rb
@@ -31,8 +31,8 @@
     end
 
     it "raises an IndexError when the given index is greater than the history size" do
-      -> { Readline::HISTORY.delete_at(10) }.should raise_error(IndexError)
-      -> { Readline::HISTORY.delete_at(-10) }.should raise_error(IndexError)
+      -> { Readline::HISTORY.delete_at(10) }.should.raise(IndexError)
+      -> { Readline::HISTORY.delete_at(-10) }.should.raise(IndexError)
     end
   end
 end
diff --git a/spec/ruby/library/readline/history/element_reference_spec.rb b/spec/ruby/library/readline/history/element_reference_spec.rb
index 0a74f3d62d7..1f1642626f0 100644
--- a/spec/ruby/library/readline/history/element_reference_spec.rb
+++ b/spec/ruby/library/readline/history/element_reference_spec.rb
@@ -23,13 +23,13 @@
     end
 
     it "raises an IndexError when there is no item at the passed index" do
-      -> { Readline::HISTORY[-10] }.should raise_error(IndexError)
-      -> { Readline::HISTORY[-9] }.should raise_error(IndexError)
-      -> { Readline::HISTORY[-8] }.should raise_error(IndexError)
+      -> { Readline::HISTORY[-10] }.should.raise(IndexError)
+      -> { Readline::HISTORY[-9] }.should.raise(IndexError)
+      -> { Readline::HISTORY[-8] }.should.raise(IndexError)
 
-      -> { Readline::HISTORY[8] }.should raise_error(IndexError)
-      -> { Readline::HISTORY[9] }.should raise_error(IndexError)
-      -> { Readline::HISTORY[10] }.should raise_error(IndexError)
+      -> { Readline::HISTORY[8] }.should.raise(IndexError)
+      -> { Readline::HISTORY[9] }.should.raise(IndexError)
+      -> { Readline::HISTORY[10] }.should.raise(IndexError)
     end
   end
 end
diff --git a/spec/ruby/library/readline/history/element_set_spec.rb b/spec/ruby/library/readline/history/element_set_spec.rb
index 776adaacd1e..0787b6343d6 100644
--- a/spec/ruby/library/readline/history/element_set_spec.rb
+++ b/spec/ruby/library/readline/history/element_set_spec.rb
@@ -17,7 +17,7 @@
     end
 
     it "raises an IndexError when there is no item at the passed positive index" do
-      -> { Readline::HISTORY[10] = "test" }.should raise_error(IndexError)
+      -> { Readline::HISTORY[10] = "test" }.should.raise(IndexError)
     end
 
     it "sets the item at the given index" do
@@ -29,7 +29,7 @@
     end
 
     it "raises an IndexError when there is no item at the passed negative index" do
-      -> { Readline::HISTORY[10] = "test" }.should raise_error(IndexError)
+      -> { Readline::HISTORY[10] = "test" }.should.raise(IndexError)
     end
   end
 end
diff --git a/spec/ruby/library/readline/history/empty_spec.rb b/spec/ruby/library/readline/history/empty_spec.rb
index 31d01d96018..5b722dccd34 100644
--- a/spec/ruby/library/readline/history/empty_spec.rb
+++ b/spec/ruby/library/readline/history/empty_spec.rb
@@ -3,11 +3,11 @@
 with_feature :readline do
   describe "Readline::HISTORY.empty?" do
     it "returns true when the history is empty" do
-      Readline::HISTORY.should be_empty
+      Readline::HISTORY.should.empty?
       Readline::HISTORY.push("test")
-      Readline::HISTORY.should_not be_empty
+      Readline::HISTORY.should_not.empty?
       Readline::HISTORY.pop
-      Readline::HISTORY.should be_empty
+      Readline::HISTORY.should.empty?
     end
   end
 end
diff --git a/spec/ruby/library/readline/history/history_spec.rb b/spec/ruby/library/readline/history/history_spec.rb
index 927dd52ebfa..3233071033f 100644
--- a/spec/ruby/library/readline/history/history_spec.rb
+++ b/spec/ruby/library/readline/history/history_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline::HISTORY" do
     it "is extended with the Enumerable module" do
-      Readline::HISTORY.should be_kind_of(Enumerable)
+      Readline::HISTORY.should.is_a?(Enumerable)
     end
   end
 end
diff --git a/spec/ruby/library/readline/history/pop_spec.rb b/spec/ruby/library/readline/history/pop_spec.rb
index 156a8a06f85..0b780a38ccf 100644
--- a/spec/ruby/library/readline/history/pop_spec.rb
+++ b/spec/ruby/library/readline/history/pop_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline::HISTORY.pop" do
     it "returns nil when the history is empty" do
-      Readline::HISTORY.pop.should be_nil
+      Readline::HISTORY.pop.should == nil
     end
 
     it "returns and removes the last item from the history" do
diff --git a/spec/ruby/library/readline/history/push_spec.rb b/spec/ruby/library/readline/history/push_spec.rb
index 53505ccba67..4bbf1763a14 100644
--- a/spec/ruby/library/readline/history/push_spec.rb
+++ b/spec/ruby/library/readline/history/push_spec.rb
@@ -20,7 +20,7 @@
     end
 
     it "raises a TypeError when the passed Object can't be converted to a String" do
-      -> { Readline::HISTORY.push(mock("Object")) }.should raise_error(TypeError)
+      -> { Readline::HISTORY.push(mock("Object")) }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/readline/history/shift_spec.rb b/spec/ruby/library/readline/history/shift_spec.rb
index 9aad7d53993..d852480a2a3 100644
--- a/spec/ruby/library/readline/history/shift_spec.rb
+++ b/spec/ruby/library/readline/history/shift_spec.rb
@@ -3,7 +3,7 @@
 with_feature :readline do
   describe "Readline::HISTORY.shift" do
     it "returns nil when the history is empty" do
-      Readline::HISTORY.shift.should be_nil
+      Readline::HISTORY.shift.should == nil
     end
 
     it "returns and removes the first item from the history" do
diff --git a/spec/ruby/library/readline/vi_editing_mode_spec.rb b/spec/ruby/library/readline/vi_editing_mode_spec.rb
index 6622962cebb..3ce4f5a7e6f 100644
--- a/spec/ruby/library/readline/vi_editing_mode_spec.rb
+++ b/spec/ruby/library/readline/vi_editing_mode_spec.rb
@@ -4,7 +4,7 @@
   with_feature :readline do
     describe "Readline.vi_editing_mode" do
       it "returns nil" do
-        Readline.vi_editing_mode.should be_nil
+        Readline.vi_editing_mode.should == nil
       end
     end
   end
diff --git a/spec/ruby/library/resolv/get_address_spec.rb b/spec/ruby/library/resolv/get_address_spec.rb
index ecc2cdf7de2..9caa94643a3 100644
--- a/spec/ruby/library/resolv/get_address_spec.rb
+++ b/spec/ruby/library/resolv/get_address_spec.rb
@@ -14,6 +14,6 @@
     res = Resolv.new([])
     -> {
       res.getaddress("should.raise.error.")
-    }.should raise_error(Resolv::ResolvError)
+    }.should.raise(Resolv::ResolvError)
   end
 end
diff --git a/spec/ruby/library/resolv/get_name_spec.rb b/spec/ruby/library/resolv/get_name_spec.rb
index 3ef97a2ceaf..81e0cda28d1 100644
--- a/spec/ruby/library/resolv/get_name_spec.rb
+++ b/spec/ruby/library/resolv/get_name_spec.rb
@@ -13,6 +13,6 @@
     res = Resolv.new([])
     -> {
       res.getname("should.raise.error")
-    }.should raise_error(Resolv::ResolvError)
+    }.should.raise(Resolv::ResolvError)
   end
 end
diff --git a/spec/ruby/library/rubygems/gem/load_path_insert_index_spec.rb b/spec/ruby/library/rubygems/gem/load_path_insert_index_spec.rb
index 9b37eaa43cd..693c72a29ed 100644
--- a/spec/ruby/library/rubygems/gem/load_path_insert_index_spec.rb
+++ b/spec/ruby/library/rubygems/gem/load_path_insert_index_spec.rb
@@ -4,7 +4,7 @@
 describe "Gem.load_path_insert_index" do
   guard -> { RbConfig::TOPDIR } do
     it "is set for an installed Ruby" do
-      Gem.load_path_insert_index.should be_kind_of Integer
+      Gem.load_path_insert_index.should.is_a? Integer
     end
   end
 end
diff --git a/spec/ruby/library/securerandom/base64_spec.rb b/spec/ruby/library/securerandom/base64_spec.rb
index 34cd419ce25..49d4b8a0298 100644
--- a/spec/ruby/library/securerandom/base64_spec.rb
+++ b/spec/ruby/library/securerandom/base64_spec.rb
@@ -6,13 +6,13 @@
   it "generates a random base64 string out of specified number of random bytes" do
     (16..128).each do |idx|
       base64 = SecureRandom.base64(idx)
-      base64.should be_kind_of(String)
+      base64.should.is_a?(String)
       base64.length.should < 2 * idx
       base64.should =~ /^[A-Za-z0-9\+\/]+={0,2}$/
     end
 
     base64 = SecureRandom.base64(16.5)
-    base64.should be_kind_of(String)
+    base64.should.is_a?(String)
     base64.length.should < 2 * 16
   end
 
@@ -32,19 +32,19 @@
   end
 
   it "generates a random base64 string out of 32 random bytes" do
-    SecureRandom.base64.should be_kind_of(String)
+    SecureRandom.base64.should.is_a?(String)
     SecureRandom.base64.length.should < 32 * 2
   end
 
   it "treats nil argument as default one and generates a random base64 string" do
-    SecureRandom.base64(nil).should be_kind_of(String)
+    SecureRandom.base64(nil).should.is_a?(String)
     SecureRandom.base64(nil).length.should < 32 * 2
   end
 
   it "raises ArgumentError on negative arguments" do
     -> {
       SecureRandom.base64(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "tries to convert the passed argument to an Integer using #to_int" do
diff --git a/spec/ruby/library/securerandom/hex_spec.rb b/spec/ruby/library/securerandom/hex_spec.rb
index bdb920b2173..ec33aca1ee8 100644
--- a/spec/ruby/library/securerandom/hex_spec.rb
+++ b/spec/ruby/library/securerandom/hex_spec.rb
@@ -6,13 +6,13 @@
   it "generates a random hex string of length twice the specified argument" do
     (1..64).each do |idx|
       hex = SecureRandom.hex(idx)
-      hex.should be_kind_of(String)
+      hex.should.is_a?(String)
       hex.length.should == 2 * idx
     end
 
     base64 = SecureRandom.hex(5.5)
-    base64.should be_kind_of(String)
-    base64.length.should eql(10)
+    base64.should.is_a?(String)
+    base64.length.should.eql?(10)
   end
 
   it "returns an empty string when argument is 0" do
@@ -31,24 +31,24 @@
   end
 
   it "generates a random hex string of length 32 if no argument is provided" do
-    SecureRandom.hex.should be_kind_of(String)
+    SecureRandom.hex.should.is_a?(String)
     SecureRandom.hex.length.should == 32
   end
 
   it "treats nil argument as default one and generates a random hex string of length 32" do
-    SecureRandom.hex(nil).should be_kind_of(String)
+    SecureRandom.hex(nil).should.is_a?(String)
     SecureRandom.hex(nil).length.should == 32
   end
 
   it "raises ArgumentError on negative arguments" do
     -> {
       SecureRandom.hex(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "tries to convert the passed argument to an Integer using #to_int" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return(5)
-    SecureRandom.hex(obj).size.should eql(10)
+    SecureRandom.hex(obj).size.should.eql?(10)
   end
 end
diff --git a/spec/ruby/library/securerandom/random_bytes_spec.rb b/spec/ruby/library/securerandom/random_bytes_spec.rb
index ed3a02255ca..4e30a531632 100644
--- a/spec/ruby/library/securerandom/random_bytes_spec.rb
+++ b/spec/ruby/library/securerandom/random_bytes_spec.rb
@@ -8,24 +8,24 @@
 
   it "generates a random binary string of length 16 if no argument is provided" do
     bytes = SecureRandom.random_bytes
-    bytes.should be_kind_of(String)
+    bytes.should.is_a?(String)
     bytes.length.should == 16
   end
 
   it "generates a random binary string of length 16 if argument is nil" do
     bytes = SecureRandom.random_bytes(nil)
-    bytes.should be_kind_of(String)
+    bytes.should.is_a?(String)
     bytes.length.should == 16
   end
 
   it "generates a random binary string of specified length" do
     (1..64).each do |idx|
       bytes = SecureRandom.random_bytes(idx)
-      bytes.should be_kind_of(String)
+      bytes.should.is_a?(String)
       bytes.length.should == idx
     end
 
-    SecureRandom.random_bytes(2.2).length.should eql(2)
+    SecureRandom.random_bytes(2.2).length.should.eql?(2)
   end
 
   it "generates different binary strings with subsequent invocations" do
@@ -42,12 +42,12 @@
   it "raises ArgumentError on negative arguments" do
     -> {
       SecureRandom.random_bytes(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "tries to convert the passed argument to an Integer using #to_int" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return(5)
-    SecureRandom.random_bytes(obj).size.should eql(5)
+    SecureRandom.random_bytes(obj).size.should.eql?(5)
   end
 end
diff --git a/spec/ruby/library/securerandom/random_number_spec.rb b/spec/ruby/library/securerandom/random_number_spec.rb
index bb25bc496ed..97cd66f7bc9 100644
--- a/spec/ruby/library/securerandom/random_number_spec.rb
+++ b/spec/ruby/library/securerandom/random_number_spec.rb
@@ -10,7 +10,7 @@
   it "generates a random positive number smaller then the positive integer argument" do
     (1..64).each do |idx|
       num = SecureRandom.random_number(idx)
-      num.should be_kind_of(Integer)
+      num.should.is_a?(Integer)
       0.should <= num
       num.should < idx
     end
@@ -20,7 +20,7 @@
     max = 12345678901234567890
     11.times do
       num = SecureRandom.random_number max
-      num.should be_kind_of(Integer)
+      num.should.is_a?(Integer)
       0.should <= num
       num.should < max
     end
@@ -29,7 +29,7 @@
   it "generates a random float number between 0.0 and 1.0 if no argument provided" do
     64.times do
       num = SecureRandom.random_number
-      num.should be_kind_of(Float)
+      num.should.is_a?(Float)
       0.0.should <= num
       num.should < 1.0
     end
@@ -38,7 +38,7 @@
   it "generates a random value in given (integer) range limits" do
     64.times do
       num = SecureRandom.random_number 11...13
-      num.should be_kind_of(Integer)
+      num.should.is_a?(Integer)
       11.should <= num
       num.should < 13
     end
@@ -49,7 +49,7 @@
     upper = 12345678901234567890 + 5
     32.times do
       num = SecureRandom.random_number lower..upper
-      num.should be_kind_of(Integer)
+      num.should.is_a?(Integer)
       lower.should <= num
       num.should <= upper
     end
@@ -58,7 +58,7 @@
   it "generates a random value in given (float) range limits" do
     64.times do
       num = SecureRandom.random_number 0.6..0.9
-      num.should be_kind_of(Float)
+      num.should.is_a?(Float)
       0.6.should <= num
       num.should <= 0.9
     end
@@ -66,14 +66,14 @@
 
   it "generates a random float number between 0.0 and 1.0 if argument is negative" do
     num = SecureRandom.random_number(-10)
-    num.should be_kind_of(Float)
+    num.should.is_a?(Float)
     0.0.should <= num
     num.should < 1.0
   end
 
   it "generates a random float number between 0.0 and 1.0 if argument is negative float" do
     num = SecureRandom.random_number(-11.1)
-    num.should be_kind_of(Float)
+    num.should.is_a?(Float)
     0.0.should <= num
     num.should < 1.0
   end
@@ -84,7 +84,7 @@
     256.times do
       val = SecureRandom.random_number
       # make sure the random values are not repeating
-      values.should_not include(val)
+      values.should_not.include?(val)
       values << val
     end
   end
@@ -92,6 +92,6 @@
   it "raises ArgumentError if the argument is non-numeric" do
     -> {
       SecureRandom.random_number(Object.new)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/shellwords/shellwords_spec.rb b/spec/ruby/library/shellwords/shellwords_spec.rb
index fe86b6faab0..d1b61e0a6eb 100644
--- a/spec/ruby/library/shellwords/shellwords_spec.rb
+++ b/spec/ruby/library/shellwords/shellwords_spec.rb
@@ -19,11 +19,11 @@
   end
 
   it "raises ArgumentError when double quoted strings are misquoted" do
-    -> { Shellwords.shellwords('a "b c d e') }.should raise_error(ArgumentError)
+    -> { Shellwords.shellwords('a "b c d e') }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when single quoted strings are misquoted" do
-    -> { Shellwords.shellwords("a 'b c d e") }.should raise_error(ArgumentError)
+    -> { Shellwords.shellwords("a 'b c d e") }.should.raise(ArgumentError)
   end
 
   # https://bugs.ruby-lang.org/issues/10055
diff --git a/spec/ruby/library/singleton/allocate_spec.rb b/spec/ruby/library/singleton/allocate_spec.rb
index 6a1512d53b9..a0094fb32ab 100644
--- a/spec/ruby/library/singleton/allocate_spec.rb
+++ b/spec/ruby/library/singleton/allocate_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Singleton.allocate" do
   it "is a private method" do
-    -> { SingletonSpecs::MyClass.allocate }.should raise_error(NoMethodError)
+    -> { SingletonSpecs::MyClass.allocate }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/library/singleton/clone_spec.rb b/spec/ruby/library/singleton/clone_spec.rb
index 3635bcd5947..a7b7b731f5e 100644
--- a/spec/ruby/library/singleton/clone_spec.rb
+++ b/spec/ruby/library/singleton/clone_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Singleton#clone" do
   it "is prevented" do
-    -> { SingletonSpecs::MyClass.instance.clone }.should raise_error(TypeError)
+    -> { SingletonSpecs::MyClass.instance.clone }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/singleton/dup_spec.rb b/spec/ruby/library/singleton/dup_spec.rb
index 13d5a213e9f..a0455f37b76 100644
--- a/spec/ruby/library/singleton/dup_spec.rb
+++ b/spec/ruby/library/singleton/dup_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Singleton#dup" do
   it "is prevented" do
-    -> { SingletonSpecs::MyClass.instance.dup }.should raise_error(TypeError)
+    -> { SingletonSpecs::MyClass.instance.dup }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/singleton/instance_spec.rb b/spec/ruby/library/singleton/instance_spec.rb
index 1679728d4cd..20cac602b54 100644
--- a/spec/ruby/library/singleton/instance_spec.rb
+++ b/spec/ruby/library/singleton/instance_spec.rb
@@ -3,28 +3,28 @@
 
 describe "Singleton.instance" do
   it "returns an instance of the singleton class" do
-    SingletonSpecs::MyClass.instance.should be_kind_of(SingletonSpecs::MyClass)
+    SingletonSpecs::MyClass.instance.should.is_a?(SingletonSpecs::MyClass)
   end
 
   it "returns the same instance for multiple calls to instance" do
-    SingletonSpecs::MyClass.instance.should equal(SingletonSpecs::MyClass.instance)
+    SingletonSpecs::MyClass.instance.should.equal?(SingletonSpecs::MyClass.instance)
   end
 
   it "returns an instance of the singleton's subclasses" do
-    SingletonSpecs::MyClassChild.instance.should be_kind_of(SingletonSpecs::MyClassChild)
+    SingletonSpecs::MyClassChild.instance.should.is_a?(SingletonSpecs::MyClassChild)
   end
 
   it "returns the same instance for multiple class to instance on subclasses" do
-    SingletonSpecs::MyClassChild.instance.should equal(SingletonSpecs::MyClassChild.instance)
+    SingletonSpecs::MyClassChild.instance.should.equal?(SingletonSpecs::MyClassChild.instance)
   end
 
   it "returns an instance of the singleton's clone" do
     klone = SingletonSpecs::MyClassChild.clone
-    klone.instance.should be_kind_of(klone)
+    klone.instance.should.is_a?(klone)
   end
 
   it "returns the same instance for multiple class to instance on clones" do
     klone = SingletonSpecs::MyClassChild.clone
-    klone.instance.should equal(klone.instance)
+    klone.instance.should.equal?(klone.instance)
   end
 end
diff --git a/spec/ruby/library/singleton/load_spec.rb b/spec/ruby/library/singleton/load_spec.rb
index 4c753f9e7a4..ab95d14640f 100644
--- a/spec/ruby/library/singleton/load_spec.rb
+++ b/spec/ruby/library/singleton/load_spec.rb
@@ -1,21 +1,20 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-# TODO: change to a.should be_equal(b)
 # TODO: write spec for cloning classes and calling private methods
 # TODO: write spec for private_methods not showing up via extended
 describe "Singleton._load" do
   it "returns the singleton instance for anything passed in" do
     klass = SingletonSpecs::MyClass
-    klass._load("").should equal(klass.instance)
-    klass._load("42").should equal(klass.instance)
-    klass._load(42).should equal(klass.instance)
+    klass._load("").should.equal?(klass.instance)
+    klass._load("42").should.equal?(klass.instance)
+    klass._load(42).should.equal?(klass.instance)
   end
 
   it "returns the singleton instance for anything passed in to subclass" do
     subklass = SingletonSpecs::MyClassChild
-    subklass._load("").should equal(subklass.instance)
-    subklass._load("42").should equal(subklass.instance)
-    subklass._load(42).should equal(subklass.instance)
+    subklass._load("").should.equal?(subklass.instance)
+    subklass._load("42").should.equal?(subklass.instance)
+    subklass._load(42).should.equal?(subklass.instance)
   end
 end
diff --git a/spec/ruby/library/singleton/new_spec.rb b/spec/ruby/library/singleton/new_spec.rb
index 2f45db819ce..6167231a297 100644
--- a/spec/ruby/library/singleton/new_spec.rb
+++ b/spec/ruby/library/singleton/new_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Singleton.new" do
   it "is a private method" do
-    -> { SingletonSpecs::NewSpec.new }.should raise_error(NoMethodError)
+    -> { SingletonSpecs::NewSpec.new }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/bind_spec.rb b/spec/ruby/library/socket/addrinfo/bind_spec.rb
index 6f78890a4d2..cdd187771fd 100644
--- a/spec/ruby/library/socket/addrinfo/bind_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/bind_spec.rb
@@ -13,16 +13,16 @@
 
   it "returns a bound socket when no block is given" do
     @socket = @addrinfo.bind
-    @socket.should be_kind_of(Socket)
-    @socket.closed?.should be_false
+    @socket.should.is_a?(Socket)
+    @socket.closed?.should == false
   end
 
   it "yields the socket if a block is given" do
     @addrinfo.bind do |sock|
       @socket = sock
-      sock.should be_kind_of(Socket)
+      sock.should.is_a?(Socket)
     end
-    @socket.closed?.should be_true
+    @socket.closed?.should == true
   end
 
 end
diff --git a/spec/ruby/library/socket/addrinfo/canonname_spec.rb b/spec/ruby/library/socket/addrinfo/canonname_spec.rb
index a1cc8b39802..efd3147125d 100644
--- a/spec/ruby/library/socket/addrinfo/canonname_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/canonname_spec.rb
@@ -10,7 +10,7 @@
   it "returns the canonical name for a host" do
     canonname = @addrinfos.map { |a| a.canonname }.find { |name| name and name.include?("localhost") }
     if canonname
-      canonname.should include("localhost")
+      canonname.should.include?("localhost")
     else
       canonname.should == nil
     end
@@ -20,7 +20,7 @@
     it 'returns nil' do
       addr = Addrinfo.new(Socket.sockaddr_in(0, '127.0.0.1'))
 
-      addr.canonname.should be_nil
+      addr.canonname.should == nil
     end
   end
 
diff --git a/spec/ruby/library/socket/addrinfo/connect_from_spec.rb b/spec/ruby/library/socket/addrinfo/connect_from_spec.rb
index 55fce2e1595..b1f6caa174e 100644
--- a/spec/ruby/library/socket/addrinfo/connect_from_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/connect_from_spec.rb
@@ -17,18 +17,18 @@
     describe 'using separate arguments' do
       it 'returns a Socket when no block is given' do
         @socket = @addr.connect_from(ip_address, 0)
-        @socket.should be_an_instance_of(Socket)
+        @socket.should.instance_of?(Socket)
       end
 
       it 'yields the Socket when a block is given' do
         @addr.connect_from(ip_address, 0) do |socket|
-          socket.should be_an_instance_of(Socket)
+          socket.should.instance_of?(Socket)
         end
       end
 
       it 'treats the last argument as a set of options if it is a Hash' do
         @socket = @addr.connect_from(ip_address, 0, timeout: 2)
-        @socket.should be_an_instance_of(Socket)
+        @socket.should.instance_of?(Socket)
       end
 
       it 'binds the socket to the local address' do
@@ -48,18 +48,18 @@
 
       it 'returns a Socket when no block is given' do
         @socket = @addr.connect_from(@from_addr)
-        @socket.should be_an_instance_of(Socket)
+        @socket.should.instance_of?(Socket)
       end
 
       it 'yields the Socket when a block is given' do
         @addr.connect_from(@from_addr) do |socket|
-          socket.should be_an_instance_of(Socket)
+          socket.should.instance_of?(Socket)
         end
       end
 
       it 'treats the last argument as a set of options if it is a Hash' do
         @socket = @addr.connect_from(@from_addr, timeout: 2)
-        @socket.should be_an_instance_of(Socket)
+        @socket.should.instance_of?(Socket)
       end
 
       it 'binds the socket to the local address' do
diff --git a/spec/ruby/library/socket/addrinfo/connect_spec.rb b/spec/ruby/library/socket/addrinfo/connect_spec.rb
index 1c2dc609ca2..a8494b5501e 100644
--- a/spec/ruby/library/socket/addrinfo/connect_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/connect_spec.rb
@@ -16,20 +16,20 @@
     it 'returns a Socket when no block is given' do
       addr = Addrinfo.tcp(ip_address, @port)
       @socket = addr.connect
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
 
     it 'yields a Socket when a block is given' do
       addr = Addrinfo.tcp(ip_address, @port)
       addr.connect do |socket|
-        socket.should be_an_instance_of(Socket)
+        socket.should.instance_of?(Socket)
       end
     end
 
     it 'accepts a Hash of options' do
       addr = Addrinfo.tcp(ip_address, @port)
       @socket = addr.connect(timeout: 2)
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/connect_to_spec.rb b/spec/ruby/library/socket/addrinfo/connect_to_spec.rb
index 69666da19b5..2bf49a38e8b 100644
--- a/spec/ruby/library/socket/addrinfo/connect_to_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/connect_to_spec.rb
@@ -17,18 +17,18 @@
     describe 'using separate arguments' do
       it 'returns a Socket when no block is given' do
         @socket = @addr.connect_to(ip_address, @port)
-        @socket.should be_an_instance_of(Socket)
+        @socket.should.instance_of?(Socket)
       end
 
       it 'yields the Socket when a block is given' do
         @addr.connect_to(ip_address, @port) do |socket|
-          socket.should be_an_instance_of(Socket)
+          socket.should.instance_of?(Socket)
         end
       end
 
       it 'treats the last argument as a set of options if it is a Hash' do
         @socket = @addr.connect_to(ip_address, @port, timeout: 2)
-        @socket.should be_an_instance_of(Socket)
+        @socket.should.instance_of?(Socket)
       end
 
       it 'binds the Addrinfo to the local address' do
@@ -48,18 +48,18 @@
 
       it 'returns a Socket when no block is given' do
         @socket = @addr.connect_to(@to_addr)
-        @socket.should be_an_instance_of(Socket)
+        @socket.should.instance_of?(Socket)
       end
 
       it 'yields the Socket when a block is given' do
         @addr.connect_to(@to_addr) do |socket|
-          socket.should be_an_instance_of(Socket)
+          socket.should.instance_of?(Socket)
         end
       end
 
       it 'treats the last argument as a set of options if it is a Hash' do
         @socket = @addr.connect_to(@to_addr, timeout: 2)
-        @socket.should be_an_instance_of(Socket)
+        @socket.should.instance_of?(Socket)
       end
 
       it 'binds the socket to the local address' do
diff --git a/spec/ruby/library/socket/addrinfo/family_addrinfo_spec.rb b/spec/ruby/library/socket/addrinfo/family_addrinfo_spec.rb
index 3c2f9f73d8a..38834ade917 100644
--- a/spec/ruby/library/socket/addrinfo/family_addrinfo_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/family_addrinfo_spec.rb
@@ -4,7 +4,7 @@
   it 'raises ArgumentError if no arguments are given' do
     addr = Addrinfo.tcp('127.0.0.1', 0)
 
-    -> { addr.family_addrinfo }.should raise_error(ArgumentError)
+    -> { addr.family_addrinfo }.should.raise(ArgumentError)
   end
 
   describe 'using multiple arguments' do
@@ -14,17 +14,17 @@
       end
 
       it 'raises ArgumentError if only 1 argument is given' do
-        -> { @source.family_addrinfo('127.0.0.1') }.should raise_error(ArgumentError)
+        -> { @source.family_addrinfo('127.0.0.1') }.should.raise(ArgumentError)
       end
 
       it 'raises ArgumentError if more than 2 arguments are given' do
-        -> { @source.family_addrinfo('127.0.0.1', 0, 666) }.should raise_error(ArgumentError)
+        -> { @source.family_addrinfo('127.0.0.1', 0, 666) }.should.raise(ArgumentError)
       end
 
       it 'returns an Addrinfo when a host and port are given' do
         addr = @source.family_addrinfo('127.0.0.1', 0)
 
-        addr.should be_an_instance_of(Addrinfo)
+        addr.should.instance_of?(Addrinfo)
       end
 
       describe 'the returned Addrinfo' do
@@ -56,13 +56,13 @@
       end
 
       it 'raises ArgumentError if more than 1 argument is given' do
-        -> { @source.family_addrinfo('foo', 'bar') }.should raise_error(ArgumentError)
+        -> { @source.family_addrinfo('foo', 'bar') }.should.raise(ArgumentError)
       end
 
       it 'returns an Addrinfo when a UNIX socket path is given' do
         addr = @source.family_addrinfo('dogs')
 
-        addr.should be_an_instance_of(Addrinfo)
+        addr.should.instance_of?(Addrinfo)
       end
 
       describe 'the returned Addrinfo' do
@@ -97,17 +97,17 @@
 
     it 'raises ArgumentError if more than 1 argument is given' do
       input = Addrinfo.tcp('127.0.0.2', 0)
-      -> { @source.family_addrinfo(input, 666) }.should raise_error(ArgumentError)
+      -> { @source.family_addrinfo(input, 666) }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if the protocol families don't match" do
       input = Addrinfo.tcp('::1', 0)
-      -> { @source.family_addrinfo(input) }.should raise_error(ArgumentError)
+      -> { @source.family_addrinfo(input) }.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if the socket types don't match" do
       input = Addrinfo.udp('127.0.0.1', 0)
-      -> { @source.family_addrinfo(input) }.should raise_error(ArgumentError)
+      -> { @source.family_addrinfo(input) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/foreach_spec.rb b/spec/ruby/library/socket/addrinfo/foreach_spec.rb
index 6ec8fab9050..8cbbddb8f0a 100644
--- a/spec/ruby/library/socket/addrinfo/foreach_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/foreach_spec.rb
@@ -3,7 +3,7 @@
 describe 'Addrinfo.foreach' do
   it 'yields Addrinfo instances to the supplied block' do
     Addrinfo.foreach('127.0.0.1', 80) do |addr|
-      addr.should be_an_instance_of(Addrinfo)
+      addr.should.instance_of?(Addrinfo)
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb b/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb
index e05fe9967ad..47393ee1678 100644
--- a/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb
@@ -5,8 +5,8 @@
   it 'returns an Array of Addrinfo instances' do
     array = Addrinfo.getaddrinfo('127.0.0.1', 80)
 
-    array.should be_an_instance_of(Array)
-    array[0].should be_an_instance_of(Addrinfo)
+    array.should.instance_of?(Array)
+    array[0].should.instance_of?(Addrinfo)
   end
 
   SocketSpecs.each_ip_protocol do |family, ip_address|
@@ -54,7 +54,7 @@
       array    = Addrinfo.getaddrinfo('127.0.0.1', 80)
       possible = [Socket::SOCK_STREAM, Socket::SOCK_DGRAM]
 
-      possible.should include(array[0].socktype)
+      possible.should.include?(array[0].socktype)
     end
   end
 
@@ -69,7 +69,7 @@
       array    = Addrinfo.getaddrinfo('127.0.0.1', 80)
       possible = [Socket::IPPROTO_TCP, Socket::IPPROTO_UDP]
 
-      possible.should include(array[0].protocol)
+      possible.should.include?(array[0].protocol)
     end
   end
 
@@ -82,6 +82,6 @@
   it 'sets the canonical name when AI_CANONNAME is given as a flag' do
     array = Addrinfo.getaddrinfo('localhost', 80, nil, nil, nil, Socket::AI_CANONNAME)
 
-    array[0].canonname.should be_an_instance_of(String)
+    array[0].canonname.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/initialize_spec.rb b/spec/ruby/library/socket/addrinfo/initialize_spec.rb
index c556bd758b9..f33255e38be 100644
--- a/spec/ruby/library/socket/addrinfo/initialize_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/initialize_spec.rb
@@ -53,11 +53,11 @@
         @addrinfo.ip_port.should == 25
       end
 
-      it "returns the specified family" do
+      it "returns the specified pfamily" do
         @addrinfo.pfamily.should == Socket::PF_INET6
       end
 
-      it "returns the specified family" do
+      it "returns the specified afamily" do
         @addrinfo.afamily.should == Socket::AF_INET6
       end
 
@@ -83,11 +83,11 @@
         @addrinfo.ip_port.should == 25
       end
 
-      it "returns the specified family" do
+      it "returns the specified pfamily" do
         @addrinfo.pfamily.should == Socket::PF_INET6
       end
 
-      it "returns the specified family" do
+      it "returns the specified afamily" do
         @addrinfo.afamily.should == Socket::AF_INET6
       end
 
@@ -113,11 +113,11 @@
         @addrinfo.ip_port.should == 25
       end
 
-      it "returns the specified family" do
+      it "returns the specified pfamily" do
         @addrinfo.pfamily.should == Socket::PF_INET6
       end
 
-      it "returns the specified family" do
+      it "returns the specified afamily" do
         @addrinfo.afamily.should == Socket::AF_INET6
       end
 
@@ -147,11 +147,11 @@
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the specified family" do
+      it "returns the specified pfamily" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
-      it "returns the specified family" do
+      it "returns the specified afamily" do
         @addrinfo.afamily.should == Socket::AF_INET
       end
 
@@ -200,7 +200,7 @@
       it 'raises SocketError' do
         block = -> { Addrinfo.new(['AF_INET6', 80, 'hostname', '127.0.0.1']) }
 
-        block.should raise_error(SocketError)
+        block.should.raise(SocketError)
       end
     end
 
@@ -217,11 +217,11 @@
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the specified family" do
+      it "returns the specified pfamily" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
-      it "returns the specified family" do
+      it "returns the specified afamily" do
         @addrinfo.afamily.should == Socket::AF_INET
       end
 
@@ -247,11 +247,11 @@
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the specified family" do
+      it "returns the specified pfamily" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
-      it "returns the specified family" do
+      it "returns the specified afamily" do
         @addrinfo.afamily.should == Socket::AF_INET
       end
 
@@ -294,7 +294,7 @@
         value = Socket::SOCK_RDM
         block = -> { Addrinfo.new(sockaddr, nil, value) }
 
-        block.should raise_error(SocketError)
+        block.should.raise(SocketError)
       end
     end
 
@@ -311,11 +311,11 @@
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the specified family" do
+      it "returns the specified pfamily" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
-      it "returns the specified family" do
+      it "returns the specified afamily" do
         @addrinfo.afamily.should == Socket::AF_INET
       end
 
@@ -340,7 +340,7 @@
           value = Socket.const_get(constant)
           -> {
             Addrinfo.new(@sockaddr, value)
-          }.should raise_error(SocketError)
+          }.should.raise(SocketError)
         end
       end
     end
@@ -368,7 +368,7 @@
               value = Socket.const_get(type)
               block = -> { Addrinfo.new(@sockaddr, nil, nil, value) }
 
-              block.should raise_error(SocketError)
+              block.should.raise(SocketError)
             end
           end
         end
@@ -396,7 +396,7 @@
               value = Socket.const_get(type)
               block = -> { Addrinfo.new(@sockaddr, nil, @socktype, value) }
 
-              block.should raise_error(SocketError)
+              block.should.raise(SocketError)
             end
           end
         end
@@ -413,7 +413,7 @@
               value = Socket.const_get(type)
               block = -> { Addrinfo.new(@sockaddr, nil, @socktype, value) }
 
-              block.should raise_error(SocketError)
+              block.should.raise(SocketError)
             end
           end
         end
@@ -444,7 +444,7 @@
             value = Socket.const_get(type)
             block = -> { Addrinfo.new(@sockaddr, nil, @socktype, value) }
 
-            block.should raise_error(SocketError)
+            block.should.raise(SocketError)
           end
         end
       end
@@ -472,7 +472,7 @@
                 value = Socket.const_get(type)
                 block = -> { Addrinfo.new(@sockaddr, nil, @socktype, value) }
 
-                block.should raise_error(SocketError)
+                block.should.raise(SocketError)
               end
             end
           end
@@ -501,7 +501,7 @@
               value = Socket.const_get(type)
               block = -> { Addrinfo.new(@sockaddr, nil, @socktype, value) }
 
-              block.should raise_error(SocketError)
+              block.should.raise(SocketError)
             end
           end
         end
@@ -514,13 +514,13 @@
       @sockaddr = Socket.sockaddr_in(80, '127.0.0.1')
     end
 
-    it 'returns an Addrinfo with the specified family' do
+    it 'returns an Addrinfo with the specified pfamily for :PF_INET' do
       addr = Addrinfo.new(@sockaddr, :PF_INET)
 
       addr.pfamily.should == Socket::PF_INET
     end
 
-    it 'returns an Addrinfo with the specified family' do
+    it 'returns an Addrinfo with the specified pfamily for :INET' do
       addr = Addrinfo.new(@sockaddr, :INET)
 
       addr.pfamily.should == Socket::PF_INET
@@ -544,13 +544,13 @@
       @sockaddr = Socket.sockaddr_in(80, '127.0.0.1')
     end
 
-    it 'returns an Addrinfo with the specified family' do
+    it 'returns an Addrinfo with the specified pfamily for PF_INET' do
       addr = Addrinfo.new(@sockaddr, 'PF_INET')
 
       addr.pfamily.should == Socket::PF_INET
     end
 
-    it 'returns an Addrinfo with the specified family' do
+    it 'returns an Addrinfo with the specified pfamily for INET' do
       addr = Addrinfo.new(@sockaddr, 'INET')
 
       addr.pfamily.should == Socket::PF_INET
diff --git a/spec/ruby/library/socket/addrinfo/ip_address_spec.rb b/spec/ruby/library/socket/addrinfo/ip_address_spec.rb
index 193432e861c..9a0ede4eebb 100644
--- a/spec/ruby/library/socket/addrinfo/ip_address_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ip_address_spec.rb
@@ -27,7 +27,7 @@
     end
 
     it "raises an exception" do
-      -> { @addrinfo.ip_address }.should raise_error(SocketError)
+      -> { @addrinfo.ip_address }.should.raise(SocketError)
     end
   end
 
diff --git a/spec/ruby/library/socket/addrinfo/ip_port_spec.rb b/spec/ruby/library/socket/addrinfo/ip_port_spec.rb
index f10ce35143d..00f74cdd467 100644
--- a/spec/ruby/library/socket/addrinfo/ip_port_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ip_port_spec.rb
@@ -27,7 +27,7 @@
     end
 
     it "raises an exception" do
-      -> { @addrinfo.ip_port }.should raise_error(SocketError)
+      -> { @addrinfo.ip_port }.should.raise(SocketError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ip_spec.rb b/spec/ruby/library/socket/addrinfo/ip_spec.rb
index 09b93416055..2237eca263f 100644
--- a/spec/ruby/library/socket/addrinfo/ip_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ip_spec.rb
@@ -8,7 +8,7 @@
     end
 
     it "returns true" do
-      @addrinfo.ip?.should be_true
+      @addrinfo.ip?.should == true
     end
   end
 
@@ -18,7 +18,7 @@
     end
 
     it "returns true" do
-      @addrinfo.ip?.should be_true
+      @addrinfo.ip?.should == true
     end
   end
 
@@ -28,7 +28,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ip?.should be_false
+      @addrinfo.ip?.should == false
     end
   end
 end
@@ -36,7 +36,7 @@
 describe 'Addrinfo.ip' do
   SocketSpecs.each_ip_protocol do |family, ip_address|
     it 'returns an Addrinfo instance' do
-      Addrinfo.ip(ip_address).should be_an_instance_of(Addrinfo)
+      Addrinfo.ip(ip_address).should.instance_of?(Addrinfo)
     end
 
     it 'sets the IP address' do
diff --git a/spec/ruby/library/socket/addrinfo/ip_unpack_spec.rb b/spec/ruby/library/socket/addrinfo/ip_unpack_spec.rb
index 58260c45578..b48ca062eee 100644
--- a/spec/ruby/library/socket/addrinfo/ip_unpack_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ip_unpack_spec.rb
@@ -27,7 +27,7 @@
     end
 
     it "raises an exception" do
-      -> { @addrinfo.ip_unpack }.should raise_error(SocketError)
+      -> { @addrinfo.ip_unpack }.should.raise(SocketError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ipv4_loopback_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_loopback_spec.rb
index 3a584d4f52f..266281ce7ad 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_loopback_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_loopback_spec.rb
@@ -10,7 +10,7 @@
     end
 
     it "returns false for another address" do
-      Addrinfo.ip('255.255.255.0').ipv4_loopback?.should be_false
+      Addrinfo.ip('255.255.255.0').ipv4_loopback?.should == false
     end
   end
 
@@ -21,11 +21,11 @@
     end
 
     it "returns false for the loopback address" do
-      @loopback.ipv4_loopback?.should be_false
+      @loopback.ipv4_loopback?.should == false
     end
 
     it "returns false for another address" do
-      @other.ipv4_loopback?.should be_false
+      @other.ipv4_loopback?.should == false
     end
   end
 
@@ -35,7 +35,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv4_loopback?.should be_false
+      @addrinfo.ipv4_loopback?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
index e4b4cfcc84a..bc8a31dfa8c 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
@@ -21,7 +21,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv4_multicast?.should be_false
+      @addrinfo.ipv4_multicast?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ipv4_private_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_private_spec.rb
index 97218b5ba32..8cfbf0a25e4 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_private_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_private_spec.rb
@@ -19,7 +19,7 @@
     end
 
     it "returns false for a public address" do
-      @other.ipv4_private?.should be_false
+      @other.ipv4_private?.should == false
     end
   end
 
@@ -29,7 +29,7 @@
     end
 
     it "returns false" do
-      @other.ipv4_private?.should be_false
+      @other.ipv4_private?.should == false
     end
   end
 
@@ -39,7 +39,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv4_private?.should be_false
+      @addrinfo.ipv4_private?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ipv4_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_spec.rb
index 61f7759b108..8fef94a8e82 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_spec.rb
@@ -7,7 +7,7 @@
     end
 
     it "returns true" do
-      @addrinfo.ipv4?.should be_true
+      @addrinfo.ipv4?.should == true
     end
   end
 
@@ -17,7 +17,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv4?.should be_false
+      @addrinfo.ipv4?.should == false
     end
   end
 
@@ -27,7 +27,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv4?.should be_false
+      @addrinfo.ipv4?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_loopback_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_loopback_spec.rb
index ffc75185ead..2e8241e3368 100644
--- a/spec/ruby/library/socket/addrinfo/ipv6_loopback_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv6_loopback_spec.rb
@@ -8,11 +8,11 @@
     end
 
     it "returns false for the loopback address" do
-      @loopback.ipv6_loopback?.should be_false
+      @loopback.ipv6_loopback?.should == false
     end
 
     it "returns false for another address" do
-      @other.ipv6_loopback?.should be_false
+      @other.ipv6_loopback?.should == false
     end
   end
 
@@ -23,11 +23,11 @@
     end
 
     it "returns true for the loopback address" do
-      @loopback.ipv6_loopback?.should be_true
+      @loopback.ipv6_loopback?.should == true
     end
 
     it "returns false for another address" do
-      @other.ipv6_loopback?.should be_false
+      @other.ipv6_loopback?.should == false
     end
   end
 
@@ -37,7 +37,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv6_loopback?.should be_false
+      @addrinfo.ipv6_loopback?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
index 99d4e8cf4d8..52787e5e531 100644
--- a/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
@@ -8,11 +8,11 @@
     end
 
     it "returns true for a multicast address" do
-      @multicast.ipv6_multicast?.should be_false
+      @multicast.ipv6_multicast?.should == false
     end
 
     it "returns false for another address" do
-      @other.ipv6_multicast?.should be_false
+      @other.ipv6_multicast?.should == false
     end
   end
 
@@ -40,7 +40,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv6_multicast?.should be_false
+      @addrinfo.ipv6_multicast?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_spec.rb
index 436d5e930b4..9fa8e9bd0c2 100644
--- a/spec/ruby/library/socket/addrinfo/ipv6_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv6_spec.rb
@@ -7,7 +7,7 @@
     end
 
     it "returns true" do
-      @addrinfo.ipv6?.should be_false
+      @addrinfo.ipv6?.should == false
     end
   end
 
@@ -17,7 +17,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv6?.should be_true
+      @addrinfo.ipv6?.should == true
     end
   end
 
@@ -27,7 +27,7 @@
     end
 
     it "returns false" do
-      @addrinfo.ipv6?.should be_false
+      @addrinfo.ipv6?.should == false
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb
index 29050bec20e..d1436d45270 100644
--- a/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb
@@ -6,7 +6,7 @@
     it 'returns an Addrinfo for ::192.168.1.1' do
       addr = Addrinfo.ip('::192.168.1.1').ipv6_to_ipv4
 
-      addr.should be_an_instance_of(Addrinfo)
+      addr.should.instance_of?(Addrinfo)
 
       addr.afamily.should    == Socket::AF_INET
       addr.ip_address.should == '192.168.1.1'
@@ -16,7 +16,7 @@
       it 'returns an Addrinfo for ::0.0.1.1' do
         addr = Addrinfo.ip('::0.0.1.1').ipv6_to_ipv4
 
-        addr.should be_an_instance_of(Addrinfo)
+        addr.should.instance_of?(Addrinfo)
 
         addr.afamily.should    == Socket::AF_INET
         addr.ip_address.should == '0.0.1.1'
@@ -25,7 +25,7 @@
       it 'returns an Addrinfo for ::0.0.1.0' do
         addr = Addrinfo.ip('::0.0.1.0').ipv6_to_ipv4
 
-        addr.should be_an_instance_of(Addrinfo)
+        addr.should.instance_of?(Addrinfo)
 
         addr.afamily.should    == Socket::AF_INET
         addr.ip_address.should == '0.0.1.0'
@@ -34,7 +34,7 @@
       it 'returns an Addrinfo for ::0.1.0.0' do
         addr = Addrinfo.ip('::0.1.0.0').ipv6_to_ipv4
 
-        addr.should be_an_instance_of(Addrinfo)
+        addr.should.instance_of?(Addrinfo)
 
         addr.afamily.should    == Socket::AF_INET
         addr.ip_address.should == '0.1.0.0'
@@ -44,27 +44,27 @@
     it 'returns an Addrinfo for ::ffff:192.168.1.1' do
       addr = Addrinfo.ip('::ffff:192.168.1.1').ipv6_to_ipv4
 
-      addr.should be_an_instance_of(Addrinfo)
+      addr.should.instance_of?(Addrinfo)
 
       addr.afamily.should    == Socket::AF_INET
       addr.ip_address.should == '192.168.1.1'
     end
 
     it 'returns nil for ::0.0.0.1' do
-      Addrinfo.ip('::0.0.0.1').ipv6_to_ipv4.should be_nil
+      Addrinfo.ip('::0.0.0.1').ipv6_to_ipv4.should == nil
     end
 
     it 'returns nil for a pure IPv6 Addrinfo' do
-      Addrinfo.ip('::1').ipv6_to_ipv4.should be_nil
+      Addrinfo.ip('::1').ipv6_to_ipv4.should == nil
     end
 
     it 'returns nil for an IPv4 Addrinfo' do
-      Addrinfo.ip('192.168.1.1').ipv6_to_ipv4.should be_nil
+      Addrinfo.ip('192.168.1.1').ipv6_to_ipv4.should == nil
     end
 
     describe 'for a unix socket' do
       it 'returns nil for a UNIX Addrinfo' do
-        Addrinfo.unix('foo').ipv6_to_ipv4.should be_nil
+        Addrinfo.unix('foo').ipv6_to_ipv4.should == nil
       end
     end
   end
diff --git a/spec/ruby/library/socket/addrinfo/listen_spec.rb b/spec/ruby/library/socket/addrinfo/listen_spec.rb
index 931093f7325..80bcdc7f83e 100644
--- a/spec/ruby/library/socket/addrinfo/listen_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/listen_spec.rb
@@ -13,12 +13,12 @@
   it 'returns a Socket when no block is given' do
     @socket = @addr.listen
 
-    @socket.should be_an_instance_of(Socket)
+    @socket.should.instance_of?(Socket)
   end
 
   it 'yields the Socket if a block is given' do
     @addr.listen do |socket|
-      socket.should be_an_instance_of(Socket)
+      socket.should.instance_of?(Socket)
     end
   end
 
diff --git a/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb b/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb
index e2c3497f7fc..438b04a99c1 100644
--- a/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb
@@ -8,7 +8,7 @@
     end
 
     it 'returns an Array' do
-      @addr.marshal_dump.should be_an_instance_of(Array)
+      @addr.marshal_dump.should.instance_of?(Array)
     end
 
     describe 'the returned Array' do
@@ -48,7 +48,7 @@
     end
 
     it 'returns an Array' do
-      @addr.marshal_dump.should be_an_instance_of(Array)
+      @addr.marshal_dump.should.instance_of?(Array)
     end
 
     describe 'the returned Array' do
diff --git a/spec/ruby/library/socket/addrinfo/tcp_spec.rb b/spec/ruby/library/socket/addrinfo/tcp_spec.rb
index c74c9c21c21..0669de16a6f 100644
--- a/spec/ruby/library/socket/addrinfo/tcp_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/tcp_spec.rb
@@ -4,7 +4,7 @@
 describe 'Addrinfo.tcp' do
   SocketSpecs.each_ip_protocol do |family, ip_address|
     it 'returns an Addrinfo instance' do
-      Addrinfo.tcp(ip_address, 80).should be_an_instance_of(Addrinfo)
+      Addrinfo.tcp(ip_address, 80).should.instance_of?(Addrinfo)
     end
 
     it 'sets the IP address' do
diff --git a/spec/ruby/library/socket/addrinfo/udp_spec.rb b/spec/ruby/library/socket/addrinfo/udp_spec.rb
index ac02e76ef58..51d7f5588ee 100644
--- a/spec/ruby/library/socket/addrinfo/udp_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/udp_spec.rb
@@ -4,7 +4,7 @@
 describe 'Addrinfo.udp' do
   SocketSpecs.each_ip_protocol do |family, ip_address|
     it 'returns an Addrinfo instance' do
-      Addrinfo.udp(ip_address, 80).should be_an_instance_of(Addrinfo)
+      Addrinfo.udp(ip_address, 80).should.instance_of?(Addrinfo)
     end
 
     it 'sets the IP address' do
diff --git a/spec/ruby/library/socket/addrinfo/unix_path_spec.rb b/spec/ruby/library/socket/addrinfo/unix_path_spec.rb
index 2a9076a3544..c15075bce36 100644
--- a/spec/ruby/library/socket/addrinfo/unix_path_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/unix_path_spec.rb
@@ -8,7 +8,7 @@
     end
 
     it "raises an exception" do
-      -> { @addrinfo.unix_path }.should raise_error(SocketError)
+      -> { @addrinfo.unix_path }.should.raise(SocketError)
     end
 
   end
@@ -19,7 +19,7 @@
     end
 
     it "raises an exception" do
-      -> { @addrinfo.unix_path }.should raise_error(SocketError)
+      -> { @addrinfo.unix_path }.should.raise(SocketError)
     end
   end
 
diff --git a/spec/ruby/library/socket/addrinfo/unix_spec.rb b/spec/ruby/library/socket/addrinfo/unix_spec.rb
index 7597533a769..da65e13efb6 100644
--- a/spec/ruby/library/socket/addrinfo/unix_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/unix_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'Addrinfo.unix' do
   it 'returns an Addrinfo instance' do
-    Addrinfo.unix('socket').should be_an_instance_of(Addrinfo)
+    Addrinfo.unix('socket').should.instance_of?(Addrinfo)
   end
 
   it 'sets the IP address' do
@@ -40,7 +40,7 @@
     end
 
     it "returns false" do
-      @addrinfo.unix?.should be_false
+      @addrinfo.unix?.should == false
     end
 
   end
@@ -51,7 +51,7 @@
     end
 
     it "returns false" do
-      @addrinfo.unix?.should be_false
+      @addrinfo.unix?.should == false
     end
   end
 
@@ -62,7 +62,7 @@
       end
 
       it "returns true" do
-        @addrinfo.unix?.should be_true
+        @addrinfo.unix?.should == true
       end
     end
   end
diff --git a/spec/ruby/library/socket/ancillarydata/cmsg_is_spec.rb b/spec/ruby/library/socket/ancillarydata/cmsg_is_spec.rb
index c54ee298259..c77f3bdbaeb 100644
--- a/spec/ruby/library/socket/ancillarydata/cmsg_is_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/cmsg_is_spec.rb
@@ -26,7 +26,7 @@
       end
 
       it 'raises SocketError when comparing with :IPV6 and :RIGHTS' do
-        -> { @data.cmsg_is?(:IPV6, :RIGHTS) }.should raise_error(SocketError)
+        -> { @data.cmsg_is?(:IPV6, :RIGHTS) }.should.raise(SocketError)
       end
     end
   end
diff --git a/spec/ruby/library/socket/ancillarydata/initialize_spec.rb b/spec/ruby/library/socket/ancillarydata/initialize_spec.rb
index eca45599d77..60f5ac7a905 100644
--- a/spec/ruby/library/socket/ancillarydata/initialize_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/initialize_spec.rb
@@ -115,25 +115,25 @@
       it 'raises TypeError when using a numeric string as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :IGMP, Socket::SCM_RIGHTS.to_s, '')
-        }.should raise_error(TypeError)
+        }.should.raise(TypeError)
       end
 
       it 'raises SocketError when using :RECVTTL as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :SOCKET, :RECVTTL, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
 
       it 'raises SocketError when using :MOO as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :SOCKET, :MOO, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
 
       it 'raises SocketError when using :IP_RECVTTL as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :SOCKET, :IP_RECVTTL, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -157,13 +157,13 @@
       it 'raises SocketError when using :RIGHTS as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :IP, :RIGHTS, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
 
       it 'raises SocketError when using :MOO as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :IP, :MOO, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -181,13 +181,13 @@
       it 'raises SocketError when using :RIGHTS as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :IPV6, :RIGHTS, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
 
       it 'raises SocketError when using :MOO as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :IPV6, :MOO, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -207,13 +207,13 @@
       it 'raises SocketError when using :RIGHTS as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :TCP, :RIGHTS, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
 
       it 'raises SocketError when using :MOO as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :TCP, :MOO, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -227,13 +227,13 @@
       it 'raises SocketError when using :RIGHTS as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :UDP, :RIGHTS, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
 
       it 'raises SocketError when using :MOO as the type argument' do
         -> {
           Socket::AncillaryData.new(:INET, :UDP, :MOO, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -245,7 +245,7 @@
       it 'raises SocketError when using :CORK sa the type argument' do
         -> {
           Socket::AncillaryData.new(:UNIX, :SOCKET, :CORK, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -253,7 +253,7 @@
       it 'raises SocketError' do
         -> {
           Socket::AncillaryData.new(:UNIX, :IP, :RECVTTL, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -261,7 +261,7 @@
       it 'raises SocketError' do
         -> {
           Socket::AncillaryData.new(:UNIX, :IPV6, :NEXTHOP, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -269,7 +269,7 @@
       it 'raises SocketError' do
         -> {
           Socket::AncillaryData.new(:UNIX, :TCP, :CORK, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
 
@@ -277,7 +277,7 @@
       it 'raises SocketError' do
         -> {
           Socket::AncillaryData.new(:UNIX, :UDP, :CORK, '')
-        }.should raise_error(SocketError)
+        }.should.raise(SocketError)
       end
     end
   end
diff --git a/spec/ruby/library/socket/ancillarydata/int_spec.rb b/spec/ruby/library/socket/ancillarydata/int_spec.rb
index fe41a30a1a0..10c5dea436b 100644
--- a/spec/ruby/library/socket/ancillarydata/int_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/int_spec.rb
@@ -7,7 +7,7 @@
     end
 
     it 'returns a Socket::AncillaryData' do
-      @data.should be_an_instance_of(Socket::AncillaryData)
+      @data.should.instance_of?(Socket::AncillaryData)
     end
 
     it 'sets the family to AF_INET' do
@@ -37,7 +37,7 @@
     it 'raises when the data is not an Integer' do
       data = Socket::AncillaryData.new(:UNIX, :SOCKET, :RIGHTS, 'ugh')
 
-      -> { data.int }.should raise_error(TypeError)
+      -> { data.int }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/ancillarydata/ip_pktinfo_spec.rb b/spec/ruby/library/socket/ancillarydata/ip_pktinfo_spec.rb
index 84910a038a3..065bcf1f39b 100644
--- a/spec/ruby/library/socket/ancillarydata/ip_pktinfo_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/ip_pktinfo_spec.rb
@@ -8,7 +8,7 @@
       end
 
       it 'returns a Socket::AncillaryData' do
-        @data.should be_an_instance_of(Socket::AncillaryData)
+        @data.should.instance_of?(Socket::AncillaryData)
       end
 
       it 'sets the family to AF_INET' do
@@ -32,7 +32,7 @@
       end
 
       it 'returns a Socket::AncillaryData' do
-        @data.should be_an_instance_of(Socket::AncillaryData)
+        @data.should.instance_of?(Socket::AncillaryData)
       end
 
       it 'sets the family to AF_INET' do
@@ -58,7 +58,7 @@
       end
 
       it 'returns an Array' do
-        @data.ip_pktinfo.should be_an_instance_of(Array)
+        @data.ip_pktinfo.should.instance_of?(Array)
       end
 
       describe 'the returned Array' do
@@ -67,15 +67,15 @@
         end
 
         it 'stores an Addrinfo at index 0' do
-          @info[0].should be_an_instance_of(Addrinfo)
+          @info[0].should.instance_of?(Addrinfo)
         end
 
         it 'stores the ifindex at index 1' do
-          @info[1].should be_kind_of(Integer)
+          @info[1].should.is_a?(Integer)
         end
 
         it 'stores an Addrinfo at index 2' do
-          @info[2].should be_an_instance_of(Addrinfo)
+          @info[2].should.instance_of?(Addrinfo)
         end
       end
 
@@ -89,7 +89,7 @@
         end
 
         it 'is not the same object as the input Addrinfo' do
-          @addr.should_not equal @source
+          @addr.should_not.equal? @source
         end
       end
 
@@ -109,7 +109,7 @@
         end
 
         it 'is not the same object as the input Addrinfo' do
-          @addr.should_not equal @dest
+          @addr.should_not.equal? @dest
         end
       end
     end
diff --git a/spec/ruby/library/socket/ancillarydata/ipv6_pktinfo_addr_spec.rb b/spec/ruby/library/socket/ancillarydata/ipv6_pktinfo_addr_spec.rb
index f70fe27d6a6..7c630218d1f 100644
--- a/spec/ruby/library/socket/ancillarydata/ipv6_pktinfo_addr_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/ipv6_pktinfo_addr_spec.rb
@@ -5,7 +5,7 @@
     it 'returns an Addrinfo' do
       data = Socket::AncillaryData.ipv6_pktinfo(Addrinfo.ip('::1'), 4)
 
-      data.ipv6_pktinfo_addr.should be_an_instance_of(Addrinfo)
+      data.ipv6_pktinfo_addr.should.instance_of?(Addrinfo)
     end
   end
 end
diff --git a/spec/ruby/library/socket/ancillarydata/ipv6_pktinfo_spec.rb b/spec/ruby/library/socket/ancillarydata/ipv6_pktinfo_spec.rb
index 0fffc720dcd..b5b779c36e5 100644
--- a/spec/ruby/library/socket/ancillarydata/ipv6_pktinfo_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/ipv6_pktinfo_spec.rb
@@ -7,7 +7,7 @@
     end
 
     it 'returns a Socket::AncillaryData' do
-      @data.should be_an_instance_of(Socket::AncillaryData)
+      @data.should.instance_of?(Socket::AncillaryData)
     end
 
     it 'sets the family to AF_INET' do
@@ -31,7 +31,7 @@
       end
 
       it 'returns an Array' do
-        @data.ipv6_pktinfo.should be_an_instance_of(Array)
+        @data.ipv6_pktinfo.should.instance_of?(Array)
       end
 
       describe 'the returned Array' do
@@ -40,11 +40,11 @@
         end
 
         it 'stores an Addrinfo at index 0' do
-          @info[0].should be_an_instance_of(Addrinfo)
+          @info[0].should.instance_of?(Addrinfo)
         end
 
         it 'stores the ifindex at index 1' do
-          @info[1].should be_kind_of(Integer)
+          @info[1].should.is_a?(Integer)
         end
       end
 
@@ -58,7 +58,7 @@
         end
 
         it 'is not the same object as the input Addrinfo' do
-          @addr.should_not equal @source
+          @addr.should_not.equal? @source
         end
       end
 
diff --git a/spec/ruby/library/socket/ancillarydata/unix_rights_spec.rb b/spec/ruby/library/socket/ancillarydata/unix_rights_spec.rb
index 95052fd91c2..6dd144ba5ab 100644
--- a/spec/ruby/library/socket/ancillarydata/unix_rights_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/unix_rights_spec.rb
@@ -26,7 +26,7 @@
 
     describe 'using non IO objects' do
       it 'raises TypeError' do
-        -> { Socket::AncillaryData.unix_rights(10) }.should raise_error(TypeError)
+        -> { Socket::AncillaryData.unix_rights(10) }.should.raise(TypeError)
       end
     end
   end
@@ -41,20 +41,20 @@
     it 'returns nil when the data is not a list of file descriptors' do
       data = Socket::AncillaryData.new(:UNIX, :SOCKET, :RIGHTS, '')
 
-      data.unix_rights.should be_nil
+      data.unix_rights.should == nil
     end
 
     it 'raises TypeError when the level is not SOL_SOCKET' do
       data = Socket::AncillaryData.new(:INET, :IP, :RECVTTL, '')
 
-      -> { data.unix_rights }.should raise_error(TypeError)
+      -> { data.unix_rights }.should.raise(TypeError)
     end
 
     platform_is_not :aix do
       it 'raises TypeError when the type is not SCM_RIGHTS' do
         data = Socket::AncillaryData.new(:INET, :SOCKET, :TIMESTAMP, '')
 
-        -> { data.unix_rights }.should raise_error(TypeError)
+        -> { data.unix_rights }.should.raise(TypeError)
       end
     end
   end
diff --git a/spec/ruby/library/socket/basicsocket/close_read_spec.rb b/spec/ruby/library/socket/basicsocket/close_read_spec.rb
index f317b349553..35bec203d7a 100644
--- a/spec/ruby/library/socket/basicsocket/close_read_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/close_read_spec.rb
@@ -12,32 +12,32 @@
 
   it "closes the reading end of the socket" do
     @server.close_read
-    -> { @server.read }.should raise_error(IOError)
+    -> { @server.read }.should.raise(IOError)
   end
 
   it 'does not raise when called on a socket already closed for reading' do
     @server.close_read
     @server.close_read
-    -> { @server.read }.should raise_error(IOError)
+    -> { @server.read }.should.raise(IOError)
   end
 
   it 'does not fully close the socket' do
     @server.close_read
-    @server.closed?.should be_false
+    @server.closed?.should == false
   end
 
   it "fully closes the socket if it was already closed for writing" do
     @server.close_write
     @server.close_read
-    @server.closed?.should be_true
+    @server.closed?.should == true
   end
 
   it 'raises IOError when called on a fully closed socket' do
     @server.close
-    -> { @server.close_read }.should raise_error(IOError)
+    -> { @server.close_read }.should.raise(IOError)
   end
 
   it "returns nil" do
-    @server.close_read.should be_nil
+    @server.close_read.should == nil
   end
 end
diff --git a/spec/ruby/library/socket/basicsocket/close_write_spec.rb b/spec/ruby/library/socket/basicsocket/close_write_spec.rb
index 232cfbb7c67..c1b6d9e9ef2 100644
--- a/spec/ruby/library/socket/basicsocket/close_write_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/close_write_spec.rb
@@ -12,18 +12,18 @@
 
   it "closes the writing end of the socket" do
     @server.close_write
-    -> { @server.write("foo") }.should raise_error(IOError)
+    -> { @server.write("foo") }.should.raise(IOError)
   end
 
   it 'does not raise when called on a socket already closed for writing' do
     @server.close_write
     @server.close_write
-    -> { @server.write("foo") }.should raise_error(IOError)
+    -> { @server.write("foo") }.should.raise(IOError)
   end
 
   it 'does not fully close the socket' do
     @server.close_write
-    @server.closed?.should be_false
+    @server.closed?.should == false
   end
 
   it "does not prevent reading" do
@@ -34,15 +34,15 @@
   it "fully closes the socket if it was already closed for reading" do
     @server.close_read
     @server.close_write
-    @server.closed?.should be_true
+    @server.closed?.should == true
   end
 
   it 'raises IOError when called on a fully closed socket' do
     @server.close
-    -> { @server.close_write }.should raise_error(IOError)
+    -> { @server.close_write }.should.raise(IOError)
   end
 
   it "returns nil" do
-    @server.close_write.should be_nil
+    @server.close_write.should == nil
   end
 end
diff --git a/spec/ruby/library/socket/basicsocket/connect_address_spec.rb b/spec/ruby/library/socket/basicsocket/connect_address_spec.rb
index 2e318fcb851..e330b6e1bef 100644
--- a/spec/ruby/library/socket/basicsocket/connect_address_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/connect_address_spec.rb
@@ -10,7 +10,7 @@
     it 'raises SocketError' do
       @sock = Socket.new(:INET, :STREAM)
 
-      -> { @sock.connect_address }.should raise_error(SocketError)
+      -> { @sock.connect_address }.should.raise(SocketError)
     end
   end
 
@@ -25,7 +25,7 @@
     end
 
     it 'returns an Addrinfo' do
-      @sock.connect_address.should be_an_instance_of(Addrinfo)
+      @sock.connect_address.should.instance_of?(Addrinfo)
     end
 
     it 'uses 127.0.0.1 as the IP address' do
@@ -65,7 +65,7 @@
       end
 
       it 'returns an Addrinfo' do
-        @sock.connect_address.should be_an_instance_of(Addrinfo)
+        @sock.connect_address.should.instance_of?(Addrinfo)
       end
 
       it 'uses ::1 as the IP address' do
@@ -109,7 +109,7 @@
       end
 
       it 'raises SocketError' do
-        -> { @client.connect_address }.should raise_error(SocketError)
+        -> { @client.connect_address }.should.raise(SocketError)
       end
     end
   end
@@ -126,7 +126,7 @@
     end
 
     it 'returns an Addrinfo' do
-      @sock.connect_address.should be_an_instance_of(Addrinfo)
+      @sock.connect_address.should.instance_of?(Addrinfo)
     end
 
     it 'uses the correct socket path' do
diff --git a/spec/ruby/library/socket/basicsocket/do_not_reverse_lookup_spec.rb b/spec/ruby/library/socket/basicsocket/do_not_reverse_lookup_spec.rb
index a8800a84932..36338bfd594 100644
--- a/spec/ruby/library/socket/basicsocket/do_not_reverse_lookup_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/do_not_reverse_lookup_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it "defaults to true" do
-    BasicSocket.do_not_reverse_lookup.should be_true
+    BasicSocket.do_not_reverse_lookup.should == true
   end
 
   it "causes 'peeraddr' to avoid name lookups" do
diff --git a/spec/ruby/library/socket/basicsocket/for_fd_spec.rb b/spec/ruby/library/socket/basicsocket/for_fd_spec.rb
index 9c9e6a8b550..8d5b71cfa9b 100644
--- a/spec/ruby/library/socket/basicsocket/for_fd_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/for_fd_spec.rb
@@ -15,7 +15,7 @@
   it "return a Socket instance wrapped around the descriptor" do
     @s2 = TCPServer.for_fd(@server.fileno)
     @s2.autoclose = false
-    @s2.should be_kind_of(TCPServer)
+    @s2.should.is_a?(TCPServer)
     @s2.fileno.should == @server.fileno
   end
 
@@ -24,7 +24,7 @@
     socket2 = Socket.for_fd(@socket1.fileno)
     socket2.autoclose = false
 
-    socket2.should be_an_instance_of(Socket)
+    socket2.should.instance_of?(Socket)
     socket2.fileno.should == @socket1.fileno
   end
 
@@ -33,6 +33,6 @@
     socket2 = Socket.for_fd(@socket1.fileno)
     socket2.autoclose = false
 
-    socket2.binmode?.should be_true
+    socket2.binmode?.should == true
   end
 end
diff --git a/spec/ruby/library/socket/basicsocket/getpeereid_spec.rb b/spec/ruby/library/socket/basicsocket/getpeereid_spec.rb
index 2e03cd3684b..b9851bae153 100644
--- a/spec/ruby/library/socket/basicsocket/getpeereid_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/getpeereid_spec.rb
@@ -30,7 +30,7 @@
 
     it 'raises NoMethodError' do
       @sock = TCPServer.new('127.0.0.1', 0)
-      -> { @sock.getpeereid }.should raise_error(NoMethodError)
+      -> { @sock.getpeereid }.should.raise(NoMethodError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/basicsocket/getpeername_spec.rb b/spec/ruby/library/socket/basicsocket/getpeername_spec.rb
index 0b93f02eefc..7e2f6f2e7b6 100644
--- a/spec/ruby/library/socket/basicsocket/getpeername_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/getpeername_spec.rb
@@ -20,6 +20,6 @@
   end
 
   it 'raises Errno::ENOTCONN for a disconnected socket' do
-    -> { @server.getpeername }.should raise_error(Errno::ENOTCONN)
+    -> { @server.getpeername }.should.raise(Errno::ENOTCONN)
   end
 end
diff --git a/spec/ruby/library/socket/basicsocket/getsockname_spec.rb b/spec/ruby/library/socket/basicsocket/getsockname_spec.rb
index b33db088b6d..a54626647e6 100644
--- a/spec/ruby/library/socket/basicsocket/getsockname_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/getsockname_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Socket::BasicSocket#getsockname" do
   after :each do
-    @socket.closed?.should be_false
+    @socket.closed?.should == false
     @socket.close
   end
 
@@ -16,7 +16,7 @@
   it "works on sockets listening in ipaddr_any" do
     @socket = TCPServer.new(0)
     sockaddr = Socket.unpack_sockaddr_in(@socket.getsockname)
-    ["::", "0.0.0.0", "::ffff:0.0.0.0"].include?(sockaddr[1]).should be_true
+    ["::", "0.0.0.0", "::ffff:0.0.0.0"].include?(sockaddr[1]).should == true
     sockaddr[0].should == @socket.addr[1]
   end
 
diff --git a/spec/ruby/library/socket/basicsocket/getsockopt_spec.rb b/spec/ruby/library/socket/basicsocket/getsockopt_spec.rb
index ce65d6c92bf..744297ad023 100644
--- a/spec/ruby/library/socket/basicsocket/getsockopt_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/getsockopt_spec.rb
@@ -7,7 +7,7 @@
   end
 
   after :each do
-    @sock.closed?.should be_false
+    @sock.closed?.should == false
     @sock.close
   end
 
@@ -41,13 +41,13 @@
   end
 
   it "raises a SystemCallError with an invalid socket option" do
-    -> { @sock.getsockopt Socket::SOL_SOCKET, -1 }.should raise_error(Errno::ENOPROTOOPT)
+    -> { @sock.getsockopt Socket::SOL_SOCKET, -1 }.should.raise(Errno::ENOPROTOOPT)
   end
 
   it 'returns a Socket::Option using a constant' do
     opt = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE)
 
-    opt.should be_an_instance_of(Socket::Option)
+    opt.should.instance_of?(Socket::Option)
   end
 
   it 'returns a Socket::Option for a boolean option' do
@@ -59,7 +59,7 @@
   it 'returns a Socket::Option for a numeric option' do
     opt = @sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL)
 
-    opt.int.should be_kind_of(Integer)
+    opt.int.should.is_a?(Integer)
   end
 
   it 'returns a Socket::Option for a struct option' do
@@ -69,7 +69,7 @@
   end
 
   it 'raises Errno::ENOPROTOOPT when requesting an invalid option' do
-    -> { @sock.getsockopt(Socket::SOL_SOCKET, -1) }.should raise_error(Errno::ENOPROTOOPT)
+    -> { @sock.getsockopt(Socket::SOL_SOCKET, -1) }.should.raise(Errno::ENOPROTOOPT)
   end
 
   describe 'using Symbols as arguments' do
@@ -171,7 +171,7 @@
       opt   = @sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL).to_s
       array = opt.unpack('i')
 
-      array[0].should be_kind_of(Integer)
+      array[0].should.is_a?(Integer)
       array[0].should > 0
     end
 
diff --git a/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb b/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
index f2383513f28..8aca7d03323 100644
--- a/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
@@ -16,7 +16,7 @@
     platform_is_not :windows do
       describe 'using an unbound socket' do
         it 'raises an exception extending IO::WaitReadable' do
-          -> { @s1.recv_nonblock(1) }.should raise_error(IO::WaitReadable)
+          -> { @s1.recv_nonblock(1) }.should.raise(IO::WaitReadable)
         end
       end
     end
@@ -25,12 +25,12 @@
       @s1.bind(Socket.pack_sockaddr_in(0, ip_address))
       -> {
         @s1.recv_nonblock(5)
-      }.should raise_error(IO::WaitReadable) { |e|
+      }.should.raise(IO::WaitReadable) { |e|
         platform_is_not :windows do
-          e.should be_kind_of(Errno::EAGAIN)
+          e.should.is_a?(Errno::EAGAIN)
         end
         platform_is :windows do
-          e.should be_kind_of(Errno::EWOULDBLOCK)
+          e.should.is_a?(Errno::EWOULDBLOCK)
         end
       }
     end
@@ -74,7 +74,7 @@
       @s1.recv_nonblock(1).should == "a"
       -> {
         @s1.recv_nonblock(5)
-      }.should raise_error(IO::WaitReadable)
+      }.should.raise(IO::WaitReadable)
     end
   end
 
@@ -89,10 +89,10 @@
       end
 
       it "raises Errno::ENOTCONN" do
-        -> { @server.recv_nonblock(1) }.should raise_error { |e|
+        -> { @server.recv_nonblock(1) }.should.raise { |e|
           [Errno::ENOTCONN, Errno::EINVAL].should.include?(e.class)
         }
-        -> { @server.recv_nonblock(1, exception: false) }.should raise_error { |e|
+        -> { @server.recv_nonblock(1, exception: false) }.should.raise { |e|
           [Errno::ENOTCONN, Errno::EINVAL].should.include?(e.class)
         }
       end
@@ -129,13 +129,13 @@
         end
 
         Thread.pass while t.status and t.status != "sleep"
-        t.status.should_not be_nil
+        t.status.should_not == nil
 
         socket = TCPSocket.new('127.0.0.1', @port)
         socket.close
         ready = true
 
-        t.value.should be_nil
+        t.value.should == nil
       end
     end
   end
diff --git a/spec/ruby/library/socket/basicsocket/recv_spec.rb b/spec/ruby/library/socket/basicsocket/recv_spec.rb
index 7581f1bc153..5c393218bc6 100644
--- a/spec/ruby/library/socket/basicsocket/recv_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recv_spec.rb
@@ -22,7 +22,7 @@
       client.close
     end
     Thread.pass while t.status and t.status != "sleep"
-    t.status.should_not be_nil
+    t.status.should_not == nil
 
     socket = TCPSocket.new('127.0.0.1', @port)
     socket.send('hello', 0)
@@ -44,7 +44,7 @@
       client.close
     end
     Thread.pass while t.status and t.status != "sleep"
-    t.status.should_not be_nil
+    t.status.should_not == nil
 
     socket = TCPSocket.new('127.0.0.1', @port)
     socket.send('helloU', Socket::MSG_OOB)
@@ -64,7 +64,7 @@
       client.close
     end
     Thread.pass while t.status and t.status != "sleep"
-    t.status.should_not be_nil
+    t.status.should_not == nil
 
     socket = TCPSocket.new('127.0.0.1', @port)
     socket.write("firstline\377secondline\377")
@@ -193,12 +193,12 @@
         end
 
         Thread.pass while t.status and t.status != "sleep"
-        t.status.should_not be_nil
+        t.status.should_not == nil
 
         socket = TCPSocket.new('127.0.0.1', @port)
         socket.close
 
-        t.value.should be_nil
+        t.value.should == nil
       end
     end
 
diff --git a/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb b/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
index d1cde4411bd..9d77f5df6b4 100644
--- a/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
@@ -17,7 +17,7 @@
       platform_is_not :windows do
         describe 'using an unbound socket' do
           it 'raises an exception extending IO::WaitReadable' do
-            -> { @server.recvmsg_nonblock }.should raise_error(IO::WaitReadable)
+            -> { @server.recvmsg_nonblock }.should.raise(IO::WaitReadable)
           end
         end
       end
@@ -29,7 +29,7 @@
 
         describe 'without any data available' do
           it 'raises an exception extending IO::WaitReadable' do
-            -> { @server.recvmsg_nonblock }.should raise_error(IO::WaitReadable)
+            -> { @server.recvmsg_nonblock }.should.raise(IO::WaitReadable)
           end
 
           it 'returns :wait_readable with exception: false' do
@@ -47,7 +47,7 @@
           end
 
           it 'returns an Array containing the data, an Addrinfo and the flags' do
-            @server.recvmsg_nonblock.should be_an_instance_of(Array)
+            @server.recvmsg_nonblock.should.instance_of?(Array)
           end
 
           describe 'without a maximum message length' do
@@ -74,12 +74,12 @@
             end
 
             it 'stores an Addrinfo at index 1' do
-              @array[1].should be_an_instance_of(Addrinfo)
+              @array[1].should.instance_of?(Addrinfo)
             end
 
             platform_is_not :windows do
               it 'stores the flags at index 2' do
-                @array[2].should be_kind_of(Integer)
+                @array[2].should.is_a?(Integer)
               end
             end
 
@@ -124,8 +124,8 @@
         end
 
         it "raises Errno::ENOTCONN" do
-          -> { @server.recvmsg_nonblock }.should raise_error(Errno::ENOTCONN)
-          -> { @server.recvmsg_nonblock(exception: false) }.should raise_error(Errno::ENOTCONN)
+          -> { @server.recvmsg_nonblock }.should.raise(Errno::ENOTCONN)
+          -> { @server.recvmsg_nonblock(exception: false) }.should.raise(Errno::ENOTCONN)
         end
       end
 
@@ -154,7 +154,7 @@
               ensure
                 socket.close
               end
-            }.should raise_error(IO::WaitReadable)
+            }.should.raise(IO::WaitReadable)
           end
         end
 
@@ -171,7 +171,7 @@
           end
 
           it 'returns an Array containing the data, an Addrinfo and the flags' do
-            @socket.recvmsg_nonblock.should be_an_instance_of(Array)
+            @socket.recvmsg_nonblock.should.instance_of?(Array)
           end
 
           describe 'the returned Array' do
@@ -184,11 +184,11 @@
             end
 
             it 'stores an Addrinfo at index 1' do
-              @array[1].should be_an_instance_of(Addrinfo)
+              @array[1].should.instance_of?(Addrinfo)
             end
 
             it 'stores the flags at index 2' do
-              @array[2].should be_kind_of(Integer)
+              @array[2].should.is_a?(Integer)
             end
 
             describe 'the returned Addrinfo' do
@@ -197,7 +197,7 @@
               end
 
               it 'raises when receiving the ip_address message' do
-                -> { @addr.ip_address }.should raise_error(SocketError)
+                -> { @addr.ip_address }.should.raise(SocketError)
               end
 
               it 'uses the correct address family' do
@@ -213,7 +213,7 @@
               end
 
               it 'raises when receiving the ip_port message' do
-                -> { @addr.ip_port }.should raise_error(SocketError)
+                -> { @addr.ip_port }.should.raise(SocketError)
               end
             end
           end
@@ -253,13 +253,13 @@
           end
 
           Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+          t.status.should_not == nil
 
           socket = TCPSocket.new('127.0.0.1', @port)
           socket.close
           ready = true
 
-          t.value.should be_nil
+          t.value.should == nil
         end
       end
     end
diff --git a/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb b/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
index cfa0f4c61d4..eabfb9dd180 100644
--- a/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
@@ -41,7 +41,7 @@
           end
 
           it 'returns an Array containing the data, an Addrinfo and the flags' do
-            @server.recvmsg.should be_an_instance_of(Array)
+            @server.recvmsg.should.instance_of?(Array)
           end
 
           describe 'without a maximum message length' do
@@ -66,12 +66,12 @@
             end
 
             it 'stores an Addrinfo at index 1' do
-              @array[1].should be_an_instance_of(Addrinfo)
+              @array[1].should.instance_of?(Addrinfo)
             end
 
             platform_is_not :windows do
               it 'stores the flags at index 2' do
-                @array[2].should be_kind_of(Integer)
+                @array[2].should.is_a?(Integer)
               end
             end
 
@@ -144,7 +144,7 @@
           end
 
           it 'returns an Array containing the data, an Addrinfo and the flags' do
-            @socket.recvmsg.should be_an_instance_of(Array)
+            @socket.recvmsg.should.instance_of?(Array)
           end
 
           describe 'the returned Array' do
@@ -157,11 +157,11 @@
             end
 
             it 'stores an Addrinfo at index 1' do
-              @array[1].should be_an_instance_of(Addrinfo)
+              @array[1].should.instance_of?(Addrinfo)
             end
 
             it 'stores the flags at index 2' do
-              @array[2].should be_kind_of(Integer)
+              @array[2].should.is_a?(Integer)
             end
 
             describe 'the returned Addrinfo' do
@@ -170,7 +170,7 @@
               end
 
               it 'raises when receiving the ip_address message' do
-                -> { @addr.ip_address }.should raise_error(SocketError)
+                -> { @addr.ip_address }.should.raise(SocketError)
               end
 
               it 'uses the correct address family' do
@@ -186,7 +186,7 @@
               end
 
               it 'raises when receiving the ip_port message' do
-                -> { @addr.ip_port }.should raise_error(SocketError)
+                -> { @addr.ip_port }.should.raise(SocketError)
               end
             end
           end
@@ -218,12 +218,12 @@
           end
 
           Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+          t.status.should_not == nil
 
           socket = TCPSocket.new('127.0.0.1', @port)
           socket.close
 
-          t.value.should be_nil
+          t.value.should == nil
         end
       end
     end
diff --git a/spec/ruby/library/socket/basicsocket/send_spec.rb b/spec/ruby/library/socket/basicsocket/send_spec.rb
index 25ba3f5655d..a2c2ee8de98 100644
--- a/spec/ruby/library/socket/basicsocket/send_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/send_spec.rb
@@ -9,8 +9,8 @@
   end
 
   after :each do
-    @server.closed?.should be_false
-    @socket.closed?.should be_false
+    @server.closed?.should == false
+    @socket.closed?.should == false
 
     @server.close
     @socket.close
@@ -28,7 +28,7 @@
       client.close
     end
     Thread.pass while t.status and t.status != "sleep"
-    t.status.should_not be_nil
+    t.status.should_not == nil
 
     @socket.send('hello', 0).should == 5
     @socket.shutdown(1) # indicate, that we are done sending
@@ -50,7 +50,7 @@
         client.close
       end
       Thread.pass while t.status and t.status != "sleep"
-      t.status.should_not be_nil
+      t.status.should_not == nil
 
       @socket.send('helloU', Socket::MSG_PEEK | Socket::MSG_OOB).should == 6
       @socket.shutdown # indicate, that we are done sending
@@ -73,7 +73,7 @@
       client.close
     end
     Thread.pass while t.status and t.status != "sleep"
-    t.status.should_not be_nil
+    t.status.should_not == nil
 
     sockaddr = Socket.pack_sockaddr_in(@port, "127.0.0.1")
     @socket.send('hello', 0, sockaddr).should == 5
@@ -109,7 +109,7 @@
 
       describe 'without a destination address' do
         it "raises #{SocketSpecs.dest_addr_req_error}" do
-          -> { @client.send('hello', 0) }.should raise_error(SocketSpecs.dest_addr_req_error)
+          -> { @client.send('hello', 0) }.should.raise(SocketSpecs.dest_addr_req_error)
         end
       end
 
@@ -121,7 +121,7 @@
         it 'does not persist the connection after writing to the socket' do
           @client.send('hello', 0, @server.getsockname)
 
-          -> { @client.send('hello', 0) }.should raise_error(SocketSpecs.dest_addr_req_error)
+          -> { @client.send('hello', 0) }.should.raise(SocketSpecs.dest_addr_req_error)
         end
       end
 
diff --git a/spec/ruby/library/socket/basicsocket/sendmsg_nonblock_spec.rb b/spec/ruby/library/socket/basicsocket/sendmsg_nonblock_spec.rb
index 7acfc659bd9..4cd6e8bdca5 100644
--- a/spec/ruby/library/socket/basicsocket/sendmsg_nonblock_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/sendmsg_nonblock_spec.rb
@@ -20,10 +20,10 @@
         it "raises #{SocketSpecs.dest_addr_req_error}" do
           -> {
             @client.sendmsg_nonblock('hello')
-          }.should raise_error(SocketSpecs.dest_addr_req_error)
+          }.should.raise(SocketSpecs.dest_addr_req_error)
           -> {
             @client.sendmsg_nonblock('hello', exception: false)
-          }.should raise_error(SocketSpecs.dest_addr_req_error)
+          }.should.raise(SocketSpecs.dest_addr_req_error)
         end
       end
 
@@ -101,7 +101,7 @@
         it 'raises IO::WaitWritable when the underlying buffer is full' do
           -> {
             10.times { @client.sendmsg_nonblock('hello' * 1_000_000) }
-          }.should raise_error(IO::WaitWritable)
+          }.should.raise(IO::WaitWritable)
         end
 
         it 'returns :wait_writable when the underlying buffer is full with exception: false' do
diff --git a/spec/ruby/library/socket/basicsocket/sendmsg_spec.rb b/spec/ruby/library/socket/basicsocket/sendmsg_spec.rb
index 7ff336c0b70..dc999b32df5 100644
--- a/spec/ruby/library/socket/basicsocket/sendmsg_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/sendmsg_spec.rb
@@ -19,7 +19,7 @@
       platform_is_not :windows do
         describe 'without a destination address' do
           it "raises #{SocketSpecs.dest_addr_req_error}" do
-            -> { @client.sendmsg('hello') }.should raise_error(SocketSpecs.dest_addr_req_error)
+            -> { @client.sendmsg('hello') }.should.raise(SocketSpecs.dest_addr_req_error)
           end
         end
       end
diff --git a/spec/ruby/library/socket/basicsocket/setsockopt_spec.rb b/spec/ruby/library/socket/basicsocket/setsockopt_spec.rb
index f686e673263..e306581aa36 100644
--- a/spec/ruby/library/socket/basicsocket/setsockopt_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/setsockopt_spec.rb
@@ -40,7 +40,7 @@
     it "raises EINVAL if passed wrong linger value" do
       -> do
         @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, 0)
-      end.should raise_error(Errno::EINVAL)
+      end.should.raise(Errno::EINVAL)
     end
   end
 
@@ -72,7 +72,7 @@
       platform_is_not :windows do
         -> {
           @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, "")
-        }.should raise_error(SystemCallError)
+        }.should.raise(SystemCallError)
       end
 
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, "blah").should == 0
@@ -82,7 +82,7 @@
       platform_is_not :windows do
         -> {
           @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, "0")
-        }.should raise_error(SystemCallError)
+        }.should.raise(SystemCallError)
       end
 
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, "\x00\x00\x00\x00").should == 0
@@ -92,13 +92,13 @@
       platform_is_not :windows do
         -> {
           @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, "1")
-        }.should raise_error(SystemCallError)
+        }.should.raise(SystemCallError)
       end
 
       platform_is_not :windows do
         -> {
           @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, "\x00\x00\x00")
-        }.should raise_error(SystemCallError)
+        }.should.raise(SystemCallError)
       end
 
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, [1].pack('i')).should == 0
@@ -127,7 +127,7 @@
 
     -> {
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, nil).should == 0
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, 1).should == 0
     n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
@@ -139,23 +139,23 @@
 
     -> {
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, "")
-    }.should raise_error(SystemCallError)
+    }.should.raise(SystemCallError)
 
     -> {
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, "bla")
-    }.should raise_error(SystemCallError)
+    }.should.raise(SystemCallError)
 
     -> {
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, "0")
-    }.should raise_error(SystemCallError)
+    }.should.raise(SystemCallError)
 
     -> {
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, "1")
-    }.should raise_error(SystemCallError)
+    }.should.raise(SystemCallError)
 
     -> {
       @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, "\x00\x00\x00")
-    }.should raise_error(SystemCallError)
+    }.should.raise(SystemCallError)
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, "\x00\x00\x01\x00").should == 0
     n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
@@ -207,7 +207,7 @@
       onoff, seconds = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER).linger
       seconds.should == 10
       # Both results can be produced depending on the OS and value of Socket::SO_LINGER
-      [true, Socket::SO_LINGER].should include(onoff)
+      [true, Socket::SO_LINGER].should.include?(onoff)
     end
   end
 end
@@ -224,7 +224,7 @@
 
     describe 'using separate arguments with Symbols' do
       it 'raises TypeError when the first argument is nil' do
-        -> { @socket.setsockopt(nil, :REUSEADDR, true) }.should raise_error(TypeError)
+        -> { @socket.setsockopt(nil, :REUSEADDR, true) }.should.raise(TypeError)
       end
 
       it 'sets a boolean option' do
@@ -251,7 +251,7 @@
 
       platform_is_not :windows do
         it 'raises Errno::EINVAL when setting an invalid option value' do
-          -> { @socket.setsockopt(:SOCKET, :OOBINLINE, 'bla') }.should raise_error(Errno::EINVAL)
+          -> { @socket.setsockopt(:SOCKET, :OOBINLINE, 'bla') }.should.raise(Errno::EINVAL)
         end
       end
     end
@@ -305,12 +305,12 @@
 
       it 'raises ArgumentError when passing 2 arguments' do
         option = Socket::Option.bool(:INET, :SOCKET, :REUSEADDR, true)
-        -> { @socket.setsockopt(option, :REUSEADDR) }.should raise_error(ArgumentError)
+        -> { @socket.setsockopt(option, :REUSEADDR) }.should.raise(ArgumentError)
       end
 
       it 'raises TypeError when passing 3 arguments' do
         option = Socket::Option.bool(:INET, :SOCKET, :REUSEADDR, true)
-        -> { @socket.setsockopt(option, :REUSEADDR, true) }.should raise_error(TypeError)
+        -> { @socket.setsockopt(option, :REUSEADDR, true) }.should.raise(TypeError)
       end
     end
   end
diff --git a/spec/ruby/library/socket/basicsocket/shutdown_spec.rb b/spec/ruby/library/socket/basicsocket/shutdown_spec.rb
index c78b32de38c..c96c62abe1f 100644
--- a/spec/ruby/library/socket/basicsocket/shutdown_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/shutdown_spec.rb
@@ -23,25 +23,25 @@
         it 'shuts down a socket for reading' do
           @client.shutdown(Socket::SHUT_RD)
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
         end
 
         it 'shuts down a socket for writing' do
           @client.shutdown(Socket::SHUT_WR)
 
-          -> { @client.write('hello') }.should raise_error(Errno::EPIPE)
+          -> { @client.write('hello') }.should.raise(Errno::EPIPE)
         end
 
         it 'shuts down a socket for reading and writing' do
           @client.shutdown(Socket::SHUT_RDWR)
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
 
-          -> { @client.write('hello') }.should raise_error(Errno::EPIPE)
+          -> { @client.write('hello') }.should.raise(Errno::EPIPE)
         end
 
         it 'raises ArgumentError when using an invalid option' do
-          -> { @server.shutdown(666) }.should raise_error(ArgumentError)
+          -> { @server.shutdown(666) }.should.raise(ArgumentError)
         end
       end
 
@@ -49,37 +49,37 @@
         it 'shuts down a socket for reading using :RD' do
           @client.shutdown(:RD)
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
         end
 
         it 'shuts down a socket for reading using :SHUT_RD' do
           @client.shutdown(:SHUT_RD)
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
         end
 
         it 'shuts down a socket for writing using :WR' do
           @client.shutdown(:WR)
 
-          -> { @client.write('hello') }.should raise_error(Errno::EPIPE)
+          -> { @client.write('hello') }.should.raise(Errno::EPIPE)
         end
 
         it 'shuts down a socket for writing using :SHUT_WR' do
           @client.shutdown(:SHUT_WR)
 
-          -> { @client.write('hello') }.should raise_error(Errno::EPIPE)
+          -> { @client.write('hello') }.should.raise(Errno::EPIPE)
         end
 
         it 'shuts down a socket for reading and writing' do
           @client.shutdown(:RDWR)
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
 
-          -> { @client.write('hello') }.should raise_error(Errno::EPIPE)
+          -> { @client.write('hello') }.should.raise(Errno::EPIPE)
         end
 
         it 'raises ArgumentError when using an invalid option' do
-          -> { @server.shutdown(:Nope) }.should raise_error(SocketError)
+          -> { @server.shutdown(:Nope) }.should.raise(SocketError)
         end
       end
 
@@ -87,29 +87,29 @@
         it 'shuts down a socket for reading using "RD"' do
           @client.shutdown('RD')
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
         end
 
         it 'shuts down a socket for reading using "SHUT_RD"' do
           @client.shutdown('SHUT_RD')
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
         end
 
         it 'shuts down a socket for writing using "WR"' do
           @client.shutdown('WR')
 
-          -> { @client.write('hello') }.should raise_error(Errno::EPIPE)
+          -> { @client.write('hello') }.should.raise(Errno::EPIPE)
         end
 
         it 'shuts down a socket for writing using "SHUT_WR"' do
           @client.shutdown('SHUT_WR')
 
-          -> { @client.write('hello') }.should raise_error(Errno::EPIPE)
+          -> { @client.write('hello') }.should.raise(Errno::EPIPE)
         end
 
         it 'raises ArgumentError when using an invalid option' do
-          -> { @server.shutdown('Nope') }.should raise_error(SocketError)
+          -> { @server.shutdown('Nope') }.should.raise(SocketError)
         end
       end
 
@@ -123,7 +123,7 @@
 
           @client.shutdown(@dummy)
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
         end
 
         it 'shuts down a socket for reading using "SHUT_RD"' do
@@ -131,7 +131,7 @@
 
           @client.shutdown(@dummy)
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
         end
 
         it 'shuts down a socket for reading and writing' do
@@ -139,15 +139,15 @@
 
           @client.shutdown(@dummy)
 
-          @client.recv(1).to_s.should be_empty
+          @client.recv(1).to_s.should.empty?
 
-          -> { @client.write('hello') }.should raise_error(Errno::EPIPE)
+          -> { @client.write('hello') }.should.raise(Errno::EPIPE)
         end
       end
 
       describe 'using an object that does not respond to #to_str' do
         it 'raises TypeError' do
-          -> { @server.shutdown(mock(:dummy)) }.should raise_error(TypeError)
+          -> { @server.shutdown(mock(:dummy)) }.should.raise(TypeError)
         end
       end
     end
diff --git a/spec/ruby/library/socket/constants/constants_spec.rb b/spec/ruby/library/socket/constants/constants_spec.rb
index b9a9d427253..a936473bb6c 100644
--- a/spec/ruby/library/socket/constants/constants_spec.rb
+++ b/spec/ruby/library/socket/constants/constants_spec.rb
@@ -5,47 +5,47 @@
   it "defines socket types" do
     consts = ["SOCK_DGRAM", "SOCK_RAW", "SOCK_RDM", "SOCK_SEQPACKET", "SOCK_STREAM"]
     consts.each do |c|
-      Socket::Constants.should have_constant(c)
+      Socket::Constants.should.const_defined?(c, false)
     end
   end
 
   it "defines protocol families" do
     consts = ["PF_INET6", "PF_INET", "PF_UNIX", "PF_UNSPEC"]
     consts.each do |c|
-      Socket::Constants.should have_constant(c)
+      Socket::Constants.should.const_defined?(c, false)
     end
   end
 
   platform_is_not :aix do
     it "defines PF_IPX protocol" do
-      Socket::Constants.should have_constant("PF_IPX")
+      Socket::Constants.should.const_defined?("PF_IPX", false)
     end
   end
 
   it "defines address families" do
     consts = ["AF_INET6", "AF_INET", "AF_UNIX", "AF_UNSPEC"]
     consts.each do |c|
-      Socket::Constants.should have_constant(c)
+      Socket::Constants.should.const_defined?(c, false)
     end
   end
 
   platform_is_not :aix do
     it "defines AF_IPX address" do
-      Socket::Constants.should have_constant("AF_IPX")
+      Socket::Constants.should.const_defined?("AF_IPX", false)
     end
   end
 
   it "defines send/receive options" do
     consts = ["MSG_DONTROUTE", "MSG_OOB", "MSG_PEEK"]
     consts.each do |c|
-      Socket::Constants.should have_constant(c)
+      Socket::Constants.should.const_defined?(c, false)
     end
   end
 
   it "defines socket level options" do
     consts = ["SOL_SOCKET"]
     consts.each do |c|
-      Socket::Constants.should have_constant(c)
+      Socket::Constants.should.const_defined?(c, false)
     end
   end
 
@@ -53,7 +53,7 @@
     consts = ["SO_BROADCAST", "SO_DEBUG", "SO_DONTROUTE", "SO_ERROR", "SO_KEEPALIVE", "SO_LINGER",
               "SO_OOBINLINE", "SO_RCVBUF", "SO_REUSEADDR", "SO_SNDBUF", "SO_TYPE"]
     consts.each do |c|
-      Socket::Constants.should have_constant(c)
+      Socket::Constants.should.const_defined?(c, false)
     end
   end
 
@@ -64,7 +64,7 @@
       consts += ["IP_DEFAULT_MULTICAST_LOOP", "IP_DEFAULT_MULTICAST_TTL"]
     end
     consts.each do |c|
-      Socket::Constants.should have_constant(c)
+      Socket::Constants.should.const_defined?(c, false)
     end
   end
 
@@ -72,7 +72,7 @@
     it "defines multicast options" do
       consts = ["IP_MAX_MEMBERSHIPS"]
       consts.each do |c|
-        Socket::Constants.should have_constant(c)
+        Socket::Constants.should.const_defined?(c, false)
       end
     end
   end
@@ -83,13 +83,13 @@
       consts << "TCP_MAXSEG"
     end
     consts.each do |c|
-      Socket::Constants.should have_constant(c)
+      Socket::Constants.should.const_defined?(c, false)
     end
   end
 
   platform_is_not :windows do
     it 'defines SCM options' do
-      Socket::Constants.should have_constant('SCM_RIGHTS')
+      Socket::Constants.should.const_defined?('SCM_RIGHTS', false)
     end
 
     it 'defines error options' do
@@ -101,7 +101,7 @@
       end
 
       consts.each do |c|
-        Socket::Constants.should have_constant(c)
+        Socket::Constants.should.const_defined?(c, false)
       end
     end
   end
diff --git a/spec/ruby/library/socket/ipsocket/addr_spec.rb b/spec/ruby/library/socket/ipsocket/addr_spec.rb
index 199eb85ab71..eb16a8efdfb 100644
--- a/spec/ruby/library/socket/ipsocket/addr_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/addr_spec.rb
@@ -17,7 +17,7 @@
     BasicSocket.do_not_reverse_lookup = false
     addrinfo = @socket.addr
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should be_kind_of(Integer)
+    addrinfo[1].should.is_a?(Integer)
     addrinfo[2].should == SocketSpecs.hostname
     addrinfo[3].should == "127.0.0.1"
   end
@@ -27,7 +27,7 @@
     BasicSocket.do_not_reverse_lookup = true
     addrinfo = @socket.addr
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should be_kind_of(Integer)
+    addrinfo[1].should.is_a?(Integer)
     addrinfo[2].should == "127.0.0.1"
     addrinfo[3].should == "127.0.0.1"
   end
@@ -35,7 +35,7 @@
   it "returns an address in the array if passed false" do
     addrinfo = @socket.addr(false)
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should be_kind_of(Integer)
+    addrinfo[1].should.is_a?(Integer)
     addrinfo[2].should == "127.0.0.1"
     addrinfo[3].should == "127.0.0.1"
   end
@@ -81,7 +81,7 @@
 
       describe 'using :cats as the argument' do
         it 'raises ArgumentError' do
-          -> { @server.addr(:cats) }.should raise_error(ArgumentError)
+          -> { @server.addr(:cats) }.should.raise(ArgumentError)
         end
       end
     end
diff --git a/spec/ruby/library/socket/ipsocket/getaddress_spec.rb b/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
index 329f8267d32..d302cd6a8ae 100644
--- a/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
@@ -23,6 +23,6 @@
   it "raises an error on unknown hostnames" do
     -> {
       IPSocket.getaddress("rubyspecdoesntexist.ruby-lang.org")
-    }.should raise_error(SocketError)
+    }.should.raise(SocketError)
   end
 end
diff --git a/spec/ruby/library/socket/ipsocket/peeraddr_spec.rb b/spec/ruby/library/socket/ipsocket/peeraddr_spec.rb
index 702650940bb..b79222000a9 100644
--- a/spec/ruby/library/socket/ipsocket/peeraddr_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/peeraddr_spec.rb
@@ -18,7 +18,7 @@
   it "raises error if socket is not connected" do
     -> {
       @server.peeraddr
-    }.should raise_error(Errno::ENOTCONN)
+    }.should.raise(Errno::ENOTCONN)
   end
 
   it "returns an array of information on the peer" do
@@ -92,7 +92,7 @@
 
       describe 'using :cats as the argument' do
         it 'raises ArgumentError' do
-          -> { @client.peeraddr(:cats) }.should raise_error(ArgumentError)
+          -> { @client.peeraddr(:cats) }.should.raise(ArgumentError)
         end
       end
     end
diff --git a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
index 5e6a145c9bd..7af0078be13 100644
--- a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
@@ -93,11 +93,11 @@
         end
 
         Thread.pass while t.status and t.status != "sleep"
-        t.status.should_not be_nil
+        t.status.should_not == nil
 
         @client.close
 
-        t.value.should be_nil
+        t.value.should == nil
       end
     end
 
diff --git a/spec/ruby/library/socket/option/bool_spec.rb b/spec/ruby/library/socket/option/bool_spec.rb
index 144a78043dc..9992e842b3f 100644
--- a/spec/ruby/library/socket/option/bool_spec.rb
+++ b/spec/ruby/library/socket/option/bool_spec.rb
@@ -4,7 +4,7 @@
 describe "Socket::Option.bool" do
   it "creates a new Socket::Option" do
     so = Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, true)
-    so.should be_an_instance_of(Socket::Option)
+    so.should.instance_of?(Socket::Option)
     so.family.should == Socket::AF_INET
     so.level.should == Socket::SOL_SOCKET
     so.optname.should == Socket::SO_KEEPALIVE
@@ -21,7 +21,7 @@
   platform_is_not :windows do
     it 'raises TypeError when called on a non boolean option' do
       opt = Socket::Option.linger(1, 4)
-      -> { opt.bool }.should raise_error(TypeError)
+      -> { opt.bool }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/option/initialize_spec.rb b/spec/ruby/library/socket/option/initialize_spec.rb
index 8071ad7ef0c..5af274f332a 100644
--- a/spec/ruby/library/socket/option/initialize_spec.rb
+++ b/spec/ruby/library/socket/option/initialize_spec.rb
@@ -10,7 +10,7 @@
       opt = Socket::Option
         .new(Socket::AF_INET, Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, @bool)
 
-      opt.should be_an_instance_of(Socket::Option)
+      opt.should.instance_of?(Socket::Option)
 
       opt.family.should  == Socket::AF_INET
       opt.level.should   == Socket::SOL_SOCKET
@@ -23,7 +23,7 @@
     it 'returns a Socket::Option' do
       opt = Socket::Option.new(:INET, :SOCKET, :KEEPALIVE, @bool)
 
-      opt.should be_an_instance_of(Socket::Option)
+      opt.should.instance_of?(Socket::Option)
 
       opt.family.should  == Socket::AF_INET
       opt.level.should   == Socket::SOL_SOCKET
@@ -34,19 +34,19 @@
     it 'raises when using an invalid address family' do
       -> {
         Socket::Option.new(:INET2, :SOCKET, :KEEPALIVE, @bool)
-      }.should raise_error(SocketError)
+      }.should.raise(SocketError)
     end
 
     it 'raises when using an invalid level' do
       -> {
         Socket::Option.new(:INET, :CATS, :KEEPALIVE, @bool)
-      }.should raise_error(SocketError)
+      }.should.raise(SocketError)
     end
 
     it 'raises when using an invalid option name' do
       -> {
         Socket::Option.new(:INET, :SOCKET, :CATS, @bool)
-      }.should raise_error(SocketError)
+      }.should.raise(SocketError)
     end
   end
 
@@ -54,7 +54,7 @@
     it 'returns a Socket::Option' do
       opt = Socket::Option.new('INET', 'SOCKET', 'KEEPALIVE', @bool)
 
-      opt.should be_an_instance_of(Socket::Option)
+      opt.should.instance_of?(Socket::Option)
 
       opt.family.should  == Socket::AF_INET
       opt.level.should   == Socket::SOL_SOCKET
@@ -65,19 +65,19 @@
     it 'raises when using an invalid address family' do
       -> {
         Socket::Option.new('INET2', 'SOCKET', 'KEEPALIVE', @bool)
-      }.should raise_error(SocketError)
+      }.should.raise(SocketError)
     end
 
     it 'raises when using an invalid level' do
       -> {
         Socket::Option.new('INET', 'CATS', 'KEEPALIVE', @bool)
-      }.should raise_error(SocketError)
+      }.should.raise(SocketError)
     end
 
     it 'raises when using an invalid option name' do
       -> {
         Socket::Option.new('INET', 'SOCKET', 'CATS', @bool)
-      }.should raise_error(SocketError)
+      }.should.raise(SocketError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/option/int_spec.rb b/spec/ruby/library/socket/option/int_spec.rb
index 8c69ef6cbdf..0cd341f88a4 100644
--- a/spec/ruby/library/socket/option/int_spec.rb
+++ b/spec/ruby/library/socket/option/int_spec.rb
@@ -4,7 +4,7 @@
 describe "Socket::Option.int" do
   it "creates a new Socket::Option" do
     so = Socket::Option.int(:INET, :SOCKET, :KEEPALIVE, 5)
-    so.should be_an_instance_of(Socket::Option)
+    so.should.instance_of?(Socket::Option)
     so.family.should == Socket::Constants::AF_INET
     so.level.should == Socket::Constants::SOL_SOCKET
     so.optname.should == Socket::Constants::SO_KEEPALIVE
@@ -14,7 +14,7 @@
   it 'returns a Socket::Option' do
     opt = Socket::Option.int(:INET, :IP, :TTL, 4)
 
-    opt.should be_an_instance_of(Socket::Option)
+    opt.should.instance_of?(Socket::Option)
 
     opt.family.should  == Socket::AF_INET
     opt.level.should   == Socket::IPPROTO_IP
@@ -37,7 +37,7 @@
   platform_is_not :windows do
     it 'raises TypeError when called on a non integer option' do
       opt = Socket::Option.linger(1, 4)
-      -> { opt.int }.should raise_error(TypeError)
+      -> { opt.int }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/option/linger_spec.rb b/spec/ruby/library/socket/option/linger_spec.rb
index ee987db85b7..87c5e0982ef 100644
--- a/spec/ruby/library/socket/option/linger_spec.rb
+++ b/spec/ruby/library/socket/option/linger_spec.rb
@@ -9,7 +9,7 @@
 describe "Socket::Option.linger" do
   it "creates a new Socket::Option for SO_LINGER" do
     so = Socket::Option.linger(1, 10)
-    so.should be_an_instance_of(Socket::Option)
+    so.should.instance_of?(Socket::Option)
 
     so.family.should == Socket::Constants::AF_UNSPEC
     so.level.should == Socket::Constants::SOL_SOCKET
@@ -31,46 +31,46 @@
   it "returns linger option" do
     so = Socket::Option.linger(0, 5)
     ary = so.linger
-    ary[0].should be_false
+    ary[0].should == false
     ary[1].should == 5
 
     so = Socket::Option.linger(false, 4)
     ary = so.linger
-    ary[0].should be_false
+    ary[0].should == false
     ary[1].should == 4
 
     so = Socket::Option.linger(1, 10)
     ary = so.linger
-    ary[0].should be_true
+    ary[0].should == true
     ary[1].should == 10
 
     so = Socket::Option.linger(true, 9)
     ary = so.linger
-    ary[0].should be_true
+    ary[0].should == true
     ary[1].should == 9
   end
 
   it "raises TypeError if not a SO_LINGER" do
     so = Socket::Option.int(:AF_UNSPEC, :SOL_SOCKET, :KEEPALIVE, 1)
-    -> { so.linger }.should raise_error(TypeError)
+    -> { so.linger }.should.raise(TypeError)
   end
 
   it 'raises TypeError when called on a non SOL_SOCKET/SO_LINGER option' do
     opt = Socket::Option.int(:INET, :IP, :TTL, 4)
 
-    -> { opt.linger }.should raise_error(TypeError)
+    -> { opt.linger }.should.raise(TypeError)
   end
 
   platform_is_not :windows do
     it "raises TypeError if option has not good size" do
       so = Socket::Option.int(:AF_UNSPEC, :SOL_SOCKET, :LINGER, 1)
-      -> { so.linger }.should raise_error(TypeError)
+      -> { so.linger }.should.raise(TypeError)
     end
   end
 
   it 'raises TypeError when called on a non linger option' do
     opt = Socket::Option.new(:INET, :SOCKET, :LINGER, '')
 
-    -> { opt.linger }.should raise_error(TypeError)
+    -> { opt.linger }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/socket/option/new_spec.rb b/spec/ruby/library/socket/option/new_spec.rb
index a9e6f09097b..3721d63ee54 100644
--- a/spec/ruby/library/socket/option/new_spec.rb
+++ b/spec/ruby/library/socket/option/new_spec.rb
@@ -22,14 +22,14 @@
   end
 
   it "should raise error on unknown family" do
-    -> { Socket::Option.new(:INET4, :SOCKET, :KEEPALIVE, [0].pack('i')) }.should raise_error(SocketError)
+    -> { Socket::Option.new(:INET4, :SOCKET, :KEEPALIVE, [0].pack('i')) }.should.raise(SocketError)
   end
 
   it "should raise error on unknown level" do
-    -> { Socket::Option.new(:INET, :ROCKET, :KEEPALIVE, [0].pack('i')) }.should raise_error(SocketError)
+    -> { Socket::Option.new(:INET, :ROCKET, :KEEPALIVE, [0].pack('i')) }.should.raise(SocketError)
   end
 
   it "should raise error on unknown option name" do
-    -> { Socket::Option.new(:INET, :SOCKET, :ALIVE, [0].pack('i')) }.should raise_error(SocketError)
+    -> { Socket::Option.new(:INET, :SOCKET, :ALIVE, [0].pack('i')) }.should.raise(SocketError)
   end
 end
diff --git a/spec/ruby/library/socket/shared/address.rb b/spec/ruby/library/socket/shared/address.rb
index 49ba17c4000..c64602df2f3 100644
--- a/spec/ruby/library/socket/shared/address.rb
+++ b/spec/ruby/library/socket/shared/address.rb
@@ -46,7 +46,7 @@
     end
 
     it 'returns an Addrinfo' do
-      @addr.should be_an_instance_of(Addrinfo)
+      @addr.should.instance_of?(Addrinfo)
     end
 
     it 'uses 0 as the protocol' do
@@ -110,7 +110,7 @@
       end
 
       it 'returns an Addrinfo' do
-        @addr.should be_an_instance_of(Addrinfo)
+        @addr.should.instance_of?(Addrinfo)
       end
 
       it 'uses 0 as the protocol' do
@@ -184,7 +184,7 @@
     end
 
     it 'returns an Addrinfo' do
-      @addr.should be_an_instance_of(Addrinfo)
+      @addr.should.instance_of?(Addrinfo)
     end
 
     it 'uses 0 as the protocol' do
@@ -240,7 +240,7 @@
     end
 
     it 'returns an Addrinfo' do
-      @addr.should be_an_instance_of(Addrinfo)
+      @addr.should.instance_of?(Addrinfo)
     end
 
     it 'uses 0 as the protocol' do
diff --git a/spec/ruby/library/socket/shared/pack_sockaddr.rb b/spec/ruby/library/socket/shared/pack_sockaddr.rb
index 4bfcf4edb9d..db6f39612d0 100644
--- a/spec/ruby/library/socket/shared/pack_sockaddr.rb
+++ b/spec/ruby/library/socket/shared/pack_sockaddr.rb
@@ -31,7 +31,7 @@
     it 'returns a String of 16 bytes' do
       str = Socket.public_send(@method, 80, '127.0.0.1')
 
-      str.should be_an_instance_of(String)
+      str.should.instance_of?(String)
       str.bytesize.should == 16
     end
   end
@@ -40,7 +40,7 @@
     it 'returns a String of 28 bytes' do
       str = Socket.public_send(@method, 80, '::1')
 
-      str.should be_an_instance_of(String)
+      str.should.instance_of?(String)
       str.bytesize.should == 28
     end
   end
@@ -68,7 +68,7 @@
     it 'returns a String of 110 bytes' do
       str = Socket.public_send(@method, '/tmp/test.sock')
 
-      str.should be_an_instance_of(String)
+      str.should.instance_of?(String)
       str.bytesize.should == 110
     end
   end
@@ -77,7 +77,7 @@
     it 'returns a String of 106 bytes' do
       str = Socket.public_send(@method, '/tmp/test.sock')
 
-      str.should be_an_instance_of(String)
+      str.should.instance_of?(String)
       str.bytesize.should == 106
     end
   end
@@ -86,7 +86,7 @@
     it "raises ArgumentError for paths that are too long" do
       # AIX doesn't raise error
       long_path = 'a' * 110
-      -> { Socket.public_send(@method, long_path) }.should raise_error(ArgumentError)
+      -> { Socket.public_send(@method, long_path) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/shared/socketpair.rb b/spec/ruby/library/socket/shared/socketpair.rb
index 25146cfff6a..7fcd4d6b46b 100644
--- a/spec/ruby/library/socket/shared/socketpair.rb
+++ b/spec/ruby/library/socket/shared/socketpair.rb
@@ -12,8 +12,8 @@
       begin
         s1, s2 = Socket.public_send(@method, :UNIX, :STREAM)
 
-        s1.should be_an_instance_of(Socket)
-        s2.should be_an_instance_of(Socket)
+        s1.should.instance_of?(Socket)
+        s2.should.instance_of?(Socket)
       ensure
         s1.close
         s2.close
@@ -24,8 +24,8 @@
       it 'returns two Socket objects' do
         s1, s2 = Socket.public_send(@method, Socket::AF_UNIX, Socket::SOCK_STREAM)
 
-        s1.should be_an_instance_of(Socket)
-        s2.should be_an_instance_of(Socket)
+        s1.should.instance_of?(Socket)
+        s2.should.instance_of?(Socket)
         s1.close
         s2.close
       end
@@ -35,18 +35,18 @@
       it 'returns two Socket objects' do
         s1, s2 = Socket.public_send(@method, :UNIX, :STREAM)
 
-        s1.should be_an_instance_of(Socket)
-        s2.should be_an_instance_of(Socket)
+        s1.should.instance_of?(Socket)
+        s2.should.instance_of?(Socket)
         s1.close
         s2.close
       end
 
       it 'raises SocketError for an unknown address family' do
-        -> { Socket.public_send(@method, :CATS, :STREAM) }.should raise_error(SocketError)
+        -> { Socket.public_send(@method, :CATS, :STREAM) }.should.raise(SocketError)
       end
 
       it 'raises SocketError for an unknown socket type' do
-        -> { Socket.public_send(@method, :UNIX, :CATS) }.should raise_error(SocketError)
+        -> { Socket.public_send(@method, :UNIX, :CATS) }.should.raise(SocketError)
       end
     end
 
@@ -54,18 +54,18 @@
       it 'returns two Socket objects' do
         s1, s2 = Socket.public_send(@method, 'UNIX', 'STREAM')
 
-        s1.should be_an_instance_of(Socket)
-        s2.should be_an_instance_of(Socket)
+        s1.should.instance_of?(Socket)
+        s2.should.instance_of?(Socket)
         s1.close
         s2.close
       end
 
       it 'raises SocketError for an unknown address family' do
-        -> { Socket.public_send(@method, 'CATS', 'STREAM') }.should raise_error(SocketError)
+        -> { Socket.public_send(@method, 'CATS', 'STREAM') }.should.raise(SocketError)
       end
 
       it 'raises SocketError for an unknown socket type' do
-        -> { Socket.public_send(@method, 'UNIX', 'CATS') }.should raise_error(SocketError)
+        -> { Socket.public_send(@method, 'UNIX', 'CATS') }.should.raise(SocketError)
       end
     end
 
@@ -79,8 +79,8 @@
 
         s1, s2 = Socket.public_send(@method, family, type)
 
-        s1.should be_an_instance_of(Socket)
-        s2.should be_an_instance_of(Socket)
+        s1.should.instance_of?(Socket)
+        s2.should.instance_of?(Socket)
         s1.close
         s2.close
       end
@@ -92,7 +92,7 @@
         family.stub!(:to_str).and_return(Socket::AF_UNIX)
         type.stub!(:to_str).and_return(Socket::SOCK_STREAM)
 
-        -> { Socket.public_send(@method, family, type) }.should raise_error(TypeError)
+        -> { Socket.public_send(@method, family, type) }.should.raise(TypeError)
       end
 
       it 'raises SocketError for an unknown address family' do
@@ -102,7 +102,7 @@
         family.stub!(:to_str).and_return('CATS')
         type.stub!(:to_str).and_return('STREAM')
 
-        -> { Socket.public_send(@method, family, type) }.should raise_error(SocketError)
+        -> { Socket.public_send(@method, family, type) }.should.raise(SocketError)
       end
 
       it 'raises SocketError for an unknown socket type' do
@@ -112,14 +112,14 @@
         family.stub!(:to_str).and_return('UNIX')
         type.stub!(:to_str).and_return('CATS')
 
-        -> { Socket.public_send(@method, family, type) }.should raise_error(SocketError)
+        -> { Socket.public_send(@method, family, type) }.should.raise(SocketError)
       end
     end
 
     it 'accepts a custom protocol as an Integer as the 3rd argument' do
       s1, s2 = Socket.public_send(@method, :UNIX, :STREAM, Socket::IPPROTO_IP)
-      s1.should be_an_instance_of(Socket)
-      s2.should be_an_instance_of(Socket)
+      s1.should.instance_of?(Socket)
+      s2.should.instance_of?(Socket)
       s1.close
       s2.close
     end
diff --git a/spec/ruby/library/socket/socket/accept_loop_spec.rb b/spec/ruby/library/socket/socket/accept_loop_spec.rb
index 78e8c3fa4af..6c65b192edd 100644
--- a/spec/ruby/library/socket/socket/accept_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/accept_loop_spec.rb
@@ -41,8 +41,8 @@
         end
 
         begin
-          conn.should be_an_instance_of(Socket)
-          addr.should be_an_instance_of(Addrinfo)
+          conn.should.instance_of?(Socket)
+          addr.should.instance_of?(Addrinfo)
         ensure
           conn.close
         end
@@ -73,8 +73,8 @@
         end
 
         begin
-          conn.should be_an_instance_of(Socket)
-          addr.should be_an_instance_of(Addrinfo)
+          conn.should.instance_of?(Socket)
+          addr.should.instance_of?(Addrinfo)
         ensure
           conn.close
         end
diff --git a/spec/ruby/library/socket/socket/accept_nonblock_spec.rb b/spec/ruby/library/socket/socket/accept_nonblock_spec.rb
index 011622988c4..09cdbaa7b40 100644
--- a/spec/ruby/library/socket/socket/accept_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/accept_nonblock_spec.rb
@@ -17,12 +17,12 @@
   it "raises IO::WaitReadable if the connection is not accepted yet" do
     -> {
       @socket.accept_nonblock
-    }.should raise_error(IO::WaitReadable) { |e|
+    }.should.raise(IO::WaitReadable) { |e|
       platform_is_not :windows do
-        e.should be_kind_of(Errno::EAGAIN)
+        e.should.is_a?(Errno::EAGAIN)
       end
       platform_is :windows do
-        e.should be_kind_of(Errno::EWOULDBLOCK)
+        e.should.is_a?(Errno::EWOULDBLOCK)
       end
     }
   end
@@ -45,8 +45,8 @@
 
     describe 'using an unbound socket' do
       it 'raises Errno::EINVAL' do
-        -> { @server.accept_nonblock }.should raise_error(Errno::EINVAL)
-        -> { @server.accept_nonblock(exception: false) }.should raise_error(Errno::EINVAL)
+        -> { @server.accept_nonblock }.should.raise(Errno::EINVAL)
+        -> { @server.accept_nonblock(exception: false) }.should.raise(Errno::EINVAL)
       end
     end
 
@@ -56,8 +56,8 @@
       end
 
       it 'raises Errno::EINVAL' do
-        -> { @server.accept_nonblock }.should raise_error(Errno::EINVAL)
-        -> { @server.accept_nonblock(exception: false) }.should raise_error(Errno::EINVAL)
+        -> { @server.accept_nonblock }.should.raise(Errno::EINVAL)
+        -> { @server.accept_nonblock(exception: false) }.should.raise(Errno::EINVAL)
       end
     end
 
@@ -65,8 +65,8 @@
       it 'raises IOError' do
         @server.close
 
-        -> { @server.accept_nonblock }.should raise_error(IOError)
-        -> { @server.accept_nonblock(exception: false) }.should raise_error(IOError)
+        -> { @server.accept_nonblock }.should.raise(IOError)
+        -> { @server.accept_nonblock(exception: false) }.should.raise(IOError)
       end
     end
 
@@ -78,7 +78,7 @@
 
       describe 'without a connected client' do
         it 'raises IO::WaitReadable' do
-          -> { @server.accept_nonblock }.should raise_error(IO::WaitReadable)
+          -> { @server.accept_nonblock }.should.raise(IO::WaitReadable)
         end
       end
 
@@ -100,8 +100,8 @@
             IO.select([@server])
             @socket, addrinfo = @server.accept_nonblock
 
-            @socket.should be_an_instance_of(Socket)
-            addrinfo.should be_an_instance_of(Addrinfo)
+            @socket.should.instance_of?(Socket)
+            addrinfo.should.instance_of?(Addrinfo)
           end
 
           describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/socket/accept_spec.rb b/spec/ruby/library/socket/socket/accept_spec.rb
index 417f996c550..fca727ab08a 100644
--- a/spec/ruby/library/socket/socket/accept_spec.rb
+++ b/spec/ruby/library/socket/socket/accept_spec.rb
@@ -15,7 +15,7 @@
     platform_is :linux do # hangs on other platforms
       describe 'using an unbound socket'  do
         it 'raises Errno::EINVAL' do
-          -> { @server.accept }.should raise_error(Errno::EINVAL)
+          -> { @server.accept }.should.raise(Errno::EINVAL)
         end
       end
 
@@ -25,7 +25,7 @@
         end
 
         it 'raises Errno::EINVAL' do
-          -> { @server.accept }.should raise_error(Errno::EINVAL)
+          -> { @server.accept }.should.raise(Errno::EINVAL)
         end
       end
     end
@@ -34,7 +34,7 @@
       it 'raises IOError' do
         @server.close
 
-        -> { @server.accept }.should raise_error(IOError)
+        -> { @server.accept }.should.raise(IOError)
       end
     end
 
@@ -58,7 +58,7 @@
 
           value = thread.value
           begin
-            value.should be_an_instance_of(Array)
+            value.should.instance_of?(Array)
           ensure
             client.close
             value[0].close
@@ -82,8 +82,8 @@
         it 'returns an Array containing a Socket and an Addrinfo' do
           @socket, addrinfo = @server.accept
 
-          @socket.should be_an_instance_of(Socket)
-          addrinfo.should be_an_instance_of(Addrinfo)
+          @socket.should.instance_of?(Socket)
+          addrinfo.should.instance_of?(Addrinfo)
         end
 
         describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/socket/bind_spec.rb b/spec/ruby/library/socket/socket/bind_spec.rb
index e76336eafac..164df92205a 100644
--- a/spec/ruby/library/socket/socket/bind_spec.rb
+++ b/spec/ruby/library/socket/socket/bind_spec.rb
@@ -8,12 +8,12 @@
   end
 
   after :each do
-    @sock.closed?.should be_false
+    @sock.closed?.should == false
     @sock.close
   end
 
   it "binds to a port" do
-    -> { @sock.bind(@sockaddr) }.should_not raise_error
+    -> { @sock.bind(@sockaddr) }.should_not.raise
   end
 
   it "returns 0 if successful" do
@@ -23,12 +23,12 @@
   it "raises Errno::EINVAL when already bound" do
     @sock.bind(@sockaddr)
 
-    -> { @sock.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
+    -> { @sock.bind(@sockaddr) }.should.raise(Errno::EINVAL)
   end
 
   it "raises Errno::EADDRNOTAVAIL when the specified sockaddr is not available from the local machine" do
     sockaddr1 = Socket.pack_sockaddr_in(0, "4.3.2.1")
-    -> { @sock.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
+    -> { @sock.bind(sockaddr1) }.should.raise(Errno::EADDRNOTAVAIL)
   end
 
   platform_is_not :windows, :cygwin do
@@ -36,7 +36,7 @@
       break if File.read('/proc/sys/net/ipv4/ip_unprivileged_port_start').to_i <= 1 rescue nil
       it "raises Errno::EACCES when the current user does not have permission to bind" do
         sockaddr1 = Socket.pack_sockaddr_in(1, "127.0.0.1")
-        -> { @sock.bind(sockaddr1) }.should raise_error(Errno::EACCES)
+        -> { @sock.bind(sockaddr1) }.should.raise(Errno::EACCES)
       end
     end
   end
@@ -50,12 +50,12 @@
   end
 
   after :each do
-    @sock.closed?.should be_false
+    @sock.closed?.should == false
     @sock.close
   end
 
   it "binds to a port" do
-    -> { @sock.bind(@sockaddr) }.should_not raise_error
+    -> { @sock.bind(@sockaddr) }.should_not.raise
   end
 
   it "returns 0 if successful" do
@@ -65,12 +65,12 @@
   it "raises Errno::EINVAL when already bound" do
     @sock.bind(@sockaddr)
 
-    -> { @sock.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
+    -> { @sock.bind(@sockaddr) }.should.raise(Errno::EINVAL)
   end
 
   it "raises Errno::EADDRNOTAVAIL when the specified sockaddr is not available from the local machine" do
     sockaddr1 = Socket.pack_sockaddr_in(0, "4.3.2.1")
-    -> { @sock.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
+    -> { @sock.bind(sockaddr1) }.should.raise(Errno::EADDRNOTAVAIL)
   end
 
   platform_is_not :windows, :cygwin do
@@ -78,7 +78,7 @@
       break if File.read('/proc/sys/net/ipv4/ip_unprivileged_port_start').to_i <= 1 rescue nil
       it "raises Errno::EACCES when the current user does not have permission to bind" do
         sockaddr1 = Socket.pack_sockaddr_in(1, "127.0.0.1")
-        -> { @sock.bind(sockaddr1) }.should raise_error(Errno::EACCES)
+        -> { @sock.bind(sockaddr1) }.should.raise(Errno::EACCES)
       end
     end
   end
@@ -103,14 +103,14 @@
       it 'raises Errno::EINVAL when binding to an already bound port' do
         @socket.bind(@sockaddr)
 
-        -> { @socket.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
+        -> { @socket.bind(@sockaddr) }.should.raise(Errno::EINVAL)
       end
 
       it 'raises Errno::EADDRNOTAVAIL when the specified sockaddr is not available' do
         ip = family == Socket::AF_INET ? '4.3.2.1' : '::2'
         sockaddr1 = Socket.sockaddr_in(0, ip)
 
-        -> { @socket.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
+        -> { @socket.bind(sockaddr1) }.should.raise(Errno::EADDRNOTAVAIL)
       end
 
       platform_is_not :windows do
@@ -120,7 +120,7 @@
           it 'raises Errno::EACCES when the user is not allowed to bind to the port' do
             sockaddr1 = Socket.pack_sockaddr_in(1, ip_address)
 
-            -> { @socket.bind(sockaddr1) }.should raise_error(Errno::EACCES)
+            -> { @socket.bind(sockaddr1) }.should.raise(Errno::EACCES)
           end
         end
       end
@@ -138,7 +138,7 @@
 
       it 'binds to an Addrinfo' do
         @socket.bind(@addr).should == 0
-        @socket.local_address.should be_an_instance_of(Addrinfo)
+        @socket.local_address.should.instance_of?(Addrinfo)
       end
 
       it 'uses a new Addrinfo for the local address' do
diff --git a/spec/ruby/library/socket/socket/connect_nonblock_spec.rb b/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
index 359b8719fb0..dac24e3e5b4 100644
--- a/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
@@ -53,13 +53,13 @@
     it "raises Errno::EINPROGRESS when the connect would block" do
       -> do
         @socket.connect_nonblock(@addr)
-      end.should raise_error(Errno::EINPROGRESS)
+      end.should.raise(Errno::EINPROGRESS)
     end
 
     it "raises Errno::EINPROGRESS with IO::WaitWritable mixed in when the connect would block" do
       -> do
         @socket.connect_nonblock(@addr)
-      end.should raise_error(IO::WaitWritable)
+      end.should.raise(IO::WaitWritable)
     end
 
     it "returns :wait_writable in exceptionless mode when the connect would block" do
@@ -93,7 +93,7 @@
       end
 
       it 'raises TypeError when passed an Integer' do
-        -> { @client.connect_nonblock(666) }.should raise_error(TypeError)
+        -> { @client.connect_nonblock(666) }.should.raise(TypeError)
       end
     end
 
@@ -122,7 +122,7 @@
             # as it's too implementation-dependent and checking for connect()
             # errors is futile anyways because of TOCTOU
             @client.connect_nonblock(@server.connect_address)
-          }.should raise_error(Errno::EISCONN)
+          }.should.raise(Errno::EISCONN)
         end
 
         it 'returns 0 when already connected in exceptionless mode' do
@@ -139,7 +139,7 @@
 
           -> {
             @client.connect_nonblock(@server.connect_address)
-          }.should raise_error(IO::EINPROGRESSWaitWritable)
+          }.should.raise(IO::EINPROGRESSWaitWritable)
         end
       end
     end
diff --git a/spec/ruby/library/socket/socket/connect_spec.rb b/spec/ruby/library/socket/socket/connect_spec.rb
index 130379ce2b5..c928b66c535 100644
--- a/spec/ruby/library/socket/socket/connect_spec.rb
+++ b/spec/ruby/library/socket/socket/connect_spec.rb
@@ -40,7 +40,7 @@
         # as it's too implementation-dependent and checking for connect()
         # errors is futile anyways because of TOCTOU
         @client.connect(@server.getsockname)
-      }.should raise_error(Errno::EISCONN)
+      }.should.raise(Errno::EISCONN)
     end
 
     platform_is_not :darwin do
@@ -70,7 +70,7 @@
         rescue Errno::ENETUNREACH
           skip "Off line"
         end
-      }.should raise_error(IO::TimeoutError)
+      }.should.raise(IO::TimeoutError)
     ensure
       client.close
     end
diff --git a/spec/ruby/library/socket/socket/getaddrinfo_spec.rb b/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
index 17ffeaccaf4..7e5bdc9b255 100644
--- a/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
+++ b/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
@@ -43,7 +43,7 @@
       addrinfo.each do |a|
         case a.last
         when Socket::IPPROTO_UDP, Socket::IPPROTO_TCP
-          expected.should include(a)
+          expected.should.include?(a)
         else
           # don't check this. It's some weird protocol we don't know about
           # so we can't spec it.
@@ -90,7 +90,7 @@
         ["AF_INET6", 9, "::", "::", Socket::AF_INET6, Socket::SOCK_STREAM, Socket::IPPROTO_TCP],
         ["AF_INET6", 9, "0:0:0:0:0:0:0:0", "0:0:0:0:0:0:0:0", Socket::AF_INET6, Socket::SOCK_STREAM, Socket::IPPROTO_TCP]
       ]
-      res.each { |a| expected.should include(a) }
+      res.each { |a| expected.should.include?(a) }
     end
 
     it "accepts empty addresses for IPv6 non-passive sockets" do
@@ -104,13 +104,13 @@
         ["AF_INET6", 9, "::1", "::1", Socket::AF_INET6, Socket::SOCK_STREAM, Socket::IPPROTO_TCP],
         ["AF_INET6", 9, "0:0:0:0:0:0:0:1", "0:0:0:0:0:0:0:1", Socket::AF_INET6, Socket::SOCK_STREAM, Socket::IPPROTO_TCP]
       ]
-      res.each { |a| expected.should include(a) }
+      res.each { |a| expected.should.include?(a) }
     end
 
     it "raises ResolutionError when fails to resolve address" do
       -> {
         Socket.getaddrinfo("www.kame.net", 80, "AF_UNIX")
-      }.should raise_error(Socket::ResolutionError) { |e|
+      }.should.raise(Socket::ResolutionError) { |e|
         [Socket::EAI_FAMILY, Socket::EAI_FAIL].should.include?(e.error_code)
       }
     end
@@ -120,7 +120,7 @@
 describe 'Socket.getaddrinfo' do
   describe 'without global reverse lookups' do
     it 'returns an Array' do
-      Socket.getaddrinfo(nil, 'ftp').should be_an_instance_of(Array)
+      Socket.getaddrinfo(nil, 'ftp').should.instance_of?(Array)
     end
 
     it 'accepts an Integer as the address family' do
@@ -131,8 +131,8 @@
       array[2].should == '127.0.0.1'
       array[3].should == '127.0.0.1'
       array[4].should == Socket::AF_INET
-      array[5].should be_kind_of(Integer)
-      array[6].should be_kind_of(Integer)
+      array[5].should.is_a?(Integer)
+      array[6].should.is_a?(Integer)
     end
 
     it 'accepts an Integer as the address family using IPv6' do
@@ -143,8 +143,8 @@
       array[2].should == '::1'
       array[3].should == '::1'
       array[4].should == Socket::AF_INET6
-      array[5].should be_kind_of(Integer)
-      array[6].should be_kind_of(Integer)
+      array[5].should.is_a?(Integer)
+      array[6].should.is_a?(Integer)
     end
 
     it 'accepts a Symbol as the address family' do
@@ -155,8 +155,8 @@
       array[2].should == '127.0.0.1'
       array[3].should == '127.0.0.1'
       array[4].should == Socket::AF_INET
-      array[5].should be_kind_of(Integer)
-      array[6].should be_kind_of(Integer)
+      array[5].should.is_a?(Integer)
+      array[6].should.is_a?(Integer)
     end
 
     it 'accepts a Symbol as the address family using IPv6' do
@@ -167,8 +167,8 @@
       array[2].should == '::1'
       array[3].should == '::1'
       array[4].should == Socket::AF_INET6
-      array[5].should be_kind_of(Integer)
-      array[6].should be_kind_of(Integer)
+      array[5].should.is_a?(Integer)
+      array[6].should.is_a?(Integer)
     end
 
     it 'accepts a String as the address family' do
@@ -179,8 +179,8 @@
       array[2].should == '127.0.0.1'
       array[3].should == '127.0.0.1'
       array[4].should == Socket::AF_INET
-      array[5].should be_kind_of(Integer)
-      array[6].should be_kind_of(Integer)
+      array[5].should.is_a?(Integer)
+      array[6].should.is_a?(Integer)
     end
 
     it 'accepts a String as the address family using IPv6' do
@@ -191,8 +191,8 @@
       array[2].should == '::1'
       array[3].should == '::1'
       array[4].should == Socket::AF_INET6
-      array[5].should be_kind_of(Integer)
-      array[6].should be_kind_of(Integer)
+      array[5].should.is_a?(Integer)
+      array[6].should.is_a?(Integer)
     end
 
     it 'accepts an object responding to #to_str as the host' do
@@ -207,8 +207,8 @@
       array[2].should == '127.0.0.1'
       array[3].should == '127.0.0.1'
       array[4].should == Socket::AF_INET
-      array[5].should be_kind_of(Integer)
-      array[6].should be_kind_of(Integer)
+      array[5].should.is_a?(Integer)
+      array[6].should.is_a?(Integer)
     end
 
     it 'accepts an object responding to #to_str as the address family' do
@@ -223,8 +223,8 @@
       array[2].should == '127.0.0.1'
       array[3].should == '127.0.0.1'
       array[4].should == Socket::AF_INET
-      array[5].should be_kind_of(Integer)
-      array[6].should be_kind_of(Integer)
+      array[5].should.is_a?(Integer)
+      array[6].should.is_a?(Integer)
     end
 
     it 'accepts an Integer as the socket type' do
@@ -237,7 +237,7 @@
         Socket::AF_INET,
         Socket::SOCK_STREAM,
       ]
-      [0, Socket::IPPROTO_TCP].should include(proto)
+      [0, Socket::IPPROTO_TCP].should.include?(proto)
     end
 
     it 'accepts a Symbol as the socket type' do
@@ -250,7 +250,7 @@
         Socket::AF_INET,
         Socket::SOCK_STREAM,
       ]
-      [0, Socket::IPPROTO_TCP].should include(proto)
+      [0, Socket::IPPROTO_TCP].should.include?(proto)
     end
 
     it 'accepts a String as the socket type' do
@@ -263,7 +263,7 @@
         Socket::AF_INET,
         Socket::SOCK_STREAM,
       ]
-      [0, Socket::IPPROTO_TCP].should include(proto)
+      [0, Socket::IPPROTO_TCP].should.include?(proto)
     end
 
     it 'accepts an object responding to #to_str as the socket type' do
@@ -280,7 +280,7 @@
         Socket::AF_INET,
         Socket::SOCK_STREAM,
       ]
-      [0, Socket::IPPROTO_TCP].should include(proto)
+      [0, Socket::IPPROTO_TCP].should.include?(proto)
     end
 
     platform_is_not :windows do
@@ -294,7 +294,7 @@
           Socket::AF_INET,
           Socket::SOCK_DGRAM,
         ]
-        [0, Socket::IPPROTO_UDP].should include(proto)
+        [0, Socket::IPPROTO_UDP].should.include?(proto)
       end
     end
 
@@ -309,7 +309,7 @@
         Socket::AF_INET,
         Socket::SOCK_STREAM,
       ]
-      [0, Socket::IPPROTO_TCP].should include(proto)
+      [0, Socket::IPPROTO_TCP].should.include?(proto)
     end
 
     it 'performs a reverse lookup when the reverse_lookup argument is true' do
@@ -319,7 +319,7 @@
       addr[0].should == 'AF_INET'
       addr[1].should == 21
 
-      addr[2].should be_an_instance_of(String)
+      addr[2].should.instance_of?(String)
       addr[2].should_not == addr[3]
 
       addr[3].should == '127.0.0.1'
@@ -332,7 +332,7 @@
       addr[0].should == 'AF_INET'
       addr[1].should == 21
 
-      addr[2].should be_an_instance_of(String)
+      addr[2].should.instance_of?(String)
       addr[2].should_not == addr[3]
 
       addr[3].should == '127.0.0.1'
@@ -349,7 +349,7 @@
         Socket::AF_INET,
         Socket::SOCK_STREAM,
       ]
-      [0, Socket::IPPROTO_TCP].should include(proto)
+      [0, Socket::IPPROTO_TCP].should.include?(proto)
     end
   end
 
@@ -372,7 +372,7 @@
       # We don't have control over this value and there's no way to test this
       # without relying on Socket.getaddrinfo()'s own behaviour (meaning this
       # test would faily any way of the method was not implemented correctly).
-      addr[2].should be_an_instance_of(String)
+      addr[2].should.instance_of?(String)
       addr[2].should_not == addr[3]
 
       addr[3].should == '127.0.0.1'
diff --git a/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb b/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
index 5d936046f5c..bf6d63dbe95 100644
--- a/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
+++ b/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
@@ -10,7 +10,7 @@
 
     describe 'without an explicit address family' do
       it 'returns an Array' do
-        suppress_warning { Socket.gethostbyaddr(@addr) }.should be_an_instance_of(Array)
+        suppress_warning { Socket.gethostbyaddr(@addr) }.should.instance_of?(Array)
       end
 
       describe 'the returned Array' do
@@ -23,10 +23,10 @@
         end
 
         it 'includes the aliases as the 2nd value' do
-          @array[1].should be_an_instance_of(Array)
+          @array[1].should.instance_of?(Array)
 
           @array[1].each do |val|
-            val.should be_an_instance_of(String)
+            val.should.instance_of?(String)
           end
         end
 
@@ -38,7 +38,7 @@
           @array[3].should == @addr
 
           @array[4..-1].each do |val|
-            val.should be_an_instance_of(String)
+            val.should.instance_of?(String)
           end
         end
       end
@@ -46,15 +46,15 @@
 
     describe 'with an explicit address family' do
       it 'returns an Array when using an Integer as the address family' do
-        suppress_warning { Socket.gethostbyaddr(@addr, Socket::AF_INET) }.should be_an_instance_of(Array)
+        suppress_warning { Socket.gethostbyaddr(@addr, Socket::AF_INET) }.should.instance_of?(Array)
       end
 
       it 'returns an Array when using a Symbol as the address family' do
-        suppress_warning { Socket.gethostbyaddr(@addr, :INET) }.should be_an_instance_of(Array)
+        suppress_warning { Socket.gethostbyaddr(@addr, :INET) }.should.instance_of?(Array)
       end
 
       it 'raises SocketError when the address is not supported by the family' do
-        -> { suppress_warning { Socket.gethostbyaddr(@addr, :INET6) } }.should raise_error(SocketError)
+        -> { suppress_warning { Socket.gethostbyaddr(@addr, :INET6) } }.should.raise(SocketError)
       end
     end
   end
@@ -67,7 +67,7 @@
 
       describe 'without an explicit address family' do
         it 'returns an Array' do
-          suppress_warning { Socket.gethostbyaddr(@addr) }.should be_an_instance_of(Array)
+          suppress_warning { Socket.gethostbyaddr(@addr) }.should.instance_of?(Array)
         end
 
         describe 'the returned Array' do
@@ -80,10 +80,10 @@
           end
 
           it 'includes the aliases as the 2nd value' do
-            @array[1].should be_an_instance_of(Array)
+            @array[1].should.instance_of?(Array)
 
             @array[1].each do |val|
-              val.should be_an_instance_of(String)
+              val.should.instance_of?(String)
             end
           end
 
@@ -92,10 +92,10 @@
           end
 
           it 'includes all address strings as the remaining values' do
-            @array[3].should be_an_instance_of(String)
+            @array[3].should.instance_of?(String)
 
             @array[4..-1].each do |val|
-              val.should be_an_instance_of(String)
+              val.should.instance_of?(String)
             end
           end
         end
@@ -103,16 +103,16 @@
 
       describe 'with an explicit address family' do
         it 'returns an Array when using an Integer as the address family' do
-          suppress_warning { Socket.gethostbyaddr(@addr, Socket::AF_INET6) }.should be_an_instance_of(Array)
+          suppress_warning { Socket.gethostbyaddr(@addr, Socket::AF_INET6) }.should.instance_of?(Array)
         end
 
         it 'returns an Array when using a Symbol as the address family' do
-          suppress_warning { Socket.gethostbyaddr(@addr, :INET6) }.should be_an_instance_of(Array)
+          suppress_warning { Socket.gethostbyaddr(@addr, :INET6) }.should.instance_of?(Array)
         end
 
         platform_is_not :windows, :wsl do
           it 'raises SocketError when the address is not supported by the family' do
-            -> { suppress_warning { Socket.gethostbyaddr(@addr, :INET) } }.should raise_error(SocketError)
+            -> { suppress_warning { Socket.gethostbyaddr(@addr, :INET) } }.should.raise(SocketError)
           end
         end
       end
diff --git a/spec/ruby/library/socket/socket/gethostbyname_spec.rb b/spec/ruby/library/socket/socket/gethostbyname_spec.rb
index 618ef853877..326fe260940 100644
--- a/spec/ruby/library/socket/socket/gethostbyname_spec.rb
+++ b/spec/ruby/library/socket/socket/gethostbyname_spec.rb
@@ -16,7 +16,7 @@
 
 describe 'Socket.gethostbyname' do
   it 'returns an Array' do
-    suppress_warning { Socket.gethostbyname('127.0.0.1') }.should be_an_instance_of(Array)
+    suppress_warning { Socket.gethostbyname('127.0.0.1') }.should.instance_of?(Array)
   end
 
   describe 'the returned Array' do
@@ -29,10 +29,10 @@
     end
 
     it 'includes the aliases as the 2nd value' do
-      @array[1].should be_an_instance_of(Array)
+      @array[1].should.instance_of?(Array)
 
       @array[1].each do |val|
-        val.should be_an_instance_of(String)
+        val.should.instance_of?(String)
       end
     end
 
@@ -43,10 +43,10 @@
     end
 
     it 'includes the address strings as the remaining values' do
-      @array[3].should be_an_instance_of(String)
+      @array[3].should.instance_of?(String)
 
       @array[4..-1].each do |val|
-        val.should be_an_instance_of(String)
+        val.should.instance_of?(String)
       end
     end
   end
diff --git a/spec/ruby/library/socket/socket/getifaddrs_spec.rb b/spec/ruby/library/socket/socket/getifaddrs_spec.rb
index 839854ea271..1b326605c8b 100644
--- a/spec/ruby/library/socket/socket/getifaddrs_spec.rb
+++ b/spec/ruby/library/socket/socket/getifaddrs_spec.rb
@@ -7,17 +7,17 @@
   end
 
   it 'returns an Array' do
-    @ifaddrs.should be_an_instance_of(Array)
+    @ifaddrs.should.instance_of?(Array)
   end
 
   describe 'the returned Array' do
     it 'should not be empty' do
-      @ifaddrs.should_not be_empty
+      @ifaddrs.should_not.empty?
     end
 
     it 'contains instances of Socket::Ifaddr' do
       @ifaddrs.each do |ifaddr|
-        ifaddr.should be_an_instance_of(Socket::Ifaddr)
+        ifaddr.should.instance_of?(Socket::Ifaddr)
       end
     end
   end
@@ -25,19 +25,19 @@
   describe 'each returned Socket::Ifaddr' do
     it 'has an interface index' do
       @ifaddrs.each do |ifaddr|
-        ifaddr.ifindex.should be_kind_of(Integer)
+        ifaddr.ifindex.should.is_a?(Integer)
       end
     end
 
     it 'has an interface name' do
       @ifaddrs.each do |ifaddr|
-        ifaddr.name.should be_an_instance_of(String)
+        ifaddr.name.should.instance_of?(String)
       end
     end
 
     it 'has a set of flags' do
       @ifaddrs.each do |ifaddr|
-        ifaddr.flags.should be_kind_of(Integer)
+        ifaddr.flags.should.is_a?(Integer)
       end
     end
   end
@@ -49,17 +49,17 @@
 
     it 'is an Addrinfo' do
       @addrs.all? do |addr|
-        addr.should be_an_instance_of(Addrinfo)
+        addr.should.instance_of?(Addrinfo)
         true
-      end.should be_true
+      end.should == true
     end
 
     it 'has an address family' do
       @addrs.all? do |addr|
-        addr.afamily.should be_kind_of(Integer)
+        addr.afamily.should.is_a?(Integer)
         addr.afamily.should_not == Socket::AF_UNSPEC
         true
-      end.should be_true
+      end.should == true
     end
   end
 
@@ -71,17 +71,17 @@
 
       it 'is an Addrinfo' do
         @addrs.all? do |addr|
-          addr.should be_an_instance_of(Addrinfo)
+          addr.should.instance_of?(Addrinfo)
           true
-        end.should be_true
+        end.should == true
       end
 
       it 'has an address family' do
         @addrs.all? do |addr|
-          addr.afamily.should be_kind_of(Integer)
+          addr.afamily.should.is_a?(Integer)
           addr.afamily.should_not == Socket::AF_UNSPEC
           true
-        end.should be_true
+        end.should == true
       end
     end
 
@@ -92,24 +92,24 @@
 
       it 'is an Addrinfo' do
         @addrs.all? do |addr|
-          addr.should be_an_instance_of(Addrinfo)
+          addr.should.instance_of?(Addrinfo)
           true
-        end.should be_true
+        end.should == true
       end
 
       it 'has an address family' do
         @addrs.all? do |addr|
-          addr.afamily.should be_kind_of(Integer)
+          addr.afamily.should.is_a?(Integer)
           addr.afamily.should_not == Socket::AF_UNSPEC
           true
-        end.should be_true
+        end.should == true
       end
 
       it 'has an IP address' do
         @addrs.all? do |addr|
-          addr.ip_address.should be_an_instance_of(String)
+          addr.ip_address.should.instance_of?(String)
           true
-        end.should be_true
+        end.should == true
       end
     end
   end
diff --git a/spec/ruby/library/socket/socket/getnameinfo_spec.rb b/spec/ruby/library/socket/socket/getnameinfo_spec.rb
index 48cc94bcd18..d0b77004de6 100644
--- a/spec/ruby/library/socket/socket/getnameinfo_spec.rb
+++ b/spec/ruby/library/socket/socket/getnameinfo_spec.rb
@@ -64,7 +64,7 @@ def should_be_valid_dns_name(name)
   it "raises ResolutionError when fails to resolve address" do
     -> {
       Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"])
-    }.should raise_error(Socket::ResolutionError) { |e|
+    }.should.raise(Socket::ResolutionError) { |e|
       [Socket::EAI_FAMILY, Socket::EAI_FAIL].should.include?(e.error_code)
     }
   end
@@ -77,7 +77,7 @@ def should_be_valid_dns_name(name)
     end
 
     it 'raises SocketError or TypeError when using an invalid String' do
-      -> { Socket.getnameinfo('cats') }.should raise_error(Exception) { |e|
+      -> { Socket.getnameinfo('cats') }.should.raise(Exception) { |e|
         (e.is_a?(SocketError) || e.is_a?(TypeError)).should == true
       }
     end
@@ -110,7 +110,7 @@ def should_be_valid_dns_name(name)
       end
 
       it 'raises ArgumentError when using an invalid Array' do
-        -> { Socket.getnameinfo([family_name]) }.should raise_error(ArgumentError)
+        -> { Socket.getnameinfo([family_name]) }.should.raise(ArgumentError)
       end
 
       platform_is_not :windows do
@@ -130,7 +130,7 @@ def should_be_valid_dns_name(name)
       describe 'without custom flags' do
         it 'returns an Array containing the hostname and service name' do
           array = Socket.getnameinfo(@addr)
-          array.should be_an_instance_of(Array)
+          array.should.instance_of?(Array)
           array[0].should == @hostname
           array[1].should == 'ftp'
         end
@@ -139,7 +139,7 @@ def should_be_valid_dns_name(name)
           addr = [family_name, 21, ip_address, nil]
 
           array = Socket.getnameinfo(addr)
-          array.should be_an_instance_of(Array)
+          array.should.instance_of?(Array)
           array[0].should == @hostname
           array[1].should == 'ftp'
         end
diff --git a/spec/ruby/library/socket/socket/getservbyname_spec.rb b/spec/ruby/library/socket/socket/getservbyname_spec.rb
index d361e619f21..4a88444fffd 100644
--- a/spec/ruby/library/socket/socket/getservbyname_spec.rb
+++ b/spec/ruby/library/socket/socket/getservbyname_spec.rb
@@ -27,6 +27,6 @@
   end
 
   it "raises a SocketError when the service or port is invalid" do
-    -> { Socket.getservbyname('invalid') }.should raise_error(SocketError)
+    -> { Socket.getservbyname('invalid') }.should.raise(SocketError)
   end
 end
diff --git a/spec/ruby/library/socket/socket/getservbyport_spec.rb b/spec/ruby/library/socket/socket/getservbyport_spec.rb
index 563c592b549..7e4b75fa52c 100644
--- a/spec/ruby/library/socket/socket/getservbyport_spec.rb
+++ b/spec/ruby/library/socket/socket/getservbyport_spec.rb
@@ -18,6 +18,6 @@
   end
 
   it 'raises SocketError for an unknown port number' do
-    -> { Socket.getservbyport(0) }.should raise_error(SocketError)
+    -> { Socket.getservbyport(0) }.should.raise(SocketError)
   end
 end
diff --git a/spec/ruby/library/socket/socket/initialize_spec.rb b/spec/ruby/library/socket/socket/initialize_spec.rb
index f8337bcaa5d..a8fb1c61fad 100644
--- a/spec/ruby/library/socket/socket/initialize_spec.rb
+++ b/spec/ruby/library/socket/socket/initialize_spec.rb
@@ -13,7 +13,7 @@
     it 'returns a Socket' do
       @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM)
 
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
   end
 
@@ -21,7 +21,7 @@
     it 'returns a Socket' do
       @socket = Socket.new(:INET, :STREAM)
 
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
   end
 
@@ -29,7 +29,7 @@
     it 'returns a Socket' do
       @socket = Socket.new('INET', 'STREAM')
 
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
   end
 
@@ -43,7 +43,7 @@
 
       @socket = Socket.new(family, type)
 
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
 
     it 'raises TypeError when the #to_str method does not return a String' do
@@ -53,7 +53,7 @@
       family.stub!(:to_str).and_return(Socket::AF_INET)
       type.stub!(:to_str).and_return(Socket::SOCK_STREAM)
 
-      -> { Socket.new(family, type) }.should raise_error(TypeError)
+      -> { Socket.new(family, type) }.should.raise(TypeError)
     end
   end
 
@@ -61,11 +61,11 @@
     it 'returns a Socket when using an Integer' do
       @socket = Socket.new(:INET, :STREAM, Socket::IPPROTO_TCP)
 
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
 
     it 'raises TypeError when using a Symbol' do
-      -> { Socket.new(:INET, :STREAM, :TCP) }.should raise_error(TypeError)
+      -> { Socket.new(:INET, :STREAM, :TCP) }.should.raise(TypeError)
     end
   end
 
@@ -82,6 +82,6 @@
 
   it "sets the socket to binary mode" do
     @socket = Socket.new(:INET, :STREAM)
-    @socket.binmode?.should be_true
+    @socket.binmode?.should == true
   end
 end
diff --git a/spec/ruby/library/socket/socket/ip_address_list_spec.rb b/spec/ruby/library/socket/socket/ip_address_list_spec.rb
index f97c2d7f85b..2c4e008af19 100644
--- a/spec/ruby/library/socket/socket/ip_address_list_spec.rb
+++ b/spec/ruby/library/socket/socket/ip_address_list_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'Socket.ip_address_list' do
   it 'returns an Array' do
-    Socket.ip_address_list.should be_an_instance_of(Array)
+    Socket.ip_address_list.should.instance_of?(Array)
   end
 
   describe 'the returned Array' do
@@ -11,12 +11,12 @@
     end
 
     it 'is not empty' do
-      @array.should_not be_empty
+      @array.should_not.empty?
     end
 
     it 'contains Addrinfo objects' do
       @array.each do |klass|
-        klass.should be_an_instance_of(Addrinfo)
+        klass.should.instance_of?(Addrinfo)
       end
     end
   end
@@ -28,8 +28,8 @@
 
     it 'has a non-empty IP address' do
       @array.each do |addr|
-        addr.ip_address.should be_an_instance_of(String)
-        addr.ip_address.should_not be_empty
+        addr.ip_address.should.instance_of?(String)
+        addr.ip_address.should_not.empty?
       end
     end
 
diff --git a/spec/ruby/library/socket/socket/listen_spec.rb b/spec/ruby/library/socket/socket/listen_spec.rb
index 4d2aedab191..7986a0225cc 100644
--- a/spec/ruby/library/socket/socket/listen_spec.rb
+++ b/spec/ruby/library/socket/socket/listen_spec.rb
@@ -7,7 +7,7 @@
   end
 
   after :each do
-    @socket.closed?.should be_false
+    @socket.closed?.should == false
     @socket.close
   end
 
@@ -35,7 +35,7 @@
       end
 
       it 'raises Errno::EOPNOTSUPP or Errno::EACCES' do
-        -> { @server.listen(1) }.should raise_error { |e|
+        -> { @server.listen(1) }.should.raise { |e|
           [Errno::EOPNOTSUPP, Errno::EACCES].should.include?(e.class)
         }
       end
@@ -59,7 +59,7 @@
       end
 
       it "raises when the given argument can't be coerced to an Integer" do
-        -> { @server.listen('cats') }.should raise_error(TypeError)
+        -> { @server.listen('cats') }.should.raise(TypeError)
       end
     end
   end
diff --git a/spec/ruby/library/socket/socket/local_address_spec.rb b/spec/ruby/library/socket/socket/local_address_spec.rb
index 3687f93a0c4..86b053fc3e2 100644
--- a/spec/ruby/library/socket/socket/local_address_spec.rb
+++ b/spec/ruby/library/socket/socket/local_address_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it 'returns an Addrinfo' do
-    @sock.local_address.should be_an_instance_of(Addrinfo)
+    @sock.local_address.should.instance_of?(Addrinfo)
   end
 
   describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb b/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
index 38a9f5ff5bc..ab29435a1d7 100644
--- a/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
@@ -16,7 +16,7 @@
     platform_is_not :windows do
       describe 'using an unbound socket' do
         it 'raises IO::WaitReadable' do
-          -> { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
+          -> { @server.recvfrom_nonblock(1) }.should.raise(IO::WaitReadable)
         end
       end
     end
@@ -29,7 +29,7 @@
 
       describe 'without any data available' do
         it 'raises IO::WaitReadable' do
-          -> { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
+          -> { @server.recvfrom_nonblock(1) }.should.raise(IO::WaitReadable)
         end
 
         it 'returns :wait_readable with exception: false' do
@@ -47,7 +47,7 @@
             IO.select([@server])
             ret = @server.recvfrom_nonblock(1)
 
-            ret.should be_an_instance_of(Array)
+            ret.should.instance_of?(Array)
             ret.length.should == 2
           end
         end
@@ -98,7 +98,7 @@
             end
 
             it 'contains an Addrinfo at index 1' do
-              @array[1].should be_an_instance_of(Addrinfo)
+              @array[1].should.instance_of?(Addrinfo)
             end
           end
 
@@ -175,13 +175,13 @@
         end
 
         Thread.pass while t.status and t.status != "sleep"
-        t.status.should_not be_nil
+        t.status.should_not == nil
 
         @client.connect(@server_addr)
         @client.close
         ready = true
 
-        t.value.should be_nil
+        t.value.should == nil
       end
     end
   end
diff --git a/spec/ruby/library/socket/socket/recvfrom_spec.rb b/spec/ruby/library/socket/socket/recvfrom_spec.rb
index cbbc162f6b0..0f319fc47ce 100644
--- a/spec/ruby/library/socket/socket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/socket/recvfrom_spec.rb
@@ -39,7 +39,7 @@
         it 'returns an Array containing the data and an Addrinfo' do
           ret = @server.recvfrom(1)
 
-          ret.should be_an_instance_of(Array)
+          ret.should.instance_of?(Array)
           ret.length.should == 2
         end
 
@@ -53,7 +53,7 @@
           end
 
           it 'contains an Addrinfo at index 1' do
-            @array[1].should be_an_instance_of(Addrinfo)
+            @array[1].should.instance_of?(Addrinfo)
           end
         end
 
@@ -120,12 +120,12 @@
         end
 
         Thread.pass while t.status and t.status != "sleep"
-        t.status.should_not be_nil
+        t.status.should_not == nil
 
         @client.connect(@server_addr)
         @client.close
 
-        t.value.should be_nil
+        t.value.should == nil
       end
     end
 
diff --git a/spec/ruby/library/socket/socket/remote_address_spec.rb b/spec/ruby/library/socket/socket/remote_address_spec.rb
index 24d60d7f582..f72ec50ed7a 100644
--- a/spec/ruby/library/socket/socket/remote_address_spec.rb
+++ b/spec/ruby/library/socket/socket/remote_address_spec.rb
@@ -22,7 +22,7 @@
     end
 
     it 'returns an Addrinfo' do
-      @client.remote_address.should be_an_instance_of(Addrinfo)
+      @client.remote_address.should.instance_of?(Addrinfo)
     end
 
     describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/socket/sysaccept_spec.rb b/spec/ruby/library/socket/socket/sysaccept_spec.rb
index 92ac21124ed..3e7078f7459 100644
--- a/spec/ruby/library/socket/socket/sysaccept_spec.rb
+++ b/spec/ruby/library/socket/socket/sysaccept_spec.rb
@@ -15,7 +15,7 @@
     platform_is :linux do # hangs on other platforms
       describe 'using an unbound socket'  do
         it 'raises Errno::EINVAL' do
-          -> { @server.sysaccept }.should raise_error(Errno::EINVAL)
+          -> { @server.sysaccept }.should.raise(Errno::EINVAL)
         end
       end
 
@@ -25,7 +25,7 @@
         end
 
         it 'raises Errno::EINVAL' do
-          -> { @server.sysaccept }.should raise_error(Errno::EINVAL)
+          -> { @server.sysaccept }.should.raise(Errno::EINVAL)
         end
       end
     end
@@ -59,7 +59,7 @@
 
           @client.connect(@server_addr)
 
-          thread.value.should be_an_instance_of(Array)
+          thread.value.should.instance_of?(Array)
         end
       end
 
@@ -76,8 +76,8 @@
         it 'returns an Array containing an Integer and an Addrinfo' do
           @fd, addrinfo = @server.sysaccept
 
-          @fd.should be_kind_of(Integer)
-          addrinfo.should be_an_instance_of(Addrinfo)
+          @fd.should.is_a?(Integer)
+          addrinfo.should.instance_of?(Addrinfo)
         end
 
         it 'returns a new file descriptor' do
diff --git a/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb b/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb
index a46c6df5c65..4e39d01d722 100644
--- a/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb
@@ -47,8 +47,8 @@
       # complete.
       thread.join
 
-      @sock.should be_an_instance_of(Socket)
-      addr.should be_an_instance_of(Addrinfo)
+      @sock.should.instance_of?(Socket)
+      addr.should.instance_of?(Addrinfo)
     end
   end
 end
diff --git a/spec/ruby/library/socket/socket/tcp_server_sockets_spec.rb b/spec/ruby/library/socket/socket/tcp_server_sockets_spec.rb
index bd496d30156..b6cdb3c5839 100644
--- a/spec/ruby/library/socket/socket/tcp_server_sockets_spec.rb
+++ b/spec/ruby/library/socket/socket/tcp_server_sockets_spec.rb
@@ -13,16 +13,16 @@
     it 'returns an Array of Socket objects' do
       @sockets = Socket.tcp_server_sockets(0)
 
-      @sockets.should be_an_instance_of(Array)
-      @sockets[0].should be_an_instance_of(Socket)
+      @sockets.should.instance_of?(Array)
+      @sockets[0].should.instance_of?(Socket)
     end
   end
 
   describe 'with a block' do
     it 'yields the sockets to the supplied block' do
       Socket.tcp_server_sockets(0) do |sockets|
-        sockets.should be_an_instance_of(Array)
-        sockets[0].should be_an_instance_of(Socket)
+        sockets.should.instance_of?(Array)
+        sockets[0].should.instance_of?(Socket)
       end
     end
 
diff --git a/spec/ruby/library/socket/socket/tcp_spec.rb b/spec/ruby/library/socket/socket/tcp_spec.rb
index faf020b1ead..f52198b0028 100644
--- a/spec/ruby/library/socket/socket/tcp_spec.rb
+++ b/spec/ruby/library/socket/socket/tcp_spec.rb
@@ -22,12 +22,12 @@
   it 'returns a Socket when no block is given' do
     @client = Socket.tcp(@host, @port)
 
-    @client.should be_an_instance_of(Socket)
+    @client.should.instance_of?(Socket)
   end
 
   it 'yields the Socket when a block is given' do
     Socket.tcp(@host, @port) do |socket|
-      socket.should be_an_instance_of(Socket)
+      socket.should.instance_of?(Socket)
     end
   end
 
@@ -51,7 +51,7 @@
   it 'raises ArgumentError when 6 arguments are provided' do
     -> {
       Socket.tcp(@host, @port, @host, 0, {:connect_timeout => 1}, 10)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it 'connects to the server' do
diff --git a/spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb b/spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb
index cb8c5c5587c..9197509f1f7 100644
--- a/spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb
+++ b/spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb
@@ -41,7 +41,7 @@
       end
 
       msg.should == 'hello'
-      src.should be_an_instance_of(Socket::UDPSource)
+      src.should.instance_of?(Socket::UDPSource)
     end
   end
 end
diff --git a/spec/ruby/library/socket/socket/udp_server_loop_spec.rb b/spec/ruby/library/socket/socket/udp_server_loop_spec.rb
index cd22ea56cff..d44d522c20c 100644
--- a/spec/ruby/library/socket/socket/udp_server_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/udp_server_loop_spec.rb
@@ -53,7 +53,7 @@
       thread.join
 
       msg.should == 'hello'
-      src.should be_an_instance_of(Socket::UDPSource)
+      src.should.instance_of?(Socket::UDPSource)
     end
   end
 end
diff --git a/spec/ruby/library/socket/socket/udp_server_recv_spec.rb b/spec/ruby/library/socket/socket/udp_server_recv_spec.rb
index 47ed74bc030..34e22805586 100644
--- a/spec/ruby/library/socket/socket/udp_server_recv_spec.rb
+++ b/spec/ruby/library/socket/socket/udp_server_recv_spec.rb
@@ -30,6 +30,6 @@
     end
 
     msg.should == 'hello'
-    src.should be_an_instance_of(Socket::UDPSource)
+    src.should.instance_of?(Socket::UDPSource)
   end
 end
diff --git a/spec/ruby/library/socket/socket/udp_server_sockets_spec.rb b/spec/ruby/library/socket/socket/udp_server_sockets_spec.rb
index f8be672612a..cb357977d66 100644
--- a/spec/ruby/library/socket/socket/udp_server_sockets_spec.rb
+++ b/spec/ruby/library/socket/socket/udp_server_sockets_spec.rb
@@ -13,16 +13,16 @@
     it 'returns an Array of Socket objects' do
       @sockets = Socket.udp_server_sockets(0)
 
-      @sockets.should be_an_instance_of(Array)
-      @sockets[0].should be_an_instance_of(Socket)
+      @sockets.should.instance_of?(Array)
+      @sockets[0].should.instance_of?(Socket)
     end
   end
 
   describe 'with a block' do
     it 'yields the sockets to the supplied block' do
       Socket.udp_server_sockets(0) do |sockets|
-        sockets.should be_an_instance_of(Array)
-        sockets[0].should be_an_instance_of(Socket)
+        sockets.should.instance_of?(Array)
+        sockets[0].should.instance_of?(Socket)
       end
     end
 
diff --git a/spec/ruby/library/socket/socket/unix_server_loop_spec.rb b/spec/ruby/library/socket/socket/unix_server_loop_spec.rb
index 6192bc8bf6d..9d35a995bc4 100644
--- a/spec/ruby/library/socket/socket/unix_server_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/unix_server_loop_spec.rb
@@ -49,8 +49,8 @@
 
       thread.join
 
-      @sock.should be_an_instance_of(Socket)
-      addr.should be_an_instance_of(Addrinfo)
+      @sock.should.instance_of?(Socket)
+      addr.should.instance_of?(Addrinfo)
     end
   end
 end
diff --git a/spec/ruby/library/socket/socket/unix_server_socket_spec.rb b/spec/ruby/library/socket/socket/unix_server_socket_spec.rb
index 34c3b96d077..da9671bf8c7 100644
--- a/spec/ruby/library/socket/socket/unix_server_socket_spec.rb
+++ b/spec/ruby/library/socket/socket/unix_server_socket_spec.rb
@@ -22,14 +22,14 @@
     it 'returns a Socket' do
       @socket = Socket.unix_server_socket(@path)
 
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
   end
 
   describe 'when a block is given' do
     it 'yields a Socket' do
       Socket.unix_server_socket(@path) do |sock|
-        sock.should be_an_instance_of(Socket)
+        sock.should.instance_of?(Socket)
       end
     end
 
@@ -40,7 +40,7 @@
         socket = sock
       end
 
-      socket.should be_an_instance_of(Socket)
+      socket.should.instance_of?(Socket)
     end
   end
 end
diff --git a/spec/ruby/library/socket/socket/unix_spec.rb b/spec/ruby/library/socket/socket/unix_spec.rb
index 2a5d77f96fd..87f4938871a 100644
--- a/spec/ruby/library/socket/socket/unix_spec.rb
+++ b/spec/ruby/library/socket/socket/unix_spec.rb
@@ -19,14 +19,14 @@
     it 'returns a Socket' do
       @socket = Socket.unix(@path)
 
-      @socket.should be_an_instance_of(Socket)
+      @socket.should.instance_of?(Socket)
     end
   end
 
   describe 'when a block is given' do
     it 'yields a Socket' do
       Socket.unix(@path) do |sock|
-        sock.should be_an_instance_of(Socket)
+        sock.should.instance_of?(Socket)
       end
     end
 
diff --git a/spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb b/spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb
index 935b5cb5439..35d46b0fd09 100644
--- a/spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb
+++ b/spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb
@@ -34,11 +34,11 @@
 
   it "raises an ArgumentError when the sin_family is not AF_INET" do
     sockaddr = Socket.sockaddr_un '/tmp/x'
-    -> { Socket.unpack_sockaddr_in sockaddr }.should raise_error(ArgumentError)
+    -> { Socket.unpack_sockaddr_in sockaddr }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError when passed addrinfo is not AF_INET/AF_INET6" do
     addrinfo = Addrinfo.unix('/tmp/sock')
-    -> { Socket.unpack_sockaddr_in(addrinfo) }.should raise_error(ArgumentError)
+    -> { Socket.unpack_sockaddr_in(addrinfo) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb b/spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb
index 6e0f11de3d2..85a941cfc22 100644
--- a/spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb
+++ b/spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb
@@ -14,11 +14,11 @@
 
   it 'raises an ArgumentError when the sa_family is not AF_UNIX' do
     sockaddr = Socket.sockaddr_in(0, '127.0.0.1')
-    -> { Socket.unpack_sockaddr_un(sockaddr) }.should raise_error(ArgumentError)
+    -> { Socket.unpack_sockaddr_un(sockaddr) }.should.raise(ArgumentError)
   end
 
   it 'raises an ArgumentError when passed addrinfo is not AF_UNIX' do
     addrinfo = Addrinfo.tcp('127.0.0.1', 0)
-    -> { Socket.unpack_sockaddr_un(addrinfo) }.should raise_error(ArgumentError)
+    -> { Socket.unpack_sockaddr_un(addrinfo) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb b/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb
index 91f6a327f03..ac08fe37c6e 100644
--- a/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb
@@ -15,7 +15,7 @@
     @server.listen(5)
     -> {
       @server.accept_nonblock
-    }.should raise_error(IO::WaitReadable)
+    }.should.raise(IO::WaitReadable)
 
     c = TCPSocket.new("127.0.0.1", @port)
     IO.select([@server])
@@ -25,7 +25,7 @@
 
     port.should == @port
     address.should == "127.0.0.1"
-    s.should be_kind_of(TCPSocket)
+    s.should.is_a?(TCPSocket)
 
     c.close
     s.close
@@ -33,12 +33,12 @@
 
   it "raises an IOError if the socket is closed" do
     @server.close
-    -> { @server.accept }.should raise_error(IOError)
+    -> { @server.accept }.should.raise(IOError)
   end
 
   describe 'without a connected client' do
     it 'raises error' do
-      -> { @server.accept_nonblock }.should raise_error(IO::WaitReadable)
+      -> { @server.accept_nonblock }.should.raise(IO::WaitReadable)
     end
 
     it 'returns :wait_readable in exceptionless mode' do
@@ -59,7 +59,7 @@
 
     describe 'without a connected client' do
       it 'raises IO::WaitReadable' do
-        -> { @server.accept_nonblock }.should raise_error(IO::WaitReadable)
+        -> { @server.accept_nonblock }.should.raise(IO::WaitReadable)
       end
     end
 
@@ -77,7 +77,7 @@
         it 'returns a TCPSocket' do
           IO.select([@server])
           @socket = @server.accept_nonblock
-          @socket.should be_an_instance_of(TCPSocket)
+          @socket.should.instance_of?(TCPSocket)
         end
       end
     end
diff --git a/spec/ruby/library/socket/tcpserver/accept_spec.rb b/spec/ruby/library/socket/tcpserver/accept_spec.rb
index d8892cd5f06..f2aa0bf8e1e 100644
--- a/spec/ruby/library/socket/tcpserver/accept_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/accept_spec.rb
@@ -15,7 +15,7 @@
     data = nil
     t = Thread.new do
       client = @server.accept
-      client.should be_kind_of(TCPSocket)
+      client.should.is_a?(TCPSocket)
       data = client.read(5)
       client << "goodbye"
       client.close
@@ -50,7 +50,7 @@
     t = Thread.new {
       -> {
         @server.accept
-      }.should raise_error(Exception, "interrupted")
+      }.should.raise(Exception, "interrupted")
     }
 
     Thread.pass while t.status and t.status != "sleep"
@@ -80,7 +80,7 @@
 
   it "raises an IOError if the socket is closed" do
     @server.close
-    -> { @server.accept }.should raise_error(IOError)
+    -> { @server.accept }.should.raise(IOError)
   end
 end
 
@@ -112,7 +112,7 @@
 
       it 'returns a TCPSocket' do
         @socket = @server.accept
-        @socket.should be_an_instance_of(TCPSocket)
+        @socket.should.instance_of?(TCPSocket)
       end
 
       platform_is_not :windows do
diff --git a/spec/ruby/library/socket/tcpserver/gets_spec.rb b/spec/ruby/library/socket/tcpserver/gets_spec.rb
index 417976d7375..72a72fa2dc4 100644
--- a/spec/ruby/library/socket/tcpserver/gets_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/gets_spec.rb
@@ -11,6 +11,6 @@
   end
 
   it "raises Errno::ENOTCONN on gets" do
-    -> { @server.gets }.should raise_error(Errno::ENOTCONN)
+    -> { @server.gets }.should.raise(Errno::ENOTCONN)
   end
 end
diff --git a/spec/ruby/library/socket/tcpserver/initialize_spec.rb b/spec/ruby/library/socket/tcpserver/initialize_spec.rb
index 4ddd1f465fd..517b014edc3 100644
--- a/spec/ruby/library/socket/tcpserver/initialize_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/initialize_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it 'sets the port to the given argument' do
-      @server.local_address.ip_port.should be_kind_of(Integer)
+      @server.local_address.ip_port.should.is_a?(Integer)
       @server.local_address.ip_port.should > 0
     end
 
@@ -24,7 +24,7 @@
     end
 
     it "sets the socket to binmode" do
-      @server.binmode?.should be_true
+      @server.binmode?.should == true
     end
   end
 
@@ -38,7 +38,7 @@
     end
 
     it 'sets the port to the given argument' do
-      @server.local_address.ip_port.should be_kind_of(Integer)
+      @server.local_address.ip_port.should.is_a?(Integer)
       @server.local_address.ip_port.should > 0
     end
 
@@ -52,7 +52,7 @@
 
   describe 'with a single String argument containing a non numeric value' do
     it 'raises SocketError' do
-      -> { TCPServer.new('cats') }.should raise_error(SocketError)
+      -> { TCPServer.new('cats') }.should.raise(SocketError)
     end
   end
 
@@ -67,7 +67,7 @@
       end
 
       it 'sets the port to the given port argument' do
-        @server.local_address.ip_port.should be_kind_of(Integer)
+        @server.local_address.ip_port.should.is_a?(Integer)
         @server.local_address.ip_port.should > 0
       end
 
@@ -90,7 +90,7 @@
     end
 
     it 'sets the port to the given port argument' do
-      @server.local_address.ip_port.should be_kind_of(Integer)
+      @server.local_address.ip_port.should.is_a?(Integer)
       @server.local_address.ip_port.should > 0
     end
 
diff --git a/spec/ruby/library/socket/tcpserver/listen_spec.rb b/spec/ruby/library/socket/tcpserver/listen_spec.rb
index c877fdced65..5b046ef6f72 100644
--- a/spec/ruby/library/socket/tcpserver/listen_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/listen_spec.rb
@@ -16,7 +16,7 @@
     end
 
     it "raises when the given argument can't be coerced to an Integer" do
-      -> { @server.listen('cats') }.should raise_error(TypeError)
+      -> { @server.listen('cats') }.should.raise(TypeError)
     end
   end
 end
diff --git a/spec/ruby/library/socket/tcpserver/new_spec.rb b/spec/ruby/library/socket/tcpserver/new_spec.rb
index dd1ba676bd9..70b8d4352ee 100644
--- a/spec/ruby/library/socket/tcpserver/new_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/new_spec.rb
@@ -10,7 +10,7 @@
     @server = TCPServer.new('127.0.0.1', 0)
     addr = @server.addr
     addr[0].should == 'AF_INET'
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     # on some platforms (Mac), MRI
     # returns comma at the end.
     addr[2].should =~ /^#{SocketSpecs.hostname}\b/
@@ -20,7 +20,7 @@
   it "binds to localhost and a port with either IPv4 or IPv6" do
     @server = TCPServer.new(SocketSpecs.hostname, 0)
     addr = @server.addr
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     if addr[0] == 'AF_INET'
       addr[2].should =~ /^#{SocketSpecs.hostname}\b/
       addr[3].should == '127.0.0.1'
@@ -34,7 +34,7 @@
     @server = TCPServer.new('', 0)
     addr = @server.addr
     addr[0].should == 'AF_INET'
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     addr[2].should == '0.0.0.0'
     addr[3].should == '0.0.0.0'
   end
@@ -43,7 +43,7 @@
     @server = TCPServer.new('', '0')
     addr = @server.addr
     addr[0].should == 'AF_INET'
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     addr[2].should == '0.0.0.0'
     addr[3].should == '0.0.0.0'
   end
@@ -52,7 +52,7 @@
     @server = TCPServer.new('', nil)
     addr = @server.addr
     addr[0].should == 'AF_INET'
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     addr[2].should == '0.0.0.0'
     addr[3].should == '0.0.0.0'
   end
@@ -61,20 +61,20 @@
     @server = TCPServer.new('', '')
     addr = @server.addr
     addr[0].should == 'AF_INET'
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     addr[2].should == '0.0.0.0'
     addr[3].should == '0.0.0.0'
   end
 
   it "coerces port to string, then determines port from that number or service name" do
-    -> { TCPServer.new(SocketSpecs.hostname, Object.new) }.should raise_error(TypeError)
+    -> { TCPServer.new(SocketSpecs.hostname, Object.new) }.should.raise(TypeError)
 
     port = Object.new
     port.should_receive(:to_str).and_return("0")
 
     @server = TCPServer.new(SocketSpecs.hostname, port)
     addr = @server.addr
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
 
     # TODO: This should also accept strings like 'https', but I don't know how to
     # pick such a service port that will be able to reliably bind...
@@ -83,18 +83,18 @@
   it "has a single argument form and treats it as a port number" do
     @server = TCPServer.new(0)
     addr = @server.addr
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
   end
 
   it "coerces port to a string when it is the only argument" do
-    -> { TCPServer.new(Object.new) }.should raise_error(TypeError)
+    -> { TCPServer.new(Object.new) }.should.raise(TypeError)
 
     port = Object.new
     port.should_receive(:to_str).and_return("0")
 
     @server = TCPServer.new(port)
     addr = @server.addr
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
   end
 
   it "does not use the given block and warns to use TCPServer::open" do
@@ -104,7 +104,7 @@
   end
 
   it "raises Errno::EADDRNOTAVAIL when the address is unknown" do
-    -> { TCPServer.new("1.2.3.4", 0) }.should raise_error(Errno::EADDRNOTAVAIL)
+    -> { TCPServer.new("1.2.3.4", 0) }.should.raise(Errno::EADDRNOTAVAIL)
   end
 
   # There is no way to make this fail-proof on all machines, because
@@ -114,7 +114,7 @@
     it "raises a SocketError when the host is unknown" do
       -> {
         TCPServer.new("--notavalidname", 0)
-      }.should raise_error(SocketError)
+      }.should.raise(SocketError)
     end
   end
 
@@ -122,7 +122,7 @@
     @server = TCPServer.new('127.0.0.1', 0)
     -> {
       @server = TCPServer.new('127.0.0.1', @server.addr[1])
-    }.should raise_error(Errno::EADDRINUSE)
+    }.should.raise(Errno::EADDRINUSE)
   end
 
   platform_is_not :windows, :aix do
diff --git a/spec/ruby/library/socket/tcpserver/sysaccept_spec.rb b/spec/ruby/library/socket/tcpserver/sysaccept_spec.rb
index bd7d33faf47..ed23bced235 100644
--- a/spec/ruby/library/socket/tcpserver/sysaccept_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/sysaccept_spec.rb
@@ -21,7 +21,7 @@
 
       fd = @server.sysaccept
 
-      fd.should be_kind_of(Integer)
+      fd.should.is_a?(Integer)
     ensure
       sock.close if sock && !sock.closed?
       IO.for_fd(fd).close if fd
@@ -58,7 +58,7 @@
       it 'returns a new file descriptor as an Integer' do
         @fd = @server.sysaccept
 
-        @fd.should be_kind_of(Integer)
+        @fd.should.is_a?(Integer)
         @fd.should_not == @client.fileno
       end
     end
diff --git a/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb b/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb
index 5a2c704f352..c6fe0078271 100644
--- a/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb
+++ b/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "returns an array elements of information on the hostname" do
-    @host_info.should be_kind_of(Array)
+    @host_info.should.is_a?(Array)
   end
 
   platform_is_not :windows do
@@ -20,12 +20,12 @@
 
     it "returns the address type as the third value" do
       address_type = @host_info[2]
-      [Socket::AF_INET, Socket::AF_INET6].include?(address_type).should be_true
+      [Socket::AF_INET, Socket::AF_INET6].include?(address_type).should == true
     end
 
     it "returns the IP address as the fourth value" do
       ip = @host_info[3]
-      ["127.0.0.1", "::1"].include?(ip).should be_true
+      ["127.0.0.1", "::1"].include?(ip).should == true
     end
   end
 
@@ -48,14 +48,14 @@
   end
 
   it "returns any aliases to the address as second value" do
-    @host_info[1].should be_kind_of(Array)
+    @host_info[1].should.is_a?(Array)
   end
 end
 
 describe 'TCPSocket.gethostbyname' do
   it 'returns an Array' do
     suppress_warning do
-      TCPSocket.gethostbyname('127.0.0.1').should be_an_instance_of(Array)
+      TCPSocket.gethostbyname('127.0.0.1').should.instance_of?(Array)
     end
   end
 
@@ -72,11 +72,11 @@
       end
 
       it 'includes an array of alternative hostnames as the 2nd value' do
-        @array[1].should be_an_instance_of(Array)
+        @array[1].should.instance_of?(Array)
       end
 
       it 'includes the address family as the 3rd value' do
-        @array[2].should be_kind_of(Integer)
+        @array[2].should.is_a?(Integer)
       end
 
       it 'includes the IP addresses as all the remaining values' do
diff --git a/spec/ruby/library/socket/tcpsocket/initialize_spec.rb b/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
index d7feb9751bb..a33d0b16bac 100644
--- a/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
+++ b/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
@@ -31,7 +31,7 @@
   SocketSpecs.each_ip_protocol do |family, ip_address|
     describe 'when no server is listening on the given address' do
       it 'raises Errno::ECONNREFUSED' do
-        -> { TCPSocket.new(ip_address, 666) }.should raise_error(Errno::ECONNREFUSED)
+        -> { TCPSocket.new(ip_address, 666) }.should.raise(Errno::ECONNREFUSED)
       end
     end
 
@@ -48,21 +48,21 @@
 
       it 'returns a TCPSocket when using an Integer as the port' do
         @client = TCPSocket.new(ip_address, @port)
-        @client.should be_an_instance_of(TCPSocket)
+        @client.should.instance_of?(TCPSocket)
       end
 
       it 'returns a TCPSocket when using a String as the port' do
         @client = TCPSocket.new(ip_address, @port.to_s)
-        @client.should be_an_instance_of(TCPSocket)
+        @client.should.instance_of?(TCPSocket)
       end
 
       it 'raises SocketError when the port number is a non numeric String' do
-        -> { TCPSocket.new(ip_address, 'cats') }.should raise_error(SocketError)
+        -> { TCPSocket.new(ip_address, 'cats') }.should.raise(SocketError)
       end
 
       it 'set the socket to binmode' do
         @client = TCPSocket.new(ip_address, @port)
-        @client.binmode?.should be_true
+        @client.binmode?.should == true
       end
 
       it 'connects to the right address' do
diff --git a/spec/ruby/library/socket/tcpsocket/local_address_spec.rb b/spec/ruby/library/socket/tcpsocket/local_address_spec.rb
index ce66d5ff8fb..5dcf741f290 100644
--- a/spec/ruby/library/socket/tcpsocket/local_address_spec.rb
+++ b/spec/ruby/library/socket/tcpsocket/local_address_spec.rb
@@ -23,7 +23,7 @@
       end
 
       it 'returns an Addrinfo' do
-        @sock.local_address.should be_an_instance_of(Addrinfo)
+        @sock.local_address.should.instance_of?(Addrinfo)
       end
 
       describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/tcpsocket/remote_address_spec.rb b/spec/ruby/library/socket/tcpsocket/remote_address_spec.rb
index eb9dabc0756..085d57b3f9f 100644
--- a/spec/ruby/library/socket/tcpsocket/remote_address_spec.rb
+++ b/spec/ruby/library/socket/tcpsocket/remote_address_spec.rb
@@ -23,7 +23,7 @@
       end
 
       it 'returns an Addrinfo' do
-        @sock.remote_address.should be_an_instance_of(Addrinfo)
+        @sock.remote_address.should.instance_of?(Addrinfo)
       end
 
       describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/tcpsocket/shared/new.rb b/spec/ruby/library/socket/tcpsocket/shared/new.rb
index 0e405253c84..cf4834526d3 100644
--- a/spec/ruby/library/socket/tcpsocket/shared/new.rb
+++ b/spec/ruby/library/socket/tcpsocket/shared/new.rb
@@ -3,21 +3,21 @@
 
 describe :tcpsocket_new, shared: true do
   it "requires a hostname and a port as arguments" do
-    -> { TCPSocket.send(@method) }.should raise_error(ArgumentError)
+    -> { TCPSocket.send(@method) }.should.raise(ArgumentError)
   end
 
   it "refuses the connection when there is no server to connect to" do
     -> do
       TCPSocket.send(@method, SocketSpecs.hostname, SocketSpecs.reserved_unused_port)
-    end.should raise_error(SystemCallError) {|e|
-      [Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL].should include(e.class)
+    end.should.raise(SystemCallError) {|e|
+      [Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL].should.include?(e.class)
     }
   end
 
   it 'raises IO::TimeoutError with :connect_timeout when no server is listening on the given address' do
     -> {
       TCPSocket.send(@method, "192.0.2.1", 80, connect_timeout: 0)
-    }.should raise_error(IO::TimeoutError)
+    }.should.raise(IO::TimeoutError)
   rescue Errno::ENETUNREACH
     # In the case all network interfaces down.
     # raise_error cannot deal with multiple expected exceptions
@@ -39,17 +39,17 @@
 
     it "silently ignores 'nil' as the third parameter" do
       @socket = TCPSocket.send(@method, @hostname, @server.port, nil)
-      @socket.should be_an_instance_of(TCPSocket)
+      @socket.should.instance_of?(TCPSocket)
     end
 
     it "connects to a listening server with host and port" do
       @socket = TCPSocket.send(@method, @hostname, @server.port)
-      @socket.should be_an_instance_of(TCPSocket)
+      @socket.should.instance_of?(TCPSocket)
     end
 
     it "connects to a server when passed local_host argument" do
       @socket = TCPSocket.send(@method, @hostname, @server.port, @hostname)
-      @socket.should be_an_instance_of(TCPSocket)
+      @socket.should.instance_of?(TCPSocket)
     end
 
     it "connects to a server when passed local_host and local_port arguments" do
@@ -70,12 +70,12 @@
         raise if retries >= max_retries
         retry
       end
-      @socket.should be_an_instance_of(TCPSocket)
+      @socket.should.instance_of?(TCPSocket)
     end
 
     it "has an address once it has connected to a listening server" do
       @socket = TCPSocket.send(@method, @hostname, @server.port)
-      @socket.should be_an_instance_of(TCPSocket)
+      @socket.should.instance_of?(TCPSocket)
 
       # TODO: Figure out how to abstract this. You can get AF_INET
       # from 'Socket.getaddrinfo(hostname, nil)[0][3]' but socket.addr
@@ -90,13 +90,13 @@
         @socket.addr[3].should == SocketSpecs.addr(:ipv6)
       end
 
-      @socket.addr[1].should be_kind_of(Integer)
+      @socket.addr[1].should.is_a?(Integer)
       @socket.addr[2].should =~ /^#{@hostname}/
     end
 
     it "connects to a server when passed connect_timeout argument" do
       @socket = TCPSocket.send(@method, @hostname, @server.port, connect_timeout: 1)
-      @socket.should be_an_instance_of(TCPSocket)
+      @socket.should.instance_of?(TCPSocket)
     end
   end
 end
diff --git a/spec/ruby/library/socket/udpsocket/bind_spec.rb b/spec/ruby/library/socket/udpsocket/bind_spec.rb
index 08b386e941f..974e701e71e 100644
--- a/spec/ruby/library/socket/udpsocket/bind_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/bind_spec.rb
@@ -12,7 +12,7 @@
 
   it "binds the socket to a port" do
     @socket.bind(SocketSpecs.hostname, 0)
-    @socket.addr[1].should be_kind_of(Integer)
+    @socket.addr[1].should.is_a?(Integer)
   end
 
   it "raises Errno::EINVAL when already bound" do
@@ -20,7 +20,7 @@
 
     -> {
       @socket.bind(SocketSpecs.hostname, @socket.addr[1])
-    }.should raise_error(Errno::EINVAL)
+    }.should.raise(Errno::EINVAL)
   end
 
   it "receives a hostname and a port" do
diff --git a/spec/ruby/library/socket/udpsocket/initialize_spec.rb b/spec/ruby/library/socket/udpsocket/initialize_spec.rb
index ecf0043c10a..c0401874007 100644
--- a/spec/ruby/library/socket/udpsocket/initialize_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/initialize_spec.rb
@@ -7,27 +7,27 @@
 
   it 'initializes a new UDPSocket' do
     @socket = UDPSocket.new
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'initializes a new UDPSocket using an Integer' do
     @socket = UDPSocket.new(Socket::AF_INET)
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'initializes a new UDPSocket using a Symbol' do
     @socket = UDPSocket.new(:INET)
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'initializes a new UDPSocket using a String' do
     @socket = UDPSocket.new('INET')
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'sets the socket to binmode' do
     @socket = UDPSocket.new(:INET)
-    @socket.binmode?.should be_true
+    @socket.binmode?.should == true
   end
 
   platform_is_not :windows do
@@ -46,8 +46,8 @@
   it 'raises Errno::EAFNOSUPPORT or Errno::EPROTONOSUPPORT when given an invalid address family' do
     -> {
       UDPSocket.new(666)
-    }.should raise_error(SystemCallError) { |e|
-      [Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT].should include(e.class)
+    }.should.raise(SystemCallError) { |e|
+      [Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT].should.include?(e.class)
     }
   end
 end
diff --git a/spec/ruby/library/socket/udpsocket/local_address_spec.rb b/spec/ruby/library/socket/udpsocket/local_address_spec.rb
index 92e4cc10c76..868d2f537e5 100644
--- a/spec/ruby/library/socket/udpsocket/local_address_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/local_address_spec.rb
@@ -28,7 +28,7 @@
       end
 
       it 'returns an Addrinfo' do
-        @sock.local_address.should be_an_instance_of(Addrinfo)
+        @sock.local_address.should.instance_of?(Addrinfo)
       end
 
       describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/udpsocket/new_spec.rb b/spec/ruby/library/socket/udpsocket/new_spec.rb
index 79bfcb624d2..aff111927cd 100644
--- a/spec/ruby/library/socket/udpsocket/new_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/new_spec.rb
@@ -8,22 +8,22 @@
 
   it 'without arguments' do
     @socket = UDPSocket.new
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'using Integer argument' do
     @socket = UDPSocket.new(Socket::AF_INET)
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'using Symbol argument' do
     @socket = UDPSocket.new(:INET)
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'using String argument' do
     @socket = UDPSocket.new('INET')
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it "does not use the given block and warns to use UDPSocket::open" do
@@ -33,8 +33,8 @@
   end
 
   it 'raises Errno::EAFNOSUPPORT or Errno::EPROTONOSUPPORT if unsupported family passed' do
-    -> { UDPSocket.new(-1) }.should raise_error(SystemCallError) { |e|
-      [Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT].should include(e.class)
+    -> { UDPSocket.new(-1) }.should.raise(SystemCallError) { |e|
+      [Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT].should.include?(e.class)
     }
   end
 end
diff --git a/spec/ruby/library/socket/udpsocket/open_spec.rb b/spec/ruby/library/socket/udpsocket/open_spec.rb
index e4dbb2ee2ab..7c778553724 100644
--- a/spec/ruby/library/socket/udpsocket/open_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/open_spec.rb
@@ -8,6 +8,6 @@
 
   it "allows calls to open without arguments" do
     @socket = UDPSocket.open
-    @socket.should be_kind_of(UDPSocket)
+    @socket.should.is_a?(UDPSocket)
   end
 end
diff --git a/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb b/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
index b8040995897..460cf2c9a2a 100644
--- a/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
@@ -16,7 +16,7 @@
     platform_is_not :windows do
       describe 'using an unbound socket' do
         it 'raises IO::WaitReadable' do
-          -> { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
+          -> { @server.recvfrom_nonblock(1) }.should.raise(IO::WaitReadable)
         end
       end
     end
@@ -32,7 +32,7 @@
 
       describe 'without any data available' do
         it 'raises IO::WaitReadable' do
-          -> { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
+          -> { @server.recvfrom_nonblock(1) }.should.raise(IO::WaitReadable)
         end
 
         it 'returns :wait_readable with exception: false' do
@@ -48,7 +48,7 @@
 
           it 'returns an Array containing the data and an Array' do
             IO.select([@server])
-            @server.recvfrom_nonblock(1).should be_an_instance_of(Array)
+            @server.recvfrom_nonblock(1).should.instance_of?(Array)
           end
 
           it 'writes the data to the buffer when one is present' do
@@ -78,7 +78,7 @@
             end
 
             it 'contains an Array at index 1' do
-              @array[1].should be_an_instance_of(Array)
+              @array[1].should.instance_of?(Array)
             end
           end
 
diff --git a/spec/ruby/library/socket/udpsocket/remote_address_spec.rb b/spec/ruby/library/socket/udpsocket/remote_address_spec.rb
index 94889ce560c..d1310200fc8 100644
--- a/spec/ruby/library/socket/udpsocket/remote_address_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/remote_address_spec.rb
@@ -28,7 +28,7 @@
       end
 
       it 'returns an Addrinfo' do
-        @sock.remote_address.should be_an_instance_of(Addrinfo)
+        @sock.remote_address.should.instance_of?(Addrinfo)
       end
 
       describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/udpsocket/send_spec.rb b/spec/ruby/library/socket/udpsocket/send_spec.rb
index 6dd5f67bea1..63f5b0dcc6b 100644
--- a/spec/ruby/library/socket/udpsocket/send_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/send_spec.rb
@@ -34,7 +34,7 @@
 
     @msg[0].should == "ad hoc"
     @msg[1][0].should == "AF_INET"
-    @msg[1][1].should be_kind_of(Integer)
+    @msg[1][1].should.is_a?(Integer)
     @msg[1][3].should == "127.0.0.1"
   end
 
@@ -46,7 +46,7 @@
 
     @msg[0].should == "ad hoc"
     @msg[1][0].should == "AF_INET"
-    @msg[1][1].should be_kind_of(Integer)
+    @msg[1][1].should.is_a?(Integer)
     @msg[1][3].should == "127.0.0.1"
   end
 
@@ -59,7 +59,7 @@
 
     @msg[0].should == "connection-based"
     @msg[1][0].should == "AF_INET"
-    @msg[1][1].should be_kind_of(Integer)
+    @msg[1][1].should.is_a?(Integer)
     @msg[1][3].should == "127.0.0.1"
   end
 
@@ -68,7 +68,7 @@
     begin
       -> do
         @socket.send('1' * 100_000, 0, SocketSpecs.hostname, @port.to_s)
-      end.should raise_error(Errno::EMSGSIZE)
+      end.should.raise(Errno::EMSGSIZE)
     ensure
       @socket.send("ad hoc", 0, SocketSpecs.hostname, @port)
       @socket.close
@@ -96,7 +96,7 @@
     describe 'using a disconnected socket' do
       describe 'without a destination address' do
         it "raises #{SocketSpecs.dest_addr_req_error}" do
-          -> { @client.send('hello', 0) }.should raise_error(SocketSpecs.dest_addr_req_error)
+          -> { @client.send('hello', 0) }.should.raise(SocketSpecs.dest_addr_req_error)
         end
       end
 
@@ -108,7 +108,7 @@
         it 'does not persist the connection after sending data' do
           @client.send('hello', 0, @addr.ip_address, @addr.ip_port)
 
-          -> { @client.send('hello', 0) }.should raise_error(SocketSpecs.dest_addr_req_error)
+          -> { @client.send('hello', 0) }.should.raise(SocketSpecs.dest_addr_req_error)
         end
       end
 
diff --git a/spec/ruby/library/socket/udpsocket/write_spec.rb b/spec/ruby/library/socket/udpsocket/write_spec.rb
index c971f29b628..d41ee078d84 100644
--- a/spec/ruby/library/socket/udpsocket/write_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/write_spec.rb
@@ -12,7 +12,7 @@
 
       -> do
         s2.write('1' * 100_000)
-      end.should raise_error(Errno::EMSGSIZE)
+      end.should.raise(Errno::EMSGSIZE)
     ensure
       s1.close if s1 && !s1.closed?
       s2.close if s2 && !s2.closed?
diff --git a/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb b/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
index f67941b296d..531d8516580 100644
--- a/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
+++ b/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
@@ -24,7 +24,7 @@
   end
 
   it "returns a UNIXSocket" do
-    @socket.should be_kind_of(UNIXSocket)
+    @socket.should.is_a?(UNIXSocket)
   end
 
   it 'returns :wait_readable in exceptionless mode' do
@@ -45,7 +45,7 @@
 
   describe 'without a client' do
     it 'raises IO::WaitReadable' do
-      -> { @server.accept_nonblock }.should raise_error(IO::WaitReadable)
+      -> { @server.accept_nonblock }.should.raise(IO::WaitReadable)
     end
   end
 
@@ -62,7 +62,7 @@
     describe 'without any data' do
       it 'returns a UNIXSocket' do
         @socket = @server.accept_nonblock
-        @socket.should be_an_instance_of(UNIXSocket)
+        @socket.should.instance_of?(UNIXSocket)
       end
     end
 
@@ -73,7 +73,7 @@
 
       it 'returns a UNIXSocket' do
         @socket = @server.accept_nonblock
-        @socket.should be_an_instance_of(UNIXSocket)
+        @socket.should.instance_of?(UNIXSocket)
       end
 
       describe 'the returned UNIXSocket' do
diff --git a/spec/ruby/library/socket/unixserver/accept_spec.rb b/spec/ruby/library/socket/unixserver/accept_spec.rb
index cc2c922b6fc..8f3ea50966f 100644
--- a/spec/ruby/library/socket/unixserver/accept_spec.rb
+++ b/spec/ruby/library/socket/unixserver/accept_spec.rb
@@ -22,7 +22,7 @@
       data, info = sock.recvfrom(5)
 
       data.should == 'hello'
-      info.should_not be_empty
+      info.should_not.empty?
     ensure
       sock.close
       client.close
@@ -49,7 +49,7 @@
     t = Thread.new {
       -> {
         @server.accept
-      }.should raise_error(Exception, "interrupted")
+      }.should.raise(Exception, "interrupted")
     }
 
     Thread.pass while t.status and t.status != "sleep"
@@ -88,7 +88,7 @@
     describe 'without any data' do
       it 'returns a UNIXSocket' do
         @socket = @server.accept
-        @socket.should be_an_instance_of(UNIXSocket)
+        @socket.should.instance_of?(UNIXSocket)
       end
     end
 
@@ -99,7 +99,7 @@
 
       it 'returns a UNIXSocket' do
         @socket = @server.accept
-        @socket.should be_an_instance_of(UNIXSocket)
+        @socket.should.instance_of?(UNIXSocket)
       end
 
       describe 'the returned UNIXSocket' do
diff --git a/spec/ruby/library/socket/unixserver/initialize_spec.rb b/spec/ruby/library/socket/unixserver/initialize_spec.rb
index 3728a307b05..ca1dd301f0f 100644
--- a/spec/ruby/library/socket/unixserver/initialize_spec.rb
+++ b/spec/ruby/library/socket/unixserver/initialize_spec.rb
@@ -13,14 +13,14 @@
   end
 
   it 'returns a new UNIXServer' do
-    @server.should be_an_instance_of(UNIXServer)
+    @server.should.instance_of?(UNIXServer)
   end
 
   it 'sets the socket to binmode' do
-    @server.binmode?.should be_true
+    @server.binmode?.should == true
   end
 
   it 'raises Errno::EADDRINUSE when the socket is already in use' do
-    -> { UNIXServer.new(@path) }.should raise_error(Errno::EADDRINUSE)
+    -> { UNIXServer.new(@path) }.should.raise(Errno::EADDRINUSE)
   end
 end
diff --git a/spec/ruby/library/socket/unixserver/sysaccept_spec.rb b/spec/ruby/library/socket/unixserver/sysaccept_spec.rb
index c4a4ecc824b..5970c011147 100644
--- a/spec/ruby/library/socket/unixserver/sysaccept_spec.rb
+++ b/spec/ruby/library/socket/unixserver/sysaccept_spec.rb
@@ -32,7 +32,7 @@
     describe 'without any data' do
       it 'returns an Integer' do
         @fd = @server.sysaccept
-        @fd.should be_kind_of(Integer)
+        @fd.should.is_a?(Integer)
       end
     end
 
@@ -43,7 +43,7 @@
 
       it 'returns an Integer' do
         @fd = @server.sysaccept
-        @fd.should be_kind_of(Integer)
+        @fd.should.is_a?(Integer)
       end
     end
   end
diff --git a/spec/ruby/library/socket/unixsocket/addr_spec.rb b/spec/ruby/library/socket/unixsocket/addr_spec.rb
index 1afe9b12dc4..b3ae2af5d83 100644
--- a/spec/ruby/library/socket/unixsocket/addr_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/addr_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it "returns an array" do
-    @client.addr.should be_kind_of(Array)
+    @client.addr.should.is_a?(Array)
   end
 
   it "returns the address family of this socket in an array" do
diff --git a/spec/ruby/library/socket/unixsocket/initialize_spec.rb b/spec/ruby/library/socket/unixsocket/initialize_spec.rb
index 5dccfcc7456..ac30b93de0c 100644
--- a/spec/ruby/library/socket/unixsocket/initialize_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/initialize_spec.rb
@@ -5,14 +5,14 @@
   describe 'using a non existing path' do
     platform_is_not :windows do
       it 'raises Errno::ENOENT' do
-        -> { UNIXSocket.new(SocketSpecs.socket_path) }.should raise_error(Errno::ENOENT)
+        -> { UNIXSocket.new(SocketSpecs.socket_path) }.should.raise(Errno::ENOENT)
       end
     end
 
     platform_is :windows do
       # Why, Windows, why?
       it 'raises Errno::ECONNREFUSED' do
-        -> { UNIXSocket.new(SocketSpecs.socket_path) }.should raise_error(Errno::ECONNREFUSED)
+        -> { UNIXSocket.new(SocketSpecs.socket_path) }.should.raise(Errno::ECONNREFUSED)
       end
     end
   end
@@ -31,7 +31,7 @@
     end
 
     it 'returns a new UNIXSocket' do
-      @socket.should be_an_instance_of(UNIXSocket)
+      @socket.should.instance_of?(UNIXSocket)
     end
 
     it 'sets the socket path to an empty String' do
@@ -39,7 +39,7 @@
     end
 
     it 'sets the socket to binmode' do
-      @socket.binmode?.should be_true
+      @socket.binmode?.should == true
     end
 
     platform_is_not :windows do
diff --git a/spec/ruby/library/socket/unixsocket/local_address_spec.rb b/spec/ruby/library/socket/unixsocket/local_address_spec.rb
index 0fdec382930..fc504698c3b 100644
--- a/spec/ruby/library/socket/unixsocket/local_address_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/local_address_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it 'returns an Addrinfo' do
-    @client.local_address.should be_an_instance_of(Addrinfo)
+    @client.local_address.should.instance_of?(Addrinfo)
   end
 
   describe 'the returned Addrinfo' do
@@ -57,7 +57,7 @@
   end
 
   it 'returns an Addrinfo' do
-    @sock.local_address.should be_an_instance_of(Addrinfo)
+    @sock.local_address.should.instance_of?(Addrinfo)
   end
 
   describe 'the returned Addrinfo' do
@@ -76,13 +76,13 @@
     it 'raises SocketError for #ip_address' do
       -> {
         @sock.local_address.ip_address
-      }.should raise_error(SocketError, "need IPv4 or IPv6 address")
+      }.should.raise(SocketError, "need IPv4 or IPv6 address")
     end
 
     it 'raises SocketError for #ip_port' do
       -> {
         @sock.local_address.ip_port
-      }.should raise_error(SocketError, "need IPv4 or IPv6 address")
+      }.should.raise(SocketError, "need IPv4 or IPv6 address")
     end
 
     it 'uses 0 as the protocol' do
diff --git a/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb b/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
index 10cab13b422..b586b1fcbb6 100644
--- a/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
@@ -21,6 +21,6 @@
   it "raises an error in server sockets" do
     -> {
       @server.peeraddr
-    }.should raise_error(Errno::ENOTCONN)
+    }.should.raise(Errno::ENOTCONN)
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/recv_io_spec.rb b/spec/ruby/library/socket/unixsocket/recv_io_spec.rb
index f0b408f3094..ac9d8923756 100644
--- a/spec/ruby/library/socket/unixsocket/recv_io_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/recv_io_spec.rb
@@ -37,7 +37,7 @@
       @socket = @server.accept
       @io = @socket.recv_io(File)
 
-      @io.should be_an_instance_of(File)
+      @io.should.instance_of?(File)
     end
   end
 
@@ -59,7 +59,7 @@
         @client.send_io(@file)
 
         @io = @server.recv_io
-        @io.should be_an_instance_of(IO)
+        @io.should.instance_of?(IO)
       end
     end
 
@@ -68,7 +68,7 @@
         @client.send_io(@file)
 
         @io = @server.recv_io(File)
-        @io.should be_an_instance_of(File)
+        @io.should.instance_of?(File)
       end
     end
 
@@ -77,7 +77,7 @@
         @client.send_io(@file)
 
         @io = @server.recv_io(File, File::WRONLY)
-        @io.should be_an_instance_of(File)
+        @io.should.instance_of?(File)
       end
     end
   end
diff --git a/spec/ruby/library/socket/unixsocket/remote_address_spec.rb b/spec/ruby/library/socket/unixsocket/remote_address_spec.rb
index 84bdff0a6a7..d2303a6587c 100644
--- a/spec/ruby/library/socket/unixsocket/remote_address_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/remote_address_spec.rb
@@ -16,7 +16,7 @@
   end
 
   it 'returns an Addrinfo' do
-    @client.remote_address.should be_an_instance_of(Addrinfo)
+    @client.remote_address.should.instance_of?(Addrinfo)
   end
 
   describe 'the returned Addrinfo' do
diff --git a/spec/ruby/library/socket/unixsocket/send_io_spec.rb b/spec/ruby/library/socket/unixsocket/send_io_spec.rb
index 52186ec3cf6..0063fc7d3f6 100644
--- a/spec/ruby/library/socket/unixsocket/send_io_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/send_io_spec.rb
@@ -49,7 +49,7 @@
       @client.send_io(@file)
 
       @io = @server.recv_io
-      @io.should be_an_instance_of(IO)
+      @io.should.instance_of?(IO)
     end
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/shared/pair.rb b/spec/ruby/library/socket/unixsocket/shared/pair.rb
index d68ee466bf1..49b6a6a4137 100644
--- a/spec/ruby/library/socket/unixsocket/shared/pair.rb
+++ b/spec/ruby/library/socket/unixsocket/shared/pair.rb
@@ -3,8 +3,8 @@
 
 describe :unixsocket_pair, shared: true do
   it "returns two UNIXSockets" do
-    @s1.should be_an_instance_of(UNIXSocket)
-    @s2.should be_an_instance_of(UNIXSocket)
+    @s1.should.instance_of?(UNIXSocket)
+    @s2.should.instance_of?(UNIXSocket)
   end
 
   it "returns a pair of connected sockets" do
diff --git a/spec/ruby/library/stringio/append_spec.rb b/spec/ruby/library/stringio/append_spec.rb
index cb50d73d1bf..c21ba005080 100644
--- a/spec/ruby/library/stringio/append_spec.rb
+++ b/spec/ruby/library/stringio/append_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "returns self" do
-    (@io << "just testing").should equal(@io)
+    (@io << "just testing").should.equal?(@io)
   end
 
   it "writes the passed argument onto self" do
@@ -31,7 +31,7 @@
 
   it "updates self's position" do
     @io << "test"
-    @io.pos.should eql(4)
+    @io.pos.should.eql?(4)
   end
 
   it "tries to convert the passed argument to a String using #to_s" do
@@ -45,11 +45,11 @@
 describe "StringIO#<< when self is not writable" do
   it "raises an IOError" do
     io = StringIO.new(+"test", "r")
-    -> { io << "test" }.should raise_error(IOError)
+    -> { io << "test" }.should.raise(IOError)
 
     io = StringIO.new(+"test")
     io.close_write
-    -> { io << "test" }.should raise_error(IOError)
+    -> { io << "test" }.should.raise(IOError)
   end
 end
 
@@ -69,6 +69,6 @@
 
   it "correctly updates self's position" do
     @io << ", testing"
-    @io.pos.should eql(16)
+    @io.pos.should.eql?(16)
   end
 end
diff --git a/spec/ruby/library/stringio/binmode_spec.rb b/spec/ruby/library/stringio/binmode_spec.rb
index 9e92c63814e..bc7ccda0a23 100644
--- a/spec/ruby/library/stringio/binmode_spec.rb
+++ b/spec/ruby/library/stringio/binmode_spec.rb
@@ -4,7 +4,7 @@
 describe "StringIO#binmode" do
   it "returns self" do
     io = StringIO.new(+"example")
-    io.binmode.should equal(io)
+    io.binmode.should.equal?(io)
   end
 
   it "changes external encoding to BINARY" do
diff --git a/spec/ruby/library/stringio/close_read_spec.rb b/spec/ruby/library/stringio/close_read_spec.rb
index 0f08e1ff2e5..dd46a927bee 100644
--- a/spec/ruby/library/stringio/close_read_spec.rb
+++ b/spec/ruby/library/stringio/close_read_spec.rb
@@ -7,12 +7,12 @@
   end
 
   it "returns nil" do
-    @io.close_read.should be_nil
+    @io.close_read.should == nil
   end
 
   it "prevents further reading" do
     @io.close_read
-    -> { @io.read(1) }.should raise_error(IOError)
+    -> { @io.read(1) }.should.raise(IOError)
   end
 
   it "allows further writing" do
@@ -22,7 +22,7 @@
 
   it "raises an IOError when in write-only mode" do
     io = StringIO.new(+"example", "w")
-    -> { io.close_read }.should raise_error(IOError)
+    -> { io.close_read }.should.raise(IOError)
 
     io = StringIO.new("example")
     io.close_read
diff --git a/spec/ruby/library/stringio/close_spec.rb b/spec/ruby/library/stringio/close_spec.rb
index 520a8de7824..6febd14a260 100644
--- a/spec/ruby/library/stringio/close_spec.rb
+++ b/spec/ruby/library/stringio/close_spec.rb
@@ -7,17 +7,17 @@
   end
 
   it "returns nil" do
-    @io.close.should be_nil
+    @io.close.should == nil
   end
 
   it "prevents further reading and/or writing" do
     @io.close
-    -> { @io.read(1) }.should raise_error(IOError)
-    -> { @io.write('x') }.should raise_error(IOError)
+    -> { @io.read(1) }.should.raise(IOError)
+    -> { @io.write('x') }.should.raise(IOError)
   end
 
   it "does not raise anything when self was already closed" do
     @io.close
-    -> { @io.close }.should_not raise_error(IOError)
+    -> { @io.close }.should_not.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/close_write_spec.rb b/spec/ruby/library/stringio/close_write_spec.rb
index c86c3f98262..b74b9961662 100644
--- a/spec/ruby/library/stringio/close_write_spec.rb
+++ b/spec/ruby/library/stringio/close_write_spec.rb
@@ -7,12 +7,12 @@
   end
 
   it "returns nil" do
-    @io.close_write.should be_nil
+    @io.close_write.should == nil
   end
 
   it "prevents further writing" do
     @io.close_write
-    -> { @io.write('x') }.should raise_error(IOError)
+    -> { @io.write('x') }.should.raise(IOError)
   end
 
   it "allows further reading" do
@@ -22,7 +22,7 @@
 
   it "raises an IOError when in read-only mode" do
     io = StringIO.new(+"example", "r")
-    -> { io.close_write }.should raise_error(IOError)
+    -> { io.close_write }.should.raise(IOError)
 
     io = StringIO.new(+"example")
     io.close_write
diff --git a/spec/ruby/library/stringio/closed_read_spec.rb b/spec/ruby/library/stringio/closed_read_spec.rb
index b4dcadc3a43..2e3813b1bce 100644
--- a/spec/ruby/library/stringio/closed_read_spec.rb
+++ b/spec/ruby/library/stringio/closed_read_spec.rb
@@ -5,8 +5,8 @@
   it "returns true if self is not readable" do
     io = StringIO.new(+"example", "r+")
     io.close_write
-    io.closed_read?.should be_false
+    io.closed_read?.should == false
     io.close_read
-    io.closed_read?.should be_true
+    io.closed_read?.should == true
   end
 end
diff --git a/spec/ruby/library/stringio/closed_spec.rb b/spec/ruby/library/stringio/closed_spec.rb
index bf7ba63184e..647fe445da6 100644
--- a/spec/ruby/library/stringio/closed_spec.rb
+++ b/spec/ruby/library/stringio/closed_spec.rb
@@ -5,12 +5,12 @@
   it "returns true if self is completely closed" do
     io = StringIO.new(+"example", "r+")
     io.close_read
-    io.closed?.should be_false
+    io.closed?.should == false
     io.close_write
-    io.closed?.should be_true
+    io.closed?.should == true
 
     io = StringIO.new(+"example", "r+")
     io.close
-    io.closed?.should be_true
+    io.closed?.should == true
   end
 end
diff --git a/spec/ruby/library/stringio/closed_write_spec.rb b/spec/ruby/library/stringio/closed_write_spec.rb
index 2bd3e6fa8b6..339691cd826 100644
--- a/spec/ruby/library/stringio/closed_write_spec.rb
+++ b/spec/ruby/library/stringio/closed_write_spec.rb
@@ -5,8 +5,8 @@
   it "returns true if self is not writable" do
     io = StringIO.new(+"example", "r+")
     io.close_read
-    io.closed_write?.should be_false
+    io.closed_write?.should == false
     io.close_write
-    io.closed_write?.should be_true
+    io.closed_write?.should == true
   end
 end
diff --git a/spec/ruby/library/stringio/fcntl_spec.rb b/spec/ruby/library/stringio/fcntl_spec.rb
index a78004d868d..6108130db7e 100644
--- a/spec/ruby/library/stringio/fcntl_spec.rb
+++ b/spec/ruby/library/stringio/fcntl_spec.rb
@@ -3,6 +3,6 @@
 
 describe "StringIO#fcntl" do
   it "raises a NotImplementedError" do
-    -> { StringIO.new("boom").fcntl }.should raise_error(NotImplementedError)
+    -> { StringIO.new("boom").fcntl }.should.raise(NotImplementedError)
   end
 end
diff --git a/spec/ruby/library/stringio/fileno_spec.rb b/spec/ruby/library/stringio/fileno_spec.rb
index 5a9f440a0fc..f5d1e83776f 100644
--- a/spec/ruby/library/stringio/fileno_spec.rb
+++ b/spec/ruby/library/stringio/fileno_spec.rb
@@ -3,6 +3,6 @@
 
 describe "StringIO#fileno" do
   it "returns nil" do
-    StringIO.new("nuffin").fileno.should be_nil
+    StringIO.new("nuffin").fileno.should == nil
   end
 end
diff --git a/spec/ruby/library/stringio/flush_spec.rb b/spec/ruby/library/stringio/flush_spec.rb
index 4dc58b1d486..48be44773ca 100644
--- a/spec/ruby/library/stringio/flush_spec.rb
+++ b/spec/ruby/library/stringio/flush_spec.rb
@@ -4,6 +4,6 @@
 describe "StringIO#flush" do
   it "returns self" do
     io = StringIO.new(+"flush")
-    io.flush.should equal(io)
+    io.flush.should.equal?(io)
   end
 end
diff --git a/spec/ruby/library/stringio/fsync_spec.rb b/spec/ruby/library/stringio/fsync_spec.rb
index 85053cb2e53..30fae15c8e9 100644
--- a/spec/ruby/library/stringio/fsync_spec.rb
+++ b/spec/ruby/library/stringio/fsync_spec.rb
@@ -4,6 +4,6 @@
 describe "StringIO#fsync" do
   it "returns zero" do
     io = StringIO.new(+"fsync")
-    io.fsync.should eql(0)
+    io.fsync.should.eql?(0)
   end
 end
diff --git a/spec/ruby/library/stringio/gets_spec.rb b/spec/ruby/library/stringio/gets_spec.rb
index ac876f0b4f3..5dc572fba56 100644
--- a/spec/ruby/library/stringio/gets_spec.rb
+++ b/spec/ruby/library/stringio/gets_spec.rb
@@ -10,8 +10,8 @@
       @io = StringIO.new("this>is>an>example")
 
       @io.pos = 36
-      @io.gets(">").should be_nil
-      @io.gets(">").should be_nil
+      @io.gets(">").should == nil
+      @io.gets(">").should == nil
     end
   end
 
@@ -22,8 +22,8 @@
       @io = StringIO.new("this>is>an>example")
 
       @io.pos = 36
-      @io.gets(3).should be_nil
-      @io.gets(3).should be_nil
+      @io.gets(3).should == nil
+      @io.gets(3).should == nil
     end
   end
 
@@ -34,8 +34,8 @@
       @io = StringIO.new("this>is>an>example")
 
       @io.pos = 36
-      @io.gets(">", 3).should be_nil
-      @io.gets(">", 3).should be_nil
+      @io.gets(">", 3).should == nil
+      @io.gets(">", 3).should == nil
     end
   end
 
@@ -46,8 +46,8 @@
       @io = StringIO.new("this>is>an>example")
 
       @io.pos = 36
-      @io.gets.should be_nil
-      @io.gets.should be_nil
+      @io.gets.should == nil
+      @io.gets.should == nil
     end
   end
 
diff --git a/spec/ruby/library/stringio/initialize_spec.rb b/spec/ruby/library/stringio/initialize_spec.rb
index 6f4d2e456c2..413e0aacc04 100644
--- a/spec/ruby/library/stringio/initialize_spec.rb
+++ b/spec/ruby/library/stringio/initialize_spec.rb
@@ -8,111 +8,111 @@
 
   it "uses the passed Object as the StringIO backend" do
     @io.send(:initialize, str = "example", "r")
-    @io.string.should equal(str)
+    @io.string.should.equal?(str)
   end
 
   it "sets the mode based on the passed mode" do
     io = StringIO.allocate
     io.send(:initialize, +"example", "r")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "rb")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "r+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "rb+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "w")
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "wb")
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "w+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "wb+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "a")
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "ab")
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "a+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", "ab+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
   end
 
   it "allows passing the mode as an Integer" do
     io = StringIO.allocate
     io.send(:initialize, +"example", IO::RDONLY)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
 
     io = StringIO.allocate
     io.send(:initialize, +"example", IO::RDWR)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", IO::WRONLY)
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", IO::WRONLY | IO::TRUNC)
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", IO::RDWR | IO::TRUNC)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", IO::WRONLY | IO::APPEND)
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.allocate
     io.send(:initialize, +"example", IO::RDWR | IO::APPEND)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
   end
 
   it "raises a FrozenError when passed a frozen String in truncate mode as StringIO backend" do
     io = StringIO.allocate
-    -> { io.send(:initialize, "example".freeze, IO::TRUNC) }.should raise_error(FrozenError)
+    -> { io.send(:initialize, "example".freeze, IO::TRUNC) }.should.raise(FrozenError)
   end
 
   it "tries to convert the passed mode to a String using #to_str" do
@@ -120,15 +120,15 @@
     obj.should_receive(:to_str).and_return("r")
     @io.send(:initialize, +"example", obj)
 
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_true
+    @io.closed_read?.should == false
+    @io.closed_write?.should == true
   end
 
   it "raises an Errno::EACCES error when passed a frozen string with a write-mode" do
     (str = "example").freeze
-    -> { @io.send(:initialize, str, "r+") }.should raise_error(Errno::EACCES)
-    -> { @io.send(:initialize, str, "w") }.should raise_error(Errno::EACCES)
-    -> { @io.send(:initialize, str, "a") }.should raise_error(Errno::EACCES)
+    -> { @io.send(:initialize, str, "r+") }.should.raise(Errno::EACCES)
+    -> { @io.send(:initialize, str, "w") }.should.raise(Errno::EACCES)
+    -> { @io.send(:initialize, str, "a") }.should.raise(Errno::EACCES)
   end
 
   it "truncates all the content if passed w mode" do
@@ -159,19 +159,19 @@
 
   it "uses the passed Object as the StringIO backend" do
     @io.send(:initialize, str = "example")
-    @io.string.should equal(str)
+    @io.string.should.equal?(str)
   end
 
   it "sets the mode to read-write if the string is mutable" do
     @io.send(:initialize, +"example")
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_false
+    @io.closed_read?.should == false
+    @io.closed_write?.should == false
   end
 
   it "sets the mode to read if the string is frozen" do
     @io.send(:initialize, -"example")
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_true
+    @io.closed_read?.should == false
+    @io.closed_write?.should == true
   end
 
   it "tries to convert the passed Object to a String using #to_str" do
@@ -184,8 +184,8 @@
   it "automatically sets the mode to read-only when passed a frozen string" do
     (str = "example").freeze
     @io.send(:initialize, str)
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_true
+    @io.closed_read?.should == false
+    @io.closed_write?.should == true
   end
 end
 
@@ -193,8 +193,8 @@
 describe "StringIO#initialize when passed keyword arguments" do
   it "sets the mode based on the passed :mode option" do
     io = StringIO.new("example", mode: "r")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
   end
 
   it "accepts a mode argument set to nil with a valid :mode option" do
@@ -223,54 +223,54 @@
   it "raises an error if passed encodings two ways" do
     -> {
       @io = StringIO.new(+'', 'w:ISO-8859-1', encoding: 'ISO-8859-1')
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = StringIO.new(+'', 'w:ISO-8859-1', external_encoding: 'ISO-8859-1')
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = StringIO.new(+'', 'w:ISO-8859-1:UTF-8', internal_encoding: 'ISO-8859-1')
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error if passed matching binary/text mode two ways" do
     -> {
       @io = StringIO.new(+'', "wb", binmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = StringIO.new(+'', "wt", textmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       @io = StringIO.new(+'', "wb", textmode: false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = StringIO.new(+'', "wt", binmode: false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error if passed conflicting binary/text mode two ways" do
     -> {
       @io = StringIO.new(+'', "wb", binmode: false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = StringIO.new(+'', "wt", textmode: false)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
 
     -> {
       @io = StringIO.new(+'', "wb", textmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = StringIO.new(+'', "wt", binmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "raises an error when trying to set both binmode and textmode" do
     -> {
       @io = StringIO.new(+'', "w", textmode: true, binmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
     -> {
       @io = StringIO.new(+'', File::Constants::WRONLY, textmode: true, binmode: true)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
 
@@ -280,13 +280,13 @@
   end
 
   it "is private" do
-    StringIO.should have_private_instance_method(:initialize)
+    StringIO.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "sets the mode to read-write" do
     @io.send(:initialize)
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_false
+    @io.closed_read?.should == false
+    @io.closed_write?.should == false
   end
 
   it "uses an empty String as the StringIO backend" do
diff --git a/spec/ruby/library/stringio/inspect_spec.rb b/spec/ruby/library/stringio/inspect_spec.rb
index 7c02f8d3609..962d858e482 100644
--- a/spec/ruby/library/stringio/inspect_spec.rb
+++ b/spec/ruby/library/stringio/inspect_spec.rb
@@ -9,7 +9,7 @@
 
   it "does not include the contents" do
     io = StringIO.new("contents")
-    io.inspect.should_not include("contents")
+    io.inspect.should_not.include?("contents")
   end
 
   it "uses the regular Object#inspect without any instance variable" do
diff --git a/spec/ruby/library/stringio/lineno_spec.rb b/spec/ruby/library/stringio/lineno_spec.rb
index c620a1a6868..a96dc05927c 100644
--- a/spec/ruby/library/stringio/lineno_spec.rb
+++ b/spec/ruby/library/stringio/lineno_spec.rb
@@ -10,7 +10,7 @@
     @io.gets
     @io.gets
     @io.gets
-    @io.lineno.should eql(3)
+    @io.lineno.should.eql?(3)
   end
 end
 
@@ -21,10 +21,10 @@
 
   it "sets the current line number, but has no impact on the position" do
     @io.lineno = 3
-    @io.pos.should eql(0)
+    @io.pos.should.eql?(0)
 
     @io.gets.should == "this\n"
-    @io.lineno.should eql(4)
-    @io.pos.should eql(5)
+    @io.lineno.should.eql?(4)
+    @io.pos.should.eql?(5)
   end
 end
diff --git a/spec/ruby/library/stringio/open_spec.rb b/spec/ruby/library/stringio/open_spec.rb
index b7c90661f99..23c7b34e093 100644
--- a/spec/ruby/library/stringio/open_spec.rb
+++ b/spec/ruby/library/stringio/open_spec.rb
@@ -4,24 +4,24 @@
 describe "StringIO.open when passed [Object, mode]" do
   it "uses the passed Object as the StringIO backend" do
     io = StringIO.open(str = "example", "r")
-    io.string.should equal(str)
+    io.string.should.equal?(str)
   end
 
   it "returns the blocks return value when yielding" do
     ret = StringIO.open(+"example", "r") { :test }
-    ret.should equal(:test)
+    ret.should.equal?(:test)
   end
 
   it "yields self to the passed block" do
     io = nil
     StringIO.open(+"example", "r") { |strio| io = strio }
-    io.should be_kind_of(StringIO)
+    io.should.is_a?(StringIO)
   end
 
   it "closes self after yielding" do
     io = nil
     StringIO.open(+"example", "r") { |strio| io = strio }
-    io.closed?.should be_true
+    io.closed?.should == true
   end
 
   it "even closes self when an exception is raised while yielding" do
@@ -33,13 +33,13 @@
       end
     rescue
     end
-    io.closed?.should be_true
+    io.closed?.should == true
   end
 
   it "sets self's string to nil after yielding" do
     io = nil
     StringIO.open(+"example", "r") { |strio| io = strio }
-    io.string.should be_nil
+    io.string.should == nil
   end
 
   it "even sets self's string to nil when an exception is raised while yielding" do
@@ -51,91 +51,91 @@
       end
     rescue
     end
-    io.string.should be_nil
+    io.string.should == nil
   end
 
   it "sets the mode based on the passed mode" do
     io = StringIO.open(+"example", "r")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
 
     io = StringIO.open(+"example", "rb")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
 
     io = StringIO.open(+"example", "r+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "rb+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "w")
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "wb")
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "w+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "wb+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "a")
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "ab")
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "a+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", "ab+")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
   end
 
   it "allows passing the mode as an Integer" do
     io = StringIO.open(+"example", IO::RDONLY)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
 
     io = StringIO.open(+"example", IO::RDWR)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", IO::WRONLY)
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", IO::WRONLY | IO::TRUNC)
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", IO::RDWR | IO::TRUNC)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", IO::WRONLY | IO::APPEND)
-    io.closed_read?.should be_true
-    io.closed_write?.should be_false
+    io.closed_read?.should == true
+    io.closed_write?.should == false
 
     io = StringIO.open(+"example", IO::RDWR | IO::APPEND)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
   end
 
   it "raises a FrozenError when passed a frozen String in truncate mode as StringIO backend" do
-    -> { StringIO.open("example".freeze, IO::TRUNC) }.should raise_error(FrozenError)
+    -> { StringIO.open("example".freeze, IO::TRUNC) }.should.raise(FrozenError)
   end
 
   it "tries to convert the passed mode to a String using #to_str" do
@@ -143,34 +143,34 @@
     obj.should_receive(:to_str).and_return("r")
     io = StringIO.open(+"example", obj)
 
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
   end
 
   it "raises an Errno::EACCES error when passed a frozen string with a write-mode" do
     (str = "example").freeze
-    -> { StringIO.open(str, "r+") }.should raise_error(Errno::EACCES)
-    -> { StringIO.open(str, "w") }.should raise_error(Errno::EACCES)
-    -> { StringIO.open(str, "a") }.should raise_error(Errno::EACCES)
+    -> { StringIO.open(str, "r+") }.should.raise(Errno::EACCES)
+    -> { StringIO.open(str, "w") }.should.raise(Errno::EACCES)
+    -> { StringIO.open(str, "a") }.should.raise(Errno::EACCES)
   end
 end
 
 describe "StringIO.open when passed [Object]" do
   it "uses the passed Object as the StringIO backend" do
     io = StringIO.open(str = "example")
-    io.string.should equal(str)
+    io.string.should.equal?(str)
   end
 
   it "yields self to the passed block" do
     io = nil
     ret = StringIO.open(+"example") { |strio| io = strio }
-    io.should equal(ret)
+    io.should.equal?(ret)
   end
 
   it "sets the mode to read-write (r+)" do
     io = StringIO.open(+"example")
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.new(+"example")
     io.printf("%d", 123)
@@ -187,8 +187,8 @@
   it "automatically sets the mode to read-only when passed a frozen string" do
     (str = "example").freeze
     io = StringIO.open(str)
-    io.closed_read?.should be_false
-    io.closed_write?.should be_true
+    io.closed_read?.should == false
+    io.closed_write?.should == true
   end
 end
 
@@ -196,13 +196,13 @@
   it "yields self to the passed block" do
     io = nil
     ret = StringIO.open { |strio| io = strio }
-    io.should equal(ret)
+    io.should.equal?(ret)
   end
 
   it "sets the mode to read-write (r+)" do
     io = StringIO.open
-    io.closed_read?.should be_false
-    io.closed_write?.should be_false
+    io.closed_read?.should == false
+    io.closed_write?.should == false
 
     io = StringIO.new(+"example")
     io.printf("%d", 123)
diff --git a/spec/ruby/library/stringio/path_spec.rb b/spec/ruby/library/stringio/path_spec.rb
index 1184ca523ff..dcb77b1df8b 100644
--- a/spec/ruby/library/stringio/path_spec.rb
+++ b/spec/ruby/library/stringio/path_spec.rb
@@ -3,6 +3,6 @@
 
 describe "StringIO#path" do
   it "is not defined" do
-    -> { StringIO.new("path").path }.should raise_error(NoMethodError)
+    -> { StringIO.new("path").path }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/library/stringio/pid_spec.rb b/spec/ruby/library/stringio/pid_spec.rb
index 08f2d7ab1a9..7a729fbe41e 100644
--- a/spec/ruby/library/stringio/pid_spec.rb
+++ b/spec/ruby/library/stringio/pid_spec.rb
@@ -3,6 +3,6 @@
 
 describe "StringIO#pid" do
   it "returns nil" do
-    StringIO.new("pid").pid.should be_nil
+    StringIO.new("pid").pid.should == nil
   end
 end
diff --git a/spec/ruby/library/stringio/pos_spec.rb b/spec/ruby/library/stringio/pos_spec.rb
index 81be5f01a52..ba640f8c18e 100644
--- a/spec/ruby/library/stringio/pos_spec.rb
+++ b/spec/ruby/library/stringio/pos_spec.rb
@@ -17,7 +17,7 @@
   end
 
   it "raises an EINVAL if given a negative argument" do
-    -> { @io.pos = -10 }.should raise_error(Errno::EINVAL)
+    -> { @io.pos = -10 }.should.raise(Errno::EINVAL)
   end
 
   it "updates the current byte offset after reaching EOF" do
diff --git a/spec/ruby/library/stringio/print_spec.rb b/spec/ruby/library/stringio/print_spec.rb
index 00c33367dc6..48728e5f144 100644
--- a/spec/ruby/library/stringio/print_spec.rb
+++ b/spec/ruby/library/stringio/print_spec.rb
@@ -29,7 +29,7 @@
   end
 
   it "returns nil" do
-    @io.print(1, 2, 3).should be_nil
+    @io.print(1, 2, 3).should == nil
   end
 
   it "pads self with \\000 when the current position is after the end" do
@@ -52,10 +52,10 @@
 
   it "updates the current position" do
     @io.print(1, 2, 3)
-    @io.pos.should eql(3)
+    @io.pos.should.eql?(3)
 
     @io.print(1, 2, 3)
-    @io.pos.should eql(6)
+    @io.pos.should.eql?(6)
   end
 
   it "correctly updates the current position when honoring the output record separator global" do
@@ -64,7 +64,7 @@
 
     begin
       @io.print(5, 6, 7, 8)
-      @io.pos.should eql(5)
+      @io.pos.should.eql?(5)
     ensure
       suppress_warning {$\ = old_rs}
     end
@@ -86,17 +86,17 @@
 
   it "correctly updates self's position" do
     @io.print(", testing")
-    @io.pos.should eql(16)
+    @io.pos.should.eql?(16)
   end
 end
 
 describe "StringIO#print when self is not writable" do
   it "raises an IOError" do
     io = StringIO.new(+"test", "r")
-    -> { io.print("test") }.should raise_error(IOError)
+    -> { io.print("test") }.should.raise(IOError)
 
     io = StringIO.new(+"test")
     io.close_write
-    -> { io.print("test") }.should raise_error(IOError)
+    -> { io.print("test") }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/printf_spec.rb b/spec/ruby/library/stringio/printf_spec.rb
index ca82e847575..ae7e0af729c 100644
--- a/spec/ruby/library/stringio/printf_spec.rb
+++ b/spec/ruby/library/stringio/printf_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "returns nil" do
-    @io.printf("%d %04x", 123, 123).should be_nil
+    @io.printf("%d %04x", 123, 123).should == nil
   end
 
   it "pads self with \\000 when the current position is after the end" do
@@ -24,10 +24,10 @@
 
   it "updates the current position" do
     @io.printf("%d %04x", 123, 123)
-    @io.pos.should eql(8)
+    @io.pos.should.eql?(8)
 
     @io.printf("%d %04x", 123, 123)
-    @io.pos.should eql(16)
+    @io.pos.should.eql?(16)
   end
 
   describe "formatting" do
@@ -56,7 +56,7 @@
 
   it "correctly updates self's position" do
     @io.printf("%s", "abc")
-    @io.pos.should eql(3)
+    @io.pos.should.eql?(3)
   end
 end
 
@@ -75,17 +75,17 @@
 
   it "correctly updates self's position" do
     @io.printf("%d %04x", 123, 123)
-    @io.pos.should eql(15)
+    @io.pos.should.eql?(15)
   end
 end
 
 describe "StringIO#printf when self is not writable" do
   it "raises an IOError" do
     io = StringIO.new(+"test", "r")
-    -> { io.printf("test") }.should raise_error(IOError)
+    -> { io.printf("test") }.should.raise(IOError)
 
     io = StringIO.new(+"test")
     io.close_write
-    -> { io.printf("test") }.should raise_error(IOError)
+    -> { io.printf("test") }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/putc_spec.rb b/spec/ruby/library/stringio/putc_spec.rb
index 9f1ac8ffb2b..742f8623eb8 100644
--- a/spec/ruby/library/stringio/putc_spec.rb
+++ b/spec/ruby/library/stringio/putc_spec.rb
@@ -22,7 +22,7 @@
 
   it "returns the passed String" do
     str = "test"
-    @io.putc(str).should equal(str)
+    @io.putc(str).should.equal?(str)
   end
 
   it "correctly updates the current position" do
@@ -79,7 +79,7 @@
   end
 
   it "raises a TypeError when the passed argument can't be coerced to Integer" do
-    -> { @io.putc(Object.new) }.should raise_error(TypeError)
+    -> { @io.putc(Object.new) }.should.raise(TypeError)
   end
 end
 
@@ -94,10 +94,10 @@
 describe "StringIO#putc when self is not writable" do
   it "raises an IOError" do
     io = StringIO.new(+"test", "r")
-    -> { io.putc(?a) }.should raise_error(IOError)
+    -> { io.putc(?a) }.should.raise(IOError)
 
     io = StringIO.new(+"test")
     io.close_write
-    -> { io.putc("t") }.should raise_error(IOError)
+    -> { io.putc("t") }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/puts_spec.rb b/spec/ruby/library/stringio/puts_spec.rb
index 054ec8227f5..ebe74d4a45e 100644
--- a/spec/ruby/library/stringio/puts_spec.rb
+++ b/spec/ruby/library/stringio/puts_spec.rb
@@ -123,7 +123,7 @@
   end
 
   it "returns nil" do
-    @io.puts.should be_nil
+    @io.puts.should == nil
   end
 
   it "prints a newline" do
@@ -158,18 +158,18 @@
 
   it "correctly updates self's position" do
     @io.puts(", testing")
-    @io.pos.should eql(17)
+    @io.pos.should.eql?(17)
   end
 end
 
 describe "StringIO#puts when self is not writable" do
   it "raises an IOError" do
     io = StringIO.new(+"test", "r")
-    -> { io.puts }.should raise_error(IOError)
+    -> { io.puts }.should.raise(IOError)
 
     io = StringIO.new(+"test")
     io.close_write
-    -> { io.puts }.should raise_error(IOError)
+    -> { io.puts }.should.raise(IOError)
   end
 end
 
diff --git a/spec/ruby/library/stringio/read_nonblock_spec.rb b/spec/ruby/library/stringio/read_nonblock_spec.rb
index 74736f7792d..38ae7541ca5 100644
--- a/spec/ruby/library/stringio/read_nonblock_spec.rb
+++ b/spec/ruby/library/stringio/read_nonblock_spec.rb
@@ -45,7 +45,7 @@
         stringio.rewind
 
         stringio.read_nonblock(5).should == "hello"
-        stringio.read_nonblock(5, exception: false).should be_nil
+        stringio.read_nonblock(5, exception: false).should == nil
       end
     end
   end
diff --git a/spec/ruby/library/stringio/read_spec.rb b/spec/ruby/library/stringio/read_spec.rb
index e49f2621271..9a2086a6827 100644
--- a/spec/ruby/library/stringio/read_spec.rb
+++ b/spec/ruby/library/stringio/read_spec.rb
@@ -39,7 +39,7 @@
 
   it "returns nil when self's position is at the end" do
     @io.pos = 7
-    @io.read(10).should be_nil
+    @io.read(10).should == nil
   end
 
   it "returns an empty String when length is 0" do
@@ -57,6 +57,6 @@
     result = @io.read(10, buf)
 
     buf.should == "abcdefghij"
-    result.should equal(buf)
+    result.should.equal?(buf)
   end
 end
diff --git a/spec/ruby/library/stringio/readline_spec.rb b/spec/ruby/library/stringio/readline_spec.rb
index 085360707f8..3f026080e21 100644
--- a/spec/ruby/library/stringio/readline_spec.rb
+++ b/spec/ruby/library/stringio/readline_spec.rb
@@ -11,7 +11,7 @@
       @io = StringIO.new("this>is>an>example")
 
       @io.pos = 36
-      -> { @io.readline(">") }.should raise_error(IOError)
+      -> { @io.readline(">") }.should.raise(IOError)
     end
   end
 
@@ -22,7 +22,7 @@
       @io = StringIO.new("this>is>an>example")
 
       @io.pos = 36
-      -> { @io.readline(3) }.should raise_error(IOError)
+      -> { @io.readline(3) }.should.raise(IOError)
     end
   end
 
@@ -33,7 +33,7 @@
       @io = StringIO.new("this>is>an>example")
 
       @io.pos = 36
-      -> { @io.readline(">", 3) }.should raise_error(IOError)
+      -> { @io.readline(">", 3) }.should.raise(IOError)
     end
   end
 
@@ -44,7 +44,7 @@
       @io = StringIO.new("this>is>an>example")
 
       @io.pos = 36
-      -> { @io.readline }.should raise_error(IOError)
+      -> { @io.readline }.should.raise(IOError)
     end
   end
 
diff --git a/spec/ruby/library/stringio/readlines_spec.rb b/spec/ruby/library/stringio/readlines_spec.rb
index ed7cc22b3d7..821a8169e7a 100644
--- a/spec/ruby/library/stringio/readlines_spec.rb
+++ b/spec/ruby/library/stringio/readlines_spec.rb
@@ -12,12 +12,12 @@
 
   it "updates self's position based on the number of read bytes" do
     @io.readlines(">")
-    @io.pos.should eql(18)
+    @io.pos.should.eql?(18)
   end
 
   it "updates self's lineno based on the number of read lines" do
     @io.readlines(">")
-    @io.lineno.should eql(4)
+    @io.lineno.should.eql?(4)
   end
 
   it "does not change $_" do
@@ -61,12 +61,12 @@
 
   it "updates self's position based on the number of read bytes" do
     @io.readlines
-    @io.pos.should eql(41)
+    @io.pos.should.eql?(41)
   end
 
   it "updates self's lineno based on the number of read lines" do
     @io.readlines
-    @io.lineno.should eql(3)
+    @io.lineno.should.eql?(3)
   end
 
   it "does not change $_" do
@@ -84,11 +84,11 @@
 describe "StringIO#readlines when in write-only mode" do
   it "raises an IOError" do
     io = StringIO.new(+"xyz", "w")
-    -> { io.readlines }.should raise_error(IOError)
+    -> { io.readlines }.should.raise(IOError)
 
     io = StringIO.new("xyz")
     io.close_read
-    -> { io.readlines }.should raise_error(IOError)
+    -> { io.readlines }.should.raise(IOError)
   end
 end
 
@@ -109,7 +109,7 @@
   end
 
   it "raises ArgumentError when limit is 0" do
-    -> { @io.readlines(0) }.should raise_error(ArgumentError)
+    -> { @io.readlines(0) }.should.raise(ArgumentError)
   end
 
   it "ignores it when the limit is negative" do
diff --git a/spec/ruby/library/stringio/readpartial_spec.rb b/spec/ruby/library/stringio/readpartial_spec.rb
index dadefb78373..e05d9bded44 100644
--- a/spec/ruby/library/stringio/readpartial_spec.rb
+++ b/spec/ruby/library/stringio/readpartial_spec.rb
@@ -57,23 +57,23 @@
 
   it "raises EOFError on EOF" do
     @string.readpartial(18).should == 'Stop, look, listen'
-    -> { @string.readpartial(10) }.should raise_error(EOFError)
+    -> { @string.readpartial(10) }.should.raise(EOFError)
   end
 
   it "discards the existing buffer content upon error" do
     buffer = +'hello'
     @string.readpartial(100)
-    -> { @string.readpartial(1, buffer) }.should raise_error(EOFError)
-    buffer.should be_empty
+    -> { @string.readpartial(1, buffer) }.should.raise(EOFError)
+    buffer.should.empty?
   end
 
   it "raises IOError if the stream is closed" do
     @string.close
-    -> { @string.readpartial(1) }.should raise_error(IOError, "not opened for reading")
+    -> { @string.readpartial(1) }.should.raise(IOError, "not opened for reading")
   end
 
   it "raises ArgumentError if the negative argument is provided" do
-    -> { @string.readpartial(-1) }.should raise_error(ArgumentError, "negative length -1 given")
+    -> { @string.readpartial(-1) }.should.raise(ArgumentError, "negative length -1 given")
   end
 
   it "immediately returns an empty string if the length argument is 0" do
@@ -82,7 +82,7 @@
 
   it "raises IOError if the stream is closed and the length argument is 0" do
     @string.close
-    -> { @string.readpartial(0) }.should raise_error(IOError, "not opened for reading")
+    -> { @string.readpartial(0) }.should.raise(IOError, "not opened for reading")
   end
 
   it "clears and returns the given buffer if the length argument is 0" do
diff --git a/spec/ruby/library/stringio/reopen_spec.rb b/spec/ruby/library/stringio/reopen_spec.rb
index 7021ff17e5c..3d4ae3a6983 100644
--- a/spec/ruby/library/stringio/reopen_spec.rb
+++ b/spec/ruby/library/stringio/reopen_spec.rb
@@ -8,18 +8,18 @@
 
   it "reopens self with the passed Object in the passed mode" do
     @io.reopen("reopened", IO::RDONLY)
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_true
+    @io.closed_read?.should == false
+    @io.closed_write?.should == true
     @io.string.should == "reopened"
 
     @io.reopen(+"reopened, twice", IO::WRONLY)
-    @io.closed_read?.should be_true
-    @io.closed_write?.should be_false
+    @io.closed_read?.should == true
+    @io.closed_write?.should == false
     @io.string.should == "reopened, twice"
 
     @io.reopen(+"reopened, another time", IO::RDWR)
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_false
+    @io.closed_read?.should == false
+    @io.closed_write?.should == false
     @io.string.should == "reopened, another time"
   end
 
@@ -31,16 +31,16 @@
   end
 
   it "raises a TypeError when the passed Object can't be converted to a String" do
-    -> { @io.reopen(Object.new, IO::RDWR) }.should raise_error(TypeError)
+    -> { @io.reopen(Object.new, IO::RDWR) }.should.raise(TypeError)
   end
 
   it "raises an Errno::EACCES when trying to reopen self with a frozen String in write-mode" do
-    -> { @io.reopen("burn".freeze, IO::WRONLY) }.should raise_error(Errno::EACCES)
-    -> { @io.reopen("burn".freeze, IO::WRONLY | IO::APPEND) }.should raise_error(Errno::EACCES)
+    -> { @io.reopen("burn".freeze, IO::WRONLY) }.should.raise(Errno::EACCES)
+    -> { @io.reopen("burn".freeze, IO::WRONLY | IO::APPEND) }.should.raise(Errno::EACCES)
   end
 
   it "raises a FrozenError when trying to reopen self with a frozen String in truncate-mode" do
-    -> { @io.reopen("burn".freeze, IO::RDONLY | IO::TRUNC) }.should raise_error(FrozenError)
+    -> { @io.reopen("burn".freeze, IO::RDONLY | IO::TRUNC) }.should.raise(FrozenError)
   end
 
   it "does not raise IOError when passed a frozen String in read-mode" do
@@ -56,23 +56,23 @@
 
   it "reopens self with the passed Object in the passed mode" do
     @io.reopen("reopened", "r")
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_true
+    @io.closed_read?.should == false
+    @io.closed_write?.should == true
     @io.string.should == "reopened"
 
     @io.reopen(+"reopened, twice", "r+")
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_false
+    @io.closed_read?.should == false
+    @io.closed_write?.should == false
     @io.string.should == "reopened, twice"
 
     @io.reopen(+"reopened, another", "w+")
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_false
+    @io.closed_read?.should == false
+    @io.closed_write?.should == false
     @io.string.should == ""
 
     @io.reopen(+"reopened, another time", "r+")
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_false
+    @io.closed_read?.should == false
+    @io.closed_write?.should == false
     @io.string.should == "reopened, another time"
   end
 
@@ -89,35 +89,35 @@
   end
 
   it "raises a TypeError when the passed Object can't be converted to a String using #to_str" do
-    -> { @io.reopen(Object.new, "r") }.should raise_error(TypeError)
+    -> { @io.reopen(Object.new, "r") }.should.raise(TypeError)
   end
 
   it "resets self's position to 0" do
     @io.read(5)
     @io.reopen(+"reopened")
-    @io.pos.should eql(0)
+    @io.pos.should.eql?(0)
   end
 
   it "resets self's line number to 0" do
     @io.gets
     @io.reopen(+"reopened")
-    @io.lineno.should eql(0)
+    @io.lineno.should.eql?(0)
   end
 
   it "tries to convert the passed mode Object to an Integer using #to_str" do
     obj = mock("to_str")
     obj.should_receive(:to_str).and_return("r")
     @io.reopen("reopened", obj)
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_true
+    @io.closed_read?.should == false
+    @io.closed_write?.should == true
     @io.string.should == "reopened"
   end
 
   it "raises an Errno::EACCES error when trying to reopen self with a frozen String in write-mode" do
-    -> { @io.reopen("burn".freeze, 'w') }.should raise_error(Errno::EACCES)
-    -> { @io.reopen("burn".freeze, 'w+') }.should raise_error(Errno::EACCES)
-    -> { @io.reopen("burn".freeze, 'a') }.should raise_error(Errno::EACCES)
-    -> { @io.reopen("burn".freeze, "r+") }.should raise_error(Errno::EACCES)
+    -> { @io.reopen("burn".freeze, 'w') }.should.raise(Errno::EACCES)
+    -> { @io.reopen("burn".freeze, 'w+') }.should.raise(Errno::EACCES)
+    -> { @io.reopen("burn".freeze, 'a') }.should.raise(Errno::EACCES)
+    -> { @io.reopen("burn".freeze, "r+") }.should.raise(Errno::EACCES)
   end
 
   it "does not raise IOError if a frozen string is passed in read mode" do
@@ -136,8 +136,8 @@
 
     @io.reopen(+"reopened")
 
-    @io.closed_write?.should be_false
-    @io.closed_read?.should be_false
+    @io.closed_write?.should == false
+    @io.closed_read?.should == false
 
     @io.string.should == "reopened"
   end
@@ -145,13 +145,13 @@
   it "resets self's position to 0" do
     @io.read(5)
     @io.reopen(+"reopened")
-    @io.pos.should eql(0)
+    @io.pos.should.eql?(0)
   end
 
   it "resets self's line number to 0" do
     @io.gets
     @io.reopen(+"reopened")
-    @io.lineno.should eql(0)
+    @io.lineno.should.eql?(0)
   end
 end
 
@@ -161,13 +161,13 @@
   end
 
   it "raises a TypeError when passed an Object that can't be converted to a StringIO" do
-    -> { @io.reopen(Object.new) }.should raise_error(TypeError)
+    -> { @io.reopen(Object.new) }.should.raise(TypeError)
   end
 
   it "does not try to convert the passed Object to a String using #to_str" do
     obj = mock("not to_str")
     obj.should_not_receive(:to_str)
-    -> { @io.reopen(obj) }.should raise_error(TypeError)
+    -> { @io.reopen(obj) }.should.raise(TypeError)
   end
 
   it "tries to convert the passed Object to a StringIO using #to_strio" do
@@ -186,20 +186,20 @@
   it "resets self's mode to read-write" do
     @io.close
     @io.reopen
-    @io.closed_read?.should be_false
-    @io.closed_write?.should be_false
+    @io.closed_read?.should == false
+    @io.closed_write?.should == false
   end
 
   it "resets self's position to 0" do
     @io.read(5)
     @io.reopen
-    @io.pos.should eql(0)
+    @io.pos.should.eql?(0)
   end
 
   it "resets self's line number to 0" do
     @io.gets
     @io.reopen
-    @io.lineno.should eql(0)
+    @io.lineno.should.eql?(0)
   end
 end
 
diff --git a/spec/ruby/library/stringio/rewind_spec.rb b/spec/ruby/library/stringio/rewind_spec.rb
index 5f885ecf814..8c48709d890 100644
--- a/spec/ruby/library/stringio/rewind_spec.rb
+++ b/spec/ruby/library/stringio/rewind_spec.rb
@@ -9,7 +9,7 @@
   end
 
   it "returns 0" do
-    @io.rewind.should eql(0)
+    @io.rewind.should.eql?(0)
   end
 
   it "resets the position" do
diff --git a/spec/ruby/library/stringio/seek_spec.rb b/spec/ruby/library/stringio/seek_spec.rb
index 253b5027a97..9043e0338fb 100644
--- a/spec/ruby/library/stringio/seek_spec.rb
+++ b/spec/ruby/library/stringio/seek_spec.rb
@@ -9,18 +9,18 @@
   it "seeks from the current position when whence is IO::SEEK_CUR" do
     @io.pos = 1
     @io.seek(1, IO::SEEK_CUR)
-    @io.pos.should eql(2)
+    @io.pos.should.eql?(2)
 
     @io.seek(-1, IO::SEEK_CUR)
-    @io.pos.should eql(1)
+    @io.pos.should.eql?(1)
   end
 
   it "seeks from the end of self when whence is IO::SEEK_END" do
     @io.seek(3, IO::SEEK_END)
-    @io.pos.should eql(11) # Outside of the StringIO's content
+    @io.pos.should.eql?(11) # Outside of the StringIO's content
 
     @io.seek(-2, IO::SEEK_END)
-    @io.pos.should eql(6)
+    @io.pos.should.eql?(6)
   end
 
   it "seeks to an absolute position when whence is IO::SEEK_SET" do
@@ -33,25 +33,25 @@
   end
 
   it "raises an Errno::EINVAL error on negative amounts when whence is IO::SEEK_SET" do
-    -> { @io.seek(-5, IO::SEEK_SET) }.should raise_error(Errno::EINVAL)
+    -> { @io.seek(-5, IO::SEEK_SET) }.should.raise(Errno::EINVAL)
   end
 
   it "raises an Errno::EINVAL error on incorrect whence argument" do
-    -> { @io.seek(0, 3) }.should raise_error(Errno::EINVAL)
-    -> { @io.seek(0, -1) }.should raise_error(Errno::EINVAL)
-    -> { @io.seek(0, 2**16) }.should raise_error(Errno::EINVAL)
-    -> { @io.seek(0, -2**16) }.should raise_error(Errno::EINVAL)
+    -> { @io.seek(0, 3) }.should.raise(Errno::EINVAL)
+    -> { @io.seek(0, -1) }.should.raise(Errno::EINVAL)
+    -> { @io.seek(0, 2**16) }.should.raise(Errno::EINVAL)
+    -> { @io.seek(0, -2**16) }.should.raise(Errno::EINVAL)
   end
 
   it "tries to convert the passed Object to a String using #to_int" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return(2)
     @io.seek(obj)
-    @io.pos.should eql(2)
+    @io.pos.should.eql?(2)
   end
 
   it "raises a TypeError when the passed Object can't be converted to an Integer" do
-    -> { @io.seek(Object.new) }.should raise_error(TypeError)
+    -> { @io.seek(Object.new) }.should.raise(TypeError)
   end
 end
 
@@ -62,6 +62,6 @@
   end
 
   it "raises an IOError" do
-    -> { @io.seek(5) }.should raise_error(IOError)
+    -> { @io.seek(5) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/set_encoding_by_bom_spec.rb b/spec/ruby/library/stringio/set_encoding_by_bom_spec.rb
index 1030aad042c..b4583a7ad77 100644
--- a/spec/ruby/library/stringio/set_encoding_by_bom_spec.rb
+++ b/spec/ruby/library/stringio/set_encoding_by_bom_spec.rb
@@ -6,7 +6,7 @@
   it "returns nil if not readable" do
     io = StringIO.new("".b, "wb")
 
-    io.set_encoding_by_bom.should be_nil
+    io.set_encoding_by_bom.should == nil
     io.external_encoding.should == Encoding::ASCII_8BIT
   end
 
@@ -82,7 +82,7 @@
 
   it "returns nil if io is empty" do
     io = StringIO.new("".b, "rb")
-    io.set_encoding_by_bom.should be_nil
+    io.set_encoding_by_bom.should == nil
     io.external_encoding.should == Encoding::ASCII_8BIT
   end
 
@@ -227,7 +227,7 @@
   it "raises FrozenError when io is frozen" do
     io = StringIO.new()
     io.freeze
-    -> { io.set_encoding_by_bom }.should raise_error(FrozenError)
+    -> { io.set_encoding_by_bom }.should.raise(FrozenError)
   end
 
   it "does not raise FrozenError when initial string is frozen" do
diff --git a/spec/ruby/library/stringio/shared/codepoints.rb b/spec/ruby/library/stringio/shared/codepoints.rb
index 25333bb0fd2..e35a02ccb48 100644
--- a/spec/ruby/library/stringio/shared/codepoints.rb
+++ b/spec/ruby/library/stringio/shared/codepoints.rb
@@ -6,7 +6,7 @@
   end
 
   it "returns an Enumerator" do
-    @enum.should be_an_instance_of(Enumerator)
+    @enum.should.instance_of?(Enumerator)
   end
 
   it "yields each codepoint code in turn" do
@@ -20,15 +20,15 @@
 
   it "raises an error if reading invalid sequence" do
     @io.pos = 1  # inside of a multibyte sequence
-    -> { @enum.first }.should raise_error(ArgumentError)
+    -> { @enum.first }.should.raise(ArgumentError)
   end
 
   it "raises an IOError if not readable" do
     @io.close_read
-    -> { @enum.to_a }.should raise_error(IOError)
+    -> { @enum.to_a }.should.raise(IOError)
 
     io = StringIO.new(+"xyz", "w")
-    -> { io.send(@method).to_a }.should raise_error(IOError)
+    -> { io.send(@method).to_a }.should.raise(IOError)
   end
 
 
@@ -39,7 +39,7 @@
   end
 
   it "returns self" do
-    @io.send(@method) {|l| l }.should equal(@io)
+    @io.send(@method) {|l| l }.should.equal?(@io)
   end
 
 end
diff --git a/spec/ruby/library/stringio/shared/each.rb b/spec/ruby/library/stringio/shared/each.rb
index 626b41a4d36..04e40b6b2a7 100644
--- a/spec/ruby/library/stringio/shared/each.rb
+++ b/spec/ruby/library/stringio/shared/each.rb
@@ -16,7 +16,7 @@
   end
 
   it "returns self" do
-    @io.send(@method) {|l| l }.should equal(@io)
+    @io.send(@method) {|l| l }.should.equal?(@io)
   end
 
   it "tries to convert the passed separator to a String using #to_str" do
@@ -74,19 +74,19 @@
       old_rs = $/
       suppress_warning {$/ = " "}
       @io.send(@method) {|s| seen << s }
-      seen.should eql(["a ", "b ", "c ", "d ", "e\n1 ", "2 ", "3 ", "4 ", "5"])
+      seen.should.eql?(["a ", "b ", "c ", "d ", "e\n1 ", "2 ", "3 ", "4 ", "5"])
     ensure
       suppress_warning {$/ = old_rs}
     end
   end
 
   it "returns self" do
-    @io.send(@method) {|l| l }.should equal(@io)
+    @io.send(@method) {|l| l }.should.equal?(@io)
   end
 
   it "returns an Enumerator when passed no block" do
     enum = @io.send(@method)
-    enum.instance_of?(Enumerator).should be_true
+    enum.instance_of?(Enumerator).should == true
 
     seen = []
     enum.each { |b| seen << b }
@@ -97,11 +97,11 @@
 describe :stringio_each_not_readable, shared: true do
   it "raises an IOError" do
     io = StringIO.new(+"a b c d e", "w")
-    -> { io.send(@method) { |b| b } }.should raise_error(IOError)
+    -> { io.send(@method) { |b| b } }.should.raise(IOError)
 
     io = StringIO.new("a b c d e")
     io.close_read
-    -> { io.send(@method) { |b| b } }.should raise_error(IOError)
+    -> { io.send(@method) { |b| b } }.should.raise(IOError)
   end
 end
 
@@ -176,13 +176,13 @@
 
   it "updates self's lineno by one" do
     @io.send(@method, '>', 3) { |s| break s }
-    @io.lineno.should eql(1)
+    @io.lineno.should.eql?(1)
 
     @io.send(@method, '>', 3) { |s| break s }
-    @io.lineno.should eql(2)
+    @io.lineno.should.eql?(2)
 
     @io.send(@method, '>', 3) { |s| break s }
-    @io.lineno.should eql(3)
+    @io.lineno.should.eql?(3)
   end
 
   it "tries to convert the passed separator to a String using #to_str" do # TODO
diff --git a/spec/ruby/library/stringio/shared/each_byte.rb b/spec/ruby/library/stringio/shared/each_byte.rb
index b51fa38f2f5..b3939c26de4 100644
--- a/spec/ruby/library/stringio/shared/each_byte.rb
+++ b/spec/ruby/library/stringio/shared/each_byte.rb
@@ -19,16 +19,16 @@
     @io.pos = 1000
     seen = nil
     @io.send(@method) { |b| seen = b }
-    seen.should be_nil
+    seen.should == nil
   end
 
   it "returns self" do
-    @io.send(@method) {}.should equal(@io)
+    @io.send(@method) {}.should.equal?(@io)
   end
 
   it "returns an Enumerator when passed no block" do
     enum = @io.send(@method)
-    enum.instance_of?(Enumerator).should be_true
+    enum.instance_of?(Enumerator).should == true
 
     seen = []
     enum.each { |b| seen << b }
@@ -39,10 +39,10 @@
 describe :stringio_each_byte_not_readable, shared: true do
   it "raises an IOError" do
     io = StringIO.new(+"xyz", "w")
-    -> { io.send(@method) { |b| b } }.should raise_error(IOError)
+    -> { io.send(@method) { |b| b } }.should.raise(IOError)
 
     io = StringIO.new("xyz")
     io.close_read
-    -> { io.send(@method) { |b| b } }.should raise_error(IOError)
+    -> { io.send(@method) { |b| b } }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/shared/each_char.rb b/spec/ruby/library/stringio/shared/each_char.rb
index 197237c1c85..4215a9952b8 100644
--- a/spec/ruby/library/stringio/shared/each_char.rb
+++ b/spec/ruby/library/stringio/shared/each_char.rb
@@ -11,12 +11,12 @@
   end
 
   it "returns self" do
-    @io.send(@method) {}.should equal(@io)
+    @io.send(@method) {}.should.equal?(@io)
   end
 
   it "returns an Enumerator when passed no block" do
     enum = @io.send(@method)
-    enum.instance_of?(Enumerator).should be_true
+    enum.instance_of?(Enumerator).should == true
 
     seen = []
     enum.each { |c| seen << c }
@@ -27,10 +27,10 @@
 describe :stringio_each_char_not_readable, shared: true do
   it "raises an IOError" do
     io = StringIO.new(+"xyz", "w")
-    -> { io.send(@method) { |b| b } }.should raise_error(IOError)
+    -> { io.send(@method) { |b| b } }.should.raise(IOError)
 
     io = StringIO.new("xyz")
     io.close_read
-    -> { io.send(@method) { |b| b } }.should raise_error(IOError)
+    -> { io.send(@method) { |b| b } }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/shared/eof.rb b/spec/ruby/library/stringio/shared/eof.rb
index e0368a2892c..a9489581fcc 100644
--- a/spec/ruby/library/stringio/shared/eof.rb
+++ b/spec/ruby/library/stringio/shared/eof.rb
@@ -5,20 +5,20 @@
 
   it "returns true when self's position is greater than or equal to self's size" do
     @io.pos = 3
-    @io.send(@method).should be_true
+    @io.send(@method).should == true
 
     @io.pos = 6
-    @io.send(@method).should be_true
+    @io.send(@method).should == true
   end
 
   it "returns false when self's position is less than self's size" do
     @io.pos = 0
-    @io.send(@method).should be_false
+    @io.send(@method).should == false
 
     @io.pos = 1
-    @io.send(@method).should be_false
+    @io.send(@method).should == false
 
     @io.pos = 2
-    @io.send(@method).should be_false
+    @io.send(@method).should == false
   end
 end
diff --git a/spec/ruby/library/stringio/shared/getc.rb b/spec/ruby/library/stringio/shared/getc.rb
index ba65040bce0..a146b2d4cfa 100644
--- a/spec/ruby/library/stringio/shared/getc.rb
+++ b/spec/ruby/library/stringio/shared/getc.rb
@@ -5,39 +5,39 @@
 
   it "increases self's position by one" do
     @io.send(@method)
-    @io.pos.should eql(1)
+    @io.pos.should.eql?(1)
 
     @io.send(@method)
-    @io.pos.should eql(2)
+    @io.pos.should.eql?(2)
 
     @io.send(@method)
-    @io.pos.should eql(3)
+    @io.pos.should.eql?(3)
   end
 
   it "returns nil when called at the end of self" do
     @io.pos = 7
-    @io.send(@method).should be_nil
-    @io.send(@method).should be_nil
-    @io.send(@method).should be_nil
+    @io.send(@method).should == nil
+    @io.send(@method).should == nil
+    @io.send(@method).should == nil
   end
 
   it "does not increase self's position when called at the end of file" do
     @io.pos = 7
     @io.send(@method)
-    @io.pos.should eql(7)
+    @io.pos.should.eql?(7)
 
     @io.send(@method)
-    @io.pos.should eql(7)
+    @io.pos.should.eql?(7)
   end
 end
 
 describe :stringio_getc_not_readable, shared: true do
   it "raises an IOError" do
     io = StringIO.new(+"xyz", "w")
-    -> { io.send(@method) }.should raise_error(IOError)
+    -> { io.send(@method) }.should.raise(IOError)
 
     io = StringIO.new("xyz")
     io.close_read
-    -> { io.send(@method) }.should raise_error(IOError)
+    -> { io.send(@method) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/shared/gets.rb b/spec/ruby/library/stringio/shared/gets.rb
index 8396b161f1d..16039b18efb 100644
--- a/spec/ruby/library/stringio/shared/gets.rb
+++ b/spec/ruby/library/stringio/shared/gets.rb
@@ -33,13 +33,13 @@
 
     it "updates self's lineno by one" do
       @io.send(@method, ">")
-      @io.lineno.should eql(1)
+      @io.lineno.should.eql?(1)
 
       @io.send(@method, ">")
-      @io.lineno.should eql(2)
+      @io.lineno.should.eql?(2)
 
       @io.send(@method, ">")
-      @io.lineno.should eql(3)
+      @io.lineno.should.eql?(3)
     end
 
     it "returns the next paragraph when the passed separator is an empty String" do
@@ -88,13 +88,13 @@
 
     it "updates self's lineno by one" do
       @io.send(@method, 3)
-      @io.lineno.should eql(1)
+      @io.lineno.should.eql?(1)
 
       @io.send(@method, 3)
-      @io.lineno.should eql(2)
+      @io.lineno.should.eql?(2)
 
       @io.send(@method, 3)
-      @io.lineno.should eql(3)
+      @io.lineno.should.eql?(3)
     end
 
     it "tries to convert the passed limit to an Integer using #to_int" do
@@ -146,13 +146,13 @@
 
     it "updates self's lineno by one" do
       @io.send(@method, '>', 3)
-      @io.lineno.should eql(1)
+      @io.lineno.should.eql?(1)
 
       @io.send(@method, '>', 3)
-      @io.lineno.should eql(2)
+      @io.lineno.should.eql?(2)
 
       @io.send(@method, '>', 3)
-      @io.lineno.should eql(3)
+      @io.lineno.should.eql?(3)
     end
 
     it "tries to convert the passed separator to a String using #to_str" do
@@ -204,24 +204,24 @@
 
     it "updates self's position" do
       @io.send(@method)
-      @io.pos.should eql(8)
+      @io.pos.should.eql?(8)
 
       @io.send(@method)
-      @io.pos.should eql(19)
+      @io.pos.should.eql?(19)
 
       @io.send(@method)
-      @io.pos.should eql(36)
+      @io.pos.should.eql?(36)
     end
 
     it "updates self's lineno" do
       @io.send(@method)
-      @io.lineno.should eql(1)
+      @io.lineno.should.eql?(1)
 
       @io.send(@method)
-      @io.lineno.should eql(2)
+      @io.lineno.should.eql?(2)
 
       @io.send(@method)
-      @io.lineno.should eql(3)
+      @io.lineno.should.eql?(3)
     end
   end
 end
@@ -239,11 +239,11 @@
   describe "when in write-only mode" do
     it "raises an IOError" do
       io = StringIO.new(+"xyz", "w")
-      -> { io.send(@method) }.should raise_error(IOError)
+      -> { io.send(@method) }.should.raise(IOError)
 
       io = StringIO.new("xyz")
       io.close_read
-      -> { io.send(@method) }.should raise_error(IOError)
+      -> { io.send(@method) }.should.raise(IOError)
     end
   end
 end
diff --git a/spec/ruby/library/stringio/shared/isatty.rb b/spec/ruby/library/stringio/shared/isatty.rb
index c9e7ee73214..2b92e8d6563 100644
--- a/spec/ruby/library/stringio/shared/isatty.rb
+++ b/spec/ruby/library/stringio/shared/isatty.rb
@@ -1,5 +1,5 @@
 describe :stringio_isatty, shared: true do
   it "returns false" do
-    StringIO.new("tty").send(@method).should be_false
+    StringIO.new("tty").send(@method).should == false
   end
 end
diff --git a/spec/ruby/library/stringio/shared/read.rb b/spec/ruby/library/stringio/shared/read.rb
index 22f76b0fb01..6e04e75dbaf 100644
--- a/spec/ruby/library/stringio/shared/read.rb
+++ b/spec/ruby/library/stringio/shared/read.rb
@@ -5,9 +5,9 @@
 
   it "returns the passed buffer String" do
     # Note: Rubinius bug:
-    # @io.send(@method, 7, buffer = +"").should equal(buffer)
+    # @io.send(@method, 7, buffer = +"").should.equal?(buffer)
     ret = @io.send(@method, 7, buffer = +"")
-    ret.should equal(buffer)
+    ret.should.equal?(buffer)
   end
 
   it "reads length bytes and writes them to the buffer String" do
@@ -42,11 +42,11 @@
   end
 
   it "raises a TypeError when the passed buffer Object can't be converted to a String" do
-    -> { @io.send(@method, 7, Object.new) }.should raise_error(TypeError)
+    -> { @io.send(@method, 7, Object.new) }.should.raise(TypeError)
   end
 
   it "raises a FrozenError error when passed a frozen String as buffer" do
-    -> { @io.send(@method, 7, "".freeze) }.should raise_error(FrozenError)
+    -> { @io.send(@method, 7, "".freeze) }.should.raise(FrozenError)
   end
 end
 
@@ -66,10 +66,10 @@
 
   it "correctly updates the position" do
     @io.send(@method, 3)
-    @io.pos.should eql(3)
+    @io.pos.should.eql?(3)
 
     @io.send(@method, 999)
-    @io.pos.should eql(7)
+    @io.pos.should.eql?(7)
   end
 
   it "tries to convert the passed length to an Integer using #to_int" do
@@ -79,11 +79,11 @@
   end
 
   it "raises a TypeError when the passed length can't be converted to an Integer" do
-    -> { @io.send(@method, Object.new) }.should raise_error(TypeError)
+    -> { @io.send(@method, Object.new) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when the passed length is negative" do
-    -> { @io.send(@method, -2) }.should raise_error(ArgumentError)
+    -> { @io.send(@method, -2) }.should.raise(ArgumentError)
   end
 
   it "returns a binary String" do
@@ -105,13 +105,13 @@
 
   it "correctly updates the current position" do
     @io.send(@method)
-    @io.pos.should eql(7)
+    @io.pos.should.eql?(7)
   end
 
   it "correctly update the current position in bytes when multi-byte characters are used" do
     @io.print("example\u03A3") # Overwrite the original string with 8 characters containing 9 bytes.
     @io.send(@method)
-    @io.pos.should eql(9)
+    @io.pos.should.eql?(9)
   end
 end
 
@@ -129,17 +129,17 @@
 
   it "updates the current position" do
     @io.send(@method, nil)
-    @io.pos.should eql(7)
+    @io.pos.should.eql?(7)
   end
 end
 
 describe :stringio_read_not_readable, shared: true do
   it "raises an IOError" do
     io = StringIO.new(+"test", "w")
-    -> { io.send(@method) }.should raise_error(IOError)
+    -> { io.send(@method) }.should.raise(IOError)
 
     io = StringIO.new("test")
     io.close_read
-    -> { io.send(@method) }.should raise_error(IOError)
+    -> { io.send(@method) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/shared/readchar.rb b/spec/ruby/library/stringio/shared/readchar.rb
index 72d7446c362..5ac28e07435 100644
--- a/spec/ruby/library/stringio/shared/readchar.rb
+++ b/spec/ruby/library/stringio/shared/readchar.rb
@@ -13,17 +13,17 @@
 
   it "raises an EOFError when self is at the end" do
     @io.pos = 7
-    -> { @io.send(@method) }.should raise_error(EOFError)
+    -> { @io.send(@method) }.should.raise(EOFError)
   end
 end
 
 describe :stringio_readchar_not_readable, shared: true do
   it "raises an IOError" do
     io = StringIO.new(+"a b c d e", "w")
-    -> { io.send(@method) }.should raise_error(IOError)
+    -> { io.send(@method) }.should.raise(IOError)
 
     io = StringIO.new("a b c d e")
     io.close_read
-    -> { io.send(@method) }.should raise_error(IOError)
+    -> { io.send(@method) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/shared/sysread.rb b/spec/ruby/library/stringio/shared/sysread.rb
index 3e23fbc2335..bc448d33796 100644
--- a/spec/ruby/library/stringio/shared/sysread.rb
+++ b/spec/ruby/library/stringio/shared/sysread.rb
@@ -10,6 +10,6 @@
 
   it "raises an EOFError when passed length > 0 and no data remains" do
     @io.read.should == "example"
-    -> { @io.send(@method, 1) }.should raise_error(EOFError)
+    -> { @io.send(@method, 1) }.should.raise(EOFError)
   end
 end
diff --git a/spec/ruby/library/stringio/shared/write.rb b/spec/ruby/library/stringio/shared/write.rb
index 4661658bafa..b6bffe7f124 100644
--- a/spec/ruby/library/stringio/shared/write.rb
+++ b/spec/ruby/library/stringio/shared/write.rb
@@ -42,7 +42,7 @@
 
   it "updates self's position" do
     @io.send(@method, 'test')
-    @io.pos.should eql(4)
+    @io.pos.should.eql?(4)
   end
 
   it "handles concurrent writes correctly" do
@@ -107,11 +107,11 @@
 describe :stringio_write_not_writable, shared: true do
   it "raises an IOError" do
     io = StringIO.new(+"test", "r")
-    -> { io.send(@method, "test") }.should raise_error(IOError)
+    -> { io.send(@method, "test") }.should.raise(IOError)
 
     io = StringIO.new(+"test")
     io.close_write
-    -> { io.send(@method, "test") }.should raise_error(IOError)
+    -> { io.send(@method, "test") }.should.raise(IOError)
   end
 end
 
@@ -130,6 +130,6 @@
 
   it "correctly updates self's position" do
     @io.send(@method, ", testing")
-    @io.pos.should eql(16)
+    @io.pos.should.eql?(16)
   end
 end
diff --git a/spec/ruby/library/stringio/string_spec.rb b/spec/ruby/library/stringio/string_spec.rb
index 1ed5233ba66..3b27243da90 100644
--- a/spec/ruby/library/stringio/string_spec.rb
+++ b/spec/ruby/library/stringio/string_spec.rb
@@ -4,7 +4,7 @@
 describe "StringIO#string" do
   it "returns the underlying string" do
     io = StringIO.new(str = "hello")
-    io.string.should equal(str)
+    io.string.should.equal?(str)
   end
 end
 
@@ -15,25 +15,25 @@
 
   it "returns the passed String" do
     str = "test"
-    (@io.string = str).should equal(str)
+    (@io.string = str).should.equal?(str)
   end
 
   it "changes the underlying string" do
     str = "hello"
     @io.string = str
-    @io.string.should equal(str)
+    @io.string.should.equal?(str)
   end
 
   it "resets the position" do
     @io.pos = 1
     @io.string = "other"
-    @io.pos.should eql(0)
+    @io.pos.should.eql?(0)
   end
 
   it "resets the line number" do
     @io.lineno = 1
     @io.string = "other"
-    @io.lineno.should eql(0)
+    @io.lineno.should.eql?(0)
   end
 
   it "tries to convert the passed Object to a String using #to_str" do
@@ -45,6 +45,6 @@
   end
 
   it "raises a TypeError when the passed Object can't be converted to an Integer" do
-    -> { @io.seek(Object.new) }.should raise_error(TypeError)
+    -> { @io.seek(Object.new) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/stringio/stringio_spec.rb b/spec/ruby/library/stringio/stringio_spec.rb
index 5ef42b3390c..dee0364ab0e 100644
--- a/spec/ruby/library/stringio/stringio_spec.rb
+++ b/spec/ruby/library/stringio/stringio_spec.rb
@@ -3,6 +3,6 @@
 
 describe "StringIO" do
   it "includes the Enumerable module" do
-    StringIO.should include(Enumerable)
+    StringIO.should.include?(Enumerable)
   end
 end
diff --git a/spec/ruby/library/stringio/sync_spec.rb b/spec/ruby/library/stringio/sync_spec.rb
index e717a5697b1..d7d1209047b 100644
--- a/spec/ruby/library/stringio/sync_spec.rb
+++ b/spec/ruby/library/stringio/sync_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#sync" do
   it "returns true" do
-    StringIO.new('').sync.should be_true
+    StringIO.new('').sync.should == true
   end
 end
 
@@ -14,6 +14,6 @@
 
   it "does not change 'sync' status" do
     @io.sync = false
-    @io.sync.should be_true
+    @io.sync.should == true
   end
 end
diff --git a/spec/ruby/library/stringio/sysread_spec.rb b/spec/ruby/library/stringio/sysread_spec.rb
index fabb06dd9a6..1403dab5cb3 100644
--- a/spec/ruby/library/stringio/sysread_spec.rb
+++ b/spec/ruby/library/stringio/sysread_spec.rb
@@ -44,7 +44,7 @@
 
   it "raises an EOFError when self's position is at the end" do
     @io.pos = 7
-    -> { @io.sysread(10) }.should raise_error(EOFError)
+    -> { @io.sysread(10) }.should.raise(EOFError)
   end
 
   it "returns an empty String when length is 0" do
diff --git a/spec/ruby/library/stringio/truncate_spec.rb b/spec/ruby/library/stringio/truncate_spec.rb
index 592ca5a6e18..7205261141d 100644
--- a/spec/ruby/library/stringio/truncate_spec.rb
+++ b/spec/ruby/library/stringio/truncate_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "returns an Integer" do
-    @io.truncate(4).should be_kind_of(Integer)
+    @io.truncate(4).should.is_a?(Integer)
   end
 
   it "truncated the underlying string down to the passed length" do
@@ -18,13 +18,13 @@
   it "does not create a copy of the underlying string" do
     io = StringIO.new(str = +"123456789")
     io.truncate(4)
-    io.string.should equal(str)
+    io.string.should.equal?(str)
   end
 
   it "does not change the position" do
     @io.pos = 7
     @io.truncate(4)
-    @io.pos.should eql(7)
+    @io.pos.should.eql?(7)
   end
 
   it "can grow a string to a larger size, padding it with \\000" do
@@ -33,8 +33,8 @@
   end
 
   it "raises an Errno::EINVAL when the passed length is negative" do
-    -> { @io.truncate(-1) }.should raise_error(Errno::EINVAL)
-    -> { @io.truncate(-10) }.should raise_error(Errno::EINVAL)
+    -> { @io.truncate(-1) }.should.raise(Errno::EINVAL)
+    -> { @io.truncate(-10) }.should.raise(Errno::EINVAL)
   end
 
   it "tries to convert the passed length to an Integer using #to_int" do
@@ -46,17 +46,17 @@
   end
 
   it "raises a TypeError when the passed length can't be converted to an Integer" do
-    -> { @io.truncate(Object.new) }.should raise_error(TypeError)
+    -> { @io.truncate(Object.new) }.should.raise(TypeError)
   end
 end
 
 describe "StringIO#truncate when self is not writable" do
   it "raises an IOError" do
     io = StringIO.new(+"test", "r")
-    -> { io.truncate(2) }.should raise_error(IOError)
+    -> { io.truncate(2) }.should.raise(IOError)
 
     io = StringIO.new(+"test")
     io.close_write
-    -> { io.truncate(2) }.should raise_error(IOError)
+    -> { io.truncate(2) }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/stringio/ungetc_spec.rb b/spec/ruby/library/stringio/ungetc_spec.rb
index bceafa79ffa..8753ac9666e 100644
--- a/spec/ruby/library/stringio/ungetc_spec.rb
+++ b/spec/ruby/library/stringio/ungetc_spec.rb
@@ -14,13 +14,13 @@
 
   it "returns nil" do
     @io.pos = 1
-    @io.ungetc(?A).should be_nil
+    @io.ungetc(?A).should == nil
   end
 
   it "decreases the current position by one" do
     @io.pos = 2
     @io.ungetc(?A)
-    @io.pos.should eql(1)
+    @io.pos.should.eql?(1)
   end
 
   it "pads with \\000 when the current position is after the end" do
@@ -39,7 +39,7 @@
   end
 
   it "raises a TypeError when the passed length can't be converted to an Integer or String" do
-    -> { @io.ungetc(Object.new) }.should raise_error(TypeError)
+    -> { @io.ungetc(Object.new) }.should.raise(TypeError)
   end
 end
 
@@ -47,12 +47,12 @@
   it "raises an IOError" do
     io = StringIO.new(+"test", "w")
     io.pos = 1
-    -> { io.ungetc(?A) }.should raise_error(IOError)
+    -> { io.ungetc(?A) }.should.raise(IOError)
 
     io = StringIO.new(+"test")
     io.pos = 1
     io.close_read
-    -> { io.ungetc(?A) }.should raise_error(IOError)
+    -> { io.ungetc(?A) }.should.raise(IOError)
   end
 end
 
@@ -62,11 +62,11 @@
 #   it "raises an IOError" do
 #     io = StringIO.new(+"test", "r")
 #     io.pos = 1
-#     lambda { io.ungetc(?A) }.should raise_error(IOError)
+#     lambda { io.ungetc(?A) }.should.raise(IOError)
 #
 #     io = StringIO.new(+"test")
 #     io.pos = 1
 #     io.close_write
-#     lambda { io.ungetc(?A) }.should raise_error(IOError)
+#     lambda { io.ungetc(?A) }.should.raise(IOError)
 #   end
 # end
diff --git a/spec/ruby/library/stringscanner/check_spec.rb b/spec/ruby/library/stringscanner/check_spec.rb
index 5e855e154ad..232158b09e9 100644
--- a/spec/ruby/library/stringscanner/check_spec.rb
+++ b/spec/ruby/library/stringscanner/check_spec.rb
@@ -33,7 +33,7 @@
       it "returns nil when matching failed" do
         @s.check(/(?<a>2008)/)
         @s.should_not.matched?
-        @s[:a].should be_nil
+        @s[:a].should == nil
       end
     end
 
@@ -43,21 +43,21 @@
         it "returns nil when matching succeeded" do
           @s.check("This")
           @s.should.matched?
-          @s[:a].should be_nil
+          @s[:a].should == nil
         end
       end
       version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
         it "raises IndexError when matching succeeded" do
           @s.check("This")
           @s.should.matched?
-          -> { @s[:a] }.should raise_error(IndexError)
+          -> { @s[:a] }.should.raise(IndexError)
         end
       end
 
       it "returns nil when matching failed" do
         @s.check("2008")
         @s.should_not.matched?
-        @s[:a].should be_nil
+        @s[:a].should == nil
       end
 
       it "returns a matching substring when given Integer index" do
@@ -74,7 +74,7 @@
 
           @s.check("This")
           @s.should.matched?
-          @s[:a].should be_nil
+          @s[:a].should == nil
         end
       end
       version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
@@ -85,7 +85,7 @@
 
           @s.check("This")
           @s.should.matched?
-          -> { @s[:a] }.should raise_error(IndexError)
+          -> { @s[:a] }.should.raise(IndexError)
         end
       end
     end
diff --git a/spec/ruby/library/stringscanner/check_until_spec.rb b/spec/ruby/library/stringscanner/check_until_spec.rb
index 582da66b375..b4ef35d9f76 100644
--- a/spec/ruby/library/stringscanner/check_until_spec.rb
+++ b/spec/ruby/library/stringscanner/check_until_spec.rb
@@ -24,7 +24,7 @@
     it "raises TypeError if given a String" do
       -> {
         @s.check_until('T')
-      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+      }.should.raise(TypeError, 'wrong argument type String (expected Regexp)')
     end
   end
 
@@ -67,7 +67,7 @@
       it "returns nil when matching failed" do
         @s.check_until(/(?<a>2008)/)
         @s.should_not.matched?
-        @s[:a].should be_nil
+        @s[:a].should == nil
       end
     end
 
@@ -78,21 +78,21 @@
           it "returns nil when matching succeeded" do
             @s.check_until("This")
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.check_until("This")
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
 
         it "returns nil when matching failed" do
           @s.check_until("2008")
           @s.should_not.matched?
-          @s[:a].should be_nil
+          @s[:a].should == nil
         end
 
         it "returns a matching substring when given Integer index" do
@@ -109,7 +109,7 @@
 
             @s.check_until("This")
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
@@ -120,7 +120,7 @@
 
             @s.check_until("This")
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
       end
diff --git a/spec/ruby/library/stringscanner/dup_spec.rb b/spec/ruby/library/stringscanner/dup_spec.rb
index 0fc52a1477e..01189645269 100644
--- a/spec/ruby/library/stringscanner/dup_spec.rb
+++ b/spec/ruby/library/stringscanner/dup_spec.rb
@@ -15,7 +15,7 @@
   it "copies the passed StringScanner's position to self" do
     @orig_s.pos = 5
     s = @orig_s.dup
-    s.pos.should eql(5)
+    s.pos.should.eql?(5)
   end
 
   it "copies previous match state" do
@@ -34,6 +34,6 @@
   it "copies the passed StringScanner scan pointer to self" do
     @orig_s.terminate
     s = @orig_s.dup
-    s.eos?.should be_true
+    s.eos?.should == true
   end
 end
diff --git a/spec/ruby/library/stringscanner/element_reference_spec.rb b/spec/ruby/library/stringscanner/element_reference_spec.rb
index 91b6d86dc75..bcd48ede61a 100644
--- a/spec/ruby/library/stringscanner/element_reference_spec.rb
+++ b/spec/ruby/library/stringscanner/element_reference_spec.rb
@@ -7,8 +7,8 @@
   end
 
   it "returns nil if there is no current match" do
-    @s[0].should be_nil
-    @s[:wday].should be_nil
+    @s[0].should == nil
+    @s[:wday].should == nil
   end
 
   it "returns the n-th subgroup in the most recent match" do
@@ -35,24 +35,24 @@
 
   it "raises a TypeError if the given index is nil" do
     @s.scan(/(\w+) (\w+) (\d+) /)
-    -> { @s[nil]}.should raise_error(TypeError)
+    -> { @s[nil]}.should.raise(TypeError)
   end
 
   it "raises a TypeError when a Range is as argument" do
     @s.scan(/(\w+) (\w+) (\d+) /)
-    -> { @s[0..2]}.should raise_error(TypeError)
+    -> { @s[0..2]}.should.raise(TypeError)
   end
 
   it "raises a IndexError when there's no any named capture group in the regexp" do
     @s.scan(/(\w+) (\w+) (\d+) /)
-    -> { @s["wday"]}.should raise_error(IndexError)
-    -> { @s[:wday]}.should raise_error(IndexError)
+    -> { @s["wday"]}.should.raise(IndexError)
+    -> { @s[:wday]}.should.raise(IndexError)
   end
 
   it "raises a IndexError when given a not existing capture group name" do
     @s.scan(/(?<a>\w+) (?<b>\w+) (?<c>\d+) /)
-    -> { @s["wday"]}.should raise_error(IndexError)
-    -> { @s[:wday]}.should raise_error(IndexError)
+    -> { @s["wday"]}.should.raise(IndexError)
+    -> { @s[:wday]}.should.raise(IndexError)
   end
 
   it "returns named capture" do
diff --git a/spec/ruby/library/stringscanner/exist_spec.rb b/spec/ruby/library/stringscanner/exist_spec.rb
index a408fd0b8dc..22076223669 100644
--- a/spec/ruby/library/stringscanner/exist_spec.rb
+++ b/spec/ruby/library/stringscanner/exist_spec.rb
@@ -32,7 +32,7 @@
     it "raises TypeError if given a String" do
       -> {
         @s.exist?('T')
-      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+      }.should.raise(TypeError, 'wrong argument type String (expected Regexp)')
     end
   end
 
@@ -57,7 +57,7 @@
       it "returns nil when matching failed" do
         @s.exist?(/(?<a>2008)/)
         @s.should_not.matched?
-        @s[:a].should be_nil
+        @s[:a].should == nil
       end
     end
 
@@ -68,21 +68,21 @@
           it "returns nil when matching succeeded" do
             @s.exist?("This")
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.exist?("This")
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
 
         it "returns nil when matching failed" do
           @s.exist?("2008")
           @s.should_not.matched?
-          @s[:a].should be_nil
+          @s[:a].should == nil
         end
 
         it "returns a matching substring when given Integer index" do
@@ -99,7 +99,7 @@
 
             @s.exist?("This")
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
@@ -110,7 +110,7 @@
 
             @s.exist?("This")
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
       end
diff --git a/spec/ruby/library/stringscanner/get_byte_spec.rb b/spec/ruby/library/stringscanner/get_byte_spec.rb
index 144859abc92..b989b73883c 100644
--- a/spec/ruby/library/stringscanner/get_byte_spec.rb
+++ b/spec/ruby/library/stringscanner/get_byte_spec.rb
@@ -37,7 +37,7 @@
         s = StringScanner.new("This is a test")
         s.get_byte
         s.should.matched?
-        s[:a].should be_nil
+        s[:a].should == nil
       end
     end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
@@ -45,7 +45,7 @@
         s = StringScanner.new("This is a test")
         s.get_byte
         s.should.matched?
-        -> { s[:a] }.should raise_error(IndexError)
+        -> { s[:a] }.should.raise(IndexError)
       end
     end
 
@@ -65,7 +65,7 @@
 
         s.get_byte
         s.should.matched?
-        s[:a].should be_nil
+        s[:a].should == nil
       end
     end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
@@ -77,7 +77,7 @@
 
         s.get_byte
         s.should.matched?
-        -> { s[:a] }.should raise_error(IndexError)
+        -> { s[:a] }.should.raise(IndexError)
       end
     end
   end
diff --git a/spec/ruby/library/stringscanner/getch_spec.rb b/spec/ruby/library/stringscanner/getch_spec.rb
index d369391b140..cd41b4336a6 100644
--- a/spec/ruby/library/stringscanner/getch_spec.rb
+++ b/spec/ruby/library/stringscanner/getch_spec.rb
@@ -11,6 +11,13 @@
     s.getch.should == "c"
   end
 
+  it "scans newlines too" do
+    s = StringScanner.new("a\nc")
+    s.getch.should == "a"
+    s.getch.should == "\n"
+    s.getch.should == "c"
+  end
+
   it "is multi-byte character sensitive" do
     # Japanese hiragana "A" in EUC-JP
     src = "\244\242".dup.force_encoding("euc-jp")
@@ -38,7 +45,7 @@
         s = StringScanner.new("This is a test")
         s.getch
         s.should.matched?
-        s[:a].should be_nil
+        s[:a].should == nil
       end
     end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
@@ -46,7 +53,7 @@
         s = StringScanner.new("This is a test")
         s.getch
         s.should.matched?
-        -> { s[:a] }.should raise_error(IndexError)
+        -> { s[:a] }.should.raise(IndexError)
       end
     end
 
@@ -67,7 +74,7 @@
 
         s.getch
         s.should.matched?
-        s[:a].should be_nil
+        s[:a].should == nil
       end
     end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
@@ -80,7 +87,7 @@
 
         s.getch
         s.should.matched?
-        -> { s[:a] }.should raise_error(IndexError)
+        -> { s[:a] }.should.raise(IndexError)
       end
     end
   end
diff --git a/spec/ruby/library/stringscanner/initialize_spec.rb b/spec/ruby/library/stringscanner/initialize_spec.rb
index 77f6084c1b7..fdab4d381ca 100644
--- a/spec/ruby/library/stringscanner/initialize_spec.rb
+++ b/spec/ruby/library/stringscanner/initialize_spec.rb
@@ -7,12 +7,12 @@
   end
 
   it "is a private method" do
-    StringScanner.should have_private_instance_method(:initialize)
+    StringScanner.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "returns an instance of StringScanner" do
-    @s.should be_kind_of(StringScanner)
-    @s.eos?.should be_false
+    @s.should.is_a?(StringScanner)
+    @s.eos?.should == false
   end
 
   it "converts the argument into a string using #to_str" do
diff --git a/spec/ruby/library/stringscanner/inspect_spec.rb b/spec/ruby/library/stringscanner/inspect_spec.rb
index ff6b97eb916..570d0b7b106 100644
--- a/spec/ruby/library/stringscanner/inspect_spec.rb
+++ b/spec/ruby/library/stringscanner/inspect_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "returns a String object" do
-    @s.inspect.should be_kind_of(String)
+    @s.inspect.should.is_a?(String)
   end
 
   it "returns a string that represents the StringScanner object" do
diff --git a/spec/ruby/library/stringscanner/match_spec.rb b/spec/ruby/library/stringscanner/match_spec.rb
index a27bb51d72c..c2bc49324b4 100644
--- a/spec/ruby/library/stringscanner/match_spec.rb
+++ b/spec/ruby/library/stringscanner/match_spec.rb
@@ -45,7 +45,7 @@
     it "returns nil when matching failed" do
       @s.match?(/(?<a>2008)/)
       @s.should_not.matched?
-      @s[:a].should be_nil
+      @s[:a].should == nil
     end
   end
 end
diff --git a/spec/ruby/library/stringscanner/matched_spec.rb b/spec/ruby/library/stringscanner/matched_spec.rb
index c020bd3eae2..95b57574c52 100644
--- a/spec/ruby/library/stringscanner/matched_spec.rb
+++ b/spec/ruby/library/stringscanner/matched_spec.rb
@@ -31,11 +31,11 @@
 
   it "returns true if the last match was successful" do
     @s.match?(/\w+/)
-    @s.matched?.should be_true
+    @s.matched?.should == true
   end
 
   it "returns false if there's no match" do
     @s.match?(/\d+/)
-    @s.matched?.should be_false
+    @s.matched?.should == false
   end
 end
diff --git a/spec/ruby/library/stringscanner/peek_spec.rb b/spec/ruby/library/stringscanner/peek_spec.rb
index d490abecf96..5b54c6be0b6 100644
--- a/spec/ruby/library/stringscanner/peek_spec.rb
+++ b/spec/ruby/library/stringscanner/peek_spec.rb
@@ -22,11 +22,11 @@
   end
 
   it "raises a ArgumentError when the passed argument is negative" do
-    -> { @s.peek(-2) }.should raise_error(ArgumentError)
+    -> { @s.peek(-2) }.should.raise(ArgumentError)
   end
 
   it "raises a RangeError when the passed argument is a Bignum" do
-    -> { @s.peek(bignum_value) }.should raise_error(RangeError)
+    -> { @s.peek(bignum_value) }.should.raise(RangeError)
   end
 
   it "returns an instance of String when passed a String subclass" do
@@ -36,7 +36,7 @@
     s = StringScanner.new(sub)
 
     ch = s.peek(1)
-    ch.should_not be_kind_of(cls)
-    ch.should be_an_instance_of(String)
+    ch.should_not.is_a?(cls)
+    ch.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/library/stringscanner/rest_size_spec.rb b/spec/ruby/library/stringscanner/rest_size_spec.rb
index a5e971631a5..65d3b50e089 100644
--- a/spec/ruby/library/stringscanner/rest_size_spec.rb
+++ b/spec/ruby/library/stringscanner/rest_size_spec.rb
@@ -14,8 +14,17 @@
     @s.rest_size.should == 0
   end
 
-  it "is equivalent to rest.size" do
+  it "is equivalent to rest.bytesize" do
     @s.scan(/This/)
-    @s.rest_size.should == @s.rest.size
+    @s.rest_size.should == @s.rest.bytesize
+
+    s = StringScanner.new('été')
+    s.rest_size.should == 5
+    s.scan(/./)
+    s.rest_size.should == 3
+    s.scan(/./)
+    s.rest_size.should == 2
+    s.scan(/./)
+    s.rest_size.should == 0
   end
 end
diff --git a/spec/ruby/library/stringscanner/rest_spec.rb b/spec/ruby/library/stringscanner/rest_spec.rb
index 67072f880de..40f073058cb 100644
--- a/spec/ruby/library/stringscanner/rest_spec.rb
+++ b/spec/ruby/library/stringscanner/rest_spec.rb
@@ -32,14 +32,14 @@
   end
 
   it "returns true if there is more data in the string" do
-    @s.rest?.should be_true
+    @s.rest?.should == true
     @s.scan(/This/)
-    @s.rest?.should be_true
+    @s.rest?.should == true
   end
 
   it "returns false if there is no more data in the string" do
     @s.terminate
-    @s.rest?.should be_false
+    @s.rest?.should == false
   end
 
   it "is the opposite of eos?" do
diff --git a/spec/ruby/library/stringscanner/scan_byte_spec.rb b/spec/ruby/library/stringscanner/scan_byte_spec.rb
index aa2decc8f74..8fd77270e4f 100644
--- a/spec/ruby/library/stringscanner/scan_byte_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_byte_spec.rb
@@ -48,7 +48,7 @@
           s = StringScanner.new("abc")
           s.scan_byte
           s.should.matched?
-          s[:a].should be_nil
+          s[:a].should == nil
         end
       end
       version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
@@ -56,7 +56,7 @@
           s = StringScanner.new("abc")
           s.scan_byte
           s.should.matched?
-          -> { s[:a] }.should raise_error(IndexError)
+          -> { s[:a] }.should.raise(IndexError)
         end
       end
 
@@ -90,7 +90,7 @@
 
           s.scan_byte
           s.should.matched?
-          -> { s[:a] }.should raise_error(IndexError)
+          -> { s[:a] }.should.raise(IndexError)
         end
       end
     end
diff --git a/spec/ruby/library/stringscanner/scan_full_spec.rb b/spec/ruby/library/stringscanner/scan_full_spec.rb
index 967313f5ca8..7633c178603 100644
--- a/spec/ruby/library/stringscanner/scan_full_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_full_spec.rb
@@ -38,7 +38,7 @@
     it "returns nil when matching failed" do
       @s.scan_full(/(?<a>2008)/, false, false)
       @s.should_not.matched?
-      @s[:a].should be_nil
+      @s[:a].should == nil
     end
   end
 end
diff --git a/spec/ruby/library/stringscanner/scan_integer_spec.rb b/spec/ruby/library/stringscanner/scan_integer_spec.rb
index fe0d26f4049..d83149344a5 100644
--- a/spec/ruby/library/stringscanner/scan_integer_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_integer_spec.rb
@@ -44,7 +44,7 @@
 
       -> {
         s.scan_integer
-      }.should raise_error(Encoding::CompatibilityError, 'ASCII incompatible encoding: UTF-16BE')
+      }.should.raise(Encoding::CompatibilityError, /ASCII incompatible encoding: UTF-16BE|incompatible encoding regexp match/)
     end
 
     context "given base" do
@@ -65,7 +65,7 @@
       it "raises ArgumentError when passed not supported base" do
         -> {
           StringScanner.new("42").scan_integer(base: 5)
-        }.should raise_error(ArgumentError, "Unsupported integer base: 5, expected 10 or 16")
+        }.should.raise(ArgumentError, "Unsupported integer base: 5, expected 10 or 16")
       end
 
       version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
@@ -107,7 +107,7 @@
         s = StringScanner.new("42")
         s.scan_integer
         s.should.matched?
-        -> { s[:a] }.should raise_error(IndexError)
+        -> { s[:a] }.should.raise(IndexError)
       end
     end
 
@@ -115,7 +115,7 @@
       s = StringScanner.new("a42")
       s.scan_integer
       s.should_not.matched?
-      s[:a].should be_nil
+      s[:a].should == nil
     end
 
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
@@ -150,7 +150,7 @@
 
         s.scan_integer
         s.should.matched?
-        -> { s[:a] }.should raise_error(IndexError)
+        -> { s[:a] }.should.raise(IndexError)
       end
     end
   end
diff --git a/spec/ruby/library/stringscanner/scan_spec.rb b/spec/ruby/library/stringscanner/scan_spec.rb
index 088c3419fbc..ee8a9eb103d 100644
--- a/spec/ruby/library/stringscanner/scan_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_spec.rb
@@ -15,7 +15,7 @@
 
   it "treats ^ as matching from the beginning of the current position" do
     @s.scan(/\w+/).should == "This"
-    @s.scan(/^\d/).should be_nil
+    @s.scan(/^\d/).should == nil
     @s.scan(/^\s/).should == " "
   end
 
@@ -26,7 +26,7 @@
 
   it "treats \\A as matching from the beginning of the current position" do
     @s.scan(/\w+/).should == "This"
-    @s.scan(/\A\d/).should be_nil
+    @s.scan(/\A\d/).should == nil
     @s.scan(/\A\s/).should == " "
   end
 
@@ -41,24 +41,24 @@
 
   it "returns nil when there is no more to scan" do
     @s.scan(/[\w\s]+/).should == "This is a test"
-    @s.scan(/\w+/).should be_nil
+    @s.scan(/\w+/).should == nil
   end
 
   it "returns an empty string when the pattern matches empty" do
     @s.scan(/.*/).should == "This is a test"
     @s.scan(/.*/).should == ""
-    @s.scan(/./).should be_nil
+    @s.scan(/./).should == nil
   end
 
   it "treats String as the pattern itself" do
-    @s.scan("this").should be_nil
+    @s.scan("this").should == nil
     @s.scan("This").should == "This"
   end
 
   it "raises a TypeError if pattern isn't a Regexp nor String" do
-    -> { @s.scan(5)         }.should raise_error(TypeError)
-    -> { @s.scan(:test)     }.should raise_error(TypeError)
-    -> { @s.scan(mock('x')) }.should raise_error(TypeError)
+    -> { @s.scan(5)         }.should.raise(TypeError)
+    -> { @s.scan(:test)     }.should.raise(TypeError)
+    -> { @s.scan(mock('x')) }.should.raise(TypeError)
   end
 
   describe "#[] successive call with a capture group name" do
@@ -71,7 +71,7 @@
     it "returns nil when matching failed" do
       @s.scan(/(?<a>2008)/)
       @s.should_not.matched?
-      @s[:a].should be_nil
+      @s[:a].should == nil
     end
   end
 end
@@ -91,11 +91,11 @@
   it "treats ^ as matching from the beginning of line" do
     @s.scan(/\w+\n/).should == "This\n"
     @s.scan(/^\w/).should == "i"
-    @s.scan(/^\w/).should be_nil
+    @s.scan(/^\w/).should == nil
   end
 
   it "treats \\A as matching from the beginning of string" do
     @s.scan(/\A\w/).should == "T"
-    @s.scan(/\A\w/).should be_nil
+    @s.scan(/\A\w/).should == nil
   end
 end
diff --git a/spec/ruby/library/stringscanner/scan_until_spec.rb b/spec/ruby/library/stringscanner/scan_until_spec.rb
index 610060d6f1e..df83f3916a9 100644
--- a/spec/ruby/library/stringscanner/scan_until_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_until_spec.rb
@@ -31,7 +31,7 @@
     it "raises TypeError if given a String" do
       -> {
         @s.scan_until('T')
-      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+      }.should.raise(TypeError, 'wrong argument type String (expected Regexp)')
     end
   end
 
@@ -73,7 +73,7 @@
       it "returns nil when matching failed" do
         @s.scan_until(/(?<a>2008)/)
         @s.should_not.matched?
-        @s[:a].should be_nil
+        @s[:a].should == nil
       end
     end
 
@@ -84,21 +84,21 @@
           it "returns nil when matching succeeded" do
             @s.scan_until("This")
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.scan_until("This")
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
 
         it "returns nil when matching failed" do
           @s.scan_until("2008")
           @s.should_not.matched?
-          @s[:a].should be_nil
+          @s[:a].should == nil
         end
 
         it "returns a matching substring when given Integer index" do
@@ -115,7 +115,7 @@
 
             @s.scan_until("This")
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
@@ -126,7 +126,7 @@
 
             @s.scan_until("This")
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
       end
diff --git a/spec/ruby/library/stringscanner/search_full_spec.rb b/spec/ruby/library/stringscanner/search_full_spec.rb
index 197adfda4d4..656884f46b7 100644
--- a/spec/ruby/library/stringscanner/search_full_spec.rb
+++ b/spec/ruby/library/stringscanner/search_full_spec.rb
@@ -40,7 +40,7 @@
     it "raises TypeError if given a String" do
       -> {
         @s.search_full('T', true, true)
-      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+      }.should.raise(TypeError, 'wrong argument type String (expected Regexp)')
     end
   end
 
@@ -82,7 +82,7 @@
       it "returns nil when matching failed" do
         @s.search_full(/(?<a>2008)/, false, false)
         @s.should_not.matched?
-        @s[:a].should be_nil
+        @s[:a].should == nil
       end
     end
 
@@ -93,21 +93,21 @@
           it "returns nil when matching succeeded" do
             @s.search_full("This", false, false)
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.search_full("This", false, false)
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
 
         it "returns nil when matching failed" do
           @s.search_full("2008", false, false)
           @s.should_not.matched?
-          @s[:a].should be_nil
+          @s[:a].should == nil
         end
 
         it "returns a matching substring when given Integer index" do
@@ -124,7 +124,7 @@
 
             @s.search_full("This", false, false)
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
       end
diff --git a/spec/ruby/library/stringscanner/shared/bol.rb b/spec/ruby/library/stringscanner/shared/bol.rb
index ebcdd7938ff..ec5c2051b51 100644
--- a/spec/ruby/library/stringscanner/shared/bol.rb
+++ b/spec/ruby/library/stringscanner/shared/bol.rb
@@ -1,25 +1,25 @@
 describe :strscan_bol, shared: true do
   it "returns true if the scan pointer is at the beginning of the line, false otherwise" do
     s = StringScanner.new("This is a test")
-    s.send(@method).should be_true
+    s.send(@method).should == true
     s.scan(/This/)
-    s.send(@method).should be_false
+    s.send(@method).should == false
     s.terminate
-    s.send(@method).should be_false
+    s.send(@method).should == false
 
     s = StringScanner.new("hello\nworld")
-    s.bol?.should be_true
+    s.bol?.should == true
     s.scan(/\w+/)
-    s.bol?.should be_false
+    s.bol?.should == false
     s.scan(/\n/)
-    s.bol?.should be_true
+    s.bol?.should == true
     s.unscan
-    s.bol?.should be_false
+    s.bol?.should == false
   end
 
   it "returns true if the scan pointer is at the end of the line of an empty string." do
     s = StringScanner.new('')
     s.terminate
-    s.send(@method).should be_true
+    s.send(@method).should == true
   end
 end
diff --git a/spec/ruby/library/stringscanner/shared/concat.rb b/spec/ruby/library/stringscanner/shared/concat.rb
index 1dbae11f7cc..8138b0f8dcd 100644
--- a/spec/ruby/library/stringscanner/shared/concat.rb
+++ b/spec/ruby/library/stringscanner/shared/concat.rb
@@ -3,28 +3,28 @@
     s = StringScanner.new(+"hello ")
     s.send(@method, 'world').should == s
     s.string.should == "hello world"
-    s.eos?.should be_false
+    s.eos?.should == false
   end
 
   it "raises a TypeError if the given argument can't be converted to a String" do
-    -> { StringScanner.new('hello').send(@method, :world)    }.should raise_error(TypeError)
-    -> { StringScanner.new('hello').send(@method, mock('x')) }.should raise_error(TypeError)
+    -> { StringScanner.new('hello').send(@method, :world)    }.should.raise(TypeError)
+    -> { StringScanner.new('hello').send(@method, mock('x')) }.should.raise(TypeError)
   end
 end
 
 describe :strscan_concat_fixnum, shared: true do
   it "raises a TypeError" do
     a = StringScanner.new("hello world")
-    -> { a.send(@method, 333) }.should raise_error(TypeError)
+    -> { a.send(@method, 333) }.should.raise(TypeError)
     b = StringScanner.new("")
-    -> { b.send(@method, (256 * 3 + 64)) }.should raise_error(TypeError)
-    -> { b.send(@method, -200)           }.should raise_error(TypeError)
+    -> { b.send(@method, (256 * 3 + 64)) }.should.raise(TypeError)
+    -> { b.send(@method, -200)           }.should.raise(TypeError)
   end
 
   it "doesn't call to_int on the argument" do
     x = mock('x')
     x.should_not_receive(:to_int)
 
-    -> { StringScanner.new("").send(@method, x) }.should raise_error(TypeError)
+    -> { StringScanner.new("").send(@method, x) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/stringscanner/shared/extract_range.rb b/spec/ruby/library/stringscanner/shared/extract_range.rb
index e7404fd0cb1..c64cc41fa73 100644
--- a/spec/ruby/library/stringscanner/shared/extract_range.rb
+++ b/spec/ruby/library/stringscanner/shared/extract_range.rb
@@ -5,7 +5,7 @@
 
     s = StringScanner.new(sub)
     ch = s.send(@method)
-    ch.should_not be_kind_of(cls)
-    ch.should be_an_instance_of(String)
+    ch.should_not.is_a?(cls)
+    ch.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/library/stringscanner/shared/extract_range_matched.rb b/spec/ruby/library/stringscanner/shared/extract_range_matched.rb
index 070a1328126..8a6349bec17 100644
--- a/spec/ruby/library/stringscanner/shared/extract_range_matched.rb
+++ b/spec/ruby/library/stringscanner/shared/extract_range_matched.rb
@@ -7,7 +7,7 @@
     s.scan(/\w{1}/)
 
     ch = s.send(@method)
-    ch.should_not be_kind_of(cls)
-    ch.should be_an_instance_of(String)
+    ch.should_not.is_a?(cls)
+    ch.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/library/stringscanner/shared/pos.rb b/spec/ruby/library/stringscanner/shared/pos.rb
index eea7ead6b5e..91f80fdf084 100644
--- a/spec/ruby/library/stringscanner/shared/pos.rb
+++ b/spec/ruby/library/stringscanner/shared/pos.rb
@@ -50,10 +50,10 @@
   it "raises a RangeError if position too far backward" do
     -> {
       @s.send(@method, -20)
-    }.should raise_error(RangeError)
+    }.should.raise(RangeError)
   end
 
   it "raises a RangeError when the passed argument is out of range" do
-    -> { @s.send(@method, 20) }.should raise_error(RangeError)
+    -> { @s.send(@method, 20) }.should.raise(RangeError)
   end
 end
diff --git a/spec/ruby/library/stringscanner/skip_spec.rb b/spec/ruby/library/stringscanner/skip_spec.rb
index 12f5b7781c8..2b955b31725 100644
--- a/spec/ruby/library/stringscanner/skip_spec.rb
+++ b/spec/ruby/library/stringscanner/skip_spec.rb
@@ -26,7 +26,7 @@
     it "returns nil when matching failed" do
       @s.skip(/(?<a>2008)/)
       @s.should_not.matched?
-      @s[:a].should be_nil
+      @s[:a].should == nil
     end
   end
 end
diff --git a/spec/ruby/library/stringscanner/skip_until_spec.rb b/spec/ruby/library/stringscanner/skip_until_spec.rb
index 5d73d8f0b91..508db285ba2 100644
--- a/spec/ruby/library/stringscanner/skip_until_spec.rb
+++ b/spec/ruby/library/stringscanner/skip_until_spec.rb
@@ -27,7 +27,7 @@
     it "raises TypeError if given a String" do
       -> {
         @s.skip_until('T')
-      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+      }.should.raise(TypeError, 'wrong argument type String (expected Regexp)')
     end
   end
 
@@ -70,7 +70,7 @@
       it "returns nil when matching failed" do
         @s.skip_until(/(?<a>2008)/)
         @s.should_not.matched?
-        @s[:a].should be_nil
+        @s[:a].should == nil
       end
     end
 
@@ -81,21 +81,21 @@
           it "returns nil when matching succeeded" do
             @s.skip_until("This")
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.skip_until("This")
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
 
         it "returns nil when matching failed" do
           @s.skip_until("2008")
           @s.should_not.matched?
-          @s[:a].should be_nil
+          @s[:a].should == nil
         end
 
         it "returns a matching substring when given Integer index" do
@@ -112,7 +112,7 @@
 
             @s.skip_until("This")
             @s.should.matched?
-            @s[:a].should be_nil
+            @s[:a].should == nil
           end
         end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
@@ -123,7 +123,7 @@
 
             @s.skip_until("This")
             @s.should.matched?
-            -> { @s[:a] }.should raise_error(IndexError)
+            -> { @s[:a] }.should.raise(IndexError)
           end
         end
       end
diff --git a/spec/ruby/library/stringscanner/string_spec.rb b/spec/ruby/library/stringscanner/string_spec.rb
index cba6bd51dd6..6cbbff48227 100644
--- a/spec/ruby/library/stringscanner/string_spec.rb
+++ b/spec/ruby/library/stringscanner/string_spec.rb
@@ -14,7 +14,7 @@
   end
 
   it "returns the identical object passed in" do
-    @s.string.equal?(@string).should be_true
+    @s.string.equal?(@string).should == true
   end
 end
 
diff --git a/spec/ruby/library/stringscanner/unscan_spec.rb b/spec/ruby/library/stringscanner/unscan_spec.rb
index b7b4876b8af..f7387782735 100644
--- a/spec/ruby/library/stringscanner/unscan_spec.rb
+++ b/spec/ruby/library/stringscanner/unscan_spec.rb
@@ -22,7 +22,7 @@
   end
 
   it "raises a StringScanner::Error when the previous match had failed" do
-    -> { @s.unscan }.should raise_error(StringScanner::Error)
-    -> { @s.scan(/\d/); @s.unscan }.should raise_error(StringScanner::Error)
+    -> { @s.unscan }.should.raise(StringScanner::Error)
+    -> { @s.scan(/\d/); @s.unscan }.should.raise(StringScanner::Error)
   end
 end
diff --git a/spec/ruby/library/stringscanner/values_at_spec.rb b/spec/ruby/library/stringscanner/values_at_spec.rb
index 14d4a5f6a7a..b00cce0ffad 100644
--- a/spec/ruby/library/stringscanner/values_at_spec.rb
+++ b/spec/ruby/library/stringscanner/values_at_spec.rb
@@ -35,7 +35,7 @@
 
       -> {
         @s.values_at("foo")
-      }.should raise_error(IndexError, "undefined group name reference: foo")
+      }.should.raise(IndexError, "undefined group name reference: foo")
     end
   end
 
@@ -54,7 +54,7 @@
 
     -> {
       @s.values_at([])
-    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+    }.should.raise(TypeError, "no implicit conversion of Array into Integer")
   end
 
   it "returns nil if the most recent matching fails" do
diff --git a/spec/ruby/library/syslog/close_spec.rb b/spec/ruby/library/syslog/close_spec.rb
index 8c3b67c05bd..713ef701d29 100644
--- a/spec/ruby/library/syslog/close_spec.rb
+++ b/spec/ruby/library/syslog/close_spec.rb
@@ -7,29 +7,29 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "closes the log" do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
         Syslog.open
-        Syslog.opened?.should be_true
+        Syslog.opened?.should == true
         Syslog.close
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "raises a RuntimeError if the log's already closed" do
-        -> { Syslog.close }.should raise_error(RuntimeError)
+        -> { Syslog.close }.should.raise(RuntimeError)
       end
 
       it "it does not work inside blocks" do
         -> {
           Syslog.open { |s| s.close }
-        }.should raise_error(RuntimeError)
+        }.should.raise(RuntimeError)
         Syslog.should_not.opened?
       end
 
@@ -37,7 +37,7 @@
         Syslog.open("rubyspec")
         Syslog.ident.should == "rubyspec"
         Syslog.close
-        Syslog.ident.should be_nil
+        Syslog.ident.should == nil
       end
 
       it "sets the options to nil" do
diff --git a/spec/ruby/library/syslog/constants_spec.rb b/spec/ruby/library/syslog/constants_spec.rb
index fc9db47dd81..a6ac355dddb 100644
--- a/spec/ruby/library/syslog/constants_spec.rb
+++ b/spec/ruby/library/syslog/constants_spec.rb
@@ -17,7 +17,7 @@
 
       it "includes the Syslog constants" do
         @constants.each do |c|
-          Syslog::Constants.should have_constant(c)
+          Syslog::Constants.should.const_defined?(c, true)
         end
       end
     end
diff --git a/spec/ruby/library/syslog/facility_spec.rb b/spec/ruby/library/syslog/facility_spec.rb
index 550ca70b112..79a685c2010 100644
--- a/spec/ruby/library/syslog/facility_spec.rb
+++ b/spec/ruby/library/syslog/facility_spec.rb
@@ -7,11 +7,11 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "returns the logging facility" do
@@ -21,7 +21,7 @@
       end
 
       it "returns nil if the log is closed" do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
         Syslog.facility.should == nil
       end
 
diff --git a/spec/ruby/library/syslog/ident_spec.rb b/spec/ruby/library/syslog/ident_spec.rb
index 3b083271406..80302a42b8f 100644
--- a/spec/ruby/library/syslog/ident_spec.rb
+++ b/spec/ruby/library/syslog/ident_spec.rb
@@ -7,11 +7,11 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "returns the logging identity" do
diff --git a/spec/ruby/library/syslog/inspect_spec.rb b/spec/ruby/library/syslog/inspect_spec.rb
index f45231f8e31..6407423fd32 100644
--- a/spec/ruby/library/syslog/inspect_spec.rb
+++ b/spec/ruby/library/syslog/inspect_spec.rb
@@ -7,11 +7,11 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "returns a string a closed log" do
diff --git a/spec/ruby/library/syslog/log_spec.rb b/spec/ruby/library/syslog/log_spec.rb
index 0c855b8257e..16502833716 100644
--- a/spec/ruby/library/syslog/log_spec.rb
+++ b/spec/ruby/library/syslog/log_spec.rb
@@ -7,11 +7,11 @@
     platform_is_not :windows, :darwin, :aix, :android do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "receives a priority as first argument" do
@@ -34,14 +34,14 @@
 
       it "fails with TypeError on nil log messages" do
         Syslog.open do |s|
-          -> { s.log(1, nil) }.should raise_error(TypeError)
+          -> { s.log(1, nil) }.should.raise(TypeError)
         end
       end
 
       it "fails if the log is closed" do
         -> {
           Syslog.log(Syslog::LOG_ALERT, "test")
-        }.should raise_error(RuntimeError)
+        }.should.raise(RuntimeError)
       end
 
       it "accepts printf parameters" do
diff --git a/spec/ruby/library/syslog/mask_spec.rb b/spec/ruby/library/syslog/mask_spec.rb
index b3f1250b24a..23cca6fa8d6 100644
--- a/spec/ruby/library/syslog/mask_spec.rb
+++ b/spec/ruby/library/syslog/mask_spec.rb
@@ -7,11 +7,11 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
         # make sure we return the mask to the default value
         Syslog.open { |s| s.mask = 255 }
       end
@@ -74,11 +74,11 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
         # make sure we return the mask to the default value
         Syslog.open { |s| s.mask = 255 }
       end
@@ -91,7 +91,7 @@
       end
 
       it "raises an error if the log is closed" do
-        -> { Syslog.mask = 1337 }.should raise_error(RuntimeError)
+        -> { Syslog.mask = 1337 }.should.raise(RuntimeError)
       end
 
       it "only accepts numbers" do
@@ -103,8 +103,8 @@
           Syslog.mask = 3.1416
           Syslog.mask.should == 3
 
-          -> { Syslog.mask = "oh hai" }.should raise_error(TypeError)
-          -> { Syslog.mask = "43" }.should raise_error(TypeError)
+          -> { Syslog.mask = "oh hai" }.should.raise(TypeError)
+          -> { Syslog.mask = "43" }.should.raise(TypeError)
 
         end
       end
diff --git a/spec/ruby/library/syslog/open_spec.rb b/spec/ruby/library/syslog/open_spec.rb
index 543f5d418b3..73e3780d785 100644
--- a/spec/ruby/library/syslog/open_spec.rb
+++ b/spec/ruby/library/syslog/open_spec.rb
@@ -8,11 +8,11 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "returns the module" do
@@ -69,18 +69,18 @@
 
       it "closes the log if after it receives a block" do
         Syslog.open{ }
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "raises an error if the log is opened" do
         Syslog.open
         -> {
           Syslog.open
-        }.should raise_error(RuntimeError, /syslog already open/)
+        }.should.raise(RuntimeError, /syslog already open/)
         -> {
           Syslog.close
           Syslog.open
-        }.should_not raise_error
+        }.should_not.raise
         Syslog.close
       end
     end
diff --git a/spec/ruby/library/syslog/opened_spec.rb b/spec/ruby/library/syslog/opened_spec.rb
index 94432e65a44..ad4311d15af 100644
--- a/spec/ruby/library/syslog/opened_spec.rb
+++ b/spec/ruby/library/syslog/opened_spec.rb
@@ -7,32 +7,32 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "returns true if the log is opened" do
         Syslog.open
-        Syslog.opened?.should be_true
+        Syslog.opened?.should == true
         Syslog.close
       end
 
       it "returns false otherwise" do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
         Syslog.open
         Syslog.close
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "works inside a block" do
         Syslog.open do |s|
-          s.opened?.should be_true
-          Syslog.opened?.should be_true
+          s.opened?.should == true
+          Syslog.opened?.should == true
         end
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
     end
   end
diff --git a/spec/ruby/library/syslog/options_spec.rb b/spec/ruby/library/syslog/options_spec.rb
index 83ba43503ec..2035272f703 100644
--- a/spec/ruby/library/syslog/options_spec.rb
+++ b/spec/ruby/library/syslog/options_spec.rb
@@ -7,11 +7,11 @@
     platform_is_not :windows do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "returns the logging options" do
@@ -21,7 +21,7 @@
       end
 
       it "returns nil when the log is closed" do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
         Syslog.options.should == nil
       end
 
diff --git a/spec/ruby/library/syslog/shared/log.rb b/spec/ruby/library/syslog/shared/log.rb
index 9f9302b2144..98ce4f54b26 100644
--- a/spec/ruby/library/syslog/shared/log.rb
+++ b/spec/ruby/library/syslog/shared/log.rb
@@ -1,11 +1,11 @@
 describe :syslog_log, shared: true do
   platform_is_not :windows, :darwin, :aix, :android do
     before :each do
-      Syslog.opened?.should be_false
+      Syslog.opened?.should == false
     end
 
     after :each do
-      Syslog.opened?.should be_false
+      Syslog.opened?.should == false
     end
 
     it "logs a message" do
diff --git a/spec/ruby/library/syslog/shared/reopen.rb b/spec/ruby/library/syslog/shared/reopen.rb
index 621437a01d8..f04408e8078 100644
--- a/spec/ruby/library/syslog/shared/reopen.rb
+++ b/spec/ruby/library/syslog/shared/reopen.rb
@@ -1,22 +1,22 @@
 describe :syslog_reopen, shared: true do
   platform_is_not :windows do
     before :each do
-      Syslog.opened?.should be_false
+      Syslog.opened?.should == false
     end
 
     after :each do
-      Syslog.opened?.should be_false
+      Syslog.opened?.should == false
     end
 
     it "reopens the log" do
       Syslog.open
-      -> { Syslog.send(@method)}.should_not raise_error
-      Syslog.opened?.should be_true
+      -> { Syslog.send(@method)}.should_not.raise
+      Syslog.opened?.should == true
       Syslog.close
     end
 
     it "fails with RuntimeError if the log is closed" do
-      -> { Syslog.send(@method)}.should raise_error(RuntimeError)
+      -> { Syslog.send(@method)}.should.raise(RuntimeError)
     end
 
     it "receives the same parameters as Syslog.open" do
@@ -26,9 +26,9 @@
         s.ident.should == "rubyspec"
         s.options.should == 3
         s.facility.should == Syslog::LOG_USER
-        s.opened?.should be_true
+        s.opened?.should == true
       end
-      Syslog.opened?.should be_false
+      Syslog.opened?.should == false
     end
 
     it "returns the module" do
diff --git a/spec/ruby/library/tempfile/_close_spec.rb b/spec/ruby/library/tempfile/_close_spec.rb
index c08f425b6f3..344b08dc176 100644
--- a/spec/ruby/library/tempfile/_close_spec.rb
+++ b/spec/ruby/library/tempfile/_close_spec.rb
@@ -11,11 +11,11 @@
   end
 
   it "is protected" do
-    Tempfile.should have_protected_instance_method(:_close)
+    Tempfile.protected_instance_methods(false).should.include?(:_close)
   end
 
   it "closes self" do
     @tempfile.send(:_close)
-    @tempfile.closed?.should be_true
+    @tempfile.closed?.should == true
   end
 end
diff --git a/spec/ruby/library/tempfile/close_spec.rb b/spec/ruby/library/tempfile/close_spec.rb
index db0eae3fa58..7e95ae1d7e0 100644
--- a/spec/ruby/library/tempfile/close_spec.rb
+++ b/spec/ruby/library/tempfile/close_spec.rb
@@ -12,7 +12,7 @@
 
   it "closes self" do
     @tempfile.close
-    @tempfile.closed?.should be_true
+    @tempfile.closed?.should == true
   end
 
   it "does not unlink self" do
@@ -29,7 +29,7 @@
 
   it "closes self" do
     @tempfile.close(true)
-    @tempfile.closed?.should be_true
+    @tempfile.closed?.should == true
   end
 
   it "unlinks self" do
@@ -46,7 +46,7 @@
 
   it "closes self" do
     @tempfile.close!
-    @tempfile.closed?.should be_true
+    @tempfile.closed?.should == true
   end
 
   it "unlinks self" do
diff --git a/spec/ruby/library/tempfile/create_spec.rb b/spec/ruby/library/tempfile/create_spec.rb
index 74c48bf32a9..be6d21e2184 100644
--- a/spec/ruby/library/tempfile/create_spec.rb
+++ b/spec/ruby/library/tempfile/create_spec.rb
@@ -12,11 +12,11 @@
   it "returns a new, open regular File instance placed in tmpdir" do
     @tempfile = Tempfile.create
     # Unlike Tempfile.open this returns a true File,
-    # but `.should be_an_instance_of(File)` would be true either way.
-    @tempfile.instance_of?(File).should be_true
+    # but `.should.instance_of?(File)` would be true either way.
+    @tempfile.instance_of?(File).should == true
 
     @tempfile.should_not.closed?
-    File.file?(@tempfile.path).should be_true
+    File.file?(@tempfile.path).should == true
 
     @tempfile.path.should.start_with?(Dir.tmpdir)
     @tempfile.path.should_not == "#{Dir.tmpdir}/"
@@ -72,11 +72,11 @@
       Tempfile.create do |tempfile|
         @tempfile = tempfile
         @tempfile.should_not.closed?
-        File.exist?(@tempfile.path).should be_true
+        File.exist?(@tempfile.path).should == true
       end
 
       @tempfile.should.closed?
-      File.exist?(@tempfile.path).should be_false
+      File.exist?(@tempfile.path).should == false
     end
   end
 
@@ -106,9 +106,9 @@
     end
 
     it "raises ArgumentError if passed something else than a String or an array of Strings" do
-      -> { Tempfile.create(:create_spec) }.should raise_error(ArgumentError, "unexpected prefix: :create_spec")
-      -> { Tempfile.create([:create_spec]) }.should raise_error(ArgumentError, "unexpected prefix: :create_spec")
-      -> { Tempfile.create(["create_spec", :temp]) }.should raise_error(ArgumentError, "unexpected suffix: :temp")
+      -> { Tempfile.create(:create_spec) }.should.raise(ArgumentError, "unexpected prefix: :create_spec")
+      -> { Tempfile.create([:create_spec]) }.should.raise(ArgumentError, "unexpected prefix: :create_spec")
+      -> { Tempfile.create(["create_spec", :temp]) }.should.raise(ArgumentError, "unexpected suffix: :temp")
     end
   end
 
@@ -119,7 +119,7 @@
     end
 
     it "raises TypeError if argument can not be converted to a String" do
-      -> { Tempfile.create("create_spec", :temp) }.should raise_error(TypeError, "no implicit conversion of Symbol into String")
+      -> { Tempfile.create("create_spec", :temp) }.should.raise(TypeError, "no implicit conversion of Symbol into String")
     end
   end
 
@@ -132,7 +132,7 @@
     end
 
     it "raises NoMethodError if passed a String mode" do
-      -> { Tempfile.create(mode: "wb") }.should raise_error(NoMethodError, /undefined method ['`]|' for .+String/)
+      -> { Tempfile.create(mode: "wb") }.should.raise(NoMethodError, /undefined method ['`]|' for .+String/)
     end
   end
 
@@ -142,7 +142,7 @@
         @tempfile = Tempfile.create(anonymous: true)
         @tempfile.should_not.closed?
         @tempfile.path.should == "#{Dir.tmpdir}/"
-        File.file?(@tempfile.path).should be_false
+        File.file?(@tempfile.path).should == false
       end
 
       it "unlinks file before calling the block" do
@@ -150,7 +150,7 @@
           @tempfile = tempfile
           @tempfile.should_not.closed?
           @tempfile.path.should == "#{Dir.tmpdir}/"
-          File.file?(@tempfile.path).should be_false
+          File.file?(@tempfile.path).should == false
         end
         @tempfile.should.closed?
       end
@@ -161,7 +161,7 @@
         @tempfile = Tempfile.create(anonymous: false)
         @tempfile.should_not.closed?
         @tempfile.path.should.start_with?(Dir.tmpdir)
-        File.file?(@tempfile.path).should be_true
+        File.file?(@tempfile.path).should == true
       end
     end
   end
@@ -170,7 +170,7 @@
     it "passes them along to File.open" do
       @tempfile = Tempfile.create(encoding: "IBM037:IBM037", binmode: true)
       @tempfile.external_encoding.should == Encoding.find("IBM037")
-      @tempfile.binmode?.should be_true
+      @tempfile.binmode?.should == true
     end
   end
 end
diff --git a/spec/ruby/library/tempfile/initialize_spec.rb b/spec/ruby/library/tempfile/initialize_spec.rb
index f2e786d7d86..0e882a3f0ce 100644
--- a/spec/ruby/library/tempfile/initialize_spec.rb
+++ b/spec/ruby/library/tempfile/initialize_spec.rb
@@ -24,7 +24,7 @@
     end
 
     path[0, tmpdir.length].should == tmpdir
-    path.should include("basename")
+    path.should.include?("basename")
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/library/tempfile/open_spec.rb b/spec/ruby/library/tempfile/open_spec.rb
index ef2c95376f2..0993a2c5eed 100644
--- a/spec/ruby/library/tempfile/open_spec.rb
+++ b/spec/ruby/library/tempfile/open_spec.rb
@@ -14,7 +14,7 @@
   it "reopens self" do
     @tempfile.close
     @tempfile.open
-    @tempfile.closed?.should be_false
+    @tempfile.closed?.should == false
   end
 
   it "reopens self in read and write mode and does not truncate" do
@@ -33,8 +33,8 @@
 
   it "returns a new, open Tempfile instance" do
     @tempfile = Tempfile.open("specs")
-    # Delegation messes up .should be_an_instance_of(Tempfile)
-    @tempfile.instance_of?(Tempfile).should be_true
+    # Delegation messes up .should.instance_of?(Tempfile)
+    @tempfile.instance_of?(Tempfile).should == true
   end
 
   it "is passed an array [base, suffix] as first argument" do
@@ -46,14 +46,14 @@
     Tempfile.open("specs", Dir.tmpdir, encoding: "IBM037:IBM037", binmode: true) do |tempfile|
       @tempfile = tempfile
       tempfile.external_encoding.should == Encoding.find("IBM037")
-      tempfile.binmode?.should be_true
+      tempfile.binmode?.should == true
     end
   end
 
   it "uses a blank string for basename when passed no arguments" do
     Tempfile.open() do |tempfile|
       @tempfile = tempfile
-      tempfile.closed?.should be_false
+      tempfile.closed?.should == false
     end
     @tempfile.should_not == nil
   end
@@ -74,9 +74,9 @@
       @tempfile = tempfile
       ScratchPad.record :yielded
 
-      # Delegation messes up .should be_an_instance_of(Tempfile)
-      tempfile.instance_of?(Tempfile).should be_true
-      tempfile.closed?.should be_false
+      # Delegation messes up .should.instance_of?(Tempfile)
+      tempfile.instance_of?(Tempfile).should == true
+      tempfile.closed?.should == false
     end
 
     ScratchPad.recorded.should == :yielded
@@ -92,6 +92,6 @@
 
   it "closes the yielded Tempfile after the block" do
     Tempfile.open("specs") { |tempfile| @tempfile = tempfile }
-    @tempfile.closed?.should be_true
+    @tempfile.closed?.should == true
   end
 end
diff --git a/spec/ruby/library/tempfile/path_spec.rb b/spec/ruby/library/tempfile/path_spec.rb
index 07f75b3e104..be56bd87c8e 100644
--- a/spec/ruby/library/tempfile/path_spec.rb
+++ b/spec/ruby/library/tempfile/path_spec.rb
@@ -21,6 +21,6 @@
     end
 
     path[0, tmpdir.length].should == tmpdir
-    path.should include("specs")
+    path.should.include?("specs")
   end
 end
diff --git a/spec/ruby/library/tempfile/shared/length.rb b/spec/ruby/library/tempfile/shared/length.rb
index 4d18d1f3852..1a89ff7b4d0 100644
--- a/spec/ruby/library/tempfile/shared/length.rb
+++ b/spec/ruby/library/tempfile/shared/length.rb
@@ -8,14 +8,14 @@
   end
 
   it "returns the size of self" do
-    @tempfile.send(@method).should eql(0)
+    @tempfile.send(@method).should.eql?(0)
     @tempfile.print("Test!")
-    @tempfile.send(@method).should eql(5)
+    @tempfile.send(@method).should.eql?(5)
   end
 
   it "returns the size of self even if self is closed" do
     @tempfile.print("Test!")
     @tempfile.close
-    @tempfile.send(@method).should eql(5)
+    @tempfile.send(@method).should.eql?(5)
   end
 end
diff --git a/spec/ruby/library/thread/queue_spec.rb b/spec/ruby/library/thread/queue_spec.rb
index c7e2bb1b501..b6c4fef08f9 100644
--- a/spec/ruby/library/thread/queue_spec.rb
+++ b/spec/ruby/library/thread/queue_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Thread::Queue" do
   it "is the same class as ::Queue" do
-    Thread.should have_constant(:Queue)
-    Thread::Queue.should equal ::Queue
+    Thread.should.const_defined?(:Queue, false)
+    Thread::Queue.should.equal? ::Queue
   end
 end
diff --git a/spec/ruby/library/thread/sizedqueue_spec.rb b/spec/ruby/library/thread/sizedqueue_spec.rb
index 6151ff437c4..ffa66bcd35f 100644
--- a/spec/ruby/library/thread/sizedqueue_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Thread::SizedQueue" do
   it "is the same class as ::SizedQueue" do
-    Thread.should have_constant(:SizedQueue)
-    Thread::SizedQueue.should equal ::SizedQueue
+    Thread.should.const_defined?(:SizedQueue, false)
+    Thread::SizedQueue.should.equal? ::SizedQueue
   end
 end
diff --git a/spec/ruby/library/time/shared/rfc2822.rb b/spec/ruby/library/time/shared/rfc2822.rb
index e460d655a68..49ef76db47f 100644
--- a/spec/ruby/library/time/shared/rfc2822.rb
+++ b/spec/ruby/library/time/shared/rfc2822.rb
@@ -60,6 +60,6 @@
     -> {
       # inner comment is not supported.
       Time.send(@method, "Fri, 21 Nov 1997 09(comment):   55  :  06 -0600")
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/time/to_time_spec.rb b/spec/ruby/library/time/to_time_spec.rb
index 7e6c75a0035..d2b89cb1123 100644
--- a/spec/ruby/library/time/to_time_spec.rb
+++ b/spec/ruby/library/time/to_time_spec.rb
@@ -6,10 +6,10 @@
     time = Time.new(2012, 2, 21, 10, 11, 12)
 
     with_timezone("America/Regina") do
-      time.to_time.should equal time
+      time.to_time.should.equal? time
     end
 
     time2 = Time.utc(2012, 2, 21, 10, 11, 12)
-    time2.to_time.should equal time2
+    time2.to_time.should.equal? time2
   end
 end
diff --git a/spec/ruby/library/timeout/error_spec.rb b/spec/ruby/library/timeout/error_spec.rb
index 6c236e51282..2c28236e290 100644
--- a/spec/ruby/library/timeout/error_spec.rb
+++ b/spec/ruby/library/timeout/error_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Timeout::Error" do
   it "is a subclass of RuntimeError" do
-    RuntimeError.should be_ancestor_of(Timeout::Error)
+    Timeout::Error.ancestors.should.include?(RuntimeError)
   end
 end
diff --git a/spec/ruby/library/timeout/timeout_spec.rb b/spec/ruby/library/timeout/timeout_spec.rb
index e16bcaea6ab..9ae70bf6006 100644
--- a/spec/ruby/library/timeout/timeout_spec.rb
+++ b/spec/ruby/library/timeout/timeout_spec.rb
@@ -7,7 +7,7 @@
       Timeout.timeout(1) do
         sleep
       end
-    }.should raise_error(Timeout::Error)
+    }.should.raise(Timeout::Error)
   end
 
   it "raises specified error type when it times out" do
@@ -15,7 +15,7 @@
       Timeout.timeout(1, StandardError) do
         sleep
       end
-    end.should raise_error(StandardError)
+    end.should.raise(StandardError)
   end
 
   it "raises specified error type with specified message when it times out" do
@@ -23,7 +23,7 @@
       Timeout.timeout(1, StandardError, "foobar") do
         sleep
       end
-    end.should raise_error(StandardError, "foobar")
+    end.should.raise(StandardError, "foobar")
   end
 
   it "raises specified error type with a default message when it times out if message is nil" do
@@ -31,7 +31,7 @@
       Timeout.timeout(1, StandardError, nil) do
         sleep
       end
-    end.should raise_error(StandardError, "execution expired")
+    end.should.raise(StandardError, "execution expired")
   end
 
   it "returns back the last value in the block" do
@@ -44,7 +44,7 @@
     it "raises an ArgumentError when provided with a negative duration" do
       -> {
         Timeout.timeout(-1)
-      }.should raise_error(ArgumentError, "Timeout sec must be a non-negative number")
+      }.should.raise(ArgumentError, "Timeout sec must be a non-negative number")
     end
   end
 end
diff --git a/spec/ruby/library/tmpdir/dir/mktmpdir_spec.rb b/spec/ruby/library/tmpdir/dir/mktmpdir_spec.rb
index 8165c2d8a8e..edc4795efb5 100644
--- a/spec/ruby/library/tmpdir/dir/mktmpdir_spec.rb
+++ b/spec/ruby/library/tmpdir/dir/mktmpdir_spec.rb
@@ -16,8 +16,8 @@
   it "creates a new writable directory in the path provided by Dir.tmpdir" do
     Dir.should_receive(:tmpdir).and_return(tmp(""))
     @tmpdir = Dir.mktmpdir
-    File.directory?(@tmpdir).should be_true
-    File.writable?(@tmpdir).should be_true
+    File.directory?(@tmpdir).should == true
+    File.writable?(@tmpdir).should == true
   end
 end
 
@@ -41,15 +41,15 @@
       called = true
       path.should.start_with?(@real_tmp_root)
     end
-    called.should be_true
+    called.should == true
   end
 
   it "creates the tmp-dir before yielding" do
     Dir.should_receive(:tmpdir).and_return(tmp(""))
     Dir.mktmpdir do |path|
       @tmpdir = path
-      File.directory?(path).should be_true
-      File.writable?(path).should be_true
+      File.directory?(path).should == true
+      File.writable?(path).should == true
     end
   end
 
@@ -67,7 +67,7 @@
       @tmpdir = path
       :test
     end
-    result.should equal(:test)
+    result.should.equal?(:test)
   end
 end
 
@@ -110,8 +110,8 @@
 
 describe "Dir.mktmpdir when passed [Object]" do
   it "raises an ArgumentError" do
-    -> { Dir.mktmpdir(Object.new) }.should raise_error(ArgumentError)
-    -> { Dir.mktmpdir(:symbol) }.should raise_error(ArgumentError)
-    -> { Dir.mktmpdir(10) }.should raise_error(ArgumentError)
+    -> { Dir.mktmpdir(Object.new) }.should.raise(ArgumentError)
+    -> { Dir.mktmpdir(:symbol) }.should.raise(ArgumentError)
+    -> { Dir.mktmpdir(10) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/tmpdir/dir/tmpdir_spec.rb b/spec/ruby/library/tmpdir/dir/tmpdir_spec.rb
index f4ab5e40b89..330f04458ff 100644
--- a/spec/ruby/library/tmpdir/dir/tmpdir_spec.rb
+++ b/spec/ruby/library/tmpdir/dir/tmpdir_spec.rb
@@ -4,7 +4,7 @@
 describe "Dir.tmpdir" do
   it "returns the path to a writable and readable directory" do
     dir = Dir.tmpdir
-    File.directory?(dir).should be_true
-    File.writable?(dir).should be_true
+    File.directory?(dir).should == true
+    File.writable?(dir).should == true
   end
 end
diff --git a/spec/ruby/library/uri/join_spec.rb b/spec/ruby/library/uri/join_spec.rb
index 796f74134f1..17773033609 100644
--- a/spec/ruby/library/uri/join_spec.rb
+++ b/spec/ruby/library/uri/join_spec.rb
@@ -23,7 +23,7 @@
   it "raises an error if given no argument" do
     -> {
       URI.join
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "doesn't create redundant '/'s" do
diff --git a/spec/ruby/library/uri/mailto/build_spec.rb b/spec/ruby/library/uri/mailto/build_spec.rb
index 2c011626ab7..081707b1cfb 100644
--- a/spec/ruby/library/uri/mailto/build_spec.rb
+++ b/spec/ruby/library/uri/mailto/build_spec.rb
@@ -84,7 +84,7 @@
     end
 
     bad.each do |x|
-      -> { URI::MailTo.build(x) }.should raise_error(URI::InvalidComponentError)
+      -> { URI::MailTo.build(x) }.should.raise(URI::InvalidComponentError)
     end
 
     ok.flatten.join("\0").should == ok_all
diff --git a/spec/ruby/library/uri/parse_spec.rb b/spec/ruby/library/uri/parse_spec.rb
index e9ec59b4905..f0373fbf5e6 100644
--- a/spec/ruby/library/uri/parse_spec.rb
+++ b/spec/ruby/library/uri/parse_spec.rb
@@ -4,7 +4,7 @@
 describe "URI.parse" do
 
   it "returns a URI::HTTP object when parsing an HTTP URI" do
-    URI.parse("http://www.example.com/").should be_kind_of(URI::HTTP)
+    URI.parse("http://www.example.com/").should.is_a?(URI::HTTP)
   end
 
   it "populates the components of a parsed URI::HTTP, setting the port to 80 by default" do
@@ -47,7 +47,7 @@
   end
 
   it "returns a URI::HTTPS object when parsing an HTTPS URI" do
-    URI.parse("https://important-intern-net.net").should be_kind_of(URI::HTTPS)
+    URI.parse("https://important-intern-net.net").should.is_a?(URI::HTTPS)
   end
 
   it "sets the port of a parsed https URI to 443 by default" do
@@ -57,7 +57,7 @@
   it "populates the components of a parsed URI::FTP object" do
     # generic, empty password.
     url = URI.parse("ftp://anonymous@ruby-lang.org/pub/ruby/1.8/ruby-1.8.6.tar.bz2;type=i")
-    url.should be_kind_of(URI::FTP)
+    url.should.is_a?(URI::FTP)
     URISpec.components(url).should == {
       scheme: "ftp",
       userinfo: "anonymous",
@@ -69,7 +69,7 @@
 
     # multidomain, no user or password
     url = URI.parse('ftp://ftp.is.co.za/rfc/rfc1808.txt')
-    url.should be_kind_of(URI::FTP)
+    url.should.is_a?(URI::FTP)
     URISpec.components(url).should == {
       scheme: "ftp",
       userinfo: nil,
@@ -81,7 +81,7 @@
 
     # empty user
     url = URI.parse('ftp://:pass@localhost/')
-    url.should be_kind_of(URI::FTP)
+    url.should.is_a?(URI::FTP)
     URISpec.components(url).should == {
       scheme: "ftp",
       userinfo: ":pass",
@@ -97,7 +97,7 @@
     #taken from http://www.faqs.org/rfcs/rfc2255.html 'cause I don't really know what an LDAP url looks like
     ldap_uris = %w{ ldap:///o=University%20of%20Michigan,c=US ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US?postalAddress ldap://host.com:6666/o=University%20of%20Michigan,c=US??sub?(cn=Babs%20Jensen) ldap://ldap.itd.umich.edu/c=GB?objectClass?one ldap://ldap.question.com/o=Question%3f,c=US?mail ldap://ldap.netscape.com/o=Babsco,c=US??(int=%5c00%5c00%5c00%5c04) ldap:///??sub??bindname=cn=Manager%2co=Foo ldap:///??sub??!bindname=cn=Manager%2co=Foo }
     ldap_uris.each do |ldap_uri|
-      URI.parse(ldap_uri).should be_kind_of(URI::LDAP)
+      URI.parse(ldap_uri).should.is_a?(URI::LDAP)
     end
   end
 
@@ -115,7 +115,7 @@
   end
 
   it "returns a URI::MailTo object when passed a mailto URI" do
-    URI.parse("mailto:spam@mailinator.com").should be_kind_of(URI::MailTo)
+    URI.parse("mailto:spam@mailinator.com").should.is_a?(URI::MailTo)
   end
 
   it "populates the components of a parsed URI::MailTo object" do
@@ -145,7 +145,7 @@
 
     # gopher
     gopher = URI.parse('gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles')
-    gopher.should be_kind_of(URI::Generic)
+    gopher.should.is_a?(URI::Generic)
 
     URISpec.components(gopher).should == {
       scheme: "gopher",
@@ -161,7 +161,7 @@
 
     # news
     news = URI.parse('news:comp.infosystems.www.servers.unix')
-    news.should be_kind_of(URI::Generic)
+    news.should.is_a?(URI::Generic)
     URISpec.components(news).should == {
       scheme: "news",
       userinfo: nil,
@@ -176,7 +176,7 @@
 
     # telnet
     telnet = URI.parse('telnet://melvyl.ucop.edu/')
-    telnet.should be_kind_of(URI::Generic)
+    telnet.should.is_a?(URI::Generic)
     URISpec.components(telnet).should == {
       scheme: "telnet",
       userinfo: nil,
@@ -191,9 +191,9 @@
 
     # files
     file_l = URI.parse('file:///foo/bar.txt')
-    file_l.should be_kind_of(URI::Generic)
+    file_l.should.is_a?(URI::Generic)
     file = URI.parse('file:/foo/bar.txt')
-    file.should be_kind_of(URI::Generic)
+    file.should.is_a?(URI::Generic)
   end
 
   it "doesn't raise errors on URIs which has underscore in reg_name" do
diff --git a/spec/ruby/library/uri/plus_spec.rb b/spec/ruby/library/uri/plus_spec.rb
index b84b0767c1f..51fb5e37506 100644
--- a/spec/ruby/library/uri/plus_spec.rb
+++ b/spec/ruby/library/uri/plus_spec.rb
@@ -36,7 +36,7 @@
   end
 
   it "raises a URI::BadURIError when adding two relative URIs" do
-    -> {URI.parse('a/b/c') + "d"}.should raise_error(URI::BadURIError)
+    -> {URI.parse('a/b/c') + "d"}.should.raise(URI::BadURIError)
   end
 
   #Todo: make more BDD?
@@ -47,403 +47,403 @@
 #  http://a/b/c/d;p?q
 #        g:h           =  g:h
     url = @base_url.merge('g:h')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g:h'
     url = @base_url.route_to('g:h')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g:h'
 
 #  http://a/b/c/d;p?q
 #        g             =  http://a/b/c/g
     url = @base_url.merge('g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g'
     url = @base_url.route_to('http://a/b/c/g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g'
 
 #  http://a/b/c/d;p?q
 #        ./g           =  http://a/b/c/g
     url = @base_url.merge('./g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g'
     url = @base_url.route_to('http://a/b/c/g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == './g' # ok
     url.to_s.should == 'g'
 
 #  http://a/b/c/d;p?q
 #        g/            =  http://a/b/c/g/
     url = @base_url.merge('g/')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g/'
     url = @base_url.route_to('http://a/b/c/g/')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g/'
 
 #  http://a/b/c/d;p?q
 #        /g            =  http://a/g
     url = @base_url.merge('/g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/g'
     url = @base_url.route_to('http://a/g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == '/g' # ok
     url.to_s.should == '../../g'
 
 #  http://a/b/c/d;p?q
 #        //g           =  http://g
     url = @base_url.merge('//g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://g'
     url = @base_url.route_to('http://g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '//g'
 
 #  http://a/b/c/d;p?q
 #        ?y            =  http://a/b/c/?y
     url = @base_url.merge('?y')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
 
     url.to_s.should == 'http://a/b/c/d;p?y'
 
     url = @base_url.route_to('http://a/b/c/?y')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '?y'
 
 #  http://a/b/c/d;p?q
 #        g?y           =  http://a/b/c/g?y
     url = @base_url.merge('g?y')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g?y'
     url = @base_url.route_to('http://a/b/c/g?y')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g?y'
 
 #  http://a/b/c/d;p?q
 #        #s            =  (current document)#s
     url = @base_url.merge('#s')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == @base_url.to_s + '#s'
     url = @base_url.route_to(@base_url.to_s + '#s')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '#s'
 
 #  http://a/b/c/d;p?q
 #        g#s           =  http://a/b/c/g#s
     url = @base_url.merge('g#s')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g#s'
     url = @base_url.route_to('http://a/b/c/g#s')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g#s'
 
 #  http://a/b/c/d;p?q
 #        g?y#s         =  http://a/b/c/g?y#s
     url = @base_url.merge('g?y#s')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g?y#s'
     url = @base_url.route_to('http://a/b/c/g?y#s')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g?y#s'
 
 #  http://a/b/c/d;p?q
 #        ;x            =  http://a/b/c/;x
     url = @base_url.merge(';x')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/;x'
     url = @base_url.route_to('http://a/b/c/;x')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == ';x'
 
 #  http://a/b/c/d;p?q
 #        g;x           =  http://a/b/c/g;x
     url = @base_url.merge('g;x')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g;x'
     url = @base_url.route_to('http://a/b/c/g;x')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g;x'
 
 #  http://a/b/c/d;p?q
 #        g;x?y#s       =  http://a/b/c/g;x?y#s
     url = @base_url.merge('g;x?y#s')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g;x?y#s'
     url = @base_url.route_to('http://a/b/c/g;x?y#s')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g;x?y#s'
 
 #  http://a/b/c/d;p?q
 #        .             =  http://a/b/c/
     url = @base_url.merge('.')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/'
     url = @base_url.route_to('http://a/b/c/')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == '.' # ok
     url.to_s.should == './'
 
 #  http://a/b/c/d;p?q
 #        ./            =  http://a/b/c/
     url = @base_url.merge('./')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/'
     url = @base_url.route_to('http://a/b/c/')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == './'
 
 #  http://a/b/c/d;p?q
 #        ..            =  http://a/b/
     url = @base_url.merge('..')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/'
     url = @base_url.route_to('http://a/b/')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == '..' # ok
     url.to_s.should == '../'
 
 #  http://a/b/c/d;p?q
 #        ../           =  http://a/b/
     url = @base_url.merge('../')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/'
     url = @base_url.route_to('http://a/b/')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '../'
 
 #  http://a/b/c/d;p?q
 #        ../g          =  http://a/b/g
     url = @base_url.merge('../g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/g'
     url = @base_url.route_to('http://a/b/g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '../g'
 
 #  http://a/b/c/d;p?q
 #        ../..         =  http://a/
     url = @base_url.merge('../..')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/'
     url = @base_url.route_to('http://a/')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == '../..' # ok
     url.to_s.should == '../../'
 
 #  http://a/b/c/d;p?q
 #        ../../        =  http://a/
     url = @base_url.merge('../../')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/'
     url = @base_url.route_to('http://a/')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '../../'
 
 #  http://a/b/c/d;p?q
 #        ../../g       =  http://a/g
     url = @base_url.merge('../../g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/g'
     url = @base_url.route_to('http://a/g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '../../g'
 
 #  http://a/b/c/d;p?q
 #        <>            =  (current document)
     url = @base_url.merge('')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/d;p?q'
     url = @base_url.route_to('http://a/b/c/d;p?q')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == ''
 
 #  http://a/b/c/d;p?q
 #        /./g          =  http://a/./g
     url = @base_url.merge('/./g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
 
     url.to_s.should == 'http://a/g'
 
     url = @base_url.route_to('http://a/./g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '/./g'
 
 #  http://a/b/c/d;p?q
 #        /../g         =  http://a/../g
     url = @base_url.merge('/../g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
 
     url.to_s.should == 'http://a/g'
 
     url = @base_url.route_to('http://a/../g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '/../g'
 
 #  http://a/b/c/d;p?q
 #        g.            =  http://a/b/c/g.
     url = @base_url.merge('g.')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g.'
     url = @base_url.route_to('http://a/b/c/g.')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g.'
 
 #  http://a/b/c/d;p?q
 #        .g            =  http://a/b/c/.g
     url = @base_url.merge('.g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/.g'
     url = @base_url.route_to('http://a/b/c/.g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '.g'
 
 #  http://a/b/c/d;p?q
 #        g..           =  http://a/b/c/g..
     url = @base_url.merge('g..')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g..'
     url = @base_url.route_to('http://a/b/c/g..')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g..'
 
 #  http://a/b/c/d;p?q
 #        ..g           =  http://a/b/c/..g
     url = @base_url.merge('..g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/..g'
     url = @base_url.route_to('http://a/b/c/..g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == '..g'
 
 #  http://a/b/c/d;p?q
 #        ../../../g    =  http://a/../g
     url = @base_url.merge('../../../g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
 
     url.to_s.should == 'http://a/g'
 
     url = @base_url.route_to('http://a/../g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == '../../../g' # ok? yes, it confuses you
     url.to_s.should == '/../g'  # and it is clearly
 
 #  http://a/b/c/d;p?q
 #        ../../../../g =  http://a/../../g
     url = @base_url.merge('../../../../g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
 
     url.to_s.should == 'http://a/g'
 
     url = @base_url.route_to('http://a/../../g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == '../../../../g' # ok? yes, it confuses you
     url.to_s.should == '/../../g'  # and it is clearly
 
 #  http://a/b/c/d;p?q
 #        ./../g        =  http://a/b/g
     url = @base_url.merge('./../g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/g'
     url = @base_url.route_to('http://a/b/g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == './../g' # ok
     url.to_s.should == '../g'
 
 #  http://a/b/c/d;p?q
 #        ./g/.         =  http://a/b/c/g/
     url = @base_url.merge('./g/.')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g/'
     url = @base_url.route_to('http://a/b/c/g/')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == './g/.' # ok
     url.to_s.should == 'g/'
 
 #  http://a/b/c/d;p?q
 #        g/./h         =  http://a/b/c/g/h
     url = @base_url.merge('g/./h')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g/h'
     url = @base_url.route_to('http://a/b/c/g/h')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == 'g/./h' # ok
     url.to_s.should == 'g/h'
 
 #  http://a/b/c/d;p?q
 #        g/../h        =  http://a/b/c/h
     url = @base_url.merge('g/../h')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/h'
     url = @base_url.route_to('http://a/b/c/h')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == 'g/../h' # ok
     url.to_s.should == 'h'
 
 #  http://a/b/c/d;p?q
 #        g;x=1/./y     =  http://a/b/c/g;x=1/y
     url = @base_url.merge('g;x=1/./y')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g;x=1/y'
     url = @base_url.route_to('http://a/b/c/g;x=1/y')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == 'g;x=1/./y' # ok
     url.to_s.should == 'g;x=1/y'
 
 #  http://a/b/c/d;p?q
 #        g;x=1/../y    =  http://a/b/c/y
     url = @base_url.merge('g;x=1/../y')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/y'
     url = @base_url.route_to('http://a/b/c/y')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should_not == 'g;x=1/../y' # ok
     url.to_s.should == 'y'
 
 #  http://a/b/c/d;p?q
 #        g?y/./x       =  http://a/b/c/g?y/./x
     url = @base_url.merge('g?y/./x')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g?y/./x'
     url = @base_url.route_to('http://a/b/c/g?y/./x')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g?y/./x'
 
 #  http://a/b/c/d;p?q
 #        g?y/../x      =  http://a/b/c/g?y/../x
     url = @base_url.merge('g?y/../x')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g?y/../x'
     url = @base_url.route_to('http://a/b/c/g?y/../x')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g?y/../x'
 
 #  http://a/b/c/d;p?q
 #        g#s/./x       =  http://a/b/c/g#s/./x
     url = @base_url.merge('g#s/./x')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g#s/./x'
     url = @base_url.route_to('http://a/b/c/g#s/./x')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g#s/./x'
 
 #  http://a/b/c/d;p?q
 #        g#s/../x      =  http://a/b/c/g#s/../x
     url = @base_url.merge('g#s/../x')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http://a/b/c/g#s/../x'
     url = @base_url.route_to('http://a/b/c/g#s/../x')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'g#s/../x'
 
 #  http://a/b/c/d;p?q
 #        http:g        =  http:g           ; for validating parsers
 #                      |  http://a/b/c/g   ; for backwards compatibility
     url = @base_url.merge('http:g')
-    url.should be_kind_of(URI::HTTP)
+    url.should.is_a?(URI::HTTP)
     url.to_s.should == 'http:g'
     url = @base_url.route_to('http:g')
-    url.should be_kind_of(URI::Generic)
+    url.should.is_a?(URI::Generic)
     url.to_s.should == 'http:g'
   end
 end
diff --git a/spec/ruby/library/uri/select_spec.rb b/spec/ruby/library/uri/select_spec.rb
index 839b68b3a12..27591f69f20 100644
--- a/spec/ruby/library/uri/select_spec.rb
+++ b/spec/ruby/library/uri/select_spec.rb
@@ -15,13 +15,13 @@
   end
 
   it "raises an ArgumentError if a component is requested that isn't valid under the given scheme" do
-    -> { URI("mailto:spam@mailinator.com").select(:path) }.should raise_error(ArgumentError)
-    -> { URI("http://blog.blag.web").select(:typecode) }.should raise_error(ArgumentError)
+    -> { URI("mailto:spam@mailinator.com").select(:path) }.should.raise(ArgumentError)
+    -> { URI("http://blog.blag.web").select(:typecode) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if given strings rather than symbols" do
     -> {
       URI("http://host:8080/path/").select("scheme","host","port",'path')
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/uri/set_component_spec.rb b/spec/ruby/library/uri/set_component_spec.rb
index 1d4165c5351..15f1ed1f87a 100644
--- a/spec/ruby/library/uri/set_component_spec.rb
+++ b/spec/ruby/library/uri/set_component_spec.rb
@@ -29,19 +29,19 @@
     end
 
     uri = URI.parse('http://example.com')
-    -> { uri.password = 'bar' }.should raise_error(URI::InvalidURIError)
+    -> { uri.password = 'bar' }.should.raise(URI::InvalidURIError)
     uri.userinfo = 'foo:bar'
     uri.to_s.should == 'http://foo:bar@example.com'
-    -> { uri.registry = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.opaque = 'bar' }.should raise_error(URI::InvalidURIError)
+    -> { uri.registry = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.opaque = 'bar' }.should.raise(URI::InvalidURIError)
 
     uri = URI.parse('mailto:foo@example.com')
-    -> { uri.user = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.password = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.userinfo = ['bar', 'baz'] }.should raise_error(URI::InvalidURIError)
-    -> { uri.host = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.port = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.path = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.query = 'bar' }.should raise_error(URI::InvalidURIError)
+    -> { uri.user = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.password = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.userinfo = ['bar', 'baz'] }.should.raise(URI::InvalidURIError)
+    -> { uri.host = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.port = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.path = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.query = 'bar' }.should.raise(URI::InvalidURIError)
   end
 end
diff --git a/spec/ruby/library/uri/shared/eql.rb b/spec/ruby/library/uri/shared/eql.rb
index 2cc960d39a1..978c4aae051 100644
--- a/spec/ruby/library/uri/shared/eql.rb
+++ b/spec/ruby/library/uri/shared/eql.rb
@@ -3,7 +3,7 @@
     URISpec::NORMALIZED_FORMS.each do |form|
       normal_uri = URI(form[:normalized])
       form[:different].each do |other|
-        URI(other).send(@method, normal_uri).should be_false
+        URI(other).send(@method, normal_uri).should == false
       end
     end
   end
@@ -11,7 +11,7 @@
 
 describe :uri_eql_against_other_types, shared: true do
   it "returns false for when compared to non-uri objects" do
-    URI("http://example.com/").send(@method, "http://example.com/").should be_false
-    URI("http://example.com/").send(@method, nil).should be_false
+    URI("http://example.com/").send(@method, "http://example.com/").should == false
+    URI("http://example.com/").send(@method, nil).should == false
   end
 end
diff --git a/spec/ruby/library/uri/shared/join.rb b/spec/ruby/library/uri/shared/join.rb
index 4df0782b374..b1f5f1c72b3 100644
--- a/spec/ruby/library/uri/shared/join.rb
+++ b/spec/ruby/library/uri/shared/join.rb
@@ -20,7 +20,7 @@
   it "raises an error if given no argument" do
     -> {
       @object.join
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "doesn't create redundant '/'s" do
diff --git a/spec/ruby/library/uri/shared/parse.rb b/spec/ruby/library/uri/shared/parse.rb
index c5057b6c4bb..7ec71795264 100644
--- a/spec/ruby/library/uri/shared/parse.rb
+++ b/spec/ruby/library/uri/shared/parse.rb
@@ -1,6 +1,6 @@
 describe :uri_parse, shared: true do
   it "returns a URI::HTTP object when parsing an HTTP URI" do
-    @object.parse("http://www.example.com/").should be_kind_of(URI::HTTP)
+    @object.parse("http://www.example.com/").should.is_a?(URI::HTTP)
   end
 
   it "populates the components of a parsed URI::HTTP, setting the port to 80 by default" do
@@ -43,7 +43,7 @@
   end
 
   it "returns a URI::HTTPS object when parsing an HTTPS URI" do
-    @object.parse("https://important-intern-net.net").should be_kind_of(URI::HTTPS)
+    @object.parse("https://important-intern-net.net").should.is_a?(URI::HTTPS)
   end
 
   it "sets the port of a parsed https URI to 443 by default" do
@@ -53,7 +53,7 @@
   it "populates the components of a parsed URI::FTP object" do
     # generic, empty password.
     url = @object.parse("ftp://anonymous@ruby-lang.org/pub/ruby/1.8/ruby-1.8.6.tar.bz2;type=i")
-    url.should be_kind_of(URI::FTP)
+    url.should.is_a?(URI::FTP)
     URISpec.components(url).should == {
       scheme: "ftp",
       userinfo: "anonymous",
@@ -65,7 +65,7 @@
 
     # multidomain, no user or password
     url = @object.parse('ftp://ftp.is.co.za/rfc/rfc1808.txt')
-    url.should be_kind_of(URI::FTP)
+    url.should.is_a?(URI::FTP)
     URISpec.components(url).should == {
       scheme: "ftp",
       userinfo: nil,
@@ -77,7 +77,7 @@
 
     # empty user
     url = @object.parse('ftp://:pass@localhost/')
-    url.should be_kind_of(URI::FTP)
+    url.should.is_a?(URI::FTP)
     URISpec.components(url).should == {
       scheme: "ftp",
       userinfo: ":pass",
@@ -93,7 +93,7 @@
     #taken from http://www.faqs.org/rfcs/rfc2255.html 'cause I don't really know what an LDAP url looks like
     ldap_uris = %w{ ldap:///o=University%20of%20Michigan,c=US ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US?postalAddress ldap://host.com:6666/o=University%20of%20Michigan,c=US??sub?(cn=Babs%20Jensen) ldap://ldap.itd.umich.edu/c=GB?objectClass?one ldap://ldap.question.com/o=Question%3f,c=US?mail ldap://ldap.netscape.com/o=Babsco,c=US??(int=%5c00%5c00%5c00%5c04) ldap:///??sub??bindname=cn=Manager%2co=Foo ldap:///??sub??!bindname=cn=Manager%2co=Foo }
     ldap_uris.each do |ldap_uri|
-      @object.parse(ldap_uri).should be_kind_of(URI::LDAP)
+      @object.parse(ldap_uri).should.is_a?(URI::LDAP)
     end
   end
 
@@ -111,7 +111,7 @@
   end
 
   it "returns a URI::MailTo object when passed a mailto URI" do
-    @object.parse("mailto:spam@mailinator.com").should be_kind_of(URI::MailTo)
+    @object.parse("mailto:spam@mailinator.com").should.is_a?(URI::MailTo)
   end
 
   it "populates the components of a parsed URI::MailTo object" do
@@ -141,7 +141,7 @@
 
     # gopher
     gopher = @object.parse('gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles')
-    gopher.should be_kind_of(URI::Generic)
+    gopher.should.is_a?(URI::Generic)
 
     URISpec.components(gopher).should == {
       scheme: "gopher",
@@ -157,7 +157,7 @@
 
     # news
     news = @object.parse('news:comp.infosystems.www.servers.unix')
-    news.should be_kind_of(URI::Generic)
+    news.should.is_a?(URI::Generic)
     URISpec.components(news).should == {
       scheme: "news",
       userinfo: nil,
@@ -172,7 +172,7 @@
 
     # telnet
     telnet = @object.parse('telnet://melvyl.ucop.edu/')
-    telnet.should be_kind_of(URI::Generic)
+    telnet.should.is_a?(URI::Generic)
     URISpec.components(telnet).should == {
       scheme: "telnet",
       userinfo: nil,
@@ -187,20 +187,20 @@
 
     # files
     file_l = @object.parse('file:///foo/bar.txt')
-    file_l.should be_kind_of(URI::Generic)
+    file_l.should.is_a?(URI::Generic)
     file = @object.parse('file:/foo/bar.txt')
-    file.should be_kind_of(URI::Generic)
+    file.should.is_a?(URI::Generic)
   end
 
   if URI::DEFAULT_PARSER == URI::RFC2396_Parser
     it "raises errors on malformed URIs" do
-      -> { @object.parse('http://a_b:80/') }.should raise_error(URI::InvalidURIError)
-      -> { @object.parse('http://a_b/') }.should raise_error(URI::InvalidURIError)
+      -> { @object.parse('http://a_b:80/') }.should.raise(URI::InvalidURIError)
+      -> { @object.parse('http://a_b/') }.should.raise(URI::InvalidURIError)
     end
   elsif URI::DEFAULT_PARSER == URI::RFC3986_Parser
     it "does not raise errors on URIs contained underscore" do
-      -> { @object.parse('http://a_b:80/') }.should_not raise_error(URI::InvalidURIError)
-      -> { @object.parse('http://a_b/') }.should_not raise_error(URI::InvalidURIError)
+      -> { @object.parse('http://a_b:80/') }.should_not.raise(URI::InvalidURIError)
+      -> { @object.parse('http://a_b/') }.should_not.raise(URI::InvalidURIError)
     end
   end
 end
diff --git a/spec/ruby/library/uri/uri_spec.rb b/spec/ruby/library/uri/uri_spec.rb
index 45a7502052a..eab4e7176ca 100644
--- a/spec/ruby/library/uri/uri_spec.rb
+++ b/spec/ruby/library/uri/uri_spec.rb
@@ -19,11 +19,11 @@
 
   it "returns the argument if it is a URI object" do
     result = URI.parse("http://ruby-lang.org")
-    URI(result).should equal(result)
+    URI(result).should.equal?(result)
   end
 
   #apparently this was a concern?  imported from MRI tests
   it "does not add a URI method to Object instances" do
-    -> {Object.new.URI("http://ruby-lang.org/")}.should raise_error(NoMethodError)
+    -> {Object.new.URI("http://ruby-lang.org/")}.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/library/weakref/__getobj___spec.rb b/spec/ruby/library/weakref/__getobj___spec.rb
index 79b06f5c96d..fa507384c28 100644
--- a/spec/ruby/library/weakref/__getobj___spec.rb
+++ b/spec/ruby/library/weakref/__getobj___spec.rb
@@ -5,13 +5,13 @@
   it "returns the object if it is reachable" do
     obj = Object.new
     ref = WeakRef.new(obj)
-    ref.__getobj__.should equal(obj)
+    ref.__getobj__.should.equal?(obj)
   end
 
   it "raises WeakRef::RefError if the object is no longer reachable" do
     ref = WeakRefSpec.make_dead_weakref
     -> {
       ref.__getobj__
-    }.should raise_error(WeakRef::RefError)
+    }.should.raise(WeakRef::RefError)
   end
 end
diff --git a/spec/ruby/library/weakref/allocate_spec.rb b/spec/ruby/library/weakref/allocate_spec.rb
index e734cfd23d2..0438d093c4d 100644
--- a/spec/ruby/library/weakref/allocate_spec.rb
+++ b/spec/ruby/library/weakref/allocate_spec.rb
@@ -3,6 +3,6 @@
 
 describe "WeakRef#allocate" do
   it "assigns nil as the reference" do
-    -> { WeakRef.allocate.__getobj__ }.should raise_error(WeakRef::RefError)
+    -> { WeakRef.allocate.__getobj__ }.should.raise(WeakRef::RefError)
   end
 end
diff --git a/spec/ruby/library/weakref/send_spec.rb b/spec/ruby/library/weakref/send_spec.rb
index 9591657e01a..da8660066fc 100644
--- a/spec/ruby/library/weakref/send_spec.rb
+++ b/spec/ruby/library/weakref/send_spec.rb
@@ -27,11 +27,11 @@ def private_method
 
   it "delegates to protected methods of the weakly-referenced object" do
     wr = WeakRef.new(WeakRefSpecs)
-    -> { wr.protected_method }.should raise_error(NameError)
+    -> { wr.protected_method }.should.raise(NameError)
   end
 
   it "does not delegate to private methods of the weakly-referenced object" do
     wr = WeakRef.new(WeakRefSpecs)
-    -> { wr.private_method }.should raise_error(NameError)
+    -> { wr.private_method }.should.raise(NameError)
   end
 end
diff --git a/spec/ruby/library/weakref/weakref_alive_spec.rb b/spec/ruby/library/weakref/weakref_alive_spec.rb
index 1ebf9c1ee39..1b12ffbbec1 100644
--- a/spec/ruby/library/weakref/weakref_alive_spec.rb
+++ b/spec/ruby/library/weakref/weakref_alive_spec.rb
@@ -5,11 +5,11 @@
   it "returns true if the object is reachable" do
     obj = Object.new
     ref = WeakRef.new(obj)
-    ref.weakref_alive?.should be_true
+    ref.weakref_alive?.should == true
   end
 
   it "returns a falsy value if the object is no longer reachable" do
     ref = WeakRefSpec.make_dead_weakref
-    [false, nil].should include(ref.weakref_alive?)
+    [false, nil].should.include?(ref.weakref_alive?)
   end
 end
diff --git a/spec/ruby/library/win32ole/win32ole/_invoke_spec.rb b/spec/ruby/library/win32ole/win32ole/_invoke_spec.rb
index 994c2e6d364..747121aeba8 100644
--- a/spec/ruby/library/win32ole/win32ole/_invoke_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/_invoke_spec.rb
@@ -8,9 +8,9 @@
     end
 
     it "raises ArgumentError if insufficient number of arguments are given" do
-      -> { @shell._invoke() }.should raise_error ArgumentError
-      -> { @shell._invoke(0) }.should raise_error ArgumentError
-      -> { @shell._invoke(0, []) }.should raise_error ArgumentError
+      -> { @shell._invoke() }.should.raise ArgumentError
+      -> { @shell._invoke(0) }.should.raise ArgumentError
+      -> { @shell._invoke(0, []) }.should.raise ArgumentError
     end
 
     it "dispatches the method bound to a specific ID" do
diff --git a/spec/ruby/library/win32ole/win32ole/connect_spec.rb b/spec/ruby/library/win32ole/win32ole/connect_spec.rb
index ac0976ddc12..3a1caf85d3c 100644
--- a/spec/ruby/library/win32ole/win32ole/connect_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/connect_spec.rb
@@ -5,11 +5,11 @@
   describe "WIN32OLE.connect" do
     it "creates WIN32OLE object given valid argument" do
       obj = WIN32OLE.connect("winmgmts:")
-      obj.should be_kind_of WIN32OLE
+      obj.should.is_a? WIN32OLE
     end
 
     it "raises TypeError when given invalid argument" do
-      -> { WIN32OLE.connect 1 }.should raise_error TypeError
+      -> { WIN32OLE.connect 1 }.should.raise TypeError
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole/const_load_spec.rb b/spec/ruby/library/win32ole/win32ole/const_load_spec.rb
index 2099c4aa66d..b0ba0235366 100644
--- a/spec/ruby/library/win32ole/win32ole/const_load_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/const_load_spec.rb
@@ -8,9 +8,9 @@
     end
 
     it "loads constant SsfWINDOWS into WIN32OLE namespace" do
-      WIN32OLE.const_defined?(:SsfWINDOWS).should be_false
+      WIN32OLE.const_defined?(:SsfWINDOWS).should == false
       WIN32OLE.const_load @win32ole
-      WIN32OLE.const_defined?(:SsfWINDOWS).should be_true
+      WIN32OLE.const_defined?(:SsfWINDOWS).should == true
     end
   end
 
@@ -23,9 +23,9 @@ module WIN32OLE_RUBYSPEC; end
     it "loads constants into given namespace" do
       module WIN32OLE_RUBYSPEC; end
 
-      WIN32OLE_RUBYSPEC.const_defined?(:SsfWINDOWS).should be_false
+      WIN32OLE_RUBYSPEC.const_defined?(:SsfWINDOWS).should == false
       WIN32OLE.const_load @win32ole, WIN32OLE_RUBYSPEC
-      WIN32OLE_RUBYSPEC.const_defined?(:SsfWINDOWS).should be_true
+      WIN32OLE_RUBYSPEC.const_defined?(:SsfWINDOWS).should == true
 
     end
   end
diff --git a/spec/ruby/library/win32ole/win32ole/locale_spec.rb b/spec/ruby/library/win32ole/win32ole/locale_spec.rb
index 89e84d80385..390c41d1a29 100644
--- a/spec/ruby/library/win32ole/win32ole/locale_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/locale_spec.rb
@@ -20,7 +20,7 @@
 
         WIN32OLE.locale.should == 1041
         WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-        -> { WIN32OLE.locale = 111 }.should raise_error WIN32OLE::RuntimeError
+        -> { WIN32OLE.locale = 111 }.should.raise WIN32OLE::RuntimeError
         WIN32OLE.locale.should == WIN32OLE::LOCALE_SYSTEM_DEFAULT
       ensure
         WIN32OLE.locale.should == WIN32OLE::LOCALE_SYSTEM_DEFAULT
diff --git a/spec/ruby/library/win32ole/win32ole/new_spec.rb b/spec/ruby/library/win32ole/win32ole/new_spec.rb
index b2a0a5da185..4f54c724d9a 100644
--- a/spec/ruby/library/win32ole/win32ole/new_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/new_spec.rb
@@ -5,20 +5,20 @@
   describe "WIN32OLESpecs.new_ole" do
     it "creates a WIN32OLE object from OLE server name" do
       shell = WIN32OLESpecs.new_ole 'Shell.Application'
-      shell.should be_kind_of WIN32OLE
+      shell.should.is_a? WIN32OLE
     end
 
     it "creates a WIN32OLE object from valid CLSID" do
       shell = WIN32OLESpecs.new_ole("{13709620-C279-11CE-A49E-444553540000}")
-      shell.should be_kind_of WIN32OLE
+      shell.should.is_a? WIN32OLE
     end
 
     it "raises TypeError if argument cannot be converted to String" do
-      -> { WIN32OLESpecs.new_ole(42) }.should raise_error( TypeError )
+      -> { WIN32OLESpecs.new_ole(42) }.should.raise( TypeError )
     end
 
     it "raises WIN32OLE::RuntimeError if invalid string is given" do
-      -> { WIN32OLE.new('foo') }.should raise_error( WIN32OLE::RuntimeError )
+      -> { WIN32OLE.new('foo') }.should.raise( WIN32OLE::RuntimeError )
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb
index b846685518f..33e3e23b1bc 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb
@@ -8,15 +8,15 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @dict.ole_func_methods(1) }.should raise_error ArgumentError
+      -> { @dict.ole_func_methods(1) }.should.raise ArgumentError
     end
 
     it "returns an array of WIN32OLE::Methods" do
-      @dict.ole_func_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
+      @dict.ole_func_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should == true
     end
 
     it "contains a 'AddRef' method for Scripting Dictionary" do
-      @dict.ole_func_methods.map { |m| m.name }.include?('AddRef').should be_true
+      @dict.ole_func_methods.map { |m| m.name }.include?('AddRef').should == true
     end
   end
 end
diff --git a/spec/ruby/library/win32ole/win32ole/ole_get_methods_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_get_methods_spec.rb
index b6e7f960bbb..168a225d583 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_get_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_get_methods_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "returns an array of WIN32OLE::Method objects" do
-      @win32ole.ole_get_methods.all? {|m| m.kind_of? WIN32OLE::Method}.should be_true
+      @win32ole.ole_get_methods.all? {|m| m.kind_of? WIN32OLE::Method}.should == true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole/ole_methods_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_methods_spec.rb
index 92c4363f78c..5152deeaf45 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_methods_spec.rb
@@ -8,15 +8,15 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @dict.ole_methods(1) }.should raise_error ArgumentError
+      -> { @dict.ole_methods(1) }.should.raise ArgumentError
     end
 
     it "returns an array of WIN32OLE::Methods" do
-      @dict.ole_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
+      @dict.ole_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should == true
     end
 
     it "contains a 'AddRef' method for Scripting Dictionary" do
-      @dict.ole_methods.map { |m| m.name }.include?('AddRef').should be_true
+      @dict.ole_methods.map { |m| m.name }.include?('AddRef').should == true
     end
   end
 end
diff --git a/spec/ruby/library/win32ole/win32ole/ole_obj_help_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_obj_help_spec.rb
index f298f19dba1..1478804b554 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_obj_help_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_obj_help_spec.rb
@@ -9,11 +9,11 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @dict.ole_obj_help(1) }.should raise_error ArgumentError
+      -> { @dict.ole_obj_help(1) }.should.raise ArgumentError
     end
 
     it "returns an instance of WIN32OLE::Type" do
-      @dict.ole_obj_help.kind_of?(WIN32OLE::Type).should be_true
+      @dict.ole_obj_help.kind_of?(WIN32OLE::Type).should == true
     end
   end
 end
diff --git a/spec/ruby/library/win32ole/win32ole/ole_put_methods_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_put_methods_spec.rb
index 2b46ae47ded..b03a5d4b062 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_put_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_put_methods_spec.rb
@@ -8,15 +8,15 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @dict.ole_put_methods(1) }.should raise_error ArgumentError
+      -> { @dict.ole_put_methods(1) }.should.raise ArgumentError
     end
 
     it "returns an array of WIN32OLE::Methods" do
-      @dict.ole_put_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
+      @dict.ole_put_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should == true
     end
 
     it "contains a 'Key' method for Scripting Dictionary" do
-      @dict.ole_put_methods.map { |m| m.name }.include?('Key').should be_true
+      @dict.ole_put_methods.map { |m| m.name }.include?('Key').should == true
     end
   end
 end
diff --git a/spec/ruby/library/win32ole/win32ole/shared/ole_method.rb b/spec/ruby/library/win32ole/win32ole/shared/ole_method.rb
index bae424a604e..9e4b7e7c208 100644
--- a/spec/ruby/library/win32ole/win32ole/shared/ole_method.rb
+++ b/spec/ruby/library/win32ole/win32ole/shared/ole_method.rb
@@ -7,12 +7,12 @@
     end
 
     it "raises ArgumentError if no argument is given" do
-      -> { @dict.send(@method) }.should raise_error ArgumentError
+      -> { @dict.send(@method) }.should.raise ArgumentError
     end
 
     it "returns the WIN32OLE::Method 'Add' if given 'Add'" do
       result = @dict.send(@method, "Add")
-      result.kind_of?(WIN32OLE::Method).should be_true
+      result.kind_of?(WIN32OLE::Method).should == true
       result.name.should == 'Add'
     end
   end
diff --git a/spec/ruby/library/win32ole/win32ole/shared/setproperty.rb b/spec/ruby/library/win32ole/win32ole/shared/setproperty.rb
index b9267aef71a..de3ad7b2868 100644
--- a/spec/ruby/library/win32ole/win32ole/shared/setproperty.rb
+++ b/spec/ruby/library/win32ole/win32ole/shared/setproperty.rb
@@ -7,7 +7,7 @@
     end
 
     it "raises ArgumentError if no argument is given" do
-      -> { @dict.send(@method) }.should raise_error ArgumentError
+      -> { @dict.send(@method) }.should.raise ArgumentError
     end
 
     it "sets key to newkey and returns nil" do
diff --git a/spec/ruby/library/win32ole/win32ole_event/new_spec.rb b/spec/ruby/library/win32ole/win32ole_event/new_spec.rb
index 4efd4c3e0fa..d09c38b78d1 100644
--- a/spec/ruby/library/win32ole/win32ole_event/new_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_event/new_spec.rb
@@ -13,21 +13,21 @@
       end
 
       it "raises TypeError given invalid argument" do
-        -> { WIN32OLE::Event.new "A" }.should raise_error TypeError
+        -> { WIN32OLE::Event.new "A" }.should.raise TypeError
       end
 
       it "raises RuntimeError if event does not exist" do
-        -> { WIN32OLE::Event.new(@xml_dom, 'A') }.should raise_error RuntimeError
+        -> { WIN32OLE::Event.new(@xml_dom, 'A') }.should.raise RuntimeError
       end
 
       it "raises RuntimeError if OLE object has no events" do
         dict = WIN32OLESpecs.new_ole('Scripting.Dictionary')
-        -> { WIN32OLE::Event.new(dict) }.should raise_error RuntimeError
+        -> { WIN32OLE::Event.new(dict) }.should.raise RuntimeError
       end
 
       it "creates WIN32OLE::Event object" do
         ev = WIN32OLE::Event.new(@xml_dom)
-        ev.should be_kind_of WIN32OLE::Event
+        ev.should.is_a? WIN32OLE::Event
       end
     end
   end
diff --git a/spec/ruby/library/win32ole/win32ole_method/dispid_spec.rb b/spec/ruby/library/win32ole/win32ole_method/dispid_spec.rb
index e5f55f2d38f..43084eb943b 100644
--- a/spec/ruby/library/win32ole/win32ole_method/dispid_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/dispid_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m.dispid(0) }.should raise_error ArgumentError
+      -> { @m.dispid(0) }.should.raise ArgumentError
     end
 
     it "returns expected dispatch ID for Shell's 'namespace' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/event_interface_spec.rb b/spec/ruby/library/win32ole/win32ole_method/event_interface_spec.rb
index bea47348eee..1d00fb9696c 100644
--- a/spec/ruby/library/win32ole/win32ole_method/event_interface_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/event_interface_spec.rb
@@ -12,7 +12,7 @@
       end
 
       it "raises ArgumentError if argument is given" do
-        -> { @on_dbl_click_method.event_interface(1) }.should raise_error ArgumentError
+        -> { @on_dbl_click_method.event_interface(1) }.should.raise ArgumentError
       end
 
       it "returns expected string for System Monitor Control's 'OnDblClick' method" do
@@ -20,7 +20,7 @@
       end
 
       it "returns nil if method has no event interface" do
-        @namespace_method.event_interface.should be_nil
+        @namespace_method.event_interface.should == nil
       end
 
     end
diff --git a/spec/ruby/library/win32ole/win32ole_method/event_spec.rb b/spec/ruby/library/win32ole/win32ole_method/event_spec.rb
index 5a94cf5ce6e..fd611519cbb 100644
--- a/spec/ruby/library/win32ole/win32ole_method/event_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/event_spec.rb
@@ -10,11 +10,11 @@
       end
 
       it "raises ArgumentError if argument is given" do
-        -> { @on_dbl_click_method.event?(1) }.should raise_error ArgumentError
+        -> { @on_dbl_click_method.event?(1) }.should.raise ArgumentError
       end
 
       it "returns true for System Monitor Control's 'OnDblClick' method" do
-        @on_dbl_click_method.event?.should be_true
+        @on_dbl_click_method.event?.should == true
       end
 
     end
diff --git a/spec/ruby/library/win32ole/win32ole_method/helpcontext_spec.rb b/spec/ruby/library/win32ole/win32ole_method/helpcontext_spec.rb
index 83f34b9c109..88164bcd1f8 100644
--- a/spec/ruby/library/win32ole/win32ole_method/helpcontext_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/helpcontext_spec.rb
@@ -11,7 +11,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @get_file_version.helpcontext(1) }.should raise_error ArgumentError
+      -> { @get_file_version.helpcontext(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for FileSystemObject's 'GetFileVersion' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/helpfile_spec.rb b/spec/ruby/library/win32ole/win32ole_method/helpfile_spec.rb
index 9cf9d63d3b4..314f58c062a 100644
--- a/spec/ruby/library/win32ole/win32ole_method/helpfile_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/helpfile_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_file_name.helpfile(1) }.should raise_error ArgumentError
+      -> { @m_file_name.helpfile(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Scripting Runtime's 'File' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/helpstring_spec.rb b/spec/ruby/library/win32ole/win32ole_method/helpstring_spec.rb
index 5ae4a5e0909..2a93acdb379 100644
--- a/spec/ruby/library/win32ole/win32ole_method/helpstring_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/helpstring_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_file_name.helpstring(1) }.should raise_error ArgumentError
+      -> { @m_file_name.helpstring(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Scripting Runtime's 'File' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/invkind_spec.rb b/spec/ruby/library/win32ole/win32ole_method/invkind_spec.rb
index 06acbb58a54..16e5412a364 100644
--- a/spec/ruby/library/win32ole/win32ole_method/invkind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/invkind_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_file_name.invkind(1) }.should raise_error ArgumentError
+      -> { @m_file_name.invkind(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Scripting Runtime's 'name' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/invoke_kind_spec.rb b/spec/ruby/library/win32ole/win32ole_method/invoke_kind_spec.rb
index 0e97ec3305a..312860a9c59 100644
--- a/spec/ruby/library/win32ole/win32ole_method/invoke_kind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/invoke_kind_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_file_name.invoke_kind(1) }.should raise_error ArgumentError
+      -> { @m_file_name.invoke_kind(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Scripting Runtime's 'name' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/new_spec.rb b/spec/ruby/library/win32ole/win32ole_method/new_spec.rb
index 46186ae566f..d805d801285 100644
--- a/spec/ruby/library/win32ole/win32ole_method/new_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/new_spec.rb
@@ -8,25 +8,25 @@
     end
 
     it "raises TypeError when given non-strings" do
-      -> { WIN32OLE::Method.new(1, 2) }.should raise_error TypeError
+      -> { WIN32OLE::Method.new(1, 2) }.should.raise TypeError
     end
 
     it "raises ArgumentError if only 1 argument is given" do
-      -> { WIN32OLE::Method.new("hello") }.should raise_error ArgumentError
-      -> { WIN32OLE::Method.new(@ole_type) }.should raise_error ArgumentError
+      -> { WIN32OLE::Method.new("hello") }.should.raise ArgumentError
+      -> { WIN32OLE::Method.new(@ole_type) }.should.raise ArgumentError
     end
 
     it "returns a valid WIN32OLE::Method object" do
-      WIN32OLE::Method.new(@ole_type, "Open").should be_kind_of WIN32OLE::Method
-      WIN32OLE::Method.new(@ole_type, "open").should be_kind_of WIN32OLE::Method
+      WIN32OLE::Method.new(@ole_type, "Open").should.is_a? WIN32OLE::Method
+      WIN32OLE::Method.new(@ole_type, "open").should.is_a? WIN32OLE::Method
     end
 
     it "raises WIN32OLE::RuntimeError if the method does not exist" do
-      -> { WIN32OLE::Method.new(@ole_type, "NonexistentMethod") }.should raise_error WIN32OLE::RuntimeError
+      -> { WIN32OLE::Method.new(@ole_type, "NonexistentMethod") }.should.raise WIN32OLE::RuntimeError
     end
 
     it "raises TypeError if second argument is not a String" do
-      -> { WIN32OLE::Method.new(@ole_type, 5) }.should raise_error TypeError
+      -> { WIN32OLE::Method.new(@ole_type, 5) }.should.raise TypeError
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_method/offset_vtbl_spec.rb b/spec/ruby/library/win32ole/win32ole_method/offset_vtbl_spec.rb
index 3c80cb3c2ae..7c7e49ff3ac 100644
--- a/spec/ruby/library/win32ole/win32ole_method/offset_vtbl_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/offset_vtbl_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_file_name.offset_vtbl(1) }.should raise_error ArgumentError
+      -> { @m_file_name.offset_vtbl(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Scripting Runtime's 'name' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/params_spec.rb b/spec/ruby/library/win32ole/win32ole_method/params_spec.rb
index 0b1b4595a31..40a543fa559 100644
--- a/spec/ruby/library/win32ole/win32ole_method/params_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/params_spec.rb
@@ -11,16 +11,16 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_file_name.params(1) }.should raise_error ArgumentError
+      -> { @m_file_name.params(1) }.should.raise ArgumentError
     end
 
     it "returns empty array for Scripting Runtime's 'name' method" do
-      @m_file_name.params.should be_kind_of Array
-      @m_file_name.params.should be_empty
+      @m_file_name.params.should.is_a? Array
+      @m_file_name.params.should.empty?
     end
 
     it "returns 4-element array of WIN32OLE::Param for Shell's 'BrowseForFolder' method" do
-      @m_browse_for_folder.params.all? { |p| p.kind_of? WIN32OLE::Param }.should be_true
+      @m_browse_for_folder.params.all? { |p| p.kind_of? WIN32OLE::Param }.should == true
       @m_browse_for_folder.params.size == 4
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_method/return_type_detail_spec.rb b/spec/ruby/library/win32ole/win32ole_method/return_type_detail_spec.rb
index c3725bfef20..6d46c705c68 100644
--- a/spec/ruby/library/win32ole/win32ole_method/return_type_detail_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/return_type_detail_spec.rb
@@ -9,11 +9,11 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_browse_for_folder.return_type_detail(1) }.should raise_error ArgumentError
+      -> { @m_browse_for_folder.return_type_detail(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Shell Control's 'BrowseForFolder' method" do
-      @m_browse_for_folder.return_type_detail.should be_kind_of Array
+      @m_browse_for_folder.return_type_detail.should.is_a? Array
       @m_browse_for_folder.return_type_detail.should == ['PTR', 'USERDEFINED', 'Folder']
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_method/return_type_spec.rb b/spec/ruby/library/win32ole/win32ole_method/return_type_spec.rb
index 9e5a1eb1dfc..5afaf202f29 100644
--- a/spec/ruby/library/win32ole/win32ole_method/return_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/return_type_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_file_name.return_type(1) }.should raise_error ArgumentError
+      -> { @m_file_name.return_type(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Scripting Runtime's 'name' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/return_vtype_spec.rb b/spec/ruby/library/win32ole/win32ole_method/return_vtype_spec.rb
index 34fd135b8cc..882b5eaf434 100644
--- a/spec/ruby/library/win32ole/win32ole_method/return_vtype_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/return_vtype_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_browse_for_folder.return_vtype(1) }.should raise_error ArgumentError
+      -> { @m_browse_for_folder.return_vtype(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Shell Control's 'BrowseForFolder' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/shared/name.rb b/spec/ruby/library/win32ole/win32ole_method/shared/name.rb
index 7e2197ca5a2..ef639998363 100644
--- a/spec/ruby/library/win32ole/win32ole_method/shared/name.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/shared/name.rb
@@ -8,7 +8,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_file_name.send(@method, 1) }.should raise_error ArgumentError
+      -> { @m_file_name.send(@method, 1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Scripting Runtime's 'name' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/size_opt_params_spec.rb b/spec/ruby/library/win32ole/win32ole_method/size_opt_params_spec.rb
index 38cb21ccef9..e03a97c6c06 100644
--- a/spec/ruby/library/win32ole/win32ole_method/size_opt_params_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/size_opt_params_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_browse_for_folder.size_opt_params(1) }.should raise_error ArgumentError
+      -> { @m_browse_for_folder.size_opt_params(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Shell Control's 'BrowseForFolder' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/size_params_spec.rb b/spec/ruby/library/win32ole/win32ole_method/size_params_spec.rb
index 5d0a35a0ef5..f64f77af467 100644
--- a/spec/ruby/library/win32ole/win32ole_method/size_params_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/size_params_spec.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_browse_for_folder.size_params(1) }.should raise_error ArgumentError
+      -> { @m_browse_for_folder.size_params(1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Shell Control's 'BrowseForFolder' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/visible_spec.rb b/spec/ruby/library/win32ole/win32ole_method/visible_spec.rb
index 2f02c15c8b9..a04ac6570b2 100644
--- a/spec/ruby/library/win32ole/win32ole_method/visible_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/visible_spec.rb
@@ -9,11 +9,11 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @m_browse_for_folder.visible?(1) }.should raise_error ArgumentError
+      -> { @m_browse_for_folder.visible?(1) }.should.raise ArgumentError
     end
 
     it "returns true for Shell Control's 'BrowseForFolder' method" do
-      @m_browse_for_folder.visible?.should be_true
+      @m_browse_for_folder.visible?.should == true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_param/default_spec.rb b/spec/ruby/library/win32ole/win32ole_param/default_spec.rb
index a37b03866d7..dded6833d48 100644
--- a/spec/ruby/library/win32ole/win32ole_param/default_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/default_spec.rb
@@ -14,12 +14,12 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @params[0].default(1) }.should raise_error ArgumentError
+      -> { @params[0].default(1) }.should.raise ArgumentError
     end
 
     it "returns nil for each of WIN32OLE::Param for Shell's 'BrowseForFolder' method" do
       @params.each do |p|
-        p.default.should be_nil
+        p.default.should == nil
       end
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_param/input_spec.rb b/spec/ruby/library/win32ole/win32ole_param/input_spec.rb
index d7e27d77390..46dc305d2b6 100644
--- a/spec/ruby/library/win32ole/win32ole_param/input_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/input_spec.rb
@@ -10,7 +10,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @param_overwritefiles.input?(1) }.should raise_error ArgumentError
+      -> { @param_overwritefiles.input?(1) }.should.raise ArgumentError
     end
 
     it "returns true for 3rd parameter of FileSystemObject's 'CopyFile' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_param/ole_type_detail_spec.rb b/spec/ruby/library/win32ole/win32ole_param/ole_type_detail_spec.rb
index e3379dbf3e3..bd25ec325a6 100644
--- a/spec/ruby/library/win32ole/win32ole_param/ole_type_detail_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/ole_type_detail_spec.rb
@@ -10,7 +10,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @param_overwritefiles.ole_type_detail(1) }.should raise_error ArgumentError
+      -> { @param_overwritefiles.ole_type_detail(1) }.should.raise ArgumentError
     end
 
     it "returns ['BOOL'] for 3rd parameter of FileSystemObject's 'CopyFile' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_param/ole_type_spec.rb b/spec/ruby/library/win32ole/win32ole_param/ole_type_spec.rb
index a7b66668077..3f0c2793161 100644
--- a/spec/ruby/library/win32ole/win32ole_param/ole_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/ole_type_spec.rb
@@ -10,7 +10,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @param_overwritefiles.ole_type(1) }.should raise_error ArgumentError
+      -> { @param_overwritefiles.ole_type(1) }.should.raise ArgumentError
     end
 
     it "returns 'BOOL' for 3rd parameter of FileSystemObject's 'CopyFile' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_param/optional_spec.rb b/spec/ruby/library/win32ole/win32ole_param/optional_spec.rb
index 50e95fc77fa..ca676e09508 100644
--- a/spec/ruby/library/win32ole/win32ole_param/optional_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/optional_spec.rb
@@ -10,11 +10,11 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @param_overwritefiles.optional?(1) }.should raise_error ArgumentError
+      -> { @param_overwritefiles.optional?(1) }.should.raise ArgumentError
     end
 
     it "returns true for 3rd parameter of FileSystemObject's 'CopyFile' method" do
-      @param_overwritefiles.optional?.should be_true
+      @param_overwritefiles.optional?.should == true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_param/retval_spec.rb b/spec/ruby/library/win32ole/win32ole_param/retval_spec.rb
index fa4a09ea0c3..f25b1e7e14c 100644
--- a/spec/ruby/library/win32ole/win32ole_param/retval_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/retval_spec.rb
@@ -10,11 +10,11 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @param_overwritefiles.retval?(1) }.should raise_error ArgumentError
+      -> { @param_overwritefiles.retval?(1) }.should.raise ArgumentError
     end
 
     it "returns false for 3rd parameter of FileSystemObject's 'CopyFile' method" do
-      @param_overwritefiles.retval?.should be_false
+      @param_overwritefiles.retval?.should == false
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_param/shared/name.rb b/spec/ruby/library/win32ole/win32ole_param/shared/name.rb
index 56ff24ddc83..1f6cbea7a03 100644
--- a/spec/ruby/library/win32ole/win32ole_param/shared/name.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/shared/name.rb
@@ -9,7 +9,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @param_overwritefiles.send(@method, 1) }.should raise_error ArgumentError
+      -> { @param_overwritefiles.send(@method, 1) }.should.raise ArgumentError
     end
 
     it "returns expected value for Scripting Runtime's 'name' method" do
diff --git a/spec/ruby/library/win32ole/win32ole_type/helpcontext_spec.rb b/spec/ruby/library/win32ole/win32ole_type/helpcontext_spec.rb
index 35911fec52c..7b605a038b3 100644
--- a/spec/ruby/library/win32ole/win32ole_type/helpcontext_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/helpcontext_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns an Integer" do
-      @ole_type.helpcontext.should be_kind_of Integer
+      @ole_type.helpcontext.should.is_a? Integer
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/helpfile_spec.rb b/spec/ruby/library/win32ole/win32ole_type/helpfile_spec.rb
index 7bd61a1c401..43a979882a4 100644
--- a/spec/ruby/library/win32ole/win32ole_type/helpfile_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/helpfile_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns an empty string" do
-      @ole_type.helpfile.should be_empty
+      @ole_type.helpfile.should.empty?
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/major_version_spec.rb b/spec/ruby/library/win32ole/win32ole_type/major_version_spec.rb
index 598e5bcef8a..66fdbc9ab06 100644
--- a/spec/ruby/library/win32ole/win32ole_type/major_version_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/major_version_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns an Integer" do
-      @ole_type.major_version.should be_kind_of Integer
+      @ole_type.major_version.should.is_a? Integer
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/minor_version_spec.rb b/spec/ruby/library/win32ole/win32ole_type/minor_version_spec.rb
index 59cfb940126..afb50865659 100644
--- a/spec/ruby/library/win32ole/win32ole_type/minor_version_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/minor_version_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns an Integer" do
-      @ole_type.minor_version.should be_kind_of Integer
+      @ole_type.minor_version.should.is_a? Integer
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/new_spec.rb b/spec/ruby/library/win32ole/win32ole_type/new_spec.rb
index 185a2359405..9d92177a4b4 100644
--- a/spec/ruby/library/win32ole/win32ole_type/new_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/new_spec.rb
@@ -4,37 +4,37 @@
 
   describe "WIN32OLE::Type.new" do
     it "raises ArgumentError with no argument" do
-      -> { WIN32OLE::Type.new }.should raise_error ArgumentError
+      -> { WIN32OLE::Type.new }.should.raise ArgumentError
     end
 
     it "raises ArgumentError with invalid string" do
-      -> { WIN32OLE::Type.new("foo") }.should raise_error ArgumentError
+      -> { WIN32OLE::Type.new("foo") }.should.raise ArgumentError
     end
 
     it "raises TypeError if second argument is not a String" do
-      -> { WIN32OLE::Type.new(1,2) }.should raise_error TypeError
+      -> { WIN32OLE::Type.new(1,2) }.should.raise TypeError
       -> {
         WIN32OLE::Type.new('Microsoft Shell Controls And Automation',2)
-      }.should raise_error TypeError
+      }.should.raise TypeError
     end
 
     it "raise WIN32OLE::RuntimeError if OLE object specified is not found" do
       -> {
         WIN32OLE::Type.new('Microsoft Shell Controls And Automation','foo')
-      }.should raise_error WIN32OLE::RuntimeError
+      }.should.raise WIN32OLE::RuntimeError
       -> {
         WIN32OLE::Type.new('Microsoft Shell Controls And Automation','Application')
-      }.should raise_error WIN32OLE::RuntimeError
+      }.should.raise WIN32OLE::RuntimeError
     end
 
     it "creates WIN32OLE::Type object from name and valid type" do
       ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
-      ole_type.should be_kind_of WIN32OLE::Type
+      ole_type.should.is_a? WIN32OLE::Type
     end
 
     it "creates WIN32OLE::Type object from CLSID and valid type" do
       ole_type2 = WIN32OLE::Type.new("{13709620-C279-11CE-A49E-444553540000}", "Shell")
-      ole_type2.should be_kind_of WIN32OLE::Type
+      ole_type2.should.is_a? WIN32OLE::Type
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/ole_classes_spec.rb b/spec/ruby/library/win32ole/win32ole_type/ole_classes_spec.rb
index ed14e37a958..7db08dc9009 100644
--- a/spec/ruby/library/win32ole/win32ole_type/ole_classes_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/ole_classes_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns array of WIN32OLE_TYPEs" do
-      WIN32OLE::Type.ole_classes("Microsoft Shell Controls And Automation").all? {|e| e.kind_of? WIN32OLE::Type }.should be_true
+      WIN32OLE::Type.ole_classes("Microsoft Shell Controls And Automation").all? {|e| e.kind_of? WIN32OLE::Type }.should == true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/ole_methods_spec.rb b/spec/ruby/library/win32ole/win32ole_type/ole_methods_spec.rb
index 0c031abaa6e..bdf668e53b6 100644
--- a/spec/ruby/library/win32ole/win32ole_type/ole_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/ole_methods_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns an Integer" do
-      @ole_type.ole_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
+      @ole_type.ole_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should == true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/progids_spec.rb b/spec/ruby/library/win32ole/win32ole_type/progids_spec.rb
index b1b57960cd6..cbb9247da12 100644
--- a/spec/ruby/library/win32ole/win32ole_type/progids_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/progids_spec.rb
@@ -4,11 +4,11 @@
 
   describe "WIN32OLE::Type.progids" do
     it "raises ArgumentError if an argument is given" do
-      -> { WIN32OLE::Type.progids(1) }.should raise_error ArgumentError
+      -> { WIN32OLE::Type.progids(1) }.should.raise ArgumentError
     end
 
     it "returns an array containing 'Shell.Explorer'" do
-      WIN32OLE::Type.progids().include?('Shell.Explorer').should be_true
+      WIN32OLE::Type.progids().include?('Shell.Explorer').should == true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/shared/name.rb b/spec/ruby/library/win32ole/win32ole_type/shared/name.rb
index efae7aeec16..707149a5bb6 100644
--- a/spec/ruby/library/win32ole/win32ole_type/shared/name.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/shared/name.rb
@@ -7,7 +7,7 @@
     end
 
     it "raises ArgumentError if argument is given" do
-      -> { @ole_type.send(@method, 1) }.should raise_error ArgumentError
+      -> { @ole_type.send(@method, 1) }.should.raise ArgumentError
     end
 
     it "returns a String" do
diff --git a/spec/ruby/library/win32ole/win32ole_type/src_type_spec.rb b/spec/ruby/library/win32ole/win32ole_type/src_type_spec.rb
index 3c7651cc1fd..9f0893b7500 100644
--- a/spec/ruby/library/win32ole/win32ole_type/src_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/src_type_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns nil" do
-      @ole_type.src_type.should be_nil
+      @ole_type.src_type.should == nil
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/typekind_spec.rb b/spec/ruby/library/win32ole/win32ole_type/typekind_spec.rb
index 8b62f3e2ebb..10516270250 100644
--- a/spec/ruby/library/win32ole/win32ole_type/typekind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/typekind_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns an Integer" do
-      @ole_type.typekind.should be_kind_of Integer
+      @ole_type.typekind.should.is_a? Integer
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/typelibs_spec.rb b/spec/ruby/library/win32ole/win32ole_type/typelibs_spec.rb
index 71d7cf00f76..36400d75f2a 100644
--- a/spec/ruby/library/win32ole/win32ole_type/typelibs_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/typelibs_spec.rb
@@ -12,11 +12,11 @@
     end
 
     it "raises ArgumentError if any argument is give" do
-      -> { WIN32OLE::Type.typelibs(1) }.should raise_error ArgumentError
+      -> { WIN32OLE::Type.typelibs(1) }.should.raise ArgumentError
     end
 
     it "returns array of type libraries" do
-      WIN32OLE::Type.typelibs().include?("Microsoft Shell Controls And Automation").should be_true
+      WIN32OLE::Type.typelibs().include?("Microsoft Shell Controls And Automation").should == true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/visible_spec.rb b/spec/ruby/library/win32ole/win32ole_type/visible_spec.rb
index 05c54c8838a..bca9159d53d 100644
--- a/spec/ruby/library/win32ole/win32ole_type/visible_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/visible_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns true" do
-      @ole_type.visible?.should be_true
+      @ole_type.visible?.should == true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_variable/ole_type_detail_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/ole_type_detail_spec.rb
index 89576ceedc6..a9232d2b28b 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/ole_type_detail_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/ole_type_detail_spec.rb
@@ -11,8 +11,8 @@
     end
 
     it "returns a nonempty Array" do
-      @var.ole_type_detail.should be_kind_of Array
-      @var.ole_type_detail.should_not be_empty
+      @var.ole_type_detail.should.is_a? Array
+      @var.ole_type_detail.should_not.empty?
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_variable/ole_type_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/ole_type_spec.rb
index 441011f1e7f..f28cbfd37a9 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/ole_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/ole_type_spec.rb
@@ -11,7 +11,7 @@
     end
 
     it "returns a String" do
-      @var.ole_type.should be_kind_of String
+      @var.ole_type.should.is_a? String
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_variable/shared/name.rb b/spec/ruby/library/win32ole/win32ole_variable/shared/name.rb
index d02942ce0a8..d0790666162 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/shared/name.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/shared/name.rb
@@ -10,7 +10,7 @@
     end
 
     it "returns a String" do
-      @var.send(@method).should be_kind_of String
+      @var.send(@method).should.is_a? String
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_variable/value_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/value_spec.rb
index d26273ebeda..33066e40efe 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/value_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/value_spec.rb
@@ -12,7 +12,7 @@
 
     it "returns an Integer" do
       # according to doc, this could return nil
-      @var.value.should be_kind_of Integer
+      @var.value.should.is_a? Integer
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_variable/variable_kind_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/variable_kind_spec.rb
index 17bc47160af..2cf1d7f1f26 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/variable_kind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/variable_kind_spec.rb
@@ -11,7 +11,7 @@
     end
 
     it "returns a String" do
-      @var.variable_kind.should be_kind_of String
+      @var.variable_kind.should.is_a? String
       @var.variable_kind.should == 'CONSTANT'
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_variable/varkind_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/varkind_spec.rb
index c5f81645099..04ccb8d46f5 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/varkind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/varkind_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "returns an Integer" do
-      @var.varkind.should be_kind_of Integer
+      @var.varkind.should.is_a? Integer
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_variable/visible_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/visible_spec.rb
index ba53a81de0b..939468122cd 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/visible_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/visible_spec.rb
@@ -11,7 +11,7 @@
     end
 
     it "returns a String" do
-      @var.visible?.should be_true
+      @var.visible?.should == true
     end
 
   end
diff --git a/spec/ruby/library/yaml/parse_file_spec.rb b/spec/ruby/library/yaml/parse_file_spec.rb
index 7bffcdc62f9..a29377f1638 100644
--- a/spec/ruby/library/yaml/parse_file_spec.rb
+++ b/spec/ruby/library/yaml/parse_file_spec.rb
@@ -5,6 +5,6 @@
 describe "YAML.parse_file" do
   it "returns a YAML::Syck::Map object after parsing a YAML file" do
     test_parse_file = fixture __FILE__, "test_yaml.yml"
-    YAML.parse_file(test_parse_file).should be_kind_of(Psych::Nodes::Document)
+    YAML.parse_file(test_parse_file).should.is_a?(Psych::Nodes::Document)
   end
 end
diff --git a/spec/ruby/library/yaml/parse_spec.rb b/spec/ruby/library/yaml/parse_spec.rb
index 37e2b7fa0a5..832cd99d039 100644
--- a/spec/ruby/library/yaml/parse_spec.rb
+++ b/spec/ruby/library/yaml/parse_spec.rb
@@ -4,7 +4,7 @@
 
 describe "YAML.parse with an empty string" do
   it "returns false" do
-    YAML.parse('').should be_false
+    YAML.parse('').should == false
   end
 end
 
diff --git a/spec/ruby/library/yaml/shared/load.rb b/spec/ruby/library/yaml/shared/load.rb
index b8bb605b0a0..7e5669f2d0f 100644
--- a/spec/ruby/library/yaml/shared/load.rb
+++ b/spec/ruby/library/yaml/shared/load.rb
@@ -60,7 +60,7 @@
     else
       error = ArgumentError
     end
-    -> { YAML.send(@method, "key1: value\ninvalid_key") }.should raise_error(error)
+    -> { YAML.send(@method, "key1: value\ninvalid_key") }.should.raise(error)
   end
 
   it "accepts symbols" do
@@ -117,7 +117,7 @@
       ].should be_computed_by(:usec)
     end
 
-    it "rounds values smaller than 1 usec to 0 " do
+    it "rounds values smaller than 1 usec to 0" do
       YAML.send(@method, "2011-03-22t23:32:11.000000342222+01:00").usec.should == 0
     end
   end
@@ -137,6 +137,6 @@
     loaded = YAML.send(@method, "--- !ruby/object:File {}\n")
     -> {
       loaded.read(1)
-    }.should raise_error(IOError)
+    }.should.raise(IOError)
   end
 end
diff --git a/spec/ruby/library/yaml/to_yaml_spec.rb b/spec/ruby/library/yaml/to_yaml_spec.rb
index 08c54514162..328ab255528 100644
--- a/spec/ruby/library/yaml/to_yaml_spec.rb
+++ b/spec/ruby/library/yaml/to_yaml_spec.rb
@@ -32,25 +32,25 @@
 
   it "returns the YAML representation of a FalseClass" do
     false_klass = false
-    false_klass.should be_kind_of(FalseClass)
+    false_klass.should.is_a?(FalseClass)
     false_klass.to_yaml.should match_yaml("--- false\n")
   end
 
   it "returns the YAML representation of a Float object" do
     float = 1.2
-    float.should be_kind_of(Float)
+    float.should.is_a?(Float)
     float.to_yaml.should match_yaml("--- 1.2\n")
   end
 
   it "returns the YAML representation of an Integer object" do
     int = 20
-    int.should be_kind_of(Integer)
+    int.should.is_a?(Integer)
     int.to_yaml.should match_yaml("--- 20\n")
   end
 
   it "returns the YAML representation of a NilClass object" do
     nil_klass = nil
-    nil_klass.should be_kind_of(NilClass)
+    nil_klass.should.is_a?(NilClass)
     nil_klass.to_yaml.should match_yaml("--- \n")
   end
 
@@ -84,7 +84,7 @@
 
   it "returns the YAML representation of a TrueClass" do
     true_klass = true
-    true_klass.should be_kind_of(TrueClass)
+    true_klass.should.is_a?(TrueClass)
     true_klass.to_yaml.should match_yaml("--- true\n")
   end
 
@@ -94,10 +94,10 @@
 
   it "returns the YAML representation for Range objects" do
     yaml = Range.new(1,3).to_yaml
-    yaml.include?("!ruby/range").should be_true
-    yaml.include?("begin: 1").should be_true
-    yaml.include?("end: 3").should be_true
-    yaml.include?("excl: false").should be_true
+    yaml.include?("!ruby/range").should == true
+    yaml.include?("begin: 1").should == true
+    yaml.include?("end: 3").should == true
+    yaml.include?("excl: false").should == true
   end
 
   it "returns the YAML representation of numeric constants" do
diff --git a/spec/ruby/library/zlib/adler32_spec.rb b/spec/ruby/library/zlib/adler32_spec.rb
index 226aa18522c..887c22d059e 100644
--- a/spec/ruby/library/zlib/adler32_spec.rb
+++ b/spec/ruby/library/zlib/adler32_spec.rb
@@ -19,7 +19,7 @@
     Zlib.adler32(test_string, 1).should == 66391324
     Zlib.adler32(test_string, 2**8).should == 701435419
     Zlib.adler32(test_string, 2**16).should == 63966491
-    -> { Zlib.adler32(test_string, 2**128) }.should raise_error(RangeError)
+    -> { Zlib.adler32(test_string, 2**128) }.should.raise(RangeError)
   end
 
   it "calculates the Adler checksum for string and initial Adler value for Integers" do
diff --git a/spec/ruby/library/zlib/crc32_spec.rb b/spec/ruby/library/zlib/crc32_spec.rb
index d5f5c199cc0..b94b5c627cd 100644
--- a/spec/ruby/library/zlib/crc32_spec.rb
+++ b/spec/ruby/library/zlib/crc32_spec.rb
@@ -26,7 +26,7 @@
     Zlib.crc32(test_string, 2**16).should == 1932511220
     Zlib.crc32("p", ~305419896).should == 4046865307
     Zlib.crc32("p", -305419897).should == 4046865307
-    -> { Zlib.crc32(test_string, 2**128) }.should raise_error(RangeError)
+    -> { Zlib.crc32(test_string, 2**128) }.should.raise(RangeError)
   end
 
   it "calculates the CRC checksum for string and initial CRC value for Integers" do
diff --git a/spec/ruby/library/zlib/gzipfile/close_spec.rb b/spec/ruby/library/zlib/gzipfile/close_spec.rb
index 964b5ffb4dc..07bafac9619 100644
--- a/spec/ruby/library/zlib/gzipfile/close_spec.rb
+++ b/spec/ruby/library/zlib/gzipfile/close_spec.rb
@@ -10,10 +10,8 @@
 
       gzio.should.closed?
 
-      -> { gzio.orig_name }.should \
-        raise_error(Zlib::GzipFile::Error, 'closed gzip stream')
-      -> { gzio.comment }.should \
-        raise_error(Zlib::GzipFile::Error, 'closed gzip stream')
+      -> { gzio.orig_name }.should.raise(Zlib::GzipFile::Error, 'closed gzip stream')
+      -> { gzio.comment }.should.raise(Zlib::GzipFile::Error, 'closed gzip stream')
     end
 
     io.string[10..-1].should == ([3] + Array.new(9,0)).pack('C*')
diff --git a/spec/ruby/library/zlib/gzipfile/comment_spec.rb b/spec/ruby/library/zlib/gzipfile/comment_spec.rb
index 70d97ecaf6e..845224df98a 100644
--- a/spec/ruby/library/zlib/gzipfile/comment_spec.rb
+++ b/spec/ruby/library/zlib/gzipfile/comment_spec.rb
@@ -19,8 +19,7 @@
     Zlib::GzipWriter.wrap @io do |gzio|
       gzio.close
 
-      -> { gzio.comment }.should \
-        raise_error(Zlib::GzipFile::Error, 'closed gzip stream')
+      -> { gzio.comment }.should.raise(Zlib::GzipFile::Error, 'closed gzip stream')
     end
   end
 end
diff --git a/spec/ruby/library/zlib/gzipfile/orig_name_spec.rb b/spec/ruby/library/zlib/gzipfile/orig_name_spec.rb
index ebfd3692aff..1da375390bd 100644
--- a/spec/ruby/library/zlib/gzipfile/orig_name_spec.rb
+++ b/spec/ruby/library/zlib/gzipfile/orig_name_spec.rb
@@ -19,8 +19,7 @@
     Zlib::GzipWriter.wrap @io do |gzio|
       gzio.close
 
-      -> { gzio.orig_name }.should \
-        raise_error(Zlib::GzipFile::Error, 'closed gzip stream')
+      -> { gzio.orig_name }.should.raise(Zlib::GzipFile::Error, 'closed gzip stream')
     end
   end
 end
diff --git a/spec/ruby/library/zlib/gzipreader/eof_spec.rb b/spec/ruby/library/zlib/gzipreader/eof_spec.rb
index 673220fdfd6..a38e144c723 100644
--- a/spec/ruby/library/zlib/gzipreader/eof_spec.rb
+++ b/spec/ruby/library/zlib/gzipreader/eof_spec.rb
@@ -12,31 +12,31 @@
 
   it "returns true when at EOF" do
     gz = Zlib::GzipReader.new @io
-    gz.eof?.should be_false
+    gz.eof?.should == false
     gz.read
-    gz.eof?.should be_true
+    gz.eof?.should == true
   end
 
   it "returns true when at EOF with the exact length of uncompressed data" do
     gz = Zlib::GzipReader.new @io
-    gz.eof?.should be_false
+    gz.eof?.should == false
     gz.read(10)
-    gz.eof?.should be_true
+    gz.eof?.should == true
   end
 
   it "returns true when at EOF with a length greater than the size of uncompressed data" do
     gz = Zlib::GzipReader.new @io
-    gz.eof?.should be_false
+    gz.eof?.should == false
     gz.read(11)
-    gz.eof?.should be_true
+    gz.eof?.should == true
   end
 
   it "returns false when at EOF when there's data left in the buffer to read" do
     gz = Zlib::GzipReader.new @io
     gz.read(9)
-    gz.eof?.should be_false
+    gz.eof?.should == false
     gz.read
-    gz.eof?.should be_true
+    gz.eof?.should == true
   end
 
   # This is especially important for JRuby, since eof? there
@@ -44,11 +44,11 @@
   it "does not affect the reading data" do
     gz = Zlib::GzipReader.new @io
     0.upto(9) do |i|
-      gz.eof?.should be_false
+      gz.eof?.should == false
       gz.read(1).should == @data[i, 1]
     end
-    gz.eof?.should be_true
+    gz.eof?.should == true
     gz.read.should == ""
-    gz.eof?.should be_true
+    gz.eof?.should == true
   end
 end
diff --git a/spec/ruby/library/zlib/gzipreader/getc_spec.rb b/spec/ruby/library/zlib/gzipreader/getc_spec.rb
index e5672319402..be135921891 100644
--- a/spec/ruby/library/zlib/gzipreader/getc_spec.rb
+++ b/spec/ruby/library/zlib/gzipreader/getc_spec.rb
@@ -33,7 +33,7 @@
     gz = Zlib::GzipReader.new @io
     gz.read
     pos = gz.pos
-    gz.getc.should be_nil
+    gz.getc.should == nil
     gz.pos.should == pos
   end
 end
diff --git a/spec/ruby/library/zlib/gzipreader/gets_spec.rb b/spec/ruby/library/zlib/gzipreader/gets_spec.rb
index d3a2e7d263b..5d0809f833b 100644
--- a/spec/ruby/library/zlib/gzipreader/gets_spec.rb
+++ b/spec/ruby/library/zlib/gzipreader/gets_spec.rb
@@ -16,7 +16,7 @@
 
       gz.gets('').should == "123\n45\n\n"
       gz.gets('').should == "abc\nde\n\n"
-      gz.eof?.should be_true
+      gz.eof?.should == true
     end
   end
 end
diff --git a/spec/ruby/library/zlib/gzipreader/read_spec.rb b/spec/ruby/library/zlib/gzipreader/read_spec.rb
index b81954b5ce1..b07d433bddd 100644
--- a/spec/ruby/library/zlib/gzipreader/read_spec.rb
+++ b/spec/ruby/library/zlib/gzipreader/read_spec.rb
@@ -30,7 +30,7 @@
     gz = Zlib::GzipReader.new @io
     -> {
       gz.read(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "returns an empty string if a 0 length is given" do
@@ -59,8 +59,8 @@
     it "returns nil if length parameter is positive" do
       gz = Zlib::GzipReader.new @io
       gz.read # read till the end
-      gz.read(1).should be_nil
-      gz.read(2**16).should be_nil
+      gz.read(1).should == nil
+      gz.read(2**16).should == nil
     end
   end
 end
diff --git a/spec/ruby/library/zlib/gzipreader/ungetbyte_spec.rb b/spec/ruby/library/zlib/gzipreader/ungetbyte_spec.rb
index 7fa0608f9f3..53870b91776 100644
--- a/spec/ruby/library/zlib/gzipreader/ungetbyte_spec.rb
+++ b/spec/ruby/library/zlib/gzipreader/ungetbyte_spec.rb
@@ -94,7 +94,7 @@
 
       it 'makes eof? false' do
         @gz.ungetbyte 0x21
-        @gz.eof?.should be_false
+        @gz.eof?.should == false
       end
     end
 
@@ -112,7 +112,7 @@
 
         it 'does not make eof? false' do
           @gz.ungetbyte nil
-          @gz.eof?.should be_true
+          @gz.eof?.should == true
         end
       end
     end
diff --git a/spec/ruby/library/zlib/gzipreader/ungetc_spec.rb b/spec/ruby/library/zlib/gzipreader/ungetc_spec.rb
index 34f2a1a2ca7..46dcfde9896 100644
--- a/spec/ruby/library/zlib/gzipreader/ungetc_spec.rb
+++ b/spec/ruby/library/zlib/gzipreader/ungetc_spec.rb
@@ -190,7 +190,7 @@
 
       it 'makes eof? false' do
         @gz.ungetc 'x'
-        @gz.eof?.should be_false
+        @gz.eof?.should == false
       end
     end
 
@@ -207,7 +207,7 @@
 
       it 'makes eof? false' do
         @gz.ungetc 'ŷ'
-        @gz.eof?.should be_false
+        @gz.eof?.should == false
       end
     end
 
@@ -224,7 +224,7 @@
 
       it 'makes eof? false' do
         @gz.ungetc 'xŷž'
-        @gz.eof?.should be_false
+        @gz.eof?.should == false
       end
     end
 
@@ -241,7 +241,7 @@
 
       it 'makes eof? false' do
         @gz.ungetc 0x21
-        @gz.eof?.should be_false
+        @gz.eof?.should == false
       end
     end
 
@@ -258,7 +258,7 @@
 
       it 'does not make eof? false' do
         @gz.ungetc ''
-        @gz.eof?.should be_true
+        @gz.eof?.should == true
       end
     end
 
@@ -276,7 +276,7 @@
 
         it 'does not make eof? false' do
           @gz.ungetc nil
-          @gz.eof?.should be_true
+          @gz.eof?.should == true
         end
       end
     end
diff --git a/spec/ruby/library/zlib/gzipwriter/append_spec.rb b/spec/ruby/library/zlib/gzipwriter/append_spec.rb
index 6aa28241800..ef9e3d3a6ba 100644
--- a/spec/ruby/library/zlib/gzipwriter/append_spec.rb
+++ b/spec/ruby/library/zlib/gzipwriter/append_spec.rb
@@ -9,7 +9,7 @@
 
   it "returns self" do
     Zlib::GzipWriter.wrap @io do |gzio|
-      (gzio << "test").should equal(gzio)
+      (gzio << "test").should.equal?(gzio)
     end
   end
 end
diff --git a/spec/ruby/library/zlib/gzipwriter/mtime_spec.rb b/spec/ruby/library/zlib/gzipwriter/mtime_spec.rb
index 621b602dc7c..a70fa680696 100644
--- a/spec/ruby/library/zlib/gzipwriter/mtime_spec.rb
+++ b/spec/ruby/library/zlib/gzipwriter/mtime_spec.rb
@@ -31,8 +31,7 @@
     Zlib::GzipWriter.wrap @io do |gzio|
       gzio.write ''
 
-      -> { gzio.mtime = nil }.should \
-        raise_error(Zlib::GzipFile::Error, 'header is already written')
+      -> { gzio.mtime = nil }.should.raise(Zlib::GzipFile::Error, 'header is already written')
     end
   end
 end
diff --git a/spec/ruby/library/zlib/inflate/append_spec.rb b/spec/ruby/library/zlib/inflate/append_spec.rb
index f121e665667..a4c791e31e9 100644
--- a/spec/ruby/library/zlib/inflate/append_spec.rb
+++ b/spec/ruby/library/zlib/inflate/append_spec.rb
@@ -41,7 +41,7 @@
   it "properly handles incomplete data" do
     # add bytes, one by one
     @foo_deflated[0, 5].each_byte { |d| @z << d.chr}
-    -> { @z.finish }.should raise_error(Zlib::BufError)
+    -> { @z.finish }.should.raise(Zlib::BufError)
   end
 
   it "properly handles excessive data, byte-by-byte" do
diff --git a/spec/ruby/library/zlib/inflate/finish_spec.rb b/spec/ruby/library/zlib/inflate/finish_spec.rb
index 3e0663e265e..b7494e419c3 100644
--- a/spec/ruby/library/zlib/inflate/finish_spec.rb
+++ b/spec/ruby/library/zlib/inflate/finish_spec.rb
@@ -23,7 +23,7 @@
   end
 
   it "each chunk should have the same prefix" do
-    @chunks.all? { |chunk| chunk =~ /\A0+\z/ }.should be_true
+    @chunks.all? { |chunk| chunk =~ /\A0+\z/ }.should == true
   end
 
 end
diff --git a/spec/ruby/library/zlib/inflate/inflate_spec.rb b/spec/ruby/library/zlib/inflate/inflate_spec.rb
index b308a4ba67b..92e52363db6 100644
--- a/spec/ruby/library/zlib/inflate/inflate_spec.rb
+++ b/spec/ruby/library/zlib/inflate/inflate_spec.rb
@@ -84,7 +84,7 @@
     # add bytes, one by one, but not all
     result = +""
     data.each_byte { |d| result << z.inflate(d.chr)}
-    -> { result << z.finish }.should raise_error(Zlib::BufError)
+    -> { result << z.finish }.should.raise(Zlib::BufError)
   end
 
   it "properly handles excessive data, byte-by-byte" do
@@ -138,7 +138,7 @@
     end
 
     it "properly handles chunked data" do
-      @chunks.all? { |chunk| chunk =~ /\A0+\z/ }.should be_true
+      @chunks.all? { |chunk| chunk =~ /\A0+\z/ }.should == true
     end
   end
 
diff --git a/spec/ruby/library/zlib/zlib_version_spec.rb b/spec/ruby/library/zlib/zlib_version_spec.rb
index f83dfae66dd..7edc76cdd51 100644
--- a/spec/ruby/library/zlib/zlib_version_spec.rb
+++ b/spec/ruby/library/zlib/zlib_version_spec.rb
@@ -3,6 +3,6 @@
 
 describe "Zlib.zlib_version" do
   it "returns the version of the libz library" do
-    Zlib.zlib_version.should be_an_instance_of(String)
+    Zlib.zlib_version.should.instance_of?(String)
   end
 end
diff --git a/spec/ruby/optional/capi/array_spec.rb b/spec/ruby/optional/capi/array_spec.rb
index 7e878598566..0b997f774ca 100644
--- a/spec/ruby/optional/capi/array_spec.rb
+++ b/spec/ruby/optional/capi/array_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "raises an ArgumentError when the given argument is negative" do
-    -> { @s.send(@method, -1) }.should raise_error(ArgumentError)
+    -> { @s.send(@method, -1) }.should.raise(ArgumentError)
   end
 end
 
@@ -84,7 +84,7 @@
     end
 
     it "raises a FrozenError if the array is frozen" do
-      -> { @s.rb_ary_cat([].freeze, 1) }.should raise_error(FrozenError)
+      -> { @s.rb_ary_cat([].freeze, 1) }.should.raise(FrozenError)
     end
   end
 
@@ -120,7 +120,7 @@
 
     it "returns the original array" do
       a = [1,2,3]
-      @s.rb_ary_reverse(a).should equal(a)
+      @s.rb_ary_reverse(a).should.equal?(a)
     end
   end
 
@@ -131,7 +131,7 @@
     end
 
     it "raises a FrozenError if the array is frozen" do
-      -> { @s.rb_ary_rotate([].freeze, 1) }.should raise_error(FrozenError)
+      -> { @s.rb_ary_rotate([].freeze, 1) }.should.raise(FrozenError)
     end
   end
 
@@ -166,7 +166,7 @@
       b = @s.rb_ary_dup(a)
 
       b.should == a
-      b.should_not equal(a)
+      b.should_not.equal?(a)
     end
   end
 
@@ -221,7 +221,7 @@
 
     it "raises an IndexError if the negative index is greater than the length" do
       a = [1, 2, 3]
-      -> { @s.rb_ary_store(a, -10, 5) }.should raise_error(IndexError)
+      -> { @s.rb_ary_store(a, -10, 5) }.should.raise(IndexError)
     end
 
     it "enlarges the array as needed" do
@@ -232,7 +232,7 @@
 
     it "raises a FrozenError if the array is frozen" do
       a = [1, 2, 3].freeze
-      -> { @s.rb_ary_store(a, 1, 5) }.should raise_error(FrozenError)
+      -> { @s.rb_ary_store(a, 1, 5) }.should.raise(FrozenError)
     end
   end
 
@@ -307,11 +307,11 @@
 
   describe "rb_ary_includes" do
     it "returns true if the array includes the element" do
-      @s.rb_ary_includes([1, 2, 3], 2).should be_true
+      @s.rb_ary_includes([1, 2, 3], 2).should == true
     end
 
     it "returns false if the array does not include the element" do
-      @s.rb_ary_includes([1, 2, 3], 4).should be_false
+      @s.rb_ary_includes([1, 2, 3], 4).should == false
     end
   end
 
@@ -322,7 +322,7 @@
     end
 
     it "returns nil for an out of range index" do
-      @s.rb_ary_aref([1, 2, 3], 6).should be_nil
+      @s.rb_ary_aref([1, 2, 3], 6).should == nil
     end
 
     it "returns a new array where the first argument is the index and the second is the length" do
@@ -335,7 +335,7 @@
     end
 
     it "returns nil when the start of a range is out of bounds" do
-      @s.rb_ary_aref([1, 2, 3, 4], 6..10).should be_nil
+      @s.rb_ary_aref([1, 2, 3, 4], 6..10).should == nil
     end
 
     it "returns an empty array when the start of a range equals the last element" do
@@ -352,7 +352,7 @@
         s2.should == s
 
         # Make sure they're different objects
-        s2.equal?(s).should be_false
+        s2.equal?(s).should == false
       end
 
       it "calls a function with the other function available as a block" do
@@ -387,7 +387,7 @@ def o.each
       s2.should == s
 
       # Make sure they're different objects
-      s2.equal?(s).should be_false
+      s2.equal?(s).should == false
     end
 
     it "calls a function with the other function available as a block" do
@@ -422,7 +422,7 @@ def o.each
 
     it "returns nil if the element is not in the array" do
       ary = [1, 2, 3, 4]
-      @s.rb_ary_delete(ary, 5).should be_nil
+      @s.rb_ary_delete(ary, 5).should == nil
       ary.should == [1, 2, 3, 4]
     end
   end
@@ -437,7 +437,7 @@ def o.each
     it "freezes the object exactly like Kernel#freeze" do
       ary = [1,2]
       @s.rb_ary_freeze(ary)
-      ary.frozen?.should be_true
+      ary.frozen?.should == true
     end
   end
 
@@ -457,12 +457,12 @@ def o.each
     end
 
     it "returns nil if the index is out of bounds" do
-      @s.rb_ary_delete_at(@array, 4).should be_nil
+      @s.rb_ary_delete_at(@array, 4).should == nil
       @array.should == [1, 2, 3, 4]
     end
 
     it "returns nil if the negative index is out of bounds" do
-      @s.rb_ary_delete_at(@array, -5).should be_nil
+      @s.rb_ary_delete_at(@array, -5).should == nil
       @array.should == [1, 2, 3, 4]
     end
   end
@@ -473,7 +473,7 @@ def o.each
 
       it "returns the given array" do
         array = [1, 2, 3]
-        @s.rb_ary_to_ary(array).should equal(array)
+        @s.rb_ary_to_ary(array).should.equal?(array)
       end
 
     end
@@ -519,7 +519,7 @@ def o.each
     end
 
     it "returns nil if the begin index is out of bound" do
-      @s.rb_ary_subseq([1, 2, 3, 4, 5], 6, 3).should be_nil
+      @s.rb_ary_subseq([1, 2, 3, 4, 5], 6, 3).should == nil
     end
 
     it "returns the existing subsequence of the length is out of bounds" do
@@ -527,7 +527,7 @@ def o.each
     end
 
     it "returns nil if the size is negative" do
-      @s.rb_ary_subseq([1, 2, 3, 4, 5], 1, -1).should be_nil
+      @s.rb_ary_subseq([1, 2, 3, 4, 5], 1, -1).should == nil
     end
   end
 end
diff --git a/spec/ruby/optional/capi/bignum_spec.rb b/spec/ruby/optional/capi/bignum_spec.rb
index 179f053eec4..ae7552b3f5f 100644
--- a/spec/ruby/optional/capi/bignum_spec.rb
+++ b/spec/ruby/optional/capi/bignum_spec.rb
@@ -35,8 +35,8 @@ def ensure_bignum(n)
     end
 
     it "raises RangeError if passed Bignum overflow long" do
-      -> { @s.rb_big2long(ensure_bignum(@max_long + 1)) }.should raise_error(RangeError)
-      -> { @s.rb_big2long(ensure_bignum(@min_long - 1)) }.should raise_error(RangeError)
+      -> { @s.rb_big2long(ensure_bignum(@max_long + 1)) }.should.raise(RangeError)
+      -> { @s.rb_big2long(ensure_bignum(@min_long - 1)) }.should.raise(RangeError)
     end
   end
 
@@ -49,8 +49,8 @@ def ensure_bignum(n)
     end
 
     it "raises RangeError if passed Bignum overflow long" do
-      -> { @s.rb_big2ll(ensure_bignum(@max_long << 40)) }.should raise_error(RangeError)
-      -> { @s.rb_big2ll(ensure_bignum(@min_long << 40)) }.should raise_error(RangeError)
+      -> { @s.rb_big2ll(ensure_bignum(@max_long << 40)) }.should.raise(RangeError)
+      -> { @s.rb_big2ll(ensure_bignum(@min_long << 40)) }.should.raise(RangeError)
     end
   end
 
@@ -67,8 +67,8 @@ def ensure_bignum(n)
     end
 
     it "raises RangeError if passed Bignum overflow long" do
-      -> { @s.rb_big2ulong(ensure_bignum(@max_ulong + 1)) }.should raise_error(RangeError)
-      -> { @s.rb_big2ulong(ensure_bignum(@min_long - 1)) }.should raise_error(RangeError)
+      -> { @s.rb_big2ulong(ensure_bignum(@max_ulong + 1)) }.should.raise(RangeError)
+      -> { @s.rb_big2ulong(ensure_bignum(@min_long - 1)) }.should.raise(RangeError)
     end
   end
 
@@ -214,13 +214,13 @@ def ensure_bignum(n)
     it "raises FloatDomainError for Infinity values" do
       inf = 1.0 / 0
 
-      -> { @s.rb_dbl2big(inf) }.should raise_error(FloatDomainError)
+      -> { @s.rb_dbl2big(inf) }.should.raise(FloatDomainError)
     end
 
     it "raises FloatDomainError for NaN values" do
       nan = 0.0 / 0
 
-      -> { @s.rb_dbl2big(nan) }.should raise_error(FloatDomainError)
+      -> { @s.rb_dbl2big(nan) }.should.raise(FloatDomainError)
     end
   end
 end
diff --git a/spec/ruby/optional/capi/binding_spec.rb b/spec/ruby/optional/capi/binding_spec.rb
index 5d0ef2efb87..1edd20b8f32 100644
--- a/spec/ruby/optional/capi/binding_spec.rb
+++ b/spec/ruby/optional/capi/binding_spec.rb
@@ -10,7 +10,7 @@
   describe "Kernel#binding" do
     it "raises when called from C" do
       foo = 14
-      -> { @b.get_binding }.should raise_error(RuntimeError)
+      -> { @b.get_binding }.should.raise(RuntimeError)
     end
   end
 end
diff --git a/spec/ruby/optional/capi/class_spec.rb b/spec/ruby/optional/capi/class_spec.rb
index 7abb5d4ed95..07e9e42ad10 100644
--- a/spec/ruby/optional/capi/class_spec.rb
+++ b/spec/ruby/optional/capi/class_spec.rb
@@ -11,8 +11,8 @@
 
 describe :rb_path_to_class, shared: true do
   it "returns a class or module from a scoped String" do
-    @s.send(@method, "CApiClassSpecs::A::B").should equal(CApiClassSpecs::A::B)
-    @s.send(@method, "CApiClassSpecs::A::M").should equal(CApiClassSpecs::A::M)
+    @s.send(@method, "CApiClassSpecs::A::B").should.equal?(CApiClassSpecs::A::B)
+    @s.send(@method, "CApiClassSpecs::A::M").should.equal?(CApiClassSpecs::A::M)
   end
 
   it "resolves autoload constants" do
@@ -20,21 +20,21 @@
   end
 
   it "raises an ArgumentError if a constant in the path does not exist" do
-    -> { @s.send(@method, "CApiClassSpecs::NotDefined::B") }.should raise_error(ArgumentError)
+    -> { @s.send(@method, "CApiClassSpecs::NotDefined::B") }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if the final constant does not exist" do
-    -> { @s.send(@method, "CApiClassSpecs::NotDefined") }.should raise_error(ArgumentError)
+    -> { @s.send(@method, "CApiClassSpecs::NotDefined") }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if the constant is not a class or module" do
     -> {
       @s.send(@method, "CApiClassSpecs::A::C")
-    }.should raise_error(TypeError, 'CApiClassSpecs::A::C does not refer to class/module')
+    }.should.raise(TypeError, 'CApiClassSpecs::A::C does not refer to class/module')
   end
 
   it "raises an ArgumentError even if a constant in the path exists on toplevel" do
-    -> { @s.send(@method, "CApiClassSpecs::Object") }.should raise_error(ArgumentError)
+    -> { @s.send(@method, "CApiClassSpecs::Object") }.should.raise(ArgumentError)
   end
 end
 
@@ -46,29 +46,31 @@
   describe "rb_class_instance_methods" do
     it "returns the public and protected methods of self and its ancestors" do
       methods = @s.rb_class_instance_methods(ModuleSpecs::Basic)
-      methods.should include(:protected_module, :public_module)
+      methods.should.include?(:protected_module)
+      methods.should.include?(:public_module)
 
       methods = @s.rb_class_instance_methods(ModuleSpecs::Basic, true)
-      methods.should include(:protected_module, :public_module)
+      methods.should.include?(:protected_module)
+      methods.should.include?(:public_module)
     end
 
     it "when passed false as a parameter, returns the instance methods of the class" do
       methods = @s.rb_class_instance_methods(ModuleSpecs::Child, false)
-      methods.should include(:protected_child, :public_child)
+      methods.to_set.should >= Set[:protected_child, :public_child]
     end
   end
 
   describe "rb_class_public_instance_methods" do
     it "returns a list of public methods in module and its ancestors" do
       methods = @s.rb_class_public_instance_methods(ModuleSpecs::CountsChild)
-      methods.should include(:public_3)
-      methods.should include(:public_2)
-      methods.should include(:public_1)
+      methods.should.include?(:public_3)
+      methods.should.include?(:public_2)
+      methods.should.include?(:public_1)
 
       methods = @s.rb_class_public_instance_methods(ModuleSpecs::CountsChild, true)
-      methods.should include(:public_3)
-      methods.should include(:public_2)
-      methods.should include(:public_1)
+      methods.should.include?(:public_3)
+      methods.should.include?(:public_2)
+      methods.should.include?(:public_1)
     end
 
     it "when passed false as a parameter, should return only methods defined in that module" do
@@ -79,14 +81,14 @@
   describe "rb_class_protected_instance_methods" do
     it "returns a list of protected methods in module and its ancestors" do
       methods = @s.rb_class_protected_instance_methods(ModuleSpecs::CountsChild)
-      methods.should include(:protected_3)
-      methods.should include(:protected_2)
-      methods.should include(:protected_1)
+      methods.should.include?(:protected_3)
+      methods.should.include?(:protected_2)
+      methods.should.include?(:protected_1)
 
       methods = @s.rb_class_protected_instance_methods(ModuleSpecs::CountsChild, true)
-      methods.should include(:protected_3)
-      methods.should include(:protected_2)
-      methods.should include(:protected_1)
+      methods.should.include?(:protected_3)
+      methods.should.include?(:protected_2)
+      methods.should.include?(:protected_1)
     end
 
     it "when passed false as a parameter, should return only methods defined in that module" do
@@ -110,7 +112,7 @@
     it "allocates and initializes a new object" do
       o = @s.rb_class_new_instance([], CApiClassSpecs::Alloc)
       o.class.should == CApiClassSpecs::Alloc
-      o.initialized.should be_true
+      o.initialized.should == true
     end
 
     it "passes arguments to the #initialize method" do
@@ -133,7 +135,7 @@
     it "raises TypeError if the last argument is not a Hash" do
       -> {
         @s.rb_class_new_instance_kw([42], CApiClassSpecs::KeywordAlloc)
-      }.should raise_error(TypeError, 'no implicit conversion of Integer into Hash')
+      }.should.raise(TypeError, 'no implicit conversion of Integer into Hash')
     end
   end
 
@@ -141,9 +143,9 @@
     it "includes a module into a class" do
       c = Class.new
       o = c.new
-      -> { o.included? }.should raise_error(NameError)
+      -> { o.included? }.should.raise(NameError)
       @s.rb_include_module(c, CApiClassSpecs::M)
-      o.included?.should be_true
+      o.included?.should == true
     end
   end
 
@@ -155,12 +157,12 @@
     it "defines an attr_reader when passed true, false" do
       @s.rb_define_attr(CApiClassSpecs::Attr, :foo, true, false)
       @a.foo.should == 1
-      -> { @a.foo = 5 }.should raise_error(NameError)
+      -> { @a.foo = 5 }.should.raise(NameError)
     end
 
     it "defines an attr_writer when passed false, true" do
       @s.rb_define_attr(CApiClassSpecs::Attr, :bar, false, true)
-      -> { @a.bar }.should raise_error(NameError)
+      -> { @a.bar }.should.raise(NameError)
       @a.bar = 5
       @a.instance_variable_get(:@bar).should == 5
     end
@@ -183,7 +185,7 @@
     it "calls the method in the superclass with the correct self" do
       @s.define_call_super_method CApiClassSpecs::SubSelf, "call_super_method"
       obj = CApiClassSpecs::SubSelf.new
-      obj.call_super_method.should equal obj
+      obj.call_super_method.should.equal? obj
     end
 
     it "calls the method in the superclass through two native levels" do
@@ -200,7 +202,7 @@
     end
 
     it "returns a string for an anonymous class" do
-      @s.rb_class2name(Class.new).should be_kind_of(String)
+      @s.rb_class2name(Class.new).should.is_a?(String)
     end
 
     it "returns a string beginning with # for an anonymous class" do
@@ -224,7 +226,7 @@
     end
 
     it "returns a string for an anonymous class" do
-      @s.rb_class_name(Class.new).should be_kind_of(String)
+      @s.rb_class_name(Class.new).should.is_a?(String)
     end
   end
 
@@ -238,22 +240,22 @@
 
   describe "rb_cvar_defined" do
     it "returns false when the class variable is not defined" do
-      @s.rb_cvar_defined(CApiClassSpecs::CVars, "@@nocvar").should be_false
+      @s.rb_cvar_defined(CApiClassSpecs::CVars, "@@nocvar").should == false
     end
 
     it "returns true when the class variable is defined" do
-      @s.rb_cvar_defined(CApiClassSpecs::CVars, "@@cvar").should be_true
+      @s.rb_cvar_defined(CApiClassSpecs::CVars, "@@cvar").should == true
     end
 
     it "returns true if the class instance variable is defined" do
-      @s.rb_cvar_defined(CApiClassSpecs::CVars, "@c_ivar").should be_true
+      @s.rb_cvar_defined(CApiClassSpecs::CVars, "@c_ivar").should == true
     end
   end
 
   describe "rb_cv_set" do
     it "sets a class variable" do
       o = CApiClassSpecs::CVars.new
-      o.new_cv.should be_nil
+      o.new_cv.should == nil
       @s.rb_cv_set(CApiClassSpecs::CVars, "@@new_cv", 1)
       o.new_cv.should == 1
       CApiClassSpecs::CVars.remove_class_variable :@@new_cv
@@ -268,14 +270,14 @@
     it "raises a NameError if the class variable is not defined" do
       -> {
         @s.rb_cv_get(CApiClassSpecs::CVars, "@@no_cvar")
-      }.should raise_error(NameError, /class variable @@no_cvar/)
+      }.should.raise(NameError, /class variable @@no_cvar/)
     end
   end
 
   describe "rb_cvar_set" do
     it "sets a class variable" do
       o = CApiClassSpecs::CVars.new
-      o.new_cvar.should be_nil
+      o.new_cvar.should == nil
       @s.rb_cvar_set(CApiClassSpecs::CVars, "@@new_cvar", 1)
       o.new_cvar.should == 1
       CApiClassSpecs::CVars.remove_class_variable :@@new_cvar
@@ -289,8 +291,8 @@
     end
 
     it "creates a subclass of the superclass" do
-      @cls.should be_kind_of(Class)
-      ClassSpecDefineClass.should equal(@cls)
+      @cls.should.is_a?(Class)
+      ClassSpecDefineClass.should.equal?(@cls)
       @cls.superclass.should == CApiClassSpecs::Super
     end
 
@@ -307,19 +309,19 @@
     it "raises a TypeError when given a non class object to superclass" do
       -> {
         @s.rb_define_class("ClassSpecDefineClass3", Module.new)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
     it "raises a TypeError when given a mismatched class to superclass" do
       -> {
         @s.rb_define_class("ClassSpecDefineClass", Object)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
     it "raises a ArgumentError when given NULL as superclass" do
       -> {
         @s.rb_define_class("ClassSpecDefineClass4", nil)
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
 
     it "allows arbitrary names, including constant names not valid in Ruby" do
@@ -328,7 +330,7 @@
 
       -> {
         Object.const_get(cls.name)
-      }.should raise_error(NameError, /wrong constant name/)
+      }.should.raise(NameError, /wrong constant name/)
     end
   end
 
@@ -337,8 +339,8 @@
       cls = @s.rb_define_class_under(CApiClassSpecs,
                                      "ClassUnder1",
                                      CApiClassSpecs::Super)
-      cls.should be_kind_of(Class)
-      CApiClassSpecs::Super.should be_ancestor_of(CApiClassSpecs::ClassUnder1)
+      cls.should.is_a?(Class)
+      CApiClassSpecs::ClassUnder1.ancestors.should.include?(CApiClassSpecs::Super)
     end
 
     it "sets the class name" do
@@ -356,7 +358,7 @@
       -> { @s.rb_define_class_under(CApiClassSpecs,
                                         "ClassUnder5",
                                         Module.new)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
     it "raises a TypeError when given a mismatched class to superclass" do
@@ -364,7 +366,7 @@
       -> { @s.rb_define_class_under(CApiClassSpecs,
                                         "ClassUnder6",
                                         Class.new)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     ensure
       CApiClassSpecs.send(:remove_const, :ClassUnder6)
     end
@@ -374,7 +376,7 @@
     end
 
     it "raises a TypeError if class is defined and its superclass mismatches the given one" do
-      -> { @s.rb_define_class_under(CApiClassSpecs, "Sub", Object) }.should raise_error(TypeError)
+      -> { @s.rb_define_class_under(CApiClassSpecs, "Sub", Object) }.should.raise(TypeError)
     end
 
     it "allows arbitrary names, including constant names not valid in Ruby" do
@@ -383,15 +385,15 @@
 
       -> {
         CApiClassSpecs.const_get(cls.name)
-      }.should raise_error(NameError, /wrong constant name/)
+      }.should.raise(NameError, /wrong constant name/)
     end
   end
 
   describe "rb_define_class_id_under" do
     it "creates a subclass of the superclass contained in a module" do
       cls = @s.rb_define_class_id_under(CApiClassSpecs, :ClassIdUnder1, CApiClassSpecs::Super)
-      cls.should be_kind_of(Class)
-      CApiClassSpecs::Super.should be_ancestor_of(CApiClassSpecs::ClassIdUnder1)
+      cls.should.is_a?(Class)
+      CApiClassSpecs::ClassIdUnder1.ancestors.should.include?(CApiClassSpecs::Super)
     end
 
     it "sets the class name" do
@@ -410,7 +412,7 @@
     end
 
     it "raises a TypeError if class is defined and its superclass mismatches the given one" do
-      -> { @s.rb_define_class_id_under(CApiClassSpecs, :Sub, Object) }.should raise_error(TypeError)
+      -> { @s.rb_define_class_id_under(CApiClassSpecs, :Sub, Object) }.should.raise(TypeError)
     end
 
     it "allows arbitrary names, including constant names not valid in Ruby" do
@@ -419,14 +421,14 @@
 
       -> {
         CApiClassSpecs.const_get(cls.name)
-      }.should raise_error(NameError, /wrong constant name/)
+      }.should.raise(NameError, /wrong constant name/)
     end
   end
 
   describe "rb_define_class_variable" do
     it "sets a class variable" do
       o = CApiClassSpecs::CVars.new
-      o.rbdcv_cvar.should be_nil
+      o.rbdcv_cvar.should == nil
       @s.rb_define_class_variable(CApiClassSpecs::CVars, "@@rbdcv_cvar", 1)
       o.rbdcv_cvar.should == 1
       CApiClassSpecs::CVars.remove_class_variable :@@rbdcv_cvar
@@ -441,23 +443,23 @@
     it "raises a NameError if the class variable is not defined" do
       -> {
         @s.rb_cvar_get(CApiClassSpecs::CVars, "@@no_cvar")
-      }.should raise_error(NameError, /class variable @@no_cvar/)
+      }.should.raise(NameError, /class variable @@no_cvar/)
     end
   end
 
   describe "rb_class_new" do
     it "returns a new subclass of the superclass" do
       subclass = @s.rb_class_new(CApiClassSpecs::NewClass)
-      CApiClassSpecs::NewClass.should be_ancestor_of(subclass)
+      subclass.ancestors.should.include?(CApiClassSpecs::NewClass)
     end
 
     it "raises a TypeError if passed Class as the superclass" do
-      -> { @s.rb_class_new(Class) }.should raise_error(TypeError)
+      -> { @s.rb_class_new(Class) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if passed a singleton class as the superclass" do
       metaclass = Object.new.singleton_class
-      -> { @s.rb_class_new(metaclass) }.should raise_error(TypeError)
+      -> { @s.rb_class_new(metaclass) }.should.raise(TypeError)
     end
   end
 
@@ -468,7 +470,7 @@
     end
 
     it "returns nil if the class has no superclass" do
-      @s.rb_class_superclass(BasicObject).should be_nil
+      @s.rb_class_superclass(BasicObject).should == nil
     end
   end
 
diff --git a/spec/ruby/optional/capi/constants_spec.rb b/spec/ruby/optional/capi/constants_spec.rb
index 172d10a788e..74584690ad4 100644
--- a/spec/ruby/optional/capi/constants_spec.rb
+++ b/spec/ruby/optional/capi/constants_spec.rb
@@ -199,7 +199,7 @@
 
   specify "rb_eFatal references the fatal class" do
     fatal = @s.rb_eFatal
-    fatal.should be_kind_of(Class)
+    fatal.should.is_a?(Class)
     fatal.should < Exception
   end
 
diff --git a/spec/ruby/optional/capi/data_spec.rb b/spec/ruby/optional/capi/data_spec.rb
index d000eba6e31..af1da10f483 100644
--- a/spec/ruby/optional/capi/data_spec.rb
+++ b/spec/ruby/optional/capi/data_spec.rb
@@ -32,7 +32,7 @@
       end
 
       it "raises a TypeError if the object does not wrap a struct" do
-        -> { @s.get_struct(Object.new) }.should raise_error(TypeError)
+        -> { @s.get_struct(Object.new) }.should.raise(TypeError)
       end
     end
 
diff --git a/spec/ruby/optional/capi/debug_spec.rb b/spec/ruby/optional/capi/debug_spec.rb
index 14ba25609c5..547b24cfcc7 100644
--- a/spec/ruby/optional/capi/debug_spec.rb
+++ b/spec/ruby/optional/capi/debug_spec.rb
@@ -9,7 +9,7 @@
 
   describe "rb_debug_inspector_open" do
     it "creates a debug context and calls the given callback" do
-      @o.rb_debug_inspector_open(42).should be_kind_of(Array)
+      @o.rb_debug_inspector_open(42).should.is_a?(Array)
       @o.debug_spec_callback_data.should == 42
     end
   end
@@ -31,7 +31,7 @@
     it "returns the current binding" do
       a = "test"
       b = @o.rb_debug_inspector_frame_binding_get(1)
-      b.should be_an_instance_of(Binding)
+      b.should.instance_of?(Binding)
       b.local_variable_get(:a).should == "test"
     end
 
@@ -55,7 +55,7 @@
   describe "rb_debug_inspector_frame_iseq_get" do
     it "returns an InstructionSequence" do
       if defined?(RubyVM::InstructionSequence)
-        @o.rb_debug_inspector_frame_iseq_get(1).should be_an_instance_of(RubyVM::InstructionSequence)
+        @o.rb_debug_inspector_frame_iseq_get(1).should.instance_of?(RubyVM::InstructionSequence)
       else
         @o.rb_debug_inspector_frame_iseq_get(1).should == nil
       end
@@ -66,9 +66,9 @@
     it "returns an array of Thread::Backtrace::Location" do
       bts = @o.rb_debug_inspector_backtrace_locations
       bts.should_not.empty?
-      bts.each { |bt| bt.should be_kind_of(Thread::Backtrace::Location) }
+      bts.each { |bt| bt.should.is_a?(Thread::Backtrace::Location) }
       location = "#{__FILE__}:#{__LINE__ - 3}"
-      bts[1].to_s.should include(location)
+      bts[1].to_s.should.include?(location)
     end
   end
 end
diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb
index 734b5f12538..b77a967b1e1 100644
--- a/spec/ruby/optional/capi/encoding_spec.rb
+++ b/spec/ruby/optional/capi/encoding_spec.rb
@@ -36,7 +36,7 @@
     obj = Object.new
     -> {
       result = @s.send(@method, obj, 1)
-    }.should raise_error(ArgumentError, "cannot set encoding on non-encoding capable object")
+    }.should.raise(ArgumentError, "cannot set encoding on non-encoding capable object")
   end
 end
 
@@ -165,7 +165,7 @@
 
   describe "rb_enc_from_index" do
     it "returns an Encoding" do
-      @s.rb_enc_from_index(0).should be_an_instance_of(String)
+      @s.rb_enc_from_index(0).should.instance_of?(String)
     end
   end
 
@@ -298,7 +298,7 @@
     it "returns a String in US-ASCII encoding when high bits are set" do
       xEE = [0xEE].pack('C').force_encoding('utf-8')
       result = @s.rb_enc_str_new(xEE, 1, Encoding::US_ASCII)
-      result.encoding.should equal(Encoding::US_ASCII)
+      result.encoding.should.equal?(Encoding::US_ASCII)
     end
   end
 
@@ -389,12 +389,12 @@
     it "returns true if the object encoding is only ASCII" do
       str = "abc".force_encoding("us-ascii")
       str.valid_encoding? # make sure to set the coderange
-      @s.ENC_CODERANGE_ASCIIONLY(str).should be_true
+      @s.ENC_CODERANGE_ASCIIONLY(str).should == true
     end
 
     it "returns false if the object encoding is not ASCII only" do
       str = "ありがとう".force_encoding("utf-8")
-      @s.ENC_CODERANGE_ASCIIONLY(str).should be_false
+      @s.ENC_CODERANGE_ASCIIONLY(str).should == false
     end
   end
 
@@ -421,7 +421,7 @@
     describe "when the rb_encoding struct is stored in native memory" do
       it "can still read the name of the encoding" do
         address = @s.rb_to_encoding_native_store(Encoding::UTF_8)
-        address.should be_kind_of(Integer)
+        address.should.is_a?(Integer)
         @s.rb_to_encoding_native_name(address).should == "UTF-8"
       end
     end
@@ -452,7 +452,7 @@
   describe "rb_enc_compatible" do
     it "returns 0 if the encodings of the Strings are not compatible" do
       a = [0xff].pack('C').force_encoding "binary"
-      b = "\u3042".encode("utf-8")
+      b = "あ"
       @s.rb_enc_compatible(a, b).should == 0
     end
 
@@ -461,11 +461,25 @@
     # Encoding.compatible?
     it "returns the same value as Encoding.compatible? if the Strings have a compatible encoding" do
       a = "abc".force_encoding("us-ascii")
-      b = "\u3042".encode("utf-8")
+      b = "あ"
       @s.rb_enc_compatible(a, b).should == Encoding.compatible?(a, b)
     end
   end
 
+  describe "rb_enc_check" do
+    it "returns the compatible encoding of the two Strings" do
+      a = "abc".force_encoding("us-ascii")
+      b = "あ"
+      @s.rb_enc_check(a, b).should == Encoding::UTF_8
+    end
+
+    it "raises Encoding::CompatibilityError if the encodings are not compatible" do
+      a = [0xff].pack('C').b
+      b = "あ"
+      -> { @s.rb_enc_check(a, b) }.should.raise(Encoding::CompatibilityError)
+    end
+  end
+
   describe "rb_enc_copy" do
     before :each do
       @obj = "rb_enc_copy".encode(Encoding::US_ASCII)
@@ -475,12 +489,20 @@
       @s.rb_enc_copy("string", @obj).encoding.should == Encoding::US_ASCII
     end
 
-    it "raises a RuntimeError if the second argument is a Symbol" do
-      -> { @s.rb_enc_copy(:symbol, @obj) }.should raise_error(RuntimeError)
+    it "raises a RuntimeError if the first argument is a Symbol" do
+      -> { @s.rb_enc_copy(:symbol, @obj) }.should.raise(RuntimeError)
     end
 
-    it "sets the encoding of a Regexp to that of the second argument" do
-      @s.rb_enc_copy(/regexp/.dup, @obj).encoding.should == Encoding::US_ASCII
+    ruby_version_is "4.1" do
+      it "raises a FrozenError if the first argument is a Regexp" do
+        -> { @s.rb_enc_copy(/regexp/.dup, @obj) }.should.raise(FrozenError)
+      end
+    end
+
+    ruby_version_is ""..."4.1" do
+      it "sets the encoding of a Regexp to that of the second argument" do
+        @s.rb_enc_copy(/regexp/.dup, @obj).encoding.should == Encoding::US_ASCII
+      end
     end
   end
 
@@ -495,7 +517,7 @@
 
     it "returns 0 if Encoding.default_internal is nil" do
       Encoding.default_internal = nil
-      @s.rb_default_internal_encoding.should be_nil
+      @s.rb_default_internal_encoding.should == nil
     end
 
     it "returns the encoding for Encoding.default_internal" do
@@ -527,11 +549,19 @@
     end
 
     it "raises a RuntimeError if the argument is Symbol" do
-      -> { @s.rb_enc_associate(:symbol, "US-ASCII") }.should raise_error(RuntimeError)
+      -> { @s.rb_enc_associate(:symbol, "US-ASCII") }.should.raise(RuntimeError)
     end
 
-    it "sets the encoding of a Regexp to the encoding" do
-      @s.rb_enc_associate(/regexp/.dup, "BINARY").encoding.should == Encoding::BINARY
+    ruby_version_is "4.1" do
+      it "raises a FrozenError if the argument is a Regexp" do
+        -> { @s.rb_enc_associate(/regexp/.dup, "BINARY") }.should.raise(FrozenError)
+      end
+    end
+
+    ruby_version_is ""..."4.1" do
+      it "sets the encoding of a Regexp to the encoding" do
+        @s.rb_enc_associate(/regexp/.dup, "BINARY").encoding.should == Encoding::BINARY
+      end
     end
 
     it "sets the encoding of a String to a default when the encoding is NULL" do
@@ -546,15 +576,24 @@
       enc.should == Encoding::BINARY
     end
 
-    it "sets the encoding of a Regexp to the encoding" do
-      index = @s.rb_enc_find_index("UTF-8")
-      enc = @s.rb_enc_associate_index(/regexp/.dup, index).encoding
-      enc.should == Encoding::UTF_8
+    ruby_version_is "4.1" do
+      it "raises a FrozenError if the argument is a Regexp" do
+        index = @s.rb_enc_find_index("UTF-8")
+        -> { @s.rb_enc_associate_index(/regexp/.dup, index) }.should.raise(FrozenError)
+      end
+    end
+
+    ruby_version_is ""..."4.1" do
+      it "sets the encoding of a Regexp to the encoding" do
+        index = @s.rb_enc_find_index("UTF-8")
+        enc = @s.rb_enc_associate_index(/regexp/.dup, index).encoding
+        enc.should == Encoding::UTF_8
+      end
     end
 
     it "sets the encoding of a Symbol to the encoding" do
       index = @s.rb_enc_find_index("UTF-8")
-      -> { @s.rb_enc_associate_index(:symbol, index) }.should raise_error(RuntimeError)
+      -> { @s.rb_enc_associate_index(:symbol, index) }.should.raise(RuntimeError)
     end
   end
 
@@ -610,13 +649,13 @@
     it "raises ArgumentError if an empty string is given" do
       -> do
         @s.rb_enc_codepoint_len("")
-      end.should raise_error(ArgumentError)
+      end.should.raise(ArgumentError)
     end
 
     it "raises ArgumentError if an invalid byte sequence is given" do
       -> do
         @s.rb_enc_codepoint_len([0xa0, 0xa1].pack('CC').force_encoding('utf-8')) # Invalid sequence identifier
-      end.should raise_error(ArgumentError)
+      end.should.raise(ArgumentError)
     end
 
     it "returns codepoint 0x24 and length 1 for character '$'" do
@@ -650,11 +689,11 @@
 
   describe "rb_enc_str_asciionly_p" do
     it "returns true for an ASCII string" do
-      @s.rb_enc_str_asciionly_p("hello").should be_true
+      @s.rb_enc_str_asciionly_p("hello").should == true
     end
 
     it "returns false for a non-ASCII string" do
-      @s.rb_enc_str_asciionly_p("hüllo").should be_false
+      @s.rb_enc_str_asciionly_p("hüllo").should == false
     end
   end
 
@@ -664,7 +703,7 @@
 
       -> {
         @s.rb_enc_raise(Encoding::UTF_8, RuntimeError, utf_8_incompatible_string)
-      }.should raise_error { |e|
+      }.should.raise { |e|
         e.message.encoding.should == Encoding::UTF_8
         e.message.valid_encoding?.should == false
         e.message.bytes.should == utf_8_incompatible_string.bytes
diff --git a/spec/ruby/optional/capi/exception_spec.rb b/spec/ruby/optional/capi/exception_spec.rb
index 5bc8e26c624..429da093d1a 100644
--- a/spec/ruby/optional/capi/exception_spec.rb
+++ b/spec/ruby/optional/capi/exception_spec.rb
@@ -28,13 +28,13 @@
   describe "rb_exc_raise" do
     it "raises passed exception" do
       runtime_error = RuntimeError.new '42'
-      -> { @s.rb_exc_raise(runtime_error) }.should raise_error(RuntimeError, '42')
+      -> { @s.rb_exc_raise(runtime_error) }.should.raise(RuntimeError, '42')
     end
 
     it "raises an exception with an empty backtrace" do
       runtime_error = RuntimeError.new '42'
       runtime_error.set_backtrace []
-      -> { @s.rb_exc_raise(runtime_error) }.should raise_error(RuntimeError, '42')
+      -> { @s.rb_exc_raise(runtime_error) }.should.raise(RuntimeError, '42')
     end
 
     it "sets $! to the raised exception when not rescuing from an another exception" do
@@ -88,15 +88,15 @@
     end
 
     it "accepts nil" do
-      @s.rb_set_errinfo(nil).should be_nil
+      @s.rb_set_errinfo(nil).should == nil
     end
 
     it "accepts an Exception instance" do
-      @s.rb_set_errinfo(Exception.new).should be_nil
+      @s.rb_set_errinfo(Exception.new).should == nil
     end
 
     it "raises a TypeError if the object is not nil or an Exception instance" do
-      -> { @s.rb_set_errinfo("error") }.should raise_error(TypeError)
+      -> { @s.rb_set_errinfo("error") }.should.raise(TypeError)
     end
   end
 
@@ -104,8 +104,8 @@
     it "raises a FrozenError regardless of the object's frozen state" do
       # The type of the argument we supply doesn't matter. The choice here is arbitrary and we only change the type
       # of the argument to ensure the exception messages are set correctly.
-      -> { @s.rb_error_frozen_object(Array.new) }.should raise_error(FrozenError, "can't modify frozen Array: []")
-      -> { @s.rb_error_frozen_object(Array.new.freeze) }.should raise_error(FrozenError, "can't modify frozen Array: []")
+      -> { @s.rb_error_frozen_object(Array.new) }.should.raise(FrozenError, "can't modify frozen Array: []")
+      -> { @s.rb_error_frozen_object(Array.new.freeze) }.should.raise(FrozenError, "can't modify frozen Array: []")
     end
 
     it "properly handles recursive rb_error_frozen_object calls" do
@@ -116,7 +116,7 @@
         s.rb_error_frozen_object(object)
       end
 
-      -> { @s.rb_error_frozen_object(object) }.should raise_error(FrozenError, "can't modify frozen #{klass}:  ...")
+      -> { @s.rb_error_frozen_object(object) }.should.raise(FrozenError, "can't modify frozen #{klass}:  ...")
     end
   end
 
@@ -124,14 +124,14 @@
     it "returns system error with default message when passed message is NULL" do
       exception = @s.rb_syserr_new(Errno::ENOENT::Errno, nil)
       exception.class.should == Errno::ENOENT
-      exception.message.should include("No such file or directory")
+      exception.message.should.include?("No such file or directory")
       exception.should.is_a?(SystemCallError)
     end
 
     it "returns system error with custom message" do
       exception = @s.rb_syserr_new(Errno::ENOENT::Errno, "custom message")
 
-      exception.message.should include("custom message")
+      exception.message.should.include?("custom message")
       exception.class.should == Errno::ENOENT
       exception.should.is_a?(SystemCallError)
     end
@@ -141,14 +141,14 @@
     it "returns system error with default message when passed message is nil" do
       exception = @s.rb_syserr_new_str(Errno::ENOENT::Errno, nil)
 
-      exception.message.should include("No such file or directory")
+      exception.message.should.include?("No such file or directory")
       exception.class.should == Errno::ENOENT
       exception.should.is_a?(SystemCallError)
     end
 
     it "returns system error with custom message" do
       exception = @s.rb_syserr_new_str(Errno::ENOENT::Errno, "custom message")
-      exception.message.should include("custom message")
+      exception.message.should.include?("custom message")
       exception.class.should == Errno::ENOENT
       exception.should.is_a?(SystemCallError)
     end
@@ -181,17 +181,17 @@
     end
 
     it "raises a TypeError for incorrect types" do
-      -> { @s.rb_make_exception([nil]) }.should raise_error(TypeError)
-      -> { @s.rb_make_exception([Object.new]) }.should raise_error(TypeError)
+      -> { @s.rb_make_exception([nil]) }.should.raise(TypeError)
+      -> { @s.rb_make_exception([Object.new]) }.should.raise(TypeError)
       obj = Object.new
       def obj.exception
         "not exception type"
       end
-      -> { @s.rb_make_exception([obj]) }.should raise_error(TypeError)
+      -> { @s.rb_make_exception([obj]) }.should.raise(TypeError)
     end
 
     it "raises an ArgumentError for too many arguments" do
-      -> { @s.rb_make_exception([Exception, "Message", ["backtrace 1"], "extra"])  }.should raise_error(ArgumentError)
+      -> { @s.rb_make_exception([Exception, "Message", ["backtrace 1"], "extra"])  }.should.raise(ArgumentError)
     end
 
     it "returns nil for empty arguments" do
diff --git a/spec/ruby/optional/capi/ext/encoding_spec.c b/spec/ruby/optional/capi/ext/encoding_spec.c
index 98d4e2e3b77..2038a5d4a85 100644
--- a/spec/ruby/optional/capi/ext/encoding_spec.c
+++ b/spec/ruby/optional/capi/ext/encoding_spec.c
@@ -91,6 +91,11 @@ static VALUE encoding_spec_rb_enc_compatible(VALUE self, VALUE a, VALUE b) {
   return rb_enc_from_encoding(enc);
 }
 
+static VALUE encoding_spec_rb_enc_check(VALUE self, VALUE a, VALUE b) {
+  rb_encoding* enc = rb_enc_check(a, b);
+  return rb_enc_from_encoding(enc);
+}
+
 static VALUE encoding_spec_rb_enc_copy(VALUE self, VALUE dest, VALUE src) {
   rb_enc_copy(dest, src);
   return dest;
@@ -353,6 +358,7 @@ void Init_encoding_spec(void) {
   rb_define_method(cls, "rb_enc_associate", encoding_spec_rb_enc_associate, 2);
   rb_define_method(cls, "rb_enc_associate_index", encoding_spec_rb_enc_associate_index, 2);
   rb_define_method(cls, "rb_enc_compatible", encoding_spec_rb_enc_compatible, 2);
+  rb_define_method(cls, "rb_enc_check", encoding_spec_rb_enc_check, 2);
   rb_define_method(cls, "rb_enc_copy", encoding_spec_rb_enc_copy, 2);
   rb_define_method(cls, "rb_enc_codelen", encoding_spec_rb_enc_codelen, 2);
   rb_define_method(cls, "rb_enc_strlen", encoding_spec_rb_enc_strlen, 3);
diff --git a/spec/ruby/optional/capi/ext/io_spec.c b/spec/ruby/optional/capi/ext/io_spec.c
index f3ede15729b..fe31cffb495 100644
--- a/spec/ruby/optional/capi/ext/io_spec.c
+++ b/spec/ruby/optional/capi/ext/io_spec.c
@@ -287,6 +287,18 @@ VALUE io_spec_rb_cloexec_open(VALUE self, VALUE path, VALUE flags, VALUE mode) {
   return rb_funcall(rb_cIO, rb_intern("for_fd"), 1, INT2FIX(fd));
 }
 
+VALUE io_spec_rb_cloexec_dup(VALUE self, VALUE io) {
+  int fd = io_spec_get_fd(io);
+  int new_fd = rb_cloexec_dup(fd);
+  return rb_funcall(rb_cIO, rb_intern("for_fd"), 1, INT2FIX(new_fd));
+}
+
+VALUE io_spec_rb_cloexec_fcntl_dupfd(VALUE self, VALUE io, VALUE minfd) {
+  int fd = io_spec_get_fd(io);
+  int new_fd = rb_cloexec_fcntl_dupfd(fd, FIX2INT(minfd));
+  return rb_funcall(rb_cIO, rb_intern("for_fd"), 1, INT2FIX(new_fd));
+}
+
 VALUE io_spec_rb_io_close(VALUE self, VALUE io) {
   return rb_io_close(io);
 }
@@ -319,13 +331,7 @@ static VALUE io_spec_errno_set(VALUE self, VALUE val) {
 
 VALUE io_spec_mode_sync_flag(VALUE self, VALUE io) {
   int mode;
-#ifdef RUBY_VERSION_IS_3_3
   mode = rb_io_mode(io);
-#else
-  rb_io_t *fp;
-  GetOpenFile(io, fp);
-  mode = fp->mode;
-#endif
   if (mode & FMODE_SYNC) {
     return Qtrue;
   } else {
@@ -333,7 +339,6 @@ VALUE io_spec_mode_sync_flag(VALUE self, VALUE io) {
   }
 }
 
-#if defined(RUBY_VERSION_IS_3_3) || defined(TRUFFLERUBY)
 static VALUE io_spec_rb_io_mode(VALUE self, VALUE io) {
   return INT2FIX(rb_io_mode(io));
 }
@@ -360,7 +365,6 @@ static VALUE io_spec_rb_io_open_descriptor(VALUE self, VALUE klass, VALUE descri
 static VALUE io_spec_rb_io_open_descriptor_without_encoding(VALUE self, VALUE klass, VALUE descriptor, VALUE mode, VALUE path, VALUE timeout) {
   return rb_io_open_descriptor(klass, FIX2INT(descriptor), FIX2INT(mode), path, timeout, NULL);
 }
-#endif
 
 void Init_io_spec(void) {
   VALUE cls = rb_define_class("CApiIOSpecs", rb_cObject);
@@ -391,9 +395,10 @@ void Init_io_spec(void) {
   rb_define_method(cls, "rb_io_binmode", io_spec_rb_io_binmode, 1);
   rb_define_method(cls, "rb_fd_fix_cloexec", io_spec_rb_fd_fix_cloexec, 1);
   rb_define_method(cls, "rb_cloexec_open", io_spec_rb_cloexec_open, 3);
+  rb_define_method(cls, "rb_cloexec_dup", io_spec_rb_cloexec_dup, 1);
+  rb_define_method(cls, "rb_cloexec_fcntl_dupfd", io_spec_rb_cloexec_fcntl_dupfd, 2);
   rb_define_method(cls, "errno=", io_spec_errno_set, 1);
   rb_define_method(cls, "rb_io_mode_sync_flag", io_spec_mode_sync_flag, 1);
-#if defined(RUBY_VERSION_IS_3_3) || defined(TRUFFLERUBY)
   rb_define_method(cls, "rb_io_mode", io_spec_rb_io_mode, 1);
   rb_define_method(cls, "rb_io_path", io_spec_rb_io_path, 1);
   rb_define_method(cls, "rb_io_closed_p", io_spec_rb_io_closed_p, 1);
@@ -404,7 +409,6 @@ void Init_io_spec(void) {
   rb_define_const(cls, "FMODE_BINMODE", INT2FIX(FMODE_BINMODE));
   rb_define_const(cls, "FMODE_TEXTMODE", INT2FIX(FMODE_TEXTMODE));
   rb_define_const(cls, "ECONV_UNIVERSAL_NEWLINE_DECORATOR", INT2FIX(ECONV_UNIVERSAL_NEWLINE_DECORATOR));
-#endif
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/rubyspec.h b/spec/ruby/optional/capi/ext/rubyspec.h
index 6c4bea5da0e..7107bead90e 100644
--- a/spec/ruby/optional/capi/ext/rubyspec.h
+++ b/spec/ruby/optional/capi/ext/rubyspec.h
@@ -43,8 +43,4 @@
 #define RUBY_VERSION_IS_3_4
 #endif
 
-#if RUBY_VERSION_SINCE(3, 3)
-#define RUBY_VERSION_IS_3_3
-#endif
-
 #endif
diff --git a/spec/ruby/optional/capi/ext/string_spec.c b/spec/ruby/optional/capi/ext/string_spec.c
index 74aa9e56e81..8291b73ea40 100644
--- a/spec/ruby/optional/capi/ext/string_spec.c
+++ b/spec/ruby/optional/capi/ext/string_spec.c
@@ -12,6 +12,13 @@
 extern "C" {
 #endif
 
+#ifdef PTR2NUM
+#elif SIZEOF_VOIDP <= SIZEOF_LONG
+# define PTR2NUM(x) (LONG2NUM((long)(x)))
+#elif SIZEOF_VOIDP <= SIZEOF_LONG_LONG
+# define PTR2NUM(x) (LL2NUM((LONG_LONG)(x)))
+#endif
+
 /* Make sure the RSTRING_PTR and the bytes are in native memory.
  * On TruffleRuby RSTRING_PTR and the bytes remain in managed memory
  * until they must be written to native memory.
@@ -296,6 +303,26 @@ VALUE string_spec_rb_str_substr(VALUE self, VALUE str, VALUE beg, VALUE len) {
   return rb_str_substr(str, FIX2INT(beg), FIX2INT(len));
 }
 
+VALUE string_spec_rb_str_subpos(VALUE self, VALUE str, VALUE beg) {
+  char* original = RSTRING_PTR(str);
+  char* end = RSTRING_END(str);
+  long len = rb_str_strlen(str);
+  char *p = rb_str_subpos(str, FIX2LONG(beg), &len);
+  if (p == NULL) {
+    return Qnil;
+  }
+
+  if (p >= original && p <= end) {
+    return rb_ary_new_from_args(2, LONG2FIX(p - RSTRING_PTR(str)), LONG2FIX(len));
+  } else {
+    rb_raise(rb_eRuntimeError, "the returned pointer is not inside the original string buffer");
+  }
+}
+
+VALUE string_spec_rb_str_sublen(VALUE self, VALUE str, VALUE pos) {
+  return LONG2FIX(rb_str_sublen(str, FIX2LONG(pos)));
+}
+
 VALUE string_spec_rb_str_to_str(VALUE self, VALUE arg) {
   return rb_str_to_str(arg);
 }
@@ -308,6 +335,11 @@ VALUE string_spec_RSTRING_LENINT(VALUE self, VALUE str) {
   return INT2FIX(RSTRING_LENINT(str));
 }
 
+VALUE string_spec_RSTRING_PTR(VALUE self, VALUE str) {
+  char* ptr = RSTRING_PTR(str);
+  return PTR2NUM(ptr);
+}
+
 VALUE string_spec_RSTRING_PTR_iterate(VALUE self, VALUE str) {
   int i;
   char* ptr;
@@ -393,6 +425,7 @@ VALUE string_spec_RSTRING_PTR_read(VALUE self, VALUE str, VALUE path) {
   if (read(fd, buffer, 30) < 0) {
     rb_syserr_fail(errno, "read");
   }
+  rb_str_set_len(str, 30);
 
   rb_str_modify_expand(str, 53);
   rb_ary_push(capacities, SIZET2NUM(rb_str_capacity(str)));
@@ -531,7 +564,10 @@ static VALUE string_spec_rb_str_modify(VALUE self, VALUE str) {
 }
 
 static VALUE string_spec_rb_utf8_str_new_static(VALUE self) {
-  return rb_utf8_str_new_static("nokogiri", 8);
+  const char* literal = "nokogiri";
+  return rb_ary_new_from_args(2,
+    rb_utf8_str_new_static("nokogiri", 8),
+    PTR2NUM(literal));
 }
 
 static VALUE string_spec_rb_utf8_str_new(VALUE self) {
@@ -645,9 +681,12 @@ void Init_string_spec(void) {
   rb_define_method(cls, "rb_str_split", string_spec_rb_str_split, 1);
   rb_define_method(cls, "rb_str_subseq", string_spec_rb_str_subseq, 3);
   rb_define_method(cls, "rb_str_substr", string_spec_rb_str_substr, 3);
+  rb_define_method(cls, "rb_str_subpos", string_spec_rb_str_subpos, 2);
+  rb_define_method(cls, "rb_str_sublen", string_spec_rb_str_sublen, 2);
   rb_define_method(cls, "rb_str_to_str", string_spec_rb_str_to_str, 1);
   rb_define_method(cls, "RSTRING_LEN", string_spec_RSTRING_LEN, 1);
   rb_define_method(cls, "RSTRING_LENINT", string_spec_RSTRING_LENINT, 1);
+  rb_define_method(cls, "RSTRING_PTR", string_spec_RSTRING_PTR, 1);
   rb_define_method(cls, "RSTRING_PTR_iterate", string_spec_RSTRING_PTR_iterate, 1);
   rb_define_method(cls, "RSTRING_PTR_iterate_uint32", string_spec_RSTRING_PTR_iterate_uint32, 1);
   rb_define_method(cls, "RSTRING_PTR_short_memcpy", string_spec_RSTRING_PTR_short_memcpy, 1);
diff --git a/spec/ruby/optional/capi/ext/struct_spec.c b/spec/ruby/optional/capi/ext/struct_spec.c
index 756cfca8dd3..1c669d153ec 100644
--- a/spec/ruby/optional/capi/ext/struct_spec.c
+++ b/spec/ruby/optional/capi/ext/struct_spec.c
@@ -66,7 +66,6 @@ static VALUE struct_spec_rb_struct_initialize(VALUE self, VALUE st, VALUE values
   return rb_struct_initialize(st, values);
 }
 
-#if defined(RUBY_VERSION_IS_3_3)
 /* Only allow setting three attributes, should be sufficient for testing. */
 static VALUE struct_spec_rb_data_define(VALUE self, VALUE superclass,
   VALUE attr1, VALUE attr2, VALUE attr3) {
@@ -81,7 +80,6 @@ static VALUE struct_spec_rb_data_define(VALUE self, VALUE superclass,
 
   return rb_data_define(superclass, a1, a2, a3, NULL);
 }
-#endif
 
 void Init_struct_spec(void) {
   VALUE cls = rb_define_class("CApiStructSpecs", rb_cObject);
@@ -95,9 +93,7 @@ void Init_struct_spec(void) {
   rb_define_method(cls, "rb_struct_new", struct_spec_rb_struct_new, 4);
   rb_define_method(cls, "rb_struct_size", struct_spec_rb_struct_size, 1);
   rb_define_method(cls, "rb_struct_initialize", struct_spec_rb_struct_initialize, 2);
-#if defined(RUBY_VERSION_IS_3_3)
   rb_define_method(cls, "rb_data_define", struct_spec_rb_data_define, 4);
-#endif
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/util_spec.c b/spec/ruby/optional/capi/ext/util_spec.c
index b5bde420d21..043da99ace5 100644
--- a/spec/ruby/optional/capi/ext/util_spec.c
+++ b/spec/ruby/optional/capi/ext/util_spec.c
@@ -20,15 +20,11 @@ VALUE util_spec_rb_scan_args(VALUE self, VALUE argv, VALUE fmt, VALUE expected,
 
   a1 = a2 = a3 = a4 = a5 = a6 = INT2FIX(-1);
 
-#ifdef RB_SCAN_ARGS_KEYWORDS
   if (*RSTRING_PTR(fmt) == 'k') {
     result = rb_scan_args_kw(RB_SCAN_ARGS_KEYWORDS, argc, args, RSTRING_PTR(fmt)+1, &a1, &a2, &a3, &a4, &a5, &a6);
   } else {
-#endif
     result = rb_scan_args(argc, args, RSTRING_PTR(fmt), &a1, &a2, &a3, &a4, &a5, &a6);
-#ifdef RB_SCAN_ARGS_KEYWORDS
   }
-#endif
 
   switch(NUM2INT(expected)) {
   case 6:
diff --git a/spec/ruby/optional/capi/fiber_spec.rb b/spec/ruby/optional/capi/fiber_spec.rb
index 05d867498ce..c820ba17c2f 100644
--- a/spec/ruby/optional/capi/fiber_spec.rb
+++ b/spec/ruby/optional/capi/fiber_spec.rb
@@ -10,7 +10,7 @@
   describe "rb_fiber_current" do
     it "returns the current fiber" do
       result = @s.rb_fiber_current()
-      result.should be_an_instance_of(Fiber)
+      result.should.instance_of?(Fiber)
       result.should == Fiber.current
     end
   end
@@ -19,9 +19,9 @@
     it "returns the fibers alive status" do
       fiber = Fiber.new { Fiber.yield }
       fiber.resume
-      @s.rb_fiber_alive_p(fiber).should be_true
+      @s.rb_fiber_alive_p(fiber).should == true
       fiber.resume
-      @s.rb_fiber_alive_p(fiber).should be_false
+      @s.rb_fiber_alive_p(fiber).should == false
     end
   end
 
@@ -43,7 +43,7 @@
   describe "rb_fiber_new" do
     it "returns a new fiber" do
       fiber = @s.rb_fiber_new
-      fiber.should be_an_instance_of(Fiber)
+      fiber.should.instance_of?(Fiber)
       fiber.resume(42).should == "42"
     end
   end
@@ -61,7 +61,7 @@
       fiber.resume
 
       result = @s.rb_fiber_raise(fiber, "Boom!")
-      result.should be_an_instance_of(RuntimeError)
+      result.should.instance_of?(RuntimeError)
       result.message.should == "Boom!"
     end
 
@@ -79,7 +79,7 @@
       fiber.transfer
 
       result = @s.rb_fiber_raise(fiber, "Boom!")
-      result.should be_an_instance_of(RuntimeError)
+      result.should.instance_of?(RuntimeError)
       result.message.should == "Boom!"
     end
   end
diff --git a/spec/ruby/optional/capi/file_spec.rb b/spec/ruby/optional/capi/file_spec.rb
index 12449b4e34d..fd63aed3160 100644
--- a/spec/ruby/optional/capi/file_spec.rb
+++ b/spec/ruby/optional/capi/file_spec.rb
@@ -5,13 +5,13 @@
 describe :rb_file_open, shared: true do
   it "raises an ArgumentError if passed an empty mode string" do
     touch @name
-    -> { @s.rb_file_open(@name, "") }.should raise_error(ArgumentError)
+    -> { @s.rb_file_open(@name, "") }.should.raise(ArgumentError)
   end
 
   it "opens a file in read-only mode with 'r'" do
     touch(@name) { |f| f.puts "readable" }
     @file = @s.send(@method, @name, "r")
-    @file.should be_an_instance_of(File)
+    @file.should.instance_of?(File)
     @file.read.chomp.should == "readable"
   end
 
@@ -65,13 +65,13 @@
   describe "FilePathValue" do
     it "returns a String argument unchanged" do
       obj = "path"
-      @s.FilePathValue(obj).should eql(obj)
+      @s.FilePathValue(obj).should.eql?(obj)
     end
 
     it "does not call #to_str on a String" do
       obj = +"path"
       obj.should_not_receive(:to_str)
-      @s.FilePathValue(obj).should eql(obj)
+      @s.FilePathValue(obj).should.eql?(obj)
     end
 
     it "calls #to_path to convert an object to a String" do
diff --git a/spec/ruby/optional/capi/fixnum_spec.rb b/spec/ruby/optional/capi/fixnum_spec.rb
index e691aa38936..73751c48951 100644
--- a/spec/ruby/optional/capi/fixnum_spec.rb
+++ b/spec/ruby/optional/capi/fixnum_spec.rb
@@ -27,7 +27,7 @@
 
     platform_is c_long_size: 64 do # sizeof(long) > sizeof(int)
       it "raises a TypeError if passed nil" do
-        -> { @s.FIX2INT(nil) }.should raise_error(TypeError)
+        -> { @s.FIX2INT(nil) }.should.raise(TypeError)
       end
 
       it "converts a Float" do
@@ -39,16 +39,16 @@
       end
 
       it "raises a RangeError if the value does not fit a native int" do
-        -> { @s.FIX2INT(0x7fff_ffff+1) }.should raise_error(RangeError)
-        -> { @s.FIX2INT(-(1 << 31) - 1) }.should raise_error(RangeError)
+        -> { @s.FIX2INT(0x7fff_ffff+1) }.should.raise(RangeError)
+        -> { @s.FIX2INT(-(1 << 31) - 1) }.should.raise(RangeError)
       end
 
       it "raises a RangeError if the value is more than 32bits" do
-        -> { @s.FIX2INT(0xffff_ffff+1) }.should raise_error(RangeError)
+        -> { @s.FIX2INT(0xffff_ffff+1) }.should.raise(RangeError)
       end
 
       it "raises a RangeError if the value is more than 64bits" do
-        -> { @s.FIX2INT(0xffff_ffff_ffff_ffff+1) }.should raise_error(RangeError)
+        -> { @s.FIX2INT(0xffff_ffff_ffff_ffff+1) }.should.raise(RangeError)
       end
 
       it "calls #to_int to coerce the value" do
@@ -76,7 +76,7 @@
 
     platform_is c_long_size: 64 do # sizeof(long) > sizeof(int)
       it "raises a TypeError if passed nil" do
-        -> { @s.FIX2UINT(nil) }.should raise_error(TypeError)
+        -> { @s.FIX2UINT(nil) }.should.raise(TypeError)
       end
 
       it "converts a Float" do
@@ -85,16 +85,16 @@
 
       it "raises a RangeError if the value does not fit a native uint" do
         # Interestingly, on MRI FIX2UINT(-1) is allowed
-        -> { @s.FIX2UINT(0xffff_ffff+1) }.should raise_error(RangeError)
-        -> { @s.FIX2UINT(-(1 << 31) - 1) }.should raise_error(RangeError)
+        -> { @s.FIX2UINT(0xffff_ffff+1) }.should.raise(RangeError)
+        -> { @s.FIX2UINT(-(1 << 31) - 1) }.should.raise(RangeError)
       end
 
       it "raises a RangeError if the value is more than 32bits" do
-        -> { @s.FIX2UINT(0xffff_ffff+1) }.should raise_error(RangeError)
+        -> { @s.FIX2UINT(0xffff_ffff+1) }.should.raise(RangeError)
       end
 
       it "raises a RangeError if the value is more than 64bits" do
-        -> { @s.FIX2UINT(0xffff_ffff_ffff_ffff+1) }.should raise_error(RangeError)
+        -> { @s.FIX2UINT(0xffff_ffff_ffff_ffff+1) }.should.raise(RangeError)
       end
     end
   end
diff --git a/spec/ruby/optional/capi/float_spec.rb b/spec/ruby/optional/capi/float_spec.rb
index 4b98902b59e..5b02483b287 100644
--- a/spec/ruby/optional/capi/float_spec.rb
+++ b/spec/ruby/optional/capi/float_spec.rb
@@ -23,8 +23,8 @@
   describe "rb_Float" do
     it "creates a new Float from a String" do
       f = @f.rb_Float("101.99")
-      f.should be_kind_of(Float)
-      f.should eql(101.99)
+      f.should.is_a?(Float)
+      f.should.eql?(101.99)
     end
   end
 
diff --git a/spec/ruby/optional/capi/gc_spec.rb b/spec/ruby/optional/capi/gc_spec.rb
index d9661328ab3..6695026c6f9 100644
--- a/spec/ruby/optional/capi/gc_spec.rb
+++ b/spec/ruby/optional/capi/gc_spec.rb
@@ -10,9 +10,9 @@
   describe "rb_gc_register_address" do
     it "correctly gets the value from a registered address" do
       @f.registered_tagged_address.should == 10
-      @f.registered_tagged_address.should equal(@f.registered_tagged_address)
+      @f.registered_tagged_address.should.equal?(@f.registered_tagged_address)
       @f.registered_reference_address.should == "Globally registered data"
-      @f.registered_reference_address.should equal(@f.registered_reference_address)
+      @f.registered_reference_address.should.equal?(@f.registered_reference_address)
     end
 
     it "keeps the value alive even if the value is assigned after rb_gc_register_address() is called" do
@@ -67,22 +67,22 @@
 
     it "enables GC when disabled" do
       GC.disable
-      @f.rb_gc_enable.should be_true
+      @f.rb_gc_enable.should == true
     end
 
     it "GC stays enabled when enabled" do
       GC.enable
-      @f.rb_gc_enable.should be_false
+      @f.rb_gc_enable.should == false
     end
 
     it "disables GC when enabled" do
       GC.enable
-      @f.rb_gc_disable.should be_false
+      @f.rb_gc_disable.should == false
     end
 
     it "GC stays disabled when disabled" do
       GC.disable
-      @f.rb_gc_disable.should be_true
+      @f.rb_gc_disable.should == true
     end
   end
 
@@ -100,13 +100,13 @@
       -> {
         @f.rb_gc_adjust_memory_usage(8)
         @f.rb_gc_adjust_memory_usage(-8)
-      }.should_not raise_error
+      }.should_not.raise
     end
   end
 
   describe "rb_gc_register_mark_object" do
     it "can be called with an object" do
-      @f.rb_gc_register_mark_object(Object.new).should be_nil
+      @f.rb_gc_register_mark_object(Object.new).should == nil
     end
 
     it "keeps the value alive even if the value is not referenced by any Ruby object" do
@@ -116,11 +116,11 @@
 
   describe "rb_gc_latest_gc_info" do
     it "raises a TypeError when hash or symbol not given" do
-      -> { @f.rb_gc_latest_gc_info("foo") }.should raise_error(TypeError)
+      -> { @f.rb_gc_latest_gc_info("foo") }.should.raise(TypeError)
     end
 
     it "raises an ArgumentError when unknown symbol given" do
-      -> { @f.rb_gc_latest_gc_info(:unknown) }.should raise_error(ArgumentError)
+      -> { @f.rb_gc_latest_gc_info(:unknown) }.should.raise(ArgumentError)
     end
 
     it "returns the populated hash when a hash is given" do
@@ -130,7 +130,7 @@
     end
 
     it "returns a value when symbol is given" do
-      @f.rb_gc_latest_gc_info(:state).should be_kind_of(Symbol)
+      @f.rb_gc_latest_gc_info(:state).should.is_a?(Symbol)
     end
   end
 end
diff --git a/spec/ruby/optional/capi/globals_spec.rb b/spec/ruby/optional/capi/globals_spec.rb
index 4657293e158..03316c256c9 100644
--- a/spec/ruby/optional/capi/globals_spec.rb
+++ b/spec/ruby/optional/capi/globals_spec.rb
@@ -52,7 +52,7 @@
 
     @f.rb_define_readonly_variable("#{name}", 15)
     $#{name}.should == 15
-    -> { $#{name} = 10 }.should raise_error(NameError)
+    -> { $#{name} = 10 }.should.raise(NameError)
     RUBY
   end
 
@@ -80,7 +80,7 @@
       end
 
       it "is read-only" do
-        -> { $virtual_variable_default_accessors = 10 }.should raise_error(NameError, /read-only/)
+        -> { $virtual_variable_default_accessors = 10 }.should.raise(NameError, /read-only/)
       end
 
       it "returns false with the default getter" do
@@ -164,7 +164,7 @@
 
       it "returns $stdin" do
         $stdin = @stream
-        @f.rb_stdin.should equal($stdin)
+        @f.rb_stdin.should.equal?($stdin)
       end
     end
 
@@ -175,7 +175,7 @@
 
       it "returns $stdout" do
         $stdout = @stream
-        @f.rb_stdout.should equal($stdout)
+        @f.rb_stdout.should.equal?($stdout)
       end
     end
 
@@ -186,7 +186,7 @@
 
       it "returns $stderr" do
         $stderr = @stream
-        @f.rb_stderr.should equal($stderr)
+        @f.rb_stderr.should.equal?($stderr)
       end
     end
 
@@ -197,7 +197,7 @@
 
       it "is an alias of rb_stdout" do
         $stdout = @stream
-        @f.rb_defout.should equal($stdout)
+        @f.rb_defout.should.equal?($stdout)
       end
     end
   end
@@ -218,7 +218,7 @@
     end
 
     it "returns nil by default" do
-      @f.rb_output_rs.should be_nil
+      @f.rb_output_rs.should == nil
     end
 
     it "returns the value of $\\" do
@@ -237,7 +237,7 @@
     end
 
     it "returns nil by default" do
-      @f.rb_output_fs.should be_nil
+      @f.rb_output_fs.should == nil
     end
 
     it "returns the value of $\\" do
@@ -263,7 +263,7 @@
       end
 
       Thread.pass while thr.status and !running
-      $_.should be_nil
+      $_.should == nil
 
       thr.join
     end
@@ -290,7 +290,7 @@
       end
 
       Thread.pass while thr.status and !running
-      $_.should be_nil
+      $_.should == nil
 
       thr.join
     end
diff --git a/spec/ruby/optional/capi/hash_spec.rb b/spec/ruby/optional/capi/hash_spec.rb
index 3a27de3bfa2..842bc82b970 100644
--- a/spec/ruby/optional/capi/hash_spec.rb
+++ b/spec/ruby/optional/capi/hash_spec.rb
@@ -36,7 +36,7 @@
       obj = mock("rb_hash no to_int")
       obj.should_receive(:hash).and_return(nil)
 
-      -> { @s.rb_hash(obj) }.should raise_error(TypeError)
+      -> { @s.rb_hash(obj) }.should.raise(TypeError)
     end
   end
 
@@ -46,7 +46,7 @@
     end
 
     it "creates a hash with no default proc" do
-      @s.rb_hash_new {}.default_proc.should be_nil
+      @s.rb_hash_new {}.default_proc.should == nil
     end
   end
 
@@ -56,11 +56,11 @@
     end
 
     it "creates a hash with no default proc" do
-      @s.rb_hash_new_capa(3) {}.default_proc.should be_nil
+      @s.rb_hash_new_capa(3) {}.default_proc.should == nil
     end
 
     it "raises RuntimeError when negative index is provided" do
-      -> { @s.rb_hash_new_capa(-1) }.should raise_error(RuntimeError, "st_table too big")
+      -> { @s.rb_hash_new_capa(-1) }.should.raise(RuntimeError, "st_table too big")
     end
   end
 
@@ -77,13 +77,13 @@
       hsh = {}
       dup = @s.rb_hash_dup(hsh)
       dup.should == hsh
-      dup.should_not equal(hsh)
+      dup.should_not.equal?(hsh)
     end
   end
 
   describe "rb_hash_freeze" do
     it "freezes the hash" do
-      @s.rb_hash_freeze({}).frozen?.should be_true
+      @s.rb_hash_freeze({}).frozen?.should == true
     end
   end
 
@@ -96,13 +96,13 @@
     it "returns the default value if it exists" do
       hsh = Hash.new(0)
       @s.rb_hash_aref(hsh, :chunky).should == 0
-      @s.rb_hash_aref_nil(hsh, :chunky).should be_false
+      @s.rb_hash_aref_nil(hsh, :chunky).should == false
     end
 
     it "returns nil if the key does not exist" do
       hsh = { }
-      @s.rb_hash_aref(hsh, :chunky).should be_nil
-      @s.rb_hash_aref_nil(hsh, :chunky).should be_true
+      @s.rb_hash_aref(hsh, :chunky).should == nil
+      @s.rb_hash_aref_nil(hsh, :chunky).should == true
     end
   end
 
@@ -117,7 +117,7 @@
   describe "rb_hash_clear" do
     it "returns self that cleared keys and values" do
       hsh = { :key => 'value' }
-      @s.rb_hash_clear(hsh).should equal(hsh)
+      @s.rb_hash_clear(hsh).should.equal?(hsh)
       hsh.should == {}
     end
   end
@@ -138,7 +138,7 @@
     end
 
     it "returns an Enumerator when no block is passed" do
-      @s.rb_hash_delete_if({a: 1}).should be_an_instance_of(Enumerator)
+      @s.rb_hash_delete_if({a: 1}).should.instance_of?(Enumerator)
     end
   end
 
@@ -153,11 +153,11 @@
 
     it "raises a KeyError if the key is not found and default is set" do
       @hsh.default = :d
-      -> { @s.rb_hash_fetch(@hsh, :c) }.should raise_error(KeyError)
+      -> { @s.rb_hash_fetch(@hsh, :c) }.should.raise(KeyError)
     end
 
     it "raises a KeyError if the key is not found and no default is set" do
-      -> { @s.rb_hash_fetch(@hsh, :c) }.should raise_error(KeyError)
+      -> { @s.rb_hash_fetch(@hsh, :c) }.should.raise(KeyError)
     end
 
     context "when key is not found" do
@@ -266,14 +266,14 @@
 
     it "does not return the default value if it exists" do
       hsh = Hash.new(0)
-      @s.rb_hash_lookup(hsh, :chunky).should be_nil
-      @s.rb_hash_lookup_nil(hsh, :chunky).should be_true
+      @s.rb_hash_lookup(hsh, :chunky).should == nil
+      @s.rb_hash_lookup_nil(hsh, :chunky).should == true
     end
 
     it "returns nil if the key does not exist" do
       hsh = { }
-      @s.rb_hash_lookup(hsh, :chunky).should be_nil
-      @s.rb_hash_lookup_nil(hsh, :chunky).should be_true
+      @s.rb_hash_lookup(hsh, :chunky).should == nil
+      @s.rb_hash_lookup_nil(hsh, :chunky).should == true
     end
 
     describe "rb_hash_lookup2" do
@@ -291,7 +291,7 @@
 
       it "returns undefined if that is the default value specified" do
         hsh = Hash.new(0)
-        @s.rb_hash_lookup2_default_undef(hsh, :chunky).should be_true
+        @s.rb_hash_lookup2_default_undef(hsh, :chunky).should == true
       end
     end
   end
@@ -322,20 +322,20 @@ def h.to_hash; {"bar" => "foo"}; end
     end
 
     it "raises a TypeError if the argument does not respond to #to_hash" do
-      -> { @s.rb_Hash(42) }.should raise_error(TypeError)
+      -> { @s.rb_Hash(42) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if #to_hash does not return a hash" do
       h = BasicObject.new
       def h.to_hash; 42; end
-      -> { @s.rb_Hash(h) }.should raise_error(TypeError)
+      -> { @s.rb_Hash(h) }.should.raise(TypeError)
     end
   end
 
   describe "hash code functions" do
     it "computes a deterministic number" do
       hash_code = @s.compute_a_hash_code(53)
-      hash_code.should be_an_instance_of(Integer)
+      hash_code.should.instance_of?(Integer)
       hash_code.should == @s.compute_a_hash_code(53)
       @s.compute_a_hash_code(90).should == @s.compute_a_hash_code(90)
     end
diff --git a/spec/ruby/optional/capi/io_spec.rb b/spec/ruby/optional/capi/io_spec.rb
index dc4ac3e3744..35bd856e001 100644
--- a/spec/ruby/optional/capi/io_spec.rb
+++ b/spec/ruby/optional/capi/io_spec.rb
@@ -15,7 +15,7 @@
   end
 
   after :each do
-    @io.close unless @io.closed?
+    @io.close
     rm_r @name
   end
 
@@ -34,7 +34,7 @@
     end
 
     it "returns the io" do
-      @o.rb_io_addstr(@io, "rb_io_addstr data").should eql(@io)
+      @o.rb_io_addstr(@io, "rb_io_addstr data").should.eql?(@io)
     end
   end
 
@@ -118,15 +118,15 @@
   end
 
   after :each do
-    @io.close unless @io.closed?
+    @io.close
     rm_r @name
   end
 
   describe "rb_io_close" do
     it "closes an IO object" do
-      @io.closed?.should be_false
+      @io.closed?.should == false
       @o.rb_io_close(@io)
-      @io.closed?.should be_true
+      @io.closed?.should == true
     end
   end
 
@@ -136,19 +136,19 @@
     end
 
     it "returns nil for non IO objects" do
-      @o.rb_io_check_io({}).should be_nil
+      @o.rb_io_check_io({}).should == nil
     end
   end
 
   describe "rb_io_check_closed" do
     it "does not raise an exception if the IO is not closed" do
       # The MRI function is void, so we use should_not raise_error
-      -> { @o.rb_io_check_closed(@io) }.should_not raise_error
+      -> { @o.rb_io_check_closed(@io) }.should_not.raise
     end
 
     it "raises an error if the IO is closed" do
       @io.close
-      -> { @o.rb_io_check_closed(@io) }.should raise_error(IOError)
+      -> { @o.rb_io_check_closed(@io) }.should.raise(IOError)
     end
   end
 
@@ -157,7 +157,7 @@
       it "returns true when nonblock flag is set" do
         require 'io/nonblock'
         @o.rb_io_set_nonblock(@io)
-        @io.nonblock?.should be_true
+        @io.nonblock?.should == true
       end
     end
   end
@@ -166,13 +166,13 @@
   # object is frozen, *not* if it's tainted.
   describe "rb_io_taint_check" do
     it "does not raise an exception if the IO is not frozen" do
-      -> { @o.rb_io_taint_check(@io) }.should_not raise_error
+      -> { @o.rb_io_taint_check(@io) }.should_not.raise
     end
 
     it "raises an exception if the IO is frozen" do
       @io.freeze
 
-      -> { @o.rb_io_taint_check(@io) }.should raise_error(RuntimeError)
+      -> { @o.rb_io_taint_check(@io) }.should.raise(RuntimeError)
     end
   end
 
@@ -186,7 +186,7 @@
 
     it "raises IOError if the IO is closed" do
       @io.close
-      -> { @o.GetOpenFile_fd(@io) }.should raise_error(IOError, "closed stream")
+      -> { @o.GetOpenFile_fd(@io) }.should.raise(IOError, "closed stream")
     end
   end
 
@@ -197,7 +197,7 @@
 
     it "sets binmode" do
       @o.rb_io_binmode(@io)
-      @io.binmode?.should be_true
+      @io.binmode?.should == true
     end
   end
 end
@@ -213,24 +213,24 @@
   end
 
   after :each do
-    @r_io.close unless @r_io.closed?
-    @w_io.close unless @w_io.closed?
-    @rw_io.close unless @rw_io.closed?
+    @r_io.close
+    @w_io.close
+    @rw_io.close
     rm_r @name
   end
 
   describe "rb_io_check_readable" do
     it "does not raise an exception if the IO is opened for reading" do
       # The MRI function is void, so we use should_not raise_error
-      -> { @o.rb_io_check_readable(@r_io) }.should_not raise_error
+      -> { @o.rb_io_check_readable(@r_io) }.should_not.raise
     end
 
     it "does not raise an exception if the IO is opened for read and write" do
-      -> { @o.rb_io_check_readable(@rw_io) }.should_not raise_error
+      -> { @o.rb_io_check_readable(@rw_io) }.should_not.raise
     end
 
     it "raises an IOError if the IO is not opened for reading" do
-      -> { @o.rb_io_check_readable(@w_io) }.should raise_error(IOError)
+      -> { @o.rb_io_check_readable(@w_io) }.should.raise(IOError)
     end
 
   end
@@ -238,27 +238,27 @@
   describe "rb_io_check_writable" do
     it "does not raise an exception if the IO is opened for writing" do
       # The MRI function is void, so we use should_not raise_error
-      -> { @o.rb_io_check_writable(@w_io) }.should_not raise_error
+      -> { @o.rb_io_check_writable(@w_io) }.should_not.raise
     end
 
     it "does not raise an exception if the IO is opened for read and write" do
-      -> { @o.rb_io_check_writable(@rw_io) }.should_not raise_error
+      -> { @o.rb_io_check_writable(@rw_io) }.should_not.raise
     end
 
     it "raises an IOError if the IO is not opened for reading" do
-      -> { @o.rb_io_check_writable(@r_io) }.should raise_error(IOError)
+      -> { @o.rb_io_check_writable(@r_io) }.should.raise(IOError)
     end
   end
 
   describe "rb_io_wait_writable" do
     it "returns false if there is no error condition" do
       @o.errno = 0
-      @o.rb_io_wait_writable(@w_io).should be_false
+      @o.rb_io_wait_writable(@w_io).should == false
     end
 
     it "raises an IOError if the IO is closed" do
       @w_io.close
-      -> { @o.rb_io_wait_writable(@w_io) }.should raise_error(IOError)
+      -> { @o.rb_io_wait_writable(@w_io) }.should.raise(IOError)
     end
   end
 
@@ -273,11 +273,11 @@
 
     it "raises an IOError if the IO is closed" do
       @w_io.close
-      -> { @o.rb_io_maybe_wait_writable(0, @w_io, nil) }.should raise_error(IOError, "closed stream")
+      -> { @o.rb_io_maybe_wait_writable(0, @w_io, nil) }.should.raise(IOError, "closed stream")
     end
 
     it "raises an IOError if the IO is not initialized" do
-      -> { @o.rb_io_maybe_wait_writable(0, IO.allocate, nil) }.should raise_error(IOError, "uninitialized stream")
+      -> { @o.rb_io_maybe_wait_writable(0, IO.allocate, nil) }.should.raise(IOError, "uninitialized stream")
     end
 
     it "can be interrupted" do
@@ -299,7 +299,7 @@
 
   describe "rb_thread_fd_writable" do
     it "waits til an fd is ready for writing" do
-      @o.rb_thread_fd_writable(@w_io).should be_nil
+      @o.rb_thread_fd_writable(@w_io).should == nil
     end
   end
 
@@ -322,14 +322,14 @@
     describe "rb_io_wait_readable" do
       it "returns false if there is no error condition" do
         @o.errno = 0
-        @o.rb_io_wait_readable(@r_io, false).should be_false
+        @o.rb_io_wait_readable(@r_io, false).should == false
       end
 
       it "raises and IOError if passed a closed stream" do
         @r_io.close
         -> {
           @o.rb_io_wait_readable(@r_io, false)
-        }.should raise_error(IOError)
+        }.should.raise(IOError)
       end
 
       it "blocks until the io is readable and returns true" do
@@ -340,7 +340,7 @@
         end
 
         @o.errno = Errno::EAGAIN.new.errno
-        @o.rb_io_wait_readable(@r_io, true).should be_true
+        @o.rb_io_wait_readable(@r_io, true).should == true
         @o.instance_variable_get(:@read_data).should == "rb_io_wait_re"
 
         thr.join
@@ -386,11 +386,11 @@
 
       it "raises an IOError if the IO is closed" do
         @r_io.close
-        -> { @o.rb_io_maybe_wait_readable(0, @r_io, nil, false) }.should raise_error(IOError, "closed stream")
+        -> { @o.rb_io_maybe_wait_readable(0, @r_io, nil, false) }.should.raise(IOError, "closed stream")
       end
 
       it "raises an IOError if the IO is not initialized" do
-        -> { @o.rb_io_maybe_wait_readable(0, IO.allocate, nil, false) }.should raise_error(IOError, "uninitialized stream")
+        -> { @o.rb_io_maybe_wait_readable(0, IO.allocate, nil, false) }.should.raise(IOError, "uninitialized stream")
       end
     end
   end
@@ -406,7 +406,7 @@
 
       Thread.pass until start
 
-      @o.rb_thread_wait_fd(@r_io).should be_nil
+      @o.rb_thread_wait_fd(@r_io).should == nil
 
       thr.join
     end
@@ -455,11 +455,11 @@
 
     it "raises an IOError if the IO is closed" do
       @w_io.close
-      -> { @o.rb_io_maybe_wait(0, @w_io, IO::WRITABLE, nil) }.should raise_error(IOError, "closed stream")
+      -> { @o.rb_io_maybe_wait(0, @w_io, IO::WRITABLE, nil) }.should.raise(IOError, "closed stream")
     end
 
     it "raises an IOError if the IO is not initialized" do
-      -> { @o.rb_io_maybe_wait(0, IO.allocate, IO::WRITABLE, nil) }.should raise_error(IOError, "uninitialized stream")
+      -> { @o.rb_io_maybe_wait(0, IO.allocate, IO::WRITABLE, nil) }.should.raise(IOError, "uninitialized stream")
     end
 
     it "can be interrupted when waiting for READABLE event" do
@@ -622,11 +622,11 @@
         io.should.is_a?(File)
 
         platform_is_not :windows do
-          -> { io.read_nonblock(1) }.should raise_error(Errno::EBADF)
+          -> { io.read_nonblock(1) }.should.raise(Errno::EBADF)
         end
 
         platform_is :windows do
-          -> { io.read_nonblock(1) }.should raise_error(IO::EWOULDBLOCKWaitReadable)
+          -> { io.read_nonblock(1) }.should.raise(IO::EWOULDBLOCKWaitReadable)
         end
       end
 
@@ -638,11 +638,11 @@
       it "deduplicates path String" do
         path = "a.txt".dup
         io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, path, 60, "US-ASCII", "UTF-8", 0, {})
-        io.path.should_not equal(path)
+        io.path.should_not.equal?(path)
 
         path = "a.txt".freeze
         io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, path, 60, "US-ASCII", "UTF-8", 0, {})
-        io.path.should_not equal(path)
+        io.path.should_not.equal?(path)
       end
 
       it "calls #to_str to convert a path to a String" do
@@ -678,13 +678,13 @@ def path.to_str; "a.txt"; end
   end
 
   after :each do
-    @io.close unless @io.closed?
+    @io.close
     rm_r @name
   end
 
   it "sets close_on_exec on the IO" do
     @o.rb_fd_fix_cloexec(@io)
-    @io.close_on_exec?.should be_true
+    @io.close_on_exec?.should == true
   end
 
 end
@@ -699,13 +699,65 @@ def path.to_str; "a.txt"; end
   end
 
   after :each do
-    @io.close unless @io.nil? || @io.closed?
+    @io.close if @io
     rm_r @name
   end
 
   it "sets close_on_exec on the newly-opened IO" do
     @io = @o.rb_cloexec_open(@name, 0, 0)
-    @io.close_on_exec?.should be_true
+    @io.close_on_exec?.should == true
+  end
+end
+
+describe "rb_cloexec_dup" do
+  before :each do
+    @o = CApiIOSpecs.new
+    @name = tmp("c_api_rb_io_specs")
+    touch @name
+
+    @io = new_io @name, "r"
+    @dup = nil
+  end
+
+  after :each do
+    @dup.close if @dup
+    @io.close
+    rm_r @name
+  end
+
+  it "duplicates a file descriptor and sets close_on_exec" do
+    @dup = @o.rb_cloexec_dup(@io)
+    @dup.should.close_on_exec?
+    @dup.fileno.should_not == @io.fileno
+  end
+end
+
+describe "rb_cloexec_fcntl_dupfd" do
+  before :each do
+    @o = CApiIOSpecs.new
+    @name = tmp("c_api_rb_io_specs")
+    touch @name
+
+    @io = new_io @name, "r"
+    @dup = nil
+  end
+
+  after :each do
+    @dup.close if @dup
+    @io.close
+    rm_r @name
+  end
+
+  it "duplicates a file descriptor and sets close_on_exec" do
+    @dup = @o.rb_cloexec_fcntl_dupfd(@io, 3)
+    @dup.close_on_exec?.should == true
+    @dup.fileno.should_not == @io.fileno
+  end
+
+  it "returns a file descriptor greater than or equal to minfd" do
+    @dup = @o.rb_cloexec_fcntl_dupfd(@io, 100)
+    @dup.fileno.should >= 100
+    @dup.close_on_exec?.should == true
   end
 end
 
diff --git a/spec/ruby/optional/capi/kernel_spec.rb b/spec/ruby/optional/capi/kernel_spec.rb
index 0a2362fb304..62eb21448b2 100644
--- a/spec/ruby/optional/capi/kernel_spec.rb
+++ b/spec/ruby/optional/capi/kernel_spec.rb
@@ -28,7 +28,7 @@ class CApiKernelSpecs::Exc < StandardError
 
   describe "rb_need_block" do
     it "raises a LocalJumpError if no block is given" do
-      -> { @s.rb_need_block }.should raise_error(LocalJumpError)
+      -> { @s.rb_need_block }.should.raise(LocalJumpError)
     end
 
     it "does not raise a LocalJumpError if a block is given" do
@@ -53,7 +53,7 @@ class CApiKernelSpecs::Exc < StandardError
 
     it "calls the method with no function callback and no block" do
       ary = [1, 3, 5]
-      @s.rb_block_call_no_func(ary).should be_kind_of(Enumerator)
+      @s.rb_block_call_no_func(ary).should.is_a?(Enumerator)
     end
 
     it "calls the method with no function callback and a block" do
@@ -65,7 +65,7 @@ class CApiKernelSpecs::Exc < StandardError
 
     it "can pass extra data to the function" do
       ary = [3]
-      @s.rb_block_call_extra_data(ary).should equal(ary)
+      @s.rb_block_call_extra_data(ary).should.equal?(ary)
     end
   end
 
@@ -78,12 +78,12 @@ class CApiKernelSpecs::Exc < StandardError
 
   describe "rb_raise" do
     it "raises an exception" do
-      -> { @s.rb_raise({}) }.should raise_error(TypeError)
+      -> { @s.rb_raise({}) }.should.raise(TypeError)
     end
 
     it "terminates the function at the point it was called" do
       h = {}
-      -> { @s.rb_raise(h) }.should raise_error(TypeError)
+      -> { @s.rb_raise(h) }.should.raise(TypeError)
       h[:stage].should == :before
     end
 
@@ -100,7 +100,7 @@ class CApiKernelSpecs::Exc < StandardError
           # should raise StandardError "aaa"
           raise
         end
-      end.should raise_error(StandardError, "aaa")
+      end.should.raise(StandardError, "aaa")
     end
   end
 
@@ -125,7 +125,7 @@ class CApiKernelSpecs::Exc < StandardError
     end
 
     it "raises an ArgumentError if there is no catch block for the symbol" do
-      -> { @s.rb_throw(nil) }.should raise_error(ArgumentError)
+      -> { @s.rb_throw(nil) }.should.raise(ArgumentError)
     end
   end
 
@@ -151,7 +151,7 @@ class CApiKernelSpecs::Exc < StandardError
     end
 
     it "raises an ArgumentError if there is no catch block for the symbol" do
-      -> { @s.rb_throw(nil) }.should raise_error(ArgumentError)
+      -> { @s.rb_throw(nil) }.should.raise(ArgumentError)
     end
   end
 
@@ -173,13 +173,13 @@ class CApiKernelSpecs::Exc < StandardError
     it "raises an exception from the value of errno" do
       -> do
         @s.rb_sys_fail("additional info")
-      end.should raise_error(SystemCallError, /additional info/)
+      end.should.raise(SystemCallError, /additional info/)
     end
 
     it "can take a NULL message" do
       -> do
         @s.rb_sys_fail(nil)
-      end.should raise_error(Errno::EPERM)
+      end.should.raise(Errno::EPERM)
     end
   end
 
@@ -187,17 +187,17 @@ class CApiKernelSpecs::Exc < StandardError
     it "raises an exception from the given error" do
       -> do
         @s.rb_syserr_fail(Errno::EINVAL::Errno, "additional info")
-      end.should raise_error(Errno::EINVAL, "Invalid argument - additional info")
+      end.should.raise(Errno::EINVAL, "Invalid argument - additional info")
     end
 
     it "can take a NULL message" do
       -> do
         @s.rb_syserr_fail(Errno::EINVAL::Errno, nil)
-      end.should raise_error(Errno::EINVAL, "Invalid argument")
+      end.should.raise(Errno::EINVAL, "Invalid argument")
     end
 
     it "uses some kind of string as message when errno is unknown" do
-      -> { @s.rb_syserr_fail(-10, nil) }.should raise_error(SystemCallError, /[[:graph:]]+/)
+      -> { @s.rb_syserr_fail(-10, nil) }.should.raise(SystemCallError, /[[:graph:]]+/)
     end
   end
 
@@ -205,17 +205,17 @@ class CApiKernelSpecs::Exc < StandardError
     it "raises an exception from the given error" do
       -> do
         @s.rb_syserr_fail_str(Errno::EINVAL::Errno, "additional info")
-      end.should raise_error(Errno::EINVAL, "Invalid argument - additional info")
+      end.should.raise(Errno::EINVAL, "Invalid argument - additional info")
     end
 
     it "can take nil as a message" do
       -> do
         @s.rb_syserr_fail_str(Errno::EINVAL::Errno, nil)
-      end.should raise_error(Errno::EINVAL, "Invalid argument")
+      end.should.raise(Errno::EINVAL, "Invalid argument")
     end
 
     it "uses some kind of string as message when errno is unknown" do
-      -> { @s.rb_syserr_fail_str(-10, nil) }.should raise_error(SystemCallError, /[[:graph:]]+/)
+      -> { @s.rb_syserr_fail_str(-10, nil) }.should.raise(SystemCallError, /[[:graph:]]+/)
     end
   end
 
@@ -231,7 +231,7 @@ class CApiKernelSpecs::Exc < StandardError
     end
 
     it "raises LocalJumpError when no block is given" do
-      -> { @s.rb_yield(1) }.should raise_error(LocalJumpError)
+      -> { @s.rb_yield(1) }.should.raise(LocalJumpError)
     end
 
     it "rb_yield to a block that breaks does not raise an error" do
@@ -269,7 +269,7 @@ class CApiKernelSpecs::Exc < StandardError
     end
 
     it "raises LocalJumpError when no block is given" do
-      -> { @s.rb_yield_splat([1, 2]) }.should raise_error(LocalJumpError)
+      -> { @s.rb_yield_splat([1, 2]) }.should.raise(LocalJumpError)
     end
   end
 
@@ -301,7 +301,7 @@ class CApiKernelSpecs::Exc < StandardError
     end
 
     it "raises LocalJumpError when no block is given" do
-      -> { @s.rb_yield_splat([1, 2]) }.should raise_error(LocalJumpError)
+      -> { @s.rb_yield_splat([1, 2]) }.should.raise(LocalJumpError)
     end
   end
 
@@ -330,7 +330,7 @@ class CApiKernelSpecs::Exc < StandardError
       proof = [] # Hold proof of work performed after the yield.
       -> do
         @s.rb_protect_yield(77, proof) { |x| raise NameError }
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
       proof[0].should == 23
     end
 
@@ -338,7 +338,7 @@ class CApiKernelSpecs::Exc < StandardError
       proof = [] # Hold proof of work performed after the yield.
       -> do
         @s.rb_protect_yield(77, proof) { |x| raise NameError }
-      end.should raise_error(NameError)
+      end.should.raise(NameError)
       proof[0].should == 23
       proof[1].should == nil
     end
@@ -375,7 +375,7 @@ class CApiKernelSpecs::Exc < StandardError
       proof = []
       -> do
         @s.rb_eval_string_protect('raise RuntimeError', proof)
-      end.should raise_error(RuntimeError)
+      end.should.raise(RuntimeError)
       proof.should == [23, nil]
     end
   end
@@ -416,11 +416,11 @@ class CApiKernelSpecs::Exc < StandardError
     end
 
     it "raises an exception if passed function raises an exception other than StandardError" do
-      -> { @s.rb_rescue(@exc_error_proc, nil, @rescue_proc_returns_arg, nil) }.should raise_error(Exception)
+      -> { @s.rb_rescue(@exc_error_proc, nil, @rescue_proc_returns_arg, nil) }.should.raise(Exception)
     end
 
     it "raises an exception if any exception is raised inside the 'rescue function'" do
-      -> { @s.rb_rescue(@std_error_proc, nil, @std_error_proc, nil) }.should raise_error(StandardError)
+      -> { @s.rb_rescue(@std_error_proc, nil, @std_error_proc, nil) }.should.raise(StandardError)
     end
 
     it "sets $! and rb_errinfo() during the 'rescue function' execution" do
@@ -463,13 +463,13 @@ def proc_caller
       @s.rb_rescue2(run_error_proc, :no_exc, proc, :exc, ArgumentError, RuntimeError).should == :exc
       -> {
         @s.rb_rescue2(type_error_proc, :no_exc, proc, :exc, ArgumentError, RuntimeError)
-      }.should raise_error(Exception, 'custom error')
+      }.should.raise(Exception, 'custom error')
     end
 
     it "raises TypeError if one of the passed exceptions is not a Module" do
       -> {
         @s.rb_rescue2(-> *_ { raise RuntimeError, "foo" }, :no_exc, -> x { x }, :exc, Object.new, 42)
-      }.should raise_error(TypeError, /class or module required/)
+      }.should.raise(TypeError, /class or module required/)
     end
 
     it "sets $! and rb_errinfo() during the 'rescue function' execution" do
@@ -505,12 +505,12 @@ def proc_caller
         throw :thrown_value
         ScratchPad << :after_throw
       end
-      @s.rb_catch("thrown_value", proc).should be_nil
+      @s.rb_catch("thrown_value", proc).should == nil
       ScratchPad.recorded.should == [:before_throw]
     end
 
     it "raises an ArgumentError if the throw symbol isn't caught" do
-      -> { @s.rb_catch("foo", -> { throw :bar }) }.should raise_error(ArgumentError)
+      -> { @s.rb_catch("foo", -> { throw :bar }) }.should.raise(ArgumentError)
     end
   end
 
@@ -531,12 +531,12 @@ def proc_caller
         throw @tag
         ScratchPad << :after_throw
       end
-      @s.rb_catch_obj(@tag, proc).should be_nil
+      @s.rb_catch_obj(@tag, proc).should == nil
       ScratchPad.recorded.should == [:before_throw]
     end
 
     it "raises an ArgumentError if the throw symbol isn't caught" do
-      -> { @s.rb_catch("foo", -> { throw :bar }) }.should raise_error(ArgumentError)
+      -> { @s.rb_catch("foo", -> { throw :bar }) }.should.raise(ArgumentError)
     end
   end
 
@@ -594,7 +594,7 @@ def proc_caller
       ensure_proc = -> x { foo = x }
       -> {
         @s.rb_ensure(raise_proc, nil, ensure_proc, :foo)
-      }.should raise_error(exception_class)
+      }.should.raise(exception_class)
       foo.should == :foo
     end
 
@@ -604,14 +604,14 @@ def proc_caller
           $!.should.is_a?(exception_class)
           @s.rb_errinfo.should.is_a?(exception_class)
         }, nil)
-      }.should raise_error(exception_class)
+      }.should.raise(exception_class)
 
       -> {
         @s.rb_ensure(-> _ { @s.rb_raise({}) }, nil, -> _ {
           $!.should.is_a?(TypeError)
           @s.rb_errinfo.should.is_a?(TypeError)
         }, nil)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
 
       $!.should == nil
       @s.rb_errinfo.should == nil
@@ -620,7 +620,7 @@ def proc_caller
     it "raises the same exception raised inside passed function" do
       raise_proc = -> *_ { raise RuntimeError, 'foo' }
       proc = -> *_ { }
-      -> { @s.rb_ensure(raise_proc, nil, proc, nil) }.should raise_error(RuntimeError, 'foo')
+      -> { @s.rb_ensure(raise_proc, nil, proc, nil) }.should.raise(RuntimeError, 'foo')
     end
   end
 
@@ -659,7 +659,7 @@ def proc_caller
   describe "rb_block_proc" do
     it "converts the implicit block into a proc" do
       proc = @s.rb_block_proc { 1+1 }
-      proc.should be_kind_of(Proc)
+      proc.should.is_a?(Proc)
       proc.call.should == 2
       proc.should_not.lambda?
     end
@@ -667,7 +667,7 @@ def proc_caller
     it "passes through an existing lambda and does not convert to a proc" do
       b = -> { 1+1 }
       proc = @s.rb_block_proc(&b)
-      proc.should equal(b)
+      proc.should.equal?(b)
       proc.call.should == 2
       proc.should.lambda?
     end
@@ -676,7 +676,7 @@ def proc_caller
   describe "rb_block_lambda" do
     it "converts the implicit block into a lambda" do
       proc = @s.rb_block_lambda { 1+1 }
-      proc.should be_kind_of(Proc)
+      proc.should.is_a?(Proc)
       proc.call.should == 2
       proc.should.lambda?
     end
@@ -684,7 +684,7 @@ def proc_caller
     it "passes through an existing Proc and does not convert to a lambda" do
       b = proc { 1+1 }
       proc = @s.rb_block_lambda(&b)
-      proc.should equal(b)
+      proc.should.equal?(b)
       proc.call.should == 2
       proc.should_not.lambda?
     end
@@ -719,7 +719,7 @@ def proc_caller
     it "returns a caller backtrace" do
       backtrace = @s.rb_make_backtrace
       lines = backtrace.select {|l| l =~ /#{__FILE__}/ }
-      lines.should_not be_empty
+      lines.should_not.empty?
     end
   end
 
@@ -777,7 +777,7 @@ def m(*args, **kwargs)
 
       -> {
         @s.rb_funcallv_kw(self, :m, [42])
-      }.should raise_error(TypeError, 'no implicit conversion of Integer into Hash')
+      }.should.raise(TypeError, 'no implicit conversion of Integer into Hash')
     end
   end
 
@@ -813,7 +813,7 @@ def method_private; :method_private end
     end
 
     it "does not call a private method" do
-      -> { @s.rb_funcallv_public(@obj, :method_private) }.should raise_error(NoMethodError, /private/)
+      -> { @s.rb_funcallv_public(@obj, :method_private) }.should.raise(NoMethodError, /private/)
     end
   end
 
@@ -847,7 +847,7 @@ def method_public(*args); [args, yield] end
 
       -> {
         @s.rb_funcall_with_block(object, :private_method, [], proc { })
-      }.should raise_error(NoMethodError, /private/)
+      }.should.raise(NoMethodError, /private/)
     end
 
     it "does not call a protected method" do
@@ -855,7 +855,7 @@ def method_public(*args); [args, yield] end
 
       -> {
         @s.rb_funcall_with_block(object, :protected_method, [], proc { })
-      }.should raise_error(NoMethodError, /protected/)
+      }.should.raise(NoMethodError, /protected/)
     end
   end
 
@@ -874,7 +874,7 @@ def method_public(*args, **kw, &block); [args, kw, block.call] end
 
       -> {
         @s.rb_funcall_with_block_kw(object, :private_method, [{}], proc { })
-      }.should raise_error(NoMethodError, /private/)
+      }.should.raise(NoMethodError, /private/)
     end
 
     it "does not call a protected method" do
@@ -882,7 +882,7 @@ def method_public(*args, **kw, &block); [args, kw, block.call] end
 
       -> {
         @s.rb_funcall_with_block_kw(object, :protected_method, [{}], proc { })
-      }.should raise_error(NoMethodError, /protected/)
+      }.should.raise(NoMethodError, /protected/)
     end
   end
 
diff --git a/spec/ruby/optional/capi/module_spec.rb b/spec/ruby/optional/capi/module_spec.rb
index af39ec01927..b9c36f569fc 100644
--- a/spec/ruby/optional/capi/module_spec.rb
+++ b/spec/ruby/optional/capi/module_spec.rb
@@ -36,7 +36,7 @@
     it "allows arbitrary names, including constant names not valid in Ruby" do
       -> {
         CApiModuleSpecs::C.const_set(:_INVALID, 1)
-      }.should raise_error(NameError, /wrong constant name/)
+      }.should.raise(NameError, /wrong constant name/)
 
       suppress_warning { @m.rb_const_set(CApiModuleSpecs::C, :_INVALID, 2) }
       @m.rb_const_get(CApiModuleSpecs::C, :_INVALID).should == 2
@@ -44,7 +44,7 @@
       # Ruby-level should still not allow access
       -> {
         CApiModuleSpecs::C.const_get(:_INVALID)
-      }.should raise_error(NameError, /wrong constant name/)
+      }.should.raise(NameError, /wrong constant name/)
     end
   end
 
@@ -56,15 +56,15 @@
 
     it "raises a TypeError if the constant is not a module" do
       ::CApiModuleSpecsGlobalConst = 7
-      -> { @m.rb_define_module("CApiModuleSpecsGlobalConst") }.should raise_error(TypeError)
+      -> { @m.rb_define_module("CApiModuleSpecsGlobalConst") }.should.raise(TypeError)
       Object.send :remove_const, :CApiModuleSpecsGlobalConst
     end
 
     it "defines a new module at toplevel" do
       mod = @m.rb_define_module("CApiModuleSpecsModuleB")
-      mod.should be_kind_of(Module)
+      mod.should.is_a?(Module)
       mod.name.should == "CApiModuleSpecsModuleB"
-      ::CApiModuleSpecsModuleB.should be_kind_of(Module)
+      ::CApiModuleSpecsModuleB.should.is_a?(Module)
       Object.send :remove_const, :CApiModuleSpecsModuleB
     end
   end
@@ -72,7 +72,7 @@
   describe "rb_define_module_under" do
     it "creates a new module inside the inner class" do
       mod = @m.rb_define_module_under(CApiModuleSpecs, "ModuleSpecsModuleUnder1")
-      mod.should be_kind_of(Module)
+      mod.should.is_a?(Module)
     end
 
     it "sets the module name" do
@@ -110,26 +110,26 @@
   describe "rb_const_defined" do
     # The fixture converts C boolean test to Ruby 'true' / 'false'
     it "returns C non-zero if a constant is defined" do
-      @m.rb_const_defined(CApiModuleSpecs::A, :X).should be_true
+      @m.rb_const_defined(CApiModuleSpecs::A, :X).should == true
     end
 
     it "returns C non-zero if a constant is defined in Object" do
-      @m.rb_const_defined(CApiModuleSpecs::A, :Module).should be_true
+      @m.rb_const_defined(CApiModuleSpecs::A, :Module).should == true
     end
   end
 
   describe "rb_const_defined_at" do
     # The fixture converts C boolean test to Ruby 'true' / 'false'
     it "returns C non-zero if a constant is defined" do
-      @m.rb_const_defined_at(CApiModuleSpecs::A, :X).should be_true
+      @m.rb_const_defined_at(CApiModuleSpecs::A, :X).should == true
     end
 
     it "does not search in ancestors for the constant" do
-      @m.rb_const_defined_at(CApiModuleSpecs::B, :X).should be_false
+      @m.rb_const_defined_at(CApiModuleSpecs::B, :X).should == false
     end
 
     it "does not search in Object" do
-      @m.rb_const_defined_at(CApiModuleSpecs::A, :Module).should be_false
+      @m.rb_const_defined_at(CApiModuleSpecs::A, :Module).should == false
     end
   end
 
@@ -166,11 +166,11 @@
     it "allows arbitrary names, including constant names not valid in Ruby" do
       -> {
         CApiModuleSpecs::A.const_get(:_INVALID)
-      }.should raise_error(NameError, /wrong constant name/)
+      }.should.raise(NameError, /wrong constant name/)
 
       -> {
         @m.rb_const_get(CApiModuleSpecs::A, :_INVALID)
-      }.should raise_error(NameError, /uninitialized constant/)
+      }.should.raise(NameError, /uninitialized constant/)
     end
   end
 
@@ -237,7 +237,7 @@ def method_to_be_aliased
   describe "rb_define_global_function" do
     it "defines a method on Kernel" do
       @m.rb_define_global_function("module_specs_global_function")
-      Kernel.should have_method(:module_specs_global_function)
+      Kernel.should.respond_to?(:module_specs_global_function)
       module_specs_global_function.should == :test_method
     end
   end
@@ -246,7 +246,7 @@ def method_to_be_aliased
     it "defines a method on a class" do
       cls = Class.new
       @m.rb_define_method(cls, "test_method")
-      cls.should have_instance_method(:test_method)
+      cls.should.method_defined?(:test_method, false)
       cls.new.test_method.should == :test_method
     end
 
@@ -285,7 +285,7 @@ def method_to_be_aliased
     it "defines a method on a module" do
       mod = Module.new
       @m.rb_define_method(mod, "test_method")
-      mod.should have_instance_method(:test_method)
+      mod.should.method_defined?(:test_method, false)
     end
 
     it "returns the correct arity of the method in module" do
@@ -313,7 +313,7 @@ def method_to_be_aliased
       cls = Class.new
       cls.include(@mod)
 
-      cls.should have_private_instance_method(:test_module_function)
+      cls.private_instance_methods(true).should.include?(:test_module_function)
     end
 
     it "returns the correct arity for private instance method" do
@@ -328,14 +328,14 @@ def method_to_be_aliased
     it "defines a private method on a class" do
       cls = Class.new
       @m.rb_define_private_method(cls, "test_method")
-      cls.should have_private_instance_method(:test_method)
+      cls.private_instance_methods(false).should.include?(:test_method)
       cls.new.send(:test_method).should == :test_method
     end
 
     it "defines a private method on a module" do
       mod = Module.new
       @m.rb_define_private_method(mod, "test_method")
-      mod.should have_private_instance_method(:test_method)
+      mod.private_instance_methods(false).should.include?(:test_method)
     end
   end
 
@@ -343,14 +343,14 @@ def method_to_be_aliased
     it "defines a protected method on a class" do
       cls = Class.new
       @m.rb_define_protected_method(cls, "test_method")
-      cls.should have_protected_instance_method(:test_method)
+      cls.protected_instance_methods(false).should.include?(:test_method)
       cls.new.send(:test_method).should == :test_method
     end
 
     it "defines a protected method on a module" do
       mod = Module.new
       @m.rb_define_protected_method(mod, "test_method")
-      mod.should have_protected_instance_method(:test_method)
+      mod.protected_instance_methods(false).should.include?(:test_method)
     end
   end
 
@@ -360,7 +360,7 @@ def method_to_be_aliased
       a = cls.new
       @m.rb_define_singleton_method a, "module_specs_singleton_method"
       a.module_specs_singleton_method.should == :test_method
-      -> { cls.new.module_specs_singleton_method }.should raise_error(NoMethodError)
+      -> { cls.new.module_specs_singleton_method }.should.raise(NoMethodError)
     end
   end
 
@@ -376,16 +376,16 @@ def ruby_test_method
     it "undef'ines a method on a class" do
       @class.new.ruby_test_method.should == :ruby_test_method
       @m.rb_undef_method @class, "ruby_test_method"
-      @class.should_not have_instance_method(:ruby_test_method)
+      @class.should_not.method_defined?(:ruby_test_method)
     end
 
     it "undefines private methods also" do
       @m.rb_undef_method @class, "initialize_copy"
-      -> { @class.new.dup }.should raise_error(NoMethodError)
+      -> { @class.new.dup }.should.raise(NoMethodError)
     end
 
     it "does not raise exceptions when passed a missing name" do
-      -> { @m.rb_undef_method @class, "not_exist" }.should_not raise_error
+      -> { @m.rb_undef_method @class, "not_exist" }.should_not.raise
     end
 
     describe "when given a frozen Class" do
@@ -394,11 +394,11 @@ def ruby_test_method
       end
 
       it "raises a FrozenError when passed a name" do
-        -> { @m.rb_undef_method @frozen, "ruby_test_method" }.should raise_error(FrozenError)
+        -> { @m.rb_undef_method @frozen, "ruby_test_method" }.should.raise(FrozenError)
       end
 
       it "raises a FrozenError when passed a missing name" do
-        -> { @m.rb_undef_method @frozen, "not_exist" }.should raise_error(FrozenError)
+        -> { @m.rb_undef_method @frozen, "not_exist" }.should.raise(FrozenError)
       end
     end
   end
@@ -413,7 +413,7 @@ def ruby_test_method
 
       cls.new.ruby_test_method.should == :ruby_test_method
       @m.rb_undef cls, :ruby_test_method
-      cls.should_not have_instance_method(:ruby_test_method)
+      cls.should_not.method_defined?(:ruby_test_method)
     end
   end
 
diff --git a/spec/ruby/optional/capi/mutex_spec.rb b/spec/ruby/optional/capi/mutex_spec.rb
index 71a2212e36c..fad9b4d1a25 100644
--- a/spec/ruby/optional/capi/mutex_spec.rb
+++ b/spec/ruby/optional/capi/mutex_spec.rb
@@ -10,64 +10,64 @@
 
   describe "rb_mutex_new" do
     it "creates a new mutex" do
-      @s.rb_mutex_new.should be_an_instance_of(Mutex)
+      @s.rb_mutex_new.should.instance_of?(Mutex)
     end
   end
 
   describe "rb_mutex_locked_p" do
     it "returns false if the mutex is not locked" do
-      @s.rb_mutex_locked_p(@m).should be_false
+      @s.rb_mutex_locked_p(@m).should == false
     end
 
     it "returns true if the mutex is locked" do
       @m.lock
-      @s.rb_mutex_locked_p(@m).should be_true
+      @s.rb_mutex_locked_p(@m).should == true
     end
   end
 
   describe "rb_mutex_trylock" do
     it "locks the mutex if not locked" do
-      @s.rb_mutex_trylock(@m).should be_true
-      @m.locked?.should be_true
+      @s.rb_mutex_trylock(@m).should == true
+      @m.locked?.should == true
     end
 
     it "returns false if the mutex is already locked" do
       @m.lock
-      @s.rb_mutex_trylock(@m).should be_false
-      @m.locked?.should be_true
+      @s.rb_mutex_trylock(@m).should == false
+      @m.locked?.should == true
     end
   end
 
   describe "rb_mutex_lock" do
     it "returns when the mutex isn't locked" do
       @s.rb_mutex_lock(@m).should == @m
-      @m.locked?.should be_true
+      @m.locked?.should == true
     end
 
     it "throws an exception when already locked in the same thread" do
       @m.lock
-      -> { @s.rb_mutex_lock(@m) }.should raise_error(ThreadError)
-      @m.locked?.should be_true
+      -> { @s.rb_mutex_lock(@m) }.should.raise(ThreadError)
+      @m.locked?.should == true
     end
   end
 
   describe "rb_mutex_unlock" do
     it "raises an exception when not locked" do
-      -> { @s.rb_mutex_unlock(@m) }.should raise_error(ThreadError)
-      @m.locked?.should be_false
+      -> { @s.rb_mutex_unlock(@m) }.should.raise(ThreadError)
+      @m.locked?.should == false
     end
 
     it "unlocks the mutex when locked" do
       @m.lock
       @s.rb_mutex_unlock(@m).should == @m
-      @m.locked?.should be_false
+      @m.locked?.should == false
     end
   end
 
   describe "rb_mutex_sleep" do
     it "throws an exception when the mutex is not locked" do
-      -> { @s.rb_mutex_sleep(@m, 0.1) }.should raise_error(ThreadError)
-      @m.locked?.should be_false
+      -> { @s.rb_mutex_sleep(@m, 0.1) }.should.raise(ThreadError)
+      @m.locked?.should == false
     end
 
     it "sleeps when the mutex is locked" do
@@ -76,13 +76,13 @@
       @s.rb_mutex_sleep(@m, 0.001)
       t2 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       (t2 - t1).should >= 0
-      @m.locked?.should be_true
+      @m.locked?.should == true
     end
   end
 
   describe "rb_mutex_synchronize" do
     it "calls the function while the mutex is locked" do
-      callback = -> { @m.locked?.should be_true }
+      callback = -> { @m.locked?.should == true }
       @s.rb_mutex_synchronize(@m, callback)
     end
 
diff --git a/spec/ruby/optional/capi/numeric_spec.rb b/spec/ruby/optional/capi/numeric_spec.rb
index e9667da5ba1..abfed135035 100644
--- a/spec/ruby/optional/capi/numeric_spec.rb
+++ b/spec/ruby/optional/capi/numeric_spec.rb
@@ -9,7 +9,7 @@
 
   describe "NUM2INT" do
     it "raises a TypeError if passed nil" do
-      -> { @s.NUM2INT(nil) }.should raise_error(TypeError)
+      -> { @s.NUM2INT(nil) }.should.raise(TypeError)
     end
 
     it "converts a Float" do
@@ -33,7 +33,7 @@
     end
 
     it "raises a RangeError if the value is more than 32bits" do
-      -> { @s.NUM2INT(0xffff_ffff+1) }.should raise_error(RangeError)
+      -> { @s.NUM2INT(0xffff_ffff+1) }.should.raise(RangeError)
     end
 
     it "calls #to_int to coerce the value" do
@@ -45,7 +45,7 @@
 
   describe "NUM2UINT" do
     it "raises a TypeError if passed nil" do
-      -> { @s.NUM2UINT(nil) }.should raise_error(TypeError)
+      -> { @s.NUM2UINT(nil) }.should.raise(TypeError)
     end
 
     it "converts a Float" do
@@ -69,17 +69,17 @@
     end
 
     it "raises a RangeError if the value is more than 32bits" do
-      -> { @s.NUM2UINT(0xffff_ffff+1) }.should raise_error(RangeError)
+      -> { @s.NUM2UINT(0xffff_ffff+1) }.should.raise(RangeError)
     end
 
     it "raises a RangeError if the value is less than 32bits negative" do
-      -> { @s.NUM2UINT(-0x8000_0000-1) }.should raise_error(RangeError)
+      -> { @s.NUM2UINT(-0x8000_0000-1) }.should.raise(RangeError)
     end
 
     it "raises a RangeError if the value is more than 64bits" do
       -> do
         @s.NUM2UINT(0xffff_ffff_ffff_ffff+1)
-      end.should raise_error(RangeError)
+      end.should.raise(RangeError)
     end
 
     it "calls #to_int to coerce the value" do
@@ -91,7 +91,7 @@
 
   describe "NUM2LONG" do
     it "raises a TypeError if passed nil" do
-      -> { @s.NUM2LONG(nil) }.should raise_error(TypeError)
+      -> { @s.NUM2LONG(nil) }.should.raise(TypeError)
     end
 
     it "converts a Float" do
@@ -116,7 +116,7 @@
       end
 
       it "raises a RangeError if the value is more than 32bits" do
-        -> { @s.NUM2LONG(0xffff_ffff+1) }.should raise_error(RangeError)
+        -> { @s.NUM2LONG(0xffff_ffff+1) }.should.raise(RangeError)
       end
     end
 
@@ -132,7 +132,7 @@
       it "raises a RangeError if the value is more than 64bits" do
         -> do
           @s.NUM2LONG(0xffff_ffff_ffff_ffff+1)
-        end.should raise_error(RangeError)
+        end.should.raise(RangeError)
       end
     end
 
@@ -145,7 +145,7 @@
 
   describe "NUM2SHORT" do
     it "raises a TypeError if passed nil" do
-      -> { @s.NUM2SHORT(nil) }.should raise_error(TypeError)
+      -> { @s.NUM2SHORT(nil) }.should.raise(TypeError)
     end
 
     it "converts a Float" do
@@ -161,7 +161,7 @@
     end
 
     it "raises a RangeError if the value is more than 32bits" do
-      -> { @s.NUM2SHORT(0xffff_ffff+1) }.should raise_error(RangeError)
+      -> { @s.NUM2SHORT(0xffff_ffff+1) }.should.raise(RangeError)
     end
 
     it "calls #to_int to coerce the value" do
@@ -173,7 +173,7 @@
 
   describe "INT2NUM" do
     it "raises a TypeError if passed nil" do
-      -> { @s.INT2NUM(nil) }.should raise_error(TypeError)
+      -> { @s.INT2NUM(nil) }.should.raise(TypeError)
     end
 
     it "converts a Float" do
@@ -181,7 +181,7 @@
     end
 
     it "raises a RangeError when passed a Bignum" do
-      -> { @s.INT2NUM(bignum_value) }.should raise_error(RangeError)
+      -> { @s.INT2NUM(bignum_value) }.should.raise(RangeError)
     end
 
     it "converts a Fixnum" do
@@ -195,7 +195,7 @@
 
   describe "NUM2ULONG" do
     it "raises a TypeError if passed nil" do
-      -> { @s.NUM2ULONG(nil) }.should raise_error(TypeError)
+      -> { @s.NUM2ULONG(nil) }.should.raise(TypeError)
     end
 
     it "converts a Float" do
@@ -227,7 +227,7 @@
       end
 
       it "raises a RangeError if the value is more than 32bits" do
-        -> { @s.NUM2ULONG(0xffff_ffff+1) }.should raise_error(RangeError)
+        -> { @s.NUM2ULONG(0xffff_ffff+1) }.should.raise(RangeError)
       end
     end
 
@@ -250,7 +250,7 @@
       it "raises a RangeError if the value is more than 64bits" do
         -> do
           @s.NUM2ULONG(0xffff_ffff_ffff_ffff+1)
-        end.should raise_error(RangeError)
+        end.should.raise(RangeError)
       end
     end
 
@@ -308,11 +308,11 @@
 
   describe "NUM2DBL" do
     it "raises a TypeError if passed nil" do
-      -> { @s.NUM2DBL(nil) }.should raise_error(TypeError)
+      -> { @s.NUM2DBL(nil) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if passed a String" do
-      -> { @s.NUM2DBL("1.2") }.should raise_error(TypeError)
+      -> { @s.NUM2DBL("1.2") }.should.raise(TypeError)
     end
 
     it "converts a Float" do
@@ -348,13 +348,13 @@
     end
 
     it "raises a TypeError when passed an empty String" do
-      -> { @s.NUM2CHR("") }.should raise_error(TypeError)
+      -> { @s.NUM2CHR("") }.should.raise(TypeError)
     end
   end
 
   describe "rb_num_zerodiv" do
     it "raises a RuntimeError" do
-      -> { @s.rb_num_zerodiv() }.should raise_error(ZeroDivisionError, 'divided by 0')
+      -> { @s.rb_num_zerodiv() }.should.raise(ZeroDivisionError, 'divided by 0')
     end
   end
 
@@ -386,7 +386,7 @@
     it "raises an ArgumentError when passed nil" do
       -> {
         @s.rb_cmpint(nil, 4)
-      }.should raise_error(ArgumentError)
+      }.should.raise(ArgumentError)
     end
   end
 
@@ -410,7 +410,7 @@
       obj = mock("rb_num_coerce_bin")
       obj.should_receive(:coerce).with(2).and_return(nil)
 
-      -> { @s.rb_num_coerce_bin(2, obj, :+) }.should raise_error(TypeError)
+      -> { @s.rb_num_coerce_bin(2, obj, :+) }.should.raise(TypeError)
     end
   end
 
@@ -435,14 +435,14 @@
       obj.should_receive(:coerce).with(2).and_raise(RuntimeError.new("my error"))
       -> {
         @s.rb_num_coerce_cmp(2, obj, :<=>)
-      }.should raise_error(RuntimeError, "my error")
+      }.should.raise(RuntimeError, "my error")
     end
 
     it "returns nil if #coerce does not return an Array" do
       obj = mock("rb_num_coerce_cmp")
       obj.should_receive(:coerce).with(2).and_return(nil)
 
-      @s.rb_num_coerce_cmp(2, obj, :<=>).should be_nil
+      @s.rb_num_coerce_cmp(2, obj, :<=>).should == nil
     end
   end
 
@@ -451,7 +451,7 @@
       obj = mock("rb_num_coerce_relop")
       obj.should_receive(:coerce).with(2).and_return([1, 2])
 
-      @s.rb_num_coerce_relop(2, obj, :<).should be_true
+      @s.rb_num_coerce_relop(2, obj, :<).should == true
     end
 
     it "calls the specified method on the first argument returned by #coerce" do
@@ -459,7 +459,7 @@
       obj.should_receive(:coerce).with(2).and_return([obj, 2])
       obj.should_receive(:<).with(2).and_return(false)
 
-      @s.rb_num_coerce_relop(2, obj, :<).should be_false
+      @s.rb_num_coerce_relop(2, obj, :<).should == false
     end
 
     it "raises an ArgumentError if #<op> returns nil" do
@@ -467,14 +467,14 @@
       obj.should_receive(:coerce).with(2).and_return([obj, 2])
       obj.should_receive(:<).with(2).and_return(nil)
 
-      -> { @s.rb_num_coerce_relop(2, obj, :<) }.should raise_error(ArgumentError)
+      -> { @s.rb_num_coerce_relop(2, obj, :<) }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError if #coerce does not return an Array" do
       obj = mock("rb_num_coerce_relop")
       obj.should_receive(:coerce).with(2).and_return(nil)
 
-      -> { @s.rb_num_coerce_relop(2, obj, :<) }.should raise_error(ArgumentError)
+      -> { @s.rb_num_coerce_relop(2, obj, :<) }.should.raise(ArgumentError)
     end
   end
 
diff --git a/spec/ruby/optional/capi/object_spec.rb b/spec/ruby/optional/capi/object_spec.rb
index 6716fd9e337..8e907a5a8ca 100644
--- a/spec/ruby/optional/capi/object_spec.rb
+++ b/spec/ruby/optional/capi/object_spec.rb
@@ -64,7 +64,7 @@ def six(a, b, *c, &d); end
     it "allocates a new uninitialized object" do
       o = @o.rb_obj_alloc(CApiObjectSpecs::Alloc)
       o.class.should == CApiObjectSpecs::Alloc
-      o.initialized.should be_nil
+      o.initialized.should == nil
     end
   end
 
@@ -77,17 +77,17 @@ def six(a, b, *c, &d); end
 
       obj2.foo.should == obj1.foo
 
-      obj2.should_not equal(obj1)
+      obj2.should_not.equal?(obj1)
     end
   end
 
   describe "rb_obj_call_init" do
     it "sends #initialize" do
       o = @o.rb_obj_alloc(CApiObjectSpecs::Alloc)
-      o.initialized.should be_nil
+      o.initialized.should == nil
 
       @o.rb_obj_call_init(o, 2, [:one, :two])
-      o.initialized.should be_true
+      o.initialized.should == true
       o.arguments.should == [:one, :two]
     end
 
@@ -235,7 +235,7 @@ def six(a, b, *c, &d); end
   describe "rb_obj_instance_variables" do
     it "returns an array with instance variable names as symbols" do
       o = ObjectTest.new
-      @o.rb_obj_instance_variables(o).should include(:@foo)
+      @o.rb_obj_instance_variables(o).should.include?(:@foo)
     end
   end
 
@@ -244,21 +244,21 @@ def six(a, b, *c, &d); end
       ary = [1, 2]
       ary.should_not_receive(:to_ary)
 
-      @o.rb_check_convert_type(ary, "Array", "to_ary").should equal(ary)
+      @o.rb_check_convert_type(ary, "Array", "to_ary").should.equal?(ary)
     end
 
     it "returns the passed object and does not call the converting method if the object is a subclass of the specified type" do
       obj = CApiObjectSpecs::SubArray.new
       obj.should_not_receive(:to_array)
 
-      @o.rb_check_convert_type(obj, "Array", "to_array").should equal(obj)
+      @o.rb_check_convert_type(obj, "Array", "to_array").should.equal?(obj)
     end
 
     it "returns nil if the converting method returns nil" do
       obj = mock("rb_check_convert_type")
       obj.should_receive(:to_array).and_return(nil)
 
-      @o.rb_check_convert_type(obj, "Array", "to_array").should be_nil
+      @o.rb_check_convert_type(obj, "Array", "to_array").should == nil
     end
 
     it "raises a TypeError if the converting method returns an object that is not the specified type" do
@@ -267,7 +267,7 @@ def six(a, b, *c, &d); end
 
       -> do
         @o.rb_check_convert_type(obj, "Array", "to_array")
-      end.should raise_error(TypeError)
+      end.should.raise(TypeError)
     end
   end
 
@@ -276,14 +276,14 @@ def six(a, b, *c, &d); end
       ary = [1, 2]
       ary.should_not_receive(:to_ary)
 
-      @o.rb_convert_type(ary, "Array", "to_ary").should equal(ary)
+      @o.rb_convert_type(ary, "Array", "to_ary").should.equal?(ary)
     end
 
     it "returns the passed object and does not call the converting method if the object is a subclass of the specified type" do
       obj = CApiObjectSpecs::SubArray.new
       obj.should_not_receive(:to_array)
 
-      @o.rb_convert_type(obj, "Array", "to_array").should equal(obj)
+      @o.rb_convert_type(obj, "Array", "to_array").should.equal?(obj)
     end
 
     it "raises a TypeError if the converting method returns nil" do
@@ -292,7 +292,7 @@ def six(a, b, *c, &d); end
 
       -> do
         @o.rb_convert_type(obj, "Array", "to_array")
-      end.should raise_error(TypeError)
+      end.should.raise(TypeError)
     end
 
     it "raises a TypeError if the converting method returns an object that is not the specified type" do
@@ -301,109 +301,109 @@ def six(a, b, *c, &d); end
 
       -> do
         @o.rb_convert_type(obj, "Array", "to_array")
-      end.should raise_error(TypeError)
+      end.should.raise(TypeError)
     end
   end
 
   describe "rb_check_array_type" do
     it "returns the argument if it's an Array" do
       x = Array.new
-      @o.rb_check_array_type(x).should equal(x)
+      @o.rb_check_array_type(x).should.equal?(x)
     end
 
     it "returns the argument if it's a kind of Array" do
       x = AryChild.new
-      @o.rb_check_array_type(x).should equal(x)
+      @o.rb_check_array_type(x).should.equal?(x)
     end
 
     it "returns nil when the argument does not respond to #to_ary" do
-      @o.rb_check_array_type(Object.new).should be_nil
+      @o.rb_check_array_type(Object.new).should == nil
     end
 
     it "sends #to_ary to the argument and returns the result if it's nil" do
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(nil)
-      @o.rb_check_array_type(obj).should be_nil
+      @o.rb_check_array_type(obj).should == nil
     end
 
     it "sends #to_ary to the argument and returns the result if it's an Array" do
       x = Array.new
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(x)
-      @o.rb_check_array_type(obj).should equal(x)
+      @o.rb_check_array_type(obj).should.equal?(x)
     end
 
     it "sends #to_ary to the argument and returns the result if it's a kind of Array" do
       x = AryChild.new
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(x)
-      @o.rb_check_array_type(obj).should equal(x)
+      @o.rb_check_array_type(obj).should.equal?(x)
     end
 
     it "sends #to_ary to the argument and raises TypeError if it's not a kind of Array" do
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(Object.new)
-      -> { @o.rb_check_array_type obj }.should raise_error(TypeError)
+      -> { @o.rb_check_array_type obj }.should.raise(TypeError)
     end
 
     it "does not rescue exceptions raised by #to_ary" do
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_raise(FrozenError)
-      -> { @o.rb_check_array_type obj }.should raise_error(FrozenError)
+      -> { @o.rb_check_array_type obj }.should.raise(FrozenError)
     end
   end
 
   describe "rb_check_string_type" do
     it "returns the argument if it's a String" do
       x = String.new
-      @o.rb_check_string_type(x).should equal(x)
+      @o.rb_check_string_type(x).should.equal?(x)
     end
 
     it "returns the argument if it's a kind of String" do
       x = StrChild.new
-      @o.rb_check_string_type(x).should equal(x)
+      @o.rb_check_string_type(x).should.equal?(x)
     end
 
     it "returns nil when the argument does not respond to #to_str" do
-      @o.rb_check_string_type(Object.new).should be_nil
+      @o.rb_check_string_type(Object.new).should == nil
     end
 
     it "sends #to_str to the argument and returns the result if it's nil" do
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(nil)
-      @o.rb_check_string_type(obj).should be_nil
+      @o.rb_check_string_type(obj).should == nil
     end
 
     it "sends #to_str to the argument and returns the result if it's a String" do
       x = String.new
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(x)
-      @o.rb_check_string_type(obj).should equal(x)
+      @o.rb_check_string_type(obj).should.equal?(x)
     end
 
     it "sends #to_str to the argument and returns the result if it's a kind of String" do
       x = StrChild.new
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(x)
-      @o.rb_check_string_type(obj).should equal(x)
+      @o.rb_check_string_type(obj).should.equal?(x)
     end
 
     it "sends #to_str to the argument and raises TypeError if it's not a kind of String" do
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(Object.new)
-      -> { @o.rb_check_string_type obj }.should raise_error(TypeError)
+      -> { @o.rb_check_string_type obj }.should.raise(TypeError)
     end
 
     it "does not rescue exceptions raised by #to_str" do
       obj = mock("to_str")
       obj.should_receive(:to_str).and_raise(RuntimeError)
-      -> { @o.rb_check_string_type obj }.should raise_error(RuntimeError)
+      -> { @o.rb_check_string_type obj }.should.raise(RuntimeError)
     end
   end
 
   describe "rb_check_to_integer" do
     it "returns the object when passed a Fixnum" do
-      @o.rb_check_to_integer(5, "to_int").should equal(5)
+      @o.rb_check_to_integer(5, "to_int").should.equal?(5)
     end
 
     it "returns the object when passed a Bignum" do
@@ -414,7 +414,7 @@ def six(a, b, *c, &d); end
       obj = mock("rb_check_to_integer")
       obj.should_receive(:to_integer).and_return(10)
 
-      @o.rb_check_to_integer(obj, "to_integer").should equal(10)
+      @o.rb_check_to_integer(obj, "to_integer").should.equal?(10)
     end
 
     it "calls the converting method and returns a Bignum value" do
@@ -428,23 +428,23 @@ def six(a, b, *c, &d); end
       obj = mock("rb_check_to_integer")
       obj.should_receive(:to_integer).and_return(nil)
 
-      @o.rb_check_to_integer(obj, "to_integer").should be_nil
+      @o.rb_check_to_integer(obj, "to_integer").should == nil
     end
 
     it "returns nil when the converting method does not return an Integer" do
       obj = mock("rb_check_to_integer")
       obj.should_receive(:to_integer).and_return("string")
 
-      @o.rb_check_to_integer(obj, "to_integer").should be_nil
+      @o.rb_check_to_integer(obj, "to_integer").should == nil
     end
   end
 
   describe "FL_ABLE" do
     it "returns correct boolean for type" do
-      @o.FL_ABLE(Object.new).should be_true
-      @o.FL_ABLE(true).should be_false
-      @o.FL_ABLE(nil).should be_false
-      @o.FL_ABLE(1).should be_false
+      @o.FL_ABLE(Object.new).should == true
+      @o.FL_ABLE(true).should == false
+      @o.FL_ABLE(nil).should == false
+      @o.FL_ABLE(1).should == false
     end
   end
 
@@ -476,9 +476,9 @@ def six(a, b, *c, &d); end
 
     it "returns the singleton class if it exists" do
       o = ObjectTest.new
-      @o.rb_class_of(o).should equal ObjectTest
+      @o.rb_class_of(o).should.equal? ObjectTest
       s = o.singleton_class
-      @o.rb_class_of(o).should equal s
+      @o.rb_class_of(o).should.equal? s
     end
   end
 
@@ -493,7 +493,7 @@ def six(a, b, *c, &d); end
     it "does not return the singleton class if it exists" do
       o = ObjectTest.new
       o.singleton_class
-      @o.rb_obj_class(o).should equal ObjectTest
+      @o.rb_obj_class(o).should.equal? ObjectTest
     end
   end
 
@@ -553,15 +553,15 @@ class DescArray < Array
     it "raises an exception if the object is not of the expected type" do
       -> {
         @o.rb_check_type([], Object.new)
-      }.should raise_error(TypeError, 'wrong argument type Array (expected Object)')
+      }.should.raise(TypeError, 'wrong argument type Array (expected Object)')
 
       -> {
         @o.rb_check_type(ObjectTest, Module.new)
-      }.should raise_error(TypeError, 'wrong argument type Class (expected Module)')
+      }.should.raise(TypeError, 'wrong argument type Class (expected Module)')
 
       -> {
         @o.rb_check_type(nil, "string")
-      }.should raise_error(TypeError, 'wrong argument type nil (expected String)')
+      }.should.raise(TypeError, 'wrong argument type nil (expected String)')
     end
   end
 
@@ -592,49 +592,49 @@ class DescArray < Array
 
   describe "RTEST" do
     it "returns C false if passed Qfalse" do
-      @o.RTEST(false).should be_false
+      @o.RTEST(false).should == false
     end
 
     it "returns C false if passed Qnil" do
-      @o.RTEST(nil).should be_false
+      @o.RTEST(nil).should == false
     end
 
     it "returns C true if passed Qtrue" do
-      @o.RTEST(true).should be_true
+      @o.RTEST(true).should == true
     end
 
     it "returns C true if passed a Symbol" do
-      @o.RTEST(:test).should be_true
+      @o.RTEST(:test).should == true
     end
 
     it "returns C true if passed an Object" do
-      @o.RTEST(Object.new).should be_true
+      @o.RTEST(Object.new).should == true
     end
   end
 
   describe "rb_special_const_p" do
     it "returns true if passed Qfalse" do
-      @o.rb_special_const_p(false).should be_true
+      @o.rb_special_const_p(false).should == true
     end
 
     it "returns true if passed Qtrue" do
-      @o.rb_special_const_p(true).should be_true
+      @o.rb_special_const_p(true).should == true
     end
 
     it "returns true if passed Qnil" do
-      @o.rb_special_const_p(nil).should be_true
+      @o.rb_special_const_p(nil).should == true
     end
 
     it "returns true if passed a Symbol" do
-      @o.rb_special_const_p(:test).should be_true
+      @o.rb_special_const_p(:test).should == true
     end
 
     it "returns true if passed a Fixnum" do
-      @o.rb_special_const_p(10).should be_true
+      @o.rb_special_const_p(10).should == true
     end
 
     it "returns false if passed an Object" do
-      @o.rb_special_const_p(Object.new).should be_false
+      @o.rb_special_const_p(Object.new).should == false
     end
   end
 
@@ -665,7 +665,7 @@ def reach
     it "freezes the object passed to it" do
       obj = ""
       @o.rb_obj_freeze(obj).should == obj
-      obj.frozen?.should be_true
+      obj.frozen?.should == true
     end
   end
 
@@ -674,7 +674,7 @@ def reach
       obj = ObjectTest
       -> do
         @o.rb_obj_instance_eval(obj) { include Kernel }
-      end.should_not raise_error(NoMethodError)
+      end.should_not.raise(NoMethodError)
     end
   end
 
@@ -706,12 +706,12 @@ def reach
 
   describe "rb_check_frozen" do
     it "raises a FrozenError if the obj is frozen" do
-      -> { @o.rb_check_frozen("".freeze) }.should raise_error(FrozenError)
+      -> { @o.rb_check_frozen("".freeze) }.should.raise(FrozenError)
     end
 
     it "does nothing when object isn't frozen" do
       obj = +""
-      -> { @o.rb_check_frozen(obj) }.should_not raise_error(TypeError)
+      -> { @o.rb_check_frozen(obj) }.should_not.raise(TypeError)
     end
   end
 
@@ -719,13 +719,13 @@ def reach
     it "converts an Integer to string" do
       obj = 1
       i = @o.rb_any_to_s(obj)
-      i.should be_kind_of(String)
+      i.should.is_a?(String)
     end
 
     it "converts an Object to string" do
       obj = Object.new
       i = @o.rb_any_to_s(obj)
-      i.should be_kind_of(String)
+      i.should.is_a?(String)
     end
   end
 
@@ -751,61 +751,61 @@ def reach
     it "raises a TypeError if #to_int does not return an Integer" do
       x = mock("to_int")
       x.should_receive(:to_int).and_return("5")
-      -> { @o.rb_to_int(x) }.should raise_error(TypeError)
+      -> { @o.rb_to_int(x) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if called with nil" do
-      -> { @o.rb_to_int(nil) }.should raise_error(TypeError)
+      -> { @o.rb_to_int(nil) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if called with true" do
-      -> { @o.rb_to_int(true) }.should raise_error(TypeError)
+      -> { @o.rb_to_int(true) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if called with false" do
-      -> { @o.rb_to_int(false) }.should raise_error(TypeError)
+      -> { @o.rb_to_int(false) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if called with a String" do
-      -> { @o.rb_to_int("1") }.should raise_error(TypeError)
+      -> { @o.rb_to_int("1") }.should.raise(TypeError)
     end
   end
 
   describe "rb_equal" do
     it "returns true if the arguments are the same exact object" do
       s = "hello"
-      @o.rb_equal(s, s).should be_true
+      @o.rb_equal(s, s).should == true
     end
 
     it "calls == to check equality and coerces to true/false" do
       m = mock("string")
       m.should_receive(:==).and_return(8)
-      @o.rb_equal(m, "hello").should be_true
+      @o.rb_equal(m, "hello").should == true
 
       m2 = mock("string")
       m2.should_receive(:==).and_return(nil)
-      @o.rb_equal(m2, "hello").should be_false
+      @o.rb_equal(m2, "hello").should == false
     end
   end
 
   describe "rb_class_inherited_p" do
 
     it "returns true if mod equals arg" do
-      @o.rb_class_inherited_p(Array, Array).should be_true
+      @o.rb_class_inherited_p(Array, Array).should == true
     end
 
     it "returns true if mod is a subclass of arg" do
-      @o.rb_class_inherited_p(Array, Object).should be_true
+      @o.rb_class_inherited_p(Array, Object).should == true
     end
 
     it "returns nil if mod is not a subclass of arg" do
-      @o.rb_class_inherited_p(Array, Hash).should be_nil
+      @o.rb_class_inherited_p(Array, Hash).should == nil
     end
 
     it "raises a TypeError if arg is no class or module" do
       ->{
         @o.rb_class_inherited_p(1, 2)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
   end
@@ -929,7 +929,7 @@ def reach
         @o.rb_define_alloc_func(klass)
         obj = klass.allocate
         obj.class.should.equal?(klass)
-        obj.should have_instance_variable(:@from_custom_allocator)
+        obj.should.instance_variable_defined?(:@from_custom_allocator)
       end
 
       it "sets up the allocator for a subclass of String" do
@@ -937,7 +937,7 @@ def reach
         @o.rb_define_alloc_func(klass)
         obj = klass.allocate
         obj.class.should.equal?(klass)
-        obj.should have_instance_variable(:@from_custom_allocator)
+        obj.should.instance_variable_defined?(:@from_custom_allocator)
         obj.should == ""
       end
 
@@ -946,7 +946,7 @@ def reach
         @o.rb_define_alloc_func(klass)
         obj = klass.allocate
         obj.class.should.equal?(klass)
-        obj.should have_instance_variable(:@from_custom_allocator)
+        obj.should.instance_variable_defined?(:@from_custom_allocator)
         obj.should == []
       end
     end
diff --git a/spec/ruby/optional/capi/proc_spec.rb b/spec/ruby/optional/capi/proc_spec.rb
index 8b94432f3e2..1c250fee761 100644
--- a/spec/ruby/optional/capi/proc_spec.rb
+++ b/spec/ruby/optional/capi/proc_spec.rb
@@ -36,7 +36,7 @@
     it "calls the C function with arguments in argv" do
       @prc2.call(1, :foo).should == :foo
       @prc2.call(2, :foo, :bar).should == :bar
-      -> { @prc2.call(3, :foo, :bar) }.should raise_error(ArgumentError)
+      -> { @prc2.call(3, :foo, :bar) }.should.raise(ArgumentError)
     end
 
     it "calls the C function with the block passed in blockarg" do
@@ -95,7 +95,7 @@
     it "raises TypeError if the last argument is not a Hash" do
       -> {
         @p.rb_proc_call_kw(proc {}, [42])
-      }.should raise_error(TypeError, 'no implicit conversion of Integer into Hash')
+      }.should.raise(TypeError, 'no implicit conversion of Integer into Hash')
     end
   end
 
@@ -125,7 +125,7 @@
     it "raises TypeError if the last argument is not a Hash" do
       -> {
         @p.rb_proc_call_with_block_kw(proc {}, [42], proc {})
-      }.should raise_error(TypeError, 'no implicit conversion of Integer into Hash')
+      }.should.raise(TypeError, 'no implicit conversion of Integer into Hash')
     end
 
     it "passes keyword arguments to the proc when a block is nil" do
@@ -138,19 +138,19 @@
   describe "rb_obj_is_proc" do
     it "returns true for Proc" do
       prc = Proc.new {|a,b| a * b }
-      @p.rb_obj_is_proc(prc).should be_true
+      @p.rb_obj_is_proc(prc).should == true
     end
 
     it "returns true for subclass of Proc" do
       prc = Class.new(Proc).new {}
-      @p.rb_obj_is_proc(prc).should be_true
+      @p.rb_obj_is_proc(prc).should == true
     end
 
     it "returns false for non Proc instances" do
-      @p.rb_obj_is_proc("aoeui").should be_false
-      @p.rb_obj_is_proc(123).should be_false
-      @p.rb_obj_is_proc(true).should be_false
-      @p.rb_obj_is_proc([]).should be_false
+      @p.rb_obj_is_proc("aoeui").should == false
+      @p.rb_obj_is_proc(123).should == false
+      @p.rb_obj_is_proc(true).should == false
+      @p.rb_obj_is_proc([]).should == false
     end
   end
 end
@@ -172,17 +172,17 @@
   it "raises an ArgumentError when the C function calls a Ruby method that calls Proc.new" do
     -> {
       @p.rb_Proc_new(2) { :called }
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   # Ruby -> C -> Ruby -> C -> rb_funcall(Proc.new)
   it "raises an ArgumentError when the C function calls a Ruby method and that method calls a C function that calls Proc.new" do
     def @p.redispatch() rb_Proc_new(0) end
-    -> { @p.rb_Proc_new(3) { :called } }.should raise_error(ArgumentError)
+    -> { @p.rb_Proc_new(3) { :called } }.should.raise(ArgumentError)
   end
 
   # Ruby -> C -> Ruby -> block_given?
   it "returns false from block_given? in a Ruby method called by the C function" do
-    @p.rb_Proc_new(6).should be_false
+    @p.rb_Proc_new(6).should == false
   end
 end
diff --git a/spec/ruby/optional/capi/range_spec.rb b/spec/ruby/optional/capi/range_spec.rb
index 80c052e79a3..9213862aa43 100644
--- a/spec/ruby/optional/capi/range_spec.rb
+++ b/spec/ruby/optional/capi/range_spec.rb
@@ -31,8 +31,8 @@
     end
 
     it "raises an ArgumentError when the given start and end can't be compared by using #<=>" do
-      -> { @s.rb_range_new(1, mock('x'))         }.should raise_error(ArgumentError)
-      -> { @s.rb_range_new(mock('x'), mock('y')) }.should raise_error(ArgumentError)
+      -> { @s.rb_range_new(1, mock('x'))         }.should.raise(ArgumentError)
+      -> { @s.rb_range_new(mock('x'), mock('y')) }.should.raise(ArgumentError)
     end
   end
 
@@ -41,7 +41,7 @@
       beg, fin, excl = @s.rb_range_values(10..20)
       beg.should == 10
       fin.should == 20
-      excl.should be_false
+      excl.should == false
     end
 
     it "stores the range properties of non-Range object" do
@@ -62,7 +62,7 @@ def range_like.exclude_end?
       beg, fin, excl = @s.rb_range_values(range_like)
       beg.should == 10
       fin.should == 20
-      excl.should be_false
+      excl.should == false
     end
   end
 
@@ -70,7 +70,7 @@ def range_like.exclude_end?
     it "returns correct begin, length and result" do
       r = 2..5
       begp, lenp, result = @s.rb_range_beg_len(r, 10, 0)
-      result.should be_true
+      result.should == true
       begp.should == 2
       lenp.should == 4
     end
@@ -78,18 +78,18 @@ def range_like.exclude_end?
     it "returns nil when not in range" do
       r = 2..5
       begp, lenp, result = @s.rb_range_beg_len(r, 1, 0)
-      result.should be_nil
+      result.should == nil
     end
 
     it "raises a RangeError when not in range and err is 1" do
       r = -5..-1
-      -> { @s.rb_range_beg_len(r, 1, 1) }.should raise_error(RangeError)
+      -> { @s.rb_range_beg_len(r, 1, 1) }.should.raise(RangeError)
     end
 
     it "returns nil when not in range and err is 0" do
       r = -5..-1
       begp, lenp, result =  @s.rb_range_beg_len(r, 1, 0)
-      result.should be_nil
+      result.should == nil
     end
   end
 
@@ -133,7 +133,7 @@ def object.exclude_end?
       error_code = 0
 
       success, beg, len, step = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
-      success.should be_true
+      success.should == true
 
       beg.should == 2
       len.should == 4
@@ -145,7 +145,7 @@ def object.exclude_end?
       error_code = 0
 
       success, _, len, _ = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
-      success.should be_true
+      success.should == true
       len.should == 3
     end
 
@@ -154,7 +154,7 @@ def object.exclude_end?
       error_code = 0
 
       success, beg, len, _ = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
-      success.should be_true
+      success.should == true
 
       beg.should == 4
       len.should == 2
@@ -165,7 +165,7 @@ def object.exclude_end?
       error_code = 0
 
       success, beg, len, _ = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
-      success.should be_true
+      success.should == true
 
       beg.should == 2
       len.should == 4
@@ -176,7 +176,7 @@ def object.exclude_end?
       error_code = 0
 
       success, _, len, _ = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
-      success.should be_true
+      success.should == true
       len.should == 4
     end
 
@@ -185,7 +185,7 @@ def object.exclude_end?
       error_code = 0
 
       success, beg, len, step = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
-      success.should be_true
+      success.should == true
 
       beg.should == 5
       len.should == 0
@@ -197,7 +197,7 @@ def object.exclude_end?
       error_code = 0
 
       success, = @s.rb_arithmetic_sequence_beg_len_step(as, 1, error_code)
-      success.should be_nil
+      success.should == nil
     end
 
     it "returns nil when not in range, negative boundaries and error code = 0" do
@@ -205,7 +205,7 @@ def object.exclude_end?
       error_code = 0
 
       success, = @s.rb_arithmetic_sequence_beg_len_step(as, 1, 0)
-      success.should be_nil
+      success.should == nil
     end
 
     it "returns begin, length and step and doesn't raise a RangeError when not in range and error code = 1" do
@@ -213,7 +213,7 @@ def object.exclude_end?
       error_code = 1
 
       success, beg, len, step = @s.rb_arithmetic_sequence_beg_len_step(as, 1, error_code)
-      success.should be_true
+      success.should == true
 
       beg.should == 2
       len.should == 4
@@ -225,7 +225,7 @@ def object.exclude_end?
       error_code = 1
 
       success, = @s.rb_arithmetic_sequence_beg_len_step(as, 1, error_code)
-      success.should be_nil
+      success.should == nil
     end
   end
 end
diff --git a/spec/ruby/optional/capi/regexp_spec.rb b/spec/ruby/optional/capi/regexp_spec.rb
index 49ac79f5c48..f233b5e3b3c 100644
--- a/spec/ruby/optional/capi/regexp_spec.rb
+++ b/spec/ruby/optional/capi/regexp_spec.rb
@@ -104,7 +104,7 @@
       end
 
       Thread.pass while thr.status and !running
-      $~.should be_nil
+      $~.should == nil
 
       thr.join
     end
diff --git a/spec/ruby/optional/capi/set_spec.rb b/spec/ruby/optional/capi/set_spec.rb
index 3e35be0505f..21a9756236e 100644
--- a/spec/ruby/optional/capi/set_spec.rb
+++ b/spec/ruby/optional/capi/set_spec.rb
@@ -64,7 +64,7 @@
     describe "rb_set_clear" do
       it "empties and returns self" do
         set = Set[1]
-        @s.rb_set_clear(set).should equal(set)
+        @s.rb_set_clear(set).should.equal?(set)
         set.should == Set[]
       end
     end
diff --git a/spec/ruby/optional/capi/spec_helper.rb b/spec/ruby/optional/capi/spec_helper.rb
index d937c967d06..49ce23d8743 100644
--- a/spec/ruby/optional/capi/spec_helper.rb
+++ b/spec/ruby/optional/capi/spec_helper.rb
@@ -89,6 +89,12 @@ def compile_extension(name)
           $ruby = ENV.values_at('RUBY_EXE', 'RUBY_FLAGS').join(' ')
           # MRI magic to consider building non-bundled extensions
           $extout = nil
+          if RbConfig::CONFIG.key?("buildlibdir") # The top directory where the libruby is built.
+            # Prepend the dummy macro to bypass the conversion in `with_destdir` on DOSISH
+            # platforms, where the drive letter is replaced with `$(DESTDIR)`.  `DESTDIR` is
+            # overridden by the command line argument bellow.
+            RbConfig::MAKEFILE_CONFIG["buildlibdir"] = "$(empty)" + RbConfig::CONFIG["buildlibdir"]
+          end
           append_cflags '-Wno-declaration-after-statement'
           #{"append_cflags #{ruby_repository_extra_include_dir.inspect}" if ruby_repository_extra_include_dir}
           create_makefile(#{ext.inspect})
@@ -100,7 +106,7 @@ def compile_extension(name)
 
       # Do not capture stderr as we want to show compiler warnings
       make, opts = setup_make
-      output = IO.popen([make, "V=1", "DESTDIR=", opts], &:read)
+      output = IO.popen([*make, "V=1", "DESTDIR=", opts], &:read)
       raise "#{make} failed:\n#{output}" unless $?.success?
       $stderr.puts output if debug
 
@@ -117,22 +123,34 @@ def compile_extension(name)
 def setup_make
   make = ENV['MAKE']
   make ||= (RbConfig::CONFIG['host_os'].include?("mswin") ? "nmake" : "make")
-  make_flags = ENV["MAKEFLAGS"] || ''
+  env = %w[MFLAGS MAKEFLAGS GNUMAKEFLAGS].to_h {|var| [var, ENV[var]]}
+  make_flags = env["MAKEFLAGS"] || ''
 
   # suppress logo of nmake.exe to stderr
   if File.basename(make, ".*").downcase == "nmake" and !make_flags.include?("l")
-    ENV["MAKEFLAGS"] = "l#{make_flags}"
+    env["MAKEFLAGS"] = "l#{make_flags}"
   end
 
   opts = {}
   if /(?:\A|\s)--jobserver-(?:auth|fds)=(\d+),(\d+)/ =~ make_flags
     [$1, $2].each do |fd|
-      fd = fd.to_i(10)
+      fd = IO.for_fd(fd.to_i(10), autoclose: false)
       opts[fd] = fd
+    rescue
+      # Jobserver is not usable, maybe no `+` flag or on Windows.
+      job_options = /\A\s*(?:-j\d+\s*|-\S+\Kj\d+)|(?:\G|\s)\K--jobserver-(?:auth|fds)=\S+\s*/
+      env["MAKEFLAGS"] = make_flags.gsub(job_options, '')
+      %w[GNUMAKEFLAGS MFLAGS].each do |var|
+        if flags = env[var]
+          env[var] = flags.gsub(job_options, '')
+        end
+      end
+      opts.clear
+      break
     end
   end
 
-  [make, opts]
+  [[env, make], opts]
 end
 
 def load_extension(name)
diff --git a/spec/ruby/optional/capi/string_spec.rb b/spec/ruby/optional/capi/string_spec.rb
index 889f0a6cfe5..3e095f05c83 100644
--- a/spec/ruby/optional/capi/string_spec.rb
+++ b/spec/ruby/optional/capi/string_spec.rb
@@ -286,13 +286,13 @@ def inspect
     it "returns a dup of the original String" do
       a = "abc"
       b = @s.rb_str_encode("abc", "us-ascii", 0, nil)
-      a.should_not equal(b)
+      a.should_not.equal?(b)
     end
 
     it "returns a duplicate of the original when the encoding doesn't change" do
       a = "abc"
       b = @s.rb_str_encode("abc", Encoding::UTF_8, 0, nil)
-      a.should_not equal(b)
+      a.should_not.equal?(b)
     end
 
     it "accepts encoding flags" do
@@ -320,7 +320,7 @@ def inspect
       str1 = "hi"
       str2 = @s.rb_str_new3 str1
       str1.should == str2
-      str1.should_not equal str2
+      str1.should_not.equal? str2
     end
   end
 
@@ -330,7 +330,7 @@ def inspect
       str1.freeze
       str2 = @s.rb_str_new4 str1
       str1.should == str2
-      str1.should equal(str2)
+      str1.should.equal?(str2)
       str1.should.frozen?
       str2.should.frozen?
     end
@@ -339,7 +339,7 @@ def inspect
       str1 = "hi"
       str2 = @s.rb_str_new4 str1
       str1.should == str2
-      str1.should_not equal(str2)
+      str1.should_not.equal?(str2)
       str2.should.frozen?
     end
   end
@@ -349,7 +349,7 @@ def inspect
       str1 = "hi"
       str2 = @s.rb_str_dup str1
       str1.should == str2
-      str1.should_not equal str2
+      str1.should_not.equal? str2
     end
   end
 
@@ -370,7 +370,7 @@ def inspect
     end
 
     it "raises a TypeError trying to append non-String-like object" do
-      -> { @s.rb_str_append("Hello", 32323)}.should raise_error(TypeError)
+      -> { @s.rb_str_append("Hello", 32323)}.should.raise(TypeError)
     end
 
     it "changes Encoding if a string is appended to an empty string" do
@@ -499,7 +499,7 @@ def inspect
     end
 
     it "converts a C string to a Fixnum strictly if base is 0" do
-      -> { @s.rb_cstr2inum("1234a", 0) }.should raise_error(ArgumentError)
+      -> { @s.rb_cstr2inum("1234a", 0) }.should.raise(ArgumentError)
     end
   end
 
@@ -517,7 +517,7 @@ def inspect
     end
 
     it "converts a C string to a Fixnum strictly" do
-      -> { @s.rb_cstr_to_inum("1234a", 10, true) }.should raise_error(ArgumentError)
+      -> { @s.rb_cstr_to_inum("1234a", 10, true) }.should.raise(ArgumentError)
     end
   end
 
@@ -536,6 +536,61 @@ def inspect
     end
   end
 
+  describe "rb_str_sublen" do
+    it "returns the character length for a given byte offset in an ASCII string" do
+      @s.rb_str_sublen("hello", 3).should == 3
+    end
+
+    it "returns the character length for a given byte offset in a multibyte string" do
+      # "hëllo" where 'ë' is 2 bytes in UTF-8, total 6 bytes
+      str = "hëllo"
+      @s.rb_str_sublen(str, 3).should == 2
+    end
+
+    it "returns 0 for byte offset 0" do
+      @s.rb_str_sublen("hello", 0).should == 0
+    end
+
+    it "returns the full character length for the total byte length" do
+      str = "hëllo"
+      @s.rb_str_sublen(str, str.bytesize).should == str.length
+    end
+  end
+
+  describe "rb_str_subpos" do
+    it "returns [byte_offset, byte_length] for a valid character offset in an ASCII string" do
+      @s.rb_str_subpos("hello", 1).should == [1, 4]
+    end
+
+    it "returns [byte_offset, byte_length] for a valid character offset in a multibyte string" do
+      # "hëllo" where 'ë' is 2 bytes in UTF-8
+      str = "hëllo"
+      @s.rb_str_subpos(str, 0).should == [0, 6]
+      @s.rb_str_subpos(str, 1).should == [1, 5]
+      @s.rb_str_subpos(str, 2).should == [3, 3]
+    end
+
+    it "returns [0, byte_length] for offset 0" do
+      @s.rb_str_subpos("hello", 0).should == [0, 5]
+    end
+
+    it "returns nil for a negative offset that is out of range" do
+      @s.rb_str_subpos("hello", -6).should == nil
+    end
+
+    it "returns the correct position for a negative offset" do
+      @s.rb_str_subpos("hello", -2).should == [3, 2]
+    end
+
+    it "returns [byte_length, 0] when offset equals string length" do
+      @s.rb_str_subpos("hello", 5).should == [5, 0]
+    end
+
+    it "returns nil when offset is beyond string length" do
+      @s.rb_str_subpos("hello", 6).should == nil
+    end
+  end
+
   describe "rb_str_to_str" do
     it "calls #to_str to coerce the value to a String" do
       @s.rb_str_to_str("foo").should == "foo"
@@ -543,8 +598,8 @@ def inspect
     end
 
     it "raises a TypeError if coercion fails" do
-      -> { @s.rb_str_to_str(0) }.should raise_error(TypeError)
-      -> { @s.rb_str_to_str(CApiStringSpecs::InvalidTostrTest.new) }.should raise_error(TypeError)
+      -> { @s.rb_str_to_str(0) }.should.raise(TypeError)
+      -> { @s.rb_str_to_str(CApiStringSpecs::InvalidTostrTest.new) }.should.raise(TypeError)
     end
   end
 
@@ -668,7 +723,7 @@ def inspect
     it "does not call #to_s on non-String objects" do
       str = mock("fake")
       str.should_not_receive(:to_s)
-      -> { @s.send(@method, str) }.should raise_error(TypeError)
+      -> { @s.send(@method, str) }.should.raise(TypeError)
     end
   end
 
@@ -681,7 +736,7 @@ def inspect
 
   describe "rb_str_modify" do
     it "raises an error if the string is frozen" do
-      -> { @s.rb_str_modify("frozen".freeze) }.should raise_error(FrozenError)
+      -> { @s.rb_str_modify("frozen".freeze) }.should.raise(FrozenError)
     end
   end
 
@@ -712,7 +767,7 @@ def inspect
     end
 
     it "raises an error if the string is frozen" do
-      -> { @s.rb_str_modify_expand("frozen".freeze, 10) }.should raise_error(FrozenError)
+      -> { @s.rb_str_modify_expand("frozen".freeze, 10) }.should.raise(FrozenError)
     end
   end
 
@@ -768,14 +823,14 @@ def inspect
     it "freezes the string" do
       s = ""
       @s.rb_str_freeze(s).should == s
-      s.frozen?.should be_true
+      s.frozen?.should == true
     end
   end
 
   describe "rb_str_hash" do
     it "hashes the string into a number" do
       s = "hello"
-      @s.rb_str_hash(s).should be_kind_of(Integer)
+      @s.rb_str_hash(s).should.is_a?(Integer)
     end
   end
 
@@ -791,7 +846,7 @@ def inspect
   # is available. There is no guarantee this even does
   # anything at all
   it "indicates data for a string might be freed" do
-    @s.rb_str_free("xyz").should be_nil
+    @s.rb_str_free("xyz").should == nil
   end
 end
 
@@ -833,12 +888,12 @@ def inspect
   describe "rb_str_equal" do
     it "compares two same strings" do
       s = "hello"
-      @s.rb_str_equal(s, "hello").should be_true
+      @s.rb_str_equal(s, "hello").should == true
     end
 
     it "compares two different strings" do
       s = "hello"
-      @s.rb_str_equal(s, "hella").should be_false
+      @s.rb_str_equal(s, "hella").should == false
     end
   end
 
@@ -873,7 +928,7 @@ def inspect
 #  -      s.should == "\xA4\xA2\xA4\xEC".dup.force_encoding("euc-jp")
 #  +      x = [0xA4, 0xA2, 0xA4, 0xEC].pack('C4')#.force_encoding('binary')
 #  +      s.should == x
-#         s.encoding.should equal(Encoding::EUC_JP)
+#         s.encoding.should.equal?(Encoding::EUC_JP)
 #     end
 
     it "transcodes a String to Encoding.default_internal if it is set" do
@@ -883,7 +938,7 @@ def inspect
       s = @s.rb_external_str_new_with_enc(a, a.bytesize, Encoding::UTF_8)
       x = [0xA4, 0xA2, 0xA4, 0xEC].pack('C4').force_encoding('euc-jp')
       s.should == x
-      s.encoding.should equal(Encoding::EUC_JP)
+      s.encoding.should.equal?(Encoding::EUC_JP)
     end
   end
 
@@ -891,7 +946,7 @@ def inspect
     it "returns a String with 'locale' encoding" do
       s = @s.rb_locale_str_new("abc", 3)
       s.should == "abc".dup.force_encoding(Encoding.find("locale"))
-      s.encoding.should equal(Encoding.find("locale"))
+      s.encoding.should.equal?(Encoding.find("locale"))
     end
   end
 
@@ -899,14 +954,14 @@ def inspect
     it "returns a String with 'locale' encoding" do
       s = @s.rb_locale_str_new_cstr("abc")
       s.should == "abc".dup.force_encoding(Encoding.find("locale"))
-      s.encoding.should equal(Encoding.find("locale"))
+      s.encoding.should.equal?(Encoding.find("locale"))
     end
   end
 
   describe "rb_str_conv_enc" do
     it "returns the original String when to encoding is not specified" do
       a = "abc".dup.force_encoding("us-ascii")
-      @s.rb_str_conv_enc(a, Encoding::US_ASCII, nil).should equal(a)
+      @s.rb_str_conv_enc(a, Encoding::US_ASCII, nil).should.equal?(a)
     end
 
     it "returns the original String if a transcoding error occurs" do
@@ -929,17 +984,17 @@ def inspect
     describe "when the String encoding is equal to the destination encoding" do
       it "returns the original String" do
         a = "abc".dup.force_encoding("us-ascii")
-        @s.rb_str_conv_enc(a, Encoding::US_ASCII, Encoding::US_ASCII).should equal(a)
+        @s.rb_str_conv_enc(a, Encoding::US_ASCII, Encoding::US_ASCII).should.equal?(a)
       end
 
       it "returns the original String if the destination encoding is ASCII compatible and the String has no high bits set" do
         a = "abc".encode("us-ascii")
-        @s.rb_str_conv_enc(a, Encoding::UTF_8, Encoding::US_ASCII).should equal(a)
+        @s.rb_str_conv_enc(a, Encoding::UTF_8, Encoding::US_ASCII).should.equal?(a)
       end
 
       it "returns the origin String if the destination encoding is BINARY" do
         a = "abc".dup.force_encoding("binary")
-        @s.rb_str_conv_enc(a, Encoding::US_ASCII, Encoding::BINARY).should equal(a)
+        @s.rb_str_conv_enc(a, Encoding::US_ASCII, Encoding::BINARY).should.equal?(a)
       end
     end
   end
@@ -947,13 +1002,13 @@ def inspect
   describe "rb_str_conv_enc_opts" do
     it "returns the original String when to encoding is not specified" do
       a = "abc".dup.force_encoding("us-ascii")
-      @s.rb_str_conv_enc_opts(a, Encoding::US_ASCII, nil, 0, nil).should equal(a)
+      @s.rb_str_conv_enc_opts(a, Encoding::US_ASCII, nil, 0, nil).should.equal?(a)
     end
 
     it "returns the original String if a transcoding error occurs" do
       a = [0xEE].pack('C').force_encoding("utf-8")
       @s.rb_str_conv_enc_opts(a, Encoding::UTF_8,
-                              Encoding::EUC_JP, 0, nil).should equal(a)
+                              Encoding::EUC_JP, 0, nil).should.equal?(a)
     end
 
     it "returns a transcoded String" do
@@ -961,26 +1016,26 @@ def inspect
       result = @s.rb_str_conv_enc_opts(a, Encoding::UTF_8, Encoding::EUC_JP, 0, nil)
       x = [0xA4, 0xA2, 0xA4, 0xEC].pack('C4').force_encoding('utf-8')
       result.should == x.force_encoding("euc-jp")
-      result.encoding.should equal(Encoding::EUC_JP)
+      result.encoding.should.equal?(Encoding::EUC_JP)
     end
 
     describe "when the String encoding is equal to the destination encoding" do
       it "returns the original String" do
         a = "abc".dup.force_encoding("us-ascii")
         @s.rb_str_conv_enc_opts(a, Encoding::US_ASCII,
-                                Encoding::US_ASCII, 0, nil).should equal(a)
+                                Encoding::US_ASCII, 0, nil).should.equal?(a)
       end
 
       it "returns the original String if the destination encoding is ASCII compatible and the String has no high bits set" do
         a = "abc".encode("us-ascii")
         @s.rb_str_conv_enc_opts(a, Encoding::UTF_8,
-                                Encoding::US_ASCII, 0, nil).should equal(a)
+                                Encoding::US_ASCII, 0, nil).should.equal?(a)
       end
 
       it "returns the origin String if the destination encoding is BINARY" do
         a = "abc".dup.force_encoding("binary")
         @s.rb_str_conv_enc_opts(a, Encoding::US_ASCII,
-                                Encoding::BINARY, 0, nil).should equal(a)
+                                Encoding::BINARY, 0, nil).should.equal?(a)
       end
     end
   end
@@ -989,7 +1044,7 @@ def inspect
     it "returns the original String with the external encoding" do
       Encoding.default_external = Encoding::ISO_8859_1
       s = @s.rb_str_export("Hëllo")
-      s.encoding.should equal(Encoding::ISO_8859_1)
+      s.encoding.should.equal?(Encoding::ISO_8859_1)
     end
   end
 
@@ -997,7 +1052,7 @@ def inspect
     it "returns the original String with the locale encoding" do
       s = @s.rb_str_export_locale("abc")
       s.should == "abc".dup.force_encoding(Encoding.find("locale"))
-      s.encoding.should equal(Encoding.find("locale"))
+      s.encoding.should.equal?(Encoding.find("locale"))
     end
   end
 
@@ -1012,7 +1067,7 @@ def inspect
     it "returns the source string if it can not be converted" do
       source = ["00ff"].pack("H*");
       result = @s.rb_str_export_to_enc(source, Encoding::UTF_8)
-      result.should equal(source)
+      result.should.equal?(source)
     end
 
     it "does not alter the source string if it can not be converted" do
@@ -1126,7 +1181,7 @@ def inspect
     end
 
     it "raises a TypeError if #to_str does not return a string" do
-      -> { @s.rb_String(CApiStringSpecs::InvalidTostrTest.new) }.should raise_error(TypeError)
+      -> { @s.rb_String(CApiStringSpecs::InvalidTostrTest.new) }.should.raise(TypeError)
     end
 
     it "tries to convert the passed argument to a string by calling #to_s" do
@@ -1144,11 +1199,11 @@ def inspect
     end
 
     it "raises an error if a string contains a null" do
-      -> { @s.rb_string_value_cstr("Hello\0 with a null.") }.should raise_error(ArgumentError)
+      -> { @s.rb_string_value_cstr("Hello\0 with a null.") }.should.raise(ArgumentError)
     end
 
     it "raises an error if a UTF-16 string contains a null" do
-      -> { @s.rb_string_value_cstr("Hello\0 with a null.".encode('UTF-16BE')) }.should raise_error(ArgumentError)
+      -> { @s.rb_string_value_cstr("Hello\0 with a null.".encode('UTF-16BE')) }.should.raise(ArgumentError)
     end
 
   end
@@ -1175,9 +1230,11 @@ def inspect
 
   describe "rb_utf8_str_new_static" do
     it "returns a UTF-8 string of the correct characters and length" do
-      str = @s.rb_utf8_str_new_static
+      str, ptr = @s.rb_utf8_str_new_static
       str.should == "nokogiri"
       str.encoding.should == Encoding::UTF_8
+
+      @s.RSTRING_PTR(str).should == ptr
     end
   end
 
@@ -1221,23 +1278,23 @@ def inspect
     it "raises an error when trying to lock an already locked string" do
       str = +"test"
       @s.rb_str_locktmp(str).should == str
-      -> { @s.rb_str_locktmp(str) }.should raise_error(RuntimeError, 'temporal locking already locked string')
+      -> { @s.rb_str_locktmp(str) }.should.raise(RuntimeError, 'temporal locking already locked string')
     end
 
     it "locks a string so that modifications would raise an error" do
       str = +"test"
       @s.rb_str_locktmp(str).should == str
-      -> { str.upcase! }.should raise_error(RuntimeError, 'can\'t modify string; temporarily locked')
+      -> { str.upcase! }.should.raise(RuntimeError, 'can\'t modify string; temporarily locked')
     end
 
     ruby_version_is "4.0" do
       it "raises FrozenError if string is frozen" do
         str = -"rb_str_locktmp"
-        -> { @s.rb_str_locktmp(str) }.should raise_error(FrozenError)
+        -> { @s.rb_str_locktmp(str) }.should.raise(FrozenError)
 
         str = +"rb_str_locktmp"
         str.freeze
-        -> { @s.rb_str_locktmp(str) }.should raise_error(FrozenError)
+        -> { @s.rb_str_locktmp(str) }.should.raise(FrozenError)
       end
     end
   end
@@ -1251,17 +1308,17 @@ def inspect
     end
 
     it "raises an error when trying to unlock an already unlocked string" do
-      -> { @s.rb_str_unlocktmp(+"test") }.should raise_error(RuntimeError, 'temporal unlocking already unlocked string')
+      -> { @s.rb_str_unlocktmp(+"test") }.should.raise(RuntimeError, 'temporal unlocking already unlocked string')
     end
 
     ruby_version_is "4.0" do
       it "raises FrozenError if string is frozen" do
         str = -"rb_str_locktmp"
-        -> { @s.rb_str_unlocktmp(str) }.should raise_error(FrozenError)
+        -> { @s.rb_str_unlocktmp(str) }.should.raise(FrozenError)
 
         str = +"rb_str_locktmp"
         str.freeze
-        -> { @s.rb_str_unlocktmp(str) }.should raise_error(FrozenError)
+        -> { @s.rb_str_unlocktmp(str) }.should.raise(FrozenError)
       end
     end
   end
diff --git a/spec/ruby/optional/capi/struct_spec.rb b/spec/ruby/optional/capi/struct_spec.rb
index 3f9eff52bc0..843387bc193 100644
--- a/spec/ruby/optional/capi/struct_spec.rb
+++ b/spec/ruby/optional/capi/struct_spec.rb
@@ -25,11 +25,11 @@
 
     it "has a value of nil for the member of a newly created instance" do
       # Verify that attributes are on an instance basis
-      Struct::CAPIStruct.new.b.should be_nil
+      Struct::CAPIStruct.new.b.should == nil
     end
 
     it "creates a constant scoped under Struct for the named Struct" do
-      Struct.should have_constant(:CAPIStruct)
+      Struct.should.const_defined?(:CAPIStruct, false)
     end
 
     it "returns the member names as Symbols" do
@@ -80,15 +80,15 @@
 
     it "has a value of nil for the member of a newly created instance" do
       # Verify that attributes are on an instance basis
-      CApiStructSpecs::CAPIStructUnder.new.b.should be_nil
+      CApiStructSpecs::CAPIStructUnder.new.b.should == nil
     end
 
     it "does not create a constant scoped under Struct for the named Struct" do
-      Struct.should_not have_constant(:CAPIStructUnder)
+      Struct.should_not.const_defined?(:CAPIStructUnder)
     end
 
     it "creates a constant scoped under the namespace of the given class" do
-      CApiStructSpecs.should have_constant(:CAPIStructUnder)
+      CApiStructSpecs.should.const_defined?(:CAPIStructUnder, false)
     end
 
     it "returns the member names as Symbols" do
@@ -106,11 +106,11 @@
 
   describe "rb_struct_define" do
     it "raises an ArgumentError if arguments contain duplicate member name" do
-      -> { @s.rb_struct_define(nil, "a", "b", "a") }.should raise_error(ArgumentError)
+      -> { @s.rb_struct_define(nil, "a", "b", "a") }.should.raise(ArgumentError)
     end
 
     it "raises a NameError if an invalid constant name is given" do
-      -> { @s.rb_struct_define("foo", "a", "b", "c") }.should raise_error(NameError)
+      -> { @s.rb_struct_define("foo", "a", "b", "c") }.should.raise(NameError)
     end
   end
 
@@ -131,12 +131,12 @@
     end
 
     it "raises a NameError if the struct member does not exist" do
-      -> { @s.rb_struct_aref(@struct, :d) }.should raise_error(NameError)
+      -> { @s.rb_struct_aref(@struct, :d) }.should.raise(NameError)
     end
 
     it "raises an IndexError if the given index is out of range" do
-      -> { @s.rb_struct_aref(@struct, -4) }.should raise_error(IndexError)
-      -> { @s.rb_struct_aref(@struct, 3) }.should raise_error(IndexError)
+      -> { @s.rb_struct_aref(@struct, -4) }.should.raise(IndexError)
+      -> { @s.rb_struct_aref(@struct, 3) }.should.raise(IndexError)
     end
   end
 
@@ -147,7 +147,7 @@
     end
 
     it "raises a NameError if the struct member does not exist" do
-      -> { @s.rb_struct_getmember(@struct, :d) }.should raise_error(NameError)
+      -> { @s.rb_struct_getmember(@struct, :d) }.should.raise(NameError)
     end
   end
 
@@ -180,17 +180,17 @@
     end
 
     it "raises a NameError if the struct member does not exist" do
-      -> { @s.rb_struct_aset(@struct, :d, 1) }.should raise_error(NameError)
+      -> { @s.rb_struct_aset(@struct, :d, 1) }.should.raise(NameError)
     end
 
     it "raises an IndexError if the given index is out of range" do
-      -> { @s.rb_struct_aset(@struct, -4, 1) }.should raise_error(IndexError)
-      -> { @s.rb_struct_aset(@struct, 3, 1) }.should raise_error(IndexError)
+      -> { @s.rb_struct_aset(@struct, -4, 1) }.should.raise(IndexError)
+      -> { @s.rb_struct_aset(@struct, 3, 1) }.should.raise(IndexError)
     end
 
     it "raises a FrozenError if the struct is frozen" do
       @struct.freeze
-      -> { @s.rb_struct_aset(@struct, :a, 1) }.should raise_error(FrozenError)
+      -> { @s.rb_struct_aset(@struct, :a, 1) }.should.raise(FrozenError)
     end
   end
 
@@ -227,7 +227,7 @@
     end
 
     it "raises ArgumentError if too many values" do
-      -> { @s.rb_struct_initialize(@struct, [1, 2, 3, 4]) }.should raise_error(ArgumentError, "struct size differs")
+      -> { @s.rb_struct_initialize(@struct, [1, 2, 3, 4]) }.should.raise(ArgumentError, "struct size differs")
     end
 
     it "treats missing values as nil" do
@@ -274,11 +274,11 @@
     end
 
     it "raises an ArgumentError if arguments contain duplicate member name" do
-      -> { @s.rb_data_define(nil, "a", "b", "a") }.should raise_error(ArgumentError)
+      -> { @s.rb_data_define(nil, "a", "b", "a") }.should.raise(ArgumentError)
     end
 
     it "raises when first argument is not a class" do
-      -> { @s.rb_data_define([], "a", "b", "c") }.should raise_error(TypeError, "wrong argument type Array (expected Class)")
+      -> { @s.rb_data_define([], "a", "b", "c") }.should.raise(TypeError, "wrong argument type Array (expected Class)")
     end
   end
 
@@ -295,12 +295,12 @@
       data = @klass.allocate
       @s.rb_struct_initialize(data, [1, 2, 3]).should == nil
       data.should.frozen?
-      -> { @s.rb_struct_initialize(data, [1, 2, 3]) }.should raise_error(FrozenError)
+      -> { @s.rb_struct_initialize(data, [1, 2, 3]) }.should.raise(FrozenError)
     end
 
     it "raises ArgumentError if too many values" do
       data = @klass.allocate
-      -> { @s.rb_struct_initialize(data, [1, 2, 3, 4]) }.should raise_error(ArgumentError, "struct size differs")
+      -> { @s.rb_struct_initialize(data, [1, 2, 3, 4]) }.should.raise(ArgumentError, "struct size differs")
     end
 
     it "treats missing values as nil" do
diff --git a/spec/ruby/optional/capi/thread_spec.rb b/spec/ruby/optional/capi/thread_spec.rb
index 117726f0e2a..75e0b94fdf9 100644
--- a/spec/ruby/optional/capi/thread_spec.rb
+++ b/spec/ruby/optional/capi/thread_spec.rb
@@ -50,7 +50,7 @@ def call_capi_rb_thread_wakeup
     end
 
     it "returns nil if the value has not been set" do
-      @t.rb_thread_local_aref(Thread.current, :thread_capi_specs_undefined).should be_nil
+      @t.rb_thread_local_aref(Thread.current, :thread_capi_specs_undefined).should == nil
     end
   end
 
@@ -72,7 +72,7 @@ def call_capi_rb_thread_wakeup
       obj = Object.new
       proc = -> x { ScratchPad.record x }
       thr = @t.rb_thread_create(proc, obj)
-      thr.should be_kind_of(Thread)
+      thr.should.is_a?(Thread)
       thr.join
       ScratchPad.recorded.should == obj
     end
@@ -83,18 +83,18 @@ def call_capi_rb_thread_wakeup
         raise "my error"
       }
       thr = @t.rb_thread_create(prc, nil)
-      thr.should be_kind_of(Thread)
+      thr.should.is_a?(Thread)
 
       -> {
         thr.join
-      }.should raise_error(RuntimeError, "my error")
+      }.should.raise(RuntimeError, "my error")
     end
 
     it "sets the thread's group" do
       thr = @t.rb_thread_create(-> x { }, nil)
       begin
         thread_group = thr.group
-        thread_group.should be_an_instance_of(ThreadGroup)
+        thread_group.should.instance_of?(ThreadGroup)
       ensure
         thr.join
       end
@@ -103,11 +103,11 @@ def call_capi_rb_thread_wakeup
 
   describe "ruby_native_thread_p" do
     it "returns non-zero for a ruby thread" do
-      @t.ruby_native_thread_p.should be_true
+      @t.ruby_native_thread_p.should == true
     end
 
     it "returns zero for a non ruby thread" do
-      @t.ruby_native_thread_p_new_thread.should be_false
+      @t.ruby_native_thread_p_new_thread.should == false
     end
   end
 
@@ -128,7 +128,7 @@ def call_capi_rb_thread_wakeup
       thr.wakeup
 
       # Make sure it stopped and we got a proper value
-      thr.value.should be_true
+      thr.value.should == true
     end
 
     platform_is_not :windows do
@@ -159,7 +159,7 @@ def call_capi_rb_thread_wakeup
 
         going_to_block = true
         # Make sure it stopped and we got a proper value
-        @t.rb_thread_call_without_gvl.should be_true
+        @t.rb_thread_call_without_gvl.should == true
 
         interrupter.join
       end
@@ -181,14 +181,14 @@ def call_capi_rb_thread_wakeup
       thr.wakeup
 
       # Make sure it stopped and we got a proper value
-      thr.value.should be_true
+      thr.value.should == true
     end
   end
 
   ruby_version_is "4.0" do
     describe "ruby_thread_has_gvl_p" do
       it "returns true if the current thread has the GVL" do
-        @t.ruby_thread_has_gvl_p.should be_true
+        @t.ruby_thread_has_gvl_p.should == true
       end
     end
   end
diff --git a/spec/ruby/optional/capi/time_spec.rb b/spec/ruby/optional/capi/time_spec.rb
index ca5fc5952af..dc0b09376e1 100644
--- a/spec/ruby/optional/capi/time_spec.rb
+++ b/spec/ruby/optional/capi/time_spec.rb
@@ -16,7 +16,7 @@
 
   describe "TIMET2NUM" do
     it "returns an Integer" do
-      @s.TIMET2NUM.should be_kind_of(Integer)
+      @s.TIMET2NUM.should.is_a?(Integer)
     end
   end
 
@@ -32,7 +32,7 @@
     it "creates a Time in the local zone with only a timestamp" do
       with_timezone("Europe/Amsterdam") do
         time = @s.rb_time_num_new(1232141421, nil)
-        time.should be_an_instance_of(Time)
+        time.should.instance_of?(Time)
         time.to_i.should == 1232141421
         platform_is_not :windows do
           time.gmt_offset.should == 3600
@@ -43,7 +43,7 @@
     it "creates a Time with the given offset" do
       with_timezone("Europe/Amsterdam") do
         time = @s.rb_time_num_new(1232141421, 7200)
-        time.should be_an_instance_of(Time)
+        time.should.instance_of?(Time)
         time.to_i.should == 1232141421
         time.gmt_offset.should == 7200
       end
@@ -52,7 +52,7 @@
     it "creates a Time with a Float timestamp" do
       with_timezone("Europe/Amsterdam") do
         time = @s.rb_time_num_new(1.5, 7200)
-        time.should be_an_instance_of(Time)
+        time.should.instance_of?(Time)
         time.to_i.should == 1
         time.nsec.should == 500000000
         time.gmt_offset.should == 7200
@@ -62,7 +62,7 @@
     it "creates a Time with a Rational timestamp" do
       with_timezone("Europe/Amsterdam") do
         time = @s.rb_time_num_new(Rational(3, 2), 7200)
-        time.should be_an_instance_of(Time)
+        time.should.instance_of?(Time)
         time.to_i.should == 1
         time.nsec.should == 500000000
         time.gmt_offset.should == 7200
@@ -73,32 +73,32 @@
   describe "rb_time_interval" do
     it "creates a timeval interval for a Fixnum" do
       sec, usec = @s.rb_time_interval(1232141421)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1232141421
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 0
     end
 
     it "creates a timeval interval for a Float" do
       sec, usec = @s.rb_time_interval(1.5)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 500000
     end
 
     it "creates a timeval interval for a Rational" do
       sec, usec = @s.rb_time_interval(Rational(3, 2))
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 500000
     end
 
     it "throws an argument error for a negative value" do
-      -> { @s.rb_time_interval(-1232141421) }.should raise_error(ArgumentError)
-      -> { @s.rb_time_interval(Rational(-3, 2)) }.should raise_error(ArgumentError)
-      -> { @s.rb_time_interval(-1.5) }.should raise_error(ArgumentError)
+      -> { @s.rb_time_interval(-1232141421) }.should.raise(ArgumentError)
+      -> { @s.rb_time_interval(Rational(-3, 2)) }.should.raise(ArgumentError)
+      -> { @s.rb_time_interval(-1.5) }.should.raise(ArgumentError)
     end
 
   end
@@ -106,36 +106,36 @@
   describe "rb_time_interval" do
     it "creates a timeval interval for a Fixnum" do
       sec, usec = @s.rb_time_interval(1232141421)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1232141421
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 0
     end
 
     it "creates a timeval interval for a Float" do
       sec, usec = @s.rb_time_interval(1.5)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 500000
     end
 
     it "creates a timeval interval for a Rational" do
       sec, usec = @s.rb_time_interval(Rational(3, 2))
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 500000
     end
 
     it "throws an argument error for a negative value" do
-      -> { @s.rb_time_interval(-1232141421) }.should raise_error(ArgumentError)
-      -> { @s.rb_time_interval(Rational(-3, 2)) }.should raise_error(ArgumentError)
-      -> { @s.rb_time_interval(-1.5) }.should raise_error(ArgumentError)
+      -> { @s.rb_time_interval(-1232141421) }.should.raise(ArgumentError)
+      -> { @s.rb_time_interval(Rational(-3, 2)) }.should.raise(ArgumentError)
+      -> { @s.rb_time_interval(-1.5) }.should.raise(ArgumentError)
     end
 
     it "throws an argument error when given a Time instance" do
-      -> { @s.rb_time_interval(Time.now) }.should raise_error(TypeError)
+      -> { @s.rb_time_interval(Time.now) }.should.raise(TypeError)
     end
 
   end
@@ -143,49 +143,49 @@
   describe "rb_time_timeval" do
     it "creates a timeval for a Fixnum" do
       sec, usec = @s.rb_time_timeval(1232141421)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1232141421
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 0
     end
 
     it "creates a timeval for a Float" do
       sec, usec = @s.rb_time_timeval(1.5)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 500000
     end
 
     it "creates a timeval for a Rational" do
       sec, usec = @s.rb_time_timeval(Rational(3, 2))
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 500000
     end
 
     it "creates a timeval for a negative Fixnum" do
       sec, usec = @s.rb_time_timeval(-1232141421)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == -1232141421
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 0
     end
 
     it "creates a timeval for a negative Float" do
       sec, usec = @s.rb_time_timeval(-1.5)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == -2
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 500000
     end
 
     it "creates a timeval for a negative Rational" do
       sec, usec = @s.rb_time_timeval(Rational(-3, 2))
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == -2
-      usec.should be_kind_of(Integer)
+      usec.should.is_a?(Integer)
       usec.should == 500000
     end
 
@@ -200,49 +200,49 @@
   describe "rb_time_timespec" do
     it "creates a timespec for a Fixnum" do
       sec, nsec = @s.rb_time_timespec(1232141421)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1232141421
-      nsec.should be_kind_of(Integer)
+      nsec.should.is_a?(Integer)
       nsec.should == 0
     end
 
     it "creates a timespec for a Float" do
       sec, nsec = @s.rb_time_timespec(1.5)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1
-      nsec.should be_kind_of(Integer)
+      nsec.should.is_a?(Integer)
       nsec.should == 500000000
     end
 
     it "creates a timespec for a Rational" do
       sec, nsec = @s.rb_time_timespec(Rational(3, 2))
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == 1
-      nsec.should be_kind_of(Integer)
+      nsec.should.is_a?(Integer)
       nsec.should == 500000000
     end
 
     it "creates a timespec for a negative Fixnum" do
       sec, nsec = @s.rb_time_timespec(-1232141421)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == -1232141421
-      nsec.should be_kind_of(Integer)
+      nsec.should.is_a?(Integer)
       nsec.should == 0
     end
 
     it "creates a timespec for a negative Float" do
       sec, nsec = @s.rb_time_timespec(-1.5)
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == -2
-      nsec.should be_kind_of(Integer)
+      nsec.should.is_a?(Integer)
       nsec.should == 500000000
     end
 
     it "creates a timespec for a negative Rational" do
       sec, nsec = @s.rb_time_timespec(Rational(-3, 2))
-      sec.should be_kind_of(Integer)
+      sec.should.is_a?(Integer)
       sec.should == -2
-      nsec.should be_kind_of(Integer)
+      nsec.should.is_a?(Integer)
       nsec.should == 500000000
     end
 
@@ -261,7 +261,7 @@
 
     describe "when offset given is within range of -86400 and 86400 (exclusive)" do
       it "sets time's is_gmt to false" do
-        @s.rb_time_timespec_new(1447087832, 476451125, 0).gmt?.should be_false
+        @s.rb_time_timespec_new(1447087832, 476451125, 0).gmt?.should == false
       end
 
       it "sets time's offset to the offset given" do
@@ -270,7 +270,7 @@
     end
 
     it "returns time object in UTC if offset given equals INT_MAX - 1" do
-      @s.rb_time_timespec_new(1447087832, 476451125, 0x7ffffffe).utc?.should be_true
+      @s.rb_time_timespec_new(1447087832, 476451125, 0x7ffffffe).utc?.should == true
     end
 
     it "returns time object in localtime if offset given equals INT_MAX" do
@@ -280,13 +280,13 @@
     end
 
     it "raises an ArgumentError if offset passed is not within range of -86400 and 86400 (exclusive)" do
-      -> { @s.rb_time_timespec_new(1447087832, 476451125, 86400) }.should raise_error(ArgumentError)
-      -> { @s.rb_time_timespec_new(1447087832, 476451125, -86400) }.should raise_error(ArgumentError)
+      -> { @s.rb_time_timespec_new(1447087832, 476451125, 86400) }.should.raise(ArgumentError)
+      -> { @s.rb_time_timespec_new(1447087832, 476451125, -86400) }.should.raise(ArgumentError)
     end
 
     it "doesn't call Time.at directly" do
       Time.should_not_receive(:at)
-      @s.rb_time_timespec_new(1447087832, 476451125, 32400).should be_kind_of(Time)
+      @s.rb_time_timespec_new(1447087832, 476451125, 32400).should.is_a?(Time)
     end
   end
 
@@ -294,7 +294,7 @@
     it "fills a struct timespec with the current time" do
       now = Time.now
       time = @s.rb_time_from_timespec(now.utc_offset)
-      time.should be_an_instance_of(Time)
+      time.should.instance_of?(Time)
       (time - now).should be_close(0, TIME_TOLERANCE)
     end
   end
diff --git a/spec/ruby/optional/capi/tracepoint_spec.rb b/spec/ruby/optional/capi/tracepoint_spec.rb
index 2043b7c9418..8775715e04c 100644
--- a/spec/ruby/optional/capi/tracepoint_spec.rb
+++ b/spec/ruby/optional/capi/tracepoint_spec.rb
@@ -14,7 +14,7 @@
   describe "rb_tracepoint_new" do
     it "returns a tracepoint object" do
       @trace = @s.rb_tracepoint_new(7)
-      @trace.should be_an_instance_of(TracePoint)
+      @trace.should.instance_of?(TracePoint)
       @trace.should_not.enabled?
     end
 
diff --git a/spec/ruby/optional/capi/typed_data_spec.rb b/spec/ruby/optional/capi/typed_data_spec.rb
index 6d1398a1a0b..8eaf7751ba7 100644
--- a/spec/ruby/optional/capi/typed_data_spec.rb
+++ b/spec/ruby/optional/capi/typed_data_spec.rb
@@ -30,7 +30,7 @@
 
   it "throws an exception for a wrong type" do
     a = @s.typed_wrap_struct(1024)
-    -> { @s.typed_get_struct_other(a) }.should raise_error(TypeError)
+    -> { @s.typed_get_struct_other(a) }.should.raise(TypeError)
   end
 
   it "unwraps data for a parent type" do
@@ -63,7 +63,7 @@
       -> {
         a = @s.typed_wrap_struct(1024)
         @s.rb_check_type(a, a)
-      }.should raise_error(TypeError) { |e|
+      }.should.raise(TypeError) { |e|
         e.message.should == 'wrong argument type Object (expected Data)'
       }
     end
@@ -82,7 +82,7 @@
 
     it "raises an error for different types" do
       a = @s.typed_wrap_struct(1024)
-      -> { @s.rb_check_typeddata_different_type(a) }.should raise_error(TypeError)
+      -> { @s.rb_check_typeddata_different_type(a) }.should.raise(TypeError)
     end
   end
 
diff --git a/spec/ruby/optional/capi/util_spec.rb b/spec/ruby/optional/capi/util_spec.rb
index 6cf064bf973..dd3cbb65498 100644
--- a/spec/ruby/optional/capi/util_spec.rb
+++ b/spec/ruby/optional/capi/util_spec.rb
@@ -21,11 +21,11 @@
     end
 
     it "raises an ArgumentError if there are insufficient arguments" do
-      -> { @o.rb_scan_args([1, 2], "3", 0, @acc) }.should raise_error(ArgumentError)
+      -> { @o.rb_scan_args([1, 2], "3", 0, @acc) }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 3)")
     end
 
     it "raises an ArgumentError if there are too many arguments" do
-      -> { @o.rb_scan_args([1, 2, 3, 4], "3", 0, @acc) }.should raise_error(ArgumentError)
+      -> { @o.rb_scan_args([1, 2, 3, 4], "3", 0, @acc) }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 3)")
     end
 
     it "assigns the required and optional arguments scanned" do
@@ -117,8 +117,15 @@
 
     it "rejects the use of nil as a hash" do
       -> {
-        @o.rb_scan_args([1, nil], "1:", 2, @acc).should == 1
-      }.should raise_error(ArgumentError)
+        @o.rb_scan_args([1, nil], "1:", 2, @acc)
+      }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+      ScratchPad.recorded.should == []
+    end
+
+    it "rejects the use of of a non-Hash as keywords" do
+      -> {
+        @o.rb_scan_args([42], ":", 1, @acc)
+      }.should.raise(ArgumentError, "wrong number of arguments (given 1, expected 0)")
       ScratchPad.recorded.should == []
     end
 
@@ -186,7 +193,7 @@
 
     it "raises an error if a required argument is not in the hash" do
       h = { :a => 7, :c => 12, :b => 5 }
-      -> { @o.rb_get_kwargs(h, [:b, :d], 2, 0) }.should raise_error(ArgumentError, /missing keyword: :?d/)
+      -> { @o.rb_get_kwargs(h, [:b, :d], 2, 0) }.should.raise(ArgumentError, "missing keyword: :d")
       h.should == {:a => 7, :c => 12}
     end
 
@@ -198,7 +205,7 @@
 
     it "raises an error if there are additional arguments  and optional is positive" do
       h = { :a => 7, :c => 12, :b => 5 }
-      -> { @o.rb_get_kwargs(h, [:b, :a], 2, 0) }.should raise_error(ArgumentError, /unknown keyword: :?c/)
+      -> { @o.rb_get_kwargs(h, [:b, :a], 2, 0) }.should.raise(ArgumentError, "unknown keyword: :c")
       h.should == {:c => 12}
     end
 
@@ -212,7 +219,7 @@
   platform_is c_long_size: 64 do
     describe "rb_long2int" do
       it "raises a RangeError if the value is outside the range of a C int" do
-        -> { @o.rb_long2int(0xffff_ffff_ffff) }.should raise_error(RangeError)
+        -> { @o.rb_long2int(0xffff_ffff_ffff) }.should.raise(RangeError)
       end
     end
 
@@ -258,7 +265,7 @@
 
   describe "rb_sourceline" do
     it "returns the current ruby file" do
-      @o.rb_sourceline.should be_kind_of(Integer)
+      @o.rb_sourceline.should.is_a?(Integer)
     end
   end
 
diff --git a/spec/ruby/security/cve_2010_1330_spec.rb b/spec/ruby/security/cve_2010_1330_spec.rb
index 25944395500..8867fb71354 100644
--- a/spec/ruby/security/cve_2010_1330_spec.rb
+++ b/spec/ruby/security/cve_2010_1330_spec.rb
@@ -14,6 +14,6 @@
     str.force_encoding Encoding::UTF_8
     -> {
       str.gsub(/</, "&lt;")
-    }.should raise_error(ArgumentError, /invalid byte sequence in UTF-8/)
+    }.should.raise(ArgumentError, /invalid byte sequence in UTF-8/)
   end
 end
diff --git a/spec/ruby/security/cve_2018_8778_spec.rb b/spec/ruby/security/cve_2018_8778_spec.rb
index 62057faa534..bbdaac734cc 100644
--- a/spec/ruby/security/cve_2018_8778_spec.rb
+++ b/spec/ruby/security/cve_2018_8778_spec.rb
@@ -5,6 +5,6 @@
     pos = (1 << PlatformGuard::POINTER_SIZE) - 99
     -> {
       "0123456789".unpack("@#{pos}C10")
-    }.should raise_error(RangeError, /pack length too big/)
+    }.should.raise(RangeError, /pack length too big/)
   end
 end
diff --git a/spec/ruby/security/cve_2018_8779_spec.rb b/spec/ruby/security/cve_2018_8779_spec.rb
index 603dcf497bf..6d573ea7fd0 100644
--- a/spec/ruby/security/cve_2018_8779_spec.rb
+++ b/spec/ruby/security/cve_2018_8779_spec.rb
@@ -18,13 +18,13 @@
     it "UNIXServer.open by raising an exception when there is a NUL byte" do
       -> {
         UNIXServer.open(@path+"\0")
-      }.should raise_error(ArgumentError, /(path name|string) contains null byte/)
+      }.should.raise(ArgumentError, /(path name|string) contains null byte/)
     end
 
     it "UNIXSocket.open by raising an exception when there is a NUL byte" do
       -> {
         UNIXSocket.open(@path+"\0")
-      }.should raise_error(ArgumentError, /(path name|string) contains null byte/)
+      }.should.raise(ArgumentError, /(path name|string) contains null byte/)
     end
   end
 end
diff --git a/spec/ruby/security/cve_2018_8780_spec.rb b/spec/ruby/security/cve_2018_8780_spec.rb
index 9942e07ee2f..dc8c6bcc9b7 100644
--- a/spec/ruby/security/cve_2018_8780_spec.rb
+++ b/spec/ruby/security/cve_2018_8780_spec.rb
@@ -8,36 +8,36 @@
   it "Dir.glob by raising an exception when there is a NUL byte" do
     -> {
       Dir.glob([[@root, File.join(@root, "*")].join("\0")])
-    }.should raise_error(ArgumentError, /(path name|string) contains null byte/)
+    }.should.raise(ArgumentError, /(path name|string) contains null byte/)
   end
 
   it "Dir.entries by raising an exception when there is a NUL byte" do
     -> {
       Dir.entries(@root+"\0")
-    }.should raise_error(ArgumentError, /(path name|string) contains null byte/)
+    }.should.raise(ArgumentError, /(path name|string) contains null byte/)
   end
 
   it "Dir.foreach by raising an exception when there is a NUL byte" do
     -> {
       Dir.foreach(@root+"\0").to_a
-    }.should raise_error(ArgumentError, /(path name|string) contains null byte/)
+    }.should.raise(ArgumentError, /(path name|string) contains null byte/)
   end
 
   it "Dir.empty? by raising an exception when there is a NUL byte" do
     -> {
       Dir.empty?(@root+"\0")
-    }.should raise_error(ArgumentError, /(path name|string) contains null byte/)
+    }.should.raise(ArgumentError, /(path name|string) contains null byte/)
   end
 
   it "Dir.children by raising an exception when there is a NUL byte" do
     -> {
       Dir.children(@root+"\0")
-    }.should raise_error(ArgumentError, /(path name|string) contains null byte/)
+    }.should.raise(ArgumentError, /(path name|string) contains null byte/)
   end
 
   it "Dir.each_child by raising an exception when there is a NUL byte" do
     -> {
       Dir.each_child(@root+"\0").to_a
-    }.should raise_error(ArgumentError, /(path name|string) contains null byte/)
+    }.should.raise(ArgumentError, /(path name|string) contains null byte/)
   end
 end
diff --git a/spec/ruby/security/cve_2019_8322_spec.rb b/spec/ruby/security/cve_2019_8322_spec.rb
index b70d78c0337..c2614b10d54 100644
--- a/spec/ruby/security/cve_2019_8322_spec.rb
+++ b/spec/ruby/security/cve_2019_8322_spec.rb
@@ -1,21 +1,24 @@
 require_relative '../spec_helper'
 
-require 'yaml'
-require 'rubygems'
-require 'rubygems/safe_yaml'
-require 'rubygems/commands/owner_command'
+ruby_version_is ""..."4.1" do
 
-describe "CVE-2019-8322 is resisted by" do
-  it "sanitising owner names" do
-    command = Gem::Commands::OwnerCommand.new
-    def command.rubygems_api_request(*args)
-      Struct.new(:body).new("---\n- email: \"\e]2;nyan\a\"\n  handle: handle\n  id: id\n")
-    end
-    def command.with_response(response)
-      yield response
+  require 'yaml'
+  require 'rubygems'
+  require 'rubygems/safe_yaml'
+  require 'rubygems/commands/owner_command'
+
+  describe "CVE-2019-8322 is resisted by" do
+    it "sanitising owner names" do
+      command = Gem::Commands::OwnerCommand.new
+      def command.rubygems_api_request(*args)
+        Struct.new(:body).new("---\n- email: \"\e]2;nyan\a\"\n  handle: handle\n  id: id\n")
+      end
+      def command.with_response(response)
+        yield response
+      end
+      command.should_receive(:say).with("Owners for gem: name")
+      command.should_receive(:say).with("- .]2;nyan.")
+      command.show_owners "name"
     end
-    command.should_receive(:say).with("Owners for gem: name")
-    command.should_receive(:say).with("- .]2;nyan.")
-    command.show_owners "name"
   end
 end
diff --git a/spec/ruby/shared/basicobject/method_missing.rb b/spec/ruby/shared/basicobject/method_missing.rb
index 4871603dcef..330f6a49223 100644
--- a/spec/ruby/shared/basicobject/method_missing.rb
+++ b/spec/ruby/shared/basicobject/method_missing.rb
@@ -24,15 +24,15 @@
 describe :method_missing_module, shared: true do
   describe "for a Module" do
     it "raises a NoMethodError when an undefined method is called" do
-      -> { @object.no_such_method }.should raise_error(NoMethodError)
+      -> { @object.no_such_method }.should.raise(NoMethodError)
     end
 
     it "raises a NoMethodError when a protected method is called" do
-      -> { @object.method_protected }.should raise_error(NoMethodError)
+      -> { @object.method_protected }.should.raise(NoMethodError)
     end
 
     it "raises a NoMethodError when a private method is called" do
-      -> { @object.method_private }.should raise_error(NoMethodError)
+      -> { @object.method_private }.should.raise(NoMethodError)
     end
   end
 end
@@ -60,15 +60,15 @@
 describe :method_missing_class, shared: true do
   describe "for a Class" do
     it "raises a NoMethodError when an undefined method is called" do
-      -> { @object.no_such_method }.should raise_error(NoMethodError)
+      -> { @object.no_such_method }.should.raise(NoMethodError)
     end
 
     it "raises a NoMethodError when a protected method is called" do
-      -> { @object.method_protected }.should raise_error(NoMethodError)
+      -> { @object.method_protected }.should.raise(NoMethodError)
     end
 
     it "raises a NoMethodError when a private method is called" do
-      -> { @object.method_private }.should raise_error(NoMethodError)
+      -> { @object.method_private }.should.raise(NoMethodError)
     end
   end
 end
@@ -100,15 +100,15 @@
 describe :method_missing_instance, shared: true do
   describe "for an instance" do
     it "raises a NoMethodError when an undefined method is called" do
-      -> { @object.new.no_such_method }.should raise_error(NoMethodError)
+      -> { @object.new.no_such_method }.should.raise(NoMethodError)
     end
 
     it "raises a NoMethodError when a protected method is called" do
-      -> { @object.new.method_protected }.should raise_error(NoMethodError)
+      -> { @object.new.method_protected }.should.raise(NoMethodError)
     end
 
     it "raises a NoMethodError when a private method is called" do
-      -> { @object.new.method_private }.should raise_error(NoMethodError)
+      -> { @object.new.method_private }.should.raise(NoMethodError)
     end
 
     it 'sets the receiver of the raised NoMethodError' do
diff --git a/spec/ruby/shared/basicobject/send.rb b/spec/ruby/shared/basicobject/send.rb
index 625aaa29179..d38aea975e3 100644
--- a/spec/ruby/shared/basicobject/send.rb
+++ b/spec/ruby/shared/basicobject/send.rb
@@ -30,10 +30,10 @@ def self.bar
   end
 
   it "raises a TypeError if the method name is not a string or symbol" do
-    -> { SendSpecs.send(@method, nil) }.should raise_error(TypeError, /not a symbol nor a string/)
-    -> { SendSpecs.send(@method, 42) }.should raise_error(TypeError, /not a symbol nor a string/)
-    -> { SendSpecs.send(@method, 3.14) }.should raise_error(TypeError, /not a symbol nor a string/)
-    -> { SendSpecs.send(@method, true) }.should raise_error(TypeError, /not a symbol nor a string/)
+    -> { SendSpecs.send(@method, nil) }.should.raise(TypeError, /not a symbol nor a string/)
+    -> { SendSpecs.send(@method, 42) }.should.raise(TypeError, /not a symbol nor a string/)
+    -> { SendSpecs.send(@method, 3.14) }.should.raise(TypeError, /not a symbol nor a string/)
+    -> { SendSpecs.send(@method, true) }.should.raise(TypeError, /not a symbol nor a string/)
   end
 
   it "raises a NameError if the corresponding method can't be found" do
@@ -42,7 +42,7 @@ def bar
         'done'
       end
     end
-    -> { SendSpecs::Foo.new.send(@method, :syegsywhwua) }.should raise_error(NameError)
+    -> { SendSpecs::Foo.new.send(@method, :syegsywhwua) }.should.raise(NameError)
   end
 
   it "raises a NameError if the corresponding singleton method can't be found" do
@@ -51,12 +51,12 @@ def self.bar
         'done'
       end
     end
-    -> { SendSpecs::Foo.send(@method, :baz) }.should raise_error(NameError)
+    -> { SendSpecs::Foo.send(@method, :baz) }.should.raise(NameError)
   end
 
   it "raises an ArgumentError if no arguments are given" do
     class SendSpecs::Foo; end
-    -> { SendSpecs::Foo.new.send @method }.should raise_error(ArgumentError)
+    -> { SendSpecs::Foo.new.send @method }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if called with more arguments than available parameters" do
@@ -64,7 +64,7 @@ class SendSpecs::Foo
       def bar; end
     end
 
-    -> { SendSpecs::Foo.new.send(@method, :bar, :arg) }.should raise_error(ArgumentError)
+    -> { SendSpecs::Foo.new.send(@method, :bar, :arg) }.should.raise(ArgumentError)
   end
 
   it "raises an ArgumentError if called with fewer arguments than required parameters" do
@@ -72,7 +72,7 @@ class SendSpecs::Foo
       def foo(arg); end
     end
 
-    -> { SendSpecs::Foo.new.send(@method, :foo) }.should raise_error(ArgumentError)
+    -> { SendSpecs::Foo.new.send(@method, :foo) }.should.raise(ArgumentError)
   end
 
   it "succeeds if passed an arbitrary number of arguments as a splat parameter" do
diff --git a/spec/ruby/shared/enumerable/minmax.rb b/spec/ruby/shared/enumerable/minmax.rb
index 8af2626d2a7..db95ef9c783 100644
--- a/spec/ruby/shared/enumerable/minmax.rb
+++ b/spec/ruby/shared/enumerable/minmax.rb
@@ -14,11 +14,11 @@
   end
 
   it "raises a NoMethodError for elements without #<=>" do
-    -> { @incomparable_enum.minmax }.should raise_error(NoMethodError)
+    -> { @incomparable_enum.minmax }.should.raise(NoMethodError)
   end
 
   it "raises an ArgumentError when elements are incompatible" do
-    -> { @incompatible_enum.minmax }.should raise_error(ArgumentError)
-    -> { @enum.minmax{ |a, b| nil } }.should raise_error(ArgumentError)
+    -> { @incompatible_enum.minmax }.should.raise(ArgumentError)
+    -> { @enum.minmax{ |a, b| nil } }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/shared/file/directory.rb b/spec/ruby/shared/file/directory.rb
index 8ba933a601f..84f8f1a958b 100644
--- a/spec/ruby/shared/file/directory.rb
+++ b/spec/ruby/shared/file/directory.rb
@@ -12,24 +12,24 @@
   end
 
   it "returns true if the argument is a directory" do
-    @object.send(@method, @dir).should be_true
+    @object.send(@method, @dir).should == true
   end
 
   it "returns false if the argument is not a directory" do
-    @object.send(@method, @file).should be_false
+    @object.send(@method, @file).should == false
   end
 
   it "accepts an object that has a #to_path method" do
-    @object.send(@method, mock_to_path(@dir)).should be_true
+    @object.send(@method, mock_to_path(@dir)).should == true
   end
 
   it "raises a TypeError when passed an Integer" do
-    -> { @object.send(@method, 1) }.should raise_error(TypeError)
-    -> { @object.send(@method, bignum_value) }.should raise_error(TypeError)
+    -> { @object.send(@method, 1) }.should.raise(TypeError)
+    -> { @object.send(@method, bignum_value) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { @object.send(@method, nil) }.should raise_error(TypeError)
+    -> { @object.send(@method, nil) }.should.raise(TypeError)
   end
 end
 
@@ -47,13 +47,13 @@
   end
 
   it "returns false if the argument is an IO that's not a directory" do
-    @object.send(@method, STDIN).should be_false
+    @object.send(@method, STDIN).should == false
   end
 
   platform_is_not :windows do
     it "returns true if the argument is an IO that is a directory" do
       File.open(@dir, "r") do |f|
-        @object.send(@method, f).should be_true
+        @object.send(@method, f).should == true
       end
     end
   end
@@ -61,6 +61,6 @@
   it "calls #to_io to convert a non-IO object" do
     io = mock('FileDirectoryIO')
     io.should_receive(:to_io).and_return(STDIN)
-    @object.send(@method, io).should be_false
+    @object.send(@method, io).should == false
   end
 end
diff --git a/spec/ruby/shared/file/executable.rb b/spec/ruby/shared/file/executable.rb
index baa156de986..0fc65cf8669 100644
--- a/spec/ruby/shared/file/executable.rb
+++ b/spec/ruby/shared/file/executable.rb
@@ -31,13 +31,13 @@
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { @object.send(@method) }.should raise_error(ArgumentError)
+    -> { @object.send(@method) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { @object.send(@method, 1)     }.should raise_error(TypeError)
-    -> { @object.send(@method, nil)   }.should raise_error(TypeError)
-    -> { @object.send(@method, false) }.should raise_error(TypeError)
+    -> { @object.send(@method, 1)     }.should.raise(TypeError)
+    -> { @object.send(@method, nil)   }.should.raise(TypeError)
+    -> { @object.send(@method, false) }.should.raise(TypeError)
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/shared/file/executable_real.rb b/spec/ruby/shared/file/executable_real.rb
index bf2734ea071..90b7a41ba76 100644
--- a/spec/ruby/shared/file/executable_real.rb
+++ b/spec/ruby/shared/file/executable_real.rb
@@ -29,13 +29,13 @@
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { @object.send(@method) }.should raise_error(ArgumentError)
+    -> { @object.send(@method) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { @object.send(@method, 1)     }.should raise_error(TypeError)
-    -> { @object.send(@method, nil)   }.should raise_error(TypeError)
-    -> { @object.send(@method, false) }.should raise_error(TypeError)
+    -> { @object.send(@method, 1)     }.should.raise(TypeError)
+    -> { @object.send(@method, nil)   }.should.raise(TypeError)
+    -> { @object.send(@method, false) }.should.raise(TypeError)
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/shared/file/exist.rb b/spec/ruby/shared/file/exist.rb
index 67424146c58..5075fa74b9b 100644
--- a/spec/ruby/shared/file/exist.rb
+++ b/spec/ruby/shared/file/exist.rb
@@ -5,12 +5,12 @@
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { @object.send(@method) }.should raise_error(ArgumentError)
-    -> { @object.send(@method, __FILE__, __FILE__) }.should raise_error(ArgumentError)
+    -> { @object.send(@method) }.should.raise(ArgumentError)
+    -> { @object.send(@method, __FILE__, __FILE__) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { @object.send(@method, nil) }.should raise_error(TypeError)
+    -> { @object.send(@method, nil) }.should.raise(TypeError)
   end
 
   it "accepts an object that has a #to_path method" do
diff --git a/spec/ruby/shared/file/file.rb b/spec/ruby/shared/file/file.rb
index c1748a88b31..18477cff554 100644
--- a/spec/ruby/shared/file/file.rb
+++ b/spec/ruby/shared/file/file.rb
@@ -34,12 +34,12 @@
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { @object.send(@method)               }.should raise_error(ArgumentError)
-    -> { @object.send(@method, @null, @file) }.should raise_error(ArgumentError)
+    -> { @object.send(@method)               }.should.raise(ArgumentError)
+    -> { @object.send(@method, @null, @file) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { @object.send(@method, nil) }.should raise_error(TypeError)
-    -> { @object.send(@method, 1)   }.should raise_error(TypeError)
+    -> { @object.send(@method, nil) }.should.raise(TypeError)
+    -> { @object.send(@method, 1)   }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/shared/file/grpowned.rb b/spec/ruby/shared/file/grpowned.rb
index 24e84c28e3c..07a5a69e1ad 100644
--- a/spec/ruby/shared/file/grpowned.rb
+++ b/spec/ruby/shared/file/grpowned.rb
@@ -11,11 +11,11 @@
 
   platform_is_not :windows do
     it "returns true if the file exist" do
-      @object.send(@method, @file).should be_true
+      @object.send(@method, @file).should == true
     end
 
     it "accepts an object that has a #to_path method" do
-      @object.send(@method, mock_to_path(@file)).should be_true
+      @object.send(@method, mock_to_path(@file)).should == true
     end
 
     it 'takes non primary groups into account' do
@@ -33,7 +33,7 @@
 
   platform_is :windows do
     it "returns false if the file exist" do
-      @object.send(@method, @file).should be_false
+      @object.send(@method, @file).should == false
     end
   end
 end
diff --git a/spec/ruby/shared/file/identical.rb b/spec/ruby/shared/file/identical.rb
index b7a2904839a..628abd4f487 100644
--- a/spec/ruby/shared/file/identical.rb
+++ b/spec/ruby/shared/file/identical.rb
@@ -25,9 +25,9 @@
   end
 
   it "returns false if any of the files doesn't exist" do
-    @object.send(@method, @file1, @non_exist).should be_false
-    @object.send(@method, @non_exist, @file1).should be_false
-    @object.send(@method, @non_exist, @non_exist).should be_false
+    @object.send(@method, @file1, @non_exist).should == false
+    @object.send(@method, @non_exist, @file1).should == false
+    @object.send(@method, @non_exist, @non_exist).should == false
   end
 
   it "accepts an object that has a #to_path method" do
@@ -35,17 +35,17 @@
   end
 
   it "raises an ArgumentError if not passed two arguments" do
-    -> { @object.send(@method, @file1, @file2, @link) }.should raise_error(ArgumentError)
-    -> { @object.send(@method, @file1) }.should raise_error(ArgumentError)
+    -> { @object.send(@method, @file1, @file2, @link) }.should.raise(ArgumentError)
+    -> { @object.send(@method, @file1) }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed String types" do
-    -> { @object.send(@method, 1,1) }.should raise_error(TypeError)
+    -> { @object.send(@method, 1,1) }.should.raise(TypeError)
   end
 
   it "returns true if both named files are identical" do
-    @object.send(@method, @file1, @file1).should be_true
-    @object.send(@method, @link, @link).should be_true
-    @object.send(@method, @file1, @file2).should be_false
+    @object.send(@method, @file1, @file1).should == true
+    @object.send(@method, @link, @link).should == true
+    @object.send(@method, @file1, @file2).should == false
   end
 end
diff --git a/spec/ruby/shared/file/size.rb b/spec/ruby/shared/file/size.rb
index cba99fe6a58..fa198ed2326 100644
--- a/spec/ruby/shared/file/size.rb
+++ b/spec/ruby/shared/file/size.rb
@@ -56,7 +56,7 @@
   end
 
   it "raises an error if file_name doesn't exist" do
-    -> {@object.send(@method, @missing)}.should raise_error(Errno::ENOENT)
+    -> {@object.send(@method, @missing)}.should.raise(Errno::ENOENT)
   end
 end
 
diff --git a/spec/ruby/shared/file/world_readable.rb b/spec/ruby/shared/file/world_readable.rb
index 1dce7a580fe..c8946366ad8 100644
--- a/spec/ruby/shared/file/world_readable.rb
+++ b/spec/ruby/shared/file/world_readable.rb
@@ -14,24 +14,24 @@
   platform_is_not :windows do
     it "returns nil if the file is chmod 600" do
       File.chmod(0600, @file)
-      @object.world_readable?(@file).should be_nil
+      @object.world_readable?(@file).should == nil
     end
 
     it "returns nil if the file is chmod 000" do
       File.chmod(0000, @file)
-      @object.world_readable?(@file).should be_nil
+      @object.world_readable?(@file).should == nil
     end
 
     it "returns nil if the file is chmod 700" do
       File.chmod(0700, @file)
-      @object.world_readable?(@file).should be_nil
+      @object.world_readable?(@file).should == nil
     end
   end
 
   # We don't specify what the Integer is because it's system dependent
   it "returns an Integer if the file is chmod 644" do
     File.chmod(0644, @file)
-    @object.world_readable?(@file).should be_an_instance_of(Integer)
+    @object.world_readable?(@file).should.instance_of?(Integer)
   end
 
   it "returns an Integer if the file is a directory and chmod 644" do
@@ -39,7 +39,7 @@
     Dir.mkdir(dir)
     Dir.should.exist?(dir)
     File.chmod(0644, dir)
-    @object.world_readable?(dir).should be_an_instance_of(Integer)
+    @object.world_readable?(dir).should.instance_of?(Integer)
     Dir.rmdir(dir)
   end
 
diff --git a/spec/ruby/shared/file/world_writable.rb b/spec/ruby/shared/file/world_writable.rb
index 7ed252dcf3c..fcff09636e2 100644
--- a/spec/ruby/shared/file/world_writable.rb
+++ b/spec/ruby/shared/file/world_writable.rb
@@ -14,23 +14,23 @@
   platform_is_not :windows do
     it "returns nil if the file is chmod 600" do
       File.chmod(0600, @file)
-      @object.world_writable?(@file).should be_nil
+      @object.world_writable?(@file).should == nil
     end
 
     it "returns nil if the file is chmod 000" do
       File.chmod(0000, @file)
-      @object.world_writable?(@file).should be_nil
+      @object.world_writable?(@file).should == nil
     end
 
     it "returns nil if the file is chmod 700" do
       File.chmod(0700, @file)
-      @object.world_writable?(@file).should be_nil
+      @object.world_writable?(@file).should == nil
     end
 
     # We don't specify what the Integer is because it's system dependent
     it "returns an Integer if the file is chmod 777" do
       File.chmod(0777, @file)
-      @object.world_writable?(@file).should be_an_instance_of(Integer)
+      @object.world_writable?(@file).should.instance_of?(Integer)
     end
 
     it "returns an Integer if the file is a directory and chmod 777" do
@@ -38,7 +38,7 @@
       Dir.mkdir(dir)
       Dir.should.exist?(dir)
       File.chmod(0777, dir)
-      @object.world_writable?(dir).should be_an_instance_of(Integer)
+      @object.world_writable?(dir).should.instance_of?(Integer)
       Dir.rmdir(dir)
     end
   end
diff --git a/spec/ruby/shared/file/writable_real.rb b/spec/ruby/shared/file/writable_real.rb
index b4a0a58c6e4..4602996187b 100644
--- a/spec/ruby/shared/file/writable_real.rb
+++ b/spec/ruby/shared/file/writable_real.rb
@@ -16,13 +16,13 @@
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { File.writable_real?        }.should raise_error(ArgumentError)
+    -> { File.writable_real?        }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { @object.send(@method, 1)     }.should raise_error(TypeError)
-    -> { @object.send(@method, nil)   }.should raise_error(TypeError)
-    -> { @object.send(@method, false) }.should raise_error(TypeError)
+    -> { @object.send(@method, 1)     }.should.raise(TypeError)
+    -> { @object.send(@method, nil)   }.should.raise(TypeError)
+    -> { @object.send(@method, false) }.should.raise(TypeError)
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/shared/file/zero.rb b/spec/ruby/shared/file/zero.rb
index 6a9399a0214..94285c14c57 100644
--- a/spec/ruby/shared/file/zero.rb
+++ b/spec/ruby/shared/file/zero.rb
@@ -40,13 +40,13 @@
   end
 
   it "raises an ArgumentError if not passed one argument" do
-    -> { File.zero? }.should raise_error(ArgumentError)
+    -> { File.zero? }.should.raise(ArgumentError)
   end
 
   it "raises a TypeError if not passed a String type" do
-    -> { @object.send(@method, nil)   }.should raise_error(TypeError)
-    -> { @object.send(@method, true)  }.should raise_error(TypeError)
-    -> { @object.send(@method, false) }.should raise_error(TypeError)
+    -> { @object.send(@method, nil)   }.should.raise(TypeError)
+    -> { @object.send(@method, true)  }.should.raise(TypeError)
+    -> { @object.send(@method, false) }.should.raise(TypeError)
   end
 
   it "returns true inside a block opening a file if it is empty" do
@@ -57,7 +57,7 @@
 
   # See https://bugs.ruby-lang.org/issues/449 for background
   it "returns true or false for a directory" do
-    @object.send(@method, @dir).should be_true_or_false
+    [true, false].should.include? @object.send(@method, @dir)
   end
 end
 
diff --git a/spec/ruby/shared/hash/key_error.rb b/spec/ruby/shared/hash/key_error.rb
index 54dcb89e919..0044cd5de23 100644
--- a/spec/ruby/shared/hash/key_error.rb
+++ b/spec/ruby/shared/hash/key_error.rb
@@ -2,21 +2,21 @@
   it "raises a KeyError" do
     -> {
       @method.call(@object, 'foo')
-    }.should raise_error(KeyError)
+    }.should.raise(KeyError)
   end
 
   it "sets the Hash as the receiver of KeyError" do
     -> {
       @method.call(@object, 'foo')
-    }.should raise_error(KeyError) { |err|
-      err.receiver.should equal(@object)
+    }.should.raise(KeyError) { |err|
+      err.receiver.should.equal?(@object)
     }
   end
 
   it "sets the unmatched key as the key of KeyError" do
     -> {
       @method.call(@object, 'foo')
-    }.should raise_error(KeyError) { |err|
+    }.should.raise(KeyError) { |err|
       err.key.to_s.should == 'foo'
     }
   end
diff --git a/spec/ruby/shared/io/putc.rb b/spec/ruby/shared/io/putc.rb
index cdf18ac9fd6..56902ccad5e 100644
--- a/spec/ruby/shared/io/putc.rb
+++ b/spec/ruby/shared/io/putc.rb
@@ -40,18 +40,18 @@
 
   it "raises IOError on a closed stream" do
     @io.close
-    -> { @io_object.send(@method, "a") }.should raise_error(IOError)
+    -> { @io_object.send(@method, "a") }.should.raise(IOError)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { @io_object.send(@method, nil) }.should raise_error(TypeError)
+    -> { @io_object.send(@method, nil) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed false" do
-    -> { @io_object.send(@method, false) }.should raise_error(TypeError)
+    -> { @io_object.send(@method, false) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed true" do
-    -> { @io_object.send(@method, true) }.should raise_error(TypeError)
+    -> { @io_object.send(@method, true) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/shared/kernel/at_exit.rb b/spec/ruby/shared/kernel/at_exit.rb
index d57ab73920f..a868ed1e0ec 100644
--- a/spec/ruby/shared/kernel/at_exit.rb
+++ b/spec/ruby/shared/kernel/at_exit.rb
@@ -60,7 +60,7 @@
     result = ruby_exe('{', options: "-r#{script}", args: "2>&1", exit_status: 1)
     $?.should_not.success?
     result.should.include?("handler ran\n")
-    result.should include("SyntaxError")
+    result.should.include?("SyntaxError")
   end
 
   it "calls the nested handler right after the outer one if a handler is nested into another handler" do
diff --git a/spec/ruby/shared/kernel/complex.rb b/spec/ruby/shared/kernel/complex.rb
index 98ee0b2b3fb..6e0764dd3d2 100644
--- a/spec/ruby/shared/kernel/complex.rb
+++ b/spec/ruby/shared/kernel/complex.rb
@@ -2,7 +2,7 @@
 describe :kernel_complex, shared: true do
 
   it "returns a Complex object" do
-    @object.send(@method, '9').should be_an_instance_of(Complex)
+    @object.send(@method, '9').should.instance_of?(Complex)
   end
 
   it "understands integers" do
diff --git a/spec/ruby/shared/kernel/equal.rb b/spec/ruby/shared/kernel/equal.rb
index 0a70aec6394..3b74232922f 100644
--- a/spec/ruby/shared/kernel/equal.rb
+++ b/spec/ruby/shared/kernel/equal.rb
@@ -2,13 +2,13 @@
 describe :object_equal, shared: true do
   it "returns true if other is identical to self" do
     obj = Object.new
-    obj.__send__(@method, obj).should be_true
+    obj.__send__(@method, obj).should == true
   end
 
   it "returns false if other is not identical to self" do
     a = Object.new
     b = Object.new
-    a.__send__(@method, b).should be_false
+    a.__send__(@method, b).should == false
   end
 
   it "returns true only if self and other are the same object" do
diff --git a/spec/ruby/shared/kernel/object_id.rb b/spec/ruby/shared/kernel/object_id.rb
index 099df8ff94c..6469e499039 100644
--- a/spec/ruby/shared/kernel/object_id.rb
+++ b/spec/ruby/shared/kernel/object_id.rb
@@ -2,7 +2,7 @@
 describe :object_id, shared: true do
   it "returns an integer" do
     o1 = @object.new
-    o1.__send__(@method).should be_kind_of(Integer)
+    o1.__send__(@method).should.is_a?(Integer)
   end
 
   it "returns the same value on all calls to id for a given object" do
diff --git a/spec/ruby/shared/kernel/raise.rb b/spec/ruby/shared/kernel/raise.rb
index 2be06ea797a..07b6a30de2c 100644
--- a/spec/ruby/shared/kernel/raise.rb
+++ b/spec/ruby/shared/kernel/raise.rb
@@ -7,9 +7,9 @@
     -> do
       @object.raise Exception, "abort"
       ScratchPad.record :no_abort
-    end.should raise_error(Exception, "abort")
+    end.should.raise(Exception, "abort")
 
-    ScratchPad.recorded.should be_nil
+    ScratchPad.recorded.should == nil
   end
 
   it "accepts an exception that implements to_hash" do
@@ -19,7 +19,7 @@ def to_hash
       end
     end
     error = custom_error.new
-    -> { @object.raise(error) }.should raise_error(custom_error)
+    -> { @object.raise(error) }.should.raise(custom_error)
   end
 
   it "allows the message parameter to be a hash" do
@@ -30,7 +30,7 @@ def initialize(data)
       end
     end
 
-    -> { @object.raise(data_error, {data: 42}) }.should raise_error(data_error) do |ex|
+    -> { @object.raise(data_error, {data: 42}) }.should.raise(data_error) do |ex|
       ex.data.should == {data: 42}
     end
   end
@@ -44,22 +44,22 @@ def initialize(data)
       end
     end
 
-    -> { @object.raise(data_error, data: 42) }.should raise_error(data_error) do |ex|
+    -> { @object.raise(data_error, data: 42) }.should.raise(data_error) do |ex|
       ex.data.should == {data: 42}
     end
   end
 
   it "raises RuntimeError if no exception class is given" do
-    -> { @object.raise }.should raise_error(RuntimeError, "")
+    -> { @object.raise }.should.raise(RuntimeError, "")
   end
 
   it "raises a given Exception instance" do
     error = RuntimeError.new
-    -> { @object.raise(error) }.should raise_error(error)
+    -> { @object.raise(error) }.should.raise(error)
   end
 
   it "raises a RuntimeError if string given" do
-    -> { @object.raise("a bad thing") }.should raise_error(RuntimeError, "a bad thing")
+    -> { @object.raise("a bad thing") }.should.raise(RuntimeError, "a bad thing")
   end
 
   it "passes no arguments to the constructor when given only an exception class" do
@@ -67,29 +67,29 @@ def initialize(data)
       def initialize
       end
     end
-    -> { @object.raise(klass) }.should raise_error(klass) { |e| e.message.should == klass.to_s }
+    -> { @object.raise(klass) }.should.raise(klass) { |e| e.message.should == klass.to_s }
   end
 
   it "raises a TypeError when passed a non-Exception object" do
-    -> { @object.raise(Object.new) }.should raise_error(TypeError, "exception class/object expected")
-    -> { @object.raise(Object.new, "message") }.should raise_error(TypeError, "exception class/object expected")
-    -> { @object.raise(Object.new, "message", []) }.should raise_error(TypeError, "exception class/object expected")
+    -> { @object.raise(Object.new) }.should.raise(TypeError, "exception class/object expected")
+    -> { @object.raise(Object.new, "message") }.should.raise(TypeError, "exception class/object expected")
+    -> { @object.raise(Object.new, "message", []) }.should.raise(TypeError, "exception class/object expected")
   end
 
   it "raises a TypeError when passed true" do
-    -> { @object.raise(true) }.should raise_error(TypeError, "exception class/object expected")
+    -> { @object.raise(true) }.should.raise(TypeError, "exception class/object expected")
   end
 
   it "raises a TypeError when passed false" do
-    -> { @object.raise(false) }.should raise_error(TypeError, "exception class/object expected")
+    -> { @object.raise(false) }.should.raise(TypeError, "exception class/object expected")
   end
 
   it "raises a TypeError when passed nil" do
-    -> { @object.raise(nil) }.should raise_error(TypeError, "exception class/object expected")
+    -> { @object.raise(nil) }.should.raise(TypeError, "exception class/object expected")
   end
 
   it "raises a TypeError when passed a message and an extra argument" do
-    -> { @object.raise("message", {cause: RuntimeError.new()}) }.should raise_error(TypeError, "exception class/object expected")
+    -> { @object.raise("message", {cause: RuntimeError.new()}) }.should.raise(TypeError, "exception class/object expected")
   end
 
   it "raises TypeError when passed a non-Exception object but it responds to #exception method that doesn't return an instance of Exception class" do
@@ -100,7 +100,7 @@ def e.exception
 
     -> {
       @object.raise e
-    }.should raise_error(TypeError, "exception object expected")
+    }.should.raise(TypeError, "exception object expected")
   end
 
   it "re-raises a previously rescued exception without overwriting the backtrace" do
@@ -127,7 +127,7 @@ def e.exception
   it "allows Exception, message, and backtrace parameters" do
     -> do
       @object.raise(ArgumentError, "message", caller)
-    end.should raise_error(ArgumentError, "message")
+    end.should.raise(ArgumentError, "message")
   end
 
   ruby_version_is "3.4" do
@@ -135,68 +135,76 @@ def e.exception
     it "allows Exception, message, and backtrace_locations parameters" do
       -> do
         @object.raise(ArgumentError, "message", locations)
-      end.should raise_error(ArgumentError, "message") { |error|
+      end.should.raise(ArgumentError, "message") { |error|
         error.backtrace_locations.map(&:to_s).should == locations.map(&:to_s)
       }
     end
   end
+end
 
-  ruby_version_is "4.0" do
-    it "allows cause keyword argument" do
+describe :kernel_raise_with_cause, shared: true do
+  context "without cause keyword argument" do
+    it "sets cause to nil when there is no previous exception" do
+      -> do
+        @object.raise("error without a cause")
+      end.should.raise(RuntimeError, "error without a cause", cause: nil)
+    end
+
+    it "supports automatic cause chaining from a previous exception" do
+      begin
+        raise StandardError,"first error"
+      rescue => cause
+        -> { @object.raise("second error") }.should.raise(RuntimeError, "second error", cause:)
+      end
+    end
+  end
+
+  context "with cause keyword argument" do
+    it "allows setting exception's cause" do
       cause = StandardError.new("original error")
-      result = nil
 
       -> do
-        @object.raise("new error", cause: cause)
-      end.should raise_error(RuntimeError, "new error") do |error|
-        error.cause.should == cause
+        @object.raise("new error", cause:)
+      end.should.raise(RuntimeError, "new error", cause:)
+    end
+
+    it "allows setting cause to nil" do
+      -> do
+        @object.raise("error without a cause", cause: nil)
+      end.should.raise(RuntimeError, "error without a cause") do |error|
+        error.cause.should == nil
       end
     end
 
     it "raises an ArgumentError when only cause is given" do
       cause = StandardError.new("cause")
       -> do
-        @object.raise(cause: cause)
-      end.should raise_error(ArgumentError, "only cause is given with no arguments")
+        @object.raise(cause:)
+      end.should.raise(ArgumentError, "only cause is given with no arguments")
     end
 
     it "raises an ArgumentError when only cause is given and is nil" do
       -> do
         @object.raise(cause: nil)
-      end.should raise_error(ArgumentError, "only cause is given with no arguments")
+      end.should.raise(ArgumentError, "only cause is given with no arguments")
     end
 
-    it "raises a TypeError when given cause is not an instance of Exception" do
+    it "raises a TypeError when given cause is not an instance of Exception or nil" do
       cause = Object.new
       -> do
-        @object.raise("message", cause: cause)
-      end.should raise_error(TypeError, "exception object expected")
+        @object.raise("message", cause:)
+      end.should.raise(TypeError, "exception object expected")
     end
 
     it "doesn't set given cause when it equals the raised exception" do
       cause = StandardError.new("cause")
-      result = nil
-
-      -> do
-        @object.raise(cause, cause: cause)
-      end.should raise_error(StandardError, "cause") do |error|
-        error.should == cause
-        error.cause.should == nil
-      end
-    end
-
-    it "accepts cause equal an exception" do
-      error = RuntimeError.new("message")
-      result = nil
 
       -> do
-        @object.raise(error, cause: error)
-      end.should raise_error(RuntimeError, "message") do |e|
-        e.cause.should == nil
-      end
+        @object.raise(cause, cause:)
+      end.should.raise(StandardError, "cause", cause: nil)
     end
 
-    it "rejects circular causes" do
+    it "raises ArgumentError when cause creates a circular reference" do
       -> {
         begin
           raise "Error 1"
@@ -211,52 +219,40 @@ def e.exception
             end
           end
         end
-      }.should raise_error(ArgumentError, "circular causes")
+      }.should.raise(ArgumentError, "circular causes")
     end
 
     it "supports exception class with message and cause" do
       cause = StandardError.new("cause message")
-      result = nil
 
       -> do
-        @object.raise(ArgumentError, "argument error message", cause: cause)
-      end.should raise_error(ArgumentError, "argument error message") do |error|
-        error.should be_kind_of(ArgumentError)
-        error.message.should == "argument error message"
-        error.cause.should == cause
-      end
+        @object.raise(ArgumentError, "argument error message", cause:)
+      end.should.raise(ArgumentError, "argument error message", cause:)
     end
 
     it "supports exception class with message, backtrace and cause" do
       cause = StandardError.new("cause message")
       backtrace = ["line1", "line2"]
-      result = nil
 
       -> do
-        @object.raise(ArgumentError, "argument error message", backtrace, cause: cause)
-      end.should raise_error(ArgumentError, "argument error message") do |error|
-        error.should be_kind_of(ArgumentError)
-        error.message.should == "argument error message"
-        error.cause.should == cause
+        @object.raise(ArgumentError, "argument error message", backtrace, cause:)
+      end.should.raise(ArgumentError, "argument error message", cause:) do |error|
         error.backtrace.should == backtrace
       end
     end
 
-    it "supports automatic cause chaining" do
+    it "supports cause: exception, overriding previous exception" do
+      custom_error = StandardError.new("custom error")
       -> do
         begin
           raise "first error"
         rescue
-          # No explicit cause - should chain automatically:
-          @object.raise("second error")
+          @object.raise("second error", cause: custom_error)
         end
-      end.should raise_error(RuntimeError, "second error") do |error|
-        error.cause.should be_kind_of(RuntimeError)
-        error.cause.message.should == "first error"
-      end
+      end.should.raise(RuntimeError, "second error", cause: custom_error)
     end
 
-    it "supports cause: nil to prevent automatic cause chaining" do
+    it "supports cause: nil, discarding previous exception" do
       -> do
         begin
           raise "first error"
@@ -264,9 +260,7 @@ def e.exception
           # Explicit nil prevents chaining:
           @object.raise("second error", cause: nil)
         end
-      end.should raise_error(RuntimeError, "second error") do |error|
-        error.cause.should == nil
-      end
+      end.should.raise(RuntimeError, "second error", cause: nil)
     end
   end
 end
@@ -292,7 +286,7 @@ def e.exception
           end
         end
 
-        result.should be_kind_of(RuntimeError)
+        result.should.is_a?(RuntimeError)
         result.message.should == "second error"
         result.cause.should == nil
       end
@@ -320,7 +314,7 @@ def e.exception
           end
         end
 
-        result.should be_kind_of(RuntimeError)
+        result.should.is_a?(RuntimeError)
         result.message.should == "second error"
         result.cause.should == override_cause
       end
@@ -340,7 +334,7 @@ def e.exception
           end
         end
 
-        result.should be_kind_of(RuntimeError)
+        result.should.is_a?(RuntimeError)
         result.message.should == "new error"
         # Calling context has no current exception:
         result.cause.should == nil
@@ -364,7 +358,7 @@ def e.exception
             end
           end
 
-          result.should be_kind_of(RuntimeError)
+          result.should.is_a?(RuntimeError)
           result.message.should == "new error"
           result.cause.should == nil
         end
@@ -379,7 +373,7 @@ def e.exception
               # Ignore - we expect the TypeError to be raised in the calling context
             end
           end
-        }.should raise_error(TypeError, "exception object expected")
+        }.should.raise(TypeError, "exception object expected")
       end
 
       it "raises ArgumentError when only cause is given with no arguments" do
@@ -391,7 +385,7 @@ def e.exception
               # Ignore - we expect the ArgumentError to be raised in the calling context
             end
           end
-        }.should raise_error(ArgumentError, "only cause is given with no arguments")
+        }.should.raise(ArgumentError, "only cause is given with no arguments")
       end
     end
   end
diff --git a/spec/ruby/shared/process/abort.rb b/spec/ruby/shared/process/abort.rb
index 935637e1c20..19f9f1e6a5d 100644
--- a/spec/ruby/shared/process/abort.rb
+++ b/spec/ruby/shared/process/abort.rb
@@ -8,29 +8,29 @@
   end
 
   it "raises a SystemExit exception" do
-    -> { @object.abort }.should raise_error(SystemExit)
+    -> { @object.abort }.should.raise(SystemExit)
   end
 
   it "sets the exception message to the given message" do
-    -> { @object.abort "message" }.should raise_error { |e| e.message.should == "message" }
+    -> { @object.abort "message" }.should.raise { |e| e.message.should == "message" }
   end
 
   it "sets the exception status code of 1" do
-    -> { @object.abort }.should raise_error { |e| e.status.should == 1 }
+    -> { @object.abort }.should.raise { |e| e.status.should == 1 }
   end
 
   it "prints the specified message to STDERR" do
-    -> { @object.abort "a message" }.should raise_error(SystemExit)
+    -> { @object.abort "a message" }.should.raise(SystemExit)
     $stderr.should =~ /a message/
   end
 
   it "coerces the argument with #to_str" do
     str = mock('to_str')
     str.should_receive(:to_str).any_number_of_times.and_return("message")
-    -> { @object.abort str }.should raise_error(SystemExit, "message")
+    -> { @object.abort str }.should.raise(SystemExit, "message")
   end
 
   it "raises TypeError when given a non-String object" do
-    -> { @object.abort 123 }.should raise_error(TypeError)
+    -> { @object.abort 123 }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/shared/process/exit.rb b/spec/ruby/shared/process/exit.rb
index 1e073614a3c..cacf2f87744 100644
--- a/spec/ruby/shared/process/exit.rb
+++ b/spec/ruby/shared/process/exit.rb
@@ -1,13 +1,13 @@
 describe :process_exit, shared: true do
   it "raises a SystemExit with status 0" do
-    -> { @object.exit }.should raise_error(SystemExit) { |e|
+    -> { @object.exit }.should.raise(SystemExit) { |e|
       e.status.should == 0
     }
   end
 
   it "raises a SystemExit with the specified status" do
     [-2**16, -2**8, -8, -1, 0, 1 , 8, 2**8, 2**16].each do |value|
-      -> { @object.exit(value) }.should raise_error(SystemExit) { |e|
+      -> { @object.exit(value) }.should.raise(SystemExit) { |e|
         e.status.should == value
       }
     end
@@ -15,14 +15,14 @@
 
   it "raises a SystemExit with the specified boolean status" do
     { true => 0, false => 1 }.each do |value, status|
-      -> { @object.exit(value) }.should raise_error(SystemExit) { |e|
+      -> { @object.exit(value) }.should.raise(SystemExit) { |e|
         e.status.should == status
       }
     end
   end
 
   it "raises a SystemExit with message 'exit'" do
-    -> { @object.exit }.should raise_error(SystemExit) { |e|
+    -> { @object.exit }.should.raise(SystemExit) { |e|
       e.message.should == "exit"
     }
   end
@@ -30,24 +30,24 @@
   it "tries to convert the passed argument to an Integer using #to_int" do
     obj = mock('5')
     obj.should_receive(:to_int).and_return(5)
-    -> { @object.exit(obj) }.should raise_error(SystemExit) { |e|
+    -> { @object.exit(obj) }.should.raise(SystemExit) { |e|
       e.status.should == 5
     }
   end
 
   it "converts the passed Float argument to an Integer" do
     { -2.2 => -2, -0.1 => 0, 5.5 => 5, 827.999 => 827 }.each do |value, status|
-      -> { @object.exit(value) }.should raise_error(SystemExit) { |e|
+      -> { @object.exit(value) }.should.raise(SystemExit) { |e|
         e.status.should == status
       }
     end
   end
 
   it "raises TypeError if can't convert the argument to an Integer" do
-    -> { @object.exit(Object.new) }.should raise_error(TypeError)
-    -> { @object.exit('0') }.should raise_error(TypeError)
-    -> { @object.exit([0]) }.should raise_error(TypeError)
-    -> { @object.exit(nil) }.should raise_error(TypeError)
+    -> { @object.exit(Object.new) }.should.raise(TypeError)
+    -> { @object.exit('0') }.should.raise(TypeError)
+    -> { @object.exit([0]) }.should.raise(TypeError)
+    -> { @object.exit(nil) }.should.raise(TypeError)
   end
 
   it "raises the SystemExit in the main thread if it reaches the top-level handler of another thread" do
@@ -75,7 +75,7 @@
     ScratchPad.recorded.should == [:in_thread, :in_main]
 
     # the thread also keeps the exception as its value
-    -> { t.value }.should raise_error(SystemExit)
+    -> { t.value }.should.raise(SystemExit)
   end
 end
 
diff --git a/spec/ruby/shared/process/fork.rb b/spec/ruby/shared/process/fork.rb
index 8dbb3d0da43..dd595cd93ed 100644
--- a/spec/ruby/shared/process/fork.rb
+++ b/spec/ruby/shared/process/fork.rb
@@ -3,12 +3,12 @@
     it "returns false from #respond_to?" do
       # Workaround for Kernel::Method being public and losing the "non-respond_to? magic"
       mod = @object.class.name == "KernelSpecs::Method" ? Object.new : @object
-      mod.respond_to?(:fork).should be_false
-      mod.respond_to?(:fork, true).should be_false
+      mod.respond_to?(:fork).should == false
+      mod.respond_to?(:fork, true).should == false
     end
 
     it "raises a NotImplementedError when called" do
-      -> { @object.fork }.should raise_error(NotImplementedError)
+      -> { @object.fork }.should.raise(NotImplementedError)
     end
   end
 
@@ -74,16 +74,19 @@
 
     it "marks threads from the parent as killed" do
       t = Thread.new { sleep }
-      pid = @object.fork {
-        touch(@file) do |f|
-          f.write Thread.current.alive?
-          f.write t.alive?
-        end
-        Process.exit!
-      }
-      Process.waitpid(pid)
-      t.kill
-      t.join
+      begin
+        pid = @object.fork {
+          touch(@file) do |f|
+            f.write Thread.current.alive?
+            f.write t.alive?
+          end
+          Process.exit!
+        }
+        Process.waitpid(pid)
+      ensure
+        t.kill
+        t.join
+      end
       File.read(@file).should == "truefalse"
     end
   end
diff --git a/spec/ruby/shared/queue/clear.rb b/spec/ruby/shared/queue/clear.rb
index 5db5a5b4973..742468a8598 100644
--- a/spec/ruby/shared/queue/clear.rb
+++ b/spec/ruby/shared/queue/clear.rb
@@ -3,9 +3,9 @@
     queue = @object.call
     queue << Object.new
     queue << 1
-    queue.empty?.should be_false
+    queue.empty?.should == false
     queue.clear
-    queue.empty?.should be_true
+    queue.empty?.should == true
   end
 
   # TODO: test for atomicity of Queue#clear
diff --git a/spec/ruby/shared/queue/close.rb b/spec/ruby/shared/queue/close.rb
index 0e7c69acbae..1b0908c27c7 100644
--- a/spec/ruby/shared/queue/close.rb
+++ b/spec/ruby/shared/queue/close.rb
@@ -2,9 +2,9 @@
   it "may be called multiple times" do
     q = @object.call
     q.close
-    q.closed?.should be_true
+    q.closed?.should == true
     q.close # no effect
-    q.closed?.should be_true
+    q.closed?.should == true
   end
 
   it "returns self" do
diff --git a/spec/ruby/shared/queue/closed.rb b/spec/ruby/shared/queue/closed.rb
index b3cea0c5245..8a7d65055f2 100644
--- a/spec/ruby/shared/queue/closed.rb
+++ b/spec/ruby/shared/queue/closed.rb
@@ -1,12 +1,12 @@
 describe :queue_closed?, shared: true do
   it "returns false initially" do
     queue = @object.call
-    queue.closed?.should be_false
+    queue.closed?.should == false
   end
 
   it "returns true when the queue is closed" do
     queue = @object.call
     queue.close
-    queue.closed?.should be_true
+    queue.closed?.should == true
   end
 end
diff --git a/spec/ruby/shared/queue/deque.rb b/spec/ruby/shared/queue/deque.rb
index a154da62747..45cbc4a995d 100644
--- a/spec/ruby/shared/queue/deque.rb
+++ b/spec/ruby/shared/queue/deque.rb
@@ -105,18 +105,18 @@
       q = @object.call
       -> {
         q.send(@method, timeout: "1")
-      }.should raise_error(TypeError, "no implicit conversion to float from string")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of String into Float")
 
       -> {
         q.send(@method, timeout: false)
-      }.should raise_error(TypeError, "no implicit conversion to float from false")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of false into Float")
     end
 
     it "raise ArgumentError if non_block = true is passed too" do
       q = @object.call
       -> {
         q.send(@method, true, timeout: 1)
-      }.should raise_error(ArgumentError, "can't set a timeout if non_block is enabled")
+      }.should.raise(ArgumentError, "can't set a timeout if non_block is enabled")
     end
 
     it "returns nil for a closed empty queue" do
@@ -137,7 +137,7 @@
 
     it "raises a ThreadError if the queue is empty" do
       q = @object.call
-      -> { q.send(@method, true) }.should raise_error(ThreadError)
+      -> { q.send(@method, true) }.should.raise(ThreadError)
     end
 
     it "removes an item from a closed queue" do
@@ -150,15 +150,15 @@
     it "raises a ThreadError for a closed empty queue" do
       q = @object.call
       q.close
-      -> { q.send(@method, true) }.should raise_error(ThreadError)
+      -> { q.send(@method, true) }.should.raise(ThreadError)
     end
 
     it "converts true-ish non_blocking argument to true" do
       q = @object.call
 
-      -> { q.send(@method, true) }.should raise_error(ThreadError)
-      -> { q.send(@method, 1) }.should raise_error(ThreadError)
-      -> { q.send(@method, "") }.should raise_error(ThreadError)
+      -> { q.send(@method, true) }.should.raise(ThreadError)
+      -> { q.send(@method, 1) }.should.raise(ThreadError)
+      -> { q.send(@method, "") }.should.raise(ThreadError)
     end
   end
 end
diff --git a/spec/ruby/shared/queue/empty.rb b/spec/ruby/shared/queue/empty.rb
index 4acd831d485..052ce6ac23a 100644
--- a/spec/ruby/shared/queue/empty.rb
+++ b/spec/ruby/shared/queue/empty.rb
@@ -1,12 +1,12 @@
 describe :queue_empty?, shared: true do
   it "returns true on an empty Queue" do
     queue = @object.call
-    queue.empty?.should be_true
+    queue.empty?.should == true
   end
 
   it "returns false when Queue is not empty" do
     queue = @object.call
     queue << Object.new
-    queue.empty?.should be_false
+    queue.empty?.should == false
   end
 end
diff --git a/spec/ruby/shared/queue/enque.rb b/spec/ruby/shared/queue/enque.rb
index 8aba02e544d..61d962b7887 100644
--- a/spec/ruby/shared/queue/enque.rb
+++ b/spec/ruby/shared/queue/enque.rb
@@ -13,6 +13,6 @@
     q.close
     -> {
       q.send @method, Object.new
-    }.should raise_error(ClosedQueueError)
+    }.should.raise(ClosedQueueError)
   end
 end
diff --git a/spec/ruby/shared/queue/freeze.rb b/spec/ruby/shared/queue/freeze.rb
index 5dedd005df4..7f1f72fd7eb 100644
--- a/spec/ruby/shared/queue/freeze.rb
+++ b/spec/ruby/shared/queue/freeze.rb
@@ -3,6 +3,6 @@
     queue = @object.call
     -> {
       queue.freeze
-    }.should raise_error(TypeError, "cannot freeze #{queue}")
+    }.should.raise(TypeError, "cannot freeze #{queue}")
   end
 end
diff --git a/spec/ruby/shared/sizedqueue/enque.rb b/spec/ruby/shared/sizedqueue/enque.rb
index 6804af3fb33..014056acdab 100644
--- a/spec/ruby/shared/sizedqueue/enque.rb
+++ b/spec/ruby/shared/sizedqueue/enque.rb
@@ -29,7 +29,7 @@
     q.size.should == 1
     add_to_queue.call
     q.size.should == 2
-    add_to_queue.should raise_error(ThreadError)
+    add_to_queue.should.raise(ThreadError)
   end
 
   it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
@@ -37,7 +37,7 @@
     q << 1
 
     t = Thread.new {
-      -> { q.send(@method, 2) }.should raise_error(ClosedQueueError, "queue closed")
+      -> { q.send(@method, 2) }.should.raise(ClosedQueueError, "queue closed")
     }
 
     Thread.pass until q.num_waiting == 1
@@ -90,24 +90,24 @@
       q = @object.call(1)
       -> {
         q.send(@method, 2, timeout: "1")
-      }.should raise_error(TypeError, "no implicit conversion to float from string")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of String into Float")
 
       -> {
         q.send(@method, 2, timeout: false)
-      }.should raise_error(TypeError, "no implicit conversion to float from false")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of false into Float")
     end
 
     it "raise ArgumentError if non_block = true is passed too" do
       q = @object.call(1)
       -> {
         q.send(@method, 2, true, timeout: 1)
-      }.should raise_error(ArgumentError, "can't set a timeout if non_block is enabled")
+      }.should.raise(ArgumentError, "can't set a timeout if non_block is enabled")
     end
 
     it "raise ClosedQueueError when closed before enqueued" do
       q = @object.call(1)
       q.close
-      -> { q.send(@method, 2, timeout: 1) }.should raise_error(ClosedQueueError, "queue closed")
+      -> { q.send(@method, 2, timeout: 1) }.should.raise(ClosedQueueError, "queue closed")
     end
 
     it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
@@ -115,7 +115,7 @@
       q << 1
 
       t = Thread.new {
-        -> { q.send(@method, 1, timeout: TIME_TOLERANCE) }.should raise_error(ClosedQueueError, "queue closed")
+        -> { q.send(@method, 1, timeout: TIME_TOLERANCE) }.should.raise(ClosedQueueError, "queue closed")
       }
 
       Thread.pass until q.num_waiting == 1
diff --git a/spec/ruby/shared/sizedqueue/max.rb b/spec/ruby/shared/sizedqueue/max.rb
index ea10d24be03..167f6692758 100644
--- a/spec/ruby/shared/sizedqueue/max.rb
+++ b/spec/ruby/shared/sizedqueue/max.rb
@@ -19,7 +19,7 @@
     q.enq 2
     q.enq 3
     q.max = 2
-    (q.size > q.max).should be_true
+    (q.size > q.max).should == true
     q.deq.should == 1
     q.deq.should == 2
     q.deq.should == 3
@@ -27,21 +27,21 @@
 
   it "raises a TypeError when given a non-numeric value" do
     q = @object.call(5)
-    -> { q.max = "foo" }.should raise_error(TypeError)
-    -> { q.max = Object.new }.should raise_error(TypeError)
+    -> { q.max = "foo" }.should.raise(TypeError)
+    -> { q.max = Object.new }.should.raise(TypeError)
   end
 
   it "raises an argument error when set to zero" do
     q = @object.call(5)
     q.max.should == 5
-    -> { q.max = 0 }.should raise_error(ArgumentError)
+    -> { q.max = 0 }.should.raise(ArgumentError)
     q.max.should == 5
   end
 
   it "raises an argument error when set to a negative number" do
     q = @object.call(5)
     q.max.should == 5
-    -> { q.max = -1 }.should raise_error(ArgumentError)
+    -> { q.max = -1 }.should.raise(ArgumentError)
     q.max.should == 5
   end
 end
diff --git a/spec/ruby/shared/sizedqueue/new.rb b/spec/ruby/shared/sizedqueue/new.rb
index 2573194efb2..2904422a45b 100644
--- a/spec/ruby/shared/sizedqueue/new.rb
+++ b/spec/ruby/shared/sizedqueue/new.rb
@@ -1,7 +1,7 @@
 describe :sizedqueue_new, shared: true do
   it "raises a TypeError when the given argument doesn't respond to #to_int" do
-    -> { @object.call("12") }.should raise_error(TypeError)
-    -> { @object.call(Object.new) }.should raise_error(TypeError)
+    -> { @object.call("12") }.should.raise(TypeError)
+    -> { @object.call(Object.new) }.should.raise(TypeError)
 
     @object.call(12.9).max.should == 12
     object = Object.new
@@ -10,14 +10,14 @@
   end
 
   it "raises an argument error when no argument is given" do
-    -> { @object.call }.should raise_error(ArgumentError)
+    -> { @object.call }.should.raise(ArgumentError)
   end
 
   it "raises an argument error when the given argument is zero" do
-    -> { @object.call(0) }.should raise_error(ArgumentError)
+    -> { @object.call(0) }.should.raise(ArgumentError)
   end
 
   it "raises an argument error when the given argument is negative" do
-    -> { @object.call(-1) }.should raise_error(ArgumentError)
+    -> { @object.call(-1) }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/shared/string/end_with.rb b/spec/ruby/shared/string/end_with.rb
index 08f43c1bce7..8eb96933954 100644
--- a/spec/ruby/shared/string/end_with.rb
+++ b/spec/ruby/shared/string/end_with.rb
@@ -30,9 +30,9 @@
 
   it "ignores arguments not convertible to string" do
     "hello".send(@method).should_not.end_with?()
-    -> { "hello".send(@method).end_with?(1) }.should raise_error(TypeError)
-    -> { "hello".send(@method).end_with?(["o"]) }.should raise_error(TypeError)
-    -> { "hello".send(@method).end_with?(1, nil, "o") }.should raise_error(TypeError)
+    -> { "hello".send(@method).end_with?(1) }.should.raise(TypeError)
+    -> { "hello".send(@method).end_with?(["o"]) }.should.raise(TypeError)
+    -> { "hello".send(@method).end_with?(1, nil, "o") }.should.raise(TypeError)
   end
 
   it "uses only the needed arguments" do
@@ -49,7 +49,7 @@
     pat = "ア".encode Encoding::EUC_JP
     -> do
       "あれ".send(@method).end_with?(pat)
-    end.should raise_error(Encoding::CompatibilityError)
+    end.should.raise(Encoding::CompatibilityError)
   end
 
   it "checks that we are starting to match at the head of a character" do
diff --git a/spec/ruby/shared/string/start_with.rb b/spec/ruby/shared/string/start_with.rb
index 9592eda4d43..fe12e289692 100644
--- a/spec/ruby/shared/string/start_with.rb
+++ b/spec/ruby/shared/string/start_with.rb
@@ -26,9 +26,9 @@
 
   it "ignores arguments not convertible to string" do
     "hello".send(@method).should_not.start_with?()
-    -> { "hello".send(@method).start_with?(1) }.should raise_error(TypeError)
-    -> { "hello".send(@method).start_with?(["h"]) }.should raise_error(TypeError)
-    -> { "hello".send(@method).start_with?(1, nil, "h") }.should raise_error(TypeError)
+    -> { "hello".send(@method).start_with?(1) }.should.raise(TypeError)
+    -> { "hello".send(@method).start_with?(["h"]) }.should.raise(TypeError)
+    -> { "hello".send(@method).start_with?(1, nil, "h") }.should.raise(TypeError)
   end
 
   it "uses only the needed arguments" do
@@ -60,14 +60,14 @@
 
   it "sets Regexp.last_match if it returns true" do
     regexp = /test-(\d+)/
-    "test-1337".send(@method).start_with?(regexp).should be_true
-    Regexp.last_match.should_not be_nil
+    "test-1337".send(@method).start_with?(regexp).should == true
+    Regexp.last_match.should_not == nil
     Regexp.last_match[1].should == "1337"
     $1.should == "1337"
 
-    "test-asdf".send(@method).start_with?(regexp).should be_false
-    Regexp.last_match.should be_nil
-    $1.should be_nil
+    "test-asdf".send(@method).start_with?(regexp).should == false
+    Regexp.last_match.should == nil
+    $1.should == nil
   end
 
   it "checks that we are not matching part of a character" do
diff --git a/spec/ruby/shared/string/times.rb b/spec/ruby/shared/string/times.rb
index 4814f894cf0..0a16ba8b822 100644
--- a/spec/ruby/shared/string/times.rb
+++ b/spec/ruby/shared/string/times.rb
@@ -18,14 +18,14 @@ class MyString < String; end
   end
 
   it "raises an ArgumentError when given integer is negative" do
-    -> { @object.call("cool", -3)    }.should raise_error(ArgumentError)
-    -> { @object.call("cool", -3.14) }.should raise_error(ArgumentError)
-    -> { @object.call("cool", min_long) }.should raise_error(ArgumentError)
+    -> { @object.call("cool", -3)    }.should.raise(ArgumentError)
+    -> { @object.call("cool", -3.14) }.should.raise(ArgumentError)
+    -> { @object.call("cool", min_long) }.should.raise(ArgumentError)
   end
 
   it "raises a RangeError when given integer is a Bignum" do
-    -> { @object.call("cool", 999999999999999999999) }.should raise_error(RangeError)
-    -> { @object.call("", 999999999999999999999) }.should raise_error(RangeError)
+    -> { @object.call("cool", 999999999999999999999) }.should.raise(RangeError)
+    -> { @object.call("", 999999999999999999999) }.should.raise(RangeError)
   end
 
   it "works with huge long values when string is empty" do
@@ -33,26 +33,26 @@ class MyString < String; end
   end
 
   it "returns String instances" do
-    @object.call(MyString.new("cool"), 0).should be_an_instance_of(String)
-    @object.call(MyString.new("cool"), 1).should be_an_instance_of(String)
-    @object.call(MyString.new("cool"), 2).should be_an_instance_of(String)
+    @object.call(MyString.new("cool"), 0).should.instance_of?(String)
+    @object.call(MyString.new("cool"), 1).should.instance_of?(String)
+    @object.call(MyString.new("cool"), 2).should.instance_of?(String)
   end
 
   it "returns a String in the same encoding as self" do
     str = "\xE3\x81\x82".dup.force_encoding Encoding::UTF_8
     result = @object.call(str, 2)
-    result.encoding.should equal(Encoding::UTF_8)
+    result.encoding.should.equal?(Encoding::UTF_8)
   end
 
   platform_is c_long_size: 32 do
     it "raises an ArgumentError if the length of the resulting string doesn't fit into a long" do
-      -> { @object.call("abc", (2 ** 31) - 1) }.should raise_error(ArgumentError)
+      -> { @object.call("abc", (2 ** 31) - 1) }.should.raise(ArgumentError)
     end
   end
 
   platform_is c_long_size: 64 do
     it "raises an ArgumentError if the length of the resulting string doesn't fit into a long" do
-      -> { @object.call("abc", (2 ** 63) - 1) }.should raise_error(ArgumentError)
+      -> { @object.call("abc", (2 ** 63) - 1) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/shared/types/rb_num2dbl_fails.rb b/spec/ruby/shared/types/rb_num2dbl_fails.rb
index ec7cc119867..4d4856fa6c8 100644
--- a/spec/ruby/shared/types/rb_num2dbl_fails.rb
+++ b/spec/ruby/shared/types/rb_num2dbl_fails.rb
@@ -7,11 +7,11 @@
 
 describe :rb_num2dbl_fails, shared: true do
   it "fails if string is provided" do
-    -> { @object.call("123") }.should raise_error(TypeError, "no implicit conversion to float from string")
+    -> { @object.call("123") }.should raise_consistent_error(TypeError, "no implicit conversion of String into Float")
   end
 
   it "fails if boolean is provided" do
-    -> { @object.call(true) }.should raise_error(TypeError, "no implicit conversion to float from true")
-    -> { @object.call(false) }.should raise_error(TypeError, "no implicit conversion to float from false")
+    -> { @object.call(true) }.should raise_consistent_error(TypeError, "no implicit conversion of true into Float")
+    -> { @object.call(false) }.should raise_consistent_error(TypeError, "no implicit conversion of false into Float")
   end
 end
diff --git a/spec/tags/ruby/command_line/dash_upper_s_tags.txt b/spec/tags/ruby/command_line/dash_upper_s_tags.txt
index 358fae51435..446310db430 100644
--- a/spec/tags/ruby/command_line/dash_upper_s_tags.txt
+++ b/spec/tags/ruby/command_line/dash_upper_s_tags.txt
@@ -1 +1,4 @@
 fails:The -S command line option runs launcher found in PATH, but only code after the first /#!.*ruby.*/-ish line in target file
+fails:The -S command line option runs launcher found in RUBYPATH, but only code after the first /#!.*ruby.*/-ish line in target file
+fails:The -S command line option runs launcher found in RUBYPATH
+fails:The -S command line option runs launcher found in RUBYPATH and sets the exit status to 1 if it fails
diff --git a/spec/tags/ruby/core/array/slice_tags.txt b/spec/tags/ruby/core/array/slice_tags.txt
deleted file mode 100644
index 856affe7f74..00000000000
--- a/spec/tags/ruby/core/array/slice_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Array#slice raises a RangeError when the start index is out of range of Fixnum
diff --git a/spec/tags/ruby/core/array/try_convert_tags.txt b/spec/tags/ruby/core/array/try_convert_tags.txt
new file mode 100644
index 00000000000..8c26f3d5cd1
--- /dev/null
+++ b/spec/tags/ruby/core/array/try_convert_tags.txt
@@ -0,0 +1 @@
+fails:Array.try_convert sends #to_ary to the argument and raises TypeError if it's not a kind of Array
diff --git a/spec/tags/ruby/core/basicobject/instance_eval_tags.txt b/spec/tags/ruby/core/basicobject/instance_eval_tags.txt
index 7fd4104843a..b35e4e0ac20 100644
--- a/spec/tags/ruby/core/basicobject/instance_eval_tags.txt
+++ b/spec/tags/ruby/core/basicobject/instance_eval_tags.txt
@@ -2,3 +2,4 @@ fails:BasicObject#instance_eval raises ArgumentError if returned value is not In
 fails:BasicObject#instance_eval raises TypeError for frozen objects when tries to set receiver's instance variables
 fails:BasicObject#instance_eval constants lookup when a String given looks in the receiver class next
 fails:Array#fetch_values with matched indexes returns the values for indexes
+fails:BasicObject#instance_eval raises ArgumentError if returned value is not String
diff --git a/spec/tags/ruby/core/data/deconstruct_keys_tags.txt b/spec/tags/ruby/core/data/deconstruct_keys_tags.txt
index e8a244746ef..f50c369cb08 100644
--- a/spec/tags/ruby/core/data/deconstruct_keys_tags.txt
+++ b/spec/tags/ruby/core/data/deconstruct_keys_tags.txt
@@ -12,3 +12,7 @@ fails:Data#deconstruct_keys returns at first not existing argument position numb
 fails:Data#deconstruct_keys tries to convert a key with #to_int if index is not a String nor a Symbol, but responds to #to_int
 fails:Data#deconstruct_keys raises a TypeError if the conversion with #to_int does not return an Integer
 fails:Data#deconstruct_keys raises TypeError if index is not a String, a Symbol and not convertible to Integer 
+fails:Data#deconstruct_keys tries to convert a key with #to_str if index is not a String nor a Symbol, but responds to #to_str
+fails:Data#deconstruct_keys raise an error on argument position number
+fails:Data#deconstruct_keys raises a TypeError if the conversion with #to_str does not return a String
+fails:Data#deconstruct_keys raises TypeError if index is not a Symbol and not convertible to String
diff --git a/spec/tags/ruby/core/dir/chroot_tags.txt b/spec/tags/ruby/core/dir/chroot_tags.txt
index 8c4874a03c7..cdda029a144 100644
--- a/spec/tags/ruby/core/dir/chroot_tags.txt
+++ b/spec/tags/ruby/core/dir/chroot_tags.txt
@@ -1,3 +1,8 @@
-fails:Dir.chroot as regular user raises an Errno::EPERM exception if the directory exists
-fails:Dir.chroot as regular user raises a SystemCallError if the directory doesn't exist
-fails:Dir.chroot as regular user calls #to_path on non-String argument
+fails(unsupported):Dir.chroot as regular user raises an Errno::EPERM exception if the directory exists
+fails(unsupported):Dir.chroot as regular user raises a SystemCallError if the directory doesn't exist
+fails(unsupported):Dir.chroot as regular user calls #to_path on non-String argument
+fails(unsupported):Dir.chroot as root can be used to change the process' root directory
+fails(unsupported):Dir.chroot as root returns 0 if successful
+fails(unsupported):Dir.chroot as root raises an Errno::ENOENT exception if the directory doesn't exist
+fails(unsupported):Dir.chroot as root can be escaped from with ../
+fails(unsupported):Dir.chroot as root calls #to_path on non-String argument
diff --git a/spec/tags/ruby/core/encoding/locale_charmap_tags.txt b/spec/tags/ruby/core/encoding/locale_charmap_tags.txt
index f8e259bf4a9..e80c0e5cfc7 100644
--- a/spec/tags/ruby/core/encoding/locale_charmap_tags.txt
+++ b/spec/tags/ruby/core/encoding/locale_charmap_tags.txt
@@ -1 +1,2 @@
 unstable(fails on Travis, maybe on Linux):Encoding.locale_charmap returns a value based on the LC_ALL environment variable
+fails:Encoding.locale_charmap when setting LC_ALL=C returns a value based on the LC_ALL environment variable
diff --git a/spec/tags/ruby/core/exception/dup_tags.txt b/spec/tags/ruby/core/exception/dup_tags.txt
deleted file mode 100644
index bb471dee3cf..00000000000
--- a/spec/tags/ruby/core/exception/dup_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Exception#dup does copy the cause
diff --git a/spec/tags/ruby/core/file/lchmod_tags.txt b/spec/tags/ruby/core/file/lchmod_tags.txt
index 9d7b03f415e..268505c467e 100644
--- a/spec/tags/ruby/core/file/lchmod_tags.txt
+++ b/spec/tags/ruby/core/file/lchmod_tags.txt
@@ -1,2 +1,3 @@
 fails(linux/openbsd, not supposed to impl):File.lchmod returns false from #respond_to?
 fails(linux/openbsd, not supposed to impl):File.lchmod raises a NotImplementedError when called
+fails(FreeBSD:https://github.com/jruby/jruby/issues/9433):File.lchmod changes the file mode of the link and not of the file
diff --git a/spec/tags/ruby/core/file/lutime_tags.txt b/spec/tags/ruby/core/file/lutime_tags.txt
index c848eba9e72..40b24cd7dc8 100644
--- a/spec/tags/ruby/core/file/lutime_tags.txt
+++ b/spec/tags/ruby/core/file/lutime_tags.txt
@@ -1 +1,11 @@
 fails:File.lutime allows Time instances in the far future to set mtime and atime (but some filesystems limit it up to 2446-05-10 or 2038-01-19 or 2486-07-02)
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime sets the access and modification time of each file
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime uses the current times if two nil values are passed
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime accepts an object that has a #to_path method
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime accepts an object that has a #to_path method
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime accepts numeric atime and mtime arguments
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime may set nanosecond precision
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime returns the number of filenames in the arguments
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime sets the access and modification time for a regular file
+fails(OpenBSD, may be broken native access, https://github.com/jruby/jruby/issues/9438):File.lutime sets the access and modification time for a symlink
+
diff --git a/spec/tags/ruby/core/file/open_tags.txt b/spec/tags/ruby/core/file/open_tags.txt
index 3da0f788f1e..a880eed489f 100644
--- a/spec/tags/ruby/core/file/open_tags.txt
+++ b/spec/tags/ruby/core/file/open_tags.txt
@@ -2,3 +2,9 @@ windows:File.open opens directories
 windows:File.open does not open a file that does no exists when using File::TRUNC mode
 windows:File.open can't write in a block when call open with File::TRUNC mode
 windows:File.open raises an Errno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC
+fails(OpenBSD, possibly broken IO flags or native access, https://github.com/jruby/jruby/issues/9438):File.open opens a file that no exists when use File::TRUNC mode
+fails(OpenBSD, possibly broken IO flags or native access, https://github.com/jruby/jruby/issues/9438):File.open truncates the file when passed File::TRUNC mode
+fails(OpenBSD, possibly broken IO flags or native access, https://github.com/jruby/jruby/issues/9438):File.open can't read in a block when call open with File::TRUNC mode
+fails(OpenBSD, possibly broken IO flags or native access, https://github.com/jruby/jruby/issues/9438):File.open can't write in a block when call open with File::TRUNC mode
+fails(OpenBSD, possibly broken IO flags or native access, https://github.com/jruby/jruby/issues/9438):File.open raises an Errno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC
+
diff --git a/spec/tags/ruby/core/file/path_tags.txt b/spec/tags/ruby/core/file/path_tags.txt
index 405f287b3b8..1cf231c2b9a 100644
--- a/spec/tags/ruby/core/file/path_tags.txt
+++ b/spec/tags/ruby/core/file/path_tags.txt
@@ -1,3 +1 @@
 fails:File#path preserves the encoding of the path
-fails:File.path raises Encoding::CompatibilityError for ASCII-incompatible string argument
-fails:File.path raises Encoding::CompatibilityError when #to_path result is ASCII-incompatible
diff --git a/spec/tags/ruby/core/file/printf_tags.txt b/spec/tags/ruby/core/file/printf_tags.txt
index dc101ed6a33..0e303189cf1 100644
--- a/spec/tags/ruby/core/file/printf_tags.txt
+++ b/spec/tags/ruby/core/file/printf_tags.txt
@@ -1 +1,4 @@
 fails(https://github.com/jruby/jruby/issues/8739):File#printf other formats c displays no characters if argument is an empty string
+fails:File#printf other formats c raises TypeError if argument is nil
+fails:File#printf other formats c raises TypeError if converting to String with to_str returns non-String
+fails:File#printf other formats c raises TypeError if converting to Integer with to_int returns non-Integer
diff --git a/spec/tags/ruby/core/file/stat/inspect_tags.txt b/spec/tags/ruby/core/file/stat/inspect_tags.txt
index 0703704018b..9baae7649d9 100644
--- a/spec/tags/ruby/core/file/stat/inspect_tags.txt
+++ b/spec/tags/ruby/core/file/stat/inspect_tags.txt
@@ -1 +1,2 @@
 windows:File::Stat#inspect produces a nicely formatted description of a File::Stat object
+fails(FreeBSD:https://github.com/jruby/jruby/issues/9433):File::Stat#inspect produces a nicely formatted description of a File::Stat object
diff --git a/spec/tags/ruby/core/file/stat/nlink_tags.txt b/spec/tags/ruby/core/file/stat/nlink_tags.txt
new file mode 100644
index 00000000000..31d74755545
--- /dev/null
+++ b/spec/tags/ruby/core/file/stat/nlink_tags.txt
@@ -0,0 +1 @@
+fails(FreeBSD:https://github.com/jruby/jruby/issues/9433):File::Stat#nlink returns the number of links to a file
\ No newline at end of file
diff --git a/spec/tags/ruby/core/file/stat/sticky_tags.txt b/spec/tags/ruby/core/file/stat/sticky_tags.txt
new file mode 100644
index 00000000000..b593e06b9ff
--- /dev/null
+++ b/spec/tags/ruby/core/file/stat/sticky_tags.txt
@@ -0,0 +1,2 @@
+fails(OpenBSD, possibly broken native access, https://github.com/jruby/jruby/issues/9438):File::Stat#sticky? returns true if the named file has the sticky bit, otherwise false
+
diff --git a/spec/tags/ruby/core/file/sticky_tags.txt b/spec/tags/ruby/core/file/sticky_tags.txt
new file mode 100644
index 00000000000..1303c76a687
--- /dev/null
+++ b/spec/tags/ruby/core/file/sticky_tags.txt
@@ -0,0 +1,2 @@
+fails(OpenBSD, possibly broken native access, https://github.com/jruby/jruby/issues/9438):File.sticky? returns true if the named file has the sticky bit, otherwise false
+
diff --git a/spec/tags/ruby/core/filetest/sticky_tags.txt b/spec/tags/ruby/core/filetest/sticky_tags.txt
new file mode 100644
index 00000000000..deb1754b7b1
--- /dev/null
+++ b/spec/tags/ruby/core/filetest/sticky_tags.txt
@@ -0,0 +1,2 @@
+fails(OpenBSD, possibly broken native access, https://github.com/jruby/jruby/issues/9438):FileTest.sticky? returns true if the named file has the sticky bit, otherwise false
+
diff --git a/spec/tags/ruby/core/hash/inspect_tags.txt b/spec/tags/ruby/core/hash/inspect_tags.txt
deleted file mode 100644
index 6221f387db5..00000000000
--- a/spec/tags/ruby/core/hash/inspect_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Hash#inspect can be evaled when Encoding.default_external is changed
diff --git a/spec/tags/ruby/core/hash/try_convert_tags.txt b/spec/tags/ruby/core/hash/try_convert_tags.txt
new file mode 100644
index 00000000000..052074d3582
--- /dev/null
+++ b/spec/tags/ruby/core/hash/try_convert_tags.txt
@@ -0,0 +1 @@
+fails:Hash.try_convert sends #to_hash to the argument and raises TypeError if it's not a kind of Hash
diff --git a/spec/tags/ruby/core/integer/try_convert_tags.txt b/spec/tags/ruby/core/integer/try_convert_tags.txt
new file mode 100644
index 00000000000..20c7372e40f
--- /dev/null
+++ b/spec/tags/ruby/core/integer/try_convert_tags.txt
@@ -0,0 +1,2 @@
+fails:Integer.try_convert sends #to_int to the argument and raises TypeError if it's not a kind of Integer
+fails:Integer.try_convert responds with a different error message when it raises a TypeError, depending on the type of the non-Integer object :to_int returns
diff --git a/spec/tags/ruby/core/io/buffer/and_tags.txt b/spec/tags/ruby/core/io/buffer/and_tags.txt
new file mode 100644
index 00000000000..3ab9702d26f
--- /dev/null
+++ b/spec/tags/ruby/core/io/buffer/and_tags.txt
@@ -0,0 +1,3 @@
+fails:IO::Buffer#& raises TypeError if mask is not an IO::Buffer
+fails:IO::Buffer#and! raises TypeError if mask is not an IO::Buffer
+fails:IO::Buffer#and! modifies the buffer in place
diff --git a/spec/tags/ruby/core/io/buffer/map_tags.txt b/spec/tags/ruby/core/io/buffer/map_tags.txt
index 502b5f018aa..53cf62c37e5 100644
--- a/spec/tags/ruby/core/io/buffer/map_tags.txt
+++ b/spec/tags/ruby/core/io/buffer/map_tags.txt
@@ -20,3 +20,10 @@ fails:IO::Buffer.map with flags argument when READONLY flag is specified causes
 fails:IO::Buffer.map with flags argument when PRIVATE is specified sets private flag on the buffer, making it freely modifiable
 fails:IO::Buffer.map with flags argument when PRIVATE is specified allows mapping read-only files and modifying the buffer
 fails:IO::Buffer.map with flags argument when PRIVATE is specified is not shared across processes
+fails(native files cannot be mapped yet, https://github.com/jruby/jruby/issues/8714):IO::Buffer.map with an empty file raises ArgumentError
+fails(native files cannot be mapped yet, https://github.com/jruby/jruby/issues/8714):IO::Buffer.map with size argument raises ArgumentError if size is larger than file size
+fails(native files cannot be mapped yet, https://github.com/jruby/jruby/issues/8714):IO::Buffer.map with size argument if size is 0 raises ArgumentError
+fails(native files cannot be mapped yet, https://github.com/jruby/jruby/issues/8714):IO::Buffer.map with size and offset arguments raises ArgumentError if offset+size is larger than file size
+fails(native files cannot be mapped yet, https://github.com/jruby/jruby/issues/8714):IO::Buffer.map with size and offset arguments raises ArgumentError if offset is negative
+fails(native files cannot be mapped yet, https://github.com/jruby/jruby/issues/8714):IO::Buffer.map with size and offset arguments if offset is an allowed value for system call if size is nil sets buffer's size to file's remaining size
+fails:IO::Buffer.map with a file opened only for reading raises a SystemCallError unless read-only
diff --git a/spec/tags/ruby/core/io/buffer/not_tags.txt b/spec/tags/ruby/core/io/buffer/not_tags.txt
new file mode 100644
index 00000000000..23a35c2cb9c
--- /dev/null
+++ b/spec/tags/ruby/core/io/buffer/not_tags.txt
@@ -0,0 +1 @@
+fails:IO::Buffer#not! modifies the buffer in place
diff --git a/spec/tags/ruby/core/io/buffer/or_tags.txt b/spec/tags/ruby/core/io/buffer/or_tags.txt
new file mode 100644
index 00000000000..ced80f82793
--- /dev/null
+++ b/spec/tags/ruby/core/io/buffer/or_tags.txt
@@ -0,0 +1,3 @@
+fails:IO::Buffer#| raises TypeError if mask is not an IO::Buffer
+fails:IO::Buffer#or! raises TypeError if mask is not an IO::Buffer
+fails:IO::Buffer#or! modifies the buffer in place
diff --git a/spec/tags/ruby/core/io/buffer/xor_tags.txt b/spec/tags/ruby/core/io/buffer/xor_tags.txt
new file mode 100644
index 00000000000..7844a2202cc
--- /dev/null
+++ b/spec/tags/ruby/core/io/buffer/xor_tags.txt
@@ -0,0 +1,3 @@
+fails:IO::Buffer#^ raises TypeError if mask is not an IO::Buffer
+fails:IO::Buffer#xor! raises TypeError if mask is not an IO::Buffer
+fails:IO::Buffer#xor! modifies the buffer in place
diff --git a/spec/tags/ruby/core/io/lineno_tags.txt b/spec/tags/ruby/core/io/lineno_tags.txt
index 3227a06d221..0fc18c9f4cc 100644
--- a/spec/tags/ruby/core/io/lineno_tags.txt
+++ b/spec/tags/ruby/core/io/lineno_tags.txt
@@ -2,3 +2,4 @@ fails:IO#lineno raises an IOError on a write-only stream
 fails:IO#lineno raises an IOError on a duplexed stream with the read side closed
 fails:IO#lineno= raises an IOError on a write-only stream
 fails:IO#lineno= raises an IOError on a duplexed stream with the read side closed
+fails:IO#lineno= raises TypeError if cannot convert argument to Integer implicitly
diff --git a/spec/tags/ruby/core/io/try_convert_tags.txt b/spec/tags/ruby/core/io/try_convert_tags.txt
new file mode 100644
index 00000000000..2cf7a498a54
--- /dev/null
+++ b/spec/tags/ruby/core/io/try_convert_tags.txt
@@ -0,0 +1 @@
+fails:IO.try_convert raises a TypeError if the object does not return an IO from #to_io
diff --git a/spec/tags/ruby/core/kernel/Rational_tags.txt b/spec/tags/ruby/core/kernel/Rational_tags.txt
index a882cee0cb4..9fcea8151c1 100644
--- a/spec/tags/ruby/core/kernel/Rational_tags.txt
+++ b/spec/tags/ruby/core/kernel/Rational_tags.txt
@@ -1 +1,2 @@
 fails:Kernel.Rational when passed neither a Numeric nor a String raises TypeError if it neither responds to #to_r nor #to_int method
+fails:Kernel.Rational when passed neither a Numeric nor a String raises TypeError if #to_r does not return Rational
diff --git a/spec/tags/ruby/core/kernel/caller_locations_tags.txt b/spec/tags/ruby/core/kernel/caller_locations_tags.txt
index 5dc5365380a..ca68622aa07 100644
--- a/spec/tags/ruby/core/kernel/caller_locations_tags.txt
+++ b/spec/tags/ruby/core/kernel/caller_locations_tags.txt
@@ -2,3 +2,4 @@ fails:Kernel#caller_locations can be called with a range whose end is negative
 fails:Kernel#caller_locations must return nil if omitting more locations than available
 fails:Kernel#caller_locations must return the same locations when called with 1..-1 and when called with no arguments
 fails(https://github.com/jruby/jruby/issues/8660):Kernel#caller_locations includes core library methods defined in Ruby
+fails(https://github.com/jruby/jruby/issues/8660):Kernel#caller_locations does not include core library methods defined in Ruby
diff --git a/spec/tags/ruby/core/kernel/printf_tags.txt b/spec/tags/ruby/core/kernel/printf_tags.txt
index c211e0bef25..b8eb8d05298 100644
--- a/spec/tags/ruby/core/kernel/printf_tags.txt
+++ b/spec/tags/ruby/core/kernel/printf_tags.txt
@@ -1,2 +1,8 @@
 fails(https://github.com/jruby/jruby/issues/8739):Kernel.printf formatting io is specified other formats c displays no characters if argument is an empty string
 fails(https://github.com/jruby/jruby/issues/8739):Kernel.printf formatting io is not specified other formats c displays no characters if argument is an empty string
+fails:Kernel.printf formatting io is specified other formats c raises TypeError if argument is nil
+fails:Kernel.printf formatting io is specified other formats c raises TypeError if converting to String with to_str returns non-String
+fails:Kernel.printf formatting io is specified other formats c raises TypeError if converting to Integer with to_int returns non-Integer
+fails:Kernel.printf formatting io is not specified other formats c raises TypeError if argument is nil
+fails:Kernel.printf formatting io is not specified other formats c raises TypeError if converting to String with to_str returns non-String
+fails:Kernel.printf formatting io is not specified other formats c raises TypeError if converting to Integer with to_int returns non-Integer
diff --git a/spec/tags/ruby/core/kernel/raise_tags.txt b/spec/tags/ruby/core/kernel/raise_tags.txt
deleted file mode 100644
index 972ab8861ff..00000000000
--- a/spec/tags/ruby/core/kernel/raise_tags.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-fails:Kernel#raise allows cause equal an exception
-fails:Kernel#raise doesn't set given cause when it equals an exception
-fails:Kernel#raise doesn't raise an ArgumentError when given cause is nil
-fails:Kernel#raise raises ArgumentError when exception is part of the cause chain
-fails:Kernel#raise re-raises a previously rescued exception without overwriting the cause when it's explicitly specified with :cause option and has nil value
-fails:Kernel#raise re-raises a previously rescued exception that doesn't have a cause and is a cause of other exception (that wasn't raised explicitly) without setting a cause implicitly
-fails:Kernel#raise raises a TypeError when passed a message and an extra argument
-fails:Kernel#raise doesn't raise a TypeError when given cause is nil
diff --git a/spec/tags/ruby/core/kernel/require_tags.txt b/spec/tags/ruby/core/kernel/require_tags.txt
index 0fc730ffde5..0fe0f945263 100644
--- a/spec/tags/ruby/core/kernel/require_tags.txt
+++ b/spec/tags/ruby/core/kernel/require_tags.txt
@@ -11,6 +11,5 @@ fails:Kernel#require (path resolution) loads c-extension file when passed absolu
 fails:Kernel.require (path resolution) loads c-extension file when passed absolute path without extension when no .rb is present
 fails:Kernel#require (path resolution) loads .bundle file when passed absolute path with .so
 fails:Kernel.require (path resolution) loads .bundle file when passed absolute path with .so
-fails:Kernel#require complex, enumerator, fiber, rational, thread, ruby2_keywords are already required
 fails:Kernel#require does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path without extension
 fails:Kernel.require does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path without extension
diff --git a/spec/tags/ruby/core/kernel/sprintf_tags.txt b/spec/tags/ruby/core/kernel/sprintf_tags.txt
index db543532e4f..2a3c32b7c12 100644
--- a/spec/tags/ruby/core/kernel/sprintf_tags.txt
+++ b/spec/tags/ruby/core/kernel/sprintf_tags.txt
@@ -1,2 +1,8 @@
 fails(https://github.com/jruby/jruby/issues/8739):Kernel#sprintf other formats c displays no characters if argument is an empty string
 fails(https://github.com/jruby/jruby/issues/8739):Kernel.sprintf other formats c displays no characters if argument is an empty string
+fails:Kernel#sprintf other formats c raises TypeError if argument is nil
+fails:Kernel#sprintf other formats c raises TypeError if converting to String with to_str returns non-String
+fails:Kernel#sprintf other formats c raises TypeError if converting to Integer with to_int returns non-Integer
+fails:Kernel.sprintf other formats c raises TypeError if argument is nil
+fails:Kernel.sprintf other formats c raises TypeError if converting to String with to_str returns non-String
+fails:Kernel.sprintf other formats c raises TypeError if converting to Integer with to_int returns non-Integer
diff --git a/spec/tags/ruby/core/marshal/dump_tags.txt b/spec/tags/ruby/core/marshal/dump_tags.txt
index d9eb4869558..5b16a2c2cf2 100644
--- a/spec/tags/ruby/core/marshal/dump_tags.txt
+++ b/spec/tags/ruby/core/marshal/dump_tags.txt
@@ -1,7 +1,6 @@
 fails:Marshal.dump with a Time dumps the zone and the offset
 fails:Marshal.dump with a Symbol dumps a binary encoded Symbol
 fails:Marshal.dump with an Object dumps an Object with a non-US-ASCII instance variable
-fails:Marshal.dump with an Exception dumps the cause for the exception
 fails:Marshal.dump with a Time dumps the zone, but not the offset if zone is UTC
 fails:Marshal.dump with an Exception dumps instance variables if they exist
 fails:Marshal.dump with a Symbol dumps multiple Symbols sharing the same encoding
@@ -19,5 +18,3 @@ fails:Marshal.dump with a Float uses object links for objects repeatedly dumped
 fails:Marshal.dump with a Time uses object links for objects repeatedly dumped
 fails:Marshal.dump with a Time adds instance variables before the object itself into the objects table
 fails:Marshal.dump with an Exception adds instance variables after the object itself into the objects table
-fails:Marshal.dump with a Data dumps an extended Data
-fails:Marshal.dump with a Data ignores overridden name method
diff --git a/spec/tags/ruby/core/marshal/load_tags.txt b/spec/tags/ruby/core/marshal/load_tags.txt
index 81191806e74..42facdcbf51 100644
--- a/spec/tags/ruby/core/marshal/load_tags.txt
+++ b/spec/tags/ruby/core/marshal/load_tags.txt
@@ -10,7 +10,3 @@ fails:Marshal.load when called with freeze: true returns frozen object extended
 fails:Marshal.load when called on objects with custom _dump methods loads the String in multibyte encoding
 fails:Marshal.load for a Rational loads
 fails:Marshal.load for a Complex loads
-fails:Marshal.load raises an ArgumentError when the dumped data is truncated
-fails:Marshal.load raises an ArgumentError when the argument is empty String
-fails:Marshal.load for a Data loads an extended Data
-fails:Marshal.load for an Integer raises ArgumentError if the input is too short
diff --git a/spec/tags/ruby/core/module/class_eval_tags.txt b/spec/tags/ruby/core/module/class_eval_tags.txt
new file mode 100644
index 00000000000..587abc08183
--- /dev/null
+++ b/spec/tags/ruby/core/module/class_eval_tags.txt
@@ -0,0 +1,2 @@
+fails:Module#class_eval raises a TypeError when the given filename can't be converted to string using to_str
+fails:Module#class_eval raises a TypeError when the given eval-string can't be converted to string using to_str
diff --git a/spec/tags/ruby/core/module/define_method_tags.txt b/spec/tags/ruby/core/module/define_method_tags.txt
index 2b969c3ce7b..d8aaf286fa1 100644
--- a/spec/tags/ruby/core/module/define_method_tags.txt
+++ b/spec/tags/ruby/core/module/define_method_tags.txt
@@ -2,3 +2,4 @@ fails(on GHA):Module#define_method when the default definee is not the same as t
 fails:Module#define_method when passed a Proc object and a method is defined inside defines the nested method in the default definee where the Proc was created
 fails:Module#define_method when passed a block behaves exactly like a lambda for break
 fails:Module#define_method when passed a block behaves exactly like a lambda for next
+fails:Module#define_method raises TypeError when #to_str called on non-String name returns non-String value
diff --git a/spec/tags/ruby/core/module/instance_method_tags.txt b/spec/tags/ruby/core/module/instance_method_tags.txt
new file mode 100644
index 00000000000..ebfd7613fd1
--- /dev/null
+++ b/spec/tags/ruby/core/module/instance_method_tags.txt
@@ -0,0 +1 @@
+fails:Module#instance_method raises TypeError when passed non-String name and #to_str returns non-String value
diff --git a/spec/tags/ruby/core/module/module_eval_tags.txt b/spec/tags/ruby/core/module/module_eval_tags.txt
new file mode 100644
index 00000000000..79a8df1520e
--- /dev/null
+++ b/spec/tags/ruby/core/module/module_eval_tags.txt
@@ -0,0 +1,2 @@
+fails:Module#module_eval raises a TypeError when the given filename can't be converted to string using to_str
+fails:Module#module_eval raises a TypeError when the given eval-string can't be converted to string using to_str
diff --git a/spec/tags/ruby/core/process/clock_gettime_tags.txt b/spec/tags/ruby/core/process/clock_gettime_tags.txt
index 5aa4a78de53..264588498a6 100644
--- a/spec/tags/ruby/core/process/clock_gettime_tags.txt
+++ b/spec/tags/ruby/core/process/clock_gettime_tags.txt
@@ -3,3 +3,10 @@ fails:Process.clock_gettime supports the platform clocks mentioned in the docume
 fails:Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_MONOTONIC_RAW
 fails:Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_MONOTONIC_RAW_APPROX
 fails:Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_UPTIME_RAW and CLOCK_UPTIME_RAW_APPROX
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9430):Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_VIRTUAL
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9430):Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_PROF
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9430):Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_UPTIME
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9430):Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_SECOND
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9430):Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_REALTIME_FAST and CLOCK_REALTIME_PRECISE
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9430):Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_MONOTONIC_FAST and CLOCK_MONOTONIC_PRECISE
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9430):Process.clock_gettime supports the platform clocks mentioned in the documentation CLOCK_UPTIME_FAST and CLOCK_UPTIME_PRECISE
diff --git a/spec/tags/ruby/core/process/constants_tags.txt b/spec/tags/ruby/core/process/constants_tags.txt
index 2a9206702af..1ba43eecc17 100644
--- a/spec/tags/ruby/core/process/constants_tags.txt
+++ b/spec/tags/ruby/core/process/constants_tags.txt
@@ -1,3 +1,2 @@
-fails(JRUBY-3655):Process::Constants has the correct constant values on Linux
-fails(JRUBY-3655):Process::Constants has the correct constant values on BSD-like systems
-fails(JRUBY-3655):Process::Constants has the correct constant values on Darwin
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9431):Process::Constants on NetBSD and FreeBSD defines RLIMIT_SBSIZE
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9431):Process::Constants on FreeBSD defines RLIMIT_NPTS
diff --git a/spec/tags/ruby/core/process/groups_tags.txt b/spec/tags/ruby/core/process/groups_tags.txt
index 91b3c93604c..167659282f6 100644
--- a/spec/tags/ruby/core/process/groups_tags.txt
+++ b/spec/tags/ruby/core/process/groups_tags.txt
@@ -1,3 +1,4 @@
 fails:Process.groups sets the list of gids of groups in the supplemental group access list
 fails:Process.groups= raises Errno::EPERM
 fails(missing one group on MacOS, unsure if it is important):Process.groups gets an Array of the gids of groups in the supplemental group access list
+fails(superuser):Process.groups= sets the list of gids of groups in the supplemental group access list
diff --git a/spec/tags/ruby/core/process/setrlimit_tags.txt b/spec/tags/ruby/core/process/setrlimit_tags.txt
new file mode 100644
index 00000000000..e0e1567c70b
--- /dev/null
+++ b/spec/tags/ruby/core/process/setrlimit_tags.txt
@@ -0,0 +1,5 @@
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9431):Process.setrlimit when passed a Symbol coerces :SBSIZE into RLIMIT_SBSIZE
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9431):Process.setrlimit when passed a String coerces 'SBSIZE' into RLIMIT_SBSIZE
+fails(OpenBSD,https://github.com/jruby/jruby/issues/9431):Process.setrlimit when passed a Symbol coerces :AS into RLIMIT_AS
+fails(OpenBSD,https://github.com/jruby/jruby/issues/9431):Process.setrlimit when passed a String coerces 'AS' into RLIMIT_AS
+
diff --git a/spec/tags/ruby/core/process/spawn_tags.txt b/spec/tags/ruby/core/process/spawn_tags.txt
index 6d46757f0cc..bf31605b2d8 100644
--- a/spec/tags/ruby/core/process/spawn_tags.txt
+++ b/spec/tags/ruby/core/process/spawn_tags.txt
@@ -66,3 +66,7 @@ windows:Process.spawn with a single argument does not subject the specified comm
 windows:Process.spawn with a single argument does not create an argument array with shell parsing semantics for whitespace on Windows
 windows:Process.spawn with a command array uses the first element as the command name and the second as the argv[0] value
 windows:Process.spawn with a command array calls #to_ary to convert the argument to an Array
+fails:Process.spawn sets $? to exit status 127 when the command does not exist
+fails:Process.spawn sets $? to exit status 127 when the file does not exist
+fails:Process.spawn raises an Errno::EACCES when the path is a directory
+fails:Process.spawn raises an Errno::ENOENT when a non-executable file is found in PATH
diff --git a/spec/tags/ruby/core/queue/deq_tags.txt b/spec/tags/ruby/core/queue/deq_tags.txt
index e69de29bb2d..b8eb8db4e9a 100644
--- a/spec/tags/ruby/core/queue/deq_tags.txt
+++ b/spec/tags/ruby/core/queue/deq_tags.txt
@@ -0,0 +1,3 @@
+fails:Queue#deq with a timeout raise TypeError if timeout is not a valid numeric
+fails:Queue operations with timeout fails if string is provided
+fails:Queue operations with timeout fails if boolean is provided
diff --git a/spec/tags/ruby/core/queue/initialize_tags.txt b/spec/tags/ruby/core/queue/initialize_tags.txt
new file mode 100644
index 00000000000..a8d2cf8fea8
--- /dev/null
+++ b/spec/tags/ruby/core/queue/initialize_tags.txt
@@ -0,0 +1 @@
+fails:Queue#initialize raises TypeError if #to_a does not return Array
diff --git a/spec/tags/ruby/core/queue/pop_tags.txt b/spec/tags/ruby/core/queue/pop_tags.txt
index e69de29bb2d..f88094920ca 100644
--- a/spec/tags/ruby/core/queue/pop_tags.txt
+++ b/spec/tags/ruby/core/queue/pop_tags.txt
@@ -0,0 +1,3 @@
+fails:Queue#pop with a timeout raise TypeError if timeout is not a valid numeric
+fails:Queue operations with timeout fails if string is provided
+fails:Queue operations with timeout fails if boolean is provided
diff --git a/spec/tags/ruby/core/queue/shift_tags.txt b/spec/tags/ruby/core/queue/shift_tags.txt
index e69de29bb2d..7e0cef34c89 100644
--- a/spec/tags/ruby/core/queue/shift_tags.txt
+++ b/spec/tags/ruby/core/queue/shift_tags.txt
@@ -0,0 +1,3 @@
+fails:Queue#shift with a timeout raise TypeError if timeout is not a valid numeric
+fails:Queue operations with timeout fails if string is provided
+fails:Queue operations with timeout fails if boolean is provided
diff --git a/spec/tags/ruby/core/range/step_tags.txt b/spec/tags/ruby/core/range/step_tags.txt
new file mode 100644
index 00000000000..228b4cbf09e
--- /dev/null
+++ b/spec/tags/ruby/core/range/step_tags.txt
@@ -0,0 +1 @@
+fails:Range#step when no block is given returned Enumerator type when range is beginless and finite raises an ArgumentError if step is non-numeric
diff --git a/spec/tags/ruby/core/refinement/import_methods_tags.txt b/spec/tags/ruby/core/refinement/import_methods_tags.txt
deleted file mode 100644
index 4e72b79300b..00000000000
--- a/spec/tags/ruby/core/refinement/import_methods_tags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fails:Refinement#import_methods imports methods from multiple modules so that methods see other's module's methods
-fails:Refinement#import_methods imports methods from module so that methods can see each other
diff --git a/spec/tags/ruby/core/refinement/prepend_tags.txt b/spec/tags/ruby/core/refinement/prepend_tags.txt
deleted file mode 100644
index c64e563f29c..00000000000
--- a/spec/tags/ruby/core/refinement/prepend_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Refinement#prepend warns about deprecation
diff --git a/spec/tags/ruby/core/regexp/compile_tags.txt b/spec/tags/ruby/core/regexp/compile_tags.txt
new file mode 100644
index 00000000000..fb8ba32f059
--- /dev/null
+++ b/spec/tags/ruby/core/regexp/compile_tags.txt
@@ -0,0 +1 @@
+fails:Regexp.compile given a non-String/Regexp raises TypeError if #to_str returns non-String value
diff --git a/spec/tags/ruby/core/regexp/linear_time_tags.txt b/spec/tags/ruby/core/regexp/linear_time_tags.txt
index 0d38895d061..1da303111db 100644
--- a/spec/tags/ruby/core/regexp/linear_time_tags.txt
+++ b/spec/tags/ruby/core/regexp/linear_time_tags.txt
@@ -1 +1,6 @@
 fails:Regexp.linear_time? returns true for positive lookarounds
+fails:Regexp.linear_time? returns true for positive lookahead
+fails:Regexp.linear_time? returns true for positive lookbehind
+fails:Regexp.linear_time? returns true for negative lookbehind
+fails:Regexp.linear_time? returns true for non-recursive subexpression call
+fails:Regexp.linear_time? returns true for positive lookahead with capture group
diff --git a/spec/tags/ruby/core/regexp/new_tags.txt b/spec/tags/ruby/core/regexp/new_tags.txt
new file mode 100644
index 00000000000..dcdb236ac38
--- /dev/null
+++ b/spec/tags/ruby/core/regexp/new_tags.txt
@@ -0,0 +1 @@
+fails:Regexp.new given a non-String/Regexp raises TypeError if #to_str returns non-String value
diff --git a/spec/tags/ruby/core/regexp/try_convert_tags.txt b/spec/tags/ruby/core/regexp/try_convert_tags.txt
new file mode 100644
index 00000000000..acf64e4335d
--- /dev/null
+++ b/spec/tags/ruby/core/regexp/try_convert_tags.txt
@@ -0,0 +1 @@
+fails:Regexp.try_convert raises a TypeError if the object does not return an Regexp from #to_regexp
diff --git a/spec/tags/ruby/core/set/add_tags.txt b/spec/tags/ruby/core/set/add_tags.txt
index f5466e162b8..a9e2007811e 100644
--- a/spec/tags/ruby/core/set/add_tags.txt
+++ b/spec/tags/ruby/core/set/add_tags.txt
@@ -1 +1 @@
-fails:Set#add? raises RuntimeError when called during iteration
+fails(we do not track iteration in progress in set or hash):Set#add? raises RuntimeError when called during iteration
diff --git a/spec/tags/ruby/core/set/compare_by_identity_tags.txt b/spec/tags/ruby/core/set/compare_by_identity_tags.txt
deleted file mode 100644
index bcee51db40b..00000000000
--- a/spec/tags/ruby/core/set/compare_by_identity_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#compare_by_identity is not equal to set what does not compare by identity
diff --git a/spec/tags/ruby/core/set/disjoint_tags.txt b/spec/tags/ruby/core/set/disjoint_tags.txt
deleted file mode 100644
index d4942290175..00000000000
--- a/spec/tags/ruby/core/set/disjoint_tags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fails:Set#disjoint? when comparing to a Set-like object returns false when a Set has at least one element in common with a Set-like object
-fails:Set#disjoint? when comparing to a Set-like object returns true when a Set has no element in common with a Set-like object
diff --git a/spec/tags/ruby/core/set/divide_tags.txt b/spec/tags/ruby/core/set/divide_tags.txt
deleted file mode 100644
index 981ba7bb891..00000000000
--- a/spec/tags/ruby/core/set/divide_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#divide when passed a block with an arity of 2 returns an enumerator when not passed a block
diff --git a/spec/tags/ruby/core/set/equal_value_tags.txt b/spec/tags/ruby/core/set/equal_value_tags.txt
deleted file mode 100644
index f6d94262e10..00000000000
--- a/spec/tags/ruby/core/set/equal_value_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#== when comparing to a Set-like object returns true when a Set and a Set-like object contain the same elements
diff --git a/spec/tags/ruby/core/set/flatten_tags.txt b/spec/tags/ruby/core/set/flatten_tags.txt
deleted file mode 100644
index 471ffcdf732..00000000000
--- a/spec/tags/ruby/core/set/flatten_tags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fails:Set#flatten when Set contains a Set-like object returns a copy of self with each included Set-like object flattened
-fails:Set#flatten! when Set contains a Set-like object flattens self, including Set-like objects
diff --git a/spec/tags/ruby/core/set/intersect_tags.txt b/spec/tags/ruby/core/set/intersect_tags.txt
deleted file mode 100644
index 7424ffa1f94..00000000000
--- a/spec/tags/ruby/core/set/intersect_tags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fails:Set#intersect? when comparing to a Set-like object returns true when a Set has at least one element in common with a Set-like object
-fails:Set#intersect? when comparing to a Set-like object returns false when a Set has no element in common with a Set-like object
diff --git a/spec/tags/ruby/core/set/merge_tags.txt b/spec/tags/ruby/core/set/merge_tags.txt
index ba19680d75f..8cc9ec6f114 100644
--- a/spec/tags/ruby/core/set/merge_tags.txt
+++ b/spec/tags/ruby/core/set/merge_tags.txt
@@ -1 +1 @@
-fails:Set#merge raises RuntimeError when called during iteration
+fails(we do not track iteration in progress in set or hash):Set#merge raises RuntimeError when called during iteration
diff --git a/spec/tags/ruby/core/set/proper_subset_tags.txt b/spec/tags/ruby/core/set/proper_subset_tags.txt
deleted file mode 100644
index afc54a8a70b..00000000000
--- a/spec/tags/ruby/core/set/proper_subset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#proper_subset? when comparing to a Set-like object returns true if passed a Set-like object that self is a proper subset of
diff --git a/spec/tags/ruby/core/set/proper_superset_tags.txt b/spec/tags/ruby/core/set/proper_superset_tags.txt
deleted file mode 100644
index 43d1f3b7657..00000000000
--- a/spec/tags/ruby/core/set/proper_superset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#proper_superset? when comparing to a Set-like object returns true if passed a Set-like object that self is a proper superset of
diff --git a/spec/tags/ruby/core/set/replace_tags.txt b/spec/tags/ruby/core/set/replace_tags.txt
index 4b3bc38e648..3c02349edce 100644
--- a/spec/tags/ruby/core/set/replace_tags.txt
+++ b/spec/tags/ruby/core/set/replace_tags.txt
@@ -1 +1 @@
-fails:Set#replace raises RuntimeError when called during iteration
+fails(we do not track iteration in progress in set or hash):Set#replace raises RuntimeError when called during iteration
diff --git a/spec/tags/ruby/core/set/sortedset/sortedset_tags.txt b/spec/tags/ruby/core/set/sortedset/sortedset_tags.txt
deleted file mode 100644
index 821c591e82a..00000000000
--- a/spec/tags/ruby/core/set/sortedset/sortedset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:SortedSet raises error including message that it has been extracted from the set stdlib
diff --git a/spec/tags/ruby/core/set/subset_tags.txt b/spec/tags/ruby/core/set/subset_tags.txt
deleted file mode 100644
index 3d8e572c30a..00000000000
--- a/spec/tags/ruby/core/set/subset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#subset? when comparing to a Set-like object returns true if passed a Set-like object that self is a subset of
diff --git a/spec/tags/ruby/core/set/superset_tags.txt b/spec/tags/ruby/core/set/superset_tags.txt
deleted file mode 100644
index b73761ff264..00000000000
--- a/spec/tags/ruby/core/set/superset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#superset? when comparing to a Set-like object returns true if passed a Set-like object that self is a superset of
diff --git a/spec/tags/ruby/core/sizedqueue/deq_tags.txt b/spec/tags/ruby/core/sizedqueue/deq_tags.txt
index e69de29bb2d..e277c6a774f 100644
--- a/spec/tags/ruby/core/sizedqueue/deq_tags.txt
+++ b/spec/tags/ruby/core/sizedqueue/deq_tags.txt
@@ -0,0 +1,3 @@
+fails:SizedQueue#deq with a timeout raise TypeError if timeout is not a valid numeric
+fails:SizedQueue operations with timeout fails if string is provided
+fails:SizedQueue operations with timeout fails if boolean is provided
diff --git a/spec/tags/ruby/core/sizedqueue/pop_tags.txt b/spec/tags/ruby/core/sizedqueue/pop_tags.txt
index e69de29bb2d..cb4b108519b 100644
--- a/spec/tags/ruby/core/sizedqueue/pop_tags.txt
+++ b/spec/tags/ruby/core/sizedqueue/pop_tags.txt
@@ -0,0 +1,3 @@
+fails:SizedQueue#pop with a timeout raise TypeError if timeout is not a valid numeric
+fails:SizedQueue operations with timeout fails if string is provided
+fails:SizedQueue operations with timeout fails if boolean is provided
diff --git a/spec/tags/ruby/core/sizedqueue/push_tags.txt b/spec/tags/ruby/core/sizedqueue/push_tags.txt
index e69de29bb2d..5ad61c4dd25 100644
--- a/spec/tags/ruby/core/sizedqueue/push_tags.txt
+++ b/spec/tags/ruby/core/sizedqueue/push_tags.txt
@@ -0,0 +1,3 @@
+fails:SizedQueue#push with a timeout raise TypeError if timeout is not a valid numeric
+fails:SizedQueue operations with timeout fails if string is provided
+fails:SizedQueue operations with timeout fails if boolean is provided
diff --git a/spec/tags/ruby/core/sizedqueue/shift_tags.txt b/spec/tags/ruby/core/sizedqueue/shift_tags.txt
index e69de29bb2d..0dc3eda503b 100644
--- a/spec/tags/ruby/core/sizedqueue/shift_tags.txt
+++ b/spec/tags/ruby/core/sizedqueue/shift_tags.txt
@@ -0,0 +1,3 @@
+fails:SizedQueue#shift with a timeout raise TypeError if timeout is not a valid numeric
+fails:SizedQueue operations with timeout fails if string is provided
+fails:SizedQueue operations with timeout fails if boolean is provided
diff --git a/spec/tags/ruby/core/string/crypt_tags.txt b/spec/tags/ruby/core/string/crypt_tags.txt
index ced4cc0c715..937e7d25885 100644
--- a/spec/tags/ruby/core/string/crypt_tags.txt
+++ b/spec/tags/ruby/core/string/crypt_tags.txt
@@ -1,3 +1,6 @@
 fails:String#crypt raises an ArgumentError when the string contains NUL character
 windows:String#crypt returns a cryptographic hash of self by applying the UNIX crypt algorithm with the specified salt
 windows:String#crypt calls #to_str to converts the salt arg to a String
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9432):String#crypt returns a cryptographic hash of self by applying the UNIX crypt algorithm with the specified salt
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9432):String#crypt calls #to_str to converts the salt arg to a String
+fails(FreeBSD,https://github.com/jruby/jruby/issues/9432):String#crypt doesn't return subclass instances
diff --git a/spec/tags/ruby/core/string/modulo_tags.txt b/spec/tags/ruby/core/string/modulo_tags.txt
index 7d02d8e54c7..183c23a3efa 100644
--- a/spec/tags/ruby/core/string/modulo_tags.txt
+++ b/spec/tags/ruby/core/string/modulo_tags.txt
@@ -5,3 +5,6 @@ fails:String#% behaves as if calling Kernel#Float for %g arguments, when the pas
 fails:String#% behaves as if calling Kernel#Float for %G arguments, when the passed argument does not respond to #to_ary
 fails(https://github.com/jruby/jruby/issues/8739):String#% other formats c displays no characters if argument is an empty string
 fails(https://github.com/jruby/jruby/issues/8739):String#% raises an ArgumentError if absolute argument specifier is followed by a conversion specifier
+fails:String#% other formats c raises TypeError if argument is nil
+fails:String#% other formats c raises TypeError if converting to String with to_str returns non-String
+fails:String#% other formats c raises TypeError if converting to Integer with to_int returns non-Integer
diff --git a/spec/tags/ruby/core/string/try_convert_tags.txt b/spec/tags/ruby/core/string/try_convert_tags.txt
new file mode 100644
index 00000000000..fe83f57f6d8
--- /dev/null
+++ b/spec/tags/ruby/core/string/try_convert_tags.txt
@@ -0,0 +1 @@
+fails:String.try_convert sends #to_str to the argument and raises TypeError if it's not a kind of String
diff --git a/spec/tags/ruby/core/thread/native_thread_id_tags.txt b/spec/tags/ruby/core/thread/native_thread_id_tags.txt
deleted file mode 100644
index 405ab6b017c..00000000000
--- a/spec/tags/ruby/core/thread/native_thread_id_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Thread#native_thread_id each thread has different native thread id
diff --git a/spec/tags/ruby/core/warning/warn_tags.txt b/spec/tags/ruby/core/warning/warn_tags.txt
index 70e3c3b11db..ca303562b2e 100644
--- a/spec/tags/ruby/core/warning/warn_tags.txt
+++ b/spec/tags/ruby/core/warning/warn_tags.txt
@@ -5,3 +5,4 @@ fails:Warning.warn doesn't print message when category is :strict_unused_block b
 windows:Warning.warn does not add a newline
 windows:Warning.warn returns nil
 windows:Warning.warn can be overridden
+fails:Warning.warn is called by parser warnings
diff --git a/spec/tags/ruby/language/for_tags.txt b/spec/tags/ruby/language/for_tags.txt
index bd5d0f1eff6..99be615417c 100644
--- a/spec/tags/ruby/language/for_tags.txt
+++ b/spec/tags/ruby/language/for_tags.txt
@@ -1,3 +1,4 @@
 fails:The for expression iterates over a list of arrays and destructures with a splat
 fails:The for expression iterates over a list of arrays and destructures with a splat and additional targets
 fails:The for expression allows an attribute with safe navigation on a nil base as an iterator name
+fails:The for expression allows an attribute with safe navigation as an iterator name
diff --git a/spec/tags/ruby/language/if_tags.txt b/spec/tags/ruby/language/if_tags.txt
new file mode 100644
index 00000000000..4658ae3180a
--- /dev/null
+++ b/spec/tags/ruby/language/if_tags.txt
@@ -0,0 +1 @@
+fails:The if expression with a boolean range ('flip-flop' operator) warns when Integer literals are used instead of predicates
diff --git a/spec/tags/ruby/language/predefined/data_tags.txt b/spec/tags/ruby/language/predefined/data_tags.txt
index 1a78efd5376..4ba211d2137 100644
--- a/spec/tags/ruby/language/predefined/data_tags.txt
+++ b/spec/tags/ruby/language/predefined/data_tags.txt
@@ -1,3 +1,6 @@
 windows:The DATA constant returns a File object with the right offset
 windows:The DATA constant is set even if there is no data after __END__
 windows:The DATA constant is set even if there is no newline after __END__
+fails:The DATA constant is set even if there is no newline after __END__
+fails:The DATA constant does not change when an included files also has a __END__
+fails:The DATA constant is included in an otherwise empty file
diff --git a/spec/tags/ruby/library/set/compare_by_identity_tags.txt b/spec/tags/ruby/library/set/compare_by_identity_tags.txt
deleted file mode 100644
index bcee51db40b..00000000000
--- a/spec/tags/ruby/library/set/compare_by_identity_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#compare_by_identity is not equal to set what does not compare by identity
diff --git a/spec/tags/ruby/library/set/disjoint_tags.txt b/spec/tags/ruby/library/set/disjoint_tags.txt
deleted file mode 100644
index d4942290175..00000000000
--- a/spec/tags/ruby/library/set/disjoint_tags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fails:Set#disjoint? when comparing to a Set-like object returns false when a Set has at least one element in common with a Set-like object
-fails:Set#disjoint? when comparing to a Set-like object returns true when a Set has no element in common with a Set-like object
diff --git a/spec/tags/ruby/library/set/divide_tags.txt b/spec/tags/ruby/library/set/divide_tags.txt
deleted file mode 100644
index 981ba7bb891..00000000000
--- a/spec/tags/ruby/library/set/divide_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#divide when passed a block with an arity of 2 returns an enumerator when not passed a block
diff --git a/spec/tags/ruby/library/set/equal_value_tags.txt b/spec/tags/ruby/library/set/equal_value_tags.txt
deleted file mode 100644
index f6d94262e10..00000000000
--- a/spec/tags/ruby/library/set/equal_value_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#== when comparing to a Set-like object returns true when a Set and a Set-like object contain the same elements
diff --git a/spec/tags/ruby/library/set/flatten_tags.txt b/spec/tags/ruby/library/set/flatten_tags.txt
deleted file mode 100644
index 471ffcdf732..00000000000
--- a/spec/tags/ruby/library/set/flatten_tags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fails:Set#flatten when Set contains a Set-like object returns a copy of self with each included Set-like object flattened
-fails:Set#flatten! when Set contains a Set-like object flattens self, including Set-like objects
diff --git a/spec/tags/ruby/library/set/intersect_tags.txt b/spec/tags/ruby/library/set/intersect_tags.txt
deleted file mode 100644
index 7424ffa1f94..00000000000
--- a/spec/tags/ruby/library/set/intersect_tags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fails:Set#intersect? when comparing to a Set-like object returns true when a Set has at least one element in common with a Set-like object
-fails:Set#intersect? when comparing to a Set-like object returns false when a Set has no element in common with a Set-like object
diff --git a/spec/tags/ruby/library/set/merge_tags.txt b/spec/tags/ruby/library/set/merge_tags.txt
deleted file mode 100644
index 2fc9a275286..00000000000
--- a/spec/tags/ruby/library/set/merge_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#merge accepts only a single argument
diff --git a/spec/tags/ruby/library/set/proper_subset_tags.txt b/spec/tags/ruby/library/set/proper_subset_tags.txt
deleted file mode 100644
index afc54a8a70b..00000000000
--- a/spec/tags/ruby/library/set/proper_subset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#proper_subset? when comparing to a Set-like object returns true if passed a Set-like object that self is a proper subset of
diff --git a/spec/tags/ruby/library/set/proper_superset_tags.txt b/spec/tags/ruby/library/set/proper_superset_tags.txt
deleted file mode 100644
index 43d1f3b7657..00000000000
--- a/spec/tags/ruby/library/set/proper_superset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#proper_superset? when comparing to a Set-like object returns true if passed a Set-like object that self is a proper superset of
diff --git a/spec/tags/ruby/library/set/sortedset/sortedset_tags.txt b/spec/tags/ruby/library/set/sortedset/sortedset_tags.txt
deleted file mode 100644
index 821c591e82a..00000000000
--- a/spec/tags/ruby/library/set/sortedset/sortedset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:SortedSet raises error including message that it has been extracted from the set stdlib
diff --git a/spec/tags/ruby/library/set/subset_tags.txt b/spec/tags/ruby/library/set/subset_tags.txt
deleted file mode 100644
index 3d8e572c30a..00000000000
--- a/spec/tags/ruby/library/set/subset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#subset? when comparing to a Set-like object returns true if passed a Set-like object that self is a subset of
diff --git a/spec/tags/ruby/library/set/superset_tags.txt b/spec/tags/ruby/library/set/superset_tags.txt
deleted file mode 100644
index b73761ff264..00000000000
--- a/spec/tags/ruby/library/set/superset_tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-fails:Set#superset? when comparing to a Set-like object returns true if passed a Set-like object that self is a superset of
diff --git a/spec/tags/ruby/library/stringio/printf_tags.txt b/spec/tags/ruby/library/stringio/printf_tags.txt
index 9b8e77dc9e4..5d8316f0a92 100644
--- a/spec/tags/ruby/library/stringio/printf_tags.txt
+++ b/spec/tags/ruby/library/stringio/printf_tags.txt
@@ -1 +1,4 @@
 fails(https://github.com/jruby/jruby/issues/8739):StringIO#printf formatting other formats c displays no characters if argument is an empty string
+fails:StringIO#printf formatting other formats c raises TypeError if argument is nil
+fails:StringIO#printf formatting other formats c raises TypeError if converting to String with to_str returns non-String
+fails:StringIO#printf formatting other formats c raises TypeError if converting to Integer with to_int returns non-Integer
diff --git a/test/check_versions.sh b/test/check_versions.sh
index c876f2db54d..1db3c769331 100755
--- a/test/check_versions.sh
+++ b/test/check_versions.sh
@@ -8,11 +8,11 @@ gem_version=${jar_version/-/.}
 
 rm -rf maven/*/target/*
 
-./mvnw install -Pbootstrap
-./mvnw -Pcomplete
-./mvnw -Pdist
-./mvnw -Pjruby-jars
-./mvnw -Pmain
+./mvnw -ntp install -Pbootstrap
+./mvnw -ntp -Pcomplete
+./mvnw -ntp -Pdist
+./mvnw -ntp -Pjruby-jars
+./mvnw -ntp -Pmain
 
 declare -a failed
 failed[0]=0
@@ -61,16 +61,16 @@ function check {
 
 }
 
-check lib/target/jruby-stdlib-$jar_version.jar 19
-check maven/jruby-jars/pkg/jruby-jars-$gem_version.gem 33
-check maven/jruby-jars/lib/jruby-core-$jar_version-complete.jar 17
-check maven/jruby-jars/lib/jruby-stdlib-$jar_version.jar 19
-check maven/jruby-complete/target/jruby-complete-$jar_version.jar 36
+check lib/target/jruby-stdlib-$jar_version.jar 20
+check maven/jruby-jars/pkg/jruby-jars-$gem_version.gem 39
+check maven/jruby-jars/lib/jruby-core-$jar_version-complete.jar 22
+check maven/jruby-jars/lib/jruby-stdlib-$jar_version.jar 20
+check maven/jruby-complete/target/jruby-complete-$jar_version.jar 42
 check maven/jruby/target/jruby-$jar_version.jar 9
 check maven/jruby-dist/target/jruby-dist-$jar_version-bin.tar.gz 45 jruby-$jar_version
 check maven/jruby-dist/target/jruby-dist-$jar_version-src.zip 20 jruby-$jar_version
-check maven/jruby-dist/target/jruby-dist-$jar_version-bin.zip 45 jruby-$jar_version
+check maven/jruby-dist/target/jruby-dist-$jar_version-bin.zip 48 jruby-$jar_version
 check core/target/jruby-base-$jar_version.jar 10
-check shaded/target/jruby-core-$jar_version.jar 17
+check shaded/target/jruby-core-$jar_version.jar 22
 
 exit "${failed[0]}"
diff --git a/test/jruby.index b/test/jruby.index
index 60c74b1fac5..367b1cc3a3a 100644
--- a/test/jruby.index
+++ b/test/jruby.index
@@ -8,6 +8,7 @@ jruby/test_array
 jruby/test_autoload
 jruby/test_backquote
 jruby/test_backtraces
+jruby/test_call_info
 jruby/test_base64
 jruby/test_binding_eval_yield
 jruby/test_block
diff --git a/test/jruby/test_call_info.rb b/test/jruby/test_call_info.rb
new file mode 100644
index 00000000000..bb30695fec4
--- /dev/null
+++ b/test/jruby/test_call_info.rb
@@ -0,0 +1,407 @@
+require 'test/unit'
+require 'tempfile'
+require 'stringio'
+
+# Tests for ThreadContext#callInfo not leaking between method calls.
+#
+# When a method is invoked with keyword arguments, the IR sets a flag
+# (CALL_KEYWORD) in ThreadContext#callInfo. If the receiving method does
+# not properly reset callInfo, that flag "leaks" to the next call and
+# causes incorrect keyword handling (ArgumentError, wrong defaults, etc.).
+class TestCallInfo < Test::Unit::TestCase
+
+  class KwargsReceiver
+    attr_reader :a, :k
+    def initialize(a, k:)
+      @a = a
+      @k = k
+    end
+  end
+
+  # ── Hash#initialize ────────────────────────────────────────────────
+
+  def test_hash_new_capacity_keyword_recognized
+    # Hash.new(capacity: N) should treat capacity: as a sizing hint, not as the default value.
+    h = Hash.new(capacity: 10)
+    assert_nil h.default, "capacity: should be recognized as keyword, not default value"
+
+    # If callInfo leaked, this would raise ArgumentError
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+
+    h = Hash.new(42, capacity: 10)
+    assert_equal 42, h.default
+
+    # If callInfo leaked, this would raise ArgumentError
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── Struct.new callInfo leak ───────────────────────────────────────
+
+  def test_struct_new_with_keyword_init_does_not_leak
+    Struct.new(:x, keyword_init: true)
+    # If callInfo leaked, this would raise ArgumentError
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal 1, v.a
+    assert_equal 2, v.k
+  end
+
+  def test_struct_new_with_empty_splat_does_not_leak
+    opts = {}
+    Struct.new(:y, **opts)
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── Struct#initialize callInfo leak ────────────────────────────────
+
+  def test_struct_initialize_1arg_empty_splat_does_not_leak
+    s = Struct.new(:x)
+    s.new(1, **{})
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_struct_initialize_2arg_empty_splat_does_not_leak
+    s = Struct.new(:x, :y)
+    s.new(1, 2, **{})
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_struct_initialize_3arg_empty_splat_does_not_leak
+    s = Struct.new(:x, :y, :z)
+    s.new(1, 2, 3, **{})
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_struct_initialize_keyword_init_works
+    s = Struct.new(:a, :b, keyword_init: true)
+    instance = s.new(a: 10, b: 20)
+    assert_equal 10, instance.a
+    assert_equal 20, instance.b
+
+    # Verify no leak after keyword_init construction
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── Regexp.linear_time? keyword handling ───────────────────────────
+
+  def test_regexp_linear_time_with_timeout_keyword
+    # timeout: must be recognized as keyword, not raise ArgumentError
+    result = Regexp.linear_time?("abc", timeout: 1.0)
+    assert_include [true, false], result
+
+    # Verify no callInfo leak after keyword call
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_regexp_linear_time_with_regexp_and_timeout_keyword
+    result = Regexp.linear_time?(/abc/, timeout: 1.0)
+    assert_include [true, false], result
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_regexp_linear_time_no_leak_without_keyword
+    Regexp.linear_time?("abc")
+    # Non-keyword call should not affect subsequent keyword call
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── Regexp#initialize keyword handling ───────────────────────────
+
+  def test_regexp_initialize_with_timeout_keyword
+    # 2-arg form: Regexp.new(source, timeout: val)
+    re = Regexp.new("abc", timeout: 1.0)
+    assert_match re, "abc"
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_regexp_initialize_3arg_with_timeout_keyword
+    # 3-arg form: Regexp.new(source, flags, timeout: val)
+    re = Regexp.new("abc", Regexp::IGNORECASE, timeout: 1.0)
+    assert_match re, "ABC"
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── ARGF keyword handling ──────────────────────────────────────────
+
+  def test_argf_readlines_chomp_keyword
+    tmpfile = Tempfile.new('test_call_info_readlines')
+    tmpfile.write("hello\nworld\n")
+    tmpfile.close
+
+    lines = File.open(tmpfile.path) { |f| f.readlines(chomp: true) }
+    assert_equal ["hello", "world"], lines
+
+    # Verify no callInfo leak
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  ensure
+    tmpfile.unlink if tmpfile
+  end
+
+  def test_argf_gets_chomp_keyword
+    tmpfile = Tempfile.new('test_call_info_gets')
+    tmpfile.write("hello\nworld\n")
+    tmpfile.close
+
+    line = File.open(tmpfile.path) { |f| f.gets(chomp: true) }
+    assert_equal "hello", line
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  ensure
+    tmpfile.unlink if tmpfile
+  end
+
+  def test_argf_each_line_chomp_keyword
+    tmpfile = Tempfile.new('test_call_info_each_line')
+    tmpfile.write("hello\nworld\n")
+    tmpfile.close
+
+    lines = []
+    File.open(tmpfile.path) { |f| f.each_line(chomp: true) { |l| lines << l } }
+    assert_equal ["hello", "world"], lines
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  ensure
+    tmpfile.unlink if tmpfile
+  end
+
+  # ── Kernel#open with to_open redirect ──────────────────────────────
+
+  class ToOpenTarget
+    def to_open(*args)
+      StringIO.new("hello from to_open")
+    end
+  end
+
+  def test_kernel_open_to_open_redirect_with_keywords
+    io = open(ToOpenTarget.new, mode: "r")
+    assert_equal "hello from to_open", io.read
+    io.close
+
+    # Verify no callInfo leak after to_open redirect
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_kernel_open_to_open_redirect_without_keywords
+    io = open(ToOpenTarget.new)
+    assert_equal "hello from to_open", io.read
+    io.close
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── to_enum keyword propagation ────────────────────────────────────
+
+  class EachWithKeyword
+    def each(k:)
+      yield k
+    end
+  end
+
+  def test_to_enum_propagates_keywords
+    enum = EachWithKeyword.new.to_enum(:each, k: 42)
+    assert_equal [42], enum.to_a
+
+    # Verify no callInfo leak
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_to_enum_without_keywords_does_not_leak
+    enum = [1, 2, 3].to_enum(:each)
+    enum.to_a
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── Data class keyword handling ────────────────────────────────────
+
+  def test_data_new_with_keywords
+    d = Data.define(:x, :y)
+    instance = d.new(x: 1, y: 2)
+    assert_equal 1, instance.x
+    assert_equal 2, instance.y
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_data_new_single_member_with_keyword
+    d = Data.define(:x)
+    instance = d.new(x: 42)
+    assert_equal 42, instance.x
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_data_with_keyword
+    d = Data.define(:x, :y)
+    original = d.new(x: 1, y: 2)
+    updated = original.with(x: 10)
+    assert_equal 10, updated.x
+    assert_equal 2, updated.y
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── Dir.glob / Dir[] keyword handling ──────────────────────────────
+
+  def test_dir_glob_with_sort_keyword
+    entries = Dir.glob("*", sort: true)
+    assert_kind_of Array, entries
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_dir_aref_does_not_leak
+    Dir["*"]
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── Proc#parameters keyword handling ───────────────────────────────
+
+  def test_proc_parameters_with_lambda_keyword
+    pr = Proc.new { |a, k:| }
+    params = pr.parameters(lambda: true)
+    assert_equal [[:req, :a], [:keyreq, :k]], params
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_proc_parameters_without_keyword
+    pr = Proc.new { |a, k:| }
+    params = pr.parameters
+    assert_include params, [:opt, :a]
+    assert_include params, [:keyreq, :k]
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── Warning.warn keyword handling ──────────────────────────────────
+
+  def test_warning_warn_with_category_keyword
+    # Warning.warn 2-arg form accepts category: keyword
+    assert_nothing_raised do
+      Warning.warn("test callinfo message\n", category: :deprecated)
+    end
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── IO.foreach keyword handling ────────────────────────────────────
+
+  def test_io_foreach_chomp_keyword
+    tmpfile = Tempfile.new('test_call_info_foreach')
+    tmpfile.write("hello\nworld\n")
+    tmpfile.close
+
+    lines = []
+    IO.foreach(tmpfile.path, chomp: true) { |l| lines << l }
+    assert_equal ["hello", "world"], lines
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  ensure
+    tmpfile.unlink if tmpfile
+  end
+
+  # ── File#initialize keyword handling ────────────────────────────────
+
+  def test_file_open_with_mode_keyword
+    tmpfile = Tempfile.new('test_call_info_file')
+    tmpfile.write("file content")
+    tmpfile.close
+
+    f = File.open(tmpfile.path, mode: "r")
+    assert_equal "file content", f.read
+    f.close
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  ensure
+    tmpfile.unlink if tmpfile
+  end
+
+  def test_file_open_with_fd_and_mode_keyword
+    tmpfile = Tempfile.new('test_call_info_file_fd')
+    tmpfile.write("fd content")
+    tmpfile.close
+
+    # Open via path first, then reopen via fd to exercise the fd delegation path
+    original = File.open(tmpfile.path, "r")
+    fd_file = IO.new(original.fileno, mode: "r", autoclose: false)
+    assert_equal "fd content", fd_file.read
+    fd_file.close
+    original.close
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  ensure
+    tmpfile.unlink if tmpfile
+  end
+
+  # ── NoMatchingPatternKeyError keyword handling ─────────────────────
+
+  def test_no_matching_pattern_key_error_with_keywords
+    err = NoMatchingPatternKeyError.new("test", matchee: { a: 1 }, key: :b)
+    assert_equal "test", err.message
+    assert_equal({ a: 1 }, err.matchee)
+    assert_equal :b, err.key
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  def test_no_matching_pattern_key_error_without_keywords
+    err = NoMatchingPatternKeyError.new("test")
+    assert_equal "test", err.message
+
+    v = KwargsReceiver.new(1, k: 2)
+    assert_equal [1, 2], [v.a, v.k]
+  end
+
+  # ── General: keywords after non-keyword calls ──────────────────────
+
+  def test_keywords_work_after_various_calls
+    # Exercise a sequence of calls mixing keyword and non-keyword usage
+    # to ensure callInfo is properly reset between calls.
+    Hash.new(capacity: 10)
+    v1 = KwargsReceiver.new(1, k: :a)
+    assert_equal :a, v1.k
+
+    [1, 2, 3].size  # non-keyword call
+    v2 = KwargsReceiver.new(2, k: :b)
+    assert_equal :b, v2.k
+
+    Struct.new(:tmp, keyword_init: true)
+    v3 = KwargsReceiver.new(3, k: :c)
+    assert_equal :c, v3.k
+  end
+end
diff --git a/test/jruby/test_command_line_switches.rb b/test/jruby/test_command_line_switches.rb
index f17751d57d6..78f3c6484c2 100644
--- a/test/jruby/test_command_line_switches.rb
+++ b/test/jruby/test_command_line_switches.rb
@@ -16,20 +16,16 @@ def test_dash_0_splits_records
   end if IS_JAR_EXECUTION
 
   def test_dash_little_c_checks_syntax
-    with_jruby_shell_spawning do
-      with_temp_script("bad : code") do |s|
-        assert_match(/SyntaxError/, jruby("-c #{s.path} 2>&1"))
-        assert_not_equal 0, $?.exitstatus
-      end
+    with_temp_script("bad : code") do |s|
+      assert_match(/SyntaxError/, jruby("-c #{s.path} 2>&1"))
+      assert_not_equal 0, $?.exitstatus
     end
   end
 
   def test_dash_little_c_checks_syntax_only
-    with_jruby_shell_spawning do
-      with_temp_script(%q{ puts "a" }) do |s|
-        assert_match(/Syntax OK/, jruby(" -c #{s.path} 2>&1").chomp)
-        assert_equal 0, $?.exitstatus
-      end
+    with_temp_script(%q{ puts "a" }) do |s|
+      assert_match(/Syntax OK/, jruby(" -c #{s.path} 2>&1").chomp)
+      assert_equal 0, $?.exitstatus
     end
   end
 
@@ -158,20 +154,16 @@ def test_dash_big_C_error
   end
 
   def test_dash_little_w_turns_warnings_on
-    with_jruby_shell_spawning do
-      assert_match(/warning/, `#{RUBY} -v -e "defined? true" 2>&1`)
-      assert_equal 0, $?.exitstatus
-    end
+    assert_match(/warning/, `#{RUBY} -v -e "defined? true" 2>&1`)
+    assert_equal 0, $?.exitstatus
   end
 
   def test_dash_big_w_sets_warning_level
-    with_jruby_shell_spawning do
-      with_temp_script("defined? true") do |s|
-        assert_equal "", jruby("-W1 #{s.path} 2>&1")
-        assert_equal 0, $?.exitstatus
-        assert_match(/warning/, jruby("-W2 #{s.path} 2>&1"))
-        assert_equal 0, $?.exitstatus
-      end
+    with_temp_script("defined? true") do |s|
+      assert_equal "", jruby("-W1 #{s.path} 2>&1")
+      assert_equal 0, $?.exitstatus
+      assert_match(/warning/, jruby("-W2 #{s.path} 2>&1"))
+      assert_equal 0, $?.exitstatus
     end
   end
 
@@ -259,11 +251,9 @@ def test_with_interesting_file_names
              /test__/, /test_U_D/, /_P_U_S_D/]
 
     names.each_with_index do |name, idx|
-      with_jruby_shell_spawning do
-        with_temp_script('print __FILE__', name) do |s|
-          assert_match rgxes[idx], jruby("#{s.path}")
-          assert_equal 0, $?.exitstatus
-        end
+      with_temp_script('print __FILE__', name) do |s|
+        assert_match rgxes[idx], jruby("#{s.path}")
+        assert_equal 0, $?.exitstatus
       end
     end
   end
@@ -281,21 +271,17 @@ def test_blank_arg_ends_arg_processing
   # JRUBY-4288
   def test_case_insensitive_jruby
     weird_jruby = '"' + File.join([RbConfig::CONFIG['bindir'], 'jRuBy']) << RbConfig::CONFIG['EXEEXT'] + '"'
-    with_jruby_shell_spawning do
-      res = `cmd.exe /c #{weird_jruby} -e "puts 1"`.rstrip
-      assert_equal '1', res
-      assert_equal 0, $?.exitstatus
-    end
+    res = `cmd.exe /c #{weird_jruby} -e "puts 1"`.rstrip
+    assert_equal '1', res
+    assert_equal 0, $?.exitstatus
   end if WINDOWS
 
   # JRUBY-4289
   def test_uppercase_exe
     weird_jruby = '"' + File.join([RbConfig::CONFIG['bindir'], 'jRuBy']) << '.ExE' + '"'
-    with_jruby_shell_spawning do
-      res = `#{weird_jruby} -e "puts 1"`.rstrip
-      assert_equal '1', res
-      assert_equal 0, $?.exitstatus
-    end
+    res = `#{weird_jruby} -e "puts 1"`.rstrip
+    assert_equal '1', res
+    assert_equal 0, $?.exitstatus
   end if WINDOWS
 
   # JRUBY-4290
diff --git a/test/jruby/test_digest2.rb b/test/jruby/test_digest2.rb
index 233cc9a77b0..fd3eb78ceb8 100644
--- a/test/jruby/test_digest2.rb
+++ b/test/jruby/test_digest2.rb
@@ -17,6 +17,22 @@ def test_equality
     assert_equal(false, (a.eql?(b)))
   end
 
+  # Concurrent update on a shared Digest::Base instance should not raise.
+  # Without synchronization, java.security.MessageDigest corrupts its
+  # internal state under concurrent access, typically throwing
+  # ArrayIndexOutOfBoundsException from the JDK's digest implementation.
+  def test_concurrent_update
+    digest = Digest::SHA256.new
+
+    threads = 10.times.map do
+      Thread.new do
+        100.times { digest.update("hello") }
+      end
+    end
+
+    assert_nothing_raised { threads.each(&:join) }
+  end
+
   # JRUBY-5147
   def test_initialize_args
     assert_raises(ArgumentError) do
diff --git a/test/jruby/test_exception.rb b/test/jruby/test_exception.rb
index 9502608188b..5d6daa31a23 100644
--- a/test/jruby/test_exception.rb
+++ b/test/jruby/test_exception.rb
@@ -18,7 +18,7 @@ def test_good_stack_trace
     begin
       rescue_an_error
     rescue RuntimeError => e
-      assert_match(/'raise_an_error'/, e.backtrace[0])
+      assert_match(/raise_an_error/, e.backtrace[0])
     end
   end
 
@@ -35,10 +35,9 @@ def test_circular_cause_handle
     begin
       raise_circular_cause
     rescue => e
-      assert_match(/'raise_circular_cause'/, e.backtrace[0])
-      assert_equal(e.message, "error 1")
-      assert_equal(e.cause.message, "error 2")
-      assert_equal(e.cause.cause.message, "error 1")
+      assert_match(/raise_circular_cause/, e.backtrace[0])
+      assert_equal("circular causes", e.message)
+      assert_equal("error 1", e.cause.message)
     end
   end
 end
diff --git a/test/jruby/test_hash.rb b/test/jruby/test_hash.rb
index c0a251124ea..aac750a12e2 100644
--- a/test/jruby/test_hash.rb
+++ b/test/jruby/test_hash.rb
@@ -108,4 +108,31 @@ def test_compare_by_identity
     assert_equal 2, hash[arr2]
   end
 
+  # GH-9340: Hash#rehash corrupts insertion-order linked list when
+  # deduplicating keys. After rehash removes a duplicate, new
+  # insertions would disconnect existing entries from iteration.
+  def test_rehash_dedup_preserves_insertion_order
+    a = [1]; b = [2]
+    h = { a => "a", b => "b" }
+    a[0] = 2  # a now equals b
+    h.rehash  # deduplicates, should keep b's value
+    h[[3]] = "c"
+
+    assert_equal 2, h.size
+    assert_equal [[2], [3]], h.keys
+    assert_equal ["b", "c"], h.values
+  end
+
+  def test_rehash_dedup_reverse_each
+    a = [1]; b = [2]; c = [3]
+    h = { a => "a", b => "b", c => "c" }
+    a[0] = 2
+    h.rehash
+    h[[10]] = "d"
+
+    result = []
+    h.reverse_each { |k, v| result << k }
+    assert_equal [[10], [3], [2]], result
+  end
+
 end
diff --git a/test/jruby/test_helper.rb b/test/jruby/test_helper.rb
index 3aa94727733..6ede28cb5d5 100644
--- a/test/jruby/test_helper.rb
+++ b/test/jruby/test_helper.rb
@@ -79,7 +79,7 @@ def jruby(*args)
       args = args[0..-2]
     end
     options.each { |k,v| args.unshift "-J-D#{k}=\"#{v}\"" } unless RUBY =~ /-cp /
-    with_jruby_shell_spawning { sh "#{interpreter(options)} #{args.join(' ')}" }
+    sh "#{interpreter(options)} #{args.join(' ')}"
   end
 
   def jruby(*args)
@@ -98,7 +98,7 @@ def jruby_with_pipe(pipe, *args)
       args = args[0..-2]
     end
     options.each { |k,v| args.unshift "-J-D#{k}=\"#{v}\"" } unless RUBY =~ /-cp /
-    with_jruby_shell_spawning { sh "#{pipe} | #{interpreter(options)} #{args.join(' ')}" }
+    sh "#{pipe} | #{interpreter(options)} #{args.join(' ')}"
   end
 
   def sh(cmd)
@@ -108,14 +108,6 @@ def sh(cmd)
 
   private
 
-  def with_jruby_shell_spawning
-    prev_in_process = JRuby.runtime.instance_config.run_ruby_in_process
-    JRuby.runtime.instance_config.run_ruby_in_process = false
-    yield
-  ensure
-    JRuby.runtime.instance_config.run_ruby_in_process = prev_in_process
-  end
-
   def quiet(&block)
     io = [STDOUT.dup, STDERR.dup]
     STDOUT.reopen DEVNULL
diff --git a/test/jruby/test_higher_javasupport.rb b/test/jruby/test_higher_javasupport.rb
index 6e74e2c7374..fec6c6e4d45 100644
--- a/test/jruby/test_higher_javasupport.rb
+++ b/test/jruby/test_higher_javasupport.rb
@@ -859,15 +859,6 @@ def test_empty_list_each_should_not_blow_up_interpreter
     assert_nothing_raised { Collections::EMPTY_LIST.each {|element| } }
   end
 
-  def test_already_loaded_proxies_should_still_see_extend_proxy
-    JavaUtilities.extend_proxy('java.util.List') do
-      def foo
-        true
-      end
-    end
-    assert_equal(true, Foo::ArrayList.new.foo)
-  end
-
   def test_same_proxy_does_not_raise
     # JString already included and it is the same proxy, so do not throw an error
     # (e.g. intent of java_import already satisfied)
@@ -1886,7 +1877,7 @@ def test_callable_no_match_raised_errors
       fail 'expected to raise'
     rescue NameError => e
       msg = e.message
-      assert msg.start_with?('no constructor for arguments (org.jruby.RubyArray) on Java::JavaLang::StringBuilder'), msg
+      assert msg.start_with?('no constructor for arguments (org.jruby.RubyArrayNative) on Java::JavaLang::StringBuilder'), msg
       assert msg.index('available overloads'), msg
       assert msg.index('  (int)'), msg
       assert msg.index('  (java.lang.String)'), msg
@@ -1898,7 +1889,7 @@ def test_callable_no_match_raised_errors
       fail 'expected to raise'
     rescue => e # NameError
       msg = e.message
-      assert msg.start_with?("no method 'valueOf' for arguments (org.jruby.RubyHash) on Java::JavaLang::Short"), msg
+      assert msg.match?(/^no method 'valueOf' for arguments \(org\.jruby\.RubyHash.*\) on Java::JavaLang::Short/), msg
       assert msg.index('available overloads'), msg
       assert msg.index('  (short)'), msg
       assert msg.index('  (java.lang.String)'), msg
diff --git a/test/jruby/test_io.rb b/test/jruby/test_io.rb
index 076e9738033..67fc8f99ed2 100644
--- a/test/jruby/test_io.rb
+++ b/test/jruby/test_io.rb
@@ -153,6 +153,22 @@ def test_reopen
     assert_nothing_raised { file.reopen(@file) }
   end
 
+  def test_reopen_copies_encoding
+    ensure_files @file, @file2
+    f1 = File.open(@file)
+    @to_close << f1
+    f1.set_encoding("EUC-JP:UTF-8")
+
+    f2 = File.open(@file2)
+    @to_close << f2
+    f2.set_encoding("ISO-8859-1:US-ASCII")
+
+    f1.reopen(f2)
+
+    assert_equal Encoding::ISO_8859_1, f1.external_encoding
+    assert_equal Encoding::US_ASCII, f1.internal_encoding
+  end
+
   def test_file_read
     ensure_files @file
     # test that read returns correct values
@@ -651,4 +667,35 @@ def out_stream.read(*n)
     assert_equal before, after, "no wrappers should have been registered"
   end
 
+  # https://github.com/jruby/jruby/issues/9324
+  def test_accept_on_closed_server_raises_ioerror
+    require 'socket'
+
+    # Concurrent threads create timing pressure needed to hit the race between one accept returning and the next start.
+    500.times do
+      tcp = TCPServer.new("127.0.0.1", 0)
+      port = tcp.connect_address.ip_port
+
+      thread = Thread.new do
+        Thread.current.abort_on_exception = false
+        Thread.current.report_on_exception = false
+        loop do
+          c = tcp.accept
+          c.close
+        end
+      rescue IOError, Errno::EBADF, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK, Errno::ECONNRESET
+        # expected on shutdown — before the fix, NullPointerException/AssertionError escapes here
+      end
+
+      10.times { Thread.new { begin; TCPSocket.new("127.0.0.1", port).close; rescue; end } }
+      Thread.pass
+      tcp.close rescue nil
+
+      thread.join(2)
+      thread.kill if thread.alive?
+    end
+    # If we reach here, no AssertionError killed the process
+    assert true
+  end
+
 end
diff --git a/test/jruby/test_jar_complete.rb b/test/jruby/test_jar_complete.rb
index 066317656f4..2ea81fe4636 100644
--- a/test/jruby/test_jar_complete.rb
+++ b/test/jruby/test_jar_complete.rb
@@ -1,4 +1,4 @@
-# gets run from 'mvn -P jruby_complete_jar_extended' which ensures that a complete jar is built first
+# gets run from './mvnw -Pjruby_complete_jar_extended' which ensures that a complete jar is built first
 
 require 'test/unit'
 require 'rbconfig'
diff --git a/test/jruby/test_load.rb b/test/jruby/test_load.rb
index 148583a78f5..7e5f772e8d5 100644
--- a/test/jruby/test_load.rb
+++ b/test/jruby/test_load.rb
@@ -264,10 +264,8 @@ def test_load_from_jar_with_symlink_in_path
       begin
         Dir.mkdir 'not_A' unless File.exist? 'not_A'
         File.symlink("not_A", "A") unless File.symlink?('A')
-        with_jruby_shell_spawning do
-          `bin/jruby -e "load File.join('file:', File.join(File.expand_path(File.dirname(File.dirname('#{__FILE__}'))), 'jruby/requireTest-1.0.jar!'), 'A', 'B.rb') ; B"`
-          assert_equal 0, $?
-        end
+        `bin/jruby -e "load File.join('file:', File.join(File.expand_path(File.dirname(File.dirname('#{__FILE__}'))), 'jruby/requireTest-1.0.jar!'), 'A', 'B.rb') ; B"`
+        assert_equal 0, $?
       ensure
         File.delete("A") if File.symlink?('A')
         Dir.rmdir 'not_A' if File.exist? 'not_A'
diff --git a/test/jruby/test_load_compiled_ruby_class_from_classpath.rb b/test/jruby/test_load_compiled_ruby_class_from_classpath.rb
index 276ea18268d..7dab85ceb1b 100644
--- a/test/jruby/test_load_compiled_ruby_class_from_classpath.rb
+++ b/test/jruby/test_load_compiled_ruby_class_from_classpath.rb
@@ -29,14 +29,11 @@ def setup
 
     # This line means we assume the test is running from the jruby root directory
     @jruby_home = Dir.pwd
-    @in_process = JRuby.runtime.instance_config.run_ruby_in_process
-    JRuby.runtime.instance_config.run_ruby_in_process = false
   end
 
   def teardown
     remove_test_artifacts
     ENV["CLASSPATH"] = @@ENV_CLASSPATH
-    JRuby.runtime.instance_config.run_ruby_in_process = @in_process
   end
 
   def test_loading_compiled_ruby_class_from_classpath
diff --git a/test/jruby/test_marshal_gemspec.rb b/test/jruby/test_marshal_gemspec.rb
index 87059830fda..4e287365d37 100644
--- a/test/jruby/test_marshal_gemspec.rb
+++ b/test/jruby/test_marshal_gemspec.rb
@@ -107,7 +107,6 @@ def test_dump_and_load_from_source
       s.date = %q{2007-11-04}
       s.description = %q{Install this gem to use Derby with JRuby on Rails.}
       s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
-      s.has_rdoc = true
       s.homepage = %q{http://jruby-extras.rubyforge.org/ActiveRecord-JDBC}
       s.require_paths = ["lib"]
       s.required_ruby_version = Gem::Requirement.new("> 0.0.0")
diff --git a/test/jruby/test_set.rb b/test/jruby/test_set.rb
index 04f8925679b..7296bcebbfc 100644
--- a/test/jruby/test_set.rb
+++ b/test/jruby/test_set.rb
@@ -4,23 +4,6 @@
 # JRuby's Set impl specific or low-level details.
 class TestSet < Test::Unit::TestCase
 
-  class SubSet < Set ; end
-
-  def test_sub_set
-    set = SubSet.new
-    assert_same SubSet, set.class
-    assert set.is_a?(SubSet)
-    assert set.is_a?(Set)
-    assert hash = set.instance_variable_get(:@hash)
-    assert hash.is_a?(Hash)
-    assert_equal Hash.new, hash
-    assert_equal '#<TestSet::SubSet: {}>', set.inspect
-
-    assert_false Set.new.equal?(SubSet.new)
-    assert_true Set.new.eql?(SubSet.new)
-    assert_true ( SubSet.new == Set.new )
-  end
-
   def test_allocate
     set = Set.allocate
     assert_same Set, set.class
@@ -83,17 +66,10 @@ def test_dup_to_a
 
   def test_to_java
     assert set = Set.new.to_java
-    assert_equal "#<Set: {}>", set.toString
+    assert_equal "Set[]", set.toString
     assert_equal org.jruby.ext.set.RubySet, set.class
     assert set.is_a?(java.util.Set)
     assert_equal java.util.HashSet.new, set
-
-    assert set = SortedSet.new([2, 1]).to_java
-    assert set.toString.start_with?('#<SortedSet: {')
-    assert_equal org.jruby.ext.set.RubySortedSet, set.class
-    assert set.is_a?(java.util.Set)
-    assert set.is_a?(java.util.SortedSet)
-    assert_equal java.util.TreeSet.new([1, 2]), set
   end if defined? JRUBY_VERSION
 
   def test_cmp_0_but_not_eql
diff --git a/test/mri.core.index b/test/mri.core.index
index edddc11f461..590cfb38260 100644
--- a/test/mri.core.index
+++ b/test/mri.core.index
@@ -140,6 +140,7 @@ ruby/test_require.rb
 ruby/test_rubyoptions.rb
 # accesses RubyVM during load
 #ruby/test_rubyvm.rb
+ruby/test_set.rb
 # launches many subprocesses, moved to extra
 #ruby/test_settracefunc.rb
 # depends on RubyVM::Shape
diff --git a/test/mri.stdlib.index b/test/mri.stdlib.index
index 0d38dc43262..622a4732f6a 100644
--- a/test/mri.stdlib.index
+++ b/test/mri.stdlib.index
@@ -1,6 +1,5 @@
 # MRI stdlib tests
 
-benchmark
 cgi
 digest
 # only runs as root and we don't support most of this anyway
@@ -10,26 +9,20 @@ etc
 fiber
 fileutils
 io
-irb
 json
-logger
 monitor
 net
 open-uri
 openssl
 optparse
-ostruct
 pathname
 psych
-rdoc
-reline
 resolv
 ripper
 socket
 stringio
 strscan
 uri
-win32ole
 yaml
 zlib
 
@@ -42,7 +35,6 @@ test_ipaddr.rb
 test_open3.rb
 test_pp.rb
 test_prettyprint.rb
-test_pstore.rb
 test_pty.rb
 test_rbconfig.rb
 test_securerandom.rb
@@ -60,9 +52,6 @@ test_weakref.rb
 # Looks for did_you_mean in the wrong place (../lib)
 #did_you_mean
 
-# Various issues setting up test libraries to load
-#fiddle
-
 # Unsupported library, tries to use "fire_update!" defined by test harness
 #mkmf
 
diff --git a/test/mri/-ext-/box/test_load_ext.rb b/test/mri/-ext-/box/test_load_ext.rb
new file mode 100644
index 00000000000..ea3744375ea
--- /dev/null
+++ b/test/mri/-ext-/box/test_load_ext.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+require 'test/unit'
+
+class Test_Load_Extensions < Test::Unit::TestCase
+  ENV_ENABLE_BOX = {'RUBY_BOX' => '1'}
+
+  def test_load_extension
+    pend
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      require '-test-/box/yay1'
+      assert_equal "1.0.0", Yay.version
+      assert_equal "yay", Yay.yay
+    end;
+  end
+
+  def test_extension_contamination_in_global
+    pend
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      require '-test-/box/yay1'
+      yay1 = Yay
+      assert_equal "1.0.0", Yay.version
+      assert_equal "yay", Yay.yay
+
+      require '-test-/box/yay2'
+      assert_equal "2.0.0", Yay.version
+      v = Yay.yay
+      assert(v == "yay" || v == "yaaay") # "yay" on Linux, "yaaay" on macOS, Win32
+    end;
+  end
+
+  def test_load_extension_in_box
+    pend
+    assert_separately([ENV_ENABLE_BOX], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      ns = Ruby::Box.new
+      ns.require '-test-/box/yay1'
+      assert_equal "1.0.0", ns::Yay.version
+      assert_raise(NameError) { Yay }
+    end;
+  end
+
+  def test_different_version_extensions
+    pend
+    assert_separately([ENV_ENABLE_BOX], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      ns1 = Ruby::Box.new
+      ns2 = Ruby::Box.new
+      ns1.require('-test-/box/yay1')
+      ns2.require('-test-/box/yay2')
+
+      assert_raise(NameError) { Yay }
+      assert_not_nil ns1::Yay
+      assert_not_nil ns2::Yay
+      assert_equal "1.0.0", ns1::Yay::VERSION
+      assert_equal "2.0.0", ns2::Yay::VERSION
+      assert_equal "1.0.0", ns1::Yay.version
+      assert_equal "2.0.0", ns2::Yay.version
+    end;
+  end
+
+  def test_loading_extensions_from_global_to_local
+    pend
+    assert_separately([ENV_ENABLE_BOX], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      require '-test-/box/yay1'
+      assert_equal "1.0.0", Yay.version
+      assert_equal "yay", Yay.yay
+
+      ns = Ruby::Box.new
+      ns.require '-test-/box/yay2'
+      assert_equal "2.0.0", ns::Yay.version
+      assert_equal "yaaay", ns::Yay.yay
+
+      assert_equal "yay", Yay.yay
+    end;
+  end
+
+  def test_loading_extensions_from_local_to_global
+    pend
+    assert_separately([ENV_ENABLE_BOX], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      ns = Ruby::Box.new
+      ns.require '-test-/box/yay1'
+      assert_equal "1.0.0", ns::Yay.version
+      assert_equal "yay", ns::Yay.yay
+
+
+      require '-test-/box/yay2'
+      assert_equal "2.0.0", Yay.version
+      assert_equal "yaaay", Yay.yay
+
+      assert_equal "yay", ns::Yay.yay
+    end;
+  end
+end
diff --git a/test/mri/-ext-/bug_reporter/test_bug_reporter.rb b/test/mri/-ext-/bug_reporter/test_bug_reporter.rb
index 0036137f020..83fdba22829 100644
--- a/test/mri/-ext-/bug_reporter/test_bug_reporter.rb
+++ b/test/mri/-ext-/bug_reporter/test_bug_reporter.rb
@@ -6,12 +6,8 @@
 
 class TestBugReporter < Test::Unit::TestCase
   def test_bug_reporter_add
-    pend "macOS 15 is not working with this test" if macos?(15)
-
-    omit "flaky with RJIT" if JITSupport.rjit_enabled?
     description = RUBY_DESCRIPTION
     description = description.sub(/\+PRISM /, '') unless ParserSupport.prism_enabled_in_subprocess?
-    description = description.sub(/\+RJIT /, '') unless JITSupport.rjit_force_enabled?
     expected_stderr = [
       :*,
       /\[BUG\]\sSegmentation\sfault.*\n/,
@@ -24,8 +20,10 @@ def test_bug_reporter_add
 
     no_core = "Process.setrlimit(Process::RLIMIT_CORE, 0); " if defined?(Process.setrlimit) && defined?(Process::RLIMIT_CORE)
     args = ["-r-test-/bug_reporter", "-C", tmpdir]
-    args.push("--yjit") if JITSupport.yjit_enabled? # We want the printed description to match this process's RUBY_DESCRIPTION
-    args.unshift({"RUBY_ON_BUG" => nil})
+    # We want the printed description to match this process's RUBY_DESCRIPTION
+    args.push("--yjit") if JITSupport.yjit_enabled?
+    args.push("--zjit") if JITSupport.zjit_enabled?
+    args.unshift({"RUBY_ON_BUG" => nil, "RUBY_CRASH_REPORT" => nil})
     stdin = "#{no_core}register_sample_bug_reporter(12345); Process.kill :SEGV, $$"
     assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")
   ensure
diff --git a/test/mri/-ext-/debug/test_debug.rb b/test/mri/-ext-/debug/test_debug.rb
index 98e178e34f4..c9263d76fa6 100644
--- a/test/mri/-ext-/debug/test_debug.rb
+++ b/test/mri/-ext-/debug/test_debug.rb
@@ -76,3 +76,57 @@ def test_lazy_block
     assert_equal true, x, '[Bug #15105]'
   end
 end
+
+# This is a YJIT test, but we can't test this without a C extension that calls
+# rb_debug_inspector_open(), so we're testing it using "-test-/debug" here.
+class TestDebugWithYJIT < Test::Unit::TestCase
+  class LocalSetArray
+    def to_a
+      Bug::Debug.inspector.each do |_, binding,|
+        binding.local_variable_set(:local, :ok) if binding
+      end
+      [:ok]
+    end
+  end
+
+  class DebugArray
+    def to_a
+      Bug::Debug.inspector
+      [:ok]
+    end
+  end
+
+  def test_yjit_invalidates_getlocal_after_splatarray
+    val = getlocal_after_splatarray(LocalSetArray.new)
+    assert_equal [:ok, :ok], val
+  end
+
+  def test_yjit_invalidates_setlocal_after_splatarray
+    val = setlocal_after_splatarray(DebugArray.new)
+    assert_equal [:ok], val
+  end
+
+  def test_yjit_invalidates_setlocal_after_proc_call
+    val = setlocal_after_proc_call(proc { Bug::Debug.inspector; :ok })
+    assert_equal :ok, val
+  end
+
+  private
+
+  def getlocal_after_splatarray(array)
+    local = 1
+    [*array, local]
+  end
+
+  def setlocal_after_splatarray(array)
+    local = *array # setlocal followed by splatarray
+    itself # split a block using a C call
+    local # getlocal
+  end
+
+  def setlocal_after_proc_call(block)
+    local = block.call # setlocal followed by OPTIMIZED_METHOD_TYPE_CALL
+    itself # split a block using a C call
+    local # getlocal
+  end
+end if defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
diff --git a/test/mri/-ext-/gvl/test_last_thread.rb b/test/mri/-ext-/gvl/test_last_thread.rb
index f1bebafeea9..bcda0e33856 100644
--- a/test/mri/-ext-/gvl/test_last_thread.rb
+++ b/test/mri/-ext-/gvl/test_last_thread.rb
@@ -15,8 +15,7 @@ def test_last_thread
       t1 = Time.now
       t = t1 - t0
 
-      assert_in_delta(1.0, t, 0.16)
+      assert_in_delta(1.0, t, 0.8)
     end;
   end
 end
-
diff --git a/test/mri/-ext-/marshal/test_internal_ivar.rb b/test/mri/-ext-/marshal/test_internal_ivar.rb
index faabe14ab2d..8b4667fdf90 100644
--- a/test/mri/-ext-/marshal/test_internal_ivar.rb
+++ b/test/mri/-ext-/marshal/test_internal_ivar.rb
@@ -7,11 +7,16 @@ module Bug end
 module Bug::Marshal
   class TestInternalIVar < Test::Unit::TestCase
     def test_marshal
-      v = InternalIVar.new("hello", "world", "bye")
+      v = InternalIVar.new("hello", "world", "bye", "hi")
       assert_equal("hello", v.normal)
       assert_equal("world", v.internal)
       assert_equal("bye", v.encoding_short)
-      dump = assert_warn(/instance variable 'E' on class \S+ is not dumped/) {
+      assert_equal("hi", v.encoding_long)
+      warnings = ->(s) {
+        w = s.scan(/instance variable '(.+?)' on class \S+ is not dumped/)
+        assert_equal(%w[E K encoding], w.flatten.sort)
+      }
+      dump = assert_warn(warnings) {
         ::Marshal.dump(v)
       }
       v = assert_nothing_raised {break ::Marshal.load(dump)}
@@ -19,6 +24,7 @@ def test_marshal
       assert_equal("hello", v.normal)
       assert_nil(v.internal)
       assert_nil(v.encoding_short)
+      assert_nil(v.encoding_long)
     end
   end
 end
diff --git a/test/mri/-ext-/scheduler/test_interrupt_with_scheduler.rb b/test/mri/-ext-/scheduler/test_interrupt_with_scheduler.rb
new file mode 100644
index 00000000000..eb7a0647e58
--- /dev/null
+++ b/test/mri/-ext-/scheduler/test_interrupt_with_scheduler.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'timeout'
+require_relative '../../fiber/scheduler'
+
+class TestSchedulerInterruptHandling < Test::Unit::TestCase
+  def setup
+    pend("No fork support") unless Process.respond_to?(:fork)
+    require '-test-/scheduler'
+  end
+
+  # Test without Thread.handle_interrupt - should work regardless of fix
+  def test_without_handle_interrupt_signal_works
+    IO.pipe do |input, output|
+      pid = fork do
+        STDERR.reopen(output)
+
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+
+        Signal.trap(:INT) do
+          ::Thread.current.raise(Interrupt)
+        end
+
+        Fiber.schedule do
+          # Yield to the scheduler:
+          sleep(0)
+
+          Bug::Scheduler.blocking_loop(output)
+        end
+      end
+
+      output.close
+      assert_equal "x", input.read(1)
+
+      Process.kill(:INT, pid)
+
+      reaper = Thread.new do
+        Process.waitpid2(pid)
+      end
+
+      unless reaper.join(10)
+        Process.kill(:KILL, pid)
+      end
+
+      _, status = reaper.value
+
+      # It should be interrupted (not killed):
+      assert_not_equal 0, status.exitstatus
+      assert_equal true, status.signaled?
+      assert_equal Signal.list["INT"], status.termsig
+    end
+  end
+end
diff --git a/test/mri/-ext-/stack/test_stack_overflow.rb b/test/mri/-ext-/stack/test_stack_overflow.rb
new file mode 100644
index 00000000000..8eddec6ab5b
--- /dev/null
+++ b/test/mri/-ext-/stack/test_stack_overflow.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+require 'test/unit'
+
+class Test_StackOverflow < Test::Unit::TestCase
+  def setup
+    omit "Stack overflow tests are not supported on this platform: #{RUBY_PLATFORM.inspect}" unless RUBY_PLATFORM =~ /x86_64-linux|darwin/
+
+    require '-test-/stack'
+
+    omit "Stack overflow tests are not supported with ASAN" if Thread.asan?
+  end
+
+  def test_overflow
+    assert_separately([], <<~RUBY)
+      # GC may try to scan the top of the stack and cause a SEGV.
+      GC.disable
+      require '-test-/stack'
+
+      assert_raise(SystemStackError) do
+        Thread.alloca_overflow
+      end
+    RUBY
+  end
+
+  def test_thread_stack_overflow
+    assert_separately([], <<~RUBY)
+      require '-test-/stack'
+      GC.disable
+
+      thread = Thread.new do
+        Thread.current.report_on_exception = false
+        Thread.alloca_overflow
+      end
+
+      assert_raise(SystemStackError) do
+        thread.join
+      end
+    RUBY
+  end
+
+  def test_fiber_stack_overflow
+    assert_separately([], <<~RUBY)
+      require '-test-/stack'
+      GC.disable
+
+      fiber = Fiber.new do
+        Thread.alloca_overflow
+      end
+
+      assert_raise(SystemStackError) do
+        fiber.resume
+      end
+    RUBY
+  end
+end
diff --git a/test/mri/-ext-/string/test_capacity.rb b/test/mri/-ext-/string/test_capacity.rb
index bcca64d85a4..df000f7cdb8 100644
--- a/test/mri/-ext-/string/test_capacity.rb
+++ b/test/mri/-ext-/string/test_capacity.rb
@@ -66,7 +66,7 @@ def capa(str)
   end
 
   def embed_header_size
-    3 * RbConfig::SIZEOF['void*']
+    GC::INTERNAL_CONSTANTS[:RBASIC_SIZE] + RbConfig::SIZEOF['void*']
   end
 
   def max_embed_len
diff --git a/test/mri/-ext-/symbol/test_type.rb b/test/mri/-ext-/symbol/test_type.rb
index 2b0fbe5b798..ed019062faf 100644
--- a/test/mri/-ext-/symbol/test_type.rb
+++ b/test/mri/-ext-/symbol/test_type.rb
@@ -123,16 +123,20 @@ def test_attrset
 
     def test_check_id_invalid_type
       cx = EnvUtil.labeled_class("X\u{1f431}")
-      assert_raise_with_message(TypeError, /X\u{1F431}/) {
-        Bug::Symbol.pinneddown?(cx)
-      }
+      EnvUtil.with_default_internal(Encoding::UTF_8) do
+        assert_raise_with_message(TypeError, /X\u{1F431}/) {
+          Bug::Symbol.pinneddown?(cx)
+        }
+      end
     end
 
     def test_check_symbol_invalid_type
       cx = EnvUtil.labeled_class("X\u{1f431}")
-      assert_raise_with_message(TypeError, /X\u{1F431}/) {
-        Bug::Symbol.find(cx)
-      }
+      EnvUtil.with_default_internal(Encoding::UTF_8) do
+        assert_raise_with_message(TypeError, /X\u{1F431}/) {
+          Bug::Symbol.find(cx)
+        }
+      end
     end
 
     def test_const_name_type
diff --git a/test/mri/-ext-/test_abi.rb b/test/mri/-ext-/test_abi.rb
index d3ea6bb9b10..7f30feb9449 100644
--- a/test/mri/-ext-/test_abi.rb
+++ b/test/mri/-ext-/test_abi.rb
@@ -9,7 +9,11 @@ def test_require_lib_with_incorrect_abi_on_dev_ruby
     assert_separately [], <<~RUBY
       err = assert_raise(LoadError) { require "-test-/abi" }
       assert_match(/incompatible ABI version/, err.message)
-      assert_include err.message, "/-test-/abi."
+      if Ruby::Box.enabled?
+        assert_include err.message, "_-test-+abi."
+      else
+        assert_include err.message, "/-test-/abi."
+      end
     RUBY
   end
 
@@ -27,7 +31,11 @@ def test_enable_abi_check_using_environment_variable
     assert_separately [{ "RUBY_ABI_CHECK" => "1" }], <<~RUBY
       err = assert_raise(LoadError) { require "-test-/abi" }
       assert_match(/incompatible ABI version/, err.message)
-      assert_include err.message, "/-test-/abi."
+      if Ruby::Box.enabled?
+        assert_include err.message, "_-test-+abi."
+      else
+        assert_include err.message, "/-test-/abi."
+      end
     RUBY
   end
 
diff --git a/test/mri/-ext-/thread/test_instrumentation_api.rb b/test/mri/-ext-/thread/test_instrumentation_api.rb
index 663e41be537..ba410693048 100644
--- a/test/mri/-ext-/thread/test_instrumentation_api.rb
+++ b/test/mri/-ext-/thread/test_instrumentation_api.rb
@@ -151,7 +151,7 @@ def test_blocking_on_ractor
       end
 
       full_timeline = record do
-        ractor.take
+        ractor.value
       end
 
       timeline = timeline_for(Thread.current, full_timeline)
@@ -161,6 +161,8 @@ def test_blocking_on_ractor
   end
 
   def test_sleeping_inside_ractor
+    omit "This test is flaky and intermittently failing now on ModGC workflow" if ENV['GITHUB_WORKFLOW'] == 'ModGC'
+
     assert_ractor(<<-"RUBY", require_relative: "helper", require: "-test-/thread/instrumentation")
       include ThreadInstrumentation::TestHelper
 
@@ -170,7 +172,7 @@ def test_sleeping_inside_ractor
         thread = Ractor.new{
           sleep 0.1
           Thread.current
-        }.take
+        }.value
         sleep 0.1
       end
 
diff --git a/test/mri/-ext-/thread/test_lock_native_thread.rb b/test/mri/-ext-/thread/test_lock_native_thread.rb
index 8a5ba78838d..b4044b2b935 100644
--- a/test/mri/-ext-/thread/test_lock_native_thread.rb
+++ b/test/mri/-ext-/thread/test_lock_native_thread.rb
@@ -15,6 +15,8 @@
 
 class TestThreadLockNativeThread < Test::Unit::TestCase
   def test_lock_native_thread
+    omit "LSAN reports memory leak because NT is not freed for MN thread" if Test::Sanitizers.lsan_enabled?
+
     assert_separately([{'RUBY_MN_THREADS' => '1'}], <<-RUBY)
       require '-test-/thread/lock_native_thread'
 
@@ -28,6 +30,8 @@ def test_lock_native_thread
   end
 
   def test_lock_native_thread_tls
+    omit "LSAN reports memory leak because NT is not freed for MN thread" if Test::Sanitizers.lsan_enabled?
+
     assert_separately([{'RUBY_MN_THREADS' => '1'}], <<-RUBY)
       require '-test-/thread/lock_native_thread'
       tn = 10
diff --git a/test/mri/-ext-/tracepoint/test_tracepoint.rb b/test/mri/-ext-/tracepoint/test_tracepoint.rb
index bf66d8f1051..debddd83d04 100644
--- a/test/mri/-ext-/tracepoint/test_tracepoint.rb
+++ b/test/mri/-ext-/tracepoint/test_tracepoint.rb
@@ -83,7 +83,7 @@ def run(hook)
   end
 
   def test_teardown_with_active_GC_end_hook
-    assert_separately([], 'require("-test-/tracepoint"); Bug.after_gc_exit_hook = proc {}')
+    assert_separately([], 'require("-test-/tracepoint"); Bug.after_gc_exit_hook = proc {}; GC.start')
   end
 
 end
diff --git a/test/mri/benchmark/test_benchmark.rb b/test/mri/benchmark/test_benchmark.rb
deleted file mode 100644
index 2e0c47af751..00000000000
--- a/test/mri/benchmark/test_benchmark.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'benchmark'
-
-class TestBenchmark < Test::Unit::TestCase
-  BENCH_FOR_TIMES_UPTO = lambda do |x|
-    n = 1000
-    tf = x.report("for:")   { for _ in 1..n; '1'; end }
-    tt = x.report("times:") { n.times do   ; '1'; end }
-    tu = x.report("upto:")  { 1.upto(n) do ; '1'; end }
-    [tf+tt+tu, (tf+tt+tu)/3]
-  end
-
-  BENCH_FOR_TIMES_UPTO_NO_LABEL = lambda do |x|
-    n = 1000
-    x.report { for _ in 1..n; '1'; end }
-    x.report { n.times do   ; '1'; end }
-    x.report { 1.upto(n) do ; '1'; end }
-  end
-
-  def labels
-    %w[first second third]
-  end
-
-  def bench(type = :bm, *args, &block)
-    if block
-      Benchmark.send(type, *args, &block)
-    else
-      Benchmark.send(type, *args) do |x|
-        labels.each { |label|
-          x.report(label) {}
-        }
-      end
-    end
-  end
-
-  def capture_bench_output(type, *args, &block)
-    capture_output { bench(type, *args, &block) }.first.gsub(/[ \-]\d\.\d{6}/, ' --time--')
-  end
-
-  def test_tms_outputs_nicely
-    assert_equal("  0.000000   0.000000   0.000000 (  0.000000)\n", Benchmark::Tms.new.to_s)
-    assert_equal("  1.000000   2.000000  10.000000 (  5.000000)\n", Benchmark::Tms.new(1,2,3,4,5).to_s)
-    assert_equal("1.000000 2.000000 3.000000 4.000000 10.000000 (5.000000) label",
-                 Benchmark::Tms.new(1,2,3,4,5,'label').format('%u %y %U %Y %t %r %n'))
-    assert_equal("1.000000 2.000", Benchmark::Tms.new(1).format('%u %.3f', 2))
-    assert_equal("100.000000 150.000000 250.000000 (200.000000)\n",
-                 Benchmark::Tms.new(100, 150, 0, 0, 200).to_s)
-  end
-
-  def test_tms_wont_modify_the_format_String_given
-    format = "format %u"
-    Benchmark::Tms.new.format(format)
-    assert_equal("format %u", format)
-  end
-
-  BENCHMARK_OUTPUT_WITH_TOTAL_AVG = <<BENCH
-              user     system      total        real
-for:      --time--   --time--   --time-- (  --time--)
-times:    --time--   --time--   --time-- (  --time--)
-upto:     --time--   --time--   --time-- (  --time--)
->total:   --time--   --time--   --time-- (  --time--)
->avg:     --time--   --time--   --time-- (  --time--)
-BENCH
-
-  def test_benchmark_does_not_print_any_space_if_the_given_caption_is_empty
-    assert_equal(<<-BENCH, capture_bench_output(:benchmark))
-first   --time--   --time--   --time-- (  --time--)
-second  --time--   --time--   --time-- (  --time--)
-third   --time--   --time--   --time-- (  --time--)
-BENCH
-  end
-
-  def test_benchmark_makes_extra_calculations_with_an_Array_at_the_end_of_the_benchmark_and_show_the_result
-    assert_equal(BENCHMARK_OUTPUT_WITH_TOTAL_AVG,
-      capture_bench_output(:benchmark,
-        Benchmark::CAPTION, 7,
-        Benchmark::FORMAT, ">total:", ">avg:",
-        &BENCH_FOR_TIMES_UPTO))
-  end
-
-  def test_bm_returns_an_Array_of_the_times_with_the_labels
-    [:bm, :bmbm].each do |meth|
-      capture_output do
-        results = bench(meth)
-        assert_instance_of(Array, results)
-        assert_equal(labels.size, results.size)
-        results.zip(labels).each { |tms, label|
-          assert_instance_of(Benchmark::Tms, tms)
-          assert_equal(label, tms.label)
-        }
-      end
-    end
-  end
-
-  def test_bm_correctly_output_when_the_label_width_is_given
-    assert_equal(<<-BENCH, capture_bench_output(:bm, 6))
-             user     system      total        real
-first    --time--   --time--   --time-- (  --time--)
-second   --time--   --time--   --time-- (  --time--)
-third    --time--   --time--   --time-- (  --time--)
-BENCH
-  end
-
-  def test_bm_correctly_output_when_no_label_is_given
-    assert_equal(<<-BENCH, capture_bench_output(:bm, &BENCH_FOR_TIMES_UPTO_NO_LABEL))
-       user     system      total        real
-   --time--   --time--   --time-- (  --time--)
-   --time--   --time--   --time-- (  --time--)
-   --time--   --time--   --time-- (  --time--)
-BENCH
-  end
-
-  def test_bm_can_make_extra_calcultations_with_an_array_at_the_end_of_the_benchmark
-    assert_equal(BENCHMARK_OUTPUT_WITH_TOTAL_AVG,
-      capture_bench_output(:bm, 7, ">total:", ">avg:",
-        &BENCH_FOR_TIMES_UPTO))
-  end
-
-  BMBM_OUTPUT = <<BENCH
-Rehearsal ------------------------------------------
-first    --time--   --time--   --time-- (  --time--)
-second   --time--   --time--   --time-- (  --time--)
-third    --time--   --time--   --time-- (  --time--)
---------------------------------- total: --time--sec
-
-             user     system      total        real
-first    --time--   --time--   --time-- (  --time--)
-second   --time--   --time--   --time-- (  --time--)
-third    --time--   --time--   --time-- (  --time--)
-BENCH
-
-  def test_bmbm_correctly_guess_the_label_width_even_when_not_given
-    assert_equal(BMBM_OUTPUT, capture_bench_output(:bmbm))
-  end
-
-  def test_bmbm_correctly_output_when_the_label_width_is_given__bmbm_ignore_it__but_it_is_a_frequent_mistake
-    assert_equal(BMBM_OUTPUT, capture_bench_output(:bmbm, 6))
-  end
-
-  def test_report_item_shows_the_title__even_if_not_a_string
-    assert_operator(capture_bench_output(:bm) { |x| x.report(:title) {} }, :include?, 'title')
-    assert_operator(capture_bench_output(:bmbm) { |x| x.report(:title) {} }, :include?, 'title')
-  end
-
-  def test_bugs_ruby_dev_40906_can_add_in_place_the_time_of_execution_of_the_block_given
-    t = Benchmark::Tms.new
-    assert_equal(0, t.real)
-    t.add! { sleep 0.1 }
-    assert_not_equal(0, t.real)
-  end
-
-  def test_realtime_output
-    sleeptime = 1.0
-    realtime = Benchmark.realtime { sleep sleeptime }
-    assert_operator sleeptime, :<, realtime
-  end
-
-  # Test that `to_h` returns a hash with the expected data.
-  def test_tms_to_h
-    tms = Benchmark::Tms.new(1.1, 2.2, 3.3, 4.4, 5.5, 'my label')
-    expected_hash = {
-      utime: 1.1, stime: 2.2, cutime: 3.3, cstime: 4.4, real: 5.5, label: 'my label'
-    }
-    assert_equal(expected_hash, tms.to_h)
-  end
-end
diff --git a/test/mri/cgi/test_cgi_cookie.rb b/test/mri/cgi/test_cgi_cookie.rb
deleted file mode 100644
index eadae453136..00000000000
--- a/test/mri/cgi/test_cgi_cookie.rb
+++ /dev/null
@@ -1,211 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'stringio'
-require_relative 'update_env'
-
-
-class CGICookieTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-      'SCRIPT_NAME' => nil,
-    )
-    @str1="\xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93".dup
-    @str1.force_encoding("UTF-8") if defined?(::Encoding)
-  end
-
-  def teardown
-    ENV.update(@environ)
-  end
-
-
-  def test_cgi_cookie_new_simple
-    cookie = CGI::Cookie.new('name1', 'val1', '&<>"', @str1)
-    assert_equal('name1', cookie.name)
-    assert_equal(['val1', '&<>"', @str1], cookie.value)
-    assert_nil(cookie.domain)
-    assert_nil(cookie.expires)
-    assert_equal('', cookie.path)
-    assert_equal(false, cookie.secure)
-    assert_equal(false, cookie.httponly)
-    assert_equal("name1=val1&%26%3C%3E%22&%E3%82%86%E3%82%93%E3%82%86%E3%82%93; path=", cookie.to_s)
-  end
-
-
-  def test_cgi_cookie_new_complex
-    t = Time.gm(2030, 12, 31, 23, 59, 59)
-    value = ['val1', '&<>"', "\xA5\xE0\xA5\xB9\xA5\xAB".dup]
-    value[2].force_encoding("EUC-JP") if defined?(::Encoding)
-    cookie = CGI::Cookie.new('name'=>'name1',
-                             'value'=>value,
-                             'path'=>'/cgi-bin/myapp/',
-                             'domain'=>'www.example.com',
-                             'expires'=>t,
-                             'secure'=>true,
-                             'httponly'=>true
-                             )
-    assert_equal('name1', cookie.name)
-    assert_equal(value, cookie.value)
-    assert_equal('www.example.com', cookie.domain)
-    assert_equal(t, cookie.expires)
-    assert_equal('/cgi-bin/myapp/', cookie.path)
-    assert_equal(true, cookie.secure)
-    assert_equal(true, cookie.httponly)
-    assert_equal('name1=val1&%26%3C%3E%22&%A5%E0%A5%B9%A5%AB; domain=www.example.com; path=/cgi-bin/myapp/; expires=Tue, 31 Dec 2030 23:59:59 GMT; secure; HttpOnly', cookie.to_s)
-  end
-
-
-  def test_cgi_cookie_new_with_domain
-    h = {'name'=>'name1', 'value'=>'value1'}
-    cookie = CGI::Cookie.new(h.merge('domain'=>'a.example.com'))
-    assert_equal('a.example.com', cookie.domain)
-
-    cookie = CGI::Cookie.new(h.merge('domain'=>'.example.com'))
-    assert_equal('.example.com', cookie.domain)
-
-    cookie = CGI::Cookie.new(h.merge('domain'=>'1.example.com'))
-    assert_equal('1.example.com', cookie.domain, 'enhanced by RFC 1123')
-
-    assert_raise(ArgumentError) {
-      CGI::Cookie.new(h.merge('domain'=>'-a.example.com'))
-    }
-
-    assert_raise(ArgumentError) {
-      CGI::Cookie.new(h.merge('domain'=>'a-.example.com'))
-    }
-  end
-
-
-  def test_cgi_cookie_scriptname
-    cookie = CGI::Cookie.new('name1', 'value1')
-    assert_equal('', cookie.path)
-    cookie = CGI::Cookie.new('name'=>'name1', 'value'=>'value1')
-    assert_equal('', cookie.path)
-    ## when ENV['SCRIPT_NAME'] is set, cookie.path is set automatically
-    ENV['SCRIPT_NAME'] = '/cgi-bin/app/example.cgi'
-    cookie = CGI::Cookie.new('name1', 'value1')
-    assert_equal('/cgi-bin/app/', cookie.path)
-    cookie = CGI::Cookie.new('name'=>'name1', 'value'=>'value1')
-    assert_equal('/cgi-bin/app/', cookie.path)
-  end
-
-
-  def test_cgi_cookie_parse
-    ## ';' separator
-    cookie_str = 'name1=val1&val2; name2=val2&%26%3C%3E%22&%E3%82%86%E3%82%93%E3%82%86%E3%82%93;_session_id=12345'
-    cookies = CGI::Cookie.parse(cookie_str)
-    list = [
-      ['name1', ['val1', 'val2']],
-      ['name2', ['val2', '&<>"',@str1]],
-      ['_session_id', ['12345']],
-    ]
-    list.each do |name, value|
-      cookie = cookies[name]
-      assert_equal(name, cookie.name)
-      assert_equal(value, cookie.value)
-    end
-    ## don't allow ',' separator
-    cookie_str = 'name1=val1&val2, name2=val2'
-    cookies = CGI::Cookie.parse(cookie_str)
-    list = [
-      ['name1', ['val1', 'val2, name2=val2']],
-    ]
-    list.each do |name, value|
-      cookie = cookies[name]
-      assert_equal(name, cookie.name)
-      assert_equal(value, cookie.value)
-    end
-  end
-
-  def test_cgi_cookie_parse_not_decode_name
-    cookie_str = "%66oo=baz;foo=bar"
-    cookies = CGI::Cookie.parse(cookie_str)
-    assert_equal({"%66oo" => ["baz"], "foo" => ["bar"]}, cookies)
-  end
-
-  def test_cgi_cookie_arrayinterface
-    cookie = CGI::Cookie.new('name1', 'a', 'b', 'c')
-    assert_equal('a', cookie[0])
-    assert_equal('c', cookie[2])
-    assert_nil(cookie[3])
-    assert_equal('a', cookie.first)
-    assert_equal('c', cookie.last)
-    assert_equal(['A', 'B', 'C'], cookie.collect{|e| e.upcase})
-  end
-
-
-  def test_cgi_cookie_domain_injection_into_name
-    name = "a=b; domain=example.com;"
-    path = "/"
-    domain = "example.jp"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  def test_cgi_cookie_newline_injection_into_name
-    name = "a=b;\r\nLocation: http://example.com#"
-    path = "/"
-    domain = "example.jp"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  def test_cgi_cookie_multibyte_injection_into_name
-    name = "a=b;\u3042"
-    path = "/"
-    domain = "example.jp"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  def test_cgi_cookie_injection_into_path
-    name = "name"
-    path = "/; samesite=none"
-    domain = "example.jp"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  def test_cgi_cookie_injection_into_domain
-    name = "name"
-    path = "/"
-    domain = "example.jp; samesite=none"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
diff --git a/test/mri/cgi/test_cgi_core.rb b/test/mri/cgi/test_cgi_core.rb
deleted file mode 100644
index f7adb7e99f1..00000000000
--- a/test/mri/cgi/test_cgi_core.rb
+++ /dev/null
@@ -1,307 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'stringio'
-require_relative 'update_env'
-
-
-class CGICoreTest < Test::Unit::TestCase
-  include UpdateEnv
-
-  def setup
-    @environ = {}
-    #@environ = {
-    #  'SERVER_PROTOCOL' => 'HTTP/1.1',
-    #  'REQUEST_METHOD'  => 'GET',
-    #  'SERVER_SOFTWARE' => 'Apache 2.2.0',
-    #}
-    #ENV.update(@environ)
-  end
-
-  def teardown
-    ENV.update(@environ)
-    $stdout = STDOUT
-  end
-
-  def test_cgi_parse_illegal_query
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'QUERY_STRING'    => 'a=111&&b=222&c&d=',
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    assert_equal(["a","b","c","d"],cgi.keys.sort)
-    assert_equal("",cgi["d"])
-  end
-
-  def test_cgi_core_params_GET
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'QUERY_STRING'    => 'id=123&id=456&id=&id&str=%40h+%3D%7E+%2F%5E%24%2F',
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    ## cgi[]
-    assert_equal('123', cgi['id'])
-    assert_equal('@h =~ /^$/', cgi['str'])
-    ## cgi.params
-    assert_equal(['123', '456', ''], cgi.params['id'])
-    assert_equal(['@h =~ /^$/'], cgi.params['str'])
-    ## cgi.keys
-    assert_equal(['id', 'str'], cgi.keys.sort)
-    ## cgi.key?, cgi.has_key?, cgi.include?
-    assert_equal(true,  cgi.key?('id'))
-    assert_equal(true,  cgi.has_key?('id'))
-    assert_equal(true,  cgi.include?('id'))
-    assert_equal(false, cgi.key?('foo'))
-    assert_equal(false, cgi.has_key?('foo'))
-    assert_equal(false, cgi.include?('foo'))
-    ## invalid parameter name
-    assert_equal('', cgi['*notfound*'])    # [ruby-dev:30740]
-    assert_equal([], cgi.params['*notfound*'])
-  end
-
-
-  def test_cgi_core_params_POST
-    query_str = 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F'
-    update_env(
-      'REQUEST_METHOD'  => 'POST',
-      'CONTENT_LENGTH'  => query_str.length.to_s,
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    $stdin = StringIO.new
-    $stdin << query_str
-    $stdin.rewind
-    cgi = CGI.new
-    ## cgi[]
-    assert_equal('123', cgi['id'])
-    assert_equal('@h =~ /^$/', cgi['str'])
-    ## cgi.params
-    assert_equal(['123', '456', ''], cgi.params['id'])
-    assert_equal(['@h =~ /^$/'], cgi.params['str'])
-    ## invalid parameter name
-    assert_equal('', cgi['*notfound*'])
-    assert_equal([], cgi.params['*notfound*'])
-  ensure
-    $stdin = STDIN
-  end
-
-  def test_cgi_core_params_encoding_check
-    query_str = 'str=%BE%BE%B9%BE'
-    update_env(
-        'REQUEST_METHOD'  => 'POST',
-        'CONTENT_LENGTH'  => query_str.length.to_s,
-        'SERVER_SOFTWARE' => 'Apache 2.2.0',
-        'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    $stdin = StringIO.new
-    $stdin << query_str
-    $stdin.rewind
-    if defined?(::Encoding)
-      hash={}
-      cgi = CGI.new(:accept_charset=>"UTF-8"){|key,val|hash[key]=val}
-      ## cgi[]
-      assert_equal("\xBE\xBE\xB9\xBE".dup.force_encoding("UTF-8"), cgi['str'])
-      ## cgi.params
-      assert_equal(["\xBE\xBE\xB9\xBE".dup.force_encoding("UTF-8")], cgi.params['str'])
-      ## accept-charset error
-      assert_equal({"str"=>"\xBE\xBE\xB9\xBE".dup.force_encoding("UTF-8")},hash)
-
-      $stdin.rewind
-      assert_raise(CGI::InvalidEncoding) do
-        cgi = CGI.new(:accept_charset=>"UTF-8")
-      end
-
-      $stdin.rewind
-      cgi = CGI.new(:accept_charset=>"EUC-JP")
-      ## cgi[]
-      assert_equal("\xBE\xBE\xB9\xBE".dup.force_encoding("EUC-JP"), cgi['str'])
-      ## cgi.params
-      assert_equal(["\xBE\xBE\xB9\xBE".dup.force_encoding("EUC-JP")], cgi.params['str'])
-    else
-      assert(true)
-    end
-  ensure
-    $stdin = STDIN
-  end
-
-
-  def test_cgi_core_cookie
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    assert_not_equal(nil,cgi.cookies)
-    [ ['_session_id', ['12345'],        ],
-      ['name1',       ['val1', 'val2'], ],
-    ].each do |key, expected|
-      cookie = cgi.cookies[key]
-      assert_kind_of(CGI::Cookie, cookie)
-      assert_equal(expected, cookie.value)
-      assert_equal(false, cookie.secure)
-      assert_nil(cookie.expires)
-      assert_nil(cookie.domain)
-      assert_equal('', cookie.path)
-    end
-  end
-
-
-  def test_cgi_core_maxcontentlength
-    update_env(
-      'REQUEST_METHOD'  => 'POST',
-      'CONTENT_LENGTH'  => (64 * 1024 * 1024).to_s
-    )
-    ex = assert_raise(StandardError) do
-      CGI.new
-    end
-    assert_equal("too large post data.", ex.message)
-  end if CGI.const_defined?(:MAX_CONTENT_LENGTH)
-
-
-  def test_cgi_core_out
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    ## euc string
-    euc_str = "\270\253\244\355\241\242\277\315\244\254\245\264\245\337\244\316\244\350\244\246\244\300"
-    ## utf8 (not converted)
-    options = { 'charset'=>'utf8' }
-    $stdout = StringIO.new
-    cgi.out(options) { euc_str }
-    assert_nil(options['language'])
-    actual = $stdout.string
-    expected = "Content-Type: text/html; charset=utf8\r\n" +
-               "Content-Length: 22\r\n" +
-               "\r\n" +
-               euc_str
-    if defined?(::Encoding)
-      actual.force_encoding("ASCII-8BIT")
-      expected.force_encoding("ASCII-8BIT")
-    end
-    assert_equal(expected, actual)
-    ## language is keeped
-    options = { 'charset'=>'Shift_JIS', 'language'=>'en' }
-    $stdout = StringIO.new
-    cgi.out(options) { euc_str }
-    assert_equal('en', options['language'])
-    ## HEAD method
-    update_env('REQUEST_METHOD' => 'HEAD')
-    options = { 'charset'=>'utf8' }
-    $stdout = StringIO.new
-    cgi.out(options) { euc_str }
-    actual = $stdout.string
-    expected = "Content-Type: text/html; charset=utf8\r\n" +
-               "Content-Length: 22\r\n" +
-               "\r\n"
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_core_print
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-    )
-    cgi = CGI.new
-    $stdout = StringIO.new
-    str = "foobar"
-    cgi.print(str)
-    expected = str
-    actual = $stdout.string
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_core_environs
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-    )
-    cgi = CGI.new
-    ##
-    list1 = %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
-        PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
-        REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
-        SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
-        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
-        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
-        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT
-    ]
-    # list2 = %w[ CONTENT_LENGTH SERVER_PORT ]
-    ## string expected
-    list1.each do |name|
-      update_env(name => "**#{name}**")
-    end
-    list1.each do |name|
-      method = name.sub(/\AHTTP_/, '').downcase
-      actual = cgi.__send__ method
-      expected = "**#{name}**"
-      assert_equal(expected, actual)
-    end
-    ## integer expected
-    update_env('CONTENT_LENGTH' => '123')
-    update_env('SERVER_PORT' => '8080')
-    assert_equal(123, cgi.content_length)
-    assert_equal(8080, cgi.server_port)
-    ## raw cookie
-    update_env('HTTP_COOKIE' => 'name1=val1')
-    update_env('HTTP_COOKIE2' => 'name2=val2')
-    assert_equal('name1=val1', cgi.raw_cookie)
-    assert_equal('name2=val2', cgi.raw_cookie2)
-  end
-
-
-  def test_cgi_core_htmltype_header
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-    )
-    ## no htmltype
-    cgi = CGI.new
-    assert_raise(NoMethodError) do cgi.doctype end
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html3
-    cgi = CGI.new('html3')
-    expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
-    assert_equal(expected, cgi.doctype)
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html4
-    cgi = CGI.new('html4')
-    expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
-    assert_equal(expected, cgi.doctype)
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html4 transitional
-    cgi = CGI.new('html4Tr')
-    expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
-    assert_equal(expected, cgi.doctype)
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html4 frameset
-    cgi = CGI.new('html4Fr')
-    expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
-    assert_equal(expected, cgi.doctype)
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html5
-    cgi = CGI.new('html5')
-    expected = '<!DOCTYPE HTML>'
-    assert_equal(expected, cgi.doctype)
-    assert_match(/^<HEADER><\/HEADER>$/i,cgi.header)
-  end
-
-
-  instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
diff --git a/test/mri/cgi/test_cgi_escape.rb b/test/mri/cgi/test_cgi_escape.rb
new file mode 100644
index 00000000000..73d99e8aacd
--- /dev/null
+++ b/test/mri/cgi/test_cgi_escape.rb
@@ -0,0 +1,325 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'cgi/escape'
+require 'stringio'
+require_relative 'update_env'
+
+
+class CGIEscapeTest < Test::Unit::TestCase
+  include CGI::Escape
+  include UpdateEnv
+
+  def setup
+    @environ = {}
+    update_env(
+      'REQUEST_METHOD' => 'GET',
+      'SCRIPT_NAME' => nil,
+    )
+    @str1="&<>\" \xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93".dup
+    @str1.force_encoding("UTF-8") if defined?(::Encoding)
+  end
+
+  def teardown
+    ENV.update(@environ)
+  end
+
+  def test_cgi_escape
+    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escape(@str1))
+    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escape(@str1).ascii_only?) if defined?(::Encoding)
+  end
+
+  def test_cgi_escape_with_unreserved_characters
+    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
+                 CGI.escape("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"),
+                 "should not escape any unreserved characters, as per RFC3986 Section 2.3")
+  end
+
+  def test_cgi_escape_with_invalid_byte_sequence
+    assert_equal('%C0%3C%3C', CGI.escape("\xC0\<\<".dup.force_encoding("UTF-8")))
+  end
+
+  def test_cgi_escape_preserve_encoding
+    assert_equal(Encoding::US_ASCII, CGI.escape("\xC0\<\<".dup.force_encoding("US-ASCII")).encoding)
+    assert_equal(Encoding::ASCII_8BIT, CGI.escape("\xC0\<\<".dup.force_encoding("ASCII-8BIT")).encoding)
+    assert_equal(Encoding::UTF_8, CGI.escape("\xC0\<\<".dup.force_encoding("UTF-8")).encoding)
+  end
+
+  def test_cgi_unescape
+    str = CGI.unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
+    assert_equal(@str1, str)
+    return unless defined?(::Encoding)
+
+    assert_equal(@str1.encoding, str.encoding)
+    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
+  end
+
+  def test_cgi_unescape_preserve_encoding
+    assert_equal(Encoding::US_ASCII, CGI.unescape("%C0%3C%3C".dup.force_encoding("US-ASCII")).encoding)
+    assert_equal(Encoding::ASCII_8BIT, CGI.unescape("%C0%3C%3C".dup.force_encoding("ASCII-8BIT")).encoding)
+    assert_equal(Encoding::UTF_8, CGI.unescape("%C0%3C%3C".dup.force_encoding("UTF-8")).encoding)
+  end
+
+  def test_cgi_unescape_accept_charset
+    return unless defined?(::Encoding)
+
+    assert_raise(TypeError) {CGI.unescape('', nil)}
+    assert_separately(%w[-rcgi/escape], "#{<<-"begin;"}\n#{<<-"end;"}")
+    begin;
+      assert_equal("", CGI.unescape(''))
+    end;
+  end
+
+  def test_cgi_escapeURIComponent
+    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escapeURIComponent(@str1))
+    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escapeURIComponent(@str1).ascii_only?) if defined?(::Encoding)
+  end
+
+  def test_cgi_escape_uri_component
+    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escape_uri_component(@str1))
+  end
+
+  def test_cgi_escapeURIComponent_with_unreserved_characters
+    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
+                 CGI.escapeURIComponent("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"),
+                 "should not encode any unreserved characters, as per RFC3986 Section 2.3")
+  end
+
+  def test_cgi_escapeURIComponent_with_invalid_byte_sequence
+    assert_equal('%C0%3C%3C', CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("UTF-8")))
+  end
+
+  def test_cgi_escapeURIComponent_preserve_encoding
+    assert_equal(Encoding::US_ASCII, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("US-ASCII")).encoding)
+    assert_equal(Encoding::ASCII_8BIT, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("ASCII-8BIT")).encoding)
+    assert_equal(Encoding::UTF_8, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("UTF-8")).encoding)
+  end
+
+  def test_cgi_unescapeURIComponent
+    str = CGI.unescapeURIComponent('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
+    assert_equal(@str1, str)
+    return unless defined?(::Encoding)
+
+    assert_equal("foo+bar", CGI.unescapeURIComponent("foo+bar"))
+
+    assert_equal(@str1.encoding, str.encoding)
+    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescapeURIComponent("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
+  end
+
+  def test_cgi_unescape_uri_component
+    str = CGI.unescape_uri_component('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
+    assert_equal(@str1, str)
+  end
+
+  def test_cgi_unescapeURIComponent_preserve_encoding
+    assert_equal(Encoding::US_ASCII, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("US-ASCII")).encoding)
+    assert_equal(Encoding::ASCII_8BIT, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("ASCII-8BIT")).encoding)
+    assert_equal(Encoding::UTF_8, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("UTF-8")).encoding)
+  end
+
+  def test_cgi_unescapeURIComponent_accept_charset
+    return unless defined?(::Encoding)
+
+    assert_raise(TypeError) {CGI.unescapeURIComponent('', nil)}
+    assert_separately(%w[-rcgi/escape], "#{<<-"begin;"}\n#{<<-"end;"}")
+    begin;
+      assert_equal("", CGI.unescapeURIComponent(''))
+    end;
+  end
+
+  def test_cgi_escapeHTML
+    assert_equal("&#39;&amp;&quot;&gt;&lt;", CGI.escapeHTML("'&\"><"))
+  end
+
+  def test_cgi_escape_html_duplicated
+    orig = "Ruby".dup.force_encoding("US-ASCII")
+    str = CGI.escapeHTML(orig)
+    assert_equal(orig, str)
+    assert_not_same(orig, str)
+  end
+
+  def assert_cgi_escape_html_preserve_encoding(str, encoding)
+    assert_equal(encoding, CGI.escapeHTML(str.dup.force_encoding(encoding)).encoding)
+  end
+
+  def test_cgi_escape_html_preserve_encoding
+    Encoding.list do |enc|
+      assert_cgi_escape_html_preserve_encoding("'&\"><", enc)
+      assert_cgi_escape_html_preserve_encoding("Ruby", enc)
+    end
+  end
+
+  def test_cgi_escape_html_dont_freeze
+    assert_not_predicate CGI.escapeHTML("'&\"><".dup),    :frozen?
+    assert_not_predicate CGI.escapeHTML("'&\"><".freeze), :frozen?
+    assert_not_predicate CGI.escapeHTML("Ruby".dup),      :frozen?
+    assert_not_predicate CGI.escapeHTML("Ruby".freeze),   :frozen?
+  end
+
+  def test_cgi_escape_html_large
+    return if RUBY_ENGINE == 'jruby'
+    ulong_max, size_max = RbConfig::LIMITS.values_at("ULONG_MAX", "SIZE_MAX")
+    return unless ulong_max < size_max # Platforms not concerned
+
+    size = (ulong_max / 6 + 1)
+    begin
+      str = '"' * size
+      escaped = CGI.escapeHTML(str)
+    rescue NoMemoryError
+      omit "Not enough memory"
+    rescue => e
+    end
+    assert_raise_with_message(ArgumentError, /overflow/, ->{"length = #{escaped.length}"}) do
+      raise e if e
+    end
+  end
+
+  def test_cgi_unescapeHTML
+    assert_equal("'&\"><", CGI.unescapeHTML("&#39;&amp;&quot;&gt;&lt;"))
+  end
+
+  def test_cgi_unescapeHTML_invalid
+    assert_equal('&<&amp>&quot&abcdefghijklmn', CGI.unescapeHTML('&&lt;&amp&gt;&quot&abcdefghijklmn'))
+  end
+
+  module UnescapeHTMLTests
+    def test_cgi_unescapeHTML_following_known_first_letter
+      assert_equal('&a>&q>&l>&g>', CGI.unescapeHTML('&a&gt;&q&gt;&l&gt;&g&gt;'))
+    end
+
+    def test_cgi_unescapeHTML_following_number_sign
+      assert_equal('&#>&#x>', CGI.unescapeHTML('&#&gt;&#x&gt;'))
+    end
+
+    def test_cgi_unescapeHTML_following_invalid_numeric
+      assert_equal('&#1114112>&#x110000>', CGI.unescapeHTML('&#1114112&gt;&#x110000&gt;'))
+    end
+  end
+
+  include UnescapeHTMLTests
+
+  Encoding.list.each do |enc|
+    begin
+      escaped = "&#39;&amp;&quot;&gt;&lt;".encode(enc)
+      unescaped = "'&\"><".encode(enc)
+    rescue Encoding::ConverterNotFoundError
+      next
+    else
+      define_method("test_cgi_escapeHTML:#{enc.name}") do
+        assert_equal(escaped, CGI.escapeHTML(unescaped))
+      end
+      define_method("test_cgi_unescapeHTML:#{enc.name}") do
+        assert_equal(unescaped, CGI.unescapeHTML(escaped))
+      end
+    end
+  end
+
+  Encoding.list.each do |enc|
+    next unless enc.ascii_compatible?
+    begin
+      escaped = "%25+%2B"
+      unescaped = "% +".encode(enc)
+    rescue Encoding::ConverterNotFoundError
+      next
+    else
+      define_method("test_cgi_escape:#{enc.name}") do
+        assert_equal(escaped, CGI.escape(unescaped))
+      end
+      define_method("test_cgi_unescape:#{enc.name}") do
+        assert_equal(unescaped, CGI.unescape(escaped, enc))
+      end
+    end
+  end
+
+  def test_cgi_unescapeHTML_uppercasecharacter
+    assert_equal("\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86", CGI.unescapeHTML("&#x3042;&#x3044;&#X3046;"))
+  end
+
+  def test_cgi_include_escape
+    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', escape(@str1))
+  end
+
+  def test_cgi_include_escapeHTML
+    assert_equal("&#39;&amp;&quot;&gt;&lt;", escapeHTML("'&\"><"))
+  end
+
+  def test_cgi_include_h
+    assert_equal("&#39;&amp;&quot;&gt;&lt;", h("'&\"><"))
+  end
+
+  def test_cgi_include_unescape
+    str = unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
+    assert_equal(@str1, str)
+    return unless defined?(::Encoding)
+
+    assert_equal(@str1.encoding, str.encoding)
+    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
+  end
+
+  def test_cgi_include_unescapeHTML
+    assert_equal("'&\"><", unescapeHTML("&#39;&amp;&quot;&gt;&lt;"))
+  end
+
+  def test_cgi_escapeElement
+    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', "A", "IMG"))
+    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"]))
+    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', "A", "IMG"))
+    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', ["A", "IMG"]))
+
+    assert_equal("&lt;A &lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<A <A HREF="url"></A>', "A", "IMG"))
+    assert_equal("&lt;A &lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<A <A HREF="url"></A>', ["A", "IMG"]))
+    assert_equal("&lt;A &lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<A <A HREF="url"></A>', "A", "IMG"))
+    assert_equal("&lt;A &lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<A <A HREF="url"></A>', ["A", "IMG"]))
+
+    assert_equal("&lt;A &lt;A ", escapeElement('<A <A ', "A", "IMG"))
+    assert_equal("&lt;A &lt;A ", escapeElement('<A <A ', ["A", "IMG"]))
+  end
+
+
+  def test_cgi_unescapeElement
+    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
+    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
+    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
+    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
+
+    assert_equal('<A <A HREF="url"></A>', unescapeElement(escapeHTML('<A <A HREF="url"></A>'), "A", "IMG"))
+    assert_equal('<A <A HREF="url"></A>', unescapeElement(escapeHTML('<A <A HREF="url"></A>'), ["A", "IMG"]))
+    assert_equal('<A <A HREF="url"></A>', unescape_element(escapeHTML('<A <A HREF="url"></A>'), "A", "IMG"))
+    assert_equal('<A <A HREF="url"></A>', unescape_element(escapeHTML('<A <A HREF="url"></A>'), ["A", "IMG"]))
+
+    assert_equal('<A <A ', unescapeElement(escapeHTML('<A <A '), "A", "IMG"))
+    assert_equal('<A <A ', unescapeElement(escapeHTML('<A <A '), ["A", "IMG"]))
+    assert_equal('<A <A ', unescape_element(escapeHTML('<A <A '), "A", "IMG"))
+    assert_equal('<A <A ', unescape_element(escapeHTML('<A <A '), ["A", "IMG"]))
+  end
+end
+
+class CGIEscapePureRubyTest < Test::Unit::TestCase
+  def setup
+    CGI::EscapeExt.module_eval do
+      alias _escapeHTML escapeHTML
+      remove_method :escapeHTML
+      alias _unescapeHTML unescapeHTML
+      remove_method :unescapeHTML
+    end if defined?(CGI::EscapeExt) and CGI::EscapeExt.method_defined?(:escapeHTML)
+  end
+
+  def teardown
+    CGI::EscapeExt.module_eval do
+      alias escapeHTML _escapeHTML
+      remove_method :_escapeHTML
+      alias unescapeHTML _unescapeHTML
+      remove_method :_unescapeHTML
+    end if defined?(CGI::EscapeExt) and CGI::EscapeExt.method_defined?(:_escapeHTML)
+  end
+
+  include CGIEscapeTest::UnescapeHTMLTests
+
+  def test_cgi_escapeHTML_with_invalid_byte_sequence
+    assert_equal("&lt;\xA4??&gt;", CGI.escapeHTML(%[<\xA4??>]))
+  end
+
+  def test_cgi_unescapeHTML_with_invalid_byte_sequence
+    input = "\xFF&"
+    assert_equal(input, CGI.unescapeHTML(input))
+  end
+end
diff --git a/test/mri/cgi/test_cgi_header.rb b/test/mri/cgi/test_cgi_header.rb
deleted file mode 100644
index ec2f4deb72b..00000000000
--- a/test/mri/cgi/test_cgi_header.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'time'
-require_relative 'update_env'
-
-
-class CGIHeaderTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    update_env(
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-      'REQUEST_METHOD'  => 'GET',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-    )
-  end
-
-
-  def teardown
-    ENV.update(@environ)
-  end
-
-
-  def test_cgi_http_header_simple
-    cgi = CGI.new
-    ## default content type
-    expected = "Content-Type: text/html\r\n\r\n"
-    actual = cgi.http_header
-    assert_equal(expected, actual)
-    ## content type specified as string
-    expected = "Content-Type: text/xhtml; charset=utf8\r\n\r\n"
-    actual = cgi.http_header('text/xhtml; charset=utf8')
-    assert_equal(expected, actual)
-    ## content type specified as hash
-    expected = "Content-Type: image/png\r\n\r\n"
-    actual = cgi.http_header('type'=>'image/png')
-    assert_equal(expected, actual)
-    ## charset specified
-    expected = "Content-Type: text/html; charset=utf8\r\n\r\n"
-    actual = cgi.http_header('charset'=>'utf8')
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_http_header_complex
-    cgi = CGI.new
-    options = {
-      'type'       => 'text/xhtml',
-      'charset'    => 'utf8',
-      'status'     => 'REDIRECT',
-      'server'     => 'webrick',
-      'connection' => 'close',
-      'length'     => 123,
-      'language'   => 'ja',
-      'expires'    => Time.gm(2000, 1, 23, 12, 34, 56),
-      'location'   => 'http://www.ruby-lang.org/',
-    }
-    expected =  "Status: 302 Found\r\n".dup
-    expected << "Server: webrick\r\n"
-    expected << "Connection: close\r\n"
-    expected << "Content-Type: text/xhtml; charset=utf8\r\n"
-    expected << "Content-Length: 123\r\n"
-    expected << "Content-Language: ja\r\n"
-    expected << "Expires: Sun, 23 Jan 2000 12:34:56 GMT\r\n"
-    expected << "location: http://www.ruby-lang.org/\r\n"
-    expected << "\r\n"
-    actual = cgi.http_header(options)
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_http_header_argerr
-    cgi = CGI.new
-    expected = ArgumentError
-
-    assert_raise(expected) do
-      cgi.http_header(nil)
-    end
-  end
-
-
-  def test_cgi_http_header_cookie
-    cgi = CGI.new
-    cookie1 = CGI::Cookie.new('name1', 'abc', '123')
-    cookie2 = CGI::Cookie.new('name'=>'name2', 'value'=>'value2', 'secure'=>true)
-    ctype = "Content-Type: text/html\r\n"
-    sep   = "\r\n"
-    c1    = "Set-Cookie: name1=abc&123; path=\r\n"
-    c2    = "Set-Cookie: name2=value2; path=; secure\r\n"
-    ## CGI::Cookie object
-    actual = cgi.http_header('cookie'=>cookie1)
-    expected = ctype + c1 + sep
-    assert_equal(expected, actual)
-    ## String
-    actual = cgi.http_header('cookie'=>cookie2.to_s)
-    expected = ctype + c2 + sep
-    assert_equal(expected, actual)
-    ## Array
-    actual = cgi.http_header('cookie'=>[cookie1, cookie2])
-    expected = ctype + c1 + c2 + sep
-    assert_equal(expected, actual)
-    ## Hash
-    actual = cgi.http_header('cookie'=>{'name1'=>cookie1, 'name2'=>cookie2})
-    expected = ctype + c1 + c2 + sep
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_http_header_output_cookies
-    cgi = CGI.new
-    ## output cookies
-    cookies = [ CGI::Cookie.new('name1', 'abc', '123'),
-                CGI::Cookie.new('name'=>'name2', 'value'=>'value2', 'secure'=>true),
-              ]
-    cgi.instance_variable_set('@output_cookies', cookies)
-    expected =  "Content-Type: text/html; charset=utf8\r\n".dup
-    expected << "Set-Cookie: name1=abc&123; path=\r\n"
-    expected << "Set-Cookie: name2=value2; path=; secure\r\n"
-    expected << "\r\n"
-    ## header when string
-    actual = cgi.http_header('text/html; charset=utf8')
-    assert_equal(expected, actual)
-    ## _header_for_string
-    actual = cgi.http_header('type'=>'text/html', 'charset'=>'utf8')
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_http_header_nph
-    time_start = Time.now.to_i
-    cgi = CGI.new
-    ## 'nph' is true
-    ENV['SERVER_SOFTWARE'] = 'Apache 2.2.0'
-    actual1 = cgi.http_header('nph'=>true)
-    ## when old IIS, NPH-mode is forced
-    ENV['SERVER_SOFTWARE'] = 'IIS/4.0'
-    actual2 = cgi.http_header
-    actual3 = cgi.http_header('status'=>'REDIRECT', 'location'=>'http://www.example.com/')
-    ## newer IIS doesn't require NPH-mode   ## [ruby-dev:30537]
-    ENV['SERVER_SOFTWARE'] = 'IIS/5.0'
-    actual4 = cgi.http_header
-    actual5 = cgi.http_header('status'=>'REDIRECT', 'location'=>'http://www.example.com/')
-    time_end = Time.now.to_i
-    date = /^Date: ([A-Z][a-z]{2}, \d{2} [A-Z][a-z]{2} \d{4} \d\d:\d\d:\d\d GMT)\r\n/
-    [actual1, actual2, actual3].each do |actual|
-      assert_match(date, actual)
-      assert_include(time_start..time_end, date =~ actual && Time.parse($1).to_i)
-      actual.sub!(date, "Date: DATE_IS_REMOVED\r\n")
-    end
-    ## assertion
-    expected =  "HTTP/1.1 200 OK\r\n".dup
-    expected << "Date: DATE_IS_REMOVED\r\n"
-    expected << "Server: Apache 2.2.0\r\n"
-    expected << "Connection: close\r\n"
-    expected << "Content-Type: text/html\r\n"
-    expected << "\r\n"
-    assert_equal(expected, actual1)
-    expected.sub!(/^Server: .*?\r\n/, "Server: IIS/4.0\r\n")
-    assert_equal(expected, actual2)
-    expected.sub!(/^HTTP\/1.1 200 OK\r\n/, "HTTP/1.1 302 Found\r\n")
-    expected.sub!(/\r\n\r\n/, "\r\nlocation: http://www.example.com/\r\n\r\n")
-    assert_equal(expected, actual3)
-    expected =  "Content-Type: text/html\r\n".dup
-    expected << "\r\n"
-    assert_equal(expected, actual4)
-    expected =  "Status: 302 Found\r\n".dup
-    expected << "Content-Type: text/html\r\n"
-    expected << "location: http://www.example.com/\r\n"
-    expected << "\r\n"
-    assert_equal(expected, actual5)
-  ensure
-    ENV.delete('SERVER_SOFTWARE')
-  end
-
-
-  def test_cgi_http_header_crlf_injection
-    cgi = CGI.new
-    assert_raise(RuntimeError) { cgi.http_header("text/xhtml\r\nBOO") }
-    assert_raise(RuntimeError) { cgi.http_header("type" => "text/xhtml\r\nBOO") }
-    assert_raise(RuntimeError) { cgi.http_header("status" => "200 OK\r\nBOO") }
-    assert_raise(RuntimeError) { cgi.http_header("location" => "text/xhtml\r\nBOO") }
-  end
-
-
-  instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
diff --git a/test/mri/cgi/test_cgi_modruby.rb b/test/mri/cgi/test_cgi_modruby.rb
deleted file mode 100644
index 90132962b5a..00000000000
--- a/test/mri/cgi/test_cgi_modruby.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require_relative 'update_env'
-
-
-class CGIModrubyTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    update_env(
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-      'REQUEST_METHOD'  => 'GET',
-      #'QUERY_STRING'    => 'a=foo&b=bar',
-    )
-    CGI.class_eval { const_set(:MOD_RUBY, true) }
-    Apache._reset()
-    #@cgi = CGI.new
-    #@req = Apache.request
-  end
-
-
-  def teardown
-    ENV.update(@environ)
-    CGI.class_eval { remove_const(:MOD_RUBY) }
-  end
-
-
-  def test_cgi_modruby_simple
-    req = Apache.request
-    cgi = CGI.new
-    assert(req._setup_cgi_env_invoked?)
-    assert(! req._send_http_header_invoked?)
-    actual = cgi.http_header
-    assert_equal('', actual)
-    assert_equal('text/html', req.content_type)
-    assert(req._send_http_header_invoked?)
-  end
-
-
-  def test_cgi_modruby_complex
-    req = Apache.request
-    cgi = CGI.new
-    options = {
-      'status'   => 'FORBIDDEN',
-      'location' => 'http://www.example.com/',
-      'type'     => 'image/gif',
-      'content-encoding' => 'deflate',
-      'cookie'   => [ CGI::Cookie.new('name1', 'abc', '123'),
-                      CGI::Cookie.new('name'=>'name2', 'value'=>'value2', 'secure'=>true),
-                    ],
-    }
-    assert(req._setup_cgi_env_invoked?)
-    assert(! req._send_http_header_invoked?)
-    actual = cgi.http_header(options)
-    assert_equal('', actual)
-    assert_equal('image/gif', req.content_type)
-    assert_equal('403 Forbidden', req.status_line)
-    assert_equal(403, req.status)
-    assert_equal('deflate', req.content_encoding)
-    assert_equal('http://www.example.com/', req.headers_out['location'])
-    assert_equal(["name1=abc&123; path=", "name2=value2; path=; secure"],
-                 req.headers_out['Set-Cookie'])
-    assert(req._send_http_header_invoked?)
-  end
-
-
-  def test_cgi_modruby_location
-    req = Apache.request
-    cgi = CGI.new
-    options = {
-      'status'   => '200 OK',
-      'location' => 'http://www.example.com/',
-    }
-    cgi.http_header(options)
-    assert_equal('200 OK', req.status_line)  # should be '302 Found' ?
-    assert_equal(302, req.status)
-    assert_equal('http://www.example.com/', req.headers_out['location'])
-  end
-
-
-  def test_cgi_modruby_requestparams
-    req = Apache.request
-    req.args = 'a=foo&b=bar'
-    cgi = CGI.new
-    assert_equal('foo', cgi['a'])
-    assert_equal('bar', cgi['b'])
-  end
-
-
-  instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
-
-
-
-## dummy class for mod_ruby
-class Apache  #:nodoc:
-
-  def self._reset
-    @request = Request.new
-  end
-
-  def self.request
-    return @request
-  end
-
-  class Request
-
-    def initialize
-      hash = {}
-      def hash.add(name, value)
-        (self[name] ||= []) << value
-      end
-      @http_header = nil
-      @headers_out  = hash
-      @status_line  = nil
-      @status       = nil
-      @content_type = nil
-      @content_encoding = nil
-    end
-    attr_accessor :headers_out, :status_line, :status, :content_type, :content_encoding
-
-    attr_accessor :args
-    #def args
-    #  return ENV['QUERY_STRING']
-    #end
-
-    def send_http_header
-      @http_header = '*invoked*'
-    end
-    def _send_http_header_invoked?
-      @http_header ? true : false
-    end
-
-    def setup_cgi_env
-      @cgi_env = '*invoked*'
-    end
-    def _setup_cgi_env_invoked?
-      @cgi_env ? true : false
-    end
-
-  end
-
-end
diff --git a/test/mri/cgi/test_cgi_multipart.rb b/test/mri/cgi/test_cgi_multipart.rb
deleted file mode 100644
index 5e8ec253901..00000000000
--- a/test/mri/cgi/test_cgi_multipart.rb
+++ /dev/null
@@ -1,385 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'tempfile'
-require 'stringio'
-require_relative 'update_env'
-
-
-##
-## usage:
-##   boundary = 'foobar1234'  # or nil
-##   multipart = MultiPart.new(boundary)
-##   multipart.append('name1', 'value1')
-##   multipart.append('file1', File.read('file1.html'), 'file1.html')
-##   str = multipart.close()
-##   str.each_line {|line| p line }
-##   ## output:
-##   # "--foobar1234\r\n"
-##   # "Content-Disposition: form-data: name=\"name1\"\r\n"
-##   # "\r\n"
-##   # "value1\r\n"
-##   # "--foobar1234\r\n"
-##   # "Content-Disposition: form-data: name=\"file1\"; filename=\"file1.html\"\r\n"
-##   # "Content-Type: text/html\r\n"
-##   # "\r\n"
-##   # "<html>\n"
-##   # "<body><p>Hello</p></body>\n"
-##   # "</html>\n"
-##   # "\r\n"
-##   # "--foobar1234--\r\n"
-##
-class MultiPart
-
-  def initialize(boundary=nil)
-    @boundary = boundary || create_boundary()
-    @buf = ''.dup
-    @buf.force_encoding(::Encoding::ASCII_8BIT) if defined?(::Encoding)
-  end
-  attr_reader :boundary
-
-  def append(name, value, filename=nil, content_type=nil)
-    content_type = detect_content_type(filename) if filename && content_type.nil?
-    s = filename ? "; filename=\"#{filename}\"" : ''
-    buf = @buf
-    buf << "--#{boundary}\r\n"
-    buf << "Content-Disposition: form-data: name=\"#{name}\"#{s}\r\n"
-    buf << "Content-Type: #{content_type}\r\n" if content_type
-    buf << "\r\n"
-    buf << value.b
-    buf << "\r\n"
-    return self
-  end
-
-  def close
-    buf = @buf
-    @buf = ''.dup
-    return buf << "--#{boundary}--\r\n"
-  end
-
-  def create_boundary()  #:nodoc:
-    return "--boundary#{rand().to_s[2..-1]}"
-  end
-
-  def detect_content_type(filename)   #:nodoc:
-    filename =~ /\.(\w+)\z/
-    return MIME_TYPES[$1] || 'application/octet-stream'
-  end
-
-  MIME_TYPES = {
-    'gif'      =>  'image/gif',
-    'jpg'      =>  'image/jpeg',
-    'jpeg'     =>  'image/jpeg',
-    'png'      =>  'image/png',
-    'bmp'      =>  'image/bmp',
-    'tif'      =>  'image/tiff',
-    'tiff'     =>  'image/tiff',
-    'htm'      =>  'text/html',
-    'html'     =>  'text/html',
-    'xml'      =>  'text/xml',
-    'txt'      =>  'text/plain',
-    'text'     =>  'text/plain',
-    'css'      =>  'text/css',
-    'mpg'      =>  'video/mpeg',
-    'mpeg'     =>  'video/mpeg',
-    'mov'      =>  'video/quicktime',
-    'avi'      =>  'video/x-msvideo',
-    'mp3'      =>  'audio/mpeg',
-    'mid'      =>  'audio/midi',
-    'wav'      =>  'audio/x-wav',
-    'zip'      =>  'application/zip',
-    #'tar.gz'   =>  'application/gtar',
-    'gz'       =>  'application/gzip',
-    'bz2'      =>  'application/bzip2',
-    'rtf'      =>  'application/rtf',
-    'pdf'      =>  'application/pdf',
-    'ps'       =>  'application/postscript',
-    'js'       =>  'application/x-javascript',
-    'xls'      =>  'application/vnd.ms-excel',
-    'doc'      =>  'application/msword',
-    'ppt'      =>  'application/vnd.ms-powerpoint',
-  }
-
-end
-
-
-
-class CGIMultipartTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    update_env(
-      'REQUEST_METHOD' => 'POST',
-      'CONTENT_TYPE' => nil,
-      'CONTENT_LENGTH' => nil,
-    )
-    @tempfiles = []
-  end
-
-  def teardown
-    ENV.update(@environ)
-    $stdin.close() if $stdin.is_a?(Tempfile)
-    $stdin = STDIN
-    @tempfiles.each {|t|
-      t.close!
-    }
-  end
-
-  def _prepare(data)
-    ## create multipart input
-    multipart = MultiPart.new(defined?(@boundary) ? @boundary : nil)
-    data.each do |hash|
-      multipart.append(hash[:name], hash[:value], hash[:filename])
-    end
-    input = multipart.close()
-    input = yield(input) if block_given?
-    #$stderr.puts "*** debug: input=\n#{input.collect{|line| line.inspect}.join("\n")}"
-    @boundary ||= multipart.boundary
-    ## set environment
-    ENV['CONTENT_TYPE'] = "multipart/form-data; boundary=#{@boundary}"
-    ENV['CONTENT_LENGTH'] = input.length.to_s
-    ENV['REQUEST_METHOD'] = 'POST'
-    ## set $stdin
-    tmpfile = Tempfile.new('test_cgi_multipart')
-    @tempfiles << tmpfile
-    tmpfile.binmode
-    tmpfile << input
-    tmpfile.rewind()
-    $stdin = tmpfile
-  end
-
-  def _test_multipart(cgi_options={})
-    caller(0).find {|s| s =~ /in `test_(.*?)'/ }
-    #testname = $1
-    #$stderr.puts "*** debug: testname=#{testname.inspect}"
-    _prepare(@data)
-    options = {:accept_charset=>"UTF-8"}
-    options.merge! cgi_options
-    cgi = CGI.new(options)
-    expected_names = @data.collect{|hash| hash[:name] }.sort
-    assert_equal(expected_names, cgi.params.keys.sort)
-    threshold = 1024*10
-    @data.each do |hash|
-      name = hash[:name]
-      expected = hash[:value]
-      if hash[:filename] #if file
-        expected_class = @expected_class || (hash[:value].length < threshold ? StringIO : Tempfile)
-        assert(cgi.files.keys.member?(hash[:name]))
-      else
-        expected_class = String
-        assert_equal(expected, cgi[name])
-        assert_equal(false,cgi.files.keys.member?(hash[:name]))
-      end
-      assert_kind_of(expected_class, cgi[name])
-      assert_equal(expected, cgi[name].read())
-      assert_equal(hash[:filename] || '', cgi[name].original_filename)  #if hash[:filename]
-      assert_equal(hash[:content_type] || '', cgi[name].content_type)  #if hash[:content_type]
-    end
-  ensure
-    if cgi
-      cgi.params.each {|name, vals|
-        vals.each {|val|
-          if val.kind_of?(Tempfile) && val.path
-            val.close!
-          end
-        }
-      }
-    end
-  end
-
-
-  def _read(basename)
-    filename = File.join(File.dirname(__FILE__), 'testdata', basename)
-    s = File.open(filename, 'rb') {|f| f.read() }
-
-    return s
-  end
-
-
-  def test_cgi_multipart_stringio
-    @boundary = '----WebKitFormBoundaryAAfvAII+YL9102cX'
-    @data = [
-      {:name=>'hidden1', :value=>'foobar'},
-      {:name=>'text1',   :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".dup},
-      {:name=>'file1',   :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-      {:name=>'image1',  :value=>_read('small.png'),
-       :filename=>'small.png',  :content_type=>'image/png'},  # small image
-    ]
-    @data[1][:value].force_encoding(::Encoding::UTF_8) if defined?(::Encoding)
-    @expected_class = StringIO
-    _test_multipart()
-  end
-
-
-  def test_cgi_multipart_tempfile
-    @boundary = '----WebKitFormBoundaryAAfvAII+YL9102cX'
-    @data = [
-      {:name=>'hidden1', :value=>'foobar'},
-      {:name=>'text1',   :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".dup},
-      {:name=>'file1',   :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-      {:name=>'image1',  :value=>_read('large.png'),
-       :filename=>'large.png',  :content_type=>'image/png'},  # large image
-    ]
-    @data[1][:value].force_encoding(::Encoding::UTF_8) if defined?(::Encoding)
-    @expected_class = Tempfile
-    _test_multipart()
-  end
-
-
-  def _set_const(klass, name, value)
-    old = nil
-    klass.class_eval do
-      old = const_get(name)
-      remove_const(name)
-      const_set(name, value)
-    end
-    return old
-  end
-
-
-  def test_cgi_multipart_maxmultipartlength
-    @data = [
-      {:name=>'image1', :value=>_read('large.png'),
-       :filename=>'large.png', :content_type=>'image/png'},  # large image
-    ]
-    begin
-      ex = assert_raise(StandardError) do
-        _test_multipart(:max_multipart_length=>2 * 1024) # set via simple scalar
-      end
-      assert_equal("too large multipart data.", ex.message)
-    ensure
-    end
-  end
-
-
-  def test_cgi_multipart_maxmultipartlength_lambda
-    @data = [
-      {:name=>'image1', :value=>_read('large.png'),
-       :filename=>'large.png', :content_type=>'image/png'},  # large image
-    ]
-    begin
-      ex = assert_raise(StandardError) do
-        _test_multipart(:max_multipart_length=>lambda{2*1024}) # set via lambda
-      end
-      assert_equal("too large multipart data.", ex.message)
-    ensure
-    end
-  end
-
-
-  def test_cgi_multipart_maxmultipartcount
-    @data = [
-      {:name=>'file1', :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-    ]
-    item = @data.first
-    500.times { @data << item }
-    #original = _set_const(CGI, :MAX_MULTIPART_COUNT, 128)
-    begin
-      ex = assert_raise(StandardError) do
-        _test_multipart()
-      end
-      assert_equal("too many parameters.", ex.message)
-    ensure
-      #_set_const(CGI, :MAX_MULTIPART_COUNT, original)
-    end
-  end if CGI.const_defined?(:MAX_MULTIPART_COUNT)
-
-
-  def test_cgi_multipart_badbody   ## [ruby-dev:28470]
-    @data = [
-      {:name=>'file1', :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-    ]
-    _prepare(@data) do |input|
-      input2 = input.sub(/--(\r\n)?\z/, "\r\n")
-      assert input2 != input
-      #p input2
-      input2
-    end
-    ex = assert_raise(EOFError) do
-      CGI.new(:accept_charset=>"UTF-8")
-    end
-    assert_equal("bad content body", ex.message)
-    #
-    _prepare(@data) do |input|
-      input2 = input.sub(/--(\r\n)?\z/, "")
-      assert input2 != input
-      #p input2
-      input2
-    end
-    ex = assert_raise(EOFError) do
-      CGI.new(:accept_charset=>"UTF-8")
-    end
-    assert_equal("bad content body", ex.message)
-  end
-
-
-  def test_cgi_multipart_quoteboundary  ## [JVN#84798830]
-    @boundary = '(.|\n)*'
-    @data = [
-      {:name=>'hidden1', :value=>'foobar'},
-      {:name=>'text1',   :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".dup},
-      {:name=>'file1',   :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-      {:name=>'image1',  :value=>_read('small.png'),
-       :filename=>'small.png',  :content_type=>'image/png'},  # small image
-    ]
-    @data[1][:value].force_encoding("UTF-8")
-    _prepare(@data)
-    cgi = CGI.new(:accept_charset=>"UTF-8")
-    assert_equal('file1.html', cgi['file1'].original_filename)
-  end
-
-  def test_cgi_multipart_boundary_10240 # [Bug #3866]
-    @boundary = 'AaB03x'
-    @data = [
-      {:name=>'file',   :value=>"b"*10134,
-       :filename=>'file.txt', :content_type=>'text/plain'},
-      {:name=>'foo',  :value=>"bar"},
-    ]
-    _prepare(@data)
-    cgi = CGI.new(:accept_charset=>"UTF-8")
-    assert_equal(cgi['foo'], 'bar')
-    assert_equal(cgi['file'].read, 'b'*10134)
-    cgi['file'].close! if cgi['file'].kind_of? Tempfile
-  end
-
-  def test_cgi_multipart_without_tempfile
-    assert_in_out_err([], <<-'EOM')
-      require 'cgi'
-      require 'stringio'
-      ENV['REQUEST_METHOD'] = 'POST'
-      ENV['CONTENT_TYPE'] = 'multipart/form-data; boundary=foobar1234'
-      body = <<-BODY.gsub(/\n/, "\r\n")
---foobar1234
-Content-Disposition: form-data: name=\"name1\"
-
-value1
---foobar1234
-Content-Disposition: form-data: name=\"file1\"; filename=\"file1.html\"
-Content-Type: text/html
-
-<html>
-<body><p>Hello</p></body>
-</html>
-
---foobar1234--
-BODY
-      ENV['CONTENT_LENGTH'] = body.size.to_s
-      $stdin = StringIO.new(body)
-      CGI.new
-    EOM
-  end
-
-  ###
-
-  self.instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
diff --git a/test/mri/cgi/test_cgi_session.rb b/test/mri/cgi/test_cgi_session.rb
deleted file mode 100644
index b16b69766e9..00000000000
--- a/test/mri/cgi/test_cgi_session.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'cgi/session'
-require 'cgi/session/pstore'
-require 'stringio'
-require 'tmpdir'
-require_relative 'update_env'
-
-class CGISessionTest < Test::Unit::TestCase
-  include UpdateEnv
-
-  def setup
-    @environ = {}
-    @session_dir = Dir.mktmpdir(%w'session dir')
-  end
-
-  def teardown
-    ENV.update(@environ)
-    $stdout = STDOUT
-    FileUtils.rm_rf(@session_dir)
-  end
-
-  def test_cgi_session_filestore
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-  #    'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-  #    'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    value1="value1"
-    value2="\x8F\xBC\x8D]".dup
-    value2.force_encoding("SJIS") if defined?(::Encoding)
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir)
-    session["key1"]=value1
-    session["key2"]=value2
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-    $stdout = StringIO.new
-    cgi.out{""}
-
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      # 'HTTP_COOKIE'     => "_session_id=#{session_id}",
-      'QUERY_STRING'    => "_session_id=#{session.session_id}",
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir)
-    $stdout = StringIO.new
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-
-  end
-  def test_cgi_session_pstore
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-  #    'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-  #    'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    value1="value1"
-    value2="\x8F\xBC\x8D]".dup
-    value2.force_encoding("SJIS") if defined?(::Encoding)
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"database_manager"=>CGI::Session::PStore)
-    session["key1"]=value1
-    session["key2"]=value2
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-    $stdout = StringIO.new
-    cgi.out{""}
-
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      # 'HTTP_COOKIE'     => "_session_id=#{session_id}",
-      'QUERY_STRING'    => "_session_id=#{session.session_id}",
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"database_manager"=>CGI::Session::PStore)
-    $stdout = StringIO.new
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-  end
-  def test_cgi_session_specify_session_id
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-  #    'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-  #    'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    value1="value1"
-    value2="\x8F\xBC\x8D]".dup
-    value2.force_encoding("SJIS") if defined?(::Encoding)
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"session_id"=>"foo")
-    session["key1"]=value1
-    session["key2"]=value2
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    assert_equal("foo",session.session_id)
-    #session_id=session.session_id
-    session.close
-    $stdout = StringIO.new
-    cgi.out{""}
-
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      # 'HTTP_COOKIE'     => "_session_id=#{session_id}",
-      'QUERY_STRING'    => "_session_id=#{session.session_id}",
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir)
-    $stdout = StringIO.new
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    assert_equal("foo",session.session_id)
-    session.close
-  end
-  def test_cgi_session_specify_session_key
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-  #    'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-  #    'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    value1="value1"
-    value2="\x8F\xBC\x8D]".dup
-    value2.force_encoding("SJIS") if defined?(::Encoding)
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"session_key"=>"bar")
-    session["key1"]=value1
-    session["key2"]=value2
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session_id=session.session_id
-    session.close
-    $stdout = StringIO.new
-    cgi.out{""}
-
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'HTTP_COOKIE'     => "bar=#{session_id}",
-      # 'QUERY_STRING'    => "bar=#{session.session_id}",
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"session_key"=>"bar")
-    $stdout = StringIO.new
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-  end
-end
diff --git a/test/mri/cgi/test_cgi_tag_helper.rb b/test/mri/cgi/test_cgi_tag_helper.rb
deleted file mode 100644
index 0b99dfc1bc4..00000000000
--- a/test/mri/cgi/test_cgi_tag_helper.rb
+++ /dev/null
@@ -1,355 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'stringio'
-require_relative 'update_env'
-
-
-class CGITagHelperTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    #@environ = {
-    #  'SERVER_PROTOCOL' => 'HTTP/1.1',
-    #  'REQUEST_METHOD'  => 'GET',
-    #  'SERVER_SOFTWARE' => 'Apache 2.2.0',
-    #}
-    #ENV.update(@environ)
-  end
-
-
-  def teardown
-    ENV.update(@environ)
-    $stdout = STDOUT
-  end
-
-
-  def test_cgi_tag_helper_html3
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-    )
-    ## html3
-    cgi = CGI.new('html3')
-    assert_equal('<A HREF=""></A>',cgi.a)
-    assert_equal('<A HREF="bar"></A>',cgi.a('bar'))
-    assert_equal('<A HREF="">foo</A>',cgi.a{'foo'})
-    assert_equal('<A HREF="bar">foo</A>',cgi.a('bar'){'foo'})
-    assert_equal('<TT></TT>',cgi.tt)
-    assert_equal('<TT></TT>',cgi.tt('bar'))
-    assert_equal('<TT>foo</TT>',cgi.tt{'foo'})
-    assert_equal('<TT>foo</TT>',cgi.tt('bar'){'foo'})
-    assert_equal('<I></I>',cgi.i)
-    assert_equal('<I></I>',cgi.i('bar'))
-    assert_equal('<I>foo</I>',cgi.i{'foo'})
-    assert_equal('<I>foo</I>',cgi.i('bar'){'foo'})
-    assert_equal('<B></B>',cgi.b)
-    assert_equal('<B></B>',cgi.b('bar'))
-    assert_equal('<B>foo</B>',cgi.b{'foo'})
-    assert_equal('<B>foo</B>',cgi.b('bar'){'foo'})
-    assert_equal('<U></U>',cgi.u)
-    assert_equal('<U></U>',cgi.u('bar'))
-    assert_equal('<U>foo</U>',cgi.u{'foo'})
-    assert_equal('<U>foo</U>',cgi.u('bar'){'foo'})
-    assert_equal('<STRIKE></STRIKE>',cgi.strike)
-    assert_equal('<STRIKE></STRIKE>',cgi.strike('bar'))
-    assert_equal('<STRIKE>foo</STRIKE>',cgi.strike{'foo'})
-    assert_equal('<STRIKE>foo</STRIKE>',cgi.strike('bar'){'foo'})
-    assert_equal('<BIG></BIG>',cgi.big)
-    assert_equal('<BIG></BIG>',cgi.big('bar'))
-    assert_equal('<BIG>foo</BIG>',cgi.big{'foo'})
-    assert_equal('<BIG>foo</BIG>',cgi.big('bar'){'foo'})
-    assert_equal('<SMALL></SMALL>',cgi.small)
-    assert_equal('<SMALL></SMALL>',cgi.small('bar'))
-    assert_equal('<SMALL>foo</SMALL>',cgi.small{'foo'})
-    assert_equal('<SMALL>foo</SMALL>',cgi.small('bar'){'foo'})
-    assert_equal('<SUB></SUB>',cgi.sub)
-    assert_equal('<SUB></SUB>',cgi.sub('bar'))
-    assert_equal('<SUB>foo</SUB>',cgi.sub{'foo'})
-    assert_equal('<SUB>foo</SUB>',cgi.sub('bar'){'foo'})
-    assert_equal('<SUP></SUP>',cgi.sup)
-    assert_equal('<SUP></SUP>',cgi.sup('bar'))
-    assert_equal('<SUP>foo</SUP>',cgi.sup{'foo'})
-    assert_equal('<SUP>foo</SUP>',cgi.sup('bar'){'foo'})
-    assert_equal('<EM></EM>',cgi.em)
-    assert_equal('<EM></EM>',cgi.em('bar'))
-    assert_equal('<EM>foo</EM>',cgi.em{'foo'})
-    assert_equal('<EM>foo</EM>',cgi.em('bar'){'foo'})
-    assert_equal('<STRONG></STRONG>',cgi.strong)
-    assert_equal('<STRONG></STRONG>',cgi.strong('bar'))
-    assert_equal('<STRONG>foo</STRONG>',cgi.strong{'foo'})
-    assert_equal('<STRONG>foo</STRONG>',cgi.strong('bar'){'foo'})
-    assert_equal('<DFN></DFN>',cgi.dfn)
-    assert_equal('<DFN></DFN>',cgi.dfn('bar'))
-    assert_equal('<DFN>foo</DFN>',cgi.dfn{'foo'})
-    assert_equal('<DFN>foo</DFN>',cgi.dfn('bar'){'foo'})
-    assert_equal('<CODE></CODE>',cgi.code)
-    assert_equal('<CODE></CODE>',cgi.code('bar'))
-    assert_equal('<CODE>foo</CODE>',cgi.code{'foo'})
-    assert_equal('<CODE>foo</CODE>',cgi.code('bar'){'foo'})
-    assert_equal('<SAMP></SAMP>',cgi.samp)
-    assert_equal('<SAMP></SAMP>',cgi.samp('bar'))
-    assert_equal('<SAMP>foo</SAMP>',cgi.samp{'foo'})
-    assert_equal('<SAMP>foo</SAMP>',cgi.samp('bar'){'foo'})
-    assert_equal('<KBD></KBD>',cgi.kbd)
-    assert_equal('<KBD></KBD>',cgi.kbd('bar'))
-    assert_equal('<KBD>foo</KBD>',cgi.kbd{'foo'})
-    assert_equal('<KBD>foo</KBD>',cgi.kbd('bar'){'foo'})
-    assert_equal('<VAR></VAR>',cgi.var)
-    assert_equal('<VAR></VAR>',cgi.var('bar'))
-    assert_equal('<VAR>foo</VAR>',cgi.var{'foo'})
-    assert_equal('<VAR>foo</VAR>',cgi.var('bar'){'foo'})
-    assert_equal('<CITE></CITE>',cgi.cite)
-    assert_equal('<CITE></CITE>',cgi.cite('bar'))
-    assert_equal('<CITE>foo</CITE>',cgi.cite{'foo'})
-    assert_equal('<CITE>foo</CITE>',cgi.cite('bar'){'foo'})
-    assert_equal('<FONT></FONT>',cgi.font)
-    assert_equal('<FONT></FONT>',cgi.font('bar'))
-    assert_equal('<FONT>foo</FONT>',cgi.font{'foo'})
-    assert_equal('<FONT>foo</FONT>',cgi.font('bar'){'foo'})
-    assert_equal('<ADDRESS></ADDRESS>',cgi.address)
-    assert_equal('<ADDRESS></ADDRESS>',cgi.address('bar'))
-    assert_equal('<ADDRESS>foo</ADDRESS>',cgi.address{'foo'})
-    assert_equal('<ADDRESS>foo</ADDRESS>',cgi.address('bar'){'foo'})
-    assert_equal('<DIV></DIV>',cgi.div)
-    assert_equal('<DIV></DIV>',cgi.div('bar'))
-    assert_equal('<DIV>foo</DIV>',cgi.div{'foo'})
-    assert_equal('<DIV>foo</DIV>',cgi.div('bar'){'foo'})
-    assert_equal('<CENTER></CENTER>',cgi.center)
-    assert_equal('<CENTER></CENTER>',cgi.center('bar'))
-    assert_equal('<CENTER>foo</CENTER>',cgi.center{'foo'})
-    assert_equal('<CENTER>foo</CENTER>',cgi.center('bar'){'foo'})
-    assert_equal('<MAP></MAP>',cgi.map)
-    assert_equal('<MAP></MAP>',cgi.map('bar'))
-    assert_equal('<MAP>foo</MAP>',cgi.map{'foo'})
-    assert_equal('<MAP>foo</MAP>',cgi.map('bar'){'foo'})
-    assert_equal('<APPLET></APPLET>',cgi.applet)
-    assert_equal('<APPLET></APPLET>',cgi.applet('bar'))
-    assert_equal('<APPLET>foo</APPLET>',cgi.applet{'foo'})
-    assert_equal('<APPLET>foo</APPLET>',cgi.applet('bar'){'foo'})
-    assert_equal('<PRE></PRE>',cgi.pre)
-    assert_equal('<PRE></PRE>',cgi.pre('bar'))
-    assert_equal('<PRE>foo</PRE>',cgi.pre{'foo'})
-    assert_equal('<PRE>foo</PRE>',cgi.pre('bar'){'foo'})
-    assert_equal('<XMP></XMP>',cgi.xmp)
-    assert_equal('<XMP></XMP>',cgi.xmp('bar'))
-    assert_equal('<XMP>foo</XMP>',cgi.xmp{'foo'})
-    assert_equal('<XMP>foo</XMP>',cgi.xmp('bar'){'foo'})
-    assert_equal('<LISTING></LISTING>',cgi.listing)
-    assert_equal('<LISTING></LISTING>',cgi.listing('bar'))
-    assert_equal('<LISTING>foo</LISTING>',cgi.listing{'foo'})
-    assert_equal('<LISTING>foo</LISTING>',cgi.listing('bar'){'foo'})
-    assert_equal('<DL></DL>',cgi.dl)
-    assert_equal('<DL></DL>',cgi.dl('bar'))
-    assert_equal('<DL>foo</DL>',cgi.dl{'foo'})
-    assert_equal('<DL>foo</DL>',cgi.dl('bar'){'foo'})
-    assert_equal('<OL></OL>',cgi.ol)
-    assert_equal('<OL></OL>',cgi.ol('bar'))
-    assert_equal('<OL>foo</OL>',cgi.ol{'foo'})
-    assert_equal('<OL>foo</OL>',cgi.ol('bar'){'foo'})
-    assert_equal('<UL></UL>',cgi.ul)
-    assert_equal('<UL></UL>',cgi.ul('bar'))
-    assert_equal('<UL>foo</UL>',cgi.ul{'foo'})
-    assert_equal('<UL>foo</UL>',cgi.ul('bar'){'foo'})
-    assert_equal('<DIR></DIR>',cgi.dir)
-    assert_equal('<DIR></DIR>',cgi.dir('bar'))
-    assert_equal('<DIR>foo</DIR>',cgi.dir{'foo'})
-    assert_equal('<DIR>foo</DIR>',cgi.dir('bar'){'foo'})
-    assert_equal('<MENU></MENU>',cgi.menu)
-    assert_equal('<MENU></MENU>',cgi.menu('bar'))
-    assert_equal('<MENU>foo</MENU>',cgi.menu{'foo'})
-    assert_equal('<MENU>foo</MENU>',cgi.menu('bar'){'foo'})
-    assert_equal('<SELECT></SELECT>',cgi.select)
-    assert_equal('<SELECT></SELECT>',cgi.select('bar'))
-    assert_equal('<SELECT>foo</SELECT>',cgi.select{'foo'})
-    assert_equal('<SELECT>foo</SELECT>',cgi.select('bar'){'foo'})
-    assert_equal('<TABLE></TABLE>',cgi.table)
-    assert_equal('<TABLE></TABLE>',cgi.table('bar'))
-    assert_equal('<TABLE>foo</TABLE>',cgi.table{'foo'})
-    assert_equal('<TABLE>foo</TABLE>',cgi.table('bar'){'foo'})
-    assert_equal('<TITLE></TITLE>',cgi.title)
-    assert_equal('<TITLE></TITLE>',cgi.title('bar'))
-    assert_equal('<TITLE>foo</TITLE>',cgi.title{'foo'})
-    assert_equal('<TITLE>foo</TITLE>',cgi.title('bar'){'foo'})
-    assert_equal('<STYLE></STYLE>',cgi.style)
-    assert_equal('<STYLE></STYLE>',cgi.style('bar'))
-    assert_equal('<STYLE>foo</STYLE>',cgi.style{'foo'})
-    assert_equal('<STYLE>foo</STYLE>',cgi.style('bar'){'foo'})
-    assert_equal('<SCRIPT></SCRIPT>',cgi.script)
-    assert_equal('<SCRIPT></SCRIPT>',cgi.script('bar'))
-    assert_equal('<SCRIPT>foo</SCRIPT>',cgi.script{'foo'})
-    assert_equal('<SCRIPT>foo</SCRIPT>',cgi.script('bar'){'foo'})
-    assert_equal('<H1></H1>',cgi.h1)
-    assert_equal('<H1></H1>',cgi.h1('bar'))
-    assert_equal('<H1>foo</H1>',cgi.h1{'foo'})
-    assert_equal('<H1>foo</H1>',cgi.h1('bar'){'foo'})
-    assert_equal('<H2></H2>',cgi.h2)
-    assert_equal('<H2></H2>',cgi.h2('bar'))
-    assert_equal('<H2>foo</H2>',cgi.h2{'foo'})
-    assert_equal('<H2>foo</H2>',cgi.h2('bar'){'foo'})
-    assert_equal('<H3></H3>',cgi.h3)
-    assert_equal('<H3></H3>',cgi.h3('bar'))
-    assert_equal('<H3>foo</H3>',cgi.h3{'foo'})
-    assert_equal('<H3>foo</H3>',cgi.h3('bar'){'foo'})
-    assert_equal('<H4></H4>',cgi.h4)
-    assert_equal('<H4></H4>',cgi.h4('bar'))
-    assert_equal('<H4>foo</H4>',cgi.h4{'foo'})
-    assert_equal('<H4>foo</H4>',cgi.h4('bar'){'foo'})
-    assert_equal('<H5></H5>',cgi.h5)
-    assert_equal('<H5></H5>',cgi.h5('bar'))
-    assert_equal('<H5>foo</H5>',cgi.h5{'foo'})
-    assert_equal('<H5>foo</H5>',cgi.h5('bar'){'foo'})
-    assert_equal('<H6></H6>',cgi.h6)
-    assert_equal('<H6></H6>',cgi.h6('bar'))
-    assert_equal('<H6>foo</H6>',cgi.h6{'foo'})
-    assert_equal('<H6>foo</H6>',cgi.h6('bar'){'foo'})
-    assert_match(/^<TEXTAREA .*><\/TEXTAREA>$/,cgi.textarea)
-    assert_match(/COLS="70"/,cgi.textarea)
-    assert_match(/ROWS="10"/,cgi.textarea)
-    assert_match(/NAME=""/,cgi.textarea)
-    assert_match(/^<TEXTAREA .*><\/TEXTAREA>$/,cgi.textarea("bar"))
-    assert_match(/COLS="70"/,cgi.textarea("bar"))
-    assert_match(/ROWS="10"/,cgi.textarea("bar"))
-    assert_match(/NAME="bar"/,cgi.textarea("bar"))
-    assert_match(/^<TEXTAREA .*>foo<\/TEXTAREA>$/,cgi.textarea{"foo"})
-    assert_match(/COLS="70"/,cgi.textarea{"foo"})
-    assert_match(/ROWS="10"/,cgi.textarea{"foo"})
-    assert_match(/NAME=""/,cgi.textarea{"foo"})
-    assert_match(/^<TEXTAREA .*>foo<\/TEXTAREA>$/,cgi.textarea("bar"){"foo"})
-    assert_match(/COLS="70"/,cgi.textarea("bar"){"foo"})
-    assert_match(/ROWS="10"/,cgi.textarea("bar"){"foo"})
-    assert_match(/NAME="bar"/,cgi.textarea("bar"){"foo"})
-    assert_match(/^<FORM .*><\/FORM>$/,cgi.form)
-    assert_match(/METHOD="post"/,cgi.form)
-    assert_match(/ENCTYPE="application\/x-www-form-urlencoded"/,cgi.form)
-    assert_match(/^<FORM .*><\/FORM>$/,cgi.form("bar"))
-    assert_match(/METHOD="bar"/,cgi.form("bar"))
-    assert_match(/ENCTYPE="application\/x-www-form-urlencoded"/,cgi.form("bar"))
-    assert_match(/^<FORM .*>foo<\/FORM>$/,cgi.form{"foo"})
-    assert_match(/METHOD="post"/,cgi.form{"foo"})
-    assert_match(/ENCTYPE="application\/x-www-form-urlencoded"/,cgi.form{"foo"})
-    assert_match(/^<FORM .*>foo<\/FORM>$/,cgi.form("bar"){"foo"})
-    assert_match(/METHOD="bar"/,cgi.form("bar"){"foo"})
-    assert_match(/ENCTYPE="application\/x-www-form-urlencoded"/,cgi.form("bar"){"foo"})
-    assert_equal('<BLOCKQUOTE></BLOCKQUOTE>',cgi.blockquote)
-    assert_equal('<BLOCKQUOTE CITE="bar"></BLOCKQUOTE>',cgi.blockquote('bar'))
-    assert_equal('<BLOCKQUOTE>foo</BLOCKQUOTE>',cgi.blockquote{'foo'})
-    assert_equal('<BLOCKQUOTE CITE="bar">foo</BLOCKQUOTE>',cgi.blockquote('bar'){'foo'})
-    assert_equal('<CAPTION></CAPTION>',cgi.caption)
-    assert_equal('<CAPTION ALIGN="bar"></CAPTION>',cgi.caption('bar'))
-    assert_equal('<CAPTION>foo</CAPTION>',cgi.caption{'foo'})
-    assert_equal('<CAPTION ALIGN="bar">foo</CAPTION>',cgi.caption('bar'){'foo'})
-    assert_equal('<IMG SRC="" ALT="">',cgi.img)
-    assert_equal('<IMG SRC="bar" ALT="">',cgi.img('bar'))
-    assert_equal('<IMG SRC="" ALT="">',cgi.img{'foo'})
-    assert_equal('<IMG SRC="bar" ALT="">',cgi.img('bar'){'foo'})
-    assert_equal('<BASE HREF="">',cgi.base)
-    assert_equal('<BASE HREF="bar">',cgi.base('bar'))
-    assert_equal('<BASE HREF="">',cgi.base{'foo'})
-    assert_equal('<BASE HREF="bar">',cgi.base('bar'){'foo'})
-    assert_equal('<BASEFONT>',cgi.basefont)
-    assert_equal('<BASEFONT>',cgi.basefont('bar'))
-    assert_equal('<BASEFONT>',cgi.basefont{'foo'})
-    assert_equal('<BASEFONT>',cgi.basefont('bar'){'foo'})
-    assert_equal('<BR>',cgi.br)
-    assert_equal('<BR>',cgi.br('bar'))
-    assert_equal('<BR>',cgi.br{'foo'})
-    assert_equal('<BR>',cgi.br('bar'){'foo'})
-    assert_equal('<AREA>',cgi.area)
-    assert_equal('<AREA>',cgi.area('bar'))
-    assert_equal('<AREA>',cgi.area{'foo'})
-    assert_equal('<AREA>',cgi.area('bar'){'foo'})
-    assert_equal('<LINK>',cgi.link)
-    assert_equal('<LINK>',cgi.link('bar'))
-    assert_equal('<LINK>',cgi.link{'foo'})
-    assert_equal('<LINK>',cgi.link('bar'){'foo'})
-    assert_equal('<PARAM>',cgi.param)
-    assert_equal('<PARAM>',cgi.param('bar'))
-    assert_equal('<PARAM>',cgi.param{'foo'})
-    assert_equal('<PARAM>',cgi.param('bar'){'foo'})
-    assert_equal('<HR>',cgi.hr)
-    assert_equal('<HR>',cgi.hr('bar'))
-    assert_equal('<HR>',cgi.hr{'foo'})
-    assert_equal('<HR>',cgi.hr('bar'){'foo'})
-    assert_equal('<INPUT>',cgi.input)
-    assert_equal('<INPUT>',cgi.input('bar'))
-    assert_equal('<INPUT>',cgi.input{'foo'})
-    assert_equal('<INPUT>',cgi.input('bar'){'foo'})
-    assert_equal('<ISINDEX>',cgi.isindex)
-    assert_equal('<ISINDEX>',cgi.isindex('bar'))
-    assert_equal('<ISINDEX>',cgi.isindex{'foo'})
-    assert_equal('<ISINDEX>',cgi.isindex('bar'){'foo'})
-    assert_equal('<META>',cgi.meta)
-    assert_equal('<META>',cgi.meta('bar'))
-    assert_equal('<META>',cgi.meta{'foo'})
-    assert_equal('<META>',cgi.meta('bar'){'foo'})
-    assert_equal('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>',cgi.html)
-    assert_equal('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>foo</HTML>',cgi.html{'foo'})
-    assert_equal('<HEAD>',cgi.head)
-    assert_equal('<HEAD>foo</HEAD>',cgi.head{'foo'})
-    assert_equal('<BODY>',cgi.body)
-    assert_equal('<BODY>foo</BODY>',cgi.body{'foo'})
-    assert_equal('<P>',cgi.p)
-    assert_equal('<P>foo</P>',cgi.p{'foo'})
-    assert_equal('<PLAINTEXT>',cgi.plaintext)
-    assert_equal('<PLAINTEXT>foo</PLAINTEXT>',cgi.plaintext{'foo'})
-    assert_equal('<DT>',cgi.dt)
-    assert_equal('<DT>foo</DT>',cgi.dt{'foo'})
-    assert_equal('<DD>',cgi.dd)
-    assert_equal('<DD>foo</DD>',cgi.dd{'foo'})
-    assert_equal('<LI>',cgi.li)
-    assert_equal('<LI>foo</LI>',cgi.li{'foo'})
-    assert_equal('<OPTION>',cgi.option)
-    assert_equal('<OPTION>foo</OPTION>',cgi.option{'foo'})
-    assert_equal('<TR>',cgi.tr)
-    assert_equal('<TR>foo</TR>',cgi.tr{'foo'})
-    assert_equal('<TH>',cgi.th)
-    assert_equal('<TH>foo</TH>',cgi.th{'foo'})
-    assert_equal('<TD>',cgi.td)
-    assert_equal('<TD>foo</TD>',cgi.td{'foo'})
-    str=cgi.checkbox_group("foo",["aa","bb"],["cc","dd"])
-    assert_match(/^<INPUT .*VALUE="aa".*>bb<INPUT .*VALUE="cc".*>dd$/,str)
-    assert_match(/^<INPUT .*TYPE="checkbox".*>bb<INPUT .*TYPE="checkbox".*>dd$/,str)
-    assert_match(/^<INPUT .*NAME="foo".*>bb<INPUT .*NAME="foo".*>dd$/,str)
-    str=cgi.radio_group("foo",["aa","bb"],["cc","dd"])
-    assert_match(/^<INPUT .*VALUE="aa".*>bb<INPUT .*VALUE="cc".*>dd$/,str)
-    assert_match(/^<INPUT .*TYPE="radio".*>bb<INPUT .*TYPE="radio".*>dd$/,str)
-    assert_match(/^<INPUT .*NAME="foo".*>bb<INPUT .*NAME="foo".*>dd$/,str)
-    str=cgi.checkbox_group("foo",["aa","bb"],["cc","dd",true])
-    assert_match(/^<INPUT .*VALUE="aa".*>bb<INPUT .*VALUE="cc".*>dd$/,str)
-    assert_match(/^<INPUT .*TYPE="checkbox".*>bb<INPUT .*TYPE="checkbox".*>dd$/,str)
-    assert_match(/^<INPUT .*NAME="foo".*>bb<INPUT .*NAME="foo".*>dd$/,str)
-    assert_match(/^<INPUT .*>bb<INPUT .*CHECKED.*>dd$/,str)
-    assert_match(/<INPUT .*TYPE="text".*>/,cgi.text_field(:name=>"name",:value=>"value"))
-    str=cgi.radio_group("foo",["aa","bb"],["cc","dd",false])
-    assert_match(/^<INPUT .*VALUE="aa".*>bb<INPUT .*VALUE="cc".*>dd$/,str)
-    assert_match(/^<INPUT .*TYPE="radio".*>bb<INPUT .*TYPE="radio".*>dd$/,str)
-    assert_match(/^<INPUT .*NAME="foo".*>bb<INPUT .*NAME="foo".*>dd$/,str)
-  end
-
-=begin
-  def test_cgi_tag_helper_html4
-    ## html4
-    cgi = CGI.new('html4')
-    ## html4 transitional
-    cgi = CGI.new('html4Tr')
-    ## html4 frameset
-    cgi = CGI.new('html4Fr')
-  end
-=end
-
-  def test_cgi_tag_helper_html5
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-    )
-    ## html5
-    cgi = CGI.new('html5')
-    assert_equal('<HEADER></HEADER>',cgi.header)
-    assert_equal('<FOOTER></FOOTER>',cgi.footer)
-    assert_equal('<ARTICLE></ARTICLE>',cgi.article)
-    assert_equal('<SECTION></SECTION>',cgi.section)
-    assert_equal('<!DOCTYPE HTML><HTML BLA="TEST"></HTML>',cgi.html("BLA"=>"TEST"){})
-  end
-
-end
diff --git a/test/mri/cgi/test_cgi_util.rb b/test/mri/cgi/test_cgi_util.rb
deleted file mode 100644
index b0612fc87d9..00000000000
--- a/test/mri/cgi/test_cgi_util.rb
+++ /dev/null
@@ -1,312 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'stringio'
-require_relative 'update_env'
-
-
-class CGIUtilTest < Test::Unit::TestCase
-  include CGI::Util
-  include UpdateEnv
-
-  def setup
-    @environ = {}
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-      'SCRIPT_NAME' => nil,
-    )
-    @str1="&<>\" \xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93".dup
-    @str1.force_encoding("UTF-8") if defined?(::Encoding)
-  end
-
-  def teardown
-    ENV.update(@environ)
-  end
-
-  def test_cgi_escape
-    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escape(@str1))
-    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escape(@str1).ascii_only?) if defined?(::Encoding)
-  end
-
-  def test_cgi_escape_with_unreserved_characters
-    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
-                 CGI.escape("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"),
-                 "should not escape any unreserved characters, as per RFC3986 Section 2.3")
-  end
-
-  def test_cgi_escape_with_invalid_byte_sequence
-    assert_equal('%C0%3C%3C', CGI.escape("\xC0\<\<".dup.force_encoding("UTF-8")))
-  end
-
-  def test_cgi_escape_preserve_encoding
-    assert_equal(Encoding::US_ASCII, CGI.escape("\xC0\<\<".dup.force_encoding("US-ASCII")).encoding)
-    assert_equal(Encoding::ASCII_8BIT, CGI.escape("\xC0\<\<".dup.force_encoding("ASCII-8BIT")).encoding)
-    assert_equal(Encoding::UTF_8, CGI.escape("\xC0\<\<".dup.force_encoding("UTF-8")).encoding)
-  end
-
-  def test_cgi_unescape
-    str = CGI.unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
-    assert_equal(@str1, str)
-    return unless defined?(::Encoding)
-
-    assert_equal(@str1.encoding, str.encoding)
-    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
-  end
-
-  def test_cgi_unescape_preserve_encoding
-    assert_equal(Encoding::US_ASCII, CGI.unescape("%C0%3C%3C".dup.force_encoding("US-ASCII")).encoding)
-    assert_equal(Encoding::ASCII_8BIT, CGI.unescape("%C0%3C%3C".dup.force_encoding("ASCII-8BIT")).encoding)
-    assert_equal(Encoding::UTF_8, CGI.unescape("%C0%3C%3C".dup.force_encoding("UTF-8")).encoding)
-  end
-
-  def test_cgi_unescape_accept_charset
-    return unless defined?(::Encoding)
-
-    assert_raise(TypeError) {CGI.unescape('', nil)}
-    assert_separately(%w[-rcgi/util], "#{<<-"begin;"}\n#{<<-"end;"}")
-    begin;
-      assert_equal("", CGI.unescape(''))
-    end;
-  end
-
-  def test_cgi_escapeURIComponent
-    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escapeURIComponent(@str1))
-    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escapeURIComponent(@str1).ascii_only?) if defined?(::Encoding)
-  end
-
-  def test_cgi_escape_uri_component
-    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escape_uri_component(@str1))
-  end
-
-  def test_cgi_escapeURIComponent_with_unreserved_characters
-    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
-                 CGI.escapeURIComponent("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"),
-                 "should not encode any unreserved characters, as per RFC3986 Section 2.3")
-  end
-
-  def test_cgi_escapeURIComponent_with_invalid_byte_sequence
-    assert_equal('%C0%3C%3C', CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("UTF-8")))
-  end
-
-  def test_cgi_escapeURIComponent_preserve_encoding
-    assert_equal(Encoding::US_ASCII, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("US-ASCII")).encoding)
-    assert_equal(Encoding::ASCII_8BIT, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("ASCII-8BIT")).encoding)
-    assert_equal(Encoding::UTF_8, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("UTF-8")).encoding)
-  end
-
-  def test_cgi_unescapeURIComponent
-    str = CGI.unescapeURIComponent('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
-    assert_equal(@str1, str)
-    return unless defined?(::Encoding)
-
-    assert_equal("foo+bar", CGI.unescapeURIComponent("foo+bar"))
-
-    assert_equal(@str1.encoding, str.encoding)
-    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescapeURIComponent("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
-  end
-
-  def test_cgi_unescape_uri_component
-    str = CGI.unescape_uri_component('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
-    assert_equal(@str1, str)
-  end
-
-  def test_cgi_unescapeURIComponent_preserve_encoding
-    assert_equal(Encoding::US_ASCII, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("US-ASCII")).encoding)
-    assert_equal(Encoding::ASCII_8BIT, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("ASCII-8BIT")).encoding)
-    assert_equal(Encoding::UTF_8, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("UTF-8")).encoding)
-  end
-
-  def test_cgi_unescapeURIComponent_accept_charset
-    return unless defined?(::Encoding)
-
-    assert_raise(TypeError) {CGI.unescapeURIComponent('', nil)}
-    assert_separately(%w[-rcgi/util], "#{<<-"begin;"}\n#{<<-"end;"}")
-    begin;
-      assert_equal("", CGI.unescapeURIComponent(''))
-    end;
-  end
-
-  def test_cgi_pretty
-    assert_equal("<HTML>\n  <BODY>\n  </BODY>\n</HTML>\n",CGI.pretty("<HTML><BODY></BODY></HTML>"))
-    assert_equal("<HTML>\n\t<BODY>\n\t</BODY>\n</HTML>\n",CGI.pretty("<HTML><BODY></BODY></HTML>","\t"))
-  end
-
-  def test_cgi_escapeHTML
-    assert_equal("&#39;&amp;&quot;&gt;&lt;", CGI.escapeHTML("'&\"><"))
-  end
-
-  def test_cgi_escape_html_duplicated
-    orig = "Ruby".dup.force_encoding("US-ASCII")
-    str = CGI.escapeHTML(orig)
-    assert_equal(orig, str)
-    assert_not_same(orig, str)
-  end
-
-  def assert_cgi_escape_html_preserve_encoding(str, encoding)
-    assert_equal(encoding, CGI.escapeHTML(str.dup.force_encoding(encoding)).encoding)
-  end
-
-  def test_cgi_escape_html_preserve_encoding
-    Encoding.list do |enc|
-      assert_cgi_escape_html_preserve_encoding("'&\"><", enc)
-      assert_cgi_escape_html_preserve_encoding("Ruby", enc)
-    end
-  end
-
-  def test_cgi_escape_html_dont_freeze
-    assert_not_predicate CGI.escapeHTML("'&\"><".dup),    :frozen?
-    assert_not_predicate CGI.escapeHTML("'&\"><".freeze), :frozen?
-    assert_not_predicate CGI.escapeHTML("Ruby".dup),      :frozen?
-    assert_not_predicate CGI.escapeHTML("Ruby".freeze),   :frozen?
-  end
-
-  def test_cgi_escape_html_large
-    return if RUBY_ENGINE == 'jruby'
-    ulong_max, size_max = RbConfig::LIMITS.values_at("ULONG_MAX", "SIZE_MAX")
-    return unless ulong_max < size_max # Platforms not concerned
-
-    size = (ulong_max / 6 + 1)
-    begin
-      str = '"' * size
-      escaped = CGI.escapeHTML(str)
-    rescue NoMemoryError
-      omit "Not enough memory"
-    rescue => e
-    end
-    assert_raise_with_message(ArgumentError, /overflow/, ->{"length = #{escaped.length}"}) do
-      raise e if e
-    end
-  end
-
-  def test_cgi_unescapeHTML
-    assert_equal("'&\"><", CGI.unescapeHTML("&#39;&amp;&quot;&gt;&lt;"))
-  end
-
-  def test_cgi_unescapeHTML_invalid
-    assert_equal('&<&amp>&quot&abcdefghijklmn', CGI.unescapeHTML('&&lt;&amp&gt;&quot&abcdefghijklmn'))
-  end
-
-  module UnescapeHTMLTests
-    def test_cgi_unescapeHTML_following_known_first_letter
-      assert_equal('&a>&q>&l>&g>', CGI.unescapeHTML('&a&gt;&q&gt;&l&gt;&g&gt;'))
-    end
-
-    def test_cgi_unescapeHTML_following_number_sign
-      assert_equal('&#>&#x>', CGI.unescapeHTML('&#&gt;&#x&gt;'))
-    end
-
-    def test_cgi_unescapeHTML_following_invalid_numeric
-      assert_equal('&#1114112>&#x110000>', CGI.unescapeHTML('&#1114112&gt;&#x110000&gt;'))
-    end
-  end
-
-  include UnescapeHTMLTests
-
-  Encoding.list.each do |enc|
-    begin
-      escaped = "&#39;&amp;&quot;&gt;&lt;".encode(enc)
-      unescaped = "'&\"><".encode(enc)
-    rescue Encoding::ConverterNotFoundError
-      next
-    else
-      define_method("test_cgi_escapeHTML:#{enc.name}") do
-        assert_equal(escaped, CGI.escapeHTML(unescaped))
-      end
-      define_method("test_cgi_unescapeHTML:#{enc.name}") do
-        assert_equal(unescaped, CGI.unescapeHTML(escaped))
-      end
-    end
-  end
-
-  Encoding.list.each do |enc|
-    next unless enc.ascii_compatible?
-    begin
-      escaped = "%25+%2B"
-      unescaped = "% +".encode(enc)
-    rescue Encoding::ConverterNotFoundError
-      next
-    else
-      define_method("test_cgi_escape:#{enc.name}") do
-        assert_equal(escaped, CGI.escape(unescaped))
-      end
-      define_method("test_cgi_unescape:#{enc.name}") do
-        assert_equal(unescaped, CGI.unescape(escaped, enc))
-      end
-    end
-  end
-
-  def test_cgi_unescapeHTML_uppercasecharacter
-    assert_equal("\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86", CGI.unescapeHTML("&#x3042;&#x3044;&#X3046;"))
-  end
-
-  def test_cgi_include_escape
-    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', escape(@str1))
-  end
-
-  def test_cgi_include_escapeHTML
-    assert_equal("&#39;&amp;&quot;&gt;&lt;", escapeHTML("'&\"><"))
-  end
-
-  def test_cgi_include_h
-    assert_equal("&#39;&amp;&quot;&gt;&lt;", h("'&\"><"))
-  end
-
-  def test_cgi_include_unescape
-    str = unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
-    assert_equal(@str1, str)
-    return unless defined?(::Encoding)
-
-    assert_equal(@str1.encoding, str.encoding)
-    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
-  end
-
-  def test_cgi_include_unescapeHTML
-    assert_equal("'&\"><", unescapeHTML("&#39;&amp;&quot;&gt;&lt;"))
-  end
-
-  def test_cgi_escapeElement
-    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', "A", "IMG"))
-    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"]))
-    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', "A", "IMG"))
-    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', ["A", "IMG"]))
-  end
-
-
-  def test_cgi_unescapeElement
-    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
-    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
-    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
-    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
-  end
-end
-
-class CGIUtilPureRubyTest < Test::Unit::TestCase
-  def setup
-    CGI::Escape.module_eval do
-      alias _escapeHTML escapeHTML
-      remove_method :escapeHTML
-      alias _unescapeHTML unescapeHTML
-      remove_method :unescapeHTML
-    end if defined?(CGI::Escape)
-  end
-
-  def teardown
-    CGI::Escape.module_eval do
-      alias escapeHTML _escapeHTML
-      remove_method :_escapeHTML
-      alias unescapeHTML _unescapeHTML
-      remove_method :_unescapeHTML
-    end if defined?(CGI::Escape)
-  end
-
-  include CGIUtilTest::UnescapeHTMLTests
-
-  def test_cgi_escapeHTML_with_invalid_byte_sequence
-    assert_equal("&lt;\xA4??&gt;", CGI.escapeHTML(%[<\xA4??>]))
-  end
-
-  def test_cgi_unescapeHTML_with_invalid_byte_sequence
-    input = "\xFF&"
-    assert_equal(input, CGI.unescapeHTML(input))
-  end
-end
diff --git a/test/mri/cgi/testdata/file1.html b/test/mri/cgi/testdata/file1.html
deleted file mode 100644
index 2ceaf6bc393..00000000000
--- a/test/mri/cgi/testdata/file1.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title>ムスカ大佐のひとりごと</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF8">
-  </head>
-  <body>
-    <p>バカどもにはちょうどいい目くらましだ。</p>
-  </body>
-</html>
diff --git a/test/mri/cgi/testdata/large.png b/test/mri/cgi/testdata/large.png
deleted file mode 100644
index d716396fa3e..00000000000
Binary files a/test/mri/cgi/testdata/large.png and /dev/null differ
diff --git a/test/mri/cgi/testdata/small.png b/test/mri/cgi/testdata/small.png
deleted file mode 100644
index 753d58e3cbb..00000000000
Binary files a/test/mri/cgi/testdata/small.png and /dev/null differ
diff --git a/test/mri/coverage/test_coverage.rb b/test/mri/coverage/test_coverage.rb
index 9db1f8f2530..80f8930472a 100644
--- a/test/mri/coverage/test_coverage.rb
+++ b/test/mri/coverage/test_coverage.rb
@@ -192,6 +192,23 @@ def test_eval_coverage
     end;
   end
 
+  def test_eval_negative_lineno
+    assert_in_out_err(ARGV, <<-"end;", ["[1, 1, 1]"], [])
+      Coverage.start(eval: true, lines: true)
+
+      eval(<<-RUBY, TOPLEVEL_BINDING, "test.rb", -2)
+      p # -2 # Not subject to measurement
+      p # -1 # Not subject to measurement
+      p #  0 # Not subject to measurement
+      p #  1 # Subject to measurement
+      p #  2 # Subject to measurement
+      p #  3 # Subject to measurement
+      RUBY
+
+      p Coverage.result["test.rb"][:lines]
+    end;
+  end
+
   def test_coverage_supported
     assert Coverage.supported?(:lines)
     assert Coverage.supported?(:oneshot_lines)
diff --git a/test/mri/date/test_date.rb b/test/mri/date/test_date.rb
index 3f9c893efa6..7e37fc94d26 100644
--- a/test/mri/date/test_date.rb
+++ b/test/mri/date/test_date.rb
@@ -134,6 +134,10 @@ def test_hash
     assert_equal(9, h[Date.new(1999,5,25)])
     assert_equal(9, h[DateTime.new(1999,5,25)])
 
+    h = {}
+    h[Date.new(3171505571716611468830131104691,2,19)] = 0
+    assert_equal(true, h.key?(Date.new(3171505571716611468830131104691,2,19)))
+
     h = {}
     h[DateTime.new(1999,5,23)] = 0
     h[DateTime.new(1999,5,24)] = 1
diff --git a/test/mri/date/test_date_conv.rb b/test/mri/date/test_date_conv.rb
index ed478b41bb3..8d810844355 100644
--- a/test/mri/date/test_date_conv.rb
+++ b/test/mri/date/test_date_conv.rb
@@ -82,18 +82,17 @@ def test_to_time__from_datetime
     assert_equal([1582, 10, 13, 1, 2, 3, 456789],
 		 [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.usec])
 
-    if Time.allocate.respond_to?(:nsec)
-      d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789123.to_r/86400000000000
-      t = d.to_time.utc
-      assert_equal([2004, 9, 19, 1, 2, 3, 456789123],
-		   [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.nsec])
-    end
+    d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789123.to_r/86400000000000
+    t = d.to_time.utc
+    assert_equal([2004, 9, 19, 1, 2, 3, 456789123],
+		 [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.nsec])
 
-    if Time.allocate.respond_to?(:subsec)
+    # TruffleRuby does not support more than nanoseconds
+    unless RUBY_ENGINE == 'truffleruby'
       d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789123456789123.to_r/86400000000000000000000
       t = d.to_time.utc
       assert_equal([2004, 9, 19, 1, 2, 3, Rational(456789123456789123,1000000000000000000)],
-		   [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.subsec])
+                   [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.subsec])
     end
   end
 
diff --git a/test/mri/date/test_date_parse.rb b/test/mri/date/test_date_parse.rb
index 16362e3bfff..720624c02e3 100644
--- a/test/mri/date/test_date_parse.rb
+++ b/test/mri/date/test_date_parse.rb
@@ -544,6 +544,8 @@ def test__parse__2
 
     h = Date._parse('')
     assert_equal({}, h)
+
+    assert_raise(TypeError) {Date._parse(nil)}
   end
 
   def test_parse
@@ -589,10 +591,13 @@ def test__parse_odd_offset
   end
 
   def test__parse_too_long_year
-    str = "Jan 1" + "0" * 100_000
-    h = EnvUtil.timeout(3) {Date._parse(str, limit: 100_010)}
-    assert_equal(100_000, Math.log10(h[:year]))
-    assert_equal(1, h[:mon])
+    # Math.log10 does not support so big numbers like 10^100_000 on TruffleRuby
+    unless RUBY_ENGINE == 'truffleruby'
+      str = "Jan 1" + "0" * 100_000
+      h = EnvUtil.timeout(3) {Date._parse(str, limit: 100_010)}
+      assert_equal(100_000, Math.log10(h[:year]))
+      assert_equal(1, h[:mon])
+    end
 
     str = "Jan - 1" + "0" * 100_000
     h = EnvUtil.timeout(3) {Date._parse(str, limit: 100_010)}
@@ -1301,4 +1306,20 @@ def test_length_limit
 
     assert_raise(ArgumentError) { Date._parse("Jan " + "9" * 1000000) }
   end
+
+  def test_string_argument
+    s = '2001-02-03T04:05:06Z'
+    obj = Class.new(Struct.new(:to_str, :count)) do
+      def to_str
+        self.count +=1
+        super
+      end
+    end.new(s, 0)
+
+    all_assertions_foreach(nil, :_parse, :_iso8601, :_rfc3339, :_xmlschema) do |m|
+      obj.count = 0
+      assert_not_equal({}, Date.__send__(m, obj))
+      assert_equal(1, obj.count)
+    end
+  end
 end
diff --git a/test/mri/date/test_date_ractor.rb b/test/mri/date/test_date_ractor.rb
index 7ec953d87ae..91ea38bb934 100644
--- a/test/mri/date/test_date_ractor.rb
+++ b/test/mri/date/test_date_ractor.rb
@@ -8,7 +8,7 @@ def code(klass = Date, share: false)
       share = #{share}
       d = Date.parse('Aug 23:55')
       Ractor.make_shareable(d) if share
-      d2, d3 = Ractor.new(d) { |d| [d, Date.parse(d.to_s)] }.take
+      d2, d3 = Ractor.new(d) { |d| [d, Date.parse(d.to_s)] }.value
       if share
         assert_same d, d2
       else
diff --git a/test/mri/date/test_switch_hitter.rb b/test/mri/date/test_switch_hitter.rb
index bdf299e0304..cc757825373 100644
--- a/test/mri/date/test_switch_hitter.rb
+++ b/test/mri/date/test_switch_hitter.rb
@@ -97,6 +97,11 @@ def test_jd
 		 [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
   end
 
+  def test_ajd
+    assert_equal(Date.civil(2008, 1, 16).ajd, 4908963r/2)
+    assert_equal(Date.civil(-11082381539297990, 2, 19).ajd, -8095679714453739481r/2)
+  end
+
   def test_ordinal
     d = Date.ordinal
     assert_equal([-4712, 1], [d.year, d.yday])
diff --git a/test/mri/did_you_mean/spell_checking/test_method_name_check.rb b/test/mri/did_you_mean/spell_checking/test_method_name_check.rb
index 4daaf7cec74..2ae5fa7d03f 100644
--- a/test/mri/did_you_mean/spell_checking/test_method_name_check.rb
+++ b/test/mri/did_you_mean/spell_checking/test_method_name_check.rb
@@ -98,6 +98,8 @@ def nil.empty?
   end
 
   def test_does_not_append_suggestions_twice
+    omit "This test is not working with JRuby" if RUBY_ENGINE == "jruby"
+
     error = assert_raise NoMethodError do
       begin
         @user.firstname
@@ -110,6 +112,8 @@ def test_does_not_append_suggestions_twice
   end
 
   def test_does_not_append_suggestions_three_times
+    omit "This test is not working with JRuby" if RUBY_ENGINE == "jruby"
+
     error = assert_raise NoMethodError do
       begin
         @user.raise_no_method_error
diff --git a/test/mri/did_you_mean/spell_checking/test_require_path_check.rb b/test/mri/did_you_mean/spell_checking/test_require_path_check.rb
index d6c06e99991..1b96772d211 100644
--- a/test/mri/did_you_mean/spell_checking/test_require_path_check.rb
+++ b/test/mri/did_you_mean/spell_checking/test_require_path_check.rb
@@ -7,11 +7,11 @@ class RequirePathCheckTest < Test::Unit::TestCase
 
   def test_load_error_from_require_has_suggestions
     error = assert_raise LoadError do
-              require 'open_struct'
+              require 'open'
             end
 
-    assert_correction 'ostruct', error.corrections
-    assert_match "Did you mean?  ostruct", get_message(error)
+    assert_correction 'open3', error.corrections
+    assert_match "Did you mean?  open3", get_message(error)
   end
 
   def test_load_error_from_require_for_nested_files_has_suggestions
diff --git a/test/mri/did_you_mean/test_ractor_compatibility.rb b/test/mri/did_you_mean/test_ractor_compatibility.rb
index 7385f106122..3166d0b6c5f 100644
--- a/test/mri/did_you_mean/test_ractor_compatibility.rb
+++ b/test/mri/did_you_mean/test_ractor_compatibility.rb
@@ -14,7 +14,7 @@ class ::Book; end
                   e.corrections # It is important to call the #corrections method within Ractor.
                   e
                 end
-              }.take
+              }.value
 
       assert_correction "Book", error.corrections
     CODE
@@ -32,7 +32,7 @@ def test_key_name_suggestion_works_in_ractor
                   e.corrections # It is important to call the #corrections method within Ractor.
                   e
                 end
-              }.take
+              }.value
 
       assert_correction ":bar", error.corrections
       assert_match "Did you mean?  :bar", get_message(error)
@@ -49,7 +49,7 @@ def test_method_name_suggestion_works_in_ractor
                   e.corrections # It is important to call the #corrections method within Ractor.
                   e
                 end
-              }.take
+              }.value
 
       assert_correction :to_s, error.corrections
       assert_match "Did you mean?  to_s",  get_message(error)
@@ -71,7 +71,7 @@ def test_pattern_key_name_suggestion_works_in_ractor
                     e.corrections # It is important to call the #corrections method within Ractor.
                     e
                   end
-                }.take
+                }.value
 
         assert_correction ":foo", error.corrections
         assert_match "Did you mean?  :foo", get_message(error)
@@ -90,7 +90,7 @@ class FirstNameError < NameError; end
           e.corrections # It is important to call the #corrections method within Ractor.
           e
         end
-      }.take
+      }.value
 
       assert_not_match(/Did you mean\?/, error.message)
     CODE
@@ -108,7 +108,7 @@ def test_variable_name_suggestion_works_in_ractor
           e.corrections # It is important to call the #corrections method within Ractor.
           e
         end
-      }.take
+      }.value
 
       assert_correction :in_ractor, error.corrections
       assert_match "Did you mean?  in_ractor", get_message(error)
diff --git a/test/mri/digest/test_ractor.rb b/test/mri/digest/test_ractor.rb
index b34a3653b4c..d7b03eaebac 100644
--- a/test/mri/digest/test_ractor.rb
+++ b/test/mri/digest/test_ractor.rb
@@ -15,6 +15,10 @@ module TestDigestRactor
 
   def test_s_hexdigest
     assert_in_out_err([], <<-"end;", ["true", "true"], [])
+      class Ractor
+        alias value take
+      end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
       $VERBOSE = nil
       require "digest"
       require "#{self.class::LIB}"
@@ -26,7 +30,7 @@ def test_s_hexdigest
         [r, hexdigest]
       end
       rs.each do |r, hexdigest|
-        puts r.take == hexdigest
+        puts r.value == hexdigest
       end
     end;
   end
diff --git a/test/mri/dtrace/helper.rb b/test/mri/dtrace/helper.rb
index 7fa16965f12..9e8c7ecd52c 100644
--- a/test/mri/dtrace/helper.rb
+++ b/test/mri/dtrace/helper.rb
@@ -65,11 +65,7 @@ module DTrace
   class TestCase < Test::Unit::TestCase
     INCLUDE = File.expand_path('..', File.dirname(__FILE__))
 
-    case RUBY_PLATFORM
-    when /solaris/i
-      # increase bufsize to 8m (default 4m on Solaris)
-      DTRACE_CMD = %w[dtrace -b 8m]
-    when /darwin/i
+    if RUBY_PLATFORM =~ /darwin/i
       READ_PROBES = proc do |cmd|
         lines = nil
         PTY.spawn(*cmd) do |io, _, pid|
diff --git a/test/mri/erb/test_erb.rb b/test/mri/erb/test_erb.rb
index 555345a1401..9eec43da158 100644
--- a/test/mri/erb/test_erb.rb
+++ b/test/mri/erb/test_erb.rb
@@ -24,29 +24,6 @@ def test_with_filename
     assert_match(/\Atest filename:1\b/, e.backtrace[0])
   end
 
-  # [deprecated] This will be removed later
-  def test_without_filename_with_safe_level
-    erb = EnvUtil.suppress_warning do
-      ERB.new("<% raise ::TestERB::MyError %>", 1)
-    end
-    e = assert_raise(MyError) {
-      erb.result
-    }
-    assert_match(/\A\(erb\):1\b/, e.backtrace[0])
-  end
-
-  # [deprecated] This will be removed later
-  def test_with_filename_and_safe_level
-    erb = EnvUtil.suppress_warning do
-      ERB.new("<% raise ::TestERB::MyError %>", 1)
-    end
-    erb.filename = "test filename"
-    e = assert_raise(MyError) {
-      erb.result
-    }
-    assert_match(/\Atest filename:1\b/, e.backtrace[0])
-  end
-
   def test_with_filename_lineno
     erb = ERB.new("<% raise ::TestERB::MyError %>")
     erb.filename = "test filename"
@@ -77,6 +54,9 @@ def test_html_escape
 
     assert_equal("", ERB::Util.html_escape(nil))
     assert_equal("123", ERB::Util.html_escape(123))
+
+    assert_equal(65536+5, ERB::Util.html_escape("x"*65536 + "&").size)
+    assert_equal(65536+5, ERB::Util.html_escape("&" + "x"*65536).size)
   end
 
   def test_html_escape_to_s
@@ -114,25 +94,16 @@ def test_version
   end
 
   def test_core
-    # [deprecated] Fix initializer later
-    EnvUtil.suppress_warning do
-      _test_core(nil)
-      _test_core(0)
-      _test_core(1)
-    end
-  end
-
-  def _test_core(safe)
     erb = @erb.new("hello")
     assert_equal("hello", erb.result)
 
-    erb = @erb.new("hello", safe, 0)
+    erb = @erb.new("hello", trim_mode: 0)
     assert_equal("hello", erb.result)
 
-    erb = @erb.new("hello", safe, 1)
+    erb = @erb.new("hello", trim_mode: 1)
     assert_equal("hello", erb.result)
 
-    erb = @erb.new("hello", safe, 2)
+    erb = @erb.new("hello", trim_mode: 2)
     assert_equal("hello", erb.result)
 
     src = <<EOS
@@ -160,9 +131,9 @@ def _test_core(safe)
 EOS
     erb = @erb.new(src)
     assert_equal(ans, erb.result)
-    erb = @erb.new(src, safe, 0)
+    erb = @erb.new(src, trim_mode: 0)
     assert_equal(ans, erb.result)
-    erb = @erb.new(src, safe, '')
+    erb = EnvUtil.suppress_warning { @erb.new(src, trim_mode: '') }
     assert_equal(ans, erb.result)
 
     ans = <<EOS
@@ -173,9 +144,9 @@ def _test_core(safe)
 * 1% n=0
 * 2
 EOS
-    erb = @erb.new(src, safe, 1)
+    erb = @erb.new(src, trim_mode: 1)
     assert_equal(ans.chomp, erb.result)
-    erb = @erb.new(src, safe, '>')
+    erb = @erb.new(src, trim_mode: '>')
     assert_equal(ans.chomp, erb.result)
 
     ans  = <<EOS
@@ -189,9 +160,9 @@ def _test_core(safe)
 * 2
 EOS
 
-    erb = @erb.new(src, safe, 2)
+    erb = @erb.new(src, trim_mode: 2)
     assert_equal(ans, erb.result)
-    erb = @erb.new(src, safe, '<>')
+    erb = @erb.new(src, trim_mode: '<>')
     assert_equal(ans, erb.result)
 
     ans = <<EOS
@@ -205,7 +176,7 @@ def _test_core(safe)
 * 0
 
 EOS
-    erb = @erb.new(src, safe, '%')
+    erb = @erb.new(src, trim_mode: '%')
     assert_equal(ans, erb.result)
 
     ans = <<EOS
@@ -213,7 +184,7 @@ def _test_core(safe)
 = hello
 * 0* 0* 0
 EOS
-    erb = @erb.new(src, safe, '%>')
+    erb = @erb.new(src, trim_mode: '%>')
     assert_equal(ans.chomp, erb.result)
 
     ans = <<EOS
@@ -223,7 +194,7 @@ def _test_core(safe)
 * 0
 * 0
 EOS
-    erb = @erb.new(src, safe, '%<>')
+    erb = @erb.new(src, trim_mode: '%<>')
     assert_equal(ans, erb.result)
   end
 
@@ -679,27 +650,6 @@ def test_half_working_comment_backward_compatibility
     end
   end
 
-  # [deprecated] These interfaces will be removed later
-  def test_deprecated_interface_warnings
-    [nil, 0, 1, 2].each do |safe|
-      assert_warn(/2nd argument of ERB.new is deprecated/) do
-        ERB.new('', safe)
-      end
-    end
-
-    [nil, '', '%', '%<>'].each do |trim|
-      assert_warn(/3rd argument of ERB.new is deprecated/) do
-        ERB.new('', nil, trim)
-      end
-    end
-
-    [nil, '_erbout', '_hamlout'].each do |eoutvar|
-      assert_warn(/4th argument of ERB.new is deprecated/) do
-        ERB.new('', nil, nil, eoutvar)
-      end
-    end
-  end
-
   def test_prohibited_marshal_dump
     erb = ERB.new("")
     assert_raise(TypeError) {Marshal.dump(erb)}
@@ -714,6 +664,33 @@ def test_prohibited_marshal_load
     assert_raise(ArgumentError) {erb.result}
   end
 
+  def test_prohibited_marshal_load_def_method
+    erb = ERB.allocate
+    erb.instance_variable_set(:@src, "")
+    erb.instance_variable_set(:@lineno, 1)
+    erb.instance_variable_set(:@_init, true)
+    erb = Marshal.load(Marshal.dump(erb))
+    assert_raise(ArgumentError) {erb.def_method(Class.new, 'render')}
+  end
+
+  def test_prohibited_marshal_load_def_module
+    erb = ERB.allocate
+    erb.instance_variable_set(:@src, "")
+    erb.instance_variable_set(:@lineno, 1)
+    erb.instance_variable_set(:@_init, true)
+    erb = Marshal.load(Marshal.dump(erb))
+    assert_raise(ArgumentError) {erb.def_module}
+  end
+
+  def test_prohibited_marshal_load_def_class
+    erb = ERB.allocate
+    erb.instance_variable_set(:@src, "")
+    erb.instance_variable_set(:@lineno, 1)
+    erb.instance_variable_set(:@_init, true)
+    erb = Marshal.load(Marshal.dump(erb))
+    assert_raise(ArgumentError) {erb.def_class}
+  end
+
   def test_multi_line_comment_lineno
     erb = ERB.new(<<~EOS)
       <%= __LINE__ %>
diff --git a/test/mri/error_highlight/test_error_highlight.rb b/test/mri/error_highlight/test_error_highlight.rb
index b75bf6d06cc..ec39b1c4db6 100644
--- a/test/mri/error_highlight/test_error_highlight.rb
+++ b/test/mri/error_highlight/test_error_highlight.rb
@@ -44,6 +44,17 @@ def preprocess(msg)
     def assert_error_message(klass, expected_msg, &blk)
       omit unless klass < ErrorHighlight::CoreExt
       err = assert_raise(klass, &blk)
+      unless klass == ArgumentError && err.message =~ /\A(?:wrong number of arguments|missing keyword[s]?|unknown keyword[s]?|no keywords accepted)\b/
+        spot = ErrorHighlight.spot(err)
+        if spot
+          assert_kind_of(Integer, spot[:first_lineno])
+          assert_kind_of(Integer, spot[:first_column])
+          assert_kind_of(Integer, spot[:last_lineno])
+          assert_kind_of(Integer, spot[:last_column])
+          assert_kind_of(String, spot[:snippet])
+          assert_kind_of(Array, spot[:script_lines])
+        end
+      end
       assert_equal(preprocess(expected_msg).chomp, err.detailed_message(highlight: false).sub(/ \((?:NoMethod|Name)Error\)/, ""))
     end
   else
@@ -880,27 +891,13 @@ def test_COLON2_4
     end
   end
 
-  if ErrorHighlight.const_get(:Spotter).const_get(:OPT_GETCONSTANT_PATH)
-    def test_COLON2_5
-      # Unfortunately, we cannot identify which `NotDefined` caused the NameError
-      assert_error_message(NameError, <<~END) do
-  uninitialized constant ErrorHighlightTest::NotDefined
-      END
-
-        ErrorHighlightTest::NotDefined::NotDefined
-      end
-    end
-  else
-    def test_COLON2_5
-      assert_error_message(NameError, <<~END) do
+  def test_COLON2_5
+    # Unfortunately, we cannot identify which `NotDefined` caused the NameError
+    assert_error_message(NameError, <<~END) do
 uninitialized constant ErrorHighlightTest::NotDefined
+    END
 
-        ErrorHighlightTest::NotDefined::NotDefined
-                          ^^^^^^^^^^^^
-      END
-
-        ErrorHighlightTest::NotDefined::NotDefined
-      end
+      ErrorHighlightTest::NotDefined::NotDefined
     end
   end
 
@@ -1102,12 +1099,13 @@ def test_args_CALL_2
   end
 
   def test_args_ATTRASGN_1
-    v = []
-    assert_error_message(ArgumentError, <<~END) do
-wrong number of arguments (given 1, expected 2..3) (ArgumentError)
+    v = method(:raise).to_proc
+    recv = NEW_MESSAGE_FORMAT ? "an instance of Proc" : v.inspect
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `[]=' for #{ recv }
 
       v [ ] = 1
-         ^^^^^^
+        ^^^^^
     END
 
       v [ ] = 1
@@ -1190,16 +1188,16 @@ def test_args_OP_ASGN1_aref_1
   end
 
   def test_args_OP_ASGN1_aref_2
-    v = []
+    v = method(:raise).to_proc
 
     assert_error_message(ArgumentError, <<~END) do
-wrong number of arguments (given 0, expected 1..2) (ArgumentError)
+ArgumentError (ArgumentError)
 
-      v [ ] += 42
-         ^^^^^^^^
+      v [ArgumentError] += 42
+         ^^^^^^^^^^^^^^^^^^^^
     END
 
-      v [ ] += 42
+      v [ArgumentError] += 42
     end
   end
 
@@ -1444,6 +1442,199 @@ def exc.backtrace_locations = []
     end
   end
 
+  begin
+    ->{}.call(1)
+  rescue ArgumentError => exc
+    MethodDefLocationSupported =
+      RubyVM::AbstractSyntaxTree.respond_to?(:node_id_for_backtrace_location) &&
+      RubyVM::AbstractSyntaxTree.node_id_for_backtrace_location(exc.backtrace_locations.first)
+  end
+
+  def process_callee_snippet(str)
+    return str if MethodDefLocationSupported
+
+    str.sub(/\n +\|.*\n +\^+\n\z/, "")
+  end
+
+  WRONG_NUMBER_OF_ARGUMENTS_LINENO = __LINE__ + 1
+  def wrong_number_of_arguments_test(x, y)
+    x + y
+  end
+
+  def test_wrong_number_of_arguments_for_method
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+wrong number of arguments (given 1, expected 2) (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       wrong_number_of_arguments_test(1)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    callee: #{ __FILE__ }:#{ WRONG_NUMBER_OF_ARGUMENTS_LINENO }
+    |   def wrong_number_of_arguments_test(x, y)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    END
+
+      wrong_number_of_arguments_test(1)
+    end
+  end
+
+  KEYWORD_TEST_LINENO = __LINE__ + 1
+  def keyword_test(kw1:, kw2:, kw3:)
+    kw1 + kw2 + kw3
+  end
+
+  def test_missing_keyword
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+missing keyword: :kw3 (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       keyword_test(kw1: 1, kw2: 2)
+            ^^^^^^^^^^^^
+    callee: #{ __FILE__ }:#{ KEYWORD_TEST_LINENO }
+    |   def keyword_test(kw1:, kw2:, kw3:)
+            ^^^^^^^^^^^^
+    END
+
+      keyword_test(kw1: 1, kw2: 2)
+    end
+  end
+
+  def test_missing_keywords # multiple missing keywords
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+missing keywords: :kw2, :kw3 (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       keyword_test(kw1: 1)
+            ^^^^^^^^^^^^
+    callee: #{ __FILE__ }:#{ KEYWORD_TEST_LINENO }
+    |   def keyword_test(kw1:, kw2:, kw3:)
+            ^^^^^^^^^^^^
+    END
+
+      keyword_test(kw1: 1)
+    end
+  end
+
+  def test_unknown_keyword
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+unknown keyword: :kw4 (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       keyword_test(kw1: 1, kw2: 2, kw3: 3, kw4: 4)
+            ^^^^^^^^^^^^
+    callee: #{ __FILE__ }:#{ KEYWORD_TEST_LINENO }
+    |   def keyword_test(kw1:, kw2:, kw3:)
+            ^^^^^^^^^^^^
+    END
+
+      keyword_test(kw1: 1, kw2: 2, kw3: 3, kw4: 4)
+    end
+  end
+
+  def test_unknown_keywords
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+unknown keywords: :kw4, :kw5 (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       keyword_test(kw1: 1, kw2: 2, kw3: 3, kw4: 4, kw5: 5)
+            ^^^^^^^^^^^^
+    callee: #{ __FILE__ }:#{ KEYWORD_TEST_LINENO }
+    |   def keyword_test(kw1:, kw2:, kw3:)
+            ^^^^^^^^^^^^
+    END
+
+      keyword_test(kw1: 1, kw2: 2, kw3: 3, kw4: 4, kw5: 5)
+    end
+  end
+
+  WRONG_NUBMER_OF_ARGUMENTS_TEST2_LINENO = __LINE__ + 1
+  def wrong_number_of_arguments_test2(
+    long_argument_name_x,
+    long_argument_name_y,
+    long_argument_name_z
+  )
+    long_argument_name_x + long_argument_name_y + long_argument_name_z
+  end
+
+  def test_wrong_number_of_arguments_for_method2
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+wrong number of arguments (given 1, expected 3) (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       wrong_number_of_arguments_test2(1)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    callee: #{ __FILE__ }:#{ WRONG_NUBMER_OF_ARGUMENTS_TEST2_LINENO }
+    |   def wrong_number_of_arguments_test2(
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    END
+
+      wrong_number_of_arguments_test2(1)
+    end
+  end
+
+  def test_wrong_number_of_arguments_for_lambda_literal
+    v = -> {}
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+wrong number of arguments (given 1, expected 0) (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       v.call(1)
+             ^^^^^
+    callee: #{ __FILE__ }:#{ lineno - 1 }
+    |     v = -> {}
+              ^^
+    END
+
+      v.call(1)
+    end
+  end
+
+  def test_wrong_number_of_arguments_for_lambda_method
+    v = lambda { }
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+wrong number of arguments (given 1, expected 0) (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       v.call(1)
+             ^^^^^
+    callee: #{ __FILE__ }:#{ lineno - 1 }
+    |     v = lambda { }
+                     ^
+    END
+
+      v.call(1)
+    end
+  end
+
+  DEFINE_METHOD_TEST_LINENO = __LINE__ + 1
+  define_method :define_method_test do |x, y|
+    x + y
+  end
+
+  def test_wrong_number_of_arguments_for_define_method
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+wrong number of arguments (given 1, expected 2) (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       define_method_test(1)
+            ^^^^^^^^^^^^^^^^^^
+    callee: #{ __FILE__ }:#{ DEFINE_METHOD_TEST_LINENO }
+    |   define_method :define_method_test do |x, y|
+                                          ^^
+    END
+
+      define_method_test(1)
+    end
+  end
+
   def test_spoofed_filename
     Tempfile.create(["error_highlight_test", ".rb"], binmode: true) do |tmp|
       tmp << "module Dummy\nend\n"
@@ -1512,6 +1703,54 @@ def test_spot_with_node
     assert_equal expected_spot, actual_spot
   end
 
+  module SingletonMethodWithSpacing
+    LINENO = __LINE__ + 1
+    def self . baz(x:)
+      x
+    end
+  end
+
+  def test_singleton_method_with_spacing_missing_keyword
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+missing keyword: :x (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       SingletonMethodWithSpacing.baz
+                                      ^^^^
+    callee: #{ __FILE__ }:#{ SingletonMethodWithSpacing::LINENO }
+    |     def self . baz(x:)
+                   ^^^^^
+    END
+
+      SingletonMethodWithSpacing.baz
+    end
+  end
+
+  module SingletonMethodMultipleKwargs
+    LINENO = __LINE__ + 1
+    def self.run(shop_id:, param1:)
+      shop_id + param1
+    end
+  end
+
+  def test_singleton_method_multiple_missing_keywords
+    lineno = __LINE__
+    assert_error_message(ArgumentError, process_callee_snippet(<<~END)) do
+missing keywords: :shop_id, :param1 (ArgumentError)
+
+    caller: #{ __FILE__ }:#{ lineno + 12 }
+    |       SingletonMethodMultipleKwargs.run
+                                         ^^^^
+    callee: #{ __FILE__ }:#{ SingletonMethodMultipleKwargs::LINENO }
+    |     def self.run(shop_id:, param1:)
+                  ^^^^
+    END
+
+      SingletonMethodMultipleKwargs.run
+    end
+  end
+
   private
 
   def find_node_by_id(node, node_id)
diff --git a/test/mri/etc/test_etc.rb b/test/mri/etc/test_etc.rb
index c15c4f6e1e7..c2e3af6317e 100644
--- a/test/mri/etc/test_etc.rb
+++ b/test/mri/etc/test_etc.rb
@@ -21,7 +21,7 @@ def test_passwd
       assert_instance_of(String, s.shell)
       assert_kind_of(Integer, s.change) if s.respond_to?(:change)
       assert_kind_of(Integer, s.quota) if s.respond_to?(:quota)
-      assert(s.age.is_a?(Integer) || s.age.is_a?(String)) if s.respond_to?(:age)
+      assert(s.age.is_a?(Integer) || s.age.is_a?(String), s.age) if s.respond_to?(:age)
       assert_instance_of(String, s.uclass) if s.respond_to?(:uclass)
       assert_instance_of(String, s.comment) if s.respond_to?(:comment)
       assert_kind_of(Integer, s.expire) if s.respond_to?(:expire)
@@ -160,7 +160,7 @@ def test_pathconf
     end
     IO.pipe {|r, w|
       val = w.pathconf(Etc::PC_PIPE_BUF)
-      assert(val.nil? || val.kind_of?(Integer))
+      assert_kind_of(Integer, val) if val
     }
   end if defined?(Etc::PC_PIPE_BUF)
 
@@ -173,28 +173,85 @@ def test_sysconfdir
     assert_operator(File, :absolute_path?, Etc.sysconfdir)
   end if File.method_defined?(:absolute_path?)
 
-  def test_ractor
+  # All Ractor-safe methods should be tested here
+  def test_ractor_parallel
+    omit "This test is flaky and intermittently failing now on ModGC workflow" if ENV['GITHUB_WORKFLOW'] == 'ModGC'
+
+    assert_ractor(<<~RUBY, require: 'etc', timeout: 60)
+      10.times.map do
+        Ractor.new do
+          100.times do
+            raise unless String === Etc.systmpdir
+            raise unless Hash === Etc.uname
+            if defined?(Etc::SC_CLK_TCK)
+              raise unless Integer === Etc.sysconf(Etc::SC_CLK_TCK)
+            end
+            if defined?(Etc::CS_PATH)
+              raise unless String === Etc.confstr(Etc::CS_PATH)
+            end
+            if defined?(Etc::PC_PIPE_BUF)
+              IO.pipe { |r, w|
+                val = w.pathconf(Etc::PC_PIPE_BUF)
+                raise unless val.nil? || val.kind_of?(Integer)
+              }
+            end
+            raise unless Integer === Etc.nprocessors
+          end
+        end
+      end.each(&:join)
+    RUBY
+  end
+
+  def test_ractor_unsafe
+    assert_ractor(<<~RUBY, require: 'etc')
+      r = Ractor.new do
+        begin
+          Etc.passwd
+        rescue => e
+          e.class
+        end
+      end.value
+      assert_equal Ractor::UnsafeError, r
+    RUBY
+  end
+
+  def test_ractor_passwd
+    omit("https://bugs.ruby-lang.org/issues/21115")
     return unless Etc.passwd # => skip test if no platform support
     Etc.endpwent
 
     assert_ractor(<<~RUBY, require: 'etc')
-      ractor = Ractor.new do
+      ractor = Ractor.new port = Ractor::Port.new do |port|
         Etc.passwd do |s|
-          Ractor.yield :sync
-          Ractor.yield s.name
+          port << :sync
+          port << s.name
           break :done
         end
       end
-      ractor.take # => :sync
+      port.receive # => :sync
       assert_raise RuntimeError, /parallel/ do
         Etc.passwd {}
       end
-      name = ractor.take # => first name
-      ractor.take # => :done
+      name = port.receive # => first name
+      ractor.join # => :done
       name2 = Etc.passwd do |s|
         break s.name
       end
       assert_equal(name2, name)
     RUBY
   end
+
+  def test_ractor_getgrgid
+    omit("https://bugs.ruby-lang.org/issues/21115")
+
+    assert_ractor(<<~RUBY, require: 'etc')
+      20.times.map do
+        Ractor.new do
+          1000.times do
+            raise unless Etc.getgrgid(Process.gid).gid == Process.gid
+          end
+        end
+      end.each(&:join)
+    RUBY
+  end
 end
diff --git a/test/mri/excludes/CGIEscapePureRubyTest.rb b/test/mri/excludes/CGIEscapePureRubyTest.rb
new file mode 100644
index 00000000000..e3f898c3e90
--- /dev/null
+++ b/test/mri/excludes/CGIEscapePureRubyTest.rb
@@ -0,0 +1,5 @@
+exclude :test_cgi_unescapeHTML_following_known_first_letter, "broken aliasing logic causes this test to break others, see https://github.com/jruby/jruby/issues/9251"
+exclude :test_cgi_escapeHTML_with_invalid_byte_sequence, "broken aliasing logic causes this test to break others, see https://github.com/jruby/jruby/issues/9251"
+exclude :test_cgi_unescapeHTML_following_number_sign, "broken aliasing logic causes this test to break others, see https://github.com/jruby/jruby/issues/9251"
+exclude :test_cgi_unescapeHTML_following_invalid_numeric, "broken aliasing logic causes this test to break others, see https://github.com/jruby/jruby/issues/9251"
+exclude :test_cgi_unescapeHTML_with_invalid_byte_sequence, "broken aliasing logic causes this test to break others, see https://github.com/jruby/jruby/issues/9251"
diff --git a/test/mri/excludes/OpenSSL/TestASN1.rb b/test/mri/excludes/OpenSSL/TestASN1.rb
index bb0190a6d74..29ed2b82466 100644
--- a/test/mri/excludes/OpenSSL/TestASN1.rb
+++ b/test/mri/excludes/OpenSSL/TestASN1.rb
@@ -1,23 +1,11 @@
 exclude :test_basic_asn1data, "work in progress"
 exclude :test_basic_constructed, "work in progress"
-exclude :test_basic_primitive, "work in progress"
-exclude :test_bit_string_infinite_length, 'encoding works but decoding not implemented'
-exclude :test_bitstring, "work in progress"
-exclude :test_cons_explicit_tagging, 'needs investigation'
-exclude :test_cons_implicit_tagging, 'needs investigation'
-exclude :test_cons_without_array_forbidden, 'needs investigation'
-exclude :test_create_inf_length_primitive, 'needs investigation'
 exclude :test_decode_constructed_overread, "work in progress"
-exclude :test_decode_x509_certificate, "work in progress"
 exclude :test_end_of_content, "work in progress"
+exclude :test_generalizedtime, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_object_identifier, "work in progress"
-exclude :test_octet_string_constructed_tagging, "work in progress"
-exclude :test_octet_string_infinite_length_explicit_tagging, 'needs investigation'
-exclude :test_octet_string_infinite_length_implicit_tagging, 'needs investigation'
-exclude :test_prim_implicit_tagging, 'needs investigation'
 exclude :test_recursive_octet_string_indefinite_length, "work in progress"
-exclude :test_recursive_octet_string_infinite_length, 'needs investigation'
-exclude :test_recursive_octet_string_parse, 'needs investigation'
+exclude :test_recursive_octet_string_parse, "work in progress"
 exclude :test_sequence, "work in progress"
 exclude :test_set, "work in progress"
-exclude :test_string_basic, "work in progress"
+exclude :test_utctime, "ASN1Error expected but nothing raised"
diff --git a/test/mri/excludes/OpenSSL/TestCipher.rb b/test/mri/excludes/OpenSSL/TestCipher.rb
index 495a6a68803..97cc21c273f 100644
--- a/test/mri/excludes/OpenSSL/TestCipher.rb
+++ b/test/mri/excludes/OpenSSL/TestCipher.rb
@@ -1,6 +1,5 @@
-exclude :test_AES, 'works - just need to enable JCE unlimited strength'
-exclude :test_AES_crush, 'needs investigation'
 exclude :test_aes_gcm, "work in progress"
+exclude :test_auth_tag_error_inheritance, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_ciphers, "work in progress"
 exclude :test_crypt_after_key, "work in progress"
 exclude :test_key_iv_set, "work in progress"
diff --git a/test/mri/excludes/OpenSSL/TestDigest.rb b/test/mri/excludes/OpenSSL/TestDigest.rb
index 73eb16f2dcd..a643fe9b328 100644
--- a/test/mri/excludes/OpenSSL/TestDigest.rb
+++ b/test/mri/excludes/OpenSSL/TestDigest.rb
@@ -1,3 +1,5 @@
+exclude :test_digest_by_oid_and_name, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, Unsupported digest algorithm (RSA-SHA256)"
 exclude :test_digests, "work in progress"
+exclude :test_initialize, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, uninitialized constant OpenSSL::Digest::DigestError"
 exclude :test_sha3, "work in progress"
 exclude :test_sha512_truncate, "work in progress"
diff --git a/test/mri/excludes/OpenSSL/TestEC.rb b/test/mri/excludes/OpenSSL/TestEC.rb
index 6b253f280bf..d82308c1938 100644
--- a/test/mri/excludes/OpenSSL/TestEC.rb
+++ b/test/mri/excludes/OpenSSL/TestEC.rb
@@ -1,14 +1,9 @@
-exclude :test_ECPrivateKey, "work in progress"
-exclude :test_ECPrivateKey_encrypted, "work in progress"
-exclude :test_PUBKEY, "work in progress"
 exclude :test_check_key, "work in progress"
-exclude :test_derive_key, "TODO: OpenSSL::PKey::EC#derive not yet implemented"
-exclude :test_dh_compute_key, "work in progress"
-exclude :test_dsa_sign_asn1_FIPS186_3, "work in progress"
-exclude :test_ec_group, "work in progress"
-exclude :test_ec_key, "work in progress"
+exclude :test_ECPrivateKey_encrypted, "PKeyError expected, got ECError - error class hierarchy mismatch with Ruby 4.0 tests"
 exclude :test_ec_point, "work in progress"
 exclude :test_ec_point_add, "work in progress"
 exclude :test_ec_point_mul, "work in progress"
-exclude :test_generate_key, "work in progress"
+exclude :test_generate, "PKeyError expected, got ECError - error class hierarchy mismatch with Ruby 4.0 tests"
+exclude :test_generate_key, "PKeyError expected, got ECError - error class hierarchy mismatch with Ruby 4.0 tests"
 exclude :test_sign_verify_raw, "work in progress"
+exclude :test_small_curve, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, null curve name"
diff --git a/test/mri/excludes/OpenSSL/TestKDF.rb b/test/mri/excludes/OpenSSL/TestKDF.rb
new file mode 100644
index 00000000000..208b59cb061
--- /dev/null
+++ b/test/mri/excludes/OpenSSL/TestKDF.rb
@@ -0,0 +1,3 @@
+exclude :test_hkdf_rfc5869_test_case_1, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, undefined method 'hkdf' for module OpenSSL::KDF"
+exclude :test_hkdf_rfc5869_test_case_3, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, undefined method 'hkdf' for module OpenSSL::KDF"
+exclude :test_hkdf_rfc5869_test_case_4, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, undefined method 'hkdf' for module OpenSSL::KDF"
diff --git a/test/mri/excludes/OpenSSL/TestOSSL.rb b/test/mri/excludes/OpenSSL/TestOSSL.rb
new file mode 100644
index 00000000000..800d7b89451
--- /dev/null
+++ b/test/mri/excludes/OpenSSL/TestOSSL.rb
@@ -0,0 +1 @@
+exclude :test_error_data, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: IP Address is invalid"
diff --git a/test/mri/excludes/OpenSSL/TestPKCS7.rb b/test/mri/excludes/OpenSSL/TestPKCS7.rb
index 70a7882e308..9b256a958fd 100644
--- a/test/mri/excludes/OpenSSL/TestPKCS7.rb
+++ b/test/mri/excludes/OpenSSL/TestPKCS7.rb
@@ -1,6 +1,12 @@
+exclude :test_data, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, PKCS7Error: PKCS7[Method: 105, Reason: 112, Data: null]"
+exclude :test_decode_ber_constructed_string, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, need to retrieve Cipher from String parameter"
+exclude :test_detached_sign, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_empty_signed_data_ruby_bug_19974, "work in progress"
 exclude :test_enveloped, "work in progress"
+exclude :test_enveloped_add_recipient, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, PKCS7Error: PKCS7[Method: 105, Reason: 116, Data: null]"
 exclude :test_graceful_parsing_failure, 'needs investigation'
 exclude :test_signed_add_signer, "work in progress"
+exclude :test_signed_authenticated_attributes, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
+exclude :test_signed_flags, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, NullPointerException: 'element' cannot be null in SignerInfoWithPkey.toASN1Object"
 exclude :test_smime, "work in progress"
 exclude :test_to_text, "work in progress"
diff --git a/test/mri/excludes/OpenSSL/TestPKey.rb b/test/mri/excludes/OpenSSL/TestPKey.rb
index 03e943093d3..8563de10292 100644
--- a/test/mri/excludes/OpenSSL/TestPKey.rb
+++ b/test/mri/excludes/OpenSSL/TestPKey.rb
@@ -1,8 +1,13 @@
 exclude :"test_compare?", "work in progress"
 exclude :test_ed25519, "work in progress"
 exclude :test_generic_oid_inspect, "work in progress"
+exclude :test_generic_oid_inspect_rsa, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_hmac_sign_verify, "work in progress"
+exclude :test_legacy_error_classes, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
+exclude :test_raw_initialize_errors, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_s_generate_key, "work in progress"
 exclude :test_s_generate_parameters, "work in progress"
 exclude :test_s_generate_parameters_with_block, "work in progress"
-exclude :test_x25519, "work in progress"
+exclude :test_s_read_der_then_pem, "PKey.read returns different DER encoding on master"
+exclude :test_s_read_passphrase, "PKeyError: Could not parse PKey: unsupported"
+exclude :test_x25519, "PKeyError: Could not parse PKey: unsupported"
diff --git a/test/mri/excludes/OpenSSL/TestPKeyDH.rb b/test/mri/excludes/OpenSSL/TestPKeyDH.rb
index 2952eb18e5e..c79466b24ad 100644
--- a/test/mri/excludes/OpenSSL/TestPKeyDH.rb
+++ b/test/mri/excludes/OpenSSL/TestPKeyDH.rb
@@ -6,5 +6,6 @@
 exclude :test_marshal, "work in progress"
 exclude :test_new_break, 'needs investigation'
 exclude :test_new_break_on_non_fips, "hangs (tested on macos M1)"
+exclude :test_params, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_params_ok?, "work in progress"
 exclude :test_public_key, 'needs investigation'
diff --git a/test/mri/excludes/OpenSSL/TestPKeyDSA.rb b/test/mri/excludes/OpenSSL/TestPKeyDSA.rb
index 3fd9c1685fe..9c961ba4cf6 100644
--- a/test/mri/excludes/OpenSSL/TestPKeyDSA.rb
+++ b/test/mri/excludes/OpenSSL/TestPKeyDSA.rb
@@ -1,5 +1,7 @@
+exclude :test_DSAPrivateKey, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: Bad sequence size: 3"
+exclude :test_DSAPrivateKey_encrypted, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: Bad sequence size: 3"
+exclude :test_PUBKEY, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: Bad sequence size: 3"
 exclude :test_dup, 'passes except for setting (invalid) `key2.p + 1` as validation happens early'
-exclude :test_export_password_length, 'needs investigation'
 exclude :test_new_break, 'needs investigation'
-exclude :test_sign_verify, "work in progress"
-exclude :test_sign_verify_raw, "TODO: sign_raw not implemented"
+exclude :test_new_empty, "PKeyError expected, got DSAError - error class hierarchy mismatch with Ruby 4.0 tests"
+exclude :test_sign_verify_raw, "work in progress"
diff --git a/test/mri/excludes/OpenSSL/TestPKeyRSA.rb b/test/mri/excludes/OpenSSL/TestPKeyRSA.rb
index 3f35458101d..2be04d98ea2 100644
--- a/test/mri/excludes/OpenSSL/TestPKeyRSA.rb
+++ b/test/mri/excludes/OpenSSL/TestPKeyRSA.rb
@@ -1,15 +1,12 @@
-exclude :test_dup, "work in progress"
+exclude :test_RSAPrivateKey_encrypted, "PKeyError expected, got RSAError - error class hierarchy mismatch with Ruby 4.0 tests"
 exclude :test_encrypt_decrypt, "work in progress"
 exclude :test_encrypt_decrypt_legacy, "work in progress"
-exclude :test_export, "work in progress"
-exclude :test_export_password_length, 'needs investigation'
 exclude :test_new_break, 'needs investigation'
+exclude :test_no_private_exp, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
+exclude :test_params, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_pem_passwd, "work in progress"
-exclude :test_private_encoding, "work in progress"
 exclude :test_private_encoding_encrypted, "work in progress"
-exclude :test_read_private_key_pem_pw, 'needs investigation'
 exclude :test_sign_verify_memory_leak, 'depends on GC.start forcing GC and changing memory size (e.g. RSS)'
-exclude :test_sign_verify_options, "work in progress"
-exclude :test_sign_verify_pss, "work in progress"
+exclude :test_sign_verify_pss, "PKeyError expected, got RSAError - error class hierarchy mismatch with Ruby 4.0 tests"
 exclude :test_sign_verify_raw, "work in progress"
-exclude :test_to_der, "work in progress"
+exclude :test_sign_verify_raw_legacy, "PKeyError expected, got RSAError - error class hierarchy mismatch with Ruby 4.0 tests"
diff --git a/test/mri/excludes/OpenSSL/TestSSL.rb b/test/mri/excludes/OpenSSL/TestSSL.rb
index 2bf58fa257e..030ad7a694c 100644
--- a/test/mri/excludes/OpenSSL/TestSSL.rb
+++ b/test/mri/excludes/OpenSSL/TestSSL.rb
@@ -6,43 +6,38 @@
 exclude :test_ciphers_method_bogus_csuite, "work in progress"
 exclude :test_ciphers_method_frozen_object, "work in progress"
 exclude :test_ciphers_method_tls_connection, "work in progress"
+exclude :test_ciphersuites_method_bogus_csuite, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, missing method on SSLContext"
+exclude :test_ciphersuites_method_frozen_object, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
+exclude :test_ciphersuites_method_nil_argument, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, missing method on SSLContext"
+exclude :test_ciphersuites_method_tls_connection, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, missing method on SSLContext"
 exclude :test_client_ca, 'needs investigation'
 exclude :test_client_cert_cb_ignore_error, "work in progress"
+exclude :test_client_sigalgs, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, undefined method 'client_sigalgs=' for an instance of OpenSSL::SSL::SSLContext"
 exclude :test_connect_certificate_verify_failed_exception_message, "work in progress"
 exclude :test_connect_works_when_setting_dh_callback_to_nil, "work in progress"
 exclude :test_ctx_options_config, "work in progress"
-exclude :test_ctx_setup_invalid, 'works sufficiently - low priority'
 exclude :test_dup, "work in progress"
 exclude :test_ecdh_curves_tls12, "work in progress"
 exclude :test_ecdh_curves_tls13, "work in progress"
 exclude :test_exception_in_verify_callback_is_ignored, "work in progress"
 exclude :test_export_keying_material, "work in progress"
+exclude :test_extra_chain_cert_auto_chain, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_finished_messages, 'hangs for a long time and then fails'
-exclude :test_freeze_calls_setup, "work in progress"
 exclude :test_get_ephemeral_key, "work in progress"
-exclude :test_getbyte, "work in progress"
 exclude :test_keylog_cb, "work in progress"
-exclude :test_npn_advertised_protocol_too_long, 'SSLContext#npn_protocols= not supported'
-exclude :test_npn_protocol_selection_ary, 'SSLContext#npn_protocols= not supported'
-exclude :test_npn_protocol_selection_cancel, 'SSLContext#npn_protocols= not supported'
-exclude :test_npn_protocol_selection_enum, 'SSLContext#npn_protocols= not supported'
-exclude :test_npn_selected_protocol_too_long, 'SSLContext#npn_protocols= not supported'
-exclude :test_options_defaults_to_OP_ALL_on, 'needs investigation'
-exclude :test_options_setting_nil_means_all, 'needs investigation'
+exclude :test_minmax_version_system_default, "TLS version mismatch - expects TLSv1.2 but gets TLSv1.3"
 exclude :test_post_connect_check_with_anon_ciphers, 'needs investigation'
-exclude :test_read_nonblock_without_session, 'HANGS'
+exclude :test_read_with_timeout, "timeout methods not implemented, https://github.com/jruby/jruby-openssl/issues/342"
+exclude :test_respect_system_default_min, "SSLError expected but nothing raised"
 exclude :test_readbyte, "work in progress"
-exclude :test_renegotiation_cb, 'SSLContext#renegotiation_cb= not supported'
 exclude :test_security_level, "work in progress"
-exclude :test_servername_cb, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
-exclude :test_servername_cb_calls_setup_on_returned_ctx, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
-exclude :test_servername_cb_can_return_nil, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
-exclude :test_servername_cb_raises_an_exception_on_unknown_objects, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
-exclude :test_servername_cb_sets_context_on_the_socket, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
-exclude :test_socket_close_write, "work in progress"
-exclude :test_ssl_sysread_blocking_error, 'works except JRuby-OpenSSL does not raise TypeError on SSLSocket#sysread(4, exception: false)'
+exclude :test_servername_cb_raises_an_exception_on_unknown_objects, "work in progress"
+exclude :test_set_groups_tls12, "OpenSSL::SSL::SSLError: no cipher match"
+exclude :test_set_groups_tls13, "undefined method 'groups=' for SSLContext"
+exclude :test_sigalgs, "undefined method 'add_certificate' for SSLContext"
 exclude :test_ssl_with_server_cert, "work in progress"
 exclude :test_sslctx_set_params, "work in progress"
+exclude :test_sysread_and_syswrite, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, appears to hang and timeout"
 exclude :test_tlsext_hostname, "work in progress"
 exclude :test_tmp_dh, "work in progress"
 exclude :test_tmp_dh_callback, "work in progress"
diff --git a/test/mri/excludes/OpenSSL/TestX509CRL.rb b/test/mri/excludes/OpenSSL/TestX509CRL.rb
index 046523ecd2e..14c2762fa51 100644
--- a/test/mri/excludes/OpenSSL/TestX509CRL.rb
+++ b/test/mri/excludes/OpenSSL/TestX509CRL.rb
@@ -1,5 +1,7 @@
+exclude :test_basic, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_eq, "work in progress"
 exclude :test_extension, "work in progress"
 exclude :test_marshal, "work in progress"
 exclude :test_revoked_to_der, "work in progress"
 exclude :test_sign_and_verify_ed25519, "work in progress"
+exclude :test_sign_and_verify_nil_digest, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
diff --git a/test/mri/excludes/OpenSSL/TestX509Certificate.rb b/test/mri/excludes/OpenSSL/TestX509Certificate.rb
index a4b605e0817..2660c3f764e 100644
--- a/test/mri/excludes/OpenSSL/TestX509Certificate.rb
+++ b/test/mri/excludes/OpenSSL/TestX509Certificate.rb
@@ -1,15 +1,11 @@
-exclude :test_aia, "work in progress"
 exclude :test_akiski, "work in progress"
-exclude :test_crl_uris, "work in progress"
 exclude :test_crl_uris_multiple_general_names, "work in progress"
 exclude :test_crl_uris_no_uris, "work in progress"
-exclude :test_eq, "work in progress"
-exclude :test_extension, "work in progress"
-exclude :test_invalid_extension, "work in progress"
+exclude :test_inspect, "inspect format differs from CRuby (subject= vs subject=#<OpenSSL::X509::Name>)"
 exclude :test_load_file_certificate_der, "work in progress"
 exclude :test_load_file_empty_pem, "work in progress"
 exclude :test_load_file_fullchain_garbage, "work in progress"
 exclude :test_load_file_fullchain_pem, "work in progress"
 exclude :test_read_der_then_pem, "work in progress"
 exclude :test_sign_and_verify_ed25519, "work in progress"
-exclude :test_tbs_precert_bytes, "work in progress"
+exclude :test_sign_and_verify_nil_digest, "undefined method 'generate_key' for module OpenSSL::PKey"
diff --git a/test/mri/excludes/OpenSSL/TestX509Extension.rb b/test/mri/excludes/OpenSSL/TestX509Extension.rb
index 86450924246..fa19bf050e8 100644
--- a/test/mri/excludes/OpenSSL/TestX509Extension.rb
+++ b/test/mri/excludes/OpenSSL/TestX509Extension.rb
@@ -1,4 +1,2 @@
 exclude :test_create_by_factory, 'needs investigation'
-exclude :test_dup, "work in progress"
 exclude :test_factory_create_extension_oid, "work in progress"
-exclude :test_value_der, "work in progress"
diff --git a/test/mri/excludes/OpenSSL/TestX509Request.rb b/test/mri/excludes/OpenSSL/TestX509Request.rb
index 3a9872df215..a3c8eed01cd 100644
--- a/test/mri/excludes/OpenSSL/TestX509Request.rb
+++ b/test/mri/excludes/OpenSSL/TestX509Request.rb
@@ -1,8 +1,2 @@
-exclude :test_attr, 'fails with <2> expected but was <0> [test_x509req.rb:94]'
-exclude :test_dup, "work in progress"
-exclude :test_eq, "work in progress"
-exclude :test_marshal, "work in progress"
-exclude :test_sign_and_verify, 'Version broke in recent rewrite'
 exclude :test_sign_and_verify_ed25519, "work in progress"
-exclude :test_sign_and_verify_rsa_sha1, "work in progress"
-exclude :test_version, 'Version broke in recent rewrite'
+exclude :test_sign_and_verify_nil_digest, "undefined method 'generate_key' for module OpenSSL::PKey"
diff --git a/test/mri/excludes/TC_Set.rb b/test/mri/excludes/TC_Set.rb
deleted file mode 100644
index ec32cd9f90b..00000000000
--- a/test/mri/excludes/TC_Set.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude :"test_intersect?", "work in progress"
diff --git a/test/mri/excludes/TC_SortedSet.rb b/test/mri/excludes/TC_SortedSet.rb
deleted file mode 100644
index 48d8e35bd4c..00000000000
--- a/test/mri/excludes/TC_SortedSet.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-exclude :test_error, "work in progress"
-exclude :test_sortedset, "needs investigation"
diff --git a/test/mri/excludes/TestAlias.rb b/test/mri/excludes/TestAlias.rb
index 9107d29bead..1643df06ed2 100644
--- a/test/mri/excludes/TestAlias.rb
+++ b/test/mri/excludes/TestAlias.rb
@@ -1,2 +1,3 @@
 exclude :test_alias_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_alias_wb_miss, "no GC.verify_internal_consistency method"
+exclude :test_undef_method_error_message_with_zsuper_method, "strange undef case with module prepends"
diff --git a/test/mri/excludes/TestBacktrace.rb b/test/mri/excludes/TestBacktrace.rb
index 6a67eeda616..009f22d0c45 100644
--- a/test/mri/excludes/TestBacktrace.rb
+++ b/test/mri/excludes/TestBacktrace.rb
@@ -7,3 +7,5 @@
 exclude :test_each_backtrace_location, "work in progress"
 exclude :test_no_receiver_for_anonymous_class, "line number is off by one in JIT modes"
 exclude :test_notty_backtrace, "work in progress"
+exclude :test_backtrace_internal_frame, "no classes in backtrace yet, https://github.com/jruby/jruby/issues/8660"
+exclude :test_backtrace_on_argument_error, "no classes in backtrace yet, https://github.com/jruby/jruby/issues/8660"
diff --git a/test/mri/excludes/TestData.rb b/test/mri/excludes/TestData.rb
deleted file mode 100644
index 36fbe2ee228..00000000000
--- a/test/mri/excludes/TestData.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude :test_inspect, "fails in JIT mode on Linux CI on GHA"
diff --git a/test/mri/excludes/TestDefined.rb b/test/mri/excludes/TestDefined.rb
index f78bfb6d91e..78f1319f383 100644
--- a/test/mri/excludes/TestDefined.rb
+++ b/test/mri/excludes/TestDefined.rb
@@ -1,6 +1,7 @@
 exclude :test_defined_empty_paren_expr, "work in progress"
 exclude :test_defined_matchdata, "work in progress"
 exclude :test_defined_method_single_call, "work in progress"
+exclude :test_defined_paren_void_stmts, "needs investigation"
 exclude :test_defined_protected_method, "work in progress"
 exclude :test_defined_refined_call_with_using, "work in progress"
 exclude :test_defined_refined_vcall_with_using, "work in progress"
diff --git a/test/mri/excludes/TestEnumerator.rb b/test/mri/excludes/TestEnumerator.rb
index 8cd56fc0951..094aefdc7ff 100644
--- a/test/mri/excludes/TestEnumerator.rb
+++ b/test/mri/excludes/TestEnumerator.rb
@@ -1,4 +1,3 @@
-exclude :test_each_arg, "unfinished in initial 2.6 work, #6161"
 exclude :test_generator, "missing FrozenError"
 exclude :test_initialize_copy, "missing TypeError"
 exclude :test_inspect, "unfinished in initial 2.6 work, #6161"
diff --git a/test/mri/excludes/TestException.rb b/test/mri/excludes/TestException.rb
index af4e4139482..a27bb3ee9ee 100644
--- a/test/mri/excludes/TestException.rb
+++ b/test/mri/excludes/TestException.rb
@@ -1,21 +1,14 @@
-
-exclude :test_cause_exception_in_cause_message, "work in progress"
-exclude :test_circular_cause_handle, "needs investigation"
-exclude :test_control_in_message, "work in progress"
-exclude :test_detailed_message_under_gc_compact_stress, "GC is not configurable"
-exclude :test_errinfo_encoding_in_debug, "needs investigation"
-exclude :test_errno_constants, "needs investigation"
+exclude :test_cause_exception_in_cause_message, "we don't dynamically call #to_s when printing exceptions"
+exclude :test_control_in_message, "encoding challenges with exception messages"
+exclude :test_errinfo_encoding_in_debug, "encoding challenges with exception messages"
 exclude :test_exception_in_ensure_with_next, "uses RubyVM"
-exclude :test_kernel_warn_uplevel, "work in progress"
+exclude :test_kernel_warn_uplevel, "we don't implement warn(uplevel:)"
 exclude :test_machine_stackoverflow, "expects Ruby SystemStackError, but we only propagate java.lang.StackOverflowError"
 exclude :test_machine_stackoverflow_by_define_method, "expects Ruby SystemStackError, but we only propagate java.lang.StackOverflowError"
-exclude :test_marshal_circular_cause, "needs investigation"
-exclude :test_multibyte_and_newline, "needs investigation"
-exclude :test_output_string_encoding, "needs investigation"
-exclude :test_raise_with_cause, "needs investigation"
-exclude :test_redefined_backtrace, "needs investigation"
+exclude :test_multibyte_and_newline, "encoding challenges with exception messages"
+exclude :test_output_string_encoding, "encoding challenges with exception messages"
+exclude :test_redefined_backtrace, "we don't dynamically call #backtrace"
 exclude :test_stackoverflow, "expects Ruby SystemStackError, but we only propagate java.lang.StackOverflowError"
-exclude :test_syntax_error_detailed_message, "probably relates to prism parser syntax error output"
+exclude :test_syntax_error_detailed_message, "passes with Prism parser"
 exclude :test_too_many_args_in_eval, "JRuby has much higher limits for passing arguments in the interpreter"
-exclude :test_warning_warn, "needs investigation"
-exclude :test_wrong_backtrace, "needs investigation"
+exclude :test_wrong_backtrace, "we don't dynamically call #backtrace"
diff --git a/test/mri/excludes/TestFiber.rb b/test/mri/excludes/TestFiber.rb
index 83b1bbedf72..400f0fde8a1 100644
--- a/test/mri/excludes/TestFiber.rb
+++ b/test/mri/excludes/TestFiber.rb
@@ -1,4 +1,5 @@
 exclude :test_error, "work in progress"
+exclude :test_exit_in_fiber, "raises NPE and then hangs"
 exclude :test_fatal_in_fiber, "work in progress"
 exclude :test_no_valid_cfp, "raises NPE rather than detecting bad context and raising a Ruby error"
 exclude :test_prohibit_transfer_to_resuming_fiber, "FiberError expected"
diff --git a/test/mri/excludes/TestFiberScheduler.rb b/test/mri/excludes/TestFiberScheduler.rb
index 6e95b4c664f..d6231274c75 100644
--- a/test/mri/excludes/TestFiberScheduler.rb
+++ b/test/mri/excludes/TestFiberScheduler.rb
@@ -1,2 +1,7 @@
 exclude :test_condition_variable, "hangs on macos M1"
 exclude :test_current_scheduler, "fails intermittently on Linux CI on GHA"
+exclude :test_io_read_error, "not hooked up to Scheduler yet, https://github.com/jruby/jruby/issues/9275"
+exclude :test_io_write_error, "not hooked up to Scheduler yet, https://github.com/jruby/jruby/issues/9275"
+exclude :test_io_write_flush_error, "not hooked up to Scheduler yet, https://github.com/jruby/jruby/issues/9275"
+exclude :test_io_write_on_flush, "not hooked up to Scheduler yet, https://github.com/jruby/jruby/issues/9275"
+exclude :test_iseq_compile_under_gc_stress_bug_21180, "uses RubyVM"
diff --git a/test/mri/excludes/TestFiberThread.rb b/test/mri/excludes/TestFiberThread.rb
index 5a77555996b..fdd5b4233e1 100644
--- a/test/mri/excludes/TestFiberThread.rb
+++ b/test/mri/excludes/TestFiberThread.rb
@@ -1 +1,2 @@
-exclude :test_broken_unblock, ""
+exclude :test_broken_unblock, "unblock needs another look"
+exclude :test_spurious_unblock_during_thread_join, "unblock needs another look"
diff --git a/test/mri/excludes/TestGc.rb b/test/mri/excludes/TestGc.rb
index 0e283126c04..371c24c1c08 100644
--- a/test/mri/excludes/TestGc.rb
+++ b/test/mri/excludes/TestGc.rb
@@ -13,6 +13,7 @@
 exclude :test_gc_internals, "MRI-specific"
 exclude :test_gc_parameter, "no GC.stat_heap method"
 exclude :test_gc_parameter_init_slots, "no GC.stat_heap method"
+exclude :test_heaps_grow_independently, "MRI-specific"
 exclude :test_interrupt_in_finalizer, "JRuby handles signals on a separate thread, plus a lot of hinky logic in this test"
 exclude :test_latest_gc_info, "no GC.latest_gc_info method"
 exclude :test_latest_gc_info_argument, "no GC.latest_gc_info method"
diff --git a/test/mri/excludes/TestHash.rb b/test/mri/excludes/TestHash.rb
index 7f806560c66..cdd2ab70ba4 100644
--- a/test/mri/excludes/TestHash.rb
+++ b/test/mri/excludes/TestHash.rb
@@ -1,5 +1,4 @@
 exclude :test_AREF_fstring_key_default_proc, "Depends on MRI-specific ObjectSpace.count_objects"
 exclude :test_compare_by_identy_memory_leak, "no working assert_no_memory_leak method"
-exclude :test_fetch_error, "needs investigation"
-exclude :test_inspect, "not matching special symbols requiring hashrocket vs colon"
 exclude :test_st_literal_memory_leak, "no working assert_no_memory_leak method"
+exclude :test_update_modify_in_block, "JRuby Hash does not detect or prevent modification during iteration (https://github.com/jruby/jruby/issues/9268)"
diff --git a/test/mri/excludes/TestHash/TestSubHash.rb b/test/mri/excludes/TestHash/TestSubHash.rb
index cff51669777..fcbc8dd8d81 100644
--- a/test/mri/excludes/TestHash/TestSubHash.rb
+++ b/test/mri/excludes/TestHash/TestSubHash.rb
@@ -1,5 +1,5 @@
 exclude :test_compare_by_identy_memory_leak, "no working assert_no_memory_leak method"
-exclude :test_fetch_error, "needs investigation"
 exclude :test_inspect, "not matching special symbols requiring hashrocket vs colon"
 exclude :test_replace_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_st_literal_memory_leak, "no working assert_no_memory_leak method"
+exclude :test_update_modify_in_block, "JRuby Hash does not detect or prevent modification during iteration (https://github.com/jruby/jruby/issues/9268)"
diff --git a/test/mri/excludes/TestHashOnly.rb b/test/mri/excludes/TestHashOnly.rb
index 76091d7d345..725089f1905 100644
--- a/test/mri/excludes/TestHashOnly.rb
+++ b/test/mri/excludes/TestHashOnly.rb
@@ -4,8 +4,6 @@
 exclude :test_compare_by_id_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_compare_by_identy_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_exception_in_rehash_memory_leak, "no working assert_no_memory_leak method"
-exclude :test_fetch_error, "needs investigation"
-exclude :test_inspect, "not matching special symbols requiring hashrocket vs colon"
 exclude :test_integer_hash_random, "JRuby does not randomize hash calculation for integer keys, see https://bugs.ruby-lang.org/issues/13002"
 exclude :test_memory_size_after_delete, "uses ObjectSpace.memsize_of"
 exclude :test_rehash_memory_leak, "no working assert_no_memory_leak method"
diff --git a/test/mri/excludes/TestIO.rb b/test/mri/excludes/TestIO.rb
index 7c282d059e9..d4224a5230d 100644
--- a/test/mri/excludes/TestIO.rb
+++ b/test/mri/excludes/TestIO.rb
@@ -6,7 +6,6 @@
 exclude :test_copy_stream_socket7, "uses fork"
 exclude :test_cross_thread_close_stdio, "needs investigation"
 exclude :test_dup_many, "needs investigation"
-exclude :test_dup_timeout, "IO#timeout is not implemented yet (https://github.com/jruby/jruby/pull/8662)"
 exclude :test_each_line, "needs investigation"
 exclude :test_each_line_limit_0, "fails in JIT mode on Linux CI on GHA"
 exclude :test_fcntl_dupfd, "needs investigation"
@@ -21,7 +20,7 @@
 exclude :test_readlines_limit_0, "hangs"
 exclude :test_readpartial_lock, "needs investigation"
 exclude :test_readpartial_locktmp, "requires string locking we do not support"
-exclude :test_recycled_fd_close, "IO#timeout is not implemented yet (https://github.com/jruby/jruby/pull/8662)"
+exclude :test_recycled_fd_close, 'fails on GHA Linux CI, NullPointerException: Cannot invoke "Object.getClass()" because "object" is null'
 exclude :test_reinitialize, "needs investigation"
 exclude :test_reopen_encoding_from_io, "needs investigation"
 exclude :test_reopen_opt, "needs investigation"
diff --git a/test/mri/excludes/TestIOBuffer.rb b/test/mri/excludes/TestIOBuffer.rb
index ea473c2015c..063f646f2d9 100644
--- a/test/mri/excludes/TestIOBuffer.rb
+++ b/test/mri/excludes/TestIOBuffer.rb
@@ -1,7 +1,14 @@
+exclude :test_bug_21210, "depends on CRuby GC APIs"
 exclude :test_copy_null_destination, "no support for null buffer"
 exclude :test_copy_null_source, "no support for null buffer"
 exclude :test_copy_overlapped_bwd, "needs investigation"
 exclude :test_file_mapped, "open files can't be memory-mapped due to jnr-enxio (https://github.com/jruby/jruby/issues/8714)"
+exclude :test_file_mapped_size_just_enough, "open files can't be memory-mapped due to jnr-enxio (https://github.com/jruby/jruby/issues/8714)"
+exclude :test_file_mapped_with_size, "open files can't be memory-mapped due to jnr-enxio (https://github.com/jruby/jruby/issues/8714)"
+exclude :test_file_mapped_offset_too_large, "open files can't be memory-mapped due to jnr-enxio (https://github.com/jruby/jruby/issues/8714)"
+exclude :test_file_mapped_negative_offset, "open files can't be memory-mapped due to jnr-enxio (https://github.com/jruby/jruby/issues/8714)"
+exclude :test_file_mapped_size_too_large, "open files can't be memory-mapped due to jnr-enxio (https://github.com/jruby/jruby/issues/8714)"
+exclude :test_file_mapped_zero_size, "open files can't be memory-mapped due to jnr-enxio (https://github.com/jruby/jruby/issues/8714)"
 exclude :test_private, "open files can't be memory-mapped due to jnr-enxio (https://github.com/jruby/jruby/issues/8714)"
 exclude :test_read_with_length_and_offset, "read of zero is supposed to read as much as it can"
 exclude :test_resize_zero_external, "missing AccessError"
diff --git a/test/mri/excludes/TestIOWaitUncommon.rb b/test/mri/excludes/TestIOWaitUncommon.rb
new file mode 100644
index 00000000000..ebcb9e1e0e9
--- /dev/null
+++ b/test/mri/excludes/TestIOWaitUncommon.rb
@@ -0,0 +1 @@
+exclude :test_after_ungetc_in_text_wait_readable, "needs investigation, may relate to text/binary mode"
diff --git a/test/mri/excludes/TestModule.rb b/test/mri/excludes/TestModule.rb
index f3038c18b8a..48294eace57 100644
--- a/test/mri/excludes/TestModule.rb
+++ b/test/mri/excludes/TestModule.rb
@@ -21,4 +21,5 @@
 exclude :test_private_constant_with_no_args, "needs investigation"
 exclude :test_protected_singleton_method, "needs investigation"
 exclude :test_redefinition_mismatch, "work in progress"
+exclude :test_set_temporary_name, "anonymous classes must update contained classes when temp name set"
 exclude :test_undef, "missing warning about undefining __id__"
diff --git a/test/mri/excludes/TestNetHTTPLocalBind.rb b/test/mri/excludes/TestNetHTTPLocalBind.rb
new file mode 100644
index 00000000000..112d42c34fd
--- /dev/null
+++ b/test/mri/excludes/TestNetHTTPLocalBind.rb
@@ -0,0 +1 @@
+exclude :test_bind_to_local_port, "port mismatch in final assertion"
diff --git a/test/mri/excludes/TestObjSpace.rb b/test/mri/excludes/TestObjSpace.rb
index ef09e9dfef7..3fefafe7b99 100644
--- a/test/mri/excludes/TestObjSpace.rb
+++ b/test/mri/excludes/TestObjSpace.rb
@@ -16,12 +16,15 @@
 exclude :test_dump_control_char, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_dynamic_symbol, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_escapes_method_name, "dumping is largely a CRuby-specific feature"
+exclude :test_dump_flag_age, "depends on running without GC"
 exclude :test_dump_flags, "dumping is largely a CRuby-specific feature"
+exclude :test_dump_include_shareable, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_includes_imemo_type, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_includes_slot_size, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_not_too_complex_shape, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_object, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_objects_dumps_page_slot_sizes, "dumping is largely a CRuby-specific feature"
+exclude :test_dump_outputs_object_id, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_reference_addresses_match_dump_all_addresses, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_shapes, "dumping is largely a CRuby-specific feature"
 exclude :test_dump_singleton_class, "dumping is largely a CRuby-specific feature"
@@ -52,4 +55,5 @@
 exclude :test_trace_object_allocations_gc_stress, "no support on JVM for live allocation tracking"
 exclude :test_trace_object_allocations_start_stop_clear, "no support on JVM for live allocation tracking"
 exclude :test_trace_object_allocations_stop_first, "no support on JVM for live allocation tracking"
+exclude :test_trace_object_allocations_with_other_tracepoint, "no support on JVM for live allocation tracking"
 exclude :test_utf8_method_names, "needs investigation"
diff --git a/test/mri/excludes/TestOpenURI.rb b/test/mri/excludes/TestOpenURI.rb
index f15908ab192..dc4b71508ff 100644
--- a/test/mri/excludes/TestOpenURI.rb
+++ b/test/mri/excludes/TestOpenURI.rb
@@ -1 +1,30 @@
+exclude :test_200, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_200_uri_open, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_200big, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_404, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_close_in_block_big, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_close_in_block_small, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_content_encoding, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_encoding, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_header, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_last_modified, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_max_redirects_success, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_max_redirects_too_many, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_mode, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_multiple_cookies, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
 exclude :test_open_timeout, "hangs on macos m1"
+exclude :test_open_uri, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_progress, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_progress_chunked, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_quoted_attvalue, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect_auth_failure_r1, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect_auth_failure_r2, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect_auth_success, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect_loop, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect_with_invalid_request_specific_fields_format, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect_with_request_specific_fields_hash, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect_with_request_specific_fields_proc, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_redirect_without_request_specific_fields_hash, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_uri_read, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
+exclude :test_without_block, "fails in http test logic, https://github.com/jruby/jruby/issues/9276"
diff --git a/test/mri/excludes/TestOpenURIProxy.rb b/test/mri/excludes/TestOpenURIProxy.rb
index 7b9abc58a11..176191328d1 100644
--- a/test/mri/excludes/TestOpenURIProxy.rb
+++ b/test/mri/excludes/TestOpenURIProxy.rb
@@ -1,3 +1,4 @@
 exclude :test_authenticated_proxy_http_basic_authentication_success, "hangs on Linux or very slow"
 exclude :test_proxy, "hangs or very slow on Linux"
 exclude :test_proxy_http_basic_authentication_failure, "hangs or very slow on Linux"
+exclude :test_proxy_http_basic_authentication_success, "hangs or very slow on MacOS"
diff --git a/test/mri/excludes/TestParse.rb b/test/mri/excludes/TestParse.rb
index c14c74fb579..3186751f5d2 100644
--- a/test/mri/excludes/TestParse.rb
+++ b/test/mri/excludes/TestParse.rb
@@ -1,4 +1,4 @@
-exclude :test_assign_in_conditional, "needs investigation"
+exclude :test_call_command, "does not parse (https://github.com/jruby/jruby/issues/9270)"
 exclude :test_define_singleton_error, "work in progress"
 exclude :test_dynamic_constant_assignment, "needs investigation"
 exclude :test_embedded_rd, "work in progress"
@@ -27,12 +27,9 @@
 exclude :test_shareable_constant_value_unfrozen, "Ractor not supported yet"
 exclude :test_shareable_constant_value_unshareable_literal, "Ractor not supported yet"
 exclude :test_string, "lots of very specific error messages in which we differ a little"
-exclude :test_symbol, "needs investigation"
 exclude :test_unassignable, "work in progress"
 exclude :test_unclosed_unicode_escape_at_eol_bug_19750, "needs investigation"
 exclude :test_unexpected_eof, "work in progress"
 exclude :test_unexpected_token_after_numeric, "work in progress"
-exclude :test_ungettable_gvar, "needs investigation"
-exclude :test_unused_variable, "work in progress"
 exclude :test_void_expr_stmts_value, "We pass the last invalid next but the test harness runs with eval for JRuby which then changes semantics"
 exclude :test_void_value_in_rhs, "needs investigation"
diff --git a/test/mri/excludes/TestPatternMatching.rb b/test/mri/excludes/TestPatternMatching.rb
index a74f1125f40..dbd06eb71b3 100644
--- a/test/mri/excludes/TestPatternMatching.rb
+++ b/test/mri/excludes/TestPatternMatching.rb
@@ -1,3 +1,5 @@
+exclude :test_alternative_pattern, "alternative patterns with local variables do not parse (https://github.com/jruby/jruby/issues/9269)"
+exclude :test_alternative_pattern_nested, "alternative patterns with local variables do not parse (https://github.com/jruby/jruby/issues/9269)"
 exclude :test_hash_pattern, "work in progress"
 exclude :test_single_pattern_error_find_pattern, "work in progress"
 exclude :test_single_pattern_error_guard_clause, "work in progress"
diff --git a/test/mri/excludes/TestProc.rb b/test/mri/excludes/TestProc.rb
index a633c0661a9..c6352cae2ab 100644
--- a/test/mri/excludes/TestProc.rb
+++ b/test/mri/excludes/TestProc.rb
@@ -5,6 +5,7 @@
 exclude :test_dup_clone, "needs investigation"
 exclude :test_hash_does_not_change_after_compaction, "needs investigation"
 exclude :test_hash_equal, "needs investigation"
+exclude :test_implicit_parameters_for_it_complex, "parser needs to treat `it` assignment as a new local variable (https://github.com/jruby/jruby/issues/9265)"
 exclude :test_lambda_warning_pass_block, "fails in JIT mode on Linux CI on GHA"
 exclude :test_parameters, "needs investigation"
 exclude :test_proc_args_single_kw_no_autosplat, "needs investigation"
diff --git a/test/mri/excludes/TestRegexp.rb b/test/mri/excludes/TestRegexp.rb
index e01e6920ca2..9092ca8a3d1 100644
--- a/test/mri/excludes/TestRegexp.rb
+++ b/test/mri/excludes/TestRegexp.rb
@@ -25,7 +25,9 @@
 exclude :test_named_capture_nonascii, "needs investigation"
 exclude :test_once_multithread, "seems to be flaky, failed in JIT mode on Linux CI on GHA"
 exclude :test_posix_bracket, "work in progress"
+exclude :test_regsub_no_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_s_timeout_memory_leak, "no working assert_no_memory_leak method"
+exclude :test_ss_in_look_behind, "new syntax for Ruby 4.0"
 exclude :test_timeout_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_timeout_nil, "times out without error on JRuby, adds 10s for no value"
 exclude :test_to_s, "needs investigation"
diff --git a/test/mri/excludes/TestRipper/ParserEvents.rb b/test/mri/excludes/TestRipper/ParserEvents.rb
index c87fd8f7282..3ed6523b1f2 100644
--- a/test/mri/excludes/TestRipper/ParserEvents.rb
+++ b/test/mri/excludes/TestRipper/ParserEvents.rb
@@ -3,6 +3,7 @@
 exclude :test_anonymous_rest_forwarding, "needs investigation"
 exclude :test_args_forward, "needs investigation"
 exclude :test_assign_error_backref, "needs investigation"
+exclude :test_call, "needs parser work, https://github.com/jruby/jruby/issues/9270"
 exclude :test_call_colon2, "needs investigation"
 exclude :test_event_coverage, "needs investigation"
 exclude :test_return_out_of_compile_error_no_memory_leak, "uses CRuby memory leak detection"
diff --git a/test/mri/excludes/TestRubyOptimization.rb b/test/mri/excludes/TestRubyOptimization.rb
index 5f32071243d..77cc2d55ce5 100644
--- a/test/mri/excludes/TestRubyOptimization.rb
+++ b/test/mri/excludes/TestRubyOptimization.rb
@@ -36,6 +36,7 @@
 exclude :test_objtostring, "may be CRuby-specific, needs investigation"
 exclude :test_opt_case_dispatch, "depends on RubyVM"
 exclude :test_opt_duparray_send_include_p, "may be CRuby-specific, needs investigation"
+exclude :test_opt_new, "uses RubyVM"
 exclude :test_opt_newarray_send_include_p, "may be CRuby-specific, needs investigation"
 exclude :test_optimized_rescue, "may be CRuby-specific, needs investigation"
 exclude :test_peephole_array_freeze, "may be CRuby-specific, needs investigation"
diff --git a/test/mri/excludes/TestSocket_TCPSocket.rb b/test/mri/excludes/TestSocket_TCPSocket.rb
index 2e3e5d90fa9..f2059ce3187 100644
--- a/test/mri/excludes/TestSocket_TCPSocket.rb
+++ b/test/mri/excludes/TestSocket_TCPSocket.rb
@@ -12,3 +12,4 @@
 exclude :test_initialize_with_hostname_resolution_failure_after_connection_failure, "needs investigation"
 exclude :test_inspect, "missing socket information"
 exclude :test_recvfrom, "no addrinfo returned"
+exclude :test_tcp_initialize_open_timeout, "connection refused to localhost"
diff --git a/test/mri/excludes/TestString.rb b/test/mri/excludes/TestString.rb
index decfbaac8e4..9f8b2b44849 100644
--- a/test/mri/excludes/TestString.rb
+++ b/test/mri/excludes/TestString.rb
@@ -7,6 +7,11 @@
 exclude :test_delete_prefix_bang_broken_encoding, "needs investigation"
 exclude :test_delete_prefix_broken_encoding, "needs investigation"
 exclude :test_each_line_chomp, "needs investigation"
+exclude :test_encode_fallback_not_string_memory_leak, "no working assert_no_memory_leak method"
+exclude :test_encode_fallback_raise_memory_leak, "no working assert_no_memory_leak method"
+exclude :test_encode_fallback_too_big_memory_leak, "no working assert_no_memory_leak method"
+exclude :test_eq_tilde_can_be_overridden, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
+exclude :test_fs, "aliased globals do not know their new name (https://github.com/jruby/jruby/issues/9177)"
 exclude :test_fs_setter, "needs investigation"
 exclude :test_grapheme_clusters, "unfinished in initial 2.6 work, #6161"
 exclude :test_grapheme_clusters_memory_leak, "no working assert_no_memory_leak method"
@@ -17,19 +22,28 @@
 exclude :test_initialize_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_initialize_nofree_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_inspect_next_line, "needs investigation"
+exclude :test_lstrip_bang_with_chars, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
+exclude :test_lstrip_with_selectors, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
 exclude :test_rindex, "needs investigation"
+exclude :test_rs, "aliased globals do not know their new name (https://github.com/jruby/jruby/issues/9177)"
 exclude :test_rstrip_bang, "needs investigation"
+exclude :test_rstrip_bang_with_chars, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
+exclude :test_rstrip_with_selectors, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
 exclude :test_scan_gc_compact_stress, "GC is not configurable"
 exclude :test_scan_segv, "requires ObjectSpace.each_object"
+exclude :test_split_with_block, "test for use-after-free in CRuby not possible in JRuby"
 exclude :test_start_with?, "needs investigation"
 exclude :test_start_with_timeout_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_string_interpolations_across_heaps_get_embedded, "uses internal GC constants"
+exclude :test_strip_bang_with_chars, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
+exclude :test_strip_with_selectors, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
 exclude :test_sub_gc_compact_stress, "GC is not configurable"
 exclude :test_sum_2, "needs investigation"
 exclude :test_tr!, "needs investigation"
 exclude :test_tr, "needs investigation"
 exclude :test_tr_s!, "needs investigation"
 exclude :test_tr_s, "needs investigation"
+exclude :test_uminus_dedup_in_place, "depends on MRI-specific interning behavior"
 exclude :test_uminus_frozen, "work in progress"
 exclude :test_uminus_no_freeze_not_bare, "work in progress"
 exclude :test_undump, "unfinished in initial 2.6 work, #6161"
diff --git a/test/mri/excludes/TestString2.rb b/test/mri/excludes/TestString2.rb
index decfbaac8e4..753b704ba88 100644
--- a/test/mri/excludes/TestString2.rb
+++ b/test/mri/excludes/TestString2.rb
@@ -7,6 +7,9 @@
 exclude :test_delete_prefix_bang_broken_encoding, "needs investigation"
 exclude :test_delete_prefix_broken_encoding, "needs investigation"
 exclude :test_each_line_chomp, "needs investigation"
+exclude :test_encode_fallback_not_string_memory_leak, "no working assert_no_memory_leak method"
+exclude :test_encode_fallback_raise_memory_leak, "no working assert_no_memory_leak method"
+exclude :test_encode_fallback_too_big_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_fs_setter, "needs investigation"
 exclude :test_grapheme_clusters, "unfinished in initial 2.6 work, #6161"
 exclude :test_grapheme_clusters_memory_leak, "no working assert_no_memory_leak method"
@@ -17,19 +20,27 @@
 exclude :test_initialize_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_initialize_nofree_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_inspect_next_line, "needs investigation"
+exclude :test_lstrip_bang_with_chars, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
+exclude :test_lstrip_with_selectors, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
 exclude :test_rindex, "needs investigation"
 exclude :test_rstrip_bang, "needs investigation"
+exclude :test_rstrip_bang_with_chars, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
+exclude :test_rstrip_with_selectors, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
 exclude :test_scan_gc_compact_stress, "GC is not configurable"
 exclude :test_scan_segv, "requires ObjectSpace.each_object"
+exclude :test_split_with_block, "test for use-after-free in CRuby not possible in JRuby"
 exclude :test_start_with?, "needs investigation"
 exclude :test_start_with_timeout_memory_leak, "no working assert_no_memory_leak method"
 exclude :test_string_interpolations_across_heaps_get_embedded, "uses internal GC constants"
+exclude :test_strip_bang_with_chars, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
+exclude :test_strip_with_selectors, "selectors are not yet supported (https://github.com/jruby/jruby/issues/9267)"
 exclude :test_sub_gc_compact_stress, "GC is not configurable"
 exclude :test_sum_2, "needs investigation"
 exclude :test_tr!, "needs investigation"
 exclude :test_tr, "needs investigation"
 exclude :test_tr_s!, "needs investigation"
 exclude :test_tr_s, "needs investigation"
+exclude :test_uminus_dedup_in_place, "depends on MRI-specific interning behavior"
 exclude :test_uminus_frozen, "work in progress"
 exclude :test_uminus_no_freeze_not_bare, "work in progress"
 exclude :test_undump, "unfinished in initial 2.6 work, #6161"
diff --git a/test/mri/excludes/TestThread.rb b/test/mri/excludes/TestThread.rb
index 112780e7815..608024fb80a 100644
--- a/test/mri/excludes/TestThread.rb
+++ b/test/mri/excludes/TestThread.rb
@@ -1,4 +1,5 @@
 exclude :test_abort_on_exception, "very sensitive to thread timing and parallelism"
+exclude :test_deadlock_backtrace, "JRuby does not do deadlock detection beyond what JVM provides"
 exclude :test_inspect_with_fiber, "Thread.current is known to reflect the fiber, not the thread, in JRuby"
 exclude :test_list, "JVM finalizer threads get adopted, randomly skewing the result (#4960)"
 exclude :test_machine_stack_size, "slow and unreliable"
diff --git a/test/mri/excludes/TestVariable.rb b/test/mri/excludes/TestVariable.rb
index 18481887ad1..cfe2671167f 100644
--- a/test/mri/excludes/TestVariable.rb
+++ b/test/mri/excludes/TestVariable.rb
@@ -1,7 +1,8 @@
+exclude :test_cloned_allows_setting_cvar, "needs investigation"
+exclude :test_exivar_resize_with_compaction_stress, "depends on CRuby GC APIs"
 exclude :test_global_variables, "requires dynamic listing of backref numbers for available groups"
 exclude :test_setting_class_variable_on_module_through_inheritance, "work in progress"
 exclude :test_singleton_class_included_class_variable, "work in progress"
 exclude :test_special_constant_ivars, "work in progress"
 exclude :test_svar_with_ifunc, "new isolation of proc frame captures, see https://github.com/jruby/jruby/issues/8726"
 exclude :test_variable, "needs investigation"
-exclude :test_cloned_allows_setting_cvar, "needs investigation"
diff --git a/test/mri/fiber/scheduler.rb b/test/mri/fiber/scheduler.rb
index ac19bba7a29..8f1ce4376b2 100644
--- a/test/mri/fiber/scheduler.rb
+++ b/test/mri/fiber/scheduler.rb
@@ -65,63 +65,79 @@ def next_timeout
     end
   end
 
-  def run
-    # $stderr.puts [__method__, Fiber.current].inspect
+  def run_once
+    readable = writable = nil
 
-    while @readable.any? or @writable.any? or @waiting.any? or @blocking.any?
-      # May only handle file descriptors up to 1024...
+    begin
       readable, writable = IO.select(@readable.keys + [@urgent.first], @writable.keys, [], next_timeout)
+    rescue IOError
+      # Ignore - this can happen if the IO is closed while we are waiting.
+    end
 
-      # puts "readable: #{readable}" if readable&.any?
-      # puts "writable: #{writable}" if writable&.any?
+    # puts "readable: #{readable}" if readable&.any?
+    # puts "writable: #{writable}" if writable&.any?
 
-      selected = {}
+    selected = {}
 
-      readable&.each do |io|
-        if fiber = @readable.delete(io)
-          @writable.delete(io) if @writable[io] == fiber
-          selected[fiber] = IO::READABLE
-        elsif io == @urgent.first
-          @urgent.first.read_nonblock(1024)
-        end
+    readable&.each do |io|
+      if fiber = @readable.delete(io)
+        @writable.delete(io) if @writable[io] == fiber
+        selected[fiber] = IO::READABLE
+      elsif io == @urgent.first
+        @urgent.first.read_nonblock(1024)
       end
+    end
 
-      writable&.each do |io|
-        if fiber = @writable.delete(io)
-          @readable.delete(io) if @readable[io] == fiber
-          selected[fiber] = selected.fetch(fiber, 0) | IO::WRITABLE
-        end
+    writable&.each do |io|
+      if fiber = @writable.delete(io)
+        @readable.delete(io) if @readable[io] == fiber
+        selected[fiber] = selected.fetch(fiber, 0) | IO::WRITABLE
       end
+    end
 
-      selected.each do |fiber, events|
-        fiber.transfer(events)
-      end
+    selected.each do |fiber, events|
+      fiber.transfer(events)
+    end
+
+    if @waiting.any?
+      time = current_time
+      waiting, @waiting = @waiting, {}
 
-      if @waiting.any?
-        time = current_time
-        waiting, @waiting = @waiting, {}
-
-        waiting.each do |fiber, timeout|
-          if fiber.alive?
-            if timeout <= time
-              fiber.transfer
-            else
-              @waiting[fiber] = timeout
-            end
+      waiting.each do |fiber, timeout|
+        if fiber.alive?
+          if timeout <= time
+            fiber.transfer
+          else
+            @waiting[fiber] = timeout
           end
         end
       end
+    end
 
-      if @ready.any?
-        ready = nil
+    if @ready.any?
+      ready = nil
 
-        @lock.synchronize do
-          ready, @ready = @ready, []
-        end
+      @lock.synchronize do
+        ready, @ready = @ready, []
+      end
 
-        ready.each do |fiber|
-          fiber.transfer
-        end
+      ready.each do |fiber|
+        fiber.transfer if fiber.alive?
+      end
+    end
+  end
+
+  def run
+    # $stderr.puts [__method__, Fiber.current].inspect
+
+    # Use Thread.handle_interrupt like Async::Scheduler does
+    # This defers signal processing, which is the root cause of the gRPC bug
+    # See: https://github.com/socketry/async/blob/main/lib/async/scheduler.rb
+    Thread.handle_interrupt(::SignalException => :never) do
+      while @readable.any? or @writable.any? or @waiting.any? or @blocking.any?
+        run_once
+
+        break if Thread.pending_interrupt?
       end
     end
   end
@@ -239,6 +255,13 @@ def io_select(...)
     end.value
   end
 
+  # This hook is invoked by `IO#close`. Using a separate IO object
+  # demonstrates that the close operation is asynchronous.
+  def io_close(descriptor)
+    Fiber.blocking{IO.for_fd(descriptor.to_i).close}
+    return true
+  end
+
   # This hook is invoked by `Kernel#sleep` and `Thread::Mutex#sleep`.
   def kernel_sleep(duration = nil)
     # $stderr.puts [__method__, duration, Fiber.current].inspect
@@ -290,6 +313,30 @@ def unblock(blocker, fiber)
     io.write_nonblock('.')
   end
 
+  class FiberInterrupt
+    def initialize(fiber, exception)
+      @fiber = fiber
+      @exception = exception
+    end
+
+    def alive?
+      @fiber.alive?
+    end
+
+    def transfer
+      @fiber.raise(@exception)
+    end
+  end
+
+  def fiber_interrupt(fiber, exception)
+    @lock.synchronize do
+      @ready << FiberInterrupt.new(fiber, exception)
+    end
+
+    io = @urgent.last
+    io.write_nonblock('.')
+  end
+
   # This hook is invoked by `Fiber.schedule`. Strictly speaking, you should use
   # it to create scheduled fibers, but it is not required in practice;
   # `Fiber.new` is usually sufficient.
@@ -311,7 +358,7 @@ def address_resolve(hostname)
   end
 
   def blocking_operation_wait(work)
-    thread = Thread.new(&work)
+    thread = Thread.new{work.call}
 
     thread.join
 
@@ -441,6 +488,33 @@ def blocking(&block)
   end
 end
 
+class IOScheduler < Scheduler
+  def operations
+    @operations ||= []
+  end
+
+  def io_write(io, buffer, length, offset)
+    descriptor = io.fileno
+    string = buffer.get_string
+
+    self.operations << [:io_write, descriptor, string]
+
+    Fiber.blocking do
+      buffer.write(io, 0, offset)
+    end
+  end
+end
+
+class IOErrorScheduler < Scheduler
+  def io_read(io, buffer, length, offset)
+    return -Errno::EBADF::Errno
+  end
+
+  def io_write(io, buffer, length, offset)
+    return -Errno::EINVAL::Errno
+  end
+end
+
 # This scheduler has a broken implementation of `unblock`` in the sense that it
 # raises an exception. This is used to test the behavior of the scheduler when
 # unblock raises an exception.
diff --git a/test/mri/fiber/test_io.rb b/test/mri/fiber/test_io.rb
index 39e32c59876..eea06f97c82 100644
--- a/test/mri/fiber/test_io.rb
+++ b/test/mri/fiber/test_io.rb
@@ -9,7 +9,7 @@ def test_read
     omit unless defined?(UNIXSocket)
 
     i, o = UNIXSocket.pair
-    if RUBY_PLATFORM=~/mswin|mingw/
+    if RUBY_PLATFORM =~ /mswin|mingw/
       i.nonblock = true
       o.nonblock = true
     end
@@ -44,7 +44,7 @@ def test_heavy_read
     16.times.map do
       Thread.new do
         i, o = UNIXSocket.pair
-        if RUBY_PLATFORM=~/mswin|mingw/
+        if RUBY_PLATFORM =~ /mswin|mingw/
           i.nonblock = true
           o.nonblock = true
         end
@@ -67,7 +67,7 @@ def test_heavy_read
 
   def test_epipe_on_read
     omit unless defined?(UNIXSocket)
-    omit "nonblock=true isn't properly supported on Windows" if RUBY_PLATFORM=~/mswin|mingw/
+    omit "nonblock=true isn't properly supported on Windows" if RUBY_PLATFORM =~ /mswin|mingw/
 
     i, o = UNIXSocket.pair
 
@@ -242,38 +242,37 @@ def test_close_while_reading_on_thread
     # Windows has UNIXSocket, but only with VS 2019+
     omit "UNIXSocket is not defined!" unless defined?(UNIXSocket)
 
-    i, o = Socket.pair(:UNIX, :STREAM)
-    if RUBY_PLATFORM=~/mswin|mingw/
-      i.nonblock = true
-      o.nonblock = true
-    end
+    Socket.pair(:UNIX, :STREAM) do |i, o|
+      if RUBY_PLATFORM =~ /mswin|mingw/
+        i.nonblock = true
+        o.nonblock = true
+      end
 
-    reading_thread = Thread.new do
-      Thread.current.report_on_exception = false
-      i.wait_readable
-    end
+      reading_thread = Thread.new do
+        Thread.current.report_on_exception = false
+        i.wait_readable
+      end
 
-    fs_thread = Thread.new do
-      # Wait until the reading thread is blocked on read:
-      Thread.pass until reading_thread.status == "sleep"
+      scheduler_thread = Thread.new do
+        # Wait until the reading thread is blocked on read:
+        Thread.pass until reading_thread.status == "sleep"
 
-      scheduler = Scheduler.new
-      Fiber.set_scheduler scheduler
-      Fiber.schedule do
-        i.close
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+        Fiber.schedule do
+          i.close
+        end
       end
-    end
 
-    assert_raise(IOError) { reading_thread.join }
-    refute_nil fs_thread.join(5), "expected thread to terminate within 5 seconds"
+      assert_raise(IOError) { reading_thread.join }
+      refute_nil scheduler_thread.join(5), "expected thread to terminate within 5 seconds"
 
-    assert_predicate(i, :closed?)
-  ensure
-    fs_thread&.kill
-    fs_thread&.join rescue nil
-    reading_thread&.kill
-    reading_thread&.join rescue nil
-    i&.close
-    o&.close
+      assert_predicate(i, :closed?)
+    ensure
+      scheduler_thread&.kill
+      scheduler_thread&.join rescue nil
+      reading_thread&.kill
+      reading_thread&.join rescue nil
+    end
   end
 end
diff --git a/test/mri/fiber/test_io_close.rb b/test/mri/fiber/test_io_close.rb
new file mode 100644
index 00000000000..742b40841d9
--- /dev/null
+++ b/test/mri/fiber/test_io_close.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+require 'test/unit'
+require_relative 'scheduler'
+
+class TestFiberIOClose < Test::Unit::TestCase
+  def with_socket_pair(&block)
+    omit "UNIXSocket is not defined!" unless defined?(UNIXSocket)
+
+    UNIXSocket.pair do |i, o|
+      if RUBY_PLATFORM =~ /mswin|mingw/
+        i.nonblock = true
+        o.nonblock = true
+      end
+
+      yield i, o
+    end
+  end
+
+  def test_io_close_across_fibers
+    # omit "Interrupting a io_wait read is not supported!" if RUBY_PLATFORM =~ /mswin|mingw/
+
+    with_socket_pair do |i, o|
+      error = nil
+
+      thread = Thread.new do
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+
+        Fiber.schedule do
+          i.read
+        rescue => error
+          # Ignore.
+        end
+
+        Fiber.schedule do
+          i.close
+        end
+      end
+
+      thread.join
+
+      assert_instance_of IOError, error
+      assert_match(/closed/, error.message)
+    end
+  end
+
+  def test_io_close_blocking_thread
+    omit "Interrupting a io_wait read is not supported!" if RUBY_PLATFORM =~ /mswin|mingw/
+
+    with_socket_pair do |i, o|
+      error = nil
+
+      reading_thread = Thread.new do
+        i.read
+      rescue => error
+        # Ignore.
+      end
+
+      Thread.pass until reading_thread.status == 'sleep'
+
+      thread = Thread.new do
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+
+        Fiber.schedule do
+          i.close
+        end
+      end
+
+      thread.join
+      reading_thread.join
+
+      assert_instance_of IOError, error
+      assert_match(/closed/, error.message)
+    end
+  end
+
+  def test_io_close_blocking_fiber
+    # omit "Interrupting a io_wait read is not supported!" if RUBY_PLATFORM =~ /mswin|mingw/
+
+    with_socket_pair do |i, o|
+      error = nil
+
+      thread = Thread.new do
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+
+        Fiber.schedule do
+          begin
+            i.read
+          rescue => error
+            # Ignore.
+          end
+        end
+      end
+
+      Thread.pass until thread.status == 'sleep'
+
+      i.close
+
+      thread.join
+
+      assert_instance_of IOError, error
+      assert_match(/closed/, error.message)
+    end
+  end
+end
diff --git a/test/mri/fiber/test_ractor.rb b/test/mri/fiber/test_ractor.rb
index 3c4ccbd8e5f..7dd82eda627 100644
--- a/test/mri/fiber/test_ractor.rb
+++ b/test/mri/fiber/test_ractor.rb
@@ -17,7 +17,7 @@ def test_ractor_shareable
           Fiber.current.class
         end.resume
       end
-      assert_equal(Fiber, r.take)
+      assert_equal(Fiber, r.value)
     end;
   end
 end
diff --git a/test/mri/fiber/test_scheduler.rb b/test/mri/fiber/test_scheduler.rb
index 62424fc4893..d3696267f79 100644
--- a/test/mri/fiber/test_scheduler.rb
+++ b/test/mri/fiber/test_scheduler.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 require 'test/unit'
+require 'securerandom'
+require 'fileutils'
 require_relative 'scheduler'
 
 class TestFiberScheduler < Test::Unit::TestCase
@@ -94,6 +96,9 @@ def scheduler.io_wait
     def scheduler.kernel_sleep
     end
 
+    def scheduler.fiber_interrupt(_fiber, _exception)
+    end
+
     thread = Thread.new do
       Fiber.set_scheduler scheduler
     end
@@ -139,6 +144,19 @@ def test_autoload
     end
   end
 
+  def test_iseq_compile_under_gc_stress_bug_21180
+    Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      Fiber.schedule do
+        EnvUtil.under_gc_stress do
+          RubyVM::InstructionSequence.compile_file(File::NULL)
+        end
+      end
+    end.join
+  end
+
   def test_deadlock
     mutex = Thread::Mutex.new
     condition = Thread::ConditionVariable.new
@@ -210,4 +228,159 @@ def test_condition_variable
     thread.join
     assert_kind_of RuntimeError, error
   end
+
+  def test_post_fork_scheduler_reset
+    omit 'fork not supported' unless Process.respond_to?(:fork)
+
+    forked_scheduler_state = nil
+    thread = Thread.new do
+      r, w = IO.pipe
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      forked_pid = fork do
+        r.close
+        w << (Fiber.scheduler ? 'set' : 'reset')
+        w.close
+      end
+      w.close
+      forked_scheduler_state = r.read
+      Process.wait(forked_pid)
+    ensure
+      r.close rescue nil
+      w.close rescue nil
+    end
+    thread.join
+    assert_equal 'reset', forked_scheduler_state
+  ensure
+    thread.kill rescue nil
+  end
+
+  def test_post_fork_fiber_blocking
+    omit 'fork not supported' unless Process.respond_to?(:fork)
+
+    fiber_blocking_state = nil
+    thread = Thread.new do
+      r, w = IO.pipe
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      forked_pid = nil
+      Fiber.schedule do
+        forked_pid = fork do
+          r.close
+          w << (Fiber.current.blocking? ? 'blocking' : 'nonblocking')
+          w.close
+        end
+      end
+      w.close
+      fiber_blocking_state = r.read
+      Process.wait(forked_pid)
+    ensure
+      r.close rescue nil
+      w.close rescue nil
+    end
+    thread.join
+    assert_equal 'blocking', fiber_blocking_state
+  ensure
+    thread.kill rescue nil
+  end
+
+  def test_io_write_on_flush
+    begin
+      path = File.join(Dir.tmpdir, "ruby_test_io_write_on_flush_#{SecureRandom.hex}")
+      descriptor = nil
+      operations = nil
+
+      thread = Thread.new do
+        scheduler = IOScheduler.new
+        Fiber.set_scheduler scheduler
+
+        Fiber.schedule do
+          File.open(path, 'w+') do |file|
+            descriptor = file.fileno
+            file << 'foo'
+            file.flush
+            file << 'bar'
+          end
+        end
+
+        operations = scheduler.operations
+      end
+
+      thread.join
+      assert_equal [
+        [:io_write, descriptor, 'foo'],
+        [:io_write, descriptor, 'bar']
+      ], operations
+
+      assert_equal 'foobar', IO.read(path)
+    ensure
+      thread.kill rescue nil
+      FileUtils.rm_f(path)
+    end
+  end
+
+  def test_io_read_error
+    path = File.join(Dir.tmpdir, "ruby_test_io_read_error_#{SecureRandom.hex}")
+    error = nil
+
+    thread = Thread.new do
+      scheduler = IOErrorScheduler.new
+      Fiber.set_scheduler scheduler
+      Fiber.schedule do
+        File.open(path, 'w+') { it.read }
+      rescue => error
+        # Ignore.
+      end
+    end
+
+    thread.join
+    assert_kind_of Errno::EBADF, error
+  ensure
+    thread.kill rescue nil
+    FileUtils.rm_f(path)
+  end
+
+  def test_io_write_error
+    path = File.join(Dir.tmpdir, "ruby_test_io_write_error_#{SecureRandom.hex}")
+    error = nil
+
+    thread = Thread.new do
+      scheduler = IOErrorScheduler.new
+      Fiber.set_scheduler scheduler
+      Fiber.schedule do
+        File.open(path, 'w+') { it.sync = true; it << 'foo' }
+      rescue => error
+        # Ignore.
+      end
+    end
+
+    thread.join
+    assert_kind_of Errno::EINVAL, error
+  ensure
+    thread.kill rescue nil
+    FileUtils.rm_f(path)
+  end
+
+  def test_io_write_flush_error
+    path = File.join(Dir.tmpdir, "ruby_test_io_write_flush_error_#{SecureRandom.hex}")
+    error = nil
+
+    thread = Thread.new do
+      scheduler = IOErrorScheduler.new
+      Fiber.set_scheduler scheduler
+      Fiber.schedule do
+        File.open(path, 'w+') { it << 'foo' }
+      rescue => error
+        # Ignore.
+      end
+    end
+
+    thread.join
+    assert_kind_of Errno::EINVAL, error
+  ensure
+    thread.kill rescue nil
+    FileUtils.rm_f(path)
+  end
 end
diff --git a/test/mri/fiber/test_sleep.rb b/test/mri/fiber/test_sleep.rb
index a7e88c03674..187f59dbd48 100644
--- a/test/mri/fiber/test_sleep.rb
+++ b/test/mri/fiber/test_sleep.rb
@@ -35,13 +35,13 @@ def test_sleep_returns_seconds_slept
       scheduler = Scheduler.new
       Fiber.set_scheduler scheduler
       Fiber.schedule do
-        seconds = sleep(2)
+        seconds = sleep(1.1)
       end
     end
 
     thread.join
 
-    assert_operator seconds, :>=, 2, "actual: %p" % seconds
+    assert_operator seconds, :>=, 1, "actual: %p" % seconds
   end
 
   def test_broken_sleep
diff --git a/test/mri/fiber/test_thread.rb b/test/mri/fiber/test_thread.rb
index 5e3cc6d0e13..0247f330d94 100644
--- a/test/mri/fiber/test_thread.rb
+++ b/test/mri/fiber/test_thread.rb
@@ -90,6 +90,47 @@ def test_thread_join_blocking
     assert_equal :done, thread.value
   end
 
+  def test_spurious_unblock_during_thread_join
+    ready = Thread::Queue.new
+
+    target_thread = Thread.new do
+      ready.pop
+      :success
+    end
+
+    Thread.pass until target_thread.status == "sleep"
+
+    result = nil
+
+    thread = Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      # Create a fiber that will join a long-running thread:
+      joining_fiber = Fiber.schedule do
+        result = target_thread.value
+      end
+
+      # Create another fiber that spuriously unblocks the joining fiber:
+      Fiber.schedule do
+        # This interrupts the join in joining_fiber:
+        scheduler.unblock(:spurious_wakeup, joining_fiber)
+
+        # This allows the unblock to be processed:
+        sleep(0)
+
+        # This allows the target thread to finish:
+        ready.push(:done)
+      end
+
+      scheduler.run
+    end
+
+    thread.join
+
+    assert_equal :success, result
+  end
+
   def test_broken_unblock
     thread = Thread.new do
       Thread.current.report_on_exception = false
diff --git a/test/mri/fiddle/helper.rb b/test/mri/fiddle/helper.rb
deleted file mode 100644
index 457e02f5951..00000000000
--- a/test/mri/fiddle/helper.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-# frozen_string_literal: true
-
-require 'rbconfig/sizeof'
-require 'test/unit'
-require 'fiddle'
-
-puts("Fiddle::VERSION: #{Fiddle::VERSION}") if $VERBOSE
-
-# FIXME: this is stolen from DL and needs to be refactored.
-
-libc_so = libm_so = nil
-
-if RUBY_ENGINE == "jruby"
-  # "jruby ... [x86_64-linux]" -> "x86_64-linux"
-  ruby_platform = RUBY_DESCRIPTION.split(" ").last[1..-2]
-else
-  ruby_platform = RUBY_PLATFORM
-end
-case ruby_platform
-when /cygwin/
-  libc_so = "cygwin1.dll"
-  libm_so = "cygwin1.dll"
-when /android/
-  libdir = '/system/lib'
-  if [0].pack('L!').size == 8
-    libdir = '/system/lib64'
-  end
-  libc_so = File.join(libdir, "libc.so")
-  libm_so = File.join(libdir, "libm.so")
-when /linux-musl/
-  Dir.glob('/lib/ld-musl-*.so.1') do |ld|
-    libc_so = libm_so = ld
-  end
-when /linux/
-  libdir = '/lib'
-  case RbConfig::SIZEOF['void*']
-  when 4
-    # 32-bit ruby
-    case RUBY_PLATFORM
-    when /armv\w+-linux/
-      # In the ARM 32-bit libc package such as libc6:armhf libc6:armel,
-      # libc.so and libm.so are installed to /lib/arm-linux-gnu*.
-      # It's not installed to /lib32.
-      dir, = Dir.glob('/lib/arm-linux-gnu*')
-      libdir = dir if dir && File.directory?(dir)
-    else
-      libdir = '/lib32' if File.directory? '/lib32'
-    end
-  when 8
-    # 64-bit ruby
-    libdir = '/lib64' if File.directory? '/lib64'
-  end
-
-  # Handle musl libc
-  libc_so, = Dir.glob(File.join(libdir, "libc.musl*.so*"))
-  if libc_so
-    libm_so = libc_so
-  else
-    # glibc
-    case RUBY_PLATFORM
-    when /alpha-linux/, /ia64-linux/
-      libc_so = "libc.so.6.1"
-      libm_so = "libm.so.6.1"
-    else
-      libc_so = "libc.so.6"
-      libm_so = "libm.so.6"
-    end
-  end
-when /mingw/, /mswin/
-  require "rbconfig"
-  crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
-  libc_so = libm_so = "#{crtname}.dll"
-when /darwin/
-  libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
-  # macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
-  rigid_path = true
-when /kfreebsd/
-  libc_so = "/lib/libc.so.0.1"
-  libm_so = "/lib/libm.so.1"
-when /gnu/	#GNU/Hurd
-  libc_so = "/lib/libc.so.0.3"
-  libm_so = "/lib/libm.so.6"
-when /mirbsd/
-  libc_so = "/usr/lib/libc.so.41.10"
-  libm_so = "/usr/lib/libm.so.7.0"
-when /freebsd/
-  libc_so = "/lib/libc.so.7"
-  libm_so = "/lib/libm.so.5"
-when /bsd|dragonfly/
-  libc_so = "/usr/lib/libc.so"
-  libm_so = "/usr/lib/libm.so"
-when /solaris/
-  libdir = '/lib'
-  case RbConfig::SIZEOF['void*']
-  when 4
-    # 32-bit ruby
-    libdir = '/lib' if File.directory? '/lib'
-  when 8
-    # 64-bit ruby
-    libdir = '/lib/64' if File.directory? '/lib/64'
-  end
-  libc_so = File.join(libdir, "libc.so")
-  libm_so = File.join(libdir, "libm.so")
-when /aix/
-  pwd=Dir.pwd
-  libc_so = libm_so = "#{pwd}/libaixdltest.so"
-  unless File.exist? libc_so
-    cobjs=%w!strcpy.o!
-    mobjs=%w!floats.o sin.o!
-    funcs=%w!sin sinf strcpy strncpy!
-    expfile='dltest.exp'
-    require 'tmpdir'
-    Dir.mktmpdir do |_dir|
-      begin
-        Dir.chdir _dir
-        %x!/usr/bin/ar x /usr/lib/libc.a #{cobjs.join(' ')}!
-        %x!/usr/bin/ar x /usr/lib/libm.a #{mobjs.join(' ')}!
-        %x!echo "#{funcs.join("\n")}\n" > #{expfile}!
-        require 'rbconfig'
-        if RbConfig::CONFIG["GCC"] = 'yes'
-          lflag='-Wl,'
-        else
-          lflag=''
-        end
-        flags="#{lflag}-bE:#{expfile} #{lflag}-bnoentry -lm"
-        %x!#{RbConfig::CONFIG["LDSHARED"]} -o #{libc_so} #{(cobjs+mobjs).join(' ')} #{flags}!
-      ensure
-        Dir.chdir pwd
-      end
-    end
-  end
-when /haiku/
-  libdir = '/system/lib'
-  case [0].pack('L!').size
-  when 4
-    # 32-bit ruby
-    libdir = '/system/lib/x86' if File.directory? '/system/lib/x86'
-  when 8
-    # 64-bit ruby
-    libdir = '/system/lib/' if File.directory? '/system/lib/'
-  end
-  libc_so = File.join(libdir, "libroot.so")
-  libm_so = File.join(libdir, "libroot.so")
-else
-  libc_so = ARGV[0] if ARGV[0] && ARGV[0][0] == ?/
-  libm_so = ARGV[1] if ARGV[1] && ARGV[1][0] == ?/
-  if( !(libc_so && libm_so) )
-    $stderr.puts("libc and libm not found: #{$0} <libc> <libm>")
-  end
-end
-
-unless rigid_path
-  libc_so = nil if libc_so && libc_so[0] == ?/ && !File.file?(libc_so)
-  libm_so = nil if libm_so && libm_so[0] == ?/ && !File.file?(libm_so)
-end
-
-if !libc_so || !libm_so
-  require "envutil"
-  ruby = EnvUtil.rubybin
-  # When the ruby binary is 32-bit and the host is 64-bit,
-  # `ldd ruby` outputs "not a dynamic executable" message.
-  # libc_so and libm_so are not set.
-  ldd = `ldd #{ruby}`
-  #puts ldd
-  libc_so = $& if !libc_so && %r{/\S*/libc\.so\S*} =~ ldd
-  libm_so = $& if !libm_so && %r{/\S*/libm\.so\S*} =~ ldd
-  #p [libc_so, libm_so]
-end
-
-Fiddle::LIBC_SO = libc_so
-Fiddle::LIBM_SO = libm_so
-
-module Fiddle
-  class TestCase < Test::Unit::TestCase
-    def setup
-      @libc = Fiddle.dlopen(LIBC_SO)
-      @libm = Fiddle.dlopen(LIBM_SO)
-    end
-
-    def teardown
-      if /linux/ =~ RUBY_PLATFORM
-        GC.start
-      end
-    end
-
-    def ffi_backend?
-      RUBY_ENGINE != 'ruby'
-    end
-
-    def under_gc_stress
-      stress, GC.stress = GC.stress, true
-      yield
-    ensure
-      GC.stress = stress
-    end
-
-    def assert_ractor_shareable(object)
-      Ractor.make_shareable(object)
-      assert_operator(Ractor, :shareable?, object)
-    end
-  end
-end
diff --git a/test/mri/fiddle/test_c_struct_builder.rb b/test/mri/fiddle/test_c_struct_builder.rb
deleted file mode 100644
index ca44c6cf7a6..00000000000
--- a/test/mri/fiddle/test_c_struct_builder.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/struct'
-  require 'fiddle/cparser'
-  require 'fiddle/import'
-rescue LoadError
-end
-
-module Fiddle
-  class TestCStructBuilder < TestCase
-    include Fiddle::CParser
-    extend Fiddle::Importer
-
-    RBasic = struct ['void * flags',
-                     'void * klass' ]
-
-
-    RObject = struct [
-      { 'basic' => RBasic },
-      { 'as'    => union([
-                          { 'heap'=> struct([ 'uint32_t numiv',
-                                              'void * ivptr',
-                                              'void * iv_index_tbl' ]) },
-                             'void *ary[3]' ])}
-    ]
-
-
-    def test_basic_embedded_members
-      assert_equal 0, RObject.offsetof("basic.flags")
-      assert_equal Fiddle::SIZEOF_VOIDP, RObject.offsetof("basic.klass")
-    end
-
-    def test_embedded_union_members
-      assert_equal 2 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as")
-      assert_equal 2 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.heap")
-      assert_equal 2 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.heap.numiv")
-      assert_equal 3 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.heap.ivptr")
-      assert_equal 4 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.heap.iv_index_tbl")
-    end
-
-    def test_as_ary
-      assert_equal 2 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.ary")
-    end
-
-    def test_offsetof
-      types, members = parse_struct_signature(['int64_t i','char c'])
-      my_struct = Fiddle::CStructBuilder.create(Fiddle::CStruct, types, members)
-      assert_equal 0, my_struct.offsetof("i")
-      assert_equal Fiddle::SIZEOF_INT64_T, my_struct.offsetof("c")
-    end
-
-    def test_offset_with_gap
-      types, members = parse_struct_signature(['void *p', 'char c', 'long x'])
-      my_struct = Fiddle::CStructBuilder.create(Fiddle::CStruct, types, members)
-
-      assert_equal PackInfo.align(0, ALIGN_VOIDP), my_struct.offsetof("p")
-      assert_equal PackInfo.align(SIZEOF_VOIDP, ALIGN_CHAR), my_struct.offsetof("c")
-      assert_equal SIZEOF_VOIDP + PackInfo.align(SIZEOF_CHAR, ALIGN_LONG), my_struct.offsetof("x")
-    end
-
-    def test_union_offsetof
-      types, members = parse_struct_signature(['int64_t i','char c'])
-      my_struct = Fiddle::CStructBuilder.create(Fiddle::CUnion, types, members)
-      assert_equal 0, my_struct.offsetof("i")
-      assert_equal 0, my_struct.offsetof("c")
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_c_struct_entry.rb b/test/mri/fiddle/test_c_struct_entry.rb
deleted file mode 100644
index 45de2efe21f..00000000000
--- a/test/mri/fiddle/test_c_struct_entry.rb
+++ /dev/null
@@ -1,171 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/struct'
-rescue LoadError
-end
-
-module Fiddle
-  class TestCStructEntity < TestCase
-    def test_class_size
-      types = [TYPE_DOUBLE, TYPE_CHAR, TYPE_DOUBLE, TYPE_BOOL]
-
-      size = CStructEntity.size types
-
-      alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
-
-      expected = PackInfo.align 0, alignments[0]
-      expected += PackInfo::SIZE_MAP[TYPE_DOUBLE]
-
-      expected = PackInfo.align expected, alignments[1]
-      expected += PackInfo::SIZE_MAP[TYPE_CHAR]
-
-      expected = PackInfo.align expected, alignments[2]
-      expected += PackInfo::SIZE_MAP[TYPE_DOUBLE]
-
-      expected = PackInfo.align expected, alignments[3]
-      expected += PackInfo::SIZE_MAP[TYPE_BOOL]
-
-      expected = PackInfo.align expected, alignments.max
-
-      assert_equal expected, size
-    end
-
-    def test_class_size_with_count
-      size = CStructEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
-
-      types = [TYPE_DOUBLE, TYPE_CHAR]
-      alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
-
-      expected = PackInfo.align 0, alignments[0]
-      expected += PackInfo::SIZE_MAP[TYPE_DOUBLE] * 2
-
-      expected = PackInfo.align expected, alignments[1]
-      expected += PackInfo::SIZE_MAP[TYPE_CHAR] * 20
-
-      expected = PackInfo.align expected, alignments.max
-
-      assert_equal expected, size
-    end
-
-    def test_set_ctypes
-      CStructEntity.malloc([TYPE_INT, TYPE_LONG], Fiddle::RUBY_FREE) do |struct|
-        struct.assign_names %w[int long]
-
-        # this test is roundabout because the stored ctypes are not accessible
-        struct['long'] = 1
-        struct['int'] = 2
-
-        assert_equal 1, struct['long']
-        assert_equal 2, struct['int']
-      end
-    end
-
-    def test_aref_pointer_array
-      CStructEntity.malloc([[TYPE_VOIDP, 2]], Fiddle::RUBY_FREE) do |team|
-        team.assign_names(["names"])
-        Fiddle::Pointer.malloc(6, Fiddle::RUBY_FREE) do |alice|
-          alice[0, 6] = "Alice\0"
-          Fiddle::Pointer.malloc(4, Fiddle::RUBY_FREE) do |bob|
-            bob[0, 4] = "Bob\0"
-            team["names"] = [alice, bob]
-            assert_equal(["Alice", "Bob"], team["names"].map(&:to_s))
-          end
-        end
-      end
-    end
-
-    def test_aref_pointer
-      CStructEntity.malloc([TYPE_VOIDP], Fiddle::RUBY_FREE) do |user|
-        user.assign_names(["name"])
-        Fiddle::Pointer.malloc(6, Fiddle::RUBY_FREE) do |alice|
-          alice[0, 6] = "Alice\0"
-          user["name"] = alice
-          assert_equal("Alice", user["name"].to_s)
-        end
-      end
-    end
-
-    def test_new_double_free
-      types = [TYPE_INT]
-      Pointer.malloc(CStructEntity.size(types), Fiddle::RUBY_FREE) do |pointer|
-        assert_raise ArgumentError do
-          CStructEntity.new(pointer, types, Fiddle::RUBY_FREE)
-        end
-      end
-    end
-
-    def test_malloc_block
-      escaped_struct = nil
-      returned = CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE) do |struct|
-        assert_equal Fiddle::SIZEOF_INT, struct.size
-        assert_equal Fiddle::RUBY_FREE, struct.free.to_i
-        escaped_struct = struct
-        :returned
-      end
-      assert_equal :returned, returned
-      assert escaped_struct.freed?
-    end
-
-    def test_malloc_block_no_free
-      assert_raise ArgumentError do
-        CStructEntity.malloc([TYPE_INT]) { |struct| }
-      end
-    end
-
-    def test_free
-      struct = CStructEntity.malloc([TYPE_INT])
-      begin
-        assert_nil struct.free
-      ensure
-        Fiddle.free struct
-      end
-    end
-
-    def test_free_with_func
-      struct = CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE)
-      refute struct.freed?
-      struct.call_free
-      assert struct.freed?
-      struct.call_free                 # you can safely run it again
-      assert struct.freed?
-      GC.start                         # you can safely run the GC routine
-      assert struct.freed?
-    end
-
-    def test_free_with_no_func
-      struct = CStructEntity.malloc([TYPE_INT])
-      refute struct.freed?
-      struct.call_free
-      refute struct.freed?
-      struct.call_free                 # you can safely run it again
-      refute struct.freed?
-    end
-
-    def test_freed?
-      struct = CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE)
-      refute struct.freed?
-      struct.call_free
-      assert struct.freed?
-    end
-
-    def test_null?
-      struct = CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE)
-      refute struct.null?
-    end
-
-    def test_size
-      CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE) do |struct|
-        assert_equal Fiddle::SIZEOF_INT, struct.size
-      end
-    end
-
-    def test_size=
-      CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE) do |struct|
-        assert_raise NoMethodError do
-          struct.size = 1
-        end
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_c_union_entity.rb b/test/mri/fiddle/test_c_union_entity.rb
deleted file mode 100644
index e0a37575625..00000000000
--- a/test/mri/fiddle/test_c_union_entity.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/struct'
-rescue LoadError
-end
-
-
-module Fiddle
-  class TestCUnionEntity < TestCase
-    def test_class_size
-      size = CUnionEntity.size([TYPE_DOUBLE, TYPE_CHAR])
-
-      assert_equal SIZEOF_DOUBLE, size
-    end
-
-    def test_class_size_with_count
-      size = CUnionEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
-
-      assert_equal SIZEOF_CHAR * 20, size
-    end
-
-    def test_set_ctypes
-      CUnionEntity.malloc([TYPE_INT, TYPE_LONG], Fiddle::RUBY_FREE) do |union|
-        union.assign_names %w[int long]
-
-        # this test is roundabout because the stored ctypes are not accessible
-        union['long'] = 1
-        assert_equal 1, union['long']
-
-        union['int'] = 1
-        assert_equal 1, union['int']
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_closure.rb b/test/mri/fiddle/test_closure.rb
deleted file mode 100644
index 26cff8e516b..00000000000
--- a/test/mri/fiddle/test_closure.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestClosure < Fiddle::TestCase
-    def teardown
-      super
-      # We can't use ObjectSpace with JRuby.
-      return if RUBY_ENGINE == "jruby"
-      # Ensure freeing all closures.
-      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
-      not_freed_closures = []
-      ObjectSpace.each_object(Fiddle::Closure) do |closure|
-        not_freed_closures << closure unless closure.freed?
-      end
-      assert_equal([], not_freed_closures)
-    end
-
-    def test_argument_errors
-      assert_raise(TypeError) do
-        Closure.new(TYPE_INT, TYPE_INT)
-      end
-
-      assert_raise(TypeError) do
-        Closure.new('foo', [TYPE_INT])
-      end
-
-      assert_raise(TypeError) do
-        Closure.new(TYPE_INT, ['meow!'])
-      end
-    end
-
-    def test_call
-      closure_class = Class.new(Closure) do
-        def call
-          10
-        end
-      end
-      closure_class.create(TYPE_INT, []) do |closure|
-        func = Function.new(closure, [], TYPE_INT)
-        assert_equal 10, func.call
-      end
-    end
-
-    def test_returner
-      closure_class = Class.new(Closure) do
-        def call thing
-          thing
-        end
-      end
-      closure_class.create(TYPE_INT, [TYPE_INT]) do |closure|
-        func = Function.new(closure, [TYPE_INT], TYPE_INT)
-        assert_equal 10, func.call(10)
-      end
-    end
-
-    def test_const_string
-      if ffi_backend?
-        omit("Closure with :const_string works but " +
-             "Function with :const_string doesn't work with FFI backend")
-      end
-
-      closure_class = Class.new(Closure) do
-        def call(string)
-          @return_string = "Hello! #{string}"
-          @return_string
-        end
-      end
-      closure_class.create(:const_string, [:const_string]) do |closure|
-        func = Function.new(closure, [:const_string], :const_string)
-        assert_equal("Hello! World!", func.call("World!"))
-      end
-    end
-
-    def test_bool
-      closure_class = Class.new(Closure) do
-        def call(bool)
-          not bool
-        end
-      end
-      closure_class.create(:bool, [:bool]) do |closure|
-        func = Function.new(closure, [:bool], :bool)
-        assert_equal(false, func.call(true))
-      end
-    end
-
-    def test_free
-      closure_class = Class.new(Closure) do
-        def call
-          10
-        end
-      end
-      closure_class.create(:int, [:void]) do |closure|
-        assert(!closure.freed?)
-        closure.free
-        assert(closure.freed?)
-        closure.free
-      end
-    end
-
-    def test_block_caller
-      cb = Closure::BlockCaller.new(TYPE_INT, [TYPE_INT]) do |one|
-        one
-      end
-      begin
-        func = Function.new(cb, [TYPE_INT], TYPE_INT)
-        assert_equal 11, func.call(11)
-      ensure
-        cb.free
-      end
-    end
-
-    def test_memsize_ruby_dev_42480
-      if RUBY_ENGINE == "jruby"
-        omit("We can't use ObjectSpace with JRuby")
-      end
-
-      require 'objspace'
-      closure_class = Class.new(Closure) do
-        def call
-          10
-        end
-      end
-      n = 10000
-      n.times do
-        closure_class.create(:int, [:void]) do |closure|
-          ObjectSpace.memsize_of(closure)
-        end
-      end
-    end
-
-    %w[INT SHORT CHAR LONG LONG_LONG].each do |name|
-      type = Fiddle.const_get("TYPE_#{name}") rescue next
-      size = Fiddle.const_get("SIZEOF_#{name}")
-      [[type, size-1, name], [-type, size, "unsigned_"+name]].each do |t, s, n|
-        define_method("test_conversion_#{n.downcase}") do
-          arg = nil
-
-          closure_class = Class.new(Closure) do
-            define_method(:call) {|x| arg = x}
-          end
-          closure_class.create(t, [t]) do |closure|
-            v = ~(~0 << (8*s))
-
-            arg = nil
-            assert_equal(v, closure.call(v))
-            assert_equal(arg, v, n)
-
-            arg = nil
-            func = Function.new(closure, [t], t)
-            assert_equal(v, func.call(v))
-            assert_equal(arg, v, n)
-          end
-        end
-      end
-    end
-
-    def test_ractor_shareable
-      omit("Need Ractor") unless defined?(Ractor)
-      closure_class = Class.new(Closure) do
-        def call
-          0
-        end
-      end
-      closure_class.create(:int, [:void]) do |c|
-        assert_ractor_shareable(c)
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_cparser.rb b/test/mri/fiddle/test_cparser.rb
deleted file mode 100644
index f1b67476ba8..00000000000
--- a/test/mri/fiddle/test_cparser.rb
+++ /dev/null
@@ -1,414 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/cparser'
-  require 'fiddle/import'
-rescue LoadError
-end
-
-module Fiddle
-  class TestCParser < TestCase
-    include CParser
-
-    def test_char_ctype
-      assert_equal(TYPE_CHAR, parse_ctype('char'))
-      assert_equal(TYPE_CHAR, parse_ctype('const char'))
-      assert_equal(TYPE_CHAR, parse_ctype('signed char'))
-      assert_equal(TYPE_CHAR, parse_ctype('const signed char'))
-      assert_equal(-TYPE_CHAR, parse_ctype('unsigned char'))
-      assert_equal(-TYPE_CHAR, parse_ctype('const unsigned char'))
-    end
-
-    def test_short_ctype
-      assert_equal(TYPE_SHORT, parse_ctype('short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const short'))
-      assert_equal(TYPE_SHORT, parse_ctype('short int'))
-      assert_equal(TYPE_SHORT, parse_ctype('const short int'))
-      assert_equal(TYPE_SHORT, parse_ctype('int short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const int short'))
-      assert_equal(TYPE_SHORT, parse_ctype('signed short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const signed short'))
-      assert_equal(TYPE_SHORT, parse_ctype('short signed'))
-      assert_equal(TYPE_SHORT, parse_ctype('const short signed'))
-      assert_equal(TYPE_SHORT, parse_ctype('signed short int'))
-      assert_equal(TYPE_SHORT, parse_ctype('const signed short int'))
-      assert_equal(TYPE_SHORT, parse_ctype('signed int short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const signed int short'))
-      assert_equal(TYPE_SHORT, parse_ctype('int signed short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const int signed short'))
-      assert_equal(TYPE_SHORT, parse_ctype('int short signed'))
-      assert_equal(TYPE_SHORT, parse_ctype('const int short signed'))
-      assert_equal(-TYPE_SHORT, parse_ctype('unsigned short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const unsigned short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('unsigned short int'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const unsigned short int'))
-      assert_equal(-TYPE_SHORT, parse_ctype('unsigned int short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const unsigned int short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('short int unsigned'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const short int unsigned'))
-      assert_equal(-TYPE_SHORT, parse_ctype('int unsigned short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const int unsigned short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('int short unsigned'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const int short unsigned'))
-    end
-
-    def test_int_ctype
-      assert_equal(TYPE_INT, parse_ctype('int'))
-      assert_equal(TYPE_INT, parse_ctype('const int'))
-      assert_equal(TYPE_INT, parse_ctype('signed int'))
-      assert_equal(TYPE_INT, parse_ctype('const signed int'))
-      assert_equal(-TYPE_INT, parse_ctype('uint'))
-      assert_equal(-TYPE_INT, parse_ctype('const uint'))
-      assert_equal(-TYPE_INT, parse_ctype('unsigned int'))
-      assert_equal(-TYPE_INT, parse_ctype('const unsigned int'))
-    end
-
-    def test_long_ctype
-      assert_equal(TYPE_LONG, parse_ctype('long'))
-      assert_equal(TYPE_LONG, parse_ctype('const long'))
-      assert_equal(TYPE_LONG, parse_ctype('long int'))
-      assert_equal(TYPE_LONG, parse_ctype('const long int'))
-      assert_equal(TYPE_LONG, parse_ctype('int long'))
-      assert_equal(TYPE_LONG, parse_ctype('const int long'))
-      assert_equal(TYPE_LONG, parse_ctype('signed long'))
-      assert_equal(TYPE_LONG, parse_ctype('const signed long'))
-      assert_equal(TYPE_LONG, parse_ctype('signed long int'))
-      assert_equal(TYPE_LONG, parse_ctype('const signed long int'))
-      assert_equal(TYPE_LONG, parse_ctype('signed int long'))
-      assert_equal(TYPE_LONG, parse_ctype('const signed int long'))
-      assert_equal(TYPE_LONG, parse_ctype('long signed'))
-      assert_equal(TYPE_LONG, parse_ctype('const long signed'))
-      assert_equal(TYPE_LONG, parse_ctype('long int signed'))
-      assert_equal(TYPE_LONG, parse_ctype('const long int signed'))
-      assert_equal(TYPE_LONG, parse_ctype('int long signed'))
-      assert_equal(TYPE_LONG, parse_ctype('const int long signed'))
-      assert_equal(-TYPE_LONG, parse_ctype('unsigned long'))
-      assert_equal(-TYPE_LONG, parse_ctype('const unsigned long'))
-      assert_equal(-TYPE_LONG, parse_ctype('unsigned long int'))
-      assert_equal(-TYPE_LONG, parse_ctype('const unsigned long int'))
-      assert_equal(-TYPE_LONG, parse_ctype('long int unsigned'))
-      assert_equal(-TYPE_LONG, parse_ctype('const long int unsigned'))
-      assert_equal(-TYPE_LONG, parse_ctype('unsigned int long'))
-      assert_equal(-TYPE_LONG, parse_ctype('const unsigned int long'))
-      assert_equal(-TYPE_LONG, parse_ctype('int unsigned long'))
-      assert_equal(-TYPE_LONG, parse_ctype('const int unsigned long'))
-      assert_equal(-TYPE_LONG, parse_ctype('int long unsigned'))
-      assert_equal(-TYPE_LONG, parse_ctype('const int long unsigned'))
-    end
-
-    def test_size_t_ctype
-      assert_equal(TYPE_SIZE_T, parse_ctype("size_t"))
-      assert_equal(TYPE_SIZE_T, parse_ctype("const size_t"))
-    end
-
-    def test_ssize_t_ctype
-      assert_equal(TYPE_SSIZE_T, parse_ctype("ssize_t"))
-      assert_equal(TYPE_SSIZE_T, parse_ctype("const ssize_t"))
-    end
-
-    def test_ptrdiff_t_ctype
-      assert_equal(TYPE_PTRDIFF_T, parse_ctype("ptrdiff_t"))
-      assert_equal(TYPE_PTRDIFF_T, parse_ctype("const ptrdiff_t"))
-    end
-
-    def test_intptr_t_ctype
-      assert_equal(TYPE_INTPTR_T, parse_ctype("intptr_t"))
-      assert_equal(TYPE_INTPTR_T, parse_ctype("const intptr_t"))
-    end
-
-    def test_uintptr_t_ctype
-      assert_equal(TYPE_UINTPTR_T, parse_ctype("uintptr_t"))
-      assert_equal(TYPE_UINTPTR_T, parse_ctype("const uintptr_t"))
-    end
-
-    def test_bool_ctype
-      assert_equal(TYPE_BOOL, parse_ctype('bool'))
-    end
-
-    def test_undefined_ctype
-      assert_raise(DLError) { parse_ctype('DWORD') }
-    end
-
-    def test_undefined_ctype_with_type_alias
-      assert_equal(-TYPE_LONG,
-                   parse_ctype('DWORD', {"DWORD" => "unsigned long"}))
-      assert_equal(-TYPE_LONG,
-                   parse_ctype('const DWORD', {"DWORD" => "unsigned long"}))
-    end
-
-    def expand_struct_types(types)
-      types.collect do |type|
-        case type
-        when Class
-          [expand_struct_types(type.types)]
-        when Array
-          [expand_struct_types([type[0]])[0][0], type[1]]
-        else
-          type
-        end
-      end
-    end
-
-    def test_struct_basic
-      assert_equal([[TYPE_INT, TYPE_CHAR], ['i', 'c']],
-                   parse_struct_signature(['int i', 'char c']))
-      assert_equal([[TYPE_INT, TYPE_CHAR], ['i', 'c']],
-                   parse_struct_signature(['const int i', 'const char c']))
-    end
-
-    def test_struct_array
-      assert_equal([[[TYPE_CHAR, 80], [TYPE_INT, 5]],
-                    ['buffer', 'x']],
-                   parse_struct_signature(['char buffer[80]',
-                                           'int[5] x']))
-      assert_equal([[[TYPE_CHAR, 80], [TYPE_INT, 5]],
-                    ['buffer', 'x']],
-                   parse_struct_signature(['const char buffer[80]',
-                                           'const int[5] x']))
-    end
-
-    def test_struct_nested_struct
-      types, members = parse_struct_signature([
-                                                'int x',
-                                                {inner: ['int i', 'char c']},
-                                              ])
-      assert_equal([[TYPE_INT, [[TYPE_INT, TYPE_CHAR]]],
-                    ['x', ['inner', ['i', 'c']]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_nested_defined_struct
-      inner = Fiddle::Importer.struct(['int i', 'char c'])
-      assert_equal([[TYPE_INT, inner],
-                    ['x', ['inner', ['i', 'c']]]],
-                   parse_struct_signature([
-                                            'int x',
-                                            {inner: inner},
-                                          ]))
-    end
-
-    def test_struct_double_nested_struct
-      types, members = parse_struct_signature([
-                                                'int x',
-                                                {
-                                                  outer: [
-                                                    'int y',
-                                                    {inner: ['int i', 'char c']},
-                                                  ],
-                                                },
-                                              ])
-      assert_equal([[TYPE_INT, [[TYPE_INT, [[TYPE_INT, TYPE_CHAR]]]]],
-                    ['x', ['outer', ['y', ['inner', ['i', 'c']]]]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_nested_struct_array
-      types, members = parse_struct_signature([
-                                                'int x',
-                                                {
-                                                  'inner[2]' => [
-                                                    'int i',
-                                                    'char c',
-                                                  ],
-                                                },
-                                              ])
-      assert_equal([[TYPE_INT, [[TYPE_INT, TYPE_CHAR], 2]],
-                    ['x', ['inner', ['i', 'c']]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_double_nested_struct_inner_array
-      types, members = parse_struct_signature(outer: [
-                                                'int x',
-                                                {
-                                                  'inner[2]' => [
-                                                    'int i',
-                                                    'char c',
-                                                  ],
-                                                },
-                                              ])
-      assert_equal([[[[TYPE_INT, [[TYPE_INT, TYPE_CHAR], 2]]]],
-                    [['outer', ['x', ['inner', ['i', 'c']]]]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_double_nested_struct_outer_array
-      types, members = parse_struct_signature([
-                                                'int x',
-                                                {
-                                                  'outer[2]' => {
-                                                    inner: [
-                                                      'int i',
-                                                      'char c',
-                                                    ],
-                                                  },
-                                                },
-                                              ])
-      assert_equal([[TYPE_INT, [[[[TYPE_INT, TYPE_CHAR]]], 2]],
-                    ['x', ['outer', [['inner', ['i', 'c']]]]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_array_str
-      assert_equal([[[TYPE_CHAR, 80], [TYPE_INT, 5]],
-                    ['buffer', 'x']],
-                   parse_struct_signature('char buffer[80], int[5] x'))
-      assert_equal([[[TYPE_CHAR, 80], [TYPE_INT, 5]],
-                    ['buffer', 'x']],
-                   parse_struct_signature('const char buffer[80], const int[5] x'))
-    end
-
-    def test_struct_function_pointer
-      assert_equal([[TYPE_VOIDP], ['cb']],
-                   parse_struct_signature(['void (*cb)(const char*)']))
-    end
-
-    def test_struct_function_pointer_str
-      assert_equal([[TYPE_VOIDP, TYPE_VOIDP], ['cb', 'data']],
-                   parse_struct_signature('void (*cb)(const char*), const char* data'))
-    end
-
-    def test_struct_string
-      assert_equal [[TYPE_INT,TYPE_VOIDP,TYPE_VOIDP], ['x', 'cb', 'name']], parse_struct_signature('int x; void (*cb)(); const char* name')
-    end
-
-    def test_struct_undefined
-      assert_raise(DLError) { parse_struct_signature(['int i', 'DWORD cb']) }
-    end
-
-    def test_struct_undefined_with_type_alias
-      assert_equal [[TYPE_INT,-TYPE_LONG], ['i', 'cb']], parse_struct_signature(['int i', 'DWORD cb'], {"DWORD" => "unsigned long"})
-    end
-
-    def test_signature_basic
-      func, ret, args = parse_signature('void func()')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [], args
-    end
-
-    def test_signature_semi
-      func, ret, args = parse_signature('void func();')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [], args
-    end
-
-    def test_signature_void_arg
-      func, ret, args = parse_signature('void func(void)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [], args
-    end
-
-    def test_signature_type_args
-      types = [
-        'char', 'unsigned char',
-        'short', 'unsigned short',
-        'int', 'unsigned int',
-        'long', 'unsigned long',
-        defined?(TYPE_LONG_LONG) && \
-        [
-        'long long', 'unsigned long long',
-        ],
-        'float', 'double',
-        'const char*', 'void*',
-      ].flatten.compact
-      func, ret, args = parse_signature("void func(#{types.join(',')})")
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [
-        TYPE_CHAR, -TYPE_CHAR,
-        TYPE_SHORT, -TYPE_SHORT,
-        TYPE_INT, -TYPE_INT,
-        TYPE_LONG, -TYPE_LONG,
-        defined?(TYPE_LONG_LONG) && \
-        [
-        TYPE_LONG_LONG, -TYPE_LONG_LONG,
-        ],
-        TYPE_FLOAT, TYPE_DOUBLE,
-        TYPE_VOIDP, TYPE_VOIDP,
-      ].flatten.compact, args
-    end
-
-    def test_signature_single_variable
-      func, ret, args = parse_signature('void func(int x)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [TYPE_INT], args
-    end
-
-    def test_signature_multiple_variables
-      func, ret, args = parse_signature('void func(int x, const char* s)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [TYPE_INT, TYPE_VOIDP], args
-    end
-
-    def test_signature_array_variable
-      func, ret, args = parse_signature('void func(int x[], int y[40])')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [TYPE_VOIDP, TYPE_VOIDP], args
-    end
-
-    def test_signature_function_pointer
-      func, ret, args = parse_signature('int func(int (*sum)(int x, int y), int x, int y)')
-      assert_equal 'func', func
-      assert_equal TYPE_INT, ret
-      assert_equal [TYPE_VOIDP, TYPE_INT, TYPE_INT], args
-    end
-
-    def test_signature_variadic_arguments
-      unless Fiddle.const_defined?("TYPE_VARIADIC")
-        omit "libffi doesn't support variadic arguments"
-      end
-      assert_equal([
-                     "printf",
-                     TYPE_INT,
-                     [TYPE_VOIDP, TYPE_VARIADIC],
-                   ],
-                   parse_signature('int printf(const char *format, ...)'))
-    end
-
-    def test_signature_return_pointer
-      func, ret, args = parse_signature('void* malloc(size_t)')
-      assert_equal 'malloc', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [TYPE_SIZE_T], args
-    end
-
-    def test_signature_return_array
-      func, ret, args = parse_signature('int (*func())[32]')
-      assert_equal 'func', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [], args
-    end
-
-    def test_signature_return_array_with_args
-      func, ret, args = parse_signature('int (*func(const char* s))[]')
-      assert_equal 'func', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [TYPE_VOIDP], args
-    end
-
-    def test_signature_return_function_pointer
-      func, ret, args = parse_signature('int (*func())(int x, int y)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [], args
-    end
-
-    def test_signature_return_function_pointer_with_args
-      func, ret, args = parse_signature('int (*func(int z))(int x, int y)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [TYPE_INT], args
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_fiddle.rb b/test/mri/fiddle/test_fiddle.rb
deleted file mode 100644
index 69d0c3d1793..00000000000
--- a/test/mri/fiddle/test_fiddle.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-class TestFiddle < Fiddle::TestCase
-  def test_nil_true_etc
-    if ffi_backend?
-      omit("Fiddle::Q* aren't supported with FFI backend")
-    end
-
-    assert_equal Fiddle::Qtrue, Fiddle.dlwrap(true)
-    assert_equal Fiddle::Qfalse, Fiddle.dlwrap(false)
-    assert_equal Fiddle::Qnil, Fiddle.dlwrap(nil)
-    assert Fiddle::Qundef
-  end
-
-  def test_windows_constant
-    require 'rbconfig'
-    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
-      assert Fiddle::WINDOWS, "Fiddle::WINDOWS should be 'true' on Windows platforms"
-    else
-      refute Fiddle::WINDOWS, "Fiddle::WINDOWS should be 'false' on non-Windows platforms"
-    end
-  end
-
-  def test_dlopen_linker_script_input_linux
-    omit("This is only for Linux") unless RUBY_PLATFORM.match?("linux")
-    if Dir.glob("/usr/lib{,64}/**/libncurses.so").empty?
-      omit("libncurses.so is needed")
-    end
-    if ffi_backend?
-      omit("Fiddle::Handle#file_name doesn't exist in FFI backend")
-    end
-
-    # libncurses.so uses INPUT() on Debian GNU/Linux and Arch Linux:
-    #
-    # Debian GNU/Linux:
-    #
-    # $ cat /usr/lib/x86_64-linux-gnu/libncurses.so
-    # INPUT(libncurses.so.6 -ltinfo)
-    #
-    # Arch Linux:
-    # $ cat /usr/lib/libncurses.so
-    # INPUT(-lncursesw)
-    handle = Fiddle.dlopen("libncurses.so")
-    begin
-      # /usr/lib/x86_64-linux-gnu/libncurses.so.6 ->
-      # libncurses.so.6
-      normalized_file_name = File.basename(handle.file_name)
-      # libncurses.so.6 ->
-      # libncurses.so
-      #
-      # libncursesw.so ->
-      # libncursesw.so
-      normalized_file_name = normalized_file_name.sub(/\.so(\.\d+)+\z/, ".so")
-      # libncurses.so ->
-      # libncurses.so
-      #
-      # libncursesw.so ->
-      # libncurses.so
-      normalized_file_name = normalized_file_name.sub(/ncursesw/, "ncurses")
-      assert_equal("libncurses.so", normalized_file_name)
-    ensure
-      handle.close
-    end
-  end
-
-  def test_dlopen_linker_script_group_linux
-    omit("This is only for Linux") unless RUBY_PLATFORM.match?("linux")
-    if ffi_backend?
-      omit("Fiddle::Handle#file_name doesn't exist in FFI backend")
-    end
-
-    # libc.so uses GROUP() on Debian GNU/Linux
-    # $ cat /usr/lib/x86_64-linux-gnu/libc.so
-    # /* GNU ld script
-    #    Use the shared library, but some functions are only in
-    #    the static library, so try that secondarily.  */
-    # OUTPUT_FORMAT(elf64-x86-64)
-    # GROUP ( /lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
-    handle = Fiddle.dlopen("libc.so")
-    begin
-      assert_equal("libc.so",
-                   File.basename(handle.file_name, ".*"))
-    ensure
-      handle.close
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_func.rb b/test/mri/fiddle/test_func.rb
deleted file mode 100644
index ca503f92ad8..00000000000
--- a/test/mri/fiddle/test_func.rb
+++ /dev/null
@@ -1,180 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestFunc < TestCase
-    def test_random
-      f = Function.new(@libc['srand'], [-TYPE_LONG], TYPE_VOID)
-      assert_nil f.call(10)
-    end
-
-    def test_sinf
-      begin
-        f = Function.new(@libm['sinf'], [TYPE_FLOAT], TYPE_FLOAT)
-      rescue Fiddle::DLError
-        omit "libm may not have sinf()"
-      end
-      assert_in_delta 1.0, f.call(90 * Math::PI / 180), 0.0001
-    end
-
-    def test_sin
-      f = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
-      assert_in_delta 1.0, f.call(90 * Math::PI / 180), 0.0001
-    end
-
-    def test_string
-      if RUBY_ENGINE == "jruby"
-        omit("Function that returns string doesn't work with JRuby")
-      end
-
-      under_gc_stress do
-        f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-        buff = +"000"
-        str = f.call(buff, "123")
-        assert_equal("123", buff)
-        assert_equal("123", str.to_s)
-      end
-    end
-
-    def test_isdigit
-      f = Function.new(@libc['isdigit'], [TYPE_INT], TYPE_INT)
-      r1 = f.call(?1.ord)
-      r2 = f.call(?2.ord)
-      rr = f.call(?r.ord)
-      assert_operator r1, :>, 0
-      assert_operator r2, :>, 0
-      assert_equal 0, rr
-    end
-
-    def test_atof
-      f = Function.new(@libc['atof'], [TYPE_VOIDP], TYPE_DOUBLE)
-      r = f.call("12.34")
-      assert_includes(12.00..13.00, r)
-    end
-
-    def test_strtod
-      f = Function.new(@libc['strtod'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_DOUBLE)
-      buff1 = Pointer["12.34"]
-      buff2 = buff1 + 4
-      r = f.call(buff1, - buff2)
-      assert_in_delta(12.34, r, 0.001)
-    end
-
-    def test_qsort1
-      if RUBY_ENGINE == "jruby"
-        omit("The untouched sanity check is broken on JRuby: https://github.com/jruby/jruby/issues/8365")
-      end
-
-      closure_class = Class.new(Closure) do
-        def call(x, y)
-          Pointer.new(x)[0] <=> Pointer.new(y)[0]
-        end
-      end
-
-      closure_class.create(TYPE_INT, [TYPE_VOIDP, TYPE_VOIDP]) do |callback|
-        qsort = Function.new(@libc['qsort'],
-                             [TYPE_VOIDP, TYPE_SIZE_T, TYPE_SIZE_T, TYPE_VOIDP],
-                             TYPE_VOID)
-        untouched = "9341"
-        buff = +"9341"
-        qsort.call(buff, buff.size, 1, callback)
-        assert_equal("1349", buff)
-
-        bug4929 = '[ruby-core:37395]'
-        buff = +"9341"
-        under_gc_stress do
-          qsort.call(buff, buff.size, 1, callback)
-        end
-        assert_equal("1349", buff, bug4929)
-
-        # Ensure the test didn't mutate String literals
-        assert_equal("93" + "41", untouched)
-      end
-    ensure
-      # We can't use ObjectSpace with JRuby.
-      unless RUBY_ENGINE == "jruby"
-        # Ensure freeing all closures.
-        # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
-        not_freed_closures = []
-        ObjectSpace.each_object(Fiddle::Closure) do |closure|
-          not_freed_closures << closure unless closure.freed?
-        end
-        assert_equal([], not_freed_closures)
-      end
-    end
-
-    def test_snprintf
-      unless Fiddle.const_defined?("TYPE_VARIADIC")
-        omit "libffi doesn't support variadic arguments"
-      end
-      if Fiddle::WINDOWS
-        snprintf_name = "_snprintf"
-      else
-        snprintf_name = "snprintf"
-      end
-      begin
-        snprintf_pointer = @libc[snprintf_name]
-      rescue Fiddle::DLError
-        omit "Can't find #{snprintf_name}: #{$!.message}"
-      end
-      snprintf = Function.new(snprintf_pointer,
-                              [
-                                :voidp,
-                                :size_t,
-                                :const_string,
-                                :variadic,
-                              ],
-                              :int)
-      Pointer.malloc(1024, Fiddle::RUBY_FREE) do |output|
-        written = snprintf.call(output,
-                                output.size,
-                                "int: %d, string: %.*s, const string: %s\n",
-                                :int, -29,
-                                :int, 4,
-                                :voidp, "Hello",
-                                :const_string, "World")
-        assert_equal("int: -29, string: Hell, const string: World\n",
-                     output[0, written])
-
-        string_like_class = Class.new do
-          def initialize(string)
-            @string = string
-          end
-
-          def to_str
-            @string
-          end
-        end
-        written = snprintf.call(output,
-                                output.size,
-                                "string: %.*s, const string: %s, uint: %u\n",
-                                :int, 2,
-                                :voidp, "Hello",
-                                :const_string, string_like_class.new("World"),
-                                :int, 29)
-        assert_equal("string: He, const string: World, uint: 29\n",
-                     output[0, written])
-      end
-    end
-
-    def test_rb_memory_view_available_p
-      omit "MemoryView is unavailable" unless defined? Fiddle::MemoryView
-      libruby = Fiddle.dlopen(nil)
-      case Fiddle::SIZEOF_VOIDP
-      when Fiddle::SIZEOF_LONG_LONG
-        value_type = -Fiddle::TYPE_LONG_LONG
-      else
-        value_type = -Fiddle::TYPE_LONG
-      end
-      rb_memory_view_available_p =
-        Function.new(libruby["rb_memory_view_available_p"],
-                     [value_type],
-                     :bool,
-                     need_gvl: true)
-      assert_equal(false, rb_memory_view_available_p.call(Fiddle::Qnil))
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_function.rb b/test/mri/fiddle/test_function.rb
deleted file mode 100644
index b408a14ccdf..00000000000
--- a/test/mri/fiddle/test_function.rb
+++ /dev/null
@@ -1,310 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestFunction < Fiddle::TestCase
-    def setup
-      super
-      Fiddle.last_error = nil
-      if WINDOWS
-        Fiddle.win32_last_error = nil
-        Fiddle.win32_last_socket_error = nil
-      end
-    end
-
-    def teardown
-      # We can't use ObjectSpace with JRuby.
-      return if RUBY_ENGINE == "jruby"
-      # Ensure freeing all closures.
-      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
-      not_freed_closures = []
-      ObjectSpace.each_object(Fiddle::Closure) do |closure|
-        not_freed_closures << closure unless closure.freed?
-      end
-      assert_equal([], not_freed_closures)
-    end
-
-    def test_default_abi
-      func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
-      assert_equal Function::DEFAULT, func.abi
-    end
-
-    def test_name
-      func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE, name: 'sin')
-      assert_equal 'sin', func.name
-    end
-
-    def test_name_symbol
-      func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE, name: :sin)
-      assert_equal :sin, func.name
-    end
-
-    def test_need_gvl?
-      if RUBY_ENGINE == "jruby"
-        omit("rb_str_dup() doesn't exist in JRuby")
-      end
-      if RUBY_ENGINE == "truffleruby"
-        omit("rb_str_dup() doesn't work with TruffleRuby")
-      end
-
-      libruby = Fiddle.dlopen(nil)
-      rb_str_dup = Function.new(libruby['rb_str_dup'],
-                                [:voidp],
-                                :voidp,
-                                need_gvl: true)
-      assert(rb_str_dup.need_gvl?)
-      assert_equal('Hello',
-                   Fiddle.dlunwrap(rb_str_dup.call(Fiddle.dlwrap('Hello'))))
-    end
-
-    def test_argument_errors
-      assert_raise(TypeError) do
-        Function.new(@libm['sin'], TYPE_DOUBLE, TYPE_DOUBLE)
-      end
-
-      assert_raise(TypeError) do
-        Function.new(@libm['sin'], ['foo'], TYPE_DOUBLE)
-      end
-
-      assert_raise(TypeError) do
-        Function.new(@libm['sin'], [TYPE_DOUBLE], 'foo')
-      end
-    end
-
-    def test_argument_type_conversion
-      type = Struct.new(:int, :call_count) do
-        def initialize(int)
-          super(int, 0)
-        end
-        def to_int
-          raise "exhausted" if (self.call_count += 1) > 1
-          self.int
-        end
-      end
-      type_arg = type.new(TYPE_DOUBLE)
-      type_result = type.new(TYPE_DOUBLE)
-      assert_nothing_raised(RuntimeError) do
-        Function.new(@libm['sin'], [type_arg], type_result)
-      end
-      assert_equal(1, type_arg.call_count)
-      assert_equal(1, type_result.call_count)
-    end
-
-    def test_call
-      func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
-      assert_in_delta 1.0, func.call(90 * Math::PI / 180), 0.0001
-    end
-
-    def test_integer_pointer_conversion
-      func = Function.new(@libc['memcpy'], [TYPE_VOIDP, TYPE_VOIDP, TYPE_SIZE_T], TYPE_VOIDP)
-      str = 'hello'
-      Pointer.malloc(str.bytesize, Fiddle::RUBY_FREE) do |dst|
-        func.call(dst.to_i, str, dst.size)
-        assert_equal(str, dst.to_str)
-      end
-    end
-
-    def test_argument_count
-      closure_class = Class.new(Closure) do
-        def call one
-          10 + one
-        end
-      end
-      closure_class.create(TYPE_INT, [TYPE_INT]) do |closure|
-        func = Function.new(closure, [TYPE_INT], TYPE_INT)
-
-        assert_raise(ArgumentError) do
-          func.call(1,2,3)
-        end
-        assert_raise(ArgumentError) do
-          func.call
-        end
-      end
-    end
-
-    def test_last_error
-      if ffi_backend?
-        omit("Fiddle.last_error doesn't work with FFI backend")
-      end
-
-      func = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-
-      assert_nil Fiddle.last_error
-      func.call(+"000", "123")
-      refute_nil Fiddle.last_error
-    end
-
-    if WINDOWS
-      def test_win32_last_error
-        kernel32 = Fiddle.dlopen("kernel32")
-        args = [kernel32["SetLastError"], [-TYPE_LONG], TYPE_VOID]
-        args << Function::STDCALL if Function.const_defined?(:STDCALL)
-        set_last_error = Function.new(*args)
-        assert_nil(Fiddle.win32_last_error)
-        n = 1 << 29 | 1
-        set_last_error.call(n)
-        assert_equal(n, Fiddle.win32_last_error)
-      end
-
-      def test_win32_last_socket_error
-        ws2_32 = Fiddle.dlopen("ws2_32")
-        args = [ws2_32["WSASetLastError"], [TYPE_INT], TYPE_VOID]
-        args << Function::STDCALL if Function.const_defined?(:STDCALL)
-        wsa_set_last_error = Function.new(*args)
-        assert_nil(Fiddle.win32_last_socket_error)
-        n = 1 << 29 | 1
-        wsa_set_last_error.call(n)
-        assert_equal(n, Fiddle.win32_last_socket_error)
-      end
-    end
-
-    def test_strcpy
-      if RUBY_ENGINE == "jruby"
-        omit("Function that returns string doesn't work with JRuby")
-      end
-
-      f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-      buff = +"000"
-      str = f.call(buff, "123")
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def call_proc(string_to_copy)
-      buff = +"000"
-      str = yield(buff, string_to_copy)
-      [buff, str]
-    end
-
-    def test_function_as_proc
-      if RUBY_ENGINE == "jruby"
-        omit("Function that returns string doesn't work with JRuby")
-      end
-
-      f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-      buff, str = call_proc("123", &f)
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def test_function_as_method
-      if RUBY_ENGINE == "jruby"
-        omit("Function that returns string doesn't work with JRuby")
-      end
-
-      f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-      klass = Class.new do
-        define_singleton_method(:strcpy, &f)
-      end
-      buff = +"000"
-      str = klass.strcpy(buff, "123")
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def test_nogvl_poll
-      require "envutil" unless defined?(EnvUtil)
-
-      # XXX hack to quiet down CI errors on EINTR from r64353
-      # [ruby-core:88360] [Misc #14937]
-      # Making pipes (and sockets) non-blocking by default would allow
-      # us to get rid of POSIX timers / timer pthread
-      # https://bugs.ruby-lang.org/issues/14968
-      IO.pipe { |r,w| IO.select([r], [w]) }
-      begin
-        poll = @libc['poll']
-      rescue Fiddle::DLError
-        omit 'poll(2) not available'
-      end
-      f = Function.new(poll, [TYPE_VOIDP, TYPE_INT, TYPE_INT], TYPE_INT)
-
-      msec = EnvUtil.apply_timeout_scale(1000)
-      t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
-      th = Thread.new { f.call(nil, 0, msec) }
-      n1 = f.call(nil, 0, msec)
-      n2 = th.value
-      t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
-      assert_in_delta(msec, t1 - t0, EnvUtil.apply_timeout_scale(500), 'slept amount of time')
-      assert_equal(0, n1, perror("poll(2) in main-thread"))
-      assert_equal(0, n2, perror("poll(2) in sub-thread"))
-    end
-
-    def test_no_memory_leak
-      if RUBY_ENGINE == "jruby"
-        omit("rb_obj_frozen_p() doesn't exist in JRuby")
-      end
-      if RUBY_ENGINE == "truffleruby"
-        omit("memory leak detection is fragile with TruffleRuby")
-      end
-
-      if respond_to?(:assert_nothing_leaked_memory)
-        rb_obj_frozen_p_symbol = Fiddle.dlopen(nil)["rb_obj_frozen_p"]
-        rb_obj_frozen_p = Fiddle::Function.new(rb_obj_frozen_p_symbol,
-                                               [Fiddle::TYPE_UINTPTR_T],
-                                               Fiddle::TYPE_UINTPTR_T)
-        a = "a"
-        n_tries = 100_000
-        n_tries.times do
-          begin
-            a + 1
-          rescue TypeError
-          end
-        end
-        n_arguments = 1
-        sizeof_fiddle_generic = Fiddle::SIZEOF_VOIDP # Rough
-        size_per_try =
-          (sizeof_fiddle_generic * n_arguments) +
-          (Fiddle::SIZEOF_VOIDP * (n_arguments + 1))
-        assert_nothing_leaked_memory(size_per_try * n_tries) do
-          n_tries.times do
-            begin
-              rb_obj_frozen_p.call(a)
-            rescue TypeError
-            end
-          end
-        end
-      else
-        prep = 'r = Fiddle::Function.new(Fiddle.dlopen(nil)["rb_obj_frozen_p"], [Fiddle::TYPE_UINTPTR_T], Fiddle::TYPE_UINTPTR_T); a = "a"'
-        code = 'begin r.call(a); rescue TypeError; end'
-        assert_no_memory_leak(%w[-W0 -rfiddle], "#{prep}\n1000.times{#{code}}", "10_000.times {#{code}}", limit: 1.2)
-      end
-    end
-
-    def test_ractor_shareable
-      omit("Need Ractor") unless defined?(Ractor)
-      assert_ractor_shareable(Function.new(@libm["sin"],
-                                           [TYPE_DOUBLE],
-                                           TYPE_DOUBLE))
-    end
-
-    def test_ractor_shareable_name
-      omit("Need Ractor") unless defined?(Ractor)
-      assert_ractor_shareable(Function.new(@libm["sin"],
-                                           [TYPE_DOUBLE],
-                                           TYPE_DOUBLE,
-                                           name: "sin"))
-    end
-
-    def test_ractor_shareable_name_symbol
-      omit("Need Ractor") unless defined?(Ractor)
-      assert_ractor_shareable(Function.new(@libm["sin"],
-                                           [TYPE_DOUBLE],
-                                           TYPE_DOUBLE,
-                                           name: :sin))
-    end
-
-    private
-
-    def perror(m)
-      proc do
-        if e = Fiddle.last_error
-          m = "#{m}: #{SystemCallError.new(e).message}"
-        end
-        m
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_handle.rb b/test/mri/fiddle/test_handle.rb
deleted file mode 100644
index ad8c45a00a6..00000000000
--- a/test/mri/fiddle/test_handle.rb
+++ /dev/null
@@ -1,244 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestHandle < TestCase
-    include Fiddle
-
-    def test_library_unavailable
-      assert_raise(DLError) do
-        Fiddle::Handle.new("does-not-exist-library")
-      end
-      assert_raise(DLError) do
-        Fiddle::Handle.new("/does/not/exist/library.#{RbConfig::CONFIG['SOEXT']}")
-      end
-    end
-
-    def test_to_i
-      if ffi_backend?
-        omit("Fiddle::Handle#to_i is unavailable with FFI backend")
-      end
-
-      handle = Fiddle::Handle.new(LIBC_SO)
-      assert_kind_of Integer, handle.to_i
-    end
-
-    def test_to_ptr
-      if ffi_backend?
-        omit("Fiddle::Handle#to_i is unavailable with FFI backend")
-      end
-
-      handle = Fiddle::Handle.new(LIBC_SO)
-      ptr = handle.to_ptr
-      assert_equal ptr.to_i, handle.to_i
-    end
-
-    def test_static_sym_unknown
-      assert_raise(DLError) { Fiddle::Handle.sym('fooo') }
-      assert_raise(DLError) { Fiddle::Handle['fooo'] }
-      refute Fiddle::Handle.sym_defined?('fooo')
-    end
-
-    def test_static_sym
-      if ffi_backend?
-        omit("We can't assume static symbols with FFI backend")
-      end
-
-      begin
-        # Linux / Darwin / FreeBSD
-        refute_nil Fiddle::Handle.sym('dlopen')
-        assert Fiddle::Handle.sym_defined?('dlopen')
-        assert_equal Fiddle::Handle.sym('dlopen'), Fiddle::Handle['dlopen']
-        return
-      rescue
-      end
-
-      begin
-        # NetBSD
-        require '-test-/dln/empty'
-        refute_nil Fiddle::Handle.sym('Init_empty')
-        assert_equal Fiddle::Handle.sym('Init_empty'), Fiddle::Handle['Init_empty']
-        return
-      rescue
-      end
-    end unless /mswin|mingw/ =~ RUBY_PLATFORM
-
-    def test_sym_closed_handle
-      handle = Fiddle::Handle.new(LIBC_SO)
-      handle.close
-      assert_raise(DLError) { handle.sym("calloc") }
-      assert_raise(DLError) { handle["calloc"] }
-    end
-
-    def test_sym_unknown
-      handle = Fiddle::Handle.new(LIBC_SO)
-      assert_raise(DLError) { handle.sym('fooo') }
-      assert_raise(DLError) { handle['fooo'] }
-      refute handle.sym_defined?('fooo')
-    end
-
-    def test_sym_with_bad_args
-      handle = Handle.new(LIBC_SO)
-      assert_raise(TypeError) { handle.sym(nil) }
-      assert_raise(TypeError) { handle[nil] }
-    end
-
-    def test_sym
-      handle = Handle.new(LIBC_SO)
-      refute_nil handle.sym('calloc')
-      refute_nil handle['calloc']
-      assert handle.sym_defined?('calloc')
-    end
-
-    def test_handle_close
-      handle = Handle.new(LIBC_SO)
-      assert_equal 0, handle.close
-    end
-
-    def test_handle_close_twice
-      handle = Handle.new(LIBC_SO)
-      handle.close
-      assert_raise(DLError) do
-        handle.close
-      end
-    end
-
-    def test_dlopen_returns_handle
-      assert_instance_of Handle, dlopen(LIBC_SO)
-    end
-
-    def test_initialize_noargs
-      if RUBY_ENGINE == "jruby"
-        omit("rb_str_new() doesn't exist in JRuby")
-      end
-
-      handle = Handle.new
-      refute_nil handle['rb_str_new']
-    end
-
-    def test_initialize_flags
-      handle = Handle.new(LIBC_SO, RTLD_LAZY | RTLD_GLOBAL)
-      refute_nil handle['calloc']
-    end
-
-    def test_enable_close
-      handle = Handle.new(LIBC_SO)
-      assert !handle.close_enabled?, 'close is enabled'
-
-      handle.enable_close
-      assert handle.close_enabled?, 'close is not enabled'
-    end
-
-    def test_disable_close
-      handle = Handle.new(LIBC_SO)
-
-      handle.enable_close
-      assert handle.close_enabled?, 'close is enabled'
-      handle.disable_close
-      assert !handle.close_enabled?, 'close is enabled'
-    end
-
-    def test_file_name
-      if ffi_backend?
-        omit("Fiddle::Handle#file_name doesn't exist in FFI backend")
-      end
-
-      file_name = Handle.new(LIBC_SO).file_name
-      if file_name
-        assert_kind_of String, file_name
-        expected = [File.basename(LIBC_SO)]
-        begin
-          expected << File.basename(File.realpath(LIBC_SO, File.dirname(file_name)))
-        rescue Errno::ENOENT
-        end
-        basename = File.basename(file_name)
-        unless File::FNM_SYSCASE.zero?
-          basename.downcase!
-          expected.each(&:downcase!)
-        end
-        assert_include expected, basename
-      end
-    end
-
-    def test_NEXT
-      if ffi_backend?
-        omit("Fiddle::Handle::NEXT doesn't exist in FFI backend")
-      end
-
-      begin
-        # Linux / Darwin
-        #
-        # There are two special pseudo-handles, RTLD_DEFAULT and RTLD_NEXT.  The  former  will  find
-        # the  first  occurrence  of the desired symbol using the default library search order.  The
-        # latter will find the next occurrence of a function in the search order after  the  current
-        # library.   This  allows  one  to  provide  a  wrapper  around a function in another shared
-        # library.
-        # --- Ubuntu Linux 8.04 dlsym(3)
-        handle = Handle::NEXT
-        refute_nil handle['malloc']
-        return
-      rescue
-      end
-
-      begin
-        # BSD
-        #
-        # If dlsym() is called with the special handle RTLD_NEXT, then the search
-        # for the symbol is limited to the shared objects which were loaded after
-        # the one issuing the call to dlsym().  Thus, if the function is called
-        # from the main program, all the shared libraries are searched.  If it is
-        # called from a shared library, all subsequent shared libraries are
-        # searched.  RTLD_NEXT is useful for implementing wrappers around library
-        # functions.  For example, a wrapper function getpid() could access the
-        # "real" getpid() with dlsym(RTLD_NEXT, "getpid").  (Actually, the dlfunc()
-        # interface, below, should be used, since getpid() is a function and not a
-        # data object.)
-        # --- FreeBSD 8.0 dlsym(3)
-        require '-test-/dln/empty'
-        handle = Handle::NEXT
-        refute_nil handle['Init_empty']
-        return
-      rescue
-      end
-    end unless /mswin|mingw/ =~ RUBY_PLATFORM
-
-    def test_DEFAULT
-      if Fiddle::WINDOWS
-        omit("Fiddle::Handle::DEFAULT doesn't have malloc() on Windows")
-      end
-
-      handle = Handle::DEFAULT
-      refute_nil handle['malloc']
-    end
-
-    def test_dlerror
-      # FreeBSD (at least 7.2 to 7.2) calls nsdispatch(3) when it calls
-      # getaddrinfo(3). And nsdispatch(3) doesn't call dlerror(3) even if
-      # it calls _nss_cache_cycle_prevention_function with dlsym(3).
-      # So our Fiddle::Handle#sym must call dlerror(3) before call dlsym.
-      # In general uses of dlerror(3) should call it before use it.
-      verbose, $VERBOSE = $VERBOSE, nil
-      require 'socket'
-      Socket.gethostbyname("localhost")
-      Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
-    ensure
-      $VERBOSE = verbose
-    end if /freebsd/=~ RUBY_PLATFORM
-
-    if /cygwin|mingw|mswin/ =~ RUBY_PLATFORM
-      def test_fallback_to_ansi
-        k = Fiddle::Handle.new("kernel32.dll")
-        ansi = k["GetFileAttributesA"]
-        assert_equal(ansi, k["GetFileAttributes"], "should fallback to ANSI version")
-      end
-    end
-
-    def test_ractor_shareable
-      omit("Need Ractor") unless defined?(Ractor)
-      assert_ractor_shareable(Fiddle::Handle.new(LIBC_SO))
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_import.rb b/test/mri/fiddle/test_import.rb
deleted file mode 100644
index a6a3b66655d..00000000000
--- a/test/mri/fiddle/test_import.rb
+++ /dev/null
@@ -1,499 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/import'
-rescue LoadError
-end
-
-module Fiddle
-  module LIBC
-    extend Importer
-    dlload LIBC_SO, LIBM_SO
-
-    typealias 'string', 'char*'
-    typealias 'FILE*', 'void*'
-
-    extern "void *strcpy(char*, char*)"
-    extern "int isdigit(int)"
-    extern "double atof(string)"
-    extern "unsigned long strtoul(char*, char **, int)"
-    extern "int qsort(void*, unsigned long, unsigned long, void*)"
-    extern "int fprintf(FILE*, char*)" rescue nil
-    extern "int gettimeofday(timeval*, timezone*)" rescue nil
-
-    Timeval = struct [
-      "long tv_sec",
-      "long tv_usec",
-    ]
-    Timezone = struct [
-      "int tz_minuteswest",
-      "int tz_dsttime",
-    ]
-    MyStruct = struct [
-      "short num[5]",
-      "char c",
-      "unsigned char buff[7]",
-    ]
-    StructNestedStruct = struct [
-      {
-        "vertices[2]" => {
-          position: ["float x", "float y", "float z"],
-          texcoord: ["float u", "float v"]
-        },
-        object: ["int id", "void *user_data"],
-      },
-      "int id"
-    ]
-    UnionNestedStruct = union [
-      {
-        keyboard: [
-          'unsigned int state',
-          'char key'
-        ],
-        mouse: [
-          'unsigned int button',
-          'unsigned short x',
-          'unsigned short y'
-        ]
-      }
-    ]
-  end
-
-  class TestImport < TestCase
-    def test_ensure_call_dlload
-      err = assert_raise(RuntimeError) do
-        Class.new do
-          extend Importer
-          extern "void *strcpy(char*, char*)"
-        end
-      end
-      assert_match(/call dlload before/, err.message)
-    end
-
-    def test_struct_memory_access()
-      # check memory operations performed directly on struct
-      Fiddle::Importer.struct(['int id']).malloc(Fiddle::RUBY_FREE) do |my_struct|
-        my_struct[0, Fiddle::SIZEOF_INT] = "\x01".b * Fiddle::SIZEOF_INT
-        assert_equal 0x01010101, my_struct.id
-
-        my_struct.id = 0
-        assert_equal "\x00".b * Fiddle::SIZEOF_INT, my_struct[0, Fiddle::SIZEOF_INT]
-      end
-    end
-
-    def test_struct_ptr_array_subscript_multiarg()
-      # check memory operations performed on struct#to_ptr
-      Fiddle::Importer.struct([ 'int x' ]).malloc(Fiddle::RUBY_FREE) do |struct|
-        ptr = struct.to_ptr
-
-        struct.x = 0x02020202
-        assert_equal("\x02".b * Fiddle::SIZEOF_INT, ptr[0, Fiddle::SIZEOF_INT])
-
-        ptr[0, Fiddle::SIZEOF_INT] = "\x01".b * Fiddle::SIZEOF_INT
-        assert_equal 0x01010101, struct.x
-      end
-    end
-
-    def test_malloc()
-      LIBC::Timeval.malloc(Fiddle::RUBY_FREE) do |s1|
-        LIBC::Timeval.malloc(Fiddle::RUBY_FREE) do |s2|
-          refute_equal(s1.to_ptr.to_i, s2.to_ptr.to_i)
-        end
-      end
-    end
-
-    def test_sizeof()
-      assert_equal(SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
-      assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct))
-      LIBC::MyStruct.malloc(Fiddle::RUBY_FREE) do |my_struct|
-        assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(my_struct))
-      end
-      assert_equal(SIZEOF_LONG_LONG, LIBC.sizeof("long long")) if defined?(SIZEOF_LONG_LONG)
-      assert_equal(LIBC::StructNestedStruct.size(), LIBC.sizeof(LIBC::StructNestedStruct))
-    end
-
-    Fiddle.constants.grep(/\ATYPE_(?!VOID|VARIADIC\z)(.*)/) do
-      type = $&
-      const_type_name = $1
-      size = Fiddle.const_get("SIZEOF_#{const_type_name}")
-      if const_type_name == "CONST_STRING"
-        name = "const_string"
-        type_name = "const char*"
-      else
-        name = $1.sub(/P\z/,"*").gsub(/_(?!T\z)/, " ").downcase
-        type_name = name
-      end
-      type_name = "unsigned #{$1}" if type_name =~ /\Au(long|short|char|int|long long)\z/
-
-      define_method("test_sizeof_#{name}") do
-        assert_equal(size, Fiddle::Importer.sizeof(type_name), type)
-      end
-    end
-
-    # Assert that the unsigned constants are equal to the "negative" signed ones
-    # for backwards compatibility
-    def test_unsigned_equals_negative_signed
-      Fiddle.constants.grep(/\ATYPE_(?!VOID|VARIADIC\z)(U.*)/) do |unsigned|
-        assert_equal(-Fiddle.const_get(unsigned.to_s.sub(/U/, '')),
-                     Fiddle.const_get(unsigned))
-      end
-    end
-
-    def test_type_constants
-      Fiddle::Types.constants.each do |const|
-        assert_equal Fiddle::Types.const_get(const), Fiddle.const_get("TYPE_#{const}")
-      end
-    end
-
-    def test_unsigned_result()
-      d = (2 ** 31) + 1
-
-      r = LIBC.strtoul(d.to_s, nil, 0)
-      assert_equal(d, r)
-    end
-
-    def test_io()
-      if ffi_backend?
-        omit("BUILD_RUBY_PLATFORM doesn't exist in FFI backend")
-      end
-
-      if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM ) || !defined?(LIBC.fprintf)
-        return
-      end
-      io_in,io_out = IO.pipe()
-      LIBC.fprintf(io_out, "hello")
-      io_out.flush()
-      io_out.close()
-      str = io_in.read()
-      io_in.close()
-      assert_equal("hello", str)
-    end
-
-    def test_value()
-      i = LIBC.value('int', 2)
-      assert_equal(2, i.value)
-
-      d = LIBC.value('double', 2.0)
-      assert_equal(2.0, d.value)
-
-      ary = LIBC.value('int[3]', [0,1,2])
-      assert_equal([0,1,2], ary.value)
-    end
-
-    def test_struct_array_assignment()
-      Fiddle::Importer.struct(["unsigned int stages[3]"]).malloc(Fiddle::RUBY_FREE) do |instance|
-        instance.stages[0] = 1024
-        instance.stages[1] = 10
-        instance.stages[2] = 100
-        assert_equal 1024, instance.stages[0]
-        assert_equal 10, instance.stages[1]
-        assert_equal 100, instance.stages[2]
-        assert_equal [1024, 10, 100].pack(Fiddle::PackInfo::PACK_MAP[-Fiddle::TYPE_INT] * 3),
-                    instance.to_ptr[0, 3 * Fiddle::SIZEOF_INT]
-        assert_raise(IndexError) { instance.stages[-1] = 5 }
-        assert_raise(IndexError) { instance.stages[3] = 5 }
-      end
-    end
-
-    def test_nested_struct_reusing_other_structs()
-      position_struct = Fiddle::Importer.struct(['float x', 'float y', 'float z'])
-      texcoord_struct = Fiddle::Importer.struct(['float u', 'float v'])
-      vertex_struct   = Fiddle::Importer.struct(position: position_struct, texcoord: texcoord_struct)
-      mesh_struct     = Fiddle::Importer.struct([
-                                                  {
-                                                    "vertices[2]" => vertex_struct,
-                                                    object: [
-                                                      "int id",
-                                                      "void *user_data",
-                                                    ],
-                                                  },
-                                                  "int id",
-                                                ])
-      assert_equal LIBC::StructNestedStruct.size, mesh_struct.size
-
-
-      keyboard_event_struct = Fiddle::Importer.struct(['unsigned int state', 'char key'])
-      mouse_event_struct    = Fiddle::Importer.struct(['unsigned int button', 'unsigned short x', 'unsigned short y'])
-      event_union           = Fiddle::Importer.union([{ keyboard: keyboard_event_struct, mouse: mouse_event_struct}])
-      assert_equal LIBC::UnionNestedStruct.size, event_union.size
-    end
-
-    def test_nested_struct_alignment_is_not_its_size()
-      inner = Fiddle::Importer.struct(['int x', 'int y', 'int z', 'int w'])
-      outer = Fiddle::Importer.struct(['char a', { 'nested' => inner }, 'char b'])
-      outer.malloc(Fiddle::RUBY_FREE) do |instance|
-        offset = instance.to_ptr.instance_variable_get(:"@offset")
-        assert_equal Fiddle::SIZEOF_INT * 5, offset.last
-        assert_equal Fiddle::SIZEOF_INT * 6, outer.size
-        assert_equal instance.to_ptr.size, outer.size
-      end
-    end
-
-    def test_struct_nested_struct_members()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        Fiddle::Pointer.malloc(24, Fiddle::RUBY_FREE) do |user_data|
-          s.vertices[0].position.x = 1
-          s.vertices[0].position.y = 2
-          s.vertices[0].position.z = 3
-          s.vertices[0].texcoord.u = 4
-          s.vertices[0].texcoord.v = 5
-          s.vertices[1].position.x = 6
-          s.vertices[1].position.y = 7
-          s.vertices[1].position.z = 8
-          s.vertices[1].texcoord.u = 9
-          s.vertices[1].texcoord.v = 10
-          s.object.id              = 100
-          s.object.user_data       = user_data
-          s.id                     = 101
-          assert_equal({
-                         "vertices" => [
-                           {
-                             "position" => {
-                               "x" => 1,
-                               "y" => 2,
-                               "z" => 3,
-                             },
-                             "texcoord" => {
-                               "u" => 4,
-                               "v" => 5,
-                             },
-                           },
-                           {
-                             "position" => {
-                               "x" => 6,
-                               "y" => 7,
-                               "z" => 8,
-                             },
-                             "texcoord" => {
-                               "u" => 9,
-                               "v" => 10,
-                             },
-                           },
-                         ],
-                         "object" => {
-                           "id" => 100,
-                           "user_data" => user_data,
-                         },
-                         "id" => 101,
-                       },
-                       s.to_h)
-        end
-      end
-    end
-
-    def test_union_nested_struct_members()
-      LIBC::UnionNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.keyboard.state = 100
-        s.keyboard.key   = 101
-        assert_equal(100, s.mouse.button)
-        refute_equal(  0, s.mouse.x)
-      end
-    end
-
-    def test_struct_nested_struct_replace_array_element()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.vertices[0].position.x = 5
-
-        vertex_struct = Fiddle::Importer.struct [{
-          position: ["float x", "float y", "float z"],
-          texcoord: ["float u", "float v"]
-        }]
-        vertex_struct.malloc(Fiddle::RUBY_FREE) do |vertex|
-          vertex.position.x = 100
-          s.vertices[0] = vertex
-
-          # make sure element was copied by value, but things like memory address
-          # should not be changed
-          assert_equal(100,              s.vertices[0].position.x)
-          refute_equal(vertex.object_id, s.vertices[0].object_id)
-          refute_equal(vertex.to_ptr,    s.vertices[0].to_ptr)
-        end
-      end
-    end
-
-    def test_struct_nested_struct_replace_array_element_nil()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.vertices[0].position.x = 5
-        s.vertices[0] = nil
-        assert_equal({
-                       "position" => {
-                         "x" => 0.0,
-                         "y" => 0.0,
-                         "z" => 0.0,
-                       },
-                       "texcoord" => {
-                         "u" => 0.0,
-                         "v" => 0.0,
-                       },
-                     },
-                     s.vertices[0].to_h)
-      end
-    end
-
-    def test_struct_nested_struct_replace_array_element_hash()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.vertices[0] = nil
-        s.vertices[0] = {
-          position: {
-            x: 10,
-            y: 100,
-          },
-        }
-        assert_equal({
-                       "position" => {
-                         "x" => 10.0,
-                         "y" => 100.0,
-                         "z" => 0.0,
-                       },
-                       "texcoord" => {
-                         "u" => 0.0,
-                         "v" => 0.0,
-                       },
-                     },
-                     s.vertices[0].to_h)
-      end
-    end
-
-    def test_struct_nested_struct_replace_entire_array()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        vertex_struct = Fiddle::Importer.struct [{
-          position: ["float x", "float y", "float z"],
-          texcoord: ["float u", "float v"]
-        }]
-
-        vertex_struct.malloc(Fiddle::RUBY_FREE) do |same0|
-          vertex_struct.malloc(Fiddle::RUBY_FREE) do |same1|
-            same = [same0, same1]
-            same[0].position.x = 1; same[1].position.x = 6
-            same[0].position.y = 2; same[1].position.y = 7
-            same[0].position.z = 3; same[1].position.z = 8
-            same[0].texcoord.u = 4; same[1].texcoord.u = 9
-            same[0].texcoord.v = 5; same[1].texcoord.v = 10
-            s.vertices = same
-            assert_equal([
-                           {
-                             "position" => {
-                               "x" => 1.0,
-                               "y" => 2.0,
-                               "z" => 3.0,
-                             },
-                             "texcoord" => {
-                               "u" => 4.0,
-                               "v" => 5.0,
-                             },
-                           },
-                           {
-                             "position" => {
-                               "x" => 6.0,
-                               "y" => 7.0,
-                               "z" => 8.0,
-                             },
-                             "texcoord" => {
-                               "u" => 9.0,
-                               "v" => 10.0,
-                             },
-                           }
-                         ],
-                         s.vertices.collect(&:to_h))
-          end
-        end
-      end
-    end
-
-    def test_struct_nested_struct_replace_entire_array_with_different_struct()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        different_struct_same_size = Fiddle::Importer.struct [{
-          a: ['float i', 'float j', 'float k'],
-          b: ['float l', 'float m']
-        }]
-
-        different_struct_same_size.malloc(Fiddle::RUBY_FREE) do |different0|
-          different_struct_same_size.malloc(Fiddle::RUBY_FREE) do |different1|
-            different = [different0, different1]
-            different[0].a.i = 11; different[1].a.i = 16
-            different[0].a.j = 12; different[1].a.j = 17
-            different[0].a.k = 13; different[1].a.k = 18
-            different[0].b.l = 14; different[1].b.l = 19
-            different[0].b.m = 15; different[1].b.m = 20
-            s.vertices[0][0, s.vertices[0].class.size] = different[0].to_ptr
-            s.vertices[1][0, s.vertices[1].class.size] = different[1].to_ptr
-            assert_equal([
-                           {
-                             "position" => {
-                               "x" => 11.0,
-                               "y" => 12.0,
-                               "z" => 13.0,
-                             },
-                             "texcoord" => {
-                               "u" => 14.0,
-                               "v" => 15.0,
-                             },
-                           },
-                           {
-                             "position" => {
-                               "x" => 16.0,
-                               "y" => 17.0,
-                               "z" => 18.0,
-                             },
-                             "texcoord" => {
-                               "u" => 19.0,
-                               "v" => 20.0,
-                             },
-                           }
-                         ],
-                         s.vertices.collect(&:to_h))
-          end
-        end
-      end
-    end
-
-    def test_struct()
-      LIBC::MyStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.num = [0,1,2,3,4]
-        s.c = ?a.ord
-        s.buff = "012345\377"
-        assert_equal([0,1,2,3,4], s.num)
-        assert_equal(?a.ord, s.c)
-        assert_equal([?0.ord,?1.ord,?2.ord,?3.ord,?4.ord,?5.ord,"\xFF".ord], s.buff)
-      end
-    end
-
-    def test_gettimeofday()
-      if( defined?(LIBC.gettimeofday) )
-        LIBC::Timeval.malloc(Fiddle::RUBY_FREE) do |timeval|
-          LIBC::Timezone.malloc(Fiddle::RUBY_FREE) do |timezone|
-            LIBC.gettimeofday(timeval, timezone)
-          end
-          cur = Time.now()
-          assert(cur.to_i - 2 <= timeval.tv_sec && timeval.tv_sec <= cur.to_i)
-        end
-      end
-    end
-
-    def test_strcpy()
-      if RUBY_ENGINE == "jruby"
-        omit("Function that returns string doesn't work with JRuby")
-      end
-
-      buff = +"000"
-      str = LIBC.strcpy(buff, "123")
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def test_isdigit
-      r1 = LIBC.isdigit(?1.ord)
-      r2 = LIBC.isdigit(?2.ord)
-      rr = LIBC.isdigit(?r.ord)
-      assert_operator(r1, :>, 0)
-      assert_operator(r2, :>, 0)
-      assert_equal(0, rr)
-    end
-
-    def test_atof
-      r = LIBC.atof("12.34")
-      assert_includes(12.00..13.00, r)
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fiddle/test_memory_view.rb b/test/mri/fiddle/test_memory_view.rb
deleted file mode 100644
index da00d66c91b..00000000000
--- a/test/mri/fiddle/test_memory_view.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-  return
-end
-
-begin
-  require '-test-/memory_view'
-rescue LoadError
-  return
-end
-
-module Fiddle
-  class TestMemoryView < TestCase
-    def setup
-      omit "MemoryView is unavailable" unless defined? Fiddle::MemoryView
-    end
-
-    def test_null_ptr
-      assert_raise(ArgumentError) do
-        MemoryView.new(Fiddle::NULL)
-      end
-    end
-
-    def test_memory_view_from_unsupported_obj
-      obj = Object.new
-      assert_raise(ArgumentError) do
-        MemoryView.new(obj)
-      end
-    end
-
-    def test_memory_view_from_pointer
-      str = Marshal.load(Marshal.dump("hello world"))
-      ptr = Pointer[str]
-      mview = MemoryView.new(ptr)
-      begin
-        assert_same(ptr, mview.obj)
-        assert_equal(str.bytesize, mview.byte_size)
-        assert_equal(true, mview.readonly?)
-        assert_equal(nil, mview.format)
-        assert_equal(1, mview.item_size)
-        assert_equal(1, mview.ndim)
-        assert_equal(nil, mview.shape)
-        assert_equal(nil, mview.strides)
-        assert_equal(nil, mview.sub_offsets)
-
-        codes = str.codepoints
-        assert_equal(codes, (0...str.bytesize).map {|i| mview[i] })
-      ensure
-        mview.release
-      end
-    end
-
-    def test_memory_view_multi_dimensional
-      omit "MemoryViewTestUtils is unavailable" unless defined? MemoryViewTestUtils
-
-      buf = [ 1, 2, 3, 4,
-              5, 6, 7, 8,
-              9, 10, 11, 12 ].pack("l!*")
-      shape = [3, 4]
-      md = MemoryViewTestUtils::MultiDimensionalView.new(buf, "l!", shape, nil)
-      mview = Fiddle::MemoryView.new(md)
-      begin
-        assert_equal(buf.bytesize, mview.byte_size)
-        assert_equal("l!", mview.format)
-        assert_equal(Fiddle::SIZEOF_LONG, mview.item_size)
-        assert_equal(2, mview.ndim)
-        assert_equal(shape, mview.shape)
-        assert_equal([Fiddle::SIZEOF_LONG*4, Fiddle::SIZEOF_LONG], mview.strides)
-        assert_equal(nil, mview.sub_offsets)
-        assert_equal(1, mview[0, 0])
-        assert_equal(4, mview[0, 3])
-        assert_equal(6, mview[1, 1])
-        assert_equal(10, mview[2, 1])
-      ensure
-        mview.release
-      end
-    end
-
-    def test_memory_view_multi_dimensional_with_strides
-      omit "MemoryViewTestUtils is unavailable" unless defined? MemoryViewTestUtils
-
-      buf = [ 1, 2,  3,  4,  5,  6,  7,  8,
-              9, 10, 11, 12, 13, 14, 15, 16 ].pack("l!*")
-      shape = [2, 8]
-      strides = [4*Fiddle::SIZEOF_LONG*2, Fiddle::SIZEOF_LONG*2]
-      md = MemoryViewTestUtils::MultiDimensionalView.new(buf, "l!", shape, strides)
-      mview = Fiddle::MemoryView.new(md)
-      begin
-        assert_equal("l!", mview.format)
-        assert_equal(Fiddle::SIZEOF_LONG, mview.item_size)
-        assert_equal(buf.bytesize, mview.byte_size)
-        assert_equal(2, mview.ndim)
-        assert_equal(shape, mview.shape)
-        assert_equal(strides, mview.strides)
-        assert_equal(nil, mview.sub_offsets)
-        assert_equal(1, mview[0, 0])
-        assert_equal(5, mview[0, 2])
-        assert_equal(9, mview[1, 0])
-        assert_equal(15, mview[1, 3])
-      ensure
-        mview.release
-      end
-    end
-
-    def test_memory_view_multi_dimensional_with_multiple_members
-      omit "MemoryViewTestUtils is unavailable" unless defined? MemoryViewTestUtils
-
-      buf = [ 1, 2,  3,  4,  5,  6,  7,  8,
-             -1, -2, -3, -4, -5, -6, -7, -8].pack("s*")
-      shape = [2, 4]
-      strides = [4*Fiddle::SIZEOF_SHORT*2, Fiddle::SIZEOF_SHORT*2]
-      md = MemoryViewTestUtils::MultiDimensionalView.new(buf, "ss", shape, strides)
-      mview = Fiddle::MemoryView.new(md)
-      begin
-        assert_equal("ss", mview.format)
-        assert_equal(Fiddle::SIZEOF_SHORT*2, mview.item_size)
-        assert_equal(buf.bytesize, mview.byte_size)
-        assert_equal(2, mview.ndim)
-        assert_equal(shape, mview.shape)
-        assert_equal(strides, mview.strides)
-        assert_equal(nil, mview.sub_offsets)
-        assert_equal([1, 2], mview[0, 0])
-        assert_equal([5, 6], mview[0, 2])
-        assert_equal([-1, -2], mview[1, 0])
-        assert_equal([-7, -8], mview[1, 3])
-      ensure
-        mview.release
-      end
-    end
-
-    def test_export
-      str = "hello world"
-      mview_str = MemoryView.export(Pointer[str]) do |mview|
-        mview.to_s
-      end
-      assert_equal(str, mview_str)
-    end
-
-    def test_release
-      ptr = Pointer["hello world"]
-      mview = MemoryView.new(ptr)
-      assert_same(ptr, mview.obj)
-      mview.release
-      assert_nil(mview.obj)
-    end
-
-    def test_to_s
-      # U+3042 HIRAGANA LETTER A
-      data = "\u{3042}"
-      ptr = Pointer[data]
-      mview = MemoryView.new(ptr)
-      begin
-        string = mview.to_s
-        assert_equal([data.b, true],
-                     [string, string.frozen?])
-      ensure
-        mview.release
-      end
-    end
-
-    def test_ractor_shareable
-      omit("Need Ractor") unless defined?(Ractor)
-      ptr = Pointer["hello world"]
-      mview = MemoryView.new(ptr)
-      begin
-        assert_ractor_shareable(mview)
-        assert_predicate(ptr, :frozen?)
-      ensure
-        mview.release
-      end
-    end
-  end
-end
diff --git a/test/mri/fiddle/test_pack.rb b/test/mri/fiddle/test_pack.rb
deleted file mode 100644
index ade1dd5040c..00000000000
--- a/test/mri/fiddle/test_pack.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-begin
-  require_relative 'helper'
-  require 'fiddle/pack'
-rescue LoadError
-  return
-end
-
-module Fiddle
-  class TestPack < TestCase
-    def test_pack_map
-      if defined?(TYPE_LONG_LONG)
-        assert_equal [0xffff_ffff_ffff_ffff], [0xffff_ffff_ffff_ffff].pack(PackInfo::PACK_MAP[-TYPE_LONG_LONG]).unpack(PackInfo::PACK_MAP[-TYPE_LONG_LONG])
-      end
-
-      case Fiddle::SIZEOF_VOIDP
-      when 8
-        assert_equal [0xffff_ffff_ffff_ffff], [0xffff_ffff_ffff_ffff].pack(PackInfo::PACK_MAP[TYPE_VOIDP]).unpack(PackInfo::PACK_MAP[TYPE_VOIDP])
-      when 4
-        assert_equal [0xffff_ffff], [0xffff_ffff].pack(PackInfo::PACK_MAP[TYPE_VOIDP]).unpack(PackInfo::PACK_MAP[TYPE_VOIDP])
-      end
-
-      case Fiddle::SIZEOF_LONG
-      when 8
-        assert_equal [0xffff_ffff_ffff_ffff], [0xffff_ffff_ffff_ffff].pack(PackInfo::PACK_MAP[-TYPE_LONG]).unpack(PackInfo::PACK_MAP[-TYPE_LONG])
-      when 4
-        assert_equal [0xffff_ffff], [0xffff_ffff].pack(PackInfo::PACK_MAP[-TYPE_LONG]).unpack(PackInfo::PACK_MAP[-TYPE_LONG])
-      end
-
-      if Fiddle::SIZEOF_INT == 4
-        assert_equal [0xffff_ffff], [0xffff_ffff].pack(PackInfo::PACK_MAP[-TYPE_INT]).unpack(PackInfo::PACK_MAP[-TYPE_INT])
-      end
-
-      assert_equal [0xffff], [0xffff].pack(PackInfo::PACK_MAP[-TYPE_SHORT]).unpack(PackInfo::PACK_MAP[-TYPE_SHORT])
-      assert_equal [0xff], [0xff].pack(PackInfo::PACK_MAP[-TYPE_CHAR]).unpack(PackInfo::PACK_MAP[-TYPE_CHAR])
-    end
-  end
-end
diff --git a/test/mri/fiddle/test_pinned.rb b/test/mri/fiddle/test_pinned.rb
deleted file mode 100644
index ad132579b00..00000000000
--- a/test/mri/fiddle/test_pinned.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-  return
-end
-
-module Fiddle
-  class TestPinned < Fiddle::TestCase
-    def test_pin_object
-      x = Object.new
-      pinner = Pinned.new x
-      assert_same x, pinner.ref
-    end
-
-    def test_clear
-      pinner = Pinned.new Object.new
-      refute pinner.cleared?
-      pinner.clear
-      assert pinner.cleared?
-      ex = assert_raise(Fiddle::ClearedReferenceError) do
-        pinner.ref
-      end
-      assert_match "called on", ex.message
-    end
-
-    def test_ractor_shareable
-      omit("Need Ractor") unless defined?(Ractor)
-      obj = Object.new
-      assert_ractor_shareable(Pinned.new(obj))
-      assert_predicate(obj, :frozen?)
-    end
-  end
-end
diff --git a/test/mri/fiddle/test_pointer.rb b/test/mri/fiddle/test_pointer.rb
deleted file mode 100644
index 9d490f9f265..00000000000
--- a/test/mri/fiddle/test_pointer.rb
+++ /dev/null
@@ -1,319 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestPointer < TestCase
-    def dlwrap arg
-      Fiddle.dlwrap arg
-    end
-
-    def test_can_read_write_memory
-      # Allocate some memory
-      Fiddle::Pointer.malloc(Fiddle::SIZEOF_VOIDP, Fiddle::RUBY_FREE) do |pointer|
-        address = pointer.to_i
-        bytes_to_write = Fiddle::SIZEOF_VOIDP.times.to_a.pack("C*")
-
-        # Write to the memory
-        Fiddle::Pointer.write(address, bytes_to_write)
-
-        # Read the bytes out again
-        bytes = Fiddle::Pointer.read(address, Fiddle::SIZEOF_VOIDP)
-        assert_equal bytes_to_write, bytes
-      end
-    end
-
-    def test_cptr_to_int
-      null = Fiddle::NULL
-      assert_equal(null.to_i, null.to_int)
-    end
-
-    def test_malloc_free_func_int
-      free = Fiddle::Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
-      assert_equal free.to_i, Fiddle::RUBY_FREE.to_i
-
-      ptr  = Pointer.malloc(10, free.to_i)
-      assert_equal 10, ptr.size
-      assert_equal free.to_i, ptr.free.to_i
-    end
-
-    def test_malloc_free_func
-      free = Fiddle::Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
-
-      ptr  = Pointer.malloc(10, free)
-      assert_equal 10, ptr.size
-      assert_equal free.to_i, ptr.free.to_i
-    end
-
-    def test_malloc_block
-      escaped_ptr = nil
-      returned = Pointer.malloc(10, Fiddle::RUBY_FREE) do |ptr|
-        assert_equal 10, ptr.size
-        assert_equal Fiddle::RUBY_FREE, ptr.free.to_i
-        escaped_ptr = ptr
-        :returned
-      end
-      assert_equal :returned, returned
-      assert escaped_ptr.freed?
-    end
-
-    def test_malloc_block_no_free
-      assert_raise ArgumentError do
-        Pointer.malloc(10) { |ptr| }
-      end
-    end
-
-    def test_malloc_subclass
-      subclass = Class.new(Pointer)
-      subclass.malloc(10, Fiddle::RUBY_FREE) do |ptr|
-        assert ptr.is_a?(subclass)
-      end
-    end
-
-    def test_to_str
-      str = Marshal.load(Marshal.dump("hello world"))
-      ptr = Pointer[str]
-
-      assert_equal 3, ptr.to_str(3).length
-      assert_equal str, ptr.to_str
-
-      ptr[5] = 0
-      assert_equal "hello\0world", ptr.to_str
-    end
-
-    def test_to_s
-      str = Marshal.load(Marshal.dump("hello world"))
-      ptr = Pointer[str]
-
-      assert_equal 3, ptr.to_s(3).length
-      assert_equal str, ptr.to_s
-
-      ptr[5] = 0
-      assert_equal 'hello', ptr.to_s
-    end
-
-    def test_minus
-      str = "hello world"
-      ptr = Pointer[str]
-      assert_equal ptr.to_s, (ptr + 3 - 3).to_s
-    end
-
-    # TODO: what if the pointer size is 0?  raise an exception? do we care?
-    def test_plus
-      str = "hello world"
-      ptr = Pointer[str]
-      new_str = ptr + 3
-      assert_equal 'lo world', new_str.to_s
-    end
-
-    def test_inspect
-      if ffi_backend?
-        omit("Fiddle::Pointer#inspect is incompatible with FFI backend")
-      end
-
-      ptr = Pointer.new(0)
-      inspect = ptr.inspect
-      assert_match(/size=#{ptr.size}/, inspect)
-      assert_match(/free=#{sprintf("%#x", ptr.free.to_i)}/, inspect)
-      assert_match(/ptr=#{sprintf("%#x", ptr.to_i)}/, inspect)
-    end
-
-    def test_to_ptr_string
-      str = "hello world"
-      ptr = Pointer[str]
-      assert_equal str.length, ptr.size
-      assert_equal 'hello', ptr[0,5]
-    end
-
-    def test_to_ptr_io
-      if ffi_backend?
-        omit("Fiddle::Pointer.to_ptr(IO) isn't supported with FFI backend")
-      end
-
-      Pointer.malloc(10, Fiddle::RUBY_FREE) do |buf|
-        File.open(__FILE__, 'r') do |f|
-          ptr = Pointer.to_ptr f
-          fread = Function.new(@libc['fread'],
-                              [TYPE_VOIDP, TYPE_INT, TYPE_INT, TYPE_VOIDP],
-                              TYPE_INT)
-          fread.call(buf.to_i, Fiddle::SIZEOF_CHAR, buf.size - 1, ptr.to_i)
-        end
-
-        File.open(__FILE__, 'r') do |f|
-          assert_equal f.read(9), buf.to_s
-        end
-      end
-    end
-
-    def test_to_ptr_with_ptr
-      ptr = Pointer.new 0
-      ptr2 = Pointer.to_ptr Struct.new(:to_ptr).new(ptr)
-      assert_equal ptr, ptr2
-
-      assert_raise(Fiddle::DLError) do
-        Pointer.to_ptr Struct.new(:to_ptr).new(nil)
-      end
-    end
-
-    def test_to_ptr_with_int
-      ptr = Pointer.new 0
-      assert_equal ptr, Pointer[0]
-    end
-
-    MimicInteger = Struct.new(:to_int)
-    def test_to_ptr_with_to_int
-      ptr = Pointer.new 0
-      assert_equal ptr, Pointer[MimicInteger.new(0)]
-    end
-
-    def test_equals
-      ptr   = Pointer.new 0
-      ptr2  = Pointer.new 0
-      assert_equal ptr2, ptr
-    end
-
-    def test_not_equals
-      ptr = Pointer.new 0
-      refute_equal 10, ptr, '10 should not equal the pointer'
-    end
-
-    def test_cmp
-      ptr = Pointer.new 0
-      assert_nil(ptr <=> 10, '10 should not be comparable')
-    end
-
-    def test_ref_ptr
-      if ffi_backend?
-        omit("Fiddle.dlwrap([]) isn't supported with FFI backend")
-      end
-
-      ary = [0,1,2,4,5]
-      addr = Pointer.new(dlwrap(ary))
-      assert_equal addr.to_i, addr.ref.ptr.to_i
-
-      assert_equal addr.to_i, (+ (- addr)).to_i
-    end
-
-    def test_to_value
-      if ffi_backend?
-        omit("Fiddle.dlwrap([]) isn't supported with FFI backend")
-      end
-
-      ary = [0,1,2,4,5]
-      addr = Pointer.new(dlwrap(ary))
-      assert_equal ary, addr.to_value
-    end
-
-    def test_free
-      ptr = Pointer.malloc(4)
-      begin
-        assert_nil ptr.free
-      ensure
-        Fiddle.free ptr
-      end
-    end
-
-    def test_free=
-      free = Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
-      ptr = Pointer.malloc(4)
-      ptr.free = free
-
-      assert_equal free.ptr, ptr.free.ptr
-    end
-
-    def test_free_with_func
-      ptr = Pointer.malloc(4, Fiddle::RUBY_FREE)
-      refute ptr.freed?
-      ptr.call_free
-      assert ptr.freed?
-      ptr.call_free                 # you can safely run it again
-      assert ptr.freed?
-      GC.start                      # you can safely run the GC routine
-      assert ptr.freed?
-    end
-
-    def test_free_with_no_func
-      ptr = Pointer.malloc(4)
-      refute ptr.freed?
-      ptr.call_free
-      refute ptr.freed?
-      ptr.call_free                 # you can safely run it again
-      refute ptr.freed?
-    end
-
-    def test_freed?
-      ptr = Pointer.malloc(4, Fiddle::RUBY_FREE)
-      refute ptr.freed?
-      ptr.call_free
-      assert ptr.freed?
-    end
-
-    def test_null?
-      ptr = Pointer.new(0)
-      assert ptr.null?
-    end
-
-    def test_size
-      Pointer.malloc(4, Fiddle::RUBY_FREE) do |ptr|
-        assert_equal 4, ptr.size
-      end
-    end
-
-    def test_size=
-      Pointer.malloc(4, Fiddle::RUBY_FREE) do |ptr|
-        ptr.size = 10
-        assert_equal 10, ptr.size
-      end
-    end
-
-    def test_aref_aset
-      check = Proc.new{|str,ptr|
-        assert_equal(str.size(), ptr.size())
-        assert_equal(str, ptr.to_s())
-        assert_equal(str[0,2], ptr.to_s(2))
-        assert_equal(str[0,2], ptr[0,2])
-        assert_equal(str[1,2], ptr[1,2])
-        assert_equal(str[1,0], ptr[1,0])
-        assert_equal(str[0].ord, ptr[0])
-        assert_equal(str[1].ord, ptr[1])
-      }
-      str = Marshal.load(Marshal.dump('abc'))
-      ptr = Pointer[str]
-      check.call(str, ptr)
-
-      str[0] = "c"
-      assert_equal 'c'.ord, ptr[0] = "c".ord
-      check.call(str, ptr)
-
-      str[0,2] = "aa"
-      assert_equal 'aa', ptr[0,2] = "aa"
-      check.call(str, ptr)
-
-      ptr2 = Pointer['cdeeee']
-      str[0,2] = "cd"
-      assert_equal ptr2, ptr[0,2] = ptr2
-      check.call(str, ptr)
-
-      ptr3 = Pointer['vvvv']
-      str[0,2] = "vv"
-      assert_equal ptr3.to_i, ptr[0,2] = ptr3.to_i
-      check.call(str, ptr)
-    end
-
-    def test_null_pointer
-      nullpo = Pointer.new(0)
-      assert_raise(DLError) {nullpo[0]}
-      assert_raise(DLError) {nullpo[0] = 1}
-    end
-
-    def test_ractor_shareable
-      omit("Need Ractor") unless defined?(Ractor)
-      assert_ractor_shareable(Fiddle::NULL)
-      ary = [0, 1, 2, 4, 5]
-      addr = Pointer.new(dlwrap(ary))
-      assert_ractor_shareable(addr)
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/mri/fileutils/test_fileutils.rb b/test/mri/fileutils/test_fileutils.rb
index d2096a04cc1..92308d95573 100644
--- a/test/mri/fileutils/test_fileutils.rb
+++ b/test/mri/fileutils/test_fileutils.rb
@@ -955,16 +955,27 @@ def test_ln_pathname
   def test_ln_s
     check_singleton :ln_s
 
+    ln_s TARGETS, 'tmp'
+    each_srcdest do |fname, lnfname|
+      assert_equal fname, File.readlink(lnfname)
+    ensure
+      rm_f lnfname
+    end
+
+    lnfname = 'symlink'
+    assert_raise(Errno::ENOENT, "multiple targets need a destination directory") {
+      ln_s TARGETS, lnfname
+    }
+    assert_file.not_exist?(lnfname)
+
     TARGETS.each do |fname|
-      begin
-        fname = "../#{fname}"
-        lnfname = 'tmp/lnsdest'
-        ln_s fname, lnfname
-        assert FileTest.symlink?(lnfname), 'not symlink'
-        assert_equal fname, File.readlink(lnfname)
-      ensure
-        rm_f lnfname
-      end
+      fname = "../#{fname}"
+      lnfname = 'tmp/lnsdest'
+      ln_s fname, lnfname
+      assert_file.symlink?(lnfname)
+      assert_equal fname, File.readlink(lnfname)
+    ensure
+      rm_f lnfname
     end
   end if have_symlink? and !no_broken_symlink?
 
@@ -1017,22 +1028,64 @@ def test_ln_sf_pathname
   def test_ln_sr
     check_singleton :ln_sr
 
-    TARGETS.each do |fname|
-      begin
-        lnfname = 'tmp/lnsdest'
-        ln_sr fname, lnfname
-        assert FileTest.symlink?(lnfname), 'not symlink'
-        assert_equal "../#{fname}", File.readlink(lnfname), fname
+    assert_all_assertions_foreach(nil, *TARGETS) do |fname|
+      lnfname = 'tmp/lnsdest'
+      ln_sr fname, lnfname
+      assert_file.symlink?(lnfname)
+      assert_file.identical?(lnfname, fname)
+      assert_equal "../#{fname}", File.readlink(lnfname)
+    ensure
+      rm_f lnfname
+    end
+
+    ln_sr TARGETS, 'tmp'
+    assert_all_assertions do |all|
+      each_srcdest do |fname, lnfname|
+        all.for(fname) do
+          assert_equal "../#{fname}", File.readlink(lnfname)
+        end
       ensure
         rm_f lnfname
       end
     end
+
+    File.symlink 'data', 'link'
+    mkdir 'link/d1'
+    mkdir 'link/d2'
+    ln_sr 'link/d1/z', 'link/d2'
+    assert_equal '../d1/z', File.readlink('data/d2/z')
+
     mkdir 'data/src'
     File.write('data/src/xxx', 'ok')
     File.symlink '../data/src', 'tmp/src'
     ln_sr 'tmp/src/xxx', 'data'
-    assert File.symlink?('data/xxx')
+    assert_file.symlink?('data/xxx')
     assert_equal 'ok', File.read('data/xxx')
+    assert_equal 'src/xxx', File.readlink('data/xxx')
+  end
+
+  def test_ln_sr_not_target_directory
+    assert_raise(ArgumentError) {
+      ln_sr TARGETS, 'tmp', target_directory: false
+    }
+    assert_empty(Dir.children('tmp'))
+
+    lnfname = 'symlink'
+    assert_raise(ArgumentError) {
+      ln_sr TARGETS, lnfname, target_directory: false
+    }
+    assert_file.not_exist?(lnfname)
+
+    assert_all_assertions_foreach(nil, *TARGETS) do |fname|
+      assert_raise(Errno::EEXIST, Errno::EACCES) {
+        ln_sr fname, 'tmp', target_directory: false
+      }
+      dest = File.join('tmp/', File.basename(fname))
+      assert_file.not_exist? dest
+      ln_sr fname, dest, target_directory: false
+      assert_file.symlink?(dest)
+      assert_equal("../#{fname}", File.readlink(dest))
+    end
   end if have_symlink?
 
   def test_ln_sr_broken_symlink
@@ -1349,7 +1402,7 @@ def test_chmod_symbol_mode
     # regular file. It's slightly strange. Anyway it's no effect bit.
     # see /usr/src/sys/ufs/ufs/ufs_chmod()
     # NetBSD, OpenBSD, Solaris, and AIX also deny it.
-    if /freebsd|netbsd|openbsd|solaris|aix/ !~ RUBY_PLATFORM
+    if /freebsd|netbsd|openbsd|aix/ !~ RUBY_PLATFORM
       chmod "u+t,o+t", 'tmp/a'
       assert_filemode 07500, 'tmp/a'
       chmod "a-t,a-s", 'tmp/a'
@@ -1763,6 +1816,14 @@ def test_remove_dir_file_perm
     assert_file_not_exist 'data/tmpdir'
   end if have_file_perm?
 
+  def test_remove_dir_with_file
+    File.write('data/tmpfile', 'dummy')
+    assert_raise(Errno::ENOTDIR) { remove_dir 'data/tmpfile' }
+    assert_file_exist 'data/tmpfile'
+  ensure
+    File.unlink('data/tmpfile') if File.exist?('data/tmpfile')
+  end
+
   def test_compare_file
     check_singleton :compare_file
     # FIXME
diff --git a/test/mri/io/console/test_io_console.rb b/test/mri/io/console/test_io_console.rb
index 2bf3df64392..c3f9c91c7de 100644
--- a/test/mri/io/console/test_io_console.rb
+++ b/test/mri/io/console/test_io_console.rb
@@ -7,6 +7,11 @@
 end
 
 class TestIO_Console < Test::Unit::TestCase
+  HOST_OS = RbConfig::CONFIG['host_os']
+  private def host_os?(os)
+    HOST_OS =~ os
+  end
+
   begin
     PATHS = $LOADED_FEATURES.grep(%r"/io/console(?:\.#{RbConfig::CONFIG['DLEXT']}|\.rb|/\w+\.rb)\z") {$`}
   rescue Encoding::CompatibilityError
@@ -20,17 +25,13 @@ class TestIO_Console < Test::Unit::TestCase
   # FreeBSD seems to hang on TTOU when running parallel tests
   # tested on FreeBSD 11.x.
   #
-  # Solaris gets stuck too, even in non-parallel mode.
-  # It occurs only in chkbuild.  It does not occur when running
-  # `make test-all` in SSH terminal.
-  #
   # I suspect that it occurs only when having no TTY.
   # (Parallel mode runs tests in child processes, so I guess
   # they has no TTY.)
   # But it does not occur in `make test-all > /dev/null`, so
   # there should be an additional factor, I guess.
   def set_winsize_setup
-    @old_ttou = trap(:TTOU, 'IGNORE') if RUBY_PLATFORM =~ /freebsd|solaris/i
+    @old_ttou = trap(:TTOU, 'IGNORE') if host_os?(/freebsd/)
   end
 
   def set_winsize_teardown
@@ -371,6 +372,15 @@ def assert_ctrl(expect, cc, r, w)
     w.print cc
     w.flush
     result = EnvUtil.timeout(3) {r.gets}
+    if result
+      case cc.chr
+      when "\C-A".."\C-_"
+        cc = "^" + (cc.ord | 0x40).chr
+      when "\C-?"
+        cc = "^?"
+      end
+      result.sub!(cc, "")
+    end
     assert_equal(expect, result.chomp)
   end
 
@@ -382,7 +392,7 @@ def test_intr
     # TestIO_Console#test_intr [/usr/home/chkbuild/chkbuild/tmp/build/20220304T163001Z/ruby/test/io/console/test_io_console.rb:387]:
     # <"25"> expected but was
     # <"-e:12:in `p': \e[1mexecution expired (\e[1;4mTimeout::Error\e[m\e[1m)\e[m">.
-    omit if /freebsd/ =~ RUBY_PLATFORM
+    omit if host_os?(/freebsd/)
 
     run_pty("#{<<~"begin;"}\n#{<<~'end;'}") do |r, w, _|
       begin;
@@ -408,7 +418,7 @@ def test_intr
       if cc = ctrl["intr"]
         assert_ctrl("#{cc.ord}", cc, r, w)
         assert_ctrl("#{cc.ord}", cc, r, w)
-        assert_ctrl("Interrupt", cc, r, w) unless /linux|solaris/ =~ RUBY_PLATFORM
+        assert_ctrl("Interrupt", cc, r, w) unless host_os?(/linux/)
       end
       if cc = ctrl["dsusp"]
         assert_ctrl("#{cc.ord}", cc, r, w)
@@ -444,7 +454,9 @@ def test_sync
 
     def test_ttyname
       return unless IO.method_defined?(:ttyname)
-      assert_equal(["true"], run_pty("p STDIN.ttyname == STDOUT.ttyname"))
+      # [Bug #20682]
+      # `sleep 0.1` is added to stabilize flaky failures on macOS.
+      assert_equal(["true"], run_pty("p STDIN.ttyname == STDOUT.ttyname; sleep 0.1"))
     end
   end
 
@@ -544,9 +556,7 @@ def test_ttyname
       File.open(ttyname) {|f| assert_predicate(f, :tty?)}
     end
   end
-end
 
-defined?(IO.console) and TestIO_Console.class_eval do
   case
   when Process.respond_to?(:daemon)
     noctty = [EnvUtil.rubybin, "-e", "Process.daemon(true)"]
diff --git a/test/mri/io/console/test_ractor.rb b/test/mri/io/console/test_ractor.rb
index b30988f47e0..dff0c67eab0 100644
--- a/test/mri/io/console/test_ractor.rb
+++ b/test/mri/io/console/test_ractor.rb
@@ -8,6 +8,10 @@ def test_ractor
     path = $".find {|path| path.end_with?(ext)}
     assert_in_out_err(%W[-r#{path}], "#{<<~"begin;"}\n#{<<~'end;'}", ["true"], [])
     begin;
+      class Ractor
+        alias value take
+      end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
       $VERBOSE = nil
       r = Ractor.new do
         $stdout.console_mode
@@ -18,17 +22,21 @@ def test_ractor
       else
         true                    # should not success
       end
-      puts r.take
+      puts r.value
     end;
 
     assert_in_out_err(%W[-r#{path}], "#{<<~"begin;"}\n#{<<~'end;'}", ["true"], [])
     begin;
+      class Ractor
+        alias value take
+      end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
       console = IO.console
       $VERBOSE = nil
       r = Ractor.new do
         IO.console
       end
-      puts console.class == r.take.class
+      puts console.class == r.value.class
     end;
   end
 end if defined? Ractor
diff --git a/test/mri/io/wait/test_io_wait.rb b/test/mri/io/wait/test_io_wait.rb
index cbc01f96224..ffe3b1f760a 100644
--- a/test/mri/io/wait/test_io_wait.rb
+++ b/test/mri/io/wait/test_io_wait.rb
@@ -4,9 +4,6 @@
 require 'timeout'
 require 'socket'
 
-# For `IO#ready?` and `IO#nread`:
-require 'io/wait'
-
 class TestIOWait < Test::Unit::TestCase
 
   def setup
@@ -22,33 +19,6 @@ def teardown
     @w.close unless @w.closed?
   end
 
-  def test_nread
-    assert_equal 0, @r.nread
-    @w.syswrite "."
-    sleep 0.1
-    assert_equal 1, @r.nread
-  end
-
-  def test_nread_buffered
-    @w.syswrite ".\n!"
-    assert_equal ".\n", @r.gets
-    assert_equal 1, @r.nread
-  end
-
-  def test_ready?
-    omit 'unstable on MinGW' if /mingw/ =~ RUBY_PLATFORM
-    assert_not_predicate @r, :ready?, "shouldn't ready, but ready"
-    @w.syswrite "."
-    sleep 0.1
-    assert_predicate @r, :ready?, "should ready, but not"
-  end
-
-  def test_buffered_ready?
-    @w.syswrite ".\n!"
-    assert_equal ".\n", @r.gets
-    assert_predicate @r, :ready?
-  end
-
   def test_wait
     omit 'unstable on MinGW' if /mingw/ =~ RUBY_PLATFORM
     assert_nil @r.wait(0)
@@ -78,7 +48,8 @@ def test_wait_eof
     ret = nil
     assert_nothing_raised(Timeout::Error) do
       q.push(true)
-      Timeout.timeout(0.1) { ret = @r.wait }
+      t = EnvUtil.apply_timeout_scale(1)
+      Timeout.timeout(t) { ret = @r.wait }
     end
     assert_equal @r, ret
   ensure
@@ -113,7 +84,8 @@ def test_wait_readable_eof
     ret = nil
     assert_nothing_raised(Timeout::Error) do
       q.push(true)
-      Timeout.timeout(0.1) { ret = @r.wait_readable }
+      t = EnvUtil.apply_timeout_scale(1)
+      Timeout.timeout(t) { ret = @r.wait_readable }
     end
     assert_equal @r, ret
   ensure
diff --git a/test/mri/io/wait/test_io_wait_uncommon.rb b/test/mri/io/wait/test_io_wait_uncommon.rb
index 0f922f4e24b..15b13b51b10 100644
--- a/test/mri/io/wait/test_io_wait_uncommon.rb
+++ b/test/mri/io/wait/test_io_wait_uncommon.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'test/unit'
+require 'io/wait'
 
 # test uncommon device types to check portability problems
 # We may optimize IO#wait_*able for non-Linux kernels in the future
@@ -74,4 +75,18 @@ def test_wait_readable_zero
   def test_wait_writable_null
     check_dev(IO::NULL, :wait_writable)
   end
+
+  def test_after_ungetc_wait_readable
+    check_dev(IO::NULL, mode: "r") {|fp|
+      fp.ungetc(?a)
+      assert_predicate fp, :wait_readable
+    }
+  end
+
+  def test_after_ungetc_in_text_wait_readable
+    check_dev(IO::NULL, mode: "rt") {|fp|
+      fp.ungetc(?a)
+      assert_predicate fp, :wait_readable
+    }
+  end
 end
diff --git a/test/mri/io/wait/test_ractor.rb b/test/mri/io/wait/test_ractor.rb
index 800216e610f..c77a29bff3e 100644
--- a/test/mri/io/wait/test_ractor.rb
+++ b/test/mri/io/wait/test_ractor.rb
@@ -7,11 +7,15 @@ def test_ractor
     ext = "/io/wait.#{RbConfig::CONFIG['DLEXT']}"
     path = $".find {|path| path.end_with?(ext)}
     assert_in_out_err(%W[-r#{path}], <<-"end;", ["true"], [])
+      class Ractor
+        alias value take
+      end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
       $VERBOSE = nil
       r = Ractor.new do
         $stdout.equal?($stdout.wait_writable)
       end
-      puts r.take
+      puts r.value
     end;
   end
 end if defined? Ractor
diff --git a/test/mri/irb/command/test_cd.rb b/test/mri/irb/command/test_cd.rb
deleted file mode 100644
index 10f77f66911..00000000000
--- a/test/mri/irb/command/test_cd.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-require "tempfile"
-require_relative "../helper"
-
-module TestIRB
-  class CDTest < IntegrationTestCase
-    def setup
-      super
-
-      write_ruby <<~'RUBY'
-        class Foo
-          class Bar
-            def bar
-              "this is bar"
-            end
-          end
-
-          def foo
-            "this is foo"
-          end
-        end
-
-        class BO < BasicObject
-          def baz
-            "this is baz"
-          end
-        end
-
-        binding.irb
-      RUBY
-    end
-
-    def test_cd
-      out = run_ruby_file do
-        type "cd Foo"
-        type "ls"
-        type "cd Bar"
-        type "ls"
-        type "cd .."
-        type "exit"
-      end
-
-      assert_match(/irb\(Foo\):002>/, out)
-      assert_match(/Foo#methods: foo/, out)
-      assert_match(/irb\(Foo::Bar\):004>/, out)
-      assert_match(/Bar#methods: bar/, out)
-      assert_match(/irb\(Foo\):006>/, out)
-    end
-
-    def test_cd_basic_object_or_frozen
-      out = run_ruby_file do
-        type "cd BO.new"
-        type "cd 1"
-        type "cd Object.new.freeze"
-        type "exit"
-      end
-
-      assert_match(/irb\(#<BO:.+\):002>/, out)
-      assert_match(/irb\(1\):003>/, out)
-      assert_match(/irb\(#<Object:.+\):004>/, out)
-    end
-
-    def test_cd_moves_top_level_with_no_args
-      out = run_ruby_file do
-        type "cd Foo"
-        type "cd Bar"
-        type "cd"
-        type "exit"
-      end
-
-      assert_match(/irb\(Foo::Bar\):003>/, out)
-      assert_match(/irb\(main\):004>/, out)
-    end
-
-    def test_cd_with_error
-      out = run_ruby_file do
-        type "cd Baz"
-        type "exit"
-      end
-
-      assert_match(/Error: uninitialized constant Baz/, out)
-      assert_match(/irb\(main\):002>/, out) # the context should not change
-    end
-  end
-end
diff --git a/test/mri/irb/command/test_custom_command.rb b/test/mri/irb/command/test_custom_command.rb
deleted file mode 100644
index 13f412c2107..00000000000
--- a/test/mri/irb/command/test_custom_command.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-# frozen_string_literal: true
-require "irb"
-
-require_relative "../helper"
-
-module TestIRB
-  class CustomCommandIntegrationTest < TestIRB::IntegrationTestCase
-    def test_command_registration_can_happen_after_irb_require
-      write_ruby <<~RUBY
-        require "irb"
-        require "irb/command"
-
-        class PrintCommand < IRB::Command::Base
-          category 'CommandTest'
-          description 'print_command'
-          def execute(*)
-            puts "Hello from PrintCommand"
-          end
-        end
-
-        IRB::Command.register(:print!, PrintCommand)
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "print!"
-        type "exit"
-      end
-
-      assert_include(output, "Hello from PrintCommand")
-    end
-
-    def test_command_registration_accepts_string_too
-      write_ruby <<~RUBY
-        require "irb/command"
-
-        class PrintCommand < IRB::Command::Base
-          category 'CommandTest'
-          description 'print_command'
-          def execute(*)
-            puts "Hello from PrintCommand"
-          end
-        end
-
-        IRB::Command.register("print!", PrintCommand)
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "print!"
-        type "exit"
-      end
-
-      assert_include(output, "Hello from PrintCommand")
-    end
-
-    def test_arguments_propagation
-      write_ruby <<~RUBY
-        require "irb/command"
-
-        class PrintArgCommand < IRB::Command::Base
-          category 'CommandTest'
-          description 'print_command_arg'
-          def execute(arg)
-            $nth_execution ||= 0
-            puts "\#{$nth_execution} arg=\#{arg.inspect}"
-            $nth_execution += 1
-          end
-        end
-
-        IRB::Command.register(:print_arg, PrintArgCommand)
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "print_arg"
-        type "print_arg  \n"
-        type "print_arg a r  g"
-        type "print_arg  a r  g  \n"
-        type "exit"
-      end
-
-      assert_include(output, "0 arg=\"\"")
-      assert_include(output, "1 arg=\"\"")
-      assert_include(output, "2 arg=\"a r  g\"")
-      assert_include(output, "3 arg=\"a r  g\"")
-    end
-
-    def test_def_extend_command_still_works
-      write_ruby <<~RUBY
-        require "irb"
-
-        class FooBarCommand < IRB::Command::Base
-          category 'FooBarCategory'
-          description 'foobar_description'
-          def execute(*)
-            $nth_execution ||= 1
-            puts "\#{$nth_execution} FooBar executed"
-            $nth_execution += 1
-          end
-        end
-
-        IRB::ExtendCommandBundle.def_extend_command(:foobar, FooBarCommand, nil, [:fbalias, IRB::Command::OVERRIDE_ALL])
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "foobar"
-        type "fbalias"
-        type "help foobar"
-        type "exit"
-      end
-
-      assert_include(output, "1 FooBar executed")
-      assert_include(output, "2 FooBar executed")
-      assert_include(output, "foobar_description")
-    end
-
-    def test_no_meta_command_also_works
-      write_ruby <<~RUBY
-        require "irb/command"
-
-        class NoMetaCommand < IRB::Command::Base
-          def execute(*)
-            puts "This command does not override meta attributes"
-          end
-        end
-
-        IRB::Command.register(:no_meta, NoMetaCommand)
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "no_meta"
-        type "help no_meta"
-        type "exit"
-      end
-
-      assert_include(output, "This command does not override meta attributes")
-      assert_include(output, "No description provided.")
-      assert_not_include(output, "Maybe IRB bug")
-    end
-
-    def test_command_name_local_variable
-      write_ruby <<~RUBY
-        require "irb/command"
-
-        class FooBarCommand < IRB::Command::Base
-          category 'CommandTest'
-          description 'test'
-          def execute(arg)
-            puts "arg=\#{arg.inspect}"
-          end
-        end
-
-        IRB::Command.register(:foo_bar, FooBarCommand)
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "binding.irb"
-        type "foo_bar == 1 || 1"
-        type "foo_bar =~ /2/ || 2"
-        type "exit"
-        type "binding.irb"
-        type "foo_bar = '3'; foo_bar"
-        type "foo_bar == 4 || '4'"
-        type "foo_bar =~ /5/ || '5'"
-        type "exit"
-        type "binding.irb"
-        type "foo_bar ||= '6'; foo_bar"
-        type "foo_bar == 7 || '7'"
-        type "foo_bar =~ /8/ || '8'"
-        type "exit"
-        type "exit"
-      end
-
-      assert_include(output, 'arg="== 1 || 1"')
-      assert_include(output, 'arg="=~ /2/ || 2"')
-      assert_include(output, '=> "3"')
-      assert_include(output, '=> "4"')
-      assert_include(output, '=> "5"')
-      assert_include(output, '=> "6"')
-      assert_include(output, '=> "7"')
-      assert_include(output, '=> "8"')
-    end
-  end
-end
diff --git a/test/mri/irb/command/test_disable_irb.rb b/test/mri/irb/command/test_disable_irb.rb
deleted file mode 100644
index 14a20043d54..00000000000
--- a/test/mri/irb/command/test_disable_irb.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: false
-require 'irb'
-
-require_relative "../helper"
-
-module TestIRB
-  class DisableIRBTest < IntegrationTestCase
-    def test_disable_irb_disable_further_irb_breakpoints
-      write_ruby <<~'ruby'
-        puts "First line"
-        puts "Second line"
-        binding.irb
-        puts "Third line"
-        binding.irb
-        puts "Fourth line"
-      ruby
-
-      output = run_ruby_file do
-        type "disable_irb"
-      end
-
-      assert_match(/First line\r\n/, output)
-      assert_match(/Second line\r\n/, output)
-      assert_match(/Third line\r\n/, output)
-      assert_match(/Fourth line\r\n/, output)
-    end
-  end
-end
diff --git a/test/mri/irb/command/test_force_exit.rb b/test/mri/irb/command/test_force_exit.rb
deleted file mode 100644
index 191a7868721..00000000000
--- a/test/mri/irb/command/test_force_exit.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: false
-require 'irb'
-
-require_relative "../helper"
-
-module TestIRB
-  class ForceExitTest < IntegrationTestCase
-    def test_forced_exit_finishes_process_immediately
-      write_ruby <<~'ruby'
-        puts "First line"
-        puts "Second line"
-        binding.irb
-        puts "Third line"
-        binding.irb
-        puts "Fourth line"
-      ruby
-
-      output = run_ruby_file do
-        type "123"
-        type "456"
-        type "exit!"
-      end
-
-      assert_match(/First line\r\n/, output)
-      assert_match(/Second line\r\n/, output)
-      assert_match(/irb\(main\):001> 123/, output)
-      assert_match(/irb\(main\):002> 456/, output)
-      refute_match(/Third line\r\n/, output)
-      refute_match(/Fourth line\r\n/, output)
-    end
-
-    def test_forced_exit_in_nested_sessions
-      write_ruby <<~'ruby'
-        def foo
-          binding.irb
-        end
-
-        binding.irb
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "123"
-        type "foo"
-        type "exit!"
-      end
-
-      assert_match(/irb\(main\):001> 123/, output)
-    end
-  end
-end
diff --git a/test/mri/irb/command/test_help.rb b/test/mri/irb/command/test_help.rb
deleted file mode 100644
index b34832b022e..00000000000
--- a/test/mri/irb/command/test_help.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require "tempfile"
-require_relative "../helper"
-
-module TestIRB
-  class HelpTest < IntegrationTestCase
-    def setup
-      super
-
-      write_rc <<~'RUBY'
-        IRB.conf[:USE_PAGER] = false
-      RUBY
-
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-    end
-
-    def test_help
-      out = run_ruby_file do
-        type "help"
-        type "exit"
-      end
-
-      assert_match(/List all available commands/, out)
-      assert_match(/Start the debugger of debug\.gem/, out)
-    end
-
-    def test_command_help
-      out = run_ruby_file do
-        type "help ls"
-        type "exit"
-      end
-
-      assert_match(/Usage: ls \[obj\]/, out)
-    end
-
-    def test_command_help_not_found
-      out = run_ruby_file do
-        type "help foo"
-        type "exit"
-      end
-
-      assert_match(/Can't find command `foo`\. Please check the command name and try again\./, out)
-    end
-
-    def test_show_cmds
-      out = run_ruby_file do
-        type "help"
-        type "exit"
-      end
-
-      assert_match(/List all available commands/, out)
-      assert_match(/Start the debugger of debug\.gem/, out)
-    end
-
-    def test_help_lists_user_aliases
-      out = run_ruby_file do
-        type "help"
-        type "exit"
-      end
-
-      assert_match(/\$\s+Alias for `show_source`/, out)
-      assert_match(/@\s+Alias for `whereami`/, out)
-    end
-
-    def test_help_lists_helper_methods
-      out = run_ruby_file do
-        type "help"
-        type "exit"
-      end
-
-      assert_match(/Helper methods\s+conf\s+Returns the current IRB context/, out)
-    end
-  end
-end
diff --git a/test/mri/irb/command/test_multi_irb_commands.rb b/test/mri/irb/command/test_multi_irb_commands.rb
deleted file mode 100644
index e313c0c5d23..00000000000
--- a/test/mri/irb/command/test_multi_irb_commands.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require "tempfile"
-require_relative "../helper"
-
-module TestIRB
-  class MultiIRBTest < IntegrationTestCase
-    def setup
-      super
-
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-    end
-
-    def test_jobs_command_with_print_deprecated_warning
-      out = run_ruby_file do
-        type "jobs"
-        type "exit"
-      end
-
-      assert_match(/Multi-irb commands are deprecated and will be removed in IRB 2\.0\.0\. Please use workspace commands instead\./, out)
-      assert_match(%r|If you have any use case for multi-irb, please leave a comment at https://github.com/ruby/irb/issues/653|, out)
-      assert_match(/#0->irb on main \(#<Thread:0x.+ run>: running\)/, out)
-    end
-
-    def test_irb_jobs_and_kill_commands
-      out = run_ruby_file do
-        type "irb"
-        type "jobs"
-        type "kill 1"
-        type "exit"
-      end
-
-      assert_match(/#0->irb on main \(#<Thread:0x.+ sleep_forever>: stop\)/, out)
-      assert_match(/#1->irb#1 on main \(#<Thread:0x.+ run>: running\)/, out)
-    end
-
-    def test_irb_fg_jobs_and_kill_commands
-      out = run_ruby_file do
-        type "irb"
-        type "fg 0"
-        type "jobs"
-        type "kill 1"
-        type "exit"
-      end
-
-      assert_match(/#0->irb on main \(#<Thread:0x.+ run>: running\)/, out)
-      assert_match(/#1->irb#1 on main \(#<Thread:0x.+ sleep_forever>: stop\)/, out)
-    end
-  end
-end
diff --git a/test/mri/irb/command/test_show_source.rb b/test/mri/irb/command/test_show_source.rb
deleted file mode 100644
index a4227231e4a..00000000000
--- a/test/mri/irb/command/test_show_source.rb
+++ /dev/null
@@ -1,410 +0,0 @@
-# frozen_string_literal: false
-require 'irb'
-
-require_relative "../helper"
-
-module TestIRB
-  class ShowSourceTest < IntegrationTestCase
-    def setup
-      super
-
-      write_rc <<~'RUBY'
-        IRB.conf[:USE_PAGER] = false
-      RUBY
-    end
-
-    def test_show_source
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source IRB.conf"
-        type "exit"
-      end
-
-      assert_match(%r[/irb\/init\.rb], out)
-    end
-
-    def test_show_source_alias
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "$ IRB.conf"
-        type "exit"
-      end
-
-      assert_match(%r[/irb\/init\.rb], out)
-    end
-
-    def test_show_source_with_missing_signature
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source foo"
-        type "exit"
-      end
-
-      assert_match(%r[Couldn't locate a definition for foo], out)
-    end
-
-    def test_show_source_with_missing_constant
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source Foo"
-        type "exit"
-      end
-
-      assert_match(%r[Couldn't locate a definition for Foo], out)
-    end
-
-    def test_show_source_with_eval_error
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source raise(Exception).itself"
-        type "exit"
-      end
-
-      assert_match(%r[Couldn't locate a definition for raise\(Exception\)\.itself], out)
-    end
-
-    def test_show_source_string
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source 'IRB.conf'"
-        type "exit"
-      end
-
-      assert_match(%r[/irb\/init\.rb], out)
-    end
-
-    def test_show_source_method_s
-      write_ruby <<~RUBY
-        class Baz
-          def foo
-          end
-        end
-
-        class Bar < Baz
-          def foo
-            super
-          end
-        end
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source Bar#foo -s"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:2\s+def foo\r\n  end\r\n], out)
-    end
-
-    def test_show_source_method_s_with_incorrect_signature
-      write_ruby <<~RUBY
-        class Baz
-          def foo
-          end
-        end
-
-        class Bar < Baz
-          def foo
-            super
-          end
-        end
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source Bar#fooo -s"
-        type "exit"
-      end
-
-      assert_match(%r[Error: Couldn't locate a super definition for Bar#fooo], out)
-    end
-
-    def test_show_source_private_method
-      write_ruby <<~RUBY
-        class Bar
-          private def foo
-          end
-        end
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source Bar#foo"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:2\s+private def foo\r\n  end\r\n], out)
-    end
-
-    def test_show_source_private_singleton_method
-      write_ruby <<~RUBY
-        class Bar
-          private def foo
-          end
-        end
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "bar = Bar.new"
-        type "show_source bar.foo"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:2\s+private def foo\r\n  end\r\n], out)
-    end
-
-    def test_show_source_method_multiple_s
-      write_ruby <<~RUBY
-        class Baz
-          def foo
-          end
-        end
-
-        class Bar < Baz
-          def foo
-            super
-          end
-        end
-
-        class Bob < Bar
-          def foo
-            super
-          end
-        end
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source Bob#foo -ss"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:2\s+def foo\r\n  end\r\n], out)
-    end
-
-    def test_show_source_method_no_instance_method
-      write_ruby <<~RUBY
-        class Baz
-        end
-
-        class Bar < Baz
-          def foo
-            super
-          end
-        end
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source Bar#foo -s"
-        type "exit"
-      end
-
-      assert_match(%r[Error: Couldn't locate a super definition for Bar#foo], out)
-    end
-
-    def test_show_source_method_exceeds_super_chain
-      write_ruby <<~RUBY
-        class Baz
-          def foo
-          end
-        end
-
-        class Bar < Baz
-          def foo
-            super
-          end
-        end
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source Bar#foo -ss"
-        type "exit"
-      end
-
-      assert_match(%r[Error: Couldn't locate a super definition for Bar#foo], out)
-    end
-
-    def test_show_source_method_accidental_characters
-      write_ruby <<~'RUBY'
-        class Baz
-          def foo
-          end
-        end
-
-        class Bar < Baz
-          def foo
-            super
-          end
-        end
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source Bar#foo -sddddd"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:2\s+def foo\r\n  end], out)
-    end
-
-    def test_show_source_receiver_super
-      write_ruby <<~RUBY
-        class Baz
-          def foo
-          end
-        end
-
-        class Bar < Baz
-          def foo
-            super
-          end
-        end
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "bar = Bar.new"
-        type "show_source bar.foo -s"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:2\s+def foo\r\n  end], out)
-    end
-
-    def test_show_source_with_double_colons
-      write_ruby <<~RUBY
-        class Foo
-        end
-
-        class Foo
-          class Bar
-          end
-        end
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source ::Foo"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:1\s+class Foo\r\nend], out)
-
-      out = run_ruby_file do
-        type "show_source ::Foo::Bar"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:5\s+class Bar\r\n  end], out)
-    end
-
-    def test_show_source_keep_script_lines
-      pend unless defined?(RubyVM.keep_script_lines)
-
-      write_ruby <<~RUBY
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "def foo; end"
-        type "show_source foo"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}\(irb\):1\s+def foo; end], out)
-    end
-
-    def test_show_source_unavailable_source
-      write_ruby <<~RUBY
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        type "RubyVM.keep_script_lines = false if defined?(RubyVM.keep_script_lines)"
-        type "def foo; end"
-        type "show_source foo"
-        type "exit"
-      end
-      assert_match(%r[#{@ruby_file.to_path}\(irb\):2\s+Source not available], out)
-    end
-
-    def test_show_source_shows_binary_source
-      write_ruby <<~RUBY
-        # io-console is an indirect dependency of irb
-        require "io/console"
-
-        binding.irb
-      RUBY
-
-      out = run_ruby_file do
-        # IO::ConsoleMode is defined in io-console gem's C extension
-        type "show_source IO::ConsoleMode"
-        type "exit"
-      end
-
-      # A safeguard to make sure the test subject is actually defined
-      refute_match(/NameError/, out)
-      assert_match(%r[Defined in binary file:.+io/console], out)
-    end
-
-    def test_show_source_with_constant_lookup
-      write_ruby <<~RUBY
-        X = 1
-        module M
-          Y = 1
-          Z = 2
-        end
-        class A
-          Z = 1
-          Array = 1
-          class B
-            include M
-            Object.new.instance_eval { binding.irb }
-          end
-        end
-      RUBY
-
-      out = run_ruby_file do
-        type "show_source X"
-        type "show_source Y"
-        type "show_source Z"
-        type "show_source Array"
-        type "exit"
-      end
-
-      assert_match(%r[#{@ruby_file.to_path}:1\s+X = 1], out)
-      assert_match(%r[#{@ruby_file.to_path}:3\s+Y = 1], out)
-      assert_match(%r[#{@ruby_file.to_path}:7\s+Z = 1], out)
-      assert_match(%r[#{@ruby_file.to_path}:8\s+Array = 1], out)
-    end
-  end
-end
diff --git a/test/mri/irb/helper.rb b/test/mri/irb/helper.rb
deleted file mode 100644
index ea2c6ef16a4..00000000000
--- a/test/mri/irb/helper.rb
+++ /dev/null
@@ -1,234 +0,0 @@
-require "test/unit"
-require "pathname"
-require "rubygems"
-
-begin
-  require_relative "../lib/helper"
-  require_relative "../lib/envutil"
-rescue LoadError # ruby/ruby defines helpers differently
-end
-
-begin
-  require "pty"
-rescue LoadError # some platforms don't support PTY
-end
-
-module IRB
-  class InputMethod; end
-end
-
-module TestIRB
-  RUBY_3_4 = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0.dev")
-  class TestCase < Test::Unit::TestCase
-    class TestInputMethod < ::IRB::InputMethod
-      attr_reader :list, :line_no
-
-      def initialize(list = [])
-        @line_no = 0
-        @list = list
-      end
-
-      def gets
-        @list[@line_no]&.tap {@line_no += 1}
-      end
-
-      def eof?
-        @line_no >= @list.size
-      end
-
-      def encoding
-        Encoding.default_external
-      end
-
-      def reset
-        @line_no = 0
-      end
-    end
-
-    def ruby_core?
-      !Pathname(__dir__).join("../../", "irb.gemspec").exist?
-    end
-
-    def setup_envs(home:)
-      @backup_home = ENV["HOME"]
-      ENV["HOME"] = home
-      @backup_xdg_config_home = ENV.delete("XDG_CONFIG_HOME")
-      @backup_irbrc = ENV.delete("IRBRC")
-    end
-
-    def teardown_envs
-      ENV["HOME"] = @backup_home
-      ENV["XDG_CONFIG_HOME"] = @backup_xdg_config_home
-      ENV["IRBRC"] = @backup_irbrc
-    end
-
-    def save_encodings
-      @default_encoding = [Encoding.default_external, Encoding.default_internal]
-      @stdio_encodings = [STDIN, STDOUT, STDERR].map {|io| [io.external_encoding, io.internal_encoding] }
-    end
-
-    def restore_encodings
-      EnvUtil.suppress_warning do
-        Encoding.default_external, Encoding.default_internal = *@default_encoding
-        [STDIN, STDOUT, STDERR].zip(@stdio_encodings) do |io, encs|
-          io.set_encoding(*encs)
-        end
-      end
-    end
-
-    def without_rdoc(&block)
-      ::Kernel.send(:alias_method, :irb_original_require, :require)
-
-      ::Kernel.define_method(:require) do |name|
-        raise LoadError, "cannot load such file -- rdoc (test)" if name.match?("rdoc") || name.match?(/^rdoc\/.*/)
-        ::Kernel.send(:irb_original_require, name)
-      end
-
-      yield
-    ensure
-      EnvUtil.suppress_warning {
-        ::Kernel.send(:alias_method, :require, :irb_original_require)
-        ::Kernel.undef_method :irb_original_require
-      }
-    end
-  end
-
-  class IntegrationTestCase < TestCase
-    LIB = File.expand_path("../../lib", __dir__)
-    TIMEOUT_SEC = 3
-
-    def setup
-      @envs = {}
-      @tmpfiles = []
-
-      unless defined?(PTY)
-        omit "Integration tests require PTY."
-      end
-
-      if ruby_core?
-        omit "This test works only under ruby/irb"
-      end
-
-      write_rc <<~RUBY
-        IRB.conf[:USE_PAGER] = false
-      RUBY
-    end
-
-    def teardown
-      @tmpfiles.each do |tmpfile|
-        File.unlink(tmpfile)
-      end
-    end
-
-    def run_ruby_file(&block)
-      cmd = [EnvUtil.rubybin, "-I", LIB, @ruby_file.to_path]
-      tmp_dir = Dir.mktmpdir
-
-      @commands = []
-      lines = []
-
-      yield
-
-      # Test should not depend on user's irbrc file
-      @envs["HOME"] ||= tmp_dir
-      @envs["XDG_CONFIG_HOME"] ||= tmp_dir
-      @envs["IRBRC"] = nil unless @envs.key?("IRBRC")
-
-      envs_for_spawn = @envs.merge('TERM' => 'dumb', 'TEST_IRB_FORCE_INTERACTIVE' => 'true')
-
-      PTY.spawn(envs_for_spawn, *cmd) do |read, write, pid|
-        Timeout.timeout(TIMEOUT_SEC) do
-          while line = safe_gets(read)
-            lines << line
-
-            # means the breakpoint is triggered
-            if line.match?(/binding\.irb/)
-              while command = @commands.shift
-                write.puts(command)
-              end
-            end
-          end
-        end
-      ensure
-        read.close
-        write.close
-        kill_safely(pid)
-      end
-
-      lines.join
-    rescue Timeout::Error
-      message = <<~MSG
-      Test timedout.
-
-      #{'=' * 30} OUTPUT #{'=' * 30}
-        #{lines.map { |l| "  #{l}" }.join}
-      #{'=' * 27} END OF OUTPUT #{'=' * 27}
-      MSG
-      assert_block(message) { false }
-    ensure
-      FileUtils.remove_entry tmp_dir
-    end
-
-    # read.gets could raise exceptions on some platforms
-    # https://github.com/ruby/ruby/blob/master/ext/pty/pty.c#L721-L728
-    def safe_gets(read)
-      read.gets
-    rescue Errno::EIO
-      nil
-    end
-
-    def kill_safely pid
-      return if wait_pid pid, TIMEOUT_SEC
-
-      Process.kill :TERM, pid
-      return if wait_pid pid, 0.2
-
-      Process.kill :KILL, pid
-      Process.waitpid(pid)
-    rescue Errno::EPERM, Errno::ESRCH
-    end
-
-    def wait_pid pid, sec
-      total_sec = 0.0
-      wait_sec = 0.001 # 1ms
-
-      while total_sec < sec
-        if Process.waitpid(pid, Process::WNOHANG) == pid
-          return true
-        end
-        sleep wait_sec
-        total_sec += wait_sec
-        wait_sec *= 2
-      end
-
-      false
-    rescue Errno::ECHILD
-      true
-    end
-
-    def type(command)
-      @commands << command
-    end
-
-    def write_ruby(program)
-      @ruby_file = Tempfile.create(%w{irbtest- .rb})
-      @tmpfiles << @ruby_file
-      @ruby_file.write(program)
-      @ruby_file.close
-    end
-
-    def write_rc(content)
-      # Append irbrc content if a tempfile for it already exists
-      if @irbrc
-        @irbrc = File.open(@irbrc, "a")
-      else
-        @irbrc = Tempfile.new('irbrc')
-        @tmpfiles << @irbrc
-      end
-
-      @irbrc.write(content)
-      @irbrc.close
-      @envs['IRBRC'] = @irbrc.path
-    end
-  end
-end
diff --git a/test/mri/irb/test_color.rb b/test/mri/irb/test_color.rb
deleted file mode 100644
index 9d78f5233e2..00000000000
--- a/test/mri/irb/test_color.rb
+++ /dev/null
@@ -1,274 +0,0 @@
-# frozen_string_literal: false
-require 'irb/color'
-require 'stringio'
-
-require_relative "helper"
-
-module TestIRB
-  class ColorTest < TestCase
-    CLEAR     = "\e[0m"
-    BOLD      = "\e[1m"
-    UNDERLINE = "\e[4m"
-    REVERSE   = "\e[7m"
-    RED       = "\e[31m"
-    GREEN     = "\e[32m"
-    YELLOW    = "\e[33m"
-    BLUE      = "\e[34m"
-    MAGENTA   = "\e[35m"
-    CYAN      = "\e[36m"
-
-    def setup
-      super
-      if IRB.respond_to?(:conf)
-        @colorize, IRB.conf[:USE_COLORIZE] = IRB.conf[:USE_COLORIZE], true
-      end
-    end
-
-    def teardown
-      if instance_variable_defined?(:@colorize)
-        IRB.conf[:USE_COLORIZE] = @colorize
-      end
-      super
-    end
-
-    def test_colorize
-      text = "text"
-      {
-        [:BOLD]      => "#{BOLD}#{text}#{CLEAR}",
-        [:UNDERLINE] => "#{UNDERLINE}#{text}#{CLEAR}",
-        [:REVERSE]   => "#{REVERSE}#{text}#{CLEAR}",
-        [:RED]       => "#{RED}#{text}#{CLEAR}",
-        [:GREEN]     => "#{GREEN}#{text}#{CLEAR}",
-        [:YELLOW]    => "#{YELLOW}#{text}#{CLEAR}",
-        [:BLUE]      => "#{BLUE}#{text}#{CLEAR}",
-        [:MAGENTA]   => "#{MAGENTA}#{text}#{CLEAR}",
-        [:CYAN]      => "#{CYAN}#{text}#{CLEAR}",
-      }.each do |seq, result|
-        assert_equal_with_term(result, text, seq: seq)
-
-        assert_equal_with_term(text, text, seq: seq, tty: false)
-        assert_equal_with_term(text, text, seq: seq, colorable: false)
-        assert_equal_with_term(result, text, seq: seq, tty: false, colorable: true)
-      end
-    end
-
-    def test_colorize_code
-      # Common behaviors. Warn parser error, but do not warn compile error.
-      tests = {
-        "1" => "#{BLUE}#{BOLD}1#{CLEAR}",
-        "2.3" => "#{MAGENTA}#{BOLD}2.3#{CLEAR}",
-        "7r" => "#{BLUE}#{BOLD}7r#{CLEAR}",
-        "8i" => "#{BLUE}#{BOLD}8i#{CLEAR}",
-        "['foo', :bar]" => "[#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}#{BOLD}'#{CLEAR}, #{YELLOW}:#{CLEAR}#{YELLOW}bar#{CLEAR}]",
-        "class A; end" => "#{GREEN}class#{CLEAR} #{BLUE}#{BOLD}#{UNDERLINE}A#{CLEAR}; #{GREEN}end#{CLEAR}",
-        "def self.foo; bar; end" => "#{GREEN}def#{CLEAR} #{CYAN}#{BOLD}self#{CLEAR}.#{BLUE}#{BOLD}foo#{CLEAR}; bar; #{GREEN}end#{CLEAR}",
-        'erb = ERB.new("a#{nil}b", trim_mode: "-")' => "erb = #{BLUE}#{BOLD}#{UNDERLINE}ERB#{CLEAR}.new(#{RED}#{BOLD}\"#{CLEAR}#{RED}a#{CLEAR}#{RED}\#{#{CLEAR}#{CYAN}#{BOLD}nil#{CLEAR}#{RED}}#{CLEAR}#{RED}b#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}, #{MAGENTA}trim_mode:#{CLEAR} #{RED}#{BOLD}\"#{CLEAR}#{RED}-#{CLEAR}#{RED}#{BOLD}\"#{CLEAR})",
-        "# comment" => "#{BLUE}#{BOLD}# comment#{CLEAR}",
-        "def f;yield(hello);end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}f#{CLEAR};#{GREEN}yield#{CLEAR}(hello);#{GREEN}end#{CLEAR}",
-        '"##@var]"' => "#{RED}#{BOLD}\"#{CLEAR}#{RED}\##{CLEAR}#{RED}\##{CLEAR}@var#{RED}]#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}",
-        '"foo#{a} #{b}"' => "#{RED}#{BOLD}\"#{CLEAR}#{RED}foo#{CLEAR}#{RED}\#{#{CLEAR}a#{RED}}#{CLEAR}#{RED} #{CLEAR}#{RED}\#{#{CLEAR}b#{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}",
-        '/r#{e}g/' => "#{RED}#{BOLD}/#{CLEAR}#{RED}r#{CLEAR}#{RED}\#{#{CLEAR}e#{RED}}#{CLEAR}#{RED}g#{CLEAR}#{RED}#{BOLD}/#{CLEAR}",
-        "'a\nb'" => "#{RED}#{BOLD}'#{CLEAR}#{RED}a#{CLEAR}\n#{RED}b#{CLEAR}#{RED}#{BOLD}'#{CLEAR}",
-        "%[str]" => "#{RED}#{BOLD}%[#{CLEAR}#{RED}str#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%Q[str]" => "#{RED}#{BOLD}%Q[#{CLEAR}#{RED}str#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%q[str]" => "#{RED}#{BOLD}%q[#{CLEAR}#{RED}str#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%x[cmd]" => "#{RED}#{BOLD}%x[#{CLEAR}#{RED}cmd#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%r[reg]" => "#{RED}#{BOLD}%r[#{CLEAR}#{RED}reg#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%w[a b]" => "#{RED}#{BOLD}%w[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%W[a b]" => "#{RED}#{BOLD}%W[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%s[a b]" => "#{YELLOW}%s[#{CLEAR}#{YELLOW}a b#{CLEAR}#{YELLOW}]#{CLEAR}",
-        "%i[c d]" => "#{YELLOW}%i[#{CLEAR}#{YELLOW}c#{CLEAR}#{YELLOW} #{CLEAR}#{YELLOW}d#{CLEAR}#{YELLOW}]#{CLEAR}",
-        "%I[c d]" => "#{YELLOW}%I[#{CLEAR}#{YELLOW}c#{CLEAR}#{YELLOW} #{CLEAR}#{YELLOW}d#{CLEAR}#{YELLOW}]#{CLEAR}",
-        "{'a': 1}" => "{#{RED}#{BOLD}'#{CLEAR}#{RED}a#{CLEAR}#{RED}#{BOLD}':#{CLEAR} #{BLUE}#{BOLD}1#{CLEAR}}",
-        ":Struct" => "#{YELLOW}:#{CLEAR}#{YELLOW}Struct#{CLEAR}",
-        '"#{}"' => "#{RED}#{BOLD}\"#{CLEAR}#{RED}\#{#{CLEAR}#{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}",
-        ':"a#{}b"' => "#{YELLOW}:\"#{CLEAR}#{YELLOW}a#{CLEAR}#{YELLOW}\#{#{CLEAR}#{YELLOW}}#{CLEAR}#{YELLOW}b#{CLEAR}#{YELLOW}\"#{CLEAR}",
-        ':"a#{ def b; end; \'c\' + "#{ :d }" }e"' => "#{YELLOW}:\"#{CLEAR}#{YELLOW}a#{CLEAR}#{YELLOW}\#{#{CLEAR} #{GREEN}def#{CLEAR} #{BLUE}#{BOLD}b#{CLEAR}; #{GREEN}end#{CLEAR}; #{RED}#{BOLD}'#{CLEAR}#{RED}c#{CLEAR}#{RED}#{BOLD}'#{CLEAR} + #{RED}#{BOLD}\"#{CLEAR}#{RED}\#{#{CLEAR} #{YELLOW}:#{CLEAR}#{YELLOW}d#{CLEAR} #{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR} #{YELLOW}}#{CLEAR}#{YELLOW}e#{CLEAR}#{YELLOW}\"#{CLEAR}",
-        "[__FILE__, __LINE__, __ENCODING__]" => "[#{CYAN}#{BOLD}__FILE__#{CLEAR}, #{CYAN}#{BOLD}__LINE__#{CLEAR}, #{CYAN}#{BOLD}__ENCODING__#{CLEAR}]",
-        ":self" => "#{YELLOW}:#{CLEAR}#{YELLOW}self#{CLEAR}",
-        ":class" => "#{YELLOW}:#{CLEAR}#{YELLOW}class#{CLEAR}",
-        "[:end, 2]" => "[#{YELLOW}:#{CLEAR}#{YELLOW}end#{CLEAR}, #{BLUE}#{BOLD}2#{CLEAR}]",
-        "[:>, 3]" => "[#{YELLOW}:#{CLEAR}#{YELLOW}>#{CLEAR}, #{BLUE}#{BOLD}3#{CLEAR}]",
-        "[:`, 4]" => "[#{YELLOW}:#{CLEAR}#{YELLOW}`#{CLEAR}, #{BLUE}#{BOLD}4#{CLEAR}]",
-        ":Hello ? world : nil" => "#{YELLOW}:#{CLEAR}#{YELLOW}Hello#{CLEAR} ? world : #{CYAN}#{BOLD}nil#{CLEAR}",
-        'raise "foo#{bar}baz"' => "raise #{RED}#{BOLD}\"#{CLEAR}#{RED}foo#{CLEAR}#{RED}\#{#{CLEAR}bar#{RED}}#{CLEAR}#{RED}baz#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}",
-        '["#{obj.inspect}"]' => "[#{RED}#{BOLD}\"#{CLEAR}#{RED}\#{#{CLEAR}obj.inspect#{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}]",
-        'URI.parse "#{}"' => "#{BLUE}#{BOLD}#{UNDERLINE}URI#{CLEAR}.parse #{RED}#{BOLD}\"#{CLEAR}#{RED}\#{#{CLEAR}#{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}",
-        "begin\nrescue\nend" => "#{GREEN}begin#{CLEAR}\n#{GREEN}rescue#{CLEAR}\n#{GREEN}end#{CLEAR}",
-        "foo %w[bar]" => "foo #{RED}#{BOLD}%w[#{CLEAR}#{RED}bar#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "foo %i[bar]" => "foo #{YELLOW}%i[#{CLEAR}#{YELLOW}bar#{CLEAR}#{YELLOW}]#{CLEAR}",
-        "foo :@bar, baz, :@@qux, :$quux" => "foo #{YELLOW}:#{CLEAR}#{YELLOW}@bar#{CLEAR}, baz, #{YELLOW}:#{CLEAR}#{YELLOW}@@qux#{CLEAR}, #{YELLOW}:#{CLEAR}#{YELLOW}$quux#{CLEAR}",
-        "`echo`" => "#{RED}#{BOLD}`#{CLEAR}#{RED}echo#{CLEAR}#{RED}#{BOLD}`#{CLEAR}",
-        "\t" => Reline::Unicode.escape_for_print("\t") == '  ' ? '  ' : "\t", # not ^I
-        "foo(*%W(bar))" => "foo(*#{RED}#{BOLD}%W(#{CLEAR}#{RED}bar#{CLEAR}#{RED}#{BOLD})#{CLEAR})",
-        "$stdout" => "#{GREEN}#{BOLD}$stdout#{CLEAR}",
-        "__END__" => "#{GREEN}__END__#{CLEAR}",
-        "foo\n__END__\nbar" => "foo\n#{GREEN}__END__#{CLEAR}\nbar",
-        "foo\n<<A\0\0bar\nA\nbaz" => "foo\n#{RED}<<A#{CLEAR}^@^@bar\n#{RED}A#{CLEAR}\nbaz",
-        "<<A+1\nA" => "#{RED}<<A#{CLEAR}+#{BLUE}#{BOLD}1#{CLEAR}\n#{RED}A#{CLEAR}",
-      }
-
-      tests.merge!({
-        "4.5.6" => "#{MAGENTA}#{BOLD}4.5#{CLEAR}#{RED}#{REVERSE}.6#{CLEAR}",
-        "\e[0m\n" => "#{RED}#{REVERSE}^[#{CLEAR}[#{BLUE}#{BOLD}0#{CLEAR}#{RED}#{REVERSE}m#{CLEAR}\n",
-        "<<EOS\nhere\nEOS" => "#{RED}<<EOS#{CLEAR}\n#{RED}here#{CLEAR}\n#{RED}EOS#{CLEAR}",
-      })
-
-      # specific to Ruby 3.0+
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
-        tests.merge!({
-          "[1]]]\u0013" => "[#{BLUE}#{BOLD}1#{CLEAR}]#{RED}#{REVERSE}]#{CLEAR}#{RED}#{REVERSE}]#{CLEAR}#{RED}#{REVERSE}^S#{CLEAR}",
-        })
-        tests.merge!({
-          "def req(true) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(#{RED}#{REVERSE}true#{CLEAR}) #{RED}#{REVERSE}end#{CLEAR}",
-          "nil = 1" => "#{RED}#{REVERSE}nil#{CLEAR} = #{BLUE}#{BOLD}1#{CLEAR}",
-          "alias $x $1" => "#{GREEN}alias#{CLEAR} #{GREEN}#{BOLD}$x#{CLEAR} #{RED}#{REVERSE}$1#{CLEAR}",
-          "class bad; end" => "#{GREEN}class#{CLEAR} #{RED}#{REVERSE}bad#{CLEAR}; #{GREEN}end#{CLEAR}",
-          "def req(@a) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(#{RED}#{REVERSE}@a#{CLEAR}) #{GREEN}end#{CLEAR}",
-        })
-        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2.0')
-          tests.merge!({
-            "def req(true) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(#{RED}#{REVERSE}true#{CLEAR}#{RED}#{REVERSE})#{CLEAR} #{RED}#{REVERSE}end#{CLEAR}",
-          })
-        end
-      else
-        tests.merge!({
-          "[1]]]\u0013" => "[#{BLUE}#{BOLD}1#{CLEAR}]#{RED}#{REVERSE}]#{CLEAR}]^S",
-          "def req(true) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(#{RED}#{REVERSE}true#{CLEAR}) end",
-          "nil = 1" => "#{CYAN}#{BOLD}nil#{CLEAR} = #{BLUE}#{BOLD}1#{CLEAR}",
-          "alias $x $1" => "#{GREEN}alias#{CLEAR} #{GREEN}#{BOLD}$x#{CLEAR} $1",
-          "class bad; end" => "#{GREEN}class#{CLEAR} bad; #{GREEN}end#{CLEAR}",
-          "def req(@a) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(@a) #{GREEN}end#{CLEAR}",
-        })
-      end
-
-      tests.each do |code, result|
-        assert_equal_with_term(result, code, complete: true)
-        assert_equal_with_term(result, code, complete: false)
-
-        assert_equal_with_term(code, code, complete: true, tty: false)
-        assert_equal_with_term(code, code, complete: false, tty: false)
-
-        assert_equal_with_term(code, code, complete: true, colorable: false)
-
-        assert_equal_with_term(code, code, complete: false, colorable: false)
-
-        assert_equal_with_term(result, code, complete: true, tty: false, colorable: true)
-
-        assert_equal_with_term(result, code, complete: false, tty: false, colorable: true)
-      end
-    end
-
-    def test_colorize_code_with_local_variables
-      code = "a /(b +1)/i"
-      result_without_lvars = "a #{RED}#{BOLD}/#{CLEAR}#{RED}(b +1)#{CLEAR}#{RED}#{BOLD}/i#{CLEAR}"
-      result_with_lvar = "a /(b #{BLUE}#{BOLD}+1#{CLEAR})/i"
-      result_with_lvars = "a /(b +#{BLUE}#{BOLD}1#{CLEAR})/i"
-
-      assert_equal_with_term(result_without_lvars, code)
-      assert_equal_with_term(result_with_lvar, code, local_variables: ['a'])
-      assert_equal_with_term(result_with_lvars, code, local_variables: ['a', 'b'])
-    end
-
-    def test_colorize_code_complete_true
-      # `complete: true` behaviors. Warn end-of-file.
-      {
-        "'foo' + 'bar" => "#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}#{BOLD}'#{CLEAR} + #{RED}#{BOLD}'#{CLEAR}#{RED}#{REVERSE}bar#{CLEAR}",
-        "('foo" => "(#{RED}#{BOLD}'#{CLEAR}#{RED}#{REVERSE}foo#{CLEAR}",
-      }.each do |code, result|
-        assert_equal_with_term(result, code, complete: true)
-
-        assert_equal_with_term(code, code, complete: true, tty: false)
-
-        assert_equal_with_term(code, code, complete: true, colorable: false)
-
-        assert_equal_with_term(result, code, complete: true, tty: false, colorable: true)
-      end
-    end
-
-    def test_colorize_code_complete_false
-      # `complete: false` behaviors. Do not warn end-of-file.
-      {
-        "'foo' + 'bar" => "#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}#{BOLD}'#{CLEAR} + #{RED}#{BOLD}'#{CLEAR}#{RED}bar#{CLEAR}",
-        "('foo" => "(#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}",
-      }.each do |code, result|
-        assert_equal_with_term(result, code, complete: false)
-
-        assert_equal_with_term(code, code, complete: false, tty: false)
-
-        assert_equal_with_term(code, code, complete: false, colorable: false)
-
-        assert_equal_with_term(result, code, complete: false, tty: false, colorable: true)
-      end
-    end
-
-    def test_inspect_colorable
-      {
-        1 => true,
-        2.3 => true,
-        ['foo', :bar] => true,
-        (a = []; a << a; a) => false,
-        (h = {}; h[h] = h; h) => false,
-        { a: 4 } => true,
-        /reg/ => true,
-        (1..3) => true,
-        Object.new => false,
-        Struct => true,
-        Test => true,
-        Struct.new(:a) => false,
-        Struct.new(:a).new(1) => false,
-      }.each do |object, result|
-        assert_equal(result, IRB::Color.inspect_colorable?(object), "Case: inspect_colorable?(#{object.inspect})")
-      end
-    end
-
-    private
-
-    def with_term(tty: true)
-      stdout = $stdout
-      io = StringIO.new
-      def io.tty?; true; end if tty
-      $stdout = io
-
-      env = ENV.to_h.dup
-      ENV['TERM'] = 'xterm-256color'
-
-      yield
-    ensure
-      $stdout = stdout
-      ENV.replace(env) if env
-    end
-
-    def assert_equal_with_term(result, code, seq: nil, tty: true, **opts)
-      actual = with_term(tty: tty) do
-        if seq
-          IRB::Color.colorize(code, seq, **opts)
-        else
-          IRB::Color.colorize_code(code, **opts)
-        end
-      end
-      message = -> {
-        args = [code.dump]
-        args << seq.inspect if seq
-        opts.each {|kwd, val| args << "#{kwd}: #{val}"}
-        "Case: colorize#{seq ? "" : "_code"}(#{args.join(', ')})\nResult: #{humanized_literal(actual)}"
-      }
-      assert_equal(result, actual, message)
-    end
-
-    def humanized_literal(str)
-      str
-        .gsub(CLEAR, '@@@{CLEAR}')
-        .gsub(BOLD, '@@@{BOLD}')
-        .gsub(UNDERLINE, '@@@{UNDERLINE}')
-        .gsub(REVERSE, '@@@{REVERSE}')
-        .gsub(RED, '@@@{RED}')
-        .gsub(GREEN, '@@@{GREEN}')
-        .gsub(YELLOW, '@@@{YELLOW}')
-        .gsub(BLUE, '@@@{BLUE}')
-        .gsub(MAGENTA, '@@@{MAGENTA}')
-        .gsub(CYAN, '@@@{CYAN}')
-        .dump.gsub(/@@@/, '#')
-    end
-  end
-end
diff --git a/test/mri/irb/test_color_printer.rb b/test/mri/irb/test_color_printer.rb
deleted file mode 100644
index c2c624d8689..00000000000
--- a/test/mri/irb/test_color_printer.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: false
-require 'irb/color_printer'
-require 'stringio'
-
-require_relative "helper"
-
-module TestIRB
-  class ColorPrinterTest < TestCase
-    CLEAR     = "\e[0m"
-    BOLD      = "\e[1m"
-    RED       = "\e[31m"
-    GREEN     = "\e[32m"
-    BLUE      = "\e[34m"
-    CYAN      = "\e[36m"
-
-    def setup
-      super
-      if IRB.respond_to?(:conf)
-        @colorize, IRB.conf[:USE_COLORIZE] = IRB.conf[:USE_COLORIZE], true
-      end
-      @get_screen_size = Reline.method(:get_screen_size)
-      Reline.instance_eval { undef :get_screen_size }
-      def Reline.get_screen_size
-        [36, 80]
-      end
-    end
-
-    def teardown
-      Reline.instance_eval { undef :get_screen_size }
-      Reline.define_singleton_method(:get_screen_size, @get_screen_size)
-      if instance_variable_defined?(:@colorize)
-        IRB.conf[:USE_COLORIZE] = @colorize
-      end
-      super
-    end
-
-    IRBTestColorPrinter = Struct.new(:a)
-
-    def test_color_printer
-      {
-        1 => "#{BLUE}#{BOLD}1#{CLEAR}\n",
-        "a\nb" => %[#{RED}#{BOLD}"#{CLEAR}#{RED}a\\nb#{CLEAR}#{RED}#{BOLD}"#{CLEAR}\n],
-        IRBTestColorPrinter.new('test') => "#{GREEN}#<struct TestIRB::ColorPrinterTest::IRBTestColorPrinter#{CLEAR} a#{GREEN}=#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}#{RED}test#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}#{GREEN}>#{CLEAR}\n",
-        Ripper::Lexer.new('1').scan => "[#{GREEN}#<Ripper::Lexer::Elem:#{CLEAR} on_int@1:0 END token: #{RED}#{BOLD}\"#{CLEAR}#{RED}1#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}#{GREEN}>#{CLEAR}]\n",
-        Class.new{define_method(:pretty_print){|q| q.text("[__FILE__, __LINE__, __ENCODING__]")}}.new => "[#{CYAN}#{BOLD}__FILE__#{CLEAR}, #{CYAN}#{BOLD}__LINE__#{CLEAR}, #{CYAN}#{BOLD}__ENCODING__#{CLEAR}]\n",
-      }.each do |object, result|
-        actual = with_term { IRB::ColorPrinter.pp(object, '') }
-        assert_equal(result, actual, "Case: IRB::ColorPrinter.pp(#{object.inspect}, '')")
-      end
-    end
-
-    private
-
-    def with_term
-      stdout = $stdout
-      io = StringIO.new
-      def io.tty?; true; end
-      $stdout = io
-
-      env = ENV.to_h.dup
-      ENV['TERM'] = 'xterm-256color'
-
-      yield
-    ensure
-      $stdout = stdout
-      ENV.replace(env) if env
-    end
-  end
-end
diff --git a/test/mri/irb/test_command.rb b/test/mri/irb/test_command.rb
deleted file mode 100644
index 21e05752b90..00000000000
--- a/test/mri/irb/test_command.rb
+++ /dev/null
@@ -1,971 +0,0 @@
-# frozen_string_literal: false
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class CommandTestCase < TestCase
-    def setup
-      @pwd = Dir.pwd
-      @tmpdir = File.join(Dir.tmpdir, "test_reline_config_#{$$}")
-      begin
-        Dir.mkdir(@tmpdir)
-      rescue Errno::EEXIST
-        FileUtils.rm_rf(@tmpdir)
-        Dir.mkdir(@tmpdir)
-      end
-      Dir.chdir(@tmpdir)
-      setup_envs(home: @tmpdir)
-      save_encodings
-      IRB.instance_variable_get(:@CONF).clear
-      IRB.instance_variable_set(:@existing_rc_name_generators, nil)
-      @is_win = (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/)
-    end
-
-    def teardown
-      teardown_envs
-      Dir.chdir(@pwd)
-      FileUtils.rm_rf(@tmpdir)
-      restore_encodings
-    end
-
-    def execute_lines(*lines, conf: {}, main: self, irb_path: nil)
-      capture_output do
-        IRB.init_config(nil)
-        IRB.conf[:VERBOSE] = false
-        IRB.conf[:PROMPT_MODE] = :SIMPLE
-        IRB.conf[:USE_PAGER] = false
-        IRB.conf.merge!(conf)
-        input = TestInputMethod.new(lines)
-        irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
-        irb.context.return_format = "=> %s\n"
-        irb.context.irb_path = irb_path if irb_path
-        IRB.conf[:MAIN_CONTEXT] = irb.context
-        irb.eval_input
-      end
-    end
-  end
-
-  class FrozenObjectTest < CommandTestCase
-    def test_calling_command_on_a_frozen_main
-      main = Object.new.freeze
-
-      out, err = execute_lines(
-        "irb_info",
-        main: main
-      )
-      assert_empty(err)
-      assert_match(/RUBY_PLATFORM/, out)
-    end
-  end
-
-  class InfoTest < CommandTestCase
-    def setup
-      super
-      @locals_backup = ENV.delete("LANG"), ENV.delete("LC_ALL")
-    end
-
-    def teardown
-      super
-      ENV["LANG"], ENV["LC_ALL"] = @locals_backup
-    end
-
-    def test_irb_info_multiline
-      FileUtils.touch("#{@tmpdir}/.inputrc")
-      FileUtils.touch("#{@tmpdir}/.irbrc")
-      FileUtils.touch("#{@tmpdir}/_irbrc")
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: true, USE_SINGLELINE: false }
-      )
-
-      expected = %r{
-        Ruby\sversion:\s.+\n
-        IRB\sversion:\sirb\s.+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        Completion: .+\n
-        \.irbrc\spaths:.*\.irbrc.*_irbrc\n
-        RUBY_PLATFORM:\s.+\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-        #{@is_win ? 'Code\spage:\s\d+\n' : ''}
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    end
-
-    def test_irb_info_singleline
-      FileUtils.touch("#{@tmpdir}/.inputrc")
-      FileUtils.touch("#{@tmpdir}/.irbrc")
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: false, USE_SINGLELINE: true }
-      )
-
-      expected = %r{
-        Ruby\sversion:\s.+\n
-        IRB\sversion:\sirb\s.+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        Completion: .+\n
-        \.irbrc\spaths:\s.+\n
-        RUBY_PLATFORM:\s.+\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-        #{@is_win ? 'Code\spage:\s\d+\n' : ''}
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    end
-
-    def test_irb_info_multiline_without_rc_files
-      inputrc_backup = ENV["INPUTRC"]
-      ENV["INPUTRC"] = "unknown_inpurc"
-      ext_backup = IRB::IRBRC_EXT
-      IRB.__send__(:remove_const, :IRBRC_EXT)
-      IRB.const_set(:IRBRC_EXT, "unknown_ext")
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: true, USE_SINGLELINE: false }
-      )
-
-      expected = %r{
-        Ruby\sversion:\s.+\n
-        IRB\sversion:\sirb\s.+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        Completion: .+\n
-        RUBY_PLATFORM:\s.+\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-        #{@is_win ? 'Code\spage:\s\d+\n' : ''}
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    ensure
-      ENV["INPUTRC"] = inputrc_backup
-      IRB.__send__(:remove_const, :IRBRC_EXT)
-      IRB.const_set(:IRBRC_EXT, ext_backup)
-    end
-
-    def test_irb_info_singleline_without_rc_files
-      inputrc_backup = ENV["INPUTRC"]
-      ENV["INPUTRC"] = "unknown_inpurc"
-      ext_backup = IRB::IRBRC_EXT
-      IRB.__send__(:remove_const, :IRBRC_EXT)
-      IRB.const_set(:IRBRC_EXT, "unknown_ext")
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: false, USE_SINGLELINE: true }
-      )
-
-      expected = %r{
-        Ruby\sversion:\s.+\n
-        IRB\sversion:\sirb\s.+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        Completion: .+\n
-        RUBY_PLATFORM:\s.+\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-        #{@is_win ? 'Code\spage:\s\d+\n' : ''}
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    ensure
-      ENV["INPUTRC"] = inputrc_backup
-      IRB.__send__(:remove_const, :IRBRC_EXT)
-      IRB.const_set(:IRBRC_EXT, ext_backup)
-    end
-
-    def test_irb_info_lang
-      FileUtils.touch("#{@tmpdir}/.inputrc")
-      FileUtils.touch("#{@tmpdir}/.irbrc")
-      ENV["LANG"] = "ja_JP.UTF-8"
-      ENV["LC_ALL"] = "en_US.UTF-8"
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: true, USE_SINGLELINE: false }
-      )
-
-      expected = %r{
-        Ruby\sversion: .+\n
-        IRB\sversion:\sirb .+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        Completion: .+\n
-        \.irbrc\spaths: .+\n
-        RUBY_PLATFORM: .+\n
-        LANG\senv:\sja_JP\.UTF-8\n
-        LC_ALL\senv:\sen_US\.UTF-8\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    end
-  end
-
-  class MeasureTest < CommandTestCase
-    def test_measure
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false
-      }
-
-      c = Class.new(Object)
-      out, err = execute_lines(
-        "measure\n",
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        "measure :on\n",
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf,
-        main: c
-      )
-
-      assert_empty err
-      assert_match(/\A(TIME is added\.\nprocessing time: .+\n=> 3\n=> 3\n){2}/, out)
-      assert_empty(c.class_variables)
-    end
-
-    def test_measure_keeps_previous_value
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false
-      }
-
-      c = Class.new(Object)
-      out, err = execute_lines(
-        "measure\n",
-        "3\n",
-        "_\n",
-        conf: conf,
-        main: c
-      )
-
-      assert_empty err
-      assert_match(/\ATIME is added\.\nprocessing time: .+\n=> 3\nprocessing time: .+\n=> 3/, out)
-      assert_empty(c.class_variables)
-    end
-
-    def test_measure_enabled_by_rc
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: true
-      }
-
-      out, err = execute_lines(
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf,
-      )
-
-      assert_empty err
-      assert_match(/\Aprocessing time: .+\n=> 3\n=> 3\n/, out)
-    end
-
-    def test_measure_enabled_by_rc_with_custom
-      measuring_proc = proc { |line, line_no, &block|
-        time = Time.now
-        result = block.()
-        puts 'custom processing time: %fs' % (Time.now - time) if IRB.conf[:MEASURE]
-        result
-      }
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: true,
-        MEASURE_PROC: { CUSTOM: measuring_proc }
-      }
-
-      out, err = execute_lines(
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf,
-      )
-      assert_empty err
-      assert_match(/\Acustom processing time: .+\n=> 3\n=> 3\n/, out)
-    end
-
-    def test_measure_with_custom
-      measuring_proc = proc { |line, line_no, &block|
-        time = Time.now
-        result = block.()
-        puts 'custom processing time: %fs' % (Time.now - time) if IRB.conf[:MEASURE]
-        result
-      }
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false,
-        MEASURE_PROC: { CUSTOM: measuring_proc }
-      }
-      out, err = execute_lines(
-        "3\n",
-        "measure\n",
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf
-      )
-
-      assert_empty err
-      assert_match(/\A=> 3\nCUSTOM is added\.\ncustom processing time: .+\n=> 3\n=> 3\n/, out)
-    end
-
-    def test_measure_toggle
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false,
-        MEASURE_PROC: {
-          FOO: proc { |&block| puts 'foo'; block.call },
-          BAR: proc { |&block| puts 'bar'; block.call }
-        }
-      }
-      out, err = execute_lines(
-        "measure :foo\n",
-        "1\n",
-        "measure :on, :bar\n",
-        "2\n",
-        "measure :off, :foo\n",
-        "3\n",
-        "measure :off, :bar\n",
-        "4\n",
-        conf: conf
-      )
-
-      assert_empty err
-      assert_match(/\AFOO is added\.\nfoo\n=> 1\nBAR is added\.\nbar\nfoo\n=> 2\nbar\n=> 3\n=> 4\n/, out)
-    end
-
-    def test_measure_with_proc_warning
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false,
-      }
-      c = Class.new(Object)
-      out, err = execute_lines(
-        "3\n",
-        "measure do\n",
-        "3\n",
-        conf: conf,
-        main: c
-      )
-
-      assert_match(/to add custom measure/, err)
-      assert_match(/\A=> 3\n=> 3\n/, out)
-      assert_empty(c.class_variables)
-    end
-  end
-
-  class IrbSourceTest < CommandTestCase
-    def test_irb_source
-      File.write("#{@tmpdir}/a.rb", "a = 'hi'\n")
-      out, err = execute_lines(
-        "a = 'bug17564'\n",
-        "a\n",
-        "irb_source '#{@tmpdir}/a.rb'\n",
-        "a\n",
-      )
-      assert_empty err
-      assert_pattern_list([
-        /=> "bug17564"\n/,
-        /=> "bug17564"\n/,
-        /   => "hi"\n/,
-        /   => "hi"\n/,
-      ], out)
-    end
-
-    def test_irb_source_without_argument
-      out, err = execute_lines(
-        "irb_source\n",
-      )
-      assert_empty err
-      assert_match(/Please specify the file name./, out)
-    end
-  end
-
-  class IrbLoadTest < CommandTestCase
-    def test_irb_load
-      File.write("#{@tmpdir}/a.rb", "a = 'hi'\n")
-      out, err = execute_lines(
-        "a = 'bug17564'\n",
-        "a\n",
-        "irb_load '#{@tmpdir}/a.rb'\n",
-        "a\n",
-      )
-      assert_empty err
-      assert_pattern_list([
-          /=> "bug17564"\n/,
-          /=> "bug17564"\n/,
-          /   => "hi"\n/,
-          /   => "bug17564"\n/,
-        ], out)
-    end
-
-    def test_irb_load_without_argument
-      out, err = execute_lines(
-        "irb_load\n",
-      )
-
-      assert_empty err
-      assert_match(/Please specify the file name./, out)
-    end
-  end
-
-  class WorkspaceCommandTestCase < CommandTestCase
-    def setup
-      super
-      # create Foo under the test class's namespace so it doesn't pollute global namespace
-      self.class.class_eval <<~RUBY
-        class Foo; end
-      RUBY
-    end
-  end
-
-  class CwwsTest < WorkspaceCommandTestCase
-    def test_cwws_returns_the_current_workspace_object
-      out, err = execute_lines(
-        "cwws"
-      )
-
-      assert_empty err
-      assert_include(out, "Current workspace: #{self}")
-    end
-  end
-
-  class PushwsTest < WorkspaceCommandTestCase
-    def test_pushws_switches_to_new_workspace_and_pushes_the_current_one_to_the_stack
-      out, err = execute_lines(
-        "pushws #{self.class}::Foo.new",
-        "self.class",
-        "popws",
-        "self.class"
-      )
-      assert_empty err
-
-      assert_match(/=> #{self.class}::Foo\n/, out)
-      assert_match(/=> #{self.class}\n$/, out)
-    end
-
-    def test_pushws_extends_the_new_workspace_with_command_bundle
-      out, err = execute_lines(
-        "pushws Object.new",
-        "self.singleton_class.ancestors"
-      )
-      assert_empty err
-      assert_include(out, "IRB::ExtendCommandBundle")
-    end
-
-    def test_pushws_prints_workspace_stack_when_no_arg_is_given
-      out, err = execute_lines(
-        "pushws",
-      )
-      assert_empty err
-      assert_include(out, "[#<TestIRB::PushwsTe...>]")
-    end
-
-    def test_pushws_without_argument_swaps_the_top_two_workspaces
-      out, err = execute_lines(
-        "pushws #{self.class}::Foo.new",
-        "self.class",
-        "pushws",
-        "self.class"
-      )
-      assert_empty err
-      assert_match(/=> #{self.class}::Foo\n/, out)
-      assert_match(/=> #{self.class}\n$/, out)
-    end
-  end
-
-  class WorkspacesTest < WorkspaceCommandTestCase
-    def test_workspaces_returns_the_stack_of_workspaces
-      out, err = execute_lines(
-        "pushws #{self.class}::Foo.new\n",
-        "workspaces",
-      )
-
-      assert_empty err
-      assert_match(/\[#<TestIRB::Workspac...>, #<TestIRB::Workspac...>\]\n/, out)
-    end
-  end
-
-  class PopwsTest < WorkspaceCommandTestCase
-    def test_popws_replaces_the_current_workspace_with_the_previous_one
-      out, err = execute_lines(
-        "pushws Foo.new\n",
-        "popws\n",
-        "cwws\n",
-        "self.class",
-      )
-      assert_empty err
-      assert_include(out, "=> #{self.class}")
-    end
-
-    def test_popws_prints_help_message_if_the_workspace_is_empty
-      out, err = execute_lines(
-        "popws\n",
-      )
-      assert_empty err
-      assert_match(/\[#<TestIRB::PopwsTes...>\]\n/, out)
-    end
-  end
-
-  class ChwsTest < WorkspaceCommandTestCase
-    def test_chws_replaces_the_current_workspace
-      out, err = execute_lines(
-        "chws #{self.class}::Foo.new\n",
-        "cwws\n",
-        "self.class\n"
-      )
-      assert_empty err
-      assert_include(out, "Current workspace: #<#{self.class.name}::Foo")
-      assert_include(out, "=> #{self.class}::Foo")
-    end
-
-    def test_chws_does_nothing_when_receiving_no_argument
-      out, err = execute_lines(
-        "chws\n",
-      )
-      assert_empty err
-      assert_include(out, "Current workspace: #{self}")
-    end
-  end
-
-  class WhereamiTest < CommandTestCase
-    def test_whereami
-      out, err = execute_lines(
-        "whereami\n",
-      )
-      assert_empty err
-      assert_match(/^From: .+ @ line \d+ :\n/, out)
-    end
-
-    def test_whereami_alias
-      out, err = execute_lines(
-        "@\n",
-      )
-      assert_empty err
-      assert_match(/^From: .+ @ line \d+ :\n/, out)
-    end
-  end
-
-  class LsTest < CommandTestCase
-    def test_ls
-      out, err = execute_lines(
-        "class P\n",
-        "  def m() end\n",
-        "  def m2() end\n",
-        "end\n",
-
-        "class C < P\n",
-        "  def m1() end\n",
-        "  def m2() end\n",
-        "end\n",
-
-        "module M\n",
-        "  def m1() end\n",
-        "  def m3() end\n",
-        "end\n",
-
-        "module M2\n",
-        "  include M\n",
-        "  def m4() end\n",
-        "end\n",
-
-        "obj = C.new\n",
-        "obj.instance_variable_set(:@a, 1)\n",
-        "obj.extend M2\n",
-        "def obj.m5() end\n",
-        "ls obj\n",
-      )
-
-      assert_empty err
-      assert_match(/^instance variables:\s+@a\n/m, out)
-      assert_match(/P#methods:\s+m\n/m, out)
-      assert_match(/C#methods:\s+m2\n/m, out)
-      assert_match(/M#methods:\s+m1\s+m3\n/m, out)
-      assert_match(/M2#methods:\s+m4\n/m, out)
-      assert_match(/C.methods:\s+m5\n/m, out)
-    end
-
-    def test_ls_class
-      out, err = execute_lines(
-        "module M1\n",
-        "  def m2; end\n",
-        "  def m3; end\n",
-        "end\n",
-
-        "class C1\n",
-        "  def m1; end\n",
-        "  def m2; end\n",
-        "end\n",
-
-        "class C2 < C1\n",
-        "  include M1\n",
-        "  def m3; end\n",
-        "  def m4; end\n",
-        "  def self.m3; end\n",
-        "  def self.m5; end\n",
-        "end\n",
-        "ls C2"
-      )
-
-      assert_empty err
-      assert_match(/C2.methods:\s+m3\s+m5\n/, out)
-      assert_match(/C2#methods:\s+m3\s+m4\n.*M1#methods:\s+m2\n.*C1#methods:\s+m1\n/, out)
-      assert_not_match(/Module#methods/, out)
-      assert_not_match(/Class#methods/, out)
-    end
-
-    def test_ls_module
-      out, err = execute_lines(
-        "module M1\n",
-        "  def m1; end\n",
-        "  def m2; end\n",
-        "end\n",
-
-        "module M2\n",
-        "  include M1\n",
-        "  def m1; end\n",
-        "  def m3; end\n",
-        "  def self.m4; end\n",
-        "end\n",
-        "ls M2"
-      )
-
-      assert_empty err
-      assert_match(/M2\.methods:\s+m4\n/, out)
-      assert_match(/M2#methods:\s+m1\s+m3\n.*M1#methods:\s+m2\n/, out)
-      assert_not_match(/Module#methods/, out)
-    end
-
-    def test_ls_instance
-      out, err = execute_lines(
-        "class Foo; def bar; end; end\n",
-        "ls Foo.new"
-      )
-
-      assert_empty err
-      assert_match(/Foo#methods:\s+bar/, out)
-      # don't duplicate
-      assert_not_match(/Foo#methods:\s+bar\n.*Foo#methods/, out)
-    end
-
-    def test_ls_grep
-      out, err = execute_lines("ls 42\n")
-      assert_empty err
-      assert_match(/times/, out)
-      assert_match(/polar/, out)
-
-      [
-        "ls 42, grep: /times/\n",
-        "ls 42 -g times\n",
-        "ls 42 -G times\n",
-      ].each do |line|
-        out, err = execute_lines(line)
-        assert_empty err
-        assert_match(/times/, out)
-        assert_not_match(/polar/, out)
-      end
-    end
-
-    def test_ls_grep_empty
-      out, err = execute_lines("ls\n")
-      assert_empty err
-      assert_match(/assert/, out)
-      assert_match(/refute/, out)
-
-      [
-        "ls grep: /assert/\n",
-        "ls -g assert\n",
-        "ls -G assert\n",
-      ].each do |line|
-        out, err = execute_lines(line)
-        assert_empty err
-        assert_match(/assert/, out)
-        assert_not_match(/refute/, out)
-      end
-    end
-
-    def test_ls_with_eval_error
-      [
-        "ls raise(Exception,'foo')\n",
-        "ls raise(Exception,'foo'), grep: /./\n",
-        "ls Integer, grep: raise(Exception,'foo')\n",
-      ].each do |line|
-        out, err = execute_lines(line)
-        assert_empty err
-        assert_match(/Exception: foo/, out)
-        assert_not_match(/Maybe IRB bug!/, out)
-      end
-    end
-
-    def test_ls_with_no_singleton_class
-      out, err = execute_lines(
-        "ls 42",
-      )
-      assert_empty err
-      assert_match(/Comparable#methods:\s+/, out)
-      assert_match(/Numeric#methods:\s+/, out)
-      assert_match(/Integer#methods:\s+/, out)
-    end
-  end
-
-  class ShowDocTest < CommandTestCase
-    def test_show_doc
-      out, err = execute_lines("show_doc String#gsub")
-
-      # the former is what we'd get without document content installed, like on CI
-      # the latter is what we may get locally
-      possible_rdoc_output = [/Nothing known about String#gsub/, /gsub\(pattern\)/]
-      assert_not_include err, "[Deprecation]"
-      assert(possible_rdoc_output.any? { |output| output.match?(out) }, "Expect the `show_doc` command to match one of the possible outputs. Got:\n#{out}")
-    ensure
-      # this is the only way to reset the redefined method without coupling the test with its implementation
-      EnvUtil.suppress_warning { load "irb/command/help.rb" }
-    end if defined?(RDoc)
-
-    def test_show_doc_without_rdoc
-      _, err = without_rdoc do
-        execute_lines("show_doc String#gsub")
-      end
-
-      assert_include(err, "Can't display document because `rdoc` is not installed.\n")
-    ensure
-      # this is the only way to reset the redefined method without coupling the test with its implementation
-      EnvUtil.suppress_warning { load "irb/command/help.rb" }
-    end
-  end
-
-  class EditTest < CommandTestCase
-    def setup
-      @original_visual = ENV["VISUAL"]
-      @original_editor = ENV["EDITOR"]
-      # noop the command so nothing gets executed
-      ENV["VISUAL"] = ": code"
-      ENV["EDITOR"] = ": code2"
-    end
-
-    def teardown
-      ENV["VISUAL"] = @original_visual
-      ENV["EDITOR"] = @original_editor
-    end
-
-    def test_edit_without_arg
-      out, err = execute_lines(
-        "edit",
-        irb_path: __FILE__
-      )
-
-      assert_empty err
-      assert_match("path: #{__FILE__}", out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_without_arg_and_non_existing_irb_path
-      out, err = execute_lines(
-        "edit",
-        irb_path: '/path/to/file.rb(irb)'
-      )
-
-      assert_empty err
-      assert_match(/Can not find file: \/path\/to\/file\.rb\(irb\)/, out)
-    end
-
-    def test_edit_with_path
-      out, err = execute_lines(
-        "edit #{__FILE__}"
-      )
-
-      assert_empty err
-      assert_match("path: #{__FILE__}", out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_non_existing_path
-      out, err = execute_lines(
-        "edit test_cmd_non_existing_path.rb"
-      )
-
-      assert_empty err
-      assert_match(/Can not find file: test_cmd_non_existing_path\.rb/, out)
-    end
-
-    def test_edit_with_constant
-      out, err = execute_lines(
-        "edit IRB::Irb"
-      )
-
-      assert_empty err
-      assert_match(/path: .*\/lib\/irb\.rb/, out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_class_method
-      out, err = execute_lines(
-        "edit IRB.start"
-      )
-
-      assert_empty err
-      assert_match(/path: .*\/lib\/irb\.rb/, out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_instance_method
-      out, err = execute_lines(
-        "edit IRB::Irb#run"
-      )
-
-      assert_empty err
-      assert_match(/path: .*\/lib\/irb\.rb/, out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_editor_env_var
-      ENV.delete("VISUAL")
-
-      out, err = execute_lines(
-        "edit",
-        irb_path: __FILE__
-      )
-
-      assert_empty err
-      assert_match("path: #{__FILE__}", out)
-      assert_match("command: ': code2'", out)
-    end
-  end
-
-  class HistoryCmdTest < CommandTestCase
-    def teardown
-      TestInputMethod.send(:remove_const, "HISTORY") if defined?(TestInputMethod::HISTORY)
-      super
-    end
-
-    def test_history
-      TestInputMethod.const_set("HISTORY", %w[foo bar baz])
-
-      out, err = without_rdoc do
-        execute_lines("history")
-      end
-
-      assert_include(out, <<~EOF)
-        2: baz
-        1: bar
-        0: foo
-      EOF
-      assert_empty err
-    end
-
-    def test_multiline_history_with_truncation
-      TestInputMethod.const_set("HISTORY", ["foo", "bar", <<~INPUT])
-        [].each do |x|
-          puts x
-        end
-      INPUT
-
-      out, err = without_rdoc do
-        execute_lines("hist")
-      end
-
-      assert_include(out, <<~EOF)
-        2: [].each do |x|
-             puts x
-           ...
-        1: bar
-        0: foo
-      EOF
-      assert_empty err
-    end
-
-    def test_history_grep
-      TestInputMethod.const_set("HISTORY", ["foo", "bar", <<~INPUT])
-        [].each do |x|
-          puts x
-        end
-      INPUT
-
-      out, err = without_rdoc do
-        execute_lines("hist -g each\n")
-      end
-
-      assert_include(out, <<~EOF)
-        2: [].each do |x|
-             puts x
-           ...
-      EOF
-      assert_empty err
-    end
-
-  end
-
-  class HelperMethodInsallTest < CommandTestCase
-    def test_helper_method_install
-      IRB::ExtendCommandBundle.module_eval do
-        def foobar
-          "test_helper_method_foobar"
-        end
-      end
-
-      out, err = execute_lines("foobar.upcase")
-      assert_empty err
-      assert_include(out, '=> "TEST_HELPER_METHOD_FOOBAR"')
-    ensure
-      IRB::ExtendCommandBundle.remove_method :foobar
-    end
-  end
-end
diff --git a/test/mri/irb/test_completion.rb b/test/mri/irb/test_completion.rb
deleted file mode 100644
index c9a0eafa3d4..00000000000
--- a/test/mri/irb/test_completion.rb
+++ /dev/null
@@ -1,317 +0,0 @@
-# frozen_string_literal: false
-require "pathname"
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class CompletionTest < TestCase
-    def completion_candidates(target, bind)
-      IRB::RegexpCompletor.new.completion_candidates('', target, '', bind: bind)
-    end
-
-    def doc_namespace(target, bind)
-      IRB::RegexpCompletor.new.doc_namespace('', target, '', bind: bind)
-    end
-
-    class CommandCompletionTest < CompletionTest
-      def test_command_completion
-        completor = IRB::RegexpCompletor.new
-        binding.eval("some_var = 1")
-        # completion for help command's argument should only include command names
-        assert_include(completor.completion_candidates('help ', 's', '', bind: binding), 'show_source')
-        assert_not_include(completor.completion_candidates('help ', 's', '', bind: binding), 'some_var')
-
-        assert_include(completor.completion_candidates('', 'show_s', '', bind: binding), 'show_source')
-        assert_not_include(completor.completion_candidates(';', 'show_s', '', bind: binding), 'show_source')
-      end
-    end
-
-    class MethodCompletionTest < CompletionTest
-      def test_complete_string
-        assert_include(completion_candidates("'foo'.up", binding), "'foo'.upcase")
-        # completing 'foo bar'.up
-        assert_include(completion_candidates("bar'.up", binding), "bar'.upcase")
-        assert_equal("String.upcase", doc_namespace("'foo'.upcase", binding))
-      end
-
-      def test_complete_regexp
-        assert_include(completion_candidates("/foo/.ma", binding), "/foo/.match")
-        # completing /foo bar/.ma
-        assert_include(completion_candidates("bar/.ma", binding), "bar/.match")
-        assert_equal("Regexp.match", doc_namespace("/foo/.match", binding))
-      end
-
-      def test_complete_array
-        assert_include(completion_candidates("[].an", binding), "[].any?")
-        assert_equal("Array.any?", doc_namespace("[].any?", binding))
-      end
-
-      def test_complete_hash_and_proc
-        # hash
-        assert_include(completion_candidates("{}.an", binding), "{}.any?")
-        assert_equal(["Hash.any?", "Proc.any?"], doc_namespace("{}.any?", binding))
-
-        # proc
-        assert_include(completion_candidates("{}.bin", binding), "{}.binding")
-        assert_equal(["Hash.binding", "Proc.binding"], doc_namespace("{}.binding", binding))
-      end
-
-      def test_complete_numeric
-        assert_include(completion_candidates("1.positi", binding), "1.positive?")
-        assert_equal("Integer.positive?", doc_namespace("1.positive?", binding))
-
-        assert_include(completion_candidates("1r.positi", binding), "1r.positive?")
-        assert_equal("Rational.positive?", doc_namespace("1r.positive?", binding))
-
-        assert_include(completion_candidates("0xFFFF.positi", binding), "0xFFFF.positive?")
-        assert_equal("Integer.positive?", doc_namespace("0xFFFF.positive?", binding))
-
-        assert_empty(completion_candidates("1i.positi", binding))
-      end
-
-      def test_complete_symbol
-        assert_include(completion_candidates(":foo.to_p", binding), ":foo.to_proc")
-        assert_equal("Symbol.to_proc", doc_namespace(":foo.to_proc", binding))
-      end
-
-      def test_complete_class
-        assert_include(completion_candidates("String.ne", binding), "String.new")
-        assert_equal("String.new", doc_namespace("String.new", binding))
-      end
-    end
-
-    class RequireComepletionTest < CompletionTest
-      def test_complete_require
-        candidates = IRB::RegexpCompletor.new.completion_candidates("require ", "'irb", "", bind: binding)
-        %w['irb/init 'irb/ruby-lex].each do |word|
-          assert_include candidates, word
-        end
-        # Test cache
-        candidates = IRB::RegexpCompletor.new.completion_candidates("require ", "'irb", "", bind: binding)
-        %w['irb/init 'irb/ruby-lex].each do |word|
-          assert_include candidates, word
-        end
-        # Test string completion not disturbed by require completion
-        candidates = IRB::RegexpCompletor.new.completion_candidates("'string ", "'.", "", bind: binding)
-        assert_include candidates, "'.upcase"
-      end
-
-      def test_complete_require_with_pathname_in_load_path
-        temp_dir = Dir.mktmpdir
-        File.write(File.join(temp_dir, "foo.rb"), "test")
-        test_path = Pathname.new(temp_dir)
-        $LOAD_PATH << test_path
-
-        candidates = IRB::RegexpCompletor.new.completion_candidates("require ", "'foo", "", bind: binding)
-        assert_include candidates, "'foo"
-      ensure
-        $LOAD_PATH.pop if test_path
-        FileUtils.remove_entry(temp_dir) if temp_dir
-      end
-
-      def test_complete_require_with_string_convertable_in_load_path
-        temp_dir = Dir.mktmpdir
-        File.write(File.join(temp_dir, "foo.rb"), "test")
-        object = Object.new
-        object.define_singleton_method(:to_s) { temp_dir }
-        $LOAD_PATH << object
-
-        candidates = IRB::RegexpCompletor.new.completion_candidates("require ", "'foo", "", bind: binding)
-        assert_include candidates, "'foo"
-      ensure
-        $LOAD_PATH.pop if object
-        FileUtils.remove_entry(temp_dir) if temp_dir
-      end
-
-      def test_complete_require_with_malformed_object_in_load_path
-        object = Object.new
-        def object.to_s; raise; end
-        $LOAD_PATH << object
-
-        assert_nothing_raised do
-          IRB::RegexpCompletor.new.completion_candidates("require ", "'foo", "", bind: binding)
-        end
-      ensure
-        $LOAD_PATH.pop if object
-      end
-
-      def test_complete_require_library_name_first
-        # Test that library name is completed first with subdirectories
-        candidates = IRB::RegexpCompletor.new.completion_candidates("require ", "'irb", "", bind: binding)
-        assert_equal "'irb", candidates.first
-      end
-
-      def test_complete_require_relative
-        candidates = Dir.chdir(__dir__ + "/../..") do
-          IRB::RegexpCompletor.new.completion_candidates("require_relative ", "'lib/irb", "", bind: binding)
-        end
-        %w['lib/irb/init 'lib/irb/ruby-lex].each do |word|
-          assert_include candidates, word
-        end
-        # Test cache
-        candidates = Dir.chdir(__dir__ + "/../..") do
-          IRB::RegexpCompletor.new.completion_candidates("require_relative ", "'lib/irb", "", bind: binding)
-        end
-        %w['lib/irb/init 'lib/irb/ruby-lex].each do |word|
-          assert_include candidates, word
-        end
-      end
-    end
-
-    class VariableCompletionTest < CompletionTest
-      def test_complete_variable
-        # Bug fix issues https://github.com/ruby/irb/issues/368
-        # Variables other than `str_example` and `@str_example` are defined to ensure that irb completion does not cause unintended behavior
-        str_example = ''
-        @str_example = ''
-        private_methods = ''
-        methods = ''
-        global_variables = ''
-        local_variables = ''
-        instance_variables = ''
-
-        # suppress "assigned but unused variable" warning
-        str_example.clear
-        @str_example.clear
-        private_methods.clear
-        methods.clear
-        global_variables.clear
-        local_variables.clear
-        instance_variables.clear
-
-        assert_include(completion_candidates("str_examp", binding), "str_example")
-        assert_equal("String", doc_namespace("str_example", binding))
-        assert_equal("String.to_s", doc_namespace("str_example.to_s", binding))
-
-        assert_include(completion_candidates("@str_examp", binding), "@str_example")
-        assert_equal("String", doc_namespace("@str_example", binding))
-        assert_equal("String.to_s", doc_namespace("@str_example.to_s", binding))
-      end
-
-      def test_complete_sort_variables
-        xzy, xzy_1, xzy2 = '', '', ''
-
-        xzy.clear
-        xzy_1.clear
-        xzy2.clear
-
-        candidates = completion_candidates("xz", binding)
-        assert_equal(%w[xzy xzy2 xzy_1], candidates)
-      end
-    end
-
-    class ConstantCompletionTest < CompletionTest
-      class Foo
-        B3 = 1
-        B1 = 1
-        B2 = 1
-      end
-
-      def test_complete_constants
-        assert_equal(["Foo"], completion_candidates("Fo", binding))
-        assert_equal(["Foo::B1", "Foo::B2", "Foo::B3"], completion_candidates("Foo::B", binding))
-        assert_equal(["Foo::B1.positive?"], completion_candidates("Foo::B1.pos", binding))
-
-        assert_equal(["::Forwardable"], completion_candidates("::Fo", binding))
-        assert_equal("Forwardable", doc_namespace("::Forwardable", binding))
-      end
-    end
-
-    def test_not_completing_empty_string
-      assert_equal([], completion_candidates("", binding))
-      assert_equal([], completion_candidates(" ", binding))
-      assert_equal([], completion_candidates("\t", binding))
-      assert_equal(nil, doc_namespace("", binding))
-    end
-
-    def test_complete_symbol
-      symbols = %w"UTF-16LE UTF-7".map do |enc|
-        "K".force_encoding(enc).to_sym
-      rescue
-      end
-      symbols += [:aiueo, :"aiu eo"]
-      candidates = completion_candidates(":a", binding)
-      assert_include(candidates, ":aiueo")
-      assert_not_include(candidates, ":aiu eo")
-      assert_empty(completion_candidates(":irb_unknown_symbol_abcdefg", binding))
-      # Do not complete empty symbol for performance reason
-      assert_empty(completion_candidates(":", binding))
-    end
-
-    def test_complete_invalid_three_colons
-      assert_empty(completion_candidates(":::A", binding))
-      assert_empty(completion_candidates(":::", binding))
-    end
-
-    def test_complete_absolute_constants_with_special_characters
-      assert_empty(completion_candidates("::A:", binding))
-      assert_empty(completion_candidates("::A.", binding))
-      assert_empty(completion_candidates("::A(", binding))
-      assert_empty(completion_candidates("::A)", binding))
-      assert_empty(completion_candidates("::A[", binding))
-    end
-
-    def test_complete_reserved_words
-      candidates = completion_candidates("de", binding)
-      %w[def defined?].each do |word|
-        assert_include candidates, word
-      end
-
-      candidates = completion_candidates("__", binding)
-      %w[__ENCODING__ __LINE__ __FILE__].each do |word|
-        assert_include candidates, word
-      end
-    end
-
-    def test_complete_methods
-      obj = Object.new
-      obj.singleton_class.class_eval {
-        def public_hoge; end
-        private def private_hoge; end
-
-        # Support for overriding #methods etc.
-        def methods; end
-        def private_methods; end
-        def global_variables; end
-        def local_variables; end
-        def instance_variables; end
-      }
-      bind = obj.instance_exec { binding }
-
-      assert_include(completion_candidates("public_hog", bind), "public_hoge")
-      assert_include(doc_namespace("public_hoge", bind), "public_hoge")
-
-      assert_include(completion_candidates("private_hog", bind), "private_hoge")
-      assert_include(doc_namespace("private_hoge", bind), "private_hoge")
-    end
-  end
-
-  class DeprecatedInputCompletorTest < TestCase
-    def setup
-      save_encodings
-      @verbose, $VERBOSE = $VERBOSE, nil
-      IRB.init_config(nil)
-      IRB.conf[:VERBOSE] = false
-      IRB.conf[:MAIN_CONTEXT] = IRB::Context.new(IRB::WorkSpace.new(binding))
-    end
-
-    def teardown
-      restore_encodings
-      $VERBOSE = @verbose
-    end
-
-    def test_completion_proc
-      assert_include(IRB::InputCompletor::CompletionProc.call('1.ab'), '1.abs')
-      assert_include(IRB::InputCompletor::CompletionProc.call('1.ab', '', ''), '1.abs')
-    end
-
-    def test_retrieve_completion_data
-      assert_include(IRB::InputCompletor.retrieve_completion_data('1.ab'), '1.abs')
-      assert_equal(IRB::InputCompletor.retrieve_completion_data('1.abs', doc_namespace: true), 'Integer.abs')
-      bind = eval('a = 1; binding')
-      assert_include(IRB::InputCompletor.retrieve_completion_data('a.ab', bind: bind), 'a.abs')
-      assert_equal(IRB::InputCompletor.retrieve_completion_data('a.abs', bind: bind, doc_namespace: true), 'Integer.abs')
-    end
-  end
-end
diff --git a/test/mri/irb/test_context.rb b/test/mri/irb/test_context.rb
deleted file mode 100644
index b02d8dbe097..00000000000
--- a/test/mri/irb/test_context.rb
+++ /dev/null
@@ -1,737 +0,0 @@
-# frozen_string_literal: false
-require 'tempfile'
-require 'irb'
-
-require_relative "helper"
-
-module TestIRB
-  class ContextTest < TestCase
-    def setup
-      IRB.init_config(nil)
-      IRB.conf[:USE_SINGLELINE] = false
-      IRB.conf[:VERBOSE] = false
-      IRB.conf[:USE_PAGER] = false
-      workspace = IRB::WorkSpace.new(Object.new)
-      @context = IRB::Context.new(nil, workspace, TestInputMethod.new)
-
-      @get_screen_size = Reline.method(:get_screen_size)
-      Reline.instance_eval { undef :get_screen_size }
-      def Reline.get_screen_size
-        [36, 80]
-      end
-      save_encodings
-    end
-
-    def teardown
-      Reline.instance_eval { undef :get_screen_size }
-      Reline.define_singleton_method(:get_screen_size, @get_screen_size)
-      restore_encodings
-    end
-
-    def test_eval_input
-      verbose, $VERBOSE = $VERBOSE, nil
-      input = TestInputMethod.new([
-        "raise 'Foo'\n",
-        "_\n",
-        "0\n",
-        "_\n",
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-
-      expected_output =
-        if RUBY_3_4
-          [
-            :*, /\(irb\):1:in '<main>': Foo \(RuntimeError\)\n/,
-            :*, /#<RuntimeError: Foo>\n/,
-            :*, /0$/,
-            :*, /0$/,
-            /\s*/
-          ]
-        else
-          [
-            :*, /\(irb\):1:in `<main>': Foo \(RuntimeError\)\n/,
-            :*, /#<RuntimeError: Foo>\n/,
-            :*, /0$/,
-            :*, /0$/,
-            /\s*/
-          ]
-        end
-
-      assert_pattern_list(expected_output, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_eval_input_raise2x
-      input = TestInputMethod.new([
-        "raise 'Foo'\n",
-        "raise 'Bar'\n",
-        "_\n",
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      expected_output =
-        if RUBY_3_4
-          [
-            :*, /\(irb\):1:in '<main>': Foo \(RuntimeError\)\n/,
-            :*, /\(irb\):2:in '<main>': Bar \(RuntimeError\)\n/,
-            :*, /#<RuntimeError: Bar>\n/,
-          ]
-        else
-          [
-            :*, /\(irb\):1:in `<main>': Foo \(RuntimeError\)\n/,
-            :*, /\(irb\):2:in `<main>': Bar \(RuntimeError\)\n/,
-            :*, /#<RuntimeError: Bar>\n/,
-          ]
-        end
-      assert_pattern_list(expected_output, out)
-    end
-
-    def test_prompt_n_deprecation
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), TestInputMethod.new)
-
-      _, err = capture_output do
-        irb.context.prompt_n = "foo"
-        irb.context.prompt_n
-      end
-
-      assert_include err, "IRB::Context#prompt_n is deprecated"
-      assert_include err, "IRB::Context#prompt_n= is deprecated"
-    end
-
-    def test_output_to_pipe
-      require 'stringio'
-      input = TestInputMethod.new(["n=1"])
-      input.instance_variable_set(:@stdout, StringIO.new)
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      irb.context.echo_on_assignment = :truncate
-      irb.context.prompt_mode = :DEFAULT
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal "=> 1\n", out
-    end
-
-    {
-      successful: [
-        [false, "class Foo < Struct.new(:bar); end; Foo.new(123)\n", /#<struct bar=123>/],
-        [:p, "class Foo < Struct.new(:bar); end; Foo.new(123)\n", /#<struct bar=123>/],
-        [true, "class Foo < Struct.new(:bar); end; Foo.new(123)\n", /#<struct #<Class:.*>::Foo bar=123>/],
-        [:yaml, "123", /--- 123\n/],
-        [:marshal, "123", Marshal.dump(123)],
-      ],
-      failed: [
-        [false, "BasicObject.new", /#<NoMethodError: undefined method (`|')to_s' for/],
-        [:p, "class Foo; undef inspect ;end; Foo.new", /#<NoMethodError: undefined method (`|')inspect' for/],
-        [:yaml, "BasicObject.new", /#<NoMethodError: undefined method (`|')inspect' for/],
-        [:marshal, "[Object.new, Class.new]", /#<TypeError: can't dump anonymous class #<Class:/]
-      ]
-    }.each do |scenario, cases|
-      cases.each do |inspect_mode, input, expected|
-        define_method "test_#{inspect_mode}_inspect_mode_#{scenario}" do
-          verbose, $VERBOSE = $VERBOSE, nil
-          irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), TestInputMethod.new([input]))
-          irb.context.inspect_mode = inspect_mode
-          out, err = capture_output do
-            irb.eval_input
-          end
-          assert_empty err
-          assert_match(expected, out)
-        ensure
-          $VERBOSE = verbose
-        end
-      end
-    end
-
-    def test_object_inspection_handles_basic_object
-      verbose, $VERBOSE = $VERBOSE, nil
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), TestInputMethod.new(["BasicObject.new"]))
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_not_match(/NoMethodError/, out)
-      assert_match(/#<BasicObject:.*>/, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_object_inspection_falls_back_to_kernel_inspect_when_errored
-      verbose, $VERBOSE = $VERBOSE, nil
-      main = Object.new
-      main.singleton_class.module_eval <<~RUBY
-        class Foo
-          def inspect
-            raise "foo"
-          end
-        end
-      RUBY
-
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new(["Foo.new"]))
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_match(/An error occurred when inspecting the object: #<RuntimeError: foo>/, out)
-      assert_match(/Result of Kernel#inspect: #<#<Class:.*>::Foo:/, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_object_inspection_prints_useful_info_when_kernel_inspect_also_errored
-      verbose, $VERBOSE = $VERBOSE, nil
-      main = Object.new
-      main.singleton_class.module_eval <<~RUBY
-        class Foo
-          def initialize
-            # Kernel#inspect goes through instance variables with #inspect
-            # So this will cause Kernel#inspect to fail
-            @foo = BasicObject.new
-          end
-
-          def inspect
-            raise "foo"
-          end
-        end
-      RUBY
-
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new(["Foo.new"]))
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_match(/An error occurred when inspecting the object: #<RuntimeError: foo>/, out)
-      assert_match(/An error occurred when running Kernel#inspect: #<NoMethodError: undefined method (`|')inspect' for/, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_default_config
-      assert_equal(true, @context.use_autocomplete?)
-    end
-
-    def test_echo_on_assignment
-      input = TestInputMethod.new([
-        "a = 1\n",
-        "a\n",
-        "a, b = 2, 3\n",
-        "a\n",
-        "b\n",
-        "b = 4\n",
-        "_\n"
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      irb.context.return_format = "=> %s\n"
-
-      # The default
-      irb.context.echo = true
-      irb.context.echo_on_assignment = false
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> 1\n=> 2\n=> 3\n=> 4\n", out)
-
-      # Everything is output, like before echo_on_assignment was introduced
-      input.reset
-      irb.context.echo = true
-      irb.context.echo_on_assignment = true
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> 1\n=> 1\n=> [2, 3]\n=> 2\n=> 3\n=> 4\n=> 4\n", out)
-
-      # Nothing is output when echo is false
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = false
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-
-      # Nothing is output when echo is false even if echo_on_assignment is true
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = true
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-    end
-
-    def test_omit_on_assignment
-      input = TestInputMethod.new([
-        "a = [1] * 100\n",
-        "a\n",
-      ])
-      value = [1] * 100
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      irb.context.return_format = "=> %s\n"
-
-      irb.context.echo = true
-      irb.context.echo_on_assignment = false
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> \n#{value.pretty_inspect}", out)
-
-      input.reset
-      irb.context.echo = true
-      irb.context.echo_on_assignment = :truncate
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> \n#{value.pretty_inspect[0..3]}...\n=> \n#{value.pretty_inspect}", out)
-
-      input.reset
-      irb.context.echo = true
-      irb.context.echo_on_assignment = true
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> \n#{value.pretty_inspect}=> \n#{value.pretty_inspect}", out)
-
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = false
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = :truncate
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = true
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-    end
-
-    def test_omit_multiline_on_assignment
-      without_colorize do
-        input = TestInputMethod.new([
-          "class A; def inspect; ([?* * 1000] * 3).join(%{\\n}); end; end; a = A.new\n",
-          "a\n"
-        ])
-        value = ([?* * 1000] * 3).join(%{\n})
-        value_first_line = (?* * 1000).to_s
-        irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-        irb.context.return_format = "=> %s\n"
-
-        irb.context.echo = true
-        irb.context.echo_on_assignment = false
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> \n#{value}\n", out)
-        irb.context.evaluate_expression('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = true
-        irb.context.echo_on_assignment = :truncate
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> #{value_first_line[0..(input.winsize.last - 9)]}...\n=> \n#{value}\n", out)
-        irb.context.evaluate_expression('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = true
-        irb.context.echo_on_assignment = true
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> \n#{value}\n=> \n#{value}\n", out)
-        irb.context.evaluate_expression('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = false
-        irb.context.echo_on_assignment = false
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("", out)
-        irb.context.evaluate_expression('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = false
-        irb.context.echo_on_assignment = :truncate
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("", out)
-        irb.context.evaluate_expression('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = false
-        irb.context.echo_on_assignment = true
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("", out)
-        irb.context.evaluate_expression('A.remove_method(:inspect)', 0)
-      end
-    end
-
-    def test_echo_on_assignment_conf
-      # Default
-      IRB.conf[:ECHO] = nil
-      IRB.conf[:ECHO_ON_ASSIGNMENT] = nil
-      without_colorize do
-        input = TestInputMethod.new()
-        irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-
-        assert(irb.context.echo?, "echo? should be true by default")
-        assert_equal(:truncate, irb.context.echo_on_assignment?, "echo_on_assignment? should be :truncate by default")
-
-        # Explicitly set :ECHO to false
-        IRB.conf[:ECHO] = false
-        irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-
-        refute(irb.context.echo?, "echo? should be false when IRB.conf[:ECHO] is set to false")
-        assert_equal(:truncate, irb.context.echo_on_assignment?, "echo_on_assignment? should be :truncate by default")
-
-        # Explicitly set :ECHO_ON_ASSIGNMENT to true
-        IRB.conf[:ECHO] = nil
-        IRB.conf[:ECHO_ON_ASSIGNMENT] = false
-        irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-
-        assert(irb.context.echo?, "echo? should be true by default")
-        refute(irb.context.echo_on_assignment?, "echo_on_assignment? should be false when IRB.conf[:ECHO_ON_ASSIGNMENT] is set to false")
-      end
-    end
-
-    def test_multiline_output_on_default_inspector
-      main = Object.new
-      def main.inspect
-        "abc\ndef"
-      end
-
-      without_colorize do
-        input = TestInputMethod.new([
-          "self"
-        ])
-        irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
-        irb.context.return_format = "=> %s\n"
-
-        # The default
-        irb.context.newline_before_multiline_output = true
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> \nabc\ndef\n",
-                     out)
-
-        # No newline before multiline output
-        input.reset
-        irb.context.newline_before_multiline_output = false
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> abc\ndef\n", out)
-      end
-    end
-
-    def test_default_return_format
-      IRB.conf[:PROMPT][:MY_PROMPT] = {
-        :PROMPT_I => "%03n> ",
-        :PROMPT_S => "%03n> ",
-        :PROMPT_C => "%03n> "
-        # without :RETURN
-        # :RETURN => "%s\n"
-      }
-      IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-      input = TestInputMethod.new([
-        "3"
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("3\n",
-                   out)
-    end
-
-    def test_eval_input_with_exception
-      pend if RUBY_ENGINE == 'truffleruby'
-      verbose, $VERBOSE = $VERBOSE, nil
-      input = TestInputMethod.new([
-        "def hoge() fuga; end; def fuga() raise; end; hoge\n",
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      expected_output =
-        if RUBY_3_4
-          [
-            :*, /\(irb\):1:in 'fuga': unhandled exception\n/,
-            :*, /\tfrom \(irb\):1:in 'hoge'\n/,
-            :*, /\tfrom \(irb\):1:in '<main>'\n/,
-            :*
-          ]
-        elsif RUBY_VERSION < '3.0.0' && STDOUT.tty?
-          [
-            :*, /Traceback \(most recent call last\):\n/,
-            :*, /\t 2: from \(irb\):1:in `<main>'\n/,
-            :*, /\t 1: from \(irb\):1:in `hoge'\n/,
-            :*, /\(irb\):1:in `fuga': unhandled exception\n/,
-          ]
-        else
-          [
-            :*, /\(irb\):1:in `fuga': unhandled exception\n/,
-            :*, /\tfrom \(irb\):1:in `hoge'\n/,
-            :*, /\tfrom \(irb\):1:in `<main>'\n/,
-            :*
-          ]
-        end
-      assert_pattern_list(expected_output, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_eval_input_with_invalid_byte_sequence_exception
-      verbose, $VERBOSE = $VERBOSE, nil
-      input = TestInputMethod.new([
-        %Q{def hoge() fuga; end; def fuga() raise "A\\xF3B"; end; hoge\n},
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      expected_output =
-        if RUBY_3_4
-          [
-            :*, /\(irb\):1:in 'fuga': A\\xF3B \(RuntimeError\)\n/,
-            :*, /\tfrom \(irb\):1:in 'hoge'\n/,
-            :*, /\tfrom \(irb\):1:in '<main>'\n/,
-            :*
-          ]
-        elsif RUBY_VERSION < '3.0.0' && STDOUT.tty?
-          [
-            :*, /Traceback \(most recent call last\):\n/,
-            :*, /\t 2: from \(irb\):1:in `<main>'\n/,
-            :*, /\t 1: from \(irb\):1:in `hoge'\n/,
-            :*, /\(irb\):1:in `fuga': A\\xF3B \(RuntimeError\)\n/,
-          ]
-        else
-          [
-            :*, /\(irb\):1:in `fuga': A\\xF3B \(RuntimeError\)\n/,
-            :*, /\tfrom \(irb\):1:in `hoge'\n/,
-            :*, /\tfrom \(irb\):1:in `<main>'\n/,
-            :*
-          ]
-        end
-
-      assert_pattern_list(expected_output, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_eval_input_with_long_exception
-      pend if RUBY_ENGINE == 'truffleruby'
-      verbose, $VERBOSE = $VERBOSE, nil
-      nesting = 20
-      generated_code = ''
-      nesting.times do |i|
-        generated_code << "def a#{i}() a#{i + 1}; end; "
-      end
-      generated_code << "def a#{nesting}() raise; end; a0\n"
-      input = TestInputMethod.new([
-        generated_code
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      if RUBY_VERSION < '3.0.0' && STDOUT.tty?
-        expected = [
-          :*, /Traceback \(most recent call last\):\n/,
-          :*, /\t... \d+ levels...\n/,
-          :*, /\t16: from \(irb\):1:in (`|')a4'\n/,
-          :*, /\t15: from \(irb\):1:in (`|')a5'\n/,
-          :*, /\t14: from \(irb\):1:in (`|')a6'\n/,
-          :*, /\t13: from \(irb\):1:in (`|')a7'\n/,
-          :*, /\t12: from \(irb\):1:in (`|')a8'\n/,
-          :*, /\t11: from \(irb\):1:in (`|')a9'\n/,
-          :*, /\t10: from \(irb\):1:in (`|')a10'\n/,
-          :*, /\t 9: from \(irb\):1:in (`|')a11'\n/,
-          :*, /\t 8: from \(irb\):1:in (`|')a12'\n/,
-          :*, /\t 7: from \(irb\):1:in (`|')a13'\n/,
-          :*, /\t 6: from \(irb\):1:in (`|')a14'\n/,
-          :*, /\t 5: from \(irb\):1:in (`|')a15'\n/,
-          :*, /\t 4: from \(irb\):1:in (`|')a16'\n/,
-          :*, /\t 3: from \(irb\):1:in (`|')a17'\n/,
-          :*, /\t 2: from \(irb\):1:in (`|')a18'\n/,
-          :*, /\t 1: from \(irb\):1:in (`|')a19'\n/,
-          :*, /\(irb\):1:in (`|')a20': unhandled exception\n/,
-        ]
-      else
-        expected = [
-          :*, /\(irb\):1:in (`|')a20': unhandled exception\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a19'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a18'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a17'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a16'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a15'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a14'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a13'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a12'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a11'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a10'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a9'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a8'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a7'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a6'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a5'\n/,
-          :*, /\tfrom \(irb\):1:in (`|')a4'\n/,
-          :*, /\t... \d+ levels...\n/,
-        ]
-      end
-      assert_pattern_list(expected, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_prompt_main_escape
-      main = Struct.new(:to_s).new("main\a\t\r\n")
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_equal("irb(main    )>", irb.send(:format_prompt, 'irb(%m)>', nil, 1, 1))
-    end
-
-    def test_prompt_main_inspect_escape
-      main = Struct.new(:inspect).new("main\\n\nmain")
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_equal("irb(main\\n main)>", irb.send(:format_prompt, 'irb(%M)>', nil, 1, 1))
-    end
-
-    def test_prompt_main_truncate
-      main = Struct.new(:to_s).new("a" * 100)
-      def main.inspect; to_s.inspect; end
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_equal('irb(aaaaaaaaaaaaaaaaaaaaaaaaaaaaa...)>', irb.send(:format_prompt, 'irb(%m)>', nil, 1, 1))
-      assert_equal('irb("aaaaaaaaaaaaaaaaaaaaaaaaaaaa...)>', irb.send(:format_prompt, 'irb(%M)>', nil, 1, 1))
-    end
-
-    def test_prompt_main_basic_object
-      main = BasicObject.new
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_match(/irb\(#<BasicObject:.+\)/, irb.send(:format_prompt, 'irb(%m)>', nil, 1, 1))
-      assert_match(/irb\(#<BasicObject:.+\)/, irb.send(:format_prompt, 'irb(%M)>', nil, 1, 1))
-    end
-
-    def test_prompt_main_raise
-      main = Object.new
-      def main.to_s; raise TypeError; end
-      def main.inspect; raise ArgumentError; end
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_equal("irb(!TypeError)>", irb.send(:format_prompt, 'irb(%m)>', nil, 1, 1))
-      assert_equal("irb(!ArgumentError)>", irb.send(:format_prompt, 'irb(%M)>', nil, 1, 1))
-    end
-
-    def test_prompt_format
-      main = 'main'
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_equal('%% main %m %main %%m >', irb.send(:format_prompt, '%%%% %m %%m %%%m %%%%m %l', '>', 1, 1))
-      assert_equal('42,%i, 42,%3i,042,%03i', irb.send(:format_prompt, '%i,%%i,%3i,%%3i,%03i,%%03i', nil, 42, 1))
-      assert_equal('42,%n, 42,%3n,042,%03n', irb.send(:format_prompt, '%n,%%n,%3n,%%3n,%03n,%%03n', nil, 1, 42))
-    end
-
-    def test_lineno
-      input = TestInputMethod.new([
-        "\n",
-        "__LINE__\n",
-        "__LINE__\n",
-        "\n",
-        "\n",
-        "__LINE__\n",
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_pattern_list([
-          :*, /\b2\n/,
-          :*, /\b3\n/,
-          :*, /\b6\n/,
-        ], out)
-    end
-
-    def test_irb_path_setter
-      @context.irb_path = __FILE__
-      assert_equal(__FILE__, @context.irb_path)
-      assert_equal("#{__FILE__}(irb)", @context.instance_variable_get(:@eval_path))
-      @context.irb_path = 'file/does/not/exist'
-      assert_equal('file/does/not/exist', @context.irb_path)
-      assert_equal('file/does/not/exist', @context.instance_variable_get(:@eval_path))
-      @context.irb_path = "#{__FILE__}(irb)"
-      assert_equal("#{__FILE__}(irb)", @context.irb_path)
-      assert_equal("#{__FILE__}(irb)", @context.instance_variable_get(:@eval_path))
-    end
-
-    def test_build_completor
-      verbose, $VERBOSE = $VERBOSE, nil
-      original_completor = IRB.conf[:COMPLETOR]
-      IRB.conf[:COMPLETOR] = nil
-      assert_match(/IRB::(Regexp|Type)Completor/, @context.send(:build_completor).class.name)
-      IRB.conf[:COMPLETOR] = :regexp
-      assert_equal 'IRB::RegexpCompletor', @context.send(:build_completor).class.name
-      IRB.conf[:COMPLETOR] = :unknown
-      assert_equal 'IRB::RegexpCompletor', @context.send(:build_completor).class.name
-      # :type is tested in test_type_completor.rb
-    ensure
-      $VERBOSE = verbose
-      IRB.conf[:COMPLETOR] = original_completor
-    end
-
-    private
-
-    def without_colorize
-      original_value = IRB.conf[:USE_COLORIZE]
-      IRB.conf[:USE_COLORIZE] = false
-      yield
-    ensure
-      IRB.conf[:USE_COLORIZE] = original_value
-    end
-  end
-end
diff --git a/test/mri/irb/test_debugger_integration.rb b/test/mri/irb/test_debugger_integration.rb
deleted file mode 100644
index 45ffb2a52e6..00000000000
--- a/test/mri/irb/test_debugger_integration.rb
+++ /dev/null
@@ -1,513 +0,0 @@
-# frozen_string_literal: true
-
-require "tempfile"
-require "tmpdir"
-
-require_relative "helper"
-
-module TestIRB
-  class DebuggerIntegrationTest < IntegrationTestCase
-    def setup
-      super
-
-      if RUBY_ENGINE == 'truffleruby'
-        omit "This test runs with ruby/debug, which doesn't work with truffleruby"
-      end
-
-      @envs.merge!("NO_COLOR" => "true", "RUBY_DEBUG_HISTORY_FILE" => '')
-    end
-
-    def test_backtrace
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-        end
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "backtrace"
-        type "exit!"
-      end
-
-      assert_match(/irb\(main\):001> backtrace/, output)
-      assert_match(/Object#foo at #{@ruby_file.to_path}/, output)
-    end
-
-    def test_debug
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "hello"
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "next"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> debug/, output)
-      assert_match(/irb:rdbg\(main\):002> next/, output)
-      assert_match(/=>   2\| puts "hello"/, output)
-    end
-
-    def test_debug_command_only_runs_once
-      write_ruby <<~'ruby'
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "debug"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> debug/, output)
-      assert_match(/irb:rdbg\(main\):002> debug/, output)
-      assert_match(/IRB is already running with a debug session/, output)
-    end
-
-    def test_debug_command_can_only_be_called_from_binding_irb
-      write_ruby <<~'ruby'
-        require "irb"
-        # trick test framework
-        puts "binding.irb"
-        IRB.start
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "exit"
-      end
-
-      assert_include(output, "Debugging commands are only available when IRB is started with binding.irb")
-    end
-
-    def test_next
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "hello"
-      ruby
-
-      output = run_ruby_file do
-        type "next"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> next/, output)
-      assert_match(/=>   2\| puts "hello"/, output)
-    end
-
-    def test_break
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "Hello"
-      RUBY
-
-      output = run_ruby_file do
-        type "break 2"
-        type "continue"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> break/, output)
-      assert_match(/=>   2\| puts "Hello"/, output)
-    end
-
-    def test_delete
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "Hello"
-        binding.irb
-        puts "World"
-      RUBY
-
-      output = run_ruby_file do
-        type "break 4"
-        type "continue"
-        type "delete 0"
-        type "continue"
-      end
-
-      assert_match(/irb:rdbg\(main\):003> delete/, output)
-      assert_match(/deleted: #0  BP - Line/, output)
-    end
-
-    def test_step
-      write_ruby <<~'RUBY'
-        def foo
-          puts "Hello"
-        end
-        binding.irb
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "step"
-        type "step"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> step/, output)
-      assert_match(/=>   5\| foo/, output)
-      assert_match(/=>   2\|   puts "Hello"/, output)
-    end
-
-    def test_long_stepping
-      write_ruby <<~'RUBY'
-        class Foo
-          def foo(num)
-            bar(num + 10)
-          end
-
-          def bar(num)
-            num
-          end
-        end
-
-        binding.irb
-        Foo.new.foo(100)
-      RUBY
-
-      output = run_ruby_file do
-        type "step"
-        type "step"
-        type "step"
-        type "step"
-        type "num"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> step/, output)
-      assert_match(/irb:rdbg\(main\):002> step/, output)
-      assert_match(/irb:rdbg\(#<Foo:.*>\):003> step/, output)
-      assert_match(/irb:rdbg\(#<Foo:.*>\):004> step/, output)
-      assert_match(/irb:rdbg\(#<Foo:.*>\):005> num/, output)
-      assert_match(/=> 110/, output)
-    end
-
-    def test_continue
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "Hello"
-        binding.irb
-        puts "World"
-      RUBY
-
-      output = run_ruby_file do
-        type "continue"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> continue/, output)
-      assert_match(/=> 3: binding.irb/, output)
-      assert_match(/irb:rdbg\(main\):002> continue/, output)
-    end
-
-    def test_finish
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-          puts "Hello"
-        end
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "finish"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> finish/, output)
-      assert_match(/=>   4\| end/, output)
-    end
-
-    def test_info
-      write_ruby <<~'RUBY'
-        def foo
-          a = "He" + "llo"
-          binding.irb
-        end
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "info"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> info/, output)
-      assert_match(/%self = main/, output)
-      assert_match(/a = "Hello"/, output)
-    end
-
-    def test_catch
-      write_ruby <<~'RUBY'
-        binding.irb
-        1 / 0
-      RUBY
-
-      output = run_ruby_file do
-        type "catch ZeroDivisionError"
-        type "continue"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> catch/, output)
-      assert_match(/Stop by #0  BP - Catch  "ZeroDivisionError"/, output)
-    end
-
-    def test_exit
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "he" + "llo"
-      RUBY
-
-      output = run_ruby_file do
-        type "debug"
-        type "exit"
-      end
-
-      assert_match(/irb:rdbg\(main\):002>/, output)
-      assert_match(/hello/, output)
-    end
-
-    def test_force_exit
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "he" + "llo"
-      RUBY
-
-      output = run_ruby_file do
-        type "debug"
-        type "exit!"
-      end
-
-      assert_match(/irb:rdbg\(main\):002>/, output)
-      assert_not_match(/hello/, output)
-    end
-
-    def test_quit
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "he" + "llo"
-      RUBY
-
-      output = run_ruby_file do
-        type "debug"
-        type "quit!"
-      end
-
-      assert_match(/irb:rdbg\(main\):002>/, output)
-      assert_not_match(/hello/, output)
-    end
-
-    def test_prompt_line_number_continues
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "Hello"
-        puts "World"
-      ruby
-
-      output = run_ruby_file do
-        type "123"
-        type "456"
-        type "next"
-        type "info"
-        type "next"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):003> next/, output)
-      assert_match(/irb:rdbg\(main\):004> info/, output)
-      assert_match(/irb:rdbg\(main\):005> next/, output)
-    end
-
-    def test_prompt_irb_name_is_kept
-      write_rc <<~RUBY
-        IRB.conf[:IRB_NAME] = "foo"
-      RUBY
-
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "Hello"
-      ruby
-
-      output = run_ruby_file do
-        type "next"
-        type "continue"
-      end
-
-      assert_match(/foo\(main\):001> next/, output)
-      assert_match(/foo:rdbg\(main\):002> continue/, output)
-    end
-
-    def test_irb_commands_are_available_after_moving_around_with_the_debugger
-      write_ruby <<~'ruby'
-        class Foo
-          def bar
-            puts "bar"
-          end
-        end
-
-        binding.irb
-        Foo.new.bar
-      ruby
-
-      output = run_ruby_file do
-        # Due to the way IRB defines its commands, moving into the Foo instance from main is necessary for proper testing.
-        type "next"
-        type "step"
-        type "irb_info"
-        type "continue"
-      end
-
-      assert_include(output, "InputMethod: RelineInputMethod")
-    end
-
-    def test_irb_command_can_check_local_variables
-      write_ruby <<~'ruby'
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type 'foobar = IRB'
-        type "show_source foobar.start"
-        type "show_source = 'Foo'"
-        type "show_source + 'Bar'"
-        type "continue"
-      end
-      assert_include(output, "def start(ap_path = nil)")
-      assert_include(output, '"FooBar"')
-    end
-
-    def test_help_command_is_delegated_to_the_debugger
-      write_ruby <<~'ruby'
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "help"
-        type "continue"
-      end
-
-      assert_include(output, "### Frame control")
-    end
-
-    def test_help_display_different_content_when_debugger_is_enabled
-      write_ruby <<~'ruby'
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "help"
-        type "continue"
-      end
-
-      # IRB's commands should still be listed
-      assert_match(/help\s+List all available commands/, output)
-      # debug gem's commands should be appended at the end
-      assert_match(/Debugging \(from debug\.gem\)\s+### Control flow/, output)
-    end
-
-    def test_input_is_evaluated_in_the_context_of_the_current_thread
-      write_ruby <<~'ruby'
-        current_thread = Thread.current
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type '"Threads match: #{current_thread == Thread.current}"'
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> debug/, output)
-      assert_match(/Threads match: true/, output)
-    end
-
-    def test_irb_switches_debugger_interface_if_debug_was_already_activated
-      write_ruby <<~'ruby'
-        require 'debug'
-        class Foo
-          def bar
-            puts "bar"
-          end
-        end
-
-        binding.irb
-        Foo.new.bar
-      ruby
-
-      output = run_ruby_file do
-        # Due to the way IRB defines its commands, moving into the Foo instance from main is necessary for proper testing.
-        type "next"
-        type "step"
-        type 'irb_info'
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> next/, output)
-      assert_include(output, "InputMethod: RelineInputMethod")
-    end
-
-    def test_debugger_cant_be_activated_while_multi_irb_is_active
-      write_ruby <<~'ruby'
-        binding.irb
-        a = 1
-      ruby
-
-      output = run_ruby_file do
-        type "jobs"
-        type "next"
-        type "exit"
-      end
-
-      assert_match(/irb\(main\):001> jobs/, output)
-      assert_include(output, "Can't start the debugger when IRB is running in a multi-IRB session.")
-    end
-
-    def test_multi_irb_commands_are_not_available_after_activating_the_debugger
-      write_ruby <<~'ruby'
-        binding.irb
-        a = 1
-      ruby
-
-      output = run_ruby_file do
-        type "next"
-        type "jobs"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> next/, output)
-      assert_include(output, "Multi-IRB commands are not available when the debugger is enabled.")
-    end
-
-    def test_irb_passes_empty_input_to_debugger_to_repeat_the_last_command
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "foo"
-        puts "bar"
-        puts "baz"
-      ruby
-
-      output = run_ruby_file do
-        type "next"
-        type ""
-        # Test that empty input doesn't repeat expressions
-        type "123"
-        type ""
-        type "next"
-        type ""
-        type ""
-      end
-
-      assert_include(output, "=>   2\| puts \"foo\"")
-      assert_include(output, "=>   3\| puts \"bar\"")
-      assert_include(output, "=>   4\| puts \"baz\"")
-    end
-  end
-end
diff --git a/test/mri/irb/test_eval_history.rb b/test/mri/irb/test_eval_history.rb
deleted file mode 100644
index 54913ceff55..00000000000
--- a/test/mri/irb/test_eval_history.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class EvalHistoryTest < TestCase
-    def setup
-      save_encodings
-      IRB.instance_variable_get(:@CONF).clear
-    end
-
-    def teardown
-      restore_encodings
-    end
-
-    def execute_lines(*lines, conf: {}, main: self, irb_path: nil)
-      IRB.init_config(nil)
-      IRB.conf[:VERBOSE] = false
-      IRB.conf[:PROMPT_MODE] = :SIMPLE
-      IRB.conf[:USE_PAGER] = false
-      IRB.conf.merge!(conf)
-      input = TestInputMethod.new(lines)
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
-      irb.context.return_format = "=> %s\n"
-      irb.context.irb_path = irb_path if irb_path
-      IRB.conf[:MAIN_CONTEXT] = irb.context
-      capture_output do
-        irb.eval_input
-      end
-    end
-
-    def test_eval_history_is_disabled_by_default
-      out, err = execute_lines(
-        "a = 1",
-        "__"
-      )
-
-      assert_empty(err)
-      assert_match(/undefined local variable or method (`|')__'/, out)
-    end
-
-    def test_eval_history_can_be_retrieved_with_double_underscore
-      out, err = execute_lines(
-        "a = 1",
-        "__",
-        conf: { EVAL_HISTORY: 5 }
-      )
-
-      assert_empty(err)
-      assert_match("=> 1\n" + "=> 1 1\n", out)
-    end
-
-    def test_eval_history_respects_given_limit
-      out, err = execute_lines(
-        "'foo'\n",
-        "'bar'\n",
-        "'baz'\n",
-        "'xyz'\n",
-        "__",
-        conf: { EVAL_HISTORY: 4 }
-      )
-
-      assert_empty(err)
-      # Because eval_history injects `__` into the history AND decide to ignore it, we only get <limit> - 1 results
-      assert_match("2 \"bar\"\n" + "3 \"baz\"\n" + "4 \"xyz\"\n", out)
-    end
-  end
-end
diff --git a/test/mri/irb/test_evaluation.rb b/test/mri/irb/test_evaluation.rb
deleted file mode 100644
index adb69b20677..00000000000
--- a/test/mri/irb/test_evaluation.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "tempfile"
-
-require_relative "helper"
-
-module TestIRB
-  class EchoingTest < IntegrationTestCase
-    def test_irb_echos_by_default
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "123123"
-        type "exit"
-      end
-
-      assert_include(output, "=> 123123")
-    end
-
-    def test_irb_doesnt_echo_line_with_semicolon
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "123123;"
-        type "123123   ;"
-        type "123123;   "
-        type <<~RUBY
-          if true
-            123123
-          end;
-        RUBY
-        type "'evaluation ends'"
-        type "exit"
-      end
-
-      assert_include(output, "=> \"evaluation ends\"")
-      assert_not_include(output, "=> 123123")
-    end
-  end
-end
diff --git a/test/mri/irb/test_helper_method.rb b/test/mri/irb/test_helper_method.rb
deleted file mode 100644
index a3e2c43b2fa..00000000000
--- a/test/mri/irb/test_helper_method.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# frozen_string_literal: true
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class HelperMethodTestCase < TestCase
-    def setup
-      $VERBOSE = nil
-      @verbosity = $VERBOSE
-      save_encodings
-      IRB.instance_variable_get(:@CONF).clear
-    end
-
-    def teardown
-      $VERBOSE = @verbosity
-      restore_encodings
-    end
-
-    def execute_lines(*lines, conf: {}, main: self, irb_path: nil)
-      IRB.init_config(nil)
-      IRB.conf[:VERBOSE] = false
-      IRB.conf[:PROMPT_MODE] = :SIMPLE
-      IRB.conf.merge!(conf)
-      input = TestInputMethod.new(lines)
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
-      irb.context.return_format = "=> %s\n"
-      irb.context.irb_path = irb_path if irb_path
-      IRB.conf[:MAIN_CONTEXT] = irb.context
-      IRB.conf[:USE_PAGER] = false
-      capture_output do
-        irb.eval_input
-      end
-    end
-  end
-
-  module TestHelperMethod
-    class ConfTest < HelperMethodTestCase
-      def test_conf_returns_the_context_object
-        out, err = execute_lines("conf.ap_name")
-
-        assert_empty err
-        assert_include out, "=> \"irb\""
-      end
-    end
-  end
-
-  class HelperMethodIntegrationTest < IntegrationTestCase
-    def test_arguments_propogation
-      write_ruby <<~RUBY
-        require "irb/helper_method"
-
-        class MyHelper < IRB::HelperMethod::Base
-          description "This is a test helper"
-
-          def execute(
-            required_arg, optional_arg = nil, *splat_arg, required_keyword_arg:,
-            optional_keyword_arg: nil, **double_splat_arg, &block_arg
-          )
-            puts [required_arg, optional_arg, splat_arg, required_keyword_arg, optional_keyword_arg, double_splat_arg, block_arg.call].to_s
-          end
-        end
-
-        IRB::HelperMethod.register(:my_helper, MyHelper)
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type <<~INPUT
-          my_helper(
-            "required", "optional", "splat", required_keyword_arg: "required",
-            optional_keyword_arg: "optional", a: 1, b: 2
-          ) { "block" }
-        INPUT
-        type "exit"
-      end
-
-      optional = {a: 1, b: 2}
-      assert_include(output, %[["required", "optional", ["splat"], "required", "optional", #{optional.inspect}, "block"]])
-    end
-
-    def test_helper_method_injection_can_happen_after_irb_require
-      write_ruby <<~RUBY
-        require "irb"
-
-        class MyHelper < IRB::HelperMethod::Base
-          description "This is a test helper"
-
-          def execute
-            puts "Hello from MyHelper"
-          end
-        end
-
-        IRB::HelperMethod.register(:my_helper, MyHelper)
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "my_helper"
-        type "exit"
-      end
-
-      assert_include(output, 'Hello from MyHelper')
-    end
-
-    def test_helper_method_instances_are_memoized
-      write_ruby <<~RUBY
-        require "irb/helper_method"
-
-        class MyHelper < IRB::HelperMethod::Base
-          description "This is a test helper"
-
-          def execute(val)
-            @val ||= val
-          end
-        end
-
-        IRB::HelperMethod.register(:my_helper, MyHelper)
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "my_helper(100)"
-        type "my_helper(200)"
-        type "exit"
-      end
-
-      assert_include(output, '=> 100')
-      assert_not_include(output, '=> 200')
-    end
-  end
-end
diff --git a/test/mri/irb/test_history.rb b/test/mri/irb/test_history.rb
deleted file mode 100644
index 021bb682c14..00000000000
--- a/test/mri/irb/test_history.rb
+++ /dev/null
@@ -1,532 +0,0 @@
-# frozen_string_literal: false
-require 'irb'
-require 'readline'
-require "tempfile"
-
-require_relative "helper"
-
-return if RUBY_PLATFORM.match?(/solaris|mswin|mingw/i)
-
-module TestIRB
-  class HistoryTest < TestCase
-    def setup
-      @conf_backup = IRB.conf.dup
-      @original_verbose, $VERBOSE = $VERBOSE, nil
-      @tmpdir = Dir.mktmpdir("test_irb_history_")
-      setup_envs(home: @tmpdir)
-      IRB.conf[:LC_MESSAGES] = IRB::Locale.new
-      save_encodings
-      IRB.instance_variable_set(:@existing_rc_name_generators, nil)
-    end
-
-    def teardown
-      IRB.conf.replace(@conf_backup)
-      IRB.instance_variable_set(:@existing_rc_name_generators, nil)
-      teardown_envs
-      restore_encodings
-      $VERBOSE = @original_verbose
-      FileUtils.rm_rf(@tmpdir)
-    end
-
-    class TestInputMethodWithRelineHistory < TestInputMethod
-      # When IRB.conf[:USE_MULTILINE] is true, IRB::RelineInputMethod uses Reline::History
-      HISTORY = Reline::History.new(Reline.core.config)
-
-      include IRB::HistorySavingAbility
-    end
-
-    class TestInputMethodWithReadlineHistory < TestInputMethod
-      # When IRB.conf[:USE_MULTILINE] is false, IRB::ReadlineInputMethod uses Readline::HISTORY
-      HISTORY = Readline::HISTORY
-
-      include IRB::HistorySavingAbility
-    end
-
-    def test_history_dont_save
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = nil
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        1
-        2
-      EXPECTED_HISTORY
-        1
-        2
-      INITIAL_HISTORY
-        3
-        exit
-      INPUT
-    end
-
-    def test_history_save_1
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 1
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-    end
-
-    def test_history_save_100
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 100
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        1
-        2
-        3
-        4
-        5
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-    end
-
-    def test_history_save_bignum
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 10 ** 19
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        1
-        2
-        3
-        4
-        5
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-    end
-
-    def test_history_save_minus_as_infinity
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = -1 # infinity
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        1
-        2
-        3
-        4
-        5
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-    end
-
-    def test_history_concurrent_use_reline
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 1
-      history_concurrent_use_for_input_method(TestInputMethodWithRelineHistory)
-    end
-
-    def test_history_concurrent_use_readline
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 1
-      history_concurrent_use_for_input_method(TestInputMethodWithReadlineHistory)
-    end
-
-    def test_history_concurrent_use_not_present
-      IRB.conf[:SAVE_HISTORY] = 1
-      io = TestInputMethodWithRelineHistory.new
-      io.class::HISTORY.clear
-      io.load_history
-      io.class::HISTORY << 'line1'
-      io.class::HISTORY << 'line2'
-
-      history_file = IRB.rc_file("_history")
-      assert_not_send [File, :file?, history_file]
-      File.write(history_file, "line0\n")
-      io.save_history
-      assert_equal(%w"line0 line1 line2", File.read(history_file).split)
-    end
-
-    def test_history_different_encodings
-      IRB.conf[:SAVE_HISTORY] = 2
-      IRB.conf[:LC_MESSAGES] = IRB::Locale.new("en_US.ASCII")
-      IRB.__send__(:set_encoding, Encoding::US_ASCII.name, override: false)
-      assert_history(<<~EXPECTED_HISTORY.encode(Encoding::US_ASCII), <<~INITIAL_HISTORY.encode(Encoding::UTF_8), <<~INPUT)
-        ????
-        exit
-      EXPECTED_HISTORY
-        😀
-      INITIAL_HISTORY
-        exit
-      INPUT
-    end
-
-    def test_history_does_not_raise_when_history_file_directory_does_not_exist
-      backup_history_file = IRB.conf[:HISTORY_FILE]
-      IRB.conf[:SAVE_HISTORY] = 1
-      IRB.conf[:HISTORY_FILE] = "fake/fake/fake/history_file"
-      io = TestInputMethodWithRelineHistory.new
-
-      assert_warn(/ensure the folder exists/i) do
-        io.save_history
-      end
-
-      # assert_warn reverts $VERBOSE to EnvUtil.original_verbose, which is true in some cases
-      # We want to keep $VERBOSE as nil until teardown is called
-      # TODO: check if this is an assert_warn issue
-      $VERBOSE = nil
-    ensure
-      IRB.conf[:HISTORY_FILE] = backup_history_file
-    end
-
-    def test_no_home_no_history_file_does_not_raise_history_save
-      ENV['HOME'] = nil
-      io = TestInputMethodWithRelineHistory.new
-      assert_nil(IRB.rc_file('_history'))
-      assert_nothing_raised do
-        io.load_history
-        io.save_history
-      end
-    end
-
-    private
-
-    def history_concurrent_use_for_input_method(input_method)
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT, input_method) do |history_file|
-        exit
-        5
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-        assert_history(<<~EXPECTED_HISTORY2, <<~INITIAL_HISTORY2, <<~INPUT2, input_method)
-        exit
-      EXPECTED_HISTORY2
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY2
-        5
-        exit
-      INPUT2
-        File.utime(File.atime(history_file), File.mtime(history_file) + 2, history_file)
-      end
-    end
-
-    def assert_history(expected_history, initial_irb_history, input, input_method = TestInputMethodWithRelineHistory)
-      actual_history = nil
-      history_file = IRB.rc_file("_history")
-      ENV["HOME"] = @tmpdir
-      File.open(history_file, "w") do |f|
-        f.write(initial_irb_history)
-      end
-
-      io = input_method.new
-      io.class::HISTORY.clear
-      io.load_history
-      if block_given?
-        previous_history = []
-        io.class::HISTORY.each { |line| previous_history << line }
-        yield history_file
-        io.class::HISTORY.clear
-        previous_history.each { |line| io.class::HISTORY << line }
-      end
-      input.split.each { |line| io.class::HISTORY << line }
-      io.save_history
-
-      io.load_history
-      File.open(history_file, "r") do |f|
-        actual_history = f.read
-      end
-      assert_equal(expected_history, actual_history, <<~MESSAGE)
-        expected:
-        #{expected_history}
-        but actual:
-        #{actual_history}
-      MESSAGE
-    end
-
-    def with_temp_stdio
-      Tempfile.create("test_readline_stdin") do |stdin|
-        Tempfile.create("test_readline_stdout") do |stdout|
-          yield stdin, stdout
-        end
-      end
-    end
-  end
-
-  class IRBHistoryIntegrationTest < IntegrationTestCase
-    def test_history_saving_with_debug
-      write_history ""
-
-      write_ruby <<~'RUBY'
-        def foo
-        end
-
-        binding.irb
-
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "'irb session'"
-        type "next"
-        type "'irb:debug session'"
-        type "step"
-        type "irb_info"
-        type "puts Reline::HISTORY.to_a.to_s"
-        type "q!"
-      end
-
-      assert_include(output, "InputMethod: RelineInputMethod")
-      # check that in-memory history is preserved across sessions
-      assert_include output, %q(
-        ["'irb session'", "next", "'irb:debug session'", "step", "irb_info", "puts Reline::HISTORY.to_a.to_s"]
-      ).strip
-
-      assert_equal <<~HISTORY, @history_file.open.read
-        'irb session'
-        next
-        'irb:debug session'
-        step
-        irb_info
-        puts Reline::HISTORY.to_a.to_s
-        q!
-      HISTORY
-    end
-
-    def test_history_saving_with_debug_without_prior_history
-      tmpdir = Dir.mktmpdir("test_irb_history_")
-      # Intentionally not creating the file so we test the reset counter logic
-      history_file = File.join(tmpdir, "irb_history")
-
-      write_rc <<~RUBY
-        IRB.conf[:HISTORY_FILE] = "#{history_file}"
-      RUBY
-
-      write_ruby <<~'RUBY'
-        def foo
-        end
-
-        binding.irb
-
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "'irb session'"
-        type "next"
-        type "'irb:debug session'"
-        type "step"
-        type "irb_info"
-        type "puts Reline::HISTORY.to_a.to_s"
-        type "q!"
-      end
-
-      assert_include(output, "InputMethod: RelineInputMethod")
-      # check that in-memory history is preserved across sessions
-      assert_include output, %q(
-        ["'irb session'", "next", "'irb:debug session'", "step", "irb_info", "puts Reline::HISTORY.to_a.to_s"]
-      ).strip
-
-      assert_equal <<~HISTORY, File.read(history_file)
-        'irb session'
-        next
-        'irb:debug session'
-        step
-        irb_info
-        puts Reline::HISTORY.to_a.to_s
-        q!
-      HISTORY
-    ensure
-      FileUtils.rm_rf(tmpdir)
-    end
-
-    def test_history_saving_with_nested_sessions
-      write_history ""
-
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-        end
-
-        binding.irb
-      RUBY
-
-      run_ruby_file do
-        type "'outer session'"
-        type "foo"
-        type "'inner session'"
-        type "exit"
-        type "'outer session again'"
-        type "exit"
-      end
-
-      assert_equal <<~HISTORY, @history_file.open.read
-        'outer session'
-        foo
-        'inner session'
-        exit
-        'outer session again'
-        exit
-      HISTORY
-    end
-
-    def test_nested_history_saving_from_inner_session_with_exit!
-      write_history ""
-
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-        end
-
-        binding.irb
-      RUBY
-
-      run_ruby_file do
-        type "'outer session'"
-        type "foo"
-        type "'inner session'"
-        type "exit!"
-      end
-
-      assert_equal <<~HISTORY, @history_file.open.read
-        'outer session'
-        foo
-        'inner session'
-        exit!
-      HISTORY
-    end
-
-    def test_nested_history_saving_from_outer_session_with_exit!
-      write_history ""
-
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-        end
-
-        binding.irb
-      RUBY
-
-      run_ruby_file do
-        type "'outer session'"
-        type "foo"
-        type "'inner session'"
-        type "exit"
-        type "'outer session again'"
-        type "exit!"
-      end
-
-      assert_equal <<~HISTORY, @history_file.open.read
-        'outer session'
-        foo
-        'inner session'
-        exit
-        'outer session again'
-        exit!
-      HISTORY
-    end
-
-    def test_history_saving_with_nested_sessions_and_prior_history
-      write_history <<~HISTORY
-        old_history_1
-        old_history_2
-        old_history_3
-      HISTORY
-
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-        end
-
-        binding.irb
-      RUBY
-
-      run_ruby_file do
-        type "'outer session'"
-        type "foo"
-        type "'inner session'"
-        type "exit"
-        type "'outer session again'"
-        type "exit"
-      end
-
-      assert_equal <<~HISTORY, @history_file.open.read
-        old_history_1
-        old_history_2
-        old_history_3
-        'outer session'
-        foo
-        'inner session'
-        exit
-        'outer session again'
-        exit
-      HISTORY
-    end
-
-    def test_direct_debug_session_loads_history
-      @envs['RUBY_DEBUG_IRB_CONSOLE'] = "1"
-      write_history <<~HISTORY
-        old_history_1
-        old_history_2
-        old_history_3
-      HISTORY
-
-      write_ruby <<~'RUBY'
-        require 'debug'
-        debugger
-        binding.irb # needed to satisfy run_ruby_file
-      RUBY
-
-      output = run_ruby_file do
-        type "history"
-        type "puts 'foo'"
-        type "history"
-        type "exit!"
-      end
-
-      assert_include(output, "irb:rdbg(main):002") # assert that we're in an irb:rdbg session
-      assert_include(output, "5: history")
-      assert_include(output, "4: puts 'foo'")
-      assert_include(output, "3: history")
-      assert_include(output, "2: old_history_3")
-      assert_include(output, "1: old_history_2")
-      assert_include(output, "0: old_history_1")
-    end
-
-    private
-
-    def write_history(history)
-      @history_file = Tempfile.new('irb_history')
-      @history_file.write(history)
-      @history_file.close
-      write_rc <<~RUBY
-        IRB.conf[:HISTORY_FILE] = "#{@history_file.path}"
-      RUBY
-    end
-  end
-end
diff --git a/test/mri/irb/test_init.rb b/test/mri/irb/test_init.rb
deleted file mode 100644
index f7168e02fea..00000000000
--- a/test/mri/irb/test_init.rb
+++ /dev/null
@@ -1,388 +0,0 @@
-# frozen_string_literal: false
-require "irb"
-require "fileutils"
-
-require_relative "helper"
-
-module TestIRB
-  class InitTest < TestCase
-    def setup
-      # IRBRC is for RVM...
-      @backup_env = %w[HOME XDG_CONFIG_HOME IRBRC].each_with_object({}) do |env, hash|
-        hash[env] = ENV.delete(env)
-      end
-      ENV["HOME"] = @tmpdir = File.realpath(Dir.mktmpdir("test_irb_init_#{$$}"))
-    end
-
-    def reset_rc_name_generators
-      IRB.instance_variable_set(:@existing_rc_name_generators, nil)
-    end
-
-    def teardown
-      ENV.update(@backup_env)
-      FileUtils.rm_rf(@tmpdir)
-      IRB.conf.delete(:SCRIPT)
-      reset_rc_name_generators
-    end
-
-    def test_setup_with_argv_preserves_global_argv
-      argv = ["foo", "bar"]
-      with_argv(argv) do
-        IRB.setup(eval("__FILE__"), argv: %w[-f])
-        assert_equal argv, ARGV
-      end
-    end
-
-    def test_setup_with_minimum_argv_does_not_change_dollar0
-      orig = $0.dup
-      IRB.setup(eval("__FILE__"), argv: %w[-f])
-      assert_equal orig, $0
-    end
-
-    def test_rc_files
-      tmpdir = @tmpdir
-      Dir.chdir(tmpdir) do
-        home = ENV['HOME'] = "#{tmpdir}/home"
-        xdg_config_home = ENV['XDG_CONFIG_HOME'] = "#{tmpdir}/xdg"
-        reset_rc_name_generators
-        assert_empty(IRB.irbrc_files)
-        assert_equal("#{home}/.irb_history", IRB.rc_file('_history'))
-        FileUtils.mkdir_p(home)
-        FileUtils.mkdir_p("#{xdg_config_home}/irb")
-        FileUtils.mkdir_p("#{home}/.config/irb")
-        reset_rc_name_generators
-        assert_empty(IRB.irbrc_files)
-        assert_equal("#{xdg_config_home}/irb/irb_history", IRB.rc_file('_history'))
-        home_irbrc = "#{home}/.irbrc"
-        config_irbrc = "#{home}/.config/irb/irbrc"
-        xdg_config_irbrc = "#{xdg_config_home}/irb/irbrc"
-        [home_irbrc, config_irbrc, xdg_config_irbrc].each do |file|
-          FileUtils.touch(file)
-        end
-        current_dir_irbrcs = %w[.irbrc irbrc _irbrc $irbrc].map { |file| "#{tmpdir}/#{file}" }
-        current_dir_irbrcs.each { |file| FileUtils.touch(file) }
-        reset_rc_name_generators
-        assert_equal([xdg_config_irbrc, home_irbrc, *current_dir_irbrcs], IRB.irbrc_files)
-        assert_equal(xdg_config_irbrc.sub(/rc$/, '_history'), IRB.rc_file('_history'))
-        ENV['XDG_CONFIG_HOME'] = nil
-        reset_rc_name_generators
-        assert_equal([home_irbrc, config_irbrc, *current_dir_irbrcs], IRB.irbrc_files)
-        assert_equal(home_irbrc.sub(/rc$/, '_history'), IRB.rc_file('_history'))
-        ENV['XDG_CONFIG_HOME'] = ''
-        reset_rc_name_generators
-        assert_equal([home_irbrc, config_irbrc] + current_dir_irbrcs, IRB.irbrc_files)
-        assert_equal(home_irbrc.sub(/rc$/, '_history'), IRB.rc_file('_history'))
-        ENV['XDG_CONFIG_HOME'] = xdg_config_home
-        ENV['IRBRC'] = "#{tmpdir}/.irbrc"
-        reset_rc_name_generators
-        assert_equal([ENV['IRBRC'], xdg_config_irbrc, home_irbrc] + (current_dir_irbrcs - [ENV['IRBRC']]), IRB.irbrc_files)
-        assert_equal(ENV['IRBRC'] + '_history', IRB.rc_file('_history'))
-        ENV['IRBRC'] = ENV['HOME'] = ENV['XDG_CONFIG_HOME'] = nil
-        reset_rc_name_generators
-        assert_equal(current_dir_irbrcs, IRB.irbrc_files)
-        assert_nil(IRB.rc_file('_history'))
-      end
-    end
-
-    def test_duplicated_rc_files
-      tmpdir = @tmpdir
-      Dir.chdir(tmpdir) do
-        ENV['XDG_CONFIG_HOME'] = "#{ENV['HOME']}/.config"
-        FileUtils.mkdir_p("#{ENV['XDG_CONFIG_HOME']}/irb")
-        env_irbrc = ENV['IRBRC'] = "#{tmpdir}/_irbrc"
-        xdg_config_irbrc = "#{ENV['XDG_CONFIG_HOME']}/irb/irbrc"
-        home_irbrc = "#{ENV['HOME']}/.irbrc"
-        current_dir_irbrc = "#{tmpdir}/irbrc"
-        [env_irbrc, xdg_config_irbrc, home_irbrc, current_dir_irbrc].each do |file|
-          FileUtils.touch(file)
-        end
-        reset_rc_name_generators
-        assert_equal([env_irbrc, xdg_config_irbrc, home_irbrc, current_dir_irbrc], IRB.irbrc_files)
-      end
-    end
-
-    def test_sigint_restore_default
-      pend "This test gets stuck on Solaris for unknown reason; contribution is welcome" if RUBY_PLATFORM =~ /solaris/
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      # IRB should restore SIGINT handler
-      status = assert_in_out_err(bundle_exec + %w[-W0 -rirb -e Signal.trap("SIGINT","DEFAULT");binding.irb;loop{Process.kill("SIGINT",$$)} -- -f --], "exit\n", //, //)
-      Process.kill("SIGKILL", status.pid) if !status.exited? && !status.stopped? && !status.signaled?
-    end
-
-    def test_sigint_restore_block
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      # IRB should restore SIGINT handler
-      status = assert_in_out_err(bundle_exec + %w[-W0 -rirb -e x=false;Signal.trap("SIGINT"){x=true};binding.irb;loop{Process.kill("SIGINT",$$);if(x);break;end} -- -f --], "exit\n", //, //)
-      Process.kill("SIGKILL", status.pid) if !status.exited? && !status.stopped? && !status.signaled?
-    end
-
-    def test_no_color_environment_variable
-      orig_no_color = ENV['NO_COLOR']
-      orig_use_colorize = IRB.conf[:USE_COLORIZE]
-      IRB.conf[:USE_COLORIZE] = true
-
-      assert IRB.conf[:USE_COLORIZE]
-
-      ENV['NO_COLOR'] = 'true'
-      IRB.setup(__FILE__)
-      refute IRB.conf[:USE_COLORIZE]
-
-      ENV['NO_COLOR'] = ''
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_COLORIZE]
-
-      ENV['NO_COLOR'] = nil
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_COLORIZE]
-    ensure
-      ENV['NO_COLOR'] = orig_no_color
-      IRB.conf[:USE_COLORIZE] = orig_use_colorize
-    end
-
-    def test_use_autocomplete_environment_variable
-      orig_use_autocomplete_env = ENV['IRB_USE_AUTOCOMPLETE']
-      orig_use_autocomplete_conf = IRB.conf[:USE_AUTOCOMPLETE]
-
-      ENV['IRB_USE_AUTOCOMPLETE'] = nil
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_AUTOCOMPLETE]
-
-      ENV['IRB_USE_AUTOCOMPLETE'] = ''
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_AUTOCOMPLETE]
-
-      ENV['IRB_USE_AUTOCOMPLETE'] = 'false'
-      IRB.setup(__FILE__)
-      refute IRB.conf[:USE_AUTOCOMPLETE]
-
-      ENV['IRB_USE_AUTOCOMPLETE'] = 'true'
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_AUTOCOMPLETE]
-    ensure
-      ENV["IRB_USE_AUTOCOMPLETE"] = orig_use_autocomplete_env
-      IRB.conf[:USE_AUTOCOMPLETE] = orig_use_autocomplete_conf
-    end
-
-    def test_completor_environment_variable
-      orig_use_autocomplete_env = ENV['IRB_COMPLETOR']
-      orig_use_autocomplete_conf = IRB.conf[:COMPLETOR]
-
-      # Default value is nil: auto-detect
-      ENV['IRB_COMPLETOR'] = nil
-      IRB.setup(__FILE__)
-      assert_equal(nil, IRB.conf[:COMPLETOR])
-
-      ENV['IRB_COMPLETOR'] = 'regexp'
-      IRB.setup(__FILE__)
-      assert_equal(:regexp, IRB.conf[:COMPLETOR])
-
-      ENV['IRB_COMPLETOR'] = 'type'
-      IRB.setup(__FILE__)
-      assert_equal(:type, IRB.conf[:COMPLETOR])
-
-      ENV['IRB_COMPLETOR'] = 'regexp'
-      IRB.setup(__FILE__, argv: ['--type-completor'])
-      assert_equal :type, IRB.conf[:COMPLETOR]
-
-      ENV['IRB_COMPLETOR'] = 'type'
-      IRB.setup(__FILE__, argv: ['--regexp-completor'])
-      assert_equal :regexp, IRB.conf[:COMPLETOR]
-    ensure
-      ENV['IRB_COMPLETOR'] = orig_use_autocomplete_env
-      IRB.conf[:COMPLETOR] = orig_use_autocomplete_conf
-    end
-
-    def test_completor_setup_with_argv
-      orig_completor_conf = IRB.conf[:COMPLETOR]
-      orig_completor_env = ENV['IRB_COMPLETOR']
-      ENV['IRB_COMPLETOR'] = nil
-
-      # Default value is nil: auto-detect
-      IRB.setup(__FILE__, argv: [])
-      assert_equal nil, IRB.conf[:COMPLETOR]
-
-      IRB.setup(__FILE__, argv: ['--type-completor'])
-      assert_equal :type, IRB.conf[:COMPLETOR]
-
-      IRB.setup(__FILE__, argv: ['--regexp-completor'])
-      assert_equal :regexp, IRB.conf[:COMPLETOR]
-    ensure
-      IRB.conf[:COMPLETOR] = orig_completor_conf
-      ENV['IRB_COMPLETOR'] = orig_completor_env
-    end
-
-    def test_noscript
-      argv = %w[--noscript -- -f]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_nil IRB.conf[:SCRIPT]
-      assert_equal(['-f'], argv)
-
-      argv = %w[--noscript -- a]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_nil IRB.conf[:SCRIPT]
-      assert_equal(['a'], argv)
-
-      argv = %w[--noscript a]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_nil IRB.conf[:SCRIPT]
-      assert_equal(['a'], argv)
-
-      argv = %w[--script --noscript a]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_nil IRB.conf[:SCRIPT]
-      assert_equal(['a'], argv)
-
-      argv = %w[--noscript --script a]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal('a', IRB.conf[:SCRIPT])
-      assert_equal([], argv)
-    end
-
-    def test_dash
-      argv = %w[-]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal('-', IRB.conf[:SCRIPT])
-      assert_equal([], argv)
-
-      argv = %w[-- -]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal('-', IRB.conf[:SCRIPT])
-      assert_equal([], argv)
-
-      argv = %w[-- - -f]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal('-', IRB.conf[:SCRIPT])
-      assert_equal(['-f'], argv)
-    end
-
-    def test_option_tracer
-      argv = %w[--tracer]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal(true, IRB.conf[:USE_TRACER])
-    end
-
-    private
-
-    def with_argv(argv)
-      orig = ARGV.dup
-      ARGV.replace(argv)
-      yield
-    ensure
-      ARGV.replace(orig)
-    end
-  end
-
-  class ConfigValidationTest < TestCase
-    def setup
-      # To prevent the test from using the user's .irbrc file
-      @home = Dir.mktmpdir
-      setup_envs(home: @home)
-      super
-    end
-
-    def teardown
-      super
-      teardown_envs
-      File.unlink(@irbrc)
-      Dir.rmdir(@home)
-      IRB.instance_variable_set(:@existing_rc_name_generators, nil)
-    end
-
-    def test_irb_name_converts_non_string_values_to_string
-      assert_no_irb_validation_error(<<~'RUBY')
-        IRB.conf[:IRB_NAME] = :foo
-      RUBY
-
-      assert_equal "foo", IRB.conf[:IRB_NAME]
-    end
-
-    def test_irb_rc_name_only_takes_callable_objects
-      assert_irb_validation_error(<<~'RUBY', "IRB.conf[:IRB_RC] should be a callable object. Got :foo.")
-        IRB.conf[:IRB_RC] = :foo
-      RUBY
-    end
-
-    def test_back_trace_limit_only_accepts_integers
-      assert_irb_validation_error(<<~'RUBY', "IRB.conf[:BACK_TRACE_LIMIT] should be an integer. Got \"foo\".")
-        IRB.conf[:BACK_TRACE_LIMIT] = "foo"
-      RUBY
-    end
-
-    def test_prompt_only_accepts_hash
-      assert_irb_validation_error(<<~'RUBY', "IRB.conf[:PROMPT] should be a Hash. Got \"foo\".")
-        IRB.conf[:PROMPT] = "foo"
-      RUBY
-    end
-
-    def test_eval_history_only_accepts_integers
-      assert_irb_validation_error(<<~'RUBY', "IRB.conf[:EVAL_HISTORY] should be an integer. Got \"foo\".")
-        IRB.conf[:EVAL_HISTORY] = "foo"
-      RUBY
-    end
-
-    private
-
-    def assert_irb_validation_error(rc_content, error_message)
-      write_rc rc_content
-
-      assert_raise_with_message(TypeError, error_message) do
-        IRB.setup(__FILE__)
-      end
-    end
-
-    def assert_no_irb_validation_error(rc_content)
-      write_rc rc_content
-
-      assert_nothing_raised do
-        IRB.setup(__FILE__)
-      end
-    end
-
-    def write_rc(content)
-      @irbrc = Tempfile.new('irbrc')
-      @irbrc.write(content)
-      @irbrc.close
-      ENV['IRBRC'] = @irbrc.path
-    end
-  end
-
-  class InitIntegrationTest < IntegrationTestCase
-    def setup
-      super
-
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-    end
-
-    def test_load_error_in_rc_file_is_warned
-      write_rc <<~'IRBRC'
-        require "file_that_does_not_exist"
-      IRBRC
-
-      output = run_ruby_file do
-        type "'foobar'"
-        type "exit"
-      end
-
-      # IRB session should still be started
-      assert_includes output, "foobar"
-      assert_includes output, 'cannot load such file -- file_that_does_not_exist (LoadError)'
-    end
-
-    def test_normal_errors_in_rc_file_is_warned
-      write_rc <<~'IRBRC'
-        raise "I'm an error"
-      IRBRC
-
-      output = run_ruby_file do
-        type "'foobar'"
-        type "exit"
-      end
-
-      # IRB session should still be started
-      assert_includes output, "foobar"
-      assert_includes output, 'I\'m an error (RuntimeError)'
-    end
-  end
-end
diff --git a/test/mri/irb/test_input_method.rb b/test/mri/irb/test_input_method.rb
deleted file mode 100644
index bd107551df4..00000000000
--- a/test/mri/irb/test_input_method.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-# frozen_string_literal: false
-
-require "irb"
-begin
-  require "rdoc"
-rescue LoadError
-end
-require_relative "helper"
-
-module TestIRB
-  class InputMethodTest < TestCase
-    def setup
-      @conf_backup = IRB.conf.dup
-      IRB.init_config(nil)
-      IRB.conf[:LC_MESSAGES] = IRB::Locale.new
-      save_encodings
-    end
-
-    def teardown
-      IRB.conf.replace(@conf_backup)
-      restore_encodings
-      # Reset Reline configuration overridden by RelineInputMethod.
-      Reline.instance_variable_set(:@core, nil)
-    end
-  end
-
-  class RelineInputMethodTest < InputMethodTest
-    def test_initialization
-      Reline.completion_proc = nil
-      Reline.dig_perfect_match_proc = nil
-      IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
-
-      assert_nil Reline.completion_append_character
-      assert_equal '', Reline.completer_quote_characters
-      assert_equal IRB::InputMethod::BASIC_WORD_BREAK_CHARACTERS, Reline.basic_word_break_characters
-      assert_not_nil Reline.completion_proc
-      assert_not_nil Reline.dig_perfect_match_proc
-    end
-
-    def test_colorize
-      IRB.conf[:USE_COLORIZE] = true
-      IRB.conf[:VERBOSE] = false
-      original_colorable = IRB::Color.method(:colorable?)
-      IRB::Color.instance_eval { undef :colorable? }
-      IRB::Color.define_singleton_method(:colorable?) { true }
-      workspace = IRB::WorkSpace.new(binding)
-      input_method = IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
-      IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new(workspace, input_method).context
-      assert_equal "\e[1m$\e[0m\e[m", Reline.output_modifier_proc.call('$', complete: false)
-      assert_equal "\e[1m$\e[0m\e[m  \e[34m\e[1m1\e[0m + \e[34m\e[1m2\e[0m", Reline.output_modifier_proc.call('$  1 + 2', complete: false)
-      assert_equal "\e[32m\e[1m$a\e[0m", Reline.output_modifier_proc.call('$a', complete: false)
-    ensure
-      IRB::Color.instance_eval { undef :colorable? }
-      IRB::Color.define_singleton_method(:colorable?, original_colorable)
-    end
-
-    def test_initialization_without_use_autocomplete
-      original_show_doc_proc = Reline.dialog_proc(:show_doc)&.dialog_proc
-      empty_proc = Proc.new {}
-      Reline.add_dialog_proc(:show_doc, empty_proc)
-
-      IRB.conf[:USE_AUTOCOMPLETE] = false
-
-      IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
-
-      refute Reline.autocompletion
-      assert_equal empty_proc, Reline.dialog_proc(:show_doc).dialog_proc
-    ensure
-      Reline.add_dialog_proc(:show_doc, original_show_doc_proc, Reline::DEFAULT_DIALOG_CONTEXT)
-    end
-
-    def test_initialization_with_use_autocomplete
-      omit 'This test requires RDoc' unless defined?(RDoc)
-      original_show_doc_proc = Reline.dialog_proc(:show_doc)&.dialog_proc
-      empty_proc = Proc.new {}
-      Reline.add_dialog_proc(:show_doc, empty_proc)
-
-      IRB.conf[:USE_AUTOCOMPLETE] = true
-
-      IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
-
-      assert Reline.autocompletion
-      assert_not_equal empty_proc, Reline.dialog_proc(:show_doc).dialog_proc
-    ensure
-      Reline.add_dialog_proc(:show_doc, original_show_doc_proc, Reline::DEFAULT_DIALOG_CONTEXT)
-    end
-
-    def test_initialization_with_use_autocomplete_but_without_rdoc
-      original_show_doc_proc = Reline.dialog_proc(:show_doc)&.dialog_proc
-      empty_proc = Proc.new {}
-      Reline.add_dialog_proc(:show_doc, empty_proc)
-
-      IRB.conf[:USE_AUTOCOMPLETE] = true
-
-      without_rdoc do
-        IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
-      end
-
-      assert Reline.autocompletion
-      # doesn't register show_doc dialog
-      assert_equal empty_proc, Reline.dialog_proc(:show_doc).dialog_proc
-    ensure
-      Reline.add_dialog_proc(:show_doc, original_show_doc_proc, Reline::DEFAULT_DIALOG_CONTEXT)
-    end
-  end
-
-  class DisplayDocumentTest < InputMethodTest
-    def setup
-      super
-      @driver = RDoc::RI::Driver.new(use_stdout: true)
-    end
-
-    def display_document(target, bind, driver = nil)
-      input_method = IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
-      input_method.instance_variable_set(:@rdoc_ri_driver, driver) if driver
-      input_method.instance_variable_set(:@completion_params, ['', target, '', bind])
-      input_method.display_document(target)
-    end
-
-    def test_perfectly_matched_namespace_triggers_document_display
-      omit unless has_rdoc_content?
-
-      out, err = capture_output do
-        display_document("String", binding, @driver)
-      end
-
-      assert_empty(err)
-
-      assert_include(out, " S\bSt\btr\bri\bin\bng\bg")
-    end
-
-    def test_perfectly_matched_multiple_namespaces_triggers_document_display
-      result = nil
-      out, err = capture_output do
-        result = display_document("{}.nil?", binding, @driver)
-      end
-
-      assert_empty(err)
-
-      # check if there're rdoc contents (e.g. CI doesn't generate them)
-      if has_rdoc_content?
-        # if there's rdoc content, we can verify by checking stdout
-        # rdoc generates control characters for formatting method names
-        assert_include(out, "P\bPr\bro\boc\bc.\b.n\bni\bil\bl?\b?") # Proc.nil?
-        assert_include(out, "H\bHa\bas\bsh\bh.\b.n\bni\bil\bl?\b?") # Hash.nil?
-      else
-        # this is a hacky way to verify the rdoc rendering code path because CI doesn't have rdoc content
-        # if there are multiple namespaces to be rendered, PerfectMatchedProc renders the result with a document
-        # which always returns the bytes rendered, even if it's 0
-        assert_equal(0, result)
-      end
-    end
-
-    def test_not_matched_namespace_triggers_nothing
-      result = nil
-      out, err = capture_output do
-        result = display_document("Stri", binding, @driver)
-      end
-
-      assert_empty(err)
-      assert_empty(out)
-      assert_nil(result)
-    end
-
-    def test_perfect_matching_stops_without_rdoc
-      result = nil
-
-      out, err = capture_output do
-        without_rdoc do
-          result = display_document("String", binding)
-        end
-      end
-
-      assert_empty(err)
-      assert_not_match(/from ruby core/, out)
-      assert_nil(result)
-    end
-
-    def test_perfect_matching_handles_nil_namespace
-      out, err = capture_output do
-        # symbol literal has `nil` doc namespace so it's a good test subject
-        assert_nil(display_document(":aiueo", binding, @driver))
-      end
-
-      assert_empty(err)
-      assert_empty(out)
-    end
-
-    private
-
-    def has_rdoc_content?
-      File.exist?(RDoc::RI::Paths::BASE)
-    end
-  end if defined?(RDoc)
-end
diff --git a/test/mri/irb/test_irb.rb b/test/mri/irb/test_irb.rb
deleted file mode 100644
index 617e9c9614b..00000000000
--- a/test/mri/irb/test_irb.rb
+++ /dev/null
@@ -1,936 +0,0 @@
-# frozen_string_literal: true
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class InputTest < IntegrationTestCase
-    def test_symbol_aliases_are_handled_correctly
-      write_ruby <<~'RUBY'
-        class Foo
-        end
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "$ Foo"
-        type "exit!"
-      end
-
-      assert_include output, "From: #{@ruby_file.path}:1"
-    end
-
-    def test_symbol_aliases_are_handled_correctly_with_singleline_mode
-      write_rc <<~RUBY
-        IRB.conf[:USE_SINGLELINE] = true
-      RUBY
-
-      write_ruby <<~'RUBY'
-        class Foo
-        end
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "irb_info"
-        type "$ Foo"
-        type "exit!"
-      end
-
-      # Make sure it's tested in singleline mode
-      assert_include output, "InputMethod: ReadlineInputMethod"
-      assert_include output, "From: #{@ruby_file.path}:1"
-    end
-
-    def test_underscore_stores_last_result
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "1 + 1"
-        type "_ + 10"
-        type "exit!"
-      end
-
-      assert_include output, "=> 12"
-    end
-
-    def test_commands_dont_override_stored_last_result
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "1 + 1"
-        type "ls"
-        type "_ + 10"
-        type "exit!"
-      end
-
-      assert_include output, "=> 12"
-    end
-
-    def test_evaluate_with_encoding_error_without_lineno
-      if RUBY_ENGINE == 'truffleruby'
-        omit "Remove me after https://github.com/ruby/prism/issues/2129 is addressed and adopted in TruffleRuby"
-      end
-
-      if RUBY_VERSION >= "3.3."
-        omit "Now raises SyntaxError"
-      end
-
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type %q[:"\xAE"]
-        type "exit!"
-      end
-
-      assert_include output, 'invalid symbol in encoding UTF-8 :"\xAE"'
-      # EncodingError would be wrapped with ANSI escape sequences, so we assert it separately
-      assert_include output, "EncodingError"
-    end
-
-    def test_evaluate_still_emits_warning
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type %q[def foo; END {}; end]
-        type "exit!"
-      end
-
-      assert_include output, '(irb):1: warning: END in method; use at_exit'
-    end
-
-    def test_symbol_aliases_dont_affect_ruby_syntax
-      write_ruby <<~'RUBY'
-        $foo = "It's a foo"
-        @bar = "It's a bar"
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "$foo"
-        type "@bar"
-        type "exit!"
-      end
-
-      assert_include output, "=> \"It's a foo\""
-      assert_include output, "=> \"It's a bar\""
-    end
-
-    def test_empty_input_echoing_behaviour
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type ""
-        type "  "
-        type "exit"
-      end
-
-      assert_not_match(/irb\(main\):001> (\r*\n)?=> nil/, output)
-      assert_match(/irb\(main\):002>   (\r*\n)?=> nil/, output)
-    end
-  end
-
-  class NestedBindingIrbTest < IntegrationTestCase
-    def test_current_context_restore
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type '$ctx = IRB.CurrentContext'
-        type 'binding.irb'
-        type 'p context_changed: IRB.CurrentContext != $ctx'
-        type 'exit'
-        type 'p context_restored: IRB.CurrentContext == $ctx'
-        type 'exit'
-      end
-
-      assert_include output, {context_changed: true}.inspect
-      assert_include output, {context_restored: true}.inspect
-    end
-  end
-
-  class IrbIOConfigurationTest < TestCase
-    Row = Struct.new(:content, :current_line_spaces, :new_line_spaces, :indent_level)
-
-    class MockIO_AutoIndent
-      attr_reader :calculated_indent
-
-      def initialize(*params)
-        @params = params
-      end
-
-      def auto_indent(&block)
-        @calculated_indent = block.call(*@params)
-      end
-    end
-
-    class MockIO_DynamicPrompt
-      attr_reader :prompt_list
-
-      def initialize(params, &assertion)
-        @params = params
-      end
-
-      def dynamic_prompt(&block)
-        @prompt_list = block.call(@params)
-      end
-    end
-
-    def setup
-      save_encodings
-      @irb = build_irb
-    end
-
-    def teardown
-      restore_encodings
-    end
-
-    class AutoIndentationTest < IrbIOConfigurationTest
-      def test_auto_indent
-        input_with_correct_indents = [
-          [%q(def each_top_level_statement), 0, 2],
-          [%q(  initialize_input), 2, 2],
-          [%q(  catch(:TERM_INPUT) do), 2, 4],
-          [%q(    loop do), 4, 6],
-          [%q(      begin), 6, 8],
-          [%q(        prompt), 8, 8],
-          [%q(        unless l = lex), 8, 10],
-          [%q(          throw :TERM_INPUT if @line == ''), 10, 10],
-          [%q(        else), 8, 10],
-          [%q(          @line_no += l.count("\n")), 10, 10],
-          [%q(          next if l == "\n"), 10, 10],
-          [%q(          @line.concat l), 10, 10],
-          [%q(          if @code_block_open or @ltype or @continue or @indent > 0), 10, 12],
-          [%q(            next), 12, 12],
-          [%q(          end), 10, 10],
-          [%q(        end), 8, 8],
-          [%q(        if @line != "\n"), 8, 10],
-          [%q(          @line.force_encoding(@io.encoding)), 10, 10],
-          [%q(          yield @line, @exp_line_no), 10, 10],
-          [%q(        end), 8, 8],
-          [%q(        break if @io.eof?), 8, 8],
-          [%q(        @line = ''), 8, 8],
-          [%q(        @exp_line_no = @line_no), 8, 8],
-          [%q(        ), nil, 8],
-          [%q(        @indent = 0), 8, 8],
-          [%q(      rescue TerminateLineInput), 6, 8],
-          [%q(        initialize_input), 8, 8],
-          [%q(        prompt), 8, 8],
-          [%q(      end), 6, 6],
-          [%q(    end), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(end), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_braces_on_their_own_line
-        input_with_correct_indents = [
-          [%q(if true), 0, 2],
-          [%q(  [), 2, 4],
-          [%q(  ]), 2, 2],
-          [%q(end), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_multiple_braces_in_a_line
-        input_with_correct_indents = [
-          [%q([[[), 0, 6],
-          [%q(    ]), 4, 4],
-          [%q(  ]), 2, 2],
-          [%q(]), 0, 0],
-          [%q([<<FOO]), 0, 0],
-          [%q(hello), 0, 0],
-          [%q(FOO), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_a_closed_brace_and_not_closed_brace_in_a_line
-        input_with_correct_indents = [
-          [%q(p() {), 0, 2],
-          [%q(}), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_symbols
-        input_with_correct_indents = [
-          [%q(:a), 0, 0],
-          [%q(:A), 0, 0],
-          [%q(:+), 0, 0],
-          [%q(:@@a), 0, 0],
-          [%q(:@a), 0, 0],
-          [%q(:$a), 0, 0],
-          [%q(:def), 0, 0],
-          [%q(:`), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_incomplete_coding_magic_comment
-        input_with_correct_indents = [
-          [%q(#coding:u), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_incomplete_encoding_magic_comment
-        input_with_correct_indents = [
-          [%q(#encoding:u), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_incomplete_emacs_coding_magic_comment
-        input_with_correct_indents = [
-          [%q(# -*- coding: u), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_incomplete_vim_coding_magic_comment
-        input_with_correct_indents = [
-          [%q(# vim:set fileencoding=u), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_mixed_rescue
-        input_with_correct_indents = [
-          [%q(def m), 0, 2],
-          [%q(  begin), 2, 4],
-          [%q(    begin), 4, 6],
-          [%q(      x = a rescue 4), 6, 6],
-          [%q(      y = [(a rescue 5)]), 6, 6],
-          [%q(      [x, y]), 6, 6],
-          [%q(    rescue => e), 4, 6],
-          [%q(      raise e rescue 8), 6, 6],
-          [%q(    end), 4, 4],
-          [%q(  rescue), 2, 4],
-          [%q(    raise rescue 11), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(rescue => e), 0, 2],
-          [%q(  raise e rescue 14), 2, 2],
-          [%q(end), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_oneliner_method_definition
-        input_with_correct_indents = [
-          [%q(class A), 0, 2],
-          [%q(  def foo0), 2, 4],
-          [%q(    3), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(  def foo1()), 2, 4],
-          [%q(    3), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(  def foo2(a, b)), 2, 4],
-          [%q(    a + b), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(  def foo3 a, b), 2, 4],
-          [%q(    a + b), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(  def bar0() = 3), 2, 2],
-          [%q(  def bar1(a) = a), 2, 2],
-          [%q(  def bar2(a, b) = a + b), 2, 2],
-          [%q(  def bar3() = :s), 2, 2],
-          [%q(  def bar4() = Time.now), 2, 2],
-          [%q(end), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_tlambda
-        input_with_correct_indents = [
-          [%q(if true), 0, 2, 1],
-          [%q(  -> {), 2, 4, 2],
-          [%q(  }), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_corresponding_syntax_to_keyword_do_in_class
-        input_with_correct_indents = [
-          [%q(class C), 0, 2, 1],
-          [%q(  while method_name do), 2, 4, 2],
-          [%q(    3), 4, 4, 2],
-          [%q(  end), 2, 2, 1],
-          [%q(  foo do), 2, 4, 2],
-          [%q(    3), 4, 4, 2],
-          [%q(  end), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_corresponding_syntax_to_keyword_do
-        input_with_correct_indents = [
-          [%q(while i > 0), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while true), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while ->{i > 0}.call), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while ->{true}.call), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while i > 0 do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while true do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while ->{i > 0}.call do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while ->{true}.call do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(foo do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(foo true do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(foo ->{true} do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(foo ->{i > 0} do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_corresponding_syntax_to_keyword_for
-        input_with_correct_indents = [
-          [%q(for i in [1]), 0, 2, 1],
-          [%q(  puts i), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_corresponding_syntax_to_keyword_for_with_do
-        input_with_correct_indents = [
-          [%q(for i in [1] do), 0, 2, 1],
-          [%q(  puts i), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_typing_incomplete_include_interpreted_as_keyword_in
-        input_with_correct_indents = [
-          [%q(module E), 0, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(class A), 0, 2, 1],
-          [%q(  in), 2, 2, 1] # scenario typing `include E`
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-
-      end
-
-      def test_bracket_corresponding_to_times
-        input_with_correct_indents = [
-          [%q(3.times { |i|), 0, 2, 1],
-          [%q(  puts i), 2, 2, 1],
-          [%q(}), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_do_corresponding_to_times
-        input_with_correct_indents = [
-          [%q(3.times do |i|), 0, 2, 1],
-          [%q(  puts i), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_bracket_corresponding_to_loop
-        input_with_correct_indents = [
-          ['loop {', 0, 2, 1],
-          ['  3', 2, 2, 1],
-          ['}', 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_do_corresponding_to_loop
-        input_with_correct_indents = [
-          [%q(loop do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_embdoc_indent
-        input_with_correct_indents = [
-          [%q(=begin), 0, 0, 0],
-          [%q(a), 0, 0, 0],
-          [%q( b), 1, 1, 0],
-          [%q(=end), 0, 0, 0],
-          [%q(if 1), 0, 2, 1],
-          [%q(  2), 2, 2, 1],
-          [%q(=begin), 0, 0, 0],
-          [%q(a), 0, 0, 0],
-          [%q( b), 1, 1, 0],
-          [%q(=end), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_heredoc_with_indent
-        input_with_correct_indents = [
-          [%q(<<~Q+<<~R), 0, 2, 1],
-          [%q(a), 2, 2, 1],
-          [%q(a), 2, 2, 1],
-          [%q(  b), 2, 2, 1],
-          [%q(  b), 2, 2, 1],
-          [%q(  Q), 0, 2, 1],
-          [%q(    c), 4, 4, 1],
-          [%q(    c), 4, 4, 1],
-          [%q(    R), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_oneliner_def_in_multiple_lines
-        input_with_correct_indents = [
-          [%q(def a()=[), 0, 2, 1],
-          [%q(  1,), 2, 2, 1],
-          [%q(].), 0, 0, 0],
-          [%q(to_s), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_broken_heredoc
-        input_with_correct_indents = [
-          [%q(def foo), 0, 2, 1],
-          [%q(  <<~Q), 2, 4, 2],
-          [%q(  Qend), 4, 4, 2],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_pasted_code_keep_base_indent_spaces
-        input_with_correct_indents = [
-          [%q(    def foo), 0, 6, 1],
-          [%q(        if bar), 6, 10, 2],
-          [%q(          [1), 10, 12, 3],
-          [%q(          ]+[["a), 10, 14, 4],
-          [%q(b" + `c), 0, 14, 4],
-          [%q(d` + /e), 0, 14, 4],
-          [%q(f/ + :"g), 0, 14, 4],
-          [%q(h".tap do), 0, 16, 5],
-          [%q(                1), 16, 16, 5],
-          [%q(              end), 14, 14, 4],
-          [%q(            ]), 12, 12, 3],
-          [%q(          ]), 10, 10, 2],
-          [%q(        end), 8, 6, 1],
-          [%q(    end), 4, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_pasted_code_keep_base_indent_spaces_with_heredoc
-        input_with_correct_indents = [
-          [%q(    def foo), 0, 6, 1],
-          [%q(        if bar), 6, 10, 2],
-          [%q(          [1), 10, 12, 3],
-          [%q(          ]+[["a), 10, 14, 4],
-          [%q(b" + <<~A + <<-B + <<C), 0, 16, 5],
-          [%q(                a#{), 16, 18, 6],
-          [%q(                1), 18, 18, 6],
-          [%q(                }), 16, 16, 5],
-          [%q(              A), 14, 16, 5],
-          [%q(                b#{), 16, 18, 6],
-          [%q(                1), 18, 18, 6],
-          [%q(                }), 16, 16, 5],
-          [%q(              B), 14, 0, 0],
-          [%q(c#{), 0, 2, 1],
-          [%q(1), 2, 2, 1],
-          [%q(}), 0, 0, 0],
-          [%q(C), 0, 14, 4],
-          [%q(            ]), 12, 12, 3],
-          [%q(          ]), 10, 10, 2],
-          [%q(        end), 8, 6, 1],
-          [%q(    end), 4, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_heredoc_keep_indent_spaces
-        (1..4).each do |indent|
-          row = Row.new(' ' * indent, nil, [4, indent].max, 2)
-          lines = ['def foo', '  <<~Q', row.content]
-          assert_row_indenting(lines, row)
-          assert_indent_level(lines, row.indent_level)
-        end
-      end
-
-      private
-
-      def assert_row_indenting(lines, row)
-        actual_current_line_spaces = calculate_indenting(lines, false)
-
-        error_message = <<~MSG
-          Incorrect spaces calculation for line:
-
-          ```
-        > #{lines.last}
-          ```
-
-          All lines:
-
-          ```
-          #{lines.join("\n")}
-          ```
-        MSG
-        assert_equal(row.current_line_spaces, actual_current_line_spaces, error_message)
-
-        error_message = <<~MSG
-          Incorrect spaces calculation for line after the current line:
-
-          ```
-          #{lines.last}
-        >
-          ```
-
-          All lines:
-
-          ```
-          #{lines.join("\n")}
-          ```
-        MSG
-        actual_next_line_spaces = calculate_indenting(lines, true)
-        assert_equal(row.new_line_spaces, actual_next_line_spaces, error_message)
-      end
-
-      def assert_rows_with_correct_indents(rows_with_spaces, assert_indent_level: false)
-        lines = []
-        rows_with_spaces.map do |row|
-          row = Row.new(*row)
-          lines << row.content
-          assert_row_indenting(lines, row)
-
-          if assert_indent_level
-            assert_indent_level(lines, row.indent_level)
-          end
-        end
-      end
-
-      def assert_indent_level(lines, expected)
-        code = lines.map { |l| "#{l}\n" }.join # code should end with "\n"
-        _tokens, opens, _ = @irb.scanner.check_code_state(code, local_variables: [])
-        indent_level = @irb.scanner.calc_indent_level(opens)
-        error_message = "Calculated the wrong number of indent level for:\n #{lines.join("\n")}"
-        assert_equal(expected, indent_level, error_message)
-      end
-
-      def calculate_indenting(lines, add_new_line)
-        lines = lines + [""] if add_new_line
-        last_line_index = lines.length - 1
-        byte_pointer = lines.last.length
-
-        mock_io = MockIO_AutoIndent.new(lines, last_line_index, byte_pointer, add_new_line)
-        @irb.context.auto_indent_mode = true
-        @irb.context.io = mock_io
-        @irb.configure_io
-
-        mock_io.calculated_indent
-      end
-    end
-
-    class DynamicPromptTest < IrbIOConfigurationTest
-      def test_endless_range_at_end_of_line
-        input_with_prompt = [
-          ['001:0: :> ', %q(a = 3..)],
-          ['002:0: :> ', %q()],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_heredoc_with_embexpr
-        input_with_prompt = [
-          ['001:0:":* ', %q(<<A+%W[#{<<B)],
-          ['002:0:":* ', %q(#{<<C+%W[)],
-          ['003:0:":* ', %q(a)],
-          ['004:2:]:* ', %q(C)],
-          ['005:2:]:* ', %q(a)],
-          ['006:0:":* ', %q(]})],
-          ['007:0:":* ', %q(})],
-          ['008:0:":* ', %q(A)],
-          ['009:2:]:* ', %q(B)],
-          ['010:1:]:* ', %q(})],
-          ['011:0: :> ', %q(])],
-          ['012:0: :> ', %q()],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_heredoc_prompt_with_quotes
-        input_with_prompt = [
-          ["001:1:':* ", %q(<<~'A')],
-          ["002:1:':* ", %q(#{foobar})],
-          ["003:0: :> ", %q(A)],
-          ["004:1:`:* ", %q(<<~`A`)],
-          ["005:1:`:* ", %q(whoami)],
-          ["006:0: :> ", %q(A)],
-          ['007:1:":* ', %q(<<~"A")],
-          ['008:1:":* ', %q(foobar)],
-          ['009:0: :> ', %q(A)],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_backtick_method
-        input_with_prompt = [
-          ['001:0: :> ', %q(self.`(arg))],
-          ['002:0: :> ', %q()],
-          ['003:0: :> ', %q(def `(); end)],
-          ['004:0: :> ', %q()],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_dynamic_prompt
-        input_with_prompt = [
-          ['001:1: :* ', %q(def hoge)],
-          ['002:1: :* ', %q(  3)],
-          ['003:0: :> ', %q(end)],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_dynamic_prompt_with_double_newline_breaking_code
-        input_with_prompt = [
-          ['001:1: :* ', %q(if true)],
-          ['002:2: :* ', %q(%)],
-          ['003:1: :* ', %q(;end)],
-          ['004:1: :* ', %q(;hello)],
-          ['005:0: :> ', %q(end)],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_dynamic_prompt_with_multiline_literal
-        input_with_prompt = [
-          ['001:1: :* ', %q(if true)],
-          ['002:2:]:* ', %q(  %w[)],
-          ['003:2:]:* ', %q(  a)],
-          ['004:1: :* ', %q(  ])],
-          ['005:1: :* ', %q(  b)],
-          ['006:2:]:* ', %q(  %w[)],
-          ['007:2:]:* ', %q(  c)],
-          ['008:1: :* ', %q(  ])],
-          ['009:0: :> ', %q(end)],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_dynamic_prompt_with_blank_line
-        input_with_prompt = [
-          ['001:1:]:* ', %q(%w[)],
-          ['002:1:]:* ', %q()],
-          ['003:0: :> ', %q(])],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def assert_dynamic_prompt(input_with_prompt)
-        expected_prompt_list, lines = input_with_prompt.transpose
-        def @irb.generate_prompt(opens, continue, line_offset)
-          ltype = @scanner.ltype_from_open_tokens(opens)
-          indent = @scanner.calc_indent_level(opens)
-          continue = opens.any? || continue
-          line_no = @line_no + line_offset
-          '%03d:%01d:%1s:%s ' % [line_no, indent, ltype, continue ? '*' : '>']
-        end
-        io = MockIO_DynamicPrompt.new(lines)
-        @irb.context.io = io
-        @irb.configure_io
-
-        error_message = <<~EOM
-          Expected dynamic prompt:
-          #{expected_prompt_list.join("\n")}
-
-          Actual dynamic prompt:
-          #{io.prompt_list.join("\n")}
-        EOM
-        assert_equal(expected_prompt_list, io.prompt_list, error_message)
-      end
-    end
-
-    private
-
-    def build_binding
-      Object.new.instance_eval { binding }
-    end
-
-    def build_irb
-      IRB.init_config(nil)
-      workspace = IRB::WorkSpace.new(build_binding)
-
-      IRB.conf[:VERBOSE] = false
-      IRB::Irb.new(workspace, TestInputMethod.new)
-    end
-  end
-
-  class BacktraceFilteringTest < TestIRB::IntegrationTestCase
-    def setup
-      super
-      # These tests are sensitive to warnings, so we disable them
-      original_rubyopt = [ENV["RUBYOPT"], @envs["RUBYOPT"]].compact.join(" ")
-      @envs["RUBYOPT"] = original_rubyopt + " -W0"
-    end
-
-    def test_backtrace_filtering
-      write_ruby <<~'RUBY'
-        def foo
-          raise "error"
-        end
-
-        def bar
-          foo
-        end
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "bar"
-        type "exit"
-      end
-
-      assert_match(/irbtest-.*\.rb:2:in (`|'Object#)foo': error \(RuntimeError\)/, output)
-      frame_traces = output.split("\n").select { |line| line.strip.match?(/from /) }.map(&:strip)
-
-      expected_traces = if RUBY_VERSION >= "3.3.0"
-        [
-          /from .*\/irbtest-.*.rb:6:in (`|'Object#)bar'/,
-          /from .*\/irbtest-.*.rb\(irb\):1:in [`']<main>'/,
-          /from <internal:kernel>:\d+:in (`|'Kernel#)loop'/,
-          /from <internal:prelude>:\d+:in (`|'Binding#)irb'/,
-          /from .*\/irbtest-.*.rb:9:in [`']<main>'/
-        ]
-      else
-        [
-          /from .*\/irbtest-.*.rb:6:in (`|'Object#)bar'/,
-          /from .*\/irbtest-.*.rb\(irb\):1:in [`']<main>'/,
-          /from <internal:prelude>:\d+:in (`|'Binding#)irb'/,
-          /from .*\/irbtest-.*.rb:9:in [`']<main>'/
-        ]
-      end
-
-      expected_traces.reverse! if RUBY_VERSION < "3.0.0"
-
-      expected_traces.each_with_index do |expected_trace, index|
-        assert_match(expected_trace, frame_traces[index])
-      end
-    end
-
-    def test_backtrace_filtering_with_backtrace_filter
-      write_rc <<~'RUBY'
-        class TestBacktraceFilter
-          def self.call(backtrace)
-            backtrace.reject { |line| line.include?("internal") }
-          end
-        end
-
-        IRB.conf[:BACKTRACE_FILTER] = TestBacktraceFilter
-      RUBY
-
-      write_ruby <<~'RUBY'
-        def foo
-          raise "error"
-        end
-
-        def bar
-          foo
-        end
-
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "bar"
-        type "exit"
-      end
-
-      assert_match(/irbtest-.*\.rb:2:in (`|'Object#)foo': error \(RuntimeError\)/, output)
-      frame_traces = output.split("\n").select { |line| line.strip.match?(/from /) }.map(&:strip)
-
-      expected_traces = [
-        /from .*\/irbtest-.*.rb:6:in (`|'Object#)bar'/,
-        /from .*\/irbtest-.*.rb\(irb\):1:in [`']<main>'/,
-        /from .*\/irbtest-.*.rb:9:in [`']<main>'/
-      ]
-
-      expected_traces.reverse! if RUBY_VERSION < "3.0.0"
-
-      expected_traces.each_with_index do |expected_trace, index|
-        assert_match(expected_trace, frame_traces[index])
-      end
-    end
-  end
-end
diff --git a/test/mri/irb/test_locale.rb b/test/mri/irb/test_locale.rb
deleted file mode 100644
index 930a38834c1..00000000000
--- a/test/mri/irb/test_locale.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require "irb"
-require "stringio"
-
-require_relative "helper"
-
-module TestIRB
-  class LocaleTestCase < TestCase
-    def test_initialize_with_en
-      locale = IRB::Locale.new("en_US.UTF-8")
-
-      assert_equal("en", locale.lang)
-      assert_equal("US", locale.territory)
-      assert_equal("UTF-8", locale.encoding.name)
-      assert_equal(nil, locale.modifier)
-    end
-
-    def test_initialize_with_ja
-      locale = IRB::Locale.new("ja_JP.UTF-8")
-
-      assert_equal("ja", locale.lang)
-      assert_equal("JP", locale.territory)
-      assert_equal("UTF-8", locale.encoding.name)
-      assert_equal(nil, locale.modifier)
-    end
-
-    def test_initialize_with_legacy_ja_encoding_ujis
-      original_stderr = $stderr
-      $stderr = StringIO.new
-
-      locale = IRB::Locale.new("ja_JP.ujis")
-
-      assert_equal("ja", locale.lang)
-      assert_equal("JP", locale.territory)
-      assert_equal(Encoding::EUC_JP, locale.encoding)
-      assert_equal(nil, locale.modifier)
-
-      assert_include $stderr.string, "ja_JP.ujis is obsolete. use ja_JP.EUC-JP"
-    ensure
-      $stderr = original_stderr
-    end
-
-    def test_initialize_with_legacy_ja_encoding_euc
-      original_stderr = $stderr
-      $stderr = StringIO.new
-
-      locale = IRB::Locale.new("ja_JP.euc")
-
-      assert_equal("ja", locale.lang)
-      assert_equal("JP", locale.territory)
-      assert_equal(Encoding::EUC_JP, locale.encoding)
-      assert_equal(nil, locale.modifier)
-
-      assert_include $stderr.string, "ja_JP.euc is obsolete. use ja_JP.EUC-JP"
-    ensure
-      $stderr = original_stderr
-    end
-
-    %w(IRB_LANG LC_MESSAGES LC_ALL LANG).each do |env_var|
-      define_method "test_initialize_with_#{env_var.downcase}" do
-        original_values = {
-          "IRB_LANG" => ENV["IRB_LANG"],
-          "LC_MESSAGES" => ENV["LC_MESSAGES"],
-          "LC_ALL" => ENV["LC_ALL"],
-          "LANG" => ENV["LANG"],
-        }
-
-        ENV["IRB_LANG"] = ENV["LC_MESSAGES"] = ENV["LC_ALL"] = ENV["LANG"] = nil
-        ENV[env_var] = "zh_TW.UTF-8"
-
-        locale = IRB::Locale.new
-
-        assert_equal("zh", locale.lang)
-        assert_equal("TW", locale.territory)
-        assert_equal("UTF-8", locale.encoding.name)
-        assert_equal(nil, locale.modifier)
-      ensure
-        original_values.each do |key, value|
-          ENV[key] = value
-        end
-      end
-    end
-
-    def test_load
-      # reset Locale's internal cache
-      IRB::Locale.class_variable_set(:@@loaded, [])
-      # Because error.rb files define the same class, loading them causes method redefinition warnings.
-      original_verbose = $VERBOSE
-      $VERBOSE = nil
-
-      jp_local = IRB::Locale.new("ja_JP.UTF-8")
-      jp_local.load("irb/error.rb")
-      msg = IRB::CantReturnToNormalMode.new.message
-      assert_equal("Normalモードに戻れません.", msg)
-
-      # reset Locale's internal cache
-      IRB::Locale.class_variable_set(:@@loaded, [])
-
-      en_local = IRB::Locale.new("en_US.UTF-8")
-      en_local.load("irb/error.rb")
-      msg = IRB::CantReturnToNormalMode.new.message
-      assert_equal("Can't return to normal mode.", msg)
-    ensure
-      # before turning warnings back on, load the error.rb file again to avoid warnings in other tests
-      IRB::Locale.new.load("irb/error.rb")
-      $VERBOSE = original_verbose
-    end
-
-    def test_find
-      jp_local = IRB::Locale.new("ja_JP.UTF-8")
-      path = jp_local.find("irb/error.rb")
-      assert_include(path, "/lib/irb/lc/ja/error.rb")
-
-      en_local = IRB::Locale.new("en_US.UTF-8")
-      path = en_local.find("irb/error.rb")
-      assert_include(path, "/lib/irb/lc/error.rb")
-    end
-  end
-end
diff --git a/test/mri/irb/test_nesting_parser.rb b/test/mri/irb/test_nesting_parser.rb
deleted file mode 100644
index 6b4f54ee212..00000000000
--- a/test/mri/irb/test_nesting_parser.rb
+++ /dev/null
@@ -1,339 +0,0 @@
-# frozen_string_literal: false
-require 'irb'
-
-require_relative "helper"
-
-module TestIRB
-  class NestingParserTest < TestCase
-    def setup
-      save_encodings
-    end
-
-    def teardown
-      restore_encodings
-    end
-
-    def parse_by_line(code)
-      IRB::NestingParser.parse_by_line(IRB::RubyLex.ripper_lex_without_warning(code))
-    end
-
-    def test_open_tokens
-      code = <<~'EOS'
-        class A
-          def f
-            if true
-              tap do
-                {
-                  x: "
-                    #{p(1, 2, 3
-      EOS
-      opens = IRB::NestingParser.open_tokens(IRB::RubyLex.ripper_lex_without_warning(code))
-      assert_equal(%w[class def if do { " #{ (], opens.map(&:tok))
-    end
-
-    def test_parse_by_line
-      code = <<~EOS
-        (((((1+2
-        ).to_s())).tap do (((
-      EOS
-      _tokens, prev_opens, next_opens, min_depth = parse_by_line(code).last
-      assert_equal(%w[( ( ( ( (], prev_opens.map(&:tok))
-      assert_equal(%w[( ( do ( ( (], next_opens.map(&:tok))
-      assert_equal(2, min_depth)
-    end
-
-    def test_ruby_syntax
-      code = <<~'EOS'
-        class A
-          1 if 2
-          1 while 2
-          1 until 2
-          1 unless 2
-          1 rescue 2
-          begin; rescue; ensure; end
-          tap do; rescue; ensure; end
-          class B; end
-          module C; end
-          def f; end
-          def `; end
-          def f() = 1
-          %(); %w[]; %q(); %r{}; %i[]
-          "#{1}"; ''; /#{1}/; `#{1}`
-          p(``); p ``; p x: ``; p 1, ``;
-          :sym; :"sym"; :+; :`; :if
-          [1, 2, 3]
-          { x: 1, y: 2 }
-          (a, (*b, c), d), e = 1, 2, 3
-          ->(a){}; ->(a) do end
-          -> a = -> b = :do do end do end
-          if 1; elsif 2; else; end
-          unless 1; end
-          while 1; end
-          until 1; end
-          for i in j; end
-          case 1; when 2; end
-          puts(1, 2, 3)
-          loop{|i|}
-          loop do |i| end
-        end
-      EOS
-      line_results = parse_by_line(code)
-      assert_equal(code.lines.size, line_results.size)
-      class_open, *inner_line_results, class_close = line_results
-      assert_equal(['class'], class_open[2].map(&:tok))
-      inner_line_results.each {|result| assert_equal(['class'], result[2].map(&:tok)) }
-      assert_equal([], class_close[2].map(&:tok))
-    end
-
-    def test_multiline_string
-      code = <<~EOS
-        "
-        aaa
-        bbb
-        "
-        <<A
-        aaa
-        bbb
-        A
-      EOS
-      line_results = parse_by_line(code)
-      assert_equal(code.lines.size, line_results.size)
-      string_content_line, string_opens = line_results[1]
-      assert_equal("\naaa\nbbb\n", string_content_line.first.first.tok)
-      assert_equal("aaa\n", string_content_line.first.last)
-      assert_equal(['"'], string_opens.map(&:tok))
-      heredoc_content_line, heredoc_opens = line_results[6]
-      assert_equal("aaa\nbbb\n", heredoc_content_line.first.first.tok)
-      assert_equal("bbb\n", heredoc_content_line.first.last)
-      assert_equal(['<<A'], heredoc_opens.map(&:tok))
-      _line, _prev_opens, next_opens, _min_depth = line_results.last
-      assert_equal([], next_opens)
-    end
-
-    def test_backslash_continued_nested_symbol
-      code = <<~'EOS'
-        x = <<A, :\
-          heredoc #{
-            here
-          }
-        A
-        =begin
-        embdoc
-        =end
-        # comment
-
-        if # this is symbol :if
-        while
-      EOS
-      line_results = parse_by_line(code)
-      assert_equal(%w[: <<A #{], line_results[2][2].map(&:tok))
-      assert_equal(%w[while], line_results.last[2].map(&:tok))
-    end
-
-    def test_oneliner_def
-      code = <<~EOC
-        if true
-          # normal oneliner def
-          def f = 1
-          def f() = 1
-          def f(*) = 1
-          # keyword, backtick, op
-          def * = 1
-          def ` = 1
-          def if = 1
-          def *() = 1
-          def `() = 1
-          def if() = 1
-          # oneliner def with receiver
-          def a.* = 1
-          def $a.* = 1
-          def @a.` = 1
-          def A.` = 1
-          def ((a;b;c)).*() = 1
-          def ((a;b;c)).if() = 1
-          def ((a;b;c)).end() = 1
-          # multiline oneliner def
-          def f =
-          1
-          def f()
-          =
-          1
-          # oneliner def with comment and embdoc
-          def # comment
-        =begin
-        embdoc
-        =end
-            ((a;b;c))
-            . # comment
-        =begin
-        embdoc
-        =end
-            f (*) # comment
-        =begin
-        embdoc
-        =end
-          =
-          1
-          # nested oneliner def
-          def f(x = def f() = 1) = def f() = 1
-      EOC
-      _tokens, _prev_opens, next_opens, min_depth = parse_by_line(code).last
-      assert_equal(['if'], next_opens.map(&:tok))
-      assert_equal(1, min_depth)
-    end
-
-    def test_heredoc_embexpr
-      code = <<~'EOS'
-        <<A+<<B+<<C+(<<D+(<<E)
-          #{
-            <<~F+"#{<<~G}
-            #{
-              here
-            }
-            F
-            G
-            "
-          }
-        A
-        B
-        C
-        D
-        E
-        )
-      EOS
-      line_results = parse_by_line(code)
-      last_opens = line_results.last[-2]
-      assert_equal([], last_opens)
-      _tokens, _prev_opens, next_opens, _min_depth = line_results[4]
-      assert_equal(%w[( <<E <<D <<C <<B <<A #{ " <<~G <<~F #{], next_opens.map(&:tok))
-    end
-
-    def test_for_in
-      code = <<~EOS
-        for i in j
-          here
-        end
-        for i in j do
-          here
-        end
-        for i in
-          j do
-          here
-        end
-        for
-          # comment
-          i in j do
-          here
-        end
-        for (a;b;c).d in (a;b;c) do
-          here
-        end
-        for i in :in + :do do
-          here
-        end
-        for i in -> do end do
-          here
-        end
-      EOS
-      line_results = parse_by_line(code).select { |tokens,| tokens.map(&:last).include?('here') }
-      assert_equal(7, line_results.size)
-      line_results.each do |_tokens, _prev_opens, next_opens, _min_depth|
-        assert_equal(['for'], next_opens.map(&:tok))
-      end
-    end
-
-    def test_while_until
-      base_code = <<~'EOS'
-        while_or_until true
-          here
-        end
-        while_or_until a < c
-          here
-        end
-        while_or_until true do
-          here
-        end
-        while_or_until
-          # comment
-          (a + b) <
-          # comment
-          c do
-          here
-        end
-        while_or_until :\
-          do do
-          here
-        end
-        while_or_until def do; end == :do do
-          here
-        end
-        while_or_until -> do end do
-          here
-        end
-      EOS
-      %w[while until].each do |keyword|
-        code = base_code.gsub('while_or_until', keyword)
-        line_results = parse_by_line(code).select { |tokens,| tokens.map(&:last).include?('here') }
-        assert_equal(7, line_results.size)
-        line_results.each do |_tokens, _prev_opens, next_opens, _min_depth|
-          assert_equal([keyword], next_opens.map(&:tok) )
-        end
-      end
-    end
-
-    def test_undef_alias
-      codes = [
-        'undef foo',
-        'alias foo bar',
-        'undef !',
-        'alias + -',
-        'alias $a $b',
-        'undef do',
-        'alias do do',
-        'undef :do',
-        'alias :do :do',
-        'undef :"#{alias do do}"',
-        'alias :"#{undef do}" do',
-        'alias do :"#{undef do}"'
-      ]
-      code_with_comment = <<~EOS
-        undef #
-        #
-        do #
-        alias #
-        #
-        do #
-        #
-        do #
-      EOS
-      code_with_heredoc = <<~EOS
-        <<~A; alias
-        A
-        :"#{<<~A}"
-        A
-        do
-      EOS
-      [*codes, code_with_comment, code_with_heredoc].each do |code|
-        opens = IRB::NestingParser.open_tokens(IRB::RubyLex.ripper_lex_without_warning('(' + code + "\nif"))
-        assert_equal(%w[( if], opens.map(&:tok))
-      end
-    end
-
-    def test_case_in
-      code = <<~EOS
-        case 1
-        in 1
-          here
-        in
-          2
-          here
-        end
-      EOS
-      line_results = parse_by_line(code).select { |tokens,| tokens.map(&:last).include?('here') }
-      assert_equal(2, line_results.size)
-      line_results.each do |_tokens, _prev_opens, next_opens, _min_depth|
-        assert_equal(['in'], next_opens.map(&:tok))
-      end
-    end
-  end
-end
diff --git a/test/mri/irb/test_option.rb b/test/mri/irb/test_option.rb
deleted file mode 100644
index fec31f384f9..00000000000
--- a/test/mri/irb/test_option.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: false
-require_relative "helper"
-
-module TestIRB
-  class OptionTest < TestCase
-    def test_end_of_option
-      bug4117 = '[ruby-core:33574]'
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      status = assert_in_out_err(bundle_exec + %w[-W0 -rirb -e IRB.start(__FILE__) -- -f --], "", //, [], bug4117)
-      assert(status.success?, bug4117)
-    end
-  end
-end
diff --git a/test/mri/irb/test_raise_exception.rb b/test/mri/irb/test_raise_exception.rb
deleted file mode 100644
index 44a5ae87e18..00000000000
--- a/test/mri/irb/test_raise_exception.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: false
-require "tmpdir"
-
-require_relative "helper"
-
-module TestIRB
-  class RaiseExceptionTest < TestCase
-    def test_raise_exception_with_nil_backtrace
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      assert_in_out_err(bundle_exec + %w[-rirb -W0 -e IRB.start(__FILE__) -- -f --], <<-IRB, /#<Exception: foo>/, [])
-      raise Exception.new("foo").tap {|e| def e.backtrace; nil; end }
-IRB
-    end
-
-    def test_raise_exception_with_message_exception
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      expected = /#<Exception: foo>\nbacktraces are hidden because bar was raised when processing them/
-      assert_in_out_err(bundle_exec + %w[-rirb -W0 -e IRB.start(__FILE__) -- -f --], <<-IRB, expected, [])
-      e = Exception.new("foo")
-      def e.message; raise 'bar'; end
-      raise e
-IRB
-    end
-
-    def test_raise_exception_with_message_inspect_exception
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      expected = /Uninspectable exception occurred/
-      assert_in_out_err(bundle_exec + %w[-rirb -W0 -e IRB.start(__FILE__) -- -f --], <<-IRB, expected, [])
-      e = Exception.new("foo")
-      def e.message; raise; end
-      def e.inspect; raise; end
-      raise e
-IRB
-    end
-
-    def test_raise_exception_with_invalid_byte_sequence
-      pend if RUBY_ENGINE == 'truffleruby' || /mswin|mingw/ =~ RUBY_PLATFORM
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      assert_in_out_err(bundle_exec + %w[-rirb -W0 -e IRB.start(__FILE__) -- -f --], <<~IRB, /A\\xF3B \(StandardError\)/, [])
-        raise StandardError, "A\\xf3B"
-      IRB
-    end
-
-    def test_raise_exception_with_different_encoding_containing_invalid_byte_sequence
-      backup_home = ENV["HOME"]
-      Dir.mktmpdir("test_irb_raise_no_backtrace_exception_#{$$}") do |tmpdir|
-        ENV["HOME"] = tmpdir
-
-        bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-        File.open("#{tmpdir}/euc.rb", 'w') do |f|
-          f.write(<<~EOF)
-            # encoding: euc-jp
-
-            def raise_euc_with_invalid_byte_sequence
-              raise "\xA4\xA2\\xFF"
-            end
-          EOF
-        end
-        env = {}
-        %w(LC_MESSAGES LC_ALL LC_CTYPE LANG).each {|n| env[n] = "ja_JP.UTF-8" }
-        # TruffleRuby warns when the locale does not exist
-        env['TRUFFLERUBYOPT'] = "#{ENV['TRUFFLERUBYOPT']} --log.level=SEVERE" if RUBY_ENGINE == 'truffleruby'
-        args = [env] + bundle_exec + %W[-rirb -C #{tmpdir} -W0 -e IRB.start(__FILE__) -- -f --]
-        error = /raise_euc_with_invalid_byte_sequence': あ\\xFF \(RuntimeError\)/
-        assert_in_out_err(args, <<~IRB, error, [], encoding: "UTF-8")
-          require_relative 'euc'
-          raise_euc_with_invalid_byte_sequence
-        IRB
-      end
-    ensure
-      ENV["HOME"] = backup_home
-    end
-  end
-end
diff --git a/test/mri/irb/test_ruby_lex.rb b/test/mri/irb/test_ruby_lex.rb
deleted file mode 100644
index 4e406a8ce08..00000000000
--- a/test/mri/irb/test_ruby_lex.rb
+++ /dev/null
@@ -1,242 +0,0 @@
-# frozen_string_literal: true
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class RubyLexTest < TestCase
-    def setup
-      save_encodings
-    end
-
-    def teardown
-      restore_encodings
-    end
-
-    def test_interpolate_token_with_heredoc_and_unclosed_embexpr
-      code = <<~'EOC'
-        ①+<<A-②
-        #{③*<<B/④
-        #{⑤&<<C|⑥
-      EOC
-      ripper_tokens = Ripper.tokenize(code)
-      rubylex_tokens = IRB::RubyLex.ripper_lex_without_warning(code)
-      # Assert no missing part
-      assert_equal(code, rubylex_tokens.map(&:tok).join)
-      # Assert ripper tokens are not removed
-      ripper_tokens.each do |tok|
-        assert(rubylex_tokens.any? { |t| t.tok == tok && t.tok != :on_ignored_by_ripper })
-      end
-      # Assert interpolated token position
-      rubylex_tokens.each do |t|
-        row, col = t.pos
-        assert_equal t.tok, code.lines[row - 1].byteslice(col, t.tok.bytesize)
-      end
-    end
-
-    def test_local_variables_dependent_code
-      lines = ["a /1#/ do", "2"]
-      assert_indent_level(lines, 1)
-      assert_code_block_open(lines, true)
-      assert_indent_level(lines, 0, local_variables: ['a'])
-      assert_code_block_open(lines, false, local_variables: ['a'])
-    end
-
-    def test_literal_ends_with_space
-      assert_code_block_open(['% a'], true)
-      assert_code_block_open(['% a '], false)
-    end
-
-    def test_literal_ends_with_newline
-      assert_code_block_open(['%'], true)
-      assert_code_block_open(['%', ''], false)
-    end
-
-    def test_should_continue
-      assert_should_continue(['a'], false)
-      assert_should_continue(['/a/'], false)
-      assert_should_continue(['a;'], false)
-      assert_should_continue(['<<A', 'A'], false)
-      assert_should_continue(['a...'], false)
-      assert_should_continue(['a\\'], true)
-      assert_should_continue(['a.'], true)
-      assert_should_continue(['a+'], true)
-      assert_should_continue(['a; #comment', '', '=begin', 'embdoc', '=end', ''], false)
-      assert_should_continue(['a+ #comment', '', '=begin', 'embdoc', '=end', ''], true)
-    end
-
-    def test_code_block_open_with_should_continue
-      # syntax ok
-      assert_code_block_open(['a'], false) # continue: false
-      assert_code_block_open(['a\\'], true) # continue: true
-
-      # recoverable syntax error code is not terminated
-      assert_code_block_open(['a+'], true)
-
-      # unrecoverable syntax error code is terminated
-      assert_code_block_open(['.; a+'], false)
-
-      # other syntax error that failed to determine if it is recoverable or not
-      assert_code_block_open(['@; a'], false)
-      assert_code_block_open(['@; a+'], true)
-      assert_code_block_open(['@; (a'], true)
-    end
-
-    def test_broken_percent_literal
-      tokens = IRB::RubyLex.ripper_lex_without_warning('%wwww')
-      pos_to_index = {}
-      tokens.each_with_index { |t, i|
-        assert_nil(pos_to_index[t.pos], "There is already another token in the position of #{t.inspect}.")
-        pos_to_index[t.pos] = i
-      }
-    end
-
-    def test_broken_percent_literal_in_method
-      tokens = IRB::RubyLex.ripper_lex_without_warning(<<~EOC.chomp)
-        def foo
-          %wwww
-        end
-      EOC
-      pos_to_index = {}
-      tokens.each_with_index { |t, i|
-        assert_nil(pos_to_index[t.pos], "There is already another token in the position of #{t.inspect}.")
-        pos_to_index[t.pos] = i
-      }
-    end
-
-    def test_unterminated_code
-      ['do', '<<A'].each do |code|
-        tokens = IRB::RubyLex.ripper_lex_without_warning(code)
-        assert_equal(code, tokens.map(&:tok).join, "Cannot reconstruct code from tokens")
-        error_tokens = tokens.map(&:event).grep(/error/)
-        assert_empty(error_tokens, 'Error tokens must be ignored if there is corresponding non-error token')
-      end
-    end
-
-    def test_unterminated_heredoc_string_literal
-      ['<<A;<<B', "<<A;<<B\n", "%W[\#{<<A;<<B", "%W[\#{<<A;<<B\n"].each do |code|
-        tokens = IRB::RubyLex.ripper_lex_without_warning(code)
-        string_literal = IRB::NestingParser.open_tokens(tokens).last
-        assert_equal('<<A', string_literal&.tok)
-      end
-    end
-
-    def test_indent_level_with_heredoc_and_embdoc
-      reference_code = <<~EOC.chomp
-        if true
-          hello
-          p(
-          )
-      EOC
-      code_with_heredoc = <<~EOC.chomp
-        if true
-          <<~A
-          A
-          p(
-          )
-      EOC
-      code_with_embdoc = <<~EOC.chomp
-        if true
-        =begin
-        =end
-          p(
-          )
-      EOC
-      expected = 1
-      assert_indent_level(reference_code.lines, expected)
-      assert_indent_level(code_with_heredoc.lines, expected)
-      assert_indent_level(code_with_embdoc.lines, expected)
-    end
-
-    def test_assignment_expression
-      ruby_lex = IRB::RubyLex.new
-
-      [
-        "foo = bar",
-        "@foo = bar",
-        "$foo = bar",
-        "@@foo = bar",
-        "::Foo = bar",
-        "a::Foo = bar",
-        "Foo = bar",
-        "foo.bar = 1",
-        "foo[1] = bar",
-        "foo += bar",
-        "foo -= bar",
-        "foo ||= bar",
-        "foo &&= bar",
-        "foo, bar = 1, 2",
-        "foo.bar=(1)",
-        "foo; foo = bar",
-        "foo; foo = bar; ;\n ;",
-        "foo\nfoo = bar",
-      ].each do |exp|
-        assert(
-          ruby_lex.assignment_expression?(exp, local_variables: []),
-          "#{exp.inspect}: should be an assignment expression"
-        )
-      end
-
-      [
-        "foo",
-        "foo.bar",
-        "foo[0]",
-        "foo = bar; foo",
-        "foo = bar\nfoo",
-      ].each do |exp|
-        refute(
-          ruby_lex.assignment_expression?(exp, local_variables: []),
-          "#{exp.inspect}: should not be an assignment expression"
-        )
-      end
-    end
-
-    def test_assignment_expression_with_local_variable
-      ruby_lex = IRB::RubyLex.new
-      code = "a /1;x=1#/"
-      refute(ruby_lex.assignment_expression?(code, local_variables: []), "#{code}: should not be an assignment expression")
-      assert(ruby_lex.assignment_expression?(code, local_variables: [:a]), "#{code}: should be an assignment expression")
-      refute(ruby_lex.assignment_expression?("", local_variables: [:a]), "empty code should not be an assignment expression")
-    end
-
-    def test_initialising_the_old_top_level_ruby_lex
-      assert_in_out_err(["--disable-gems", "-W:deprecated"], <<~RUBY, [], /warning: constant ::RubyLex is deprecated/)
-        require "irb"
-        ::RubyLex.new(nil)
-      RUBY
-    end
-
-    private
-
-    def assert_indent_level(lines, expected, local_variables: [])
-      indent_level, _continue, _code_block_open = check_state(lines, local_variables: local_variables)
-      error_message = "Calculated the wrong number of indent level for:\n #{lines.join("\n")}"
-      assert_equal(expected, indent_level, error_message)
-    end
-
-    def assert_should_continue(lines, expected, local_variables: [])
-      _indent_level, continue, _code_block_open = check_state(lines, local_variables: local_variables)
-      error_message = "Wrong result of should_continue for:\n #{lines.join("\n")}"
-      assert_equal(expected, continue, error_message)
-    end
-
-    def assert_code_block_open(lines, expected, local_variables: [])
-      if RUBY_ENGINE == 'truffleruby'
-        omit "Remove me after https://github.com/ruby/prism/issues/2129 is addressed and adopted in TruffleRuby"
-      end
-
-      _indent_level, _continue, code_block_open = check_state(lines, local_variables: local_variables)
-      error_message = "Wrong result of code_block_open for:\n #{lines.join("\n")}"
-      assert_equal(expected, code_block_open, error_message)
-    end
-
-    def check_state(lines, local_variables: [])
-      code = lines.map { |l| "#{l}\n" }.join # code should end with "\n"
-      ruby_lex = IRB::RubyLex.new
-      tokens, opens, terminated = ruby_lex.check_code_state(code, local_variables: local_variables)
-      indent_level = ruby_lex.calc_indent_level(opens)
-      continue = ruby_lex.should_continue?(tokens)
-      [indent_level, continue, !terminated]
-    end
-  end
-end
diff --git a/test/mri/irb/test_tracer.rb b/test/mri/irb/test_tracer.rb
deleted file mode 100644
index 540f8be1314..00000000000
--- a/test/mri/irb/test_tracer.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# frozen_string_literal: false
-require 'tempfile'
-require 'irb'
-
-require_relative "helper"
-
-module TestIRB
-  class ContextWithTracerIntegrationTest < IntegrationTestCase
-    def setup
-      super
-
-      omit "Tracer gem is not available when running on TruffleRuby" if RUBY_ENGINE == "truffleruby"
-
-      @envs.merge!("NO_COLOR" => "true")
-    end
-
-    def example_ruby_file
-      <<~'RUBY'
-        class Foo
-          def self.foo
-            100
-          end
-        end
-
-        def bar(obj)
-          obj.foo
-        end
-
-        binding.irb
-      RUBY
-    end
-
-    def test_use_tracer_enabled_when_gem_is_unavailable
-      write_rc <<~RUBY
-        # Simulate the absence of the tracer gem
-        ::Kernel.send(:alias_method, :irb_original_require, :require)
-
-        ::Kernel.define_method(:require) do |name|
-          raise LoadError, "cannot load such file -- tracer (test)" if name.match?("tracer")
-          ::Kernel.send(:irb_original_require, name)
-        end
-
-        IRB.conf[:USE_TRACER] = true
-      RUBY
-
-      write_ruby example_ruby_file
-
-      output = run_ruby_file do
-        type "bar(Foo)"
-        type "exit"
-      end
-
-      assert_include(output, "Tracer extension of IRB is enabled but tracer gem wasn't found.")
-    end
-
-    def test_use_tracer_enabled_when_gem_is_available
-      write_rc <<~RUBY
-        IRB.conf[:USE_TRACER] = true
-      RUBY
-
-      write_ruby example_ruby_file
-
-      output = run_ruby_file do
-        type "bar(Foo)"
-        type "exit"
-      end
-
-      assert_include(output, "Object#bar at")
-      assert_include(output, "Foo.foo at")
-      assert_include(output, "Foo.foo #=> 100")
-      assert_include(output, "Object#bar #=> 100")
-
-      # Test that the tracer output does not include IRB's own files
-      assert_not_include(output, "irb/workspace.rb")
-    end
-
-    def test_use_tracer_is_disabled_by_default
-      write_ruby example_ruby_file
-
-      output = run_ruby_file do
-        type "bar(Foo)"
-        type "exit"
-      end
-
-      assert_not_include(output, "#depth:")
-      assert_not_include(output, "Foo.foo")
-    end
-
-  end
-end
diff --git a/test/mri/irb/test_type_completor.rb b/test/mri/irb/test_type_completor.rb
deleted file mode 100644
index 3d0e25d19e0..00000000000
--- a/test/mri/irb/test_type_completor.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-
-# Run test only when Ruby >= 3.0 and repl_type_completor is available
-return unless RUBY_VERSION >= '3.0.0'
-return if RUBY_ENGINE == 'truffleruby' # needs endless method definition
-begin
-  require 'repl_type_completor'
-rescue LoadError
-  return
-end
-
-require 'irb'
-require 'tempfile'
-require_relative './helper'
-
-module TestIRB
-  class TypeCompletorTest < TestCase
-    DummyContext = Struct.new(:irb_path)
-
-    def setup
-      ReplTypeCompletor.load_rbs unless ReplTypeCompletor.rbs_loaded?
-      context = DummyContext.new('(irb)')
-      @completor = IRB::TypeCompletor.new(context)
-    end
-
-    def empty_binding
-      binding
-    end
-
-    def test_build_completor
-      IRB.init_config(nil)
-      verbose, $VERBOSE = $VERBOSE, nil
-      original_completor = IRB.conf[:COMPLETOR]
-      workspace = IRB::WorkSpace.new(Object.new)
-      @context = IRB::Context.new(nil, workspace, TestInputMethod.new)
-      IRB.conf[:COMPLETOR] = nil
-      expected_default_completor = RUBY_VERSION >= '3.4' ? 'IRB::TypeCompletor' : 'IRB::RegexpCompletor'
-      assert_equal expected_default_completor, @context.send(:build_completor).class.name
-      IRB.conf[:COMPLETOR] = :type
-      assert_equal 'IRB::TypeCompletor', @context.send(:build_completor).class.name
-    ensure
-      $VERBOSE = verbose
-      IRB.conf[:COMPLETOR] = original_completor
-    end
-
-    def assert_completion(preposing, target, binding: empty_binding, include: nil, exclude: nil)
-      raise ArgumentError if include.nil? && exclude.nil?
-      candidates = @completor.completion_candidates(preposing, target, '', bind: binding)
-      assert ([*include] - candidates).empty?, "Expected #{candidates} to include #{include}" if include
-      assert (candidates & [*exclude]).empty?, "Expected #{candidates} not to include #{exclude}" if exclude
-    end
-
-    def assert_doc_namespace(preposing, target, namespace, binding: empty_binding)
-      @completor.completion_candidates(preposing, target, '', bind: binding)
-      assert_equal namespace, @completor.doc_namespace(preposing, target, '', bind: binding)
-    end
-
-    def test_type_completion
-      bind = eval('num = 1; binding')
-      assert_completion('num.times.map(&:', 'ab', binding: bind, include: 'abs')
-      assert_doc_namespace('num.chr.', 'upcase', 'String#upcase', binding: bind)
-    end
-
-    def test_inspect
-      assert_match(/\AReplTypeCompletor.*\z/, @completor.inspect)
-    end
-
-    def test_empty_completion
-      candidates = @completor.completion_candidates('(', ')', '', bind: binding)
-      assert_equal [], candidates
-      assert_doc_namespace('(', ')', nil)
-    end
-
-    def test_command_completion
-      binding.eval("some_var = 1")
-      # completion for help command's argument should only include command names
-      assert_include(@completor.completion_candidates('help ', 's', '', bind: binding), 'show_source')
-      assert_not_include(@completor.completion_candidates('help ', 's', '', bind: binding), 'some_var')
-
-      assert_include(@completor.completion_candidates('', 'show_s', '', bind: binding), 'show_source')
-      assert_not_include(@completor.completion_candidates(';', 'show_s', '', bind: binding), 'show_source')
-    end
-  end
-
-  class TypeCompletorIntegrationTest < IntegrationTestCase
-    def test_type_completor
-      write_rc <<~RUBY
-        IRB.conf[:COMPLETOR] = :type
-      RUBY
-
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "irb_info"
-        type "sleep 0.01 until ReplTypeCompletor.rbs_loaded?"
-        type "completor = IRB.CurrentContext.io.instance_variable_get(:@completor);"
-        type "n = 10"
-        type "puts completor.completion_candidates 'a = n.abs;', 'a.b', '', bind: binding"
-        type "puts completor.doc_namespace 'a = n.chr;', 'a.encoding', '', bind: binding"
-        type "exit!"
-      end
-      assert_match(/Completion: Autocomplete, ReplTypeCompletor/, output)
-      assert_match(/a\.bit_length/, output)
-      assert_match(/String#encoding/, output)
-    end
-  end
-end
diff --git a/test/mri/irb/test_workspace.rb b/test/mri/irb/test_workspace.rb
deleted file mode 100644
index ad515f91df3..00000000000
--- a/test/mri/irb/test_workspace.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: false
-require 'tempfile'
-require 'irb'
-require 'irb/workspace'
-require 'irb/color'
-
-require_relative "helper"
-
-module TestIRB
-  class WorkSpaceTest < TestCase
-    def test_code_around_binding
-      IRB.conf[:USE_COLORIZE] = false
-      Tempfile.create('irb') do |f|
-        code = <<~RUBY
-          # 1
-          # 2
-          IRB::WorkSpace.new(binding) # 3
-          # 4
-          # 5
-        RUBY
-        f.print(code)
-        f.close
-
-        workspace = eval(code, binding, f.path)
-        assert_equal(<<~EOS, without_term { workspace.code_around_binding })
-
-          From: #{f.path} @ line 3 :
-
-              1: # 1
-              2: # 2
-           => 3: IRB::WorkSpace.new(binding) # 3
-              4: # 4
-              5: # 5
-
-        EOS
-      end
-    ensure
-      IRB.conf.delete(:USE_COLORIZE)
-    end
-
-    def test_code_around_binding_with_existing_unreadable_file
-      pend 'chmod cannot make file unreadable on windows' if windows?
-      pend 'skipped in root privilege' if Process.uid == 0
-
-      Tempfile.create('irb') do |f|
-        code = "IRB::WorkSpace.new(binding)\n"
-        f.print(code)
-        f.close
-
-        File.chmod(0, f.path)
-
-        workspace = eval(code, binding, f.path)
-        assert_equal(nil, workspace.code_around_binding)
-      end
-    end
-
-    def test_code_around_binding_with_script_lines__
-      IRB.conf[:USE_COLORIZE] = false
-      with_script_lines do |script_lines|
-        Tempfile.create('irb') do |f|
-          code = "IRB::WorkSpace.new(binding)\n"
-          script_lines[f.path] = code.split(/^/)
-
-          workspace = eval(code, binding, f.path)
-          assert_equal(<<~EOS, without_term { workspace.code_around_binding })
-
-            From: #{f.path} @ line 1 :
-
-             => 1: IRB::WorkSpace.new(binding)
-
-          EOS
-        end
-      end
-    ensure
-      IRB.conf.delete(:USE_COLORIZE)
-    end
-
-    def test_code_around_binding_on_irb
-      workspace = eval("IRB::WorkSpace.new(binding)", binding, "(irb)")
-      assert_equal(nil, workspace.code_around_binding)
-    end
-
-    def test_toplevel_binding_local_variables
-      bug17623 = '[ruby-core:102468]'
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      top_srcdir = "#{__dir__}/../.."
-      irb_path = nil
-      %w[exe libexec].find do |dir|
-        irb_path = "#{top_srcdir}/#{dir}/irb"
-        File.exist?(irb_path)
-      end or omit 'irb command not found'
-      assert_in_out_err(bundle_exec + ['-W0', "-C#{top_srcdir}", '-e', <<~RUBY, '--', '-f', '--'], 'binding.local_variables', /\[:_\]/, [], bug17623)
-        version = 'xyz' # typical rubygems loading file
-        load('#{irb_path}')
-      RUBY
-    end
-
-    private
-
-    def with_script_lines
-      script_lines = nil
-      debug_lines = {}
-      Object.class_eval do
-        if defined?(SCRIPT_LINES__)
-          script_lines = SCRIPT_LINES__
-          remove_const :SCRIPT_LINES__
-        end
-        const_set(:SCRIPT_LINES__, debug_lines)
-      end
-      yield debug_lines
-    ensure
-      Object.class_eval do
-        remove_const :SCRIPT_LINES__
-        const_set(:SCRIPT_LINES__, script_lines) if script_lines
-      end
-    end
-
-    def without_term
-      env = ENV.to_h.dup
-      ENV.delete('TERM')
-      yield
-    ensure
-      ENV.replace(env)
-    end
-  end
-end
diff --git a/test/mri/irb/yamatanooroti/test_rendering.rb b/test/mri/irb/yamatanooroti/test_rendering.rb
deleted file mode 100644
index ac6ce5346ea..00000000000
--- a/test/mri/irb/yamatanooroti/test_rendering.rb
+++ /dev/null
@@ -1,478 +0,0 @@
-require 'irb'
-
-begin
-  require 'yamatanooroti'
-rescue LoadError, NameError
-  # On Ruby repository, this test suite doesn't run because Ruby repo doesn't
-  # have the yamatanooroti gem.
-  return
-end
-
-class IRB::RenderingTest < Yamatanooroti::TestCase
-  def setup
-    @original_term = ENV['TERM']
-    @home_backup = ENV['HOME']
-    @xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
-    ENV['TERM'] = "xterm-256color"
-    @pwd = Dir.pwd
-    suffix = '%010d' % Random.rand(0..65535)
-    @tmpdir = File.join(File.expand_path(Dir.tmpdir), "test_irb_#{$$}_#{suffix}")
-    begin
-      Dir.mkdir(@tmpdir)
-    rescue Errno::EEXIST
-      FileUtils.rm_rf(@tmpdir)
-      Dir.mkdir(@tmpdir)
-    end
-    @irbrc_backup = ENV['IRBRC']
-    @irbrc_file = ENV['IRBRC'] = File.join(@tmpdir, 'temporaty_irbrc')
-    File.unlink(@irbrc_file) if File.exist?(@irbrc_file)
-    ENV['HOME'] = File.join(@tmpdir, 'home')
-    ENV['XDG_CONFIG_HOME'] = File.join(@tmpdir, 'xdg_config_home')
-  end
-
-  def teardown
-    FileUtils.rm_rf(@tmpdir)
-    ENV['IRBRC'] = @irbrc_backup
-    ENV['TERM'] = @original_term
-    ENV['HOME'] = @home_backup
-    ENV['XDG_CONFIG_HOME'] = @xdg_config_home_backup
-  end
-
-  def test_launch
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write(<<~EOC)
-      'Hello, World!'
-    EOC
-    assert_screen(<<~EOC)
-      irb(main):001> 'Hello, World!'
-      => "Hello, World!"
-      irb(main):002>
-    EOC
-    close
-  end
-
-  def test_configuration_file_is_skipped_with_dash_f
-    write_irbrc <<~'LINES'
-      puts '.irbrc file should be ignored when -f is used'
-    LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb -f}, startup_message: /irb\(main\)/)
-    write(<<~EOC)
-      'Hello, World!'
-    EOC
-    assert_screen(<<~EOC)
-      irb(main):001> 'Hello, World!'
-      => "Hello, World!"
-      irb(main):002>
-    EOC
-    close
-  end
-
-  def test_configuration_file_is_skipped_with_dash_f_for_nested_sessions
-    write_irbrc <<~'LINES'
-      puts '.irbrc file should be ignored when -f is used'
-    LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb -f}, startup_message: /irb\(main\)/)
-    write(<<~EOC)
-      'Hello, World!'
-      binding.irb
-      exit!
-    EOC
-    assert_screen(<<~EOC)
-      irb(main):001> 'Hello, World!'
-      => "Hello, World!"
-      irb(main):002> binding.irb
-      irb(main):003> exit!
-      irb(main):001>
-    EOC
-    close
-  end
-
-  def test_nomultiline
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb --nomultiline}, startup_message: /irb\(main\)/)
-    write(<<~EOC)
-      if true
-      if false
-      a = "hello
-      world"
-      puts a
-      end
-      end
-    EOC
-    assert_screen(<<~EOC)
-      irb(main):001> if true
-      irb(main):002*   if false
-      irb(main):003*     a = "hello
-      irb(main):004" world"
-      irb(main):005*     puts a
-      irb(main):006*     end
-      irb(main):007*   end
-      => nil
-      irb(main):008>
-    EOC
-    close
-  end
-
-  def test_multiline_paste
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write(<<~EOC)
-      class A
-        def inspect; '#<A>'; end
-        def a; self; end
-        def b; true; end
-      end
-
-      a = A.new
-
-      a
-       .a
-       .b
-      .itself
-    EOC
-    assert_screen(<<~EOC)
-      irb(main):001* class A
-      irb(main):002*   def inspect; '#<A>'; end
-      irb(main):003*   def a; self; end
-      irb(main):004*   def b; true; end
-      irb(main):005> end
-      => :b
-      irb(main):006>
-      irb(main):007> a = A.new
-      => #<A>
-      irb(main):008>
-      irb(main):009> a
-      irb(main):010>  .a
-      irb(main):011>  .b
-      irb(main):012> .itself
-      => true
-      irb(main):013>
-    EOC
-    close
-  end
-
-  def test_evaluate_each_toplevel_statement_by_multiline_paste
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write(<<~EOC)
-      class A
-        def inspect; '#<A>'; end
-        def b; self; end
-        def c; true; end
-      end
-
-      a = A.new
-
-      a
-        .b
-        # aaa
-        .c
-
-      (a)
-        &.b()
-
-      class A def b; self; end; def c; true; end; end;
-      a = A.new
-      a
-        .b
-        # aaa
-        .c
-      (a)
-        &.b()
-      .itself
-    EOC
-    assert_screen(<<~EOC)
-      irb(main):001* class A
-      irb(main):002*   def inspect; '#<A>'; end
-      irb(main):003*   def b; self; end
-      irb(main):004*   def c; true; end
-      irb(main):005> end
-      => :c
-      irb(main):006>
-      irb(main):007> a = A.new
-      => #<A>
-      irb(main):008>
-      irb(main):009> a
-      irb(main):010>   .b
-      irb(main):011>   # aaa
-      irb(main):012>   .c
-      => true
-      irb(main):013>
-      irb(main):014> (a)
-      irb(main):015>   &.b()
-      => #<A>
-      irb(main):016>
-      irb(main):017> class A def b; self; end; def c; true; end; end;
-      irb(main):018> a = A.new
-      => #<A>
-      irb(main):019> a
-      irb(main):020>   .b
-      irb(main):021>   # aaa
-      irb(main):022>   .c
-      => true
-      irb(main):023> (a)
-      irb(main):024>   &.b()
-      irb(main):025> .itself
-      => #<A>
-      irb(main):026>
-    EOC
-    close
-  end
-
-  def test_symbol_with_backtick
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write(<<~EOC)
-      :`
-    EOC
-    assert_screen(<<~EOC)
-      irb(main):001> :`
-      => :`
-      irb(main):002>
-    EOC
-    close
-  end
-
-  def test_autocomplete_with_multiple_doc_namespaces
-    start_terminal(3, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write("{}.__id_")
-    write("\C-i")
-    assert_screen(/irb\(main\):001> {}\.__id__\n                }\.__id__(?:Press )?/)
-    close
-  end
-
-  def test_autocomplete_with_showdoc_in_gaps_on_narrow_screen_right
-    rdoc_dir = File.join(@tmpdir, 'rdoc')
-    system("bundle exec rdoc -r -o #{rdoc_dir}")
-    write_irbrc <<~LINES
-      IRB.conf[:EXTRA_DOC_DIRS] = ['#{rdoc_dir}']
-      IRB.conf[:PROMPT][:MY_PROMPT] = {
-        :PROMPT_I => "%03n> ",
-        :PROMPT_S => "%03n> ",
-        :PROMPT_C => "%03n> "
-      }
-      IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-    LINES
-    start_terminal(4, 19, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /001>/)
-    write("IR")
-    write("\C-i")
-
-    # This is because on macOS we display different shortcut for displaying the full doc
-    # 'O' is for 'Option' and 'A' is for 'Alt'
-    if RUBY_PLATFORM =~ /darwin/
-      assert_screen(<<~EOC)
-        001> IRB
-             IRBPress Opti
-                IRB
-      EOC
-    else
-      assert_screen(<<~EOC)
-        001> IRB
-             IRBPress Alt+
-                IRB
-      EOC
-    end
-    close
-  end
-
-  def test_autocomplete_with_showdoc_in_gaps_on_narrow_screen_left
-    rdoc_dir = File.join(@tmpdir, 'rdoc')
-    system("bundle exec rdoc -r -o #{rdoc_dir}")
-    write_irbrc <<~LINES
-      IRB.conf[:EXTRA_DOC_DIRS] = ['#{rdoc_dir}']
-      IRB.conf[:PROMPT][:MY_PROMPT] = {
-        :PROMPT_I => "%03n> ",
-        :PROMPT_S => "%03n> ",
-        :PROMPT_C => "%03n> "
-      }
-      IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-    LINES
-    start_terminal(4, 12, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /001>/)
-    write("IR")
-    write("\C-i")
-    assert_screen(<<~EOC)
-      001> IRB
-      PressIRB
-      IRB
-    EOC
-    close
-  end
-
-  def test_assignment_expression_truncate
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    # Assignment expression code that turns into non-assignment expression after evaluation
-    code = "a /'/i if false; a=1; x=1000.times.to_a#'.size"
-    write(code + "\n")
-    assert_screen(<<~EOC)
-      irb(main):001> #{code}
-      =>
-      [0,
-      ...
-      irb(main):002>
-    EOC
-    close
-  end
-
-  def test_ctrl_c_is_handled
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    # Assignment expression code that turns into non-assignment expression after evaluation
-    write("\C-c")
-    assert_screen(<<~EOC)
-      irb(main):001>
-      ^C
-      irb(main):001>
-    EOC
-    close
-  end
-
-  def test_show_cmds_with_pager_can_quit_with_ctrl_c
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write("help\n")
-    write("G") # move to the end of the screen
-    write("\C-c") # quit pager
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-
-    # IRB should resume
-    assert_screen(/foobar/)
-    # IRB::Abort should be rescued
-    assert_screen(/\A(?!IRB::Abort)/)
-    close
-  end
-
-  def test_pager_page_content_pages_output_when_it_does_not_fit_in_the_screen_because_of_total_length
-    write_irbrc <<~'LINES'
-      require "irb/pager"
-    LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write("IRB::Pager.page_content('a' * (80 * 8))\n")
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-
-    assert_screen(/a{80}/)
-    # because pager is invoked, foobar will not be evaluated
-    assert_screen(/\A(?!foobar)/)
-    close
-  end
-
-  def test_pager_page_content_pages_output_when_it_does_not_fit_in_the_screen_because_of_screen_height
-    write_irbrc <<~'LINES'
-      require "irb/pager"
-    LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write("IRB::Pager.page_content('a\n' * 8)\n")
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-
-    assert_screen(/(a\n){8}/)
-    # because pager is invoked, foobar will not be evaluated
-    assert_screen(/\A(?!foobar)/)
-    close
-  end
-
-  def test_pager_page_content_doesnt_page_output_when_it_fits_in_the_screen
-    write_irbrc <<~'LINES'
-      require "irb/pager"
-    LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write("IRB::Pager.page_content('a' * (80 * 7))\n")
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-
-    assert_screen(/a{80}/)
-    # because pager is not invoked, foobar will be evaluated
-    assert_screen(/foobar/)
-    close
-  end
-
-  def test_long_evaluation_output_is_paged
-    write_irbrc <<~'LINES'
-      require "irb/pager"
-    LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write("'a' * 80 * 11\n")
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-
-    assert_screen(/(a{80}\n){8}/)
-    # because pager is invoked, foobar will not be evaluated
-    assert_screen(/\A(?!foobar)/)
-    close
-  end
-
-  def test_long_evaluation_output_is_preserved_after_paging
-    write_irbrc <<~'LINES'
-      require "irb/pager"
-    LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
-    write("'a' * 80 * 11\n")
-    write("q") # quit pager
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-
-    # confirm pager has exited
-    assert_screen(/foobar/)
-    # confirm output is preserved
-    assert_screen(/(a{80}\n){6}/)
-    close
-  end
-
-  def test_debug_integration_hints_debugger_commands
-    write_irbrc <<~'LINES'
-      IRB.conf[:USE_COLORIZE] = false
-    LINES
-    script = Tempfile.create(["debug", ".rb"])
-    script.write <<~RUBY
-      binding.irb
-    RUBY
-    script.close
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{script.to_path}}, startup_message: /irb\(main\)/)
-    write("debug\n")
-    write("pp 1\n")
-    write("pp 1")
-
-    # submitted input shouldn't contain hint
-    assert_screen(/irb:rdbg\(main\):002> pp 1\n/)
-    # unsubmitted input should contain hint
-    assert_screen(/irb:rdbg\(main\):003> pp 1 # debug command\n/)
-    close
-  ensure
-    File.unlink(script) if script
-  end
-
-  def test_debug_integration_doesnt_hint_non_debugger_commands
-    write_irbrc <<~'LINES'
-      IRB.conf[:USE_COLORIZE] = false
-    LINES
-    script = Tempfile.create(["debug", ".rb"])
-    script.write <<~RUBY
-      binding.irb
-    RUBY
-    script.close
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{script.to_path}}, startup_message: /irb\(main\)/)
-    write("debug\n")
-    write("foo")
-    assert_screen(/irb:rdbg\(main\):002> foo\n/)
-    close
-  ensure
-    File.unlink(script) if script
-  end
-
-  def test_debug_integration_doesnt_hint_debugger_commands_in_nomultiline_mode
-    write_irbrc <<~'LINES'
-      IRB.conf[:USE_SINGLELINE] = true
-    LINES
-    script = Tempfile.create(["debug", ".rb"])
-    script.write <<~RUBY
-      puts 'start IRB'
-      binding.irb
-    RUBY
-    script.close
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{script.to_path}}, startup_message: 'start IRB')
-    write("debug\n")
-    write("pp 1")
-    # submitted input shouldn't contain hint
-    assert_screen(/irb:rdbg\(main\):002> pp 1\n/)
-    close
-  ensure
-    File.unlink(script) if script
-  end
-
-  private
-
-  def write_irbrc(content)
-    File.open(@irbrc_file, 'w') do |f|
-      f.write content
-    end
-  end
-end
diff --git a/test/mri/json/fixtures/pass15.json b/test/mri/json/fixtures/fail15.json
similarity index 100%
rename from test/mri/json/fixtures/pass15.json
rename to test/mri/json/fixtures/fail15.json
diff --git a/test/mri/json/fixtures/pass16.json b/test/mri/json/fixtures/fail16.json
similarity index 100%
rename from test/mri/json/fixtures/pass16.json
rename to test/mri/json/fixtures/fail16.json
diff --git a/test/mri/json/fixtures/pass17.json b/test/mri/json/fixtures/fail17.json
similarity index 100%
rename from test/mri/json/fixtures/pass17.json
rename to test/mri/json/fixtures/fail17.json
diff --git a/test/mri/json/fixtures/pass26.json b/test/mri/json/fixtures/fail26.json
similarity index 100%
rename from test/mri/json/fixtures/pass26.json
rename to test/mri/json/fixtures/fail26.json
diff --git a/test/mri/json/json_common_interface_test.rb b/test/mri/json/json_common_interface_test.rb
index 37fa439575c..ddb641d2d37 100644
--- a/test/mri/json/json_common_interface_test.rb
+++ b/test/mri/json/json_common_interface_test.rb
@@ -149,6 +149,7 @@ def test_load_with_proc
   def test_load_with_options
     json  = '{ "foo": NaN }'
     assert JSON.load(json, nil, :allow_nan => true)['foo'].nan?
+    assert JSON.load(json, :allow_nan => true)['foo'].nan?
   end
 
   def test_load_null
diff --git a/test/mri/json/json_generator_test.rb b/test/mri/json/json_generator_test.rb
index 1b3c702c982..438aa722081 100755
--- a/test/mri/json/json_generator_test.rb
+++ b/test/mri/json/json_generator_test.rb
@@ -282,13 +282,49 @@ def test_allow_nan
   end
 
   def test_depth
+    pretty = { object_nl: "\n", array_nl: "\n", space: " ", indent: "  " }
+    state = JSON.state.new(**pretty)
+    assert_equal %({\n  "foo": 42\n}), JSON.generate({ foo: 42 }, pretty)
+    assert_equal %({\n  "foo": 42\n}), state.generate(foo: 42)
+    state.depth = 1
+    assert_equal %({\n    "foo": 42\n  }), JSON.generate({ foo: 42 }, pretty.merge(depth: 1))
+    assert_equal %({\n    "foo": 42\n  }), state.generate(foo: 42)
+  end
+
+  def test_depth_nesting_error
     ary = []; ary << ary
     assert_raise(JSON::NestingError) { generate(ary) }
     assert_raise(JSON::NestingError) { JSON.pretty_generate(ary) }
-    s = JSON.state.new
-    assert_equal 0, s.depth
+  end
+
+  def test_depth_nesting_error_to_json
+    ary = []; ary << ary
+    s = JSON.state.new(depth: 1)
     assert_raise(JSON::NestingError) { ary.to_json(s) }
-    assert_equal 100, s.depth
+    assert_equal 1, s.depth
+  end
+
+  def test_depth_nesting_error_Hash_to_json
+    hash = {}; hash[:a] = hash
+    s = JSON.state.new(depth: 1)
+    assert_raise(JSON::NestingError) { hash.to_json(s) }
+    assert_equal 1, s.depth
+  end
+
+  def test_depth_nesting_error_generate
+    ary = []; ary << ary
+    s = JSON.state.new(depth: 1)
+    assert_raise(JSON::NestingError) { s.generate(ary) }
+    assert_equal 1, s.depth
+  end
+
+  def test_depth_exception_calling_to_json
+    def (obj = Object.new).to_json(*)
+      raise
+    end
+    s = JSON.state.new(depth: 1).freeze
+    assert_raise(RuntimeError) { s.generate([{ hash: obj }]) }
+    assert_equal 1, s.depth
   end
 
   def test_buffer_initial_length
diff --git a/test/mri/json/json_parser_test.rb b/test/mri/json/json_parser_test.rb
index 6315c3e667b..9ed2c2c5cae 100644
--- a/test/mri/json/json_parser_test.rb
+++ b/test/mri/json/json_parser_test.rb
@@ -164,6 +164,20 @@ def test_parse_complex_objects
     end
   end
 
+  def test_parse_control_chars_in_string
+    0.upto(31) do |ord|
+      assert_raise JSON::ParserError do
+        parse(%("#{ord.chr}"))
+      end
+    end
+  end
+
+  def test_parse_allowed_control_chars_in_string
+    0.upto(31) do |ord|
+      assert_equal ord.chr, parse(%("#{ord.chr}"), allow_control_characters: true)
+    end
+  end
+
   def test_parse_arrays
     assert_equal([1,2,3], parse('[1,2,3]'))
     assert_equal([1.2,2,3], parse('[1.2,2,3]'))
@@ -510,8 +524,8 @@ def test_backslash
     data = ['"']
     assert_equal data, parse(json)
     #
-    json = '["\\\'"]'
-    data = ["'"]
+    json = '["\\/"]'
+    data = ["/"]
     assert_equal data, parse(json)
 
     json = '["\/"]'
diff --git a/test/mri/json/ractor_test.rb b/test/mri/json/ractor_test.rb
index 53e1099ce9b..e53c405a744 100644
--- a/test/mri/json/ractor_test.rb
+++ b/test/mri/json/ractor_test.rb
@@ -52,4 +52,63 @@ def test_generate
     _, status = Process.waitpid2(pid)
     assert_predicate status, :success?
   end
+
+  def test_coder
+    coder = JSON::Coder.new.freeze
+    assert Ractor.shareable?(coder)
+    pid = fork do
+      Warning[:experimental] = false
+      r = Ractor.new(coder) do |coder|
+        json = coder.dump({
+          'a' => 2,
+          'b' => 3.141,
+          'c' => 'c',
+          'd' => [ 1, "b", 3.14 ],
+          'e' => { 'foo' => 'bar' },
+          'g' => "\"\0\037",
+          'h' => 1000.0,
+          'i' => 0.001
+        })
+        coder.load(json)
+      end
+      expected_json = JSON.parse('{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' +
+                      '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}')
+      actual_json = r.value
+
+      if expected_json == actual_json
+        exit 0
+      else
+        puts "Expected:"
+        puts expected_json
+        puts "Actual:"
+        puts actual_json
+        puts
+        exit 1
+      end
+    end
+    _, status = Process.waitpid2(pid)
+    assert_predicate status, :success?
+  end
+
+  class NonNative
+    def initialize(value)
+      @value = value
+    end
+  end
+
+  def test_coder_proc
+    block = Ractor.shareable_proc { |value| value.as_json }
+    coder = JSON::Coder.new(&block).freeze
+    assert Ractor.shareable?(coder)
+
+    pid = fork do
+      Warning[:experimental] = false
+      assert_equal [{}], Ractor.new(coder) { |coder|
+        coder.load('[{}]')
+      }.value
+    end
+
+    _, status = Process.waitpid2(pid)
+    assert_predicate status, :success?
+  end if Ractor.respond_to?(:shareable_proc)
 end if defined?(Ractor) && Process.respond_to?(:fork)
diff --git a/test/mri/lib/jit_support.rb b/test/mri/lib/jit_support.rb
index cf3baaaeb75..386a5a6f1ef 100644
--- a/test/mri/lib/jit_support.rb
+++ b/test/mri/lib/jit_support.rb
@@ -10,24 +10,20 @@ def yjit_supported?
   end
 
   def yjit_enabled?
-    defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
+    defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
   end
 
   def yjit_force_enabled?
     "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?YJIT_FORCE_ENABLE\b/)
   end
 
-  def rjit_supported?
-    return @rjit_supported if defined?(@rjit_supported)
+  def zjit_supported?
+    return @zjit_supported if defined?(@zjit_supported)
     # nil in mswin
-    @rjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['RJIT_SUPPORT'])
+    @zjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['ZJIT_SUPPORT'])
   end
 
-  def rjit_enabled?
-    defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-  end
-
-  def rjit_force_enabled?
-    "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?RJIT_FORCE_ENABLE\b/)
+  def zjit_enabled?
+    defined?(RubyVM::ZJIT) && RubyVM::ZJIT.enabled?
   end
 end
diff --git a/test/mri/logger/test_formatter.rb b/test/mri/logger/test_formatter.rb
deleted file mode 100644
index 94657229914..00000000000
--- a/test/mri/logger/test_formatter.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-
-class TestFormatter < Test::Unit::TestCase
-  def test_call
-    severity = 'INFO'
-    time = Time.now
-    progname = 'ruby'
-    msg = 'This is a test'
-    formatter = Logger::Formatter.new
-
-    result = formatter.call(severity, time, progname, msg)
-    time_matcher = /\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}/
-    matcher = /#{severity[0..0]}, \[#{time_matcher} #\d+\]  #{severity} -- #{progname}: #{msg}\n/
-
-    assert_match(matcher, result)
-  end
-
-  class CustomFormatter < Logger::Formatter
-    def call(time)
-      format_datetime(time)
-    end
-  end
-
-  def test_format_datetime
-    time = Time.now
-    formatter = CustomFormatter.new
-
-    result = formatter.call(time)
-    matcher = /^\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}$/
-
-    assert_match(matcher, result)
-  end
-end
diff --git a/test/mri/logger/test_logdevice.rb b/test/mri/logger/test_logdevice.rb
deleted file mode 100644
index 610905e5421..00000000000
--- a/test/mri/logger/test_logdevice.rb
+++ /dev/null
@@ -1,859 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-require 'tempfile'
-require 'tmpdir'
-
-class TestLogDevice < Test::Unit::TestCase
-  class LogExcnRaiser
-    def write(*arg)
-      raise 'disk is full'
-    end
-
-    def close
-    end
-
-    def stat
-      Object.new
-    end
-  end
-
-  def setup
-    @tempfile = Tempfile.new("logger")
-    @tempfile.close
-    @filename = @tempfile.path
-    File.unlink(@filename)
-  end
-
-  def teardown
-    @tempfile.close(true)
-  end
-
-  def d(log, opt = {})
-    Logger::LogDevice.new(log, **opt)
-  end
-
-  def test_initialize
-    logdev = d(STDERR)
-    assert_equal(STDERR, logdev.dev)
-    assert_nil(logdev.filename)
-    assert_raise(TypeError) do
-      d(nil)
-    end
-    #
-    logdev = d(@filename)
-    begin
-      assert_file.exist?(@filename)
-      assert_predicate(logdev.dev, :sync)
-      refute_predicate(logdev.dev, :binmode?)
-      assert_equal(@filename, logdev.filename)
-      logdev.write('hello')
-    ensure
-      logdev.close
-    end
-    # create logfile which is already exist.
-    logdev = d(@filename)
-    begin
-      assert_predicate(logdev.dev, :sync)
-      refute_predicate(logdev.dev, :binmode?)
-      logdev.write('world')
-      logfile = File.read(@filename)
-      assert_equal(2, logfile.split(/\n/).size)
-      assert_match(/^helloworld$/, logfile)
-    ensure
-      logdev.close
-    end
-    # logfile object with path
-    tempfile = Tempfile.new("logger")
-    tempfile.sync = true
-    logdev = d(tempfile)
-    begin
-      logdev.write('world')
-      logfile = File.read(tempfile.path)
-      assert_equal(1, logfile.split(/\n/).size)
-      assert_match(/^world$/, logfile)
-      assert_equal(tempfile.path, logdev.filename)
-    ensure
-      logdev.close
-      File.unlink(tempfile)
-      tempfile.close(true)
-    end
-  end
-
-  def test_write
-    r, w = IO.pipe
-    logdev = d(w)
-    logdev.write("msg2\n\n")
-    IO.select([r], nil, nil, 0.1)
-    w.close
-    msg = r.read
-    r.close
-    assert_equal("msg2\n\n", msg)
-    #
-    logdev = d(LogExcnRaiser.new)
-    class << (stderr = '')
-      alias write concat
-    end
-    $stderr, stderr = stderr, $stderr
-    begin
-      assert_nothing_raised do
-        logdev.write('hello')
-      end
-    ensure
-      logdev.close
-      $stderr, stderr = stderr, $stderr
-    end
-    assert_equal "log writing failed. disk is full\n", stderr
-  end
-
-  def test_close
-    r, w = IO.pipe
-    logdev = d(w)
-    logdev.write("msg2\n\n")
-    IO.select([r], nil, nil, 0.1)
-    assert_not_predicate(w, :closed?)
-    logdev.close
-    assert_predicate(w, :closed?)
-    r.close
-  end
-
-  def test_reopen_io
-    logdev  = d(STDERR)
-    old_dev = logdev.dev
-    logdev.reopen
-    assert_equal(STDERR, logdev.dev)
-    assert_not_predicate(old_dev, :closed?)
-  end
-
-  def test_reopen_io_by_io
-    logdev  = d(STDERR)
-    old_dev = logdev.dev
-    logdev.reopen(STDOUT)
-    assert_equal(STDOUT, logdev.dev)
-    assert_not_predicate(old_dev, :closed?)
-  end
-
-  def test_reopen_io_by_file
-    logdev  = d(STDERR)
-    old_dev = logdev.dev
-    logdev.reopen(@filename)
-    begin
-      assert_file.exist?(@filename)
-      assert_equal(@filename, logdev.filename)
-      assert_not_predicate(old_dev, :closed?)
-    ensure
-      logdev.close
-    end
-  end
-
-  def test_reopen_file
-    logdev = d(@filename)
-    old_dev = logdev.dev
-
-    logdev.reopen
-    begin
-      assert_file.exist?(@filename)
-      assert_equal(@filename, logdev.filename)
-      assert_predicate(old_dev, :closed?)
-    ensure
-      logdev.close
-    end
-  end
-
-  def test_reopen_file_by_io
-    logdev = d(@filename)
-    old_dev = logdev.dev
-    logdev.reopen(STDOUT)
-    assert_equal(STDOUT, logdev.dev)
-    assert_nil(logdev.filename)
-    assert_predicate(old_dev, :closed?)
-  end
-
-  def test_reopen_file_by_file
-    logdev = d(@filename)
-    old_dev = logdev.dev
-
-    tempfile2 = Tempfile.new("logger")
-    tempfile2.close
-    filename2 = tempfile2.path
-    File.unlink(filename2)
-
-    logdev.reopen(filename2)
-    begin
-      assert_file.exist?(filename2)
-      assert_equal(filename2, logdev.filename)
-      assert_predicate(old_dev, :closed?)
-    ensure
-      logdev.close
-      tempfile2.close(true)
-    end
-  end
-
-  def test_shifting_size
-    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
-    logfile = tmpfile.path
-    logfile0 = logfile + '.0'
-    logfile1 = logfile + '.1'
-    logfile2 = logfile + '.2'
-    logfile3 = logfile + '.3'
-    tmpfile.close(true)
-    File.unlink(logfile) if File.exist?(logfile)
-    File.unlink(logfile0) if File.exist?(logfile0)
-    File.unlink(logfile1) if File.exist?(logfile1)
-    File.unlink(logfile2) if File.exist?(logfile2)
-    logger = Logger.new(logfile, 4, 100)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile)
-    assert_file.not_exist?(logfile0)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile0)
-    assert_file.not_exist?(logfile1)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile1)
-    assert_file.not_exist?(logfile2)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile2)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.close
-    File.unlink(logfile)
-    File.unlink(logfile0)
-    File.unlink(logfile1)
-    File.unlink(logfile2)
-
-    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_2.log'])
-    logfile = tmpfile.path
-    logfile0 = logfile + '.0'
-    logfile1 = logfile + '.1'
-    logfile2 = logfile + '.2'
-    logfile3 = logfile + '.3'
-    tmpfile.close(true)
-    logger = Logger.new(logfile, 4, 150)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile)
-    assert_file.not_exist?(logfile0)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile0)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile0)
-    assert_file.not_exist?(logfile1)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile1)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile1)
-    assert_file.not_exist?(logfile2)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile2)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile2)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.close
-    File.unlink(logfile)
-    File.unlink(logfile0)
-    File.unlink(logfile1)
-    File.unlink(logfile2)
-  end
-
-  def test_shifting_age_variants
-    logger = Logger.new(@filename, 'daily')
-    logger.info('daily')
-    logger.close
-    logger = Logger.new(@filename, 'weekly')
-    logger.info('weekly')
-    logger.close
-    logger = Logger.new(@filename, 'monthly')
-    logger.info('monthly')
-    logger.close
-  end
-
-  def test_invalid_shifting_age
-    assert_raise(ArgumentError) { Logger::Period.next_rotate_time(Time.now, 'invalid') }
-    assert_raise(ArgumentError) { Logger::Period.previous_period_end(Time.now, 'invalid') }
-  end
-
-  def test_shifting_age
-    yyyymmdd = Time.now.strftime("%Y%m%d")
-    filename1 = @filename + ".#{yyyymmdd}"
-    filename2 = @filename + ".#{yyyymmdd}.1"
-    filename3 = @filename + ".#{yyyymmdd}.2"
-    begin
-      logger = Logger.new(@filename, 'now')
-      assert_file.exist?(@filename)
-      assert_file.not_exist?(filename1)
-      assert_file.not_exist?(filename2)
-      assert_file.not_exist?(filename3)
-      logger.info("0" * 15)
-      assert_file.exist?(@filename)
-      assert_file.exist?(filename1)
-      assert_file.not_exist?(filename2)
-      assert_file.not_exist?(filename3)
-      logger.warn("0" * 15)
-      assert_file.exist?(@filename)
-      assert_file.exist?(filename1)
-      assert_file.exist?(filename2)
-      assert_file.not_exist?(filename3)
-      logger.error("0" * 15)
-      assert_file.exist?(@filename)
-      assert_file.exist?(filename1)
-      assert_file.exist?(filename2)
-      assert_file.exist?(filename3)
-    ensure
-      logger.close if logger
-      [filename1, filename2, filename3].each do |filename|
-        File.unlink(filename) if File.exist?(filename)
-      end
-    end
-  end
-
-  def test_shifting_period_suffix
-    ['%Y%m%d', '%Y-%m-%d', '%Y'].each do |format|
-      if format == '%Y%m%d' # default
-        logger = Logger.new(@filename, 'now', 1048576)
-      else # config
-        logger = Logger.new(@filename, 'now', 1048576, shift_period_suffix: format)
-      end
-      begin
-        yyyymmdd = Time.now.strftime(format)
-        filename1 = @filename + ".#{yyyymmdd}"
-        filename2 = @filename + ".#{yyyymmdd}.1"
-        filename3 = @filename + ".#{yyyymmdd}.2"
-        logger.info("0" * 15)
-        logger.info("0" * 15)
-        logger.info("0" * 15)
-        assert_file.exist?(@filename)
-        assert_file.exist?(filename1)
-        assert_file.exist?(filename2)
-        assert_file.exist?(filename3)
-      ensure
-        logger.close if logger
-        [filename1, filename2, filename3].each do |filename|
-          File.unlink(filename) if File.exist?(filename)
-        end
-      end
-    end
-  end
-
-  def test_shifting_size_in_multiprocess
-    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
-    logfile = tmpfile.path
-    logfile0 = logfile + '.0'
-    logfile1 = logfile + '.1'
-    logfile2 = logfile + '.2'
-    tmpfile.close(true)
-    File.unlink(logfile) if File.exist?(logfile)
-    File.unlink(logfile0) if File.exist?(logfile0)
-    File.unlink(logfile1) if File.exist?(logfile1)
-    File.unlink(logfile2) if File.exist?(logfile2)
-    begin
-      stderr = run_children(2, [logfile], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        logger = Logger.new(ARGV[0], 4, 10)
-        10.times do
-          logger.info '0' * 15
-        end
-      end;
-      assert_no_match(/log shifting failed/, stderr)
-      assert_no_match(/log writing failed/, stderr)
-      assert_no_match(/log rotation inter-process lock failed/, stderr)
-    ensure
-      File.unlink(logfile) if File.exist?(logfile)
-      File.unlink(logfile0) if File.exist?(logfile0)
-      File.unlink(logfile1) if File.exist?(logfile1)
-      File.unlink(logfile2) if File.exist?(logfile2)
-    end
-  end
-
-  def test_shifting_age_in_multiprocess
-    yyyymmdd = Time.now.strftime("%Y%m%d")
-    begin
-      stderr = run_children(2, [@filename], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        logger = Logger.new(ARGV[0], 'now')
-        10.times do
-          logger.info '0' * 15
-        end
-      end;
-      assert_no_match(/log shifting failed/, stderr)
-      assert_no_match(/log writing failed/, stderr)
-      assert_no_match(/log rotation inter-process lock failed/, stderr)
-    ensure
-      Dir.glob("#{@filename}.#{yyyymmdd}{,.[1-9]*}") do |filename|
-        File.unlink(filename) if File.exist?(filename)
-      end
-    end
-  end
-
-  def test_open_logfile_in_multiprocess
-    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
-    logfile = tmpfile.path
-    tmpfile.close(true)
-    begin
-      20.times do
-        run_children(2, [logfile], "#{<<-"begin;"}\n#{<<-'end;'}")
-        begin;
-          logfile = ARGV[0]
-          logdev = Logger::LogDevice.new(logfile)
-          logdev.send(:open_logfile, logfile)
-        end;
-        assert_equal(1, File.readlines(logfile).grep(/# Logfile created on/).size)
-        File.unlink(logfile)
-      end
-    ensure
-      File.unlink(logfile) if File.exist?(logfile)
-    end
-  end
-
-  def test_shifting_size_not_rotate_too_much
-    logdev0 = d(@filename)
-    logdev0.__send__(:add_log_header, @tempfile)
-    header_size = @tempfile.size
-    message = "*" * 99 + "\n"
-    shift_size = header_size + message.size * 3 - 1
-    opt = {shift_age: 1, shift_size: shift_size}
-
-    Dir.mktmpdir do |tmpdir|
-      begin
-        log = File.join(tmpdir, "log")
-        logdev1 = d(log, opt)
-        logdev2 = d(log, opt)
-
-        assert_file.identical?(log, logdev1.dev)
-        assert_file.identical?(log, logdev2.dev)
-
-        3.times{logdev1.write(message)}
-        assert_file.identical?(log, logdev1.dev)
-        assert_file.identical?(log, logdev2.dev)
-
-        logdev1.write(message)
-        assert_file.identical?(log, logdev1.dev)
-        # NOTE: below assertion fails in JRuby 9.3 and TruffleRuby
-        assert_file.identical?(log + ".0", logdev2.dev)
-
-        logdev2.write(message)
-        assert_file.identical?(log, logdev1.dev)
-        assert_file.identical?(log, logdev2.dev)
-
-        logdev1.write(message)
-        assert_file.identical?(log, logdev1.dev)
-        assert_file.identical?(log, logdev2.dev)
-      ensure
-        logdev1.close if logdev1
-        logdev2.close if logdev2
-      end
-    end
-  ensure
-    logdev0.close
-  end
-
-  def test_shifting_midnight
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([*%W"--disable=gems -rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          File.utime(*[Time.mktime(2014, 1, 2, 0, 0, 0)]*2, log)
-
-          Time.now = Time.mktime(2014, 1, 2, 23, 59, 59, 999000)
-          dev = Logger::LogDevice.new(log, shift_age: 'daily')
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.mktime(2014, 1, 3, 1, 1, 1)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close
-        end
-      end;
-
-      bug = '[GH-539]'
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      assert_file.for(bug).exist?(log+".20140102")
-      assert_match(/hello-1/, File.read(log+".20140102"), bug)
-    end
-  end
-
-  env_tz_works = /linux|darwin|freebsd|openbsd/ =~ RUBY_PLATFORM # borrow from test/ruby/test_time_tz.rb
-
-  def test_shifting_weekly
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2015, 12, 14, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'weekly')
-
-          Time.now = Time.utc(2015, 12, 19, 12, 34, 56)
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2015, 12, 20, 0, 1, 1)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2015-12-19", cont[/^[-\d]+/])
-      assert_equal("20151219", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  def test_shifting_monthly
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2015, 12, 14, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'monthly')
-
-          Time.now = Time.utc(2015, 12, 31, 12, 34, 56)
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2016, 1, 1, 0, 1, 1)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2015-12-31", cont[/^[-\d]+/])
-      assert_equal("20151231", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  def test_shifting_dst_change
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"Europe/London"}, *%W"--disable=gems -rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-
-          Time.now = Time.mktime(2014, 3, 30, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new(log, shift_age: 'daily')
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(*[Time.mktime(2014, 3, 30, 0, 2, 3)]*2, log)
-
-          Time.now = Time.mktime(2014, 3, 31, 0, 1, 1)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close
-        end
-      end;
-
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      assert_file.exist?(log+".20140330")
-    end
-  end if env_tz_works
-
-  def test_shifting_weekly_dst_change
-    Dir.mktmpdir do |tmpdir|
-      assert_separately([{"TZ"=>"Europe/London"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.mktime(2015, 10, 25, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'weekly')
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-    end
-  end if env_tz_works
-
-  def test_shifting_monthly_dst_change
-    Dir.mktmpdir do |tmpdir|
-      assert_separately([{"TZ"=>"Europe/London"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2016, 9, 1, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'monthly')
-
-          Time.now = Time.utc(2016, 9, 8, 7, 6, 5)
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2016, 10, 9, 8, 7, 6)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2016, 10, 9, 8, 7, 7)
-          dev.write("#{Time.now} hello-3\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2016-09-08", cont[/^[-\d]+/])
-      assert_equal("20160930", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  def test_shifting_midnight_exist_file
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([*%W"--disable=gems -rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          File.utime(*[Time.mktime(2014, 1, 2, 0, 0, 0)]*2, log)
-
-          Time.now = Time.mktime(2014, 1, 2, 23, 59, 59, 999000)
-          dev = Logger::LogDevice.new(log, shift_age: 'daily')
-          dev.write("#{Time.now} hello-1\n")
-          dev.close
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.mktime(2014, 1, 3, 1, 1, 1)
-          dev = Logger::LogDevice.new(log, shift_age: 'daily')
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close
-        end
-      end;
-
-      bug = '[GH-539]'
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      assert_file.for(bug).exist?(log+".20140102")
-      assert_match(/hello-1/, File.read(log+".20140102"), bug)
-    end
-  end
-
-  env_tz_works = /linux|darwin|freebsd/ =~ RUBY_PLATFORM # borrow from test/ruby/test_time_tz.rb
-
-  def test_shifting_weekly_exist_file
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2015, 12, 14, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'weekly')
-
-          Time.now = Time.utc(2015, 12, 19, 12, 34, 56)
-          dev.write("#{Time.now} hello-1\n")
-          dev.close
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2015, 12, 20, 0, 1, 1)
-          dev = Logger::LogDevice.new("log", shift_age: 'weekly')
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2015-12-19", cont[/^[-\d]+/])
-      assert_equal("20151219", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  def test_shifting_monthly_exist_file
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2015, 12, 14, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'monthly')
-
-          Time.now = Time.utc(2015, 12, 31, 12, 34, 56)
-          dev.write("#{Time.now} hello-1\n")
-          dev.close
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2016, 1, 1, 0, 1, 1)
-          dev = Logger::LogDevice.new("log", shift_age: 'monthly')
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2015-12-31", cont[/^[-\d]+/])
-      assert_equal("20151231", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  private
-
-  def run_children(n, args, src)
-    r, w = IO.pipe
-    [w, *(1..n).map do
-       f = IO.popen([EnvUtil.rubybin, *%w[--disable=gems -rlogger -], *args], "w", err: w)
-       f.puts(src)
-       f
-     end].each(&:close)
-    stderr = r.read
-    r.close
-    stderr
-  end
-end
diff --git a/test/mri/logger/test_logger.rb b/test/mri/logger/test_logger.rb
deleted file mode 100644
index 2023553a6c1..00000000000
--- a/test/mri/logger/test_logger.rb
+++ /dev/null
@@ -1,402 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-require 'tempfile'
-
-class TestLogger < Test::Unit::TestCase
-  include Logger::Severity
-
-  def setup
-    @logger = Logger.new(nil)
-  end
-
-  class Log
-    attr_reader :label, :datetime, :pid, :severity, :progname, :msg
-    def initialize(line)
-      /\A(\w+), \[([^#]*) #(\d+)\]\s+(\w+) -- (\w*): ([\x0-\xff]*)/ =~ line
-      @label, @datetime, @pid, @severity, @progname, @msg = $1, $2, $3, $4, $5, $6
-    end
-  end
-
-  def log_add(logger, severity, msg, progname = nil, &block)
-    log(logger, :add, severity, msg, progname, &block)
-  end
-
-  def log(logger, msg_id, *arg, &block)
-    Log.new(log_raw(logger, msg_id, *arg, &block))
-  end
-
-  def log_raw(logger, msg_id, *arg, &block)
-    Tempfile.create(File.basename(__FILE__) + '.log') {|logdev|
-      logger.instance_eval { @logdev = Logger::LogDevice.new(logdev) }
-      logger.__send__(msg_id, *arg, &block)
-      logdev.rewind
-      logdev.read
-    }
-  end
-
-  def test_level
-    @logger.level = UNKNOWN
-    assert_equal(UNKNOWN, @logger.level)
-    @logger.level = INFO
-    assert_equal(INFO, @logger.level)
-    @logger.sev_threshold = ERROR
-    assert_equal(ERROR, @logger.sev_threshold)
-    @logger.sev_threshold = WARN
-    assert_equal(WARN, @logger.sev_threshold)
-    assert_equal(WARN, @logger.level)
-
-    @logger.level = DEBUG
-    assert(@logger.debug?)
-    assert(@logger.info?)
-    @logger.level = INFO
-    assert(!@logger.debug?)
-    assert(@logger.info?)
-    assert(@logger.warn?)
-    @logger.level = WARN
-    assert(!@logger.info?)
-    assert(@logger.warn?)
-    assert(@logger.error?)
-    @logger.level = ERROR
-    assert(!@logger.warn?)
-    assert(@logger.error?)
-    assert(@logger.fatal?)
-    @logger.level = FATAL
-    assert(!@logger.error?)
-    assert(@logger.fatal?)
-    @logger.level = UNKNOWN
-    assert(!@logger.error?)
-    assert(!@logger.fatal?)
-  end
-
-  def test_symbol_level
-    logger_symbol_levels = {
-      debug:   DEBUG,
-      info:    INFO,
-      warn:    WARN,
-      error:   ERROR,
-      fatal:   FATAL,
-      unknown: UNKNOWN,
-      DEBUG:   DEBUG,
-      INFO:    INFO,
-      WARN:    WARN,
-      ERROR:   ERROR,
-      FATAL:   FATAL,
-      UNKNOWN: UNKNOWN,
-    }
-    logger_symbol_levels.each do |symbol, level|
-      @logger.level = symbol
-      assert(@logger.level == level)
-    end
-    assert_raise(ArgumentError) { @logger.level = :something_wrong }
-  end
-
-  def test_string_level
-    logger_string_levels = {
-      'debug'   => DEBUG,
-      'info'    => INFO,
-      'warn'    => WARN,
-      'error'   => ERROR,
-      'fatal'   => FATAL,
-      'unknown' => UNKNOWN,
-      'DEBUG'   => DEBUG,
-      'INFO'    => INFO,
-      'WARN'    => WARN,
-      'ERROR'   => ERROR,
-      'FATAL'   => FATAL,
-      'UNKNOWN' => UNKNOWN,
-    }
-    logger_string_levels.each do |string, level|
-      @logger.level = string
-      assert(@logger.level == level)
-    end
-    assert_raise(ArgumentError) { @logger.level = 'something_wrong' }
-  end
-
-  def test_reraise_write_errors
-    c = Object.new
-    e = Class.new(StandardError)
-    c.define_singleton_method(:write){|*| raise e}
-    c.define_singleton_method(:close){}
-    logger = Logger.new(c, :reraise_write_errors=>[e])
-    assert_raise(e) { logger.warn('foo') }
-  end
-
-  def test_progname
-    assert_nil(@logger.progname)
-    @logger.progname = "name"
-    assert_equal("name", @logger.progname)
-  end
-
-  def test_datetime_format
-    verbose, $VERBOSE = $VERBOSE, false
-    dummy = STDERR
-    logger = Logger.new(dummy)
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.\s*\d+$/, log.datetime)
-    logger.datetime_format = "%d%b%Y@%H:%M:%S"
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^\d\d\w\w\w\d\d\d\d@\d\d:\d\d:\d\d$/, log.datetime)
-    logger.datetime_format = ""
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^$/, log.datetime)
-  ensure
-    $VERBOSE = verbose
-  end
-
-  def test_formatter
-    dummy = STDERR
-    logger = Logger.new(dummy)
-    # default
-    log = log(logger, :info, "foo")
-    assert_equal("foo\n", log.msg)
-    # config
-    logger.formatter = proc { |severity, timestamp, progname, msg|
-      "#{severity}:#{msg}\n\n"
-    }
-    line = log_raw(logger, :info, "foo")
-    assert_equal("INFO:foo\n\n", line)
-    # recover
-    logger.formatter = nil
-    log = log(logger, :info, "foo")
-    assert_equal("foo\n", log.msg)
-    # again
-    o = Object.new
-    def o.call(severity, timestamp, progname, msg)
-      "<<#{severity}-#{msg}>>\n"
-    end
-    logger.formatter = o
-    line = log_raw(logger, :info, "foo")
-    assert_equal("<""<INFO-foo>>\n", line)
-  end
-
-  def test_initialize
-    logger = Logger.new(STDERR)
-    assert_nil(logger.progname)
-    assert_equal(DEBUG, logger.level)
-    assert_nil(logger.datetime_format)
-  end
-
-  def test_initialize_with_level
-    # default
-    logger = Logger.new(STDERR)
-    assert_equal(Logger::DEBUG, logger.level)
-    # config
-    logger = Logger.new(STDERR, level: :info)
-    assert_equal(Logger::INFO, logger.level)
-  end
-
-  def test_initialize_with_progname
-    # default
-    logger = Logger.new(STDERR)
-    assert_equal(nil, logger.progname)
-    # config
-    logger = Logger.new(STDERR, progname: :progname)
-    assert_equal(:progname, logger.progname)
-  end
-
-  def test_initialize_with_formatter
-    # default
-    logger = Logger.new(STDERR)
-    log = log(logger, :info, "foo")
-    assert_equal("foo\n", log.msg)
-    # config
-    logger = Logger.new(STDERR, formatter: proc { |severity, timestamp, progname, msg|
-      "#{severity}:#{msg}\n\n"
-    })
-    line = log_raw(logger, :info, "foo")
-    assert_equal("INFO:foo\n\n", line)
-  end
-
-  def test_initialize_with_datetime_format
-    # default
-    logger = Logger.new(STDERR)
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.\s*\d+$/, log.datetime)
-    # config
-    logger = Logger.new(STDERR, datetime_format: "%d%b%Y@%H:%M:%S")
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^\d\d\w\w\w\d\d\d\d@\d\d:\d\d:\d\d$/, log.datetime)
-  end
-
-  def test_reopen
-    logger = Logger.new(STDERR)
-    logger.reopen(STDOUT)
-    assert_equal(STDOUT, logger.instance_variable_get(:@logdev).dev)
-  end
-
-  def test_reopen_nil_logdevice
-    logger = Logger.new(File::NULL)
-    assert_nothing_raised do
-      logger.reopen(STDOUT)
-    end
-  end
-
-  def test_add
-    logger = Logger.new(nil)
-    logger.progname = "my_progname"
-    assert(logger.add(INFO))
-    log = log_add(logger, nil, "msg")
-    assert_equal("ANY", log.severity)
-    assert_equal("my_progname", log.progname)
-    logger.level = WARN
-    assert(logger.log(INFO))
-    assert_nil(log_add(logger, INFO, "msg").msg)
-    log = log_add(logger, WARN, nil) { "msg" }
-    assert_equal("msg\n", log.msg)
-    log = log_add(logger, WARN, "") { "msg" }
-    assert_equal("\n", log.msg)
-    assert_equal("my_progname", log.progname)
-    log = log_add(logger, WARN, nil, "progname?")
-    assert_equal("progname?\n", log.msg)
-    assert_equal("my_progname", log.progname)
-    #
-    logger = Logger.new(nil)
-    log = log_add(logger, INFO, nil, false)
-    assert_equal("false\n", log.msg)
-  end
-
-  def test_add_binary_data_with_binmode_logdev
-    EnvUtil.with_default_internal(Encoding::UTF_8) do
-      begin
-        tempfile = Tempfile.new("logger")
-        tempfile.close
-        filename = tempfile.path
-        File.unlink(filename)
-
-        logger = Logger.new filename, binmode: true
-        logger.level = Logger::DEBUG
-
-        str = +"\x80"
-        str.force_encoding("ASCII-8BIT")
-
-        logger.add Logger::DEBUG, str
-        assert_equal(2, File.binread(filename).split(/\n/).size)
-      ensure
-        logger.close
-        tempfile.unlink
-      end
-    end
-  end
-
-  def test_level_log
-    logger = Logger.new(nil)
-    logger.progname = "my_progname"
-    log = log(logger, :debug, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("DEBUG", log.severity)
-    assert_equal("D", log.label)
-    #
-    log = log(logger, :debug) { "msg_block" }
-    assert_equal("msg_block\n", log.msg)
-    assert_equal("my_progname", log.progname)
-    log = log(logger, :debug, "msg_inline")
-    assert_equal("msg_inline\n", log.msg)
-    assert_equal("my_progname", log.progname)
-    #
-    log = log(logger, :info, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("INFO", log.severity)
-    assert_equal("I", log.label)
-    #
-    log = log(logger, :warn, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("WARN", log.severity)
-    assert_equal("W", log.label)
-    #
-    log = log(logger, :error, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("ERROR", log.severity)
-    assert_equal("E", log.label)
-    #
-    log = log(logger, :fatal, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("FATAL", log.severity)
-    assert_equal("F", log.label)
-    #
-    log = log(logger, :unknown, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("ANY", log.severity)
-    assert_equal("A", log.label)
-  end
-
-  def test_close
-    r, w = IO.pipe
-    assert(!w.closed?)
-    logger = Logger.new(w)
-    logger.close
-    assert(w.closed?)
-    r.close
-  end
-
-  class MyError < StandardError
-  end
-
-  class MyMsg
-    def inspect
-      "my_msg"
-    end
-  end
-
-  def test_format
-    logger = Logger.new(nil)
-    log = log_add(logger, INFO, "msg\n")
-    assert_equal("msg\n\n", log.msg)
-    begin
-      raise MyError.new("excn")
-    rescue MyError => e
-      log = log_add(logger, INFO, e)
-      assert_match(/^excn \(TestLogger::MyError\)/, log.msg)
-      # expects backtrace is dumped across multi lines.  10 might be changed.
-      assert(log.msg.split(/\n/).size >= 10)
-    end
-    log = log_add(logger, INFO, MyMsg.new)
-    assert_equal("my_msg\n", log.msg)
-  end
-
-  def test_lshift
-    r, w = IO.pipe
-    logger = Logger.new(w)
-    logger << "msg"
-    IO.select([r], nil, nil, 0.1)
-    w.close
-    msg = r.read
-    r.close
-    assert_equal("msg", msg)
-    #
-    r, w = IO.pipe
-    logger = Logger.new(w)
-    logger << "msg2\n\n"
-    IO.select([r], nil, nil, 0.1)
-    w.close
-    msg = r.read
-    r.close
-    assert_equal("msg2\n\n", msg)
-  end
-
-  class CustomLogger < Logger
-    def level
-      INFO
-    end
-  end
-
-  def test_overriding_level
-    logger = CustomLogger.new(nil)
-    log = log(logger, :info) { "msg" }
-    assert_equal "msg\n", log.msg
-    #
-    log = log(logger, :debug) { "msg" }
-    assert_nil log.msg
-  end
-
-  def test_does_not_instantiate_log_device_for_File_NULL
-    l = Logger.new(File::NULL)
-    assert_nil(l.instance_variable_get(:@logdev))
-  end
-end
diff --git a/test/mri/logger/test_logperiod.rb b/test/mri/logger/test_logperiod.rb
deleted file mode 100644
index ee38d877c69..00000000000
--- a/test/mri/logger/test_logperiod.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require "logger"
-require "time"
-
-class TestLogPeriod < Test::Unit::TestCase
-  def test_next_rotate_time
-    time = Time.parse("2019-07-18 13:52:02")
-
-    assert_next_rotate_time_words(time, "2019-07-19 00:00:00", ["daily", :daily])
-    assert_next_rotate_time_words(time, "2019-07-21 00:00:00", ["weekly", :weekly])
-    assert_next_rotate_time_words(time, "2019-08-01 00:00:00", ["monthly", :monthly])
-
-    assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, "invalid") }
-  end
-
-  def test_next_rotate_time_extreme_cases
-    # First day of Month and Saturday
-    time = Time.parse("2018-07-01 00:00:00")
-
-    assert_next_rotate_time_words(time, "2018-07-02 00:00:00", ["daily", :daily])
-    assert_next_rotate_time_words(time, "2018-07-08 00:00:00", ["weekly", :weekly])
-    assert_next_rotate_time_words(time, "2018-08-01 00:00:00", ["monthly", :monthly])
-
-    assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, "invalid") }
-  end
-
-  def test_previous_period_end
-    time = Time.parse("2019-07-18 13:52:02")
-
-    assert_previous_period_end_words(time, "2019-07-17 23:59:59", ["daily", :daily])
-    assert_previous_period_end_words(time, "2019-07-13 23:59:59", ["weekly", :weekly])
-    assert_previous_period_end_words(time, "2019-06-30 23:59:59", ["monthly", :monthly])
-
-    assert_raise(ArgumentError) { Logger::Period.previous_period_end(time, "invalid") }
-  end
-
-  def test_previous_period_end_extreme_cases
-    # First day of Month and Saturday
-    time = Time.parse("2018-07-01 00:00:00")
-    previous_date = "2018-06-30 23:59:59"
-
-    assert_previous_period_end_words(time, previous_date, ["daily", :daily])
-    assert_previous_period_end_words(time, previous_date, ["weekly", :weekly])
-    assert_previous_period_end_words(time, previous_date, ["monthly", :monthly])
-
-    assert_raise(ArgumentError) { Logger::Period.previous_period_end(time, "invalid") }
-  end
-
-  private
-
-  def assert_next_rotate_time_words(time, next_date, words)
-    assert_time_words(:next_rotate_time, time, next_date, words)
-  end
-
-  def assert_previous_period_end_words(time, previous_date, words)
-    assert_time_words(:previous_period_end, time, previous_date, words)
-  end
-
-  def assert_time_words(method, time, date, words)
-    words.each do |word|
-      daily_result = Logger::Period.public_send(method, time, word)
-      expected_result = Time.parse(date)
-      assert_equal(expected_result, daily_result)
-    end
-  end
-end
diff --git a/test/mri/logger/test_severity.rb b/test/mri/logger/test_severity.rb
deleted file mode 100644
index fb26939e9d9..00000000000
--- a/test/mri/logger/test_severity.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-
-class TestLoggerSeverity < Test::Unit::TestCase
-  include Logger::Severity
-
-  def test_enum
-    logger_levels = Logger.constants
-    levels = ["WARN", "UNKNOWN", "INFO", "FATAL", "DEBUG", "ERROR"]
-    Logger::Severity.constants.each do |level|
-      assert(levels.include?(level.to_s))
-      assert(logger_levels.include?(level))
-    end
-    assert_equal(levels.size, Logger::Severity.constants.size)
-  end
-
-  def test_level_assignment
-    logger = Logger.new(nil)
-
-    Logger::Severity.constants.each do |level|
-      next if level == :UNKNOWN
-
-      logger.send("#{level.downcase}!")
-      assert(logger.level) == Logger::Severity.const_get(level)
-    end
-  end
-
-  def test_fiber_local_level
-    logger = Logger.new(nil)
-    logger.level = INFO # default level
-    other = Logger.new(nil)
-    other.level = ERROR # default level
-
-    assert_equal(other.level, ERROR)
-    logger.with_level(:WARN) do
-      assert_equal(other.level, ERROR)
-      assert_equal(logger.level, WARN)
-
-      logger.with_level(DEBUG) do # verify reentrancy
-        assert_equal(logger.level, DEBUG)
-
-        Fiber.new do
-          assert_equal(logger.level, INFO)
-          logger.with_level(:WARN) do
-            assert_equal(other.level, ERROR)
-            assert_equal(logger.level, WARN)
-          end
-          assert_equal(logger.level, INFO)
-        end.resume
-
-        assert_equal(logger.level, DEBUG)
-      end
-      assert_equal(logger.level, WARN)
-    end
-    assert_equal(logger.level, INFO)
-  end
-
-  def test_thread_local_level
-    subclass = Class.new(Logger) do
-      def level_key
-        Thread.current
-      end
-    end
-
-    logger = subclass.new(nil)
-    logger.level = INFO # default level
-    other = subclass.new(nil)
-    other.level = ERROR # default level
-
-    assert_equal(other.level, ERROR)
-    logger.with_level(:WARN) do
-      assert_equal(other.level, ERROR)
-      assert_equal(logger.level, WARN)
-
-      logger.with_level(DEBUG) do # verify reentrancy
-        assert_equal(logger.level, DEBUG)
-
-        Fiber.new do
-          assert_equal(logger.level, DEBUG)
-          logger.with_level(:WARN) do
-            assert_equal(other.level, ERROR)
-            assert_equal(logger.level, WARN)
-          end
-          assert_equal(logger.level, DEBUG)
-        end.resume
-
-        assert_equal(logger.level, DEBUG)
-      end
-      assert_equal(logger.level, WARN)
-    end
-    assert_equal(logger.level, INFO)
-  end
-end
diff --git a/test/mri/mkmf/test_pkg_config.rb b/test/mri/mkmf/test_pkg_config.rb
index f6a960c7d99..adf5fa6e92b 100644
--- a/test/mri/mkmf/test_pkg_config.rb
+++ b/test/mri/mkmf/test_pkg_config.rb
@@ -46,21 +46,26 @@ def test_pkgconfig_with_option_returns_nil_on_error
   def test_pkgconfig_with_libs_option_returns_output
     pend("skipping because pkg-config is not installed") unless PKG_CONFIG
     expected = ["-L#{@fixtures_lib_dir}", "-ltest1-public"].sort
-    actual = pkg_config("test1", "libs").shellsplit.sort
-    assert_equal(expected, actual, MKMFLOG)
+    actual = pkg_config("test1", "libs")
+    assert_equal_sorted(expected, actual, MKMFLOG)
   end
 
   def test_pkgconfig_with_cflags_option_returns_output
     pend("skipping because pkg-config is not installed") unless PKG_CONFIG
     expected = ["--cflags-other", "-I#{@fixtures_inc_dir}/cflags-I"].sort
-    actual = pkg_config("test1", "cflags").shellsplit.sort
-    assert_equal(expected, actual, MKMFLOG)
+    actual = pkg_config("test1", "cflags")
+    assert_equal_sorted(expected, actual, MKMFLOG)
   end
 
   def test_pkgconfig_with_multiple_options
     pend("skipping because pkg-config is not installed") unless PKG_CONFIG
     expected = ["-L#{@fixtures_lib_dir}", "-ltest1-public", "-ltest1-private"].sort
-    actual = pkg_config("test1", "libs", "static").shellsplit.sort
-    assert_equal(expected, actual, MKMFLOG)
+    actual = pkg_config("test1", "libs", "static")
+    assert_equal_sorted(expected, actual, MKMFLOG)
+  end
+
+  private def assert_equal_sorted(expected, actual, msg = nil)
+    actual = actual.shellsplit.sort if actual
+    assert_equal(expected, actual, msg)
   end
 end
diff --git a/test/mri/mmtk/helper.rb b/test/mri/mmtk/helper.rb
new file mode 100644
index 00000000000..3bede9ed301
--- /dev/null
+++ b/test/mri/mmtk/helper.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "test/unit"
+require "core_assertions"
+
+module MMTk
+  class TestCase < ::Test::Unit::TestCase
+    include Test::Unit::CoreAssertions
+
+    def setup
+      omit "Not running on MMTk" unless using_mmtk?
+
+      @original_timeout_scale = EnvUtil.timeout_scale
+      timeout_scale = ENV["RUBY_TEST_TIMEOUT_SCALE"].to_f
+      EnvUtil.timeout_scale = timeout_scale if timeout_scale > 0
+
+      super
+    end
+
+    def teardown
+      if using_mmtk?
+        EnvUtil.timeout_scale = @original_timeout_scale
+      end
+    end
+
+    private
+
+    def using_mmtk?
+      GC.config[:implementation] == "mmtk"
+    end
+  end
+end
diff --git a/test/mri/mmtk/test_configuration.rb b/test/mri/mmtk/test_configuration.rb
new file mode 100644
index 00000000000..427cd9a0794
--- /dev/null
+++ b/test/mri/mmtk/test_configuration.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+
+module MMTk
+  class TestConfiguration < TestCase
+    def test_MMTK_THREADS
+      assert_separately([{ "MMTK_THREADS" => "5" }], <<~RUBY)
+        assert_equal(5, GC.config[:mmtk_worker_count])
+      RUBY
+
+      assert_separately([{ "MMTK_THREADS" => "1" }], <<~RUBY)
+        assert_equal(1, GC.config[:mmtk_worker_count])
+      RUBY
+    end
+
+    %w(NoGC MarkSweep Immix).each do |plan|
+      define_method(:"test_MMTK_PLAN_#{plan}") do
+        assert_separately([{ "MMTK_PLAN" => plan }], <<~RUBY)
+          assert_equal("#{plan}", GC.config[:mmtk_plan])
+        RUBY
+      end
+    end
+
+    %w(fixed dynamic).each do |heap|
+      define_method(:"test_MMTK_HEAP_MODE_#{heap}") do
+        assert_separately([{ "MMTK_HEAP_MODE" => heap }], <<~RUBY)
+          assert_equal("#{heap}", GC.config[:mmtk_heap_mode])
+        RUBY
+      end
+    end
+
+    def test_MMTK_HEAP_MIN
+      # Defaults to 1MiB
+      assert_separately([], <<~RUBY)
+        assert_equal(1 * 1024 * 1024, GC.config[:mmtk_heap_min])
+      RUBY
+
+      assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "1" }], <<~RUBY)
+        assert_equal(1, GC.config[:mmtk_heap_min])
+      RUBY
+
+      assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "10MiB", "MMTK_HEAP_MAX" => "1GiB" }], <<~RUBY)
+        assert_equal(10 * 1024 * 1024, GC.config[:mmtk_heap_min])
+      RUBY
+    end
+
+    def test_MMTK_HEAP_MIN_is_ignored_for_fixed_heaps
+      assert_separately([{ "MMTK_HEAP_MODE" => "fixed", "MMTK_HEAP_MIN" => "1" }], <<~RUBY)
+        assert_nil(GC.config[:mmtk_heap_min])
+      RUBY
+    end
+
+    def test_MMTK_HEAP_MAX
+      assert_separately([{ "MMTK_HEAP_MODE" => "fixed", "MMTK_HEAP_MAX" => "100MiB" }], <<~RUBY)
+        assert_equal(100 * 1024 * 1024, GC.config[:mmtk_heap_max])
+      RUBY
+    end
+
+    %w(MMTK_THREADS MMTK_HEAP_MIN MMTK_HEAP_MAX MMTK_HEAP_MODE MMTK_PLAN).each do |var|
+      define_method(:"test_invalid_#{var}") do
+        exit_code = assert_in_out_err(
+          [{ var => "foobar" }, "--"],
+          "",
+          [],
+          ["[FATAL] Invalid #{var} foobar"]
+        )
+
+        assert_equal(1, exit_code.exitstatus)
+      end
+    end
+
+    def test_MMTK_HEAP_MIN_greater_than_or_equal_to_MMTK_HEAP_MAX
+      exit_code = assert_in_out_err(
+        [{ "MMTK_HEAP_MIN" => "100MiB", "MMTK_HEAP_MAX" => "10MiB" }, "--"],
+        "",
+        [],
+        ["[FATAL] MMTK_HEAP_MIN(104857600) >= MMTK_HEAP_MAX(10485760)"]
+      )
+
+      assert_equal(1, exit_code.exitstatus)
+
+      exit_code = assert_in_out_err(
+        [{ "MMTK_HEAP_MIN" => "10MiB", "MMTK_HEAP_MAX" => "10MiB" }, "--"],
+        "",
+        [],
+        ["[FATAL] MMTK_HEAP_MIN(10485760) >= MMTK_HEAP_MAX(10485760)"]
+      )
+
+      assert_equal(1, exit_code.exitstatus)
+    end
+  end
+end
diff --git a/test/mri/net/http/test_http.rb b/test/mri/net/http/test_http.rb
index a49cc87e8d2..4e7fa22756c 100644
--- a/test/mri/net/http/test_http.rb
+++ b/test/mri/net/http/test_http.rb
@@ -494,12 +494,10 @@ def _test_post__no_data(http)
 
   def test_s_post
     url = "http://#{config('host')}:#{config('port')}/?q=a"
-    res = assert_warning(/Content-Type did not set/) do
-      Net::HTTP.post(
-              URI.parse(url),
-              "a=x")
-    end
-    assert_equal "application/x-www-form-urlencoded", res["Content-Type"]
+    res = Net::HTTP.post(
+            URI.parse(url),
+            "a=x")
+    assert_equal "application/octet-stream", res["Content-Type"]
     assert_equal "a=x", res.body
     assert_equal url, res["X-request-uri"]
 
@@ -565,14 +563,12 @@ def test_timeout_during_HTTP_session_write
       conn = Net::HTTP.new('localhost', port)
       conn.write_timeout = EnvUtil.apply_timeout_scale(0.01)
       conn.read_timeout = EnvUtil.apply_timeout_scale(0.01) if windows?
-      conn.open_timeout = EnvUtil.apply_timeout_scale(0.1)
+      conn.open_timeout = EnvUtil.apply_timeout_scale(1)
 
       th = Thread.new do
         err = !windows? ? Net::WriteTimeout : Net::ReadTimeout
         assert_raise(err) do
-          assert_warning(/Content-Type did not set/) do
-            conn.post('/', "a"*50_000_000)
-          end
+          conn.post('/', "a"*50_000_000)
         end
       end
       assert th.join(EnvUtil.apply_timeout_scale(10))
@@ -589,9 +585,9 @@ def test_timeout_during_non_chunked_streamed_HTTP_session_write
       port = server.addr[1]
 
       conn = Net::HTTP.new('localhost', port)
-      conn.write_timeout = 0.01
-      conn.read_timeout = 0.01 if windows?
-      conn.open_timeout = 0.1
+      conn.write_timeout = EnvUtil.apply_timeout_scale(0.01)
+      conn.read_timeout = EnvUtil.apply_timeout_scale(0.01) if windows?
+      conn.open_timeout = EnvUtil.apply_timeout_scale(1)
 
       req = Net::HTTP::Post.new('/')
       data = "a"*50_000_000
@@ -1404,3 +1400,28 @@ def test_partial_response
     assert_raise(EOFError) {http.get('/')}
   end
 end
+
+class TestNetHTTPInRactor < Test::Unit::TestCase
+  CONFIG = {
+    'host' => '127.0.0.1',
+    'proxy_host' => nil,
+    'proxy_port' => nil,
+  }
+
+  include TestNetHTTPUtils
+
+  def test_get
+    assert_ractor(<<~RUBY, require: 'net/http')
+      expected = #{$test_net_http_data.dump}.b
+      ret = Ractor.new {
+        host = #{config('host').dump}
+        port = #{config('port')}
+        Net::HTTP.start(host, port) { |http|
+          res = http.get('/')
+          res.body
+        }
+      }.value
+      assert_equal expected, ret
+    RUBY
+  end
+end if defined?(Ractor) && Ractor.method_defined?(:value)
diff --git a/test/mri/net/http/test_http_request.rb b/test/mri/net/http/test_http_request.rb
index 7fd82b03539..9f5cf4f8f56 100644
--- a/test/mri/net/http/test_http_request.rb
+++ b/test/mri/net/http/test_http_request.rb
@@ -74,6 +74,18 @@ def test_initialize_GET_uri
     assert_equal "/foo", req.path
     assert_equal "example.com", req['Host']
 
+    req = Net::HTTP::Get.new(URI("https://203.0.113.1/foo"))
+    assert_equal "/foo", req.path
+    assert_equal "203.0.113.1", req['Host']
+
+    req = Net::HTTP::Get.new(URI("https://203.0.113.1:8000/foo"))
+    assert_equal "/foo", req.path
+    assert_equal "203.0.113.1:8000", req['Host']
+
+    req = Net::HTTP::Get.new(URI("https://[2001:db8::1]:8000/foo"))
+    assert_equal "/foo", req.path
+    assert_equal "[2001:db8::1]:8000", req['Host']
+
     assert_raise(ArgumentError){ Net::HTTP::Get.new(URI("urn:ietf:rfc:7231")) }
     assert_raise(ArgumentError){ Net::HTTP::Get.new(URI("http://")) }
   end
@@ -89,5 +101,25 @@ def test_header_set
                          'Bug #7831 - do not decode content if the user overrides'
   end if Net::HTTP::HAVE_ZLIB
 
+  def test_update_uri
+    req = Net::HTTP::Get.new(URI.parse("http://203.0.113.1"))
+    req.update_uri("test", 8080, false)
+    assert_equal "203.0.113.1", req.uri.host
+    assert_equal 8080, req.uri.port
+
+    req = Net::HTTP::Get.new(URI.parse("http://203.0.113.1:2020"))
+    req.update_uri("test", 8080, false)
+    assert_equal "203.0.113.1", req.uri.host
+    assert_equal 8080, req.uri.port
+
+    req = Net::HTTP::Get.new(URI.parse("http://[2001:db8::1]"))
+    req.update_uri("test", 8080, false)
+    assert_equal "[2001:db8::1]", req.uri.host
+    assert_equal 8080, req.uri.port
+
+    req = Net::HTTP::Get.new(URI.parse("http://[2001:db8::1]:2020"))
+    req.update_uri("test", 8080, false)
+    assert_equal "[2001:db8::1]", req.uri.host
+    assert_equal 8080, req.uri.port
+  end
 end
-
diff --git a/test/mri/net/http/test_https.rb b/test/mri/net/http/test_https.rb
index e860c8745ed..f5b21b901ff 100644
--- a/test/mri/net/http/test_https.rb
+++ b/test/mri/net/http/test_https.rb
@@ -7,6 +7,8 @@
   # should skip this test
 end
 
+return unless defined?(OpenSSL::SSL)
+
 class TestNetHTTPS < Test::Unit::TestCase
   include TestNetHTTPUtils
 
@@ -19,7 +21,6 @@ def self.read_fixture(key)
   CA_CERT = OpenSSL::X509::Certificate.new(read_fixture("cacert.pem"))
   SERVER_KEY = OpenSSL::PKey.read(read_fixture("server.key"))
   SERVER_CERT = OpenSSL::X509::Certificate.new(read_fixture("server.crt"))
-  DHPARAMS = OpenSSL::PKey::DH.new(read_fixture("dhparams.pem"))
   TEST_STORE = OpenSSL::X509::Store.new.tap {|s| s.add_cert(CA_CERT) }
 
   CONFIG = {
@@ -29,25 +30,16 @@ def self.read_fixture(key)
     'ssl_enable' => true,
     'ssl_certificate' => SERVER_CERT,
     'ssl_private_key' => SERVER_KEY,
-    'ssl_tmp_dh_callback' => proc { DHPARAMS },
   }
 
   def test_get
     http = Net::HTTP.new(HOST, config("port"))
     http.use_ssl = true
     http.cert_store = TEST_STORE
-    certs = []
-    http.verify_callback = Proc.new do |preverify_ok, store_ctx|
-      certs << store_ctx.current_cert
-      preverify_ok
-    end
     http.request_get("/") {|res|
       assert_equal($test_net_http_data, res.body)
+      assert_equal(SERVER_CERT.to_der, http.peer_cert.to_der)
     }
-    # TODO: OpenSSL 1.1.1h seems to yield only SERVER_CERT; need to check the incompatibility
-    certs.zip([CA_CERT, SERVER_CERT][-certs.size..-1]) do |actual, expected|
-      assert_equal(expected.to_der, actual.to_der)
-    end
   end
 
   def test_get_SNI
@@ -55,18 +47,10 @@ def test_get_SNI
     http.ipaddr = config('host')
     http.use_ssl = true
     http.cert_store = TEST_STORE
-    certs = []
-    http.verify_callback = Proc.new do |preverify_ok, store_ctx|
-      certs << store_ctx.current_cert
-      preverify_ok
-    end
     http.request_get("/") {|res|
       assert_equal($test_net_http_data, res.body)
+      assert_equal(SERVER_CERT.to_der, http.peer_cert.to_der)
     }
-    # TODO: OpenSSL 1.1.1h seems to yield only SERVER_CERT; need to check the incompatibility
-    certs.zip([CA_CERT, SERVER_CERT][-certs.size..-1]) do |actual, expected|
-      assert_equal(expected.to_der, actual.to_der)
-    end
   end
 
   def test_get_SNI_proxy
@@ -78,11 +62,6 @@ def test_get_SNI_proxy
         http.ipaddr = "192.0.2.1"
         http.use_ssl = true
         http.cert_store = TEST_STORE
-        certs = []
-        http.verify_callback = Proc.new do |preverify_ok, store_ctx|
-          certs << store_ctx.current_cert
-          preverify_ok
-        end
         begin
           http.start
         rescue EOFError
@@ -114,11 +93,6 @@ def test_get_SNI_failure
       http.ipaddr = config('host')
       http.use_ssl = true
       http.cert_store = TEST_STORE
-      certs = []
-      http.verify_callback = Proc.new do |preverify_ok, store_ctx|
-        certs << store_ctx.current_cert
-        preverify_ok
-      end
       @log_tester = lambda {|_| }
       assert_raise(OpenSSL::SSL::SSLError){ http.start }
     end
@@ -135,10 +109,6 @@ def test_post
   end
 
   def test_session_reuse
-    # FIXME: The new_session_cb is known broken for clients in OpenSSL 1.1.0h.
-    # See https://github.com/openssl/openssl/pull/5967 for details.
-    omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 1.1.0h')
-
     http = Net::HTTP.new(HOST, config("port"))
     http.use_ssl = true
     http.cert_store = TEST_STORE
@@ -165,9 +135,6 @@ def test_session_reuse
   end
 
   def test_session_reuse_but_expire
-    # FIXME: The new_session_cb is known broken for clients in OpenSSL 1.1.0h.
-    omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 1.1.0h')
-
     http = Net::HTTP.new(HOST, config("port"))
     http.use_ssl = true
     http.cert_store = TEST_STORE
@@ -240,6 +207,21 @@ def test_certificate_verify_failure
     assert_match(/certificate verify failed/, ex.message)
   end
 
+  def test_verify_callback
+    http = Net::HTTP.new(HOST, config("port"))
+    http.use_ssl = true
+    http.cert_store = TEST_STORE
+    certs = []
+    http.verify_callback = Proc.new {|preverify_ok, store_ctx|
+      certs << store_ctx.current_cert
+      preverify_ok
+    }
+    http.request_get("/") {|res|
+      assert_equal($test_net_http_data, res.body)
+    }
+    assert_equal(SERVER_CERT.to_der, certs.last.to_der)
+  end
+
   def test_timeout_during_SSL_handshake
     bug4246 = "expected the SSL connection to have timed out but have not. [ruby-core:34203]"
 
@@ -275,9 +257,7 @@ def test_max_version
     http = Net::HTTP.new(HOST, config("port"))
     http.use_ssl = true
     http.max_version = :SSL2
-    http.verify_callback = Proc.new do |preverify_ok, store_ctx|
-      true
-    end
+    http.cert_store = TEST_STORE
     @log_tester = lambda {|_| }
     ex = assert_raise(OpenSSL::SSL::SSLError){
       http.request_get("/") {|res| }
@@ -286,7 +266,25 @@ def test_max_version
     assert_match(re_msg, ex.message)
   end
 
-end if defined?(OpenSSL::SSL)
+  def test_ractor
+    assert_ractor(<<~RUBY, require: 'net/https')
+      expected = #{$test_net_http_data.dump}.b
+      ret = Ractor.new {
+        host = #{HOST.dump}
+        port = #{config('port')}
+        ca_cert_pem = #{CA_CERT.to_pem.dump}
+        cert_store = OpenSSL::X509::Store.new.tap { |s|
+          s.add_cert(OpenSSL::X509::Certificate.new(ca_cert_pem))
+        }
+        Net::HTTP.start(host, port, use_ssl: true, cert_store: cert_store) { |http|
+          res = http.get('/')
+          res.body
+        }
+      }.value
+      assert_equal expected, ret
+    RUBY
+  end if defined?(Ractor) && Ractor.method_defined?(:value)
+end
 
 class TestNetHTTPSIdentityVerifyFailure < Test::Unit::TestCase
   include TestNetHTTPUtils
@@ -300,7 +298,6 @@ def self.read_fixture(key)
   CA_CERT = OpenSSL::X509::Certificate.new(read_fixture("cacert.pem"))
   SERVER_KEY = OpenSSL::PKey.read(read_fixture("server.key"))
   SERVER_CERT = OpenSSL::X509::Certificate.new(read_fixture("server.crt"))
-  DHPARAMS = OpenSSL::PKey::DH.new(read_fixture("dhparams.pem"))
   TEST_STORE = OpenSSL::X509::Store.new.tap {|s| s.add_cert(CA_CERT) }
 
   CONFIG = {
@@ -310,7 +307,6 @@ def self.read_fixture(key)
     'ssl_enable' => true,
     'ssl_certificate' => SERVER_CERT,
     'ssl_private_key' => SERVER_KEY,
-    'ssl_tmp_dh_callback' => proc { DHPARAMS },
   }
 
   def test_identity_verify_failure
@@ -326,4 +322,4 @@ def test_identity_verify_failure
     re_msg = /certificate verify failed|hostname \"#{HOST_IP}\" does not match/
     assert_match(re_msg, ex.message)
   end
-end if defined?(OpenSSL::SSL)
+end
diff --git a/test/mri/net/http/test_https_proxy.rb b/test/mri/net/http/test_https_proxy.rb
index f4c6aa0b6a0..237c16e64de 100644
--- a/test/mri/net/http/test_https_proxy.rb
+++ b/test/mri/net/http/test_https_proxy.rb
@@ -5,14 +5,10 @@
 end
 require 'test/unit'
 
+return unless defined?(OpenSSL::SSL)
+
 class HTTPSProxyTest < Test::Unit::TestCase
   def test_https_proxy_authentication
-    begin
-      OpenSSL
-    rescue LoadError
-      omit 'autoload problem. see [ruby-dev:45021][Bug #5786]'
-    end
-
     TCPServer.open("127.0.0.1", 0) {|serv|
       _, port, _, _ = serv.addr
       client_thread = Thread.new {
@@ -50,12 +46,6 @@ def read_fixture(key)
   end
 
   def test_https_proxy_ssl_connection
-    begin
-      OpenSSL
-    rescue LoadError
-      omit 'autoload problem. see [ruby-dev:45021][Bug #5786]'
-    end
-
     TCPServer.open("127.0.0.1", 0) {|tcpserver|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.key = OpenSSL::PKey.read(read_fixture("server.key"))
@@ -91,4 +81,4 @@ def test_https_proxy_ssl_connection
       assert_join_threads([client_thread, server_thread])
     }
   end
-end if defined?(OpenSSL)
+end
diff --git a/test/mri/net/http/utils.rb b/test/mri/net/http/utils.rb
index 6e7106cd487..0b9e440e7cb 100644
--- a/test/mri/net/http/utils.rb
+++ b/test/mri/net/http/utils.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'socket'
-require 'openssl'
 
 module TestNetHTTPUtils
 
@@ -14,17 +13,16 @@ def initialize(config, &block)
       @procs = {}
 
       if @config['ssl_enable']
+        require 'openssl'
         context = OpenSSL::SSL::SSLContext.new
         context.cert = @config['ssl_certificate']
         context.key = @config['ssl_private_key']
-        context.tmp_dh_callback = @config['ssl_tmp_dh_callback']
         @ssl_server = OpenSSL::SSL::SSLServer.new(@server, context)
       end
 
       @block = block
     end
 
-    # NOTE: patched by JRuby
     def start
       @thread = Thread.new do
         loop do
@@ -43,7 +41,6 @@ def run(socket)
       handle_request(socket)
     end
 
-    # NOTE: patched by JRuby
     def shutdown
       @thread&.kill
       @thread&.join
@@ -73,6 +70,11 @@ def handle_request(socket)
         socket.write "HTTP/1.1 100 Continue\r\n\r\n"
       end
 
+      # Set default Content-Type if not provided
+      if !headers['Content-Type'] && (method == 'POST' || method == 'PUT' || method == 'PATCH')
+        headers['Content-Type'] = 'application/octet-stream'
+      end
+
       req = Request.new(method, path, headers, socket)
       if @procs.key?(req.path) || @procs.key?("#{req.path}/")
         proc = @procs[req.path] || @procs["#{req.path}/"]
@@ -308,16 +310,18 @@ def handle_post(path, headers, socket)
     scheme = headers['X-Request-Scheme'] || 'http'
     host = @config['host']
     port = socket.addr[1]
-    charset = parse_content_type(headers['Content-Type'])[1]
+    content_type = headers['Content-Type'] || 'application/octet-stream'
+    charset = parse_content_type(content_type)[1]
     path = "#{scheme}://#{host}:#{port}#{path}"
     path = path.encode(charset) if charset
-    response = "HTTP/1.1 200 OK\r\nContent-Type: #{headers['Content-Type']}\r\nContent-Length: #{body.bytesize}\r\nX-request-uri: #{path}\r\n\r\n#{body}"
+    response = "HTTP/1.1 200 OK\r\nContent-Type: #{content_type}\r\nContent-Length: #{body.bytesize}\r\nX-request-uri: #{path}\r\n\r\n#{body}"
     socket.print(response)
   end
 
   def handle_patch(path, headers, socket)
     body = socket.read(headers['Content-Length'].to_i)
-    response = "HTTP/1.1 200 OK\r\nContent-Type: #{headers['Content-Type']}\r\nContent-Length: #{body.bytesize}\r\n\r\n#{body}"
+    content_type = headers['Content-Type'] || 'application/octet-stream'
+    response = "HTTP/1.1 200 OK\r\nContent-Type: #{content_type}\r\nContent-Length: #{body.bytesize}\r\n\r\n#{body}"
     socket.print(response)
   end
 
diff --git a/test/mri/objspace/test_objspace.rb b/test/mri/objspace/test_objspace.rb
index e0dde3621cc..3d5b2a4d2ae 100644
--- a/test/mri/objspace/test_objspace.rb
+++ b/test/mri/objspace/test_objspace.rb
@@ -32,7 +32,7 @@ def test_memsize_of_root_shared_string
     a = "a" * GC::INTERNAL_CONSTANTS[:RVARGC_MAX_ALLOCATE_SIZE]
     b = a.dup
     c = nil
-    ObjectSpace.each_object(String) {|x| break c = x if x == a and x.frozen?}
+    ObjectSpace.each_object(String) {|x| break c = x if a == x and x.frozen?}
     rv_size = GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE]
     assert_equal([rv_size, rv_size, a.length + 1 + rv_size], [a, b, c].map {|x| ObjectSpace.memsize_of(x)})
   end
@@ -203,8 +203,9 @@ def test_trace_object_allocations
       assert_equal(line1,    ObjectSpace.allocation_sourceline(o1))
       assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(o1))
       assert_equal(c1,       ObjectSpace.allocation_generation(o1))
-      assert_equal(Class.name, ObjectSpace.allocation_class_path(o1))
-      assert_equal(:new,       ObjectSpace.allocation_method_id(o1))
+      # These assertions fail under coverage measurement: https://bugs.ruby-lang.org/issues/21298
+      #assert_equal(self.class.name, ObjectSpace.allocation_class_path(o1))
+      #assert_equal(__method__,       ObjectSpace.allocation_method_id(o1))
 
       assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(o2))
       assert_equal(line2,    ObjectSpace.allocation_sourceline(o2))
@@ -287,6 +288,33 @@ def test_trace_object_allocations_gc_stress
     assert true # success
   end
 
+  def test_trace_object_allocations_with_other_tracepoint
+    # Test that ObjectSpace.trace_object_allocations isn't changed by changes
+    # to another tracepoint
+    line_tp = TracePoint.new(:line) { }
+
+    ObjectSpace.trace_object_allocations_start
+
+    obj1 = Object.new; line1 = __LINE__
+    assert_equal __FILE__, ObjectSpace.allocation_sourcefile(obj1)
+    assert_equal line1, ObjectSpace.allocation_sourceline(obj1)
+
+    line_tp.enable
+
+    obj2 = Object.new; line2 = __LINE__
+    assert_equal __FILE__, ObjectSpace.allocation_sourcefile(obj2)
+    assert_equal line2, ObjectSpace.allocation_sourceline(obj2)
+
+    line_tp.disable
+
+    obj3 = Object.new; line3 = __LINE__
+    assert_equal __FILE__, ObjectSpace.allocation_sourcefile(obj3)
+    assert_equal line3, ObjectSpace.allocation_sourceline(obj3)
+  ensure
+    ObjectSpace.trace_object_allocations_stop
+    ObjectSpace.trace_object_allocations_clear
+  end
+
   def test_trace_object_allocations_compaction
     omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
 
@@ -308,7 +336,7 @@ def test_trace_object_allocations_compaction
   def test_trace_object_allocations_compaction_freed_pages
     omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
 
-    assert_normal_exit(<<~RUBY)
+    assert_normal_exit(<<~RUBY, timeout: 60)
       require "objspace"
 
       objs = []
@@ -332,11 +360,25 @@ def test_dump_flags
     # Ensure that the fstring is promoted to old generation
     4.times { GC.start }
     info = ObjectSpace.dump("foo".freeze)
-    assert_match(/"wb_protected":true, "old":true/, info)
+    assert_include(info, '"wb_protected":true')
+    assert_include(info, '"age":3')
+    assert_include(info, '"old":true')
     assert_match(/"fstring":true/, info)
     JSON.parse(info) if defined?(JSON)
   end
 
+  def test_dump_flag_age
+    EnvUtil.without_gc do
+      o = Object.new
+
+      assert_include(ObjectSpace.dump(o), '"age":0')
+
+      GC.start
+
+      assert_include(ObjectSpace.dump(o), '"age":1')
+    end
+  end
+
   if defined?(RubyVM::Shape)
     class TooComplex; end
 
@@ -486,6 +528,20 @@ def test_dump_dynamic_symbol
     assert_match(/"value":"foobar\h+"/, dump)
   end
 
+  def test_dump_outputs_object_id
+    obj = Object.new
+
+    # Doesn't output object_id when it has not been seen
+    dump = ObjectSpace.dump(obj)
+    assert_not_include(dump, "\"object_id\"")
+
+    id = obj.object_id
+
+    # Outputs object_id when it has been seen
+    dump = ObjectSpace.dump(obj)
+    assert_include(dump, "\"object_id\":#{id}")
+  end
+
   def test_dump_includes_imemo_type
     assert_in_out_err(%w[-robjspace], "#{<<-"begin;"}\n#{<<-'end;'}") do |output, error|
       begin;
@@ -771,6 +827,27 @@ def dump_my_heap_please
     end
   end
 
+  def test_dump_all_with_ractors
+    assert_ractor("#{<<-"begin;"}#{<<-'end;'}")
+    begin;
+      require "objspace"
+      require "tempfile"
+      require "json"
+      rs = 4.times.map do
+        Ractor.new do
+          Tempfile.create do |f|
+            ObjectSpace.dump_all(output: f)
+            f.close
+            File.readlines(f.path).each do |line|
+              JSON.parse(line)
+            end
+          end
+        end
+      end
+      rs.each(&:join)
+    end;
+  end
+
   def test_dump_uninitialized_file
     assert_in_out_err(%[-robjspace], <<-RUBY) do |(output), (error)|
       puts ObjectSpace.dump(File.allocate)
@@ -949,6 +1026,13 @@ def test_escape_class_name
     assert_equal class_name, JSON.parse(json)["name"]
   end
 
+  def test_dump_include_shareable
+    omit 'Not provided by mmtk' if RUBY_DESCRIPTION.include?("+GC[mmtk]")
+
+    assert_include(ObjectSpace.dump(ENV), '"shareable":true')
+    assert_not_include(ObjectSpace.dump([]), '"shareable":true')
+  end
+
   def test_utf8_method_names
     name = "utf8_❨╯°□°❩╯︵┻━┻"
     obj = ObjectSpace.trace_object_allocations do
diff --git a/test/mri/objspace/test_ractor.rb b/test/mri/objspace/test_ractor.rb
index 4901eeae2e1..996d83fbd21 100644
--- a/test/mri/objspace/test_ractor.rb
+++ b/test/mri/objspace/test_ractor.rb
@@ -5,12 +5,78 @@ def test_tracing_does_not_crash
     assert_ractor(<<~RUBY, require: 'objspace')
       ObjectSpace.trace_object_allocations do
         r = Ractor.new do
-          obj = 'a' * 1024
-          Ractor.yield obj
+          _obj = 'a' * 1024
         end
 
-        r.take
-        r.take
+        r.join
+      end
+    RUBY
+  end
+
+  def test_undefine_finalizer
+    assert_ractor(<<~'RUBY', require: 'objspace')
+      def fin
+        ->(id) { }
+      end
+      ractors = 5.times.map do
+        Ractor.new do
+          10_000.times do
+            o = Object.new
+            ObjectSpace.define_finalizer(o, fin)
+            ObjectSpace.undefine_finalizer(o)
+          end
+        end
+      end
+
+      ractors.each(&:join)
+    RUBY
+  end
+
+  def test_copy_finalizer
+    assert_ractor(<<~'RUBY', require: 'objspace')
+      def fin
+        ->(id) { }
+      end
+      OBJ = Object.new
+      ObjectSpace.define_finalizer(OBJ, fin)
+      OBJ.freeze
+
+      ractors = 5.times.map do
+        Ractor.new do
+          10_000.times do
+            OBJ.clone
+          end
+        end
+      end
+
+      ractors.each(&:join)
+    RUBY
+  end
+
+  def test_trace_object_allocations_with_ractor_tracepoint
+    # Test that ObjectSpace.trace_object_allocations works globally across all Ractors
+    assert_ractor(<<~'RUBY', require: 'objspace')
+      ObjectSpace.trace_object_allocations do
+        obj1 = Object.new; line1 = __LINE__
+        assert_equal __FILE__, ObjectSpace.allocation_sourcefile(obj1)
+        assert_equal line1, ObjectSpace.allocation_sourceline(obj1)
+
+        r = Ractor.new {
+          obj = Object.new; line = __LINE__
+          [line, obj]
+        }
+
+        obj2 = Object.new; line2 = __LINE__
+        assert_equal __FILE__, ObjectSpace.allocation_sourcefile(obj2)
+        assert_equal line2, ObjectSpace.allocation_sourceline(obj2)
+
+        expected_line, ractor_obj = r.value
+        assert_equal __FILE__, ObjectSpace.allocation_sourcefile(ractor_obj)
+        assert_equal expected_line, ObjectSpace.allocation_sourceline(ractor_obj)
+
+        obj3 = Object.new; line3 = __LINE__
+        assert_equal __FILE__, ObjectSpace.allocation_sourcefile(obj3)
+        assert_equal line3, ObjectSpace.allocation_sourceline(obj3)
       end
     RUBY
   end
diff --git a/test/mri/open-uri/utils.rb b/test/mri/open-uri/utils.rb
index 4b7c2b1c519..e7ca64bd1c2 100644
--- a/test/mri/open-uri/utils.rb
+++ b/test/mri/open-uri/utils.rb
@@ -1,6 +1,5 @@
 require 'socket'
 require 'net/http'
-require 'tmpdir'
 begin
   require 'openssl'
 rescue LoadError
@@ -17,7 +16,6 @@ def mount_proc(path, proc)
     @procs[path] = proc
   end
 
-  # NOTE: patched by JRuby
   def start
     @thread = Thread.new do
       loop do
@@ -28,9 +26,9 @@ def start
     end
   end
 
-  # NOTE: patched by JRuby
   def shutdown
     @thread.kill
+    @server.close
   end
 
   private
@@ -162,7 +160,6 @@ def initialize(host, port, auth_proc = nil, log, access_log)
     @access_log = access_log
   end
 
-  # NOTE: patched by JRuby
   def start
     @thread = Thread.new do
       loop do
@@ -182,9 +179,9 @@ def start
     end
   end
 
-  # NOTE: patched by JRuby
   def shutdown
     @thread.kill
+    @server.close
   end
 
   private
@@ -273,7 +270,6 @@ def initialize(cert, key, dh, bind_addr, port, log)
     @ssl_server = OpenSSL::SSL::SSLServer.new(@server, context)
   end
 
-  # NOTE: patched by JRuby
   def start
     @thread = Thread.new do
       loop do
@@ -285,8 +281,8 @@ def start
     end
   end
 
-  # NOTE: patched by JRuby
   def shutdown
+    @thread.kill
     @server.close
   end
 
diff --git a/test/mri/openssl/fixtures/pkey/certificate.der b/test/mri/openssl/fixtures/pkey/certificate.der
deleted file mode 100644
index 7d44df8413a..00000000000
Binary files a/test/mri/openssl/fixtures/pkey/certificate.der and /dev/null differ
diff --git a/test/mri/openssl/fixtures/pkey/dsa1024.pem b/test/mri/openssl/fixtures/pkey/dsa1024.pem
deleted file mode 100644
index 1bf498895e2..00000000000
--- a/test/mri/openssl/fixtures/pkey/dsa1024.pem
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIIBugIBAAKBgQCH9aAoXvWWThIjkA6D+nI1F9ksF9iDq594rkiGNOT9sPDOdB+n
-D+qeeeeloRlj19ymCSADPI0ZLRgkchkAEnY2RnqnhHOjVf/roGgRbW+iQDMbQ9wa
-/pvc6/fAbsu1goE1hBYjm98/sZEeXavj8tR56IXnjF1b6Nx0+sgeUKFKEQIVAMiz
-4BJUFeTtddyM4uadBM7HKLPRAoGAZdLBSYNGiij7vAjesF5mGUKTIgPd+JKuBEDx
-OaBclsgfdoyoF/TMOkIty+PVlYD+//Vl2xnoUEIRaMXHwHfm0r2xUX++oeRaSScg
-YizJdUxe5jvBuBszGPRc/mGpb9YvP0sB+FL1KmuxYmdODfCe51zl8uM/CVhouJ3w
-DjmRGscCgYAuFlfC7p+e8huCKydfcv/beftqjewiOPpQ3u5uI6KPCtCJPpDhs3+4
-IihH2cPsAlqwGF4tlibW1+/z/OZ1AZinPK3y7b2jSJASEaPeEltVzB92hcd1khk2
-jTYcmSsV4VddplOPK9czytR/GbbibxsrhhgZUbd8LPbvIgaiadJ1PgIUBnJ/5vN2
-CVArsEzlPUCbohPvZnE=
------END DSA PRIVATE KEY-----
diff --git a/test/mri/openssl/fixtures/pkey/dsa256.pem b/test/mri/openssl/fixtures/pkey/dsa256.pem
deleted file mode 100644
index d9a407f7368..00000000000
--- a/test/mri/openssl/fixtures/pkey/dsa256.pem
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIH3AgEAAkEAhk2libbY2a8y2Pt21+YPYGZeW6wzaW2yfj5oiClXro9XMR7XWLkE
-9B7XxLNFCS2gmCCdMsMW1HulaHtLFQmB2wIVAM43JZrcgpu6ajZ01VkLc93gu/Ed
-AkAOhujZrrKV5CzBKutKLb0GVyVWmdC7InoNSMZEeGU72rT96IjM59YzoqmD0pGM
-3I1o4cGqg1D1DfM1rQlnN1eSAkBq6xXfEDwJ1mLNxF6q8Zm/ugFYWR5xcX/3wFiT
-b4+EjHP/DbNh9Vm5wcfnDBJ1zKvrMEf2xqngYdrV/3CiGJeKAhRvL57QvJZcQGvn
-ISNX5cMzFHRW3Q==
------END DSA PRIVATE KEY-----
diff --git a/test/mri/openssl/fixtures/pkey/dsa512.pem b/test/mri/openssl/fixtures/pkey/dsa512.pem
deleted file mode 100644
index 962c41cc67f..00000000000
--- a/test/mri/openssl/fixtures/pkey/dsa512.pem
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIH4AgEAAkEA5lB4GvEwjrsMlGDqGsxrbqeFRh6o9OWt6FgTYiEEHaOYhkIxv0Ok
-RZPDNwOG997mDjBnvDJ1i56OmS3MbTnovwIVAJgub/aDrSDB4DZGH7UyarcaGy6D
-AkB9HdFw/3td8K4l1FZHv7TCZeJ3ZLb7dF3TWoGUP003RCqoji3/lHdKoVdTQNuR
-S/m6DlCwhjRjiQ/lBRgCLCcaAkEAjN891JBjzpMj4bWgsACmMggFf57DS0Ti+5++
-Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxXoXi9OAIUBG98h4tilg6S
-55jreJD3Se3slps=
------END DSA PRIVATE KEY-----
diff --git a/test/mri/openssl/fixtures/pkey/empty.der b/test/mri/openssl/fixtures/pkey/empty.der
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/mri/openssl/fixtures/pkey/empty.pem b/test/mri/openssl/fixtures/pkey/empty.pem
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/mri/openssl/fixtures/pkey/fullchain.pem b/test/mri/openssl/fixtures/pkey/fullchain.pem
deleted file mode 100644
index 624785d326a..00000000000
--- a/test/mri/openssl/fixtures/pkey/fullchain.pem
+++ /dev/null
@@ -1,56 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFKTCCBBGgAwIBAgISBFspP+tJfRaC6xprreB4Rp9KMA0GCSqGSIb3DQEBCwUA
-MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMTA0MTcwMjQzMTlaFw0yMTA3MTYwMjQzMTlaMBwxGjAYBgNVBAMT
-EXd3dy5jb2Rlb3Rha3UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx6h5vNPfkkrtYWxn1PWDDLRAwrGmZbkYPttjHBRSwTcd7rsIX4PcSzw9fWxm
-K4vIkAYoKAElIvsSE3xRUjyzMrACfdhK5J8rG25fq94iVyoYaNBQV0WMJkO6X47s
-hGeIKkK91ohR5b2tMw3/z9zELP0TVo2TPG7rYsBZm34myldqDA8yVEBEOa+Qdpda
-9xewPhkkdpAU55qgWTrD21m7vGq9WpsBz4wNKnwVsaugtkRH82VPIfaL4ZI9kox6
-QoPWe/tHUBdlDkuT7ud77eLAWnC/5Clg28/9GU/Z8Nj8SrrKuXL6WUXmxxaAhWUR
-Qx4VblZeuIpwd0nHyP0hz4CWKQIDAQABo4ICTTCCAkkwDgYDVR0PAQH/BAQDAgWg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0G
-A1UdDgQWBBTKiSGZuLFSIG2JPbFSZa9TxMu5WTAfBgNVHSMEGDAWgBQULrMXt1hW
-y65QCUDmH6+dixTCxjBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6
-Ly9yMy5vLmxlbmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL3IzLmkubGVuY3Iu
-b3JnLzAcBgNVHREEFTATghF3d3cuY29kZW90YWt1LmNvbTBMBgNVHSAERTBDMAgG
-BmeBDAECATA3BgsrBgEEAYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3Bz
-LmxldHNlbmNyeXB0Lm9yZzCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB3AJQgvB6O
-1Y1siHMfgosiLA3R2k1ebE+UPWHbTi9YTaLCAAABeN3s/lgAAAQDAEgwRgIhAKFY
-Q+vBe3zyeBazxp8kVN7oLvcQ6Y9PPz199tVhYnEbAiEAhU/xdbQaY/6b93h+7NTF
-sPG7X4lq/3UoNgoXcAVGZgoAdgD2XJQv0XcwIhRUGAgwlFaO400TGTO/3wwvIAvM
-TvFk4wAAAXjd7P5OAAAEAwBHMEUCIQDWd79+jWaGuf3acm5/yV95jL2KvzeGFfdU
-HZlKIeWFmAIgDSZ6ug7AyhYNKjzFV4ZSICln+L4yI92EpOa+8gDG6/0wDQYJKoZI
-hvcNAQELBQADggEBAHIhMYm06lLFmJL+cfIg5fFEmFNdHmmZn88Hypv4/MtmqTKv
-5asF/z3TvhW4hX2+TY+NdcqGT7cZFo/ZF/tS6oBXPgmBYM1dEfp2FAdnGNOySC5Y
-7RC4Uk9TUpP2g101YBmj6dQKQluAwIQk+gO4MSlHE0J0U/lMpjvrLWcuHbV4/xWJ
-IdM+iPq8GeYt5epYmNc7XeRIgv7V3RxDQdBv2OVM5mtPVerdiO0ISrdbe5mvz2+Z
-rhSg+EJNHlmMwcq5HqtMwS8M8Ax+vLmWCOkPWXhyV8wQaQcFjZJfpIGUvCnMTqsh
-kSIYXq2CbSDUUFRFssNN6EdVms0KnmW3BUu0xAk=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
-MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
-AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
-jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
-Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
-U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
-gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
-/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
-oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
-BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
-ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
-p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
-AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
-Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
-LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
-r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
-ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
-S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
-qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
-O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
-UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
------END CERTIFICATE-----
diff --git a/test/mri/openssl/fixtures/pkey/garbage.txt b/test/mri/openssl/fixtures/pkey/garbage.txt
deleted file mode 100644
index 557db03de99..00000000000
--- a/test/mri/openssl/fixtures/pkey/garbage.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello World
diff --git a/test/mri/openssl/fixtures/pkey/mldsa65-1.pem b/test/mri/openssl/fixtures/pkey/mldsa65-1.pem
new file mode 100644
index 00000000000..21f08e3ac60
--- /dev/null
+++ b/test/mri/openssl/fixtures/pkey/mldsa65-1.pem
@@ -0,0 +1,88 @@
+-----BEGIN PRIVATE KEY-----
+MIIP/gIBADALBglghkgBZQMEAxIEgg/qMIIP5gQg6Xunp08Ia0w6d93rvBnXnlYf
+ih3Z+9IDZSRIyAGfjbQEgg/A9DPSakjm2xFsVzCHpfwcUwP5dYpJGRYwG7/eSp8b
+/lJOHPmIHjOAC8jN3xS66UXcouWozGXbmieGjLzNs1HjBaJ0CEw51wQOuPLDg8nj
+Pdesnqu5Ct1sNzqz0K57ixyEPrdPI+Vd7XDNaXfOytZ1d4+yFBC6cGpznQ9CiRYm
+PpFEgUZSg3QzFmB0hREkB4FHhTIUZlckclcxNRRTg4UFUIVTdTcThxVyJSFFInZl
+GEUnKAIEcXBUdmgwMQMhRngCFEIFBIB2BVRjEiEwI3FwAQJEEScySFh0UVdQExeB
+ZDYgIUhlFUYxh1g2V2YRdohodCVgBXYIJRJCQHFGRiI0GGQENkgBFwUGNUeAMlh0
+ZgMhIWRmhyhGVEeAUUOHVVKEZHU4BQdwMjEBIIcQeBYFZhKBdwFjBlQECCJEdoYT
+E3FXYlcECCNIZAF4cTaAQwYxBkd2YRE3FTIYRCYgF2SBUiBCJ1ImFjZSFDCIaAY1
+J1ExVDRRVzFGgiUIV1UBCDcVFmcIM4OGeDIXEyZXaCFzBBeBFQQxcFeIJWBmJCdw
+hWMUdYFiNFAmMIEyKIRYIIeIgHA3AmNTElA3gwVmBUUHERE2AAJHUhQTJQAFAXhY
+QmYDdSZHWFhHQXUkRFBWViQ4VERRF1eEN0I2VzR1dUIxg1Uid2NmcDIWdBAzITEA
+AmJgh3JlgwIREgVoIiEoMCADEGSHFIGHUnJVU2I0CGRxaAR3JUVgAnJQOAQiZ2Vh
+OFM3MIEHUmFzQhcEdzSBhBcYVCgEKCIiWHUBhCVxhkBjRzUzJAhDQ2F3eGdUNTEj
+QQcjY3E3BnR2Q4cWIjJohyd2hCUzOIgSUodmIxY1AmaDFVBQEghncQQYQ2QIcjiB
+ZWNQZGZFhHiBIQcXURQQAVg2RBQQd0aDgGQXE3Q4eHY1iERUVoUTcQIjcmh0UVci
+Rhd4MRI0ZUVHNXEAIDQ2cVIGZYMiB1ZQQSYVMlZBQiAwQHJYCEUBExAjF4QwQBMT
+cjdGVCckJTBFJAcXREMzAlYmhRJXgEVSESFYAAJwFXRyKBZCQwcDIFQkJWUFB4gV
+F2GBiEcVEUAmcWEFREA4dEFDQwhFUQUIcHQRMRGHFTA2g0YmZxIiMjMjAQFgcHYF
+IgJlFyA4RhdRgWY1FVEhM4VoUhiIQkcIeCCFZIESZjVWFjNWQEZTNGUoBiR0cgFn
+hDNIAhIRdXQgaGBxNUdyBUIWAniAZIOHYTIyUYd0YXExBjEShGA1GBQ3FBZVEmEw
+EhhEJQNwRjUyQnSIAVNlQjKDdIEBQQhgdSdxc2RjEmRiFyY2RRYicjQCh3AhNSZo
+QzRlGDaGMzCIhRcjIocxN4cwM2gRA2WIN0NyaHR1NRVRAXIkFTR0J2NCCCEHKHYn
+FSYGF3QXBwhDYUZEJmdHEWAlBCIyVRFBR2NSNgJwZgBoAgMjcYQRNAFjI2ZVVgEE
+V3Y1eIREhFc1ABVEGGcUNGRnWAJYOAdlZmgWQlZncWJVNFNkBwOGRiAmJGQGNlIx
+NwNwZ3WBaGIBdiNlMEVXFwFkZRRCE3ZwFxgQWFKHVxOBdxJHJBhSF0d4IlAgIRUY
+UXdCWIQIKDGAhAIoVBAhdXU3AHKCiCBkF4KEhhRyU2JTIIdwdGYSCDcXIWM4QYIY
+NoCFNSESeBMnciUkMxV1RYNzYUSGggMIgWVCM3aAMRcCITMgKERIEjgiUkIlNoUT
+JkMjMzc3dxV1WGOCZRJSMzIhGIAgBEgicDM2CFclACBlBoYyhyNgJoOIExIoY3Qh
+EFRQhFYBZoJERhNoQCIUaAIARgiCQSUXYkUgR4RnYAczh0ECOCeGdBJXExNohzZH
+GFMAE2MAUUZ3NzF2FldoGCKEIzJzGDFHd3KAU4ZHUichAYUmEYVAdShYFlh3FIIl
+UzQYdScUdlAAglVjBiNCJYGBKHVTNEJBMBAQEFQhJSI0diJ0dFA3KBIAg2RxcXIA
+cWMBcoIEQBgAUBUyEDUwcQYTVwSCMjBCVEQiQWMThDhVE2YWZBNQhVZzY4cBhIZh
+IIBBQihmh4VgJjZkJ2J1VlAB5kLlGDaGXIOc++2QqMCGeB9FnTYpHFoSXQrOjQhS
+tfTln0rEelihhKhi3Bu8mdhyTSFZTShsQidqlN1/U50KnMTqII7r9QltUZqPH9sW
+CswVssxnVe1GAXY/LqJPN5DEN2ZEMoAgmxLbGYB5YdKID1lj5zquaCqpDUGDI/Wi
+zJ5xpFzn7nGJwedU2MBqcqlIVJg8VeIInkLL/v3y2uqD4+pewW8OewqosJOfBgjI
+RH1FXcdGbnqKJk1YZ8iwVMTNoU9U8gGDI5kk/dWWqqAdxaVrsmevmNRp6wtibFG6
+FxrSRb7hOP8IVv7TkMA+Cv4MRs0UhYJ2W8x0G0LxP4M+m3cAJkaHyHDda1NHjfTV
+zG9hWK8Ad7t+F9hw5++KBPlkW+/sX4eYpOlC/XjpMp1W6WIr9oIbRp6RXKNUuBXQ
+58uNAmq6peDenbwsmiBKG+RWntbMxtjOM9bo/JXMV9dIT/KIbljl2C/4TRbWy0D3
+KfZlvAHpiw2oH/vaLUFbIg7sK823keZA/uSFJ2KSPBVC6+AYX5tM/P/KKLJmFoVY
+U7h4F/SDCbOt5PJu9yg+fN6ftBT3a2723TAx7M8+WqPrvvOB5UFJRNCcpwnjqriz
+8ENLgoze5wm2sIk+QvB15tFG0n3+9eTOjD+q0dJDSxq5xAuAalBoFp7vSt2x1UO/
+4Nf/jXvJT2nXjR7QgtabQRzKqbP5lHVtL0BCJeGFlbGeuAGIfNuVY0809E66sWDo
+S18hNAfp9jKe0aU7MxGU6RvCB8vLK+cld/RzujyK8C307PJdzwCLEYIBMC3SvBcQ
+9CpJFuPIcEVoM1RiThw/l1MAaKJ3y73ekU5p+Dd2CN4P4pCDSiVj/PAOW1c7iA2A
+QBVuCfPMYJyW93toHaqpaZuD9VN3OKbtJvuMWCOIN59ERFvttv5CNQ01rhgCv3dZ
+kkkFrJsmFcwsgMW1JIGozMKywFzi9yDWUL6j/ZCc8xqkfP9fYPBBTcSsUvWV9Zq6
+AU22B9j6/EUP8crw0VViacbEJy2sJgIumEQiVlVNavorpPwjtWpVQFvsBrDm6X80
+jk9H/yTKrrR6LaTH7999s/88jOLszmbX7Yt8VmMkkliml2rd6UqG9D6zq2xEj1IV
+6ZT2zhVe+wHNmpkr1kYTIVsLXrHNpCWEQeHscSCzz/lg+aOv8kSfFqGq2VFjxnts
+7Z88TjxzIOQk14Lzkgl0PCyHXau8i2bteCOimqRYEd3ihNcC8U9MXLYrOiv24oXM
+RpkzoHGOtZoAie6k1Xj6aDwIl2mTBHg5BF0A4U+d/z7wS8Gr9nEc574s9OyKAZn6
+5L/1GgpWa0e2buxn8fkPAMptY0773prqKqwvV/SWdvUJ4B4HLNLsU70+N4XAZlRS
+7saNkghBkrD/WobJQwa/9OWWa5Gw6Frurr0AmnBU+EN7u6niFwARsa9f1yjuW8IJ
+tLD7H+Yu2bGouHWpeoXQHwqFxl+me7rQ/ePvOYQk/SzlzvroaqAGECrDoHU3kzhn
+rhJLueA9b0j3u0/+CQaNOFPWb6GAjmafVWpBcXtOSkHVUXitclURlITEwe47tn+g
+XffSw3k1q3XBKkFkJQrgPa2IbpAWvFKA7rOInY/b8N/lCI0bZAei2OOR2/MLifkx
+F3L8daWXslp7QSlIjUXwtgdD6CwQsEui99dZvTYlSxzUKC9nsF0oPYxWpHAcuoCE
+pQCR1CuyuGkDCaod2VNWqWOcZ5QXjEtbVHFO8qJdePJPKWV+0YcltaR4X5q2Pts9
+4a0SJMSM/tXrUi9g9RjjnB+F++rc4a5FrQ2r7FDXudk7NUEoJPyBvBDeowiSmXvv
+SHrL6WsQgf8n5sZxfA0uqs+8OMSLLNj72CSoBQMJNVJgYQkSyBuHl6Zk59+k/WeJ
+wX1qevXwaC6JrdF+naRcp16tNv+7230GPO1d3+X3zZOtAEuAzk6kw3da8Y15qZ5j
+FqzXPO8TsURyOf4Fp+kxpETSQ+mf8Do0hWzUYE8Cj2EFcwuE2Q7+c1ZHAFpQNk1j
+T4vR//yCYjO8/lY0yDV7iDzkT36twyvKZ/cMxC001RSNmtr3QNWWkRRDBWCSwnjW
++cn408gCVFPwVUOBwUr6aOeUY+fCcvWnYPCDj7ggdS5wEoUk+xrk4v2kU2gAH/mp
+DqhFNouIcExoNW5j7j0w0YKnZtZJ9pviiM0EXS6vhk4ayxI2pi3VOqL2RhoNleAa
+bTcCQ71wOxqpp4khssLcOsUR8trpadlvZJ9sc1ksUfoOz/pMI9Yj0IWctbuiriJp
+l193X2sPzVMn3MaEt+XPrsX5wOogbQAfSJyY8pfCnZuhVLoZDpJADJxou0EhP+wH
+p9yZc5GZosFgDJvTEhZfUmituLW4+op1FLJqA/LQSxBVz51OnmtzpgJLyR0ctTLG
+9CcYbFTrzltPlOTHVjVW4rD9jyoLjLdfUf9qG65qVpGBisV+wD+SI6P0x5rhN7Dt
+nC0YNZZ0cYyN24xw8Bxzcc9RkY8/MFfbTXOG43Uuh7fkPIdY2NQSUK2tkfiMdPgu
+zlR1HoZHBrCcsQXJH0OhbuJ6Uwzm340Upj4b/eykq+uUcVY8PAUHSg6mwKy+E4yp
+Za5Z5U50Kv9rFcE9Hwh09fGfdUrKTCFxoKrqfeW+ogTXJHQR5A41r9PP1l7/9Bp7
+P+UtdjJtAHzTO1r7/dckvghBslqhNBzA55wtWEmjMFh4Mm3lBMvBGrCelKPtaOrb
+CYlv4eqGZMEeE3VoEKO3QnXU/dqJvhwQhjCcgxPtOzm9eSrofTvXa4xIMKyuNF2z
+F6K0S5o3I+pBUInshXHWwN1pAT1R4FRYAUTv9mZbhLP+MWgPIMrdWWHAMDL5DeBH
+G4AT5RQbzIHjQ12fJq30m1LajjLlL+mF5og+plMgEGOCJMHZyT2NcNb7gFHWk2mh
+JmO/qxdXQ1FQ/oEf+gNmfgdlw/N6TY7PvmkVfdkhgp/zQLcGgJ33gj0gy4Jr284G
+EhmeOGQflVsMFDqrAgjCEEJSLl/+FXuDfJjTixyly/yTTJCAeiEXsSW4xDisYZyR
+dmEXPtx7eyelJjbsM2yMTNacvCA8TCywTqxYMlYF45kHhTrnQoMvx83U0vqB+ALA
+JsGGrYQZ3tx9j8ae27b0rkSrccFYhKCXI/mwEZcZ6SG3q6/PhHWQOaie2EkuVLDq
+YAK0ZjlTv0znE1OVN3ovKAqq8ga/y5tOKXREo/i/SRPj4aHel4Lky26+Nmm+t+E2
+CL3SBcqhBC45qIB27kdsqBsnCfSzm1fQsy6jivCEDneLTLNoltDyXunSwyLP/7HI
+qclQDtLzvC0mHUNlhcds4I20
+-----END PRIVATE KEY-----
diff --git a/test/mri/openssl/fixtures/pkey/mldsa65-2.pem b/test/mri/openssl/fixtures/pkey/mldsa65-2.pem
new file mode 100644
index 00000000000..0ae64c2c5d2
--- /dev/null
+++ b/test/mri/openssl/fixtures/pkey/mldsa65-2.pem
@@ -0,0 +1,88 @@
+-----BEGIN PRIVATE KEY-----
+MIIP/gIBADALBglghkgBZQMEAxIEgg/qMIIP5gQgDdLfrcKpbcx2qbjvcE+SqUnW
++y7uWok/WM51jtrhQGIEgg/Az2AAnia3lgXsNEHx5NtoKaslKSsMPpvhRGFlcTcT
+ZFF3hKrybqvpUxtqF8nqPTy0geEN/k/k6rYHDIcaBfE5J65Xn8dwRbUSzpjSJVD7
+aBv1qprz1pAAXMYcazKeqWCJxyy7u9opGuNMaJ7SHcqwQ1kZ4nWaxEua9JnXZ6aJ
+zGkVg3WFgnBFVFJjNwFRGGNDNjNVAUUgURZgiFhARkBIIIVFZkJ3UlaAFzBodRVj
+OGhnUHAyQkc0ZRQYVTUDAQcHNhVTInEyZ0hngkBRcmKFdxgjVShoRmAyRYRTMAFi
+KARRInZVhCMHhCQzcDh4hAd2V4UoVVGIIHclWFZXJVCDUXeFZ1YnIgcjgiJnU0BI
+EoFgEnZyF2OEUSUlJSNicSUChwFGJCglhnBCMUZWdAeACCVEVxVFYTRFQ3AyhkNo
+cwFSBAd0BGVBBlRyhVYQVyNHVSJmYhNhBXaFMIUTEEJYYFhxhWN0IQNYQQdHMHMC
+FTM0cUVGcnBlCAZSYQM4Unh0NTCBIlAHEYMmYzUmQ1cIBIKENGYlKAYnMSYwBFAy
+IiMWVBMQeAJQVRJBh2A1ImB3cYVgd2QhJSUVg3VYd0VxMmQhIhB4YQJTIoFiBkcj
+QgIBVEQIgXaABoNAOGUkcUdjUEB2SGiFKCRBYTZAISJRFnaEJmMoRndWBhCDBIJQ
+EXFDYIAieBYnQYIwY2J3hoVRMTYGaDEmgSMxFidoETEjFCgnUYCFQhB4NWhmVAZw
+M0gCEDAWCIcQgXQjgxNkFVZCKCOEiBIFFFA3NBQVZiSCYWRnYXASRISGQTUWAUA4
+IYMhckd2UhiDQYE3RxdAAnEIODYAUUhnMABIERdYFSQkcSYFAyIBASUkFAQEdTJA
+IxZABjhyBjF1Q4UWNEMgFBY4NSdjRxCFhyg0FVIAI1FWVhUlgRBHEGgYKEcIEoEl
+cIRzRWE0Z0g2BzQ2FxUGiEchJ1ZzUBY1d0EQQjd2AwY3KHhDQ1IVAUcIhDgWYIZI
+WFN3BEhTgBciRhNTGGUARoeBMXExNAIwcRYnBRgohUM4gYSARhCIMkMDJVhIgoMS
+R2BRKDFHh2JgGGUyMlIUKCR1ImJFgCY0gFgABgUYBXU2BDRGCHaGiCgTIDIyBFh4
+RmFzUBBCE2FUJWYAY4ZjSAg1BWWFAFQ1hkBjAnMiByEWVIVgN2MXYmBUU2BhYkUh
+OBNEWEBChUSDVgYEZiJ1cjUmNDIGQghgZEUIcUdwZVYjRzgBeHA1gRSGVXYhgmaB
+NVZ3UTgQUSF1NldYc1aDRgdGMVYUdwgQVThTVEJyN2IFUwdgUTZoJhQDVIRzEEdI
+E2YFd2EhESIVMSVFdhRHYAAFBShCEoAXQScWdEdSiGIydUNiZzhmJzY2ZlMTOCYH
+UzcVZxYUiHAxhDgmcWcHZjAFdBSHVhMyhiIyCCcwdgcACGOHRiNlAmAFAyFVVRcW
+FQQhNwIFYUBxNxKGVlQzF4IBEyAYFDF3BzMlUjJyYIMTFDAUFWRDhnWGdABYQRRQ
+h0VTAIgWhnd1FEhng4hlUwMiY2c4hzczM2BzgxRoZRRVRkF1VngWFFEogkEEQAWA
+J3R3A3IBhmQVaDVGKCJkMlc1GAFwIXQHF4h1RkJVEiJRRQB2ACGEgDFBBDEIWBEx
+VQBBRoFjMzKEKCZYcnRWYVh1M0N4GEMmRIInExYFNUMgExZRQ1h4h3NwdGYEJDJR
+ECiCYjQ0Z2ZGIGIwZCZGAFYjaEIzVFIQGEYUBHOBcTJiQSdCF3dCUQEBhgJBRyZU
+JlZxMHKHYHh2E0NwCIdCM3gHBjFWYhJoghJIBCgHI1hWJTRiF2eBcRBRNgISBYZx
+YzYTdoM4YGJWVBBYFzWBAUOHcVaAFERQEWEHExYyZIN4BjhEVQFIgyRAcGY3hiRI
+QkiDckYRgRQQISUQFDR0VxZyZ0hiIgQhOIhgiGdnIlaEJgQARjgxgWBzAgJ2FCAz
+NmgwVlGGdUcxYhZjVCQXAkGIMoJAJwFFBWMGhzExGCA1ZzdIRhMwQiaGN4AlMzNW
+RyFAA3UzYCBSNXOBMUEgRUY0E2wwl7ncBzQaQCHLGi4fo4iNcjppgeVmwIkz3lQc
+B1+enw6xro9Jj41TDjetf9GWcQeGt7rWjs2Q4b1R1IzuRhVgw7PuvtM1PzoP1Wfj
+sT1ugBTv5FzYo1zBx6L1hAYrB1ZR8EY/0qp3JhMeMDNry3kxoWxBk6NRXCl550nV
+DjxIXzzQYBOtvEUdRjX0jKFRtp5r+usf5BY+HjkFPlCxUNZ9U1EuWNZenAG47Q1a
+xL6aiyTUOsmyzXmIRXA3lQVurP1GqH5beYWgt6g+veH9MZm7HqC2iAqrQvTWrfQg
+Vh9h6K2VgK7rA7/SUHJS++3l3YqRV+0CL05OSa3+55ZheCQyinGcHqOR4DiaO4tl
+XWlYis6KU7ZkQPwEejPibzrK6OvCBHOYzBmZXu6Q3h57TzCAZoS7Uinm1VHVFqIw
+eid4VR9QHv14bj2pj8lz+bSEeP3/quUci+TF9A/CNzrTdv7eYxlS1EGd40PQMA6F
+p/ZHenXBp9vp8xCFPO6N4BSpLTm4HATPv0IfSJvalmj8YGMx9baCkuv1zInD/nij
+XjAOpuxXuLo4Odnsyh8nG3ApojSwPew6Nw0/gIkaaBAEHatk36bif14ZfpjdtMSu
+ZqqRe28YAX5Cc+CGgwmiMVp1wcfnsREStQljA51Wgh9BMDj864vIxDRwoDvnGUP0
+2us2kCc1YWOYO0fhXnQwLv0SfhMSueXSWI+TtavZ7XEpoxLR59KfQXNr54lD2LVi
+SAIfnugQFY6QWQJy9tqj/EQVRVAz7DtsKYhuaXXXUob1WjRpW1GA0Haz+fflunto
+PVI8jfubex+6clxGXhc8wef3P6mZI//C4qdhU1DL+Lfa+nUvzq2RbsrpZh6wB0RU
+a608XykbdkVPR56khUm+a+p4jMQrp2YCmiPj68CvZz49voij9v4sFhUPQ8NuqoRy
+VYRGSSiAccpoDocgn4mcScbj5WgxgDHxhYt2N2FeO37//2AiXNzOhZVSpjNe8OIs
+F5msuuf6lYDFQj8yy5wYkR9VLUMajV54E0vdo1ns3MCZzGUuibHRlkPrAOXMsHrY
+80le9gLR6QUtfT/2C3PPT6v6psdI86FvQbjly24skPaG9Vm0HGOc3ImuQu5m6CbQ
+37Nb8uIMSRG7QBxhVAXAwxXs6KiWZ8TxyS4zn7INRNyBHm1cgZPSxxXfPZIwosjv
+G0cMqD/CCtxriy0HkJjwtCbUYLc0nU+nMEuMCylWvf6w7hw0SkB/Sa9XvPTiMr3m
+B3qxGr69du5HKLFap9HhlYzgOOuPQrzQxAkIIQ2bCxsIPmTuDXJPvCBB84/I5RyL
+dG7j3LsOg4JGjp0+1wQE7+dynxIFru/DCfNSl5En0ON/Pmu4rteTd3X78Wovr6cV
+8bTp+AQ4ZuSk4bT0S9OtC3hAM8WUjQDZplmJkB8tzo6T5fRU9YX0MFAjUAh7MYAe
+a6+Up3mxWmYeo+c4msn7aRfvi4lplMoSKHs+rMgN93ExN/M+IUgTUsjlVQselOzV
+SKlUIQ5oXI+f/Sdtt8PKU/ltSFrAvNwowbarIOjClBPeNrNhYgascjzZ6vBbDYkU
+zaWo97QIvsW5Fj63uYNdeKEfGc+Pf6/IkiVBf5kKGUvHjmBXpgmf02FkDRF065pL
+Bx8UDeaHpzAcLBMDbUVejokoEtqDZjlkOljhUeiau99YGC3u3vQia8e64Z0IliaH
+FXXH/8l2FR3ZnYWnLBL4YBSmvwOvosB0iQhKaIb05oxzn6xmgotVhTT5IDqE3PX1
+OfpnFIoNe2IPvobu4z1Q5X2YjA8AvgXOsmH71Js4Ihy2DvGXSESVfF6EB9TqpmHC
+YPIhPORi2g7El4iZrbSvAqOoGILx+8HwBTm8rg4zuqCg44J/nEn7vgjA0rzmQ5mm
+uex3OEpi2RosZ4RecwFrbnkDtN8geeiaZGovGjGtLlBwd09VRji0DFy/l8fUqOqi
+NttZxiGLRL8SsOntUzbkNKcH3GnuN2FUOVD/xMiqOl8IvS6EO81CpPq0c8JxHWQ0
+ew2QsV8EIJLHpjZRNE4wp/3r4Z9U3ziV7ip8N64ScNj0YedJEvRgLM6hracg7Tey
+bOXhJ8FLh1/cGbeGD0tlbwg8YNZeXkA7YYDmlpWw57jZwYoyx7HqgziF0qqLIPIO
+s9CwjtAb26B0trIJHjkpv0EQHtRsOJuaQIXDcj/A8QVSb9F58cVALYb6NVCADdl5
+fytsoVJst8UQRT+AL5i61ZIVFG9URvoDFCJOYfp5WMF26lb6R0OVw0fuo5XHAcql
+T+gPyx5SaU8Klo/2k5jIm4+JQ74/d4srfcqnVPX/5ueIxtvJx+2q+MuhcOPelwmx
+BjPNvzLRcNFQU8/6meFFFVclBfIPDzOspxTOKu6DvcrkMLFiX1Vl40x/FpVMdRFj
+M5DmJR7NoFhoOguGin1cOdpvUmPxGEzKEJfrQqQ5CX4Kj4lHIFjHeYR1nLTagAyA
+rGv029l5af0CcPmQgl4NlTWh5eRtsFs16YDRkz+1xdQwJnpU9Qs91f6ckScGRHaM
+pbpJPoCGPT+kNvHbWrziupkaFYRTy3kHlhkZ7aqqq5phtDVk89LmS355V46t6CoL
+clkAwCWPBqUtJ4Dd0G1Qo6v/3wv63GkrezzxMjvINrJ6rVNqQBgLN5fiHzxYNRjD
+UB9BRLJq7updAnEFSNLqifwDwIHD75EtQEOfWoGBE/beMU4vecnzh7Q3aM3YE7zJ
+sZdtSoLzIycXZczICi8kNRZ/yXUS/mswUaUTNwANWGvYpXXsGRjdg8rCG7bMdBzX
+op9qNMFoxbZjg1NnEvlY33gMgHi0hTVeVd3WvFLrOSnV16dIb6wvgIjW90L/dqXx
+iKHKlXtaq01N1vpFBQnUhjL+ZvKh2rQpQpyVB4HBdQeSWC16/tYA8EPUZsISZAM2
+nYdbxHlIooPFz/Ali+g0B1JD0wFs/GljQloKVmBG1otF0FMBRvFlLUflcI4VSsDk
+odpZfBwFPq3K3qN6SAgtpKRzaJH7YDZn6XYIcekoAHP0rsqUH34eeHJ3Rv2U2ml0
+lzi+Ydsv+/REFoiLYNL8Gqa6WpVcZ1qCUse6ORnHCWd2Vxf4d8YDvcLwPwEqcB6u
+ewhC3Gme5ydV4hwTv9SzHOJ2ohTI9J4FpdEmGxOuB9HROQ3c8qPm6PDh5fXwOItz
+qaD8y6RLZUaPMXgwbAI/Gr5EFLAGp6CXfLrKE9yD3yLAop4DZ6GPPoHqOc+hKkgY
+edxUwijnQ25mtgrrJzvUWOpO0hi+CNdcMQMXXU2phyibN8h/JoejzIm9HXk2EvV9
+qX4cmZjkE9fKw15cRjvQt1K1
+-----END PRIVATE KEY-----
diff --git a/test/mri/openssl/fixtures/pkey/p256_too_large.pem b/test/mri/openssl/fixtures/pkey/p256_too_large.pem
deleted file mode 100644
index a73ac37f875..00000000000
--- a/test/mri/openssl/fixtures/pkey/p256_too_large.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP+TT0V8Fndsnacji9tyf6hmhHywcOWTee9XkiBeJoVloAoGCCqGSM49
-AwEHoUQDQgAEBkhhJIU/2/YdPSlY2I1k25xjK4trr5OXSgXvBC21PtY0HQ7lor7A
-jzT0giJITqmcd81fwGw5+96zLcdxTF1hVQ==
------END EC PRIVATE KEY-----
diff --git a/test/mri/openssl/fixtures/pkey/p384_invalid.pem b/test/mri/openssl/fixtures/pkey/p384_invalid.pem
deleted file mode 100644
index d5cdc9a3afb..00000000000
--- a/test/mri/openssl/fixtures/pkey/p384_invalid.pem
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDDA1Tm0m7YhkfeVpFuarAJYVlHp2tQj+1fOBiLa10t9E8TiQO/hVfxB
-vGaVEQwOheWgBwYFK4EEACKhZANiAASyGqmryZGqdpsq5gEDIfNvgC3AwSJxiBCL
-XKHBTFRp+tCezLDOK/6V8KK/vVGBJlGFW6/I7ahyXprxS7xs7hPA9iz5YiuqXlu+
-lbrIpZOz7b73hyQQCkvbBO/Avg+hPAk=
------END EC PRIVATE KEY-----
diff --git a/test/mri/openssl/fixtures/pkey/rsa1024.pem b/test/mri/openssl/fixtures/pkey/rsa1024.pem
deleted file mode 100644
index 464de074be8..00000000000
--- a/test/mri/openssl/fixtures/pkey/rsa1024.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDLwsSw1ECnPtT+PkOgHhcGA71nwC2/nL85VBGnRqDxOqjVh7Cx
-aKPERYHsk4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbCz0layNqHyywQEVLFmp1cpIt/
-Q3geLv8ZD9pihowKJDyMDiN6ArYUmZczvW4976MU3+l54E6lF/JfFEU5hwIDAQAB
-AoGBAKSl/MQarye1yOysqX6P8fDFQt68VvtXkNmlSiKOGuzyho0M+UVSFcs6k1L0
-maDE25AMZUiGzuWHyaU55d7RXDgeskDMakD1v6ZejYtxJkSXbETOTLDwUWTn618T
-gnb17tU1jktUtU67xK/08i/XodlgnQhs6VoHTuCh3Hu77O6RAkEA7+gxqBuZR572
-74/akiW/SuXm0SXPEviyO1MuSRwtI87B02D0qgV8D1UHRm4AhMnJ8MCs1809kMQE
-JiQUCrp9mQJBANlt2ngBO14us6NnhuAseFDTBzCHXwUUu1YKHpMMmxpnGqaldGgX
-sOZB3lgJsT9VlGf3YGYdkLTNVbogQKlKpB8CQQDiSwkb4vyQfDe8/NpU5Not0fII
-8jsDUCb+opWUTMmfbxWRR3FBNu8wnym/m19N4fFj8LqYzHX4KY0oVPu6qvJxAkEA
-wa5snNekFcqONLIE4G5cosrIrb74sqL8GbGb+KuTAprzj5z1K8Bm0UW9lTjVDjDi
-qRYgZfZSL+x1P/54+xTFSwJAY1FxA/N3QPCXCjPh5YqFxAMQs2VVYTfg+t0MEcJD
-dPMQD5JX6g5HKnHFg2mZtoXQrWmJSn7p8GJK8yNTopEErA==
------END RSA PRIVATE KEY-----
diff --git a/test/mri/openssl/test_asn1.rb b/test/mri/openssl/test_asn1.rb
index 354b5878954..5978ecf6736 100644
--- a/test/mri/openssl/test_asn1.rb
+++ b/test/mri/openssl/test_asn1.rb
@@ -6,7 +6,7 @@
 class  OpenSSL::TestASN1 < OpenSSL::TestCase
   def test_decode_x509_certificate
     subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
-    key = Fixtures.pkey("rsa1024")
+    key = Fixtures.pkey("rsa-1")
     now = Time.at(Time.now.to_i) # suppress usec
     s = 0xdeadbeafdeadbeafdeadbeafdeadbeaf
     exts = [
@@ -306,7 +306,11 @@ def test_null
   end
 
   def test_object_identifier
-    encode_decode_test B(%w{ 06 01 00 }), OpenSSL::ASN1::ObjectId.new("0.0".b)
+    obj = encode_decode_test B(%w{ 06 01 00 }), OpenSSL::ASN1::ObjectId.new("0.0".b)
+    assert_equal "0.0", obj.oid
+    assert_nil obj.sn
+    assert_nil obj.ln
+    assert_equal obj.oid, obj.value
     encode_decode_test B(%w{ 06 01 28 }), OpenSSL::ASN1::ObjectId.new("1.0".b)
     encode_decode_test B(%w{ 06 03 88 37 03 }), OpenSSL::ASN1::ObjectId.new("2.999.3".b)
     encode_decode_test B(%w{ 06 05 2A 22 83 BB 55 }), OpenSSL::ASN1::ObjectId.new("1.2.34.56789".b)
@@ -314,6 +318,7 @@ def test_object_identifier
     assert_equal "2.16.840.1.101.3.4.2.1", obj.oid
     assert_equal "SHA256", obj.sn
     assert_equal "sha256", obj.ln
+    assert_equal obj.sn, obj.value
     assert_raise(OpenSSL::ASN1::ASN1Error) {
       OpenSSL::ASN1.decode(B(%w{ 06 00 }))
     }
@@ -389,6 +394,11 @@ def test_sequence
     ])
     expected.indefinite_length = true
     encode_test B(%w{ 30 80 04 01 00 00 00 }), expected
+
+    # Missing EOC at the end of contents octets
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1.decode(B(%w{ 30 80 01 01 FF }))
+    }
   end
 
   def test_set
@@ -406,24 +416,38 @@ def test_set
   def test_utctime
     encode_decode_test B(%w{ 17 0D }) + "160908234339Z".b,
       OpenSSL::ASN1::UTCTime.new(Time.utc(2016, 9, 8, 23, 43, 39))
-    begin
-      # possible range of UTCTime is 1969-2068 currently
-      encode_decode_test B(%w{ 17 0D }) + "690908234339Z".b,
-        OpenSSL::ASN1::UTCTime.new(Time.utc(1969, 9, 8, 23, 43, 39))
-    rescue OpenSSL::ASN1::ASN1Error
-      pend "No negative time_t support?"
-    end
-    # not implemented
+
+    # 1950-2049 range is assumed to match RFC 5280's expectation
+    encode_decode_test B(%w{ 17 0D }) + "490908234339Z".b,
+      OpenSSL::ASN1::UTCTime.new(Time.utc(2049, 9, 8, 23, 43, 39))
+    encode_decode_test B(%w{ 17 0D }) + "500908234339Z".b,
+      OpenSSL::ASN1::UTCTime.new(Time.utc(1950, 9, 8, 23, 43, 39))
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1::UTCTime.new(Time.new(2049, 12, 31, 23, 0, 0, "-04:00")).to_der
+    }
+
+    # UTC offset (BER): ASN1_TIME_to_tm() may or may not support it
     # decode_test B(%w{ 17 11 }) + "500908234339+0930".b,
     #   OpenSSL::ASN1::UTCTime.new(Time.new(1950, 9, 8, 23, 43, 39, "+09:30"))
     # decode_test B(%w{ 17 0F }) + "5009082343-0930".b,
     #   OpenSSL::ASN1::UTCTime.new(Time.new(1950, 9, 8, 23, 43, 0, "-09:30"))
-    # assert_raise(OpenSSL::ASN1::ASN1Error) {
-    #   OpenSSL::ASN1.decode(B(%w{ 17 0C }) + "500908234339".b)
-    # }
-    # assert_raise(OpenSSL::ASN1::ASN1Error) {
-    #   OpenSSL::ASN1.decode(B(%w{ 17 0D }) + "500908234339Y".b)
-    # }
+
+    # Seconds is omitted (BER)
+    # decode_test B(%w{ 18 0D }) + "201612081934Z".b,
+    #   OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 0))
+
+    # Fractional seconds is not allowed in UTCTime
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1.decode(B(%w{ 17 0F }) + "160908234339.5Z".b)
+    }
+
+    # Missing "Z"
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1.decode(B(%w{ 17 0C }) + "500908234339".b)
+    }
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1.decode(B(%w{ 17 0D }) + "500908234339Y".b)
+    }
   end
 
   def test_generalizedtime
@@ -431,24 +455,46 @@ def test_generalizedtime
       OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 29))
     encode_decode_test B(%w{ 18 0F }) + "99990908234339Z".b,
       OpenSSL::ASN1::GeneralizedTime.new(Time.utc(9999, 9, 8, 23, 43, 39))
-    # not implemented
+
+    # Fractional seconds (DER). Not supported by ASN1_TIME_to_tm()
+    # because struct tm cannot store it.
+    # encode_decode_test B(%w{ 18 11 }) + "20161208193439.5Z".b,
+    #   OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 39.5))
+
+    # UTC offset (BER): ASN1_TIME_to_tm() may or may not support it
     # decode_test B(%w{ 18 13 }) + "20161208193439+0930".b,
     #   OpenSSL::ASN1::GeneralizedTime.new(Time.new(2016, 12, 8, 19, 34, 39, "+09:30"))
     # decode_test B(%w{ 18 11 }) + "201612081934-0930".b,
     #   OpenSSL::ASN1::GeneralizedTime.new(Time.new(2016, 12, 8, 19, 34, 0, "-09:30"))
     # decode_test B(%w{ 18 11 }) + "201612081934-09".b,
     #   OpenSSL::ASN1::GeneralizedTime.new(Time.new(2016, 12, 8, 19, 34, 0, "-09:00"))
+
+    # Minutes and seconds are omitted (BER)
+    # decode_test B(%w{ 18 0B }) + "2016120819Z".b,
+    #   OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 0, 0))
+    # Fractional hours (BER)
     # decode_test B(%w{ 18 0D }) + "2016120819.5Z".b,
     #   OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 30, 0))
+    # Fractional hours with "," as the decimal separator (BER)
     # decode_test B(%w{ 18 0D }) + "2016120819,5Z".b,
     #   OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 30, 0))
+
+    # Seconds is omitted (BER)
+    # decode_test B(%w{ 18 0D }) + "201612081934Z".b,
+    #   OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 0))
+    # Fractional minutes (BER)
     # decode_test B(%w{ 18 0F }) + "201612081934.5Z".b,
     #   OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 30))
-    # decode_test B(%w{ 18 11 }) + "20161208193439.5Z".b,
-    #   OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 39.5))
-    # assert_raise(OpenSSL::ASN1::ASN1Error) {
-    #   OpenSSL::ASN1.decode(B(%w{ 18 0D }) + "201612081934Y".b)
-    # }
+
+    # Missing "Z"
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1.decode(B(%w{ 18 0F }) + "20161208193429Y".b)
+    }
+
+    # Encoding year out of range
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1::GeneralizedTime.new(Time.utc(10000, 9, 8, 23, 43, 39)).to_der
+    }
   end
 
   def test_basic_asn1data
@@ -458,7 +504,7 @@ def test_basic_asn1data
     encode_decode_test B(%w{ 81 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 1, :CONTEXT_SPECIFIC)
     encode_decode_test B(%w{ C1 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 1, :PRIVATE)
     encode_decode_test B(%w{ 1F 20 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 32, :UNIVERSAL)
-    encode_decode_test B(%w{ 1F C0 20 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 8224, :UNIVERSAL)
+    encode_decode_test B(%w{ 9F C0 20 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 8224, :CONTEXT_SPECIFIC)
     encode_decode_test B(%w{ 41 02 AB CD }), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD }), 1, :APPLICATION)
     encode_decode_test B(%w{ 41 81 80 } + %w{ AB CD } * 64), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD } * 64), 1, :APPLICATION)
     encode_decode_test B(%w{ 41 82 01 00 } + %w{ AB CD } * 128), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD } * 128), 1, :APPLICATION)
diff --git a/test/mri/openssl/test_bn.rb b/test/mri/openssl/test_bn.rb
index 1217f250a79..f663102d45c 100644
--- a/test/mri/openssl/test_bn.rb
+++ b/test/mri/openssl/test_bn.rb
@@ -321,6 +321,8 @@ def test_argument_error
   end
 
   def test_get_flags_and_set_flags
+    return if aws_lc? # AWS-LC does not support BN::CONSTTIME.
+
     e = OpenSSL::BN.new(999)
 
     assert_equal(0, e.get_flags(OpenSSL::BN::CONSTTIME))
@@ -343,28 +345,38 @@ def test_get_flags_and_set_flags
     assert_equal(4, e.get_flags(OpenSSL::BN::CONSTTIME))
   end
 
-  if respond_to?(:ractor)
+  if defined?(Ractor) && respond_to?(:ractor)
+    unless Ractor.method_defined?(:value) # Ruby 3.4 or earlier
+      using Module.new {
+        refine Ractor do
+          alias value take
+        end
+      }
+    end
+
     ractor
     def test_ractor
-      assert_equal(@e1, Ractor.new { OpenSSL::BN.new("999") }.take)
-      assert_equal(@e3, Ractor.new { OpenSSL::BN.new("\a\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 2) }.take)
-      assert_equal("999", Ractor.new(@e1) { |e1| e1.to_s }.take)
-      assert_equal("07FFFFFFFFFFFFFFFFFFFFFFFFFF", Ractor.new(@e3) { |e3| e3.to_s(16) }.take)
-      assert_equal(2**107-1, Ractor.new(@e3) { _1.to_i }.take)
-      assert_equal([1000, -999], Ractor.new(@e2) { _1.coerce(1000) }.take)
-      assert_equal(false, Ractor.new  { 1.to_bn.zero? }.take)
-      assert_equal(true, Ractor.new { 1.to_bn.one? }.take)
-      assert_equal(true, Ractor.new(@e2) { _1.negative? }.take)
-      assert_equal("-03E7", Ractor.new(@e2) { _1.to_s(16) }.take)
-      assert_equal(2**107-1, Ractor.new(@e3) { _1.to_i }.take)
-      assert_equal([1000, -999], Ractor.new(@e2) { _1.coerce(1000) }.take)
-      assert_equal(true, Ractor.new { 0.to_bn.zero? }.take)
-      assert_equal(true, Ractor.new { 1.to_bn.one? }.take )
-      assert_equal(false,Ractor.new { 2.to_bn.odd? }.take)
-      assert_equal(true, Ractor.new(@e2) { _1.negative? }.take)
-      assert_include(128..255, Ractor.new { OpenSSL::BN.rand(8)}.take)
-      assert_include(0...2**32, Ractor.new { OpenSSL::BN.generate_prime(32) }.take)
-      assert_equal(0, Ractor.new { OpenSSL::BN.new(999).get_flags(OpenSSL::BN::CONSTTIME) }.take)
+      assert_equal(@e1, Ractor.new { OpenSSL::BN.new("999") }.value)
+      assert_equal(@e3, Ractor.new { OpenSSL::BN.new("\a\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 2) }.value)
+      assert_equal("999", Ractor.new(@e1) { |e1| e1.to_s }.value)
+      assert_equal("07FFFFFFFFFFFFFFFFFFFFFFFFFF", Ractor.new(@e3) { |e3| e3.to_s(16) }.value)
+      assert_equal(2**107-1, Ractor.new(@e3) { _1.to_i }.value)
+      assert_equal([1000, -999], Ractor.new(@e2) { _1.coerce(1000) }.value)
+      assert_equal(false, Ractor.new  { 1.to_bn.zero? }.value)
+      assert_equal(true, Ractor.new { 1.to_bn.one? }.value)
+      assert_equal(true, Ractor.new(@e2) { _1.negative? }.value)
+      assert_equal("-03E7", Ractor.new(@e2) { _1.to_s(16) }.value)
+      assert_equal(2**107-1, Ractor.new(@e3) { _1.to_i }.value)
+      assert_equal([1000, -999], Ractor.new(@e2) { _1.coerce(1000) }.value)
+      assert_equal(true, Ractor.new { 0.to_bn.zero? }.value)
+      assert_equal(true, Ractor.new { 1.to_bn.one? }.value )
+      assert_equal(false,Ractor.new { 2.to_bn.odd? }.value)
+      assert_equal(true, Ractor.new(@e2) { _1.negative? }.value)
+      assert_include(128..255, Ractor.new { OpenSSL::BN.rand(8)}.value)
+      assert_include(0...2**32, Ractor.new { OpenSSL::BN.generate_prime(32) }.value)
+      if !aws_lc? # AWS-LC does not support BN::CONSTTIME.
+        assert_equal(0, Ractor.new { OpenSSL::BN.new(999).get_flags(OpenSSL::BN::CONSTTIME) }.value)
+      end
       # test if shareable when frozen
       assert Ractor.shareable?(@e1.freeze)
     end
diff --git a/test/mri/openssl/test_buffering.rb b/test/mri/openssl/test_buffering.rb
index 7575c5b4fe4..466bbcfa231 100644
--- a/test/mri/openssl/test_buffering.rb
+++ b/test/mri/openssl/test_buffering.rb
@@ -31,7 +31,7 @@ def sysread(size)
     end
 
     def syswrite(str)
-      @io << str
+      @io.append_as_bytes(str)
       str.size
     end
   end
diff --git a/test/mri/openssl/test_cipher.rb b/test/mri/openssl/test_cipher.rb
index cd0b3dcb445..93766cfc88c 100644
--- a/test/mri/openssl/test_cipher.rb
+++ b/test/mri/openssl/test_cipher.rb
@@ -112,6 +112,9 @@ def test_initialize
     cipher = OpenSSL::Cipher.new("DES-EDE3-CBC")
     assert_raise(RuntimeError) { cipher.__send__(:initialize, "DES-EDE3-CBC") }
     assert_raise(RuntimeError) { OpenSSL::Cipher.allocate.final }
+    assert_raise(OpenSSL::Cipher::CipherError) {
+      OpenSSL::Cipher.new("no such algorithm")
+    }
   end
 
   def test_ctr_if_exists
@@ -182,6 +185,10 @@ def test_update_raise_if_key_not_set
     end
   end
 
+  def test_auth_tag_error_inheritance
+    assert_equal OpenSSL::Cipher::CipherError, OpenSSL::Cipher::AuthTagError.superclass
+  end
+
   def test_authenticated
     cipher = OpenSSL::Cipher.new('aes-128-gcm')
     assert_predicate(cipher, :authenticated?)
@@ -212,7 +219,8 @@ def test_aes_ccm
     cipher = new_decryptor("aes-128-ccm", **kwargs, ccm_data_len: ct.length, auth_tag: tag[0, 8], auth_data: aad)
     assert_equal pt, cipher.update(ct) << cipher.final
 
-    # wrong tag is rejected
+    # wrong tag is rejected - in CCM, authentication happens during update, but
+    # we consider this a general CipherError since update failures can have various causes
     tag2 = tag.dup
     tag2.setbyte(-1, (tag2.getbyte(-1) + 1) & 0xff)
     cipher = new_decryptor("aes-128-ccm", **kwargs, ccm_data_len: ct.length, auth_tag: tag2, auth_data: aad)
@@ -265,19 +273,19 @@ def test_aes_gcm
     tag2.setbyte(-1, (tag2.getbyte(-1) + 1) & 0xff)
     cipher = new_decryptor("aes-128-gcm", key: key, iv: iv, auth_tag: tag2, auth_data: aad)
     cipher.update(ct)
-    assert_raise(OpenSSL::Cipher::CipherError) { cipher.final }
+    assert_raise(OpenSSL::Cipher::AuthTagError) { cipher.final }
 
     # wrong aad is rejected
     aad2 = aad[0..-2] << aad[-1].succ
     cipher = new_decryptor("aes-128-gcm", key: key, iv: iv, auth_tag: tag, auth_data: aad2)
     cipher.update(ct)
-    assert_raise(OpenSSL::Cipher::CipherError) { cipher.final }
+    assert_raise(OpenSSL::Cipher::AuthTagError) { cipher.final }
 
     # wrong ciphertext is rejected
     ct2 = ct[0..-2] << ct[-1].succ
     cipher = new_decryptor("aes-128-gcm", key: key, iv: iv, auth_tag: tag, auth_data: aad)
     cipher.update(ct2)
-    assert_raise(OpenSSL::Cipher::CipherError) { cipher.final }
+    assert_raise(OpenSSL::Cipher::AuthTagError) { cipher.final }
   end
 
   def test_aes_gcm_variable_iv_len
@@ -337,6 +345,24 @@ def test_aes_ocb_tag_len
 
   end if has_cipher?("aes-128-ocb")
 
+  def test_aes_gcm_siv
+    # RFC 8452 Appendix C.1., 8th example
+    key = ["01000000000000000000000000000000"].pack("H*")
+    iv  = ["030000000000000000000000"].pack("H*")
+    aad = ["01"].pack("H*")
+    pt =  ["0200000000000000"].pack("H*")
+    ct =  ["1e6daba35669f4273b0a1a2560969cdf790d99759abd1508"].pack("H*")
+    tag = ["3b0a1a2560969cdf790d99759abd1508"].pack("H*")
+    ct_without_tag = ct.byteslice(0, ct.bytesize - tag.bytesize)
+
+    cipher = new_encryptor("aes-128-gcm-siv", key: key, iv: iv, auth_data: aad)
+    assert_equal ct_without_tag, cipher.update(pt) << cipher.final
+    assert_equal tag, cipher.auth_tag
+    cipher = new_decryptor("aes-128-gcm-siv", key: key, iv: iv, auth_tag: tag,
+                           auth_data: aad)
+    assert_equal pt, cipher.update(ct_without_tag) << cipher.final
+  end if openssl?(3, 2, 0)
+
   def test_aes_gcm_key_iv_order_issue
     pt = "[ruby/openssl#49]"
     cipher = OpenSSL::Cipher.new("aes-128-gcm").encrypt
@@ -363,7 +389,7 @@ def test_aes_keywrap_pad
 
     begin
       cipher = OpenSSL::Cipher.new("id-aes192-wrap-pad").encrypt
-    rescue OpenSSL::Cipher::CipherError, RuntimeError
+    rescue OpenSSL::Cipher::CipherError
       omit "id-aes192-wrap-pad is not supported: #$!"
     end
     cipher.key = kek
diff --git a/test/mri/openssl/test_config.rb b/test/mri/openssl/test_config.rb
index 759a5bbd441..c10a855a4bf 100644
--- a/test/mri/openssl/test_config.rb
+++ b/test/mri/openssl/test_config.rb
@@ -43,6 +43,9 @@ def test_s_parse
   end
 
   def test_s_parse_format
+    # AWS-LC removed support for parsing $foo variables.
+    return if aws_lc?
+
     c = OpenSSL::Config.parse(<<__EOC__)
  baz =qx\t                # "baz = qx"
 
@@ -213,13 +216,15 @@ def test_get_value
     assert_raise(TypeError) do
       @it.get_value(nil, 'HOME') # not allowed unlike Config#value
     end
-    # fallback to 'default' ugly...
-    assert_equal('.', @it.get_value('unknown', 'HOME'))
+    unless aws_lc? # AWS-LC does not support the fallback
+      # fallback to 'default' ugly...
+      assert_equal('.', @it.get_value('unknown', 'HOME'))
+    end
   end
 
   def test_get_value_ENV
-    # LibreSSL removed support for NCONF_get_string(conf, "ENV", str)
-    return if libressl?
+    # LibreSSL and AWS-LC removed support for NCONF_get_string(conf, "ENV", str)
+    return if libressl? || aws_lc?
 
     key = ENV.keys.first
     assert_not_nil(key) # make sure we have at least one ENV var.
diff --git a/test/mri/openssl/test_digest.rb b/test/mri/openssl/test_digest.rb
index 988330e4058..2ef84cfa4c7 100644
--- a/test/mri/openssl/test_digest.rb
+++ b/test/mri/openssl/test_digest.rb
@@ -10,6 +10,12 @@ def setup
     @d2 = OpenSSL::Digest::MD5.new
   end
 
+  def test_initialize
+    assert_raise(OpenSSL::Digest::DigestError) {
+      OpenSSL::Digest.new("no such algorithm")
+    }
+  end
+
   def test_digest
     null_hex = "d41d8cd98f00b204e9800998ecf8427e"
     null_bin = [null_hex].pack("H*")
@@ -62,8 +68,17 @@ def test_digest_constants
   end
 
   def test_digest_by_oid_and_name
-    check_digest(OpenSSL::ASN1::ObjectId.new("MD5"))
-    check_digest(OpenSSL::ASN1::ObjectId.new("SHA1"))
+    # SHA256
+    o1 = OpenSSL::Digest.digest("SHA256", "")
+    o2 = OpenSSL::Digest.digest("sha256", "")
+    assert_equal(o1, o2)
+    o3 = OpenSSL::Digest.digest("2.16.840.1.101.3.4.2.1", "")
+    assert_equal(o1, o3)
+
+    # An alias for SHA256 recognized by EVP_get_digestbyname(), but not by
+    # EVP_MD_fetch()
+    o4 = OpenSSL::Digest.digest("RSA-SHA256", "")
+    assert_equal(o1, o4)
   end
 
   def encode16(str)
@@ -88,7 +103,6 @@ def test_sha2
   end
 
   def test_sha512_truncate
-    pend "SHA512_224 is not implemented" unless digest_available?('sha512-224')
     sha512_224_a = "d5cdb9ccc769a5121d4175f2bfdd13d6310e0d3d361ea75d82108327"
     sha512_256_a = "455e518824bc0601f9fb858ff5c37d417d67c2f8e0df2babe4808858aea830f8"
 
@@ -100,23 +114,22 @@ def test_sha512_truncate
   end
 
   def test_sha3
-    pend "SHA3 is not implemented" unless digest_available?('sha3-224')
     s224 = '6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7'
     s256 = 'a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a'
     s384 = '0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004'
     s512 = 'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26'
-    assert_equal(OpenSSL::Digest.hexdigest('SHA3-224', ""), s224)
-    assert_equal(OpenSSL::Digest.hexdigest('SHA3-256', ""), s256)
-    assert_equal(OpenSSL::Digest.hexdigest('SHA3-384', ""), s384)
-    assert_equal(OpenSSL::Digest.hexdigest('SHA3-512', ""), s512)
+    assert_equal(s224, OpenSSL::Digest.hexdigest('SHA3-224', ""))
+    assert_equal(s256, OpenSSL::Digest.hexdigest('SHA3-256', ""))
+    assert_equal(s384, OpenSSL::Digest.hexdigest('SHA3-384', ""))
+    assert_equal(s512, OpenSSL::Digest.hexdigest('SHA3-512', ""))
   end
 
-  def test_digest_by_oid_and_name_sha2
-    check_digest(OpenSSL::ASN1::ObjectId.new("SHA224"))
-    check_digest(OpenSSL::ASN1::ObjectId.new("SHA256"))
-    check_digest(OpenSSL::ASN1::ObjectId.new("SHA384"))
-    check_digest(OpenSSL::ASN1::ObjectId.new("SHA512"))
-  end
+  def test_fetched_evp_md
+    # Pre-NIST Keccak is an example of a digest algorithm that doesn't have an
+    # NID and requires dynamic allocation of EVP_MD
+    hex = "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+    assert_equal(hex, OpenSSL::Digest.hexdigest("KECCAK-256", ""))
+  end if openssl?(3, 2, 0)
 
   def test_openssl_digest
     assert_equal OpenSSL::Digest::MD5, OpenSSL::Digest("MD5")
@@ -134,22 +147,6 @@ def test_digests
     assert_include digests, "sha256"
     assert_include digests, "sha512"
   end
-
-  private
-
-  def check_digest(oid)
-    d = OpenSSL::Digest.new(oid.sn)
-    assert_not_nil(d)
-    d = OpenSSL::Digest.new(oid.ln)
-    assert_not_nil(d)
-    d = OpenSSL::Digest.new(oid.oid)
-    assert_not_nil(d)
-  end
-
-  def digest_available?(name)
-    @digests ||= OpenSSL::Digest.digests
-    @digests.include?(name)
-  end
 end
 
 end
diff --git a/test/mri/openssl/test_fips.rb b/test/mri/openssl/test_fips.rb
index 4a3dd43a418..efc2655e25b 100644
--- a/test/mri/openssl/test_fips.rb
+++ b/test/mri/openssl/test_fips.rb
@@ -28,6 +28,8 @@ def test_fips_mode_get_is_false_on_fips_mode_disabled
   end
 
   def test_fips_mode_is_reentrant
+    return if aws_lc? # AWS-LC's FIPS mode is decided at compile time.
+
     assert_separately(["-ropenssl"], <<~"end;")
       OpenSSL.fips_mode = false
       OpenSSL.fips_mode = false
@@ -35,7 +37,10 @@ def test_fips_mode_is_reentrant
   end
 
   def test_fips_mode_get_with_fips_mode_set
-    omit('OpenSSL is not FIPS-capable') unless OpenSSL::OPENSSL_FIPS
+    return if aws_lc? # AWS-LC's FIPS mode is decided at compile time.
+    unless ENV["TEST_RUBY_OPENSSL_FIPS_ENABLED"]
+      omit "Only for FIPS mode environment"
+    end
 
     assert_separately(["-ropenssl"], <<~"end;")
       begin
diff --git a/test/mri/openssl/test_kdf.rb b/test/mri/openssl/test_kdf.rb
index f4790c96afa..6a12a25aa83 100644
--- a/test/mri/openssl/test_kdf.rb
+++ b/test/mri/openssl/test_kdf.rb
@@ -132,7 +132,6 @@ def test_scrypt_rfc7914_second
   end
 
   def test_hkdf_rfc5869_test_case_1
-    pend "HKDF is not implemented" unless OpenSSL::KDF.respond_to?(:hkdf) # OpenSSL >= 1.1.0
     hash = "sha256"
     ikm = B("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")
     salt = B("000102030405060708090a0b0c")
@@ -146,7 +145,6 @@ def test_hkdf_rfc5869_test_case_1
   end
 
   def test_hkdf_rfc5869_test_case_3
-    pend "HKDF is not implemented" unless OpenSSL::KDF.respond_to?(:hkdf) # OpenSSL >= 1.1.0
     hash = "sha256"
     ikm = B("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")
     salt = B("")
@@ -160,7 +158,6 @@ def test_hkdf_rfc5869_test_case_3
   end
 
   def test_hkdf_rfc5869_test_case_4
-    pend "HKDF is not implemented" unless OpenSSL::KDF.respond_to?(:hkdf) # OpenSSL >= 1.1.0
     hash = "sha1"
     ikm = B("0b0b0b0b0b0b0b0b0b0b0b")
     salt = B("000102030405060708090a0b0c")
diff --git a/test/mri/openssl/test_ns_spki.rb b/test/mri/openssl/test_ns_spki.rb
index d76fc9e5cfb..04844292897 100644
--- a/test/mri/openssl/test_ns_spki.rb
+++ b/test/mri/openssl/test_ns_spki.rb
@@ -17,8 +17,8 @@ def setup
   end
 
   def test_build_data
-    key1 = Fixtures.pkey("rsa1024")
-    key2 = Fixtures.pkey("rsa2048")
+    key1 = Fixtures.pkey("rsa-1")
+    key2 = Fixtures.pkey("rsa-2")
     spki = OpenSSL::Netscape::SPKI.new
     spki.challenge = "RandomString"
     spki.public_key = key1.public_key
diff --git a/test/mri/openssl/test_ocsp.rb b/test/mri/openssl/test_ocsp.rb
index cf96fc22e51..b9b66ad37ad 100644
--- a/test/mri/openssl/test_ocsp.rb
+++ b/test/mri/openssl/test_ocsp.rb
@@ -13,7 +13,7 @@ def setup
     # @cert2   @ocsp_cert
 
     ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
-    @ca_key = Fixtures.pkey("rsa1024")
+    @ca_key = Fixtures.pkey("rsa-1")
     ca_exts = [
       ["basicConstraints", "CA:TRUE", true],
       ["keyUsage", "cRLSign,keyCertSign", true],
@@ -22,7 +22,7 @@ def setup
       ca_subj, @ca_key, 1, ca_exts, nil, nil)
 
     cert_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA2")
-    @cert_key = Fixtures.pkey("rsa1024")
+    @cert_key = Fixtures.pkey("rsa-2")
     cert_exts = [
       ["basicConstraints", "CA:TRUE", true],
       ["keyUsage", "cRLSign,keyCertSign", true],
@@ -31,14 +31,14 @@ def setup
       cert_subj, @cert_key, 5, cert_exts, @ca_cert, @ca_key)
 
     cert2_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
-    @cert2_key = Fixtures.pkey("rsa1024")
+    @cert2_key = Fixtures.pkey("rsa-3")
     cert2_exts = [
     ]
     @cert2 = OpenSSL::TestUtils.issue_cert(
       cert2_subj, @cert2_key, 10, cert2_exts, @cert, @cert_key)
 
     ocsp_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCAOCSP")
-    @ocsp_key = Fixtures.pkey("rsa2048")
+    @ocsp_key = Fixtures.pkey("p256")
     ocsp_exts = [
       ["extendedKeyUsage", "OCSPSigning", true],
     ]
@@ -63,8 +63,10 @@ def test_certificate_id_issuer_name_hash
 
   def test_certificate_id_issuer_key_hash
     cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert)
-    assert_equal OpenSSL::Digest.hexdigest('SHA1', OpenSSL::ASN1.decode(@ca_cert.to_der).value[0].value[6].value[1].value), cid.issuer_key_hash
-    assert_equal "d1fef9fbf8ae1bc160cbfa03e2596dd873089213", cid.issuer_key_hash
+    # content of subjectPublicKey (bit string) in SubjectPublicKeyInfo
+    spki = OpenSSL::ASN1.decode(@ca_key.public_to_der)
+    assert_equal OpenSSL::Digest.hexdigest("SHA1", spki.value[1].value),
+      cid.issuer_key_hash
   end
 
   def test_certificate_id_hash_algorithm
diff --git a/test/mri/openssl/test_ossl.rb b/test/mri/openssl/test_ossl.rb
index 3a90ead10a1..51262985f56 100644
--- a/test/mri/openssl/test_ossl.rb
+++ b/test/mri/openssl/test_ossl.rb
@@ -3,51 +3,45 @@
 
 if defined?(OpenSSL)
 
-class OpenSSL::OSSL < OpenSSL::SSLTestCase
+class OpenSSL::TestOSSL < OpenSSL::TestCase
   def test_fixed_length_secure_compare
     assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "a") }
     assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aa") }
 
-    assert OpenSSL.fixed_length_secure_compare("aaa", "aaa")
-    assert OpenSSL.fixed_length_secure_compare(
+    assert_true(OpenSSL.fixed_length_secure_compare("aaa", "aaa"))
+    assert_true(OpenSSL.fixed_length_secure_compare(
       OpenSSL::Digest.digest('SHA256', "aaa"), OpenSSL::Digest::SHA256.digest("aaa")
-    )
+    ))
 
     assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aaaa") }
-    refute OpenSSL.fixed_length_secure_compare("aaa", "baa")
-    refute OpenSSL.fixed_length_secure_compare("aaa", "aba")
-    refute OpenSSL.fixed_length_secure_compare("aaa", "aab")
+    assert_false(OpenSSL.fixed_length_secure_compare("aaa", "baa"))
+    assert_false(OpenSSL.fixed_length_secure_compare("aaa", "aba"))
+    assert_false(OpenSSL.fixed_length_secure_compare("aaa", "aab"))
     assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aaab") }
     assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "b") }
     assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "bb") }
-    refute OpenSSL.fixed_length_secure_compare("aaa", "bbb")
+    assert_false(OpenSSL.fixed_length_secure_compare("aaa", "bbb"))
     assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "bbbb") }
   end
 
   def test_secure_compare
-    refute OpenSSL.secure_compare("aaa", "a")
-    refute OpenSSL.secure_compare("aaa", "aa")
+    assert_false(OpenSSL.secure_compare("aaa", "a"))
+    assert_false(OpenSSL.secure_compare("aaa", "aa"))
 
-    assert OpenSSL.secure_compare("aaa", "aaa")
+    assert_true(OpenSSL.secure_compare("aaa", "aaa"))
 
-    refute OpenSSL.secure_compare("aaa", "aaaa")
-    refute OpenSSL.secure_compare("aaa", "baa")
-    refute OpenSSL.secure_compare("aaa", "aba")
-    refute OpenSSL.secure_compare("aaa", "aab")
-    refute OpenSSL.secure_compare("aaa", "aaab")
-    refute OpenSSL.secure_compare("aaa", "b")
-    refute OpenSSL.secure_compare("aaa", "bb")
-    refute OpenSSL.secure_compare("aaa", "bbb")
-    refute OpenSSL.secure_compare("aaa", "bbbb")
+    assert_false(OpenSSL.secure_compare("aaa", "aaaa"))
+    assert_false(OpenSSL.secure_compare("aaa", "baa"))
+    assert_false(OpenSSL.secure_compare("aaa", "aba"))
+    assert_false(OpenSSL.secure_compare("aaa", "aab"))
+    assert_false(OpenSSL.secure_compare("aaa", "aaab"))
+    assert_false(OpenSSL.secure_compare("aaa", "b"))
+    assert_false(OpenSSL.secure_compare("aaa", "bb"))
+    assert_false(OpenSSL.secure_compare("aaa", "bbb"))
+    assert_false(OpenSSL.secure_compare("aaa", "bbbb"))
   end
 
   def test_memcmp_timing
-    begin
-      require "benchmark"
-    rescue LoadError
-      pend "Benchmark is not available in this environment. Please install it with `gem install benchmark`."
-    end
-
     # Ensure using fixed_length_secure_compare takes almost exactly the same amount of time to compare two different strings.
     # Regular string comparison will short-circuit on the first non-matching character, failing this test.
     # NOTE: this test may be susceptible to noise if the system running the tests is otherwise under load.
@@ -58,24 +52,41 @@ def test_memcmp_timing
 
     a_b_time = a_c_time = 0
     100.times do
-      a_b_time += Benchmark.measure { 100.times { OpenSSL.fixed_length_secure_compare(a, b) } }.real
-      a_c_time += Benchmark.measure { 100.times { OpenSSL.fixed_length_secure_compare(a, c) } }.real
+      t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      100.times { OpenSSL.fixed_length_secure_compare(a, b) }
+      t2 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      100.times { OpenSSL.fixed_length_secure_compare(a, c) }
+      t3 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      a_b_time += t2 - t1
+      a_c_time += t3 - t2
     end
     assert_operator(a_b_time, :<, a_c_time * 10, "fixed_length_secure_compare timing test failed")
     assert_operator(a_c_time, :<, a_b_time * 10, "fixed_length_secure_compare timing test failed")
-  end
+  end if ENV["OSSL_TEST_ALL"] == "1"
 
   def test_error_data
-    # X509V3_EXT_nconf_nid() called from OpenSSL::X509::ExtensionFactory#create_ext is a function
-    # that uses ERR_raise_data() to append additional information about the error.
+    # X509V3_EXT_nconf_nid() called from
+    # OpenSSL::X509::ExtensionFactory#create_ext is a function that uses
+    # ERR_raise_data() to append additional information about the error.
     #
     # The generated message should look like:
     #     "subjectAltName = IP:not.a.valid.ip.address: bad ip address (value=not.a.valid.ip.address)"
     #     "subjectAltName = IP:not.a.valid.ip.address: error in extension (name=subjectAltName, value=IP:not.a.valid.ip.address)"
+    #
+    # The string inside parentheses is the ERR_TXT_STRING data, and is appended
+    # by ossl_make_error(), so we check it here.
     ef = OpenSSL::X509::ExtensionFactory.new
-    assert_raise_with_message(OpenSSL::X509::ExtensionError, /value=(IP:)?not.a.valid.ip.address\)/) {
+    e = assert_raise(OpenSSL::X509::ExtensionError) {
       ef.create_ext("subjectAltName", "IP:not.a.valid.ip.address")
     }
+    assert_match(/not.a.valid.ip.address\)\z/, e.message)
+
+    # We currently craft the strings based on ERR_error_string()'s style:
+    #     error:<error code in hex>:<library>:<function>:<reason> (data)
+    assert_instance_of(Array, e.errors)
+    assert_match(/\Aerror:.*not.a.valid.ip.address\)\z/, e.errors.last)
+    assert_include(e.detailed_message, "not.a.valid.ip.address")
   end
 end
 
diff --git a/test/mri/openssl/test_pkcs12.rb b/test/mri/openssl/test_pkcs12.rb
index 68a23b28c08..1b5328774e4 100644
--- a/test/mri/openssl/test_pkcs12.rb
+++ b/test/mri/openssl/test_pkcs12.rb
@@ -178,6 +178,8 @@ def test_create_with_mac_itr
     end
 
     def test_create_with_keytype
+      omit "AWS-LC does not support KEY_SIG and KEY_EX" if aws_lc?
+
       OpenSSL::PKCS12.create(
         "omg",
         "hello",
diff --git a/test/mri/openssl/test_pkcs7.rb b/test/mri/openssl/test_pkcs7.rb
index 862716b4d82..b3129c0cdfe 100644
--- a/test/mri/openssl/test_pkcs7.rb
+++ b/test/mri/openssl/test_pkcs7.rb
@@ -6,92 +6,125 @@
 class OpenSSL::TestPKCS7 < OpenSSL::TestCase
   def setup
     super
-    @rsa1024 = Fixtures.pkey("rsa1024")
-    @rsa2048 = Fixtures.pkey("rsa2048")
-    ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
-    ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
-    ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
+    @ca_key = Fixtures.pkey("rsa-1")
+    @ee1_key = Fixtures.pkey("rsa-2")
+    @ee2_key = Fixtures.pkey("rsa-3")
+    ca = OpenSSL::X509::Name.new([["CN", "CA"]])
+    ee1 = OpenSSL::X509::Name.new([["CN", "EE1"]])
+    ee2 = OpenSSL::X509::Name.new([["CN", "EE2"]])
 
     ca_exts = [
-      ["basicConstraints","CA:TRUE",true],
-      ["keyUsage","keyCertSign, cRLSign",true],
-      ["subjectKeyIdentifier","hash",false],
-      ["authorityKeyIdentifier","keyid:always",false],
+      ["basicConstraints", "CA:TRUE", true],
+      ["keyUsage", "keyCertSign, cRLSign", true],
+      ["subjectKeyIdentifier", "hash", false],
+      ["authorityKeyIdentifier", "keyid:always", false],
     ]
-    @ca_cert = issue_cert(ca, @rsa2048, 1, ca_exts, nil, nil)
+    @ca_cert = issue_cert(ca, @ca_key, 1, ca_exts, nil, nil)
     ee_exts = [
-      ["keyUsage","Non Repudiation, Digital Signature, Key Encipherment",true],
-      ["authorityKeyIdentifier","keyid:always",false],
-      ["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false],
+      ["keyUsage", "nonRepudiation, digitalSignature, keyEncipherment", true],
+      ["authorityKeyIdentifier", "keyid:always", false],
+      ["extendedKeyUsage", "clientAuth, emailProtection, codeSigning", false],
     ]
-    @ee1_cert = issue_cert(ee1, @rsa1024, 2, ee_exts, @ca_cert, @rsa2048)
-    @ee2_cert = issue_cert(ee2, @rsa1024, 3, ee_exts, @ca_cert, @rsa2048)
+    @ee1_cert = issue_cert(ee1, @ee1_key, 2, ee_exts, @ca_cert, @ca_key)
+    @ee2_cert = issue_cert(ee2, @ee2_key, 3, ee_exts, @ca_cert, @ca_key)
   end
 
   def test_signed
     store = OpenSSL::X509::Store.new
     store.add_cert(@ca_cert)
+
+    data = "aaaaa\nbbbbb\nccccc\n"
     ca_certs = [@ca_cert]
+    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @ee1_key, data, ca_certs)
+    # TODO: #data contains untranslated content
+    assert_equal("aaaaa\nbbbbb\nccccc\n", tmp.data)
+    assert_nil(tmp.error_string)
 
-    data = "aaaaa\r\nbbbbb\r\nccccc\r\n"
-    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs)
     p7 = OpenSSL::PKCS7.new(tmp.to_der)
+    assert_nil(p7.data)
+    assert_nil(p7.error_string)
+
+    assert_true(p7.verify([], store))
+    # AWS-LC does not appear to convert to CRLF automatically
+    assert_equal("aaaaa\r\nbbbbb\r\nccccc\r\n", p7.data) unless aws_lc?
+    assert_nil(p7.error_string)
+
     certs = p7.certificates
-    signers = p7.signers
-    assert(p7.verify([], store))
-    assert_equal(data, p7.data)
     assert_equal(2, certs.size)
-    assert_equal(@ee1_cert.subject.to_s, certs[0].subject.to_s)
-    assert_equal(@ca_cert.subject.to_s, certs[1].subject.to_s)
+    assert_equal(@ee1_cert.subject, certs[0].subject)
+    assert_equal(@ca_cert.subject, certs[1].subject)
+
+    signers = p7.signers
     assert_equal(1, signers.size)
     assert_equal(@ee1_cert.serial, signers[0].serial)
-    assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+    assert_equal(@ee1_cert.issuer, signers[0].issuer)
+    # AWS-LC does not generate authenticatedAttributes
+    assert_in_delta(Time.now, signers[0].signed_time, 10) unless aws_lc?
+
+    assert_false(p7.verify([@ca_cert], OpenSSL::X509::Store.new))
+  end
+
+  def test_signed_flags
+    store = OpenSSL::X509::Store.new
+    store.add_cert(@ca_cert)
 
     # Normally OpenSSL tries to translate the supplied content into canonical
     # MIME format (e.g. a newline character is converted into CR+LF).
     # If the content is a binary, PKCS7::BINARY flag should be used.
-
+    #
+    # PKCS7::NOATTR flag suppresses authenticatedAttributes.
     data = "aaaaa\nbbbbb\nccccc\n"
-    flag = OpenSSL::PKCS7::BINARY
-    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
+    flag = OpenSSL::PKCS7::BINARY | OpenSSL::PKCS7::NOATTR
+    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @ee1_key, data, [@ca_cert], flag)
     p7 = OpenSSL::PKCS7.new(tmp.to_der)
-    certs = p7.certificates
-    signers = p7.signers
-    assert(p7.verify([], store))
+
+    assert_true(p7.verify([], store))
     assert_equal(data, p7.data)
+
+    certs = p7.certificates
     assert_equal(2, certs.size)
-    assert_equal(@ee1_cert.subject.to_s, certs[0].subject.to_s)
-    assert_equal(@ca_cert.subject.to_s, certs[1].subject.to_s)
+    assert_equal(@ee1_cert.subject, certs[0].subject)
+    assert_equal(@ca_cert.subject, certs[1].subject)
+
+    signers = p7.signers
     assert_equal(1, signers.size)
     assert_equal(@ee1_cert.serial, signers[0].serial)
-    assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+    assert_equal(@ee1_cert.issuer, signers[0].issuer)
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { signers[0].signed_time }
+  end
+
+  def test_signed_multiple_signers
+    store = OpenSSL::X509::Store.new
+    store.add_cert(@ca_cert)
 
     # A signed-data which have multiple signatures can be created
     # through the following steps.
     #   1. create two signed-data
     #   2. copy signerInfo and certificate from one to another
-
-    tmp1 = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, [], flag)
-    tmp2 = OpenSSL::PKCS7.sign(@ee2_cert, @rsa1024, data, [], flag)
+    data = "aaaaa\r\nbbbbb\r\nccccc\r\n"
+    tmp1 = OpenSSL::PKCS7.sign(@ee1_cert, @ee1_key, data)
+    tmp2 = OpenSSL::PKCS7.sign(@ee2_cert, @ee2_key, data)
     tmp1.add_signer(tmp2.signers[0])
     tmp1.add_certificate(@ee2_cert)
 
     p7 = OpenSSL::PKCS7.new(tmp1.to_der)
-    certs = p7.certificates
-    signers = p7.signers
-    assert(p7.verify([], store))
+    assert_true(p7.verify([], store))
     assert_equal(data, p7.data)
+
+    certs = p7.certificates
     assert_equal(2, certs.size)
+
+    signers = p7.signers
     assert_equal(2, signers.size)
     assert_equal(@ee1_cert.serial, signers[0].serial)
-    assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+    assert_equal(@ee1_cert.issuer, signers[0].issuer)
     assert_equal(@ee2_cert.serial, signers[1].serial)
-    assert_equal(@ee2_cert.issuer.to_s, signers[1].issuer.to_s)
+    assert_equal(@ee2_cert.issuer, signers[1].issuer)
   end
 
   def test_signed_add_signer
     data = "aaaaa\nbbbbb\nccccc\n"
-    psi = OpenSSL::PKCS7::SignerInfo.new(@ee1_cert, @rsa1024, "sha256")
+    psi = OpenSSL::PKCS7::SignerInfo.new(@ee1_cert, @ee1_key, "sha256")
     p7 = OpenSSL::PKCS7.new
     p7.type = :signed
     p7.add_signer(psi)
@@ -110,30 +143,82 @@ def test_signed_add_signer
   def test_detached_sign
     store = OpenSSL::X509::Store.new
     store.add_cert(@ca_cert)
-    ca_certs = [@ca_cert]
 
     data = "aaaaa\nbbbbb\nccccc\n"
+    ca_certs = [@ca_cert]
     flag = OpenSSL::PKCS7::BINARY|OpenSSL::PKCS7::DETACHED
-    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
+    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @ee1_key, data, ca_certs, flag)
     p7 = OpenSSL::PKCS7.new(tmp.to_der)
-    assert_nothing_raised do
-      OpenSSL::ASN1.decode(p7)
-    end
+    assert_predicate(p7, :detached?)
+    assert_true(p7.detached)
 
-    certs = p7.certificates
-    signers = p7.signers
-    assert(!p7.verify([], store))
-    assert(p7.verify([], store, data))
+    assert_false(p7.verify([], store))
+    # FIXME: Should it be nil?
+    assert_equal("", p7.data)
+    assert_match(/no content|NO_CONTENT/, p7.error_string)
+
+    assert_true(p7.verify([], store, data))
     assert_equal(data, p7.data)
+    assert_nil(p7.error_string)
+
+    certs = p7.certificates
     assert_equal(2, certs.size)
-    assert_equal(@ee1_cert.subject.to_s, certs[0].subject.to_s)
-    assert_equal(@ca_cert.subject.to_s, certs[1].subject.to_s)
+    assert_equal(@ee1_cert.subject, certs[0].subject)
+    assert_equal(@ca_cert.subject, certs[1].subject)
+
+    signers = p7.signers
     assert_equal(1, signers.size)
     assert_equal(@ee1_cert.serial, signers[0].serial)
-    assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+    assert_equal(@ee1_cert.issuer, signers[0].issuer)
+  end
+
+  def test_signed_authenticated_attributes
+    # Using static PEM data because AWS-LC does not support generating one
+    # with authenticatedAttributes.
+    #
+    # p7 was generated with OpenSSL 3.4.1 with this program with commandline
+    # "faketime 2025-04-03Z ruby prog.rb":
+    #
+    #   require_relative "test/openssl/utils"
+    #   include OpenSSL::TestUtils
+    #   key = Fixtures.pkey("p256")
+    #   cert = issue_cert(OpenSSL::X509::Name.new([["CN", "cert"]]), key, 1, [], nil, nil)
+    #   p7 = OpenSSL::PKCS7.sign(cert, key, "content", [])
+    #   puts p7.to_pem
+    p7 = OpenSSL::PKCS7.new(<<~EOF)
+-----BEGIN PKCS7-----
+MIICvgYJKoZIhvcNAQcCoIICrzCCAqsCAQExDzANBglghkgBZQMEAgEFADAWBgkq
+hkiG9w0BBwGgCQQHY29udGVudKCCAQ4wggEKMIGxoAMCAQICAQEwCgYIKoZIzj0E
+AwIwDzENMAsGA1UEAwwEY2VydDAeFw0yNTA0MDIyMzAwMDFaFw0yNTA0MDMwMTAw
+MDFaMA8xDTALBgNVBAMMBGNlcnQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQW
+CWTZz6hVQgpDrh5kb1uEs09YHuVJn8CsrjV4bLnADNT/QbnVe20J4FSX4xqFm2f1
+87Ukp0XiomZLf11eekQ2MAoGCCqGSM49BAMCA0gAMEUCIEg1fDI8b3hZAArgniVk
+HeM6puwgcMh5NXwvJ9x0unVmAiEAppecVTSQ+yEPyBG415Og6sK+RC78pcByEC81
+C/QSwRYxggFpMIIBZQIBATAUMA8xDTALBgNVBAMMBGNlcnQCAQEwDQYJYIZIAWUD
+BAIBBQCggeQwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUx
+DxcNMjUwNDAzMDAwMDAxWjAvBgkqhkiG9w0BCQQxIgQg7XACtDnprIRfIjV9gius
+FERzD722AW0+yUMil7nsn3MweQYJKoZIhvcNAQkPMWwwajALBglghkgBZQMEASow
+CwYJYIZIAWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0D
+AgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwCgYI
+KoZIzj0EAwIESDBGAiEAssymc28HySAhg+XeWIpSbtzkwycr2JG6dzHRZ+vn0ocC
+IQCJVpo1FTLZOHSc9UpjS+VKR4cg50Iz0HiPyo6hwjCrwA==
+-----END PKCS7-----
+    EOF
+
+    cert = p7.certificates[0]
+    store = OpenSSL::X509::Store.new.tap { |store|
+      store.time = Time.utc(2025, 4, 3)
+      store.add_cert(cert)
+    }
+    assert_equal(true, p7.verify([], store))
+    assert_equal(1, p7.signers.size)
+    signer = p7.signers[0]
+    assert_in_delta(Time.utc(2025, 4, 3), signer.signed_time, 10)
   end
 
   def test_enveloped
+    omit_on_fips # PKCS #1 v1.5 padding
+
     certs = [@ee1_cert, @ee2_cert]
     cipher = OpenSSL::Cipher::AES.new("128-CBC")
     data = "aaaaa\nbbbbb\nccccc\n"
@@ -144,15 +229,20 @@ def test_enveloped
     assert_equal(:enveloped, p7.type)
     assert_equal(2, recip.size)
 
-    assert_equal(@ca_cert.subject.to_s, recip[0].issuer.to_s)
-    assert_equal(2, recip[0].serial)
-    assert_equal(data, p7.decrypt(@rsa1024, @ee1_cert))
+    assert_equal(@ca_cert.subject, recip[0].issuer)
+    assert_equal(@ee1_cert.serial, recip[0].serial)
+    assert_equal(16, @ee1_key.decrypt(recip[0].enc_key).size)
+    assert_equal(data, p7.decrypt(@ee1_key, @ee1_cert))
 
-    assert_equal(@ca_cert.subject.to_s, recip[1].issuer.to_s)
-    assert_equal(3, recip[1].serial)
-    assert_equal(data, p7.decrypt(@rsa1024, @ee2_cert))
+    assert_equal(@ca_cert.subject, recip[1].issuer)
+    assert_equal(@ee2_cert.serial, recip[1].serial)
+    assert_equal(data, p7.decrypt(@ee2_key, @ee2_cert))
 
-    assert_equal(data, p7.decrypt(@rsa1024))
+    assert_equal(data, p7.decrypt(@ee1_key))
+
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) {
+      p7.decrypt(@ca_key, @ca_cert)
+    }
 
     # Default cipher has been removed in v3.3
     assert_raise_with_message(ArgumentError, /RC2-40-CBC/) {
@@ -160,9 +250,61 @@ def test_enveloped
     }
   end
 
+  def test_enveloped_add_recipient
+    omit_on_fips # PKCS #1 v1.5 padding
+
+    data = "aaaaa\nbbbbb\nccccc\n"
+    ktri_ee1 = OpenSSL::PKCS7::RecipientInfo.new(@ee1_cert)
+    ktri_ee2 = OpenSSL::PKCS7::RecipientInfo.new(@ee2_cert)
+
+    tmp = OpenSSL::PKCS7.new
+    tmp.type = :enveloped
+    tmp.cipher = "AES-128-CBC"
+    tmp.add_recipient(ktri_ee1)
+    tmp.add_recipient(ktri_ee2)
+    tmp.add_data(data)
+
+    p7 = OpenSSL::PKCS7.new(tmp.to_der)
+    assert_equal(:enveloped, p7.type)
+    assert_equal(data, p7.decrypt(@ee1_key, @ee1_cert))
+    assert_equal(data, p7.decrypt(@ee2_key, @ee2_cert))
+    assert_equal([@ee1_cert.serial, @ee2_cert.serial].sort,
+                 p7.recipients.map(&:serial).sort)
+  end
+
+  def test_data
+    asn1 = OpenSSL::ASN1::Sequence([
+      OpenSSL::ASN1::ObjectId("pkcs7-data"),
+      OpenSSL::ASN1::OctetString("content", 0, :EXPLICIT),
+    ])
+    p7 = OpenSSL::PKCS7.new
+    p7.type = :data
+    p7.data = "content"
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { p7.add_certificate(@ee1_cert) }
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { p7.certificates = [@ee1_cert] }
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { p7.cipher = "aes-128-cbc" }
+    assert_equal(asn1.to_der, p7.to_der)
+
+    p7 = OpenSSL::PKCS7.new(asn1)
+    assert_equal(:data, p7.type)
+    assert_equal(false, p7.detached)
+    assert_equal(false, p7.detached?)
+    # Not applicable
+    assert_nil(p7.certificates)
+    assert_nil(p7.crls)
+    # Not applicable. Should they return nil or raise an exception instead?
+    assert_equal([], p7.signers)
+    assert_equal([], p7.recipients)
+    # PKCS7#verify can't distinguish verification failure and other errors
+    store = OpenSSL::X509::Store.new
+    assert_equal(false, p7.verify([@ee1_cert], store))
+    assert_match(/wrong content type|WRONG_CONTENT_TYPE/, p7.error_string)
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { p7.decrypt(@ee1_key) }
+  end
+
   def test_empty_signed_data_ruby_bug_19974
     data = "-----BEGIN PKCS7-----\nMAsGCSqGSIb3DQEHAg==\n-----END PKCS7-----\n"
-    assert_raise(ArgumentError) { OpenSSL::PKCS7.new(data) }
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { OpenSSL::PKCS7.new(data) }
 
     data = <<END
 MIME-Version: 1.0
@@ -176,8 +318,8 @@ def test_empty_signed_data_ruby_bug_19974
   end
 
   def test_graceful_parsing_failure #[ruby-core:43250]
-    contents = File.read(__FILE__)
-    assert_raise(ArgumentError) { OpenSSL::PKCS7.new(contents) }
+    contents = "not a valid PKCS #7 PEM block"
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { OpenSSL::PKCS7.new(contents) }
   end
 
   def test_set_type_signed
@@ -198,12 +340,6 @@ def test_set_type_signed_and_enveloped
     assert_equal(:signedAndEnveloped, p7.type)
   end
 
-  def test_set_type_enveloped
-    p7 = OpenSSL::PKCS7.new
-    p7.type = "enveloped"
-    assert_equal(:enveloped, p7.type)
-  end
-
   def test_set_type_encrypted
     p7 = OpenSSL::PKCS7.new
     p7.type = "encrypted"
@@ -211,12 +347,14 @@ def test_set_type_encrypted
   end
 
   def test_smime
+    pend "AWS-LC has no current support for SMIME with PKCS7" if aws_lc?
+
     store = OpenSSL::X509::Store.new
     store.add_cert(@ca_cert)
     ca_certs = [@ca_cert]
 
     data = "aaaaa\r\nbbbbb\r\nccccc\r\n"
-    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs)
+    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @ee1_key, data, ca_certs)
     p7 = OpenSSL::PKCS7.new(tmp.to_der)
     smime = OpenSSL::PKCS7.write_smime(p7)
     assert_equal(true, smime.start_with?(<<END))
@@ -233,6 +371,8 @@ def test_smime
   end
 
   def test_to_text
+    omit "AWS-LC does not support PKCS7.to_text" if aws_lc?
+
     p7 = OpenSSL::PKCS7.new
     p7.type = "signed"
     assert_match(/signed/, p7.to_text)
@@ -275,78 +415,34 @@ def test_degenerate_pkcs7
     end
   end
 
-  def test_split_content
-     pki_message_pem = <<END
------BEGIN PKCS7-----
-MIIHSwYJKoZIhvcNAQcCoIIHPDCCBzgCAQExCzAJBgUrDgMCGgUAMIIDiAYJKoZI
-hvcNAQcBoIIDeQSCA3UwgAYJKoZIhvcNAQcDoIAwgAIBADGCARAwggEMAgEAMHUw
-cDEQMA4GA1UECgwHZXhhbXBsZTEXMBUGA1UEAwwOVEFSTUFDIFJPT1QgQ0ExIjAg
-BgkqhkiG9w0BCQEWE3NvbWVvbmVAZXhhbXBsZS5vcmcxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQHDAlUb3duIEhhbGwCAWYwDQYJKoZIhvcNAQEBBQAEgYBspXXse8ZhG1FE
-E3PVAulbvrdR52FWPkpeLvSjgEkYzTiUi0CC3poUL1Ku5mOlavWAJgoJpFICDbvc
-N4ZNDCwOhnzoI9fMGmm1gvPQy15BdhhZRo9lP7Ga/Hg2APKT0/0yhPsmJ+w+u1e7
-OoJEVeEZ27x3+u745bGEcu8of5th6TCABgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcE
-CBNs2U5mMsd/oIAEggIQU6cur8QBz02/4eMpHdlU9IkyrRMiaMZ/ky9zecOAjnvY
-d2jZqS7RhczpaNJaSli3GmDsKrF+XqE9J58s9ScGqUigzapusTsxIoRUPr7Ztb0a
-pg8VWDipAsuw7GfEkgx868sV93uC4v6Isfjbhd+JRTFp/wR1kTi7YgSXhES+RLUW
-gQbDIDgEQYxJ5U951AJtnSpjs9za2ZkTdd8RSEizJK0bQ1vqLoApwAVgZqluATqQ
-AHSDCxhweVYw6+y90B9xOrqPC0eU7Wzryq2+Raq5ND2Wlf5/N11RQ3EQdKq/l5Te
-ijp9PdWPlkUhWVoDlOFkysjk+BE+7AkzgYvz9UvBjmZsMsWqf+KsZ4S8/30ndLzu
-iucsu6eOnFLLX8DKZxV6nYffZOPzZZL8hFBcE7PPgSdBEkazMrEBXq1j5mN7exbJ
-NOA5uGWyJNBMOCe+1JbxG9UeoqvCCTHESxEeDu7xR3NnSOD47n7cXwHr81YzK2zQ
-5oWpP3C8jzI7tUjLd1S0Z3Psd17oaCn+JOfUtuB0nc3wfPF/WPo0xZQodWxp2/Cl
-EltR6qr1zf5C7GwmLzBZ6bHFAIT60/JzV0/56Pn8ztsRFtI4cwaBfTfvnwi8/sD9
-/LYOMY+/b6UDCUSR7RTN7XfrtAqDEzSdzdJkOWm1jvM8gkLmxpZdvxG3ZvDYnEQE
-5Nq+un5nAny1wf3rWierBAjE5ntiAmgs5AAAAAAAAAAAAACgggHqMIIB5jCCAU+g
-AwIBAgIBATANBgkqhkiG9w0BAQUFADAvMS0wKwYDVQQDEyQwQUM5RjAyNi1EQ0VB
-LTRDMTItOTEyNy1DMEZEN0QyQThCNUEwHhcNMTIxMDE5MDk0NTQ3WhcNMTMxMDE5
-MDk0NTQ3WjAvMS0wKwYDVQQDEyQwQUM5RjAyNi1EQ0VBLTRDMTItOTEyNy1DMEZE
-N0QyQThCNUEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALTsTNyGIsKvyw56
-WI3Gll/RmjsupkrdEtPbx7OjS9MEgyhOAf9+u6CV0LJGHpy7HUeROykF6xpbSdCm
-Mr6kNObl5N0ljOb8OmV4atKjmGg1rWawDLyDQ9Dtuby+dzfHtzAzP+J/3ZoOtSqq
-AHVTnCclU1pm/uHN0HZ5nL5iLJTvAgMBAAGjEjAQMA4GA1UdDwEB/wQEAwIFoDAN
-BgkqhkiG9w0BAQUFAAOBgQA8K+BouEV04HRTdMZd3akjTQOm6aEGW4nIRnYIf8ZV
-mvUpLirVlX/unKtJinhGisFGpuYLMpemx17cnGkBeLCQRvHQjC+ho7l8/LOGheMS
-nvu0XHhvmJtRbm8MKHhogwZqHFDnXonvjyqhnhEtK5F2Fimcce3MoF2QtEe0UWv/
-8DGCAaowggGmAgEBMDQwLzEtMCsGA1UEAxMkMEFDOUYwMjYtRENFQS00QzEyLTkx
-MjctQzBGRDdEMkE4QjVBAgEBMAkGBSsOAwIaBQCggc0wEgYKYIZIAYb4RQEJAjEE
-EwIxOTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0x
-MjEwMTkwOTQ1NDdaMCAGCmCGSAGG+EUBCQUxEgQQ2EFUJdQNwQDxclIQ8qNyYzAj
-BgkqhkiG9w0BCQQxFgQUy8GFXPpAwRJUT3rdvNC9Pn+4eoswOAYKYIZIAYb4RQEJ
-BzEqEygwRkU3QzJEQTVEMDc2NzFFOTcxNDlCNUE3MDRCMERDNkM4MDYwRDJBMA0G
-CSqGSIb3DQEBAQUABIGAWUNdzvU2iiQOtihBwF0h48Nnw/2qX8uRjg6CVTOMcGji
-BxjUMifEbT//KJwljshl4y3yBLqeVYLOd04k6aKSdjgdZnrnUPI6p5tL5PfJkTAE
-L6qflZ9YCU5erE4T5U98hCQBMh4nOYxgaTjnZzhpkKQuEiKq/755cjzTzlI/eok=
------END PKCS7-----
-END
-    pki_message_content_pem = <<END
------BEGIN PKCS7-----
-MIIDawYJKoZIhvcNAQcDoIIDXDCCA1gCAQAxggEQMIIBDAIBADB1MHAxEDAOBgNV
-BAoMB2V4YW1wbGUxFzAVBgNVBAMMDlRBUk1BQyBST09UIENBMSIwIAYJKoZIhvcN
-AQkBFhNzb21lb25lQGV4YW1wbGUub3JnMQswCQYDVQQGEwJVUzESMBAGA1UEBwwJ
-VG93biBIYWxsAgFmMA0GCSqGSIb3DQEBAQUABIGAbKV17HvGYRtRRBNz1QLpW763
-UedhVj5KXi70o4BJGM04lItAgt6aFC9SruZjpWr1gCYKCaRSAg273DeGTQwsDoZ8
-6CPXzBpptYLz0MteQXYYWUaPZT+xmvx4NgDyk9P9MoT7JifsPrtXuzqCRFXhGdu8
-d/ru+OWxhHLvKH+bYekwggI9BgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcECBNs2U5m
-Msd/gIICGFOnLq/EAc9Nv+HjKR3ZVPSJMq0TImjGf5Mvc3nDgI572Hdo2aku0YXM
-6WjSWkpYtxpg7Cqxfl6hPSefLPUnBqlIoM2qbrE7MSKEVD6+2bW9GqYPFVg4qQLL
-sOxnxJIMfOvLFfd7guL+iLH424XfiUUxaf8EdZE4u2IEl4REvkS1FoEGwyA4BEGM
-SeVPedQCbZ0qY7Pc2tmZE3XfEUhIsyStG0Nb6i6AKcAFYGapbgE6kAB0gwsYcHlW
-MOvsvdAfcTq6jwtHlO1s68qtvkWquTQ9lpX+fzddUUNxEHSqv5eU3oo6fT3Vj5ZF
-IVlaA5ThZMrI5PgRPuwJM4GL8/VLwY5mbDLFqn/irGeEvP99J3S87ornLLunjpxS
-y1/AymcVep2H32Tj82WS/IRQXBOzz4EnQRJGszKxAV6tY+Zje3sWyTTgObhlsiTQ
-TDgnvtSW8RvVHqKrwgkxxEsRHg7u8UdzZ0jg+O5+3F8B6/NWMyts0OaFqT9wvI8y
-O7VIy3dUtGdz7Hde6Ggp/iTn1LbgdJ3N8Hzxf1j6NMWUKHVsadvwpRJbUeqq9c3+
-QuxsJi8wWemxxQCE+tPyc1dP+ej5/M7bERbSOHMGgX03758IvP7A/fy2DjGPv2+l
-AwlEke0Uze1367QKgxM0nc3SZDlptY7zPIJC5saWXb8Rt2bw2JxEBOTavrp+ZwJ8
-tcH961onq8Tme2ICaCzk
------END PKCS7-----
-END
-    pki_msg = OpenSSL::PKCS7.new(pki_message_pem)
-    store = OpenSSL::X509::Store.new
-    pki_msg.verify(nil, store, nil, OpenSSL::PKCS7::NOVERIFY)
-    p7enc = OpenSSL::PKCS7.new(pki_msg.data)
-    assert_equal(pki_message_content_pem, p7enc.to_pem)
+  def test_decode_ber_constructed_string
+    omit_on_fips # PKCS #1 v1.5 padding
+
+    p7 = OpenSSL::PKCS7.encrypt([@ee1_cert], "content", "aes-128-cbc")
+
+    # Make an equivalent BER to p7.to_der. Here we convert the encryptedContent
+    # field of EncryptedContentInfo into a constructed encoding using the
+    # indefinite length form.
+    # See https://www.rfc-editor.org/rfc/rfc2315#section-10.1
+    asn1 = OpenSSL::ASN1.decode(p7.to_der)
+    asn1.indefinite_length = true
+    enveloped_data_explicit_tag = asn1.value[1]
+    enveloped_data_explicit_tag.indefinite_length = true
+    enveloped_data = enveloped_data_explicit_tag.value[0]
+    enveloped_data.indefinite_length = true
+    encrypted_content_info = enveloped_data.value[2]
+    encrypted_content_info.indefinite_length = true
+    orig = encrypted_content_info.value[2]
+    encrypted_content_info.value[2] = OpenSSL::ASN1::ASN1Data.new([
+      OpenSSL::ASN1::OctetString(orig.value[...5]),
+      OpenSSL::ASN1::OctetString(orig.value[5...]),
+    ], 0, :CONTEXT_SPECIFIC).tap { |x| x.indefinite_length = true }
+
+    assert_not_equal(p7.to_der, asn1.to_der)
+    assert_equal(p7.to_der, OpenSSL::PKCS7.new(asn1.to_der).to_der)
+
+    assert_equal("content", OpenSSL::PKCS7.new(p7.to_der).decrypt(@ee1_key))
+    assert_equal("content", OpenSSL::PKCS7.new(asn1.to_der).decrypt(@ee1_key))
   end
 end
 
diff --git a/test/mri/openssl/test_pkey.rb b/test/mri/openssl/test_pkey.rb
index aae6b7e0717..88299888f04 100644
--- a/test/mri/openssl/test_pkey.rb
+++ b/test/mri/openssl/test_pkey.rb
@@ -2,28 +2,13 @@
 require_relative "utils"
 
 class OpenSSL::TestPKey < OpenSSL::PKeyTestCase
-  def test_generic_oid_inspect
+  def test_generic_oid_inspect_rsa
     # RSA private key
     rsa = Fixtures.pkey("rsa-1")
     assert_instance_of OpenSSL::PKey::RSA, rsa
     assert_equal "rsaEncryption", rsa.oid
     assert_match %r{oid=rsaEncryption}, rsa.inspect
-
-    # X25519 private key
-    x25519_pem = <<~EOF
-    -----BEGIN PRIVATE KEY-----
-    MC4CAQAwBQYDK2VuBCIEIHcHbQpzGKV9PBbBclGyZkXfTC+H68CZKrF3+6UduSwq
-    -----END PRIVATE KEY-----
-    EOF
-    begin
-      x25519 = OpenSSL::PKey.read(x25519_pem)
-    rescue OpenSSL::PKey::PKeyError
-      # OpenSSL < 1.1.0
-      pend "X25519 is not implemented"
-    end
-    assert_instance_of OpenSSL::PKey::PKey, x25519
-    assert_equal "X25519", x25519.oid
-    assert_match %r{oid=X25519}, x25519.inspect
+    assert_match %r{type_name=RSA}, rsa.inspect if openssl?(3, 0, 0)
   end
 
   def test_s_generate_parameters
@@ -75,6 +60,111 @@ def test_s_generate_key
     assert_not_equal nil, pkey.private_key
   end
 
+  def test_s_read_pem_unknown_block
+    # A PEM-encoded certificate and a PEM-encoded private key are combined.
+    # Check that OSSL_STORE doesn't stop after the first PEM block.
+    orig = Fixtures.pkey("rsa-1")
+    subject = OpenSSL::X509::Name.new([["CN", "test"]])
+    cert = issue_cert(subject, orig, 1, [], nil, nil)
+
+    input = cert.to_text + cert.to_pem + orig.to_text + orig.private_to_pem
+    pkey = OpenSSL::PKey.read(input)
+    assert_equal(orig.private_to_der, pkey.private_to_der)
+  end
+
+  def test_s_read_der_then_pem
+    # If the input is valid as both DER and PEM (which allows garbage data
+    # before and after the block), it is read as DER
+    #
+    # TODO: Garbage data after DER should not be allowed, but it is currently
+    # ignored
+    orig1 = Fixtures.pkey("rsa-1")
+    orig2 = Fixtures.pkey("rsa-2")
+    pkey = OpenSSL::PKey.read(orig1.public_to_der + orig2.private_to_pem)
+    assert_equal(orig1.public_to_der, pkey.public_to_der)
+    assert_not_predicate(pkey, :private?)
+  end
+
+  def test_s_read_passphrase
+    orig = Fixtures.pkey("rsa-1")
+    encrypted_pem = orig.private_to_pem("AES-256-CBC", "correct_passphrase")
+    assert_match(/\A-----BEGIN ENCRYPTED PRIVATE KEY-----/, encrypted_pem)
+
+    # Correct passphrase passed as the second argument
+    pkey1 = OpenSSL::PKey.read(encrypted_pem, "correct_passphrase")
+    assert_equal(orig.private_to_der, pkey1.private_to_der)
+
+    # Correct passphrase returned by the block. The block gets false
+    called = 0
+    flag = nil
+    pkey2 = OpenSSL::PKey.read(encrypted_pem) { |f|
+      called += 1
+      flag = f
+      "correct_passphrase"
+    }
+    assert_equal(orig.private_to_der, pkey2.private_to_der)
+    assert_equal(1, called)
+    assert_false(flag)
+
+    # Incorrect passphrase passed. The block is not called
+    called = 0
+    assert_raise(OpenSSL::PKey::PKeyError) {
+      OpenSSL::PKey.read(encrypted_pem, "incorrect_passphrase") {
+        called += 1
+      }
+    }
+    assert_equal(0, called)
+
+    # Incorrect passphrase returned by the block. The block is called only once
+    called = 0
+    assert_raise(OpenSSL::PKey::PKeyError) {
+      OpenSSL::PKey.read(encrypted_pem) {
+        called += 1
+        "incorrect_passphrase"
+      }
+    }
+    assert_equal(1, called)
+  end
+
+  def test_s_read_passphrase_tty
+    omit "https://github.com/aws/aws-lc/pull/2555" if aws_lc?
+
+    orig = Fixtures.pkey("rsa-1")
+    encrypted_pem = orig.private_to_pem("AES-256-CBC", "correct_passphrase")
+
+    # Correct passphrase passed to OpenSSL's prompt
+    script = <<~"end;"
+      require "openssl"
+      Process.setsid
+      OpenSSL::PKey.read(#{encrypted_pem.dump})
+      puts "ok"
+    end;
+    assert_in_out_err([*$:.map { |l| "-I#{l}" }, "-e#{script}"],
+                      "correct_passphrase\n") { |stdout, stderr|
+      assert_equal(["Enter PEM pass phrase:"], stderr)
+      assert_equal(["ok"], stdout)
+    }
+
+    # Incorrect passphrase passed to OpenSSL's prompt
+    script = <<~"end;"
+      require "openssl"
+      Process.setsid
+      begin
+        OpenSSL::PKey.read(#{encrypted_pem.dump})
+      rescue OpenSSL::PKey::PKeyError
+        puts "ok"
+      else
+        puts "expected OpenSSL::PKey::PKeyError"
+      end
+    end;
+    stdin = "incorrect_passphrase\n" * 5
+    assert_in_out_err([*$:.map { |l| "-I#{l}" }, "-e#{script}"],
+                      stdin) { |stdout, stderr|
+      assert_equal(1, stderr.count("Enter PEM pass phrase:"))
+      assert_equal(["ok"], stdout)
+    }
+  end if ENV["OSSL_TEST_ALL"] == "1" && Process.respond_to?(:setsid)
+
   def test_hmac_sign_verify
     pkey = OpenSSL::PKey.generate_key("HMAC", { "key" => "abcd" })
 
@@ -90,8 +180,6 @@ def test_hmac_sign_verify
   def test_ed25519
     # Ed25519 is not FIPS-approved.
     omit_on_fips
-    # See EVP_PKEY_sign in Changelog for 3.7.0: https://github.com/libressl/portable/blob/master/ChangeLog
-    omit "Ed25519 not supported" unless openssl?(1, 1, 1) || libressl?(3, 7, 0)
 
     # Test vector from RFC 8032 Section 7.1 TEST 2
     priv_pem = <<~EOF
@@ -112,18 +200,14 @@ def test_ed25519
     assert_equal pub_pem, priv.public_to_pem
     assert_equal pub_pem, pub.public_to_pem
 
-    begin
-      assert_equal "4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb",
-        priv.raw_private_key.unpack1("H*")
-      assert_equal OpenSSL::PKey.new_raw_private_key("ED25519", priv.raw_private_key).private_to_pem,
-        priv.private_to_pem
-      assert_equal "3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c",
-        priv.raw_public_key.unpack1("H*")
-      assert_equal OpenSSL::PKey.new_raw_public_key("ED25519", priv.raw_public_key).public_to_pem,
-        pub.public_to_pem
-    rescue NoMethodError
-      pend "running OpenSSL version does not have raw public key support"
-    end
+    assert_equal "4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb",
+      priv.raw_private_key.unpack1("H*")
+    assert_equal OpenSSL::PKey.new_raw_private_key("ED25519", priv.raw_private_key).private_to_pem,
+      priv.private_to_pem
+    assert_equal "3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c",
+      priv.raw_public_key.unpack1("H*")
+    assert_equal OpenSSL::PKey.new_raw_public_key("ED25519", priv.raw_public_key).public_to_pem,
+      pub.public_to_pem
 
     sig = [<<~EOF.gsub(/[^0-9a-f]/, "")].pack("H*")
     92a009a9f0d4cab8720e820b5f642540
@@ -146,6 +230,8 @@ def test_ed25519
   end
 
   def test_x25519
+    omit_on_fips
+
     # Test vector from RFC 7748 Section 6.1
     alice_pem = <<~EOF
     -----BEGIN PRIVATE KEY-----
@@ -158,39 +244,48 @@ def test_x25519
     -----END PUBLIC KEY-----
     EOF
     shared_secret = "4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742"
-    begin
-      alice = OpenSSL::PKey.read(alice_pem)
-      bob = OpenSSL::PKey.read(bob_pem)
-    rescue OpenSSL::PKey::PKeyError
-      # OpenSSL < 1.1.0
-      pend "X25519 is not implemented"
-    end
+
+    alice = OpenSSL::PKey.read(alice_pem)
+    bob = OpenSSL::PKey.read(bob_pem)
     assert_instance_of OpenSSL::PKey::PKey, alice
+    assert_equal "X25519", alice.oid
+    assert_match %r{oid=X25519}, alice.inspect
     assert_equal alice_pem, alice.private_to_pem
     assert_equal bob_pem, bob.public_to_pem
     assert_equal [shared_secret].pack("H*"), alice.derive(bob)
-    begin
-      alice_private = OpenSSL::PKey.new_raw_private_key("X25519", alice.raw_private_key)
-      bob_public = OpenSSL::PKey.new_raw_public_key("X25519", bob.raw_public_key)
-      alice_private_raw = alice.raw_private_key.unpack1("H*")
-      bob_public_raw = bob.raw_public_key.unpack1("H*")
-    rescue NoMethodError
-      # OpenSSL < 1.1.1
-      pend "running OpenSSL version does not have raw public key support"
-    end
+
+    alice_private = OpenSSL::PKey.new_raw_private_key("X25519", alice.raw_private_key)
+    bob_public = OpenSSL::PKey.new_raw_public_key("X25519", bob.raw_public_key)
     assert_equal alice_private.private_to_pem,
       alice.private_to_pem
     assert_equal bob_public.public_to_pem,
       bob.public_to_pem
     assert_equal "77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a",
-      alice_private_raw
+      alice.raw_private_key.unpack1("H*")
     assert_equal "de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f",
-      bob_public_raw
+      bob.raw_public_key.unpack1("H*")
   end
 
-  def raw_initialize
-    pend "Ed25519 is not implemented" unless openssl?(1, 1, 1) # >= v1.1.1
+  def test_ml_dsa
+    # AWS-LC also supports ML-DSA, but it's implemented in a different way
+    return unless openssl?(3, 5, 0)
+
+    pkey = OpenSSL::PKey.generate_key("ML-DSA-44")
+    assert_match(/type_name=ML-DSA-44/, pkey.inspect)
+    sig = pkey.sign(nil, "data")
+    assert_equal(2420, sig.bytesize)
+    assert_equal(true, pkey.verify(nil, sig, "data"))
+
+    pub2 = OpenSSL::PKey.read(pkey.public_to_der)
+    assert_equal(true, pub2.verify(nil, sig, "data"))
 
+    raw_public_key = pkey.raw_public_key
+    assert_equal(1312, raw_public_key.bytesize)
+    pub3 = OpenSSL::PKey.new_raw_public_key("ML-DSA-44", raw_public_key)
+    assert_equal(true, pub3.verify(nil, sig, "data"))
+  end
+
+  def test_raw_initialize_errors
     assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.new_raw_private_key("foo123", "xxx") }
     assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.new_raw_private_key("ED25519", "xxx") }
     assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.new_raw_public_key("foo123", "xxx") }
@@ -198,10 +293,10 @@ def raw_initialize
   end
 
   def test_compare?
-    key1 = Fixtures.pkey("rsa1024")
-    key2 = Fixtures.pkey("rsa1024")
-    key3 = Fixtures.pkey("rsa2048")
-    key4 = Fixtures.pkey("dh-1")
+    key1 = Fixtures.pkey("rsa-1")
+    key2 = Fixtures.pkey("rsa-1")
+    key3 = Fixtures.pkey("rsa-2")
+    key4 = Fixtures.pkey("p256")
 
     assert_equal(true, key1.compare?(key2))
     assert_equal(true, key1.public_key.compare?(key2))
@@ -216,7 +311,14 @@ def test_compare?
   end
 
   def test_to_text
-    rsa = Fixtures.pkey("rsa1024")
+    rsa = Fixtures.pkey("rsa-1")
     assert_include rsa.to_text, "publicExponent"
   end
+
+  def test_legacy_error_classes
+    assert_same(OpenSSL::PKey::PKeyError, OpenSSL::PKey::DSAError)
+    assert_same(OpenSSL::PKey::PKeyError, OpenSSL::PKey::DHError)
+    assert_same(OpenSSL::PKey::PKeyError, OpenSSL::PKey::ECError)
+    assert_same(OpenSSL::PKey::PKeyError, OpenSSL::PKey::RSAError)
+  end
 end
diff --git a/test/mri/openssl/test_pkey_dh.rb b/test/mri/openssl/test_pkey_dh.rb
index d32ffaf6b11..cd13283a2a7 100644
--- a/test/mri/openssl/test_pkey_dh.rb
+++ b/test/mri/openssl/test_pkey_dh.rb
@@ -4,36 +4,43 @@
 if defined?(OpenSSL) && defined?(OpenSSL::PKey::DH)
 
 class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase
-  NEW_KEYLEN = 2048
-
   def test_new_empty
-    dh = OpenSSL::PKey::DH.new
-    assert_equal nil, dh.p
-    assert_equal nil, dh.priv_key
+    # pkeys are immutable with OpenSSL >= 3.0
+    if openssl?(3, 0, 0)
+      assert_raise(ArgumentError) { OpenSSL::PKey::DH.new }
+    else
+      dh = OpenSSL::PKey::DH.new
+      assert_nil(dh.p)
+      assert_nil(dh.priv_key)
+    end
   end
 
   def test_new_generate
-    # This test is slow
-    dh = OpenSSL::PKey::DH.new(NEW_KEYLEN)
-    assert_key(dh)
-  end if ENV["OSSL_TEST_ALL"]
-
-  def test_new_break_on_non_fips
-    omit_on_fips
-
-    assert_nil(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
-    assert_raise(RuntimeError) do
-      OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise }
+    begin
+      dh1 = OpenSSL::PKey::DH.new(512)
+    rescue OpenSSL::PKey::PKeyError
+      omit "generating 512-bit DH parameters failed; " \
+        "likely not supported by this OpenSSL build"
+    end
+    assert_equal(512, dh1.p.num_bits)
+    assert_key(dh1)
+
+    dh2 = OpenSSL::PKey::DH.generate(512)
+    assert_equal(512, dh2.p.num_bits)
+    assert_key(dh2)
+    assert_not_equal(dh1.p, dh2.p)
+  end if ENV["OSSL_TEST_ALL"] == "1"
+
+  def test_new_break
+    unless openssl? && OpenSSL.fips_mode
+      assert_raise(RuntimeError) do
+        OpenSSL::PKey::DH.new(2048) { raise }
+      end
+    else
+      # The block argument is not executed in FIPS case.
+      # See https://github.com/ruby/openssl/issues/692 for details.
+      assert_kind_of(OpenSSL::PKey::DH, OpenSSL::PKey::DH.new(2048) { raise })
     end
-  end
-
-  def test_new_break_on_fips
-    omit_on_non_fips
-
-    # The block argument is not executed in FIPS case.
-    # See https://github.com/ruby/openssl/issues/692 for details.
-    assert(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
-    assert(OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise })
   end
 
   def test_derive_key
@@ -55,15 +62,15 @@ def test_derive_key
   end
 
   def test_DHparams
-    dh = Fixtures.pkey("dh2048_ffdhe2048")
-    dh_params = dh.public_key
+    dh_params = Fixtures.pkey("dh2048_ffdhe2048")
 
     asn1 = OpenSSL::ASN1::Sequence([
-      OpenSSL::ASN1::Integer(dh.p),
-      OpenSSL::ASN1::Integer(dh.g)
+      OpenSSL::ASN1::Integer(dh_params.p),
+      OpenSSL::ASN1::Integer(dh_params.g)
     ])
+    assert_equal(asn1.to_der, dh_params.to_der)
     key = OpenSSL::PKey::DH.new(asn1.to_der)
-    assert_same_dh dh_params, key
+    assert_same_dh_params(dh_params, key)
 
     pem = <<~EOF
     -----BEGIN DH PARAMETERS-----
@@ -75,14 +82,20 @@ def test_DHparams
     ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg==
     -----END DH PARAMETERS-----
     EOF
+    assert_equal(pem, dh_params.export)
 
     key = OpenSSL::PKey::DH.new(pem)
-    assert_same_dh dh_params, key
+    assert_same_dh_params(dh_params, key)
+    assert_no_key(key)
     key = OpenSSL::PKey.read(pem)
-    assert_same_dh dh_params, key
-
-    assert_equal asn1.to_der, dh.to_der
-    assert_equal pem, dh.export
+    assert_same_dh_params(dh_params, key)
+    assert_no_key(key)
+
+    key = OpenSSL::PKey.generate_key(dh_params)
+    assert_same_dh_params(dh_params, key)
+    assert_key(key)
+    assert_equal(dh_params.to_der, key.to_der)
+    assert_equal(dh_params.to_pem, key.to_pem)
   end
 
   def test_public_key
@@ -95,23 +108,25 @@ def test_public_key
 
   def test_generate_key
     # Deprecated in v3.0.0; incompatible with OpenSSL 3.0
-    # Creates a copy with params only
-    dh = Fixtures.pkey("dh2048_ffdhe2048").public_key
+    dh = Fixtures.pkey("dh2048_ffdhe2048")
     assert_no_key(dh)
     dh.generate_key!
     assert_key(dh)
 
-    dh2 = dh.public_key
+    dh2 = OpenSSL::PKey::DH.new(dh.to_der)
     dh2.generate_key!
+    assert_not_equal(dh.pub_key, dh2.pub_key)
     assert_equal(dh.compute_key(dh2.pub_key), dh2.compute_key(dh.pub_key))
   end if !openssl?(3, 0, 0)
 
   def test_params_ok?
+    omit_on_fips
+
     # Skip the tests in old OpenSSL version 1.1.1c or early versions before
     # applying the following commits in OpenSSL 1.1.1d to make `DH_check`
     # function pass the RFC 7919 FFDHE group texts.
     # https://github.com/openssl/openssl/pull/9435
-    unless openssl?(1, 1, 1, 4)
+    if openssl? && !openssl?(1, 1, 1, 4)
       pend 'DH check for RFC 7919 FFDHE group texts is not implemented'
     end
 
@@ -123,11 +138,41 @@ def test_params_ok?
     ]))
     assert_equal(true, dh1.params_ok?)
 
-    dh2 = OpenSSL::PKey::DH.new(OpenSSL::ASN1::Sequence([
-      OpenSSL::ASN1::Integer(dh0.p + 1),
-      OpenSSL::ASN1::Integer(dh0.g)
-    ]))
-    assert_equal(false, dh2.params_ok?)
+    # AWS-LC automatically does parameter checks on the parsed params.
+    if aws_lc?
+      assert_raise(OpenSSL::PKey::PKeyError) {
+        OpenSSL::PKey::DH.new(OpenSSL::ASN1::Sequence([
+          OpenSSL::ASN1::Integer(dh0.p + 1),
+          OpenSSL::ASN1::Integer(dh0.g)
+        ]))
+      }
+    else
+      dh2 = OpenSSL::PKey::DH.new(OpenSSL::ASN1::Sequence([
+        OpenSSL::ASN1::Integer(dh0.p + 1),
+        OpenSSL::ASN1::Integer(dh0.g)
+      ]))
+      assert_equal(false, dh2.params_ok?)
+    end
+
+  end
+
+  def test_params
+    dh = Fixtures.pkey("dh2048_ffdhe2048")
+    assert_kind_of(OpenSSL::BN, dh.p)
+    assert_equal(dh.p, dh.params["p"])
+    assert_kind_of(OpenSSL::BN, dh.g)
+    assert_equal(dh.g, dh.params["g"])
+    assert_nil(dh.pub_key)
+    assert_nil(dh.params["pub_key"])
+    assert_nil(dh.priv_key)
+    assert_nil(dh.params["priv_key"])
+
+    dhkey = OpenSSL::PKey.generate_key(dh)
+    assert_equal(dh.params["p"], dhkey.params["p"])
+    assert_kind_of(OpenSSL::BN, dhkey.pub_key)
+    assert_equal(dhkey.pub_key, dhkey.params["pub_key"])
+    assert_kind_of(OpenSSL::BN, dhkey.priv_key)
+    assert_equal(dhkey.priv_key, dhkey.params["priv_key"])
   end
 
   def test_dup
@@ -176,14 +221,14 @@ def assert_no_key(dh)
   end
 
   def assert_key(dh)
-    assert(dh.public?)
-    assert(dh.private?)
-    assert(dh.pub_key)
-    assert(dh.priv_key)
+    assert_true(dh.public?)
+    assert_true(dh.private?)
+    assert_kind_of(OpenSSL::BN, dh.pub_key)
+    assert_kind_of(OpenSSL::BN, dh.priv_key)
   end
 
-  def assert_same_dh(expected, key)
-    check_component(expected, key, [:p, :q, :g, :pub_key, :priv_key])
+  def assert_same_dh_params(expected, key)
+    check_component(expected, key, [:p, :q, :g])
   end
 end
 
diff --git a/test/mri/openssl/test_pkey_dsa.rb b/test/mri/openssl/test_pkey_dsa.rb
index 3e8a83b2d01..1ec0bf0b4d4 100644
--- a/test/mri/openssl/test_pkey_dsa.rb
+++ b/test/mri/openssl/test_pkey_dsa.rb
@@ -10,7 +10,7 @@ def setup
   end
 
   def test_private
-    key = Fixtures.pkey("dsa1024")
+    key = Fixtures.pkey("dsa2048")
     assert_equal true, key.private?
     key2 = OpenSSL::PKey::DSA.new(key.to_der)
     assert_equal true, key2.private?
@@ -33,6 +33,17 @@ def test_new_break
     end
   end
 
+  def test_new_empty
+    # pkeys are immutable with OpenSSL >= 3.0
+    if openssl?(3, 0, 0)
+      assert_raise(ArgumentError) { OpenSSL::PKey::DSA.new }
+    else
+      key = OpenSSL::PKey::DSA.new
+      assert_nil(key.p)
+      assert_raise(OpenSSL::PKey::PKeyError) { key.to_der }
+    end
+  end
+
   def test_generate
     # DSA.generate used to call DSA_generate_parameters_ex(), which adjusts the
     # size of q according to the size of p
@@ -41,11 +52,11 @@ def test_generate
     assert_equal 1024, key1024.p.num_bits
     assert_equal 160, key1024.q.num_bits
 
-    key2048 = OpenSSL::PKey::DSA.generate(2048)
-    assert_equal 2048, key2048.p.num_bits
-    assert_equal 256, key2048.q.num_bits
-
     if ENV["OSSL_TEST_ALL"] == "1" # slow
+      key2048 = OpenSSL::PKey::DSA.generate(2048)
+      assert_equal 2048, key2048.p.num_bits
+      assert_equal 256, key2048.q.num_bits
+
       key3072 = OpenSSL::PKey::DSA.generate(3072)
       assert_equal 3072, key3072.p.num_bits
       assert_equal 256, key3072.q.num_bits
@@ -86,122 +97,93 @@ def test_sign_verify_raw
     sig = key.syssign(digest)
     assert_equal true, key.sysverify(digest, sig)
     assert_equal false, key.sysverify(digest, invalid_sig)
-    assert_raise(OpenSSL::PKey::DSAError) { key.sysverify(digest, malformed_sig) }
+    assert_sign_verify_false_or_error { key.sysverify(digest, malformed_sig) }
     assert_equal true, key.verify_raw(nil, sig, digest)
     assert_equal false, key.verify_raw(nil, invalid_sig, digest)
-    assert_raise(OpenSSL::PKey::PKeyError) { key.verify_raw(nil, malformed_sig, digest) }
+    assert_sign_verify_false_or_error { key.verify_raw(nil, malformed_sig, digest) }
 
     # Sign by #sign_raw
     sig = key.sign_raw(nil, digest)
     assert_equal true, key.sysverify(digest, sig)
     assert_equal false, key.sysverify(digest, invalid_sig)
-    assert_raise(OpenSSL::PKey::DSAError) { key.sysverify(digest, malformed_sig) }
+    assert_sign_verify_false_or_error { key.sysverify(digest, malformed_sig) }
     assert_equal true, key.verify_raw(nil, sig, digest)
     assert_equal false, key.verify_raw(nil, invalid_sig, digest)
-    assert_raise(OpenSSL::PKey::PKeyError) { key.verify_raw(nil, malformed_sig, digest) }
+    assert_sign_verify_false_or_error { key.verify_raw(nil, malformed_sig, digest) }
   end
 
   def test_DSAPrivateKey
     # OpenSSL DSAPrivateKey format; similar to RSAPrivateKey
-    dsa512 = Fixtures.pkey("dsa512")
+    orig = Fixtures.pkey("dsa2048")
     asn1 = OpenSSL::ASN1::Sequence([
       OpenSSL::ASN1::Integer(0),
-      OpenSSL::ASN1::Integer(dsa512.p),
-      OpenSSL::ASN1::Integer(dsa512.q),
-      OpenSSL::ASN1::Integer(dsa512.g),
-      OpenSSL::ASN1::Integer(dsa512.pub_key),
-      OpenSSL::ASN1::Integer(dsa512.priv_key)
+      OpenSSL::ASN1::Integer(orig.p),
+      OpenSSL::ASN1::Integer(orig.q),
+      OpenSSL::ASN1::Integer(orig.g),
+      OpenSSL::ASN1::Integer(orig.pub_key),
+      OpenSSL::ASN1::Integer(orig.priv_key)
     ])
     key = OpenSSL::PKey::DSA.new(asn1.to_der)
     assert_predicate key, :private?
-    assert_same_dsa dsa512, key
-
-    pem = <<~EOF
-    -----BEGIN DSA PRIVATE KEY-----
-    MIH4AgEAAkEA5lB4GvEwjrsMlGDqGsxrbqeFRh6o9OWt6FgTYiEEHaOYhkIxv0Ok
-    RZPDNwOG997mDjBnvDJ1i56OmS3MbTnovwIVAJgub/aDrSDB4DZGH7UyarcaGy6D
-    AkB9HdFw/3td8K4l1FZHv7TCZeJ3ZLb7dF3TWoGUP003RCqoji3/lHdKoVdTQNuR
-    S/m6DlCwhjRjiQ/lBRgCLCcaAkEAjN891JBjzpMj4bWgsACmMggFf57DS0Ti+5++
-    Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxXoXi9OAIUBG98h4tilg6S
-    55jreJD3Se3slps=
-    -----END DSA PRIVATE KEY-----
-    EOF
+    assert_same_dsa orig, key
+
+    pem = der_to_pem(asn1.to_der, "DSA PRIVATE KEY")
     key = OpenSSL::PKey::DSA.new(pem)
-    assert_same_dsa dsa512, key
+    assert_same_dsa orig, key
 
-    assert_equal asn1.to_der, dsa512.to_der
-    assert_equal pem, dsa512.export
+    assert_equal asn1.to_der, orig.to_der
+    assert_equal pem, orig.export
   end
 
   def test_DSAPrivateKey_encrypted
-    # key = abcdef
-    dsa512 = Fixtures.pkey("dsa512")
-    pem = <<~EOF
-    -----BEGIN DSA PRIVATE KEY-----
-    Proc-Type: 4,ENCRYPTED
-    DEK-Info: AES-128-CBC,F8BB7BFC7EAB9118AC2E3DA16C8DB1D9
-
-    D2sIzsM9MLXBtlF4RW42u2GB9gX3HQ3prtVIjWPLaKBYoToRUiv8WKsjptfZuLSB
-    74ZPdMS7VITM+W1HIxo/tjS80348Cwc9ou8H/E6WGat8ZUk/igLOUEII+coQS6qw
-    QpuLMcCIavevX0gjdjEIkojBB81TYDofA1Bp1z1zDI/2Zhw822xapI79ZF7Rmywt
-    OSyWzFaGipgDpdFsGzvT6//z0jMr0AuJVcZ0VJ5lyPGQZAeVBlbYEI4T72cC5Cz7
-    XvLiaUtum6/sASD2PQqdDNpgx/WA6Vs1Po2kIUQIM5TIwyJI0GdykZcYm6xIK/ta
-    Wgx6c8K+qBAIVrilw3EWxw==
-    -----END DSA PRIVATE KEY-----
-    EOF
+    # OpenSSL DSAPrivateKey with OpenSSL encryption
+    orig = Fixtures.pkey("dsa2048")
+
+    pem = der_to_encrypted_pem(orig.to_der, "DSA PRIVATE KEY", "abcdef")
     key = OpenSSL::PKey::DSA.new(pem, "abcdef")
-    assert_same_dsa dsa512, key
+    assert_same_dsa orig, key
     key = OpenSSL::PKey::DSA.new(pem) { "abcdef" }
-    assert_same_dsa dsa512, key
+    assert_same_dsa orig, key
 
     cipher = OpenSSL::Cipher.new("aes-128-cbc")
-    exported = dsa512.to_pem(cipher, "abcdef\0\1")
-    assert_same_dsa dsa512, OpenSSL::PKey::DSA.new(exported, "abcdef\0\1")
-    assert_raise(OpenSSL::PKey::DSAError) {
+    exported = orig.to_pem(cipher, "abcdef\0\1")
+    assert_same_dsa orig, OpenSSL::PKey::DSA.new(exported, "abcdef\0\1")
+    assert_raise(OpenSSL::PKey::PKeyError) {
       OpenSSL::PKey::DSA.new(exported, "abcdef")
     }
   end
 
   def test_PUBKEY
-    dsa512 = Fixtures.pkey("dsa512")
-    dsa512pub = OpenSSL::PKey::DSA.new(dsa512.public_to_der)
+    orig = Fixtures.pkey("dsa2048")
+    pub = OpenSSL::PKey::DSA.new(orig.public_to_der)
 
     asn1 = OpenSSL::ASN1::Sequence([
       OpenSSL::ASN1::Sequence([
         OpenSSL::ASN1::ObjectId("DSA"),
         OpenSSL::ASN1::Sequence([
-          OpenSSL::ASN1::Integer(dsa512.p),
-          OpenSSL::ASN1::Integer(dsa512.q),
-          OpenSSL::ASN1::Integer(dsa512.g)
+          OpenSSL::ASN1::Integer(orig.p),
+          OpenSSL::ASN1::Integer(orig.q),
+          OpenSSL::ASN1::Integer(orig.g)
         ])
       ]),
       OpenSSL::ASN1::BitString(
-        OpenSSL::ASN1::Integer(dsa512.pub_key).to_der
+        OpenSSL::ASN1::Integer(orig.pub_key).to_der
       )
     ])
     key = OpenSSL::PKey::DSA.new(asn1.to_der)
     assert_not_predicate key, :private?
-    assert_same_dsa dsa512pub, key
-
-    pem = <<~EOF
-    -----BEGIN PUBLIC KEY-----
-    MIHxMIGoBgcqhkjOOAQBMIGcAkEA5lB4GvEwjrsMlGDqGsxrbqeFRh6o9OWt6FgT
-    YiEEHaOYhkIxv0OkRZPDNwOG997mDjBnvDJ1i56OmS3MbTnovwIVAJgub/aDrSDB
-    4DZGH7UyarcaGy6DAkB9HdFw/3td8K4l1FZHv7TCZeJ3ZLb7dF3TWoGUP003RCqo
-    ji3/lHdKoVdTQNuRS/m6DlCwhjRjiQ/lBRgCLCcaA0QAAkEAjN891JBjzpMj4bWg
-    sACmMggFf57DS0Ti+5++Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxX
-    oXi9OA==
-    -----END PUBLIC KEY-----
-    EOF
+    assert_same_dsa pub, key
+
+    pem = der_to_pem(asn1.to_der, "PUBLIC KEY")
     key = OpenSSL::PKey::DSA.new(pem)
-    assert_same_dsa dsa512pub, key
+    assert_same_dsa pub, key
 
     assert_equal asn1.to_der, key.to_der
     assert_equal pem, key.export
 
-    assert_equal asn1.to_der, dsa512.public_to_der
+    assert_equal asn1.to_der, orig.public_to_der
     assert_equal asn1.to_der, key.public_to_der
-    assert_equal pem, dsa512.public_to_pem
+    assert_equal pem, orig.public_to_pem
     assert_equal pem, key.public_to_pem
   end
 
@@ -230,8 +212,29 @@ def test_read_DSAPublicKey_pem
     assert_equal(nil, key.priv_key)
   end
 
+  def test_params
+    key = Fixtures.pkey("dsa2048")
+    assert_kind_of(OpenSSL::BN, key.p)
+    assert_equal(key.p, key.params["p"])
+    assert_kind_of(OpenSSL::BN, key.q)
+    assert_equal(key.q, key.params["q"])
+    assert_kind_of(OpenSSL::BN, key.g)
+    assert_equal(key.g, key.params["g"])
+    assert_kind_of(OpenSSL::BN, key.pub_key)
+    assert_equal(key.pub_key, key.params["pub_key"])
+    assert_kind_of(OpenSSL::BN, key.priv_key)
+    assert_equal(key.priv_key, key.params["priv_key"])
+
+    pubkey = OpenSSL::PKey.read(key.public_to_der)
+    assert_equal(key.params["p"], pubkey.params["p"])
+    assert_equal(key.pub_key, pubkey.pub_key)
+    assert_equal(key.pub_key, pubkey.params["pub_key"])
+    assert_nil(pubkey.priv_key)
+    assert_nil(pubkey.params["priv_key"])
+  end
+
   def test_dup
-    key = Fixtures.pkey("dsa1024")
+    key = Fixtures.pkey("dsa2048")
     key2 = key.dup
     assert_equal key.params, key2.params
 
@@ -243,7 +246,7 @@ def test_dup
   end
 
   def test_marshal
-    key = Fixtures.pkey("dsa1024")
+    key = Fixtures.pkey("dsa2048")
     deserialized = Marshal.load(Marshal.dump(key))
 
     assert_equal key.to_der, deserialized.to_der
diff --git a/test/mri/openssl/test_pkey_ec.rb b/test/mri/openssl/test_pkey_ec.rb
index 2cb8e287ab7..88085bc68c7 100644
--- a/test/mri/openssl/test_pkey_ec.rb
+++ b/test/mri/openssl/test_pkey_ec.rb
@@ -4,19 +4,9 @@
 if defined?(OpenSSL)
 
 class OpenSSL::TestEC < OpenSSL::PKeyTestCase
-  def test_ec_key
+  def test_ec_key_new
     key1 = OpenSSL::PKey::EC.generate("prime256v1")
 
-    # PKey is immutable in OpenSSL >= 3.0; constructing an empty EC object is
-    # deprecated
-    if !openssl?(3, 0, 0)
-      key2 = OpenSSL::PKey::EC.new
-      key2.group = key1.group
-      key2.private_key = key1.private_key
-      key2.public_key = key1.public_key
-      assert_equal key1.to_der, key2.to_der
-    end
-
     key3 = OpenSSL::PKey::EC.new(key1)
     assert_equal key1.to_der, key3.to_der
 
@@ -35,6 +25,23 @@ def test_ec_key
     end
   end
 
+  def test_ec_key_new_empty
+    # pkeys are immutable with OpenSSL >= 3.0; constructing an empty EC object is
+    # disallowed
+    if openssl?(3, 0, 0)
+      assert_raise(ArgumentError) { OpenSSL::PKey::EC.new }
+    else
+      key = OpenSSL::PKey::EC.new
+      assert_nil(key.group)
+
+      p256 = Fixtures.pkey("p256")
+      key.group = p256.group
+      key.private_key = p256.private_key
+      key.public_key = p256.public_key
+      assert_equal(p256.to_der, key.to_der)
+    end
+  end
+
   def test_builtin_curves
     builtin_curves = OpenSSL::PKey::EC.builtin_curves
     assert_not_empty builtin_curves
@@ -47,7 +54,9 @@ def test_builtin_curves
   end
 
   def test_generate
-    assert_raise(OpenSSL::PKey::ECError) { OpenSSL::PKey::EC.generate("non-existent") }
+    assert_raise(OpenSSL::PKey::PKeyError) {
+      OpenSSL::PKey::EC.generate("non-existent")
+    }
     g = OpenSSL::PKey::EC::Group.new("prime256v1")
     ec = OpenSSL::PKey::EC.generate(g)
     assert_equal(true, ec.private?)
@@ -58,7 +67,7 @@ def test_generate
   def test_generate_key
     ec = OpenSSL::PKey::EC.new("prime256v1")
     assert_equal false, ec.private?
-    assert_raise(OpenSSL::PKey::ECError) { ec.to_der }
+    assert_raise(OpenSSL::PKey::PKeyError) { ec.to_der }
     ec.generate_key!
     assert_equal true, ec.private?
     assert_nothing_raised { ec.to_der }
@@ -72,6 +81,8 @@ def test_marshal
   end
 
   def test_check_key
+    omit_on_fips
+
     key0 = Fixtures.pkey("p256")
     assert_equal(true, key0.check_key)
     assert_equal(true, key0.private?)
@@ -88,16 +99,25 @@ def test_check_key
     assert_equal(true, key2.check_key)
 
     # Behavior of EVP_PKEY_public_check changes between OpenSSL 1.1.1 and 3.0
-    key4 = Fixtures.pkey("p256_too_large")
-    assert_raise(OpenSSL::PKey::ECError) { key4.check_key }
-
-    key5 = Fixtures.pkey("p384_invalid")
-    assert_raise(OpenSSL::PKey::ECError) { key5.check_key }
+    # The public key does not match the private key
+    ec_key_data = <<~EOF
+    -----BEGIN EC PRIVATE KEY-----
+    MHcCAQEEIP+TT0V8Fndsnacji9tyf6hmhHywcOWTee9XkiBeJoVloAoGCCqGSM49
+    AwEHoUQDQgAEBkhhJIU/2/YdPSlY2I1k25xjK4trr5OXSgXvBC21PtY0HQ7lor7A
+    jzT0giJITqmcd81fwGw5+96zLcdxTF1hVQ==
+    -----END EC PRIVATE KEY-----
+    EOF
+    if aws_lc? # AWS-LC automatically does key checks on the parsed key.
+      assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.read(ec_key_data) }
+    else
+      key4 = OpenSSL::PKey.read(ec_key_data)
+      assert_raise(OpenSSL::PKey::PKeyError) { key4.check_key }
+    end
 
     # EC#private_key= is deprecated in 3.0 and won't work on OpenSSL 3.0
     if !openssl?(3, 0, 0)
       key2.private_key += 1
-      assert_raise(OpenSSL::PKey::ECError) { key2.check_key }
+      assert_raise(OpenSSL::PKey::PKeyError) { key2.check_key }
     end
   end
 
@@ -143,19 +163,19 @@ def test_sign_verify_raw
     sig = key.dsa_sign_asn1(data1)
     assert_equal true, key.dsa_verify_asn1(data1, sig)
     assert_equal false, key.dsa_verify_asn1(data2, sig)
-    assert_raise(OpenSSL::PKey::ECError) { key.dsa_verify_asn1(data1, malformed_sig) }
+    assert_sign_verify_false_or_error { key.dsa_verify_asn1(data1, malformed_sig) }
     assert_equal true, key.verify_raw(nil, sig, data1)
     assert_equal false, key.verify_raw(nil, sig, data2)
-    assert_raise(OpenSSL::PKey::PKeyError) { key.verify_raw(nil, malformed_sig, data1) }
+    assert_sign_verify_false_or_error { key.verify_raw(nil, malformed_sig, data1) }
 
     # Sign by #sign_raw
     sig = key.sign_raw(nil, data1)
     assert_equal true, key.dsa_verify_asn1(data1, sig)
     assert_equal false, key.dsa_verify_asn1(data2, sig)
-    assert_raise(OpenSSL::PKey::ECError) { key.dsa_verify_asn1(data1, malformed_sig) }
+    assert_sign_verify_false_or_error { key.dsa_verify_asn1(data1, malformed_sig) }
     assert_equal true, key.verify_raw(nil, sig, data1)
     assert_equal false, key.verify_raw(nil, sig, data2)
-    assert_raise(OpenSSL::PKey::PKeyError) { key.verify_raw(nil, malformed_sig, data1) }
+    assert_sign_verify_false_or_error{ key.verify_raw(nil, malformed_sig, data1) }
   end
 
   def test_dsa_sign_asn1_FIPS186_3
@@ -251,7 +271,7 @@ def test_ECPrivateKey_encrypted
     cipher = OpenSSL::Cipher.new("aes-128-cbc")
     exported = p256.to_pem(cipher, "abcdef\0\1")
     assert_same_ec p256, OpenSSL::PKey::EC.new(exported, "abcdef\0\1")
-    assert_raise(OpenSSL::PKey::ECError) {
+    assert_raise(OpenSSL::PKey::PKeyError) {
       OpenSSL::PKey::EC.new(exported, "abcdef")
     }
   end
@@ -300,7 +320,10 @@ def test_ec_group
     assert_equal group1.to_der, group2.to_der
     assert_equal group1, group2
     group2.asn1_flag ^=OpenSSL::PKey::EC::NAMED_CURVE
-    assert_not_equal group1.to_der, group2.to_der
+    # AWS-LC does not support serializing explicit curves.
+    unless aws_lc?
+      assert_not_equal group1.to_der, group2.to_der
+    end
     assert_equal group1, group2
 
     group3 = group1.dup
@@ -346,18 +369,26 @@ def test_ec_point
       point2.to_octet_string(:uncompressed)
     assert_equal point2.to_octet_string(:uncompressed),
       point3.to_octet_string(:uncompressed)
+  end
 
+  def test_small_curve
     begin
       group = OpenSSL::PKey::EC::Group.new(:GFp, 17, 2, 2)
       group.point_conversion_form = :uncompressed
       generator = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 05 01 }))
       group.set_generator(generator, 19, 1)
-      point = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 06 03 }))
     rescue OpenSSL::PKey::EC::Group::Error
       pend "Patched OpenSSL rejected curve" if /unsupported field/ =~ $!.message
       raise
     end
-
+    assert_equal 17.to_bn.num_bits, group.degree
+    assert_equal B(%w{ 04 05 01 }),
+      group.generator.to_octet_string(:uncompressed)
+    assert_equal 19.to_bn, group.order
+    assert_equal 1.to_bn, group.cofactor
+    assert_nil group.curve_name
+
+    point = OpenSSL::PKey::EC::Point.new(group, B(%w{ 04 06 03 }))
     assert_equal 0x040603.to_bn, point.to_bn
     assert_equal 0x040603.to_bn, point.to_bn(:uncompressed)
     assert_equal 0x0306.to_bn, point.to_bn(:compressed)
@@ -421,28 +452,6 @@ def test_ec_point_mul
       # 3 * (6, 3) + 3 * (5, 1) = (7, 6)
       result_a2 = point_a.mul(3, 3)
       assert_equal B(%w{ 04 07 06 }), result_a2.to_octet_string(:uncompressed)
-      EnvUtil.suppress_warning do # Point#mul(ary, ary [, bn]) is deprecated
-        begin
-          result_b1 = point_a.mul([3], [])
-        rescue NotImplementedError
-          # LibreSSL and OpenSSL 3.0 do no longer support this form of calling
-          next
-        end
-
-        # 3 * point_a = 3 * (6, 3) = (16, 13)
-        result_b1 = point_a.mul([3], [])
-        assert_equal B(%w{ 04 10 0D }), result_b1.to_octet_string(:uncompressed)
-        # 3 * point_a + 2 * point_a = 3 * (6, 3) + 2 * (6, 3) = (7, 11)
-        result_b1 = point_a.mul([3, 2], [point_a])
-        assert_equal B(%w{ 04 07 0B }), result_b1.to_octet_string(:uncompressed)
-        # 3 * point_a + 5 * point_a.group.generator = 3 * (6, 3) + 5 * (5, 1) = (13, 10)
-        result_b1 = point_a.mul([3], [], 5)
-        assert_equal B(%w{ 04 0D 0A }), result_b1.to_octet_string(:uncompressed)
-
-        assert_raise(ArgumentError) { point_a.mul([1], [point_a]) }
-        assert_raise(TypeError) { point_a.mul([1], nil) }
-        assert_raise(TypeError) { point_a.mul([nil], []) }
-      end
     rescue OpenSSL::PKey::EC::Group::Error
       # CentOS patches OpenSSL to reject curves defined over Fp where p < 256 bits
       raise if $!.message !~ /unsupported field/
@@ -455,6 +464,9 @@ def test_ec_point_mul
     # invalid argument
     point = p256_key.public_key
     assert_raise(TypeError) { point.mul(nil) }
+
+    # mul with arrays was removed in version 4.0.0
+    assert_raise(NotImplementedError) { point.mul([1], []) }
   end
 
 # test Group: asn1_flag, point_conversion
diff --git a/test/mri/openssl/test_pkey_rsa.rb b/test/mri/openssl/test_pkey_rsa.rb
index 02693c277bd..86f51cf4385 100644
--- a/test/mri/openssl/test_pkey_rsa.rb
+++ b/test/mri/openssl/test_pkey_rsa.rb
@@ -6,40 +6,38 @@
 class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
   def test_no_private_exp
     key = OpenSSL::PKey::RSA.new
-    rsa = Fixtures.pkey("rsa2048")
+    rsa = Fixtures.pkey("rsa-1")
     key.set_key(rsa.n, rsa.e, nil)
     key.set_factors(rsa.p, rsa.q)
-    assert_raise(OpenSSL::PKey::RSAError){ key.private_encrypt("foo") }
-    assert_raise(OpenSSL::PKey::RSAError){ key.private_decrypt("foo") }
+    assert_raise(OpenSSL::PKey::PKeyError){ key.private_encrypt("foo") }
+    assert_raise(OpenSSL::PKey::PKeyError){ key.private_decrypt("foo") }
   end if !openssl?(3, 0, 0) # Impossible state in OpenSSL 3.0
 
   def test_private
-    key = Fixtures.pkey("rsa2048")
+    key = Fixtures.pkey("rsa-1")
 
     # Generated by DER
     key2 = OpenSSL::PKey::RSA.new(key.to_der)
-    assert(key2.private?)
+    assert_true(key2.private?)
 
     # public key
     key3 = key.public_key
-    assert(!key3.private?)
+    assert_false(key3.private?)
 
     # Generated by public key DER
     key4 = OpenSSL::PKey::RSA.new(key3.to_der)
-    assert(!key4.private?)
-    rsa1024 = Fixtures.pkey("rsa1024")
+    assert_false(key4.private?)
 
     if !openssl?(3, 0, 0)
-      key = OpenSSL::PKey::RSA.new
       # Generated by RSA#set_key
       key5 = OpenSSL::PKey::RSA.new
-      key5.set_key(rsa1024.n, rsa1024.e, rsa1024.d)
-      assert(key5.private?)
+      key5.set_key(key.n, key.e, key.d)
+      assert_true(key5.private?)
 
       # Generated by RSA#set_key, without d
       key6 = OpenSSL::PKey::RSA.new
-      key6.set_key(rsa1024.n, rsa1024.e, nil)
-      assert(!key6.private?)
+      key6.set_key(key.n, key.e, nil)
+      assert_false(key6.private?)
     end
   end
 
@@ -61,6 +59,16 @@ def test_new_public_exponent
     assert_equal 3, key.e
   end
 
+  def test_new_empty
+    # pkeys are immutable with OpenSSL >= 3.0
+    if openssl?(3, 0, 0)
+      assert_raise(ArgumentError) { OpenSSL::PKey::RSA.new }
+    else
+      key = OpenSSL::PKey::RSA.new
+      assert_nil(key.n)
+    end
+  end
+
   def test_s_generate
     key1 = OpenSSL::PKey::RSA.generate(2048)
     assert_equal 2048, key1.n.num_bits
@@ -108,13 +116,13 @@ def test_sign_verify_options
     pssopts = {
       "rsa_padding_mode" => "pss",
       "rsa_pss_saltlen" => 20,
-      "rsa_mgf1_md" => "SHA1"
+      "rsa_mgf1_md" => "SHA256"
     }
     sig_pss = key.sign("SHA256", data, pssopts)
     assert_equal 256, sig_pss.bytesize
     assert_equal true, key.verify("SHA256", sig_pss, data, pssopts)
     assert_equal true, key.verify_pss("SHA256", sig_pss, data,
-                                      salt_length: 20, mgf1_hash: "SHA1")
+                                      salt_length: 20, mgf1_hash: "SHA256")
     # Defaults to PKCS #1 v1.5 padding => verification failure
     assert_equal false, key.verify("SHA256", sig_pss, data)
 
@@ -172,7 +180,7 @@ def test_sign_verify_raw_legacy
     # Failure cases
     assert_raise(ArgumentError){ key.private_encrypt() }
     assert_raise(ArgumentError){ key.private_encrypt("hi", 1, nil) }
-    assert_raise(OpenSSL::PKey::RSAError){ key.private_encrypt(plain0, 666) }
+    assert_raise(OpenSSL::PKey::PKeyError){ key.private_encrypt(plain0, 666) }
   end
 
 
@@ -181,29 +189,29 @@ def test_verify_empty_rsa
     assert_raise(OpenSSL::PKey::PKeyError, "[Bug #12783]") {
       rsa.verify("SHA1", "a", "b")
     }
-  end
+  end unless openssl?(3, 0, 0) # Empty RSA is not possible with OpenSSL >= 3.0
 
   def test_sign_verify_pss
     key = Fixtures.pkey("rsa2048")
     data = "Sign me!"
     invalid_data = "Sign me?"
 
-    signature = key.sign_pss("SHA256", data, salt_length: 20, mgf1_hash: "SHA1")
+    signature = key.sign_pss("SHA256", data, salt_length: 20, mgf1_hash: "SHA256")
     assert_equal 256, signature.bytesize
     assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: 20, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: 20, mgf1_hash: "SHA256")
     assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA256")
     assert_equal false,
-      key.verify_pss("SHA256", signature, invalid_data, salt_length: 20, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, invalid_data, salt_length: 20, mgf1_hash: "SHA256")
 
-    signature = key.sign_pss("SHA256", data, salt_length: :digest, mgf1_hash: "SHA1")
+    signature = key.sign_pss("SHA256", data, salt_length: :digest, mgf1_hash: "SHA256")
     assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: 32, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: 32, mgf1_hash: "SHA256")
     assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA256")
     assert_equal false,
-      key.verify_pss("SHA256", signature, data, salt_length: 20, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: 20, mgf1_hash: "SHA256")
 
     # The sign_pss with `salt_length: :max` raises the "invalid salt length"
     # error in FIPS. We need to skip the tests in FIPS.
@@ -213,18 +221,18 @@ def test_sign_verify_pss
     # FIPS 186-5 section 5.4 PKCS #1
     # https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf
     unless OpenSSL.fips_mode
-      signature = key.sign_pss("SHA256", data, salt_length: :max, mgf1_hash: "SHA1")
+      signature = key.sign_pss("SHA256", data, salt_length: :max, mgf1_hash: "SHA256")
       # Should verify on the following salt_length (sLen).
       # sLen <= emLen (octat) - 2 - hLen (octet) = 2048 / 8 - 2 - 256 / 8 = 222
       # https://datatracker.ietf.org/doc/html/rfc8017#section-9.1.1
       assert_equal true,
-        key.verify_pss("SHA256", signature, data, salt_length: 222, mgf1_hash: "SHA1")
+        key.verify_pss("SHA256", signature, data, salt_length: 222, mgf1_hash: "SHA256")
       assert_equal true,
-        key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA1")
+        key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA256")
     end
 
-    assert_raise(OpenSSL::PKey::RSAError) {
-      key.sign_pss("SHA256", data, salt_length: 223, mgf1_hash: "SHA1")
+    assert_raise(OpenSSL::PKey::PKeyError) {
+      key.sign_pss("SHA256", data, salt_length: 223, mgf1_hash: "SHA256")
     }
   end
 
@@ -270,57 +278,57 @@ def test_encrypt_decrypt_legacy
   end
 
   def test_export
-    rsa1024 = Fixtures.pkey("rsa1024")
+    orig = Fixtures.pkey("rsa-1")
 
-    pub = OpenSSL::PKey.read(rsa1024.public_to_der)
-    assert_not_equal rsa1024.export, pub.export
-    assert_equal rsa1024.public_to_pem, pub.export
+    pub = OpenSSL::PKey.read(orig.public_to_der)
+    assert_not_equal orig.export, pub.export
+    assert_equal orig.public_to_pem, pub.export
 
     # PKey is immutable in OpenSSL >= 3.0
     if !openssl?(3, 0, 0)
       key = OpenSSL::PKey::RSA.new
 
       # key has only n, e and d
-      key.set_key(rsa1024.n, rsa1024.e, rsa1024.d)
-      assert_equal rsa1024.public_key.export, key.export
+      key.set_key(orig.n, orig.e, orig.d)
+      assert_equal orig.public_key.export, key.export
 
       # key has only n, e, d, p and q
-      key.set_factors(rsa1024.p, rsa1024.q)
-      assert_equal rsa1024.public_key.export, key.export
+      key.set_factors(orig.p, orig.q)
+      assert_equal orig.public_key.export, key.export
 
       # key has n, e, d, p, q, dmp1, dmq1 and iqmp
-      key.set_crt_params(rsa1024.dmp1, rsa1024.dmq1, rsa1024.iqmp)
-      assert_equal rsa1024.export, key.export
+      key.set_crt_params(orig.dmp1, orig.dmq1, orig.iqmp)
+      assert_equal orig.export, key.export
     end
   end
 
   def test_to_der
-    rsa1024 = Fixtures.pkey("rsa1024")
+    orig = Fixtures.pkey("rsa-1")
 
-    pub = OpenSSL::PKey.read(rsa1024.public_to_der)
-    assert_not_equal rsa1024.to_der, pub.to_der
-    assert_equal rsa1024.public_to_der, pub.to_der
+    pub = OpenSSL::PKey.read(orig.public_to_der)
+    assert_not_equal orig.to_der, pub.to_der
+    assert_equal orig.public_to_der, pub.to_der
 
     # PKey is immutable in OpenSSL >= 3.0
     if !openssl?(3, 0, 0)
       key = OpenSSL::PKey::RSA.new
 
       # key has only n, e and d
-      key.set_key(rsa1024.n, rsa1024.e, rsa1024.d)
-      assert_equal rsa1024.public_key.to_der, key.to_der
+      key.set_key(orig.n, orig.e, orig.d)
+      assert_equal orig.public_key.to_der, key.to_der
 
       # key has only n, e, d, p and q
-      key.set_factors(rsa1024.p, rsa1024.q)
-      assert_equal rsa1024.public_key.to_der, key.to_der
+      key.set_factors(orig.p, orig.q)
+      assert_equal orig.public_key.to_der, key.to_der
 
       # key has n, e, d, p, q, dmp1, dmq1 and iqmp
-      key.set_crt_params(rsa1024.dmp1, rsa1024.dmq1, rsa1024.iqmp)
-      assert_equal rsa1024.to_der, key.to_der
+      key.set_crt_params(orig.dmp1, orig.dmq1, orig.iqmp)
+      assert_equal orig.to_der, key.to_der
     end
   end
 
   def test_RSAPrivateKey
-    rsa = Fixtures.pkey("rsa2048")
+    rsa = Fixtures.pkey("rsa-1")
     asn1 = OpenSSL::ASN1::Sequence([
       OpenSSL::ASN1::Integer(0),
       OpenSSL::ASN1::Integer(rsa.n),
@@ -336,35 +344,7 @@ def test_RSAPrivateKey
     assert_predicate key, :private?
     assert_same_rsa rsa, key
 
-    pem = <<~EOF
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEpAIBAAKCAQEAuV9ht9J7k4NBs38jOXvvTKY9gW8nLICSno5EETR1cuF7i4pN
-    s9I1QJGAFAX0BEO4KbzXmuOvfCpD3CU+Slp1enenfzq/t/e/1IRW0wkJUJUFQign
-    4CtrkJL+P07yx18UjyPlBXb81ApEmAB5mrJVSrWmqbjs07JbuS4QQGGXLc+Su96D
-    kYKmSNVjBiLxVVSpyZfAY3hD37d60uG+X8xdW5v68JkRFIhdGlb6JL8fllf/A/bl
-    NwdJOhVr9mESHhwGjwfSeTDPfd8ZLE027E5lyAVX9KZYcU00mOX+fdxOSnGqS/8J
-    DRh0EPHDL15RcJjV2J6vZjPb0rOYGDoMcH+94wIDAQABAoIBAAzsamqfYQAqwXTb
-    I0CJtGg6msUgU7HVkOM+9d3hM2L791oGHV6xBAdpXW2H8LgvZHJ8eOeSghR8+dgq
-    PIqAffo4x1Oma+FOg3A0fb0evyiACyrOk+EcBdbBeLo/LcvahBtqnDfiUMQTpy6V
-    seSoFCwuN91TSCeGIsDpRjbG1vxZgtx+uI+oH5+ytqJOmfCksRDCkMglGkzyfcl0
-    Xc5CUhIJ0my53xijEUQl19rtWdMnNnnkdbG8PT3LZlOta5Do86BElzUYka0C6dUc
-    VsBDQ0Nup0P6rEQgy7tephHoRlUGTYamsajGJaAo1F3IQVIrRSuagi7+YpSpCqsW
-    wORqorkCgYEA7RdX6MDVrbw7LePnhyuaqTiMK+055/R1TqhB1JvvxJ1CXk2rDL6G
-    0TLHQ7oGofd5LYiemg4ZVtWdJe43BPZlVgT6lvL/iGo8JnrncB9Da6L7nrq/+Rvj
-    XGjf1qODCK+LmreZWEsaLPURIoR/Ewwxb9J2zd0CaMjeTwafJo1CZvcCgYEAyCgb
-    aqoWvUecX8VvARfuA593Lsi50t4MEArnOXXcd1RnXoZWhbx5rgO8/ATKfXr0BK/n
-    h2GF9PfKzHFm/4V6e82OL7gu/kLy2u9bXN74vOvWFL5NOrOKPM7Kg+9I131kNYOw
-    Ivnr/VtHE5s0dY7JChYWE1F3vArrOw3T00a4CXUCgYEA0SqY+dS2LvIzW4cHCe9k
-    IQqsT0yYm5TFsUEr4sA3xcPfe4cV8sZb9k/QEGYb1+SWWZ+AHPV3UW5fl8kTbSNb
-    v4ng8i8rVVQ0ANbJO9e5CUrepein2MPL0AkOATR8M7t7dGGpvYV0cFk8ZrFx0oId
-    U0PgYDotF/iueBWlbsOM430CgYEAqYI95dFyPI5/AiSkY5queeb8+mQH62sdcCCr
-    vd/w/CZA/K5sbAo4SoTj8dLk4evU6HtIa0DOP63y071eaxvRpTNqLUOgmLh+D6gS
-    Cc7TfLuFrD+WDBatBd5jZ+SoHccVrLR/4L8jeodo5FPW05A+9gnKXEXsTxY4LOUC
-    9bS4e1kCgYAqVXZh63JsMwoaxCYmQ66eJojKa47VNrOeIZDZvd2BPVf30glBOT41
-    gBoDG3WMPZoQj9pb7uMcrnvs4APj2FIhMU8U15LcPAj59cD6S6rWnAxO8NFK7HQG
-    4Jxg3JNNf8ErQoCHb1B3oVdXJkmbJkARoDpBKmTCgKtP8ADYLmVPQw==
-    -----END RSA PRIVATE KEY-----
-    EOF
+    pem = der_to_pem(asn1.to_der, "RSA PRIVATE KEY")
     key = OpenSSL::PKey::RSA.new(pem)
     assert_same_rsa rsa, key
 
@@ -379,69 +359,46 @@ def test_RSAPrivateKey
   end
 
   def test_RSAPrivateKey_encrypted
+    # PKCS #1 RSAPrivateKey with OpenSSL encryption
     omit_on_fips
 
-    rsa1024 = Fixtures.pkey("rsa1024")
-    # key = abcdef
-    pem = <<~EOF
-    -----BEGIN RSA PRIVATE KEY-----
-    Proc-Type: 4,ENCRYPTED
-    DEK-Info: AES-128-CBC,733F5302505B34701FC41F5C0746E4C0
-
-    zgJniZZQfvv8TFx3LzV6zhAQVayvQVZlAYqFq2yWbbxzF7C+IBhKQle9IhUQ9j/y
-    /jkvol550LS8vZ7TX5WxyDLe12cdqzEvpR6jf3NbxiNysOCxwG4ErhaZGP+krcoB
-    ObuL0nvls/+3myy5reKEyy22+0GvTDjaChfr+FwJjXMG+IBCLscYdgZC1LQL6oAn
-    9xY5DH3W7BW4wR5ttxvtN32TkfVQh8xi3jrLrduUh+hV8DTiAiLIhv0Vykwhep2p
-    WZA+7qbrYaYM8GLLgLrb6LfBoxeNxAEKiTpl1quFkm+Hk1dKq0EhVnxHf92x0zVF
-    jRGZxAMNcrlCoE4f5XK45epVZSZvihdo1k73GPbp84aZ5P/xlO4OwZ3i4uCQXynl
-    jE9c+I+4rRWKyPz9gkkqo0+teJL8ifeKt/3ab6FcdA0aArynqmsKJMktxmNu83We
-    YVGEHZPeOlyOQqPvZqWsLnXQUfg54OkbuV4/4mWSIzxFXdFy/AekSeJugpswMXqn
-    oNck4qySNyfnlyelppXyWWwDfVus9CVAGZmJQaJExHMT/rQFRVchlmY0Ddr5O264
-    gcjv90o1NBOc2fNcqjivuoX7ROqys4K/YdNQ1HhQ7usJghADNOtuLI8ZqMh9akXD
-    Eqp6Ne97wq1NiJj0nt3SJlzTnOyTjzrTe0Y+atPkVKp7SsjkATMI9JdhXwGhWd7a
-    qFVl0owZiDasgEhyG2K5L6r+yaJLYkPVXZYC/wtWC3NEchnDWZGQcXzB4xROCQkD
-    OlWNYDkPiZioeFkA3/fTMvG4moB2Pp9Q4GU5fJ6k43Ccu1up8dX/LumZb4ecg5/x
-    -----END RSA PRIVATE KEY-----
-    EOF
+    rsa = Fixtures.pkey("rsa2048")
+
+    pem = der_to_encrypted_pem(rsa.to_der, "RSA PRIVATE KEY", "abcdef")
     key = OpenSSL::PKey::RSA.new(pem, "abcdef")
-    assert_same_rsa rsa1024, key
+    assert_same_rsa rsa, key
     key = OpenSSL::PKey::RSA.new(pem) { "abcdef" }
-    assert_same_rsa rsa1024, key
+    assert_same_rsa rsa, key
 
     cipher = OpenSSL::Cipher.new("aes-128-cbc")
-    exported = rsa1024.to_pem(cipher, "abcdef\0\1")
-    assert_same_rsa rsa1024, OpenSSL::PKey::RSA.new(exported, "abcdef\0\1")
-    assert_raise(OpenSSL::PKey::RSAError) {
+    exported = rsa.to_pem(cipher, "abcdef\0\1")
+    assert_same_rsa rsa, OpenSSL::PKey::RSA.new(exported, "abcdef\0\1")
+    assert_raise(OpenSSL::PKey::PKeyError) {
       OpenSSL::PKey::RSA.new(exported, "abcdef")
     }
   end
 
   def test_RSAPublicKey
-    rsa1024 = Fixtures.pkey("rsa1024")
-    rsa1024pub = OpenSSL::PKey::RSA.new(rsa1024.public_to_der)
+    # PKCS #1 RSAPublicKey. Only decoding is supported
+    orig = Fixtures.pkey("rsa-1")
+    pub = OpenSSL::PKey::RSA.new(orig.public_to_der)
 
     asn1 = OpenSSL::ASN1::Sequence([
-      OpenSSL::ASN1::Integer(rsa1024.n),
-      OpenSSL::ASN1::Integer(rsa1024.e)
+      OpenSSL::ASN1::Integer(orig.n),
+      OpenSSL::ASN1::Integer(orig.e)
     ])
     key = OpenSSL::PKey::RSA.new(asn1.to_der)
     assert_not_predicate key, :private?
-    assert_same_rsa rsa1024pub, key
+    assert_same_rsa pub, key
 
-    pem = <<~EOF
-    -----BEGIN RSA PUBLIC KEY-----
-    MIGJAoGBAMvCxLDUQKc+1P4+Q6AeFwYDvWfALb+cvzlUEadGoPE6qNWHsLFoo8RF
-    geyTgE8KQTduu1OE9Zz2SMcRBDu5/1jWtsLPSVrI2ofLLBARUsWanVyki39DeB4u
-    /xkP2mKGjAokPIwOI3oCthSZlzO9bj3voxTf6XngTqUX8l8URTmHAgMBAAE=
-    -----END RSA PUBLIC KEY-----
-    EOF
+    pem = der_to_pem(asn1.to_der, "RSA PUBLIC KEY")
     key = OpenSSL::PKey::RSA.new(pem)
-    assert_same_rsa rsa1024pub, key
+    assert_same_rsa pub, key
   end
 
   def test_PUBKEY
-    rsa1024 = Fixtures.pkey("rsa1024")
-    rsa1024pub = OpenSSL::PKey::RSA.new(rsa1024.public_to_der)
+    orig = Fixtures.pkey("rsa-1")
+    pub = OpenSSL::PKey::RSA.new(orig.public_to_der)
 
     asn1 = OpenSSL::ASN1::Sequence([
       OpenSSL::ASN1::Sequence([
@@ -450,39 +407,32 @@ def test_PUBKEY
       ]),
       OpenSSL::ASN1::BitString(
         OpenSSL::ASN1::Sequence([
-          OpenSSL::ASN1::Integer(rsa1024.n),
-          OpenSSL::ASN1::Integer(rsa1024.e)
+          OpenSSL::ASN1::Integer(orig.n),
+          OpenSSL::ASN1::Integer(orig.e)
         ]).to_der
       )
     ])
     key = OpenSSL::PKey::RSA.new(asn1.to_der)
     assert_not_predicate key, :private?
-    assert_same_rsa rsa1024pub, key
+    assert_same_rsa pub, key
 
-    pem = <<~EOF
-    -----BEGIN PUBLIC KEY-----
-    MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLwsSw1ECnPtT+PkOgHhcGA71n
-    wC2/nL85VBGnRqDxOqjVh7CxaKPERYHsk4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbC
-    z0layNqHyywQEVLFmp1cpIt/Q3geLv8ZD9pihowKJDyMDiN6ArYUmZczvW4976MU
-    3+l54E6lF/JfFEU5hwIDAQAB
-    -----END PUBLIC KEY-----
-    EOF
+    pem = der_to_pem(asn1.to_der, "PUBLIC KEY")
     key = OpenSSL::PKey::RSA.new(pem)
-    assert_same_rsa rsa1024pub, key
+    assert_same_rsa pub, key
 
     assert_equal asn1.to_der, key.to_der
     assert_equal pem, key.export
 
-    assert_equal asn1.to_der, rsa1024.public_to_der
+    assert_equal asn1.to_der, orig.public_to_der
     assert_equal asn1.to_der, key.public_to_der
-    assert_equal pem, rsa1024.public_to_pem
+    assert_equal pem, orig.public_to_pem
     assert_equal pem, key.public_to_pem
   end
 
   def test_pem_passwd
     omit_on_fips
 
-    key = Fixtures.pkey("rsa1024")
+    key = Fixtures.pkey("rsa-1")
     pem3c = key.to_pem("aes-128-cbc", "key")
     assert_match (/ENCRYPTED/), pem3c
     assert_equal key.to_der, OpenSSL::PKey.read(pem3c, "key").to_der
@@ -493,38 +443,21 @@ def test_pem_passwd
   end
 
   def test_private_encoding
-    rsa1024 = Fixtures.pkey("rsa1024")
+    pkey = Fixtures.pkey("rsa-1")
     asn1 = OpenSSL::ASN1::Sequence([
       OpenSSL::ASN1::Integer(0),
       OpenSSL::ASN1::Sequence([
         OpenSSL::ASN1::ObjectId("rsaEncryption"),
         OpenSSL::ASN1::Null(nil)
       ]),
-      OpenSSL::ASN1::OctetString(rsa1024.to_der)
+      OpenSSL::ASN1::OctetString(pkey.to_der)
     ])
-    assert_equal asn1.to_der, rsa1024.private_to_der
-    assert_same_rsa rsa1024, OpenSSL::PKey.read(asn1.to_der)
+    assert_equal asn1.to_der, pkey.private_to_der
+    assert_same_rsa pkey, OpenSSL::PKey.read(asn1.to_der)
 
-    pem = <<~EOF
-    -----BEGIN PRIVATE KEY-----
-    MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMvCxLDUQKc+1P4+
-    Q6AeFwYDvWfALb+cvzlUEadGoPE6qNWHsLFoo8RFgeyTgE8KQTduu1OE9Zz2SMcR
-    BDu5/1jWtsLPSVrI2ofLLBARUsWanVyki39DeB4u/xkP2mKGjAokPIwOI3oCthSZ
-    lzO9bj3voxTf6XngTqUX8l8URTmHAgMBAAECgYEApKX8xBqvJ7XI7Kypfo/x8MVC
-    3rxW+1eQ2aVKIo4a7PKGjQz5RVIVyzqTUvSZoMTbkAxlSIbO5YfJpTnl3tFcOB6y
-    QMxqQPW/pl6Ni3EmRJdsRM5MsPBRZOfrXxOCdvXu1TWOS1S1TrvEr/TyL9eh2WCd
-    CGzpWgdO4KHce7vs7pECQQDv6DGoG5lHnvbvj9qSJb9K5ebRJc8S+LI7Uy5JHC0j
-    zsHTYPSqBXwPVQdGbgCEycnwwKzXzT2QxAQmJBQKun2ZAkEA2W3aeAE7Xi6zo2eG
-    4Cx4UNMHMIdfBRS7VgoekwybGmcapqV0aBew5kHeWAmxP1WUZ/dgZh2QtM1VuiBA
-    qUqkHwJBAOJLCRvi/JB8N7z82lTk2i3R8gjyOwNQJv6ilZRMyZ9vFZFHcUE27zCf
-    Kb+bX03h8WPwupjMdfgpjShU+7qq8nECQQDBrmyc16QVyo40sgTgblyiysitvviy
-    ovwZsZv4q5MCmvOPnPUrwGbRRb2VONUOMOKpFiBl9lIv7HU//nj7FMVLAkBjUXED
-    83dA8JcKM+HlioXEAxCzZVVhN+D63QwRwkN08xAPklfqDkcqccWDaZm2hdCtaYlK
-    funwYkrzI1OikQSs
-    -----END PRIVATE KEY-----
-    EOF
-    assert_equal pem, rsa1024.private_to_pem
-    assert_same_rsa rsa1024, OpenSSL::PKey.read(pem)
+    pem = der_to_pem(asn1.to_der, "PRIVATE KEY")
+    assert_equal pem, pkey.private_to_pem
+    assert_same_rsa pkey, OpenSSL::PKey.read(pem)
   end
 
   def test_private_encoding_encrypted
@@ -542,44 +475,65 @@ def test_private_encoding_encrypted
     assert_match (/BEGIN ENCRYPTED PRIVATE KEY/), encoded.lines[0]
     assert_same_rsa rsa, OpenSSL::PKey.read(encoded, "abcdef")
 
-    # certtool --load-privkey=test/openssl/fixtures/pkey/rsa2048.pem --to-p8 --password=abcdef
+    # Use openssl instead of certtool due to https://gitlab.com/gnutls/gnutls/-/issues/1632
+    # openssl pkcs8 -in test/openssl/fixtures/pkey/rsa2048.pem -topk8 -v2 aes-128-cbc -passout pass:abcdef
     pem = <<~EOF
     -----BEGIN ENCRYPTED PRIVATE KEY-----
-    MIIFOTBjBgkqhkiG9w0BBQ0wVjA1BgkqhkiG9w0BBQwwKAQSsTIsinrhNMr4owUz
-    cwYGgB0lAgMJJ8ACARAwCgYIKoZIhvcNAgkwHQYJYIZIAWUDBAECBBDtDYqmQOLV
-    Nh0T0DslWgovBIIE0ESbJey2Pjf9brTp9/41CPnI9Ev78CGSv8Ihyuynu6G7oj7N
-    G7jUB1pVMQ7ivebF5DmM0qHAix6fDqJetB3WCnRQpMLyIdq5VrnKwFNhwGYduWA5
-    IyaAc4DHj02e6YLyBTIKpu79OSFxLrnLCRaTbvZIUQaGhyd6pB7iAhqz5YBC0rpa
-    iMK5TRlNGPYG9n2eGFOhvUsbJ4T8VDzjpVWw0VNRaukXtg4xiR6o1f0qSXqAb5d9
-    REq5DfaQfoOKTV9j7KJHDRrBQG81vkU4K+xILrCBfbcYb82aCoinwSep9LC30HaH
-    LZ0hYQOuD/k/UbgjToS2wyMnkz75MN5ZNhDMZl/mACQdsMMtIxG37Mpo1Ca33uZi
-    71TCOEKIblZS11L1YhIni9Af8pOuHJBWwezP2zN2nPwV6OhgL7Jlax7ICQOPC6L/
-    yRGgC5eT4lDDAuTy0IdUhr0r5XrFzZR0/5Vgsq9cGfk9QkXOoETRhQVkEfUDdCs6
-    6CK+SwUR9qh5824ShODFG0SQpsqBPIVtkGrypBSUJtICmGMOAsclB7RDN7/opJwp
-    qv/iRJ5dhWrhRgQ/DfYifvO5On7RgC2hm48gF3Pt6XCA857ryyYxLYeMY42tAUqp
-    Hmc9HL7bMYF/jl3cJ32+gLvI3PBVvrvyeAhRo6z7MFVe9I04OywV6BHUx1Us6ybF
-    qkYnSpcJZdu7HyvzXm7XWLFmt7K5BlAgnFsa/8+cI1BGPgQRc1j0SWepXsSwFZX6
-    JkNQ0dewq4uRJXbGyQgfh5I5ETpqDhSt2JfBwAoze6cx3DPC711PUamxyWMiejs+
-    mYdia4p62NxaUvyXWmCGIEOzajRwywEhf9OLAmfqTN41TIrEL4BUxqtzDyw8Nl8T
-    KB7nJEC366jFASfumNQkXXyH5yBIF+XwwSKUOObRZVn2rUzFToo51hHu9efxHoXa
-    jZlpfglWijkmOuwoIGlGHOq8gUn76oq9WbV+YO+fWm/mf4S3ECzmYzxb6a1uCTy/
-    Itkm2qOe3yTM1t+oCqZ0/MeTZ84ALQaWv5reQfjronPZ1jeNtxrYz28tJ4KwBn0U
-    bJReXbOLsHAymipncxlmaevbx4GPTduu/lbpxefoN95w+SpEdyTmVWrfaCTgAbad
-    EzcRl60my3xOMQ7CaUbRgGiwohqHDvuXzeqoZ96u6CwfAoEfy4jETmKLRH6uTtj7
-    4jdTyoqyizjpvaM8LPspBS+oqFwLxBjpseQuScrZO1BjPxrImLy2/VRqwJ+CF4FB
-    iijEgDgDc1EMIGe5YmOAV+i22n9RqX+2IvkYp7CWXrB9/lmirLFukd7hT8DLPUGq
-    AvSZwTPbDPoZKG3DAebC3DbiC7A3x0KZp24doNRLamZ/MyKHo2Rzl0UhkzDU0ly2
-    eAnyNYsOAQck+C6L+ieD95Gksm9YJWurwttm5JragbIJwMCrsBQd4bXDkKdRhxS2
-    JpS0dT/aoDmgTzoG07x4cZk0rjBkfX1ta0j0b1lz7/PZXl9AbRvFdq5sJpmv4Ryz
-    S+OERqo4IEfJJq2WJ92WR+HLGV3Gvsdb7znZTEF1tp4pWOLAt83Pry282UJxO7Pe
-    ySf/868TEmXams06GYvH+7cMiIT2m9Dc+EFgNaPmm0uMmJ+ZjqHKSOLzrL7C
+    MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIay5V8CDQi5oCAggA
+    MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAECBBB6eyagcbsvdQlM1kPcH7kiBIIE
+    0Ng1apIyoPAZ4BfC4kMNeSmeAv3XspxqYi3uWzXiNyTcoE6390swrwM6WvdpXvLI
+    /n/V06krxPZ9X4fBG2kLUzXt5f09lEvmQU1HW1wJGU5Sq3bNeXBrlJF4DzJE4WWd
+    whVVvNMm44ghdzN/jGSw3z+6d717N+waa7vrpBDsHjhsPNwxpyzUvcFPFysTazxx
+    kN/dziIBF6SRKi6w8VaJEMQ8czGu5T3jOc2e/1p3/AYhHLPS4NHhLR5OUh0TKqLK
+    tANAqI9YqCAjhqcYCmN3mMQXY52VfOqG9hlX1x9ZQyqiH7l102EWbPqouk6bCBLQ
+    wHepPg4uK99Wsdh65qEryNnXQ5ZmO6aGb6T3TFENCaNKmi8Nh+/5dr7J7YfhIwpo
+    FqHvk0hrZ8r3EQlr8/td0Yb1/IKzeQ34638uXf9UxK7C6o+ilsmJDR4PHJUfZL23
+    Yb9qWJ0GEzd5AMsI7x6KuUxSuH9nKniv5Tzyty3Xmb4FwXUyADWE19cVuaT+HrFz
+    GraKnA3UXbEgWAU48/l4K2HcAHyHDD2Kbp8k+o1zUkH0fWUdfE6OUGtx19Fv44Jh
+    B7xDngK8K48C6nrj06/DSYfXlb2X7WQiapeG4jt6U57tLH2XAjHCkvu0IBZ+//+P
+    yIWduEHQ3w8FBRcIsTNJo5CjkGk580TVQB/OBLWfX48Ay3oF9zgnomDIlVjl9D0n
+    lKxw/KMCLkvB78rUeGbr1Kwj36FhGpTBw3FgcYGa5oWFZTlcOgMTXLqlbb9JnDlA
+    Zs7Tu0WTyOTV/Dne9nEm39Dzu6wRojiIpmygTD4FI7rmOy3CYNvL3XPv7XQj0hny
+    Ee/fLxugYlQnwPZSqOVEQY2HsG7AmEHRsvy4bIWIGt+yzAPZixt9MUdJh91ttRt7
+    QA/8J1pAsGqEuQpF6UUINZop3J7twfhO4zWYN/NNQ52eWNX2KLfjfGRhrvatzmZ0
+    BuCsCI9hwEeE6PTlhbX1Rs177MrDc3vlqz2V3Po0OrFjXAyg9DR/OC4iK5wOG2ZD
+    7StVSP8bzwQXsz3fJ0ardKXgnU2YDAP6Vykjgt+nFI09HV/S2faOc2g/UK4Y2khl
+    J93u/GHMz/Kr3bKWGY1/6nPdIdFheQjsiNhd5gI4tWik2B3QwU9mETToZ2LSvDHU
+    jYCys576xJLkdMM6nJdq72z4tCoES9IxyHVs4uLjHKIo/ZtKr+8xDo8IL4ax3U8+
+    NMhs/lwReHmPGahm1fu9zLRbNCVL7e0zrOqbjvKcSEftObpV/LLcPYXtEm+lZcck
+    /PMw49HSE364anKEXCH1cyVWJwdZRpFUHvRpLIrpHru7/cthhiEMdLgK1/x8sLob
+    DiyieLxH1DPeXT4X+z94ER4IuPVOcV5AXc/omghispEX6DNUnn5jC4e3WyabjUbw
+    MuO9lVH9Wi2/ynExCqVmQkdbTXuLwjni1fJ27Q5zb0aCmhO8eq6P869NCjhJuiUj
+    NI9XtGLP50YVWE0kL8KEJqnyFudky8Khzk4/dyixQFqin5GfT4vetrLunGHy7lRB
+    3LpnFrpMOr+0xr1RW1k9vlmjRsJSiojJfReYO7gH3B5swiww2azogoL+4jhF1Jxh
+    OYLWdkKhP2jSVGqtIDtny0O4lBm2+hLpWjiI0mJQ7wdA
     -----END ENCRYPTED PRIVATE KEY-----
     EOF
     assert_same_rsa rsa, OpenSSL::PKey.read(pem, "abcdef")
   end
 
+  def test_params
+    key = Fixtures.pkey("rsa2048")
+    assert_equal(2048, key.n.num_bits)
+    assert_equal(key.n, key.params["n"])
+    assert_equal(65537, key.e)
+    assert_equal(key.e, key.params["e"])
+    [:d, :p, :q, :dmp1, :dmq1, :iqmp].each do |name|
+      assert_kind_of(OpenSSL::BN, key.send(name))
+      assert_equal(key.send(name), key.params[name.to_s])
+    end
+
+    pubkey = OpenSSL::PKey.read(key.public_to_der)
+    assert_equal(key.n, pubkey.n)
+    assert_equal(key.e, pubkey.e)
+    [:d, :p, :q, :dmp1, :dmq1, :iqmp].each do |name|
+      assert_nil(pubkey.send(name))
+      assert_nil(pubkey.params[name.to_s])
+    end
+  end
+
   def test_dup
-    key = Fixtures.pkey("rsa1024")
+    key = Fixtures.pkey("rsa-1")
     key2 = key.dup
     assert_equal key.params, key2.params
 
@@ -591,7 +545,7 @@ def test_dup
   end
 
   def test_marshal
-    key = Fixtures.pkey("rsa2048")
+    key = Fixtures.pkey("rsa-1")
     deserialized = Marshal.load(Marshal.dump(key))
 
     assert_equal key.to_der, deserialized.to_der
diff --git a/test/mri/openssl/test_provider.rb b/test/mri/openssl/test_provider.rb
index 6f85c00c988..10081e208ce 100644
--- a/test/mri/openssl/test_provider.rb
+++ b/test/mri/openssl/test_provider.rb
@@ -46,6 +46,7 @@ def test_openssl_legacy_provider
 
     with_openssl(<<-'end;')
       begin
+        OpenSSL::Provider.load("default")
         OpenSSL::Provider.load("legacy")
       rescue OpenSSL::Provider::ProviderError
         omit "Only for OpenSSL with legacy provider"
diff --git a/test/mri/openssl/test_ssl.rb b/test/mri/openssl/test_ssl.rb
index 459efcc18ea..5d20ccd1f4b 100644
--- a/test/mri/openssl/test_ssl.rb
+++ b/test/mri/openssl/test_ssl.rb
@@ -39,8 +39,7 @@ def test_ctx_options
   end
 
   def test_ctx_options_config
-    omit "LibreSSL does not support OPENSSL_CONF" if libressl?
-    omit "OpenSSL < 1.1.1 does not support system_default" if openssl? && !openssl?(1, 1, 1)
+    omit "LibreSSL and AWS-LC do not support OPENSSL_CONF" if libressl? || aws_lc?
 
     Tempfile.create("openssl.cnf") { |f|
       f.puts(<<~EOF)
@@ -231,6 +230,34 @@ def test_add_certificate_multiple_certs
     end
   end
 
+  def test_extra_chain_cert_auto_chain
+    start_server { |port|
+      server_connect(port) { |ssl|
+        ssl.puts "abc"; assert_equal "abc\n", ssl.gets
+        assert_equal @svr_cert.to_der, ssl.peer_cert.to_der
+        assert_equal [@svr_cert], ssl.peer_cert_chain
+      }
+    }
+
+    # AWS-LC enables SSL_MODE_NO_AUTO_CHAIN by default
+    unless aws_lc?
+      ctx_proc = -> ctx {
+        # Sanity check: start_server won't set extra_chain_cert
+        assert_nil ctx.extra_chain_cert
+        ctx.cert_store = OpenSSL::X509::Store.new.tap { |store|
+          store.add_cert(@ca_cert)
+        }
+      }
+      start_server(ctx_proc: ctx_proc) { |port|
+        server_connect(port) { |ssl|
+          ssl.puts "abc"; assert_equal "abc\n", ssl.gets
+          assert_equal @svr_cert.to_der, ssl.peer_cert.to_der
+          assert_equal [@svr_cert, @ca_cert], ssl.peer_cert_chain
+        }
+      }
+    end
+  end
+
   def test_sysread_and_syswrite
     start_server { |port|
       server_connect(port) { |ssl|
@@ -243,6 +270,11 @@ def test_sysread_and_syswrite
         ssl.syswrite(str)
         assert_same buf, ssl.sysread(str.size, buf)
         assert_equal(str, buf)
+
+        obj = Object.new
+        obj.define_singleton_method(:to_str) { str }
+        ssl.syswrite(obj)
+        assert_equal(str, ssl.sysread(str.bytesize))
       }
     }
   end
@@ -256,11 +288,16 @@ def test_read_with_timeout
         ssl.syswrite(str)
         assert_equal(str, ssl.sysread(str.bytesize))
 
-        ssl.timeout = 1
-        assert_raise(IO::TimeoutError) {ssl.read(1)}
+        ssl.timeout = 0.1
+        assert_raise(IO::TimeoutError) { ssl.sysread(1) }
 
         ssl.syswrite(str)
         assert_equal(str, ssl.sysread(str.bytesize))
+
+        buf = "orig".b
+        assert_raise(IO::TimeoutError) { ssl.sysread(1, buf) }
+        assert_equal("orig", buf)
+        assert_nothing_raised { buf.clear }
       end
     end
   end
@@ -344,27 +381,27 @@ def test_verify_mode_server_cert
       empty_store = OpenSSL::X509::Store.new
 
       # Valid certificate, SSL_VERIFY_PEER
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      ctx.cert_store = populated_store
       assert_nothing_raised {
-        ctx = OpenSSL::SSL::SSLContext.new
-        ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        ctx.cert_store = populated_store
         server_connect(port, ctx) { |ssl| ssl.puts("abc"); ssl.gets }
       }
 
       # Invalid certificate, SSL_VERIFY_NONE
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      ctx.cert_store = empty_store
       assert_nothing_raised {
-        ctx = OpenSSL::SSL::SSLContext.new
-        ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        ctx.cert_store = empty_store
         server_connect(port, ctx) { |ssl| ssl.puts("abc"); ssl.gets }
       }
 
       # Invalid certificate, SSL_VERIFY_PEER
-      assert_handshake_error {
-        ctx = OpenSSL::SSL::SSLContext.new
-        ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        ctx.cert_store = empty_store
-        server_connect(port, ctx) { |ssl| ssl.puts("abc"); ssl.gets }
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      ctx.cert_store = empty_store
+      assert_raise(OpenSSL::SSL::SSLError) {
+        server_connect(port, ctx)
       }
     }
   end
@@ -392,10 +429,15 @@ def test_verify_mode_client_cert_required
 
   def test_client_auth_success
     vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
-    start_server(verify_mode: vflag,
-      ctx_proc: proc { |ctx|
-        ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl?(3, 2, 0)
-    }) { |port|
+    ctx_proc = proc { |ctx|
+      store = OpenSSL::X509::Store.new
+      store.add_cert(@ca_cert)
+      store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+      ctx.cert_store = store
+      # LibreSSL doesn't support client_cert_cb in TLS 1.3
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl?
+    }
+    start_server(verify_mode: vflag, ctx_proc: ctx_proc) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.key = @cli_key
       ctx.cert = @cli_cert
@@ -437,9 +479,13 @@ def test_client_cert_cb_ignore_error
   end
 
   def test_client_ca
-    pend "LibreSSL 3.2 has broken client CA support" if libressl?(3, 2, 0)
+    pend "LibreSSL doesn't support certificate_authorities" if libressl?
 
     ctx_proc = Proc.new do |ctx|
+      store = OpenSSL::X509::Store.new
+      store.add_cert(@ca_cert)
+      store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+      ctx.cert_store = store
       ctx.client_ca = [@ca_cert]
     end
 
@@ -505,7 +551,7 @@ def test_verify_result
       ssl.sync_close = true
       begin
         assert_raise(OpenSSL::SSL::SSLError){ ssl.connect }
-        assert_equal(OpenSSL::X509::V_ERR_SELF_SIGNED_CERT_IN_CHAIN, ssl.verify_result)
+        assert_equal(OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, ssl.verify_result)
       ensure
         ssl.close
       end
@@ -609,12 +655,9 @@ def test_finished_messages
     start_server(accept_proc: proc { |server|
       server_finished = server.finished_message
       server_peer_finished = server.peer_finished_message
-    }, ctx_proc: proc { |ctx|
-      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl?(3, 2, 0)
     }) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      ctx.max_version = :TLS1_2 if libressl?(3, 2, 0) && !libressl?(3, 3, 0)
       server_connect(port, ctx) { |ssl|
         ssl.puts "abc"; ssl.gets
 
@@ -642,8 +685,12 @@ def test_sslctx_set_params
   end
 
   def test_post_connect_check_with_anon_ciphers
+    # DH missing the q value on unknown named parameters is not FIPS-approved.
+    omit_on_fips
+    omit "AWS-LC does not support DHE ciphersuites" if aws_lc?
+
     ctx_proc = -> ctx {
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "aNULL"
       ctx.tmp_dh = Fixtures.pkey("dh-1")
       ctx.security_level = 0
@@ -651,7 +698,7 @@ def test_post_connect_check_with_anon_ciphers
 
     start_server(ctx_proc: ctx_proc) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "aNULL"
       ctx.security_level = 0
       server_connect(port, ctx) { |ssl|
@@ -795,11 +842,6 @@ def test_post_connection_check_wildcard_san
     #     buzz.example.net, respectively).  ...
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
       create_cert_with_san('DNS:baz*.example.com'), 'baz1.example.com'))
-
-    # LibreSSL 3.5.0+ doesn't support other wildcard certificates
-    # (it isn't required to, as RFC states MAY, not MUST)
-    return if libressl?(3, 5, 0)
-
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
       create_cert_with_san('DNS:*baz.example.com'), 'foobaz.example.com'))
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
@@ -883,11 +925,17 @@ def test_post_connection_check_wildcard_cn
   end
 
   def create_cert_with_san(san)
-    ef = OpenSSL::X509::ExtensionFactory.new
     cert = OpenSSL::X509::Certificate.new
     cert.subject = OpenSSL::X509::Name.parse("/DC=some/DC=site/CN=Some Site")
-    ext = ef.create_ext('subjectAltName', san)
-    cert.add_extension(ext)
+    v = OpenSSL::ASN1::Sequence(san.split(",").map { |item|
+      type, value = item.split(":", 2)
+      case type
+      when "DNS" then OpenSSL::ASN1::IA5String(value, 2, :IMPLICIT)
+      when "IP" then OpenSSL::ASN1::OctetString(IPAddr.new(value).hton, 7, :IMPLICIT)
+      else raise "unsupported"
+      end
+    })
+    cert.add_extension(OpenSSL::X509::Extension.new("subjectAltName", v))
     cert
   end
 
@@ -924,7 +972,7 @@ def socketpair
   end
 
   def test_keylog_cb
-    pend "Keylog callback is not supported" if !openssl?(1, 1, 1) || libressl?
+    omit "Keylog callback is not supported" if libressl?
 
     prefix = 'CLIENT_RANDOM'
     context = OpenSSL::SSL::SSLContext.new
@@ -944,30 +992,28 @@ def test_keylog_cb
       end
     end
 
-    if tls13_supported?
-      prefixes = [
-        'SERVER_HANDSHAKE_TRAFFIC_SECRET',
-        'EXPORTER_SECRET',
-        'SERVER_TRAFFIC_SECRET_0',
-        'CLIENT_HANDSHAKE_TRAFFIC_SECRET',
-        'CLIENT_TRAFFIC_SECRET_0',
-      ]
-      context = OpenSSL::SSL::SSLContext.new
-      context.min_version = context.max_version = OpenSSL::SSL::TLS1_3_VERSION
-      cb_called = false
-      context.keylog_cb = proc do |_sock, line|
-        cb_called = true
-        assert_not_nil(prefixes.delete(line.split.first))
-      end
+    prefixes = [
+      'SERVER_HANDSHAKE_TRAFFIC_SECRET',
+      'EXPORTER_SECRET',
+      'SERVER_TRAFFIC_SECRET_0',
+      'CLIENT_HANDSHAKE_TRAFFIC_SECRET',
+      'CLIENT_TRAFFIC_SECRET_0',
+    ]
+    context = OpenSSL::SSL::SSLContext.new
+    context.min_version = context.max_version = OpenSSL::SSL::TLS1_3_VERSION
+    cb_called = false
+    context.keylog_cb = proc do |_sock, line|
+      cb_called = true
+      assert_not_nil(prefixes.delete(line.split.first))
+    end
 
-      start_server do |port|
-        server_connect(port, context) do |ssl|
-          ssl.puts "abc"
-          assert_equal("abc\n", ssl.gets)
-          assert_equal(true, cb_called)
-        end
-        assert_equal(0, prefixes.size)
+    start_server do |port|
+      server_connect(port, context) do |ssl|
+        ssl.puts "abc"
+        assert_equal("abc\n", ssl.gets)
+        assert_equal(true, cb_called)
       end
+      assert_equal(0, prefixes.size)
     end
   end
 
@@ -1077,13 +1123,11 @@ def test_accept_errors_include_peeraddr
 
   def test_verify_hostname_on_connect
     ctx_proc = proc { |ctx|
-      san = "DNS:a.example.com,DNS:*.b.example.com"
-      san += ",DNS:c*.example.com,DNS:d.*.example.com" unless libressl?(3, 2, 2)
       exts = [
         ["keyUsage", "keyEncipherment,digitalSignature", true],
-        ["subjectAltName", san],
+        ["subjectAltName", "DNS:a.example.com,DNS:*.b.example.com," \
+                           "DNS:c*.example.com,DNS:d.*.example.com"],
       ]
-
       ctx.cert = issue_cert(@svr, @svr_key, 4, exts, @ca_cert, @ca_key)
       ctx.key = @svr_key
     }
@@ -1105,7 +1149,6 @@ def test_verify_hostname_on_connect
         ["cx.example.com", true],
         ["d.x.example.com", false],
       ].each do |name, expected_ok|
-        next if name.start_with?('cx') if libressl?(3, 2, 2)
         begin
           sock = TCPSocket.new("127.0.0.1", port)
           ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
@@ -1114,7 +1157,7 @@ def test_verify_hostname_on_connect
             ssl.connect
             ssl.puts "abc"; assert_equal "abc\n", ssl.gets
           else
-            assert_handshake_error { ssl.connect }
+            assert_raise(OpenSSL::SSL::SSLError) { ssl.connect }
           end
         ensure
           ssl.close if ssl
@@ -1152,7 +1195,7 @@ def test_verify_hostname_failure_error_code
         sock = TCPSocket.new("127.0.0.1", port)
         ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
         ssl.hostname = "b.example.com"
-        assert_handshake_error { ssl.connect }
+        assert_raise(OpenSSL::SSL::SSLError) { ssl.connect }
         assert_equal false, verify_callback_ok
         assert_equal OpenSSL::X509::V_ERR_HOSTNAME_MISMATCH, verify_callback_err
       ensure
@@ -1165,9 +1208,7 @@ def test_connect_certificate_verify_failed_exception_message
     start_server(ignore_listener_error: true) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.set_params
-      # OpenSSL <= 1.1.0: "self signed certificate in certificate chain"
-      # OpenSSL >= 3.0.0: "self-signed certificate in certificate chain"
-      assert_raise_with_message(OpenSSL::SSL::SSLError, /self.signed/) {
+      assert_raise_with_message(OpenSSL::SSL::SSLError, /unable to get local issuer certificate/) {
         server_connect(port, ctx)
       }
     }
@@ -1209,34 +1250,33 @@ def check_supported_protocol_versions
       OpenSSL::SSL::TLS1_VERSION,
       OpenSSL::SSL::TLS1_1_VERSION,
       OpenSSL::SSL::TLS1_2_VERSION,
-      # OpenSSL 1.1.1
-      defined?(OpenSSL::SSL::TLS1_3_VERSION) && OpenSSL::SSL::TLS1_3_VERSION,
-    ].compact
+      OpenSSL::SSL::TLS1_3_VERSION,
+    ]
 
-    # Prepare for testing & do sanity check
     supported = []
-    possible_versions.each do |ver|
-      catch(:unsupported) {
-        ctx_proc = proc { |ctx|
-          begin
-            ctx.min_version = ctx.max_version = ver
-          rescue ArgumentError, OpenSSL::SSL::SSLError
-            throw :unsupported
-          end
+    ctx_proc = proc { |ctx|
+      # The default security level is 1 in OpenSSL <= 3.1, 2 in OpenSSL >= 3.2
+      # In OpenSSL >= 3.0, TLS 1.1 or older is disabled at level 1
+      ctx.security_level = 0
+      # Explicitly reset them to avoid influenced by OPENSSL_CONF
+      ctx.min_version = ctx.max_version = nil
+    }
+    start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
+      possible_versions.each do |ver|
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.security_level = 0
+        ctx.min_version = ctx.max_version = ver
+        server_connect(port, ctx) { |ssl|
+          ssl.puts "abc"; assert_equal "abc\n", ssl.gets
         }
-        start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
-          begin
-            server_connect(port) { |ssl|
-              ssl.puts "abc"; assert_equal "abc\n", ssl.gets
-            }
-          rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET
-          else
-            supported << ver
-          end
-        end
-      }
+        supported << ver
+      rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET
+      end
     end
-    assert_not_empty supported
+
+    # Sanity check: in our test suite we assume these are always supported
+    assert_include(supported, OpenSSL::SSL::TLS1_2_VERSION)
+    assert_include(supported, OpenSSL::SSL::TLS1_3_VERSION)
 
     supported
   end
@@ -1254,7 +1294,7 @@ def test_set_params_min_version
       start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
         ctx = OpenSSL::SSL::SSLContext.new
         ctx.set_params(cert_store: store, verify_hostname: false)
-        assert_handshake_error { server_connect(port, ctx) { } }
+        assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) }
       }
     end
   end
@@ -1270,18 +1310,20 @@ def test_minmax_version
       OpenSSL::SSL::TLS1_VERSION => { name: "TLSv1", method: "TLSv1" },
       OpenSSL::SSL::TLS1_1_VERSION => { name: "TLSv1.1", method: "TLSv1_1" },
       OpenSSL::SSL::TLS1_2_VERSION => { name: "TLSv1.2", method: "TLSv1_2" },
-      # OpenSSL 1.1.1
-      defined?(OpenSSL::SSL::TLS1_3_VERSION) && OpenSSL::SSL::TLS1_3_VERSION =>
-      { name: "TLSv1.3", method: nil },
+      OpenSSL::SSL::TLS1_3_VERSION => { name: "TLSv1.3", method: nil },
     }
 
     # Server enables a single version
     supported.each do |ver|
-      ctx_proc = proc { |ctx| ctx.min_version = ctx.max_version = ver }
+      ctx_proc = proc { |ctx|
+        ctx.security_level = 0
+        ctx.min_version = ctx.max_version = ver
+      }
       start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
         supported.each do |cver|
           # Client enables a single version
           ctx1 = OpenSSL::SSL::SSLContext.new
+          ctx1.security_level = 0
           ctx1.min_version = ctx1.max_version = cver
           if ver == cver
             server_connect(port, ctx1) { |ssl|
@@ -1289,13 +1331,14 @@ def test_minmax_version
               ssl.puts "abc"; assert_equal "abc\n", ssl.gets
             }
           else
-            assert_handshake_error { server_connect(port, ctx1) { } }
+            assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx1) }
           end
 
           # There is no version-specific SSL methods for TLS 1.3
           if cver <= OpenSSL::SSL::TLS1_2_VERSION
             # Client enables a single version using #ssl_version=
             ctx2 = OpenSSL::SSL::SSLContext.new
+            ctx2.security_level = 0
             ctx2.ssl_version = vmap[cver][:method]
             if ver == cver
               server_connect(port, ctx2) { |ssl|
@@ -1303,13 +1346,14 @@ def test_minmax_version
                 ssl.puts "abc"; assert_equal "abc\n", ssl.gets
               }
             else
-              assert_handshake_error { server_connect(port, ctx2) { } }
+              assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx2) }
             end
           end
         end
 
         # Client enables all supported versions
         ctx3 = OpenSSL::SSL::SSLContext.new
+        ctx3.security_level = 0
         ctx3.min_version = ctx3.max_version = nil
         server_connect(port, ctx3) { |ssl|
           assert_equal vmap[ver][:name], ssl.ssl_version
@@ -1324,12 +1368,17 @@ def test_minmax_version
 
     # Server sets min_version (earliest is disabled)
     sver = supported[1]
-    ctx_proc = proc { |ctx| ctx.min_version = sver }
+    ctx_proc = proc { |ctx|
+      ctx.security_level = 0
+      ctx.min_version = sver
+    }
     start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
       supported.each do |cver|
         # Client sets min_version
         ctx1 = OpenSSL::SSL::SSLContext.new
+        ctx1.security_level = 0
         ctx1.min_version = cver
+        ctx1.max_version = 0
         server_connect(port, ctx1) { |ssl|
           assert_equal vmap[supported.last][:name], ssl.ssl_version
           ssl.puts "abc"; assert_equal "abc\n", ssl.gets
@@ -1337,6 +1386,8 @@ def test_minmax_version
 
         # Client sets max_version
         ctx2 = OpenSSL::SSL::SSLContext.new
+        ctx2.security_level = 0
+        ctx2.min_version = 0
         ctx2.max_version = cver
         if cver >= sver
           server_connect(port, ctx2) { |ssl|
@@ -1344,14 +1395,18 @@ def test_minmax_version
             ssl.puts "abc"; assert_equal "abc\n", ssl.gets
           }
         else
-          assert_handshake_error { server_connect(port, ctx2) { } }
+          assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx2) }
         end
       end
     }
 
     # Server sets max_version (latest is disabled)
     sver = supported[-2]
-    ctx_proc = proc { |ctx| ctx.max_version = sver }
+    ctx_proc = proc { |ctx|
+      ctx.security_level = 0
+      ctx.min_version = 0
+      ctx.max_version = sver
+    }
     start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
       supported.each do |cver|
         # Client sets min_version
@@ -1363,11 +1418,13 @@ def test_minmax_version
             ssl.puts "abc"; assert_equal "abc\n", ssl.gets
           }
         else
-          assert_handshake_error { server_connect(port, ctx1) { } }
+          assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx1) }
         end
 
         # Client sets max_version
         ctx2 = OpenSSL::SSL::SSLContext.new
+        ctx2.security_level = 0
+        ctx2.min_version = 0
         ctx2.max_version = cver
         server_connect(port, ctx2) { |ssl|
           if cver >= sver
@@ -1381,15 +1438,106 @@ def test_minmax_version
     }
   end
 
+  def test_minmax_version_system_default
+    omit "LibreSSL and AWS-LC do not support OPENSSL_CONF" if libressl? || aws_lc?
+
+    Tempfile.create("openssl.cnf") { |f|
+      f.puts(<<~EOF)
+        openssl_conf = default_conf
+        [default_conf]
+        ssl_conf = ssl_sect
+        [ssl_sect]
+        system_default = ssl_default_sect
+        [ssl_default_sect]
+        MaxProtocol = TLSv1.2
+      EOF
+      f.close
+
+      start_server(ignore_listener_error: true) do |port|
+        assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl", "-", port.to_s], <<~"end;")
+          sock = TCPSocket.new("127.0.0.1", ARGV[0].to_i)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+          ssl.sync_close = true
+          ssl.connect
+          assert_equal("TLSv1.2", ssl.ssl_version)
+          ssl.puts("abc"); assert_equal("abc\n", ssl.gets)
+          ssl.close
+        end;
+
+        assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl", "-", port.to_s], <<~"end;")
+          sock = TCPSocket.new("127.0.0.1", ARGV[0].to_i)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+          ctx.max_version = nil
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+          ssl.sync_close = true
+          ssl.connect
+          assert_equal("TLSv1.3", ssl.ssl_version)
+          ssl.puts("abc"); assert_equal("abc\n", ssl.gets)
+          ssl.close
+        end;
+      end
+    }
+  end
+
+  def test_respect_system_default_min
+    omit "LibreSSL and AWS-LC do not support OPENSSL_CONF" if libressl? || aws_lc?
+
+    Tempfile.create("openssl.cnf") { |f|
+      f.puts(<<~EOF)
+        openssl_conf = default_conf
+        [default_conf]
+        ssl_conf = ssl_sect
+        [ssl_sect]
+        system_default = ssl_default_sect
+        [ssl_default_sect]
+        MinProtocol = TLSv1.3
+      EOF
+      f.close
+
+      ctx_proc = proc { |ctx|
+        ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+      }
+      start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
+        assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl", "-", port.to_s], <<~"end;")
+          sock = TCPSocket.new("127.0.0.1", ARGV[0].to_i)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+          ssl.sync_close = true
+          assert_raise(OpenSSL::SSL::SSLError) do
+            ssl.connect
+          end
+          ssl.close
+        end;
+      end
+
+      ctx_proc = proc { |ctx|
+        ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_3_VERSION
+      }
+      start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
+        assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl", "-", port.to_s], <<~"end;")
+          sock = TCPSocket.new("127.0.0.1", ARGV[0].to_i)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+          ssl.sync_close = true
+          ssl.connect
+          assert_equal("TLSv1.3", ssl.ssl_version)
+          ssl.puts("abc"); assert_equal("abc\n", ssl.gets)
+          ssl.close
+        end;
+      end
+    }
+  end
+
   def test_options_disable_versions
     # It's recommended to use SSLContext#{min,max}_version= instead in real
     # applications. The purpose of this test case is to check that SSL options
     # are properly propagated to OpenSSL library.
     supported = check_supported_protocol_versions
-    if !defined?(OpenSSL::SSL::TLS1_3_VERSION) ||
-        !supported.include?(OpenSSL::SSL::TLS1_2_VERSION) ||
-        !supported.include?(OpenSSL::SSL::TLS1_3_VERSION) ||
-        !defined?(OpenSSL::SSL::OP_NO_TLSv1_3) # LibreSSL < 3.4
+    if !supported.include?(OpenSSL::SSL::TLS1_2_VERSION) ||
+        !supported.include?(OpenSSL::SSL::TLS1_3_VERSION)
       pend "this test case requires both TLS 1.2 and TLS 1.3 to be supported " \
         "and enabled by default"
     end
@@ -1404,7 +1552,7 @@ def test_options_disable_versions
       # Client only supports TLS 1.2
       ctx1 = OpenSSL::SSL::SSLContext.new
       ctx1.min_version = ctx1.max_version = OpenSSL::SSL::TLS1_2_VERSION
-      assert_handshake_error { server_connect(port, ctx1) { } }
+      assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx1) }
 
       # Client only supports TLS 1.3
       ctx2 = OpenSSL::SSL::SSLContext.new
@@ -1420,7 +1568,7 @@ def test_options_disable_versions
       # Client doesn't support TLS 1.2
       ctx1 = OpenSSL::SSL::SSLContext.new
       ctx1.options |= OpenSSL::SSL::OP_NO_TLSv1_2
-      assert_handshake_error { server_connect(port, ctx1) { } }
+      assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx1) }
 
       # Client supports TLS 1.2 by default
       ctx2 = OpenSSL::SSL::SSLContext.new
@@ -1444,7 +1592,7 @@ def test_renegotiation_cb
     num_handshakes = 0
     renegotiation_cb = Proc.new { |ssl| num_handshakes += 1 }
     ctx_proc = Proc.new { |ctx| ctx.renegotiation_cb = renegotiation_cb }
-    start_server_version(:SSLv23, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc) { |port|
       server_connect(port) { |ssl|
         assert_equal(1, num_handshakes)
         ssl.puts "abc"; assert_equal "abc\n", ssl.gets
@@ -1460,7 +1608,7 @@ def test_alpn_protocol_selection_ary
       }
       ctx.alpn_protocols = advertised
     }
-    start_server_version(:SSLv23, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.alpn_protocols = advertised
       server_connect(port, ctx) { |ssl|
@@ -1502,9 +1650,10 @@ def test_npn_protocol_selection_ary
 
     advertised = ["http/1.1", "spdy/2"]
     ctx_proc = proc { |ctx| ctx.npn_protocols = advertised }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc) { |port|
       selector = lambda { |which|
         ctx = OpenSSL::SSL::SSLContext.new
+        ctx.max_version = :TLS1_2
         ctx.npn_select_cb = -> (protocols) { protocols.send(which) }
         server_connect(port, ctx) { |ssl|
           assert_equal(advertised.send(which), ssl.npn_protocol)
@@ -1524,9 +1673,10 @@ def advertised.each
       yield "spdy/2"
     end
     ctx_proc = Proc.new { |ctx| ctx.npn_protocols = advertised }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc) { |port|
       selector = lambda { |selected, which|
         ctx = OpenSSL::SSL::SSLContext.new
+        ctx.max_version = :TLS1_2
         ctx.npn_select_cb = -> (protocols) { protocols.to_a.send(which) }
         server_connect(port, ctx) { |ssl|
           assert_equal(selected, ssl.npn_protocol)
@@ -1541,8 +1691,9 @@ def test_npn_protocol_selection_cancel
     return unless OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
 
     ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
+      ctx.max_version = :TLS1_2
       ctx.npn_select_cb = -> (protocols) { raise RuntimeError.new }
       assert_raise(RuntimeError) { server_connect(port, ctx) }
     }
@@ -1551,22 +1702,22 @@ def test_npn_protocol_selection_cancel
   def test_npn_advertised_protocol_too_long
     return unless OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
 
-    ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["a" * 256] }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.npn_select_cb = -> (protocols) { protocols.first }
-      assert_handshake_error { server_connect(port, ctx) }
-    }
+    ctx = OpenSSL::SSL::SSLContext.new
+    assert_raise(OpenSSL::SSL::SSLError) do
+      ctx.npn_protocols = ["a" * 256]
+      ctx.setup
+    end
   end
 
   def test_npn_selected_protocol_too_long
     return unless OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
 
     ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
+      ctx.max_version = :TLS1_2
       ctx.npn_select_cb = -> (protocols) { "a" * 256 }
-      assert_handshake_error { server_connect(port, ctx) }
+      assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) }
     }
   end
 
@@ -1598,14 +1749,17 @@ def test_sync_close_without_connect
   end
 
   def test_get_ephemeral_key
+    # kRSA is not FIPS-approved.
+    omit_on_fips
+
     # kRSA
     ctx_proc1 = proc { |ctx|
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "kRSA"
     }
     start_server(ctx_proc: ctx_proc1, ignore_listener_error: true) do |port|
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "kRSA"
       begin
         server_connect(port, ctx) { |ssl| assert_nil ssl.tmp_key }
@@ -1616,30 +1770,27 @@ def test_get_ephemeral_key
     end
 
     # DHE
-    # TODO: How to test this with TLS 1.3?
-    ctx_proc2 = proc { |ctx|
-      ctx.ssl_version = :TLSv1_2
-      ctx.ciphers = "EDH"
-      ctx.tmp_dh = Fixtures.pkey("dh-1")
-    }
-    start_server(ctx_proc: ctx_proc2) do |port|
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ssl_version = :TLSv1_2
-      ctx.ciphers = "EDH"
-      server_connect(port, ctx) { |ssl|
-        assert_instance_of OpenSSL::PKey::DH, ssl.tmp_key
-      }
+    # OpenSSL 3.0 added support for named FFDHE groups in TLS 1.3
+    # LibreSSL does not support named FFDHE groups currently
+    # AWS-LC does not support DHE ciphersuites
+    if openssl?(3, 0, 0)
+      start_server do |port|
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.groups = "ffdhe3072"
+        server_connect(port, ctx) { |ssl|
+          assert_instance_of OpenSSL::PKey::DH, ssl.tmp_key
+          assert_equal 3072, ssl.tmp_key.p.num_bits
+          ssl.puts "abc"; assert_equal "abc\n", ssl.gets
+        }
+      end
     end
 
     # ECDHE
     ctx_proc3 = proc { |ctx|
-      ctx.ciphers = "DEFAULT:!kRSA:!kEDH"
-      ctx.ecdh_curves = "P-256"
+      ctx.groups = "P-256"
     }
     start_server(ctx_proc: ctx_proc3) do |port|
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ciphers = "DEFAULT:!kRSA:!kEDH"
-      server_connect(port, ctx) { |ssl|
+      server_connect(port) { |ssl|
         assert_instance_of OpenSSL::PKey::EC, ssl.tmp_key
         ssl.puts "abc"; assert_equal "abc\n", ssl.gets
       }
@@ -1648,11 +1799,11 @@ def test_get_ephemeral_key
 
   def test_fallback_scsv
     supported = check_supported_protocol_versions
-    return unless supported.include?(OpenSSL::SSL::TLS1_1_VERSION) &&
-      supported.include?(OpenSSL::SSL::TLS1_2_VERSION)
+    unless supported.include?(OpenSSL::SSL::TLS1_1_VERSION)
+      omit "TLS 1.1 support is required to run this test case"
+    end
 
-    pend "Fallback SCSV is not supported" unless \
-      OpenSSL::SSL::SSLContext.method_defined?(:enable_fallback_scsv)
+    omit "Fallback SCSV is not supported" if libressl?
 
     start_server do |port|
       ctx = OpenSSL::SSL::SSLContext.new
@@ -1663,11 +1814,15 @@ def test_fallback_scsv
     end
 
     ctx_proc = proc { |ctx|
+      ctx.security_level = 0
+      ctx.min_version = 0
       ctx.max_version = OpenSSL::SSL::TLS1_1_VERSION
     }
     start_server(ctx_proc: ctx_proc) do |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.enable_fallback_scsv
+      ctx.security_level = 0
+      ctx.min_version = 0
       ctx.max_version = OpenSSL::SSL::TLS1_1_VERSION
       # Here is OK too
       # TLS1.2 not supported, fallback to TLS1.1 and signaling the fallback
@@ -1685,19 +1840,24 @@ def test_fallback_scsv
       # Otherwise, this test fails when using openssl 1.1.1 (or later) that supports TLS1.3.
       # TODO: We may need another test for TLS1.3 because it seems to have a different mechanism.
       ctx1 = OpenSSL::SSL::SSLContext.new
+      ctx1.security_level = 0
+      ctx1.min_version = 0
       ctx1.max_version = OpenSSL::SSL::TLS1_2_VERSION
       s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
 
       ctx2 = OpenSSL::SSL::SSLContext.new
       ctx2.enable_fallback_scsv
+      ctx2.security_level = 0
+      ctx2.min_version = 0
       ctx2.max_version = OpenSSL::SSL::TLS1_1_VERSION
       s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2)
+      # AWS-LC has slightly different error messages in all-caps.
       t = Thread.new {
-        assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
+        assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback|INAPPROPRIATE_FALLBACK/) {
           s2.connect
         }
       }
-      assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
+      assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback|INAPPROPRIATE_FALLBACK/) {
         s1.accept
       }
       t.join
@@ -1708,6 +1868,10 @@ def test_fallback_scsv
   end
 
   def test_tmp_dh_callback
+    # DH missing the q value on unknown named parameters is not FIPS-approved.
+    omit_on_fips
+    omit "AWS-LC does not support DHE ciphersuites" if aws_lc?
+
     dh = Fixtures.pkey("dh-1")
     called = false
     ctx_proc = -> ctx {
@@ -1727,11 +1891,6 @@ def test_tmp_dh_callback
   end
 
   def test_ciphersuites_method_tls_connection
-    ssl_ctx = OpenSSL::SSL::SSLContext.new
-    if !tls13_supported? || !ssl_ctx.respond_to?(:ciphersuites=)
-      pend 'TLS 1.3 not supported'
-    end
-
     csuite = ['TLS_AES_128_GCM_SHA256', 'TLSv1.3', 128, 128]
     inputs = [csuite[0], [csuite[0]], [csuite]]
 
@@ -1743,11 +1902,7 @@ def test_ciphersuites_method_tls_connection
 
         server_connect(port, cli_ctx) do |ssl|
           assert_equal('TLSv1.3', ssl.ssl_version)
-          if libressl?(3, 4, 0) && !libressl?(3, 5, 0)
-            assert_equal("AEAD-AES128-GCM-SHA256", ssl.cipher[0])
-          else
-            assert_equal(csuite[0], ssl.cipher[0])
-          end
+          assert_equal(csuite[0], ssl.cipher[0])
           ssl.puts('abc'); assert_equal("abc\n", ssl.gets)
         end
       end
@@ -1756,26 +1911,21 @@ def test_ciphersuites_method_tls_connection
 
   def test_ciphersuites_method_nil_argument
     ssl_ctx = OpenSSL::SSL::SSLContext.new
-    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
-
     assert_nothing_raised { ssl_ctx.ciphersuites = nil }
   end
 
   def test_ciphersuites_method_frozen_object
     ssl_ctx = OpenSSL::SSL::SSLContext.new
-    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
-
     ssl_ctx.freeze
     assert_raise(FrozenError) { ssl_ctx.ciphersuites = 'TLS_AES_256_GCM_SHA384' }
   end
 
   def test_ciphersuites_method_bogus_csuite
     ssl_ctx = OpenSSL::SSL::SSLContext.new
-    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
-
+    # AWS-LC has slightly different error messages in all-caps.
     assert_raise_with_message(
       OpenSSL::SSL::SSLError,
-      /SSL_CTX_set_ciphersuites: no cipher match/i
+      /SSL_CTX_set_ciphersuites: (no cipher match|NO_CIPHER_MATCH)/i
     ) { ssl_ctx.ciphersuites = 'BOGUS' }
   end
 
@@ -1811,34 +1961,184 @@ def test_ciphers_method_frozen_object
   end
 
   def test_ciphers_method_bogus_csuite
-    omit "Old #{OpenSSL::OPENSSL_LIBRARY_VERSION}" if
-      year = OpenSSL::OPENSSL_LIBRARY_VERSION[/\A OpenSSL\s+[01]\..*\s\K\d+\z/x] and
-      year.to_i <= 2018
-
     ssl_ctx = OpenSSL::SSL::SSLContext.new
 
+    # AWS-LC has slightly different error messages in all-caps.
     assert_raise_with_message(
       OpenSSL::SSL::SSLError,
-      /SSL_CTX_set_cipher_list: no cipher match/i
+      /SSL_CTX_set_cipher_list: (no cipher match|NO_CIPHER_MATCH)/i
     ) { ssl_ctx.ciphers = 'BOGUS' }
   end
 
+  def test_sigalgs
+    omit "SSL_CTX_set1_sigalgs_list() not supported" if libressl?
+
+    svr_exts = [
+      ["keyUsage", "keyEncipherment,digitalSignature", true],
+      ["subjectAltName", "DNS:localhost", false],
+    ]
+    ecdsa_key = Fixtures.pkey("p256")
+    ecdsa_cert = issue_cert(@svr, ecdsa_key, 10, svr_exts, @ca_cert, @ca_key)
+
+    ctx_proc = -> ctx {
+      # Unset values set by start_server
+      ctx.cert = ctx.key = ctx.extra_chain_cert = nil
+      ctx.add_certificate(@svr_cert, @svr_key, [@ca_cert]) # RSA
+      ctx.add_certificate(ecdsa_cert, ecdsa_key, [@ca_cert]) # ECDSA
+    }
+    start_server(ctx_proc: ctx_proc) do |port|
+      ctx1 = OpenSSL::SSL::SSLContext.new
+      ctx1.sigalgs = "rsa_pss_rsae_sha256"
+      server_connect(port, ctx1) { |ssl|
+        assert_kind_of(OpenSSL::PKey::RSA, ssl.peer_cert.public_key)
+        ssl.puts("abc"); ssl.gets
+      }
+
+      ctx2 = OpenSSL::SSL::SSLContext.new
+      ctx2.sigalgs = "ed25519:ecdsa_secp256r1_sha256"
+      server_connect(port, ctx2) { |ssl|
+        assert_kind_of(OpenSSL::PKey::EC, ssl.peer_cert.public_key)
+        ssl.puts("abc"); ssl.gets
+      }
+    end
+
+    # Frozen
+    ssl_ctx = OpenSSL::SSL::SSLContext.new
+    ssl_ctx.freeze
+    assert_raise(FrozenError) { ssl_ctx.sigalgs = "ECDSA+SHA256:RSA+SHA256" }
+
+    # Bogus
+    ssl_ctx = OpenSSL::SSL::SSLContext.new
+    assert_raise(TypeError) { ssl_ctx.sigalgs = nil }
+    assert_raise(OpenSSL::SSL::SSLError) { ssl_ctx.sigalgs = "BOGUS" }
+  end
+
+  def test_client_sigalgs
+    omit "SSL_CTX_set1_client_sigalgs_list() not supported" if libressl? || aws_lc?
+
+    cli_exts = [
+      ["keyUsage", "keyEncipherment,digitalSignature", true],
+      ["subjectAltName", "DNS:localhost", false],
+    ]
+    ecdsa_key = Fixtures.pkey("p256")
+    ecdsa_cert = issue_cert(@cli, ecdsa_key, 10, cli_exts, @ca_cert, @ca_key)
+
+    ctx_proc = -> ctx {
+      store = OpenSSL::X509::Store.new
+      store.add_cert(@ca_cert)
+      store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+      ctx.cert_store = store
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+      ctx.client_sigalgs = "ECDSA+SHA256"
+    }
+    start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
+      ctx1 = OpenSSL::SSL::SSLContext.new
+      ctx1.add_certificate(@cli_cert, @cli_key) # RSA
+      assert_handshake_error {
+        server_connect(port, ctx1) { |ssl|
+          ssl.puts("abc"); ssl.gets
+        }
+      }
+
+      ctx2 = OpenSSL::SSL::SSLContext.new
+      ctx2.add_certificate(ecdsa_cert, ecdsa_key) # ECDSA
+      server_connect(port, ctx2) { |ssl|
+        ssl.puts("abc"); ssl.gets
+      }
+    end
+  end
+
+  def test_get_sigalg
+    # SSL_get0_signature_name() not supported
+    # SSL_get0_peer_signature_name() not supported
+    return unless openssl?(3, 5, 0)
+
+    server_proc = -> (ctx, ssl) {
+      assert_equal('rsa_pss_rsae_sha256', ssl.sigalg)
+      assert_nil(ssl.peer_sigalg)
+
+      readwrite_loop(ctx, ssl)
+    }
+    start_server(server_proc: server_proc) do |port|
+      cli_ctx = OpenSSL::SSL::SSLContext.new
+      server_connect(port, cli_ctx) do |ssl|
+        assert_nil(ssl.sigalg)
+        assert_equal('rsa_pss_rsae_sha256', ssl.peer_sigalg)
+        ssl.puts "abc"; ssl.gets
+      end
+    end
+  end
+
+  def test_pqc_sigalg
+    # PQC algorithm ML-DSA (FIPS 204) is supported on OpenSSL 3.5 or later.
+    return unless openssl?(3, 5, 0)
+
+    mldsa = Fixtures.pkey("mldsa65-1")
+    mldsa_ca_key  = Fixtures.pkey("mldsa65-2")
+    mldsa_ca_cert = issue_cert(@ca, mldsa_ca_key, 1, @ca_exts, nil, nil,
+                               digest: nil)
+    mldsa_cert = issue_cert(@svr, mldsa, 60, [], mldsa_ca_cert, mldsa_ca_key,
+                            digest: nil)
+    rsa = Fixtures.pkey("rsa-1")
+    rsa_cert = issue_cert(@svr, rsa, 61, [], @ca_cert, @ca_key)
+    ctx_proc = -> ctx {
+      # Unset values set by start_server
+      ctx.cert = ctx.key = ctx.extra_chain_cert = nil
+      ctx.sigalgs = "rsa_pss_rsae_sha256:mldsa65"
+      ctx.add_certificate(mldsa_cert, mldsa)
+      ctx.add_certificate(rsa_cert, rsa)
+    }
+
+    server_proc = -> (ctx, ssl) {
+      assert_equal('mldsa65', ssl.sigalg)
+
+      readwrite_loop(ctx, ssl)
+    }
+    start_server(ctx_proc: ctx_proc, server_proc: server_proc) do |port|
+      ctx = OpenSSL::SSL::SSLContext.new
+      # Set signature algorithm because while OpenSSL may use ML-DSA by
+      # default, the system OpenSSL configuration affects the used signature
+      # algorithm.
+      ctx.sigalgs = 'mldsa65'
+      server_connect(port, ctx) { |ssl|
+        assert_equal('mldsa65', ssl.peer_sigalg)
+        ssl.puts "abc"; ssl.gets
+      }
+    end
+
+    server_proc = -> (ctx, ssl) {
+      assert_equal('rsa_pss_rsae_sha256', ssl.sigalg)
+
+      readwrite_loop(ctx, ssl)
+    }
+    start_server(ctx_proc: ctx_proc, server_proc: server_proc) do |port|
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.sigalgs = 'rsa_pss_rsae_sha256'
+      server_connect(port, ctx) { |ssl|
+        assert_equal('rsa_pss_rsae_sha256', ssl.peer_sigalg)
+        ssl.puts "abc"; ssl.gets
+      }
+    end
+  end
+
   def test_connect_works_when_setting_dh_callback_to_nil
+    omit "AWS-LC does not support DHE ciphersuites" if aws_lc?
+
     ctx_proc = -> ctx {
       ctx.max_version = :TLS1_2
       ctx.ciphers = "DH:!NULL" # use DH
       ctx.tmp_dh_callback = nil
     }
     start_server(ctx_proc: ctx_proc) do |port|
-      EnvUtil.suppress_warning { # uses default callback
-        assert_nothing_raised {
-          server_connect(port) { }
-        }
-      }
+      assert_nothing_raised { server_connect(port) { } }
     end
   end
 
   def test_tmp_dh
+    # DH missing the q value on unknown named parameters is not FIPS-approved.
+    omit_on_fips
+    omit "AWS-LC does not support DHE ciphersuites" if aws_lc?
+
     dh = Fixtures.pkey("dh-1")
     ctx_proc = -> ctx {
       ctx.max_version = :TLS1_2
@@ -1852,86 +2152,125 @@ def test_tmp_dh
     end
   end
 
-  def test_ecdh_curves_tls12
+  def test_set_groups_tls12
     ctx_proc = -> ctx {
       # Enable both ECDHE (~ TLS 1.2) cipher suites and TLS 1.3
       ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "kEECDH"
-      ctx.ecdh_curves = "P-384:P-521"
+      ctx.groups = "P-384:P-521"
     }
     start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
       # Test 1: Client=P-256:P-384, Server=P-384:P-521 --> P-384
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ecdh_curves = "P-256:P-384"
+      ctx.groups = "P-256:P-384"
       server_connect(port, ctx) { |ssl|
         cs = ssl.cipher[0]
         assert_match (/\AECDH/), cs
+        # SSL_get0_group_name() is supported on OpenSSL 3.2 or later.
+        assert_equal "secp384r1", ssl.group if openssl?(3, 2, 0)
         assert_equal "secp384r1", ssl.tmp_key.group.curve_name
         ssl.puts "abc"; assert_equal "abc\n", ssl.gets
       }
 
       # Test 2: Client=P-256, Server=P-521:P-384 --> Fail
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ecdh_curves = "P-256"
+      ctx.groups = "P-256"
       assert_raise(OpenSSL::SSL::SSLError) {
         server_connect(port, ctx) { }
       }
 
       # Test 3: Client=P-521:P-384, Server=P-521:P-384 --> P-521
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ecdh_curves = "P-521:P-384"
+      ctx.groups = "P-521:P-384"
       server_connect(port, ctx) { |ssl|
         assert_equal "secp521r1", ssl.tmp_key.group.curve_name
         ssl.puts "abc"; assert_equal "abc\n", ssl.gets
       }
+
+      # Test 4: #ecdh_curves= alias
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.ecdh_curves = "P-256:P-384"
+      server_connect(port, ctx) { |ssl|
+        assert_equal "secp384r1", ssl.tmp_key.group.curve_name
+      }
     end
   end
 
-  def test_ecdh_curves_tls13
-    pend "TLS 1.3 not supported" unless tls13_supported?
-
+  def test_set_groups_tls13
     ctx_proc = -> ctx {
       # Assume TLS 1.3 is enabled and chosen by default
-      ctx.ecdh_curves = "P-384:P-521"
+      ctx.groups = "P-384:P-521"
     }
     start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ecdh_curves = "P-256:P-384" # disable P-521
+      ctx.groups = "P-256:P-384" # disable P-521
 
       server_connect(port, ctx) { |ssl|
         assert_equal "TLSv1.3", ssl.ssl_version
+        # SSL_get0_group_name() is supported on OpenSSL 3.2 or later.
+        assert_equal "secp384r1", ssl.group if openssl?(3, 2, 0)
         assert_equal "secp384r1", ssl.tmp_key.group.curve_name
         ssl.puts "abc"; assert_equal "abc\n", ssl.gets
       }
     end
   end
 
+  def test_pqc_group
+    # PQC algorithm ML-KEM (FIPS 203) is supported on OpenSSL 3.5 or later.
+    return unless openssl?(3, 5, 0)
+
+    [
+      'X25519MLKEM768',
+      'SecP256r1MLKEM768',
+      'SecP384r1MLKEM1024'
+    ].each do |group|
+      ctx_proc = -> ctx {
+        ctx.groups = group
+      }
+      start_server(ctx_proc: ctx_proc) do |port|
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.groups = group
+        server_connect(port, ctx) { |ssl|
+          assert_equal(group, ssl.group)
+          ssl.puts "abc"; ssl.gets
+        }
+      end
+    end
+  end
+
   def test_security_level
     ctx = OpenSSL::SSL::SSLContext.new
-    begin
-      ctx.security_level = 1
-    rescue NotImplementedError
+    ctx.security_level = 1
+    if aws_lc? # AWS-LC does not support security levels.
       assert_equal(0, ctx.security_level)
       return
     end
     assert_equal(1, ctx.security_level)
 
-    dsa512 = Fixtures.pkey("dsa512")
-    dsa512_cert = issue_cert(@svr, dsa512, 50, [], @ca_cert, @ca_key)
-    rsa1024 = Fixtures.pkey("rsa1024")
-    rsa1024_cert = issue_cert(@svr, rsa1024, 51, [], @ca_cert, @ca_key)
+    # See SSL_CTX_set_security_level(3). Definitions of security levels may
+    # change in future OpenSSL versions. As of OpenSSL 1.1.0:
+    #  - Level 1 requires 160-bit ECC keys or 1024-bit RSA keys.
+    #  - Level 2 requires 224-bit ECC keys or 2048-bit RSA keys.
+    begin
+      ec112 = OpenSSL::PKey::EC.generate("secp112r1")
+      ec112_cert = issue_cert(@svr, ec112, 50, [], @ca_cert, @ca_key)
+      ec192 = OpenSSL::PKey::EC.generate("prime192v1")
+      ec192_cert = issue_cert(@svr, ec192, 51, [], @ca_cert, @ca_key)
+    rescue OpenSSL::PKey::PKeyError
+      # Distro-provided OpenSSL may refuse to generate small keys
+      return
+    end
 
     assert_raise(OpenSSL::SSL::SSLError) {
-      # 512 bit DSA key is rejected because it offers < 80 bits of security
-      ctx.add_certificate(dsa512_cert, dsa512)
+      ctx.add_certificate(ec112_cert, ec112)
     }
     assert_nothing_raised {
-      ctx.add_certificate(rsa1024_cert, rsa1024)
+      ctx.add_certificate(ec192_cert, ec192)
     }
     ctx.security_level = 2
     assert_raise(OpenSSL::SSL::SSLError) {
       # < 112 bits of security
-      ctx.add_certificate(rsa1024_cert, rsa1024)
+      ctx.add_certificate(ec192_cert, ec192)
     }
   end
 
@@ -1987,22 +2326,52 @@ def test_export_keying_material
     end
   end
 
-  private
+  # OpenSSL::Buffering requires $/ accessible from non-main Ractors (Ruby 4.0)
+  # https://bugs.ruby-lang.org/issues/21109
+  #
+  # Hangs on Windows
+  # https://bugs.ruby-lang.org/issues/21537
+  if respond_to?(:ractor) && RUBY_VERSION >= "4.0" && RUBY_PLATFORM !~ /mswin|mingw/
+    ractor
+    def test_ractor_client
+      start_server { |port|
+        s = Ractor.new(port, @ca_cert) { |port, ca_cert|
+          sock = TCPSocket.new("127.0.0.1", port)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          ctx.cert_store = OpenSSL::X509::Store.new.tap { |store|
+            store.add_cert(ca_cert)
+          }
+          begin
+            ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+            ssl.connect
+            ssl.puts("abc")
+            ssl.gets
+          ensure
+            ssl.close
+            sock.close
+          end
+        }.value
+        assert_equal("abc\n", s)
+      }
+    end
 
-  def start_server_version(version, ctx_proc = nil,
-                           server_proc = method(:readwrite_loop), &blk)
-    ctx_wrap = Proc.new { |ctx|
-      ctx.ssl_version = version
-      ctx_proc.call(ctx) if ctx_proc
-    }
-    start_server(
-      ctx_proc: ctx_wrap,
-      server_proc: server_proc,
-      ignore_listener_error: true,
-      &blk
-    )
+    ractor
+    def test_ractor_set_params
+      # We cannot actually test default stores in the test suite as it depends
+      # on the environment, but at least check that it does not raise an
+      # exception
+      ok = Ractor.new {
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.set_params
+        ctx.cert_store.kind_of?(OpenSSL::X509::Store)
+      }.value
+      assert(ok, "ctx.cert_store is an instance of OpenSSL::X509::Store")
+    end
   end
 
+  private
+
   def server_connect(port, ctx = nil)
     sock = TCPSocket.new("127.0.0.1", port)
     ssl = ctx ? OpenSSL::SSL::SSLSocket.new(sock, ctx) : OpenSSL::SSL::SSLSocket.new(sock)
diff --git a/test/mri/openssl/test_ssl_session.rb b/test/mri/openssl/test_ssl_session.rb
index 25ba6a8c45e..37874ca2733 100644
--- a/test/mri/openssl/test_ssl_session.rb
+++ b/test/mri/openssl/test_ssl_session.rb
@@ -5,7 +5,9 @@
 
 class OpenSSL::TestSSLSession < OpenSSL::SSLTestCase
   def test_session
-    ctx_proc = proc { |ctx| ctx.ssl_version = :TLSv1_2 }
+    ctx_proc = proc { |ctx|
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+    }
     start_server(ctx_proc: ctx_proc) do |port|
       server_connect_with_session(port, nil, nil) { |ssl|
         session = ssl.session
@@ -28,9 +30,10 @@ def test_session
     end
   end
 
+  # PEM file updated to use TLS 1.2 with ECDHE-RSA-AES256-SHA.
   DUMMY_SESSION = <<__EOS__
 -----BEGIN SSL SESSION PARAMETERS-----
-MIIDzQIBAQICAwEEAgA5BCAF219w9ZEV8dNA60cpEGOI34hJtIFbf3bkfzSgMyad
+MIIDzQIBAQICAwMEAsAUBCAF219w9ZEV8dNA60cpEGOI34hJtIFbf3bkfzSgMyad
 MQQwyGLbkCxE4OiMLdKKem+pyh8V7ifoP7tCxhdmwoDlJxI1v6nVCjai+FGYuncy
 NNSWoQYCBE4DDWuiAwIBCqOCAo4wggKKMIIBcqADAgECAgECMA0GCSqGSIb3DQEB
 BQUAMD0xEzARBgoJkiaJk/IsZAEZFgNvcmcxGTAXBgoJkiaJk/IsZAEZFglydWJ5
@@ -54,9 +57,10 @@ def test_session
 -----END SSL SESSION PARAMETERS-----
 __EOS__
 
+  # PEM file updated to use TLS 1.1 with ECDHE-RSA-AES256-SHA.
   DUMMY_SESSION_NO_EXT = <<-__EOS__
 -----BEGIN SSL SESSION PARAMETERS-----
-MIIDCAIBAQICAwAEAgA5BCDyAW7rcpzMjDSosH+Tv6sukymeqgq3xQVVMez628A+
+MIIDCAIBAQICAwIEAsAUBCDyAW7rcpzMjDSosH+Tv6sukymeqgq3xQVVMez628A+
 lAQw9TrKzrIqlHEh6ltuQaqv/Aq83AmaAlogYktZgXAjOGnhX7ifJDNLMuCfQq53
 hPAaoQYCBE4iDeeiBAICASyjggKOMIICijCCAXKgAwIBAgIBAjANBgkqhkiG9w0B
 AQUFADA9MRMwEQYKCZImiZPyLGQBGRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVi
@@ -120,7 +124,8 @@ def test_resumption
       ctx.options &= ~OpenSSL::SSL::OP_NO_TICKET
       # Disable server-side session cache which is enabled by default
       ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_OFF
-      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl?(3, 2, 0)
+      # Session tickets must be retrieved via ctx.session_new_cb in TLS 1.3 in AWS-LC.
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl? || aws_lc?
     }
     start_server(ctx_proc: ctx_proc) do |port|
       sess1 = server_connect_with_session(port, nil, nil) { |ssl|
@@ -143,7 +148,7 @@ def test_resumption
 
   def test_server_session_cache
     ctx_proc = Proc.new do |ctx|
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.options |= OpenSSL::SSL::OP_NO_TICKET
     end
 
@@ -197,7 +202,7 @@ def test_server_session_cache
       10.times do |i|
         connections = i
         cctx = OpenSSL::SSL::SSLContext.new
-        cctx.ssl_version = :TLSv1_2
+        cctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
         server_connect_with_session(port, cctx, first_session) { |ssl|
           ssl.puts("abc"); assert_equal "abc\n", ssl.gets
           first_session ||= ssl.session
@@ -217,7 +222,7 @@ def test_server_session_cache
 
   # Skipping tests that use session_remove_cb by default because it may cause
   # deadlock.
-  TEST_SESSION_REMOVE_CB = ENV["OSSL_TEST_ALL"] == "1"
+  TEST_SESSION_REMOVE_CB = ENV["OSSL_TEST_UNSAFE"] == "1"
 
   def test_ctx_client_session_cb_tls12
     start_server do |port|
@@ -237,21 +242,25 @@ def test_ctx_client_session_cb_tls12
       end
 
       server_connect_with_session(port, ctx, nil) { |ssl|
-        assert_equal(1, ctx.session_cache_stats[:cache_num])
         assert_equal(1, ctx.session_cache_stats[:connect_good])
         assert_equal([ssl, ssl.session], called[:new])
-        assert_equal(true, ctx.session_remove(ssl.session))
-        assert_equal(false, ctx.session_remove(ssl.session))
-        if TEST_SESSION_REMOVE_CB
-          assert_equal([ctx, ssl.session], called[:remove])
+        # AWS-LC doesn't support internal session caching on the client, but
+        # the callback is still enabled as expected.
+        unless aws_lc?
+          assert_equal(1, ctx.session_cache_stats[:cache_num])
+          assert_equal(true, ctx.session_remove(ssl.session))
+          if TEST_SESSION_REMOVE_CB
+            assert_equal([ctx, ssl.session], called[:remove])
+          end
         end
+        assert_equal(false, ctx.session_remove(ssl.session))
       }
     end
   end
 
   def test_ctx_client_session_cb_tls13
-    omit "TLS 1.3 not supported" unless tls13_supported?
     omit "LibreSSL does not call session_new_cb in TLS 1.3" if libressl?
+    omit "AWS-LC does not support internal session caching on the client" if aws_lc?
 
     start_server do |port|
       called = {}
@@ -274,7 +283,6 @@ def test_ctx_client_session_cb_tls13
   end
 
   def test_ctx_client_session_cb_tls13_exception
-    omit "TLS 1.3 not supported" unless tls13_supported?
     omit "LibreSSL does not call session_new_cb in TLS 1.3" if libressl?
 
     server_proc = lambda do |ctx, ssl|
@@ -301,11 +309,11 @@ def test_ctx_server_session_cb
     connections = nil
     called = {}
     cctx = OpenSSL::SSL::SSLContext.new
-    cctx.ssl_version = :TLSv1_2
+    cctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
     sctx = nil
     ctx_proc = Proc.new { |ctx|
       sctx = ctx
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.options |= OpenSSL::SSL::OP_NO_TICKET
 
       # get_cb is called whenever a client proposed to resume a session but
@@ -375,11 +383,6 @@ def test_ctx_server_session_cb
       connections = 2
       sess2 = server_connect_with_session(port, cctx, sess0.dup) { |ssl|
         ssl.puts("abc"); assert_equal "abc\n", ssl.gets
-        if !ssl.session_reused? && openssl?(1, 1, 0) && !openssl?(1, 1, 0, 7)
-          # OpenSSL >= 1.1.0, < 1.1.0g
-          pend "External session cache is not working; " \
-            "see https://github.com/openssl/openssl/pull/4014"
-        end
         assert_equal true, ssl.session_reused?
         ssl.session
       }
diff --git a/test/mri/openssl/test_ts.rb b/test/mri/openssl/test_ts.rb
index ac0469ad567..cca7898bc13 100644
--- a/test/mri/openssl/test_ts.rb
+++ b/test/mri/openssl/test_ts.rb
@@ -70,15 +70,14 @@ def ts_cert_ee
   def test_request_mandatory_fields
     req = OpenSSL::Timestamp::Request.new
     assert_raise(OpenSSL::Timestamp::TimestampError) do
-      tmp = req.to_der
-      pp OpenSSL::ASN1.decode(tmp)
+      req.to_der
     end
     req.algorithm = "sha1"
     assert_raise(OpenSSL::Timestamp::TimestampError) do
       req.to_der
     end
     req.message_imprint = OpenSSL::Digest.digest('SHA1', "data")
-    req.to_der
+    assert_nothing_raised { req.to_der }
   end
 
   def test_request_assignment
@@ -89,8 +88,9 @@ def test_request_assignment
     assert_raise(TypeError) { req.version = nil }
     assert_raise(TypeError) { req.version = "foo" }
 
-    req.algorithm = "SHA1"
+    req.algorithm = "sha1"
     assert_equal("SHA1", req.algorithm)
+    assert_equal("SHA1", OpenSSL::ASN1.ObjectId("SHA1").sn)
     assert_raise(TypeError) { req.algorithm = nil }
     assert_raise(OpenSSL::ASN1::ASN1Error) { req.algorithm = "xxx" }
 
@@ -371,60 +371,60 @@ def test_no_cert_requested
   end
 
   def test_response_no_policy_defined
-    assert_raise(OpenSSL::Timestamp::TimestampError) do
-      req = OpenSSL::Timestamp::Request.new
-      req.algorithm = "SHA1"
-      digest = OpenSSL::Digest.digest('SHA1', "test")
-      req.message_imprint = digest
+    req = OpenSSL::Timestamp::Request.new
+    req.algorithm = "SHA1"
+    digest = OpenSSL::Digest.digest('SHA1', "test")
+    req.message_imprint = digest
 
-      fac = OpenSSL::Timestamp::Factory.new
-      fac.gen_time = Time.now
-      fac.serial_number = 1
-      fac.allowed_digests = ["sha1"]
+    fac = OpenSSL::Timestamp::Factory.new
+    fac.gen_time = Time.now
+    fac.serial_number = 1
+    fac.allowed_digests = ["sha1"]
 
+    assert_raise(OpenSSL::Timestamp::TimestampError) do
       fac.create_timestamp(ee_key, ts_cert_ee, req)
     end
   end
 
   def test_verify_ee_no_req
+    ts, _ = timestamp_ee
     assert_raise(TypeError) do
-      ts, _ = timestamp_ee
       ts.verify(nil, ca_cert)
     end
   end
 
   def test_verify_ee_no_store
+    ts, req = timestamp_ee
     assert_raise(TypeError) do
-      ts, req = timestamp_ee
       ts.verify(req, nil)
     end
   end
 
   def test_verify_ee_wrong_root_no_intermediate
+    ts, req = timestamp_ee
     assert_raise(OpenSSL::Timestamp::TimestampError) do
-      ts, req = timestamp_ee
       ts.verify(req, intermediate_store)
     end
   end
 
   def test_verify_ee_wrong_root_wrong_intermediate
+    ts, req = timestamp_ee
     assert_raise(OpenSSL::Timestamp::TimestampError) do
-      ts, req = timestamp_ee
       ts.verify(req, intermediate_store, [ca_cert])
     end
   end
 
   def test_verify_ee_nonce_mismatch
+    ts, req = timestamp_ee
+    req.nonce = 1
     assert_raise(OpenSSL::Timestamp::TimestampError) do
-      ts, req = timestamp_ee
-      req.nonce = 1
       ts.verify(req, ca_store, [intermediate_cert])
     end
   end
 
   def test_verify_ee_intermediate_missing
+    ts, req = timestamp_ee
     assert_raise(OpenSSL::Timestamp::TimestampError) do
-      ts, req = timestamp_ee
       ts.verify(req, ca_store)
     end
   end
@@ -472,27 +472,27 @@ def test_verify_direct_unrelated_untrusted
   end
 
   def test_verify_direct_wrong_root
+    ts, req = timestamp_direct
     assert_raise(OpenSSL::Timestamp::TimestampError) do
-      ts, req = timestamp_direct
       ts.verify(req, intermediate_store)
     end
   end
 
   def test_verify_direct_no_cert_no_intermediate
+    ts, req = timestamp_direct_no_cert
     assert_raise(OpenSSL::Timestamp::TimestampError) do
-      ts, req = timestamp_direct_no_cert
       ts.verify(req, ca_store)
     end
   end
 
   def test_verify_ee_no_cert
     ts, req = timestamp_ee_no_cert
-    ts.verify(req, ca_store, [ts_cert_ee, intermediate_cert])
+    assert_same(ts, ts.verify(req, ca_store, [ts_cert_ee, intermediate_cert]))
   end
 
   def test_verify_ee_no_cert_no_intermediate
+    ts, req = timestamp_ee_no_cert
     assert_raise(OpenSSL::Timestamp::TimestampError) do
-      ts, req = timestamp_ee_no_cert
       ts.verify(req, ca_store, [ts_cert_ee])
     end
   end
diff --git a/test/mri/openssl/test_x509cert.rb b/test/mri/openssl/test_x509cert.rb
index 6c16218f387..9e0aa4edf6b 100644
--- a/test/mri/openssl/test_x509cert.rb
+++ b/test/mri/openssl/test_x509cert.rb
@@ -6,17 +6,16 @@
 class OpenSSL::TestX509Certificate < OpenSSL::TestCase
   def setup
     super
-    @rsa1024 = Fixtures.pkey("rsa1024")
-    @rsa2048 = Fixtures.pkey("rsa2048")
-    @dsa256  = Fixtures.pkey("dsa256")
-    @dsa512  = Fixtures.pkey("dsa512")
+    @rsa1 = Fixtures.pkey("rsa-1")
+    @rsa2 = Fixtures.pkey("rsa-2")
+    @ec1 = Fixtures.pkey("p256")
     @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
     @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
   end
 
   def test_serial
     [1, 2**32, 2**100].each{|s|
-      cert = issue_cert(@ca, @rsa2048, s, [], nil, nil)
+      cert = issue_cert(@ca, @rsa1, s, [], nil, nil)
       assert_equal(s, cert.serial)
       cert = OpenSSL::X509::Certificate.new(cert.to_der)
       assert_equal(s, cert.serial)
@@ -29,40 +28,34 @@ def test_public_key
       ["subjectKeyIdentifier","hash",false],
       ["authorityKeyIdentifier","keyid:always",false],
     ]
-
-    [
-      @rsa1024, @rsa2048, @dsa256, @dsa512,
-    ].each{|pk|
-      cert = issue_cert(@ca, pk, 1, exts, nil, nil)
-      assert_equal(cert.extensions.sort_by(&:to_s)[2].value,
-                   OpenSSL::TestUtils.get_subject_key_id(cert))
-      cert = OpenSSL::X509::Certificate.new(cert.to_der)
-      assert_equal(cert.extensions.sort_by(&:to_s)[2].value,
-                   OpenSSL::TestUtils.get_subject_key_id(cert))
-    }
+    cert = issue_cert(@ca, @rsa1, 1, exts, nil, nil)
+    assert_kind_of(OpenSSL::PKey::RSA, cert.public_key)
+    assert_equal(@rsa1.public_to_der, cert.public_key.public_to_der)
+    cert = OpenSSL::X509::Certificate.new(cert.to_der)
+    assert_equal(@rsa1.public_to_der, cert.public_key.public_to_der)
   end
 
   def test_validity
     now = Time.at(Time.now.to_i + 0.9)
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil,
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                       not_before: now, not_after: now+3600)
     assert_equal(Time.at(now.to_i), cert.not_before)
     assert_equal(Time.at(now.to_i+3600), cert.not_after)
 
     now = Time.at(now.to_i)
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil,
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                       not_before: now, not_after: now+3600)
     assert_equal(now.getutc, cert.not_before)
     assert_equal((now+3600).getutc, cert.not_after)
 
     now = Time.at(0)
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil,
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                       not_before: now, not_after: now)
     assert_equal(now.getutc, cert.not_before)
     assert_equal(now.getutc, cert.not_after)
 
     now = Time.at(0x7fffffff)
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil,
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                       not_before: now, not_after: now)
     assert_equal(now.getutc, cert.not_before)
     assert_equal(now.getutc, cert.not_after)
@@ -75,7 +68,7 @@ def test_extension_factory
       ["subjectKeyIdentifier","hash",false],
       ["authorityKeyIdentifier","issuer:always,keyid:always",false],
     ]
-    ca_cert = issue_cert(@ca, @rsa2048, 1, ca_exts, nil, nil)
+    ca_cert = issue_cert(@ca, @rsa1, 1, ca_exts, nil, nil)
     ca_cert.extensions.each_with_index{|ext, i|
       assert_equal(ca_exts[i].first, ext.oid)
       assert_equal(ca_exts[i].last, ext.critical?)
@@ -88,7 +81,7 @@ def test_extension_factory
       ["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false],
       ["subjectAltName","email:ee1@ruby-lang.org",false],
     ]
-    ee1_cert = issue_cert(@ee1, @rsa1024, 2, ee1_exts, ca_cert, @rsa2048)
+    ee1_cert = issue_cert(@ee1, @rsa2, 2, ee1_exts, ca_cert, @rsa1)
     assert_equal(ca_cert.subject.to_der, ee1_cert.issuer.to_der)
     ee1_cert.extensions.each_with_index{|ext, i|
       assert_equal(ee1_exts[i].first, ext.oid)
@@ -97,25 +90,25 @@ def test_extension_factory
   end
 
   def test_akiski
-    ca_cert = generate_cert(@ca, @rsa2048, 4, nil)
+    ca_cert = generate_cert(@ca, @rsa1, 4, nil)
     ef = OpenSSL::X509::ExtensionFactory.new(ca_cert, ca_cert)
     ca_cert.add_extension(
       ef.create_extension("subjectKeyIdentifier", "hash", false))
     ca_cert.add_extension(
       ef.create_extension("authorityKeyIdentifier", "issuer:always,keyid:always", false))
-    ca_cert.sign(@rsa2048, "sha256")
+    ca_cert.sign(@rsa1, "sha256")
 
     ca_keyid = get_subject_key_id(ca_cert.to_der, hex: false)
     assert_equal ca_keyid, ca_cert.authority_key_identifier
     assert_equal ca_keyid, ca_cert.subject_key_identifier
 
-    ee_cert = generate_cert(@ee1, Fixtures.pkey("p256"), 5, ca_cert)
+    ee_cert = generate_cert(@ee1, @rsa2, 5, ca_cert)
     ef = OpenSSL::X509::ExtensionFactory.new(ca_cert, ee_cert)
     ee_cert.add_extension(
       ef.create_extension("subjectKeyIdentifier", "hash", false))
     ee_cert.add_extension(
       ef.create_extension("authorityKeyIdentifier", "issuer:always,keyid:always", false))
-    ee_cert.sign(@rsa2048, "sha256")
+    ee_cert.sign(@rsa1, "sha256")
 
     ee_keyid = get_subject_key_id(ee_cert.to_der, hex: false)
     assert_equal ca_keyid, ee_cert.authority_key_identifier
@@ -123,13 +116,13 @@ def test_akiski
   end
 
   def test_akiski_missing
-    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ee1, @rsa1, 1, [], nil, nil)
     assert_nil(cert.authority_key_identifier)
     assert_nil(cert.subject_key_identifier)
   end
 
   def test_crl_uris_no_crl_distribution_points
-    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ee1, @rsa1, 1, [], nil, nil)
     assert_nil(cert.crl_uris)
   end
 
@@ -141,10 +134,10 @@ def test_crl_uris
       URI.1 = http://www.example.com/crl
       URI.2 = ldap://ldap.example.com/cn=ca?certificateRevocationList;binary
     _cnf_
-    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
+    cdp_cert = generate_cert(@ee1, @rsa1, 3, nil)
     ef.subject_certificate = cdp_cert
     cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "@crlDistPts"))
-    cdp_cert.sign(@rsa2048, "sha256")
+    cdp_cert.sign(@rsa1, "sha256")
     assert_equal(
       ["http://www.example.com/crl", "ldap://ldap.example.com/cn=ca?certificateRevocationList;binary"],
       cdp_cert.crl_uris
@@ -158,10 +151,10 @@ def test_crl_uris_multiple_general_names
       [crlDistPts_section]
       fullname = URI:http://www.example.com/crl, URI:ldap://ldap.example.com/cn=ca?certificateRevocationList;binary
     _cnf_
-    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
+    cdp_cert = generate_cert(@ee1, @rsa1, 3, nil)
     ef.subject_certificate = cdp_cert
     cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "crlDistPts_section"))
-    cdp_cert.sign(@rsa2048, "sha256")
+    cdp_cert.sign(@rsa1, "sha256")
     assert_equal(
       ["http://www.example.com/crl", "ldap://ldap.example.com/cn=ca?certificateRevocationList;binary"],
       cdp_cert.crl_uris
@@ -177,22 +170,22 @@ def test_crl_uris_no_uris
       [dirname_section]
       CN = dirname
     _cnf_
-    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
+    cdp_cert = generate_cert(@ee1, @rsa1, 3, nil)
     ef.subject_certificate = cdp_cert
     cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "crlDistPts_section"))
-    cdp_cert.sign(@rsa2048, "sha256")
+    cdp_cert.sign(@rsa1, "sha256")
     assert_nil(cdp_cert.crl_uris)
   end
 
   def test_aia_missing
-    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ee1, @rsa1, 1, [], nil, nil)
     assert_nil(cert.ca_issuer_uris)
     assert_nil(cert.ocsp_uris)
   end
 
   def test_aia
     ef = OpenSSL::X509::ExtensionFactory.new
-    aia_cert = generate_cert(@ee1, @rsa2048, 4, nil)
+    aia_cert = generate_cert(@ee1, @rsa1, 4, nil)
     ef.subject_certificate = aia_cert
     aia_cert.add_extension(
       ef.create_extension(
@@ -204,7 +197,7 @@ def test_aia
         false
       )
     )
-    aia_cert.sign(@rsa2048, "sha256")
+    aia_cert.sign(@rsa1, "sha256")
     assert_equal(
       ["http://www.example.com/caIssuers", "ldap://ldap.example.com/cn=ca?authorityInfoAccessCaIssuers;binary"],
       aia_cert.ca_issuer_uris
@@ -217,7 +210,7 @@ def test_aia
 
   def test_invalid_extension
     integer = OpenSSL::ASN1::Integer.new(0)
-    invalid_exts_cert = generate_cert(@ee1, @rsa1024, 1, nil)
+    invalid_exts_cert = generate_cert(@ee1, @rsa1, 1, nil)
     ["subjectKeyIdentifier", "authorityKeyIdentifier", "crlDistributionPoints", "authorityInfoAccess"].each do |ext|
       invalid_exts_cert.add_extension(
         OpenSSL::X509::Extension.new(ext, integer.to_der)
@@ -241,84 +234,31 @@ def test_invalid_extension
     }
   end
 
-  def test_sign_and_verify_rsa_sha1
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil, digest: "SHA1")
-    assert_equal(false, cert.verify(@rsa1024))
-    assert_equal(true,  cert.verify(@rsa2048))
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
+  def test_sign_and_verify
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil, digest: "SHA256")
+    assert_equal("sha256WithRSAEncryption", cert.signature_algorithm) # ln
+    assert_equal(true, cert.verify(@rsa1))
+    assert_equal(false, cert.verify(@rsa2))
+    assert_equal(false, certificate_error_returns_false { cert.verify(@ec1) })
     cert.serial = 2
-    assert_equal(false, cert.verify(@rsa2048))
-  rescue OpenSSL::X509::CertificateError # RHEL 9 disables SHA1
-  end
-
-  def test_sign_and_verify_rsa_md5
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil, digest: "md5")
-    assert_equal(false, cert.verify(@rsa1024))
-    assert_equal(true, cert.verify(@rsa2048))
-
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
-    cert.subject = @ee1
-    assert_equal(false, cert.verify(@rsa2048))
-  rescue OpenSSL::X509::CertificateError # RHEL7 disables MD5
-  end
-
-  def test_sign_and_verify_dsa
-    cert = issue_cert(@ca, @dsa512, 1, [], nil, nil)
-    assert_equal(false, certificate_error_returns_false { cert.verify(@rsa1024) })
-    assert_equal(false, certificate_error_returns_false { cert.verify(@rsa2048) })
-    assert_equal(false, cert.verify(@dsa256))
-    assert_equal(true,  cert.verify(@dsa512))
-    cert.not_after = Time.now
-    assert_equal(false, cert.verify(@dsa512))
-  end
-
-  def test_sign_and_verify_rsa_dss1
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil, digest: OpenSSL::Digest.new('DSS1'))
-    assert_equal(false, cert.verify(@rsa1024))
-    assert_equal(true, cert.verify(@rsa2048))
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
-    cert.subject = @ee1
-    assert_equal(false, cert.verify(@rsa2048))
-  rescue OpenSSL::X509::CertificateError
-  end if defined?(OpenSSL::Digest::DSS1)
-
-  def test_sign_and_verify_dsa_md5
-    assert_raise(OpenSSL::X509::CertificateError){
-      issue_cert(@ca, @dsa512, 1, [], nil, nil, digest: "md5")
-    }
+    assert_equal(false, cert.verify(@rsa1))
   end
 
-  def test_sign_and_verify_ed25519
+  def test_sign_and_verify_nil_digest
     # Ed25519 is not FIPS-approved.
     omit_on_fips
-    # See ASN1_item_sign_ctx in ChangeLog for 3.8.1: https://github.com/libressl/portable/blob/master/ChangeLog
-    omit "Ed25519 not supported" unless openssl?(1, 1, 1) || libressl?(3, 8, 1)
     ed25519 = OpenSSL::PKey::generate_key("ED25519")
     cert = issue_cert(@ca, ed25519, 1, [], nil, nil, digest: nil)
     assert_equal(true, cert.verify(ed25519))
   end
 
-  def test_dsa_with_sha2
-    cert = issue_cert(@ca, @dsa256, 1, [], nil, nil, digest: "sha256")
-    assert_equal("dsa_with_SHA256", cert.signature_algorithm)
-    # TODO: need more tests for dsa + sha2
-
-    # SHA1 is allowed from OpenSSL 1.0.0 (0.9.8 requires DSS1)
-    cert = issue_cert(@ca, @dsa256, 1, [], nil, nil, digest: "sha1")
-    assert_equal("dsaWithSHA1", cert.signature_algorithm)
-  rescue OpenSSL::X509::CertificateError # RHEL 9 disables SHA1
-  end
-
   def test_check_private_key
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
-    assert_equal(true, cert.check_private_key(@rsa2048))
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    assert_equal(true, cert.check_private_key(@rsa1))
   end
 
   def test_read_from_file
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
     Tempfile.create("cert") { |f|
       f << cert.to_pem
       f.rewind
@@ -327,12 +267,12 @@ def test_read_from_file
   end
 
   def test_read_der_then_pem
-    cert1 = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert1 = issue_cert(@ca, @rsa1, 1, [], nil, nil)
     exts = [
       # A new line before PEM block
       ["nsComment", "Another certificate:\n" + cert1.to_pem],
     ]
-    cert2 = issue_cert(@ca, @rsa2048, 2, exts, nil, nil)
+    cert2 = issue_cert(@ca, @rsa1, 2, exts, nil, nil)
 
     assert_equal cert2, OpenSSL::X509::Certificate.new(cert2.to_der)
     assert_equal cert2, OpenSSL::X509::Certificate.new(cert2.to_pem)
@@ -340,15 +280,15 @@ def test_read_der_then_pem
 
   def test_eq
     now = Time.now
-    cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil,
+    cacert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                         not_before: now, not_after: now + 3600)
-    cert1 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+    cert1 = issue_cert(@ee1, @rsa2, 2, [], cacert, @rsa1,
                        not_before: now, not_after: now + 3600)
-    cert2 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+    cert2 = issue_cert(@ee1, @rsa2, 2, [], cacert, @rsa1,
                        not_before: now, not_after: now + 3600)
-    cert3 = issue_cert(@ee1, @rsa2048, 3, [], cacert, @rsa1024,
+    cert3 = issue_cert(@ee1, @rsa2, 3, [], cacert, @rsa1,
                        not_before: now, not_after: now + 3600)
-    cert4 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+    cert4 = issue_cert(@ee1, @rsa2, 2, [], cacert, @rsa1,
                        digest: "sha512", not_before: now, not_after: now + 3600)
 
     assert_equal false, cert1 == 12345
@@ -358,11 +298,19 @@ def test_eq
     assert_equal false, cert3 == cert4
   end
 
+  def test_inspect
+    cacert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    assert_include(cacert.inspect, "subject=#{@ca.inspect}")
+
+    # Do not raise an exception for an invalid certificate
+    assert_instance_of(String, OpenSSL::X509::Certificate.new.inspect)
+  end
+
   def test_marshal
     now = Time.now
-    cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil,
+    cacert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
       not_before: now, not_after: now + 3600)
-    cert = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+    cert = issue_cert(@ee1, @rsa2, 2, [], cacert, @rsa1,
       not_before: now, not_after: now + 3600)
     deserialized = Marshal.load(Marshal.dump(cert))
 
@@ -370,41 +318,58 @@ def test_marshal
   end
 
   def test_load_file_empty_pem
-    empty_path = Fixtures.file_path("pkey", "empty.pem")
-    assert_raise(OpenSSL::X509::CertificateError) do
-      OpenSSL::X509::Certificate.load_file(empty_path)
+    Tempfile.create("empty.pem") do |f|
+      f.close
+
+      assert_raise(OpenSSL::X509::CertificateError) do
+        OpenSSL::X509::Certificate.load_file(f.path)
+      end
     end
   end
 
   def test_load_file_fullchain_pem
-    fullchain_path = Fixtures.file_path("pkey", "fullchain.pem")
-    certificates = OpenSSL::X509::Certificate.load_file(fullchain_path)
-    assert_equal 2, certificates.size
-    assert_equal "/CN=www.codeotaku.com", certificates[0].subject.to_s
-    assert_equal "/C=US/O=Let's Encrypt/CN=R3", certificates[1].subject.to_s
+    cert1 = issue_cert(@ee1, @rsa1, 1, [], nil, nil)
+    cert2 = issue_cert(@ca, @rsa2, 1, [], nil, nil)
+
+    Tempfile.create("fullchain.pem") do |f|
+      f.puts cert1.to_pem
+      f.puts cert2.to_pem
+      f.close
+
+      certificates = OpenSSL::X509::Certificate.load_file(f.path)
+      assert_equal 2, certificates.size
+      assert_equal @ee1, certificates[0].subject
+      assert_equal @ca, certificates[1].subject
+    end
   end
 
   def test_load_file_certificate_der
-    fullchain_path = Fixtures.file_path("pkey", "certificate.der")
-    certificates = OpenSSL::X509::Certificate.load_file(fullchain_path)
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    Tempfile.create("certificate.der", binmode: true) do |f|
+      f.write cert.to_der
+      f.close
 
-    # DER encoding can only contain one certificate:
-    assert_equal 1, certificates.size
-    assert_equal "/CN=www.codeotaku.com", certificates[0].subject.to_s
+      certificates = OpenSSL::X509::Certificate.load_file(f.path)
+
+      # DER encoding can only contain one certificate:
+      assert_equal 1, certificates.size
+      assert_equal cert.to_der, certificates[0].to_der
+    end
   end
 
   def test_load_file_fullchain_garbage
-    fullchain_path = Fixtures.file_path("pkey", "garbage.txt")
+    Tempfile.create("garbage.txt") do |f|
+      f.puts "not a certificate"
+      f.close
 
-    assert_raise(OpenSSL::X509::CertificateError) do
-      OpenSSL::X509::Certificate.load_file(fullchain_path)
+      assert_raise(OpenSSL::X509::CertificateError) do
+        OpenSSL::X509::Certificate.load_file(f.path)
+      end
     end
   end
 
   def test_tbs_precert_bytes
-    pend "LibreSSL < 3.5 does not have i2d_re_X509_tbs" if libressl? && !libressl?(3, 5, 0)
-
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
     seq = OpenSSL::ASN1.decode(cert.tbs_bytes)
 
     assert_equal 7, seq.value.size
diff --git a/test/mri/openssl/test_x509crl.rb b/test/mri/openssl/test_x509crl.rb
index e5fa6f9989c..81c9247df2c 100644
--- a/test/mri/openssl/test_x509crl.rb
+++ b/test/mri/openssl/test_x509crl.rb
@@ -6,25 +6,21 @@
 class OpenSSL::TestX509CRL < OpenSSL::TestCase
   def setup
     super
-    @rsa1024 = Fixtures.pkey("rsa1024")
-    @rsa2048 = Fixtures.pkey("rsa2048")
-    @dsa256  = Fixtures.pkey("dsa256")
-    @dsa512  = Fixtures.pkey("dsa512")
+    @rsa1 = Fixtures.pkey("rsa-1")
+    @rsa2 = Fixtures.pkey("rsa-2")
     @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
-    @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
-    @ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
   end
 
   def test_basic
     now = Time.at(Time.now.to_i)
 
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
-    crl = issue_crl([], 1, now, now+1600, [],
-                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    crl = issue_crl([], 1, now, now+1600, [], cert, @rsa1, "SHA256")
     assert_equal(1, crl.version)
     assert_equal(cert.issuer.to_der, crl.issuer.to_der)
     assert_equal(now, crl.last_update)
     assert_equal(now+1600, crl.next_update)
+    assert_equal("sha256WithRSAEncryption", crl.signature_algorithm) # ln
 
     crl = OpenSSL::X509::CRL.new(crl.to_der)
     assert_equal(1, crl.version)
@@ -55,9 +51,9 @@ def test_revoked
       [4, now,                 4],
       [5, now,                 5],
     ]
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
     crl = issue_crl(revoke_info, 1, Time.now, Time.now+1600, [],
-                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
+                    cert, @rsa1, "SHA256")
     revoked = crl.revoked
     assert_equal(5, revoked.size)
     assert_equal(1, revoked[0].serial)
@@ -98,7 +94,7 @@ def test_revoked
 
     revoke_info = (1..1000).collect{|i| [i, now, 0] }
     crl = issue_crl(revoke_info, 1, Time.now, Time.now+1600, [],
-                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
+                    cert, @rsa1, "SHA256")
     revoked = crl.revoked
     assert_equal(1000, revoked.size)
     assert_equal(1, revoked[0].serial)
@@ -122,9 +118,9 @@ def test_extension
       ["issuerAltName", "issuer:copy", false],
     ]
 
-    cert = issue_cert(@ca, @rsa2048, 1, cert_exts, nil, nil)
+    cert = issue_cert(@ca, @rsa1, 1, cert_exts, nil, nil)
     crl = issue_crl([], 1, Time.now, Time.now+1600, crl_exts,
-                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
+                    cert, @rsa1, "SHA256")
     exts = crl.extensions
     assert_equal(3, exts.size)
     assert_equal("1", exts[0].value)
@@ -160,61 +156,55 @@ def test_extension
     assert_equal(false, exts[2].critical?)
 
     no_ext_crl = issue_crl([], 1, Time.now, Time.now+1600, [],
-      cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
+                           cert, @rsa1, "SHA256")
     assert_equal nil, no_ext_crl.authority_key_identifier
   end
 
   def test_crlnumber
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
-    crl = issue_crl([], 1, Time.now, Time.now+1600, [],
-                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    crl = issue_crl([], 1, Time.now, Time.now+1600, [], cert, @rsa1, "SHA256")
     assert_match(1.to_s, crl.extensions[0].value)
     assert_match(/X509v3 CRL Number:\s+#{1}/m, crl.to_text)
 
     crl = issue_crl([], 2**32, Time.now, Time.now+1600, [],
-                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
+                    cert, @rsa1, "SHA256")
     assert_match((2**32).to_s, crl.extensions[0].value)
     assert_match(/X509v3 CRL Number:\s+#{2**32}/m, crl.to_text)
 
     crl = issue_crl([], 2**100, Time.now, Time.now+1600, [],
-                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
+                    cert, @rsa1, "SHA256")
     assert_match(/X509v3 CRL Number:\s+#{2**100}/m, crl.to_text)
     assert_match((2**100).to_s, crl.extensions[0].value)
   end
 
   def test_sign_and_verify
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
-    crl = issue_crl([], 1, Time.now, Time.now+1600, [],
-                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
-    assert_equal(false, crl.verify(@rsa1024))
-    assert_equal(true,  crl.verify(@rsa2048))
-    assert_equal(false, crl_error_returns_false { crl.verify(@dsa256) })
-    assert_equal(false, crl_error_returns_false { crl.verify(@dsa512) })
+    p256 = Fixtures.pkey("p256")
+
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    crl = issue_crl([], 1, Time.now, Time.now+1600, [], cert, @rsa1, "SHA256")
+    assert_equal(true, crl.verify(@rsa1))
+    assert_equal(false, crl.verify(@rsa2))
+    assert_equal(false, crl_error_returns_false { crl.verify(p256) })
     crl.version = 0
-    assert_equal(false, crl.verify(@rsa2048))
+    assert_equal(false, crl.verify(@rsa1))
 
-    cert = issue_cert(@ca, @dsa512, 1, [], nil, nil)
-    crl = issue_crl([], 1, Time.now, Time.now+1600, [],
-                    cert, @dsa512, OpenSSL::Digest.new('SHA256'))
-    assert_equal(false, crl_error_returns_false { crl.verify(@rsa1024) })
-    assert_equal(false, crl_error_returns_false { crl.verify(@rsa2048) })
-    assert_equal(false, crl.verify(@dsa256))
-    assert_equal(true,  crl.verify(@dsa512))
+    cert = issue_cert(@ca, p256, 1, [], nil, nil)
+    crl = issue_crl([], 1, Time.now, Time.now+1600, [], cert, p256, "SHA256")
+    assert_equal(false, crl_error_returns_false { crl.verify(@rsa1) })
+    assert_equal(false, crl_error_returns_false { crl.verify(@rsa2) })
+    assert_equal(true, crl.verify(p256))
     crl.version = 0
-    assert_equal(false, crl.verify(@dsa512))
+    assert_equal(false, crl.verify(p256))
   end
 
-  def test_sign_and_verify_ed25519
+  def test_sign_and_verify_nil_digest
     # Ed25519 is not FIPS-approved.
     omit_on_fips
-    # See ASN1_item_sign_ctx in ChangeLog for 3.8.1: https://github.com/libressl/portable/blob/master/ChangeLog
-    omit "Ed25519 not supported" unless openssl?(1, 1, 1) || libressl?(3, 8, 1)
     ed25519 = OpenSSL::PKey::generate_key("ED25519")
     cert = issue_cert(@ca, ed25519, 1, [], nil, nil, digest: nil)
     crl = issue_crl([], 1, Time.now, Time.now+1600, [],
                     cert, ed25519, nil)
-    assert_equal(false, crl_error_returns_false { crl.verify(@rsa1024) })
-    assert_equal(false, crl_error_returns_false { crl.verify(@rsa2048) })
+    assert_equal(false, crl_error_returns_false { crl.verify(@rsa1) })
     assert_equal(false, crl.verify(OpenSSL::PKey::generate_key("ED25519")))
     assert_equal(true,  crl.verify(ed25519))
     crl.version = 0
@@ -247,8 +237,8 @@ def test_revoked_to_der
   def test_eq
     now = Time.now
 
-    cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil)
-    crl1 = issue_crl([], 1, now, now + 3600, [], cacert, @rsa1024, "sha256")
+    cacert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    crl1 = issue_crl([], 1, now, now + 3600, [], cacert, @rsa1, "SHA256")
     rev1 = OpenSSL::X509::Revoked.new.tap { |rev|
       rev.serial = 1
       rev.time = now
@@ -276,8 +266,8 @@ def test_eq
   def test_marshal
     now = Time.now
 
-    cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil)
-    crl = issue_crl([], 1, now, now + 3600, [], cacert, @rsa1024, "sha256")
+    cacert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    crl = issue_crl([], 1, now, now + 3600, [], cacert, @rsa1, "SHA256")
     rev = OpenSSL::X509::Revoked.new.tap { |rev|
       rev.serial = 1
       rev.time = now
diff --git a/test/mri/openssl/test_x509name.rb b/test/mri/openssl/test_x509name.rb
index c6d15219f58..223c575e4e9 100644
--- a/test/mri/openssl/test_x509name.rb
+++ b/test/mri/openssl/test_x509name.rb
@@ -423,24 +423,14 @@ def test_spaceship
     assert_equal(nil, n3 <=> nil)
   end
 
-  def name_hash(name)
-    # OpenSSL 1.0.0 uses SHA1 for canonical encoding (not just a der) of
-    # X509Name for X509_NAME_hash.
-    name.respond_to?(:hash_old) ? name.hash_old : name.hash
-  end
+  def test_hash_old
+    omit_on_fips # MD5
 
-  def test_hash
     dn = "/DC=org/DC=ruby-lang/CN=www.ruby-lang.org"
     name = OpenSSL::X509::Name.parse(dn)
     d = OpenSSL::Digest.digest('MD5', name.to_der)
     expected = (d[0].ord & 0xff) | (d[1].ord & 0xff) << 8 | (d[2].ord & 0xff) << 16 | (d[3].ord & 0xff) << 24
-    assert_equal(expected, name_hash(name))
-    #
-    dn = "/DC=org/DC=ruby-lang/CN=baz.ruby-lang.org"
-    name = OpenSSL::X509::Name.parse(dn)
-    d = OpenSSL::Digest.digest('MD5', name.to_der)
-    expected = (d[0].ord & 0xff) | (d[1].ord & 0xff) << 8 | (d[2].ord & 0xff) << 16 | (d[3].ord & 0xff) << 24
-    assert_equal(expected, name_hash(name))
+    assert_equal(expected, name.hash_old)
   end
 
   def test_equality
diff --git a/test/mri/openssl/test_x509req.rb b/test/mri/openssl/test_x509req.rb
index 1bf457ecf66..b198a1185ab 100644
--- a/test/mri/openssl/test_x509req.rb
+++ b/test/mri/openssl/test_x509req.rb
@@ -6,10 +6,8 @@
 class OpenSSL::TestX509Request < OpenSSL::TestCase
   def setup
     super
-    @rsa1024 = Fixtures.pkey("rsa1024")
-    @rsa2048 = Fixtures.pkey("rsa2048")
-    @dsa256  = Fixtures.pkey("dsa256")
-    @dsa512  = Fixtures.pkey("dsa512")
+    @rsa1 = Fixtures.pkey("rsa-1")
+    @rsa2 = Fixtures.pkey("rsa-2")
     @dn = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou")
   end
 
@@ -23,31 +21,32 @@ def issue_csr(ver, dn, key, digest)
   end
 
   def test_public_key
-    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
-    assert_equal(@rsa1024.public_to_der, req.public_key.public_to_der)
+    req = issue_csr(0, @dn, @rsa1, "SHA256")
+    assert_kind_of(OpenSSL::PKey::RSA, req.public_key)
+    assert_equal(@rsa1.public_to_der, req.public_key.public_to_der)
     req = OpenSSL::X509::Request.new(req.to_der)
-    assert_equal(@rsa1024.public_to_der, req.public_key.public_to_der)
-
-    req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('SHA256'))
-    assert_equal(@dsa512.public_to_der, req.public_key.public_to_der)
-    req = OpenSSL::X509::Request.new(req.to_der)
-    assert_equal(@dsa512.public_to_der, req.public_key.public_to_der)
+    assert_equal(@rsa1.public_to_der, req.public_key.public_to_der)
   end
 
   def test_version
-    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
+    req = issue_csr(0, @dn, @rsa1, "SHA256")
     assert_equal(0, req.version)
     req = OpenSSL::X509::Request.new(req.to_der)
     assert_equal(0, req.version)
   end
 
   def test_subject
-    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
+    req = issue_csr(0, @dn, @rsa1, "SHA256")
     assert_equal(@dn.to_der, req.subject.to_der)
     req = OpenSSL::X509::Request.new(req.to_der)
     assert_equal(@dn.to_der, req.subject.to_der)
   end
 
+  def test_signature_algorithm
+    req = issue_csr(0, @dn, @rsa1, "SHA256")
+    assert_equal("sha256WithRSAEncryption", req.signature_algorithm) # ln
+  end
+
   def create_ext_req(exts)
     ef = OpenSSL::X509::ExtensionFactory.new
     exts = exts.collect{|e| ef.create_extension(*e) }
@@ -73,9 +72,9 @@ def test_attr
       OpenSSL::X509::Attribute.new("msExtReq", attrval),
     ]
 
-    req0 = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
+    req0 = issue_csr(0, @dn, @rsa1, "SHA256")
     attrs.each{|attr| req0.add_attribute(attr) }
-    req1 = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
+    req1 = issue_csr(0, @dn, @rsa1, "SHA256")
     req1.attributes = attrs
     assert_equal(req0.to_der, req1.to_der)
 
@@ -95,67 +94,44 @@ def test_attr
     assert_equal(exts, get_ext_req(attrs[1].value))
   end
 
-  def test_sign_and_verify_rsa_sha1
-    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
-    assert_equal(true,  req.verify(@rsa1024))
-    assert_equal(false, req.verify(@rsa2048))
-    assert_equal(false, request_error_returns_false { req.verify(@dsa256) })
-    assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
-    req.subject = OpenSSL::X509::Name.parse("/C=JP/CN=FooBarFooBar")
-    assert_equal(false, req.verify(@rsa1024))
-  rescue OpenSSL::X509::RequestError # RHEL 9 disables SHA1
-  end
-
-  def test_sign_and_verify_rsa_md5
-    req = issue_csr(0, @dn, @rsa2048, OpenSSL::Digest.new('MD5'))
-    assert_equal(false, req.verify(@rsa1024))
-    assert_equal(true,  req.verify(@rsa2048))
-    assert_equal(false, request_error_returns_false { req.verify(@dsa256) })
-    assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
-    req.subject = OpenSSL::X509::Name.parse("/C=JP/CN=FooBar")
-    assert_equal(false, req.verify(@rsa2048))
-  rescue OpenSSL::X509::RequestError # RHEL7 disables MD5
-  end
-
-  def test_sign_and_verify_dsa
-    req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('SHA256'))
-    assert_equal(false, request_error_returns_false { req.verify(@rsa1024) })
-    assert_equal(false, request_error_returns_false { req.verify(@rsa2048) })
-    assert_equal(false, req.verify(@dsa256))
-    assert_equal(true,  req.verify(@dsa512))
-    req.public_key = @rsa1024.public_key
-    assert_equal(false, req.verify(@dsa512))
+  def test_sign_digest_instance
+    req1 = issue_csr(0, @dn, @rsa1, "SHA256")
+    req2 = issue_csr(0, @dn, @rsa1, OpenSSL::Digest.new("SHA256"))
+    assert_equal(req1.to_der, req2.to_der)
   end
 
-  def test_sign_and_verify_dsa_md5
-    assert_raise(OpenSSL::X509::RequestError){
-      issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('MD5')) }
+  def test_sign_and_verify
+    req = issue_csr(0, @dn, @rsa1, "SHA256")
+    assert_equal(true, req.verify(@rsa1))
+    assert_equal(false, req.verify(@rsa2))
+    ec = OpenSSL::PKey::EC.generate("prime256v1")
+    assert_equal(false, request_error_returns_false { req.verify(ec) })
+    req.subject = OpenSSL::X509::Name.parse_rfc2253("CN=FooBarFooBar,C=JP")
+    assert_equal(false, req.verify(@rsa1))
   end
 
-  def test_sign_and_verify_ed25519
+  def test_sign_and_verify_nil_digest
     # Ed25519 is not FIPS-approved.
     omit_on_fips
-    # See ASN1_item_sign_ctx in ChangeLog for 3.8.1: https://github.com/libressl/portable/blob/master/ChangeLog
-    omit "Ed25519 not supported" unless openssl?(1, 1, 1) || libressl?(3, 8, 1)
     ed25519 = OpenSSL::PKey::generate_key("ED25519")
     req = issue_csr(0, @dn, ed25519, nil)
-    assert_equal(false, request_error_returns_false { req.verify(@rsa1024) })
-    assert_equal(false, request_error_returns_false { req.verify(@rsa2048) })
+    assert_equal(false, request_error_returns_false { req.verify(@rsa1) })
+    assert_equal(false, request_error_returns_false { req.verify(@rsa2) })
     assert_equal(false, req.verify(OpenSSL::PKey::generate_key("ED25519")))
     assert_equal(true, req.verify(ed25519))
-    req.public_key = @rsa1024.public_key
+    req.public_key = @rsa1
     assert_equal(false, req.verify(ed25519))
   end
 
   def test_dup
-    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
+    req = issue_csr(0, @dn, @rsa1, "SHA256")
     assert_equal(req.to_der, req.dup.to_der)
   end
 
   def test_eq
-    req1 = issue_csr(0, @dn, @rsa1024, "sha256")
-    req2 = issue_csr(0, @dn, @rsa1024, "sha256")
-    req3 = issue_csr(0, @dn, @rsa1024, "sha512")
+    req1 = issue_csr(0, @dn, @rsa1, "SHA256")
+    req2 = issue_csr(0, @dn, @rsa1, "SHA256")
+    req3 = issue_csr(0, @dn, @rsa1, "SHA512")
 
     assert_equal false, req1 == 12345
     assert_equal true, req1 == req2
@@ -163,7 +139,7 @@ def test_eq
   end
 
   def test_marshal
-    req = issue_csr(0, @dn, @rsa1024, "sha256")
+    req = issue_csr(0, @dn, @rsa1, "SHA256")
     deserialized = Marshal.load(Marshal.dump(req))
 
     assert_equal req.to_der, deserialized.to_der
diff --git a/test/mri/openssl/test_x509store.rb b/test/mri/openssl/test_x509store.rb
index d6c0e707a27..c13beae364f 100644
--- a/test/mri/openssl/test_x509store.rb
+++ b/test/mri/openssl/test_x509store.rb
@@ -91,6 +91,18 @@ def test_verify_simple
     assert_match(/ok/i, store.error_string)
     assert_equal(OpenSSL::X509::V_OK, store.error)
     assert_equal([ee1_cert, ca2_cert, ca1_cert], store.chain)
+
+    # Manually instantiated StoreContext
+    # Nothing trusted
+    store = OpenSSL::X509::Store.new
+    ctx = OpenSSL::X509::StoreContext.new(store, ee1_cert)
+    assert_nil(ctx.current_cert)
+    assert_nil(ctx.current_crl)
+    assert_equal(false, ctx.verify)
+    assert_equal(OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, ctx.error)
+    assert_equal(0, ctx.error_depth)
+    assert_equal([ee1_cert], ctx.chain)
+    assert_equal(ee1_cert, ctx.current_cert)
   end
 
   def test_verify_callback
@@ -329,15 +341,12 @@ def test_verify_with_crl
   end
 
   def test_add_cert_duplicate
-    # Up until OpenSSL 1.1.0, X509_STORE_add_{cert,crl}() returned an error
-    # if the given certificate is already in the X509_STORE
-    return if openssl?(1, 1, 0) || libressl?
     ca1 = OpenSSL::X509::Name.parse_rfc2253("CN=Root CA")
     ca1_key = Fixtures.pkey("rsa-1")
     ca1_cert = issue_cert(ca1, ca1_key, 1, [], nil, nil)
     store = OpenSSL::X509::Store.new
     store.add_cert(ca1_cert)
-    assert_raise(OpenSSL::X509::StoreError){
+    assert_nothing_raised {
       store.add_cert(ca1_cert)  # add same certificate twice
     }
 
@@ -349,7 +358,7 @@ def test_add_cert_duplicate
     crl2 = issue_crl(revoke_info, 2, now+1800, now+3600, [],
                      ca1_cert, ca1_key, "sha256")
     store.add_crl(crl1)
-    assert_raise(OpenSSL::X509::StoreError){
+    assert_nothing_raised {
       store.add_crl(crl2) # add CRL issued by same CA twice.
     }
   end
diff --git a/test/mri/openssl/utils.rb b/test/mri/openssl/utils.rb
index f6c84eef67c..7e6fe8b1633 100644
--- a/test/mri/openssl/utils.rb
+++ b/test/mri/openssl/utils.rb
@@ -24,10 +24,6 @@ def read_file(category, name)
       @file_cache[[category, name]] ||=
         File.read(File.join(__dir__, "fixtures", category, name + ".pem"))
     end
-
-    def file_path(category, name)
-      File.join(__dir__, "fixtures", category, name)
-    end
   end
 
   module_function
@@ -107,7 +103,7 @@ def get_subject_key_id(cert, hex: true)
   end
 
   def openssl?(major = nil, minor = nil, fix = nil, patch = 0, status = 0)
-    return false if OpenSSL::OPENSSL_VERSION.include?("LibreSSL")
+    return false if OpenSSL::OPENSSL_VERSION.include?("LibreSSL") || OpenSSL::OPENSSL_VERSION.include?("AWS-LC")
     return true unless major
     OpenSSL::OPENSSL_VERSION_NUMBER >=
       major * 0x10000000 + minor * 0x100000 + fix * 0x1000 + patch * 0x10 +
@@ -119,6 +115,10 @@ def libressl?(major = nil, minor = nil, fix = nil)
     return false unless version
     !major || (version.map(&:to_i) <=> [major, minor, fix]) >= 0
   end
+
+  def aws_lc?
+    OpenSSL::OPENSSL_VERSION.include?("AWS-LC")
+  end
 end
 
 class OpenSSL::TestCase < Test::Unit::TestCase
@@ -177,43 +177,31 @@ def setup
     @ca  = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
     @svr = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
     @cli = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
-    ca_exts = [
+    @ca_exts = [
       ["basicConstraints","CA:TRUE",true],
       ["keyUsage","cRLSign,keyCertSign",true],
     ]
-    ee_exts = [
+    @ee_exts = [
       ["keyUsage","keyEncipherment,digitalSignature",true],
     ]
-    @ca_cert  = issue_cert(@ca, @ca_key, 1, ca_exts, nil, nil)
-    @svr_cert = issue_cert(@svr, @svr_key, 2, ee_exts, @ca_cert, @ca_key)
-    @cli_cert = issue_cert(@cli, @cli_key, 3, ee_exts, @ca_cert, @ca_key)
+    @ca_cert  = issue_cert(@ca, @ca_key, 1, @ca_exts, nil, nil)
+    @svr_cert = issue_cert(@svr, @svr_key, 2, @ee_exts, @ca_cert, @ca_key)
+    @cli_cert = issue_cert(@cli, @cli_key, 3, @ee_exts, @ca_cert, @ca_key)
     @server = nil
   end
 
-  def tls13_supported?
-    return false unless defined?(OpenSSL::SSL::TLS1_3_VERSION)
-    ctx = OpenSSL::SSL::SSLContext.new
-    ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_3_VERSION
-    true
-  rescue
-  end
-
   def readwrite_loop(ctx, ssl)
     while line = ssl.gets
       ssl.write(line)
     end
   end
 
-  def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true,
+  def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE,
                    ctx_proc: nil, server_proc: method(:readwrite_loop),
                    accept_proc: proc{},
                    ignore_listener_error: false, &block)
     IO.pipe {|stop_pipe_r, stop_pipe_w|
-      store = OpenSSL::X509::Store.new
-      store.add_cert(@ca_cert)
-      store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.cert_store = store
       ctx.cert = @svr_cert
       ctx.key = @svr_key
       ctx.verify_mode = verify_mode
@@ -224,7 +212,6 @@ def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true
       port = tcps.connect_address.ip_port
 
       ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
-      ssls.start_immediately = start_immediately
 
       threads = []
       begin
@@ -299,6 +286,41 @@ def check_component(base, test, keys)
       assert_equal base.send(comp), test.send(comp)
     }
   end
+
+  def assert_sign_verify_false_or_error
+    ret = yield
+  rescue => e
+    assert_kind_of(OpenSSL::PKey::PKeyError, e)
+  else
+    assert_equal(false, ret)
+  end
+
+  def der_to_pem(der, pem_header)
+    # RFC 7468
+    <<~EOS
+    -----BEGIN #{pem_header}-----
+    #{[der].pack("m0").scan(/.{1,64}/).join("\n")}
+    -----END #{pem_header}-----
+    EOS
+  end
+
+  def der_to_encrypted_pem(der, pem_header, password)
+    # OpenSSL encryption, non-standard
+    iv = 16.times.to_a.pack("C*")
+    encrypted = OpenSSL::Cipher.new("aes-128-cbc").encrypt.then { |cipher|
+      cipher.key = OpenSSL::Digest.digest("MD5", password + iv[0, 8])
+      cipher.iv = iv
+      cipher.update(der) << cipher.final
+    }
+    <<~EOS
+    -----BEGIN #{pem_header}-----
+    Proc-Type: 4,ENCRYPTED
+    DEK-Info: AES-128-CBC,#{iv.unpack1("H*").upcase}
+
+    #{[encrypted].pack("m0").scan(/.{1,64}/).join("\n")}
+    -----END #{pem_header}-----
+    EOS
+  end
 end
 
 module OpenSSL::Certs
diff --git a/test/mri/optparse/test_load.rb b/test/mri/optparse/test_load.rb
index 0ebe855682a..f664cfbf722 100644
--- a/test/mri/optparse/test_load.rb
+++ b/test/mri/optparse/test_load.rb
@@ -31,7 +31,13 @@ def assert_load(result)
     assert_equal({test: result}, into)
   end
 
+  def assert_load_nothing
+    assert !new_parser.load
+    assert_nil @result
+  end
+
   def setup_options(env, dir, suffix = nil)
+    env.update({'HOME'=>@tmpdir})
     optdir = File.join(@tmpdir, dir)
     FileUtils.mkdir_p(optdir)
     file = File.join(optdir, [@basename, suffix].join(""))
@@ -41,7 +47,7 @@ def setup_options(env, dir, suffix = nil)
       begin
         yield dir, optdir
       ensure
-        File.unlink(file)
+        File.unlink(file) rescue nil
         Dir.rmdir(optdir) rescue nil
       end
     else
@@ -50,7 +56,7 @@ def setup_options(env, dir, suffix = nil)
   end
 
   def setup_options_home(&block)
-    setup_options({'HOME'=>@tmpdir}, ".options", &block)
+    setup_options({}, ".options", &block)
   end
 
   def setup_options_xdg_config_home(&block)
@@ -58,7 +64,7 @@ def setup_options_xdg_config_home(&block)
   end
 
   def setup_options_home_config(&block)
-    setup_options({'HOME'=>@tmpdir}, ".config", ".options", &block)
+    setup_options({}, ".config", ".options", &block)
   end
 
   def setup_options_xdg_config_dirs(&block)
@@ -66,7 +72,11 @@ def setup_options_xdg_config_dirs(&block)
   end
 
   def setup_options_home_config_settings(&block)
-    setup_options({'HOME'=>@tmpdir}, "config/settings", ".options", &block)
+    setup_options({}, "config/settings", ".options", &block)
+  end
+
+  def setup_options_home_options(envname, &block)
+    setup_options({envname => '~/options'}, "options", ".options", &block)
   end
 
   def test_load_home_options
@@ -91,7 +101,7 @@ def test_load_home_options
   end
 
   def test_load_xdg_config_home
-    result, = setup_options_xdg_config_home
+    result, dir = setup_options_xdg_config_home
     assert_load(result)
 
     setup_options_home_config do
@@ -105,6 +115,11 @@ def test_load_xdg_config_home
     setup_options_home_config_settings do
       assert_load(result)
     end
+
+    File.unlink("#{dir}/#{@basename}.options")
+    setup_options_home_config do
+      assert_load_nothing
+    end
   end
 
   def test_load_home_config
@@ -118,6 +133,11 @@ def test_load_home_config
     setup_options_home_config_settings do
       assert_load(result)
     end
+
+    setup_options_xdg_config_home do |_, dir|
+      File.unlink("#{dir}/#{@basename}.options")
+      assert_load_nothing
+    end
   end
 
   def test_load_xdg_config_dirs
@@ -135,7 +155,34 @@ def test_load_home_config_settings
   end
 
   def test_load_nothing
-    assert !new_parser.load
-    assert_nil @result
+    setup_options({}, "") do
+      assert_load_nothing
+    end
+  end
+
+  def test_not_expand_path_basename
+    basename = @basename
+    @basename = "~"
+    $test_optparse_basename = "/" + @basename
+    alias $test_optparse_prog $0
+    alias $0 $test_optparse_basename
+    setup_options({'HOME'=>@tmpdir+"/~options"}, "", "options") do
+      assert_load_nothing
+    end
+  ensure
+    alias $0 $test_optparse_prog
+    @basename = basename
+  end
+
+  def test_not_expand_path_xdg_config_home
+    setup_options_home_options('XDG_CONFIG_HOME') do
+      assert_load_nothing
+    end
+  end
+
+  def test_not_expand_path_xdg_config_dirs
+    setup_options_home_options('XDG_CONFIG_DIRS') do
+      assert_load_nothing
+    end
   end
 end
diff --git a/test/mri/optparse/test_optparse.rb b/test/mri/optparse/test_optparse.rb
index 7f35cb4a8a0..ff334009a69 100644
--- a/test/mri/optparse/test_optparse.rb
+++ b/test/mri/optparse/test_optparse.rb
@@ -184,10 +184,9 @@ def test_help_pager
       File.open(File.join(dir, "options.rb"), "w") do |f|
         f.puts "#{<<~"begin;"}\n#{<<~'end;'}"
         begin;
-          stdout = STDOUT.dup
+          stdout = $stdout.dup
           def stdout.tty?; true; end
-          Object.__send__(:remove_const, :STDOUT)
-          STDOUT = stdout
+          $stdout = stdout
           ARGV.options do |opt|
           end;
           100.times {|i| f.puts "  opt.on('--opt-#{i}') {}"}
@@ -217,4 +216,16 @@ def stdout.tty?; true; end
       end
     end
   end
+
+  def test_program_name
+    program = $0
+    $0 = "rdbg3.5"
+    assert_equal "rdbg3.5", OptionParser.new.program_name
+    RbConfig::CONFIG["EXECUTABLE_EXTS"]&.split(" ") do |ext|
+      $0 = "rdbg3.5" + ext
+      assert_equal "rdbg3.5", OptionParser.new.program_name
+    end
+  ensure
+    $0 = program
+  end
 end
diff --git a/test/mri/optparse/test_placearg.rb b/test/mri/optparse/test_placearg.rb
index a8a11e676b8..d5be5a66fb1 100644
--- a/test/mri/optparse/test_placearg.rb
+++ b/test/mri/optparse/test_placearg.rb
@@ -7,6 +7,10 @@ def setup
     @opt.def_option("-x [VAL]") {|x| @flag = x}
     @opt.def_option("--option [VAL]") {|x| @flag = x}
     @opt.def_option("-T [level]", /^[0-4]$/, Integer) {|x| @topt = x}
+    @opt.def_option("--enum [VAL]", [:Alpha, :Bravo, :Charlie]) {|x| @enum = x}
+    @opt.def_option("--enumval [VAL]", [[:Alpha, 1], [:Bravo, 2], [:Charlie, 3]]) {|x| @enum = x}
+    @opt.def_option("--integer [VAL]", Integer, [1, 2, 3]) {|x| @integer = x}
+    @opt.def_option("--range [VAL]", Integer, 1..3) {|x| @range = x}
     @topt = nil
     @opt.def_option("-n") {}
     @opt.def_option("--regexp [REGEXP]", Regexp) {|x| @reopt = x}
@@ -93,4 +97,25 @@ def test_lambda
     assert_equal(%w"", no_error {@opt.parse!(%w"--lambda")})
     assert_equal(nil, @flag)
   end
+
+  def test_enum
+    assert_equal([], no_error {@opt.parse!(%w"--enum=A")})
+    assert_equal(:Alpha, @enum)
+  end
+
+  def test_enum_pair
+    assert_equal([], no_error {@opt.parse!(%w"--enumval=A")})
+    assert_equal(1, @enum)
+  end
+
+  def test_enum_conversion
+    assert_equal([], no_error {@opt.parse!(%w"--integer=1")})
+    assert_equal(1, @integer)
+  end
+
+  def test_enum_range
+    assert_equal([], no_error {@opt.parse!(%w"--range=1")})
+    assert_equal(1, @range)
+    assert_raise(OptionParser::InvalidArgument) {@opt.parse!(%w"--range=4")}
+  end
 end
diff --git a/test/mri/optparse/test_switch.rb b/test/mri/optparse/test_switch.rb
new file mode 100644
index 00000000000..b06f4e310bc
--- /dev/null
+++ b/test/mri/optparse/test_switch.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: false
+
+require 'test/unit'
+require 'optparse'
+
+
+class TestOptionParserSwitch < Test::Unit::TestCase
+
+  def setup
+    @parser = OptionParser.new
+  end
+
+  def assert_invalidarg_error(msg, &block)
+    exc = assert_raise(OptionParser::InvalidArgument) do
+      yield
+    end
+    assert_equal "invalid argument: #{msg}", exc.message
+  end
+
+  def test_make_switch__enum_array
+    p = @parser
+    p.on("--enum=<val>", ["aa", "bb", "cc"])
+    p.permute(["--enum=bb"], into: (opts={}))
+    assert_equal({:enum=>"bb"}, opts)
+    assert_invalidarg_error("--enum=dd") do
+      p.permute(["--enum=dd"], into: (opts={}))
+    end
+  end
+
+  def test_make_switch__enum_hash
+    p = @parser
+    p.on("--hash=<val>", {"aa"=>"AA", "bb"=>"BB"})
+    p.permute(["--hash=bb"], into: (opts={}))
+    assert_equal({:hash=>"BB"}, opts)
+    assert_invalidarg_error("--hash=dd") do
+      p.permute(["--hash=dd"], into: (opts={}))
+    end
+  end
+
+  def test_make_switch__enum_set
+    p = @parser
+    p.on("--set=<val>", Set.new(["aa", "bb", "cc"]))
+    p.permute(["--set=bb"], into: (opts={}))
+    assert_equal({:set=>"bb"}, opts)
+    assert_invalidarg_error("--set=dd") do
+      p.permute(["--set=dd"], into: (opts={}))
+    end
+  end
+
+end
diff --git a/test/mri/ostruct/test_ostruct.rb b/test/mri/ostruct/test_ostruct.rb
deleted file mode 100644
index 19bb6061457..00000000000
--- a/test/mri/ostruct/test_ostruct.rb
+++ /dev/null
@@ -1,434 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'ostruct'
-require 'yaml'
-
-class TC_OpenStruct < Test::Unit::TestCase
-  def test_initialize
-    h = {name: "John Smith", age: 70, pension: 300}
-    assert_equal h, OpenStruct.new(h).to_h
-    assert_equal h, OpenStruct.new(OpenStruct.new(h)).to_h
-    assert_equal h, OpenStruct.new(Struct.new(*h.keys).new(*h.values)).to_h
-  end
-
-  def test_respond_to
-    o = OpenStruct.new
-    o.a = 1
-    assert_respond_to(o, :a)
-    assert_respond_to(o, :a=)
-  end
-
-  def test_respond_to_with_lazy_getter
-    o = OpenStruct.new a: 1
-    assert_respond_to(o, :a)
-    assert_respond_to(o, :a=)
-  end
-
-  def test_respond_to_allocated
-    assert_not_respond_to(OpenStruct.allocate, :a)
-  end
-
-  def test_equality
-    o1 = OpenStruct.new
-    o2 = OpenStruct.new
-    assert_equal(o1, o2)
-
-    o1.a = 'a'
-    assert_not_equal(o1, o2)
-
-    o2.a = 'a'
-    assert_equal(o1, o2)
-
-    o1.a = 'b'
-    assert_not_equal(o1, o2)
-
-    o2 = Object.new
-    o2.instance_eval{@table = {:a => 'b'}}
-    assert_not_equal(o1, o2)
-  end
-
-  def test_inspect
-    foo = OpenStruct.new
-    assert_equal("#<OpenStruct>", foo.inspect)
-    foo.bar = 1
-    foo.baz = 2
-    assert_equal("#<OpenStruct bar=1, baz=2>", foo.inspect)
-    assert_equal(false, foo.inspect.frozen?)
-
-    foo = OpenStruct.new
-    foo.bar = OpenStruct.new
-    assert_equal('#<OpenStruct bar=#<OpenStruct>>', foo.inspect)
-    foo.bar.foo = foo
-    assert_equal('#<OpenStruct bar=#<OpenStruct foo=#<OpenStruct ...>>>', foo.inspect)
-    assert_equal(false, foo.inspect.frozen?)
-  end
-
-  def test_frozen
-    o = OpenStruct.new(foo: 42)
-    o.a = 'a'
-    o.freeze
-    assert_raise(FrozenError) {o.b = 'b'}
-    assert_not_respond_to(o, :b)
-    assert_raise(FrozenError) {o.a = 'z'}
-    assert_equal('a', o.a)
-    assert_equal(42, o.foo)
-    o = OpenStruct.new :a => 42
-    def o.frozen?; nil end
-    o.freeze
-    assert_raise(FrozenError, '[ruby-core:22559]') {o.a = 1764}
-  end
-
-  def test_delete_field
-    bug = '[ruby-core:33010]'
-    o = OpenStruct.new
-    assert_not_respond_to(o, :a)
-    assert_not_respond_to(o, :a=)
-    o.a = 'a'
-    assert_respond_to(o, :a)
-    assert_respond_to(o, :a=)
-    a = o.delete_field :a
-    assert_not_respond_to(o, :a, bug)
-    assert_not_respond_to(o, :a=, bug)
-    assert_equal('a', a)
-    s = Object.new
-    def s.to_sym
-      :foo
-    end
-    o[s] = true
-    assert_respond_to(o, :foo)
-    assert_respond_to(o, :foo=)
-    o.delete_field s
-    assert_not_respond_to(o, :foo)
-    assert_not_respond_to(o, :foo=)
-
-    assert_raise(NameError) { o.delete_field(s) }
-    assert_equal(:bar, o.delete_field(s) { :bar })
-
-    o[s] = :foobar
-    assert_respond_to(o, :foo)
-    assert_respond_to(o, :foo=)
-    assert_equal(:foobar, o.delete_field(s) { :baz })
-
-    assert_equal(42, OpenStruct.new(foo: 42).delete_field(:foo) { :bug })
-
-    o = OpenStruct.new(block_given?: 42)
-    assert_raise(NameError) { o.delete_field(:foo) }
-  end
-
-  def test_setter
-    os = OpenStruct.new
-    os[:foo] = :bar
-    assert_equal :bar, os.foo
-    os['foo'] = :baz
-    assert_equal :baz, os.foo
-  end
-
-  def test_getter
-    os = OpenStruct.new
-    os.foo = :bar
-    assert_equal :bar, os[:foo]
-    assert_equal :bar, os['foo']
-  end
-
-  def test_dig
-    os1 = OpenStruct.new
-    os2 = OpenStruct.new
-    os1.child = os2
-    os2.foo = :bar
-    os2.child = [42]
-    assert_equal :bar, os1.dig("child", :foo)
-    assert_nil os1.dig("parent", :foo)
-    assert_raise(TypeError) { os1.dig("child", 0) }
-  end
-
-  def test_to_h
-    h = {name: "John Smith", age: 70, pension: 300}
-    os = OpenStruct.new(h)
-    to_h = os.to_h
-    assert_equal(h, to_h)
-
-    to_h[:age] = 71
-    assert_equal(70, os.age)
-    assert_equal(70, h[:age])
-
-    assert_equal(h, OpenStruct.new("name" => "John Smith", "age" => 70, pension: 300).to_h)
-  end
-
-  def test_to_h_with_block
-    os = OpenStruct.new("country" => "Australia", :capital => "Canberra")
-    assert_equal({"country" => "AUSTRALIA", "capital" => "CANBERRA" },
-                 os.to_h {|name, value| [name.to_s, value.upcase]})
-    assert_equal("Australia", os.country)
-  end
-
-  def test_each_pair
-    h = {name: "John Smith", age: 70, pension: 300}
-    os = OpenStruct.new(h)
-    assert_same os, os.each_pair{ }
-    assert_equal '#<Enumerator: #<OpenStruct name="John Smith", age=70, pension=300>:each_pair>', os.each_pair.inspect
-    assert_equal [[:name, "John Smith"], [:age, 70], [:pension, 300]], os.each_pair.to_a
-    assert_equal 3, os.each_pair.size
-  end
-
-  def test_eql_and_hash
-    os1 = OpenStruct.new age: 70
-    os2 = OpenStruct.new age: 70.0
-    assert_equal os1, os2
-    assert_equal false, os1.eql?(os2)
-    assert_not_equal os1.hash, os2.hash
-    assert_equal true, os1.eql?(os1.dup)
-    assert_equal os1.hash, os1.dup.hash
-  end
-
-  def test_method_missing
-    os = OpenStruct.new
-    e = assert_raise(NoMethodError) { os.foo true }
-    assert_equal :foo, e.name
-    assert_equal [true], e.args
-    assert_match(/#{__callee__}/, e.backtrace[0])
-    e = assert_raise(ArgumentError) { os.send :foo=, true, true }
-    assert_match(/#{__callee__}/, e.backtrace[0])
-  end
-
-  def test_accessor_defines_method
-    os = OpenStruct.new(foo: 42)
-    assert_respond_to(os, :foo)
-    assert_equal(42, os.foo)
-    assert_equal([:foo, :foo=], os.singleton_methods.sort)
-  end
-
-  def test_does_not_redefine
-    $VERBOSE, verbose_bak = nil, $VERBOSE
-    os = OpenStruct.new(foo: 42)
-    def os.foo
-      43
-    end
-    os.foo = 44
-    assert_equal(43, os.foo)
-  ensure
-    $VERBOSE = verbose_bak
-  end
-
-  def test_allocate_subclass
-    bug = '[ruby-core:80292] [Bug #13358] allocate should not call initialize'
-    c = Class.new(OpenStruct) {
-      def initialize(x,y={})super(y);end
-    }
-    os = assert_nothing_raised(ArgumentError, bug) {c.allocate}
-    assert_instance_of(c, os)
-  end
-
-  def test_initialize_subclass
-    c = Class.new(OpenStruct) {
-      def initialize(x,y={})super(y);end
-    }
-    o = c.new(1, {a: 42})
-    assert_equal(42, o.dup.a)
-    assert_equal(42, o.clone.a)
-  end
-
-  def test_private_method
-    os = OpenStruct.new
-    class << os
-      private
-      def foo
-      end
-    end
-    assert_raise_with_message(NoMethodError, /private method/) do
-      os.foo true, true
-    end
-  end
-
-  def test_protected_method
-    os = OpenStruct.new
-    class << os
-      protected
-      def foo
-      end
-    end
-    assert_raise_with_message(NoMethodError, /protected method/) do
-      os.foo true, true
-    end
-  end
-
-  def test_access_undefined
-    os = OpenStruct.new
-    assert_nil os.foo
-  end
-
-  def test_overridden_private_methods
-    os = OpenStruct.new(puts: :foo, format: :bar)
-    assert_equal(:foo, os.puts)
-    assert_equal(:bar, os.format)
-  end
-
-  def test_super
-    c = Class.new(OpenStruct) {
-      def foo; super; end
-    }
-    os = c.new(foo: :bar)
-    assert_equal(:bar, os.foo)
-  end
-
-  def test_overridden_public_methods
-    os = OpenStruct.new(method: :foo, class: :bar)
-    assert_equal(:foo, os.method)
-    assert_equal(:bar, os.class)
-  end
-
-  def test_access_original_methods
-    os = OpenStruct.new(method: :foo, hash: 42)
-    assert_equal(os.object_id, os.method!(:object_id).call)
-    assert_not_equal(42, os.hash!)
-    refute os.methods.include?(:"!~!")
-  end
-
-  def test_override_subclass
-    c = Class.new(OpenStruct) {
-      def foo; :protect_me; end
-      private def bar; :protect_me; end
-      def inspect; 'protect me'; end
-    }
-    o = c.new(
-      foo: 1, bar: 2, inspect: '3', # in subclass: protected
-      table!: 4, # bang method: protected
-      each_pair: 5, to_s: 'hello', # others: not protected
-    )
-    # protected:
-    assert_equal(:protect_me, o.foo)
-    assert_equal(:protect_me, o.send(:bar))
-    assert_equal('protect me', o.inspect)
-    assert_not_equal(4, o.send(:table!))
-    # not protected:
-    assert_equal(5, o.each_pair)
-    assert_equal('hello', o.to_s)
-  end
-
-  def test_override_submodule
-    m = Module.new {
-      def foo; :protect_me; end
-      private def bar; :protect_me; end
-      def inspect; 'protect me'; end
-    }
-    m2 = Module.new {
-      def added_to_all_open_struct; :override_me; end
-    }
-    OpenStruct.class_eval do
-      include m2
-      # prepend case tbd
-      def added_to_all_open_struct_2; :override_me; end
-    end
-    c = Class.new(OpenStruct) { include m }
-    o = c.new(
-      foo: 1, bar: 2, inspect: '3', # in subclass: protected
-      table!: 4, # bang method: protected
-      each_pair: 5, to_s: 'hello', # others: not protected
-                                   # including those added by the user:
-      added_to_all_open_struct: 6, added_to_all_open_struct_2: 7,
-    )
-    # protected:
-    assert_equal(:protect_me, o.foo)
-    assert_equal(:protect_me, o.send(:bar))
-    assert_equal('protect me', o.inspect)
-    assert_not_equal(4, o.send(:table!))
-    # not protected:
-    assert_equal(5, o.each_pair)
-    assert_equal('hello', o.to_s)
-    assert_equal(6, o.added_to_all_open_struct)
-    assert_equal(7, o.added_to_all_open_struct_2)
-  end
-
-  def test_mistaken_subclass
-    sub = Class.new(OpenStruct) do
-      def [](k)
-        __send__(k)
-        super
-      end
-
-      def []=(k, v)
-        @item_set = true
-        __send__("#{k}=", v)
-        super
-      end
-    end
-    o = sub.new
-    o.foo = 42
-    assert_equal 42, o.foo
-  end
-
-  def test_ractor
-    assert_ractor(<<~RUBY, require: 'ostruct')
-      obj1 = OpenStruct.new(a: 42, b: 42)
-      obj1.c = 42
-      obj1.freeze
-
-      obj2 = Ractor.new obj1 do |obj|
-        obj
-      end.take
-      assert obj1.object_id == obj2.object_id
-    RUBY
-  end if defined?(Ractor)
-
-  def test_access_methods_from_different_ractor
-    assert_ractor(<<~RUBY, require: 'ostruct')
-      os = OpenStruct.new
-      os.value = 100
-      r = Ractor.new(os) do |x|
-        v = x.value
-        Ractor.yield v
-      end
-      assert 100 == r.take
-    RUBY
-  end if defined?(Ractor)
-
-  def test_legacy_yaml
-    s = "--- !ruby/object:OpenStruct\ntable:\n  :foo: 42\n"
-    o = YAML.safe_load(s, permitted_classes: [Symbol, OpenStruct])
-    assert_equal(42, o.foo)
-
-    o = OpenStruct.new(table: {foo: 42})
-    assert_equal({foo: 42}, YAML.safe_load(YAML.dump(o), permitted_classes: [Symbol, OpenStruct]).table)
-  end if RUBY_VERSION >= '2.6'
-
-  def test_yaml
-    h = {name: "John Smith", age: 70, pension: 300.42}
-    yaml = "--- !ruby/object:OpenStruct\nname: John Smith\nage: 70\npension: 300.42\n"
-    os1 = OpenStruct.new(h)
-    os2 = YAML.safe_load(os1.to_yaml, permitted_classes: [Symbol, OpenStruct])
-    assert_equal yaml, os1.to_yaml
-    assert_equal os1, os2
-    assert_equal true, os1.eql?(os2)
-    assert_equal 300.42, os2.pension
-  end if RUBY_VERSION >= '2.6'
-
-  def test_marshal
-    o = OpenStruct.new(name: "John Smith", age: 70, pension: 300.42)
-    o2 = Marshal.load(Marshal.dump(o))
-    assert_equal o, o2
-  end
-
-  def test_class
-    os = OpenStruct.new(class: 'my-class', method: 'post')
-    assert_equal('my-class', os.class)
-    assert_equal(OpenStruct, os.class!)
-  end
-
-  has_performance_warnings = begin
-    Warning[:performance]
-    true
-  rescue NoMethodError, ArgumentError
-    false
-  end
-
-  if has_performance_warnings
-    def test_performance_warning
-      assert_in_out_err(
-        %w(-Ilib -rostruct -w -W:performance -e) + ['OpenStruct.new(a: 1)'],
-        "",
-        [],
-        ["-e:1: warning: OpenStruct use is discouraged for performance reasons"],
-        success: true,
-      )
-    end
-  end
-end
diff --git a/test/mri/pathname/test_pathname.rb b/test/mri/pathname/test_pathname.rb
index 6a4bb784bd0..3114d1458d2 100644
--- a/test/mri/pathname/test_pathname.rb
+++ b/test/mri/pathname/test_pathname.rb
@@ -348,7 +348,7 @@ def has_symlink?
     rescue NotImplementedError
       return false
     rescue Errno::ENOENT
-      return false
+      return true
     rescue Errno::EACCES
       return false
     end
@@ -370,10 +370,11 @@ def has_hardlink?
   end
 
   def realpath(path, basedir=nil)
-    Pathname.new(path).realpath(basedir).to_s
+    Pathname.new(path).realpath(*basedir).to_s
   end
 
   def test_realpath
+    omit "not working yet" if RUBY_ENGINE == "jruby"
     return if !has_symlink?
     with_tmpchdir('rubytest-pathname') {|dir|
       assert_raise(Errno::ENOENT) { realpath("#{dir}/not-exist") }
@@ -434,6 +435,7 @@ def realdirpath(path)
   end
 
   def test_realdirpath
+    omit "not working yet" if RUBY_ENGINE == "jruby"
     return if !has_symlink?
     Dir.mktmpdir('rubytest-pathname') {|dir|
       rdir = realpath(dir)
@@ -482,12 +484,27 @@ def test_initialize
     assert_equal('a', p1.to_s)
     p2 = Pathname.new(p1)
     assert_equal(p1, p2)
+
+    obj = Object.new
+    assert_raise_with_message(TypeError, /#to_path or #to_str/) { Pathname.new(obj) }
+
+    obj = Object.new
+    def obj.to_path; "a/path"; end
+    assert_equal("a/path", Pathname.new(obj).to_s)
+
+    obj = Object.new
+    def obj.to_str; "a/b"; end
+    assert_equal("a/b", Pathname.new(obj).to_s)
   end
 
   def test_initialize_nul
     assert_raise(ArgumentError) { Pathname.new("a\0") }
   end
 
+  def test_initialize_encoding
+    assert_raise(Encoding::CompatibilityError) { Pathname.new("a".encode(Encoding::UTF_32BE)) }
+  end
+
   def test_global_constructor
     p = Pathname.new('a')
     assert_equal(p, Pathname('a'))
@@ -682,6 +699,7 @@ def test_each_child
   end
 
   def test_each_line
+    omit "not working yet" if RUBY_ENGINE == "jruby"
     with_tmpchdir('rubytest-pathname') {|dir|
       open("a", "w") {|f| f.puts 1, 2 }
       a = []
@@ -708,6 +726,7 @@ def test_each_line
   end
 
   def test_each_line_opts
+    omit "not working yet" if RUBY_ENGINE == "jruby"
     with_tmpchdir('rubytest-pathname') {|dir|
       open("a", "w") {|f| f.puts 1, 2 }
       a = []
@@ -815,7 +834,7 @@ def test_atime
   end
 
   def test_birthtime
-    omit if RUBY_PLATFORM =~ /android/
+    omit "no File.birthtime" if RUBY_PLATFORM =~ /android/ or !File.respond_to?(:birthtime)
     # Check under a (probably) local filesystem.
     # Remote filesystems often may not support birthtime.
     with_tmpchdir('rubytest-pathname') do |dir|
@@ -1052,7 +1071,11 @@ def test_lutime
       latime = Time.utc(2000)
       lmtime = Time.utc(1999)
       File.symlink("a", "l")
-      Pathname("l").utime(latime, lmtime)
+      begin
+        Pathname("l").lutime(latime, lmtime)
+      rescue NotImplementedError
+        next
+      end
       s = File.lstat("a")
       ls = File.lstat("l")
       assert_equal(atime, s.atime)
@@ -1322,7 +1345,8 @@ def test_s_glob
   end
 
   def test_s_glob_3args
-    expect = RUBY_VERSION >= "3.1" ? [Pathname("."), Pathname("f")] : [Pathname("."), Pathname(".."), Pathname("f")]
+    # Note: truffleruby should behave like CRuby 3.1+, but it's not the case currently
+    expect = (RUBY_VERSION >= "3.1" && RUBY_ENGINE != "truffleruby") ? [Pathname("."), Pathname("f")] : [Pathname("."), Pathname(".."), Pathname("f")]
     with_tmpchdir('rubytest-pathname') {|dir|
       open("f", "w") {|f| f.write "abc" }
       Dir.chdir("/") {
diff --git a/test/mri/pathname/test_ractor.rb b/test/mri/pathname/test_ractor.rb
index 3d7b63deed4..737e4a4111d 100644
--- a/test/mri/pathname/test_ractor.rb
+++ b/test/mri/pathname/test_ractor.rb
@@ -9,14 +9,22 @@ def setup
 
   def test_ractor_shareable
     assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    class Ractor
+      alias value take
+    end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
     begin;
       $VERBOSE = nil
       require "pathname"
       r = Ractor.new Pathname("a") do |x|
         x.join(Pathname("b"), Pathname("c"))
       end
-      assert_equal(Pathname("a/b/c"), r.take)
+      assert_equal(Pathname("a/b/c"), r.value)
+
+      r = Ractor.new Pathname("a") do |a|
+        Pathname("b").relative_path_from(a)
+      end
+      assert_equal(Pathname("../b"), r.value)
     end;
   end
 end
-
diff --git a/test/mri/prism/api/freeze_test.rb b/test/mri/prism/api/freeze_test.rb
new file mode 100644
index 00000000000..5533a003313
--- /dev/null
+++ b/test/mri/prism/api/freeze_test.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class FreezeTest < TestCase
+    def test_parse
+      assert_frozen(Prism.parse("1 + 2; %i{foo} + %i{bar}", freeze: true))
+    end
+
+    def test_lex
+      assert_frozen(Prism.lex("1 + 2; %i{foo} + %i{bar}", freeze: true))
+    end
+
+    def test_parse_lex
+      assert_frozen(Prism.parse_lex("1 + 2; %i{foo} + %i{bar}", freeze: true))
+      assert_frozen(Prism.parse_lex("# encoding: euc-jp\n%i{foo}", freeze: true))
+    end
+
+    def test_parse_comments
+      assert_frozen(Prism.parse_comments("# comment", freeze: true))
+    end
+
+    def test_parse_stream
+      assert_frozen(Prism.parse_stream(StringIO.new("1 + 2; %i{foo} + %i{bar}"), freeze: true))
+    end
+
+    if !ENV["PRISM_BUILD_MINIMAL"]
+      def test_dump
+        assert_frozen(Prism.dump("1 + 2; %i{foo} + %i{bar}", freeze: true))
+      end
+    end
+
+    private
+
+    def assert_frozen_each(value)
+      assert_predicate value, :frozen?
+
+      value.instance_variables.each do |name|
+        case (child = value.instance_variable_get(name))
+        when Array
+          child.each { |item| assert_frozen_each(item) }
+        when Hash
+          child.each { |key, item| assert_frozen_each(key); assert_frozen_each(item) }
+        else
+          assert_frozen_each(child)
+        end
+      end
+    end
+
+    if defined?(Ractor.shareable?)
+      def assert_frozen(value)
+        assert_frozen_each(value)
+        assert Ractor.shareable?(value), -> { binding.irb }
+      end
+    else
+      alias assert_frozen assert_frozen_each
+    end
+  end
+end
diff --git a/test/mri/prism/api/parse_test.rb b/test/mri/prism/api/parse_test.rb
index ee8061c98c5..bbf28201ffe 100644
--- a/test/mri/prism/api/parse_test.rb
+++ b/test/mri/prism/api/parse_test.rb
@@ -116,6 +116,15 @@ def test_version
       assert Prism.parse_success?("1 + 1", version: "3.4.9")
       assert Prism.parse_success?("1 + 1", version: "3.4.10")
 
+      assert Prism.parse_success?("1 + 1", version: "3.5")
+      assert Prism.parse_success?("1 + 1", version: "3.5.0")
+
+      assert Prism.parse_success?("1 + 1", version: "4.0")
+      assert Prism.parse_success?("1 + 1", version: "4.0.0")
+
+      assert Prism.parse_success?("1 + 1", version: "4.1")
+      assert Prism.parse_success?("1 + 1", version: "4.1.0")
+
       assert Prism.parse_success?("1 + 1", version: "latest")
 
       # Test edge case
@@ -133,10 +142,36 @@ def test_version
 
       # Not supported version (too new)
       assert_raise ArgumentError do
-        Prism.parse("1 + 1", version: "3.5.0")
+        Prism.parse("1 + 1", version: "3.6.0")
+      end
+    end
+
+    def test_version_current
+      if RUBY_VERSION >= "3.3"
+        assert Prism.parse_success?("1 + 1", version: "current")
+      else
+        assert_raise(CurrentVersionError) { Prism.parse_success?("1 + 1", version: "current") }
       end
     end
 
+    def test_scopes
+      assert_kind_of Prism::CallNode, Prism.parse_statement("foo")
+      assert_kind_of Prism::LocalVariableReadNode, Prism.parse_statement("foo", scopes: [[:foo]])
+      assert_kind_of Prism::LocalVariableReadNode, Prism.parse_statement("foo", scopes: [Prism.scope(locals: [:foo])])
+
+      assert Prism.parse_failure?("foo(*)")
+      assert Prism.parse_success?("foo(*)", scopes: [Prism.scope(forwarding: [:*])])
+
+      assert Prism.parse_failure?("foo(**)")
+      assert Prism.parse_success?("foo(**)", scopes: [Prism.scope(forwarding: [:**])])
+
+      assert Prism.parse_failure?("foo(&)")
+      assert Prism.parse_success?("foo(&)", scopes: [Prism.scope(forwarding: [:&])])
+
+      assert Prism.parse_failure?("foo(...)")
+      assert Prism.parse_success?("foo(...)", scopes: [Prism.scope(forwarding: [:"..."])])
+    end
+
     private
 
     def find_source_file_node(program)
diff --git a/test/mri/prism/attribute_write_test.rb b/test/mri/prism/attribute_write_test.rb
deleted file mode 100644
index bd83d72da35..00000000000
--- a/test/mri/prism/attribute_write_test.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class AttributeWriteTest < TestCase
-    module Target
-      def self.value
-        2
-      end
-
-      def self.value=(value)
-        2
-      end
-
-      def self.[]=(index, value)
-        2
-      end
-    end
-
-    def test_named_call_with_operator
-      assert_attribute_write("Target.value = 1")
-    end
-
-    def test_named_call_without_operator
-      assert_attribute_write("Target.value=(1)")
-    end
-
-    def test_indexed_call_with_operator
-      assert_attribute_write("Target[0] = 1")
-    end
-
-    def test_indexed_call_without_operator
-      refute_attribute_write("Target.[]=(0, 1)")
-    end
-
-    def test_comparison_operators
-      refute_attribute_write("Target.value == 1")
-      refute_attribute_write("Target.value === 1")
-    end
-
-    private
-
-    def parse(source)
-      Prism.parse(source).value.statements.body.first
-    end
-
-    def assert_attribute_write(source)
-      call = parse(source)
-      assert(call.attribute_write?)
-      assert_equal(1, eval(source))
-    end
-
-    def refute_attribute_write(source)
-      call = parse(source)
-      refute(call.attribute_write?)
-      refute_equal(1, eval(source))
-    end
-  end
-end
diff --git a/test/mri/prism/command_line_test.rb b/test/mri/prism/command_line_test.rb
deleted file mode 100644
index 57ab0dee45e..00000000000
--- a/test/mri/prism/command_line_test.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class CommandLineTest < TestCase
-    def test_command_line_p
-      program = Prism.parse("1", command_line: "p").value
-      statements = program.statements.body
-
-      assert_equal 2, statements.length
-      assert_kind_of CallNode, statements.last
-      assert_equal :print, statements.last.name
-    end
-
-    def test_command_line_n
-      program = Prism.parse("1", command_line: "n").value
-      statements = program.statements.body
-
-      assert_equal 1, statements.length
-      assert_kind_of WhileNode, statements.first
-
-      predicate = statements.first.predicate
-      assert_kind_of CallNode, predicate
-      assert_equal :gets, predicate.name
-
-      arguments = predicate.arguments.arguments
-      assert_equal 1, arguments.length
-      assert_equal :$/, arguments.first.name
-    end
-
-    def test_command_line_a
-      program = Prism.parse("1", command_line: "na").value
-      statements = program.statements.body
-
-      assert_equal 1, statements.length
-      assert_kind_of WhileNode, statements.first
-
-      statement = statements.first.statements.body.first
-      assert_kind_of GlobalVariableWriteNode, statement
-      assert_equal :$F, statement.name
-    end
-
-    def test_command_line_l
-      program = Prism.parse("1", command_line: "nl").value
-      statements = program.statements.body
-
-      assert_equal 1, statements.length
-      assert_kind_of WhileNode, statements.first
-
-      predicate = statements.first.predicate
-      assert_kind_of CallNode, predicate
-      assert_equal :gets, predicate.name
-
-      arguments = predicate.arguments.arguments
-      assert_equal 2, arguments.length
-      assert_equal :$/, arguments.first.name
-      assert_equal "chomp", arguments.last.elements.first.key.unescaped
-    end
-
-    def test_command_line_e
-      result = Prism.parse("1 if 2..3")
-      assert_equal 2, result.warnings.length
-
-      result = Prism.parse("1 if 2..3", command_line: "e")
-      assert_equal 0, result.warnings.length
-    end
-  end
-end
diff --git a/test/mri/prism/comments_test.rb b/test/mri/prism/comments_test.rb
deleted file mode 100644
index b99c00268c3..00000000000
--- a/test/mri/prism/comments_test.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class CommentsTest < TestCase
-    def test_comment_inline
-      source = "# comment"
-      assert_equal [0], Debug.newlines(source)
-
-      assert_comment(
-        source,
-        InlineComment,
-        start_offset: 0,
-        end_offset: 9,
-        start_line: 1,
-        end_line: 1,
-        start_column: 0,
-        end_column: 9
-      )
-    end
-
-    def test_comment_inline_def
-      source = <<~RUBY
-      def foo
-        # a comment
-      end
-      RUBY
-
-      assert_comment(
-        source,
-        InlineComment,
-        start_offset: 10,
-        end_offset: 21,
-        start_line: 2,
-        end_line: 2,
-        start_column: 2,
-        end_column: 13
-      )
-    end
-
-    def test___END__
-      result = Prism.parse(<<~RUBY)
-        __END__
-        comment
-      RUBY
-
-      data_loc = result.data_loc
-      assert_equal 0, data_loc.start_offset
-      assert_equal 16, data_loc.end_offset
-    end
-
-    def test___END__crlf
-      result = Prism.parse("__END__\r\ncomment\r\n")
-
-      data_loc = result.data_loc
-      assert_equal 0, data_loc.start_offset
-      assert_equal 18, data_loc.end_offset
-    end
-
-    def test_comment_embedded_document
-      source = <<~RUBY
-        =begin
-        comment
-        =end
-      RUBY
-
-      assert_comment(
-        source,
-        EmbDocComment,
-        start_offset: 0,
-        end_offset: 20,
-        start_line: 1,
-        end_line: 4,
-        start_column: 0,
-        end_column: 0
-      )
-    end
-
-    def test_comment_embedded_document_with_content_on_same_line
-      source = <<~RUBY
-        =begin other stuff
-        =end
-      RUBY
-
-      assert_comment(
-        source,
-        EmbDocComment,
-        start_offset: 0,
-        end_offset: 24,
-        start_line: 1,
-        end_line: 3,
-        start_column: 0,
-        end_column: 0
-      )
-    end
-
-    def test_attaching_comments
-      source = <<~RUBY
-        # Foo class
-        class Foo
-          # bar method
-          def bar
-            # baz invocation
-            baz
-          end # bar end
-        end # Foo end
-      RUBY
-
-      result = Prism.parse(source)
-      result.attach_comments!
-      tree = result.value
-      class_node = tree.statements.body.first
-      method_node = class_node.body.body.first
-      call_node = method_node.body.body.first
-
-      assert_equal("# Foo class\n# Foo end", class_node.location.comments.map { |c| c.location.slice }.join("\n"))
-      assert_equal("# bar method\n# bar end", method_node.location.comments.map { |c| c.location.slice }.join("\n"))
-      assert_equal("# baz invocation", call_node.location.comments.map { |c| c.location.slice }.join("\n"))
-    end
-
-    private
-
-    def assert_comment(source, type, start_offset:, end_offset:, start_line:, end_line:, start_column:, end_column:)
-      result = Prism.parse(source)
-      assert result.errors.empty?, result.errors.map(&:message).join("\n")
-      assert_kind_of type, result.comments.first
-
-      location = result.comments.first.location
-      assert_equal start_offset, location.start_offset, -> { "Expected start_offset to be #{start_offset}" }
-      assert_equal end_offset, location.end_offset, -> { "Expected end_offset to be #{end_offset}" }
-      assert_equal start_line, location.start_line, -> { "Expected start_line to be #{start_line}" }
-      assert_equal end_line, location.end_line, -> { "Expected end_line to be #{end_line}" }
-      assert_equal start_column, location.start_column, -> { "Expected start_column to be #{start_column}" }
-      assert_equal end_column, location.end_column, -> { "Expected end_column to be #{end_column}" }
-    end
-  end
-end
diff --git a/test/mri/prism/compiler_test.rb b/test/mri/prism/compiler_test.rb
deleted file mode 100644
index 9a326eb8d61..00000000000
--- a/test/mri/prism/compiler_test.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-# typed: ignore
-
-require_relative "test_helper"
-
-module Prism
-  class CompilerTest < TestCase
-    class SExpressions < Prism::Compiler
-      def visit_arguments_node(node)
-        [:arguments, super]
-      end
-
-      def visit_call_node(node)
-        [:call, super]
-      end
-
-      def visit_integer_node(node)
-        [:integer]
-      end
-
-      def visit_program_node(node)
-        [:program, super]
-      end
-    end
-
-    def test_compiler
-      expected = [:program, [[[:call, [[:integer], [:arguments, [[:integer]]]]]]]]
-      assert_equal expected, Prism.parse("1 + 2").value.accept(SExpressions.new)
-    end
-  end
-end
diff --git a/test/mri/prism/constant_path_node_test.rb b/test/mri/prism/constant_path_node_test.rb
deleted file mode 100644
index dffb55c0ffe..00000000000
--- a/test/mri/prism/constant_path_node_test.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class ConstantPathNodeTest < TestCase
-    def test_full_name_for_constant_path
-      source = <<~RUBY
-        Foo:: # comment
-          Bar::Baz::
-            Qux
-      RUBY
-
-      constant_path = Prism.parse(source).value.statements.body.first
-      assert_equal("Foo::Bar::Baz::Qux", constant_path.full_name)
-    end
-
-    def test_full_name_for_constant_path_with_self
-      source = <<~RUBY
-        self:: # comment
-          Bar::Baz::
-            Qux
-      RUBY
-
-      constant_path = Prism.parse(source).value.statements.body.first
-      assert_raise(ConstantPathNode::DynamicPartsInConstantPathError) do
-        constant_path.full_name
-      end
-    end
-
-    def test_full_name_for_constant_path_with_variable
-      source = <<~RUBY
-        foo:: # comment
-          Bar::Baz::
-            Qux
-      RUBY
-
-      constant_path = Prism.parse(source).value.statements.body.first
-
-      assert_raise(ConstantPathNode::DynamicPartsInConstantPathError) do
-        constant_path.full_name
-      end
-    end
-
-    def test_full_name_for_constant_path_target
-      source = <<~RUBY
-        Foo:: # comment
-          Bar::Baz::
-            Qux, Something = [1, 2]
-      RUBY
-
-      node = Prism.parse(source).value.statements.body.first
-      assert_equal("Foo::Bar::Baz::Qux", node.lefts.first.full_name)
-    end
-
-    def test_full_name_for_constant_path_with_stovetop_start
-      source = <<~RUBY
-        ::Foo:: # comment
-          Bar::Baz::
-            Qux, Something = [1, 2]
-      RUBY
-
-      node = Prism.parse(source).value.statements.body.first
-      assert_equal("::Foo::Bar::Baz::Qux", node.lefts.first.full_name)
-    end
-
-    def test_full_name_for_constant_path_target_with_non_constant_parent
-      source = <<~RUBY
-        self::Foo, Bar = [1, 2]
-      RUBY
-
-      constant_target = Prism.parse(source).value.statements.body.first
-      dynamic, static = constant_target.lefts
-
-      assert_raise(ConstantPathNode::DynamicPartsInConstantPathError) do
-        dynamic.full_name
-      end
-
-      assert_equal("Bar", static.full_name)
-    end
-
-    def test_full_name_for_constant_read_node
-      source = <<~RUBY
-        Bar
-      RUBY
-
-      constant = Prism.parse(source).value.statements.body.first
-      assert_equal("Bar", constant.full_name)
-    end
-  end
-end
diff --git a/test/mri/prism/desugar_compiler_test.rb b/test/mri/prism/desugar_compiler_test.rb
deleted file mode 100644
index 1a1d580d2dc..00000000000
--- a/test/mri/prism/desugar_compiler_test.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class DesugarCompilerTest < TestCase
-    def test_and_write
-      assert_desugars("(AndNode (ClassVariableReadNode) (ClassVariableWriteNode (CallNode)))", "@@foo &&= bar")
-      assert_not_desugared("Foo::Bar &&= baz", "Desugaring would execute Foo twice or need temporary variables")
-      assert_desugars("(AndNode (ConstantReadNode) (ConstantWriteNode (CallNode)))", "Foo &&= bar")
-      assert_desugars("(AndNode (GlobalVariableReadNode) (GlobalVariableWriteNode (CallNode)))", "$foo &&= bar")
-      assert_desugars("(AndNode (InstanceVariableReadNode) (InstanceVariableWriteNode (CallNode)))", "@foo &&= bar")
-      assert_desugars("(AndNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo &&= bar")
-      assert_desugars("(AndNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo = 1; foo &&= bar")
-    end
-
-    def test_or_write
-      assert_desugars("(IfNode (DefinedNode (ClassVariableReadNode)) (StatementsNode (ClassVariableReadNode)) (ElseNode (StatementsNode (ClassVariableWriteNode (CallNode)))))", "@@foo ||= bar")
-      assert_not_desugared("Foo::Bar ||= baz", "Desugaring would execute Foo twice or need temporary variables")
-      assert_desugars("(IfNode (DefinedNode (ConstantReadNode)) (StatementsNode (ConstantReadNode)) (ElseNode (StatementsNode (ConstantWriteNode (CallNode)))))", "Foo ||= bar")
-      assert_desugars("(IfNode (DefinedNode (GlobalVariableReadNode)) (StatementsNode (GlobalVariableReadNode)) (ElseNode (StatementsNode (GlobalVariableWriteNode (CallNode)))))", "$foo ||= bar")
-      assert_desugars("(OrNode (InstanceVariableReadNode) (InstanceVariableWriteNode (CallNode)))", "@foo ||= bar")
-      assert_desugars("(OrNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo ||= bar")
-      assert_desugars("(OrNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo = 1; foo ||= bar")
-    end
-
-    def test_operator_write
-      assert_desugars("(ClassVariableWriteNode (CallNode (ClassVariableReadNode) (ArgumentsNode (CallNode))))", "@@foo += bar")
-      assert_not_desugared("Foo::Bar += baz", "Desugaring would execute Foo twice or need temporary variables")
-      assert_desugars("(ConstantWriteNode (CallNode (ConstantReadNode) (ArgumentsNode (CallNode))))", "Foo += bar")
-      assert_desugars("(GlobalVariableWriteNode (CallNode (GlobalVariableReadNode) (ArgumentsNode (CallNode))))", "$foo += bar")
-      assert_desugars("(InstanceVariableWriteNode (CallNode (InstanceVariableReadNode) (ArgumentsNode (CallNode))))", "@foo += bar")
-      assert_desugars("(LocalVariableWriteNode (CallNode (LocalVariableReadNode) (ArgumentsNode (CallNode))))", "foo += bar")
-      assert_desugars("(LocalVariableWriteNode (CallNode (LocalVariableReadNode) (ArgumentsNode (CallNode))))", "foo = 1; foo += bar")
-    end
-
-    private
-
-    def ast_inspect(node)
-      parts = [node.class.name.split("::").last]
-
-      node.deconstruct_keys(nil).each do |_, value|
-        case value
-        when Node
-          parts << ast_inspect(value)
-        when Array
-          parts.concat(value.map { |element| ast_inspect(element) })
-        end
-      end
-
-      "(#{parts.join(" ")})"
-    end
-
-    # Ensure every node is only present once in the AST.
-    # If the same node is present twice it would most likely indicate it is executed twice, which is invalid semantically.
-    # This also acts as a sanity check that Node#child_nodes returns only nodes or nil (which caught a couple bugs).
-    def ensure_every_node_once_in_ast(node, all_nodes = {}.compare_by_identity)
-      if all_nodes.include?(node)
-        raise "#{node.inspect} is present multiple times in the desugared AST and likely executed multiple times"
-      else
-        all_nodes[node] = true
-      end
-      node.child_nodes.each do |child|
-        ensure_every_node_once_in_ast(child, all_nodes) unless child.nil?
-      end
-    end
-
-    def assert_desugars(expected, source)
-      ast = Prism.parse(source).value.accept(DesugarCompiler.new)
-      assert_equal expected, ast_inspect(ast.statements.body.last)
-
-      ensure_every_node_once_in_ast(ast)
-    end
-
-    def assert_not_desugared(source, reason)
-      ast = Prism.parse(source).value
-      assert_equal_nodes(ast, ast.accept(DesugarCompiler.new))
-    end
-  end
-end
diff --git a/test/mri/prism/dispatcher_test.rb b/test/mri/prism/dispatcher_test.rb
deleted file mode 100644
index 0d8a6d35e90..00000000000
--- a/test/mri/prism/dispatcher_test.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class DispatcherTest < TestCase
-    class TestListener
-      attr_reader :events_received
-
-      def initialize
-        @events_received = []
-      end
-
-      def on_call_node_enter(node)
-        events_received << :on_call_node_enter
-      end
-
-      def on_call_node_leave(node)
-        events_received << :on_call_node_leave
-      end
-
-      def on_integer_node_enter(node)
-        events_received << :on_integer_node_enter
-      end
-    end
-
-    def test_dispatching_events
-      listener = TestListener.new
-      dispatcher = Dispatcher.new
-      dispatcher.register(listener, :on_call_node_enter, :on_call_node_leave, :on_integer_node_enter)
-
-      root = Prism.parse(<<~RUBY).value
-        def foo
-          something(1, 2, 3)
-        end
-      RUBY
-
-      dispatcher.dispatch(root)
-      assert_equal([:on_call_node_enter, :on_integer_node_enter, :on_integer_node_enter, :on_integer_node_enter, :on_call_node_leave], listener.events_received)
-
-      listener.events_received.clear
-      dispatcher.dispatch_once(root.statements.body.first.body.body.first)
-      assert_equal([:on_call_node_enter, :on_call_node_leave], listener.events_received)
-    end
-  end
-end
diff --git a/test/mri/prism/encoding/encodings_test.rb b/test/mri/prism/encoding/encodings_test.rb
index 4ad2b465cc1..b008fc3fa10 100644
--- a/test/mri/prism/encoding/encodings_test.rb
+++ b/test/mri/prism/encoding/encodings_test.rb
@@ -56,21 +56,11 @@ def assert_encoding_identifier(name, character)
 
     # Check that we can properly parse every codepoint in the given encoding.
     def assert_encoding(encoding, name, range)
-      # I'm not entirely sure, but I believe these codepoints are incorrect in
-      # their parsing in CRuby. They all report as matching `[[:lower:]]` but
-      # then they are parsed as constants. This is because CRuby determines if
-      # an identifier is a constant or not by case folding it down to lowercase
-      # and checking if there is a difference. And even though they report
-      # themselves as lowercase, their case fold is different. I have reported
-      # this bug upstream.
+      unicode = false
+
       case encoding
       when Encoding::UTF_8, Encoding::UTF_8_MAC, Encoding::UTF8_DoCoMo, Encoding::UTF8_KDDI, Encoding::UTF8_SoftBank, Encoding::CESU_8
-        range = range.to_a - [
-          0x01c5, 0x01c8, 0x01cb, 0x01f2, 0x1f88, 0x1f89, 0x1f8a, 0x1f8b,
-          0x1f8c, 0x1f8d, 0x1f8e, 0x1f8f, 0x1f98, 0x1f99, 0x1f9a, 0x1f9b,
-          0x1f9c, 0x1f9d, 0x1f9e, 0x1f9f, 0x1fa8, 0x1fa9, 0x1faa, 0x1fab,
-          0x1fac, 0x1fad, 0x1fae, 0x1faf, 0x1fbc, 0x1fcc, 0x1ffc,
-        ]
+        unicode = true
       when Encoding::Windows_1253
         range = range.to_a - [0xb5]
       end
@@ -79,7 +69,7 @@ def assert_encoding(encoding, name, range)
         character = codepoint.chr(encoding)
 
         if character.match?(/[[:alpha:]]/)
-          if character.match?(/[[:upper:]]/)
+          if character.match?(/[[:upper:]]/) || (unicode && character.match?(Regexp.new("\\p{Lt}".encode(encoding))))
             assert_encoding_constant(name, character)
           else
             assert_encoding_identifier(name, character)
diff --git a/test/mri/prism/encoding/regular_expression_encoding_test.rb b/test/mri/prism/encoding/regular_expression_encoding_test.rb
index 5d062fe59a2..e2daae1d7fa 100644
--- a/test/mri/prism/encoding/regular_expression_encoding_test.rb
+++ b/test/mri/prism/encoding/regular_expression_encoding_test.rb
@@ -119,8 +119,8 @@ def assert_regular_expression_encoding_flags(encoding, regexps)
         if expected.is_a?(Array) && actual.is_a?(Array)
           if expected.last.start_with?("/.../n has a non escaped non ASCII character in non ASCII-8BIT script:") &&
               actual.last.start_with?("/.../n has a non escaped non ASCII character in non ASCII-8BIT script:")
-              expected.last.clear
-              actual.last.clear
+            expected.pop
+            actual.pop
           end
         end
 
diff --git a/test/mri/prism/encoding_test.rb b/test/mri/prism/encoding_test.rb
deleted file mode 100644
index c23bb8c294b..00000000000
--- a/test/mri/prism/encoding_test.rb
+++ /dev/null
@@ -1,572 +0,0 @@
-# frozen_string_literal: true
-
-return if RUBY_ENGINE != "ruby"
-
-require_relative "test_helper"
-
-module Prism
-  class EncodingTest < TestCase
-    codepoints_1byte = 0...0x100
-    encodings = {
-      Encoding::ASCII_8BIT =>   codepoints_1byte,
-      Encoding::US_ASCII =>     codepoints_1byte,
-      Encoding::Windows_1253 => codepoints_1byte
-    }
-
-    # By default we don't test every codepoint in these encodings because it
-    # takes a very long time.
-    if ENV["PRISM_TEST_ALL_ENCODINGS"]
-      codepoints_2bytes = 0...0x10000
-      codepoints_unicode = (0...0x110000)
-
-      codepoints_eucjp = [
-        *(0...0x10000),
-        *(0...0x10000).map { |bytes| bytes | 0x8F0000 }
-      ]
-
-      codepoints_emacs_mule = [
-        *(0...0x80),
-        *((0x81...0x90).flat_map { |byte1| (0x90...0x100).map { |byte2| byte1 << 8 | byte2 } }),
-        *((0x90...0x9C).flat_map { |byte1| (0xA0...0x100).flat_map { |byte2| (0xA0...0x100).flat_map { |byte3| byte1 << 16 | byte2 << 8 | byte3 } } }),
-        *((0xF0...0xF5).flat_map { |byte2| (0xA0...0x100).flat_map { |byte3| (0xA0...0x100).flat_map { |byte4| 0x9C << 24 | byte3 << 16 | byte3 << 8 | byte4 } } }),
-      ]
-
-      codepoints_gb18030 = [
-        *(0...0x80),
-        *((0x81..0xFE).flat_map { |byte1| (0x40...0x100).map { |byte2| byte1 << 8 | byte2 } }),
-        *((0x81..0xFE).flat_map { |byte1| (0x30...0x40).flat_map { |byte2| (0x81..0xFE).flat_map { |byte3| (0x2F...0x41).map { |byte4| byte1 << 24 | byte2 << 16 | byte3 << 8 | byte4 } } } }),
-      ]
-
-      codepoints_euc_tw = [
-        *(0..0x7F),
-        *(0xA1..0xFF).flat_map { |byte1| (0xA1..0xFF).map { |byte2| (byte1 << 8) | byte2 } },
-        *(0xA1..0xB0).flat_map { |byte2| (0xA1..0xFF).flat_map { |byte3| (0xA1..0xFF).flat_map { |byte4| 0x8E << 24 | byte2 << 16 | byte3 << 8 | byte4 } } }
-      ]
-
-      encodings.merge!(
-        Encoding::CP850 =>                      codepoints_1byte,
-        Encoding::CP852 =>                      codepoints_1byte,
-        Encoding::CP855 =>                      codepoints_1byte,
-        Encoding::GB1988 =>                     codepoints_1byte,
-        Encoding::IBM437 =>                     codepoints_1byte,
-        Encoding::IBM720 =>                     codepoints_1byte,
-        Encoding::IBM737 =>                     codepoints_1byte,
-        Encoding::IBM775 =>                     codepoints_1byte,
-        Encoding::IBM852 =>                     codepoints_1byte,
-        Encoding::IBM855 =>                     codepoints_1byte,
-        Encoding::IBM857 =>                     codepoints_1byte,
-        Encoding::IBM860 =>                     codepoints_1byte,
-        Encoding::IBM861 =>                     codepoints_1byte,
-        Encoding::IBM862 =>                     codepoints_1byte,
-        Encoding::IBM863 =>                     codepoints_1byte,
-        Encoding::IBM864 =>                     codepoints_1byte,
-        Encoding::IBM865 =>                     codepoints_1byte,
-        Encoding::IBM866 =>                     codepoints_1byte,
-        Encoding::IBM869 =>                     codepoints_1byte,
-        Encoding::ISO_8859_1 =>                 codepoints_1byte,
-        Encoding::ISO_8859_2 =>                 codepoints_1byte,
-        Encoding::ISO_8859_3 =>                 codepoints_1byte,
-        Encoding::ISO_8859_4 =>                 codepoints_1byte,
-        Encoding::ISO_8859_5 =>                 codepoints_1byte,
-        Encoding::ISO_8859_6 =>                 codepoints_1byte,
-        Encoding::ISO_8859_7 =>                 codepoints_1byte,
-        Encoding::ISO_8859_8 =>                 codepoints_1byte,
-        Encoding::ISO_8859_9 =>                 codepoints_1byte,
-        Encoding::ISO_8859_10 =>                codepoints_1byte,
-        Encoding::ISO_8859_11 =>                codepoints_1byte,
-        Encoding::ISO_8859_13 =>                codepoints_1byte,
-        Encoding::ISO_8859_14 =>                codepoints_1byte,
-        Encoding::ISO_8859_15 =>                codepoints_1byte,
-        Encoding::ISO_8859_16 =>                codepoints_1byte,
-        Encoding::KOI8_R =>                     codepoints_1byte,
-        Encoding::KOI8_U =>                     codepoints_1byte,
-        Encoding::MACCENTEURO =>                codepoints_1byte,
-        Encoding::MACCROATIAN =>                codepoints_1byte,
-        Encoding::MACCYRILLIC =>                codepoints_1byte,
-        Encoding::MACGREEK =>                   codepoints_1byte,
-        Encoding::MACICELAND =>                 codepoints_1byte,
-        Encoding::MACROMAN =>                   codepoints_1byte,
-        Encoding::MACROMANIA =>                 codepoints_1byte,
-        Encoding::MACTHAI =>                    codepoints_1byte,
-        Encoding::MACTURKISH =>                 codepoints_1byte,
-        Encoding::MACUKRAINE =>                 codepoints_1byte,
-        Encoding::TIS_620 =>                    codepoints_1byte,
-        Encoding::Windows_1250 =>               codepoints_1byte,
-        Encoding::Windows_1251 =>               codepoints_1byte,
-        Encoding::Windows_1252 =>               codepoints_1byte,
-        Encoding::Windows_1254 =>               codepoints_1byte,
-        Encoding::Windows_1255 =>               codepoints_1byte,
-        Encoding::Windows_1256 =>               codepoints_1byte,
-        Encoding::Windows_1257 =>               codepoints_1byte,
-        Encoding::Windows_1258 =>               codepoints_1byte,
-        Encoding::Windows_874 =>                codepoints_1byte,
-        Encoding::Big5 =>                       codepoints_2bytes,
-        Encoding::Big5_HKSCS =>                 codepoints_2bytes,
-        Encoding::Big5_UAO =>                   codepoints_2bytes,
-        Encoding::CP949 =>                      codepoints_2bytes,
-        Encoding::CP950 =>                      codepoints_2bytes,
-        Encoding::CP951 =>                      codepoints_2bytes,
-        Encoding::EUC_KR =>                     codepoints_2bytes,
-        Encoding::GBK =>                        codepoints_2bytes,
-        Encoding::GB12345 =>                    codepoints_2bytes,
-        Encoding::GB2312 =>                     codepoints_2bytes,
-        Encoding::MACJAPANESE =>                codepoints_2bytes,
-        Encoding::Shift_JIS =>                  codepoints_2bytes,
-        Encoding::SJIS_DoCoMo =>                codepoints_2bytes,
-        Encoding::SJIS_KDDI =>                  codepoints_2bytes,
-        Encoding::SJIS_SoftBank =>              codepoints_2bytes,
-        Encoding::Windows_31J =>                codepoints_2bytes,
-        Encoding::UTF_8 =>                      codepoints_unicode,
-        Encoding::UTF8_MAC =>                   codepoints_unicode,
-        Encoding::UTF8_DoCoMo =>                codepoints_unicode,
-        Encoding::UTF8_KDDI =>                  codepoints_unicode,
-        Encoding::UTF8_SoftBank =>              codepoints_unicode,
-        Encoding::CESU_8 =>                     codepoints_unicode,
-        Encoding::CP51932 =>                    codepoints_eucjp,
-        Encoding::EUC_JP =>                     codepoints_eucjp,
-        Encoding::EUCJP_MS =>                   codepoints_eucjp,
-        Encoding::EUC_JIS_2004 =>               codepoints_eucjp,
-        Encoding::EMACS_MULE =>                 codepoints_emacs_mule,
-        Encoding::STATELESS_ISO_2022_JP =>      codepoints_emacs_mule,
-        Encoding::STATELESS_ISO_2022_JP_KDDI => codepoints_emacs_mule,
-        Encoding::GB18030 =>                    codepoints_gb18030,
-        Encoding::EUC_TW =>                     codepoints_euc_tw
-      )
-    end
-
-    # These test that we're correctly parsing codepoints for each alias of each
-    # encoding that prism supports.
-    encodings.each do |encoding, range|
-      (encoding.names - %w[external internal filesystem locale]).each do |name|
-        define_method(:"test_encoding_#{name}") do
-          assert_encoding(encoding, name, range)
-        end
-      end
-    end
-
-    # These test that we're correctly setting the flags on strings for each
-    # encoding that prism supports.
-    escapes = ["\\x00", "\\x7F", "\\x80", "\\xFF", "\\u{00}", "\\u{7F}", "\\u{80}", "\\M-\\C-?"]
-    escapes = escapes.concat(escapes.product(escapes).map(&:join))
-    symbols = [:a, :ą, :+]
-    regexps = [/a/, /ą/, //]
-
-    encodings.each_key do |encoding|
-      define_method(:"test_encoding_flags_#{encoding.name}") do
-        assert_encoding_flags(encoding, escapes)
-      end
-
-      define_method(:"test_symbol_encoding_flags_#{encoding.name}") do
-        assert_symbol_encoding_flags(encoding, symbols)
-      end
-
-      define_method(:"test_symbol_character_escape_encoding_flags_#{encoding.name}") do
-        assert_symbol_character_escape_encoding_flags(encoding, escapes)
-      end
-
-      define_method(:"test_regular_expression_encoding_flags_#{encoding.name}") do
-        assert_regular_expression_encoding_flags(encoding, regexps.map(&:inspect))
-      end
-
-      define_method(:"test_regular_expression_escape_encoding_flags_#{encoding.name}") do
-        assert_regular_expression_encoding_flags(encoding, escapes.map { |e| "/#{e}/" })
-      end
-    end
-
-    encoding_modifiers = { ascii_8bit: "n", utf_8: "u", euc_jp: "e", windows_31j: "s" }
-    regexp_sources = ["abc", "garçon", "\\x80", "gar\\xC3\\xA7on", "gar\\u{E7}on", "abc\\u{FFFFFF}", "\\x80\\u{80}" ]
-
-    encoding_modifiers.each_value do |modifier|
-      encodings.each_key do |encoding|
-        define_method(:"test_regular_expression_encoding_modifiers_/#{modifier}_#{encoding.name}") do
-          assert_regular_expression_encoding_flags(
-            encoding,
-            regexp_sources.product(encoding_modifiers.values).map { |r, modifier| "/#{r}/#{modifier}" }
-          )
-        end
-      end
-    end
-
-    def test_coding
-      result = Prism.parse("# coding: utf-8\n'string'")
-      actual = result.value.statements.body.first.unescaped.encoding
-      assert_equal Encoding.find("utf-8"), actual
-    end
-
-    def test_coding_with_whitespace
-      result = Prism.parse("# coding \t \r  \v   :     \t \v    \r   ascii-8bit \n'string'")
-      actual = result.value.statements.body.first.unescaped.encoding
-      assert_equal Encoding.find("ascii-8bit"), actual
-    end
-
-    def test_emacs_style
-      result = Prism.parse("# -*- coding: utf-8 -*-\n'string'")
-      actual = result.value.statements.body.first.unescaped.encoding
-      assert_equal Encoding.find("utf-8"), actual
-    end
-
-    # This test may be a little confusing. Basically when we use our strpbrk, it
-    # takes into account the encoding of the file.
-    def test_strpbrk_multibyte
-      result = Prism.parse(<<~RUBY)
-        # encoding: Shift_JIS
-        %w[\x81\x5c]
-      RUBY
-
-      assert(result.errors.empty?)
-      assert_equal(
-        (+"\x81\x5c").force_encoding(Encoding::Shift_JIS),
-        result.value.statements.body.first.elements.first.unescaped
-      )
-    end
-
-    def test_utf_8_variations
-      %w[
-        utf-8-unix
-        utf-8-dos
-        utf-8-mac
-        utf-8-*
-      ].each do |encoding|
-        result = Prism.parse("# coding: #{encoding}\n'string'")
-        actual = result.value.statements.body.first.unescaped.encoding
-        assert_equal Encoding.find("utf-8"), actual
-      end
-    end
-
-    def test_first_lexed_token
-      encoding = Prism.lex("# encoding: ascii-8bit").value[0][0].value.encoding
-      assert_equal Encoding.find("ascii-8bit"), encoding
-    end
-
-    def test_slice_encoding
-      slice = Prism.parse("# encoding: Shift_JIS\nア").value.slice
-      assert_equal (+"ア").force_encoding(Encoding::SHIFT_JIS), slice
-      assert_equal Encoding::SHIFT_JIS, slice.encoding
-    end
-
-    def test_multibyte_escapes
-      [
-        ["'", "'"],
-        ["\"", "\""],
-        ["`", "`"],
-        ["/", "/"],
-        ["<<'HERE'\n", "\nHERE"],
-        ["<<-HERE\n", "\nHERE"]
-      ].each do |opening, closing|
-        assert Prism.parse_success?("# encoding: shift_jis\n'\\\x82\xA0'\n")
-      end
-    end
-
-    private
-
-    class ConstantContext < BasicObject
-      def self.const_missing(const)
-        const
-      end
-    end
-
-    def constant_context
-      ConstantContext.new
-    end
-
-    class IdentifierContext < BasicObject
-      def method_missing(name, *)
-        name
-      end
-    end
-
-    def identifier_context
-      IdentifierContext.new
-    end
-
-    def assert_encoding_constant(name, character)
-      source = "# encoding: #{name}\n#{character}"
-      expected = constant_context.instance_eval(source)
-
-      result = Prism.parse(source)
-      assert result.success?
-
-      actual = result.value.statements.body.last
-      assert_kind_of ConstantReadNode, actual
-      assert_equal expected, actual.name
-    end
-
-    def assert_encoding_identifier(name, character)
-      source = "# encoding: #{name}\n#{character}"
-      expected = identifier_context.instance_eval(source)
-
-      result = Prism.parse(source)
-      assert result.success?
-
-      actual = result.value.statements.body.last
-      assert_kind_of CallNode, actual
-      assert_equal expected, actual.name
-    end
-
-    # Check that we can properly parse every codepoint in the given encoding.
-    def assert_encoding(encoding, name, range)
-      # I'm not entirely sure, but I believe these codepoints are incorrect in
-      # their parsing in CRuby. They all report as matching `[[:lower:]]` but
-      # then they are parsed as constants. This is because CRuby determines if
-      # an identifier is a constant or not by case folding it down to lowercase
-      # and checking if there is a difference. And even though they report
-      # themselves as lowercase, their case fold is different. I have reported
-      # this bug upstream.
-      case encoding
-      when Encoding::UTF_8, Encoding::UTF_8_MAC, Encoding::UTF8_DoCoMo, Encoding::UTF8_KDDI, Encoding::UTF8_SoftBank, Encoding::CESU_8
-        range = range.to_a - [
-          0x01c5, 0x01c8, 0x01cb, 0x01f2, 0x1f88, 0x1f89, 0x1f8a, 0x1f8b,
-          0x1f8c, 0x1f8d, 0x1f8e, 0x1f8f, 0x1f98, 0x1f99, 0x1f9a, 0x1f9b,
-          0x1f9c, 0x1f9d, 0x1f9e, 0x1f9f, 0x1fa8, 0x1fa9, 0x1faa, 0x1fab,
-          0x1fac, 0x1fad, 0x1fae, 0x1faf, 0x1fbc, 0x1fcc, 0x1ffc,
-        ]
-      when Encoding::Windows_1253
-        range = range.to_a - [0xb5]
-      end
-
-      range.each do |codepoint|
-        character = codepoint.chr(encoding)
-
-        if character.match?(/[[:alpha:]]/)
-          if character.match?(/[[:upper:]]/)
-            assert_encoding_constant(name, character)
-          else
-            assert_encoding_identifier(name, character)
-          end
-        elsif character.match?(/[[:alnum:]]/)
-          assert_encoding_identifier(name, "_#{character}")
-        else
-          next if ["/", "{"].include?(character)
-
-          source = "# encoding: #{name}\n/(?##{character})/\n"
-          assert Prism.parse(source).success?
-        end
-      rescue RangeError
-        source = "# encoding: #{name}\n\\x#{codepoint.to_s(16)}"
-        refute Prism.parse(source).success?
-      end
-    end
-
-    def assert_encoding_flags(encoding, escapes)
-      escapes.each do |escaped|
-        source = "# encoding: #{encoding.name}\n\"#{escaped}\""
-
-        expected =
-          begin
-            eval(source).encoding
-          rescue SyntaxError => error
-            if error.message.include?("UTF-8 mixed within")
-              error.message[/: (.+?)\n/, 1]
-            else
-              raise
-            end
-          end
-
-        actual =
-          Prism.parse(source).then do |result|
-            if result.success?
-              string = result.value.statements.body.first
-
-              if string.forced_utf8_encoding?
-                Encoding::UTF_8
-              elsif string.forced_binary_encoding?
-                Encoding::ASCII_8BIT
-              else
-                encoding
-              end
-            else
-              error = result.errors.first
-
-              if error.message.include?("mixed")
-                error.message
-              else
-                raise error.message
-              end
-            end
-          end
-
-        assert_equal expected, actual
-      end
-    end
-
-    # Test Symbol literals without any interpolation or escape sequences.
-    def assert_symbol_encoding_flags(encoding, symbols)
-      symbols.each do |symbol|
-        source = "# encoding: #{encoding.name}\n#{symbol.inspect}"
-
-        expected =
-          begin
-            eval(source).encoding
-          rescue SyntaxError => error
-            unless error.message.include?("invalid multibyte char")
-              raise
-            end
-          end
-
-        actual =
-          Prism.parse(source).then do |result|
-            if result.success?
-              symbol = result.value.statements.body.first
-
-              if symbol.forced_utf8_encoding?
-                Encoding::UTF_8
-              elsif symbol.forced_binary_encoding?
-                Encoding::ASCII_8BIT
-              elsif symbol.forced_us_ascii_encoding?
-                Encoding::US_ASCII
-              else
-                encoding
-              end
-            else
-              error = result.errors.last
-
-              unless error.message.include?("invalid symbol")
-                raise error.message
-              end
-            end
-          end
-
-        assert_equal expected, actual
-      end
-    end
-
-    def assert_symbol_character_escape_encoding_flags(encoding, escapes)
-      escapes.each do |escaped|
-        source = "# encoding: #{encoding.name}\n:\"#{escaped}\""
-
-        expected =
-          begin
-            eval(source).encoding
-          rescue SyntaxError => error
-            if error.message.include?("UTF-8 mixed within")
-              error.message[/: (.+?)\n/, 1]
-            else
-              raise
-            end
-          end
-
-        actual =
-          Prism.parse(source).then do |result|
-            if result.success?
-              symbol = result.value.statements.body.first
-
-              if symbol.forced_utf8_encoding?
-                Encoding::UTF_8
-              elsif symbol.forced_binary_encoding?
-                Encoding::ASCII_8BIT
-              elsif symbol.forced_us_ascii_encoding?
-                Encoding::US_ASCII
-              else
-                encoding
-              end
-            else
-              error = result.errors.first
-
-              if error.message.include?("mixed")
-                error.message
-              else
-                raise error.message
-              end
-            end
-          end
-
-        assert_equal expected, actual
-      end
-    end
-
-    def assert_regular_expression_encoding_flags(encoding, regexps)
-      regexps.each do |regexp|
-        regexp_modifier_used = regexp.end_with?("/u") || regexp.end_with?("/e") || regexp.end_with?("/s") || regexp.end_with?("/n")
-        source = "# encoding: #{encoding.name}\n#{regexp}"
-
-        encoding_errors = ["invalid multibyte char", "escaped non ASCII character in UTF-8 regexp", "differs from source encoding"]
-        skipped_errors = ["invalid multibyte escape", "incompatible character encoding", "UTF-8 character in non UTF-8 regexp", "invalid Unicode range", "invalid Unicode list"]
-
-        # TODO (nirvdrum 21-Feb-2024): Prism currently does not handle Regexp validation unless modifiers are used. So, skip processing those errors for now: https://github.com/ruby/prism/issues/2104
-        unless regexp_modifier_used
-          skipped_errors += encoding_errors
-          encoding_errors.clear
-        end
-
-        expected =
-          begin
-            eval(source).encoding
-          rescue SyntaxError => error
-            if encoding_errors.find { |e| error.message.include?(e) }
-              error.message.split("\n").map { |m| m[/: (.+?)$/, 1] }
-            elsif skipped_errors.find { |e| error.message.include?(e) }
-              next
-            else
-              raise
-            end
-          end
-
-        actual =
-          Prism.parse(source).then do |result|
-            if result.success?
-              regexp = result.value.statements.body.first
-
-              actual_encoding = if regexp.forced_utf8_encoding?
-                Encoding::UTF_8
-              elsif regexp.forced_binary_encoding?
-                Encoding::ASCII_8BIT
-              elsif regexp.forced_us_ascii_encoding?
-                Encoding::US_ASCII
-              elsif regexp.ascii_8bit?
-                Encoding::ASCII_8BIT
-              elsif regexp.utf_8?
-                Encoding::UTF_8
-              elsif regexp.euc_jp?
-                Encoding::EUC_JP
-              elsif regexp.windows_31j?
-                Encoding::Windows_31J
-              else
-                encoding
-              end
-
-              if regexp.utf_8? && actual_encoding != Encoding::UTF_8
-                raise "expected regexp encoding to be UTF-8 due to '/u' modifier, but got #{actual_encoding.name}"
-              elsif regexp.ascii_8bit? && (actual_encoding != Encoding::ASCII_8BIT && actual_encoding != Encoding::US_ASCII)
-                raise "expected regexp encoding to be ASCII-8BIT or US-ASCII due to '/n' modifier, but got #{actual_encoding.name}"
-              elsif regexp.euc_jp? && actual_encoding != Encoding::EUC_JP
-                raise "expected regexp encoding to be EUC-JP due to '/e' modifier, but got #{actual_encoding.name}"
-              elsif regexp.windows_31j? && actual_encoding != Encoding::Windows_31J
-                raise "expected regexp encoding to be Windows-31J due to '/s' modifier, but got #{actual_encoding.name}"
-              end
-
-              if regexp.utf_8? && regexp.forced_utf8_encoding?
-                raise "the forced_utf8 flag should not be set when the UTF-8 modifier (/u) is used"
-              elsif regexp.ascii_8bit? && regexp.forced_binary_encoding?
-                raise "the forced_ascii_8bit flag should not be set when the UTF-8 modifier (/u) is used"
-              end
-
-              actual_encoding
-            else
-              errors = result.errors.map(&:message)
-
-              if errors.last&.include?("UTF-8 mixed within")
-                nil
-              else
-                errors
-              end
-            end
-          end
-
-        # TODO (nirvdrum 22-Feb-2024): Remove this workaround once Prism better maps CRuby's error messages.
-        # This class of error message is tricky. The part not being compared is a representation of the regexp.
-        # Depending on the source encoding and any encoding modifiers being used, CRuby alters how the regexp is represented.
-        # Sometimes it's an MBC string. Other times it uses hexadecimal character escapes. And in other cases it uses
-        # the long-form Unicode escape sequences. This short-circuit checks that the error message is mostly correct.
-        if expected.is_a?(Array) && actual.is_a?(Array)
-          if expected.last.start_with?("/.../n has a non escaped non ASCII character in non ASCII-8BIT script:") &&
-              actual.last.start_with?("/.../n has a non escaped non ASCII character in non ASCII-8BIT script:")
-              expected.last.clear
-              actual.last.clear
-          end
-        end
-
-        assert_equal expected, actual
-      end
-    end
-  end
-end
diff --git a/test/mri/prism/errors/3.3-3.3/circular_parameters.txt b/test/mri/prism/errors/3.3-3.3/circular_parameters.txt
new file mode 100644
index 00000000000..ef9642b075a
--- /dev/null
+++ b/test/mri/prism/errors/3.3-3.3/circular_parameters.txt
@@ -0,0 +1,12 @@
+def foo(bar = bar) = 42
+        ^~~ circular argument reference - bar
+
+def foo(bar: bar) = 42
+        ^~~ circular argument reference - bar
+
+proc { |foo = foo| }
+        ^~~ circular argument reference - foo
+
+proc { |foo: foo| }
+        ^~~ circular argument reference - foo
+
diff --git a/test/mri/prism/errors/3.3-3.4/leading_logical.txt b/test/mri/prism/errors/3.3-3.4/leading_logical.txt
new file mode 100644
index 00000000000..2a702e281d5
--- /dev/null
+++ b/test/mri/prism/errors/3.3-3.4/leading_logical.txt
@@ -0,0 +1,34 @@
+1
+&& 2
+^~ unexpected '&&', ignoring it
+&& 3
+^~ unexpected '&&', ignoring it
+
+1
+|| 2
+^ unexpected '|', ignoring it
+ ^ unexpected '|', ignoring it
+|| 3
+^ unexpected '|', ignoring it
+ ^ unexpected '|', ignoring it
+
+1
+and 2
+^~~ unexpected 'and', ignoring it
+and 3
+^~~ unexpected 'and', ignoring it
+
+1
+or 2
+^~ unexpected 'or', ignoring it
+or 3
+^~ unexpected 'or', ignoring it
+
+1
+and foo
+^~~ unexpected 'and', ignoring it
+
+2
+or foo
+^~ unexpected 'or', ignoring it
+
diff --git a/test/mri/prism/errors/3.3-3.4/private_endless_method.txt b/test/mri/prism/errors/3.3-3.4/private_endless_method.txt
new file mode 100644
index 00000000000..8aae5e0cd39
--- /dev/null
+++ b/test/mri/prism/errors/3.3-3.4/private_endless_method.txt
@@ -0,0 +1,3 @@
+private def foo = puts "Hello"
+                       ^ unexpected string literal, expecting end-of-input
+
diff --git a/test/mri/prism/errors/block_args_in_array_assignment.txt b/test/mri/prism/errors/3.4/block_args_in_array_assignment.txt
similarity index 100%
rename from test/mri/prism/errors/block_args_in_array_assignment.txt
rename to test/mri/prism/errors/3.4/block_args_in_array_assignment.txt
diff --git a/test/mri/prism/errors/dont_allow_return_inside_sclass_body.txt b/test/mri/prism/errors/3.4/dont_allow_return_inside_sclass_body.txt
similarity index 100%
rename from test/mri/prism/errors/dont_allow_return_inside_sclass_body.txt
rename to test/mri/prism/errors/3.4/dont_allow_return_inside_sclass_body.txt
diff --git a/test/mri/prism/errors/3.4/it_with_ordinary_parameter.txt b/test/mri/prism/errors/3.4/it_with_ordinary_parameter.txt
new file mode 100644
index 00000000000..ff9c4276cac
--- /dev/null
+++ b/test/mri/prism/errors/3.4/it_with_ordinary_parameter.txt
@@ -0,0 +1,3 @@
+proc { || it }
+          ^~ 'it' is not allowed when an ordinary parameter is defined
+
diff --git a/test/mri/prism/errors/keyword_args_in_array_assignment.txt b/test/mri/prism/errors/3.4/keyword_args_in_array_assignment.txt
similarity index 100%
rename from test/mri/prism/errors/keyword_args_in_array_assignment.txt
rename to test/mri/prism/errors/3.4/keyword_args_in_array_assignment.txt
diff --git a/test/mri/prism/errors/block_args_with_endless_def.txt b/test/mri/prism/errors/block_args_with_endless_def.txt
new file mode 100644
index 00000000000..a7242160d29
--- /dev/null
+++ b/test/mri/prism/errors/block_args_with_endless_def.txt
@@ -0,0 +1,5 @@
+p do |a = def f = 1; b| end
+          ^~~~~~~ unexpected endless method definition; expected a default value for a parameter
+p do |a = def f = 1| 2; b|c end
+          ^~~~~~~ unexpected endless method definition; expected a default value for a parameter
+
diff --git a/test/mri/prism/errors/command_calls.txt b/test/mri/prism/errors/command_calls.txt
index 19812a1d0a6..6601e5fbbc6 100644
--- a/test/mri/prism/errors/command_calls.txt
+++ b/test/mri/prism/errors/command_calls.txt
@@ -1,3 +1,10 @@
 [a b]
   ^ unexpected local variable or method; expected a `,` separator for the array elements
 
+
+[
+  a b do
+   ^ unexpected local variable or method; expected a `,` separator for the array elements
+  end,
+]
+
diff --git a/test/mri/prism/errors/command_calls_31.txt b/test/mri/prism/errors/command_calls_31.txt
new file mode 100644
index 00000000000..e662b254444
--- /dev/null
+++ b/test/mri/prism/errors/command_calls_31.txt
@@ -0,0 +1,17 @@
+true && not true
+            ^~~~ expected a `(` after `not`
+            ^~~~ unexpected 'true', expecting end-of-input
+
+true || not true
+            ^~~~ expected a `(` after `not`
+            ^~~~ unexpected 'true', expecting end-of-input
+
+true && not (true)
+           ^ expected a `(` immediately after `not`
+            ^ unexpected '(', expecting end-of-input
+
+true && not
+true
+^~~~ expected a `(` after `not`
+^~~~ unexpected 'true', expecting end-of-input
+
diff --git a/test/mri/prism/errors/command_calls_32.txt b/test/mri/prism/errors/command_calls_32.txt
new file mode 100644
index 00000000000..14488ca3355
--- /dev/null
+++ b/test/mri/prism/errors/command_calls_32.txt
@@ -0,0 +1,19 @@
+foo && return bar
+              ^~~ unexpected local variable or method, expecting end-of-input
+
+tap { foo && break bar }
+                   ^~~ unexpected local variable or method, expecting end-of-input
+
+tap { foo && next bar }
+                  ^~~ unexpected local variable or method, expecting end-of-input
+
+foo && return()
+             ^ unexpected '(', expecting end-of-input
+
+foo && return(bar)
+             ^ unexpected '(', expecting end-of-input
+
+foo && return(bar, baz)
+             ^~~~~~~~~~ unexpected write target
+             ^ unexpected '(', expecting end-of-input
+
diff --git a/test/mri/prism/errors/command_calls_33.txt b/test/mri/prism/errors/command_calls_33.txt
new file mode 100644
index 00000000000..13e3b35c9e8
--- /dev/null
+++ b/test/mri/prism/errors/command_calls_33.txt
@@ -0,0 +1,6 @@
+1 if foo = bar baz
+               ^~~ unexpected local variable or method, expecting end-of-input
+
+1 and foo = bar baz
+                ^~~ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/mri/prism/errors/command_calls_34.txt b/test/mri/prism/errors/command_calls_34.txt
new file mode 100644
index 00000000000..ce62bc1492a
--- /dev/null
+++ b/test/mri/prism/errors/command_calls_34.txt
@@ -0,0 +1,24 @@
+foo(bar 1 do end, 2)
+                ^ invalid comma
+                  ^ unexpected integer; expected a `)` to close the arguments
+                  ^ unexpected integer, expecting end-of-input
+                   ^ unexpected ')', expecting end-of-input
+                   ^ unexpected ')', ignoring it
+
+foo(bar 1 do end,)
+                ^ invalid comma
+
+foo(1, bar 2 do end)
+           ^ unexpected integer; expected a `)` to close the arguments
+           ^ unexpected integer, expecting end-of-input
+             ^~ unexpected 'do', expecting end-of-input
+             ^~ unexpected 'do', ignoring it
+                ^~~ unexpected 'end', ignoring it
+                   ^ unexpected ')', ignoring it
+
+foo(1, bar 2)
+           ^ unexpected integer; expected a `)` to close the arguments
+           ^ unexpected integer, expecting end-of-input
+            ^ unexpected ')', expecting end-of-input
+            ^ unexpected ')', ignoring it
+
diff --git a/test/mri/prism/errors/command_calls_35.txt b/test/mri/prism/errors/command_calls_35.txt
new file mode 100644
index 00000000000..45f569b117c
--- /dev/null
+++ b/test/mri/prism/errors/command_calls_35.txt
@@ -0,0 +1,46 @@
+p(p a, x: b => value)
+            ^~ unexpected '=>'; expected a `)` to close the arguments
+                    ^ unexpected ')', expecting end-of-input
+                    ^ unexpected ')', ignoring it
+
+p(p a, x: => value)
+          ^~ unexpected '=>'; expected a `)` to close the arguments
+                  ^ unexpected ')', expecting end-of-input
+                  ^ unexpected ')', ignoring it
+
+p(p a, &block => value)
+              ^~ unexpected '=>'; expected a `)` to close the arguments
+                      ^ unexpected ')', expecting end-of-input
+                      ^ unexpected ')', ignoring it
+
+p(p a do end => value)
+             ^~ unexpected '=>'; expected a `)` to close the arguments
+                     ^ unexpected ')', expecting end-of-input
+                     ^ unexpected ')', ignoring it
+
+p(p a, *args => value)
+             ^~ unexpected '=>'; expected a `)` to close the arguments
+                     ^ unexpected ')', expecting end-of-input
+                     ^ unexpected ')', ignoring it
+
+p(p a, **kwargs => value)
+                ^~ unexpected '=>'; expected a `)` to close the arguments
+                        ^ unexpected ')', expecting end-of-input
+                        ^ unexpected ')', ignoring it
+
+p p 1, &block => 2, &block
+              ^~ unexpected '=>', expecting end-of-input
+              ^~ unexpected '=>', ignoring it
+                  ^ unexpected ',', expecting end-of-input
+                  ^ unexpected ',', ignoring it
+                    ^ unexpected '&', ignoring it
+
+p p p 1 => 2 => 3 => 4
+                  ^~ unexpected '=>', expecting end-of-input
+                  ^~ unexpected '=>', ignoring it
+
+p[p a, x: b => value]
+           ^ expected a matching `]`
+                    ^ unexpected ']', expecting end-of-input
+                    ^ unexpected ']', ignoring it
+
diff --git a/test/mri/prism/errors/def_with_optional_splat.txt b/test/mri/prism/errors/def_with_optional_splat.txt
new file mode 100644
index 00000000000..74a833ceec0
--- /dev/null
+++ b/test/mri/prism/errors/def_with_optional_splat.txt
@@ -0,0 +1,6 @@
+def foo(*bar = nil); end
+             ^ unexpected '='; expected a `)` to close the parameters
+                  ^ unexpected ')', expecting end-of-input
+                  ^ unexpected ')', ignoring it
+                     ^~~ unexpected 'end', ignoring it
+
diff --git a/test/mri/prism/errors/defined_empty.txt b/test/mri/prism/errors/defined_empty.txt
new file mode 100644
index 00000000000..4d7ea764131
--- /dev/null
+++ b/test/mri/prism/errors/defined_empty.txt
@@ -0,0 +1,3 @@
+defined?()
+        ^ expected an expression after `defined?`
+
diff --git a/test/mri/prism/errors/destroy_call_operator_write_arguments.txt b/test/mri/prism/errors/destroy_call_operator_write_arguments.txt
new file mode 100644
index 00000000000..c3c72f92260
--- /dev/null
+++ b/test/mri/prism/errors/destroy_call_operator_write_arguments.txt
@@ -0,0 +1,11 @@
+t next&&do end&=
+        ^~ unexpected 'do'; expected an expression after the operator
+  ^~~~ unexpected void value expression
+  ^~~~ unexpected void value expression
+^~~~~~~~~~~~~~ unexpected write target
+              ^~ unexpected operator after a call with arguments
+              ^~ unexpected operator after a call with a block
+''while=
+  ^~~~~ expected a predicate expression for the `while` statement
+       ^ unexpected '='; target cannot be written
+
diff --git a/test/mri/prism/errors/endless_method_command_call.txt b/test/mri/prism/errors/endless_method_command_call.txt
new file mode 100644
index 00000000000..e6a328c2944
--- /dev/null
+++ b/test/mri/prism/errors/endless_method_command_call.txt
@@ -0,0 +1,3 @@
+private :m, def hello = puts "Hello"
+                             ^ unexpected string literal, expecting end-of-input
+
diff --git a/test/mri/prism/errors/endless_method_command_call_parameters.txt b/test/mri/prism/errors/endless_method_command_call_parameters.txt
new file mode 100644
index 00000000000..5dc92ce7f9f
--- /dev/null
+++ b/test/mri/prism/errors/endless_method_command_call_parameters.txt
@@ -0,0 +1,27 @@
+def f x: = 1
+         ^ could not parse the endless method parameters
+
+def f ... = 1
+          ^ could not parse the endless method parameters
+
+def f * = 1
+        ^ could not parse the endless method parameters
+
+def f ** = 1
+         ^ could not parse the endless method parameters
+
+def f & = 1
+        ^ could not parse the endless method parameters
+
+def f *a = 1
+         ^ could not parse the endless method parameters
+
+def f **a = 1
+          ^ could not parse the endless method parameters
+
+def f &a = 1
+         ^ could not parse the endless method parameters
+
+def f a, (b) = 1
+             ^ could not parse the endless method parameters
+
diff --git a/test/mri/prism/errors/escape_unicode_curly_whitespace.txt b/test/mri/prism/errors/escape_unicode_curly_whitespace.txt
new file mode 100644
index 00000000000..324d8a2ae51
--- /dev/null
+++ b/test/mri/prism/errors/escape_unicode_curly_whitespace.txt
@@ -0,0 +1,5 @@
+"\u{
+    ^ invalid Unicode escape sequence
+    ^ unterminated Unicode escape
+61}"
+
diff --git a/test/mri/prism/errors/heredoc_percent_q_newline_delimiter.txt b/test/mri/prism/errors/heredoc_percent_q_newline_delimiter.txt
new file mode 100644
index 00000000000..73664c071f6
--- /dev/null
+++ b/test/mri/prism/errors/heredoc_percent_q_newline_delimiter.txt
@@ -0,0 +1,11 @@
+%q
+#{<<B}
+B
+^ unexpected constant, expecting end-of-input
+
+<<A; %q
+A
+#{<<B}
+B
+^ unexpected constant, expecting end-of-input
+
diff --git a/test/mri/prism/errors/it_with_ordinary_parameter.txt b/test/mri/prism/errors/it_with_ordinary_parameter.txt
deleted file mode 100644
index 0fc34e9cc88..00000000000
--- a/test/mri/prism/errors/it_with_ordinary_parameter.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-proc { || it }
-          ^~ `it` is not allowed when an ordinary parameter is defined
-
diff --git a/test/mri/prism/errors/label_in_interpolated_string.txt b/test/mri/prism/errors/label_in_interpolated_string.txt
new file mode 100644
index 00000000000..e8f40dd2a8a
--- /dev/null
+++ b/test/mri/prism/errors/label_in_interpolated_string.txt
@@ -0,0 +1,14 @@
+case    in el""Q
+^~~~ expected a predicate for a case matching statement
+             ^ expected a delimiter after the patterns of an `in` clause
+               ^ unexpected constant, expecting end-of-input
+ !"""#{in el"":Q
+       ^~ unexpected 'in', assuming it is closing the parent 'in' clause
+       ^ expected a `}` to close the embedded expression
+       ^~ cannot parse the string part
+          ^~ cannot parse the string part
+            ^ cannot parse the string part
+    ^~~~~~~~~~~ unexpected label
+    ^~~~~~~~~~~ expected a string for concatenation
+               ^ expected an `end` to close the `case` statement
+
diff --git a/test/mri/prism/errors/pattern-capture-in-alt-array.txt b/test/mri/prism/errors/pattern-capture-in-alt-array.txt
new file mode 100644
index 00000000000..5cb59fa328a
--- /dev/null
+++ b/test/mri/prism/errors/pattern-capture-in-alt-array.txt
@@ -0,0 +1,4 @@
+1 => [a, b] | 2
+      ^ variable capture in alternative pattern
+         ^ variable capture in alternative pattern
+
diff --git a/test/mri/prism/errors/pattern-capture-in-alt-hash.txt b/test/mri/prism/errors/pattern-capture-in-alt-hash.txt
new file mode 100644
index 00000000000..150b3baecc4
--- /dev/null
+++ b/test/mri/prism/errors/pattern-capture-in-alt-hash.txt
@@ -0,0 +1,3 @@
+1 => { a: b } | 2
+          ^ variable capture in alternative pattern
+
diff --git a/test/mri/prism/errors/pattern-capture-in-alt-name.txt b/test/mri/prism/errors/pattern-capture-in-alt-name.txt
new file mode 100644
index 00000000000..cbf2bae85fe
--- /dev/null
+++ b/test/mri/prism/errors/pattern-capture-in-alt-name.txt
@@ -0,0 +1,3 @@
+1 => (2 => b) | 2
+           ^ variable capture in alternative pattern
+
diff --git a/test/mri/prism/errors/pattern-capture-in-alt-top.txt b/test/mri/prism/errors/pattern-capture-in-alt-top.txt
new file mode 100644
index 00000000000..bdf3a7f6374
--- /dev/null
+++ b/test/mri/prism/errors/pattern-capture-in-alt-top.txt
@@ -0,0 +1,4 @@
+1 => a | b
+     ^ variable capture in alternative pattern
+         ^ variable capture in alternative pattern
+
diff --git a/test/mri/prism/errors/pattern_arithmetic_expressions.txt b/test/mri/prism/errors/pattern_arithmetic_expressions.txt
new file mode 100644
index 00000000000..cfb36505312
--- /dev/null
+++ b/test/mri/prism/errors/pattern_arithmetic_expressions.txt
@@ -0,0 +1,3 @@
+case 1; in -1**2; end
+           ^~~~~ expected a pattern expression after the `in` keyword
+
diff --git a/test/mri/prism/errors/pattern_match_implicit_rest.txt b/test/mri/prism/errors/pattern_match_implicit_rest.txt
new file mode 100644
index 00000000000..8602c0add06
--- /dev/null
+++ b/test/mri/prism/errors/pattern_match_implicit_rest.txt
@@ -0,0 +1,3 @@
+a=>b, *,
+        ^ expected a pattern expression after `,`
+
diff --git a/test/mri/prism/errors/pattern_string_key.txt b/test/mri/prism/errors/pattern_string_key.txt
new file mode 100644
index 00000000000..9f28feddb96
--- /dev/null
+++ b/test/mri/prism/errors/pattern_string_key.txt
@@ -0,0 +1,8 @@
+case:a
+in b:"","#{}"
+        ^~~~~ expected a label after the `,` in the hash pattern
+             ^ expected a pattern expression after the key
+             ^ expected a delimiter after the patterns of an `in` clause
+             ^ unexpected end-of-input, assuming it is closing the parent top level context
+             ^ expected an `end` to close the `case` statement
+
diff --git a/test/mri/prism/errors/xstring_concat.txt b/test/mri/prism/errors/xstring_concat.txt
new file mode 100644
index 00000000000..f4d453d68d1
--- /dev/null
+++ b/test/mri/prism/errors/xstring_concat.txt
@@ -0,0 +1,5 @@
+<<`EOC` "bar"
+^~~~~~~ expected a string for concatenation
+echo foo
+EOC
+
diff --git a/test/mri/prism/errors_test.rb b/test/mri/prism/errors_test.rb
index 62bbd8458b2..706b7395574 100644
--- a/test/mri/prism/errors_test.rb
+++ b/test/mri/prism/errors_test.rb
@@ -1,41 +1,19 @@
 # frozen_string_literal: true
 
+return if RUBY_VERSION < "3.3.0"
+
 require_relative "test_helper"
 
 module Prism
   class ErrorsTest < TestCase
     base = File.expand_path("errors", __dir__)
-    filepaths = Dir["*.txt", base: base]
-
-    if RUBY_VERSION < "3.0"
-      filepaths -= [
-        "cannot_assign_to_a_reserved_numbered_parameter.txt",
-        "writing_numbered_parameter.txt",
-        "targeting_numbered_parameter.txt",
-        "defining_numbered_parameter.txt",
-        "defining_numbered_parameter_2.txt",
-        "numbered_parameters_in_block_arguments.txt",
-        "numbered_and_write.txt",
-        "numbered_or_write.txt",
-        "numbered_operator_write.txt"
-      ]
-    end
-
-    if RUBY_VERSION < "3.4"
-      filepaths -= [
-        "it_with_ordinary_parameter.txt",
-        "block_args_in_array_assignment.txt",
-        "keyword_args_in_array_assignment.txt"
-      ]
-    end
-
-    if RUBY_VERSION < "3.4" || RUBY_RELEASE_DATE < "2024-07-24"
-      filepaths -= ["dont_allow_return_inside_sclass_body.txt"]
-    end
+    filepaths = Dir["**/*.txt", base: base]
 
     filepaths.each do |filepath|
-      define_method(:"test_#{File.basename(filepath, ".txt")}") do
-        assert_errors(File.join(base, filepath))
+      ruby_versions_for(filepath).each do |version|
+        define_method(:"test_#{version}_#{File.basename(filepath, ".txt")}") do
+          assert_errors(File.join(base, filepath), version)
+        end
       end
     end
 
@@ -86,29 +64,33 @@ def test_invalid_message_name
       assert_equal :"", Prism.parse_statement("+.@foo,+=foo").write_name
     end
 
-    def test_circular_parameters
-      source = <<~RUBY
-        def foo(bar = bar) = 42
-        def foo(bar: bar) = 42
-        proc { |foo = foo| }
-        proc { |foo: foo| }
-      RUBY
+    def test_regexp_encoding_option_mismatch_error
+      # UTF-8 char with ASCII-8BIT modifier
+      result = Prism.parse('/Ȃ/n')
+      assert_includes result.errors.map(&:type), :regexp_encoding_option_mismatch
 
-      source.each_line do |line|
-        assert_predicate Prism.parse(line, version: "3.3.0"), :failure?
-        assert_predicate Prism.parse(line), :success?
-      end
+      # UTF-8 char with EUC-JP modifier
+      result = Prism.parse('/Ȃ/e')
+      assert_includes result.errors.map(&:type), :regexp_encoding_option_mismatch
+
+      # UTF-8 char with Windows-31J modifier
+      result = Prism.parse('/Ȃ/s')
+      assert_includes result.errors.map(&:type), :regexp_encoding_option_mismatch
+
+      # UTF-8 char with UTF-8 modifier
+      result = Prism.parse('/Ȃ/u')
+      assert_empty result.errors
     end
 
     private
 
-    def assert_errors(filepath)
+    def assert_errors(filepath, version)
       expected = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
 
       source = expected.lines.grep_v(/^\s*\^/).join.gsub(/\n*\z/, "")
-      refute_valid_syntax(source)
+      refute_valid_syntax(source) if CURRENT_MAJOR_MINOR == version
 
-      result = Prism.parse(source)
+      result = Prism.parse(source, version: version)
       errors = result.errors
       refute_empty errors, "Expected errors in #{filepath}"
 
diff --git a/test/mri/prism/fixtures/3.3-3.3/block_args_in_array_assignment.txt b/test/mri/prism/fixtures/3.3-3.3/block_args_in_array_assignment.txt
new file mode 100644
index 00000000000..6d6b052681b
--- /dev/null
+++ b/test/mri/prism/fixtures/3.3-3.3/block_args_in_array_assignment.txt
@@ -0,0 +1 @@
+matrix[5, &block] = 8
diff --git a/test/mri/prism/fixtures/3.3-3.3/it.txt b/test/mri/prism/fixtures/3.3-3.3/it.txt
new file mode 100644
index 00000000000..5410b01e711
--- /dev/null
+++ b/test/mri/prism/fixtures/3.3-3.3/it.txt
@@ -0,0 +1,5 @@
+x do
+  it
+end
+
+-> { it }
diff --git a/test/mri/prism/fixtures/it_indirect_writes.txt b/test/mri/prism/fixtures/3.3-3.3/it_indirect_writes.txt
similarity index 100%
rename from test/mri/prism/fixtures/it_indirect_writes.txt
rename to test/mri/prism/fixtures/3.3-3.3/it_indirect_writes.txt
diff --git a/test/mri/prism/fixtures/3.3-3.3/it_read_and_assignment.txt b/test/mri/prism/fixtures/3.3-3.3/it_read_and_assignment.txt
new file mode 100644
index 00000000000..2cceeb2a548
--- /dev/null
+++ b/test/mri/prism/fixtures/3.3-3.3/it_read_and_assignment.txt
@@ -0,0 +1 @@
+42.tap { p it; it = it; p it }
diff --git a/test/mri/prism/fixtures/3.3-3.3/it_with_ordinary_parameter.txt b/test/mri/prism/fixtures/3.3-3.3/it_with_ordinary_parameter.txt
new file mode 100644
index 00000000000..178b641e6b9
--- /dev/null
+++ b/test/mri/prism/fixtures/3.3-3.3/it_with_ordinary_parameter.txt
@@ -0,0 +1 @@
+proc { || it }
diff --git a/test/mri/prism/fixtures/3.3-3.3/keyword_args_in_array_assignment.txt b/test/mri/prism/fixtures/3.3-3.3/keyword_args_in_array_assignment.txt
new file mode 100644
index 00000000000..88016c2afe8
--- /dev/null
+++ b/test/mri/prism/fixtures/3.3-3.3/keyword_args_in_array_assignment.txt
@@ -0,0 +1 @@
+matrix[5, axis: :y] = 8
diff --git a/test/mri/prism/fixtures/3.3-3.3/return_in_sclass.txt b/test/mri/prism/fixtures/3.3-3.3/return_in_sclass.txt
new file mode 100644
index 00000000000..f1fde5771af
--- /dev/null
+++ b/test/mri/prism/fixtures/3.3-3.3/return_in_sclass.txt
@@ -0,0 +1 @@
+class << A; return; end
diff --git a/test/mri/prism/fixtures/3.4/circular_parameters.txt b/test/mri/prism/fixtures/3.4/circular_parameters.txt
new file mode 100644
index 00000000000..11537023ada
--- /dev/null
+++ b/test/mri/prism/fixtures/3.4/circular_parameters.txt
@@ -0,0 +1,4 @@
+def foo(bar = bar) = 42
+def foo(bar: bar) = 42
+proc { |foo = foo| }
+proc { |foo: foo| }
diff --git a/test/mri/prism/fixtures/3.4/it.txt b/test/mri/prism/fixtures/3.4/it.txt
new file mode 100644
index 00000000000..5410b01e711
--- /dev/null
+++ b/test/mri/prism/fixtures/3.4/it.txt
@@ -0,0 +1,5 @@
+x do
+  it
+end
+
+-> { it }
diff --git a/test/mri/prism/fixtures/3.4/it_indirect_writes.txt b/test/mri/prism/fixtures/3.4/it_indirect_writes.txt
new file mode 100644
index 00000000000..bb87e9483e2
--- /dev/null
+++ b/test/mri/prism/fixtures/3.4/it_indirect_writes.txt
@@ -0,0 +1,23 @@
+tap { it += 1 }
+
+tap { it ||= 1 }
+
+tap { it &&= 1 }
+
+tap { it; it += 1 }
+
+tap { it; it ||= 1 }
+
+tap { it; it &&= 1 }
+
+tap { it += 1; it }
+
+tap { it ||= 1; it }
+
+tap { it &&= 1; it }
+
+tap { it; it += 1; it }
+
+tap { it; it ||= 1; it }
+
+tap { it; it &&= 1; it }
diff --git a/test/mri/prism/fixtures/3.4/it_read_and_assignment.txt b/test/mri/prism/fixtures/3.4/it_read_and_assignment.txt
new file mode 100644
index 00000000000..2cceeb2a548
--- /dev/null
+++ b/test/mri/prism/fixtures/3.4/it_read_and_assignment.txt
@@ -0,0 +1 @@
+42.tap { p it; it = it; p it }
diff --git a/test/mri/prism/fixtures/4.0/endless_methods_command_call.txt b/test/mri/prism/fixtures/4.0/endless_methods_command_call.txt
new file mode 100644
index 00000000000..91a9d156d55
--- /dev/null
+++ b/test/mri/prism/fixtures/4.0/endless_methods_command_call.txt
@@ -0,0 +1,8 @@
+private def foo = puts "Hello"
+private def foo = puts "Hello", "World"
+private def foo = puts "Hello" do expr end
+private def foo() = puts "Hello"
+private def foo(x) = puts x
+private def obj.foo = puts "Hello"
+private def obj.foo() = puts "Hello"
+private def obj.foo(x) = puts x
diff --git a/test/mri/prism/fixtures/4.0/leading_logical.txt b/test/mri/prism/fixtures/4.0/leading_logical.txt
new file mode 100644
index 00000000000..feb5ee245c8
--- /dev/null
+++ b/test/mri/prism/fixtures/4.0/leading_logical.txt
@@ -0,0 +1,21 @@
+1
+&& 2
+&& 3
+
+1
+|| 2
+|| 3
+
+1
+and 2
+and 3
+
+1
+or 2
+or 3
+
+1
+andfoo
+
+2
+orfoo
diff --git a/test/mri/prism/fixtures/begin_rescue.txt b/test/mri/prism/fixtures/begin_rescue.txt
index 0a56fbef9f5..790574f4ffe 100644
--- a/test/mri/prism/fixtures/begin_rescue.txt
+++ b/test/mri/prism/fixtures/begin_rescue.txt
@@ -2,6 +2,12 @@ begin; a; rescue; b; else; c; end
 
 begin; a; rescue; b; else; c; ensure; d; end
 
+begin; rescue ; end
+
+begin; rescue ; ensure ; end
+
+begin; rescue ; else ; end
+
 begin
 a
 end
diff --git a/test/mri/prism/fixtures/break.txt b/test/mri/prism/fixtures/break.txt
index 5532322c5ce..d823f866df7 100644
--- a/test/mri/prism/fixtures/break.txt
+++ b/test/mri/prism/fixtures/break.txt
@@ -20,6 +20,10 @@ tap { break() }
 
 tap { break(1) }
 
+tap { (break 1) }
+
+tap { foo && (break 1) }
+
 foo { break 42 } == 42
 
 foo { |a| break } == 42
diff --git a/test/mri/prism/fixtures/case_in_hash_key.txt b/test/mri/prism/fixtures/case_in_hash_key.txt
new file mode 100644
index 00000000000..75ac8a846f7
--- /dev/null
+++ b/test/mri/prism/fixtures/case_in_hash_key.txt
@@ -0,0 +1,6 @@
+case 1
+in 2
+  A.print message:
+in 3
+  A.print message:
+end
diff --git a/test/mri/prism/fixtures/character_literal.txt b/test/mri/prism/fixtures/character_literal.txt
new file mode 100644
index 00000000000..920332123f1
--- /dev/null
+++ b/test/mri/prism/fixtures/character_literal.txt
@@ -0,0 +1,2 @@
+# encoding: Windows-31J
+p ?\u3042""
diff --git a/test/mri/prism/fixtures/command_method_call_2.txt b/test/mri/prism/fixtures/command_method_call_2.txt
new file mode 100644
index 00000000000..165c45987aa
--- /dev/null
+++ b/test/mri/prism/fixtures/command_method_call_2.txt
@@ -0,0 +1,3 @@
+foo(bar baz do end)
+
+foo(bar baz, bat)
diff --git a/test/mri/prism/fixtures/command_method_call_3.txt b/test/mri/prism/fixtures/command_method_call_3.txt
new file mode 100644
index 00000000000..6de0446aa9b
--- /dev/null
+++ b/test/mri/prism/fixtures/command_method_call_3.txt
@@ -0,0 +1,19 @@
+foo(bar 1, key => '2')
+
+foo(bar 1, KEY => '2')
+
+foo(bar 1, :key => '2')
+
+foo(bar 1, { baz: :bat } => '2')
+
+foo bar - %i[baz] => '2'
+
+foo(bar {} => '2')
+
+foo(bar baz {} => '2')
+
+foo(bar do end => '2')
+
+foo(1, bar {} => '2')
+
+foo(1, bar do end => '2')
diff --git a/test/mri/prism/fixtures/comment_single.txt b/test/mri/prism/fixtures/comment_single.txt
new file mode 100644
index 00000000000..72037a6ea1a
--- /dev/null
+++ b/test/mri/prism/fixtures/comment_single.txt
@@ -0,0 +1 @@
+foo # Bar
\ No newline at end of file
diff --git a/test/mri/prism/fixtures/defined.txt b/test/mri/prism/fixtures/defined.txt
index 247fa94e3a4..09fc0a29e74 100644
--- a/test/mri/prism/fixtures/defined.txt
+++ b/test/mri/prism/fixtures/defined.txt
@@ -8,3 +8,12 @@ defined? 1
 
 defined?("foo"
 )
+
+defined?
+1
+
+defined?
+(1)
+
+defined?
+()
diff --git a/test/mri/prism/fixtures/dstring.txt b/test/mri/prism/fixtures/dstring.txt
index 085e0c6852a..ef698d8fe9a 100644
--- a/test/mri/prism/fixtures/dstring.txt
+++ b/test/mri/prism/fixtures/dstring.txt
@@ -27,3 +27,16 @@ foo\\\\
 "
 foo\\\\\
 "
+
+"
+foo\
+b\nar
+#{}
+"
+
+"foo
+\n#{}bar\n\n#{}
+a\nb\n#{}\nc\n"
+
+"
+’"
diff --git a/test/mri/prism/fixtures/dsym_str.txt b/test/mri/prism/fixtures/dsym_str.txt
index ee68dde88d5..0af0a8ddaf7 100644
--- a/test/mri/prism/fixtures/dsym_str.txt
+++ b/test/mri/prism/fixtures/dsym_str.txt
@@ -1,2 +1,5 @@
 :"foo
   bar"
+
+:"
+’"
diff --git a/test/mri/prism/fixtures/encoding_binary.txt b/test/mri/prism/fixtures/encoding_binary.txt
new file mode 100644
index 00000000000..f3dfc85abd3
--- /dev/null
+++ b/test/mri/prism/fixtures/encoding_binary.txt
@@ -0,0 +1,9 @@
+# encoding: binary
+
+"\xcd"
+
+:"\xcd"
+
+/#{"\xcd"}/
+
+%W[\xC0]
diff --git a/test/mri/prism/fixtures/encoding_euc_jp.txt b/test/mri/prism/fixtures/encoding_euc_jp.txt
new file mode 100644
index 00000000000..bbee76eae51
--- /dev/null
+++ b/test/mri/prism/fixtures/encoding_euc_jp.txt
@@ -0,0 +1,6 @@
+# encoding: euc-jp
+
+# \x8E indicates a double-byte character, \x01 is not a valid second byte in euc-jp
+"\x8E\x01"
+
+%W["\x8E\x01"]
diff --git a/test/mri/prism/fixtures/endless_method_as_default_arg.txt b/test/mri/prism/fixtures/endless_method_as_default_arg.txt
new file mode 100644
index 00000000000..0063d9a8fa6
--- /dev/null
+++ b/test/mri/prism/fixtures/endless_method_as_default_arg.txt
@@ -0,0 +1,11 @@
+def foo(a = def f = 1); end
+
+def foo(a = def f = 1, b); end
+
+def foo(b, a = def f = 1); end
+
+def foo(a: def f = 1); end
+
+def foo(a = def f = 1+2); end
+
+->(a = def f = 1) {}
diff --git a/test/mri/prism/fixtures/endless_methods.txt b/test/mri/prism/fixtures/endless_methods.txt
index 8c2f2a30cc5..7eb3bf43189 100644
--- a/test/mri/prism/fixtures/endless_methods.txt
+++ b/test/mri/prism/fixtures/endless_methods.txt
@@ -3,3 +3,5 @@ def foo = 1
 def bar = A ""
 
 def method = 1 + 2 + 3
+
+x = def f = p 1
diff --git a/test/mri/prism/fixtures/heredoc_percent_q_newline_delimiter.txt b/test/mri/prism/fixtures/heredoc_percent_q_newline_delimiter.txt
new file mode 100644
index 00000000000..dbfa0bf4b4a
--- /dev/null
+++ b/test/mri/prism/fixtures/heredoc_percent_q_newline_delimiter.txt
@@ -0,0 +1,22 @@
+%Q
+#{<<B}
+B
+
+%
+#{<<B}
+B
+
+<<A; %Q
+A
+#{<<B}
+B
+
+<<A; %
+A
+#{<<B}
+B
+
+# \r\n
+%Q
+#{<<B}
+B
diff --git a/test/mri/prism/fixtures/heredocs_with_fake_newlines.txt b/test/mri/prism/fixtures/heredocs_with_fake_newlines.txt
new file mode 100644
index 00000000000..887b7ab5e76
--- /dev/null
+++ b/test/mri/prism/fixtures/heredocs_with_fake_newlines.txt
@@ -0,0 +1,55 @@
+<<-RUBY
+  \n
+  \n
+  exit
+  \\n
+  \n\n\n\n
+  argh
+  \\
+  \\\
+  foo\nbar
+  \f
+  ok
+RUBY
+
+<<~RUBY
+  \n
+  \n
+  exit
+  \\n
+  \n\n\n\n
+  argh
+  \\
+  \\\
+  foo\nbar
+  \f
+  ok
+RUBY
+
+<<~RUBY
+  #{123}\n
+  \n
+  exit
+  \\#{123}n
+  \n#{123}\n\n\n
+  argh
+  \\#{123}baz
+  \\\
+  foo\nbar
+  \f
+  ok
+RUBY
+
+<<'RUBY'
+  \n
+  \n
+  exit
+  \n
+  \n\n\n\n
+  argh
+  \
+  \
+  foo\nbar
+  \f
+  ok
+RUBY
diff --git a/test/mri/prism/fixtures/it_assignment.txt b/test/mri/prism/fixtures/it_assignment.txt
new file mode 100644
index 00000000000..523b0ffe1e1
--- /dev/null
+++ b/test/mri/prism/fixtures/it_assignment.txt
@@ -0,0 +1 @@
+42.tap { it = it; p it }
diff --git a/test/mri/prism/fixtures/keyword_method_names.txt b/test/mri/prism/fixtures/keyword_method_names.txt
index 91544694410..d3b6eac5379 100644
--- a/test/mri/prism/fixtures/keyword_method_names.txt
+++ b/test/mri/prism/fixtures/keyword_method_names.txt
@@ -12,18 +12,9 @@ end
 def m(a, **nil)
 end
 
-def __ENCODING__.a
-end
-
 %{abc}
 
 %"abc"
 
-def __FILE__.a
-end
-
-def __LINE__.a
-end
-
 def nil::a
 end
diff --git a/test/mri/prism/fixtures/lambda.txt b/test/mri/prism/fixtures/lambda.txt
index dfe833509f9..8d67b4dd79f 100644
--- a/test/mri/prism/fixtures/lambda.txt
+++ b/test/mri/prism/fixtures/lambda.txt
@@ -10,6 +10,10 @@
 
 -> foo: bar do end
 
+def foo(*, **)
+  ->() { bar(*, **) }
+end
+
 p{|a:
 b|}
 
diff --git a/test/mri/prism/fixtures/methods.txt b/test/mri/prism/fixtures/methods.txt
index d59196bdfdf..eb0a5ca3dcf 100644
--- a/test/mri/prism/fixtures/methods.txt
+++ b/test/mri/prism/fixtures/methods.txt
@@ -109,6 +109,8 @@ def foo = 123
 
 def a(*); b(*); end
 
+def a(*, **); b { c(*, **) }; end
+
 def a(...); b(...); end
 
 def a(...); b(1, 2, ...); end
diff --git a/test/mri/prism/fixtures/next.txt b/test/mri/prism/fixtures/next.txt
index 2ef14c6304e..0d2d6a11f50 100644
--- a/test/mri/prism/fixtures/next.txt
+++ b/test/mri/prism/fixtures/next.txt
@@ -22,3 +22,7 @@ tap { next
 tap { next() }
 
 tap { next(1) }
+
+tap { (next 1) }
+
+tap { foo && (next 1) }
diff --git a/test/mri/prism/fixtures/patterns.txt b/test/mri/prism/fixtures/patterns.txt
index f4f3489e4d9..449dac619b4 100644
--- a/test/mri/prism/fixtures/patterns.txt
+++ b/test/mri/prism/fixtures/patterns.txt
@@ -212,8 +212,13 @@ foo => Object[{x:}]
 
 case (); in [_a, _a]; end
 case (); in [{a:1}, {a:2}]; end
+a => ^({'a' => 'b'})
 
 a in b, and c
 a in b, or c
 (a in b,) and c
 (a in b,) or c
+
+x => ^([*a.x])
+x => ^([**a.x])
+x => ^({ a: })
diff --git a/test/mri/prism/fixtures/ranges.txt b/test/mri/prism/fixtures/ranges.txt
index e2e4136ae96..87eac6d2419 100644
--- a/test/mri/prism/fixtures/ranges.txt
+++ b/test/mri/prism/fixtures/ranges.txt
@@ -2,6 +2,8 @@
 
 (..2)
 
+foo ((1..1))
+
 1...2
 
 foo[...2]
diff --git a/test/mri/prism/fixtures/regex.txt b/test/mri/prism/fixtures/regex.txt
index 4623733f589..712bfc081ac 100644
--- a/test/mri/prism/fixtures/regex.txt
+++ b/test/mri/prism/fixtures/regex.txt
@@ -46,3 +46,13 @@ tap { /(?<a>)/ =~ to_s }
 def foo(nil:) = /(?<nil>)/ =~ ""
 
 /(?-x:#)/x
+
+/a
+b\
+c\
+d\\\
+e\\
+f\
+/
+
+//
diff --git a/test/mri/prism/fixtures/regex_with_fake_newlines.txt b/test/mri/prism/fixtures/regex_with_fake_newlines.txt
new file mode 100644
index 00000000000..d92a2e4adea
--- /dev/null
+++ b/test/mri/prism/fixtures/regex_with_fake_newlines.txt
@@ -0,0 +1,41 @@
+/
+  \n
+  \n
+  exit
+  \\n
+  \n\n\n\n
+  argh
+  \\
+  \\\
+  foo\nbar
+  \f
+  ok
+/
+
+%r{
+  \n
+  \n
+  exit
+  \\n
+  \n\n\n\n
+  argh
+  \\
+  \\\
+  foo\nbar
+  \f
+  ok
+}
+
+%r{
+  #{123}\n
+  \n
+  exit\\\
+  \\#{123}n
+  \n#{123}\n\n\n
+  argh\
+  \\#{123}baz\\
+  \\\
+  foo\nbar
+  \f
+  ok
+}
diff --git a/test/mri/prism/fixtures/rescue.txt b/test/mri/prism/fixtures/rescue.txt
index 99170fbe0ff..f4364630291 100644
--- a/test/mri/prism/fixtures/rescue.txt
+++ b/test/mri/prism/fixtures/rescue.txt
@@ -33,3 +33,7 @@ end
 foo if bar rescue baz
 
 z = x y rescue c d
+
+begin
+rescue => A[]
+end
diff --git a/test/mri/prism/fixtures/return.txt b/test/mri/prism/fixtures/return.txt
index a8b5b95fabe..952fb80da85 100644
--- a/test/mri/prism/fixtures/return.txt
+++ b/test/mri/prism/fixtures/return.txt
@@ -22,3 +22,6 @@ return()
 
 return(1)
 
+(return 1)
+
+foo && (return 1)
diff --git a/test/mri/prism/fixtures/seattlerb/block_break.txt b/test/mri/prism/fixtures/seattlerb/block_break.txt
deleted file mode 100644
index 35eabee187b..00000000000
--- a/test/mri/prism/fixtures/seattlerb/block_break.txt
+++ /dev/null
@@ -1 +0,0 @@
-break foo arg do |bar| end
diff --git a/test/mri/prism/fixtures/seattlerb/block_next.txt b/test/mri/prism/fixtures/seattlerb/block_next.txt
deleted file mode 100644
index 760fcbf8098..00000000000
--- a/test/mri/prism/fixtures/seattlerb/block_next.txt
+++ /dev/null
@@ -1 +0,0 @@
-next foo arg do |bar| end
diff --git a/test/mri/prism/fixtures/seattlerb/dasgn_icky2.txt b/test/mri/prism/fixtures/seattlerb/dasgn_icky2.txt
deleted file mode 100644
index 2f50d323041..00000000000
--- a/test/mri/prism/fixtures/seattlerb/dasgn_icky2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-a do
-  v = nil
-  begin
-    yield
-  rescue Exception => v
-    break
-  end
-end
diff --git a/test/mri/prism/fixtures/seattlerb/yield_arg.txt b/test/mri/prism/fixtures/seattlerb/yield_arg.txt
deleted file mode 100644
index 7e752f62e25..00000000000
--- a/test/mri/prism/fixtures/seattlerb/yield_arg.txt
+++ /dev/null
@@ -1 +0,0 @@
-yield 42
diff --git a/test/mri/prism/fixtures/seattlerb/yield_call_assocs.txt b/test/mri/prism/fixtures/seattlerb/yield_call_assocs.txt
deleted file mode 100644
index 95963dfcf9b..00000000000
--- a/test/mri/prism/fixtures/seattlerb/yield_call_assocs.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-yield 1, :z => 1
-
-yield 1, :z => 1, :w => 2
-
-yield y :z=>1
-
-yield y z:1
-
-yield y(z:1)
-
-yield y(z=>1)
diff --git a/test/mri/prism/fixtures/seattlerb/yield_empty_parens.txt b/test/mri/prism/fixtures/seattlerb/yield_empty_parens.txt
deleted file mode 100644
index cff86b243ad..00000000000
--- a/test/mri/prism/fixtures/seattlerb/yield_empty_parens.txt
+++ /dev/null
@@ -1 +0,0 @@
-yield()
diff --git a/test/mri/prism/fixtures/string_concatination_frozen_false.txt b/test/mri/prism/fixtures/string_concatination_frozen_false.txt
new file mode 100644
index 00000000000..abe9301408e
--- /dev/null
+++ b/test/mri/prism/fixtures/string_concatination_frozen_false.txt
@@ -0,0 +1,5 @@
+# frozen_string_literal: false
+
+'foo' 'bar'
+
+'foo' 'bar' "baz#{bat}"
diff --git a/test/mri/prism/fixtures/string_concatination_frozen_true.txt b/test/mri/prism/fixtures/string_concatination_frozen_true.txt
new file mode 100644
index 00000000000..829777f0a70
--- /dev/null
+++ b/test/mri/prism/fixtures/string_concatination_frozen_true.txt
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+'foo' 'bar'
+
+'foo' 'bar' "baz#{bat}"
diff --git a/test/mri/prism/fixtures/strings.txt b/test/mri/prism/fixtures/strings.txt
index 6963d75b2da..1419f975b7b 100644
--- a/test/mri/prism/fixtures/strings.txt
+++ b/test/mri/prism/fixtures/strings.txt
@@ -40,6 +40,15 @@
 #
 "bar"
 
+"
+foo\
+b\nar
+"
+
+"foo
+\nbar\n\n
+a\nb\n\nc\n"
+
 %q{abc}
 
 %s[abc]
@@ -64,6 +73,62 @@
 
 %w[foo\ bar baz]
 
+%w[foo\ bar\\ baz\\\
+ bat]
+
+%W[#{foo}\
+bar
+baz #{bat}
+]
+
+%w(foo\n)
+
+%w(foo\
+)
+
+%w(foo \n)
+
+%W(foo\
+bar)
+
+%w[foo     bar]
+
+%w[
+  a   
+  b   c  
+ d   
+]
+
+%w[
+  foo\nbar baz\n\n\
+  bat\n\\\n\foo
+]
+
+%W[
+  foo\nbar baz\n\n\
+  bat\n\\\n\foo
+]
+
+%w[foo\
+  bar
+  baz\\
+  bat
+  1\n
+  2
+  3\\n
+]
+
+%W[foo\
+  bar
+  baz\\
+  bat
+  1\n
+  2
+  3\\n
+]
+
+%W[f\u{006f 006f}]
+
 %W[a b#{c}d e]
 
 %W[a b c]
@@ -78,6 +143,11 @@
 
 '\\ foo \\ bar'
 
+'foo\
+bar\\
+baz
+'
+
 "#$foo"
 
 "#@foo"
@@ -86,6 +156,10 @@
 
 "\7 \43 \141"
 
+"ち\xE3\x81\xFF"
+
+"\777"
+
 %[abc]
 
 %(abc)
@@ -100,6 +174,10 @@
 
 %Q{abc}
 
+%Q(\«)
+
+%q(\«)
+
 %^#$^#
 
 %@#@#
diff --git a/test/mri/prism/fixtures/symbols.txt b/test/mri/prism/fixtures/symbols.txt
index 7563eb874f6..34895b9e9fd 100644
--- a/test/mri/prism/fixtures/symbols.txt
+++ b/test/mri/prism/fixtures/symbols.txt
@@ -4,6 +4,17 @@
 
 :"abc#{1}"
 
+:"
+foo\
+b\nar
+"
+
+:"
+foo\
+b\nar
+#{}
+"
+
 [:Υ, :ά, :ŗ, :ρ]
 
 :-@
diff --git a/test/mri/prism/fixtures/unary_method_calls.txt b/test/mri/prism/fixtures/unary_method_calls.txt
new file mode 100644
index 00000000000..dda85e4bdbf
--- /dev/null
+++ b/test/mri/prism/fixtures/unary_method_calls.txt
@@ -0,0 +1,2 @@
+42.~@
+42.!@
diff --git a/test/mri/prism/fixtures/unparser/corpus/literal/control.txt b/test/mri/prism/fixtures/unparser/corpus/literal/control.txt
deleted file mode 100644
index 648782bc962..00000000000
--- a/test/mri/prism/fixtures/unparser/corpus/literal/control.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-next
-return
-break
-retry
-redo
-return 1
-return 1, 2
-return true ? 1 : 2
-break true ? 1 : 2
-next true ? 1 : 2
-return true, if true
-  1
-else
-  2
-end
diff --git a/test/mri/prism/fixtures/unparser/corpus/literal/yield.txt b/test/mri/prism/fixtures/unparser/corpus/literal/yield.txt
deleted file mode 100644
index c0b58208424..00000000000
--- a/test/mri/prism/fixtures/unparser/corpus/literal/yield.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-yield
-yield(a)
-yield(a, b)
diff --git a/test/mri/prism/fixtures/variables.txt b/test/mri/prism/fixtures/variables.txt
index 1545c30c80f..4f4dc6f9c82 100644
--- a/test/mri/prism/fixtures/variables.txt
+++ b/test/mri/prism/fixtures/variables.txt
@@ -45,3 +45,5 @@ Foo = 1, 2
 (a; b; c)
 
 a, (b, c), d = []
+
+(a,), = []
diff --git a/test/mri/prism/fixtures/whitequark/LICENSE b/test/mri/prism/fixtures/whitequark/LICENSE
index 971310e3d68..43f97889853 100644
--- a/test/mri/prism/fixtures/whitequark/LICENSE
+++ b/test/mri/prism/fixtures/whitequark/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) 2013-2016 whitequark  <whitequark@whitequark.org>
+Copyright (c) 2013-2024 parser project contributors
+Copyright (c) 2013-2016 Catherine  <whitequark@whitequark.org>
 
 Parts of the source are derived from ruby_parser:
 Copyright (c) Ryan Davis, seattle.rb
diff --git a/test/mri/prism/fixtures/whitequark/arg_combinations.txt b/test/mri/prism/fixtures/whitequark/arg_combinations.txt
new file mode 100644
index 00000000000..801b1e47f4c
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/arg_combinations.txt
@@ -0,0 +1,29 @@
+def f &b; end
+
+def f *r, &b; end
+
+def f *r, p, &b; end
+
+def f ; end
+
+def f a, &b; end
+
+def f a, *r, &b; end
+
+def f a, *r, p, &b; end
+
+def f a, o=1, &b; end
+
+def f a, o=1, *r, &b; end
+
+def f a, o=1, *r, p, &b; end
+
+def f a, o=1, p, &b; end
+
+def f o=1, &b; end
+
+def f o=1, *r, &b; end
+
+def f o=1, *r, p, &b; end
+
+def f o=1, p, &b; end
diff --git a/test/mri/prism/fixtures/whitequark/args_assocs.txt b/test/mri/prism/fixtures/whitequark/args_assocs.txt
deleted file mode 100644
index b33e1311818..00000000000
--- a/test/mri/prism/fixtures/whitequark/args_assocs.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-fun(:foo => 1)
-
-fun(:foo => 1, &baz)
-
-self.[]= foo, :a => 1
-
-self[:bar => 1]
-
-super(:foo => 42)
-
-yield(:foo => 42)
diff --git a/test/mri/prism/fixtures/whitequark/args_assocs_legacy.txt b/test/mri/prism/fixtures/whitequark/args_assocs_legacy.txt
deleted file mode 100644
index b33e1311818..00000000000
--- a/test/mri/prism/fixtures/whitequark/args_assocs_legacy.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-fun(:foo => 1)
-
-fun(:foo => 1, &baz)
-
-self.[]= foo, :a => 1
-
-self[:bar => 1]
-
-super(:foo => 42)
-
-yield(:foo => 42)
diff --git a/test/mri/prism/fixtures/whitequark/block_arg_combinations.txt b/test/mri/prism/fixtures/whitequark/block_arg_combinations.txt
new file mode 100644
index 00000000000..ccb9cfea56c
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/block_arg_combinations.txt
@@ -0,0 +1,57 @@
+f{  }
+
+f{ | | }
+
+f{ |&b| }
+
+f{ |*, &b| }
+
+f{ |*r, p, &b| }
+
+f{ |*s, &b| }
+
+f{ |*s| }
+
+f{ |*| }
+
+f{ |;
+a
+| }
+
+f{ |;a| }
+
+f{ |a, &b| }
+
+f{ |a, *, &b| }
+
+f{ |a, *r, p, &b| }
+
+f{ |a, *s, &b| }
+
+f{ |a, *s| }
+
+f{ |a, *| }
+
+f{ |a, c| }
+
+f{ |a, o=1, &b| }
+
+f{ |a, o=1, *r, p, &b| }
+
+f{ |a, o=1, o1=2, *r, &b| }
+
+f{ |a, o=1, p, &b| }
+
+f{ |a,| }
+
+f{ |a| }
+
+f{ |o=1, &b| }
+
+f{ |o=1, *r, &b| }
+
+f{ |o=1, *r, p, &b| }
+
+f{ |o=1, p, &b| }
+
+f{ || }
diff --git a/test/mri/prism/fixtures/whitequark/block_kwarg.txt b/test/mri/prism/fixtures/whitequark/block_kwarg.txt
new file mode 100644
index 00000000000..9f1283371f4
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/block_kwarg.txt
@@ -0,0 +1 @@
+f{ |foo:| }
diff --git a/test/mri/prism/fixtures/whitequark/block_kwarg_combinations.txt b/test/mri/prism/fixtures/whitequark/block_kwarg_combinations.txt
new file mode 100644
index 00000000000..3dbb961777a
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/block_kwarg_combinations.txt
@@ -0,0 +1,5 @@
+f{ |**baz, &b| }
+
+f{ |foo: 1, &b| }
+
+f{ |foo: 1, bar: 2, **baz, &b| }
diff --git a/test/mri/prism/fixtures/whitequark/break.txt b/test/mri/prism/fixtures/whitequark/break.txt
deleted file mode 100644
index da51ec7c31e..00000000000
--- a/test/mri/prism/fixtures/whitequark/break.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-break
-
-break foo
-
-break()
-
-break(foo)
diff --git a/test/mri/prism/fixtures/whitequark/break_block.txt b/test/mri/prism/fixtures/whitequark/break_block.txt
deleted file mode 100644
index 4b58c58d5ea..00000000000
--- a/test/mri/prism/fixtures/whitequark/break_block.txt
+++ /dev/null
@@ -1 +0,0 @@
-break fun foo do end
diff --git a/test/mri/prism/fixtures/whitequark/class_definition_in_while_cond.txt b/test/mri/prism/fixtures/whitequark/class_definition_in_while_cond.txt
deleted file mode 100644
index 10427314b59..00000000000
--- a/test/mri/prism/fixtures/whitequark/class_definition_in_while_cond.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-while class << self; a = tap do end; end; break; end
-
-while class << self; tap do end; end; break; end
-
-while class Foo a = tap do end; end; break; end
-
-while class Foo; tap do end; end; break; end
diff --git a/test/mri/prism/fixtures/whitequark/emit_arg_inside_procarg0_legacy.txt b/test/mri/prism/fixtures/whitequark/emit_arg_inside_procarg0_legacy.txt
new file mode 100644
index 00000000000..a985f15b6e0
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/emit_arg_inside_procarg0_legacy.txt
@@ -0,0 +1 @@
+f{ |a| }
diff --git a/test/mri/prism/fixtures/whitequark/find_pattern.txt b/test/mri/prism/fixtures/whitequark/find_pattern.txt
new file mode 100644
index 00000000000..fb8999ae288
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/find_pattern.txt
@@ -0,0 +1,7 @@
+case foo; in *, 42, * then true; end
+
+case foo; in Array[*, 1, *] then true; end
+
+case foo; in String(*, 1, *) then true; end
+
+case foo; in [*x, 1 => a, *y] then true; end
diff --git a/test/mri/prism/fixtures/whitequark/if_while_after_class__since_32.txt b/test/mri/prism/fixtures/whitequark/if_while_after_class__since_32.txt
deleted file mode 100644
index 1552494d28c..00000000000
--- a/test/mri/prism/fixtures/whitequark/if_while_after_class__since_32.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-class if true; Object end::Kernel; end
-
-class while true; break Object end::Kernel; end
-
-module if true; Object end::Kernel; end
-
-module while true; break Object end::Kernel; end
diff --git a/test/mri/prism/fixtures/whitequark/kwarg_combinations.txt b/test/mri/prism/fixtures/whitequark/kwarg_combinations.txt
new file mode 100644
index 00000000000..1bd792856e2
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/kwarg_combinations.txt
@@ -0,0 +1,7 @@
+def f (foo: 1, &b); end
+
+def f (foo: 1, bar: 2, **baz, &b); end
+
+def f **baz, &b; end
+
+def f *, **; end
diff --git a/test/mri/prism/fixtures/whitequark/kwarg_no_paren.txt b/test/mri/prism/fixtures/whitequark/kwarg_no_paren.txt
new file mode 100644
index 00000000000..cf29c273d0d
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/kwarg_no_paren.txt
@@ -0,0 +1,5 @@
+def f foo:
+; end
+
+def f foo: -1
+; end
diff --git a/test/mri/prism/fixtures/whitequark/lvar_injecting_match.txt b/test/mri/prism/fixtures/whitequark/lvar_injecting_match.txt
index ba814a1088a..2d18c84b571 100644
--- a/test/mri/prism/fixtures/whitequark/lvar_injecting_match.txt
+++ b/test/mri/prism/fixtures/whitequark/lvar_injecting_match.txt
@@ -1 +1,3 @@
+/(?<a>a)/ =~ 'a'; /#{}(?<b>b)/ =~ 'b'; a; b
+
 /(?<match>bar)/ =~ 'bar'; match
diff --git a/test/mri/prism/fixtures/whitequark/marg_combinations.txt b/test/mri/prism/fixtures/whitequark/marg_combinations.txt
new file mode 100644
index 00000000000..aff34dcb620
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/marg_combinations.txt
@@ -0,0 +1,19 @@
+def f (((a))); end
+
+def f ((*)); end
+
+def f ((*, p)); end
+
+def f ((*r)); end
+
+def f ((*r, p)); end
+
+def f ((a, *)); end
+
+def f ((a, *, p)); end
+
+def f ((a, *r)); end
+
+def f ((a, *r, p)); end
+
+def f ((a, a1)); end
diff --git a/test/mri/prism/fixtures/whitequark/multiple_args_with_trailing_comma.txt b/test/mri/prism/fixtures/whitequark/multiple_args_with_trailing_comma.txt
new file mode 100644
index 00000000000..b6907387578
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/multiple_args_with_trailing_comma.txt
@@ -0,0 +1 @@
+f{ |a, b,| }
diff --git a/test/mri/prism/fixtures/whitequark/next.txt b/test/mri/prism/fixtures/whitequark/next.txt
deleted file mode 100644
index 7556ac2b74b..00000000000
--- a/test/mri/prism/fixtures/whitequark/next.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-next
-
-next foo
-
-next()
-
-next(foo)
diff --git a/test/mri/prism/fixtures/whitequark/next_block.txt b/test/mri/prism/fixtures/whitequark/next_block.txt
deleted file mode 100644
index d3b51dfa218..00000000000
--- a/test/mri/prism/fixtures/whitequark/next_block.txt
+++ /dev/null
@@ -1 +0,0 @@
-next fun foo do end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_const_pattern.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_const_pattern.txt
new file mode 100644
index 00000000000..82821dbc83c
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_const_pattern.txt
@@ -0,0 +1,11 @@
+case foo; in A() then true; end
+
+case foo; in A(1, 2) then true; end
+
+case foo; in A(x:) then true; end
+
+case foo; in A[1, 2] then true; end
+
+case foo; in A[] then true; end
+
+case foo; in A[x:] then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_constants.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_constants.txt
new file mode 100644
index 00000000000..aba764ff356
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_constants.txt
@@ -0,0 +1,5 @@
+case foo; in ::A then true; end
+
+case foo; in A then true; end
+
+case foo; in A::B then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_explicit_array_match.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_explicit_array_match.txt
new file mode 100644
index 00000000000..61e518d0fba
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_explicit_array_match.txt
@@ -0,0 +1,19 @@
+case foo; in [*, x] then true; end
+
+case foo; in [*x, y] then true; end
+
+case foo; in [x, *, y] then true; end
+
+case foo; in [x, *y, z] then true; end
+
+case foo; in [x, y, *] then true; end
+
+case foo; in [x, y, *z] then true; end
+
+case foo; in [x, y,] then true; end
+
+case foo; in [x, y] then true; end
+
+case foo; in [x,] then nil; end
+
+case foo; in [x] then nil; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_expr_in_paren.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_expr_in_paren.txt
new file mode 100644
index 00000000000..9b2e91b70dc
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_expr_in_paren.txt
@@ -0,0 +1 @@
+case foo; in (1) then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_hash.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_hash.txt
new file mode 100644
index 00000000000..b26f2c59dca
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_hash.txt
@@ -0,0 +1,48 @@
+case foo; 
+        in a: {b:}, c:
+          p c
+      ; end
+
+case foo; 
+        in {Foo: 42
+        }
+          false
+      ; end
+
+case foo; 
+        in {a:
+              2}
+          false
+      ; end
+
+case foo; 
+        in {a:
+        }
+          true
+      ; end
+
+case foo; 
+        in {a: 1
+        }
+          false
+      ; end
+
+case foo; in ** then true; end
+
+case foo; in **a then true; end
+
+case foo; in a: 1 then true; end
+
+case foo; in a: 1, _a:, ** then true; end
+
+case foo; in a: 1, b: 2 then true; end
+
+case foo; in a: then true; end
+
+case foo; in a:, b: then true; end
+
+case foo; in { a: 1 } then true; end
+
+case foo; in { a: 1, } then true; end
+
+case foo; in {} then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_if_unless_modifiers.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_if_unless_modifiers.txt
new file mode 100644
index 00000000000..05ca3173554
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_if_unless_modifiers.txt
@@ -0,0 +1,3 @@
+case foo; in x if true; nil; end
+
+case foo; in x unless true; nil; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_implicit_array_match.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_implicit_array_match.txt
new file mode 100644
index 00000000000..360c5150a51
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_implicit_array_match.txt
@@ -0,0 +1,15 @@
+case foo; in * then nil; end
+
+case foo; in *x then nil; end
+
+case foo; in *x, y, z then nil; end
+
+case foo; in 1, "a", [], {} then nil; end
+
+case foo; in x, *y, z then nil; end
+
+case foo; in x, then nil; end
+
+case foo; in x, y then nil; end
+
+case foo; in x, y, then nil; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_keyword_variable.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_keyword_variable.txt
new file mode 100644
index 00000000000..83c7a06b09e
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_keyword_variable.txt
@@ -0,0 +1 @@
+case foo; in self then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_lambda.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_lambda.txt
new file mode 100644
index 00000000000..eeccdc70e0c
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_lambda.txt
@@ -0,0 +1 @@
+case foo; in ->{ 42 } then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_match_alt.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_match_alt.txt
new file mode 100644
index 00000000000..6c6549916d3
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_match_alt.txt
@@ -0,0 +1 @@
+case foo; in 1 | 2 then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_match_as.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_match_as.txt
new file mode 100644
index 00000000000..2a105f9f367
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_match_as.txt
@@ -0,0 +1 @@
+case foo; in 1 => a then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_nil_pattern.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_nil_pattern.txt
new file mode 100644
index 00000000000..46dce94a2dc
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_nil_pattern.txt
@@ -0,0 +1 @@
+case foo; in **nil then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_no_body.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_no_body.txt
new file mode 100644
index 00000000000..73b471d3521
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_no_body.txt
@@ -0,0 +1 @@
+case foo; in 1; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_ranges.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_ranges.txt
new file mode 100644
index 00000000000..7e603e77b05
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_ranges.txt
@@ -0,0 +1,11 @@
+case foo; in ...2 then true; end
+
+case foo; in ..2 then true; end
+
+case foo; in 1.. then true; end
+
+case foo; in 1... then true; end
+
+case foo; in 1...2 then true; end
+
+case foo; in 1..2 then true; end
diff --git a/test/mri/prism/fixtures/whitequark/pattern_matching_single_match.txt b/test/mri/prism/fixtures/whitequark/pattern_matching_single_match.txt
new file mode 100644
index 00000000000..c174376585d
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pattern_matching_single_match.txt
@@ -0,0 +1 @@
+case foo; in x then x; end
diff --git a/test/mri/prism/fixtures/whitequark/pin_expr.txt b/test/mri/prism/fixtures/whitequark/pin_expr.txt
new file mode 100644
index 00000000000..a072c7c1947
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/pin_expr.txt
@@ -0,0 +1,14 @@
+case foo; in ^$TestPatternMatching; end
+
+case foo; in ^(0+0) then nil; end
+
+case foo; in ^(1
+); end
+
+case foo; in ^(42) then nil; end
+
+case foo; in ^@@TestPatternMatching; end
+
+case foo; in ^@a; end
+
+case foo; in { foo: ^(42) } then nil; end
diff --git a/test/mri/prism/fixtures/whitequark/procarg0_legacy.txt b/test/mri/prism/fixtures/whitequark/procarg0_legacy.txt
new file mode 100644
index 00000000000..a985f15b6e0
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/procarg0_legacy.txt
@@ -0,0 +1 @@
+f{ |a| }
diff --git a/test/mri/prism/fixtures/whitequark/redo.txt b/test/mri/prism/fixtures/whitequark/redo.txt
deleted file mode 100644
index f49789cbab8..00000000000
--- a/test/mri/prism/fixtures/whitequark/redo.txt
+++ /dev/null
@@ -1 +0,0 @@
-redo
diff --git a/test/mri/prism/fixtures/whitequark/retry.txt b/test/mri/prism/fixtures/whitequark/retry.txt
deleted file mode 100644
index 77428f7b73e..00000000000
--- a/test/mri/prism/fixtures/whitequark/retry.txt
+++ /dev/null
@@ -1 +0,0 @@
-retry
diff --git a/test/mri/prism/fixtures/whitequark/ruby_bug_18878.txt b/test/mri/prism/fixtures/whitequark/ruby_bug_18878.txt
new file mode 100644
index 00000000000..583280c9e33
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/ruby_bug_18878.txt
@@ -0,0 +1 @@
+Foo::Bar { |a| 42 }
diff --git a/test/mri/prism/fixtures/whitequark/ruby_bug_19281.txt b/test/mri/prism/fixtures/whitequark/ruby_bug_19281.txt
new file mode 100644
index 00000000000..cd154f97569
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/ruby_bug_19281.txt
@@ -0,0 +1,7 @@
+a.b (1;2),(3),(4)
+
+a.b (;),(),()
+
+p (1;2),(3),(4)
+
+p (;),(),()
diff --git a/test/mri/prism/fixtures/whitequark/ruby_bug_19539.txt b/test/mri/prism/fixtures/whitequark/ruby_bug_19539.txt
new file mode 100644
index 00000000000..b2d052d94da
--- /dev/null
+++ b/test/mri/prism/fixtures/whitequark/ruby_bug_19539.txt
@@ -0,0 +1,9 @@
+<<' FOO'
+[Bug #19539]
+ FOO
+
+
+<<-' FOO'
+[Bug #19539]
+ FOO
+
diff --git a/test/mri/prism/fixtures/whitequark/yield.txt b/test/mri/prism/fixtures/whitequark/yield.txt
deleted file mode 100644
index 0ecf6395891..00000000000
--- a/test/mri/prism/fixtures/whitequark/yield.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-yield
-
-yield foo
-
-yield()
-
-yield(foo)
diff --git a/test/mri/prism/fixtures/xstring.txt b/test/mri/prism/fixtures/xstring.txt
index 7ec09468d8c..465a14e84bb 100644
--- a/test/mri/prism/fixtures/xstring.txt
+++ b/test/mri/prism/fixtures/xstring.txt
@@ -11,3 +11,11 @@
 ``
 
 %x{}
+
+`
+foo\
+b\nar
+`
+
+`
+’`
diff --git a/test/mri/prism/fixtures_test.rb b/test/mri/prism/fixtures_test.rb
index 7225b4ac66c..7df97029d3a 100644
--- a/test/mri/prism/fixtures_test.rb
+++ b/test/mri/prism/fixtures_test.rb
@@ -8,13 +8,25 @@ module Prism
   class FixturesTest < TestCase
     except = []
 
-    # Ruby < 3.3.0 cannot parse heredocs where there are leading whitespace
-    # characters in the heredoc start.
-    # Example: <<~'   EOF' or <<-'  EOF'
-    # https://bugs.ruby-lang.org/issues/19539
-    except << "heredocs_leading_whitespace.txt" if RUBY_VERSION < "3.3.0"
+    if RUBY_VERSION < "3.3.0"
+      # Ruby < 3.3.0 cannot parse heredocs where there are leading whitespace
+      # characters in the heredoc start.
+      # Example: <<~'   EOF' or <<-'  EOF'
+      # https://bugs.ruby-lang.org/issues/19539
+      except << "heredocs_leading_whitespace.txt"
+      except << "whitequark/ruby_bug_19539.txt"
 
-    Fixture.each(except: except) do |fixture|
+      # https://bugs.ruby-lang.org/issues/19025
+      except << "whitequark/numparam_ruby_bug_19025.txt"
+      # https://bugs.ruby-lang.org/issues/18878
+      except << "whitequark/ruby_bug_18878.txt"
+      # https://bugs.ruby-lang.org/issues/19281
+      except << "whitequark/ruby_bug_19281.txt"
+    end
+
+    except << "command_method_call_2.txt"
+
+    Fixture.each_for_current_ruby(except: except) do |fixture|
       define_method(fixture.test_name) { assert_valid_syntax(fixture.read) }
     end
   end
diff --git a/test/mri/prism/format_errors_test.rb b/test/mri/prism/format_errors_test.rb
deleted file mode 100644
index a1edbef2e86..00000000000
--- a/test/mri/prism/format_errors_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if Prism::BACKEND == :FFI
-
-module Prism
-  class FormatErrorsTest < TestCase
-    def test_format_errors
-      assert_equal <<~ERROR, Debug.format_errors("<>", false)
-        > 1 | <>
-            | ^ unexpected '<', ignoring it
-            |  ^ unexpected '>', ignoring it
-      ERROR
-
-      assert_equal <<~'ERROR', Debug.format_errors('"%W"\u"', false)
-        > 1 | "%W"\u"
-            |     ^ unexpected backslash, ignoring it
-            |      ^ unexpected local variable or method, expecting end-of-input
-            |        ^ unterminated string meets end of file
-      ERROR
-    end
-  end
-end
diff --git a/test/mri/prism/integer_parse_test.rb b/test/mri/prism/integer_parse_test.rb
deleted file mode 100644
index f42e817e793..00000000000
--- a/test/mri/prism/integer_parse_test.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if Prism::BACKEND == :FFI
-
-module Prism
-  class IntegerParseTest < TestCase
-    def test_integer_parse
-      assert_integer_parse(1)
-      assert_integer_parse(50)
-      assert_integer_parse(100)
-      assert_integer_parse(100, "1_0_0")
-      assert_integer_parse(8, "0_1_0")
-
-      assert_integer_parse(10, "0b1010")
-      assert_integer_parse(10, "0B1010")
-      assert_integer_parse(10, "0o12")
-      assert_integer_parse(10, "0O12")
-      assert_integer_parse(10, "012")
-      assert_integer_parse(10, "0d10")
-      assert_integer_parse(10, "0D10")
-      assert_integer_parse(10, "0xA")
-      assert_integer_parse(10, "0XA")
-
-      assert_integer_parse(2**32)
-      assert_integer_parse(2**64 + 2**32)
-      assert_integer_parse(2**128 + 2**64 + 2**32)
-
-      num = 99 ** 99
-      assert_integer_parse(num, "0b#{num.to_s(2)}")
-      assert_integer_parse(num, "0o#{num.to_s(8)}")
-      assert_integer_parse(num, "0d#{num.to_s(10)}")
-      assert_integer_parse(num, "0x#{num.to_s(16)}")
-    end
-
-    private
-
-    def assert_integer_parse(expected, source = expected.to_s)
-      integer, string = Debug.integer_parse(source)
-      assert_equal expected, integer
-      assert_equal expected.to_s, string
-    end
-  end
-end
diff --git a/test/mri/prism/lex_test.rb b/test/mri/prism/lex_test.rb
index 7eac677ef70..68e47a09640 100644
--- a/test/mri/prism/lex_test.rb
+++ b/test/mri/prism/lex_test.rb
@@ -7,15 +7,13 @@
 module Prism
   class LexTest < TestCase
     except = [
-      # It seems like there are some oddities with nested heredocs and ripper.
-      # Waiting for feedback on https://bugs.ruby-lang.org/issues/19838.
-      "seattlerb/heredoc_nested.txt",
-      "whitequark/dedenting_heredoc.txt",
-      # Ripper seems to have a bug that the regex portions before and after
-      # the heredoc are combined into a single token. See
-      # https://bugs.ruby-lang.org/issues/19838.
+      # https://bugs.ruby-lang.org/issues/21756
       "spanning_heredoc.txt",
-      "spanning_heredoc_newlines.txt"
+      # Prism emits a single string in some cases when ripper splits them up
+      "whitequark/dedenting_heredoc.txt",
+      "heredocs_with_fake_newlines.txt",
+      # Prism emits BEG for `on_regexp_end`
+      "spanning_heredoc_newlines.txt",
     ]
 
     if RUBY_VERSION < "3.3.0"
@@ -28,9 +26,20 @@ class LexTest < TestCase
       # Example: <<~'   EOF' or <<-'  EOF'
       # https://bugs.ruby-lang.org/issues/19539
       except << "heredocs_leading_whitespace.txt"
+      except << "whitequark/ruby_bug_19539.txt"
+
+      # https://bugs.ruby-lang.org/issues/19025
+      except << "whitequark/numparam_ruby_bug_19025.txt"
+      # https://bugs.ruby-lang.org/issues/18878
+      except << "whitequark/ruby_bug_18878.txt"
+      # https://bugs.ruby-lang.org/issues/19281
+      except << "whitequark/ruby_bug_19281.txt"
     end
 
-    Fixture.each(except: except) do |fixture|
+    # https://bugs.ruby-lang.org/issues/21168#note-5
+    except << "command_method_call_2.txt"
+
+    Fixture.each_for_current_ruby(except: except) do |fixture|
       define_method(fixture.test_name) { assert_lex(fixture) }
     end
 
@@ -79,7 +88,7 @@ def test_parse_lex_file
     def assert_lex(fixture)
       source = fixture.read
 
-      result = Prism.lex_compat(source)
+      result = Prism.lex_compat(source, version: "current")
       assert_equal [], result.errors
 
       Prism.lex_ripper(source).zip(result.value).each do |(ripper, prism)|
diff --git a/test/mri/prism/locals_test.rb b/test/mri/prism/locals_test.rb
index e0e9a458559..4f8d6080e80 100644
--- a/test/mri/prism/locals_test.rb
+++ b/test/mri/prism/locals_test.rb
@@ -13,11 +13,6 @@
 # in comparing the locals because they will be the same.
 return if RubyVM::InstructionSequence.compile("").to_a[4][:parser] == :prism
 
-# In Ruby 3.4.0, the local table for method forwarding changed. But 3.4.0 can
-# refer to the dev version, so while 3.4.0 still isn't released, we need to
-# check if we have a high enough revision.
-return if RubyVM::InstructionSequence.compile("def foo(...); end").to_a[13][2][2][10].length != 1
-
 # Omit tests if running on a 32-bit machine because there is a bug with how
 # Ruby is handling large ISeqs on 32-bit machines
 return if RUBY_PLATFORM =~ /i686/
@@ -29,10 +24,13 @@ class LocalsTest < TestCase
     except = [
       # Skip this fixture because it has a different number of locals because
       # CRuby is eliminating dead code.
-      "whitequark/ruby_bug_10653.txt"
+      "whitequark/ruby_bug_10653.txt",
+
+      # https://bugs.ruby-lang.org/issues/21168#note-5
+      "command_method_call_2.txt",
     ]
 
-    Fixture.each(except: except) do |fixture|
+    Fixture.each_for_current_ruby(except: except) do |fixture|
       define_method(fixture.test_name) { assert_locals(fixture) }
     end
 
diff --git a/test/mri/prism/location_test.rb b/test/mri/prism/location_test.rb
deleted file mode 100644
index c7ce248b569..00000000000
--- a/test/mri/prism/location_test.rb
+++ /dev/null
@@ -1,945 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class LocationTest < TestCase
-    def test_AliasGlobalVariableNode
-      assert_location(AliasGlobalVariableNode, "alias $foo $bar")
-    end
-
-    def test_AliasMethodNode
-      assert_location(AliasMethodNode, "alias foo bar")
-    end
-
-    def test_AlternationPatternNode
-      assert_location(AlternationPatternNode, "foo => bar | baz", 7...16, &:pattern)
-    end
-
-    def test_AndNode
-      assert_location(AndNode, "foo and bar")
-      assert_location(AndNode, "foo && bar")
-    end
-
-    def test_ArgumentsNode
-      assert_location(ArgumentsNode, "foo(bar, baz, qux)", 4...17, &:arguments)
-    end
-
-    def test_ArrayNode
-      assert_location(ArrayNode, "[foo, bar, baz]")
-      assert_location(ArrayNode, "%i[foo bar baz]")
-      assert_location(ArrayNode, "%I[foo bar baz]")
-      assert_location(ArrayNode, "%w[foo bar baz]")
-      assert_location(ArrayNode, "%W[foo bar baz]")
-    end
-
-    def test_ArrayPatternNode
-      assert_location(ArrayPatternNode, "foo => bar, baz", 7...15, &:pattern)
-      assert_location(ArrayPatternNode, "foo => [bar, baz]", 7...17, &:pattern)
-      assert_location(ArrayPatternNode, "foo => *bar", 7...11, &:pattern)
-      assert_location(ArrayPatternNode, "foo => []", 7...9, &:pattern)
-      assert_location(ArrayPatternNode, "foo => Foo[]", 7...12, &:pattern)
-      assert_location(ArrayPatternNode, "foo => Foo[bar]", 7...15, &:pattern)
-    end
-
-    def test_AssocNode
-      assert_location(AssocNode, "{ '': 1 }", 2...7) { |node| node.elements.first }
-      assert_location(AssocNode, "{ foo: :bar }", 2...11) { |node| node.elements.first }
-      assert_location(AssocNode, "{ :foo => :bar }", 2...14) { |node| node.elements.first }
-      assert_location(AssocNode, "foo(bar: :baz)", 4...13) { |node| node.arguments.arguments.first.elements.first }
-    end
-
-    def test_AssocSplatNode
-      assert_location(AssocSplatNode, "{ **foo }", 2...7) { |node| node.elements.first }
-      assert_location(AssocSplatNode, "foo(**bar)", 4...9) { |node| node.arguments.arguments.first.elements.first }
-    end
-
-    def test_BackReferenceReadNode
-      assert_location(BackReferenceReadNode, "$+")
-    end
-
-    def test_BeginNode
-      assert_location(BeginNode, "begin foo end")
-      assert_location(BeginNode, "begin foo rescue bar end")
-      assert_location(BeginNode, "begin foo; rescue bar\nelse baz end")
-      assert_location(BeginNode, "begin foo; rescue bar\nelse baz\nensure qux end")
-
-      assert_location(BeginNode, "class Foo\nrescue then end", 0..25, &:body)
-      assert_location(BeginNode, "module Foo\nrescue then end", 0..26, &:body)
-    end
-
-    def test_BlockArgumentNode
-      assert_location(BlockArgumentNode, "foo(&bar)", 4...8, &:block)
-    end
-
-    def test_BlockLocalVariableNode
-      assert_location(BlockLocalVariableNode, "foo { |;bar| }", 8...11) do |node|
-        node.block.parameters.locals.first
-      end
-    end
-
-    def test_BlockNode
-      assert_location(BlockNode, "foo {}", 4...6, &:block)
-      assert_location(BlockNode, "foo do end", 4...10, &:block)
-    end
-
-    def test_BlockParameterNode
-      assert_location(BlockParameterNode, "def foo(&bar) end", 8...12) { |node| node.parameters.block }
-    end
-
-    def test_BlockParametersNode
-      assert_location(BlockParametersNode, "foo { || }", 6...8) { |node| node.block.parameters }
-      assert_location(BlockParametersNode, "foo { |bar| baz }", 6...11) { |node| node.block.parameters }
-      assert_location(BlockParametersNode, "foo { |bar; baz| baz }", 6...16) { |node| node.block.parameters }
-
-      assert_location(BlockParametersNode, "-> () {}", 3...5, &:parameters)
-      assert_location(BlockParametersNode, "-> (bar) { baz }", 3...8, &:parameters)
-      assert_location(BlockParametersNode, "-> (bar; baz) { baz }", 3...13, &:parameters)
-    end
-
-    def test_BreakNode
-      assert_location(BreakNode, "break")
-      assert_location(BreakNode, "break foo")
-      assert_location(BreakNode, "break foo, bar")
-      assert_location(BreakNode, "break(foo)")
-    end
-
-    def test_CallNode
-      assert_location(CallNode, "foo")
-      assert_location(CallNode, "foo?")
-      assert_location(CallNode, "foo!")
-
-      assert_location(CallNode, "foo()")
-      assert_location(CallNode, "foo?()")
-      assert_location(CallNode, "foo!()")
-
-      assert_location(CallNode, "foo(bar)")
-      assert_location(CallNode, "foo?(bar)")
-      assert_location(CallNode, "foo!(bar)")
-
-      assert_location(CallNode, "!foo")
-      assert_location(CallNode, "~foo")
-      assert_location(CallNode, "+foo")
-      assert_location(CallNode, "-foo")
-
-      assert_location(CallNode, "not foo")
-      assert_location(CallNode, "not(foo)")
-      assert_location(CallNode, "not()")
-
-      assert_location(CallNode, "foo + bar")
-      assert_location(CallNode, "foo -\n  bar")
-
-      assert_location(CallNode, "Foo()")
-      assert_location(CallNode, "Foo(bar)")
-
-      assert_location(CallNode, "Foo::Bar()")
-      assert_location(CallNode, "Foo::Bar(baz)")
-
-      assert_location(CallNode, "Foo::bar")
-      assert_location(CallNode, "Foo::bar()")
-      assert_location(CallNode, "Foo::bar(baz)")
-
-      assert_location(CallNode, "Foo.bar")
-      assert_location(CallNode, "Foo.bar()")
-      assert_location(CallNode, "Foo.bar(baz)")
-
-      assert_location(CallNode, "foo::bar")
-      assert_location(CallNode, "foo::bar()")
-      assert_location(CallNode, "foo::bar(baz)")
-
-      assert_location(CallNode, "foo.bar")
-      assert_location(CallNode, "foo.bar()")
-      assert_location(CallNode, "foo.bar(baz)")
-
-      assert_location(CallNode, "foo&.bar")
-      assert_location(CallNode, "foo&.bar()")
-      assert_location(CallNode, "foo&.bar(baz)")
-
-      assert_location(CallNode, "foo[]")
-      assert_location(CallNode, "foo[bar]")
-      assert_location(CallNode, "foo[bar, baz]")
-
-      assert_location(CallNode, "foo[] = 1")
-      assert_location(CallNode, "foo[bar] = 1")
-      assert_location(CallNode, "foo[bar, baz] = 1")
-
-      assert_location(CallNode, "foo.()")
-      assert_location(CallNode, "foo.(bar)")
-
-      assert_location(CallNode, "foo&.()")
-      assert_location(CallNode, "foo&.(bar)")
-
-      assert_location(CallNode, "foo::()")
-      assert_location(CallNode, "foo::(bar)")
-      assert_location(CallNode, "foo::(bar, baz)")
-
-      assert_location(CallNode, "foo bar baz")
-      assert_location(CallNode, "foo bar('baz')")
-
-      assert_location(CallNode, "-> { it }", 5...7, version: "3.3.0") do |node|
-        node.body.body.first
-      end
-
-      assert_location(LocalVariableReadNode, "-> { it }", 5...7, version: "3.4.0") do |node|
-        node.body.body.first
-      end
-    end
-
-    def test_CallAndWriteNode
-      assert_location(CallAndWriteNode, "foo.foo &&= bar")
-    end
-
-    def test_CallOperatorWriteNode
-      assert_location(CallOperatorWriteNode, "foo.foo += bar")
-    end
-
-    def test_CallOrWriteNode
-      assert_location(CallOrWriteNode, "foo.foo ||= bar")
-    end
-
-    def test_CallTargetNode
-      assert_location(CallTargetNode, "foo.bar, = baz", 0...7) do |node|
-        node.lefts.first
-      end
-    end
-
-    def test_CapturePatternNode
-      assert_location(CapturePatternNode, "case foo; in bar => baz; end", 13...23) do |node|
-        node.conditions.first.pattern
-      end
-    end
-
-    def test_CaseNode
-      assert_location(CaseNode, "case foo; when bar; end")
-      assert_location(CaseNode, "case foo; when bar; else; end")
-      assert_location(CaseNode, "case foo; when bar; when baz; end")
-      assert_location(CaseNode, "case foo; when bar; when baz; else; end")
-    end
-
-    def test_CaseMatchNode
-      assert_location(CaseMatchNode, "case foo; in bar; end")
-      assert_location(CaseMatchNode, "case foo; in bar; else; end")
-      assert_location(CaseMatchNode, "case foo; in bar; in baz; end")
-      assert_location(CaseMatchNode, "case foo; in bar; in baz; else; end")
-    end
-
-    def test_ClassNode
-      assert_location(ClassNode, "class Foo end")
-      assert_location(ClassNode, "class Foo < Bar; end")
-    end
-
-    def test_ClassVariableAndWriteNode
-      assert_location(ClassVariableAndWriteNode, "@@foo &&= bar")
-    end
-
-    def test_ClassVariableOperatorWriteNode
-      assert_location(ClassVariableOperatorWriteNode, "@@foo += bar")
-    end
-
-    def test_ClassVariableOrWriteNode
-      assert_location(ClassVariableOrWriteNode, "@@foo ||= bar")
-    end
-
-    def test_ClassVariableReadNode
-      assert_location(ClassVariableReadNode, "@@foo")
-    end
-
-    def test_ClassVariableTargetNode
-      assert_location(ClassVariableTargetNode, "@@foo, @@bar = baz", 0...5) do |node|
-        node.lefts.first
-      end
-    end
-
-    def test_ClassVariableWriteNode
-      assert_location(ClassVariableWriteNode, "@@foo = bar")
-    end
-
-    def test_ConstantPathAndWriteNode
-      assert_location(ConstantPathAndWriteNode, "Parent::Child &&= bar")
-    end
-
-    def test_ConstantPathNode
-      assert_location(ConstantPathNode, "Foo::Bar")
-      assert_location(ConstantPathNode, "::Foo")
-      assert_location(ConstantPathNode, "::Foo::Bar")
-    end
-
-    def test_ConstantPathOperatorWriteNode
-      assert_location(ConstantPathOperatorWriteNode, "Parent::Child += bar")
-    end
-
-    def test_ConstantPathOrWriteNode
-      assert_location(ConstantPathOrWriteNode, "Parent::Child ||= bar")
-    end
-
-    def test_ConstantPathTargetNode
-      assert_location(ConstantPathTargetNode, "::Foo, ::Bar = baz", 0...5) do |node|
-        node.lefts.first
-      end
-    end
-
-    def test_ConstantPathWriteNode
-      assert_location(ConstantPathWriteNode, "Foo::Bar = baz")
-      assert_location(ConstantPathWriteNode, "::Foo = bar")
-      assert_location(ConstantPathWriteNode, "::Foo::Bar = baz")
-    end
-
-    def test_ConstantAndWriteNode
-      assert_location(ConstantAndWriteNode, "Foo &&= bar")
-    end
-
-    def test_ConstantOperatorWriteNode
-      assert_location(ConstantOperatorWriteNode, "Foo += bar")
-    end
-
-    def test_ConstantOrWriteNode
-      assert_location(ConstantOrWriteNode, "Foo ||= bar")
-    end
-
-    def test_ConstantReadNode
-      assert_location(ConstantReadNode, "Foo")
-      assert_location(ConstantReadNode, "Foo::Bar", 5...8, &:child)
-    end
-
-    def test_ConstantTargetNode
-      assert_location(ConstantTargetNode, "Foo, Bar = baz", 0...3) do |node|
-        node.lefts.first
-      end
-    end
-
-    def test_ConstantWriteNode
-      assert_location(ConstantWriteNode, "Foo = bar")
-    end
-
-    def test_DefNode
-      assert_location(DefNode, "def foo; bar; end")
-      assert_location(DefNode, "def foo = bar")
-      assert_location(DefNode, "def foo.bar; baz; end")
-      assert_location(DefNode, "def foo.bar = baz")
-    end
-
-    def test_DefinedNode
-      assert_location(DefinedNode, "defined? foo")
-      assert_location(DefinedNode, "defined?(foo)")
-    end
-
-    def test_ElseNode
-      assert_location(ElseNode, "if foo; bar; else; baz; end", 13...27, &:consequent)
-      assert_location(ElseNode, "foo ? bar : baz", 10...15, &:consequent)
-    end
-
-    def test_EmbeddedStatementsNode
-      assert_location(EmbeddedStatementsNode, '"foo #{bar} baz"', 5...11) { |node| node.parts[1] }
-    end
-
-    def test_EmbeddedVariableNode
-      assert_location(EmbeddedVariableNode, '"foo #@@bar baz"', 5...11) { |node| node.parts[1] }
-    end
-
-    def test_EnsureNode
-      assert_location(EnsureNode, "begin; foo; ensure; bar; end", 12...28, &:ensure_clause)
-    end
-
-    def test_FalseNode
-      assert_location(FalseNode, "false")
-    end
-
-    def test_FindPatternNode
-      assert_location(FindPatternNode, "case foo; in *, bar, *; end", 13...22) do |node|
-        node.conditions.first.pattern
-      end
-    end
-
-    def test_FlipFlopNode
-      assert_location(FlipFlopNode, "if foo..bar; end", 3..11, &:predicate)
-    end
-
-    def test_FloatNode
-      assert_location(FloatNode, "0.0")
-      assert_location(FloatNode, "1.0")
-      assert_location(FloatNode, "1.0e10")
-      assert_location(FloatNode, "1.0e-10")
-    end
-
-    def test_ForNode
-      assert_location(ForNode, "for foo in bar; end")
-      assert_location(ForNode, "for foo, bar in baz do end")
-    end
-
-    def test_ForwardingArgumentsNode
-      assert_location(ForwardingArgumentsNode, "def foo(...); bar(...); end", 18...21) do |node|
-        node.body.body.first.arguments.arguments.first
-      end
-    end
-
-    def test_ForwardingParameterNode
-      assert_location(ForwardingParameterNode, "def foo(...); end", 8...11) do |node|
-        node.parameters.keyword_rest
-      end
-    end
-
-    def test_ForwardingSuperNode
-      assert_location(ForwardingSuperNode, "super")
-      assert_location(ForwardingSuperNode, "super {}")
-    end
-
-    def test_GlobalVariableAndWriteNode
-      assert_location(GlobalVariableAndWriteNode, "$foo &&= bar")
-    end
-
-    def test_GlobalVariableOperatorWriteNode
-      assert_location(GlobalVariableOperatorWriteNode, "$foo += bar")
-    end
-
-    def test_GlobalVariableOrWriteNode
-      assert_location(GlobalVariableOrWriteNode, "$foo ||= bar")
-    end
-
-    def test_GlobalVariableReadNode
-      assert_location(GlobalVariableReadNode, "$foo")
-    end
-
-    def test_GlobalVariableTargetNode
-      assert_location(GlobalVariableTargetNode, "$foo, $bar = baz", 0...4) do |node|
-        node.lefts.first
-      end
-    end
-
-    def test_GlobalVariableWriteNode
-      assert_location(GlobalVariableWriteNode, "$foo = bar")
-    end
-
-    def test_HashNode
-      assert_location(HashNode, "{ foo: 2 }")
-      assert_location(HashNode, "{ \nfoo: 2, \nbar: 3 \n}")
-    end
-
-    def test_HashPatternNode
-      assert_location(HashPatternNode, "case foo; in bar: baz; end", 13...21) do |node|
-        node.conditions.first.pattern
-      end
-    end
-
-    def test_IfNode
-      assert_location(IfNode, "if type in 1;elsif type in B;end")
-    end
-
-    def test_ImaginaryNode
-      assert_location(ImaginaryNode, "1i")
-      assert_location(ImaginaryNode, "1ri")
-    end
-
-    def test_ImplicitNode
-      assert_location(ImplicitNode, "{ foo: }", 2...6) do |node|
-        node.elements.first.value
-      end
-
-      assert_location(ImplicitNode, "{ Foo: }", 2..6) do |node|
-        node.elements.first.value
-      end
-
-      assert_location(ImplicitNode, "foo = 1; { foo: }", 11..15) do |node|
-        node.elements.first.value
-      end
-    end
-
-    def test_ImplicitRestNode
-      assert_location(ImplicitRestNode, "foo, = bar", 3..4, &:rest)
-
-      assert_location(ImplicitRestNode, "for foo, in bar do end", 7..8) do |node|
-        node.index.rest
-      end
-
-      assert_location(ImplicitRestNode, "foo { |bar,| }", 10..11) do |node|
-        node.block.parameters.parameters.rest
-      end
-
-      assert_location(ImplicitRestNode, "foo in [bar,]", 11..12) do |node|
-        node.pattern.rest
-      end
-    end
-
-    def test_InNode
-      assert_location(InNode, "case foo; in bar; end", 10...16) do |node|
-        node.conditions.first
-      end
-    end
-
-    def test_IndexAndWriteNode
-      assert_location(IndexAndWriteNode, "foo[foo] &&= bar")
-    end
-
-    def test_IndexOperatorWriteNode
-      assert_location(IndexOperatorWriteNode, "foo[foo] += bar")
-    end
-
-    def test_IndexOrWriteNode
-      assert_location(IndexOrWriteNode, "foo[foo] ||= bar")
-    end
-
-    def test_IndexTargetNode
-      assert_location(IndexTargetNode, "foo[bar, &baz], = qux", 0...14) do |node|
-        node.lefts.first
-      end
-    end
-
-    def test_InstanceVariableAndWriteNode
-      assert_location(InstanceVariableAndWriteNode, "@foo &&= bar")
-    end
-
-    def test_InstanceVariableOperatorWriteNode
-      assert_location(InstanceVariableOperatorWriteNode, "@foo += bar")
-    end
-
-    def test_InstanceVariableOrWriteNode
-      assert_location(InstanceVariableOrWriteNode, "@foo ||= bar")
-    end
-
-    def test_InstanceVariableReadNode
-      assert_location(InstanceVariableReadNode, "@foo")
-    end
-
-    def test_InstanceVariableTargetNode
-      assert_location(InstanceVariableTargetNode, "@foo, @bar = baz", 0...4) do |node|
-        node.lefts.first
-      end
-    end
-
-    def test_InstanceVariableWriteNode
-      assert_location(InstanceVariableWriteNode, "@foo = bar")
-    end
-
-    def test_IntegerNode
-      assert_location(IntegerNode, "0")
-      assert_location(IntegerNode, "1")
-      assert_location(IntegerNode, "1_000")
-      assert_location(IntegerNode, "0x1")
-      assert_location(IntegerNode, "0x1_000")
-      assert_location(IntegerNode, "0b1")
-      assert_location(IntegerNode, "0b1_000")
-      assert_location(IntegerNode, "0o1")
-      assert_location(IntegerNode, "0o1_000")
-    end
-
-    def test_InterpolatedMatchLastLineNode
-      assert_location(InterpolatedMatchLastLineNode, "if /foo \#{bar}/ then end", 3...15, &:predicate)
-    end
-
-    def test_InterpolatedRegularExpressionNode
-      assert_location(InterpolatedRegularExpressionNode, "/\#{foo}/")
-    end
-
-    def test_InterpolatedStringNode
-      assert_location(InterpolatedStringNode, "\"foo \#@bar baz\"")
-      assert_location(InterpolatedStringNode, "<<~A\nhello \#{1} world\nA", 0...4)
-      assert_location(InterpolatedStringNode, '"foo" "bar"')
-    end
-
-    def test_InterpolatedSymbolNode
-      assert_location(InterpolatedSymbolNode, ':"#{foo}bar"')
-    end
-
-    def test_InterpolatedXStringNode
-      assert_location(InterpolatedXStringNode, '`foo #{bar} baz`')
-    end
-
-    def test_ItParametersNode
-      assert_location(ItParametersNode, "-> { it }", &:parameters)
-    end
-
-    def test_KeywordHashNode
-      assert_location(KeywordHashNode, "foo(a, b: 1)", 7...11) { |node| node.arguments.arguments[1] }
-    end
-
-    def test_KeywordRestParameterNode
-      assert_location(KeywordRestParameterNode, "def foo(**); end", 8...10) do |node|
-        node.parameters.keyword_rest
-      end
-
-      assert_location(KeywordRestParameterNode, "def foo(**bar); end", 8...13) do |node|
-        node.parameters.keyword_rest
-      end
-    end
-
-    def test_LambdaNode
-      assert_location(LambdaNode, "-> { foo }")
-      assert_location(LambdaNode, "-> do foo end")
-    end
-
-    def test_LocalVariableAndWriteNode
-      assert_location(LocalVariableAndWriteNode, "foo &&= bar")
-      assert_location(LocalVariableAndWriteNode, "foo = 1; foo &&= bar", 9...20)
-    end
-
-    def test_LocalVariableOperatorWriteNode
-      assert_location(LocalVariableOperatorWriteNode, "foo += bar")
-      assert_location(LocalVariableOperatorWriteNode, "foo = 1; foo += bar", 9...19)
-    end
-
-    def test_LocalVariableOrWriteNode
-      assert_location(LocalVariableOrWriteNode, "foo ||= bar")
-      assert_location(LocalVariableOrWriteNode, "foo = 1; foo ||= bar", 9...20)
-    end
-
-    def test_LocalVariableReadNode
-      assert_location(LocalVariableReadNode, "foo = 1; foo", 9...12)
-      assert_location(LocalVariableReadNode, "-> { it }", 5...7) do |node|
-        node.body.body.first
-      end
-      assert_location(LocalVariableReadNode, "foo { it }", 6...8) do |node|
-        node.block.body.body.first
-      end
-    end
-
-    def test_LocalVariableTargetNode
-      assert_location(LocalVariableTargetNode, "foo, bar = baz", 0...3) do |node|
-        node.lefts.first
-      end
-    end
-
-    def test_LocalVariableWriteNode
-      assert_location(LocalVariableWriteNode, "foo = bar")
-    end
-
-    def test_MatchLastLineNode
-      assert_location(MatchLastLineNode, "if /foo/ then end", 3...8, &:predicate)
-    end
-
-    def test_MatchPredicateNode
-      assert_location(MatchPredicateNode, "foo in bar")
-    end
-
-    def test_MatchRequiredNode
-      assert_location(MatchRequiredNode, "foo => bar")
-    end
-
-    def test_MatchWriteNode
-      assert_location(MatchWriteNode, "/(?<foo>)/ =~ foo")
-    end
-
-    def test_ModuleNode
-      assert_location(ModuleNode, "module Foo end")
-    end
-
-    def test_MultiTargetNode
-      assert_location(MultiTargetNode, "for foo, bar in baz do end", 4...12, &:index)
-      assert_location(MultiTargetNode, "foo, (bar, baz) = qux", 5...15) { |node| node.lefts.last }
-      assert_location(MultiTargetNode, "def foo((bar)); end", 8...13) do |node|
-        node.parameters.requireds.first
-      end
-    end
-
-    def test_MultiWriteNode
-      assert_location(MultiWriteNode, "foo, bar = baz")
-      assert_location(MultiWriteNode, "(foo, bar) = baz")
-      assert_location(MultiWriteNode, "((foo, bar)) = baz")
-    end
-
-    def test_NextNode
-      assert_location(NextNode, "next")
-      assert_location(NextNode, "next foo")
-      assert_location(NextNode, "next foo, bar")
-      assert_location(NextNode, "next(foo)")
-    end
-
-    def test_NilNode
-      assert_location(NilNode, "nil")
-    end
-
-    def test_NoKeywordsParameterNode
-      assert_location(NoKeywordsParameterNode, "def foo(**nil); end", 8...13) { |node| node.parameters.keyword_rest }
-    end
-
-    def test_NumberedParametersNode
-      assert_location(NumberedParametersNode, "-> { _1 }", &:parameters)
-      assert_location(NumberedParametersNode, "foo { _1 }", 4...10) { |node| node.block.parameters }
-    end
-
-    def test_NumberedReferenceReadNode
-      assert_location(NumberedReferenceReadNode, "$1")
-    end
-
-    def test_OptionalKeywordParameterNode
-      assert_location(OptionalKeywordParameterNode, "def foo(bar: nil); end", 8...16) do |node|
-        node.parameters.keywords.first
-      end
-    end
-
-    def test_OptionalParameterNode
-      assert_location(OptionalParameterNode, "def foo(bar = nil); end", 8...17) do |node|
-        node.parameters.optionals.first
-      end
-    end
-
-    def test_OrNode
-      assert_location(OrNode, "foo || bar")
-      assert_location(OrNode, "foo or bar")
-    end
-
-    def test_ParametersNode
-      assert_location(ParametersNode, "def foo(bar, baz); end", 8...16, &:parameters)
-    end
-
-    def test_ParenthesesNode
-      assert_location(ParenthesesNode, "()")
-      assert_location(ParenthesesNode, "(foo)")
-      assert_location(ParenthesesNode, "foo (bar), baz", 4...9) { |node| node.arguments.arguments.first }
-      assert_location(ParenthesesNode, "def (foo).bar; end", 4...9, &:receiver)
-    end
-
-    def test_PinnedExpressionNode
-      assert_location(PinnedExpressionNode, "foo in ^(bar)", 7...13, &:pattern)
-    end
-
-    def test_PinnedVariableNode
-      assert_location(PinnedVariableNode, "bar = 1; foo in ^bar", 16...20, &:pattern)
-      assert_location(PinnedVariableNode, "proc { 1 in ^it }.call(1)", 12...15) do |node|
-        node.receiver.block.body.body.first.pattern
-      end
-    end
-
-    def test_PostExecutionNode
-      assert_location(PostExecutionNode, "END {}")
-      assert_location(PostExecutionNode, "END { foo }")
-    end
-
-    def test_PreExecutionNode
-      assert_location(PreExecutionNode, "BEGIN {}")
-      assert_location(PreExecutionNode, "BEGIN { foo }")
-    end
-
-    def test_RangeNode
-      assert_location(RangeNode, "1..2")
-      assert_location(RangeNode, "1...2")
-
-      assert_location(RangeNode, "..2")
-      assert_location(RangeNode, "...2")
-
-      assert_location(RangeNode, "1..")
-      assert_location(RangeNode, "1...")
-    end
-
-    def test_RationalNode
-      assert_location(RationalNode, "1r")
-      assert_location(RationalNode, "1.0r")
-    end
-
-    def test_RedoNode
-      assert_location(RedoNode, "redo")
-    end
-
-    def test_RegularExpressionNode
-      assert_location(RegularExpressionNode, "/foo/")
-    end
-
-    def test_RequiredKeywordParameterNode
-      assert_location(RequiredKeywordParameterNode, "def foo(bar:); end", 8...12) do |node|
-        node.parameters.keywords.first
-      end
-    end
-
-    def test_RequiredParameterNode
-      assert_location(RequiredParameterNode, "def foo(bar); end", 8...11) do |node|
-        node.parameters.requireds.first
-      end
-    end
-
-    def test_RescueNode
-      code = <<~RUBY
-      begin
-        body
-      rescue TypeError
-      rescue ArgumentError
-      end
-      RUBY
-      assert_location(RescueNode, code, 13...50) { |node| node.rescue_clause }
-      assert_location(RescueNode, code, 30...50) { |node| node.rescue_clause.consequent }
-    end
-
-    def test_RescueModifierNode
-      assert_location(RescueModifierNode, "foo rescue bar")
-    end
-
-    def test_RestParameterNode
-      assert_location(RestParameterNode, "def foo(*bar); end", 8...12) do |node|
-        node.parameters.rest
-      end
-    end
-
-    def test_RetryNode
-      assert_location(RetryNode, "retry")
-    end
-
-    def test_ReturnNode
-      assert_location(ReturnNode, "return")
-      assert_location(ReturnNode, "return foo")
-      assert_location(ReturnNode, "return foo, bar")
-      assert_location(ReturnNode, "return(foo)")
-    end
-
-    def test_SelfNode
-      assert_location(SelfNode, "self")
-    end
-
-    def test_ShareableConstantNode
-      source = <<~RUBY
-        # shareable_constant_value: literal
-        C = { foo: 1 }
-      RUBY
-
-      assert_location(ShareableConstantNode, source, 36...50)
-    end
-
-    def test_SingletonClassNode
-      assert_location(SingletonClassNode, "class << self; end")
-    end
-
-    def test_SourceEncodingNode
-      assert_location(SourceEncodingNode, "__ENCODING__")
-    end
-
-    def test_SourceFileNode
-      assert_location(SourceFileNode, "__FILE__")
-    end
-
-    def test_SourceLineNode
-      assert_location(SourceLineNode, "__LINE__")
-    end
-
-    def test_SplatNode
-      assert_location(SplatNode, "*foo = bar", 0...4, &:rest)
-    end
-
-    def test_StatementsNode
-      assert_location(StatementsNode, "foo { 1 }", 6...7) { |node| node.block.body }
-
-      assert_location(StatementsNode, "(1)", 1...2, &:body)
-
-      assert_location(StatementsNode, "def foo; 1; end", 9...10, &:body)
-      assert_location(StatementsNode, "def foo = 1", 10...11, &:body)
-      assert_location(StatementsNode, "def foo; 1\n2; end", 9...12, &:body)
-
-      assert_location(StatementsNode, "if foo; bar; end", 8...11, &:statements)
-      assert_location(StatementsNode, "foo if bar", 0...3, &:statements)
-
-      assert_location(StatementsNode, "if foo; foo; elsif bar; bar; end", 24...27) { |node| node.consequent.statements }
-      assert_location(StatementsNode, "if foo; foo; else; bar; end", 19...22) { |node| node.consequent.statements }
-
-      assert_location(StatementsNode, "unless foo; bar; end", 12...15, &:statements)
-      assert_location(StatementsNode, "foo unless bar", 0...3, &:statements)
-
-      assert_location(StatementsNode, "case; when foo; bar; end", 16...19) { |node| node.conditions.first.statements }
-
-      assert_location(StatementsNode, "while foo; bar; end", 11...14, &:statements)
-      assert_location(StatementsNode, "foo while bar", 0...3, &:statements)
-
-      assert_location(StatementsNode, "until foo; bar; end", 11...14, &:statements)
-      assert_location(StatementsNode, "foo until bar", 0...3, &:statements)
-
-      assert_location(StatementsNode, "for foo in bar; baz; end", 16...19, &:statements)
-
-      assert_location(StatementsNode, "begin; foo; end", 7...10, &:statements)
-      assert_location(StatementsNode, "begin; rescue; foo; end", 15...18) { |node| node.rescue_clause.statements }
-      assert_location(StatementsNode, "begin; ensure; foo; end", 15...18) { |node| node.ensure_clause.statements }
-      assert_location(StatementsNode, "begin; rescue; else; foo; end", 21...24) { |node| node.else_clause.statements }
-
-      assert_location(StatementsNode, "class Foo; foo; end", 11...14, &:body)
-      assert_location(StatementsNode, "module Foo; foo; end", 12...15, &:body)
-      assert_location(StatementsNode, "class << self; foo; end", 15...18, &:body)
-
-      assert_location(StatementsNode, "-> { foo }", 5...8, &:body)
-      assert_location(StatementsNode, "BEGIN { foo }", 8...11, &:statements)
-      assert_location(StatementsNode, "END { foo }", 6...9, &:statements)
-
-      assert_location(StatementsNode, "\"\#{foo}\"", 3...6) { |node| node.parts.first.statements }
-    end
-
-    def test_StringNode
-      assert_location(StringNode, '"foo"')
-      assert_location(StringNode, '%q[foo]')
-    end
-
-    def test_SuperNode
-      assert_location(SuperNode, "super foo")
-      assert_location(SuperNode, "super foo, bar")
-
-      assert_location(SuperNode, "super()")
-      assert_location(SuperNode, "super(foo)")
-      assert_location(SuperNode, "super(foo, bar)")
-
-      assert_location(SuperNode, "super() {}")
-    end
-
-    def test_SymbolNode
-      assert_location(SymbolNode, ":foo")
-    end
-
-    def test_TrueNode
-      assert_location(TrueNode, "true")
-    end
-
-    def test_UndefNode
-      assert_location(UndefNode, "undef foo")
-      assert_location(UndefNode, "undef foo, bar")
-    end
-
-    def test_UnlessNode
-      assert_location(UnlessNode, "foo unless bar")
-      assert_location(UnlessNode, "unless bar; foo; end")
-    end
-
-    def test_UntilNode
-      assert_location(UntilNode, "foo = bar until baz")
-      assert_location(UntilNode, "until bar;baz;end")
-    end
-
-    def test_WhenNode
-      assert_location(WhenNode, "case foo; when bar; end", 10...18) { |node| node.conditions.first }
-    end
-
-    def test_WhileNode
-      assert_location(WhileNode, "foo = bar while foo != baz")
-      assert_location(WhileNode, "while a;bar;baz;end")
-    end
-
-    def test_XStringNode
-      assert_location(XStringNode, "`foo`")
-      assert_location(XStringNode, "%x[foo]")
-    end
-
-    def test_YieldNode
-      assert_location(YieldNode, "yield")
-      assert_location(YieldNode, "yield foo")
-      assert_location(YieldNode, "yield foo, bar")
-      assert_location(YieldNode, "yield(foo)")
-    end
-
-    def test_all_tested
-      expected = Prism.constants.grep(/.Node$/).sort - %i[MissingNode ProgramNode]
-      actual = LocationTest.instance_methods(false).grep(/.Node$/).map { |name| name[5..].to_sym }.sort
-      assert_equal expected, actual
-    end
-
-    private
-
-    def assert_location(kind, source, expected = 0...source.length, **options)
-      result = Prism.parse(source, **options)
-      assert result.success?
-
-      node = result.value.statements.body.last
-      node = yield node if block_given?
-
-      if expected.begin == 0
-        assert_equal 0, node.location.start_column
-      end
-
-      if expected.end == source.length
-        assert_equal source.split("\n").last.length, node.location.end_column
-      end
-
-      assert_kind_of kind, node
-      assert_equal expected.begin, node.location.start_offset
-      assert_equal expected.end, node.location.end_offset
-    end
-  end
-end
diff --git a/test/mri/prism/memsize_test.rb b/test/mri/prism/memsize_test.rb
deleted file mode 100644
index d7e1448dbc0..00000000000
--- a/test/mri/prism/memsize_test.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if Prism::BACKEND == :FFI
-
-module Prism
-  class MemsizeTest < TestCase
-    def test_memsize
-      result = Debug.memsize("2 + 3")
-
-      assert_equal 5, result[:length]
-      assert_kind_of Integer, result[:memsize]
-      assert_equal 6, result[:node_count]
-    end
-  end
-end
diff --git a/test/mri/prism/parameters_signature_test.rb b/test/mri/prism/parameters_signature_test.rb
deleted file mode 100644
index 788ce7b9071..00000000000
--- a/test/mri/prism/parameters_signature_test.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if RUBY_VERSION < "3.2" || RUBY_ENGINE == "truffleruby"
-
-module Prism
-  class ParametersSignatureTest < TestCase
-    def test_req
-      assert_parameters([[:req, :a]], "a")
-    end
-
-    def test_req_destructure
-      assert_parameters([[:req]], "(a, b)")
-    end
-
-    def test_opt
-      assert_parameters([[:opt, :a]], "a = 1")
-    end
-
-    def test_rest
-      assert_parameters([[:rest, :a]], "*a")
-    end
-
-    def test_rest_anonymous
-      assert_parameters([[:rest, :*]], "*")
-    end
-
-    def test_post
-      assert_parameters([[:rest, :a], [:req, :b]], "*a, b")
-    end
-
-    def test_post_destructure
-      assert_parameters([[:rest, :a], [:req]], "*a, (b, c)")
-    end
-
-    def test_keyreq
-      assert_parameters([[:keyreq, :a]], "a:")
-    end
-
-    def test_key
-      assert_parameters([[:key, :a]], "a: 1")
-    end
-
-    def test_keyrest
-      assert_parameters([[:keyrest, :a]], "**a")
-    end
-
-    def test_nokey
-      assert_parameters([[:nokey]], "**nil")
-    end
-
-    def test_keyrest_anonymous
-      assert_parameters([[:keyrest, :**]], "**")
-    end
-
-    def test_key_ordering
-      assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
-    end
-
-    def test_block
-      assert_parameters([[:block, :a]], "&a")
-    end
-
-    def test_block_anonymous
-      assert_parameters([[:block, :&]], "&")
-    end
-
-    def test_forwarding
-      assert_parameters([[:rest, :*], [:keyrest, :**], [:block, :&]], "...")
-    end
-
-    private
-
-    def assert_parameters(expected, source)
-      eval("def self.m(#{source}); end")
-
-      begin
-        assert_equal(expected, method(:m).parameters)
-        assert_equal(expected, signature(source))
-      ensure
-        singleton_class.undef_method(:m)
-      end
-    end
-
-    def signature(source)
-      program = Prism.parse("def m(#{source}); end").value
-      program.statements.body.first.parameters.signature
-    end
-  end
-end
diff --git a/test/mri/prism/parse_comments_test.rb b/test/mri/prism/parse_comments_test.rb
deleted file mode 100644
index 30086e31552..00000000000
--- a/test/mri/prism/parse_comments_test.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class ParseCommentsTest < TestCase
-    def test_parse_comments
-      comments = Prism.parse_comments("# foo")
-
-      assert_kind_of Array, comments
-      assert_equal 1, comments.length
-    end
-
-    def test_parse_file_comments
-      comments = Prism.parse_file_comments(__FILE__)
-
-      assert_kind_of Array, comments
-      assert_equal 1, comments.length
-    end
-  end
-end
diff --git a/test/mri/prism/parse_stream_test.rb b/test/mri/prism/parse_stream_test.rb
deleted file mode 100644
index 9e6347b92b0..00000000000
--- a/test/mri/prism/parse_stream_test.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-require "stringio"
-
-module Prism
-  class ParseStreamTest < TestCase
-    def test_single_line
-      io = StringIO.new("1 + 2")
-      result = Prism.parse_stream(io)
-
-      assert result.success?
-      assert_kind_of Prism::CallNode, result.value.statements.body.first
-    end
-
-    def test_multi_line
-      io = StringIO.new("1 + 2\n3 + 4")
-      result = Prism.parse_stream(io)
-
-      assert result.success?
-      assert_kind_of Prism::CallNode, result.value.statements.body.first
-      assert_kind_of Prism::CallNode, result.value.statements.body.last
-    end
-
-    def test_multi_read
-      io = StringIO.new("a" * 4096 * 4)
-      result = Prism.parse_stream(io)
-
-      assert result.success?
-      assert_kind_of Prism::CallNode, result.value.statements.body.first
-    end
-
-    def test___END__
-      io = StringIO.new("1 + 2\n3 + 4\n__END__\n5 + 6")
-      result = Prism.parse_stream(io)
-
-      assert result.success?
-      assert_equal 2, result.value.statements.body.length
-      assert_equal "5 + 6", io.read
-    end
-
-    def test_false___END___in_string
-      io = StringIO.new("1 + 2\n3 + 4\n\"\n__END__\n\"\n5 + 6")
-      result = Prism.parse_stream(io)
-
-      assert result.success?
-      assert_equal 4, result.value.statements.body.length
-    end
-
-    def test_false___END___in_regexp
-      io = StringIO.new("1 + 2\n3 + 4\n/\n__END__\n/\n5 + 6")
-      result = Prism.parse_stream(io)
-
-      assert result.success?
-      assert_equal 4, result.value.statements.body.length
-    end
-
-    def test_false___END___in_list
-      io = StringIO.new("1 + 2\n3 + 4\n%w[\n__END__\n]\n5 + 6")
-      result = Prism.parse_stream(io)
-
-      assert result.success?
-      assert_equal 4, result.value.statements.body.length
-    end
-
-    def test_false___END___in_heredoc
-      io = StringIO.new("1 + 2\n3 + 4\n<<-EOF\n__END__\nEOF\n5 + 6")
-      result = Prism.parse_stream(io)
-
-      assert result.success?
-      assert_equal 4, result.value.statements.body.length
-    end
-  end
-end
diff --git a/test/mri/prism/parse_test.rb b/test/mri/prism/parse_test.rb
deleted file mode 100644
index 574a1c1714f..00000000000
--- a/test/mri/prism/parse_test.rb
+++ /dev/null
@@ -1,374 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class ParseTest < TestCase
-    # A subclass of Ripper that extracts out magic comments.
-    class MagicCommentRipper < Ripper
-      attr_reader :magic_comments
-
-      def initialize(*)
-        super
-        @magic_comments = []
-      end
-
-      def on_magic_comment(key, value)
-        @magic_comments << [key, value]
-        super
-      end
-    end
-
-    # When we pretty-print the trees to compare against the snapshots, we want to
-    # be certain that we print with the same external encoding. This is because
-    # methods like Symbol#inspect take into account external encoding and it could
-    # change how the snapshot is generated. On machines with certain settings
-    # (like LANG=C or -Eascii-8bit) this could have been changed. So here we're
-    # going to force it to be UTF-8 to keep the snapshots consistent.
-    def setup
-      @previous_default_external = Encoding.default_external
-      ignore_warnings { Encoding.default_external = Encoding::UTF_8 }
-    end
-
-    def teardown
-      ignore_warnings { Encoding.default_external = @previous_default_external }
-    end
-
-    def test_empty_string
-      result = Prism.parse("")
-      assert_equal [], result.value.statements.body
-    end
-
-    def test_parse_takes_file_path
-      filepath = "filepath.rb"
-      result = Prism.parse("def foo; __FILE__; end", filepath: filepath)
-
-      assert_equal filepath, find_source_file_node(result.value).filepath
-    end
-
-    def test_parse_takes_line
-      line = 4
-      result = Prism.parse("def foo\n __FILE__\nend", line: line)
-
-      assert_equal line, result.value.location.start_line
-      assert_equal line + 1, find_source_file_node(result.value).location.start_line
-
-      result = Prism.parse_lex("def foo\n __FILE__\nend", line: line)
-      assert_equal line, result.value.first.location.start_line
-    end
-
-    def test_parse_takes_negative_lines
-      line = -2
-      result = Prism.parse("def foo\n __FILE__\nend", line: line)
-
-      assert_equal line, result.value.location.start_line
-      assert_equal line + 1, find_source_file_node(result.value).location.start_line
-
-      result = Prism.parse_lex("def foo\n __FILE__\nend", line: line)
-      assert_equal line, result.value.first.location.start_line
-    end
-
-    def test_parse_lex
-      node, tokens = Prism.parse_lex("def foo; end").value
-
-      assert_kind_of ProgramNode, node
-      assert_equal 5, tokens.length
-    end
-
-    def test_dump_file
-      assert_nothing_raised do
-        Prism.dump_file(__FILE__)
-      end
-
-      error = assert_raise Errno::ENOENT do
-        Prism.dump_file("idontexist.rb")
-      end
-
-      assert_equal "No such file or directory - idontexist.rb", error.message
-
-      assert_raise TypeError do
-        Prism.dump_file(nil)
-      end
-    end
-
-    def test_lex_file
-      assert_nothing_raised do
-        Prism.lex_file(__FILE__)
-      end
-
-      error = assert_raise Errno::ENOENT do
-        Prism.lex_file("idontexist.rb")
-      end
-
-      assert_equal "No such file or directory - idontexist.rb", error.message
-
-      assert_raise TypeError do
-        Prism.lex_file(nil)
-      end
-    end
-
-    def test_parse_lex_file
-      node, tokens = Prism.parse_lex_file(__FILE__).value
-
-      assert_kind_of ProgramNode, node
-      refute_empty tokens
-
-      error = assert_raise Errno::ENOENT do
-        Prism.parse_lex_file("idontexist.rb")
-      end
-
-      assert_equal "No such file or directory - idontexist.rb", error.message
-
-      assert_raise TypeError do
-        Prism.parse_lex_file(nil)
-      end
-    end
-
-    def test_parse_file
-      node = Prism.parse_file(__FILE__).value
-      assert_kind_of ProgramNode, node
-
-      error = assert_raise Errno::ENOENT do
-        Prism.parse_file("idontexist.rb")
-      end
-
-      assert_equal "No such file or directory - idontexist.rb", error.message
-
-      assert_raise TypeError do
-        Prism.parse_file(nil)
-      end
-    end
-
-    def test_parse_file_success
-      assert_predicate Prism.parse_file_comments(__FILE__), :any?
-
-      error = assert_raise Errno::ENOENT do
-        Prism.parse_file_comments("idontexist.rb")
-      end
-
-      assert_equal "No such file or directory - idontexist.rb", error.message
-
-      assert_raise TypeError do
-        Prism.parse_file_comments(nil)
-      end
-    end
-
-    def test_parse_file_comments
-      assert_predicate Prism.parse_file_comments(__FILE__), :any?
-
-      error = assert_raise Errno::ENOENT do
-        Prism.parse_file_comments("idontexist.rb")
-      end
-
-      assert_equal "No such file or directory - idontexist.rb", error.message
-
-      assert_raise TypeError do
-        Prism.parse_file_comments(nil)
-      end
-    end
-
-    # To accurately compare against Ripper, we need to make sure that we're
-    # running on CRuby 3.2+.
-    ripper_enabled = RUBY_ENGINE == "ruby" && RUBY_VERSION >= "3.2.0"
-
-    # The FOCUS environment variable allows you to specify one particular fixture
-    # to test, instead of all of them.
-    base = File.join(__dir__, "fixtures")
-    relatives = ENV["FOCUS"] ? [ENV["FOCUS"]] : Dir["**/*.txt", base: base]
-
-    relatives.each do |relative|
-      # These fail on TruffleRuby due to a difference in Symbol#inspect: :测试 vs :"测试"
-      next if RUBY_ENGINE == "truffleruby" and %w[emoji_method_calls.txt seattlerb/bug202.txt seattlerb/magic_encoding_comment.txt].include?(relative)
-
-      filepath = File.join(base, relative)
-      snapshot = File.expand_path(File.join("snapshots", relative), __dir__)
-
-      directory = File.dirname(snapshot)
-      FileUtils.mkdir_p(directory) unless File.directory?(directory)
-
-      ripper_should_parse = ripper_should_match = ripper_enabled
-
-      # This file has changed behavior in Ripper in Ruby 3.3, so we skip it if
-      # we're on an earlier version.
-      ripper_should_match = false if relative == "seattlerb/pct_w_heredoc_interp_nested.txt" && RUBY_VERSION < "3.3.0"
-
-      # It seems like there are some oddities with nested heredocs and ripper.
-      # Waiting for feedback on https://bugs.ruby-lang.org/issues/19838.
-      ripper_should_match = false if relative == "seattlerb/heredoc_nested.txt"
-
-      # Ripper seems to have a bug that the regex portions before and after the heredoc are combined
-      # into a single token. See https://bugs.ruby-lang.org/issues/19838.
-      #
-      # Additionally, Ripper cannot parse the %w[] fixture in this file, so set ripper_should_parse to false.
-      ripper_should_parse = false if relative == "spanning_heredoc.txt"
-
-      # Ruby < 3.3.0 cannot parse heredocs where there are leading whitespace charactes in the heredoc start.
-      # Example: <<~'   EOF' or <<-'  EOF'
-      # https://bugs.ruby-lang.org/issues/19539
-      ripper_should_parse = false if relative == "heredocs_leading_whitespace.txt" && RUBY_VERSION < "3.3.0"
-
-      define_method "test_filepath_#{relative}" do
-        # First, read the source from the filepath. Use binmode to avoid converting CRLF on Windows,
-        # and explicitly set the external encoding to UTF-8 to override the binmode default.
-        source = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
-
-        if ripper_should_parse
-          src = source
-
-          case relative
-          when /break|next|redo|if|unless|rescue|control|keywords|retry/
-            # Uncaught syntax errors: Invalid break, Invalid next
-            src = "->do\nrescue\n#{src}\nend"
-            ripper_should_match = false
-          end
-          case src
-          when /^ *yield/
-            # Uncaught syntax errors: Invalid yield
-            src = "def __invalid_yield__\n#{src}\nend"
-            ripper_should_match = false
-          end
-
-          # Make sure that it can be correctly parsed by Ripper. If it can't, then we have a fixture
-          # that is invalid Ruby.
-          refute_nil(Ripper.sexp_raw(src), "Ripper failed to parse")
-        end
-
-        # Next, assert that there were no errors during parsing.
-        result = Prism.parse(source, filepath: relative)
-        assert_empty result.errors
-
-        # Next, pretty print the source.
-        printed = PP.pp(result.value, +"", 79)
-
-        if File.exist?(snapshot)
-          saved = File.read(snapshot)
-
-          # If the snapshot file exists, but the printed value does not match the
-          # snapshot, then update the snapshot file.
-          if printed != saved
-            File.write(snapshot, printed)
-            warn("Updated snapshot at #{snapshot}.")
-          end
-
-          # If the snapshot file exists, then assert that the printed value
-          # matches the snapshot.
-          assert_equal(saved, printed)
-        else
-          # If the snapshot file does not yet exist, then write it out now.
-          File.write(snapshot, printed)
-          warn("Created snapshot at #{snapshot}.")
-        end
-
-        # Next, assert that the value can be serialized and deserialized without
-        # changing the shape of the tree.
-        assert_equal_nodes(result.value, Prism.load(source, Prism.dump(source, filepath: relative)).value)
-
-        # Next, check that the location ranges of each node in the tree are a
-        # superset of their respective child nodes.
-        assert_non_overlapping_locations(result.value)
-
-        # Next, assert that the newlines are in the expected places.
-        expected_newlines = [0]
-        source.b.scan("\n") { expected_newlines << $~.offset(0)[0] + 1 }
-        assert_equal expected_newlines, Debug.newlines(source)
-
-        if ripper_should_parse && ripper_should_match
-          # Finally, assert that we can lex the source and get the same tokens as
-          # Ripper.
-          lex_result = Prism.lex_compat(source)
-          assert_equal [], lex_result.errors
-          tokens = lex_result.value
-
-          begin
-            Prism.lex_ripper(source).zip(tokens).each do |(ripper, prism)|
-              assert_equal ripper, prism
-            end
-          rescue SyntaxError
-            raise ArgumentError, "Test file has invalid syntax #{filepath}"
-          end
-
-          # Next, check that we get the correct number of magic comments when
-          # lexing with ripper.
-          expected = MagicCommentRipper.new(source).tap(&:parse).magic_comments
-          actual = result.magic_comments
-
-          assert_equal expected.length, actual.length
-          expected.zip(actual).each do |(expected_key, expected_value), magic_comment|
-            assert_equal expected_key, magic_comment.key
-            assert_equal expected_value, magic_comment.value
-          end
-        end
-      end
-    end
-
-    Dir["*.txt", base: base].each do |relative|
-      next if relative == "newline_terminated.txt" || relative == "spanning_heredoc_newlines.txt"
-
-      # We test every snippet (separated by \n\n) in isolation
-      # to ensure the parser does not try to read bytes further than the end of each snippet
-      define_method "test_individual_snippets_#{relative}" do
-        filepath = File.join(base, relative)
-
-        # First, read the source from the filepath. Use binmode to avoid converting CRLF on Windows,
-        # and explicitly set the external encoding to UTF-8 to override the binmode default.
-        file_contents = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
-
-        file_contents.split(/(?<=\S)\n\n(?=\S)/).each do |snippet|
-          snippet = snippet.rstrip
-          result = Prism.parse(snippet, filepath: relative)
-          assert_empty result.errors
-
-          assert_equal_nodes(result.value, Prism.load(snippet, Prism.dump(snippet, filepath: relative)).value)
-        end
-      end
-    end
-
-    private
-
-    # Check that the location ranges of each node in the tree are a superset of
-    # their respective child nodes.
-    def assert_non_overlapping_locations(node)
-      queue = [node]
-
-      while (current = queue.shift)
-        # We only want to compare parent/child location overlap in the case that
-        # we are not looking at a heredoc. That's because heredoc locations are
-        # special in that they only use the declaration of the heredoc.
-        compare = !(current.is_a?(StringNode) ||
-                    current.is_a?(XStringNode) ||
-                    current.is_a?(InterpolatedStringNode) ||
-                    current.is_a?(InterpolatedXStringNode)) ||
-        !current.opening&.start_with?("<<")
-
-        current.child_nodes.each do |child|
-          # child_nodes can return nil values, so we need to skip those.
-          next unless child
-
-          # Now that we know we have a child node, add that to the queue.
-          queue << child
-
-          if compare
-            assert_operator current.location.start_offset, :<=, child.location.start_offset
-            assert_operator current.location.end_offset, :>=, child.location.end_offset
-          end
-        end
-      end
-    end
-
-    def find_source_file_node(program)
-      queue = [program]
-      while (node = queue.shift)
-        return node if node.is_a?(SourceFileNode)
-        queue.concat(node.compact_child_nodes)
-      end
-    end
-
-    def ignore_warnings
-      previous_verbosity = $VERBOSE
-      $VERBOSE = nil
-      yield
-    ensure
-      $VERBOSE = previous_verbosity
-    end
-  end
-end
diff --git a/test/mri/prism/parser_test.rb b/test/mri/prism/parser_test.rb
deleted file mode 100644
index 237a4397cae..00000000000
--- a/test/mri/prism/parser_test.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-begin
-  verbose, $VERBOSE = $VERBOSE, nil
-  require "parser/ruby33"
-  require "prism/translation/parser33"
-rescue LoadError
-  # In CRuby's CI, we're not going to test against the parser gem because we
-  # don't want to have to install it. So in this case we'll just skip this test.
-  return
-ensure
-  $VERBOSE = verbose
-end
-
-# First, opt in to every AST feature.
-Parser::Builders::Default.modernize
-
-# Modify the source map == check so that it doesn't check against the node
-# itself so we don't get into a recursive loop.
-Parser::Source::Map.prepend(
-  Module.new {
-    def ==(other)
-      self.class == other.class &&
-        (instance_variables - %i[@node]).map do |ivar|
-          instance_variable_get(ivar) == other.instance_variable_get(ivar)
-        end.reduce(:&)
-    end
-  }
-)
-
-# Next, ensure that we're comparing the nodes and also comparing the source
-# ranges so that we're getting all of the necessary information.
-Parser::AST::Node.prepend(
-  Module.new {
-    def ==(other)
-      super && (location == other.location)
-    end
-  }
-)
-
-module Prism
-  class ParserTest < TestCase
-    base = File.join(__dir__, "fixtures")
-
-    # These files are erroring because of the parser gem being wrong.
-    skip_incorrect = [
-      "embdoc_no_newline_at_end.txt"
-    ]
-
-    # These files are either failing to parse or failing to translate, so we'll
-    # skip them for now.
-    skip_all = skip_incorrect | [
-      "dash_heredocs.txt",
-      "dos_endings.txt",
-      "heredocs_with_ignored_newlines.txt",
-      "regex.txt",
-      "regex_char_width.txt",
-      "spanning_heredoc.txt",
-      "spanning_heredoc_newlines.txt",
-      "tilde_heredocs.txt",
-      "unescaping.txt"
-    ]
-
-    # Not sure why these files are failing on JRuby, but skipping them for now.
-    if RUBY_ENGINE == "jruby"
-      skip_all.push("emoji_method_calls.txt", "symbols.txt")
-    end
-
-    # These files are failing to translate their lexer output into the lexer
-    # output expected by the parser gem, so we'll skip them for now.
-    skip_tokens = [
-      "comments.txt",
-      "heredoc_with_comment.txt",
-      "indented_file_end.txt",
-      "strings.txt",
-      "xstring_with_backslash.txt"
-    ]
-
-    Dir["*.txt", base: base].each do |name|
-      next if skip_all.include?(name)
-
-      define_method("test_#{name}") do
-        assert_equal_parses(File.join(base, name), compare_tokens: !skip_tokens.include?(name))
-      end
-    end
-
-    private
-
-    def assert_equal_parses(filepath, compare_tokens: true)
-      buffer = Parser::Source::Buffer.new(filepath, 1)
-      buffer.source = File.read(filepath)
-
-      parser = Parser::Ruby33.new
-      parser.diagnostics.consumer = ->(*) {}
-      parser.diagnostics.all_errors_are_fatal = true
-
-      expected_ast, expected_comments, expected_tokens =
-        begin
-          parser.tokenize(buffer)
-        rescue ArgumentError, Parser::SyntaxError
-          return
-        end
-
-      actual_ast, actual_comments, actual_tokens =
-        Prism::Translation::Parser33.new.tokenize(buffer)
-
-      assert_equal expected_ast, actual_ast, -> { assert_equal_asts_message(expected_ast, actual_ast) }
-      assert_equal_tokens(expected_tokens, actual_tokens) if compare_tokens
-      assert_equal_comments(expected_comments, actual_comments)
-    end
-
-    def assert_equal_asts_message(expected_ast, actual_ast)
-      queue = [[expected_ast, actual_ast]]
-
-      while (left, right = queue.shift)
-        if left.type != right.type
-          return "expected: #{left.type}\nactual: #{right.type}"
-        end
-
-        if left.location != right.location
-          return "expected:\n#{left.inspect}\n#{left.location.inspect}\nactual:\n#{right.inspect}\n#{right.location.inspect}"
-        end
-
-        if left.type == :str && left.children[0] != right.children[0]
-          return "expected: #{left.inspect}\nactual: #{right.inspect}"
-        end
-
-        left.children.zip(right.children).each do |left_child, right_child|
-          queue << [left_child, right_child] if left_child.is_a?(Parser::AST::Node)
-        end
-      end
-
-      "expected: #{expected_ast.inspect}\nactual: #{actual_ast.inspect}"
-    end
-
-    def assert_equal_tokens(expected_tokens, actual_tokens)
-      if expected_tokens != actual_tokens
-        expected_index = 0
-        actual_index = 0
-
-        while expected_index < expected_tokens.length
-          expected_token = expected_tokens[expected_index]
-          actual_token = actual_tokens[actual_index]
-
-          expected_index += 1
-          actual_index += 1
-
-          # The parser gem always has a space before a string end in list
-          # literals, but we don't. So we'll skip over the space.
-          if expected_token[0] == :tSPACE && actual_token[0] == :tSTRING_END
-            expected_index += 1
-            next
-          end
-
-          # There are a lot of tokens that have very specific meaning according
-          # to the context of the parser. We don't expose that information in
-          # prism, so we need to normalize these tokens a bit.
-          case actual_token[0]
-          when :kDO
-            actual_token[0] = expected_token[0] if %i[kDO_BLOCK kDO_LAMBDA].include?(expected_token[0])
-          when :tLPAREN
-            actual_token[0] = expected_token[0] if expected_token[0] == :tLPAREN2
-          when :tPOW
-            actual_token[0] = expected_token[0] if expected_token[0] == :tDSTAR
-          end
-
-          # Now we can assert that the tokens are actually equal.
-          assert_equal expected_token, actual_token, -> {
-            "expected: #{expected_token.inspect}\n" \
-            "actual: #{actual_token.inspect}"
-          }
-        end
-      end
-    end
-
-    def assert_equal_comments(expected_comments, actual_comments)
-      assert_equal expected_comments, actual_comments, -> {
-        "expected: #{expected_comments.inspect}\n" \
-        "actual: #{actual_comments.inspect}"
-      }
-    end
-  end
-end
diff --git a/test/mri/prism/pattern_test.rb b/test/mri/prism/pattern_test.rb
deleted file mode 100644
index e0aa079cb9c..00000000000
--- a/test/mri/prism/pattern_test.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class PatternTest < TestCase
-    def test_invalid_syntax
-      assert_raise(Pattern::CompilationError) { scan("", "<>") }
-    end
-
-    def test_invalid_constant
-      assert_raise(Pattern::CompilationError) { scan("", "Foo") }
-    end
-
-    def test_invalid_nested_constant
-      assert_raise(Pattern::CompilationError) { scan("", "Foo::Bar") }
-    end
-
-    def test_regexp_with_interpolation
-      assert_raise(Pattern::CompilationError) { scan("", "/\#{foo}/") }
-    end
-
-    def test_string_with_interpolation
-      assert_raise(Pattern::CompilationError) { scan("", '"#{foo}"') }
-    end
-
-    def test_symbol_with_interpolation
-      assert_raise(Pattern::CompilationError) { scan("", ":\"\#{foo}\"") }
-    end
-
-    def test_invalid_node
-      assert_raise(Pattern::CompilationError) { scan("", "IntegerNode[^foo]") }
-    end
-
-    def test_self
-      assert_raise(Pattern::CompilationError) { scan("", "self") }
-    end
-
-    def test_array_pattern_no_constant
-      results = scan("1 + 2", "[IntegerNode]")
-
-      assert_equal 1, results.length
-    end
-
-    def test_array_pattern
-      results = scan("1 + 2", "CallNode[name: :+, receiver: IntegerNode, arguments: [IntegerNode]]")
-
-      assert_equal 1, results.length
-    end
-
-    def test_alternation_pattern
-      results = scan("Foo + Bar + 1", "ConstantReadNode | IntegerNode")
-
-      assert_equal 3, results.length
-      assert_equal 1, results.grep(IntegerNode).first.value
-    end
-
-    def test_constant_read_node
-      results = scan("Foo + Bar + Baz", "ConstantReadNode")
-
-      assert_equal 3, results.length
-      assert_equal %w[Bar Baz Foo], results.map(&:slice).sort
-    end
-
-    def test_object_const
-      results = scan("1 + 2 + 3", "IntegerNode[]")
-
-      assert_equal 3, results.length
-    end
-
-    def test_constant_path
-      results = scan("Foo + Bar + Baz", "Prism::ConstantReadNode")
-
-      assert_equal 3, results.length
-    end
-
-    def test_hash_pattern_no_constant
-      results = scan("Foo + Bar + Baz", "{ name: :+ }")
-
-      assert_equal 2, results.length
-    end
-
-    def test_hash_pattern_regexp
-      results = scan("Foo + Bar + Baz", "{ name: /^[[:punct:]]$/ }")
-
-      assert_equal 2, results.length
-      assert_equal ["Prism::CallNode"], results.map { |node| node.class.name }.uniq
-    end
-
-    def test_nil
-      results = scan("foo", "{ receiver: nil }")
-
-      assert_equal 1, results.length
-    end
-
-    def test_regexp_options
-      results = scan("@foo + @bar + @baz", "InstanceVariableReadNode[name: /^@B/i]")
-
-      assert_equal 2, results.length
-    end
-
-    def test_string_empty
-      results = scan("", "''")
-
-      assert_empty results
-    end
-
-    def test_symbol_empty
-      results = scan("", ":''")
-
-      assert_empty results
-    end
-
-    def test_symbol_plain
-      results = scan("@foo", "{ name: :\"@foo\" }")
-
-      assert_equal 1, results.length
-    end
-
-    def test_symbol
-      results = scan("@foo", "{ name: :@foo }")
-
-      assert_equal 1, results.length
-    end
-
-    private
-
-    def scan(source, query)
-      Prism::Pattern.new(query).scan(Prism.parse(source).value).to_a
-    end
-  end
-end
diff --git a/test/mri/prism/ractor_test.rb b/test/mri/prism/ractor_test.rb
new file mode 100644
index 00000000000..0e008ffb088
--- /dev/null
+++ b/test/mri/prism/ractor_test.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+return unless defined?(Ractor) && Process.respond_to?(:fork)
+
+require_relative "test_helper"
+
+module Prism
+  class RactorTest < TestCase
+    def test_version
+      assert_match(/\A\d+\.\d+\.\d+\z/, with_ractor { Prism::VERSION })
+    end
+
+    def test_parse_file
+      assert_equal("Prism::ParseResult", with_ractor(__FILE__) { |filepath| Prism.parse_file(filepath).class })
+    end
+
+    def test_lex_file
+      assert_equal("Prism::LexResult", with_ractor(__FILE__) { |filepath| Prism.lex_file(filepath).class })
+    end
+
+    def test_parse_file_comments
+      assert_equal("Array", with_ractor(__FILE__) { |filepath| Prism.parse_file_comments(filepath).class })
+    end
+
+    def test_parse_lex_file
+      assert_equal("Prism::ParseLexResult", with_ractor(__FILE__) { |filepath| Prism.parse_lex_file(filepath).class })
+    end
+
+    def test_parse_success
+      assert_equal("true", with_ractor("1 + 1") { |source| Prism.parse_success?(source) })
+    end
+
+    def test_parse_failure
+      assert_equal("true", with_ractor("1 +") { |source| Prism.parse_failure?(source) })
+    end
+
+    def test_string_query_local
+      assert_equal("true", with_ractor("foo") { |source| StringQuery.local?(source) })
+    end
+
+    def test_string_query_constant
+      assert_equal("true", with_ractor("FOO") { |source| StringQuery.constant?(source) })
+    end
+
+    def test_string_query_method_name
+      assert_equal("true", with_ractor("foo?") { |source| StringQuery.method_name?(source) })
+    end
+
+    if !ENV["PRISM_BUILD_MINIMAL"]
+      def test_dump_file
+        result = with_ractor(__FILE__) { |filepath| Prism.dump_file(filepath) }
+        assert_operator(result, :start_with?, "PRISM")
+      end
+    end
+
+    private
+
+    # Note that this must be done in a subprocess, otherwise it can mess up
+    # CRuby's test suite.
+    def with_ractor(*arguments, &block)
+      IO.popen("-") do |reader|
+        if reader
+          reader.gets.chomp
+        else
+          ractor = ignore_warnings { Ractor.new(*arguments, &block) }
+
+          # Somewhere in the Ruby 4.0.* series, Ractor#take was removed and
+          # Ractor#value was added.
+          puts(ractor.respond_to?(:value) ? ractor.value : ractor.take)
+        end
+      end
+    end
+  end
+end
diff --git a/test/mri/prism/result/named_capture_test.rb b/test/mri/prism/result/named_capture_test.rb
new file mode 100644
index 00000000000..36cb9108992
--- /dev/null
+++ b/test/mri/prism/result/named_capture_test.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class NamedCaptureTest < TestCase
+    def test_hex_escapes
+      assert_equal :😀, parse_name("\\xf0\\x9f\\x98\\x80")
+    end
+
+    def test_unicode_escape
+      assert_equal :し, parse_name("\\u3057")
+    end
+
+    def test_unicode_escapes_bracess
+      assert_equal :😀, parse_name("\\u{1f600}")
+    end
+
+    def test_octal_escapes
+      assert_equal :😀, parse_name("\\xf0\\x9f\\x98\\200")
+    end
+
+    private
+
+    def parse_name(content)
+      Prism.parse_statement("/(?<#{content}>)/ =~ ''").targets.first.name
+    end
+  end
+end
diff --git a/test/mri/prism/result/source_location_test.rb b/test/mri/prism/result/source_location_test.rb
index 7bdc707658e..38b971d02b8 100644
--- a/test/mri/prism/result/source_location_test.rb
+++ b/test/mri/prism/result/source_location_test.rb
@@ -13,7 +13,7 @@ def test_AliasMethodNode
     end
 
     def test_AlternationPatternNode
-      assert_location(AlternationPatternNode, "foo => bar | baz", 7...16, &:pattern)
+      assert_location(AlternationPatternNode, "foo => 0 | 1", 7...12, &:pattern)
     end
 
     def test_AndNode
diff --git a/test/mri/prism/result/string_test.rb b/test/mri/prism/result/string_test.rb
new file mode 100644
index 00000000000..48c7f592eb9
--- /dev/null
+++ b/test/mri/prism/result/string_test.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class StringTest < TestCase
+    def test_regular_expression_node_unescaped_frozen
+      node = Prism.parse_statement("/foo/")
+      assert_predicate node.unescaped, :frozen?
+    end
+
+    def test_source_file_node_filepath_frozen
+      node = Prism.parse_statement("__FILE__")
+      assert_predicate node.filepath, :frozen?
+    end
+
+    def test_string_node_unescaped_frozen
+      node = Prism.parse_statement('"foo"')
+      assert_predicate node.unescaped, :frozen?
+    end
+
+    def test_symbol_node_unescaped_frozen
+      node = Prism.parse_statement(":foo")
+      assert_predicate node.unescaped, :frozen?
+    end
+
+    def test_xstring_node_unescaped_frozen
+      node = Prism.parse_statement("`foo`")
+      assert_predicate node.unescaped, :frozen?
+    end
+  end
+end
diff --git a/test/mri/prism/result/warnings_test.rb b/test/mri/prism/result/warnings_test.rb
index 04542dbada1..4643fb134fe 100644
--- a/test/mri/prism/result/warnings_test.rb
+++ b/test/mri/prism/result/warnings_test.rb
@@ -339,7 +339,7 @@ def test_unreachable_statement
       assert_warning("tap { redo; foo }", "statement not reached")
     end
 
-    if RbConfig::CONFIG["host_os"].match?(/bccwin|cygwin|djgpp|mingw|mswin|wince/i)
+    if windows?
       def test_shebang_ending_with_carriage_return
         refute_warning("#!ruby\r\np(123)\n", compare: false)
       end
diff --git a/test/mri/prism/ripper_test.rb b/test/mri/prism/ripper_test.rb
deleted file mode 100644
index 07238fc3d54..00000000000
--- a/test/mri/prism/ripper_test.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-return if RUBY_VERSION < "3.3"
-
-require_relative "test_helper"
-
-module Prism
-  class RipperTest < TestCase
-    base = File.join(__dir__, "fixtures")
-    relatives = ENV["FOCUS"] ? [ENV["FOCUS"]] : Dir["**/*.txt", base: base]
-
-    incorrect = [
-      # Ripper incorrectly attributes the block to the keyword.
-      "seattlerb/block_break.txt",
-      "seattlerb/block_next.txt",
-      "seattlerb/block_return.txt",
-      "whitequark/break_block.txt",
-      "whitequark/next_block.txt",
-      "whitequark/return_block.txt",
-
-      # Ripper is not accounting for locals created by patterns using the **
-      # operator within an `in` clause.
-      "seattlerb/parse_pattern_058.txt",
-
-      # Ripper cannot handle named capture groups in regular expressions.
-      "regex.txt",
-      "regex_char_width.txt",
-      "whitequark/lvar_injecting_match.txt",
-
-      # Ripper fails to understand some structures that span across heredocs.
-      "spanning_heredoc.txt"
-    ]
-
-    omitted = [
-      "dos_endings.txt",
-      "heredocs_with_ignored_newlines.txt",
-      "seattlerb/block_call_dot_op2_brace_block.txt",
-      "seattlerb/block_command_operation_colon.txt",
-      "seattlerb/block_command_operation_dot.txt",
-      "seattlerb/heredoc__backslash_dos_format.txt",
-      "seattlerb/heredoc_backslash_nl.txt",
-      "seattlerb/heredoc_nested.txt",
-      "seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt",
-      "tilde_heredocs.txt",
-      "unparser/corpus/semantic/dstr.txt",
-      "whitequark/dedenting_heredoc.txt",
-      "whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt",
-      "whitequark/parser_slash_slash_n_escaping_in_literals.txt",
-      "whitequark/send_block_chain_cmd.txt",
-      "whitequark/slash_newline_in_heredocs.txt"
-    ]
-
-    relatives.each do |relative|
-      # Skip the tests that Ripper is reporting the wrong results for.
-      next if incorrect.include?(relative)
-
-      # Skip the tests we haven't implemented yet.
-      next if omitted.include?(relative)
-
-      filepath = File.join(__dir__, "fixtures", relative)
-
-      define_method "test_ripper_#{relative}" do
-        source = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
-
-        case relative
-        when /break|next|redo|if|unless|rescue|control|keywords|retry/
-          source = "-> do\nrescue\n#{source}\nend"
-        end
-
-        case source
-        when /^ *yield/
-          source = "def __invalid_yield__\n#{source}\nend"
-        end
-
-        assert_ripper(source)
-      end
-    end
-
-    private
-
-    def assert_ripper(source)
-      assert_equal Ripper.sexp_raw(source), Prism::Translation::Ripper.sexp_raw(source)
-    end
-  end
-end
diff --git a/test/mri/prism/ruby/dispatcher_test.rb b/test/mri/prism/ruby/dispatcher_test.rb
index 1b6d7f4117e..83eb29e1f3b 100644
--- a/test/mri/prism/ruby/dispatcher_test.rb
+++ b/test/mri/prism/ruby/dispatcher_test.rb
@@ -25,9 +25,12 @@ def on_integer_node_enter(node)
     end
 
     def test_dispatching_events
-      listener = TestListener.new
+      listener_manual = TestListener.new
+      listener_public = TestListener.new
+
       dispatcher = Dispatcher.new
-      dispatcher.register(listener, :on_call_node_enter, :on_call_node_leave, :on_integer_node_enter)
+      dispatcher.register(listener_manual, :on_call_node_enter, :on_call_node_leave, :on_integer_node_enter)
+      dispatcher.register_public_methods(listener_public)
 
       root = Prism.parse(<<~RUBY).value
         def foo
@@ -36,11 +39,17 @@ def foo
       RUBY
 
       dispatcher.dispatch(root)
-      assert_equal([:on_call_node_enter, :on_integer_node_enter, :on_integer_node_enter, :on_integer_node_enter, :on_call_node_leave], listener.events_received)
 
-      listener.events_received.clear
+      [listener_manual, listener_public].each do |listener|
+        assert_equal([:on_call_node_enter, :on_integer_node_enter, :on_integer_node_enter, :on_integer_node_enter, :on_call_node_leave], listener.events_received)
+        listener.events_received.clear
+      end
+
       dispatcher.dispatch_once(root.statements.body.first.body.body.first)
-      assert_equal([:on_call_node_enter, :on_call_node_leave], listener.events_received)
+
+      [listener_manual, listener_public].each do |listener|
+        assert_equal([:on_call_node_enter, :on_call_node_leave], listener.events_received)
+      end
     end
   end
 end
diff --git a/test/mri/prism/ruby/location_test.rb b/test/mri/prism/ruby/location_test.rb
index 33f844243c0..5e2ab63802b 100644
--- a/test/mri/prism/ruby/location_test.rb
+++ b/test/mri/prism/ruby/location_test.rb
@@ -13,19 +13,22 @@ def test_join
       assert_equal 0, joined.start_offset
       assert_equal 10, joined.length
 
-      assert_raise(RuntimeError, "Incompatible locations") do
+      e = assert_raise(RuntimeError) do
         argument.location.join(receiver.location)
       end
+      assert_equal "Incompatible locations", e.message
 
       other_argument = Prism.parse_statement("1234 + 567").arguments.arguments.first
 
-      assert_raise(RuntimeError, "Incompatible sources") do
+      e = assert_raise(RuntimeError) do
         other_argument.location.join(receiver.location)
       end
+      assert_equal "Incompatible sources", e.message
 
-      assert_raise(RuntimeError, "Incompatible sources") do
+      e = assert_raise(RuntimeError) do
         receiver.location.join(other_argument.location)
       end
+      assert_equal "Incompatible sources", e.message
     end
 
     def test_character_offsets
diff --git a/test/mri/prism/ruby/parameters_signature_test.rb b/test/mri/prism/ruby/parameters_signature_test.rb
index 9256bcc0703..ea1eea106ba 100644
--- a/test/mri/prism/ruby/parameters_signature_test.rb
+++ b/test/mri/prism/ruby/parameters_signature_test.rb
@@ -54,9 +54,10 @@ def test_keyrest_anonymous
       assert_parameters([[:keyrest, :**]], "**")
     end
 
-    def test_key_ordering
-      omit("TruffleRuby returns keys in order they were declared") if RUBY_ENGINE == "truffleruby"
-      assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
+    if RUBY_ENGINE == "ruby"
+      def test_key_ordering
+        assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
+      end
     end
 
     def test_block
diff --git a/test/mri/prism/ruby/parser_test.rb b/test/mri/prism/ruby/parser_test.rb
index 606a0e54f64..df290a6a8e2 100644
--- a/test/mri/prism/ruby/parser_test.rb
+++ b/test/mri/prism/ruby/parser_test.rb
@@ -6,6 +6,7 @@
   verbose, $VERBOSE = $VERBOSE, nil
   require "parser/ruby33"
   require "prism/translation/parser33"
+  require "prism/translation/parser34"
 rescue LoadError
   # In CRuby's CI, we're not going to test against the parser gem because we
   # don't want to have to install it. So in this case we'll just skip this test.
@@ -16,6 +17,19 @@
 
 # First, opt in to every AST feature.
 Parser::Builders::Default.modernize
+Prism::Translation::Parser::Builder.modernize
+
+# The parser gem rejects some strings that would most likely lead to errors
+# in consumers due to encoding problems. RuboCop however monkey-patches this
+# method out in order to accept such code.
+# https://github.com/whitequark/parser/blob/v3.3.6.0/lib/parser/builders/default.rb#L2289-L2295
+Parser::Builders::Default.prepend(
+  Module.new {
+    def string_value(token)
+      value(token)
+    end
+  }
+)
 
 # Modify the source map == check so that it doesn't check against the node
 # itself so we don't get into a recursive loop.
@@ -42,6 +56,22 @@ def ==(other)
 
 module Prism
   class ParserTest < TestCase
+    # These files contain code with valid syntax that can't be parsed.
+    skip_syntax_error = [
+      # alias/undef with %s(abc) symbol literal
+      "alias.txt",
+      "seattlerb/bug_215.txt",
+
+      # %Q with newline delimiter and heredoc interpolation
+      "heredoc_percent_q_newline_delimiter.txt",
+
+      # 1.. && 2
+      "ranges.txt",
+
+      # https://bugs.ruby-lang.org/issues/21168#note-5
+      "command_method_call_2.txt",
+    ]
+
     # These files contain code that is being parsed incorrectly by the parser
     # gem, and therefore we don't want to compare against our translation.
     skip_incorrect = [
@@ -53,134 +83,131 @@ class ParserTest < TestCase
       "seattlerb/heredoc_nested.txt",
 
       # https://github.com/whitequark/parser/issues/1016
-      "whitequark/unary_num_pow_precedence.txt"
-    ]
+      "whitequark/unary_num_pow_precedence.txt",
 
-    # These files are either failing to parse or failing to translate, so we'll
-    # skip them for now.
-    skip_all = skip_incorrect | [
-      "regex.txt",
-      "unescaping.txt",
-      "seattlerb/bug190.txt",
+      # https://github.com/whitequark/parser/issues/950
+      "whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt",
+
+      # Contains an escaped multibyte character. This is supposed to drop to backslash
+      "seattlerb/regexp_escape_extended.txt",
+
+      # https://github.com/whitequark/parser/issues/1020
+      # These contain consecutive \r characters, followed by \n. Prism only receives
+      # the already modified source buffer which dropped one \r but must know the
+      # original code to parse it correctly.
       "seattlerb/heredoc_with_extra_carriage_returns_windows.txt",
       "seattlerb/heredoc_with_only_carriage_returns_windows.txt",
       "seattlerb/heredoc_with_only_carriage_returns.txt",
-      "seattlerb/parse_line_heredoc_hardnewline.txt",
-      "seattlerb/pctW_lineno.txt",
+
+      # https://github.com/whitequark/parser/issues/1026
+      # Regex with \c escape
+      "unescaping.txt",
       "seattlerb/regexp_esc_C_slash.txt",
-      "unparser/corpus/literal/literal.txt",
-      "unparser/corpus/semantic/dstr.txt",
-      "whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt",
-      "whitequark/parser_slash_slash_n_escaping_in_literals.txt",
-      "whitequark/ruby_bug_11989.txt"
-    ]
 
-    # Not sure why these files are failing on JRuby, but skipping them for now.
-    if RUBY_ENGINE == "jruby"
-      skip_all.push("emoji_method_calls.txt", "symbols.txt")
-    end
+      # https://github.com/whitequark/parser/issues/1084
+      "unary_method_calls.txt",
+    ]
 
     # These files are failing to translate their lexer output into the lexer
     # output expected by the parser gem, so we'll skip them for now.
     skip_tokens = [
-      "comments.txt",
       "dash_heredocs.txt",
-      "dos_endings.txt",
       "embdoc_no_newline_at_end.txt",
-      "heredoc_with_comment.txt",
-      "heredocs_with_ignored_newlines.txt",
-      "indented_file_end.txt",
       "methods.txt",
-      "strings.txt",
-      "tilde_heredocs.txt",
-      "xstring_with_backslash.txt",
-      "seattlerb/backticks_interpolation_line.txt",
       "seattlerb/bug169.txt",
       "seattlerb/case_in.txt",
-      "seattlerb/class_comments.txt",
       "seattlerb/difficult4__leading_dots2.txt",
       "seattlerb/difficult6__7.txt",
       "seattlerb/difficult6__8.txt",
-      "seattlerb/dsym_esc_to_sym.txt",
-      "seattlerb/heredoc__backslash_dos_format.txt",
-      "seattlerb/heredoc_backslash_nl.txt",
-      "seattlerb/heredoc_comma_arg.txt",
-      "seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt",
-      "seattlerb/heredoc_squiggly_blank_lines.txt",
-      "seattlerb/heredoc_squiggly_interp.txt",
-      "seattlerb/heredoc_squiggly_tabs_extra.txt",
-      "seattlerb/heredoc_squiggly_tabs.txt",
-      "seattlerb/heredoc_squiggly_visually_blank_lines.txt",
-      "seattlerb/heredoc_squiggly.txt",
       "seattlerb/heredoc_unicode.txt",
-      "seattlerb/heredoc_with_carriage_return_escapes_windows.txt",
-      "seattlerb/heredoc_with_carriage_return_escapes.txt",
-      "seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt",
-      "seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt",
-      "seattlerb/interpolated_symbol_array_line_breaks.txt",
-      "seattlerb/interpolated_word_array_line_breaks.txt",
-      "seattlerb/label_vs_string.txt",
-      "seattlerb/module_comments.txt",
-      "seattlerb/non_interpolated_symbol_array_line_breaks.txt",
-      "seattlerb/non_interpolated_word_array_line_breaks.txt",
-      "seattlerb/parse_line_block_inline_comment_leading_newlines.txt",
-      "seattlerb/parse_line_block_inline_comment.txt",
-      "seattlerb/parse_line_block_inline_multiline_comment.txt",
-      "seattlerb/parse_line_dstr_escaped_newline.txt",
       "seattlerb/parse_line_heredoc.txt",
-      "seattlerb/parse_line_multiline_str_literal_n.txt",
-      "seattlerb/parse_line_str_with_newline_escape.txt",
       "seattlerb/pct_w_heredoc_interp_nested.txt",
-      "seattlerb/qsymbols_empty_space.txt",
-      "seattlerb/qw_escape_term.txt",
-      "seattlerb/qWords_space.txt",
-      "seattlerb/read_escape_unicode_curlies.txt",
-      "seattlerb/read_escape_unicode_h4.txt",
       "seattlerb/required_kwarg_no_value.txt",
-      "seattlerb/slashy_newlines_within_string.txt",
-      "seattlerb/str_double_escaped_newline.txt",
-      "seattlerb/str_double_newline.txt",
-      "seattlerb/str_evstr_escape.txt",
-      "seattlerb/str_newline_hash_line_number.txt",
-      "seattlerb/str_single_newline.txt",
-      "seattlerb/symbols_empty_space.txt",
       "seattlerb/TestRubyParserShared.txt",
       "unparser/corpus/literal/assignment.txt",
-      "unparser/corpus/literal/dstr.txt",
-      "unparser/corpus/semantic/opasgn.txt",
+      "unparser/corpus/literal/literal.txt",
       "whitequark/args.txt",
       "whitequark/beginless_erange_after_newline.txt",
       "whitequark/beginless_irange_after_newline.txt",
-      "whitequark/bug_ascii_8bit_in_literal.txt",
-      "whitequark/bug_def_no_paren_eql_begin.txt",
-      "whitequark/dedenting_heredoc.txt",
-      "whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt",
       "whitequark/forward_arg_with_open_args.txt",
-      "whitequark/interp_digit_var.txt",
+      "whitequark/kwarg_no_paren.txt",
       "whitequark/lbrace_arg_after_command_args.txt",
       "whitequark/multiple_pattern_matches.txt",
       "whitequark/newline_in_hash_argument.txt",
-      "whitequark/parser_bug_640.txt",
-      "whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt",
-      "whitequark/ruby_bug_11990.txt",
+      "whitequark/pattern_matching_expr_in_paren.txt",
+      "whitequark/pattern_matching_hash.txt",
       "whitequark/ruby_bug_14690.txt",
       "whitequark/ruby_bug_9669.txt",
-      "whitequark/slash_newline_in_heredocs.txt",
       "whitequark/space_args_arg_block.txt",
       "whitequark/space_args_block.txt"
     ]
 
-    Fixture.each do |fixture|
+    Fixture.each_for_version(except: skip_syntax_error, version: "3.3") do |fixture|
       define_method(fixture.test_name) do
         assert_equal_parses(
           fixture,
-          compare_asts: !skip_all.include?(fixture.path),
+          compare_asts: !skip_incorrect.include?(fixture.path),
           compare_tokens: !skip_tokens.include?(fixture.path),
           compare_comments: fixture.path != "embdoc_no_newline_at_end.txt"
         )
       end
     end
 
+    def test_non_prism_builder_class_deprecated
+      warnings = capture_warnings { Prism::Translation::Parser33.new(Parser::Builders::Default.new) }
+
+      assert_include(warnings, "#{__FILE__}:#{__LINE__ - 2}")
+      assert_include(warnings, "is not a `Prism::Translation::Parser::Builder` subclass")
+
+      warnings = capture_warnings { Prism::Translation::Parser33.new }
+      assert_empty(warnings)
+    end
+
+    if RUBY_VERSION >= "3.3"
+      def test_current_parser_for_current_ruby
+        major, minor = CURRENT_MAJOR_MINOR.split(".")
+        # Let's just hope there never is a Ruby 3.10 or similar
+        expected = major.to_i * 10 + minor.to_i
+        assert_equal(expected, Translation::ParserCurrent.new.version)
+      end
+    end
+
+    def test_invalid_syntax
+      code = <<~RUBY
+        foo do
+          case bar
+          when
+          end
+        end
+      RUBY
+      buffer = Parser::Source::Buffer.new("(string)")
+      buffer.source = code
+
+      parser = Prism::Translation::Parser33.new
+      parser.diagnostics.all_errors_are_fatal = true
+      assert_raise(Parser::SyntaxError) { parser.tokenize(buffer) }
+    end
+
+    def test_it_block_parameter_syntax
+      it_fixture_path = Pathname(__dir__).join("../../../test/prism/fixtures/3.4/it.txt")
+
+      buffer = Parser::Source::Buffer.new(it_fixture_path)
+      buffer.source = it_fixture_path.read
+      actual_ast = Prism::Translation::Parser34.new.tokenize(buffer)[0]
+
+      it_block_parameter_sexp = parse_sexp {
+        s(:begin,
+        s(:itblock,
+          s(:send, nil, :x), :it,
+          s(:lvar, :it)),
+        s(:itblock,
+          s(:lambda), :it,
+          s(:lvar, :it)))
+      }
+
+      assert_equal(it_block_parameter_sexp, actual_ast.to_sexp)
+    end
+
     private
 
     def assert_equal_parses(fixture, compare_asts: true, compare_tokens: true, compare_comments: true)
@@ -192,17 +219,13 @@ def assert_equal_parses(fixture, compare_asts: true, compare_tokens: true, compa
       parser.diagnostics.all_errors_are_fatal = true
 
       expected_ast, expected_comments, expected_tokens =
-        begin
-          ignore_warnings { parser.tokenize(buffer) }
-        rescue ArgumentError, Parser::SyntaxError
-          return
-        end
+        ignore_warnings { parser.tokenize(buffer) }
 
       actual_ast, actual_comments, actual_tokens =
         ignore_warnings { Prism::Translation::Parser33.new.tokenize(buffer) }
 
       if expected_ast == actual_ast
-        if !compare_asts
+        if !compare_asts && !Fixture.custom_base_path?
           puts "#{fixture.path} is now passing"
         end
 
@@ -213,7 +236,7 @@ def assert_equal_parses(fixture, compare_asts: true, compare_tokens: true, compa
         rescue Test::Unit::AssertionFailedError
           raise if compare_tokens
         else
-          puts "#{fixture.path} is now passing" if !compare_tokens
+          puts "#{fixture.path} is now passing" if !compare_tokens && !Fixture.custom_base_path?
         end
 
         assert_equal_comments(expected_comments, actual_comments) if compare_comments
@@ -248,22 +271,14 @@ def assert_equal_asts_message(expected_ast, actual_ast)
 
     def assert_equal_tokens(expected_tokens, actual_tokens)
       if expected_tokens != actual_tokens
-        expected_index = 0
-        actual_index = 0
-
-        while expected_index < expected_tokens.length
-          expected_token = expected_tokens[expected_index]
-          actual_token = actual_tokens.fetch(actual_index, [])
+        index = 0
+        max_index = [expected_tokens, actual_tokens].map(&:size).max
 
-          expected_index += 1
-          actual_index += 1
+        while index <= max_index
+          expected_token = expected_tokens.fetch(index, [])
+          actual_token = actual_tokens.fetch(index, [])
 
-          # The parser gem always has a space before a string end in list
-          # literals, but we don't. So we'll skip over the space.
-          if expected_token[0] == :tSPACE && actual_token[0] == :tSTRING_END
-            expected_index += 1
-            next
-          end
+          index += 1
 
           # There are a lot of tokens that have very specific meaning according
           # to the context of the parser. We don't expose that information in
@@ -287,5 +302,9 @@ def assert_equal_comments(expected_comments, actual_comments)
         "actual: #{actual_comments.inspect}"
       }
     end
+
+    def parse_sexp(&block)
+      Class.new { extend AST::Sexp }.instance_eval(&block).to_sexp
+    end
   end
 end
diff --git a/test/mri/prism/ruby/ripper_test.rb b/test/mri/prism/ruby/ripper_test.rb
index 8db47da3d35..bd63302efcf 100644
--- a/test/mri/prism/ruby/ripper_test.rb
+++ b/test/mri/prism/ruby/ripper_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-return if RUBY_VERSION < "3.3"
+return if RUBY_VERSION < "3.3" || RUBY_ENGINE != "ruby"
 
 require_relative "../test_helper"
 
@@ -9,29 +9,37 @@ class RipperTest < TestCase
     # Skip these tests that Ripper is reporting the wrong results for.
     incorrect = [
       # Ripper incorrectly attributes the block to the keyword.
-      "seattlerb/block_break.txt",
-      "seattlerb/block_next.txt",
       "seattlerb/block_return.txt",
-      "whitequark/break_block.txt",
-      "whitequark/next_block.txt",
       "whitequark/return_block.txt",
 
-      # Ripper is not accounting for locals created by patterns using the **
-      # operator within an `in` clause.
-      "seattlerb/parse_pattern_058.txt",
-
       # Ripper cannot handle named capture groups in regular expressions.
       "regex.txt",
-      "regex_char_width.txt",
-      "whitequark/lvar_injecting_match.txt",
 
       # Ripper fails to understand some structures that span across heredocs.
-      "spanning_heredoc.txt"
+      "spanning_heredoc.txt",
+
+      # Ripper interprets circular keyword arguments as method calls.
+      "3.4/circular_parameters.txt",
+
+      # Ripper doesn't emit `args_add_block` when endless method is prefixed by modifier.
+      "4.0/endless_methods_command_call.txt",
+
+      # https://bugs.ruby-lang.org/issues/21168#note-5
+      "command_method_call_2.txt",
     ]
 
+    if RUBY_VERSION.start_with?("3.3.")
+      incorrect += [
+        "whitequark/lvar_injecting_match.txt",
+        "seattlerb/parse_pattern_058.txt",
+        "regex_char_width.txt",
+      ]
+    end
+
     # Skip these tests that we haven't implemented yet.
     omitted = [
       "dos_endings.txt",
+      "heredocs_with_fake_newlines.txt",
       "heredocs_with_ignored_newlines.txt",
       "seattlerb/block_call_dot_op2_brace_block.txt",
       "seattlerb/block_command_operation_colon.txt",
@@ -45,11 +53,12 @@ class RipperTest < TestCase
       "whitequark/dedenting_heredoc.txt",
       "whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt",
       "whitequark/parser_slash_slash_n_escaping_in_literals.txt",
+      "whitequark/ruby_bug_18878.txt",
       "whitequark/send_block_chain_cmd.txt",
       "whitequark/slash_newline_in_heredocs.txt"
     ]
 
-    Fixture.each(except: incorrect | omitted) do |fixture|
+    Fixture.each_for_current_ruby(except: incorrect | omitted) do |fixture|
       define_method(fixture.test_name) { assert_ripper(fixture.read) }
     end
 
diff --git a/test/mri/prism/ruby/ruby_parser_test.rb b/test/mri/prism/ruby/ruby_parser_test.rb
index a13daeeb849..4b7e9c93edd 100644
--- a/test/mri/prism/ruby/ruby_parser_test.rb
+++ b/test/mri/prism/ruby/ruby_parser_test.rb
@@ -13,40 +13,32 @@
   return
 end
 
-# We want to also compare lines and files to make sure we're setting them
-# correctly.
-Sexp.prepend(
-  Module.new do
-    def ==(other)
-      super && line == other.line && file == other.file # && line_max == other.line_max
-    end
-  end
-)
-
 module Prism
   class RubyParserTest < TestCase
     todos = [
-      "newline_terminated.txt",
+      "character_literal.txt",
+      "encoding_euc_jp.txt",
       "regex_char_width.txt",
-      "seattlerb/bug169.txt",
       "seattlerb/masgn_colon3.txt",
       "seattlerb/messy_op_asgn_lineno.txt",
       "seattlerb/op_asgn_primary_colon_const_command_call.txt",
       "seattlerb/regexp_esc_C_slash.txt",
       "seattlerb/str_lit_concat_bad_encodings.txt",
+      "strings.txt",
       "unescaping.txt",
-      "unparser/corpus/literal/kwbegin.txt",
-      "unparser/corpus/literal/send.txt",
       "whitequark/masgn_const.txt",
+      "whitequark/pattern_matching_constants.txt",
+      "whitequark/pattern_matching_single_match.txt",
       "whitequark/ruby_bug_12402.txt",
-      "whitequark/ruby_bug_14690.txt",
-      "whitequark/space_args_block.txt"
     ]
 
     # https://github.com/seattlerb/ruby_parser/issues/344
     failures = [
       "alias.txt",
+      "dsym_str.txt",
       "dos_endings.txt",
+      "heredoc_percent_q_newline_delimiter.txt",
+      "heredocs_with_fake_newlines.txt",
       "heredocs_with_ignored_newlines.txt",
       "method_calls.txt",
       "methods.txt",
@@ -64,7 +56,9 @@ class RubyParserTest < TestCase
       "seattlerb/heredoc_with_only_carriage_returns.txt",
       "spanning_heredoc_newlines.txt",
       "spanning_heredoc.txt",
+      "symbols.txt",
       "tilde_heredocs.txt",
+      "unary_method_calls.txt",
       "unparser/corpus/literal/literal.txt",
       "while.txt",
       "whitequark/cond_eflipflop.txt",
@@ -80,7 +74,22 @@ class RubyParserTest < TestCase
       "whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt",
       "whitequark/pattern_matching_single_line.txt",
       "whitequark/ruby_bug_11989.txt",
-      "whitequark/slash_newline_in_heredocs.txt"
+      "whitequark/ruby_bug_18878.txt",
+      "whitequark/ruby_bug_19281.txt",
+      "whitequark/slash_newline_in_heredocs.txt",
+
+      "3.3-3.3/block_args_in_array_assignment.txt",
+      "3.3-3.3/it_with_ordinary_parameter.txt",
+      "3.3-3.3/keyword_args_in_array_assignment.txt",
+      "3.3-3.3/return_in_sclass.txt",
+
+      "3.4/circular_parameters.txt",
+
+      "4.0/endless_methods_command_call.txt",
+      "4.0/leading_logical.txt",
+
+      # https://bugs.ruby-lang.org/issues/21168#note-5
+      "command_method_call_2.txt",
     ]
 
     Fixture.each(except: failures) do |fixture|
@@ -95,10 +104,16 @@ def assert_ruby_parser(fixture, allowed_failure)
       source = fixture.read
       expected = ignore_warnings { ::RubyParser.new.parse(source, fixture.path) }
       actual = Prism::Translation::RubyParser.new.parse(source, fixture.path)
+      on_failure = -> { message(expected, actual) }
 
       if !allowed_failure
-        assert_equal(expected, actual, -> { message(expected, actual) })
-      elsif expected == actual
+        assert_equal(expected, actual, on_failure)
+
+        unless actual.nil?
+          assert_equal(expected.line, actual.line, on_failure)
+          assert_equal(expected.file, actual.file, on_failure)
+        end
+      elsif expected == actual && expected.line && actual.line && expected.file == actual.file
         puts "#{name} now passes"
       end
     end
diff --git a/test/mri/prism/ruby_api_test.rb b/test/mri/prism/ruby_api_test.rb
deleted file mode 100644
index 80f7cb05d3e..00000000000
--- a/test/mri/prism/ruby_api_test.rb
+++ /dev/null
@@ -1,255 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class RubyAPITest < TestCase
-    def test_ruby_api
-      filepath = __FILE__
-      source = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
-
-      assert_equal Prism.lex(source, filepath: filepath).value, Prism.lex_file(filepath).value
-      assert_equal Prism.dump(source, filepath: filepath), Prism.dump_file(filepath)
-
-      serialized = Prism.dump(source, filepath: filepath)
-      ast1 = Prism.load(source, serialized).value
-      ast2 = Prism.parse(source, filepath: filepath).value
-      ast3 = Prism.parse_file(filepath).value
-
-      assert_equal_nodes ast1, ast2
-      assert_equal_nodes ast2, ast3
-    end
-
-    def test_parse_success?
-      assert Prism.parse_success?("1")
-      refute Prism.parse_success?("<>")
-    end
-
-    def test_parse_file_success?
-      assert Prism.parse_file_success?(__FILE__)
-    end
-
-    def test_options
-      assert_equal "", Prism.parse("__FILE__").value.statements.body[0].filepath
-      assert_equal "foo.rb", Prism.parse("__FILE__", filepath: "foo.rb").value.statements.body[0].filepath
-
-      assert_equal 1, Prism.parse("foo").value.statements.body[0].location.start_line
-      assert_equal 10, Prism.parse("foo", line: 10).value.statements.body[0].location.start_line
-
-      refute Prism.parse("\"foo\"").value.statements.body[0].frozen?
-      assert Prism.parse("\"foo\"", frozen_string_literal: true).value.statements.body[0].frozen?
-      refute Prism.parse("\"foo\"", frozen_string_literal: false).value.statements.body[0].frozen?
-
-      assert_kind_of Prism::CallNode, Prism.parse("foo").value.statements.body[0]
-      assert_kind_of Prism::LocalVariableReadNode, Prism.parse("foo", scopes: [[:foo]]).value.statements.body[0]
-      assert_equal 1, Prism.parse("foo", scopes: [[:foo], []]).value.statements.body[0].depth
-
-      assert_equal [:foo], Prism.parse("foo", scopes: [[:foo]]).value.locals
-    end
-
-    def test_literal_value_method
-      assert_equal 123, parse_expression("123").value
-      assert_equal 3.14, parse_expression("3.14").value
-      assert_equal 42i, parse_expression("42i").value
-      assert_equal 42.1ri, parse_expression("42.1ri").value
-      assert_equal 3.14i, parse_expression("3.14i").value
-      assert_equal 42r, parse_expression("42r").value
-      assert_equal 0.5r, parse_expression("0.5r").value
-      assert_equal 42ri, parse_expression("42ri").value
-      assert_equal 0.5ri, parse_expression("0.5ri").value
-      assert_equal 0xFFr, parse_expression("0xFFr").value
-      assert_equal 0xFFri, parse_expression("0xFFri").value
-    end
-
-    def test_location_join
-      recv, args_node, _ = parse_expression("1234 + 567").child_nodes
-      arg = args_node.arguments[0]
-
-      joined = recv.location.join(arg.location)
-      assert_equal 0, joined.start_offset
-      assert_equal 10, joined.length
-
-      assert_raise RuntimeError, "Incompatible locations" do
-        arg.location.join(recv.location)
-      end
-
-      other_arg = parse_expression("1234 + 567").arguments.arguments[0]
-
-      assert_raise RuntimeError, "Incompatible sources" do
-        other_arg.location.join(recv.location)
-      end
-
-      assert_raise RuntimeError, "Incompatible sources" do
-        recv.location.join(other_arg.location)
-      end
-    end
-
-    def test_location_character_offsets
-      program = Prism.parse("😀 + 😀\n😍 ||= 😍").value
-
-      # first 😀
-      location = program.statements.body.first.receiver.location
-      assert_equal 0, location.start_character_offset
-      assert_equal 1, location.end_character_offset
-      assert_equal 0, location.start_character_column
-      assert_equal 1, location.end_character_column
-
-      # second 😀
-      location = program.statements.body.first.arguments.arguments.first.location
-      assert_equal 4, location.start_character_offset
-      assert_equal 5, location.end_character_offset
-      assert_equal 4, location.start_character_column
-      assert_equal 5, location.end_character_column
-
-      # first 😍
-      location = program.statements.body.last.name_loc
-      assert_equal 6, location.start_character_offset
-      assert_equal 7, location.end_character_offset
-      assert_equal 0, location.start_character_column
-      assert_equal 1, location.end_character_column
-
-      # second 😍
-      location = program.statements.body.last.value.location
-      assert_equal 12, location.start_character_offset
-      assert_equal 13, location.end_character_offset
-      assert_equal 6, location.start_character_column
-      assert_equal 7, location.end_character_column
-    end
-
-    def test_location_code_units
-      program = Prism.parse("😀 + 😀\n😍 ||= 😍").value
-
-      # first 😀
-      location = program.statements.body.first.receiver.location
-
-      assert_equal 0, location.start_code_units_offset(Encoding::UTF_8)
-      assert_equal 0, location.start_code_units_offset(Encoding::UTF_16LE)
-      assert_equal 0, location.start_code_units_offset(Encoding::UTF_32LE)
-
-      assert_equal 1, location.end_code_units_offset(Encoding::UTF_8)
-      assert_equal 2, location.end_code_units_offset(Encoding::UTF_16LE)
-      assert_equal 1, location.end_code_units_offset(Encoding::UTF_32LE)
-
-      assert_equal 0, location.start_code_units_column(Encoding::UTF_8)
-      assert_equal 0, location.start_code_units_column(Encoding::UTF_16LE)
-      assert_equal 0, location.start_code_units_column(Encoding::UTF_32LE)
-
-      assert_equal 1, location.end_code_units_column(Encoding::UTF_8)
-      assert_equal 2, location.end_code_units_column(Encoding::UTF_16LE)
-      assert_equal 1, location.end_code_units_column(Encoding::UTF_32LE)
-
-      # second 😀
-      location = program.statements.body.first.arguments.arguments.first.location
-
-      assert_equal 4, location.start_code_units_offset(Encoding::UTF_8)
-      assert_equal 5, location.start_code_units_offset(Encoding::UTF_16LE)
-      assert_equal 4, location.start_code_units_offset(Encoding::UTF_32LE)
-
-      assert_equal 5, location.end_code_units_offset(Encoding::UTF_8)
-      assert_equal 7, location.end_code_units_offset(Encoding::UTF_16LE)
-      assert_equal 5, location.end_code_units_offset(Encoding::UTF_32LE)
-
-      assert_equal 4, location.start_code_units_column(Encoding::UTF_8)
-      assert_equal 5, location.start_code_units_column(Encoding::UTF_16LE)
-      assert_equal 4, location.start_code_units_column(Encoding::UTF_32LE)
-
-      assert_equal 5, location.end_code_units_column(Encoding::UTF_8)
-      assert_equal 7, location.end_code_units_column(Encoding::UTF_16LE)
-      assert_equal 5, location.end_code_units_column(Encoding::UTF_32LE)
-
-      # first 😍
-      location = program.statements.body.last.name_loc
-
-      assert_equal 6, location.start_code_units_offset(Encoding::UTF_8)
-      assert_equal 8, location.start_code_units_offset(Encoding::UTF_16LE)
-      assert_equal 6, location.start_code_units_offset(Encoding::UTF_32LE)
-
-      assert_equal 7, location.end_code_units_offset(Encoding::UTF_8)
-      assert_equal 10, location.end_code_units_offset(Encoding::UTF_16LE)
-      assert_equal 7, location.end_code_units_offset(Encoding::UTF_32LE)
-
-      assert_equal 0, location.start_code_units_column(Encoding::UTF_8)
-      assert_equal 0, location.start_code_units_column(Encoding::UTF_16LE)
-      assert_equal 0, location.start_code_units_column(Encoding::UTF_32LE)
-
-      assert_equal 1, location.end_code_units_column(Encoding::UTF_8)
-      assert_equal 2, location.end_code_units_column(Encoding::UTF_16LE)
-      assert_equal 1, location.end_code_units_column(Encoding::UTF_32LE)
-
-      # second 😍
-      location = program.statements.body.last.value.location
-
-      assert_equal 12, location.start_code_units_offset(Encoding::UTF_8)
-      assert_equal 15, location.start_code_units_offset(Encoding::UTF_16LE)
-      assert_equal 12, location.start_code_units_offset(Encoding::UTF_32LE)
-
-      assert_equal 13, location.end_code_units_offset(Encoding::UTF_8)
-      assert_equal 17, location.end_code_units_offset(Encoding::UTF_16LE)
-      assert_equal 13, location.end_code_units_offset(Encoding::UTF_32LE)
-
-      assert_equal 6, location.start_code_units_column(Encoding::UTF_8)
-      assert_equal 7, location.start_code_units_column(Encoding::UTF_16LE)
-      assert_equal 6, location.start_code_units_column(Encoding::UTF_32LE)
-
-      assert_equal 7, location.end_code_units_column(Encoding::UTF_8)
-      assert_equal 9, location.end_code_units_column(Encoding::UTF_16LE)
-      assert_equal 7, location.end_code_units_column(Encoding::UTF_32LE)
-    end
-
-    def test_heredoc?
-      refute parse_expression("\"foo\"").heredoc?
-      refute parse_expression("\"foo \#{1}\"").heredoc?
-      refute parse_expression("`foo`").heredoc?
-      refute parse_expression("`foo \#{1}`").heredoc?
-
-      assert parse_expression("<<~HERE\nfoo\nHERE\n").heredoc?
-      assert parse_expression("<<~HERE\nfoo \#{1}\nHERE\n").heredoc?
-      assert parse_expression("<<~`HERE`\nfoo\nHERE\n").heredoc?
-      assert parse_expression("<<~`HERE`\nfoo \#{1}\nHERE\n").heredoc?
-    end
-
-    # Through some bit hackery, we want to allow consumers to use the integer
-    # base flags as the base itself. It has a nice property that the current
-    # alignment provides them in the correct order. So here we test that our
-    # assumption holds so that it doesn't change out from under us.
-    #
-    # In C, this would look something like:
-    #
-    #     ((flags & ~DECIMAL) << 1) || 10
-    #
-    # We have to do some other work in Ruby because 0 is truthy and ~ on an
-    # integer doesn't have a fixed width.
-    def test_integer_base_flags
-      base = -> (node) do
-        value = (node.send(:flags) & (0b1111 - IntegerBaseFlags::DECIMAL)) << 1
-        value == 0 ? 10 : value
-      end
-
-      assert_equal 2, base[parse_expression("0b1")]
-      assert_equal 8, base[parse_expression("0o1")]
-      assert_equal 10, base[parse_expression("0d1")]
-      assert_equal 16, base[parse_expression("0x1")]
-    end
-
-    def test_offset
-      source = <<~RUBY
-        #!/bin/sh
-
-        echo "foo"
-        exit 0
-
-        #!/usr/bin/env ruby
-
-        puts "bar"
-      RUBY
-
-      assert Prism.parse_success?(source, offset: 30)
-    end
-
-    private
-
-    def parse_expression(source)
-      Prism.parse(source).value.statements.body.first
-    end
-  end
-end
diff --git a/test/mri/prism/ruby_parser_test.rb b/test/mri/prism/ruby_parser_test.rb
deleted file mode 100644
index 1d22f0e7b87..00000000000
--- a/test/mri/prism/ruby_parser_test.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-# frozen_string_literal: true
-
-return if RUBY_ENGINE == "jruby"
-
-require_relative "test_helper"
-
-begin
-  require "ruby_parser"
-rescue LoadError
-  # In CRuby's CI, we're not going to test against the ruby_parser gem because
-  # we don't want to have to install it. So in this case we'll just skip this
-  # test.
-  return
-end
-
-# We want to also compare lines and files to make sure we're setting them
-# correctly.
-Sexp.prepend(
-  Module.new do
-    def ==(other)
-      super && line == other.line && max_line == other.max_line && file == other.file
-    end
-  end
-)
-
-module Prism
-  class RubyParserTest < TestCase
-    base = File.join(__dir__, "fixtures")
-
-    todos = %w[
-      heredocs_nested.txt
-      newline_terminated.txt
-      regex_char_width.txt
-      seattlerb/bug169.txt
-      seattlerb/dstr_evstr.txt
-      seattlerb/heredoc_squiggly_interp.txt
-      seattlerb/masgn_colon3.txt
-      seattlerb/messy_op_asgn_lineno.txt
-      seattlerb/op_asgn_primary_colon_const_command_call.txt
-      seattlerb/parse_line_evstr_after_break.txt
-      seattlerb/regexp_esc_C_slash.txt
-      seattlerb/str_lit_concat_bad_encodings.txt
-      seattlerb/str_pct_nested_nested.txt
-      unescaping.txt
-      unparser/corpus/literal/kwbegin.txt
-      unparser/corpus/literal/send.txt
-      unparser/corpus/semantic/dstr.txt
-      whitequark/masgn_const.txt
-      whitequark/ruby_bug_12402.txt
-      whitequark/ruby_bug_14690.txt
-      whitequark/space_args_block.txt
-      whitequark/string_concat.txt
-    ]
-
-    # These files contain CRLF line endings, which ruby_parser translates into
-    # LF before it gets back to the node. This means the node actually has the
-    # wrong contents.
-    crlf = %w[
-      dos_endings.txt
-      heredoc_with_comment.txt
-      seattlerb/heredoc__backslash_dos_format.txt
-      seattlerb/heredoc_with_carriage_return_escapes_windows.txt
-      seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
-      seattlerb/heredoc_with_extra_carriage_returns_windows.txt
-      seattlerb/heredoc_with_extra_carriage_returns.txt
-      seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
-      seattlerb/heredoc_with_only_carriage_returns_windows.txt
-      seattlerb/heredoc_with_only_carriage_returns.txt
-    ]
-
-    # https://github.com/seattlerb/ruby_parser/issues/344
-    failures = crlf | %w[
-      alias.txt
-      heredocs_with_ignored_newlines.txt
-      method_calls.txt
-      methods.txt
-      multi_write.txt
-      not.txt
-      patterns.txt
-      regex.txt
-      seattlerb/and_multi.txt
-      seattlerb/heredoc_bad_hex_escape.txt
-      seattlerb/heredoc_bad_oct_escape.txt
-      spanning_heredoc_newlines.txt
-      spanning_heredoc.txt
-      tilde_heredocs.txt
-      unparser/corpus/literal/literal.txt
-      while.txt
-      whitequark/class_definition_in_while_cond.txt
-      whitequark/cond_eflipflop.txt
-      whitequark/cond_iflipflop.txt
-      whitequark/cond_match_current_line.txt
-      whitequark/dedenting_heredoc.txt
-      whitequark/if_while_after_class__since_32.txt
-      whitequark/lvar_injecting_match.txt
-      whitequark/not.txt
-      whitequark/op_asgn_cmd.txt
-      whitequark/parser_bug_640.txt
-      whitequark/parser_slash_slash_n_escaping_in_literals.txt
-      whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt
-      whitequark/pattern_matching_single_line.txt
-      whitequark/ruby_bug_11989.txt
-      whitequark/slash_newline_in_heredocs.txt
-    ]
-
-    Dir["**/*.txt", base: base].each do |name|
-      next if failures.include?(name)
-
-      define_method("test_#{name}") do
-        begin
-          # Parsing with ruby parser tends to be noisy with warnings, so we're
-          # turning those off.
-          previous_verbose, $VERBOSE = $VERBOSE, nil
-          assert_parse_file(base, name, todos.include?(name))
-        ensure
-          $VERBOSE = previous_verbose
-        end
-      end
-    end
-
-    private
-
-    def assert_parse_file(base, name, allowed_failure)
-      filepath = File.join(base, name)
-      expected = ::RubyParser.new.parse(File.read(filepath), filepath)
-      actual = Prism::Translation::RubyParser.parse_file(filepath)
-
-      if !allowed_failure
-        assert_equal_nodes expected, actual
-      elsif expected == actual
-        puts "#{name} now passes"
-      end
-    end
-
-    def assert_equal_nodes(left, right)
-      return if left == right
-
-      if left.is_a?(Sexp) && right.is_a?(Sexp)
-        if left.line != right.line
-          assert_equal "(#{left.inspect} line=#{left.line})", "(#{right.inspect} line=#{right.line})"
-        elsif left.file != right.file
-          assert_equal "(#{left.inspect} file=#{left.file})", "(#{right.inspect} file=#{right.file})"
-        elsif left.length != right.length
-          assert_equal "(#{left.inspect} length=#{left.length})", "(#{right.inspect} length=#{right.length})"
-        else
-          left.zip(right).each { |l, r| assert_equal_nodes(l, r) }
-        end
-      else
-        assert_equal left, right
-      end
-    end
-  end
-end
diff --git a/test/mri/prism/snapshots/alias.txt b/test/mri/prism/snapshots/alias.txt
deleted file mode 100644
index 687082d85e2..00000000000
--- a/test/mri/prism/snapshots/alias.txt
+++ /dev/null
@@ -1,194 +0,0 @@
-@ ProgramNode (location: (1,0)-(23,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(23,11))
-    └── body: (length: 12)
-        ├── @ AliasMethodNode (location: (1,0)-(1,15))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (1,6)-(1,10))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (1,6)-(1,7) = ":"
-        │   │   ├── value_loc: (1,7)-(1,10) = "foo"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "foo"
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (1,11)-(1,15))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (1,11)-(1,12) = ":"
-        │   │   ├── value_loc: (1,12)-(1,15) = "bar"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "bar"
-        │   └── keyword_loc: (1,0)-(1,5) = "alias"
-        ├── @ AliasMethodNode (location: (3,0)-(3,21))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (3,6)-(3,13))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (3,6)-(3,9) = "%s["
-        │   │   ├── value_loc: (3,9)-(3,12) = "abc"
-        │   │   ├── closing_loc: (3,12)-(3,13) = "]"
-        │   │   └── unescaped: "abc"
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (3,14)-(3,21))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (3,14)-(3,17) = "%s["
-        │   │   ├── value_loc: (3,17)-(3,20) = "def"
-        │   │   ├── closing_loc: (3,20)-(3,21) = "]"
-        │   │   └── unescaped: "def"
-        │   └── keyword_loc: (3,0)-(3,5) = "alias"
-        ├── @ AliasMethodNode (location: (5,0)-(5,19))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (5,6)-(5,12))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (5,6)-(5,8) = ":'"
-        │   │   ├── value_loc: (5,8)-(5,11) = "abc"
-        │   │   ├── closing_loc: (5,11)-(5,12) = "'"
-        │   │   └── unescaped: "abc"
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (5,13)-(5,19))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (5,13)-(5,15) = ":'"
-        │   │   ├── value_loc: (5,15)-(5,18) = "def"
-        │   │   ├── closing_loc: (5,18)-(5,19) = "'"
-        │   │   └── unescaped: "def"
-        │   └── keyword_loc: (5,0)-(5,5) = "alias"
-        ├── @ AliasMethodNode (location: (7,0)-(7,23))
-        │   ├── new_name:
-        │   │   @ InterpolatedSymbolNode (location: (7,6)-(7,16))
-        │   │   ├── opening_loc: (7,6)-(7,8) = ":\""
-        │   │   ├── parts: (length: 2)
-        │   │   │   ├── @ StringNode (location: (7,8)-(7,11))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── content_loc: (7,8)-(7,11) = "abc"
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── unescaped: "abc"
-        │   │   │   └── @ EmbeddedStatementsNode (location: (7,11)-(7,15))
-        │   │   │       ├── opening_loc: (7,11)-(7,13) = "\#{"
-        │   │   │       ├── statements:
-        │   │   │       │   @ StatementsNode (location: (7,13)-(7,14))
-        │   │   │       │   └── body: (length: 1)
-        │   │   │       │       └── @ IntegerNode (location: (7,13)-(7,14))
-        │   │   │       │           ├── flags: decimal
-        │   │   │       │           └── value: 1
-        │   │   │       └── closing_loc: (7,14)-(7,15) = "}"
-        │   │   └── closing_loc: (7,15)-(7,16) = "\""
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (7,17)-(7,23))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (7,17)-(7,19) = ":'"
-        │   │   ├── value_loc: (7,19)-(7,22) = "def"
-        │   │   ├── closing_loc: (7,22)-(7,23) = "'"
-        │   │   └── unescaped: "def"
-        │   └── keyword_loc: (7,0)-(7,5) = "alias"
-        ├── @ AliasGlobalVariableNode (location: (9,0)-(9,11))
-        │   ├── new_name:
-        │   │   @ GlobalVariableReadNode (location: (9,6)-(9,8))
-        │   │   └── name: :$a
-        │   ├── old_name:
-        │   │   @ BackReferenceReadNode (location: (9,9)-(9,11))
-        │   │   └── name: :$'
-        │   └── keyword_loc: (9,0)-(9,5) = "alias"
-        ├── @ AliasMethodNode (location: (11,0)-(11,13))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (11,6)-(11,9))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: ∅
-        │   │   ├── value_loc: (11,6)-(11,9) = "foo"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "foo"
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (11,10)-(11,13))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: ∅
-        │   │   ├── value_loc: (11,10)-(11,13) = "bar"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "bar"
-        │   └── keyword_loc: (11,0)-(11,5) = "alias"
-        ├── @ AliasGlobalVariableNode (location: (13,0)-(13,15))
-        │   ├── new_name:
-        │   │   @ GlobalVariableReadNode (location: (13,6)-(13,10))
-        │   │   └── name: :$foo
-        │   ├── old_name:
-        │   │   @ GlobalVariableReadNode (location: (13,11)-(13,15))
-        │   │   └── name: :$bar
-        │   └── keyword_loc: (13,0)-(13,5) = "alias"
-        ├── @ AliasMethodNode (location: (15,0)-(15,12))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (15,6)-(15,9))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: ∅
-        │   │   ├── value_loc: (15,6)-(15,9) = "foo"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "foo"
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (15,10)-(15,12))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: ∅
-        │   │   ├── value_loc: (15,10)-(15,12) = "if"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "if"
-        │   └── keyword_loc: (15,0)-(15,5) = "alias"
-        ├── @ AliasMethodNode (location: (17,0)-(17,13))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (17,6)-(17,9))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: ∅
-        │   │   ├── value_loc: (17,6)-(17,9) = "foo"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "foo"
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (17,10)-(17,13))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: ∅
-        │   │   ├── value_loc: (17,10)-(17,13) = "<=>"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "<=>"
-        │   └── keyword_loc: (17,0)-(17,5) = "alias"
-        ├── @ AliasMethodNode (location: (19,0)-(19,15))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (19,6)-(19,9))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (19,6)-(19,7) = ":"
-        │   │   ├── value_loc: (19,7)-(19,9) = "=="
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "=="
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (19,10)-(19,15))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (19,10)-(19,11) = ":"
-        │   │   ├── value_loc: (19,11)-(19,15) = "eql?"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "eql?"
-        │   └── keyword_loc: (19,0)-(19,5) = "alias"
-        ├── @ AliasMethodNode (location: (21,0)-(21,9))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (21,6)-(21,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: ∅
-        │   │   ├── value_loc: (21,6)-(21,7) = "A"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "A"
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (21,8)-(21,9))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: ∅
-        │   │   ├── value_loc: (21,8)-(21,9) = "B"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "B"
-        │   └── keyword_loc: (21,0)-(21,5) = "alias"
-        └── @ AliasMethodNode (location: (23,0)-(23,11))
-            ├── new_name:
-            │   @ SymbolNode (location: (23,6)-(23,8))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (23,6)-(23,7) = ":"
-            │   ├── value_loc: (23,7)-(23,8) = "A"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "A"
-            ├── old_name:
-            │   @ SymbolNode (location: (23,9)-(23,11))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (23,9)-(23,10) = ":"
-            │   ├── value_loc: (23,10)-(23,11) = "B"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "B"
-            └── keyword_loc: (23,0)-(23,5) = "alias"
diff --git a/test/mri/prism/snapshots/arithmetic.txt b/test/mri/prism/snapshots/arithmetic.txt
deleted file mode 100644
index c8a31c3d70e..00000000000
--- a/test/mri/prism/snapshots/arithmetic.txt
+++ /dev/null
@@ -1,255 +0,0 @@
-@ ProgramNode (location: (1,0)-(13,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(13,8))
-    └── body: (length: 7)
-        ├── @ CallNode (location: (1,0)-(1,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (1,4)-(1,8))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (1,5)-(1,8))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :bar
-        │   │           │   ├── message_loc: (1,5)-(1,8) = "bar"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :!
-        │   │           ├── message_loc: (1,4)-(1,5) = "!"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,4))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (3,1)-(3,4))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (3,1)-(3,4) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :-@
-        │   │   ├── message_loc: (3,0)-(3,1) = "-"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :*
-        │   ├── message_loc: (3,4)-(3,5) = "*"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,5)-(3,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,5)-(3,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (3,5)-(3,8) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (5,0)-(5,4))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (5,1)-(5,4))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (5,1)-(5,4) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :+@
-        │   │   ├── message_loc: (5,0)-(5,1) = "+"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :**
-        │   ├── message_loc: (5,4)-(5,6) = "**"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,6)-(5,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (5,6)-(5,9))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (5,6)-(5,9) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (7,0)-(7,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (7,0)-(7,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,4)-(7,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (7,4)-(7,8))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (7,5)-(7,8))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :bar
-        │   │           │   ├── message_loc: (7,5)-(7,8) = "bar"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :~
-        │   │           ├── message_loc: (7,4)-(7,5) = "~"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (9,0)-(9,17))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (9,0)-(9,10))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (9,0)-(9,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (9,0)-(9,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :<<
-        │   │   ├── message_loc: (9,4)-(9,6) = "<<"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (9,7)-(9,10))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ CallNode (location: (9,7)-(9,10))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (9,7)-(9,10) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<<
-        │   ├── message_loc: (9,11)-(9,13) = "<<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,14)-(9,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (9,14)-(9,17))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (9,14)-(9,17) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (11,0)-(11,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (11,1)-(11,5))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (11,1)-(11,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :**
-        │   │   ├── message_loc: (11,2)-(11,4) = "**"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (11,4)-(11,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (11,4)-(11,5))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :-@
-        │   ├── message_loc: (11,0)-(11,1) = "-"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (13,0)-(13,8))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (13,0)-(13,2))
-            │   ├── flags: decimal
-            │   └── value: -1
-            ├── call_operator_loc: (13,2)-(13,3) = "."
-            ├── name: :zero?
-            ├── message_loc: (13,3)-(13,8) = "zero?"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/arrays.txt b/test/mri/prism/snapshots/arrays.txt
deleted file mode 100644
index 1cf6b226972..00000000000
--- a/test/mri/prism/snapshots/arrays.txt
+++ /dev/null
@@ -1,2308 +0,0 @@
-@ ProgramNode (location: (1,0)-(142,32))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(142,32))
-    └── body: (length: 59)
-        ├── @ ArrayNode (location: (1,0)-(1,4))
-        │   ├── flags: contains_splat
-        │   ├── elements: (length: 1)
-        │   │   └── @ SplatNode (location: (1,1)-(1,3))
-        │   │       ├── operator_loc: (1,1)-(1,2) = "*"
-        │   │       └── expression:
-        │   │           @ CallNode (location: (1,2)-(1,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (1,2)-(1,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "["
-        │   └── closing_loc: (1,3)-(1,4) = "]"
-        ├── @ CallNode (location: (3,0)-(3,23))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (3,3)-(3,13) = "[bar, baz]"
-        │   ├── opening_loc: (3,3)-(3,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,4)-(3,23))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ CallNode (location: (3,4)-(3,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (3,4)-(3,7) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       ├── @ CallNode (location: (3,9)-(3,12))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :baz
-        │   │       │   ├── message_loc: (3,9)-(3,12) = "baz"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ ArrayNode (location: (3,16)-(3,23))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 3)
-        │   │           │   ├── @ IntegerNode (location: (3,16)-(3,17))
-        │   │           │   │   ├── flags: decimal
-        │   │           │   │   └── value: 1
-        │   │           │   ├── @ IntegerNode (location: (3,19)-(3,20))
-        │   │           │   │   ├── flags: decimal
-        │   │           │   │   └── value: 2
-        │   │           │   └── @ IntegerNode (location: (3,22)-(3,23))
-        │   │           │       ├── flags: decimal
-        │   │           │       └── value: 3
-        │   │           ├── opening_loc: ∅
-        │   │           └── closing_loc: ∅
-        │   ├── closing_loc: (3,12)-(3,13) = "]"
-        │   └── block: ∅
-        ├── @ ArrayNode (location: (5,0)-(5,13))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ KeywordHashNode (location: (5,1)-(5,12))
-        │   │       ├── flags: symbol_keys
-        │   │       └── elements: (length: 1)
-        │   │           └── @ AssocNode (location: (5,1)-(5,12))
-        │   │               ├── key:
-        │   │               │   @ SymbolNode (location: (5,1)-(5,3))
-        │   │               │   ├── flags: forced_us_ascii_encoding
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── value_loc: (5,1)-(5,2) = "a"
-        │   │               │   ├── closing_loc: (5,2)-(5,3) = ":"
-        │   │               │   └── unescaped: "a"
-        │   │               ├── value:
-        │   │               │   @ ArrayNode (location: (5,4)-(5,12))
-        │   │               │   ├── flags: ∅
-        │   │               │   ├── elements: (length: 2)
-        │   │               │   │   ├── @ SymbolNode (location: (5,5)-(5,7))
-        │   │               │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   │   ├── opening_loc: (5,5)-(5,6) = ":"
-        │   │               │   │   │   ├── value_loc: (5,6)-(5,7) = "b"
-        │   │               │   │   │   ├── closing_loc: ∅
-        │   │               │   │   │   └── unescaped: "b"
-        │   │               │   │   └── @ SymbolNode (location: (5,9)-(5,11))
-        │   │               │   │       ├── flags: forced_us_ascii_encoding
-        │   │               │   │       ├── opening_loc: (5,9)-(5,10) = ":"
-        │   │               │   │       ├── value_loc: (5,10)-(5,11) = "c"
-        │   │               │   │       ├── closing_loc: ∅
-        │   │               │   │       └── unescaped: "c"
-        │   │               │   ├── opening_loc: (5,4)-(5,5) = "["
-        │   │               │   └── closing_loc: (5,11)-(5,12) = "]"
-        │   │               └── operator_loc: ∅
-        │   ├── opening_loc: (5,0)-(5,1) = "["
-        │   └── closing_loc: (5,12)-(5,13) = "]"
-        ├── @ ArrayNode (location: (9,0)-(15,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 5)
-        │   │   ├── @ SymbolNode (location: (9,1)-(9,3))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (9,1)-(9,2) = ":"
-        │   │   │   ├── value_loc: (9,2)-(9,3) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ SymbolNode (location: (9,5)-(9,7))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (9,5)-(9,6) = ":"
-        │   │   │   ├── value_loc: (9,6)-(9,7) = "b"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b"
-        │   │   ├── @ SymbolNode (location: (10,0)-(10,2))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (10,0)-(10,1) = ":"
-        │   │   │   ├── value_loc: (10,1)-(10,2) = "c"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "c"
-        │   │   ├── @ IntegerNode (location: (10,3)-(10,4))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── @ SymbolNode (location: (14,0)-(14,2))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: (14,0)-(14,1) = ":"
-        │   │       ├── value_loc: (14,1)-(14,2) = "d"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "d"
-        │   ├── opening_loc: (9,0)-(9,1) = "["
-        │   └── closing_loc: (15,0)-(15,1) = "]"
-        ├── @ ArrayNode (location: (18,0)-(26,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 5)
-        │   │   ├── @ SymbolNode (location: (18,1)-(18,3))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (18,1)-(18,2) = ":"
-        │   │   │   ├── value_loc: (18,2)-(18,3) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ SymbolNode (location: (18,5)-(18,7))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (18,5)-(18,6) = ":"
-        │   │   │   ├── value_loc: (18,6)-(18,7) = "b"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b"
-        │   │   ├── @ SymbolNode (location: (19,0)-(19,2))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (19,0)-(19,1) = ":"
-        │   │   │   ├── value_loc: (19,1)-(19,2) = "c"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "c"
-        │   │   ├── @ IntegerNode (location: (19,3)-(19,4))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── @ SymbolNode (location: (23,0)-(23,2))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: (23,0)-(23,1) = ":"
-        │   │       ├── value_loc: (23,1)-(23,2) = "d"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "d"
-        │   ├── opening_loc: (18,0)-(18,1) = "["
-        │   └── closing_loc: (26,0)-(26,1) = "]"
-        ├── @ ArrayNode (location: (28,0)-(28,12))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ KeywordHashNode (location: (28,1)-(28,11))
-        │   │       ├── flags: ∅
-        │   │       └── elements: (length: 1)
-        │   │           └── @ AssocNode (location: (28,1)-(28,11))
-        │   │               ├── key:
-        │   │               │   @ CallNode (location: (28,1)-(28,4))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :foo
-        │   │               │   ├── message_loc: (28,1)-(28,4) = "foo"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               ├── value:
-        │   │               │   @ CallNode (location: (28,8)-(28,11))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :bar
-        │   │               │   ├── message_loc: (28,8)-(28,11) = "bar"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               └── operator_loc: (28,5)-(28,7) = "=>"
-        │   ├── opening_loc: (28,0)-(28,1) = "["
-        │   └── closing_loc: (28,11)-(28,12) = "]"
-        ├── @ CallNode (location: (30,0)-(30,19))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (30,0)-(30,8))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (30,0)-(30,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (30,0)-(30,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :[]
-        │   │   ├── message_loc: (30,3)-(30,8) = "[bar]"
-        │   │   ├── opening_loc: (30,3)-(30,4) = "["
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (30,4)-(30,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ CallNode (location: (30,4)-(30,7))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (30,4)-(30,7) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── closing_loc: (30,7)-(30,8) = "]"
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (30,8)-(30,13) = "[baz]"
-        │   ├── opening_loc: (30,8)-(30,9) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (30,9)-(30,19))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (30,9)-(30,12))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :baz
-        │   │       │   ├── message_loc: (30,9)-(30,12) = "baz"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (30,16)-(30,19))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :qux
-        │   │           ├── message_loc: (30,16)-(30,19) = "qux"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (30,12)-(30,13) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (32,0)-(32,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (32,0)-(32,8))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (32,0)-(32,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (32,0)-(32,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :[]
-        │   │   ├── message_loc: (32,3)-(32,8) = "[bar]"
-        │   │   ├── opening_loc: (32,3)-(32,4) = "["
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (32,4)-(32,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ CallNode (location: (32,4)-(32,7))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (32,4)-(32,7) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── closing_loc: (32,7)-(32,8) = "]"
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (32,8)-(32,13) = "[baz]"
-        │   ├── opening_loc: (32,8)-(32,9) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (32,9)-(32,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (32,9)-(32,12))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (32,9)-(32,12) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (32,12)-(32,13) = "]"
-        │   └── block: ∅
-        ├── @ ArrayNode (location: (34,0)-(35,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (34,0)-(34,1) = "["
-        │   └── closing_loc: (35,0)-(35,1) = "]"
-        ├── @ CallNode (location: (37,0)-(37,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (37,0)-(37,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (37,0)-(37,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (37,3)-(37,13) = "[bar, baz]"
-        │   ├── opening_loc: (37,3)-(37,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (37,4)-(37,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (37,4)-(37,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (37,4)-(37,7) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (37,9)-(37,12))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (37,9)-(37,12) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (37,12)-(37,13) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (39,0)-(39,19))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (39,0)-(39,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (39,0)-(39,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (39,3)-(39,13) = "[bar, baz]"
-        │   ├── opening_loc: (39,3)-(39,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (39,4)-(39,19))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ CallNode (location: (39,4)-(39,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (39,4)-(39,7) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       ├── @ CallNode (location: (39,9)-(39,12))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :baz
-        │   │       │   ├── message_loc: (39,9)-(39,12) = "baz"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (39,16)-(39,19))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :qux
-        │   │           ├── message_loc: (39,16)-(39,19) = "qux"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (39,12)-(39,13) = "]"
-        │   └── block: ∅
-        ├── @ MultiWriteNode (location: (41,0)-(41,21))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ IndexTargetNode (location: (41,0)-(41,6))
-        │   │   │   ├── flags: attribute_write
-        │   │   │   ├── receiver:
-        │   │   │   │   @ CallNode (location: (41,0)-(41,3))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :foo
-        │   │   │   │   ├── message_loc: (41,0)-(41,3) = "foo"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── opening_loc: (41,3)-(41,4) = "["
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (41,4)-(41,5))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (41,4)-(41,5))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 0
-        │   │   │   ├── closing_loc: (41,5)-(41,6) = "]"
-        │   │   │   └── block: ∅
-        │   │   └── @ IndexTargetNode (location: (41,8)-(41,14))
-        │   │       ├── flags: attribute_write
-        │   │       ├── receiver:
-        │   │       │   @ CallNode (location: (41,8)-(41,11))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (41,8)-(41,11) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       ├── opening_loc: (41,11)-(41,12) = "["
-        │   │       ├── arguments:
-        │   │       │   @ ArgumentsNode (location: (41,12)-(41,13))
-        │   │       │   ├── flags: ∅
-        │   │       │   └── arguments: (length: 1)
-        │   │       │       └── @ IntegerNode (location: (41,12)-(41,13))
-        │   │       │           ├── flags: decimal
-        │   │       │           └── value: 0
-        │   │       ├── closing_loc: (41,13)-(41,14) = "]"
-        │   │       └── block: ∅
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (41,15)-(41,16) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (41,17)-(41,21))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (41,17)-(41,18))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (41,20)-(41,21))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ CallNode (location: (43,0)-(43,19))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (43,0)-(43,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (43,0)-(43,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (43,3)-(43,19) = "[bar[baz] = qux]"
-        │   ├── opening_loc: (43,3)-(43,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (43,4)-(43,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (43,4)-(43,18))
-        │   │           ├── flags: attribute_write
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (43,4)-(43,7))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :bar
-        │   │           │   ├── message_loc: (43,4)-(43,7) = "bar"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :[]=
-        │   │           ├── message_loc: (43,7)-(43,12) = "[baz]"
-        │   │           ├── opening_loc: (43,7)-(43,8) = "["
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (43,8)-(43,18))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ CallNode (location: (43,8)-(43,11))
-        │   │           │       │   ├── flags: variable_call, ignore_visibility
-        │   │           │       │   ├── receiver: ∅
-        │   │           │       │   ├── call_operator_loc: ∅
-        │   │           │       │   ├── name: :baz
-        │   │           │       │   ├── message_loc: (43,8)-(43,11) = "baz"
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── arguments: ∅
-        │   │           │       │   ├── closing_loc: ∅
-        │   │           │       │   └── block: ∅
-        │   │           │       └── @ CallNode (location: (43,15)-(43,18))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :qux
-        │   │           │           ├── message_loc: (43,15)-(43,18) = "qux"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── closing_loc: (43,11)-(43,12) = "]"
-        │   │           └── block: ∅
-        │   ├── closing_loc: (43,18)-(43,19) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (45,0)-(45,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (45,0)-(45,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (45,0)-(45,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (45,3)-(45,8) = "[bar]"
-        │   ├── opening_loc: (45,3)-(45,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (45,4)-(45,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (45,4)-(45,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (45,4)-(45,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (45,7)-(45,8) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (47,0)-(47,14))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (47,0)-(47,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (47,0)-(47,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (47,3)-(47,8) = "[bar]"
-        │   ├── opening_loc: (47,3)-(47,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (47,4)-(47,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (47,4)-(47,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (47,4)-(47,7) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (47,11)-(47,14))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (47,11)-(47,14) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (47,7)-(47,8) = "]"
-        │   └── block: ∅
-        ├── @ ArrayNode (location: (49,0)-(49,6))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ KeywordHashNode (location: (49,1)-(49,5))
-        │   │       ├── flags: ∅
-        │   │       └── elements: (length: 1)
-        │   │           └── @ AssocSplatNode (location: (49,1)-(49,5))
-        │   │               ├── value:
-        │   │               │   @ HashNode (location: (49,3)-(49,5))
-        │   │               │   ├── opening_loc: (49,3)-(49,4) = "{"
-        │   │               │   ├── elements: (length: 0)
-        │   │               │   └── closing_loc: (49,4)-(49,5) = "}"
-        │   │               └── operator_loc: (49,1)-(49,3) = "**"
-        │   ├── opening_loc: (49,0)-(49,1) = "["
-        │   └── closing_loc: (49,5)-(49,6) = "]"
-        ├── @ ArrayNode (location: (51,0)-(51,6))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ KeywordHashNode (location: (51,1)-(51,5))
-        │   │       ├── flags: ∅
-        │   │       └── elements: (length: 1)
-        │   │           └── @ AssocSplatNode (location: (51,1)-(51,5))
-        │   │               ├── value:
-        │   │               │   @ CallNode (location: (51,3)-(51,5))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :kw
-        │   │               │   ├── message_loc: (51,3)-(51,5) = "kw"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               └── operator_loc: (51,1)-(51,3) = "**"
-        │   ├── opening_loc: (51,0)-(51,1) = "["
-        │   └── closing_loc: (51,5)-(51,6) = "]"
-        ├── @ ArrayNode (location: (53,0)-(53,9))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ IntegerNode (location: (53,1)-(53,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── @ KeywordHashNode (location: (53,4)-(53,8))
-        │   │       ├── flags: ∅
-        │   │       └── elements: (length: 1)
-        │   │           └── @ AssocSplatNode (location: (53,4)-(53,8))
-        │   │               ├── value:
-        │   │               │   @ CallNode (location: (53,6)-(53,8))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :kw
-        │   │               │   ├── message_loc: (53,6)-(53,8) = "kw"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               └── operator_loc: (53,4)-(53,6) = "**"
-        │   ├── opening_loc: (53,0)-(53,1) = "["
-        │   └── closing_loc: (53,8)-(53,9) = "]"
-        ├── @ ArrayNode (location: (55,0)-(55,21))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ IntegerNode (location: (55,1)-(55,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── @ KeywordHashNode (location: (55,4)-(55,20))
-        │   │       ├── flags: ∅
-        │   │       └── elements: (length: 3)
-        │   │           ├── @ AssocSplatNode (location: (55,4)-(55,8))
-        │   │           │   ├── value:
-        │   │           │   │   @ CallNode (location: (55,6)-(55,8))
-        │   │           │   │   ├── flags: variable_call, ignore_visibility
-        │   │           │   │   ├── receiver: ∅
-        │   │           │   │   ├── call_operator_loc: ∅
-        │   │           │   │   ├── name: :kw
-        │   │           │   │   ├── message_loc: (55,6)-(55,8) = "kw"
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── arguments: ∅
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── block: ∅
-        │   │           │   └── operator_loc: (55,4)-(55,6) = "**"
-        │   │           ├── @ AssocSplatNode (location: (55,10)-(55,14))
-        │   │           │   ├── value:
-        │   │           │   │   @ HashNode (location: (55,12)-(55,14))
-        │   │           │   │   ├── opening_loc: (55,12)-(55,13) = "{"
-        │   │           │   │   ├── elements: (length: 0)
-        │   │           │   │   └── closing_loc: (55,13)-(55,14) = "}"
-        │   │           │   └── operator_loc: (55,10)-(55,12) = "**"
-        │   │           └── @ AssocSplatNode (location: (55,16)-(55,20))
-        │   │               ├── value:
-        │   │               │   @ CallNode (location: (55,18)-(55,20))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :kw
-        │   │               │   ├── message_loc: (55,18)-(55,20) = "kw"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               └── operator_loc: (55,16)-(55,18) = "**"
-        │   ├── opening_loc: (55,0)-(55,1) = "["
-        │   └── closing_loc: (55,20)-(55,21) = "]"
-        ├── @ ArrayNode (location: (57,0)-(59,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ KeywordHashNode (location: (58,2)-(58,12))
-        │   │       ├── flags: ∅
-        │   │       └── elements: (length: 1)
-        │   │           └── @ AssocNode (location: (58,2)-(58,12))
-        │   │               ├── key:
-        │   │               │   @ CallNode (location: (58,2)-(58,5))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :foo
-        │   │               │   ├── message_loc: (58,2)-(58,5) = "foo"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               ├── value:
-        │   │               │   @ CallNode (location: (58,9)-(58,12))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :bar
-        │   │               │   ├── message_loc: (58,9)-(58,12) = "bar"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               └── operator_loc: (58,6)-(58,8) = "=>"
-        │   ├── opening_loc: (57,0)-(57,1) = "["
-        │   └── closing_loc: (59,0)-(59,1) = "]"
-        ├── @ ArrayNode (location: (62,0)-(62,17))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ SymbolNode (location: (62,3)-(62,6))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (62,3)-(62,6) = "one"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "one"
-        │   │   ├── @ SymbolNode (location: (62,7)-(62,10))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (62,7)-(62,10) = "two"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "two"
-        │   │   └── @ SymbolNode (location: (62,11)-(62,16))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (62,11)-(62,16) = "three"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "three"
-        │   ├── opening_loc: (62,0)-(62,3) = "%i#"
-        │   └── closing_loc: (62,16)-(62,17) = "#"
-        ├── @ ArrayNode (location: (64,0)-(64,17))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ StringNode (location: (64,3)-(64,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (64,3)-(64,6) = "one"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "one"
-        │   │   ├── @ StringNode (location: (64,7)-(64,10))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (64,7)-(64,10) = "two"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "two"
-        │   │   └── @ StringNode (location: (64,11)-(64,16))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (64,11)-(64,16) = "three"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "three"
-        │   ├── opening_loc: (64,0)-(64,3) = "%w#"
-        │   └── closing_loc: (64,16)-(64,17) = "#"
-        ├── @ XStringNode (location: (66,0)-(66,17))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (66,0)-(66,3) = "%x#"
-        │   ├── content_loc: (66,3)-(66,16) = "one two three"
-        │   ├── closing_loc: (66,16)-(66,17) = "#"
-        │   └── unescaped: "one two three"
-        ├── @ ArrayNode (location: (69,0)-(69,17))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ SymbolNode (location: (69,3)-(69,6))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (69,3)-(69,6) = "one"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "one"
-        │   │   ├── @ SymbolNode (location: (69,7)-(69,10))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (69,7)-(69,10) = "two"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "two"
-        │   │   └── @ SymbolNode (location: (69,11)-(69,16))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (69,11)-(69,16) = "three"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "three"
-        │   ├── opening_loc: (69,0)-(69,3) = "%i@"
-        │   └── closing_loc: (69,16)-(69,17) = "@"
-        ├── @ ArrayNode (location: (71,0)-(71,17))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ StringNode (location: (71,3)-(71,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (71,3)-(71,6) = "one"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "one"
-        │   │   ├── @ StringNode (location: (71,7)-(71,10))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (71,7)-(71,10) = "two"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "two"
-        │   │   └── @ StringNode (location: (71,11)-(71,16))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (71,11)-(71,16) = "three"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "three"
-        │   ├── opening_loc: (71,0)-(71,3) = "%w@"
-        │   └── closing_loc: (71,16)-(71,17) = "@"
-        ├── @ XStringNode (location: (73,0)-(73,17))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (73,0)-(73,3) = "%x@"
-        │   ├── content_loc: (73,3)-(73,16) = "one two three"
-        │   ├── closing_loc: (73,16)-(73,17) = "@"
-        │   └── unescaped: "one two three"
-        ├── @ ArrayNode (location: (76,0)-(76,17))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ SymbolNode (location: (76,3)-(76,6))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (76,3)-(76,6) = "one"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "one"
-        │   │   ├── @ SymbolNode (location: (76,7)-(76,10))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (76,7)-(76,10) = "two"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "two"
-        │   │   └── @ SymbolNode (location: (76,11)-(76,16))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (76,11)-(76,16) = "three"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "three"
-        │   ├── opening_loc: (76,0)-(76,3) = "%i{"
-        │   └── closing_loc: (76,16)-(76,17) = "}"
-        ├── @ ArrayNode (location: (78,0)-(78,17))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ StringNode (location: (78,3)-(78,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (78,3)-(78,6) = "one"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "one"
-        │   │   ├── @ StringNode (location: (78,7)-(78,10))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (78,7)-(78,10) = "two"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "two"
-        │   │   └── @ StringNode (location: (78,11)-(78,16))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (78,11)-(78,16) = "three"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "three"
-        │   ├── opening_loc: (78,0)-(78,3) = "%w{"
-        │   └── closing_loc: (78,16)-(78,17) = "}"
-        ├── @ XStringNode (location: (80,0)-(80,17))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (80,0)-(80,3) = "%x{"
-        │   ├── content_loc: (80,3)-(80,16) = "one two three"
-        │   ├── closing_loc: (80,16)-(80,17) = "}"
-        │   └── unescaped: "one two three"
-        ├── @ ArrayNode (location: (82,0)-(82,7))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (82,3)-(82,6))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (82,3)-(82,6) = "\\C:"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\\C:"
-        │   ├── opening_loc: (82,0)-(82,3) = "%w["
-        │   └── closing_loc: (82,6)-(82,7) = "]"
-        ├── @ CallNode (location: (84,0)-(84,13))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (84,0)-(84,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (84,0)-(84,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (84,3)-(84,9) = "[&bar]"
-        │   ├── opening_loc: (84,3)-(84,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (84,12)-(84,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (84,12)-(84,13))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: (84,8)-(84,9) = "]"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (84,4)-(84,8))
-        │       ├── expression:
-        │       │   @ CallNode (location: (84,5)-(84,8))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :bar
-        │       │   ├── message_loc: (84,5)-(84,8) = "bar"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (84,4)-(84,5) = "&"
-        ├── @ CallNode (location: (86,0)-(86,17))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (86,0)-(86,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (86,0)-(86,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (86,0)-(86,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (86,3)-(86,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (86,4)-(86,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (86,7)-(86,13) = "[&bar]"
-        │   ├── opening_loc: (86,7)-(86,8) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (86,16)-(86,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (86,16)-(86,17))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: (86,12)-(86,13) = "]"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (86,8)-(86,12))
-        │       ├── expression:
-        │       │   @ CallNode (location: (86,9)-(86,12))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :bar
-        │       │   ├── message_loc: (86,9)-(86,12) = "bar"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (86,8)-(86,9) = "&"
-        ├── @ DefNode (location: (88,0)-(90,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (88,4)-(88,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (88,8)-(88,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (88,8)-(88,9))
-        │   │       ├── flags: ∅
-        │   │       ├── name: ∅
-        │   │       ├── name_loc: ∅
-        │   │       └── operator_loc: (88,8)-(88,9) = "&"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (89,2)-(89,12))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (89,2)-(89,12))
-        │   │           ├── flags: attribute_write
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (89,2)-(89,5))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :bar
-        │   │           │   ├── message_loc: (89,2)-(89,5) = "bar"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :[]=
-        │   │           ├── message_loc: (89,5)-(89,8) = "[&]"
-        │   │           ├── opening_loc: (89,5)-(89,6) = "["
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (89,11)-(89,12))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (89,11)-(89,12))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: (89,7)-(89,8) = "]"
-        │   │           └── block:
-        │   │               @ BlockArgumentNode (location: (89,6)-(89,7))
-        │   │               ├── expression: ∅
-        │   │               └── operator_loc: (89,6)-(89,7) = "&"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (88,0)-(88,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (88,7)-(88,8) = "("
-        │   ├── rparen_loc: (88,9)-(88,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (90,0)-(90,3) = "end"
-        ├── @ IndexOperatorWriteNode (location: (92,0)-(92,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (92,0)-(92,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (92,0)-(92,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (92,3)-(92,4) = "["
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (92,4)-(92,5) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :+
-        │   ├── operator_loc: (92,6)-(92,8) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (92,9)-(92,10))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOrWriteNode (location: (94,0)-(94,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (94,0)-(94,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (94,0)-(94,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (94,3)-(94,4) = "["
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (94,4)-(94,5) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (94,6)-(94,9) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (94,10)-(94,11))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexAndWriteNode (location: (96,0)-(96,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (96,0)-(96,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (96,0)-(96,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (96,3)-(96,4) = "["
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (96,4)-(96,5) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (96,6)-(96,9) = "&&="
-        │   └── value:
-        │       @ IntegerNode (location: (96,10)-(96,11))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOperatorWriteNode (location: (98,0)-(98,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (98,0)-(98,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (98,0)-(98,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (98,0)-(98,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (98,3)-(98,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (98,4)-(98,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (98,7)-(98,8) = "["
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (98,8)-(98,9) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :+
-        │   ├── operator_loc: (98,10)-(98,12) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (98,13)-(98,14))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOrWriteNode (location: (100,0)-(100,15))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (100,0)-(100,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (100,0)-(100,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (100,0)-(100,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (100,3)-(100,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (100,4)-(100,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (100,7)-(100,8) = "["
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (100,8)-(100,9) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (100,10)-(100,13) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (100,14)-(100,15))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexAndWriteNode (location: (102,0)-(102,15))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (102,0)-(102,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (102,0)-(102,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (102,0)-(102,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (102,3)-(102,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (102,4)-(102,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (102,7)-(102,8) = "["
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (102,8)-(102,9) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (102,10)-(102,13) = "&&="
-        │   └── value:
-        │       @ IntegerNode (location: (102,14)-(102,15))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOperatorWriteNode (location: (104,0)-(104,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (104,0)-(104,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (104,0)-(104,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (104,3)-(104,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (104,4)-(104,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (104,4)-(104,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (104,4)-(104,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (104,7)-(104,8) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :+
-        │   ├── operator_loc: (104,9)-(104,11) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (104,12)-(104,13))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOrWriteNode (location: (106,0)-(106,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (106,0)-(106,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (106,0)-(106,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (106,3)-(106,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (106,4)-(106,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (106,4)-(106,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (106,4)-(106,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (106,7)-(106,8) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (106,9)-(106,12) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (106,13)-(106,14))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexAndWriteNode (location: (108,0)-(108,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (108,0)-(108,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (108,0)-(108,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (108,3)-(108,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (108,4)-(108,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (108,4)-(108,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (108,4)-(108,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (108,7)-(108,8) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (108,9)-(108,12) = "&&="
-        │   └── value:
-        │       @ IntegerNode (location: (108,13)-(108,14))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOperatorWriteNode (location: (110,0)-(110,17))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (110,0)-(110,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (110,0)-(110,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (110,0)-(110,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (110,3)-(110,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (110,4)-(110,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (110,7)-(110,8) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (110,8)-(110,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (110,8)-(110,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (110,8)-(110,11) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (110,11)-(110,12) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :+
-        │   ├── operator_loc: (110,13)-(110,15) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (110,16)-(110,17))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOrWriteNode (location: (112,0)-(112,18))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (112,0)-(112,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (112,0)-(112,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (112,0)-(112,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (112,3)-(112,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (112,4)-(112,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (112,7)-(112,8) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (112,8)-(112,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (112,8)-(112,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (112,8)-(112,11) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (112,11)-(112,12) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (112,13)-(112,16) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (112,17)-(112,18))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexAndWriteNode (location: (114,0)-(114,18))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (114,0)-(114,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (114,0)-(114,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (114,0)-(114,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (114,3)-(114,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (114,4)-(114,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (114,7)-(114,8) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (114,8)-(114,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (114,8)-(114,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (114,8)-(114,11) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (114,11)-(114,12) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (114,13)-(114,16) = "&&="
-        │   └── value:
-        │       @ IntegerNode (location: (114,17)-(114,18))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOperatorWriteNode (location: (116,0)-(116,19))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (116,0)-(116,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (116,0)-(116,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (116,3)-(116,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (116,4)-(116,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (116,4)-(116,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (116,4)-(116,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (116,13)-(116,14) = "]"
-        │   ├── block:
-        │   │   @ BlockArgumentNode (location: (116,9)-(116,13))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (116,10)-(116,13))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── message_loc: (116,10)-(116,13) = "baz"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (116,9)-(116,10) = "&"
-        │   ├── operator: :+
-        │   ├── operator_loc: (116,15)-(116,17) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (116,18)-(116,19))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOrWriteNode (location: (118,0)-(118,20))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (118,0)-(118,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (118,0)-(118,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (118,3)-(118,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (118,4)-(118,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (118,4)-(118,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (118,4)-(118,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (118,13)-(118,14) = "]"
-        │   ├── block:
-        │   │   @ BlockArgumentNode (location: (118,9)-(118,13))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (118,10)-(118,13))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── message_loc: (118,10)-(118,13) = "baz"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (118,9)-(118,10) = "&"
-        │   ├── operator_loc: (118,15)-(118,18) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (118,19)-(118,20))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexAndWriteNode (location: (120,0)-(120,20))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (120,0)-(120,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (120,0)-(120,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (120,3)-(120,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (120,4)-(120,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (120,4)-(120,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (120,4)-(120,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (120,13)-(120,14) = "]"
-        │   ├── block:
-        │   │   @ BlockArgumentNode (location: (120,9)-(120,13))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (120,10)-(120,13))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── message_loc: (120,10)-(120,13) = "baz"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (120,9)-(120,10) = "&"
-        │   ├── operator_loc: (120,15)-(120,18) = "&&="
-        │   └── value:
-        │       @ IntegerNode (location: (120,19)-(120,20))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOperatorWriteNode (location: (122,0)-(122,23))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (122,0)-(122,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (122,0)-(122,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (122,0)-(122,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (122,3)-(122,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (122,4)-(122,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (122,7)-(122,8) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (122,8)-(122,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (122,8)-(122,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (122,8)-(122,11) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (122,17)-(122,18) = "]"
-        │   ├── block:
-        │   │   @ BlockArgumentNode (location: (122,13)-(122,17))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (122,14)-(122,17))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── message_loc: (122,14)-(122,17) = "baz"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (122,13)-(122,14) = "&"
-        │   ├── operator: :+
-        │   ├── operator_loc: (122,19)-(122,21) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (122,22)-(122,23))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexOrWriteNode (location: (124,0)-(124,24))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (124,0)-(124,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (124,0)-(124,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (124,0)-(124,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (124,3)-(124,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (124,4)-(124,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (124,7)-(124,8) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (124,8)-(124,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (124,8)-(124,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (124,8)-(124,11) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (124,17)-(124,18) = "]"
-        │   ├── block:
-        │   │   @ BlockArgumentNode (location: (124,13)-(124,17))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (124,14)-(124,17))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── message_loc: (124,14)-(124,17) = "baz"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (124,13)-(124,14) = "&"
-        │   ├── operator_loc: (124,19)-(124,22) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (124,23)-(124,24))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IndexAndWriteNode (location: (126,0)-(126,24))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (126,0)-(126,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (126,0)-(126,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (126,0)-(126,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (126,3)-(126,4) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (126,4)-(126,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (126,7)-(126,8) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (126,8)-(126,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (126,8)-(126,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (126,8)-(126,11) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (126,17)-(126,18) = "]"
-        │   ├── block:
-        │   │   @ BlockArgumentNode (location: (126,13)-(126,17))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (126,14)-(126,17))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── message_loc: (126,14)-(126,17) = "baz"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (126,13)-(126,14) = "&"
-        │   ├── operator_loc: (126,19)-(126,22) = "&&="
-        │   └── value:
-        │       @ IntegerNode (location: (126,23)-(126,24))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ DefNode (location: (128,0)-(128,19))
-        │   ├── name: :f
-        │   ├── name_loc: (128,4)-(128,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (128,6)-(128,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (128,6)-(128,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (128,6)-(128,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (128,10)-(128,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (128,10)-(128,14))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (128,10)-(128,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :a
-        │   │           │   ├── message_loc: (128,10)-(128,11) = "a"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :[]
-        │   │           ├── message_loc: (128,11)-(128,14) = "[*]"
-        │   │           ├── opening_loc: (128,11)-(128,12) = "["
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (128,12)-(128,13))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ SplatNode (location: (128,12)-(128,13))
-        │   │           │           ├── operator_loc: (128,12)-(128,13) = "*"
-        │   │           │           └── expression: ∅
-        │   │           ├── closing_loc: (128,13)-(128,14) = "]"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (128,0)-(128,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (128,5)-(128,6) = "("
-        │   ├── rparen_loc: (128,7)-(128,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (128,16)-(128,19) = "end"
-        ├── @ DefNode (location: (130,0)-(130,22))
-        │   ├── name: :f
-        │   ├── name_loc: (130,4)-(130,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (130,6)-(130,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (130,6)-(130,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (130,6)-(130,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (130,10)-(130,17))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (130,10)-(130,17))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (130,10)-(130,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :a
-        │   │           │   ├── message_loc: (130,10)-(130,11) = "a"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :[]
-        │   │           ├── message_loc: (130,11)-(130,17) = "[1, *]"
-        │   │           ├── opening_loc: (130,11)-(130,12) = "["
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (130,12)-(130,16))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ IntegerNode (location: (130,12)-(130,13))
-        │   │           │       │   ├── flags: decimal
-        │   │           │       │   └── value: 1
-        │   │           │       └── @ SplatNode (location: (130,15)-(130,16))
-        │   │           │           ├── operator_loc: (130,15)-(130,16) = "*"
-        │   │           │           └── expression: ∅
-        │   │           ├── closing_loc: (130,16)-(130,17) = "]"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (130,0)-(130,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (130,5)-(130,6) = "("
-        │   ├── rparen_loc: (130,7)-(130,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (130,19)-(130,22) = "end"
-        ├── @ DefNode (location: (132,0)-(132,23))
-        │   ├── name: :f
-        │   ├── name_loc: (132,4)-(132,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (132,6)-(132,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (132,6)-(132,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (132,6)-(132,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (132,10)-(132,18))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (132,10)-(132,18))
-        │   │           ├── flags: attribute_write
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (132,10)-(132,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :a
-        │   │           │   ├── message_loc: (132,10)-(132,11) = "a"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :[]=
-        │   │           ├── message_loc: (132,11)-(132,14) = "[*]"
-        │   │           ├── opening_loc: (132,11)-(132,12) = "["
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (132,12)-(132,18))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ SplatNode (location: (132,12)-(132,13))
-        │   │           │       │   ├── operator_loc: (132,12)-(132,13) = "*"
-        │   │           │       │   └── expression: ∅
-        │   │           │       └── @ IntegerNode (location: (132,17)-(132,18))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: (132,13)-(132,14) = "]"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (132,0)-(132,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (132,5)-(132,6) = "("
-        │   ├── rparen_loc: (132,7)-(132,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (132,20)-(132,23) = "end"
-        ├── @ DefNode (location: (134,0)-(134,26))
-        │   ├── name: :f
-        │   ├── name_loc: (134,4)-(134,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (134,6)-(134,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (134,6)-(134,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (134,6)-(134,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (134,10)-(134,21))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (134,10)-(134,21))
-        │   │           ├── flags: attribute_write
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (134,10)-(134,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :a
-        │   │           │   ├── message_loc: (134,10)-(134,11) = "a"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :[]=
-        │   │           ├── message_loc: (134,11)-(134,17) = "[1, *]"
-        │   │           ├── opening_loc: (134,11)-(134,12) = "["
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (134,12)-(134,21))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 3)
-        │   │           │       ├── @ IntegerNode (location: (134,12)-(134,13))
-        │   │           │       │   ├── flags: decimal
-        │   │           │       │   └── value: 1
-        │   │           │       ├── @ SplatNode (location: (134,15)-(134,16))
-        │   │           │       │   ├── operator_loc: (134,15)-(134,16) = "*"
-        │   │           │       │   └── expression: ∅
-        │   │           │       └── @ IntegerNode (location: (134,20)-(134,21))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: (134,16)-(134,17) = "]"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (134,0)-(134,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (134,5)-(134,6) = "("
-        │   ├── rparen_loc: (134,7)-(134,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (134,23)-(134,26) = "end"
-        ├── @ DefNode (location: (136,0)-(136,24))
-        │   ├── name: :f
-        │   ├── name_loc: (136,4)-(136,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (136,6)-(136,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (136,6)-(136,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (136,6)-(136,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (136,10)-(136,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IndexOperatorWriteNode (location: (136,10)-(136,19))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (136,10)-(136,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :a
-        │   │           │   ├── message_loc: (136,10)-(136,11) = "a"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── opening_loc: (136,11)-(136,12) = "["
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (136,12)-(136,13))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ SplatNode (location: (136,12)-(136,13))
-        │   │           │           ├── operator_loc: (136,12)-(136,13) = "*"
-        │   │           │           └── expression: ∅
-        │   │           ├── closing_loc: (136,13)-(136,14) = "]"
-        │   │           ├── block: ∅
-        │   │           ├── operator: :+
-        │   │           ├── operator_loc: (136,15)-(136,17) = "+="
-        │   │           └── value:
-        │   │               @ IntegerNode (location: (136,18)-(136,19))
-        │   │               ├── flags: decimal
-        │   │               └── value: 1
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (136,0)-(136,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (136,5)-(136,6) = "("
-        │   ├── rparen_loc: (136,7)-(136,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (136,21)-(136,24) = "end"
-        ├── @ DefNode (location: (138,0)-(138,28))
-        │   ├── name: :f
-        │   ├── name_loc: (138,4)-(138,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (138,6)-(138,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (138,6)-(138,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (138,6)-(138,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (138,10)-(138,23))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IndexAndWriteNode (location: (138,10)-(138,23))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (138,10)-(138,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :a
-        │   │           │   ├── message_loc: (138,10)-(138,11) = "a"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── opening_loc: (138,11)-(138,12) = "["
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (138,12)-(138,16))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ IntegerNode (location: (138,12)-(138,13))
-        │   │           │       │   ├── flags: decimal
-        │   │           │       │   └── value: 1
-        │   │           │       └── @ SplatNode (location: (138,15)-(138,16))
-        │   │           │           ├── operator_loc: (138,15)-(138,16) = "*"
-        │   │           │           └── expression: ∅
-        │   │           ├── closing_loc: (138,16)-(138,17) = "]"
-        │   │           ├── block: ∅
-        │   │           ├── operator_loc: (138,18)-(138,21) = "&&="
-        │   │           └── value:
-        │   │               @ IntegerNode (location: (138,22)-(138,23))
-        │   │               ├── flags: decimal
-        │   │               └── value: 1
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (138,0)-(138,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (138,5)-(138,6) = "("
-        │   ├── rparen_loc: (138,7)-(138,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (138,25)-(138,28) = "end"
-        ├── @ DefNode (location: (140,0)-(140,29))
-        │   ├── name: :f
-        │   ├── name_loc: (140,4)-(140,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (140,6)-(140,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (140,6)-(140,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (140,6)-(140,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (140,0)-(140,29))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (140,10)-(140,24))
-        │   │   │   ├── keyword_loc: (140,10)-(140,16) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: (140,17)-(140,19) = "=>"
-        │   │   │   ├── reference:
-        │   │   │   │   @ IndexTargetNode (location: (140,20)-(140,24))
-        │   │   │   │   ├── flags: attribute_write
-        │   │   │   │   ├── receiver:
-        │   │   │   │   │   @ CallNode (location: (140,20)-(140,21))
-        │   │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   │   ├── receiver: ∅
-        │   │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   │   ├── name: :a
-        │   │   │   │   │   ├── message_loc: (140,20)-(140,21) = "a"
-        │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   ├── arguments: ∅
-        │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   └── block: ∅
-        │   │   │   │   ├── opening_loc: (140,21)-(140,22) = "["
-        │   │   │   │   ├── arguments:
-        │   │   │   │   │   @ ArgumentsNode (location: (140,22)-(140,23))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │   │       └── @ SplatNode (location: (140,22)-(140,23))
-        │   │   │   │   │           ├── operator_loc: (140,22)-(140,23) = "*"
-        │   │   │   │   │           └── expression: ∅
-        │   │   │   │   ├── closing_loc: (140,23)-(140,24) = "]"
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── statements: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause: ∅
-        │   │   └── end_keyword_loc: (140,26)-(140,29) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (140,0)-(140,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (140,5)-(140,6) = "("
-        │   ├── rparen_loc: (140,7)-(140,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (140,26)-(140,29) = "end"
-        └── @ DefNode (location: (142,0)-(142,32))
-            ├── name: :f
-            ├── name_loc: (142,4)-(142,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (142,6)-(142,7))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (142,6)-(142,7))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (142,6)-(142,7) = "*"
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ BeginNode (location: (142,0)-(142,32))
-            │   ├── begin_keyword_loc: ∅
-            │   ├── statements: ∅
-            │   ├── rescue_clause:
-            │   │   @ RescueNode (location: (142,10)-(142,27))
-            │   │   ├── keyword_loc: (142,10)-(142,16) = "rescue"
-            │   │   ├── exceptions: (length: 0)
-            │   │   ├── operator_loc: (142,17)-(142,19) = "=>"
-            │   │   ├── reference:
-            │   │   │   @ IndexTargetNode (location: (142,20)-(142,27))
-            │   │   │   ├── flags: attribute_write
-            │   │   │   ├── receiver:
-            │   │   │   │   @ CallNode (location: (142,20)-(142,21))
-            │   │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   │   ├── receiver: ∅
-            │   │   │   │   ├── call_operator_loc: ∅
-            │   │   │   │   ├── name: :a
-            │   │   │   │   ├── message_loc: (142,20)-(142,21) = "a"
-            │   │   │   │   ├── opening_loc: ∅
-            │   │   │   │   ├── arguments: ∅
-            │   │   │   │   ├── closing_loc: ∅
-            │   │   │   │   └── block: ∅
-            │   │   │   ├── opening_loc: (142,21)-(142,22) = "["
-            │   │   │   ├── arguments:
-            │   │   │   │   @ ArgumentsNode (location: (142,22)-(142,26))
-            │   │   │   │   ├── flags: ∅
-            │   │   │   │   └── arguments: (length: 2)
-            │   │   │   │       ├── @ IntegerNode (location: (142,22)-(142,23))
-            │   │   │   │       │   ├── flags: decimal
-            │   │   │   │       │   └── value: 1
-            │   │   │   │       └── @ SplatNode (location: (142,25)-(142,26))
-            │   │   │   │           ├── operator_loc: (142,25)-(142,26) = "*"
-            │   │   │   │           └── expression: ∅
-            │   │   │   ├── closing_loc: (142,26)-(142,27) = "]"
-            │   │   │   └── block: ∅
-            │   │   ├── statements: ∅
-            │   │   └── consequent: ∅
-            │   ├── else_clause: ∅
-            │   ├── ensure_clause: ∅
-            │   └── end_keyword_loc: (142,29)-(142,32) = "end"
-            ├── locals: []
-            ├── def_keyword_loc: (142,0)-(142,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (142,5)-(142,6) = "("
-            ├── rparen_loc: (142,7)-(142,8) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (142,29)-(142,32) = "end"
diff --git a/test/mri/prism/snapshots/begin_ensure.txt b/test/mri/prism/snapshots/begin_ensure.txt
deleted file mode 100644
index 9af9b9e5736..00000000000
--- a/test/mri/prism/snapshots/begin_ensure.txt
+++ /dev/null
@@ -1,251 +0,0 @@
-@ ProgramNode (location: (1,0)-(21,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(21,15))
-    └── body: (length: 5)
-        ├── @ BeginNode (location: (1,0)-(5,3))
-        │   ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (2,0)-(2,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,0)-(2,1))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (2,0)-(2,1) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause:
-        │   │   @ EnsureNode (location: (3,0)-(5,3))
-        │   │   ├── ensure_keyword_loc: (3,0)-(3,6) = "ensure"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (4,0)-(4,1))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (4,0)-(4,1))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (4,0)-(4,1) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ BeginNode (location: (7,0)-(7,24))
-        │   ├── begin_keyword_loc: (7,0)-(7,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (7,7)-(7,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (7,7)-(7,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (7,7)-(7,8) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause:
-        │   │   @ EnsureNode (location: (7,10)-(7,24))
-        │   │   ├── ensure_keyword_loc: (7,10)-(7,16) = "ensure"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (7,18)-(7,19))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (7,18)-(7,19))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (7,18)-(7,19) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (7,21)-(7,24) = "end"
-        │   └── end_keyword_loc: (7,21)-(7,24) = "end"
-        ├── @ BeginNode (location: (9,0)-(11,4))
-        │   ├── begin_keyword_loc: (9,0)-(9,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (9,6)-(9,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (9,6)-(9,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (9,6)-(9,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause:
-        │   │   @ EnsureNode (location: (10,1)-(11,4))
-        │   │   ├── ensure_keyword_loc: (10,1)-(10,7) = "ensure"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (10,8)-(10,9))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (10,8)-(10,9))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (10,8)-(10,9) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (11,1)-(11,4) = "end"
-        │   └── end_keyword_loc: (11,1)-(11,4) = "end"
-        ├── @ BeginNode (location: (13,0)-(13,22))
-        │   ├── begin_keyword_loc: (13,0)-(13,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (13,6)-(13,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (13,6)-(13,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (13,6)-(13,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause:
-        │   │   @ EnsureNode (location: (13,9)-(13,22))
-        │   │   ├── ensure_keyword_loc: (13,9)-(13,15) = "ensure"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (13,16)-(13,17))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (13,16)-(13,17))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (13,16)-(13,17) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (13,19)-(13,22) = "end"
-        │   └── end_keyword_loc: (13,19)-(13,22) = "end"
-        └── @ BeginNode (location: (15,0)-(21,15))
-            ├── begin_keyword_loc: (15,0)-(15,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (15,6)-(21,11))
-            │   └── body: (length: 1)
-            │       └── @ BeginNode (location: (15,6)-(21,11))
-            │           ├── begin_keyword_loc: (15,6)-(15,11) = "begin"
-            │           ├── statements:
-            │           │   @ StatementsNode (location: (15,11)-(21,7))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (15,11)-(21,7))
-            │           │           ├── flags: ∅
-            │           │           ├── receiver:
-            │           │           │   @ SymbolNode (location: (15,11)-(15,13))
-            │           │           │   ├── flags: forced_us_ascii_encoding
-            │           │           │   ├── opening_loc: (15,11)-(15,12) = ":"
-            │           │           │   ├── value_loc: (15,12)-(15,13) = "s"
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── unescaped: "s"
-            │           │           ├── call_operator_loc: (15,13)-(15,14) = "."
-            │           │           ├── name: :l
-            │           │           ├── message_loc: (15,14)-(15,15) = "l"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments:
-            │           │           │   @ ArgumentsNode (location: (15,16)-(21,7))
-            │           │           │   ├── flags: ∅
-            │           │           │   └── arguments: (length: 1)
-            │           │           │       └── @ BeginNode (location: (15,16)-(21,7))
-            │           │           │           ├── begin_keyword_loc: (15,16)-(15,21) = "begin"
-            │           │           │           ├── statements: ∅
-            │           │           │           ├── rescue_clause: ∅
-            │           │           │           ├── else_clause: ∅
-            │           │           │           ├── ensure_clause:
-            │           │           │           │   @ EnsureNode (location: (15,22)-(21,7))
-            │           │           │           │   ├── ensure_keyword_loc: (15,22)-(15,28) = "ensure"
-            │           │           │           │   ├── statements:
-            │           │           │           │   │   @ StatementsNode (location: (15,29)-(21,3))
-            │           │           │           │   │   └── body: (length: 1)
-            │           │           │           │   │       └── @ CallNode (location: (15,29)-(21,3))
-            │           │           │           │   │           ├── flags: ∅
-            │           │           │           │   │           ├── receiver:
-            │           │           │           │   │           │   @ ConstantReadNode (location: (15,29)-(15,35))
-            │           │           │           │   │           │   └── name: :Module
-            │           │           │           │   │           ├── call_operator_loc: (15,35)-(15,36) = "."
-            │           │           │           │   │           ├── name: :new
-            │           │           │           │   │           ├── message_loc: (15,36)-(15,39) = "new"
-            │           │           │           │   │           ├── opening_loc: ∅
-            │           │           │           │   │           ├── arguments: ∅
-            │           │           │           │   │           ├── closing_loc: ∅
-            │           │           │           │   │           └── block:
-            │           │           │           │   │               @ BlockNode (location: (15,40)-(21,3))
-            │           │           │           │   │               ├── locals: []
-            │           │           │           │   │               ├── parameters: ∅
-            │           │           │           │   │               ├── body:
-            │           │           │           │   │               │   @ StatementsNode (location: (16,2)-(20,5))
-            │           │           │           │   │               │   └── body: (length: 1)
-            │           │           │           │   │               │       └── @ BeginNode (location: (16,2)-(20,5))
-            │           │           │           │   │               │           ├── begin_keyword_loc: (16,2)-(16,7) = "begin"
-            │           │           │           │   │               │           ├── statements:
-            │           │           │           │   │               │           │   @ StatementsNode (location: (17,4)-(17,9))
-            │           │           │           │   │               │           │   └── body: (length: 1)
-            │           │           │           │   │               │           │       └── @ BreakNode (location: (17,4)-(17,9))
-            │           │           │           │   │               │           │           ├── arguments: ∅
-            │           │           │           │   │               │           │           └── keyword_loc: (17,4)-(17,9) = "break"
-            │           │           │           │   │               │           ├── rescue_clause: ∅
-            │           │           │           │   │               │           ├── else_clause: ∅
-            │           │           │           │   │               │           ├── ensure_clause:
-            │           │           │           │   │               │           │   @ EnsureNode (location: (18,4)-(20,5))
-            │           │           │           │   │               │           │   ├── ensure_keyword_loc: (18,4)-(18,10) = "ensure"
-            │           │           │           │   │               │           │   ├── statements:
-            │           │           │           │   │               │           │   │   @ StatementsNode (location: (18,11)-(19,7))
-            │           │           │           │   │               │           │   │   └── body: (length: 1)
-            │           │           │           │   │               │           │   │       └── @ CallNode (location: (18,11)-(19,7))
-            │           │           │           │   │               │           │   │           ├── flags: ∅
-            │           │           │           │   │               │           │   │           ├── receiver:
-            │           │           │           │   │               │           │   │           │   @ ConstantReadNode (location: (18,11)-(18,17))
-            │           │           │           │   │               │           │   │           │   └── name: :Module
-            │           │           │           │   │               │           │   │           ├── call_operator_loc: (18,17)-(18,18) = "."
-            │           │           │           │   │               │           │   │           ├── name: :new
-            │           │           │           │   │               │           │   │           ├── message_loc: (18,18)-(18,21) = "new"
-            │           │           │           │   │               │           │   │           ├── opening_loc: ∅
-            │           │           │           │   │               │           │   │           ├── arguments: ∅
-            │           │           │           │   │               │           │   │           ├── closing_loc: ∅
-            │           │           │           │   │               │           │   │           └── block:
-            │           │           │           │   │               │           │   │               @ BlockNode (location: (18,22)-(19,7))
-            │           │           │           │   │               │           │   │               ├── locals: []
-            │           │           │           │   │               │           │   │               ├── parameters: ∅
-            │           │           │           │   │               │           │   │               ├── body: ∅
-            │           │           │           │   │               │           │   │               ├── opening_loc: (18,22)-(18,24) = "do"
-            │           │           │           │   │               │           │   │               └── closing_loc: (19,4)-(19,7) = "end"
-            │           │           │           │   │               │           │   └── end_keyword_loc: (20,2)-(20,5) = "end"
-            │           │           │           │   │               │           └── end_keyword_loc: (20,2)-(20,5) = "end"
-            │           │           │           │   │               ├── opening_loc: (15,40)-(15,42) = "do"
-            │           │           │           │   │               └── closing_loc: (21,0)-(21,3) = "end"
-            │           │           │           │   └── end_keyword_loc: (21,4)-(21,7) = "end"
-            │           │           │           └── end_keyword_loc: (21,4)-(21,7) = "end"
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── rescue_clause: ∅
-            │           ├── else_clause: ∅
-            │           ├── ensure_clause: ∅
-            │           └── end_keyword_loc: (21,8)-(21,11) = "end"
-            ├── rescue_clause: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (21,12)-(21,15) = "end"
diff --git a/test/mri/prism/snapshots/begin_rescue.txt b/test/mri/prism/snapshots/begin_rescue.txt
deleted file mode 100644
index f624f85c072..00000000000
--- a/test/mri/prism/snapshots/begin_rescue.txt
+++ /dev/null
@@ -1,699 +0,0 @@
-@ ProgramNode (location: (1,0)-(78,3))
-├── locals: [:ex]
-└── statements:
-    @ StatementsNode (location: (1,0)-(78,3))
-    └── body: (length: 17)
-        ├── @ BeginNode (location: (1,0)-(1,33))
-        │   ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,7)-(1,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,7)-(1,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (1,7)-(1,8) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (1,10)-(1,19))
-        │   │   ├── keyword_loc: (1,10)-(1,16) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,18)-(1,19))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (1,18)-(1,19))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (1,18)-(1,19) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause:
-        │   │   @ ElseNode (location: (1,21)-(1,33))
-        │   │   ├── else_keyword_loc: (1,21)-(1,25) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,27)-(1,28))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (1,27)-(1,28))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :c
-        │   │   │           ├── message_loc: (1,27)-(1,28) = "c"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (1,30)-(1,33) = "end"
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (1,30)-(1,33) = "end"
-        ├── @ BeginNode (location: (3,0)-(3,44))
-        │   ├── begin_keyword_loc: (3,0)-(3,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (3,7)-(3,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (3,7)-(3,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (3,7)-(3,8) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (3,10)-(3,19))
-        │   │   ├── keyword_loc: (3,10)-(3,16) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (3,18)-(3,19))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (3,18)-(3,19))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (3,18)-(3,19) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause:
-        │   │   @ ElseNode (location: (3,21)-(3,36))
-        │   │   ├── else_keyword_loc: (3,21)-(3,25) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (3,27)-(3,28))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (3,27)-(3,28))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :c
-        │   │   │           ├── message_loc: (3,27)-(3,28) = "c"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (3,30)-(3,36) = "ensure"
-        │   ├── ensure_clause:
-        │   │   @ EnsureNode (location: (3,30)-(3,44))
-        │   │   ├── ensure_keyword_loc: (3,30)-(3,36) = "ensure"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (3,38)-(3,39))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (3,38)-(3,39))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :d
-        │   │   │           ├── message_loc: (3,38)-(3,39) = "d"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (3,41)-(3,44) = "end"
-        │   └── end_keyword_loc: (3,41)-(3,44) = "end"
-        ├── @ BeginNode (location: (5,0)-(7,3))
-        │   ├── begin_keyword_loc: (5,0)-(5,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (6,0)-(6,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (6,0)-(6,1))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (6,0)-(6,1) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (7,0)-(7,3) = "end"
-        ├── @ BeginNode (location: (9,0)-(9,13))
-        │   ├── begin_keyword_loc: (9,0)-(9,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (9,7)-(9,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (9,7)-(9,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (9,7)-(9,8) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (9,10)-(9,13) = "end"
-        ├── @ BeginNode (location: (11,0)-(12,4))
-        │   ├── begin_keyword_loc: (11,0)-(11,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (11,6)-(11,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (11,6)-(11,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (11,6)-(11,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (12,1)-(12,4) = "end"
-        ├── @ BeginNode (location: (14,0)-(14,12))
-        │   ├── begin_keyword_loc: (14,0)-(14,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (14,6)-(14,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (14,6)-(14,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (14,6)-(14,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (14,9)-(14,12) = "end"
-        ├── @ BeginNode (location: (16,0)-(24,3))
-        │   ├── begin_keyword_loc: (16,0)-(16,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (17,0)-(17,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (17,0)-(17,1))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (17,0)-(17,1) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (18,0)-(23,1))
-        │   │   ├── keyword_loc: (18,0)-(18,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (19,0)-(19,1))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (19,0)-(19,1))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (19,0)-(19,1) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent:
-        │   │       @ RescueNode (location: (20,0)-(23,1))
-        │   │       ├── keyword_loc: (20,0)-(20,6) = "rescue"
-        │   │       ├── exceptions: (length: 0)
-        │   │       ├── operator_loc: ∅
-        │   │       ├── reference: ∅
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (21,0)-(21,1))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (21,0)-(21,1))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :c
-        │   │       │           ├── message_loc: (21,0)-(21,1) = "c"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       └── consequent:
-        │   │           @ RescueNode (location: (22,0)-(23,1))
-        │   │           ├── keyword_loc: (22,0)-(22,6) = "rescue"
-        │   │           ├── exceptions: (length: 0)
-        │   │           ├── operator_loc: ∅
-        │   │           ├── reference: ∅
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (23,0)-(23,1))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (23,0)-(23,1))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :d
-        │   │           │           ├── message_loc: (23,0)-(23,1) = "d"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (24,0)-(24,3) = "end"
-        ├── @ BeginNode (location: (26,0)-(32,3))
-        │   ├── begin_keyword_loc: (26,0)-(26,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (27,2)-(27,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (27,2)-(27,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (27,2)-(27,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (28,0)-(31,3))
-        │   │   ├── keyword_loc: (28,0)-(28,6) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (28,7)-(28,16))
-        │   │   │       └── name: :Exception
-        │   │   ├── operator_loc: (28,17)-(28,19) = "=>"
-        │   │   ├── reference:
-        │   │   │   @ LocalVariableTargetNode (location: (28,20)-(28,22))
-        │   │   │   ├── name: :ex
-        │   │   │   └── depth: 0
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (29,2)-(29,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (29,2)-(29,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (29,2)-(29,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent:
-        │   │       @ RescueNode (location: (30,0)-(31,3))
-        │   │       ├── keyword_loc: (30,0)-(30,6) = "rescue"
-        │   │       ├── exceptions: (length: 2)
-        │   │       │   ├── @ ConstantReadNode (location: (30,7)-(30,23))
-        │   │       │   │   └── name: :AnotherException
-        │   │       │   └── @ ConstantReadNode (location: (30,25)-(30,41))
-        │   │       │       └── name: :OneMoreException
-        │   │       ├── operator_loc: (30,42)-(30,44) = "=>"
-        │   │       ├── reference:
-        │   │       │   @ LocalVariableTargetNode (location: (30,45)-(30,47))
-        │   │       │   ├── name: :ex
-        │   │       │   └── depth: 0
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (31,2)-(31,3))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (31,2)-(31,3))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :c
-        │   │       │           ├── message_loc: (31,2)-(31,3) = "c"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (32,0)-(32,3) = "end"
-        ├── @ BeginNode (location: (34,0)-(40,3))
-        │   ├── begin_keyword_loc: (34,0)-(34,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (35,2)-(35,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (35,2)-(35,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (35,2)-(35,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (36,0)-(37,3))
-        │   │   ├── keyword_loc: (36,0)-(36,6) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (36,7)-(36,16))
-        │   │   │       └── name: :Exception
-        │   │   ├── operator_loc: (36,17)-(36,19) = "=>"
-        │   │   ├── reference:
-        │   │   │   @ LocalVariableTargetNode (location: (36,20)-(36,22))
-        │   │   │   ├── name: :ex
-        │   │   │   └── depth: 0
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (37,2)-(37,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (37,2)-(37,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (37,2)-(37,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause:
-        │   │   @ EnsureNode (location: (38,0)-(40,3))
-        │   │   ├── ensure_keyword_loc: (38,0)-(38,6) = "ensure"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (39,2)-(39,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (39,2)-(39,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (39,2)-(39,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (40,0)-(40,3) = "end"
-        │   └── end_keyword_loc: (40,0)-(40,3) = "end"
-        ├── @ StringNode (location: (42,0)-(42,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (42,0)-(42,2) = "%!"
-        │   ├── content_loc: (42,2)-(42,5) = "abc"
-        │   ├── closing_loc: (42,5)-(42,6) = "!"
-        │   └── unescaped: "abc"
-        ├── @ BeginNode (location: (44,0)-(48,3))
-        │   ├── begin_keyword_loc: (44,0)-(44,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (45,0)-(45,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (45,0)-(45,1))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (45,0)-(45,1) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (46,0)-(47,1))
-        │   │   ├── keyword_loc: (46,0)-(46,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (47,0)-(47,1))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (47,0)-(47,1))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (47,0)-(47,1) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (48,0)-(48,3) = "end"
-        ├── @ BeginNode (location: (50,0)-(50,20))
-        │   ├── begin_keyword_loc: (50,0)-(50,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (50,6)-(50,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (50,6)-(50,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (50,6)-(50,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (50,8)-(50,16))
-        │   │   ├── keyword_loc: (50,8)-(50,14) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (50,15)-(50,16))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (50,15)-(50,16))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (50,15)-(50,16) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (50,17)-(50,20) = "end"
-        ├── @ BeginNode (location: (52,0)-(54,5))
-        │   ├── begin_keyword_loc: (52,0)-(52,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (53,0)-(53,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (53,0)-(53,1))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (53,0)-(53,1) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (53,2)-(54,1))
-        │   │   ├── keyword_loc: (53,2)-(53,8) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (54,0)-(54,1))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (54,0)-(54,1))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (54,0)-(54,1) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (54,2)-(54,5) = "end"
-        ├── @ BeginNode (location: (56,0)-(60,3))
-        │   ├── begin_keyword_loc: (56,0)-(56,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (57,0)-(57,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (57,0)-(57,1))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (57,0)-(57,1) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (58,0)-(59,1))
-        │   │   ├── keyword_loc: (58,0)-(58,6) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (58,7)-(58,16))
-        │   │   │       └── name: :Exception
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (59,0)-(59,1))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (59,0)-(59,1))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (59,0)-(59,1) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (60,0)-(60,3) = "end"
-        ├── @ BeginNode (location: (62,0)-(66,3))
-        │   ├── begin_keyword_loc: (62,0)-(62,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (63,0)-(63,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (63,0)-(63,1))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (63,0)-(63,1) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (64,0)-(65,1))
-        │   │   ├── keyword_loc: (64,0)-(64,6) = "rescue"
-        │   │   ├── exceptions: (length: 2)
-        │   │   │   ├── @ ConstantReadNode (location: (64,7)-(64,16))
-        │   │   │   │   └── name: :Exception
-        │   │   │   └── @ ConstantReadNode (location: (64,18)-(64,33))
-        │   │   │       └── name: :CustomException
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (65,0)-(65,1))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (65,0)-(65,1))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (65,0)-(65,1) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (66,0)-(66,3) = "end"
-        ├── @ BeginNode (location: (68,0)-(72,3))
-        │   ├── begin_keyword_loc: (68,0)-(68,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (69,2)-(69,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (69,2)-(69,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (69,2)-(69,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (70,0)-(71,3))
-        │   │   ├── keyword_loc: (70,0)-(70,6) = "rescue"
-        │   │   ├── exceptions: (length: 2)
-        │   │   │   ├── @ ConstantReadNode (location: (70,7)-(70,16))
-        │   │   │   │   └── name: :Exception
-        │   │   │   └── @ ConstantReadNode (location: (70,18)-(70,33))
-        │   │   │       └── name: :CustomException
-        │   │   ├── operator_loc: (70,34)-(70,36) = "=>"
-        │   │   ├── reference:
-        │   │   │   @ LocalVariableTargetNode (location: (70,37)-(70,39))
-        │   │   │   ├── name: :ex
-        │   │   │   └── depth: 0
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (71,2)-(71,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (71,2)-(71,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (71,2)-(71,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (72,0)-(72,3) = "end"
-        └── @ BeginNode (location: (74,0)-(78,3))
-            ├── begin_keyword_loc: (74,0)-(74,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (75,2)-(75,3))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (75,2)-(75,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :a
-            │           ├── message_loc: (75,2)-(75,3) = "a"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (76,0)-(77,3))
-            │   ├── keyword_loc: (76,0)-(76,6) = "rescue"
-            │   ├── exceptions: (length: 1)
-            │   │   └── @ ConstantReadNode (location: (76,7)-(76,16))
-            │   │       └── name: :Exception
-            │   ├── operator_loc: (76,17)-(76,19) = "=>"
-            │   ├── reference:
-            │   │   @ LocalVariableTargetNode (location: (76,20)-(76,22))
-            │   │   ├── name: :ex
-            │   │   └── depth: 0
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (77,2)-(77,3))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (77,2)-(77,3))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :b
-            │   │           ├── message_loc: (77,2)-(77,3) = "b"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (78,0)-(78,3) = "end"
diff --git a/test/mri/prism/snapshots/blocks.txt b/test/mri/prism/snapshots/blocks.txt
deleted file mode 100644
index 0b1ec52e38b..00000000000
--- a/test/mri/prism/snapshots/blocks.txt
+++ /dev/null
@@ -1,774 +0,0 @@
-@ ProgramNode (location: (1,0)-(54,17))
-├── locals: [:fork]
-└── statements:
-    @ StatementsNode (location: (1,0)-(54,17))
-    └── body: (length: 20)
-        ├── @ CallNode (location: (1,0)-(1,16))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (1,3)-(1,8) = "[bar]"
-        │   ├── opening_loc: (1,3)-(1,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (1,4)-(1,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (1,4)-(1,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (1,7)-(1,8) = "]"
-        │   └── block:
-        │       @ BlockNode (location: (1,9)-(1,16))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (1,11)-(1,14))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (1,11)-(1,14))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :baz
-        │       │           ├── message_loc: (1,11)-(1,14) = "baz"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (1,9)-(1,10) = "{"
-        │       └── closing_loc: (1,15)-(1,16) = "}"
-        ├── @ CallNode (location: (3,0)-(5,3))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (3,3)-(3,8) = "[bar]"
-        │   ├── opening_loc: (3,3)-(3,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,4)-(3,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,4)-(3,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (3,4)-(3,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (3,7)-(3,8) = "]"
-        │   └── block:
-        │       @ BlockNode (location: (3,9)-(5,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (4,0)-(4,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (4,0)-(4,3))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :baz
-        │       │           ├── message_loc: (4,0)-(4,3) = "baz"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (3,9)-(3,11) = "do"
-        │       └── closing_loc: (5,0)-(5,3) = "end"
-        ├── @ CallNode (location: (7,0)-(7,35))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (7,0)-(7,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :x
-        │   │   ├── message_loc: (7,0)-(7,1) = "x"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (7,1)-(7,2) = "."
-        │   ├── name: :reduce
-        │   ├── message_loc: (7,2)-(7,8) = "reduce"
-        │   ├── opening_loc: (7,8)-(7,9) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,9)-(7,10))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (7,9)-(7,10))
-        │   │           ├── flags: decimal
-        │   │           └── value: 0
-        │   ├── closing_loc: (7,10)-(7,11) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (7,12)-(7,35))
-        │       ├── locals: [:x, :memo]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (7,14)-(7,23))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (7,15)-(7,22))
-        │       │   │   ├── requireds: (length: 2)
-        │       │   │   │   ├── @ RequiredParameterNode (location: (7,15)-(7,16))
-        │       │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   └── name: :x
-        │       │   │   │   └── @ RequiredParameterNode (location: (7,18)-(7,22))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :memo
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (7,14)-(7,15) = "|"
-        │       │   └── closing_loc: (7,22)-(7,23) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (7,24)-(7,33))
-        │       │   └── body: (length: 1)
-        │       │       └── @ LocalVariableOperatorWriteNode (location: (7,24)-(7,33))
-        │       │           ├── name_loc: (7,24)-(7,28) = "memo"
-        │       │           ├── operator_loc: (7,29)-(7,31) = "+="
-        │       │           ├── value:
-        │       │           │   @ LocalVariableReadNode (location: (7,32)-(7,33))
-        │       │           │   ├── name: :x
-        │       │           │   └── depth: 0
-        │       │           ├── name: :memo
-        │       │           ├── operator: :+
-        │       │           └── depth: 0
-        │       ├── opening_loc: (7,12)-(7,13) = "{"
-        │       └── closing_loc: (7,34)-(7,35) = "}"
-        ├── @ CallNode (location: (9,0)-(9,10))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (9,0)-(9,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (9,4)-(9,10))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (9,4)-(9,6) = "do"
-        │       └── closing_loc: (9,7)-(9,10) = "end"
-        ├── @ CallNode (location: (11,0)-(11,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (11,0)-(11,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (11,4)-(11,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (11,4)-(11,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (11,4)-(11,7) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ ParenthesesNode (location: (11,9)-(11,21))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (11,10)-(11,20))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (11,10)-(11,20))
-        │   │           │           ├── flags: ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :baz
-        │   │           │           ├── message_loc: (11,10)-(11,13) = "baz"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block:
-        │   │           │               @ BlockNode (location: (11,14)-(11,20))
-        │   │           │               ├── locals: []
-        │   │           │               ├── parameters: ∅
-        │   │           │               ├── body: ∅
-        │   │           │               ├── opening_loc: (11,14)-(11,16) = "do"
-        │   │           │               └── closing_loc: (11,17)-(11,20) = "end"
-        │   │           ├── opening_loc: (11,9)-(11,10) = "("
-        │   │           └── closing_loc: (11,20)-(11,21) = ")"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (13,0)-(13,14))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (13,0)-(13,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (13,4)-(13,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (13,4)-(13,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (13,4)-(13,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (13,8)-(13,14))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (13,8)-(13,10) = "do"
-        │       └── closing_loc: (13,11)-(13,14) = "end"
-        ├── @ CallNode (location: (15,0)-(15,18))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (15,0)-(15,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,4)-(15,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (15,4)-(15,11))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (15,4)-(15,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (15,8)-(15,11))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ CallNode (location: (15,8)-(15,11))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :baz
-        │   │           │           ├── message_loc: (15,8)-(15,11) = "baz"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (15,12)-(15,18))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (15,12)-(15,14) = "do"
-        │       └── closing_loc: (15,15)-(15,18) = "end"
-        ├── @ CallNode (location: (17,0)-(18,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (17,0)-(17,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (17,4)-(18,3))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (17,7)-(17,17))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (17,8)-(17,16))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (17,8)-(17,16))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :a
-        │       │   │   │       ├── name_loc: (17,8)-(17,9) = "a"
-        │       │   │   │       ├── operator_loc: (17,10)-(17,11) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ CallNode (location: (17,12)-(17,16))
-        │       │   │   │           ├── flags: ∅
-        │       │   │   │           ├── receiver:
-        │       │   │   │           │   @ CallNode (location: (17,12)-(17,13))
-        │       │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │       │   │   │           │   ├── receiver: ∅
-        │       │   │   │           │   ├── call_operator_loc: ∅
-        │       │   │   │           │   ├── name: :b
-        │       │   │   │           │   ├── message_loc: (17,12)-(17,13) = "b"
-        │       │   │   │           │   ├── opening_loc: ∅
-        │       │   │   │           │   ├── arguments: ∅
-        │       │   │   │           │   ├── closing_loc: ∅
-        │       │   │   │           │   └── block: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :[]
-        │       │   │   │           ├── message_loc: (17,13)-(17,16) = "[1]"
-        │       │   │   │           ├── opening_loc: (17,13)-(17,14) = "["
-        │       │   │   │           ├── arguments:
-        │       │   │   │           │   @ ArgumentsNode (location: (17,14)-(17,15))
-        │       │   │   │           │   ├── flags: ∅
-        │       │   │   │           │   └── arguments: (length: 1)
-        │       │   │   │           │       └── @ IntegerNode (location: (17,14)-(17,15))
-        │       │   │   │           │           ├── flags: decimal
-        │       │   │   │           │           └── value: 1
-        │       │   │   │           ├── closing_loc: (17,15)-(17,16) = "]"
-        │       │   │   │           └── block: ∅
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (17,7)-(17,8) = "|"
-        │       │   └── closing_loc: (17,16)-(17,17) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (17,4)-(17,6) = "do"
-        │       └── closing_loc: (18,0)-(18,3) = "end"
-        ├── @ CallNode (location: (20,0)-(22,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (20,0)-(20,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (20,4)-(22,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (20,4)-(22,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (21,0)-(21,6))
-        │       │   │   ├── keyword_loc: (21,0)-(21,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 0)
-        │       │   │   ├── operator_loc: ∅
-        │       │   │   ├── reference: ∅
-        │       │   │   ├── statements: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (22,0)-(22,3) = "end"
-        │       ├── opening_loc: (20,4)-(20,6) = "do"
-        │       └── closing_loc: (22,0)-(22,3) = "end"
-        ├── @ CallNode (location: (24,0)-(29,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (24,0)-(24,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (24,4)-(29,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (25,2)-(28,5))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (25,2)-(28,5))
-        │       │           ├── flags: ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :bar
-        │       │           ├── message_loc: (25,2)-(25,5) = "bar"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block:
-        │       │               @ BlockNode (location: (25,6)-(28,5))
-        │       │               ├── locals: []
-        │       │               ├── parameters: ∅
-        │       │               ├── body:
-        │       │               │   @ StatementsNode (location: (26,4)-(27,7))
-        │       │               │   └── body: (length: 1)
-        │       │               │       └── @ CallNode (location: (26,4)-(27,7))
-        │       │               │           ├── flags: ignore_visibility
-        │       │               │           ├── receiver: ∅
-        │       │               │           ├── call_operator_loc: ∅
-        │       │               │           ├── name: :baz
-        │       │               │           ├── message_loc: (26,4)-(26,7) = "baz"
-        │       │               │           ├── opening_loc: ∅
-        │       │               │           ├── arguments: ∅
-        │       │               │           ├── closing_loc: ∅
-        │       │               │           └── block:
-        │       │               │               @ BlockNode (location: (26,8)-(27,7))
-        │       │               │               ├── locals: []
-        │       │               │               ├── parameters: ∅
-        │       │               │               ├── body: ∅
-        │       │               │               ├── opening_loc: (26,8)-(26,10) = "do"
-        │       │               │               └── closing_loc: (27,4)-(27,7) = "end"
-        │       │               ├── opening_loc: (25,6)-(25,8) = "do"
-        │       │               └── closing_loc: (28,2)-(28,5) = "end"
-        │       ├── opening_loc: (24,4)-(24,6) = "do"
-        │       └── closing_loc: (29,0)-(29,3) = "end"
-        ├── @ CallNode (location: (31,0)-(31,16))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (31,0)-(31,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (31,0)-(31,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (31,3)-(31,8) = "[bar]"
-        │   ├── opening_loc: (31,3)-(31,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,4)-(31,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (31,4)-(31,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (31,4)-(31,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (31,7)-(31,8) = "]"
-        │   └── block:
-        │       @ BlockNode (location: (31,9)-(31,16))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (31,11)-(31,14))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (31,11)-(31,14))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :baz
-        │       │           ├── message_loc: (31,11)-(31,14) = "baz"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (31,9)-(31,10) = "{"
-        │       └── closing_loc: (31,15)-(31,16) = "}"
-        ├── @ CallNode (location: (33,0)-(33,24))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (33,0)-(33,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (33,4)-(33,24))
-        │       ├── locals: [:x, :y, :z]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (33,6)-(33,20))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (33,7)-(33,19))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (33,7)-(33,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :x
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (33,10)-(33,15))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :y
-        │       │   │   │       ├── name_loc: (33,10)-(33,11) = "y"
-        │       │   │   │       ├── operator_loc: (33,12)-(33,13) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (33,14)-(33,15))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 2
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 1)
-        │       │   │   │   └── @ RequiredKeywordParameterNode (location: (33,17)-(33,19))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :z
-        │       │   │   │       └── name_loc: (33,17)-(33,19) = "z:"
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (33,6)-(33,7) = "|"
-        │       │   └── closing_loc: (33,19)-(33,20) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (33,21)-(33,22))
-        │       │   └── body: (length: 1)
-        │       │       └── @ LocalVariableReadNode (location: (33,21)-(33,22))
-        │       │           ├── name: :x
-        │       │           └── depth: 0
-        │       ├── opening_loc: (33,4)-(33,5) = "{"
-        │       └── closing_loc: (33,23)-(33,24) = "}"
-        ├── @ CallNode (location: (35,0)-(35,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (35,0)-(35,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (35,4)-(35,11))
-        │       ├── locals: [:x]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (35,6)-(35,9))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (35,7)-(35,8))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (35,7)-(35,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :x
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (35,6)-(35,7) = "|"
-        │       │   └── closing_loc: (35,8)-(35,9) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (35,4)-(35,5) = "{"
-        │       └── closing_loc: (35,10)-(35,11) = "}"
-        ├── @ LocalVariableWriteNode (location: (37,0)-(37,8))
-        │   ├── name: :fork
-        │   ├── depth: 0
-        │   ├── name_loc: (37,0)-(37,4) = "fork"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (37,7)-(37,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (37,5)-(37,6) = "="
-        ├── @ CallNode (location: (38,0)-(39,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fork
-        │   ├── message_loc: (38,0)-(38,4) = "fork"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (38,5)-(39,3))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (38,8)-(38,11))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (38,9)-(38,10))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (38,9)-(38,10))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (38,8)-(38,9) = "|"
-        │       │   └── closing_loc: (38,10)-(38,11) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (38,5)-(38,7) = "do"
-        │       └── closing_loc: (39,0)-(39,3) = "end"
-        ├── @ CallNode (location: (41,0)-(41,12))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fork
-        │   ├── message_loc: (41,0)-(41,4) = "fork"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (41,5)-(41,12))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (41,7)-(41,10))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (41,8)-(41,9))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (41,8)-(41,9))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (41,7)-(41,8) = "|"
-        │       │   └── closing_loc: (41,9)-(41,10) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (41,5)-(41,6) = "{"
-        │       └── closing_loc: (41,11)-(41,12) = "}"
-        ├── @ CallNode (location: (43,0)-(44,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :C
-        │   ├── message_loc: (43,0)-(43,1) = "C"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (43,2)-(44,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (43,2)-(43,4) = "do"
-        │       └── closing_loc: (44,0)-(44,3) = "end"
-        ├── @ CallNode (location: (46,0)-(46,4))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :C
-        │   ├── message_loc: (46,0)-(46,1) = "C"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (46,2)-(46,4))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (46,2)-(46,3) = "{"
-        │       └── closing_loc: (46,3)-(46,4) = "}"
-        ├── @ CallNode (location: (48,0)-(52,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (48,0)-(48,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (48,4)-(52,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (48,4)-(52,1))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :lambda
-        │   │           ├── message_loc: (48,4)-(48,10) = "lambda"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (48,11)-(52,1))
-        │   │               ├── locals: [:a, :b]
-        │   │               ├── parameters:
-        │   │               │   @ BlockParametersNode (location: (48,13)-(51,3))
-        │   │               │   ├── parameters:
-        │   │               │   │   @ ParametersNode (location: (49,2)-(50,6))
-        │   │               │   │   ├── requireds: (length: 0)
-        │   │               │   │   ├── optionals: (length: 0)
-        │   │               │   │   ├── rest: ∅
-        │   │               │   │   ├── posts: (length: 0)
-        │   │               │   │   ├── keywords: (length: 2)
-        │   │               │   │   │   ├── @ OptionalKeywordParameterNode (location: (49,2)-(49,6))
-        │   │               │   │   │   │   ├── flags: ∅
-        │   │               │   │   │   │   ├── name: :a
-        │   │               │   │   │   │   ├── name_loc: (49,2)-(49,4) = "a:"
-        │   │               │   │   │   │   └── value:
-        │   │               │   │   │   │       @ IntegerNode (location: (49,5)-(49,6))
-        │   │               │   │   │   │       ├── flags: decimal
-        │   │               │   │   │   │       └── value: 1
-        │   │               │   │   │   └── @ OptionalKeywordParameterNode (location: (50,2)-(50,6))
-        │   │               │   │   │       ├── flags: ∅
-        │   │               │   │   │       ├── name: :b
-        │   │               │   │   │       ├── name_loc: (50,2)-(50,4) = "b:"
-        │   │               │   │   │       └── value:
-        │   │               │   │   │           @ IntegerNode (location: (50,5)-(50,6))
-        │   │               │   │   │           ├── flags: decimal
-        │   │               │   │   │           └── value: 2
-        │   │               │   │   ├── keyword_rest: ∅
-        │   │               │   │   └── block: ∅
-        │   │               │   ├── locals: (length: 0)
-        │   │               │   ├── opening_loc: (48,13)-(48,14) = "|"
-        │   │               │   └── closing_loc: (51,2)-(51,3) = "|"
-        │   │               ├── body: ∅
-        │   │               ├── opening_loc: (48,11)-(48,12) = "{"
-        │   │               └── closing_loc: (52,0)-(52,1) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (54,0)-(54,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo
-            ├── message_loc: (54,0)-(54,3) = "foo"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (54,4)-(54,17))
-                ├── locals: [:bar]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (54,7)-(54,13))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (54,8)-(54,12))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (54,8)-(54,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :bar
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest:
-                │   │   │   @ ImplicitRestNode (location: (54,11)-(54,12))
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (54,7)-(54,8) = "|"
-                │   └── closing_loc: (54,12)-(54,13) = "|"
-                ├── body: ∅
-                ├── opening_loc: (54,4)-(54,6) = "do"
-                └── closing_loc: (54,14)-(54,17) = "end"
diff --git a/test/mri/prism/snapshots/boolean_operators.txt b/test/mri/prism/snapshots/boolean_operators.txt
deleted file mode 100644
index ace8047e18d..00000000000
--- a/test/mri/prism/snapshots/boolean_operators.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,7))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,7))
-    └── body: (length: 3)
-        ├── @ LocalVariableAndWriteNode (location: (1,0)-(1,7))
-        │   ├── name_loc: (1,0)-(1,1) = "a"
-        │   ├── operator_loc: (1,2)-(1,5) = "&&="
-        │   ├── value:
-        │   │   @ CallNode (location: (1,6)-(1,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :b
-        │   │   ├── message_loc: (1,6)-(1,7) = "b"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── name: :a
-        │   └── depth: 0
-        ├── @ LocalVariableOperatorWriteNode (location: (3,0)-(3,6))
-        │   ├── name_loc: (3,0)-(3,1) = "a"
-        │   ├── operator_loc: (3,2)-(3,4) = "+="
-        │   ├── value:
-        │   │   @ CallNode (location: (3,5)-(3,6))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :b
-        │   │   ├── message_loc: (3,5)-(3,6) = "b"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── name: :a
-        │   ├── operator: :+
-        │   └── depth: 0
-        └── @ LocalVariableOrWriteNode (location: (5,0)-(5,7))
-            ├── name_loc: (5,0)-(5,1) = "a"
-            ├── operator_loc: (5,2)-(5,5) = "||="
-            ├── value:
-            │   @ CallNode (location: (5,6)-(5,7))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :b
-            │   ├── message_loc: (5,6)-(5,7) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── name: :a
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/booleans.txt b/test/mri/prism/snapshots/booleans.txt
deleted file mode 100644
index 47319662439..00000000000
--- a/test/mri/prism/snapshots/booleans.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,4))
-    └── body: (length: 2)
-        ├── @ FalseNode (location: (1,0)-(1,5))
-        └── @ TrueNode (location: (3,0)-(3,4))
diff --git a/test/mri/prism/snapshots/break.txt b/test/mri/prism/snapshots/break.txt
deleted file mode 100644
index 984b9f7f227..00000000000
--- a/test/mri/prism/snapshots/break.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-@ ProgramNode (location: (1,0)-(25,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(25,23))
-    └── body: (length: 11)
-        ├── @ BreakNode (location: (1,0)-(1,5))
-        │   ├── arguments: ∅
-        │   └── keyword_loc: (1,0)-(1,5) = "break"
-        ├── @ BreakNode (location: (3,0)-(3,19))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,6)-(3,19))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ ParenthesesNode (location: (3,6)-(3,9))
-        │   │       │   ├── body:
-        │   │       │   │   @ StatementsNode (location: (3,7)-(3,8))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ IntegerNode (location: (3,7)-(3,8))
-        │   │       │   │           ├── flags: decimal
-        │   │       │   │           └── value: 1
-        │   │       │   ├── opening_loc: (3,6)-(3,7) = "("
-        │   │       │   └── closing_loc: (3,8)-(3,9) = ")"
-        │   │       ├── @ ParenthesesNode (location: (3,11)-(3,14))
-        │   │       │   ├── body:
-        │   │       │   │   @ StatementsNode (location: (3,12)-(3,13))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ IntegerNode (location: (3,12)-(3,13))
-        │   │       │   │           ├── flags: decimal
-        │   │       │   │           └── value: 2
-        │   │       │   ├── opening_loc: (3,11)-(3,12) = "("
-        │   │       │   └── closing_loc: (3,13)-(3,14) = ")"
-        │   │       └── @ ParenthesesNode (location: (3,16)-(3,19))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (3,17)-(3,18))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (3,17)-(3,18))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 3
-        │   │           ├── opening_loc: (3,16)-(3,17) = "("
-        │   │           └── closing_loc: (3,18)-(3,19) = ")"
-        │   └── keyword_loc: (3,0)-(3,5) = "break"
-        ├── @ BreakNode (location: (5,0)-(5,7))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,6)-(5,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,6)-(5,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   └── keyword_loc: (5,0)-(5,5) = "break"
-        ├── @ BreakNode (location: (7,0)-(8,1))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,6)-(8,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ IntegerNode (location: (7,6)-(7,7))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── @ IntegerNode (location: (7,9)-(7,10))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── @ IntegerNode (location: (8,0)-(8,1))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   └── keyword_loc: (7,0)-(7,5) = "break"
-        ├── @ BreakNode (location: (10,0)-(10,13))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (10,6)-(10,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ IntegerNode (location: (10,6)-(10,7))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── @ IntegerNode (location: (10,9)-(10,10))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── @ IntegerNode (location: (10,12)-(10,13))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   └── keyword_loc: (10,0)-(10,5) = "break"
-        ├── @ BreakNode (location: (12,0)-(12,15))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (12,6)-(12,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ArrayNode (location: (12,6)-(12,15))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 3)
-        │   │           │   ├── @ IntegerNode (location: (12,7)-(12,8))
-        │   │           │   │   ├── flags: decimal
-        │   │           │   │   └── value: 1
-        │   │           │   ├── @ IntegerNode (location: (12,10)-(12,11))
-        │   │           │   │   ├── flags: decimal
-        │   │           │   │   └── value: 2
-        │   │           │   └── @ IntegerNode (location: (12,13)-(12,14))
-        │   │           │       ├── flags: decimal
-        │   │           │       └── value: 3
-        │   │           ├── opening_loc: (12,6)-(12,7) = "["
-        │   │           └── closing_loc: (12,14)-(12,15) = "]"
-        │   └── keyword_loc: (12,0)-(12,5) = "break"
-        ├── @ BreakNode (location: (14,0)-(17,1))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (14,5)-(17,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (14,5)-(17,1))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (15,2)-(16,3))
-        │   │           │   └── body: (length: 2)
-        │   │           │       ├── @ IntegerNode (location: (15,2)-(15,3))
-        │   │           │       │   ├── flags: decimal
-        │   │           │       │   └── value: 1
-        │   │           │       └── @ IntegerNode (location: (16,2)-(16,3))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 2
-        │   │           ├── opening_loc: (14,5)-(14,6) = "("
-        │   │           └── closing_loc: (17,0)-(17,1) = ")"
-        │   └── keyword_loc: (14,0)-(14,5) = "break"
-        ├── @ BreakNode (location: (19,0)-(19,7))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (19,5)-(19,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (19,5)-(19,7))
-        │   │           ├── body: ∅
-        │   │           ├── opening_loc: (19,5)-(19,6) = "("
-        │   │           └── closing_loc: (19,6)-(19,7) = ")"
-        │   └── keyword_loc: (19,0)-(19,5) = "break"
-        ├── @ BreakNode (location: (21,0)-(21,8))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,5)-(21,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (21,5)-(21,8))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (21,6)-(21,7))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (21,6)-(21,7))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── opening_loc: (21,5)-(21,6) = "("
-        │   │           └── closing_loc: (21,7)-(21,8) = ")"
-        │   └── keyword_loc: (21,0)-(21,5) = "break"
-        ├── @ CallNode (location: (23,0)-(23,22))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (23,0)-(23,16))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (23,0)-(23,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (23,4)-(23,16))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body:
-        │   │       │   @ StatementsNode (location: (23,6)-(23,14))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ BreakNode (location: (23,6)-(23,14))
-        │   │       │           ├── arguments:
-        │   │       │           │   @ ArgumentsNode (location: (23,12)-(23,14))
-        │   │       │           │   ├── flags: ∅
-        │   │       │           │   └── arguments: (length: 1)
-        │   │       │           │       └── @ IntegerNode (location: (23,12)-(23,14))
-        │   │       │           │           ├── flags: decimal
-        │   │       │           │           └── value: 42
-        │   │       │           └── keyword_loc: (23,6)-(23,11) = "break"
-        │   │       ├── opening_loc: (23,4)-(23,5) = "{"
-        │   │       └── closing_loc: (23,15)-(23,16) = "}"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :==
-        │   ├── message_loc: (23,17)-(23,19) = "=="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (23,20)-(23,22))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (23,20)-(23,22))
-        │   │           ├── flags: decimal
-        │   │           └── value: 42
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (25,0)-(25,23))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (25,0)-(25,17))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (25,0)-(25,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (25,4)-(25,17))
-            │       ├── locals: [:a]
-            │       ├── parameters:
-            │       │   @ BlockParametersNode (location: (25,6)-(25,9))
-            │       │   ├── parameters:
-            │       │   │   @ ParametersNode (location: (25,7)-(25,8))
-            │       │   │   ├── requireds: (length: 1)
-            │       │   │   │   └── @ RequiredParameterNode (location: (25,7)-(25,8))
-            │       │   │   │       ├── flags: ∅
-            │       │   │   │       └── name: :a
-            │       │   │   ├── optionals: (length: 0)
-            │       │   │   ├── rest: ∅
-            │       │   │   ├── posts: (length: 0)
-            │       │   │   ├── keywords: (length: 0)
-            │       │   │   ├── keyword_rest: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── locals: (length: 0)
-            │       │   ├── opening_loc: (25,6)-(25,7) = "|"
-            │       │   └── closing_loc: (25,8)-(25,9) = "|"
-            │       ├── body:
-            │       │   @ StatementsNode (location: (25,10)-(25,15))
-            │       │   └── body: (length: 1)
-            │       │       └── @ BreakNode (location: (25,10)-(25,15))
-            │       │           ├── arguments: ∅
-            │       │           └── keyword_loc: (25,10)-(25,15) = "break"
-            │       ├── opening_loc: (25,4)-(25,5) = "{"
-            │       └── closing_loc: (25,16)-(25,17) = "}"
-            ├── call_operator_loc: ∅
-            ├── name: :==
-            ├── message_loc: (25,18)-(25,20) = "=="
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (25,21)-(25,23))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (25,21)-(25,23))
-            │           ├── flags: decimal
-            │           └── value: 42
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/case.txt b/test/mri/prism/snapshots/case.txt
deleted file mode 100644
index 417bf9492a4..00000000000
--- a/test/mri/prism/snapshots/case.txt
+++ /dev/null
@@ -1,495 +0,0 @@
-@ ProgramNode (location: (1,0)-(55,3))
-├── locals: [:b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(55,3))
-    └── body: (length: 15)
-        ├── @ CaseNode (location: (1,0)-(3,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (1,5)-(1,8))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (1,5)-(1,6) = ":"
-        │   │   ├── value_loc: (1,6)-(1,8) = "hi"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "hi"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (2,0)-(2,8))
-        │   │       ├── keyword_loc: (2,0)-(2,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ SymbolNode (location: (2,5)-(2,8))
-        │   │       │       ├── flags: forced_us_ascii_encoding
-        │   │       │       ├── opening_loc: (2,5)-(2,6) = ":"
-        │   │       │       ├── value_loc: (2,6)-(2,8) = "hi"
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── unescaped: "hi"
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (1,0)-(1,4) = "case"
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        ├── @ CaseNode (location: (5,0)-(5,58))
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (5,5)-(5,9))
-        │   ├── conditions: (length: 2)
-        │   │   ├── @ WhenNode (location: (5,11)-(5,30))
-        │   │   │   ├── keyword_loc: (5,11)-(5,15) = "when"
-        │   │   │   ├── conditions: (length: 1)
-        │   │   │   │   └── @ TrueNode (location: (5,16)-(5,20))
-        │   │   │   ├── then_keyword_loc: ∅
-        │   │   │   └── statements:
-        │   │   │       @ StatementsNode (location: (5,22)-(5,30))
-        │   │   │       └── body: (length: 1)
-        │   │   │           └── @ CallNode (location: (5,22)-(5,30))
-        │   │   │               ├── flags: ignore_visibility
-        │   │   │               ├── receiver: ∅
-        │   │   │               ├── call_operator_loc: ∅
-        │   │   │               ├── name: :puts
-        │   │   │               ├── message_loc: (5,22)-(5,26) = "puts"
-        │   │   │               ├── opening_loc: ∅
-        │   │   │               ├── arguments:
-        │   │   │               │   @ ArgumentsNode (location: (5,27)-(5,30))
-        │   │   │               │   ├── flags: ∅
-        │   │   │               │   └── arguments: (length: 1)
-        │   │   │               │       └── @ SymbolNode (location: (5,27)-(5,30))
-        │   │   │               │           ├── flags: forced_us_ascii_encoding
-        │   │   │               │           ├── opening_loc: (5,27)-(5,28) = ":"
-        │   │   │               │           ├── value_loc: (5,28)-(5,30) = "hi"
-        │   │   │               │           ├── closing_loc: ∅
-        │   │   │               │           └── unescaped: "hi"
-        │   │   │               ├── closing_loc: ∅
-        │   │   │               └── block: ∅
-        │   │   └── @ WhenNode (location: (5,32)-(5,53))
-        │   │       ├── keyword_loc: (5,32)-(5,36) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ FalseNode (location: (5,37)-(5,42))
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements:
-        │   │           @ StatementsNode (location: (5,44)-(5,53))
-        │   │           └── body: (length: 1)
-        │   │               └── @ CallNode (location: (5,44)-(5,53))
-        │   │                   ├── flags: ignore_visibility
-        │   │                   ├── receiver: ∅
-        │   │                   ├── call_operator_loc: ∅
-        │   │                   ├── name: :puts
-        │   │                   ├── message_loc: (5,44)-(5,48) = "puts"
-        │   │                   ├── opening_loc: ∅
-        │   │                   ├── arguments:
-        │   │                   │   @ ArgumentsNode (location: (5,49)-(5,53))
-        │   │                   │   ├── flags: ∅
-        │   │                   │   └── arguments: (length: 1)
-        │   │                   │       └── @ SymbolNode (location: (5,49)-(5,53))
-        │   │                   │           ├── flags: forced_us_ascii_encoding
-        │   │                   │           ├── opening_loc: (5,49)-(5,50) = ":"
-        │   │                   │           ├── value_loc: (5,50)-(5,53) = "bye"
-        │   │                   │           ├── closing_loc: ∅
-        │   │                   │           └── unescaped: "bye"
-        │   │                   ├── closing_loc: ∅
-        │   │                   └── block: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (5,0)-(5,4) = "case"
-        │   └── end_keyword_loc: (5,55)-(5,58) = "end"
-        ├── @ CaseNode (location: (7,0)-(7,20))
-        │   ├── predicate: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (7,6)-(7,15))
-        │   │       ├── keyword_loc: (7,6)-(7,10) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ SplatNode (location: (7,11)-(7,15))
-        │   │       │       ├── operator_loc: (7,11)-(7,12) = "*"
-        │   │       │       └── expression:
-        │   │       │           @ CallNode (location: (7,12)-(7,15))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :foo
-        │   │       │           ├── message_loc: (7,12)-(7,15) = "foo"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (7,0)-(7,4) = "case"
-        │   └── end_keyword_loc: (7,17)-(7,20) = "end"
-        ├── @ CaseNode (location: (9,0)-(13,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (9,5)-(9,8))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (9,5)-(9,6) = ":"
-        │   │   ├── value_loc: (9,6)-(9,8) = "hi"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "hi"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (10,0)-(10,8))
-        │   │       ├── keyword_loc: (10,0)-(10,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ SymbolNode (location: (10,5)-(10,8))
-        │   │       │       ├── flags: forced_us_ascii_encoding
-        │   │       │       ├── opening_loc: (10,5)-(10,6) = ":"
-        │   │       │       ├── value_loc: (10,6)-(10,8) = "hi"
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── unescaped: "hi"
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (11,0)-(13,3))
-        │   │   ├── else_keyword_loc: (11,0)-(11,4) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (12,0)-(12,2))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ SymbolNode (location: (12,0)-(12,2))
-        │   │   │           ├── flags: forced_us_ascii_encoding
-        │   │   │           ├── opening_loc: (12,0)-(12,1) = ":"
-        │   │   │           ├── value_loc: (12,1)-(12,2) = "b"
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── unescaped: "b"
-        │   │   └── end_keyword_loc: (13,0)-(13,3) = "end"
-        │   ├── case_keyword_loc: (9,0)-(9,4) = "case"
-        │   └── end_keyword_loc: (13,0)-(13,3) = "end"
-        ├── @ CaseNode (location: (15,0)-(15,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (15,5)-(15,9))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :this
-        │   │   ├── message_loc: (15,5)-(15,9) = "this"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (15,11)-(15,31))
-        │   │       ├── keyword_loc: (15,11)-(15,15) = "when"
-        │   │       ├── conditions: (length: 2)
-        │   │       │   ├── @ ConstantReadNode (location: (15,16)-(15,22))
-        │   │       │   │   └── name: :FooBar
-        │   │       │   └── @ ConstantReadNode (location: (15,24)-(15,31))
-        │   │       │       └── name: :BazBonk
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (15,0)-(15,4) = "case"
-        │   └── end_keyword_loc: (15,33)-(15,36) = "end"
-        ├── @ CaseNode (location: (17,0)-(19,3))
-        │   ├── predicate: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (18,0)-(18,15))
-        │   │       ├── keyword_loc: (18,0)-(18,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ CallNode (location: (18,5)-(18,15))
-        │   │       │       ├── flags: ∅
-        │   │       │       ├── receiver:
-        │   │       │       │   @ CallNode (location: (18,5)-(18,8))
-        │   │       │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │       │   ├── receiver: ∅
-        │   │       │       │   ├── call_operator_loc: ∅
-        │   │       │       │   ├── name: :foo
-        │   │       │       │   ├── message_loc: (18,5)-(18,8) = "foo"
-        │   │       │       │   ├── opening_loc: ∅
-        │   │       │       │   ├── arguments: ∅
-        │   │       │       │   ├── closing_loc: ∅
-        │   │       │       │   └── block: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :==
-        │   │       │       ├── message_loc: (18,9)-(18,11) = "=="
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments:
-        │   │       │       │   @ ArgumentsNode (location: (18,12)-(18,15))
-        │   │       │       │   ├── flags: ∅
-        │   │       │       │   └── arguments: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (18,12)-(18,15))
-        │   │       │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :bar
-        │   │       │       │           ├── message_loc: (18,12)-(18,15) = "bar"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (17,0)-(17,4) = "case"
-        │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        ├── @ CaseNode (location: (21,0)-(25,3))
-        │   ├── predicate: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (22,0)-(22,6))
-        │   │       ├── keyword_loc: (22,0)-(22,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ CallNode (location: (22,5)-(22,6))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :a
-        │   │       │       ├── message_loc: (22,5)-(22,6) = "a"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (23,0)-(25,3))
-        │   │   ├── else_keyword_loc: (23,0)-(23,4) = "else"
-        │   │   ├── statements: ∅
-        │   │   └── end_keyword_loc: (25,0)-(25,3) = "end"
-        │   ├── case_keyword_loc: (21,0)-(21,4) = "case"
-        │   └── end_keyword_loc: (25,0)-(25,3) = "end"
-        ├── @ CaseNode (location: (27,0)-(30,6))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (27,5)-(27,9))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :type
-        │   │   ├── message_loc: (27,5)-(27,9) = "type"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (28,3)-(28,10))
-        │   │       ├── keyword_loc: (28,3)-(28,7) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ SymbolNode (location: (28,8)-(28,10))
-        │   │       │       ├── flags: forced_us_ascii_encoding
-        │   │       │       ├── opening_loc: (28,8)-(28,9) = ":"
-        │   │       │       ├── value_loc: (28,9)-(28,10) = "b"
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── unescaped: "b"
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (29,5)-(30,6))
-        │   │   ├── else_keyword_loc: (29,5)-(29,9) = "else"
-        │   │   ├── statements: ∅
-        │   │   └── end_keyword_loc: (30,3)-(30,6) = "end"
-        │   ├── case_keyword_loc: (27,0)-(27,4) = "case"
-        │   └── end_keyword_loc: (30,3)-(30,6) = "end"
-        ├── @ CaseNode (location: (32,0)-(32,25))
-        │   ├── predicate: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (32,14)-(32,20))
-        │   │       ├── keyword_loc: (32,14)-(32,18) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ IntegerNode (location: (32,19)-(32,20))
-        │   │       │       ├── flags: decimal
-        │   │       │       └── value: 1
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (32,0)-(32,4) = "case"
-        │   └── end_keyword_loc: (32,22)-(32,25) = "end"
-        ├── @ CaseNode (location: (34,0)-(36,3))
-        │   ├── predicate:
-        │   │   @ MatchPredicateNode (location: (34,5)-(34,11))
-        │   │   ├── value:
-        │   │   │   @ IntegerNode (location: (34,5)-(34,6))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── pattern:
-        │   │   │   @ IntegerNode (location: (34,10)-(34,11))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   └── operator_loc: (34,7)-(34,9) = "in"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (35,0)-(35,6))
-        │   │       ├── keyword_loc: (35,0)-(35,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ IntegerNode (location: (35,5)-(35,6))
-        │   │       │       ├── flags: decimal
-        │   │       │       └── value: 3
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (34,0)-(34,4) = "case"
-        │   └── end_keyword_loc: (36,0)-(36,3) = "end"
-        ├── @ CaseNode (location: (38,0)-(38,24))
-        │   ├── predicate:
-        │   │   @ MatchPredicateNode (location: (38,5)-(38,11))
-        │   │   ├── value:
-        │   │   │   @ IntegerNode (location: (38,5)-(38,6))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── pattern:
-        │   │   │   @ IntegerNode (location: (38,10)-(38,11))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   └── operator_loc: (38,7)-(38,9) = "in"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (38,13)-(38,19))
-        │   │       ├── keyword_loc: (38,13)-(38,17) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ IntegerNode (location: (38,18)-(38,19))
-        │   │       │       ├── flags: decimal
-        │   │       │       └── value: 3
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (38,0)-(38,4) = "case"
-        │   └── end_keyword_loc: (38,21)-(38,24) = "end"
-        ├── @ CaseMatchNode (location: (40,0)-(42,3))
-        │   ├── predicate:
-        │   │   @ MatchPredicateNode (location: (40,5)-(40,11))
-        │   │   ├── value:
-        │   │   │   @ IntegerNode (location: (40,5)-(40,6))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── pattern:
-        │   │   │   @ IntegerNode (location: (40,10)-(40,11))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   └── operator_loc: (40,7)-(40,9) = "in"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (41,0)-(41,4))
-        │   │       ├── pattern:
-        │   │       │   @ IntegerNode (location: (41,3)-(41,4))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 3
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (41,0)-(41,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (40,0)-(40,4) = "case"
-        │   └── end_keyword_loc: (42,0)-(42,3) = "end"
-        ├── @ CaseMatchNode (location: (44,0)-(44,22))
-        │   ├── predicate:
-        │   │   @ MatchPredicateNode (location: (44,5)-(44,11))
-        │   │   ├── value:
-        │   │   │   @ IntegerNode (location: (44,5)-(44,6))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── pattern:
-        │   │   │   @ IntegerNode (location: (44,10)-(44,11))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   └── operator_loc: (44,7)-(44,9) = "in"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (44,13)-(44,17))
-        │   │       ├── pattern:
-        │   │       │   @ IntegerNode (location: (44,16)-(44,17))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 3
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (44,13)-(44,15) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (44,0)-(44,4) = "case"
-        │   └── end_keyword_loc: (44,19)-(44,22) = "end"
-        ├── @ CaseMatchNode (location: (46,0)-(49,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (46,5)-(46,6))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (46,5)-(46,6) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (47,0)-(48,3))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (47,3)-(47,15))
-        │   │       │   ├── if_keyword_loc: (47,5)-(47,7) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ AndNode (location: (47,8)-(47,15))
-        │   │       │   │   ├── left:
-        │   │       │   │   │   @ CallNode (location: (47,8)-(47,9))
-        │   │       │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │       │   │   │   ├── receiver: ∅
-        │   │       │   │   │   ├── call_operator_loc: ∅
-        │   │       │   │   │   ├── name: :c
-        │   │       │   │   │   ├── message_loc: (47,8)-(47,9) = "c"
-        │   │       │   │   │   ├── opening_loc: ∅
-        │   │       │   │   │   ├── arguments: ∅
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── block: ∅
-        │   │       │   │   ├── right:
-        │   │       │   │   │   @ CallNode (location: (47,14)-(47,15))
-        │   │       │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │       │   │   │   ├── receiver: ∅
-        │   │       │   │   │   ├── call_operator_loc: ∅
-        │   │       │   │   │   ├── name: :d
-        │   │       │   │   │   ├── message_loc: (47,14)-(47,15) = "d"
-        │   │       │   │   │   ├── opening_loc: ∅
-        │   │       │   │   │   ├── arguments: ∅
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── block: ∅
-        │   │       │   │   └── operator_loc: (47,10)-(47,13) = "and"
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (47,3)-(47,4))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ LocalVariableTargetNode (location: (47,3)-(47,4))
-        │   │       │   │           ├── name: :b
-        │   │       │   │           └── depth: 0
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (48,2)-(48,3))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (48,2)-(48,3))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :e
-        │   │       │           ├── message_loc: (48,2)-(48,3) = "e"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       ├── in_loc: (47,0)-(47,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (46,0)-(46,4) = "case"
-        │   └── end_keyword_loc: (49,0)-(49,3) = "end"
-        └── @ CallNode (location: (51,0)-(55,3))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (51,0)-(51,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: (51,1)-(51,2) = "."
-            ├── name: :then
-            ├── message_loc: (51,2)-(51,6) = "then"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (51,7)-(55,3))
-                ├── locals: [:_1]
-                ├── parameters:
-                │   @ NumberedParametersNode (location: (51,7)-(55,3))
-                │   └── maximum: 1
-                ├── body:
-                │   @ StatementsNode (location: (52,2)-(54,5))
-                │   └── body: (length: 1)
-                │       └── @ CaseMatchNode (location: (52,2)-(54,5))
-                │           ├── predicate:
-                │           │   @ IntegerNode (location: (52,7)-(52,8))
-                │           │   ├── flags: decimal
-                │           │   └── value: 1
-                │           ├── conditions: (length: 1)
-                │           │   └── @ InNode (location: (53,2)-(53,8))
-                │           │       ├── pattern:
-                │           │       │   @ PinnedVariableNode (location: (53,5)-(53,8))
-                │           │       │   ├── variable:
-                │           │       │   │   @ LocalVariableReadNode (location: (53,6)-(53,8))
-                │           │       │   │   ├── name: :_1
-                │           │       │   │   └── depth: 0
-                │           │       │   └── operator_loc: (53,5)-(53,6) = "^"
-                │           │       ├── statements: ∅
-                │           │       ├── in_loc: (53,2)-(53,4) = "in"
-                │           │       └── then_loc: ∅
-                │           ├── consequent: ∅
-                │           ├── case_keyword_loc: (52,2)-(52,6) = "case"
-                │           └── end_keyword_loc: (54,2)-(54,5) = "end"
-                ├── opening_loc: (51,7)-(51,9) = "do"
-                └── closing_loc: (55,0)-(55,3) = "end"
diff --git a/test/mri/prism/snapshots/classes.txt b/test/mri/prism/snapshots/classes.txt
deleted file mode 100644
index 4a36bd5cdc4..00000000000
--- a/test/mri/prism/snapshots/classes.txt
+++ /dev/null
@@ -1,365 +0,0 @@
-@ ProgramNode (location: (1,0)-(35,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(35,3))
-    └── body: (length: 14)
-        ├── @ ClassNode (location: (1,0)-(1,17))
-        │   ├── locals: [:a]
-        │   ├── class_keyword_loc: (1,0)-(1,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (1,6)-(1,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,8)-(1,13))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableWriteNode (location: (1,8)-(1,13))
-        │   │           ├── name: :a
-        │   │           ├── depth: 0
-        │   │           ├── name_loc: (1,8)-(1,9) = "a"
-        │   │           ├── value:
-        │   │           │   @ IntegerNode (location: (1,12)-(1,13))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           └── operator_loc: (1,10)-(1,11) = "="
-        │   ├── end_keyword_loc: (1,14)-(1,17) = "end"
-        │   └── name: :A
-        ├── @ ClassNode (location: (3,0)-(3,20))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (3,0)-(3,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (3,6)-(3,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (3,0)-(3,20))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── rescue_clause: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (3,9)-(3,20))
-        │   │   │   ├── ensure_keyword_loc: (3,9)-(3,15) = "ensure"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (3,17)-(3,20) = "end"
-        │   │   └── end_keyword_loc: (3,17)-(3,20) = "end"
-        │   ├── end_keyword_loc: (3,17)-(3,20) = "end"
-        │   └── name: :A
-        ├── @ ClassNode (location: (5,0)-(5,34))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (5,0)-(5,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (5,6)-(5,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (5,0)-(5,34))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (5,9)-(5,15))
-        │   │   │   ├── keyword_loc: (5,9)-(5,15) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause:
-        │   │   │   @ ElseNode (location: (5,17)-(5,29))
-        │   │   │   ├── else_keyword_loc: (5,17)-(5,21) = "else"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (5,23)-(5,29) = "ensure"
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (5,23)-(5,34))
-        │   │   │   ├── ensure_keyword_loc: (5,23)-(5,29) = "ensure"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (5,31)-(5,34) = "end"
-        │   │   └── end_keyword_loc: (5,31)-(5,34) = "end"
-        │   ├── end_keyword_loc: (5,31)-(5,34) = "end"
-        │   └── name: :A
-        ├── @ ClassNode (location: (7,0)-(9,3))
-        │   ├── locals: [:a]
-        │   ├── class_keyword_loc: (7,0)-(7,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (7,6)-(7,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: (7,8)-(7,9) = "<"
-        │   ├── superclass:
-        │   │   @ ConstantReadNode (location: (7,10)-(7,11))
-        │   │   └── name: :B
-        │   ├── body:
-        │   │   @ StatementsNode (location: (8,0)-(8,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableWriteNode (location: (8,0)-(8,5))
-        │   │           ├── name: :a
-        │   │           ├── depth: 0
-        │   │           ├── name_loc: (8,0)-(8,1) = "a"
-        │   │           ├── value:
-        │   │           │   @ IntegerNode (location: (8,4)-(8,5))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           └── operator_loc: (8,2)-(8,3) = "="
-        │   ├── end_keyword_loc: (9,0)-(9,3) = "end"
-        │   └── name: :A
-        ├── @ SingletonClassNode (location: (11,0)-(12,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (11,0)-(11,5) = "class"
-        │   ├── operator_loc: (11,6)-(11,8) = "<<"
-        │   ├── expression:
-        │   │   @ CallNode (location: (11,9)-(11,16))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (11,13)-(11,16))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (11,13)-(11,16) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (11,9)-(11,12) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   └── end_keyword_loc: (12,0)-(12,3) = "end"
-        ├── @ ClassNode (location: (14,0)-(14,40))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (14,0)-(14,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (14,6)-(14,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (14,9)-(14,35))
-        │   │   └── body: (length: 1)
-        │   │       └── @ SingletonClassNode (location: (14,9)-(14,35))
-        │   │           ├── locals: []
-        │   │           ├── class_keyword_loc: (14,9)-(14,14) = "class"
-        │   │           ├── operator_loc: (14,15)-(14,17) = "<<"
-        │   │           ├── expression:
-        │   │           │   @ SelfNode (location: (14,18)-(14,22))
-        │   │           ├── body:
-        │   │           │   @ BeginNode (location: (14,9)-(14,35))
-        │   │           │   ├── begin_keyword_loc: ∅
-        │   │           │   ├── statements: ∅
-        │   │           │   ├── rescue_clause: ∅
-        │   │           │   ├── else_clause: ∅
-        │   │           │   ├── ensure_clause:
-        │   │           │   │   @ EnsureNode (location: (14,24)-(14,35))
-        │   │           │   │   ├── ensure_keyword_loc: (14,24)-(14,30) = "ensure"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── end_keyword_loc: (14,32)-(14,35) = "end"
-        │   │           │   └── end_keyword_loc: (14,32)-(14,35) = "end"
-        │   │           └── end_keyword_loc: (14,32)-(14,35) = "end"
-        │   ├── end_keyword_loc: (14,37)-(14,40) = "end"
-        │   └── name: :A
-        ├── @ ClassNode (location: (16,0)-(16,54))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (16,0)-(16,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (16,6)-(16,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (16,9)-(16,49))
-        │   │   └── body: (length: 1)
-        │   │       └── @ SingletonClassNode (location: (16,9)-(16,49))
-        │   │           ├── locals: []
-        │   │           ├── class_keyword_loc: (16,9)-(16,14) = "class"
-        │   │           ├── operator_loc: (16,15)-(16,17) = "<<"
-        │   │           ├── expression:
-        │   │           │   @ SelfNode (location: (16,18)-(16,22))
-        │   │           ├── body:
-        │   │           │   @ BeginNode (location: (16,9)-(16,49))
-        │   │           │   ├── begin_keyword_loc: ∅
-        │   │           │   ├── statements: ∅
-        │   │           │   ├── rescue_clause:
-        │   │           │   │   @ RescueNode (location: (16,24)-(16,30))
-        │   │           │   │   ├── keyword_loc: (16,24)-(16,30) = "rescue"
-        │   │           │   │   ├── exceptions: (length: 0)
-        │   │           │   │   ├── operator_loc: ∅
-        │   │           │   │   ├── reference: ∅
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── consequent: ∅
-        │   │           │   ├── else_clause:
-        │   │           │   │   @ ElseNode (location: (16,32)-(16,44))
-        │   │           │   │   ├── else_keyword_loc: (16,32)-(16,36) = "else"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── end_keyword_loc: (16,38)-(16,44) = "ensure"
-        │   │           │   ├── ensure_clause:
-        │   │           │   │   @ EnsureNode (location: (16,38)-(16,49))
-        │   │           │   │   ├── ensure_keyword_loc: (16,38)-(16,44) = "ensure"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── end_keyword_loc: (16,46)-(16,49) = "end"
-        │   │           │   └── end_keyword_loc: (16,46)-(16,49) = "end"
-        │   │           └── end_keyword_loc: (16,46)-(16,49) = "end"
-        │   ├── end_keyword_loc: (16,51)-(16,54) = "end"
-        │   └── name: :A
-        ├── @ SingletonClassNode (location: (18,0)-(19,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (18,0)-(18,5) = "class"
-        │   ├── operator_loc: (18,6)-(18,8) = "<<"
-        │   ├── expression:
-        │   │   @ CallNode (location: (18,9)-(18,16))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (18,9)-(18,12))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (18,9)-(18,12) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (18,12)-(18,13) = "."
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (18,13)-(18,16) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        ├── @ SingletonClassNode (location: (21,0)-(21,20))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (21,0)-(21,5) = "class"
-        │   ├── operator_loc: (21,6)-(21,8) = "<<"
-        │   ├── expression:
-        │   │   @ CallNode (location: (21,9)-(21,16))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (21,9)-(21,12))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (21,9)-(21,12) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (21,12)-(21,13) = "."
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (21,13)-(21,16) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   └── end_keyword_loc: (21,17)-(21,20) = "end"
-        ├── @ SingletonClassNode (location: (23,0)-(24,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (23,0)-(23,5) = "class"
-        │   ├── operator_loc: (23,6)-(23,8) = "<<"
-        │   ├── expression:
-        │   │   @ SelfNode (location: (23,9)-(23,13))
-        │   ├── body: ∅
-        │   └── end_keyword_loc: (24,0)-(24,3) = "end"
-        ├── @ SingletonClassNode (location: (26,0)-(26,17))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (26,0)-(26,5) = "class"
-        │   ├── operator_loc: (26,6)-(26,8) = "<<"
-        │   ├── expression:
-        │   │   @ SelfNode (location: (26,9)-(26,13))
-        │   ├── body: ∅
-        │   └── end_keyword_loc: (26,14)-(26,17) = "end"
-        ├── @ SingletonClassNode (location: (28,0)-(30,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (28,0)-(28,5) = "class"
-        │   ├── operator_loc: (28,6)-(28,8) = "<<"
-        │   ├── expression:
-        │   │   @ SelfNode (location: (28,9)-(28,13))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (29,0)-(29,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (29,0)-(29,5))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ IntegerNode (location: (29,0)-(29,1))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :+
-        │   │           ├── message_loc: (29,2)-(29,3) = "+"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (29,4)-(29,5))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (29,4)-(29,5))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 2
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── end_keyword_loc: (30,0)-(30,3) = "end"
-        ├── @ SingletonClassNode (location: (32,0)-(32,23))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (32,0)-(32,5) = "class"
-        │   ├── operator_loc: (32,6)-(32,8) = "<<"
-        │   ├── expression:
-        │   │   @ SelfNode (location: (32,9)-(32,13))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (32,14)-(32,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (32,14)-(32,19))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ IntegerNode (location: (32,14)-(32,15))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :+
-        │   │           ├── message_loc: (32,16)-(32,17) = "+"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (32,18)-(32,19))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (32,18)-(32,19))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 2
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── end_keyword_loc: (32,20)-(32,23) = "end"
-        └── @ ClassNode (location: (34,0)-(35,3))
-            ├── locals: []
-            ├── class_keyword_loc: (34,0)-(34,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (34,6)-(34,7))
-            │   └── name: :A
-            ├── inheritance_operator_loc: (34,8)-(34,9) = "<"
-            ├── superclass:
-            │   @ CallNode (location: (34,10)-(34,14))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ ConstantReadNode (location: (34,10)-(34,11))
-            │   │   └── name: :B
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :[]
-            │   ├── message_loc: (34,11)-(34,14) = "[1]"
-            │   ├── opening_loc: (34,11)-(34,12) = "["
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (34,12)-(34,13))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ IntegerNode (location: (34,12)-(34,13))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── closing_loc: (34,13)-(34,14) = "]"
-            │   └── block: ∅
-            ├── body: ∅
-            ├── end_keyword_loc: (35,0)-(35,3) = "end"
-            └── name: :A
diff --git a/test/mri/prism/snapshots/command_method_call.txt b/test/mri/prism/snapshots/command_method_call.txt
deleted file mode 100644
index 7fd6341304c..00000000000
--- a/test/mri/prism/snapshots/command_method_call.txt
+++ /dev/null
@@ -1,755 +0,0 @@
-@ ProgramNode (location: (1,0)-(41,10))
-├── locals: [:foo, :bar]
-└── statements:
-    @ StatementsNode (location: (1,0)-(41,10))
-    └── body: (length: 21)
-        ├── @ CallNode (location: (1,0)-(1,5))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,4)-(1,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,4)-(3,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,4)-(3,9))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (3,4)-(3,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (3,8)-(3,9))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (3,8)-(3,9))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ IfNode (location: (5,0)-(5,14))
-        │   ├── if_keyword_loc: (5,6)-(5,8) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (5,9)-(5,14))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (5,9)-(5,12) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (5,13)-(5,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (5,13)-(5,14))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (5,0)-(5,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (5,0)-(5,5))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (5,0)-(5,3) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (5,4)-(5,5))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (5,4)-(5,5))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ UnlessNode (location: (7,0)-(7,18))
-        │   ├── keyword_loc: (7,6)-(7,12) = "unless"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (7,13)-(7,18))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (7,13)-(7,16) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (7,17)-(7,18))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (7,17)-(7,18))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (7,0)-(7,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (7,0)-(7,5))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (7,0)-(7,3) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (7,4)-(7,5))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (7,4)-(7,5))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ WhileNode (location: (9,0)-(9,17))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (9,6)-(9,11) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (9,12)-(9,17))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (9,12)-(9,15) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (9,16)-(9,17))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (9,16)-(9,17))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (9,0)-(9,5))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (9,0)-(9,5))
-        │               ├── flags: ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :foo
-        │               ├── message_loc: (9,0)-(9,3) = "foo"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (9,4)-(9,5))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 1)
-        │               │       └── @ IntegerNode (location: (9,4)-(9,5))
-        │               │           ├── flags: decimal
-        │               │           └── value: 1
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ UntilNode (location: (11,0)-(11,17))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (11,6)-(11,11) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (11,12)-(11,17))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (11,12)-(11,15) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (11,16)-(11,17))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (11,16)-(11,17))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (11,0)-(11,5))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (11,0)-(11,5))
-        │               ├── flags: ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :foo
-        │               ├── message_loc: (11,0)-(11,3) = "foo"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (11,4)-(11,5))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 1)
-        │               │       └── @ IntegerNode (location: (11,4)-(11,5))
-        │               │           ├── flags: decimal
-        │               │           └── value: 1
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ RescueModifierNode (location: (13,0)-(13,18))
-        │   ├── expression:
-        │   │   @ CallNode (location: (13,0)-(13,5))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (13,0)-(13,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (13,4)-(13,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (13,4)-(13,5))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── keyword_loc: (13,6)-(13,12) = "rescue"
-        │   └── rescue_expression:
-        │       @ CallNode (location: (13,13)-(13,18))
-        │       ├── flags: ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (13,13)-(13,16) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments:
-        │       │   @ ArgumentsNode (location: (13,17)-(13,18))
-        │       │   ├── flags: ∅
-        │       │   └── arguments: (length: 1)
-        │       │       └── @ IntegerNode (location: (13,17)-(13,18))
-        │       │           ├── flags: decimal
-        │       │           └── value: 2
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ CallNode (location: (15,0)-(15,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (15,0)-(15,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (15,0)-(15,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (15,3)-(15,10) = "[bar 1]"
-        │   ├── opening_loc: (15,3)-(15,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,4)-(15,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (15,4)-(15,9))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (15,4)-(15,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (15,8)-(15,9))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (15,8)-(15,9))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (15,9)-(15,10) = "]"
-        │   └── block: ∅
-        ├── @ AndNode (location: (17,0)-(17,15))
-        │   ├── left:
-        │   │   @ CallNode (location: (17,0)-(17,5))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (17,0)-(17,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (17,4)-(17,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (17,4)-(17,5))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (17,10)-(17,15))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (17,10)-(17,13) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (17,14)-(17,15))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (17,14)-(17,15))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (17,6)-(17,9) = "and"
-        ├── @ OrNode (location: (19,0)-(19,14))
-        │   ├── left:
-        │   │   @ CallNode (location: (19,0)-(19,5))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (19,0)-(19,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (19,4)-(19,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (19,4)-(19,5))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (19,9)-(19,14))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (19,9)-(19,12) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (19,13)-(19,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (19,13)-(19,14))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (19,6)-(19,8) = "or"
-        ├── @ CallNode (location: (21,0)-(21,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (21,4)-(21,9))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (21,4)-(21,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (21,8)-(21,9))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (21,8)-(21,9))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (21,0)-(21,3) = "not"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ LocalVariableWriteNode (location: (23,0)-(23,17))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (23,0)-(23,3) = "foo"
-        │   ├── value:
-        │   │   @ LocalVariableWriteNode (location: (23,6)-(23,17))
-        │   │   ├── name: :bar
-        │   │   ├── depth: 0
-        │   │   ├── name_loc: (23,6)-(23,9) = "bar"
-        │   │   ├── value:
-        │   │   │   @ CallNode (location: (23,12)-(23,17))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── message_loc: (23,12)-(23,15) = "baz"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (23,16)-(23,17))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (23,16)-(23,17))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (23,10)-(23,11) = "="
-        │   └── operator_loc: (23,4)-(23,5) = "="
-        ├── @ DefNode (location: (25,0)-(25,15))
-        │   ├── name: :foo
-        │   ├── name_loc: (25,4)-(25,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (25,10)-(25,15))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (25,10)-(25,15))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (25,10)-(25,13) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (25,14)-(25,15))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (25,14)-(25,15))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (25,0)-(25,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (25,8)-(25,9) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ CallNode (location: (27,0)-(27,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (27,0)-(27,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: (27,1)-(27,2) = "."
-        │   ├── name: :foo
-        │   ├── message_loc: (27,2)-(27,5) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (27,6)-(27,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (27,6)-(27,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (29,0)-(29,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (29,0)-(29,5))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (29,0)-(29,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── call_operator_loc: (29,1)-(29,2) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (29,2)-(29,5) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (29,5)-(29,6) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (29,6)-(29,9) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (29,10)-(29,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (29,10)-(29,11))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (31,0)-(31,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (31,0)-(31,8))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (31,0)-(31,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── receiver:
-        │   │   │   │   @ IntegerNode (location: (31,0)-(31,1))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   ├── call_operator_loc: (31,1)-(31,2) = "."
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (31,2)-(31,5) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :[]
-        │   │   ├── message_loc: (31,5)-(31,8) = "[2]"
-        │   │   ├── opening_loc: (31,5)-(31,6) = "["
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (31,6)-(31,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (31,6)-(31,7))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: (31,7)-(31,8) = "]"
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (31,8)-(31,9) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (31,9)-(31,12) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,13)-(31,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (31,13)-(31,14))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (33,0)-(33,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (33,0)-(33,8))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (33,0)-(33,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── call_operator_loc: (33,1)-(33,2) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (33,2)-(33,5) = "foo"
-        │   │   ├── opening_loc: (33,5)-(33,6) = "("
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (33,6)-(33,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (33,6)-(33,7))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: (33,7)-(33,8) = ")"
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (33,8)-(33,9) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (33,9)-(33,12) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (33,13)-(33,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (33,13)-(33,14))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (35,0)-(35,15))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (35,0)-(35,9))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (35,0)-(35,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── call_operator_loc: (35,1)-(35,2) = "."
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (35,2)-(35,5) = "foo"
-        │   │   ├── opening_loc: (35,5)-(35,6) = "("
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: (35,8)-(35,9) = ")"
-        │   │   └── block:
-        │   │       @ BlockArgumentNode (location: (35,6)-(35,8))
-        │   │       ├── expression:
-        │   │       │   @ IntegerNode (location: (35,7)-(35,8))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── operator_loc: (35,6)-(35,7) = "&"
-        │   ├── call_operator_loc: (35,9)-(35,10) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (35,10)-(35,13) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (35,14)-(35,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (35,14)-(35,15))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ AndNode (location: (37,0)-(37,17))
-        │   ├── left:
-        │   │   @ CallNode (location: (37,0)-(37,6))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (37,1)-(37,6))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (37,1)-(37,4) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (37,5)-(37,6))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (37,5)-(37,6))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (37,0)-(37,1) = "!"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (37,11)-(37,17))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (37,12)-(37,17))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (37,12)-(37,15) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (37,16)-(37,17))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (37,16)-(37,17))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 2
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (37,11)-(37,12) = "!"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (37,7)-(37,10) = "and"
-        ├── @ OrNode (location: (39,0)-(39,16))
-        │   ├── left:
-        │   │   @ CallNode (location: (39,0)-(39,6))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (39,1)-(39,6))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (39,1)-(39,4) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (39,5)-(39,6))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (39,5)-(39,6))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (39,0)-(39,1) = "!"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (39,10)-(39,16))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (39,11)-(39,16))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (39,11)-(39,14) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (39,15)-(39,16))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (39,15)-(39,16))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 2
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (39,10)-(39,11) = "!"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (39,7)-(39,9) = "or"
-        └── @ CallNode (location: (41,0)-(41,10))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (41,4)-(41,10))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (41,5)-(41,10))
-            │   │   ├── flags: ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :foo
-            │   │   ├── message_loc: (41,5)-(41,8) = "foo"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments:
-            │   │   │   @ ArgumentsNode (location: (41,9)-(41,10))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── arguments: (length: 1)
-            │   │   │       └── @ IntegerNode (location: (41,9)-(41,10))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 1
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :!
-            │   ├── message_loc: (41,4)-(41,5) = "!"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (41,0)-(41,3) = "not"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/comments.txt b/test/mri/prism/snapshots/comments.txt
deleted file mode 100644
index b7088adcd50..00000000000
--- a/test/mri/prism/snapshots/comments.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-@ ProgramNode (location: (1,0)-(24,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(24,5))
-    └── body: (length: 9)
-        ├── @ CallNode (location: (1,0)-(1,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :b
-        │   ├── message_loc: (3,0)-(3,1) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :c
-        │   ├── message_loc: (5,0)-(5,1) = "c"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (6,0)-(6,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :d
-        │   ├── message_loc: (6,0)-(6,1) = "d"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (8,0)-(10,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (8,0)-(8,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :e
-        │   │   ├── message_loc: (8,0)-(8,1) = "e"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (10,2)-(10,3) = "."
-        │   ├── name: :f
-        │   ├── message_loc: (10,3)-(10,4) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (12,0)-(14,2))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (12,0)-(12,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :g
-        │   │   ├── message_loc: (12,0)-(12,1) = "g"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (14,0)-(14,1) = "."
-        │   ├── name: :h
-        │   ├── message_loc: (14,1)-(14,2) = "h"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (16,0)-(17,2))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (16,0)-(16,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :i
-        │   │   ├── message_loc: (16,0)-(16,1) = "i"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (17,0)-(17,1) = "."
-        │   ├── name: :j
-        │   ├── message_loc: (17,1)-(17,2) = "j"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (19,0)-(20,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (19,0)-(19,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :k
-        │   │   ├── message_loc: (19,0)-(19,1) = "k"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (20,2)-(20,3) = "."
-        │   ├── name: :l
-        │   ├── message_loc: (20,3)-(20,4) = "l"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (22,0)-(24,5))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (22,0)-(22,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :m
-            │   ├── message_loc: (22,0)-(22,1) = "m"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (24,2)-(24,4) = "&."
-            ├── name: :n
-            ├── message_loc: (24,4)-(24,5) = "n"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/constants.txt b/test/mri/prism/snapshots/constants.txt
deleted file mode 100644
index 59e234148a5..00000000000
--- a/test/mri/prism/snapshots/constants.txt
+++ /dev/null
@@ -1,1242 +0,0 @@
-@ ProgramNode (location: (1,0)-(184,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(184,10))
-    └── body: (length: 90)
-        ├── @ ConstantPathNode (location: (1,0)-(1,4))
-        │   ├── parent:
-        │   │   @ ConstantReadNode (location: (1,0)-(1,1))
-        │   │   └── name: :A
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (1,3)-(1,4))
-        │   │   └── name: :B
-        │   └── delimiter_loc: (1,1)-(1,3) = "::"
-        ├── @ ConstantPathNode (location: (3,0)-(3,7))
-        │   ├── parent:
-        │   │   @ ConstantPathNode (location: (3,0)-(3,4))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (3,0)-(3,1))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (3,3)-(3,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (3,1)-(3,3) = "::"
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (3,6)-(3,7))
-        │   │   └── name: :C
-        │   └── delimiter_loc: (3,4)-(3,6) = "::"
-        ├── @ ConstantPathNode (location: (5,0)-(5,4))
-        │   ├── parent:
-        │   │   @ CallNode (location: (5,0)-(5,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (5,0)-(5,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (5,3)-(5,4))
-        │   │   └── name: :B
-        │   └── delimiter_loc: (5,1)-(5,3) = "::"
-        ├── @ ConstantPathWriteNode (location: (7,0)-(7,8))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (7,0)-(7,4))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (7,0)-(7,1))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (7,3)-(7,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (7,1)-(7,3) = "::"
-        │   ├── operator_loc: (7,5)-(7,6) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (7,7)-(7,8))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ ConstantWriteNode (location: (9,0)-(9,5))
-        │   ├── name: :A
-        │   ├── name_loc: (9,0)-(9,1) = "A"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (9,4)-(9,5))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (9,2)-(9,3) = "="
-        ├── @ ConstantReadNode (location: (11,0)-(11,3))
-        │   └── name: :ABC
-        ├── @ CallNode (location: (13,0)-(13,5))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :Foo
-        │   ├── message_loc: (13,0)-(13,3) = "Foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (13,4)-(13,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (13,4)-(13,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (15,0)-(15,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :Foo
-        │   ├── message_loc: (15,0)-(15,3) = "Foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,4)-(15,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (15,4)-(15,8))
-        │   │           ├── operator_loc: (15,4)-(15,5) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (15,5)-(15,8))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :bar
-        │   │               ├── message_loc: (15,5)-(15,8) = "bar"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (17,0)-(17,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :Foo
-        │   ├── message_loc: (17,0)-(17,3) = "Foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (17,4)-(17,9))
-        │   │   ├── flags: contains_keyword_splat
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (17,4)-(17,9))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocSplatNode (location: (17,4)-(17,9))
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (17,6)-(17,9))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :bar
-        │   │                   │   ├── message_loc: (17,6)-(17,9) = "bar"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: (17,4)-(17,6) = "**"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (19,0)-(19,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :Foo
-        │   ├── message_loc: (19,0)-(19,3) = "Foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockArgumentNode (location: (19,4)-(19,8))
-        │       ├── expression:
-        │       │   @ CallNode (location: (19,5)-(19,8))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :bar
-        │       │   ├── message_loc: (19,5)-(19,8) = "bar"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (19,4)-(19,5) = "&"
-        ├── @ CallNode (location: (21,0)-(21,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (21,0)-(21,3))
-        │   │   └── name: :Foo
-        │   ├── call_operator_loc: (21,3)-(21,5) = "::"
-        │   ├── name: :Bar
-        │   ├── message_loc: (21,5)-(21,8) = "Bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,9)-(21,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (21,9)-(21,13))
-        │   │           ├── operator_loc: (21,9)-(21,10) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (21,10)-(21,13))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :baz
-        │   │               ├── message_loc: (21,10)-(21,13) = "baz"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (23,0)-(23,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (23,0)-(23,3))
-        │   │   └── name: :Foo
-        │   ├── call_operator_loc: (23,3)-(23,5) = "::"
-        │   ├── name: :Bar
-        │   ├── message_loc: (23,5)-(23,8) = "Bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (23,9)-(23,14))
-        │   │   ├── flags: contains_keyword_splat
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (23,9)-(23,14))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocSplatNode (location: (23,9)-(23,14))
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (23,11)-(23,14))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :baz
-        │   │                   │   ├── message_loc: (23,11)-(23,14) = "baz"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: (23,9)-(23,11) = "**"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (25,0)-(25,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (25,0)-(25,3))
-        │   │   └── name: :Foo
-        │   ├── call_operator_loc: (25,3)-(25,5) = "::"
-        │   ├── name: :Bar
-        │   ├── message_loc: (25,5)-(25,8) = "Bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockArgumentNode (location: (25,9)-(25,13))
-        │       ├── expression:
-        │       │   @ CallNode (location: (25,10)-(25,13))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :baz
-        │       │   ├── message_loc: (25,10)-(25,13) = "baz"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (25,9)-(25,10) = "&"
-        ├── @ CallNode (location: (27,0)-(27,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantPathNode (location: (27,0)-(27,3))
-        │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (27,2)-(27,3))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (27,0)-(27,2) = "::"
-        │   ├── call_operator_loc: (27,3)-(27,5) = "::"
-        │   ├── name: :foo
-        │   ├── message_loc: (27,5)-(27,8) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ ConstantPathWriteNode (location: (29,0)-(29,7))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (29,0)-(29,3))
-        │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (29,2)-(29,3))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (29,0)-(29,2) = "::"
-        │   ├── operator_loc: (29,4)-(29,5) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (29,6)-(29,7))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ ConstantPathWriteNode (location: (31,0)-(31,10))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (31,0)-(31,6))
-        │   │   ├── parent:
-        │   │   │   @ ConstantPathNode (location: (31,0)-(31,3))
-        │   │   │   ├── parent: ∅
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (31,2)-(31,3))
-        │   │   │   │   └── name: :A
-        │   │   │   └── delimiter_loc: (31,0)-(31,2) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (31,5)-(31,6))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (31,3)-(31,5) = "::"
-        │   ├── operator_loc: (31,7)-(31,8) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (31,9)-(31,10))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ ConstantPathNode (location: (33,0)-(33,6))
-        │   ├── parent:
-        │   │   @ ConstantPathNode (location: (33,0)-(33,3))
-        │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (33,2)-(33,3))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (33,0)-(33,2) = "::"
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (33,5)-(33,6))
-        │   │   └── name: :B
-        │   └── delimiter_loc: (33,3)-(33,5) = "::"
-        ├── @ ConstantPathNode (location: (35,0)-(35,3))
-        │   ├── parent: ∅
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (35,2)-(35,3))
-        │   │   └── name: :A
-        │   └── delimiter_loc: (35,0)-(35,2) = "::"
-        ├── @ CallNode (location: (37,0)-(37,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (37,0)-(37,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (37,1)-(37,3) = "::"
-        │   ├── name: :false
-        │   ├── message_loc: (37,3)-(37,8) = "false"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (39,0)-(39,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantPathNode (location: (39,0)-(39,4))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (39,0)-(39,1))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (39,3)-(39,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (39,1)-(39,3) = "::"
-        │   ├── call_operator_loc: (39,4)-(39,6) = "::"
-        │   ├── name: :true
-        │   ├── message_loc: (39,6)-(39,10) = "true"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (41,0)-(41,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (41,0)-(41,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (41,1)-(41,3) = "::"
-        │   ├── name: :&
-        │   ├── message_loc: (41,3)-(41,4) = "&"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (43,0)-(43,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (43,0)-(43,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (43,1)-(43,3) = "::"
-        │   ├── name: :`
-        │   ├── message_loc: (43,3)-(43,4) = "`"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (45,0)-(45,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (45,0)-(45,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (45,1)-(45,3) = "::"
-        │   ├── name: :!
-        │   ├── message_loc: (45,3)-(45,4) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (47,0)-(47,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (47,0)-(47,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (47,1)-(47,3) = "::"
-        │   ├── name: :!=
-        │   ├── message_loc: (47,3)-(47,5) = "!="
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (49,0)-(49,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (49,0)-(49,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (49,1)-(49,3) = "::"
-        │   ├── name: :^
-        │   ├── message_loc: (49,3)-(49,4) = "^"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (51,0)-(51,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (51,0)-(51,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (51,1)-(51,3) = "::"
-        │   ├── name: :==
-        │   ├── message_loc: (51,3)-(51,5) = "=="
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (53,0)-(53,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (53,0)-(53,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (53,1)-(53,3) = "::"
-        │   ├── name: :===
-        │   ├── message_loc: (53,3)-(53,6) = "==="
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (55,0)-(55,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (55,0)-(55,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (55,1)-(55,3) = "::"
-        │   ├── name: :=~
-        │   ├── message_loc: (55,3)-(55,5) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (57,0)-(57,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (57,0)-(57,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (57,1)-(57,3) = "::"
-        │   ├── name: :>
-        │   ├── message_loc: (57,3)-(57,4) = ">"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (59,0)-(59,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (59,0)-(59,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (59,1)-(59,3) = "::"
-        │   ├── name: :>=
-        │   ├── message_loc: (59,3)-(59,5) = ">="
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (61,0)-(61,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (61,0)-(61,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (61,1)-(61,3) = "::"
-        │   ├── name: :>>
-        │   ├── message_loc: (61,3)-(61,5) = ">>"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (63,0)-(63,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (63,0)-(63,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (63,1)-(63,3) = "::"
-        │   ├── name: :<<
-        │   ├── message_loc: (63,3)-(63,5) = "<<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ ConstantPathNode (location: (65,0)-(67,1))
-        │   ├── parent:
-        │   │   @ ConstantReadNode (location: (65,0)-(65,1))
-        │   │   └── name: :A
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (67,0)-(67,1))
-        │   │   └── name: :C
-        │   └── delimiter_loc: (65,1)-(65,3) = "::"
-        ├── @ CallNode (location: (69,0)-(69,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (69,0)-(69,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (69,1)-(69,3) = "::"
-        │   ├── name: :alias
-        │   ├── message_loc: (69,3)-(69,8) = "alias"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (71,0)-(71,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (71,0)-(71,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (71,1)-(71,3) = "::"
-        │   ├── name: :and
-        │   ├── message_loc: (71,3)-(71,6) = "and"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (73,0)-(73,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (73,0)-(73,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (73,1)-(73,3) = "::"
-        │   ├── name: :begin
-        │   ├── message_loc: (73,3)-(73,8) = "begin"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ ConstantPathNode (location: (75,0)-(75,8))
-        │   ├── parent:
-        │   │   @ ConstantReadNode (location: (75,0)-(75,1))
-        │   │   └── name: :A
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (75,3)-(75,8))
-        │   │   └── name: :BEGIN
-        │   └── delimiter_loc: (75,1)-(75,3) = "::"
-        ├── @ CallNode (location: (77,0)-(77,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (77,0)-(77,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (77,1)-(77,3) = "::"
-        │   ├── name: :break
-        │   ├── message_loc: (77,3)-(77,8) = "break"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (79,0)-(79,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (79,0)-(79,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (79,1)-(79,3) = "::"
-        │   ├── name: :class
-        │   ├── message_loc: (79,3)-(79,8) = "class"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (81,0)-(81,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (81,0)-(81,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (81,1)-(81,3) = "::"
-        │   ├── name: :def
-        │   ├── message_loc: (81,3)-(81,6) = "def"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (83,0)-(83,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (83,0)-(83,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (83,1)-(83,3) = "::"
-        │   ├── name: :defined
-        │   ├── message_loc: (83,3)-(83,10) = "defined"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (85,0)-(85,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (85,0)-(85,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (85,1)-(85,3) = "::"
-        │   ├── name: :do
-        │   ├── message_loc: (85,3)-(85,5) = "do"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (87,0)-(87,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (87,0)-(87,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (87,1)-(87,3) = "::"
-        │   ├── name: :else
-        │   ├── message_loc: (87,3)-(87,7) = "else"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (89,0)-(89,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (89,0)-(89,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (89,1)-(89,3) = "::"
-        │   ├── name: :elsif
-        │   ├── message_loc: (89,3)-(89,8) = "elsif"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (91,0)-(91,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (91,0)-(91,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (91,1)-(91,3) = "::"
-        │   ├── name: :end
-        │   ├── message_loc: (91,3)-(91,6) = "end"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ ConstantPathNode (location: (93,0)-(93,6))
-        │   ├── parent:
-        │   │   @ ConstantReadNode (location: (93,0)-(93,1))
-        │   │   └── name: :A
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (93,3)-(93,6))
-        │   │   └── name: :END
-        │   └── delimiter_loc: (93,1)-(93,3) = "::"
-        ├── @ CallNode (location: (95,0)-(95,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (95,0)-(95,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (95,1)-(95,3) = "::"
-        │   ├── name: :ensure
-        │   ├── message_loc: (95,3)-(95,9) = "ensure"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (97,0)-(97,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (97,0)-(97,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (97,1)-(97,3) = "::"
-        │   ├── name: :false
-        │   ├── message_loc: (97,3)-(97,8) = "false"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (99,0)-(99,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (99,0)-(99,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (99,1)-(99,3) = "::"
-        │   ├── name: :for
-        │   ├── message_loc: (99,3)-(99,6) = "for"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (101,0)-(101,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (101,0)-(101,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (101,1)-(101,3) = "::"
-        │   ├── name: :if
-        │   ├── message_loc: (101,3)-(101,5) = "if"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (103,0)-(103,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (103,0)-(103,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (103,1)-(103,3) = "::"
-        │   ├── name: :in
-        │   ├── message_loc: (103,3)-(103,5) = "in"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (105,0)-(105,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (105,0)-(105,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (105,1)-(105,3) = "::"
-        │   ├── name: :next
-        │   ├── message_loc: (105,3)-(105,7) = "next"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (107,0)-(107,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (107,0)-(107,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (107,1)-(107,3) = "::"
-        │   ├── name: :nil
-        │   ├── message_loc: (107,3)-(107,6) = "nil"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (109,0)-(109,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (109,0)-(109,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (109,1)-(109,3) = "::"
-        │   ├── name: :not
-        │   ├── message_loc: (109,3)-(109,6) = "not"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (111,0)-(111,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (111,0)-(111,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (111,1)-(111,3) = "::"
-        │   ├── name: :or
-        │   ├── message_loc: (111,3)-(111,5) = "or"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (113,0)-(113,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (113,0)-(113,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (113,1)-(113,3) = "::"
-        │   ├── name: :redo
-        │   ├── message_loc: (113,3)-(113,7) = "redo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (115,0)-(115,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (115,0)-(115,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (115,1)-(115,3) = "::"
-        │   ├── name: :rescue
-        │   ├── message_loc: (115,3)-(115,9) = "rescue"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (117,0)-(117,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (117,0)-(117,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (117,1)-(117,3) = "::"
-        │   ├── name: :retry
-        │   ├── message_loc: (117,3)-(117,8) = "retry"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (119,0)-(119,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (119,0)-(119,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (119,1)-(119,3) = "::"
-        │   ├── name: :return
-        │   ├── message_loc: (119,3)-(119,9) = "return"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (121,0)-(121,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (121,0)-(121,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (121,1)-(121,3) = "::"
-        │   ├── name: :self
-        │   ├── message_loc: (121,3)-(121,7) = "self"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (123,0)-(123,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (123,0)-(123,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (123,1)-(123,3) = "::"
-        │   ├── name: :super
-        │   ├── message_loc: (123,3)-(123,8) = "super"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (125,0)-(125,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (125,0)-(125,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (125,1)-(125,3) = "::"
-        │   ├── name: :then
-        │   ├── message_loc: (125,3)-(125,7) = "then"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (127,0)-(127,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (127,0)-(127,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (127,1)-(127,3) = "::"
-        │   ├── name: :true
-        │   ├── message_loc: (127,3)-(127,7) = "true"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (129,0)-(129,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (129,0)-(129,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (129,1)-(129,3) = "::"
-        │   ├── name: :undef
-        │   ├── message_loc: (129,3)-(129,8) = "undef"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (131,0)-(131,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (131,0)-(131,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (131,1)-(131,3) = "::"
-        │   ├── name: :unless
-        │   ├── message_loc: (131,3)-(131,9) = "unless"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (133,0)-(133,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (133,0)-(133,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (133,1)-(133,3) = "::"
-        │   ├── name: :until
-        │   ├── message_loc: (133,3)-(133,8) = "until"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (135,0)-(135,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (135,0)-(135,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (135,1)-(135,3) = "::"
-        │   ├── name: :when
-        │   ├── message_loc: (135,3)-(135,7) = "when"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (137,0)-(137,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (137,0)-(137,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (137,1)-(137,3) = "::"
-        │   ├── name: :while
-        │   ├── message_loc: (137,3)-(137,8) = "while"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (139,0)-(139,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (139,0)-(139,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (139,1)-(139,3) = "::"
-        │   ├── name: :yield
-        │   ├── message_loc: (139,3)-(139,8) = "yield"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (141,0)-(141,15))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (141,0)-(141,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (141,1)-(141,3) = "::"
-        │   ├── name: :__ENCODING__
-        │   ├── message_loc: (141,3)-(141,15) = "__ENCODING__"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (143,0)-(143,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (143,0)-(143,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (143,1)-(143,3) = "::"
-        │   ├── name: :__FILE__
-        │   ├── message_loc: (143,3)-(143,11) = "__FILE__"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (145,0)-(145,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (145,0)-(145,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (145,1)-(145,3) = "::"
-        │   ├── name: :__LINE__
-        │   ├── message_loc: (145,3)-(145,11) = "__LINE__"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (147,0)-(147,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (147,0)-(147,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (147,1)-(147,3) = "::"
-        │   ├── name: :<
-        │   ├── message_loc: (147,3)-(147,4) = "<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (149,0)-(149,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (149,0)-(149,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (149,1)-(149,3) = "::"
-        │   ├── name: :<=>
-        │   ├── message_loc: (149,3)-(149,6) = "<=>"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (151,0)-(151,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (151,0)-(151,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (151,1)-(151,3) = "::"
-        │   ├── name: :<<
-        │   ├── message_loc: (151,3)-(151,5) = "<<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (153,0)-(153,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (153,0)-(153,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (153,1)-(153,3) = "::"
-        │   ├── name: :-
-        │   ├── message_loc: (153,3)-(153,4) = "-"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (155,0)-(155,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (155,0)-(155,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (155,1)-(155,3) = "::"
-        │   ├── name: :%
-        │   ├── message_loc: (155,3)-(155,4) = "%"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (157,0)-(157,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (157,0)-(157,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (157,1)-(157,3) = "::"
-        │   ├── name: :%
-        │   ├── message_loc: (157,3)-(157,4) = "%"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (157,4)-(157,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (157,4)-(157,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :i
-        │   │           ├── message_loc: (157,4)-(157,5) = "i"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (159,0)-(159,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (159,0)-(159,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (159,1)-(159,3) = "::"
-        │   ├── name: :%
-        │   ├── message_loc: (159,3)-(159,4) = "%"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (159,4)-(159,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (159,4)-(159,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :w
-        │   │           ├── message_loc: (159,4)-(159,5) = "w"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (161,0)-(161,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (161,0)-(161,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (161,1)-(161,3) = "::"
-        │   ├── name: :%
-        │   ├── message_loc: (161,3)-(161,4) = "%"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (161,4)-(161,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (161,4)-(161,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :x
-        │   │           ├── message_loc: (161,4)-(161,5) = "x"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (163,0)-(163,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (163,0)-(163,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (163,1)-(163,3) = "::"
-        │   ├── name: :%
-        │   ├── message_loc: (163,3)-(163,4) = "%"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (163,4)-(163,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ConstantReadNode (location: (163,4)-(163,5))
-        │   │           └── name: :I
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (165,0)-(165,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (165,0)-(165,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (165,1)-(165,3) = "::"
-        │   ├── name: :%
-        │   ├── message_loc: (165,3)-(165,4) = "%"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (165,4)-(165,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ConstantReadNode (location: (165,4)-(165,5))
-        │   │           └── name: :W
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (167,0)-(167,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (167,0)-(167,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (167,1)-(167,3) = "::"
-        │   ├── name: :|
-        │   ├── message_loc: (167,3)-(167,4) = "|"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (169,0)-(169,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (169,0)-(169,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (169,1)-(169,3) = "::"
-        │   ├── name: :+
-        │   ├── message_loc: (169,3)-(169,4) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (171,0)-(171,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (171,0)-(171,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (171,1)-(171,3) = "::"
-        │   ├── name: :/
-        │   ├── message_loc: (171,3)-(171,4) = "/"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (173,0)-(173,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (173,0)-(173,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (173,1)-(173,3) = "::"
-        │   ├── name: :*
-        │   ├── message_loc: (173,3)-(173,4) = "*"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (175,0)-(175,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (175,0)-(175,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (175,1)-(175,3) = "::"
-        │   ├── name: :**
-        │   ├── message_loc: (175,3)-(175,5) = "**"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (177,0)-(177,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (177,0)-(177,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (177,1)-(177,3) = "::"
-        │   ├── name: :~
-        │   ├── message_loc: (177,3)-(177,4) = "~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ ConstantPathNode (location: (179,0)-(180,1))
-        │   ├── parent:
-        │   │   @ CallNode (location: (179,0)-(179,4))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ ConstantReadNode (location: (179,0)-(179,1))
-        │   │   │   └── name: :A
-        │   │   ├── call_operator_loc: (179,1)-(179,3) = "::"
-        │   │   ├── name: :_
-        │   │   ├── message_loc: (179,3)-(179,4) = "_"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (180,0)-(180,1))
-        │   │   └── name: :C
-        │   └── delimiter_loc: (179,4)-(179,6) = "::"
-        └── @ RangeNode (location: (182,0)-(184,10))
-            ├── flags: ∅
-            ├── left:
-            │   @ CallNode (location: (182,0)-(182,4))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ ConstantReadNode (location: (182,0)-(182,1))
-            │   │   └── name: :A
-            │   ├── call_operator_loc: (182,1)-(182,3) = "::"
-            │   ├── name: :_
-            │   ├── message_loc: (182,3)-(182,4) = "_"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── right:
-            │   @ CallNode (location: (184,0)-(184,10))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ ConstantReadNode (location: (184,0)-(184,1))
-            │   │   └── name: :A
-            │   ├── call_operator_loc: (184,1)-(184,3) = "::"
-            │   ├── name: :__END__
-            │   ├── message_loc: (184,3)-(184,10) = "__END__"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── operator_loc: (182,4)-(182,6) = ".."
diff --git a/test/mri/prism/snapshots/dash_heredocs.txt b/test/mri/prism/snapshots/dash_heredocs.txt
deleted file mode 100644
index 9af3acf9c2e..00000000000
--- a/test/mri/prism/snapshots/dash_heredocs.txt
+++ /dev/null
@@ -1,256 +0,0 @@
-@ ProgramNode (location: (1,0)-(57,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(57,11))
-    └── body: (length: 13)
-        ├── @ StringNode (location: (1,0)-(1,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,6) = "<<-EOF"
-        │   ├── content_loc: (2,0)-(3,0) = "  a\n"
-        │   ├── closing_loc: (3,0)-(4,0) = "EOF\n"
-        │   └── unescaped: "  a\n"
-        ├── @ CallNode (location: (5,0)-(5,20))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (5,0)-(5,8))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (5,0)-(5,8) = "<<-FIRST"
-        │   │   ├── content_loc: (6,0)-(7,0) = "  a\n"
-        │   │   ├── closing_loc: (7,0)-(8,0) = "FIRST\n"
-        │   │   └── unescaped: "  a\n"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (5,9)-(5,10) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,11)-(5,20))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (5,11)-(5,20))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (5,11)-(5,20) = "<<-SECOND"
-        │   │           ├── content_loc: (8,0)-(9,0) = "  b\n"
-        │   │           ├── closing_loc: (9,0)-(10,0) = "SECOND\n"
-        │   │           └── unescaped: "  b\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ InterpolatedXStringNode (location: (11,0)-(11,8))
-        │   ├── opening_loc: (11,0)-(11,8) = "<<-`EOF`"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (12,0)-(13,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (12,0)-(13,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "  a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (13,0)-(13,4))
-        │   │   │   ├── opening_loc: (13,0)-(13,2) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (13,2)-(13,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (13,2)-(13,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :b
-        │   │   │   │           ├── message_loc: (13,2)-(13,3) = "b"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (13,3)-(13,4) = "}"
-        │   │   └── @ StringNode (location: (13,4)-(14,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (13,4)-(14,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (14,0)-(15,0) = "EOF\n"
-        ├── @ StringNode (location: (16,0)-(16,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (16,0)-(16,6) = "<<-EOF"
-        │   ├── content_loc: (17,0)-(18,0) = "  a\n"
-        │   ├── closing_loc: (18,0)-(19,0) = "EOF\n"
-        │   └── unescaped: "  a\n"
-        ├── @ StringNode (location: (20,0)-(20,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (20,0)-(20,6) = "<<-EOF"
-        │   ├── content_loc: (21,0)-(23,0) = "  a\n  b\n"
-        │   ├── closing_loc: (23,0)-(24,0) = "  EOF\n"
-        │   └── unescaped: "  a\n  b\n"
-        ├── @ InterpolatedStringNode (location: (25,0)-(25,8))
-        │   ├── opening_loc: (25,0)-(25,8) = "<<-\"EOF\""
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (26,0)-(27,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (26,0)-(27,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "  a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (27,0)-(27,4))
-        │   │   │   ├── opening_loc: (27,0)-(27,2) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (27,2)-(27,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (27,2)-(27,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :b
-        │   │   │   │           ├── message_loc: (27,2)-(27,3) = "b"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (27,3)-(27,4) = "}"
-        │   │   └── @ StringNode (location: (27,4)-(28,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (27,4)-(28,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (28,0)-(29,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (30,0)-(30,6))
-        │   ├── opening_loc: (30,0)-(30,6) = "<<-EOF"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (31,0)-(32,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (31,0)-(32,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "  a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (32,0)-(32,4))
-        │   │   │   ├── opening_loc: (32,0)-(32,2) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (32,2)-(32,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (32,2)-(32,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :b
-        │   │   │   │           ├── message_loc: (32,2)-(32,3) = "b"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (32,3)-(32,4) = "}"
-        │   │   └── @ StringNode (location: (32,4)-(33,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (32,4)-(33,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (33,0)-(34,0) = "EOF\n"
-        ├── @ StringNode (location: (35,0)-(35,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (35,0)-(35,2) = "%#"
-        │   ├── content_loc: (35,2)-(35,5) = "abc"
-        │   ├── closing_loc: (35,5)-(35,6) = "#"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (37,0)-(37,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (37,0)-(37,6) = "<<-EOF"
-        │   ├── content_loc: (38,0)-(40,0) = "  a\n  b\n"
-        │   ├── closing_loc: (40,0)-(41,0) = "EOF\n"
-        │   └── unescaped: "  a\n  b\n"
-        ├── @ StringNode (location: (42,0)-(42,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (42,0)-(42,5) = "<<-''"
-        │   ├── content_loc: (43,0)-(43,0) = ""
-        │   ├── closing_loc: (43,0)-(44,0) = "\n"
-        │   └── unescaped: ""
-        ├── @ StringNode (location: (45,0)-(45,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (45,0)-(45,8) = "<<-'EOF'"
-        │   ├── content_loc: (46,0)-(47,0) = "  a \#{1}\n"
-        │   ├── closing_loc: (47,0)-(48,0) = "EOF\n"
-        │   └── unescaped: "  a \#{1}\n"
-        ├── @ CallNode (location: (49,0)-(49,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (49,0)-(49,4))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (49,0)-(49,4) = "<<-A"
-        │   │   ├── content_loc: (50,0)-(51,0) = "  a\n"
-        │   │   ├── closing_loc: (51,0)-(52,0) = "A\n"
-        │   │   └── unescaped: "  a\n"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (49,5)-(49,6) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (49,7)-(49,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (49,7)-(49,11))
-        │   │           ├── opening_loc: (49,7)-(49,11) = "<<-B"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (52,0)-(53,2))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (52,0)-(53,2) = "  b\n  "
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  b\n  "
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (53,2)-(54,3))
-        │   │           │   │   ├── opening_loc: (53,2)-(53,4) = "\#{"
-        │   │           │   │   ├── statements:
-        │   │           │   │   │   @ StatementsNode (location: (53,4)-(53,5))
-        │   │           │   │   │   └── body: (length: 1)
-        │   │           │   │   │       └── @ IntegerNode (location: (53,4)-(53,5))
-        │   │           │   │   │           ├── flags: decimal
-        │   │           │   │   │           └── value: 2
-        │   │           │   │   └── closing_loc: (54,2)-(54,3) = "}"
-        │   │           │   └── @ StringNode (location: (54,3)-(55,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (54,3)-(55,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (55,0)-(56,0) = "B\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (57,0)-(57,11))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ StringNode (location: (57,0)-(57,4))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (57,0)-(57,4) = "<<-A"
-            │   ├── content_loc: (58,0)-(59,0) = "  a\n"
-            │   ├── closing_loc: (59,0)-(60,0) = "A\n"
-            │   └── unescaped: "  a\n"
-            ├── call_operator_loc: ∅
-            ├── name: :+
-            ├── message_loc: (57,5)-(57,6) = "+"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (57,7)-(57,11))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InterpolatedStringNode (location: (57,7)-(57,11))
-            │           ├── opening_loc: (57,7)-(57,11) = "<<-B"
-            │           ├── parts: (length: 3)
-            │           │   ├── @ StringNode (location: (60,0)-(61,2))
-            │           │   │   ├── flags: ∅
-            │           │   │   ├── opening_loc: ∅
-            │           │   │   ├── content_loc: (60,0)-(61,2) = "  b\n  "
-            │           │   │   ├── closing_loc: ∅
-            │           │   │   └── unescaped: "  b\n  "
-            │           │   ├── @ EmbeddedStatementsNode (location: (61,2)-(62,4))
-            │           │   │   ├── opening_loc: (61,2)-(61,4) = "\#{"
-            │           │   │   ├── statements:
-            │           │   │   │   @ StatementsNode (location: (62,2)-(62,3))
-            │           │   │   │   └── body: (length: 1)
-            │           │   │   │       └── @ IntegerNode (location: (62,2)-(62,3))
-            │           │   │   │           ├── flags: decimal
-            │           │   │   │           └── value: 2
-            │           │   │   └── closing_loc: (62,3)-(62,4) = "}"
-            │           │   └── @ StringNode (location: (62,4)-(63,0))
-            │           │       ├── flags: ∅
-            │           │       ├── opening_loc: ∅
-            │           │       ├── content_loc: (62,4)-(63,0) = "\n"
-            │           │       ├── closing_loc: ∅
-            │           │       └── unescaped: "\n"
-            │           └── closing_loc: (63,0)-(64,0) = "B\n"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/defined.txt b/test/mri/prism/snapshots/defined.txt
deleted file mode 100644
index 53a5081811c..00000000000
--- a/test/mri/prism/snapshots/defined.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-@ ProgramNode (location: (1,0)-(10,1))
-├── locals: [:x]
-└── statements:
-    @ StatementsNode (location: (1,0)-(10,1))
-    └── body: (length: 5)
-        ├── @ AndNode (location: (1,0)-(1,25))
-        │   ├── left:
-        │   │   @ DefinedNode (location: (1,0)-(1,10))
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── value:
-        │   │   │   @ IntegerNode (location: (1,9)-(1,10))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── rparen_loc: ∅
-        │   │   └── keyword_loc: (1,0)-(1,8) = "defined?"
-        │   ├── right:
-        │   │   @ DefinedNode (location: (1,15)-(1,25))
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── value:
-        │   │   │   @ IntegerNode (location: (1,24)-(1,25))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   ├── rparen_loc: ∅
-        │   │   └── keyword_loc: (1,15)-(1,23) = "defined?"
-        │   └── operator_loc: (1,11)-(1,14) = "and"
-        ├── @ DefinedNode (location: (3,0)-(3,16))
-        │   ├── lparen_loc: (3,8)-(3,9) = "("
-        │   ├── value:
-        │   │   @ LocalVariableOperatorWriteNode (location: (3,9)-(3,15))
-        │   │   ├── name_loc: (3,9)-(3,10) = "x"
-        │   │   ├── operator_loc: (3,11)-(3,13) = "%="
-        │   │   ├── value:
-        │   │   │   @ IntegerNode (location: (3,14)-(3,15))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   ├── name: :x
-        │   │   ├── operator: :%
-        │   │   └── depth: 0
-        │   ├── rparen_loc: (3,15)-(3,16) = ")"
-        │   └── keyword_loc: (3,0)-(3,8) = "defined?"
-        ├── @ DefinedNode (location: (5,0)-(5,21))
-        │   ├── lparen_loc: (5,8)-(5,9) = "("
-        │   ├── value:
-        │   │   @ AndNode (location: (5,9)-(5,20))
-        │   │   ├── left:
-        │   │   │   @ CallNode (location: (5,9)-(5,12))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (5,9)-(5,12) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (5,17)-(5,20))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (5,17)-(5,20) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (5,13)-(5,16) = "and"
-        │   ├── rparen_loc: (5,20)-(5,21) = ")"
-        │   └── keyword_loc: (5,0)-(5,8) = "defined?"
-        ├── @ DefinedNode (location: (7,0)-(7,10))
-        │   ├── lparen_loc: ∅
-        │   ├── value:
-        │   │   @ IntegerNode (location: (7,9)-(7,10))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── rparen_loc: ∅
-        │   └── keyword_loc: (7,0)-(7,8) = "defined?"
-        └── @ DefinedNode (location: (9,0)-(10,1))
-            ├── lparen_loc: (9,8)-(9,9) = "("
-            ├── value:
-            │   @ StringNode (location: (9,9)-(9,14))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (9,9)-(9,10) = "\""
-            │   ├── content_loc: (9,10)-(9,13) = "foo"
-            │   ├── closing_loc: (9,13)-(9,14) = "\""
-            │   └── unescaped: "foo"
-            ├── rparen_loc: (10,0)-(10,1) = ")"
-            └── keyword_loc: (9,0)-(9,8) = "defined?"
diff --git a/test/mri/prism/snapshots/dos_endings.txt b/test/mri/prism/snapshots/dos_endings.txt
deleted file mode 100644
index ed75b8a52fd..00000000000
--- a/test/mri/prism/snapshots/dos_endings.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-@ ProgramNode (location: (1,0)-(17,20))
-├── locals: [:x, :a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(17,20))
-    └── body: (length: 5)
-        ├── @ CallNode (location: (1,0)-(2,12))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :puts
-        │   ├── message_loc: (1,0)-(1,4) = "puts"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,5)-(2,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (1,5)-(2,12))
-        │   │           ├── opening_loc: ∅
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (1,5)-(1,9))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: (1,5)-(1,6) = "\""
-        │   │           │   │   ├── content_loc: (1,6)-(1,8) = "hi"
-        │   │           │   │   ├── closing_loc: (1,8)-(1,9) = "\""
-        │   │           │   │   └── unescaped: "hi"
-        │   │           │   └── @ StringNode (location: (2,5)-(2,12))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: (2,5)-(2,6) = "\""
-        │   │           │       ├── content_loc: (2,6)-(2,11) = "there"
-        │   │           │       ├── closing_loc: (2,11)-(2,12) = "\""
-        │   │           │       └── unescaped: "there"
-        │   │           └── closing_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ ArrayNode (location: (4,0)-(5,2))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ SymbolNode (location: (4,3)-(5,1))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (4,3)-(5,1) = "a\\\r\nb"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a\nb"
-        │   ├── opening_loc: (4,0)-(4,3) = "%I{"
-        │   └── closing_loc: (5,1)-(5,2) = "}"
-        ├── @ StringNode (location: (7,0)-(7,4))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (7,0)-(7,4) = "<<-E"
-        │   ├── content_loc: (8,0)-(11,0) = "    1 \\\r\n    2\r\n    3\r\n"
-        │   ├── closing_loc: (11,0)-(12,0) = "E\r\n"
-        │   └── unescaped: "    1     2\r\n    3\r\n"
-        ├── @ LocalVariableWriteNode (location: (13,0)-(15,0))
-        │   ├── name: :x
-        │   ├── depth: 0
-        │   ├── name_loc: (13,0)-(13,1) = "x"
-        │   ├── value:
-        │   │   @ StringNode (location: (13,4)-(15,0))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (13,4)-(14,0) = "%\r\n"
-        │   │   ├── content_loc: (14,0)-(14,0) = ""
-        │   │   ├── closing_loc: (14,0)-(15,0) = "\r\n"
-        │   │   └── unescaped: ""
-        │   └── operator_loc: (13,2)-(13,3) = "="
-        └── @ LocalVariableWriteNode (location: (17,0)-(17,20))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (17,0)-(17,1) = "a"
-            ├── value:
-            │   @ CallNode (location: (17,4)-(17,20))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (17,4)-(17,7) = "foo"
-            │   ├── opening_loc: (17,7)-(17,8) = "("
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (17,8)-(17,19))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (17,8)-(17,19))
-            │   │           ├── flags: ∅
-            │   │           ├── receiver:
-            │   │           │   @ InterpolatedStringNode (location: (17,8)-(17,14))
-            │   │           │   ├── opening_loc: (17,8)-(17,14) = "<<~EOF"
-            │   │           │   ├── parts: (length: 2)
-            │   │           │   │   ├── @ StringNode (location: (18,0)-(19,0))
-            │   │           │   │   │   ├── flags: ∅
-            │   │           │   │   │   ├── opening_loc: ∅
-            │   │           │   │   │   ├── content_loc: (18,0)-(19,0) = "\r\n"
-            │   │           │   │   │   ├── closing_loc: ∅
-            │   │           │   │   │   └── unescaped: "\n"
-            │   │           │   │   └── @ StringNode (location: (19,0)-(20,0))
-            │   │           │   │       ├── flags: ∅
-            │   │           │   │       ├── opening_loc: ∅
-            │   │           │   │       ├── content_loc: (19,0)-(20,0) = "    baz\r\n"
-            │   │           │   │       ├── closing_loc: ∅
-            │   │           │   │       └── unescaped: "baz\r\n"
-            │   │           │   └── closing_loc: (20,0)-(21,0) = "  EOF\r\n"
-            │   │           ├── call_operator_loc: (17,14)-(17,15) = "."
-            │   │           ├── name: :chop
-            │   │           ├── message_loc: (17,15)-(17,19) = "chop"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: (17,19)-(17,20) = ")"
-            │   └── block: ∅
-            └── operator_loc: (17,2)-(17,3) = "="
diff --git a/test/mri/prism/snapshots/dstring.txt b/test/mri/prism/snapshots/dstring.txt
deleted file mode 100644
index ad395f8a8eb..00000000000
--- a/test/mri/prism/snapshots/dstring.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-@ ProgramNode (location: (1,0)-(29,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(29,1))
-    └── body: (length: 8)
-        ├── @ StringNode (location: (1,0)-(2,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── content_loc: (1,1)-(2,5) = "foo\n  bar"
-        │   ├── closing_loc: (2,5)-(2,6) = "\""
-        │   └── unescaped: "foo\n  bar"
-        ├── @ InterpolatedStringNode (location: (4,0)-(5,9))
-        │   ├── opening_loc: (4,0)-(4,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (4,1)-(5,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (4,1)-(5,2) = "foo\n  "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo\n  "
-        │   │   └── @ EmbeddedStatementsNode (location: (5,2)-(5,8))
-        │   │       ├── opening_loc: (5,2)-(5,4) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (5,4)-(5,7))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (5,4)-(5,7))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :bar
-        │   │       │           ├── message_loc: (5,4)-(5,7) = "bar"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       └── closing_loc: (5,7)-(5,8) = "}"
-        │   └── closing_loc: (5,8)-(5,9) = "\""
-        ├── @ InterpolatedStringNode (location: (7,0)-(9,2))
-        │   ├── opening_loc: ∅
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (7,0)-(8,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (7,0)-(7,1) = "\""
-        │   │   │   ├── content_loc: (7,1)-(8,1) = "fo\no"
-        │   │   │   ├── closing_loc: (8,1)-(8,2) = "\""
-        │   │   │   └── unescaped: "fo\no"
-        │   │   └── @ StringNode (location: (8,3)-(9,2))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (8,3)-(8,4) = "\""
-        │   │       ├── content_loc: (8,4)-(9,1) = "ba\nr"
-        │   │       ├── closing_loc: (9,1)-(9,2) = "\""
-        │   │       └── unescaped: "ba\nr"
-        │   └── closing_loc: ∅
-        ├── @ StringNode (location: (11,0)-(13,1))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (11,0)-(11,1) = "\""
-        │   ├── content_loc: (11,1)-(13,0) = "\nfoo\\\n"
-        │   ├── closing_loc: (13,0)-(13,1) = "\""
-        │   └── unescaped: "\nfoo"
-        ├── @ StringNode (location: (15,0)-(17,1))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (15,0)-(15,1) = "\""
-        │   ├── content_loc: (15,1)-(17,0) = "\nfoo\\\\\n"
-        │   ├── closing_loc: (17,0)-(17,1) = "\""
-        │   └── unescaped: "\nfoo\\\n"
-        ├── @ StringNode (location: (19,0)-(21,1))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (19,0)-(19,1) = "\""
-        │   ├── content_loc: (19,1)-(21,0) = "\nfoo\\\\\\\n"
-        │   ├── closing_loc: (21,0)-(21,1) = "\""
-        │   └── unescaped: "\nfoo\\"
-        ├── @ StringNode (location: (23,0)-(25,1))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (23,0)-(23,1) = "\""
-        │   ├── content_loc: (23,1)-(25,0) = "\nfoo\\\\\\\\\n"
-        │   ├── closing_loc: (25,0)-(25,1) = "\""
-        │   └── unescaped: "\nfoo\\\\\n"
-        └── @ StringNode (location: (27,0)-(29,1))
-            ├── flags: ∅
-            ├── opening_loc: (27,0)-(27,1) = "\""
-            ├── content_loc: (27,1)-(29,0) = "\nfoo\\\\\\\\\\\n"
-            ├── closing_loc: (29,0)-(29,1) = "\""
-            └── unescaped: "\nfoo\\\\"
diff --git a/test/mri/prism/snapshots/dsym_str.txt b/test/mri/prism/snapshots/dsym_str.txt
deleted file mode 100644
index 33a5e2da21c..00000000000
--- a/test/mri/prism/snapshots/dsym_str.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,6))
-    └── body: (length: 1)
-        └── @ SymbolNode (location: (1,0)-(2,6))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (1,0)-(1,2) = ":\""
-            ├── value_loc: (1,2)-(2,5) = "foo\n  bar"
-            ├── closing_loc: (2,5)-(2,6) = "\""
-            └── unescaped: "foo\n  bar"
diff --git a/test/mri/prism/snapshots/embdoc_no_newline_at_end.txt b/test/mri/prism/snapshots/embdoc_no_newline_at_end.txt
deleted file mode 100644
index 3a21ce5559c..00000000000
--- a/test/mri/prism/snapshots/embdoc_no_newline_at_end.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,0))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,0))
-    └── body: (length: 0)
diff --git a/test/mri/prism/snapshots/emoji_method_calls.txt b/test/mri/prism/snapshots/emoji_method_calls.txt
deleted file mode 100644
index 8f71181ac15..00000000000
--- a/test/mri/prism/snapshots/emoji_method_calls.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,3)-(1,4) = "."
-            ├── name: :🌊=
-            ├── message_loc: (1,4)-(1,8) = "🌊"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,11)-(1,12))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,11)-(1,12))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/endless_methods.txt b/test/mri/prism/snapshots/endless_methods.txt
deleted file mode 100644
index 6e20c0deec6..00000000000
--- a/test/mri/prism/snapshots/endless_methods.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,22))
-    └── body: (length: 3)
-        ├── @ DefNode (location: (1,0)-(1,11))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,10)-(1,11))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,10)-(1,11))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (1,8)-(1,9) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (3,0)-(3,14))
-        │   ├── name: :bar
-        │   ├── name_loc: (3,4)-(3,7) = "bar"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,10)-(3,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (3,10)-(3,14))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :A
-        │   │           ├── message_loc: (3,10)-(3,11) = "A"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (3,12)-(3,14))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ StringNode (location: (3,12)-(3,14))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── opening_loc: (3,12)-(3,13) = "\""
-        │   │           │           ├── content_loc: (3,13)-(3,13) = ""
-        │   │           │           ├── closing_loc: (3,13)-(3,14) = "\""
-        │   │           │           └── unescaped: ""
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (3,8)-(3,9) = "="
-        │   └── end_keyword_loc: ∅
-        └── @ DefNode (location: (5,0)-(5,22))
-            ├── name: :method
-            ├── name_loc: (5,4)-(5,10) = "method"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (5,13)-(5,22))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (5,13)-(5,22))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ CallNode (location: (5,13)-(5,18))
-            │           │   ├── flags: ∅
-            │           │   ├── receiver:
-            │           │   │   @ IntegerNode (location: (5,13)-(5,14))
-            │           │   │   ├── flags: decimal
-            │           │   │   └── value: 1
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :+
-            │           │   ├── message_loc: (5,15)-(5,16) = "+"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments:
-            │           │   │   @ ArgumentsNode (location: (5,17)-(5,18))
-            │           │   │   ├── flags: ∅
-            │           │   │   └── arguments: (length: 1)
-            │           │   │       └── @ IntegerNode (location: (5,17)-(5,18))
-            │           │   │           ├── flags: decimal
-            │           │   │           └── value: 2
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :+
-            │           ├── message_loc: (5,19)-(5,20) = "+"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (5,21)-(5,22))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ IntegerNode (location: (5,21)-(5,22))
-            │           │           ├── flags: decimal
-            │           │           └── value: 3
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (5,0)-(5,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: (5,11)-(5,12) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/endless_range_in_conditional.txt b/test/mri/prism/snapshots/endless_range_in_conditional.txt
deleted file mode 100644
index 1802c4faed6..00000000000
--- a/test/mri/prism/snapshots/endless_range_in_conditional.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,12))
-    └── body: (length: 3)
-        ├── @ IfNode (location: (1,0)-(1,13))
-        │   ├── if_keyword_loc: (1,0)-(1,2) = "if"
-        │   ├── predicate:
-        │   │   @ FlipFlopNode (location: (1,3)-(1,7))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (1,3)-(1,4))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (1,6)-(1,7))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   └── operator_loc: (1,4)-(1,6) = ".."
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (1,10)-(1,13) = "end"
-        ├── @ IfNode (location: (2,0)-(2,12))
-        │   ├── if_keyword_loc: (2,0)-(2,2) = "if"
-        │   ├── predicate:
-        │   │   @ FlipFlopNode (location: (2,3)-(2,6))
-        │   │   ├── flags: ∅
-        │   │   ├── left: ∅
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (2,5)-(2,6))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── operator_loc: (2,3)-(2,5) = ".."
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (2,9)-(2,12) = "end"
-        └── @ IfNode (location: (3,0)-(3,12))
-            ├── if_keyword_loc: (3,0)-(3,2) = "if"
-            ├── predicate:
-            │   @ FlipFlopNode (location: (3,3)-(3,6))
-            │   ├── flags: ∅
-            │   ├── left:
-            │   │   @ IntegerNode (location: (3,3)-(3,4))
-            │   │   ├── flags: decimal
-            │   │   └── value: 1
-            │   ├── right: ∅
-            │   └── operator_loc: (3,4)-(3,6) = ".."
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (3,9)-(3,12) = "end"
diff --git a/test/mri/prism/snapshots/for.txt b/test/mri/prism/snapshots/for.txt
deleted file mode 100644
index cc4bbc1166f..00000000000
--- a/test/mri/prism/snapshots/for.txt
+++ /dev/null
@@ -1,188 +0,0 @@
-@ ProgramNode (location: (1,0)-(19,22))
-├── locals: [:i, :j, :k]
-└── statements:
-    @ StatementsNode (location: (1,0)-(19,22))
-    └── body: (length: 6)
-        ├── @ ForNode (location: (1,0)-(3,3))
-        │   ├── index:
-        │   │   @ LocalVariableTargetNode (location: (1,4)-(1,5))
-        │   │   ├── name: :i
-        │   │   └── depth: 0
-        │   ├── collection:
-        │   │   @ RangeNode (location: (1,9)-(1,14))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (1,9)-(1,10))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (1,12)-(1,14))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 10
-        │   │   └── operator_loc: (1,10)-(1,12) = ".."
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (2,0)-(2,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (2,0)-(2,1))
-        │   │           ├── name: :i
-        │   │           └── depth: 0
-        │   ├── for_keyword_loc: (1,0)-(1,3) = "for"
-        │   ├── in_keyword_loc: (1,6)-(1,8) = "in"
-        │   ├── do_keyword_loc: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        ├── @ ForNode (location: (5,0)-(5,22))
-        │   ├── index:
-        │   │   @ LocalVariableTargetNode (location: (5,4)-(5,5))
-        │   │   ├── name: :i
-        │   │   └── depth: 0
-        │   ├── collection:
-        │   │   @ RangeNode (location: (5,9)-(5,14))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (5,9)-(5,10))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (5,12)-(5,14))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 10
-        │   │   └── operator_loc: (5,10)-(5,12) = ".."
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (5,16)-(5,17))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (5,16)-(5,17))
-        │   │           ├── name: :i
-        │   │           └── depth: 0
-        │   ├── for_keyword_loc: (5,0)-(5,3) = "for"
-        │   ├── in_keyword_loc: (5,6)-(5,8) = "in"
-        │   ├── do_keyword_loc: ∅
-        │   └── end_keyword_loc: (5,19)-(5,22) = "end"
-        ├── @ ForNode (location: (7,0)-(9,3))
-        │   ├── index:
-        │   │   @ MultiTargetNode (location: (7,4)-(7,7))
-        │   │   ├── lefts: (length: 2)
-        │   │   │   ├── @ LocalVariableTargetNode (location: (7,4)-(7,5))
-        │   │   │   │   ├── name: :i
-        │   │   │   │   └── depth: 0
-        │   │   │   └── @ LocalVariableTargetNode (location: (7,6)-(7,7))
-        │   │   │       ├── name: :j
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── rights: (length: 0)
-        │   │   ├── lparen_loc: ∅
-        │   │   └── rparen_loc: ∅
-        │   ├── collection:
-        │   │   @ RangeNode (location: (7,11)-(7,16))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (7,11)-(7,12))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (7,14)-(7,16))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 10
-        │   │   └── operator_loc: (7,12)-(7,14) = ".."
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (8,0)-(8,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (8,0)-(8,1))
-        │   │           ├── name: :i
-        │   │           └── depth: 0
-        │   ├── for_keyword_loc: (7,0)-(7,3) = "for"
-        │   ├── in_keyword_loc: (7,8)-(7,10) = "in"
-        │   ├── do_keyword_loc: ∅
-        │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-        ├── @ ForNode (location: (11,0)-(13,3))
-        │   ├── index:
-        │   │   @ MultiTargetNode (location: (11,4)-(11,9))
-        │   │   ├── lefts: (length: 3)
-        │   │   │   ├── @ LocalVariableTargetNode (location: (11,4)-(11,5))
-        │   │   │   │   ├── name: :i
-        │   │   │   │   └── depth: 0
-        │   │   │   ├── @ LocalVariableTargetNode (location: (11,6)-(11,7))
-        │   │   │   │   ├── name: :j
-        │   │   │   │   └── depth: 0
-        │   │   │   └── @ LocalVariableTargetNode (location: (11,8)-(11,9))
-        │   │   │       ├── name: :k
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── rights: (length: 0)
-        │   │   ├── lparen_loc: ∅
-        │   │   └── rparen_loc: ∅
-        │   ├── collection:
-        │   │   @ RangeNode (location: (11,13)-(11,18))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (11,13)-(11,14))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (11,16)-(11,18))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 10
-        │   │   └── operator_loc: (11,14)-(11,16) = ".."
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (12,0)-(12,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (12,0)-(12,1))
-        │   │           ├── name: :i
-        │   │           └── depth: 0
-        │   ├── for_keyword_loc: (11,0)-(11,3) = "for"
-        │   ├── in_keyword_loc: (11,10)-(11,12) = "in"
-        │   ├── do_keyword_loc: ∅
-        │   └── end_keyword_loc: (13,0)-(13,3) = "end"
-        ├── @ ForNode (location: (15,0)-(17,3))
-        │   ├── index:
-        │   │   @ LocalVariableTargetNode (location: (15,4)-(15,5))
-        │   │   ├── name: :i
-        │   │   └── depth: 0
-        │   ├── collection:
-        │   │   @ RangeNode (location: (15,9)-(15,14))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (15,9)-(15,10))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (15,12)-(15,14))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 10
-        │   │   └── operator_loc: (15,10)-(15,12) = ".."
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (16,0)-(16,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (16,0)-(16,1))
-        │   │           ├── name: :i
-        │   │           └── depth: 0
-        │   ├── for_keyword_loc: (15,0)-(15,3) = "for"
-        │   ├── in_keyword_loc: (15,6)-(15,8) = "in"
-        │   ├── do_keyword_loc: (15,15)-(15,17) = "do"
-        │   └── end_keyword_loc: (17,0)-(17,3) = "end"
-        └── @ ForNode (location: (19,0)-(19,22))
-            ├── index:
-            │   @ LocalVariableTargetNode (location: (19,4)-(19,5))
-            │   ├── name: :i
-            │   └── depth: 0
-            ├── collection:
-            │   @ RangeNode (location: (19,9)-(19,14))
-            │   ├── flags: ∅
-            │   ├── left:
-            │   │   @ IntegerNode (location: (19,9)-(19,10))
-            │   │   ├── flags: decimal
-            │   │   └── value: 1
-            │   ├── right:
-            │   │   @ IntegerNode (location: (19,12)-(19,14))
-            │   │   ├── flags: decimal
-            │   │   └── value: 10
-            │   └── operator_loc: (19,10)-(19,12) = ".."
-            ├── statements:
-            │   @ StatementsNode (location: (19,16)-(19,17))
-            │   └── body: (length: 1)
-            │       └── @ LocalVariableReadNode (location: (19,16)-(19,17))
-            │           ├── name: :i
-            │           └── depth: 0
-            ├── for_keyword_loc: (19,0)-(19,3) = "for"
-            ├── in_keyword_loc: (19,6)-(19,8) = "in"
-            ├── do_keyword_loc: ∅
-            └── end_keyword_loc: (19,19)-(19,22) = "end"
diff --git a/test/mri/prism/snapshots/global_variables.txt b/test/mri/prism/snapshots/global_variables.txt
deleted file mode 100644
index 9f775ed80d3..00000000000
--- a/test/mri/prism/snapshots/global_variables.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-@ ProgramNode (location: (1,0)-(93,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(93,4))
-    └── body: (length: 47)
-        ├── @ GlobalVariableReadNode (location: (1,0)-(1,16))
-        │   └── name: :$global_variable
-        ├── @ GlobalVariableReadNode (location: (3,0)-(3,2))
-        │   └── name: :$_
-        ├── @ GlobalVariableReadNode (location: (5,0)-(5,3))
-        │   └── name: :$-w
-        ├── @ GlobalVariableReadNode (location: (7,0)-(7,10))
-        │   └── name: :$LOAD_PATH
-        ├── @ GlobalVariableReadNode (location: (9,0)-(9,6))
-        │   └── name: :$stdin
-        ├── @ GlobalVariableReadNode (location: (11,0)-(11,7))
-        │   └── name: :$stdout
-        ├── @ GlobalVariableReadNode (location: (13,0)-(13,7))
-        │   └── name: :$stderr
-        ├── @ GlobalVariableReadNode (location: (15,0)-(15,2))
-        │   └── name: :$!
-        ├── @ GlobalVariableReadNode (location: (17,0)-(17,2))
-        │   └── name: :$?
-        ├── @ GlobalVariableReadNode (location: (19,0)-(19,2))
-        │   └── name: :$~
-        ├── @ BackReferenceReadNode (location: (21,0)-(21,2))
-        │   └── name: :$&
-        ├── @ BackReferenceReadNode (location: (23,0)-(23,2))
-        │   └── name: :$`
-        ├── @ BackReferenceReadNode (location: (25,0)-(25,2))
-        │   └── name: :$'
-        ├── @ BackReferenceReadNode (location: (27,0)-(27,2))
-        │   └── name: :$+
-        ├── @ GlobalVariableReadNode (location: (29,0)-(29,2))
-        │   └── name: :$:
-        ├── @ GlobalVariableReadNode (location: (31,0)-(31,2))
-        │   └── name: :$;
-        ├── @ GlobalVariableReadNode (location: (33,0)-(33,2))
-        │   └── name: :$,
-        ├── @ GlobalVariableReadNode (location: (35,0)-(35,6))
-        │   └── name: :$DEBUG
-        ├── @ GlobalVariableReadNode (location: (37,0)-(37,9))
-        │   └── name: :$FILENAME
-        ├── @ GlobalVariableReadNode (location: (39,0)-(39,2))
-        │   └── name: :$0
-        ├── @ GlobalVariableReadNode (location: (41,0)-(41,3))
-        │   └── name: :$-0
-        ├── @ GlobalVariableReadNode (location: (43,0)-(43,16))
-        │   └── name: :$LOADED_FEATURES
-        ├── @ GlobalVariableReadNode (location: (45,0)-(45,8))
-        │   └── name: :$VERBOSE
-        ├── @ GlobalVariableReadNode (location: (47,0)-(47,3))
-        │   └── name: :$-K
-        ├── @ SymbolNode (location: (49,0)-(49,17))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (49,0)-(49,1) = ":"
-        │   ├── value_loc: (49,1)-(49,17) = "$global_variable"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$global_variable"
-        ├── @ SymbolNode (location: (51,0)-(51,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (51,0)-(51,1) = ":"
-        │   ├── value_loc: (51,1)-(51,3) = "$_"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$_"
-        ├── @ SymbolNode (location: (53,0)-(53,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (53,0)-(53,1) = ":"
-        │   ├── value_loc: (53,1)-(53,4) = "$-w"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$-w"
-        ├── @ SymbolNode (location: (55,0)-(55,11))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (55,0)-(55,1) = ":"
-        │   ├── value_loc: (55,1)-(55,11) = "$LOAD_PATH"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$LOAD_PATH"
-        ├── @ SymbolNode (location: (57,0)-(57,7))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (57,0)-(57,1) = ":"
-        │   ├── value_loc: (57,1)-(57,7) = "$stdin"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$stdin"
-        ├── @ SymbolNode (location: (59,0)-(59,8))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (59,0)-(59,1) = ":"
-        │   ├── value_loc: (59,1)-(59,8) = "$stdout"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$stdout"
-        ├── @ SymbolNode (location: (61,0)-(61,8))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (61,0)-(61,1) = ":"
-        │   ├── value_loc: (61,1)-(61,8) = "$stderr"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$stderr"
-        ├── @ SymbolNode (location: (63,0)-(63,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (63,0)-(63,1) = ":"
-        │   ├── value_loc: (63,1)-(63,3) = "$!"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$!"
-        ├── @ SymbolNode (location: (65,0)-(65,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (65,0)-(65,1) = ":"
-        │   ├── value_loc: (65,1)-(65,3) = "$?"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$?"
-        ├── @ SymbolNode (location: (67,0)-(67,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (67,0)-(67,1) = ":"
-        │   ├── value_loc: (67,1)-(67,3) = "$~"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$~"
-        ├── @ SymbolNode (location: (69,0)-(69,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (69,0)-(69,1) = ":"
-        │   ├── value_loc: (69,1)-(69,3) = "$&"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$&"
-        ├── @ SymbolNode (location: (71,0)-(71,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (71,0)-(71,1) = ":"
-        │   ├── value_loc: (71,1)-(71,3) = "$`"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$`"
-        ├── @ SymbolNode (location: (73,0)-(73,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (73,0)-(73,1) = ":"
-        │   ├── value_loc: (73,1)-(73,3) = "$'"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$'"
-        ├── @ SymbolNode (location: (75,0)-(75,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (75,0)-(75,1) = ":"
-        │   ├── value_loc: (75,1)-(75,3) = "$+"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$+"
-        ├── @ SymbolNode (location: (77,0)-(77,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (77,0)-(77,1) = ":"
-        │   ├── value_loc: (77,1)-(77,3) = "$:"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$:"
-        ├── @ SymbolNode (location: (79,0)-(79,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (79,0)-(79,1) = ":"
-        │   ├── value_loc: (79,1)-(79,3) = "$;"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$;"
-        ├── @ SymbolNode (location: (81,0)-(81,7))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (81,0)-(81,1) = ":"
-        │   ├── value_loc: (81,1)-(81,7) = "$DEBUG"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$DEBUG"
-        ├── @ SymbolNode (location: (83,0)-(83,10))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (83,0)-(83,1) = ":"
-        │   ├── value_loc: (83,1)-(83,10) = "$FILENAME"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$FILENAME"
-        ├── @ SymbolNode (location: (85,0)-(85,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (85,0)-(85,1) = ":"
-        │   ├── value_loc: (85,1)-(85,3) = "$0"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$0"
-        ├── @ SymbolNode (location: (87,0)-(87,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (87,0)-(87,1) = ":"
-        │   ├── value_loc: (87,1)-(87,4) = "$-0"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$-0"
-        ├── @ SymbolNode (location: (89,0)-(89,17))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (89,0)-(89,1) = ":"
-        │   ├── value_loc: (89,1)-(89,17) = "$LOADED_FEATURES"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$LOADED_FEATURES"
-        ├── @ SymbolNode (location: (91,0)-(91,9))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (91,0)-(91,1) = ":"
-        │   ├── value_loc: (91,1)-(91,9) = "$VERBOSE"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$VERBOSE"
-        └── @ SymbolNode (location: (93,0)-(93,4))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (93,0)-(93,1) = ":"
-            ├── value_loc: (93,1)-(93,4) = "$-K"
-            ├── closing_loc: ∅
-            └── unescaped: "$-K"
diff --git a/test/mri/prism/snapshots/hashes.txt b/test/mri/prism/snapshots/hashes.txt
deleted file mode 100644
index 7a3ac4b0eaa..00000000000
--- a/test/mri/prism/snapshots/hashes.txt
+++ /dev/null
@@ -1,384 +0,0 @@
-@ ProgramNode (location: (1,0)-(28,9))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(28,9))
-    └── body: (length: 10)
-        ├── @ HashNode (location: (1,0)-(1,2))
-        │   ├── opening_loc: (1,0)-(1,1) = "{"
-        │   ├── elements: (length: 0)
-        │   └── closing_loc: (1,1)-(1,2) = "}"
-        ├── @ HashNode (location: (3,0)-(4,1))
-        │   ├── opening_loc: (3,0)-(3,1) = "{"
-        │   ├── elements: (length: 0)
-        │   └── closing_loc: (4,0)-(4,1) = "}"
-        ├── @ HashNode (location: (6,0)-(6,18))
-        │   ├── opening_loc: (6,0)-(6,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (6,2)-(6,8))
-        │   │   │   ├── key:
-        │   │   │   │   @ CallNode (location: (6,2)-(6,3))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :a
-        │   │   │   │   ├── message_loc: (6,2)-(6,3) = "a"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (6,7)-(6,8))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── message_loc: (6,7)-(6,8) = "b"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: (6,4)-(6,6) = "=>"
-        │   │   └── @ AssocNode (location: (6,10)-(6,16))
-        │   │       ├── key:
-        │   │       │   @ CallNode (location: (6,10)-(6,11))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :c
-        │   │       │   ├── message_loc: (6,10)-(6,11) = "c"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       ├── value:
-        │   │       │   @ CallNode (location: (6,15)-(6,16))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :d
-        │   │       │   ├── message_loc: (6,15)-(6,16) = "d"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── operator_loc: (6,12)-(6,14) = "=>"
-        │   └── closing_loc: (6,17)-(6,18) = "}"
-        ├── @ HashNode (location: (8,0)-(8,15))
-        │   ├── opening_loc: (8,0)-(8,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (8,2)-(8,8))
-        │   │   │   ├── key:
-        │   │   │   │   @ CallNode (location: (8,2)-(8,3))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :a
-        │   │   │   │   ├── message_loc: (8,2)-(8,3) = "a"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (8,7)-(8,8))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── message_loc: (8,7)-(8,8) = "b"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: (8,4)-(8,6) = "=>"
-        │   │   └── @ AssocSplatNode (location: (8,10)-(8,13))
-        │   │       ├── value:
-        │   │       │   @ CallNode (location: (8,12)-(8,13))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :c
-        │   │       │   ├── message_loc: (8,12)-(8,13) = "c"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── operator_loc: (8,10)-(8,12) = "**"
-        │   └── closing_loc: (8,14)-(8,15) = "}"
-        ├── @ HashNode (location: (10,0)-(16,5))
-        │   ├── opening_loc: (10,0)-(10,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (11,6)-(11,10))
-        │   │   │   ├── key:
-        │   │   │   │   @ SymbolNode (location: (11,6)-(11,8))
-        │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── value_loc: (11,6)-(11,7) = "a"
-        │   │   │   │   ├── closing_loc: (11,7)-(11,8) = ":"
-        │   │   │   │   └── unescaped: "a"
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (11,9)-(11,10))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── message_loc: (11,9)-(11,10) = "b"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: ∅
-        │   │   └── @ AssocNode (location: (12,6)-(12,10))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (12,6)-(12,8))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (12,6)-(12,7) = "c"
-        │   │       │   ├── closing_loc: (12,7)-(12,8) = ":"
-        │   │       │   └── unescaped: "c"
-        │   │       ├── value:
-        │   │       │   @ CallNode (location: (12,9)-(12,10))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :d
-        │   │       │   ├── message_loc: (12,9)-(12,10) = "d"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (16,4)-(16,5) = "}"
-        ├── @ HashNode (location: (18,0)-(18,25))
-        │   ├── opening_loc: (18,0)-(18,1) = "{"
-        │   ├── elements: (length: 4)
-        │   │   ├── @ AssocNode (location: (18,2)-(18,6))
-        │   │   │   ├── key:
-        │   │   │   │   @ SymbolNode (location: (18,2)-(18,4))
-        │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── value_loc: (18,2)-(18,3) = "a"
-        │   │   │   │   ├── closing_loc: (18,3)-(18,4) = ":"
-        │   │   │   │   └── unescaped: "a"
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (18,5)-(18,6))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── message_loc: (18,5)-(18,6) = "b"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: ∅
-        │   │   ├── @ AssocNode (location: (18,8)-(18,12))
-        │   │   │   ├── key:
-        │   │   │   │   @ SymbolNode (location: (18,8)-(18,10))
-        │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── value_loc: (18,8)-(18,9) = "c"
-        │   │   │   │   ├── closing_loc: (18,9)-(18,10) = ":"
-        │   │   │   │   └── unescaped: "c"
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (18,11)-(18,12))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :d
-        │   │   │   │   ├── message_loc: (18,11)-(18,12) = "d"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: ∅
-        │   │   ├── @ AssocSplatNode (location: (18,14)-(18,17))
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (18,16)-(18,17))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :e
-        │   │   │   │   ├── message_loc: (18,16)-(18,17) = "e"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: (18,14)-(18,16) = "**"
-        │   │   └── @ AssocNode (location: (18,19)-(18,23))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (18,19)-(18,21))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (18,19)-(18,20) = "f"
-        │   │       │   ├── closing_loc: (18,20)-(18,21) = ":"
-        │   │       │   └── unescaped: "f"
-        │   │       ├── value:
-        │   │       │   @ CallNode (location: (18,22)-(18,23))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :g
-        │   │       │   ├── message_loc: (18,22)-(18,23) = "g"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (18,24)-(18,25) = "}"
-        ├── @ HashNode (location: (20,0)-(20,12))
-        │   ├── opening_loc: (20,0)-(20,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (20,2)-(20,10))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (20,2)-(20,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (20,2)-(20,3) = "\""
-        │   │       │   ├── value_loc: (20,3)-(20,4) = "a"
-        │   │       │   ├── closing_loc: (20,4)-(20,6) = "\":"
-        │   │       │   └── unescaped: "a"
-        │   │       ├── value:
-        │   │       │   @ CallNode (location: (20,7)-(20,10))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── receiver:
-        │   │       │   │   @ CallNode (location: (20,8)-(20,10))
-        │   │       │   │   ├── flags: ignore_visibility
-        │   │       │   │   ├── receiver: ∅
-        │   │       │   │   ├── call_operator_loc: ∅
-        │   │       │   │   ├── name: :b?
-        │   │       │   │   ├── message_loc: (20,8)-(20,10) = "b?"
-        │   │       │   │   ├── opening_loc: ∅
-        │   │       │   │   ├── arguments: ∅
-        │   │       │   │   ├── closing_loc: ∅
-        │   │       │   │   └── block: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :!
-        │   │       │   ├── message_loc: (20,7)-(20,8) = "!"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (20,11)-(20,12) = "}"
-        ├── @ LocalVariableWriteNode (location: (22,0)-(22,5))
-        │   ├── name: :a
-        │   ├── depth: 0
-        │   ├── name_loc: (22,0)-(22,1) = "a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (22,4)-(22,5))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (22,2)-(22,3) = "="
-        ├── @ CallNode (location: (23,0)-(26,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :tap
-        │   ├── message_loc: (23,0)-(23,3) = "tap"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (23,4)-(26,3))
-        │       ├── locals: [:b]
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (24,2)-(25,20))
-        │       │   └── body: (length: 2)
-        │       │       ├── @ LocalVariableWriteNode (location: (24,2)-(24,7))
-        │       │       │   ├── name: :b
-        │       │       │   ├── depth: 0
-        │       │       │   ├── name_loc: (24,2)-(24,3) = "b"
-        │       │       │   ├── value:
-        │       │       │   │   @ IntegerNode (location: (24,6)-(24,7))
-        │       │       │   │   ├── flags: decimal
-        │       │       │   │   └── value: 1
-        │       │       │   └── operator_loc: (24,4)-(24,5) = "="
-        │       │       └── @ HashNode (location: (25,2)-(25,20))
-        │       │           ├── opening_loc: (25,2)-(25,3) = "{"
-        │       │           ├── elements: (length: 4)
-        │       │           │   ├── @ AssocNode (location: (25,4)-(25,6))
-        │       │           │   │   ├── key:
-        │       │           │   │   │   @ SymbolNode (location: (25,4)-(25,6))
-        │       │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │       │           │   │   │   ├── opening_loc: ∅
-        │       │           │   │   │   ├── value_loc: (25,4)-(25,5) = "a"
-        │       │           │   │   │   ├── closing_loc: (25,5)-(25,6) = ":"
-        │       │           │   │   │   └── unescaped: "a"
-        │       │           │   │   ├── value:
-        │       │           │   │   │   @ ImplicitNode (location: (25,4)-(25,6))
-        │       │           │   │   │   └── value:
-        │       │           │   │   │       @ LocalVariableReadNode (location: (25,4)-(25,6))
-        │       │           │   │   │       ├── name: :a
-        │       │           │   │   │       └── depth: 1
-        │       │           │   │   └── operator_loc: ∅
-        │       │           │   ├── @ AssocNode (location: (25,8)-(25,10))
-        │       │           │   │   ├── key:
-        │       │           │   │   │   @ SymbolNode (location: (25,8)-(25,10))
-        │       │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │       │           │   │   │   ├── opening_loc: ∅
-        │       │           │   │   │   ├── value_loc: (25,8)-(25,9) = "b"
-        │       │           │   │   │   ├── closing_loc: (25,9)-(25,10) = ":"
-        │       │           │   │   │   └── unescaped: "b"
-        │       │           │   │   ├── value:
-        │       │           │   │   │   @ ImplicitNode (location: (25,8)-(25,10))
-        │       │           │   │   │   └── value:
-        │       │           │   │   │       @ LocalVariableReadNode (location: (25,8)-(25,10))
-        │       │           │   │   │       ├── name: :b
-        │       │           │   │   │       └── depth: 0
-        │       │           │   │   └── operator_loc: ∅
-        │       │           │   ├── @ AssocNode (location: (25,12)-(25,14))
-        │       │           │   │   ├── key:
-        │       │           │   │   │   @ SymbolNode (location: (25,12)-(25,14))
-        │       │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │       │           │   │   │   ├── opening_loc: ∅
-        │       │           │   │   │   ├── value_loc: (25,12)-(25,13) = "c"
-        │       │           │   │   │   ├── closing_loc: (25,13)-(25,14) = ":"
-        │       │           │   │   │   └── unescaped: "c"
-        │       │           │   │   ├── value:
-        │       │           │   │   │   @ ImplicitNode (location: (25,12)-(25,14))
-        │       │           │   │   │   └── value:
-        │       │           │   │   │       @ CallNode (location: (25,12)-(25,14))
-        │       │           │   │   │       ├── flags: ignore_visibility
-        │       │           │   │   │       ├── receiver: ∅
-        │       │           │   │   │       ├── call_operator_loc: ∅
-        │       │           │   │   │       ├── name: :c
-        │       │           │   │   │       ├── message_loc: (25,12)-(25,13) = "c"
-        │       │           │   │   │       ├── opening_loc: ∅
-        │       │           │   │   │       ├── arguments: ∅
-        │       │           │   │   │       ├── closing_loc: ∅
-        │       │           │   │   │       └── block: ∅
-        │       │           │   │   └── operator_loc: ∅
-        │       │           │   └── @ AssocNode (location: (25,16)-(25,18))
-        │       │           │       ├── key:
-        │       │           │       │   @ SymbolNode (location: (25,16)-(25,18))
-        │       │           │       │   ├── flags: forced_us_ascii_encoding
-        │       │           │       │   ├── opening_loc: ∅
-        │       │           │       │   ├── value_loc: (25,16)-(25,17) = "D"
-        │       │           │       │   ├── closing_loc: (25,17)-(25,18) = ":"
-        │       │           │       │   └── unescaped: "D"
-        │       │           │       ├── value:
-        │       │           │       │   @ ImplicitNode (location: (25,16)-(25,18))
-        │       │           │       │   └── value:
-        │       │           │       │       @ ConstantReadNode (location: (25,16)-(25,18))
-        │       │           │       │       └── name: :D
-        │       │           │       └── operator_loc: ∅
-        │       │           └── closing_loc: (25,19)-(25,20) = "}"
-        │       ├── opening_loc: (23,4)-(23,6) = "do"
-        │       └── closing_loc: (26,0)-(26,3) = "end"
-        └── @ HashNode (location: (28,0)-(28,9))
-            ├── opening_loc: (28,0)-(28,1) = "{"
-            ├── elements: (length: 1)
-            │   └── @ AssocNode (location: (28,2)-(28,7))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (28,2)-(28,4))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: ∅
-            │       │   ├── value_loc: (28,2)-(28,3) = "a"
-            │       │   ├── closing_loc: (28,3)-(28,4) = ":"
-            │       │   └── unescaped: "a"
-            │       ├── value:
-            │       │   @ IntegerNode (location: (28,5)-(28,7))
-            │       │   ├── flags: decimal
-            │       │   └── value: -1
-            │       └── operator_loc: ∅
-            └── closing_loc: (28,8)-(28,9) = "}"
diff --git a/test/mri/prism/snapshots/heredoc.txt b/test/mri/prism/snapshots/heredoc.txt
deleted file mode 100644
index 3ca66dd9897..00000000000
--- a/test/mri/prism/snapshots/heredoc.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,6) = "<<TEXT"
-            ├── content_loc: (2,0)-(2,0) = ""
-            ├── closing_loc: (2,0)-(3,0) = "TEXT\n"
-            └── unescaped: ""
diff --git a/test/mri/prism/snapshots/heredoc_with_carriage_returns.txt b/test/mri/prism/snapshots/heredoc_with_carriage_returns.txt
deleted file mode 100644
index 134f8632340..00000000000
--- a/test/mri/prism/snapshots/heredoc_with_carriage_returns.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,6) = "<<TEXT"
-            ├── content_loc: (2,0)-(2,0) = ""
-            ├── closing_loc: (2,0)-(3,0) = "TEXT\r\n"
-            └── unescaped: ""
diff --git a/test/mri/prism/snapshots/heredoc_with_comment.txt b/test/mri/prism/snapshots/heredoc_with_comment.txt
deleted file mode 100644
index 117fdc117a3..00000000000
--- a/test/mri/prism/snapshots/heredoc_with_comment.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,15))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ StringNode (location: (1,0)-(1,9))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (1,0)-(1,9) = "<<-TARGET"
-            │   ├── content_loc: (2,0)-(3,0) = "  content makes for an obvious error\r\n"
-            │   ├── closing_loc: (3,0)-(3,6) = "TARGET"
-            │   └── unescaped: "  content makes for an obvious error\r\n"
-            ├── call_operator_loc: (1,9)-(1,10) = "."
-            ├── name: :chomp
-            ├── message_loc: (1,10)-(1,15) = "chomp"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/heredoc_with_escaped_newline_at_start.txt b/test/mri/prism/snapshots/heredoc_with_escaped_newline_at_start.txt
deleted file mode 100644
index acc6b082fcd..00000000000
--- a/test/mri/prism/snapshots/heredoc_with_escaped_newline_at_start.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,25))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,25))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (1,0)-(1,9))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (1,0)-(1,9) = "<<-TARGET"
-        │   │   ├── content_loc: (2,0)-(2,0) = ""
-        │   │   ├── closing_loc: (2,0)-(3,0) = "TARGET\n"
-        │   │   └── unescaped: ""
-        │   ├── call_operator_loc: (1,9)-(1,10) = "."
-        │   ├── name: :gsub
-        │   ├── message_loc: (1,10)-(1,14) = "gsub"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,15)-(1,25))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ RegularExpressionNode (location: (1,15)-(1,21))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (1,15)-(1,16) = "/"
-        │   │       │   ├── content_loc: (1,16)-(1,20) = "^\\s{"
-        │   │       │   ├── closing_loc: (1,20)-(1,21) = "/"
-        │   │       │   └── unescaped: "^\\s{"
-        │   │       └── @ StringNode (location: (1,23)-(1,25))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,23)-(1,24) = "'"
-        │   │           ├── content_loc: (1,24)-(1,24) = ""
-        │   │           ├── closing_loc: (1,24)-(1,25) = "'"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,25))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ StringNode (location: (5,0)-(5,9))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (5,0)-(5,9) = "<<-TARGET"
-            │   ├── content_loc: (6,0)-(6,0) = ""
-            │   ├── closing_loc: (6,0)-(7,0) = "TARGET\r\n"
-            │   └── unescaped: ""
-            ├── call_operator_loc: (5,9)-(5,10) = "."
-            ├── name: :gsub
-            ├── message_loc: (5,10)-(5,14) = "gsub"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (5,15)-(5,25))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ RegularExpressionNode (location: (5,15)-(5,21))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (5,15)-(5,16) = "/"
-            │       │   ├── content_loc: (5,16)-(5,20) = "^\\s{"
-            │       │   ├── closing_loc: (5,20)-(5,21) = "/"
-            │       │   └── unescaped: "^\\s{"
-            │       └── @ StringNode (location: (5,23)-(5,25))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (5,23)-(5,24) = "'"
-            │           ├── content_loc: (5,24)-(5,24) = ""
-            │           ├── closing_loc: (5,24)-(5,25) = "'"
-            │           └── unescaped: ""
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/heredoc_with_trailing_newline.txt b/test/mri/prism/snapshots/heredoc_with_trailing_newline.txt
deleted file mode 100644
index b064931aa8c..00000000000
--- a/test/mri/prism/snapshots/heredoc_with_trailing_newline.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,6) = "<<-END"
-            ├── content_loc: (2,0)-(2,0) = ""
-            ├── closing_loc: (2,0)-(2,3) = "END"
-            └── unescaped: ""
diff --git a/test/mri/prism/snapshots/heredocs_leading_whitespace.txt b/test/mri/prism/snapshots/heredocs_leading_whitespace.txt
deleted file mode 100644
index 5412f7d2907..00000000000
--- a/test/mri/prism/snapshots/heredocs_leading_whitespace.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(21,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(21,10))
-    └── body: (length: 5)
-        ├── @ StringNode (location: (1,0)-(1,10))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,10) = "<<-'  FOO'"
-        │   ├── content_loc: (2,0)-(4,0) = "a\nb\n"
-        │   ├── closing_loc: (4,0)-(5,0) = "     FOO\n"
-        │   └── unescaped: "a\nb\n"
-        ├── @ StringNode (location: (6,0)-(6,10))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (6,0)-(6,10) = "<<-\"  FOO\""
-        │   ├── content_loc: (7,0)-(9,0) = "a\nb\n"
-        │   ├── closing_loc: (9,0)-(10,0) = "     FOO\n"
-        │   └── unescaped: "a\nb\n"
-        ├── @ StringNode (location: (11,0)-(11,10))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (11,0)-(11,10) = "<<-'  FOO'"
-        │   ├── content_loc: (12,0)-(14,0) = "a\nb\n"
-        │   ├── closing_loc: (14,0)-(15,0) = "  FOO\n"
-        │   └── unescaped: "a\nb\n"
-        ├── @ InterpolatedStringNode (location: (16,0)-(16,10))
-        │   ├── opening_loc: (16,0)-(16,10) = "<<~'  FOO'"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (17,0)-(18,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (17,0)-(18,0) = "a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ StringNode (location: (18,0)-(19,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (18,0)-(19,0) = "b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (19,0)-(20,0) = "     FOO\n"
-        └── @ InterpolatedStringNode (location: (21,0)-(21,10))
-            ├── opening_loc: (21,0)-(21,10) = "<<~'  FOO'"
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (22,0)-(23,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (22,0)-(23,0) = "a\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a\n"
-            │   └── @ StringNode (location: (23,0)-(24,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (23,0)-(24,0) = "b\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "b\n"
-            └── closing_loc: (24,0)-(25,0) = "  FOO\n"
diff --git a/test/mri/prism/snapshots/heredocs_nested.txt b/test/mri/prism/snapshots/heredocs_nested.txt
deleted file mode 100644
index 1717aadbbce..00000000000
--- a/test/mri/prism/snapshots/heredocs_nested.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-@ ProgramNode (location: (1,0)-(12,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(12,4))
-    └── body: (length: 2)
-        ├── @ InterpolatedStringNode (location: (1,0)-(1,7))
-        │   ├── opening_loc: (1,0)-(1,7) = "<<~RUBY"
-        │   ├── parts: (length: 4)
-        │   │   ├── @ StringNode (location: (2,0)-(3,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (2,0)-(3,0) = "pre\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "pre\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (3,0)-(7,1))
-        │   │   │   ├── opening_loc: (3,0)-(3,2) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (4,0)-(4,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ StringNode (location: (4,0)-(4,6))
-        │   │   │   │           ├── flags: ∅
-        │   │   │   │           ├── opening_loc: (4,0)-(4,6) = "<<RUBY"
-        │   │   │   │           ├── content_loc: (5,0)-(6,0) = "  hello\n"
-        │   │   │   │           ├── closing_loc: (6,0)-(7,0) = "RUBY\n"
-        │   │   │   │           └── unescaped: "  hello\n"
-        │   │   │   └── closing_loc: (7,0)-(7,1) = "}"
-        │   │   ├── @ StringNode (location: (7,1)-(8,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (7,1)-(8,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   └── @ StringNode (location: (8,0)-(9,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (8,0)-(9,0) = "post\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "post\n"
-        │   └── closing_loc: (9,0)-(10,0) = "RUBY\n"
-        └── @ InterpolatedStringNode (location: (12,0)-(12,4))
-            ├── opening_loc: (12,0)-(12,4) = "<<-A"
-            ├── parts: (length: 2)
-            │   ├── @ EmbeddedStatementsNode (location: (13,0)-(21,1))
-            │   │   ├── opening_loc: (13,0)-(13,2) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (14,0)-(14,4))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ InterpolatedStringNode (location: (14,0)-(14,4))
-            │   │   │           ├── opening_loc: (14,0)-(14,4) = "<<-B"
-            │   │   │           ├── parts: (length: 2)
-            │   │   │           │   ├── @ EmbeddedStatementsNode (location: (15,0)-(19,1))
-            │   │   │           │   │   ├── opening_loc: (15,0)-(15,2) = "\#{"
-            │   │   │           │   │   ├── statements:
-            │   │   │           │   │   │   @ StatementsNode (location: (16,0)-(16,4))
-            │   │   │           │   │   │   └── body: (length: 1)
-            │   │   │           │   │   │       └── @ InterpolatedStringNode (location: (16,0)-(16,4))
-            │   │   │           │   │   │           ├── opening_loc: (16,0)-(16,4) = "<<-C"
-            │   │   │           │   │   │           ├── parts: (length: 2)
-            │   │   │           │   │   │           │   ├── @ EmbeddedStatementsNode (location: (17,0)-(17,4))
-            │   │   │           │   │   │           │   │   ├── opening_loc: (17,0)-(17,2) = "\#{"
-            │   │   │           │   │   │           │   │   ├── statements:
-            │   │   │           │   │   │           │   │   │   @ StatementsNode (location: (17,2)-(17,3))
-            │   │   │           │   │   │           │   │   │   └── body: (length: 1)
-            │   │   │           │   │   │           │   │   │       └── @ IntegerNode (location: (17,2)-(17,3))
-            │   │   │           │   │   │           │   │   │           ├── flags: decimal
-            │   │   │           │   │   │           │   │   │           └── value: 3
-            │   │   │           │   │   │           │   │   └── closing_loc: (17,3)-(17,4) = "}"
-            │   │   │           │   │   │           │   └── @ StringNode (location: (17,4)-(18,0))
-            │   │   │           │   │   │           │       ├── flags: ∅
-            │   │   │           │   │   │           │       ├── opening_loc: ∅
-            │   │   │           │   │   │           │       ├── content_loc: (17,4)-(18,0) = "\n"
-            │   │   │           │   │   │           │       ├── closing_loc: ∅
-            │   │   │           │   │   │           │       └── unescaped: "\n"
-            │   │   │           │   │   │           └── closing_loc: (18,0)-(19,0) = "C\n"
-            │   │   │           │   │   └── closing_loc: (19,0)-(19,1) = "}"
-            │   │   │           │   └── @ StringNode (location: (19,1)-(20,0))
-            │   │   │           │       ├── flags: ∅
-            │   │   │           │       ├── opening_loc: ∅
-            │   │   │           │       ├── content_loc: (19,1)-(20,0) = "\n"
-            │   │   │           │       ├── closing_loc: ∅
-            │   │   │           │       └── unescaped: "\n"
-            │   │   │           └── closing_loc: (20,0)-(21,0) = "B\n"
-            │   │   └── closing_loc: (21,0)-(21,1) = "}"
-            │   └── @ StringNode (location: (21,1)-(22,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (21,1)-(22,0) = "\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "\n"
-            └── closing_loc: (22,0)-(23,0) = "A\n"
diff --git a/test/mri/prism/snapshots/heredocs_with_ignored_newlines.txt b/test/mri/prism/snapshots/heredocs_with_ignored_newlines.txt
deleted file mode 100644
index cdc0b4faab9..00000000000
--- a/test/mri/prism/snapshots/heredocs_with_ignored_newlines.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,8))
-    └── body: (length: 2)
-        ├── @ StringNode (location: (1,0)-(1,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,7) = "<<-HERE"
-        │   ├── content_loc: (2,0)-(2,0) = ""
-        │   ├── closing_loc: (2,0)-(3,0) = "HERE\n"
-        │   └── unescaped: ""
-        └── @ InterpolatedStringNode (location: (4,0)-(4,8))
-            ├── opening_loc: (4,0)-(4,8) = "<<~THERE"
-            ├── parts: (length: 9)
-            │   ├── @ StringNode (location: (5,0)-(6,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (5,0)-(6,0) = "  way over\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "way over\n"
-            │   ├── @ StringNode (location: (6,0)-(7,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (6,0)-(7,0) = "  <<HERE\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "<<HERE\n"
-            │   ├── @ StringNode (location: (7,0)-(8,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (7,0)-(8,0) = "    not here\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "  not here\n"
-            │   ├── @ StringNode (location: (8,0)-(9,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (8,0)-(9,0) = "  HERE\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "HERE\n"
-            │   ├── @ StringNode (location: (9,0)-(10,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (9,0)-(10,0) = "\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "\n"
-            │   ├── @ StringNode (location: (10,0)-(11,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (10,0)-(11,0) = "  <<~BUT\\\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "<<~BUT"
-            │   ├── @ StringNode (location: (11,0)-(12,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (11,0)-(12,0) = "    but\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "  but\n"
-            │   ├── @ StringNode (location: (12,0)-(13,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (12,0)-(13,0) = "  BUT\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "BUT\n"
-            │   └── @ StringNode (location: (13,0)-(14,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (13,0)-(14,0) = "    there\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "  there\n"
-            └── closing_loc: (14,0)-(15,0) = "THERE\n"
diff --git a/test/mri/prism/snapshots/heredocs_with_ignored_newlines_and_non_empty.txt b/test/mri/prism/snapshots/heredocs_with_ignored_newlines_and_non_empty.txt
deleted file mode 100644
index df422f0c1c4..00000000000
--- a/test/mri/prism/snapshots/heredocs_with_ignored_newlines_and_non_empty.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,6) = "<<-EOE"
-            ├── content_loc: (2,0)-(4,0) = " some\n heredocs\n"
-            ├── closing_loc: (4,0)-(4,3) = "EOE"
-            └── unescaped: " some\n heredocs\n"
diff --git a/test/mri/prism/snapshots/if.txt b/test/mri/prism/snapshots/if.txt
deleted file mode 100644
index f879ed38857..00000000000
--- a/test/mri/prism/snapshots/if.txt
+++ /dev/null
@@ -1,462 +0,0 @@
-@ ProgramNode (location: (1,0)-(42,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(42,3))
-    └── body: (length: 13)
-        ├── @ IfNode (location: (1,0)-(1,15))
-        │   ├── if_keyword_loc: (1,0)-(1,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (1,3)-(1,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,9)-(1,10))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,9)-(1,10))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (1,12)-(1,15) = "end"
-        ├── @ IfNode (location: (3,0)-(4,12))
-        │   ├── if_keyword_loc: (3,0)-(3,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (3,3)-(3,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (4,0)-(4,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (4,0)-(4,1))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (4,2)-(4,12))
-        │   │   ├── else_keyword_loc: (4,2)-(4,6) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (4,7)-(4,8))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (4,7)-(4,8))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   └── end_keyword_loc: (4,9)-(4,12) = "end"
-        │   └── end_keyword_loc: (4,9)-(4,12) = "end"
-        ├── @ IfNode (location: (6,0)-(6,73))
-        │   ├── if_keyword_loc: (6,0)-(6,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (6,3)-(6,7))
-        │   ├── then_keyword_loc: (6,8)-(6,12) = "then"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (6,13)-(6,17))
-        │   │   └── body: (length: 1)
-        │   │       └── @ TrueNode (location: (6,13)-(6,17))
-        │   ├── consequent:
-        │   │   @ IfNode (location: (6,18)-(6,73))
-        │   │   ├── if_keyword_loc: (6,18)-(6,23) = "elsif"
-        │   │   ├── predicate:
-        │   │   │   @ FalseNode (location: (6,24)-(6,29))
-        │   │   ├── then_keyword_loc: (6,30)-(6,34) = "then"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (6,35)-(6,40))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ FalseNode (location: (6,35)-(6,40))
-        │   │   ├── consequent:
-        │   │   │   @ IfNode (location: (6,41)-(6,73))
-        │   │   │   ├── if_keyword_loc: (6,41)-(6,46) = "elsif"
-        │   │   │   ├── predicate:
-        │   │   │   │   @ NilNode (location: (6,47)-(6,50))
-        │   │   │   ├── then_keyword_loc: (6,51)-(6,55) = "then"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (6,56)-(6,59))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ NilNode (location: (6,56)-(6,59))
-        │   │   │   ├── consequent:
-        │   │   │   │   @ ElseNode (location: (6,60)-(6,73))
-        │   │   │   │   ├── else_keyword_loc: (6,60)-(6,64) = "else"
-        │   │   │   │   ├── statements:
-        │   │   │   │   │   @ StatementsNode (location: (6,65)-(6,69))
-        │   │   │   │   │   └── body: (length: 1)
-        │   │   │   │   │       └── @ SelfNode (location: (6,65)-(6,69))
-        │   │   │   │   └── end_keyword_loc: (6,70)-(6,73) = "end"
-        │   │   │   └── end_keyword_loc: (6,70)-(6,73) = "end"
-        │   │   └── end_keyword_loc: (6,70)-(6,73) = "end"
-        │   └── end_keyword_loc: (6,70)-(6,73) = "end"
-        ├── @ IfNode (location: (8,0)-(8,9))
-        │   ├── if_keyword_loc: (8,2)-(8,4) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (8,5)-(8,9))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (8,0)-(8,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (8,0)-(8,1))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (10,0)-(10,13))
-        │   ├── if_keyword_loc: (10,6)-(10,8) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (10,9)-(10,13))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (10,0)-(10,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ BreakNode (location: (10,0)-(10,5))
-        │   │           ├── arguments: ∅
-        │   │           └── keyword_loc: (10,0)-(10,5) = "break"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (12,0)-(12,12))
-        │   ├── if_keyword_loc: (12,5)-(12,7) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (12,8)-(12,12))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (12,0)-(12,4))
-        │   │   └── body: (length: 1)
-        │   │       └── @ NextNode (location: (12,0)-(12,4))
-        │   │           ├── arguments: ∅
-        │   │           └── keyword_loc: (12,0)-(12,4) = "next"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (14,0)-(14,14))
-        │   ├── if_keyword_loc: (14,7)-(14,9) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (14,10)-(14,14))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (14,0)-(14,6))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ReturnNode (location: (14,0)-(14,6))
-        │   │           ├── keyword_loc: (14,0)-(14,6) = "return"
-        │   │           └── arguments: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (16,0)-(16,30))
-        │   ├── if_keyword_loc: (16,0)-(16,2) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (16,3)-(16,12))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :exit_loop
-        │   │   ├── message_loc: (16,3)-(16,12) = "exit_loop"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (16,13)-(16,17) = "then"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (16,18)-(16,26))
-        │   │   └── body: (length: 1)
-        │   │       └── @ BreakNode (location: (16,18)-(16,26))
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (16,24)-(16,26))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (16,24)-(16,26))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 42
-        │   │           └── keyword_loc: (16,18)-(16,23) = "break"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (16,27)-(16,30) = "end"
-        ├── @ IfNode (location: (18,0)-(20,3))
-        │   ├── if_keyword_loc: (18,0)-(18,2) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (18,3)-(18,6))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (18,3)-(18,6) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (19,0)-(19,4) = "then"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (19,5)-(19,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (19,5)-(19,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (19,5)-(19,8) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (20,0)-(20,3) = "end"
-        ├── @ IfNode (location: (22,0)-(22,11))
-        │   ├── if_keyword_loc: (22,7)-(22,9) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (22,10)-(22,11))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :c
-        │   │   ├── message_loc: (22,10)-(22,11) = "c"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (22,0)-(22,6))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IfNode (location: (22,0)-(22,6))
-        │   │           ├── if_keyword_loc: (22,2)-(22,4) = "if"
-        │   │           ├── predicate:
-        │   │           │   @ CallNode (location: (22,5)-(22,6))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :b
-        │   │           │   ├── message_loc: (22,5)-(22,6) = "b"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── then_keyword_loc: ∅
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (22,0)-(22,1))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (22,0)-(22,1))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :a
-        │   │           │           ├── message_loc: (22,0)-(22,1) = "a"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── consequent: ∅
-        │   │           └── end_keyword_loc: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (24,0)-(27,3))
-        │   ├── if_keyword_loc: (24,0)-(24,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (24,3)-(24,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (25,2)-(25,6))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (25,2)-(25,6))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (25,2)-(25,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (25,4)-(25,6))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ KeywordHashNode (location: (25,4)-(25,6))
-        │   │           │           ├── flags: symbol_keys
-        │   │           │           └── elements: (length: 1)
-        │   │           │               └── @ AssocNode (location: (25,4)-(25,6))
-        │   │           │                   ├── key:
-        │   │           │                   │   @ SymbolNode (location: (25,4)-(25,6))
-        │   │           │                   │   ├── flags: forced_us_ascii_encoding
-        │   │           │                   │   ├── opening_loc: ∅
-        │   │           │                   │   ├── value_loc: (25,4)-(25,5) = "b"
-        │   │           │                   │   ├── closing_loc: (25,5)-(25,6) = ":"
-        │   │           │                   │   └── unescaped: "b"
-        │   │           │                   ├── value:
-        │   │           │                   │   @ ImplicitNode (location: (25,4)-(25,6))
-        │   │           │                   │   └── value:
-        │   │           │                   │       @ CallNode (location: (25,4)-(25,6))
-        │   │           │                   │       ├── flags: ignore_visibility
-        │   │           │                   │       ├── receiver: ∅
-        │   │           │                   │       ├── call_operator_loc: ∅
-        │   │           │                   │       ├── name: :b
-        │   │           │                   │       ├── message_loc: (25,4)-(25,5) = "b"
-        │   │           │                   │       ├── opening_loc: ∅
-        │   │           │                   │       ├── arguments: ∅
-        │   │           │                   │       ├── closing_loc: ∅
-        │   │           │                   │       └── block: ∅
-        │   │           │                   └── operator_loc: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (26,0)-(27,3))
-        │   │   ├── else_keyword_loc: (26,0)-(26,4) = "else"
-        │   │   ├── statements: ∅
-        │   │   └── end_keyword_loc: (27,0)-(27,3) = "end"
-        │   └── end_keyword_loc: (27,0)-(27,3) = "end"
-        ├── @ IfNode (location: (29,0)-(31,3))
-        │   ├── if_keyword_loc: (29,0)-(29,2) = "if"
-        │   ├── predicate:
-        │   │   @ MatchPredicateNode (location: (29,3)-(29,12))
-        │   │   ├── value:
-        │   │   │   @ CallNode (location: (29,3)-(29,7))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :type
-        │   │   │   ├── message_loc: (29,3)-(29,7) = "type"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── pattern:
-        │   │   │   @ IntegerNode (location: (29,11)-(29,12))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── operator_loc: (29,8)-(29,10) = "in"
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements: ∅
-        │   ├── consequent:
-        │   │   @ IfNode (location: (30,0)-(31,3))
-        │   │   ├── if_keyword_loc: (30,0)-(30,5) = "elsif"
-        │   │   ├── predicate:
-        │   │   │   @ MatchPredicateNode (location: (30,6)-(30,15))
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (30,6)-(30,10))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :type
-        │   │   │   │   ├── message_loc: (30,6)-(30,10) = "type"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── pattern:
-        │   │   │   │   @ ConstantReadNode (location: (30,14)-(30,15))
-        │   │   │   │   └── name: :B
-        │   │   │   └── operator_loc: (30,11)-(30,13) = "in"
-        │   │   ├── then_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── consequent: ∅
-        │   │   └── end_keyword_loc: (31,0)-(31,3) = "end"
-        │   └── end_keyword_loc: (31,0)-(31,3) = "end"
-        └── @ IfNode (location: (33,0)-(42,3))
-            ├── if_keyword_loc: (33,0)-(33,2) = "if"
-            ├── predicate:
-            │   @ IntegerNode (location: (33,3)-(33,4))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (34,2)-(35,5))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (34,2)-(35,5))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :lambda
-            │           ├── message_loc: (34,2)-(34,8) = "lambda"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block:
-            │               @ BlockNode (location: (34,9)-(35,5))
-            │               ├── locals: [:_]
-            │               ├── parameters:
-            │               │   @ BlockParametersNode (location: (34,12)-(34,15))
-            │               │   ├── parameters:
-            │               │   │   @ ParametersNode (location: (34,13)-(34,14))
-            │               │   │   ├── requireds: (length: 1)
-            │               │   │   │   └── @ RequiredParameterNode (location: (34,13)-(34,14))
-            │               │   │   │       ├── flags: ∅
-            │               │   │   │       └── name: :_
-            │               │   │   ├── optionals: (length: 0)
-            │               │   │   ├── rest: ∅
-            │               │   │   ├── posts: (length: 0)
-            │               │   │   ├── keywords: (length: 0)
-            │               │   │   ├── keyword_rest: ∅
-            │               │   │   └── block: ∅
-            │               │   ├── locals: (length: 0)
-            │               │   ├── opening_loc: (34,12)-(34,13) = "|"
-            │               │   └── closing_loc: (34,14)-(34,15) = "|"
-            │               ├── body: ∅
-            │               ├── opening_loc: (34,9)-(34,11) = "do"
-            │               └── closing_loc: (35,2)-(35,5) = "end"
-            ├── consequent:
-            │   @ IfNode (location: (36,0)-(42,3))
-            │   ├── if_keyword_loc: (36,0)-(36,5) = "elsif"
-            │   ├── predicate:
-            │   │   @ IntegerNode (location: (36,6)-(36,7))
-            │   │   ├── flags: decimal
-            │   │   └── value: 2
-            │   ├── then_keyword_loc: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (37,2)-(38,5))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (37,2)-(38,5))
-            │   │           ├── flags: ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :lambda
-            │   │           ├── message_loc: (37,2)-(37,8) = "lambda"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block:
-            │   │               @ BlockNode (location: (37,9)-(38,5))
-            │   │               ├── locals: [:_]
-            │   │               ├── parameters:
-            │   │               │   @ BlockParametersNode (location: (37,12)-(37,15))
-            │   │               │   ├── parameters:
-            │   │               │   │   @ ParametersNode (location: (37,13)-(37,14))
-            │   │               │   │   ├── requireds: (length: 1)
-            │   │               │   │   │   └── @ RequiredParameterNode (location: (37,13)-(37,14))
-            │   │               │   │   │       ├── flags: ∅
-            │   │               │   │   │       └── name: :_
-            │   │               │   │   ├── optionals: (length: 0)
-            │   │               │   │   ├── rest: ∅
-            │   │               │   │   ├── posts: (length: 0)
-            │   │               │   │   ├── keywords: (length: 0)
-            │   │               │   │   ├── keyword_rest: ∅
-            │   │               │   │   └── block: ∅
-            │   │               │   ├── locals: (length: 0)
-            │   │               │   ├── opening_loc: (37,12)-(37,13) = "|"
-            │   │               │   └── closing_loc: (37,14)-(37,15) = "|"
-            │   │               ├── body: ∅
-            │   │               ├── opening_loc: (37,9)-(37,11) = "do"
-            │   │               └── closing_loc: (38,2)-(38,5) = "end"
-            │   ├── consequent:
-            │   │   @ ElseNode (location: (39,0)-(42,3))
-            │   │   ├── else_keyword_loc: (39,0)-(39,4) = "else"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (40,2)-(41,5))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (40,2)-(41,5))
-            │   │   │           ├── flags: ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :lambda
-            │   │   │           ├── message_loc: (40,2)-(40,8) = "lambda"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block:
-            │   │   │               @ BlockNode (location: (40,9)-(41,5))
-            │   │   │               ├── locals: [:_]
-            │   │   │               ├── parameters:
-            │   │   │               │   @ BlockParametersNode (location: (40,12)-(40,15))
-            │   │   │               │   ├── parameters:
-            │   │   │               │   │   @ ParametersNode (location: (40,13)-(40,14))
-            │   │   │               │   │   ├── requireds: (length: 1)
-            │   │   │               │   │   │   └── @ RequiredParameterNode (location: (40,13)-(40,14))
-            │   │   │               │   │   │       ├── flags: ∅
-            │   │   │               │   │   │       └── name: :_
-            │   │   │               │   │   ├── optionals: (length: 0)
-            │   │   │               │   │   ├── rest: ∅
-            │   │   │               │   │   ├── posts: (length: 0)
-            │   │   │               │   │   ├── keywords: (length: 0)
-            │   │   │               │   │   ├── keyword_rest: ∅
-            │   │   │               │   │   └── block: ∅
-            │   │   │               │   ├── locals: (length: 0)
-            │   │   │               │   ├── opening_loc: (40,12)-(40,13) = "|"
-            │   │   │               │   └── closing_loc: (40,14)-(40,15) = "|"
-            │   │   │               ├── body: ∅
-            │   │   │               ├── opening_loc: (40,9)-(40,11) = "do"
-            │   │   │               └── closing_loc: (41,2)-(41,5) = "end"
-            │   │   └── end_keyword_loc: (42,0)-(42,3) = "end"
-            │   └── end_keyword_loc: (42,0)-(42,3) = "end"
-            └── end_keyword_loc: (42,0)-(42,3) = "end"
diff --git a/test/mri/prism/snapshots/indented_file_end.txt b/test/mri/prism/snapshots/indented_file_end.txt
deleted file mode 100644
index aa43ec5a1e0..00000000000
--- a/test/mri/prism/snapshots/indented_file_end.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,4)-(3,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,4)-(3,7))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,4)-(3,7))
-            ├── name: :hi
-            ├── name_loc: (1,8)-(1,10) = "hi"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,4)-(1,7) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (3,4)-(3,7) = "end"
diff --git a/test/mri/prism/snapshots/integer_operations.txt b/test/mri/prism/snapshots/integer_operations.txt
deleted file mode 100644
index 4660928ad26..00000000000
--- a/test/mri/prism/snapshots/integer_operations.txt
+++ /dev/null
@@ -1,635 +0,0 @@
-@ ProgramNode (location: (1,0)-(63,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(63,7))
-    └── body: (length: 32)
-        ├── @ CallNode (location: (1,0)-(1,2))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (1,1)-(1,2))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (1,0)-(1,1) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,2))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (3,1)-(3,2))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :~
-        │   ├── message_loc: (3,0)-(3,1) = "~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (5,0)-(5,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!=
-        │   ├── message_loc: (5,2)-(5,4) = "!="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,5)-(5,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,5)-(5,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (7,0)-(7,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (7,0)-(7,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!~
-        │   ├── message_loc: (7,2)-(7,4) = "!~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,5)-(7,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (7,5)-(7,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (9,0)-(9,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (9,0)-(9,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :%
-        │   ├── message_loc: (9,2)-(9,3) = "%"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,4)-(9,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (9,4)-(9,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (11,0)-(11,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (11,0)-(11,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :&
-        │   ├── message_loc: (11,2)-(11,3) = "&"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (11,4)-(11,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (11,4)-(11,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (13,0)-(13,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (13,0)-(13,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :*
-        │   ├── message_loc: (13,2)-(13,3) = "*"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (13,4)-(13,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (13,4)-(13,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (15,0)-(15,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (15,0)-(15,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :**
-        │   ├── message_loc: (15,1)-(15,3) = "**"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,3)-(15,4))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (15,3)-(15,4))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (17,0)-(17,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (17,0)-(17,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (17,2)-(17,3) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (17,4)-(17,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (17,4)-(17,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (19,0)-(19,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (19,0)-(19,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :-
-        │   ├── message_loc: (19,2)-(19,3) = "-"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (19,4)-(19,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (19,4)-(19,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (21,0)-(21,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (21,0)-(21,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :/
-        │   ├── message_loc: (21,2)-(21,3) = "/"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,4)-(21,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (21,4)-(21,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (23,0)-(23,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (23,0)-(23,3))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (23,0)-(23,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :/
-        │   │   ├── message_loc: (23,1)-(23,2) = "/"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (23,2)-(23,3))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (23,2)-(23,3))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :/
-        │   ├── message_loc: (23,3)-(23,4) = "/"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (23,4)-(23,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (23,4)-(23,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (25,0)-(25,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (25,0)-(25,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<
-        │   ├── message_loc: (25,2)-(25,3) = "<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (25,4)-(25,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (25,4)-(25,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (27,0)-(27,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (27,0)-(27,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<<
-        │   ├── message_loc: (27,2)-(27,4) = "<<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (27,5)-(27,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (27,5)-(27,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (29,0)-(29,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (29,0)-(29,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<=
-        │   ├── message_loc: (29,2)-(29,4) = "<="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (29,5)-(29,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (29,5)-(29,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (31,0)-(31,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (31,0)-(31,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<=>
-        │   ├── message_loc: (31,2)-(31,5) = "<=>"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,6)-(31,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (31,6)-(31,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (33,0)-(33,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (33,0)-(33,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :==
-        │   ├── message_loc: (33,2)-(33,4) = "=="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (33,5)-(33,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (33,5)-(33,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (35,0)-(35,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (35,0)-(35,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :===
-        │   ├── message_loc: (35,2)-(35,5) = "==="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (35,6)-(35,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (35,6)-(35,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (37,0)-(37,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (37,0)-(37,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :=~
-        │   ├── message_loc: (37,2)-(37,4) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (37,5)-(37,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (37,5)-(37,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (39,0)-(39,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (39,0)-(39,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>
-        │   ├── message_loc: (39,2)-(39,3) = ">"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (39,4)-(39,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (39,4)-(39,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (41,0)-(41,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (41,0)-(41,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>=
-        │   ├── message_loc: (41,2)-(41,4) = ">="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (41,5)-(41,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (41,5)-(41,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (43,0)-(43,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (43,0)-(43,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>>
-        │   ├── message_loc: (43,2)-(43,4) = ">>"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (43,5)-(43,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (43,5)-(43,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (45,0)-(45,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (45,0)-(45,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :^
-        │   ├── message_loc: (45,2)-(45,3) = "^"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (45,4)-(45,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (45,4)-(45,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (47,0)-(47,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (47,0)-(47,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :|
-        │   ├── message_loc: (47,2)-(47,3) = "|"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (47,4)-(47,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (47,4)-(47,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ AndNode (location: (49,0)-(49,6))
-        │   ├── left:
-        │   │   @ IntegerNode (location: (49,0)-(49,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ IntegerNode (location: (49,5)-(49,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   └── operator_loc: (49,2)-(49,4) = "&&"
-        ├── @ AndNode (location: (51,0)-(51,7))
-        │   ├── left:
-        │   │   @ IntegerNode (location: (51,0)-(51,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ IntegerNode (location: (51,6)-(51,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   └── operator_loc: (51,2)-(51,5) = "and"
-        ├── @ CallNode (location: (53,0)-(53,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (53,0)-(53,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :*
-        │   ├── message_loc: (53,2)-(53,3) = "*"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (53,4)-(53,10))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (53,4)-(53,10))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ IntegerNode (location: (53,4)-(53,5))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 2
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :**
-        │   │           ├── message_loc: (53,6)-(53,8) = "**"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (53,9)-(53,10))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (53,9)-(53,10))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 3
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (55,0)-(55,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (55,0)-(55,5))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (55,0)-(55,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :*
-        │   │   ├── message_loc: (55,2)-(55,3) = "*"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (55,4)-(55,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (55,4)-(55,5))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (55,6)-(55,7) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (55,8)-(55,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (55,8)-(55,9))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ OrNode (location: (57,0)-(57,6))
-        │   ├── left:
-        │   │   @ IntegerNode (location: (57,0)-(57,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ IntegerNode (location: (57,5)-(57,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   └── operator_loc: (57,2)-(57,4) = "or"
-        ├── @ OrNode (location: (59,0)-(59,6))
-        │   ├── left:
-        │   │   @ IntegerNode (location: (59,0)-(59,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ IntegerNode (location: (59,5)-(59,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   └── operator_loc: (59,2)-(59,4) = "||"
-        ├── @ CallNode (location: (61,0)-(61,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (61,0)-(61,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (61,2)-(61,3) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (61,4)-(61,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (61,4)-(61,9))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ IntegerNode (location: (61,4)-(61,5))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 2
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :*
-        │   │           ├── message_loc: (61,6)-(61,7) = "*"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (61,8)-(61,9))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (61,8)-(61,9))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 3
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ ParenthesesNode (location: (63,0)-(63,7))
-            ├── body:
-            │   @ StatementsNode (location: (63,1)-(63,6))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (63,1)-(63,6))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ IntegerNode (location: (63,1)-(63,2))
-            │           │   ├── flags: decimal
-            │           │   └── value: 1
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :+
-            │           ├── message_loc: (63,3)-(63,4) = "+"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (63,5)-(63,6))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ IntegerNode (location: (63,5)-(63,6))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── opening_loc: (63,0)-(63,1) = "("
-            └── closing_loc: (63,6)-(63,7) = ")"
diff --git a/test/mri/prism/snapshots/keyword_method_names.txt b/test/mri/prism/snapshots/keyword_method_names.txt
deleted file mode 100644
index 6d59790b070..00000000000
--- a/test/mri/prism/snapshots/keyword_method_names.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-@ ProgramNode (location: (1,0)-(29,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(29,3))
-    └── body: (length: 10)
-        ├── @ DefNode (location: (1,0)-(2,3))
-        │   ├── name: :def
-        │   ├── name_loc: (1,4)-(1,7) = "def"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (2,0)-(2,3) = "end"
-        ├── @ DefNode (location: (4,0)-(5,3))
-        │   ├── name: :ensure
-        │   ├── name_loc: (4,9)-(4,15) = "ensure"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (4,4)-(4,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (4,0)-(4,3) = "def"
-        │   ├── operator_loc: (4,8)-(4,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ CallNode (location: (7,0)-(10,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :private
-        │   ├── message_loc: (7,0)-(7,7) = "private"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,8)-(10,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ DefNode (location: (7,8)-(10,3))
-        │   │           ├── name: :foo
-        │   │           ├── name_loc: (7,12)-(7,15) = "foo"
-        │   │           ├── receiver: ∅
-        │   │           ├── parameters: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (8,2)-(9,5))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (8,2)-(9,5))
-        │   │           │           ├── flags: ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :bar
-        │   │           │           ├── message_loc: (8,2)-(8,5) = "bar"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block:
-        │   │           │               @ BlockNode (location: (8,6)-(9,5))
-        │   │           │               ├── locals: []
-        │   │           │               ├── parameters: ∅
-        │   │           │               ├── body: ∅
-        │   │           │               ├── opening_loc: (8,6)-(8,8) = "do"
-        │   │           │               └── closing_loc: (9,2)-(9,5) = "end"
-        │   │           ├── locals: []
-        │   │           ├── def_keyword_loc: (7,8)-(7,11) = "def"
-        │   │           ├── operator_loc: ∅
-        │   │           ├── lparen_loc: ∅
-        │   │           ├── rparen_loc: ∅
-        │   │           ├── equal_loc: ∅
-        │   │           └── end_keyword_loc: (10,0)-(10,3) = "end"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ DefNode (location: (12,0)-(13,3))
-        │   ├── name: :m
-        │   ├── name_loc: (12,4)-(12,5) = "m"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (12,6)-(12,14))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (12,6)-(12,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ NoKeywordsParameterNode (location: (12,9)-(12,14))
-        │   │   │   ├── operator_loc: (12,9)-(12,11) = "**"
-        │   │   │   └── keyword_loc: (12,11)-(12,14) = "nil"
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (12,0)-(12,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (12,5)-(12,6) = "("
-        │   ├── rparen_loc: (12,14)-(12,15) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (13,0)-(13,3) = "end"
-        ├── @ DefNode (location: (15,0)-(16,3))
-        │   ├── name: :a
-        │   ├── name_loc: (15,17)-(15,18) = "a"
-        │   ├── receiver:
-        │   │   @ SourceEncodingNode (location: (15,4)-(15,16))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (15,0)-(15,3) = "def"
-        │   ├── operator_loc: (15,16)-(15,17) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (16,0)-(16,3) = "end"
-        ├── @ StringNode (location: (18,0)-(18,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (18,0)-(18,2) = "%{"
-        │   ├── content_loc: (18,2)-(18,5) = "abc"
-        │   ├── closing_loc: (18,5)-(18,6) = "}"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (20,0)-(20,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (20,0)-(20,2) = "%\""
-        │   ├── content_loc: (20,2)-(20,5) = "abc"
-        │   ├── closing_loc: (20,5)-(20,6) = "\""
-        │   └── unescaped: "abc"
-        ├── @ DefNode (location: (22,0)-(23,3))
-        │   ├── name: :a
-        │   ├── name_loc: (22,13)-(22,14) = "a"
-        │   ├── receiver:
-        │   │   @ SourceFileNode (location: (22,4)-(22,12))
-        │   │   ├── flags: ∅
-        │   │   └── filepath: "keyword_method_names.txt"
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (22,0)-(22,3) = "def"
-        │   ├── operator_loc: (22,12)-(22,13) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (23,0)-(23,3) = "end"
-        ├── @ DefNode (location: (25,0)-(26,3))
-        │   ├── name: :a
-        │   ├── name_loc: (25,13)-(25,14) = "a"
-        │   ├── receiver:
-        │   │   @ SourceLineNode (location: (25,4)-(25,12))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (25,0)-(25,3) = "def"
-        │   ├── operator_loc: (25,12)-(25,13) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (26,0)-(26,3) = "end"
-        └── @ DefNode (location: (28,0)-(29,3))
-            ├── name: :a
-            ├── name_loc: (28,9)-(28,10) = "a"
-            ├── receiver:
-            │   @ NilNode (location: (28,4)-(28,7))
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (28,0)-(28,3) = "def"
-            ├── operator_loc: (28,7)-(28,9) = "::"
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (29,0)-(29,3) = "end"
diff --git a/test/mri/prism/snapshots/keywords.txt b/test/mri/prism/snapshots/keywords.txt
deleted file mode 100644
index 8a93c38bfd3..00000000000
--- a/test/mri/prism/snapshots/keywords.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,8))
-    └── body: (length: 6)
-        ├── @ RedoNode (location: (1,0)-(1,4))
-        ├── @ RetryNode (location: (3,0)-(3,5))
-        ├── @ SelfNode (location: (5,0)-(5,4))
-        ├── @ SourceEncodingNode (location: (7,0)-(7,12))
-        ├── @ SourceFileNode (location: (9,0)-(9,8))
-        │   ├── flags: ∅
-        │   └── filepath: "keywords.txt"
-        └── @ SourceLineNode (location: (11,0)-(11,8))
diff --git a/test/mri/prism/snapshots/lambda.txt b/test/mri/prism/snapshots/lambda.txt
deleted file mode 100644
index f9e82c8811a..00000000000
--- a/test/mri/prism/snapshots/lambda.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,18))
-    └── body: (length: 5)
-        ├── @ LambdaNode (location: (1,0)-(3,4))
-        │   ├── locals: [:foo]
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (3,2)-(3,3) = "{"
-        │   ├── closing_loc: (3,3)-(3,4) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (1,2)-(3,1))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (2,2)-(2,5))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (2,2)-(2,5))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :foo
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (1,2)-(1,3) = "("
-        │   │   └── closing_loc: (3,0)-(3,1) = ")"
-        │   └── body: ∅
-        ├── @ LambdaNode (location: (5,0)-(5,18))
-        │   ├── locals: [:x]
-        │   ├── operator_loc: (5,0)-(5,2) = "->"
-        │   ├── opening_loc: (5,15)-(5,16) = "{"
-        │   ├── closing_loc: (5,17)-(5,18) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (5,2)-(5,14))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (5,3)-(5,13))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 1)
-        │   │   │   │   └── @ OptionalKeywordParameterNode (location: (5,3)-(5,13))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :x
-        │   │   │   │       ├── name_loc: (5,3)-(5,5) = "x:"
-        │   │   │   │       └── value:
-        │   │   │   │           @ InterpolatedStringNode (location: (5,6)-(5,13))
-        │   │   │   │           ├── opening_loc: (5,6)-(5,7) = "\""
-        │   │   │   │           ├── parts: (length: 2)
-        │   │   │   │           │   ├── @ StringNode (location: (5,7)-(5,8))
-        │   │   │   │           │   │   ├── flags: ∅
-        │   │   │   │           │   │   ├── opening_loc: ∅
-        │   │   │   │           │   │   ├── content_loc: (5,7)-(5,8) = "b"
-        │   │   │   │           │   │   ├── closing_loc: ∅
-        │   │   │   │           │   │   └── unescaped: "b"
-        │   │   │   │           │   └── @ EmbeddedStatementsNode (location: (5,8)-(5,12))
-        │   │   │   │           │       ├── opening_loc: (5,8)-(5,10) = "\#{"
-        │   │   │   │           │       ├── statements:
-        │   │   │   │           │       │   @ StatementsNode (location: (5,10)-(5,11))
-        │   │   │   │           │       │   └── body: (length: 1)
-        │   │   │   │           │       │       └── @ CallNode (location: (5,10)-(5,11))
-        │   │   │   │           │       │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           │       │           ├── receiver: ∅
-        │   │   │   │           │       │           ├── call_operator_loc: ∅
-        │   │   │   │           │       │           ├── name: :a
-        │   │   │   │           │       │           ├── message_loc: (5,10)-(5,11) = "a"
-        │   │   │   │           │       │           ├── opening_loc: ∅
-        │   │   │   │           │       │           ├── arguments: ∅
-        │   │   │   │           │       │           ├── closing_loc: ∅
-        │   │   │   │           │       │           └── block: ∅
-        │   │   │   │           │       └── closing_loc: (5,11)-(5,12) = "}"
-        │   │   │   │           └── closing_loc: (5,12)-(5,13) = "\""
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (5,2)-(5,3) = "("
-        │   │   └── closing_loc: (5,13)-(5,14) = ")"
-        │   └── body: ∅
-        ├── @ LambdaNode (location: (7,0)-(7,15))
-        │   ├── locals: [:a]
-        │   ├── operator_loc: (7,0)-(7,2) = "->"
-        │   ├── opening_loc: (7,13)-(7,14) = "{"
-        │   ├── closing_loc: (7,14)-(7,15) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (7,2)-(7,12))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (7,3)-(7,11))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 1)
-        │   │   │   │   └── @ OptionalKeywordParameterNode (location: (7,3)-(7,11))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :a
-        │   │   │   │       ├── name_loc: (7,3)-(7,5) = "a:"
-        │   │   │   │       └── value:
-        │   │   │   │           @ CallNode (location: (7,6)-(7,11))
-        │   │   │   │           ├── flags: ∅
-        │   │   │   │           ├── receiver:
-        │   │   │   │           │   @ CallNode (location: (7,6)-(7,7))
-        │   │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │           │   ├── receiver: ∅
-        │   │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │   │           │   ├── name: :b
-        │   │   │   │           │   ├── message_loc: (7,6)-(7,7) = "b"
-        │   │   │   │           │   ├── opening_loc: ∅
-        │   │   │   │           │   ├── arguments: ∅
-        │   │   │   │           │   ├── closing_loc: ∅
-        │   │   │   │           │   └── block: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :*
-        │   │   │   │           ├── message_loc: (7,8)-(7,9) = "*"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments:
-        │   │   │   │           │   @ ArgumentsNode (location: (7,10)-(7,11))
-        │   │   │   │           │   ├── flags: ∅
-        │   │   │   │           │   └── arguments: (length: 1)
-        │   │   │   │           │       └── @ IntegerNode (location: (7,10)-(7,11))
-        │   │   │   │           │           ├── flags: decimal
-        │   │   │   │           │           └── value: 3
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (7,2)-(7,3) = "("
-        │   │   └── closing_loc: (7,11)-(7,12) = ")"
-        │   └── body: ∅
-        ├── @ LambdaNode (location: (9,0)-(9,19))
-        │   ├── locals: [:foo]
-        │   ├── operator_loc: (9,0)-(9,2) = "->"
-        │   ├── opening_loc: (9,13)-(9,15) = "do"
-        │   ├── closing_loc: (9,16)-(9,19) = "end"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (9,3)-(9,12))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (9,3)-(9,12))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 1)
-        │   │   │   │   └── @ OptionalParameterNode (location: (9,3)-(9,12))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :foo
-        │   │   │   │       ├── name_loc: (9,3)-(9,6) = "foo"
-        │   │   │   │       ├── operator_loc: (9,7)-(9,8) = "="
-        │   │   │   │       └── value:
-        │   │   │   │           @ CallNode (location: (9,9)-(9,12))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           ├── message_loc: (9,9)-(9,12) = "bar"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── body: ∅
-        └── @ LambdaNode (location: (11,0)-(11,18))
-            ├── locals: [:foo]
-            ├── operator_loc: (11,0)-(11,2) = "->"
-            ├── opening_loc: (11,12)-(11,14) = "do"
-            ├── closing_loc: (11,15)-(11,18) = "end"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (11,3)-(11,11))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (11,3)-(11,11))
-            │   │   ├── requireds: (length: 0)
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 1)
-            │   │   │   └── @ OptionalKeywordParameterNode (location: (11,3)-(11,11))
-            │   │   │       ├── flags: ∅
-            │   │   │       ├── name: :foo
-            │   │   │       ├── name_loc: (11,3)-(11,7) = "foo:"
-            │   │   │       └── value:
-            │   │   │           @ CallNode (location: (11,8)-(11,11))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :bar
-            │   │   │           ├── message_loc: (11,8)-(11,11) = "bar"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: ∅
-            │   └── closing_loc: ∅
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/method_calls.txt b/test/mri/prism/snapshots/method_calls.txt
deleted file mode 100644
index 370686e9ea7..00000000000
--- a/test/mri/prism/snapshots/method_calls.txt
+++ /dev/null
@@ -1,2456 +0,0 @@
-@ ProgramNode (location: (1,0)-(156,19))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(156,19))
-    └── body: (length: 67)
-        ├── @ CallNode (location: (1,0)-(1,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (1,4)-(1,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,8)-(1,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,8)-(1,14))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,8)-(1,10) = "%{"
-        │   │           ├── content_loc: (1,10)-(1,13) = "baz"
-        │   │           ├── closing_loc: (1,13)-(1,14) = "}"
-        │   │           └── unescaped: "baz"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (3,0)-(3,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (3,1)-(3,2) = "."
-        │   ├── name: :b
-        │   ├── message_loc: (3,2)-(3,3) = "b"
-        │   ├── opening_loc: (3,3)-(3,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,4)-(3,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (3,4)-(3,5))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :c
-        │   │       │   ├── message_loc: (3,4)-(3,5) = "c"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (3,7)-(3,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :d
-        │   │           ├── message_loc: (3,7)-(3,8) = "d"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (3,8)-(3,9) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (5,0)-(5,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (5,0)-(5,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (5,1)-(5,2) = "."
-        │   ├── name: :b
-        │   ├── message_loc: (5,2)-(5,3) = "b"
-        │   ├── opening_loc: (5,3)-(5,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (5,4)-(5,5) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (7,0)-(9,7))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (7,0)-(8,6))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (7,0)-(7,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (7,0)-(7,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (8,2)-(8,3) = "."
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (8,3)-(8,6) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (9,2)-(9,4) = "&."
-        │   ├── name: :baz
-        │   ├── message_loc: (9,4)-(9,7) = "baz"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (11,0)-(11,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a!
-        │   ├── message_loc: (11,0)-(11,2) = "a!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (13,0)-(13,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (13,0)-(13,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (13,0)-(13,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (13,1)-(13,2) = "."
-        │   ├── name: :call
-        │   ├── message_loc: ∅
-        │   ├── opening_loc: (13,2)-(13,3) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (13,3)-(13,4) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (15,0)-(15,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (15,0)-(15,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (15,0)-(15,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (15,1)-(15,2) = "."
-        │   ├── name: :call
-        │   ├── message_loc: ∅
-        │   ├── opening_loc: (15,2)-(15,3) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,3)-(15,10))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ IntegerNode (location: (15,3)-(15,4))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── @ IntegerNode (location: (15,6)-(15,7))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── @ IntegerNode (location: (15,9)-(15,10))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   ├── closing_loc: (15,10)-(15,11) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (17,0)-(17,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (17,0)-(17,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (17,0)-(17,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (17,1)-(17,3) = "::"
-        │   ├── name: :b
-        │   ├── message_loc: (17,3)-(17,4) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (19,0)-(19,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (19,0)-(19,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (19,0)-(19,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (19,1)-(19,3) = "::"
-        │   ├── name: :b
-        │   ├── message_loc: (19,3)-(19,4) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (19,5)-(19,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (19,5)-(19,6))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :c
-        │   │           ├── message_loc: (19,5)-(19,6) = "c"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (21,0)-(21,11))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (21,0)-(21,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (21,0)-(21,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (21,3)-(21,4) = "."
-        │   ├── name: :bar=
-        │   ├── message_loc: (21,4)-(21,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,10)-(21,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (21,10)-(21,11))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (23,0)-(23,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a?
-        │   ├── message_loc: (23,0)-(23,2) = "a?"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (25,0)-(25,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (25,0)-(25,1) = "a"
-        │   ├── opening_loc: (25,1)-(25,2) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (25,8)-(25,9) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (25,2)-(25,8))
-        │       ├── expression:
-        │       │   @ CallNode (location: (25,3)-(25,8))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :block
-        │       │   ├── message_loc: (25,3)-(25,8) = "block"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (25,2)-(25,3) = "&"
-        ├── @ CallNode (location: (27,0)-(27,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (27,0)-(27,1) = "a"
-        │   ├── opening_loc: (27,1)-(27,2) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (27,2)-(27,10))
-        │   │   ├── flags: contains_keyword_splat
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (27,2)-(27,10))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocSplatNode (location: (27,2)-(27,10))
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (27,4)-(27,10))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :kwargs
-        │   │                   │   ├── message_loc: (27,4)-(27,10) = "kwargs"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: (27,2)-(27,4) = "**"
-        │   ├── closing_loc: (27,10)-(27,11) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (29,0)-(29,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (29,0)-(29,3))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (29,0)-(29,1))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :a
-        │   │   │   ├── message_loc: (29,0)-(29,1) = "a"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (29,1)-(29,2) = "."
-        │   │   ├── name: :b
-        │   │   ├── message_loc: (29,2)-(29,3) = "b"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (29,3)-(29,4) = "."
-        │   ├── name: :c
-        │   ├── message_loc: (29,4)-(29,5) = "c"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (31,0)-(31,7))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (31,0)-(31,1) = "a"
-        │   ├── opening_loc: (31,1)-(31,2) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,2)-(31,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (31,2)-(31,3))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (31,2)-(31,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (31,5)-(31,6))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :c
-        │   │           ├── message_loc: (31,5)-(31,6) = "c"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (31,6)-(31,7) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (33,0)-(33,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (33,0)-(33,1) = "a"
-        │   ├── opening_loc: (33,1)-(33,2) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (33,2)-(33,3) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (35,0)-(35,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (35,0)-(35,1) = "a"
-        │   ├── opening_loc: (35,1)-(35,2) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (35,2)-(35,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (35,2)-(35,7))
-        │   │           ├── operator_loc: (35,2)-(35,3) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (35,3)-(35,7))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :args
-        │   │               ├── message_loc: (35,3)-(35,7) = "args"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (35,7)-(35,8) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (37,0)-(37,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (37,0)-(37,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (37,2)-(37,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (37,2)-(37,3))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (37,2)-(37,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (37,5)-(37,6))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :c
-        │   │           ├── message_loc: (37,5)-(37,6) = "c"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (39,0)-(39,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (39,0)-(39,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (39,0)-(39,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (39,1)-(39,2) = "."
-        │   ├── name: :b
-        │   ├── message_loc: (39,2)-(39,3) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (39,4)-(39,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (39,4)-(39,5))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :c
-        │   │       │   ├── message_loc: (39,4)-(39,5) = "c"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (39,7)-(39,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :d
-        │   │           ├── message_loc: (39,7)-(39,8) = "d"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ MultiWriteNode (location: (41,0)-(41,23))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ CallTargetNode (location: (41,0)-(41,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── receiver:
-        │   │   │   │   @ CallNode (location: (41,0)-(41,3))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :foo
-        │   │   │   │   ├── message_loc: (41,0)-(41,3) = "foo"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── call_operator_loc: (41,3)-(41,4) = "."
-        │   │   │   ├── name: :foo=
-        │   │   │   └── message_loc: (41,4)-(41,7) = "foo"
-        │   │   └── @ CallTargetNode (location: (41,9)-(41,16))
-        │   │       ├── flags: ∅
-        │   │       ├── receiver:
-        │   │       │   @ CallNode (location: (41,9)-(41,12))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (41,9)-(41,12) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       ├── call_operator_loc: (41,12)-(41,13) = "."
-        │   │       ├── name: :bar=
-        │   │       └── message_loc: (41,13)-(41,16) = "bar"
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (41,17)-(41,18) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (41,19)-(41,23))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (41,19)-(41,20))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (41,22)-(41,23))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ CallNode (location: (43,0)-(43,4))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (43,0)-(43,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (43,0)-(43,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (43,1)-(43,3) = "&."
-        │   ├── name: :b
-        │   ├── message_loc: (43,3)-(43,4) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (45,0)-(45,5))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (45,0)-(45,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (45,0)-(45,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (45,1)-(45,3) = "&."
-        │   ├── name: :call
-        │   ├── message_loc: ∅
-        │   ├── opening_loc: (45,3)-(45,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (45,4)-(45,5) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (47,0)-(47,7))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (47,0)-(47,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (47,0)-(47,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (47,1)-(47,3) = "&."
-        │   ├── name: :b
-        │   ├── message_loc: (47,3)-(47,4) = "b"
-        │   ├── opening_loc: (47,4)-(47,5) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (47,5)-(47,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (47,5)-(47,6))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :c
-        │   │           ├── message_loc: (47,5)-(47,6) = "c"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (47,6)-(47,7) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (49,0)-(49,6))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (49,0)-(49,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (49,0)-(49,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (49,1)-(49,3) = "&."
-        │   ├── name: :b
-        │   ├── message_loc: (49,3)-(49,4) = "b"
-        │   ├── opening_loc: (49,4)-(49,5) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (49,5)-(49,6) = ")"
-        │   └── block: ∅
-        ├── @ IfNode (location: (51,0)-(51,33))
-        │   ├── if_keyword_loc: (51,11)-(51,13) = "if"
-        │   ├── predicate:
-        │   │   @ AndNode (location: (51,14)-(51,33))
-        │   │   ├── left:
-        │   │   │   @ OrNode (location: (51,14)-(51,25))
-        │   │   │   ├── left:
-        │   │   │   │   @ CallNode (location: (51,14)-(51,18))
-        │   │   │   │   ├── flags: ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :bar?
-        │   │   │   │   ├── message_loc: (51,14)-(51,18) = "bar?"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── right:
-        │   │   │   │   @ CallNode (location: (51,22)-(51,25))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :baz
-        │   │   │   │   ├── message_loc: (51,22)-(51,25) = "baz"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: (51,19)-(51,21) = "or"
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (51,30)-(51,33))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :qux
-        │   │   │   ├── message_loc: (51,30)-(51,33) = "qux"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (51,26)-(51,29) = "and"
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (51,0)-(51,10))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (51,0)-(51,10))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (51,0)-(51,3) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (51,4)-(51,10))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ SymbolNode (location: (51,4)-(51,6))
-        │   │           │       │   ├── flags: forced_us_ascii_encoding
-        │   │           │       │   ├── opening_loc: (51,4)-(51,5) = ":"
-        │   │           │       │   ├── value_loc: (51,5)-(51,6) = "a"
-        │   │           │       │   ├── closing_loc: ∅
-        │   │           │       │   └── unescaped: "a"
-        │   │           │       └── @ SymbolNode (location: (51,8)-(51,10))
-        │   │           │           ├── flags: forced_us_ascii_encoding
-        │   │           │           ├── opening_loc: (51,8)-(51,9) = ":"
-        │   │           │           ├── value_loc: (51,9)-(51,10) = "b"
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── unescaped: "b"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ CallNode (location: (53,0)-(56,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (53,0)-(53,3) = "foo"
-        │   ├── opening_loc: (53,3)-(53,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (53,4)-(55,4))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (53,4)-(53,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (53,4)-(53,5) = ":"
-        │   │       │   ├── value_loc: (53,5)-(53,6) = "a"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "a"
-        │   │       └── @ SymbolNode (location: (55,2)-(55,4))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (55,2)-(55,3) = ":"
-        │   │           ├── value_loc: (55,3)-(55,4) = "b"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "b"
-        │   ├── closing_loc: (56,0)-(56,1) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (58,0)-(58,10))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (58,0)-(58,3) = "foo"
-        │   ├── opening_loc: (58,3)-(58,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (58,4)-(58,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (58,4)-(58,9))
-        │   │           ├── operator_loc: (58,4)-(58,5) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (58,5)-(58,9))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :rest
-        │   │               ├── message_loc: (58,5)-(58,9) = "rest"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (58,9)-(58,10) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (60,0)-(60,39))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (60,0)-(60,3) = "foo"
-        │   ├── opening_loc: (60,3)-(60,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (60,4)-(60,32))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (60,4)-(60,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (60,4)-(60,5) = ":"
-        │   │       │   ├── value_loc: (60,5)-(60,6) = "a"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "a"
-        │   │       └── @ KeywordHashNode (location: (60,8)-(60,32))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 2)
-        │   │               ├── @ AssocNode (location: (60,8)-(60,22))
-        │   │               │   ├── key:
-        │   │               │   │   @ SymbolNode (location: (60,8)-(60,10))
-        │   │               │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   ├── opening_loc: (60,8)-(60,9) = ":"
-        │   │               │   │   ├── value_loc: (60,9)-(60,10) = "h"
-        │   │               │   │   ├── closing_loc: ∅
-        │   │               │   │   └── unescaped: "h"
-        │   │               │   ├── value:
-        │   │               │   │   @ ArrayNode (location: (60,14)-(60,22))
-        │   │               │   │   ├── flags: ∅
-        │   │               │   │   ├── elements: (length: 2)
-        │   │               │   │   │   ├── @ SymbolNode (location: (60,15)-(60,17))
-        │   │               │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   │   │   ├── opening_loc: (60,15)-(60,16) = ":"
-        │   │               │   │   │   │   ├── value_loc: (60,16)-(60,17) = "x"
-        │   │               │   │   │   │   ├── closing_loc: ∅
-        │   │               │   │   │   │   └── unescaped: "x"
-        │   │               │   │   │   └── @ SymbolNode (location: (60,19)-(60,21))
-        │   │               │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │               │   │   │       ├── opening_loc: (60,19)-(60,20) = ":"
-        │   │               │   │   │       ├── value_loc: (60,20)-(60,21) = "y"
-        │   │               │   │   │       ├── closing_loc: ∅
-        │   │               │   │   │       └── unescaped: "y"
-        │   │               │   │   ├── opening_loc: (60,14)-(60,15) = "["
-        │   │               │   │   └── closing_loc: (60,21)-(60,22) = "]"
-        │   │               │   └── operator_loc: (60,11)-(60,13) = "=>"
-        │   │               └── @ AssocNode (location: (60,24)-(60,32))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (60,24)-(60,26))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (60,24)-(60,25) = ":"
-        │   │                   │   ├── value_loc: (60,25)-(60,26) = "a"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "a"
-        │   │                   ├── value:
-        │   │                   │   @ SymbolNode (location: (60,30)-(60,32))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (60,30)-(60,31) = ":"
-        │   │                   │   ├── value_loc: (60,31)-(60,32) = "b"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "b"
-        │   │                   └── operator_loc: (60,27)-(60,29) = "=>"
-        │   ├── closing_loc: (60,39)-(60,40) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (60,34)-(60,39))
-        │       ├── expression:
-        │       │   @ SymbolNode (location: (60,35)-(60,39))
-        │       │   ├── flags: forced_us_ascii_encoding
-        │       │   ├── opening_loc: (60,35)-(60,36) = ":"
-        │       │   ├── value_loc: (60,36)-(60,39) = "bar"
-        │       │   ├── closing_loc: ∅
-        │       │   └── unescaped: "bar"
-        │       └── operator_loc: (60,34)-(60,35) = "&"
-        ├── @ CallNode (location: (62,0)-(62,49))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :hi
-        │   ├── message_loc: (62,0)-(62,2) = "hi"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (62,3)-(62,49))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ IntegerNode (location: (62,3)-(62,6))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 123
-        │   │       └── @ HashNode (location: (62,8)-(62,49))
-        │   │           ├── opening_loc: (62,8)-(62,9) = "{"
-        │   │           ├── elements: (length: 3)
-        │   │           │   ├── @ AssocNode (location: (62,10)-(62,27))
-        │   │           │   │   ├── key:
-        │   │           │   │   │   @ SymbolNode (location: (62,10)-(62,16))
-        │   │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │           │   │   │   ├── opening_loc: (62,10)-(62,11) = ":"
-        │   │           │   │   │   ├── value_loc: (62,11)-(62,16) = "there"
-        │   │           │   │   │   ├── closing_loc: ∅
-        │   │           │   │   │   └── unescaped: "there"
-        │   │           │   │   ├── value:
-        │   │           │   │   │   @ SymbolNode (location: (62,20)-(62,27))
-        │   │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │           │   │   │   ├── opening_loc: (62,20)-(62,21) = ":"
-        │   │           │   │   │   ├── value_loc: (62,21)-(62,27) = "friend"
-        │   │           │   │   │   ├── closing_loc: ∅
-        │   │           │   │   │   └── unescaped: "friend"
-        │   │           │   │   └── operator_loc: (62,17)-(62,19) = "=>"
-        │   │           │   ├── @ AssocSplatNode (location: (62,29)-(62,33))
-        │   │           │   │   ├── value:
-        │   │           │   │   │   @ HashNode (location: (62,31)-(62,33))
-        │   │           │   │   │   ├── opening_loc: (62,31)-(62,32) = "{"
-        │   │           │   │   │   ├── elements: (length: 0)
-        │   │           │   │   │   └── closing_loc: (62,32)-(62,33) = "}"
-        │   │           │   │   └── operator_loc: (62,29)-(62,31) = "**"
-        │   │           │   └── @ AssocNode (location: (62,35)-(62,47))
-        │   │           │       ├── key:
-        │   │           │       │   @ SymbolNode (location: (62,35)-(62,42))
-        │   │           │       │   ├── flags: forced_us_ascii_encoding
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── value_loc: (62,35)-(62,41) = "whatup"
-        │   │           │       │   ├── closing_loc: (62,41)-(62,42) = ":"
-        │   │           │       │   └── unescaped: "whatup"
-        │   │           │       ├── value:
-        │   │           │       │   @ SymbolNode (location: (62,43)-(62,47))
-        │   │           │       │   ├── flags: forced_us_ascii_encoding
-        │   │           │       │   ├── opening_loc: (62,43)-(62,44) = ":"
-        │   │           │       │   ├── value_loc: (62,44)-(62,47) = "dog"
-        │   │           │       │   ├── closing_loc: ∅
-        │   │           │       │   └── unescaped: "dog"
-        │   │           │       └── operator_loc: ∅
-        │   │           └── closing_loc: (62,48)-(62,49) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (64,0)-(64,36))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (64,0)-(64,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (64,4)-(64,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (64,4)-(64,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (64,4)-(64,5) = ":"
-        │   │       │   ├── value_loc: (64,5)-(64,6) = "a"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "a"
-        │   │       └── @ KeywordHashNode (location: (64,8)-(64,15))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (64,8)-(64,15))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (64,8)-(64,10))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (64,8)-(64,9) = "b"
-        │   │                   │   ├── closing_loc: (64,9)-(64,10) = ":"
-        │   │                   │   └── unescaped: "b"
-        │   │                   ├── value:
-        │   │                   │   @ TrueNode (location: (64,11)-(64,15))
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (64,16)-(64,36))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (64,19)-(64,25))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (64,20)-(64,24))
-        │       │   │   ├── requireds: (length: 2)
-        │       │   │   │   ├── @ RequiredParameterNode (location: (64,20)-(64,21))
-        │       │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   └── name: :a
-        │       │   │   │   └── @ RequiredParameterNode (location: (64,23)-(64,24))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :b
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (64,19)-(64,20) = "|"
-        │       │   └── closing_loc: (64,24)-(64,25) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (64,26)-(64,32))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (64,26)-(64,32))
-        │       │           ├── flags: ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :puts
-        │       │           ├── message_loc: (64,26)-(64,30) = "puts"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments:
-        │       │           │   @ ArgumentsNode (location: (64,31)-(64,32))
-        │       │           │   ├── flags: ∅
-        │       │           │   └── arguments: (length: 1)
-        │       │           │       └── @ LocalVariableReadNode (location: (64,31)-(64,32))
-        │       │           │           ├── name: :a
-        │       │           │           └── depth: 0
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (64,16)-(64,18) = "do"
-        │       └── closing_loc: (64,33)-(64,36) = "end"
-        ├── @ CallNode (location: (66,0)-(66,17))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :hi
-        │   ├── message_loc: (66,0)-(66,2) = "hi"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (66,3)-(66,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (66,3)-(66,17))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (66,3)-(66,17))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (66,3)-(66,9))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (66,3)-(66,8) = "there"
-        │   │                   │   ├── closing_loc: (66,8)-(66,9) = ":"
-        │   │                   │   └── unescaped: "there"
-        │   │                   ├── value:
-        │   │                   │   @ SymbolNode (location: (66,10)-(66,17))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (66,10)-(66,11) = ":"
-        │   │                   │   ├── value_loc: (66,11)-(66,17) = "friend"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "friend"
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (68,0)-(68,40))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :hi
-        │   ├── message_loc: (68,0)-(68,2) = "hi"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (68,3)-(68,40))
-        │   │   ├── flags: contains_keyword_splat
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (68,3)-(68,40))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 3)
-        │   │               ├── @ AssocNode (location: (68,3)-(68,20))
-        │   │               │   ├── key:
-        │   │               │   │   @ SymbolNode (location: (68,3)-(68,9))
-        │   │               │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   ├── opening_loc: (68,3)-(68,4) = ":"
-        │   │               │   │   ├── value_loc: (68,4)-(68,9) = "there"
-        │   │               │   │   ├── closing_loc: ∅
-        │   │               │   │   └── unescaped: "there"
-        │   │               │   ├── value:
-        │   │               │   │   @ SymbolNode (location: (68,13)-(68,20))
-        │   │               │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   ├── opening_loc: (68,13)-(68,14) = ":"
-        │   │               │   │   ├── value_loc: (68,14)-(68,20) = "friend"
-        │   │               │   │   ├── closing_loc: ∅
-        │   │               │   │   └── unescaped: "friend"
-        │   │               │   └── operator_loc: (68,10)-(68,12) = "=>"
-        │   │               ├── @ AssocSplatNode (location: (68,22)-(68,26))
-        │   │               │   ├── value:
-        │   │               │   │   @ HashNode (location: (68,24)-(68,26))
-        │   │               │   │   ├── opening_loc: (68,24)-(68,25) = "{"
-        │   │               │   │   ├── elements: (length: 0)
-        │   │               │   │   └── closing_loc: (68,25)-(68,26) = "}"
-        │   │               │   └── operator_loc: (68,22)-(68,24) = "**"
-        │   │               └── @ AssocNode (location: (68,28)-(68,40))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (68,28)-(68,35))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (68,28)-(68,34) = "whatup"
-        │   │                   │   ├── closing_loc: (68,34)-(68,35) = ":"
-        │   │                   │   └── unescaped: "whatup"
-        │   │                   ├── value:
-        │   │                   │   @ SymbolNode (location: (68,36)-(68,40))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (68,36)-(68,37) = ":"
-        │   │                   │   ├── value_loc: (68,37)-(68,40) = "dog"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "dog"
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (70,0)-(70,41))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :hi
-        │   ├── message_loc: (70,0)-(70,2) = "hi"
-        │   ├── opening_loc: (70,2)-(70,3) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (70,3)-(70,40))
-        │   │   ├── flags: contains_keyword_splat
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (70,3)-(70,40))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 3)
-        │   │               ├── @ AssocNode (location: (70,3)-(70,20))
-        │   │               │   ├── key:
-        │   │               │   │   @ SymbolNode (location: (70,3)-(70,9))
-        │   │               │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   ├── opening_loc: (70,3)-(70,4) = ":"
-        │   │               │   │   ├── value_loc: (70,4)-(70,9) = "there"
-        │   │               │   │   ├── closing_loc: ∅
-        │   │               │   │   └── unescaped: "there"
-        │   │               │   ├── value:
-        │   │               │   │   @ SymbolNode (location: (70,13)-(70,20))
-        │   │               │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   ├── opening_loc: (70,13)-(70,14) = ":"
-        │   │               │   │   ├── value_loc: (70,14)-(70,20) = "friend"
-        │   │               │   │   ├── closing_loc: ∅
-        │   │               │   │   └── unescaped: "friend"
-        │   │               │   └── operator_loc: (70,10)-(70,12) = "=>"
-        │   │               ├── @ AssocSplatNode (location: (70,22)-(70,26))
-        │   │               │   ├── value:
-        │   │               │   │   @ HashNode (location: (70,24)-(70,26))
-        │   │               │   │   ├── opening_loc: (70,24)-(70,25) = "{"
-        │   │               │   │   ├── elements: (length: 0)
-        │   │               │   │   └── closing_loc: (70,25)-(70,26) = "}"
-        │   │               │   └── operator_loc: (70,22)-(70,24) = "**"
-        │   │               └── @ AssocNode (location: (70,28)-(70,40))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (70,28)-(70,35))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (70,28)-(70,34) = "whatup"
-        │   │                   │   ├── closing_loc: (70,34)-(70,35) = ":"
-        │   │                   │   └── unescaped: "whatup"
-        │   │                   ├── value:
-        │   │                   │   @ SymbolNode (location: (70,36)-(70,40))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (70,36)-(70,37) = ":"
-        │   │                   │   ├── value_loc: (70,37)-(70,40) = "dog"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "dog"
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: (70,40)-(70,41) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (72,0)-(72,35))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (72,0)-(72,3) = "foo"
-        │   ├── opening_loc: (72,3)-(72,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (72,4)-(72,26))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ HashNode (location: (72,4)-(72,26))
-        │   │           ├── opening_loc: (72,4)-(72,5) = "{"
-        │   │           ├── elements: (length: 2)
-        │   │           │   ├── @ AssocNode (location: (72,6)-(72,13))
-        │   │           │   │   ├── key:
-        │   │           │   │   │   @ SymbolNode (location: (72,6)-(72,8))
-        │   │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │           │   │   │   ├── opening_loc: ∅
-        │   │           │   │   │   ├── value_loc: (72,6)-(72,7) = "a"
-        │   │           │   │   │   ├── closing_loc: (72,7)-(72,8) = ":"
-        │   │           │   │   │   └── unescaped: "a"
-        │   │           │   │   ├── value:
-        │   │           │   │   │   @ TrueNode (location: (72,9)-(72,13))
-        │   │           │   │   └── operator_loc: ∅
-        │   │           │   └── @ AssocNode (location: (72,15)-(72,23))
-        │   │           │       ├── key:
-        │   │           │       │   @ SymbolNode (location: (72,15)-(72,17))
-        │   │           │       │   ├── flags: forced_us_ascii_encoding
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── value_loc: (72,15)-(72,16) = "b"
-        │   │           │       │   ├── closing_loc: (72,16)-(72,17) = ":"
-        │   │           │       │   └── unescaped: "b"
-        │   │           │       ├── value:
-        │   │           │       │   @ FalseNode (location: (72,18)-(72,23))
-        │   │           │       └── operator_loc: ∅
-        │   │           └── closing_loc: (72,25)-(72,26) = "}"
-        │   ├── closing_loc: (72,35)-(72,36) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (72,28)-(72,35))
-        │       ├── expression:
-        │       │   @ SymbolNode (location: (72,29)-(72,35))
-        │       │   ├── flags: forced_us_ascii_encoding
-        │       │   ├── opening_loc: (72,29)-(72,30) = ":"
-        │       │   ├── value_loc: (72,30)-(72,35) = "block"
-        │       │   ├── closing_loc: ∅
-        │       │   └── unescaped: "block"
-        │       └── operator_loc: (72,28)-(72,29) = "&"
-        ├── @ CallNode (location: (74,0)-(74,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :hi
-        │   ├── message_loc: (74,0)-(74,2) = "hi"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (74,3)-(74,20))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (74,3)-(74,20))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (74,3)-(74,20))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (74,3)-(74,9))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (74,3)-(74,4) = ":"
-        │   │                   │   ├── value_loc: (74,4)-(74,9) = "there"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "there"
-        │   │                   ├── value:
-        │   │                   │   @ SymbolNode (location: (74,13)-(74,20))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (74,13)-(74,14) = ":"
-        │   │                   │   ├── value_loc: (74,14)-(74,20) = "friend"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "friend"
-        │   │                   └── operator_loc: (74,10)-(74,12) = "=>"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (76,0)-(78,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (76,0)-(76,3) = "foo"
-        │   ├── opening_loc: (76,3)-(76,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (76,4)-(77,2))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (76,4)-(76,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (76,4)-(76,5) = ":"
-        │   │       │   ├── value_loc: (76,5)-(76,6) = "a"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "a"
-        │   │       └── @ SymbolNode (location: (77,0)-(77,2))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (77,0)-(77,1) = ":"
-        │   │           ├── value_loc: (77,1)-(77,2) = "b"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "b"
-        │   ├── closing_loc: (78,0)-(78,1) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (80,0)-(83,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (80,0)-(80,3) = "foo"
-        │   ├── opening_loc: (80,3)-(80,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (81,0)-(82,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (81,0)-(81,2))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (81,0)-(81,1) = ":"
-        │   │       │   ├── value_loc: (81,1)-(81,2) = "a"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "a"
-        │   │       └── @ KeywordHashNode (location: (82,0)-(82,5))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (82,0)-(82,5))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (82,0)-(82,2))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (82,0)-(82,1) = "b"
-        │   │                   │   ├── closing_loc: (82,1)-(82,2) = ":"
-        │   │                   │   └── unescaped: "b"
-        │   │                   ├── value:
-        │   │                   │   @ SymbolNode (location: (82,3)-(82,5))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (82,3)-(82,4) = ":"
-        │   │                   │   ├── value_loc: (82,4)-(82,5) = "c"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "c"
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: (83,0)-(83,1) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (85,0)-(85,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (85,0)-(85,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockArgumentNode (location: (85,4)-(85,11))
-        │       ├── expression:
-        │       │   @ SymbolNode (location: (85,5)-(85,11))
-        │       │   ├── flags: forced_us_ascii_encoding
-        │       │   ├── opening_loc: (85,5)-(85,6) = ":"
-        │       │   ├── value_loc: (85,6)-(85,11) = "block"
-        │       │   ├── closing_loc: ∅
-        │       │   └── unescaped: "block"
-        │       └── operator_loc: (85,4)-(85,5) = "&"
-        ├── @ CallNode (location: (87,0)-(87,30))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (87,0)-(87,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (87,4)-(87,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (87,4)-(87,21))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 2)
-        │   │               ├── @ AssocNode (location: (87,4)-(87,11))
-        │   │               │   ├── key:
-        │   │               │   │   @ SymbolNode (location: (87,4)-(87,6))
-        │   │               │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   ├── opening_loc: ∅
-        │   │               │   │   ├── value_loc: (87,4)-(87,5) = "a"
-        │   │               │   │   ├── closing_loc: (87,5)-(87,6) = ":"
-        │   │               │   │   └── unescaped: "a"
-        │   │               │   ├── value:
-        │   │               │   │   @ TrueNode (location: (87,7)-(87,11))
-        │   │               │   └── operator_loc: ∅
-        │   │               └── @ AssocNode (location: (87,13)-(87,21))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (87,13)-(87,15))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (87,13)-(87,14) = "b"
-        │   │                   │   ├── closing_loc: (87,14)-(87,15) = ":"
-        │   │                   │   └── unescaped: "b"
-        │   │                   ├── value:
-        │   │                   │   @ FalseNode (location: (87,16)-(87,21))
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockArgumentNode (location: (87,23)-(87,30))
-        │       ├── expression:
-        │       │   @ SymbolNode (location: (87,24)-(87,30))
-        │       │   ├── flags: forced_us_ascii_encoding
-        │       │   ├── opening_loc: (87,24)-(87,25) = ":"
-        │       │   ├── value_loc: (87,25)-(87,30) = "block"
-        │       │   ├── closing_loc: ∅
-        │       │   └── unescaped: "block"
-        │       └── operator_loc: (87,23)-(87,24) = "&"
-        ├── @ CallNode (location: (89,0)-(89,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :some_func
-        │   ├── message_loc: (89,0)-(89,9) = "some_func"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (89,10)-(89,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ IntegerNode (location: (89,10)-(89,11))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── @ KeywordHashNode (location: (89,13)-(89,21))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (89,13)-(89,21))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (89,13)-(89,19))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (89,13)-(89,18) = "kwarg"
-        │   │                   │   ├── closing_loc: (89,18)-(89,19) = ":"
-        │   │                   │   └── unescaped: "kwarg"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (89,20)-(89,21))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 2
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (91,0)-(91,18))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (91,0)-(91,6))
-        │   │   └── name: :Kernel
-        │   ├── call_operator_loc: (91,6)-(91,7) = "."
-        │   ├── name: :Integer
-        │   ├── message_loc: (91,7)-(91,14) = "Integer"
-        │   ├── opening_loc: (91,14)-(91,15) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (91,15)-(91,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (91,15)-(91,17))
-        │   │           ├── flags: decimal
-        │   │           └── value: 10
-        │   ├── closing_loc: (91,17)-(91,18) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (93,0)-(93,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (93,0)-(93,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :x
-        │   │   ├── message_loc: (93,0)-(93,1) = "x"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (93,1)-(93,2) = "."
-        │   ├── name: :each
-        │   ├── message_loc: (93,2)-(93,6) = "each"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (93,7)-(93,10))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (93,7)-(93,8) = "{"
-        │       └── closing_loc: (93,9)-(93,10) = "}"
-        ├── @ CallNode (location: (95,0)-(95,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (95,0)-(95,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (95,0)-(95,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (95,3)-(95,4) = "."
-        │   ├── name: :map
-        │   ├── message_loc: (95,4)-(95,7) = "map"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (95,8)-(95,14))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (95,10)-(95,12))
-        │       │   └── body: (length: 1)
-        │       │       └── @ BackReferenceReadNode (location: (95,10)-(95,12))
-        │       │           └── name: :$&
-        │       ├── opening_loc: (95,8)-(95,9) = "{"
-        │       └── closing_loc: (95,13)-(95,14) = "}"
-        ├── @ CallNode (location: (97,0)-(97,12))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantPathNode (location: (97,0)-(97,4))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (97,0)-(97,1))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (97,3)-(97,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (97,1)-(97,3) = "::"
-        │   ├── call_operator_loc: (97,4)-(97,6) = "::"
-        │   ├── name: :C
-        │   ├── message_loc: (97,6)-(97,7) = "C"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (97,8)-(97,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SymbolNode (location: (97,8)-(97,12))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (97,8)-(97,9) = ":"
-        │   │           ├── value_loc: (97,9)-(97,12) = "foo"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "foo"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (99,0)-(99,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantPathNode (location: (99,0)-(99,4))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (99,0)-(99,1))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (99,3)-(99,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (99,1)-(99,3) = "::"
-        │   ├── call_operator_loc: (99,4)-(99,6) = "::"
-        │   ├── name: :C
-        │   ├── message_loc: (99,6)-(99,7) = "C"
-        │   ├── opening_loc: (99,7)-(99,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (99,8)-(99,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SymbolNode (location: (99,8)-(99,12))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (99,8)-(99,9) = ":"
-        │   │           ├── value_loc: (99,9)-(99,12) = "foo"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "foo"
-        │   ├── closing_loc: (99,12)-(99,13) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (101,0)-(101,17))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantPathNode (location: (101,0)-(101,4))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (101,0)-(101,1))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (101,3)-(101,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (101,1)-(101,3) = "::"
-        │   ├── call_operator_loc: (101,4)-(101,6) = "::"
-        │   ├── name: :C
-        │   ├── message_loc: (101,6)-(101,7) = "C"
-        │   ├── opening_loc: (101,7)-(101,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (101,8)-(101,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SymbolNode (location: (101,8)-(101,12))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (101,8)-(101,9) = ":"
-        │   │           ├── value_loc: (101,9)-(101,12) = "foo"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "foo"
-        │   ├── closing_loc: (101,12)-(101,13) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (101,14)-(101,17))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (101,14)-(101,15) = "{"
-        │       └── closing_loc: (101,16)-(101,17) = "}"
-        ├── @ CallNode (location: (103,0)-(103,12))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (103,0)-(103,3) = "foo"
-        │   ├── opening_loc: (103,3)-(103,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (103,4)-(103,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (103,4)-(103,11))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (103,4)-(103,11))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (103,4)-(103,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (103,4)-(103,5) = "\""
-        │   │                   │   ├── value_loc: (103,5)-(103,6) = "a"
-        │   │                   │   ├── closing_loc: (103,6)-(103,8) = "\":"
-        │   │                   │   └── unescaped: "a"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (103,9)-(103,11))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: -1
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: (103,11)-(103,12) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (105,0)-(105,28))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (105,0)-(105,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (105,4)-(105,28))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (105,4)-(105,28))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (105,4)-(105,28))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (105,4)-(105,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (105,4)-(105,7) = "bar"
-        │   │                   │   ├── closing_loc: (105,7)-(105,8) = ":"
-        │   │                   │   └── unescaped: "bar"
-        │   │                   ├── value:
-        │   │                   │   @ HashNode (location: (105,9)-(105,28))
-        │   │                   │   ├── opening_loc: (105,9)-(105,10) = "{"
-        │   │                   │   ├── elements: (length: 1)
-        │   │                   │   │   └── @ AssocNode (location: (105,11)-(105,26))
-        │   │                   │   │       ├── key:
-        │   │                   │   │       │   @ SymbolNode (location: (105,11)-(105,15))
-        │   │                   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   │       │   ├── opening_loc: ∅
-        │   │                   │   │       │   ├── value_loc: (105,11)-(105,14) = "baz"
-        │   │                   │   │       │   ├── closing_loc: (105,14)-(105,15) = ":"
-        │   │                   │   │       │   └── unescaped: "baz"
-        │   │                   │   │       ├── value:
-        │   │                   │   │       │   @ CallNode (location: (105,16)-(105,26))
-        │   │                   │   │       │   ├── flags: ignore_visibility
-        │   │                   │   │       │   ├── receiver: ∅
-        │   │                   │   │       │   ├── call_operator_loc: ∅
-        │   │                   │   │       │   ├── name: :qux
-        │   │                   │   │       │   ├── message_loc: (105,16)-(105,19) = "qux"
-        │   │                   │   │       │   ├── opening_loc: ∅
-        │   │                   │   │       │   ├── arguments: ∅
-        │   │                   │   │       │   ├── closing_loc: ∅
-        │   │                   │   │       │   └── block:
-        │   │                   │   │       │       @ BlockNode (location: (105,20)-(105,26))
-        │   │                   │   │       │       ├── locals: []
-        │   │                   │   │       │       ├── parameters: ∅
-        │   │                   │   │       │       ├── body: ∅
-        │   │                   │   │       │       ├── opening_loc: (105,20)-(105,22) = "do"
-        │   │                   │   │       │       └── closing_loc: (105,23)-(105,26) = "end"
-        │   │                   │   │       └── operator_loc: ∅
-        │   │                   │   └── closing_loc: (105,27)-(105,28) = "}"
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (107,0)-(107,24))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (107,0)-(107,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (107,4)-(107,24))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (107,4)-(107,24))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (107,4)-(107,24))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (107,4)-(107,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (107,4)-(107,7) = "bar"
-        │   │                   │   ├── closing_loc: (107,7)-(107,8) = ":"
-        │   │                   │   └── unescaped: "bar"
-        │   │                   ├── value:
-        │   │                   │   @ HashNode (location: (107,9)-(107,24))
-        │   │                   │   ├── opening_loc: (107,9)-(107,10) = "{"
-        │   │                   │   ├── elements: (length: 1)
-        │   │                   │   │   └── @ AssocSplatNode (location: (107,11)-(107,22))
-        │   │                   │   │       ├── value:
-        │   │                   │   │       │   @ CallNode (location: (107,13)-(107,22))
-        │   │                   │   │       │   ├── flags: ignore_visibility
-        │   │                   │   │       │   ├── receiver: ∅
-        │   │                   │   │       │   ├── call_operator_loc: ∅
-        │   │                   │   │       │   ├── name: :kw
-        │   │                   │   │       │   ├── message_loc: (107,13)-(107,15) = "kw"
-        │   │                   │   │       │   ├── opening_loc: ∅
-        │   │                   │   │       │   ├── arguments: ∅
-        │   │                   │   │       │   ├── closing_loc: ∅
-        │   │                   │   │       │   └── block:
-        │   │                   │   │       │       @ BlockNode (location: (107,16)-(107,22))
-        │   │                   │   │       │       ├── locals: []
-        │   │                   │   │       │       ├── parameters: ∅
-        │   │                   │   │       │       ├── body: ∅
-        │   │                   │   │       │       ├── opening_loc: (107,16)-(107,18) = "do"
-        │   │                   │   │       │       └── closing_loc: (107,19)-(107,22) = "end"
-        │   │                   │   │       └── operator_loc: (107,11)-(107,13) = "**"
-        │   │                   │   └── closing_loc: (107,23)-(107,24) = "}"
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (109,0)-(109,36))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (109,0)-(109,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (109,4)-(109,29))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (109,4)-(109,29))
-        │   │           ├── opening_loc: (109,4)-(109,5) = "\""
-        │   │           ├── parts: (length: 1)
-        │   │           │   └── @ EmbeddedStatementsNode (location: (109,5)-(109,28))
-        │   │           │       ├── opening_loc: (109,5)-(109,7) = "\#{"
-        │   │           │       ├── statements:
-        │   │           │       │   @ StatementsNode (location: (109,7)-(109,27))
-        │   │           │       │   └── body: (length: 1)
-        │   │           │       │       └── @ CallNode (location: (109,7)-(109,27))
-        │   │           │       │           ├── flags: ∅
-        │   │           │       │           ├── receiver:
-        │   │           │       │           │   @ CallNode (location: (109,7)-(109,10))
-        │   │           │       │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │       │           │   ├── receiver: ∅
-        │   │           │       │           │   ├── call_operator_loc: ∅
-        │   │           │       │           │   ├── name: :bar
-        │   │           │       │           │   ├── message_loc: (109,7)-(109,10) = "bar"
-        │   │           │       │           │   ├── opening_loc: ∅
-        │   │           │       │           │   ├── arguments: ∅
-        │   │           │       │           │   ├── closing_loc: ∅
-        │   │           │       │           │   └── block: ∅
-        │   │           │       │           ├── call_operator_loc: (109,10)-(109,11) = "."
-        │   │           │       │           ├── name: :map
-        │   │           │       │           ├── message_loc: (109,11)-(109,14) = "map"
-        │   │           │       │           ├── opening_loc: ∅
-        │   │           │       │           ├── arguments: ∅
-        │   │           │       │           ├── closing_loc: ∅
-        │   │           │       │           └── block:
-        │   │           │       │               @ BlockNode (location: (109,15)-(109,27))
-        │   │           │       │               ├── locals: []
-        │   │           │       │               ├── parameters: ∅
-        │   │           │       │               ├── body:
-        │   │           │       │               │   @ StatementsNode (location: (109,18)-(109,23))
-        │   │           │       │               │   └── body: (length: 1)
-        │   │           │       │               │       └── @ StringNode (location: (109,18)-(109,23))
-        │   │           │       │               │           ├── flags: ∅
-        │   │           │       │               │           ├── opening_loc: (109,18)-(109,19) = "\""
-        │   │           │       │               │           ├── content_loc: (109,19)-(109,22) = "baz"
-        │   │           │       │               │           ├── closing_loc: (109,22)-(109,23) = "\""
-        │   │           │       │               │           └── unescaped: "baz"
-        │   │           │       │               ├── opening_loc: (109,15)-(109,17) = "do"
-        │   │           │       │               └── closing_loc: (109,24)-(109,27) = "end"
-        │   │           │       └── closing_loc: (109,27)-(109,28) = "}"
-        │   │           └── closing_loc: (109,28)-(109,29) = "\""
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (109,30)-(109,36))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (109,30)-(109,32) = "do"
-        │       └── closing_loc: (109,33)-(109,36) = "end"
-        ├── @ CallNode (location: (111,0)-(111,28))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (111,0)-(111,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (111,4)-(111,28))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ClassNode (location: (111,4)-(111,28))
-        │   │           ├── locals: []
-        │   │           ├── class_keyword_loc: (111,4)-(111,9) = "class"
-        │   │           ├── constant_path:
-        │   │           │   @ ConstantReadNode (location: (111,10)-(111,13))
-        │   │           │   └── name: :Bar
-        │   │           ├── inheritance_operator_loc: ∅
-        │   │           ├── superclass: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (111,14)-(111,24))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (111,14)-(111,24))
-        │   │           │           ├── flags: ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :baz
-        │   │           │           ├── message_loc: (111,14)-(111,17) = "baz"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block:
-        │   │           │               @ BlockNode (location: (111,18)-(111,24))
-        │   │           │               ├── locals: []
-        │   │           │               ├── parameters: ∅
-        │   │           │               ├── body: ∅
-        │   │           │               ├── opening_loc: (111,18)-(111,20) = "do"
-        │   │           │               └── closing_loc: (111,21)-(111,24) = "end"
-        │   │           ├── end_keyword_loc: (111,25)-(111,28) = "end"
-        │   │           └── name: :Bar
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (113,0)-(113,29))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (113,0)-(113,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (113,4)-(113,29))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ModuleNode (location: (113,4)-(113,29))
-        │   │           ├── locals: []
-        │   │           ├── module_keyword_loc: (113,4)-(113,10) = "module"
-        │   │           ├── constant_path:
-        │   │           │   @ ConstantReadNode (location: (113,11)-(113,14))
-        │   │           │   └── name: :Bar
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (113,15)-(113,25))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (113,15)-(113,25))
-        │   │           │           ├── flags: ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :baz
-        │   │           │           ├── message_loc: (113,15)-(113,18) = "baz"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block:
-        │   │           │               @ BlockNode (location: (113,19)-(113,25))
-        │   │           │               ├── locals: []
-        │   │           │               ├── parameters: ∅
-        │   │           │               ├── body: ∅
-        │   │           │               ├── opening_loc: (113,19)-(113,21) = "do"
-        │   │           │               └── closing_loc: (113,22)-(113,25) = "end"
-        │   │           ├── end_keyword_loc: (113,26)-(113,29) = "end"
-        │   │           └── name: :Bar
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (115,0)-(115,16))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (115,0)-(115,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (115,4)-(115,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ArrayNode (location: (115,4)-(115,16))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 1)
-        │   │           │   └── @ CallNode (location: (115,5)-(115,15))
-        │   │           │       ├── flags: ignore_visibility
-        │   │           │       ├── receiver: ∅
-        │   │           │       ├── call_operator_loc: ∅
-        │   │           │       ├── name: :baz
-        │   │           │       ├── message_loc: (115,5)-(115,8) = "baz"
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── arguments: ∅
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── block:
-        │   │           │           @ BlockNode (location: (115,9)-(115,15))
-        │   │           │           ├── locals: []
-        │   │           │           ├── parameters: ∅
-        │   │           │           ├── body: ∅
-        │   │           │           ├── opening_loc: (115,9)-(115,11) = "do"
-        │   │           │           └── closing_loc: (115,12)-(115,15) = "end"
-        │   │           ├── opening_loc: (115,4)-(115,5) = "["
-        │   │           └── closing_loc: (115,15)-(115,16) = "]"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (117,0)-(117,28))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (117,0)-(117,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (117,2)-(117,28))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ BeginNode (location: (117,2)-(117,28))
-        │   │           ├── begin_keyword_loc: (117,2)-(117,7) = "begin"
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (117,8)-(117,24))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (117,8)-(117,24))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── receiver:
-        │   │           │           │   @ IntegerNode (location: (117,8)-(117,9))
-        │   │           │           │   ├── flags: decimal
-        │   │           │           │   └── value: 1
-        │   │           │           ├── call_operator_loc: (117,9)-(117,10) = "."
-        │   │           │           ├── name: :times
-        │   │           │           ├── message_loc: (117,10)-(117,15) = "times"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block:
-        │   │           │               @ BlockNode (location: (117,16)-(117,24))
-        │   │           │               ├── locals: []
-        │   │           │               ├── parameters: ∅
-        │   │           │               ├── body:
-        │   │           │               │   @ StatementsNode (location: (117,19)-(117,20))
-        │   │           │               │   └── body: (length: 1)
-        │   │           │               │       └── @ IntegerNode (location: (117,19)-(117,20))
-        │   │           │               │           ├── flags: decimal
-        │   │           │               │           └── value: 1
-        │   │           │               ├── opening_loc: (117,16)-(117,18) = "do"
-        │   │           │               └── closing_loc: (117,21)-(117,24) = "end"
-        │   │           ├── rescue_clause: ∅
-        │   │           ├── else_clause: ∅
-        │   │           ├── ensure_clause: ∅
-        │   │           └── end_keyword_loc: (117,25)-(117,28) = "end"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (119,0)-(124,5))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (119,0)-(119,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (119,4)-(124,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (119,4)-(119,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (119,4)-(119,5) = ":"
-        │   │       │   ├── value_loc: (119,5)-(119,6) = "a"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "a"
-        │   │       └── @ IfNode (location: (120,2)-(124,5))
-        │   │           ├── if_keyword_loc: (120,2)-(120,4) = "if"
-        │   │           ├── predicate:
-        │   │           │   @ CallNode (location: (120,5)-(120,6))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :x
-        │   │           │   ├── message_loc: (120,5)-(120,6) = "x"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── then_keyword_loc: ∅
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (121,4)-(123,7))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (121,4)-(123,7))
-        │   │           │           ├── flags: ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :bar
-        │   │           │           ├── message_loc: (121,4)-(121,7) = "bar"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block:
-        │   │           │               @ BlockNode (location: (121,8)-(123,7))
-        │   │           │               ├── locals: [:a]
-        │   │           │               ├── parameters:
-        │   │           │               │   @ BlockParametersNode (location: (121,11)-(121,14))
-        │   │           │               │   ├── parameters:
-        │   │           │               │   │   @ ParametersNode (location: (121,12)-(121,13))
-        │   │           │               │   │   ├── requireds: (length: 1)
-        │   │           │               │   │   │   └── @ RequiredParameterNode (location: (121,12)-(121,13))
-        │   │           │               │   │   │       ├── flags: ∅
-        │   │           │               │   │   │       └── name: :a
-        │   │           │               │   │   ├── optionals: (length: 0)
-        │   │           │               │   │   ├── rest: ∅
-        │   │           │               │   │   ├── posts: (length: 0)
-        │   │           │               │   │   ├── keywords: (length: 0)
-        │   │           │               │   │   ├── keyword_rest: ∅
-        │   │           │               │   │   └── block: ∅
-        │   │           │               │   ├── locals: (length: 0)
-        │   │           │               │   ├── opening_loc: (121,11)-(121,12) = "|"
-        │   │           │               │   └── closing_loc: (121,13)-(121,14) = "|"
-        │   │           │               ├── body:
-        │   │           │               │   @ StatementsNode (location: (122,6)-(122,7))
-        │   │           │               │   └── body: (length: 1)
-        │   │           │               │       └── @ LocalVariableReadNode (location: (122,6)-(122,7))
-        │   │           │               │           ├── name: :a
-        │   │           │               │           └── depth: 0
-        │   │           │               ├── opening_loc: (121,8)-(121,10) = "do"
-        │   │           │               └── closing_loc: (123,4)-(123,7) = "end"
-        │   │           ├── consequent: ∅
-        │   │           └── end_keyword_loc: (124,2)-(124,5) = "end"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (126,0)-(135,5))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (126,0)-(126,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (126,4)-(135,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ SymbolNode (location: (126,4)-(126,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (126,4)-(126,5) = ":"
-        │   │       │   ├── value_loc: (126,5)-(126,6) = "a"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "a"
-        │   │       ├── @ WhileNode (location: (127,2)-(131,5))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── keyword_loc: (127,2)-(127,7) = "while"
-        │   │       │   ├── closing_loc: (131,2)-(131,5) = "end"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ CallNode (location: (127,8)-(127,9))
-        │   │       │   │   ├── flags: variable_call, ignore_visibility
-        │   │       │   │   ├── receiver: ∅
-        │   │       │   │   ├── call_operator_loc: ∅
-        │   │       │   │   ├── name: :x
-        │   │       │   │   ├── message_loc: (127,8)-(127,9) = "x"
-        │   │       │   │   ├── opening_loc: ∅
-        │   │       │   │   ├── arguments: ∅
-        │   │       │   │   ├── closing_loc: ∅
-        │   │       │   │   └── block: ∅
-        │   │       │   └── statements:
-        │   │       │       @ StatementsNode (location: (128,4)-(130,7))
-        │   │       │       └── body: (length: 1)
-        │   │       │           └── @ CallNode (location: (128,4)-(130,7))
-        │   │       │               ├── flags: ignore_visibility
-        │   │       │               ├── receiver: ∅
-        │   │       │               ├── call_operator_loc: ∅
-        │   │       │               ├── name: :bar
-        │   │       │               ├── message_loc: (128,4)-(128,7) = "bar"
-        │   │       │               ├── opening_loc: ∅
-        │   │       │               ├── arguments: ∅
-        │   │       │               ├── closing_loc: ∅
-        │   │       │               └── block:
-        │   │       │                   @ BlockNode (location: (128,8)-(130,7))
-        │   │       │                   ├── locals: [:a]
-        │   │       │                   ├── parameters:
-        │   │       │                   │   @ BlockParametersNode (location: (128,11)-(128,14))
-        │   │       │                   │   ├── parameters:
-        │   │       │                   │   │   @ ParametersNode (location: (128,12)-(128,13))
-        │   │       │                   │   │   ├── requireds: (length: 1)
-        │   │       │                   │   │   │   └── @ RequiredParameterNode (location: (128,12)-(128,13))
-        │   │       │                   │   │   │       ├── flags: ∅
-        │   │       │                   │   │   │       └── name: :a
-        │   │       │                   │   │   ├── optionals: (length: 0)
-        │   │       │                   │   │   ├── rest: ∅
-        │   │       │                   │   │   ├── posts: (length: 0)
-        │   │       │                   │   │   ├── keywords: (length: 0)
-        │   │       │                   │   │   ├── keyword_rest: ∅
-        │   │       │                   │   │   └── block: ∅
-        │   │       │                   │   ├── locals: (length: 0)
-        │   │       │                   │   ├── opening_loc: (128,11)-(128,12) = "|"
-        │   │       │                   │   └── closing_loc: (128,13)-(128,14) = "|"
-        │   │       │                   ├── body:
-        │   │       │                   │   @ StatementsNode (location: (129,6)-(129,7))
-        │   │       │                   │   └── body: (length: 1)
-        │   │       │                   │       └── @ LocalVariableReadNode (location: (129,6)-(129,7))
-        │   │       │                   │           ├── name: :a
-        │   │       │                   │           └── depth: 0
-        │   │       │                   ├── opening_loc: (128,8)-(128,10) = "do"
-        │   │       │                   └── closing_loc: (130,4)-(130,7) = "end"
-        │   │       └── @ UntilNode (location: (132,2)-(135,5))
-        │   │           ├── flags: ∅
-        │   │           ├── keyword_loc: (132,2)-(132,7) = "until"
-        │   │           ├── closing_loc: (135,2)-(135,5) = "end"
-        │   │           ├── predicate:
-        │   │           │   @ CallNode (location: (132,8)-(132,9))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :x
-        │   │           │   ├── message_loc: (132,8)-(132,9) = "x"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           └── statements:
-        │   │               @ StatementsNode (location: (133,4)-(134,7))
-        │   │               └── body: (length: 1)
-        │   │                   └── @ CallNode (location: (133,4)-(134,7))
-        │   │                       ├── flags: ignore_visibility
-        │   │                       ├── receiver: ∅
-        │   │                       ├── call_operator_loc: ∅
-        │   │                       ├── name: :baz
-        │   │                       ├── message_loc: (133,4)-(133,7) = "baz"
-        │   │                       ├── opening_loc: ∅
-        │   │                       ├── arguments: ∅
-        │   │                       ├── closing_loc: ∅
-        │   │                       └── block:
-        │   │                           @ BlockNode (location: (133,8)-(134,7))
-        │   │                           ├── locals: []
-        │   │                           ├── parameters: ∅
-        │   │                           ├── body: ∅
-        │   │                           ├── opening_loc: (133,8)-(133,10) = "do"
-        │   │                           └── closing_loc: (134,4)-(134,7) = "end"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (137,0)-(137,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ HashNode (location: (137,0)-(137,2))
-        │   │   ├── opening_loc: (137,0)-(137,1) = "{"
-        │   │   ├── elements: (length: 0)
-        │   │   └── closing_loc: (137,1)-(137,2) = "}"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (137,3)-(137,4) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (137,5)-(137,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (137,5)-(137,9))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :A
-        │   │           ├── message_loc: (137,5)-(137,6) = "A"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (137,7)-(137,9))
-        │   │               ├── locals: []
-        │   │               ├── parameters: ∅
-        │   │               ├── body: ∅
-        │   │               ├── opening_loc: (137,7)-(137,8) = "{"
-        │   │               └── closing_loc: (137,8)-(137,9) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (139,0)-(139,16))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ HashNode (location: (139,0)-(139,2))
-        │   │   ├── opening_loc: (139,0)-(139,1) = "{"
-        │   │   ├── elements: (length: 0)
-        │   │   └── closing_loc: (139,1)-(139,2) = "}"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (139,3)-(139,4) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (139,5)-(139,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (139,5)-(139,16))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :A
-        │   │           ├── message_loc: (139,5)-(139,6) = "A"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (139,7)-(139,16))
-        │   │               ├── locals: [:a]
-        │   │               ├── parameters:
-        │   │               │   @ BlockParametersNode (location: (139,9)-(139,12))
-        │   │               │   ├── parameters:
-        │   │               │   │   @ ParametersNode (location: (139,10)-(139,11))
-        │   │               │   │   ├── requireds: (length: 1)
-        │   │               │   │   │   └── @ RequiredParameterNode (location: (139,10)-(139,11))
-        │   │               │   │   │       ├── flags: ∅
-        │   │               │   │   │       └── name: :a
-        │   │               │   │   ├── optionals: (length: 0)
-        │   │               │   │   ├── rest: ∅
-        │   │               │   │   ├── posts: (length: 0)
-        │   │               │   │   ├── keywords: (length: 0)
-        │   │               │   │   ├── keyword_rest: ∅
-        │   │               │   │   └── block: ∅
-        │   │               │   ├── locals: (length: 0)
-        │   │               │   ├── opening_loc: (139,9)-(139,10) = "|"
-        │   │               │   └── closing_loc: (139,11)-(139,12) = "|"
-        │   │               ├── body:
-        │   │               │   @ StatementsNode (location: (139,13)-(139,14))
-        │   │               │   └── body: (length: 1)
-        │   │               │       └── @ LocalVariableReadNode (location: (139,13)-(139,14))
-        │   │               │           ├── name: :a
-        │   │               │           └── depth: 0
-        │   │               ├── opening_loc: (139,7)-(139,8) = "{"
-        │   │               └── closing_loc: (139,15)-(139,16) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (141,0)-(141,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (141,0)-(141,4))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :A
-        │   │   ├── message_loc: (141,0)-(141,1) = "A"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (141,2)-(141,4))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (141,2)-(141,3) = "{"
-        │   │       └── closing_loc: (141,3)-(141,4) = "}"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (141,5)-(141,6) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (141,7)-(141,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (141,7)-(141,11))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :A
-        │   │           ├── message_loc: (141,7)-(141,8) = "A"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (141,9)-(141,11))
-        │   │               ├── locals: []
-        │   │               ├── parameters: ∅
-        │   │               ├── body: ∅
-        │   │               ├── opening_loc: (141,9)-(141,10) = "{"
-        │   │               └── closing_loc: (141,10)-(141,11) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (143,0)-(143,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (143,0)-(143,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :lst
-        │   │   ├── message_loc: (143,0)-(143,3) = "lst"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<<
-        │   ├── message_loc: (143,4)-(143,6) = "<<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (143,7)-(143,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (143,7)-(143,11))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :A
-        │   │           ├── message_loc: (143,7)-(143,8) = "A"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (143,9)-(143,11))
-        │   │               ├── locals: []
-        │   │               ├── parameters: ∅
-        │   │               ├── body: ∅
-        │   │               ├── opening_loc: (143,9)-(143,10) = "{"
-        │   │               └── closing_loc: (143,10)-(143,11) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ InterpolatedStringNode (location: (145,0)-(145,17))
-        │   ├── opening_loc: (145,0)-(145,1) = "\""
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedStatementsNode (location: (145,1)-(145,16))
-        │   │       ├── opening_loc: (145,1)-(145,3) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (145,4)-(145,14))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (145,4)-(145,14))
-        │   │       │           ├── flags: ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :join
-        │   │       │           ├── message_loc: (145,4)-(145,8) = "join"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments:
-        │   │       │           │   @ ArgumentsNode (location: (145,9)-(145,14))
-        │   │       │           │   ├── flags: ∅
-        │   │       │           │   └── arguments: (length: 1)
-        │   │       │           │       └── @ ParenthesesNode (location: (145,9)-(145,14))
-        │   │       │           │           ├── body:
-        │   │       │           │           │   @ StatementsNode (location: (145,10)-(145,13))
-        │   │       │           │           │   └── body: (length: 1)
-        │   │       │           │           │       └── @ StringNode (location: (145,10)-(145,13))
-        │   │       │           │           │           ├── flags: ∅
-        │   │       │           │           │           ├── opening_loc: (145,10)-(145,11) = "\""
-        │   │       │           │           │           ├── content_loc: (145,11)-(145,12) = " "
-        │   │       │           │           │           ├── closing_loc: (145,12)-(145,13) = "\""
-        │   │       │           │           │           └── unescaped: " "
-        │   │       │           │           ├── opening_loc: (145,9)-(145,10) = "("
-        │   │       │           │           └── closing_loc: (145,13)-(145,14) = ")"
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       └── closing_loc: (145,15)-(145,16) = "}"
-        │   └── closing_loc: (145,16)-(145,17) = "\""
-        ├── @ InterpolatedStringNode (location: (147,0)-(147,8))
-        │   ├── opening_loc: (147,0)-(147,1) = "\""
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedStatementsNode (location: (147,1)-(147,7))
-        │   │       ├── opening_loc: (147,1)-(147,3) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (147,3)-(147,6))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ ParenthesesNode (location: (147,3)-(147,6))
-        │   │       │           ├── body:
-        │   │       │           │   @ StatementsNode (location: (147,4)-(147,5))
-        │   │       │           │   └── body: (length: 1)
-        │   │       │           │       └── @ CallNode (location: (147,4)-(147,5))
-        │   │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │           │           ├── receiver: ∅
-        │   │       │           │           ├── call_operator_loc: ∅
-        │   │       │           │           ├── name: :v
-        │   │       │           │           ├── message_loc: (147,4)-(147,5) = "v"
-        │   │       │           │           ├── opening_loc: ∅
-        │   │       │           │           ├── arguments: ∅
-        │   │       │           │           ├── closing_loc: ∅
-        │   │       │           │           └── block: ∅
-        │   │       │           ├── opening_loc: (147,3)-(147,4) = "("
-        │   │       │           └── closing_loc: (147,5)-(147,6) = ")"
-        │   │       └── closing_loc: (147,6)-(147,7) = "}"
-        │   └── closing_loc: (147,7)-(147,8) = "\""
-        ├── @ DefNode (location: (149,0)-(149,18))
-        │   ├── name: :f
-        │   ├── name_loc: (149,4)-(149,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (149,6)-(149,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (149,6)-(149,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (149,6)-(149,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (149,10)-(149,13))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (149,10)-(149,13))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :p
-        │   │           ├── message_loc: (149,10)-(149,11) = "p"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (149,12)-(149,13))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ SplatNode (location: (149,12)-(149,13))
-        │   │           │           ├── operator_loc: (149,12)-(149,13) = "*"
-        │   │           │           └── expression: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (149,0)-(149,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (149,5)-(149,6) = "("
-        │   ├── rparen_loc: (149,7)-(149,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (149,15)-(149,18) = "end"
-        ├── @ CallNode (location: (151,0)-(151,16))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (151,0)-(151,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (151,4)-(151,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ IntegerNode (location: (151,4)-(151,5))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── @ CallNode (location: (151,7)-(151,16))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :Bar
-        │   │           ├── message_loc: (151,7)-(151,10) = "Bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (151,11)-(151,16))
-        │   │               ├── locals: []
-        │   │               ├── parameters: ∅
-        │   │               ├── body:
-        │   │               │   @ StatementsNode (location: (151,13)-(151,14))
-        │   │               │   └── body: (length: 1)
-        │   │               │       └── @ IntegerNode (location: (151,13)-(151,14))
-        │   │               │           ├── flags: decimal
-        │   │               │           └── value: 1
-        │   │               ├── opening_loc: (151,11)-(151,12) = "{"
-        │   │               └── closing_loc: (151,15)-(151,16) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ LocalVariableWriteNode (location: (153,0)-(153,7))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (153,0)-(153,3) = "foo"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (153,6)-(153,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (153,4)-(153,5) = "="
-        ├── @ CallNode (location: (154,0)-(154,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (154,0)-(154,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (154,4)-(154,6))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (154,4)-(154,5) = "{"
-        │       └── closing_loc: (154,5)-(154,6) = "}"
-        └── @ CallNode (location: (156,0)-(156,19))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ InstanceVariableReadNode (location: (156,0)-(156,2))
-            │   └── name: :@a
-            ├── call_operator_loc: (156,2)-(156,3) = "."
-            ├── name: :b
-            ├── message_loc: (156,3)-(156,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (156,5)-(156,19))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (156,5)-(156,19))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (156,5)-(156,19))
-            │                   ├── key:
-            │                   │   @ InterpolatedSymbolNode (location: (156,5)-(156,16))
-            │                   │   ├── opening_loc: (156,5)-(156,6) = "\""
-            │                   │   ├── parts: (length: 2)
-            │                   │   │   ├── @ StringNode (location: (156,6)-(156,7))
-            │                   │   │   │   ├── flags: ∅
-            │                   │   │   │   ├── opening_loc: ∅
-            │                   │   │   │   ├── content_loc: (156,6)-(156,7) = "c"
-            │                   │   │   │   ├── closing_loc: ∅
-            │                   │   │   │   └── unescaped: "c"
-            │                   │   │   └── @ EmbeddedStatementsNode (location: (156,7)-(156,14))
-            │                   │   │       ├── opening_loc: (156,7)-(156,9) = "\#{"
-            │                   │   │       ├── statements:
-            │                   │   │       │   @ StatementsNode (location: (156,9)-(156,13))
-            │                   │   │       │   └── body: (length: 1)
-            │                   │   │       │       └── @ CallNode (location: (156,9)-(156,13))
-            │                   │   │       │           ├── flags: variable_call, ignore_visibility
-            │                   │   │       │           ├── receiver: ∅
-            │                   │   │       │           ├── call_operator_loc: ∅
-            │                   │   │       │           ├── name: :name
-            │                   │   │       │           ├── message_loc: (156,9)-(156,13) = "name"
-            │                   │   │       │           ├── opening_loc: ∅
-            │                   │   │       │           ├── arguments: ∅
-            │                   │   │       │           ├── closing_loc: ∅
-            │                   │   │       │           └── block: ∅
-            │                   │   │       └── closing_loc: (156,13)-(156,14) = "}"
-            │                   │   └── closing_loc: (156,14)-(156,16) = "\":"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (156,17)-(156,19))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 42
-            │                   └── operator_loc: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/methods.txt b/test/mri/prism/snapshots/methods.txt
deleted file mode 100644
index ac21bbaed19..00000000000
--- a/test/mri/prism/snapshots/methods.txt
+++ /dev/null
@@ -1,2051 +0,0 @@
-@ ProgramNode (location: (1,0)-(183,37))
-├── locals: [:a, :c, :foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(183,37))
-    └── body: (length: 69)
-        ├── @ DefNode (location: (1,0)-(2,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,8)-(1,18))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,18))
-        │   │   │       ├── lefts: (length: 2)
-        │   │   │       │   ├── @ RequiredParameterNode (location: (1,9)-(1,12))
-        │   │   │       │   │   ├── flags: ∅
-        │   │   │       │   │   └── name: :bar
-        │   │   │       │   └── @ RequiredParameterNode (location: (1,14)-(1,17))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :baz
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-        │   │   │       └── rparen_loc: (1,17)-(1,18) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:bar, :baz]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,7)-(1,8) = "("
-        │   ├── rparen_loc: (1,18)-(1,19) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (2,0)-(2,3) = "end"
-        ├── @ DefNode (location: (4,0)-(5,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (4,4)-(4,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (4,8)-(4,44))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (4,8)-(4,18))
-        │   │   │       ├── lefts: (length: 2)
-        │   │   │       │   ├── @ RequiredParameterNode (location: (4,9)-(4,12))
-        │   │   │       │   │   ├── flags: ∅
-        │   │   │       │   │   └── name: :bar
-        │   │   │       │   └── @ RequiredParameterNode (location: (4,14)-(4,17))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :baz
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (4,8)-(4,9) = "("
-        │   │   │       └── rparen_loc: (4,17)-(4,18) = ")"
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (4,20)-(4,32))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :optional
-        │   │   │       ├── name_loc: (4,20)-(4,28) = "optional"
-        │   │   │       ├── operator_loc: (4,29)-(4,30) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (4,31)-(4,32))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (4,34)-(4,44))
-        │   │   │       ├── lefts: (length: 2)
-        │   │   │       │   ├── @ RequiredParameterNode (location: (4,35)-(4,38))
-        │   │   │       │   │   ├── flags: ∅
-        │   │   │       │   │   └── name: :bin
-        │   │   │       │   └── @ RequiredParameterNode (location: (4,40)-(4,43))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :bag
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (4,34)-(4,35) = "("
-        │   │   │       └── rparen_loc: (4,43)-(4,44) = ")"
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:bar, :baz, :optional, :bin, :bag]
-        │   ├── def_keyword_loc: (4,0)-(4,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (4,7)-(4,8) = "("
-        │   ├── rparen_loc: (4,44)-(4,45) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ DefNode (location: (8,0)-(8,18))
-        │   ├── name: :a
-        │   ├── name_loc: (8,4)-(8,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (8,0)-(8,18))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── rescue_clause: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (8,7)-(8,18))
-        │   │   │   ├── ensure_keyword_loc: (8,7)-(8,13) = "ensure"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (8,15)-(8,18) = "end"
-        │   │   └── end_keyword_loc: (8,15)-(8,18) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (8,0)-(8,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (8,15)-(8,18) = "end"
-        ├── @ DefNode (location: (10,0)-(11,3))
-        │   ├── name: :a
-        │   ├── name_loc: (10,8)-(10,9) = "a"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (10,4)-(10,7))
-        │   │   ├── body:
-        │   │   │   @ CallNode (location: (10,5)-(10,6))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :b
-        │   │   │   ├── message_loc: (10,5)-(10,6) = "b"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── opening_loc: (10,4)-(10,5) = "("
-        │   │   └── closing_loc: (10,6)-(10,7) = ")"
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (10,0)-(10,3) = "def"
-        │   ├── operator_loc: (10,7)-(10,8) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ DefNode (location: (13,0)-(14,3))
-        │   ├── name: :b
-        │   ├── name_loc: (13,9)-(13,10) = "b"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (13,4)-(13,7))
-        │   │   ├── body:
-        │   │   │   @ CallNode (location: (13,5)-(13,6))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :a
-        │   │   │   ├── message_loc: (13,5)-(13,6) = "a"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── opening_loc: (13,4)-(13,5) = "("
-        │   │   └── closing_loc: (13,6)-(13,7) = ")"
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (13,0)-(13,3) = "def"
-        │   ├── operator_loc: (13,7)-(13,9) = "::"
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (14,0)-(14,3) = "end"
-        ├── @ DefNode (location: (16,0)-(17,3))
-        │   ├── name: :a
-        │   ├── name_loc: (16,10)-(16,11) = "a"
-        │   ├── receiver:
-        │   │   @ FalseNode (location: (16,4)-(16,9))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (16,0)-(16,3) = "def"
-        │   ├── operator_loc: (16,9)-(16,10) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (17,0)-(17,3) = "end"
-        ├── @ DefNode (location: (19,0)-(20,3))
-        │   ├── name: :a
-        │   ├── name_loc: (19,4)-(19,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (19,6)-(19,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (19,6)-(19,9))
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (19,0)-(19,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (19,5)-(19,6) = "("
-        │   ├── rparen_loc: (19,9)-(19,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (20,0)-(20,3) = "end"
-        ├── @ DefNode (location: (22,0)-(23,3))
-        │   ├── name: :a
-        │   ├── name_loc: (22,9)-(22,10) = "a"
-        │   ├── receiver:
-        │   │   @ GlobalVariableReadNode (location: (22,4)-(22,8))
-        │   │   └── name: :$var
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (22,0)-(22,3) = "def"
-        │   ├── operator_loc: (22,8)-(22,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (23,0)-(23,3) = "end"
-        ├── @ DefNode (location: (25,0)-(26,3))
-        │   ├── name: :b
-        │   ├── name_loc: (25,6)-(25,7) = "b"
-        │   ├── receiver:
-        │   │   @ CallNode (location: (25,4)-(25,5))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (25,4)-(25,5) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (25,0)-(25,3) = "def"
-        │   ├── operator_loc: (25,5)-(25,6) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (26,0)-(26,3) = "end"
-        ├── @ DefNode (location: (28,0)-(29,3))
-        │   ├── name: :a
-        │   ├── name_loc: (28,9)-(28,10) = "a"
-        │   ├── receiver:
-        │   │   @ InstanceVariableReadNode (location: (28,4)-(28,8))
-        │   │   └── name: :@var
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (28,0)-(28,3) = "def"
-        │   ├── operator_loc: (28,8)-(28,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (29,0)-(29,3) = "end"
-        ├── @ DefNode (location: (31,0)-(31,13))
-        │   ├── name: :a
-        │   ├── name_loc: (31,4)-(31,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (31,6)-(31,8))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ RequiredKeywordParameterNode (location: (31,6)-(31,8))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :b
-        │   │   │       └── name_loc: (31,6)-(31,8) = "b:"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (31,0)-(31,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (31,10)-(31,13) = "end"
-        ├── @ StringNode (location: (33,0)-(33,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (33,0)-(33,2) = "%,"
-        │   ├── content_loc: (33,2)-(33,5) = "abc"
-        │   ├── closing_loc: (33,5)-(33,6) = ","
-        │   └── unescaped: "abc"
-        ├── @ DefNode (location: (35,0)-(36,3))
-        │   ├── name: :a
-        │   ├── name_loc: (35,4)-(35,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (35,6)-(35,8))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ RequiredKeywordParameterNode (location: (35,6)-(35,8))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :b
-        │   │   │       └── name_loc: (35,6)-(35,8) = "b:"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (35,0)-(35,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (35,5)-(35,6) = "("
-        │   ├── rparen_loc: (35,8)-(35,9) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (36,0)-(36,3) = "end"
-        ├── @ DefNode (location: (38,0)-(39,3))
-        │   ├── name: :a
-        │   ├── name_loc: (38,4)-(38,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (38,6)-(38,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ KeywordRestParameterNode (location: (38,6)-(38,9))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :b
-        │   │   │   ├── name_loc: (38,8)-(38,9) = "b"
-        │   │   │   └── operator_loc: (38,6)-(38,8) = "**"
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (38,0)-(38,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (38,5)-(38,6) = "("
-        │   ├── rparen_loc: (38,9)-(38,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (39,0)-(39,3) = "end"
-        ├── @ DefNode (location: (41,0)-(42,3))
-        │   ├── name: :a
-        │   ├── name_loc: (41,4)-(41,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (41,6)-(41,8))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ KeywordRestParameterNode (location: (41,6)-(41,8))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (41,6)-(41,8) = "**"
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (41,0)-(41,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (41,5)-(41,6) = "("
-        │   ├── rparen_loc: (41,8)-(41,9) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (42,0)-(42,3) = "end"
-        ├── @ LocalVariableWriteNode (location: (44,0)-(44,5))
-        │   ├── name: :a
-        │   ├── depth: 0
-        │   ├── name_loc: (44,0)-(44,1) = "a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (44,4)-(44,5))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (44,2)-(44,3) = "="
-        ├── @ DefNode (location: (44,7)-(45,3))
-        │   ├── name: :a
-        │   ├── name_loc: (44,11)-(44,12) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (44,7)-(44,10) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (45,0)-(45,3) = "end"
-        ├── @ DefNode (location: (47,0)-(48,3))
-        │   ├── name: :a
-        │   ├── name_loc: (47,4)-(47,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (47,6)-(47,13))
-        │   │   ├── requireds: (length: 3)
-        │   │   │   ├── @ RequiredParameterNode (location: (47,6)-(47,7))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :b
-        │   │   │   ├── @ RequiredParameterNode (location: (47,9)-(47,10))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :c
-        │   │   │   └── @ RequiredParameterNode (location: (47,12)-(47,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :d
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b, :c, :d]
-        │   ├── def_keyword_loc: (47,0)-(47,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (48,0)-(48,3) = "end"
-        ├── @ DefNode (location: (50,0)-(51,3))
-        │   ├── name: :a
-        │   ├── name_loc: (50,8)-(50,9) = "a"
-        │   ├── receiver:
-        │   │   @ NilNode (location: (50,4)-(50,7))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (50,0)-(50,3) = "def"
-        │   ├── operator_loc: (50,7)-(50,8) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (51,0)-(51,3) = "end"
-        ├── @ DefNode (location: (53,0)-(54,3))
-        │   ├── name: :a
-        │   ├── name_loc: (53,4)-(53,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (53,6)-(53,14))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 2)
-        │   │   │   ├── @ RequiredKeywordParameterNode (location: (53,6)-(53,8))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   └── name_loc: (53,6)-(53,8) = "b:"
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (53,10)-(53,14))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :c
-        │   │   │       ├── name_loc: (53,10)-(53,12) = "c:"
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (53,13)-(53,14))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b, :c]
-        │   ├── def_keyword_loc: (53,0)-(53,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (54,0)-(54,3) = "end"
-        ├── @ DefNode (location: (56,0)-(57,3))
-        │   ├── name: :a
-        │   ├── name_loc: (56,4)-(56,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (56,6)-(56,14))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 2)
-        │   │   │   ├── @ RequiredKeywordParameterNode (location: (56,6)-(56,8))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   └── name_loc: (56,6)-(56,8) = "b:"
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (56,10)-(56,14))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :c
-        │   │   │       ├── name_loc: (56,10)-(56,12) = "c:"
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (56,13)-(56,14))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b, :c]
-        │   ├── def_keyword_loc: (56,0)-(56,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (56,5)-(56,6) = "("
-        │   ├── rparen_loc: (56,14)-(56,15) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (57,0)-(57,3) = "end"
-        ├── @ DefNode (location: (59,0)-(61,3))
-        │   ├── name: :a
-        │   ├── name_loc: (59,4)-(59,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (59,6)-(60,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 2)
-        │   │   │   ├── @ OptionalKeywordParameterNode (location: (59,6)-(60,3))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── name_loc: (59,6)-(59,8) = "b:"
-        │   │   │   │   └── value:
-        │   │   │   │       @ IntegerNode (location: (60,2)-(60,3))
-        │   │   │   │       ├── flags: decimal
-        │   │   │   │       └── value: 1
-        │   │   │   └── @ RequiredKeywordParameterNode (location: (60,5)-(60,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :c
-        │   │   │       └── name_loc: (60,5)-(60,7) = "c:"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b, :c]
-        │   ├── def_keyword_loc: (59,0)-(59,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (59,5)-(59,6) = "("
-        │   ├── rparen_loc: (60,7)-(60,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (61,0)-(61,3) = "end"
-        ├── @ StringNode (location: (63,0)-(63,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (63,0)-(63,2) = "%."
-        │   ├── content_loc: (63,2)-(63,5) = "abc"
-        │   ├── closing_loc: (63,5)-(63,6) = "."
-        │   └── unescaped: "abc"
-        ├── @ DefNode (location: (65,0)-(66,3))
-        │   ├── name: :a
-        │   ├── name_loc: (65,4)-(65,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (65,6)-(65,18))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 2)
-        │   │   │   ├── @ OptionalParameterNode (location: (65,6)-(65,11))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── name_loc: (65,6)-(65,7) = "b"
-        │   │   │   │   ├── operator_loc: (65,8)-(65,9) = "="
-        │   │   │   │   └── value:
-        │   │   │   │       @ IntegerNode (location: (65,10)-(65,11))
-        │   │   │   │       ├── flags: decimal
-        │   │   │   │       └── value: 1
-        │   │   │   └── @ OptionalParameterNode (location: (65,13)-(65,18))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :c
-        │   │   │       ├── name_loc: (65,13)-(65,14) = "c"
-        │   │   │       ├── operator_loc: (65,15)-(65,16) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (65,17)-(65,18))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b, :c]
-        │   ├── def_keyword_loc: (65,0)-(65,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (66,0)-(66,3) = "end"
-        ├── @ DefNode (location: (68,0)-(69,3))
-        │   ├── name: :a
-        │   ├── name_loc: (68,4)-(68,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (68,0)-(68,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (68,5)-(68,6) = "("
-        │   ├── rparen_loc: (68,6)-(68,7) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (69,0)-(69,3) = "end"
-        ├── @ DefNode (location: (71,0)-(72,3))
-        │   ├── name: :a
-        │   ├── name_loc: (71,4)-(71,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (71,6)-(71,14))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (71,6)-(71,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :b
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (71,9)-(71,14))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :c
-        │   │   │       ├── name_loc: (71,9)-(71,10) = "c"
-        │   │   │       ├── operator_loc: (71,11)-(71,12) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (71,13)-(71,14))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b, :c]
-        │   ├── def_keyword_loc: (71,0)-(71,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (72,0)-(72,3) = "end"
-        ├── @ DefNode (location: (74,0)-(75,3))
-        │   ├── name: :a
-        │   ├── name_loc: (74,4)-(74,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (74,6)-(74,7))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (74,6)-(74,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :b
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (74,0)-(74,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (75,0)-(75,3) = "end"
-        ├── @ DefNode (location: (77,0)-(77,32))
-        │   ├── name: :a
-        │   ├── name_loc: (77,4)-(77,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (77,0)-(77,32))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (77,7)-(77,13))
-        │   │   │   ├── keyword_loc: (77,7)-(77,13) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause:
-        │   │   │   @ ElseNode (location: (77,15)-(77,27))
-        │   │   │   ├── else_keyword_loc: (77,15)-(77,19) = "else"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (77,21)-(77,27) = "ensure"
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (77,21)-(77,32))
-        │   │   │   ├── ensure_keyword_loc: (77,21)-(77,27) = "ensure"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (77,29)-(77,32) = "end"
-        │   │   └── end_keyword_loc: (77,29)-(77,32) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (77,0)-(77,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (77,29)-(77,32) = "end"
-        ├── @ DefNode (location: (79,0)-(80,3))
-        │   ├── name: :a
-        │   ├── name_loc: (79,4)-(79,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (79,6)-(79,8))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (79,6)-(79,8))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :b
-        │   │   │   ├── name_loc: (79,7)-(79,8) = "b"
-        │   │   │   └── operator_loc: (79,6)-(79,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (79,0)-(79,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (80,0)-(80,3) = "end"
-        ├── @ DefNode (location: (82,0)-(83,3))
-        │   ├── name: :a
-        │   ├── name_loc: (82,4)-(82,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (82,6)-(82,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (82,6)-(82,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (82,6)-(82,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (82,0)-(82,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (82,5)-(82,6) = "("
-        │   ├── rparen_loc: (82,7)-(82,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (83,0)-(83,3) = "end"
-        ├── @ DefNode (location: (85,0)-(87,3))
-        │   ├── name: :a
-        │   ├── name_loc: (85,4)-(85,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (86,0)-(86,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableWriteNode (location: (86,0)-(86,5))
-        │   │           ├── name: :b
-        │   │           ├── depth: 0
-        │   │           ├── name_loc: (86,0)-(86,1) = "b"
-        │   │           ├── value:
-        │   │           │   @ IntegerNode (location: (86,4)-(86,5))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           └── operator_loc: (86,2)-(86,3) = "="
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (85,0)-(85,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (87,0)-(87,3) = "end"
-        ├── @ DefNode (location: (89,0)-(90,3))
-        │   ├── name: :a
-        │   ├── name_loc: (89,9)-(89,10) = "a"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (89,4)-(89,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (89,0)-(89,3) = "def"
-        │   ├── operator_loc: (89,8)-(89,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (90,0)-(90,3) = "end"
-        ├── @ DefNode (location: (92,0)-(93,3))
-        │   ├── name: :a
-        │   ├── name_loc: (92,9)-(92,10) = "a"
-        │   ├── receiver:
-        │   │   @ TrueNode (location: (92,4)-(92,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (92,0)-(92,3) = "def"
-        │   ├── operator_loc: (92,8)-(92,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (93,0)-(93,3) = "end"
-        ├── @ DefNode (location: (95,0)-(96,3))
-        │   ├── name: :a
-        │   ├── name_loc: (95,4)-(95,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (95,0)-(95,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (96,0)-(96,3) = "end"
-        ├── @ DefNode (location: (98,0)-(101,3))
-        │   ├── name: :hi
-        │   ├── name_loc: (98,4)-(98,6) = "hi"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (99,0)-(100,4))
-        │   │   └── body: (length: 2)
-        │   │       ├── @ IfNode (location: (99,0)-(99,18))
-        │   │       │   ├── if_keyword_loc: (99,11)-(99,13) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ TrueNode (location: (99,14)-(99,18))
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (99,0)-(99,10))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ ReturnNode (location: (99,0)-(99,10))
-        │   │       │   │           ├── keyword_loc: (99,0)-(99,6) = "return"
-        │   │       │   │           └── arguments:
-        │   │       │   │               @ ArgumentsNode (location: (99,7)-(99,10))
-        │   │       │   │               ├── flags: ∅
-        │   │       │   │               └── arguments: (length: 1)
-        │   │       │   │                   └── @ SymbolNode (location: (99,7)-(99,10))
-        │   │       │   │                       ├── flags: forced_us_ascii_encoding
-        │   │       │   │                       ├── opening_loc: (99,7)-(99,8) = ":"
-        │   │       │   │                       ├── value_loc: (99,8)-(99,10) = "hi"
-        │   │       │   │                       ├── closing_loc: ∅
-        │   │       │   │                       └── unescaped: "hi"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       └── @ SymbolNode (location: (100,0)-(100,4))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (100,0)-(100,1) = ":"
-        │   │           ├── value_loc: (100,1)-(100,4) = "bye"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "bye"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (98,0)-(98,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (101,0)-(101,3) = "end"
-        ├── @ DefNode (location: (103,0)-(103,11))
-        │   ├── name: :foo
-        │   ├── name_loc: (103,4)-(103,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (103,10)-(103,11))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (103,10)-(103,11))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (103,0)-(103,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (103,8)-(103,9) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (104,0)-(104,11))
-        │   ├── name: :bar
-        │   ├── name_loc: (104,4)-(104,7) = "bar"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (104,10)-(104,11))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (104,10)-(104,11))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (104,0)-(104,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (104,8)-(104,9) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (106,0)-(106,18))
-        │   ├── name: :foo
-        │   ├── name_loc: (106,4)-(106,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (106,8)-(106,11))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (106,8)-(106,11))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :bar
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (106,15)-(106,18))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (106,15)-(106,18))
-        │   │           ├── flags: decimal
-        │   │           └── value: 123
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (106,0)-(106,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (106,7)-(106,8) = "("
-        │   ├── rparen_loc: (106,11)-(106,12) = ")"
-        │   ├── equal_loc: (106,13)-(106,14) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (108,0)-(108,13))
-        │   ├── name: :foo
-        │   ├── name_loc: (108,4)-(108,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (108,10)-(108,13))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (108,10)-(108,13))
-        │   │           ├── flags: decimal
-        │   │           └── value: 123
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (108,0)-(108,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (108,8)-(108,9) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (110,0)-(110,19))
-        │   ├── name: :a
-        │   ├── name_loc: (110,4)-(110,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (110,6)-(110,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (110,6)-(110,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (110,6)-(110,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (110,10)-(110,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (110,10)-(110,14))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (110,10)-(110,11) = "b"
-        │   │           ├── opening_loc: (110,11)-(110,12) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (110,12)-(110,13))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ SplatNode (location: (110,12)-(110,13))
-        │   │           │           ├── operator_loc: (110,12)-(110,13) = "*"
-        │   │           │           └── expression: ∅
-        │   │           ├── closing_loc: (110,13)-(110,14) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (110,0)-(110,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (110,5)-(110,6) = "("
-        │   ├── rparen_loc: (110,7)-(110,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (110,16)-(110,19) = "end"
-        ├── @ DefNode (location: (112,0)-(112,23))
-        │   ├── name: :a
-        │   ├── name_loc: (112,4)-(112,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (112,6)-(112,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (112,6)-(112,9))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (112,12)-(112,18))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (112,12)-(112,18))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (112,12)-(112,13) = "b"
-        │   │           ├── opening_loc: (112,13)-(112,14) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (112,14)-(112,17))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ ForwardingArgumentsNode (location: (112,14)-(112,17))
-        │   │           ├── closing_loc: (112,17)-(112,18) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (112,0)-(112,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (112,5)-(112,6) = "("
-        │   ├── rparen_loc: (112,9)-(112,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (112,20)-(112,23) = "end"
-        ├── @ DefNode (location: (114,0)-(114,29))
-        │   ├── name: :a
-        │   ├── name_loc: (114,4)-(114,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (114,6)-(114,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (114,6)-(114,9))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (114,12)-(114,24))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (114,12)-(114,24))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (114,12)-(114,13) = "b"
-        │   │           ├── opening_loc: (114,13)-(114,14) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (114,14)-(114,23))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 3)
-        │   │           │       ├── @ IntegerNode (location: (114,14)-(114,15))
-        │   │           │       │   ├── flags: decimal
-        │   │           │       │   └── value: 1
-        │   │           │       ├── @ IntegerNode (location: (114,17)-(114,18))
-        │   │           │       │   ├── flags: decimal
-        │   │           │       │   └── value: 2
-        │   │           │       └── @ ForwardingArgumentsNode (location: (114,20)-(114,23))
-        │   │           ├── closing_loc: (114,23)-(114,24) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (114,0)-(114,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (114,5)-(114,6) = "("
-        │   ├── rparen_loc: (114,9)-(114,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (114,26)-(114,29) = "end"
-        ├── @ DefNode (location: (116,0)-(117,3))
-        │   ├── name: :a
-        │   ├── name_loc: (116,12)-(116,13) = "a"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (116,4)-(116,11))
-        │   │   ├── body:
-        │   │   │   @ LocalVariableWriteNode (location: (116,5)-(116,10))
-        │   │   │   ├── name: :c
-        │   │   │   ├── depth: 0
-        │   │   │   ├── name_loc: (116,5)-(116,6) = "c"
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (116,9)-(116,10))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── message_loc: (116,9)-(116,10) = "b"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: (116,7)-(116,8) = "="
-        │   │   ├── opening_loc: (116,4)-(116,5) = "("
-        │   │   └── closing_loc: (116,10)-(116,11) = ")"
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (116,0)-(116,3) = "def"
-        │   ├── operator_loc: (116,11)-(116,12) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (117,0)-(117,3) = "end"
-        ├── @ DefNode (location: (119,0)-(120,3))
-        │   ├── name: :a
-        │   ├── name_loc: (119,4)-(119,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (119,6)-(119,8))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (119,6)-(119,8))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (119,7)-(119,8) = "b"
-        │   │       └── operator_loc: (119,6)-(119,7) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (119,0)-(119,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (120,0)-(120,3) = "end"
-        ├── @ DefNode (location: (122,0)-(123,3))
-        │   ├── name: :a
-        │   ├── name_loc: (122,4)-(122,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (122,6)-(122,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (122,6)-(122,7))
-        │   │       ├── flags: ∅
-        │   │       ├── name: ∅
-        │   │       ├── name_loc: ∅
-        │   │       └── operator_loc: (122,6)-(122,7) = "&"
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (122,0)-(122,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (122,5)-(122,6) = "("
-        │   ├── rparen_loc: (122,7)-(122,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (123,0)-(123,3) = "end"
-        ├── @ DefNode (location: (125,0)-(126,3))
-        │   ├── name: :a
-        │   ├── name_loc: (125,10)-(125,11) = "a"
-        │   ├── receiver:
-        │   │   @ ClassVariableReadNode (location: (125,4)-(125,9))
-        │   │   └── name: :@@var
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (125,0)-(125,3) = "def"
-        │   ├── operator_loc: (125,9)-(125,10) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (126,0)-(126,3) = "end"
-        ├── @ DefNode (location: (128,0)-(129,3))
-        │   ├── name: :C
-        │   ├── name_loc: (128,12)-(128,13) = "C"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (128,4)-(128,11))
-        │   │   ├── body:
-        │   │   │   @ LocalVariableWriteNode (location: (128,5)-(128,10))
-        │   │   │   ├── name: :a
-        │   │   │   ├── depth: 0
-        │   │   │   ├── name_loc: (128,5)-(128,6) = "a"
-        │   │   │   ├── value:
-        │   │   │   │   @ CallNode (location: (128,9)-(128,10))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── message_loc: (128,9)-(128,10) = "b"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: (128,7)-(128,8) = "="
-        │   │   ├── opening_loc: (128,4)-(128,5) = "("
-        │   │   └── closing_loc: (128,10)-(128,11) = ")"
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (128,0)-(128,3) = "def"
-        │   ├── operator_loc: (128,11)-(128,12) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (129,0)-(129,3) = "end"
-        ├── @ DefNode (location: (131,0)-(131,28))
-        │   ├── name: :Array_function
-        │   ├── name_loc: (131,9)-(131,23) = "Array_function"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (131,4)-(131,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (131,0)-(131,3) = "def"
-        │   ├── operator_loc: (131,8)-(131,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (131,25)-(131,28) = "end"
-        ├── @ ConstantWriteNode (location: (133,0)-(133,9))
-        │   ├── name: :Const
-        │   ├── name_loc: (133,0)-(133,5) = "Const"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (133,8)-(133,9))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (133,6)-(133,7) = "="
-        ├── @ DefNode (location: (133,11)-(134,3))
-        │   ├── name: :a
-        │   ├── name_loc: (133,21)-(133,22) = "a"
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (133,15)-(133,20))
-        │   │   └── name: :Const
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (133,11)-(133,14) = "def"
-        │   ├── operator_loc: (133,20)-(133,21) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (134,0)-(134,3) = "end"
-        ├── @ DefNode (location: (136,0)-(136,31))
-        │   ├── name: :a
-        │   ├── name_loc: (136,4)-(136,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (136,6)-(136,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (136,6)-(136,9))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (136,12)-(136,26))
-        │   │   └── body: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (136,12)-(136,26))
-        │   │           ├── opening_loc: (136,12)-(136,13) = "\""
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (136,13)-(136,16))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (136,13)-(136,16) = "foo"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "foo"
-        │   │           │   └── @ EmbeddedStatementsNode (location: (136,16)-(136,25))
-        │   │           │       ├── opening_loc: (136,16)-(136,18) = "\#{"
-        │   │           │       ├── statements:
-        │   │           │       │   @ StatementsNode (location: (136,18)-(136,24))
-        │   │           │       │   └── body: (length: 1)
-        │   │           │       │       └── @ CallNode (location: (136,18)-(136,24))
-        │   │           │       │           ├── flags: ignore_visibility
-        │   │           │       │           ├── receiver: ∅
-        │   │           │       │           ├── call_operator_loc: ∅
-        │   │           │       │           ├── name: :b
-        │   │           │       │           ├── message_loc: (136,18)-(136,19) = "b"
-        │   │           │       │           ├── opening_loc: (136,19)-(136,20) = "("
-        │   │           │       │           ├── arguments:
-        │   │           │       │           │   @ ArgumentsNode (location: (136,20)-(136,23))
-        │   │           │       │           │   ├── flags: ∅
-        │   │           │       │           │   └── arguments: (length: 1)
-        │   │           │       │           │       └── @ ForwardingArgumentsNode (location: (136,20)-(136,23))
-        │   │           │       │           ├── closing_loc: (136,23)-(136,24) = ")"
-        │   │           │       │           └── block: ∅
-        │   │           │       └── closing_loc: (136,24)-(136,25) = "}"
-        │   │           └── closing_loc: (136,25)-(136,26) = "\""
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (136,0)-(136,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (136,5)-(136,6) = "("
-        │   ├── rparen_loc: (136,9)-(136,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (136,28)-(136,31) = "end"
-        ├── @ DefNode (location: (138,0)-(140,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (138,4)-(138,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (139,2)-(139,30))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (139,2)-(139,30))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ HashNode (location: (139,2)-(139,4))
-        │   │           │   ├── opening_loc: (139,2)-(139,3) = "{"
-        │   │           │   ├── elements: (length: 0)
-        │   │           │   └── closing_loc: (139,3)-(139,4) = "}"
-        │   │           ├── call_operator_loc: (139,4)-(139,5) = "."
-        │   │           ├── name: :merge
-        │   │           ├── message_loc: (139,5)-(139,10) = "merge"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (139,11)-(139,30))
-        │   │           │   ├── flags: contains_keyword_splat
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ KeywordHashNode (location: (139,11)-(139,30))
-        │   │           │           ├── flags: ∅
-        │   │           │           └── elements: (length: 3)
-        │   │           │               ├── @ AssocSplatNode (location: (139,11)-(139,16))
-        │   │           │               │   ├── value:
-        │   │           │               │   │   @ CallNode (location: (139,13)-(139,16))
-        │   │           │               │   │   ├── flags: variable_call, ignore_visibility
-        │   │           │               │   │   ├── receiver: ∅
-        │   │           │               │   │   ├── call_operator_loc: ∅
-        │   │           │               │   │   ├── name: :bar
-        │   │           │               │   │   ├── message_loc: (139,13)-(139,16) = "bar"
-        │   │           │               │   │   ├── opening_loc: ∅
-        │   │           │               │   │   ├── arguments: ∅
-        │   │           │               │   │   ├── closing_loc: ∅
-        │   │           │               │   │   └── block: ∅
-        │   │           │               │   └── operator_loc: (139,11)-(139,13) = "**"
-        │   │           │               ├── @ AssocSplatNode (location: (139,18)-(139,23))
-        │   │           │               │   ├── value:
-        │   │           │               │   │   @ CallNode (location: (139,20)-(139,23))
-        │   │           │               │   │   ├── flags: variable_call, ignore_visibility
-        │   │           │               │   │   ├── receiver: ∅
-        │   │           │               │   │   ├── call_operator_loc: ∅
-        │   │           │               │   │   ├── name: :baz
-        │   │           │               │   │   ├── message_loc: (139,20)-(139,23) = "baz"
-        │   │           │               │   │   ├── opening_loc: ∅
-        │   │           │               │   │   ├── arguments: ∅
-        │   │           │               │   │   ├── closing_loc: ∅
-        │   │           │               │   │   └── block: ∅
-        │   │           │               │   └── operator_loc: (139,18)-(139,20) = "**"
-        │   │           │               └── @ AssocSplatNode (location: (139,25)-(139,30))
-        │   │           │                   ├── value:
-        │   │           │                   │   @ CallNode (location: (139,27)-(139,30))
-        │   │           │                   │   ├── flags: variable_call, ignore_visibility
-        │   │           │                   │   ├── receiver: ∅
-        │   │           │                   │   ├── call_operator_loc: ∅
-        │   │           │                   │   ├── name: :qux
-        │   │           │                   │   ├── message_loc: (139,27)-(139,30) = "qux"
-        │   │           │                   │   ├── opening_loc: ∅
-        │   │           │                   │   ├── arguments: ∅
-        │   │           │                   │   ├── closing_loc: ∅
-        │   │           │                   │   └── block: ∅
-        │   │           │                   └── operator_loc: (139,25)-(139,27) = "**"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (138,0)-(138,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (140,0)-(140,3) = "end"
-        ├── @ DefNode (location: (142,0)-(143,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (142,4)-(142,7) = "bar"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (142,8)-(142,19))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (142,8)-(142,19))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :a
-        │   │   │       ├── name_loc: (142,8)-(142,10) = "a:"
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (142,11)-(142,19))
-        │   │   │           ├── body:
-        │   │   │           │   @ StatementsNode (location: (142,12)-(142,18))
-        │   │   │           │   └── body: (length: 1)
-        │   │   │           │       └── @ RangeNode (location: (142,12)-(142,18))
-        │   │   │           │           ├── flags: exclude_end
-        │   │   │           │           ├── left:
-        │   │   │           │           │   @ IntegerNode (location: (142,12)-(142,13))
-        │   │   │           │           │   ├── flags: decimal
-        │   │   │           │           │   └── value: 1
-        │   │   │           │           ├── right:
-        │   │   │           │           │   @ IntegerNode (location: (142,16)-(142,18))
-        │   │   │           │           │   ├── flags: decimal
-        │   │   │           │           │   └── value: 10
-        │   │   │           │           └── operator_loc: (142,13)-(142,16) = "..."
-        │   │   │           ├── opening_loc: (142,11)-(142,12) = "("
-        │   │   │           └── closing_loc: (142,18)-(142,19) = ")"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (142,0)-(142,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (142,7)-(142,8) = "("
-        │   ├── rparen_loc: (142,19)-(142,20) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (143,0)-(143,3) = "end"
-        ├── @ DefNode (location: (145,0)-(146,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (145,4)-(145,7) = "bar"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (145,8)-(145,18))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (145,8)-(145,18))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :a
-        │   │   │       ├── name_loc: (145,8)-(145,10) = "a:"
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (145,11)-(145,18))
-        │   │   │           ├── body:
-        │   │   │           │   @ StatementsNode (location: (145,12)-(145,17))
-        │   │   │           │   └── body: (length: 1)
-        │   │   │           │       └── @ RangeNode (location: (145,12)-(145,17))
-        │   │   │           │           ├── flags: exclude_end
-        │   │   │           │           ├── left: ∅
-        │   │   │           │           ├── right:
-        │   │   │           │           │   @ IntegerNode (location: (145,15)-(145,17))
-        │   │   │           │           │   ├── flags: decimal
-        │   │   │           │           │   └── value: 10
-        │   │   │           │           └── operator_loc: (145,12)-(145,15) = "..."
-        │   │   │           ├── opening_loc: (145,11)-(145,12) = "("
-        │   │   │           └── closing_loc: (145,17)-(145,18) = ")"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (145,0)-(145,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (145,7)-(145,8) = "("
-        │   ├── rparen_loc: (145,18)-(145,19) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (146,0)-(146,3) = "end"
-        ├── @ DefNode (location: (148,0)-(149,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (148,4)-(148,7) = "bar"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (148,8)-(148,17))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (148,8)-(148,17))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :a
-        │   │   │       ├── name_loc: (148,8)-(148,10) = "a:"
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (148,11)-(148,17))
-        │   │   │           ├── body:
-        │   │   │           │   @ StatementsNode (location: (148,12)-(148,16))
-        │   │   │           │   └── body: (length: 1)
-        │   │   │           │       └── @ RangeNode (location: (148,12)-(148,16))
-        │   │   │           │           ├── flags: exclude_end
-        │   │   │           │           ├── left:
-        │   │   │           │           │   @ IntegerNode (location: (148,12)-(148,13))
-        │   │   │           │           │   ├── flags: decimal
-        │   │   │           │           │   └── value: 1
-        │   │   │           │           ├── right: ∅
-        │   │   │           │           └── operator_loc: (148,13)-(148,16) = "..."
-        │   │   │           ├── opening_loc: (148,11)-(148,12) = "("
-        │   │   │           └── closing_loc: (148,16)-(148,17) = ")"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (148,0)-(148,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (148,7)-(148,8) = "("
-        │   ├── rparen_loc: (148,17)-(148,18) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (149,0)-(149,3) = "end"
-        ├── @ DefNode (location: (151,0)-(152,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (151,4)-(151,7) = "bar"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (151,8)-(151,20))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (151,8)-(151,20))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :a
-        │   │   │       ├── name_loc: (151,8)-(151,9) = "a"
-        │   │   │       ├── operator_loc: (151,10)-(151,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (151,12)-(151,20))
-        │   │   │           ├── body:
-        │   │   │           │   @ StatementsNode (location: (151,13)-(151,19))
-        │   │   │           │   └── body: (length: 1)
-        │   │   │           │       └── @ RangeNode (location: (151,13)-(151,19))
-        │   │   │           │           ├── flags: exclude_end
-        │   │   │           │           ├── left:
-        │   │   │           │           │   @ IntegerNode (location: (151,13)-(151,14))
-        │   │   │           │           │   ├── flags: decimal
-        │   │   │           │           │   └── value: 1
-        │   │   │           │           ├── right:
-        │   │   │           │           │   @ IntegerNode (location: (151,17)-(151,19))
-        │   │   │           │           │   ├── flags: decimal
-        │   │   │           │           │   └── value: 10
-        │   │   │           │           └── operator_loc: (151,14)-(151,17) = "..."
-        │   │   │           ├── opening_loc: (151,12)-(151,13) = "("
-        │   │   │           └── closing_loc: (151,19)-(151,20) = ")"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (151,0)-(151,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (151,7)-(151,8) = "("
-        │   ├── rparen_loc: (151,20)-(151,21) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (152,0)-(152,3) = "end"
-        ├── @ DefNode (location: (154,0)-(155,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (154,4)-(154,7) = "bar"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (154,8)-(154,19))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (154,8)-(154,19))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :a
-        │   │   │       ├── name_loc: (154,8)-(154,9) = "a"
-        │   │   │       ├── operator_loc: (154,10)-(154,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (154,12)-(154,19))
-        │   │   │           ├── body:
-        │   │   │           │   @ StatementsNode (location: (154,13)-(154,18))
-        │   │   │           │   └── body: (length: 1)
-        │   │   │           │       └── @ RangeNode (location: (154,13)-(154,18))
-        │   │   │           │           ├── flags: exclude_end
-        │   │   │           │           ├── left: ∅
-        │   │   │           │           ├── right:
-        │   │   │           │           │   @ IntegerNode (location: (154,16)-(154,18))
-        │   │   │           │           │   ├── flags: decimal
-        │   │   │           │           │   └── value: 10
-        │   │   │           │           └── operator_loc: (154,13)-(154,16) = "..."
-        │   │   │           ├── opening_loc: (154,12)-(154,13) = "("
-        │   │   │           └── closing_loc: (154,18)-(154,19) = ")"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (154,0)-(154,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (154,7)-(154,8) = "("
-        │   ├── rparen_loc: (154,19)-(154,20) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (155,0)-(155,3) = "end"
-        ├── @ DefNode (location: (157,0)-(158,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (157,4)-(157,7) = "bar"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (157,8)-(157,18))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (157,8)-(157,18))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :a
-        │   │   │       ├── name_loc: (157,8)-(157,9) = "a"
-        │   │   │       ├── operator_loc: (157,10)-(157,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (157,12)-(157,18))
-        │   │   │           ├── body:
-        │   │   │           │   @ StatementsNode (location: (157,13)-(157,17))
-        │   │   │           │   └── body: (length: 1)
-        │   │   │           │       └── @ RangeNode (location: (157,13)-(157,17))
-        │   │   │           │           ├── flags: exclude_end
-        │   │   │           │           ├── left:
-        │   │   │           │           │   @ IntegerNode (location: (157,13)-(157,14))
-        │   │   │           │           │   ├── flags: decimal
-        │   │   │           │           │   └── value: 1
-        │   │   │           │           ├── right: ∅
-        │   │   │           │           └── operator_loc: (157,14)-(157,17) = "..."
-        │   │   │           ├── opening_loc: (157,12)-(157,13) = "("
-        │   │   │           └── closing_loc: (157,17)-(157,18) = ")"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (157,0)-(157,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (157,7)-(157,8) = "("
-        │   ├── rparen_loc: (157,18)-(157,19) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (158,0)-(158,3) = "end"
-        ├── @ DefNode (location: (160,0)-(162,3))
-        │   ├── name: :method
-        │   ├── name_loc: (160,4)-(160,10) = "method"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (160,11)-(160,12))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (160,11)-(160,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (161,2)-(161,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (161,2)-(161,14))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (161,2)-(161,6))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :item
-        │   │           │   ├── message_loc: (161,2)-(161,6) = "item"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :>>
-        │   │           ├── message_loc: (161,7)-(161,9) = ">>"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (161,10)-(161,14))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ CallNode (location: (161,10)-(161,14))
-        │   │           │           ├── flags: ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :a
-        │   │           │           ├── message_loc: (161,10)-(161,11) = "a"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block:
-        │   │           │               @ BlockNode (location: (161,12)-(161,14))
-        │   │           │               ├── locals: []
-        │   │           │               ├── parameters: ∅
-        │   │           │               ├── body: ∅
-        │   │           │               ├── opening_loc: (161,12)-(161,13) = "{"
-        │   │           │               └── closing_loc: (161,13)-(161,14) = "}"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (160,0)-(160,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (160,10)-(160,11) = "("
-        │   ├── rparen_loc: (160,12)-(160,13) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (162,0)-(162,3) = "end"
-        ├── @ LocalVariableWriteNode (location: (164,0)-(164,7))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (164,0)-(164,3) = "foo"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (164,6)-(164,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (164,4)-(164,5) = "="
-        ├── @ DefNode (location: (165,0)-(165,16))
-        │   ├── name: :bar
-        │   ├── name_loc: (165,8)-(165,11) = "bar"
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (165,4)-(165,7))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (165,0)-(165,3) = "def"
-        │   ├── operator_loc: (165,7)-(165,8) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (165,13)-(165,16) = "end"
-        ├── @ DefNode (location: (167,0)-(167,18))
-        │   ├── name: :f
-        │   ├── name_loc: (167,4)-(167,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (167,6)-(167,7))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (167,6)-(167,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (167,6)-(167,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (167,10)-(167,13))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ArrayNode (location: (167,10)-(167,13))
-        │   │           ├── flags: contains_splat
-        │   │           ├── elements: (length: 1)
-        │   │           │   └── @ SplatNode (location: (167,11)-(167,12))
-        │   │           │       ├── operator_loc: (167,11)-(167,12) = "*"
-        │   │           │       └── expression: ∅
-        │   │           ├── opening_loc: (167,10)-(167,11) = "["
-        │   │           └── closing_loc: (167,12)-(167,13) = "]"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (167,0)-(167,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (167,5)-(167,6) = "("
-        │   ├── rparen_loc: (167,7)-(167,8) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (167,15)-(167,18) = "end"
-        ├── @ DefNode (location: (169,0)-(169,15))
-        │   ├── name: :f
-        │   ├── name_loc: (169,4)-(169,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (169,6)-(169,10))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (169,6)-(169,10))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :x
-        │   │   │       ├── name_loc: (169,6)-(169,8) = "x:"
-        │   │   │       └── value:
-        │   │   │           @ CallNode (location: (169,8)-(169,10))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ CallNode (location: (169,9)-(169,10))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :a
-        │   │   │           │   ├── message_loc: (169,9)-(169,10) = "a"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :-@
-        │   │   │           ├── message_loc: (169,8)-(169,9) = "-"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (169,0)-(169,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (169,12)-(169,15) = "end"
-        ├── @ DefNode (location: (171,0)-(171,15))
-        │   ├── name: :f
-        │   ├── name_loc: (171,4)-(171,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (171,6)-(171,10))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (171,6)-(171,10))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :x
-        │   │   │       ├── name_loc: (171,6)-(171,8) = "x:"
-        │   │   │       └── value:
-        │   │   │           @ CallNode (location: (171,8)-(171,10))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ CallNode (location: (171,9)-(171,10))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :a
-        │   │   │           │   ├── message_loc: (171,9)-(171,10) = "a"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :+@
-        │   │   │           ├── message_loc: (171,8)-(171,9) = "+"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (171,0)-(171,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (171,12)-(171,15) = "end"
-        ├── @ DefNode (location: (173,0)-(173,15))
-        │   ├── name: :f
-        │   ├── name_loc: (173,4)-(173,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (173,6)-(173,10))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (173,6)-(173,10))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :x
-        │   │   │       ├── name_loc: (173,6)-(173,8) = "x:"
-        │   │   │       └── value:
-        │   │   │           @ CallNode (location: (173,8)-(173,10))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ CallNode (location: (173,9)-(173,10))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :a
-        │   │   │           │   ├── message_loc: (173,9)-(173,10) = "a"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :!
-        │   │   │           ├── message_loc: (173,8)-(173,9) = "!"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (173,0)-(173,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (173,12)-(173,15) = "end"
-        ├── @ DefNode (location: (175,0)-(175,20))
-        │   ├── name: :foo
-        │   ├── name_loc: (175,4)-(175,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (175,8)-(175,15))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (175,8)-(175,15))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :x
-        │   │   │       ├── name_loc: (175,8)-(175,10) = "x:"
-        │   │   │       └── value:
-        │   │   │           @ StringNode (location: (175,10)-(175,15))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (175,10)-(175,12) = "%("
-        │   │   │           ├── content_loc: (175,12)-(175,14) = "xx"
-        │   │   │           ├── closing_loc: (175,14)-(175,15) = ")"
-        │   │   │           └── unescaped: "xx"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (175,0)-(175,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (175,17)-(175,20) = "end"
-        ├── @ DefNode (location: (177,0)-(179,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (177,4)-(177,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (177,8)-(177,11))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (177,8)-(177,11))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (178,2)-(178,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (178,2)-(178,7))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (178,2)-(178,5) = "bar"
-        │   │           ├── opening_loc: (178,5)-(178,6) = "("
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: (178,7)-(178,8) = ")"
-        │   │           └── block:
-        │   │               @ BlockArgumentNode (location: (178,6)-(178,7))
-        │   │               ├── expression: ∅
-        │   │               └── operator_loc: (178,6)-(178,7) = "&"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (177,0)-(177,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (177,7)-(177,8) = "("
-        │   ├── rparen_loc: (177,11)-(177,12) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (179,0)-(179,3) = "end"
-        ├── @ DefNode (location: (181,0)-(181,42))
-        │   ├── name: :foo
-        │   ├── name_loc: (181,4)-(181,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (181,8)-(181,37))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (181,8)-(181,37))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :bar
-        │   │   │       ├── name_loc: (181,8)-(181,11) = "bar"
-        │   │   │       ├── operator_loc: (181,12)-(181,13) = "="
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (181,14)-(181,37))
-        │   │   │           ├── body:
-        │   │   │           │   @ StatementsNode (location: (181,15)-(181,36))
-        │   │   │           │   └── body: (length: 2)
-        │   │   │           │       ├── @ DefNode (location: (181,15)-(181,33))
-        │   │   │           │       │   ├── name: :baz
-        │   │   │           │       │   ├── name_loc: (181,19)-(181,22) = "baz"
-        │   │   │           │       │   ├── receiver: ∅
-        │   │   │           │       │   ├── parameters:
-        │   │   │           │       │   │   @ ParametersNode (location: (181,23)-(181,26))
-        │   │   │           │       │   │   ├── requireds: (length: 1)
-        │   │   │           │       │   │   │   └── @ RequiredParameterNode (location: (181,23)-(181,26))
-        │   │   │           │       │   │   │       ├── flags: ∅
-        │   │   │           │       │   │   │       └── name: :bar
-        │   │   │           │       │   │   ├── optionals: (length: 0)
-        │   │   │           │       │   │   ├── rest: ∅
-        │   │   │           │       │   │   ├── posts: (length: 0)
-        │   │   │           │       │   │   ├── keywords: (length: 0)
-        │   │   │           │       │   │   ├── keyword_rest: ∅
-        │   │   │           │       │   │   └── block: ∅
-        │   │   │           │       │   ├── body:
-        │   │   │           │       │   │   @ StatementsNode (location: (181,30)-(181,33))
-        │   │   │           │       │   │   └── body: (length: 1)
-        │   │   │           │       │   │       └── @ LocalVariableReadNode (location: (181,30)-(181,33))
-        │   │   │           │       │   │           ├── name: :bar
-        │   │   │           │       │   │           └── depth: 0
-        │   │   │           │       │   ├── locals: [:bar]
-        │   │   │           │       │   ├── def_keyword_loc: (181,15)-(181,18) = "def"
-        │   │   │           │       │   ├── operator_loc: ∅
-        │   │   │           │       │   ├── lparen_loc: (181,22)-(181,23) = "("
-        │   │   │           │       │   ├── rparen_loc: (181,26)-(181,27) = ")"
-        │   │   │           │       │   ├── equal_loc: (181,28)-(181,29) = "="
-        │   │   │           │       │   └── end_keyword_loc: ∅
-        │   │   │           │       └── @ IntegerNode (location: (181,35)-(181,36))
-        │   │   │           │           ├── flags: decimal
-        │   │   │           │           └── value: 1
-        │   │   │           ├── opening_loc: (181,14)-(181,15) = "("
-        │   │   │           └── closing_loc: (181,36)-(181,37) = ")"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (181,41)-(181,42))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (181,41)-(181,42))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (181,0)-(181,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (181,7)-(181,8) = "("
-        │   ├── rparen_loc: (181,37)-(181,38) = ")"
-        │   ├── equal_loc: (181,39)-(181,40) = "="
-        │   └── end_keyword_loc: ∅
-        └── @ DefNode (location: (183,0)-(183,37))
-            ├── name: :foo
-            ├── name_loc: (183,21)-(183,24) = "foo"
-            ├── receiver:
-            │   @ ParenthesesNode (location: (183,4)-(183,20))
-            │   ├── body:
-            │   │   @ ClassNode (location: (183,5)-(183,19))
-            │   │   ├── locals: []
-            │   │   ├── class_keyword_loc: (183,5)-(183,10) = "class"
-            │   │   ├── constant_path:
-            │   │   │   @ ConstantReadNode (location: (183,11)-(183,14))
-            │   │   │   └── name: :Foo
-            │   │   ├── inheritance_operator_loc: ∅
-            │   │   ├── superclass: ∅
-            │   │   ├── body: ∅
-            │   │   ├── end_keyword_loc: (183,16)-(183,19) = "end"
-            │   │   └── name: :Foo
-            │   ├── opening_loc: (183,4)-(183,5) = "("
-            │   └── closing_loc: (183,19)-(183,20) = ")"
-            ├── parameters:
-            │   @ ParametersNode (location: (183,25)-(183,32))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 1)
-            │   │   └── @ OptionalParameterNode (location: (183,25)-(183,32))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :bar
-            │   │       ├── name_loc: (183,25)-(183,28) = "bar"
-            │   │       ├── operator_loc: (183,29)-(183,30) = "="
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (183,31)-(183,32))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (183,36)-(183,37))
-            │   └── body: (length: 1)
-            │       └── @ IntegerNode (location: (183,36)-(183,37))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── locals: [:bar]
-            ├── def_keyword_loc: (183,0)-(183,3) = "def"
-            ├── operator_loc: (183,20)-(183,21) = "."
-            ├── lparen_loc: (183,24)-(183,25) = "("
-            ├── rparen_loc: (183,32)-(183,33) = ")"
-            ├── equal_loc: (183,34)-(183,35) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/modules.txt b/test/mri/prism/snapshots/modules.txt
deleted file mode 100644
index aef3875d74d..00000000000
--- a/test/mri/prism/snapshots/modules.txt
+++ /dev/null
@@ -1,183 +0,0 @@
-@ ProgramNode (location: (1,0)-(18,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(18,3))
-    └── body: (length: 7)
-        ├── @ ModuleNode (location: (1,0)-(1,18))
-        │   ├── locals: [:a]
-        │   ├── module_keyword_loc: (1,0)-(1,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (1,7)-(1,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,9)-(1,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableWriteNode (location: (1,9)-(1,14))
-        │   │           ├── name: :a
-        │   │           ├── depth: 0
-        │   │           ├── name_loc: (1,9)-(1,10) = "a"
-        │   │           ├── value:
-        │   │           │   @ IntegerNode (location: (1,13)-(1,14))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           └── operator_loc: (1,11)-(1,12) = "="
-        │   ├── end_keyword_loc: (1,15)-(1,18) = "end"
-        │   └── name: :A
-        ├── @ InterpolatedStringNode (location: (3,0)-(3,18))
-        │   ├── opening_loc: (3,0)-(3,3) = "%Q{"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (3,3)-(3,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (3,3)-(3,7) = "aaa "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "aaa "
-        │   │   ├── @ EmbeddedStatementsNode (location: (3,7)-(3,13))
-        │   │   │   ├── opening_loc: (3,7)-(3,9) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (3,9)-(3,12))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (3,9)-(3,12))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bbb
-        │   │   │   │           ├── message_loc: (3,9)-(3,12) = "bbb"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (3,12)-(3,13) = "}"
-        │   │   └── @ StringNode (location: (3,13)-(3,17))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (3,13)-(3,17) = " ccc"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: " ccc"
-        │   └── closing_loc: (3,17)-(3,18) = "}"
-        ├── @ ModuleNode (location: (5,0)-(6,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (5,0)-(5,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (5,7)-(5,11))
-        │   │   ├── parent:
-        │   │   │   @ CallNode (location: (5,7)-(5,8))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :m
-        │   │   │   ├── message_loc: (5,7)-(5,8) = "m"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,10)-(5,11))
-        │   │   │   └── name: :M
-        │   │   └── delimiter_loc: (5,8)-(5,10) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (6,0)-(6,3) = "end"
-        │   └── name: :M
-        ├── @ ModuleNode (location: (8,0)-(9,19))
-        │   ├── locals: [:x]
-        │   ├── module_keyword_loc: (8,0)-(8,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (8,7)-(8,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ BeginNode (location: (8,0)-(9,19))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (9,1)-(9,6))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableWriteNode (location: (9,1)-(9,6))
-        │   │   │           ├── name: :x
-        │   │   │           ├── depth: 0
-        │   │   │           ├── name_loc: (9,1)-(9,2) = "x"
-        │   │   │           ├── value:
-        │   │   │           │   @ IntegerNode (location: (9,5)-(9,6))
-        │   │   │           │   ├── flags: decimal
-        │   │   │           │   └── value: 1
-        │   │   │           └── operator_loc: (9,3)-(9,4) = "="
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (9,8)-(9,14))
-        │   │   │   ├── keyword_loc: (9,8)-(9,14) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause: ∅
-        │   │   └── end_keyword_loc: (9,16)-(9,19) = "end"
-        │   ├── end_keyword_loc: (9,16)-(9,19) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (11,0)-(12,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (11,0)-(11,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (11,7)-(11,10))
-        │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (11,9)-(11,10))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (11,7)-(11,9) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (12,0)-(12,3) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (14,0)-(15,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (14,0)-(14,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (14,7)-(14,13))
-        │   │   ├── parent:
-        │   │   │   @ CallNode (location: (14,7)-(14,10))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── receiver:
-        │   │   │   │   @ ConstantReadNode (location: (14,7)-(14,8))
-        │   │   │   │   └── name: :A
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :[]
-        │   │   │   ├── message_loc: (14,8)-(14,10) = "[]"
-        │   │   │   ├── opening_loc: (14,8)-(14,9) = "["
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: (14,9)-(14,10) = "]"
-        │   │   │   └── block: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (14,12)-(14,13))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (14,10)-(14,12) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (15,0)-(15,3) = "end"
-        │   └── name: :B
-        └── @ ModuleNode (location: (17,0)-(18,3))
-            ├── locals: []
-            ├── module_keyword_loc: (17,0)-(17,6) = "module"
-            ├── constant_path:
-            │   @ ConstantPathNode (location: (17,7)-(17,14))
-            │   ├── parent:
-            │   │   @ CallNode (location: (17,7)-(17,11))
-            │   │   ├── flags: ∅
-            │   │   ├── receiver:
-            │   │   │   @ ConstantReadNode (location: (17,7)-(17,8))
-            │   │   │   └── name: :A
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :[]
-            │   │   ├── message_loc: (17,8)-(17,11) = "[1]"
-            │   │   ├── opening_loc: (17,8)-(17,9) = "["
-            │   │   ├── arguments:
-            │   │   │   @ ArgumentsNode (location: (17,9)-(17,10))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── arguments: (length: 1)
-            │   │   │       └── @ IntegerNode (location: (17,9)-(17,10))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 1
-            │   │   ├── closing_loc: (17,10)-(17,11) = "]"
-            │   │   └── block: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (17,13)-(17,14))
-            │   │   └── name: :B
-            │   └── delimiter_loc: (17,11)-(17,13) = "::"
-            ├── body: ∅
-            ├── end_keyword_loc: (18,0)-(18,3) = "end"
-            └── name: :B
diff --git a/test/mri/prism/snapshots/multi_write.txt b/test/mri/prism/snapshots/multi_write.txt
deleted file mode 100644
index d313801fdb2..00000000000
--- a/test/mri/prism/snapshots/multi_write.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,26))
-├── locals: [:foo, :bar]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,26))
-    └── body: (length: 4)
-        ├── @ LocalVariableWriteNode (location: (1,0)-(1,18))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (1,0)-(1,3) = "foo"
-        │   ├── value:
-        │   │   @ RescueModifierNode (location: (1,6)-(1,18))
-        │   │   ├── expression:
-        │   │   │   @ IntegerNode (location: (1,6)-(1,7))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── keyword_loc: (1,8)-(1,14) = "rescue"
-        │   │   └── rescue_expression:
-        │   │       @ NilNode (location: (1,15)-(1,18))
-        │   └── operator_loc: (1,4)-(1,5) = "="
-        ├── @ MultiWriteNode (location: (2,0)-(2,23))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (2,0)-(2,3))
-        │   │   │   ├── name: :foo
-        │   │   │   └── depth: 0
-        │   │   └── @ LocalVariableTargetNode (location: (2,5)-(2,8))
-        │   │       ├── name: :bar
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (2,9)-(2,10) = "="
-        │   └── value:
-        │       @ RescueModifierNode (location: (2,11)-(2,23))
-        │       ├── expression:
-        │       │   @ IntegerNode (location: (2,11)-(2,12))
-        │       │   ├── flags: decimal
-        │       │   └── value: 1
-        │       ├── keyword_loc: (2,13)-(2,19) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (2,20)-(2,23))
-        ├── @ RescueModifierNode (location: (3,0)-(3,21))
-        │   ├── expression:
-        │   │   @ LocalVariableWriteNode (location: (3,0)-(3,10))
-        │   │   ├── name: :foo
-        │   │   ├── depth: 0
-        │   │   ├── name_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── value:
-        │   │   │   @ ArrayNode (location: (3,6)-(3,10))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 2)
-        │   │   │   │   ├── @ IntegerNode (location: (3,6)-(3,7))
-        │   │   │   │   │   ├── flags: decimal
-        │   │   │   │   │   └── value: 1
-        │   │   │   │   └── @ IntegerNode (location: (3,9)-(3,10))
-        │   │   │   │       ├── flags: decimal
-        │   │   │   │       └── value: 2
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   └── closing_loc: ∅
-        │   │   └── operator_loc: (3,4)-(3,5) = "="
-        │   ├── keyword_loc: (3,11)-(3,17) = "rescue"
-        │   └── rescue_expression:
-        │       @ NilNode (location: (3,18)-(3,21))
-        └── @ MultiWriteNode (location: (4,0)-(4,26))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (4,0)-(4,3))
-            │   │   ├── name: :foo
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (4,5)-(4,8))
-            │       ├── name: :bar
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (4,9)-(4,10) = "="
-            └── value:
-                @ RescueModifierNode (location: (4,11)-(4,26))
-                ├── expression:
-                │   @ ArrayNode (location: (4,11)-(4,15))
-                │   ├── flags: ∅
-                │   ├── elements: (length: 2)
-                │   │   ├── @ IntegerNode (location: (4,11)-(4,12))
-                │   │   │   ├── flags: decimal
-                │   │   │   └── value: 1
-                │   │   └── @ IntegerNode (location: (4,14)-(4,15))
-                │   │       ├── flags: decimal
-                │   │       └── value: 2
-                │   ├── opening_loc: ∅
-                │   └── closing_loc: ∅
-                ├── keyword_loc: (4,16)-(4,22) = "rescue"
-                └── rescue_expression:
-                    @ NilNode (location: (4,23)-(4,26))
diff --git a/test/mri/prism/snapshots/newline_terminated.txt b/test/mri/prism/snapshots/newline_terminated.txt
deleted file mode 100644
index 6a3b28dba98..00000000000
--- a/test/mri/prism/snapshots/newline_terminated.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-@ ProgramNode (location: (3,0)-(41,0))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (3,0)-(41,0))
-    └── body: (length: 17)
-        ├── @ StringNode (location: (3,0)-(3,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (3,0)-(3,2) = "% "
-        │   ├── content_loc: (3,2)-(3,5) = "abc"
-        │   ├── closing_loc: (3,5)-(3,6) = " "
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (4,0)-(4,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (4,0)-(4,2) = "%\t"
-        │   ├── content_loc: (4,2)-(4,5) = "abc"
-        │   ├── closing_loc: (4,5)-(4,6) = "\t"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (5,0)-(5,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (5,0)-(5,2) = "%\v"
-        │   ├── content_loc: (5,2)-(5,5) = "abc"
-        │   ├── closing_loc: (5,5)-(5,6) = "\v"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (6,0)-(6,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (6,0)-(6,2) = "%\r"
-        │   ├── content_loc: (6,2)-(6,5) = "abc"
-        │   ├── closing_loc: (6,5)-(6,6) = "\r"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (7,0)-(9,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (7,0)-(8,0) = "%\n"
-        │   ├── content_loc: (8,0)-(8,3) = "abc"
-        │   ├── closing_loc: (8,3)-(9,0) = "\n"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (10,0)-(10,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (10,0)-(10,2) = "%\u0000"
-        │   ├── content_loc: (10,2)-(10,5) = "abc"
-        │   ├── closing_loc: (10,5)-(10,6) = "\u0000"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (11,0)-(13,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (11,0)-(12,0) = "%\n"
-        │   ├── content_loc: (12,0)-(12,3) = "abc"
-        │   ├── closing_loc: (12,3)-(13,0) = "\n"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (14,0)-(16,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (14,0)-(15,0) = "%\n"
-        │   ├── content_loc: (15,0)-(15,4) = "\rabc"
-        │   ├── closing_loc: (15,4)-(16,0) = "\n"
-        │   └── unescaped: "\rabc"
-        ├── @ StringNode (location: (17,0)-(19,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (17,0)-(18,0) = "%\n"
-        │   ├── content_loc: (18,0)-(18,4) = "\rabc"
-        │   ├── closing_loc: (18,4)-(19,0) = "\n"
-        │   └── unescaped: "\rabc"
-        ├── @ StringNode (location: (20,0)-(22,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (20,0)-(21,0) = "%\n"
-        │   ├── content_loc: (21,0)-(21,3) = "abc"
-        │   ├── closing_loc: (21,3)-(22,0) = "\n"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (23,0)-(23,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (23,0)-(23,2) = "%\r"
-        │   ├── content_loc: (23,2)-(23,5) = "abc"
-        │   ├── closing_loc: (23,5)-(23,6) = "\r"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (24,0)-(26,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (24,0)-(25,0) = "%\n"
-        │   ├── content_loc: (25,0)-(25,3) = "abc"
-        │   ├── closing_loc: (25,3)-(26,0) = "\n"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (27,0)-(29,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (27,0)-(28,0) = "%\n"
-        │   ├── content_loc: (28,0)-(28,3) = "abc"
-        │   ├── closing_loc: (28,3)-(29,0) = "\n"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (30,0)-(32,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (30,0)-(31,0) = "%\n"
-        │   ├── content_loc: (31,0)-(31,3) = "foo"
-        │   ├── closing_loc: (31,3)-(32,0) = "\n"
-        │   └── unescaped: "foo"
-        ├── @ StringNode (location: (33,0)-(35,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (33,0)-(34,0) = "%q\n"
-        │   ├── content_loc: (34,0)-(34,3) = "foo"
-        │   ├── closing_loc: (34,3)-(35,0) = "\n"
-        │   └── unescaped: "foo"
-        ├── @ StringNode (location: (36,0)-(38,0))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (36,0)-(37,0) = "%Q\n"
-        │   ├── content_loc: (37,0)-(37,3) = "foo"
-        │   ├── closing_loc: (37,3)-(38,0) = "\n"
-        │   └── unescaped: "foo"
-        └── @ RegularExpressionNode (location: (39,0)-(41,0))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (39,0)-(40,0) = "%r\n"
-            ├── content_loc: (40,0)-(40,3) = "foo"
-            ├── closing_loc: (40,3)-(41,0) = "\n"
-            └── unescaped: "foo"
diff --git a/test/mri/prism/snapshots/next.txt b/test/mri/prism/snapshots/next.txt
deleted file mode 100644
index 64ec3ebc91a..00000000000
--- a/test/mri/prism/snapshots/next.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-@ ProgramNode (location: (1,0)-(24,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(24,7))
-    └── body: (length: 11)
-        ├── @ NextNode (location: (1,0)-(1,4))
-        │   ├── arguments: ∅
-        │   └── keyword_loc: (1,0)-(1,4) = "next"
-        ├── @ NextNode (location: (3,0)-(3,18))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,5)-(3,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ ParenthesesNode (location: (3,5)-(3,8))
-        │   │       │   ├── body:
-        │   │       │   │   @ StatementsNode (location: (3,6)-(3,7))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ IntegerNode (location: (3,6)-(3,7))
-        │   │       │   │           ├── flags: decimal
-        │   │       │   │           └── value: 1
-        │   │       │   ├── opening_loc: (3,5)-(3,6) = "("
-        │   │       │   └── closing_loc: (3,7)-(3,8) = ")"
-        │   │       ├── @ ParenthesesNode (location: (3,10)-(3,13))
-        │   │       │   ├── body:
-        │   │       │   │   @ StatementsNode (location: (3,11)-(3,12))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ IntegerNode (location: (3,11)-(3,12))
-        │   │       │   │           ├── flags: decimal
-        │   │       │   │           └── value: 2
-        │   │       │   ├── opening_loc: (3,10)-(3,11) = "("
-        │   │       │   └── closing_loc: (3,12)-(3,13) = ")"
-        │   │       └── @ ParenthesesNode (location: (3,15)-(3,18))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (3,16)-(3,17))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (3,16)-(3,17))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 3
-        │   │           ├── opening_loc: (3,15)-(3,16) = "("
-        │   │           └── closing_loc: (3,17)-(3,18) = ")"
-        │   └── keyword_loc: (3,0)-(3,4) = "next"
-        ├── @ NextNode (location: (5,0)-(5,6))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,5)-(5,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,5)-(5,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   └── keyword_loc: (5,0)-(5,4) = "next"
-        ├── @ NextNode (location: (7,0)-(8,1))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,5)-(8,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ IntegerNode (location: (7,5)-(7,6))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── @ IntegerNode (location: (7,8)-(7,9))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── @ IntegerNode (location: (8,0)-(8,1))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   └── keyword_loc: (7,0)-(7,4) = "next"
-        ├── @ NextNode (location: (10,0)-(10,12))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (10,5)-(10,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ IntegerNode (location: (10,5)-(10,6))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── @ IntegerNode (location: (10,8)-(10,9))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── @ IntegerNode (location: (10,11)-(10,12))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   └── keyword_loc: (10,0)-(10,4) = "next"
-        ├── @ NextNode (location: (12,0)-(12,14))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (12,5)-(12,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ArrayNode (location: (12,5)-(12,14))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 3)
-        │   │           │   ├── @ IntegerNode (location: (12,6)-(12,7))
-        │   │           │   │   ├── flags: decimal
-        │   │           │   │   └── value: 1
-        │   │           │   ├── @ IntegerNode (location: (12,9)-(12,10))
-        │   │           │   │   ├── flags: decimal
-        │   │           │   │   └── value: 2
-        │   │           │   └── @ IntegerNode (location: (12,12)-(12,13))
-        │   │           │       ├── flags: decimal
-        │   │           │       └── value: 3
-        │   │           ├── opening_loc: (12,5)-(12,6) = "["
-        │   │           └── closing_loc: (12,13)-(12,14) = "]"
-        │   └── keyword_loc: (12,0)-(12,4) = "next"
-        ├── @ NextNode (location: (14,0)-(17,1))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (14,4)-(17,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (14,4)-(17,1))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (15,2)-(16,3))
-        │   │           │   └── body: (length: 2)
-        │   │           │       ├── @ IntegerNode (location: (15,2)-(15,3))
-        │   │           │       │   ├── flags: decimal
-        │   │           │       │   └── value: 1
-        │   │           │       └── @ IntegerNode (location: (16,2)-(16,3))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 2
-        │   │           ├── opening_loc: (14,4)-(14,5) = "("
-        │   │           └── closing_loc: (17,0)-(17,1) = ")"
-        │   └── keyword_loc: (14,0)-(14,4) = "next"
-        ├── @ NextNode (location: (19,0)-(19,4))
-        │   ├── arguments: ∅
-        │   └── keyword_loc: (19,0)-(19,4) = "next"
-        ├── @ IntegerNode (location: (20,0)-(20,1))
-        │   ├── flags: decimal
-        │   └── value: 1
-        ├── @ NextNode (location: (22,0)-(22,6))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (22,4)-(22,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (22,4)-(22,6))
-        │   │           ├── body: ∅
-        │   │           ├── opening_loc: (22,4)-(22,5) = "("
-        │   │           └── closing_loc: (22,5)-(22,6) = ")"
-        │   └── keyword_loc: (22,0)-(22,4) = "next"
-        └── @ NextNode (location: (24,0)-(24,7))
-            ├── arguments:
-            │   @ ArgumentsNode (location: (24,4)-(24,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (24,4)-(24,7))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (24,5)-(24,6))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (24,5)-(24,6))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── opening_loc: (24,4)-(24,5) = "("
-            │           └── closing_loc: (24,6)-(24,7) = ")"
-            └── keyword_loc: (24,0)-(24,4) = "next"
diff --git a/test/mri/prism/snapshots/nils.txt b/test/mri/prism/snapshots/nils.txt
deleted file mode 100644
index f72745560fe..00000000000
--- a/test/mri/prism/snapshots/nils.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(12,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(12,11))
-    └── body: (length: 5)
-        ├── @ NilNode (location: (1,0)-(1,3))
-        ├── @ ParenthesesNode (location: (3,0)-(3,2))
-        │   ├── body: ∅
-        │   ├── opening_loc: (3,0)-(3,1) = "("
-        │   └── closing_loc: (3,1)-(3,2) = ")"
-        ├── @ ParenthesesNode (location: (5,0)-(8,1))
-        │   ├── body: ∅
-        │   ├── opening_loc: (5,0)-(5,1) = "("
-        │   └── closing_loc: (8,0)-(8,1) = ")"
-        ├── @ PostExecutionNode (location: (10,0)-(10,9))
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (10,6)-(10,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (10,6)-(10,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── keyword_loc: (10,0)-(10,3) = "END"
-        │   ├── opening_loc: (10,4)-(10,5) = "{"
-        │   └── closing_loc: (10,8)-(10,9) = "}"
-        └── @ PreExecutionNode (location: (12,0)-(12,11))
-            ├── statements:
-            │   @ StatementsNode (location: (12,8)-(12,9))
-            │   └── body: (length: 1)
-            │       └── @ IntegerNode (location: (12,8)-(12,9))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── keyword_loc: (12,0)-(12,5) = "BEGIN"
-            ├── opening_loc: (12,6)-(12,7) = "{"
-            └── closing_loc: (12,10)-(12,11) = "}"
diff --git a/test/mri/prism/snapshots/non_alphanumeric_methods.txt b/test/mri/prism/snapshots/non_alphanumeric_methods.txt
deleted file mode 100644
index 2ed66fe0e2e..00000000000
--- a/test/mri/prism/snapshots/non_alphanumeric_methods.txt
+++ /dev/null
@@ -1,503 +0,0 @@
-@ ProgramNode (location: (1,0)-(105,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(105,3))
-    └── body: (length: 36)
-        ├── @ DefNode (location: (1,0)-(2,3))
-        │   ├── name: :!
-        │   ├── name_loc: (1,4)-(1,5) = "!"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (2,0)-(2,3) = "end"
-        ├── @ DefNode (location: (4,0)-(5,3))
-        │   ├── name: :!=
-        │   ├── name_loc: (4,4)-(4,6) = "!="
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (4,0)-(4,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ DefNode (location: (7,0)-(8,3))
-        │   ├── name: :!~
-        │   ├── name_loc: (7,4)-(7,6) = "!~"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (8,0)-(8,3) = "end"
-        ├── @ DefNode (location: (10,0)-(11,3))
-        │   ├── name: :%
-        │   ├── name_loc: (10,4)-(10,5) = "%"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (10,0)-(10,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ DefNode (location: (13,0)-(14,3))
-        │   ├── name: :+
-        │   ├── name_loc: (13,9)-(13,10) = "+"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (13,4)-(13,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (13,0)-(13,3) = "def"
-        │   ├── operator_loc: (13,8)-(13,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (14,0)-(14,3) = "end"
-        ├── @ DefNode (location: (16,0)-(17,3))
-        │   ├── name: :&
-        │   ├── name_loc: (16,4)-(16,5) = "&"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (16,0)-(16,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (17,0)-(17,3) = "end"
-        ├── @ DefNode (location: (19,0)-(20,3))
-        │   ├── name: :*
-        │   ├── name_loc: (19,4)-(19,5) = "*"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (19,0)-(19,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (20,0)-(20,3) = "end"
-        ├── @ DefNode (location: (22,0)-(23,3))
-        │   ├── name: :**
-        │   ├── name_loc: (22,4)-(22,6) = "**"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (22,0)-(22,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (23,0)-(23,3) = "end"
-        ├── @ StringNode (location: (25,0)-(25,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (25,0)-(25,2) = "%|"
-        │   ├── content_loc: (25,2)-(25,5) = "abc"
-        │   ├── closing_loc: (25,5)-(25,6) = "|"
-        │   └── unescaped: "abc"
-        ├── @ DefNode (location: (27,0)-(28,3))
-        │   ├── name: :+
-        │   ├── name_loc: (27,4)-(27,5) = "+"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (27,6)-(27,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ KeywordRestParameterNode (location: (27,6)-(27,9))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :b
-        │   │   │   ├── name_loc: (27,8)-(27,9) = "b"
-        │   │   │   └── operator_loc: (27,6)-(27,8) = "**"
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (27,0)-(27,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (28,0)-(28,3) = "end"
-        ├── @ DefNode (location: (30,0)-(31,3))
-        │   ├── name: :+
-        │   ├── name_loc: (30,4)-(30,5) = "+"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (30,0)-(30,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (30,5)-(30,6) = "("
-        │   ├── rparen_loc: (30,6)-(30,7) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (31,0)-(31,3) = "end"
-        ├── @ DefNode (location: (33,0)-(34,3))
-        │   ├── name: :+
-        │   ├── name_loc: (33,4)-(33,5) = "+"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (33,6)-(33,7))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (33,6)-(33,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :b
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (33,0)-(33,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (34,0)-(34,3) = "end"
-        ├── @ DefNode (location: (36,0)-(37,3))
-        │   ├── name: :+
-        │   ├── name_loc: (36,9)-(36,10) = "+"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (36,4)-(36,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (36,0)-(36,3) = "def"
-        │   ├── operator_loc: (36,8)-(36,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (37,0)-(37,3) = "end"
-        ├── @ DefNode (location: (39,0)-(40,3))
-        │   ├── name: :+
-        │   ├── name_loc: (39,4)-(39,5) = "+"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (39,0)-(39,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (40,0)-(40,3) = "end"
-        ├── @ DefNode (location: (42,0)-(43,3))
-        │   ├── name: :+@
-        │   ├── name_loc: (42,4)-(42,6) = "+@"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (42,0)-(42,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (43,0)-(43,3) = "end"
-        ├── @ DefNode (location: (45,0)-(46,3))
-        │   ├── name: :-
-        │   ├── name_loc: (45,4)-(45,5) = "-"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (45,0)-(45,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (46,0)-(46,3) = "end"
-        ├── @ DefNode (location: (48,0)-(48,11))
-        │   ├── name: :-
-        │   ├── name_loc: (48,6)-(48,7) = "-"
-        │   ├── receiver:
-        │   │   @ CallNode (location: (48,4)-(48,5))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (48,4)-(48,5) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (48,0)-(48,3) = "def"
-        │   ├── operator_loc: (48,5)-(48,6) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (48,8)-(48,11) = "end"
-        ├── @ DefNode (location: (50,0)-(51,3))
-        │   ├── name: :-@
-        │   ├── name_loc: (50,4)-(50,6) = "-@"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (50,0)-(50,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (51,0)-(51,3) = "end"
-        ├── @ DefNode (location: (53,0)-(54,3))
-        │   ├── name: :/
-        │   ├── name_loc: (53,4)-(53,5) = "/"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (53,0)-(53,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (54,0)-(54,3) = "end"
-        ├── @ DefNode (location: (56,0)-(57,3))
-        │   ├── name: :<
-        │   ├── name_loc: (56,4)-(56,5) = "<"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (56,0)-(56,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (57,0)-(57,3) = "end"
-        ├── @ DefNode (location: (59,0)-(60,3))
-        │   ├── name: :<<
-        │   ├── name_loc: (59,4)-(59,6) = "<<"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (59,0)-(59,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (60,0)-(60,3) = "end"
-        ├── @ DefNode (location: (62,0)-(63,3))
-        │   ├── name: :<=
-        │   ├── name_loc: (62,4)-(62,6) = "<="
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (62,0)-(62,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (63,0)-(63,3) = "end"
-        ├── @ DefNode (location: (65,0)-(66,3))
-        │   ├── name: :<=>
-        │   ├── name_loc: (65,4)-(65,7) = "<=>"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (65,0)-(65,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (66,0)-(66,3) = "end"
-        ├── @ DefNode (location: (68,0)-(69,3))
-        │   ├── name: :==
-        │   ├── name_loc: (68,4)-(68,6) = "=="
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (68,0)-(68,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (69,0)-(69,3) = "end"
-        ├── @ DefNode (location: (71,0)-(72,3))
-        │   ├── name: :===
-        │   ├── name_loc: (71,4)-(71,7) = "==="
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (71,0)-(71,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (72,0)-(72,3) = "end"
-        ├── @ DefNode (location: (74,0)-(75,3))
-        │   ├── name: :=~
-        │   ├── name_loc: (74,4)-(74,6) = "=~"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (74,0)-(74,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (75,0)-(75,3) = "end"
-        ├── @ DefNode (location: (77,0)-(78,3))
-        │   ├── name: :>
-        │   ├── name_loc: (77,4)-(77,5) = ">"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (77,0)-(77,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (78,0)-(78,3) = "end"
-        ├── @ DefNode (location: (80,0)-(81,3))
-        │   ├── name: :>=
-        │   ├── name_loc: (80,4)-(80,6) = ">="
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (80,0)-(80,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (81,0)-(81,3) = "end"
-        ├── @ DefNode (location: (83,0)-(84,3))
-        │   ├── name: :>>
-        │   ├── name_loc: (83,4)-(83,6) = ">>"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (83,0)-(83,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (84,0)-(84,3) = "end"
-        ├── @ DefNode (location: (86,0)-(87,3))
-        │   ├── name: :[]
-        │   ├── name_loc: (86,4)-(86,6) = "[]"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (86,0)-(86,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (87,0)-(87,3) = "end"
-        ├── @ DefNode (location: (89,0)-(90,3))
-        │   ├── name: :[]=
-        │   ├── name_loc: (89,4)-(89,7) = "[]="
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (89,0)-(89,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (90,0)-(90,3) = "end"
-        ├── @ DefNode (location: (92,0)-(93,3))
-        │   ├── name: :^
-        │   ├── name_loc: (92,4)-(92,5) = "^"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (92,0)-(92,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (93,0)-(93,3) = "end"
-        ├── @ DefNode (location: (95,0)-(96,3))
-        │   ├── name: :`
-        │   ├── name_loc: (95,4)-(95,5) = "`"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (95,0)-(95,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (96,0)-(96,3) = "end"
-        ├── @ DefNode (location: (98,0)-(99,3))
-        │   ├── name: :`
-        │   ├── name_loc: (98,9)-(98,10) = "`"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (98,4)-(98,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (98,0)-(98,3) = "def"
-        │   ├── operator_loc: (98,8)-(98,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (99,0)-(99,3) = "end"
-        ├── @ DefNode (location: (101,0)-(102,3))
-        │   ├── name: :|
-        │   ├── name_loc: (101,4)-(101,5) = "|"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (101,0)-(101,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (102,0)-(102,3) = "end"
-        └── @ DefNode (location: (104,0)-(105,3))
-            ├── name: :~
-            ├── name_loc: (104,4)-(104,5) = "~"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (104,0)-(104,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (105,0)-(105,3) = "end"
diff --git a/test/mri/prism/snapshots/not.txt b/test/mri/prism/snapshots/not.txt
deleted file mode 100644
index fda61bb4b58..00000000000
--- a/test/mri/prism/snapshots/not.txt
+++ /dev/null
@@ -1,351 +0,0 @@
-@ ProgramNode (location: (1,0)-(37,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(37,16))
-    └── body: (length: 10)
-        ├── @ AndNode (location: (1,0)-(1,19))
-        │   ├── left:
-        │   │   @ CallNode (location: (1,0)-(1,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (1,4)-(1,7))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (1,4)-(1,7) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (1,0)-(1,3) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (1,12)-(1,19))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (1,16)-(1,19))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (1,16)-(1,19) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (1,12)-(1,15) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (1,8)-(1,11) = "and"
-        ├── @ CallNode (location: (3,0)-(3,16))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ AndNode (location: (3,4)-(3,15))
-        │   │   ├── left:
-        │   │   │   @ CallNode (location: (3,4)-(3,7))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (3,4)-(3,7) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (3,12)-(3,15))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (3,12)-(3,15) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (3,8)-(3,11) = "and"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (3,0)-(3,3) = "not"
-        │   ├── opening_loc: (3,3)-(3,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (3,15)-(3,16) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (5,4)-(5,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (5,4)-(5,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (5,0)-(5,3) = "not"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ AndNode (location: (7,0)-(8,5))
-        │   ├── left:
-        │   │   @ CallNode (location: (7,0)-(7,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (7,4)-(7,7))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (7,4)-(7,7) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (7,0)-(7,3) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (7,12)-(8,5))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (8,2)-(8,5))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (8,2)-(8,5) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (7,12)-(7,15) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (7,8)-(7,11) = "and"
-        ├── @ AndNode (location: (11,0)-(13,5))
-        │   ├── left:
-        │   │   @ CallNode (location: (11,0)-(11,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (11,4)-(11,7))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (11,4)-(11,7) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (11,0)-(11,3) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (12,4)-(13,5))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (13,2)-(13,5))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (13,2)-(13,5) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (12,4)-(12,7) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (11,8)-(11,11) = "and"
-        ├── @ AndNode (location: (16,0)-(20,5))
-        │   ├── left:
-        │   │   @ CallNode (location: (16,0)-(16,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (16,4)-(16,7))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (16,4)-(16,7) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (16,0)-(16,3) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (17,2)-(20,5))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (20,2)-(20,5))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (20,2)-(20,5) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :!
-        │   │   ├── message_loc: (17,2)-(17,5) = "not"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (16,8)-(16,11) = "and"
-        ├── @ CallNode (location: (22,0)-(25,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (22,4)-(22,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (22,4)-(22,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (22,0)-(22,3) = "not"
-        │   ├── opening_loc: (22,3)-(22,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (25,0)-(25,1) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (27,0)-(33,3))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (30,0)-(30,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (30,0)-(30,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (27,0)-(27,3) = "not"
-        │   ├── opening_loc: (27,3)-(27,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (33,2)-(33,3) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (35,0)-(35,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ FlipFlopNode (location: (35,4)-(35,14))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ CallNode (location: (35,4)-(35,7))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (35,4)-(35,7) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (35,11)-(35,14))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (35,11)-(35,14) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (35,8)-(35,10) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (35,0)-(35,3) = "not"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (37,0)-(37,16))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ ParenthesesNode (location: (37,4)-(37,16))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (37,5)-(37,15))
-            │   │   └── body: (length: 1)
-            │   │       └── @ FlipFlopNode (location: (37,5)-(37,15))
-            │   │           ├── flags: ∅
-            │   │           ├── left:
-            │   │           │   @ CallNode (location: (37,5)-(37,8))
-            │   │           │   ├── flags: variable_call, ignore_visibility
-            │   │           │   ├── receiver: ∅
-            │   │           │   ├── call_operator_loc: ∅
-            │   │           │   ├── name: :foo
-            │   │           │   ├── message_loc: (37,5)-(37,8) = "foo"
-            │   │           │   ├── opening_loc: ∅
-            │   │           │   ├── arguments: ∅
-            │   │           │   ├── closing_loc: ∅
-            │   │           │   └── block: ∅
-            │   │           ├── right:
-            │   │           │   @ CallNode (location: (37,12)-(37,15))
-            │   │           │   ├── flags: variable_call, ignore_visibility
-            │   │           │   ├── receiver: ∅
-            │   │           │   ├── call_operator_loc: ∅
-            │   │           │   ├── name: :bar
-            │   │           │   ├── message_loc: (37,12)-(37,15) = "bar"
-            │   │           │   ├── opening_loc: ∅
-            │   │           │   ├── arguments: ∅
-            │   │           │   ├── closing_loc: ∅
-            │   │           │   └── block: ∅
-            │   │           └── operator_loc: (37,9)-(37,11) = ".."
-            │   ├── opening_loc: (37,4)-(37,5) = "("
-            │   └── closing_loc: (37,15)-(37,16) = ")"
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (37,0)-(37,3) = "not"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/numbers.txt b/test/mri/prism/snapshots/numbers.txt
deleted file mode 100644
index 740f3f5a2a1..00000000000
--- a/test/mri/prism/snapshots/numbers.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-@ ProgramNode (location: (1,0)-(67,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(67,5))
-    └── body: (length: 34)
-        ├── @ IntegerNode (location: (1,0)-(1,1))
-        │   ├── flags: decimal
-        │   └── value: 0
-        ├── @ IntegerNode (location: (3,0)-(3,1))
-        │   ├── flags: decimal
-        │   └── value: 1
-        ├── @ FloatNode (location: (5,0)-(5,3))
-        │   └── value: 1.0
-        ├── @ IntegerNode (location: (7,0)-(7,1))
-        │   ├── flags: decimal
-        │   └── value: 2
-        ├── @ IntegerNode (location: (9,0)-(9,3))
-        │   ├── flags: binary
-        │   └── value: 0
-        ├── @ IntegerNode (location: (11,0)-(11,3))
-        │   ├── flags: binary
-        │   └── value: 1
-        ├── @ IntegerNode (location: (13,0)-(13,4))
-        │   ├── flags: binary
-        │   └── value: 2
-        ├── @ IntegerNode (location: (15,0)-(15,3))
-        │   ├── flags: decimal
-        │   └── value: 0
-        ├── @ IntegerNode (location: (17,0)-(17,3))
-        │   ├── flags: decimal
-        │   └── value: 1
-        ├── @ IntegerNode (location: (19,0)-(19,3))
-        │   ├── flags: decimal
-        │   └── value: 2
-        ├── @ IntegerNode (location: (21,0)-(21,2))
-        │   ├── flags: octal
-        │   └── value: 0
-        ├── @ IntegerNode (location: (23,0)-(23,2))
-        │   ├── flags: octal
-        │   └── value: 1
-        ├── @ IntegerNode (location: (25,0)-(25,2))
-        │   ├── flags: octal
-        │   └── value: 2
-        ├── @ IntegerNode (location: (27,0)-(27,3))
-        │   ├── flags: octal
-        │   └── value: 0
-        ├── @ IntegerNode (location: (29,0)-(29,3))
-        │   ├── flags: octal
-        │   └── value: 1
-        ├── @ IntegerNode (location: (31,0)-(31,3))
-        │   ├── flags: octal
-        │   └── value: 2
-        ├── @ IntegerNode (location: (33,0)-(33,3))
-        │   ├── flags: hexadecimal
-        │   └── value: 0
-        ├── @ IntegerNode (location: (35,0)-(35,3))
-        │   ├── flags: hexadecimal
-        │   └── value: 1
-        ├── @ IntegerNode (location: (37,0)-(37,3))
-        │   ├── flags: hexadecimal
-        │   └── value: 2
-        ├── @ ImaginaryNode (location: (39,0)-(39,2))
-        │   └── numeric:
-        │       @ IntegerNode (location: (39,0)-(39,1))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ RationalNode (location: (41,0)-(41,2))
-        │   └── numeric:
-        │       @ IntegerNode (location: (41,0)-(41,1))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ IntegerNode (location: (43,0)-(43,2))
-        │   ├── flags: decimal
-        │   └── value: -1
-        ├── @ ImaginaryNode (location: (45,0)-(45,3))
-        │   └── numeric:
-        │       @ RationalNode (location: (45,0)-(45,2))
-        │       └── numeric:
-        │           @ IntegerNode (location: (45,0)-(45,1))
-        │           ├── flags: decimal
-        │           └── value: 1
-        ├── @ RationalNode (location: (47,0)-(47,4))
-        │   └── numeric:
-        │       @ FloatNode (location: (47,0)-(47,3))
-        │       └── value: 1.2
-        ├── @ ImaginaryNode (location: (49,0)-(49,5))
-        │   └── numeric:
-        │       @ RationalNode (location: (49,0)-(49,4))
-        │       └── numeric:
-        │           @ FloatNode (location: (49,0)-(49,3))
-        │           └── value: 1.2
-        ├── @ ImaginaryNode (location: (51,0)-(51,4))
-        │   └── numeric:
-        │       @ RationalNode (location: (51,0)-(51,3))
-        │       └── numeric:
-        │           @ IntegerNode (location: (51,0)-(51,2))
-        │           ├── flags: decimal
-        │           └── value: -1
-        ├── @ RationalNode (location: (53,0)-(53,5))
-        │   └── numeric:
-        │       @ FloatNode (location: (53,0)-(53,4))
-        │       └── value: -1.2
-        ├── @ ImaginaryNode (location: (55,0)-(55,6))
-        │   └── numeric:
-        │       @ RationalNode (location: (55,0)-(55,5))
-        │       └── numeric:
-        │           @ FloatNode (location: (55,0)-(55,4))
-        │           └── value: -1.2
-        ├── @ RationalNode (location: (57,0)-(57,4))
-        │   └── numeric:
-        │       @ IntegerNode (location: (57,0)-(57,3))
-        │       ├── flags: octal
-        │       └── value: 1
-        ├── @ ImaginaryNode (location: (59,0)-(59,4))
-        │   └── numeric:
-        │       @ IntegerNode (location: (59,0)-(59,3))
-        │       ├── flags: octal
-        │       └── value: 1
-        ├── @ ImaginaryNode (location: (61,0)-(61,5))
-        │   └── numeric:
-        │       @ RationalNode (location: (61,0)-(61,4))
-        │       └── numeric:
-        │           @ IntegerNode (location: (61,0)-(61,3))
-        │           ├── flags: octal
-        │           └── value: 1
-        ├── @ RationalNode (location: (63,0)-(63,4))
-        │   └── numeric:
-        │       @ IntegerNode (location: (63,0)-(63,3))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ ImaginaryNode (location: (65,0)-(65,4))
-        │   └── numeric:
-        │       @ IntegerNode (location: (65,0)-(65,3))
-        │       ├── flags: decimal
-        │       └── value: 1
-        └── @ ImaginaryNode (location: (67,0)-(67,5))
-            └── numeric:
-                @ RationalNode (location: (67,0)-(67,4))
-                └── numeric:
-                    @ IntegerNode (location: (67,0)-(67,3))
-                    ├── flags: binary
-                    └── value: 1
diff --git a/test/mri/prism/snapshots/patterns.txt b/test/mri/prism/snapshots/patterns.txt
deleted file mode 100644
index 5662129daed..00000000000
--- a/test/mri/prism/snapshots/patterns.txt
+++ /dev/null
@@ -1,4921 +0,0 @@
-@ ProgramNode (location: (1,0)-(217,5))
-├── locals: [:bar, :baz, :qux, :b, :a, :foo, :x]
-└── statements:
-    @ StatementsNode (location: (1,0)-(217,5))
-    └── body: (length: 180)
-        ├── @ MatchRequiredNode (location: (1,0)-(1,10))
-        │   ├── value:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ LocalVariableTargetNode (location: (1,7)-(1,10))
-        │   │   ├── name: :bar
-        │   │   └── depth: 0
-        │   └── operator_loc: (1,4)-(1,6) = "=>"
-        ├── @ MatchRequiredNode (location: (2,0)-(2,8))
-        │   ├── value:
-        │   │   @ CallNode (location: (2,0)-(2,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (2,0)-(2,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ IntegerNode (location: (2,7)-(2,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (2,4)-(2,6) = "=>"
-        ├── @ MatchRequiredNode (location: (3,0)-(3,10))
-        │   ├── value:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ FloatNode (location: (3,7)-(3,10))
-        │   │   └── value: 1.0
-        │   └── operator_loc: (3,4)-(3,6) = "=>"
-        ├── @ MatchRequiredNode (location: (4,0)-(4,9))
-        │   ├── value:
-        │   │   @ CallNode (location: (4,0)-(4,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (4,0)-(4,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ImaginaryNode (location: (4,7)-(4,9))
-        │   │   └── numeric:
-        │   │       @ IntegerNode (location: (4,7)-(4,8))
-        │   │       ├── flags: decimal
-        │   │       └── value: 1
-        │   └── operator_loc: (4,4)-(4,6) = "=>"
-        ├── @ MatchRequiredNode (location: (5,0)-(5,9))
-        │   ├── value:
-        │   │   @ CallNode (location: (5,0)-(5,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (5,0)-(5,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RationalNode (location: (5,7)-(5,9))
-        │   │   └── numeric:
-        │   │       @ IntegerNode (location: (5,7)-(5,8))
-        │   │       ├── flags: decimal
-        │   │       └── value: 1
-        │   └── operator_loc: (5,4)-(5,6) = "=>"
-        ├── @ MatchRequiredNode (location: (6,0)-(6,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (6,0)-(6,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (6,0)-(6,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SymbolNode (location: (6,7)-(6,11))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (6,7)-(6,8) = ":"
-        │   │   ├── value_loc: (6,8)-(6,11) = "foo"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (6,4)-(6,6) = "=>"
-        ├── @ MatchRequiredNode (location: (7,0)-(7,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (7,0)-(7,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (7,0)-(7,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SymbolNode (location: (7,7)-(7,14))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (7,7)-(7,10) = "%s["
-        │   │   ├── value_loc: (7,10)-(7,13) = "foo"
-        │   │   ├── closing_loc: (7,13)-(7,14) = "]"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (7,4)-(7,6) = "=>"
-        ├── @ MatchRequiredNode (location: (8,0)-(8,13))
-        │   ├── value:
-        │   │   @ CallNode (location: (8,0)-(8,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (8,0)-(8,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SymbolNode (location: (8,7)-(8,13))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (8,7)-(8,9) = ":\""
-        │   │   ├── value_loc: (8,9)-(8,12) = "foo"
-        │   │   ├── closing_loc: (8,12)-(8,13) = "\""
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (8,4)-(8,6) = "=>"
-        ├── @ MatchRequiredNode (location: (9,0)-(9,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (9,0)-(9,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (9,0)-(9,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RegularExpressionNode (location: (9,7)-(9,12))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (9,7)-(9,8) = "/"
-        │   │   ├── content_loc: (9,8)-(9,11) = "foo"
-        │   │   ├── closing_loc: (9,11)-(9,12) = "/"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (9,4)-(9,6) = "=>"
-        ├── @ MatchRequiredNode (location: (10,0)-(10,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (10,0)-(10,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (10,0)-(10,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ XStringNode (location: (10,7)-(10,12))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (10,7)-(10,8) = "`"
-        │   │   ├── content_loc: (10,8)-(10,11) = "foo"
-        │   │   ├── closing_loc: (10,11)-(10,12) = "`"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (10,4)-(10,6) = "=>"
-        ├── @ MatchRequiredNode (location: (11,0)-(11,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (11,0)-(11,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (11,0)-(11,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ XStringNode (location: (11,7)-(11,14))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (11,7)-(11,10) = "%x["
-        │   │   ├── content_loc: (11,10)-(11,13) = "foo"
-        │   │   ├── closing_loc: (11,13)-(11,14) = "]"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (11,4)-(11,6) = "=>"
-        ├── @ MatchRequiredNode (location: (12,0)-(12,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (12,0)-(12,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (12,0)-(12,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayNode (location: (12,7)-(12,14))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ SymbolNode (location: (12,10)-(12,13))
-        │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── value_loc: (12,10)-(12,13) = "foo"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "foo"
-        │   │   ├── opening_loc: (12,7)-(12,10) = "%i["
-        │   │   └── closing_loc: (12,13)-(12,14) = "]"
-        │   └── operator_loc: (12,4)-(12,6) = "=>"
-        ├── @ MatchRequiredNode (location: (13,0)-(13,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (13,0)-(13,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (13,0)-(13,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayNode (location: (13,7)-(13,14))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ SymbolNode (location: (13,10)-(13,13))
-        │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── value_loc: (13,10)-(13,13) = "foo"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "foo"
-        │   │   ├── opening_loc: (13,7)-(13,10) = "%I["
-        │   │   └── closing_loc: (13,13)-(13,14) = "]"
-        │   └── operator_loc: (13,4)-(13,6) = "=>"
-        ├── @ MatchRequiredNode (location: (14,0)-(14,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (14,0)-(14,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (14,0)-(14,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayNode (location: (14,7)-(14,14))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ StringNode (location: (14,10)-(14,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── content_loc: (14,10)-(14,13) = "foo"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "foo"
-        │   │   ├── opening_loc: (14,7)-(14,10) = "%w["
-        │   │   └── closing_loc: (14,13)-(14,14) = "]"
-        │   └── operator_loc: (14,4)-(14,6) = "=>"
-        ├── @ MatchRequiredNode (location: (15,0)-(15,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (15,0)-(15,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (15,0)-(15,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayNode (location: (15,7)-(15,14))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ StringNode (location: (15,10)-(15,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── content_loc: (15,10)-(15,13) = "foo"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "foo"
-        │   │   ├── opening_loc: (15,7)-(15,10) = "%W["
-        │   │   └── closing_loc: (15,13)-(15,14) = "]"
-        │   └── operator_loc: (15,4)-(15,6) = "=>"
-        ├── @ MatchRequiredNode (location: (16,0)-(16,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (16,0)-(16,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (16,0)-(16,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ StringNode (location: (16,7)-(16,14))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (16,7)-(16,10) = "%q["
-        │   │   ├── content_loc: (16,10)-(16,13) = "foo"
-        │   │   ├── closing_loc: (16,13)-(16,14) = "]"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (16,4)-(16,6) = "=>"
-        ├── @ MatchRequiredNode (location: (17,0)-(17,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (17,0)-(17,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (17,0)-(17,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ StringNode (location: (17,7)-(17,14))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (17,7)-(17,10) = "%Q["
-        │   │   ├── content_loc: (17,10)-(17,13) = "foo"
-        │   │   ├── closing_loc: (17,13)-(17,14) = "]"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (17,4)-(17,6) = "=>"
-        ├── @ MatchRequiredNode (location: (18,0)-(18,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (18,0)-(18,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (18,0)-(18,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ StringNode (location: (18,7)-(18,12))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (18,7)-(18,8) = "\""
-        │   │   ├── content_loc: (18,8)-(18,11) = "foo"
-        │   │   ├── closing_loc: (18,11)-(18,12) = "\""
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (18,4)-(18,6) = "=>"
-        ├── @ MatchRequiredNode (location: (19,0)-(19,10))
-        │   ├── value:
-        │   │   @ CallNode (location: (19,0)-(19,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (19,0)-(19,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ NilNode (location: (19,7)-(19,10))
-        │   └── operator_loc: (19,4)-(19,6) = "=>"
-        ├── @ MatchRequiredNode (location: (20,0)-(20,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (20,0)-(20,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (20,0)-(20,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SelfNode (location: (20,7)-(20,11))
-        │   └── operator_loc: (20,4)-(20,6) = "=>"
-        ├── @ MatchRequiredNode (location: (21,0)-(21,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (21,0)-(21,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (21,0)-(21,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ TrueNode (location: (21,7)-(21,11))
-        │   └── operator_loc: (21,4)-(21,6) = "=>"
-        ├── @ MatchRequiredNode (location: (22,0)-(22,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (22,0)-(22,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (22,0)-(22,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ FalseNode (location: (22,7)-(22,12))
-        │   └── operator_loc: (22,4)-(22,6) = "=>"
-        ├── @ MatchRequiredNode (location: (23,0)-(23,15))
-        │   ├── value:
-        │   │   @ CallNode (location: (23,0)-(23,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (23,0)-(23,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SourceFileNode (location: (23,7)-(23,15))
-        │   │   ├── flags: ∅
-        │   │   └── filepath: "patterns.txt"
-        │   └── operator_loc: (23,4)-(23,6) = "=>"
-        ├── @ MatchRequiredNode (location: (24,0)-(24,15))
-        │   ├── value:
-        │   │   @ CallNode (location: (24,0)-(24,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (24,0)-(24,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SourceLineNode (location: (24,7)-(24,15))
-        │   └── operator_loc: (24,4)-(24,6) = "=>"
-        ├── @ MatchRequiredNode (location: (25,0)-(25,19))
-        │   ├── value:
-        │   │   @ CallNode (location: (25,0)-(25,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (25,0)-(25,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SourceEncodingNode (location: (25,7)-(25,19))
-        │   └── operator_loc: (25,4)-(25,6) = "=>"
-        ├── @ MatchRequiredNode (location: (26,0)-(26,17))
-        │   ├── value:
-        │   │   @ CallNode (location: (26,0)-(26,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (26,0)-(26,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ LambdaNode (location: (26,7)-(26,17))
-        │   │   ├── locals: []
-        │   │   ├── operator_loc: (26,7)-(26,9) = "->"
-        │   │   ├── opening_loc: (26,10)-(26,11) = "{"
-        │   │   ├── closing_loc: (26,16)-(26,17) = "}"
-        │   │   ├── parameters: ∅
-        │   │   └── body:
-        │   │       @ StatementsNode (location: (26,12)-(26,15))
-        │   │       └── body: (length: 1)
-        │   │           └── @ LocalVariableReadNode (location: (26,12)-(26,15))
-        │   │               ├── name: :bar
-        │   │               └── depth: 1
-        │   └── operator_loc: (26,4)-(26,6) = "=>"
-        ├── @ MatchRequiredNode (location: (28,0)-(28,13))
-        │   ├── value:
-        │   │   @ CallNode (location: (28,0)-(28,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (28,0)-(28,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (28,7)-(28,13))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (28,7)-(28,8))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (28,12)-(28,13))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── operator_loc: (28,9)-(28,11) = ".."
-        │   └── operator_loc: (28,4)-(28,6) = "=>"
-        ├── @ MatchRequiredNode (location: (29,0)-(29,17))
-        │   ├── value:
-        │   │   @ CallNode (location: (29,0)-(29,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (29,0)-(29,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (29,7)-(29,17))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ FloatNode (location: (29,7)-(29,10))
-        │   │   │   └── value: 1.0
-        │   │   ├── right:
-        │   │   │   @ FloatNode (location: (29,14)-(29,17))
-        │   │   │   └── value: 1.0
-        │   │   └── operator_loc: (29,11)-(29,13) = ".."
-        │   └── operator_loc: (29,4)-(29,6) = "=>"
-        ├── @ MatchRequiredNode (location: (30,0)-(30,15))
-        │   ├── value:
-        │   │   @ CallNode (location: (30,0)-(30,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (30,0)-(30,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (30,7)-(30,15))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ ImaginaryNode (location: (30,7)-(30,9))
-        │   │   │   └── numeric:
-        │   │   │       @ IntegerNode (location: (30,7)-(30,8))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 1
-        │   │   ├── right:
-        │   │   │   @ ImaginaryNode (location: (30,13)-(30,15))
-        │   │   │   └── numeric:
-        │   │   │       @ IntegerNode (location: (30,13)-(30,14))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 1
-        │   │   └── operator_loc: (30,10)-(30,12) = ".."
-        │   └── operator_loc: (30,4)-(30,6) = "=>"
-        ├── @ MatchRequiredNode (location: (31,0)-(31,15))
-        │   ├── value:
-        │   │   @ CallNode (location: (31,0)-(31,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (31,0)-(31,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (31,7)-(31,15))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ RationalNode (location: (31,7)-(31,9))
-        │   │   │   └── numeric:
-        │   │   │       @ IntegerNode (location: (31,7)-(31,8))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 1
-        │   │   ├── right:
-        │   │   │   @ RationalNode (location: (31,13)-(31,15))
-        │   │   │   └── numeric:
-        │   │   │       @ IntegerNode (location: (31,13)-(31,14))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 1
-        │   │   └── operator_loc: (31,10)-(31,12) = ".."
-        │   └── operator_loc: (31,4)-(31,6) = "=>"
-        ├── @ MatchRequiredNode (location: (32,0)-(32,19))
-        │   ├── value:
-        │   │   @ CallNode (location: (32,0)-(32,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (32,0)-(32,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (32,7)-(32,19))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ SymbolNode (location: (32,7)-(32,11))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (32,7)-(32,8) = ":"
-        │   │   │   ├── value_loc: (32,8)-(32,11) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ SymbolNode (location: (32,15)-(32,19))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (32,15)-(32,16) = ":"
-        │   │   │   ├── value_loc: (32,16)-(32,19) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (32,12)-(32,14) = ".."
-        │   └── operator_loc: (32,4)-(32,6) = "=>"
-        ├── @ MatchRequiredNode (location: (33,0)-(33,25))
-        │   ├── value:
-        │   │   @ CallNode (location: (33,0)-(33,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (33,0)-(33,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (33,7)-(33,25))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ SymbolNode (location: (33,7)-(33,14))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (33,7)-(33,10) = "%s["
-        │   │   │   ├── value_loc: (33,10)-(33,13) = "foo"
-        │   │   │   ├── closing_loc: (33,13)-(33,14) = "]"
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ SymbolNode (location: (33,18)-(33,25))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (33,18)-(33,21) = "%s["
-        │   │   │   ├── value_loc: (33,21)-(33,24) = "foo"
-        │   │   │   ├── closing_loc: (33,24)-(33,25) = "]"
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (33,15)-(33,17) = ".."
-        │   └── operator_loc: (33,4)-(33,6) = "=>"
-        ├── @ MatchRequiredNode (location: (34,0)-(34,23))
-        │   ├── value:
-        │   │   @ CallNode (location: (34,0)-(34,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (34,0)-(34,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (34,7)-(34,23))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ SymbolNode (location: (34,7)-(34,13))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (34,7)-(34,9) = ":\""
-        │   │   │   ├── value_loc: (34,9)-(34,12) = "foo"
-        │   │   │   ├── closing_loc: (34,12)-(34,13) = "\""
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ SymbolNode (location: (34,17)-(34,23))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (34,17)-(34,19) = ":\""
-        │   │   │   ├── value_loc: (34,19)-(34,22) = "foo"
-        │   │   │   ├── closing_loc: (34,22)-(34,23) = "\""
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (34,14)-(34,16) = ".."
-        │   └── operator_loc: (34,4)-(34,6) = "=>"
-        ├── @ MatchRequiredNode (location: (35,0)-(35,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (35,0)-(35,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (35,0)-(35,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (35,7)-(35,21))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ RegularExpressionNode (location: (35,7)-(35,12))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (35,7)-(35,8) = "/"
-        │   │   │   ├── content_loc: (35,8)-(35,11) = "foo"
-        │   │   │   ├── closing_loc: (35,11)-(35,12) = "/"
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ RegularExpressionNode (location: (35,16)-(35,21))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (35,16)-(35,17) = "/"
-        │   │   │   ├── content_loc: (35,17)-(35,20) = "foo"
-        │   │   │   ├── closing_loc: (35,20)-(35,21) = "/"
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (35,13)-(35,15) = ".."
-        │   └── operator_loc: (35,4)-(35,6) = "=>"
-        ├── @ MatchRequiredNode (location: (36,0)-(36,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (36,0)-(36,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (36,0)-(36,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (36,7)-(36,21))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ XStringNode (location: (36,7)-(36,12))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (36,7)-(36,8) = "`"
-        │   │   │   ├── content_loc: (36,8)-(36,11) = "foo"
-        │   │   │   ├── closing_loc: (36,11)-(36,12) = "`"
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ XStringNode (location: (36,16)-(36,21))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (36,16)-(36,17) = "`"
-        │   │   │   ├── content_loc: (36,17)-(36,20) = "foo"
-        │   │   │   ├── closing_loc: (36,20)-(36,21) = "`"
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (36,13)-(36,15) = ".."
-        │   └── operator_loc: (36,4)-(36,6) = "=>"
-        ├── @ MatchRequiredNode (location: (37,0)-(37,25))
-        │   ├── value:
-        │   │   @ CallNode (location: (37,0)-(37,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (37,0)-(37,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (37,7)-(37,25))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ XStringNode (location: (37,7)-(37,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (37,7)-(37,10) = "%x["
-        │   │   │   ├── content_loc: (37,10)-(37,13) = "foo"
-        │   │   │   ├── closing_loc: (37,13)-(37,14) = "]"
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ XStringNode (location: (37,18)-(37,25))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (37,18)-(37,21) = "%x["
-        │   │   │   ├── content_loc: (37,21)-(37,24) = "foo"
-        │   │   │   ├── closing_loc: (37,24)-(37,25) = "]"
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (37,15)-(37,17) = ".."
-        │   └── operator_loc: (37,4)-(37,6) = "=>"
-        ├── @ MatchRequiredNode (location: (38,0)-(38,25))
-        │   ├── value:
-        │   │   @ CallNode (location: (38,0)-(38,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (38,0)-(38,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (38,7)-(38,25))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ ArrayNode (location: (38,7)-(38,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 1)
-        │   │   │   │   └── @ SymbolNode (location: (38,10)-(38,13))
-        │   │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── value_loc: (38,10)-(38,13) = "foo"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "foo"
-        │   │   │   ├── opening_loc: (38,7)-(38,10) = "%i["
-        │   │   │   └── closing_loc: (38,13)-(38,14) = "]"
-        │   │   ├── right:
-        │   │   │   @ ArrayNode (location: (38,18)-(38,25))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 1)
-        │   │   │   │   └── @ SymbolNode (location: (38,21)-(38,24))
-        │   │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── value_loc: (38,21)-(38,24) = "foo"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "foo"
-        │   │   │   ├── opening_loc: (38,18)-(38,21) = "%i["
-        │   │   │   └── closing_loc: (38,24)-(38,25) = "]"
-        │   │   └── operator_loc: (38,15)-(38,17) = ".."
-        │   └── operator_loc: (38,4)-(38,6) = "=>"
-        ├── @ MatchRequiredNode (location: (39,0)-(39,25))
-        │   ├── value:
-        │   │   @ CallNode (location: (39,0)-(39,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (39,0)-(39,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (39,7)-(39,25))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ ArrayNode (location: (39,7)-(39,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 1)
-        │   │   │   │   └── @ SymbolNode (location: (39,10)-(39,13))
-        │   │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── value_loc: (39,10)-(39,13) = "foo"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "foo"
-        │   │   │   ├── opening_loc: (39,7)-(39,10) = "%I["
-        │   │   │   └── closing_loc: (39,13)-(39,14) = "]"
-        │   │   ├── right:
-        │   │   │   @ ArrayNode (location: (39,18)-(39,25))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 1)
-        │   │   │   │   └── @ SymbolNode (location: (39,21)-(39,24))
-        │   │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── value_loc: (39,21)-(39,24) = "foo"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "foo"
-        │   │   │   ├── opening_loc: (39,18)-(39,21) = "%I["
-        │   │   │   └── closing_loc: (39,24)-(39,25) = "]"
-        │   │   └── operator_loc: (39,15)-(39,17) = ".."
-        │   └── operator_loc: (39,4)-(39,6) = "=>"
-        ├── @ MatchRequiredNode (location: (40,0)-(40,25))
-        │   ├── value:
-        │   │   @ CallNode (location: (40,0)-(40,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (40,0)-(40,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (40,7)-(40,25))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ ArrayNode (location: (40,7)-(40,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 1)
-        │   │   │   │   └── @ StringNode (location: (40,10)-(40,13))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── content_loc: (40,10)-(40,13) = "foo"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "foo"
-        │   │   │   ├── opening_loc: (40,7)-(40,10) = "%w["
-        │   │   │   └── closing_loc: (40,13)-(40,14) = "]"
-        │   │   ├── right:
-        │   │   │   @ ArrayNode (location: (40,18)-(40,25))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 1)
-        │   │   │   │   └── @ StringNode (location: (40,21)-(40,24))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── content_loc: (40,21)-(40,24) = "foo"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "foo"
-        │   │   │   ├── opening_loc: (40,18)-(40,21) = "%w["
-        │   │   │   └── closing_loc: (40,24)-(40,25) = "]"
-        │   │   └── operator_loc: (40,15)-(40,17) = ".."
-        │   └── operator_loc: (40,4)-(40,6) = "=>"
-        ├── @ MatchRequiredNode (location: (41,0)-(41,25))
-        │   ├── value:
-        │   │   @ CallNode (location: (41,0)-(41,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (41,0)-(41,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (41,7)-(41,25))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ ArrayNode (location: (41,7)-(41,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 1)
-        │   │   │   │   └── @ StringNode (location: (41,10)-(41,13))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── content_loc: (41,10)-(41,13) = "foo"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "foo"
-        │   │   │   ├── opening_loc: (41,7)-(41,10) = "%W["
-        │   │   │   └── closing_loc: (41,13)-(41,14) = "]"
-        │   │   ├── right:
-        │   │   │   @ ArrayNode (location: (41,18)-(41,25))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── elements: (length: 1)
-        │   │   │   │   └── @ StringNode (location: (41,21)-(41,24))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── content_loc: (41,21)-(41,24) = "foo"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "foo"
-        │   │   │   ├── opening_loc: (41,18)-(41,21) = "%W["
-        │   │   │   └── closing_loc: (41,24)-(41,25) = "]"
-        │   │   └── operator_loc: (41,15)-(41,17) = ".."
-        │   └── operator_loc: (41,4)-(41,6) = "=>"
-        ├── @ MatchRequiredNode (location: (42,0)-(42,25))
-        │   ├── value:
-        │   │   @ CallNode (location: (42,0)-(42,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (42,0)-(42,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (42,7)-(42,25))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ StringNode (location: (42,7)-(42,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (42,7)-(42,10) = "%q["
-        │   │   │   ├── content_loc: (42,10)-(42,13) = "foo"
-        │   │   │   ├── closing_loc: (42,13)-(42,14) = "]"
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ StringNode (location: (42,18)-(42,25))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (42,18)-(42,21) = "%q["
-        │   │   │   ├── content_loc: (42,21)-(42,24) = "foo"
-        │   │   │   ├── closing_loc: (42,24)-(42,25) = "]"
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (42,15)-(42,17) = ".."
-        │   └── operator_loc: (42,4)-(42,6) = "=>"
-        ├── @ MatchRequiredNode (location: (43,0)-(43,25))
-        │   ├── value:
-        │   │   @ CallNode (location: (43,0)-(43,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (43,0)-(43,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (43,7)-(43,25))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ StringNode (location: (43,7)-(43,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (43,7)-(43,10) = "%Q["
-        │   │   │   ├── content_loc: (43,10)-(43,13) = "foo"
-        │   │   │   ├── closing_loc: (43,13)-(43,14) = "]"
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ StringNode (location: (43,18)-(43,25))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (43,18)-(43,21) = "%Q["
-        │   │   │   ├── content_loc: (43,21)-(43,24) = "foo"
-        │   │   │   ├── closing_loc: (43,24)-(43,25) = "]"
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (43,15)-(43,17) = ".."
-        │   └── operator_loc: (43,4)-(43,6) = "=>"
-        ├── @ MatchRequiredNode (location: (44,0)-(44,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (44,0)-(44,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (44,0)-(44,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (44,7)-(44,21))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ StringNode (location: (44,7)-(44,12))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (44,7)-(44,8) = "\""
-        │   │   │   ├── content_loc: (44,8)-(44,11) = "foo"
-        │   │   │   ├── closing_loc: (44,11)-(44,12) = "\""
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── right:
-        │   │   │   @ StringNode (location: (44,16)-(44,21))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (44,16)-(44,17) = "\""
-        │   │   │   ├── content_loc: (44,17)-(44,20) = "foo"
-        │   │   │   ├── closing_loc: (44,20)-(44,21) = "\""
-        │   │   │   └── unescaped: "foo"
-        │   │   └── operator_loc: (44,13)-(44,15) = ".."
-        │   └── operator_loc: (44,4)-(44,6) = "=>"
-        ├── @ MatchRequiredNode (location: (45,0)-(45,17))
-        │   ├── value:
-        │   │   @ CallNode (location: (45,0)-(45,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (45,0)-(45,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (45,7)-(45,17))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ NilNode (location: (45,7)-(45,10))
-        │   │   ├── right:
-        │   │   │   @ NilNode (location: (45,14)-(45,17))
-        │   │   └── operator_loc: (45,11)-(45,13) = ".."
-        │   └── operator_loc: (45,4)-(45,6) = "=>"
-        ├── @ MatchRequiredNode (location: (46,0)-(46,19))
-        │   ├── value:
-        │   │   @ CallNode (location: (46,0)-(46,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (46,0)-(46,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (46,7)-(46,19))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ SelfNode (location: (46,7)-(46,11))
-        │   │   ├── right:
-        │   │   │   @ SelfNode (location: (46,15)-(46,19))
-        │   │   └── operator_loc: (46,12)-(46,14) = ".."
-        │   └── operator_loc: (46,4)-(46,6) = "=>"
-        ├── @ MatchRequiredNode (location: (47,0)-(47,19))
-        │   ├── value:
-        │   │   @ CallNode (location: (47,0)-(47,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (47,0)-(47,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (47,7)-(47,19))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ TrueNode (location: (47,7)-(47,11))
-        │   │   ├── right:
-        │   │   │   @ TrueNode (location: (47,15)-(47,19))
-        │   │   └── operator_loc: (47,12)-(47,14) = ".."
-        │   └── operator_loc: (47,4)-(47,6) = "=>"
-        ├── @ MatchRequiredNode (location: (48,0)-(48,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (48,0)-(48,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (48,0)-(48,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (48,7)-(48,21))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ FalseNode (location: (48,7)-(48,12))
-        │   │   ├── right:
-        │   │   │   @ FalseNode (location: (48,16)-(48,21))
-        │   │   └── operator_loc: (48,13)-(48,15) = ".."
-        │   └── operator_loc: (48,4)-(48,6) = "=>"
-        ├── @ MatchRequiredNode (location: (49,0)-(49,27))
-        │   ├── value:
-        │   │   @ CallNode (location: (49,0)-(49,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (49,0)-(49,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (49,7)-(49,27))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ SourceFileNode (location: (49,7)-(49,15))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── filepath: "patterns.txt"
-        │   │   ├── right:
-        │   │   │   @ SourceFileNode (location: (49,19)-(49,27))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── filepath: "patterns.txt"
-        │   │   └── operator_loc: (49,16)-(49,18) = ".."
-        │   └── operator_loc: (49,4)-(49,6) = "=>"
-        ├── @ MatchRequiredNode (location: (50,0)-(50,27))
-        │   ├── value:
-        │   │   @ CallNode (location: (50,0)-(50,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (50,0)-(50,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (50,7)-(50,27))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ SourceLineNode (location: (50,7)-(50,15))
-        │   │   ├── right:
-        │   │   │   @ SourceLineNode (location: (50,19)-(50,27))
-        │   │   └── operator_loc: (50,16)-(50,18) = ".."
-        │   └── operator_loc: (50,4)-(50,6) = "=>"
-        ├── @ MatchRequiredNode (location: (51,0)-(51,35))
-        │   ├── value:
-        │   │   @ CallNode (location: (51,0)-(51,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (51,0)-(51,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (51,7)-(51,35))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ SourceEncodingNode (location: (51,7)-(51,19))
-        │   │   ├── right:
-        │   │   │   @ SourceEncodingNode (location: (51,23)-(51,35))
-        │   │   └── operator_loc: (51,20)-(51,22) = ".."
-        │   └── operator_loc: (51,4)-(51,6) = "=>"
-        ├── @ MatchRequiredNode (location: (52,0)-(52,31))
-        │   ├── value:
-        │   │   @ CallNode (location: (52,0)-(52,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (52,0)-(52,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RangeNode (location: (52,7)-(52,31))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ LambdaNode (location: (52,7)-(52,17))
-        │   │   │   ├── locals: []
-        │   │   │   ├── operator_loc: (52,7)-(52,9) = "->"
-        │   │   │   ├── opening_loc: (52,10)-(52,11) = "{"
-        │   │   │   ├── closing_loc: (52,16)-(52,17) = "}"
-        │   │   │   ├── parameters: ∅
-        │   │   │   └── body:
-        │   │   │       @ StatementsNode (location: (52,12)-(52,15))
-        │   │   │       └── body: (length: 1)
-        │   │   │           └── @ LocalVariableReadNode (location: (52,12)-(52,15))
-        │   │   │               ├── name: :bar
-        │   │   │               └── depth: 1
-        │   │   ├── right:
-        │   │   │   @ LambdaNode (location: (52,21)-(52,31))
-        │   │   │   ├── locals: []
-        │   │   │   ├── operator_loc: (52,21)-(52,23) = "->"
-        │   │   │   ├── opening_loc: (52,24)-(52,25) = "{"
-        │   │   │   ├── closing_loc: (52,30)-(52,31) = "}"
-        │   │   │   ├── parameters: ∅
-        │   │   │   └── body:
-        │   │   │       @ StatementsNode (location: (52,26)-(52,29))
-        │   │   │       └── body: (length: 1)
-        │   │   │           └── @ LocalVariableReadNode (location: (52,26)-(52,29))
-        │   │   │               ├── name: :bar
-        │   │   │               └── depth: 1
-        │   │   └── operator_loc: (52,18)-(52,20) = ".."
-        │   └── operator_loc: (52,4)-(52,6) = "=>"
-        ├── @ LocalVariableWriteNode (location: (54,0)-(54,7))
-        │   ├── name: :bar
-        │   ├── depth: 0
-        │   ├── name_loc: (54,0)-(54,3) = "bar"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (54,6)-(54,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (54,4)-(54,5) = "="
-        ├── @ MatchRequiredNode (location: (54,9)-(54,20))
-        │   ├── value:
-        │   │   @ CallNode (location: (54,9)-(54,12))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (54,9)-(54,12) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ PinnedVariableNode (location: (54,16)-(54,20))
-        │   │   ├── variable:
-        │   │   │   @ LocalVariableReadNode (location: (54,17)-(54,20))
-        │   │   │   ├── name: :bar
-        │   │   │   └── depth: 0
-        │   │   └── operator_loc: (54,16)-(54,17) = "^"
-        │   └── operator_loc: (54,13)-(54,15) = "=>"
-        ├── @ MatchRequiredNode (location: (55,0)-(55,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (55,0)-(55,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (55,0)-(55,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ PinnedVariableNode (location: (55,7)-(55,12))
-        │   │   ├── variable:
-        │   │   │   @ InstanceVariableReadNode (location: (55,8)-(55,12))
-        │   │   │   └── name: :@bar
-        │   │   └── operator_loc: (55,7)-(55,8) = "^"
-        │   └── operator_loc: (55,4)-(55,6) = "=>"
-        ├── @ MatchRequiredNode (location: (56,0)-(56,13))
-        │   ├── value:
-        │   │   @ CallNode (location: (56,0)-(56,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (56,0)-(56,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ PinnedVariableNode (location: (56,7)-(56,13))
-        │   │   ├── variable:
-        │   │   │   @ ClassVariableReadNode (location: (56,8)-(56,13))
-        │   │   │   └── name: :@@bar
-        │   │   └── operator_loc: (56,7)-(56,8) = "^"
-        │   └── operator_loc: (56,4)-(56,6) = "=>"
-        ├── @ MatchRequiredNode (location: (57,0)-(57,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (57,0)-(57,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (57,0)-(57,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ PinnedVariableNode (location: (57,7)-(57,12))
-        │   │   ├── variable:
-        │   │   │   @ GlobalVariableReadNode (location: (57,8)-(57,12))
-        │   │   │   └── name: :$bar
-        │   │   └── operator_loc: (57,7)-(57,8) = "^"
-        │   └── operator_loc: (57,4)-(57,6) = "=>"
-        ├── @ MatchRequiredNode (location: (59,0)-(59,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (59,0)-(59,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (59,0)-(59,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ PinnedExpressionNode (location: (59,7)-(59,11))
-        │   │   ├── expression:
-        │   │   │   @ IntegerNode (location: (59,9)-(59,10))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── operator_loc: (59,7)-(59,8) = "^"
-        │   │   ├── lparen_loc: (59,8)-(59,9) = "("
-        │   │   └── rparen_loc: (59,10)-(59,11) = ")"
-        │   └── operator_loc: (59,4)-(59,6) = "=>"
-        ├── @ MatchRequiredNode (location: (60,0)-(60,13))
-        │   ├── value:
-        │   │   @ CallNode (location: (60,0)-(60,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (60,0)-(60,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ PinnedExpressionNode (location: (60,7)-(60,13))
-        │   │   ├── expression:
-        │   │   │   @ NilNode (location: (60,9)-(60,12))
-        │   │   ├── operator_loc: (60,7)-(60,8) = "^"
-        │   │   ├── lparen_loc: (60,8)-(60,9) = "("
-        │   │   └── rparen_loc: (60,12)-(60,13) = ")"
-        │   └── operator_loc: (60,4)-(60,6) = "=>"
-        ├── @ MatchRequiredNode (location: (61,0)-(61,23))
-        │   ├── value:
-        │   │   @ CallNode (location: (61,0)-(61,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (61,0)-(61,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ PinnedExpressionNode (location: (61,7)-(61,23))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (61,9)-(61,22))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── receiver:
-        │   │   │   │   @ StringNode (location: (61,9)-(61,14))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── opening_loc: (61,9)-(61,10) = "\""
-        │   │   │   │   ├── content_loc: (61,10)-(61,13) = "bar"
-        │   │   │   │   ├── closing_loc: (61,13)-(61,14) = "\""
-        │   │   │   │   └── unescaped: "bar"
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :+
-        │   │   │   ├── message_loc: (61,15)-(61,16) = "+"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (61,17)-(61,22))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ StringNode (location: (61,17)-(61,22))
-        │   │   │   │           ├── flags: ∅
-        │   │   │   │           ├── opening_loc: (61,17)-(61,18) = "\""
-        │   │   │   │           ├── content_loc: (61,18)-(61,21) = "baz"
-        │   │   │   │           ├── closing_loc: (61,21)-(61,22) = "\""
-        │   │   │   │           └── unescaped: "baz"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── operator_loc: (61,7)-(61,8) = "^"
-        │   │   ├── lparen_loc: (61,8)-(61,9) = "("
-        │   │   └── rparen_loc: (61,22)-(61,23) = ")"
-        │   └── operator_loc: (61,4)-(61,6) = "=>"
-        ├── @ MatchRequiredNode (location: (63,0)-(63,10))
-        │   ├── value:
-        │   │   @ CallNode (location: (63,0)-(63,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (63,0)-(63,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ConstantReadNode (location: (63,7)-(63,10))
-        │   │   └── name: :Foo
-        │   └── operator_loc: (63,4)-(63,6) = "=>"
-        ├── @ MatchRequiredNode (location: (64,0)-(64,20))
-        │   ├── value:
-        │   │   @ CallNode (location: (64,0)-(64,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (64,0)-(64,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ConstantPathNode (location: (64,7)-(64,20))
-        │   │   ├── parent:
-        │   │   │   @ ConstantPathNode (location: (64,7)-(64,15))
-        │   │   │   ├── parent:
-        │   │   │   │   @ ConstantReadNode (location: (64,7)-(64,10))
-        │   │   │   │   └── name: :Foo
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (64,12)-(64,15))
-        │   │   │   │   └── name: :Bar
-        │   │   │   └── delimiter_loc: (64,10)-(64,12) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (64,17)-(64,20))
-        │   │   │   └── name: :Baz
-        │   │   └── delimiter_loc: (64,15)-(64,17) = "::"
-        │   └── operator_loc: (64,4)-(64,6) = "=>"
-        ├── @ MatchRequiredNode (location: (65,0)-(65,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (65,0)-(65,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (65,0)-(65,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ConstantPathNode (location: (65,7)-(65,12))
-        │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (65,9)-(65,12))
-        │   │   │   └── name: :Foo
-        │   │   └── delimiter_loc: (65,7)-(65,9) = "::"
-        │   └── operator_loc: (65,4)-(65,6) = "=>"
-        ├── @ MatchRequiredNode (location: (66,0)-(66,22))
-        │   ├── value:
-        │   │   @ CallNode (location: (66,0)-(66,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (66,0)-(66,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ConstantPathNode (location: (66,7)-(66,22))
-        │   │   ├── parent:
-        │   │   │   @ ConstantPathNode (location: (66,7)-(66,17))
-        │   │   │   ├── parent:
-        │   │   │   │   @ ConstantPathNode (location: (66,7)-(66,12))
-        │   │   │   │   ├── parent: ∅
-        │   │   │   │   ├── child:
-        │   │   │   │   │   @ ConstantReadNode (location: (66,9)-(66,12))
-        │   │   │   │   │   └── name: :Foo
-        │   │   │   │   └── delimiter_loc: (66,7)-(66,9) = "::"
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (66,14)-(66,17))
-        │   │   │   │   └── name: :Bar
-        │   │   │   └── delimiter_loc: (66,12)-(66,14) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (66,19)-(66,22))
-        │   │   │   └── name: :Baz
-        │   │   └── delimiter_loc: (66,17)-(66,19) = "::"
-        │   └── operator_loc: (66,4)-(66,6) = "=>"
-        ├── @ MatchRequiredNode (location: (68,0)-(68,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (68,0)-(68,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (68,0)-(68,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (68,7)-(68,12))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (68,7)-(68,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (68,10)-(68,11) = "("
-        │   │   └── closing_loc: (68,11)-(68,12) = ")"
-        │   └── operator_loc: (68,4)-(68,6) = "=>"
-        ├── @ MatchRequiredNode (location: (69,0)-(69,13))
-        │   ├── value:
-        │   │   @ CallNode (location: (69,0)-(69,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (69,0)-(69,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (69,7)-(69,13))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (69,7)-(69,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ IntegerNode (location: (69,11)-(69,12))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (69,10)-(69,11) = "("
-        │   │   └── closing_loc: (69,12)-(69,13) = ")"
-        │   └── operator_loc: (69,4)-(69,6) = "=>"
-        ├── @ MatchRequiredNode (location: (70,0)-(70,19))
-        │   ├── value:
-        │   │   @ CallNode (location: (70,0)-(70,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (70,0)-(70,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (70,7)-(70,19))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (70,7)-(70,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 3)
-        │   │   │   ├── @ IntegerNode (location: (70,11)-(70,12))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   ├── @ IntegerNode (location: (70,14)-(70,15))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 2
-        │   │   │   └── @ IntegerNode (location: (70,17)-(70,18))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 3
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (70,10)-(70,11) = "("
-        │   │   └── closing_loc: (70,18)-(70,19) = ")"
-        │   └── operator_loc: (70,4)-(70,6) = "=>"
-        ├── @ MatchRequiredNode (location: (71,0)-(71,15))
-        │   ├── value:
-        │   │   @ CallNode (location: (71,0)-(71,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (71,0)-(71,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (71,7)-(71,15))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (71,7)-(71,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (71,11)-(71,14))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (71,10)-(71,11) = "("
-        │   │   └── closing_loc: (71,14)-(71,15) = ")"
-        │   └── operator_loc: (71,4)-(71,6) = "=>"
-        ├── @ MatchRequiredNode (location: (72,0)-(72,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (72,0)-(72,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (72,0)-(72,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (72,7)-(72,21))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (72,7)-(72,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (72,11)-(72,15))
-        │   │   │   ├── operator_loc: (72,11)-(72,12) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (72,12)-(72,15))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (72,17)-(72,20))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: (72,10)-(72,11) = "("
-        │   │   └── closing_loc: (72,20)-(72,21) = ")"
-        │   └── operator_loc: (72,4)-(72,6) = "=>"
-        ├── @ MatchRequiredNode (location: (73,0)-(73,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (73,0)-(73,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (73,0)-(73,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (73,7)-(73,21))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (73,7)-(73,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (73,11)-(73,14))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (73,16)-(73,20))
-        │   │   │   ├── operator_loc: (73,16)-(73,17) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (73,17)-(73,20))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (73,10)-(73,11) = "("
-        │   │   └── closing_loc: (73,20)-(73,21) = ")"
-        │   └── operator_loc: (73,4)-(73,6) = "=>"
-        ├── @ MatchRequiredNode (location: (74,0)-(74,27))
-        │   ├── value:
-        │   │   @ CallNode (location: (74,0)-(74,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (74,0)-(74,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ FindPatternNode (location: (74,7)-(74,27))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (74,7)-(74,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── left:
-        │   │   │   @ SplatNode (location: (74,11)-(74,15))
-        │   │   │   ├── operator_loc: (74,11)-(74,12) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (74,12)-(74,15))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (74,17)-(74,20))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── right:
-        │   │   │   @ SplatNode (location: (74,22)-(74,26))
-        │   │   │   ├── operator_loc: (74,22)-(74,23) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (74,23)-(74,26))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: (74,10)-(74,11) = "("
-        │   │   └── closing_loc: (74,26)-(74,27) = ")"
-        │   └── operator_loc: (74,4)-(74,6) = "=>"
-        ├── @ MatchRequiredNode (location: (76,0)-(76,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (76,0)-(76,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (76,0)-(76,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (76,7)-(76,12))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (76,7)-(76,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (76,10)-(76,11) = "["
-        │   │   └── closing_loc: (76,11)-(76,12) = "]"
-        │   └── operator_loc: (76,4)-(76,6) = "=>"
-        ├── @ MatchRequiredNode (location: (77,0)-(77,13))
-        │   ├── value:
-        │   │   @ CallNode (location: (77,0)-(77,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (77,0)-(77,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (77,7)-(77,13))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (77,7)-(77,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ IntegerNode (location: (77,11)-(77,12))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (77,10)-(77,11) = "["
-        │   │   └── closing_loc: (77,12)-(77,13) = "]"
-        │   └── operator_loc: (77,4)-(77,6) = "=>"
-        ├── @ MatchRequiredNode (location: (78,0)-(78,19))
-        │   ├── value:
-        │   │   @ CallNode (location: (78,0)-(78,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (78,0)-(78,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (78,7)-(78,19))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (78,7)-(78,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 3)
-        │   │   │   ├── @ IntegerNode (location: (78,11)-(78,12))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   ├── @ IntegerNode (location: (78,14)-(78,15))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 2
-        │   │   │   └── @ IntegerNode (location: (78,17)-(78,18))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 3
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (78,10)-(78,11) = "["
-        │   │   └── closing_loc: (78,18)-(78,19) = "]"
-        │   └── operator_loc: (78,4)-(78,6) = "=>"
-        ├── @ MatchRequiredNode (location: (79,0)-(79,17))
-        │   ├── value:
-        │   │   @ CallNode (location: (79,0)-(79,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (79,0)-(79,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (79,7)-(79,17))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (79,7)-(79,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ ArrayPatternNode (location: (79,11)-(79,16))
-        │   │   │       ├── constant:
-        │   │   │       │   @ ConstantReadNode (location: (79,11)-(79,14))
-        │   │   │       │   └── name: :Foo
-        │   │   │       ├── requireds: (length: 0)
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── posts: (length: 0)
-        │   │   │       ├── opening_loc: (79,14)-(79,15) = "["
-        │   │   │       └── closing_loc: (79,15)-(79,16) = "]"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (79,10)-(79,11) = "["
-        │   │   └── closing_loc: (79,16)-(79,17) = "]"
-        │   └── operator_loc: (79,4)-(79,6) = "=>"
-        ├── @ MatchRequiredNode (location: (80,0)-(80,15))
-        │   ├── value:
-        │   │   @ CallNode (location: (80,0)-(80,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (80,0)-(80,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (80,7)-(80,15))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (80,7)-(80,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (80,11)-(80,14))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (80,10)-(80,11) = "["
-        │   │   └── closing_loc: (80,14)-(80,15) = "]"
-        │   └── operator_loc: (80,4)-(80,6) = "=>"
-        ├── @ MatchRequiredNode (location: (81,0)-(81,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (81,0)-(81,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (81,0)-(81,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (81,7)-(81,21))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (81,7)-(81,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (81,11)-(81,15))
-        │   │   │   ├── operator_loc: (81,11)-(81,12) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (81,12)-(81,15))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (81,17)-(81,20))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: (81,10)-(81,11) = "["
-        │   │   └── closing_loc: (81,20)-(81,21) = "]"
-        │   └── operator_loc: (81,4)-(81,6) = "=>"
-        ├── @ MatchRequiredNode (location: (82,0)-(82,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (82,0)-(82,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (82,0)-(82,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (82,7)-(82,21))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (82,7)-(82,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (82,11)-(82,14))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (82,16)-(82,20))
-        │   │   │   ├── operator_loc: (82,16)-(82,17) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (82,17)-(82,20))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (82,10)-(82,11) = "["
-        │   │   └── closing_loc: (82,20)-(82,21) = "]"
-        │   └── operator_loc: (82,4)-(82,6) = "=>"
-        ├── @ MatchRequiredNode (location: (83,0)-(83,27))
-        │   ├── value:
-        │   │   @ CallNode (location: (83,0)-(83,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (83,0)-(83,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ FindPatternNode (location: (83,7)-(83,27))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (83,7)-(83,10))
-        │   │   │   └── name: :Foo
-        │   │   ├── left:
-        │   │   │   @ SplatNode (location: (83,11)-(83,15))
-        │   │   │   ├── operator_loc: (83,11)-(83,12) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (83,12)-(83,15))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (83,17)-(83,20))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── right:
-        │   │   │   @ SplatNode (location: (83,22)-(83,26))
-        │   │   │   ├── operator_loc: (83,22)-(83,23) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (83,23)-(83,26))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: (83,10)-(83,11) = "["
-        │   │   └── closing_loc: (83,26)-(83,27) = "]"
-        │   └── operator_loc: (83,4)-(83,6) = "=>"
-        ├── @ MatchRequiredNode (location: (85,0)-(85,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (85,0)-(85,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (85,0)-(85,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (85,7)-(85,11))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (85,7)-(85,11))
-        │   │   │   ├── operator_loc: (85,7)-(85,8) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (85,8)-(85,11))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (85,4)-(85,6) = "=>"
-        ├── @ MatchRequiredNode (location: (86,0)-(86,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (86,0)-(86,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (86,0)-(86,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (86,7)-(86,21))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (86,7)-(86,11))
-        │   │   │   ├── operator_loc: (86,7)-(86,8) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (86,8)-(86,11))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 2)
-        │   │   │   ├── @ LocalVariableTargetNode (location: (86,13)-(86,16))
-        │   │   │   │   ├── name: :baz
-        │   │   │   │   └── depth: 0
-        │   │   │   └── @ LocalVariableTargetNode (location: (86,18)-(86,21))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (86,4)-(86,6) = "=>"
-        ├── @ MatchRequiredNode (location: (87,0)-(87,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (87,0)-(87,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (87,0)-(87,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (87,7)-(87,21))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (87,7)-(87,10))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (87,12)-(87,16))
-        │   │   │   ├── operator_loc: (87,12)-(87,13) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (87,13)-(87,16))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (87,18)-(87,21))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (87,4)-(87,6) = "=>"
-        ├── @ MatchRequiredNode (location: (88,0)-(88,21))
-        │   ├── value:
-        │   │   @ CallNode (location: (88,0)-(88,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (88,0)-(88,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (88,7)-(88,21))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 2)
-        │   │   │   ├── @ LocalVariableTargetNode (location: (88,7)-(88,10))
-        │   │   │   │   ├── name: :bar
-        │   │   │   │   └── depth: 0
-        │   │   │   └── @ LocalVariableTargetNode (location: (88,12)-(88,15))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (88,17)-(88,21))
-        │   │   │   ├── operator_loc: (88,17)-(88,18) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (88,18)-(88,21))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (88,4)-(88,6) = "=>"
-        ├── @ MatchRequiredNode (location: (89,0)-(89,22))
-        │   ├── value:
-        │   │   @ CallNode (location: (89,0)-(89,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (89,0)-(89,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ FindPatternNode (location: (89,7)-(89,22))
-        │   │   ├── constant: ∅
-        │   │   ├── left:
-        │   │   │   @ SplatNode (location: (89,7)-(89,11))
-        │   │   │   ├── operator_loc: (89,7)-(89,8) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (89,8)-(89,11))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (89,13)-(89,16))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── right:
-        │   │   │   @ SplatNode (location: (89,18)-(89,22))
-        │   │   │   ├── operator_loc: (89,18)-(89,19) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (89,19)-(89,22))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (89,4)-(89,6) = "=>"
-        ├── @ MatchRequiredNode (location: (91,0)-(91,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (91,0)-(91,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (91,0)-(91,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (91,7)-(91,11))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (91,7)-(91,10))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ ImplicitRestNode (location: (91,10)-(91,11))
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (91,4)-(91,6) = "=>"
-        ├── @ MatchRequiredNode (location: (95,0)-(95,9))
-        │   ├── value:
-        │   │   @ CallNode (location: (95,0)-(95,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (95,0)-(95,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (95,7)-(95,9))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (95,7)-(95,8) = "["
-        │   │   └── closing_loc: (95,8)-(95,9) = "]"
-        │   └── operator_loc: (95,4)-(95,6) = "=>"
-        ├── @ MatchRequiredNode (location: (96,0)-(96,17))
-        │   ├── value:
-        │   │   @ CallNode (location: (96,0)-(96,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (96,0)-(96,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (96,7)-(96,17))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ ArrayPatternNode (location: (96,8)-(96,16))
-        │   │   │       ├── constant: ∅
-        │   │   │       ├── requireds: (length: 1)
-        │   │   │       │   └── @ ArrayPatternNode (location: (96,9)-(96,15))
-        │   │   │       │       ├── constant: ∅
-        │   │   │       │       ├── requireds: (length: 1)
-        │   │   │       │       │   └── @ ArrayPatternNode (location: (96,10)-(96,14))
-        │   │   │       │       │       ├── constant: ∅
-        │   │   │       │       │       ├── requireds: (length: 1)
-        │   │   │       │       │       │   └── @ ArrayPatternNode (location: (96,11)-(96,13))
-        │   │   │       │       │       │       ├── constant: ∅
-        │   │   │       │       │       │       ├── requireds: (length: 0)
-        │   │   │       │       │       │       ├── rest: ∅
-        │   │   │       │       │       │       ├── posts: (length: 0)
-        │   │   │       │       │       │       ├── opening_loc: (96,11)-(96,12) = "["
-        │   │   │       │       │       │       └── closing_loc: (96,12)-(96,13) = "]"
-        │   │   │       │       │       ├── rest: ∅
-        │   │   │       │       │       ├── posts: (length: 0)
-        │   │   │       │       │       ├── opening_loc: (96,10)-(96,11) = "["
-        │   │   │       │       │       └── closing_loc: (96,13)-(96,14) = "]"
-        │   │   │       │       ├── rest: ∅
-        │   │   │       │       ├── posts: (length: 0)
-        │   │   │       │       ├── opening_loc: (96,9)-(96,10) = "["
-        │   │   │       │       └── closing_loc: (96,14)-(96,15) = "]"
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── posts: (length: 0)
-        │   │   │       ├── opening_loc: (96,8)-(96,9) = "["
-        │   │   │       └── closing_loc: (96,15)-(96,16) = "]"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (96,7)-(96,8) = "["
-        │   │   └── closing_loc: (96,16)-(96,17) = "]"
-        │   └── operator_loc: (96,4)-(96,6) = "=>"
-        ├── @ MatchRequiredNode (location: (98,0)-(98,13))
-        │   ├── value:
-        │   │   @ CallNode (location: (98,0)-(98,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (98,0)-(98,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (98,7)-(98,13))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (98,8)-(98,12))
-        │   │   │   ├── operator_loc: (98,8)-(98,9) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (98,9)-(98,12))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (98,7)-(98,8) = "["
-        │   │   └── closing_loc: (98,12)-(98,13) = "]"
-        │   └── operator_loc: (98,4)-(98,6) = "=>"
-        ├── @ MatchRequiredNode (location: (99,0)-(99,23))
-        │   ├── value:
-        │   │   @ CallNode (location: (99,0)-(99,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (99,0)-(99,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (99,7)-(99,23))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (99,8)-(99,12))
-        │   │   │   ├── operator_loc: (99,8)-(99,9) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (99,9)-(99,12))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 2)
-        │   │   │   ├── @ LocalVariableTargetNode (location: (99,14)-(99,17))
-        │   │   │   │   ├── name: :baz
-        │   │   │   │   └── depth: 0
-        │   │   │   └── @ LocalVariableTargetNode (location: (99,19)-(99,22))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: (99,7)-(99,8) = "["
-        │   │   └── closing_loc: (99,22)-(99,23) = "]"
-        │   └── operator_loc: (99,4)-(99,6) = "=>"
-        ├── @ MatchRequiredNode (location: (100,0)-(100,23))
-        │   ├── value:
-        │   │   @ CallNode (location: (100,0)-(100,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (100,0)-(100,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (100,7)-(100,23))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (100,8)-(100,11))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (100,13)-(100,17))
-        │   │   │   ├── operator_loc: (100,13)-(100,14) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (100,14)-(100,17))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (100,19)-(100,22))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: (100,7)-(100,8) = "["
-        │   │   └── closing_loc: (100,22)-(100,23) = "]"
-        │   └── operator_loc: (100,4)-(100,6) = "=>"
-        ├── @ MatchRequiredNode (location: (101,0)-(101,23))
-        │   ├── value:
-        │   │   @ CallNode (location: (101,0)-(101,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (101,0)-(101,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (101,7)-(101,23))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 2)
-        │   │   │   ├── @ LocalVariableTargetNode (location: (101,8)-(101,11))
-        │   │   │   │   ├── name: :bar
-        │   │   │   │   └── depth: 0
-        │   │   │   └── @ LocalVariableTargetNode (location: (101,13)-(101,16))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (101,18)-(101,22))
-        │   │   │   ├── operator_loc: (101,18)-(101,19) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (101,19)-(101,22))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (101,7)-(101,8) = "["
-        │   │   └── closing_loc: (101,22)-(101,23) = "]"
-        │   └── operator_loc: (101,4)-(101,6) = "=>"
-        ├── @ MatchRequiredNode (location: (102,0)-(102,24))
-        │   ├── value:
-        │   │   @ CallNode (location: (102,0)-(102,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (102,0)-(102,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ FindPatternNode (location: (102,7)-(102,24))
-        │   │   ├── constant: ∅
-        │   │   ├── left:
-        │   │   │   @ SplatNode (location: (102,8)-(102,12))
-        │   │   │   ├── operator_loc: (102,8)-(102,9) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (102,9)-(102,12))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (102,14)-(102,17))
-        │   │   │       ├── name: :baz
-        │   │   │       └── depth: 0
-        │   │   ├── right:
-        │   │   │   @ SplatNode (location: (102,19)-(102,23))
-        │   │   │   ├── operator_loc: (102,19)-(102,20) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (102,20)-(102,23))
-        │   │   │       ├── name: :qux
-        │   │   │       └── depth: 0
-        │   │   ├── opening_loc: (102,7)-(102,8) = "["
-        │   │   └── closing_loc: (102,23)-(102,24) = "]"
-        │   └── operator_loc: (102,4)-(102,6) = "=>"
-        ├── @ MatchPredicateNode (location: (104,0)-(104,10))
-        │   ├── value:
-        │   │   @ CallNode (location: (104,0)-(104,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (104,0)-(104,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ LocalVariableTargetNode (location: (104,7)-(104,10))
-        │   │   ├── name: :bar
-        │   │   └── depth: 0
-        │   └── operator_loc: (104,4)-(104,6) = "in"
-        ├── @ MatchPredicateNode (location: (105,0)-(105,8))
-        │   ├── value:
-        │   │   @ CallNode (location: (105,0)-(105,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (105,0)-(105,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ IntegerNode (location: (105,7)-(105,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (105,4)-(105,6) = "in"
-        ├── @ MatchPredicateNode (location: (106,0)-(106,10))
-        │   ├── value:
-        │   │   @ CallNode (location: (106,0)-(106,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (106,0)-(106,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ FloatNode (location: (106,7)-(106,10))
-        │   │   └── value: 1.0
-        │   └── operator_loc: (106,4)-(106,6) = "in"
-        ├── @ MatchPredicateNode (location: (107,0)-(107,9))
-        │   ├── value:
-        │   │   @ CallNode (location: (107,0)-(107,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (107,0)-(107,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ImaginaryNode (location: (107,7)-(107,9))
-        │   │   └── numeric:
-        │   │       @ IntegerNode (location: (107,7)-(107,8))
-        │   │       ├── flags: decimal
-        │   │       └── value: 1
-        │   └── operator_loc: (107,4)-(107,6) = "in"
-        ├── @ MatchPredicateNode (location: (108,0)-(108,9))
-        │   ├── value:
-        │   │   @ CallNode (location: (108,0)-(108,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (108,0)-(108,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RationalNode (location: (108,7)-(108,9))
-        │   │   └── numeric:
-        │   │       @ IntegerNode (location: (108,7)-(108,8))
-        │   │       ├── flags: decimal
-        │   │       └── value: 1
-        │   └── operator_loc: (108,4)-(108,6) = "in"
-        ├── @ MatchPredicateNode (location: (109,0)-(109,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (109,0)-(109,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (109,0)-(109,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SymbolNode (location: (109,7)-(109,11))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (109,7)-(109,8) = ":"
-        │   │   ├── value_loc: (109,8)-(109,11) = "foo"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (109,4)-(109,6) = "in"
-        ├── @ MatchPredicateNode (location: (110,0)-(110,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (110,0)-(110,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (110,0)-(110,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SymbolNode (location: (110,7)-(110,14))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (110,7)-(110,10) = "%s["
-        │   │   ├── value_loc: (110,10)-(110,13) = "foo"
-        │   │   ├── closing_loc: (110,13)-(110,14) = "]"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (110,4)-(110,6) = "in"
-        ├── @ MatchPredicateNode (location: (111,0)-(111,13))
-        │   ├── value:
-        │   │   @ CallNode (location: (111,0)-(111,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (111,0)-(111,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SymbolNode (location: (111,7)-(111,13))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (111,7)-(111,9) = ":\""
-        │   │   ├── value_loc: (111,9)-(111,12) = "foo"
-        │   │   ├── closing_loc: (111,12)-(111,13) = "\""
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (111,4)-(111,6) = "in"
-        ├── @ MatchPredicateNode (location: (112,0)-(112,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (112,0)-(112,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (112,0)-(112,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ RegularExpressionNode (location: (112,7)-(112,12))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (112,7)-(112,8) = "/"
-        │   │   ├── content_loc: (112,8)-(112,11) = "foo"
-        │   │   ├── closing_loc: (112,11)-(112,12) = "/"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (112,4)-(112,6) = "in"
-        ├── @ MatchPredicateNode (location: (113,0)-(113,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (113,0)-(113,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (113,0)-(113,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ XStringNode (location: (113,7)-(113,12))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (113,7)-(113,8) = "`"
-        │   │   ├── content_loc: (113,8)-(113,11) = "foo"
-        │   │   ├── closing_loc: (113,11)-(113,12) = "`"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (113,4)-(113,6) = "in"
-        ├── @ MatchPredicateNode (location: (114,0)-(114,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (114,0)-(114,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (114,0)-(114,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ XStringNode (location: (114,7)-(114,14))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (114,7)-(114,10) = "%x["
-        │   │   ├── content_loc: (114,10)-(114,13) = "foo"
-        │   │   ├── closing_loc: (114,13)-(114,14) = "]"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (114,4)-(114,6) = "in"
-        ├── @ MatchPredicateNode (location: (115,0)-(115,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (115,0)-(115,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (115,0)-(115,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayNode (location: (115,7)-(115,14))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ SymbolNode (location: (115,10)-(115,13))
-        │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── value_loc: (115,10)-(115,13) = "foo"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "foo"
-        │   │   ├── opening_loc: (115,7)-(115,10) = "%i["
-        │   │   └── closing_loc: (115,13)-(115,14) = "]"
-        │   └── operator_loc: (115,4)-(115,6) = "in"
-        ├── @ MatchPredicateNode (location: (116,0)-(116,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (116,0)-(116,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (116,0)-(116,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayNode (location: (116,7)-(116,14))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ SymbolNode (location: (116,10)-(116,13))
-        │   │   │       ├── flags: forced_us_ascii_encoding
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── value_loc: (116,10)-(116,13) = "foo"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "foo"
-        │   │   ├── opening_loc: (116,7)-(116,10) = "%I["
-        │   │   └── closing_loc: (116,13)-(116,14) = "]"
-        │   └── operator_loc: (116,4)-(116,6) = "in"
-        ├── @ MatchPredicateNode (location: (117,0)-(117,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (117,0)-(117,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (117,0)-(117,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayNode (location: (117,7)-(117,14))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ StringNode (location: (117,10)-(117,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── content_loc: (117,10)-(117,13) = "foo"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "foo"
-        │   │   ├── opening_loc: (117,7)-(117,10) = "%w["
-        │   │   └── closing_loc: (117,13)-(117,14) = "]"
-        │   └── operator_loc: (117,4)-(117,6) = "in"
-        ├── @ MatchPredicateNode (location: (118,0)-(118,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (118,0)-(118,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (118,0)-(118,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayNode (location: (118,7)-(118,14))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ StringNode (location: (118,10)-(118,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── content_loc: (118,10)-(118,13) = "foo"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "foo"
-        │   │   ├── opening_loc: (118,7)-(118,10) = "%W["
-        │   │   └── closing_loc: (118,13)-(118,14) = "]"
-        │   └── operator_loc: (118,4)-(118,6) = "in"
-        ├── @ MatchPredicateNode (location: (119,0)-(119,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (119,0)-(119,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (119,0)-(119,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ StringNode (location: (119,7)-(119,14))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (119,7)-(119,10) = "%q["
-        │   │   ├── content_loc: (119,10)-(119,13) = "foo"
-        │   │   ├── closing_loc: (119,13)-(119,14) = "]"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (119,4)-(119,6) = "in"
-        ├── @ MatchPredicateNode (location: (120,0)-(120,14))
-        │   ├── value:
-        │   │   @ CallNode (location: (120,0)-(120,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (120,0)-(120,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ StringNode (location: (120,7)-(120,14))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (120,7)-(120,10) = "%Q["
-        │   │   ├── content_loc: (120,10)-(120,13) = "foo"
-        │   │   ├── closing_loc: (120,13)-(120,14) = "]"
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (120,4)-(120,6) = "in"
-        ├── @ MatchPredicateNode (location: (121,0)-(121,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (121,0)-(121,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (121,0)-(121,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ StringNode (location: (121,7)-(121,12))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (121,7)-(121,8) = "\""
-        │   │   ├── content_loc: (121,8)-(121,11) = "foo"
-        │   │   ├── closing_loc: (121,11)-(121,12) = "\""
-        │   │   └── unescaped: "foo"
-        │   └── operator_loc: (121,4)-(121,6) = "in"
-        ├── @ MatchPredicateNode (location: (122,0)-(122,10))
-        │   ├── value:
-        │   │   @ CallNode (location: (122,0)-(122,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (122,0)-(122,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ NilNode (location: (122,7)-(122,10))
-        │   └── operator_loc: (122,4)-(122,6) = "in"
-        ├── @ MatchPredicateNode (location: (123,0)-(123,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (123,0)-(123,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (123,0)-(123,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SelfNode (location: (123,7)-(123,11))
-        │   └── operator_loc: (123,4)-(123,6) = "in"
-        ├── @ MatchPredicateNode (location: (124,0)-(124,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (124,0)-(124,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (124,0)-(124,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ TrueNode (location: (124,7)-(124,11))
-        │   └── operator_loc: (124,4)-(124,6) = "in"
-        ├── @ MatchPredicateNode (location: (125,0)-(125,12))
-        │   ├── value:
-        │   │   @ CallNode (location: (125,0)-(125,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (125,0)-(125,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ FalseNode (location: (125,7)-(125,12))
-        │   └── operator_loc: (125,4)-(125,6) = "in"
-        ├── @ MatchPredicateNode (location: (126,0)-(126,15))
-        │   ├── value:
-        │   │   @ CallNode (location: (126,0)-(126,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (126,0)-(126,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SourceFileNode (location: (126,7)-(126,15))
-        │   │   ├── flags: ∅
-        │   │   └── filepath: "patterns.txt"
-        │   └── operator_loc: (126,4)-(126,6) = "in"
-        ├── @ MatchPredicateNode (location: (127,0)-(127,15))
-        │   ├── value:
-        │   │   @ CallNode (location: (127,0)-(127,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (127,0)-(127,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SourceLineNode (location: (127,7)-(127,15))
-        │   └── operator_loc: (127,4)-(127,6) = "in"
-        ├── @ MatchPredicateNode (location: (128,0)-(128,19))
-        │   ├── value:
-        │   │   @ CallNode (location: (128,0)-(128,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (128,0)-(128,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ SourceEncodingNode (location: (128,7)-(128,19))
-        │   └── operator_loc: (128,4)-(128,6) = "in"
-        ├── @ MatchPredicateNode (location: (129,0)-(129,17))
-        │   ├── value:
-        │   │   @ CallNode (location: (129,0)-(129,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (129,0)-(129,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ LambdaNode (location: (129,7)-(129,17))
-        │   │   ├── locals: []
-        │   │   ├── operator_loc: (129,7)-(129,9) = "->"
-        │   │   ├── opening_loc: (129,10)-(129,11) = "{"
-        │   │   ├── closing_loc: (129,16)-(129,17) = "}"
-        │   │   ├── parameters: ∅
-        │   │   └── body:
-        │   │       @ StatementsNode (location: (129,12)-(129,15))
-        │   │       └── body: (length: 1)
-        │   │           └── @ LocalVariableReadNode (location: (129,12)-(129,15))
-        │   │               ├── name: :bar
-        │   │               └── depth: 1
-        │   └── operator_loc: (129,4)-(129,6) = "in"
-        ├── @ MatchPredicateNode (location: (131,0)-(131,11))
-        │   ├── value:
-        │   │   @ CallNode (location: (131,0)-(131,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (131,0)-(131,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (131,7)-(131,11))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (131,7)-(131,10))
-        │   │   │       ├── name: :bar
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ ImplicitRestNode (location: (131,10)-(131,11))
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (131,4)-(131,6) = "in"
-        ├── @ CaseMatchNode (location: (135,0)-(135,25))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (135,5)-(135,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (135,5)-(135,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (135,10)-(135,21))
-        │   │       ├── pattern:
-        │   │       │   @ LocalVariableTargetNode (location: (135,13)-(135,16))
-        │   │       │   ├── name: :bar
-        │   │       │   └── depth: 0
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (135,10)-(135,12) = "in"
-        │   │       └── then_loc: (135,17)-(135,21) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (135,0)-(135,4) = "case"
-        │   └── end_keyword_loc: (135,22)-(135,25) = "end"
-        ├── @ CaseMatchNode (location: (136,0)-(136,23))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (136,5)-(136,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (136,5)-(136,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (136,10)-(136,19))
-        │   │       ├── pattern:
-        │   │       │   @ IntegerNode (location: (136,13)-(136,14))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (136,10)-(136,12) = "in"
-        │   │       └── then_loc: (136,15)-(136,19) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (136,0)-(136,4) = "case"
-        │   └── end_keyword_loc: (136,20)-(136,23) = "end"
-        ├── @ CaseMatchNode (location: (137,0)-(137,25))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (137,5)-(137,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (137,5)-(137,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (137,10)-(137,21))
-        │   │       ├── pattern:
-        │   │       │   @ FloatNode (location: (137,13)-(137,16))
-        │   │       │   └── value: 1.0
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (137,10)-(137,12) = "in"
-        │   │       └── then_loc: (137,17)-(137,21) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (137,0)-(137,4) = "case"
-        │   └── end_keyword_loc: (137,22)-(137,25) = "end"
-        ├── @ CaseMatchNode (location: (138,0)-(138,24))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (138,5)-(138,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (138,5)-(138,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (138,10)-(138,20))
-        │   │       ├── pattern:
-        │   │       │   @ ImaginaryNode (location: (138,13)-(138,15))
-        │   │       │   └── numeric:
-        │   │       │       @ IntegerNode (location: (138,13)-(138,14))
-        │   │       │       ├── flags: decimal
-        │   │       │       └── value: 1
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (138,10)-(138,12) = "in"
-        │   │       └── then_loc: (138,16)-(138,20) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (138,0)-(138,4) = "case"
-        │   └── end_keyword_loc: (138,21)-(138,24) = "end"
-        ├── @ CaseMatchNode (location: (139,0)-(139,24))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (139,5)-(139,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (139,5)-(139,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (139,10)-(139,20))
-        │   │       ├── pattern:
-        │   │       │   @ RationalNode (location: (139,13)-(139,15))
-        │   │       │   └── numeric:
-        │   │       │       @ IntegerNode (location: (139,13)-(139,14))
-        │   │       │       ├── flags: decimal
-        │   │       │       └── value: 1
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (139,10)-(139,12) = "in"
-        │   │       └── then_loc: (139,16)-(139,20) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (139,0)-(139,4) = "case"
-        │   └── end_keyword_loc: (139,21)-(139,24) = "end"
-        ├── @ CaseMatchNode (location: (140,0)-(140,26))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (140,5)-(140,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (140,5)-(140,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (140,10)-(140,22))
-        │   │       ├── pattern:
-        │   │       │   @ SymbolNode (location: (140,13)-(140,17))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (140,13)-(140,14) = ":"
-        │   │       │   ├── value_loc: (140,14)-(140,17) = "foo"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (140,10)-(140,12) = "in"
-        │   │       └── then_loc: (140,18)-(140,22) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (140,0)-(140,4) = "case"
-        │   └── end_keyword_loc: (140,23)-(140,26) = "end"
-        ├── @ CaseMatchNode (location: (141,0)-(141,29))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (141,5)-(141,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (141,5)-(141,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (141,10)-(141,25))
-        │   │       ├── pattern:
-        │   │       │   @ SymbolNode (location: (141,13)-(141,20))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (141,13)-(141,16) = "%s["
-        │   │       │   ├── value_loc: (141,16)-(141,19) = "foo"
-        │   │       │   ├── closing_loc: (141,19)-(141,20) = "]"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (141,10)-(141,12) = "in"
-        │   │       └── then_loc: (141,21)-(141,25) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (141,0)-(141,4) = "case"
-        │   └── end_keyword_loc: (141,26)-(141,29) = "end"
-        ├── @ CaseMatchNode (location: (142,0)-(142,28))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (142,5)-(142,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (142,5)-(142,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (142,10)-(142,24))
-        │   │       ├── pattern:
-        │   │       │   @ SymbolNode (location: (142,13)-(142,19))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (142,13)-(142,15) = ":\""
-        │   │       │   ├── value_loc: (142,15)-(142,18) = "foo"
-        │   │       │   ├── closing_loc: (142,18)-(142,19) = "\""
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (142,10)-(142,12) = "in"
-        │   │       └── then_loc: (142,20)-(142,24) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (142,0)-(142,4) = "case"
-        │   └── end_keyword_loc: (142,25)-(142,28) = "end"
-        ├── @ CaseMatchNode (location: (143,0)-(143,27))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (143,5)-(143,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (143,5)-(143,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (143,10)-(143,23))
-        │   │       ├── pattern:
-        │   │       │   @ RegularExpressionNode (location: (143,13)-(143,18))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (143,13)-(143,14) = "/"
-        │   │       │   ├── content_loc: (143,14)-(143,17) = "foo"
-        │   │       │   ├── closing_loc: (143,17)-(143,18) = "/"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (143,10)-(143,12) = "in"
-        │   │       └── then_loc: (143,19)-(143,23) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (143,0)-(143,4) = "case"
-        │   └── end_keyword_loc: (143,24)-(143,27) = "end"
-        ├── @ CaseMatchNode (location: (144,0)-(144,27))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (144,5)-(144,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (144,5)-(144,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (144,10)-(144,23))
-        │   │       ├── pattern:
-        │   │       │   @ XStringNode (location: (144,13)-(144,18))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (144,13)-(144,14) = "`"
-        │   │       │   ├── content_loc: (144,14)-(144,17) = "foo"
-        │   │       │   ├── closing_loc: (144,17)-(144,18) = "`"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (144,10)-(144,12) = "in"
-        │   │       └── then_loc: (144,19)-(144,23) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (144,0)-(144,4) = "case"
-        │   └── end_keyword_loc: (144,24)-(144,27) = "end"
-        ├── @ CaseMatchNode (location: (145,0)-(145,29))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (145,5)-(145,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (145,5)-(145,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (145,10)-(145,25))
-        │   │       ├── pattern:
-        │   │       │   @ XStringNode (location: (145,13)-(145,20))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (145,13)-(145,16) = "%x["
-        │   │       │   ├── content_loc: (145,16)-(145,19) = "foo"
-        │   │       │   ├── closing_loc: (145,19)-(145,20) = "]"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (145,10)-(145,12) = "in"
-        │   │       └── then_loc: (145,21)-(145,25) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (145,0)-(145,4) = "case"
-        │   └── end_keyword_loc: (145,26)-(145,29) = "end"
-        ├── @ CaseMatchNode (location: (146,0)-(146,29))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (146,5)-(146,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (146,5)-(146,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (146,10)-(146,25))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayNode (location: (146,13)-(146,20))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── elements: (length: 1)
-        │   │       │   │   └── @ SymbolNode (location: (146,16)-(146,19))
-        │   │       │   │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── value_loc: (146,16)-(146,19) = "foo"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "foo"
-        │   │       │   ├── opening_loc: (146,13)-(146,16) = "%i["
-        │   │       │   └── closing_loc: (146,19)-(146,20) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (146,10)-(146,12) = "in"
-        │   │       └── then_loc: (146,21)-(146,25) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (146,0)-(146,4) = "case"
-        │   └── end_keyword_loc: (146,26)-(146,29) = "end"
-        ├── @ CaseMatchNode (location: (147,0)-(147,29))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (147,5)-(147,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (147,5)-(147,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (147,10)-(147,25))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayNode (location: (147,13)-(147,20))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── elements: (length: 1)
-        │   │       │   │   └── @ SymbolNode (location: (147,16)-(147,19))
-        │   │       │   │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── value_loc: (147,16)-(147,19) = "foo"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "foo"
-        │   │       │   ├── opening_loc: (147,13)-(147,16) = "%I["
-        │   │       │   └── closing_loc: (147,19)-(147,20) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (147,10)-(147,12) = "in"
-        │   │       └── then_loc: (147,21)-(147,25) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (147,0)-(147,4) = "case"
-        │   └── end_keyword_loc: (147,26)-(147,29) = "end"
-        ├── @ CaseMatchNode (location: (148,0)-(148,29))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (148,5)-(148,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (148,5)-(148,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (148,10)-(148,25))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayNode (location: (148,13)-(148,20))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── elements: (length: 1)
-        │   │       │   │   └── @ StringNode (location: (148,16)-(148,19))
-        │   │       │   │       ├── flags: ∅
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── content_loc: (148,16)-(148,19) = "foo"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "foo"
-        │   │       │   ├── opening_loc: (148,13)-(148,16) = "%w["
-        │   │       │   └── closing_loc: (148,19)-(148,20) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (148,10)-(148,12) = "in"
-        │   │       └── then_loc: (148,21)-(148,25) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (148,0)-(148,4) = "case"
-        │   └── end_keyword_loc: (148,26)-(148,29) = "end"
-        ├── @ CaseMatchNode (location: (149,0)-(149,29))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (149,5)-(149,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (149,5)-(149,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (149,10)-(149,25))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayNode (location: (149,13)-(149,20))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── elements: (length: 1)
-        │   │       │   │   └── @ StringNode (location: (149,16)-(149,19))
-        │   │       │   │       ├── flags: ∅
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── content_loc: (149,16)-(149,19) = "foo"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "foo"
-        │   │       │   ├── opening_loc: (149,13)-(149,16) = "%W["
-        │   │       │   └── closing_loc: (149,19)-(149,20) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (149,10)-(149,12) = "in"
-        │   │       └── then_loc: (149,21)-(149,25) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (149,0)-(149,4) = "case"
-        │   └── end_keyword_loc: (149,26)-(149,29) = "end"
-        ├── @ CaseMatchNode (location: (150,0)-(150,29))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (150,5)-(150,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (150,5)-(150,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (150,10)-(150,25))
-        │   │       ├── pattern:
-        │   │       │   @ StringNode (location: (150,13)-(150,20))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (150,13)-(150,16) = "%q["
-        │   │       │   ├── content_loc: (150,16)-(150,19) = "foo"
-        │   │       │   ├── closing_loc: (150,19)-(150,20) = "]"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (150,10)-(150,12) = "in"
-        │   │       └── then_loc: (150,21)-(150,25) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (150,0)-(150,4) = "case"
-        │   └── end_keyword_loc: (150,26)-(150,29) = "end"
-        ├── @ CaseMatchNode (location: (151,0)-(151,29))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (151,5)-(151,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (151,5)-(151,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (151,10)-(151,25))
-        │   │       ├── pattern:
-        │   │       │   @ StringNode (location: (151,13)-(151,20))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (151,13)-(151,16) = "%Q["
-        │   │       │   ├── content_loc: (151,16)-(151,19) = "foo"
-        │   │       │   ├── closing_loc: (151,19)-(151,20) = "]"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (151,10)-(151,12) = "in"
-        │   │       └── then_loc: (151,21)-(151,25) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (151,0)-(151,4) = "case"
-        │   └── end_keyword_loc: (151,26)-(151,29) = "end"
-        ├── @ CaseMatchNode (location: (152,0)-(152,27))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (152,5)-(152,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (152,5)-(152,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (152,10)-(152,23))
-        │   │       ├── pattern:
-        │   │       │   @ StringNode (location: (152,13)-(152,18))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (152,13)-(152,14) = "\""
-        │   │       │   ├── content_loc: (152,14)-(152,17) = "foo"
-        │   │       │   ├── closing_loc: (152,17)-(152,18) = "\""
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (152,10)-(152,12) = "in"
-        │   │       └── then_loc: (152,19)-(152,23) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (152,0)-(152,4) = "case"
-        │   └── end_keyword_loc: (152,24)-(152,27) = "end"
-        ├── @ CaseMatchNode (location: (153,0)-(153,25))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (153,5)-(153,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (153,5)-(153,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (153,10)-(153,21))
-        │   │       ├── pattern:
-        │   │       │   @ NilNode (location: (153,13)-(153,16))
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (153,10)-(153,12) = "in"
-        │   │       └── then_loc: (153,17)-(153,21) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (153,0)-(153,4) = "case"
-        │   └── end_keyword_loc: (153,22)-(153,25) = "end"
-        ├── @ CaseMatchNode (location: (154,0)-(154,26))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (154,5)-(154,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (154,5)-(154,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (154,10)-(154,22))
-        │   │       ├── pattern:
-        │   │       │   @ SelfNode (location: (154,13)-(154,17))
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (154,10)-(154,12) = "in"
-        │   │       └── then_loc: (154,18)-(154,22) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (154,0)-(154,4) = "case"
-        │   └── end_keyword_loc: (154,23)-(154,26) = "end"
-        ├── @ CaseMatchNode (location: (155,0)-(155,26))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (155,5)-(155,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (155,5)-(155,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (155,10)-(155,22))
-        │   │       ├── pattern:
-        │   │       │   @ TrueNode (location: (155,13)-(155,17))
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (155,10)-(155,12) = "in"
-        │   │       └── then_loc: (155,18)-(155,22) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (155,0)-(155,4) = "case"
-        │   └── end_keyword_loc: (155,23)-(155,26) = "end"
-        ├── @ CaseMatchNode (location: (156,0)-(156,27))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (156,5)-(156,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (156,5)-(156,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (156,10)-(156,23))
-        │   │       ├── pattern:
-        │   │       │   @ FalseNode (location: (156,13)-(156,18))
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (156,10)-(156,12) = "in"
-        │   │       └── then_loc: (156,19)-(156,23) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (156,0)-(156,4) = "case"
-        │   └── end_keyword_loc: (156,24)-(156,27) = "end"
-        ├── @ CaseMatchNode (location: (157,0)-(157,30))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (157,5)-(157,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (157,5)-(157,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (157,10)-(157,26))
-        │   │       ├── pattern:
-        │   │       │   @ SourceFileNode (location: (157,13)-(157,21))
-        │   │       │   ├── flags: ∅
-        │   │       │   └── filepath: "patterns.txt"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (157,10)-(157,12) = "in"
-        │   │       └── then_loc: (157,22)-(157,26) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (157,0)-(157,4) = "case"
-        │   └── end_keyword_loc: (157,27)-(157,30) = "end"
-        ├── @ CaseMatchNode (location: (158,0)-(158,30))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (158,5)-(158,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (158,5)-(158,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (158,10)-(158,26))
-        │   │       ├── pattern:
-        │   │       │   @ SourceLineNode (location: (158,13)-(158,21))
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (158,10)-(158,12) = "in"
-        │   │       └── then_loc: (158,22)-(158,26) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (158,0)-(158,4) = "case"
-        │   └── end_keyword_loc: (158,27)-(158,30) = "end"
-        ├── @ CaseMatchNode (location: (159,0)-(159,34))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (159,5)-(159,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (159,5)-(159,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (159,10)-(159,30))
-        │   │       ├── pattern:
-        │   │       │   @ SourceEncodingNode (location: (159,13)-(159,25))
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (159,10)-(159,12) = "in"
-        │   │       └── then_loc: (159,26)-(159,30) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (159,0)-(159,4) = "case"
-        │   └── end_keyword_loc: (159,31)-(159,34) = "end"
-        ├── @ CaseMatchNode (location: (160,0)-(160,32))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (160,5)-(160,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (160,5)-(160,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (160,10)-(160,28))
-        │   │       ├── pattern:
-        │   │       │   @ LambdaNode (location: (160,13)-(160,23))
-        │   │       │   ├── locals: []
-        │   │       │   ├── operator_loc: (160,13)-(160,15) = "->"
-        │   │       │   ├── opening_loc: (160,16)-(160,17) = "{"
-        │   │       │   ├── closing_loc: (160,22)-(160,23) = "}"
-        │   │       │   ├── parameters: ∅
-        │   │       │   └── body:
-        │   │       │       @ StatementsNode (location: (160,18)-(160,21))
-        │   │       │       └── body: (length: 1)
-        │   │       │           └── @ LocalVariableReadNode (location: (160,18)-(160,21))
-        │   │       │               ├── name: :bar
-        │   │       │               └── depth: 1
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (160,10)-(160,12) = "in"
-        │   │       └── then_loc: (160,24)-(160,28) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (160,0)-(160,4) = "case"
-        │   └── end_keyword_loc: (160,29)-(160,32) = "end"
-        ├── @ CaseMatchNode (location: (162,0)-(162,32))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (162,5)-(162,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (162,5)-(162,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (162,10)-(162,28))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (162,13)-(162,23))
-        │   │       │   ├── if_keyword_loc: (162,17)-(162,19) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (162,20)-(162,23))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (162,13)-(162,16))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ LocalVariableTargetNode (location: (162,13)-(162,16))
-        │   │       │   │           ├── name: :bar
-        │   │       │   │           └── depth: 0
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (162,10)-(162,12) = "in"
-        │   │       └── then_loc: (162,24)-(162,28) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (162,0)-(162,4) = "case"
-        │   └── end_keyword_loc: (162,29)-(162,32) = "end"
-        ├── @ CaseMatchNode (location: (163,0)-(163,30))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (163,5)-(163,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (163,5)-(163,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (163,10)-(163,26))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (163,13)-(163,21))
-        │   │       │   ├── if_keyword_loc: (163,15)-(163,17) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (163,18)-(163,21))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (163,13)-(163,14))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ IntegerNode (location: (163,13)-(163,14))
-        │   │       │   │           ├── flags: decimal
-        │   │       │   │           └── value: 1
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (163,10)-(163,12) = "in"
-        │   │       └── then_loc: (163,22)-(163,26) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (163,0)-(163,4) = "case"
-        │   └── end_keyword_loc: (163,27)-(163,30) = "end"
-        ├── @ CaseMatchNode (location: (164,0)-(164,32))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (164,5)-(164,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (164,5)-(164,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (164,10)-(164,28))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (164,13)-(164,23))
-        │   │       │   ├── if_keyword_loc: (164,17)-(164,19) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (164,20)-(164,23))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (164,13)-(164,16))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ FloatNode (location: (164,13)-(164,16))
-        │   │       │   │           └── value: 1.0
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (164,10)-(164,12) = "in"
-        │   │       └── then_loc: (164,24)-(164,28) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (164,0)-(164,4) = "case"
-        │   └── end_keyword_loc: (164,29)-(164,32) = "end"
-        ├── @ CaseMatchNode (location: (165,0)-(165,31))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (165,5)-(165,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (165,5)-(165,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (165,10)-(165,27))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (165,13)-(165,22))
-        │   │       │   ├── if_keyword_loc: (165,16)-(165,18) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (165,19)-(165,22))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (165,13)-(165,15))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ ImaginaryNode (location: (165,13)-(165,15))
-        │   │       │   │           └── numeric:
-        │   │       │   │               @ IntegerNode (location: (165,13)-(165,14))
-        │   │       │   │               ├── flags: decimal
-        │   │       │   │               └── value: 1
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (165,10)-(165,12) = "in"
-        │   │       └── then_loc: (165,23)-(165,27) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (165,0)-(165,4) = "case"
-        │   └── end_keyword_loc: (165,28)-(165,31) = "end"
-        ├── @ CaseMatchNode (location: (166,0)-(166,31))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (166,5)-(166,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (166,5)-(166,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (166,10)-(166,27))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (166,13)-(166,22))
-        │   │       │   ├── if_keyword_loc: (166,16)-(166,18) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (166,19)-(166,22))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (166,13)-(166,15))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ RationalNode (location: (166,13)-(166,15))
-        │   │       │   │           └── numeric:
-        │   │       │   │               @ IntegerNode (location: (166,13)-(166,14))
-        │   │       │   │               ├── flags: decimal
-        │   │       │   │               └── value: 1
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (166,10)-(166,12) = "in"
-        │   │       └── then_loc: (166,23)-(166,27) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (166,0)-(166,4) = "case"
-        │   └── end_keyword_loc: (166,28)-(166,31) = "end"
-        ├── @ CaseMatchNode (location: (167,0)-(167,33))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (167,5)-(167,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (167,5)-(167,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (167,10)-(167,29))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (167,13)-(167,24))
-        │   │       │   ├── if_keyword_loc: (167,18)-(167,20) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (167,21)-(167,24))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (167,13)-(167,17))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ SymbolNode (location: (167,13)-(167,17))
-        │   │       │   │           ├── flags: forced_us_ascii_encoding
-        │   │       │   │           ├── opening_loc: (167,13)-(167,14) = ":"
-        │   │       │   │           ├── value_loc: (167,14)-(167,17) = "foo"
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (167,10)-(167,12) = "in"
-        │   │       └── then_loc: (167,25)-(167,29) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (167,0)-(167,4) = "case"
-        │   └── end_keyword_loc: (167,30)-(167,33) = "end"
-        ├── @ CaseMatchNode (location: (168,0)-(168,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (168,5)-(168,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (168,5)-(168,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (168,10)-(168,32))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (168,13)-(168,27))
-        │   │       │   ├── if_keyword_loc: (168,21)-(168,23) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (168,24)-(168,27))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (168,13)-(168,20))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ SymbolNode (location: (168,13)-(168,20))
-        │   │       │   │           ├── flags: forced_us_ascii_encoding
-        │   │       │   │           ├── opening_loc: (168,13)-(168,16) = "%s["
-        │   │       │   │           ├── value_loc: (168,16)-(168,19) = "foo"
-        │   │       │   │           ├── closing_loc: (168,19)-(168,20) = "]"
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (168,10)-(168,12) = "in"
-        │   │       └── then_loc: (168,28)-(168,32) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (168,0)-(168,4) = "case"
-        │   └── end_keyword_loc: (168,33)-(168,36) = "end"
-        ├── @ CaseMatchNode (location: (169,0)-(169,35))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (169,5)-(169,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (169,5)-(169,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (169,10)-(169,31))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (169,13)-(169,26))
-        │   │       │   ├── if_keyword_loc: (169,20)-(169,22) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (169,23)-(169,26))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (169,13)-(169,19))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ SymbolNode (location: (169,13)-(169,19))
-        │   │       │   │           ├── flags: forced_us_ascii_encoding
-        │   │       │   │           ├── opening_loc: (169,13)-(169,15) = ":\""
-        │   │       │   │           ├── value_loc: (169,15)-(169,18) = "foo"
-        │   │       │   │           ├── closing_loc: (169,18)-(169,19) = "\""
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (169,10)-(169,12) = "in"
-        │   │       └── then_loc: (169,27)-(169,31) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (169,0)-(169,4) = "case"
-        │   └── end_keyword_loc: (169,32)-(169,35) = "end"
-        ├── @ CaseMatchNode (location: (170,0)-(170,34))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (170,5)-(170,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (170,5)-(170,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (170,10)-(170,30))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (170,13)-(170,25))
-        │   │       │   ├── if_keyword_loc: (170,19)-(170,21) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (170,22)-(170,25))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (170,13)-(170,18))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ RegularExpressionNode (location: (170,13)-(170,18))
-        │   │       │   │           ├── flags: forced_us_ascii_encoding
-        │   │       │   │           ├── opening_loc: (170,13)-(170,14) = "/"
-        │   │       │   │           ├── content_loc: (170,14)-(170,17) = "foo"
-        │   │       │   │           ├── closing_loc: (170,17)-(170,18) = "/"
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (170,10)-(170,12) = "in"
-        │   │       └── then_loc: (170,26)-(170,30) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (170,0)-(170,4) = "case"
-        │   └── end_keyword_loc: (170,31)-(170,34) = "end"
-        ├── @ CaseMatchNode (location: (171,0)-(171,34))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (171,5)-(171,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (171,5)-(171,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (171,10)-(171,30))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (171,13)-(171,25))
-        │   │       │   ├── if_keyword_loc: (171,19)-(171,21) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (171,22)-(171,25))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (171,13)-(171,18))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ XStringNode (location: (171,13)-(171,18))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── opening_loc: (171,13)-(171,14) = "`"
-        │   │       │   │           ├── content_loc: (171,14)-(171,17) = "foo"
-        │   │       │   │           ├── closing_loc: (171,17)-(171,18) = "`"
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (171,10)-(171,12) = "in"
-        │   │       └── then_loc: (171,26)-(171,30) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (171,0)-(171,4) = "case"
-        │   └── end_keyword_loc: (171,31)-(171,34) = "end"
-        ├── @ CaseMatchNode (location: (172,0)-(172,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (172,5)-(172,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (172,5)-(172,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (172,10)-(172,32))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (172,13)-(172,27))
-        │   │       │   ├── if_keyword_loc: (172,21)-(172,23) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (172,24)-(172,27))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (172,13)-(172,20))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ XStringNode (location: (172,13)-(172,20))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── opening_loc: (172,13)-(172,16) = "%x["
-        │   │       │   │           ├── content_loc: (172,16)-(172,19) = "foo"
-        │   │       │   │           ├── closing_loc: (172,19)-(172,20) = "]"
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (172,10)-(172,12) = "in"
-        │   │       └── then_loc: (172,28)-(172,32) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (172,0)-(172,4) = "case"
-        │   └── end_keyword_loc: (172,33)-(172,36) = "end"
-        ├── @ CaseMatchNode (location: (173,0)-(173,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (173,5)-(173,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (173,5)-(173,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (173,10)-(173,32))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (173,13)-(173,27))
-        │   │       │   ├── if_keyword_loc: (173,21)-(173,23) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (173,24)-(173,27))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (173,13)-(173,20))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ ArrayNode (location: (173,13)-(173,20))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── elements: (length: 1)
-        │   │       │   │           │   └── @ SymbolNode (location: (173,16)-(173,19))
-        │   │       │   │           │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │           │       ├── opening_loc: ∅
-        │   │       │   │           │       ├── value_loc: (173,16)-(173,19) = "foo"
-        │   │       │   │           │       ├── closing_loc: ∅
-        │   │       │   │           │       └── unescaped: "foo"
-        │   │       │   │           ├── opening_loc: (173,13)-(173,16) = "%i["
-        │   │       │   │           └── closing_loc: (173,19)-(173,20) = "]"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (173,10)-(173,12) = "in"
-        │   │       └── then_loc: (173,28)-(173,32) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (173,0)-(173,4) = "case"
-        │   └── end_keyword_loc: (173,33)-(173,36) = "end"
-        ├── @ CaseMatchNode (location: (174,0)-(174,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (174,5)-(174,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (174,5)-(174,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (174,10)-(174,32))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (174,13)-(174,27))
-        │   │       │   ├── if_keyword_loc: (174,21)-(174,23) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (174,24)-(174,27))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (174,13)-(174,20))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ ArrayNode (location: (174,13)-(174,20))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── elements: (length: 1)
-        │   │       │   │           │   └── @ SymbolNode (location: (174,16)-(174,19))
-        │   │       │   │           │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │           │       ├── opening_loc: ∅
-        │   │       │   │           │       ├── value_loc: (174,16)-(174,19) = "foo"
-        │   │       │   │           │       ├── closing_loc: ∅
-        │   │       │   │           │       └── unescaped: "foo"
-        │   │       │   │           ├── opening_loc: (174,13)-(174,16) = "%I["
-        │   │       │   │           └── closing_loc: (174,19)-(174,20) = "]"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (174,10)-(174,12) = "in"
-        │   │       └── then_loc: (174,28)-(174,32) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (174,0)-(174,4) = "case"
-        │   └── end_keyword_loc: (174,33)-(174,36) = "end"
-        ├── @ CaseMatchNode (location: (175,0)-(175,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (175,5)-(175,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (175,5)-(175,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (175,10)-(175,32))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (175,13)-(175,27))
-        │   │       │   ├── if_keyword_loc: (175,21)-(175,23) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (175,24)-(175,27))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (175,13)-(175,20))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ ArrayNode (location: (175,13)-(175,20))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── elements: (length: 1)
-        │   │       │   │           │   └── @ StringNode (location: (175,16)-(175,19))
-        │   │       │   │           │       ├── flags: ∅
-        │   │       │   │           │       ├── opening_loc: ∅
-        │   │       │   │           │       ├── content_loc: (175,16)-(175,19) = "foo"
-        │   │       │   │           │       ├── closing_loc: ∅
-        │   │       │   │           │       └── unescaped: "foo"
-        │   │       │   │           ├── opening_loc: (175,13)-(175,16) = "%w["
-        │   │       │   │           └── closing_loc: (175,19)-(175,20) = "]"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (175,10)-(175,12) = "in"
-        │   │       └── then_loc: (175,28)-(175,32) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (175,0)-(175,4) = "case"
-        │   └── end_keyword_loc: (175,33)-(175,36) = "end"
-        ├── @ CaseMatchNode (location: (176,0)-(176,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (176,5)-(176,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (176,5)-(176,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (176,10)-(176,32))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (176,13)-(176,27))
-        │   │       │   ├── if_keyword_loc: (176,21)-(176,23) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (176,24)-(176,27))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (176,13)-(176,20))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ ArrayNode (location: (176,13)-(176,20))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── elements: (length: 1)
-        │   │       │   │           │   └── @ StringNode (location: (176,16)-(176,19))
-        │   │       │   │           │       ├── flags: ∅
-        │   │       │   │           │       ├── opening_loc: ∅
-        │   │       │   │           │       ├── content_loc: (176,16)-(176,19) = "foo"
-        │   │       │   │           │       ├── closing_loc: ∅
-        │   │       │   │           │       └── unescaped: "foo"
-        │   │       │   │           ├── opening_loc: (176,13)-(176,16) = "%W["
-        │   │       │   │           └── closing_loc: (176,19)-(176,20) = "]"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (176,10)-(176,12) = "in"
-        │   │       └── then_loc: (176,28)-(176,32) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (176,0)-(176,4) = "case"
-        │   └── end_keyword_loc: (176,33)-(176,36) = "end"
-        ├── @ CaseMatchNode (location: (177,0)-(177,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (177,5)-(177,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (177,5)-(177,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (177,10)-(177,32))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (177,13)-(177,27))
-        │   │       │   ├── if_keyword_loc: (177,21)-(177,23) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (177,24)-(177,27))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (177,13)-(177,20))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ StringNode (location: (177,13)-(177,20))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── opening_loc: (177,13)-(177,16) = "%q["
-        │   │       │   │           ├── content_loc: (177,16)-(177,19) = "foo"
-        │   │       │   │           ├── closing_loc: (177,19)-(177,20) = "]"
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (177,10)-(177,12) = "in"
-        │   │       └── then_loc: (177,28)-(177,32) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (177,0)-(177,4) = "case"
-        │   └── end_keyword_loc: (177,33)-(177,36) = "end"
-        ├── @ CaseMatchNode (location: (178,0)-(178,36))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (178,5)-(178,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (178,5)-(178,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (178,10)-(178,32))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (178,13)-(178,27))
-        │   │       │   ├── if_keyword_loc: (178,21)-(178,23) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (178,24)-(178,27))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (178,13)-(178,20))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ StringNode (location: (178,13)-(178,20))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── opening_loc: (178,13)-(178,16) = "%Q["
-        │   │       │   │           ├── content_loc: (178,16)-(178,19) = "foo"
-        │   │       │   │           ├── closing_loc: (178,19)-(178,20) = "]"
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (178,10)-(178,12) = "in"
-        │   │       └── then_loc: (178,28)-(178,32) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (178,0)-(178,4) = "case"
-        │   └── end_keyword_loc: (178,33)-(178,36) = "end"
-        ├── @ CaseMatchNode (location: (179,0)-(179,34))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (179,5)-(179,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (179,5)-(179,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (179,10)-(179,30))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (179,13)-(179,25))
-        │   │       │   ├── if_keyword_loc: (179,19)-(179,21) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (179,22)-(179,25))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (179,13)-(179,18))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ StringNode (location: (179,13)-(179,18))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── opening_loc: (179,13)-(179,14) = "\""
-        │   │       │   │           ├── content_loc: (179,14)-(179,17) = "foo"
-        │   │       │   │           ├── closing_loc: (179,17)-(179,18) = "\""
-        │   │       │   │           └── unescaped: "foo"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (179,10)-(179,12) = "in"
-        │   │       └── then_loc: (179,26)-(179,30) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (179,0)-(179,4) = "case"
-        │   └── end_keyword_loc: (179,31)-(179,34) = "end"
-        ├── @ CaseMatchNode (location: (180,0)-(180,32))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (180,5)-(180,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (180,5)-(180,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (180,10)-(180,28))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (180,13)-(180,23))
-        │   │       │   ├── if_keyword_loc: (180,17)-(180,19) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (180,20)-(180,23))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (180,13)-(180,16))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ NilNode (location: (180,13)-(180,16))
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (180,10)-(180,12) = "in"
-        │   │       └── then_loc: (180,24)-(180,28) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (180,0)-(180,4) = "case"
-        │   └── end_keyword_loc: (180,29)-(180,32) = "end"
-        ├── @ CaseMatchNode (location: (181,0)-(181,33))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (181,5)-(181,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (181,5)-(181,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (181,10)-(181,29))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (181,13)-(181,24))
-        │   │       │   ├── if_keyword_loc: (181,18)-(181,20) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (181,21)-(181,24))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (181,13)-(181,17))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ SelfNode (location: (181,13)-(181,17))
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (181,10)-(181,12) = "in"
-        │   │       └── then_loc: (181,25)-(181,29) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (181,0)-(181,4) = "case"
-        │   └── end_keyword_loc: (181,30)-(181,33) = "end"
-        ├── @ CaseMatchNode (location: (182,0)-(182,33))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (182,5)-(182,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (182,5)-(182,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (182,10)-(182,29))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (182,13)-(182,24))
-        │   │       │   ├── if_keyword_loc: (182,18)-(182,20) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (182,21)-(182,24))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (182,13)-(182,17))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ TrueNode (location: (182,13)-(182,17))
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (182,10)-(182,12) = "in"
-        │   │       └── then_loc: (182,25)-(182,29) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (182,0)-(182,4) = "case"
-        │   └── end_keyword_loc: (182,30)-(182,33) = "end"
-        ├── @ CaseMatchNode (location: (183,0)-(183,34))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (183,5)-(183,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (183,5)-(183,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (183,10)-(183,30))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (183,13)-(183,25))
-        │   │       │   ├── if_keyword_loc: (183,19)-(183,21) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (183,22)-(183,25))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (183,13)-(183,18))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ FalseNode (location: (183,13)-(183,18))
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (183,10)-(183,12) = "in"
-        │   │       └── then_loc: (183,26)-(183,30) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (183,0)-(183,4) = "case"
-        │   └── end_keyword_loc: (183,31)-(183,34) = "end"
-        ├── @ CaseMatchNode (location: (184,0)-(184,37))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (184,5)-(184,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (184,5)-(184,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (184,10)-(184,33))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (184,13)-(184,28))
-        │   │       │   ├── if_keyword_loc: (184,22)-(184,24) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (184,25)-(184,28))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (184,13)-(184,21))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ SourceFileNode (location: (184,13)-(184,21))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           └── filepath: "patterns.txt"
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (184,10)-(184,12) = "in"
-        │   │       └── then_loc: (184,29)-(184,33) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (184,0)-(184,4) = "case"
-        │   └── end_keyword_loc: (184,34)-(184,37) = "end"
-        ├── @ CaseMatchNode (location: (185,0)-(185,37))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (185,5)-(185,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (185,5)-(185,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (185,10)-(185,33))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (185,13)-(185,28))
-        │   │       │   ├── if_keyword_loc: (185,22)-(185,24) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (185,25)-(185,28))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (185,13)-(185,21))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ SourceLineNode (location: (185,13)-(185,21))
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (185,10)-(185,12) = "in"
-        │   │       └── then_loc: (185,29)-(185,33) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (185,0)-(185,4) = "case"
-        │   └── end_keyword_loc: (185,34)-(185,37) = "end"
-        ├── @ CaseMatchNode (location: (186,0)-(186,41))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (186,5)-(186,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (186,5)-(186,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (186,10)-(186,37))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (186,13)-(186,32))
-        │   │       │   ├── if_keyword_loc: (186,26)-(186,28) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (186,29)-(186,32))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (186,13)-(186,25))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ SourceEncodingNode (location: (186,13)-(186,25))
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (186,10)-(186,12) = "in"
-        │   │       └── then_loc: (186,33)-(186,37) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (186,0)-(186,4) = "case"
-        │   └── end_keyword_loc: (186,38)-(186,41) = "end"
-        ├── @ CaseMatchNode (location: (187,0)-(187,39))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (187,5)-(187,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (187,5)-(187,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (187,10)-(187,35))
-        │   │       ├── pattern:
-        │   │       │   @ IfNode (location: (187,13)-(187,30))
-        │   │       │   ├── if_keyword_loc: (187,24)-(187,26) = "if"
-        │   │       │   ├── predicate:
-        │   │       │   │   @ LocalVariableReadNode (location: (187,27)-(187,30))
-        │   │       │   │   ├── name: :baz
-        │   │       │   │   └── depth: 0
-        │   │       │   ├── then_keyword_loc: ∅
-        │   │       │   ├── statements:
-        │   │       │   │   @ StatementsNode (location: (187,13)-(187,23))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ LambdaNode (location: (187,13)-(187,23))
-        │   │       │   │           ├── locals: []
-        │   │       │   │           ├── operator_loc: (187,13)-(187,15) = "->"
-        │   │       │   │           ├── opening_loc: (187,16)-(187,17) = "{"
-        │   │       │   │           ├── closing_loc: (187,22)-(187,23) = "}"
-        │   │       │   │           ├── parameters: ∅
-        │   │       │   │           └── body:
-        │   │       │   │               @ StatementsNode (location: (187,18)-(187,21))
-        │   │       │   │               └── body: (length: 1)
-        │   │       │   │                   └── @ LocalVariableReadNode (location: (187,18)-(187,21))
-        │   │       │   │                       ├── name: :bar
-        │   │       │   │                       └── depth: 1
-        │   │       │   ├── consequent: ∅
-        │   │       │   └── end_keyword_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (187,10)-(187,12) = "in"
-        │   │       └── then_loc: (187,31)-(187,35) = "then"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (187,0)-(187,4) = "case"
-        │   └── end_keyword_loc: (187,36)-(187,39) = "end"
-        ├── @ IfNode (location: (189,0)-(190,3))
-        │   ├── if_keyword_loc: (189,0)-(189,2) = "if"
-        │   ├── predicate:
-        │   │   @ MatchPredicateNode (location: (189,3)-(189,10))
-        │   │   ├── value:
-        │   │   │   @ CallNode (location: (189,3)-(189,4))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :a
-        │   │   │   ├── message_loc: (189,3)-(189,4) = "a"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── pattern:
-        │   │   │   @ ArrayPatternNode (location: (189,8)-(189,10))
-        │   │   │   ├── constant: ∅
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── opening_loc: (189,8)-(189,9) = "["
-        │   │   │   └── closing_loc: (189,9)-(189,10) = "]"
-        │   │   └── operator_loc: (189,5)-(189,7) = "in"
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (190,0)-(190,3) = "end"
-        ├── @ MatchRequiredNode (location: (192,0)-(194,1))
-        │   ├── value:
-        │   │   @ CallNode (location: (192,0)-(192,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (192,0)-(192,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (192,5)-(194,1))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (193,2)-(193,3))
-        │   │   │       ├── name: :b
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (192,5)-(192,6) = "["
-        │   │   └── closing_loc: (194,0)-(194,1) = "]"
-        │   └── operator_loc: (192,2)-(192,4) = "=>"
-        ├── @ MatchPredicateNode (location: (196,0)-(200,1))
-        │   ├── value:
-        │   │   @ CallNode (location: (196,0)-(196,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (196,0)-(196,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ HashPatternNode (location: (196,7)-(200,1))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (196,7)-(196,8))
-        │   │   │   └── name: :A
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (197,2)-(199,3))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (197,2)-(197,6))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (197,2)-(197,5) = "bar"
-        │   │   │       │   ├── closing_loc: (197,5)-(197,6) = ":"
-        │   │   │       │   └── unescaped: "bar"
-        │   │   │       ├── value:
-        │   │   │       │   @ HashPatternNode (location: (197,7)-(199,3))
-        │   │   │       │   ├── constant:
-        │   │   │       │   │   @ ConstantReadNode (location: (197,7)-(197,8))
-        │   │   │       │   │   └── name: :B
-        │   │   │       │   ├── elements: (length: 1)
-        │   │   │       │   │   └── @ AssocNode (location: (198,4)-(198,12))
-        │   │   │       │   │       ├── key:
-        │   │   │       │   │       │   @ SymbolNode (location: (198,4)-(198,10))
-        │   │   │       │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   │       │   ├── opening_loc: ∅
-        │   │   │       │   │       │   ├── value_loc: (198,4)-(198,9) = "value"
-        │   │   │       │   │       │   ├── closing_loc: (198,9)-(198,10) = ":"
-        │   │   │       │   │       │   └── unescaped: "value"
-        │   │   │       │   │       ├── value:
-        │   │   │       │   │       │   @ LocalVariableTargetNode (location: (198,11)-(198,12))
-        │   │   │       │   │       │   ├── name: :a
-        │   │   │       │   │       │   └── depth: 0
-        │   │   │       │   │       └── operator_loc: ∅
-        │   │   │       │   ├── rest: ∅
-        │   │   │       │   ├── opening_loc: (197,8)-(197,9) = "["
-        │   │   │       │   └── closing_loc: (199,2)-(199,3) = "]"
-        │   │   │       └── operator_loc: ∅
-        │   │   ├── rest: ∅
-        │   │   ├── opening_loc: (196,8)-(196,9) = "["
-        │   │   └── closing_loc: (200,0)-(200,1) = "]"
-        │   └── operator_loc: (196,4)-(196,6) = "in"
-        ├── @ MatchPredicateNode (location: (202,0)-(202,17))
-        │   ├── value:
-        │   │   @ CallNode (location: (202,0)-(202,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (202,0)-(202,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ CapturePatternNode (location: (202,7)-(202,17))
-        │   │   ├── value:
-        │   │   │   @ LocalVariableTargetNode (location: (202,7)-(202,10))
-        │   │   │   ├── name: :bar
-        │   │   │   └── depth: 0
-        │   │   ├── target:
-        │   │   │   @ LocalVariableTargetNode (location: (202,14)-(202,17))
-        │   │   │   ├── name: :baz
-        │   │   │   └── depth: 0
-        │   │   └── operator_loc: (202,11)-(202,13) = "=>"
-        │   └── operator_loc: (202,4)-(202,6) = "in"
-        ├── @ MatchRequiredNode (location: (203,0)-(203,17))
-        │   ├── value:
-        │   │   @ CallNode (location: (203,0)-(203,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (203,0)-(203,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── pattern:
-        │   │   @ CapturePatternNode (location: (203,7)-(203,17))
-        │   │   ├── value:
-        │   │   │   @ LocalVariableTargetNode (location: (203,7)-(203,10))
-        │   │   │   ├── name: :bar
-        │   │   │   └── depth: 0
-        │   │   ├── target:
-        │   │   │   @ LocalVariableTargetNode (location: (203,14)-(203,17))
-        │   │   │   ├── name: :baz
-        │   │   │   └── depth: 0
-        │   │   └── operator_loc: (203,11)-(203,13) = "=>"
-        │   └── operator_loc: (203,4)-(203,6) = "=>"
-        ├── @ MultiWriteNode (location: (205,0)-(205,20))
-        │   ├── lefts: (length: 3)
-        │   │   ├── @ LocalVariableTargetNode (location: (205,0)-(205,3))
-        │   │   │   ├── name: :foo
-        │   │   │   └── depth: 0
-        │   │   ├── @ LocalVariableTargetNode (location: (205,5)-(205,8))
-        │   │   │   ├── name: :bar
-        │   │   │   └── depth: 0
-        │   │   └── @ LocalVariableTargetNode (location: (205,10)-(205,13))
-        │   │       ├── name: :baz
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (205,14)-(205,15) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (205,16)-(205,20))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (205,16)-(205,17))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (205,19)-(205,20))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ CallNode (location: (206,0)-(208,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (206,0)-(206,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (206,4)-(208,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (207,2)-(207,29))
-        │       │   └── body: (length: 1)
-        │       │       └── @ MatchRequiredNode (location: (207,2)-(207,29))
-        │       │           ├── value:
-        │       │           │   @ ArrayNode (location: (207,2)-(207,8))
-        │       │           │   ├── flags: ∅
-        │       │           │   ├── elements: (length: 2)
-        │       │           │   │   ├── @ IntegerNode (location: (207,3)-(207,4))
-        │       │           │   │   │   ├── flags: decimal
-        │       │           │   │   │   └── value: 1
-        │       │           │   │   └── @ IntegerNode (location: (207,6)-(207,7))
-        │       │           │   │       ├── flags: decimal
-        │       │           │   │       └── value: 2
-        │       │           │   ├── opening_loc: (207,2)-(207,3) = "["
-        │       │           │   └── closing_loc: (207,7)-(207,8) = "]"
-        │       │           ├── pattern:
-        │       │           │   @ CapturePatternNode (location: (207,12)-(207,29))
-        │       │           │   ├── value:
-        │       │           │   │   @ ArrayPatternNode (location: (207,12)-(207,22))
-        │       │           │   │   ├── constant: ∅
-        │       │           │   │   ├── requireds: (length: 2)
-        │       │           │   │   │   ├── @ LocalVariableTargetNode (location: (207,13)-(207,16))
-        │       │           │   │   │   │   ├── name: :foo
-        │       │           │   │   │   │   └── depth: 1
-        │       │           │   │   │   └── @ LocalVariableTargetNode (location: (207,18)-(207,21))
-        │       │           │   │   │       ├── name: :bar
-        │       │           │   │   │       └── depth: 1
-        │       │           │   │   ├── rest: ∅
-        │       │           │   │   ├── posts: (length: 0)
-        │       │           │   │   ├── opening_loc: (207,12)-(207,13) = "["
-        │       │           │   │   └── closing_loc: (207,21)-(207,22) = "]"
-        │       │           │   ├── target:
-        │       │           │   │   @ LocalVariableTargetNode (location: (207,26)-(207,29))
-        │       │           │   │   ├── name: :baz
-        │       │           │   │   └── depth: 1
-        │       │           │   └── operator_loc: (207,23)-(207,25) = "=>"
-        │       │           └── operator_loc: (207,9)-(207,11) = "=>"
-        │       ├── opening_loc: (206,4)-(206,6) = "do"
-        │       └── closing_loc: (208,0)-(208,3) = "end"
-        ├── @ MatchRequiredNode (location: (210,0)-(210,19))
-        │   ├── value:
-        │   │   @ LocalVariableReadNode (location: (210,0)-(210,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (210,7)-(210,19))
-        │   │   ├── constant:
-        │   │   │   @ ConstantReadNode (location: (210,7)-(210,13))
-        │   │   │   └── name: :Object
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ HashPatternNode (location: (210,14)-(210,18))
-        │   │   │       ├── constant: ∅
-        │   │   │       ├── elements: (length: 1)
-        │   │   │       │   └── @ AssocNode (location: (210,15)-(210,17))
-        │   │   │       │       ├── key:
-        │   │   │       │       │   @ SymbolNode (location: (210,15)-(210,17))
-        │   │   │       │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │       │   ├── opening_loc: ∅
-        │   │   │       │       │   ├── value_loc: (210,15)-(210,16) = "x"
-        │   │   │       │       │   ├── closing_loc: (210,16)-(210,17) = ":"
-        │   │   │       │       │   └── unescaped: "x"
-        │   │   │       │       ├── value:
-        │   │   │       │       │   @ ImplicitNode (location: (210,15)-(210,16))
-        │   │   │       │       │   └── value:
-        │   │   │       │       │       @ LocalVariableTargetNode (location: (210,15)-(210,16))
-        │   │   │       │       │       ├── name: :x
-        │   │   │       │       │       └── depth: 0
-        │   │   │       │       └── operator_loc: ∅
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── opening_loc: (210,14)-(210,15) = "{"
-        │   │   │       └── closing_loc: (210,17)-(210,18) = "}"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (210,13)-(210,14) = "["
-        │   │   └── closing_loc: (210,18)-(210,19) = "]"
-        │   └── operator_loc: (210,4)-(210,6) = "=>"
-        ├── @ CallNode (location: (212,0)-(212,19))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (212,0)-(212,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: (212,1)-(212,2) = "."
-        │   ├── name: :then
-        │   ├── message_loc: (212,2)-(212,6) = "then"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (212,7)-(212,19))
-        │       ├── locals: [:_1]
-        │       ├── parameters:
-        │       │   @ NumberedParametersNode (location: (212,7)-(212,19))
-        │       │   └── maximum: 1
-        │       ├── body:
-        │       │   @ StatementsNode (location: (212,9)-(212,17))
-        │       │   └── body: (length: 1)
-        │       │       └── @ MatchPredicateNode (location: (212,9)-(212,17))
-        │       │           ├── value:
-        │       │           │   @ IntegerNode (location: (212,9)-(212,10))
-        │       │           │   ├── flags: decimal
-        │       │           │   └── value: 1
-        │       │           ├── pattern:
-        │       │           │   @ PinnedVariableNode (location: (212,14)-(212,17))
-        │       │           │   ├── variable:
-        │       │           │   │   @ LocalVariableReadNode (location: (212,15)-(212,17))
-        │       │           │   │   ├── name: :_1
-        │       │           │   │   └── depth: 0
-        │       │           │   └── operator_loc: (212,14)-(212,15) = "^"
-        │       │           └── operator_loc: (212,11)-(212,13) = "in"
-        │       ├── opening_loc: (212,7)-(212,8) = "{"
-        │       └── closing_loc: (212,18)-(212,19) = "}"
-        └── @ MultiWriteNode (location: (214,0)-(217,5))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (215,2)-(215,3))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (216,2)-(216,3))
-            │       ├── name: :b
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: (214,0)-(214,1) = "("
-            ├── rparen_loc: (217,0)-(217,1) = ")"
-            ├── operator_loc: (217,2)-(217,3) = "="
-            └── value:
-                @ CallNode (location: (217,4)-(217,5))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :c
-                ├── message_loc: (217,4)-(217,5) = "c"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/procs.txt b/test/mri/prism/snapshots/procs.txt
deleted file mode 100644
index 1329ae6a5f2..00000000000
--- a/test/mri/prism/snapshots/procs.txt
+++ /dev/null
@@ -1,403 +0,0 @@
-@ ProgramNode (location: (1,0)-(27,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(27,19))
-    └── body: (length: 10)
-        ├── @ LambdaNode (location: (1,0)-(1,21))
-        │   ├── locals: [:a, :b, :c, :d]
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (1,16)-(1,17) = "{"
-        │   ├── closing_loc: (1,20)-(1,21) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (1,3)-(1,15))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (1,4)-(1,5))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (1,4)-(1,5))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :a
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 3)
-        │   │   │   ├── @ BlockLocalVariableNode (location: (1,7)-(1,8))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :b
-        │   │   │   ├── @ BlockLocalVariableNode (location: (1,10)-(1,11))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :c
-        │   │   │   └── @ BlockLocalVariableNode (location: (1,13)-(1,14))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :d
-        │   │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   │   └── closing_loc: (1,14)-(1,15) = ")"
-        │   └── body:
-        │       @ StatementsNode (location: (1,18)-(1,19))
-        │       └── body: (length: 1)
-        │           └── @ LocalVariableReadNode (location: (1,18)-(1,19))
-        │               ├── name: :b
-        │               └── depth: 0
-        ├── @ LambdaNode (location: (3,0)-(5,3))
-        │   ├── locals: []
-        │   ├── operator_loc: (3,0)-(3,2) = "->"
-        │   ├── opening_loc: (3,3)-(3,5) = "do"
-        │   ├── closing_loc: (5,0)-(5,3) = "end"
-        │   ├── parameters: ∅
-        │   └── body:
-        │       @ BeginNode (location: (3,3)-(5,3))
-        │       ├── begin_keyword_loc: ∅
-        │       ├── statements: ∅
-        │       ├── rescue_clause: ∅
-        │       ├── else_clause: ∅
-        │       ├── ensure_clause:
-        │       │   @ EnsureNode (location: (4,0)-(5,3))
-        │       │   ├── ensure_keyword_loc: (4,0)-(4,6) = "ensure"
-        │       │   ├── statements: ∅
-        │       │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        │       └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ LambdaNode (location: (7,0)-(11,3))
-        │   ├── locals: []
-        │   ├── operator_loc: (7,0)-(7,2) = "->"
-        │   ├── opening_loc: (7,3)-(7,5) = "do"
-        │   ├── closing_loc: (11,0)-(11,3) = "end"
-        │   ├── parameters: ∅
-        │   └── body:
-        │       @ BeginNode (location: (7,3)-(11,3))
-        │       ├── begin_keyword_loc: ∅
-        │       ├── statements: ∅
-        │       ├── rescue_clause:
-        │       │   @ RescueNode (location: (8,0)-(8,6))
-        │       │   ├── keyword_loc: (8,0)-(8,6) = "rescue"
-        │       │   ├── exceptions: (length: 0)
-        │       │   ├── operator_loc: ∅
-        │       │   ├── reference: ∅
-        │       │   ├── statements: ∅
-        │       │   └── consequent: ∅
-        │       ├── else_clause:
-        │       │   @ ElseNode (location: (9,0)-(10,6))
-        │       │   ├── else_keyword_loc: (9,0)-(9,4) = "else"
-        │       │   ├── statements: ∅
-        │       │   └── end_keyword_loc: (10,0)-(10,6) = "ensure"
-        │       ├── ensure_clause:
-        │       │   @ EnsureNode (location: (10,0)-(11,3))
-        │       │   ├── ensure_keyword_loc: (10,0)-(10,6) = "ensure"
-        │       │   ├── statements: ∅
-        │       │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        │       └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ LambdaNode (location: (13,0)-(13,10))
-        │   ├── locals: []
-        │   ├── operator_loc: (13,0)-(13,2) = "->"
-        │   ├── opening_loc: (13,3)-(13,4) = "{"
-        │   ├── closing_loc: (13,9)-(13,10) = "}"
-        │   ├── parameters: ∅
-        │   └── body:
-        │       @ StatementsNode (location: (13,5)-(13,8))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (13,5)-(13,8))
-        │               ├── flags: variable_call, ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :foo
-        │               ├── message_loc: (13,5)-(13,8) = "foo"
-        │               ├── opening_loc: ∅
-        │               ├── arguments: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ LambdaNode (location: (15,0)-(15,15))
-        │   ├── locals: []
-        │   ├── operator_loc: (15,0)-(15,2) = "->"
-        │   ├── opening_loc: (15,3)-(15,5) = "do"
-        │   ├── closing_loc: (15,12)-(15,15) = "end"
-        │   ├── parameters: ∅
-        │   └── body:
-        │       @ StatementsNode (location: (15,7)-(15,10))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (15,7)-(15,10))
-        │               ├── flags: variable_call, ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :foo
-        │               ├── message_loc: (15,7)-(15,10) = "foo"
-        │               ├── opening_loc: ∅
-        │               ├── arguments: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ LambdaNode (location: (17,0)-(17,29))
-        │   ├── locals: [:a, :b, :c, :d, :e]
-        │   ├── operator_loc: (17,0)-(17,2) = "->"
-        │   ├── opening_loc: (17,24)-(17,25) = "{"
-        │   ├── closing_loc: (17,28)-(17,29) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (17,3)-(17,23))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (17,3)-(17,23))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (17,3)-(17,4))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :a
-        │   │   │   ├── optionals: (length: 1)
-        │   │   │   │   └── @ OptionalParameterNode (location: (17,6)-(17,11))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :b
-        │   │   │   │       ├── name_loc: (17,6)-(17,7) = "b"
-        │   │   │   │       ├── operator_loc: (17,8)-(17,9) = "="
-        │   │   │   │       └── value:
-        │   │   │   │           @ IntegerNode (location: (17,10)-(17,11))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 2)
-        │   │   │   │   ├── @ RequiredKeywordParameterNode (location: (17,13)-(17,15))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── name: :c
-        │   │   │   │   │   └── name_loc: (17,13)-(17,15) = "c:"
-        │   │   │   │   └── @ RequiredKeywordParameterNode (location: (17,17)-(17,19))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :d
-        │   │   │   │       └── name_loc: (17,17)-(17,19) = "d:"
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block:
-        │   │   │       @ BlockParameterNode (location: (17,21)-(17,23))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :e
-        │   │   │       ├── name_loc: (17,22)-(17,23) = "e"
-        │   │   │       └── operator_loc: (17,21)-(17,22) = "&"
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── body:
-        │       @ StatementsNode (location: (17,26)-(17,27))
-        │       └── body: (length: 1)
-        │           └── @ LocalVariableReadNode (location: (17,26)-(17,27))
-        │               ├── name: :a
-        │               └── depth: 0
-        ├── @ LambdaNode (location: (19,0)-(19,40))
-        │   ├── locals: [:a, :b, :c, :d, :e, :f, :g]
-        │   ├── operator_loc: (19,0)-(19,2) = "->"
-        │   ├── opening_loc: (19,35)-(19,36) = "{"
-        │   ├── closing_loc: (19,39)-(19,40) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (19,3)-(19,34))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (19,4)-(19,33))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (19,4)-(19,5))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :a
-        │   │   │   ├── optionals: (length: 1)
-        │   │   │   │   └── @ OptionalParameterNode (location: (19,7)-(19,12))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :b
-        │   │   │   │       ├── name_loc: (19,7)-(19,8) = "b"
-        │   │   │   │       ├── operator_loc: (19,9)-(19,10) = "="
-        │   │   │   │       └── value:
-        │   │   │   │           @ IntegerNode (location: (19,11)-(19,12))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   ├── rest:
-        │   │   │   │   @ RestParameterNode (location: (19,14)-(19,16))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :c
-        │   │   │   │   ├── name_loc: (19,15)-(19,16) = "c"
-        │   │   │   │   └── operator_loc: (19,14)-(19,15) = "*"
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 2)
-        │   │   │   │   ├── @ RequiredKeywordParameterNode (location: (19,18)-(19,20))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── name: :d
-        │   │   │   │   │   └── name_loc: (19,18)-(19,20) = "d:"
-        │   │   │   │   └── @ RequiredKeywordParameterNode (location: (19,22)-(19,24))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :e
-        │   │   │   │       └── name_loc: (19,22)-(19,24) = "e:"
-        │   │   │   ├── keyword_rest:
-        │   │   │   │   @ KeywordRestParameterNode (location: (19,26)-(19,29))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :f
-        │   │   │   │   ├── name_loc: (19,28)-(19,29) = "f"
-        │   │   │   │   └── operator_loc: (19,26)-(19,28) = "**"
-        │   │   │   └── block:
-        │   │   │       @ BlockParameterNode (location: (19,31)-(19,33))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :g
-        │   │   │       ├── name_loc: (19,32)-(19,33) = "g"
-        │   │   │       └── operator_loc: (19,31)-(19,32) = "&"
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (19,3)-(19,4) = "("
-        │   │   └── closing_loc: (19,33)-(19,34) = ")"
-        │   └── body:
-        │       @ StatementsNode (location: (19,37)-(19,38))
-        │       └── body: (length: 1)
-        │           └── @ LocalVariableReadNode (location: (19,37)-(19,38))
-        │               ├── name: :a
-        │               └── depth: 0
-        ├── @ LambdaNode (location: (21,0)-(23,3))
-        │   ├── locals: [:a, :b, :c, :d, :e, :f, :g]
-        │   ├── operator_loc: (21,0)-(21,2) = "->"
-        │   ├── opening_loc: (21,35)-(21,37) = "do"
-        │   ├── closing_loc: (23,0)-(23,3) = "end"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (21,3)-(21,34))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (21,4)-(21,33))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (21,4)-(21,5))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :a
-        │   │   │   ├── optionals: (length: 1)
-        │   │   │   │   └── @ OptionalParameterNode (location: (21,7)-(21,12))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :b
-        │   │   │   │       ├── name_loc: (21,7)-(21,8) = "b"
-        │   │   │   │       ├── operator_loc: (21,9)-(21,10) = "="
-        │   │   │   │       └── value:
-        │   │   │   │           @ IntegerNode (location: (21,11)-(21,12))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   ├── rest:
-        │   │   │   │   @ RestParameterNode (location: (21,14)-(21,16))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :c
-        │   │   │   │   ├── name_loc: (21,15)-(21,16) = "c"
-        │   │   │   │   └── operator_loc: (21,14)-(21,15) = "*"
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 2)
-        │   │   │   │   ├── @ RequiredKeywordParameterNode (location: (21,18)-(21,20))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── name: :d
-        │   │   │   │   │   └── name_loc: (21,18)-(21,20) = "d:"
-        │   │   │   │   └── @ RequiredKeywordParameterNode (location: (21,22)-(21,24))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :e
-        │   │   │   │       └── name_loc: (21,22)-(21,24) = "e:"
-        │   │   │   ├── keyword_rest:
-        │   │   │   │   @ KeywordRestParameterNode (location: (21,26)-(21,29))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :f
-        │   │   │   │   ├── name_loc: (21,28)-(21,29) = "f"
-        │   │   │   │   └── operator_loc: (21,26)-(21,28) = "**"
-        │   │   │   └── block:
-        │   │   │       @ BlockParameterNode (location: (21,31)-(21,33))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :g
-        │   │   │       ├── name_loc: (21,32)-(21,33) = "g"
-        │   │   │       └── operator_loc: (21,31)-(21,32) = "&"
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (21,3)-(21,4) = "("
-        │   │   └── closing_loc: (21,33)-(21,34) = ")"
-        │   └── body:
-        │       @ StatementsNode (location: (22,2)-(22,3))
-        │       └── body: (length: 1)
-        │           └── @ LocalVariableReadNode (location: (22,2)-(22,3))
-        │               ├── name: :a
-        │               └── depth: 0
-        ├── @ LambdaNode (location: (25,0)-(25,25))
-        │   ├── locals: [:a]
-        │   ├── operator_loc: (25,0)-(25,2) = "->"
-        │   ├── opening_loc: (25,7)-(25,8) = "{"
-        │   ├── closing_loc: (25,24)-(25,25) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (25,3)-(25,6))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (25,4)-(25,5))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (25,4)-(25,5))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :a
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (25,3)-(25,4) = "("
-        │   │   └── closing_loc: (25,5)-(25,6) = ")"
-        │   └── body:
-        │       @ StatementsNode (location: (25,9)-(25,23))
-        │       └── body: (length: 1)
-        │           └── @ LambdaNode (location: (25,9)-(25,23))
-        │               ├── locals: [:b]
-        │               ├── operator_loc: (25,9)-(25,11) = "->"
-        │               ├── opening_loc: (25,14)-(25,15) = "{"
-        │               ├── closing_loc: (25,22)-(25,23) = "}"
-        │               ├── parameters:
-        │               │   @ BlockParametersNode (location: (25,12)-(25,13))
-        │               │   ├── parameters:
-        │               │   │   @ ParametersNode (location: (25,12)-(25,13))
-        │               │   │   ├── requireds: (length: 1)
-        │               │   │   │   └── @ RequiredParameterNode (location: (25,12)-(25,13))
-        │               │   │   │       ├── flags: ∅
-        │               │   │   │       └── name: :b
-        │               │   │   ├── optionals: (length: 0)
-        │               │   │   ├── rest: ∅
-        │               │   │   ├── posts: (length: 0)
-        │               │   │   ├── keywords: (length: 0)
-        │               │   │   ├── keyword_rest: ∅
-        │               │   │   └── block: ∅
-        │               │   ├── locals: (length: 0)
-        │               │   ├── opening_loc: ∅
-        │               │   └── closing_loc: ∅
-        │               └── body:
-        │                   @ StatementsNode (location: (25,16)-(25,21))
-        │                   └── body: (length: 1)
-        │                       └── @ CallNode (location: (25,16)-(25,21))
-        │                           ├── flags: ∅
-        │                           ├── receiver:
-        │                           │   @ LocalVariableReadNode (location: (25,16)-(25,17))
-        │                           │   ├── name: :a
-        │                           │   └── depth: 1
-        │                           ├── call_operator_loc: ∅
-        │                           ├── name: :*
-        │                           ├── message_loc: (25,18)-(25,19) = "*"
-        │                           ├── opening_loc: ∅
-        │                           ├── arguments:
-        │                           │   @ ArgumentsNode (location: (25,20)-(25,21))
-        │                           │   ├── flags: ∅
-        │                           │   └── arguments: (length: 1)
-        │                           │       └── @ LocalVariableReadNode (location: (25,20)-(25,21))
-        │                           │           ├── name: :b
-        │                           │           └── depth: 0
-        │                           ├── closing_loc: ∅
-        │                           └── block: ∅
-        └── @ LambdaNode (location: (27,0)-(27,19))
-            ├── locals: [:a, :b, :c]
-            ├── operator_loc: (27,0)-(27,2) = "->"
-            ├── opening_loc: (27,16)-(27,17) = "{"
-            ├── closing_loc: (27,18)-(27,19) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (27,3)-(27,15))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (27,4)-(27,14))
-            │   │   ├── requireds: (length: 1)
-            │   │   │   └── @ MultiTargetNode (location: (27,4)-(27,10))
-            │   │   │       ├── lefts: (length: 2)
-            │   │   │       │   ├── @ RequiredParameterNode (location: (27,5)-(27,6))
-            │   │   │       │   │   ├── flags: ∅
-            │   │   │       │   │   └── name: :a
-            │   │   │       │   └── @ RequiredParameterNode (location: (27,8)-(27,9))
-            │   │   │       │       ├── flags: ∅
-            │   │   │       │       └── name: :b
-            │   │   │       ├── rest: ∅
-            │   │   │       ├── rights: (length: 0)
-            │   │   │       ├── lparen_loc: (27,4)-(27,5) = "("
-            │   │   │       └── rparen_loc: (27,9)-(27,10) = ")"
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest:
-            │   │   │   @ RestParameterNode (location: (27,12)-(27,14))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── name: :c
-            │   │   │   ├── name_loc: (27,13)-(27,14) = "c"
-            │   │   │   └── operator_loc: (27,12)-(27,13) = "*"
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: (27,3)-(27,4) = "("
-            │   └── closing_loc: (27,14)-(27,15) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/range_begin_open_exclusive.txt b/test/mri/prism/snapshots/range_begin_open_exclusive.txt
deleted file mode 100644
index a630b01ef19..00000000000
--- a/test/mri/prism/snapshots/range_begin_open_exclusive.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ RangeNode (location: (1,0)-(1,4))
-            ├── flags: exclude_end
-            ├── left: ∅
-            ├── right:
-            │   @ IntegerNode (location: (1,3)-(1,4))
-            │   ├── flags: decimal
-            │   └── value: 2
-            └── operator_loc: (1,0)-(1,3) = "..."
diff --git a/test/mri/prism/snapshots/range_begin_open_inclusive.txt b/test/mri/prism/snapshots/range_begin_open_inclusive.txt
deleted file mode 100644
index dc8ef0d2dbc..00000000000
--- a/test/mri/prism/snapshots/range_begin_open_inclusive.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ RangeNode (location: (1,0)-(1,3))
-            ├── flags: ∅
-            ├── left: ∅
-            ├── right:
-            │   @ IntegerNode (location: (1,2)-(1,3))
-            │   ├── flags: decimal
-            │   └── value: 2
-            └── operator_loc: (1,0)-(1,2) = ".."
diff --git a/test/mri/prism/snapshots/range_beginless.txt b/test/mri/prism/snapshots/range_beginless.txt
deleted file mode 100644
index 800f087dc10..00000000000
--- a/test/mri/prism/snapshots/range_beginless.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,18))
-├── flags: ∅
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,18))
-    ├── flags: ∅
-    └── body: (length: 3)
-        ├── @ DefNode (location: (1,0)-(1,21))
-        │   ├── flags: newline
-        │   ├── name: :f
-        │   ├── name_loc: (1,4)-(1,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,6)-(1,15))
-        │   │   ├── flags: ∅
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (1,6)-(1,15))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :x
-        │   │   │       ├── name_loc: (1,6)-(1,7) = "x"
-        │   │   │       ├── operator_loc: (1,8)-(1,9) = "="
-        │   │   │       └── value:
-        │   │   │           @ RangeNode (location: (1,10)-(1,15))
-        │   │   │           ├── flags: exclude_end
-        │   │   │           ├── left: ∅
-        │   │   │           ├── right:
-        │   │   │           │   @ StringNode (location: (1,13)-(1,15))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   ├── opening_loc: (1,13)-(1,14) = "?"
-        │   │   │           │   ├── content_loc: (1,14)-(1,15) = "a"
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── unescaped: "a"
-        │   │   │           └── operator_loc: (1,10)-(1,13) = "..."
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,5)-(1,6) = "("
-        │   ├── rparen_loc: (1,15)-(1,16) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,18)-(1,21) = "end"
-        ├── @ DefNode (location: (3,0)-(3,20))
-        │   ├── flags: newline
-        │   ├── name: :f
-        │   ├── name_loc: (3,4)-(3,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (3,6)-(3,14))
-        │   │   ├── flags: ∅
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (3,6)-(3,14))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :x
-        │   │   │       ├── name_loc: (3,6)-(3,8) = "x:"
-        │   │   │       └── value:
-        │   │   │           @ RangeNode (location: (3,9)-(3,14))
-        │   │   │           ├── flags: exclude_end
-        │   │   │           ├── left: ∅
-        │   │   │           ├── right:
-        │   │   │           │   @ StringNode (location: (3,12)-(3,14))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   ├── opening_loc: (3,12)-(3,13) = "?"
-        │   │   │           │   ├── content_loc: (3,13)-(3,14) = "a"
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── unescaped: "a"
-        │   │   │           └── operator_loc: (3,9)-(3,12) = "..."
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (3,5)-(3,6) = "("
-        │   ├── rparen_loc: (3,14)-(3,15) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,17)-(3,20) = "end"
-        └── @ DefNode (location: (5,0)-(5,18))
-            ├── flags: newline
-            ├── name: :f
-            ├── name_loc: (5,4)-(5,5) = "f"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (5,8)-(5,13))
-            │   ├── flags: ∅
-            │   └── body: (length: 1)
-            │       └── @ RangeNode (location: (5,8)-(5,13))
-            │           ├── flags: newline, exclude_end
-            │           ├── left: ∅
-            │           ├── right:
-            │           │   @ SymbolNode (location: (5,11)-(5,13))
-            │           │   ├── flags: static_literal, forced_us_ascii_encoding
-            │           │   ├── opening_loc: (5,11)-(5,12) = ":"
-            │           │   ├── value_loc: (5,12)-(5,13) = "a"
-            │           │   ├── closing_loc: ∅
-            │           │   └── unescaped: "a"
-            │           └── operator_loc: (5,8)-(5,11) = "..."
-            ├── locals: []
-            ├── def_keyword_loc: (5,0)-(5,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (5,5)-(5,6) = "("
-            ├── rparen_loc: (5,6)-(5,7) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (5,15)-(5,18) = "end"
diff --git a/test/mri/prism/snapshots/range_end_open_exclusive.txt b/test/mri/prism/snapshots/range_end_open_exclusive.txt
deleted file mode 100644
index 17a75f89456..00000000000
--- a/test/mri/prism/snapshots/range_end_open_exclusive.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ RangeNode (location: (1,0)-(1,4))
-            ├── flags: exclude_end
-            ├── left:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 2
-            ├── right: ∅
-            └── operator_loc: (1,1)-(1,4) = "..."
diff --git a/test/mri/prism/snapshots/range_end_open_inclusive.txt b/test/mri/prism/snapshots/range_end_open_inclusive.txt
deleted file mode 100644
index b49272d8cd1..00000000000
--- a/test/mri/prism/snapshots/range_end_open_inclusive.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ RangeNode (location: (1,0)-(1,3))
-            ├── flags: ∅
-            ├── left:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 2
-            ├── right: ∅
-            └── operator_loc: (1,1)-(1,3) = ".."
diff --git a/test/mri/prism/snapshots/ranges.txt b/test/mri/prism/snapshots/ranges.txt
deleted file mode 100644
index 2fffe805376..00000000000
--- a/test/mri/prism/snapshots/ranges.txt
+++ /dev/null
@@ -1,533 +0,0 @@
-@ ProgramNode (location: (1,0)-(49,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(49,7))
-    └── body: (length: 25)
-        ├── @ ParenthesesNode (location: (1,0)-(1,6))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,1)-(1,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RangeNode (location: (1,1)-(1,5))
-        │   │           ├── flags: exclude_end
-        │   │           ├── left: ∅
-        │   │           ├── right:
-        │   │           │   @ IntegerNode (location: (1,4)-(1,5))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 2
-        │   │           └── operator_loc: (1,1)-(1,4) = "..."
-        │   ├── opening_loc: (1,0)-(1,1) = "("
-        │   └── closing_loc: (1,5)-(1,6) = ")"
-        ├── @ ParenthesesNode (location: (3,0)-(3,5))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,1)-(3,4))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RangeNode (location: (3,1)-(3,4))
-        │   │           ├── flags: ∅
-        │   │           ├── left: ∅
-        │   │           ├── right:
-        │   │           │   @ IntegerNode (location: (3,3)-(3,4))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 2
-        │   │           └── operator_loc: (3,1)-(3,3) = ".."
-        │   ├── opening_loc: (3,0)-(3,1) = "("
-        │   └── closing_loc: (3,4)-(3,5) = ")"
-        ├── @ RangeNode (location: (5,0)-(5,5))
-        │   ├── flags: exclude_end
-        │   ├── left:
-        │   │   @ IntegerNode (location: (5,0)-(5,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ IntegerNode (location: (5,4)-(5,5))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   └── operator_loc: (5,1)-(5,4) = "..."
-        ├── @ CallNode (location: (7,0)-(7,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (7,0)-(7,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (7,0)-(7,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (7,3)-(7,9) = "[...2]"
-        │   ├── opening_loc: (7,3)-(7,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,4)-(7,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ RangeNode (location: (7,4)-(7,8))
-        │   │           ├── flags: exclude_end
-        │   │           ├── left: ∅
-        │   │           ├── right:
-        │   │           │   @ IntegerNode (location: (7,7)-(7,8))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 2
-        │   │           └── operator_loc: (7,4)-(7,7) = "..."
-        │   ├── closing_loc: (7,8)-(7,9) = "]"
-        │   └── block: ∅
-        ├── @ HashNode (location: (9,0)-(9,15))
-        │   ├── opening_loc: (9,0)-(9,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (9,2)-(9,13))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (9,2)-(9,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (9,2)-(9,5) = "foo"
-        │   │       │   ├── closing_loc: (9,5)-(9,6) = ":"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── value:
-        │   │       │   @ RangeNode (location: (9,7)-(9,13))
-        │   │       │   ├── flags: exclude_end
-        │   │       │   ├── left: ∅
-        │   │       │   ├── right:
-        │   │       │   │   @ CallNode (location: (9,10)-(9,13))
-        │   │       │   │   ├── flags: variable_call, ignore_visibility
-        │   │       │   │   ├── receiver: ∅
-        │   │       │   │   ├── call_operator_loc: ∅
-        │   │       │   │   ├── name: :bar
-        │   │       │   │   ├── message_loc: (9,10)-(9,13) = "bar"
-        │   │       │   │   ├── opening_loc: ∅
-        │   │       │   │   ├── arguments: ∅
-        │   │       │   │   ├── closing_loc: ∅
-        │   │       │   │   └── block: ∅
-        │   │       │   └── operator_loc: (9,7)-(9,10) = "..."
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (9,14)-(9,15) = "}"
-        ├── @ ParenthesesNode (location: (11,0)-(11,6))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (11,1)-(11,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RangeNode (location: (11,1)-(11,5))
-        │   │           ├── flags: exclude_end
-        │   │           ├── left:
-        │   │           │   @ IntegerNode (location: (11,1)-(11,2))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           ├── right: ∅
-        │   │           └── operator_loc: (11,2)-(11,5) = "..."
-        │   ├── opening_loc: (11,0)-(11,1) = "("
-        │   └── closing_loc: (11,5)-(11,6) = ")"
-        ├── @ RangeNode (location: (13,0)-(13,4))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ IntegerNode (location: (13,0)-(13,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ IntegerNode (location: (13,3)-(13,4))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   └── operator_loc: (13,1)-(13,3) = ".."
-        ├── @ HashNode (location: (15,0)-(15,14))
-        │   ├── opening_loc: (15,0)-(15,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (15,2)-(15,12))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (15,2)-(15,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (15,2)-(15,5) = "foo"
-        │   │       │   ├── closing_loc: (15,5)-(15,6) = ":"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── value:
-        │   │       │   @ RangeNode (location: (15,7)-(15,12))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── left: ∅
-        │   │       │   ├── right:
-        │   │       │   │   @ CallNode (location: (15,9)-(15,12))
-        │   │       │   │   ├── flags: variable_call, ignore_visibility
-        │   │       │   │   ├── receiver: ∅
-        │   │       │   │   ├── call_operator_loc: ∅
-        │   │       │   │   ├── name: :bar
-        │   │       │   │   ├── message_loc: (15,9)-(15,12) = "bar"
-        │   │       │   │   ├── opening_loc: ∅
-        │   │       │   │   ├── arguments: ∅
-        │   │       │   │   ├── closing_loc: ∅
-        │   │       │   │   └── block: ∅
-        │   │       │   └── operator_loc: (15,7)-(15,9) = ".."
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (15,13)-(15,14) = "}"
-        ├── @ ParenthesesNode (location: (17,0)-(17,5))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (17,1)-(17,4))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RangeNode (location: (17,1)-(17,4))
-        │   │           ├── flags: ∅
-        │   │           ├── left:
-        │   │           │   @ IntegerNode (location: (17,1)-(17,2))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           ├── right: ∅
-        │   │           └── operator_loc: (17,2)-(17,4) = ".."
-        │   ├── opening_loc: (17,0)-(17,1) = "("
-        │   └── closing_loc: (17,4)-(17,5) = ")"
-        ├── @ RangeNode (location: (19,0)-(19,8))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ IntegerNode (location: (19,0)-(19,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ RangeNode (location: (19,5)-(19,8))
-        │   │   ├── flags: ∅
-        │   │   ├── left: ∅
-        │   │   ├── right:
-        │   │   │   @ IntegerNode (location: (19,7)-(19,8))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── operator_loc: (19,5)-(19,7) = ".."
-        │   └── operator_loc: (19,2)-(19,4) = ".."
-        ├── @ AndNode (location: (21,0)-(21,8))
-        │   ├── left:
-        │   │   @ RangeNode (location: (21,0)-(21,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (21,0)-(21,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (21,1)-(21,3) = ".."
-        │   ├── right:
-        │   │   @ IntegerNode (location: (21,7)-(21,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   └── operator_loc: (21,4)-(21,6) = "&&"
-        ├── @ CallNode (location: (23,0)-(23,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (23,0)-(23,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (23,0)-(23,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (23,1)-(23,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :==
-        │   ├── message_loc: (23,4)-(23,6) = "=="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (23,7)-(23,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (23,7)-(23,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (25,0)-(25,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (25,0)-(25,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (25,0)-(25,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (25,1)-(25,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!=
-        │   ├── message_loc: (25,4)-(25,6) = "!="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (25,7)-(25,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (25,7)-(25,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (27,0)-(27,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (27,0)-(27,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (27,0)-(27,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (27,1)-(27,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :===
-        │   ├── message_loc: (27,4)-(27,7) = "==="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (27,8)-(27,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (27,8)-(27,9))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (29,0)-(29,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (29,0)-(29,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (29,0)-(29,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (29,1)-(29,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<=>
-        │   ├── message_loc: (29,4)-(29,7) = "<=>"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (29,8)-(29,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (29,8)-(29,9))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (31,0)-(31,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (31,0)-(31,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (31,0)-(31,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (31,1)-(31,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :=~
-        │   ├── message_loc: (31,4)-(31,6) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,7)-(31,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (31,7)-(31,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (33,0)-(33,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (33,0)-(33,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (33,0)-(33,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (33,1)-(33,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!~
-        │   ├── message_loc: (33,4)-(33,6) = "!~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (33,7)-(33,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (33,7)-(33,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (35,0)-(35,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (35,0)-(35,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (35,0)-(35,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (35,1)-(35,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<
-        │   ├── message_loc: (35,4)-(35,5) = "<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (35,6)-(35,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (35,6)-(35,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (37,0)-(37,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (37,0)-(37,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (37,0)-(37,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (37,1)-(37,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>
-        │   ├── message_loc: (37,4)-(37,5) = ">"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (37,6)-(37,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (37,6)-(37,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (39,0)-(39,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (39,0)-(39,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (39,0)-(39,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (39,1)-(39,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<=
-        │   ├── message_loc: (39,4)-(39,6) = "<="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (39,7)-(39,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (39,7)-(39,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (41,0)-(41,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (41,0)-(41,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (41,0)-(41,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (41,1)-(41,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>=
-        │   ├── message_loc: (41,4)-(41,6) = ">="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (41,7)-(41,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (41,7)-(41,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (43,0)-(43,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (43,0)-(43,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (43,0)-(43,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (43,1)-(43,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<<
-        │   ├── message_loc: (43,4)-(43,6) = "<<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (43,7)-(43,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (43,7)-(43,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (45,0)-(45,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RangeNode (location: (45,0)-(45,3))
-        │   │   ├── flags: ∅
-        │   │   ├── left:
-        │   │   │   @ IntegerNode (location: (45,0)-(45,1))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── right: ∅
-        │   │   └── operator_loc: (45,1)-(45,3) = ".."
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>>
-        │   ├── message_loc: (45,4)-(45,6) = ">>"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (45,7)-(45,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (45,7)-(45,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ RangeNode (location: (47,0)-(47,7))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ IntegerNode (location: (47,0)-(47,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ CallNode (location: (47,4)-(47,7))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (47,6)-(47,7))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :+@
-        │   │   ├── message_loc: (47,4)-(47,5) = "+"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (47,1)-(47,3) = ".."
-        └── @ RangeNode (location: (49,0)-(49,7))
-            ├── flags: ∅
-            ├── left:
-            │   @ IntegerNode (location: (49,0)-(49,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── right:
-            │   @ CallNode (location: (49,4)-(49,7))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ IntegerNode (location: (49,6)-(49,7))
-            │   │   ├── flags: decimal
-            │   │   └── value: 2
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :-@
-            │   ├── message_loc: (49,4)-(49,5) = "-"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── operator_loc: (49,1)-(49,3) = ".."
diff --git a/test/mri/prism/snapshots/regex.txt b/test/mri/prism/snapshots/regex.txt
deleted file mode 100644
index 9e19bbb18d2..00000000000
--- a/test/mri/prism/snapshots/regex.txt
+++ /dev/null
@@ -1,371 +0,0 @@
-@ ProgramNode (location: (1,0)-(40,24))
-├── locals: [:foo, :ab, :abc, :a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(40,24))
-    └── body: (length: 21)
-        ├── @ CallNode (location: (1,0)-(1,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ RegularExpressionNode (location: (1,4)-(1,9))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (1,4)-(1,5) = "/"
-        │   │           ├── content_loc: (1,5)-(1,8) = "bar"
-        │   │           ├── closing_loc: (1,8)-(1,9) = "/"
-        │   │           └── unescaped: "bar"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ RegularExpressionNode (location: (3,0)-(3,8))
-        │   ├── flags: ignore_case, forced_us_ascii_encoding
-        │   ├── opening_loc: (3,0)-(3,3) = "%r{"
-        │   ├── content_loc: (3,3)-(3,6) = "abc"
-        │   ├── closing_loc: (3,6)-(3,8) = "}i"
-        │   └── unescaped: "abc"
-        ├── @ RegularExpressionNode (location: (5,0)-(5,5))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (5,0)-(5,1) = "/"
-        │   ├── content_loc: (5,1)-(5,4) = "a\\b"
-        │   ├── closing_loc: (5,4)-(5,5) = "/"
-        │   └── unescaped: "a\\b"
-        ├── @ InterpolatedRegularExpressionNode (location: (7,0)-(7,11))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (7,0)-(7,1) = "/"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (7,1)-(7,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (7,1)-(7,5) = "aaa "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "aaa "
-        │   │   └── @ EmbeddedVariableNode (location: (7,5)-(7,10))
-        │   │       ├── operator_loc: (7,5)-(7,6) = "#"
-        │   │       └── variable:
-        │   │           @ GlobalVariableReadNode (location: (7,6)-(7,10))
-        │   │           └── name: :$bbb
-        │   └── closing_loc: (7,10)-(7,11) = "/"
-        ├── @ InterpolatedRegularExpressionNode (location: (9,0)-(9,16))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (9,0)-(9,1) = "/"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (9,1)-(9,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (9,1)-(9,5) = "aaa "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "aaa "
-        │   │   ├── @ EmbeddedStatementsNode (location: (9,5)-(9,11))
-        │   │   │   ├── opening_loc: (9,5)-(9,7) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (9,7)-(9,10))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (9,7)-(9,10))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bbb
-        │   │   │   │           ├── message_loc: (9,7)-(9,10) = "bbb"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (9,10)-(9,11) = "}"
-        │   │   └── @ StringNode (location: (9,11)-(9,15))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (9,11)-(9,15) = " ccc"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: " ccc"
-        │   └── closing_loc: (9,15)-(9,16) = "/"
-        ├── @ ArrayNode (location: (11,0)-(11,27))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ MatchWriteNode (location: (11,1)-(11,21))
-        │   │   │   ├── call:
-        │   │   │   │   @ CallNode (location: (11,1)-(11,21))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── receiver:
-        │   │   │   │   │   @ RegularExpressionNode (location: (11,1)-(11,14))
-        │   │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   │   ├── opening_loc: (11,1)-(11,2) = "/"
-        │   │   │   │   │   ├── content_loc: (11,2)-(11,13) = "(?<foo>bar)"
-        │   │   │   │   │   ├── closing_loc: (11,13)-(11,14) = "/"
-        │   │   │   │   │   └── unescaped: "(?<foo>bar)"
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :=~
-        │   │   │   │   ├── message_loc: (11,15)-(11,17) = "=~"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments:
-        │   │   │   │   │   @ ArgumentsNode (location: (11,18)-(11,21))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │   │       └── @ CallNode (location: (11,18)-(11,21))
-        │   │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │   │           ├── receiver: ∅
-        │   │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │   │           ├── name: :baz
-        │   │   │   │   │           ├── message_loc: (11,18)-(11,21) = "baz"
-        │   │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │   │           ├── arguments: ∅
-        │   │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │   │           └── block: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── targets: (length: 1)
-        │   │   │       └── @ LocalVariableTargetNode (location: (11,5)-(11,8))
-        │   │   │           ├── name: :foo
-        │   │   │           └── depth: 0
-        │   │   └── @ LocalVariableReadNode (location: (11,23)-(11,26))
-        │   │       ├── name: :foo
-        │   │       └── depth: 0
-        │   ├── opening_loc: (11,0)-(11,1) = "["
-        │   └── closing_loc: (11,26)-(11,27) = "]"
-        ├── @ RegularExpressionNode (location: (13,0)-(13,6))
-        │   ├── flags: ignore_case, forced_us_ascii_encoding
-        │   ├── opening_loc: (13,0)-(13,1) = "/"
-        │   ├── content_loc: (13,1)-(13,4) = "abc"
-        │   ├── closing_loc: (13,4)-(13,6) = "/i"
-        │   └── unescaped: "abc"
-        ├── @ RegularExpressionNode (location: (15,0)-(15,26))
-        │   ├── flags: ignore_case, forced_us_ascii_encoding
-        │   ├── opening_loc: (15,0)-(15,3) = "%r/"
-        │   ├── content_loc: (15,3)-(15,24) = "[a-z$._?][\\w$.?\#@~]*:"
-        │   ├── closing_loc: (15,24)-(15,26) = "/i"
-        │   └── unescaped: "[a-z$._?][\\w$.?\#@~]*:"
-        ├── @ RegularExpressionNode (location: (17,0)-(17,37))
-        │   ├── flags: ignore_case, forced_us_ascii_encoding
-        │   ├── opening_loc: (17,0)-(17,3) = "%r/"
-        │   ├── content_loc: (17,3)-(17,35) = "([a-z$._?][\\w$.?\#@~]*)(\\s+)(equ)"
-        │   ├── closing_loc: (17,35)-(17,37) = "/i"
-        │   └── unescaped: "([a-z$._?][\\w$.?\#@~]*)(\\s+)(equ)"
-        ├── @ RegularExpressionNode (location: (19,0)-(19,25))
-        │   ├── flags: ignore_case, forced_us_ascii_encoding
-        │   ├── opening_loc: (19,0)-(19,3) = "%r/"
-        │   ├── content_loc: (19,3)-(19,23) = "[a-z$._?][\\w$.?\#@~]*"
-        │   ├── closing_loc: (19,23)-(19,25) = "/i"
-        │   └── unescaped: "[a-z$._?][\\w$.?\#@~]*"
-        ├── @ RegularExpressionNode (location: (21,0)-(24,1))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (21,0)-(21,3) = "%r("
-        │   ├── content_loc: (21,3)-(24,0) = "\n(?:[\\w\#$%_']|\\(\\)|\\(,\\)|\\[\\]|[0-9])*\n  (?:[\\w\#$%_']+)\n"
-        │   ├── closing_loc: (24,0)-(24,1) = ")"
-        │   └── unescaped: "\n(?:[\\w\#$%_']|\\(\\)|\\(,\\)|\\[\\]|[0-9])*\n  (?:[\\w\#$%_']+)\n"
-        ├── @ CallNode (location: (26,0)-(26,16))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RegularExpressionNode (location: (26,0)-(26,8))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (26,0)-(26,1) = "/"
-        │   │   ├── content_loc: (26,1)-(26,7) = "(?#\\))"
-        │   │   ├── closing_loc: (26,7)-(26,8) = "/"
-        │   │   └── unescaped: "(?#\\))"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :=~
-        │   ├── message_loc: (26,9)-(26,11) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (26,12)-(26,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (26,12)-(26,16))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (26,12)-(26,13) = "\""
-        │   │           ├── content_loc: (26,13)-(26,15) = "hi"
-        │   │           ├── closing_loc: (26,15)-(26,16) = "\""
-        │   │           └── unescaped: "hi"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ RegularExpressionNode (location: (28,0)-(28,9))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (28,0)-(28,3) = "%r#"
-        │   ├── content_loc: (28,3)-(28,8) = "pound"
-        │   ├── closing_loc: (28,8)-(28,9) = "#"
-        │   └── unescaped: "pound"
-        ├── @ InterpolatedRegularExpressionNode (location: (30,0)-(30,13))
-        │   ├── flags: once
-        │   ├── opening_loc: (30,0)-(30,1) = "/"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (30,1)-(30,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (30,1)-(30,5) = "aaa "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "aaa "
-        │   │   └── @ EmbeddedStatementsNode (location: (30,5)-(30,11))
-        │   │       ├── opening_loc: (30,5)-(30,7) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (30,7)-(30,10))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (30,7)-(30,10))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :bbb
-        │   │       │           ├── message_loc: (30,7)-(30,10) = "bbb"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       └── closing_loc: (30,10)-(30,11) = "}"
-        │   └── closing_loc: (30,11)-(30,13) = "/o"
-        ├── @ MatchWriteNode (location: (32,0)-(33,10))
-        │   ├── call:
-        │   │   @ CallNode (location: (32,0)-(33,10))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ RegularExpressionNode (location: (32,0)-(33,4))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (32,0)-(32,1) = "/"
-        │   │   │   ├── content_loc: (32,1)-(33,3) = "(?<a\\\nb>)"
-        │   │   │   ├── closing_loc: (33,3)-(33,4) = "/"
-        │   │   │   └── unescaped: "(?<ab>)"
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :=~
-        │   │   ├── message_loc: (33,5)-(33,7) = "=~"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (33,8)-(33,10))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ StringNode (location: (33,8)-(33,10))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (33,8)-(33,9) = "\""
-        │   │   │           ├── content_loc: (33,9)-(33,9) = ""
-        │   │   │           ├── closing_loc: (33,9)-(33,10) = "\""
-        │   │   │           └── unescaped: ""
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── targets: (length: 1)
-        │       └── @ LocalVariableTargetNode (location: (32,0)-(33,4))
-        │           ├── name: :ab
-        │           └── depth: 0
-        ├── @ LocalVariableReadNode (location: (33,12)-(33,14))
-        │   ├── name: :ab
-        │   └── depth: 0
-        ├── @ MatchWriteNode (location: (35,0)-(35,24))
-        │   ├── call:
-        │   │   @ CallNode (location: (35,0)-(35,24))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ RegularExpressionNode (location: (35,0)-(35,18))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (35,0)-(35,1) = "/"
-        │   │   │   ├── content_loc: (35,1)-(35,17) = "(?<abc>)(?<abc>)"
-        │   │   │   ├── closing_loc: (35,17)-(35,18) = "/"
-        │   │   │   └── unescaped: "(?<abc>)(?<abc>)"
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :=~
-        │   │   ├── message_loc: (35,19)-(35,21) = "=~"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (35,22)-(35,24))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ StringNode (location: (35,22)-(35,24))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (35,22)-(35,23) = "\""
-        │   │   │           ├── content_loc: (35,23)-(35,23) = ""
-        │   │   │           ├── closing_loc: (35,23)-(35,24) = "\""
-        │   │   │           └── unescaped: ""
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── targets: (length: 1)
-        │       └── @ LocalVariableTargetNode (location: (35,4)-(35,7))
-        │           ├── name: :abc
-        │           └── depth: 0
-        ├── @ LocalVariableReadNode (location: (35,26)-(35,29))
-        │   ├── name: :abc
-        │   └── depth: 0
-        ├── @ CallNode (location: (37,0)-(37,16))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RegularExpressionNode (location: (37,0)-(37,10))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (37,0)-(37,1) = "/"
-        │   │   ├── content_loc: (37,1)-(37,9) = "(?<a b>)"
-        │   │   ├── closing_loc: (37,9)-(37,10) = "/"
-        │   │   └── unescaped: "(?<a b>)"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :=~
-        │   ├── message_loc: (37,11)-(37,13) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (37,14)-(37,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (37,14)-(37,16))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (37,14)-(37,15) = "\""
-        │   │           ├── content_loc: (37,15)-(37,15) = ""
-        │   │           ├── closing_loc: (37,15)-(37,16) = "\""
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ LocalVariableWriteNode (location: (39,0)-(39,5))
-        │   ├── name: :a
-        │   ├── depth: 0
-        │   ├── name_loc: (39,0)-(39,1) = "a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (39,4)-(39,5))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (39,2)-(39,3) = "="
-        └── @ CallNode (location: (40,0)-(40,24))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :tap
-            ├── message_loc: (40,0)-(40,3) = "tap"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (40,4)-(40,24))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (40,6)-(40,22))
-                │   └── body: (length: 1)
-                │       └── @ MatchWriteNode (location: (40,6)-(40,22))
-                │           ├── call:
-                │           │   @ CallNode (location: (40,6)-(40,22))
-                │           │   ├── flags: ∅
-                │           │   ├── receiver:
-                │           │   │   @ RegularExpressionNode (location: (40,6)-(40,14))
-                │           │   │   ├── flags: forced_us_ascii_encoding
-                │           │   │   ├── opening_loc: (40,6)-(40,7) = "/"
-                │           │   │   ├── content_loc: (40,7)-(40,13) = "(?<a>)"
-                │           │   │   ├── closing_loc: (40,13)-(40,14) = "/"
-                │           │   │   └── unescaped: "(?<a>)"
-                │           │   ├── call_operator_loc: ∅
-                │           │   ├── name: :=~
-                │           │   ├── message_loc: (40,15)-(40,17) = "=~"
-                │           │   ├── opening_loc: ∅
-                │           │   ├── arguments:
-                │           │   │   @ ArgumentsNode (location: (40,18)-(40,22))
-                │           │   │   ├── flags: ∅
-                │           │   │   └── arguments: (length: 1)
-                │           │   │       └── @ CallNode (location: (40,18)-(40,22))
-                │           │   │           ├── flags: variable_call, ignore_visibility
-                │           │   │           ├── receiver: ∅
-                │           │   │           ├── call_operator_loc: ∅
-                │           │   │           ├── name: :to_s
-                │           │   │           ├── message_loc: (40,18)-(40,22) = "to_s"
-                │           │   │           ├── opening_loc: ∅
-                │           │   │           ├── arguments: ∅
-                │           │   │           ├── closing_loc: ∅
-                │           │   │           └── block: ∅
-                │           │   ├── closing_loc: ∅
-                │           │   └── block: ∅
-                │           └── targets: (length: 1)
-                │               └── @ LocalVariableTargetNode (location: (40,10)-(40,11))
-                │                   ├── name: :a
-                │                   └── depth: 1
-                ├── opening_loc: (40,4)-(40,5) = "{"
-                └── closing_loc: (40,23)-(40,24) = "}"
diff --git a/test/mri/prism/snapshots/regex_char_width.txt b/test/mri/prism/snapshots/regex_char_width.txt
deleted file mode 100644
index 6bf2169b2f3..00000000000
--- a/test/mri/prism/snapshots/regex_char_width.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (2,0)-(3,6))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (2,0)-(3,6))
-    └── body: (length: 2)
-        ├── @ MatchWriteNode (location: (2,0)-(2,36))
-        │   ├── call:
-        │   │   @ CallNode (location: (2,0)-(2,36))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ RegularExpressionNode (location: (2,0)-(2,22))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (2,0)-(2,1) = "/"
-        │   │   │   ├── content_loc: (2,1)-(2,21) = "\x{E285}\xA7(?<a>.)\x{E285}\xA9(?<b>.)"
-        │   │   │   ├── closing_loc: (2,21)-(2,22) = "/"
-        │   │   │   └── unescaped: "\x{E285}\xA7(?<a>.)\x{E285}\xA9(?<b>.)"
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :=~
-        │   │   ├── message_loc: (2,23)-(2,25) = "=~"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (2,26)-(2,36))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ StringNode (location: (2,26)-(2,36))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (2,26)-(2,27) = "'"
-        │   │   │           ├── content_loc: (2,27)-(2,35) = "\x{E285}\xA7a\x{E285}\xA9b"
-        │   │   │           ├── closing_loc: (2,35)-(2,36) = "'"
-        │   │   │           └── unescaped: "\x{E285}\xA7a\x{E285}\xA9b"
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── targets: (length: 2)
-        │       ├── @ LocalVariableTargetNode (location: (2,7)-(2,8))
-        │       │   ├── name: :a
-        │       │   └── depth: 0
-        │       └── @ LocalVariableTargetNode (location: (2,17)-(2,18))
-        │           ├── name: :b
-        │           └── depth: 0
-        └── @ ArrayNode (location: (3,0)-(3,6))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ LocalVariableReadNode (location: (3,1)-(3,2))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ LocalVariableReadNode (location: (3,4)-(3,5))
-            │       ├── name: :b
-            │       └── depth: 0
-            ├── opening_loc: (3,0)-(3,1) = "["
-            └── closing_loc: (3,5)-(3,6) = "]"
diff --git a/test/mri/prism/snapshots/repeat_parameters.txt b/test/mri/prism/snapshots/repeat_parameters.txt
deleted file mode 100644
index fd98294ce61..00000000000
--- a/test/mri/prism/snapshots/repeat_parameters.txt
+++ /dev/null
@@ -1,473 +0,0 @@
-@ ProgramNode (location: (1,0)-(38,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(38,3))
-    └── body: (length: 13)
-        ├── @ DefNode (location: (1,0)-(2,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,8)-(1,12))
-        │   │   ├── requireds: (length: 2)
-        │   │   │   ├── @ RequiredParameterNode (location: (1,8)-(1,9))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :a
-        │   │   │   └── @ RequiredParameterNode (location: (1,11)-(1,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :_
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :_]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,7)-(1,8) = "("
-        │   ├── rparen_loc: (1,12)-(1,13) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (2,0)-(2,3) = "end"
-        ├── @ DefNode (location: (4,0)-(5,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (4,4)-(4,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (4,8)-(4,15))
-        │   │   ├── requireds: (length: 3)
-        │   │   │   ├── @ RequiredParameterNode (location: (4,8)-(4,9))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :a
-        │   │   │   ├── @ RequiredParameterNode (location: (4,11)-(4,12))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :_
-        │   │   │   └── @ RequiredParameterNode (location: (4,14)-(4,15))
-        │   │   │       ├── flags: repeated_parameter
-        │   │   │       └── name: :_
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :_]
-        │   ├── def_keyword_loc: (4,0)-(4,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (4,7)-(4,8) = "("
-        │   ├── rparen_loc: (4,15)-(4,16) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ DefNode (location: (7,0)-(8,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (7,4)-(7,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (7,8)-(7,19))
-        │   │   ├── requireds: (length: 4)
-        │   │   │   ├── @ RequiredParameterNode (location: (7,8)-(7,9))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :a
-        │   │   │   ├── @ RequiredParameterNode (location: (7,11)-(7,12))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :_
-        │   │   │   ├── @ RequiredParameterNode (location: (7,14)-(7,15))
-        │   │   │   │   ├── flags: repeated_parameter
-        │   │   │   │   └── name: :_
-        │   │   │   └── @ RequiredParameterNode (location: (7,17)-(7,19))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :_b
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :_, :_b]
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (7,7)-(7,8) = "("
-        │   ├── rparen_loc: (7,19)-(7,20) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (8,0)-(8,3) = "end"
-        ├── @ DefNode (location: (10,0)-(11,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (10,4)-(10,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (10,8)-(10,23))
-        │   │   ├── requireds: (length: 5)
-        │   │   │   ├── @ RequiredParameterNode (location: (10,8)-(10,9))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :a
-        │   │   │   ├── @ RequiredParameterNode (location: (10,11)-(10,12))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :_
-        │   │   │   ├── @ RequiredParameterNode (location: (10,14)-(10,15))
-        │   │   │   │   ├── flags: repeated_parameter
-        │   │   │   │   └── name: :_
-        │   │   │   ├── @ RequiredParameterNode (location: (10,17)-(10,19))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :_b
-        │   │   │   └── @ RequiredParameterNode (location: (10,21)-(10,23))
-        │   │   │       ├── flags: repeated_parameter
-        │   │   │       └── name: :_b
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :_, :_b]
-        │   ├── def_keyword_loc: (10,0)-(10,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (10,7)-(10,8) = "("
-        │   ├── rparen_loc: (10,23)-(10,24) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ DefNode (location: (13,0)-(14,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (13,4)-(13,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (13,8)-(13,35))
-        │   │   ├── requireds: (length: 3)
-        │   │   │   ├── @ RequiredParameterNode (location: (13,8)-(13,9))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :a
-        │   │   │   ├── @ MultiTargetNode (location: (13,11)-(13,22))
-        │   │   │   │   ├── lefts: (length: 1)
-        │   │   │   │   │   └── @ RequiredParameterNode (location: (13,12)-(13,13))
-        │   │   │   │   │       ├── flags: ∅
-        │   │   │   │   │       └── name: :b
-        │   │   │   │   ├── rest:
-        │   │   │   │   │   @ SplatNode (location: (13,15)-(13,18))
-        │   │   │   │   │   ├── operator_loc: (13,15)-(13,16) = "*"
-        │   │   │   │   │   └── expression:
-        │   │   │   │   │       @ RequiredParameterNode (location: (13,16)-(13,18))
-        │   │   │   │   │       ├── flags: ∅
-        │   │   │   │   │       └── name: :_c
-        │   │   │   │   ├── rights: (length: 1)
-        │   │   │   │   │   └── @ RequiredParameterNode (location: (13,20)-(13,21))
-        │   │   │   │   │       ├── flags: ∅
-        │   │   │   │   │       └── name: :d
-        │   │   │   │   ├── lparen_loc: (13,11)-(13,12) = "("
-        │   │   │   │   └── rparen_loc: (13,21)-(13,22) = ")"
-        │   │   │   └── @ MultiTargetNode (location: (13,24)-(13,35))
-        │   │   │       ├── lefts: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (13,25)-(13,26))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :e
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (13,28)-(13,31))
-        │   │   │       │   ├── operator_loc: (13,28)-(13,29) = "*"
-        │   │   │       │   └── expression:
-        │   │   │       │       @ RequiredParameterNode (location: (13,29)-(13,31))
-        │   │   │       │       ├── flags: repeated_parameter
-        │   │   │       │       └── name: :_c
-        │   │   │       ├── rights: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (13,33)-(13,34))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :f
-        │   │   │       ├── lparen_loc: (13,24)-(13,25) = "("
-        │   │   │       └── rparen_loc: (13,34)-(13,35) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :b, :_c, :d, :e, :f]
-        │   ├── def_keyword_loc: (13,0)-(13,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (13,7)-(13,8) = "("
-        │   ├── rparen_loc: (13,35)-(13,36) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (14,0)-(14,3) = "end"
-        ├── @ DefNode (location: (16,0)-(17,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (16,4)-(16,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (16,8)-(16,20))
-        │   │   ├── requireds: (length: 4)
-        │   │   │   ├── @ RequiredParameterNode (location: (16,8)-(16,10))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :_a
-        │   │   │   ├── @ RequiredParameterNode (location: (16,12)-(16,14))
-        │   │   │   │   ├── flags: repeated_parameter
-        │   │   │   │   └── name: :_a
-        │   │   │   ├── @ RequiredParameterNode (location: (16,16)-(16,17))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :b
-        │   │   │   └── @ RequiredParameterNode (location: (16,19)-(16,20))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :c
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:_a, :b, :c]
-        │   ├── def_keyword_loc: (16,0)-(16,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (16,7)-(16,8) = "("
-        │   ├── rparen_loc: (16,20)-(16,21) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (17,0)-(17,3) = "end"
-        ├── @ DefNode (location: (19,0)-(20,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (19,4)-(19,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (19,8)-(19,32))
-        │   │   ├── requireds: (length: 2)
-        │   │   │   ├── @ MultiTargetNode (location: (19,8)-(19,19))
-        │   │   │   │   ├── lefts: (length: 1)
-        │   │   │   │   │   └── @ RequiredParameterNode (location: (19,9)-(19,10))
-        │   │   │   │   │       ├── flags: ∅
-        │   │   │   │   │       └── name: :a
-        │   │   │   │   ├── rest:
-        │   │   │   │   │   @ SplatNode (location: (19,12)-(19,15))
-        │   │   │   │   │   ├── operator_loc: (19,12)-(19,13) = "*"
-        │   │   │   │   │   └── expression:
-        │   │   │   │   │       @ RequiredParameterNode (location: (19,13)-(19,15))
-        │   │   │   │   │       ├── flags: ∅
-        │   │   │   │   │       └── name: :_b
-        │   │   │   │   ├── rights: (length: 1)
-        │   │   │   │   │   └── @ RequiredParameterNode (location: (19,17)-(19,18))
-        │   │   │   │   │       ├── flags: ∅
-        │   │   │   │   │       └── name: :c
-        │   │   │   │   ├── lparen_loc: (19,8)-(19,9) = "("
-        │   │   │   │   └── rparen_loc: (19,18)-(19,19) = ")"
-        │   │   │   └── @ MultiTargetNode (location: (19,21)-(19,32))
-        │   │   │       ├── lefts: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (19,22)-(19,23))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :d
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (19,25)-(19,28))
-        │   │   │       │   ├── operator_loc: (19,25)-(19,26) = "*"
-        │   │   │       │   └── expression:
-        │   │   │       │       @ RequiredParameterNode (location: (19,26)-(19,28))
-        │   │   │       │       ├── flags: repeated_parameter
-        │   │   │       │       └── name: :_b
-        │   │   │       ├── rights: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (19,30)-(19,31))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :e
-        │   │   │       ├── lparen_loc: (19,21)-(19,22) = "("
-        │   │   │       └── rparen_loc: (19,31)-(19,32) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :_b, :c, :d, :e]
-        │   ├── def_keyword_loc: (19,0)-(19,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (19,7)-(19,8) = "("
-        │   ├── rparen_loc: (19,32)-(19,33) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (20,0)-(20,3) = "end"
-        ├── @ DefNode (location: (22,0)-(23,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (22,4)-(22,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (22,8)-(22,22))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 2)
-        │   │   │   ├── @ OptionalParameterNode (location: (22,8)-(22,14))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :_a
-        │   │   │   │   ├── name_loc: (22,8)-(22,10) = "_a"
-        │   │   │   │   ├── operator_loc: (22,11)-(22,12) = "="
-        │   │   │   │   └── value:
-        │   │   │   │       @ IntegerNode (location: (22,13)-(22,14))
-        │   │   │   │       ├── flags: decimal
-        │   │   │   │       └── value: 1
-        │   │   │   └── @ OptionalParameterNode (location: (22,16)-(22,22))
-        │   │   │       ├── flags: repeated_parameter
-        │   │   │       ├── name: :_a
-        │   │   │       ├── name_loc: (22,16)-(22,18) = "_a"
-        │   │   │       ├── operator_loc: (22,19)-(22,20) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (22,21)-(22,22))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:_a]
-        │   ├── def_keyword_loc: (22,0)-(22,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (22,7)-(22,8) = "("
-        │   ├── rparen_loc: (22,22)-(22,23) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (23,0)-(23,3) = "end"
-        ├── @ DefNode (location: (25,0)-(26,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (25,4)-(25,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (25,8)-(25,16))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 2)
-        │   │   │   ├── @ RequiredKeywordParameterNode (location: (25,8)-(25,11))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :_a
-        │   │   │   │   └── name_loc: (25,8)-(25,11) = "_a:"
-        │   │   │   └── @ RequiredKeywordParameterNode (location: (25,13)-(25,16))
-        │   │   │       ├── flags: repeated_parameter
-        │   │   │       ├── name: :_a
-        │   │   │       └── name_loc: (25,13)-(25,16) = "_a:"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:_a]
-        │   ├── def_keyword_loc: (25,0)-(25,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (25,7)-(25,8) = "("
-        │   ├── rparen_loc: (25,16)-(25,17) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (26,0)-(26,3) = "end"
-        ├── @ DefNode (location: (28,0)-(29,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (28,4)-(28,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (28,8)-(28,20))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 2)
-        │   │   │   ├── @ OptionalKeywordParameterNode (location: (28,8)-(28,13))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :_a
-        │   │   │   │   ├── name_loc: (28,8)-(28,11) = "_a:"
-        │   │   │   │   └── value:
-        │   │   │   │       @ IntegerNode (location: (28,12)-(28,13))
-        │   │   │   │       ├── flags: decimal
-        │   │   │   │       └── value: 1
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (28,15)-(28,20))
-        │   │   │       ├── flags: repeated_parameter
-        │   │   │       ├── name: :_a
-        │   │   │       ├── name_loc: (28,15)-(28,18) = "_a:"
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (28,19)-(28,20))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:_a]
-        │   ├── def_keyword_loc: (28,0)-(28,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (28,7)-(28,8) = "("
-        │   ├── rparen_loc: (28,20)-(28,21) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (29,0)-(29,3) = "end"
-        ├── @ DefNode (location: (31,0)-(32,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (31,4)-(31,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (31,8)-(31,16))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (31,8)-(31,10))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :_a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ KeywordRestParameterNode (location: (31,12)-(31,16))
-        │   │   │   ├── flags: repeated_parameter
-        │   │   │   ├── name: :_a
-        │   │   │   ├── name_loc: (31,14)-(31,16) = "_a"
-        │   │   │   └── operator_loc: (31,12)-(31,14) = "**"
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:_a]
-        │   ├── def_keyword_loc: (31,0)-(31,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (31,7)-(31,8) = "("
-        │   ├── rparen_loc: (31,16)-(31,17) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (32,0)-(32,3) = "end"
-        ├── @ DefNode (location: (34,0)-(35,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (34,4)-(34,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (34,8)-(34,15))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (34,8)-(34,10))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :_a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (34,12)-(34,15))
-        │   │       ├── flags: repeated_parameter
-        │   │       ├── name: :_a
-        │   │       ├── name_loc: (34,13)-(34,15) = "_a"
-        │   │       └── operator_loc: (34,12)-(34,13) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:_a]
-        │   ├── def_keyword_loc: (34,0)-(34,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (34,7)-(34,8) = "("
-        │   ├── rparen_loc: (34,15)-(34,16) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (35,0)-(35,3) = "end"
-        └── @ DefNode (location: (37,0)-(38,3))
-            ├── name: :foo
-            ├── name_loc: (37,4)-(37,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (37,8)-(37,15))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (37,8)-(37,10))
-            │   │       ├── flags: ∅
-            │   │       └── name: :_a
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (37,12)-(37,15))
-            │   │   ├── flags: repeated_parameter
-            │   │   ├── name: :_a
-            │   │   ├── name_loc: (37,13)-(37,15) = "_a"
-            │   │   └── operator_loc: (37,12)-(37,13) = "*"
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:_a]
-            ├── def_keyword_loc: (37,0)-(37,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (37,7)-(37,8) = "("
-            ├── rparen_loc: (37,15)-(37,16) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (38,0)-(38,3) = "end"
diff --git a/test/mri/prism/snapshots/rescue.txt b/test/mri/prism/snapshots/rescue.txt
deleted file mode 100644
index d987c496173..00000000000
--- a/test/mri/prism/snapshots/rescue.txt
+++ /dev/null
@@ -1,491 +0,0 @@
-@ ProgramNode (location: (1,0)-(35,18))
-├── locals: [:a, :z]
-└── statements:
-    @ StatementsNode (location: (1,0)-(35,18))
-    └── body: (length: 14)
-        ├── @ RescueModifierNode (location: (1,0)-(1,14))
-        │   ├── expression:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── keyword_loc: (1,4)-(1,10) = "rescue"
-        │   └── rescue_expression:
-        │       @ NilNode (location: (1,11)-(1,14))
-        ├── @ RescueModifierNode (location: (3,0)-(4,3))
-        │   ├── expression:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── keyword_loc: (3,4)-(3,10) = "rescue"
-        │   └── rescue_expression:
-        │       @ NilNode (location: (4,0)-(4,3))
-        ├── @ RescueModifierNode (location: (6,0)-(6,16))
-        │   ├── expression:
-        │   │   @ BreakNode (location: (6,0)-(6,5))
-        │   │   ├── arguments: ∅
-        │   │   └── keyword_loc: (6,0)-(6,5) = "break"
-        │   ├── keyword_loc: (6,6)-(6,12) = "rescue"
-        │   └── rescue_expression:
-        │       @ NilNode (location: (6,13)-(6,16))
-        ├── @ RescueModifierNode (location: (8,0)-(8,15))
-        │   ├── expression:
-        │   │   @ NextNode (location: (8,0)-(8,4))
-        │   │   ├── arguments: ∅
-        │   │   └── keyword_loc: (8,0)-(8,4) = "next"
-        │   ├── keyword_loc: (8,5)-(8,11) = "rescue"
-        │   └── rescue_expression:
-        │       @ NilNode (location: (8,12)-(8,15))
-        ├── @ RescueModifierNode (location: (10,0)-(10,17))
-        │   ├── expression:
-        │   │   @ ReturnNode (location: (10,0)-(10,6))
-        │   │   ├── keyword_loc: (10,0)-(10,6) = "return"
-        │   │   └── arguments: ∅
-        │   ├── keyword_loc: (10,7)-(10,13) = "rescue"
-        │   └── rescue_expression:
-        │       @ NilNode (location: (10,14)-(10,17))
-        ├── @ RescueModifierNode (location: (12,0)-(12,19))
-        │   ├── expression:
-        │   │   @ CallNode (location: (12,0)-(12,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (12,0)-(12,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── keyword_loc: (12,4)-(12,10) = "rescue"
-        │   └── rescue_expression:
-        │       @ OrNode (location: (12,11)-(12,19))
-        │       ├── left:
-        │       │   @ NilNode (location: (12,11)-(12,14))
-        │       ├── right:
-        │       │   @ IntegerNode (location: (12,18)-(12,19))
-        │       │   ├── flags: decimal
-        │       │   └── value: 1
-        │       └── operator_loc: (12,15)-(12,17) = "||"
-        ├── @ RescueModifierNode (location: (14,0)-(14,22))
-        │   ├── expression:
-        │   │   @ CallNode (location: (14,0)-(14,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (14,0)-(14,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── keyword_loc: (14,4)-(14,10) = "rescue"
-        │   └── rescue_expression:
-        │       @ IfNode (location: (14,11)-(14,22))
-        │       ├── if_keyword_loc: ∅
-        │       ├── predicate:
-        │       │   @ NilNode (location: (14,11)-(14,14))
-        │       ├── then_keyword_loc: (14,15)-(14,16) = "?"
-        │       ├── statements:
-        │       │   @ StatementsNode (location: (14,17)-(14,18))
-        │       │   └── body: (length: 1)
-        │       │       └── @ IntegerNode (location: (14,17)-(14,18))
-        │       │           ├── flags: decimal
-        │       │           └── value: 1
-        │       ├── consequent:
-        │       │   @ ElseNode (location: (14,19)-(14,22))
-        │       │   ├── else_keyword_loc: (14,19)-(14,20) = ":"
-        │       │   ├── statements:
-        │       │   │   @ StatementsNode (location: (14,21)-(14,22))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ IntegerNode (location: (14,21)-(14,22))
-        │       │   │           ├── flags: decimal
-        │       │   │           └── value: 2
-        │       │   └── end_keyword_loc: ∅
-        │       └── end_keyword_loc: ∅
-        ├── @ BeginNode (location: (16,0)-(16,24))
-        │   ├── begin_keyword_loc: (16,0)-(16,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (16,7)-(16,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (16,7)-(16,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (16,7)-(16,8) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (16,10)-(16,19))
-        │   │   ├── keyword_loc: (16,10)-(16,16) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ SplatNode (location: (16,17)-(16,19))
-        │   │   │       ├── operator_loc: (16,17)-(16,18) = "*"
-        │   │   │       └── expression:
-        │   │   │           @ CallNode (location: (16,18)-(16,19))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (16,18)-(16,19) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (16,21)-(16,24) = "end"
-        ├── @ CallNode (location: (18,0)-(20,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (18,0)-(18,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (18,4)-(20,3))
-        │       ├── locals: [:x]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (18,7)-(18,10))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (18,8)-(18,9))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (18,8)-(18,9))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :x
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (18,7)-(18,8) = "|"
-        │       │   └── closing_loc: (18,9)-(18,10) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (19,2)-(19,40))
-        │       │   └── body: (length: 1)
-        │       │       └── @ RescueModifierNode (location: (19,2)-(19,40))
-        │       │           ├── expression:
-        │       │           │   @ CallNode (location: (19,2)-(19,8))
-        │       │           │   ├── flags: ignore_visibility
-        │       │           │   ├── receiver: ∅
-        │       │           │   ├── call_operator_loc: ∅
-        │       │           │   ├── name: :bar
-        │       │           │   ├── message_loc: (19,2)-(19,5) = "bar"
-        │       │           │   ├── opening_loc: (19,5)-(19,6) = "("
-        │       │           │   ├── arguments:
-        │       │           │   │   @ ArgumentsNode (location: (19,6)-(19,7))
-        │       │           │   │   ├── flags: ∅
-        │       │           │   │   └── arguments: (length: 1)
-        │       │           │   │       └── @ CallNode (location: (19,6)-(19,7))
-        │       │           │   │           ├── flags: variable_call, ignore_visibility
-        │       │           │   │           ├── receiver: ∅
-        │       │           │   │           ├── call_operator_loc: ∅
-        │       │           │   │           ├── name: :y
-        │       │           │   │           ├── message_loc: (19,6)-(19,7) = "y"
-        │       │           │   │           ├── opening_loc: ∅
-        │       │           │   │           ├── arguments: ∅
-        │       │           │   │           ├── closing_loc: ∅
-        │       │           │   │           └── block: ∅
-        │       │           │   ├── closing_loc: (19,7)-(19,8) = ")"
-        │       │           │   └── block: ∅
-        │       │           ├── keyword_loc: (19,9)-(19,15) = "rescue"
-        │       │           └── rescue_expression:
-        │       │               @ CallNode (location: (19,16)-(19,40))
-        │       │               ├── flags: ignore_visibility
-        │       │               ├── receiver: ∅
-        │       │               ├── call_operator_loc: ∅
-        │       │               ├── name: :ArgumentError
-        │       │               ├── message_loc: (19,16)-(19,29) = "ArgumentError"
-        │       │               ├── opening_loc: ∅
-        │       │               ├── arguments:
-        │       │               │   @ ArgumentsNode (location: (19,30)-(19,40))
-        │       │               │   ├── flags: ∅
-        │       │               │   └── arguments: (length: 1)
-        │       │               │       └── @ CallNode (location: (19,30)-(19,40))
-        │       │               │           ├── flags: ignore_visibility
-        │       │               │           ├── receiver: ∅
-        │       │               │           ├── call_operator_loc: ∅
-        │       │               │           ├── name: :fail
-        │       │               │           ├── message_loc: (19,30)-(19,34) = "fail"
-        │       │               │           ├── opening_loc: ∅
-        │       │               │           ├── arguments:
-        │       │               │           │   @ ArgumentsNode (location: (19,35)-(19,40))
-        │       │               │           │   ├── flags: ∅
-        │       │               │           │   └── arguments: (length: 1)
-        │       │               │           │       └── @ StringNode (location: (19,35)-(19,40))
-        │       │               │           │           ├── flags: ∅
-        │       │               │           │           ├── opening_loc: (19,35)-(19,36) = "\""
-        │       │               │           │           ├── content_loc: (19,36)-(19,39) = "baz"
-        │       │               │           │           ├── closing_loc: (19,39)-(19,40) = "\""
-        │       │               │           │           └── unescaped: "baz"
-        │       │               │           ├── closing_loc: ∅
-        │       │               │           └── block: ∅
-        │       │               ├── closing_loc: ∅
-        │       │               └── block: ∅
-        │       ├── opening_loc: (18,4)-(18,6) = "do"
-        │       └── closing_loc: (20,0)-(20,3) = "end"
-        ├── @ IfNode (location: (22,0)-(24,3))
-        │   ├── if_keyword_loc: (22,0)-(22,2) = "if"
-        │   ├── predicate:
-        │   │   @ LocalVariableWriteNode (location: (22,3)-(22,21))
-        │   │   ├── name: :a
-        │   │   ├── depth: 0
-        │   │   ├── name_loc: (22,3)-(22,4) = "a"
-        │   │   ├── value:
-        │   │   │   @ RescueModifierNode (location: (22,7)-(22,21))
-        │   │   │   ├── expression:
-        │   │   │   │   @ CallNode (location: (22,7)-(22,10))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :foo
-        │   │   │   │   ├── message_loc: (22,7)-(22,10) = "foo"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── keyword_loc: (22,11)-(22,17) = "rescue"
-        │   │   │   └── rescue_expression:
-        │   │   │       @ NilNode (location: (22,18)-(22,21))
-        │   │   └── operator_loc: (22,5)-(22,6) = "="
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (23,2)-(23,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (23,2)-(23,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (23,2)-(23,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (24,0)-(24,3) = "end"
-        ├── @ DefNode (location: (26,0)-(26,44))
-        │   ├── name: :some_method
-        │   ├── name_loc: (26,4)-(26,15) = "some_method"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (26,18)-(26,44))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RescueModifierNode (location: (26,18)-(26,44))
-        │   │           ├── expression:
-        │   │           │   @ CallNode (location: (26,18)-(26,33))
-        │   │           │   ├── flags: ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :other_method
-        │   │           │   ├── message_loc: (26,18)-(26,30) = "other_method"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments:
-        │   │           │   │   @ ArgumentsNode (location: (26,31)-(26,33))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   └── arguments: (length: 1)
-        │   │           │   │       └── @ IntegerNode (location: (26,31)-(26,33))
-        │   │           │   │           ├── flags: decimal
-        │   │           │   │           └── value: 42
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── keyword_loc: (26,34)-(26,40) = "rescue"
-        │   │           └── rescue_expression:
-        │   │               @ NilNode (location: (26,41)-(26,44))
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (26,0)-(26,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (26,16)-(26,17) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (28,0)-(31,3))
-        │   ├── name: :a
-        │   ├── name_loc: (28,4)-(28,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (28,0)-(31,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (29,2)-(29,6))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (29,2)-(29,6))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :a
-        │   │   │           ├── message_loc: (29,2)-(29,3) = "a"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (29,4)-(29,6))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ KeywordHashNode (location: (29,4)-(29,6))
-        │   │   │           │           ├── flags: symbol_keys
-        │   │   │           │           └── elements: (length: 1)
-        │   │   │           │               └── @ AssocNode (location: (29,4)-(29,6))
-        │   │   │           │                   ├── key:
-        │   │   │           │                   │   @ SymbolNode (location: (29,4)-(29,6))
-        │   │   │           │                   │   ├── flags: forced_us_ascii_encoding
-        │   │   │           │                   │   ├── opening_loc: ∅
-        │   │   │           │                   │   ├── value_loc: (29,4)-(29,5) = "b"
-        │   │   │           │                   │   ├── closing_loc: (29,5)-(29,6) = ":"
-        │   │   │           │                   │   └── unescaped: "b"
-        │   │   │           │                   ├── value:
-        │   │   │           │                   │   @ ImplicitNode (location: (29,4)-(29,6))
-        │   │   │           │                   │   └── value:
-        │   │   │           │                   │       @ CallNode (location: (29,4)-(29,6))
-        │   │   │           │                   │       ├── flags: ignore_visibility
-        │   │   │           │                   │       ├── receiver: ∅
-        │   │   │           │                   │       ├── call_operator_loc: ∅
-        │   │   │           │                   │       ├── name: :b
-        │   │   │           │                   │       ├── message_loc: (29,4)-(29,5) = "b"
-        │   │   │           │                   │       ├── opening_loc: ∅
-        │   │   │           │                   │       ├── arguments: ∅
-        │   │   │           │                   │       ├── closing_loc: ∅
-        │   │   │           │                   │       └── block: ∅
-        │   │   │           │                   └── operator_loc: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (30,0)-(30,6))
-        │   │   │   ├── keyword_loc: (30,0)-(30,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause: ∅
-        │   │   └── end_keyword_loc: (31,0)-(31,3) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (28,0)-(28,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (31,0)-(31,3) = "end"
-        ├── @ RescueModifierNode (location: (33,0)-(33,21))
-        │   ├── expression:
-        │   │   @ IfNode (location: (33,0)-(33,10))
-        │   │   ├── if_keyword_loc: (33,4)-(33,6) = "if"
-        │   │   ├── predicate:
-        │   │   │   @ CallNode (location: (33,7)-(33,10))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── message_loc: (33,7)-(33,10) = "bar"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── then_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (33,0)-(33,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (33,0)-(33,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :foo
-        │   │   │           ├── message_loc: (33,0)-(33,3) = "foo"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── consequent: ∅
-        │   │   └── end_keyword_loc: ∅
-        │   ├── keyword_loc: (33,11)-(33,17) = "rescue"
-        │   └── rescue_expression:
-        │       @ CallNode (location: (33,18)-(33,21))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :baz
-        │       ├── message_loc: (33,18)-(33,21) = "baz"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        └── @ LocalVariableWriteNode (location: (35,0)-(35,18))
-            ├── name: :z
-            ├── depth: 0
-            ├── name_loc: (35,0)-(35,1) = "z"
-            ├── value:
-            │   @ RescueModifierNode (location: (35,4)-(35,18))
-            │   ├── expression:
-            │   │   @ CallNode (location: (35,4)-(35,7))
-            │   │   ├── flags: ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :x
-            │   │   ├── message_loc: (35,4)-(35,5) = "x"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments:
-            │   │   │   @ ArgumentsNode (location: (35,6)-(35,7))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── arguments: (length: 1)
-            │   │   │       └── @ CallNode (location: (35,6)-(35,7))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :y
-            │   │   │           ├── message_loc: (35,6)-(35,7) = "y"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── keyword_loc: (35,8)-(35,14) = "rescue"
-            │   └── rescue_expression:
-            │       @ CallNode (location: (35,15)-(35,18))
-            │       ├── flags: ignore_visibility
-            │       ├── receiver: ∅
-            │       ├── call_operator_loc: ∅
-            │       ├── name: :c
-            │       ├── message_loc: (35,15)-(35,16) = "c"
-            │       ├── opening_loc: ∅
-            │       ├── arguments:
-            │       │   @ ArgumentsNode (location: (35,17)-(35,18))
-            │       │   ├── flags: ∅
-            │       │   └── arguments: (length: 1)
-            │       │       └── @ CallNode (location: (35,17)-(35,18))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :d
-            │       │           ├── message_loc: (35,17)-(35,18) = "d"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       ├── closing_loc: ∅
-            │       └── block: ∅
-            └── operator_loc: (35,2)-(35,3) = "="
diff --git a/test/mri/prism/snapshots/rescue_modifier.txt b/test/mri/prism/snapshots/rescue_modifier.txt
deleted file mode 100644
index 0a27a3bb49c..00000000000
--- a/test/mri/prism/snapshots/rescue_modifier.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,23))
-├── flags: ∅
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,23))
-    ├── flags: ∅
-    └── body: (length: 4)
-        ├── @ IfNode (location: (1,0)-(1,15))
-        │   ├── flags: newline
-        │   ├── if_keyword_loc: (1,11)-(1,13) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,14)-(1,15))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :c
-        │   │   ├── message_loc: (1,14)-(1,15) = "c"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,0)-(1,10))
-        │   │   ├── flags: ∅
-        │   │   └── body: (length: 1)
-        │   │       └── @ RescueModifierNode (location: (1,0)-(1,10))
-        │   │           ├── flags: newline
-        │   │           ├── expression:
-        │   │           │   @ CallNode (location: (1,0)-(1,1))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :a
-        │   │           │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── keyword_loc: (1,2)-(1,8) = "rescue"
-        │   │           └── rescue_expression:
-        │   │               @ CallNode (location: (1,9)-(1,10))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :b
-        │   │               ├── message_loc: (1,9)-(1,10) = "b"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── subsequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (3,0)-(3,19))
-        │   ├── flags: newline
-        │   ├── if_keyword_loc: (3,15)-(3,17) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (3,18)-(3,19))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :d
-        │   │   ├── message_loc: (3,18)-(3,19) = "d"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (3,0)-(3,14))
-        │   │   ├── flags: ∅
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableWriteNode (location: (3,0)-(3,14))
-        │   │           ├── flags: newline
-        │   │           ├── name: :a
-        │   │           ├── depth: 0
-        │   │           ├── name_loc: (3,0)-(3,1) = "a"
-        │   │           ├── value:
-        │   │           │   @ RescueModifierNode (location: (3,4)-(3,14))
-        │   │           │   ├── flags: ∅
-        │   │           │   ├── expression:
-        │   │           │   │   @ CallNode (location: (3,4)-(3,5))
-        │   │           │   │   ├── flags: variable_call, ignore_visibility
-        │   │           │   │   ├── receiver: ∅
-        │   │           │   │   ├── call_operator_loc: ∅
-        │   │           │   │   ├── name: :b
-        │   │           │   │   ├── message_loc: (3,4)-(3,5) = "b"
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── arguments: ∅
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── block: ∅
-        │   │           │   ├── keyword_loc: (3,6)-(3,12) = "rescue"
-        │   │           │   └── rescue_expression:
-        │   │           │       @ CallNode (location: (3,13)-(3,14))
-        │   │           │       ├── flags: variable_call, ignore_visibility
-        │   │           │       ├── receiver: ∅
-        │   │           │       ├── call_operator_loc: ∅
-        │   │           │       ├── name: :c
-        │   │           │       ├── message_loc: (3,13)-(3,14) = "c"
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── arguments: ∅
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── block: ∅
-        │   │           └── operator_loc: (3,2)-(3,3) = "="
-        │   ├── subsequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (5,0)-(5,20))
-        │   ├── flags: newline
-        │   ├── if_keyword_loc: (5,16)-(5,18) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (5,19)-(5,20))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :d
-        │   │   ├── message_loc: (5,19)-(5,20) = "d"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (5,0)-(5,15))
-        │   │   ├── flags: ∅
-        │   │   └── body: (length: 1)
-        │   │       └── @ MultiWriteNode (location: (5,0)-(5,15))
-        │   │           ├── flags: newline
-        │   │           ├── lefts: (length: 1)
-        │   │           │   └── @ LocalVariableTargetNode (location: (5,0)-(5,1))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── name: :a
-        │   │           │       └── depth: 0
-        │   │           ├── rest:
-        │   │           │   @ ImplicitRestNode (location: (5,1)-(5,2))
-        │   │           │   └── flags: ∅
-        │   │           ├── rights: (length: 0)
-        │   │           ├── lparen_loc: ∅
-        │   │           ├── rparen_loc: ∅
-        │   │           ├── operator_loc: (5,3)-(5,4) = "="
-        │   │           └── value:
-        │   │               @ RescueModifierNode (location: (5,5)-(5,15))
-        │   │               ├── flags: ∅
-        │   │               ├── expression:
-        │   │               │   @ CallNode (location: (5,5)-(5,6))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :b
-        │   │               │   ├── message_loc: (5,5)-(5,6) = "b"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               ├── keyword_loc: (5,7)-(5,13) = "rescue"
-        │   │               └── rescue_expression:
-        │   │                   @ CallNode (location: (5,14)-(5,15))
-        │   │                   ├── flags: variable_call, ignore_visibility
-        │   │                   ├── receiver: ∅
-        │   │                   ├── call_operator_loc: ∅
-        │   │                   ├── name: :c
-        │   │                   ├── message_loc: (5,14)-(5,15) = "c"
-        │   │                   ├── opening_loc: ∅
-        │   │                   ├── arguments: ∅
-        │   │                   ├── closing_loc: ∅
-        │   │                   └── block: ∅
-        │   ├── subsequent: ∅
-        │   └── end_keyword_loc: ∅
-        └── @ IfNode (location: (7,0)-(7,23))
-            ├── flags: newline
-            ├── if_keyword_loc: (7,19)-(7,21) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (7,22)-(7,23))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :d
-            │   ├── message_loc: (7,22)-(7,23) = "d"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (7,0)-(7,18))
-            │   ├── flags: ∅
-            │   └── body: (length: 1)
-            │       └── @ DefNode (location: (7,0)-(7,18))
-            │           ├── flags: newline
-            │           ├── name: :a
-            │           ├── name_loc: (7,4)-(7,5) = "a"
-            │           ├── receiver: ∅
-            │           ├── parameters: ∅
-            │           ├── body:
-            │           │   @ StatementsNode (location: (7,8)-(7,18))
-            │           │   ├── flags: ∅
-            │           │   └── body: (length: 1)
-            │           │       └── @ RescueModifierNode (location: (7,8)-(7,18))
-            │           │           ├── flags: ∅
-            │           │           ├── expression:
-            │           │           │   @ CallNode (location: (7,8)-(7,9))
-            │           │           │   ├── flags: variable_call, ignore_visibility
-            │           │           │   ├── receiver: ∅
-            │           │           │   ├── call_operator_loc: ∅
-            │           │           │   ├── name: :b
-            │           │           │   ├── message_loc: (7,8)-(7,9) = "b"
-            │           │           │   ├── opening_loc: ∅
-            │           │           │   ├── arguments: ∅
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── block: ∅
-            │           │           ├── keyword_loc: (7,10)-(7,16) = "rescue"
-            │           │           └── rescue_expression:
-            │           │               @ CallNode (location: (7,17)-(7,18))
-            │           │               ├── flags: variable_call, ignore_visibility
-            │           │               ├── receiver: ∅
-            │           │               ├── call_operator_loc: ∅
-            │           │               ├── name: :c
-            │           │               ├── message_loc: (7,17)-(7,18) = "c"
-            │           │               ├── opening_loc: ∅
-            │           │               ├── arguments: ∅
-            │           │               ├── closing_loc: ∅
-            │           │               └── block: ∅
-            │           ├── locals: []
-            │           ├── def_keyword_loc: (7,0)-(7,3) = "def"
-            │           ├── operator_loc: ∅
-            │           ├── lparen_loc: ∅
-            │           ├── rparen_loc: ∅
-            │           ├── equal_loc: (7,6)-(7,7) = "="
-            │           └── end_keyword_loc: ∅
-            ├── subsequent: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/return.txt b/test/mri/prism/snapshots/return.txt
deleted file mode 100644
index 9a33076193c..00000000000
--- a/test/mri/prism/snapshots/return.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-@ ProgramNode (location: (1,0)-(23,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(23,9))
-    └── body: (length: 10)
-        ├── @ ReturnNode (location: (1,0)-(1,6))
-        │   ├── keyword_loc: (1,0)-(1,6) = "return"
-        │   └── arguments: ∅
-        ├── @ ReturnNode (location: (3,0)-(3,20))
-        │   ├── keyword_loc: (3,0)-(3,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (3,7)-(3,20))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 3)
-        │           ├── @ ParenthesesNode (location: (3,7)-(3,10))
-        │           │   ├── body:
-        │           │   │   @ StatementsNode (location: (3,8)-(3,9))
-        │           │   │   └── body: (length: 1)
-        │           │   │       └── @ IntegerNode (location: (3,8)-(3,9))
-        │           │   │           ├── flags: decimal
-        │           │   │           └── value: 1
-        │           │   ├── opening_loc: (3,7)-(3,8) = "("
-        │           │   └── closing_loc: (3,9)-(3,10) = ")"
-        │           ├── @ ParenthesesNode (location: (3,12)-(3,15))
-        │           │   ├── body:
-        │           │   │   @ StatementsNode (location: (3,13)-(3,14))
-        │           │   │   └── body: (length: 1)
-        │           │   │       └── @ IntegerNode (location: (3,13)-(3,14))
-        │           │   │           ├── flags: decimal
-        │           │   │           └── value: 2
-        │           │   ├── opening_loc: (3,12)-(3,13) = "("
-        │           │   └── closing_loc: (3,14)-(3,15) = ")"
-        │           └── @ ParenthesesNode (location: (3,17)-(3,20))
-        │               ├── body:
-        │               │   @ StatementsNode (location: (3,18)-(3,19))
-        │               │   └── body: (length: 1)
-        │               │       └── @ IntegerNode (location: (3,18)-(3,19))
-        │               │           ├── flags: decimal
-        │               │           └── value: 3
-        │               ├── opening_loc: (3,17)-(3,18) = "("
-        │               └── closing_loc: (3,19)-(3,20) = ")"
-        ├── @ ReturnNode (location: (5,0)-(5,9))
-        │   ├── keyword_loc: (5,0)-(5,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (5,7)-(5,9))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ SplatNode (location: (5,7)-(5,9))
-        │               ├── operator_loc: (5,7)-(5,8) = "*"
-        │               └── expression:
-        │                   @ IntegerNode (location: (5,8)-(5,9))
-        │                   ├── flags: decimal
-        │                   └── value: 1
-        ├── @ ReturnNode (location: (7,0)-(7,8))
-        │   ├── keyword_loc: (7,0)-(7,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (7,7)-(7,8))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ IntegerNode (location: (7,7)-(7,8))
-        │               ├── flags: decimal
-        │               └── value: 1
-        ├── @ ReturnNode (location: (9,0)-(10,1))
-        │   ├── keyword_loc: (9,0)-(9,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (9,7)-(10,1))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 3)
-        │           ├── @ IntegerNode (location: (9,7)-(9,8))
-        │           │   ├── flags: decimal
-        │           │   └── value: 1
-        │           ├── @ IntegerNode (location: (9,10)-(9,11))
-        │           │   ├── flags: decimal
-        │           │   └── value: 2
-        │           └── @ IntegerNode (location: (10,0)-(10,1))
-        │               ├── flags: decimal
-        │               └── value: 3
-        ├── @ ReturnNode (location: (12,0)-(12,14))
-        │   ├── keyword_loc: (12,0)-(12,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (12,7)-(12,14))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 3)
-        │           ├── @ IntegerNode (location: (12,7)-(12,8))
-        │           │   ├── flags: decimal
-        │           │   └── value: 1
-        │           ├── @ IntegerNode (location: (12,10)-(12,11))
-        │           │   ├── flags: decimal
-        │           │   └── value: 2
-        │           └── @ IntegerNode (location: (12,13)-(12,14))
-        │               ├── flags: decimal
-        │               └── value: 3
-        ├── @ ReturnNode (location: (14,0)-(14,16))
-        │   ├── keyword_loc: (14,0)-(14,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (14,7)-(14,16))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ ArrayNode (location: (14,7)-(14,16))
-        │               ├── flags: ∅
-        │               ├── elements: (length: 3)
-        │               │   ├── @ IntegerNode (location: (14,8)-(14,9))
-        │               │   │   ├── flags: decimal
-        │               │   │   └── value: 1
-        │               │   ├── @ IntegerNode (location: (14,11)-(14,12))
-        │               │   │   ├── flags: decimal
-        │               │   │   └── value: 2
-        │               │   └── @ IntegerNode (location: (14,14)-(14,15))
-        │               │       ├── flags: decimal
-        │               │       └── value: 3
-        │               ├── opening_loc: (14,7)-(14,8) = "["
-        │               └── closing_loc: (14,15)-(14,16) = "]"
-        ├── @ ReturnNode (location: (16,0)-(19,1))
-        │   ├── keyword_loc: (16,0)-(16,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (16,6)-(19,1))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ ParenthesesNode (location: (16,6)-(19,1))
-        │               ├── body:
-        │               │   @ StatementsNode (location: (17,2)-(18,3))
-        │               │   └── body: (length: 2)
-        │               │       ├── @ IntegerNode (location: (17,2)-(17,3))
-        │               │       │   ├── flags: decimal
-        │               │       │   └── value: 1
-        │               │       └── @ IntegerNode (location: (18,2)-(18,3))
-        │               │           ├── flags: decimal
-        │               │           └── value: 2
-        │               ├── opening_loc: (16,6)-(16,7) = "("
-        │               └── closing_loc: (19,0)-(19,1) = ")"
-        ├── @ ReturnNode (location: (21,0)-(21,8))
-        │   ├── keyword_loc: (21,0)-(21,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (21,6)-(21,8))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ ParenthesesNode (location: (21,6)-(21,8))
-        │               ├── body: ∅
-        │               ├── opening_loc: (21,6)-(21,7) = "("
-        │               └── closing_loc: (21,7)-(21,8) = ")"
-        └── @ ReturnNode (location: (23,0)-(23,9))
-            ├── keyword_loc: (23,0)-(23,6) = "return"
-            └── arguments:
-                @ ArgumentsNode (location: (23,6)-(23,9))
-                ├── flags: ∅
-                └── arguments: (length: 1)
-                    └── @ ParenthesesNode (location: (23,6)-(23,9))
-                        ├── body:
-                        │   @ StatementsNode (location: (23,7)-(23,8))
-                        │   └── body: (length: 1)
-                        │       └── @ IntegerNode (location: (23,7)-(23,8))
-                        │           ├── flags: decimal
-                        │           └── value: 1
-                        ├── opening_loc: (23,6)-(23,7) = "("
-                        └── closing_loc: (23,8)-(23,9) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/BEGIN.txt b/test/mri/prism/snapshots/seattlerb/BEGIN.txt
deleted file mode 100644
index 246f39cbba8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/BEGIN.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ PreExecutionNode (location: (1,0)-(1,12))
-            ├── statements:
-            │   @ StatementsNode (location: (1,8)-(1,10))
-            │   └── body: (length: 1)
-            │       └── @ IntegerNode (location: (1,8)-(1,10))
-            │           ├── flags: decimal
-            │           └── value: 42
-            ├── keyword_loc: (1,0)-(1,5) = "BEGIN"
-            ├── opening_loc: (1,6)-(1,7) = "{"
-            └── closing_loc: (1,11)-(1,12) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/TestRubyParserShared.txt b/test/mri/prism/snapshots/seattlerb/TestRubyParserShared.txt
deleted file mode 100644
index fabc92e4779..00000000000
--- a/test/mri/prism/snapshots/seattlerb/TestRubyParserShared.txt
+++ /dev/null
@@ -1,361 +0,0 @@
-@ ProgramNode (location: (1,0)-(92,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(92,1))
-    └── body: (length: 16)
-        ├── @ ArrayNode (location: (1,0)-(4,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (1,0)-(1,3) = "%I["
-        │   └── closing_loc: (4,0)-(4,1) = "]"
-        ├── @ ArrayNode (location: (6,0)-(9,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ SymbolNode (location: (7,0)-(7,5))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (7,0)-(7,5) = "line2"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "line2"
-        │   │   └── @ SymbolNode (location: (8,0)-(8,5))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (8,0)-(8,5) = "line3"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "line3"
-        │   ├── opening_loc: (6,0)-(6,3) = "%I["
-        │   └── closing_loc: (9,0)-(9,1) = "]"
-        ├── @ ArrayNode (location: (11,0)-(14,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (11,0)-(11,3) = "%W["
-        │   └── closing_loc: (14,0)-(14,1) = "]"
-        ├── @ ArrayNode (location: (16,0)-(19,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (17,0)-(17,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (17,0)-(17,5) = "line2"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "line2"
-        │   │   └── @ StringNode (location: (18,0)-(18,5))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (18,0)-(18,5) = "line3"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "line3"
-        │   ├── opening_loc: (16,0)-(16,3) = "%W["
-        │   └── closing_loc: (19,0)-(19,1) = "]"
-        ├── @ ArrayNode (location: (21,0)-(24,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (21,0)-(21,3) = "%i["
-        │   └── closing_loc: (24,0)-(24,1) = "]"
-        ├── @ ArrayNode (location: (26,0)-(29,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ SymbolNode (location: (27,0)-(27,5))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (27,0)-(27,5) = "line2"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "line2"
-        │   │   └── @ SymbolNode (location: (28,0)-(28,5))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (28,0)-(28,5) = "line3"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "line3"
-        │   ├── opening_loc: (26,0)-(26,3) = "%i["
-        │   └── closing_loc: (29,0)-(29,1) = "]"
-        ├── @ RegularExpressionNode (location: (31,0)-(34,1))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (31,0)-(31,3) = "%r["
-        │   ├── content_loc: (31,3)-(34,0) = "\n\n\n"
-        │   ├── closing_loc: (34,0)-(34,1) = "]"
-        │   └── unescaped: "\n\n\n"
-        ├── @ ArrayNode (location: (36,0)-(39,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (36,0)-(36,3) = "%w["
-        │   └── closing_loc: (39,0)-(39,1) = "]"
-        ├── @ ArrayNode (location: (41,0)-(44,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (42,0)-(42,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (42,0)-(42,5) = "line2"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "line2"
-        │   │   └── @ StringNode (location: (43,0)-(43,5))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (43,0)-(43,5) = "line3"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "line3"
-        │   ├── opening_loc: (41,0)-(41,3) = "%w["
-        │   └── closing_loc: (44,0)-(44,1) = "]"
-        ├── @ ArrayNode (location: (46,0)-(49,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ SymbolNode (location: (47,0)-(47,6))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (47,0)-(47,1) = ":"
-        │   │   │   ├── value_loc: (47,1)-(47,6) = "line2"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "line2"
-        │   │   └── @ SymbolNode (location: (48,0)-(48,6))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: (48,0)-(48,1) = ":"
-        │   │       ├── value_loc: (48,1)-(48,6) = "line3"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "line3"
-        │   ├── opening_loc: (46,0)-(46,1) = "["
-        │   └── closing_loc: (49,0)-(49,1) = "]"
-        ├── @ ClassNode (location: (51,0)-(56,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (51,0)-(51,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (51,6)-(51,7))
-        │   │   └── name: :X
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (52,2)-(55,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ DefNode (location: (52,2)-(55,5))
-        │   │           ├── name: :y
-        │   │           ├── name_loc: (52,11)-(52,12) = "y"
-        │   │           ├── receiver:
-        │   │           │   @ SelfNode (location: (52,6)-(52,10))
-        │   │           ├── parameters:
-        │   │           │   @ ParametersNode (location: (52,13)-(53,9))
-        │   │           │   ├── requireds: (length: 2)
-        │   │           │   │   ├── @ RequiredParameterNode (location: (52,13)-(52,14))
-        │   │           │   │   │   ├── flags: ∅
-        │   │           │   │   │   └── name: :a
-        │   │           │   │   └── @ RequiredParameterNode (location: (53,8)-(53,9))
-        │   │           │   │       ├── flags: ∅
-        │   │           │   │       └── name: :b
-        │   │           │   ├── optionals: (length: 0)
-        │   │           │   ├── rest: ∅
-        │   │           │   ├── posts: (length: 0)
-        │   │           │   ├── keywords: (length: 0)
-        │   │           │   ├── keyword_rest: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (54,4)-(54,9))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (54,4)-(54,9))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── receiver:
-        │   │           │           │   @ LocalVariableReadNode (location: (54,4)-(54,5))
-        │   │           │           │   ├── name: :a
-        │   │           │           │   └── depth: 0
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :+
-        │   │           │           ├── message_loc: (54,6)-(54,7) = "+"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments:
-        │   │           │           │   @ ArgumentsNode (location: (54,8)-(54,9))
-        │   │           │           │   ├── flags: ∅
-        │   │           │           │   └── arguments: (length: 1)
-        │   │           │           │       └── @ LocalVariableReadNode (location: (54,8)-(54,9))
-        │   │           │           │           ├── name: :b
-        │   │           │           │           └── depth: 0
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── locals: [:a, :b]
-        │   │           ├── def_keyword_loc: (52,2)-(52,5) = "def"
-        │   │           ├── operator_loc: (52,10)-(52,11) = "."
-        │   │           ├── lparen_loc: (52,12)-(52,13) = "("
-        │   │           ├── rparen_loc: (53,9)-(53,10) = ")"
-        │   │           ├── equal_loc: ∅
-        │   │           └── end_keyword_loc: (55,2)-(55,5) = "end"
-        │   ├── end_keyword_loc: (56,0)-(56,3) = "end"
-        │   └── name: :X
-        ├── @ ClassNode (location: (59,0)-(63,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (59,0)-(59,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (59,6)-(59,7))
-        │   │   └── name: :X
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (60,2)-(62,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ClassNode (location: (60,2)-(62,5))
-        │   │           ├── locals: []
-        │   │           ├── class_keyword_loc: (60,2)-(60,7) = "class"
-        │   │           ├── constant_path:
-        │   │           │   @ ConstantReadNode (location: (60,8)-(60,9))
-        │   │           │   └── name: :Y
-        │   │           ├── inheritance_operator_loc: ∅
-        │   │           ├── superclass: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (61,4)-(61,10))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ ConstantWriteNode (location: (61,4)-(61,10))
-        │   │           │           ├── name: :Z
-        │   │           │           ├── name_loc: (61,4)-(61,5) = "Z"
-        │   │           │           ├── value:
-        │   │           │           │   @ IntegerNode (location: (61,8)-(61,10))
-        │   │           │           │   ├── flags: decimal
-        │   │           │           │   └── value: 42
-        │   │           │           └── operator_loc: (61,6)-(61,7) = "="
-        │   │           ├── end_keyword_loc: (62,2)-(62,5) = "end"
-        │   │           └── name: :Y
-        │   ├── end_keyword_loc: (63,0)-(63,3) = "end"
-        │   └── name: :X
-        ├── @ ClassNode (location: (66,0)-(71,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (66,0)-(66,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (66,6)-(66,7))
-        │   │   └── name: :X
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (67,2)-(70,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ DefNode (location: (67,2)-(70,5))
-        │   │           ├── name: :y
-        │   │           ├── name_loc: (67,6)-(67,7) = "y"
-        │   │           ├── receiver: ∅
-        │   │           ├── parameters:
-        │   │           │   @ ParametersNode (location: (67,8)-(68,9))
-        │   │           │   ├── requireds: (length: 2)
-        │   │           │   │   ├── @ RequiredParameterNode (location: (67,8)-(67,9))
-        │   │           │   │   │   ├── flags: ∅
-        │   │           │   │   │   └── name: :a
-        │   │           │   │   └── @ RequiredParameterNode (location: (68,8)-(68,9))
-        │   │           │   │       ├── flags: ∅
-        │   │           │   │       └── name: :b
-        │   │           │   ├── optionals: (length: 0)
-        │   │           │   ├── rest: ∅
-        │   │           │   ├── posts: (length: 0)
-        │   │           │   ├── keywords: (length: 0)
-        │   │           │   ├── keyword_rest: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (69,4)-(69,9))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (69,4)-(69,9))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── receiver:
-        │   │           │           │   @ LocalVariableReadNode (location: (69,4)-(69,5))
-        │   │           │           │   ├── name: :a
-        │   │           │           │   └── depth: 0
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :+
-        │   │           │           ├── message_loc: (69,6)-(69,7) = "+"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments:
-        │   │           │           │   @ ArgumentsNode (location: (69,8)-(69,9))
-        │   │           │           │   ├── flags: ∅
-        │   │           │           │   └── arguments: (length: 1)
-        │   │           │           │       └── @ LocalVariableReadNode (location: (69,8)-(69,9))
-        │   │           │           │           ├── name: :b
-        │   │           │           │           └── depth: 0
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── locals: [:a, :b]
-        │   │           ├── def_keyword_loc: (67,2)-(67,5) = "def"
-        │   │           ├── operator_loc: ∅
-        │   │           ├── lparen_loc: (67,7)-(67,8) = "("
-        │   │           ├── rparen_loc: (68,9)-(68,10) = ")"
-        │   │           ├── equal_loc: ∅
-        │   │           └── end_keyword_loc: (70,2)-(70,5) = "end"
-        │   ├── end_keyword_loc: (71,0)-(71,3) = "end"
-        │   └── name: :X
-        ├── @ ModuleNode (location: (74,0)-(79,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (74,0)-(74,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (74,7)-(74,8))
-        │   │   └── name: :X
-        │   ├── body:
-        │   │   @ StatementsNode (location: (75,2)-(78,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ConstantWriteNode (location: (75,2)-(78,3))
-        │   │           ├── name: :X
-        │   │           ├── name_loc: (75,2)-(75,3) = "X"
-        │   │           ├── value:
-        │   │           │   @ ArrayNode (location: (75,6)-(78,3))
-        │   │           │   ├── flags: ∅
-        │   │           │   ├── elements: (length: 2)
-        │   │           │   │   ├── @ SymbolNode (location: (76,4)-(76,10))
-        │   │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │           │   │   │   ├── opening_loc: (76,4)-(76,5) = ":"
-        │   │           │   │   │   ├── value_loc: (76,5)-(76,10) = "line3"
-        │   │           │   │   │   ├── closing_loc: ∅
-        │   │           │   │   │   └── unescaped: "line3"
-        │   │           │   │   └── @ SymbolNode (location: (77,4)-(77,10))
-        │   │           │   │       ├── flags: forced_us_ascii_encoding
-        │   │           │   │       ├── opening_loc: (77,4)-(77,5) = ":"
-        │   │           │   │       ├── value_loc: (77,5)-(77,10) = "line4"
-        │   │           │   │       ├── closing_loc: ∅
-        │   │           │   │       └── unescaped: "line4"
-        │   │           │   ├── opening_loc: (75,6)-(75,7) = "["
-        │   │           │   └── closing_loc: (78,2)-(78,3) = "]"
-        │   │           └── operator_loc: (75,4)-(75,5) = "="
-        │   ├── end_keyword_loc: (79,0)-(79,3) = "end"
-        │   └── name: :X
-        ├── @ ModuleNode (location: (82,0)-(86,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (82,0)-(82,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (82,7)-(82,8))
-        │   │   └── name: :X
-        │   ├── body:
-        │   │   @ StatementsNode (location: (83,2)-(85,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ModuleNode (location: (83,2)-(85,5))
-        │   │           ├── locals: []
-        │   │           ├── module_keyword_loc: (83,2)-(83,8) = "module"
-        │   │           ├── constant_path:
-        │   │           │   @ ConstantReadNode (location: (83,9)-(83,10))
-        │   │           │   └── name: :Y
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (84,4)-(84,10))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ ConstantWriteNode (location: (84,4)-(84,10))
-        │   │           │           ├── name: :Z
-        │   │           │           ├── name_loc: (84,4)-(84,5) = "Z"
-        │   │           │           ├── value:
-        │   │           │           │   @ IntegerNode (location: (84,8)-(84,10))
-        │   │           │           │   ├── flags: decimal
-        │   │           │           │   └── value: 42
-        │   │           │           └── operator_loc: (84,6)-(84,7) = "="
-        │   │           ├── end_keyword_loc: (85,2)-(85,5) = "end"
-        │   │           └── name: :Y
-        │   ├── end_keyword_loc: (86,0)-(86,3) = "end"
-        │   └── name: :X
-        └── @ CallNode (location: (89,0)-(92,1))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :x
-            ├── message_loc: (89,0)-(89,1) = "x"
-            ├── opening_loc: (89,1)-(89,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (90,0)-(91,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ SymbolNode (location: (90,0)-(90,6))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (90,0)-(90,1) = ":"
-            │       │   ├── value_loc: (90,1)-(90,6) = "line2"
-            │       │   ├── closing_loc: ∅
-            │       │   └── unescaped: "line2"
-            │       └── @ SymbolNode (location: (91,0)-(91,6))
-            │           ├── flags: forced_us_ascii_encoding
-            │           ├── opening_loc: (91,0)-(91,1) = ":"
-            │           ├── value_loc: (91,1)-(91,6) = "line3"
-            │           ├── closing_loc: ∅
-            │           └── unescaped: "line3"
-            ├── closing_loc: (92,0)-(92,1) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/__ENCODING__.txt b/test/mri/prism/snapshots/seattlerb/__ENCODING__.txt
deleted file mode 100644
index 1b223bd8fe7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/__ENCODING__.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ SourceEncodingNode (location: (1,0)-(1,12))
diff --git a/test/mri/prism/snapshots/seattlerb/alias_gvar_backref.txt b/test/mri/prism/snapshots/seattlerb/alias_gvar_backref.txt
deleted file mode 100644
index a2586423d78..00000000000
--- a/test/mri/prism/snapshots/seattlerb/alias_gvar_backref.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ AliasGlobalVariableNode (location: (1,0)-(1,15))
-            ├── new_name:
-            │   @ GlobalVariableReadNode (location: (1,6)-(1,12))
-            │   └── name: :$MATCH
-            ├── old_name:
-            │   @ BackReferenceReadNode (location: (1,13)-(1,15))
-            │   └── name: :$&
-            └── keyword_loc: (1,0)-(1,5) = "alias"
diff --git a/test/mri/prism/snapshots/seattlerb/alias_resword.txt b/test/mri/prism/snapshots/seattlerb/alias_resword.txt
deleted file mode 100644
index 99ed696c687..00000000000
--- a/test/mri/prism/snapshots/seattlerb/alias_resword.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ AliasMethodNode (location: (1,0)-(1,12))
-            ├── new_name:
-            │   @ SymbolNode (location: (1,6)-(1,8))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: ∅
-            │   ├── value_loc: (1,6)-(1,8) = "in"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "in"
-            ├── old_name:
-            │   @ SymbolNode (location: (1,9)-(1,12))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: ∅
-            │   ├── value_loc: (1,9)-(1,12) = "out"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "out"
-            └── keyword_loc: (1,0)-(1,5) = "alias"
diff --git a/test/mri/prism/snapshots/seattlerb/and_multi.txt b/test/mri/prism/snapshots/seattlerb/and_multi.txt
deleted file mode 100644
index b60b131fd2d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/and_multi.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,4))
-    └── body: (length: 1)
-        └── @ AndNode (location: (1,0)-(3,4))
-            ├── left:
-            │   @ AndNode (location: (1,0)-(2,9))
-            │   ├── left:
-            │   │   @ TrueNode (location: (1,0)-(1,4))
-            │   ├── right:
-            │   │   @ CallNode (location: (2,0)-(2,9))
-            │   │   ├── flags: ∅
-            │   │   ├── receiver:
-            │   │   │   @ FalseNode (location: (2,4)-(2,9))
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :!
-            │   │   ├── message_loc: (2,0)-(2,3) = "not"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   └── operator_loc: (1,5)-(1,8) = "and"
-            ├── right:
-            │   @ TrueNode (location: (3,0)-(3,4))
-            └── operator_loc: (2,10)-(2,13) = "and"
diff --git a/test/mri/prism/snapshots/seattlerb/aref_args_assocs.txt b/test/mri/prism/snapshots/seattlerb/aref_args_assocs.txt
deleted file mode 100644
index b729186dc5e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/aref_args_assocs.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,8))
-            ├── flags: ∅
-            ├── elements: (length: 1)
-            │   └── @ KeywordHashNode (location: (1,1)-(1,7))
-            │       ├── flags: ∅
-            │       └── elements: (length: 1)
-            │           └── @ AssocNode (location: (1,1)-(1,7))
-            │               ├── key:
-            │               │   @ IntegerNode (location: (1,1)-(1,2))
-            │               │   ├── flags: decimal
-            │               │   └── value: 1
-            │               ├── value:
-            │               │   @ IntegerNode (location: (1,6)-(1,7))
-            │               │   ├── flags: decimal
-            │               │   └── value: 2
-            │               └── operator_loc: (1,3)-(1,5) = "=>"
-            ├── opening_loc: (1,0)-(1,1) = "["
-            └── closing_loc: (1,7)-(1,8) = "]"
diff --git a/test/mri/prism/snapshots/seattlerb/aref_args_lit_assocs.txt b/test/mri/prism/snapshots/seattlerb/aref_args_lit_assocs.txt
deleted file mode 100644
index 0e9454d780b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/aref_args_lit_assocs.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,11))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ IntegerNode (location: (1,1)-(1,2))
-            │   │   ├── flags: decimal
-            │   │   └── value: 1
-            │   └── @ KeywordHashNode (location: (1,4)-(1,10))
-            │       ├── flags: ∅
-            │       └── elements: (length: 1)
-            │           └── @ AssocNode (location: (1,4)-(1,10))
-            │               ├── key:
-            │               │   @ IntegerNode (location: (1,4)-(1,5))
-            │               │   ├── flags: decimal
-            │               │   └── value: 2
-            │               ├── value:
-            │               │   @ IntegerNode (location: (1,9)-(1,10))
-            │               │   ├── flags: decimal
-            │               │   └── value: 3
-            │               └── operator_loc: (1,6)-(1,8) = "=>"
-            ├── opening_loc: (1,0)-(1,1) = "["
-            └── closing_loc: (1,10)-(1,11) = "]"
diff --git a/test/mri/prism/snapshots/seattlerb/args_kw_block.txt b/test/mri/prism/snapshots/seattlerb/args_kw_block.txt
deleted file mode 100644
index 1ad933c74e3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/args_kw_block.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,20))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,14))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,6)-(1,10))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :a
-            │   │       ├── name_loc: (1,6)-(1,8) = "a:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,9)-(1,10))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── keyword_rest: ∅
-            │   └── block:
-            │       @ BlockParameterNode (location: (1,12)-(1,14))
-            │       ├── flags: ∅
-            │       ├── name: :b
-            │       ├── name_loc: (1,13)-(1,14) = "b"
-            │       └── operator_loc: (1,12)-(1,13) = "&"
-            ├── body: ∅
-            ├── locals: [:a, :b]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,14)-(1,15) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,17)-(1,20) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/array_line_breaks.txt b/test/mri/prism/snapshots/seattlerb/array_line_breaks.txt
deleted file mode 100644
index 880fedf9330..00000000000
--- a/test/mri/prism/snapshots/seattlerb/array_line_breaks.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,1))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(3,4))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (2,0)-(2,3))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (2,0)-(2,1) = "'"
-        │   │   │   ├── content_loc: (2,1)-(2,2) = "a"
-        │   │   │   ├── closing_loc: (2,2)-(2,3) = "'"
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ StringNode (location: (3,0)-(3,3))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (3,0)-(3,1) = "'"
-        │   │       ├── content_loc: (3,1)-(3,2) = "b"
-        │   │       ├── closing_loc: (3,2)-(3,3) = "'"
-        │   │       └── unescaped: "b"
-        │   ├── opening_loc: (1,0)-(1,1) = "["
-        │   └── closing_loc: (3,3)-(3,4) = "]"
-        └── @ IntegerNode (location: (4,0)-(4,1))
-            ├── flags: decimal
-            └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/array_lits_trailing_calls.txt b/test/mri/prism/snapshots/seattlerb/array_lits_trailing_calls.txt
deleted file mode 100644
index d46a181fc76..00000000000
--- a/test/mri/prism/snapshots/seattlerb/array_lits_trailing_calls.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,4))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ArrayNode (location: (1,0)-(1,4))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 0)
-        │   │   ├── opening_loc: (1,0)-(1,3) = "%w["
-        │   │   └── closing_loc: (1,3)-(1,4) = "]"
-        │   ├── call_operator_loc: (1,4)-(1,5) = "."
-        │   ├── name: :b
-        │   ├── message_loc: (1,5)-(1,6) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,4))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ ArrayNode (location: (3,0)-(3,2))
-            │   ├── flags: ∅
-            │   ├── elements: (length: 0)
-            │   ├── opening_loc: (3,0)-(3,1) = "["
-            │   └── closing_loc: (3,1)-(3,2) = "]"
-            ├── call_operator_loc: (3,2)-(3,3) = "."
-            ├── name: :b
-            ├── message_loc: (3,3)-(3,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/assoc__bare.txt b/test/mri/prism/snapshots/seattlerb/assoc__bare.txt
deleted file mode 100644
index 28e4f713c51..00000000000
--- a/test/mri/prism/snapshots/seattlerb/assoc__bare.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,0)-(1,6))
-            ├── opening_loc: (1,0)-(1,1) = "{"
-            ├── elements: (length: 1)
-            │   └── @ AssocNode (location: (1,2)-(1,4))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (1,2)-(1,4))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: ∅
-            │       │   ├── value_loc: (1,2)-(1,3) = "y"
-            │       │   ├── closing_loc: (1,3)-(1,4) = ":"
-            │       │   └── unescaped: "y"
-            │       ├── value:
-            │       │   @ ImplicitNode (location: (1,2)-(1,4))
-            │       │   └── value:
-            │       │       @ CallNode (location: (1,2)-(1,4))
-            │       │       ├── flags: ignore_visibility
-            │       │       ├── receiver: ∅
-            │       │       ├── call_operator_loc: ∅
-            │       │       ├── name: :y
-            │       │       ├── message_loc: (1,2)-(1,3) = "y"
-            │       │       ├── opening_loc: ∅
-            │       │       ├── arguments: ∅
-            │       │       ├── closing_loc: ∅
-            │       │       └── block: ∅
-            │       └── operator_loc: ∅
-            └── closing_loc: (1,5)-(1,6) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/assoc_label.txt b/test/mri/prism/snapshots/seattlerb/assoc_label.txt
deleted file mode 100644
index 923f5450f43..00000000000
--- a/test/mri/prism/snapshots/seattlerb/assoc_label.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,2)-(1,5))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,2)-(1,5))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,2)-(1,4))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (1,2)-(1,3) = "b"
-            │                   │   ├── closing_loc: (1,3)-(1,4) = ":"
-            │                   │   └── unescaped: "b"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,4)-(1,5))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   └── operator_loc: ∅
-            ├── closing_loc: (1,5)-(1,6) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/attr_asgn_colon_id.txt b/test/mri/prism/snapshots/seattlerb/attr_asgn_colon_id.txt
deleted file mode 100644
index 589433eda89..00000000000
--- a/test/mri/prism/snapshots/seattlerb/attr_asgn_colon_id.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ ConstantReadNode (location: (1,0)-(1,1))
-            │   └── name: :A
-            ├── call_operator_loc: (1,1)-(1,3) = "::"
-            ├── name: :b=
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,7)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/attrasgn_array_arg.txt b/test/mri/prism/snapshots/seattlerb/attrasgn_array_arg.txt
deleted file mode 100644
index 9b04ae9656e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/attrasgn_array_arg.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]=
-            ├── message_loc: (1,1)-(1,9) = "[[1, 2]]"
-            ├── opening_loc: (1,1)-(1,2) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ ArrayNode (location: (1,2)-(1,8))
-            │       │   ├── flags: ∅
-            │       │   ├── elements: (length: 2)
-            │       │   │   ├── @ IntegerNode (location: (1,3)-(1,4))
-            │       │   │   │   ├── flags: decimal
-            │       │   │   │   └── value: 1
-            │       │   │   └── @ IntegerNode (location: (1,6)-(1,7))
-            │       │   │       ├── flags: decimal
-            │       │   │       └── value: 2
-            │       │   ├── opening_loc: (1,2)-(1,3) = "["
-            │       │   └── closing_loc: (1,7)-(1,8) = "]"
-            │       └── @ IntegerNode (location: (1,12)-(1,13))
-            │           ├── flags: decimal
-            │           └── value: 3
-            ├── closing_loc: (1,8)-(1,9) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/attrasgn_array_lhs.txt b/test/mri/prism/snapshots/seattlerb/attrasgn_array_lhs.txt
deleted file mode 100644
index 39544e98da2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/attrasgn_array_lhs.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,42))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,42))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,42))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ ArrayNode (location: (1,0)-(1,12))
-            │   ├── flags: ∅
-            │   ├── elements: (length: 4)
-            │   │   ├── @ IntegerNode (location: (1,1)-(1,2))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 1
-            │   │   ├── @ IntegerNode (location: (1,4)-(1,5))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 2
-            │   │   ├── @ IntegerNode (location: (1,7)-(1,8))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 3
-            │   │   └── @ IntegerNode (location: (1,10)-(1,11))
-            │   │       ├── flags: decimal
-            │   │       └── value: 4
-            │   ├── opening_loc: (1,0)-(1,1) = "["
-            │   └── closing_loc: (1,11)-(1,12) = "]"
-            ├── call_operator_loc: ∅
-            ├── name: :[]=
-            ├── message_loc: (1,12)-(1,24) = "[from .. to]"
-            ├── opening_loc: (1,12)-(1,13) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,13)-(1,42))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ RangeNode (location: (1,13)-(1,23))
-            │       │   ├── flags: ∅
-            │       │   ├── left:
-            │       │   │   @ CallNode (location: (1,13)-(1,17))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :from
-            │       │   │   ├── message_loc: (1,13)-(1,17) = "from"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── right:
-            │       │   │   @ CallNode (location: (1,21)-(1,23))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :to
-            │       │   │   ├── message_loc: (1,21)-(1,23) = "to"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   └── operator_loc: (1,18)-(1,20) = ".."
-            │       └── @ ArrayNode (location: (1,27)-(1,42))
-            │           ├── flags: ∅
-            │           ├── elements: (length: 3)
-            │           │   ├── @ StringNode (location: (1,28)-(1,31))
-            │           │   │   ├── flags: ∅
-            │           │   │   ├── opening_loc: (1,28)-(1,29) = "\""
-            │           │   │   ├── content_loc: (1,29)-(1,30) = "a"
-            │           │   │   ├── closing_loc: (1,30)-(1,31) = "\""
-            │           │   │   └── unescaped: "a"
-            │           │   ├── @ StringNode (location: (1,33)-(1,36))
-            │           │   │   ├── flags: ∅
-            │           │   │   ├── opening_loc: (1,33)-(1,34) = "\""
-            │           │   │   ├── content_loc: (1,34)-(1,35) = "b"
-            │           │   │   ├── closing_loc: (1,35)-(1,36) = "\""
-            │           │   │   └── unescaped: "b"
-            │           │   └── @ StringNode (location: (1,38)-(1,41))
-            │           │       ├── flags: ∅
-            │           │       ├── opening_loc: (1,38)-(1,39) = "\""
-            │           │       ├── content_loc: (1,39)-(1,40) = "c"
-            │           │       ├── closing_loc: (1,40)-(1,41) = "\""
-            │           │       └── unescaped: "c"
-            │           ├── opening_loc: (1,27)-(1,28) = "["
-            │           └── closing_loc: (1,41)-(1,42) = "]"
-            ├── closing_loc: (1,23)-(1,24) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/attrasgn_primary_dot_constant.txt b/test/mri/prism/snapshots/seattlerb/attrasgn_primary_dot_constant.txt
deleted file mode 100644
index d4c4fe10705..00000000000
--- a/test/mri/prism/snapshots/seattlerb/attrasgn_primary_dot_constant.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :B=
-            ├── message_loc: (1,2)-(1,3) = "B"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/backticks_interpolation_line.txt b/test/mri/prism/snapshots/seattlerb/backticks_interpolation_line.txt
deleted file mode 100644
index 67c8be034eb..00000000000
--- a/test/mri/prism/snapshots/seattlerb/backticks_interpolation_line.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :x
-            ├── message_loc: (1,0)-(1,1) = "x"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InterpolatedXStringNode (location: (1,2)-(1,8))
-            │           ├── opening_loc: (1,2)-(1,3) = "`"
-            │           ├── parts: (length: 1)
-            │           │   └── @ EmbeddedStatementsNode (location: (1,3)-(1,7))
-            │           │       ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │           │       ├── statements:
-            │           │       │   @ StatementsNode (location: (1,5)-(1,6))
-            │           │       │   └── body: (length: 1)
-            │           │       │       └── @ CallNode (location: (1,5)-(1,6))
-            │           │       │           ├── flags: variable_call, ignore_visibility
-            │           │       │           ├── receiver: ∅
-            │           │       │           ├── call_operator_loc: ∅
-            │           │       │           ├── name: :y
-            │           │       │           ├── message_loc: (1,5)-(1,6) = "y"
-            │           │       │           ├── opening_loc: ∅
-            │           │       │           ├── arguments: ∅
-            │           │       │           ├── closing_loc: ∅
-            │           │       │           └── block: ∅
-            │           │       └── closing_loc: (1,6)-(1,7) = "}"
-            │           └── closing_loc: (1,7)-(1,8) = "`"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bang_eq.txt b/test/mri/prism/snapshots/seattlerb/bang_eq.txt
deleted file mode 100644
index ec3dd888b27..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bang_eq.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :!=
-            ├── message_loc: (1,2)-(1,4) = "!="
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bdot2.txt b/test/mri/prism/snapshots/seattlerb/bdot2.txt
deleted file mode 100644
index d4fb86fbe66..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bdot2.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 3)
-        ├── @ RangeNode (location: (1,0)-(1,4))
-        │   ├── flags: ∅
-        │   ├── left: ∅
-        │   ├── right:
-        │   │   @ IntegerNode (location: (1,2)-(1,4))
-        │   │   ├── flags: decimal
-        │   │   └── value: 10
-        │   └── operator_loc: (1,0)-(1,2) = ".."
-        ├── @ RangeNode (location: (2,2)-(2,5))
-        │   ├── flags: ∅
-        │   ├── left: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (2,4)-(2,5))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (2,4)-(2,5) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (2,2)-(2,4) = ".."
-        └── @ CallNode (location: (3,2)-(3,3))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (3,2)-(3,3) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bdot3.txt b/test/mri/prism/snapshots/seattlerb/bdot3.txt
deleted file mode 100644
index 0c960f04587..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bdot3.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 3)
-        ├── @ RangeNode (location: (1,0)-(1,5))
-        │   ├── flags: exclude_end
-        │   ├── left: ∅
-        │   ├── right:
-        │   │   @ IntegerNode (location: (1,3)-(1,5))
-        │   │   ├── flags: decimal
-        │   │   └── value: 10
-        │   └── operator_loc: (1,0)-(1,3) = "..."
-        ├── @ RangeNode (location: (2,2)-(2,6))
-        │   ├── flags: exclude_end
-        │   ├── left: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (2,5)-(2,6))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (2,5)-(2,6) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (2,2)-(2,5) = "..."
-        └── @ CallNode (location: (3,2)-(3,3))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (3,2)-(3,3) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/begin_ensure_no_bodies.txt b/test/mri/prism/snapshots/seattlerb/begin_ensure_no_bodies.txt
deleted file mode 100644
index e1698d0baef..00000000000
--- a/test/mri/prism/snapshots/seattlerb/begin_ensure_no_bodies.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(3,3))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements: ∅
-            ├── rescue_clause: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (2,0)-(3,3))
-            │   ├── ensure_keyword_loc: (2,0)-(2,6) = "ensure"
-            │   ├── statements: ∅
-            │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/begin_rescue_else_ensure_bodies.txt b/test/mri/prism/snapshots/seattlerb/begin_rescue_else_ensure_bodies.txt
deleted file mode 100644
index 6603e5c8945..00000000000
--- a/test/mri/prism/snapshots/seattlerb/begin_rescue_else_ensure_bodies.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,3))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(9,3))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (2,2)-(2,3))
-            │   └── body: (length: 1)
-            │       └── @ IntegerNode (location: (2,2)-(2,3))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── rescue_clause:
-            │   @ RescueNode (location: (3,0)-(4,3))
-            │   ├── keyword_loc: (3,0)-(3,6) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (4,2)-(4,3))
-            │   │   └── body: (length: 1)
-            │   │       └── @ IntegerNode (location: (4,2)-(4,3))
-            │   │           ├── flags: decimal
-            │   │           └── value: 2
-            │   └── consequent: ∅
-            ├── else_clause:
-            │   @ ElseNode (location: (5,0)-(7,6))
-            │   ├── else_keyword_loc: (5,0)-(5,4) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (6,2)-(6,3))
-            │   │   └── body: (length: 1)
-            │   │       └── @ IntegerNode (location: (6,2)-(6,3))
-            │   │           ├── flags: decimal
-            │   │           └── value: 3
-            │   └── end_keyword_loc: (7,0)-(7,6) = "ensure"
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (7,0)-(9,3))
-            │   ├── ensure_keyword_loc: (7,0)-(7,6) = "ensure"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (8,2)-(8,3))
-            │   │   └── body: (length: 1)
-            │   │       └── @ IntegerNode (location: (8,2)-(8,3))
-            │   │           ├── flags: decimal
-            │   │           └── value: 4
-            │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-            └── end_keyword_loc: (9,0)-(9,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/begin_rescue_else_ensure_no_bodies.txt b/test/mri/prism/snapshots/seattlerb/begin_rescue_else_ensure_no_bodies.txt
deleted file mode 100644
index 02e1f097ac4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/begin_rescue_else_ensure_no_bodies.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,3))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(9,3))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (3,0)-(3,6))
-            │   ├── keyword_loc: (3,0)-(3,6) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements: ∅
-            │   └── consequent: ∅
-            ├── else_clause:
-            │   @ ElseNode (location: (5,0)-(7,6))
-            │   ├── else_keyword_loc: (5,0)-(5,4) = "else"
-            │   ├── statements: ∅
-            │   └── end_keyword_loc: (7,0)-(7,6) = "ensure"
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (7,0)-(9,3))
-            │   ├── ensure_keyword_loc: (7,0)-(7,6) = "ensure"
-            │   ├── statements: ∅
-            │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-            └── end_keyword_loc: (9,0)-(9,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/begin_rescue_ensure_no_bodies.txt b/test/mri/prism/snapshots/seattlerb/begin_rescue_ensure_no_bodies.txt
deleted file mode 100644
index b36fe5c1fef..00000000000
--- a/test/mri/prism/snapshots/seattlerb/begin_rescue_ensure_no_bodies.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(4,3))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (2,0)-(2,6))
-            │   ├── keyword_loc: (2,0)-(2,6) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements: ∅
-            │   └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (3,0)-(4,3))
-            │   ├── ensure_keyword_loc: (3,0)-(3,6) = "ensure"
-            │   ├── statements: ∅
-            │   └── end_keyword_loc: (4,0)-(4,3) = "end"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg__bare.txt b/test/mri/prism/snapshots/seattlerb/block_arg__bare.txt
deleted file mode 100644
index 165c2980be3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg__bare.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,13))
-            ├── name: :x
-            ├── name_loc: (1,4)-(1,5) = "x"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,7))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block:
-            │       @ BlockParameterNode (location: (1,6)-(1,7))
-            │       ├── flags: ∅
-            │       ├── name: ∅
-            │       ├── name_loc: ∅
-            │       └── operator_loc: (1,6)-(1,7) = "&"
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,7)-(1,8) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,10)-(1,13) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg_kwsplat.txt b/test/mri/prism/snapshots/seattlerb/block_arg_kwsplat.txt
deleted file mode 100644
index 392de8559b9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg_kwsplat.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,11))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,11))
-                ├── locals: [:b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,9))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,8))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest:
-                │   │   │   @ KeywordRestParameterNode (location: (1,5)-(1,8))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :b
-                │   │   │   ├── name_loc: (1,7)-(1,8) = "b"
-                │   │   │   └── operator_loc: (1,5)-(1,7) = "**"
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,8)-(1,9) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,10)-(1,11) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt b/test/mri/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt
deleted file mode 100644
index ee9644d59d8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,21))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,21))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,21))
-                ├── locals: [:b, :c, :d, :e]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,19))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,18))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :c
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "c"
-                │   │   │       ├── operator_loc: (1,9)-(1,10) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,10)-(1,11))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,13)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :d
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,16)-(1,18))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :e
-                │   │       ├── name_loc: (1,17)-(1,18) = "e"
-                │   │       └── operator_loc: (1,16)-(1,17) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,18)-(1,19) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,20)-(1,21) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg_opt_splat.txt b/test/mri/prism/snapshots/seattlerb/block_arg_opt_splat.txt
deleted file mode 100644
index 799bd21057a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg_opt_splat.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,20))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,20))
-                ├── locals: [:b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,18))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,17))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,13))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :c
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "c"
-                │   │   │       ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,12)-(1,13))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,15)-(1,17))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :d
-                │   │   │   ├── name_loc: (1,16)-(1,17) = "d"
-                │   │   │   └── operator_loc: (1,15)-(1,16) = "*"
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,17)-(1,18) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,19)-(1,20) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt b/test/mri/prism/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
deleted file mode 100644
index b5df136a622..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,25))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,25))
-                ├── locals: [:b, :c, :d, :e, :f]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,23))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,22))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :c
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "c"
-                │   │   │       ├── operator_loc: (1,9)-(1,10) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,10)-(1,11))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,13)-(1,15))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :d
-                │   │   │   ├── name_loc: (1,14)-(1,15) = "d"
-                │   │   │   └── operator_loc: (1,13)-(1,14) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,17)-(1,18))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :e
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,20)-(1,22))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :f
-                │   │       ├── name_loc: (1,21)-(1,22) = "f"
-                │   │       └── operator_loc: (1,20)-(1,21) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,22)-(1,23) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,24)-(1,25) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg_optional.txt b/test/mri/prism/snapshots/seattlerb/block_arg_optional.txt
deleted file mode 100644
index 8a850e9a21a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg_optional.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,13))
-                ├── locals: [:b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,11))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,10))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,10))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "b"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,9)-(1,10))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,10)-(1,11) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,12)-(1,13) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg_scope.txt b/test/mri/prism/snapshots/seattlerb/block_arg_scope.txt
deleted file mode 100644
index b99cc5e45ce..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg_scope.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,12))
-                ├── locals: [:b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,10))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,6))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 1)
-                │   │   └── @ BlockLocalVariableNode (location: (1,8)-(1,9))
-                │   │       ├── flags: ∅
-                │   │       └── name: :c
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,9)-(1,10) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,11)-(1,12) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg_scope2.txt b/test/mri/prism/snapshots/seattlerb/block_arg_scope2.txt
deleted file mode 100644
index 98b3a7da3aa..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg_scope2.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,14))
-                ├── locals: [:b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,3)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,4)-(1,5))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,4)-(1,5))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 2)
-                │   │   ├── @ BlockLocalVariableNode (location: (1,7)-(1,8))
-                │   │   │   ├── flags: ∅
-                │   │   │   └── name: :c
-                │   │   └── @ BlockLocalVariableNode (location: (1,10)-(1,11))
-                │   │       ├── flags: ∅
-                │   │       └── name: :d
-                │   ├── opening_loc: (1,3)-(1,4) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,13)-(1,14) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_arg_splat_arg.txt b/test/mri/prism/snapshots/seattlerb/block_arg_splat_arg.txt
deleted file mode 100644
index fd5813c9836..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_arg_splat_arg.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,16))
-                ├── locals: [:b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,14))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,13))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,8)-(1,10))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :c
-                │   │   │   ├── name_loc: (1,9)-(1,10) = "c"
-                │   │   │   └── operator_loc: (1,8)-(1,9) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,12)-(1,13))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :d
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,13)-(1,14) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,15)-(1,16) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_args_kwargs.txt b/test/mri/prism/snapshots/seattlerb/block_args_kwargs.txt
deleted file mode 100644
index 0975ce33679..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_args_kwargs.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,23))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,23))
-                ├── locals: [:kwargs]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,14))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,13))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest:
-                │   │   │   @ KeywordRestParameterNode (location: (1,5)-(1,13))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :kwargs
-                │   │   │   ├── name_loc: (1,7)-(1,13) = "kwargs"
-                │   │   │   └── operator_loc: (1,5)-(1,7) = "**"
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,13)-(1,14) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,15)-(1,21))
-                │   └── body: (length: 1)
-                │       └── @ LocalVariableReadNode (location: (1,15)-(1,21))
-                │           ├── name: :kwargs
-                │           └── depth: 0
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,22)-(1,23) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_args_no_kwargs.txt b/test/mri/prism/snapshots/seattlerb/block_args_no_kwargs.txt
deleted file mode 100644
index d47349defbd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_args_no_kwargs.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,13))
-                ├── locals: []
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,11))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,10))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest:
-                │   │   │   @ NoKeywordsParameterNode (location: (1,5)-(1,10))
-                │   │   │   ├── operator_loc: (1,5)-(1,7) = "**"
-                │   │   │   └── keyword_loc: (1,7)-(1,10) = "nil"
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,10)-(1,11) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,12)-(1,13) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_args_opt1.txt b/test/mri/prism/snapshots/seattlerb/block_args_opt1.txt
deleted file mode 100644
index 1f21c0a4773..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_args_opt1.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,24))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,24))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "b"
-                │   │   │       ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,12)-(1,14))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,16)-(1,22))
-                │   └── body: (length: 1)
-                │       └── @ ArrayNode (location: (1,16)-(1,22))
-                │           ├── flags: ∅
-                │           ├── elements: (length: 2)
-                │           │   ├── @ LocalVariableReadNode (location: (1,17)-(1,18))
-                │           │   │   ├── name: :a
-                │           │   │   └── depth: 0
-                │           │   └── @ LocalVariableReadNode (location: (1,20)-(1,21))
-                │           │       ├── name: :b
-                │           │       └── depth: 0
-                │           ├── opening_loc: (1,16)-(1,17) = "["
-                │           └── closing_loc: (1,21)-(1,22) = "]"
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,23)-(1,24) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_args_opt2.txt b/test/mri/prism/snapshots/seattlerb/block_args_opt2.txt
deleted file mode 100644
index a8d736dde73..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_args_opt2.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,18))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,18))
-                ├── locals: [:b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,16))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,6)-(1,14))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 2)
-                │   │   │   ├── @ OptionalParameterNode (location: (1,6)-(1,9))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   ├── name: :b
-                │   │   │   │   ├── name_loc: (1,6)-(1,7) = "b"
-                │   │   │   │   ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │   │   └── value:
-                │   │   │   │       @ IntegerNode (location: (1,8)-(1,9))
-                │   │   │   │       ├── flags: decimal
-                │   │   │   │       └── value: 1
-                │   │   │   └── @ OptionalParameterNode (location: (1,11)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :c
-                │   │   │       ├── name_loc: (1,11)-(1,12) = "c"
-                │   │   │       ├── operator_loc: (1,12)-(1,13) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,13)-(1,14))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 2
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,15)-(1,16) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,17)-(1,18) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_args_opt2_2.txt b/test/mri/prism/snapshots/seattlerb/block_args_opt2_2.txt
deleted file mode 100644
index 0403851ed7b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_args_opt2_2.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,35))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,35))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,35))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,35))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,23))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,22))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 2)
-                │   │   │   ├── @ OptionalParameterNode (location: (1,8)-(1,14))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   ├── name: :b
-                │   │   │   │   ├── name_loc: (1,8)-(1,9) = "b"
-                │   │   │   │   ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │   │   └── value:
-                │   │   │   │       @ IntegerNode (location: (1,12)-(1,14))
-                │   │   │   │       ├── flags: decimal
-                │   │   │   │       └── value: 42
-                │   │   │   └── @ OptionalParameterNode (location: (1,16)-(1,22))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :c
-                │   │   │       ├── name_loc: (1,16)-(1,17) = "c"
-                │   │   │       ├── operator_loc: (1,18)-(1,19) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,20)-(1,22))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 24
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,22)-(1,23) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,24)-(1,33))
-                │   └── body: (length: 1)
-                │       └── @ ArrayNode (location: (1,24)-(1,33))
-                │           ├── flags: ∅
-                │           ├── elements: (length: 3)
-                │           │   ├── @ LocalVariableReadNode (location: (1,25)-(1,26))
-                │           │   │   ├── name: :a
-                │           │   │   └── depth: 0
-                │           │   ├── @ LocalVariableReadNode (location: (1,28)-(1,29))
-                │           │   │   ├── name: :b
-                │           │   │   └── depth: 0
-                │           │   └── @ LocalVariableReadNode (location: (1,31)-(1,32))
-                │           │       ├── name: :c
-                │           │       └── depth: 0
-                │           ├── opening_loc: (1,24)-(1,25) = "["
-                │           └── closing_loc: (1,32)-(1,33) = "]"
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,34)-(1,35) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_args_opt3.txt b/test/mri/prism/snapshots/seattlerb/block_args_opt3.txt
deleted file mode 100644
index ff4495019c7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_args_opt3.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,42))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,42))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,42))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,42))
-                ├── locals: [:a, :b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,27))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,26))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 2)
-                │   │   │   ├── @ OptionalParameterNode (location: (1,8)-(1,14))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   ├── name: :b
-                │   │   │   │   ├── name_loc: (1,8)-(1,9) = "b"
-                │   │   │   │   ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │   │   └── value:
-                │   │   │   │       @ IntegerNode (location: (1,12)-(1,14))
-                │   │   │   │       ├── flags: decimal
-                │   │   │   │       └── value: 42
-                │   │   │   └── @ OptionalParameterNode (location: (1,16)-(1,22))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :c
-                │   │   │       ├── name_loc: (1,16)-(1,17) = "c"
-                │   │   │       ├── operator_loc: (1,18)-(1,19) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,20)-(1,22))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 24
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,24)-(1,26))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :d
-                │   │       ├── name_loc: (1,25)-(1,26) = "d"
-                │   │       └── operator_loc: (1,24)-(1,25) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,26)-(1,27) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,28)-(1,40))
-                │   └── body: (length: 1)
-                │       └── @ ArrayNode (location: (1,28)-(1,40))
-                │           ├── flags: ∅
-                │           ├── elements: (length: 4)
-                │           │   ├── @ LocalVariableReadNode (location: (1,29)-(1,30))
-                │           │   │   ├── name: :a
-                │           │   │   └── depth: 0
-                │           │   ├── @ LocalVariableReadNode (location: (1,32)-(1,33))
-                │           │   │   ├── name: :b
-                │           │   │   └── depth: 0
-                │           │   ├── @ LocalVariableReadNode (location: (1,35)-(1,36))
-                │           │   │   ├── name: :c
-                │           │   │   └── depth: 0
-                │           │   └── @ LocalVariableReadNode (location: (1,38)-(1,39))
-                │           │       ├── name: :d
-                │           │       └── depth: 0
-                │           ├── opening_loc: (1,28)-(1,29) = "["
-                │           └── closing_loc: (1,39)-(1,40) = "]"
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,41)-(1,42) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_break.txt b/test/mri/prism/snapshots/seattlerb/block_break.txt
deleted file mode 100644
index ce61b2f0d12..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_break.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,26))
-    └── body: (length: 1)
-        └── @ BreakNode (location: (1,0)-(1,26))
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(1,26))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,6)-(1,26))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (1,6)-(1,9) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,10)-(1,13))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (1,10)-(1,13))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :arg
-            │           │           ├── message_loc: (1,10)-(1,13) = "arg"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: ∅
-            │           └── block:
-            │               @ BlockNode (location: (1,14)-(1,26))
-            │               ├── locals: [:bar]
-            │               ├── parameters:
-            │               │   @ BlockParametersNode (location: (1,17)-(1,22))
-            │               │   ├── parameters:
-            │               │   │   @ ParametersNode (location: (1,18)-(1,21))
-            │               │   │   ├── requireds: (length: 1)
-            │               │   │   │   └── @ RequiredParameterNode (location: (1,18)-(1,21))
-            │               │   │   │       ├── flags: ∅
-            │               │   │   │       └── name: :bar
-            │               │   │   ├── optionals: (length: 0)
-            │               │   │   ├── rest: ∅
-            │               │   │   ├── posts: (length: 0)
-            │               │   │   ├── keywords: (length: 0)
-            │               │   │   ├── keyword_rest: ∅
-            │               │   │   └── block: ∅
-            │               │   ├── locals: (length: 0)
-            │               │   ├── opening_loc: (1,17)-(1,18) = "|"
-            │               │   └── closing_loc: (1,21)-(1,22) = "|"
-            │               ├── body: ∅
-            │               ├── opening_loc: (1,14)-(1,16) = "do"
-            │               └── closing_loc: (1,23)-(1,26) = "end"
-            └── keyword_loc: (1,0)-(1,5) = "break"
diff --git a/test/mri/prism/snapshots/seattlerb/block_call_defn_call_block_call.txt b/test/mri/prism/snapshots/seattlerb/block_call_defn_call_block_call.txt
deleted file mode 100644
index 2e634dc937a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_call_defn_call_block_call.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,11))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(3,4))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(3,4))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ DefNode (location: (1,2)-(3,4))
-        │   │           ├── name: :b
-        │   │           ├── name_loc: (1,6)-(1,7) = "b"
-        │   │           ├── receiver: ∅
-        │   │           ├── parameters:
-        │   │           │   @ ParametersNode (location: (1,8)-(1,9))
-        │   │           │   ├── requireds: (length: 1)
-        │   │           │   │   └── @ RequiredParameterNode (location: (1,8)-(1,9))
-        │   │           │   │       ├── flags: ∅
-        │   │           │   │       └── name: :c
-        │   │           │   ├── optionals: (length: 0)
-        │   │           │   ├── rest: ∅
-        │   │           │   ├── posts: (length: 0)
-        │   │           │   ├── keywords: (length: 0)
-        │   │           │   ├── keyword_rest: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (2,1)-(2,2))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (2,1)-(2,2))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :d
-        │   │           │           ├── message_loc: (2,1)-(2,2) = "d"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── locals: [:c]
-        │   │           ├── def_keyword_loc: (1,2)-(1,5) = "def"
-        │   │           ├── operator_loc: ∅
-        │   │           ├── lparen_loc: (1,7)-(1,8) = "("
-        │   │           ├── rparen_loc: (1,9)-(1,10) = ")"
-        │   │           ├── equal_loc: ∅
-        │   │           └── end_keyword_loc: (3,1)-(3,4) = "end"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (4,1)-(4,11))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (4,1)-(4,2))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :e
-            │   ├── message_loc: (4,1)-(4,2) = "e"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (4,2)-(4,3) = "."
-            ├── name: :f
-            ├── message_loc: (4,3)-(4,4) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (4,5)-(4,11))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (4,5)-(4,7) = "do"
-                └── closing_loc: (4,8)-(4,11) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/block_call_dot_op2_brace_block.txt b/test/mri/prism/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
deleted file mode 100644
index e46104b868c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,31))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,31))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,31))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,16))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,0)-(1,1))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,1)-(1,2) = "."
-            │   ├── name: :b
-            │   ├── message_loc: (1,2)-(1,3) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,4)-(1,7))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,4)-(1,7))
-            │   │           ├── flags: ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :c
-            │   │           ├── message_loc: (1,4)-(1,5) = "c"
-            │   │           ├── opening_loc: (1,5)-(1,6) = "("
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: (1,6)-(1,7) = ")"
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (1,8)-(1,16))
-            │       ├── locals: []
-            │       ├── parameters: ∅
-            │       ├── body:
-            │       │   @ StatementsNode (location: (1,11)-(1,12))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (1,11)-(1,12))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :d
-            │       │           ├── message_loc: (1,11)-(1,12) = "d"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       ├── opening_loc: (1,8)-(1,10) = "do"
-            │       └── closing_loc: (1,13)-(1,16) = "end"
-            ├── call_operator_loc: (1,16)-(1,17) = "."
-            ├── name: :e
-            ├── message_loc: (1,17)-(1,18) = "e"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,19)-(1,31))
-                ├── locals: [:f]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,22)-(1,25))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,23)-(1,24))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,23)-(1,24))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :f
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,22)-(1,23) = "|"
-                │   └── closing_loc: (1,24)-(1,25) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,26)-(1,27))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (1,26)-(1,27))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :g
-                │           ├── message_loc: (1,26)-(1,27) = "g"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (1,19)-(1,21) = "do"
-                └── closing_loc: (1,28)-(1,31) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt b/test/mri/prism/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
deleted file mode 100644
index 05d076f8d6f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,33))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,33))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,33))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,16))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,0)-(1,1))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,1)-(1,2) = "."
-            │   ├── name: :b
-            │   ├── message_loc: (1,2)-(1,3) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,4)-(1,7))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,4)-(1,7))
-            │   │           ├── flags: ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :c
-            │   │           ├── message_loc: (1,4)-(1,5) = "c"
-            │   │           ├── opening_loc: (1,5)-(1,6) = "("
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: (1,6)-(1,7) = ")"
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (1,8)-(1,16))
-            │       ├── locals: []
-            │       ├── parameters: ∅
-            │       ├── body:
-            │       │   @ StatementsNode (location: (1,11)-(1,12))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (1,11)-(1,12))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :d
-            │       │           ├── message_loc: (1,11)-(1,12) = "d"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       ├── opening_loc: (1,8)-(1,10) = "do"
-            │       └── closing_loc: (1,13)-(1,16) = "end"
-            ├── call_operator_loc: (1,16)-(1,17) = "."
-            ├── name: :e
-            ├── message_loc: (1,17)-(1,18) = "e"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,19)-(1,20))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,19)-(1,20))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :f
-            │           ├── message_loc: (1,19)-(1,20) = "f"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,21)-(1,33))
-                ├── locals: [:g]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,24)-(1,27))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,25)-(1,26))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,25)-(1,26))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :g
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,24)-(1,25) = "|"
-                │   └── closing_loc: (1,26)-(1,27) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,28)-(1,29))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (1,28)-(1,29))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :h
-                │           ├── message_loc: (1,28)-(1,29) = "h"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (1,21)-(1,23) = "do"
-                └── closing_loc: (1,30)-(1,33) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/block_call_operation_colon.txt b/test/mri/prism/snapshots/seattlerb/block_call_operation_colon.txt
deleted file mode 100644
index 9fd13b0dfcc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_call_operation_colon.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,15))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,12))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,0)-(1,1))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,1)-(1,2) = "."
-            │   ├── name: :b
-            │   ├── message_loc: (1,2)-(1,3) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,4)-(1,5))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :c
-            │   │           ├── message_loc: (1,4)-(1,5) = "c"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (1,6)-(1,12))
-            │       ├── locals: []
-            │       ├── parameters: ∅
-            │       ├── body: ∅
-            │       ├── opening_loc: (1,6)-(1,8) = "do"
-            │       └── closing_loc: (1,9)-(1,12) = "end"
-            ├── call_operator_loc: (1,12)-(1,14) = "::"
-            ├── name: :d
-            ├── message_loc: (1,14)-(1,15) = "d"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/block_call_operation_dot.txt b/test/mri/prism/snapshots/seattlerb/block_call_operation_dot.txt
deleted file mode 100644
index 43c19d33181..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_call_operation_dot.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,12))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,0)-(1,1))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,1)-(1,2) = "."
-            │   ├── name: :b
-            │   ├── message_loc: (1,2)-(1,3) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,4)-(1,5))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :c
-            │   │           ├── message_loc: (1,4)-(1,5) = "c"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (1,6)-(1,12))
-            │       ├── locals: []
-            │       ├── parameters: ∅
-            │       ├── body: ∅
-            │       ├── opening_loc: (1,6)-(1,8) = "do"
-            │       └── closing_loc: (1,9)-(1,12) = "end"
-            ├── call_operator_loc: (1,12)-(1,13) = "."
-            ├── name: :d
-            ├── message_loc: (1,13)-(1,14) = "d"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/block_call_paren_call_block_call.txt b/test/mri/prism/snapshots/seattlerb/block_call_paren_call_block_call.txt
deleted file mode 100644
index 10c1780d374..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_call_paren_call_block_call.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,10))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,5))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (1,2)-(1,5))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (1,3)-(1,4))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (1,3)-(1,4))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :b
-        │   │           │           ├── message_loc: (1,3)-(1,4) = "b"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── opening_loc: (1,2)-(1,3) = "("
-        │   │           └── closing_loc: (1,4)-(1,5) = ")"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (2,0)-(2,10))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (2,0)-(2,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :c
-            │   ├── message_loc: (2,0)-(2,1) = "c"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (2,1)-(2,2) = "."
-            ├── name: :d
-            ├── message_loc: (2,2)-(2,3) = "d"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (2,4)-(2,10))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (2,4)-(2,6) = "do"
-                └── closing_loc: (2,7)-(2,10) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/block_command_operation_colon.txt b/test/mri/prism/snapshots/seattlerb/block_command_operation_colon.txt
deleted file mode 100644
index 30fd6dafa00..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_command_operation_colon.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,11))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,2)-(1,4))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ SymbolNode (location: (1,2)-(1,4))
-            │   │           ├── flags: forced_us_ascii_encoding
-            │   │           ├── opening_loc: (1,2)-(1,3) = ":"
-            │   │           ├── value_loc: (1,3)-(1,4) = "b"
-            │   │           ├── closing_loc: ∅
-            │   │           └── unescaped: "b"
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (1,5)-(1,11))
-            │       ├── locals: []
-            │       ├── parameters: ∅
-            │       ├── body: ∅
-            │       ├── opening_loc: (1,5)-(1,7) = "do"
-            │       └── closing_loc: (1,8)-(1,11) = "end"
-            ├── call_operator_loc: (1,11)-(1,13) = "::"
-            ├── name: :c
-            ├── message_loc: (1,13)-(1,14) = "c"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,15)-(1,17))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ SymbolNode (location: (1,15)-(1,17))
-            │           ├── flags: forced_us_ascii_encoding
-            │           ├── opening_loc: (1,15)-(1,16) = ":"
-            │           ├── value_loc: (1,16)-(1,17) = "d"
-            │           ├── closing_loc: ∅
-            │           └── unescaped: "d"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/block_command_operation_dot.txt b/test/mri/prism/snapshots/seattlerb/block_command_operation_dot.txt
deleted file mode 100644
index e4f69d36045..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_command_operation_dot.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,11))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,2)-(1,4))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ SymbolNode (location: (1,2)-(1,4))
-            │   │           ├── flags: forced_us_ascii_encoding
-            │   │           ├── opening_loc: (1,2)-(1,3) = ":"
-            │   │           ├── value_loc: (1,3)-(1,4) = "b"
-            │   │           ├── closing_loc: ∅
-            │   │           └── unescaped: "b"
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (1,5)-(1,11))
-            │       ├── locals: []
-            │       ├── parameters: ∅
-            │       ├── body: ∅
-            │       ├── opening_loc: (1,5)-(1,7) = "do"
-            │       └── closing_loc: (1,8)-(1,11) = "end"
-            ├── call_operator_loc: (1,11)-(1,12) = "."
-            ├── name: :c
-            ├── message_loc: (1,12)-(1,13) = "c"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,14)-(1,16))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ SymbolNode (location: (1,14)-(1,16))
-            │           ├── flags: forced_us_ascii_encoding
-            │           ├── opening_loc: (1,14)-(1,15) = ":"
-            │           ├── value_loc: (1,15)-(1,16) = "d"
-            │           ├── closing_loc: ∅
-            │           └── unescaped: "d"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt b/test/mri/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
deleted file mode 100644
index e309ec1f98f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,14))
-                ├── locals: [:a]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,11))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,11))
-                │   │   │       ├── lefts: (length: 0)
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,6)-(1,7))
-                │   │   │       │   ├── operator_loc: (1,6)-(1,7) = "*"
-                │   │   │       │   └── expression: ∅
-                │   │   │       ├── rights: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :a
-                │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │       └── rparen_loc: (1,10)-(1,11) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,13)-(1,14) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_decomp_arg_splat.txt b/test/mri/prism/snapshots/seattlerb/block_decomp_arg_splat.txt
deleted file mode 100644
index 8d28fa7e02d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_decomp_arg_splat.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,14))
-                ├── locals: [:b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,11))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,11))
-                │   │   │       ├── lefts: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,9)-(1,10))
-                │   │   │       │   ├── operator_loc: (1,9)-(1,10) = "*"
-                │   │   │       │   └── expression: ∅
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │       └── rparen_loc: (1,10)-(1,11) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,13)-(1,14) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt b/test/mri/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
deleted file mode 100644
index 4f4a82acf59..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,18))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,18))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,16))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,15))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,15))
-                │   │   │       ├── lefts: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :a
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,9)-(1,11))
-                │   │   │       │   ├── operator_loc: (1,9)-(1,10) = "*"
-                │   │   │       │   └── expression:
-                │   │   │       │       @ RequiredParameterNode (location: (1,10)-(1,11))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rights: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,13)-(1,14))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :c
-                │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │       └── rparen_loc: (1,14)-(1,15) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,15)-(1,16) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,17)-(1,18) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_decomp_splat.txt b/test/mri/prism/snapshots/seattlerb/block_decomp_splat.txt
deleted file mode 100644
index 09d34401264..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_decomp_splat.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,12))
-                ├── locals: [:a]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,10))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,9))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,9))
-                │   │   │       ├── lefts: (length: 0)
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,6)-(1,8))
-                │   │   │       │   ├── operator_loc: (1,6)-(1,7) = "*"
-                │   │   │       │   └── expression:
-                │   │   │       │       @ RequiredParameterNode (location: (1,7)-(1,8))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :a
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │       └── rparen_loc: (1,8)-(1,9) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,9)-(1,10) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,11)-(1,12) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_kw.txt b/test/mri/prism/snapshots/seattlerb/block_kw.txt
deleted file mode 100644
index f022637dae6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_kw.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,15))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :blah
-            ├── message_loc: (1,0)-(1,4) = "blah"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,5)-(1,15))
-                ├── locals: [:k]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,7)-(1,13))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,8)-(1,12))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 1)
-                │   │   │   └── @ OptionalKeywordParameterNode (location: (1,8)-(1,12))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :k
-                │   │   │       ├── name_loc: (1,8)-(1,10) = "k:"
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,10)-(1,12))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,7)-(1,8) = "|"
-                │   └── closing_loc: (1,12)-(1,13) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,5)-(1,6) = "{"
-                └── closing_loc: (1,14)-(1,15) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_kw__required.txt b/test/mri/prism/snapshots/seattlerb/block_kw__required.txt
deleted file mode 100644
index 8a49c8bec7e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_kw__required.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :blah
-            ├── message_loc: (1,0)-(1,4) = "blah"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,5)-(1,16))
-                ├── locals: [:k]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,8)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,9)-(1,11))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 1)
-                │   │   │   └── @ RequiredKeywordParameterNode (location: (1,9)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :k
-                │   │   │       └── name_loc: (1,9)-(1,11) = "k:"
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,8)-(1,9) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,5)-(1,7) = "do"
-                └── closing_loc: (1,13)-(1,16) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/block_kwarg_lvar.txt b/test/mri/prism/snapshots/seattlerb/block_kwarg_lvar.txt
deleted file mode 100644
index e77bf90a276..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_kwarg_lvar.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,20))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :bl
-            ├── message_loc: (1,0)-(1,2) = "bl"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,3)-(1,20))
-                ├── locals: [:kw]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,5)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,6)-(1,14))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 1)
-                │   │   │   └── @ OptionalKeywordParameterNode (location: (1,6)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :kw
-                │   │   │       ├── name_loc: (1,6)-(1,9) = "kw:"
-                │   │   │       └── value:
-                │   │   │           @ SymbolNode (location: (1,10)-(1,14))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (1,10)-(1,11) = ":"
-                │   │   │           ├── value_loc: (1,11)-(1,14) = "val"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "val"
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,5)-(1,6) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,16)-(1,18))
-                │   └── body: (length: 1)
-                │       └── @ LocalVariableReadNode (location: (1,16)-(1,18))
-                │           ├── name: :kw
-                │           └── depth: 0
-                ├── opening_loc: (1,3)-(1,4) = "{"
-                └── closing_loc: (1,19)-(1,20) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt b/test/mri/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
deleted file mode 100644
index a527c8c993d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,33))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,33))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,33))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :bl
-            ├── message_loc: (1,0)-(1,2) = "bl"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,3)-(1,33))
-                ├── locals: [:kw, :kw2]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,5)-(1,28))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,6)-(1,26))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 2)
-                │   │   │   ├── @ OptionalKeywordParameterNode (location: (1,6)-(1,14))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   ├── name: :kw
-                │   │   │   │   ├── name_loc: (1,6)-(1,9) = "kw:"
-                │   │   │   │   └── value:
-                │   │   │   │       @ SymbolNode (location: (1,10)-(1,14))
-                │   │   │   │       ├── flags: forced_us_ascii_encoding
-                │   │   │   │       ├── opening_loc: (1,10)-(1,11) = ":"
-                │   │   │   │       ├── value_loc: (1,11)-(1,14) = "val"
-                │   │   │   │       ├── closing_loc: ∅
-                │   │   │   │       └── unescaped: "val"
-                │   │   │   └── @ OptionalKeywordParameterNode (location: (1,16)-(1,26))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :kw2
-                │   │   │       ├── name_loc: (1,16)-(1,20) = "kw2:"
-                │   │   │       └── value:
-                │   │   │           @ SymbolNode (location: (1,21)-(1,26))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (1,21)-(1,22) = ":"
-                │   │   │           ├── value_loc: (1,22)-(1,26) = "val2"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "val2"
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,5)-(1,6) = "|"
-                │   └── closing_loc: (1,27)-(1,28) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,29)-(1,31))
-                │   └── body: (length: 1)
-                │       └── @ LocalVariableReadNode (location: (1,29)-(1,31))
-                │           ├── name: :kw
-                │           └── depth: 0
-                ├── opening_loc: (1,3)-(1,4) = "{"
-                └── closing_loc: (1,32)-(1,33) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_next.txt b/test/mri/prism/snapshots/seattlerb/block_next.txt
deleted file mode 100644
index 71f2deb2ddf..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_next.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ NextNode (location: (1,0)-(1,25))
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,25))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,5)-(1,25))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (1,5)-(1,8) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,9)-(1,12))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (1,9)-(1,12))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :arg
-            │           │           ├── message_loc: (1,9)-(1,12) = "arg"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: ∅
-            │           └── block:
-            │               @ BlockNode (location: (1,13)-(1,25))
-            │               ├── locals: [:bar]
-            │               ├── parameters:
-            │               │   @ BlockParametersNode (location: (1,16)-(1,21))
-            │               │   ├── parameters:
-            │               │   │   @ ParametersNode (location: (1,17)-(1,20))
-            │               │   │   ├── requireds: (length: 1)
-            │               │   │   │   └── @ RequiredParameterNode (location: (1,17)-(1,20))
-            │               │   │   │       ├── flags: ∅
-            │               │   │   │       └── name: :bar
-            │               │   │   ├── optionals: (length: 0)
-            │               │   │   ├── rest: ∅
-            │               │   │   ├── posts: (length: 0)
-            │               │   │   ├── keywords: (length: 0)
-            │               │   │   ├── keyword_rest: ∅
-            │               │   │   └── block: ∅
-            │               │   ├── locals: (length: 0)
-            │               │   ├── opening_loc: (1,16)-(1,17) = "|"
-            │               │   └── closing_loc: (1,20)-(1,21) = "|"
-            │               ├── body: ∅
-            │               ├── opening_loc: (1,13)-(1,15) = "do"
-            │               └── closing_loc: (1,22)-(1,25) = "end"
-            └── keyword_loc: (1,0)-(1,4) = "next"
diff --git a/test/mri/prism/snapshots/seattlerb/block_opt_arg.txt b/test/mri/prism/snapshots/seattlerb/block_opt_arg.txt
deleted file mode 100644
index 64dc928f14b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_opt_arg.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,14))
-                ├── locals: [:b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,11))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,8))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "b"
-                │   │   │       ├── operator_loc: (1,6)-(1,7) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,7)-(1,8))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,10)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,13)-(1,14) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_opt_splat.txt b/test/mri/prism/snapshots/seattlerb/block_opt_splat.txt
deleted file mode 100644
index c18df9c27d4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_opt_splat.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,10))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "b"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,9)-(1,10))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,12)-(1,14))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :c
-                │   │   │   ├── name_loc: (1,13)-(1,14) = "c"
-                │   │   │   └── operator_loc: (1,12)-(1,13) = "*"
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt b/test/mri/prism/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
deleted file mode 100644
index 3806809d2bd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,22))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,22))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,22))
-                ├── locals: [:b, :c, :d, :e]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,20))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,19))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,8))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "b"
-                │   │   │       ├── operator_loc: (1,6)-(1,7) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,7)-(1,8))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,10)-(1,12))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :c
-                │   │   │   ├── name_loc: (1,11)-(1,12) = "c"
-                │   │   │   └── operator_loc: (1,10)-(1,11) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,14)-(1,15))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :d
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,17)-(1,19))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :e
-                │   │       ├── name_loc: (1,18)-(1,19) = "e"
-                │   │       └── operator_loc: (1,17)-(1,18) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,19)-(1,20) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,21)-(1,22) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_optarg.txt b/test/mri/prism/snapshots/seattlerb/block_optarg.txt
deleted file mode 100644
index 5da99aec799..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_optarg.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,14))
-                ├── locals: [:b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,11))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "b"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ SymbolNode (location: (1,9)-(1,11))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (1,9)-(1,10) = ":"
-                │   │   │           ├── value_loc: (1,10)-(1,11) = "c"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "c"
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,13)-(1,14) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_paren_splat.txt b/test/mri/prism/snapshots/seattlerb/block_paren_splat.txt
deleted file mode 100644
index ebd937904cc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_paren_splat.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,15))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,15))
-                ├── locals: [:b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,13))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,12))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,12))
-                │   │   │       ├── lefts: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,9)-(1,11))
-                │   │   │       │   ├── operator_loc: (1,9)-(1,10) = "*"
-                │   │   │       │   └── expression:
-                │   │   │       │       @ RequiredParameterNode (location: (1,10)-(1,11))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :c
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │       └── rparen_loc: (1,11)-(1,12) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,12)-(1,13) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,14)-(1,15) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_reg_optarg.txt b/test/mri/prism/snapshots/seattlerb/block_reg_optarg.txt
deleted file mode 100644
index 53c43603a7e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_reg_optarg.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :c
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "c"
-                │   │   │       ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │       └── value:
-                │   │   │           @ SymbolNode (location: (1,12)-(1,14))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (1,12)-(1,13) = ":"
-                │   │   │           ├── value_loc: (1,13)-(1,14) = "d"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "d"
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_return.txt b/test/mri/prism/snapshots/seattlerb/block_return.txt
deleted file mode 100644
index e91f5f25922..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_return.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,27))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,27))
-    └── body: (length: 1)
-        └── @ ReturnNode (location: (1,0)-(1,27))
-            ├── keyword_loc: (1,0)-(1,6) = "return"
-            └── arguments:
-                @ ArgumentsNode (location: (1,7)-(1,27))
-                ├── flags: ∅
-                └── arguments: (length: 1)
-                    └── @ CallNode (location: (1,7)-(1,27))
-                        ├── flags: ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :foo
-                        ├── message_loc: (1,7)-(1,10) = "foo"
-                        ├── opening_loc: ∅
-                        ├── arguments:
-                        │   @ ArgumentsNode (location: (1,11)-(1,14))
-                        │   ├── flags: ∅
-                        │   └── arguments: (length: 1)
-                        │       └── @ CallNode (location: (1,11)-(1,14))
-                        │           ├── flags: variable_call, ignore_visibility
-                        │           ├── receiver: ∅
-                        │           ├── call_operator_loc: ∅
-                        │           ├── name: :arg
-                        │           ├── message_loc: (1,11)-(1,14) = "arg"
-                        │           ├── opening_loc: ∅
-                        │           ├── arguments: ∅
-                        │           ├── closing_loc: ∅
-                        │           └── block: ∅
-                        ├── closing_loc: ∅
-                        └── block:
-                            @ BlockNode (location: (1,15)-(1,27))
-                            ├── locals: [:bar]
-                            ├── parameters:
-                            │   @ BlockParametersNode (location: (1,18)-(1,23))
-                            │   ├── parameters:
-                            │   │   @ ParametersNode (location: (1,19)-(1,22))
-                            │   │   ├── requireds: (length: 1)
-                            │   │   │   └── @ RequiredParameterNode (location: (1,19)-(1,22))
-                            │   │   │       ├── flags: ∅
-                            │   │   │       └── name: :bar
-                            │   │   ├── optionals: (length: 0)
-                            │   │   ├── rest: ∅
-                            │   │   ├── posts: (length: 0)
-                            │   │   ├── keywords: (length: 0)
-                            │   │   ├── keyword_rest: ∅
-                            │   │   └── block: ∅
-                            │   ├── locals: (length: 0)
-                            │   ├── opening_loc: (1,18)-(1,19) = "|"
-                            │   └── closing_loc: (1,22)-(1,23) = "|"
-                            ├── body: ∅
-                            ├── opening_loc: (1,15)-(1,17) = "do"
-                            └── closing_loc: (1,24)-(1,27) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/block_scope.txt b/test/mri/prism/snapshots/seattlerb/block_scope.txt
deleted file mode 100644
index a21a28b9937..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_scope.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,10))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,10))
-                ├── locals: [:b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,8))
-                │   ├── parameters: ∅
-                │   ├── locals: (length: 1)
-                │   │   └── @ BlockLocalVariableNode (location: (1,6)-(1,7))
-                │   │       ├── flags: ∅
-                │   │       └── name: :b
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,7)-(1,8) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,9)-(1,10) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/block_splat_reg.txt b/test/mri/prism/snapshots/seattlerb/block_splat_reg.txt
deleted file mode 100644
index 617ff886225..00000000000
--- a/test/mri/prism/snapshots/seattlerb/block_splat_reg.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,13))
-                ├── locals: [:b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,11))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,10))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,5)-(1,7))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :b
-                │   │   │   ├── name_loc: (1,6)-(1,7) = "b"
-                │   │   │   └── operator_loc: (1,5)-(1,6) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,10)-(1,11) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,12)-(1,13) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug169.txt b/test/mri/prism/snapshots/seattlerb/bug169.txt
deleted file mode 100644
index e4fb47a6de9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug169.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (1,0)-(1,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,4))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,2)-(1,4))
-            │           ├── body: ∅
-            │           ├── opening_loc: (1,2)-(1,3) = "("
-            │           └── closing_loc: (1,3)-(1,4) = ")"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,5)-(1,7))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,5)-(1,6) = "{"
-                └── closing_loc: (1,6)-(1,7) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug179.txt b/test/mri/prism/snapshots/seattlerb/bug179.txt
deleted file mode 100644
index d7695bc7a74..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug179.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ RangeNode (location: (1,2)-(1,9))
-            │           ├── flags: ∅
-            │           ├── left:
-            │           │   @ ParenthesesNode (location: (1,2)-(1,4))
-            │           │   ├── body: ∅
-            │           │   ├── opening_loc: (1,2)-(1,3) = "("
-            │           │   └── closing_loc: (1,3)-(1,4) = ")"
-            │           ├── right:
-            │           │   @ NilNode (location: (1,6)-(1,9))
-            │           └── operator_loc: (1,4)-(1,6) = ".."
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bug190.txt b/test/mri/prism/snapshots/seattlerb/bug190.txt
deleted file mode 100644
index b261a166cf9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug190.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ RegularExpressionNode (location: (1,0)-(1,6))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (1,0)-(1,3) = "%r'"
-            ├── content_loc: (1,3)-(1,5) = "\\'"
-            ├── closing_loc: (1,5)-(1,6) = "'"
-            └── unescaped: "'"
diff --git a/test/mri/prism/snapshots/seattlerb/bug191.txt b/test/mri/prism/snapshots/seattlerb/bug191.txt
deleted file mode 100644
index 69835ab1d03..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug191.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,9))
-    └── body: (length: 2)
-        ├── @ IfNode (location: (1,0)-(1,9))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,0)-(1,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (1,2)-(1,3) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,4)-(1,6))
-        │   │   └── body: (length: 1)
-        │   │       └── @ StringNode (location: (1,4)-(1,6))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,4)-(1,5) = "\""
-        │   │           ├── content_loc: (1,5)-(1,5) = ""
-        │   │           ├── closing_loc: (1,5)-(1,6) = "\""
-        │   │           └── unescaped: ""
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (1,6)-(1,9))
-        │   │   ├── else_keyword_loc: (1,6)-(1,7) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,8)-(1,9))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (1,8)-(1,9))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (1,8)-(1,9) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        └── @ IfNode (location: (3,0)-(3,9))
-            ├── if_keyword_loc: ∅
-            ├── predicate:
-            │   @ CallNode (location: (3,0)-(3,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (3,0)-(3,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: (3,2)-(3,3) = "?"
-            ├── statements:
-            │   @ StatementsNode (location: (3,4)-(3,6))
-            │   └── body: (length: 1)
-            │       └── @ StringNode (location: (3,4)-(3,6))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (3,4)-(3,5) = "'"
-            │           ├── content_loc: (3,5)-(3,5) = ""
-            │           ├── closing_loc: (3,5)-(3,6) = "'"
-            │           └── unescaped: ""
-            ├── consequent:
-            │   @ ElseNode (location: (3,6)-(3,9))
-            │   ├── else_keyword_loc: (3,6)-(3,7) = ":"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (3,8)-(3,9))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (3,8)-(3,9))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :b
-            │   │           ├── message_loc: (3,8)-(3,9) = "b"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bug202.txt b/test/mri/prism/snapshots/seattlerb/bug202.txt
deleted file mode 100644
index 377b53727ed..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug202.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,10))
-├── locals: [:测试]
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,10))
-    └── body: (length: 2)
-        ├── @ GlobalVariableWriteNode (location: (1,0)-(1,11))
-        │   ├── name: :$测试
-        │   ├── name_loc: (1,0)-(1,7) = "$测试"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,10)-(1,11))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (1,8)-(1,9) = "="
-        └── @ LocalVariableWriteNode (location: (2,0)-(2,10))
-            ├── name: :测试
-            ├── depth: 0
-            ├── name_loc: (2,0)-(2,6) = "测试"
-            ├── value:
-            │   @ IntegerNode (location: (2,9)-(2,10))
-            │   ├── flags: decimal
-            │   └── value: 1
-            └── operator_loc: (2,7)-(2,8) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/bug236.txt b/test/mri/prism/snapshots/seattlerb/bug236.txt
deleted file mode 100644
index 203a39a793a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug236.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,6))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,7))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :x
-        │   ├── message_loc: (1,0)-(1,1) = "x"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,1)-(1,7))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (1,2)-(1,6))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (1,3)-(1,5))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (1,3)-(1,4))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ ImplicitRestNode (location: (1,4)-(1,5))
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (1,2)-(1,3) = "|"
-        │       │   └── closing_loc: (1,5)-(1,6) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,1)-(1,2) = "{"
-        │       └── closing_loc: (1,6)-(1,7) = "}"
-        └── @ CallNode (location: (3,0)-(3,6))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :x
-            ├── message_loc: (3,0)-(3,1) = "x"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (3,1)-(3,6))
-                ├── locals: [:a]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (3,2)-(3,5))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (3,3)-(3,4))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (3,3)-(3,4))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (3,2)-(3,3) = "|"
-                │   └── closing_loc: (3,4)-(3,5) = "|"
-                ├── body: ∅
-                ├── opening_loc: (3,1)-(3,2) = "{"
-                └── closing_loc: (3,5)-(3,6) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug290.txt b/test/mri/prism/snapshots/seattlerb/bug290.txt
deleted file mode 100644
index 4f1e673c4b3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug290.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(3,3))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (2,2)-(2,5))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (2,2)-(2,5))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (2,2)-(2,5) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_187.txt b/test/mri/prism/snapshots/seattlerb/bug_187.txt
deleted file mode 100644
index ae72675e5cf..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_187.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :private
-            ├── message_loc: (1,0)-(1,7) = "private"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,8)-(3,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ DefNode (location: (1,8)-(3,3))
-            │           ├── name: :f
-            │           ├── name_loc: (1,12)-(1,13) = "f"
-            │           ├── receiver: ∅
-            │           ├── parameters: ∅
-            │           ├── body:
-            │           │   @ StatementsNode (location: (2,0)-(2,10))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (2,0)-(2,10))
-            │           │           ├── flags: ∅
-            │           │           ├── receiver:
-            │           │           │   @ CallNode (location: (2,0)-(2,1))
-            │           │           │   ├── flags: variable_call, ignore_visibility
-            │           │           │   ├── receiver: ∅
-            │           │           │   ├── call_operator_loc: ∅
-            │           │           │   ├── name: :a
-            │           │           │   ├── message_loc: (2,0)-(2,1) = "a"
-            │           │           │   ├── opening_loc: ∅
-            │           │           │   ├── arguments: ∅
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── block: ∅
-            │           │           ├── call_operator_loc: (2,1)-(2,2) = "."
-            │           │           ├── name: :b
-            │           │           ├── message_loc: (2,2)-(2,3) = "b"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block:
-            │           │               @ BlockNode (location: (2,4)-(2,10))
-            │           │               ├── locals: []
-            │           │               ├── parameters: ∅
-            │           │               ├── body: ∅
-            │           │               ├── opening_loc: (2,4)-(2,6) = "do"
-            │           │               └── closing_loc: (2,7)-(2,10) = "end"
-            │           ├── locals: []
-            │           ├── def_keyword_loc: (1,8)-(1,11) = "def"
-            │           ├── operator_loc: ∅
-            │           ├── lparen_loc: ∅
-            │           ├── rparen_loc: ∅
-            │           ├── equal_loc: ∅
-            │           └── end_keyword_loc: (3,0)-(3,3) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bug_215.txt b/test/mri/prism/snapshots/seattlerb/bug_215.txt
deleted file mode 100644
index de7716335e9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_215.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ UndefNode (location: (1,0)-(1,13))
-            ├── names: (length: 1)
-            │   └── @ SymbolNode (location: (1,6)-(1,13))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: (1,6)-(1,9) = "%s("
-            │       ├── value_loc: (1,9)-(1,12) = "foo"
-            │       ├── closing_loc: (1,12)-(1,13) = ")"
-            │       └── unescaped: "foo"
-            └── keyword_loc: (1,0)-(1,5) = "undef"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_249.txt b/test/mri/prism/snapshots/seattlerb/bug_249.txt
deleted file mode 100644
index 569bea14c54..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_249.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,28))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(4,28))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :mount
-            ├── message_loc: (1,0)-(1,5) = "mount"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(4,28))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (1,6)-(4,9))
-            │       │   ├── flags: ∅
-            │       │   ├── receiver:
-            │       │   │   @ ParenthesesNode (location: (1,6)-(4,5))
-            │       │   │   ├── body:
-            │       │   │   │   @ StatementsNode (location: (1,7)-(4,4))
-            │       │   │   │   └── body: (length: 1)
-            │       │   │   │       └── @ CallNode (location: (1,7)-(4,4))
-            │       │   │   │           ├── flags: ∅
-            │       │   │   │           ├── receiver:
-            │       │   │   │           │   @ ConstantReadNode (location: (1,7)-(1,12))
-            │       │   │   │           │   └── name: :Class
-            │       │   │   │           ├── call_operator_loc: (1,12)-(1,13) = "."
-            │       │   │   │           ├── name: :new
-            │       │   │   │           ├── message_loc: (1,13)-(1,16) = "new"
-            │       │   │   │           ├── opening_loc: ∅
-            │       │   │   │           ├── arguments: ∅
-            │       │   │   │           ├── closing_loc: ∅
-            │       │   │   │           └── block:
-            │       │   │   │               @ BlockNode (location: (1,17)-(4,4))
-            │       │   │   │               ├── locals: []
-            │       │   │   │               ├── parameters: ∅
-            │       │   │   │               ├── body:
-            │       │   │   │               │   @ StatementsNode (location: (2,0)-(3,3))
-            │       │   │   │               │   └── body: (length: 1)
-            │       │   │   │               │       └── @ DefNode (location: (2,0)-(3,3))
-            │       │   │   │               │           ├── name: :initialize
-            │       │   │   │               │           ├── name_loc: (2,4)-(2,14) = "initialize"
-            │       │   │   │               │           ├── receiver: ∅
-            │       │   │   │               │           ├── parameters: ∅
-            │       │   │   │               │           ├── body: ∅
-            │       │   │   │               │           ├── locals: []
-            │       │   │   │               │           ├── def_keyword_loc: (2,0)-(2,3) = "def"
-            │       │   │   │               │           ├── operator_loc: ∅
-            │       │   │   │               │           ├── lparen_loc: ∅
-            │       │   │   │               │           ├── rparen_loc: ∅
-            │       │   │   │               │           ├── equal_loc: ∅
-            │       │   │   │               │           └── end_keyword_loc: (3,0)-(3,3) = "end"
-            │       │   │   │               ├── opening_loc: (1,17)-(1,19) = "do"
-            │       │   │   │               └── closing_loc: (4,1)-(4,4) = "end"
-            │       │   │   ├── opening_loc: (1,6)-(1,7) = "("
-            │       │   │   └── closing_loc: (4,4)-(4,5) = ")"
-            │       │   ├── call_operator_loc: (4,5)-(4,6) = "."
-            │       │   ├── name: :new
-            │       │   ├── message_loc: (4,6)-(4,9) = "new"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ KeywordHashNode (location: (4,11)-(4,28))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (4,11)-(4,28))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (4,11)-(4,14))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (4,11)-(4,12) = ":"
-            │                   │   ├── value_loc: (4,12)-(4,14) = "at"
-            │                   │   ├── closing_loc: ∅
-            │                   │   └── unescaped: "at"
-            │                   ├── value:
-            │                   │   @ StringNode (location: (4,18)-(4,28))
-            │                   │   ├── flags: ∅
-            │                   │   ├── opening_loc: (4,18)-(4,19) = "'"
-            │                   │   ├── content_loc: (4,19)-(4,27) = "endpoint"
-            │                   │   ├── closing_loc: (4,27)-(4,28) = "'"
-            │                   │   └── unescaped: "endpoint"
-            │                   └── operator_loc: (4,15)-(4,17) = "=>"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bug_and.txt b/test/mri/prism/snapshots/seattlerb/bug_and.txt
deleted file mode 100644
index 3daf505e5f1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_and.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,11))
-    └── body: (length: 2)
-        ├── @ AndNode (location: (1,0)-(2,4))
-        │   ├── left:
-        │   │   @ TrueNode (location: (1,0)-(1,4))
-        │   ├── right:
-        │   │   @ TrueNode (location: (2,0)-(2,4))
-        │   └── operator_loc: (1,5)-(1,8) = "and"
-        └── @ AndNode (location: (4,0)-(4,11))
-            ├── left:
-            │   @ TrueNode (location: (4,0)-(4,4))
-            ├── right:
-            │   @ ArrayNode (location: (4,9)-(4,11))
-            │   ├── flags: ∅
-            │   ├── elements: (length: 0)
-            │   ├── opening_loc: (4,9)-(4,10) = "["
-            │   └── closing_loc: (4,10)-(4,11) = "]"
-            └── operator_loc: (4,5)-(4,8) = "and"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_args__19.txt b/test/mri/prism/snapshots/seattlerb/bug_args__19.txt
deleted file mode 100644
index f451bd01722..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_args__19.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,16))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,11))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,11))
-                │   │   │       ├── lefts: (length: 2)
-                │   │   │       │   ├── @ RequiredParameterNode (location: (1,6)-(1,7))
-                │   │   │       │   │   ├── flags: ∅
-                │   │   │       │   │   └── name: :a
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rest: ∅
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │       └── rparen_loc: (1,10)-(1,11) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,13)-(1,14))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (1,13)-(1,14))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :d
-                │           ├── message_loc: (1,13)-(1,14) = "d"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,15)-(1,16) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_args_masgn.txt b/test/mri/prism/snapshots/seattlerb/bug_args_masgn.txt
deleted file mode 100644
index 297979c182c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_args_masgn.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ MultiTargetNode (location: (1,5)-(1,11))
-                │   │   │   │   ├── lefts: (length: 2)
-                │   │   │   │   │   ├── @ RequiredParameterNode (location: (1,6)-(1,7))
-                │   │   │   │   │   │   ├── flags: ∅
-                │   │   │   │   │   │   └── name: :a
-                │   │   │   │   │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │   │   │       ├── flags: ∅
-                │   │   │   │   │       └── name: :b
-                │   │   │   │   ├── rest: ∅
-                │   │   │   │   ├── rights: (length: 0)
-                │   │   │   │   ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │   │   └── rparen_loc: (1,10)-(1,11) = ")"
-                │   │   │   └── @ RequiredParameterNode (location: (1,13)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_args_masgn2.txt b/test/mri/prism/snapshots/seattlerb/bug_args_masgn2.txt
deleted file mode 100644
index 6bec9187b3b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_args_masgn2.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,22))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,22))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,22))
-                ├── locals: [:a, :b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,20))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,19))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ MultiTargetNode (location: (1,5)-(1,16))
-                │   │   │   │   ├── lefts: (length: 2)
-                │   │   │   │   │   ├── @ MultiTargetNode (location: (1,6)-(1,12))
-                │   │   │   │   │   │   ├── lefts: (length: 2)
-                │   │   │   │   │   │   │   ├── @ RequiredParameterNode (location: (1,7)-(1,8))
-                │   │   │   │   │   │   │   │   ├── flags: ∅
-                │   │   │   │   │   │   │   │   └── name: :a
-                │   │   │   │   │   │   │   └── @ RequiredParameterNode (location: (1,10)-(1,11))
-                │   │   │   │   │   │   │       ├── flags: ∅
-                │   │   │   │   │   │   │       └── name: :b
-                │   │   │   │   │   │   ├── rest: ∅
-                │   │   │   │   │   │   ├── rights: (length: 0)
-                │   │   │   │   │   │   ├── lparen_loc: (1,6)-(1,7) = "("
-                │   │   │   │   │   │   └── rparen_loc: (1,11)-(1,12) = ")"
-                │   │   │   │   │   └── @ RequiredParameterNode (location: (1,14)-(1,15))
-                │   │   │   │   │       ├── flags: ∅
-                │   │   │   │   │       └── name: :c
-                │   │   │   │   ├── rest: ∅
-                │   │   │   │   ├── rights: (length: 0)
-                │   │   │   │   ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │   │   └── rparen_loc: (1,15)-(1,16) = ")"
-                │   │   │   └── @ RequiredParameterNode (location: (1,18)-(1,19))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :d
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,19)-(1,20) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,21)-(1,22) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt b/test/mri/prism/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt
deleted file mode 100644
index 42a060d02aa..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,19))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,19))
-                ├── locals: [:k, :v, :i]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,17))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,16))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,16))
-                │   │   │       ├── lefts: (length: 2)
-                │   │   │       │   ├── @ MultiTargetNode (location: (1,6)-(1,12))
-                │   │   │       │   │   ├── lefts: (length: 2)
-                │   │   │       │   │   │   ├── @ RequiredParameterNode (location: (1,7)-(1,8))
-                │   │   │       │   │   │   │   ├── flags: ∅
-                │   │   │       │   │   │   │   └── name: :k
-                │   │   │       │   │   │   └── @ RequiredParameterNode (location: (1,10)-(1,11))
-                │   │   │       │   │   │       ├── flags: ∅
-                │   │   │       │   │   │       └── name: :v
-                │   │   │       │   │   ├── rest: ∅
-                │   │   │       │   │   ├── rights: (length: 0)
-                │   │   │       │   │   ├── lparen_loc: (1,6)-(1,7) = "("
-                │   │   │       │   │   └── rparen_loc: (1,11)-(1,12) = ")"
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,14)-(1,15))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :i
-                │   │   │       ├── rest: ∅
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │       └── rparen_loc: (1,15)-(1,16) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,16)-(1,17) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,18)-(1,19) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_call_arglist_parens.txt b/test/mri/prism/snapshots/seattlerb/bug_call_arglist_parens.txt
deleted file mode 100644
index 53d6f9220b2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_call_arglist_parens.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-@ ProgramNode (location: (1,6)-(11,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,6)-(11,9))
-    └── body: (length: 3)
-        ├── @ DefNode (location: (1,6)-(3,9))
-        │   ├── name: :f
-        │   ├── name_loc: (1,10)-(1,11) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,8)-(2,17))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,8)-(2,17))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :g
-        │   │           ├── message_loc: (2,8)-(2,9) = "g"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (2,10)-(2,17))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ ParenthesesNode (location: (2,10)-(2,14))
-        │   │           │       │   ├── body:
-        │   │           │       │   │   @ StatementsNode (location: (2,12)-(2,13))
-        │   │           │       │   │   └── body: (length: 1)
-        │   │           │       │   │       └── @ IntegerNode (location: (2,12)-(2,13))
-        │   │           │       │   │           ├── flags: decimal
-        │   │           │       │   │           └── value: 1
-        │   │           │       │   ├── opening_loc: (2,10)-(2,11) = "("
-        │   │           │       │   └── closing_loc: (2,13)-(2,14) = ")"
-        │   │           │       └── @ IntegerNode (location: (2,16)-(2,17))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 2
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,6)-(1,9) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,6)-(3,9) = "end"
-        ├── @ DefNode (location: (6,6)-(8,9))
-        │   ├── name: :f
-        │   ├── name_loc: (6,10)-(6,11) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (7,8)-(7,16))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (7,8)-(7,16))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :g
-        │   │           ├── message_loc: (7,8)-(7,9) = "g"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (7,10)-(7,16))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ ParenthesesNode (location: (7,10)-(7,13))
-        │   │           │       │   ├── body:
-        │   │           │       │   │   @ StatementsNode (location: (7,11)-(7,12))
-        │   │           │       │   │   └── body: (length: 1)
-        │   │           │       │   │       └── @ IntegerNode (location: (7,11)-(7,12))
-        │   │           │       │   │           ├── flags: decimal
-        │   │           │       │   │           └── value: 1
-        │   │           │       │   ├── opening_loc: (7,10)-(7,11) = "("
-        │   │           │       │   └── closing_loc: (7,12)-(7,13) = ")"
-        │   │           │       └── @ IntegerNode (location: (7,15)-(7,16))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 2
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (6,6)-(6,9) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (6,11)-(6,12) = "("
-        │   ├── rparen_loc: (6,12)-(6,13) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (8,6)-(8,9) = "end"
-        └── @ CallNode (location: (11,0)-(11,9))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :g
-            ├── message_loc: (11,0)-(11,1) = "g"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (11,2)-(11,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ ParenthesesNode (location: (11,2)-(11,6))
-            │       │   ├── body:
-            │       │   │   @ StatementsNode (location: (11,4)-(11,5))
-            │       │   │   └── body: (length: 1)
-            │       │   │       └── @ IntegerNode (location: (11,4)-(11,5))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 1
-            │       │   ├── opening_loc: (11,2)-(11,3) = "("
-            │       │   └── closing_loc: (11,5)-(11,6) = ")"
-            │       └── @ IntegerNode (location: (11,8)-(11,9))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bug_case_when_regexp.txt b/test/mri/prism/snapshots/seattlerb/bug_case_when_regexp.txt
deleted file mode 100644
index 0cc1ca05e1f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_case_when_regexp.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,26))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,26))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "x"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "x"
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,9)-(1,22))
-            │       ├── keyword_loc: (1,9)-(1,13) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ RegularExpressionNode (location: (1,14)-(1,17))
-            │       │       ├── flags: forced_us_ascii_encoding
-            │       │       ├── opening_loc: (1,14)-(1,15) = "/"
-            │       │       ├── content_loc: (1,15)-(1,16) = "x"
-            │       │       ├── closing_loc: (1,16)-(1,17) = "/"
-            │       │       └── unescaped: "x"
-            │       ├── then_keyword_loc: (1,18)-(1,22) = "then"
-            │       └── statements: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,23)-(1,26) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_comma.txt b/test/mri/prism/snapshots/seattlerb/bug_comma.txt
deleted file mode 100644
index af886999b5e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_comma.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,24))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (1,3)-(1,15))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :test
-            │   ├── message_loc: (1,3)-(1,7) = "test"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,8)-(1,15))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 2)
-            │   │       ├── @ StringNode (location: (1,8)-(1,10))
-            │   │       │   ├── flags: ∅
-            │   │       │   ├── opening_loc: (1,8)-(1,9) = "?"
-            │   │       │   ├── content_loc: (1,9)-(1,10) = "d"
-            │   │       │   ├── closing_loc: ∅
-            │   │       │   └── unescaped: "d"
-            │   │       └── @ CallNode (location: (1,12)-(1,15))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :dir
-            │   │           ├── message_loc: (1,12)-(1,15) = "dir"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: (1,16)-(1,20) = "then"
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (1,21)-(1,24) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_cond_pct.txt b/test/mri/prism/snapshots/seattlerb/bug_cond_pct.txt
deleted file mode 100644
index cbf3bc3ef02..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_cond_pct.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,28))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,28))
-            ├── predicate: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,6)-(1,23))
-            │       ├── keyword_loc: (1,6)-(1,10) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ RegularExpressionNode (location: (1,11)-(1,23))
-            │       │       ├── flags: forced_us_ascii_encoding
-            │       │       ├── opening_loc: (1,11)-(1,14) = "%r%"
-            │       │       ├── content_loc: (1,14)-(1,22) = "blahblah"
-            │       │       ├── closing_loc: (1,22)-(1,23) = "%"
-            │       │       └── unescaped: "blahblah"
-            │       ├── then_keyword_loc: ∅
-            │       └── statements: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,25)-(1,28) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_hash_args.txt b/test/mri/prism/snapshots/seattlerb/bug_hash_args.txt
deleted file mode 100644
index 6f17e88714a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_hash_args.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,19))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo
-            ├── message_loc: (1,0)-(1,3) = "foo"
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,18))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ SymbolNode (location: (1,4)-(1,8))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (1,4)-(1,5) = ":"
-            │       │   ├── value_loc: (1,5)-(1,8) = "bar"
-            │       │   ├── closing_loc: ∅
-            │       │   └── unescaped: "bar"
-            │       └── @ KeywordHashNode (location: (1,10)-(1,18))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,10)-(1,18))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,10)-(1,14))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (1,10)-(1,13) = "baz"
-            │                   │   ├── closing_loc: (1,13)-(1,14) = ":"
-            │                   │   └── unescaped: "baz"
-            │                   ├── value:
-            │                   │   @ NilNode (location: (1,15)-(1,18))
-            │                   └── operator_loc: ∅
-            ├── closing_loc: (1,18)-(1,19) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bug_hash_args_trailing_comma.txt b/test/mri/prism/snapshots/seattlerb/bug_hash_args_trailing_comma.txt
deleted file mode 100644
index e7256b337b9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_hash_args_trailing_comma.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,20))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo
-            ├── message_loc: (1,0)-(1,3) = "foo"
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,18))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ SymbolNode (location: (1,4)-(1,8))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (1,4)-(1,5) = ":"
-            │       │   ├── value_loc: (1,5)-(1,8) = "bar"
-            │       │   ├── closing_loc: ∅
-            │       │   └── unescaped: "bar"
-            │       └── @ KeywordHashNode (location: (1,10)-(1,18))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,10)-(1,18))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,10)-(1,14))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (1,10)-(1,13) = "baz"
-            │                   │   ├── closing_loc: (1,13)-(1,14) = ":"
-            │                   │   └── unescaped: "baz"
-            │                   ├── value:
-            │                   │   @ NilNode (location: (1,15)-(1,18))
-            │                   └── operator_loc: ∅
-            ├── closing_loc: (1,19)-(1,20) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bug_hash_interp_array.txt b/test/mri/prism/snapshots/seattlerb/bug_hash_interp_array.txt
deleted file mode 100644
index 433fb024115..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_hash_interp_array.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,0)-(1,13))
-            ├── opening_loc: (1,0)-(1,1) = "{"
-            ├── elements: (length: 1)
-            │   └── @ AssocNode (location: (1,2)-(1,11))
-            │       ├── key:
-            │       │   @ InterpolatedSymbolNode (location: (1,2)-(1,8))
-            │       │   ├── opening_loc: (1,2)-(1,3) = "\""
-            │       │   ├── parts: (length: 1)
-            │       │   │   └── @ EmbeddedStatementsNode (location: (1,3)-(1,6))
-            │       │   │       ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │       │   │       ├── statements: ∅
-            │       │   │       └── closing_loc: (1,5)-(1,6) = "}"
-            │       │   └── closing_loc: (1,6)-(1,8) = "\":"
-            │       ├── value:
-            │       │   @ ArrayNode (location: (1,9)-(1,11))
-            │       │   ├── flags: ∅
-            │       │   ├── elements: (length: 0)
-            │       │   ├── opening_loc: (1,9)-(1,10) = "["
-            │       │   └── closing_loc: (1,10)-(1,11) = "]"
-            │       └── operator_loc: ∅
-            └── closing_loc: (1,12)-(1,13) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_masgn_right.txt b/test/mri/prism/snapshots/seattlerb/bug_masgn_right.txt
deleted file mode 100644
index b4c75c4607e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_masgn_right.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,14))
-                │   │   │       ├── lefts: (length: 2)
-                │   │   │       │   ├── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       │   │   ├── flags: ∅
-                │   │   │       │   │   └── name: :b
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,12)-(1,13))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :c
-                │   │   │       ├── rest: ∅
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,13)-(1,14) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/bug_not_parens.txt b/test/mri/prism/snapshots/seattlerb/bug_not_parens.txt
deleted file mode 100644
index 9e4a416d4aa..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_not_parens.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,4)-(1,5))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,4)-(1,5) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,3) = "not"
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments: ∅
-            ├── closing_loc: (1,5)-(1,6) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/bug_op_asgn_rescue.txt b/test/mri/prism/snapshots/seattlerb/bug_op_asgn_rescue.txt
deleted file mode 100644
index 33016f32f86..00000000000
--- a/test/mri/prism/snapshots/seattlerb/bug_op_asgn_rescue.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ LocalVariableOrWriteNode (location: (1,0)-(1,18))
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── operator_loc: (1,2)-(1,5) = "||="
-            ├── value:
-            │   @ RescueModifierNode (location: (1,6)-(1,18))
-            │   ├── expression:
-            │   │   @ CallNode (location: (1,6)-(1,7))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :b
-            │   │   ├── message_loc: (1,6)-(1,7) = "b"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── keyword_loc: (1,8)-(1,14) = "rescue"
-            │   └── rescue_expression:
-            │       @ NilNode (location: (1,15)-(1,18))
-            ├── name: :a
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/seattlerb/call_and.txt b/test/mri/prism/snapshots/seattlerb/call_and.txt
deleted file mode 100644
index d3e88b3f9e4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_and.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :&
-            ├── message_loc: (1,2)-(1,3) = "&"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,4)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_arg_assoc.txt b/test/mri/prism/snapshots/seattlerb/call_arg_assoc.txt
deleted file mode 100644
index 27c19fd3392..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_arg_assoc.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,10))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (1,2)-(1,3))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       └── @ KeywordHashNode (location: (1,5)-(1,9))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,5)-(1,9))
-            │                   ├── key:
-            │                   │   @ IntegerNode (location: (1,5)-(1,6))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 2
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,8)-(1,9))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 3
-            │                   └── operator_loc: (1,6)-(1,8) = "=>"
-            ├── closing_loc: (1,9)-(1,10) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_arg_assoc_kwsplat.txt b/test/mri/prism/snapshots/seattlerb/call_arg_assoc_kwsplat.txt
deleted file mode 100644
index 0193eb1dfcf..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_arg_assoc_kwsplat.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,15))
-            │   ├── flags: contains_keyword_splat
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (1,2)-(1,3))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       └── @ KeywordHashNode (location: (1,5)-(1,15))
-            │           ├── flags: ∅
-            │           └── elements: (length: 2)
-            │               ├── @ AssocNode (location: (1,5)-(1,10))
-            │               │   ├── key:
-            │               │   │   @ SymbolNode (location: (1,5)-(1,8))
-            │               │   │   ├── flags: forced_us_ascii_encoding
-            │               │   │   ├── opening_loc: ∅
-            │               │   │   ├── value_loc: (1,5)-(1,7) = "kw"
-            │               │   │   ├── closing_loc: (1,7)-(1,8) = ":"
-            │               │   │   └── unescaped: "kw"
-            │               │   ├── value:
-            │               │   │   @ IntegerNode (location: (1,9)-(1,10))
-            │               │   │   ├── flags: decimal
-            │               │   │   └── value: 2
-            │               │   └── operator_loc: ∅
-            │               └── @ AssocSplatNode (location: (1,12)-(1,15))
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,14)-(1,15))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 3
-            │                   └── operator_loc: (1,12)-(1,14) = "**"
-            ├── closing_loc: (1,15)-(1,16) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_arg_kwsplat.txt b/test/mri/prism/snapshots/seattlerb/call_arg_kwsplat.txt
deleted file mode 100644
index 91c7725525f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_arg_kwsplat.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,8))
-            │   ├── flags: contains_keyword_splat
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (1,2)-(1,3))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :b
-            │       │   ├── message_loc: (1,2)-(1,3) = "b"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ KeywordHashNode (location: (1,5)-(1,8))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocSplatNode (location: (1,5)-(1,8))
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,7)-(1,8))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   └── operator_loc: (1,5)-(1,7) = "**"
-            ├── closing_loc: (1,8)-(1,9) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_args_assoc_quoted.txt b/test/mri/prism/snapshots/seattlerb/call_args_assoc_quoted.txt
deleted file mode 100644
index 2d6f81c8186..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_args_assoc_quoted.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,8))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :x
-        │   ├── message_loc: (1,0)-(1,1) = "x"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (1,2)-(1,11))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (1,2)-(1,11))
-        │   │                   ├── key:
-        │   │                   │   @ InterpolatedSymbolNode (location: (1,2)-(1,9))
-        │   │                   │   ├── opening_loc: (1,2)-(1,3) = "\""
-        │   │                   │   ├── parts: (length: 1)
-        │   │                   │   │   └── @ EmbeddedStatementsNode (location: (1,3)-(1,7))
-        │   │                   │   │       ├── opening_loc: (1,3)-(1,5) = "\#{"
-        │   │                   │   │       ├── statements:
-        │   │                   │   │       │   @ StatementsNode (location: (1,5)-(1,6))
-        │   │                   │   │       │   └── body: (length: 1)
-        │   │                   │   │       │       └── @ CallNode (location: (1,5)-(1,6))
-        │   │                   │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │                   │   │       │           ├── receiver: ∅
-        │   │                   │   │       │           ├── call_operator_loc: ∅
-        │   │                   │   │       │           ├── name: :k
-        │   │                   │   │       │           ├── message_loc: (1,5)-(1,6) = "k"
-        │   │                   │   │       │           ├── opening_loc: ∅
-        │   │                   │   │       │           ├── arguments: ∅
-        │   │                   │   │       │           ├── closing_loc: ∅
-        │   │                   │   │       │           └── block: ∅
-        │   │                   │   │       └── closing_loc: (1,6)-(1,7) = "}"
-        │   │                   │   └── closing_loc: (1,7)-(1,9) = "\":"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (1,9)-(1,11))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 42
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :x
-        │   ├── message_loc: (3,0)-(3,1) = "x"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,2)-(3,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (3,2)-(3,8))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (3,2)-(3,8))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (3,2)-(3,6))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (3,2)-(3,3) = "\""
-        │   │                   │   ├── value_loc: (3,3)-(3,4) = "k"
-        │   │                   │   ├── closing_loc: (3,4)-(3,6) = "\":"
-        │   │                   │   └── unescaped: "k"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (3,6)-(3,8))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 42
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,8))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :x
-            ├── message_loc: (5,0)-(5,1) = "x"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (5,2)-(5,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (5,2)-(5,8))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (5,2)-(5,8))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (5,2)-(5,6))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (5,2)-(5,3) = "'"
-            │                   │   ├── value_loc: (5,3)-(5,4) = "k"
-            │                   │   ├── closing_loc: (5,4)-(5,6) = "':"
-            │                   │   └── unescaped: "k"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (5,6)-(5,8))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 42
-            │                   └── operator_loc: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_args_assoc_trailing_comma.txt b/test/mri/prism/snapshots/seattlerb/call_args_assoc_trailing_comma.txt
deleted file mode 100644
index 312a1981a06..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_args_assoc_trailing_comma.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,11))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (1,2)-(1,3))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       └── @ KeywordHashNode (location: (1,5)-(1,9))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,5)-(1,9))
-            │                   ├── key:
-            │                   │   @ IntegerNode (location: (1,5)-(1,6))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 2
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,8)-(1,9))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 3
-            │                   └── operator_loc: (1,6)-(1,8) = "=>"
-            ├── closing_loc: (1,10)-(1,11) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_args_command.txt b/test/mri/prism/snapshots/seattlerb/call_args_command.txt
deleted file mode 100644
index f4a55ff58c3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_args_command.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :b
-            ├── message_loc: (1,2)-(1,3) = "b"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,4)-(1,9))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ CallNode (location: (1,4)-(1,5))
-            │           │   ├── flags: variable_call, ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :c
-            │           │   ├── message_loc: (1,4)-(1,5) = "c"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments: ∅
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── call_operator_loc: (1,5)-(1,6) = "."
-            │           ├── name: :d
-            │           ├── message_loc: (1,6)-(1,7) = "d"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,8)-(1,9))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ IntegerNode (location: (1,8)-(1,9))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_array_arg.txt b/test/mri/prism/snapshots/seattlerb/call_array_arg.txt
deleted file mode 100644
index 95d2f4859d0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_array_arg.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :==
-            ├── message_loc: (1,2)-(1,4) = "=="
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ArrayNode (location: (1,5)-(1,13))
-            │           ├── flags: ∅
-            │           ├── elements: (length: 2)
-            │           │   ├── @ SymbolNode (location: (1,6)-(1,8))
-            │           │   │   ├── flags: forced_us_ascii_encoding
-            │           │   │   ├── opening_loc: (1,6)-(1,7) = ":"
-            │           │   │   ├── value_loc: (1,7)-(1,8) = "b"
-            │           │   │   ├── closing_loc: ∅
-            │           │   │   └── unescaped: "b"
-            │           │   └── @ SymbolNode (location: (1,10)-(1,12))
-            │           │       ├── flags: forced_us_ascii_encoding
-            │           │       ├── opening_loc: (1,10)-(1,11) = ":"
-            │           │       ├── value_loc: (1,11)-(1,12) = "c"
-            │           │       ├── closing_loc: ∅
-            │           │       └── unescaped: "c"
-            │           ├── opening_loc: (1,5)-(1,6) = "["
-            │           └── closing_loc: (1,12)-(1,13) = "]"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_array_block_call.txt b/test/mri/prism/snapshots/seattlerb/call_array_block_call.txt
deleted file mode 100644
index e02740e7f58..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_array_block_call.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,19))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,19))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ArrayNode (location: (1,2)-(1,19))
-            │           ├── flags: ∅
-            │           ├── elements: (length: 2)
-            │           │   ├── @ NilNode (location: (1,4)-(1,7))
-            │           │   └── @ CallNode (location: (1,9)-(1,17))
-            │           │       ├── flags: ignore_visibility
-            │           │       ├── receiver: ∅
-            │           │       ├── call_operator_loc: ∅
-            │           │       ├── name: :b
-            │           │       ├── message_loc: (1,9)-(1,10) = "b"
-            │           │       ├── opening_loc: ∅
-            │           │       ├── arguments: ∅
-            │           │       ├── closing_loc: ∅
-            │           │       └── block:
-            │           │           @ BlockNode (location: (1,11)-(1,17))
-            │           │           ├── locals: []
-            │           │           ├── parameters: ∅
-            │           │           ├── body: ∅
-            │           │           ├── opening_loc: (1,11)-(1,13) = "do"
-            │           │           └── closing_loc: (1,14)-(1,17) = "end"
-            │           ├── opening_loc: (1,2)-(1,3) = "["
-            │           └── closing_loc: (1,18)-(1,19) = "]"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_array_lambda_block_call.txt b/test/mri/prism/snapshots/seattlerb/call_array_lambda_block_call.txt
deleted file mode 100644
index c6aa7228123..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_array_lambda_block_call.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(2,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,11))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ArrayNode (location: (1,2)-(1,11))
-            │           ├── flags: ∅
-            │           ├── elements: (length: 1)
-            │           │   └── @ LambdaNode (location: (1,3)-(1,10))
-            │           │       ├── locals: []
-            │           │       ├── operator_loc: (1,3)-(1,5) = "->"
-            │           │       ├── opening_loc: (1,8)-(1,9) = "{"
-            │           │       ├── closing_loc: (1,9)-(1,10) = "}"
-            │           │       ├── parameters:
-            │           │       │   @ BlockParametersNode (location: (1,5)-(1,7))
-            │           │       │   ├── parameters: ∅
-            │           │       │   ├── locals: (length: 0)
-            │           │       │   ├── opening_loc: (1,5)-(1,6) = "("
-            │           │       │   └── closing_loc: (1,6)-(1,7) = ")"
-            │           │       └── body: ∅
-            │           ├── opening_loc: (1,2)-(1,3) = "["
-            │           └── closing_loc: (1,10)-(1,11) = "]"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,12)-(2,3))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,12)-(1,14) = "do"
-                └── closing_loc: (2,0)-(2,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/call_array_lit_inline_hash.txt b/test/mri/prism/snapshots/seattlerb/call_array_lit_inline_hash.txt
deleted file mode 100644
index 091e21c00a6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_array_lit_inline_hash.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,15))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ArrayNode (location: (1,2)-(1,15))
-            │           ├── flags: ∅
-            │           ├── elements: (length: 2)
-            │           │   ├── @ SymbolNode (location: (1,3)-(1,5))
-            │           │   │   ├── flags: forced_us_ascii_encoding
-            │           │   │   ├── opening_loc: (1,3)-(1,4) = ":"
-            │           │   │   ├── value_loc: (1,4)-(1,5) = "b"
-            │           │   │   ├── closing_loc: ∅
-            │           │   │   └── unescaped: "b"
-            │           │   └── @ KeywordHashNode (location: (1,7)-(1,14))
-            │           │       ├── flags: symbol_keys
-            │           │       └── elements: (length: 1)
-            │           │           └── @ AssocNode (location: (1,7)-(1,14))
-            │           │               ├── key:
-            │           │               │   @ SymbolNode (location: (1,7)-(1,9))
-            │           │               │   ├── flags: forced_us_ascii_encoding
-            │           │               │   ├── opening_loc: (1,7)-(1,8) = ":"
-            │           │               │   ├── value_loc: (1,8)-(1,9) = "c"
-            │           │               │   ├── closing_loc: ∅
-            │           │               │   └── unescaped: "c"
-            │           │               ├── value:
-            │           │               │   @ IntegerNode (location: (1,13)-(1,14))
-            │           │               │   ├── flags: decimal
-            │           │               │   └── value: 1
-            │           │               └── operator_loc: (1,10)-(1,12) = "=>"
-            │           ├── opening_loc: (1,2)-(1,3) = "["
-            │           └── closing_loc: (1,14)-(1,15) = "]"
-            ├── closing_loc: (1,15)-(1,16) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_assoc.txt b/test/mri/prism/snapshots/seattlerb/call_assoc.txt
deleted file mode 100644
index 438c2565538..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_assoc.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,2)-(1,6))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,2)-(1,6))
-            │                   ├── key:
-            │                   │   @ IntegerNode (location: (1,2)-(1,3))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 2
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,5)-(1,6))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 3
-            │                   └── operator_loc: (1,3)-(1,5) = "=>"
-            ├── closing_loc: (1,6)-(1,7) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_assoc_new.txt b/test/mri/prism/snapshots/seattlerb/call_assoc_new.txt
deleted file mode 100644
index b4d7e0bf834..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_assoc_new.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,2)-(1,5))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,2)-(1,5))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,2)-(1,4))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (1,2)-(1,3) = "a"
-            │                   │   ├── closing_loc: (1,3)-(1,4) = ":"
-            │                   │   └── unescaped: "a"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,4)-(1,5))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 3
-            │                   └── operator_loc: ∅
-            ├── closing_loc: (1,5)-(1,6) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_assoc_new_if_multiline.txt b/test/mri/prism/snapshots/seattlerb/call_assoc_new_if_multiline.txt
deleted file mode 100644
index 9587e2e074d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_assoc_new_if_multiline.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(5,4))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(5,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,2)-(5,3))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,2)-(5,3))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,2)-(1,4))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (1,2)-(1,3) = "b"
-            │                   │   ├── closing_loc: (1,3)-(1,4) = ":"
-            │                   │   └── unescaped: "b"
-            │                   ├── value:
-            │                   │   @ IfNode (location: (1,5)-(5,3))
-            │                   │   ├── if_keyword_loc: (1,5)-(1,7) = "if"
-            │                   │   ├── predicate:
-            │                   │   │   @ SymbolNode (location: (1,8)-(1,10))
-            │                   │   │   ├── flags: forced_us_ascii_encoding
-            │                   │   │   ├── opening_loc: (1,8)-(1,9) = ":"
-            │                   │   │   ├── value_loc: (1,9)-(1,10) = "c"
-            │                   │   │   ├── closing_loc: ∅
-            │                   │   │   └── unescaped: "c"
-            │                   │   ├── then_keyword_loc: ∅
-            │                   │   ├── statements:
-            │                   │   │   @ StatementsNode (location: (2,0)-(2,1))
-            │                   │   │   └── body: (length: 1)
-            │                   │   │       └── @ IntegerNode (location: (2,0)-(2,1))
-            │                   │   │           ├── flags: decimal
-            │                   │   │           └── value: 1
-            │                   │   ├── consequent:
-            │                   │   │   @ ElseNode (location: (3,0)-(5,3))
-            │                   │   │   ├── else_keyword_loc: (3,0)-(3,4) = "else"
-            │                   │   │   ├── statements:
-            │                   │   │   │   @ StatementsNode (location: (4,0)-(4,1))
-            │                   │   │   │   └── body: (length: 1)
-            │                   │   │   │       └── @ IntegerNode (location: (4,0)-(4,1))
-            │                   │   │   │           ├── flags: decimal
-            │                   │   │   │           └── value: 2
-            │                   │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-            │                   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-            │                   └── operator_loc: ∅
-            ├── closing_loc: (5,3)-(5,4) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_assoc_trailing_comma.txt b/test/mri/prism/snapshots/seattlerb/call_assoc_trailing_comma.txt
deleted file mode 100644
index 8d0b285172c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_assoc_trailing_comma.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,2)-(1,6))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,2)-(1,6))
-            │                   ├── key:
-            │                   │   @ IntegerNode (location: (1,2)-(1,3))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,5)-(1,6))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 2
-            │                   └── operator_loc: (1,3)-(1,5) = "=>"
-            ├── closing_loc: (1,7)-(1,8) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_bang_command_call.txt b/test/mri/prism/snapshots/seattlerb/call_bang_command_call.txt
deleted file mode 100644
index 5e4e10d953c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_bang_command_call.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,2)-(1,7))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,2)-(1,3))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,2)-(1,3) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,3)-(1,4) = "."
-            │   ├── name: :b
-            │   ├── message_loc: (1,4)-(1,5) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,1) = "!"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_bang_squiggle.txt b/test/mri/prism/snapshots/seattlerb/call_bang_squiggle.txt
deleted file mode 100644
index bf11bc0136f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_bang_squiggle.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :!~
-            ├── message_loc: (1,2)-(1,4) = "!~"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_begin_call_block_call.txt b/test/mri/prism/snapshots/seattlerb/call_begin_call_block_call.txt
deleted file mode 100644
index 1aa994c8e6d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_begin_call_block_call.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(3,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ BeginNode (location: (1,2)-(3,3))
-            │           ├── begin_keyword_loc: (1,2)-(1,7) = "begin"
-            │           ├── statements:
-            │           │   @ StatementsNode (location: (2,0)-(2,10))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (2,0)-(2,10))
-            │           │           ├── flags: ∅
-            │           │           ├── receiver:
-            │           │           │   @ CallNode (location: (2,0)-(2,1))
-            │           │           │   ├── flags: variable_call, ignore_visibility
-            │           │           │   ├── receiver: ∅
-            │           │           │   ├── call_operator_loc: ∅
-            │           │           │   ├── name: :b
-            │           │           │   ├── message_loc: (2,0)-(2,1) = "b"
-            │           │           │   ├── opening_loc: ∅
-            │           │           │   ├── arguments: ∅
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── block: ∅
-            │           │           ├── call_operator_loc: (2,1)-(2,2) = "."
-            │           │           ├── name: :c
-            │           │           ├── message_loc: (2,2)-(2,3) = "c"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block:
-            │           │               @ BlockNode (location: (2,4)-(2,10))
-            │           │               ├── locals: []
-            │           │               ├── parameters: ∅
-            │           │               ├── body: ∅
-            │           │               ├── opening_loc: (2,4)-(2,6) = "do"
-            │           │               └── closing_loc: (2,7)-(2,10) = "end"
-            │           ├── rescue_clause: ∅
-            │           ├── else_clause: ∅
-            │           ├── ensure_clause: ∅
-            │           └── end_keyword_loc: (3,0)-(3,3) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_block_arg_named.txt b/test/mri/prism/snapshots/seattlerb/call_block_arg_named.txt
deleted file mode 100644
index f87c29cf2e1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_block_arg_named.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :x
-            ├── message_loc: (1,0)-(1,1) = "x"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments: ∅
-            ├── closing_loc: (1,6)-(1,7) = ")"
-            └── block:
-                @ BlockArgumentNode (location: (1,2)-(1,6))
-                ├── expression:
-                │   @ CallNode (location: (1,3)-(1,6))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :blk
-                │   ├── message_loc: (1,3)-(1,6) = "blk"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                └── operator_loc: (1,2)-(1,3) = "&"
diff --git a/test/mri/prism/snapshots/seattlerb/call_carat.txt b/test/mri/prism/snapshots/seattlerb/call_carat.txt
deleted file mode 100644
index 856e9a7847f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_carat.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :^
-            ├── message_loc: (1,2)-(1,3) = "^"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,4)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_colon2.txt b/test/mri/prism/snapshots/seattlerb/call_colon2.txt
deleted file mode 100644
index 98bfc631260..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_colon2.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ ConstantReadNode (location: (1,0)-(1,1))
-            │   └── name: :A
-            ├── call_operator_loc: (1,1)-(1,3) = "::"
-            ├── name: :b
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_colon_parens.txt b/test/mri/prism/snapshots/seattlerb/call_colon_parens.txt
deleted file mode 100644
index 6d10171a2b1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_colon_parens.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: (1,1)-(1,3) = "::"
-            ├── name: :call
-            ├── message_loc: ∅
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments: ∅
-            ├── closing_loc: (1,4)-(1,5) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_div.txt b/test/mri/prism/snapshots/seattlerb/call_div.txt
deleted file mode 100644
index ba62fb87bd1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_div.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :/
-            ├── message_loc: (1,2)-(1,3) = "/"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,4)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_dot_parens.txt b/test/mri/prism/snapshots/seattlerb/call_dot_parens.txt
deleted file mode 100644
index c9b70846996..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_dot_parens.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :call
-            ├── message_loc: ∅
-            ├── opening_loc: (1,2)-(1,3) = "("
-            ├── arguments: ∅
-            ├── closing_loc: (1,3)-(1,4) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_env.txt b/test/mri/prism/snapshots/seattlerb/call_env.txt
deleted file mode 100644
index fd1f95388ed..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_env.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :happy
-            ├── message_loc: (1,2)-(1,7) = "happy"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_eq3.txt b/test/mri/prism/snapshots/seattlerb/call_eq3.txt
deleted file mode 100644
index e636e157257..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_eq3.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :===
-            ├── message_loc: (1,2)-(1,5) = "==="
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_gt.txt b/test/mri/prism/snapshots/seattlerb/call_gt.txt
deleted file mode 100644
index a6f19e5adfe..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_gt.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :>
-            ├── message_loc: (1,2)-(1,3) = ">"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,4)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_kwsplat.txt b/test/mri/prism/snapshots/seattlerb/call_kwsplat.txt
deleted file mode 100644
index 4199e97a44c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_kwsplat.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,5))
-            │   ├── flags: contains_keyword_splat
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,2)-(1,5))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocSplatNode (location: (1,2)-(1,5))
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,4)-(1,5))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   └── operator_loc: (1,2)-(1,4) = "**"
-            ├── closing_loc: (1,5)-(1,6) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_leading_dots.txt b/test/mri/prism/snapshots/seattlerb/call_leading_dots.txt
deleted file mode 100644
index e8435d7e7a1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_leading_dots.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,2))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,2))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(2,2))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,0)-(1,1))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (2,0)-(2,1) = "."
-            │   ├── name: :b
-            │   ├── message_loc: (2,1)-(2,2) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (3,0)-(3,1) = "."
-            ├── name: :c
-            ├── message_loc: (3,1)-(3,2) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_leading_dots_comment.txt b/test/mri/prism/snapshots/seattlerb/call_leading_dots_comment.txt
deleted file mode 100644
index e5dfb723723..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_leading_dots_comment.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,2))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(4,2))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(2,2))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,0)-(1,1))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (2,0)-(2,1) = "."
-            │   ├── name: :b
-            │   ├── message_loc: (2,1)-(2,2) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (4,0)-(4,1) = "."
-            ├── name: :d
-            ├── message_loc: (4,1)-(4,2) = "d"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_lt.txt b/test/mri/prism/snapshots/seattlerb/call_lt.txt
deleted file mode 100644
index 14f50585d93..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_lt.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :<
-            ├── message_loc: (1,2)-(1,3) = "<"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,4)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_lte.txt b/test/mri/prism/snapshots/seattlerb/call_lte.txt
deleted file mode 100644
index 665a99d60a8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_lte.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :<=
-            ├── message_loc: (1,2)-(1,4) = "<="
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_not.txt b/test/mri/prism/snapshots/seattlerb/call_not.txt
deleted file mode 100644
index 86c68923031..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_not.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,4)-(1,6))
-            │   ├── flags: decimal
-            │   └── value: 42
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,3) = "not"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_pipe.txt b/test/mri/prism/snapshots/seattlerb/call_pipe.txt
deleted file mode 100644
index 855e986ef6f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_pipe.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :|
-            ├── message_loc: (1,2)-(1,3) = "|"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,4)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_rshift.txt b/test/mri/prism/snapshots/seattlerb/call_rshift.txt
deleted file mode 100644
index 26e593db187..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_rshift.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :>>
-            ├── message_loc: (1,2)-(1,4) = ">>"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_self_brackets.txt b/test/mri/prism/snapshots/seattlerb/call_self_brackets.txt
deleted file mode 100644
index 16ca69b5c29..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_self_brackets.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ignore_visibility
-            ├── receiver:
-            │   @ SelfNode (location: (1,0)-(1,4))
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,4)-(1,7) = "[1]"
-            ├── opening_loc: (1,4)-(1,5) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (1,6)-(1,7) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_spaceship.txt b/test/mri/prism/snapshots/seattlerb/call_spaceship.txt
deleted file mode 100644
index 8d43c3f9710..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_spaceship.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :<=>
-            ├── message_loc: (1,2)-(1,5) = "<=>"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_stabby_do_end_with_block.txt b/test/mri/prism/snapshots/seattlerb/call_stabby_do_end_with_block.txt
deleted file mode 100644
index 242db9e9cb5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_stabby_do_end_with_block.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,22))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,22))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LambdaNode (location: (1,2)-(1,13))
-            │           ├── locals: []
-            │           ├── operator_loc: (1,2)-(1,4) = "->"
-            │           ├── opening_loc: (1,5)-(1,7) = "do"
-            │           ├── closing_loc: (1,10)-(1,13) = "end"
-            │           ├── parameters: ∅
-            │           └── body:
-            │               @ StatementsNode (location: (1,8)-(1,9))
-            │               └── body: (length: 1)
-            │                   └── @ IntegerNode (location: (1,8)-(1,9))
-            │                       ├── flags: decimal
-            │                       └── value: 1
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,14)-(1,22))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (1,17)-(1,18))
-                │   └── body: (length: 1)
-                │       └── @ IntegerNode (location: (1,17)-(1,18))
-                │           ├── flags: decimal
-                │           └── value: 2
-                ├── opening_loc: (1,14)-(1,16) = "do"
-                └── closing_loc: (1,19)-(1,22) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt b/test/mri/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt
deleted file mode 100644
index 7c3ab8dad8f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,19))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LambdaNode (location: (1,2)-(1,10))
-            │           ├── locals: []
-            │           ├── operator_loc: (1,2)-(1,4) = "->"
-            │           ├── opening_loc: (1,5)-(1,6) = "{"
-            │           ├── closing_loc: (1,9)-(1,10) = "}"
-            │           ├── parameters: ∅
-            │           └── body:
-            │               @ StatementsNode (location: (1,7)-(1,8))
-            │               └── body: (length: 1)
-            │                   └── @ IntegerNode (location: (1,7)-(1,8))
-            │                       ├── flags: decimal
-            │                       └── value: 1
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,11)-(1,19))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (1,14)-(1,15))
-                │   └── body: (length: 1)
-                │       └── @ IntegerNode (location: (1,14)-(1,15))
-                │           ├── flags: decimal
-                │           └── value: 2
-                ├── opening_loc: (1,11)-(1,13) = "do"
-                └── closing_loc: (1,16)-(1,19) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/call_star.txt b/test/mri/prism/snapshots/seattlerb/call_star.txt
deleted file mode 100644
index 49aee1672c7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_star.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :*
-            ├── message_loc: (1,2)-(1,3) = "*"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,4)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_star2.txt b/test/mri/prism/snapshots/seattlerb/call_star2.txt
deleted file mode 100644
index cc2532cc7c8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_star2.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :**
-            ├── message_loc: (1,2)-(1,4) = "**"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_trailing_comma.txt b/test/mri/prism/snapshots/seattlerb/call_trailing_comma.txt
deleted file mode 100644
index fe28a3ad3eb..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_trailing_comma.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,2)-(1,3))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (1,4)-(1,5) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_trailing_dots.txt b/test/mri/prism/snapshots/seattlerb/call_trailing_dots.txt
deleted file mode 100644
index b0e23eb27b9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_trailing_dots.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,1))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,1))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(2,1))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,0)-(1,1))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,1)-(1,2) = "."
-            │   ├── name: :b
-            │   ├── message_loc: (2,0)-(2,1) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (2,1)-(2,2) = "."
-            ├── name: :c
-            ├── message_loc: (3,0)-(3,1) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/call_unary_bang.txt b/test/mri/prism/snapshots/seattlerb/call_unary_bang.txt
deleted file mode 100644
index 782cc83b103..00000000000
--- a/test/mri/prism/snapshots/seattlerb/call_unary_bang.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,2))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,2))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,1)-(1,2))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,1) = "!"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/case_in.txt b/test/mri/prism/snapshots/seattlerb/case_in.txt
deleted file mode 100644
index 950d66647e6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in.txt
+++ /dev/null
@@ -1,976 +0,0 @@
-@ ProgramNode (location: (1,0)-(111,3))
-├── locals: [:b, :_, :lhs, :x, :rhs, :c, :e]
-└── statements:
-    @ StatementsNode (location: (1,0)-(111,3))
-    └── body: (length: 28)
-        ├── @ CaseMatchNode (location: (1,0)-(3,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (1,5)-(1,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (1,5)-(1,6) = ":"
-        │   │   ├── value_loc: (1,6)-(1,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (2,0)-(2,8))
-        │   │       ├── pattern:
-        │   │       │   @ HashPatternNode (location: (2,4)-(2,8))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── elements: (length: 1)
-        │   │       │   │   └── @ AssocNode (location: (2,4)-(2,8))
-        │   │       │   │       ├── key:
-        │   │       │   │       │   @ SymbolNode (location: (2,4)-(2,8))
-        │   │       │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │       │   ├── opening_loc: (2,4)-(2,5) = "\""
-        │   │       │   │       │   ├── value_loc: (2,5)-(2,6) = "b"
-        │   │       │   │       │   ├── closing_loc: (2,6)-(2,8) = "\":"
-        │   │       │   │       │   └── unescaped: "b"
-        │   │       │   │       ├── value:
-        │   │       │   │       │   @ ImplicitNode (location: (2,5)-(2,6))
-        │   │       │   │       │   └── value:
-        │   │       │   │       │       @ LocalVariableTargetNode (location: (2,5)-(2,6))
-        │   │       │   │       │       ├── name: :b
-        │   │       │   │       │       └── depth: 0
-        │   │       │   │       └── operator_loc: ∅
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   └── closing_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (2,0)-(2,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (1,0)-(1,4) = "case"
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        ├── @ CaseMatchNode (location: (5,0)-(7,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (5,5)-(5,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (5,5)-(5,6) = ":"
-        │   │   ├── value_loc: (5,6)-(5,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (6,0)-(6,10))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayNode (location: (6,3)-(6,10))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── elements: (length: 2)
-        │   │       │   │   ├── @ SymbolNode (location: (6,6)-(6,7))
-        │   │       │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │   │   ├── opening_loc: ∅
-        │   │       │   │   │   ├── value_loc: (6,6)-(6,7) = "a"
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── unescaped: "a"
-        │   │       │   │   └── @ SymbolNode (location: (6,8)-(6,9))
-        │   │       │   │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── value_loc: (6,8)-(6,9) = "b"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "b"
-        │   │       │   ├── opening_loc: (6,3)-(6,6) = "%I["
-        │   │       │   └── closing_loc: (6,9)-(6,10) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (6,0)-(6,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (5,0)-(5,4) = "case"
-        │   └── end_keyword_loc: (7,0)-(7,3) = "end"
-        ├── @ CaseMatchNode (location: (9,0)-(11,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (9,5)-(9,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (9,5)-(9,6) = ":"
-        │   │   ├── value_loc: (9,6)-(9,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (10,0)-(10,10))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayNode (location: (10,3)-(10,10))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── elements: (length: 2)
-        │   │       │   │   ├── @ StringNode (location: (10,6)-(10,7))
-        │   │       │   │   │   ├── flags: ∅
-        │   │       │   │   │   ├── opening_loc: ∅
-        │   │       │   │   │   ├── content_loc: (10,6)-(10,7) = "a"
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── unescaped: "a"
-        │   │       │   │   └── @ StringNode (location: (10,8)-(10,9))
-        │   │       │   │       ├── flags: ∅
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── content_loc: (10,8)-(10,9) = "b"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "b"
-        │   │       │   ├── opening_loc: (10,3)-(10,6) = "%W["
-        │   │       │   └── closing_loc: (10,9)-(10,10) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (10,0)-(10,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (9,0)-(9,4) = "case"
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ CaseMatchNode (location: (13,0)-(15,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (13,5)-(13,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (13,5)-(13,6) = ":"
-        │   │   ├── value_loc: (13,6)-(13,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (14,0)-(14,10))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayNode (location: (14,3)-(14,10))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── elements: (length: 2)
-        │   │       │   │   ├── @ SymbolNode (location: (14,6)-(14,7))
-        │   │       │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │   │   ├── opening_loc: ∅
-        │   │       │   │   │   ├── value_loc: (14,6)-(14,7) = "a"
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── unescaped: "a"
-        │   │       │   │   └── @ SymbolNode (location: (14,8)-(14,9))
-        │   │       │   │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── value_loc: (14,8)-(14,9) = "b"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "b"
-        │   │       │   ├── opening_loc: (14,3)-(14,6) = "%i["
-        │   │       │   └── closing_loc: (14,9)-(14,10) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (14,0)-(14,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (13,0)-(13,4) = "case"
-        │   └── end_keyword_loc: (15,0)-(15,3) = "end"
-        ├── @ CaseMatchNode (location: (17,0)-(19,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (17,5)-(17,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (17,5)-(17,6) = ":"
-        │   │   ├── value_loc: (17,6)-(17,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (18,0)-(18,10))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayNode (location: (18,3)-(18,10))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── elements: (length: 2)
-        │   │       │   │   ├── @ StringNode (location: (18,6)-(18,7))
-        │   │       │   │   │   ├── flags: ∅
-        │   │       │   │   │   ├── opening_loc: ∅
-        │   │       │   │   │   ├── content_loc: (18,6)-(18,7) = "a"
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── unescaped: "a"
-        │   │       │   │   └── @ StringNode (location: (18,8)-(18,9))
-        │   │       │   │       ├── flags: ∅
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── content_loc: (18,8)-(18,9) = "b"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "b"
-        │   │       │   ├── opening_loc: (18,3)-(18,6) = "%w["
-        │   │       │   └── closing_loc: (18,9)-(18,10) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (18,0)-(18,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (17,0)-(17,4) = "case"
-        │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        ├── @ CaseMatchNode (location: (21,0)-(23,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (21,5)-(21,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (21,5)-(21,6) = ":"
-        │   │   ├── value_loc: (21,6)-(21,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (22,0)-(22,10))
-        │   │       ├── pattern:
-        │   │       │   @ ParenthesesNode (location: (22,3)-(22,10))
-        │   │       │   ├── body:
-        │   │       │   │   @ RangeNode (location: (22,4)-(22,9))
-        │   │       │   │   ├── flags: exclude_end
-        │   │       │   │   ├── left: ∅
-        │   │       │   │   ├── right:
-        │   │       │   │   │   @ IntegerNode (location: (22,7)-(22,9))
-        │   │       │   │   │   ├── flags: decimal
-        │   │       │   │   │   └── value: 10
-        │   │       │   │   └── operator_loc: (22,4)-(22,7) = "..."
-        │   │       │   ├── opening_loc: (22,3)-(22,4) = "("
-        │   │       │   └── closing_loc: (22,9)-(22,10) = ")"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (22,0)-(22,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (21,0)-(21,4) = "case"
-        │   └── end_keyword_loc: (23,0)-(23,3) = "end"
-        ├── @ CaseMatchNode (location: (25,0)-(27,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (25,5)-(25,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (25,5)-(25,6) = ":"
-        │   │   ├── value_loc: (25,6)-(25,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (26,0)-(26,9))
-        │   │       ├── pattern:
-        │   │       │   @ ParenthesesNode (location: (26,3)-(26,9))
-        │   │       │   ├── body:
-        │   │       │   │   @ RangeNode (location: (26,4)-(26,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   ├── left: ∅
-        │   │       │   │   ├── right:
-        │   │       │   │   │   @ IntegerNode (location: (26,6)-(26,8))
-        │   │       │   │   │   ├── flags: decimal
-        │   │       │   │   │   └── value: 10
-        │   │       │   │   └── operator_loc: (26,4)-(26,6) = ".."
-        │   │       │   ├── opening_loc: (26,3)-(26,4) = "("
-        │   │       │   └── closing_loc: (26,8)-(26,9) = ")"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (26,0)-(26,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (25,0)-(25,4) = "case"
-        │   └── end_keyword_loc: (27,0)-(27,3) = "end"
-        ├── @ CaseMatchNode (location: (29,0)-(31,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (29,5)-(29,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (29,5)-(29,6) = ":"
-        │   │   ├── value_loc: (29,6)-(29,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (30,0)-(30,9))
-        │   │       ├── pattern:
-        │   │       │   @ ParenthesesNode (location: (30,3)-(30,9))
-        │   │       │   ├── body:
-        │   │       │   │   @ RangeNode (location: (30,4)-(30,8))
-        │   │       │   │   ├── flags: exclude_end
-        │   │       │   │   ├── left:
-        │   │       │   │   │   @ IntegerNode (location: (30,4)-(30,5))
-        │   │       │   │   │   ├── flags: decimal
-        │   │       │   │   │   └── value: 1
-        │   │       │   │   ├── right: ∅
-        │   │       │   │   └── operator_loc: (30,5)-(30,8) = "..."
-        │   │       │   ├── opening_loc: (30,3)-(30,4) = "("
-        │   │       │   └── closing_loc: (30,8)-(30,9) = ")"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (30,0)-(30,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (29,0)-(29,4) = "case"
-        │   └── end_keyword_loc: (31,0)-(31,3) = "end"
-        ├── @ CaseMatchNode (location: (33,0)-(35,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (33,5)-(33,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (33,5)-(33,6) = ":"
-        │   │   ├── value_loc: (33,6)-(33,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (34,0)-(34,10))
-        │   │       ├── pattern:
-        │   │       │   @ ParenthesesNode (location: (34,3)-(34,10))
-        │   │       │   ├── body:
-        │   │       │   │   @ RangeNode (location: (34,4)-(34,9))
-        │   │       │   │   ├── flags: exclude_end
-        │   │       │   │   ├── left:
-        │   │       │   │   │   @ IntegerNode (location: (34,4)-(34,5))
-        │   │       │   │   │   ├── flags: decimal
-        │   │       │   │   │   └── value: 1
-        │   │       │   │   ├── right:
-        │   │       │   │   │   @ IntegerNode (location: (34,8)-(34,9))
-        │   │       │   │   │   ├── flags: decimal
-        │   │       │   │   │   └── value: 3
-        │   │       │   │   └── operator_loc: (34,5)-(34,8) = "..."
-        │   │       │   ├── opening_loc: (34,3)-(34,4) = "("
-        │   │       │   └── closing_loc: (34,9)-(34,10) = ")"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (34,0)-(34,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (33,0)-(33,4) = "case"
-        │   └── end_keyword_loc: (35,0)-(35,3) = "end"
-        ├── @ CaseMatchNode (location: (37,0)-(39,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (37,5)-(37,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (37,5)-(37,6) = ":"
-        │   │   ├── value_loc: (37,6)-(37,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (38,0)-(38,7))
-        │   │       ├── pattern:
-        │   │       │   @ ParenthesesNode (location: (38,3)-(38,7))
-        │   │       │   ├── body:
-        │   │       │   │   @ IntegerNode (location: (38,4)-(38,6))
-        │   │       │   │   ├── flags: decimal
-        │   │       │   │   └── value: 42
-        │   │       │   ├── opening_loc: (38,3)-(38,4) = "("
-        │   │       │   └── closing_loc: (38,6)-(38,7) = ")"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (38,0)-(38,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (37,0)-(37,4) = "case"
-        │   └── end_keyword_loc: (39,0)-(39,3) = "end"
-        ├── @ CaseMatchNode (location: (41,0)-(43,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (41,5)-(41,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (41,5)-(41,6) = ":"
-        │   │   ├── value_loc: (41,6)-(41,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (42,0)-(42,8))
-        │   │       ├── pattern:
-        │   │       │   @ HashPatternNode (location: (42,3)-(42,8))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── elements: (length: 0)
-        │   │       │   ├── rest:
-        │   │       │   │   @ NoKeywordsParameterNode (location: (42,3)-(42,8))
-        │   │       │   │   ├── operator_loc: (42,3)-(42,5) = "**"
-        │   │       │   │   └── keyword_loc: (42,5)-(42,8) = "nil"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   └── closing_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (42,0)-(42,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (41,0)-(41,4) = "case"
-        │   └── end_keyword_loc: (43,0)-(43,3) = "end"
-        ├── @ CaseMatchNode (location: (45,0)-(47,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (45,5)-(45,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (45,5)-(45,6) = ":"
-        │   │   ├── value_loc: (45,6)-(45,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (46,0)-(46,11))
-        │   │       ├── pattern:
-        │   │       │   @ RegularExpressionNode (location: (46,3)-(46,11))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (46,3)-(46,4) = "/"
-        │   │       │   ├── content_loc: (46,4)-(46,10) = "regexp"
-        │   │       │   ├── closing_loc: (46,10)-(46,11) = "/"
-        │   │       │   └── unescaped: "regexp"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (46,0)-(46,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (45,0)-(45,4) = "case"
-        │   └── end_keyword_loc: (47,0)-(47,3) = "end"
-        ├── @ CaseMatchNode (location: (49,0)-(51,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (49,5)-(49,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (49,5)-(49,6) = ":"
-        │   │   ├── value_loc: (49,6)-(49,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (50,0)-(50,13))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (50,3)-(50,13))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 1)
-        │   │       │   │   └── @ SymbolNode (location: (50,3)-(50,5))
-        │   │       │   │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │       ├── opening_loc: (50,3)-(50,4) = ":"
-        │   │       │   │       ├── value_loc: (50,4)-(50,5) = "b"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "b"
-        │   │       │   ├── rest:
-        │   │       │   │   @ SplatNode (location: (50,7)-(50,9))
-        │   │       │   │   ├── operator_loc: (50,7)-(50,8) = "*"
-        │   │       │   │   └── expression:
-        │   │       │   │       @ LocalVariableTargetNode (location: (50,8)-(50,9))
-        │   │       │   │       ├── name: :_
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── posts: (length: 1)
-        │   │       │   │   └── @ SymbolNode (location: (50,11)-(50,13))
-        │   │       │   │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │       ├── opening_loc: (50,11)-(50,12) = ":"
-        │   │       │   │       ├── value_loc: (50,12)-(50,13) = "c"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "c"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   └── closing_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (50,0)-(50,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (49,0)-(49,4) = "case"
-        │   └── end_keyword_loc: (51,0)-(51,3) = "end"
-        ├── @ CaseMatchNode (location: (53,0)-(55,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (53,5)-(53,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (53,5)-(53,6) = ":"
-        │   │   ├── value_loc: (53,6)-(53,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (54,0)-(54,11))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (54,3)-(54,11))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 2)
-        │   │       │   │   ├── @ SymbolNode (location: (54,3)-(54,5))
-        │   │       │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │   │   ├── opening_loc: (54,3)-(54,4) = ":"
-        │   │       │   │   │   ├── value_loc: (54,4)-(54,5) = "b"
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── unescaped: "b"
-        │   │       │   │   └── @ ArrayPatternNode (location: (54,7)-(54,11))
-        │   │       │   │       ├── constant: ∅
-        │   │       │   │       ├── requireds: (length: 1)
-        │   │       │   │       │   └── @ SymbolNode (location: (54,8)-(54,10))
-        │   │       │   │       │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │       │       ├── opening_loc: (54,8)-(54,9) = ":"
-        │   │       │   │       │       ├── value_loc: (54,9)-(54,10) = "c"
-        │   │       │   │       │       ├── closing_loc: ∅
-        │   │       │   │       │       └── unescaped: "c"
-        │   │       │   │       ├── rest: ∅
-        │   │       │   │       ├── posts: (length: 0)
-        │   │       │   │       ├── opening_loc: (54,7)-(54,8) = "["
-        │   │       │   │       └── closing_loc: (54,10)-(54,11) = "]"
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   └── closing_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (54,0)-(54,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (53,0)-(53,4) = "case"
-        │   └── end_keyword_loc: (55,0)-(55,3) = "end"
-        ├── @ CaseMatchNode (location: (57,0)-(59,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (57,5)-(57,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (57,5)-(57,6) = ":"
-        │   │   ├── value_loc: (57,6)-(57,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (58,0)-(58,11))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (58,3)-(58,11))
-        │   │       │   ├── constant:
-        │   │       │   │   @ ConstantReadNode (location: (58,3)-(58,9))
-        │   │       │   │   └── name: :Symbol
-        │   │       │   ├── requireds: (length: 0)
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: (58,9)-(58,10) = "("
-        │   │       │   └── closing_loc: (58,10)-(58,11) = ")"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (58,0)-(58,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (57,0)-(57,4) = "case"
-        │   └── end_keyword_loc: (59,0)-(59,3) = "end"
-        ├── @ CaseMatchNode (location: (61,0)-(63,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (61,5)-(61,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (61,5)-(61,6) = ":"
-        │   │   ├── value_loc: (61,6)-(61,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (62,0)-(62,24))
-        │   │       ├── pattern:
-        │   │       │   @ FindPatternNode (location: (62,3)-(62,24))
-        │   │       │   ├── constant:
-        │   │       │   │   @ ConstantReadNode (location: (62,3)-(62,9))
-        │   │       │   │   └── name: :Symbol
-        │   │       │   ├── left:
-        │   │       │   │   @ SplatNode (location: (62,10)-(62,14))
-        │   │       │   │   ├── operator_loc: (62,10)-(62,11) = "*"
-        │   │       │   │   └── expression:
-        │   │       │   │       @ LocalVariableTargetNode (location: (62,11)-(62,14))
-        │   │       │   │       ├── name: :lhs
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── requireds: (length: 1)
-        │   │       │   │   └── @ LocalVariableTargetNode (location: (62,16)-(62,17))
-        │   │       │   │       ├── name: :x
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── right:
-        │   │       │   │   @ SplatNode (location: (62,19)-(62,23))
-        │   │       │   │   ├── operator_loc: (62,19)-(62,20) = "*"
-        │   │       │   │   └── expression:
-        │   │       │   │       @ LocalVariableTargetNode (location: (62,20)-(62,23))
-        │   │       │   │       ├── name: :rhs
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── opening_loc: (62,9)-(62,10) = "("
-        │   │       │   └── closing_loc: (62,23)-(62,24) = ")"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (62,0)-(62,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (61,0)-(61,4) = "case"
-        │   └── end_keyword_loc: (63,0)-(63,3) = "end"
-        ├── @ CaseMatchNode (location: (65,0)-(67,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (65,5)-(65,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (65,5)-(65,6) = ":"
-        │   │   ├── value_loc: (65,6)-(65,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (66,0)-(66,24))
-        │   │       ├── pattern:
-        │   │       │   @ FindPatternNode (location: (66,3)-(66,24))
-        │   │       │   ├── constant:
-        │   │       │   │   @ ConstantReadNode (location: (66,3)-(66,9))
-        │   │       │   │   └── name: :Symbol
-        │   │       │   ├── left:
-        │   │       │   │   @ SplatNode (location: (66,10)-(66,14))
-        │   │       │   │   ├── operator_loc: (66,10)-(66,11) = "*"
-        │   │       │   │   └── expression:
-        │   │       │   │       @ LocalVariableTargetNode (location: (66,11)-(66,14))
-        │   │       │   │       ├── name: :lhs
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── requireds: (length: 1)
-        │   │       │   │   └── @ LocalVariableTargetNode (location: (66,16)-(66,17))
-        │   │       │   │       ├── name: :x
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── right:
-        │   │       │   │   @ SplatNode (location: (66,19)-(66,23))
-        │   │       │   │   ├── operator_loc: (66,19)-(66,20) = "*"
-        │   │       │   │   └── expression:
-        │   │       │   │       @ LocalVariableTargetNode (location: (66,20)-(66,23))
-        │   │       │   │       ├── name: :rhs
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── opening_loc: (66,9)-(66,10) = "["
-        │   │       │   └── closing_loc: (66,23)-(66,24) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (66,0)-(66,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (65,0)-(65,4) = "case"
-        │   └── end_keyword_loc: (67,0)-(67,3) = "end"
-        ├── @ CaseMatchNode (location: (69,0)-(71,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (69,5)-(69,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (69,5)-(69,6) = ":"
-        │   │   ├── value_loc: (69,6)-(69,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (70,0)-(70,22))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (70,3)-(70,22))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 2)
-        │   │       │   │   ├── @ LambdaNode (location: (70,4)-(70,18))
-        │   │       │   │   │   ├── locals: [:b]
-        │   │       │   │   │   ├── operator_loc: (70,4)-(70,6) = "->"
-        │   │       │   │   │   ├── opening_loc: (70,10)-(70,11) = "{"
-        │   │       │   │   │   ├── closing_loc: (70,17)-(70,18) = "}"
-        │   │       │   │   │   ├── parameters:
-        │   │       │   │   │   │   @ BlockParametersNode (location: (70,6)-(70,9))
-        │   │       │   │   │   │   ├── parameters:
-        │   │       │   │   │   │   │   @ ParametersNode (location: (70,7)-(70,8))
-        │   │       │   │   │   │   │   ├── requireds: (length: 1)
-        │   │       │   │   │   │   │   │   └── @ RequiredParameterNode (location: (70,7)-(70,8))
-        │   │       │   │   │   │   │   │       ├── flags: ∅
-        │   │       │   │   │   │   │   │       └── name: :b
-        │   │       │   │   │   │   │   ├── optionals: (length: 0)
-        │   │       │   │   │   │   │   ├── rest: ∅
-        │   │       │   │   │   │   │   ├── posts: (length: 0)
-        │   │       │   │   │   │   │   ├── keywords: (length: 0)
-        │   │       │   │   │   │   │   ├── keyword_rest: ∅
-        │   │       │   │   │   │   │   └── block: ∅
-        │   │       │   │   │   │   ├── locals: (length: 0)
-        │   │       │   │   │   │   ├── opening_loc: (70,6)-(70,7) = "("
-        │   │       │   │   │   │   └── closing_loc: (70,8)-(70,9) = ")"
-        │   │       │   │   │   └── body:
-        │   │       │   │   │       @ StatementsNode (location: (70,12)-(70,16))
-        │   │       │   │   │       └── body: (length: 1)
-        │   │       │   │   │           └── @ TrueNode (location: (70,12)-(70,16))
-        │   │       │   │   └── @ LocalVariableTargetNode (location: (70,20)-(70,21))
-        │   │       │   │       ├── name: :c
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: (70,3)-(70,4) = "["
-        │   │       │   └── closing_loc: (70,21)-(70,22) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (70,0)-(70,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (69,0)-(69,4) = "case"
-        │   └── end_keyword_loc: (71,0)-(71,3) = "end"
-        ├── @ CaseMatchNode (location: (73,0)-(75,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (73,5)-(73,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (73,5)-(73,6) = ":"
-        │   │   ├── value_loc: (73,6)-(73,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (74,0)-(74,28))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (74,3)-(74,28))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 4)
-        │   │       │   │   ├── @ SymbolNode (location: (74,4)-(74,6))
-        │   │       │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │   │   ├── opening_loc: (74,4)-(74,5) = ":"
-        │   │       │   │   │   ├── value_loc: (74,5)-(74,6) = "a"
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── unescaped: "a"
-        │   │       │   │   ├── @ LocalVariableTargetNode (location: (74,8)-(74,9))
-        │   │       │   │   │   ├── name: :b
-        │   │       │   │   │   └── depth: 0
-        │   │       │   │   ├── @ LocalVariableTargetNode (location: (74,11)-(74,12))
-        │   │       │   │   │   ├── name: :c
-        │   │       │   │   │   └── depth: 0
-        │   │       │   │   └── @ ArrayPatternNode (location: (74,14)-(74,27))
-        │   │       │   │       ├── constant: ∅
-        │   │       │   │       ├── requireds: (length: 1)
-        │   │       │   │       │   └── @ SymbolNode (location: (74,15)-(74,17))
-        │   │       │   │       │       ├── flags: forced_us_ascii_encoding
-        │   │       │   │       │       ├── opening_loc: (74,15)-(74,16) = ":"
-        │   │       │   │       │       ├── value_loc: (74,16)-(74,17) = "d"
-        │   │       │   │       │       ├── closing_loc: ∅
-        │   │       │   │       │       └── unescaped: "d"
-        │   │       │   │       ├── rest:
-        │   │       │   │       │   @ SplatNode (location: (74,19)-(74,21))
-        │   │       │   │       │   ├── operator_loc: (74,19)-(74,20) = "*"
-        │   │       │   │       │   └── expression:
-        │   │       │   │       │       @ LocalVariableTargetNode (location: (74,20)-(74,21))
-        │   │       │   │       │       ├── name: :e
-        │   │       │   │       │       └── depth: 0
-        │   │       │   │       ├── posts: (length: 1)
-        │   │       │   │       │   └── @ NilNode (location: (74,23)-(74,26))
-        │   │       │   │       ├── opening_loc: (74,14)-(74,15) = "["
-        │   │       │   │       └── closing_loc: (74,26)-(74,27) = "]"
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: (74,3)-(74,4) = "["
-        │   │       │   └── closing_loc: (74,27)-(74,28) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (74,0)-(74,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (73,0)-(73,4) = "case"
-        │   └── end_keyword_loc: (75,0)-(75,3) = "end"
-        ├── @ CaseMatchNode (location: (77,0)-(79,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (77,5)-(77,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (77,5)-(77,6) = ":"
-        │   │   ├── value_loc: (77,6)-(77,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (78,0)-(78,12))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (78,3)-(78,12))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 1)
-        │   │       │   │   └── @ ConstantReadNode (location: (78,4)-(78,5))
-        │   │       │   │       └── name: :A
-        │   │       │   ├── rest:
-        │   │       │   │   @ SplatNode (location: (78,7)-(78,8))
-        │   │       │   │   ├── operator_loc: (78,7)-(78,8) = "*"
-        │   │       │   │   └── expression: ∅
-        │   │       │   ├── posts: (length: 1)
-        │   │       │   │   └── @ ConstantReadNode (location: (78,10)-(78,11))
-        │   │       │   │       └── name: :B
-        │   │       │   ├── opening_loc: (78,3)-(78,4) = "["
-        │   │       │   └── closing_loc: (78,11)-(78,12) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (78,0)-(78,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (77,0)-(77,4) = "case"
-        │   └── end_keyword_loc: (79,0)-(79,3) = "end"
-        ├── @ CaseMatchNode (location: (81,0)-(83,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (81,5)-(81,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (81,5)-(81,6) = ":"
-        │   │   ├── value_loc: (81,6)-(81,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (82,0)-(82,22))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (82,3)-(82,22))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 2)
-        │   │       │   │   ├── @ ArrayPatternNode (location: (82,4)-(82,11))
-        │   │       │   │   │   ├── constant: ∅
-        │   │       │   │   │   ├── requireds: (length: 2)
-        │   │       │   │   │   │   ├── @ SymbolNode (location: (82,5)-(82,7))
-        │   │       │   │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │   │   │   │   ├── opening_loc: (82,5)-(82,6) = ":"
-        │   │       │   │   │   │   │   ├── value_loc: (82,6)-(82,7) = "b"
-        │   │       │   │   │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   │   │   └── unescaped: "b"
-        │   │       │   │   │   │   └── @ LocalVariableTargetNode (location: (82,9)-(82,10))
-        │   │       │   │   │   │       ├── name: :c
-        │   │       │   │   │   │       └── depth: 0
-        │   │       │   │   │   ├── rest: ∅
-        │   │       │   │   │   ├── posts: (length: 0)
-        │   │       │   │   │   ├── opening_loc: (82,4)-(82,5) = "["
-        │   │       │   │   │   └── closing_loc: (82,10)-(82,11) = "]"
-        │   │       │   │   └── @ ArrayPatternNode (location: (82,13)-(82,21))
-        │   │       │   │       ├── constant: ∅
-        │   │       │   │       ├── requireds: (length: 2)
-        │   │       │   │       │   ├── @ SymbolNode (location: (82,14)-(82,16))
-        │   │       │   │       │   │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │       │   │   ├── opening_loc: (82,14)-(82,15) = ":"
-        │   │       │   │       │   │   ├── value_loc: (82,15)-(82,16) = "d"
-        │   │       │   │       │   │   ├── closing_loc: ∅
-        │   │       │   │       │   │   └── unescaped: "d"
-        │   │       │   │       │   └── @ PinnedVariableNode (location: (82,18)-(82,20))
-        │   │       │   │       │       ├── variable:
-        │   │       │   │       │       │   @ LocalVariableReadNode (location: (82,19)-(82,20))
-        │   │       │   │       │       │   ├── name: :e
-        │   │       │   │       │       │   └── depth: 0
-        │   │       │   │       │       └── operator_loc: (82,18)-(82,19) = "^"
-        │   │       │   │       ├── rest: ∅
-        │   │       │   │       ├── posts: (length: 0)
-        │   │       │   │       ├── opening_loc: (82,13)-(82,14) = "["
-        │   │       │   │       └── closing_loc: (82,20)-(82,21) = "]"
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: (82,3)-(82,4) = "["
-        │   │       │   └── closing_loc: (82,21)-(82,22) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (82,0)-(82,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (81,0)-(81,4) = "case"
-        │   └── end_keyword_loc: (83,0)-(83,3) = "end"
-        ├── @ CaseMatchNode (location: (85,0)-(87,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (85,5)-(85,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (85,5)-(85,6) = ":"
-        │   │   ├── value_loc: (85,6)-(85,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (86,0)-(86,5))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (86,3)-(86,5))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 0)
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: (86,3)-(86,4) = "["
-        │   │       │   └── closing_loc: (86,4)-(86,5) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (86,0)-(86,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (85,0)-(85,4) = "case"
-        │   └── end_keyword_loc: (87,0)-(87,3) = "end"
-        ├── @ CaseMatchNode (location: (89,0)-(91,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (89,5)-(89,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (89,5)-(89,6) = ":"
-        │   │   ├── value_loc: (89,6)-(89,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (90,0)-(90,9))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (90,3)-(90,9))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 1)
-        │   │       │   │   └── @ PinnedExpressionNode (location: (90,4)-(90,8))
-        │   │       │   │       ├── expression:
-        │   │       │   │       │   @ CallNode (location: (90,6)-(90,7))
-        │   │       │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   │       │   ├── receiver: ∅
-        │   │       │   │       │   ├── call_operator_loc: ∅
-        │   │       │   │       │   ├── name: :a
-        │   │       │   │       │   ├── message_loc: (90,6)-(90,7) = "a"
-        │   │       │   │       │   ├── opening_loc: ∅
-        │   │       │   │       │   ├── arguments: ∅
-        │   │       │   │       │   ├── closing_loc: ∅
-        │   │       │   │       │   └── block: ∅
-        │   │       │   │       ├── operator_loc: (90,4)-(90,5) = "^"
-        │   │       │   │       ├── lparen_loc: (90,5)-(90,6) = "("
-        │   │       │   │       └── rparen_loc: (90,7)-(90,8) = ")"
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: (90,3)-(90,4) = "["
-        │   │       │   └── closing_loc: (90,8)-(90,9) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (90,0)-(90,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (89,0)-(89,4) = "case"
-        │   └── end_keyword_loc: (91,0)-(91,3) = "end"
-        ├── @ CaseMatchNode (location: (93,0)-(95,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (93,5)-(93,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (93,5)-(93,6) = ":"
-        │   │   ├── value_loc: (93,6)-(93,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (94,0)-(94,19))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (94,3)-(94,19))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 3)
-        │   │       │   │   ├── @ PinnedVariableNode (location: (94,4)-(94,7))
-        │   │       │   │   │   ├── variable:
-        │   │       │   │   │   │   @ InstanceVariableReadNode (location: (94,5)-(94,7))
-        │   │       │   │   │   │   └── name: :@a
-        │   │       │   │   │   └── operator_loc: (94,4)-(94,5) = "^"
-        │   │       │   │   ├── @ PinnedVariableNode (location: (94,9)-(94,12))
-        │   │       │   │   │   ├── variable:
-        │   │       │   │   │   │   @ GlobalVariableReadNode (location: (94,10)-(94,12))
-        │   │       │   │   │   │   └── name: :$b
-        │   │       │   │   │   └── operator_loc: (94,9)-(94,10) = "^"
-        │   │       │   │   └── @ PinnedVariableNode (location: (94,14)-(94,18))
-        │   │       │   │       ├── variable:
-        │   │       │   │       │   @ ClassVariableReadNode (location: (94,15)-(94,18))
-        │   │       │   │       │   └── name: :@@c
-        │   │       │   │       └── operator_loc: (94,14)-(94,15) = "^"
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: (94,3)-(94,4) = "["
-        │   │       │   └── closing_loc: (94,18)-(94,19) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (94,0)-(94,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (93,0)-(93,4) = "case"
-        │   └── end_keyword_loc: (95,0)-(95,3) = "end"
-        ├── @ CaseMatchNode (location: (97,0)-(99,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (97,5)-(97,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (97,5)-(97,6) = ":"
-        │   │   ├── value_loc: (97,6)-(97,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (98,0)-(98,12))
-        │   │       ├── pattern:
-        │   │       │   @ XStringNode (location: (98,3)-(98,12))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (98,3)-(98,4) = "`"
-        │   │       │   ├── content_loc: (98,4)-(98,11) = "echo hi"
-        │   │       │   ├── closing_loc: (98,11)-(98,12) = "`"
-        │   │       │   └── unescaped: "echo hi"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (98,0)-(98,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (97,0)-(97,4) = "case"
-        │   └── end_keyword_loc: (99,0)-(99,3) = "end"
-        ├── @ CaseMatchNode (location: (101,0)-(103,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (101,5)-(101,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (101,5)-(101,6) = ":"
-        │   │   ├── value_loc: (101,6)-(101,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (102,0)-(102,16))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (102,3)-(102,16))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── requireds: (length: 3)
-        │   │       │   │   ├── @ NilNode (location: (102,3)-(102,6))
-        │   │       │   │   ├── @ NilNode (location: (102,8)-(102,11))
-        │   │       │   │   └── @ NilNode (location: (102,13)-(102,16))
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── posts: (length: 0)
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   └── closing_loc: ∅
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (102,0)-(102,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (101,0)-(101,4) = "case"
-        │   └── end_keyword_loc: (103,0)-(103,3) = "end"
-        ├── @ CaseMatchNode (location: (105,0)-(107,3))
-        │   ├── predicate:
-        │   │   @ SymbolNode (location: (105,5)-(105,7))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (105,5)-(105,6) = ":"
-        │   │   ├── value_loc: (105,6)-(105,7) = "a"
-        │   │   ├── closing_loc: ∅
-        │   │   └── unescaped: "a"
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (106,0)-(106,11))
-        │   │       ├── pattern:
-        │   │       │   @ HashPatternNode (location: (106,3)-(106,11))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── elements: (length: 1)
-        │   │       │   │   └── @ AssocNode (location: (106,5)-(106,9))
-        │   │       │   │       ├── key:
-        │   │       │   │       │   @ SymbolNode (location: (106,5)-(106,9))
-        │   │       │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │       │   ├── opening_loc: (106,5)-(106,6) = "\""
-        │   │       │   │       │   ├── value_loc: (106,6)-(106,7) = "b"
-        │   │       │   │       │   ├── closing_loc: (106,7)-(106,9) = "\":"
-        │   │       │   │       │   └── unescaped: "b"
-        │   │       │   │       ├── value:
-        │   │       │   │       │   @ ImplicitNode (location: (106,6)-(106,7))
-        │   │       │   │       │   └── value:
-        │   │       │   │       │       @ LocalVariableTargetNode (location: (106,6)-(106,7))
-        │   │       │   │       │       ├── name: :b
-        │   │       │   │       │       └── depth: 0
-        │   │       │   │       └── operator_loc: ∅
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── opening_loc: (106,3)-(106,4) = "{"
-        │   │       │   └── closing_loc: (106,10)-(106,11) = "}"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (106,0)-(106,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (105,0)-(105,4) = "case"
-        │   └── end_keyword_loc: (107,0)-(107,3) = "end"
-        └── @ CaseMatchNode (location: (109,0)-(111,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (109,5)-(109,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (109,5)-(109,6) = ":"
-            │   ├── value_loc: (109,6)-(109,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (110,0)-(110,5))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (110,3)-(110,5))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 0)
-            │       │   ├── rest: ∅
-            │       │   ├── opening_loc: (110,3)-(110,4) = "{"
-            │       │   └── closing_loc: (110,4)-(110,5) = "}"
-            │       ├── statements: ∅
-            │       ├── in_loc: (110,0)-(110,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (109,0)-(109,4) = "case"
-            └── end_keyword_loc: (111,0)-(111,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_31.txt b/test/mri/prism/snapshots/seattlerb/case_in_31.txt
deleted file mode 100644
index fdf5ce2a29e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_31.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: [:c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,11))
-            │       │   ├── constant: ∅
-            │       │   ├── requireds: (length: 1)
-            │       │   │   └── @ SymbolNode (location: (2,4)-(2,6))
-            │       │   │       ├── flags: forced_us_ascii_encoding
-            │       │   │       ├── opening_loc: (2,4)-(2,5) = ":"
-            │       │   │       ├── value_loc: (2,5)-(2,6) = "b"
-            │       │   │       ├── closing_loc: ∅
-            │       │   │       └── unescaped: "b"
-            │       │   ├── rest:
-            │       │   │   @ SplatNode (location: (2,8)-(2,10))
-            │       │   │   ├── operator_loc: (2,8)-(2,9) = "*"
-            │       │   │   └── expression:
-            │       │   │       @ LocalVariableTargetNode (location: (2,9)-(2,10))
-            │       │   │       ├── name: :c
-            │       │   │       └── depth: 0
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: (2,3)-(2,4) = "["
-            │       │   └── closing_loc: (2,10)-(2,11) = "]"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "d"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "d"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_37.txt b/test/mri/prism/snapshots/seattlerb/case_in_37.txt
deleted file mode 100644
index 1a1d887b4fd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_37.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,19))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 1)
-            │       │   │   └── @ AssocNode (location: (2,5)-(2,17))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,5)-(2,7))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,5)-(2,6) = "b"
-            │       │   │       │   ├── closing_loc: (2,6)-(2,7) = ":"
-            │       │   │       │   └── unescaped: "b"
-            │       │   │       ├── value:
-            │       │   │       │   @ ArrayPatternNode (location: (2,8)-(2,17))
-            │       │   │       │   ├── constant: ∅
-            │       │   │       │   ├── requireds: (length: 1)
-            │       │   │       │   │   └── @ ConstantReadNode (location: (2,9)-(2,13))
-            │       │   │       │   │       └── name: :Hash
-            │       │   │       │   ├── rest:
-            │       │   │       │   │   @ SplatNode (location: (2,15)-(2,16))
-            │       │   │       │   │   ├── operator_loc: (2,15)-(2,16) = "*"
-            │       │   │       │   │   └── expression: ∅
-            │       │   │       │   ├── posts: (length: 0)
-            │       │   │       │   ├── opening_loc: (2,8)-(2,9) = "["
-            │       │   │       │   └── closing_loc: (2,16)-(2,17) = "]"
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest: ∅
-            │       │   ├── opening_loc: (2,3)-(2,4) = "{"
-            │       │   └── closing_loc: (2,18)-(2,19) = "}"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "c"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "c"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_42.txt b/test/mri/prism/snapshots/seattlerb/case_in_42.txt
deleted file mode 100644
index f985d6bc8db..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_42.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: [:_]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(2,18))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,9))
-            │       │   ├── constant: ∅
-            │       │   ├── requireds: (length: 1)
-            │       │   │   └── @ SymbolNode (location: (2,3)-(2,5))
-            │       │   │       ├── flags: forced_us_ascii_encoding
-            │       │   │       ├── opening_loc: (2,3)-(2,4) = ":"
-            │       │   │       ├── value_loc: (2,4)-(2,5) = "b"
-            │       │   │       ├── closing_loc: ∅
-            │       │   │       └── unescaped: "b"
-            │       │   ├── rest:
-            │       │   │   @ SplatNode (location: (2,7)-(2,9))
-            │       │   │   ├── operator_loc: (2,7)-(2,8) = "*"
-            │       │   │   └── expression:
-            │       │   │       @ LocalVariableTargetNode (location: (2,8)-(2,9))
-            │       │   │       ├── name: :_
-            │       │   │       └── depth: 0
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: ∅
-            │       │   └── closing_loc: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (2,15)-(2,18))
-            │       │   └── body: (length: 1)
-            │       │       └── @ NilNode (location: (2,15)-(2,18))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,10)-(2,14) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_42_2.txt b/test/mri/prism/snapshots/seattlerb/case_in_42_2.txt
deleted file mode 100644
index c399ba1bfa4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_42_2.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: [:list]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(2,20))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,11))
-            │       │   ├── constant:
-            │       │   │   @ ConstantReadNode (location: (2,3)-(2,4))
-            │       │   │   └── name: :A
-            │       │   ├── requireds: (length: 0)
-            │       │   ├── rest:
-            │       │   │   @ SplatNode (location: (2,5)-(2,10))
-            │       │   │   ├── operator_loc: (2,5)-(2,6) = "*"
-            │       │   │   └── expression:
-            │       │   │       @ LocalVariableTargetNode (location: (2,6)-(2,10))
-            │       │   │       ├── name: :list
-            │       │   │       └── depth: 0
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: (2,4)-(2,5) = "("
-            │       │   └── closing_loc: (2,10)-(2,11) = ")"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (2,17)-(2,20))
-            │       │   └── body: (length: 1)
-            │       │       └── @ NilNode (location: (2,17)-(2,20))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,12)-(2,16) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_47.txt b/test/mri/prism/snapshots/seattlerb/case_in_47.txt
deleted file mode 100644
index 99baebce05a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_47.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,14))
-            │       │   ├── constant: ∅
-            │       │   ├── requireds: (length: 0)
-            │       │   ├── rest:
-            │       │   │   @ SplatNode (location: (2,4)-(2,5))
-            │       │   │   ├── operator_loc: (2,4)-(2,5) = "*"
-            │       │   │   └── expression: ∅
-            │       │   ├── posts: (length: 2)
-            │       │   │   ├── @ SymbolNode (location: (2,7)-(2,9))
-            │       │   │   │   ├── flags: forced_us_ascii_encoding
-            │       │   │   │   ├── opening_loc: (2,7)-(2,8) = ":"
-            │       │   │   │   ├── value_loc: (2,8)-(2,9) = "b"
-            │       │   │   │   ├── closing_loc: ∅
-            │       │   │   │   └── unescaped: "b"
-            │       │   │   └── @ SymbolNode (location: (2,11)-(2,13))
-            │       │   │       ├── flags: forced_us_ascii_encoding
-            │       │   │       ├── opening_loc: (2,11)-(2,12) = ":"
-            │       │   │       ├── value_loc: (2,12)-(2,13) = "c"
-            │       │   │       ├── closing_loc: ∅
-            │       │   │       └── unescaped: "c"
-            │       │   ├── opening_loc: (2,3)-(2,4) = "["
-            │       │   └── closing_loc: (2,13)-(2,14) = "]"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "d"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "d"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_67.txt b/test/mri/prism/snapshots/seattlerb/case_in_67.txt
deleted file mode 100644
index 4bab417d578..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_67.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(2,15))
-            │       ├── pattern:
-            │       │   @ RangeNode (location: (2,3)-(2,6))
-            │       │   ├── flags: ∅
-            │       │   ├── left:
-            │       │   │   @ IntegerNode (location: (2,3)-(2,4))
-            │       │   │   ├── flags: decimal
-            │       │   │   └── value: 1
-            │       │   ├── right: ∅
-            │       │   └── operator_loc: (2,4)-(2,6) = ".."
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (2,12)-(2,15))
-            │       │   └── body: (length: 1)
-            │       │       └── @ NilNode (location: (2,12)-(2,15))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,7)-(2,11) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_86.txt b/test/mri/prism/snapshots/seattlerb/case_in_86.txt
deleted file mode 100644
index 58891378448..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_86.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ ArrayNode (location: (1,5)-(1,13))
-            │   ├── flags: ∅
-            │   ├── elements: (length: 2)
-            │   │   ├── @ SymbolNode (location: (1,6)-(1,8))
-            │   │   │   ├── flags: forced_us_ascii_encoding
-            │   │   │   ├── opening_loc: (1,6)-(1,7) = ":"
-            │   │   │   ├── value_loc: (1,7)-(1,8) = "a"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "a"
-            │   │   └── @ SymbolNode (location: (1,10)-(1,12))
-            │   │       ├── flags: forced_us_ascii_encoding
-            │   │       ├── opening_loc: (1,10)-(1,11) = ":"
-            │   │       ├── value_loc: (1,11)-(1,12) = "b"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: "b"
-            │   ├── opening_loc: (1,5)-(1,6) = "["
-            │   └── closing_loc: (1,12)-(1,13) = "]"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(2,25))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,16))
-            │       │   ├── constant: ∅
-            │       │   ├── requireds: (length: 1)
-            │       │   │   └── @ ConstantPathNode (location: (2,3)-(2,13))
-            │       │   │       ├── parent: ∅
-            │       │   │       ├── child:
-            │       │   │       │   @ ConstantReadNode (location: (2,5)-(2,13))
-            │       │   │       │   └── name: :NilClass
-            │       │   │       └── delimiter_loc: (2,3)-(2,5) = "::"
-            │       │   ├── rest:
-            │       │   │   @ SplatNode (location: (2,15)-(2,16))
-            │       │   │   ├── operator_loc: (2,15)-(2,16) = "*"
-            │       │   │   └── expression: ∅
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: ∅
-            │       │   └── closing_loc: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (2,22)-(2,25))
-            │       │   └── body: (length: 1)
-            │       │       └── @ NilNode (location: (2,22)-(2,25))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,17)-(2,21) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_86_2.txt b/test/mri/prism/snapshots/seattlerb/case_in_86_2.txt
deleted file mode 100644
index 18ce70ae93f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_86_2.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ ArrayNode (location: (1,5)-(1,13))
-            │   ├── flags: ∅
-            │   ├── elements: (length: 2)
-            │   │   ├── @ SymbolNode (location: (1,6)-(1,8))
-            │   │   │   ├── flags: forced_us_ascii_encoding
-            │   │   │   ├── opening_loc: (1,6)-(1,7) = ":"
-            │   │   │   ├── value_loc: (1,7)-(1,8) = "a"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "a"
-            │   │   └── @ SymbolNode (location: (1,10)-(1,12))
-            │   │       ├── flags: forced_us_ascii_encoding
-            │   │       ├── opening_loc: (1,10)-(1,11) = ":"
-            │   │       ├── value_loc: (1,11)-(1,12) = "b"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: "b"
-            │   ├── opening_loc: (1,5)-(1,6) = "["
-            │   └── closing_loc: (1,12)-(1,13) = "]"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(2,25))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,16))
-            │       │   ├── constant: ∅
-            │       │   ├── requireds: (length: 0)
-            │       │   ├── rest:
-            │       │   │   @ SplatNode (location: (2,3)-(2,4))
-            │       │   │   ├── operator_loc: (2,3)-(2,4) = "*"
-            │       │   │   └── expression: ∅
-            │       │   ├── posts: (length: 1)
-            │       │   │   └── @ ConstantPathNode (location: (2,6)-(2,16))
-            │       │   │       ├── parent: ∅
-            │       │   │       ├── child:
-            │       │   │       │   @ ConstantReadNode (location: (2,8)-(2,16))
-            │       │   │       │   └── name: :NilClass
-            │       │   │       └── delimiter_loc: (2,6)-(2,8) = "::"
-            │       │   ├── opening_loc: ∅
-            │       │   └── closing_loc: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (2,22)-(2,25))
-            │       │   └── body: (length: 1)
-            │       │       └── @ NilNode (location: (2,22)-(2,25))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,17)-(2,21) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_array_pat_const.txt b/test/mri/prism/snapshots/seattlerb/case_in_array_pat_const.txt
deleted file mode 100644
index f361e8d4589..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_array_pat_const.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: [:c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,7))
-            │       │   ├── constant:
-            │       │   │   @ ConstantReadNode (location: (2,3)-(2,4))
-            │       │   │   └── name: :B
-            │       │   ├── requireds: (length: 1)
-            │       │   │   └── @ LocalVariableTargetNode (location: (2,5)-(2,6))
-            │       │   │       ├── name: :c
-            │       │   │       └── depth: 0
-            │       │   ├── rest: ∅
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: (2,4)-(2,5) = "["
-            │       │   └── closing_loc: (2,6)-(2,7) = "]"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "d"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "d"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_array_pat_const2.txt b/test/mri/prism/snapshots/seattlerb/case_in_array_pat_const2.txt
deleted file mode 100644
index c783af9ce56..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_array_pat_const2.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: [:d]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,10))
-            │       │   ├── constant:
-            │       │   │   @ ConstantPathNode (location: (2,3)-(2,7))
-            │       │   │   ├── parent:
-            │       │   │   │   @ ConstantReadNode (location: (2,3)-(2,4))
-            │       │   │   │   └── name: :B
-            │       │   │   ├── child:
-            │       │   │   │   @ ConstantReadNode (location: (2,6)-(2,7))
-            │       │   │   │   └── name: :C
-            │       │   │   └── delimiter_loc: (2,4)-(2,6) = "::"
-            │       │   ├── requireds: (length: 1)
-            │       │   │   └── @ LocalVariableTargetNode (location: (2,8)-(2,9))
-            │       │   │       ├── name: :d
-            │       │   │       └── depth: 0
-            │       │   ├── rest: ∅
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: (2,7)-(2,8) = "["
-            │       │   └── closing_loc: (2,9)-(2,10) = "]"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "e"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "e"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_array_pat_paren_assign.txt b/test/mri/prism/snapshots/seattlerb/case_in_array_pat_paren_assign.txt
deleted file mode 100644
index 8d185b250a7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_array_pat_paren_assign.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: [:d]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,12))
-            │       │   ├── constant:
-            │       │   │   @ ConstantReadNode (location: (2,3)-(2,4))
-            │       │   │   └── name: :B
-            │       │   ├── requireds: (length: 1)
-            │       │   │   └── @ CapturePatternNode (location: (2,5)-(2,11))
-            │       │   │       ├── value:
-            │       │   │       │   @ ConstantReadNode (location: (2,5)-(2,6))
-            │       │   │       │   └── name: :C
-            │       │   │       ├── target:
-            │       │   │       │   @ LocalVariableTargetNode (location: (2,10)-(2,11))
-            │       │   │       │   ├── name: :d
-            │       │   │       │   └── depth: 0
-            │       │   │       └── operator_loc: (2,7)-(2,9) = "=>"
-            │       │   ├── rest: ∅
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: (2,4)-(2,5) = "("
-            │       │   └── closing_loc: (2,11)-(2,12) = ")"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "d"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "d"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_const.txt b/test/mri/prism/snapshots/seattlerb/case_in_const.txt
deleted file mode 100644
index c4b838aa1d5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_const.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ ConstantReadNode (location: (1,5)-(1,10))
-            │   └── name: :Array
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ ConstantReadNode (location: (2,3)-(2,8))
-            │       │   └── name: :Class
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "b"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "b"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_else.txt b/test/mri/prism/snapshots/seattlerb/case_in_else.txt
deleted file mode 100644
index 5eae7fc1ea2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_else.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(6,3))
-            ├── predicate:
-            │   @ ConstantReadNode (location: (1,5)-(1,10))
-            │   └── name: :Array
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ ConstantReadNode (location: (2,3)-(2,8))
-            │       │   └── name: :Class
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "b"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "b"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent:
-            │   @ ElseNode (location: (4,0)-(6,3))
-            │   ├── else_keyword_loc: (4,0)-(4,4) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (5,2)-(5,4))
-            │   │   └── body: (length: 1)
-            │   │       └── @ SymbolNode (location: (5,2)-(5,4))
-            │   │           ├── flags: forced_us_ascii_encoding
-            │   │           ├── opening_loc: (5,2)-(5,3) = ":"
-            │   │           ├── value_loc: (5,3)-(5,4) = "c"
-            │   │           ├── closing_loc: ∅
-            │   │           └── unescaped: "c"
-            │   └── end_keyword_loc: (6,0)-(6,3) = "end"
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (6,0)-(6,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_find.txt b/test/mri/prism/snapshots/seattlerb/case_in_find.txt
deleted file mode 100644
index f84c4c30d0d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_find.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,2)-(2,15))
-            │       ├── pattern:
-            │       │   @ FindPatternNode (location: (2,5)-(2,15))
-            │       │   ├── constant: ∅
-            │       │   ├── left:
-            │       │   │   @ SplatNode (location: (2,5)-(2,7))
-            │       │   │   ├── operator_loc: (2,5)-(2,6) = "*"
-            │       │   │   └── expression:
-            │       │   │       @ LocalVariableTargetNode (location: (2,6)-(2,7))
-            │       │   │       ├── name: :a
-            │       │   │       └── depth: 0
-            │       │   ├── requireds: (length: 1)
-            │       │   │   └── @ SymbolNode (location: (2,9)-(2,11))
-            │       │   │       ├── flags: forced_us_ascii_encoding
-            │       │   │       ├── opening_loc: (2,9)-(2,10) = ":"
-            │       │   │       ├── value_loc: (2,10)-(2,11) = "+"
-            │       │   │       ├── closing_loc: ∅
-            │       │   │       └── unescaped: "+"
-            │       │   ├── right:
-            │       │   │   @ SplatNode (location: (2,13)-(2,15))
-            │       │   │   ├── operator_loc: (2,13)-(2,14) = "*"
-            │       │   │   └── expression:
-            │       │   │       @ LocalVariableTargetNode (location: (2,14)-(2,15))
-            │       │   │       ├── name: :b
-            │       │   │       └── depth: 0
-            │       │   ├── opening_loc: ∅
-            │       │   └── closing_loc: ∅
-            │       ├── statements: ∅
-            │       ├── in_loc: (2,2)-(2,4) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_find_array.txt b/test/mri/prism/snapshots/seattlerb/case_in_find_array.txt
deleted file mode 100644
index a757f803460..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_find_array.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: [:c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(2,16))
-            │       ├── pattern:
-            │       │   @ FindPatternNode (location: (2,3)-(2,16))
-            │       │   ├── constant: ∅
-            │       │   ├── left:
-            │       │   │   @ SplatNode (location: (2,4)-(2,5))
-            │       │   │   ├── operator_loc: (2,4)-(2,5) = "*"
-            │       │   │   └── expression: ∅
-            │       │   ├── requireds: (length: 2)
-            │       │   │   ├── @ SymbolNode (location: (2,7)-(2,9))
-            │       │   │   │   ├── flags: forced_us_ascii_encoding
-            │       │   │   │   ├── opening_loc: (2,7)-(2,8) = ":"
-            │       │   │   │   ├── value_loc: (2,8)-(2,9) = "b"
-            │       │   │   │   ├── closing_loc: ∅
-            │       │   │   │   └── unescaped: "b"
-            │       │   │   └── @ LocalVariableTargetNode (location: (2,11)-(2,12))
-            │       │   │       ├── name: :c
-            │       │   │       └── depth: 0
-            │       │   ├── right:
-            │       │   │   @ SplatNode (location: (2,14)-(2,15))
-            │       │   │   ├── operator_loc: (2,14)-(2,15) = "*"
-            │       │   │   └── expression: ∅
-            │       │   ├── opening_loc: (2,3)-(2,4) = "["
-            │       │   └── closing_loc: (2,15)-(2,16) = "]"
-            │       ├── statements: ∅
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat.txt b/test/mri/prism/snapshots/seattlerb/case_in_hash_pat.txt
deleted file mode 100644
index e813efa9ee5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,21))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 2)
-            │       │   │   ├── @ AssocNode (location: (2,5)-(2,11))
-            │       │   │   │   ├── key:
-            │       │   │   │   │   @ SymbolNode (location: (2,5)-(2,7))
-            │       │   │   │   │   ├── flags: forced_us_ascii_encoding
-            │       │   │   │   │   ├── opening_loc: ∅
-            │       │   │   │   │   ├── value_loc: (2,5)-(2,6) = "b"
-            │       │   │   │   │   ├── closing_loc: (2,6)-(2,7) = ":"
-            │       │   │   │   │   └── unescaped: "b"
-            │       │   │   │   ├── value:
-            │       │   │   │   │   @ StringNode (location: (2,8)-(2,11))
-            │       │   │   │   │   ├── flags: ∅
-            │       │   │   │   │   ├── opening_loc: (2,8)-(2,9) = "'"
-            │       │   │   │   │   ├── content_loc: (2,9)-(2,10) = "c"
-            │       │   │   │   │   ├── closing_loc: (2,10)-(2,11) = "'"
-            │       │   │   │   │   └── unescaped: "c"
-            │       │   │   │   └── operator_loc: ∅
-            │       │   │   └── @ AssocNode (location: (2,13)-(2,19))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,13)-(2,15))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,13)-(2,14) = "d"
-            │       │   │       │   ├── closing_loc: (2,14)-(2,15) = ":"
-            │       │   │       │   └── unescaped: "d"
-            │       │   │       ├── value:
-            │       │   │       │   @ StringNode (location: (2,16)-(2,19))
-            │       │   │       │   ├── flags: ∅
-            │       │   │       │   ├── opening_loc: (2,16)-(2,17) = "\""
-            │       │   │       │   ├── content_loc: (2,17)-(2,18) = "e"
-            │       │   │       │   ├── closing_loc: (2,18)-(2,19) = "\""
-            │       │   │       │   └── unescaped: "e"
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest: ∅
-            │       │   ├── opening_loc: (2,3)-(2,4) = "{"
-            │       │   └── closing_loc: (2,20)-(2,21) = "}"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "f"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "f"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,22)-(2,26) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_assign.txt b/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_assign.txt
deleted file mode 100644
index 790d9d63ffb..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_assign.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: [:x, :f]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,34))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 3)
-            │       │   │   ├── @ AssocNode (location: (2,5)-(2,20))
-            │       │   │   │   ├── key:
-            │       │   │   │   │   @ SymbolNode (location: (2,5)-(2,7))
-            │       │   │   │   │   ├── flags: forced_us_ascii_encoding
-            │       │   │   │   │   ├── opening_loc: ∅
-            │       │   │   │   │   ├── value_loc: (2,5)-(2,6) = "b"
-            │       │   │   │   │   ├── closing_loc: (2,6)-(2,7) = ":"
-            │       │   │   │   │   └── unescaped: "b"
-            │       │   │   │   ├── value:
-            │       │   │   │   │   @ CapturePatternNode (location: (2,8)-(2,20))
-            │       │   │   │   │   ├── value:
-            │       │   │   │   │   │   @ ConstantReadNode (location: (2,8)-(2,15))
-            │       │   │   │   │   │   └── name: :Integer
-            │       │   │   │   │   ├── target:
-            │       │   │   │   │   │   @ LocalVariableTargetNode (location: (2,19)-(2,20))
-            │       │   │   │   │   │   ├── name: :x
-            │       │   │   │   │   │   └── depth: 0
-            │       │   │   │   │   └── operator_loc: (2,16)-(2,18) = "=>"
-            │       │   │   │   └── operator_loc: ∅
-            │       │   │   ├── @ AssocNode (location: (2,22)-(2,28))
-            │       │   │   │   ├── key:
-            │       │   │   │   │   @ SymbolNode (location: (2,22)-(2,24))
-            │       │   │   │   │   ├── flags: forced_us_ascii_encoding
-            │       │   │   │   │   ├── opening_loc: ∅
-            │       │   │   │   │   ├── value_loc: (2,22)-(2,23) = "d"
-            │       │   │   │   │   ├── closing_loc: (2,23)-(2,24) = ":"
-            │       │   │   │   │   └── unescaped: "d"
-            │       │   │   │   ├── value:
-            │       │   │   │   │   @ StringNode (location: (2,25)-(2,28))
-            │       │   │   │   │   ├── flags: ∅
-            │       │   │   │   │   ├── opening_loc: (2,25)-(2,26) = "\""
-            │       │   │   │   │   ├── content_loc: (2,26)-(2,27) = "e"
-            │       │   │   │   │   ├── closing_loc: (2,27)-(2,28) = "\""
-            │       │   │   │   │   └── unescaped: "e"
-            │       │   │   │   └── operator_loc: ∅
-            │       │   │   └── @ AssocNode (location: (2,30)-(2,32))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,30)-(2,32))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,30)-(2,31) = "f"
-            │       │   │       │   ├── closing_loc: (2,31)-(2,32) = ":"
-            │       │   │       │   └── unescaped: "f"
-            │       │   │       ├── value:
-            │       │   │       │   @ ImplicitNode (location: (2,30)-(2,31))
-            │       │   │       │   └── value:
-            │       │   │       │       @ LocalVariableTargetNode (location: (2,30)-(2,31))
-            │       │   │       │       ├── name: :f
-            │       │   │       │       └── depth: 0
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest: ∅
-            │       │   ├── opening_loc: (2,3)-(2,4) = "{"
-            │       │   └── closing_loc: (2,33)-(2,34) = "}"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "g"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "g"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,35)-(2,39) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_paren_assign.txt b/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_paren_assign.txt
deleted file mode 100644
index 4c8cfd0e544..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_paren_assign.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,11))
-            │       │   ├── constant:
-            │       │   │   @ ConstantReadNode (location: (2,3)-(2,4))
-            │       │   │   └── name: :B
-            │       │   ├── elements: (length: 1)
-            │       │   │   └── @ AssocNode (location: (2,5)-(2,10))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,5)-(2,7))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,5)-(2,6) = "a"
-            │       │   │       │   ├── closing_loc: (2,6)-(2,7) = ":"
-            │       │   │       │   └── unescaped: "a"
-            │       │   │       ├── value:
-            │       │   │       │   @ IntegerNode (location: (2,8)-(2,10))
-            │       │   │       │   ├── flags: decimal
-            │       │   │       │   └── value: 42
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest: ∅
-            │       │   ├── opening_loc: (2,4)-(2,5) = "("
-            │       │   └── closing_loc: (2,10)-(2,11) = ")"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "d"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "d"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_paren_true.txt b/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_paren_true.txt
deleted file mode 100644
index 8ff95a161f3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_paren_true.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,10))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 1)
-            │       │   │   └── @ AssocNode (location: (2,3)-(2,10))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,3)-(2,5))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,3)-(2,4) = "b"
-            │       │   │       │   ├── closing_loc: (2,4)-(2,5) = ":"
-            │       │   │       │   └── unescaped: "b"
-            │       │   │       ├── value:
-            │       │   │       │   @ TrueNode (location: (2,6)-(2,10))
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest: ∅
-            │       │   ├── opening_loc: ∅
-            │       │   └── closing_loc: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "c"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "c"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,11)-(2,15) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_rest.txt b/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_rest.txt
deleted file mode 100644
index b93b889ec5f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_rest.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: [:c, :rest]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(2,23))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,15))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 1)
-            │       │   │   └── @ AssocNode (location: (2,3)-(2,7))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,3)-(2,5))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,3)-(2,4) = "b"
-            │       │   │       │   ├── closing_loc: (2,4)-(2,5) = ":"
-            │       │   │       │   └── unescaped: "b"
-            │       │   │       ├── value:
-            │       │   │       │   @ LocalVariableTargetNode (location: (2,6)-(2,7))
-            │       │   │       │   ├── name: :c
-            │       │   │       │   └── depth: 0
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest:
-            │       │   │   @ AssocSplatNode (location: (2,9)-(2,15))
-            │       │   │   ├── value:
-            │       │   │   │   @ LocalVariableTargetNode (location: (2,11)-(2,15))
-            │       │   │   │   ├── name: :rest
-            │       │   │   │   └── depth: 0
-            │       │   │   └── operator_loc: (2,9)-(2,11) = "**"
-            │       │   ├── opening_loc: ∅
-            │       │   └── closing_loc: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (2,21)-(2,23))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (2,21)-(2,23))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (2,21)-(2,22) = ":"
-            │       │           ├── value_loc: (2,22)-(2,23) = "d"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "d"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,16)-(2,20) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_rest_solo.txt b/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_rest_solo.txt
deleted file mode 100644
index 956e93faa02..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_hash_pat_rest_solo.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: [:rest]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(3,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(2,17))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,9))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 0)
-            │       │   ├── rest:
-            │       │   │   @ AssocSplatNode (location: (2,3)-(2,9))
-            │       │   │   ├── value:
-            │       │   │   │   @ LocalVariableTargetNode (location: (2,5)-(2,9))
-            │       │   │   │   ├── name: :rest
-            │       │   │   │   └── depth: 0
-            │       │   │   └── operator_loc: (2,3)-(2,5) = "**"
-            │       │   ├── opening_loc: ∅
-            │       │   └── closing_loc: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (2,15)-(2,17))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (2,15)-(2,17))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (2,15)-(2,16) = ":"
-            │       │           ├── value_loc: (2,16)-(2,17) = "d"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "d"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: (2,10)-(2,14) = "then"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_if_unless_post_mod.txt b/test/mri/prism/snapshots/seattlerb/case_in_if_unless_post_mod.txt
deleted file mode 100644
index a21d3e15dd4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_if_unless_post_mod.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(6,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 2)
-            │   ├── @ InNode (location: (2,0)-(3,4))
-            │   │   ├── pattern:
-            │   │   │   @ IfNode (location: (2,3)-(2,12))
-            │   │   │   ├── if_keyword_loc: (2,5)-(2,7) = "if"
-            │   │   │   ├── predicate:
-            │   │   │   │   @ TrueNode (location: (2,8)-(2,12))
-            │   │   │   ├── then_keyword_loc: ∅
-            │   │   │   ├── statements:
-            │   │   │   │   @ StatementsNode (location: (2,3)-(2,4))
-            │   │   │   │   └── body: (length: 1)
-            │   │   │   │       └── @ ConstantReadNode (location: (2,3)-(2,4))
-            │   │   │   │           └── name: :A
-            │   │   │   ├── consequent: ∅
-            │   │   │   └── end_keyword_loc: ∅
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (3,2)-(3,4))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │   │   │           ├── flags: forced_us_ascii_encoding
-            │   │   │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │   │   │           ├── value_loc: (3,3)-(3,4) = "C"
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── unescaped: "C"
-            │   │   ├── in_loc: (2,0)-(2,2) = "in"
-            │   │   └── then_loc: ∅
-            │   └── @ InNode (location: (4,0)-(5,4))
-            │       ├── pattern:
-            │       │   @ UnlessNode (location: (4,3)-(4,17))
-            │       │   ├── keyword_loc: (4,5)-(4,11) = "unless"
-            │       │   ├── predicate:
-            │       │   │   @ FalseNode (location: (4,12)-(4,17))
-            │       │   ├── then_keyword_loc: ∅
-            │       │   ├── statements:
-            │       │   │   @ StatementsNode (location: (4,3)-(4,4))
-            │       │   │   └── body: (length: 1)
-            │       │   │       └── @ ConstantReadNode (location: (4,3)-(4,4))
-            │       │   │           └── name: :D
-            │       │   ├── consequent: ∅
-            │       │   └── end_keyword_loc: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (5,2)-(5,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (5,2)-(5,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (5,2)-(5,3) = ":"
-            │       │           ├── value_loc: (5,3)-(5,4) = "E"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "E"
-            │       ├── in_loc: (4,0)-(4,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (6,0)-(6,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_multiple.txt b/test/mri/prism/snapshots/seattlerb/case_in_multiple.txt
deleted file mode 100644
index d8597c4bfab..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_multiple.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(6,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 2)
-            │   ├── @ InNode (location: (2,0)-(3,4))
-            │   │   ├── pattern:
-            │   │   │   @ ConstantPathNode (location: (2,3)-(2,7))
-            │   │   │   ├── parent:
-            │   │   │   │   @ ConstantReadNode (location: (2,3)-(2,4))
-            │   │   │   │   └── name: :A
-            │   │   │   ├── child:
-            │   │   │   │   @ ConstantReadNode (location: (2,6)-(2,7))
-            │   │   │   │   └── name: :B
-            │   │   │   └── delimiter_loc: (2,4)-(2,6) = "::"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (3,2)-(3,4))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │   │   │           ├── flags: forced_us_ascii_encoding
-            │   │   │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │   │   │           ├── value_loc: (3,3)-(3,4) = "C"
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── unescaped: "C"
-            │   │   ├── in_loc: (2,0)-(2,2) = "in"
-            │   │   └── then_loc: ∅
-            │   └── @ InNode (location: (4,0)-(5,4))
-            │       ├── pattern:
-            │       │   @ ConstantPathNode (location: (4,3)-(4,7))
-            │       │   ├── parent:
-            │       │   │   @ ConstantReadNode (location: (4,3)-(4,4))
-            │       │   │   └── name: :D
-            │       │   ├── child:
-            │       │   │   @ ConstantReadNode (location: (4,6)-(4,7))
-            │       │   │   └── name: :E
-            │       │   └── delimiter_loc: (4,4)-(4,6) = "::"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (5,2)-(5,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (5,2)-(5,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (5,2)-(5,3) = ":"
-            │       │           ├── value_loc: (5,3)-(5,4) = "F"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "F"
-            │       ├── in_loc: (4,0)-(4,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (6,0)-(6,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/case_in_or.txt b/test/mri/prism/snapshots/seattlerb/case_in_or.txt
deleted file mode 100644
index 7ac66176082..00000000000
--- a/test/mri/prism/snapshots/seattlerb/case_in_or.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,4))
-            │       ├── pattern:
-            │       │   @ AlternationPatternNode (location: (2,3)-(2,8))
-            │       │   ├── left:
-            │       │   │   @ ConstantReadNode (location: (2,3)-(2,4))
-            │       │   │   └── name: :B
-            │       │   ├── right:
-            │       │   │   @ ConstantReadNode (location: (2,7)-(2,8))
-            │       │   │   └── name: :C
-            │       │   └── operator_loc: (2,5)-(2,6) = "|"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,4))
-            │       │   └── body: (length: 1)
-            │       │       └── @ SymbolNode (location: (3,2)-(3,4))
-            │       │           ├── flags: forced_us_ascii_encoding
-            │       │           ├── opening_loc: (3,2)-(3,3) = ":"
-            │       │           ├── value_loc: (3,3)-(3,4) = "d"
-            │       │           ├── closing_loc: ∅
-            │       │           └── unescaped: "d"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/class_comments.txt b/test/mri/prism/snapshots/seattlerb/class_comments.txt
deleted file mode 100644
index 5ac05b6be68..00000000000
--- a/test/mri/prism/snapshots/seattlerb/class_comments.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (4,0)-(9,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (4,0)-(9,3))
-    └── body: (length: 1)
-        └── @ ClassNode (location: (4,0)-(9,3))
-            ├── locals: []
-            ├── class_keyword_loc: (4,0)-(4,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (4,6)-(4,7))
-            │   └── name: :X
-            ├── inheritance_operator_loc: ∅
-            ├── superclass: ∅
-            ├── body:
-            │   @ StatementsNode (location: (6,2)-(8,5))
-            │   └── body: (length: 1)
-            │       └── @ DefNode (location: (6,2)-(8,5))
-            │           ├── name: :blah
-            │           ├── name_loc: (6,6)-(6,10) = "blah"
-            │           ├── receiver: ∅
-            │           ├── parameters: ∅
-            │           ├── body: ∅
-            │           ├── locals: []
-            │           ├── def_keyword_loc: (6,2)-(6,5) = "def"
-            │           ├── operator_loc: ∅
-            │           ├── lparen_loc: ∅
-            │           ├── rparen_loc: ∅
-            │           ├── equal_loc: ∅
-            │           └── end_keyword_loc: (8,2)-(8,5) = "end"
-            ├── end_keyword_loc: (9,0)-(9,3) = "end"
-            └── name: :X
diff --git a/test/mri/prism/snapshots/seattlerb/cond_unary_minus.txt b/test/mri/prism/snapshots/seattlerb/cond_unary_minus.txt
deleted file mode 100644
index b6e12dfb15c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/cond_unary_minus.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,10))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ IntegerNode (location: (1,3)-(1,5))
-            │   ├── flags: decimal
-            │   └── value: -1
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (1,7)-(1,10) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/const_2_op_asgn_or2.txt b/test/mri/prism/snapshots/seattlerb/const_2_op_asgn_or2.txt
deleted file mode 100644
index b018ac48d4f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/const_2_op_asgn_or2.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ ConstantPathOrWriteNode (location: (1,0)-(1,12))
-            ├── target:
-            │   @ ConstantPathNode (location: (1,0)-(1,6))
-            │   ├── parent:
-            │   │   @ ConstantPathNode (location: (1,0)-(1,3))
-            │   │   ├── parent: ∅
-            │   │   ├── child:
-            │   │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   │   └── name: :X
-            │   │   └── delimiter_loc: (1,0)-(1,2) = "::"
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,5)-(1,6))
-            │   │   └── name: :Y
-            │   └── delimiter_loc: (1,3)-(1,5) = "::"
-            ├── operator_loc: (1,7)-(1,10) = "||="
-            └── value:
-                @ IntegerNode (location: (1,11)-(1,12))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/const_3_op_asgn_or.txt b/test/mri/prism/snapshots/seattlerb/const_3_op_asgn_or.txt
deleted file mode 100644
index 8d9d94931b9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/const_3_op_asgn_or.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ ConstantPathOrWriteNode (location: (1,0)-(1,9))
-            ├── target:
-            │   @ ConstantPathNode (location: (1,0)-(1,3))
-            │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   └── name: :X
-            │   └── delimiter_loc: (1,0)-(1,2) = "::"
-            ├── operator_loc: (1,4)-(1,7) = "||="
-            └── value:
-                @ IntegerNode (location: (1,8)-(1,9))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/const_op_asgn_and1.txt b/test/mri/prism/snapshots/seattlerb/const_op_asgn_and1.txt
deleted file mode 100644
index b1d61b3752c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/const_op_asgn_and1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ ConstantPathOperatorWriteNode (location: (1,0)-(1,8))
-            ├── target:
-            │   @ ConstantPathNode (location: (1,0)-(1,3))
-            │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   └── name: :X
-            │   └── delimiter_loc: (1,0)-(1,2) = "::"
-            ├── operator_loc: (1,4)-(1,6) = "&="
-            ├── value:
-            │   @ IntegerNode (location: (1,7)-(1,8))
-            │   ├── flags: decimal
-            │   └── value: 1
-            └── operator: :&
diff --git a/test/mri/prism/snapshots/seattlerb/const_op_asgn_and2.txt b/test/mri/prism/snapshots/seattlerb/const_op_asgn_and2.txt
deleted file mode 100644
index 22f66825349..00000000000
--- a/test/mri/prism/snapshots/seattlerb/const_op_asgn_and2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ ConstantPathAndWriteNode (location: (1,0)-(1,9))
-            ├── target:
-            │   @ ConstantPathNode (location: (1,0)-(1,3))
-            │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   └── name: :X
-            │   └── delimiter_loc: (1,0)-(1,2) = "::"
-            ├── operator_loc: (1,4)-(1,7) = "&&="
-            └── value:
-                @ IntegerNode (location: (1,8)-(1,9))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/const_op_asgn_or.txt b/test/mri/prism/snapshots/seattlerb/const_op_asgn_or.txt
deleted file mode 100644
index 067e0fbb93d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/const_op_asgn_or.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ ConstantPathOrWriteNode (location: (1,0)-(1,10))
-            ├── target:
-            │   @ ConstantPathNode (location: (1,0)-(1,4))
-            │   ├── parent:
-            │   │   @ ConstantReadNode (location: (1,0)-(1,1))
-            │   │   └── name: :X
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,3)-(1,4))
-            │   │   └── name: :Y
-            │   └── delimiter_loc: (1,1)-(1,3) = "::"
-            ├── operator_loc: (1,5)-(1,8) = "||="
-            └── value:
-                @ IntegerNode (location: (1,9)-(1,10))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/dasgn_icky2.txt b/test/mri/prism/snapshots/seattlerb/dasgn_icky2.txt
deleted file mode 100644
index e118362f876..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dasgn_icky2.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-@ ProgramNode (location: (1,0)-(8,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(8,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(8,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(8,3))
-                ├── locals: [:v]
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (2,2)-(7,5))
-                │   └── body: (length: 2)
-                │       ├── @ LocalVariableWriteNode (location: (2,2)-(2,9))
-                │       │   ├── name: :v
-                │       │   ├── depth: 0
-                │       │   ├── name_loc: (2,2)-(2,3) = "v"
-                │       │   ├── value:
-                │       │   │   @ NilNode (location: (2,6)-(2,9))
-                │       │   └── operator_loc: (2,4)-(2,5) = "="
-                │       └── @ BeginNode (location: (3,2)-(7,5))
-                │           ├── begin_keyword_loc: (3,2)-(3,7) = "begin"
-                │           ├── statements:
-                │           │   @ StatementsNode (location: (4,4)-(4,9))
-                │           │   └── body: (length: 1)
-                │           │       └── @ YieldNode (location: (4,4)-(4,9))
-                │           │           ├── keyword_loc: (4,4)-(4,9) = "yield"
-                │           │           ├── lparen_loc: ∅
-                │           │           ├── arguments: ∅
-                │           │           └── rparen_loc: ∅
-                │           ├── rescue_clause:
-                │           │   @ RescueNode (location: (5,2)-(6,9))
-                │           │   ├── keyword_loc: (5,2)-(5,8) = "rescue"
-                │           │   ├── exceptions: (length: 1)
-                │           │   │   └── @ ConstantReadNode (location: (5,9)-(5,18))
-                │           │   │       └── name: :Exception
-                │           │   ├── operator_loc: (5,19)-(5,21) = "=>"
-                │           │   ├── reference:
-                │           │   │   @ LocalVariableTargetNode (location: (5,22)-(5,23))
-                │           │   │   ├── name: :v
-                │           │   │   └── depth: 0
-                │           │   ├── statements:
-                │           │   │   @ StatementsNode (location: (6,4)-(6,9))
-                │           │   │   └── body: (length: 1)
-                │           │   │       └── @ BreakNode (location: (6,4)-(6,9))
-                │           │   │           ├── arguments: ∅
-                │           │   │           └── keyword_loc: (6,4)-(6,9) = "break"
-                │           │   └── consequent: ∅
-                │           ├── else_clause: ∅
-                │           ├── ensure_clause: ∅
-                │           └── end_keyword_loc: (7,2)-(7,5) = "end"
-                ├── opening_loc: (1,2)-(1,4) = "do"
-                └── closing_loc: (8,0)-(8,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defined_eh_parens.txt b/test/mri/prism/snapshots/seattlerb/defined_eh_parens.txt
deleted file mode 100644
index 49b577fcd13..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defined_eh_parens.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ DefinedNode (location: (1,0)-(1,12))
-            ├── lparen_loc: (1,8)-(1,9) = "("
-            ├── value:
-            │   @ IntegerNode (location: (1,9)-(1,11))
-            │   ├── flags: decimal
-            │   └── value: 42
-            ├── rparen_loc: (1,11)-(1,12) = ")"
-            └── keyword_loc: (1,0)-(1,8) = "defined?"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_arg_asplat_arg.txt b/test/mri/prism/snapshots/seattlerb/defn_arg_asplat_arg.txt
deleted file mode 100644
index 3f2bdf44a44..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_arg_asplat_arg.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,29))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,29))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,29))
-            ├── name: :call
-            ├── name_loc: (1,4)-(1,8) = "call"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,9)-(1,24))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,9)-(1,15))
-            │   │       ├── flags: ∅
-            │   │       └── name: :interp
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (1,17)-(1,18))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,17)-(1,18) = "*"
-            │   ├── posts: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,20)-(1,24))
-            │   │       ├── flags: ∅
-            │   │       └── name: :args
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:interp, :args]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,8)-(1,9) = "("
-            ├── rparen_loc: (1,24)-(1,25) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,26)-(1,29) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_arg_forward_args.txt b/test/mri/prism/snapshots/seattlerb/defn_arg_forward_args.txt
deleted file mode 100644
index 4121770c5c2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_arg_forward_args.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,29))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,29))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,29))
-            ├── name: :a
-            ├── name_loc: (1,4)-(1,5) = "a"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,12))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-            │   │       ├── flags: ∅
-            │   │       └── name: :x
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (1,9)-(1,12))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,15)-(1,24))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,15)-(1,24))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (1,15)-(1,16) = "b"
-            │           ├── opening_loc: (1,16)-(1,17) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,17)-(1,23))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 2)
-            │           │       ├── @ LocalVariableReadNode (location: (1,17)-(1,18))
-            │           │       │   ├── name: :x
-            │           │       │   └── depth: 0
-            │           │       └── @ ForwardingArgumentsNode (location: (1,20)-(1,23))
-            │           ├── closing_loc: (1,23)-(1,24) = ")"
-            │           └── block: ∅
-            ├── locals: [:x]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,12)-(1,13) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,26)-(1,29) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_args_forward_args.txt b/test/mri/prism/snapshots/seattlerb/defn_args_forward_args.txt
deleted file mode 100644
index 178b6ccde73..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_args_forward_args.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,41))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,41))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,41))
-            ├── name: :a
-            ├── name_loc: (1,4)-(1,5) = "a"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,18))
-            │   ├── requireds: (length: 3)
-            │   │   ├── @ RequiredParameterNode (location: (1,6)-(1,7))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── name: :x
-            │   │   ├── @ RequiredParameterNode (location: (1,9)-(1,10))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── name: :y
-            │   │   └── @ RequiredParameterNode (location: (1,12)-(1,13))
-            │   │       ├── flags: ∅
-            │   │       └── name: :z
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (1,15)-(1,18))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,21)-(1,36))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,21)-(1,36))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (1,21)-(1,22) = "b"
-            │           ├── opening_loc: (1,22)-(1,23) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,23)-(1,35))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 3)
-            │           │       ├── @ SymbolNode (location: (1,23)-(1,27))
-            │           │       │   ├── flags: forced_us_ascii_encoding
-            │           │       │   ├── opening_loc: (1,23)-(1,24) = ":"
-            │           │       │   ├── value_loc: (1,24)-(1,27) = "get"
-            │           │       │   ├── closing_loc: ∅
-            │           │       │   └── unescaped: "get"
-            │           │       ├── @ LocalVariableReadNode (location: (1,29)-(1,30))
-            │           │       │   ├── name: :z
-            │           │       │   └── depth: 0
-            │           │       └── @ ForwardingArgumentsNode (location: (1,32)-(1,35))
-            │           ├── closing_loc: (1,35)-(1,36) = ")"
-            │           └── block: ∅
-            ├── locals: [:x, :y, :z]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,18)-(1,19) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,38)-(1,41) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_comments.txt b/test/mri/prism/snapshots/seattlerb/defn_comments.txt
deleted file mode 100644
index 585aa65c9a6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_comments.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (4,0)-(5,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (4,0)-(5,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (4,0)-(5,3))
-            ├── name: :blah
-            ├── name_loc: (4,4)-(4,8) = "blah"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (4,0)-(4,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (5,0)-(5,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_endless_command.txt b/test/mri/prism/snapshots/seattlerb/defn_endless_command.txt
deleted file mode 100644
index c3ea59282a7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_endless_command.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,33))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,33))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,33))
-            ├── name: :some_method
-            ├── name_loc: (1,4)-(1,15) = "some_method"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,18)-(1,33))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,18)-(1,33))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :other_method
-            │           ├── message_loc: (1,18)-(1,30) = "other_method"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,31)-(1,33))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ IntegerNode (location: (1,31)-(1,33))
-            │           │           ├── flags: decimal
-            │           │           └── value: 42
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: (1,16)-(1,17) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defn_endless_command_rescue.txt b/test/mri/prism/snapshots/seattlerb/defn_endless_command_rescue.txt
deleted file mode 100644
index dfd1d01ba82..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_endless_command_rescue.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,43))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,43))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,43))
-            ├── name: :some_method
-            ├── name_loc: (1,4)-(1,15) = "some_method"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,18)-(1,43))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (1,18)-(1,43))
-            │           ├── expression:
-            │           │   @ CallNode (location: (1,18)-(1,33))
-            │           │   ├── flags: ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :other_method
-            │           │   ├── message_loc: (1,18)-(1,30) = "other_method"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments:
-            │           │   │   @ ArgumentsNode (location: (1,31)-(1,33))
-            │           │   │   ├── flags: ∅
-            │           │   │   └── arguments: (length: 1)
-            │           │   │       └── @ IntegerNode (location: (1,31)-(1,33))
-            │           │   │           ├── flags: decimal
-            │           │   │           └── value: 42
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── keyword_loc: (1,34)-(1,40) = "rescue"
-            │           └── rescue_expression:
-            │               @ IntegerNode (location: (1,41)-(1,43))
-            │               ├── flags: decimal
-            │               └── value: 24
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: (1,16)-(1,17) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defn_forward_args.txt b/test/mri/prism/snapshots/seattlerb/defn_forward_args.txt
deleted file mode 100644
index 71a984c8115..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_forward_args.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,23))
-            ├── name: :a
-            ├── name_loc: (1,4)-(1,5) = "a"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,9))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (1,6)-(1,9))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,12)-(1,18))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,12)-(1,18))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (1,12)-(1,13) = "b"
-            │           ├── opening_loc: (1,13)-(1,14) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,14)-(1,17))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ ForwardingArgumentsNode (location: (1,14)-(1,17))
-            │           ├── closing_loc: (1,17)-(1,18) = ")"
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,9)-(1,10) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,20)-(1,23) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_forward_args__no_parens.txt b/test/mri/prism/snapshots/seattlerb/defn_forward_args__no_parens.txt
deleted file mode 100644
index 4a4d69e4d03..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_forward_args__no_parens.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(3,3))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,9))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (1,6)-(1,9))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (2,2)-(2,8))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (2,2)-(2,8))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :m
-            │           ├── message_loc: (2,2)-(2,3) = "m"
-            │           ├── opening_loc: (2,3)-(2,4) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (2,4)-(2,7))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ ForwardingArgumentsNode (location: (2,4)-(2,7))
-            │           ├── closing_loc: (2,7)-(2,8) = ")"
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_kwarg_env.txt b/test/mri/prism/snapshots/seattlerb/defn_kwarg_env.txt
deleted file mode 100644
index f420420fc37..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_kwarg_env.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,45))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,45))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,45))
-            ├── name: :test
-            ├── name_loc: (1,4)-(1,8) = "test"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,9)-(1,18))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,9)-(1,18))
-            │   │   ├── flags: ∅
-            │   │   ├── name: :testing
-            │   │   ├── name_loc: (1,11)-(1,18) = "testing"
-            │   │   └── operator_loc: (1,9)-(1,11) = "**"
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,20)-(1,41))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,20)-(1,41))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :test_splat
-            │           ├── message_loc: (1,20)-(1,30) = "test_splat"
-            │           ├── opening_loc: (1,30)-(1,31) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,31)-(1,40))
-            │           │   ├── flags: contains_keyword_splat
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ KeywordHashNode (location: (1,31)-(1,40))
-            │           │           ├── flags: ∅
-            │           │           └── elements: (length: 1)
-            │           │               └── @ AssocSplatNode (location: (1,31)-(1,40))
-            │           │                   ├── value:
-            │           │                   │   @ LocalVariableReadNode (location: (1,33)-(1,40))
-            │           │                   │   ├── name: :testing
-            │           │                   │   └── depth: 0
-            │           │                   └── operator_loc: (1,31)-(1,33) = "**"
-            │           ├── closing_loc: (1,40)-(1,41) = ")"
-            │           └── block: ∅
-            ├── locals: [:testing]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,8)-(1,9) = "("
-            ├── rparen_loc: (1,18)-(1,19) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,42)-(1,45) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwarg.txt b/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwarg.txt
deleted file mode 100644
index 8a5022ff37d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwarg.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,24))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,19))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-            │   │       ├── flags: ∅
-            │   │       └── name: :a
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 2)
-            │   │   ├── @ OptionalKeywordParameterNode (location: (1,9)-(1,13))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── name: :b
-            │   │   │   ├── name_loc: (1,9)-(1,11) = "b:"
-            │   │   │   └── value:
-            │   │   │       @ IntegerNode (location: (1,12)-(1,13))
-            │   │   │       ├── flags: decimal
-            │   │   │       └── value: 1
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,15)-(1,19))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :c
-            │   │       ├── name_loc: (1,15)-(1,17) = "c:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,18)-(1,19))
-            │   │           ├── flags: decimal
-            │   │           └── value: 2
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a, :b, :c]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,19)-(1,20) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,21)-(1,24) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwsplat.txt b/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwsplat.txt
deleted file mode 100644
index 4c980bc27f8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwsplat.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,20))
-            ├── name: :a
-            ├── name_loc: (1,4)-(1,5) = "a"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,15))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,6)-(1,10))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :b
-            │   │       ├── name_loc: (1,6)-(1,8) = "b:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,9)-(1,10))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,12)-(1,15))
-            │   │   ├── flags: ∅
-            │   │   ├── name: :c
-            │   │   ├── name_loc: (1,14)-(1,15) = "c"
-            │   │   └── operator_loc: (1,12)-(1,14) = "**"
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:b, :c]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,15)-(1,16) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,17)-(1,20) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt b/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt
deleted file mode 100644
index 40afacc2a7d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,19))
-            ├── name: :a
-            ├── name_loc: (1,4)-(1,5) = "a"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,14))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,6)-(1,10))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :b
-            │   │       ├── name_loc: (1,6)-(1,8) = "b:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,9)-(1,10))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,12)-(1,14))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,12)-(1,14) = "**"
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:b]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,14)-(1,15) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,16)-(1,19) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_kwarg_lvar.txt b/test/mri/prism/snapshots/seattlerb/defn_kwarg_lvar.txt
deleted file mode 100644
index 0eae56924c8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_kwarg_lvar.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,26))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,26))
-            ├── name: :fun
-            ├── name_loc: (1,4)-(1,7) = "fun"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,16))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,8)-(1,16))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :kw
-            │   │       ├── name_loc: (1,8)-(1,11) = "kw:"
-            │   │       └── value:
-            │   │           @ SymbolNode (location: (1,12)-(1,16))
-            │   │           ├── flags: forced_us_ascii_encoding
-            │   │           ├── opening_loc: (1,12)-(1,13) = ":"
-            │   │           ├── value_loc: (1,13)-(1,16) = "val"
-            │   │           ├── closing_loc: ∅
-            │   │           └── unescaped: "val"
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,19)-(1,21))
-            │   └── body: (length: 1)
-            │       └── @ LocalVariableReadNode (location: (1,19)-(1,21))
-            │           ├── name: :kw
-            │           └── depth: 0
-            ├── locals: [:kw]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,16)-(1,17) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,23)-(1,26) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_kwarg_no_parens.txt b/test/mri/prism/snapshots/seattlerb/defn_kwarg_no_parens.txt
deleted file mode 100644
index bc5747ad02d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_kwarg_no_parens.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(2,3))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,10))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,6)-(1,10))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :a
-            │   │       ├── name_loc: (1,6)-(1,8) = "a:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,9)-(1,10))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (2,0)-(2,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_kwarg_val.txt b/test/mri/prism/snapshots/seattlerb/defn_kwarg_val.txt
deleted file mode 100644
index 82527f7875f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_kwarg_val.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,17))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,12))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-            │   │       ├── flags: ∅
-            │   │       └── name: :a
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,9)-(1,12))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :b
-            │   │       ├── name_loc: (1,9)-(1,11) = "b:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,11)-(1,12))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a, :b]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,12)-(1,13) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,14)-(1,17) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_no_kwargs.txt b/test/mri/prism/snapshots/seattlerb/defn_no_kwargs.txt
deleted file mode 100644
index 0ef0634a537..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_no_kwargs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,17))
-            ├── name: :x
-            ├── name_loc: (1,4)-(1,5) = "x"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,11))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ NoKeywordsParameterNode (location: (1,6)-(1,11))
-            │   │   ├── operator_loc: (1,6)-(1,8) = "**"
-            │   │   └── keyword_loc: (1,8)-(1,11) = "nil"
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,11)-(1,12) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,14)-(1,17) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_oneliner.txt b/test/mri/prism/snapshots/seattlerb/defn_oneliner.txt
deleted file mode 100644
index e7004998092..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_oneliner.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,27))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,27))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,27))
-            ├── name: :exec
-            ├── name_loc: (1,4)-(1,8) = "exec"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,9)-(1,12))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,9)-(1,12))
-            │   │       ├── flags: ∅
-            │   │       └── name: :cmd
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,16)-(1,27))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,16)-(1,27))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :system
-            │           ├── message_loc: (1,16)-(1,22) = "system"
-            │           ├── opening_loc: (1,22)-(1,23) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,23)-(1,26))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ LocalVariableReadNode (location: (1,23)-(1,26))
-            │           │           ├── name: :cmd
-            │           │           └── depth: 0
-            │           ├── closing_loc: (1,26)-(1,27) = ")"
-            │           └── block: ∅
-            ├── locals: [:cmd]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,8)-(1,9) = "("
-            ├── rparen_loc: (1,12)-(1,13) = ")"
-            ├── equal_loc: (1,14)-(1,15) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defn_oneliner_eq2.txt b/test/mri/prism/snapshots/seattlerb/defn_oneliner_eq2.txt
deleted file mode 100644
index 2708351ede4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_oneliner_eq2.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ ClassNode (location: (1,0)-(3,3))
-            ├── locals: []
-            ├── class_keyword_loc: (1,0)-(1,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (1,6)-(1,7))
-            │   └── name: :X
-            ├── inheritance_operator_loc: ∅
-            ├── superclass: ∅
-            ├── body:
-            │   @ StatementsNode (location: (2,2)-(2,16))
-            │   └── body: (length: 1)
-            │       └── @ DefNode (location: (2,2)-(2,16))
-            │           ├── name: :==
-            │           ├── name_loc: (2,6)-(2,8) = "=="
-            │           ├── receiver: ∅
-            │           ├── parameters:
-            │           │   @ ParametersNode (location: (2,9)-(2,10))
-            │           │   ├── requireds: (length: 1)
-            │           │   │   └── @ RequiredParameterNode (location: (2,9)-(2,10))
-            │           │   │       ├── flags: ∅
-            │           │   │       └── name: :o
-            │           │   ├── optionals: (length: 0)
-            │           │   ├── rest: ∅
-            │           │   ├── posts: (length: 0)
-            │           │   ├── keywords: (length: 0)
-            │           │   ├── keyword_rest: ∅
-            │           │   └── block: ∅
-            │           ├── body:
-            │           │   @ StatementsNode (location: (2,14)-(2,16))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (2,14)-(2,16))
-            │           │           ├── flags: decimal
-            │           │           └── value: 42
-            │           ├── locals: [:o]
-            │           ├── def_keyword_loc: (2,2)-(2,5) = "def"
-            │           ├── operator_loc: ∅
-            │           ├── lparen_loc: (2,8)-(2,9) = "("
-            │           ├── rparen_loc: (2,10)-(2,11) = ")"
-            │           ├── equal_loc: (2,12)-(2,13) = "="
-            │           └── end_keyword_loc: ∅
-            ├── end_keyword_loc: (3,0)-(3,3) = "end"
-            └── name: :X
diff --git a/test/mri/prism/snapshots/seattlerb/defn_oneliner_noargs.txt b/test/mri/prism/snapshots/seattlerb/defn_oneliner_noargs.txt
deleted file mode 100644
index 54555b1a238..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_oneliner_noargs.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,17))
-            ├── name: :exec
-            ├── name_loc: (1,4)-(1,8) = "exec"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,11)-(1,17))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,11)-(1,17))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :system
-            │           ├── message_loc: (1,11)-(1,17) = "system"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: (1,9)-(1,10) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt b/test/mri/prism/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt
deleted file mode 100644
index e0fc4636f18..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,19))
-            ├── name: :exec
-            ├── name_loc: (1,4)-(1,8) = "exec"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,13)-(1,19))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,13)-(1,19))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :system
-            │           ├── message_loc: (1,13)-(1,19) = "system"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,8)-(1,9) = "("
-            ├── rparen_loc: (1,9)-(1,10) = ")"
-            ├── equal_loc: (1,11)-(1,12) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defn_oneliner_rescue.txt b/test/mri/prism/snapshots/seattlerb/defn_oneliner_rescue.txt
deleted file mode 100644
index b5b5dbe6ac6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_oneliner_rescue.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-@ ProgramNode (location: (1,0)-(13,38))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(13,38))
-    └── body: (length: 3)
-        ├── @ DefNode (location: (1,0)-(5,3))
-        │   ├── name: :exec
-        │   ├── name_loc: (1,4)-(1,8) = "exec"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,9)-(1,12))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (1,9)-(1,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :cmd
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (1,0)-(5,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (2,2)-(2,13))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (2,2)-(2,13))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :system
-        │   │   │           ├── message_loc: (2,2)-(2,8) = "system"
-        │   │   │           ├── opening_loc: (2,8)-(2,9) = "("
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (2,9)-(2,12))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ LocalVariableReadNode (location: (2,9)-(2,12))
-        │   │   │           │           ├── name: :cmd
-        │   │   │           │           └── depth: 0
-        │   │   │           ├── closing_loc: (2,12)-(2,13) = ")"
-        │   │   │           └── block: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (3,0)-(4,5))
-        │   │   │   ├── keyword_loc: (3,0)-(3,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (4,2)-(4,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ NilNode (location: (4,2)-(4,5))
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause: ∅
-        │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        │   ├── locals: [:cmd]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,8)-(1,9) = "("
-        │   ├── rparen_loc: (1,12)-(1,13) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ DefNode (location: (8,0)-(10,3))
-        │   ├── name: :exec
-        │   ├── name_loc: (8,4)-(8,8) = "exec"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (8,9)-(8,12))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (8,9)-(8,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :cmd
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (9,2)-(9,24))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RescueModifierNode (location: (9,2)-(9,24))
-        │   │           ├── expression:
-        │   │           │   @ CallNode (location: (9,2)-(9,13))
-        │   │           │   ├── flags: ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :system
-        │   │           │   ├── message_loc: (9,2)-(9,8) = "system"
-        │   │           │   ├── opening_loc: (9,8)-(9,9) = "("
-        │   │           │   ├── arguments:
-        │   │           │   │   @ ArgumentsNode (location: (9,9)-(9,12))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   └── arguments: (length: 1)
-        │   │           │   │       └── @ LocalVariableReadNode (location: (9,9)-(9,12))
-        │   │           │   │           ├── name: :cmd
-        │   │           │   │           └── depth: 0
-        │   │           │   ├── closing_loc: (9,12)-(9,13) = ")"
-        │   │           │   └── block: ∅
-        │   │           ├── keyword_loc: (9,14)-(9,20) = "rescue"
-        │   │           └── rescue_expression:
-        │   │               @ NilNode (location: (9,21)-(9,24))
-        │   ├── locals: [:cmd]
-        │   ├── def_keyword_loc: (8,0)-(8,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (8,8)-(8,9) = "("
-        │   ├── rparen_loc: (8,12)-(8,13) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (10,0)-(10,3) = "end"
-        └── @ DefNode (location: (13,0)-(13,38))
-            ├── name: :exec
-            ├── name_loc: (13,4)-(13,8) = "exec"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (13,9)-(13,12))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (13,9)-(13,12))
-            │   │       ├── flags: ∅
-            │   │       └── name: :cmd
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (13,16)-(13,38))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (13,16)-(13,38))
-            │           ├── expression:
-            │           │   @ CallNode (location: (13,16)-(13,27))
-            │           │   ├── flags: ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :system
-            │           │   ├── message_loc: (13,16)-(13,22) = "system"
-            │           │   ├── opening_loc: (13,22)-(13,23) = "("
-            │           │   ├── arguments:
-            │           │   │   @ ArgumentsNode (location: (13,23)-(13,26))
-            │           │   │   ├── flags: ∅
-            │           │   │   └── arguments: (length: 1)
-            │           │   │       └── @ LocalVariableReadNode (location: (13,23)-(13,26))
-            │           │   │           ├── name: :cmd
-            │           │   │           └── depth: 0
-            │           │   ├── closing_loc: (13,26)-(13,27) = ")"
-            │           │   └── block: ∅
-            │           ├── keyword_loc: (13,28)-(13,34) = "rescue"
-            │           └── rescue_expression:
-            │               @ NilNode (location: (13,35)-(13,38))
-            ├── locals: [:cmd]
-            ├── def_keyword_loc: (13,0)-(13,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (13,8)-(13,9) = "("
-            ├── rparen_loc: (13,12)-(13,13) = ")"
-            ├── equal_loc: (13,14)-(13,15) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defn_opt_last_arg.txt b/test/mri/prism/snapshots/seattlerb/defn_opt_last_arg.txt
deleted file mode 100644
index 569bc230783..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_opt_last_arg.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(2,3))
-            ├── name: :m
-            ├── name_loc: (1,4)-(1,5) = "m"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,17))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 1)
-            │   │   └── @ OptionalParameterNode (location: (1,6)-(1,17))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :arg
-            │   │       ├── name_loc: (1,6)-(1,9) = "arg"
-            │   │       ├── operator_loc: (1,10)-(1,11) = "="
-            │   │       └── value:
-            │   │           @ FalseNode (location: (1,12)-(1,17))
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:arg]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (2,0)-(2,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_opt_reg.txt b/test/mri/prism/snapshots/seattlerb/defn_opt_reg.txt
deleted file mode 100644
index f86168513ac..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_opt_reg.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,19))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,14))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 1)
-            │   │   └── @ OptionalParameterNode (location: (1,6)-(1,11))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :a
-            │   │       ├── name_loc: (1,6)-(1,7) = "a"
-            │   │       ├── operator_loc: (1,7)-(1,8) = "="
-            │   │       └── value:
-            │   │           @ NilNode (location: (1,8)-(1,11))
-            │   ├── rest: ∅
-            │   ├── posts: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,13)-(1,14))
-            │   │       ├── flags: ∅
-            │   │       └── name: :b
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a, :b]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,14)-(1,15) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,16)-(1,19) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_opt_splat_arg.txt b/test/mri/prism/snapshots/seattlerb/defn_opt_splat_arg.txt
deleted file mode 100644
index 3019e9b73e3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_opt_splat_arg.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,24))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,7)-(1,19))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 1)
-            │   │   └── @ OptionalParameterNode (location: (1,7)-(1,12))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :a
-            │   │       ├── name_loc: (1,7)-(1,8) = "a"
-            │   │       ├── operator_loc: (1,9)-(1,10) = "="
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,11)-(1,12))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (1,14)-(1,16))
-            │   │   ├── flags: ∅
-            │   │   ├── name: :b
-            │   │   ├── name_loc: (1,15)-(1,16) = "b"
-            │   │   └── operator_loc: (1,14)-(1,15) = "*"
-            │   ├── posts: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,18)-(1,19))
-            │   │       ├── flags: ∅
-            │   │       └── name: :c
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a, :b, :c]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,6)-(1,7) = "("
-            ├── rparen_loc: (1,19)-(1,20) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,21)-(1,24) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_powarg.txt b/test/mri/prism/snapshots/seattlerb/defn_powarg.txt
deleted file mode 100644
index bce131ad183..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_powarg.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,17))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,12))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,6)-(1,12))
-            │   │   ├── flags: ∅
-            │   │   ├── name: :opts
-            │   │   ├── name_loc: (1,8)-(1,12) = "opts"
-            │   │   └── operator_loc: (1,6)-(1,8) = "**"
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:opts]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,12)-(1,13) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,14)-(1,17) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_reg_opt_reg.txt b/test/mri/prism/snapshots/seattlerb/defn_reg_opt_reg.txt
deleted file mode 100644
index d079e1b5f39..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_reg_opt_reg.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,23))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,18))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-            │   │       ├── flags: ∅
-            │   │       └── name: :a
-            │   ├── optionals: (length: 1)
-            │   │   └── @ OptionalParameterNode (location: (1,9)-(1,15))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :b
-            │   │       ├── name_loc: (1,9)-(1,10) = "b"
-            │   │       ├── operator_loc: (1,11)-(1,12) = "="
-            │   │       └── value:
-            │   │           @ SymbolNode (location: (1,13)-(1,15))
-            │   │           ├── flags: forced_us_ascii_encoding
-            │   │           ├── opening_loc: (1,13)-(1,14) = ":"
-            │   │           ├── value_loc: (1,14)-(1,15) = "c"
-            │   │           ├── closing_loc: ∅
-            │   │           └── unescaped: "c"
-            │   ├── rest: ∅
-            │   ├── posts: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,17)-(1,18))
-            │   │       ├── flags: ∅
-            │   │       └── name: :d
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a, :b, :d]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,18)-(1,19) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,20)-(1,23) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_splat_arg.txt b/test/mri/prism/snapshots/seattlerb/defn_splat_arg.txt
deleted file mode 100644
index 109fac495ab..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_splat_arg.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,15))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,10))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (1,6)-(1,7))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,6)-(1,7) = "*"
-            │   ├── posts: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-            │   │       ├── flags: ∅
-            │   │       └── name: :a
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,10)-(1,11) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,12)-(1,15) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defn_unary_not.txt b/test/mri/prism/snapshots/seattlerb/defn_unary_not.txt
deleted file mode 100644
index 231a3c0da9e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defn_unary_not.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,17))
-            ├── name: :!
-            ├── name_loc: (1,4)-(1,6) = "!@"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,8)-(1,12))
-            │   └── body: (length: 1)
-            │       └── @ TrueNode (location: (1,8)-(1,12))
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,14)-(1,17) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defns_reserved.txt b/test/mri/prism/snapshots/seattlerb/defns_reserved.txt
deleted file mode 100644
index 96860b49ce0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defns_reserved.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,20))
-            ├── name: :return
-            ├── name_loc: (1,9)-(1,15) = "return"
-            ├── receiver:
-            │   @ SelfNode (location: (1,4)-(1,8))
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: (1,8)-(1,9) = "."
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,17)-(1,20) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt b/test/mri/prism/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
deleted file mode 100644
index 24bb14f8e14..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,30))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,30))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,30))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,30))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ DefNode (location: (1,2)-(1,30))
-            │           ├── name: :b
-            │           ├── name_loc: (1,11)-(1,12) = "b"
-            │           ├── receiver:
-            │           │   @ SelfNode (location: (1,6)-(1,10))
-            │           ├── parameters: ∅
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,14)-(1,25))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (1,14)-(1,25))
-            │           │           ├── flags: ∅
-            │           │           ├── receiver:
-            │           │           │   @ CallNode (location: (1,14)-(1,15))
-            │           │           │   ├── flags: variable_call, ignore_visibility
-            │           │           │   ├── receiver: ∅
-            │           │           │   ├── call_operator_loc: ∅
-            │           │           │   ├── name: :x
-            │           │           │   ├── message_loc: (1,14)-(1,15) = "x"
-            │           │           │   ├── opening_loc: ∅
-            │           │           │   ├── arguments: ∅
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── block: ∅
-            │           │           ├── call_operator_loc: (1,15)-(1,16) = "."
-            │           │           ├── name: :y
-            │           │           ├── message_loc: (1,16)-(1,17) = "y"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block:
-            │           │               @ BlockNode (location: (1,18)-(1,25))
-            │           │               ├── locals: []
-            │           │               ├── parameters: ∅
-            │           │               ├── body: ∅
-            │           │               ├── opening_loc: (1,18)-(1,20) = "do"
-            │           │               └── closing_loc: (1,22)-(1,25) = "end"
-            │           ├── locals: []
-            │           ├── def_keyword_loc: (1,2)-(1,5) = "def"
-            │           ├── operator_loc: (1,10)-(1,11) = "."
-            │           ├── lparen_loc: ∅
-            │           ├── rparen_loc: ∅
-            │           ├── equal_loc: ∅
-            │           └── end_keyword_loc: (1,27)-(1,30) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defs_comments.txt b/test/mri/prism/snapshots/seattlerb/defs_comments.txt
deleted file mode 100644
index a2976e7ee28..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defs_comments.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-@ ProgramNode (location: (4,0)-(5,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (4,0)-(5,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (4,0)-(5,3))
-            ├── name: :blah
-            ├── name_loc: (4,9)-(4,13) = "blah"
-            ├── receiver:
-            │   @ SelfNode (location: (4,4)-(4,8))
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (4,0)-(4,3) = "def"
-            ├── operator_loc: (4,8)-(4,9) = "."
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (5,0)-(5,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defs_endless_command.txt b/test/mri/prism/snapshots/seattlerb/defs_endless_command.txt
deleted file mode 100644
index f3c4e794178..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defs_endless_command.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,35))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,35))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,35))
-            ├── name: :some_method
-            ├── name_loc: (1,6)-(1,17) = "some_method"
-            ├── receiver:
-            │   @ CallNode (location: (1,4)-(1,5))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :x
-            │   ├── message_loc: (1,4)-(1,5) = "x"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,20)-(1,35))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,20)-(1,35))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :other_method
-            │           ├── message_loc: (1,20)-(1,32) = "other_method"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,33)-(1,35))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ IntegerNode (location: (1,33)-(1,35))
-            │           │           ├── flags: decimal
-            │           │           └── value: 42
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: (1,5)-(1,6) = "."
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: (1,18)-(1,19) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defs_endless_command_rescue.txt b/test/mri/prism/snapshots/seattlerb/defs_endless_command_rescue.txt
deleted file mode 100644
index b0cd34a9c83..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defs_endless_command_rescue.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,45))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,45))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,45))
-            ├── name: :some_method
-            ├── name_loc: (1,6)-(1,17) = "some_method"
-            ├── receiver:
-            │   @ CallNode (location: (1,4)-(1,5))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :x
-            │   ├── message_loc: (1,4)-(1,5) = "x"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,20)-(1,45))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (1,20)-(1,45))
-            │           ├── expression:
-            │           │   @ CallNode (location: (1,20)-(1,35))
-            │           │   ├── flags: ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :other_method
-            │           │   ├── message_loc: (1,20)-(1,32) = "other_method"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments:
-            │           │   │   @ ArgumentsNode (location: (1,33)-(1,35))
-            │           │   │   ├── flags: ∅
-            │           │   │   └── arguments: (length: 1)
-            │           │   │       └── @ IntegerNode (location: (1,33)-(1,35))
-            │           │   │           ├── flags: decimal
-            │           │   │           └── value: 42
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── keyword_loc: (1,36)-(1,42) = "rescue"
-            │           └── rescue_expression:
-            │               @ IntegerNode (location: (1,43)-(1,45))
-            │               ├── flags: decimal
-            │               └── value: 24
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: (1,5)-(1,6) = "."
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: (1,18)-(1,19) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defs_kwarg.txt b/test/mri/prism/snapshots/seattlerb/defs_kwarg.txt
deleted file mode 100644
index 53235c9bb80..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defs_kwarg.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(2,3))
-            ├── name: :a
-            ├── name_loc: (1,9)-(1,10) = "a"
-            ├── receiver:
-            │   @ SelfNode (location: (1,4)-(1,8))
-            ├── parameters:
-            │   @ ParametersNode (location: (1,11)-(1,15))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,11)-(1,15))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :b
-            │   │       ├── name_loc: (1,11)-(1,13) = "b:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,14)-(1,15))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:b]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: (1,8)-(1,9) = "."
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (2,0)-(2,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/defs_oneliner.txt b/test/mri/prism/snapshots/seattlerb/defs_oneliner.txt
deleted file mode 100644
index d32975354d9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defs_oneliner.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,32))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,32))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,32))
-            ├── name: :exec
-            ├── name_loc: (1,9)-(1,13) = "exec"
-            ├── receiver:
-            │   @ SelfNode (location: (1,4)-(1,8))
-            ├── parameters:
-            │   @ ParametersNode (location: (1,14)-(1,17))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,14)-(1,17))
-            │   │       ├── flags: ∅
-            │   │       └── name: :cmd
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,21)-(1,32))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,21)-(1,32))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :system
-            │           ├── message_loc: (1,21)-(1,27) = "system"
-            │           ├── opening_loc: (1,27)-(1,28) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,28)-(1,31))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ LocalVariableReadNode (location: (1,28)-(1,31))
-            │           │           ├── name: :cmd
-            │           │           └── depth: 0
-            │           ├── closing_loc: (1,31)-(1,32) = ")"
-            │           └── block: ∅
-            ├── locals: [:cmd]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: (1,8)-(1,9) = "."
-            ├── lparen_loc: (1,13)-(1,14) = "("
-            ├── rparen_loc: (1,17)-(1,18) = ")"
-            ├── equal_loc: (1,19)-(1,20) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/defs_oneliner_eq2.txt b/test/mri/prism/snapshots/seattlerb/defs_oneliner_eq2.txt
deleted file mode 100644
index fcc5c63cf06..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defs_oneliner_eq2.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ ClassNode (location: (1,0)-(3,3))
-            ├── locals: []
-            ├── class_keyword_loc: (1,0)-(1,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (1,6)-(1,7))
-            │   └── name: :X
-            ├── inheritance_operator_loc: ∅
-            ├── superclass: ∅
-            ├── body:
-            │   @ StatementsNode (location: (2,2)-(2,21))
-            │   └── body: (length: 1)
-            │       └── @ DefNode (location: (2,2)-(2,21))
-            │           ├── name: :==
-            │           ├── name_loc: (2,11)-(2,13) = "=="
-            │           ├── receiver:
-            │           │   @ SelfNode (location: (2,6)-(2,10))
-            │           ├── parameters:
-            │           │   @ ParametersNode (location: (2,14)-(2,15))
-            │           │   ├── requireds: (length: 1)
-            │           │   │   └── @ RequiredParameterNode (location: (2,14)-(2,15))
-            │           │   │       ├── flags: ∅
-            │           │   │       └── name: :o
-            │           │   ├── optionals: (length: 0)
-            │           │   ├── rest: ∅
-            │           │   ├── posts: (length: 0)
-            │           │   ├── keywords: (length: 0)
-            │           │   ├── keyword_rest: ∅
-            │           │   └── block: ∅
-            │           ├── body:
-            │           │   @ StatementsNode (location: (2,19)-(2,21))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (2,19)-(2,21))
-            │           │           ├── flags: decimal
-            │           │           └── value: 42
-            │           ├── locals: [:o]
-            │           ├── def_keyword_loc: (2,2)-(2,5) = "def"
-            │           ├── operator_loc: (2,10)-(2,11) = "."
-            │           ├── lparen_loc: (2,13)-(2,14) = "("
-            │           ├── rparen_loc: (2,15)-(2,16) = ")"
-            │           ├── equal_loc: (2,17)-(2,18) = "="
-            │           └── end_keyword_loc: ∅
-            ├── end_keyword_loc: (3,0)-(3,3) = "end"
-            └── name: :X
diff --git a/test/mri/prism/snapshots/seattlerb/defs_oneliner_rescue.txt b/test/mri/prism/snapshots/seattlerb/defs_oneliner_rescue.txt
deleted file mode 100644
index f7762107682..00000000000
--- a/test/mri/prism/snapshots/seattlerb/defs_oneliner_rescue.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-@ ProgramNode (location: (1,0)-(13,43))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(13,43))
-    └── body: (length: 3)
-        ├── @ DefNode (location: (1,0)-(5,3))
-        │   ├── name: :exec
-        │   ├── name_loc: (1,9)-(1,13) = "exec"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (1,4)-(1,8))
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,14)-(1,17))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (1,14)-(1,17))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :cmd
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (1,0)-(5,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (2,2)-(2,13))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (2,2)-(2,13))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :system
-        │   │   │           ├── message_loc: (2,2)-(2,8) = "system"
-        │   │   │           ├── opening_loc: (2,8)-(2,9) = "("
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (2,9)-(2,12))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ LocalVariableReadNode (location: (2,9)-(2,12))
-        │   │   │           │           ├── name: :cmd
-        │   │   │           │           └── depth: 0
-        │   │   │           ├── closing_loc: (2,12)-(2,13) = ")"
-        │   │   │           └── block: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (3,0)-(4,5))
-        │   │   │   ├── keyword_loc: (3,0)-(3,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (4,2)-(4,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ NilNode (location: (4,2)-(4,5))
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause: ∅
-        │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        │   ├── locals: [:cmd]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: (1,8)-(1,9) = "."
-        │   ├── lparen_loc: (1,13)-(1,14) = "("
-        │   ├── rparen_loc: (1,17)-(1,18) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ DefNode (location: (8,0)-(10,3))
-        │   ├── name: :exec
-        │   ├── name_loc: (8,9)-(8,13) = "exec"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (8,4)-(8,8))
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (8,14)-(8,17))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (8,14)-(8,17))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :cmd
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (9,2)-(9,24))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RescueModifierNode (location: (9,2)-(9,24))
-        │   │           ├── expression:
-        │   │           │   @ CallNode (location: (9,2)-(9,13))
-        │   │           │   ├── flags: ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :system
-        │   │           │   ├── message_loc: (9,2)-(9,8) = "system"
-        │   │           │   ├── opening_loc: (9,8)-(9,9) = "("
-        │   │           │   ├── arguments:
-        │   │           │   │   @ ArgumentsNode (location: (9,9)-(9,12))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   └── arguments: (length: 1)
-        │   │           │   │       └── @ LocalVariableReadNode (location: (9,9)-(9,12))
-        │   │           │   │           ├── name: :cmd
-        │   │           │   │           └── depth: 0
-        │   │           │   ├── closing_loc: (9,12)-(9,13) = ")"
-        │   │           │   └── block: ∅
-        │   │           ├── keyword_loc: (9,14)-(9,20) = "rescue"
-        │   │           └── rescue_expression:
-        │   │               @ NilNode (location: (9,21)-(9,24))
-        │   ├── locals: [:cmd]
-        │   ├── def_keyword_loc: (8,0)-(8,3) = "def"
-        │   ├── operator_loc: (8,8)-(8,9) = "."
-        │   ├── lparen_loc: (8,13)-(8,14) = "("
-        │   ├── rparen_loc: (8,17)-(8,18) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (10,0)-(10,3) = "end"
-        └── @ DefNode (location: (13,0)-(13,43))
-            ├── name: :exec
-            ├── name_loc: (13,9)-(13,13) = "exec"
-            ├── receiver:
-            │   @ SelfNode (location: (13,4)-(13,8))
-            ├── parameters:
-            │   @ ParametersNode (location: (13,14)-(13,17))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (13,14)-(13,17))
-            │   │       ├── flags: ∅
-            │   │       └── name: :cmd
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (13,21)-(13,43))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (13,21)-(13,43))
-            │           ├── expression:
-            │           │   @ CallNode (location: (13,21)-(13,32))
-            │           │   ├── flags: ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :system
-            │           │   ├── message_loc: (13,21)-(13,27) = "system"
-            │           │   ├── opening_loc: (13,27)-(13,28) = "("
-            │           │   ├── arguments:
-            │           │   │   @ ArgumentsNode (location: (13,28)-(13,31))
-            │           │   │   ├── flags: ∅
-            │           │   │   └── arguments: (length: 1)
-            │           │   │       └── @ LocalVariableReadNode (location: (13,28)-(13,31))
-            │           │   │           ├── name: :cmd
-            │           │   │           └── depth: 0
-            │           │   ├── closing_loc: (13,31)-(13,32) = ")"
-            │           │   └── block: ∅
-            │           ├── keyword_loc: (13,33)-(13,39) = "rescue"
-            │           └── rescue_expression:
-            │               @ NilNode (location: (13,40)-(13,43))
-            ├── locals: [:cmd]
-            ├── def_keyword_loc: (13,0)-(13,3) = "def"
-            ├── operator_loc: (13,8)-(13,9) = "."
-            ├── lparen_loc: (13,13)-(13,14) = "("
-            ├── rparen_loc: (13,17)-(13,18) = ")"
-            ├── equal_loc: (13,19)-(13,20) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/difficult0_.txt b/test/mri/prism/snapshots/seattlerb/difficult0_.txt
deleted file mode 100644
index 251a80125de..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult0_.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(4,8))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(4,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,2)-(4,8))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ CallNode (location: (1,2)-(4,4))
-            │           │   ├── flags: ∅
-            │           │   ├── receiver:
-            │           │   │   @ StringNode (location: (1,2)-(1,8))
-            │           │   │   ├── flags: ∅
-            │           │   │   ├── opening_loc: (1,2)-(1,8) = "<<-END"
-            │           │   │   ├── content_loc: (2,0)-(3,0) = "  a\n"
-            │           │   │   ├── closing_loc: (3,0)-(4,0) = "  END\n"
-            │           │   │   └── unescaped: "  a\n"
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :+
-            │           │   ├── message_loc: (1,8)-(1,9) = "+"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments:
-            │           │   │   @ ArgumentsNode (location: (1,9)-(4,4))
-            │           │   │   ├── flags: ∅
-            │           │   │   └── arguments: (length: 1)
-            │           │   │       └── @ InterpolatedStringNode (location: (1,9)-(4,4))
-            │           │   │           ├── opening_loc: (1,9)-(1,10) = "'"
-            │           │   │           ├── parts: (length: 2)
-            │           │   │           │   ├── @ StringNode (location: (1,10)-(2,0))
-            │           │   │           │   │   ├── flags: ∅
-            │           │   │           │   │   ├── opening_loc: ∅
-            │           │   │           │   │   ├── content_loc: (1,10)-(2,0) = "b\n"
-            │           │   │           │   │   ├── closing_loc: ∅
-            │           │   │           │   │   └── unescaped: "b\n"
-            │           │   │           │   └── @ StringNode (location: (4,0)-(4,3))
-            │           │   │           │       ├── flags: ∅
-            │           │   │           │       ├── opening_loc: ∅
-            │           │   │           │       ├── content_loc: (4,0)-(4,3) = "  c"
-            │           │   │           │       ├── closing_loc: ∅
-            │           │   │           │       └── unescaped: "  c"
-            │           │   │           └── closing_loc: (4,3)-(4,4) = "'"
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :+
-            │           ├── message_loc: (4,4)-(4,5) = "+"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (4,5)-(4,8))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ StringNode (location: (4,5)-(4,8))
-            │           │           ├── flags: ∅
-            │           │           ├── opening_loc: (4,5)-(4,6) = "'"
-            │           │           ├── content_loc: (4,6)-(4,7) = "d"
-            │           │           ├── closing_loc: (4,7)-(4,8) = "'"
-            │           │           └── unescaped: "d"
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/difficult1_line_numbers.txt b/test/mri/prism/snapshots/seattlerb/difficult1_line_numbers.txt
deleted file mode 100644
index da2306312c7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult1_line_numbers.txt
+++ /dev/null
@@ -1,267 +0,0 @@
-@ ProgramNode (location: (1,0)-(12,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(12,3))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(12,3))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ TrueNode (location: (1,3)-(1,7))
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (2,2)-(11,11))
-            │   └── body: (length: 10)
-            │       ├── @ CallNode (location: (2,2)-(2,5))
-            │       │   ├── flags: ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :p
-            │       │   ├── message_loc: (2,2)-(2,3) = "p"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (2,4)-(2,5))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 1)
-            │       │   │       └── @ IntegerNode (location: (2,4)-(2,5))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 1
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       ├── @ CallNode (location: (3,2)-(3,7))
-            │       │   ├── flags: ∅
-            │       │   ├── receiver:
-            │       │   │   @ CallNode (location: (3,2)-(3,3))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :a
-            │       │   │   ├── message_loc: (3,2)-(3,3) = "a"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── call_operator_loc: (3,3)-(3,4) = "."
-            │       │   ├── name: :b
-            │       │   ├── message_loc: (3,4)-(3,5) = "b"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (3,6)-(3,7))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 1)
-            │       │   │       └── @ IntegerNode (location: (3,6)-(3,7))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 2
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       ├── @ CallNode (location: (4,2)-(4,10))
-            │       │   ├── flags: ∅
-            │       │   ├── receiver:
-            │       │   │   @ CallNode (location: (4,2)-(4,3))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :c
-            │       │   │   ├── message_loc: (4,2)-(4,3) = "c"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── call_operator_loc: (4,3)-(4,4) = "."
-            │       │   ├── name: :d
-            │       │   ├── message_loc: (4,4)-(4,5) = "d"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (4,6)-(4,10))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 2)
-            │       │   │       ├── @ IntegerNode (location: (4,6)-(4,7))
-            │       │   │       │   ├── flags: decimal
-            │       │   │       │   └── value: 3
-            │       │   │       └── @ IntegerNode (location: (4,9)-(4,10))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 4
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       ├── @ CallNode (location: (5,2)-(5,7))
-            │       │   ├── flags: ∅
-            │       │   ├── receiver:
-            │       │   │   @ CallNode (location: (5,2)-(5,3))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :e
-            │       │   │   ├── message_loc: (5,2)-(5,3) = "e"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── call_operator_loc: (5,3)-(5,4) = "."
-            │       │   ├── name: :f
-            │       │   ├── message_loc: (5,4)-(5,5) = "f"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (5,6)-(5,7))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 1)
-            │       │   │       └── @ IntegerNode (location: (5,6)-(5,7))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 5
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       ├── @ CallNode (location: (6,2)-(6,10))
-            │       │   ├── flags: ∅
-            │       │   ├── receiver:
-            │       │   │   @ CallNode (location: (6,2)-(6,3))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :g
-            │       │   │   ├── message_loc: (6,2)-(6,3) = "g"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── call_operator_loc: (6,3)-(6,4) = "."
-            │       │   ├── name: :h
-            │       │   ├── message_loc: (6,4)-(6,5) = "h"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (6,6)-(6,10))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 2)
-            │       │   │       ├── @ IntegerNode (location: (6,6)-(6,7))
-            │       │   │       │   ├── flags: decimal
-            │       │   │       │   └── value: 6
-            │       │   │       └── @ IntegerNode (location: (6,9)-(6,10))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 7
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       ├── @ CallNode (location: (7,2)-(7,6))
-            │       │   ├── flags: ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :p
-            │       │   ├── message_loc: (7,2)-(7,3) = "p"
-            │       │   ├── opening_loc: (7,3)-(7,4) = "("
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (7,4)-(7,5))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 1)
-            │       │   │       └── @ IntegerNode (location: (7,4)-(7,5))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 1
-            │       │   ├── closing_loc: (7,5)-(7,6) = ")"
-            │       │   └── block: ∅
-            │       ├── @ CallNode (location: (8,2)-(8,8))
-            │       │   ├── flags: ∅
-            │       │   ├── receiver:
-            │       │   │   @ CallNode (location: (8,2)-(8,3))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :a
-            │       │   │   ├── message_loc: (8,2)-(8,3) = "a"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── call_operator_loc: (8,3)-(8,4) = "."
-            │       │   ├── name: :b
-            │       │   ├── message_loc: (8,4)-(8,5) = "b"
-            │       │   ├── opening_loc: (8,5)-(8,6) = "("
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (8,6)-(8,7))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 1)
-            │       │   │       └── @ IntegerNode (location: (8,6)-(8,7))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 2
-            │       │   ├── closing_loc: (8,7)-(8,8) = ")"
-            │       │   └── block: ∅
-            │       ├── @ CallNode (location: (9,2)-(9,11))
-            │       │   ├── flags: ∅
-            │       │   ├── receiver:
-            │       │   │   @ CallNode (location: (9,2)-(9,3))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :c
-            │       │   │   ├── message_loc: (9,2)-(9,3) = "c"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── call_operator_loc: (9,3)-(9,4) = "."
-            │       │   ├── name: :d
-            │       │   ├── message_loc: (9,4)-(9,5) = "d"
-            │       │   ├── opening_loc: (9,5)-(9,6) = "("
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (9,6)-(9,10))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 2)
-            │       │   │       ├── @ IntegerNode (location: (9,6)-(9,7))
-            │       │   │       │   ├── flags: decimal
-            │       │   │       │   └── value: 3
-            │       │   │       └── @ IntegerNode (location: (9,9)-(9,10))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 4
-            │       │   ├── closing_loc: (9,10)-(9,11) = ")"
-            │       │   └── block: ∅
-            │       ├── @ CallNode (location: (10,2)-(10,8))
-            │       │   ├── flags: ∅
-            │       │   ├── receiver:
-            │       │   │   @ CallNode (location: (10,2)-(10,3))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :e
-            │       │   │   ├── message_loc: (10,2)-(10,3) = "e"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── call_operator_loc: (10,3)-(10,4) = "."
-            │       │   ├── name: :f
-            │       │   ├── message_loc: (10,4)-(10,5) = "f"
-            │       │   ├── opening_loc: (10,5)-(10,6) = "("
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (10,6)-(10,7))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 1)
-            │       │   │       └── @ IntegerNode (location: (10,6)-(10,7))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 5
-            │       │   ├── closing_loc: (10,7)-(10,8) = ")"
-            │       │   └── block: ∅
-            │       └── @ CallNode (location: (11,2)-(11,11))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ CallNode (location: (11,2)-(11,3))
-            │           │   ├── flags: variable_call, ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :g
-            │           │   ├── message_loc: (11,2)-(11,3) = "g"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments: ∅
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── call_operator_loc: (11,3)-(11,4) = "."
-            │           ├── name: :h
-            │           ├── message_loc: (11,4)-(11,5) = "h"
-            │           ├── opening_loc: (11,5)-(11,6) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (11,6)-(11,10))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 2)
-            │           │       ├── @ IntegerNode (location: (11,6)-(11,7))
-            │           │       │   ├── flags: decimal
-            │           │       │   └── value: 6
-            │           │       └── @ IntegerNode (location: (11,9)-(11,10))
-            │           │           ├── flags: decimal
-            │           │           └── value: 7
-            │           ├── closing_loc: (11,10)-(11,11) = ")"
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (12,0)-(12,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult1_line_numbers2.txt b/test/mri/prism/snapshots/seattlerb/difficult1_line_numbers2.txt
deleted file mode 100644
index f586634c59b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult1_line_numbers2.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,1))
-├── locals: [:b, :c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,1))
-    └── body: (length: 2)
-        ├── @ IfNode (location: (1,0)-(6,3))
-        │   ├── if_keyword_loc: (1,0)-(1,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (1,3)-(1,7))
-        │   ├── then_keyword_loc: (1,8)-(1,12) = "then"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (2,2)-(5,6))
-        │   │   └── body: (length: 4)
-        │   │       ├── @ CallNode (location: (2,2)-(2,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :p
-        │   │       │   ├── message_loc: (2,2)-(2,3) = "p"
-        │   │       │   ├── opening_loc: (2,3)-(2,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (2,4)-(2,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ StringNode (location: (2,4)-(2,7))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── opening_loc: (2,4)-(2,5) = "\""
-        │   │       │   │           ├── content_loc: (2,5)-(2,6) = "a"
-        │   │       │   │           ├── closing_loc: (2,6)-(2,7) = "\""
-        │   │       │   │           └── unescaped: "a"
-        │   │       │   ├── closing_loc: (2,7)-(2,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       ├── @ LocalVariableWriteNode (location: (3,2)-(3,7))
-        │   │       │   ├── name: :b
-        │   │       │   ├── depth: 0
-        │   │       │   ├── name_loc: (3,2)-(3,3) = "b"
-        │   │       │   ├── value:
-        │   │       │   │   @ IntegerNode (location: (3,6)-(3,7))
-        │   │       │   │   ├── flags: decimal
-        │   │       │   │   └── value: 1
-        │   │       │   └── operator_loc: (3,4)-(3,5) = "="
-        │   │       ├── @ CallNode (location: (4,2)-(4,5))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :p
-        │   │       │   ├── message_loc: (4,2)-(4,3) = "p"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (4,4)-(4,5))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ LocalVariableReadNode (location: (4,4)-(4,5))
-        │   │       │   │           ├── name: :b
-        │   │       │   │           └── depth: 0
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ LocalVariableWriteNode (location: (5,2)-(5,6))
-        │   │           ├── name: :c
-        │   │           ├── depth: 0
-        │   │           ├── name_loc: (5,2)-(5,3) = "c"
-        │   │           ├── value:
-        │   │           │   @ IntegerNode (location: (5,5)-(5,6))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           └── operator_loc: (5,4)-(5,5) = "="
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (6,0)-(6,3) = "end"
-        └── @ CallNode (location: (7,0)-(7,1))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (7,0)-(7,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/difficult2_.txt b/test/mri/prism/snapshots/seattlerb/difficult2_.txt
deleted file mode 100644
index a9b3736fe33..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult2_.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,6))
-    └── body: (length: 2)
-        ├── @ IfNode (location: (1,0)-(1,13))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ IntegerNode (location: (1,0)-(1,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── then_keyword_loc: (1,2)-(1,3) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,4)-(1,9))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,4)-(1,9))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (1,4)-(1,5) = "b"
-        │   │           ├── opening_loc: (1,5)-(1,6) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (1,6)-(1,8))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ StringNode (location: (1,6)-(1,8))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── opening_loc: (1,6)-(1,7) = "'"
-        │   │           │           ├── content_loc: (1,7)-(1,7) = ""
-        │   │           │           ├── closing_loc: (1,7)-(1,8) = "'"
-        │   │           │           └── unescaped: ""
-        │   │           ├── closing_loc: (1,8)-(1,9) = ")"
-        │   │           └── block: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (1,10)-(1,13))
-        │   │   ├── else_keyword_loc: (1,10)-(1,11) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,12)-(1,13))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (1,12)-(1,13))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        └── @ CallNode (location: (2,0)-(2,6))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (2,0)-(2,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (2,2)-(2,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (2,2)-(2,6))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (2,2)-(2,6))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (2,2)-(2,4))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (2,2)-(2,3) = "d"
-            │                   │   ├── closing_loc: (2,3)-(2,4) = ":"
-            │                   │   └── unescaped: "d"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (2,5)-(2,6))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 3
-            │                   └── operator_loc: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3_.txt b/test/mri/prism/snapshots/seattlerb/difficult3_.txt
deleted file mode 100644
index f074c49a9f9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3_.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,18))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,18))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,16))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,15))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,15))
-                │   │   │       ├── lefts: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,12)-(1,14))
-                │   │   │       │   ├── operator_loc: (1,12)-(1,13) = "*"
-                │   │   │       │   └── expression:
-                │   │   │       │       @ RequiredParameterNode (location: (1,13)-(1,14))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :c
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,14)-(1,15) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,15)-(1,16) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,17)-(1,18) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3_2.txt b/test/mri/prism/snapshots/seattlerb/difficult3_2.txt
deleted file mode 100644
index af1a6491716..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3_2.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,13))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,11))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,10))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,5)-(1,7))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :a
-                │   │   │   ├── name_loc: (1,6)-(1,7) = "a"
-                │   │   │   └── operator_loc: (1,5)-(1,6) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,10)-(1,11) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,12)-(1,13) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3_3.txt b/test/mri/prism/snapshots/seattlerb/difficult3_3.txt
deleted file mode 100644
index e49bbcd55ab..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3_3.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,5)-(1,7))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :a
-                │   │   │   ├── name_loc: (1,6)-(1,7) = "a"
-                │   │   │   └── operator_loc: (1,5)-(1,6) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,12)-(1,14))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :c
-                │   │       ├── name_loc: (1,13)-(1,14) = "c"
-                │   │       └── operator_loc: (1,12)-(1,13) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3_4.txt b/test/mri/prism/snapshots/seattlerb/difficult3_4.txt
deleted file mode 100644
index 73afffb4cb7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3_4.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,17))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ IfNode (location: (1,2)-(1,17))
-            │   ├── if_keyword_loc: ∅
-            │   ├── predicate:
-            │   │   @ CallNode (location: (1,2)-(1,3))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :b
-            │   │   ├── message_loc: (1,2)-(1,3) = "b"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── then_keyword_loc: (1,4)-(1,5) = "?"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,6)-(1,10))
-            │   │   └── body: (length: 1)
-            │   │       └── @ TrueNode (location: (1,6)-(1,10))
-            │   ├── consequent:
-            │   │   @ ElseNode (location: (1,10)-(1,17))
-            │   │   ├── else_keyword_loc: (1,10)-(1,11) = ":"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,12)-(1,17))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ FalseNode (location: (1,12)-(1,17))
-            │   │   └── end_keyword_loc: ∅
-            │   └── end_keyword_loc: ∅
-            └── operator_loc: (1,1)-(1,2) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3_5.txt b/test/mri/prism/snapshots/seattlerb/difficult3_5.txt
deleted file mode 100644
index 793c3f1e118..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3_5.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,19))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,19))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LambdaNode (location: (1,2)-(1,19))
-            │           ├── locals: []
-            │           ├── operator_loc: (1,2)-(1,4) = "->"
-            │           ├── opening_loc: (1,7)-(1,8) = "{"
-            │           ├── closing_loc: (1,18)-(1,19) = "}"
-            │           ├── parameters:
-            │           │   @ BlockParametersNode (location: (1,4)-(1,6))
-            │           │   ├── parameters: ∅
-            │           │   ├── locals: (length: 0)
-            │           │   ├── opening_loc: (1,4)-(1,5) = "("
-            │           │   └── closing_loc: (1,5)-(1,6) = ")"
-            │           └── body:
-            │               @ StatementsNode (location: (1,9)-(1,17))
-            │               └── body: (length: 1)
-            │                   └── @ CallNode (location: (1,9)-(1,17))
-            │                       ├── flags: ignore_visibility
-            │                       ├── receiver: ∅
-            │                       ├── call_operator_loc: ∅
-            │                       ├── name: :g
-            │                       ├── message_loc: (1,9)-(1,10) = "g"
-            │                       ├── opening_loc: ∅
-            │                       ├── arguments: ∅
-            │                       ├── closing_loc: ∅
-            │                       └── block:
-            │                           @ BlockNode (location: (1,11)-(1,17))
-            │                           ├── locals: []
-            │                           ├── parameters: ∅
-            │                           ├── body: ∅
-            │                           ├── opening_loc: (1,11)-(1,13) = "do"
-            │                           └── closing_loc: (1,14)-(1,17) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3__10.txt b/test/mri/prism/snapshots/seattlerb/difficult3__10.txt
deleted file mode 100644
index 0131e44d445..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3__10.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,18))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,18))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,16))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,15))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,15))
-                │   │   │       ├── lefts: (length: 0)
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,9)-(1,11))
-                │   │   │       │   ├── operator_loc: (1,9)-(1,10) = "*"
-                │   │   │       │   └── expression:
-                │   │   │       │       @ RequiredParameterNode (location: (1,10)-(1,11))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rights: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,13)-(1,14))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :c
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,14)-(1,15) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,15)-(1,16) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,17)-(1,18) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3__11.txt b/test/mri/prism/snapshots/seattlerb/difficult3__11.txt
deleted file mode 100644
index a658b091c23..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3__11.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,14))
-                ├── locals: [:a]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,11))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,11))
-                │   │   │       ├── lefts: (length: 0)
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,9)-(1,10))
-                │   │   │       │   ├── operator_loc: (1,9)-(1,10) = "*"
-                │   │   │       │   └── expression: ∅
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,10)-(1,11) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,13)-(1,14) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3__12.txt b/test/mri/prism/snapshots/seattlerb/difficult3__12.txt
deleted file mode 100644
index 5aa252fe6ac..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3__12.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,14))
-                │   │   │       ├── lefts: (length: 0)
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,9)-(1,10))
-                │   │   │       │   ├── operator_loc: (1,9)-(1,10) = "*"
-                │   │   │       │   └── expression: ∅
-                │   │   │       ├── rights: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,12)-(1,13))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,13)-(1,14) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3__6.txt b/test/mri/prism/snapshots/seattlerb/difficult3__6.txt
deleted file mode 100644
index a42a625be73..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3__6.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,21))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,21))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,21))
-                ├── locals: [:a, :b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,19))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,18))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,18))
-                │   │   │       ├── lefts: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,12)-(1,14))
-                │   │   │       │   ├── operator_loc: (1,12)-(1,13) = "*"
-                │   │   │       │   └── expression:
-                │   │   │       │       @ RequiredParameterNode (location: (1,13)-(1,14))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :c
-                │   │   │       ├── rights: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,16)-(1,17))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :d
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,17)-(1,18) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,18)-(1,19) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,20)-(1,21) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3__7.txt b/test/mri/prism/snapshots/seattlerb/difficult3__7.txt
deleted file mode 100644
index b08025804ca..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3__7.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,14))
-                │   │   │       ├── lefts: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,12)-(1,13))
-                │   │   │       │   ├── operator_loc: (1,12)-(1,13) = "*"
-                │   │   │       │   └── expression: ∅
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,13)-(1,14) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3__8.txt b/test/mri/prism/snapshots/seattlerb/difficult3__8.txt
deleted file mode 100644
index b2b118faef0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3__8.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,20))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,20))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,18))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,17))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,17))
-                │   │   │       ├── lefts: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,12)-(1,13))
-                │   │   │       │   ├── operator_loc: (1,12)-(1,13) = "*"
-                │   │   │       │   └── expression: ∅
-                │   │   │       ├── rights: (length: 1)
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,15)-(1,16))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :c
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,16)-(1,17) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,17)-(1,18) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,19)-(1,20) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult3__9.txt b/test/mri/prism/snapshots/seattlerb/difficult3__9.txt
deleted file mode 100644
index 85c10a4432b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult3__9.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,15))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,15))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,13))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,12))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ MultiTargetNode (location: (1,8)-(1,12))
-                │   │   │       ├── lefts: (length: 0)
-                │   │   │       ├── rest:
-                │   │   │       │   @ SplatNode (location: (1,9)-(1,11))
-                │   │   │       │   ├── operator_loc: (1,9)-(1,10) = "*"
-                │   │   │       │   └── expression:
-                │   │   │       │       @ RequiredParameterNode (location: (1,10)-(1,11))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │       └── rparen_loc: (1,11)-(1,12) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,12)-(1,13) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,14)-(1,15) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult4__leading_dots.txt b/test/mri/prism/snapshots/seattlerb/difficult4__leading_dots.txt
deleted file mode 100644
index 8307c806e62..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult4__leading_dots.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,2))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(2,2))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (2,0)-(2,1) = "."
-            ├── name: :b
-            ├── message_loc: (2,1)-(2,2) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/difficult4__leading_dots2.txt b/test/mri/prism/snapshots/seattlerb/difficult4__leading_dots2.txt
deleted file mode 100644
index ee4370c0f03..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult4__leading_dots2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 2)
-        ├── @ IntegerNode (location: (1,0)-(1,1))
-        │   ├── flags: decimal
-        │   └── value: 1
-        └── @ RangeNode (location: (2,0)-(2,3))
-            ├── flags: ∅
-            ├── left: ∅
-            ├── right:
-            │   @ IntegerNode (location: (2,2)-(2,3))
-            │   ├── flags: decimal
-            │   └── value: 3
-            └── operator_loc: (2,0)-(2,2) = ".."
diff --git a/test/mri/prism/snapshots/seattlerb/difficult6_.txt b/test/mri/prism/snapshots/seattlerb/difficult6_.txt
deleted file mode 100644
index bf80034fe95..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult6_.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,25))
-            ├── locals: [:a, :b]
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,13)-(1,14) = "{"
-            ├── closing_loc: (1,24)-(1,25) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,2)-(1,12))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (1,3)-(1,11))
-            │   │   ├── requireds: (length: 1)
-            │   │   │   └── @ RequiredParameterNode (location: (1,3)-(1,4))
-            │   │   │       ├── flags: ∅
-            │   │   │       └── name: :a
-            │   │   ├── optionals: (length: 1)
-            │   │   │   └── @ OptionalParameterNode (location: (1,6)-(1,11))
-            │   │   │       ├── flags: ∅
-            │   │   │       ├── name: :b
-            │   │   │       ├── name_loc: (1,6)-(1,7) = "b"
-            │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-            │   │   │       └── value:
-            │   │   │           @ NilNode (location: (1,8)-(1,11))
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: (1,2)-(1,3) = "("
-            │   └── closing_loc: (1,11)-(1,12) = ")"
-            └── body:
-                @ StatementsNode (location: (1,15)-(1,23))
-                └── body: (length: 1)
-                    └── @ CallNode (location: (1,15)-(1,23))
-                        ├── flags: ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :p
-                        ├── message_loc: (1,15)-(1,16) = "p"
-                        ├── opening_loc: ∅
-                        ├── arguments:
-                        │   @ ArgumentsNode (location: (1,17)-(1,23))
-                        │   ├── flags: ∅
-                        │   └── arguments: (length: 1)
-                        │       └── @ ArrayNode (location: (1,17)-(1,23))
-                        │           ├── flags: ∅
-                        │           ├── elements: (length: 2)
-                        │           │   ├── @ LocalVariableReadNode (location: (1,18)-(1,19))
-                        │           │   │   ├── name: :a
-                        │           │   │   └── depth: 0
-                        │           │   └── @ LocalVariableReadNode (location: (1,21)-(1,22))
-                        │           │       ├── name: :b
-                        │           │       └── depth: 0
-                        │           ├── opening_loc: (1,17)-(1,18) = "["
-                        │           └── closing_loc: (1,22)-(1,23) = "]"
-                        ├── closing_loc: ∅
-                        └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/difficult6__7.txt b/test/mri/prism/snapshots/seattlerb/difficult6__7.txt
deleted file mode 100644
index 7fe70c70332..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult6__7.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,11))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :b
-            ├── message_loc: (1,2)-(1,3) = "b"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,4)-(1,7))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,5)-(1,6))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── opening_loc: (1,4)-(1,5) = "("
-            │           └── closing_loc: (1,6)-(1,7) = ")"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,8)-(1,11))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (1,9)-(1,10))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (1,9)-(1,10))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :c
-                │           ├── message_loc: (1,9)-(1,10) = "c"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (1,8)-(1,9) = "{"
-                └── closing_loc: (1,10)-(1,11) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult6__8.txt b/test/mri/prism/snapshots/seattlerb/difficult6__8.txt
deleted file mode 100644
index 7f915e283c7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult6__8.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "::"
-            ├── name: :b
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,5)-(1,8))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,6)-(1,7))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── opening_loc: (1,5)-(1,6) = "("
-            │           └── closing_loc: (1,7)-(1,8) = ")"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,9)-(1,12))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (1,10)-(1,11))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (1,10)-(1,11))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :c
-                │           ├── message_loc: (1,10)-(1,11) = "c"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (1,9)-(1,10) = "{"
-                └── closing_loc: (1,11)-(1,12) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/difficult7_.txt b/test/mri/prism/snapshots/seattlerb/difficult7_.txt
deleted file mode 100644
index 40c778cf6cc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/difficult7_.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-@ ProgramNode (location: (1,6)-(4,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,6)-(4,7))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,6)-(4,7))
-            ├── opening_loc: (1,6)-(1,7) = "{"
-            ├── elements: (length: 2)
-            │   ├── @ AssocNode (location: (2,8)-(2,33))
-            │   │   ├── key:
-            │   │   │   @ SymbolNode (location: (2,8)-(2,10))
-            │   │   │   ├── flags: forced_us_ascii_encoding
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── value_loc: (2,8)-(2,9) = "a"
-            │   │   │   ├── closing_loc: (2,9)-(2,10) = ":"
-            │   │   │   └── unescaped: "a"
-            │   │   ├── value:
-            │   │   │   @ CallNode (location: (2,11)-(2,33))
-            │   │   │   ├── flags: ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :lambda
-            │   │   │   ├── message_loc: (2,11)-(2,17) = "lambda"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block:
-            │   │   │       @ BlockNode (location: (2,18)-(2,33))
-            │   │   │       ├── locals: []
-            │   │   │       ├── parameters: ∅
-            │   │   │       ├── body:
-            │   │   │       │   @ StatementsNode (location: (2,20)-(2,31))
-            │   │   │       │   └── body: (length: 1)
-            │   │   │       │       └── @ IfNode (location: (2,20)-(2,31))
-            │   │   │       │           ├── if_keyword_loc: ∅
-            │   │   │       │           ├── predicate:
-            │   │   │       │           │   @ CallNode (location: (2,20)-(2,21))
-            │   │   │       │           │   ├── flags: variable_call, ignore_visibility
-            │   │   │       │           │   ├── receiver: ∅
-            │   │   │       │           │   ├── call_operator_loc: ∅
-            │   │   │       │           │   ├── name: :b
-            │   │   │       │           │   ├── message_loc: (2,20)-(2,21) = "b"
-            │   │   │       │           │   ├── opening_loc: ∅
-            │   │   │       │           │   ├── arguments: ∅
-            │   │   │       │           │   ├── closing_loc: ∅
-            │   │   │       │           │   └── block: ∅
-            │   │   │       │           ├── then_keyword_loc: (2,22)-(2,23) = "?"
-            │   │   │       │           ├── statements:
-            │   │   │       │           │   @ StatementsNode (location: (2,24)-(2,27))
-            │   │   │       │           │   └── body: (length: 1)
-            │   │   │       │           │       └── @ CallNode (location: (2,24)-(2,27))
-            │   │   │       │           │           ├── flags: ignore_visibility
-            │   │   │       │           │           ├── receiver: ∅
-            │   │   │       │           │           ├── call_operator_loc: ∅
-            │   │   │       │           │           ├── name: :c
-            │   │   │       │           │           ├── message_loc: (2,24)-(2,25) = "c"
-            │   │   │       │           │           ├── opening_loc: (2,25)-(2,26) = "("
-            │   │   │       │           │           ├── arguments: ∅
-            │   │   │       │           │           ├── closing_loc: (2,26)-(2,27) = ")"
-            │   │   │       │           │           └── block: ∅
-            │   │   │       │           ├── consequent:
-            │   │   │       │           │   @ ElseNode (location: (2,28)-(2,31))
-            │   │   │       │           │   ├── else_keyword_loc: (2,28)-(2,29) = ":"
-            │   │   │       │           │   ├── statements:
-            │   │   │       │           │   │   @ StatementsNode (location: (2,30)-(2,31))
-            │   │   │       │           │   │   └── body: (length: 1)
-            │   │   │       │           │   │       └── @ CallNode (location: (2,30)-(2,31))
-            │   │   │       │           │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │       │           │   │           ├── receiver: ∅
-            │   │   │       │           │   │           ├── call_operator_loc: ∅
-            │   │   │       │           │   │           ├── name: :d
-            │   │   │       │           │   │           ├── message_loc: (2,30)-(2,31) = "d"
-            │   │   │       │           │   │           ├── opening_loc: ∅
-            │   │   │       │           │   │           ├── arguments: ∅
-            │   │   │       │           │   │           ├── closing_loc: ∅
-            │   │   │       │           │   │           └── block: ∅
-            │   │   │       │           │   └── end_keyword_loc: ∅
-            │   │   │       │           └── end_keyword_loc: ∅
-            │   │   │       ├── opening_loc: (2,18)-(2,19) = "{"
-            │   │   │       └── closing_loc: (2,32)-(2,33) = "}"
-            │   │   └── operator_loc: ∅
-            │   └── @ AssocNode (location: (3,8)-(3,14))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (3,8)-(3,10))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: ∅
-            │       │   ├── value_loc: (3,8)-(3,9) = "e"
-            │       │   ├── closing_loc: (3,9)-(3,10) = ":"
-            │       │   └── unescaped: "e"
-            │       ├── value:
-            │       │   @ NilNode (location: (3,11)-(3,14))
-            │       └── operator_loc: ∅
-            └── closing_loc: (4,6)-(4,7) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/do_bug.txt b/test/mri/prism/snapshots/seattlerb/do_bug.txt
deleted file mode 100644
index 5877b18d686..00000000000
--- a/test/mri/prism/snapshots/seattlerb/do_bug.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,2)-(1,3))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (2,0)-(4,3))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (2,0)-(2,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (2,0)-(2,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (2,1)-(2,2) = "."
-            ├── name: :b
-            ├── message_loc: (2,2)-(2,3) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (2,4)-(4,3))
-                ├── locals: [:c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (2,7)-(2,10))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (2,8)-(2,9))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (2,8)-(2,9))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (2,7)-(2,8) = "|"
-                │   └── closing_loc: (2,9)-(2,10) = "|"
-                ├── body: ∅
-                ├── opening_loc: (2,4)-(2,6) = "do"
-                └── closing_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/do_lambda.txt b/test/mri/prism/snapshots/seattlerb/do_lambda.txt
deleted file mode 100644
index 4713fb3e4b7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/do_lambda.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,11))
-            ├── locals: []
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,5)-(1,7) = "do"
-            ├── closing_loc: (1,8)-(1,11) = "end"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,2)-(1,4))
-            │   ├── parameters: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: (1,2)-(1,3) = "("
-            │   └── closing_loc: (1,3)-(1,4) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/dot2_nil__26.txt b/test/mri/prism/snapshots/seattlerb/dot2_nil__26.txt
deleted file mode 100644
index 104515ac3ad..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dot2_nil__26.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ RangeNode (location: (1,0)-(1,3))
-            ├── flags: ∅
-            ├── left:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── right: ∅
-            └── operator_loc: (1,1)-(1,3) = ".."
diff --git a/test/mri/prism/snapshots/seattlerb/dot3_nil__26.txt b/test/mri/prism/snapshots/seattlerb/dot3_nil__26.txt
deleted file mode 100644
index ec7f57cd96f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dot3_nil__26.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ RangeNode (location: (1,0)-(1,4))
-            ├── flags: exclude_end
-            ├── left:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── right: ∅
-            └── operator_loc: (1,1)-(1,4) = "..."
diff --git a/test/mri/prism/snapshots/seattlerb/dstr_evstr.txt b/test/mri/prism/snapshots/seattlerb/dstr_evstr.txt
deleted file mode 100644
index ce692238cdf..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dstr_evstr.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,12))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 2)
-            │   ├── @ EmbeddedStatementsNode (location: (1,1)-(1,7))
-            │   │   ├── opening_loc: (1,1)-(1,3) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,3)-(1,6))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ StringNode (location: (1,3)-(1,6))
-            │   │   │           ├── flags: ∅
-            │   │   │           ├── opening_loc: (1,3)-(1,4) = "'"
-            │   │   │           ├── content_loc: (1,4)-(1,5) = "a"
-            │   │   │           ├── closing_loc: (1,5)-(1,6) = "'"
-            │   │   │           └── unescaped: "a"
-            │   │   └── closing_loc: (1,6)-(1,7) = "}"
-            │   └── @ EmbeddedStatementsNode (location: (1,7)-(1,11))
-            │       ├── opening_loc: (1,7)-(1,9) = "\#{"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,9)-(1,10))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (1,9)-(1,10))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :b
-            │       │           ├── message_loc: (1,9)-(1,10) = "b"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       └── closing_loc: (1,10)-(1,11) = "}"
-            └── closing_loc: (1,11)-(1,12) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/dstr_evstr_empty_end.txt b/test/mri/prism/snapshots/seattlerb/dstr_evstr_empty_end.txt
deleted file mode 100644
index 53f97e4b363..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dstr_evstr_empty_end.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ InterpolatedSymbolNode (location: (1,0)-(1,11))
-            ├── opening_loc: (1,0)-(1,2) = ":\""
-            ├── parts: (length: 1)
-            │   └── @ EmbeddedStatementsNode (location: (1,2)-(1,10))
-            │       ├── opening_loc: (1,2)-(1,4) = "\#{"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,4)-(1,9))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (1,4)-(1,9))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :field
-            │       │           ├── message_loc: (1,4)-(1,9) = "field"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       └── closing_loc: (1,9)-(1,10) = "}"
-            └── closing_loc: (1,10)-(1,11) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/dstr_lex_state.txt b/test/mri/prism/snapshots/seattlerb/dstr_lex_state.txt
deleted file mode 100644
index 0e7f8ff83d9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dstr_lex_state.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,8))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 1)
-            │   └── @ EmbeddedStatementsNode (location: (1,1)-(1,7))
-            │       ├── opening_loc: (1,1)-(1,3) = "\#{"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,3)-(1,6))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (1,3)-(1,6))
-            │       │           ├── flags: ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :p
-            │       │           ├── message_loc: (1,3)-(1,4) = "p"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments:
-            │       │           │   @ ArgumentsNode (location: (1,4)-(1,6))
-            │       │           │   ├── flags: ∅
-            │       │           │   └── arguments: (length: 1)
-            │       │           │       └── @ SymbolNode (location: (1,4)-(1,6))
-            │       │           │           ├── flags: forced_us_ascii_encoding
-            │       │           │           ├── opening_loc: (1,4)-(1,5) = ":"
-            │       │           │           ├── value_loc: (1,5)-(1,6) = "a"
-            │       │           │           ├── closing_loc: ∅
-            │       │           │           └── unescaped: "a"
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       └── closing_loc: (1,6)-(1,7) = "}"
-            └── closing_loc: (1,7)-(1,8) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/dstr_str.txt b/test/mri/prism/snapshots/seattlerb/dstr_str.txt
deleted file mode 100644
index 42bd37a1ac9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dstr_str.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,10))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 2)
-            │   ├── @ EmbeddedStatementsNode (location: (1,1)-(1,7))
-            │   │   ├── opening_loc: (1,1)-(1,3) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,3)-(1,6))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ StringNode (location: (1,3)-(1,6))
-            │   │   │           ├── flags: ∅
-            │   │   │           ├── opening_loc: (1,3)-(1,4) = "'"
-            │   │   │           ├── content_loc: (1,4)-(1,5) = "a"
-            │   │   │           ├── closing_loc: (1,5)-(1,6) = "'"
-            │   │   │           └── unescaped: "a"
-            │   │   └── closing_loc: (1,6)-(1,7) = "}"
-            │   └── @ StringNode (location: (1,7)-(1,9))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,7)-(1,9) = " b"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: " b"
-            └── closing_loc: (1,9)-(1,10) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/dsym_esc_to_sym.txt b/test/mri/prism/snapshots/seattlerb/dsym_esc_to_sym.txt
deleted file mode 100644
index 7b1b68131e0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dsym_esc_to_sym.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ SymbolNode (location: (1,0)-(1,17))
-            ├── flags: forced_utf8_encoding
-            ├── opening_loc: (1,0)-(1,2) = ":\""
-            ├── value_loc: (1,2)-(1,16) = "Variet\\303\\240"
-            ├── closing_loc: (1,16)-(1,17) = "\""
-            └── unescaped: "Varietà"
diff --git a/test/mri/prism/snapshots/seattlerb/dsym_to_sym.txt b/test/mri/prism/snapshots/seattlerb/dsym_to_sym.txt
deleted file mode 100644
index eb7e435c630..00000000000
--- a/test/mri/prism/snapshots/seattlerb/dsym_to_sym.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,13))
-    └── body: (length: 2)
-        ├── @ AliasMethodNode (location: (1,0)-(1,17))
-        │   ├── new_name:
-        │   │   @ SymbolNode (location: (1,6)-(1,11))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (1,6)-(1,8) = ":\""
-        │   │   ├── value_loc: (1,8)-(1,10) = "<<"
-        │   │   ├── closing_loc: (1,10)-(1,11) = "\""
-        │   │   └── unescaped: "<<"
-        │   ├── old_name:
-        │   │   @ SymbolNode (location: (1,12)-(1,17))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (1,12)-(1,14) = ":\""
-        │   │   ├── value_loc: (1,14)-(1,16) = ">>"
-        │   │   ├── closing_loc: (1,16)-(1,17) = "\""
-        │   │   └── unescaped: ">>"
-        │   └── keyword_loc: (1,0)-(1,5) = "alias"
-        └── @ AliasMethodNode (location: (3,0)-(3,13))
-            ├── new_name:
-            │   @ SymbolNode (location: (3,6)-(3,9))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (3,6)-(3,7) = ":"
-            │   ├── value_loc: (3,7)-(3,9) = "<<"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "<<"
-            ├── old_name:
-            │   @ SymbolNode (location: (3,10)-(3,13))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (3,10)-(3,11) = ":"
-            │   ├── value_loc: (3,11)-(3,13) = ">>"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: ">>"
-            └── keyword_loc: (3,0)-(3,5) = "alias"
diff --git a/test/mri/prism/snapshots/seattlerb/eq_begin_line_numbers.txt b/test/mri/prism/snapshots/seattlerb/eq_begin_line_numbers.txt
deleted file mode 100644
index a5fc3951d69..00000000000
--- a/test/mri/prism/snapshots/seattlerb/eq_begin_line_numbers.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,1))
-    └── body: (length: 2)
-        ├── @ IntegerNode (location: (1,0)-(1,1))
-        │   ├── flags: decimal
-        │   └── value: 1
-        └── @ IntegerNode (location: (6,0)-(6,1))
-            ├── flags: decimal
-            └── value: 2
diff --git a/test/mri/prism/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt b/test/mri/prism/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
deleted file mode 100644
index 2103bde8cbf..00000000000
--- a/test/mri/prism/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,8))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :h
-            │   ├── message_loc: (1,0)-(1,1) = "h"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]=
-            ├── message_loc: (1,1)-(1,4) = "[k]"
-            ├── opening_loc: (1,1)-(1,2) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(3,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (1,2)-(1,3))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :k
-            │       │   ├── message_loc: (1,2)-(1,3) = "k"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ BeginNode (location: (1,5)-(3,8))
-            │           ├── begin_keyword_loc: (1,5)-(1,10) = "begin"
-            │           ├── statements:
-            │           │   @ StatementsNode (location: (2,7)-(2,9))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (2,7)-(2,9))
-            │           │           ├── flags: decimal
-            │           │           └── value: 42
-            │           ├── rescue_clause: ∅
-            │           ├── else_clause: ∅
-            │           ├── ensure_clause: ∅
-            │           └── end_keyword_loc: (3,5)-(3,8) = "end"
-            ├── closing_loc: (1,3)-(1,4) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/evstr_evstr.txt b/test/mri/prism/snapshots/seattlerb/evstr_evstr.txt
deleted file mode 100644
index ef7545c2f25..00000000000
--- a/test/mri/prism/snapshots/seattlerb/evstr_evstr.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,10))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 2)
-            │   ├── @ EmbeddedStatementsNode (location: (1,1)-(1,5))
-            │   │   ├── opening_loc: (1,1)-(1,3) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,3)-(1,4))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (1,3)-(1,4))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :a
-            │   │   │           ├── message_loc: (1,3)-(1,4) = "a"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (1,4)-(1,5) = "}"
-            │   └── @ EmbeddedStatementsNode (location: (1,5)-(1,9))
-            │       ├── opening_loc: (1,5)-(1,7) = "\#{"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,7)-(1,8))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (1,7)-(1,8))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :b
-            │       │           ├── message_loc: (1,7)-(1,8) = "b"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       └── closing_loc: (1,8)-(1,9) = "}"
-            └── closing_loc: (1,9)-(1,10) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/evstr_str.txt b/test/mri/prism/snapshots/seattlerb/evstr_str.txt
deleted file mode 100644
index 214491d6cf0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/evstr_str.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,8))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 2)
-            │   ├── @ EmbeddedStatementsNode (location: (1,1)-(1,5))
-            │   │   ├── opening_loc: (1,1)-(1,3) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,3)-(1,4))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (1,3)-(1,4))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :a
-            │   │   │           ├── message_loc: (1,3)-(1,4) = "a"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (1,4)-(1,5) = "}"
-            │   └── @ StringNode (location: (1,5)-(1,7))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,5)-(1,7) = " b"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: " b"
-            └── closing_loc: (1,7)-(1,8) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/expr_not_bang.txt b/test/mri/prism/snapshots/seattlerb/expr_not_bang.txt
deleted file mode 100644
index 0a289ab7bed..00000000000
--- a/test/mri/prism/snapshots/seattlerb/expr_not_bang.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,2)-(1,5))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,2)-(1,3) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,4)-(1,5))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :b
-            │   │           ├── message_loc: (1,4)-(1,5) = "b"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,1) = "!"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/f_kw.txt b/test/mri/prism/snapshots/seattlerb/f_kw.txt
deleted file mode 100644
index 4226137925a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/f_kw.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,15))
-            ├── name: :x
-            ├── name_loc: (1,4)-(1,5) = "x"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,10))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,6)-(1,10))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :k
-            │   │       ├── name_loc: (1,6)-(1,8) = "k:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,8)-(1,10))
-            │   │           ├── flags: decimal
-            │   │           └── value: 42
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:k]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,12)-(1,15) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/f_kw__required.txt b/test/mri/prism/snapshots/seattlerb/f_kw__required.txt
deleted file mode 100644
index f72f43e034e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/f_kw__required.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,13))
-            ├── name: :x
-            ├── name_loc: (1,4)-(1,5) = "x"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,8))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ RequiredKeywordParameterNode (location: (1,6)-(1,8))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :k
-            │   │       └── name_loc: (1,6)-(1,8) = "k:"
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:k]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,10)-(1,13) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/flip2_env_lvar.txt b/test/mri/prism/snapshots/seattlerb/flip2_env_lvar.txt
deleted file mode 100644
index 5a71ab6cda3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/flip2_env_lvar.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,16))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ FlipFlopNode (location: (1,3)-(1,7))
-            │   ├── flags: ∅
-            │   ├── left:
-            │   │   @ CallNode (location: (1,3)-(1,4))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,3)-(1,4) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── right:
-            │   │   @ CallNode (location: (1,6)-(1,7))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :b
-            │   │   ├── message_loc: (1,6)-(1,7) = "b"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   └── operator_loc: (1,4)-(1,6) = ".."
-            ├── then_keyword_loc: (1,8)-(1,12) = "then"
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (1,13)-(1,16) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/float_with_if_modifier.txt b/test/mri/prism/snapshots/seattlerb/float_with_if_modifier.txt
deleted file mode 100644
index 9c1da70f242..00000000000
--- a/test/mri/prism/snapshots/seattlerb/float_with_if_modifier.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,10))
-            ├── if_keyword_loc: (1,3)-(1,5) = "if"
-            ├── predicate:
-            │   @ TrueNode (location: (1,6)-(1,10))
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (1,0)-(1,3))
-            │   └── body: (length: 1)
-            │       └── @ FloatNode (location: (1,0)-(1,3))
-            │           └── value: 1.0
-            ├── consequent: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc__backslash_dos_format.txt b/test/mri/prism/snapshots/seattlerb/heredoc__backslash_dos_format.txt
deleted file mode 100644
index 6ba437e36a9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc__backslash_dos_format.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:str]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,12))
-            ├── name: :str
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,3) = "str"
-            ├── value:
-            │   @ StringNode (location: (1,6)-(1,12))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (1,6)-(1,12) = "<<-XXX"
-            │   ├── content_loc: (2,0)-(4,0) = "before\\\r\nafter\r\n"
-            │   ├── closing_loc: (4,0)-(5,0) = "XXX\r\n"
-            │   └── unescaped: "beforeafter\r\n"
-            └── operator_loc: (1,4)-(1,5) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_backslash_nl.txt b/test/mri/prism/snapshots/seattlerb/heredoc_backslash_nl.txt
deleted file mode 100644
index fc4c1784fef..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_backslash_nl.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,7))
-    └── body: (length: 2)
-        ├── @ StringNode (location: (1,0)-(3,1))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── content_loc: (1,1)-(3,0) = "  why would someone do this? \\\n  blah\n"
-        │   ├── closing_loc: (3,0)-(3,1) = "\""
-        │   └── unescaped: "  why would someone do this?   blah\n"
-        └── @ StringNode (location: (5,0)-(5,7))
-            ├── flags: ∅
-            ├── opening_loc: (5,0)-(5,7) = "<<-DESC"
-            ├── content_loc: (6,0)-(8,0) = "  why would someone do this? \\\n  blah\n"
-            ├── closing_loc: (8,0)-(9,0) = "DESC\n"
-            └── unescaped: "  why would someone do this?   blah\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_bad_hex_escape.txt b/test/mri/prism/snapshots/seattlerb/heredoc_bad_hex_escape.txt
deleted file mode 100644
index 2b1d776404b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_bad_hex_escape.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: [:s]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,9))
-            ├── name: :s
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "s"
-            ├── value:
-            │   @ StringNode (location: (1,4)-(1,9))
-            │   ├── flags: forced_utf8_encoding
-            │   ├── opening_loc: (1,4)-(1,9) = "<<eos"
-            │   ├── content_loc: (2,0)-(3,0) = "a\\xE9b\n"
-            │   ├── closing_loc: (3,0)-(4,0) = "eos\n"
-            │   └── unescaped: "a\xE9b\n"
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_bad_oct_escape.txt b/test/mri/prism/snapshots/seattlerb/heredoc_bad_oct_escape.txt
deleted file mode 100644
index 7a01f8d6d1c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_bad_oct_escape.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: [:s]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,10))
-            ├── name: :s
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "s"
-            ├── value:
-            │   @ StringNode (location: (1,4)-(1,10))
-            │   ├── flags: forced_utf8_encoding
-            │   ├── opening_loc: (1,4)-(1,10) = "<<-EOS"
-            │   ├── content_loc: (2,0)-(4,0) = "a\\247b\ncöd\n"
-            │   ├── closing_loc: (4,0)-(5,0) = "EOS\n"
-            │   └── unescaped: "a\xA7b\ncöd\n"
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_comma_arg.txt b/test/mri/prism/snapshots/seattlerb/heredoc_comma_arg.txt
deleted file mode 100644
index 888ebc809a8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_comma_arg.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,1))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(2,3))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (1,1)-(2,1))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (1,1)-(1,2) = "\""
-        │   │       ├── content_loc: (1,2)-(2,0) = "  some text\n"
-        │   │       ├── closing_loc: (2,0)-(2,1) = "\""
-        │   │       └── unescaped: "  some text\n"
-        │   ├── opening_loc: (1,0)-(1,1) = "["
-        │   └── closing_loc: (2,2)-(2,3) = "]"
-        └── @ ArrayNode (location: (4,0)-(7,1))
-            ├── flags: ∅
-            ├── elements: (length: 1)
-            │   └── @ StringNode (location: (4,1)-(4,8))
-            │       ├── flags: ∅
-            │       ├── opening_loc: (4,1)-(4,8) = "<<-FILE"
-            │       ├── content_loc: (5,0)-(6,0) = "  some text\n"
-            │       ├── closing_loc: (6,0)-(7,0) = "FILE\n"
-            │       └── unescaped: "  some text\n"
-            ├── opening_loc: (4,0)-(4,1) = "["
-            └── closing_loc: (7,0)-(7,1) = "]"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_lineno.txt b/test/mri/prism/snapshots/seattlerb/heredoc_lineno.txt
deleted file mode 100644
index a51ce71afe8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_lineno.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,6))
-├── locals: [:c, :d]
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,6))
-    └── body: (length: 2)
-        ├── @ LocalVariableWriteNode (location: (1,0)-(1,11))
-        │   ├── name: :c
-        │   ├── depth: 0
-        │   ├── name_loc: (1,0)-(1,1) = "c"
-        │   ├── value:
-        │   │   @ StringNode (location: (1,4)-(1,11))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (1,4)-(1,11) = "<<'CCC'"
-        │   │   ├── content_loc: (2,0)-(5,0) = "line2\nline3\nline4\n"
-        │   │   ├── closing_loc: (5,0)-(6,0) = "CCC\n"
-        │   │   └── unescaped: "line2\nline3\nline4\n"
-        │   └── operator_loc: (1,2)-(1,3) = "="
-        └── @ LocalVariableWriteNode (location: (7,0)-(7,6))
-            ├── name: :d
-            ├── depth: 0
-            ├── name_loc: (7,0)-(7,1) = "d"
-            ├── value:
-            │   @ IntegerNode (location: (7,4)-(7,6))
-            │   ├── flags: decimal
-            │   └── value: 42
-            └── operator_loc: (7,2)-(7,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_nested.txt b/test/mri/prism/snapshots/seattlerb/heredoc_nested.txt
deleted file mode 100644
index 4734068ba01..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_nested.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,2))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(7,2))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ InterpolatedStringNode (location: (1,1)-(1,4))
-            │   │   ├── opening_loc: (1,1)-(1,4) = "<<A"
-            │   │   ├── parts: (length: 3)
-            │   │   │   ├── @ EmbeddedStatementsNode (location: (2,0)-(2,6))
-            │   │   │   │   ├── opening_loc: (2,0)-(2,2) = "\#{"
-            │   │   │   │   ├── statements:
-            │   │   │   │   │   @ StatementsNode (location: (2,2)-(2,5))
-            │   │   │   │   │   └── body: (length: 1)
-            │   │   │   │   │       └── @ StringNode (location: (2,2)-(2,5))
-            │   │   │   │   │           ├── flags: ∅
-            │   │   │   │   │           ├── opening_loc: (2,2)-(2,5) = "<<B"
-            │   │   │   │   │           ├── content_loc: (3,0)-(4,0) = "b\n"
-            │   │   │   │   │           ├── closing_loc: (4,0)-(5,0) = "B\n"
-            │   │   │   │   │           └── unescaped: "b\n"
-            │   │   │   │   └── closing_loc: (2,5)-(2,6) = "}"
-            │   │   │   ├── @ StringNode (location: (2,6)-(3,0))
-            │   │   │   │   ├── flags: ∅
-            │   │   │   │   ├── opening_loc: ∅
-            │   │   │   │   ├── content_loc: (2,6)-(3,0) = "\n"
-            │   │   │   │   ├── closing_loc: ∅
-            │   │   │   │   └── unescaped: "\n"
-            │   │   │   └── @ StringNode (location: (5,0)-(6,0))
-            │   │   │       ├── flags: ∅
-            │   │   │       ├── opening_loc: ∅
-            │   │   │       ├── content_loc: (5,0)-(6,0) = "a\n"
-            │   │   │       ├── closing_loc: ∅
-            │   │   │       └── unescaped: "a\n"
-            │   │   └── closing_loc: (6,0)-(7,0) = "A\n"
-            │   └── @ IntegerNode (location: (7,0)-(7,1))
-            │       ├── flags: decimal
-            │       └── value: 0
-            ├── opening_loc: (1,0)-(1,1) = "["
-            └── closing_loc: (7,1)-(7,2) = "]"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly.txt
deleted file mode 100644
index 48f830befa8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,12))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ InterpolatedStringNode (location: (1,4)-(1,12))
-            │   ├── opening_loc: (1,4)-(1,12) = "<<~\"EOF\""
-            │   ├── parts: (length: 3)
-            │   │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (2,0)-(3,0) = "  x\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "x\n"
-            │   │   ├── @ StringNode (location: (3,0)-(4,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (3,0)-(4,0) = "  y\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "y\n"
-            │   │   └── @ StringNode (location: (4,0)-(5,0))
-            │   │       ├── flags: ∅
-            │   │       ├── opening_loc: ∅
-            │   │       ├── content_loc: (4,0)-(5,0) = "  z\n"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: "z\n"
-            │   └── closing_loc: (5,0)-(6,0) = "  EOF\n"
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
deleted file mode 100644
index 3a4ea011e2e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,20))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ CallNode (location: (1,4)-(1,20))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,4)-(1,7) = "foo"
-            │   ├── opening_loc: (1,7)-(1,8) = "("
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,8)-(1,19))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,8)-(1,19))
-            │   │           ├── flags: ∅
-            │   │           ├── receiver:
-            │   │           │   @ InterpolatedStringNode (location: (1,8)-(1,14))
-            │   │           │   ├── opening_loc: (1,8)-(1,14) = "<<~EOF"
-            │   │           │   ├── parts: (length: 3)
-            │   │           │   │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │           │   │   │   ├── flags: ∅
-            │   │           │   │   │   ├── opening_loc: ∅
-            │   │           │   │   │   ├── content_loc: (2,0)-(3,0) = "\n"
-            │   │           │   │   │   ├── closing_loc: ∅
-            │   │           │   │   │   └── unescaped: "\n"
-            │   │           │   │   ├── @ EmbeddedStatementsNode (location: (3,4)-(3,10))
-            │   │           │   │   │   ├── opening_loc: (3,4)-(3,6) = "\#{"
-            │   │           │   │   │   ├── statements:
-            │   │           │   │   │   │   @ StatementsNode (location: (3,6)-(3,9))
-            │   │           │   │   │   │   └── body: (length: 1)
-            │   │           │   │   │   │       └── @ CallNode (location: (3,6)-(3,9))
-            │   │           │   │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │           │   │   │   │           ├── receiver: ∅
-            │   │           │   │   │   │           ├── call_operator_loc: ∅
-            │   │           │   │   │   │           ├── name: :bar
-            │   │           │   │   │   │           ├── message_loc: (3,6)-(3,9) = "bar"
-            │   │           │   │   │   │           ├── opening_loc: ∅
-            │   │           │   │   │   │           ├── arguments: ∅
-            │   │           │   │   │   │           ├── closing_loc: ∅
-            │   │           │   │   │   │           └── block: ∅
-            │   │           │   │   │   └── closing_loc: (3,9)-(3,10) = "}"
-            │   │           │   │   └── @ StringNode (location: (3,10)-(4,0))
-            │   │           │   │       ├── flags: ∅
-            │   │           │   │       ├── opening_loc: ∅
-            │   │           │   │       ├── content_loc: (3,10)-(4,0) = "baz\n"
-            │   │           │   │       ├── closing_loc: ∅
-            │   │           │   │       └── unescaped: "baz\n"
-            │   │           │   └── closing_loc: (4,0)-(5,0) = "  EOF\n"
-            │   │           ├── call_operator_loc: (1,14)-(1,15) = "."
-            │   │           ├── name: :chop
-            │   │           ├── message_loc: (1,15)-(1,19) = "chop"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: (1,19)-(1,20) = ")"
-            │   └── block: ∅
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_blank_lines.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_blank_lines.txt
deleted file mode 100644
index 533f8ac460a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_blank_lines.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,10))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ InterpolatedStringNode (location: (1,4)-(1,10))
-            │   ├── opening_loc: (1,4)-(1,10) = "<<~EOF"
-            │   ├── parts: (length: 3)
-            │   │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (2,0)-(3,0) = "  x\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "x\n"
-            │   │   ├── @ StringNode (location: (3,0)-(4,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (3,0)-(4,0) = "\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "\n"
-            │   │   └── @ StringNode (location: (4,0)-(5,0))
-            │   │       ├── flags: ∅
-            │   │       ├── opening_loc: ∅
-            │   │       ├── content_loc: (4,0)-(5,0) = "  z\n"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: "z\n"
-            │   └── closing_loc: (5,0)-(6,0) = "EOF\n"
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_empty.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_empty.txt
deleted file mode 100644
index c998f19984b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_empty.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,4) = "<<~A"
-            ├── content_loc: (2,0)-(2,0) = ""
-            ├── closing_loc: (2,0)-(3,0) = "A\n"
-            └── unescaped: ""
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_interp.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_interp.txt
deleted file mode 100644
index 31360286c4e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_interp.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,10))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ InterpolatedStringNode (location: (1,4)-(1,10))
-            │   ├── opening_loc: (1,4)-(1,10) = "<<~EOF"
-            │   ├── parts: (length: 5)
-            │   │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (2,0)-(3,0) = "      w\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "    w\n"
-            │   │   ├── @ StringNode (location: (3,0)-(3,3))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (3,0)-(3,3) = "  x"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "x"
-            │   │   ├── @ EmbeddedStatementsNode (location: (3,3)-(3,8))
-            │   │   │   ├── opening_loc: (3,3)-(3,5) = "\#{"
-            │   │   │   ├── statements:
-            │   │   │   │   @ StatementsNode (location: (3,5)-(3,7))
-            │   │   │   │   └── body: (length: 1)
-            │   │   │   │       └── @ IntegerNode (location: (3,5)-(3,7))
-            │   │   │   │           ├── flags: decimal
-            │   │   │   │           └── value: 42
-            │   │   │   └── closing_loc: (3,7)-(3,8) = "}"
-            │   │   ├── @ StringNode (location: (3,8)-(4,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (3,8)-(4,0) = " y\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: " y\n"
-            │   │   └── @ StringNode (location: (4,0)-(5,0))
-            │   │       ├── flags: ∅
-            │   │       ├── opening_loc: ∅
-            │   │       ├── content_loc: (4,0)-(5,0) = "    z\n"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: "  z\n"
-            │   └── closing_loc: (5,0)-(6,0) = "  EOF\n"
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_no_indent.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_no_indent.txt
deleted file mode 100644
index 7c17bc48207..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_no_indent.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,4) = "<<~A"
-            ├── content_loc: (2,0)-(3,0) = "a\n"
-            ├── closing_loc: (3,0)-(4,0) = "A\n"
-            └── unescaped: "a\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_tabs.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_tabs.txt
deleted file mode 100644
index 8a0581917d0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_tabs.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,12))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ InterpolatedStringNode (location: (1,4)-(1,12))
-            │   ├── opening_loc: (1,4)-(1,12) = "<<~\"EOF\""
-            │   ├── parts: (length: 2)
-            │   │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (2,0)-(3,0) = "        blah blah\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "blah blah\n"
-            │   │   └── @ StringNode (location: (3,0)-(4,0))
-            │   │       ├── flags: ∅
-            │   │       ├── opening_loc: ∅
-            │   │       ├── content_loc: (3,0)-(4,0) = "\t blah blah\n"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: " blah blah\n"
-            │   └── closing_loc: (4,0)-(5,0) = "  EOF\n"
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_tabs_extra.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_tabs_extra.txt
deleted file mode 100644
index af85f11e688..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_tabs_extra.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,12))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ InterpolatedStringNode (location: (1,4)-(1,12))
-            │   ├── opening_loc: (1,4)-(1,12) = "<<~\"EOF\""
-            │   ├── parts: (length: 2)
-            │   │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (2,0)-(3,0) = "  blah blah\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "blah blah\n"
-            │   │   └── @ StringNode (location: (3,0)-(4,0))
-            │   │       ├── flags: ∅
-            │   │       ├── opening_loc: ∅
-            │   │       ├── content_loc: (3,0)-(4,0) = " \tblah blah\n"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: "\tblah blah\n"
-            │   └── closing_loc: (4,0)-(5,0) = "  EOF\n"
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt b/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt
deleted file mode 100644
index 3cba13a968b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,10))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ InterpolatedStringNode (location: (1,4)-(1,10))
-            │   ├── opening_loc: (1,4)-(1,10) = "<<~EOF"
-            │   ├── parts: (length: 3)
-            │   │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (2,0)-(3,0) = "  x\n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "x\n"
-            │   │   ├── @ StringNode (location: (3,0)-(4,0))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── content_loc: (3,0)-(4,0) = " \n"
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── unescaped: "\n"
-            │   │   └── @ StringNode (location: (4,0)-(5,0))
-            │   │       ├── flags: ∅
-            │   │       ├── opening_loc: ∅
-            │   │       ├── content_loc: (4,0)-(5,0) = "  z\n"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: "z\n"
-            │   └── closing_loc: (5,0)-(6,0) = "EOF\n"
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_trailing_slash_continued_call.txt b/test/mri/prism/snapshots/seattlerb/heredoc_trailing_slash_continued_call.txt
deleted file mode 100644
index bc05047b409..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_trailing_slash_continued_call.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(4,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ StringNode (location: (1,0)-(1,5))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (1,0)-(1,5) = "<<END"
-            │   ├── content_loc: (2,0)-(3,0) = "blah\n"
-            │   ├── closing_loc: (3,0)-(4,0) = "END\n"
-            │   └── unescaped: "blah\n"
-            ├── call_operator_loc: (4,0)-(4,1) = "."
-            ├── name: :strip
-            ├── message_loc: (4,1)-(4,6) = "strip"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_unicode.txt b/test/mri/prism/snapshots/seattlerb/heredoc_unicode.txt
deleted file mode 100644
index 2c728543248..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_unicode.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,9) = "<<OOTPÜT"
-            ├── content_loc: (2,0)-(3,0) = ".\n"
-            ├── closing_loc: (3,0)-(4,0) = "OOTPÜT\n"
-            └── unescaped: ".\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_carriage_return_escapes.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_carriage_return_escapes.txt
deleted file mode 100644
index 43bb8d5ea82..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_carriage_return_escapes.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,5) = "<<EOS"
-            ├── content_loc: (2,0)-(4,0) = "foo\\rbar\nbaz\\r\n"
-            ├── closing_loc: (4,0)-(5,0) = "EOS\n"
-            └── unescaped: "foo\rbar\nbaz\r\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_carriage_return_escapes_windows.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_carriage_return_escapes_windows.txt
deleted file mode 100644
index 21802c5707e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_carriage_return_escapes_windows.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,5) = "<<EOS"
-            ├── content_loc: (2,0)-(4,0) = "foo\\rbar\r\nbaz\\r\r\n"
-            ├── closing_loc: (4,0)-(5,0) = "EOS\r\n"
-            └── unescaped: "foo\rbar\r\nbaz\r\r\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
deleted file mode 100644
index dca03e71b0a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,7))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,7) = "<<'eot'"
-            ├── content_loc: (2,0)-(3,0) = "body\r\n"
-            ├── closing_loc: (3,0)-(4,0) = "eot\n"
-            └── unescaped: "body\r\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_returns.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_returns.txt
deleted file mode 100644
index 93fa1a16877..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_returns.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,5) = "<<EOS"
-            ├── content_loc: (2,0)-(4,0) = "foo\rbar\r\nbaz\n"
-            ├── closing_loc: (4,0)-(5,0) = "EOS\n"
-            └── unescaped: "foo\rbar\r\nbaz\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_returns_windows.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_returns_windows.txt
deleted file mode 100644
index 98b6e3fe118..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_extra_carriage_returns_windows.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,5) = "<<EOS"
-            ├── content_loc: (2,0)-(4,0) = "foo\rbar\r\r\nbaz\r\n"
-            ├── closing_loc: (4,0)-(5,0) = "EOS\r\n"
-            └── unescaped: "foo\rbar\r\r\nbaz\r\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt
deleted file mode 100644
index 0067e49809c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,5))
-            ├── opening_loc: (1,0)-(1,5) = "<<EOS"
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (2,0)-(2,5))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (2,0)-(2,5) = "foo\\r"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo\r"
-            │   ├── @ EmbeddedVariableNode (location: (2,5)-(2,10))
-            │   │   ├── operator_loc: (2,5)-(2,6) = "#"
-            │   │   └── variable:
-            │   │       @ InstanceVariableReadNode (location: (2,6)-(2,10))
-            │   │       └── name: :@bar
-            │   └── @ StringNode (location: (2,10)-(3,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (2,10)-(3,0) = "\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "\n"
-            └── closing_loc: (3,0)-(4,0) = "EOS\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
deleted file mode 100644
index dc8f8ae6d6b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,5))
-            ├── opening_loc: (1,0)-(1,5) = "<<EOS"
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (2,0)-(2,5))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (2,0)-(2,5) = "foo\\r"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo\r"
-            │   ├── @ EmbeddedVariableNode (location: (2,5)-(2,10))
-            │   │   ├── operator_loc: (2,5)-(2,6) = "#"
-            │   │   └── variable:
-            │   │       @ InstanceVariableReadNode (location: (2,6)-(2,10))
-            │   │       └── name: :@bar
-            │   └── @ StringNode (location: (2,10)-(3,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (2,10)-(3,0) = "\r\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "\r\n"
-            └── closing_loc: (3,0)-(4,0) = "EOS\r\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_not_global_interpolation.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_not_global_interpolation.txt
deleted file mode 100644
index 6e1648f6590..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_not_global_interpolation.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,10))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,10) = "<<-HEREDOC"
-            ├── content_loc: (2,0)-(3,0) = "\#${\n"
-            ├── closing_loc: (3,0)-(4,0) = "HEREDOC\n"
-            └── unescaped: "\#${\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_only_carriage_returns.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_only_carriage_returns.txt
deleted file mode 100644
index 6771f4afd76..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_only_carriage_returns.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,5) = "<<EOS"
-            ├── content_loc: (2,0)-(5,0) = "\r\n\r\r\n\\r\n"
-            ├── closing_loc: (5,0)-(6,0) = "EOS\n"
-            └── unescaped: "\r\n\r\r\n\r\n"
diff --git a/test/mri/prism/snapshots/seattlerb/heredoc_with_only_carriage_returns_windows.txt b/test/mri/prism/snapshots/seattlerb/heredoc_with_only_carriage_returns_windows.txt
deleted file mode 100644
index b0f5d369dc7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/heredoc_with_only_carriage_returns_windows.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,5) = "<<EOS"
-            ├── content_loc: (2,0)-(5,0) = "\r\r\n\r\r\r\n\\r\r\n"
-            ├── closing_loc: (5,0)-(6,0) = "EOS\r\n"
-            └── unescaped: "\r\r\n\r\r\r\n\r\r\n"
diff --git a/test/mri/prism/snapshots/seattlerb/if_elsif.txt b/test/mri/prism/snapshots/seattlerb/if_elsif.txt
deleted file mode 100644
index 034850158c2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/if_elsif.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,18))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ IntegerNode (location: (1,3)-(1,4))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent:
-            │   @ IfNode (location: (1,6)-(1,18))
-            │   ├── if_keyword_loc: (1,6)-(1,11) = "elsif"
-            │   ├── predicate:
-            │   │   @ IntegerNode (location: (1,12)-(1,13))
-            │   │   ├── flags: decimal
-            │   │   └── value: 2
-            │   ├── then_keyword_loc: ∅
-            │   ├── statements: ∅
-            │   ├── consequent: ∅
-            │   └── end_keyword_loc: (1,15)-(1,18) = "end"
-            └── end_keyword_loc: (1,15)-(1,18) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/if_symbol.txt b/test/mri/prism/snapshots/seattlerb/if_symbol.txt
deleted file mode 100644
index 85ec52b4c82..00000000000
--- a/test/mri/prism/snapshots/seattlerb/if_symbol.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,12))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (1,3)-(1,7))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :f
-            │   ├── message_loc: (1,3)-(1,4) = "f"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,5)-(1,7))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ SymbolNode (location: (1,5)-(1,7))
-            │   │           ├── flags: forced_us_ascii_encoding
-            │   │           ├── opening_loc: (1,5)-(1,6) = ":"
-            │   │           ├── value_loc: (1,6)-(1,7) = "x"
-            │   │           ├── closing_loc: ∅
-            │   │           └── unescaped: "x"
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (1,9)-(1,12) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/in_expr_no_case.txt b/test/mri/prism/snapshots/seattlerb/in_expr_no_case.txt
deleted file mode 100644
index 0a026c08dbc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/in_expr_no_case.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ MatchPredicateNode (location: (1,0)-(1,16))
-            ├── value:
-            │   @ StringNode (location: (1,0)-(1,6))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (1,0)-(1,1) = "'"
-            │   ├── content_loc: (1,1)-(1,5) = "woot"
-            │   ├── closing_loc: (1,5)-(1,6) = "'"
-            │   └── unescaped: "woot"
-            ├── pattern:
-            │   @ ConstantReadNode (location: (1,10)-(1,16))
-            │   └── name: :String
-            └── operator_loc: (1,7)-(1,9) = "in"
diff --git a/test/mri/prism/snapshots/seattlerb/index_0.txt b/test/mri/prism/snapshots/seattlerb/index_0.txt
deleted file mode 100644
index 9771e9c2bd4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/index_0.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]=
-            ├── message_loc: (1,1)-(1,3) = "[]"
-            ├── opening_loc: (1,1)-(1,2) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,6)-(1,7))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (1,6)-(1,7) = "b"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: (1,2)-(1,3) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/index_0_opasgn.txt b/test/mri/prism/snapshots/seattlerb/index_0_opasgn.txt
deleted file mode 100644
index 239a5492535..00000000000
--- a/test/mri/prism/snapshots/seattlerb/index_0_opasgn.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ IndexOperatorWriteNode (location: (1,0)-(1,8))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── opening_loc: (1,1)-(1,2) = "["
-            ├── arguments: ∅
-            ├── closing_loc: (1,2)-(1,3) = "]"
-            ├── block: ∅
-            ├── operator: :+
-            ├── operator_loc: (1,4)-(1,6) = "+="
-            └── value:
-                @ CallNode (location: (1,7)-(1,8))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :b
-                ├── message_loc: (1,7)-(1,8) = "b"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/integer_with_if_modifier.txt b/test/mri/prism/snapshots/seattlerb/integer_with_if_modifier.txt
deleted file mode 100644
index 2108c1f0a0a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/integer_with_if_modifier.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,12))
-            ├── if_keyword_loc: (1,5)-(1,7) = "if"
-            ├── predicate:
-            │   @ TrueNode (location: (1,8)-(1,12))
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (1,0)-(1,5))
-            │   └── body: (length: 1)
-            │       └── @ IntegerNode (location: (1,0)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 1234
-            ├── consequent: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/interpolated_symbol_array_line_breaks.txt b/test/mri/prism/snapshots/seattlerb/interpolated_symbol_array_line_breaks.txt
deleted file mode 100644
index ab231cf539a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/interpolated_symbol_array_line_breaks.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,1))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(4,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ SymbolNode (location: (2,0)-(2,1))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (2,0)-(2,1) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ SymbolNode (location: (3,0)-(3,1))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (3,0)-(3,1) = "b"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b"
-        │   ├── opening_loc: (1,0)-(1,3) = "%I("
-        │   └── closing_loc: (4,0)-(4,1) = ")"
-        └── @ IntegerNode (location: (5,0)-(5,1))
-            ├── flags: decimal
-            └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/interpolated_word_array_line_breaks.txt b/test/mri/prism/snapshots/seattlerb/interpolated_word_array_line_breaks.txt
deleted file mode 100644
index 933e5de6272..00000000000
--- a/test/mri/prism/snapshots/seattlerb/interpolated_word_array_line_breaks.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,1))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(4,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (2,0)-(2,1))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (2,0)-(2,1) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ StringNode (location: (3,0)-(3,1))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (3,0)-(3,1) = "b"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b"
-        │   ├── opening_loc: (1,0)-(1,3) = "%W("
-        │   └── closing_loc: (4,0)-(4,1) = ")"
-        └── @ IntegerNode (location: (5,0)-(5,1))
-            ├── flags: decimal
-            └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_1.txt b/test/mri/prism/snapshots/seattlerb/iter_args_1.txt
deleted file mode 100644
index f76bbfc559c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_1.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,11))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,11))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,9))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,8))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   └── @ RequiredParameterNode (location: (1,7)-(1,8))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,8)-(1,9) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,10)-(1,11) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_10_1.txt b/test/mri/prism/snapshots/seattlerb/iter_args_10_1.txt
deleted file mode 100644
index b8aaae800a5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_10_1.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,21))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,21))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,21))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,19))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,18))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "b"
-                │   │   │       ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,12)-(1,14))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,16)-(1,18))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :c
-                │   │   │   ├── name_loc: (1,17)-(1,18) = "c"
-                │   │   │   └── operator_loc: (1,16)-(1,17) = "*"
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,18)-(1,19) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,20)-(1,21) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_10_2.txt b/test/mri/prism/snapshots/seattlerb/iter_args_10_2.txt
deleted file mode 100644
index 833f6429dc7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_10_2.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,25))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,25))
-                ├── locals: [:a, :b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,23))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,22))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "b"
-                │   │   │       ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,12)-(1,14))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,16)-(1,18))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :c
-                │   │   │   ├── name_loc: (1,17)-(1,18) = "c"
-                │   │   │   └── operator_loc: (1,16)-(1,17) = "*"
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,20)-(1,22))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :d
-                │   │       ├── name_loc: (1,21)-(1,22) = "d"
-                │   │       └── operator_loc: (1,20)-(1,21) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,22)-(1,23) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,24)-(1,25) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_11_1.txt b/test/mri/prism/snapshots/seattlerb/iter_args_11_1.txt
deleted file mode 100644
index e4d2f794742..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_11_1.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,24))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,24))
-                ├── locals: [:a, :b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,22))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,21))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "b"
-                │   │   │       ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,12)-(1,14))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,16)-(1,18))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :c
-                │   │   │   ├── name_loc: (1,17)-(1,18) = "c"
-                │   │   │   └── operator_loc: (1,16)-(1,17) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,20)-(1,21))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :d
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,21)-(1,22) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,23)-(1,24) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_11_2.txt b/test/mri/prism/snapshots/seattlerb/iter_args_11_2.txt
deleted file mode 100644
index 07a0e5ed9db..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_11_2.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,28))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,28))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,28))
-                ├── locals: [:a, :b, :c, :d, :e]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,26))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,25))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "b"
-                │   │   │       ├── operator_loc: (1,10)-(1,11) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,12)-(1,14))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,16)-(1,18))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :c
-                │   │   │   ├── name_loc: (1,17)-(1,18) = "c"
-                │   │   │   └── operator_loc: (1,16)-(1,17) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,20)-(1,21))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :d
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,23)-(1,25))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :e
-                │   │       ├── name_loc: (1,24)-(1,25) = "e"
-                │   │       └── operator_loc: (1,23)-(1,24) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,25)-(1,26) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,27)-(1,28) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_2__19.txt b/test/mri/prism/snapshots/seattlerb/iter_args_2__19.txt
deleted file mode 100644
index a905286f479..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_2__19.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,14))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,12))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,11))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,11))
-                │   │   │       ├── lefts: (length: 2)
-                │   │   │       │   ├── @ RequiredParameterNode (location: (1,6)-(1,7))
-                │   │   │       │   │   ├── flags: ∅
-                │   │   │       │   │   └── name: :a
-                │   │   │       │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       │       ├── flags: ∅
-                │   │   │       │       └── name: :b
-                │   │   │       ├── rest: ∅
-                │   │   │       ├── rights: (length: 0)
-                │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-                │   │   │       └── rparen_loc: (1,10)-(1,11) = ")"
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,11)-(1,12) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,13)-(1,14) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_3.txt b/test/mri/prism/snapshots/seattlerb/iter_args_3.txt
deleted file mode 100644
index 66782f07938..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_3.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,20))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,20))
-                ├── locals: [:a, :b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,18))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,17))
-                │   │   ├── requireds: (length: 3)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :a
-                │   │   │   ├── @ MultiTargetNode (location: (1,8)-(1,14))
-                │   │   │   │   ├── lefts: (length: 2)
-                │   │   │   │   │   ├── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │   │   │   │   ├── flags: ∅
-                │   │   │   │   │   │   └── name: :b
-                │   │   │   │   │   └── @ RequiredParameterNode (location: (1,12)-(1,13))
-                │   │   │   │   │       ├── flags: ∅
-                │   │   │   │   │       └── name: :c
-                │   │   │   │   ├── rest: ∅
-                │   │   │   │   ├── rights: (length: 0)
-                │   │   │   │   ├── lparen_loc: (1,8)-(1,9) = "("
-                │   │   │   │   └── rparen_loc: (1,13)-(1,14) = ")"
-                │   │   │   └── @ RequiredParameterNode (location: (1,16)-(1,17))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :d
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,17)-(1,18) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,19)-(1,20) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_4.txt b/test/mri/prism/snapshots/seattlerb/iter_args_4.txt
deleted file mode 100644
index c4f2b47a035..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_4.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,16))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,14))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,13))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,8)-(1,10))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :b
-                │   │   │   ├── name_loc: (1,9)-(1,10) = "b"
-                │   │   │   └── operator_loc: (1,8)-(1,9) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,12)-(1,13))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,13)-(1,14) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,15)-(1,16) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_5.txt b/test/mri/prism/snapshots/seattlerb/iter_args_5.txt
deleted file mode 100644
index 44940629b40..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_5.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,13))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,11))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,10))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,8)-(1,10))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :b
-                │   │       ├── name_loc: (1,9)-(1,10) = "b"
-                │   │       └── operator_loc: (1,8)-(1,9) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,10)-(1,11) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,12)-(1,13) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_6.txt b/test/mri/prism/snapshots/seattlerb/iter_args_6.txt
deleted file mode 100644
index df3a405dffd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_6.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,18))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,18))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,16))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,15))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,5)-(1,6))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :a
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,8)-(1,12))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,8)-(1,9) = "b"
-                │   │   │       ├── operator_loc: (1,9)-(1,10) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,10)-(1,12))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,14)-(1,15))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,15)-(1,16) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,17)-(1,18) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_7_1.txt b/test/mri/prism/snapshots/seattlerb/iter_args_7_1.txt
deleted file mode 100644
index 3f65fb8dc0b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_7_1.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,18))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,18))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,16))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,15))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :a
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "a"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,9)-(1,11))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,13)-(1,15))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :b
-                │   │   │   ├── name_loc: (1,14)-(1,15) = "b"
-                │   │   │   └── operator_loc: (1,13)-(1,14) = "*"
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,15)-(1,16) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,17)-(1,18) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_7_2.txt b/test/mri/prism/snapshots/seattlerb/iter_args_7_2.txt
deleted file mode 100644
index 112a5a1b6b6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_7_2.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,22))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,22))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,22))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,20))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,19))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :a
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "a"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,9)-(1,11))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,13)-(1,15))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :b
-                │   │   │   ├── name_loc: (1,14)-(1,15) = "b"
-                │   │   │   └── operator_loc: (1,13)-(1,14) = "*"
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,17)-(1,19))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :c
-                │   │       ├── name_loc: (1,18)-(1,19) = "c"
-                │   │       └── operator_loc: (1,17)-(1,18) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,19)-(1,20) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,21)-(1,22) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_8_1.txt b/test/mri/prism/snapshots/seattlerb/iter_args_8_1.txt
deleted file mode 100644
index 5591fcfc695..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_8_1.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,21))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,21))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,21))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,19))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,18))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :a
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "a"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,9)-(1,11))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,13)-(1,15))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :b
-                │   │   │   ├── name_loc: (1,14)-(1,15) = "b"
-                │   │   │   └── operator_loc: (1,13)-(1,14) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,17)-(1,18))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,18)-(1,19) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,20)-(1,21) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_8_2.txt b/test/mri/prism/snapshots/seattlerb/iter_args_8_2.txt
deleted file mode 100644
index 8cb061d5a7a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_8_2.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,25))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,25))
-                ├── locals: [:a, :b, :c, :d]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,23))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,22))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :a
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "a"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,9)-(1,11))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest:
-                │   │   │   @ RestParameterNode (location: (1,13)-(1,15))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :b
-                │   │   │   ├── name_loc: (1,14)-(1,15) = "b"
-                │   │   │   └── operator_loc: (1,13)-(1,14) = "*"
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,17)-(1,18))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,20)-(1,22))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :d
-                │   │       ├── name_loc: (1,21)-(1,22) = "d"
-                │   │       └── operator_loc: (1,20)-(1,21) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,22)-(1,23) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,24)-(1,25) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_9_1.txt b/test/mri/prism/snapshots/seattlerb/iter_args_9_1.txt
deleted file mode 100644
index 70b2a6cb191..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_9_1.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:a, :b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :a
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "a"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,9)-(1,11))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,13)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_args_9_2.txt b/test/mri/prism/snapshots/seattlerb/iter_args_9_2.txt
deleted file mode 100644
index cad8b47e7f6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_args_9_2.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,21))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,21))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,21))
-                ├── locals: [:a, :b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,19))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,18))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 1)
-                │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,11))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :a
-                │   │   │       ├── name_loc: (1,5)-(1,6) = "a"
-                │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,9)-(1,11))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 42
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,13)-(1,14))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :b
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block:
-                │   │       @ BlockParameterNode (location: (1,16)-(1,18))
-                │   │       ├── flags: ∅
-                │   │       ├── name: :c
-                │   │       ├── name_loc: (1,17)-(1,18) = "c"
-                │   │       └── operator_loc: (1,16)-(1,17) = "&"
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,18)-(1,19) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,20)-(1,21) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_kwarg.txt b/test/mri/prism/snapshots/seattlerb/iter_kwarg.txt
deleted file mode 100644
index 13b90276617..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_kwarg.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,12))
-                ├── locals: [:b]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,10))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,9))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 1)
-                │   │   │   └── @ OptionalKeywordParameterNode (location: (1,5)-(1,9))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,5)-(1,7) = "b:"
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,8)-(1,9))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,9)-(1,10) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,11)-(1,12) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt b/test/mri/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
deleted file mode 100644
index 321e15cb2bc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(1,17))
-                ├── locals: [:b, :c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,4)-(1,15))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,5)-(1,14))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 1)
-                │   │   │   └── @ OptionalKeywordParameterNode (location: (1,5)-(1,9))
-                │   │   │       ├── flags: ∅
-                │   │   │       ├── name: :b
-                │   │   │       ├── name_loc: (1,5)-(1,7) = "b:"
-                │   │   │       └── value:
-                │   │   │           @ IntegerNode (location: (1,8)-(1,9))
-                │   │   │           ├── flags: decimal
-                │   │   │           └── value: 1
-                │   │   ├── keyword_rest:
-                │   │   │   @ KeywordRestParameterNode (location: (1,11)-(1,14))
-                │   │   │   ├── flags: ∅
-                │   │   │   ├── name: :c
-                │   │   │   ├── name_loc: (1,13)-(1,14) = "c"
-                │   │   │   └── operator_loc: (1,11)-(1,13) = "**"
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,4)-(1,5) = "|"
-                │   └── closing_loc: (1,14)-(1,15) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,2)-(1,3) = "{"
-                └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/label_vs_string.txt b/test/mri/prism/snapshots/seattlerb/label_vs_string.txt
deleted file mode 100644
index c8d7af8f48b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/label_vs_string.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,1))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(2,1))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,4))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :_buf
-            │   ├── message_loc: (1,0)-(1,4) = "_buf"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :<<
-            ├── message_loc: (1,5)-(1,7) = "<<"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,8)-(2,1))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ StringNode (location: (1,8)-(2,1))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (1,8)-(1,9) = "'"
-            │           ├── content_loc: (1,9)-(2,0) = ":\n"
-            │           ├── closing_loc: (2,0)-(2,1) = "'"
-            │           └── unescaped: ":\n"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/lambda_do_vs_brace.txt b/test/mri/prism/snapshots/seattlerb/lambda_do_vs_brace.txt
deleted file mode 100644
index afc0d3d56fe..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lambda_do_vs_brace.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,9))
-    └── body: (length: 4)
-        ├── @ CallNode (location: (1,0)-(1,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (1,0)-(1,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ LambdaNode (location: (1,2)-(1,11))
-        │   │           ├── locals: []
-        │   │           ├── operator_loc: (1,2)-(1,4) = "->"
-        │   │           ├── opening_loc: (1,5)-(1,7) = "do"
-        │   │           ├── closing_loc: (1,8)-(1,11) = "end"
-        │   │           ├── parameters: ∅
-        │   │           └── body: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,7))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (3,0)-(3,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,2)-(3,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ LambdaNode (location: (3,2)-(3,7))
-        │   │           ├── locals: []
-        │   │           ├── operator_loc: (3,2)-(3,4) = "->"
-        │   │           ├── opening_loc: (3,5)-(3,6) = "{"
-        │   │           ├── closing_loc: (3,6)-(3,7) = "}"
-        │   │           ├── parameters: ∅
-        │   │           └── body: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,13))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (5,0)-(5,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,2)-(5,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ LambdaNode (location: (5,2)-(5,13))
-        │   │           ├── locals: []
-        │   │           ├── operator_loc: (5,2)-(5,4) = "->"
-        │   │           ├── opening_loc: (5,7)-(5,9) = "do"
-        │   │           ├── closing_loc: (5,10)-(5,13) = "end"
-        │   │           ├── parameters:
-        │   │           │   @ BlockParametersNode (location: (5,4)-(5,6))
-        │   │           │   ├── parameters: ∅
-        │   │           │   ├── locals: (length: 0)
-        │   │           │   ├── opening_loc: (5,4)-(5,5) = "("
-        │   │           │   └── closing_loc: (5,5)-(5,6) = ")"
-        │   │           └── body: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (7,0)-(7,9))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (7,0)-(7,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (7,2)-(7,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LambdaNode (location: (7,2)-(7,9))
-            │           ├── locals: []
-            │           ├── operator_loc: (7,2)-(7,4) = "->"
-            │           ├── opening_loc: (7,7)-(7,8) = "{"
-            │           ├── closing_loc: (7,8)-(7,9) = "}"
-            │           ├── parameters:
-            │           │   @ BlockParametersNode (location: (7,4)-(7,6))
-            │           │   ├── parameters: ∅
-            │           │   ├── locals: (length: 0)
-            │           │   ├── opening_loc: (7,4)-(7,5) = "("
-            │           │   └── closing_loc: (7,5)-(7,6) = ")"
-            │           └── body: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/lasgn_arg_rescue_arg.txt b/test/mri/prism/snapshots/seattlerb/lasgn_arg_rescue_arg.txt
deleted file mode 100644
index 7bbef7055a1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lasgn_arg_rescue_arg.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,14))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ RescueModifierNode (location: (1,4)-(1,14))
-            │   ├── expression:
-            │   │   @ IntegerNode (location: (1,4)-(1,5))
-            │   │   ├── flags: decimal
-            │   │   └── value: 1
-            │   ├── keyword_loc: (1,6)-(1,12) = "rescue"
-            │   └── rescue_expression:
-            │       @ IntegerNode (location: (1,13)-(1,14))
-            │       ├── flags: decimal
-            │       └── value: 2
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/lasgn_call_bracket_rescue_arg.txt b/test/mri/prism/snapshots/seattlerb/lasgn_call_bracket_rescue_arg.txt
deleted file mode 100644
index 521fceaf1b7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lasgn_call_bracket_rescue_arg.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,17))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ RescueModifierNode (location: (1,4)-(1,17))
-            │   ├── expression:
-            │   │   @ CallNode (location: (1,4)-(1,8))
-            │   │   ├── flags: ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :b
-            │   │   ├── message_loc: (1,4)-(1,5) = "b"
-            │   │   ├── opening_loc: (1,5)-(1,6) = "("
-            │   │   ├── arguments:
-            │   │   │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── arguments: (length: 1)
-            │   │   │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 1
-            │   │   ├── closing_loc: (1,7)-(1,8) = ")"
-            │   │   └── block: ∅
-            │   ├── keyword_loc: (1,9)-(1,15) = "rescue"
-            │   └── rescue_expression:
-            │       @ IntegerNode (location: (1,16)-(1,17))
-            │       ├── flags: decimal
-            │       └── value: 2
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/lasgn_call_nobracket_rescue_arg.txt b/test/mri/prism/snapshots/seattlerb/lasgn_call_nobracket_rescue_arg.txt
deleted file mode 100644
index d730fb51cbe..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lasgn_call_nobracket_rescue_arg.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,16))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ RescueModifierNode (location: (1,4)-(1,16))
-            │   ├── expression:
-            │   │   @ CallNode (location: (1,4)-(1,7))
-            │   │   ├── flags: ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :b
-            │   │   ├── message_loc: (1,4)-(1,5) = "b"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments:
-            │   │   │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── arguments: (length: 1)
-            │   │   │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 1
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── keyword_loc: (1,8)-(1,14) = "rescue"
-            │   └── rescue_expression:
-            │       @ IntegerNode (location: (1,15)-(1,16))
-            │       ├── flags: decimal
-            │       └── value: 2
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/lasgn_command.txt b/test/mri/prism/snapshots/seattlerb/lasgn_command.txt
deleted file mode 100644
index d6ed787b26b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lasgn_command.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,9))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ CallNode (location: (1,4)-(1,9))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,4)-(1,5))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :b
-            │   │   ├── message_loc: (1,4)-(1,5) = "b"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,5)-(1,6) = "."
-            │   ├── name: :c
-            │   ├── message_loc: (1,6)-(1,7) = "c"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,8)-(1,9))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ IntegerNode (location: (1,8)-(1,9))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/lasgn_env.txt b/test/mri/prism/snapshots/seattlerb/lasgn_env.txt
deleted file mode 100644
index a0ada99a9bc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lasgn_env.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,6))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ IntegerNode (location: (1,4)-(1,6))
-            │   ├── flags: decimal
-            │   └── value: 42
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/lasgn_ivar_env.txt b/test/mri/prism/snapshots/seattlerb/lasgn_ivar_env.txt
deleted file mode 100644
index 56757304770..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lasgn_ivar_env.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ InstanceVariableWriteNode (location: (1,0)-(1,7))
-            ├── name: :@a
-            ├── name_loc: (1,0)-(1,2) = "@a"
-            ├── value:
-            │   @ IntegerNode (location: (1,5)-(1,7))
-            │   ├── flags: decimal
-            │   └── value: 42
-            └── operator_loc: (1,3)-(1,4) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/lasgn_lasgn_command_call.txt b/test/mri/prism/snapshots/seattlerb/lasgn_lasgn_command_call.txt
deleted file mode 100644
index bb4b64e88cd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lasgn_lasgn_command_call.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,11))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ LocalVariableWriteNode (location: (1,4)-(1,11))
-            │   ├── name: :b
-            │   ├── depth: 0
-            │   ├── name_loc: (1,4)-(1,5) = "b"
-            │   ├── value:
-            │   │   @ CallNode (location: (1,8)-(1,11))
-            │   │   ├── flags: ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :c
-            │   │   ├── message_loc: (1,8)-(1,9) = "c"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments:
-            │   │   │   @ ArgumentsNode (location: (1,10)-(1,11))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── arguments: (length: 1)
-            │   │   │       └── @ IntegerNode (location: (1,10)-(1,11))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 1
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   └── operator_loc: (1,6)-(1,7) = "="
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/lasgn_middle_splat.txt b/test/mri/prism/snapshots/seattlerb/lasgn_middle_splat.txt
deleted file mode 100644
index c113fef13fc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/lasgn_middle_splat.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,12))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── value:
-            │   @ ArrayNode (location: (1,4)-(1,12))
-            │   ├── flags: contains_splat
-            │   ├── elements: (length: 3)
-            │   │   ├── @ CallNode (location: (1,4)-(1,5))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :b
-            │   │   │   ├── message_loc: (1,4)-(1,5) = "b"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── @ SplatNode (location: (1,7)-(1,9))
-            │   │   │   ├── operator_loc: (1,7)-(1,8) = "*"
-            │   │   │   └── expression:
-            │   │   │       @ CallNode (location: (1,8)-(1,9))
-            │   │   │       ├── flags: variable_call, ignore_visibility
-            │   │   │       ├── receiver: ∅
-            │   │   │       ├── call_operator_loc: ∅
-            │   │   │       ├── name: :c
-            │   │   │       ├── message_loc: (1,8)-(1,9) = "c"
-            │   │   │       ├── opening_loc: ∅
-            │   │   │       ├── arguments: ∅
-            │   │   │       ├── closing_loc: ∅
-            │   │   │       └── block: ∅
-            │   │   └── @ CallNode (location: (1,11)-(1,12))
-            │   │       ├── flags: variable_call, ignore_visibility
-            │   │       ├── receiver: ∅
-            │   │       ├── call_operator_loc: ∅
-            │   │       ├── name: :d
-            │   │       ├── message_loc: (1,11)-(1,12) = "d"
-            │   │       ├── opening_loc: ∅
-            │   │       ├── arguments: ∅
-            │   │       ├── closing_loc: ∅
-            │   │       └── block: ∅
-            │   ├── opening_loc: ∅
-            │   └── closing_loc: ∅
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/magic_encoding_comment.txt b/test/mri/prism/snapshots/seattlerb/magic_encoding_comment.txt
deleted file mode 100644
index 9c4ca884d2e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/magic_encoding_comment.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (2,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (2,0)-(3,3))
-    └── body: (length: 1)
-        └── @ ClassNode (location: (2,0)-(3,3))
-            ├── locals: []
-            ├── class_keyword_loc: (2,0)-(2,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (2,6)-(2,34))
-            │   └── name: :ExampleUTF8ClassNameVarietà
-            ├── inheritance_operator_loc: ∅
-            ├── superclass: ∅
-            ├── body:
-            │   @ StatementsNode (location: (2,36)-(2,68))
-            │   └── body: (length: 1)
-            │       └── @ DefNode (location: (2,36)-(2,68))
-            │           ├── name: :è
-            │           ├── name_loc: (2,45)-(2,47) = "è"
-            │           ├── receiver:
-            │           │   @ SelfNode (location: (2,40)-(2,44))
-            │           ├── parameters: ∅
-            │           ├── body:
-            │           │   @ StatementsNode (location: (2,49)-(2,63))
-            │           │   └── body: (length: 1)
-            │           │       └── @ LocalVariableWriteNode (location: (2,49)-(2,63))
-            │           │           ├── name: :così
-            │           │           ├── depth: 0
-            │           │           ├── name_loc: (2,49)-(2,54) = "così"
-            │           │           ├── value:
-            │           │           │   @ SymbolNode (location: (2,57)-(2,63))
-            │           │           │   ├── flags: ∅
-            │           │           │   ├── opening_loc: (2,57)-(2,58) = ":"
-            │           │           │   ├── value_loc: (2,58)-(2,63) = "però"
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── unescaped: "però"
-            │           │           └── operator_loc: (2,55)-(2,56) = "="
-            │           ├── locals: [:così]
-            │           ├── def_keyword_loc: (2,36)-(2,39) = "def"
-            │           ├── operator_loc: (2,44)-(2,45) = "."
-            │           ├── lparen_loc: ∅
-            │           ├── rparen_loc: ∅
-            │           ├── equal_loc: ∅
-            │           └── end_keyword_loc: (2,65)-(2,68) = "end"
-            ├── end_keyword_loc: (3,0)-(3,3) = "end"
-            └── name: :ExampleUTF8ClassNameVarietà
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_anon_splat_arg.txt b/test/mri/prism/snapshots/seattlerb/masgn_anon_splat_arg.txt
deleted file mode 100644
index 9ebcab30952..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_anon_splat_arg.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,8))
-            ├── lefts: (length: 0)
-            ├── rest:
-            │   @ SplatNode (location: (1,0)-(1,1))
-            │   ├── operator_loc: (1,0)-(1,1) = "*"
-            │   └── expression: ∅
-            ├── rights: (length: 1)
-            │   └── @ LocalVariableTargetNode (location: (1,3)-(1,4))
-            │       ├── name: :a
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,5)-(1,6) = "="
-            └── value:
-                @ CallNode (location: (1,7)-(1,8))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :b
-                ├── message_loc: (1,7)-(1,8) = "b"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_arg_colon_arg.txt b/test/mri/prism/snapshots/seattlerb/masgn_arg_colon_arg.txt
deleted file mode 100644
index 83613c42d1f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_arg_colon_arg.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,11))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ CallTargetNode (location: (1,3)-(1,7))
-            │       ├── flags: ∅
-            │       ├── receiver:
-            │       │   @ CallNode (location: (1,3)-(1,4))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :b
-            │       │   ├── message_loc: (1,3)-(1,4) = "b"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       ├── call_operator_loc: (1,4)-(1,6) = "::"
-            │       ├── name: :c=
-            │       └── message_loc: (1,6)-(1,7) = "c"
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,8)-(1,9) = "="
-            └── value:
-                @ CallNode (location: (1,10)-(1,11))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :d
-                ├── message_loc: (1,10)-(1,11) = "d"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_arg_ident.txt b/test/mri/prism/snapshots/seattlerb/masgn_arg_ident.txt
deleted file mode 100644
index f4c99648f08..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_arg_ident.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,10))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ CallTargetNode (location: (1,3)-(1,6))
-            │       ├── flags: ∅
-            │       ├── receiver:
-            │       │   @ CallNode (location: (1,3)-(1,4))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :b
-            │       │   ├── message_loc: (1,3)-(1,4) = "b"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       ├── call_operator_loc: (1,4)-(1,5) = "."
-            │       ├── name: :C=
-            │       └── message_loc: (1,5)-(1,6) = "C"
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,7)-(1,8) = "="
-            └── value:
-                @ CallNode (location: (1,9)-(1,10))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :d
-                ├── message_loc: (1,9)-(1,10) = "d"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_arg_splat_arg.txt b/test/mri/prism/snapshots/seattlerb/masgn_arg_splat_arg.txt
deleted file mode 100644
index 48e58de0765..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_arg_splat_arg.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:a, :b, :c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,12))
-            ├── lefts: (length: 1)
-            │   └── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │       ├── name: :a
-            │       └── depth: 0
-            ├── rest:
-            │   @ SplatNode (location: (1,3)-(1,5))
-            │   ├── operator_loc: (1,3)-(1,4) = "*"
-            │   └── expression:
-            │       @ LocalVariableTargetNode (location: (1,4)-(1,5))
-            │       ├── name: :b
-            │       └── depth: 0
-            ├── rights: (length: 1)
-            │   └── @ LocalVariableTargetNode (location: (1,7)-(1,8))
-            │       ├── name: :c
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,9)-(1,10) = "="
-            └── value:
-                @ CallNode (location: (1,11)-(1,12))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :d
-                ├── message_loc: (1,11)-(1,12) = "d"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_colon2.txt b/test/mri/prism/snapshots/seattlerb/masgn_colon2.txt
deleted file mode 100644
index 73ce8a71da2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_colon2.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,14))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ ConstantPathTargetNode (location: (1,3)-(1,7))
-            │       ├── parent:
-            │       │   @ CallNode (location: (1,3)-(1,4))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :b
-            │       │   ├── message_loc: (1,3)-(1,4) = "b"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       ├── child:
-            │       │   @ ConstantReadNode (location: (1,6)-(1,7))
-            │       │   └── name: :C
-            │       └── delimiter_loc: (1,4)-(1,6) = "::"
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,8)-(1,9) = "="
-            └── value:
-                @ ArrayNode (location: (1,10)-(1,14))
-                ├── flags: ∅
-                ├── elements: (length: 2)
-                │   ├── @ IntegerNode (location: (1,10)-(1,11))
-                │   │   ├── flags: decimal
-                │   │   └── value: 1
-                │   └── @ IntegerNode (location: (1,13)-(1,14))
-                │       ├── flags: decimal
-                │       └── value: 2
-                ├── opening_loc: ∅
-                └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_colon3.txt b/test/mri/prism/snapshots/seattlerb/masgn_colon3.txt
deleted file mode 100644
index 0cf4f8626d5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_colon3.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,15))
-            ├── lefts: (length: 2)
-            │   ├── @ ConstantPathTargetNode (location: (1,0)-(1,3))
-            │   │   ├── parent: ∅
-            │   │   ├── child:
-            │   │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   │   └── name: :A
-            │   │   └── delimiter_loc: (1,0)-(1,2) = "::"
-            │   └── @ ConstantPathTargetNode (location: (1,5)-(1,8))
-            │       ├── parent: ∅
-            │       ├── child:
-            │       │   @ ConstantReadNode (location: (1,7)-(1,8))
-            │       │   └── name: :B
-            │       └── delimiter_loc: (1,5)-(1,7) = "::"
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,9)-(1,10) = "="
-            └── value:
-                @ ArrayNode (location: (1,11)-(1,15))
-                ├── flags: ∅
-                ├── elements: (length: 2)
-                │   ├── @ IntegerNode (location: (1,11)-(1,12))
-                │   │   ├── flags: decimal
-                │   │   └── value: 1
-                │   └── @ IntegerNode (location: (1,14)-(1,15))
-                │       ├── flags: decimal
-                │       └── value: 2
-                ├── opening_loc: ∅
-                └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_command_call.txt b/test/mri/prism/snapshots/seattlerb/masgn_command_call.txt
deleted file mode 100644
index 687ea382436..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_command_call.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,10))
-            ├── lefts: (length: 1)
-            │   └── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │       ├── name: :a
-            │       └── depth: 0
-            ├── rest:
-            │   @ ImplicitRestNode (location: (1,1)-(1,2))
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,3)-(1,4) = "="
-            └── value:
-                @ CallNode (location: (1,5)-(1,10))
-                ├── flags: ∅
-                ├── receiver:
-                │   @ CallNode (location: (1,5)-(1,6))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :b
-                │   ├── message_loc: (1,5)-(1,6) = "b"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                ├── call_operator_loc: (1,6)-(1,7) = "."
-                ├── name: :c
-                ├── message_loc: (1,7)-(1,8) = "c"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (1,9)-(1,10))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 1)
-                │       └── @ IntegerNode (location: (1,9)-(1,10))
-                │           ├── flags: decimal
-                │           └── value: 1
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_double_paren.txt b/test/mri/prism/snapshots/seattlerb/masgn_double_paren.txt
deleted file mode 100644
index 590df8fa077..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_double_paren.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,9))
-            ├── lefts: (length: 1)
-            │   └── @ MultiTargetNode (location: (1,1)-(1,6))
-            │       ├── lefts: (length: 2)
-            │       │   ├── @ LocalVariableTargetNode (location: (1,2)-(1,3))
-            │       │   │   ├── name: :a
-            │       │   │   └── depth: 0
-            │       │   └── @ LocalVariableTargetNode (location: (1,4)-(1,5))
-            │       │       ├── name: :b
-            │       │       └── depth: 0
-            │       ├── rest: ∅
-            │       ├── rights: (length: 0)
-            │       ├── lparen_loc: (1,1)-(1,2) = "("
-            │       └── rparen_loc: (1,5)-(1,6) = ")"
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: (1,0)-(1,1) = "("
-            ├── rparen_loc: (1,6)-(1,7) = ")"
-            ├── operator_loc: (1,7)-(1,8) = "="
-            └── value:
-                @ CallNode (location: (1,8)-(1,9))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :c
-                ├── message_loc: (1,8)-(1,9) = "c"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_lhs_splat.txt b/test/mri/prism/snapshots/seattlerb/masgn_lhs_splat.txt
deleted file mode 100644
index 771dd7c0406..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_lhs_splat.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,12))
-            ├── lefts: (length: 0)
-            ├── rest:
-            │   @ SplatNode (location: (1,0)-(1,2))
-            │   ├── operator_loc: (1,0)-(1,1) = "*"
-            │   └── expression:
-            │       @ LocalVariableTargetNode (location: (1,1)-(1,2))
-            │       ├── name: :a
-            │       └── depth: 0
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,3)-(1,4) = "="
-            └── value:
-                @ ArrayNode (location: (1,5)-(1,12))
-                ├── flags: ∅
-                ├── elements: (length: 3)
-                │   ├── @ IntegerNode (location: (1,5)-(1,6))
-                │   │   ├── flags: decimal
-                │   │   └── value: 1
-                │   ├── @ IntegerNode (location: (1,8)-(1,9))
-                │   │   ├── flags: decimal
-                │   │   └── value: 2
-                │   └── @ IntegerNode (location: (1,11)-(1,12))
-                │       ├── flags: decimal
-                │       └── value: 3
-                ├── opening_loc: ∅
-                └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_paren.txt b/test/mri/prism/snapshots/seattlerb/masgn_paren.txt
deleted file mode 100644
index 5d79774d5e4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_paren.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,12))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (1,1)-(1,2))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,4)-(1,5))
-            │       ├── name: :b
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: (1,0)-(1,1) = "("
-            ├── rparen_loc: (1,5)-(1,6) = ")"
-            ├── operator_loc: (1,7)-(1,8) = "="
-            └── value:
-                @ CallNode (location: (1,9)-(1,12))
-                ├── flags: ∅
-                ├── receiver:
-                │   @ CallNode (location: (1,9)-(1,10))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :c
-                │   ├── message_loc: (1,9)-(1,10) = "c"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                ├── call_operator_loc: (1,10)-(1,11) = "."
-                ├── name: :d
-                ├── message_loc: (1,11)-(1,12) = "d"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_splat_arg.txt b/test/mri/prism/snapshots/seattlerb/masgn_splat_arg.txt
deleted file mode 100644
index b8113b126f8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_splat_arg.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,9))
-            ├── lefts: (length: 0)
-            ├── rest:
-            │   @ SplatNode (location: (1,0)-(1,2))
-            │   ├── operator_loc: (1,0)-(1,1) = "*"
-            │   └── expression:
-            │       @ LocalVariableTargetNode (location: (1,1)-(1,2))
-            │       ├── name: :a
-            │       └── depth: 0
-            ├── rights: (length: 1)
-            │   └── @ LocalVariableTargetNode (location: (1,4)-(1,5))
-            │       ├── name: :b
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,6)-(1,7) = "="
-            └── value:
-                @ CallNode (location: (1,8)-(1,9))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :c
-                ├── message_loc: (1,8)-(1,9) = "c"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_splat_arg_arg.txt b/test/mri/prism/snapshots/seattlerb/masgn_splat_arg_arg.txt
deleted file mode 100644
index a832aef1e02..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_splat_arg_arg.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:a, :b, :c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,12))
-            ├── lefts: (length: 0)
-            ├── rest:
-            │   @ SplatNode (location: (1,0)-(1,2))
-            │   ├── operator_loc: (1,0)-(1,1) = "*"
-            │   └── expression:
-            │       @ LocalVariableTargetNode (location: (1,1)-(1,2))
-            │       ├── name: :a
-            │       └── depth: 0
-            ├── rights: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (1,4)-(1,5))
-            │   │   ├── name: :b
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,7)-(1,8))
-            │       ├── name: :c
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,9)-(1,10) = "="
-            └── value:
-                @ CallNode (location: (1,11)-(1,12))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :d
-                ├── message_loc: (1,11)-(1,12) = "d"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_star.txt b/test/mri/prism/snapshots/seattlerb/masgn_star.txt
deleted file mode 100644
index 3e01eef8a78..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_star.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,5))
-            ├── lefts: (length: 0)
-            ├── rest:
-            │   @ SplatNode (location: (1,0)-(1,1))
-            │   ├── operator_loc: (1,0)-(1,1) = "*"
-            │   └── expression: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,2)-(1,3) = "="
-            └── value:
-                @ IntegerNode (location: (1,4)-(1,5))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/masgn_var_star_var.txt b/test/mri/prism/snapshots/seattlerb/masgn_var_star_var.txt
deleted file mode 100644
index 37851efd6f0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/masgn_var_star_var.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,11))
-            ├── lefts: (length: 1)
-            │   └── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │       ├── name: :a
-            │       └── depth: 0
-            ├── rest:
-            │   @ SplatNode (location: (1,3)-(1,4))
-            │   ├── operator_loc: (1,3)-(1,4) = "*"
-            │   └── expression: ∅
-            ├── rights: (length: 1)
-            │   └── @ LocalVariableTargetNode (location: (1,6)-(1,7))
-            │       ├── name: :b
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,8)-(1,9) = "="
-            └── value:
-                @ CallNode (location: (1,10)-(1,11))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :c
-                ├── message_loc: (1,10)-(1,11) = "c"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/messy_op_asgn_lineno.txt b/test/mri/prism/snapshots/seattlerb/messy_op_asgn_lineno.txt
deleted file mode 100644
index 7a3e9affb59..00000000000
--- a/test/mri/prism/snapshots/seattlerb/messy_op_asgn_lineno.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,15))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,15))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,2)-(1,15))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,3)-(1,14))
-            │           │   └── body: (length: 1)
-            │           │       └── @ ConstantPathOperatorWriteNode (location: (1,3)-(1,14))
-            │           │           ├── target:
-            │           │           │   @ ConstantPathNode (location: (1,3)-(1,7))
-            │           │           │   ├── parent:
-            │           │           │   │   @ ConstantReadNode (location: (1,3)-(1,4))
-            │           │           │   │   └── name: :B
-            │           │           │   ├── child:
-            │           │           │   │   @ ConstantReadNode (location: (1,6)-(1,7))
-            │           │           │   │   └── name: :C
-            │           │           │   └── delimiter_loc: (1,4)-(1,6) = "::"
-            │           │           ├── operator_loc: (1,8)-(1,10) = "*="
-            │           │           ├── value:
-            │           │           │   @ CallNode (location: (1,11)-(1,14))
-            │           │           │   ├── flags: ignore_visibility
-            │           │           │   ├── receiver: ∅
-            │           │           │   ├── call_operator_loc: ∅
-            │           │           │   ├── name: :d
-            │           │           │   ├── message_loc: (1,11)-(1,12) = "d"
-            │           │           │   ├── opening_loc: ∅
-            │           │           │   ├── arguments:
-            │           │           │   │   @ ArgumentsNode (location: (1,13)-(1,14))
-            │           │           │   │   ├── flags: ∅
-            │           │           │   │   └── arguments: (length: 1)
-            │           │           │   │       └── @ CallNode (location: (1,13)-(1,14))
-            │           │           │   │           ├── flags: variable_call, ignore_visibility
-            │           │           │   │           ├── receiver: ∅
-            │           │           │   │           ├── call_operator_loc: ∅
-            │           │           │   │           ├── name: :e
-            │           │           │   │           ├── message_loc: (1,13)-(1,14) = "e"
-            │           │           │   │           ├── opening_loc: ∅
-            │           │           │   │           ├── arguments: ∅
-            │           │           │   │           ├── closing_loc: ∅
-            │           │           │   │           └── block: ∅
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── block: ∅
-            │           │           └── operator: :*
-            │           ├── opening_loc: (1,2)-(1,3) = "("
-            │           └── closing_loc: (1,14)-(1,15) = ")"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/method_call_assoc_trailing_comma.txt b/test/mri/prism/snapshots/seattlerb/method_call_assoc_trailing_comma.txt
deleted file mode 100644
index da10a474c3a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/method_call_assoc_trailing_comma.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,10))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :f
-            ├── message_loc: (1,2)-(1,3) = "f"
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,4)-(1,8))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,4)-(1,8))
-            │                   ├── key:
-            │                   │   @ IntegerNode (location: (1,4)-(1,5))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,7)-(1,8))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 2
-            │                   └── operator_loc: (1,5)-(1,7) = "=>"
-            ├── closing_loc: (1,9)-(1,10) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/method_call_trailing_comma.txt b/test/mri/prism/snapshots/seattlerb/method_call_trailing_comma.txt
deleted file mode 100644
index edf79062cfe..00000000000
--- a/test/mri/prism/snapshots/seattlerb/method_call_trailing_comma.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :f
-            ├── message_loc: (1,2)-(1,3) = "f"
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,4)-(1,5))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (1,6)-(1,7) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/mlhs_back_anonsplat.txt b/test/mri/prism/snapshots/seattlerb/mlhs_back_anonsplat.txt
deleted file mode 100644
index 600f7f717b1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/mlhs_back_anonsplat.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: [:a, :b, :c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,14))
-            ├── lefts: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (1,3)-(1,4))
-            │   │   ├── name: :b
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,6)-(1,7))
-            │       ├── name: :c
-            │       └── depth: 0
-            ├── rest:
-            │   @ SplatNode (location: (1,9)-(1,10))
-            │   ├── operator_loc: (1,9)-(1,10) = "*"
-            │   └── expression: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,11)-(1,12) = "="
-            └── value:
-                @ CallNode (location: (1,13)-(1,14))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :f
-                ├── message_loc: (1,13)-(1,14) = "f"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/mlhs_back_splat.txt b/test/mri/prism/snapshots/seattlerb/mlhs_back_splat.txt
deleted file mode 100644
index f5d3fe5ae90..00000000000
--- a/test/mri/prism/snapshots/seattlerb/mlhs_back_splat.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: [:a, :b, :c, :s]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,15))
-            ├── lefts: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (1,3)-(1,4))
-            │   │   ├── name: :b
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,6)-(1,7))
-            │       ├── name: :c
-            │       └── depth: 0
-            ├── rest:
-            │   @ SplatNode (location: (1,9)-(1,11))
-            │   ├── operator_loc: (1,9)-(1,10) = "*"
-            │   └── expression:
-            │       @ LocalVariableTargetNode (location: (1,10)-(1,11))
-            │       ├── name: :s
-            │       └── depth: 0
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,12)-(1,13) = "="
-            └── value:
-                @ CallNode (location: (1,14)-(1,15))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :f
-                ├── message_loc: (1,14)-(1,15) = "f"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/mlhs_front_anonsplat.txt b/test/mri/prism/snapshots/seattlerb/mlhs_front_anonsplat.txt
deleted file mode 100644
index d4797031a5c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/mlhs_front_anonsplat.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: [:x, :y, :z]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,14))
-            ├── lefts: (length: 0)
-            ├── rest:
-            │   @ SplatNode (location: (1,0)-(1,1))
-            │   ├── operator_loc: (1,0)-(1,1) = "*"
-            │   └── expression: ∅
-            ├── rights: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (1,3)-(1,4))
-            │   │   ├── name: :x
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (1,6)-(1,7))
-            │   │   ├── name: :y
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,9)-(1,10))
-            │       ├── name: :z
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,11)-(1,12) = "="
-            └── value:
-                @ CallNode (location: (1,13)-(1,14))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :f
-                ├── message_loc: (1,13)-(1,14) = "f"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/mlhs_front_splat.txt b/test/mri/prism/snapshots/seattlerb/mlhs_front_splat.txt
deleted file mode 100644
index 47a7b8da7c2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/mlhs_front_splat.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: [:s, :x, :y, :z]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,15))
-            ├── lefts: (length: 0)
-            ├── rest:
-            │   @ SplatNode (location: (1,0)-(1,2))
-            │   ├── operator_loc: (1,0)-(1,1) = "*"
-            │   └── expression:
-            │       @ LocalVariableTargetNode (location: (1,1)-(1,2))
-            │       ├── name: :s
-            │       └── depth: 0
-            ├── rights: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (1,4)-(1,5))
-            │   │   ├── name: :x
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (1,7)-(1,8))
-            │   │   ├── name: :y
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,10)-(1,11))
-            │       ├── name: :z
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,12)-(1,13) = "="
-            └── value:
-                @ CallNode (location: (1,14)-(1,15))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :f
-                ├── message_loc: (1,14)-(1,15) = "f"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/mlhs_keyword.txt b/test/mri/prism/snapshots/seattlerb/mlhs_keyword.txt
deleted file mode 100644
index 6142640b2cb..00000000000
--- a/test/mri/prism/snapshots/seattlerb/mlhs_keyword.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :!=
-            ├── message_loc: (1,2)-(1,4) = "!="
-            ├── opening_loc: (1,4)-(1,5) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,15))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ TrueNode (location: (1,5)-(1,9))
-            │       └── @ TrueNode (location: (1,11)-(1,15))
-            ├── closing_loc: (1,15)-(1,16) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/mlhs_mid_anonsplat.txt b/test/mri/prism/snapshots/seattlerb/mlhs_mid_anonsplat.txt
deleted file mode 100644
index b6306e16743..00000000000
--- a/test/mri/prism/snapshots/seattlerb/mlhs_mid_anonsplat.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: [:a, :b, :c, :x, :y, :z]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,23))
-            ├── lefts: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (1,3)-(1,4))
-            │   │   ├── name: :b
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,6)-(1,7))
-            │       ├── name: :c
-            │       └── depth: 0
-            ├── rest:
-            │   @ SplatNode (location: (1,9)-(1,10))
-            │   ├── operator_loc: (1,9)-(1,10) = "*"
-            │   └── expression: ∅
-            ├── rights: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (1,12)-(1,13))
-            │   │   ├── name: :x
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (1,15)-(1,16))
-            │   │   ├── name: :y
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,18)-(1,19))
-            │       ├── name: :z
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,20)-(1,21) = "="
-            └── value:
-                @ CallNode (location: (1,22)-(1,23))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :f
-                ├── message_loc: (1,22)-(1,23) = "f"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/mlhs_mid_splat.txt b/test/mri/prism/snapshots/seattlerb/mlhs_mid_splat.txt
deleted file mode 100644
index 1dae24d9111..00000000000
--- a/test/mri/prism/snapshots/seattlerb/mlhs_mid_splat.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: [:a, :b, :c, :s, :x, :y, :z]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,24))
-            ├── lefts: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (1,3)-(1,4))
-            │   │   ├── name: :b
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,6)-(1,7))
-            │       ├── name: :c
-            │       └── depth: 0
-            ├── rest:
-            │   @ SplatNode (location: (1,9)-(1,11))
-            │   ├── operator_loc: (1,9)-(1,10) = "*"
-            │   └── expression:
-            │       @ LocalVariableTargetNode (location: (1,10)-(1,11))
-            │       ├── name: :s
-            │       └── depth: 0
-            ├── rights: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (1,13)-(1,14))
-            │   │   ├── name: :x
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (1,16)-(1,17))
-            │   │   ├── name: :y
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,19)-(1,20))
-            │       ├── name: :z
-            │       └── depth: 0
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,21)-(1,22) = "="
-            └── value:
-                @ CallNode (location: (1,23)-(1,24))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :f
-                ├── message_loc: (1,23)-(1,24) = "f"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/mlhs_rescue.txt b/test/mri/prism/snapshots/seattlerb/mlhs_rescue.txt
deleted file mode 100644
index bd983cd3f9b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/mlhs_rescue.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,18))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,3)-(1,4))
-            │       ├── name: :b
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,5)-(1,6) = "="
-            └── value:
-                @ RescueModifierNode (location: (1,7)-(1,18))
-                ├── expression:
-                │   @ CallNode (location: (1,7)-(1,8))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :f
-                │   ├── message_loc: (1,7)-(1,8) = "f"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                ├── keyword_loc: (1,9)-(1,15) = "rescue"
-                └── rescue_expression:
-                    @ IntegerNode (location: (1,16)-(1,18))
-                    ├── flags: decimal
-                    └── value: 42
diff --git a/test/mri/prism/snapshots/seattlerb/module_comments.txt b/test/mri/prism/snapshots/seattlerb/module_comments.txt
deleted file mode 100644
index 2785187a29e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/module_comments.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (5,0)-(10,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (5,0)-(10,3))
-    └── body: (length: 1)
-        └── @ ModuleNode (location: (5,0)-(10,3))
-            ├── locals: []
-            ├── module_keyword_loc: (5,0)-(5,6) = "module"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (5,7)-(5,8))
-            │   └── name: :X
-            ├── body:
-            │   @ StatementsNode (location: (7,2)-(9,5))
-            │   └── body: (length: 1)
-            │       └── @ DefNode (location: (7,2)-(9,5))
-            │           ├── name: :blah
-            │           ├── name_loc: (7,6)-(7,10) = "blah"
-            │           ├── receiver: ∅
-            │           ├── parameters: ∅
-            │           ├── body: ∅
-            │           ├── locals: []
-            │           ├── def_keyword_loc: (7,2)-(7,5) = "def"
-            │           ├── operator_loc: ∅
-            │           ├── lparen_loc: ∅
-            │           ├── rparen_loc: ∅
-            │           ├── equal_loc: ∅
-            │           └── end_keyword_loc: (9,2)-(9,5) = "end"
-            ├── end_keyword_loc: (10,0)-(10,3) = "end"
-            └── name: :X
diff --git a/test/mri/prism/snapshots/seattlerb/multiline_hash_declaration.txt b/test/mri/prism/snapshots/seattlerb/multiline_hash_declaration.txt
deleted file mode 100644
index 79b0ef5d236..00000000000
--- a/test/mri/prism/snapshots/seattlerb/multiline_hash_declaration.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-@ ProgramNode (location: (1,0)-(8,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(8,12))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(3,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (1,0)-(1,1) = "f"
-        │   ├── opening_loc: (1,1)-(1,2) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(3,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (1,2)-(3,1))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (1,2)-(3,1))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (1,2)-(1,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (1,2)-(1,7) = "state"
-        │   │                   │   ├── closing_loc: (1,7)-(1,8) = ":"
-        │   │                   │   └── unescaped: "state"
-        │   │                   ├── value:
-        │   │                   │   @ HashNode (location: (2,1)-(3,1))
-        │   │                   │   ├── opening_loc: (2,1)-(2,2) = "{"
-        │   │                   │   ├── elements: (length: 0)
-        │   │                   │   └── closing_loc: (3,0)-(3,1) = "}"
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: (3,1)-(3,2) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(6,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (5,0)-(5,1) = "f"
-        │   ├── opening_loc: (5,1)-(5,2) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,2)-(6,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (5,2)-(6,1))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (5,2)-(6,1))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (5,2)-(5,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (5,2)-(5,7) = "state"
-        │   │                   │   ├── closing_loc: (5,7)-(5,8) = ":"
-        │   │                   │   └── unescaped: "state"
-        │   │                   ├── value:
-        │   │                   │   @ HashNode (location: (5,9)-(6,1))
-        │   │                   │   ├── opening_loc: (5,9)-(5,10) = "{"
-        │   │                   │   ├── elements: (length: 0)
-        │   │                   │   └── closing_loc: (6,0)-(6,1) = "}"
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: (6,1)-(6,2) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (8,0)-(8,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (8,0)-(8,1) = "f"
-            ├── opening_loc: (8,1)-(8,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (8,2)-(8,11))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (8,2)-(8,11))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (8,2)-(8,11))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (8,2)-(8,8))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (8,2)-(8,7) = "state"
-            │                   │   ├── closing_loc: (8,7)-(8,8) = ":"
-            │                   │   └── unescaped: "state"
-            │                   ├── value:
-            │                   │   @ HashNode (location: (8,9)-(8,11))
-            │                   │   ├── opening_loc: (8,9)-(8,10) = "{"
-            │                   │   ├── elements: (length: 0)
-            │                   │   └── closing_loc: (8,10)-(8,11) = "}"
-            │                   └── operator_loc: ∅
-            ├── closing_loc: (8,11)-(8,12) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/non_interpolated_symbol_array_line_breaks.txt b/test/mri/prism/snapshots/seattlerb/non_interpolated_symbol_array_line_breaks.txt
deleted file mode 100644
index cbf4ec4a081..00000000000
--- a/test/mri/prism/snapshots/seattlerb/non_interpolated_symbol_array_line_breaks.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,1))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(4,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ SymbolNode (location: (2,0)-(2,1))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (2,0)-(2,1) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ SymbolNode (location: (3,0)-(3,1))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (3,0)-(3,1) = "b"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b"
-        │   ├── opening_loc: (1,0)-(1,3) = "%i("
-        │   └── closing_loc: (4,0)-(4,1) = ")"
-        └── @ IntegerNode (location: (5,0)-(5,1))
-            ├── flags: decimal
-            └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/non_interpolated_word_array_line_breaks.txt b/test/mri/prism/snapshots/seattlerb/non_interpolated_word_array_line_breaks.txt
deleted file mode 100644
index e82f2500981..00000000000
--- a/test/mri/prism/snapshots/seattlerb/non_interpolated_word_array_line_breaks.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,1))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(4,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (2,0)-(2,1))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (2,0)-(2,1) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ StringNode (location: (3,0)-(3,1))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (3,0)-(3,1) = "b"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b"
-        │   ├── opening_loc: (1,0)-(1,3) = "%w("
-        │   └── closing_loc: (4,0)-(4,1) = ")"
-        └── @ IntegerNode (location: (5,0)-(5,1))
-            ├── flags: decimal
-            └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/op_asgn_command_call.txt b/test/mri/prism/snapshots/seattlerb/op_asgn_command_call.txt
deleted file mode 100644
index 54aa06214fa..00000000000
--- a/test/mri/prism/snapshots/seattlerb/op_asgn_command_call.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ LocalVariableOrWriteNode (location: (1,0)-(1,11))
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── operator_loc: (1,2)-(1,5) = "||="
-            ├── value:
-            │   @ CallNode (location: (1,6)-(1,11))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,6)-(1,7))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :b
-            │   │   ├── message_loc: (1,6)-(1,7) = "b"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,7)-(1,8) = "."
-            │   ├── name: :c
-            │   ├── message_loc: (1,8)-(1,9) = "c"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,10)-(1,11))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ IntegerNode (location: (1,10)-(1,11))
-            │   │           ├── flags: decimal
-            │   │           └── value: 2
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── name: :a
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/seattlerb/op_asgn_dot_ident_command_call.txt b/test/mri/prism/snapshots/seattlerb/op_asgn_dot_ident_command_call.txt
deleted file mode 100644
index 324c042b00d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/op_asgn_dot_ident_command_call.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallOrWriteNode (location: (1,0)-(1,11))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ ConstantReadNode (location: (1,0)-(1,1))
-            │   └── name: :A
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── message_loc: (1,2)-(1,3) = "B"
-            ├── read_name: :B
-            ├── write_name: :B=
-            ├── operator_loc: (1,4)-(1,7) = "||="
-            └── value:
-                @ CallNode (location: (1,8)-(1,11))
-                ├── flags: ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :c
-                ├── message_loc: (1,8)-(1,9) = "c"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (1,10)-(1,11))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 1)
-                │       └── @ IntegerNode (location: (1,10)-(1,11))
-                │           ├── flags: decimal
-                │           └── value: 1
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/op_asgn_index_command_call.txt b/test/mri/prism/snapshots/seattlerb/op_asgn_index_command_call.txt
deleted file mode 100644
index ddee4cde495..00000000000
--- a/test/mri/prism/snapshots/seattlerb/op_asgn_index_command_call.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ IndexOrWriteNode (location: (1,0)-(1,16))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── opening_loc: (1,1)-(1,2) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,4))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ SymbolNode (location: (1,2)-(1,4))
-            │           ├── flags: forced_us_ascii_encoding
-            │           ├── opening_loc: (1,2)-(1,3) = ":"
-            │           ├── value_loc: (1,3)-(1,4) = "b"
-            │           ├── closing_loc: ∅
-            │           └── unescaped: "b"
-            ├── closing_loc: (1,4)-(1,5) = "]"
-            ├── block: ∅
-            ├── operator_loc: (1,6)-(1,9) = "||="
-            └── value:
-                @ CallNode (location: (1,10)-(1,16))
-                ├── flags: ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :c
-                ├── message_loc: (1,10)-(1,11) = "c"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (1,12)-(1,16))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 2)
-                │       ├── @ IntegerNode (location: (1,12)-(1,13))
-                │       │   ├── flags: decimal
-                │       │   └── value: 1
-                │       └── @ IntegerNode (location: (1,15)-(1,16))
-                │           ├── flags: decimal
-                │           └── value: 2
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt b/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
deleted file mode 100644
index 8e6df3e8125..00000000000
--- a/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ ConstantPathOperatorWriteNode (location: (1,0)-(1,11))
-            ├── target:
-            │   @ ConstantPathNode (location: (1,0)-(1,4))
-            │   ├── parent:
-            │   │   @ ConstantReadNode (location: (1,0)-(1,1))
-            │   │   └── name: :A
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,3)-(1,4))
-            │   │   └── name: :B
-            │   └── delimiter_loc: (1,1)-(1,3) = "::"
-            ├── operator_loc: (1,5)-(1,7) = "*="
-            ├── value:
-            │   @ CallNode (location: (1,8)-(1,11))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :c
-            │   ├── message_loc: (1,8)-(1,9) = "c"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,10)-(1,11))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,10)-(1,11))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :d
-            │   │           ├── message_loc: (1,10)-(1,11) = "d"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── operator: :*
diff --git a/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_identifier1.txt b/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_identifier1.txt
deleted file mode 100644
index 0daadcf6ff6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_identifier1.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallOperatorWriteNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ ConstantReadNode (location: (1,0)-(1,1))
-            │   └── name: :A
-            ├── call_operator_loc: (1,1)-(1,3) = "::"
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── read_name: :b
-            ├── write_name: :b=
-            ├── operator: :+
-            ├── operator_loc: (1,5)-(1,7) = "+="
-            └── value:
-                @ IntegerNode (location: (1,8)-(1,9))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt b/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
deleted file mode 100644
index ea8603165b0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallOperatorWriteNode (location: (1,0)-(1,11))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ ConstantReadNode (location: (1,0)-(1,1))
-            │   └── name: :A
-            ├── call_operator_loc: (1,1)-(1,3) = "::"
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── read_name: :b
-            ├── write_name: :b=
-            ├── operator: :*
-            ├── operator_loc: (1,5)-(1,7) = "*="
-            └── value:
-                @ CallNode (location: (1,8)-(1,11))
-                ├── flags: ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :c
-                ├── message_loc: (1,8)-(1,9) = "c"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (1,10)-(1,11))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 1)
-                │       └── @ CallNode (location: (1,10)-(1,11))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :d
-                │           ├── message_loc: (1,10)-(1,11) = "d"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt b/test/mri/prism/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt
deleted file mode 100644
index b3b57091938..00000000000
--- a/test/mri/prism/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallOrWriteNode (location: (1,0)-(1,11))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── message_loc: (1,2)-(1,3) = "b"
-            ├── read_name: :b
-            ├── write_name: :b=
-            ├── operator_loc: (1,4)-(1,7) = "||="
-            └── value:
-                @ CallNode (location: (1,8)-(1,11))
-                ├── flags: ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :c
-                ├── message_loc: (1,8)-(1,9) = "c"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (1,10)-(1,11))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 1)
-                │       └── @ IntegerNode (location: (1,10)-(1,11))
-                │           ├── flags: decimal
-                │           └── value: 1
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_def_special_name.txt b/test/mri/prism/snapshots/seattlerb/parse_def_special_name.txt
deleted file mode 100644
index dfbfe8a3912..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_def_special_name.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,13))
-            ├── name: :next
-            ├── name_loc: (1,4)-(1,8) = "next"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,10)-(1,13) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_if_not_canonical.txt b/test/mri/prism/snapshots/seattlerb/parse_if_not_canonical.txt
deleted file mode 100644
index 763bd24efde..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_if_not_canonical.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(2,3))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (1,3)-(1,15))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,7)-(1,15))
-            │   │   ├── flags: ∅
-            │   │   ├── receiver:
-            │   │   │   @ CallNode (location: (1,7)-(1,10))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :var
-            │   │   │   ├── message_loc: (1,7)-(1,10) = "var"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── call_operator_loc: (1,10)-(1,11) = "."
-            │   │   ├── name: :nil?
-            │   │   ├── message_loc: (1,11)-(1,15) = "nil?"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :!
-            │   ├── message_loc: (1,3)-(1,6) = "not"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: (1,16)-(1,20) = "then"
-            ├── statements:
-            │   @ StatementsNode (location: (1,21)-(1,26))
-            │   └── body: (length: 1)
-            │       └── @ StringNode (location: (1,21)-(1,26))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (1,21)-(1,22) = "'"
-            │           ├── content_loc: (1,22)-(1,25) = "foo"
-            │           ├── closing_loc: (1,25)-(1,26) = "'"
-            │           └── unescaped: "foo"
-            ├── consequent:
-            │   @ ElseNode (location: (1,27)-(2,3))
-            │   ├── else_keyword_loc: (1,27)-(1,31) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,32)-(1,37))
-            │   │   └── body: (length: 1)
-            │   │       └── @ StringNode (location: (1,32)-(1,37))
-            │   │           ├── flags: ∅
-            │   │           ├── opening_loc: (1,32)-(1,33) = "'"
-            │   │           ├── content_loc: (1,33)-(1,36) = "bar"
-            │   │           ├── closing_loc: (1,36)-(1,37) = "'"
-            │   │           └── unescaped: "bar"
-            │   └── end_keyword_loc: (2,0)-(2,3) = "end"
-            └── end_keyword_loc: (2,0)-(2,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_if_not_noncanonical.txt b/test/mri/prism/snapshots/seattlerb/parse_if_not_noncanonical.txt
deleted file mode 100644
index 763bd24efde..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_if_not_noncanonical.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(2,3))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (1,3)-(1,15))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,7)-(1,15))
-            │   │   ├── flags: ∅
-            │   │   ├── receiver:
-            │   │   │   @ CallNode (location: (1,7)-(1,10))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :var
-            │   │   │   ├── message_loc: (1,7)-(1,10) = "var"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── call_operator_loc: (1,10)-(1,11) = "."
-            │   │   ├── name: :nil?
-            │   │   ├── message_loc: (1,11)-(1,15) = "nil?"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :!
-            │   ├── message_loc: (1,3)-(1,6) = "not"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: (1,16)-(1,20) = "then"
-            ├── statements:
-            │   @ StatementsNode (location: (1,21)-(1,26))
-            │   └── body: (length: 1)
-            │       └── @ StringNode (location: (1,21)-(1,26))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (1,21)-(1,22) = "'"
-            │           ├── content_loc: (1,22)-(1,25) = "foo"
-            │           ├── closing_loc: (1,25)-(1,26) = "'"
-            │           └── unescaped: "foo"
-            ├── consequent:
-            │   @ ElseNode (location: (1,27)-(2,3))
-            │   ├── else_keyword_loc: (1,27)-(1,31) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,32)-(1,37))
-            │   │   └── body: (length: 1)
-            │   │       └── @ StringNode (location: (1,32)-(1,37))
-            │   │           ├── flags: ∅
-            │   │           ├── opening_loc: (1,32)-(1,33) = "'"
-            │   │           ├── content_loc: (1,33)-(1,36) = "bar"
-            │   │           ├── closing_loc: (1,36)-(1,37) = "'"
-            │   │           └── unescaped: "bar"
-            │   └── end_keyword_loc: (2,0)-(2,3) = "end"
-            └── end_keyword_loc: (2,0)-(2,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_block.txt b/test/mri/prism/snapshots/seattlerb/parse_line_block.txt
deleted file mode 100644
index 623c08d50e3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_block.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 2)
-        ├── @ LocalVariableWriteNode (location: (1,0)-(1,6))
-        │   ├── name: :a
-        │   ├── depth: 0
-        │   ├── name_loc: (1,0)-(1,1) = "a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,4)-(1,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 42
-        │   └── operator_loc: (1,2)-(1,3) = "="
-        └── @ CallNode (location: (2,0)-(2,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (2,0)-(2,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (2,2)-(2,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LocalVariableReadNode (location: (2,2)-(2,3))
-            │           ├── name: :a
-            │           └── depth: 0
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_comment.txt b/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_comment.txt
deleted file mode 100644
index 8495527cf44..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_comment.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,1))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (2,0)-(2,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :b
-        │   ├── message_loc: (2,0)-(2,1) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,1))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (3,0)-(3,1) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt b/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
deleted file mode 100644
index f531a73a586..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (4,0)-(7,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (4,0)-(7,1))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (4,0)-(4,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (4,0)-(4,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :b
-        │   ├── message_loc: (5,0)-(5,1) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (7,0)-(7,1))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (7,0)-(7,1) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt b/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt
deleted file mode 100644
index d4e962b355e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,1))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (2,0)-(2,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :b
-        │   ├── message_loc: (2,0)-(2,1) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (4,0)-(4,1))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (4,0)-(4,1) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt b/test/mri/prism/snapshots/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt
deleted file mode 100644
index a08f5419f18..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,4))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,4))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InstanceVariableReadNode (location: (1,2)-(1,4))
-            │           └── name: :@b
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_call_ivar_line_break_paren.txt b/test/mri/prism/snapshots/seattlerb/parse_line_call_ivar_line_break_paren.txt
deleted file mode 100644
index dd58d92d3a5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_call_ivar_line_break_paren.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,1))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(2,1))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,4))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InstanceVariableReadNode (location: (1,2)-(1,4))
-            │           └── name: :@b
-            ├── closing_loc: (2,0)-(2,1) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_call_no_args.txt b/test/mri/prism/snapshots/seattlerb/parse_line_call_no_args.txt
deleted file mode 100644
index 8a0fcd63afa..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_call_no_args.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,2)-(3,3))
-                ├── locals: [:x, :y]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,5)-(1,11))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,6)-(1,10))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,6)-(1,7))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :x
-                │   │   │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :y
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,5)-(1,6) = "|"
-                │   └── closing_loc: (1,10)-(1,11) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (2,2)-(2,7))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (2,2)-(2,7))
-                │           ├── flags: ∅
-                │           ├── receiver:
-                │           │   @ LocalVariableReadNode (location: (2,2)-(2,3))
-                │           │   ├── name: :x
-                │           │   └── depth: 0
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :+
-                │           ├── message_loc: (2,4)-(2,5) = "+"
-                │           ├── opening_loc: ∅
-                │           ├── arguments:
-                │           │   @ ArgumentsNode (location: (2,6)-(2,7))
-                │           │   ├── flags: ∅
-                │           │   └── arguments: (length: 1)
-                │           │       └── @ LocalVariableReadNode (location: (2,6)-(2,7))
-                │           │           ├── name: :y
-                │           │           └── depth: 0
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (1,2)-(1,4) = "do"
-                └── closing_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_defn_complex.txt b/test/mri/prism/snapshots/seattlerb/parse_line_defn_complex.txt
deleted file mode 100644
index 50ccb762bee..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_defn_complex.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(5,3))
-            ├── name: :x
-            ├── name_loc: (1,4)-(1,5) = "x"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,7))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-            │   │       ├── flags: ∅
-            │   │       └── name: :y
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (2,2)-(4,10))
-            │   └── body: (length: 3)
-            │       ├── @ CallNode (location: (2,2)-(2,6))
-            │       │   ├── flags: ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :p
-            │       │   ├── message_loc: (2,2)-(2,3) = "p"
-            │       │   ├── opening_loc: (2,3)-(2,4) = "("
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (2,4)-(2,5))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 1)
-            │       │   │       └── @ LocalVariableReadNode (location: (2,4)-(2,5))
-            │       │   │           ├── name: :y
-            │       │   │           └── depth: 0
-            │       │   ├── closing_loc: (2,5)-(2,6) = ")"
-            │       │   └── block: ∅
-            │       ├── @ LocalVariableOperatorWriteNode (location: (3,2)-(3,8))
-            │       │   ├── name_loc: (3,2)-(3,3) = "y"
-            │       │   ├── operator_loc: (3,4)-(3,6) = "*="
-            │       │   ├── value:
-            │       │   │   @ IntegerNode (location: (3,7)-(3,8))
-            │       │   │   ├── flags: decimal
-            │       │   │   └── value: 2
-            │       │   ├── name: :y
-            │       │   ├── operator: :*
-            │       │   └── depth: 0
-            │       └── @ ReturnNode (location: (4,2)-(4,10))
-            │           ├── keyword_loc: (4,2)-(4,8) = "return"
-            │           └── arguments:
-            │               @ ArgumentsNode (location: (4,9)-(4,10))
-            │               ├── flags: ∅
-            │               └── arguments: (length: 1)
-            │                   └── @ LocalVariableReadNode (location: (4,9)-(4,10))
-            │                       ├── name: :y
-            │                       └── depth: 0
-            ├── locals: [:y]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,7)-(1,8) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (5,0)-(5,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_defn_no_parens.txt b/test/mri/prism/snapshots/seattlerb/parse_line_defn_no_parens.txt
deleted file mode 100644
index 74240322ac4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_defn_no_parens.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,3))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(3,3))
-        │   ├── name: :f
-        │   ├── name_loc: (1,4)-(1,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        └── @ DefNode (location: (5,0)-(6,3))
-            ├── name: :f
-            ├── name_loc: (5,4)-(5,5) = "f"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (5,0)-(5,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (6,0)-(6,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_defn_no_parens_args.txt b/test/mri/prism/snapshots/seattlerb/parse_line_defn_no_parens_args.txt
deleted file mode 100644
index 8445743293c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_defn_no_parens_args.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(2,3))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,7))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,6)-(1,7))
-            │   │       ├── flags: ∅
-            │   │       └── name: :a
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (2,0)-(2,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_dot2.txt b/test/mri/prism/snapshots/seattlerb/parse_line_dot2.txt
deleted file mode 100644
index 9ccf5bdc994..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_dot2.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,1))
-    └── body: (length: 3)
-        ├── @ RangeNode (location: (1,0)-(2,1))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ IntegerNode (location: (1,0)-(1,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 0
-        │   ├── right:
-        │   │   @ IntegerNode (location: (2,0)-(2,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 4
-        │   └── operator_loc: (1,1)-(1,3) = ".."
-        ├── @ RangeNode (location: (3,0)-(4,1))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ CallNode (location: (3,0)-(3,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (3,0)-(3,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (4,0)-(4,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :b
-        │   │   ├── message_loc: (4,0)-(4,1) = "b"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (3,1)-(3,3) = ".."
-        └── @ CallNode (location: (5,0)-(5,1))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (5,0)-(5,1) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_dot2_open.txt b/test/mri/prism/snapshots/seattlerb/parse_line_dot2_open.txt
deleted file mode 100644
index f85fdd6d4b8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_dot2_open.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 3)
-        ├── @ RangeNode (location: (1,0)-(1,3))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ IntegerNode (location: (1,0)-(1,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 0
-        │   ├── right: ∅
-        │   └── operator_loc: (1,1)-(1,3) = ".."
-        ├── @ RangeNode (location: (2,2)-(2,5))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ CallNode (location: (2,2)-(2,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (2,2)-(2,3) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right: ∅
-        │   └── operator_loc: (2,3)-(2,5) = ".."
-        └── @ CallNode (location: (3,2)-(3,3))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (3,2)-(3,3) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_dot3.txt b/test/mri/prism/snapshots/seattlerb/parse_line_dot3.txt
deleted file mode 100644
index 6364c1f1366..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_dot3.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,1))
-    └── body: (length: 3)
-        ├── @ RangeNode (location: (1,0)-(2,1))
-        │   ├── flags: exclude_end
-        │   ├── left:
-        │   │   @ IntegerNode (location: (1,0)-(1,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 0
-        │   ├── right:
-        │   │   @ IntegerNode (location: (2,0)-(2,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 4
-        │   └── operator_loc: (1,1)-(1,4) = "..."
-        ├── @ RangeNode (location: (3,0)-(4,1))
-        │   ├── flags: exclude_end
-        │   ├── left:
-        │   │   @ CallNode (location: (3,0)-(3,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (3,0)-(3,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (4,0)-(4,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :b
-        │   │   ├── message_loc: (4,0)-(4,1) = "b"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (3,1)-(3,4) = "..."
-        └── @ CallNode (location: (5,0)-(5,1))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (5,0)-(5,1) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_dot3_open.txt b/test/mri/prism/snapshots/seattlerb/parse_line_dot3_open.txt
deleted file mode 100644
index 35759d12e39..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_dot3_open.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 3)
-        ├── @ RangeNode (location: (1,0)-(1,4))
-        │   ├── flags: exclude_end
-        │   ├── left:
-        │   │   @ IntegerNode (location: (1,0)-(1,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 0
-        │   ├── right: ∅
-        │   └── operator_loc: (1,1)-(1,4) = "..."
-        ├── @ RangeNode (location: (2,2)-(2,6))
-        │   ├── flags: exclude_end
-        │   ├── left:
-        │   │   @ CallNode (location: (2,2)-(2,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (2,2)-(2,3) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right: ∅
-        │   └── operator_loc: (2,3)-(2,6) = "..."
-        └── @ CallNode (location: (3,2)-(3,3))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :c
-            ├── message_loc: (3,2)-(3,3) = "c"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_dstr_escaped_newline.txt b/test/mri/prism/snapshots/seattlerb/parse_line_dstr_escaped_newline.txt
deleted file mode 100644
index e135d31a25a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_dstr_escaped_newline.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,4))
-    └── body: (length: 2)
-        ├── @ InterpolatedStringNode (location: (1,0)-(2,2))
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (1,1)-(1,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (1,1)-(1,4) = "a\\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ EmbeddedStatementsNode (location: (1,4)-(2,1))
-        │   │       ├── opening_loc: (1,4)-(1,6) = "\#{"
-        │   │       ├── statements: ∅
-        │   │       └── closing_loc: (2,0)-(2,1) = "}"
-        │   └── closing_loc: (2,1)-(2,2) = "\""
-        └── @ TrueNode (location: (3,0)-(3,4))
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_dstr_soft_newline.txt b/test/mri/prism/snapshots/seattlerb/parse_line_dstr_soft_newline.txt
deleted file mode 100644
index 4415cbcc1b2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_dstr_soft_newline.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,4))
-    └── body: (length: 2)
-        ├── @ InterpolatedStringNode (location: (1,0)-(3,2))
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (1,1)-(2,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (1,1)-(2,0) = "a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ EmbeddedStatementsNode (location: (2,0)-(3,1))
-        │   │       ├── opening_loc: (2,0)-(2,2) = "\#{"
-        │   │       ├── statements: ∅
-        │   │       └── closing_loc: (3,0)-(3,1) = "}"
-        │   └── closing_loc: (3,1)-(3,2) = "\""
-        └── @ TrueNode (location: (4,0)-(4,4))
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_evstr_after_break.txt b/test/mri/prism/snapshots/seattlerb/parse_line_evstr_after_break.txt
deleted file mode 100644
index 9cb200e94bc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_evstr_after_break.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,6))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(2,6))
-            ├── opening_loc: ∅
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (1,0)-(1,3))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: (1,0)-(1,1) = "\""
-            │   │   ├── content_loc: (1,1)-(1,2) = "a"
-            │   │   ├── closing_loc: (1,2)-(1,3) = "\""
-            │   │   └── unescaped: "a"
-            │   └── @ InterpolatedStringNode (location: (2,0)-(2,6))
-            │       ├── opening_loc: (2,0)-(2,1) = "\""
-            │       ├── parts: (length: 1)
-            │       │   └── @ EmbeddedStatementsNode (location: (2,1)-(2,5))
-            │       │       ├── opening_loc: (2,1)-(2,3) = "\#{"
-            │       │       ├── statements:
-            │       │       │   @ StatementsNode (location: (2,3)-(2,4))
-            │       │       │   └── body: (length: 1)
-            │       │       │       └── @ CallNode (location: (2,3)-(2,4))
-            │       │       │           ├── flags: variable_call, ignore_visibility
-            │       │       │           ├── receiver: ∅
-            │       │       │           ├── call_operator_loc: ∅
-            │       │       │           ├── name: :b
-            │       │       │           ├── message_loc: (2,3)-(2,4) = "b"
-            │       │       │           ├── opening_loc: ∅
-            │       │       │           ├── arguments: ∅
-            │       │       │           ├── closing_loc: ∅
-            │       │       │           └── block: ∅
-            │       │       └── closing_loc: (2,4)-(2,5) = "}"
-            │       └── closing_loc: (2,5)-(2,6) = "\""
-            └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_hash_lit.txt b/test/mri/prism/snapshots/seattlerb/parse_line_hash_lit.txt
deleted file mode 100644
index 0f95a607aa0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_hash_lit.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,1))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,0)-(3,1))
-            ├── opening_loc: (1,0)-(1,1) = "{"
-            ├── elements: (length: 1)
-            │   └── @ AssocNode (location: (2,0)-(2,8))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (2,0)-(2,3))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (2,0)-(2,1) = ":"
-            │       │   ├── value_loc: (2,1)-(2,3) = "s1"
-            │       │   ├── closing_loc: ∅
-            │       │   └── unescaped: "s1"
-            │       ├── value:
-            │       │   @ IntegerNode (location: (2,7)-(2,8))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       └── operator_loc: (2,4)-(2,6) = "=>"
-            └── closing_loc: (3,0)-(3,1) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_heredoc.txt b/test/mri/prism/snapshots/seattlerb/parse_line_heredoc.txt
deleted file mode 100644
index ba00f015040..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_heredoc.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,6)-(4,17))
-├── locals: [:string]
-└── statements:
-    @ StatementsNode (location: (1,6)-(4,17))
-    └── body: (length: 2)
-        ├── @ LocalVariableWriteNode (location: (1,6)-(1,31))
-        │   ├── name: :string
-        │   ├── depth: 0
-        │   ├── name_loc: (1,6)-(1,12) = "string"
-        │   ├── value:
-        │   │   @ CallNode (location: (1,15)-(1,31))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ StringNode (location: (1,15)-(1,25))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (1,15)-(1,25) = "<<-HEREDOC"
-        │   │   │   ├── content_loc: (2,0)-(3,0) = "        very long string\n"
-        │   │   │   ├── closing_loc: (3,0)-(4,0) = "      HEREDOC\n"
-        │   │   │   └── unescaped: "        very long string\n"
-        │   │   ├── call_operator_loc: (1,25)-(1,26) = "."
-        │   │   ├── name: :strip
-        │   │   ├── message_loc: (1,26)-(1,31) = "strip"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (1,13)-(1,14) = "="
-        └── @ CallNode (location: (4,6)-(4,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :puts
-            ├── message_loc: (4,6)-(4,10) = "puts"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (4,11)-(4,17))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LocalVariableReadNode (location: (4,11)-(4,17))
-            │           ├── name: :string
-            │           └── depth: 0
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_evstr.txt b/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_evstr.txt
deleted file mode 100644
index 1a51e369342..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_evstr.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,4))
-            ├── opening_loc: (1,0)-(1,4) = "<<-A"
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (2,0)-(3,0) = "a\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a\n"
-            │   ├── @ EmbeddedStatementsNode (location: (3,0)-(3,4))
-            │   │   ├── opening_loc: (3,0)-(3,2) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (3,2)-(3,3))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (3,2)-(3,3))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :b
-            │   │   │           ├── message_loc: (3,2)-(3,3) = "b"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (3,3)-(3,4) = "}"
-            │   └── @ StringNode (location: (3,4)-(4,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (3,4)-(4,0) = "\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "\n"
-            └── closing_loc: (4,0)-(5,0) = "A\n"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_hardnewline.txt b/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_hardnewline.txt
deleted file mode 100644
index ad0f0dfd99a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_hardnewline.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,3))
-    └── body: (length: 2)
-        ├── @ StringNode (location: (1,0)-(1,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,8) = "<<-EOFOO"
-        │   ├── content_loc: (2,0)-(3,0) = "\\n\\n\\n\\n\\n\\n\\n\\n\\n\n"
-        │   ├── closing_loc: (3,0)-(4,0) = "EOFOO\n"
-        │   └── unescaped: "\n\n\n\n\n\n\n\n\n\n"
-        └── @ ClassNode (location: (5,0)-(6,3))
-            ├── locals: []
-            ├── class_keyword_loc: (5,0)-(5,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (5,6)-(5,9))
-            │   └── name: :Foo
-            ├── inheritance_operator_loc: ∅
-            ├── superclass: ∅
-            ├── body: ∅
-            ├── end_keyword_loc: (6,0)-(6,3) = "end"
-            └── name: :Foo
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_regexp_chars.txt b/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_regexp_chars.txt
deleted file mode 100644
index fdac30fab71..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_heredoc_regexp_chars.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,6)-(4,17))
-├── locals: [:string]
-└── statements:
-    @ StatementsNode (location: (1,6)-(4,17))
-    └── body: (length: 2)
-        ├── @ LocalVariableWriteNode (location: (1,6)-(1,22))
-        │   ├── name: :string
-        │   ├── depth: 0
-        │   ├── name_loc: (1,6)-(1,12) = "string"
-        │   ├── value:
-        │   │   @ StringNode (location: (1,15)-(1,22))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (1,15)-(1,22) = "<<-\"^D\""
-        │   │   ├── content_loc: (2,0)-(3,0) = "        very long string\n"
-        │   │   ├── closing_loc: (3,0)-(4,0) = "      ^D\n"
-        │   │   └── unescaped: "        very long string\n"
-        │   └── operator_loc: (1,13)-(1,14) = "="
-        └── @ CallNode (location: (4,6)-(4,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :puts
-            ├── message_loc: (4,6)-(4,10) = "puts"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (4,11)-(4,17))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LocalVariableReadNode (location: (4,11)-(4,17))
-            │           ├── name: :string
-            │           └── depth: 0
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_iter_call_no_parens.txt b/test/mri/prism/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
deleted file mode 100644
index 8d9dbf24abb..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,2)-(1,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :a
-            │           ├── message_loc: (1,2)-(1,3) = "a"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,4)-(3,3))
-                ├── locals: [:x, :y]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,7)-(1,13))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,8)-(1,12))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,8)-(1,9))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :x
-                │   │   │   └── @ RequiredParameterNode (location: (1,11)-(1,12))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :y
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,7)-(1,8) = "|"
-                │   └── closing_loc: (1,12)-(1,13) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (2,2)-(2,7))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (2,2)-(2,7))
-                │           ├── flags: ∅
-                │           ├── receiver:
-                │           │   @ LocalVariableReadNode (location: (2,2)-(2,3))
-                │           │   ├── name: :x
-                │           │   └── depth: 0
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :+
-                │           ├── message_loc: (2,4)-(2,5) = "+"
-                │           ├── opening_loc: ∅
-                │           ├── arguments:
-                │           │   @ ArgumentsNode (location: (2,6)-(2,7))
-                │           │   ├── flags: ∅
-                │           │   └── arguments: (length: 1)
-                │           │       └── @ LocalVariableReadNode (location: (2,6)-(2,7))
-                │           │           ├── name: :y
-                │           │           └── depth: 0
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (1,4)-(1,6) = "do"
-                └── closing_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt b/test/mri/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt
deleted file mode 100644
index 663d870137c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,2)-(1,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :a
-            │           ├── message_loc: (1,2)-(1,3) = "a"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: (1,3)-(1,4) = ")"
-            └── block:
-                @ BlockNode (location: (1,5)-(3,3))
-                ├── locals: [:x, :y]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,8)-(1,14))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,9)-(1,13))
-                │   │   ├── requireds: (length: 2)
-                │   │   │   ├── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │   │   ├── flags: ∅
-                │   │   │   │   └── name: :x
-                │   │   │   └── @ RequiredParameterNode (location: (1,12)-(1,13))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :y
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,8)-(1,9) = "|"
-                │   └── closing_loc: (1,13)-(1,14) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (2,2)-(2,7))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (2,2)-(2,7))
-                │           ├── flags: ∅
-                │           ├── receiver:
-                │           │   @ LocalVariableReadNode (location: (2,2)-(2,3))
-                │           │   ├── name: :x
-                │           │   └── depth: 0
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :+
-                │           ├── message_loc: (2,4)-(2,5) = "+"
-                │           ├── opening_loc: ∅
-                │           ├── arguments:
-                │           │   @ ArgumentsNode (location: (2,6)-(2,7))
-                │           │   ├── flags: ∅
-                │           │   └── arguments: (length: 1)
-                │           │       └── @ LocalVariableReadNode (location: (2,6)-(2,7))
-                │           │           ├── name: :y
-                │           │           └── depth: 0
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (1,5)-(1,7) = "do"
-                └── closing_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_multiline_str.txt b/test/mri/prism/snapshots/seattlerb/parse_line_multiline_str.txt
deleted file mode 100644
index 8d4578eaec9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_multiline_str.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,1))
-    └── body: (length: 2)
-        ├── @ StringNode (location: (1,0)-(2,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── content_loc: (1,1)-(2,1) = "a\nb"
-        │   ├── closing_loc: (2,1)-(2,2) = "\""
-        │   └── unescaped: "a\nb"
-        └── @ IntegerNode (location: (3,0)-(3,1))
-            ├── flags: decimal
-            └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_multiline_str_literal_n.txt b/test/mri/prism/snapshots/seattlerb/parse_line_multiline_str_literal_n.txt
deleted file mode 100644
index 49d31f5b1b5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_multiline_str_literal_n.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,1))
-    └── body: (length: 2)
-        ├── @ StringNode (location: (1,0)-(1,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── content_loc: (1,1)-(1,5) = "a\\nb"
-        │   ├── closing_loc: (1,5)-(1,6) = "\""
-        │   └── unescaped: "a\nb"
-        └── @ IntegerNode (location: (2,0)-(2,1))
-            ├── flags: decimal
-            └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_newlines.txt b/test/mri/prism/snapshots/seattlerb/parse_line_newlines.txt
deleted file mode 100644
index 3e1ceef586d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_newlines.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ TrueNode (location: (1,0)-(1,4))
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_op_asgn.txt b/test/mri/prism/snapshots/seattlerb/parse_line_op_asgn.txt
deleted file mode 100644
index 5c2eb2da3cb..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_op_asgn.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-@ ProgramNode (location: (1,6)-(3,9))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,6)-(3,9))
-    └── body: (length: 2)
-        ├── @ LocalVariableOperatorWriteNode (location: (1,6)-(2,11))
-        │   ├── name_loc: (1,6)-(1,9) = "foo"
-        │   ├── operator_loc: (1,10)-(1,12) = "+="
-        │   ├── value:
-        │   │   @ CallNode (location: (2,8)-(2,11))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (2,8)-(2,11) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── name: :foo
-        │   ├── operator: :+
-        │   └── depth: 0
-        └── @ CallNode (location: (3,6)-(3,9))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :baz
-            ├── message_loc: (3,6)-(3,9) = "baz"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_postexe.txt b/test/mri/prism/snapshots/seattlerb/parse_line_postexe.txt
deleted file mode 100644
index 68b5f02fe0e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_postexe.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,1))
-    └── body: (length: 1)
-        └── @ PostExecutionNode (location: (1,0)-(3,1))
-            ├── statements:
-            │   @ StatementsNode (location: (2,0)-(2,3))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (2,0)-(2,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (2,0)-(2,3) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── keyword_loc: (1,0)-(1,3) = "END"
-            ├── opening_loc: (1,4)-(1,5) = "{"
-            └── closing_loc: (3,0)-(3,1) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_preexe.txt b/test/mri/prism/snapshots/seattlerb/parse_line_preexe.txt
deleted file mode 100644
index 65ea22cf7d4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_preexe.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,1))
-    └── body: (length: 1)
-        └── @ PreExecutionNode (location: (1,0)-(3,1))
-            ├── statements:
-            │   @ StatementsNode (location: (2,0)-(2,3))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (2,0)-(2,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (2,0)-(2,3) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── keyword_loc: (1,0)-(1,5) = "BEGIN"
-            ├── opening_loc: (1,6)-(1,7) = "{"
-            └── closing_loc: (3,0)-(3,1) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_rescue.txt b/test/mri/prism/snapshots/seattlerb/parse_line_rescue.txt
deleted file mode 100644
index cb20d5403bb..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_rescue.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,3))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(7,3))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (2,2)-(2,3))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (2,2)-(2,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :a
-            │           ├── message_loc: (2,2)-(2,3) = "a"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (3,0)-(6,3))
-            │   ├── keyword_loc: (3,0)-(3,6) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (4,2)-(4,3))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (4,2)-(4,3))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :b
-            │   │           ├── message_loc: (4,2)-(4,3) = "b"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent:
-            │       @ RescueNode (location: (5,0)-(6,3))
-            │       ├── keyword_loc: (5,0)-(5,6) = "rescue"
-            │       ├── exceptions: (length: 0)
-            │       ├── operator_loc: ∅
-            │       ├── reference: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (6,2)-(6,3))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (6,2)-(6,3))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :c
-            │       │           ├── message_loc: (6,2)-(6,3) = "c"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (7,0)-(7,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_return.txt b/test/mri/prism/snapshots/seattlerb/parse_line_return.txt
deleted file mode 100644
index 9194ae13ee5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_return.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,6)-(5,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,6)-(5,9))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,6)-(5,9))
-            ├── name: :blah
-            ├── name_loc: (1,10)-(1,14) = "blah"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (2,8)-(4,11))
-            │   └── body: (length: 1)
-            │       └── @ IfNode (location: (2,8)-(4,11))
-            │           ├── if_keyword_loc: (2,8)-(2,10) = "if"
-            │           ├── predicate:
-            │           │   @ TrueNode (location: (2,11)-(2,15))
-            │           ├── then_keyword_loc: (2,16)-(2,20) = "then"
-            │           ├── statements:
-            │           │   @ StatementsNode (location: (3,10)-(3,19))
-            │           │   └── body: (length: 1)
-            │           │       └── @ ReturnNode (location: (3,10)-(3,19))
-            │           │           ├── keyword_loc: (3,10)-(3,16) = "return"
-            │           │           └── arguments:
-            │           │               @ ArgumentsNode (location: (3,17)-(3,19))
-            │           │               ├── flags: ∅
-            │           │               └── arguments: (length: 1)
-            │           │                   └── @ IntegerNode (location: (3,17)-(3,19))
-            │           │                       ├── flags: decimal
-            │           │                       └── value: 42
-            │           ├── consequent: ∅
-            │           └── end_keyword_loc: (4,8)-(4,11) = "end"
-            ├── locals: []
-            ├── def_keyword_loc: (1,6)-(1,9) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (5,6)-(5,9) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_str_with_newline_escape.txt b/test/mri/prism/snapshots/seattlerb/parse_line_str_with_newline_escape.txt
deleted file mode 100644
index 4a675d67c48..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_str_with_newline_escape.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: (1,1)-(1,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,12))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ StringNode (location: (1,2)-(1,6))
-            │       │   ├── flags: ∅
-            │       │   ├── opening_loc: (1,2)-(1,3) = "\""
-            │       │   ├── content_loc: (1,3)-(1,5) = "\\n"
-            │       │   ├── closing_loc: (1,5)-(1,6) = "\""
-            │       │   └── unescaped: "\n"
-            │       └── @ TrueNode (location: (1,8)-(1,12))
-            ├── closing_loc: (1,12)-(1,13) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_to_ary.txt b/test/mri/prism/snapshots/seattlerb/parse_line_to_ary.txt
deleted file mode 100644
index 0485b0d2e3b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_to_ary.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,1))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,1))
-    └── body: (length: 2)
-        ├── @ MultiWriteNode (location: (1,0)-(2,5))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,1))
-        │   │   │   ├── name: :a
-        │   │   │   └── depth: 0
-        │   │   └── @ LocalVariableTargetNode (location: (2,0)-(2,1))
-        │   │       ├── name: :b
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (2,2)-(2,3) = "="
-        │   └── value:
-        │       @ CallNode (location: (2,4)-(2,5))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :c
-        │       ├── message_loc: (2,4)-(2,5) = "c"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,1))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :d
-            ├── message_loc: (3,0)-(3,1) = "d"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_line_trailing_newlines.txt b/test/mri/prism/snapshots/seattlerb/parse_line_trailing_newlines.txt
deleted file mode 100644
index 5cd7702847e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_line_trailing_newlines.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,1))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (2,0)-(2,1))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :b
-            ├── message_loc: (2,0)-(2,1) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_opt_call_args_assocs_comma.txt b/test/mri/prism/snapshots/seattlerb/parse_opt_call_args_assocs_comma.txt
deleted file mode 100644
index b767a5c17e5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_opt_call_args_assocs_comma.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,1)-(1,8) = "[2=>3,]"
-            ├── opening_loc: (1,1)-(1,2) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,2)-(1,6))
-            │           ├── flags: ∅
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,2)-(1,6))
-            │                   ├── key:
-            │                   │   @ IntegerNode (location: (1,2)-(1,3))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 2
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,5)-(1,6))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 3
-            │                   └── operator_loc: (1,3)-(1,5) = "=>"
-            ├── closing_loc: (1,7)-(1,8) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_opt_call_args_lit_comma.txt b/test/mri/prism/snapshots/seattlerb/parse_opt_call_args_lit_comma.txt
deleted file mode 100644
index d1d3d9335f3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_opt_call_args_lit_comma.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,1)-(1,5) = "[2,]"
-            ├── opening_loc: (1,1)-(1,2) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,2)-(1,3))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: (1,4)-(1,5) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/parse_pattern_019.txt b/test/mri/prism/snapshots/seattlerb/parse_pattern_019.txt
deleted file mode 100644
index 9e2500fbdef..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_pattern_019.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ IntegerNode (location: (1,5)-(1,6))
-            │   ├── flags: decimal
-            │   └── value: 0
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,6))
-            │       ├── pattern:
-            │       │   @ RangeNode (location: (2,3)-(2,8))
-            │       │   ├── flags: ∅
-            │       │   ├── left:
-            │       │   │   @ IntegerNode (location: (2,3)-(2,5))
-            │       │   │   ├── flags: decimal
-            │       │   │   └── value: -1
-            │       │   ├── right:
-            │       │   │   @ IntegerNode (location: (2,7)-(2,8))
-            │       │   │   ├── flags: decimal
-            │       │   │   └── value: 1
-            │       │   └── operator_loc: (2,5)-(2,7) = ".."
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,6))
-            │       │   └── body: (length: 1)
-            │       │       └── @ TrueNode (location: (3,2)-(3,6))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_pattern_044.txt b/test/mri/prism/snapshots/seattlerb/parse_pattern_044.txt
deleted file mode 100644
index 951a5100b67..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_pattern_044.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ CallNode (location: (1,5)-(1,8))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :obj
-            │   ├── message_loc: (1,5)-(1,8) = "obj"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,6))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,11))
-            │       │   ├── constant:
-            │       │   │   @ ConstantReadNode (location: (2,3)-(2,9))
-            │       │   │   └── name: :Object
-            │       │   ├── requireds: (length: 0)
-            │       │   ├── rest: ∅
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: (2,9)-(2,10) = "["
-            │       │   └── closing_loc: (2,10)-(2,11) = "]"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,6))
-            │       │   └── body: (length: 1)
-            │       │       └── @ TrueNode (location: (3,2)-(3,6))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_pattern_051.txt b/test/mri/prism/snapshots/seattlerb/parse_pattern_051.txt
deleted file mode 100644
index 6c366e559f6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_pattern_051.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ ArrayNode (location: (1,5)-(1,14))
-            │   ├── flags: ∅
-            │   ├── elements: (length: 3)
-            │   │   ├── @ IntegerNode (location: (1,6)-(1,7))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 0
-            │   │   ├── @ IntegerNode (location: (1,9)-(1,10))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 1
-            │   │   └── @ IntegerNode (location: (1,12)-(1,13))
-            │   │       ├── flags: decimal
-            │   │       └── value: 2
-            │   ├── opening_loc: (1,5)-(1,6) = "["
-            │   └── closing_loc: (1,13)-(1,14) = "]"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,6))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,3)-(2,10))
-            │       │   ├── constant: ∅
-            │       │   ├── requireds: (length: 2)
-            │       │   │   ├── @ IntegerNode (location: (2,4)-(2,5))
-            │       │   │   │   ├── flags: decimal
-            │       │   │   │   └── value: 0
-            │       │   │   └── @ IntegerNode (location: (2,7)-(2,8))
-            │       │   │       ├── flags: decimal
-            │       │   │       └── value: 1
-            │       │   ├── rest:
-            │       │   │   @ ImplicitRestNode (location: (2,8)-(2,9))
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: (2,3)-(2,4) = "["
-            │       │   └── closing_loc: (2,9)-(2,10) = "]"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,6))
-            │       │   └── body: (length: 1)
-            │       │       └── @ TrueNode (location: (3,2)-(3,6))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_pattern_058.txt b/test/mri/prism/snapshots/seattlerb/parse_pattern_058.txt
deleted file mode 100644
index 8a4f8f8a68c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_pattern_058.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: [:a, :rest]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ HashNode (location: (1,5)-(1,11))
-            │   ├── opening_loc: (1,5)-(1,6) = "{"
-            │   ├── elements: (length: 1)
-            │   │   └── @ AssocNode (location: (1,6)-(1,10))
-            │   │       ├── key:
-            │   │       │   @ SymbolNode (location: (1,6)-(1,8))
-            │   │       │   ├── flags: forced_us_ascii_encoding
-            │   │       │   ├── opening_loc: ∅
-            │   │       │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   │       │   ├── closing_loc: (1,7)-(1,8) = ":"
-            │   │       │   └── unescaped: "a"
-            │   │       ├── value:
-            │   │       │   @ IntegerNode (location: (1,9)-(1,10))
-            │   │       │   ├── flags: decimal
-            │   │       │   └── value: 0
-            │   │       └── operator_loc: ∅
-            │   └── closing_loc: (1,10)-(1,11) = "}"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,11))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,15))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 1)
-            │       │   │   └── @ AssocNode (location: (2,4)-(2,6))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,4)-(2,6))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,4)-(2,5) = "a"
-            │       │   │       │   ├── closing_loc: (2,5)-(2,6) = ":"
-            │       │   │       │   └── unescaped: "a"
-            │       │   │       ├── value:
-            │       │   │       │   @ ImplicitNode (location: (2,4)-(2,5))
-            │       │   │       │   └── value:
-            │       │   │       │       @ LocalVariableTargetNode (location: (2,4)-(2,5))
-            │       │   │       │       ├── name: :a
-            │       │   │       │       └── depth: 0
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest:
-            │       │   │   @ AssocSplatNode (location: (2,8)-(2,14))
-            │       │   │   ├── value:
-            │       │   │   │   @ LocalVariableTargetNode (location: (2,10)-(2,14))
-            │       │   │   │   ├── name: :rest
-            │       │   │   │   └── depth: 0
-            │       │   │   └── operator_loc: (2,8)-(2,10) = "**"
-            │       │   ├── opening_loc: (2,3)-(2,4) = "{"
-            │       │   └── closing_loc: (2,14)-(2,15) = "}"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,11))
-            │       │   └── body: (length: 1)
-            │       │       └── @ ArrayNode (location: (3,2)-(3,11))
-            │       │           ├── flags: ∅
-            │       │           ├── elements: (length: 2)
-            │       │           │   ├── @ LocalVariableReadNode (location: (3,3)-(3,4))
-            │       │           │   │   ├── name: :a
-            │       │           │   │   └── depth: 0
-            │       │           │   └── @ LocalVariableReadNode (location: (3,6)-(3,10))
-            │       │           │       ├── name: :rest
-            │       │           │       └── depth: 0
-            │       │           ├── opening_loc: (3,2)-(3,3) = "["
-            │       │           └── closing_loc: (3,10)-(3,11) = "]"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_pattern_058_2.txt b/test/mri/prism/snapshots/seattlerb/parse_pattern_058_2.txt
deleted file mode 100644
index 3507d0f2cf2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_pattern_058_2.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ HashNode (location: (1,5)-(1,11))
-            │   ├── opening_loc: (1,5)-(1,6) = "{"
-            │   ├── elements: (length: 1)
-            │   │   └── @ AssocNode (location: (1,6)-(1,10))
-            │   │       ├── key:
-            │   │       │   @ SymbolNode (location: (1,6)-(1,8))
-            │   │       │   ├── flags: forced_us_ascii_encoding
-            │   │       │   ├── opening_loc: ∅
-            │   │       │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   │       │   ├── closing_loc: (1,7)-(1,8) = ":"
-            │   │       │   └── unescaped: "a"
-            │   │       ├── value:
-            │   │       │   @ IntegerNode (location: (1,9)-(1,10))
-            │   │       │   ├── flags: decimal
-            │   │       │   └── value: 0
-            │   │       └── operator_loc: ∅
-            │   └── closing_loc: (1,10)-(1,11) = "}"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,5))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,11))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 1)
-            │       │   │   └── @ AssocNode (location: (2,4)-(2,6))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,4)-(2,6))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,4)-(2,5) = "a"
-            │       │   │       │   ├── closing_loc: (2,5)-(2,6) = ":"
-            │       │   │       │   └── unescaped: "a"
-            │       │   │       ├── value:
-            │       │   │       │   @ ImplicitNode (location: (2,4)-(2,5))
-            │       │   │       │   └── value:
-            │       │   │       │       @ LocalVariableTargetNode (location: (2,4)-(2,5))
-            │       │   │       │       ├── name: :a
-            │       │   │       │       └── depth: 0
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest:
-            │       │   │   @ AssocSplatNode (location: (2,8)-(2,10))
-            │       │   │   ├── value: ∅
-            │       │   │   └── operator_loc: (2,8)-(2,10) = "**"
-            │       │   ├── opening_loc: (2,3)-(2,4) = "{"
-            │       │   └── closing_loc: (2,10)-(2,11) = "}"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,5))
-            │       │   └── body: (length: 1)
-            │       │       └── @ ArrayNode (location: (3,2)-(3,5))
-            │       │           ├── flags: ∅
-            │       │           ├── elements: (length: 1)
-            │       │           │   └── @ LocalVariableReadNode (location: (3,3)-(3,4))
-            │       │           │       ├── name: :a
-            │       │           │       └── depth: 0
-            │       │           ├── opening_loc: (3,2)-(3,3) = "["
-            │       │           └── closing_loc: (3,4)-(3,5) = "]"
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_pattern_069.txt b/test/mri/prism/snapshots/seattlerb/parse_pattern_069.txt
deleted file mode 100644
index 09ac7653c6b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_pattern_069.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ SymbolNode (location: (1,5)-(1,7))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,5)-(1,6) = ":"
-            │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,3))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,15))
-            │       │   ├── constant:
-            │       │   │   @ ConstantReadNode (location: (2,3)-(2,9))
-            │       │   │   └── name: :Object
-            │       │   ├── elements: (length: 1)
-            │       │   │   └── @ AssocNode (location: (2,10)-(2,14))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,10)-(2,12))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,10)-(2,11) = "b"
-            │       │   │       │   ├── closing_loc: (2,11)-(2,12) = ":"
-            │       │   │       │   └── unescaped: "b"
-            │       │   │       ├── value:
-            │       │   │       │   @ IntegerNode (location: (2,13)-(2,14))
-            │       │   │       │   ├── flags: decimal
-            │       │   │       │   └── value: 1
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest: ∅
-            │       │   ├── opening_loc: (2,9)-(2,10) = "["
-            │       │   └── closing_loc: (2,14)-(2,15) = "]"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,3))
-            │       │   └── body: (length: 1)
-            │       │       └── @ IntegerNode (location: (3,2)-(3,3))
-            │       │           ├── flags: decimal
-            │       │           └── value: 1
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_pattern_076.txt b/test/mri/prism/snapshots/seattlerb/parse_pattern_076.txt
deleted file mode 100644
index 60e71cd6fe9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_pattern_076.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(4,3))
-            ├── predicate:
-            │   @ HashNode (location: (1,5)-(1,11))
-            │   ├── opening_loc: (1,5)-(1,6) = "{"
-            │   ├── elements: (length: 1)
-            │   │   └── @ AssocNode (location: (1,6)-(1,10))
-            │   │       ├── key:
-            │   │       │   @ SymbolNode (location: (1,6)-(1,8))
-            │   │       │   ├── flags: forced_us_ascii_encoding
-            │   │       │   ├── opening_loc: ∅
-            │   │       │   ├── value_loc: (1,6)-(1,7) = "a"
-            │   │       │   ├── closing_loc: (1,7)-(1,8) = ":"
-            │   │       │   └── unescaped: "a"
-            │   │       ├── value:
-            │   │       │   @ IntegerNode (location: (1,9)-(1,10))
-            │   │       │   ├── flags: decimal
-            │   │       │   └── value: 1
-            │   │       └── operator_loc: ∅
-            │   └── closing_loc: (1,10)-(1,11) = "}"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,0)-(3,6))
-            │       ├── pattern:
-            │       │   @ HashPatternNode (location: (2,3)-(2,16))
-            │       │   ├── constant: ∅
-            │       │   ├── elements: (length: 1)
-            │       │   │   └── @ AssocNode (location: (2,4)-(2,8))
-            │       │   │       ├── key:
-            │       │   │       │   @ SymbolNode (location: (2,4)-(2,6))
-            │       │   │       │   ├── flags: forced_us_ascii_encoding
-            │       │   │       │   ├── opening_loc: ∅
-            │       │   │       │   ├── value_loc: (2,4)-(2,5) = "a"
-            │       │   │       │   ├── closing_loc: (2,5)-(2,6) = ":"
-            │       │   │       │   └── unescaped: "a"
-            │       │   │       ├── value:
-            │       │   │       │   @ IntegerNode (location: (2,7)-(2,8))
-            │       │   │       │   ├── flags: decimal
-            │       │   │       │   └── value: 1
-            │       │   │       └── operator_loc: ∅
-            │       │   ├── rest:
-            │       │   │   @ NoKeywordsParameterNode (location: (2,10)-(2,15))
-            │       │   │   ├── operator_loc: (2,10)-(2,12) = "**"
-            │       │   │   └── keyword_loc: (2,12)-(2,15) = "nil"
-            │       │   ├── opening_loc: (2,3)-(2,4) = "{"
-            │       │   └── closing_loc: (2,15)-(2,16) = "}"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (3,2)-(3,6))
-            │       │   └── body: (length: 1)
-            │       │       └── @ TrueNode (location: (3,2)-(3,6))
-            │       ├── in_loc: (2,0)-(2,2) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_until_not_canonical.txt b/test/mri/prism/snapshots/seattlerb/parse_until_not_canonical.txt
deleted file mode 100644
index 7d5ef19a054..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_until_not_canonical.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ UntilNode (location: (1,0)-(3,3))
-            ├── flags: ∅
-            ├── keyword_loc: (1,0)-(1,5) = "until"
-            ├── closing_loc: (3,0)-(3,3) = "end"
-            ├── predicate:
-            │   @ CallNode (location: (1,6)-(1,18))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,10)-(1,18))
-            │   │   ├── flags: ∅
-            │   │   ├── receiver:
-            │   │   │   @ CallNode (location: (1,10)-(1,13))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :var
-            │   │   │   ├── message_loc: (1,10)-(1,13) = "var"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── call_operator_loc: (1,13)-(1,14) = "."
-            │   │   ├── name: :nil?
-            │   │   ├── message_loc: (1,14)-(1,18) = "nil?"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :!
-            │   ├── message_loc: (1,6)-(1,9) = "not"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (2,2)-(2,7))
-                └── body: (length: 1)
-                    └── @ StringNode (location: (2,2)-(2,7))
-                        ├── flags: ∅
-                        ├── opening_loc: (2,2)-(2,3) = "'"
-                        ├── content_loc: (2,3)-(2,6) = "foo"
-                        ├── closing_loc: (2,6)-(2,7) = "'"
-                        └── unescaped: "foo"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_until_not_noncanonical.txt b/test/mri/prism/snapshots/seattlerb/parse_until_not_noncanonical.txt
deleted file mode 100644
index 7d5ef19a054..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_until_not_noncanonical.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ UntilNode (location: (1,0)-(3,3))
-            ├── flags: ∅
-            ├── keyword_loc: (1,0)-(1,5) = "until"
-            ├── closing_loc: (3,0)-(3,3) = "end"
-            ├── predicate:
-            │   @ CallNode (location: (1,6)-(1,18))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,10)-(1,18))
-            │   │   ├── flags: ∅
-            │   │   ├── receiver:
-            │   │   │   @ CallNode (location: (1,10)-(1,13))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :var
-            │   │   │   ├── message_loc: (1,10)-(1,13) = "var"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── call_operator_loc: (1,13)-(1,14) = "."
-            │   │   ├── name: :nil?
-            │   │   ├── message_loc: (1,14)-(1,18) = "nil?"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :!
-            │   ├── message_loc: (1,6)-(1,9) = "not"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (2,2)-(2,7))
-                └── body: (length: 1)
-                    └── @ StringNode (location: (2,2)-(2,7))
-                        ├── flags: ∅
-                        ├── opening_loc: (2,2)-(2,3) = "'"
-                        ├── content_loc: (2,3)-(2,6) = "foo"
-                        ├── closing_loc: (2,6)-(2,7) = "'"
-                        └── unescaped: "foo"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_while_not_canonical.txt b/test/mri/prism/snapshots/seattlerb/parse_while_not_canonical.txt
deleted file mode 100644
index 91eb88a70f6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_while_not_canonical.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ WhileNode (location: (1,0)-(3,3))
-            ├── flags: ∅
-            ├── keyword_loc: (1,0)-(1,5) = "while"
-            ├── closing_loc: (3,0)-(3,3) = "end"
-            ├── predicate:
-            │   @ CallNode (location: (1,6)-(1,18))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,10)-(1,18))
-            │   │   ├── flags: ∅
-            │   │   ├── receiver:
-            │   │   │   @ CallNode (location: (1,10)-(1,13))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :var
-            │   │   │   ├── message_loc: (1,10)-(1,13) = "var"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── call_operator_loc: (1,13)-(1,14) = "."
-            │   │   ├── name: :nil?
-            │   │   ├── message_loc: (1,14)-(1,18) = "nil?"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :!
-            │   ├── message_loc: (1,6)-(1,9) = "not"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (2,2)-(2,7))
-                └── body: (length: 1)
-                    └── @ StringNode (location: (2,2)-(2,7))
-                        ├── flags: ∅
-                        ├── opening_loc: (2,2)-(2,3) = "'"
-                        ├── content_loc: (2,3)-(2,6) = "foo"
-                        ├── closing_loc: (2,6)-(2,7) = "'"
-                        └── unescaped: "foo"
diff --git a/test/mri/prism/snapshots/seattlerb/parse_while_not_noncanonical.txt b/test/mri/prism/snapshots/seattlerb/parse_while_not_noncanonical.txt
deleted file mode 100644
index 91eb88a70f6..00000000000
--- a/test/mri/prism/snapshots/seattlerb/parse_while_not_noncanonical.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ WhileNode (location: (1,0)-(3,3))
-            ├── flags: ∅
-            ├── keyword_loc: (1,0)-(1,5) = "while"
-            ├── closing_loc: (3,0)-(3,3) = "end"
-            ├── predicate:
-            │   @ CallNode (location: (1,6)-(1,18))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,10)-(1,18))
-            │   │   ├── flags: ∅
-            │   │   ├── receiver:
-            │   │   │   @ CallNode (location: (1,10)-(1,13))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :var
-            │   │   │   ├── message_loc: (1,10)-(1,13) = "var"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── call_operator_loc: (1,13)-(1,14) = "."
-            │   │   ├── name: :nil?
-            │   │   ├── message_loc: (1,14)-(1,18) = "nil?"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :!
-            │   ├── message_loc: (1,6)-(1,9) = "not"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (2,2)-(2,7))
-                └── body: (length: 1)
-                    └── @ StringNode (location: (2,2)-(2,7))
-                        ├── flags: ∅
-                        ├── opening_loc: (2,2)-(2,3) = "'"
-                        ├── content_loc: (2,3)-(2,6) = "foo"
-                        ├── closing_loc: (2,6)-(2,7) = "'"
-                        └── unescaped: "foo"
diff --git a/test/mri/prism/snapshots/seattlerb/pctW_lineno.txt b/test/mri/prism/snapshots/seattlerb/pctW_lineno.txt
deleted file mode 100644
index 58efa9c59a1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/pctW_lineno.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,11))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(5,11))
-            ├── flags: ∅
-            ├── elements: (length: 7)
-            │   ├── @ StringNode (location: (1,3)-(1,7))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,3)-(1,7) = "a\\nb"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a\nb"
-            │   ├── @ StringNode (location: (2,0)-(2,1))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (2,0)-(2,1) = "c"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "c"
-            │   ├── @ StringNode (location: (2,2)-(2,3))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (2,2)-(2,3) = "d"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "d"
-            │   ├── @ StringNode (location: (3,0)-(4,1))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (3,0)-(4,1) = "e\\\nf"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "e\nf"
-            │   ├── @ StringNode (location: (5,0)-(5,2))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (5,0)-(5,2) = "gy"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "gy"
-            │   ├── @ StringNode (location: (5,3)-(5,6))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (5,3)-(5,6) = "h\\y"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "hy"
-            │   └── @ StringNode (location: (5,7)-(5,10))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (5,7)-(5,10) = "i\\y"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "iy"
-            ├── opening_loc: (1,0)-(1,3) = "%W("
-            └── closing_loc: (5,10)-(5,11) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/pct_Q_backslash_nl.txt b/test/mri/prism/snapshots/seattlerb/pct_Q_backslash_nl.txt
deleted file mode 100644
index 31cc0941ee2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/pct_Q_backslash_nl.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,1))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(2,1))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,3) = "%q{"
-            ├── content_loc: (1,3)-(2,0) = " \\\n"
-            ├── closing_loc: (2,0)-(2,1) = "}"
-            └── unescaped: " \\\n"
diff --git a/test/mri/prism/snapshots/seattlerb/pct_nl.txt b/test/mri/prism/snapshots/seattlerb/pct_nl.txt
deleted file mode 100644
index 1009fcb51d0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/pct_nl.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,0))
-├── locals: [:x]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,0))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(3,0))
-            ├── name: :x
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "x"
-            ├── value:
-            │   @ StringNode (location: (1,4)-(3,0))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (1,4)-(2,0) = "%\n"
-            │   ├── content_loc: (2,0)-(2,0) = ""
-            │   ├── closing_loc: (2,0)-(3,0) = "\n"
-            │   └── unescaped: ""
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt b/test/mri/prism/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt
deleted file mode 100644
index 946f08bc3c5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,11))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(4,11))
-            ├── flags: ∅
-            ├── elements: (length: 5)
-            │   ├── @ StringNode (location: (1,4)-(1,5))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,4)-(1,5) = "1"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "1"
-            │   ├── @ InterpolatedStringNode (location: (1,6)-(1,12))
-            │   │   ├── opening_loc: ∅
-            │   │   ├── parts: (length: 1)
-            │   │   │   └── @ EmbeddedStatementsNode (location: (1,6)-(1,12))
-            │   │   │       ├── opening_loc: (1,6)-(1,8) = "\#{"
-            │   │   │       ├── statements:
-            │   │   │       │   @ StatementsNode (location: (1,8)-(1,11))
-            │   │   │       │   └── body: (length: 1)
-            │   │   │       │       └── @ StringNode (location: (1,8)-(1,11))
-            │   │   │       │           ├── flags: ∅
-            │   │   │       │           ├── opening_loc: (1,8)-(1,11) = "<<A"
-            │   │   │       │           ├── content_loc: (2,0)-(3,0) = "2\n"
-            │   │   │       │           ├── closing_loc: (3,0)-(4,0) = "A\n"
-            │   │   │       │           └── unescaped: "2\n"
-            │   │   │       └── closing_loc: (1,11)-(1,12) = "}"
-            │   │   └── closing_loc: ∅
-            │   ├── @ StringNode (location: (1,13)-(1,14))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,13)-(1,14) = "3"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "3"
-            │   ├── @ StringNode (location: (4,6)-(4,7))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (4,6)-(4,7) = "4"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "4"
-            │   └── @ StringNode (location: (4,8)-(4,9))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (4,8)-(4,9) = "5"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "5"
-            ├── opening_loc: (1,0)-(1,3) = "%W("
-            └── closing_loc: (4,10)-(4,11) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/pipe_semicolon.txt b/test/mri/prism/snapshots/seattlerb/pipe_semicolon.txt
deleted file mode 100644
index 71fb4fbed56..00000000000
--- a/test/mri/prism/snapshots/seattlerb/pipe_semicolon.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,18))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :b
-            ├── message_loc: (1,2)-(1,3) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,4)-(1,18))
-                ├── locals: [:c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,7)-(1,14))
-                │   ├── parameters: ∅
-                │   ├── locals: (length: 1)
-                │   │   └── @ BlockLocalVariableNode (location: (1,11)-(1,12))
-                │   │       ├── flags: ∅
-                │   │       └── name: :c
-                │   ├── opening_loc: (1,7)-(1,8) = "|"
-                │   └── closing_loc: (1,13)-(1,14) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,4)-(1,6) = "do"
-                └── closing_loc: (1,15)-(1,18) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/pipe_space.txt b/test/mri/prism/snapshots/seattlerb/pipe_space.txt
deleted file mode 100644
index 302d2253377..00000000000
--- a/test/mri/prism/snapshots/seattlerb/pipe_space.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,2) = "."
-            ├── name: :b
-            ├── message_loc: (1,2)-(1,3) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,4)-(1,14))
-                ├── locals: []
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,7)-(1,10))
-                │   ├── parameters: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,7)-(1,8) = "|"
-                │   └── closing_loc: (1,9)-(1,10) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,4)-(1,6) = "do"
-                └── closing_loc: (1,11)-(1,14) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/qWords_space.txt b/test/mri/prism/snapshots/seattlerb/qWords_space.txt
deleted file mode 100644
index 95ae6d40752..00000000000
--- a/test/mri/prism/snapshots/seattlerb/qWords_space.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── elements: (length: 0)
-            ├── opening_loc: (1,0)-(1,3) = "%W("
-            └── closing_loc: (1,4)-(1,5) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/qsymbols.txt b/test/mri/prism/snapshots/seattlerb/qsymbols.txt
deleted file mode 100644
index 8ba68638c5b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/qsymbols.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── elements: (length: 3)
-            │   ├── @ SymbolNode (location: (1,3)-(1,4))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,3)-(1,4) = "a"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a"
-            │   ├── @ SymbolNode (location: (1,5)-(1,6))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,5)-(1,6) = "b"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "b"
-            │   └── @ SymbolNode (location: (1,7)-(1,8))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: ∅
-            │       ├── value_loc: (1,7)-(1,8) = "c"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "c"
-            ├── opening_loc: (1,0)-(1,3) = "%I("
-            └── closing_loc: (1,8)-(1,9) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/qsymbols_empty.txt b/test/mri/prism/snapshots/seattlerb/qsymbols_empty.txt
deleted file mode 100644
index 54aa3f77d71..00000000000
--- a/test/mri/prism/snapshots/seattlerb/qsymbols_empty.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── elements: (length: 0)
-            ├── opening_loc: (1,0)-(1,3) = "%I("
-            └── closing_loc: (1,3)-(1,4) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/qsymbols_empty_space.txt b/test/mri/prism/snapshots/seattlerb/qsymbols_empty_space.txt
deleted file mode 100644
index 624b922ce66..00000000000
--- a/test/mri/prism/snapshots/seattlerb/qsymbols_empty_space.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── elements: (length: 0)
-            ├── opening_loc: (1,0)-(1,3) = "%I("
-            └── closing_loc: (1,4)-(1,5) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/qsymbols_interp.txt b/test/mri/prism/snapshots/seattlerb/qsymbols_interp.txt
deleted file mode 100644
index 23c39302475..00000000000
--- a/test/mri/prism/snapshots/seattlerb/qsymbols_interp.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,15))
-            ├── flags: ∅
-            ├── elements: (length: 3)
-            │   ├── @ SymbolNode (location: (1,3)-(1,4))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,3)-(1,4) = "a"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a"
-            │   ├── @ InterpolatedSymbolNode (location: (1,5)-(1,12))
-            │   │   ├── opening_loc: ∅
-            │   │   ├── parts: (length: 2)
-            │   │   │   ├── @ StringNode (location: (1,5)-(1,6))
-            │   │   │   │   ├── flags: ∅
-            │   │   │   │   ├── opening_loc: ∅
-            │   │   │   │   ├── content_loc: (1,5)-(1,6) = "b"
-            │   │   │   │   ├── closing_loc: ∅
-            │   │   │   │   └── unescaped: "b"
-            │   │   │   └── @ EmbeddedStatementsNode (location: (1,6)-(1,12))
-            │   │   │       ├── opening_loc: (1,6)-(1,8) = "\#{"
-            │   │   │       ├── statements:
-            │   │   │       │   @ StatementsNode (location: (1,8)-(1,11))
-            │   │   │       │   └── body: (length: 1)
-            │   │   │       │       └── @ CallNode (location: (1,8)-(1,11))
-            │   │   │       │           ├── flags: ∅
-            │   │   │       │           ├── receiver:
-            │   │   │       │           │   @ IntegerNode (location: (1,8)-(1,9))
-            │   │   │       │           │   ├── flags: decimal
-            │   │   │       │           │   └── value: 1
-            │   │   │       │           ├── call_operator_loc: ∅
-            │   │   │       │           ├── name: :+
-            │   │   │       │           ├── message_loc: (1,9)-(1,10) = "+"
-            │   │   │       │           ├── opening_loc: ∅
-            │   │   │       │           ├── arguments:
-            │   │   │       │           │   @ ArgumentsNode (location: (1,10)-(1,11))
-            │   │   │       │           │   ├── flags: ∅
-            │   │   │       │           │   └── arguments: (length: 1)
-            │   │   │       │           │       └── @ IntegerNode (location: (1,10)-(1,11))
-            │   │   │       │           │           ├── flags: decimal
-            │   │   │       │           │           └── value: 1
-            │   │   │       │           ├── closing_loc: ∅
-            │   │   │       │           └── block: ∅
-            │   │   │       └── closing_loc: (1,11)-(1,12) = "}"
-            │   │   └── closing_loc: ∅
-            │   └── @ SymbolNode (location: (1,13)-(1,14))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: ∅
-            │       ├── value_loc: (1,13)-(1,14) = "c"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "c"
-            ├── opening_loc: (1,0)-(1,3) = "%I("
-            └── closing_loc: (1,14)-(1,15) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/quoted_symbol_hash_arg.txt b/test/mri/prism/snapshots/seattlerb/quoted_symbol_hash_arg.txt
deleted file mode 100644
index 64caf51bcbd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/quoted_symbol_hash_arg.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :puts
-            ├── message_loc: (1,0)-(1,4) = "puts"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,12))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,5)-(1,12))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,5)-(1,12))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,5)-(1,9))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (1,5)-(1,6) = "'"
-            │                   │   ├── value_loc: (1,6)-(1,7) = "a"
-            │                   │   ├── closing_loc: (1,7)-(1,9) = "':"
-            │                   │   └── unescaped: "a"
-            │                   ├── value:
-            │                   │   @ HashNode (location: (1,10)-(1,12))
-            │                   │   ├── opening_loc: (1,10)-(1,11) = "{"
-            │                   │   ├── elements: (length: 0)
-            │                   │   └── closing_loc: (1,11)-(1,12) = "}"
-            │                   └── operator_loc: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/quoted_symbol_keys.txt b/test/mri/prism/snapshots/seattlerb/quoted_symbol_keys.txt
deleted file mode 100644
index 96e6af51a42..00000000000
--- a/test/mri/prism/snapshots/seattlerb/quoted_symbol_keys.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,0)-(1,11))
-            ├── opening_loc: (1,0)-(1,1) = "{"
-            ├── elements: (length: 1)
-            │   └── @ AssocNode (location: (1,2)-(1,9))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (1,2)-(1,6))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (1,2)-(1,3) = "'"
-            │       │   ├── value_loc: (1,3)-(1,4) = "a"
-            │       │   ├── closing_loc: (1,4)-(1,6) = "':"
-            │       │   └── unescaped: "a"
-            │       ├── value:
-            │       │   @ SymbolNode (location: (1,7)-(1,9))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (1,7)-(1,8) = ":"
-            │       │   ├── value_loc: (1,8)-(1,9) = "b"
-            │       │   ├── closing_loc: ∅
-            │       │   └── unescaped: "b"
-            │       └── operator_loc: ∅
-            └── closing_loc: (1,10)-(1,11) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/qw_escape.txt b/test/mri/prism/snapshots/seattlerb/qw_escape.txt
deleted file mode 100644
index d92c1da7a62..00000000000
--- a/test/mri/prism/snapshots/seattlerb/qw_escape.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,7))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,3) = "%q("
-            ├── content_loc: (1,3)-(1,6) = "\u0001\\'"
-            ├── closing_loc: (1,6)-(1,7) = ")"
-            └── unescaped: "\u0001\\'"
diff --git a/test/mri/prism/snapshots/seattlerb/qw_escape_term.txt b/test/mri/prism/snapshots/seattlerb/qw_escape_term.txt
deleted file mode 100644
index e935b7eb685..00000000000
--- a/test/mri/prism/snapshots/seattlerb/qw_escape_term.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,26))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,26))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,3) = "%q|"
-            ├── content_loc: (1,3)-(1,25) = "blah blah \\| blah blah"
-            ├── closing_loc: (1,25)-(1,26) = "|"
-            └── unescaped: "blah blah | blah blah"
diff --git a/test/mri/prism/snapshots/seattlerb/qwords_empty.txt b/test/mri/prism/snapshots/seattlerb/qwords_empty.txt
deleted file mode 100644
index f9915c97c9d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/qwords_empty.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── elements: (length: 0)
-            ├── opening_loc: (1,0)-(1,3) = "%w("
-            └── closing_loc: (1,3)-(1,4) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/read_escape_unicode_curlies.txt b/test/mri/prism/snapshots/seattlerb/read_escape_unicode_curlies.txt
deleted file mode 100644
index 3ea5604b697..00000000000
--- a/test/mri/prism/snapshots/seattlerb/read_escape_unicode_curlies.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,9))
-            ├── flags: forced_utf8_encoding
-            ├── opening_loc: (1,0)-(1,1) = "?"
-            ├── content_loc: (1,1)-(1,9) = "\\u{00a0}"
-            ├── closing_loc: ∅
-            └── unescaped: " "
diff --git a/test/mri/prism/snapshots/seattlerb/read_escape_unicode_h4.txt b/test/mri/prism/snapshots/seattlerb/read_escape_unicode_h4.txt
deleted file mode 100644
index 1eba1396fd0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/read_escape_unicode_h4.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,7))
-            ├── flags: forced_utf8_encoding
-            ├── opening_loc: (1,0)-(1,1) = "?"
-            ├── content_loc: (1,1)-(1,7) = "\\u00a0"
-            ├── closing_loc: ∅
-            └── unescaped: " "
diff --git a/test/mri/prism/snapshots/seattlerb/regexp.txt b/test/mri/prism/snapshots/seattlerb/regexp.txt
deleted file mode 100644
index 06cf99264e3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/regexp.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,13))
-    └── body: (length: 5)
-        ├── @ RegularExpressionNode (location: (1,0)-(1,5))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (1,0)-(1,1) = "/"
-        │   ├── content_loc: (1,1)-(1,4) = "wtf"
-        │   ├── closing_loc: (1,4)-(1,5) = "/"
-        │   └── unescaped: "wtf"
-        ├── @ RegularExpressionNode (location: (3,0)-(3,6))
-        │   ├── flags: multi_line, forced_us_ascii_encoding
-        │   ├── opening_loc: (3,0)-(3,1) = "/"
-        │   ├── content_loc: (3,1)-(3,4) = "wtf"
-        │   ├── closing_loc: (3,4)-(3,6) = "/m"
-        │   └── unescaped: "wtf"
-        ├── @ RegularExpressionNode (location: (5,0)-(5,6))
-        │   ├── flags: ascii_8bit, forced_us_ascii_encoding
-        │   ├── opening_loc: (5,0)-(5,1) = "/"
-        │   ├── content_loc: (5,1)-(5,4) = "wtf"
-        │   ├── closing_loc: (5,4)-(5,6) = "/n"
-        │   └── unescaped: "wtf"
-        ├── @ RegularExpressionNode (location: (7,0)-(7,7))
-        │   ├── flags: multi_line, ascii_8bit, forced_us_ascii_encoding
-        │   ├── opening_loc: (7,0)-(7,1) = "/"
-        │   ├── content_loc: (7,1)-(7,4) = "wtf"
-        │   ├── closing_loc: (7,4)-(7,7) = "/nm"
-        │   └── unescaped: "wtf"
-        └── @ RegularExpressionNode (location: (9,0)-(9,13))
-            ├── flags: multi_line, ascii_8bit, forced_us_ascii_encoding
-            ├── opening_loc: (9,0)-(9,1) = "/"
-            ├── content_loc: (9,1)-(9,4) = "wtf"
-            ├── closing_loc: (9,4)-(9,13) = "/nmnmnmnm"
-            └── unescaped: "wtf"
diff --git a/test/mri/prism/snapshots/seattlerb/regexp_esc_C_slash.txt b/test/mri/prism/snapshots/seattlerb/regexp_esc_C_slash.txt
deleted file mode 100644
index 4dbedc44ca4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/regexp_esc_C_slash.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ RegularExpressionNode (location: (1,0)-(1,7))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (1,0)-(1,1) = "/"
-            ├── content_loc: (1,1)-(1,6) = "\\cC\\d"
-            ├── closing_loc: (1,6)-(1,7) = "/"
-            └── unescaped: "\\x03\\d"
diff --git a/test/mri/prism/snapshots/seattlerb/regexp_esc_u.txt b/test/mri/prism/snapshots/seattlerb/regexp_esc_u.txt
deleted file mode 100644
index bca451eb3b5..00000000000
--- a/test/mri/prism/snapshots/seattlerb/regexp_esc_u.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ RegularExpressionNode (location: (1,0)-(1,17))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (1,0)-(1,1) = "/"
-            ├── content_loc: (1,1)-(1,16) = "[\\u0021-\\u0027]"
-            ├── closing_loc: (1,16)-(1,17) = "/"
-            └── unescaped: "[\\u0021-\\u0027]"
diff --git a/test/mri/prism/snapshots/seattlerb/regexp_escape_extended.txt b/test/mri/prism/snapshots/seattlerb/regexp_escape_extended.txt
deleted file mode 100644
index 6568d2bd923..00000000000
--- a/test/mri/prism/snapshots/seattlerb/regexp_escape_extended.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ RegularExpressionNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,1) = "/"
-            ├── content_loc: (1,1)-(1,5) = "\\“"
-            ├── closing_loc: (1,5)-(1,6) = "/"
-            └── unescaped: "“"
diff --git a/test/mri/prism/snapshots/seattlerb/regexp_unicode_curlies.txt b/test/mri/prism/snapshots/seattlerb/regexp_unicode_curlies.txt
deleted file mode 100644
index 487161b4d0d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/regexp_unicode_curlies.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,8))
-    └── body: (length: 2)
-        ├── @ RegularExpressionNode (location: (1,0)-(1,15))
-        │   ├── flags: forced_utf8_encoding
-        │   ├── opening_loc: (1,0)-(1,1) = "/"
-        │   ├── content_loc: (1,1)-(1,14) = "\\u{c0de babe}"
-        │   ├── closing_loc: (1,14)-(1,15) = "/"
-        │   └── unescaped: "\\u{c0de babe}"
-        └── @ RegularExpressionNode (location: (3,0)-(3,8))
-            ├── flags: forced_utf8_encoding
-            ├── opening_loc: (3,0)-(3,1) = "/"
-            ├── content_loc: (3,1)-(3,7) = "\\u{df}"
-            ├── closing_loc: (3,7)-(3,8) = "/"
-            └── unescaped: "\\u{df}"
diff --git a/test/mri/prism/snapshots/seattlerb/required_kwarg_no_value.txt b/test/mri/prism/snapshots/seattlerb/required_kwarg_no_value.txt
deleted file mode 100644
index 54595ac5cba..00000000000
--- a/test/mri/prism/snapshots/seattlerb/required_kwarg_no_value.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(2,3))
-            ├── name: :x
-            ├── name_loc: (1,4)-(1,5) = "x"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,12))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 2)
-            │   │   ├── @ RequiredKeywordParameterNode (location: (1,6)-(1,8))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── name: :a
-            │   │   │   └── name_loc: (1,6)-(1,8) = "a:"
-            │   │   └── @ RequiredKeywordParameterNode (location: (1,10)-(1,12))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :b
-            │   │       └── name_loc: (1,10)-(1,12) = "b:"
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:a, :b]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (2,0)-(2,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt b/test/mri/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt
deleted file mode 100644
index 21f8bb08a5c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(5,8))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(5,3))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :proc
-            │   ├── message_loc: (1,0)-(1,4) = "proc"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (1,5)-(5,3))
-            │       ├── locals: []
-            │       ├── parameters: ∅
-            │       ├── body:
-            │       │   @ BeginNode (location: (1,5)-(5,3))
-            │       │   ├── begin_keyword_loc: ∅
-            │       │   ├── statements:
-            │       │   │   @ StatementsNode (location: (2,2)-(2,8))
-            │       │   │   └── body: (length: 1)
-            │       │   │       └── @ SymbolNode (location: (2,2)-(2,8))
-            │       │   │           ├── flags: forced_us_ascii_encoding
-            │       │   │           ├── opening_loc: (2,2)-(2,3) = ":"
-            │       │   │           ├── value_loc: (2,3)-(2,8) = "begin"
-            │       │   │           ├── closing_loc: ∅
-            │       │   │           └── unescaped: "begin"
-            │       │   ├── rescue_clause: ∅
-            │       │   ├── else_clause: ∅
-            │       │   ├── ensure_clause:
-            │       │   │   @ EnsureNode (location: (3,0)-(5,3))
-            │       │   │   ├── ensure_keyword_loc: (3,0)-(3,6) = "ensure"
-            │       │   │   ├── statements:
-            │       │   │   │   @ StatementsNode (location: (4,2)-(4,9))
-            │       │   │   │   └── body: (length: 1)
-            │       │   │   │       └── @ SymbolNode (location: (4,2)-(4,9))
-            │       │   │   │           ├── flags: forced_us_ascii_encoding
-            │       │   │   │           ├── opening_loc: (4,2)-(4,3) = ":"
-            │       │   │   │           ├── value_loc: (4,3)-(4,9) = "ensure"
-            │       │   │   │           ├── closing_loc: ∅
-            │       │   │   │           └── unescaped: "ensure"
-            │       │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-            │       │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-            │       ├── opening_loc: (1,5)-(1,7) = "do"
-            │       └── closing_loc: (5,0)-(5,3) = "end"
-            ├── call_operator_loc: (5,3)-(5,4) = "."
-            ├── name: :call
-            ├── message_loc: (5,4)-(5,8) = "call"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt b/test/mri/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt
deleted file mode 100644
index aa4e85c171b..00000000000
--- a/test/mri/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(9,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :tap
-            ├── message_loc: (1,0)-(1,3) = "tap"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,4)-(9,3))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ BeginNode (location: (1,4)-(9,3))
-                │   ├── begin_keyword_loc: ∅
-                │   ├── statements:
-                │   │   @ StatementsNode (location: (2,2)-(2,8))
-                │   │   └── body: (length: 1)
-                │   │       └── @ SymbolNode (location: (2,2)-(2,8))
-                │   │           ├── flags: forced_us_ascii_encoding
-                │   │           ├── opening_loc: (2,2)-(2,3) = ":"
-                │   │           ├── value_loc: (2,3)-(2,8) = "begin"
-                │   │           ├── closing_loc: ∅
-                │   │           └── unescaped: "begin"
-                │   ├── rescue_clause:
-                │   │   @ RescueNode (location: (3,0)-(4,9))
-                │   │   ├── keyword_loc: (3,0)-(3,6) = "rescue"
-                │   │   ├── exceptions: (length: 0)
-                │   │   ├── operator_loc: ∅
-                │   │   ├── reference: ∅
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (4,2)-(4,9))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ SymbolNode (location: (4,2)-(4,9))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (4,2)-(4,3) = ":"
-                │   │   │           ├── value_loc: (4,3)-(4,9) = "rescue"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "rescue"
-                │   │   └── consequent: ∅
-                │   ├── else_clause:
-                │   │   @ ElseNode (location: (5,0)-(7,6))
-                │   │   ├── else_keyword_loc: (5,0)-(5,4) = "else"
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (6,2)-(6,7))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ SymbolNode (location: (6,2)-(6,7))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (6,2)-(6,3) = ":"
-                │   │   │           ├── value_loc: (6,3)-(6,7) = "else"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "else"
-                │   │   └── end_keyword_loc: (7,0)-(7,6) = "ensure"
-                │   ├── ensure_clause:
-                │   │   @ EnsureNode (location: (7,0)-(9,3))
-                │   │   ├── ensure_keyword_loc: (7,0)-(7,6) = "ensure"
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (8,2)-(8,9))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ SymbolNode (location: (8,2)-(8,9))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (8,2)-(8,3) = ":"
-                │   │   │           ├── value_loc: (8,3)-(8,9) = "ensure"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "ensure"
-                │   │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-                │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-                ├── opening_loc: (1,4)-(1,6) = "do"
-                └── closing_loc: (9,0)-(9,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/rescue_do_end_raised.txt b/test/mri/prism/snapshots/seattlerb/rescue_do_end_raised.txt
deleted file mode 100644
index 06f67fae690..00000000000
--- a/test/mri/prism/snapshots/seattlerb/rescue_do_end_raised.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(5,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :tap
-            ├── message_loc: (1,0)-(1,3) = "tap"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,4)-(5,3))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ BeginNode (location: (1,4)-(5,3))
-                │   ├── begin_keyword_loc: ∅
-                │   ├── statements:
-                │   │   @ StatementsNode (location: (2,2)-(2,7))
-                │   │   └── body: (length: 1)
-                │   │       └── @ CallNode (location: (2,2)-(2,7))
-                │   │           ├── flags: variable_call, ignore_visibility
-                │   │           ├── receiver: ∅
-                │   │           ├── call_operator_loc: ∅
-                │   │           ├── name: :raise
-                │   │           ├── message_loc: (2,2)-(2,7) = "raise"
-                │   │           ├── opening_loc: ∅
-                │   │           ├── arguments: ∅
-                │   │           ├── closing_loc: ∅
-                │   │           └── block: ∅
-                │   ├── rescue_clause: ∅
-                │   ├── else_clause: ∅
-                │   ├── ensure_clause:
-                │   │   @ EnsureNode (location: (3,0)-(5,3))
-                │   │   ├── ensure_keyword_loc: (3,0)-(3,6) = "ensure"
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (4,2)-(4,9))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ SymbolNode (location: (4,2)-(4,9))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (4,2)-(4,3) = ":"
-                │   │   │           ├── value_loc: (4,3)-(4,9) = "ensure"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "ensure"
-                │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-                │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-                ├── opening_loc: (1,4)-(1,6) = "do"
-                └── closing_loc: (5,0)-(5,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/rescue_do_end_rescued.txt b/test/mri/prism/snapshots/seattlerb/rescue_do_end_rescued.txt
deleted file mode 100644
index b4576c3bb2e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/rescue_do_end_rescued.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(9,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :tap
-            ├── message_loc: (1,0)-(1,3) = "tap"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,4)-(9,3))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ BeginNode (location: (1,4)-(9,3))
-                │   ├── begin_keyword_loc: ∅
-                │   ├── statements:
-                │   │   @ StatementsNode (location: (2,2)-(2,7))
-                │   │   └── body: (length: 1)
-                │   │       └── @ CallNode (location: (2,2)-(2,7))
-                │   │           ├── flags: variable_call, ignore_visibility
-                │   │           ├── receiver: ∅
-                │   │           ├── call_operator_loc: ∅
-                │   │           ├── name: :raise
-                │   │           ├── message_loc: (2,2)-(2,7) = "raise"
-                │   │           ├── opening_loc: ∅
-                │   │           ├── arguments: ∅
-                │   │           ├── closing_loc: ∅
-                │   │           └── block: ∅
-                │   ├── rescue_clause:
-                │   │   @ RescueNode (location: (3,0)-(4,9))
-                │   │   ├── keyword_loc: (3,0)-(3,6) = "rescue"
-                │   │   ├── exceptions: (length: 0)
-                │   │   ├── operator_loc: ∅
-                │   │   ├── reference: ∅
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (4,2)-(4,9))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ SymbolNode (location: (4,2)-(4,9))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (4,2)-(4,3) = ":"
-                │   │   │           ├── value_loc: (4,3)-(4,9) = "rescue"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "rescue"
-                │   │   └── consequent: ∅
-                │   ├── else_clause:
-                │   │   @ ElseNode (location: (5,0)-(7,6))
-                │   │   ├── else_keyword_loc: (5,0)-(5,4) = "else"
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (6,2)-(6,7))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ SymbolNode (location: (6,2)-(6,7))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (6,2)-(6,3) = ":"
-                │   │   │           ├── value_loc: (6,3)-(6,7) = "else"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "else"
-                │   │   └── end_keyword_loc: (7,0)-(7,6) = "ensure"
-                │   ├── ensure_clause:
-                │   │   @ EnsureNode (location: (7,0)-(9,3))
-                │   │   ├── ensure_keyword_loc: (7,0)-(7,6) = "ensure"
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (8,2)-(8,9))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ SymbolNode (location: (8,2)-(8,9))
-                │   │   │           ├── flags: forced_us_ascii_encoding
-                │   │   │           ├── opening_loc: (8,2)-(8,3) = ":"
-                │   │   │           ├── value_loc: (8,3)-(8,9) = "ensure"
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── unescaped: "ensure"
-                │   │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-                │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-                ├── opening_loc: (1,4)-(1,6) = "do"
-                └── closing_loc: (9,0)-(9,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/rescue_in_block.txt b/test/mri/prism/snapshots/seattlerb/rescue_in_block.txt
deleted file mode 100644
index daac2b67763..00000000000
--- a/test/mri/prism/snapshots/seattlerb/rescue_in_block.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(4,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :blah
-            ├── message_loc: (1,0)-(1,4) = "blah"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,5)-(4,3))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ BeginNode (location: (1,5)-(4,3))
-                │   ├── begin_keyword_loc: ∅
-                │   ├── statements: ∅
-                │   ├── rescue_clause:
-                │   │   @ RescueNode (location: (2,0)-(3,7))
-                │   │   ├── keyword_loc: (2,0)-(2,6) = "rescue"
-                │   │   ├── exceptions: (length: 0)
-                │   │   ├── operator_loc: ∅
-                │   │   ├── reference: ∅
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (3,2)-(3,7))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ CallNode (location: (3,2)-(3,7))
-                │   │   │           ├── flags: variable_call, ignore_visibility
-                │   │   │           ├── receiver: ∅
-                │   │   │           ├── call_operator_loc: ∅
-                │   │   │           ├── name: :stuff
-                │   │   │           ├── message_loc: (3,2)-(3,7) = "stuff"
-                │   │   │           ├── opening_loc: ∅
-                │   │   │           ├── arguments: ∅
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── block: ∅
-                │   │   └── consequent: ∅
-                │   ├── else_clause: ∅
-                │   ├── ensure_clause: ∅
-                │   └── end_keyword_loc: (4,0)-(4,3) = "end"
-                ├── opening_loc: (1,5)-(1,7) = "do"
-                └── closing_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/rescue_parens.txt b/test/mri/prism/snapshots/seattlerb/rescue_parens.txt
deleted file mode 100644
index d086095e7ae..00000000000
--- a/test/mri/prism/snapshots/seattlerb/rescue_parens.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,14))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,2)-(1,14))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,3)-(1,13))
-            │           │   └── body: (length: 1)
-            │           │       └── @ RescueModifierNode (location: (1,3)-(1,13))
-            │           │           ├── expression:
-            │           │           │   @ CallNode (location: (1,3)-(1,4))
-            │           │           │   ├── flags: variable_call, ignore_visibility
-            │           │           │   ├── receiver: ∅
-            │           │           │   ├── call_operator_loc: ∅
-            │           │           │   ├── name: :b
-            │           │           │   ├── message_loc: (1,3)-(1,4) = "b"
-            │           │           │   ├── opening_loc: ∅
-            │           │           │   ├── arguments: ∅
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── block: ∅
-            │           │           ├── keyword_loc: (1,5)-(1,11) = "rescue"
-            │           │           └── rescue_expression:
-            │           │               @ CallNode (location: (1,12)-(1,13))
-            │           │               ├── flags: variable_call, ignore_visibility
-            │           │               ├── receiver: ∅
-            │           │               ├── call_operator_loc: ∅
-            │           │               ├── name: :c
-            │           │               ├── message_loc: (1,12)-(1,13) = "c"
-            │           │               ├── opening_loc: ∅
-            │           │               ├── arguments: ∅
-            │           │               ├── closing_loc: ∅
-            │           │               └── block: ∅
-            │           ├── opening_loc: (1,2)-(1,3) = "("
-            │           └── closing_loc: (1,13)-(1,14) = ")"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/return_call_assocs.txt b/test/mri/prism/snapshots/seattlerb/return_call_assocs.txt
deleted file mode 100644
index 69aae7b2054..00000000000
--- a/test/mri/prism/snapshots/seattlerb/return_call_assocs.txt
+++ /dev/null
@@ -1,212 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,14))
-    └── body: (length: 6)
-        ├── @ ReturnNode (location: (1,0)-(1,17))
-        │   ├── keyword_loc: (1,0)-(1,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (1,7)-(1,17))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 2)
-        │           ├── @ IntegerNode (location: (1,7)-(1,8))
-        │           │   ├── flags: decimal
-        │           │   └── value: 1
-        │           └── @ KeywordHashNode (location: (1,10)-(1,17))
-        │               ├── flags: symbol_keys
-        │               └── elements: (length: 1)
-        │                   └── @ AssocNode (location: (1,10)-(1,17))
-        │                       ├── key:
-        │                       │   @ SymbolNode (location: (1,10)-(1,12))
-        │                       │   ├── flags: forced_us_ascii_encoding
-        │                       │   ├── opening_loc: (1,10)-(1,11) = ":"
-        │                       │   ├── value_loc: (1,11)-(1,12) = "z"
-        │                       │   ├── closing_loc: ∅
-        │                       │   └── unescaped: "z"
-        │                       ├── value:
-        │                       │   @ IntegerNode (location: (1,16)-(1,17))
-        │                       │   ├── flags: decimal
-        │                       │   └── value: 1
-        │                       └── operator_loc: (1,13)-(1,15) = "=>"
-        ├── @ ReturnNode (location: (3,0)-(3,26))
-        │   ├── keyword_loc: (3,0)-(3,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (3,7)-(3,26))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 2)
-        │           ├── @ IntegerNode (location: (3,7)-(3,8))
-        │           │   ├── flags: decimal
-        │           │   └── value: 1
-        │           └── @ KeywordHashNode (location: (3,10)-(3,26))
-        │               ├── flags: symbol_keys
-        │               └── elements: (length: 2)
-        │                   ├── @ AssocNode (location: (3,10)-(3,17))
-        │                   │   ├── key:
-        │                   │   │   @ SymbolNode (location: (3,10)-(3,12))
-        │                   │   │   ├── flags: forced_us_ascii_encoding
-        │                   │   │   ├── opening_loc: (3,10)-(3,11) = ":"
-        │                   │   │   ├── value_loc: (3,11)-(3,12) = "z"
-        │                   │   │   ├── closing_loc: ∅
-        │                   │   │   └── unescaped: "z"
-        │                   │   ├── value:
-        │                   │   │   @ IntegerNode (location: (3,16)-(3,17))
-        │                   │   │   ├── flags: decimal
-        │                   │   │   └── value: 1
-        │                   │   └── operator_loc: (3,13)-(3,15) = "=>"
-        │                   └── @ AssocNode (location: (3,19)-(3,26))
-        │                       ├── key:
-        │                       │   @ SymbolNode (location: (3,19)-(3,21))
-        │                       │   ├── flags: forced_us_ascii_encoding
-        │                       │   ├── opening_loc: (3,19)-(3,20) = ":"
-        │                       │   ├── value_loc: (3,20)-(3,21) = "w"
-        │                       │   ├── closing_loc: ∅
-        │                       │   └── unescaped: "w"
-        │                       ├── value:
-        │                       │   @ IntegerNode (location: (3,25)-(3,26))
-        │                       │   ├── flags: decimal
-        │                       │   └── value: 2
-        │                       └── operator_loc: (3,22)-(3,24) = "=>"
-        ├── @ ReturnNode (location: (5,0)-(5,14))
-        │   ├── keyword_loc: (5,0)-(5,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (5,7)-(5,14))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ CallNode (location: (5,7)-(5,14))
-        │               ├── flags: ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :y
-        │               ├── message_loc: (5,7)-(5,8) = "y"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (5,9)-(5,14))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 1)
-        │               │       └── @ KeywordHashNode (location: (5,9)-(5,14))
-        │               │           ├── flags: symbol_keys
-        │               │           └── elements: (length: 1)
-        │               │               └── @ AssocNode (location: (5,9)-(5,14))
-        │               │                   ├── key:
-        │               │                   │   @ SymbolNode (location: (5,9)-(5,11))
-        │               │                   │   ├── flags: forced_us_ascii_encoding
-        │               │                   │   ├── opening_loc: (5,9)-(5,10) = ":"
-        │               │                   │   ├── value_loc: (5,10)-(5,11) = "z"
-        │               │                   │   ├── closing_loc: ∅
-        │               │                   │   └── unescaped: "z"
-        │               │                   ├── value:
-        │               │                   │   @ IntegerNode (location: (5,13)-(5,14))
-        │               │                   │   ├── flags: decimal
-        │               │                   │   └── value: 1
-        │               │                   └── operator_loc: (5,11)-(5,13) = "=>"
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ ReturnNode (location: (7,0)-(7,12))
-        │   ├── keyword_loc: (7,0)-(7,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (7,7)-(7,12))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ CallNode (location: (7,7)-(7,12))
-        │               ├── flags: ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :y
-        │               ├── message_loc: (7,7)-(7,8) = "y"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (7,9)-(7,12))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 1)
-        │               │       └── @ KeywordHashNode (location: (7,9)-(7,12))
-        │               │           ├── flags: symbol_keys
-        │               │           └── elements: (length: 1)
-        │               │               └── @ AssocNode (location: (7,9)-(7,12))
-        │               │                   ├── key:
-        │               │                   │   @ SymbolNode (location: (7,9)-(7,11))
-        │               │                   │   ├── flags: forced_us_ascii_encoding
-        │               │                   │   ├── opening_loc: ∅
-        │               │                   │   ├── value_loc: (7,9)-(7,10) = "z"
-        │               │                   │   ├── closing_loc: (7,10)-(7,11) = ":"
-        │               │                   │   └── unescaped: "z"
-        │               │                   ├── value:
-        │               │                   │   @ IntegerNode (location: (7,11)-(7,12))
-        │               │                   │   ├── flags: decimal
-        │               │                   │   └── value: 1
-        │               │                   └── operator_loc: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ ReturnNode (location: (9,0)-(9,13))
-        │   ├── keyword_loc: (9,0)-(9,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (9,7)-(9,13))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ CallNode (location: (9,7)-(9,13))
-        │               ├── flags: ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :y
-        │               ├── message_loc: (9,7)-(9,8) = "y"
-        │               ├── opening_loc: (9,8)-(9,9) = "("
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (9,9)-(9,12))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 1)
-        │               │       └── @ KeywordHashNode (location: (9,9)-(9,12))
-        │               │           ├── flags: symbol_keys
-        │               │           └── elements: (length: 1)
-        │               │               └── @ AssocNode (location: (9,9)-(9,12))
-        │               │                   ├── key:
-        │               │                   │   @ SymbolNode (location: (9,9)-(9,11))
-        │               │                   │   ├── flags: forced_us_ascii_encoding
-        │               │                   │   ├── opening_loc: ∅
-        │               │                   │   ├── value_loc: (9,9)-(9,10) = "z"
-        │               │                   │   ├── closing_loc: (9,10)-(9,11) = ":"
-        │               │                   │   └── unescaped: "z"
-        │               │                   ├── value:
-        │               │                   │   @ IntegerNode (location: (9,11)-(9,12))
-        │               │                   │   ├── flags: decimal
-        │               │                   │   └── value: 1
-        │               │                   └── operator_loc: ∅
-        │               ├── closing_loc: (9,12)-(9,13) = ")"
-        │               └── block: ∅
-        └── @ ReturnNode (location: (11,0)-(11,14))
-            ├── keyword_loc: (11,0)-(11,6) = "return"
-            └── arguments:
-                @ ArgumentsNode (location: (11,7)-(11,14))
-                ├── flags: ∅
-                └── arguments: (length: 1)
-                    └── @ CallNode (location: (11,7)-(11,14))
-                        ├── flags: ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :y
-                        ├── message_loc: (11,7)-(11,8) = "y"
-                        ├── opening_loc: (11,8)-(11,9) = "("
-                        ├── arguments:
-                        │   @ ArgumentsNode (location: (11,9)-(11,13))
-                        │   ├── flags: ∅
-                        │   └── arguments: (length: 1)
-                        │       └── @ KeywordHashNode (location: (11,9)-(11,13))
-                        │           ├── flags: ∅
-                        │           └── elements: (length: 1)
-                        │               └── @ AssocNode (location: (11,9)-(11,13))
-                        │                   ├── key:
-                        │                   │   @ CallNode (location: (11,9)-(11,10))
-                        │                   │   ├── flags: variable_call, ignore_visibility
-                        │                   │   ├── receiver: ∅
-                        │                   │   ├── call_operator_loc: ∅
-                        │                   │   ├── name: :z
-                        │                   │   ├── message_loc: (11,9)-(11,10) = "z"
-                        │                   │   ├── opening_loc: ∅
-                        │                   │   ├── arguments: ∅
-                        │                   │   ├── closing_loc: ∅
-                        │                   │   └── block: ∅
-                        │                   ├── value:
-                        │                   │   @ IntegerNode (location: (11,12)-(11,13))
-                        │                   │   ├── flags: decimal
-                        │                   │   └── value: 1
-                        │                   └── operator_loc: (11,10)-(11,12) = "=>"
-                        ├── closing_loc: (11,13)-(11,14) = ")"
-                        └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/rhs_asgn.txt b/test/mri/prism/snapshots/seattlerb/rhs_asgn.txt
deleted file mode 100644
index 9ee187218bb..00000000000
--- a/test/mri/prism/snapshots/seattlerb/rhs_asgn.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: [:n]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ MatchRequiredNode (location: (1,0)-(1,7))
-            ├── value:
-            │   @ IntegerNode (location: (1,0)-(1,2))
-            │   ├── flags: decimal
-            │   └── value: 42
-            ├── pattern:
-            │   @ LocalVariableTargetNode (location: (1,6)-(1,7))
-            │   ├── name: :n
-            │   └── depth: 0
-            └── operator_loc: (1,3)-(1,5) = "=>"
diff --git a/test/mri/prism/snapshots/seattlerb/ruby21_numbers.txt b/test/mri/prism/snapshots/seattlerb/ruby21_numbers.txt
deleted file mode 100644
index 34a3452d1b3..00000000000
--- a/test/mri/prism/snapshots/seattlerb/ruby21_numbers.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,13))
-            ├── flags: ∅
-            ├── elements: (length: 3)
-            │   ├── @ ImaginaryNode (location: (1,1)-(1,3))
-            │   │   └── numeric:
-            │   │       @ IntegerNode (location: (1,1)-(1,2))
-            │   │       ├── flags: decimal
-            │   │       └── value: 1
-            │   ├── @ RationalNode (location: (1,5)-(1,7))
-            │   │   └── numeric:
-            │   │       @ IntegerNode (location: (1,5)-(1,6))
-            │   │       ├── flags: decimal
-            │   │       └── value: 2
-            │   └── @ ImaginaryNode (location: (1,9)-(1,12))
-            │       └── numeric:
-            │           @ RationalNode (location: (1,9)-(1,11))
-            │           └── numeric:
-            │               @ IntegerNode (location: (1,9)-(1,10))
-            │               ├── flags: decimal
-            │               └── value: 3
-            ├── opening_loc: (1,0)-(1,1) = "["
-            └── closing_loc: (1,12)-(1,13) = "]"
diff --git a/test/mri/prism/snapshots/seattlerb/safe_attrasgn.txt b/test/mri/prism/snapshots/seattlerb/safe_attrasgn.txt
deleted file mode 100644
index 3cec95ae7cd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_attrasgn.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: safe_navigation, attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── name: :b=
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,7)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_attrasgn_constant.txt b/test/mri/prism/snapshots/seattlerb/safe_attrasgn_constant.txt
deleted file mode 100644
index baea0631864..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_attrasgn_constant.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: safe_navigation, attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── name: :B=
-            ├── message_loc: (1,3)-(1,4) = "B"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,7)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_call.txt b/test/mri/prism/snapshots/seattlerb/safe_call.txt
deleted file mode 100644
index 7b402d9ef2f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_call.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,4))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── name: :b
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_call_after_newline.txt b/test/mri/prism/snapshots/seattlerb/safe_call_after_newline.txt
deleted file mode 100644
index 0a69cbc9e52..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_call_after_newline.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(2,3))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (2,0)-(2,2) = "&."
-            ├── name: :b
-            ├── message_loc: (2,2)-(2,3) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_call_dot_parens.txt b/test/mri/prism/snapshots/seattlerb/safe_call_dot_parens.txt
deleted file mode 100644
index 1d6ba9e49e9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_call_dot_parens.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,5))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── name: :call
-            ├── message_loc: ∅
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments: ∅
-            ├── closing_loc: (1,4)-(1,5) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_call_newline.txt b/test/mri/prism/snapshots/seattlerb/safe_call_newline.txt
deleted file mode 100644
index 7b402d9ef2f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_call_newline.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,4))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── name: :b
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_call_operator.txt b/test/mri/prism/snapshots/seattlerb/safe_call_operator.txt
deleted file mode 100644
index d1f9b1ea9ef..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_call_operator.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── name: :>
-            ├── message_loc: (1,3)-(1,4) = ">"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_call_rhs_newline.txt b/test/mri/prism/snapshots/seattlerb/safe_call_rhs_newline.txt
deleted file mode 100644
index 34790ebb337..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_call_rhs_newline.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: [:c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,8))
-            ├── name: :c
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "c"
-            ├── value:
-            │   @ CallNode (location: (1,4)-(1,8))
-            │   ├── flags: safe_navigation
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,4)-(1,5))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,4)-(1,5) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,5)-(1,7) = "&."
-            │   ├── name: :b
-            │   ├── message_loc: (1,7)-(1,8) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/seattlerb/safe_calls.txt b/test/mri/prism/snapshots/seattlerb/safe_calls.txt
deleted file mode 100644
index 54e591d9c0a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_calls.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,10))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,4))
-            │   ├── flags: safe_navigation
-            │   ├── receiver:
-            │   │   @ CallNode (location: (1,0)-(1,1))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :a
-            │   │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── call_operator_loc: (1,1)-(1,3) = "&."
-            │   ├── name: :b
-            │   ├── message_loc: (1,3)-(1,4) = "b"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,4)-(1,6) = "&."
-            ├── name: :c
-            ├── message_loc: (1,6)-(1,7) = "c"
-            ├── opening_loc: (1,7)-(1,8) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,8)-(1,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,8)-(1,9))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (1,9)-(1,10) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_op_asgn.txt b/test/mri/prism/snapshots/seattlerb/safe_op_asgn.txt
deleted file mode 100644
index 7a9fd2b7f71..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_op_asgn.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallOperatorWriteNode (location: (1,0)-(1,11))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── read_name: :b
-            ├── write_name: :b=
-            ├── operator: :+
-            ├── operator_loc: (1,5)-(1,7) = "+="
-            └── value:
-                @ CallNode (location: (1,8)-(1,11))
-                ├── flags: ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :x
-                ├── message_loc: (1,8)-(1,9) = "x"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (1,10)-(1,11))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 1)
-                │       └── @ IntegerNode (location: (1,10)-(1,11))
-                │           ├── flags: decimal
-                │           └── value: 1
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/safe_op_asgn2.txt b/test/mri/prism/snapshots/seattlerb/safe_op_asgn2.txt
deleted file mode 100644
index bdb0e061560..00000000000
--- a/test/mri/prism/snapshots/seattlerb/safe_op_asgn2.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,1))
-    └── body: (length: 1)
-        └── @ CallOrWriteNode (location: (1,0)-(2,1))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── read_name: :b
-            ├── write_name: :b=
-            ├── operator_loc: (1,5)-(1,8) = "||="
-            └── value:
-                @ CallNode (location: (2,0)-(2,1))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :x
-                ├── message_loc: (2,0)-(2,1) = "x"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/slashy_newlines_within_string.txt b/test/mri/prism/snapshots/seattlerb/slashy_newlines_within_string.txt
deleted file mode 100644
index f9be33ffdd0..00000000000
--- a/test/mri/prism/snapshots/seattlerb/slashy_newlines_within_string.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,5))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(4,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :puts
-        │   ├── message_loc: (1,0)-(1,4) = "puts"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,5)-(4,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,5)-(4,8))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,5)-(1,6) = "\""
-        │   │           ├── content_loc: (1,6)-(4,7) = "hello\\\n my\\\n dear\\\n friend"
-        │   │           ├── closing_loc: (4,7)-(4,8) = "\""
-        │   │           └── unescaped: "hello my dear friend"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (6,0)-(6,5))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (6,0)-(6,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (6,0)-(6,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :+
-            ├── message_loc: (6,2)-(6,3) = "+"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (6,4)-(6,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (6,4)-(6,5))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (6,4)-(6,5) = "b"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/stabby_arg_no_paren.txt b/test/mri/prism/snapshots/seattlerb/stabby_arg_no_paren.txt
deleted file mode 100644
index e665565d383..00000000000
--- a/test/mri/prism/snapshots/seattlerb/stabby_arg_no_paren.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,5))
-            ├── locals: [:a]
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,3)-(1,4) = "{"
-            ├── closing_loc: (1,4)-(1,5) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,2)-(1,3))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (1,2)-(1,3))
-            │   │   ├── requireds: (length: 1)
-            │   │   │   └── @ RequiredParameterNode (location: (1,2)-(1,3))
-            │   │   │       ├── flags: ∅
-            │   │   │       └── name: :a
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: ∅
-            │   └── closing_loc: ∅
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt b/test/mri/prism/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
deleted file mode 100644
index 0b0000ef335..00000000000
--- a/test/mri/prism/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,23))
-            ├── locals: [:b, :c, :d, :e, :f]
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,21)-(1,22) = "{"
-            ├── closing_loc: (1,22)-(1,23) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,2)-(1,21))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (1,3)-(1,20))
-            │   │   ├── requireds: (length: 1)
-            │   │   │   └── @ RequiredParameterNode (location: (1,3)-(1,4))
-            │   │   │       ├── flags: ∅
-            │   │   │       └── name: :b
-            │   │   ├── optionals: (length: 1)
-            │   │   │   └── @ OptionalParameterNode (location: (1,6)-(1,9))
-            │   │   │       ├── flags: ∅
-            │   │   │       ├── name: :c
-            │   │   │       ├── name_loc: (1,6)-(1,7) = "c"
-            │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-            │   │   │       └── value:
-            │   │   │           @ IntegerNode (location: (1,8)-(1,9))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 1
-            │   │   ├── rest:
-            │   │   │   @ RestParameterNode (location: (1,11)-(1,13))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── name: :d
-            │   │   │   ├── name_loc: (1,12)-(1,13) = "d"
-            │   │   │   └── operator_loc: (1,11)-(1,12) = "*"
-            │   │   ├── posts: (length: 1)
-            │   │   │   └── @ RequiredParameterNode (location: (1,15)-(1,16))
-            │   │   │       ├── flags: ∅
-            │   │   │       └── name: :e
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block:
-            │   │       @ BlockParameterNode (location: (1,18)-(1,20))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :f
-            │   │       ├── name_loc: (1,19)-(1,20) = "f"
-            │   │       └── operator_loc: (1,18)-(1,19) = "&"
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: (1,2)-(1,3) = "("
-            │   └── closing_loc: (1,20)-(1,21) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/stabby_block_iter_call.txt b/test/mri/prism/snapshots/seattlerb/stabby_block_iter_call.txt
deleted file mode 100644
index e51c7d97edd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/stabby_block_iter_call.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(4,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :x
-            ├── message_loc: (1,0)-(1,1) = "x"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(4,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LambdaNode (location: (1,2)-(4,3))
-            │           ├── locals: []
-            │           ├── operator_loc: (1,2)-(1,4) = "->"
-            │           ├── opening_loc: (1,8)-(1,10) = "do"
-            │           ├── closing_loc: (4,0)-(4,3) = "end"
-            │           ├── parameters:
-            │           │   @ BlockParametersNode (location: (1,5)-(1,7))
-            │           │   ├── parameters: ∅
-            │           │   ├── locals: (length: 0)
-            │           │   ├── opening_loc: (1,5)-(1,6) = "("
-            │           │   └── closing_loc: (1,6)-(1,7) = ")"
-            │           └── body:
-            │               @ StatementsNode (location: (2,0)-(3,3))
-            │               └── body: (length: 1)
-            │                   └── @ CallNode (location: (2,0)-(3,3))
-            │                       ├── flags: ∅
-            │                       ├── receiver:
-            │                       │   @ CallNode (location: (2,0)-(2,1))
-            │                       │   ├── flags: variable_call, ignore_visibility
-            │                       │   ├── receiver: ∅
-            │                       │   ├── call_operator_loc: ∅
-            │                       │   ├── name: :a
-            │                       │   ├── message_loc: (2,0)-(2,1) = "a"
-            │                       │   ├── opening_loc: ∅
-            │                       │   ├── arguments: ∅
-            │                       │   ├── closing_loc: ∅
-            │                       │   └── block: ∅
-            │                       ├── call_operator_loc: (2,1)-(2,2) = "."
-            │                       ├── name: :b
-            │                       ├── message_loc: (2,2)-(2,3) = "b"
-            │                       ├── opening_loc: ∅
-            │                       ├── arguments: ∅
-            │                       ├── closing_loc: ∅
-            │                       └── block:
-            │                           @ BlockNode (location: (2,4)-(3,3))
-            │                           ├── locals: []
-            │                           ├── parameters: ∅
-            │                           ├── body: ∅
-            │                           ├── opening_loc: (2,4)-(2,6) = "do"
-            │                           └── closing_loc: (3,0)-(3,3) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt b/test/mri/prism/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
deleted file mode 100644
index d7a268a5d5a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(4,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :x
-            ├── message_loc: (1,0)-(1,1) = "x"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(4,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LambdaNode (location: (1,2)-(4,3))
-            │           ├── locals: []
-            │           ├── operator_loc: (1,2)-(1,4) = "->"
-            │           ├── opening_loc: (1,8)-(1,10) = "do"
-            │           ├── closing_loc: (4,0)-(4,3) = "end"
-            │           ├── parameters:
-            │           │   @ BlockParametersNode (location: (1,5)-(1,7))
-            │           │   ├── parameters: ∅
-            │           │   ├── locals: (length: 0)
-            │           │   ├── opening_loc: (1,5)-(1,6) = "("
-            │           │   └── closing_loc: (1,6)-(1,7) = ")"
-            │           └── body:
-            │               @ StatementsNode (location: (2,0)-(3,3))
-            │               └── body: (length: 1)
-            │                   └── @ CallNode (location: (2,0)-(3,3))
-            │                       ├── flags: ignore_visibility
-            │                       ├── receiver: ∅
-            │                       ├── call_operator_loc: ∅
-            │                       ├── name: :a
-            │                       ├── message_loc: (2,0)-(2,1) = "a"
-            │                       ├── opening_loc: (2,1)-(2,2) = "("
-            │                       ├── arguments:
-            │                       │   @ ArgumentsNode (location: (2,2)-(2,3))
-            │                       │   ├── flags: ∅
-            │                       │   └── arguments: (length: 1)
-            │                       │       └── @ IntegerNode (location: (2,2)-(2,3))
-            │                       │           ├── flags: decimal
-            │                       │           └── value: 1
-            │                       ├── closing_loc: (2,3)-(2,4) = ")"
-            │                       └── block:
-            │                           @ BlockNode (location: (2,5)-(3,3))
-            │                           ├── locals: []
-            │                           ├── parameters: ∅
-            │                           ├── body: ∅
-            │                           ├── opening_loc: (2,5)-(2,7) = "do"
-            │                           └── closing_loc: (3,0)-(3,3) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/stabby_block_kw.txt b/test/mri/prism/snapshots/seattlerb/stabby_block_kw.txt
deleted file mode 100644
index 7addbb8b288..00000000000
--- a/test/mri/prism/snapshots/seattlerb/stabby_block_kw.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,13))
-            ├── locals: [:k]
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,10)-(1,11) = "{"
-            ├── closing_loc: (1,12)-(1,13) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,3)-(1,9))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (1,4)-(1,8))
-            │   │   ├── requireds: (length: 0)
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 1)
-            │   │   │   └── @ OptionalKeywordParameterNode (location: (1,4)-(1,8))
-            │   │   │       ├── flags: ∅
-            │   │   │       ├── name: :k
-            │   │   │       ├── name_loc: (1,4)-(1,6) = "k:"
-            │   │   │       └── value:
-            │   │   │           @ IntegerNode (location: (1,6)-(1,8))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 42
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: (1,3)-(1,4) = "("
-            │   └── closing_loc: (1,8)-(1,9) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/stabby_block_kw__required.txt b/test/mri/prism/snapshots/seattlerb/stabby_block_kw__required.txt
deleted file mode 100644
index b5040d91dbe..00000000000
--- a/test/mri/prism/snapshots/seattlerb/stabby_block_kw__required.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,11))
-            ├── locals: [:k]
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,8)-(1,9) = "{"
-            ├── closing_loc: (1,10)-(1,11) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,3)-(1,7))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (1,4)-(1,6))
-            │   │   ├── requireds: (length: 0)
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 1)
-            │   │   │   └── @ RequiredKeywordParameterNode (location: (1,4)-(1,6))
-            │   │   │       ├── flags: ∅
-            │   │   │       ├── name: :k
-            │   │   │       └── name_loc: (1,4)-(1,6) = "k:"
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: (1,3)-(1,4) = "("
-            │   └── closing_loc: (1,6)-(1,7) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/stabby_proc_scope.txt b/test/mri/prism/snapshots/seattlerb/stabby_proc_scope.txt
deleted file mode 100644
index 898f823f245..00000000000
--- a/test/mri/prism/snapshots/seattlerb/stabby_proc_scope.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,11))
-            ├── locals: [:a, :b]
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,9)-(1,10) = "{"
-            ├── closing_loc: (1,10)-(1,11) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,2)-(1,8))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (1,3)-(1,4))
-            │   │   ├── requireds: (length: 1)
-            │   │   │   └── @ RequiredParameterNode (location: (1,3)-(1,4))
-            │   │   │       ├── flags: ∅
-            │   │   │       └── name: :a
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 1)
-            │   │   └── @ BlockLocalVariableNode (location: (1,6)-(1,7))
-            │   │       ├── flags: ∅
-            │   │       └── name: :b
-            │   ├── opening_loc: (1,2)-(1,3) = "("
-            │   └── closing_loc: (1,7)-(1,8) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_backslashes.txt b/test/mri/prism/snapshots/seattlerb/str_backslashes.txt
deleted file mode 100644
index ec41a89c380..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_backslashes.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,204))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,204))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,204))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :x
-            ├── message_loc: (1,0)-(1,1) = "x"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,204))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ StringNode (location: (1,2)-(1,204))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (1,2)-(1,3) = "'"
-            │           ├── content_loc: (1,3)-(1,203) = "\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n"
-            │           ├── closing_loc: (1,203)-(1,204) = "'"
-            │           └── unescaped: "\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_double_double_escaped_newline.txt b/test/mri/prism/snapshots/seattlerb/str_double_double_escaped_newline.txt
deleted file mode 100644
index 620b43f631a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_double_double_escaped_newline.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,7))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,2)-(1,7))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,2)-(1,3) = "\""
-        │   │           ├── content_loc: (1,3)-(1,6) = "\\\\n"
-        │   │           ├── closing_loc: (1,6)-(1,7) = "\""
-        │   │           └── unescaped: "\\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (1,8)-(1,9))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :b
-            ├── message_loc: (1,8)-(1,9) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_double_escaped_newline.txt b/test/mri/prism/snapshots/seattlerb/str_double_escaped_newline.txt
deleted file mode 100644
index 2aee91b75c9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_double_escaped_newline.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,2)-(1,6))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,2)-(1,3) = "\""
-        │   │           ├── content_loc: (1,3)-(1,5) = "\\n"
-        │   │           ├── closing_loc: (1,5)-(1,6) = "\""
-        │   │           └── unescaped: "\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (1,7)-(1,8))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :b
-            ├── message_loc: (1,7)-(1,8) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_double_newline.txt b/test/mri/prism/snapshots/seattlerb/str_double_newline.txt
deleted file mode 100644
index eb249cde8a1..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_double_newline.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(2,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(2,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,2)-(2,1))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,2)-(1,3) = "\""
-        │   │           ├── content_loc: (1,3)-(2,0) = "\n"
-        │   │           ├── closing_loc: (2,0)-(2,1) = "\""
-        │   │           └── unescaped: "\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (2,2)-(2,3))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :b
-            ├── message_loc: (2,2)-(2,3) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_evstr.txt b/test/mri/prism/snapshots/seattlerb/str_evstr.txt
deleted file mode 100644
index 24b4bdaa859..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_evstr.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,8))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (1,1)-(1,3))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,1)-(1,3) = "a "
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a "
-            │   └── @ EmbeddedStatementsNode (location: (1,3)-(1,7))
-            │       ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,5)-(1,6))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (1,5)-(1,6))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :b
-            │       │           ├── message_loc: (1,5)-(1,6) = "b"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       └── closing_loc: (1,6)-(1,7) = "}"
-            └── closing_loc: (1,7)-(1,8) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/str_evstr_escape.txt b/test/mri/prism/snapshots/seattlerb/str_evstr_escape.txt
deleted file mode 100644
index c14c39ee85f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_evstr_escape.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,16))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (1,1)-(1,3))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,1)-(1,3) = "a "
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a "
-            │   ├── @ EmbeddedStatementsNode (location: (1,3)-(1,7))
-            │   │   ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,5)-(1,6))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (1,5)-(1,6))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :b
-            │   │   │           ├── message_loc: (1,5)-(1,6) = "b"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (1,6)-(1,7) = "}"
-            │   └── @ StringNode (location: (1,7)-(1,15))
-            │       ├── flags: forced_utf8_encoding
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,7)-(1,15) = "\\302\\275"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "½"
-            └── closing_loc: (1,15)-(1,16) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/str_heredoc_interp.txt b/test/mri/prism/snapshots/seattlerb/str_heredoc_interp.txt
deleted file mode 100644
index cdb5e7e804f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_heredoc_interp.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,4))
-            ├── opening_loc: (1,0)-(1,4) = "<<\"\""
-            ├── parts: (length: 2)
-            │   ├── @ EmbeddedStatementsNode (location: (2,0)-(2,4))
-            │   │   ├── opening_loc: (2,0)-(2,2) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (2,2)-(2,3))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (2,2)-(2,3))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :x
-            │   │   │           ├── message_loc: (2,2)-(2,3) = "x"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (2,3)-(2,4) = "}"
-            │   └── @ StringNode (location: (2,4)-(4,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (2,4)-(4,0) = "\nblah2\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "\nblah2\n"
-            └── closing_loc: (4,0)-(5,0) = "\n"
diff --git a/test/mri/prism/snapshots/seattlerb/str_interp_ternary_or_label.txt b/test/mri/prism/snapshots/seattlerb/str_interp_ternary_or_label.txt
deleted file mode 100644
index 474c42ebc8c..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_interp_ternary_or_label.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,23))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 1)
-            │   └── @ EmbeddedStatementsNode (location: (1,1)-(1,22))
-            │       ├── opening_loc: (1,1)-(1,3) = "\#{"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,3)-(1,21))
-            │       │   └── body: (length: 1)
-            │       │       └── @ IfNode (location: (1,3)-(1,21))
-            │       │           ├── if_keyword_loc: ∅
-            │       │           ├── predicate:
-            │       │           │   @ CallNode (location: (1,3)-(1,7))
-            │       │           │   ├── flags: ∅
-            │       │           │   ├── receiver:
-            │       │           │   │   @ CallNode (location: (1,3)-(1,4))
-            │       │           │   │   ├── flags: variable_call, ignore_visibility
-            │       │           │   │   ├── receiver: ∅
-            │       │           │   │   ├── call_operator_loc: ∅
-            │       │           │   │   ├── name: :a
-            │       │           │   │   ├── message_loc: (1,3)-(1,4) = "a"
-            │       │           │   │   ├── opening_loc: ∅
-            │       │           │   │   ├── arguments: ∅
-            │       │           │   │   ├── closing_loc: ∅
-            │       │           │   │   └── block: ∅
-            │       │           │   ├── call_operator_loc: (1,4)-(1,5) = "."
-            │       │           │   ├── name: :b?
-            │       │           │   ├── message_loc: (1,5)-(1,7) = "b?"
-            │       │           │   ├── opening_loc: ∅
-            │       │           │   ├── arguments: ∅
-            │       │           │   ├── closing_loc: ∅
-            │       │           │   └── block: ∅
-            │       │           ├── then_keyword_loc: (1,8)-(1,9) = "?"
-            │       │           ├── statements:
-            │       │           │   @ StatementsNode (location: (1,10)-(1,17))
-            │       │           │   └── body: (length: 1)
-            │       │           │       └── @ CallNode (location: (1,10)-(1,17))
-            │       │           │           ├── flags: ∅
-            │       │           │           ├── receiver:
-            │       │           │           │   @ CallNode (location: (1,10)-(1,14))
-            │       │           │           │   ├── flags: ∅
-            │       │           │           │   ├── receiver:
-            │       │           │           │   │   @ StringNode (location: (1,10)-(1,12))
-            │       │           │           │   │   ├── flags: ∅
-            │       │           │           │   │   ├── opening_loc: (1,10)-(1,11) = "\""
-            │       │           │           │   │   ├── content_loc: (1,11)-(1,11) = ""
-            │       │           │           │   │   ├── closing_loc: (1,11)-(1,12) = "\""
-            │       │           │           │   │   └── unescaped: ""
-            │       │           │           │   ├── call_operator_loc: ∅
-            │       │           │           │   ├── name: :+
-            │       │           │           │   ├── message_loc: (1,12)-(1,13) = "+"
-            │       │           │           │   ├── opening_loc: ∅
-            │       │           │           │   ├── arguments:
-            │       │           │           │   │   @ ArgumentsNode (location: (1,13)-(1,14))
-            │       │           │           │   │   ├── flags: ∅
-            │       │           │           │   │   └── arguments: (length: 1)
-            │       │           │           │   │       └── @ CallNode (location: (1,13)-(1,14))
-            │       │           │           │   │           ├── flags: variable_call, ignore_visibility
-            │       │           │           │   │           ├── receiver: ∅
-            │       │           │           │   │           ├── call_operator_loc: ∅
-            │       │           │           │   │           ├── name: :a
-            │       │           │           │   │           ├── message_loc: (1,13)-(1,14) = "a"
-            │       │           │           │   │           ├── opening_loc: ∅
-            │       │           │           │   │           ├── arguments: ∅
-            │       │           │           │   │           ├── closing_loc: ∅
-            │       │           │           │   │           └── block: ∅
-            │       │           │           │   ├── closing_loc: ∅
-            │       │           │           │   └── block: ∅
-            │       │           │           ├── call_operator_loc: ∅
-            │       │           │           ├── name: :+
-            │       │           │           ├── message_loc: (1,14)-(1,15) = "+"
-            │       │           │           ├── opening_loc: ∅
-            │       │           │           ├── arguments:
-            │       │           │           │   @ ArgumentsNode (location: (1,15)-(1,17))
-            │       │           │           │   ├── flags: ∅
-            │       │           │           │   └── arguments: (length: 1)
-            │       │           │           │       └── @ StringNode (location: (1,15)-(1,17))
-            │       │           │           │           ├── flags: ∅
-            │       │           │           │           ├── opening_loc: (1,15)-(1,16) = "\""
-            │       │           │           │           ├── content_loc: (1,16)-(1,16) = ""
-            │       │           │           │           ├── closing_loc: (1,16)-(1,17) = "\""
-            │       │           │           │           └── unescaped: ""
-            │       │           │           ├── closing_loc: ∅
-            │       │           │           └── block: ∅
-            │       │           ├── consequent:
-            │       │           │   @ ElseNode (location: (1,17)-(1,21))
-            │       │           │   ├── else_keyword_loc: (1,17)-(1,18) = ":"
-            │       │           │   ├── statements:
-            │       │           │   │   @ StatementsNode (location: (1,19)-(1,21))
-            │       │           │   │   └── body: (length: 1)
-            │       │           │   │       └── @ StringNode (location: (1,19)-(1,21))
-            │       │           │   │           ├── flags: ∅
-            │       │           │   │           ├── opening_loc: (1,19)-(1,20) = "\""
-            │       │           │   │           ├── content_loc: (1,20)-(1,20) = ""
-            │       │           │   │           ├── closing_loc: (1,20)-(1,21) = "\""
-            │       │           │   │           └── unescaped: ""
-            │       │           │   └── end_keyword_loc: ∅
-            │       │           └── end_keyword_loc: ∅
-            │       └── closing_loc: (1,21)-(1,22) = "}"
-            └── closing_loc: (1,22)-(1,23) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/str_lit_concat_bad_encodings.txt b/test/mri/prism/snapshots/seattlerb/str_lit_concat_bad_encodings.txt
deleted file mode 100644
index b841407cd8d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_lit_concat_bad_encodings.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,66))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,66))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(2,66))
-            ├── opening_loc: ∅
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (1,0)-(1,62))
-            │   │   ├── flags: forced_utf8_encoding
-            │   │   ├── opening_loc: (1,0)-(1,1) = "\""
-            │   │   ├── content_loc: (1,1)-(1,61) = "\\xE3\\xD3\\x8B\\xE3\\x83\\xBC\\x83\\xE3\\x83\\xE3\\x82\\xB3\\xA3\\x82\\x99"
-            │   │   ├── closing_loc: (1,61)-(1,62) = "\""
-            │   │   └── unescaped: "\xE3Ӌー\x83\xE3\x83コ\xA3\x82\x99"
-            │   └── @ StringNode (location: (2,8)-(2,66))
-            │       ├── flags: forced_utf8_encoding
-            │       ├── opening_loc: (2,8)-(2,9) = "\""
-            │       ├── content_loc: (2,9)-(2,65) = "\\xE3\\x83\\xB3\\xE3\\x83\\x8F\\xE3\\x82\\x9A\\xC3\\xBD;foo@bar.com"
-            │       ├── closing_loc: (2,65)-(2,66) = "\""
-            │       └── unescaped: "ンパý;foo@bar.com"
-            └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_newline_hash_line_number.txt b/test/mri/prism/snapshots/seattlerb/str_newline_hash_line_number.txt
deleted file mode 100644
index d55d9650685..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_newline_hash_line_number.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,1))
-    └── body: (length: 2)
-        ├── @ StringNode (location: (1,0)-(1,11))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── content_loc: (1,1)-(1,10) = "\\n\\n\\n\\n#"
-        │   ├── closing_loc: (1,10)-(1,11) = "\""
-        │   └── unescaped: "\n\n\n\n#"
-        └── @ IntegerNode (location: (2,0)-(2,1))
-            ├── flags: decimal
-            └── value: 1
diff --git a/test/mri/prism/snapshots/seattlerb/str_pct_Q_nested.txt b/test/mri/prism/snapshots/seattlerb/str_pct_Q_nested.txt
deleted file mode 100644
index 92ee7a9c6cc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_pct_Q_nested.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,26))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,26))
-            ├── opening_loc: (1,0)-(1,3) = "%Q["
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (1,3)-(1,11))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,3)-(1,11) = "before ["
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "before ["
-            │   ├── @ EmbeddedStatementsNode (location: (1,11)-(1,18))
-            │   │   ├── opening_loc: (1,11)-(1,13) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,13)-(1,17))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (1,13)-(1,17))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :nest
-            │   │   │           ├── message_loc: (1,13)-(1,17) = "nest"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (1,17)-(1,18) = "}"
-            │   └── @ StringNode (location: (1,18)-(1,25))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,18)-(1,25) = "] after"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "] after"
-            └── closing_loc: (1,25)-(1,26) = "]"
diff --git a/test/mri/prism/snapshots/seattlerb/str_pct_nested_nested.txt b/test/mri/prism/snapshots/seattlerb/str_pct_nested_nested.txt
deleted file mode 100644
index b9c39c9a93e..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_pct_nested_nested.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,20))
-            ├── opening_loc: (1,0)-(1,2) = "%{"
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (1,2)-(1,5))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,2)-(1,5) = " { "
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: " { "
-            │   ├── @ EmbeddedStatementsNode (location: (1,5)-(1,16))
-            │   │   ├── opening_loc: (1,5)-(1,7) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,8)-(1,14))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ InterpolatedStringNode (location: (1,8)-(1,14))
-            │   │   │           ├── opening_loc: (1,8)-(1,9) = "\""
-            │   │   │           ├── parts: (length: 1)
-            │   │   │           │   └── @ EmbeddedStatementsNode (location: (1,9)-(1,13))
-            │   │   │           │       ├── opening_loc: (1,9)-(1,11) = "\#{"
-            │   │   │           │       ├── statements:
-            │   │   │           │       │   @ StatementsNode (location: (1,11)-(1,12))
-            │   │   │           │       │   └── body: (length: 1)
-            │   │   │           │       │       └── @ IntegerNode (location: (1,11)-(1,12))
-            │   │   │           │       │           ├── flags: decimal
-            │   │   │           │       │           └── value: 1
-            │   │   │           │       └── closing_loc: (1,12)-(1,13) = "}"
-            │   │   │           └── closing_loc: (1,13)-(1,14) = "\""
-            │   │   └── closing_loc: (1,15)-(1,16) = "}"
-            │   └── @ StringNode (location: (1,16)-(1,19))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,16)-(1,19) = " } "
-            │       ├── closing_loc: ∅
-            │       └── unescaped: " } "
-            └── closing_loc: (1,19)-(1,20) = "}"
diff --git a/test/mri/prism/snapshots/seattlerb/str_pct_q.txt b/test/mri/prism/snapshots/seattlerb/str_pct_q.txt
deleted file mode 100644
index c4dd5bacae2..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_pct_q.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,3) = "%q{"
-            ├── content_loc: (1,3)-(1,8) = "a b c"
-            ├── closing_loc: (1,8)-(1,9) = "}"
-            └── unescaped: "a b c"
diff --git a/test/mri/prism/snapshots/seattlerb/str_single_double_escaped_newline.txt b/test/mri/prism/snapshots/seattlerb/str_single_double_escaped_newline.txt
deleted file mode 100644
index 8fa8886029a..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_single_double_escaped_newline.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,7))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,2)-(1,7))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,2)-(1,3) = "'"
-        │   │           ├── content_loc: (1,3)-(1,6) = "\\\\n"
-        │   │           ├── closing_loc: (1,6)-(1,7) = "'"
-        │   │           └── unescaped: "\\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (1,8)-(1,9))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :b
-            ├── message_loc: (1,8)-(1,9) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_single_escaped_newline.txt b/test/mri/prism/snapshots/seattlerb/str_single_escaped_newline.txt
deleted file mode 100644
index c840c7688bc..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_single_escaped_newline.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,2)-(1,6))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,2)-(1,3) = "'"
-        │   │           ├── content_loc: (1,3)-(1,5) = "\\n"
-        │   │           ├── closing_loc: (1,5)-(1,6) = "'"
-        │   │           └── unescaped: "\\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (1,7)-(1,8))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :b
-            ├── message_loc: (1,7)-(1,8) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_single_newline.txt b/test/mri/prism/snapshots/seattlerb/str_single_newline.txt
deleted file mode 100644
index 15b0f2ff729..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_single_newline.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(2,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(2,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,2)-(2,1))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,2)-(1,3) = "'"
-        │   │           ├── content_loc: (1,3)-(2,0) = "\n"
-        │   │           ├── closing_loc: (2,0)-(2,1) = "'"
-        │   │           └── unescaped: "\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (2,2)-(2,3))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :b
-            ├── message_loc: (2,2)-(2,3) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/str_str.txt b/test/mri/prism/snapshots/seattlerb/str_str.txt
deleted file mode 100644
index f183980f5e7..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_str.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,10))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (1,1)-(1,3))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,1)-(1,3) = "a "
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a "
-            │   └── @ EmbeddedStatementsNode (location: (1,3)-(1,9))
-            │       ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,5)-(1,8))
-            │       │   └── body: (length: 1)
-            │       │       └── @ StringNode (location: (1,5)-(1,8))
-            │       │           ├── flags: ∅
-            │       │           ├── opening_loc: (1,5)-(1,6) = "'"
-            │       │           ├── content_loc: (1,6)-(1,7) = "b"
-            │       │           ├── closing_loc: (1,7)-(1,8) = "'"
-            │       │           └── unescaped: "b"
-            │       └── closing_loc: (1,8)-(1,9) = "}"
-            └── closing_loc: (1,9)-(1,10) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/str_str_str.txt b/test/mri/prism/snapshots/seattlerb/str_str_str.txt
deleted file mode 100644
index 68873d81825..00000000000
--- a/test/mri/prism/snapshots/seattlerb/str_str_str.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,12))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (1,1)-(1,3))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,1)-(1,3) = "a "
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a "
-            │   ├── @ EmbeddedStatementsNode (location: (1,3)-(1,9))
-            │   │   ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,5)-(1,8))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ StringNode (location: (1,5)-(1,8))
-            │   │   │           ├── flags: ∅
-            │   │   │           ├── opening_loc: (1,5)-(1,6) = "'"
-            │   │   │           ├── content_loc: (1,6)-(1,7) = "b"
-            │   │   │           ├── closing_loc: (1,7)-(1,8) = "'"
-            │   │   │           └── unescaped: "b"
-            │   │   └── closing_loc: (1,8)-(1,9) = "}"
-            │   └── @ StringNode (location: (1,9)-(1,11))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,9)-(1,11) = " c"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: " c"
-            └── closing_loc: (1,11)-(1,12) = "\""
diff --git a/test/mri/prism/snapshots/seattlerb/super_arg.txt b/test/mri/prism/snapshots/seattlerb/super_arg.txt
deleted file mode 100644
index 61b5f0b6313..00000000000
--- a/test/mri/prism/snapshots/seattlerb/super_arg.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ SuperNode (location: (1,0)-(1,8))
-            ├── keyword_loc: (1,0)-(1,5) = "super"
-            ├── lparen_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,6)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 42
-            ├── rparen_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/symbol_empty.txt b/test/mri/prism/snapshots/seattlerb/symbol_empty.txt
deleted file mode 100644
index e95543e925d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/symbol_empty.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ SymbolNode (location: (1,0)-(1,3))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (1,0)-(1,2) = ":'"
-            ├── value_loc: (1,2)-(1,2) = ""
-            ├── closing_loc: (1,2)-(1,3) = "'"
-            └── unescaped: ""
diff --git a/test/mri/prism/snapshots/seattlerb/symbol_list.txt b/test/mri/prism/snapshots/seattlerb/symbol_list.txt
deleted file mode 100644
index 6750160d507..00000000000
--- a/test/mri/prism/snapshots/seattlerb/symbol_list.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,13))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ InterpolatedSymbolNode (location: (1,3)-(1,7))
-            │   │   ├── opening_loc: ∅
-            │   │   ├── parts: (length: 1)
-            │   │   │   └── @ EmbeddedStatementsNode (location: (1,3)-(1,7))
-            │   │   │       ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │   │   │       ├── statements:
-            │   │   │       │   @ StatementsNode (location: (1,5)-(1,6))
-            │   │   │       │   └── body: (length: 1)
-            │   │   │       │       └── @ CallNode (location: (1,5)-(1,6))
-            │   │   │       │           ├── flags: variable_call, ignore_visibility
-            │   │   │       │           ├── receiver: ∅
-            │   │   │       │           ├── call_operator_loc: ∅
-            │   │   │       │           ├── name: :a
-            │   │   │       │           ├── message_loc: (1,5)-(1,6) = "a"
-            │   │   │       │           ├── opening_loc: ∅
-            │   │   │       │           ├── arguments: ∅
-            │   │   │       │           ├── closing_loc: ∅
-            │   │   │       │           └── block: ∅
-            │   │   │       └── closing_loc: (1,6)-(1,7) = "}"
-            │   │   └── closing_loc: ∅
-            │   └── @ InterpolatedSymbolNode (location: (1,8)-(1,12))
-            │       ├── opening_loc: ∅
-            │       ├── parts: (length: 1)
-            │       │   └── @ EmbeddedStatementsNode (location: (1,8)-(1,12))
-            │       │       ├── opening_loc: (1,8)-(1,10) = "\#{"
-            │       │       ├── statements:
-            │       │       │   @ StatementsNode (location: (1,10)-(1,11))
-            │       │       │   └── body: (length: 1)
-            │       │       │       └── @ CallNode (location: (1,10)-(1,11))
-            │       │       │           ├── flags: variable_call, ignore_visibility
-            │       │       │           ├── receiver: ∅
-            │       │       │           ├── call_operator_loc: ∅
-            │       │       │           ├── name: :b
-            │       │       │           ├── message_loc: (1,10)-(1,11) = "b"
-            │       │       │           ├── opening_loc: ∅
-            │       │       │           ├── arguments: ∅
-            │       │       │           ├── closing_loc: ∅
-            │       │       │           └── block: ∅
-            │       │       └── closing_loc: (1,11)-(1,12) = "}"
-            │       └── closing_loc: ∅
-            ├── opening_loc: (1,0)-(1,3) = "%I["
-            └── closing_loc: (1,12)-(1,13) = "]"
diff --git a/test/mri/prism/snapshots/seattlerb/symbols.txt b/test/mri/prism/snapshots/seattlerb/symbols.txt
deleted file mode 100644
index 30cf57c5287..00000000000
--- a/test/mri/prism/snapshots/seattlerb/symbols.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── elements: (length: 3)
-            │   ├── @ SymbolNode (location: (1,3)-(1,4))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,3)-(1,4) = "a"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a"
-            │   ├── @ SymbolNode (location: (1,5)-(1,6))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,5)-(1,6) = "b"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "b"
-            │   └── @ SymbolNode (location: (1,7)-(1,8))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: ∅
-            │       ├── value_loc: (1,7)-(1,8) = "c"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "c"
-            ├── opening_loc: (1,0)-(1,3) = "%i("
-            └── closing_loc: (1,8)-(1,9) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/symbols_empty.txt b/test/mri/prism/snapshots/seattlerb/symbols_empty.txt
deleted file mode 100644
index dc743e2be50..00000000000
--- a/test/mri/prism/snapshots/seattlerb/symbols_empty.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── elements: (length: 0)
-            ├── opening_loc: (1,0)-(1,3) = "%i("
-            └── closing_loc: (1,3)-(1,4) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/symbols_empty_space.txt b/test/mri/prism/snapshots/seattlerb/symbols_empty_space.txt
deleted file mode 100644
index ea7ada9446d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/symbols_empty_space.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,5))
-            ├── flags: ∅
-            ├── elements: (length: 0)
-            ├── opening_loc: (1,0)-(1,3) = "%i("
-            └── closing_loc: (1,4)-(1,5) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/symbols_interp.txt b/test/mri/prism/snapshots/seattlerb/symbols_interp.txt
deleted file mode 100644
index 2ad3cc502d9..00000000000
--- a/test/mri/prism/snapshots/seattlerb/symbols_interp.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,15))
-            ├── flags: ∅
-            ├── elements: (length: 3)
-            │   ├── @ SymbolNode (location: (1,3)-(1,4))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,3)-(1,4) = "a"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a"
-            │   ├── @ SymbolNode (location: (1,5)-(1,12))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,5)-(1,12) = "b\#{1+1}"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "b\#{1+1}"
-            │   └── @ SymbolNode (location: (1,13)-(1,14))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: ∅
-            │       ├── value_loc: (1,13)-(1,14) = "c"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "c"
-            ├── opening_loc: (1,0)-(1,3) = "%i("
-            └── closing_loc: (1,14)-(1,15) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/thingy.txt b/test/mri/prism/snapshots/seattlerb/thingy.txt
deleted file mode 100644
index 4dd2ac44a65..00000000000
--- a/test/mri/prism/snapshots/seattlerb/thingy.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,7))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :f
-        │   │   ├── message_loc: (1,0)-(1,1) = "f"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,1)-(1,2) = "."
-        │   ├── name: :call
-        │   ├── message_loc: ∅
-        │   ├── opening_loc: (1,2)-(1,3) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,3)-(1,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,3)-(1,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 42
-        │   ├── closing_loc: (1,5)-(1,6) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,7))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (3,0)-(3,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :f
-            │   ├── message_loc: (3,0)-(3,1) = "f"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (3,1)-(3,3) = "::"
-            ├── name: :call
-            ├── message_loc: ∅
-            ├── opening_loc: (3,3)-(3,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,4)-(3,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (3,4)-(3,6))
-            │           ├── flags: decimal
-            │           └── value: 42
-            ├── closing_loc: (3,6)-(3,7) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/uminus_float.txt b/test/mri/prism/snapshots/seattlerb/uminus_float.txt
deleted file mode 100644
index 0578dbbd680..00000000000
--- a/test/mri/prism/snapshots/seattlerb/uminus_float.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ FloatNode (location: (1,0)-(1,4))
-            └── value: -0.0
diff --git a/test/mri/prism/snapshots/seattlerb/unary_minus.txt b/test/mri/prism/snapshots/seattlerb/unary_minus.txt
deleted file mode 100644
index 79889bffb04..00000000000
--- a/test/mri/prism/snapshots/seattlerb/unary_minus.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,2))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,2))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,1)-(1,2))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,1)-(1,2) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :-@
-            ├── message_loc: (1,0)-(1,1) = "-"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/unary_plus.txt b/test/mri/prism/snapshots/seattlerb/unary_plus.txt
deleted file mode 100644
index b570cbf73be..00000000000
--- a/test/mri/prism/snapshots/seattlerb/unary_plus.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,2))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,2))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,1)-(1,2))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,1)-(1,2) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :+@
-            ├── message_loc: (1,0)-(1,1) = "+"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/unary_plus_on_literal.txt b/test/mri/prism/snapshots/seattlerb/unary_plus_on_literal.txt
deleted file mode 100644
index 4deb857536f..00000000000
--- a/test/mri/prism/snapshots/seattlerb/unary_plus_on_literal.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,3))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ SymbolNode (location: (1,1)-(1,3))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,1)-(1,2) = ":"
-            │   ├── value_loc: (1,2)-(1,3) = "a"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "a"
-            ├── call_operator_loc: ∅
-            ├── name: :+@
-            ├── message_loc: (1,0)-(1,1) = "+"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/unary_tilde.txt b/test/mri/prism/snapshots/seattlerb/unary_tilde.txt
deleted file mode 100644
index 5fd1a5d00e8..00000000000
--- a/test/mri/prism/snapshots/seattlerb/unary_tilde.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,2))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,2))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,1)-(1,2))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,1)-(1,2) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :~
-            ├── message_loc: (1,0)-(1,1) = "~"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/utf8_bom.txt b/test/mri/prism/snapshots/seattlerb/utf8_bom.txt
deleted file mode 100644
index 9f0eb83b052..00000000000
--- a/test/mri/prism/snapshots/seattlerb/utf8_bom.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (2,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (2,0)-(2,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (2,0)-(2,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (2,0)-(2,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (2,2)-(2,3))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (2,2)-(2,3))
-            │           ├── flags: decimal
-            │           └── value: 0
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/when_splat.txt b/test/mri/prism/snapshots/seattlerb/when_splat.txt
deleted file mode 100644
index 19e70019c0d..00000000000
--- a/test/mri/prism/snapshots/seattlerb/when_splat.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,25))
-            ├── predicate:
-            │   @ CallNode (location: (1,5)-(1,6))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,5)-(1,6) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,8)-(1,20))
-            │       ├── keyword_loc: (1,8)-(1,12) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ SplatNode (location: (1,13)-(1,15))
-            │       │       ├── operator_loc: (1,13)-(1,14) = "*"
-            │       │       └── expression:
-            │       │           @ CallNode (location: (1,14)-(1,15))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :b
-            │       │           ├── message_loc: (1,14)-(1,15) = "b"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       ├── then_keyword_loc: (1,16)-(1,20) = "then"
-            │       └── statements: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,22)-(1,25) = "end"
diff --git a/test/mri/prism/snapshots/seattlerb/words_interp.txt b/test/mri/prism/snapshots/seattlerb/words_interp.txt
deleted file mode 100644
index dfead7d3534..00000000000
--- a/test/mri/prism/snapshots/seattlerb/words_interp.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── elements: (length: 1)
-            │   └── @ InterpolatedStringNode (location: (1,3)-(1,8))
-            │       ├── opening_loc: ∅
-            │       ├── parts: (length: 2)
-            │       │   ├── @ EmbeddedStatementsNode (location: (1,3)-(1,7))
-            │       │   │   ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │       │   │   ├── statements:
-            │       │   │   │   @ StatementsNode (location: (1,5)-(1,6))
-            │       │   │   │   └── body: (length: 1)
-            │       │   │   │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │       │   │   │           ├── flags: decimal
-            │       │   │   │           └── value: 1
-            │       │   │   └── closing_loc: (1,6)-(1,7) = "}"
-            │       │   └── @ StringNode (location: (1,7)-(1,8))
-            │       │       ├── flags: ∅
-            │       │       ├── opening_loc: ∅
-            │       │       ├── content_loc: (1,7)-(1,8) = "b"
-            │       │       ├── closing_loc: ∅
-            │       │       └── unescaped: "b"
-            │       └── closing_loc: ∅
-            ├── opening_loc: (1,0)-(1,3) = "%W("
-            └── closing_loc: (1,8)-(1,9) = ")"
diff --git a/test/mri/prism/snapshots/seattlerb/yield_arg.txt b/test/mri/prism/snapshots/seattlerb/yield_arg.txt
deleted file mode 100644
index 22e0c14f837..00000000000
--- a/test/mri/prism/snapshots/seattlerb/yield_arg.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ YieldNode (location: (1,0)-(1,8))
-            ├── keyword_loc: (1,0)-(1,5) = "yield"
-            ├── lparen_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,6)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 42
-            └── rparen_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/yield_call_assocs.txt b/test/mri/prism/snapshots/seattlerb/yield_call_assocs.txt
deleted file mode 100644
index c04273f5aa4..00000000000
--- a/test/mri/prism/snapshots/seattlerb/yield_call_assocs.txt
+++ /dev/null
@@ -1,224 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,13))
-    └── body: (length: 6)
-        ├── @ YieldNode (location: (1,0)-(1,16))
-        │   ├── keyword_loc: (1,0)-(1,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,6)-(1,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ IntegerNode (location: (1,6)-(1,7))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── @ KeywordHashNode (location: (1,9)-(1,16))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (1,9)-(1,16))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (1,9)-(1,11))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (1,9)-(1,10) = ":"
-        │   │                   │   ├── value_loc: (1,10)-(1,11) = "z"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "z"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (1,15)-(1,16))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (1,12)-(1,14) = "=>"
-        │   └── rparen_loc: ∅
-        ├── @ YieldNode (location: (3,0)-(3,25))
-        │   ├── keyword_loc: (3,0)-(3,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,6)-(3,25))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ IntegerNode (location: (3,6)-(3,7))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── @ KeywordHashNode (location: (3,9)-(3,25))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 2)
-        │   │               ├── @ AssocNode (location: (3,9)-(3,16))
-        │   │               │   ├── key:
-        │   │               │   │   @ SymbolNode (location: (3,9)-(3,11))
-        │   │               │   │   ├── flags: forced_us_ascii_encoding
-        │   │               │   │   ├── opening_loc: (3,9)-(3,10) = ":"
-        │   │               │   │   ├── value_loc: (3,10)-(3,11) = "z"
-        │   │               │   │   ├── closing_loc: ∅
-        │   │               │   │   └── unescaped: "z"
-        │   │               │   ├── value:
-        │   │               │   │   @ IntegerNode (location: (3,15)-(3,16))
-        │   │               │   │   ├── flags: decimal
-        │   │               │   │   └── value: 1
-        │   │               │   └── operator_loc: (3,12)-(3,14) = "=>"
-        │   │               └── @ AssocNode (location: (3,18)-(3,25))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (3,18)-(3,20))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (3,18)-(3,19) = ":"
-        │   │                   │   ├── value_loc: (3,19)-(3,20) = "w"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "w"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (3,24)-(3,25))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 2
-        │   │                   └── operator_loc: (3,21)-(3,23) = "=>"
-        │   └── rparen_loc: ∅
-        ├── @ YieldNode (location: (5,0)-(5,13))
-        │   ├── keyword_loc: (5,0)-(5,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,6)-(5,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (5,6)-(5,13))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :y
-        │   │           ├── message_loc: (5,6)-(5,7) = "y"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (5,8)-(5,13))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ KeywordHashNode (location: (5,8)-(5,13))
-        │   │           │           ├── flags: symbol_keys
-        │   │           │           └── elements: (length: 1)
-        │   │           │               └── @ AssocNode (location: (5,8)-(5,13))
-        │   │           │                   ├── key:
-        │   │           │                   │   @ SymbolNode (location: (5,8)-(5,10))
-        │   │           │                   │   ├── flags: forced_us_ascii_encoding
-        │   │           │                   │   ├── opening_loc: (5,8)-(5,9) = ":"
-        │   │           │                   │   ├── value_loc: (5,9)-(5,10) = "z"
-        │   │           │                   │   ├── closing_loc: ∅
-        │   │           │                   │   └── unescaped: "z"
-        │   │           │                   ├── value:
-        │   │           │                   │   @ IntegerNode (location: (5,12)-(5,13))
-        │   │           │                   │   ├── flags: decimal
-        │   │           │                   │   └── value: 1
-        │   │           │                   └── operator_loc: (5,10)-(5,12) = "=>"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── rparen_loc: ∅
-        ├── @ YieldNode (location: (7,0)-(7,11))
-        │   ├── keyword_loc: (7,0)-(7,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,6)-(7,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (7,6)-(7,11))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :y
-        │   │           ├── message_loc: (7,6)-(7,7) = "y"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (7,8)-(7,11))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ KeywordHashNode (location: (7,8)-(7,11))
-        │   │           │           ├── flags: symbol_keys
-        │   │           │           └── elements: (length: 1)
-        │   │           │               └── @ AssocNode (location: (7,8)-(7,11))
-        │   │           │                   ├── key:
-        │   │           │                   │   @ SymbolNode (location: (7,8)-(7,10))
-        │   │           │                   │   ├── flags: forced_us_ascii_encoding
-        │   │           │                   │   ├── opening_loc: ∅
-        │   │           │                   │   ├── value_loc: (7,8)-(7,9) = "z"
-        │   │           │                   │   ├── closing_loc: (7,9)-(7,10) = ":"
-        │   │           │                   │   └── unescaped: "z"
-        │   │           │                   ├── value:
-        │   │           │                   │   @ IntegerNode (location: (7,10)-(7,11))
-        │   │           │                   │   ├── flags: decimal
-        │   │           │                   │   └── value: 1
-        │   │           │                   └── operator_loc: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── rparen_loc: ∅
-        ├── @ YieldNode (location: (9,0)-(9,12))
-        │   ├── keyword_loc: (9,0)-(9,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,6)-(9,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (9,6)-(9,12))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :y
-        │   │           ├── message_loc: (9,6)-(9,7) = "y"
-        │   │           ├── opening_loc: (9,7)-(9,8) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (9,8)-(9,11))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ KeywordHashNode (location: (9,8)-(9,11))
-        │   │           │           ├── flags: symbol_keys
-        │   │           │           └── elements: (length: 1)
-        │   │           │               └── @ AssocNode (location: (9,8)-(9,11))
-        │   │           │                   ├── key:
-        │   │           │                   │   @ SymbolNode (location: (9,8)-(9,10))
-        │   │           │                   │   ├── flags: forced_us_ascii_encoding
-        │   │           │                   │   ├── opening_loc: ∅
-        │   │           │                   │   ├── value_loc: (9,8)-(9,9) = "z"
-        │   │           │                   │   ├── closing_loc: (9,9)-(9,10) = ":"
-        │   │           │                   │   └── unescaped: "z"
-        │   │           │                   ├── value:
-        │   │           │                   │   @ IntegerNode (location: (9,10)-(9,11))
-        │   │           │                   │   ├── flags: decimal
-        │   │           │                   │   └── value: 1
-        │   │           │                   └── operator_loc: ∅
-        │   │           ├── closing_loc: (9,11)-(9,12) = ")"
-        │   │           └── block: ∅
-        │   └── rparen_loc: ∅
-        └── @ YieldNode (location: (11,0)-(11,13))
-            ├── keyword_loc: (11,0)-(11,5) = "yield"
-            ├── lparen_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (11,6)-(11,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (11,6)-(11,13))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :y
-            │           ├── message_loc: (11,6)-(11,7) = "y"
-            │           ├── opening_loc: (11,7)-(11,8) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (11,8)-(11,12))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ KeywordHashNode (location: (11,8)-(11,12))
-            │           │           ├── flags: ∅
-            │           │           └── elements: (length: 1)
-            │           │               └── @ AssocNode (location: (11,8)-(11,12))
-            │           │                   ├── key:
-            │           │                   │   @ CallNode (location: (11,8)-(11,9))
-            │           │                   │   ├── flags: variable_call, ignore_visibility
-            │           │                   │   ├── receiver: ∅
-            │           │                   │   ├── call_operator_loc: ∅
-            │           │                   │   ├── name: :z
-            │           │                   │   ├── message_loc: (11,8)-(11,9) = "z"
-            │           │                   │   ├── opening_loc: ∅
-            │           │                   │   ├── arguments: ∅
-            │           │                   │   ├── closing_loc: ∅
-            │           │                   │   └── block: ∅
-            │           │                   ├── value:
-            │           │                   │   @ IntegerNode (location: (11,11)-(11,12))
-            │           │                   │   ├── flags: decimal
-            │           │                   │   └── value: 1
-            │           │                   └── operator_loc: (11,9)-(11,11) = "=>"
-            │           ├── closing_loc: (11,12)-(11,13) = ")"
-            │           └── block: ∅
-            └── rparen_loc: ∅
diff --git a/test/mri/prism/snapshots/seattlerb/yield_empty_parens.txt b/test/mri/prism/snapshots/seattlerb/yield_empty_parens.txt
deleted file mode 100644
index 5ecd89823fd..00000000000
--- a/test/mri/prism/snapshots/seattlerb/yield_empty_parens.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ YieldNode (location: (1,0)-(1,7))
-            ├── keyword_loc: (1,0)-(1,5) = "yield"
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── arguments: ∅
-            └── rparen_loc: (1,6)-(1,7) = ")"
diff --git a/test/mri/prism/snapshots/single_method_call_with_bang.txt b/test/mri/prism/snapshots/single_method_call_with_bang.txt
deleted file mode 100644
index 4c68e0adac9..00000000000
--- a/test/mri/prism/snapshots/single_method_call_with_bang.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,4))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo!
-            ├── message_loc: (1,0)-(1,4) = "foo!"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/single_quote_heredocs.txt b/test/mri/prism/snapshots/single_quote_heredocs.txt
deleted file mode 100644
index 429c9daf11c..00000000000
--- a/test/mri/prism/snapshots/single_quote_heredocs.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,8))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,8) = "<<-'EOS'"
-            ├── content_loc: (2,0)-(3,0) = "    cd L:\\Work\\MG3710IQPro\\Develop\n"
-            ├── closing_loc: (3,0)-(4,0) = "EOS\n"
-            └── unescaped: "    cd L:\\Work\\MG3710IQPro\\Develop\n"
diff --git a/test/mri/prism/snapshots/spanning_heredoc.txt b/test/mri/prism/snapshots/spanning_heredoc.txt
deleted file mode 100644
index 90297d2282c..00000000000
--- a/test/mri/prism/snapshots/spanning_heredoc.txt
+++ /dev/null
@@ -1,409 +0,0 @@
-@ ProgramNode (location: (4,0)-(63,2))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (4,0)-(63,2))
-    └── body: (length: 14)
-        ├── @ CallNode (location: (4,0)-(7,7))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :pp
-        │   ├── message_loc: (4,0)-(4,2) = "pp"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (4,3)-(7,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (4,3)-(7,7))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ StringNode (location: (4,3)-(4,7))
-        │   │           │   ├── flags: ∅
-        │   │           │   ├── opening_loc: (4,3)-(4,7) = "<<-A"
-        │   │           │   ├── content_loc: (5,0)-(6,0) = "a\n"
-        │   │           │   ├── closing_loc: (6,0)-(7,0) = "A\n"
-        │   │           │   └── unescaped: "a\n"
-        │   │           ├── call_operator_loc: (4,7)-(4,8) = "."
-        │   │           ├── name: :gsub
-        │   │           ├── message_loc: (4,8)-(4,12) = "gsub"
-        │   │           ├── opening_loc: (4,12)-(4,13) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (4,13)-(7,6))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ InterpolatedRegularExpressionNode (location: (4,13)-(7,2))
-        │   │           │       │   ├── flags: ∅
-        │   │           │       │   ├── opening_loc: (4,13)-(4,14) = "/"
-        │   │           │       │   ├── parts: (length: 2)
-        │   │           │       │   │   ├── @ StringNode (location: (4,14)-(4,16))
-        │   │           │       │   │   │   ├── flags: ∅
-        │   │           │       │   │   │   ├── opening_loc: ∅
-        │   │           │       │   │   │   ├── content_loc: (4,14)-(4,16) = "b\\"
-        │   │           │       │   │   │   ├── closing_loc: ∅
-        │   │           │       │   │   │   └── unescaped: "b"
-        │   │           │       │   │   └── @ StringNode (location: (7,0)-(7,1))
-        │   │           │       │   │       ├── flags: ∅
-        │   │           │       │   │       ├── opening_loc: ∅
-        │   │           │       │   │       ├── content_loc: (7,0)-(7,1) = "b"
-        │   │           │       │   │       ├── closing_loc: ∅
-        │   │           │       │   │       └── unescaped: "b"
-        │   │           │       │   └── closing_loc: (7,1)-(7,2) = "/"
-        │   │           │       └── @ StringNode (location: (7,4)-(7,6))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── opening_loc: (7,4)-(7,5) = "\""
-        │   │           │           ├── content_loc: (7,5)-(7,5) = ""
-        │   │           │           ├── closing_loc: (7,5)-(7,6) = "\""
-        │   │           │           └── unescaped: ""
-        │   │           ├── closing_loc: (7,6)-(7,7) = ")"
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (10,0)-(13,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :pp
-        │   ├── message_loc: (10,0)-(10,2) = "pp"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (10,3)-(13,2))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ StringNode (location: (10,3)-(10,7))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (10,3)-(10,7) = "<<-A"
-        │   │       │   ├── content_loc: (11,0)-(12,0) = "c\n"
-        │   │       │   ├── closing_loc: (12,0)-(13,0) = "A\n"
-        │   │       │   └── unescaped: "c\n"
-        │   │       └── @ InterpolatedStringNode (location: (10,9)-(13,2))
-        │   │           ├── opening_loc: (10,9)-(10,10) = "\""
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (10,10)-(10,12))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (10,10)-(10,12) = "d\\"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "d"
-        │   │           │   └── @ StringNode (location: (13,0)-(13,1))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (13,0)-(13,1) = "d"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "d"
-        │   │           └── closing_loc: (13,1)-(13,2) = "\""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (16,0)-(19,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :pp
-        │   ├── message_loc: (16,0)-(16,2) = "pp"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (16,3)-(19,2))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ StringNode (location: (16,3)-(16,7))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (16,3)-(16,7) = "<<-A"
-        │   │       │   ├── content_loc: (17,0)-(18,0) = "e\n"
-        │   │       │   ├── closing_loc: (18,0)-(19,0) = "A\n"
-        │   │       │   └── unescaped: "e\n"
-        │   │       └── @ InterpolatedStringNode (location: (16,9)-(19,2))
-        │   │           ├── opening_loc: (16,9)-(16,12) = "%q["
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (16,12)-(16,14))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (16,12)-(16,14) = "f\\"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "f\\\n"
-        │   │           │   └── @ StringNode (location: (19,0)-(19,1))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (19,0)-(19,1) = "f"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "f"
-        │   │           └── closing_loc: (19,1)-(19,2) = "]"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (22,0)-(25,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :pp
-        │   ├── message_loc: (22,0)-(22,2) = "pp"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (22,3)-(25,2))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ StringNode (location: (22,3)-(22,7))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (22,3)-(22,7) = "<<-A"
-        │   │       │   ├── content_loc: (23,0)-(24,0) = "g\n"
-        │   │       │   ├── closing_loc: (24,0)-(25,0) = "A\n"
-        │   │       │   └── unescaped: "g\n"
-        │   │       └── @ InterpolatedStringNode (location: (22,9)-(25,2))
-        │   │           ├── opening_loc: (22,9)-(22,12) = "%Q["
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (22,12)-(22,14))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (22,12)-(22,14) = "h\\"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "h"
-        │   │           │   └── @ StringNode (location: (25,0)-(25,1))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (25,0)-(25,1) = "h"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "h"
-        │   │           └── closing_loc: (25,1)-(25,2) = "]"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (28,0)-(31,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :pp
-        │   ├── message_loc: (28,0)-(28,2) = "pp"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (28,3)-(31,2))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ StringNode (location: (28,3)-(28,7))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (28,3)-(28,7) = "<<-A"
-        │   │       │   ├── content_loc: (29,0)-(30,0) = "i\n"
-        │   │       │   ├── closing_loc: (30,0)-(31,0) = "A\n"
-        │   │       │   └── unescaped: "i\n"
-        │   │       └── @ ArrayNode (location: (28,9)-(31,2))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 2)
-        │   │           │   ├── @ StringNode (location: (28,12)-(28,14))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (28,12)-(28,14) = "j\\"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "j\n"
-        │   │           │   └── @ StringNode (location: (31,0)-(31,1))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (31,0)-(31,1) = "j"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "j"
-        │   │           ├── opening_loc: (28,9)-(28,12) = "%w["
-        │   │           └── closing_loc: (31,1)-(31,2) = "]"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (35,0)-(38,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :pp
-        │   ├── message_loc: (35,0)-(35,2) = "pp"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (35,3)-(38,2))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ StringNode (location: (35,3)-(35,7))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (35,3)-(35,7) = "<<-A"
-        │   │       │   ├── content_loc: (36,0)-(37,0) = "k\n"
-        │   │       │   ├── closing_loc: (37,0)-(38,0) = "A\n"
-        │   │       │   └── unescaped: "k\n"
-        │   │       └── @ ArrayNode (location: (35,9)-(38,2))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 1)
-        │   │           │   └── @ InterpolatedStringNode (location: (35,12)-(38,1))
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── parts: (length: 2)
-        │   │           │       │   ├── @ StringNode (location: (35,12)-(35,14))
-        │   │           │       │   │   ├── flags: ∅
-        │   │           │       │   │   ├── opening_loc: ∅
-        │   │           │       │   │   ├── content_loc: (35,12)-(35,14) = "l\\"
-        │   │           │       │   │   ├── closing_loc: ∅
-        │   │           │       │   │   └── unescaped: "l\n"
-        │   │           │       │   └── @ StringNode (location: (38,0)-(38,1))
-        │   │           │       │       ├── flags: ∅
-        │   │           │       │       ├── opening_loc: ∅
-        │   │           │       │       ├── content_loc: (38,0)-(38,1) = "l"
-        │   │           │       │       ├── closing_loc: ∅
-        │   │           │       │       └── unescaped: "l"
-        │   │           │       └── closing_loc: ∅
-        │   │           ├── opening_loc: (35,9)-(35,12) = "%W["
-        │   │           └── closing_loc: (38,1)-(38,2) = "]"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (41,0)-(44,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :pp
-        │   ├── message_loc: (41,0)-(41,2) = "pp"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (41,3)-(44,2))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ StringNode (location: (41,3)-(41,7))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (41,3)-(41,7) = "<<-A"
-        │   │       │   ├── content_loc: (42,0)-(43,0) = "m\n"
-        │   │       │   ├── closing_loc: (43,0)-(44,0) = "A\n"
-        │   │       │   └── unescaped: "m\n"
-        │   │       └── @ ArrayNode (location: (41,9)-(44,2))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 2)
-        │   │           │   ├── @ SymbolNode (location: (41,12)-(41,14))
-        │   │           │   │   ├── flags: forced_us_ascii_encoding
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── value_loc: (41,12)-(41,14) = "n\\"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "n\n"
-        │   │           │   └── @ SymbolNode (location: (44,0)-(44,1))
-        │   │           │       ├── flags: forced_us_ascii_encoding
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── value_loc: (44,0)-(44,1) = "n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "n"
-        │   │           ├── opening_loc: (41,9)-(41,12) = "%i["
-        │   │           └── closing_loc: (44,1)-(44,2) = "]"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (48,0)-(51,2))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :pp
-        │   ├── message_loc: (48,0)-(48,2) = "pp"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (48,3)-(51,2))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ StringNode (location: (48,3)-(48,7))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (48,3)-(48,7) = "<<-A"
-        │   │       │   ├── content_loc: (49,0)-(50,0) = "o\n"
-        │   │       │   ├── closing_loc: (50,0)-(51,0) = "A\n"
-        │   │       │   └── unescaped: "o\n"
-        │   │       └── @ ArrayNode (location: (48,9)-(51,2))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 1)
-        │   │           │   └── @ InterpolatedSymbolNode (location: (48,12)-(48,14))
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── parts: (length: 2)
-        │   │           │       │   ├── @ StringNode (location: (48,12)-(48,14))
-        │   │           │       │   │   ├── flags: ∅
-        │   │           │       │   │   ├── opening_loc: ∅
-        │   │           │       │   │   ├── content_loc: (48,12)-(48,14) = "p\\"
-        │   │           │       │   │   ├── closing_loc: ∅
-        │   │           │       │   │   └── unescaped: "p\n"
-        │   │           │       │   └── @ StringNode (location: (48,12)-(48,14))
-        │   │           │       │       ├── flags: ∅
-        │   │           │       │       ├── opening_loc: ∅
-        │   │           │       │       ├── content_loc: (48,12)-(48,14) = "p\\"
-        │   │           │       │       ├── closing_loc: ∅
-        │   │           │       │       └── unescaped: "p"
-        │   │           │       └── closing_loc: ∅
-        │   │           ├── opening_loc: (48,9)-(48,12) = "%I["
-        │   │           └── closing_loc: (51,1)-(51,2) = "]"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ StringNode (location: (53,0)-(53,3))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (53,0)-(53,3) = "<<A"
-        │   ├── content_loc: (54,0)-(54,0) = ""
-        │   ├── closing_loc: (54,0)-(55,0) = "A\n"
-        │   └── unescaped: ""
-        ├── @ MatchWriteNode (location: (53,5)-(55,13))
-        │   ├── call:
-        │   │   @ CallNode (location: (53,5)-(55,13))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ InterpolatedRegularExpressionNode (location: (53,5)-(55,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (53,5)-(53,6) = "/"
-        │   │   │   ├── parts: (length: 2)
-        │   │   │   │   ├── @ StringNode (location: (53,6)-(53,7))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   ├── content_loc: (53,6)-(53,7) = "\\"
-        │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   └── unescaped: ""
-        │   │   │   │   └── @ StringNode (location: (55,0)-(55,6))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── content_loc: (55,0)-(55,6) = "(?<a>)"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "(?<a>)"
-        │   │   │   └── closing_loc: (55,6)-(55,7) = "/"
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :=~
-        │   │   ├── message_loc: (55,8)-(55,10) = "=~"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (55,11)-(55,13))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ StringNode (location: (55,11)-(55,13))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (55,11)-(55,12) = "'"
-        │   │   │           ├── content_loc: (55,12)-(55,12) = ""
-        │   │   │           ├── closing_loc: (55,12)-(55,13) = "'"
-        │   │   │           └── unescaped: ""
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── targets: (length: 1)
-        │       └── @ LocalVariableTargetNode (location: (53,5)-(55,7))
-        │           ├── name: :a
-        │           └── depth: 0
-        ├── @ StringNode (location: (57,0)-(57,3))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (57,0)-(57,3) = "<<A"
-        │   ├── content_loc: (58,0)-(58,0) = ""
-        │   ├── closing_loc: (58,0)-(59,0) = "A\n"
-        │   └── unescaped: ""
-        ├── @ InterpolatedSymbolNode (location: (57,5)-(59,2))
-        │   ├── opening_loc: (57,5)-(57,7) = ":'"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (57,7)-(58,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (57,7)-(58,0) = "a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ StringNode (location: (59,0)-(59,1))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (59,0)-(59,1) = "b"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b"
-        │   └── closing_loc: (59,1)-(59,2) = "'"
-        ├── @ StringNode (location: (61,0)-(61,3))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (61,0)-(61,3) = "<<A"
-        │   ├── content_loc: (62,0)-(62,0) = ""
-        │   ├── closing_loc: (62,0)-(63,0) = "A\n"
-        │   └── unescaped: ""
-        └── @ InterpolatedSymbolNode (location: (61,5)-(63,2))
-            ├── opening_loc: (61,5)-(61,7) = ":\""
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (61,7)-(62,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (61,7)-(62,0) = "a\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "a\n"
-            │   └── @ StringNode (location: (63,0)-(63,1))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (63,0)-(63,1) = "b"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "b"
-            └── closing_loc: (63,1)-(63,2) = "\""
diff --git a/test/mri/prism/snapshots/spanning_heredoc_newlines.txt b/test/mri/prism/snapshots/spanning_heredoc_newlines.txt
deleted file mode 100644
index e3609ddbbab..00000000000
--- a/test/mri/prism/snapshots/spanning_heredoc_newlines.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-@ ProgramNode (location: (1,0)-(24,0))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(24,0))
-    └── body: (length: 6)
-        ├── @ CallNode (location: (1,0)-(4,0))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (1,0)-(1,3))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (1,0)-(1,3) = "<<A"
-        │   │   ├── content_loc: (2,0)-(2,0) = ""
-        │   │   ├── closing_loc: (2,0)-(3,0) = "A\n"
-        │   │   └── unescaped: ""
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (1,3)-(1,4) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(4,0))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (1,4)-(4,0))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,4)-(2,0) = "%\n"
-        │   │           ├── content_loc: (3,0)-(3,0) = ""
-        │   │           ├── closing_loc: (3,0)-(4,0) = "\n"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(8,0))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (5,0)-(5,3))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (5,0)-(5,3) = "<<A"
-        │   │   ├── content_loc: (6,0)-(6,0) = ""
-        │   │   ├── closing_loc: (6,0)-(7,0) = "A\n"
-        │   │   └── unescaped: ""
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (5,3)-(5,4) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,4)-(8,0))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ RegularExpressionNode (location: (5,4)-(8,0))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (5,4)-(6,0) = "%r\n"
-        │   │           ├── content_loc: (6,0)-(6,0) = ""
-        │   │           ├── closing_loc: (7,0)-(8,0) = "\n"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (9,0)-(12,0))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (9,0)-(9,3))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (9,0)-(9,3) = "<<A"
-        │   │   ├── content_loc: (10,0)-(10,0) = ""
-        │   │   ├── closing_loc: (10,0)-(11,0) = "A\n"
-        │   │   └── unescaped: ""
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (9,3)-(9,4) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,4)-(12,0))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (9,4)-(12,0))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (9,4)-(10,0) = "%q\n"
-        │   │           ├── content_loc: (11,0)-(11,0) = ""
-        │   │           ├── closing_loc: (11,0)-(12,0) = "\n"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (13,0)-(16,0))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (13,0)-(13,3))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (13,0)-(13,3) = "<<A"
-        │   │   ├── content_loc: (14,0)-(14,0) = ""
-        │   │   ├── closing_loc: (14,0)-(15,0) = "A\n"
-        │   │   └── unescaped: ""
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (13,3)-(13,4) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (13,4)-(16,0))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (13,4)-(16,0))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (13,4)-(14,0) = "%Q\n"
-        │   │           ├── content_loc: (15,0)-(15,0) = ""
-        │   │           ├── closing_loc: (15,0)-(16,0) = "\n"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (17,0)-(20,0))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (17,0)-(17,3))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (17,0)-(17,3) = "<<A"
-        │   │   ├── content_loc: (18,0)-(18,0) = ""
-        │   │   ├── closing_loc: (18,0)-(19,0) = "A\n"
-        │   │   └── unescaped: ""
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (17,3)-(17,4) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (17,4)-(20,0))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SymbolNode (location: (17,4)-(20,0))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (17,4)-(18,0) = "%s\n"
-        │   │           ├── value_loc: (18,0)-(18,0) = ""
-        │   │           ├── closing_loc: (19,0)-(20,0) = "\n"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (21,0)-(24,0))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ StringNode (location: (21,0)-(21,3))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (21,0)-(21,3) = "<<A"
-            │   ├── content_loc: (22,0)-(22,0) = ""
-            │   ├── closing_loc: (22,0)-(23,0) = "A\n"
-            │   └── unescaped: ""
-            ├── call_operator_loc: ∅
-            ├── name: :+
-            ├── message_loc: (21,3)-(21,4) = "+"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (21,4)-(24,0))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ XStringNode (location: (21,4)-(24,0))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (21,4)-(22,0) = "%x\n"
-            │           ├── content_loc: (22,0)-(22,0) = ""
-            │           ├── closing_loc: (23,0)-(24,0) = "\n"
-            │           └── unescaped: ""
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/strings.txt b/test/mri/prism/snapshots/strings.txt
deleted file mode 100644
index 40a05ce09d5..00000000000
--- a/test/mri/prism/snapshots/strings.txt
+++ /dev/null
@@ -1,527 +0,0 @@
-@ ProgramNode (location: (1,0)-(105,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(105,4))
-    └── body: (length: 50)
-        ├── @ StringNode (location: (1,0)-(1,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,2) = "%%"
-        │   ├── content_loc: (1,2)-(1,5) = "abc"
-        │   ├── closing_loc: (1,5)-(1,6) = "%"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (3,0)-(3,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (3,0)-(3,2) = "%^"
-        │   ├── content_loc: (3,2)-(3,5) = "abc"
-        │   ├── closing_loc: (3,5)-(3,6) = "^"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (5,0)-(5,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (5,0)-(5,2) = "%&"
-        │   ├── content_loc: (5,2)-(5,5) = "abc"
-        │   ├── closing_loc: (5,5)-(5,6) = "&"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (7,0)-(7,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (7,0)-(7,2) = "%*"
-        │   ├── content_loc: (7,2)-(7,5) = "abc"
-        │   ├── closing_loc: (7,5)-(7,6) = "*"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (9,0)-(9,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (9,0)-(9,2) = "%_"
-        │   ├── content_loc: (9,2)-(9,5) = "abc"
-        │   ├── closing_loc: (9,5)-(9,6) = "_"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (11,0)-(11,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (11,0)-(11,2) = "%+"
-        │   ├── content_loc: (11,2)-(11,5) = "abc"
-        │   ├── closing_loc: (11,5)-(11,6) = "+"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (13,0)-(13,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (13,0)-(13,2) = "%-"
-        │   ├── content_loc: (13,2)-(13,5) = "abc"
-        │   ├── closing_loc: (13,5)-(13,6) = "-"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (15,0)-(15,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (15,0)-(15,2) = "%:"
-        │   ├── content_loc: (15,2)-(15,5) = "abc"
-        │   ├── closing_loc: (15,5)-(15,6) = ":"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (17,0)-(17,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (17,0)-(17,2) = "%;"
-        │   ├── content_loc: (17,2)-(17,5) = "abc"
-        │   ├── closing_loc: (17,5)-(17,6) = ";"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (19,0)-(19,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (19,0)-(19,2) = "%'"
-        │   ├── content_loc: (19,2)-(19,5) = "abc"
-        │   ├── closing_loc: (19,5)-(19,6) = "'"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (21,0)-(21,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (21,0)-(21,2) = "%~"
-        │   ├── content_loc: (21,2)-(21,5) = "abc"
-        │   ├── closing_loc: (21,5)-(21,6) = "~"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (23,0)-(23,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (23,0)-(23,2) = "%?"
-        │   ├── content_loc: (23,2)-(23,5) = "abc"
-        │   ├── closing_loc: (23,5)-(23,6) = "?"
-        │   └── unescaped: "abc"
-        ├── @ ArrayNode (location: (25,0)-(25,8))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (25,0)-(25,3) = "%w{"
-        │   └── closing_loc: (25,7)-(25,8) = "}"
-        ├── @ StringNode (location: (27,0)-(27,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (27,0)-(27,2) = "%/"
-        │   ├── content_loc: (27,2)-(27,5) = "abc"
-        │   ├── closing_loc: (27,5)-(27,6) = "/"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (29,0)-(29,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (29,0)-(29,2) = "%`"
-        │   ├── content_loc: (29,2)-(29,5) = "abc"
-        │   ├── closing_loc: (29,5)-(29,6) = "`"
-        │   └── unescaped: "abc"
-        ├── @ InterpolatedStringNode (location: (31,0)-(31,8))
-        │   ├── opening_loc: (31,0)-(31,1) = "\""
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedVariableNode (location: (31,1)-(31,7))
-        │   │       ├── operator_loc: (31,1)-(31,2) = "#"
-        │   │       └── variable:
-        │   │           @ ClassVariableReadNode (location: (31,2)-(31,7))
-        │   │           └── name: :@@foo
-        │   └── closing_loc: (31,7)-(31,8) = "\""
-        ├── @ StringNode (location: (33,0)-(33,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (33,0)-(33,2) = "%\\"
-        │   ├── content_loc: (33,2)-(33,5) = "abc"
-        │   ├── closing_loc: (33,5)-(33,6) = "\\"
-        │   └── unescaped: "abc"
-        ├── @ InterpolatedStringNode (location: (35,0)-(35,17))
-        │   ├── opening_loc: (35,0)-(35,2) = "%{"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (35,2)-(35,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (35,2)-(35,6) = "aaa "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "aaa "
-        │   │   ├── @ EmbeddedStatementsNode (location: (35,6)-(35,12))
-        │   │   │   ├── opening_loc: (35,6)-(35,8) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (35,8)-(35,11))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (35,8)-(35,11))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bbb
-        │   │   │   │           ├── message_loc: (35,8)-(35,11) = "bbb"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (35,11)-(35,12) = "}"
-        │   │   └── @ StringNode (location: (35,12)-(35,16))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (35,12)-(35,16) = " ccc"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: " ccc"
-        │   └── closing_loc: (35,16)-(35,17) = "}"
-        ├── @ StringNode (location: (37,0)-(37,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (37,0)-(37,2) = "%["
-        │   ├── content_loc: (37,2)-(37,7) = "foo[]"
-        │   ├── closing_loc: (37,7)-(37,8) = "]"
-        │   └── unescaped: "foo[]"
-        ├── @ CallNode (location: (39,0)-(41,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ StringNode (location: (39,0)-(39,5))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (39,0)-(39,1) = "\""
-        │   │   ├── content_loc: (39,1)-(39,4) = "foo"
-        │   │   ├── closing_loc: (39,4)-(39,5) = "\""
-        │   │   └── unescaped: "foo"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (39,6)-(39,7) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (41,0)-(41,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (41,0)-(41,5))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (41,0)-(41,1) = "\""
-        │   │           ├── content_loc: (41,1)-(41,4) = "bar"
-        │   │           ├── closing_loc: (41,4)-(41,5) = "\""
-        │   │           └── unescaped: "bar"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ StringNode (location: (43,0)-(43,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (43,0)-(43,3) = "%q{"
-        │   ├── content_loc: (43,3)-(43,6) = "abc"
-        │   ├── closing_loc: (43,6)-(43,7) = "}"
-        │   └── unescaped: "abc"
-        ├── @ SymbolNode (location: (45,0)-(45,7))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (45,0)-(45,3) = "%s["
-        │   ├── value_loc: (45,3)-(45,6) = "abc"
-        │   ├── closing_loc: (45,6)-(45,7) = "]"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (47,0)-(47,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (47,0)-(47,2) = "%{"
-        │   ├── content_loc: (47,2)-(47,5) = "abc"
-        │   ├── closing_loc: (47,5)-(47,6) = "}"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (49,0)-(49,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (49,0)-(49,1) = "'"
-        │   ├── content_loc: (49,1)-(49,1) = ""
-        │   ├── closing_loc: (49,1)-(49,2) = "'"
-        │   └── unescaped: ""
-        ├── @ StringNode (location: (51,0)-(51,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (51,0)-(51,1) = "\""
-        │   ├── content_loc: (51,1)-(51,4) = "abc"
-        │   ├── closing_loc: (51,4)-(51,5) = "\""
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (53,0)-(53,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (53,0)-(53,1) = "\""
-        │   ├── content_loc: (53,1)-(53,6) = "\#@---"
-        │   ├── closing_loc: (53,6)-(53,7) = "\""
-        │   └── unescaped: "\#@---"
-        ├── @ InterpolatedStringNode (location: (55,0)-(55,16))
-        │   ├── opening_loc: (55,0)-(55,1) = "\""
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (55,1)-(55,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (55,1)-(55,5) = "aaa "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "aaa "
-        │   │   ├── @ EmbeddedStatementsNode (location: (55,5)-(55,11))
-        │   │   │   ├── opening_loc: (55,5)-(55,7) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (55,7)-(55,10))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (55,7)-(55,10))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bbb
-        │   │   │   │           ├── message_loc: (55,7)-(55,10) = "bbb"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (55,10)-(55,11) = "}"
-        │   │   └── @ StringNode (location: (55,11)-(55,15))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (55,11)-(55,15) = " ccc"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: " ccc"
-        │   └── closing_loc: (55,15)-(55,16) = "\""
-        ├── @ StringNode (location: (57,0)-(57,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (57,0)-(57,1) = "'"
-        │   ├── content_loc: (57,1)-(57,4) = "abc"
-        │   ├── closing_loc: (57,4)-(57,5) = "'"
-        │   └── unescaped: "abc"
-        ├── @ ArrayNode (location: (59,0)-(59,9))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ StringNode (location: (59,3)-(59,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (59,3)-(59,4) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ StringNode (location: (59,5)-(59,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (59,5)-(59,6) = "b"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b"
-        │   │   └── @ StringNode (location: (59,7)-(59,8))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (59,7)-(59,8) = "c"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "c"
-        │   ├── opening_loc: (59,0)-(59,3) = "%w["
-        │   └── closing_loc: (59,8)-(59,9) = "]"
-        ├── @ ArrayNode (location: (61,0)-(61,17))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ StringNode (location: (61,3)-(61,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (61,3)-(61,6) = "a[]"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a[]"
-        │   │   ├── @ StringNode (location: (61,7)-(61,12))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (61,7)-(61,12) = "b[[]]"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b[[]]"
-        │   │   └── @ StringNode (location: (61,13)-(61,16))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (61,13)-(61,16) = "c[]"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "c[]"
-        │   ├── opening_loc: (61,0)-(61,3) = "%w["
-        │   └── closing_loc: (61,16)-(61,17) = "]"
-        ├── @ ArrayNode (location: (63,0)-(63,18))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (63,3)-(63,11))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (63,3)-(63,11) = "foo\\ bar"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo bar"
-        │   │   └── @ StringNode (location: (63,12)-(63,17))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (63,12)-(63,17) = "\\\#{1}"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\\\#{1}"
-        │   ├── opening_loc: (63,0)-(63,3) = "%w["
-        │   └── closing_loc: (63,17)-(63,18) = "]"
-        ├── @ ArrayNode (location: (65,0)-(65,16))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (65,3)-(65,11))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (65,3)-(65,11) = "foo\\ bar"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo bar"
-        │   │   └── @ StringNode (location: (65,12)-(65,15))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (65,12)-(65,15) = "baz"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "baz"
-        │   ├── opening_loc: (65,0)-(65,3) = "%w["
-        │   └── closing_loc: (65,15)-(65,16) = "]"
-        ├── @ ArrayNode (location: (67,0)-(67,14))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ StringNode (location: (67,3)-(67,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (67,3)-(67,4) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ InterpolatedStringNode (location: (67,5)-(67,11))
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── parts: (length: 3)
-        │   │   │   │   ├── @ StringNode (location: (67,5)-(67,6))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   ├── content_loc: (67,5)-(67,6) = "b"
-        │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   └── unescaped: "b"
-        │   │   │   │   ├── @ EmbeddedStatementsNode (location: (67,6)-(67,10))
-        │   │   │   │   │   ├── opening_loc: (67,6)-(67,8) = "\#{"
-        │   │   │   │   │   ├── statements:
-        │   │   │   │   │   │   @ StatementsNode (location: (67,8)-(67,9))
-        │   │   │   │   │   │   └── body: (length: 1)
-        │   │   │   │   │   │       └── @ CallNode (location: (67,8)-(67,9))
-        │   │   │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │   │   │           ├── receiver: ∅
-        │   │   │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │   │   │           ├── name: :c
-        │   │   │   │   │   │           ├── message_loc: (67,8)-(67,9) = "c"
-        │   │   │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │   │   │           ├── arguments: ∅
-        │   │   │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │   │   │           └── block: ∅
-        │   │   │   │   │   └── closing_loc: (67,9)-(67,10) = "}"
-        │   │   │   │   └── @ StringNode (location: (67,10)-(67,11))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── content_loc: (67,10)-(67,11) = "d"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "d"
-        │   │   │   └── closing_loc: ∅
-        │   │   └── @ StringNode (location: (67,12)-(67,13))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (67,12)-(67,13) = "e"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "e"
-        │   ├── opening_loc: (67,0)-(67,3) = "%W["
-        │   └── closing_loc: (67,13)-(67,14) = "]"
-        ├── @ ArrayNode (location: (69,0)-(69,9))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ StringNode (location: (69,3)-(69,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (69,3)-(69,4) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ StringNode (location: (69,5)-(69,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (69,5)-(69,6) = "b"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b"
-        │   │   └── @ StringNode (location: (69,7)-(69,8))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (69,7)-(69,8) = "c"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "c"
-        │   ├── opening_loc: (69,0)-(69,3) = "%W["
-        │   └── closing_loc: (69,8)-(69,9) = "]"
-        ├── @ ArrayNode (location: (71,0)-(75,1))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ StringNode (location: (72,2)-(72,3))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (72,2)-(72,3) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ StringNode (location: (73,2)-(73,3))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (73,2)-(73,3) = "b"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b"
-        │   │   └── @ StringNode (location: (74,2)-(74,3))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (74,2)-(74,3) = "c"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "c"
-        │   ├── opening_loc: (71,0)-(71,3) = "%w["
-        │   └── closing_loc: (75,0)-(75,1) = "]"
-        ├── @ StringNode (location: (77,0)-(77,15))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (77,0)-(77,1) = "'"
-        │   ├── content_loc: (77,1)-(77,14) = "\\' foo \\' bar"
-        │   ├── closing_loc: (77,14)-(77,15) = "'"
-        │   └── unescaped: "' foo ' bar"
-        ├── @ StringNode (location: (79,0)-(79,15))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (79,0)-(79,1) = "'"
-        │   ├── content_loc: (79,1)-(79,14) = "\\\\ foo \\\\ bar"
-        │   ├── closing_loc: (79,14)-(79,15) = "'"
-        │   └── unescaped: "\\ foo \\ bar"
-        ├── @ InterpolatedStringNode (location: (81,0)-(81,7))
-        │   ├── opening_loc: (81,0)-(81,1) = "\""
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedVariableNode (location: (81,1)-(81,6))
-        │   │       ├── operator_loc: (81,1)-(81,2) = "#"
-        │   │       └── variable:
-        │   │           @ GlobalVariableReadNode (location: (81,2)-(81,6))
-        │   │           └── name: :$foo
-        │   └── closing_loc: (81,6)-(81,7) = "\""
-        ├── @ InterpolatedStringNode (location: (83,0)-(83,7))
-        │   ├── opening_loc: (83,0)-(83,1) = "\""
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedVariableNode (location: (83,1)-(83,6))
-        │   │       ├── operator_loc: (83,1)-(83,2) = "#"
-        │   │       └── variable:
-        │   │           @ InstanceVariableReadNode (location: (83,2)-(83,6))
-        │   │           └── name: :@foo
-        │   └── closing_loc: (83,6)-(83,7) = "\""
-        ├── @ StringNode (location: (85,0)-(85,15))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (85,0)-(85,1) = "\""
-        │   ├── content_loc: (85,1)-(85,14) = "\\x7 \\x23 \\x61"
-        │   ├── closing_loc: (85,14)-(85,15) = "\""
-        │   └── unescaped: "\a # a"
-        ├── @ StringNode (location: (87,0)-(87,13))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (87,0)-(87,1) = "\""
-        │   ├── content_loc: (87,1)-(87,12) = "\\7 \\43 \\141"
-        │   ├── closing_loc: (87,12)-(87,13) = "\""
-        │   └── unescaped: "\a # a"
-        ├── @ StringNode (location: (89,0)-(89,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (89,0)-(89,2) = "%["
-        │   ├── content_loc: (89,2)-(89,5) = "abc"
-        │   ├── closing_loc: (89,5)-(89,6) = "]"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (91,0)-(91,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (91,0)-(91,2) = "%("
-        │   ├── content_loc: (91,2)-(91,5) = "abc"
-        │   ├── closing_loc: (91,5)-(91,6) = ")"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (93,0)-(93,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (93,0)-(93,2) = "%@"
-        │   ├── content_loc: (93,2)-(93,5) = "abc"
-        │   ├── closing_loc: (93,5)-(93,6) = "@"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (95,0)-(95,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (95,0)-(95,2) = "%$"
-        │   ├── content_loc: (95,2)-(95,5) = "abc"
-        │   ├── closing_loc: (95,5)-(95,6) = "$"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (97,0)-(97,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (97,0)-(97,1) = "?"
-        │   ├── content_loc: (97,1)-(97,2) = "a"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "a"
-        ├── @ InterpolatedStringNode (location: (99,0)-(99,6))
-        │   ├── opening_loc: ∅
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (99,0)-(99,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (99,0)-(99,1) = "?"
-        │   │   │   ├── content_loc: (99,1)-(99,2) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ StringNode (location: (99,3)-(99,6))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (99,3)-(99,4) = "\""
-        │   │       ├── content_loc: (99,4)-(99,5) = "a"
-        │   │       ├── closing_loc: (99,5)-(99,6) = "\""
-        │   │       └── unescaped: "a"
-        │   └── closing_loc: ∅
-        ├── @ StringNode (location: (101,0)-(101,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (101,0)-(101,3) = "%Q{"
-        │   ├── content_loc: (101,3)-(101,6) = "abc"
-        │   ├── closing_loc: (101,6)-(101,7) = "}"
-        │   └── unescaped: "abc"
-        ├── @ StringNode (location: (103,0)-(103,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (103,0)-(103,2) = "%^"
-        │   ├── content_loc: (103,2)-(103,4) = "\#$"
-        │   ├── closing_loc: (103,4)-(103,5) = "^"
-        │   └── unescaped: "\#$"
-        └── @ StringNode (location: (105,0)-(105,4))
-            ├── flags: ∅
-            ├── opening_loc: (105,0)-(105,2) = "%@"
-            ├── content_loc: (105,2)-(105,3) = "#"
-            ├── closing_loc: (105,3)-(105,4) = "@"
-            └── unescaped: "#"
diff --git a/test/mri/prism/snapshots/super.txt b/test/mri/prism/snapshots/super.txt
deleted file mode 100644
index 79f9a5d5a59..00000000000
--- a/test/mri/prism/snapshots/super.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-@ ProgramNode (location: (1,0)-(17,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(17,21))
-    └── body: (length: 9)
-        ├── @ ForwardingSuperNode (location: (1,0)-(1,5))
-        │   └── block: ∅
-        ├── @ SuperNode (location: (3,0)-(3,7))
-        │   ├── keyword_loc: (3,0)-(3,5) = "super"
-        │   ├── lparen_loc: (3,5)-(3,6) = "("
-        │   ├── arguments: ∅
-        │   ├── rparen_loc: (3,6)-(3,7) = ")"
-        │   └── block: ∅
-        ├── @ SuperNode (location: (5,0)-(5,8))
-        │   ├── keyword_loc: (5,0)-(5,5) = "super"
-        │   ├── lparen_loc: (5,5)-(5,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,6)-(5,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,6)-(5,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── rparen_loc: (5,7)-(5,8) = ")"
-        │   └── block: ∅
-        ├── @ SuperNode (location: (7,0)-(7,14))
-        │   ├── keyword_loc: (7,0)-(7,5) = "super"
-        │   ├── lparen_loc: (7,5)-(7,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,6)-(7,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ IntegerNode (location: (7,6)-(7,7))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── @ IntegerNode (location: (7,9)-(7,10))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── @ IntegerNode (location: (7,12)-(7,13))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   ├── rparen_loc: (7,13)-(7,14) = ")"
-        │   └── block: ∅
-        ├── @ SuperNode (location: (9,0)-(9,11))
-        │   ├── keyword_loc: (9,0)-(9,5) = "super"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── rparen_loc: ∅
-        │   └── block:
-        │       @ BlockArgumentNode (location: (9,6)-(9,11))
-        │       ├── expression:
-        │       │   @ SymbolNode (location: (9,7)-(9,11))
-        │       │   ├── flags: forced_us_ascii_encoding
-        │       │   ├── opening_loc: (9,7)-(9,8) = ":"
-        │       │   ├── value_loc: (9,8)-(9,11) = "foo"
-        │       │   ├── closing_loc: ∅
-        │       │   └── unescaped: "foo"
-        │       └── operator_loc: (9,6)-(9,7) = "&"
-        ├── @ SuperNode (location: (11,0)-(11,12))
-        │   ├── keyword_loc: (11,0)-(11,5) = "super"
-        │   ├── lparen_loc: (11,5)-(11,6) = "("
-        │   ├── arguments: ∅
-        │   ├── rparen_loc: (11,11)-(11,12) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (11,6)-(11,11))
-        │       ├── expression:
-        │       │   @ SymbolNode (location: (11,7)-(11,11))
-        │       │   ├── flags: forced_us_ascii_encoding
-        │       │   ├── opening_loc: (11,7)-(11,8) = ":"
-        │       │   ├── value_loc: (11,8)-(11,11) = "foo"
-        │       │   ├── closing_loc: ∅
-        │       │   └── unescaped: "foo"
-        │       └── operator_loc: (11,6)-(11,7) = "&"
-        ├── @ ForwardingSuperNode (location: (13,0)-(13,8))
-        │   └── block:
-        │       @ BlockNode (location: (13,6)-(13,8))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (13,6)-(13,7) = "{"
-        │       └── closing_loc: (13,7)-(13,8) = "}"
-        ├── @ SuperNode (location: (15,0)-(15,17))
-        │   ├── keyword_loc: (15,0)-(15,5) = "super"
-        │   ├── lparen_loc: (15,5)-(15,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,6)-(15,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ IntegerNode (location: (15,6)-(15,7))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── @ IntegerNode (location: (15,9)-(15,10))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── @ IntegerNode (location: (15,12)-(15,13))
-        │   │           ├── flags: decimal
-        │   │           └── value: 3
-        │   ├── rparen_loc: (15,13)-(15,14) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (15,15)-(15,17))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (15,15)-(15,16) = "{"
-        │       └── closing_loc: (15,16)-(15,17) = "}"
-        └── @ SuperNode (location: (17,0)-(17,21))
-            ├── keyword_loc: (17,0)-(17,5) = "super"
-            ├── lparen_loc: (17,5)-(17,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (17,6)-(17,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 3)
-            │       ├── @ IntegerNode (location: (17,6)-(17,7))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       ├── @ IntegerNode (location: (17,9)-(17,10))
-            │       │   ├── flags: decimal
-            │       │   └── value: 2
-            │       └── @ IntegerNode (location: (17,12)-(17,13))
-            │           ├── flags: decimal
-            │           └── value: 3
-            ├── rparen_loc: (17,20)-(17,21) = ")"
-            └── block:
-                @ BlockArgumentNode (location: (17,15)-(17,20))
-                ├── expression:
-                │   @ SymbolNode (location: (17,16)-(17,20))
-                │   ├── flags: forced_us_ascii_encoding
-                │   ├── opening_loc: (17,16)-(17,17) = ":"
-                │   ├── value_loc: (17,17)-(17,20) = "foo"
-                │   ├── closing_loc: ∅
-                │   └── unescaped: "foo"
-                └── operator_loc: (17,15)-(17,16) = "&"
diff --git a/test/mri/prism/snapshots/symbols.txt b/test/mri/prism/snapshots/symbols.txt
deleted file mode 100644
index c34be74b37d..00000000000
--- a/test/mri/prism/snapshots/symbols.txt
+++ /dev/null
@@ -1,464 +0,0 @@
-@ ProgramNode (location: (1,0)-(93,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(93,13))
-    └── body: (length: 47)
-        ├── @ SymbolNode (location: (1,0)-(1,6))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (1,0)-(1,2) = ":'"
-        │   ├── value_loc: (1,2)-(1,5) = "abc"
-        │   ├── closing_loc: (1,5)-(1,6) = "'"
-        │   └── unescaped: "abc"
-        ├── @ InterpolatedSymbolNode (location: (3,0)-(3,9))
-        │   ├── opening_loc: (3,0)-(3,2) = ":\""
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedStatementsNode (location: (3,2)-(3,8))
-        │   │       ├── opening_loc: (3,2)-(3,4) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (3,4)-(3,7))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (3,4)-(3,7))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :var
-        │   │       │           ├── message_loc: (3,4)-(3,7) = "var"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       └── closing_loc: (3,7)-(3,8) = "}"
-        │   └── closing_loc: (3,8)-(3,9) = "\""
-        ├── @ InterpolatedSymbolNode (location: (5,0)-(5,10))
-        │   ├── opening_loc: (5,0)-(5,2) = ":\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (5,2)-(5,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (5,2)-(5,5) = "abc"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "abc"
-        │   │   └── @ EmbeddedStatementsNode (location: (5,5)-(5,9))
-        │   │       ├── opening_loc: (5,5)-(5,7) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (5,7)-(5,8))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ IntegerNode (location: (5,7)-(5,8))
-        │   │       │           ├── flags: decimal
-        │   │       │           └── value: 1
-        │   │       └── closing_loc: (5,8)-(5,9) = "}"
-        │   └── closing_loc: (5,9)-(5,10) = "\""
-        ├── @ ArrayNode (location: (7,0)-(7,20))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 4)
-        │   │   ├── @ SymbolNode (location: (7,1)-(7,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (7,1)-(7,2) = ":"
-        │   │   │   ├── value_loc: (7,2)-(7,4) = "Υ"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "Υ"
-        │   │   ├── @ SymbolNode (location: (7,6)-(7,9))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (7,6)-(7,7) = ":"
-        │   │   │   ├── value_loc: (7,7)-(7,9) = "ά"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "ά"
-        │   │   ├── @ SymbolNode (location: (7,11)-(7,14))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (7,11)-(7,12) = ":"
-        │   │   │   ├── value_loc: (7,12)-(7,14) = "ŗ"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "ŗ"
-        │   │   └── @ SymbolNode (location: (7,16)-(7,19))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (7,16)-(7,17) = ":"
-        │   │       ├── value_loc: (7,17)-(7,19) = "ρ"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "ρ"
-        │   ├── opening_loc: (7,0)-(7,1) = "["
-        │   └── closing_loc: (7,19)-(7,20) = "]"
-        ├── @ SymbolNode (location: (9,0)-(9,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (9,0)-(9,1) = ":"
-        │   ├── value_loc: (9,1)-(9,3) = "-@"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "-@"
-        ├── @ SymbolNode (location: (11,0)-(11,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (11,0)-(11,1) = ":"
-        │   ├── value_loc: (11,1)-(11,2) = "-"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "-"
-        ├── @ SymbolNode (location: (13,0)-(13,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (13,0)-(13,1) = ":"
-        │   ├── value_loc: (13,1)-(13,2) = "%"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "%"
-        ├── @ SymbolNode (location: (15,0)-(15,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (15,0)-(15,1) = ":"
-        │   ├── value_loc: (15,1)-(15,2) = "|"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "|"
-        ├── @ SymbolNode (location: (17,0)-(17,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (17,0)-(17,1) = ":"
-        │   ├── value_loc: (17,1)-(17,3) = "+@"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "+@"
-        ├── @ SymbolNode (location: (19,0)-(19,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (19,0)-(19,1) = ":"
-        │   ├── value_loc: (19,1)-(19,2) = "+"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "+"
-        ├── @ SymbolNode (location: (21,0)-(21,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (21,0)-(21,1) = ":"
-        │   ├── value_loc: (21,1)-(21,2) = "/"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "/"
-        ├── @ SymbolNode (location: (23,0)-(23,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (23,0)-(23,1) = ":"
-        │   ├── value_loc: (23,1)-(23,3) = "**"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "**"
-        ├── @ SymbolNode (location: (25,0)-(25,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (25,0)-(25,1) = ":"
-        │   ├── value_loc: (25,1)-(25,2) = "*"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "*"
-        ├── @ SymbolNode (location: (27,0)-(27,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (27,0)-(27,1) = ":"
-        │   ├── value_loc: (27,1)-(27,3) = "~@"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "~"
-        ├── @ ArrayNode (location: (29,0)-(29,16))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 4)
-        │   │   ├── @ IntegerNode (location: (29,1)-(29,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── @ FloatNode (location: (29,4)-(29,7))
-        │   │   │   └── value: 1.0
-        │   │   ├── @ RationalNode (location: (29,9)-(29,11))
-        │   │   │   └── numeric:
-        │   │   │       @ IntegerNode (location: (29,9)-(29,10))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 1
-        │   │   └── @ ImaginaryNode (location: (29,13)-(29,15))
-        │   │       └── numeric:
-        │   │           @ IntegerNode (location: (29,13)-(29,14))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── opening_loc: (29,0)-(29,1) = "["
-        │   └── closing_loc: (29,15)-(29,16) = "]"
-        ├── @ SymbolNode (location: (31,0)-(31,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (31,0)-(31,1) = ":"
-        │   ├── value_loc: (31,1)-(31,2) = "~"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "~"
-        ├── @ SymbolNode (location: (33,0)-(33,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (33,0)-(33,1) = ":"
-        │   ├── value_loc: (33,1)-(33,2) = "a"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "a"
-        ├── @ ArrayNode (location: (35,0)-(35,9))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ SymbolNode (location: (35,3)-(35,4))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (35,3)-(35,4) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ SymbolNode (location: (35,5)-(35,6))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (35,5)-(35,6) = "b"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b"
-        │   │   └── @ SymbolNode (location: (35,7)-(35,8))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (35,7)-(35,8) = "c"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "c"
-        │   ├── opening_loc: (35,0)-(35,3) = "%i["
-        │   └── closing_loc: (35,8)-(35,9) = "]"
-        ├── @ ArrayNode (location: (37,0)-(37,24))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 4)
-        │   │   ├── @ SymbolNode (location: (37,3)-(37,4))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (37,3)-(37,4) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ SymbolNode (location: (37,5)-(37,10))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (37,5)-(37,10) = "b\#{1}"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b\#{1}"
-        │   │   ├── @ SymbolNode (location: (37,11)-(37,16))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (37,11)-(37,16) = "\#{2}c"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\#{2}c"
-        │   │   └── @ SymbolNode (location: (37,17)-(37,23))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (37,17)-(37,23) = "d\#{3}f"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "d\#{3}f"
-        │   ├── opening_loc: (37,0)-(37,3) = "%i["
-        │   └── closing_loc: (37,23)-(37,24) = "]"
-        ├── @ ArrayNode (location: (39,0)-(39,24))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 4)
-        │   │   ├── @ SymbolNode (location: (39,3)-(39,4))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (39,3)-(39,4) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ InterpolatedSymbolNode (location: (39,5)-(39,10))
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── parts: (length: 2)
-        │   │   │   │   ├── @ StringNode (location: (39,5)-(39,6))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   ├── content_loc: (39,5)-(39,6) = "b"
-        │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   └── unescaped: "b"
-        │   │   │   │   └── @ EmbeddedStatementsNode (location: (39,6)-(39,10))
-        │   │   │   │       ├── opening_loc: (39,6)-(39,8) = "\#{"
-        │   │   │   │       ├── statements:
-        │   │   │   │       │   @ StatementsNode (location: (39,8)-(39,9))
-        │   │   │   │       │   └── body: (length: 1)
-        │   │   │   │       │       └── @ IntegerNode (location: (39,8)-(39,9))
-        │   │   │   │       │           ├── flags: decimal
-        │   │   │   │       │           └── value: 1
-        │   │   │   │       └── closing_loc: (39,9)-(39,10) = "}"
-        │   │   │   └── closing_loc: ∅
-        │   │   ├── @ InterpolatedSymbolNode (location: (39,11)-(39,16))
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── parts: (length: 2)
-        │   │   │   │   ├── @ EmbeddedStatementsNode (location: (39,11)-(39,15))
-        │   │   │   │   │   ├── opening_loc: (39,11)-(39,13) = "\#{"
-        │   │   │   │   │   ├── statements:
-        │   │   │   │   │   │   @ StatementsNode (location: (39,13)-(39,14))
-        │   │   │   │   │   │   └── body: (length: 1)
-        │   │   │   │   │   │       └── @ IntegerNode (location: (39,13)-(39,14))
-        │   │   │   │   │   │           ├── flags: decimal
-        │   │   │   │   │   │           └── value: 2
-        │   │   │   │   │   └── closing_loc: (39,14)-(39,15) = "}"
-        │   │   │   │   └── @ StringNode (location: (39,15)-(39,16))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── content_loc: (39,15)-(39,16) = "c"
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── unescaped: "c"
-        │   │   │   └── closing_loc: ∅
-        │   │   └── @ InterpolatedSymbolNode (location: (39,17)-(39,23))
-        │   │       ├── opening_loc: ∅
-        │   │       ├── parts: (length: 3)
-        │   │       │   ├── @ StringNode (location: (39,17)-(39,18))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   ├── opening_loc: ∅
-        │   │       │   │   ├── content_loc: (39,17)-(39,18) = "d"
-        │   │       │   │   ├── closing_loc: ∅
-        │   │       │   │   └── unescaped: "d"
-        │   │       │   ├── @ EmbeddedStatementsNode (location: (39,18)-(39,22))
-        │   │       │   │   ├── opening_loc: (39,18)-(39,20) = "\#{"
-        │   │       │   │   ├── statements:
-        │   │       │   │   │   @ StatementsNode (location: (39,20)-(39,21))
-        │   │       │   │   │   └── body: (length: 1)
-        │   │       │   │   │       └── @ IntegerNode (location: (39,20)-(39,21))
-        │   │       │   │   │           ├── flags: decimal
-        │   │       │   │   │           └── value: 3
-        │   │       │   │   └── closing_loc: (39,21)-(39,22) = "}"
-        │   │       │   └── @ StringNode (location: (39,22)-(39,23))
-        │   │       │       ├── flags: ∅
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── content_loc: (39,22)-(39,23) = "f"
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── unescaped: "f"
-        │   │       └── closing_loc: ∅
-        │   ├── opening_loc: (39,0)-(39,3) = "%I["
-        │   └── closing_loc: (39,23)-(39,24) = "]"
-        ├── @ SymbolNode (location: (41,0)-(41,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (41,0)-(41,1) = ":"
-        │   ├── value_loc: (41,1)-(41,4) = "@@a"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "@@a"
-        ├── @ SymbolNode (location: (43,0)-(43,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (43,0)-(43,1) = ":"
-        │   ├── value_loc: (43,1)-(43,5) = "👍"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "👍"
-        ├── @ ArrayNode (location: (45,0)-(45,7))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ SymbolNode (location: (45,3)-(45,6))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (45,3)-(45,6) = "a\\b"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a\\b"
-        │   ├── opening_loc: (45,0)-(45,3) = "%i["
-        │   └── closing_loc: (45,6)-(45,7) = "]"
-        ├── @ SymbolNode (location: (47,0)-(47,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (47,0)-(47,1) = ":"
-        │   ├── value_loc: (47,1)-(47,3) = "$a"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "$a"
-        ├── @ SymbolNode (location: (49,0)-(49,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (49,0)-(49,1) = ":"
-        │   ├── value_loc: (49,1)-(49,3) = "@a"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "@a"
-        ├── @ SymbolNode (location: (51,0)-(51,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (51,0)-(51,1) = ":"
-        │   ├── value_loc: (51,1)-(51,3) = "do"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "do"
-        ├── @ SymbolNode (location: (53,0)-(53,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (53,0)-(53,1) = ":"
-        │   ├── value_loc: (53,1)-(53,2) = "&"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "&"
-        ├── @ SymbolNode (location: (55,0)-(55,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (55,0)-(55,1) = ":"
-        │   ├── value_loc: (55,1)-(55,2) = "`"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "`"
-        ├── @ SymbolNode (location: (57,0)-(57,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (57,0)-(57,1) = ":"
-        │   ├── value_loc: (57,1)-(57,3) = "!@"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "!"
-        ├── @ SymbolNode (location: (59,0)-(59,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (59,0)-(59,1) = ":"
-        │   ├── value_loc: (59,1)-(59,3) = "!~"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "!~"
-        ├── @ SymbolNode (location: (61,0)-(61,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (61,0)-(61,1) = ":"
-        │   ├── value_loc: (61,1)-(61,2) = "!"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "!"
-        ├── @ SymbolNode (location: (63,0)-(63,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (63,0)-(63,1) = ":"
-        │   ├── value_loc: (63,1)-(63,3) = "[]"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "[]"
-        ├── @ SymbolNode (location: (65,0)-(65,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (65,0)-(65,1) = ":"
-        │   ├── value_loc: (65,1)-(65,4) = "[]="
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "[]="
-        ├── @ SymbolNode (location: (67,0)-(67,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (67,0)-(67,1) = ":"
-        │   ├── value_loc: (67,1)-(67,2) = "^"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "^"
-        ├── @ SymbolNode (location: (69,0)-(69,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (69,0)-(69,1) = ":"
-        │   ├── value_loc: (69,1)-(69,3) = "=="
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "=="
-        ├── @ SymbolNode (location: (71,0)-(71,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (71,0)-(71,1) = ":"
-        │   ├── value_loc: (71,1)-(71,4) = "==="
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "==="
-        ├── @ SymbolNode (location: (73,0)-(73,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (73,0)-(73,1) = ":"
-        │   ├── value_loc: (73,1)-(73,3) = "=~"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "=~"
-        ├── @ SymbolNode (location: (75,0)-(75,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (75,0)-(75,1) = ":"
-        │   ├── value_loc: (75,1)-(75,3) = ">="
-        │   ├── closing_loc: ∅
-        │   └── unescaped: ">="
-        ├── @ SymbolNode (location: (77,0)-(77,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (77,0)-(77,1) = ":"
-        │   ├── value_loc: (77,1)-(77,3) = ">>"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: ">>"
-        ├── @ SymbolNode (location: (79,0)-(79,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (79,0)-(79,1) = ":"
-        │   ├── value_loc: (79,1)-(79,2) = ">"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: ">"
-        ├── @ SymbolNode (location: (81,0)-(81,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (81,0)-(81,1) = ":"
-        │   ├── value_loc: (81,1)-(81,4) = "<=>"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "<=>"
-        ├── @ SymbolNode (location: (83,0)-(83,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (83,0)-(83,1) = ":"
-        │   ├── value_loc: (83,1)-(83,3) = "<="
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "<="
-        ├── @ SymbolNode (location: (85,0)-(85,3))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (85,0)-(85,1) = ":"
-        │   ├── value_loc: (85,1)-(85,3) = "<<"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "<<"
-        ├── @ SymbolNode (location: (87,0)-(87,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (87,0)-(87,1) = ":"
-        │   ├── value_loc: (87,1)-(87,2) = "<"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "<"
-        ├── @ SymbolNode (location: (89,0)-(89,9))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (89,0)-(89,1) = ":"
-        │   ├── value_loc: (89,1)-(89,9) = "__LINE__"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "__LINE__"
-        ├── @ SymbolNode (location: (91,0)-(91,9))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (91,0)-(91,1) = ":"
-        │   ├── value_loc: (91,1)-(91,9) = "__FILE__"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "__FILE__"
-        └── @ SymbolNode (location: (93,0)-(93,13))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (93,0)-(93,1) = ":"
-            ├── value_loc: (93,1)-(93,13) = "__ENCODING__"
-            ├── closing_loc: ∅
-            └── unescaped: "__ENCODING__"
diff --git a/test/mri/prism/snapshots/ternary_operator.txt b/test/mri/prism/snapshots/ternary_operator.txt
deleted file mode 100644
index 0277ac88f0c..00000000000
--- a/test/mri/prism/snapshots/ternary_operator.txt
+++ /dev/null
@@ -1,295 +0,0 @@
-@ ProgramNode (location: (1,0)-(15,12))
-├── locals: [:_a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(15,12))
-    └── body: (length: 8)
-        ├── @ IfNode (location: (1,0)-(1,9))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,0)-(1,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (1,2)-(1,3) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,4)-(1,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,4)-(1,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (1,4)-(1,5) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (1,6)-(1,9))
-        │   │   ├── else_keyword_loc: (1,6)-(1,7) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,8)-(1,9))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (1,8)-(1,9))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :c
-        │   │   │           ├── message_loc: (1,8)-(1,9) = "c"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (3,0)-(3,27))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (3,0)-(3,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (3,0)-(3,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (3,2)-(3,3) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (3,4)-(3,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ DefinedNode (location: (3,4)-(3,14))
-        │   │           ├── lparen_loc: ∅
-        │   │           ├── value:
-        │   │           │   @ CallNode (location: (3,13)-(3,14))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :b
-        │   │           │   ├── message_loc: (3,13)-(3,14) = "b"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── rparen_loc: ∅
-        │   │           └── keyword_loc: (3,4)-(3,12) = "defined?"
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (3,15)-(3,27))
-        │   │   ├── else_keyword_loc: (3,15)-(3,16) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (3,17)-(3,27))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ DefinedNode (location: (3,17)-(3,27))
-        │   │   │           ├── lparen_loc: ∅
-        │   │   │           ├── value:
-        │   │   │           │   @ CallNode (location: (3,26)-(3,27))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :c
-        │   │   │           │   ├── message_loc: (3,26)-(3,27) = "c"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── rparen_loc: ∅
-        │   │   │           └── keyword_loc: (3,17)-(3,25) = "defined?"
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (5,0)-(5,15))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (5,0)-(5,6))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :empty?
-        │   │   ├── message_loc: (5,0)-(5,6) = "empty?"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (5,6)-(5,7) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (5,7)-(5,11))
-        │   │   └── body: (length: 1)
-        │   │       └── @ TrueNode (location: (5,7)-(5,11))
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (5,11)-(5,15))
-        │   │   ├── else_keyword_loc: (5,11)-(5,12) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (5,12)-(5,15))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ NilNode (location: (5,12)-(5,15))
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (7,0)-(7,16))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (7,0)-(7,6))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :empty?
-        │   │   ├── message_loc: (7,0)-(7,6) = "empty?"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (7,6)-(7,7) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (7,7)-(7,12))
-        │   │   └── body: (length: 1)
-        │   │       └── @ FalseNode (location: (7,7)-(7,12))
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (7,12)-(7,16))
-        │   │   ├── else_keyword_loc: (7,12)-(7,13) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (7,13)-(7,16))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ NilNode (location: (7,13)-(7,16))
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (9,0)-(9,14))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (9,0)-(9,6))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :empty?
-        │   │   ├── message_loc: (9,0)-(9,6) = "empty?"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (9,6)-(9,7) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (9,7)-(9,10))
-        │   │   └── body: (length: 1)
-        │   │       └── @ NilNode (location: (9,7)-(9,10))
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (9,10)-(9,14))
-        │   │   ├── else_keyword_loc: (9,10)-(9,11) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (9,11)-(9,14))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ NilNode (location: (9,11)-(9,14))
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (11,0)-(11,10))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (11,0)-(11,2))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a?
-        │   │   ├── message_loc: (11,0)-(11,2) = "a?"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (11,2)-(11,3) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (11,3)-(11,6))
-        │   │   └── body: (length: 1)
-        │   │       └── @ NilNode (location: (11,3)-(11,6))
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (11,6)-(11,10))
-        │   │   ├── else_keyword_loc: (11,6)-(11,7) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (11,7)-(11,10))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ NilNode (location: (11,7)-(11,10))
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (13,0)-(13,14))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (13,0)-(13,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (13,0)-(13,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (13,2)-(13,3) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (13,3)-(13,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (13,3)-(13,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :var1
-        │   │           ├── message_loc: (13,3)-(13,7) = "var1"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (13,8)-(13,14))
-        │   │   ├── else_keyword_loc: (13,8)-(13,9) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (13,10)-(13,14))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (13,10)-(13,14))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :var2
-        │   │   │           ├── message_loc: (13,10)-(13,14) = "var2"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        └── @ IfNode (location: (15,0)-(15,12))
-            ├── if_keyword_loc: ∅
-            ├── predicate:
-            │   @ CallNode (location: (15,0)-(15,4))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :nil?
-            │   ├── message_loc: (15,0)-(15,4) = "nil?"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: (15,4)-(15,5) = "?"
-            ├── statements:
-            │   @ StatementsNode (location: (15,5)-(15,10))
-            │   └── body: (length: 1)
-            │       └── @ LocalVariableWriteNode (location: (15,5)-(15,10))
-            │           ├── name: :_a
-            │           ├── depth: 0
-            │           ├── name_loc: (15,5)-(15,7) = "_a"
-            │           ├── value:
-            │           │   @ IntegerNode (location: (15,9)-(15,10))
-            │           │   ├── flags: decimal
-            │           │   └── value: 2
-            │           └── operator_loc: (15,8)-(15,9) = "="
-            ├── consequent:
-            │   @ ElseNode (location: (15,10)-(15,12))
-            │   ├── else_keyword_loc: (15,10)-(15,11) = ":"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (15,11)-(15,12))
-            │   │   └── body: (length: 1)
-            │   │       └── @ IntegerNode (location: (15,11)-(15,12))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   └── end_keyword_loc: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/tilde_heredocs.txt b/test/mri/prism/snapshots/tilde_heredocs.txt
deleted file mode 100644
index fd369a64b2a..00000000000
--- a/test/mri/prism/snapshots/tilde_heredocs.txt
+++ /dev/null
@@ -1,388 +0,0 @@
-@ ProgramNode (location: (1,0)-(94,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(94,6))
-    └── body: (length: 19)
-        ├── @ InterpolatedStringNode (location: (1,0)-(1,6))
-        │   ├── opening_loc: (1,0)-(1,6) = "<<~EOF"
-        │   ├── parts: (length: 4)
-        │   │   ├── @ StringNode (location: (2,0)-(3,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (2,0)-(3,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "  a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (3,0)-(3,4))
-        │   │   │   ├── opening_loc: (3,0)-(3,2) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (3,2)-(3,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (3,2)-(3,3))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   └── closing_loc: (3,3)-(3,4) = "}"
-        │   │   ├── @ StringNode (location: (3,4)-(4,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (3,4)-(4,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   └── @ StringNode (location: (4,0)-(5,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (4,0)-(5,0) = "  a\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "  a\n"
-        │   └── closing_loc: (5,0)-(6,0) = "EOF\n"
-        ├── @ StringNode (location: (7,0)-(7,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (7,0)-(7,6) = "<<~EOF"
-        │   ├── content_loc: (8,0)-(9,0) = "  a\n"
-        │   ├── closing_loc: (9,0)-(10,0) = "EOF\n"
-        │   └── unescaped: "a\n"
-        ├── @ InterpolatedStringNode (location: (11,0)-(11,6))
-        │   ├── opening_loc: (11,0)-(11,6) = "<<~EOF"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (12,0)-(13,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (12,0)-(13,0) = "\ta\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\ta\n"
-        │   │   ├── @ StringNode (location: (13,0)-(14,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (13,0)-(14,0) = "  b\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b\n"
-        │   │   └── @ StringNode (location: (14,0)-(15,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (14,0)-(15,0) = "\t\tc\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\t\tc\n"
-        │   └── closing_loc: (15,0)-(16,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (17,0)-(17,6))
-        │   ├── opening_loc: (17,0)-(17,6) = "<<~EOF"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ EmbeddedStatementsNode (location: (18,2)-(18,6))
-        │   │   │   ├── opening_loc: (18,2)-(18,4) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (18,4)-(18,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (18,4)-(18,5))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   └── closing_loc: (18,5)-(18,6) = "}"
-        │   │   └── @ StringNode (location: (18,6)-(19,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (18,6)-(19,0) = " a\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: " a\n"
-        │   └── closing_loc: (19,0)-(20,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (21,0)-(21,6))
-        │   ├── opening_loc: (21,0)-(21,6) = "<<~EOF"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (22,0)-(22,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (22,0)-(22,4) = "  a "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a "
-        │   │   ├── @ EmbeddedStatementsNode (location: (22,4)-(22,8))
-        │   │   │   ├── opening_loc: (22,4)-(22,6) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (22,6)-(22,7))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (22,6)-(22,7))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   └── closing_loc: (22,7)-(22,8) = "}"
-        │   │   └── @ StringNode (location: (22,8)-(23,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (22,8)-(23,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (23,0)-(24,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (25,0)-(25,6))
-        │   ├── opening_loc: (25,0)-(25,6) = "<<~EOF"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (26,0)-(27,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (26,0)-(27,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: " a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (27,1)-(27,5))
-        │   │   │   ├── opening_loc: (27,1)-(27,3) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (27,3)-(27,4))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (27,3)-(27,4))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   └── closing_loc: (27,4)-(27,5) = "}"
-        │   │   └── @ StringNode (location: (27,5)-(28,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (27,5)-(28,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (28,0)-(29,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (30,0)-(30,6))
-        │   ├── opening_loc: (30,0)-(30,6) = "<<~EOF"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (31,0)-(32,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (31,0)-(32,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (32,2)-(32,6))
-        │   │   │   ├── opening_loc: (32,2)-(32,4) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (32,4)-(32,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (32,4)-(32,5))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   └── closing_loc: (32,5)-(32,6) = "}"
-        │   │   └── @ StringNode (location: (32,6)-(33,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (32,6)-(33,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (33,0)-(34,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (35,0)-(35,6))
-        │   ├── opening_loc: (35,0)-(35,6) = "<<~EOF"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (36,0)-(37,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (36,0)-(37,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ StringNode (location: (37,0)-(38,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (37,0)-(38,0) = "  b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (38,0)-(39,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (40,0)-(40,6))
-        │   ├── opening_loc: (40,0)-(40,6) = "<<~EOF"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (41,0)-(42,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (41,0)-(42,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ StringNode (location: (42,0)-(43,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (42,0)-(43,0) = "   b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: " b\n"
-        │   └── closing_loc: (43,0)-(44,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (45,0)-(45,6))
-        │   ├── opening_loc: (45,0)-(45,6) = "<<~EOF"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (46,0)-(47,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (46,0)-(47,0) = "\t\t\ta\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\ta\n"
-        │   │   └── @ StringNode (location: (47,0)-(48,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (47,0)-(48,0) = "\t\tb\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (48,0)-(49,0) = "EOF\n"
-        ├── @ StringNode (location: (50,0)-(50,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (50,0)-(50,8) = "<<~'EOF'"
-        │   ├── content_loc: (51,0)-(52,0) = "  a \#{1}\n"
-        │   ├── closing_loc: (52,0)-(53,0) = "EOF\n"
-        │   └── unescaped: "a \#{1}\n"
-        ├── @ InterpolatedStringNode (location: (54,0)-(54,6))
-        │   ├── opening_loc: (54,0)-(54,6) = "<<~EOF"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (55,0)-(56,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (55,0)-(56,0) = "\ta\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ StringNode (location: (56,0)-(57,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (56,0)-(57,0) = "\t b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: " b\n"
-        │   └── closing_loc: (57,0)-(58,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (59,0)-(59,6))
-        │   ├── opening_loc: (59,0)-(59,6) = "<<~EOF"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (60,0)-(61,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (60,0)-(61,0) = "\t a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: " a\n"
-        │   │   └── @ StringNode (location: (61,0)-(62,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (61,0)-(62,0) = "\tb\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (62,0)-(63,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (64,0)-(64,6))
-        │   ├── opening_loc: (64,0)-(64,6) = "<<~EOF"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (65,0)-(66,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (65,0)-(66,0) = "  \ta\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ StringNode (location: (66,0)-(67,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (66,0)-(67,0) = "        b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (67,0)-(68,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (69,0)-(69,6))
-        │   ├── opening_loc: (69,0)-(69,6) = "<<~EOF"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (70,0)-(71,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (70,0)-(71,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ StringNode (location: (71,0)-(72,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (71,0)-(72,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   └── @ StringNode (location: (72,0)-(73,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (72,0)-(73,0) = "  b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (73,0)-(74,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (75,0)-(75,6))
-        │   ├── opening_loc: (75,0)-(75,6) = "<<~EOF"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (76,0)-(77,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (76,0)-(77,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ StringNode (location: (77,0)-(78,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (77,0)-(78,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   └── @ StringNode (location: (78,0)-(79,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (78,0)-(79,0) = "  b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (79,0)-(80,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (81,0)-(81,6))
-        │   ├── opening_loc: (81,0)-(81,6) = "<<~EOF"
-        │   ├── parts: (length: 5)
-        │   │   ├── @ StringNode (location: (82,0)-(83,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (82,0)-(83,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ StringNode (location: (83,0)-(84,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (83,0)-(84,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   ├── @ StringNode (location: (84,0)-(85,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (84,0)-(85,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   ├── @ StringNode (location: (85,0)-(86,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (85,0)-(86,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   └── @ StringNode (location: (86,0)-(87,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (86,0)-(87,0) = "  b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (87,0)-(88,0) = "EOF\n"
-        ├── @ InterpolatedStringNode (location: (89,0)-(89,6))
-        │   ├── opening_loc: (89,0)-(89,6) = "<<~EOF"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (90,0)-(91,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (90,0)-(91,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (91,2)-(91,6))
-        │   │   │   ├── opening_loc: (91,2)-(91,4) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (91,4)-(91,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (91,4)-(91,5))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   └── closing_loc: (91,5)-(91,6) = "}"
-        │   │   └── @ StringNode (location: (91,6)-(92,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (91,6)-(92,0) = "a\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a\n"
-        │   └── closing_loc: (92,0)-(93,0) = "    EOF\n"
-        └── @ InterpolatedStringNode (location: (94,0)-(94,6))
-            ├── opening_loc: (94,0)-(94,6) = "<<~EOT"
-            ├── parts: (length: 3)
-            │   ├── @ EmbeddedStatementsNode (location: (95,2)-(95,6))
-            │   │   ├── opening_loc: (95,2)-(95,4) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (95,4)-(95,5))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ IntegerNode (location: (95,4)-(95,5))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 1
-            │   │   └── closing_loc: (95,5)-(95,6) = "}"
-            │   ├── @ StringNode (location: (95,6)-(96,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (95,6)-(96,0) = "\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "\n"
-            │   └── @ StringNode (location: (96,0)-(97,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (96,0)-(97,0) = "\tb\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "\tb\n"
-            └── closing_loc: (97,0)-(98,0) = "EOT\n"
diff --git a/test/mri/prism/snapshots/undef.txt b/test/mri/prism/snapshots/undef.txt
deleted file mode 100644
index 6031119ad17..00000000000
--- a/test/mri/prism/snapshots/undef.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-@ ProgramNode (location: (1,0)-(17,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(17,14))
-    └── body: (length: 9)
-        ├── @ UndefNode (location: (1,0)-(1,7))
-        │   ├── names: (length: 1)
-        │   │   └── @ SymbolNode (location: (1,6)-(1,7))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (1,6)-(1,7) = "a"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a"
-        │   └── keyword_loc: (1,0)-(1,5) = "undef"
-        ├── @ UndefNode (location: (3,0)-(3,10))
-        │   ├── names: (length: 2)
-        │   │   ├── @ SymbolNode (location: (3,6)-(3,7))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (3,6)-(3,7) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ SymbolNode (location: (3,9)-(3,10))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (3,9)-(3,10) = "b"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b"
-        │   └── keyword_loc: (3,0)-(3,5) = "undef"
-        ├── @ UndefNode (location: (5,0)-(5,8))
-        │   ├── names: (length: 1)
-        │   │   └── @ SymbolNode (location: (5,6)-(5,8))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (5,6)-(5,8) = "if"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "if"
-        │   └── keyword_loc: (5,0)-(5,5) = "undef"
-        ├── @ UndefNode (location: (7,0)-(7,9))
-        │   ├── names: (length: 1)
-        │   │   └── @ SymbolNode (location: (7,6)-(7,9))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (7,6)-(7,9) = "<=>"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "<=>"
-        │   └── keyword_loc: (7,0)-(7,5) = "undef"
-        ├── @ UndefNode (location: (9,0)-(9,8))
-        │   ├── names: (length: 1)
-        │   │   └── @ SymbolNode (location: (9,6)-(9,8))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: (9,6)-(9,7) = ":"
-        │   │       ├── value_loc: (9,7)-(9,8) = "a"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a"
-        │   └── keyword_loc: (9,0)-(9,5) = "undef"
-        ├── @ UndefNode (location: (11,0)-(11,16))
-        │   ├── names: (length: 3)
-        │   │   ├── @ SymbolNode (location: (11,6)-(11,8))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (11,6)-(11,7) = ":"
-        │   │   │   ├── value_loc: (11,7)-(11,8) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   ├── @ SymbolNode (location: (11,10)-(11,12))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (11,10)-(11,11) = ":"
-        │   │   │   ├── value_loc: (11,11)-(11,12) = "b"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "b"
-        │   │   └── @ SymbolNode (location: (11,14)-(11,16))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: (11,14)-(11,15) = ":"
-        │   │       ├── value_loc: (11,15)-(11,16) = "c"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "c"
-        │   └── keyword_loc: (11,0)-(11,5) = "undef"
-        ├── @ UndefNode (location: (13,0)-(13,12))
-        │   ├── names: (length: 1)
-        │   │   └── @ SymbolNode (location: (13,6)-(13,12))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: (13,6)-(13,8) = ":'"
-        │   │       ├── value_loc: (13,8)-(13,11) = "abc"
-        │   │       ├── closing_loc: (13,11)-(13,12) = "'"
-        │   │       └── unescaped: "abc"
-        │   └── keyword_loc: (13,0)-(13,5) = "undef"
-        ├── @ UndefNode (location: (15,0)-(15,16))
-        │   ├── names: (length: 1)
-        │   │   └── @ InterpolatedSymbolNode (location: (15,6)-(15,16))
-        │   │       ├── opening_loc: (15,6)-(15,8) = ":\""
-        │   │       ├── parts: (length: 2)
-        │   │       │   ├── @ StringNode (location: (15,8)-(15,11))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   ├── opening_loc: ∅
-        │   │       │   │   ├── content_loc: (15,8)-(15,11) = "abc"
-        │   │       │   │   ├── closing_loc: ∅
-        │   │       │   │   └── unescaped: "abc"
-        │   │       │   └── @ EmbeddedStatementsNode (location: (15,11)-(15,15))
-        │   │       │       ├── opening_loc: (15,11)-(15,13) = "\#{"
-        │   │       │       ├── statements:
-        │   │       │       │   @ StatementsNode (location: (15,13)-(15,14))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ IntegerNode (location: (15,13)-(15,14))
-        │   │       │       │           ├── flags: decimal
-        │   │       │       │           └── value: 1
-        │   │       │       └── closing_loc: (15,14)-(15,15) = "}"
-        │   │       └── closing_loc: (15,15)-(15,16) = "\""
-        │   └── keyword_loc: (15,0)-(15,5) = "undef"
-        └── @ UndefNode (location: (17,0)-(17,14))
-            ├── names: (length: 1)
-            │   └── @ SymbolNode (location: (17,6)-(17,14))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: ∅
-            │       ├── value_loc: (17,6)-(17,14) = "Constant"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "Constant"
-            └── keyword_loc: (17,0)-(17,5) = "undef"
diff --git a/test/mri/prism/snapshots/unescaping.txt b/test/mri/prism/snapshots/unescaping.txt
deleted file mode 100644
index 456ef226d07..00000000000
--- a/test/mri/prism/snapshots/unescaping.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,7))
-    └── body: (length: 4)
-        ├── @ ArrayNode (location: (1,0)-(1,10))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (1,1)-(1,9))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (1,1)-(1,2) = "\""
-        │   │       ├── content_loc: (1,2)-(1,8) = "\\c\#{1}"
-        │   │       ├── closing_loc: (1,8)-(1,9) = "\""
-        │   │       └── unescaped: "\u0003{1}"
-        │   ├── opening_loc: (1,0)-(1,1) = "["
-        │   └── closing_loc: (1,9)-(1,10) = "]"
-        ├── @ RegularExpressionNode (location: (3,0)-(3,8))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (3,0)-(3,1) = "/"
-        │   ├── content_loc: (3,1)-(3,7) = "\\c\#{1}"
-        │   ├── closing_loc: (3,7)-(3,8) = "/"
-        │   └── unescaped: "\\x03{1}"
-        ├── @ StringNode (location: (5,0)-(5,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (5,0)-(5,1) = "\""
-        │   ├── content_loc: (5,1)-(5,7) = "\\c\#{1}"
-        │   ├── closing_loc: (5,7)-(5,8) = "\""
-        │   └── unescaped: "\u0003{1}"
-        └── @ StringNode (location: (7,0)-(7,7))
-            ├── flags: ∅
-            ├── opening_loc: (7,0)-(7,7) = "<<~HERE"
-            ├── content_loc: (8,0)-(9,0) = "   \\c\#{1}\n"
-            ├── closing_loc: (9,0)-(10,0) = "HERE\n"
-            └── unescaped: "\u0003{1}\n"
diff --git a/test/mri/prism/snapshots/unless.txt b/test/mri/prism/snapshots/unless.txt
deleted file mode 100644
index df16f90fd8e..00000000000
--- a/test/mri/prism/snapshots/unless.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-@ ProgramNode (location: (1,0)-(14,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(14,22))
-    └── body: (length: 7)
-        ├── @ UnlessNode (location: (1,0)-(1,19))
-        │   ├── keyword_loc: (1,0)-(1,6) = "unless"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (1,7)-(1,11))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,13)-(1,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,13)-(1,14))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (1,16)-(1,19) = "end"
-        ├── @ UnlessNode (location: (3,0)-(4,12))
-        │   ├── keyword_loc: (3,0)-(3,6) = "unless"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (3,7)-(3,11))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (4,0)-(4,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (4,0)-(4,1))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (4,2)-(4,12))
-        │   │   ├── else_keyword_loc: (4,2)-(4,6) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (4,7)-(4,8))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (4,7)-(4,8))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   └── end_keyword_loc: (4,9)-(4,12) = "end"
-        │   └── end_keyword_loc: (4,9)-(4,12) = "end"
-        ├── @ UnlessNode (location: (6,0)-(6,13))
-        │   ├── keyword_loc: (6,2)-(6,8) = "unless"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (6,9)-(6,13))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (6,0)-(6,1))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (6,0)-(6,1))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ UnlessNode (location: (8,0)-(8,17))
-        │   ├── keyword_loc: (8,6)-(8,12) = "unless"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (8,13)-(8,17))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (8,0)-(8,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ BreakNode (location: (8,0)-(8,5))
-        │   │           ├── arguments: ∅
-        │   │           └── keyword_loc: (8,0)-(8,5) = "break"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ UnlessNode (location: (10,0)-(10,16))
-        │   ├── keyword_loc: (10,5)-(10,11) = "unless"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (10,12)-(10,16))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (10,0)-(10,4))
-        │   │   └── body: (length: 1)
-        │   │       └── @ NextNode (location: (10,0)-(10,4))
-        │   │           ├── arguments: ∅
-        │   │           └── keyword_loc: (10,0)-(10,4) = "next"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ UnlessNode (location: (12,0)-(12,18))
-        │   ├── keyword_loc: (12,7)-(12,13) = "unless"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (12,14)-(12,18))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (12,0)-(12,6))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ReturnNode (location: (12,0)-(12,6))
-        │   │           ├── keyword_loc: (12,0)-(12,6) = "return"
-        │   │           └── arguments: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: ∅
-        └── @ UnlessNode (location: (14,0)-(14,22))
-            ├── keyword_loc: (14,11)-(14,17) = "unless"
-            ├── predicate:
-            │   @ CallNode (location: (14,18)-(14,22))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :bar?
-            │   ├── message_loc: (14,18)-(14,22) = "bar?"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (14,0)-(14,10))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (14,0)-(14,10))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (14,0)-(14,3) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (14,4)-(14,10))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 2)
-            │           │       ├── @ SymbolNode (location: (14,4)-(14,6))
-            │           │       │   ├── flags: forced_us_ascii_encoding
-            │           │       │   ├── opening_loc: (14,4)-(14,5) = ":"
-            │           │       │   ├── value_loc: (14,5)-(14,6) = "a"
-            │           │       │   ├── closing_loc: ∅
-            │           │       │   └── unescaped: "a"
-            │           │       └── @ SymbolNode (location: (14,8)-(14,10))
-            │           │           ├── flags: forced_us_ascii_encoding
-            │           │           ├── opening_loc: (14,8)-(14,9) = ":"
-            │           │           ├── value_loc: (14,9)-(14,10) = "b"
-            │           │           ├── closing_loc: ∅
-            │           │           └── unescaped: "b"
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/alias.txt b/test/mri/prism/snapshots/unparser/corpus/literal/alias.txt
deleted file mode 100644
index 18ddc86d4f4..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/alias.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,15))
-    └── body: (length: 2)
-        ├── @ AliasGlobalVariableNode (location: (1,0)-(1,15))
-        │   ├── new_name:
-        │   │   @ GlobalVariableReadNode (location: (1,6)-(1,10))
-        │   │   └── name: :$foo
-        │   ├── old_name:
-        │   │   @ GlobalVariableReadNode (location: (1,11)-(1,15))
-        │   │   └── name: :$bar
-        │   └── keyword_loc: (1,0)-(1,5) = "alias"
-        └── @ AliasMethodNode (location: (2,0)-(2,15))
-            ├── new_name:
-            │   @ SymbolNode (location: (2,6)-(2,10))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (2,6)-(2,7) = ":"
-            │   ├── value_loc: (2,7)-(2,10) = "foo"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "foo"
-            ├── old_name:
-            │   @ SymbolNode (location: (2,11)-(2,15))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (2,11)-(2,12) = ":"
-            │   ├── value_loc: (2,12)-(2,15) = "bar"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "bar"
-            └── keyword_loc: (2,0)-(2,5) = "alias"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/assignment.txt b/test/mri/prism/snapshots/unparser/corpus/literal/assignment.txt
deleted file mode 100644
index 3a458b83e80..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/assignment.txt
+++ /dev/null
@@ -1,1075 +0,0 @@
-@ ProgramNode (location: (1,0)-(51,17))
-├── locals: [:a, :b, :foo, :c, :x]
-└── statements:
-    @ StatementsNode (location: (1,0)-(51,17))
-    └── body: (length: 43)
-        ├── @ GlobalVariableWriteNode (location: (1,0)-(1,6))
-        │   ├── name: :$a
-        │   ├── name_loc: (1,0)-(1,2) = "$a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,5)-(1,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (1,3)-(1,4) = "="
-        ├── @ MultiWriteNode (location: (2,0)-(2,17))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ GlobalVariableTargetNode (location: (2,1)-(2,3))
-        │   │   │   └── name: :$a
-        │   │   └── @ GlobalVariableTargetNode (location: (2,5)-(2,7))
-        │   │       └── name: :$b
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (2,0)-(2,1) = "("
-        │   ├── rparen_loc: (2,7)-(2,8) = ")"
-        │   ├── operator_loc: (2,9)-(2,10) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (2,11)-(2,17))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (2,12)-(2,13))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (2,15)-(2,16))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (2,11)-(2,12) = "["
-        │       └── closing_loc: (2,16)-(2,17) = "]"
-        ├── @ MultiWriteNode (location: (3,0)-(3,13))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ MultiTargetNode (location: (3,1)-(3,5))
-        │   │   │   ├── lefts: (length: 1)
-        │   │   │   │   └── @ LocalVariableTargetNode (location: (3,2)-(3,3))
-        │   │   │   │       ├── name: :a
-        │   │   │   │       └── depth: 0
-        │   │   │   ├── rest:
-        │   │   │   │   @ ImplicitRestNode (location: (3,3)-(3,4))
-        │   │   │   ├── rights: (length: 0)
-        │   │   │   ├── lparen_loc: (3,1)-(3,2) = "("
-        │   │   │   └── rparen_loc: (3,4)-(3,5) = ")"
-        │   │   └── @ LocalVariableTargetNode (location: (3,7)-(3,8))
-        │   │       ├── name: :b
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (3,0)-(3,1) = "("
-        │   ├── rparen_loc: (3,8)-(3,9) = ")"
-        │   ├── operator_loc: (3,10)-(3,11) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (3,12)-(3,13))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ MultiWriteNode (location: (4,0)-(4,9))
-        │   ├── lefts: (length: 0)
-        │   ├── rest:
-        │   │   @ SplatNode (location: (4,1)-(4,3))
-        │   │   ├── operator_loc: (4,1)-(4,2) = "*"
-        │   │   └── expression:
-        │   │       @ LocalVariableTargetNode (location: (4,2)-(4,3))
-        │   │       ├── name: :a
-        │   │       └── depth: 0
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (4,0)-(4,1) = "("
-        │   ├── rparen_loc: (4,3)-(4,4) = ")"
-        │   ├── operator_loc: (4,5)-(4,6) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (4,7)-(4,9))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 0)
-        │       ├── opening_loc: (4,7)-(4,8) = "["
-        │       └── closing_loc: (4,8)-(4,9) = "]"
-        ├── @ MultiWriteNode (location: (5,0)-(5,15))
-        │   ├── lefts: (length: 0)
-        │   ├── rest:
-        │   │   @ SplatNode (location: (5,1)-(5,5))
-        │   │   ├── operator_loc: (5,1)-(5,2) = "*"
-        │   │   └── expression:
-        │   │       @ LocalVariableTargetNode (location: (5,2)-(5,5))
-        │   │       ├── name: :foo
-        │   │       └── depth: 0
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (5,0)-(5,1) = "("
-        │   ├── rparen_loc: (5,5)-(5,6) = ")"
-        │   ├── operator_loc: (5,7)-(5,8) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (5,9)-(5,15))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (5,10)-(5,11))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (5,13)-(5,14))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (5,9)-(5,10) = "["
-        │       └── closing_loc: (5,14)-(5,15) = "]"
-        ├── @ MultiWriteNode (location: (6,0)-(6,19))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ ClassVariableTargetNode (location: (6,1)-(6,4))
-        │   │   │   └── name: :@@a
-        │   │   └── @ ClassVariableTargetNode (location: (6,6)-(6,9))
-        │   │       └── name: :@@b
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (6,0)-(6,1) = "("
-        │   ├── rparen_loc: (6,9)-(6,10) = ")"
-        │   ├── operator_loc: (6,11)-(6,12) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (6,13)-(6,19))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (6,14)-(6,15))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (6,17)-(6,18))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (6,13)-(6,14) = "["
-        │       └── closing_loc: (6,18)-(6,19) = "]"
-        ├── @ MultiWriteNode (location: (7,0)-(7,17))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ InstanceVariableTargetNode (location: (7,1)-(7,3))
-        │   │   │   └── name: :@a
-        │   │   └── @ InstanceVariableTargetNode (location: (7,5)-(7,7))
-        │   │       └── name: :@b
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (7,0)-(7,1) = "("
-        │   ├── rparen_loc: (7,7)-(7,8) = ")"
-        │   ├── operator_loc: (7,9)-(7,10) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (7,11)-(7,17))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (7,12)-(7,13))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (7,15)-(7,16))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (7,11)-(7,12) = "["
-        │       └── closing_loc: (7,16)-(7,17) = "]"
-        ├── @ MultiWriteNode (location: (8,0)-(8,25))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (8,1)-(8,2))
-        │   │   │   ├── name: :a
-        │   │   │   └── depth: 0
-        │   │   └── @ MultiTargetNode (location: (8,4)-(8,10))
-        │   │       ├── lefts: (length: 2)
-        │   │       │   ├── @ LocalVariableTargetNode (location: (8,5)-(8,6))
-        │   │       │   │   ├── name: :b
-        │   │       │   │   └── depth: 0
-        │   │       │   └── @ LocalVariableTargetNode (location: (8,8)-(8,9))
-        │   │       │       ├── name: :c
-        │   │       │       └── depth: 0
-        │   │       ├── rest: ∅
-        │   │       ├── rights: (length: 0)
-        │   │       ├── lparen_loc: (8,4)-(8,5) = "("
-        │   │       └── rparen_loc: (8,9)-(8,10) = ")"
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (8,0)-(8,1) = "("
-        │   ├── rparen_loc: (8,10)-(8,11) = ")"
-        │   ├── operator_loc: (8,12)-(8,13) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (8,14)-(8,25))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (8,15)-(8,16))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ ArrayNode (location: (8,18)-(8,24))
-        │       │       ├── flags: ∅
-        │       │       ├── elements: (length: 2)
-        │       │       │   ├── @ IntegerNode (location: (8,19)-(8,20))
-        │       │       │   │   ├── flags: decimal
-        │       │       │   │   └── value: 2
-        │       │       │   └── @ IntegerNode (location: (8,22)-(8,23))
-        │       │       │       ├── flags: decimal
-        │       │       │       └── value: 3
-        │       │       ├── opening_loc: (8,18)-(8,19) = "["
-        │       │       └── closing_loc: (8,23)-(8,24) = "]"
-        │       ├── opening_loc: (8,14)-(8,15) = "["
-        │       └── closing_loc: (8,24)-(8,25) = "]"
-        ├── @ MultiWriteNode (location: (9,0)-(9,15))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (9,1)-(9,2))
-        │   │       ├── name: :a
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ SplatNode (location: (9,4)-(9,5))
-        │   │   ├── operator_loc: (9,4)-(9,5) = "*"
-        │   │   └── expression: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (9,0)-(9,1) = "("
-        │   ├── rparen_loc: (9,5)-(9,6) = ")"
-        │   ├── operator_loc: (9,7)-(9,8) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (9,9)-(9,15))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (9,10)-(9,11))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (9,13)-(9,14))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (9,9)-(9,10) = "["
-        │       └── closing_loc: (9,14)-(9,15) = "]"
-        ├── @ MultiWriteNode (location: (10,0)-(10,18))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (10,1)-(10,2))
-        │   │       ├── name: :a
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ SplatNode (location: (10,4)-(10,8))
-        │   │   ├── operator_loc: (10,4)-(10,5) = "*"
-        │   │   └── expression:
-        │   │       @ LocalVariableTargetNode (location: (10,5)-(10,8))
-        │   │       ├── name: :foo
-        │   │       └── depth: 0
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (10,0)-(10,1) = "("
-        │   ├── rparen_loc: (10,8)-(10,9) = ")"
-        │   ├── operator_loc: (10,10)-(10,11) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (10,12)-(10,18))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (10,13)-(10,14))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (10,16)-(10,17))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (10,12)-(10,13) = "["
-        │       └── closing_loc: (10,17)-(10,18) = "]"
-        ├── @ MultiWriteNode (location: (11,0)-(11,15))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (11,1)-(11,2))
-        │   │   │   ├── name: :a
-        │   │   │   └── depth: 0
-        │   │   └── @ LocalVariableTargetNode (location: (11,4)-(11,5))
-        │   │       ├── name: :b
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (11,0)-(11,1) = "("
-        │   ├── rparen_loc: (11,5)-(11,6) = ")"
-        │   ├── operator_loc: (11,7)-(11,8) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (11,9)-(11,15))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (11,10)-(11,11))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (11,13)-(11,14))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (11,9)-(11,10) = "["
-        │       └── closing_loc: (11,14)-(11,15) = "]"
-        ├── @ MultiWriteNode (location: (12,0)-(12,12))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (12,1)-(12,2))
-        │   │   │   ├── name: :a
-        │   │   │   └── depth: 0
-        │   │   └── @ LocalVariableTargetNode (location: (12,4)-(12,5))
-        │   │       ├── name: :b
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (12,0)-(12,1) = "("
-        │   ├── rparen_loc: (12,5)-(12,6) = ")"
-        │   ├── operator_loc: (12,7)-(12,8) = "="
-        │   └── value:
-        │       @ LocalVariableReadNode (location: (12,9)-(12,12))
-        │       ├── name: :foo
-        │       └── depth: 0
-        ├── @ MultiWriteNode (location: (13,0)-(13,10))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (13,1)-(13,2))
-        │   │       ├── name: :a
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ ImplicitRestNode (location: (13,2)-(13,3))
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (13,0)-(13,1) = "("
-        │   ├── rparen_loc: (13,3)-(13,4) = ")"
-        │   ├── operator_loc: (13,5)-(13,6) = "="
-        │   └── value:
-        │       @ LocalVariableReadNode (location: (13,7)-(13,10))
-        │       ├── name: :foo
-        │       └── depth: 0
-        ├── @ MultiWriteNode (location: (14,0)-(14,23))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ CallTargetNode (location: (14,1)-(14,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── receiver:
-        │   │   │   │   @ LocalVariableReadNode (location: (14,1)-(14,2))
-        │   │   │   │   ├── name: :a
-        │   │   │   │   └── depth: 0
-        │   │   │   ├── call_operator_loc: (14,2)-(14,3) = "."
-        │   │   │   ├── name: :foo=
-        │   │   │   └── message_loc: (14,3)-(14,6) = "foo"
-        │   │   └── @ CallTargetNode (location: (14,8)-(14,13))
-        │   │       ├── flags: ∅
-        │   │       ├── receiver:
-        │   │       │   @ LocalVariableReadNode (location: (14,8)-(14,9))
-        │   │       │   ├── name: :a
-        │   │       │   └── depth: 0
-        │   │       ├── call_operator_loc: (14,9)-(14,10) = "."
-        │   │       ├── name: :bar=
-        │   │       └── message_loc: (14,10)-(14,13) = "bar"
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (14,0)-(14,1) = "("
-        │   ├── rparen_loc: (14,13)-(14,14) = ")"
-        │   ├── operator_loc: (14,15)-(14,16) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (14,17)-(14,23))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (14,18)-(14,19))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (14,21)-(14,22))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (14,17)-(14,18) = "["
-        │       └── closing_loc: (14,22)-(14,23) = "]"
-        ├── @ MultiWriteNode (location: (15,0)-(15,24))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ IndexTargetNode (location: (15,1)-(15,8))
-        │   │   │   ├── flags: attribute_write
-        │   │   │   ├── receiver:
-        │   │   │   │   @ LocalVariableReadNode (location: (15,1)-(15,2))
-        │   │   │   │   ├── name: :a
-        │   │   │   │   └── depth: 0
-        │   │   │   ├── opening_loc: (15,2)-(15,3) = "["
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (15,3)-(15,7))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ SplatNode (location: (15,3)-(15,7))
-        │   │   │   │           ├── operator_loc: (15,3)-(15,4) = "*"
-        │   │   │   │           └── expression:
-        │   │   │   │               @ LocalVariableReadNode (location: (15,4)-(15,7))
-        │   │   │   │               ├── name: :foo
-        │   │   │   │               └── depth: 0
-        │   │   │   ├── closing_loc: (15,7)-(15,8) = "]"
-        │   │   │   └── block: ∅
-        │   │   └── @ IndexTargetNode (location: (15,10)-(15,14))
-        │   │       ├── flags: attribute_write
-        │   │       ├── receiver:
-        │   │       │   @ LocalVariableReadNode (location: (15,10)-(15,11))
-        │   │       │   ├── name: :a
-        │   │       │   └── depth: 0
-        │   │       ├── opening_loc: (15,11)-(15,12) = "["
-        │   │       ├── arguments:
-        │   │       │   @ ArgumentsNode (location: (15,12)-(15,13))
-        │   │       │   ├── flags: ∅
-        │   │       │   └── arguments: (length: 1)
-        │   │       │       └── @ IntegerNode (location: (15,12)-(15,13))
-        │   │       │           ├── flags: decimal
-        │   │       │           └── value: 1
-        │   │       ├── closing_loc: (15,13)-(15,14) = "]"
-        │   │       └── block: ∅
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (15,0)-(15,1) = "("
-        │   ├── rparen_loc: (15,14)-(15,15) = ")"
-        │   ├── operator_loc: (15,16)-(15,17) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (15,18)-(15,24))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (15,19)-(15,20))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (15,22)-(15,23))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (15,18)-(15,19) = "["
-        │       └── closing_loc: (15,23)-(15,24) = "]"
-        ├── @ MultiWriteNode (location: (16,0)-(16,21))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ IndexTargetNode (location: (16,1)-(16,5))
-        │   │   │   ├── flags: attribute_write
-        │   │   │   ├── receiver:
-        │   │   │   │   @ LocalVariableReadNode (location: (16,1)-(16,2))
-        │   │   │   │   ├── name: :a
-        │   │   │   │   └── depth: 0
-        │   │   │   ├── opening_loc: (16,2)-(16,3) = "["
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (16,3)-(16,4))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (16,3)-(16,4))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 0
-        │   │   │   ├── closing_loc: (16,4)-(16,5) = "]"
-        │   │   │   └── block: ∅
-        │   │   └── @ IndexTargetNode (location: (16,7)-(16,11))
-        │   │       ├── flags: attribute_write
-        │   │       ├── receiver:
-        │   │       │   @ LocalVariableReadNode (location: (16,7)-(16,8))
-        │   │       │   ├── name: :a
-        │   │       │   └── depth: 0
-        │   │       ├── opening_loc: (16,8)-(16,9) = "["
-        │   │       ├── arguments:
-        │   │       │   @ ArgumentsNode (location: (16,9)-(16,10))
-        │   │       │   ├── flags: ∅
-        │   │       │   └── arguments: (length: 1)
-        │   │       │       └── @ IntegerNode (location: (16,9)-(16,10))
-        │   │       │           ├── flags: decimal
-        │   │       │           └── value: 1
-        │   │       ├── closing_loc: (16,10)-(16,11) = "]"
-        │   │       └── block: ∅
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (16,0)-(16,1) = "("
-        │   ├── rparen_loc: (16,11)-(16,12) = ")"
-        │   ├── operator_loc: (16,13)-(16,14) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (16,15)-(16,21))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (16,16)-(16,17))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (16,19)-(16,20))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: (16,15)-(16,16) = "["
-        │       └── closing_loc: (16,20)-(16,21) = "]"
-        ├── @ MultiWriteNode (location: (17,0)-(17,12))
-        │   ├── lefts: (length: 0)
-        │   ├── rest:
-        │   │   @ SplatNode (location: (17,1)-(17,7))
-        │   │   ├── operator_loc: (17,1)-(17,2) = "*"
-        │   │   └── expression:
-        │   │       @ CallTargetNode (location: (17,2)-(17,7))
-        │   │       ├── flags: ∅
-        │   │       ├── receiver:
-        │   │       │   @ LocalVariableReadNode (location: (17,2)-(17,3))
-        │   │       │   ├── name: :c
-        │   │       │   └── depth: 0
-        │   │       ├── call_operator_loc: (17,3)-(17,4) = "."
-        │   │       ├── name: :foo=
-        │   │       └── message_loc: (17,4)-(17,7) = "foo"
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (17,0)-(17,1) = "("
-        │   ├── rparen_loc: (17,7)-(17,8) = ")"
-        │   ├── operator_loc: (17,9)-(17,10) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (17,11)-(17,12))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ ConstantPathWriteNode (location: (18,0)-(18,13))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (18,0)-(18,5))
-        │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (18,2)-(18,5))
-        │   │   │   └── name: :Foo
-        │   │   └── delimiter_loc: (18,0)-(18,2) = "::"
-        │   ├── operator_loc: (18,6)-(18,7) = "="
-        │   └── value:
-        │       @ ConstantPathNode (location: (18,8)-(18,13))
-        │       ├── parent: ∅
-        │       ├── child:
-        │       │   @ ConstantReadNode (location: (18,10)-(18,13))
-        │       │   └── name: :Bar
-        │       └── delimiter_loc: (18,8)-(18,10) = "::"
-        ├── @ ClassVariableWriteNode (location: (19,0)-(19,7))
-        │   ├── name: :@@a
-        │   ├── name_loc: (19,0)-(19,3) = "@@a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (19,6)-(19,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (19,4)-(19,5) = "="
-        ├── @ InstanceVariableWriteNode (location: (20,0)-(20,6))
-        │   ├── name: :@a
-        │   ├── name_loc: (20,0)-(20,2) = "@a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (20,5)-(20,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (20,3)-(20,4) = "="
-        ├── @ ConstantWriteNode (location: (21,0)-(21,9))
-        │   ├── name: :CONST
-        │   ├── name_loc: (21,0)-(21,5) = "CONST"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (21,8)-(21,9))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (21,6)-(21,7) = "="
-        ├── @ ConstantPathWriteNode (location: (22,0)-(22,23))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (22,0)-(22,19))
-        │   │   ├── parent:
-        │   │   │   @ ConstantPathNode (location: (22,0)-(22,12))
-        │   │   │   ├── parent:
-        │   │   │   │   @ ConstantReadNode (location: (22,0)-(22,4))
-        │   │   │   │   └── name: :Name
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (22,6)-(22,12))
-        │   │   │   │   └── name: :Spaced
-        │   │   │   └── delimiter_loc: (22,4)-(22,6) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (22,14)-(22,19))
-        │   │   │   └── name: :CONST
-        │   │   └── delimiter_loc: (22,12)-(22,14) = "::"
-        │   ├── operator_loc: (22,20)-(22,21) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (22,22)-(22,23))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ LocalVariableWriteNode (location: (23,0)-(23,16))
-        │   ├── name: :a
-        │   ├── depth: 0
-        │   ├── name_loc: (23,0)-(23,1) = "a"
-        │   ├── value:
-        │   │   @ ParenthesesNode (location: (23,4)-(23,16))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (23,5)-(23,15))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ MultiWriteNode (location: (23,5)-(23,15))
-        │   │   │           ├── lefts: (length: 2)
-        │   │   │           │   ├── @ LocalVariableTargetNode (location: (23,6)-(23,7))
-        │   │   │           │   │   ├── name: :b
-        │   │   │           │   │   └── depth: 0
-        │   │   │           │   └── @ LocalVariableTargetNode (location: (23,9)-(23,10))
-        │   │   │           │       ├── name: :c
-        │   │   │           │       └── depth: 0
-        │   │   │           ├── rest: ∅
-        │   │   │           ├── rights: (length: 0)
-        │   │   │           ├── lparen_loc: (23,5)-(23,6) = "("
-        │   │   │           ├── rparen_loc: (23,10)-(23,11) = ")"
-        │   │   │           ├── operator_loc: (23,12)-(23,13) = "="
-        │   │   │           └── value:
-        │   │   │               @ IntegerNode (location: (23,14)-(23,15))
-        │   │   │               ├── flags: decimal
-        │   │   │               └── value: 1
-        │   │   ├── opening_loc: (23,4)-(23,5) = "("
-        │   │   └── closing_loc: (23,15)-(23,16) = ")"
-        │   └── operator_loc: (23,2)-(23,3) = "="
-        ├── @ LocalVariableWriteNode (location: (24,0)-(24,5))
-        │   ├── name: :a
-        │   ├── depth: 0
-        │   ├── name_loc: (24,0)-(24,1) = "a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (24,4)-(24,5))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (24,2)-(24,3) = "="
-        ├── @ LocalVariableWriteNode (location: (25,0)-(25,11))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (25,0)-(25,3) = "foo"
-        │   ├── value:
-        │   │   @ CallNode (location: (25,6)-(25,11))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (25,6)-(25,9) = "foo"
-        │   │   ├── opening_loc: (25,9)-(25,10) = "("
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: (25,10)-(25,11) = ")"
-        │   │   └── block: ∅
-        │   └── operator_loc: (25,4)-(25,5) = "="
-        ├── @ CallNode (location: (26,0)-(26,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (26,0)-(26,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (26,3)-(26,4) = "."
-        │   ├── name: :[]=
-        │   ├── message_loc: (26,4)-(26,7) = "[]="
-        │   ├── opening_loc: (26,7)-(26,8) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (26,8)-(26,9) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (27,0)-(27,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (27,0)-(27,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (27,3)-(27,4) = "."
-        │   ├── name: :[]=
-        │   ├── message_loc: (27,4)-(27,7) = "[]="
-        │   ├── opening_loc: (27,7)-(27,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (27,8)-(27,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ IntegerNode (location: (27,8)-(27,9))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── @ IntegerNode (location: (27,11)-(27,12))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: (27,12)-(27,13) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (28,0)-(28,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (28,0)-(28,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (28,3)-(28,4) = "."
-        │   ├── name: :[]=
-        │   ├── message_loc: (28,4)-(28,7) = "[]="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (28,7)-(28,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ TrueNode (location: (28,7)-(28,11))
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (29,0)-(29,19))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (29,0)-(29,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (29,3)-(29,11) = "[*index]"
-        │   ├── opening_loc: (29,3)-(29,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (29,4)-(29,19))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SplatNode (location: (29,4)-(29,10))
-        │   │       │   ├── operator_loc: (29,4)-(29,5) = "*"
-        │   │       │   └── expression:
-        │   │       │       @ CallNode (location: (29,5)-(29,10))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :index
-        │   │       │       ├── message_loc: (29,5)-(29,10) = "index"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       └── @ CallNode (location: (29,14)-(29,19))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :value
-        │   │           ├── message_loc: (29,14)-(29,19) = "value"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (29,10)-(29,11) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (30,0)-(30,17))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (30,0)-(30,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (30,3)-(30,9) = "[1..2]"
-        │   ├── opening_loc: (30,3)-(30,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (30,4)-(30,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ RangeNode (location: (30,4)-(30,8))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── left:
-        │   │       │   │   @ IntegerNode (location: (30,4)-(30,5))
-        │   │       │   │   ├── flags: decimal
-        │   │       │   │   └── value: 1
-        │   │       │   ├── right:
-        │   │       │   │   @ IntegerNode (location: (30,7)-(30,8))
-        │   │       │   │   ├── flags: decimal
-        │   │       │   │   └── value: 2
-        │   │       │   └── operator_loc: (30,5)-(30,7) = ".."
-        │   │       └── @ CallNode (location: (30,12)-(30,17))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :value
-        │   │           ├── message_loc: (30,12)-(30,17) = "value"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (30,8)-(30,9) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (31,0)-(31,9))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (31,0)-(31,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (31,3)-(31,5) = "[]"
-        │   ├── opening_loc: (31,3)-(31,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,8)-(31,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (31,8)-(31,9))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: (31,4)-(31,5) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (32,0)-(32,17))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (32,0)-(32,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (32,3)-(32,9) = "[a, b]"
-        │   ├── opening_loc: (32,3)-(32,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (32,4)-(32,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ LocalVariableReadNode (location: (32,4)-(32,5))
-        │   │       │   ├── name: :a
-        │   │       │   └── depth: 0
-        │   │       ├── @ LocalVariableReadNode (location: (32,7)-(32,8))
-        │   │       │   ├── name: :b
-        │   │       │   └── depth: 0
-        │   │       └── @ CallNode (location: (32,12)-(32,17))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :value
-        │   │           ├── message_loc: (32,12)-(32,17) = "value"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (32,8)-(32,9) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (33,0)-(33,18))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (33,0)-(33,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (33,3)-(33,10) = "[index]"
-        │   ├── opening_loc: (33,3)-(33,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (33,4)-(33,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (33,4)-(33,9))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :index
-        │   │       │   ├── message_loc: (33,4)-(33,9) = "index"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (33,13)-(33,18))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :value
-        │   │           ├── message_loc: (33,13)-(33,18) = "value"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (33,9)-(33,10) = "]"
-        │   └── block: ∅
-        ├── @ LocalVariableWriteNode (location: (34,0)-(34,7))
-        │   ├── name: :x
-        │   ├── depth: 0
-        │   ├── name_loc: (34,0)-(34,1) = "x"
-        │   ├── value:
-        │   │   @ StringNode (location: (34,4)-(34,7))
-        │   │   ├── flags: ∅
-        │   │   ├── opening_loc: (34,4)-(34,6) = "%("
-        │   │   ├── content_loc: (34,6)-(34,6) = ""
-        │   │   ├── closing_loc: (34,6)-(34,7) = ")"
-        │   │   └── unescaped: ""
-        │   └── operator_loc: (34,2)-(34,3) = "="
-        ├── @ CallNode (location: (35,0)-(35,7))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (35,0)-(35,1))
-        │   │   ├── name: :x
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (35,1)-(35,2) = "."
-        │   ├── name: :x=
-        │   ├── message_loc: (35,2)-(35,3) = "x"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (35,4)-(35,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (35,4)-(35,7))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (35,4)-(35,6) = "%("
-        │   │           ├── content_loc: (35,6)-(35,6) = ""
-        │   │           ├── closing_loc: (35,6)-(35,7) = ")"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (36,0)-(36,12))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (36,0)-(36,1))
-        │   │   ├── name: :x
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (36,1)-(36,6) = "[%()]"
-        │   ├── opening_loc: (36,1)-(36,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (36,2)-(36,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ StringNode (location: (36,2)-(36,5))
-        │   │       │   ├── flags: ∅
-        │   │       │   ├── opening_loc: (36,2)-(36,4) = "%("
-        │   │       │   ├── content_loc: (36,4)-(36,4) = ""
-        │   │       │   ├── closing_loc: (36,4)-(36,5) = ")"
-        │   │       │   └── unescaped: ""
-        │   │       └── @ CallNode (location: (36,9)-(36,12))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (36,9)-(36,12) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (36,5)-(36,6) = "]"
-        │   └── block: ∅
-        ├── @ IndexOrWriteNode (location: (37,0)-(37,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (37,0)-(37,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (37,1)-(37,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (37,2)-(37,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (37,2)-(37,5))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (37,2)-(37,4) = "%("
-        │   │           ├── content_loc: (37,4)-(37,4) = ""
-        │   │           ├── closing_loc: (37,4)-(37,5) = ")"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: (37,5)-(37,6) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (37,7)-(37,10) = "||="
-        │   └── value:
-        │       @ CallNode (location: (37,11)-(37,14))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (37,11)-(37,14) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ InstanceVariableOrWriteNode (location: (38,0)-(38,10))
-        │   ├── name: :@a
-        │   ├── name_loc: (38,0)-(38,2) = "@a"
-        │   ├── operator_loc: (38,3)-(38,6) = "||="
-        │   └── value:
-        │       @ StringNode (location: (38,7)-(38,10))
-        │       ├── flags: ∅
-        │       ├── opening_loc: (38,7)-(38,9) = "%("
-        │       ├── content_loc: (38,9)-(38,9) = ""
-        │       ├── closing_loc: (38,9)-(38,10) = ")"
-        │       └── unescaped: ""
-        ├── @ LocalVariableWriteNode (location: (39,0)-(39,14))
-        │   ├── name: :x
-        │   ├── depth: 0
-        │   ├── name_loc: (39,0)-(39,1) = "x"
-        │   ├── value:
-        │   │   @ InterpolatedStringNode (location: (39,4)-(39,14))
-        │   │   ├── opening_loc: (39,4)-(39,14) = "<<-HEREDOC"
-        │   │   ├── parts: (length: 3)
-        │   │   │   ├── @ StringNode (location: (40,0)-(40,2))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── content_loc: (40,0)-(40,2) = "  "
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── unescaped: "  "
-        │   │   │   ├── @ EmbeddedStatementsNode (location: (40,2)-(40,5))
-        │   │   │   │   ├── opening_loc: (40,2)-(40,4) = "\#{"
-        │   │   │   │   ├── statements: ∅
-        │   │   │   │   └── closing_loc: (40,4)-(40,5) = "}"
-        │   │   │   └── @ StringNode (location: (40,5)-(41,0))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── content_loc: (40,5)-(41,0) = "\n"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "\n"
-        │   │   └── closing_loc: (41,0)-(42,0) = "HEREDOC\n"
-        │   └── operator_loc: (39,2)-(39,3) = "="
-        ├── @ CallNode (location: (42,0)-(42,14))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (42,0)-(42,1))
-        │   │   ├── name: :x
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (42,1)-(42,2) = "."
-        │   ├── name: :x=
-        │   ├── message_loc: (42,2)-(42,3) = "x"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (42,4)-(42,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (42,4)-(42,14))
-        │   │           ├── opening_loc: (42,4)-(42,14) = "<<-HEREDOC"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (43,0)-(43,2))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (43,0)-(43,2) = "  "
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  "
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (43,2)-(43,5))
-        │   │           │   │   ├── opening_loc: (43,2)-(43,4) = "\#{"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── closing_loc: (43,4)-(43,5) = "}"
-        │   │           │   └── @ StringNode (location: (43,5)-(44,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (43,5)-(44,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (44,0)-(45,0) = "HEREDOC\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (45,0)-(45,16))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (45,0)-(45,1))
-        │   │   ├── name: :x
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (45,1)-(45,3) = "[]"
-        │   ├── opening_loc: (45,1)-(45,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (45,6)-(45,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (45,6)-(45,16))
-        │   │           ├── opening_loc: (45,6)-(45,16) = "<<-HEREDOC"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (46,0)-(46,2))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (46,0)-(46,2) = "  "
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  "
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (46,2)-(46,5))
-        │   │           │   │   ├── opening_loc: (46,2)-(46,4) = "\#{"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── closing_loc: (46,4)-(46,5) = "}"
-        │   │           │   └── @ StringNode (location: (46,5)-(47,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (46,5)-(47,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (47,0)-(48,0) = "HEREDOC\n"
-        │   ├── closing_loc: (45,2)-(45,3) = "]"
-        │   └── block: ∅
-        ├── @ IndexOrWriteNode (location: (48,0)-(48,21))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (48,0)-(48,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (48,1)-(48,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (48,2)-(48,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (48,2)-(48,12))
-        │   │           ├── opening_loc: (48,2)-(48,12) = "<<-HEREDOC"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (49,0)-(49,2))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (49,0)-(49,2) = "  "
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  "
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (49,2)-(49,5))
-        │   │           │   │   ├── opening_loc: (49,2)-(49,4) = "\#{"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── closing_loc: (49,4)-(49,5) = "}"
-        │   │           │   └── @ StringNode (location: (49,5)-(50,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (49,5)-(50,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (50,0)-(51,0) = "HEREDOC\n"
-        │   ├── closing_loc: (48,12)-(48,13) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (48,14)-(48,17) = "||="
-        │   └── value:
-        │       @ CallNode (location: (48,18)-(48,21))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (48,18)-(48,21) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        └── @ InstanceVariableOrWriteNode (location: (51,0)-(51,17))
-            ├── name: :@a
-            ├── name_loc: (51,0)-(51,2) = "@a"
-            ├── operator_loc: (51,3)-(51,6) = "||="
-            └── value:
-                @ InterpolatedStringNode (location: (51,7)-(51,17))
-                ├── opening_loc: (51,7)-(51,17) = "<<-HEREDOC"
-                ├── parts: (length: 3)
-                │   ├── @ StringNode (location: (52,0)-(52,2))
-                │   │   ├── flags: ∅
-                │   │   ├── opening_loc: ∅
-                │   │   ├── content_loc: (52,0)-(52,2) = "  "
-                │   │   ├── closing_loc: ∅
-                │   │   └── unescaped: "  "
-                │   ├── @ EmbeddedStatementsNode (location: (52,2)-(52,5))
-                │   │   ├── opening_loc: (52,2)-(52,4) = "\#{"
-                │   │   ├── statements: ∅
-                │   │   └── closing_loc: (52,4)-(52,5) = "}"
-                │   └── @ StringNode (location: (52,5)-(53,0))
-                │       ├── flags: ∅
-                │       ├── opening_loc: ∅
-                │       ├── content_loc: (52,5)-(53,0) = "\n"
-                │       ├── closing_loc: ∅
-                │       └── unescaped: "\n"
-                └── closing_loc: (53,0)-(54,0) = "HEREDOC\n"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/block.txt b/test/mri/prism/snapshots/unparser/corpus/literal/block.txt
deleted file mode 100644
index b4c86d0b04b..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/block.txt
+++ /dev/null
@@ -1,1402 +0,0 @@
-@ ProgramNode (location: (1,0)-(96,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(96,1))
-    └── body: (length: 30)
-        ├── @ CallNode (location: (1,0)-(2,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,4)-(2,1))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,4)-(1,5) = "{"
-        │       └── closing_loc: (2,0)-(2,1) = "}"
-        ├── @ CallNode (location: (3,0)-(4,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (3,4)-(4,1))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (3,6)-(3,9))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (3,7)-(3,8))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (3,7)-(3,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (3,6)-(3,7) = "|"
-        │       │   └── closing_loc: (3,8)-(3,9) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (3,4)-(3,5) = "{"
-        │       └── closing_loc: (4,0)-(4,1) = "}"
-        ├── @ CallNode (location: (5,0)-(6,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (5,0)-(5,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (5,4)-(6,1))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (5,6)-(5,10))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (5,7)-(5,9))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (5,7)-(5,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ ImplicitRestNode (location: (5,8)-(5,9))
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (5,6)-(5,7) = "|"
-        │       │   └── closing_loc: (5,9)-(5,10) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (5,4)-(5,5) = "{"
-        │       └── closing_loc: (6,0)-(6,1) = "}"
-        ├── @ CallNode (location: (7,0)-(8,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (7,0)-(7,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (7,4)-(8,1))
-        │       ├── locals: [:a, :x]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (7,6)-(7,13))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (7,7)-(7,9))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (7,7)-(7,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ ImplicitRestNode (location: (7,8)-(7,9))
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 1)
-        │       │   │   └── @ BlockLocalVariableNode (location: (7,11)-(7,12))
-        │       │   │       ├── flags: ∅
-        │       │   │       └── name: :x
-        │       │   ├── opening_loc: (7,6)-(7,7) = "|"
-        │       │   └── closing_loc: (7,12)-(7,13) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (7,4)-(7,5) = "{"
-        │       └── closing_loc: (8,0)-(8,1) = "}"
-        ├── @ CallNode (location: (9,0)-(10,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (9,0)-(9,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (9,4)-(10,1))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (9,6)-(9,12))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (9,7)-(9,11))
-        │       │   │   ├── requireds: (length: 2)
-        │       │   │   │   ├── @ RequiredParameterNode (location: (9,7)-(9,8))
-        │       │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   └── name: :a
-        │       │   │   │   └── @ RequiredParameterNode (location: (9,10)-(9,11))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :b
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (9,6)-(9,7) = "|"
-        │       │   └── closing_loc: (9,11)-(9,12) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (9,4)-(9,5) = "{"
-        │       └── closing_loc: (10,0)-(10,1) = "}"
-        ├── @ CallNode (location: (11,0)-(13,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (11,0)-(11,3) = "foo"
-        │   ├── opening_loc: (11,3)-(11,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (11,4)-(11,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (11,4)-(11,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: (11,5)-(11,6) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (11,7)-(13,1))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (12,2)-(12,5))
-        │       │   └── body: (length: 1)
-        │       │       └── @ NilNode (location: (12,2)-(12,5))
-        │       ├── opening_loc: (11,7)-(11,8) = "{"
-        │       └── closing_loc: (13,0)-(13,1) = "}"
-        ├── @ CallNode (location: (14,0)-(16,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (14,0)-(14,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (14,4)-(16,1))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (14,6)-(14,13))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (14,7)-(14,12))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (14,7)-(14,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (14,10)-(14,12))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :b
-        │       │   │   │   ├── name_loc: (14,11)-(14,12) = "b"
-        │       │   │   │   └── operator_loc: (14,10)-(14,11) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (14,6)-(14,7) = "|"
-        │       │   └── closing_loc: (14,12)-(14,13) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (15,2)-(15,5))
-        │       │   └── body: (length: 1)
-        │       │       └── @ NilNode (location: (15,2)-(15,5))
-        │       ├── opening_loc: (14,4)-(14,5) = "{"
-        │       └── closing_loc: (16,0)-(16,1) = "}"
-        ├── @ CallNode (location: (17,0)-(19,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (17,0)-(17,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (17,4)-(19,1))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (17,6)-(17,12))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (17,7)-(17,11))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (17,7)-(17,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (17,10)-(17,11))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: ∅
-        │       │   │   │   ├── name_loc: ∅
-        │       │   │   │   └── operator_loc: (17,10)-(17,11) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (17,6)-(17,7) = "|"
-        │       │   └── closing_loc: (17,11)-(17,12) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (18,2)-(18,5))
-        │       │   └── body: (length: 1)
-        │       │       └── @ NilNode (location: (18,2)-(18,5))
-        │       ├── opening_loc: (17,4)-(17,5) = "{"
-        │       └── closing_loc: (19,0)-(19,1) = "}"
-        ├── @ CallNode (location: (20,0)-(22,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (20,0)-(20,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (20,4)-(22,1))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (21,2)-(21,5))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (21,2)-(21,5))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :bar
-        │       │           ├── message_loc: (21,2)-(21,5) = "bar"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (20,4)-(20,5) = "{"
-        │       └── closing_loc: (22,0)-(22,1) = "}"
-        ├── @ CallNode (location: (23,0)-(25,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (23,0)-(23,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (23,0)-(23,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (23,3)-(23,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (23,4)-(23,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (23,8)-(25,1))
-        │       ├── locals: [:a, :b, :c]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (23,10)-(23,21))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (23,11)-(23,20))
-        │       │   │   ├── requireds: (length: 2)
-        │       │   │   │   ├── @ MultiTargetNode (location: (23,11)-(23,17))
-        │       │   │   │   │   ├── lefts: (length: 2)
-        │       │   │   │   │   │   ├── @ RequiredParameterNode (location: (23,12)-(23,13))
-        │       │   │   │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   │   │   └── name: :a
-        │       │   │   │   │   │   └── @ RequiredParameterNode (location: (23,15)-(23,16))
-        │       │   │   │   │   │       ├── flags: ∅
-        │       │   │   │   │   │       └── name: :b
-        │       │   │   │   │   ├── rest: ∅
-        │       │   │   │   │   ├── rights: (length: 0)
-        │       │   │   │   │   ├── lparen_loc: (23,11)-(23,12) = "("
-        │       │   │   │   │   └── rparen_loc: (23,16)-(23,17) = ")"
-        │       │   │   │   └── @ RequiredParameterNode (location: (23,19)-(23,20))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :c
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (23,10)-(23,11) = "|"
-        │       │   └── closing_loc: (23,20)-(23,21) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (24,2)-(24,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (24,2)-(24,3))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :d
-        │       │           ├── message_loc: (24,2)-(24,3) = "d"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (23,8)-(23,9) = "{"
-        │       └── closing_loc: (25,0)-(25,1) = "}"
-        ├── @ CallNode (location: (26,0)-(27,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (26,0)-(26,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (26,0)-(26,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (26,3)-(26,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (26,4)-(26,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (26,8)-(27,1))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (26,10)-(26,17))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (26,11)-(26,13))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (26,11)-(26,13))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :a
-        │       │   │   │   ├── name_loc: (26,12)-(26,13) = "a"
-        │       │   │   │   └── operator_loc: (26,11)-(26,12) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 1)
-        │       │   │   └── @ BlockLocalVariableNode (location: (26,15)-(26,16))
-        │       │   │       ├── flags: ∅
-        │       │   │       └── name: :b
-        │       │   ├── opening_loc: (26,10)-(26,11) = "|"
-        │       │   └── closing_loc: (26,16)-(26,17) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (26,8)-(26,9) = "{"
-        │       └── closing_loc: (27,0)-(27,1) = "}"
-        ├── @ CallNode (location: (28,0)-(29,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (28,0)-(28,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (28,0)-(28,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (28,3)-(28,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (28,4)-(28,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (28,8)-(29,1))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (28,10)-(28,16))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (28,11)-(28,12))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (28,11)-(28,12))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 1)
-        │       │   │   └── @ BlockLocalVariableNode (location: (28,14)-(28,15))
-        │       │   │       ├── flags: ∅
-        │       │   │       └── name: :b
-        │       │   ├── opening_loc: (28,10)-(28,11) = "|"
-        │       │   └── closing_loc: (28,15)-(28,16) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (28,8)-(28,9) = "{"
-        │       └── closing_loc: (29,0)-(29,1) = "}"
-        ├── @ CallNode (location: (30,0)-(31,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (30,0)-(30,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (30,0)-(30,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (30,3)-(30,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (30,4)-(30,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (30,8)-(31,1))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (30,10)-(30,18))
-        │       │   ├── parameters: ∅
-        │       │   ├── locals: (length: 2)
-        │       │   │   ├── @ BlockLocalVariableNode (location: (30,13)-(30,14))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   └── name: :a
-        │       │   │   └── @ BlockLocalVariableNode (location: (30,16)-(30,17))
-        │       │   │       ├── flags: ∅
-        │       │   │       └── name: :b
-        │       │   ├── opening_loc: (30,10)-(30,11) = "|"
-        │       │   └── closing_loc: (30,17)-(30,18) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (30,8)-(30,9) = "{"
-        │       └── closing_loc: (31,0)-(31,1) = "}"
-        ├── @ CallNode (location: (32,0)-(34,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (32,0)-(32,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (32,0)-(32,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (32,3)-(32,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (32,4)-(32,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (32,8)-(34,1))
-        │       ├── locals: []
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (32,10)-(32,13))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (32,11)-(32,12))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (32,11)-(32,12))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: ∅
-        │       │   │   │   ├── name_loc: ∅
-        │       │   │   │   └── operator_loc: (32,11)-(32,12) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (32,10)-(32,11) = "|"
-        │       │   └── closing_loc: (32,12)-(32,13) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (33,2)-(33,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (33,2)-(33,3))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :d
-        │       │           ├── message_loc: (33,2)-(33,3) = "d"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (32,8)-(32,9) = "{"
-        │       └── closing_loc: (34,0)-(34,1) = "}"
-        ├── @ CallNode (location: (35,0)-(37,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (35,0)-(35,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (35,0)-(35,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (35,3)-(35,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (35,4)-(35,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (35,8)-(37,1))
-        │       ├── locals: []
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (35,10)-(35,15))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (35,11)-(35,14))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ MultiTargetNode (location: (35,11)-(35,14))
-        │       │   │   │       ├── lefts: (length: 0)
-        │       │   │   │       ├── rest:
-        │       │   │   │       │   @ SplatNode (location: (35,12)-(35,13))
-        │       │   │   │       │   ├── operator_loc: (35,12)-(35,13) = "*"
-        │       │   │   │       │   └── expression: ∅
-        │       │   │   │       ├── rights: (length: 0)
-        │       │   │   │       ├── lparen_loc: (35,11)-(35,12) = "("
-        │       │   │   │       └── rparen_loc: (35,13)-(35,14) = ")"
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (35,10)-(35,11) = "|"
-        │       │   └── closing_loc: (35,14)-(35,15) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (36,2)-(36,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (36,2)-(36,3))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :d
-        │       │           ├── message_loc: (36,2)-(36,3) = "d"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (35,8)-(35,9) = "{"
-        │       └── closing_loc: (37,0)-(37,1) = "}"
-        ├── @ CallNode (location: (38,0)-(40,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (38,0)-(38,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (38,0)-(38,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (38,3)-(38,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (38,4)-(38,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (38,8)-(40,1))
-        │       ├── locals: []
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (38,10)-(38,17))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (38,11)-(38,16))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ MultiTargetNode (location: (38,11)-(38,16))
-        │       │   │   │       ├── lefts: (length: 1)
-        │       │   │   │       │   └── @ MultiTargetNode (location: (38,12)-(38,15))
-        │       │   │   │       │       ├── lefts: (length: 0)
-        │       │   │   │       │       ├── rest:
-        │       │   │   │       │       │   @ SplatNode (location: (38,13)-(38,14))
-        │       │   │   │       │       │   ├── operator_loc: (38,13)-(38,14) = "*"
-        │       │   │   │       │       │   └── expression: ∅
-        │       │   │   │       │       ├── rights: (length: 0)
-        │       │   │   │       │       ├── lparen_loc: (38,12)-(38,13) = "("
-        │       │   │   │       │       └── rparen_loc: (38,14)-(38,15) = ")"
-        │       │   │   │       ├── rest: ∅
-        │       │   │   │       ├── rights: (length: 0)
-        │       │   │   │       ├── lparen_loc: (38,11)-(38,12) = "("
-        │       │   │   │       └── rparen_loc: (38,15)-(38,16) = ")"
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (38,10)-(38,11) = "|"
-        │       │   └── closing_loc: (38,16)-(38,17) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (39,2)-(39,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (39,2)-(39,3))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :d
-        │       │           ├── message_loc: (39,2)-(39,3) = "d"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (38,8)-(38,9) = "{"
-        │       └── closing_loc: (40,0)-(40,1) = "}"
-        ├── @ CallNode (location: (41,0)-(43,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (41,0)-(41,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (41,0)-(41,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (41,3)-(41,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (41,4)-(41,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (41,8)-(43,1))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (41,10)-(41,20))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (41,11)-(41,19))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ MultiTargetNode (location: (41,11)-(41,19))
-        │       │   │   │       ├── lefts: (length: 2)
-        │       │   │   │       │   ├── @ RequiredParameterNode (location: (41,12)-(41,13))
-        │       │   │   │       │   │   ├── flags: ∅
-        │       │   │   │       │   │   └── name: :a
-        │       │   │   │       │   └── @ MultiTargetNode (location: (41,15)-(41,18))
-        │       │   │   │       │       ├── lefts: (length: 0)
-        │       │   │   │       │       ├── rest:
-        │       │   │   │       │       │   @ SplatNode (location: (41,16)-(41,17))
-        │       │   │   │       │       │   ├── operator_loc: (41,16)-(41,17) = "*"
-        │       │   │   │       │       │   └── expression: ∅
-        │       │   │   │       │       ├── rights: (length: 0)
-        │       │   │   │       │       ├── lparen_loc: (41,15)-(41,16) = "("
-        │       │   │   │       │       └── rparen_loc: (41,17)-(41,18) = ")"
-        │       │   │   │       ├── rest: ∅
-        │       │   │   │       ├── rights: (length: 0)
-        │       │   │   │       ├── lparen_loc: (41,11)-(41,12) = "("
-        │       │   │   │       └── rparen_loc: (41,18)-(41,19) = ")"
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (41,10)-(41,11) = "|"
-        │       │   └── closing_loc: (41,19)-(41,20) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (42,2)-(42,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (42,2)-(42,3))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :d
-        │       │           ├── message_loc: (42,2)-(42,3) = "d"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (41,8)-(41,9) = "{"
-        │       └── closing_loc: (43,0)-(43,1) = "}"
-        ├── @ CallNode (location: (44,0)-(46,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (44,0)-(44,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (44,0)-(44,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (44,3)-(44,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (44,4)-(44,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (44,8)-(46,1))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (44,10)-(44,18))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (44,11)-(44,17))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ MultiTargetNode (location: (44,11)-(44,17))
-        │       │   │   │       ├── lefts: (length: 2)
-        │       │   │   │       │   ├── @ RequiredParameterNode (location: (44,12)-(44,13))
-        │       │   │   │       │   │   ├── flags: ∅
-        │       │   │   │       │   │   └── name: :a
-        │       │   │   │       │   └── @ RequiredParameterNode (location: (44,15)-(44,16))
-        │       │   │   │       │       ├── flags: ∅
-        │       │   │   │       │       └── name: :b
-        │       │   │   │       ├── rest: ∅
-        │       │   │   │       ├── rights: (length: 0)
-        │       │   │   │       ├── lparen_loc: (44,11)-(44,12) = "("
-        │       │   │   │       └── rparen_loc: (44,16)-(44,17) = ")"
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (44,10)-(44,11) = "|"
-        │       │   └── closing_loc: (44,17)-(44,18) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (45,2)-(45,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (45,2)-(45,3))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :d
-        │       │           ├── message_loc: (45,2)-(45,3) = "d"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (44,8)-(44,9) = "{"
-        │       └── closing_loc: (46,0)-(46,1) = "}"
-        ├── @ CallNode (location: (47,0)-(48,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (47,0)-(48,1))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (47,0)-(47,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (47,0)-(47,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (47,3)-(47,4) = "."
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (47,4)-(47,7) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (47,8)-(48,1))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (47,8)-(47,9) = "{"
-        │   │       └── closing_loc: (48,0)-(48,1) = "}"
-        │   ├── call_operator_loc: (48,1)-(48,2) = "."
-        │   ├── name: :baz
-        │   ├── message_loc: (48,2)-(48,5) = "baz"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (49,0)-(51,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (49,0)-(49,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (49,2)-(51,3))
-        │       ├── locals: [:e]
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (49,2)-(51,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (50,0)-(50,21))
-        │       │   │   ├── keyword_loc: (50,0)-(50,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 1)
-        │       │   │   │   └── @ ConstantReadNode (location: (50,7)-(50,16))
-        │       │   │   │       └── name: :Exception
-        │       │   │   ├── operator_loc: (50,17)-(50,19) = "=>"
-        │       │   │   ├── reference:
-        │       │   │   │   @ LocalVariableTargetNode (location: (50,20)-(50,21))
-        │       │   │   │   ├── name: :e
-        │       │   │   │   └── depth: 0
-        │       │   │   ├── statements: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (51,0)-(51,3) = "end"
-        │       ├── opening_loc: (49,2)-(49,4) = "do"
-        │       └── closing_loc: (51,0)-(51,3) = "end"
-        ├── @ CallNode (location: (52,0)-(56,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (52,0)-(52,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (52,2)-(56,3))
-        │       ├── locals: [:bar]
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (52,2)-(56,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements:
-        │       │   │   @ StatementsNode (location: (53,2)-(53,5))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ CallNode (location: (53,2)-(53,5))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :foo
-        │       │   │           ├── message_loc: (53,2)-(53,5) = "foo"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (54,0)-(55,5))
-        │       │   │   ├── keyword_loc: (54,0)-(54,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 1)
-        │       │   │   │   └── @ ConstantReadNode (location: (54,7)-(54,16))
-        │       │   │   │       └── name: :Exception
-        │       │   │   ├── operator_loc: (54,17)-(54,19) = "=>"
-        │       │   │   ├── reference:
-        │       │   │   │   @ LocalVariableTargetNode (location: (54,20)-(54,23))
-        │       │   │   │   ├── name: :bar
-        │       │   │   │   └── depth: 0
-        │       │   │   ├── statements:
-        │       │   │   │   @ StatementsNode (location: (55,2)-(55,5))
-        │       │   │   │   └── body: (length: 1)
-        │       │   │   │       └── @ LocalVariableReadNode (location: (55,2)-(55,5))
-        │       │   │   │           ├── name: :bar
-        │       │   │   │           └── depth: 0
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (56,0)-(56,3) = "end"
-        │       ├── opening_loc: (52,2)-(52,4) = "do"
-        │       └── closing_loc: (56,0)-(56,3) = "end"
-        ├── @ CallNode (location: (57,0)-(61,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (57,0)-(57,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (57,2)-(61,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (57,2)-(61,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements:
-        │       │   │   @ StatementsNode (location: (58,2)-(58,5))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ CallNode (location: (58,2)-(58,5))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (58,2)-(58,5) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (59,0)-(60,5))
-        │       │   │   ├── keyword_loc: (59,0)-(59,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 2)
-        │       │   │   │   ├── @ ConstantReadNode (location: (59,7)-(59,16))
-        │       │   │   │   │   └── name: :SomeError
-        │       │   │   │   └── @ SplatNode (location: (59,18)-(59,22))
-        │       │   │   │       ├── operator_loc: (59,18)-(59,19) = "*"
-        │       │   │   │       └── expression:
-        │       │   │   │           @ CallNode (location: (59,19)-(59,22))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :bar
-        │       │   │   │           ├── message_loc: (59,19)-(59,22) = "bar"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   ├── operator_loc: ∅
-        │       │   │   ├── reference: ∅
-        │       │   │   ├── statements:
-        │       │   │   │   @ StatementsNode (location: (60,2)-(60,5))
-        │       │   │   │   └── body: (length: 1)
-        │       │   │   │       └── @ CallNode (location: (60,2)-(60,5))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :baz
-        │       │   │   │           ├── message_loc: (60,2)-(60,5) = "baz"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (61,0)-(61,3) = "end"
-        │       ├── opening_loc: (57,2)-(57,4) = "do"
-        │       └── closing_loc: (61,0)-(61,3) = "end"
-        ├── @ CallNode (location: (62,0)-(66,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (62,0)-(62,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (62,2)-(66,3))
-        │       ├── locals: [:exception]
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (62,2)-(66,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements:
-        │       │   │   @ StatementsNode (location: (63,2)-(63,5))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ CallNode (location: (63,2)-(63,5))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (63,2)-(63,5) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (64,0)-(65,5))
-        │       │   │   ├── keyword_loc: (64,0)-(64,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 2)
-        │       │   │   │   ├── @ ConstantReadNode (location: (64,7)-(64,16))
-        │       │   │   │   │   └── name: :SomeError
-        │       │   │   │   └── @ SplatNode (location: (64,18)-(64,22))
-        │       │   │   │       ├── operator_loc: (64,18)-(64,19) = "*"
-        │       │   │   │       └── expression:
-        │       │   │   │           @ CallNode (location: (64,19)-(64,22))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :bar
-        │       │   │   │           ├── message_loc: (64,19)-(64,22) = "bar"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   ├── operator_loc: (64,23)-(64,25) = "=>"
-        │       │   │   ├── reference:
-        │       │   │   │   @ LocalVariableTargetNode (location: (64,26)-(64,35))
-        │       │   │   │   ├── name: :exception
-        │       │   │   │   └── depth: 0
-        │       │   │   ├── statements:
-        │       │   │   │   @ StatementsNode (location: (65,2)-(65,5))
-        │       │   │   │   └── body: (length: 1)
-        │       │   │   │       └── @ CallNode (location: (65,2)-(65,5))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :baz
-        │       │   │   │           ├── message_loc: (65,2)-(65,5) = "baz"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (66,0)-(66,3) = "end"
-        │       ├── opening_loc: (62,2)-(62,4) = "do"
-        │       └── closing_loc: (66,0)-(66,3) = "end"
-        ├── @ CallNode (location: (67,0)-(71,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (67,0)-(67,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (67,2)-(71,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (67,2)-(71,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements:
-        │       │   │   @ StatementsNode (location: (68,2)-(68,5))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ CallNode (location: (68,2)-(68,5))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (68,2)-(68,5) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (69,0)-(70,5))
-        │       │   │   ├── keyword_loc: (69,0)-(69,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 1)
-        │       │   │   │   └── @ SplatNode (location: (69,7)-(69,11))
-        │       │   │   │       ├── operator_loc: (69,7)-(69,8) = "*"
-        │       │   │   │       └── expression:
-        │       │   │   │           @ CallNode (location: (69,8)-(69,11))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :bar
-        │       │   │   │           ├── message_loc: (69,8)-(69,11) = "bar"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   ├── operator_loc: ∅
-        │       │   │   ├── reference: ∅
-        │       │   │   ├── statements:
-        │       │   │   │   @ StatementsNode (location: (70,2)-(70,5))
-        │       │   │   │   └── body: (length: 1)
-        │       │   │   │       └── @ CallNode (location: (70,2)-(70,5))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :baz
-        │       │   │   │           ├── message_loc: (70,2)-(70,5) = "baz"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (71,0)-(71,3) = "end"
-        │       ├── opening_loc: (67,2)-(67,4) = "do"
-        │       └── closing_loc: (71,0)-(71,3) = "end"
-        ├── @ CallNode (location: (72,0)-(75,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (72,0)-(72,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (72,2)-(75,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (72,2)-(75,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements:
-        │       │   │   @ StatementsNode (location: (73,2)-(73,5))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ CallNode (location: (73,2)-(73,5))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (73,2)-(73,5) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (74,0)-(74,16))
-        │       │   │   ├── keyword_loc: (74,0)-(74,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 1)
-        │       │   │   │   └── @ ConstantReadNode (location: (74,7)-(74,16))
-        │       │   │   │       └── name: :LoadError
-        │       │   │   ├── operator_loc: ∅
-        │       │   │   ├── reference: ∅
-        │       │   │   ├── statements: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (75,0)-(75,3) = "end"
-        │       ├── opening_loc: (72,2)-(72,4) = "do"
-        │       └── closing_loc: (75,0)-(75,3) = "end"
-        ├── @ CallNode (location: (76,0)-(81,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (76,0)-(76,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (76,2)-(81,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (76,2)-(81,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements:
-        │       │   │   @ StatementsNode (location: (77,2)-(77,5))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ CallNode (location: (77,2)-(77,5))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (77,2)-(77,5) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (78,0)-(78,6))
-        │       │   │   ├── keyword_loc: (78,0)-(78,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 0)
-        │       │   │   ├── operator_loc: ∅
-        │       │   │   ├── reference: ∅
-        │       │   │   ├── statements: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause:
-        │       │   │   @ ElseNode (location: (79,0)-(81,3))
-        │       │   │   ├── else_keyword_loc: (79,0)-(79,4) = "else"
-        │       │   │   ├── statements:
-        │       │   │   │   @ StatementsNode (location: (80,2)-(80,5))
-        │       │   │   │   └── body: (length: 1)
-        │       │   │   │       └── @ CallNode (location: (80,2)-(80,5))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :baz
-        │       │   │   │           ├── message_loc: (80,2)-(80,5) = "baz"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   └── end_keyword_loc: (81,0)-(81,3) = "end"
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (81,0)-(81,3) = "end"
-        │       ├── opening_loc: (76,2)-(76,4) = "do"
-        │       └── closing_loc: (81,0)-(81,3) = "end"
-        ├── @ CallNode (location: (82,0)-(86,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (82,0)-(82,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (82,2)-(86,3))
-        │       ├── locals: [:exception]
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (82,2)-(86,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements:
-        │       │   │   @ StatementsNode (location: (83,2)-(83,5))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ CallNode (location: (83,2)-(83,5))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (83,2)-(83,5) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (84,0)-(85,5))
-        │       │   │   ├── keyword_loc: (84,0)-(84,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 1)
-        │       │   │   │   └── @ SplatNode (location: (84,7)-(84,11))
-        │       │   │   │       ├── operator_loc: (84,7)-(84,8) = "*"
-        │       │   │   │       └── expression:
-        │       │   │   │           @ CallNode (location: (84,8)-(84,11))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :bar
-        │       │   │   │           ├── message_loc: (84,8)-(84,11) = "bar"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   ├── operator_loc: (84,12)-(84,14) = "=>"
-        │       │   │   ├── reference:
-        │       │   │   │   @ LocalVariableTargetNode (location: (84,15)-(84,24))
-        │       │   │   │   ├── name: :exception
-        │       │   │   │   └── depth: 0
-        │       │   │   ├── statements:
-        │       │   │   │   @ StatementsNode (location: (85,2)-(85,5))
-        │       │   │   │   └── body: (length: 1)
-        │       │   │   │       └── @ CallNode (location: (85,2)-(85,5))
-        │       │   │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │   │           ├── receiver: ∅
-        │       │   │   │           ├── call_operator_loc: ∅
-        │       │   │   │           ├── name: :baz
-        │       │   │   │           ├── message_loc: (85,2)-(85,5) = "baz"
-        │       │   │   │           ├── opening_loc: ∅
-        │       │   │   │           ├── arguments: ∅
-        │       │   │   │           ├── closing_loc: ∅
-        │       │   │   │           └── block: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (86,0)-(86,3) = "end"
-        │       ├── opening_loc: (82,2)-(82,4) = "do"
-        │       └── closing_loc: (86,0)-(86,3) = "end"
-        ├── @ CallNode (location: (87,0)-(89,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (87,0)-(87,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (87,2)-(89,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (87,2)-(89,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements: ∅
-        │       │   ├── rescue_clause: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause:
-        │       │   │   @ EnsureNode (location: (88,0)-(89,3))
-        │       │   │   ├── ensure_keyword_loc: (88,0)-(88,6) = "ensure"
-        │       │   │   ├── statements: ∅
-        │       │   │   └── end_keyword_loc: (89,0)-(89,3) = "end"
-        │       │   └── end_keyword_loc: (89,0)-(89,3) = "end"
-        │       ├── opening_loc: (87,2)-(87,4) = "do"
-        │       └── closing_loc: (89,0)-(89,3) = "end"
-        ├── @ CallNode (location: (90,0)-(93,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (90,0)-(90,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (90,2)-(93,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (90,2)-(93,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (91,0)-(91,6))
-        │       │   │   ├── keyword_loc: (91,0)-(91,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 0)
-        │       │   │   ├── operator_loc: ∅
-        │       │   │   ├── reference: ∅
-        │       │   │   ├── statements: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause:
-        │       │   │   @ EnsureNode (location: (92,0)-(93,3))
-        │       │   │   ├── ensure_keyword_loc: (92,0)-(92,6) = "ensure"
-        │       │   │   ├── statements: ∅
-        │       │   │   └── end_keyword_loc: (93,0)-(93,3) = "end"
-        │       │   └── end_keyword_loc: (93,0)-(93,3) = "end"
-        │       ├── opening_loc: (90,2)-(90,4) = "do"
-        │       └── closing_loc: (93,0)-(93,3) = "end"
-        └── @ CallNode (location: (94,0)-(96,1))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :bar
-            ├── message_loc: (94,0)-(94,3) = "bar"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (94,4)-(96,1))
-                ├── locals: [:_1, :_2]
-                ├── parameters:
-                │   @ NumberedParametersNode (location: (94,4)-(96,1))
-                │   └── maximum: 2
-                ├── body:
-                │   @ StatementsNode (location: (95,2)-(95,9))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (95,2)-(95,9))
-                │           ├── flags: ∅
-                │           ├── receiver:
-                │           │   @ LocalVariableReadNode (location: (95,2)-(95,4))
-                │           │   ├── name: :_1
-                │           │   └── depth: 0
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :+
-                │           ├── message_loc: (95,5)-(95,6) = "+"
-                │           ├── opening_loc: ∅
-                │           ├── arguments:
-                │           │   @ ArgumentsNode (location: (95,7)-(95,9))
-                │           │   ├── flags: ∅
-                │           │   └── arguments: (length: 1)
-                │           │       └── @ LocalVariableReadNode (location: (95,7)-(95,9))
-                │           │           ├── name: :_2
-                │           │           └── depth: 0
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (94,4)-(94,5) = "{"
-                └── closing_loc: (96,0)-(96,1) = "}"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/case.txt b/test/mri/prism/snapshots/unparser/corpus/literal/case.txt
deleted file mode 100644
index 509caa55c8b..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/case.txt
+++ /dev/null
@@ -1,446 +0,0 @@
-@ ProgramNode (location: (1,0)-(37,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(37,3))
-    └── body: (length: 8)
-        ├── @ CaseNode (location: (1,0)-(6,3))
-        │   ├── predicate: ∅
-        │   ├── conditions: (length: 2)
-        │   │   ├── @ WhenNode (location: (2,0)-(3,5))
-        │   │   │   ├── keyword_loc: (2,0)-(2,4) = "when"
-        │   │   │   ├── conditions: (length: 1)
-        │   │   │   │   └── @ CallNode (location: (2,5)-(2,8))
-        │   │   │   │       ├── flags: variable_call, ignore_visibility
-        │   │   │   │       ├── receiver: ∅
-        │   │   │   │       ├── call_operator_loc: ∅
-        │   │   │   │       ├── name: :bar
-        │   │   │   │       ├── message_loc: (2,5)-(2,8) = "bar"
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── arguments: ∅
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── block: ∅
-        │   │   │   ├── then_keyword_loc: ∅
-        │   │   │   └── statements:
-        │   │   │       @ StatementsNode (location: (3,2)-(3,5))
-        │   │   │       └── body: (length: 1)
-        │   │   │           └── @ CallNode (location: (3,2)-(3,5))
-        │   │   │               ├── flags: variable_call, ignore_visibility
-        │   │   │               ├── receiver: ∅
-        │   │   │               ├── call_operator_loc: ∅
-        │   │   │               ├── name: :baz
-        │   │   │               ├── message_loc: (3,2)-(3,5) = "baz"
-        │   │   │               ├── opening_loc: ∅
-        │   │   │               ├── arguments: ∅
-        │   │   │               ├── closing_loc: ∅
-        │   │   │               └── block: ∅
-        │   │   └── @ WhenNode (location: (4,0)-(5,5))
-        │   │       ├── keyword_loc: (4,0)-(4,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ CallNode (location: (4,5)-(4,8))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :baz
-        │   │       │       ├── message_loc: (4,5)-(4,8) = "baz"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements:
-        │   │           @ StatementsNode (location: (5,2)-(5,5))
-        │   │           └── body: (length: 1)
-        │   │               └── @ CallNode (location: (5,2)-(5,5))
-        │   │                   ├── flags: variable_call, ignore_visibility
-        │   │                   ├── receiver: ∅
-        │   │                   ├── call_operator_loc: ∅
-        │   │                   ├── name: :bar
-        │   │                   ├── message_loc: (5,2)-(5,5) = "bar"
-        │   │                   ├── opening_loc: ∅
-        │   │                   ├── arguments: ∅
-        │   │                   ├── closing_loc: ∅
-        │   │                   └── block: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (1,0)-(1,4) = "case"
-        │   └── end_keyword_loc: (6,0)-(6,3) = "end"
-        ├── @ CaseNode (location: (7,0)-(11,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (7,5)-(7,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (7,5)-(7,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 2)
-        │   │   ├── @ WhenNode (location: (8,0)-(8,8))
-        │   │   │   ├── keyword_loc: (8,0)-(8,4) = "when"
-        │   │   │   ├── conditions: (length: 1)
-        │   │   │   │   └── @ CallNode (location: (8,5)-(8,8))
-        │   │   │   │       ├── flags: variable_call, ignore_visibility
-        │   │   │   │       ├── receiver: ∅
-        │   │   │   │       ├── call_operator_loc: ∅
-        │   │   │   │       ├── name: :bar
-        │   │   │   │       ├── message_loc: (8,5)-(8,8) = "bar"
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── arguments: ∅
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── block: ∅
-        │   │   │   ├── then_keyword_loc: ∅
-        │   │   │   └── statements: ∅
-        │   │   └── @ WhenNode (location: (9,0)-(10,5))
-        │   │       ├── keyword_loc: (9,0)-(9,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ CallNode (location: (9,5)-(9,8))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :baz
-        │   │       │       ├── message_loc: (9,5)-(9,8) = "baz"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements:
-        │   │           @ StatementsNode (location: (10,2)-(10,5))
-        │   │           └── body: (length: 1)
-        │   │               └── @ CallNode (location: (10,2)-(10,5))
-        │   │                   ├── flags: variable_call, ignore_visibility
-        │   │                   ├── receiver: ∅
-        │   │                   ├── call_operator_loc: ∅
-        │   │                   ├── name: :bar
-        │   │                   ├── message_loc: (10,2)-(10,5) = "bar"
-        │   │                   ├── opening_loc: ∅
-        │   │                   ├── arguments: ∅
-        │   │                   ├── closing_loc: ∅
-        │   │                   └── block: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (7,0)-(7,4) = "case"
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ CaseNode (location: (12,0)-(17,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (12,5)-(12,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (12,5)-(12,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 2)
-        │   │   ├── @ WhenNode (location: (13,0)-(14,5))
-        │   │   │   ├── keyword_loc: (13,0)-(13,4) = "when"
-        │   │   │   ├── conditions: (length: 1)
-        │   │   │   │   └── @ CallNode (location: (13,5)-(13,8))
-        │   │   │   │       ├── flags: variable_call, ignore_visibility
-        │   │   │   │       ├── receiver: ∅
-        │   │   │   │       ├── call_operator_loc: ∅
-        │   │   │   │       ├── name: :bar
-        │   │   │   │       ├── message_loc: (13,5)-(13,8) = "bar"
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── arguments: ∅
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── block: ∅
-        │   │   │   ├── then_keyword_loc: ∅
-        │   │   │   └── statements:
-        │   │   │       @ StatementsNode (location: (14,2)-(14,5))
-        │   │   │       └── body: (length: 1)
-        │   │   │           └── @ CallNode (location: (14,2)-(14,5))
-        │   │   │               ├── flags: variable_call, ignore_visibility
-        │   │   │               ├── receiver: ∅
-        │   │   │               ├── call_operator_loc: ∅
-        │   │   │               ├── name: :baz
-        │   │   │               ├── message_loc: (14,2)-(14,5) = "baz"
-        │   │   │               ├── opening_loc: ∅
-        │   │   │               ├── arguments: ∅
-        │   │   │               ├── closing_loc: ∅
-        │   │   │               └── block: ∅
-        │   │   └── @ WhenNode (location: (15,0)-(16,5))
-        │   │       ├── keyword_loc: (15,0)-(15,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ CallNode (location: (15,5)-(15,8))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :baz
-        │   │       │       ├── message_loc: (15,5)-(15,8) = "baz"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements:
-        │   │           @ StatementsNode (location: (16,2)-(16,5))
-        │   │           └── body: (length: 1)
-        │   │               └── @ CallNode (location: (16,2)-(16,5))
-        │   │                   ├── flags: variable_call, ignore_visibility
-        │   │                   ├── receiver: ∅
-        │   │                   ├── call_operator_loc: ∅
-        │   │                   ├── name: :bar
-        │   │                   ├── message_loc: (16,2)-(16,5) = "bar"
-        │   │                   ├── opening_loc: ∅
-        │   │                   ├── arguments: ∅
-        │   │                   ├── closing_loc: ∅
-        │   │                   └── block: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (12,0)-(12,4) = "case"
-        │   └── end_keyword_loc: (17,0)-(17,3) = "end"
-        ├── @ CaseNode (location: (18,0)-(21,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (18,5)-(18,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (18,5)-(18,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (19,0)-(20,8))
-        │   │       ├── keyword_loc: (19,0)-(19,4) = "when"
-        │   │       ├── conditions: (length: 2)
-        │   │       │   ├── @ CallNode (location: (19,5)-(19,8))
-        │   │       │   │   ├── flags: variable_call, ignore_visibility
-        │   │       │   │   ├── receiver: ∅
-        │   │       │   │   ├── call_operator_loc: ∅
-        │   │       │   │   ├── name: :bar
-        │   │       │   │   ├── message_loc: (19,5)-(19,8) = "bar"
-        │   │       │   │   ├── opening_loc: ∅
-        │   │       │   │   ├── arguments: ∅
-        │   │       │   │   ├── closing_loc: ∅
-        │   │       │   │   └── block: ∅
-        │   │       │   └── @ CallNode (location: (19,10)-(19,13))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :baz
-        │   │       │       ├── message_loc: (19,10)-(19,13) = "baz"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements:
-        │   │           @ StatementsNode (location: (20,2)-(20,8))
-        │   │           └── body: (length: 1)
-        │   │               └── @ SymbolNode (location: (20,2)-(20,8))
-        │   │                   ├── flags: forced_us_ascii_encoding
-        │   │                   ├── opening_loc: (20,2)-(20,3) = ":"
-        │   │                   ├── value_loc: (20,3)-(20,8) = "other"
-        │   │                   ├── closing_loc: ∅
-        │   │                   └── unescaped: "other"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (18,0)-(18,4) = "case"
-        │   └── end_keyword_loc: (21,0)-(21,3) = "end"
-        ├── @ CaseNode (location: (22,0)-(25,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (22,5)-(22,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (22,5)-(22,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (23,0)-(24,8))
-        │   │       ├── keyword_loc: (23,0)-(23,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ SplatNode (location: (23,5)-(23,9))
-        │   │       │       ├── operator_loc: (23,5)-(23,6) = "*"
-        │   │       │       └── expression:
-        │   │       │           @ CallNode (location: (23,6)-(23,9))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :bar
-        │   │       │           ├── message_loc: (23,6)-(23,9) = "bar"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements:
-        │   │           @ StatementsNode (location: (24,2)-(24,8))
-        │   │           └── body: (length: 1)
-        │   │               └── @ SymbolNode (location: (24,2)-(24,8))
-        │   │                   ├── flags: forced_us_ascii_encoding
-        │   │                   ├── opening_loc: (24,2)-(24,3) = ":"
-        │   │                   ├── value_loc: (24,3)-(24,8) = "value"
-        │   │                   ├── closing_loc: ∅
-        │   │                   └── unescaped: "value"
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (22,0)-(22,4) = "case"
-        │   └── end_keyword_loc: (25,0)-(25,3) = "end"
-        ├── @ CaseNode (location: (26,0)-(31,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (26,5)-(26,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (26,5)-(26,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (27,0)-(28,5))
-        │   │       ├── keyword_loc: (27,0)-(27,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ CallNode (location: (27,5)-(27,8))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :bar
-        │   │       │       ├── message_loc: (27,5)-(27,8) = "bar"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements:
-        │   │           @ StatementsNode (location: (28,2)-(28,5))
-        │   │           └── body: (length: 1)
-        │   │               └── @ CallNode (location: (28,2)-(28,5))
-        │   │                   ├── flags: variable_call, ignore_visibility
-        │   │                   ├── receiver: ∅
-        │   │                   ├── call_operator_loc: ∅
-        │   │                   ├── name: :baz
-        │   │                   ├── message_loc: (28,2)-(28,5) = "baz"
-        │   │                   ├── opening_loc: ∅
-        │   │                   ├── arguments: ∅
-        │   │                   ├── closing_loc: ∅
-        │   │                   └── block: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (29,0)-(31,3))
-        │   │   ├── else_keyword_loc: (29,0)-(29,4) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (30,2)-(30,6))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ SymbolNode (location: (30,2)-(30,6))
-        │   │   │           ├── flags: forced_us_ascii_encoding
-        │   │   │           ├── opening_loc: (30,2)-(30,3) = ":"
-        │   │   │           ├── value_loc: (30,3)-(30,6) = "foo"
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── unescaped: "foo"
-        │   │   └── end_keyword_loc: (31,0)-(31,3) = "end"
-        │   ├── case_keyword_loc: (26,0)-(26,4) = "case"
-        │   └── end_keyword_loc: (31,0)-(31,3) = "end"
-        ├── @ CaseNode (location: (32,0)-(34,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (32,5)-(32,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (32,5)-(32,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ WhenNode (location: (33,0)-(33,15))
-        │   │       ├── keyword_loc: (33,0)-(33,4) = "when"
-        │   │       ├── conditions: (length: 1)
-        │   │       │   └── @ SplatNode (location: (33,5)-(33,15))
-        │   │       │       ├── operator_loc: (33,5)-(33,6) = "*"
-        │   │       │       └── expression:
-        │   │       │           @ CallNode (location: (33,6)-(33,15))
-        │   │       │           ├── flags: ∅
-        │   │       │           ├── receiver:
-        │   │       │           │   @ CallNode (location: (33,6)-(33,9))
-        │   │       │           │   ├── flags: variable_call, ignore_visibility
-        │   │       │           │   ├── receiver: ∅
-        │   │       │           │   ├── call_operator_loc: ∅
-        │   │       │           │   ├── name: :bar
-        │   │       │           │   ├── message_loc: (33,6)-(33,9) = "bar"
-        │   │       │           │   ├── opening_loc: ∅
-        │   │       │           │   ├── arguments: ∅
-        │   │       │           │   ├── closing_loc: ∅
-        │   │       │           │   └── block: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :|
-        │   │       │           ├── message_loc: (33,10)-(33,11) = "|"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments:
-        │   │       │           │   @ ArgumentsNode (location: (33,12)-(33,15))
-        │   │       │           │   ├── flags: ∅
-        │   │       │           │   └── arguments: (length: 1)
-        │   │       │           │       └── @ CallNode (location: (33,12)-(33,15))
-        │   │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │           │           ├── receiver: ∅
-        │   │       │           │           ├── call_operator_loc: ∅
-        │   │       │           │           ├── name: :baz
-        │   │       │           │           ├── message_loc: (33,12)-(33,15) = "baz"
-        │   │       │           │           ├── opening_loc: ∅
-        │   │       │           │           ├── arguments: ∅
-        │   │       │           │           ├── closing_loc: ∅
-        │   │       │           │           └── block: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       ├── then_keyword_loc: ∅
-        │   │       └── statements: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (32,0)-(32,4) = "case"
-        │   └── end_keyword_loc: (34,0)-(34,3) = "end"
-        └── @ CaseNode (location: (35,0)-(37,3))
-            ├── predicate:
-            │   @ CallNode (location: (35,5)-(35,8))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (35,5)-(35,8) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (36,0)-(36,15))
-            │       ├── keyword_loc: (36,0)-(36,4) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ SplatNode (location: (36,5)-(36,15))
-            │       │       ├── operator_loc: (36,5)-(36,6) = "*"
-            │       │       └── expression:
-            │       │           @ CallNode (location: (36,6)-(36,15))
-            │       │           ├── flags: attribute_write
-            │       │           ├── receiver:
-            │       │           │   @ CallNode (location: (36,6)-(36,9))
-            │       │           │   ├── flags: variable_call, ignore_visibility
-            │       │           │   ├── receiver: ∅
-            │       │           │   ├── call_operator_loc: ∅
-            │       │           │   ├── name: :bar
-            │       │           │   ├── message_loc: (36,6)-(36,9) = "bar"
-            │       │           │   ├── opening_loc: ∅
-            │       │           │   ├── arguments: ∅
-            │       │           │   ├── closing_loc: ∅
-            │       │           │   └── block: ∅
-            │       │           ├── call_operator_loc: (36,9)-(36,10) = "."
-            │       │           ├── name: :baz=
-            │       │           ├── message_loc: (36,10)-(36,13) = "baz"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments:
-            │       │           │   @ ArgumentsNode (location: (36,14)-(36,15))
-            │       │           │   ├── flags: ∅
-            │       │           │   └── arguments: (length: 1)
-            │       │           │       └── @ IntegerNode (location: (36,14)-(36,15))
-            │       │           │           ├── flags: decimal
-            │       │           │           └── value: 1
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       ├── then_keyword_loc: ∅
-            │       └── statements: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (35,0)-(35,4) = "case"
-            └── end_keyword_loc: (37,0)-(37,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/class.txt b/test/mri/prism/snapshots/unparser/corpus/literal/class.txt
deleted file mode 100644
index 34eb03edb3d..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/class.txt
+++ /dev/null
@@ -1,233 +0,0 @@
-@ ProgramNode (location: (1,0)-(35,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(35,3))
-    └── body: (length: 10)
-        ├── @ ClassNode (location: (1,0)-(2,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (1,0)-(1,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (1,6)-(1,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (2,0)-(2,3) = "end"
-        │   └── name: :A
-        ├── @ SingletonClassNode (location: (4,0)-(5,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (4,0)-(4,5) = "class"
-        │   ├── operator_loc: (4,6)-(4,8) = "<<"
-        │   ├── expression:
-        │   │   @ CallNode (location: (4,9)-(4,10))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (4,9)-(4,10) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        ├── @ SingletonClassNode (location: (7,0)-(9,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (7,0)-(7,5) = "class"
-        │   ├── operator_loc: (7,6)-(7,8) = "<<"
-        │   ├── expression:
-        │   │   @ CallNode (location: (7,9)-(7,10))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (7,9)-(7,10) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (8,2)-(8,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (8,2)-(8,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (8,2)-(8,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-        ├── @ ClassNode (location: (11,0)-(12,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (11,0)-(11,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (11,6)-(11,10))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (11,6)-(11,7))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (11,9)-(11,10))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (11,7)-(11,9) = "::"
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (12,0)-(12,3) = "end"
-        │   └── name: :B
-        ├── @ ClassNode (location: (14,0)-(15,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (14,0)-(14,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (14,6)-(14,13))
-        │   │   ├── parent:
-        │   │   │   @ ConstantPathNode (location: (14,6)-(14,10))
-        │   │   │   ├── parent:
-        │   │   │   │   @ ConstantReadNode (location: (14,6)-(14,7))
-        │   │   │   │   └── name: :A
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (14,9)-(14,10))
-        │   │   │   │   └── name: :B
-        │   │   │   └── delimiter_loc: (14,7)-(14,9) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (14,12)-(14,13))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (14,10)-(14,12) = "::"
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (15,0)-(15,3) = "end"
-        │   └── name: :C
-        ├── @ ClassNode (location: (17,0)-(18,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (17,0)-(17,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (17,6)-(17,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: (17,8)-(17,9) = "<"
-        │   ├── superclass:
-        │   │   @ ConstantReadNode (location: (17,10)-(17,11))
-        │   │   └── name: :B
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (18,0)-(18,3) = "end"
-        │   └── name: :A
-        ├── @ ClassNode (location: (20,0)-(21,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (20,0)-(20,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (20,6)-(20,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: (20,8)-(20,9) = "<"
-        │   ├── superclass:
-        │   │   @ ConstantPathNode (location: (20,10)-(20,14))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (20,10)-(20,11))
-        │   │   │   └── name: :B
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (20,13)-(20,14))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (20,11)-(20,13) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (21,0)-(21,3) = "end"
-        │   └── name: :A
-        ├── @ ClassNode (location: (23,0)-(24,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (23,0)-(23,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (23,6)-(23,10))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (23,6)-(23,7))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (23,9)-(23,10))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (23,7)-(23,9) = "::"
-        │   ├── inheritance_operator_loc: (23,11)-(23,12) = "<"
-        │   ├── superclass:
-        │   │   @ ConstantPathNode (location: (23,13)-(23,17))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (23,13)-(23,14))
-        │   │   │   └── name: :C
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (23,16)-(23,17))
-        │   │   │   └── name: :D
-        │   │   └── delimiter_loc: (23,14)-(23,16) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (24,0)-(24,3) = "end"
-        │   └── name: :B
-        ├── @ ClassNode (location: (26,0)-(32,3))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (26,0)-(26,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (26,6)-(26,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (27,2)-(31,5))
-        │   │   └── body: (length: 2)
-        │   │       ├── @ CallNode (location: (27,2)-(27,16))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :include
-        │   │       │   ├── message_loc: (27,2)-(27,9) = "include"
-        │   │       │   ├── opening_loc: (27,9)-(27,10) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (27,10)-(27,15))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (27,10)-(27,15))
-        │   │       │   │           ├── flags: ∅
-        │   │       │   │           ├── receiver:
-        │   │       │   │           │   @ ConstantReadNode (location: (27,10)-(27,11))
-        │   │       │   │           │   └── name: :B
-        │   │       │   │           ├── call_operator_loc: (27,11)-(27,12) = "."
-        │   │       │   │           ├── name: :new
-        │   │       │   │           ├── message_loc: (27,12)-(27,15) = "new"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (27,15)-(27,16) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ DefNode (location: (29,2)-(31,5))
-        │   │           ├── name: :foo
-        │   │           ├── name_loc: (29,6)-(29,9) = "foo"
-        │   │           ├── receiver: ∅
-        │   │           ├── parameters: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (30,4)-(30,8))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ SymbolNode (location: (30,4)-(30,8))
-        │   │           │           ├── flags: forced_us_ascii_encoding
-        │   │           │           ├── opening_loc: (30,4)-(30,5) = ":"
-        │   │           │           ├── value_loc: (30,5)-(30,8) = "bar"
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── unescaped: "bar"
-        │   │           ├── locals: []
-        │   │           ├── def_keyword_loc: (29,2)-(29,5) = "def"
-        │   │           ├── operator_loc: ∅
-        │   │           ├── lparen_loc: ∅
-        │   │           ├── rparen_loc: ∅
-        │   │           ├── equal_loc: ∅
-        │   │           └── end_keyword_loc: (31,2)-(31,5) = "end"
-        │   ├── end_keyword_loc: (32,0)-(32,3) = "end"
-        │   └── name: :A
-        └── @ ClassNode (location: (34,0)-(35,3))
-            ├── locals: []
-            ├── class_keyword_loc: (34,0)-(34,5) = "class"
-            ├── constant_path:
-            │   @ ConstantPathNode (location: (34,6)-(34,9))
-            │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (34,8)-(34,9))
-            │   │   └── name: :A
-            │   └── delimiter_loc: (34,6)-(34,8) = "::"
-            ├── inheritance_operator_loc: ∅
-            ├── superclass: ∅
-            ├── body: ∅
-            ├── end_keyword_loc: (35,0)-(35,3) = "end"
-            └── name: :A
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/control.txt b/test/mri/prism/snapshots/unparser/corpus/literal/control.txt
deleted file mode 100644
index 9bb303fed42..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/control.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-@ ProgramNode (location: (1,0)-(15,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(15,3))
-    └── body: (length: 11)
-        ├── @ NextNode (location: (1,0)-(1,4))
-        │   ├── arguments: ∅
-        │   └── keyword_loc: (1,0)-(1,4) = "next"
-        ├── @ ReturnNode (location: (2,0)-(2,6))
-        │   ├── keyword_loc: (2,0)-(2,6) = "return"
-        │   └── arguments: ∅
-        ├── @ BreakNode (location: (3,0)-(3,5))
-        │   ├── arguments: ∅
-        │   └── keyword_loc: (3,0)-(3,5) = "break"
-        ├── @ RetryNode (location: (4,0)-(4,5))
-        ├── @ RedoNode (location: (5,0)-(5,4))
-        ├── @ ReturnNode (location: (6,0)-(6,8))
-        │   ├── keyword_loc: (6,0)-(6,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (6,7)-(6,8))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ IntegerNode (location: (6,7)-(6,8))
-        │               ├── flags: decimal
-        │               └── value: 1
-        ├── @ ReturnNode (location: (7,0)-(7,11))
-        │   ├── keyword_loc: (7,0)-(7,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (7,7)-(7,11))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 2)
-        │           ├── @ IntegerNode (location: (7,7)-(7,8))
-        │           │   ├── flags: decimal
-        │           │   └── value: 1
-        │           └── @ IntegerNode (location: (7,10)-(7,11))
-        │               ├── flags: decimal
-        │               └── value: 2
-        ├── @ ReturnNode (location: (8,0)-(8,19))
-        │   ├── keyword_loc: (8,0)-(8,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (8,7)-(8,19))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ IfNode (location: (8,7)-(8,19))
-        │               ├── if_keyword_loc: ∅
-        │               ├── predicate:
-        │               │   @ TrueNode (location: (8,7)-(8,11))
-        │               ├── then_keyword_loc: (8,12)-(8,13) = "?"
-        │               ├── statements:
-        │               │   @ StatementsNode (location: (8,14)-(8,15))
-        │               │   └── body: (length: 1)
-        │               │       └── @ IntegerNode (location: (8,14)-(8,15))
-        │               │           ├── flags: decimal
-        │               │           └── value: 1
-        │               ├── consequent:
-        │               │   @ ElseNode (location: (8,16)-(8,19))
-        │               │   ├── else_keyword_loc: (8,16)-(8,17) = ":"
-        │               │   ├── statements:
-        │               │   │   @ StatementsNode (location: (8,18)-(8,19))
-        │               │   │   └── body: (length: 1)
-        │               │   │       └── @ IntegerNode (location: (8,18)-(8,19))
-        │               │   │           ├── flags: decimal
-        │               │   │           └── value: 2
-        │               │   └── end_keyword_loc: ∅
-        │               └── end_keyword_loc: ∅
-        ├── @ BreakNode (location: (9,0)-(9,18))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,6)-(9,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IfNode (location: (9,6)-(9,18))
-        │   │           ├── if_keyword_loc: ∅
-        │   │           ├── predicate:
-        │   │           │   @ TrueNode (location: (9,6)-(9,10))
-        │   │           ├── then_keyword_loc: (9,11)-(9,12) = "?"
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (9,13)-(9,14))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (9,13)-(9,14))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── consequent:
-        │   │           │   @ ElseNode (location: (9,15)-(9,18))
-        │   │           │   ├── else_keyword_loc: (9,15)-(9,16) = ":"
-        │   │           │   ├── statements:
-        │   │           │   │   @ StatementsNode (location: (9,17)-(9,18))
-        │   │           │   │   └── body: (length: 1)
-        │   │           │   │       └── @ IntegerNode (location: (9,17)-(9,18))
-        │   │           │   │           ├── flags: decimal
-        │   │           │   │           └── value: 2
-        │   │           │   └── end_keyword_loc: ∅
-        │   │           └── end_keyword_loc: ∅
-        │   └── keyword_loc: (9,0)-(9,5) = "break"
-        ├── @ NextNode (location: (10,0)-(10,17))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (10,5)-(10,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IfNode (location: (10,5)-(10,17))
-        │   │           ├── if_keyword_loc: ∅
-        │   │           ├── predicate:
-        │   │           │   @ TrueNode (location: (10,5)-(10,9))
-        │   │           ├── then_keyword_loc: (10,10)-(10,11) = "?"
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (10,12)-(10,13))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (10,12)-(10,13))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── consequent:
-        │   │           │   @ ElseNode (location: (10,14)-(10,17))
-        │   │           │   ├── else_keyword_loc: (10,14)-(10,15) = ":"
-        │   │           │   ├── statements:
-        │   │           │   │   @ StatementsNode (location: (10,16)-(10,17))
-        │   │           │   │   └── body: (length: 1)
-        │   │           │   │       └── @ IntegerNode (location: (10,16)-(10,17))
-        │   │           │   │           ├── flags: decimal
-        │   │           │   │           └── value: 2
-        │   │           │   └── end_keyword_loc: ∅
-        │   │           └── end_keyword_loc: ∅
-        │   └── keyword_loc: (10,0)-(10,4) = "next"
-        └── @ ReturnNode (location: (11,0)-(15,3))
-            ├── keyword_loc: (11,0)-(11,6) = "return"
-            └── arguments:
-                @ ArgumentsNode (location: (11,7)-(15,3))
-                ├── flags: ∅
-                └── arguments: (length: 2)
-                    ├── @ TrueNode (location: (11,7)-(11,11))
-                    └── @ IfNode (location: (11,13)-(15,3))
-                        ├── if_keyword_loc: (11,13)-(11,15) = "if"
-                        ├── predicate:
-                        │   @ TrueNode (location: (11,16)-(11,20))
-                        ├── then_keyword_loc: ∅
-                        ├── statements:
-                        │   @ StatementsNode (location: (12,2)-(12,3))
-                        │   └── body: (length: 1)
-                        │       └── @ IntegerNode (location: (12,2)-(12,3))
-                        │           ├── flags: decimal
-                        │           └── value: 1
-                        ├── consequent:
-                        │   @ ElseNode (location: (13,0)-(15,3))
-                        │   ├── else_keyword_loc: (13,0)-(13,4) = "else"
-                        │   ├── statements:
-                        │   │   @ StatementsNode (location: (14,2)-(14,3))
-                        │   │   └── body: (length: 1)
-                        │   │       └── @ IntegerNode (location: (14,2)-(14,3))
-                        │   │           ├── flags: decimal
-                        │   │           └── value: 2
-                        │   └── end_keyword_loc: (15,0)-(15,3) = "end"
-                        └── end_keyword_loc: (15,0)-(15,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/def.txt b/test/mri/prism/snapshots/unparser/corpus/literal/def.txt
deleted file mode 100644
index da285d894ba..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/def.txt
+++ /dev/null
@@ -1,1203 +0,0 @@
-@ ProgramNode (location: (1,0)-(134,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(134,3))
-    └── body: (length: 30)
-        ├── @ DefNode (location: (1,0)-(9,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (1,0)-(9,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (2,2)-(2,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (2,2)-(2,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :a
-        │   │   │           ├── message_loc: (2,2)-(2,3) = "a"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (3,0)-(4,3))
-        │   │   │   ├── keyword_loc: (3,0)-(3,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (4,2)-(4,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (4,2)-(4,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :b
-        │   │   │   │           ├── message_loc: (4,2)-(4,3) = "b"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause:
-        │   │   │   @ ElseNode (location: (5,0)-(7,6))
-        │   │   │   ├── else_keyword_loc: (5,0)-(5,4) = "else"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (6,2)-(6,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (6,2)-(6,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :c
-        │   │   │   │           ├── message_loc: (6,2)-(6,3) = "c"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── end_keyword_loc: (7,0)-(7,6) = "ensure"
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (7,0)-(9,3))
-        │   │   │   ├── ensure_keyword_loc: (7,0)-(7,6) = "ensure"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (8,2)-(8,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (8,2)-(8,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :d
-        │   │   │   │           ├── message_loc: (8,2)-(8,3) = "d"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-        │   │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-        ├── @ DefNode (location: (11,0)-(19,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (11,4)-(11,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (11,0)-(19,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (12,2)-(12,12))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ RescueModifierNode (location: (12,2)-(12,12))
-        │   │   │           ├── expression:
-        │   │   │           │   @ CallNode (location: (12,2)-(12,3))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :a
-        │   │   │           │   ├── message_loc: (12,2)-(12,3) = "a"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── keyword_loc: (12,4)-(12,10) = "rescue"
-        │   │   │           └── rescue_expression:
-        │   │   │               @ CallNode (location: (12,11)-(12,12))
-        │   │   │               ├── flags: variable_call, ignore_visibility
-        │   │   │               ├── receiver: ∅
-        │   │   │               ├── call_operator_loc: ∅
-        │   │   │               ├── name: :b
-        │   │   │               ├── message_loc: (12,11)-(12,12) = "b"
-        │   │   │               ├── opening_loc: ∅
-        │   │   │               ├── arguments: ∅
-        │   │   │               ├── closing_loc: ∅
-        │   │   │               └── block: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (13,0)-(14,3))
-        │   │   │   ├── keyword_loc: (13,0)-(13,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (14,2)-(14,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (14,2)-(14,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :b
-        │   │   │   │           ├── message_loc: (14,2)-(14,3) = "b"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause:
-        │   │   │   @ ElseNode (location: (15,0)-(17,6))
-        │   │   │   ├── else_keyword_loc: (15,0)-(15,4) = "else"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (16,2)-(16,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (16,2)-(16,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :c
-        │   │   │   │           ├── message_loc: (16,2)-(16,3) = "c"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── end_keyword_loc: (17,0)-(17,6) = "ensure"
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (17,0)-(19,3))
-        │   │   │   ├── ensure_keyword_loc: (17,0)-(17,6) = "ensure"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (18,2)-(18,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (18,2)-(18,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :d
-        │   │   │   │           ├── message_loc: (18,2)-(18,3) = "d"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        │   │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (11,0)-(11,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        ├── @ DefNode (location: (21,0)-(22,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (21,4)-(21,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (21,8)-(21,18))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 2)
-        │   │   │   ├── @ RequiredKeywordParameterNode (location: (21,8)-(21,12))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :bar
-        │   │   │   │   └── name_loc: (21,8)-(21,12) = "bar:"
-        │   │   │   └── @ RequiredKeywordParameterNode (location: (21,14)-(21,18))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :baz
-        │   │   │       └── name_loc: (21,14)-(21,18) = "baz:"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:bar, :baz]
-        │   ├── def_keyword_loc: (21,0)-(21,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (21,7)-(21,8) = "("
-        │   ├── rparen_loc: (21,18)-(21,19) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (22,0)-(22,3) = "end"
-        ├── @ DefNode (location: (24,0)-(25,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (24,4)-(24,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (24,0)-(24,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (25,0)-(25,3) = "end"
-        ├── @ DefNode (location: (27,0)-(29,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (27,4)-(27,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (28,2)-(28,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (28,2)-(28,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (28,2)-(28,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (27,0)-(27,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (29,0)-(29,3) = "end"
-        ├── @ DefNode (location: (31,0)-(37,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (31,4)-(31,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (31,0)-(37,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (32,2)-(32,5))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (32,2)-(32,5))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :foo
-        │   │   │           ├── message_loc: (32,2)-(32,5) = "foo"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (33,0)-(34,5))
-        │   │   │   ├── keyword_loc: (33,0)-(33,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (34,2)-(34,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (34,2)-(34,5))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           ├── message_loc: (34,2)-(34,5) = "bar"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (35,0)-(37,3))
-        │   │   │   ├── ensure_keyword_loc: (35,0)-(35,6) = "ensure"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (36,2)-(36,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (36,2)-(36,5))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :baz
-        │   │   │   │           ├── message_loc: (36,2)-(36,5) = "baz"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── end_keyword_loc: (37,0)-(37,3) = "end"
-        │   │   └── end_keyword_loc: (37,0)-(37,3) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (31,0)-(31,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (37,0)-(37,3) = "end"
-        ├── @ DefNode (location: (39,0)-(43,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (39,4)-(39,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (39,0)-(43,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (40,2)-(40,5))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (40,2)-(40,5))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (40,2)-(40,5) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── rescue_clause: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (41,0)-(43,3))
-        │   │   │   ├── ensure_keyword_loc: (41,0)-(41,6) = "ensure"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (42,2)-(42,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (42,2)-(42,5))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :baz
-        │   │   │   │           ├── message_loc: (42,2)-(42,5) = "baz"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── end_keyword_loc: (43,0)-(43,3) = "end"
-        │   │   └── end_keyword_loc: (43,0)-(43,3) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (39,0)-(39,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (43,0)-(43,3) = "end"
-        ├── @ DefNode (location: (45,0)-(49,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (45,4)-(45,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (45,0)-(49,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (46,2)-(46,5))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (46,2)-(46,5))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (46,2)-(46,5) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (47,0)-(48,5))
-        │   │   │   ├── keyword_loc: (47,0)-(47,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (48,2)-(48,5))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (48,2)-(48,5))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :baz
-        │   │   │   │           ├── message_loc: (48,2)-(48,5) = "baz"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause: ∅
-        │   │   └── end_keyword_loc: (49,0)-(49,3) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (45,0)-(45,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (49,0)-(49,3) = "end"
-        ├── @ DefNode (location: (51,0)-(53,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (51,4)-(51,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (51,8)-(51,11))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (51,8)-(51,11))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :bar
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (52,2)-(52,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (52,2)-(52,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (51,0)-(51,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (51,7)-(51,8) = "("
-        │   ├── rparen_loc: (51,11)-(51,12) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (53,0)-(53,3) = "end"
-        ├── @ DefNode (location: (55,0)-(57,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (55,4)-(55,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (55,8)-(55,16))
-        │   │   ├── requireds: (length: 2)
-        │   │   │   ├── @ RequiredParameterNode (location: (55,8)-(55,11))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :bar
-        │   │   │   └── @ RequiredParameterNode (location: (55,13)-(55,16))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :baz
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (56,2)-(56,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (56,2)-(56,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar, :baz]
-        │   ├── def_keyword_loc: (55,0)-(55,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (55,7)-(55,8) = "("
-        │   ├── rparen_loc: (55,16)-(55,17) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (57,0)-(57,3) = "end"
-        ├── @ DefNode (location: (59,0)-(61,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (59,4)-(59,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (59,8)-(59,16))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (59,8)-(59,16))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :bar
-        │   │   │       ├── name_loc: (59,8)-(59,11) = "bar"
-        │   │   │       ├── operator_loc: (59,12)-(59,13) = "="
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (59,14)-(59,16))
-        │   │   │           ├── body: ∅
-        │   │   │           ├── opening_loc: (59,14)-(59,15) = "("
-        │   │   │           └── closing_loc: (59,15)-(59,16) = ")"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (60,2)-(60,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (60,2)-(60,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (59,0)-(59,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (59,7)-(59,8) = "("
-        │   ├── rparen_loc: (59,16)-(59,17) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (61,0)-(61,3) = "end"
-        ├── @ DefNode (location: (63,0)-(64,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (63,4)-(63,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (63,8)-(63,24))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (63,8)-(63,24))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :bar
-        │   │   │       ├── name_loc: (63,8)-(63,11) = "bar"
-        │   │   │       ├── operator_loc: (63,12)-(63,13) = "="
-        │   │   │       └── value:
-        │   │   │           @ ParenthesesNode (location: (63,14)-(63,24))
-        │   │   │           ├── body:
-        │   │   │           │   @ StatementsNode (location: (63,15)-(63,23))
-        │   │   │           │   └── body: (length: 2)
-        │   │   │           │       ├── @ CallNode (location: (63,15)-(63,18))
-        │   │   │           │       │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │       │   ├── receiver: ∅
-        │   │   │           │       │   ├── call_operator_loc: ∅
-        │   │   │           │       │   ├── name: :baz
-        │   │   │           │       │   ├── message_loc: (63,15)-(63,18) = "baz"
-        │   │   │           │       │   ├── opening_loc: ∅
-        │   │   │           │       │   ├── arguments: ∅
-        │   │   │           │       │   ├── closing_loc: ∅
-        │   │   │           │       │   └── block: ∅
-        │   │   │           │       └── @ NilNode (location: (63,20)-(63,23))
-        │   │   │           ├── opening_loc: (63,14)-(63,15) = "("
-        │   │   │           └── closing_loc: (63,23)-(63,24) = ")"
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (63,0)-(63,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (63,7)-(63,8) = "("
-        │   ├── rparen_loc: (63,24)-(63,25) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (64,0)-(64,3) = "end"
-        ├── @ DefNode (location: (66,0)-(68,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (66,4)-(66,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (66,8)-(66,18))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (66,8)-(66,18))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :bar
-        │   │   │       ├── name_loc: (66,8)-(66,11) = "bar"
-        │   │   │       ├── operator_loc: (66,12)-(66,13) = "="
-        │   │   │       └── value:
-        │   │   │           @ TrueNode (location: (66,14)-(66,18))
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (67,2)-(67,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (67,2)-(67,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (66,0)-(66,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (66,7)-(66,8) = "("
-        │   ├── rparen_loc: (66,18)-(66,19) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (68,0)-(68,3) = "end"
-        ├── @ DefNode (location: (70,0)-(72,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (70,4)-(70,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (70,8)-(70,23))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (70,8)-(70,11))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :bar
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (70,13)-(70,23))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :baz
-        │   │   │       ├── name_loc: (70,13)-(70,16) = "baz"
-        │   │   │       ├── operator_loc: (70,17)-(70,18) = "="
-        │   │   │       └── value:
-        │   │   │           @ TrueNode (location: (70,19)-(70,23))
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (71,2)-(71,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (71,2)-(71,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar, :baz]
-        │   ├── def_keyword_loc: (70,0)-(70,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (70,7)-(70,8) = "("
-        │   ├── rparen_loc: (70,23)-(70,24) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (72,0)-(72,3) = "end"
-        ├── @ DefNode (location: (74,0)-(75,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (74,4)-(74,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (74,8)-(74,14))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (74,8)-(74,14))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :bar
-        │   │   │       ├── name_loc: (74,8)-(74,12) = "bar:"
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (74,13)-(74,14))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (74,0)-(74,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (74,7)-(74,8) = "("
-        │   ├── rparen_loc: (74,14)-(74,15) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (75,0)-(75,3) = "end"
-        ├── @ DefNode (location: (77,0)-(78,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (77,4)-(77,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (77,8)-(77,16))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (77,8)-(77,16))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :bar
-        │   │   │       ├── name_loc: (77,8)-(77,12) = "bar:"
-        │   │   │       └── value:
-        │   │   │           @ CallNode (location: (77,13)-(77,16))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :baz
-        │   │   │           ├── message_loc: (77,13)-(77,16) = "baz"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (77,0)-(77,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (77,7)-(77,8) = "("
-        │   ├── rparen_loc: (77,16)-(77,17) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (78,0)-(78,3) = "end"
-        ├── @ DefNode (location: (80,0)-(81,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (80,4)-(80,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (80,8)-(80,18))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (80,8)-(80,18))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :bar
-        │   │   │       ├── name_loc: (80,8)-(80,12) = "bar:"
-        │   │   │       └── value:
-        │   │   │           @ CallNode (location: (80,13)-(80,18))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (80,13)-(80,16) = "bar"
-        │   │   │           ├── opening_loc: (80,16)-(80,17) = "("
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: (80,17)-(80,18) = ")"
-        │   │   │           └── block: ∅
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (80,0)-(80,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (80,7)-(80,8) = "("
-        │   ├── rparen_loc: (80,18)-(80,19) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (81,0)-(81,3) = "end"
-        ├── @ DefNode (location: (83,0)-(85,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (83,4)-(83,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (83,8)-(83,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (83,8)-(83,9))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (83,8)-(83,9) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (84,2)-(84,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (84,2)-(84,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (84,2)-(84,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (83,0)-(83,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (83,7)-(83,8) = "("
-        │   ├── rparen_loc: (83,9)-(83,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (85,0)-(85,3) = "end"
-        ├── @ DefNode (location: (87,0)-(89,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (87,4)-(87,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (87,8)-(87,12))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (87,8)-(87,12))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :bar
-        │   │   │   ├── name_loc: (87,9)-(87,12) = "bar"
-        │   │   │   └── operator_loc: (87,8)-(87,9) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (88,2)-(88,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (88,2)-(88,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar]
-        │   ├── def_keyword_loc: (87,0)-(87,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (87,7)-(87,8) = "("
-        │   ├── rparen_loc: (87,12)-(87,13) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (89,0)-(89,3) = "end"
-        ├── @ DefNode (location: (91,0)-(93,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (91,4)-(91,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (91,8)-(91,17))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (91,8)-(91,11))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :bar
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (91,13)-(91,17))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── name_loc: (91,14)-(91,17) = "baz"
-        │   │   │   └── operator_loc: (91,13)-(91,14) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (92,2)-(92,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (92,2)-(92,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar, :baz]
-        │   ├── def_keyword_loc: (91,0)-(91,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (91,7)-(91,8) = "("
-        │   ├── rparen_loc: (91,17)-(91,18) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (93,0)-(93,3) = "end"
-        ├── @ DefNode (location: (95,0)-(97,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (95,4)-(95,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (95,8)-(95,24))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (95,8)-(95,18))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :baz
-        │   │   │       ├── name_loc: (95,8)-(95,11) = "baz"
-        │   │   │       ├── operator_loc: (95,12)-(95,13) = "="
-        │   │   │       └── value:
-        │   │   │           @ TrueNode (location: (95,14)-(95,18))
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (95,20)-(95,24))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :bor
-        │   │   │   ├── name_loc: (95,21)-(95,24) = "bor"
-        │   │   │   └── operator_loc: (95,20)-(95,21) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (96,2)-(96,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (96,2)-(96,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (96,2)-(96,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:baz, :bor]
-        │   ├── def_keyword_loc: (95,0)-(95,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (95,7)-(95,8) = "("
-        │   ├── rparen_loc: (95,24)-(95,25) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (97,0)-(97,3) = "end"
-        ├── @ DefNode (location: (99,0)-(101,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (99,4)-(99,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (99,8)-(99,32))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (99,8)-(99,18))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :baz
-        │   │   │       ├── name_loc: (99,8)-(99,11) = "baz"
-        │   │   │       ├── operator_loc: (99,12)-(99,13) = "="
-        │   │   │       └── value:
-        │   │   │           @ TrueNode (location: (99,14)-(99,18))
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (99,20)-(99,24))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :bor
-        │   │   │   ├── name_loc: (99,21)-(99,24) = "bor"
-        │   │   │   └── operator_loc: (99,20)-(99,21) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (99,26)-(99,32))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :block
-        │   │       ├── name_loc: (99,27)-(99,32) = "block"
-        │   │       └── operator_loc: (99,26)-(99,27) = "&"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (100,2)-(100,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (100,2)-(100,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (100,2)-(100,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:baz, :bor, :block]
-        │   ├── def_keyword_loc: (99,0)-(99,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (99,7)-(99,8) = "("
-        │   ├── rparen_loc: (99,32)-(99,33) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (101,0)-(101,3) = "end"
-        ├── @ DefNode (location: (103,0)-(105,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (103,4)-(103,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (103,8)-(103,29))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (103,8)-(103,11))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :bar
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (103,13)-(103,23))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :baz
-        │   │   │       ├── name_loc: (103,13)-(103,16) = "baz"
-        │   │   │       ├── operator_loc: (103,17)-(103,18) = "="
-        │   │   │       └── value:
-        │   │   │           @ TrueNode (location: (103,19)-(103,23))
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (103,25)-(103,29))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :bor
-        │   │   │   ├── name_loc: (103,26)-(103,29) = "bor"
-        │   │   │   └── operator_loc: (103,25)-(103,26) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (104,2)-(104,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (104,2)-(104,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar, :baz, :bor]
-        │   ├── def_keyword_loc: (103,0)-(103,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (103,7)-(103,8) = "("
-        │   ├── rparen_loc: (103,29)-(103,30) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (105,0)-(105,3) = "end"
-        ├── @ DefNode (location: (107,0)-(109,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (107,4)-(107,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (107,8)-(107,14))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (107,8)-(107,14))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :block
-        │   │       ├── name_loc: (107,9)-(107,14) = "block"
-        │   │       └── operator_loc: (107,8)-(107,9) = "&"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (108,2)-(108,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (108,2)-(108,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (108,2)-(108,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:block]
-        │   ├── def_keyword_loc: (107,0)-(107,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (107,7)-(107,8) = "("
-        │   ├── rparen_loc: (107,14)-(107,15) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (109,0)-(109,3) = "end"
-        ├── @ DefNode (location: (111,0)-(113,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (111,4)-(111,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (111,8)-(111,19))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (111,8)-(111,11))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :bar
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (111,13)-(111,19))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :block
-        │   │       ├── name_loc: (111,14)-(111,19) = "block"
-        │   │       └── operator_loc: (111,13)-(111,14) = "&"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (112,2)-(112,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (112,2)-(112,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── locals: [:bar, :block]
-        │   ├── def_keyword_loc: (111,0)-(111,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (111,7)-(111,8) = "("
-        │   ├── rparen_loc: (111,19)-(111,20) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (113,0)-(113,3) = "end"
-        ├── @ DefNode (location: (115,0)-(118,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (115,4)-(115,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (116,2)-(117,5))
-        │   │   └── body: (length: 2)
-        │   │       ├── @ CallNode (location: (116,2)-(116,5))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (116,2)-(116,5) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (117,2)-(117,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (117,2)-(117,5) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (115,0)-(115,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (118,0)-(118,3) = "end"
-        ├── @ DefNode (location: (120,0)-(121,3))
-        │   ├── name: :f
-        │   ├── name_loc: (120,4)-(120,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (120,6)-(120,11))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (120,6)-(120,11))
-        │   │   │       ├── lefts: (length: 1)
-        │   │   │       │   └── @ MultiTargetNode (location: (120,7)-(120,10))
-        │   │   │       │       ├── lefts: (length: 1)
-        │   │   │       │       │   └── @ RequiredParameterNode (location: (120,8)-(120,9))
-        │   │   │       │       │       ├── flags: ∅
-        │   │   │       │       │       └── name: :a
-        │   │   │       │       ├── rest: ∅
-        │   │   │       │       ├── rights: (length: 0)
-        │   │   │       │       ├── lparen_loc: (120,7)-(120,8) = "("
-        │   │   │       │       └── rparen_loc: (120,9)-(120,10) = ")"
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (120,6)-(120,7) = "("
-        │   │   │       └── rparen_loc: (120,10)-(120,11) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (120,0)-(120,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (120,5)-(120,6) = "("
-        │   ├── rparen_loc: (120,11)-(120,12) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (121,0)-(121,3) = "end"
-        ├── @ DefNode (location: (123,0)-(124,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (123,4)-(123,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (123,8)-(123,26))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 2)
-        │   │   │   ├── @ RequiredKeywordParameterNode (location: (123,8)-(123,12))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :bar
-        │   │   │   │   └── name_loc: (123,8)-(123,12) = "bar:"
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (123,14)-(123,26))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :baz
-        │   │   │       ├── name_loc: (123,14)-(123,18) = "baz:"
-        │   │   │       └── value:
-        │   │   │           @ StringNode (location: (123,19)-(123,26))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (123,19)-(123,20) = "\""
-        │   │   │           ├── content_loc: (123,20)-(123,25) = "value"
-        │   │   │           ├── closing_loc: (123,25)-(123,26) = "\""
-        │   │   │           └── unescaped: "value"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:bar, :baz]
-        │   ├── def_keyword_loc: (123,0)-(123,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (123,7)-(123,8) = "("
-        │   ├── rparen_loc: (123,26)-(123,27) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (124,0)-(124,3) = "end"
-        ├── @ DefNode (location: (126,0)-(130,3))
-        │   ├── name: :f
-        │   ├── name_loc: (126,4)-(126,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (127,2)-(127,12))
-        │   │   └── body: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (127,2)-(127,12))
-        │   │           ├── opening_loc: (127,2)-(127,12) = "<<-HEREDOC"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (128,0)-(128,4))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (128,0)-(128,4) = "    "
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "    "
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (128,4)-(128,7))
-        │   │           │   │   ├── opening_loc: (128,4)-(128,6) = "\#{"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── closing_loc: (128,6)-(128,7) = "}"
-        │   │           │   └── @ StringNode (location: (128,7)-(129,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (128,7)-(129,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (129,0)-(130,0) = "  HEREDOC\n"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (126,0)-(126,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (130,0)-(130,3) = "end"
-        └── @ DefNode (location: (132,0)-(134,3))
-            ├── name: :f
-            ├── name_loc: (132,4)-(132,5) = "f"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (133,2)-(133,5))
-            │   └── body: (length: 1)
-            │       └── @ StringNode (location: (133,2)-(133,5))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (133,2)-(133,4) = "%("
-            │           ├── content_loc: (133,4)-(133,4) = ""
-            │           ├── closing_loc: (133,4)-(133,5) = ")"
-            │           └── unescaped: ""
-            ├── locals: []
-            ├── def_keyword_loc: (132,0)-(132,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (134,0)-(134,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/defined.txt b/test/mri/prism/snapshots/unparser/corpus/literal/defined.txt
deleted file mode 100644
index 89145ddcda8..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/defined.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,27))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,27))
-    └── body: (length: 3)
-        ├── @ DefinedNode (location: (1,0)-(1,14))
-        │   ├── lparen_loc: (1,8)-(1,9) = "("
-        │   ├── value:
-        │   │   @ InstanceVariableReadNode (location: (1,9)-(1,13))
-        │   │   └── name: :@foo
-        │   ├── rparen_loc: (1,13)-(1,14) = ")"
-        │   └── keyword_loc: (1,0)-(1,8) = "defined?"
-        ├── @ DefinedNode (location: (2,0)-(2,13))
-        │   ├── lparen_loc: (2,8)-(2,9) = "("
-        │   ├── value:
-        │   │   @ ConstantReadNode (location: (2,9)-(2,12))
-        │   │   └── name: :Foo
-        │   ├── rparen_loc: (2,12)-(2,13) = ")"
-        │   └── keyword_loc: (2,0)-(2,8) = "defined?"
-        └── @ DefinedNode (location: (3,0)-(3,27))
-            ├── lparen_loc: (3,8)-(3,9) = "("
-            ├── value:
-            │   @ ParenthesesNode (location: (3,9)-(3,26))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (3,10)-(3,25))
-            │   │   └── body: (length: 1)
-            │   │       └── @ MultiWriteNode (location: (3,10)-(3,25))
-            │   │           ├── lefts: (length: 2)
-            │   │           │   ├── @ LocalVariableTargetNode (location: (3,11)-(3,12))
-            │   │           │   │   ├── name: :a
-            │   │           │   │   └── depth: 0
-            │   │           │   └── @ LocalVariableTargetNode (location: (3,14)-(3,15))
-            │   │           │       ├── name: :b
-            │   │           │       └── depth: 0
-            │   │           ├── rest: ∅
-            │   │           ├── rights: (length: 0)
-            │   │           ├── lparen_loc: (3,10)-(3,11) = "("
-            │   │           ├── rparen_loc: (3,15)-(3,16) = ")"
-            │   │           ├── operator_loc: (3,17)-(3,18) = "="
-            │   │           └── value:
-            │   │               @ ArrayNode (location: (3,19)-(3,25))
-            │   │               ├── flags: ∅
-            │   │               ├── elements: (length: 2)
-            │   │               │   ├── @ IntegerNode (location: (3,20)-(3,21))
-            │   │               │   │   ├── flags: decimal
-            │   │               │   │   └── value: 1
-            │   │               │   └── @ IntegerNode (location: (3,23)-(3,24))
-            │   │               │       ├── flags: decimal
-            │   │               │       └── value: 2
-            │   │               ├── opening_loc: (3,19)-(3,20) = "["
-            │   │               └── closing_loc: (3,24)-(3,25) = "]"
-            │   ├── opening_loc: (3,9)-(3,10) = "("
-            │   └── closing_loc: (3,25)-(3,26) = ")"
-            ├── rparen_loc: (3,26)-(3,27) = ")"
-            └── keyword_loc: (3,0)-(3,8) = "defined?"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/defs.txt b/test/mri/prism/snapshots/unparser/corpus/literal/defs.txt
deleted file mode 100644
index 431843cc191..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/defs.txt
+++ /dev/null
@@ -1,360 +0,0 @@
-@ ProgramNode (location: (1,0)-(40,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(40,3))
-    └── body: (length: 10)
-        ├── @ DefNode (location: (1,0)-(2,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,9)-(1,12) = "foo"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (1,4)-(1,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: (1,8)-(1,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (2,0)-(2,3) = "end"
-        ├── @ DefNode (location: (4,0)-(6,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (4,9)-(4,12) = "foo"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (4,4)-(4,8))
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (5,2)-(5,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (5,2)-(5,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (5,2)-(5,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (4,0)-(4,3) = "def"
-        │   ├── operator_loc: (4,8)-(4,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (6,0)-(6,3) = "end"
-        ├── @ DefNode (location: (8,0)-(11,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (8,9)-(8,12) = "foo"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (8,4)-(8,8))
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (9,2)-(10,5))
-        │   │   └── body: (length: 2)
-        │   │       ├── @ CallNode (location: (9,2)-(9,5))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (9,2)-(9,5) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (10,2)-(10,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (10,2)-(10,5) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (8,0)-(8,3) = "def"
-        │   ├── operator_loc: (8,8)-(8,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ DefNode (location: (13,0)-(15,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (13,8)-(13,11) = "bar"
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (13,4)-(13,7))
-        │   │   └── name: :Foo
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (14,2)-(14,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (14,2)-(14,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (14,2)-(14,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (13,0)-(13,3) = "def"
-        │   ├── operator_loc: (13,7)-(13,8) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (15,0)-(15,3) = "end"
-        ├── @ DefNode (location: (17,0)-(20,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (18,3)-(18,6) = "bar"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (17,4)-(18,2))
-        │   │   ├── body:
-        │   │   │   @ CallNode (location: (17,5)-(18,1))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (17,5)-(17,8) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block:
-        │   │   │       @ BlockNode (location: (17,9)-(18,1))
-        │   │   │       ├── locals: [:bar]
-        │   │   │       ├── parameters:
-        │   │   │       │   @ BlockParametersNode (location: (17,11)-(17,16))
-        │   │   │       │   ├── parameters:
-        │   │   │       │   │   @ ParametersNode (location: (17,12)-(17,15))
-        │   │   │       │   │   ├── requireds: (length: 1)
-        │   │   │       │   │   │   └── @ RequiredParameterNode (location: (17,12)-(17,15))
-        │   │   │       │   │   │       ├── flags: ∅
-        │   │   │       │   │   │       └── name: :bar
-        │   │   │       │   │   ├── optionals: (length: 0)
-        │   │   │       │   │   ├── rest: ∅
-        │   │   │       │   │   ├── posts: (length: 0)
-        │   │   │       │   │   ├── keywords: (length: 0)
-        │   │   │       │   │   ├── keyword_rest: ∅
-        │   │   │       │   │   └── block: ∅
-        │   │   │       │   ├── locals: (length: 0)
-        │   │   │       │   ├── opening_loc: (17,11)-(17,12) = "|"
-        │   │   │       │   └── closing_loc: (17,15)-(17,16) = "|"
-        │   │   │       ├── body: ∅
-        │   │   │       ├── opening_loc: (17,9)-(17,10) = "{"
-        │   │   │       └── closing_loc: (18,0)-(18,1) = "}"
-        │   │   ├── opening_loc: (17,4)-(17,5) = "("
-        │   │   └── closing_loc: (18,1)-(18,2) = ")"
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (19,2)-(19,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (19,2)-(19,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (19,2)-(19,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (17,0)-(17,3) = "def"
-        │   ├── operator_loc: (18,2)-(18,3) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (20,0)-(20,3) = "end"
-        ├── @ DefNode (location: (22,0)-(24,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (22,13)-(22,16) = "bar"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (22,4)-(22,12))
-        │   │   ├── body:
-        │   │   │   @ CallNode (location: (22,5)-(22,11))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (22,5)-(22,8) = "foo"
-        │   │   │   ├── opening_loc: (22,8)-(22,9) = "("
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (22,9)-(22,10))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (22,9)-(22,10))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   ├── closing_loc: (22,10)-(22,11) = ")"
-        │   │   │   └── block: ∅
-        │   │   ├── opening_loc: (22,4)-(22,5) = "("
-        │   │   └── closing_loc: (22,11)-(22,12) = ")"
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (23,2)-(23,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (23,2)-(23,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (23,2)-(23,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (22,0)-(22,3) = "def"
-        │   ├── operator_loc: (22,12)-(22,13) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (24,0)-(24,3) = "end"
-        ├── @ DefNode (location: (26,0)-(28,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (26,19)-(26,22) = "bar"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (26,4)-(26,18))
-        │   │   ├── body:
-        │   │   │   @ CallNode (location: (26,5)-(26,17))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── receiver:
-        │   │   │   │   @ ConstantPathNode (location: (26,5)-(26,13))
-        │   │   │   │   ├── parent:
-        │   │   │   │   │   @ ConstantReadNode (location: (26,5)-(26,8))
-        │   │   │   │   │   └── name: :Foo
-        │   │   │   │   ├── child:
-        │   │   │   │   │   @ ConstantReadNode (location: (26,10)-(26,13))
-        │   │   │   │   │   └── name: :Bar
-        │   │   │   │   └── delimiter_loc: (26,8)-(26,10) = "::"
-        │   │   │   ├── call_operator_loc: (26,13)-(26,14) = "."
-        │   │   │   ├── name: :baz
-        │   │   │   ├── message_loc: (26,14)-(26,17) = "baz"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── opening_loc: (26,4)-(26,5) = "("
-        │   │   └── closing_loc: (26,17)-(26,18) = ")"
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (27,2)-(27,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (27,2)-(27,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (27,2)-(27,5) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (26,0)-(26,3) = "def"
-        │   ├── operator_loc: (26,18)-(26,19) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (28,0)-(28,3) = "end"
-        ├── @ DefNode (location: (30,0)-(32,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (30,15)-(30,18) = "bar"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (30,4)-(30,14))
-        │   │   ├── body:
-        │   │   │   @ ConstantPathNode (location: (30,5)-(30,13))
-        │   │   │   ├── parent:
-        │   │   │   │   @ ConstantReadNode (location: (30,5)-(30,8))
-        │   │   │   │   └── name: :Foo
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (30,10)-(30,13))
-        │   │   │   │   └── name: :Bar
-        │   │   │   └── delimiter_loc: (30,8)-(30,10) = "::"
-        │   │   ├── opening_loc: (30,4)-(30,5) = "("
-        │   │   └── closing_loc: (30,13)-(30,14) = ")"
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (31,2)-(31,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (31,2)-(31,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (31,2)-(31,5) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (30,0)-(30,3) = "def"
-        │   ├── operator_loc: (30,14)-(30,15) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (32,0)-(32,3) = "end"
-        ├── @ DefNode (location: (34,0)-(36,3))
-        │   ├── name: :bar
-        │   ├── name_loc: (34,8)-(34,11) = "bar"
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (34,4)-(34,7))
-        │   │   └── name: :Foo
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (35,2)-(35,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (35,2)-(35,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (35,2)-(35,5) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (34,0)-(34,3) = "def"
-        │   ├── operator_loc: (34,7)-(34,8) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (36,0)-(36,3) = "end"
-        └── @ DefNode (location: (38,0)-(40,3))
-            ├── name: :bar
-            ├── name_loc: (38,8)-(38,11) = "bar"
-            ├── receiver:
-            │   @ CallNode (location: (38,4)-(38,7))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (38,4)-(38,7) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (39,2)-(39,5))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (39,2)-(39,5))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :baz
-            │           ├── message_loc: (39,2)-(39,5) = "baz"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (38,0)-(38,3) = "def"
-            ├── operator_loc: (38,7)-(38,8) = "."
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (40,0)-(40,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/dstr.txt b/test/mri/prism/snapshots/unparser/corpus/literal/dstr.txt
deleted file mode 100644
index 2f8e5da65ae..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/dstr.txt
+++ /dev/null
@@ -1,341 +0,0 @@
-@ ProgramNode (location: (1,0)-(37,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(37,1))
-    └── body: (length: 11)
-        ├── @ IfNode (location: (1,0)-(3,3))
-        │   ├── if_keyword_loc: (1,0)-(1,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (1,3)-(1,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (2,2)-(2,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (2,2)-(2,8))
-        │   │           ├── opening_loc: (2,2)-(2,3) = "\""
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (2,3)-(2,6))
-        │   │           │   │   ├── opening_loc: (2,3)-(2,5) = "\#{"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── closing_loc: (2,5)-(2,6) = "}"
-        │   │           │   └── @ StringNode (location: (2,6)-(2,7))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (2,6)-(2,7) = "a"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "a"
-        │   │           └── closing_loc: (2,7)-(2,8) = "\""
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        ├── @ IfNode (location: (4,0)-(11,3))
-        │   ├── if_keyword_loc: (4,0)-(4,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (4,3)-(4,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (5,2)-(10,3))
-        │   │   └── body: (length: 2)
-        │   │       ├── @ InterpolatedStringNode (location: (5,2)-(5,12))
-        │   │       │   ├── opening_loc: (5,2)-(5,12) = "<<-HEREDOC"
-        │   │       │   ├── parts: (length: 3)
-        │   │       │   │   ├── @ StringNode (location: (6,0)-(7,0))
-        │   │       │   │   │   ├── flags: ∅
-        │   │       │   │   │   ├── opening_loc: ∅
-        │   │       │   │   │   ├── content_loc: (6,0)-(7,0) = "a\n"
-        │   │       │   │   │   ├── closing_loc: ∅
-        │   │       │   │   │   └── unescaped: "a\n"
-        │   │       │   │   ├── @ EmbeddedStatementsNode (location: (7,0)-(7,3))
-        │   │       │   │   │   ├── opening_loc: (7,0)-(7,2) = "\#{"
-        │   │       │   │   │   ├── statements: ∅
-        │   │       │   │   │   └── closing_loc: (7,2)-(7,3) = "}"
-        │   │       │   │   └── @ StringNode (location: (7,3)-(9,0))
-        │   │       │   │       ├── flags: ∅
-        │   │       │   │       ├── opening_loc: ∅
-        │   │       │   │       ├── content_loc: (7,3)-(9,0) = "a\nb\n"
-        │   │       │   │       ├── closing_loc: ∅
-        │   │       │   │       └── unescaped: "a\nb\n"
-        │   │       │   └── closing_loc: (9,0)-(10,0) = "  HEREDOC\n"
-        │   │       └── @ CallNode (location: (10,2)-(10,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :x
-        │   │           ├── message_loc: (10,2)-(10,3) = "x"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ InterpolatedStringNode (location: (12,0)-(12,10))
-        │   ├── opening_loc: (12,0)-(12,10) = "<<-HEREDOC"
-        │   ├── parts: (length: 7)
-        │   │   ├── @ StringNode (location: (13,0)-(14,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (13,0)-(14,0) = "\\\#{}\\\#{}\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\#{}\#{}\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (14,0)-(14,3))
-        │   │   │   ├── opening_loc: (14,0)-(14,2) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (14,2)-(14,3) = "}"
-        │   │   ├── @ StringNode (location: (14,3)-(15,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (14,3)-(15,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (15,0)-(15,3))
-        │   │   │   ├── opening_loc: (15,0)-(15,2) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (15,2)-(15,3) = "}"
-        │   │   ├── @ StringNode (location: (15,3)-(16,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (15,3)-(16,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (16,0)-(16,3))
-        │   │   │   ├── opening_loc: (16,0)-(16,2) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (16,2)-(16,3) = "}"
-        │   │   └── @ StringNode (location: (16,3)-(17,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (16,3)-(17,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (17,0)-(18,0) = "HEREDOC\n"
-        ├── @ RescueModifierNode (location: (18,0)-(18,21))
-        │   ├── expression:
-        │   │   @ InterpolatedStringNode (location: (18,0)-(18,10))
-        │   │   ├── opening_loc: (18,0)-(18,10) = "<<-HEREDOC"
-        │   │   ├── parts: (length: 2)
-        │   │   │   ├── @ EmbeddedStatementsNode (location: (19,0)-(19,3))
-        │   │   │   │   ├── opening_loc: (19,0)-(19,2) = "\#{"
-        │   │   │   │   ├── statements: ∅
-        │   │   │   │   └── closing_loc: (19,2)-(19,3) = "}"
-        │   │   │   └── @ StringNode (location: (19,3)-(21,0))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── content_loc: (19,3)-(21,0) = "\na\n"
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── unescaped: "\na\n"
-        │   │   └── closing_loc: (21,0)-(22,0) = "HEREDOC\n"
-        │   ├── keyword_loc: (18,11)-(18,17) = "rescue"
-        │   └── rescue_expression:
-        │       @ NilNode (location: (18,18)-(18,21))
-        ├── @ InterpolatedStringNode (location: (22,0)-(22,6))
-        │   ├── opening_loc: (22,0)-(22,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (22,1)-(22,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (22,1)-(22,2) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ EmbeddedVariableNode (location: (22,2)-(22,5))
-        │   │       ├── operator_loc: (22,2)-(22,3) = "#"
-        │   │       └── variable:
-        │   │           @ NumberedReferenceReadNode (location: (22,3)-(22,5))
-        │   │           └── number: 1
-        │   └── closing_loc: (22,5)-(22,6) = "\""
-        ├── @ InterpolatedStringNode (location: (23,0)-(23,6))
-        │   ├── opening_loc: (23,0)-(23,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (23,1)-(23,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (23,1)-(23,2) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ EmbeddedVariableNode (location: (23,2)-(23,5))
-        │   │       ├── operator_loc: (23,2)-(23,3) = "#"
-        │   │       └── variable:
-        │   │           @ GlobalVariableReadNode (location: (23,3)-(23,5))
-        │   │           └── name: :$a
-        │   └── closing_loc: (23,5)-(23,6) = "\""
-        ├── @ InterpolatedStringNode (location: (24,0)-(24,6))
-        │   ├── opening_loc: (24,0)-(24,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (24,1)-(24,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (24,1)-(24,2) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ EmbeddedVariableNode (location: (24,2)-(24,5))
-        │   │       ├── operator_loc: (24,2)-(24,3) = "#"
-        │   │       └── variable:
-        │   │           @ InstanceVariableReadNode (location: (24,3)-(24,5))
-        │   │           └── name: :@a
-        │   └── closing_loc: (24,5)-(24,6) = "\""
-        ├── @ InterpolatedStringNode (location: (25,0)-(25,7))
-        │   ├── opening_loc: (25,0)-(25,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (25,1)-(25,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (25,1)-(25,2) = "a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ EmbeddedVariableNode (location: (25,2)-(25,6))
-        │   │       ├── operator_loc: (25,2)-(25,3) = "#"
-        │   │       └── variable:
-        │   │           @ ClassVariableReadNode (location: (25,3)-(25,6))
-        │   │           └── name: :@@a
-        │   └── closing_loc: (25,6)-(25,7) = "\""
-        ├── @ IfNode (location: (26,0)-(30,3))
-        │   ├── if_keyword_loc: (26,0)-(26,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (26,3)-(26,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (27,2)-(27,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ReturnNode (location: (27,2)-(27,19))
-        │   │           ├── keyword_loc: (27,2)-(27,8) = "return"
-        │   │           └── arguments:
-        │   │               @ ArgumentsNode (location: (27,9)-(27,19))
-        │   │               ├── flags: ∅
-        │   │               └── arguments: (length: 1)
-        │   │                   └── @ InterpolatedStringNode (location: (27,9)-(27,19))
-        │   │                       ├── opening_loc: (27,9)-(27,19) = "<<-HEREDOC"
-        │   │                       ├── parts: (length: 3)
-        │   │                       │   ├── @ StringNode (location: (28,0)-(28,4))
-        │   │                       │   │   ├── flags: ∅
-        │   │                       │   │   ├── opening_loc: ∅
-        │   │                       │   │   ├── content_loc: (28,0)-(28,4) = "    "
-        │   │                       │   │   ├── closing_loc: ∅
-        │   │                       │   │   └── unescaped: "    "
-        │   │                       │   ├── @ EmbeddedStatementsNode (location: (28,4)-(28,9))
-        │   │                       │   │   ├── opening_loc: (28,4)-(28,6) = "\#{"
-        │   │                       │   │   ├── statements:
-        │   │                       │   │   │   @ StatementsNode (location: (28,6)-(28,8))
-        │   │                       │   │   │   └── body: (length: 1)
-        │   │                       │   │   │       └── @ IntegerNode (location: (28,6)-(28,8))
-        │   │                       │   │   │           ├── flags: decimal
-        │   │                       │   │   │           └── value: 42
-        │   │                       │   │   └── closing_loc: (28,8)-(28,9) = "}"
-        │   │                       │   └── @ StringNode (location: (28,9)-(29,0))
-        │   │                       │       ├── flags: ∅
-        │   │                       │       ├── opening_loc: ∅
-        │   │                       │       ├── content_loc: (28,9)-(29,0) = "\n"
-        │   │                       │       ├── closing_loc: ∅
-        │   │                       │       └── unescaped: "\n"
-        │   │                       └── closing_loc: (29,0)-(30,0) = "  HEREDOC\n"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (30,0)-(30,3) = "end"
-        ├── @ CallNode (location: (31,0)-(31,15))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (31,0)-(31,3) = "foo"
-        │   ├── opening_loc: (31,3)-(31,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,4)-(31,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (31,4)-(31,14))
-        │   │           ├── opening_loc: (31,4)-(31,14) = "<<-HEREDOC"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (32,0)-(32,2))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (32,0)-(32,2) = "  "
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  "
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (32,2)-(32,8))
-        │   │           │   │   ├── opening_loc: (32,2)-(32,4) = "\#{"
-        │   │           │   │   ├── statements:
-        │   │           │   │   │   @ StatementsNode (location: (32,4)-(32,7))
-        │   │           │   │   │   └── body: (length: 1)
-        │   │           │   │   │       └── @ CallNode (location: (32,4)-(32,7))
-        │   │           │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │           │   │   │           ├── receiver: ∅
-        │   │           │   │   │           ├── call_operator_loc: ∅
-        │   │           │   │   │           ├── name: :bar
-        │   │           │   │   │           ├── message_loc: (32,4)-(32,7) = "bar"
-        │   │           │   │   │           ├── opening_loc: ∅
-        │   │           │   │   │           ├── arguments: ∅
-        │   │           │   │   │           ├── closing_loc: ∅
-        │   │           │   │   │           └── block: ∅
-        │   │           │   │   └── closing_loc: (32,7)-(32,8) = "}"
-        │   │           │   └── @ StringNode (location: (32,8)-(33,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (32,8)-(33,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (33,0)-(34,0) = "HEREDOC\n"
-        │   ├── closing_loc: (31,14)-(31,15) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (34,0)-(37,1))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo
-            ├── message_loc: (34,0)-(34,3) = "foo"
-            ├── opening_loc: (34,3)-(34,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (34,4)-(34,14))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InterpolatedStringNode (location: (34,4)-(34,14))
-            │           ├── opening_loc: (34,4)-(34,14) = "<<-HEREDOC"
-            │           ├── parts: (length: 3)
-            │           │   ├── @ StringNode (location: (35,0)-(35,2))
-            │           │   │   ├── flags: ∅
-            │           │   │   ├── opening_loc: ∅
-            │           │   │   ├── content_loc: (35,0)-(35,2) = "  "
-            │           │   │   ├── closing_loc: ∅
-            │           │   │   └── unescaped: "  "
-            │           │   ├── @ EmbeddedStatementsNode (location: (35,2)-(35,8))
-            │           │   │   ├── opening_loc: (35,2)-(35,4) = "\#{"
-            │           │   │   ├── statements:
-            │           │   │   │   @ StatementsNode (location: (35,4)-(35,7))
-            │           │   │   │   └── body: (length: 1)
-            │           │   │   │       └── @ CallNode (location: (35,4)-(35,7))
-            │           │   │   │           ├── flags: variable_call, ignore_visibility
-            │           │   │   │           ├── receiver: ∅
-            │           │   │   │           ├── call_operator_loc: ∅
-            │           │   │   │           ├── name: :bar
-            │           │   │   │           ├── message_loc: (35,4)-(35,7) = "bar"
-            │           │   │   │           ├── opening_loc: ∅
-            │           │   │   │           ├── arguments: ∅
-            │           │   │   │           ├── closing_loc: ∅
-            │           │   │   │           └── block: ∅
-            │           │   │   └── closing_loc: (35,7)-(35,8) = "}"
-            │           │   └── @ StringNode (location: (35,8)-(36,0))
-            │           │       ├── flags: ∅
-            │           │       ├── opening_loc: ∅
-            │           │       ├── content_loc: (35,8)-(36,0) = "\n"
-            │           │       ├── closing_loc: ∅
-            │           │       └── unescaped: "\n"
-            │           └── closing_loc: (36,0)-(37,0) = "HEREDOC\n"
-            ├── closing_loc: (34,14)-(34,15) = ")"
-            └── block:
-                @ BlockNode (location: (34,16)-(37,1))
-                ├── locals: [:x]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (34,18)-(34,21))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (34,19)-(34,20))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (34,19)-(34,20))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :x
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (34,18)-(34,19) = "|"
-                │   └── closing_loc: (34,20)-(34,21) = "|"
-                ├── body: ∅
-                ├── opening_loc: (34,16)-(34,17) = "{"
-                └── closing_loc: (37,0)-(37,1) = "}"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/empty.txt b/test/mri/prism/snapshots/unparser/corpus/literal/empty.txt
deleted file mode 100644
index 3a21ce5559c..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/empty.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,0))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,0))
-    └── body: (length: 0)
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/empty_begin.txt b/test/mri/prism/snapshots/unparser/corpus/literal/empty_begin.txt
deleted file mode 100644
index 838b4bf6f04..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/empty_begin.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,2))
-    └── body: (length: 1)
-        └── @ ParenthesesNode (location: (1,0)-(1,2))
-            ├── body: ∅
-            ├── opening_loc: (1,0)-(1,1) = "("
-            └── closing_loc: (1,1)-(1,2) = ")"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/flipflop.txt b/test/mri/prism/snapshots/unparser/corpus/literal/flipflop.txt
deleted file mode 100644
index 2794e0534f2..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/flipflop.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,3))
-    └── body: (length: 2)
-        ├── @ IfNode (location: (1,0)-(3,3))
-        │   ├── if_keyword_loc: (1,0)-(1,2) = "if"
-        │   ├── predicate:
-        │   │   @ ParenthesesNode (location: (1,3)-(1,23))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (1,4)-(1,22))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ FlipFlopNode (location: (1,4)-(1,22))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── left:
-        │   │   │           │   @ ParenthesesNode (location: (1,4)-(1,12))
-        │   │   │           │   ├── body:
-        │   │   │           │   │   @ StatementsNode (location: (1,5)-(1,11))
-        │   │   │           │   │   └── body: (length: 1)
-        │   │   │           │   │       └── @ CallNode (location: (1,5)-(1,11))
-        │   │   │           │   │           ├── flags: ∅
-        │   │   │           │   │           ├── receiver:
-        │   │   │           │   │           │   @ CallNode (location: (1,5)-(1,6))
-        │   │   │           │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   │           │   ├── receiver: ∅
-        │   │   │           │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   │           │   ├── name: :i
-        │   │   │           │   │           │   ├── message_loc: (1,5)-(1,6) = "i"
-        │   │   │           │   │           │   ├── opening_loc: ∅
-        │   │   │           │   │           │   ├── arguments: ∅
-        │   │   │           │   │           │   ├── closing_loc: ∅
-        │   │   │           │   │           │   └── block: ∅
-        │   │   │           │   │           ├── call_operator_loc: ∅
-        │   │   │           │   │           ├── name: :==
-        │   │   │           │   │           ├── message_loc: (1,7)-(1,9) = "=="
-        │   │   │           │   │           ├── opening_loc: ∅
-        │   │   │           │   │           ├── arguments:
-        │   │   │           │   │           │   @ ArgumentsNode (location: (1,10)-(1,11))
-        │   │   │           │   │           │   ├── flags: ∅
-        │   │   │           │   │           │   └── arguments: (length: 1)
-        │   │   │           │   │           │       └── @ IntegerNode (location: (1,10)-(1,11))
-        │   │   │           │   │           │           ├── flags: decimal
-        │   │   │           │   │           │           └── value: 4
-        │   │   │           │   │           ├── closing_loc: ∅
-        │   │   │           │   │           └── block: ∅
-        │   │   │           │   ├── opening_loc: (1,4)-(1,5) = "("
-        │   │   │           │   └── closing_loc: (1,11)-(1,12) = ")"
-        │   │   │           ├── right:
-        │   │   │           │   @ ParenthesesNode (location: (1,14)-(1,22))
-        │   │   │           │   ├── body:
-        │   │   │           │   │   @ StatementsNode (location: (1,15)-(1,21))
-        │   │   │           │   │   └── body: (length: 1)
-        │   │   │           │   │       └── @ CallNode (location: (1,15)-(1,21))
-        │   │   │           │   │           ├── flags: ∅
-        │   │   │           │   │           ├── receiver:
-        │   │   │           │   │           │   @ CallNode (location: (1,15)-(1,16))
-        │   │   │           │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   │           │   ├── receiver: ∅
-        │   │   │           │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   │           │   ├── name: :i
-        │   │   │           │   │           │   ├── message_loc: (1,15)-(1,16) = "i"
-        │   │   │           │   │           │   ├── opening_loc: ∅
-        │   │   │           │   │           │   ├── arguments: ∅
-        │   │   │           │   │           │   ├── closing_loc: ∅
-        │   │   │           │   │           │   └── block: ∅
-        │   │   │           │   │           ├── call_operator_loc: ∅
-        │   │   │           │   │           ├── name: :==
-        │   │   │           │   │           ├── message_loc: (1,17)-(1,19) = "=="
-        │   │   │           │   │           ├── opening_loc: ∅
-        │   │   │           │   │           ├── arguments:
-        │   │   │           │   │           │   @ ArgumentsNode (location: (1,20)-(1,21))
-        │   │   │           │   │           │   ├── flags: ∅
-        │   │   │           │   │           │   └── arguments: (length: 1)
-        │   │   │           │   │           │       └── @ IntegerNode (location: (1,20)-(1,21))
-        │   │   │           │   │           │           ├── flags: decimal
-        │   │   │           │   │           │           └── value: 4
-        │   │   │           │   │           ├── closing_loc: ∅
-        │   │   │           │   │           └── block: ∅
-        │   │   │           │   ├── opening_loc: (1,14)-(1,15) = "("
-        │   │   │           │   └── closing_loc: (1,21)-(1,22) = ")"
-        │   │   │           └── operator_loc: (1,12)-(1,14) = ".."
-        │   │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   │   └── closing_loc: (1,22)-(1,23) = ")"
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (2,2)-(2,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,2)-(2,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (2,2)-(2,5) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        └── @ IfNode (location: (4,0)-(6,3))
-            ├── if_keyword_loc: (4,0)-(4,2) = "if"
-            ├── predicate:
-            │   @ ParenthesesNode (location: (4,3)-(4,24))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (4,4)-(4,23))
-            │   │   └── body: (length: 1)
-            │   │       └── @ FlipFlopNode (location: (4,4)-(4,23))
-            │   │           ├── flags: exclude_end
-            │   │           ├── left:
-            │   │           │   @ ParenthesesNode (location: (4,4)-(4,12))
-            │   │           │   ├── body:
-            │   │           │   │   @ StatementsNode (location: (4,5)-(4,11))
-            │   │           │   │   └── body: (length: 1)
-            │   │           │   │       └── @ CallNode (location: (4,5)-(4,11))
-            │   │           │   │           ├── flags: ∅
-            │   │           │   │           ├── receiver:
-            │   │           │   │           │   @ CallNode (location: (4,5)-(4,6))
-            │   │           │   │           │   ├── flags: variable_call, ignore_visibility
-            │   │           │   │           │   ├── receiver: ∅
-            │   │           │   │           │   ├── call_operator_loc: ∅
-            │   │           │   │           │   ├── name: :i
-            │   │           │   │           │   ├── message_loc: (4,5)-(4,6) = "i"
-            │   │           │   │           │   ├── opening_loc: ∅
-            │   │           │   │           │   ├── arguments: ∅
-            │   │           │   │           │   ├── closing_loc: ∅
-            │   │           │   │           │   └── block: ∅
-            │   │           │   │           ├── call_operator_loc: ∅
-            │   │           │   │           ├── name: :==
-            │   │           │   │           ├── message_loc: (4,7)-(4,9) = "=="
-            │   │           │   │           ├── opening_loc: ∅
-            │   │           │   │           ├── arguments:
-            │   │           │   │           │   @ ArgumentsNode (location: (4,10)-(4,11))
-            │   │           │   │           │   ├── flags: ∅
-            │   │           │   │           │   └── arguments: (length: 1)
-            │   │           │   │           │       └── @ IntegerNode (location: (4,10)-(4,11))
-            │   │           │   │           │           ├── flags: decimal
-            │   │           │   │           │           └── value: 4
-            │   │           │   │           ├── closing_loc: ∅
-            │   │           │   │           └── block: ∅
-            │   │           │   ├── opening_loc: (4,4)-(4,5) = "("
-            │   │           │   └── closing_loc: (4,11)-(4,12) = ")"
-            │   │           ├── right:
-            │   │           │   @ ParenthesesNode (location: (4,15)-(4,23))
-            │   │           │   ├── body:
-            │   │           │   │   @ StatementsNode (location: (4,16)-(4,22))
-            │   │           │   │   └── body: (length: 1)
-            │   │           │   │       └── @ CallNode (location: (4,16)-(4,22))
-            │   │           │   │           ├── flags: ∅
-            │   │           │   │           ├── receiver:
-            │   │           │   │           │   @ CallNode (location: (4,16)-(4,17))
-            │   │           │   │           │   ├── flags: variable_call, ignore_visibility
-            │   │           │   │           │   ├── receiver: ∅
-            │   │           │   │           │   ├── call_operator_loc: ∅
-            │   │           │   │           │   ├── name: :i
-            │   │           │   │           │   ├── message_loc: (4,16)-(4,17) = "i"
-            │   │           │   │           │   ├── opening_loc: ∅
-            │   │           │   │           │   ├── arguments: ∅
-            │   │           │   │           │   ├── closing_loc: ∅
-            │   │           │   │           │   └── block: ∅
-            │   │           │   │           ├── call_operator_loc: ∅
-            │   │           │   │           ├── name: :==
-            │   │           │   │           ├── message_loc: (4,18)-(4,20) = "=="
-            │   │           │   │           ├── opening_loc: ∅
-            │   │           │   │           ├── arguments:
-            │   │           │   │           │   @ ArgumentsNode (location: (4,21)-(4,22))
-            │   │           │   │           │   ├── flags: ∅
-            │   │           │   │           │   └── arguments: (length: 1)
-            │   │           │   │           │       └── @ IntegerNode (location: (4,21)-(4,22))
-            │   │           │   │           │           ├── flags: decimal
-            │   │           │   │           │           └── value: 4
-            │   │           │   │           ├── closing_loc: ∅
-            │   │           │   │           └── block: ∅
-            │   │           │   ├── opening_loc: (4,15)-(4,16) = "("
-            │   │           │   └── closing_loc: (4,22)-(4,23) = ")"
-            │   │           └── operator_loc: (4,12)-(4,15) = "..."
-            │   ├── opening_loc: (4,3)-(4,4) = "("
-            │   └── closing_loc: (4,23)-(4,24) = ")"
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (5,2)-(5,5))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (5,2)-(5,5))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (5,2)-(5,5) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (6,0)-(6,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/for.txt b/test/mri/prism/snapshots/unparser/corpus/literal/for.txt
deleted file mode 100644
index 660c6b73f3f..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/for.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-@ ProgramNode (location: (1,0)-(12,3))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(12,3))
-    └── body: (length: 4)
-        ├── @ CallNode (location: (1,0)-(3,4))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :bar
-        │   ├── message_loc: (1,0)-(1,3) = "bar"
-        │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(3,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ForNode (location: (1,4)-(3,3))
-        │   │           ├── index:
-        │   │           │   @ LocalVariableTargetNode (location: (1,8)-(1,9))
-        │   │           │   ├── name: :a
-        │   │           │   └── depth: 0
-        │   │           ├── collection:
-        │   │           │   @ CallNode (location: (1,13)-(1,16))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :bar
-        │   │           │   ├── message_loc: (1,13)-(1,16) = "bar"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (2,2)-(2,5))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (2,2)-(2,5))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :baz
-        │   │           │           ├── message_loc: (2,2)-(2,5) = "baz"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── for_keyword_loc: (1,4)-(1,7) = "for"
-        │   │           ├── in_keyword_loc: (1,10)-(1,12) = "in"
-        │   │           ├── do_keyword_loc: (1,17)-(1,19) = "do"
-        │   │           └── end_keyword_loc: (3,0)-(3,3) = "end"
-        │   ├── closing_loc: (3,3)-(3,4) = ")"
-        │   └── block: ∅
-        ├── @ ForNode (location: (4,0)-(6,3))
-        │   ├── index:
-        │   │   @ LocalVariableTargetNode (location: (4,4)-(4,5))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── collection:
-        │   │   @ CallNode (location: (4,9)-(4,12))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (4,9)-(4,12) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (5,2)-(5,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (5,2)-(5,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (5,2)-(5,5) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── for_keyword_loc: (4,0)-(4,3) = "for"
-        │   ├── in_keyword_loc: (4,6)-(4,8) = "in"
-        │   ├── do_keyword_loc: (4,13)-(4,15) = "do"
-        │   └── end_keyword_loc: (6,0)-(6,3) = "end"
-        ├── @ ForNode (location: (7,0)-(9,3))
-        │   ├── index:
-        │   │   @ MultiTargetNode (location: (7,4)-(7,11))
-        │   │   ├── lefts: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (7,5)-(7,6))
-        │   │   │       ├── name: :a
-        │   │   │       └── depth: 0
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (7,8)-(7,10))
-        │   │   │   ├── operator_loc: (7,8)-(7,9) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ LocalVariableTargetNode (location: (7,9)-(7,10))
-        │   │   │       ├── name: :b
-        │   │   │       └── depth: 0
-        │   │   ├── rights: (length: 0)
-        │   │   ├── lparen_loc: (7,4)-(7,5) = "("
-        │   │   └── rparen_loc: (7,10)-(7,11) = ")"
-        │   ├── collection:
-        │   │   @ CallNode (location: (7,15)-(7,18))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (7,15)-(7,18) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (8,2)-(8,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (8,2)-(8,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :baz
-        │   │           ├── message_loc: (8,2)-(8,5) = "baz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── for_keyword_loc: (7,0)-(7,3) = "for"
-        │   ├── in_keyword_loc: (7,12)-(7,14) = "in"
-        │   ├── do_keyword_loc: (7,19)-(7,21) = "do"
-        │   └── end_keyword_loc: (9,0)-(9,3) = "end"
-        └── @ ForNode (location: (10,0)-(12,3))
-            ├── index:
-            │   @ MultiTargetNode (location: (10,4)-(10,10))
-            │   ├── lefts: (length: 2)
-            │   │   ├── @ LocalVariableTargetNode (location: (10,5)-(10,6))
-            │   │   │   ├── name: :a
-            │   │   │   └── depth: 0
-            │   │   └── @ LocalVariableTargetNode (location: (10,8)-(10,9))
-            │   │       ├── name: :b
-            │   │       └── depth: 0
-            │   ├── rest: ∅
-            │   ├── rights: (length: 0)
-            │   ├── lparen_loc: (10,4)-(10,5) = "("
-            │   └── rparen_loc: (10,9)-(10,10) = ")"
-            ├── collection:
-            │   @ CallNode (location: (10,14)-(10,17))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :bar
-            │   ├── message_loc: (10,14)-(10,17) = "bar"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (11,2)-(11,5))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (11,2)-(11,5))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :baz
-            │           ├── message_loc: (11,2)-(11,5) = "baz"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── for_keyword_loc: (10,0)-(10,3) = "for"
-            ├── in_keyword_loc: (10,11)-(10,13) = "in"
-            ├── do_keyword_loc: (10,18)-(10,20) = "do"
-            └── end_keyword_loc: (12,0)-(12,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/hookexe.txt b/test/mri/prism/snapshots/unparser/corpus/literal/hookexe.txt
deleted file mode 100644
index dabedbc5885..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/hookexe.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,1))
-    └── body: (length: 3)
-        ├── @ PreExecutionNode (location: (1,0)-(3,1))
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (2,2)-(2,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,2)-(2,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (2,2)-(2,5) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── keyword_loc: (1,0)-(1,5) = "BEGIN"
-        │   ├── opening_loc: (1,6)-(1,7) = "{"
-        │   └── closing_loc: (3,0)-(3,1) = "}"
-        ├── @ CallNode (location: (4,0)-(4,3))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :bar
-        │   ├── message_loc: (4,0)-(4,3) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ PostExecutionNode (location: (5,0)-(7,1))
-            ├── statements:
-            │   @ StatementsNode (location: (6,2)-(6,5))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (6,2)-(6,5))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :baz
-            │           ├── message_loc: (6,2)-(6,5) = "baz"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── keyword_loc: (5,0)-(5,3) = "END"
-            ├── opening_loc: (5,4)-(5,5) = "{"
-            └── closing_loc: (7,0)-(7,1) = "}"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/if.txt b/test/mri/prism/snapshots/unparser/corpus/literal/if.txt
deleted file mode 100644
index 00eeba179c6..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/if.txt
+++ /dev/null
@@ -1,288 +0,0 @@
-@ ProgramNode (location: (1,0)-(36,3))
-├── locals: [:foo, :pair]
-└── statements:
-    @ StatementsNode (location: (1,0)-(36,3))
-    └── body: (length: 10)
-        ├── @ IfNode (location: (1,0)-(3,3))
-        │   ├── if_keyword_loc: (1,0)-(1,2) = "if"
-        │   ├── predicate:
-        │   │   @ MatchLastLineNode (location: (1,3)-(1,8))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (1,3)-(1,4) = "/"
-        │   │   ├── content_loc: (1,4)-(1,7) = "foo"
-        │   │   ├── closing_loc: (1,7)-(1,8) = "/"
-        │   │   └── unescaped: "foo"
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (2,2)-(2,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,2)-(2,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (2,2)-(2,5) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        ├── @ IfNode (location: (4,0)-(6,3))
-        │   ├── if_keyword_loc: (4,0)-(4,2) = "if"
-        │   ├── predicate:
-        │   │   @ IntegerNode (location: (4,3)-(4,4))
-        │   │   ├── flags: decimal
-        │   │   └── value: 3
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (5,2)-(5,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,2)-(5,3))
-        │   │           ├── flags: decimal
-        │   │           └── value: 9
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (6,0)-(6,3) = "end"
-        ├── @ IfNode (location: (7,0)-(11,3))
-        │   ├── if_keyword_loc: (7,0)-(7,2) = "if"
-        │   ├── predicate:
-        │   │   @ IntegerNode (location: (7,3)-(7,4))
-        │   │   ├── flags: decimal
-        │   │   └── value: 4
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (8,2)-(8,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (8,2)-(8,3))
-        │   │           ├── flags: decimal
-        │   │           └── value: 5
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (9,0)-(11,3))
-        │   │   ├── else_keyword_loc: (9,0)-(9,4) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (10,2)-(10,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (10,2)-(10,3))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 6
-        │   │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ UnlessNode (location: (12,0)-(14,3))
-        │   ├── keyword_loc: (12,0)-(12,6) = "unless"
-        │   ├── predicate:
-        │   │   @ IntegerNode (location: (12,7)-(12,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 3
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (13,2)-(13,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ NilNode (location: (13,2)-(13,5))
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (14,0)-(14,3) = "end"
-        ├── @ UnlessNode (location: (15,0)-(17,3))
-        │   ├── keyword_loc: (15,0)-(15,6) = "unless"
-        │   ├── predicate:
-        │   │   @ IntegerNode (location: (15,7)-(15,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 3
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (16,2)-(16,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (16,2)-(16,3))
-        │   │           ├── flags: decimal
-        │   │           └── value: 9
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (17,0)-(17,3) = "end"
-        ├── @ IfNode (location: (18,0)-(19,3))
-        │   ├── if_keyword_loc: (18,0)-(18,2) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (18,3)-(18,6))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (18,3)-(18,6) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        ├── @ ModuleNode (location: (21,0)-(23,3))
-        │   ├── locals: [:foo]
-        │   ├── module_keyword_loc: (21,0)-(21,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (21,7)-(21,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (22,2)-(22,18))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IfNode (location: (22,2)-(22,18))
-        │   │           ├── if_keyword_loc: (22,12)-(22,14) = "if"
-        │   │           ├── predicate:
-        │   │           │   @ LocalVariableReadNode (location: (22,15)-(22,18))
-        │   │           │   ├── name: :foo
-        │   │           │   └── depth: 0
-        │   │           ├── then_keyword_loc: ∅
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (22,2)-(22,11))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ LocalVariableWriteNode (location: (22,2)-(22,11))
-        │   │           │           ├── name: :foo
-        │   │           │           ├── depth: 0
-        │   │           │           ├── name_loc: (22,2)-(22,5) = "foo"
-        │   │           │           ├── value:
-        │   │           │           │   @ CallNode (location: (22,8)-(22,11))
-        │   │           │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │           │   ├── receiver: ∅
-        │   │           │           │   ├── call_operator_loc: ∅
-        │   │           │           │   ├── name: :bar
-        │   │           │           │   ├── message_loc: (22,8)-(22,11) = "bar"
-        │   │           │           │   ├── opening_loc: ∅
-        │   │           │           │   ├── arguments: ∅
-        │   │           │           │   ├── closing_loc: ∅
-        │   │           │           │   └── block: ∅
-        │   │           │           └── operator_loc: (22,6)-(22,7) = "="
-        │   │           ├── consequent: ∅
-        │   │           └── end_keyword_loc: ∅
-        │   ├── end_keyword_loc: (23,0)-(23,3) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (25,0)-(27,3))
-        │   ├── locals: [:foo]
-        │   ├── module_keyword_loc: (25,0)-(25,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (25,7)-(25,8))
-        │   │   └── name: :B
-        │   ├── body:
-        │   │   @ StatementsNode (location: (26,2)-(26,22))
-        │   │   └── body: (length: 1)
-        │   │       └── @ UnlessNode (location: (26,2)-(26,22))
-        │   │           ├── keyword_loc: (26,12)-(26,18) = "unless"
-        │   │           ├── predicate:
-        │   │           │   @ LocalVariableReadNode (location: (26,19)-(26,22))
-        │   │           │   ├── name: :foo
-        │   │           │   └── depth: 0
-        │   │           ├── then_keyword_loc: ∅
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (26,2)-(26,11))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ LocalVariableWriteNode (location: (26,2)-(26,11))
-        │   │           │           ├── name: :foo
-        │   │           │           ├── depth: 0
-        │   │           │           ├── name_loc: (26,2)-(26,5) = "foo"
-        │   │           │           ├── value:
-        │   │           │           │   @ CallNode (location: (26,8)-(26,11))
-        │   │           │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │           │   ├── receiver: ∅
-        │   │           │           │   ├── call_operator_loc: ∅
-        │   │           │           │   ├── name: :bar
-        │   │           │           │   ├── message_loc: (26,8)-(26,11) = "bar"
-        │   │           │           │   ├── opening_loc: ∅
-        │   │           │           │   ├── arguments: ∅
-        │   │           │           │   ├── closing_loc: ∅
-        │   │           │           │   └── block: ∅
-        │   │           │           └── operator_loc: (26,6)-(26,7) = "="
-        │   │           ├── consequent: ∅
-        │   │           └── end_keyword_loc: ∅
-        │   ├── end_keyword_loc: (27,0)-(27,3) = "end"
-        │   └── name: :B
-        ├── @ UnlessNode (location: (28,0)-(30,3))
-        │   ├── keyword_loc: (28,0)-(28,6) = "unless"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (28,7)-(28,10))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (28,7)-(28,10) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (29,2)-(29,11))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableWriteNode (location: (29,2)-(29,11))
-        │   │           ├── name: :foo
-        │   │           ├── depth: 0
-        │   │           ├── name_loc: (29,2)-(29,5) = "foo"
-        │   │           ├── value:
-        │   │           │   @ CallNode (location: (29,8)-(29,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :bar
-        │   │           │   ├── message_loc: (29,8)-(29,11) = "bar"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           └── operator_loc: (29,6)-(29,7) = "="
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (30,0)-(30,3) = "end"
-        └── @ IfNode (location: (31,0)-(36,3))
-            ├── if_keyword_loc: (31,0)-(31,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (31,3)-(33,1))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (31,3)-(31,6) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (31,7)-(33,1))
-            │       ├── locals: [:pair]
-            │       ├── parameters:
-            │       │   @ BlockParametersNode (location: (31,9)-(31,15))
-            │       │   ├── parameters:
-            │       │   │   @ ParametersNode (location: (31,10)-(31,14))
-            │       │   │   ├── requireds: (length: 1)
-            │       │   │   │   └── @ RequiredParameterNode (location: (31,10)-(31,14))
-            │       │   │   │       ├── flags: ∅
-            │       │   │   │       └── name: :pair
-            │       │   │   ├── optionals: (length: 0)
-            │       │   │   ├── rest: ∅
-            │       │   │   ├── posts: (length: 0)
-            │       │   │   ├── keywords: (length: 0)
-            │       │   │   ├── keyword_rest: ∅
-            │       │   │   └── block: ∅
-            │       │   ├── locals: (length: 0)
-            │       │   ├── opening_loc: (31,9)-(31,10) = "|"
-            │       │   └── closing_loc: (31,14)-(31,15) = "|"
-            │       ├── body:
-            │       │   @ StatementsNode (location: (32,2)-(32,6))
-            │       │   └── body: (length: 1)
-            │       │       └── @ LocalVariableReadNode (location: (32,2)-(32,6))
-            │       │           ├── name: :pair
-            │       │           └── depth: 0
-            │       ├── opening_loc: (31,7)-(31,8) = "{"
-            │       └── closing_loc: (33,0)-(33,1) = "}"
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (34,2)-(35,5))
-            │   └── body: (length: 2)
-            │       ├── @ LocalVariableWriteNode (location: (34,2)-(34,13))
-            │       │   ├── name: :pair
-            │       │   ├── depth: 0
-            │       │   ├── name_loc: (34,2)-(34,6) = "pair"
-            │       │   ├── value:
-            │       │   │   @ SymbolNode (location: (34,9)-(34,13))
-            │       │   │   ├── flags: forced_us_ascii_encoding
-            │       │   │   ├── opening_loc: (34,9)-(34,10) = ":"
-            │       │   │   ├── value_loc: (34,10)-(34,13) = "foo"
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── unescaped: "foo"
-            │       │   └── operator_loc: (34,7)-(34,8) = "="
-            │       └── @ LocalVariableReadNode (location: (35,2)-(35,5))
-            │           ├── name: :foo
-            │           └── depth: 0
-            ├── consequent: ∅
-            └── end_keyword_loc: (36,0)-(36,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/kwbegin.txt b/test/mri/prism/snapshots/unparser/corpus/literal/kwbegin.txt
deleted file mode 100644
index 48e53af00e4..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/kwbegin.txt
+++ /dev/null
@@ -1,491 +0,0 @@
-@ ProgramNode (location: (1,0)-(80,3))
-├── locals: [:foo, :bar, :exception]
-└── statements:
-    @ StatementsNode (location: (1,0)-(80,3))
-    └── body: (length: 14)
-        ├── @ BeginNode (location: (1,0)-(3,3))
-        │   ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-        │   ├── statements: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (2,0)-(2,6))
-        │   │   ├── keyword_loc: (2,0)-(2,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        ├── @ BeginNode (location: (5,0)-(7,3))
-        │   ├── begin_keyword_loc: (5,0)-(5,5) = "begin"
-        │   ├── statements: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause:
-        │   │   @ EnsureNode (location: (6,0)-(7,3))
-        │   │   ├── ensure_keyword_loc: (6,0)-(6,6) = "ensure"
-        │   │   ├── statements: ∅
-        │   │   └── end_keyword_loc: (7,0)-(7,3) = "end"
-        │   └── end_keyword_loc: (7,0)-(7,3) = "end"
-        ├── @ BeginNode (location: (9,0)-(11,3))
-        │   ├── begin_keyword_loc: (9,0)-(9,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (10,2)-(10,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (10,2)-(10,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (10,2)-(10,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ BeginNode (location: (13,0)-(17,3))
-        │   ├── begin_keyword_loc: (13,0)-(13,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (14,2)-(14,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (14,2)-(14,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (14,2)-(14,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (15,0)-(16,3))
-        │   │   ├── keyword_loc: (15,0)-(15,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (16,2)-(16,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (16,2)-(16,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (16,2)-(16,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (17,0)-(17,3) = "end"
-        ├── @ BeginNode (location: (19,0)-(24,3))
-        │   ├── begin_keyword_loc: (19,0)-(19,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (20,2)-(21,3))
-        │   │   └── body: (length: 2)
-        │   │       ├── @ CallNode (location: (20,2)-(20,3))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :a
-        │   │       │   ├── message_loc: (20,2)-(20,3) = "a"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (21,2)-(21,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (21,2)-(21,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (22,0)-(23,3))
-        │   │   ├── keyword_loc: (22,0)-(22,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (23,2)-(23,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (23,2)-(23,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (23,2)-(23,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (24,0)-(24,3) = "end"
-        ├── @ BeginNode (location: (26,0)-(28,3))
-        │   ├── begin_keyword_loc: (26,0)-(26,5) = "begin"
-        │   ├── statements: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (27,0)-(27,8))
-        │   │   ├── keyword_loc: (27,0)-(27,6) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (27,7)-(27,8))
-        │   │   │       └── name: :A
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (28,0)-(28,3) = "end"
-        ├── @ BeginNode (location: (30,0)-(32,3))
-        │   ├── begin_keyword_loc: (30,0)-(30,5) = "begin"
-        │   ├── statements: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (31,0)-(31,15))
-        │   │   ├── keyword_loc: (31,0)-(31,6) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (31,7)-(31,8))
-        │   │   │       └── name: :A
-        │   │   ├── operator_loc: (31,9)-(31,11) = "=>"
-        │   │   ├── reference:
-        │   │   │   @ LocalVariableTargetNode (location: (31,12)-(31,15))
-        │   │   │   ├── name: :foo
-        │   │   │   └── depth: 0
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (32,0)-(32,3) = "end"
-        ├── @ BeginNode (location: (34,0)-(42,3))
-        │   ├── begin_keyword_loc: (34,0)-(34,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (35,2)-(35,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (35,2)-(35,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (35,2)-(35,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (36,0)-(39,3))
-        │   │   ├── keyword_loc: (36,0)-(36,6) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (36,7)-(36,8))
-        │   │   │       └── name: :A
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (37,2)-(37,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (37,2)-(37,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (37,2)-(37,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent:
-        │   │       @ RescueNode (location: (38,0)-(39,3))
-        │   │       ├── keyword_loc: (38,0)-(38,6) = "rescue"
-        │   │       ├── exceptions: (length: 1)
-        │   │       │   └── @ ConstantReadNode (location: (38,7)-(38,8))
-        │   │       │       └── name: :B
-        │   │       ├── operator_loc: ∅
-        │   │       ├── reference: ∅
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (39,2)-(39,3))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (39,2)-(39,3))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :c
-        │   │       │           ├── message_loc: (39,2)-(39,3) = "c"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause:
-        │   │   @ EnsureNode (location: (40,0)-(42,3))
-        │   │   ├── ensure_keyword_loc: (40,0)-(40,6) = "ensure"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (41,2)-(41,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (41,2)-(41,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :d
-        │   │   │           ├── message_loc: (41,2)-(41,3) = "d"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (42,0)-(42,3) = "end"
-        │   └── end_keyword_loc: (42,0)-(42,3) = "end"
-        ├── @ BeginNode (location: (44,0)-(53,3))
-        │   ├── begin_keyword_loc: (44,0)-(44,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (45,2)-(49,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ BeginNode (location: (45,2)-(49,5))
-        │   │           ├── begin_keyword_loc: (45,2)-(45,7) = "begin"
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (46,4)-(47,7))
-        │   │           │   └── body: (length: 2)
-        │   │           │       ├── @ LocalVariableReadNode (location: (46,4)-(46,7))
-        │   │           │       │   ├── name: :foo
-        │   │           │       │   └── depth: 0
-        │   │           │       └── @ CallNode (location: (47,4)-(47,7))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :bar
-        │   │           │           ├── message_loc: (47,4)-(47,7) = "bar"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── rescue_clause:
-        │   │           │   @ RescueNode (location: (48,2)-(48,8))
-        │   │           │   ├── keyword_loc: (48,2)-(48,8) = "rescue"
-        │   │           │   ├── exceptions: (length: 0)
-        │   │           │   ├── operator_loc: ∅
-        │   │           │   ├── reference: ∅
-        │   │           │   ├── statements: ∅
-        │   │           │   └── consequent: ∅
-        │   │           ├── else_clause: ∅
-        │   │           ├── ensure_clause: ∅
-        │   │           └── end_keyword_loc: (49,2)-(49,5) = "end"
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (50,0)-(52,5))
-        │   │   ├── keyword_loc: (50,0)-(50,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (51,2)-(52,5))
-        │   │   │   └── body: (length: 2)
-        │   │   │       ├── @ CallNode (location: (51,2)-(51,5))
-        │   │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │   │       │   ├── receiver: ∅
-        │   │   │       │   ├── call_operator_loc: ∅
-        │   │   │       │   ├── name: :baz
-        │   │   │       │   ├── message_loc: (51,2)-(51,5) = "baz"
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── arguments: ∅
-        │   │   │       │   ├── closing_loc: ∅
-        │   │   │       │   └── block: ∅
-        │   │   │       └── @ CallNode (location: (52,2)-(52,5))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (52,2)-(52,5) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (53,0)-(53,3) = "end"
-        ├── @ BeginNode (location: (55,0)-(58,3))
-        │   ├── begin_keyword_loc: (55,0)-(55,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (56,2)-(56,35))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RescueModifierNode (location: (56,2)-(56,35))
-        │   │           ├── expression:
-        │   │           │   @ CallNode (location: (56,2)-(56,18))
-        │   │           │   ├── flags: ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :raise
-        │   │           │   ├── message_loc: (56,2)-(56,7) = "raise"
-        │   │           │   ├── opening_loc: (56,7)-(56,8) = "("
-        │   │           │   ├── arguments:
-        │   │           │   │   @ ArgumentsNode (location: (56,8)-(56,17))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   └── arguments: (length: 1)
-        │   │           │   │       └── @ ConstantReadNode (location: (56,8)-(56,17))
-        │   │           │   │           └── name: :Exception
-        │   │           │   ├── closing_loc: (56,17)-(56,18) = ")"
-        │   │           │   └── block: ∅
-        │   │           ├── keyword_loc: (56,19)-(56,25) = "rescue"
-        │   │           └── rescue_expression:
-        │   │               @ LocalVariableWriteNode (location: (56,26)-(56,35))
-        │   │               ├── name: :foo
-        │   │               ├── depth: 0
-        │   │               ├── name_loc: (56,26)-(56,29) = "foo"
-        │   │               ├── value:
-        │   │               │   @ CallNode (location: (56,32)-(56,35))
-        │   │               │   ├── flags: variable_call, ignore_visibility
-        │   │               │   ├── receiver: ∅
-        │   │               │   ├── call_operator_loc: ∅
-        │   │               │   ├── name: :bar
-        │   │               │   ├── message_loc: (56,32)-(56,35) = "bar"
-        │   │               │   ├── opening_loc: ∅
-        │   │               │   ├── arguments: ∅
-        │   │               │   ├── closing_loc: ∅
-        │   │               │   └── block: ∅
-        │   │               └── operator_loc: (56,30)-(56,31) = "="
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (57,0)-(57,16))
-        │   │   ├── keyword_loc: (57,0)-(57,6) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (57,7)-(57,16))
-        │   │   │       └── name: :Exception
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (58,0)-(58,3) = "end"
-        ├── @ BeginNode (location: (60,0)-(64,3))
-        │   ├── begin_keyword_loc: (60,0)-(60,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (61,2)-(61,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (61,2)-(61,5))
-        │   │           ├── name: :foo
-        │   │           └── depth: 0
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (62,0)-(63,5))
-        │   │   ├── keyword_loc: (62,0)-(62,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: (62,7)-(62,9) = "=>"
-        │   │   ├── reference:
-        │   │   │   @ LocalVariableTargetNode (location: (62,10)-(62,13))
-        │   │   │   ├── name: :bar
-        │   │   │   └── depth: 0
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (63,2)-(63,5))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableReadNode (location: (63,2)-(63,5))
-        │   │   │           ├── name: :bar
-        │   │   │           └── depth: 0
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (64,0)-(64,3) = "end"
-        ├── @ BeginNode (location: (66,0)-(70,3))
-        │   ├── begin_keyword_loc: (66,0)-(66,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (67,2)-(67,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (67,2)-(67,5))
-        │   │           ├── name: :foo
-        │   │           └── depth: 0
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (68,0)-(69,5))
-        │   │   ├── keyword_loc: (68,0)-(68,6) = "rescue"
-        │   │   ├── exceptions: (length: 2)
-        │   │   │   ├── @ ConstantReadNode (location: (68,7)-(68,16))
-        │   │   │   │   └── name: :Exception
-        │   │   │   └── @ ConstantReadNode (location: (68,18)-(68,23))
-        │   │   │       └── name: :Other
-        │   │   ├── operator_loc: (68,24)-(68,26) = "=>"
-        │   │   ├── reference:
-        │   │   │   @ LocalVariableTargetNode (location: (68,27)-(68,30))
-        │   │   │   ├── name: :bar
-        │   │   │   └── depth: 0
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (69,2)-(69,5))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableReadNode (location: (69,2)-(69,5))
-        │   │   │           ├── name: :bar
-        │   │   │           └── depth: 0
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (70,0)-(70,3) = "end"
-        ├── @ BeginNode (location: (72,0)-(76,3))
-        │   ├── begin_keyword_loc: (72,0)-(72,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (73,2)-(73,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (73,2)-(73,5))
-        │   │           ├── name: :bar
-        │   │           └── depth: 0
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (74,0)-(75,5))
-        │   │   ├── keyword_loc: (74,0)-(74,6) = "rescue"
-        │   │   ├── exceptions: (length: 2)
-        │   │   │   ├── @ ConstantReadNode (location: (74,7)-(74,16))
-        │   │   │   │   └── name: :SomeError
-        │   │   │   └── @ SplatNode (location: (74,18)-(74,22))
-        │   │   │       ├── operator_loc: (74,18)-(74,19) = "*"
-        │   │   │       └── expression:
-        │   │   │           @ LocalVariableReadNode (location: (74,19)-(74,22))
-        │   │   │           ├── name: :bar
-        │   │   │           └── depth: 0
-        │   │   ├── operator_loc: (74,23)-(74,25) = "=>"
-        │   │   ├── reference:
-        │   │   │   @ LocalVariableTargetNode (location: (74,26)-(74,35))
-        │   │   │   ├── name: :exception
-        │   │   │   └── depth: 0
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (75,2)-(75,5))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (75,2)-(75,5))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :baz
-        │   │   │           ├── message_loc: (75,2)-(75,5) = "baz"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (76,0)-(76,3) = "end"
-        └── @ SingletonClassNode (location: (78,0)-(80,3))
-            ├── locals: []
-            ├── class_keyword_loc: (78,0)-(78,5) = "class"
-            ├── operator_loc: (78,6)-(78,8) = "<<"
-            ├── expression:
-            │   @ SelfNode (location: (78,9)-(78,13))
-            ├── body:
-            │   @ StatementsNode (location: (79,2)-(79,23))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (79,2)-(79,23))
-            │           ├── expression:
-            │           │   @ UndefNode (location: (79,2)-(79,12))
-            │           │   ├── names: (length: 1)
-            │           │   │   └── @ SymbolNode (location: (79,8)-(79,12))
-            │           │   │       ├── flags: forced_us_ascii_encoding
-            │           │   │       ├── opening_loc: (79,8)-(79,9) = ":"
-            │           │   │       ├── value_loc: (79,9)-(79,12) = "bar"
-            │           │   │       ├── closing_loc: ∅
-            │           │   │       └── unescaped: "bar"
-            │           │   └── keyword_loc: (79,2)-(79,7) = "undef"
-            │           ├── keyword_loc: (79,13)-(79,19) = "rescue"
-            │           └── rescue_expression:
-            │               @ NilNode (location: (79,20)-(79,23))
-            └── end_keyword_loc: (80,0)-(80,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/lambda.txt b/test/mri/prism/snapshots/unparser/corpus/literal/lambda.txt
deleted file mode 100644
index 3594787bcab..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/lambda.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-@ ProgramNode (location: (1,0)-(13,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(13,1))
-    └── body: (length: 6)
-        ├── @ CallNode (location: (1,0)-(2,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :lambda
-        │   ├── message_loc: (1,0)-(1,6) = "lambda"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,7)-(2,1))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,7)-(1,8) = "{"
-        │       └── closing_loc: (2,0)-(2,1) = "}"
-        ├── @ CallNode (location: (3,0)-(5,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :lambda
-        │   ├── message_loc: (3,0)-(3,6) = "lambda"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (3,7)-(5,1))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (3,9)-(3,15))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (3,10)-(3,14))
-        │       │   │   ├── requireds: (length: 2)
-        │       │   │   │   ├── @ RequiredParameterNode (location: (3,10)-(3,11))
-        │       │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   └── name: :a
-        │       │   │   │   └── @ RequiredParameterNode (location: (3,13)-(3,14))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :b
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (3,9)-(3,10) = "|"
-        │       │   └── closing_loc: (3,14)-(3,15) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (4,2)-(4,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ LocalVariableReadNode (location: (4,2)-(4,3))
-        │       │           ├── name: :a
-        │       │           └── depth: 0
-        │       ├── opening_loc: (3,7)-(3,8) = "{"
-        │       └── closing_loc: (5,0)-(5,1) = "}"
-        ├── @ LambdaNode (location: (6,0)-(7,1))
-        │   ├── locals: []
-        │   ├── operator_loc: (6,0)-(6,2) = "->"
-        │   ├── opening_loc: (6,5)-(6,6) = "{"
-        │   ├── closing_loc: (7,0)-(7,1) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (6,2)-(6,4))
-        │   │   ├── parameters: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (6,2)-(6,3) = "("
-        │   │   └── closing_loc: (6,3)-(6,4) = ")"
-        │   └── body: ∅
-        ├── @ LambdaNode (location: (8,0)-(9,1))
-        │   ├── locals: [:a]
-        │   ├── operator_loc: (8,0)-(8,2) = "->"
-        │   ├── opening_loc: (8,6)-(8,7) = "{"
-        │   ├── closing_loc: (9,0)-(9,1) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (8,2)-(8,5))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (8,3)-(8,4))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (8,3)-(8,4))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :a
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (8,2)-(8,3) = "("
-        │   │   └── closing_loc: (8,4)-(8,5) = ")"
-        │   └── body: ∅
-        ├── @ LambdaNode (location: (10,0)-(11,1))
-        │   ├── locals: [:a, :b]
-        │   ├── operator_loc: (10,0)-(10,2) = "->"
-        │   ├── opening_loc: (10,9)-(10,10) = "{"
-        │   ├── closing_loc: (11,0)-(11,1) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (10,2)-(10,8))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (10,3)-(10,7))
-        │   │   │   ├── requireds: (length: 2)
-        │   │   │   │   ├── @ RequiredParameterNode (location: (10,3)-(10,4))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   └── name: :a
-        │   │   │   │   └── @ RequiredParameterNode (location: (10,6)-(10,7))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :b
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (10,2)-(10,3) = "("
-        │   │   └── closing_loc: (10,7)-(10,8) = ")"
-        │   └── body: ∅
-        └── @ LambdaNode (location: (12,0)-(13,1))
-            ├── locals: [:a, :b, :c]
-            ├── operator_loc: (12,0)-(12,2) = "->"
-            ├── opening_loc: (12,12)-(12,13) = "{"
-            ├── closing_loc: (13,0)-(13,1) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (12,2)-(12,11))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (12,3)-(12,7))
-            │   │   ├── requireds: (length: 2)
-            │   │   │   ├── @ RequiredParameterNode (location: (12,3)-(12,4))
-            │   │   │   │   ├── flags: ∅
-            │   │   │   │   └── name: :a
-            │   │   │   └── @ RequiredParameterNode (location: (12,6)-(12,7))
-            │   │   │       ├── flags: ∅
-            │   │   │       └── name: :b
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 1)
-            │   │   └── @ BlockLocalVariableNode (location: (12,9)-(12,10))
-            │   │       ├── flags: ∅
-            │   │       └── name: :c
-            │   ├── opening_loc: (12,2)-(12,3) = "("
-            │   └── closing_loc: (12,10)-(12,11) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/literal.txt b/test/mri/prism/snapshots/unparser/corpus/literal/literal.txt
deleted file mode 100644
index ba7dd70b5b7..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/literal.txt
+++ /dev/null
@@ -1,1186 +0,0 @@
-@ ProgramNode (location: (1,0)-(91,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(91,2))
-    └── body: (length: 78)
-        ├── @ HashNode (location: (1,0)-(1,38))
-        │   ├── opening_loc: (1,0)-(1,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (1,2)-(1,21))
-        │   │   │   ├── key:
-        │   │   │   │   @ StringNode (location: (1,2)-(1,7))
-        │   │   │   │   ├── flags: frozen
-        │   │   │   │   ├── opening_loc: (1,2)-(1,3) = "\""
-        │   │   │   │   ├── content_loc: (1,3)-(1,6) = "foo"
-        │   │   │   │   ├── closing_loc: (1,6)-(1,7) = "\""
-        │   │   │   │   └── unescaped: "foo"
-        │   │   │   ├── value:
-        │   │   │   │   @ InterpolatedStringNode (location: (1,11)-(1,21))
-        │   │   │   │   ├── opening_loc: (1,11)-(1,21) = "<<-HEREDOC"
-        │   │   │   │   ├── parts: (length: 3)
-        │   │   │   │   │   ├── @ StringNode (location: (2,0)-(2,2))
-        │   │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   │   ├── content_loc: (2,0)-(2,2) = "  "
-        │   │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   │   └── unescaped: "  "
-        │   │   │   │   │   ├── @ EmbeddedStatementsNode (location: (2,2)-(2,5))
-        │   │   │   │   │   │   ├── opening_loc: (2,2)-(2,4) = "\#{"
-        │   │   │   │   │   │   ├── statements: ∅
-        │   │   │   │   │   │   └── closing_loc: (2,4)-(2,5) = "}"
-        │   │   │   │   │   └── @ StringNode (location: (2,5)-(3,0))
-        │   │   │   │   │       ├── flags: ∅
-        │   │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │   │       ├── content_loc: (2,5)-(3,0) = "\n"
-        │   │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │   │       └── unescaped: "\n"
-        │   │   │   │   └── closing_loc: (3,0)-(4,0) = "HEREDOC\n"
-        │   │   │   └── operator_loc: (1,8)-(1,10) = "=>"
-        │   │   └── @ AssocNode (location: (1,23)-(1,36))
-        │   │       ├── key:
-        │   │       │   @ StringNode (location: (1,23)-(1,28))
-        │   │       │   ├── flags: frozen
-        │   │       │   ├── opening_loc: (1,23)-(1,24) = "\""
-        │   │       │   ├── content_loc: (1,24)-(1,27) = "bar"
-        │   │       │   ├── closing_loc: (1,27)-(1,28) = "\""
-        │   │       │   └── unescaped: "bar"
-        │   │       ├── value:
-        │   │       │   @ SymbolNode (location: (1,32)-(1,36))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (1,32)-(1,33) = ":"
-        │   │       │   ├── value_loc: (1,33)-(1,36) = "baz"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "baz"
-        │   │       └── operator_loc: (1,29)-(1,31) = "=>"
-        │   └── closing_loc: (1,37)-(1,38) = "}"
-        ├── @ HashNode (location: (4,0)-(4,31))
-        │   ├── opening_loc: (4,0)-(4,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (4,2)-(4,14))
-        │   │   │   ├── key:
-        │   │   │   │   @ StringNode (location: (4,2)-(4,7))
-        │   │   │   │   ├── flags: frozen
-        │   │   │   │   ├── opening_loc: (4,2)-(4,3) = "\""
-        │   │   │   │   ├── content_loc: (4,3)-(4,6) = "foo"
-        │   │   │   │   ├── closing_loc: (4,6)-(4,7) = "\""
-        │   │   │   │   └── unescaped: "foo"
-        │   │   │   ├── value:
-        │   │   │   │   @ StringNode (location: (4,11)-(4,14))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── opening_loc: (4,11)-(4,13) = "%("
-        │   │   │   │   ├── content_loc: (4,13)-(4,13) = ""
-        │   │   │   │   ├── closing_loc: (4,13)-(4,14) = ")"
-        │   │   │   │   └── unescaped: ""
-        │   │   │   └── operator_loc: (4,8)-(4,10) = "=>"
-        │   │   └── @ AssocNode (location: (4,16)-(4,29))
-        │   │       ├── key:
-        │   │       │   @ StringNode (location: (4,16)-(4,21))
-        │   │       │   ├── flags: frozen
-        │   │       │   ├── opening_loc: (4,16)-(4,17) = "\""
-        │   │       │   ├── content_loc: (4,17)-(4,20) = "bar"
-        │   │       │   ├── closing_loc: (4,20)-(4,21) = "\""
-        │   │       │   └── unescaped: "bar"
-        │   │       ├── value:
-        │   │       │   @ SymbolNode (location: (4,25)-(4,29))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (4,25)-(4,26) = ":"
-        │   │       │   ├── value_loc: (4,26)-(4,29) = "baz"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "baz"
-        │   │       └── operator_loc: (4,22)-(4,24) = "=>"
-        │   └── closing_loc: (4,30)-(4,31) = "}"
-        ├── @ ArrayNode (location: (5,0)-(5,12))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (5,1)-(5,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (5,1)-(5,2) = "\""
-        │   │   │   ├── content_loc: (5,2)-(5,5) = "foo"
-        │   │   │   ├── closing_loc: (5,5)-(5,6) = "\""
-        │   │   │   └── unescaped: "foo"
-        │   │   └── @ StringNode (location: (5,8)-(5,11))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (5,8)-(5,10) = "%("
-        │   │       ├── content_loc: (5,10)-(5,10) = ""
-        │   │       ├── closing_loc: (5,10)-(5,11) = ")"
-        │   │       └── unescaped: ""
-        │   ├── opening_loc: (5,0)-(5,1) = "["
-        │   └── closing_loc: (5,11)-(5,12) = "]"
-        ├── @ CallNode (location: (6,0)-(6,15))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (6,0)-(6,13))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (6,0)-(6,1) = "a"
-        │   │   ├── opening_loc: (6,1)-(6,2) = "("
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (6,2)-(6,12))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ InterpolatedStringNode (location: (6,2)-(6,12))
-        │   │   │           ├── opening_loc: (6,2)-(6,12) = "<<-HEREDOC"
-        │   │   │           ├── parts: (length: 3)
-        │   │   │           │   ├── @ StringNode (location: (7,0)-(7,2))
-        │   │   │           │   │   ├── flags: ∅
-        │   │   │           │   │   ├── opening_loc: ∅
-        │   │   │           │   │   ├── content_loc: (7,0)-(7,2) = "  "
-        │   │   │           │   │   ├── closing_loc: ∅
-        │   │   │           │   │   └── unescaped: "  "
-        │   │   │           │   ├── @ EmbeddedStatementsNode (location: (7,2)-(7,5))
-        │   │   │           │   │   ├── opening_loc: (7,2)-(7,4) = "\#{"
-        │   │   │           │   │   ├── statements: ∅
-        │   │   │           │   │   └── closing_loc: (7,4)-(7,5) = "}"
-        │   │   │           │   └── @ StringNode (location: (7,5)-(8,0))
-        │   │   │           │       ├── flags: ∅
-        │   │   │           │       ├── opening_loc: ∅
-        │   │   │           │       ├── content_loc: (7,5)-(8,0) = "\n"
-        │   │   │           │       ├── closing_loc: ∅
-        │   │   │           │       └── unescaped: "\n"
-        │   │   │           └── closing_loc: (8,0)-(9,0) = "HEREDOC\n"
-        │   │   ├── closing_loc: (6,12)-(6,13) = ")"
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (6,13)-(6,14) = "."
-        │   ├── name: :a
-        │   ├── message_loc: (6,14)-(6,15) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (9,0)-(9,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (9,0)-(9,6))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (9,0)-(9,1) = "a"
-        │   │   ├── opening_loc: (9,1)-(9,2) = "("
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (9,2)-(9,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ StringNode (location: (9,2)-(9,5))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (9,2)-(9,4) = "%("
-        │   │   │           ├── content_loc: (9,4)-(9,4) = ""
-        │   │   │           ├── closing_loc: (9,4)-(9,5) = ")"
-        │   │   │           └── unescaped: ""
-        │   │   ├── closing_loc: (9,5)-(9,6) = ")"
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (9,6)-(9,7) = "."
-        │   ├── name: :a
-        │   ├── message_loc: (9,7)-(9,8) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ HashNode (location: (10,0)-(10,30))
-        │   ├── opening_loc: (10,0)-(10,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (10,2)-(10,21))
-        │   │   │   ├── key:
-        │   │   │   │   @ StringNode (location: (10,2)-(10,7))
-        │   │   │   │   ├── flags: frozen
-        │   │   │   │   ├── opening_loc: (10,2)-(10,3) = "\""
-        │   │   │   │   ├── content_loc: (10,3)-(10,6) = "foo"
-        │   │   │   │   ├── closing_loc: (10,6)-(10,7) = "\""
-        │   │   │   │   └── unescaped: "foo"
-        │   │   │   ├── value:
-        │   │   │   │   @ InterpolatedStringNode (location: (10,11)-(10,21))
-        │   │   │   │   ├── opening_loc: (10,11)-(10,21) = "<<-HEREDOC"
-        │   │   │   │   ├── parts: (length: 3)
-        │   │   │   │   │   ├── @ StringNode (location: (11,0)-(11,2))
-        │   │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   │   ├── content_loc: (11,0)-(11,2) = "  "
-        │   │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   │   └── unescaped: "  "
-        │   │   │   │   │   ├── @ EmbeddedStatementsNode (location: (11,2)-(11,5))
-        │   │   │   │   │   │   ├── opening_loc: (11,2)-(11,4) = "\#{"
-        │   │   │   │   │   │   ├── statements: ∅
-        │   │   │   │   │   │   └── closing_loc: (11,4)-(11,5) = "}"
-        │   │   │   │   │   └── @ StringNode (location: (11,5)-(12,0))
-        │   │   │   │   │       ├── flags: ∅
-        │   │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │   │       ├── content_loc: (11,5)-(12,0) = "\n"
-        │   │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │   │       └── unescaped: "\n"
-        │   │   │   │   └── closing_loc: (12,0)-(13,0) = "HEREDOC\n"
-        │   │   │   └── operator_loc: (10,8)-(10,10) = "=>"
-        │   │   └── @ AssocSplatNode (location: (10,23)-(10,28))
-        │   │       ├── value:
-        │   │       │   @ CallNode (location: (10,25)-(10,28))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :baz
-        │   │       │   ├── message_loc: (10,25)-(10,28) = "baz"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── operator_loc: (10,23)-(10,25) = "**"
-        │   └── closing_loc: (10,29)-(10,30) = "}"
-        ├── @ HashNode (location: (13,0)-(13,23))
-        │   ├── opening_loc: (13,0)-(13,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (13,2)-(13,14))
-        │   │   │   ├── key:
-        │   │   │   │   @ StringNode (location: (13,2)-(13,7))
-        │   │   │   │   ├── flags: frozen
-        │   │   │   │   ├── opening_loc: (13,2)-(13,3) = "\""
-        │   │   │   │   ├── content_loc: (13,3)-(13,6) = "foo"
-        │   │   │   │   ├── closing_loc: (13,6)-(13,7) = "\""
-        │   │   │   │   └── unescaped: "foo"
-        │   │   │   ├── value:
-        │   │   │   │   @ StringNode (location: (13,11)-(13,14))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── opening_loc: (13,11)-(13,13) = "%("
-        │   │   │   │   ├── content_loc: (13,13)-(13,13) = ""
-        │   │   │   │   ├── closing_loc: (13,13)-(13,14) = ")"
-        │   │   │   │   └── unescaped: ""
-        │   │   │   └── operator_loc: (13,8)-(13,10) = "=>"
-        │   │   └── @ AssocSplatNode (location: (13,16)-(13,21))
-        │   │       ├── value:
-        │   │       │   @ CallNode (location: (13,18)-(13,21))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :baz
-        │   │       │   ├── message_loc: (13,18)-(13,21) = "baz"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── operator_loc: (13,16)-(13,18) = "**"
-        │   └── closing_loc: (13,22)-(13,23) = "}"
-        ├── @ InterpolatedStringNode (location: (14,0)-(14,14))
-        │   ├── opening_loc: (14,0)-(14,1) = "\""
-        │   ├── parts: (length: 5)
-        │   │   ├── @ EmbeddedVariableNode (location: (14,1)-(14,4))
-        │   │   │   ├── operator_loc: (14,1)-(14,2) = "#"
-        │   │   │   └── variable:
-        │   │   │       @ InstanceVariableReadNode (location: (14,2)-(14,4))
-        │   │   │       └── name: :@a
-        │   │   ├── @ StringNode (location: (14,4)-(14,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (14,4)-(14,5) = " "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: " "
-        │   │   ├── @ EmbeddedVariableNode (location: (14,5)-(14,9))
-        │   │   │   ├── operator_loc: (14,5)-(14,6) = "#"
-        │   │   │   └── variable:
-        │   │   │       @ ClassVariableReadNode (location: (14,6)-(14,9))
-        │   │   │       └── name: :@@a
-        │   │   ├── @ StringNode (location: (14,9)-(14,10))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (14,9)-(14,10) = " "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: " "
-        │   │   └── @ EmbeddedVariableNode (location: (14,10)-(14,13))
-        │   │       ├── operator_loc: (14,10)-(14,11) = "#"
-        │   │       └── variable:
-        │   │           @ GlobalVariableReadNode (location: (14,11)-(14,13))
-        │   │           └── name: :$a
-        │   └── closing_loc: (14,13)-(14,14) = "\""
-        ├── @ IntegerNode (location: (15,0)-(15,1))
-        │   ├── flags: decimal
-        │   └── value: 0
-        ├── @ CallNode (location: (16,0)-(16,3))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (16,1)-(16,3))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+@
-        │   ├── message_loc: (16,0)-(16,1) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ IntegerNode (location: (17,0)-(17,1))
-        │   ├── flags: decimal
-        │   └── value: 1
-        ├── @ IntegerNode (location: (18,0)-(18,1))
-        │   ├── flags: decimal
-        │   └── value: 1
-        ├── @ RationalNode (location: (19,0)-(19,2))
-        │   └── numeric:
-        │       @ IntegerNode (location: (19,0)-(19,1))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ RationalNode (location: (20,0)-(20,4))
-        │   └── numeric:
-        │       @ FloatNode (location: (20,0)-(20,3))
-        │       └── value: 1.5
-        ├── @ RationalNode (location: (21,0)-(21,4))
-        │   └── numeric:
-        │       @ FloatNode (location: (21,0)-(21,3))
-        │       └── value: 1.3
-        ├── @ ImaginaryNode (location: (22,0)-(22,2))
-        │   └── numeric:
-        │       @ IntegerNode (location: (22,0)-(22,1))
-        │       ├── flags: decimal
-        │       └── value: 5
-        ├── @ ImaginaryNode (location: (23,0)-(23,3))
-        │   └── numeric:
-        │       @ IntegerNode (location: (23,0)-(23,2))
-        │       ├── flags: decimal
-        │       └── value: -5
-        ├── @ ImaginaryNode (location: (24,0)-(24,4))
-        │   └── numeric:
-        │       @ FloatNode (location: (24,0)-(24,3))
-        │       └── value: 0.6
-        ├── @ ImaginaryNode (location: (25,0)-(25,5))
-        │   └── numeric:
-        │       @ FloatNode (location: (25,0)-(25,4))
-        │       └── value: -0.6
-        ├── @ ImaginaryNode (location: (26,0)-(26,32))
-        │   └── numeric:
-        │       @ IntegerNode (location: (26,0)-(26,31))
-        │       ├── flags: decimal
-        │       └── value: 1000000000000000000000000000000
-        ├── @ ImaginaryNode (location: (27,0)-(27,3))
-        │   └── numeric:
-        │       @ RationalNode (location: (27,0)-(27,2))
-        │       └── numeric:
-        │           @ IntegerNode (location: (27,0)-(27,1))
-        │           ├── flags: decimal
-        │           └── value: 1
-        ├── @ InterpolatedStringNode (location: (28,0)-(28,11))
-        │   ├── opening_loc: ∅
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (28,0)-(28,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (28,0)-(28,1) = "\""
-        │   │   │   ├── content_loc: (28,1)-(28,4) = "foo"
-        │   │   │   ├── closing_loc: (28,4)-(28,5) = "\""
-        │   │   │   └── unescaped: "foo"
-        │   │   └── @ StringNode (location: (28,6)-(28,11))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (28,6)-(28,7) = "\""
-        │   │       ├── content_loc: (28,7)-(28,10) = "bar"
-        │   │       ├── closing_loc: (28,10)-(28,11) = "\""
-        │   │       └── unescaped: "bar"
-        │   └── closing_loc: ∅
-        ├── @ InterpolatedStringNode (location: (29,0)-(29,15))
-        │   ├── opening_loc: (29,0)-(29,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (29,1)-(29,8))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (29,1)-(29,8) = "foobar "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foobar "
-        │   │   └── @ EmbeddedStatementsNode (location: (29,8)-(29,14))
-        │   │       ├── opening_loc: (29,8)-(29,10) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (29,10)-(29,13))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (29,10)-(29,13))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :baz
-        │   │       │           ├── message_loc: (29,10)-(29,13) = "baz"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       └── closing_loc: (29,13)-(29,14) = "}"
-        │   └── closing_loc: (29,14)-(29,15) = "\""
-        ├── @ InterpolatedStringNode (location: (30,0)-(30,12))
-        │   ├── opening_loc: (30,0)-(30,1) = "\""
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (30,1)-(30,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (30,1)-(30,4) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── @ EmbeddedStatementsNode (location: (30,4)-(30,8))
-        │   │   │   ├── opening_loc: (30,4)-(30,6) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (30,6)-(30,7))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ IntegerNode (location: (30,6)-(30,7))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   └── closing_loc: (30,7)-(30,8) = "}"
-        │   │   └── @ StringNode (location: (30,8)-(30,11))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (30,8)-(30,11) = "bar"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "bar"
-        │   └── closing_loc: (30,11)-(30,12) = "\""
-        ├── @ InterpolatedStringNode (location: (31,0)-(31,9))
-        │   ├── opening_loc: (31,0)-(31,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (31,1)-(31,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (31,1)-(31,5) = "\\\\\\\\"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\\\\"
-        │   │   └── @ EmbeddedStatementsNode (location: (31,5)-(31,8))
-        │   │       ├── opening_loc: (31,5)-(31,7) = "\#{"
-        │   │       ├── statements: ∅
-        │   │       └── closing_loc: (31,7)-(31,8) = "}"
-        │   └── closing_loc: (31,8)-(31,9) = "\""
-        ├── @ InterpolatedStringNode (location: (32,0)-(32,9))
-        │   ├── opening_loc: (32,0)-(32,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ EmbeddedStatementsNode (location: (32,1)-(32,4))
-        │   │   │   ├── opening_loc: (32,1)-(32,3) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (32,3)-(32,4) = "}"
-        │   │   └── @ StringNode (location: (32,4)-(32,8))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (32,4)-(32,8) = "\\\#{}"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#{}"
-        │   └── closing_loc: (32,8)-(32,9) = "\""
-        ├── @ InterpolatedStringNode (location: (33,0)-(33,9))
-        │   ├── opening_loc: (33,0)-(33,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (33,1)-(33,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (33,1)-(33,5) = "\\\#{}"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\#{}"
-        │   │   └── @ EmbeddedStatementsNode (location: (33,5)-(33,8))
-        │   │       ├── opening_loc: (33,5)-(33,7) = "\#{"
-        │   │       ├── statements: ∅
-        │   │       └── closing_loc: (33,7)-(33,8) = "}"
-        │   └── closing_loc: (33,8)-(33,9) = "\""
-        ├── @ StringNode (location: (34,0)-(34,15))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (34,0)-(34,1) = "\""
-        │   ├── content_loc: (34,1)-(34,14) = "foo\\\\\\\#{@bar}"
-        │   ├── closing_loc: (34,14)-(34,15) = "\""
-        │   └── unescaped: "foo\\\#{@bar}"
-        ├── @ StringNode (location: (35,0)-(35,4))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (35,0)-(35,1) = "\""
-        │   ├── content_loc: (35,1)-(35,3) = "\\\""
-        │   ├── closing_loc: (35,3)-(35,4) = "\""
-        │   └── unescaped: "\""
-        ├── @ StringNode (location: (36,0)-(36,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (36,0)-(36,1) = "\""
-        │   ├── content_loc: (36,1)-(36,8) = "foo bar"
-        │   ├── closing_loc: (36,8)-(36,9) = "\""
-        │   └── unescaped: "foo bar"
-        ├── @ StringNode (location: (37,0)-(37,10))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (37,0)-(37,1) = "\""
-        │   ├── content_loc: (37,1)-(37,9) = "foo\\nbar"
-        │   ├── closing_loc: (37,9)-(37,10) = "\""
-        │   └── unescaped: "foo\nbar"
-        ├── @ XStringNode (location: (38,0)-(38,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (38,0)-(38,1) = "`"
-        │   ├── content_loc: (38,1)-(38,4) = "foo"
-        │   ├── closing_loc: (38,4)-(38,5) = "`"
-        │   └── unescaped: "foo"
-        ├── @ InterpolatedXStringNode (location: (39,0)-(39,12))
-        │   ├── opening_loc: (39,0)-(39,1) = "`"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (39,1)-(39,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (39,1)-(39,4) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   └── @ EmbeddedStatementsNode (location: (39,4)-(39,11))
-        │   │       ├── opening_loc: (39,4)-(39,6) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (39,6)-(39,10))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ InstanceVariableReadNode (location: (39,6)-(39,10))
-        │   │       │           └── name: :@bar
-        │   │       └── closing_loc: (39,10)-(39,11) = "}"
-        │   └── closing_loc: (39,11)-(39,12) = "`"
-        ├── @ XStringNode (location: (40,0)-(40,3))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (40,0)-(40,1) = "`"
-        │   ├── content_loc: (40,1)-(40,2) = ")"
-        │   ├── closing_loc: (40,2)-(40,3) = "`"
-        │   └── unescaped: ")"
-        ├── @ XStringNode (location: (41,0)-(41,4))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (41,0)-(41,1) = "`"
-        │   ├── content_loc: (41,1)-(41,3) = "\\`"
-        │   ├── closing_loc: (41,3)-(41,4) = "`"
-        │   └── unescaped: "`"
-        ├── @ XStringNode (location: (42,0)-(42,3))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (42,0)-(42,1) = "`"
-        │   ├── content_loc: (42,1)-(42,2) = "\""
-        │   ├── closing_loc: (42,2)-(42,3) = "`"
-        │   └── unescaped: "\""
-        ├── @ SymbolNode (location: (43,0)-(43,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (43,0)-(43,1) = ":"
-        │   ├── value_loc: (43,1)-(43,4) = "foo"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "foo"
-        ├── @ SymbolNode (location: (44,0)-(44,6))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (44,0)-(44,2) = ":\""
-        │   ├── value_loc: (44,2)-(44,5) = "A B"
-        │   ├── closing_loc: (44,5)-(44,6) = "\""
-        │   └── unescaped: "A B"
-        ├── @ SymbolNode (location: (45,0)-(45,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (45,0)-(45,1) = ":"
-        │   ├── value_loc: (45,1)-(45,4) = "foo"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "foo"
-        ├── @ SymbolNode (location: (46,0)-(46,6))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (46,0)-(46,2) = ":\""
-        │   ├── value_loc: (46,2)-(46,5) = "A B"
-        │   ├── closing_loc: (46,5)-(46,6) = "\""
-        │   └── unescaped: "A B"
-        ├── @ SymbolNode (location: (47,0)-(47,7))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (47,0)-(47,2) = ":\""
-        │   ├── value_loc: (47,2)-(47,6) = "A\\\"B"
-        │   ├── closing_loc: (47,6)-(47,7) = "\""
-        │   └── unescaped: "A\"B"
-        ├── @ SymbolNode (location: (48,0)-(48,3))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (48,0)-(48,2) = ":\""
-        │   ├── value_loc: (1,0)-(1,0) = ""
-        │   ├── closing_loc: (48,2)-(48,3) = "\""
-        │   └── unescaped: ""
-        ├── @ RegularExpressionNode (location: (49,0)-(49,5))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (49,0)-(49,1) = "/"
-        │   ├── content_loc: (49,1)-(49,4) = "foo"
-        │   ├── closing_loc: (49,4)-(49,5) = "/"
-        │   └── unescaped: "foo"
-        ├── @ RegularExpressionNode (location: (50,0)-(50,28))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (50,0)-(50,1) = "/"
-        │   ├── content_loc: (50,1)-(50,27) = "[^-+',.\\/:@[:alnum:]\\[\\]]+"
-        │   ├── closing_loc: (50,27)-(50,28) = "/"
-        │   └── unescaped: "[^-+',./:@[:alnum:]\\[\\]]+"
-        ├── @ InterpolatedRegularExpressionNode (location: (51,0)-(51,12))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (51,0)-(51,1) = "/"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (51,1)-(51,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (51,1)-(51,4) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   └── @ EmbeddedStatementsNode (location: (51,4)-(51,11))
-        │   │       ├── opening_loc: (51,4)-(51,6) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (51,6)-(51,10))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ InstanceVariableReadNode (location: (51,6)-(51,10))
-        │   │       │           └── name: :@bar
-        │   │       └── closing_loc: (51,10)-(51,11) = "}"
-        │   └── closing_loc: (51,11)-(51,12) = "/"
-        ├── @ InterpolatedRegularExpressionNode (location: (52,0)-(52,15))
-        │   ├── flags: ignore_case, extended, multi_line
-        │   ├── opening_loc: (52,0)-(52,1) = "/"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (52,1)-(52,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (52,1)-(52,4) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   └── @ EmbeddedStatementsNode (location: (52,4)-(52,11))
-        │   │       ├── opening_loc: (52,4)-(52,6) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (52,6)-(52,10))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ InstanceVariableReadNode (location: (52,6)-(52,10))
-        │   │       │           └── name: :@bar
-        │   │       └── closing_loc: (52,10)-(52,11) = "}"
-        │   └── closing_loc: (52,11)-(52,15) = "/imx"
-        ├── @ InterpolatedRegularExpressionNode (location: (53,0)-(53,13))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (53,0)-(53,1) = "/"
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedStatementsNode (location: (53,1)-(53,12))
-        │   │       ├── opening_loc: (53,1)-(53,3) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (53,3)-(53,11))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ StringNode (location: (53,3)-(53,11))
-        │   │       │           ├── flags: ∅
-        │   │       │           ├── opening_loc: (53,3)-(53,4) = "\""
-        │   │       │           ├── content_loc: (53,4)-(53,10) = "\\u0000"
-        │   │       │           ├── closing_loc: (53,10)-(53,11) = "\""
-        │   │       │           └── unescaped: "\u0000"
-        │   │       └── closing_loc: (53,11)-(53,12) = "}"
-        │   └── closing_loc: (53,12)-(53,13) = "/"
-        ├── @ RegularExpressionNode (location: (54,0)-(54,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (54,0)-(54,1) = "/"
-        │   ├── content_loc: (54,1)-(54,3) = "\\n"
-        │   ├── closing_loc: (54,3)-(54,4) = "/"
-        │   └── unescaped: "\\n"
-        ├── @ RegularExpressionNode (location: (55,0)-(55,4))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (55,0)-(55,1) = "/"
-        │   ├── content_loc: (55,1)-(55,3) = "\\n"
-        │   ├── closing_loc: (55,3)-(55,4) = "/"
-        │   └── unescaped: "\\n"
-        ├── @ RegularExpressionNode (location: (56,0)-(56,5))
-        │   ├── flags: extended, forced_us_ascii_encoding
-        │   ├── opening_loc: (56,0)-(56,1) = "/"
-        │   ├── content_loc: (56,1)-(56,3) = "\\n"
-        │   ├── closing_loc: (56,3)-(56,5) = "/x"
-        │   └── unescaped: "\\n"
-        ├── @ RegularExpressionNode (location: (57,0)-(57,7))
-        │   ├── flags: extended, forced_us_ascii_encoding
-        │   ├── opening_loc: (57,0)-(57,1) = "/"
-        │   ├── content_loc: (57,1)-(57,5) = "\\/\\/"
-        │   ├── closing_loc: (57,5)-(57,7) = "/x"
-        │   └── unescaped: "//"
-        ├── @ InterpolatedSymbolNode (location: (58,0)-(58,15))
-        │   ├── opening_loc: (58,0)-(58,2) = ":\""
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (58,2)-(58,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (58,2)-(58,5) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   ├── @ EmbeddedStatementsNode (location: (58,5)-(58,11))
-        │   │   │   ├── opening_loc: (58,5)-(58,7) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (58,7)-(58,10))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (58,7)-(58,10))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           ├── message_loc: (58,7)-(58,10) = "bar"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (58,10)-(58,11) = "}"
-        │   │   └── @ StringNode (location: (58,11)-(58,14))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (58,11)-(58,14) = "baz"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "baz"
-        │   └── closing_loc: (58,14)-(58,15) = "\""
-        ├── @ InterpolatedSymbolNode (location: (59,0)-(59,11))
-        │   ├── opening_loc: (59,0)-(59,2) = ":\""
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedStatementsNode (location: (59,2)-(59,10))
-        │   │       ├── opening_loc: (59,2)-(59,4) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (59,4)-(59,9))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ StringNode (location: (59,4)-(59,9))
-        │   │       │           ├── flags: ∅
-        │   │       │           ├── opening_loc: (59,4)-(59,5) = "\""
-        │   │       │           ├── content_loc: (59,5)-(59,8) = "foo"
-        │   │       │           ├── closing_loc: (59,8)-(59,9) = "\""
-        │   │       │           └── unescaped: "foo"
-        │   │       └── closing_loc: (59,9)-(59,10) = "}"
-        │   └── closing_loc: (59,10)-(59,11) = "\""
-        ├── @ RangeNode (location: (60,0)-(60,14))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ ParenthesesNode (location: (60,0)-(60,11))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (60,1)-(60,10))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (60,1)-(60,10))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ FloatNode (location: (60,1)-(60,4))
-        │   │   │           │   └── value: 0.0
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :/
-        │   │   │           ├── message_loc: (60,5)-(60,6) = "/"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (60,7)-(60,10))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ FloatNode (location: (60,7)-(60,10))
-        │   │   │           │           └── value: 0.0
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (60,0)-(60,1) = "("
-        │   │   └── closing_loc: (60,10)-(60,11) = ")"
-        │   ├── right:
-        │   │   @ IntegerNode (location: (60,13)-(60,14))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (60,11)-(60,13) = ".."
-        ├── @ RangeNode (location: (61,0)-(61,14))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ IntegerNode (location: (61,0)-(61,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ ParenthesesNode (location: (61,3)-(61,14))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (61,4)-(61,13))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (61,4)-(61,13))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ FloatNode (location: (61,4)-(61,7))
-        │   │   │           │   └── value: 0.0
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :/
-        │   │   │           ├── message_loc: (61,8)-(61,9) = "/"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (61,10)-(61,13))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ FloatNode (location: (61,10)-(61,13))
-        │   │   │           │           └── value: 0.0
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (61,3)-(61,4) = "("
-        │   │   └── closing_loc: (61,13)-(61,14) = ")"
-        │   └── operator_loc: (61,1)-(61,3) = ".."
-        ├── @ RangeNode (location: (62,0)-(62,16))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ ParenthesesNode (location: (62,0)-(62,11))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (62,1)-(62,10))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (62,1)-(62,10))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ FloatNode (location: (62,1)-(62,4))
-        │   │   │           │   └── value: 0.0
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :/
-        │   │   │           ├── message_loc: (62,5)-(62,6) = "/"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (62,7)-(62,10))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ FloatNode (location: (62,7)-(62,10))
-        │   │   │           │           └── value: 0.0
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (62,0)-(62,1) = "("
-        │   │   └── closing_loc: (62,10)-(62,11) = ")"
-        │   ├── right:
-        │   │   @ IntegerNode (location: (62,13)-(62,16))
-        │   │   ├── flags: decimal
-        │   │   └── value: 100
-        │   └── operator_loc: (62,11)-(62,13) = ".."
-        ├── @ FloatNode (location: (63,0)-(63,4))
-        │   └── value: -0.1
-        ├── @ FloatNode (location: (64,0)-(64,3))
-        │   └── value: 0.1
-        ├── @ ArrayNode (location: (65,0)-(65,6))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ IntegerNode (location: (65,1)-(65,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── @ IntegerNode (location: (65,4)-(65,5))
-        │   │       ├── flags: decimal
-        │   │       └── value: 2
-        │   ├── opening_loc: (65,0)-(65,1) = "["
-        │   └── closing_loc: (65,5)-(65,6) = "]"
-        ├── @ ArrayNode (location: (66,0)-(66,11))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 3)
-        │   │   ├── @ IntegerNode (location: (66,1)-(66,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── @ ParenthesesNode (location: (66,4)-(66,6))
-        │   │   │   ├── body: ∅
-        │   │   │   ├── opening_loc: (66,4)-(66,5) = "("
-        │   │   │   └── closing_loc: (66,5)-(66,6) = ")"
-        │   │   └── @ CallNode (location: (66,8)-(66,10))
-        │   │       ├── flags: variable_call, ignore_visibility
-        │   │       ├── receiver: ∅
-        │   │       ├── call_operator_loc: ∅
-        │   │       ├── name: :n2
-        │   │       ├── message_loc: (66,8)-(66,10) = "n2"
-        │   │       ├── opening_loc: ∅
-        │   │       ├── arguments: ∅
-        │   │       ├── closing_loc: ∅
-        │   │       └── block: ∅
-        │   ├── opening_loc: (66,0)-(66,1) = "["
-        │   └── closing_loc: (66,10)-(66,11) = "]"
-        ├── @ ArrayNode (location: (67,0)-(67,3))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ IntegerNode (location: (67,1)-(67,2))
-        │   │       ├── flags: decimal
-        │   │       └── value: 1
-        │   ├── opening_loc: (67,0)-(67,1) = "["
-        │   └── closing_loc: (67,2)-(67,3) = "]"
-        ├── @ ArrayNode (location: (68,0)-(68,2))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (68,0)-(68,1) = "["
-        │   └── closing_loc: (68,1)-(68,2) = "]"
-        ├── @ ArrayNode (location: (69,0)-(69,10))
-        │   ├── flags: contains_splat
-        │   ├── elements: (length: 2)
-        │   │   ├── @ IntegerNode (location: (69,1)-(69,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   └── @ SplatNode (location: (69,4)-(69,9))
-        │   │       ├── operator_loc: (69,4)-(69,5) = "*"
-        │   │       └── expression:
-        │   │           @ InstanceVariableReadNode (location: (69,5)-(69,9))
-        │   │           └── name: :@foo
-        │   ├── opening_loc: (69,0)-(69,1) = "["
-        │   └── closing_loc: (69,9)-(69,10) = "]"
-        ├── @ ArrayNode (location: (70,0)-(70,10))
-        │   ├── flags: contains_splat
-        │   ├── elements: (length: 2)
-        │   │   ├── @ SplatNode (location: (70,1)-(70,6))
-        │   │   │   ├── operator_loc: (70,1)-(70,2) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ InstanceVariableReadNode (location: (70,2)-(70,6))
-        │   │   │       └── name: :@foo
-        │   │   └── @ IntegerNode (location: (70,8)-(70,9))
-        │   │       ├── flags: decimal
-        │   │       └── value: 1
-        │   ├── opening_loc: (70,0)-(70,1) = "["
-        │   └── closing_loc: (70,9)-(70,10) = "]"
-        ├── @ ArrayNode (location: (71,0)-(71,14))
-        │   ├── flags: contains_splat
-        │   ├── elements: (length: 2)
-        │   │   ├── @ SplatNode (location: (71,1)-(71,6))
-        │   │   │   ├── operator_loc: (71,1)-(71,2) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ InstanceVariableReadNode (location: (71,2)-(71,6))
-        │   │   │       └── name: :@foo
-        │   │   └── @ SplatNode (location: (71,8)-(71,13))
-        │   │       ├── operator_loc: (71,8)-(71,9) = "*"
-        │   │       └── expression:
-        │   │           @ InstanceVariableReadNode (location: (71,9)-(71,13))
-        │   │           └── name: :@baz
-        │   ├── opening_loc: (71,0)-(71,1) = "["
-        │   └── closing_loc: (71,13)-(71,14) = "]"
-        ├── @ HashNode (location: (72,0)-(72,2))
-        │   ├── opening_loc: (72,0)-(72,1) = "{"
-        │   ├── elements: (length: 0)
-        │   └── closing_loc: (72,1)-(72,2) = "}"
-        ├── @ HashNode (location: (73,0)-(73,12))
-        │   ├── opening_loc: (73,0)-(73,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (73,2)-(73,10))
-        │   │       ├── key:
-        │   │       │   @ ParenthesesNode (location: (73,2)-(73,4))
-        │   │       │   ├── body: ∅
-        │   │       │   ├── opening_loc: (73,2)-(73,3) = "("
-        │   │       │   └── closing_loc: (73,3)-(73,4) = ")"
-        │   │       ├── value:
-        │   │       │   @ ParenthesesNode (location: (73,8)-(73,10))
-        │   │       │   ├── body: ∅
-        │   │       │   ├── opening_loc: (73,8)-(73,9) = "("
-        │   │       │   └── closing_loc: (73,9)-(73,10) = ")"
-        │   │       └── operator_loc: (73,5)-(73,7) = "=>"
-        │   └── closing_loc: (73,11)-(73,12) = "}"
-        ├── @ HashNode (location: (74,0)-(74,10))
-        │   ├── opening_loc: (74,0)-(74,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (74,2)-(74,8))
-        │   │       ├── key:
-        │   │       │   @ IntegerNode (location: (74,2)-(74,3))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── value:
-        │   │       │   @ IntegerNode (location: (74,7)-(74,8))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── operator_loc: (74,4)-(74,6) = "=>"
-        │   └── closing_loc: (74,9)-(74,10) = "}"
-        ├── @ HashNode (location: (75,0)-(75,18))
-        │   ├── opening_loc: (75,0)-(75,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (75,2)-(75,8))
-        │   │   │   ├── key:
-        │   │   │   │   @ IntegerNode (location: (75,2)-(75,3))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   ├── value:
-        │   │   │   │   @ IntegerNode (location: (75,7)-(75,8))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 2
-        │   │   │   └── operator_loc: (75,4)-(75,6) = "=>"
-        │   │   └── @ AssocNode (location: (75,10)-(75,16))
-        │   │       ├── key:
-        │   │       │   @ IntegerNode (location: (75,10)-(75,11))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 3
-        │   │       ├── value:
-        │   │       │   @ IntegerNode (location: (75,15)-(75,16))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 4
-        │   │       └── operator_loc: (75,12)-(75,14) = "=>"
-        │   └── closing_loc: (75,17)-(75,18) = "}"
-        ├── @ HashNode (location: (76,0)-(76,27))
-        │   ├── opening_loc: (76,0)-(76,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (76,2)-(76,19))
-        │   │   │   ├── key:
-        │   │   │   │   @ SymbolNode (location: (76,2)-(76,4))
-        │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── value_loc: (76,2)-(76,3) = "a"
-        │   │   │   │   ├── closing_loc: (76,3)-(76,4) = ":"
-        │   │   │   │   └── unescaped: "a"
-        │   │   │   ├── value:
-        │   │   │   │   @ ParenthesesNode (location: (76,5)-(76,19))
-        │   │   │   │   ├── body:
-        │   │   │   │   │   @ StatementsNode (location: (76,6)-(76,18))
-        │   │   │   │   │   └── body: (length: 1)
-        │   │   │   │   │       └── @ RescueModifierNode (location: (76,6)-(76,18))
-        │   │   │   │   │           ├── expression:
-        │   │   │   │   │           │   @ IntegerNode (location: (76,6)-(76,7))
-        │   │   │   │   │           │   ├── flags: decimal
-        │   │   │   │   │           │   └── value: 1
-        │   │   │   │   │           ├── keyword_loc: (76,8)-(76,14) = "rescue"
-        │   │   │   │   │           └── rescue_expression:
-        │   │   │   │   │               @ CallNode (location: (76,15)-(76,18))
-        │   │   │   │   │               ├── flags: variable_call, ignore_visibility
-        │   │   │   │   │               ├── receiver: ∅
-        │   │   │   │   │               ├── call_operator_loc: ∅
-        │   │   │   │   │               ├── name: :foo
-        │   │   │   │   │               ├── message_loc: (76,15)-(76,18) = "foo"
-        │   │   │   │   │               ├── opening_loc: ∅
-        │   │   │   │   │               ├── arguments: ∅
-        │   │   │   │   │               ├── closing_loc: ∅
-        │   │   │   │   │               └── block: ∅
-        │   │   │   │   ├── opening_loc: (76,5)-(76,6) = "("
-        │   │   │   │   └── closing_loc: (76,18)-(76,19) = ")"
-        │   │   │   └── operator_loc: ∅
-        │   │   └── @ AssocNode (location: (76,21)-(76,25))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (76,21)-(76,23))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (76,21)-(76,22) = "b"
-        │   │       │   ├── closing_loc: (76,22)-(76,23) = ":"
-        │   │       │   └── unescaped: "b"
-        │   │       ├── value:
-        │   │       │   @ IntegerNode (location: (76,24)-(76,25))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (76,26)-(76,27) = "}"
-        ├── @ HashNode (location: (77,0)-(77,14))
-        │   ├── opening_loc: (77,0)-(77,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (77,2)-(77,6))
-        │   │   │   ├── key:
-        │   │   │   │   @ SymbolNode (location: (77,2)-(77,4))
-        │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── value_loc: (77,2)-(77,3) = "a"
-        │   │   │   │   ├── closing_loc: (77,3)-(77,4) = ":"
-        │   │   │   │   └── unescaped: "a"
-        │   │   │   ├── value:
-        │   │   │   │   @ IntegerNode (location: (77,5)-(77,6))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── operator_loc: ∅
-        │   │   └── @ AssocNode (location: (77,8)-(77,12))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (77,8)-(77,10))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (77,8)-(77,9) = "b"
-        │   │       │   ├── closing_loc: (77,9)-(77,10) = ":"
-        │   │       │   └── unescaped: "b"
-        │   │       ├── value:
-        │   │       │   @ IntegerNode (location: (77,11)-(77,12))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (77,13)-(77,14) = "}"
-        ├── @ HashNode (location: (78,0)-(78,9))
-        │   ├── opening_loc: (78,0)-(78,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (78,2)-(78,7))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (78,2)-(78,4))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (78,2)-(78,3) = "a"
-        │   │       │   ├── closing_loc: (78,3)-(78,4) = ":"
-        │   │       │   └── unescaped: "a"
-        │   │       ├── value:
-        │   │       │   @ SymbolNode (location: (78,5)-(78,7))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (78,5)-(78,6) = ":"
-        │   │       │   ├── value_loc: (78,6)-(78,7) = "a"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "a"
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (78,8)-(78,9) = "}"
-        ├── @ HashNode (location: (79,0)-(79,15))
-        │   ├── opening_loc: (79,0)-(79,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (79,2)-(79,13))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (79,2)-(79,8))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (79,2)-(79,4) = ":\""
-        │   │       │   ├── value_loc: (79,4)-(79,7) = "a b"
-        │   │       │   ├── closing_loc: (79,7)-(79,8) = "\""
-        │   │       │   └── unescaped: "a b"
-        │   │       ├── value:
-        │   │       │   @ IntegerNode (location: (79,12)-(79,13))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── operator_loc: (79,9)-(79,11) = "=>"
-        │   └── closing_loc: (79,14)-(79,15) = "}"
-        ├── @ HashNode (location: (80,0)-(80,12))
-        │   ├── opening_loc: (80,0)-(80,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (80,2)-(80,10))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (80,2)-(80,5))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (80,2)-(80,3) = ":"
-        │   │       │   ├── value_loc: (80,3)-(80,5) = "-@"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "-@"
-        │   │       ├── value:
-        │   │       │   @ IntegerNode (location: (80,9)-(80,10))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── operator_loc: (80,6)-(80,8) = "=>"
-        │   └── closing_loc: (80,11)-(80,12) = "}"
-        ├── @ InterpolatedStringNode (location: (81,0)-(82,7))
-        │   ├── opening_loc: (81,0)-(81,1) = "\""
-        │   ├── parts: (length: 4)
-        │   │   ├── @ EmbeddedStatementsNode (location: (81,1)-(81,4))
-        │   │   │   ├── opening_loc: (81,1)-(81,3) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (81,3)-(81,4) = "}"
-        │   │   ├── @ StringNode (location: (81,4)-(82,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (81,4)-(82,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (82,0)-(82,3))
-        │   │   │   ├── opening_loc: (82,0)-(82,2) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (82,2)-(82,3) = "}"
-        │   │   └── @ StringNode (location: (82,3)-(82,6))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (82,3)-(82,6) = "\\na"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\na"
-        │   └── closing_loc: (82,6)-(82,7) = "\""
-        ├── @ CallNode (location: (83,0)-(86,1))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (83,0)-(83,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (83,4)-(86,1))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (84,2)-(85,7))
-        │       │   └── body: (length: 1)
-        │       │       └── @ InterpolatedStringNode (location: (84,2)-(85,7))
-        │       │           ├── opening_loc: (84,2)-(84,3) = "\""
-        │       │           ├── parts: (length: 4)
-        │       │           │   ├── @ EmbeddedStatementsNode (location: (84,3)-(84,6))
-        │       │           │   │   ├── opening_loc: (84,3)-(84,5) = "\#{"
-        │       │           │   │   ├── statements: ∅
-        │       │           │   │   └── closing_loc: (84,5)-(84,6) = "}"
-        │       │           │   ├── @ StringNode (location: (84,6)-(85,0))
-        │       │           │   │   ├── flags: ∅
-        │       │           │   │   ├── opening_loc: ∅
-        │       │           │   │   ├── content_loc: (84,6)-(85,0) = "\n"
-        │       │           │   │   ├── closing_loc: ∅
-        │       │           │   │   └── unescaped: "\n"
-        │       │           │   ├── @ EmbeddedStatementsNode (location: (85,0)-(85,3))
-        │       │           │   │   ├── opening_loc: (85,0)-(85,2) = "\#{"
-        │       │           │   │   ├── statements: ∅
-        │       │           │   │   └── closing_loc: (85,2)-(85,3) = "}"
-        │       │           │   └── @ StringNode (location: (85,3)-(85,6))
-        │       │           │       ├── flags: ∅
-        │       │           │       ├── opening_loc: ∅
-        │       │           │       ├── content_loc: (85,3)-(85,6) = "\\na"
-        │       │           │       ├── closing_loc: ∅
-        │       │           │       └── unescaped: "\na"
-        │       │           └── closing_loc: (85,6)-(85,7) = "\""
-        │       ├── opening_loc: (83,4)-(83,5) = "{"
-        │       └── closing_loc: (86,0)-(86,1) = "}"
-        ├── @ SymbolNode (location: (87,0)-(88,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (87,0)-(87,2) = ":\""
-        │   ├── value_loc: (87,2)-(88,1) = "a\\\\\nb"
-        │   ├── closing_loc: (88,1)-(88,2) = "\""
-        │   └── unescaped: "a\\\nb"
-        └── @ InterpolatedXStringNode (location: (89,0)-(91,2))
-            ├── opening_loc: (89,0)-(89,1) = "`"
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (89,1)-(90,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (89,1)-(90,0) = "  x\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "  x\n"
-            │   ├── @ EmbeddedStatementsNode (location: (90,0)-(90,6))
-            │   │   ├── opening_loc: (90,0)-(90,2) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (90,2)-(90,5))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (90,2)-(90,5))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :foo
-            │   │   │           ├── message_loc: (90,2)-(90,5) = "foo"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (90,5)-(90,6) = "}"
-            │   └── @ StringNode (location: (90,6)-(91,1))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (90,6)-(91,1) = "\n#"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "\n#"
-            └── closing_loc: (91,1)-(91,2) = "`"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/module.txt b/test/mri/prism/snapshots/unparser/corpus/literal/module.txt
deleted file mode 100644
index 5dd8c03b517..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/module.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-@ ProgramNode (location: (1,0)-(16,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(16,3))
-    └── body: (length: 4)
-        ├── @ ModuleNode (location: (1,0)-(2,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (1,0)-(1,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (1,7)-(1,8))
-        │   │   └── name: :A
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (2,0)-(2,3) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (4,0)-(5,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (4,0)-(4,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (4,7)-(4,11))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (4,7)-(4,8))
-        │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (4,10)-(4,11))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (4,8)-(4,10) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (5,0)-(5,3) = "end"
-        │   └── name: :B
-        ├── @ ModuleNode (location: (7,0)-(8,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (7,0)-(7,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (7,7)-(7,14))
-        │   │   ├── parent:
-        │   │   │   @ ConstantPathNode (location: (7,7)-(7,11))
-        │   │   │   ├── parent:
-        │   │   │   │   @ ConstantReadNode (location: (7,7)-(7,8))
-        │   │   │   │   └── name: :A
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (7,10)-(7,11))
-        │   │   │   │   └── name: :B
-        │   │   │   └── delimiter_loc: (7,8)-(7,10) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (7,13)-(7,14))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (7,11)-(7,13) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (8,0)-(8,3) = "end"
-        │   └── name: :C
-        └── @ ModuleNode (location: (10,0)-(16,3))
-            ├── locals: []
-            ├── module_keyword_loc: (10,0)-(10,6) = "module"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (10,7)-(10,8))
-            │   └── name: :A
-            ├── body:
-            │   @ StatementsNode (location: (11,2)-(15,5))
-            │   └── body: (length: 2)
-            │       ├── @ CallNode (location: (11,2)-(11,16))
-            │       │   ├── flags: ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :include
-            │       │   ├── message_loc: (11,2)-(11,9) = "include"
-            │       │   ├── opening_loc: (11,9)-(11,10) = "("
-            │       │   ├── arguments:
-            │       │   │   @ ArgumentsNode (location: (11,10)-(11,15))
-            │       │   │   ├── flags: ∅
-            │       │   │   └── arguments: (length: 1)
-            │       │   │       └── @ CallNode (location: (11,10)-(11,15))
-            │       │   │           ├── flags: ∅
-            │       │   │           ├── receiver:
-            │       │   │           │   @ ConstantReadNode (location: (11,10)-(11,11))
-            │       │   │           │   └── name: :B
-            │       │   │           ├── call_operator_loc: (11,11)-(11,12) = "."
-            │       │   │           ├── name: :new
-            │       │   │           ├── message_loc: (11,12)-(11,15) = "new"
-            │       │   │           ├── opening_loc: ∅
-            │       │   │           ├── arguments: ∅
-            │       │   │           ├── closing_loc: ∅
-            │       │   │           └── block: ∅
-            │       │   ├── closing_loc: (11,15)-(11,16) = ")"
-            │       │   └── block: ∅
-            │       └── @ DefNode (location: (13,2)-(15,5))
-            │           ├── name: :foo
-            │           ├── name_loc: (13,6)-(13,9) = "foo"
-            │           ├── receiver: ∅
-            │           ├── parameters: ∅
-            │           ├── body:
-            │           │   @ StatementsNode (location: (14,4)-(14,8))
-            │           │   └── body: (length: 1)
-            │           │       └── @ SymbolNode (location: (14,4)-(14,8))
-            │           │           ├── flags: forced_us_ascii_encoding
-            │           │           ├── opening_loc: (14,4)-(14,5) = ":"
-            │           │           ├── value_loc: (14,5)-(14,8) = "bar"
-            │           │           ├── closing_loc: ∅
-            │           │           └── unescaped: "bar"
-            │           ├── locals: []
-            │           ├── def_keyword_loc: (13,2)-(13,5) = "def"
-            │           ├── operator_loc: ∅
-            │           ├── lparen_loc: ∅
-            │           ├── rparen_loc: ∅
-            │           ├── equal_loc: ∅
-            │           └── end_keyword_loc: (15,2)-(15,5) = "end"
-            ├── end_keyword_loc: (16,0)-(16,3) = "end"
-            └── name: :A
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/opasgn.txt b/test/mri/prism/snapshots/unparser/corpus/literal/opasgn.txt
deleted file mode 100644
index 8dc08496381..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/opasgn.txt
+++ /dev/null
@@ -1,509 +0,0 @@
-@ ProgramNode (location: (1,0)-(24,10))
-├── locals: [:a, :h]
-└── statements:
-    @ StatementsNode (location: (1,0)-(24,10))
-    └── body: (length: 24)
-        ├── @ LocalVariableOperatorWriteNode (location: (1,0)-(1,6))
-        │   ├── name_loc: (1,0)-(1,1) = "a"
-        │   ├── operator_loc: (1,2)-(1,4) = "+="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,5)-(1,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   ├── name: :a
-        │   ├── operator: :+
-        │   └── depth: 0
-        ├── @ LocalVariableOperatorWriteNode (location: (2,0)-(2,6))
-        │   ├── name_loc: (2,0)-(2,1) = "a"
-        │   ├── operator_loc: (2,2)-(2,4) = "-="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (2,5)-(2,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   ├── name: :a
-        │   ├── operator: :-
-        │   └── depth: 0
-        ├── @ LocalVariableOperatorWriteNode (location: (3,0)-(3,7))
-        │   ├── name_loc: (3,0)-(3,1) = "a"
-        │   ├── operator_loc: (3,2)-(3,5) = "**="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (3,6)-(3,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   ├── name: :a
-        │   ├── operator: :**
-        │   └── depth: 0
-        ├── @ LocalVariableOperatorWriteNode (location: (4,0)-(4,6))
-        │   ├── name_loc: (4,0)-(4,1) = "a"
-        │   ├── operator_loc: (4,2)-(4,4) = "*="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (4,5)-(4,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   ├── name: :a
-        │   ├── operator: :*
-        │   └── depth: 0
-        ├── @ LocalVariableOperatorWriteNode (location: (5,0)-(5,6))
-        │   ├── name_loc: (5,0)-(5,1) = "a"
-        │   ├── operator_loc: (5,2)-(5,4) = "/="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (5,5)-(5,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   ├── name: :a
-        │   ├── operator: :/
-        │   └── depth: 0
-        ├── @ LocalVariableAndWriteNode (location: (6,0)-(6,7))
-        │   ├── name_loc: (6,0)-(6,1) = "a"
-        │   ├── operator_loc: (6,2)-(6,5) = "&&="
-        │   ├── value:
-        │   │   @ CallNode (location: (6,6)-(6,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :b
-        │   │   ├── message_loc: (6,6)-(6,7) = "b"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── name: :a
-        │   └── depth: 0
-        ├── @ LocalVariableOrWriteNode (location: (7,0)-(7,7))
-        │   ├── name_loc: (7,0)-(7,1) = "a"
-        │   ├── operator_loc: (7,2)-(7,5) = "||="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (7,6)-(7,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   ├── name: :a
-        │   └── depth: 0
-        ├── @ CallNode (location: (8,0)-(8,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (8,0)-(8,9))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (8,1)-(8,8))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableOrWriteNode (location: (8,1)-(8,8))
-        │   │   │           ├── name_loc: (8,1)-(8,2) = "a"
-        │   │   │           ├── operator_loc: (8,3)-(8,6) = "||="
-        │   │   │           ├── value:
-        │   │   │           │   @ IntegerNode (location: (8,7)-(8,8))
-        │   │   │           │   ├── flags: decimal
-        │   │   │           │   └── value: 2
-        │   │   │           ├── name: :a
-        │   │   │           └── depth: 0
-        │   │   ├── opening_loc: (8,0)-(8,1) = "("
-        │   │   └── closing_loc: (8,8)-(8,9) = ")"
-        │   ├── call_operator_loc: (8,9)-(8,10) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (8,10)-(8,13) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (9,0)-(9,17))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (9,0)-(9,10))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (9,1)-(9,9))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableOrWriteNode (location: (9,1)-(9,9))
-        │   │   │           ├── name_loc: (9,1)-(9,2) = "h"
-        │   │   │           ├── operator_loc: (9,3)-(9,6) = "||="
-        │   │   │           ├── value:
-        │   │   │           │   @ HashNode (location: (9,7)-(9,9))
-        │   │   │           │   ├── opening_loc: (9,7)-(9,8) = "{"
-        │   │   │           │   ├── elements: (length: 0)
-        │   │   │           │   └── closing_loc: (9,8)-(9,9) = "}"
-        │   │   │           ├── name: :h
-        │   │   │           └── depth: 0
-        │   │   ├── opening_loc: (9,0)-(9,1) = "("
-        │   │   └── closing_loc: (9,9)-(9,10) = ")"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]=
-        │   ├── message_loc: (9,10)-(9,13) = "[k]"
-        │   ├── opening_loc: (9,10)-(9,11) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,11)-(9,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (9,11)-(9,12))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :k
-        │   │       │   ├── message_loc: (9,11)-(9,12) = "k"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (9,16)-(9,17))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :v
-        │   │           ├── message_loc: (9,16)-(9,17) = "v"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (9,12)-(9,13) = "]"
-        │   └── block: ∅
-        ├── @ CallOperatorWriteNode (location: (10,0)-(10,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (10,0)-(10,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (10,1)-(10,2) = "."
-        │   ├── message_loc: (10,2)-(10,3) = "b"
-        │   ├── read_name: :b
-        │   ├── write_name: :b=
-        │   ├── operator: :+
-        │   ├── operator_loc: (10,4)-(10,6) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (10,7)-(10,8))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ CallOperatorWriteNode (location: (11,0)-(11,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (11,0)-(11,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (11,1)-(11,2) = "."
-        │   ├── message_loc: (11,2)-(11,3) = "b"
-        │   ├── read_name: :b
-        │   ├── write_name: :b=
-        │   ├── operator: :-
-        │   ├── operator_loc: (11,4)-(11,6) = "-="
-        │   └── value:
-        │       @ IntegerNode (location: (11,7)-(11,8))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ CallOperatorWriteNode (location: (12,0)-(12,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (12,0)-(12,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (12,1)-(12,2) = "."
-        │   ├── message_loc: (12,2)-(12,3) = "b"
-        │   ├── read_name: :b
-        │   ├── write_name: :b=
-        │   ├── operator: :**
-        │   ├── operator_loc: (12,4)-(12,7) = "**="
-        │   └── value:
-        │       @ IntegerNode (location: (12,8)-(12,9))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ CallOperatorWriteNode (location: (13,0)-(13,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (13,0)-(13,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (13,1)-(13,2) = "."
-        │   ├── message_loc: (13,2)-(13,3) = "b"
-        │   ├── read_name: :b
-        │   ├── write_name: :b=
-        │   ├── operator: :*
-        │   ├── operator_loc: (13,4)-(13,6) = "*="
-        │   └── value:
-        │       @ IntegerNode (location: (13,7)-(13,8))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ CallOperatorWriteNode (location: (14,0)-(14,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (14,0)-(14,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (14,1)-(14,2) = "."
-        │   ├── message_loc: (14,2)-(14,3) = "b"
-        │   ├── read_name: :b
-        │   ├── write_name: :b=
-        │   ├── operator: :/
-        │   ├── operator_loc: (14,4)-(14,6) = "/="
-        │   └── value:
-        │       @ IntegerNode (location: (14,7)-(14,8))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ CallAndWriteNode (location: (15,0)-(15,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (15,0)-(15,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (15,1)-(15,2) = "."
-        │   ├── message_loc: (15,2)-(15,3) = "b"
-        │   ├── read_name: :b
-        │   ├── write_name: :b=
-        │   ├── operator_loc: (15,4)-(15,7) = "&&="
-        │   └── value:
-        │       @ CallNode (location: (15,8)-(15,9))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :b
-        │       ├── message_loc: (15,8)-(15,9) = "b"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ CallOrWriteNode (location: (16,0)-(16,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (16,0)-(16,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (16,1)-(16,2) = "."
-        │   ├── message_loc: (16,2)-(16,3) = "b"
-        │   ├── read_name: :b
-        │   ├── write_name: :b=
-        │   ├── operator_loc: (16,4)-(16,7) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (16,8)-(16,9))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ IndexOperatorWriteNode (location: (17,0)-(17,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (17,0)-(17,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (17,1)-(17,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (17,2)-(17,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (17,2)-(17,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (17,2)-(17,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (17,3)-(17,4) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :+
-        │   ├── operator_loc: (17,5)-(17,7) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (17,8)-(17,9))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ IndexOperatorWriteNode (location: (18,0)-(18,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (18,0)-(18,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (18,1)-(18,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (18,2)-(18,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (18,2)-(18,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (18,2)-(18,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (18,3)-(18,4) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :-
-        │   ├── operator_loc: (18,5)-(18,7) = "-="
-        │   └── value:
-        │       @ IntegerNode (location: (18,8)-(18,9))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ IndexOperatorWriteNode (location: (19,0)-(19,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (19,0)-(19,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (19,1)-(19,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (19,2)-(19,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (19,2)-(19,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (19,2)-(19,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (19,3)-(19,4) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :**
-        │   ├── operator_loc: (19,5)-(19,8) = "**="
-        │   └── value:
-        │       @ IntegerNode (location: (19,9)-(19,10))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ IndexOperatorWriteNode (location: (20,0)-(20,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (20,0)-(20,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (20,1)-(20,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (20,2)-(20,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (20,2)-(20,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (20,2)-(20,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (20,3)-(20,4) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :*
-        │   ├── operator_loc: (20,5)-(20,7) = "*="
-        │   └── value:
-        │       @ IntegerNode (location: (20,8)-(20,9))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ IndexOperatorWriteNode (location: (21,0)-(21,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (21,0)-(21,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (21,1)-(21,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,2)-(21,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (21,2)-(21,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (21,2)-(21,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (21,3)-(21,4) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :/
-        │   ├── operator_loc: (21,5)-(21,7) = "/="
-        │   └── value:
-        │       @ IntegerNode (location: (21,8)-(21,9))
-        │       ├── flags: decimal
-        │       └── value: 2
-        ├── @ IndexAndWriteNode (location: (22,0)-(22,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (22,0)-(22,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (22,1)-(22,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (22,2)-(22,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (22,2)-(22,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (22,2)-(22,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (22,3)-(22,4) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (22,5)-(22,8) = "&&="
-        │   └── value:
-        │       @ CallNode (location: (22,9)-(22,10))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :b
-        │       ├── message_loc: (22,9)-(22,10) = "b"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ IndexOrWriteNode (location: (23,0)-(23,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (23,0)-(23,1))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (23,1)-(23,2) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (23,2)-(23,3))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (23,2)-(23,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (23,2)-(23,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (23,3)-(23,4) = "]"
-        │   ├── block: ∅
-        │   ├── operator_loc: (23,5)-(23,8) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (23,9)-(23,10))
-        │       ├── flags: decimal
-        │       └── value: 2
-        └── @ CallOperatorWriteNode (location: (24,0)-(24,10))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (24,0)-(24,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (24,0)-(24,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (24,3)-(24,4) = "."
-            ├── message_loc: (24,4)-(24,5) = "A"
-            ├── read_name: :A
-            ├── write_name: :A=
-            ├── operator: :+
-            ├── operator_loc: (24,6)-(24,8) = "+="
-            └── value:
-                @ IntegerNode (location: (24,9)-(24,10))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/pattern.txt b/test/mri/prism/snapshots/unparser/corpus/literal/pattern.txt
deleted file mode 100644
index 5a0b4bb7336..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/pattern.txt
+++ /dev/null
@@ -1,446 +0,0 @@
-@ ProgramNode (location: (1,0)-(41,8))
-├── locals: [:a, :x, :y]
-└── statements:
-    @ StatementsNode (location: (1,0)-(41,8))
-    └── body: (length: 4)
-        ├── @ CaseMatchNode (location: (1,0)-(33,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,5)-(1,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,5)-(1,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 15)
-        │   │   ├── @ InNode (location: (2,0)-(3,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ ArrayPatternNode (location: (2,3)-(2,17))
-        │   │   │   │   ├── constant:
-        │   │   │   │   │   @ ConstantReadNode (location: (2,3)-(2,4))
-        │   │   │   │   │   └── name: :A
-        │   │   │   │   ├── requireds: (length: 2)
-        │   │   │   │   │   ├── @ IntegerNode (location: (2,5)-(2,6))
-        │   │   │   │   │   │   ├── flags: decimal
-        │   │   │   │   │   │   └── value: 1
-        │   │   │   │   │   └── @ IntegerNode (location: (2,8)-(2,9))
-        │   │   │   │   │       ├── flags: decimal
-        │   │   │   │   │       └── value: 2
-        │   │   │   │   ├── rest:
-        │   │   │   │   │   @ SplatNode (location: (2,11)-(2,13))
-        │   │   │   │   │   ├── operator_loc: (2,11)-(2,12) = "*"
-        │   │   │   │   │   └── expression:
-        │   │   │   │   │       @ LocalVariableTargetNode (location: (2,12)-(2,13))
-        │   │   │   │   │       ├── name: :a
-        │   │   │   │   │       └── depth: 0
-        │   │   │   │   ├── posts: (length: 1)
-        │   │   │   │   │   └── @ IntegerNode (location: (2,15)-(2,16))
-        │   │   │   │   │       ├── flags: decimal
-        │   │   │   │   │       └── value: 3
-        │   │   │   │   ├── opening_loc: (2,4)-(2,5) = "["
-        │   │   │   │   └── closing_loc: (2,16)-(2,17) = "]"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (3,2)-(3,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (3,2)-(3,6))
-        │   │   │   ├── in_loc: (2,0)-(2,2) = "in"
-        │   │   │   └── then_loc: (2,18)-(2,22) = "then"
-        │   │   ├── @ InNode (location: (4,0)-(5,3))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ ArrayPatternNode (location: (4,3)-(4,11))
-        │   │   │   │   ├── constant: ∅
-        │   │   │   │   ├── requireds: (length: 2)
-        │   │   │   │   │   ├── @ IntegerNode (location: (4,4)-(4,5))
-        │   │   │   │   │   │   ├── flags: decimal
-        │   │   │   │   │   │   └── value: 1
-        │   │   │   │   │   └── @ IntegerNode (location: (4,7)-(4,8))
-        │   │   │   │   │       ├── flags: decimal
-        │   │   │   │   │       └── value: 2
-        │   │   │   │   ├── rest:
-        │   │   │   │   │   @ ImplicitRestNode (location: (4,8)-(4,9))
-        │   │   │   │   ├── posts: (length: 0)
-        │   │   │   │   ├── opening_loc: (4,3)-(4,4) = "["
-        │   │   │   │   └── closing_loc: (4,10)-(4,11) = "]"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (5,2)-(5,3))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (5,2)-(5,3))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :y
-        │   │   │   │           ├── message_loc: (5,2)-(5,3) = "y"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── in_loc: (4,0)-(4,2) = "in"
-        │   │   │   └── then_loc: (4,12)-(4,16) = "then"
-        │   │   ├── @ InNode (location: (6,0)-(7,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ HashPatternNode (location: (6,3)-(6,8))
-        │   │   │   │   ├── constant:
-        │   │   │   │   │   @ ConstantReadNode (location: (6,3)-(6,4))
-        │   │   │   │   │   └── name: :A
-        │   │   │   │   ├── elements: (length: 1)
-        │   │   │   │   │   └── @ AssocNode (location: (6,5)-(6,7))
-        │   │   │   │   │       ├── key:
-        │   │   │   │   │       │   @ SymbolNode (location: (6,5)-(6,7))
-        │   │   │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   │       │   ├── opening_loc: ∅
-        │   │   │   │   │       │   ├── value_loc: (6,5)-(6,6) = "x"
-        │   │   │   │   │       │   ├── closing_loc: (6,6)-(6,7) = ":"
-        │   │   │   │   │       │   └── unescaped: "x"
-        │   │   │   │   │       ├── value:
-        │   │   │   │   │       │   @ ImplicitNode (location: (6,5)-(6,6))
-        │   │   │   │   │       │   └── value:
-        │   │   │   │   │       │       @ LocalVariableTargetNode (location: (6,5)-(6,6))
-        │   │   │   │   │       │       ├── name: :x
-        │   │   │   │   │       │       └── depth: 0
-        │   │   │   │   │       └── operator_loc: ∅
-        │   │   │   │   ├── rest: ∅
-        │   │   │   │   ├── opening_loc: (6,4)-(6,5) = "("
-        │   │   │   │   └── closing_loc: (6,7)-(6,8) = ")"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (7,2)-(7,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (7,2)-(7,6))
-        │   │   │   ├── in_loc: (6,0)-(6,2) = "in"
-        │   │   │   └── then_loc: (6,9)-(6,13) = "then"
-        │   │   ├── @ InNode (location: (8,0)-(9,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ HashPatternNode (location: (8,3)-(8,8))
-        │   │   │   │   ├── constant: ∅
-        │   │   │   │   ├── elements: (length: 0)
-        │   │   │   │   ├── rest:
-        │   │   │   │   │   @ AssocSplatNode (location: (8,4)-(8,7))
-        │   │   │   │   │   ├── value:
-        │   │   │   │   │   │   @ LocalVariableTargetNode (location: (8,6)-(8,7))
-        │   │   │   │   │   │   ├── name: :a
-        │   │   │   │   │   │   └── depth: 0
-        │   │   │   │   │   └── operator_loc: (8,4)-(8,6) = "**"
-        │   │   │   │   ├── opening_loc: (8,3)-(8,4) = "{"
-        │   │   │   │   └── closing_loc: (8,7)-(8,8) = "}"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (9,2)-(9,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (9,2)-(9,6))
-        │   │   │   ├── in_loc: (8,0)-(8,2) = "in"
-        │   │   │   └── then_loc: (8,9)-(8,13) = "then"
-        │   │   ├── @ InNode (location: (10,0)-(11,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ IfNode (location: (10,3)-(10,13))
-        │   │   │   │   ├── if_keyword_loc: (10,6)-(10,8) = "if"
-        │   │   │   │   ├── predicate:
-        │   │   │   │   │   @ TrueNode (location: (10,9)-(10,13))
-        │   │   │   │   ├── then_keyword_loc: ∅
-        │   │   │   │   ├── statements:
-        │   │   │   │   │   @ StatementsNode (location: (10,3)-(10,5))
-        │   │   │   │   │   └── body: (length: 1)
-        │   │   │   │   │       └── @ HashPatternNode (location: (10,3)-(10,5))
-        │   │   │   │   │           ├── constant: ∅
-        │   │   │   │   │           ├── elements: (length: 0)
-        │   │   │   │   │           ├── rest: ∅
-        │   │   │   │   │           ├── opening_loc: (10,3)-(10,4) = "{"
-        │   │   │   │   │           └── closing_loc: (10,4)-(10,5) = "}"
-        │   │   │   │   ├── consequent: ∅
-        │   │   │   │   └── end_keyword_loc: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (11,2)-(11,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (11,2)-(11,6))
-        │   │   │   ├── in_loc: (10,0)-(10,2) = "in"
-        │   │   │   └── then_loc: (10,14)-(10,18) = "then"
-        │   │   ├── @ InNode (location: (12,0)-(13,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ ArrayPatternNode (location: (12,3)-(12,12))
-        │   │   │   │   ├── constant: ∅
-        │   │   │   │   ├── requireds: (length: 2)
-        │   │   │   │   │   ├── @ LocalVariableTargetNode (location: (12,4)-(12,5))
-        │   │   │   │   │   │   ├── name: :x
-        │   │   │   │   │   │   └── depth: 0
-        │   │   │   │   │   └── @ LocalVariableTargetNode (location: (12,7)-(12,8))
-        │   │   │   │   │       ├── name: :y
-        │   │   │   │   │       └── depth: 0
-        │   │   │   │   ├── rest:
-        │   │   │   │   │   @ SplatNode (location: (12,10)-(12,11))
-        │   │   │   │   │   ├── operator_loc: (12,10)-(12,11) = "*"
-        │   │   │   │   │   └── expression: ∅
-        │   │   │   │   ├── posts: (length: 0)
-        │   │   │   │   ├── opening_loc: (12,3)-(12,4) = "["
-        │   │   │   │   └── closing_loc: (12,11)-(12,12) = "]"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (13,2)-(13,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (13,2)-(13,6))
-        │   │   │   ├── in_loc: (12,0)-(12,2) = "in"
-        │   │   │   └── then_loc: (12,13)-(12,17) = "then"
-        │   │   ├── @ InNode (location: (14,0)-(15,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ HashPatternNode (location: (14,3)-(14,16))
-        │   │   │   │   ├── constant: ∅
-        │   │   │   │   ├── elements: (length: 2)
-        │   │   │   │   │   ├── @ AssocNode (location: (14,4)-(14,8))
-        │   │   │   │   │   │   ├── key:
-        │   │   │   │   │   │   │   @ SymbolNode (location: (14,4)-(14,6))
-        │   │   │   │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   │   │   ├── value_loc: (14,4)-(14,5) = "a"
-        │   │   │   │   │   │   │   ├── closing_loc: (14,5)-(14,6) = ":"
-        │   │   │   │   │   │   │   └── unescaped: "a"
-        │   │   │   │   │   │   ├── value:
-        │   │   │   │   │   │   │   @ IntegerNode (location: (14,7)-(14,8))
-        │   │   │   │   │   │   │   ├── flags: decimal
-        │   │   │   │   │   │   │   └── value: 1
-        │   │   │   │   │   │   └── operator_loc: ∅
-        │   │   │   │   │   └── @ AssocNode (location: (14,10)-(14,15))
-        │   │   │   │   │       ├── key:
-        │   │   │   │   │       │   @ SymbolNode (location: (14,10)-(14,13))
-        │   │   │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   │       │   ├── opening_loc: ∅
-        │   │   │   │   │       │   ├── value_loc: (14,10)-(14,12) = "aa"
-        │   │   │   │   │       │   ├── closing_loc: (14,12)-(14,13) = ":"
-        │   │   │   │   │       │   └── unescaped: "aa"
-        │   │   │   │   │       ├── value:
-        │   │   │   │   │       │   @ IntegerNode (location: (14,14)-(14,15))
-        │   │   │   │   │       │   ├── flags: decimal
-        │   │   │   │   │       │   └── value: 2
-        │   │   │   │   │       └── operator_loc: ∅
-        │   │   │   │   ├── rest: ∅
-        │   │   │   │   ├── opening_loc: (14,3)-(14,4) = "{"
-        │   │   │   │   └── closing_loc: (14,15)-(14,16) = "}"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (15,2)-(15,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (15,2)-(15,6))
-        │   │   │   ├── in_loc: (14,0)-(14,2) = "in"
-        │   │   │   └── then_loc: (14,17)-(14,21) = "then"
-        │   │   ├── @ InNode (location: (16,0)-(17,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ HashPatternNode (location: (16,3)-(16,5))
-        │   │   │   │   ├── constant: ∅
-        │   │   │   │   ├── elements: (length: 0)
-        │   │   │   │   ├── rest: ∅
-        │   │   │   │   ├── opening_loc: (16,3)-(16,4) = "{"
-        │   │   │   │   └── closing_loc: (16,4)-(16,5) = "}"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (17,2)-(17,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (17,2)-(17,6))
-        │   │   │   ├── in_loc: (16,0)-(16,2) = "in"
-        │   │   │   └── then_loc: (16,6)-(16,10) = "then"
-        │   │   ├── @ InNode (location: (18,0)-(19,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ HashPatternNode (location: (18,3)-(18,10))
-        │   │   │   │   ├── constant: ∅
-        │   │   │   │   ├── elements: (length: 0)
-        │   │   │   │   ├── rest:
-        │   │   │   │   │   @ NoKeywordsParameterNode (location: (18,4)-(18,9))
-        │   │   │   │   │   ├── operator_loc: (18,4)-(18,6) = "**"
-        │   │   │   │   │   └── keyword_loc: (18,6)-(18,9) = "nil"
-        │   │   │   │   ├── opening_loc: (18,3)-(18,4) = "{"
-        │   │   │   │   └── closing_loc: (18,9)-(18,10) = "}"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (19,2)-(19,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (19,2)-(19,6))
-        │   │   │   ├── in_loc: (18,0)-(18,2) = "in"
-        │   │   │   └── then_loc: (18,11)-(18,15) = "then"
-        │   │   ├── @ InNode (location: (20,0)-(21,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ HashPatternNode (location: (20,3)-(20,11))
-        │   │   │   │   ├── constant: ∅
-        │   │   │   │   ├── elements: (length: 1)
-        │   │   │   │   │   └── @ AssocNode (location: (20,4)-(20,10))
-        │   │   │   │   │       ├── key:
-        │   │   │   │   │       │   @ SymbolNode (location: (20,4)-(20,8))
-        │   │   │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   │       │   ├── opening_loc: (20,4)-(20,5) = "\""
-        │   │   │   │   │       │   ├── value_loc: (20,5)-(20,6) = "a"
-        │   │   │   │   │       │   ├── closing_loc: (20,6)-(20,8) = "\":"
-        │   │   │   │   │       │   └── unescaped: "a"
-        │   │   │   │   │       ├── value:
-        │   │   │   │   │       │   @ IntegerNode (location: (20,9)-(20,10))
-        │   │   │   │   │       │   ├── flags: decimal
-        │   │   │   │   │       │   └── value: 1
-        │   │   │   │   │       └── operator_loc: ∅
-        │   │   │   │   ├── rest: ∅
-        │   │   │   │   ├── opening_loc: (20,3)-(20,4) = "{"
-        │   │   │   │   └── closing_loc: (20,10)-(20,11) = "}"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (21,2)-(21,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (21,2)-(21,6))
-        │   │   │   ├── in_loc: (20,0)-(20,2) = "in"
-        │   │   │   └── then_loc: (20,12)-(20,16) = "then"
-        │   │   ├── @ InNode (location: (22,0)-(23,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ AlternationPatternNode (location: (22,3)-(22,8))
-        │   │   │   │   ├── left:
-        │   │   │   │   │   @ IntegerNode (location: (22,3)-(22,4))
-        │   │   │   │   │   ├── flags: decimal
-        │   │   │   │   │   └── value: 1
-        │   │   │   │   ├── right:
-        │   │   │   │   │   @ IntegerNode (location: (22,7)-(22,8))
-        │   │   │   │   │   ├── flags: decimal
-        │   │   │   │   │   └── value: 2
-        │   │   │   │   └── operator_loc: (22,5)-(22,6) = "|"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (23,2)-(23,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (23,2)-(23,6))
-        │   │   │   ├── in_loc: (22,0)-(22,2) = "in"
-        │   │   │   └── then_loc: (22,9)-(22,13) = "then"
-        │   │   ├── @ InNode (location: (24,0)-(25,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ CapturePatternNode (location: (24,3)-(24,9))
-        │   │   │   │   ├── value:
-        │   │   │   │   │   @ IntegerNode (location: (24,3)-(24,4))
-        │   │   │   │   │   ├── flags: decimal
-        │   │   │   │   │   └── value: 1
-        │   │   │   │   ├── target:
-        │   │   │   │   │   @ LocalVariableTargetNode (location: (24,8)-(24,9))
-        │   │   │   │   │   ├── name: :a
-        │   │   │   │   │   └── depth: 0
-        │   │   │   │   └── operator_loc: (24,5)-(24,7) = "=>"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (25,2)-(25,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (25,2)-(25,6))
-        │   │   │   ├── in_loc: (24,0)-(24,2) = "in"
-        │   │   │   └── then_loc: (24,10)-(24,14) = "then"
-        │   │   ├── @ InNode (location: (26,0)-(27,6))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ PinnedVariableNode (location: (26,3)-(26,5))
-        │   │   │   │   ├── variable:
-        │   │   │   │   │   @ LocalVariableReadNode (location: (26,4)-(26,5))
-        │   │   │   │   │   ├── name: :x
-        │   │   │   │   │   └── depth: 0
-        │   │   │   │   └── operator_loc: (26,3)-(26,4) = "^"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (27,2)-(27,6))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ TrueNode (location: (27,2)-(27,6))
-        │   │   │   ├── in_loc: (26,0)-(26,2) = "in"
-        │   │   │   └── then_loc: (26,6)-(26,10) = "then"
-        │   │   ├── @ InNode (location: (28,0)-(28,4))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ IntegerNode (location: (28,3)-(28,4))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   ├── statements: ∅
-        │   │   │   ├── in_loc: (28,0)-(28,2) = "in"
-        │   │   │   └── then_loc: ∅
-        │   │   └── @ InNode (location: (29,0)-(30,6))
-        │   │       ├── pattern:
-        │   │       │   @ IntegerNode (location: (29,3)-(29,4))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (30,2)-(30,6))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ TrueNode (location: (30,2)-(30,6))
-        │   │       ├── in_loc: (29,0)-(29,2) = "in"
-        │   │       └── then_loc: (29,5)-(29,9) = "then"
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (31,0)-(33,3))
-        │   │   ├── else_keyword_loc: (31,0)-(31,4) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (32,2)-(32,6))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ TrueNode (location: (32,2)-(32,6))
-        │   │   └── end_keyword_loc: (33,0)-(33,3) = "end"
-        │   ├── case_keyword_loc: (1,0)-(1,4) = "case"
-        │   └── end_keyword_loc: (33,0)-(33,3) = "end"
-        ├── @ CaseMatchNode (location: (34,0)-(36,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (34,5)-(34,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (34,5)-(34,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (35,0)-(35,17))
-        │   │       ├── pattern:
-        │   │       │   @ ArrayPatternNode (location: (35,3)-(35,17))
-        │   │       │   ├── constant:
-        │   │       │   │   @ ConstantReadNode (location: (35,3)-(35,4))
-        │   │       │   │   └── name: :A
-        │   │       │   ├── requireds: (length: 2)
-        │   │       │   │   ├── @ IntegerNode (location: (35,5)-(35,6))
-        │   │       │   │   │   ├── flags: decimal
-        │   │       │   │   │   └── value: 1
-        │   │       │   │   └── @ IntegerNode (location: (35,8)-(35,9))
-        │   │       │   │       ├── flags: decimal
-        │   │       │   │       └── value: 2
-        │   │       │   ├── rest:
-        │   │       │   │   @ SplatNode (location: (35,11)-(35,13))
-        │   │       │   │   ├── operator_loc: (35,11)-(35,12) = "*"
-        │   │       │   │   └── expression:
-        │   │       │   │       @ LocalVariableTargetNode (location: (35,12)-(35,13))
-        │   │       │   │       ├── name: :a
-        │   │       │   │       └── depth: 0
-        │   │       │   ├── posts: (length: 1)
-        │   │       │   │   └── @ IntegerNode (location: (35,15)-(35,16))
-        │   │       │   │       ├── flags: decimal
-        │   │       │   │       └── value: 3
-        │   │       │   ├── opening_loc: (35,4)-(35,5) = "["
-        │   │       │   └── closing_loc: (35,16)-(35,17) = "]"
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (35,0)-(35,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (34,0)-(34,4) = "case"
-        │   └── end_keyword_loc: (36,0)-(36,3) = "end"
-        ├── @ CaseMatchNode (location: (37,0)-(40,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (37,5)-(37,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (37,5)-(37,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 1)
-        │   │   └── @ InNode (location: (38,0)-(38,4))
-        │   │       ├── pattern:
-        │   │       │   @ ConstantReadNode (location: (38,3)-(38,4))
-        │   │       │   └── name: :A
-        │   │       ├── statements: ∅
-        │   │       ├── in_loc: (38,0)-(38,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (39,0)-(40,3))
-        │   │   ├── else_keyword_loc: (39,0)-(39,4) = "else"
-        │   │   ├── statements: ∅
-        │   │   └── end_keyword_loc: (40,0)-(40,3) = "end"
-        │   ├── case_keyword_loc: (37,0)-(37,4) = "case"
-        │   └── end_keyword_loc: (40,0)-(40,3) = "end"
-        └── @ MatchPredicateNode (location: (41,0)-(41,8))
-            ├── value:
-            │   @ IntegerNode (location: (41,0)-(41,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── pattern:
-            │   @ ArrayPatternNode (location: (41,5)-(41,8))
-            │   ├── constant: ∅
-            │   ├── requireds: (length: 1)
-            │   │   └── @ LocalVariableTargetNode (location: (41,6)-(41,7))
-            │   │       ├── name: :a
-            │   │       └── depth: 0
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── opening_loc: (41,5)-(41,6) = "["
-            │   └── closing_loc: (41,7)-(41,8) = "]"
-            └── operator_loc: (41,2)-(41,4) = "in"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/pragma.txt b/test/mri/prism/snapshots/unparser/corpus/literal/pragma.txt
deleted file mode 100644
index 08e386b872b..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/pragma.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,7))
-    └── body: (length: 4)
-        ├── @ SourceEncodingNode (location: (1,0)-(1,12))
-        ├── @ SourceFileNode (location: (2,0)-(2,8))
-        │   ├── flags: ∅
-        │   └── filepath: "unparser/corpus/literal/pragma.txt"
-        ├── @ SourceLineNode (location: (3,0)-(3,8))
-        └── @ CallNode (location: (4,0)-(4,7))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :__dir__
-            ├── message_loc: (4,0)-(4,7) = "__dir__"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/range.txt b/test/mri/prism/snapshots/unparser/corpus/literal/range.txt
deleted file mode 100644
index ab015d04fce..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/range.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,5))
-    └── body: (length: 4)
-        ├── @ ParenthesesNode (location: (1,0)-(1,5))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,1)-(1,4))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RangeNode (location: (1,1)-(1,4))
-        │   │           ├── flags: ∅
-        │   │           ├── left:
-        │   │           │   @ IntegerNode (location: (1,1)-(1,2))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           ├── right: ∅
-        │   │           └── operator_loc: (1,2)-(1,4) = ".."
-        │   ├── opening_loc: (1,0)-(1,1) = "("
-        │   └── closing_loc: (1,4)-(1,5) = ")"
-        ├── @ RangeNode (location: (2,0)-(2,4))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ IntegerNode (location: (2,0)-(2,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ IntegerNode (location: (2,3)-(2,4))
-        │   │   ├── flags: decimal
-        │   │   └── value: 2
-        │   └── operator_loc: (2,1)-(2,3) = ".."
-        ├── @ ParenthesesNode (location: (3,0)-(3,6))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,1)-(3,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RangeNode (location: (3,1)-(3,5))
-        │   │           ├── flags: exclude_end
-        │   │           ├── left:
-        │   │           │   @ IntegerNode (location: (3,1)-(3,2))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           ├── right: ∅
-        │   │           └── operator_loc: (3,2)-(3,5) = "..."
-        │   ├── opening_loc: (3,0)-(3,1) = "("
-        │   └── closing_loc: (3,5)-(3,6) = ")"
-        └── @ RangeNode (location: (4,0)-(4,5))
-            ├── flags: exclude_end
-            ├── left:
-            │   @ IntegerNode (location: (4,0)-(4,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── right:
-            │   @ IntegerNode (location: (4,4)-(4,5))
-            │   ├── flags: decimal
-            │   └── value: 2
-            └── operator_loc: (4,1)-(4,4) = "..."
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/rescue.txt b/test/mri/prism/snapshots/unparser/corpus/literal/rescue.txt
deleted file mode 100644
index d84366f3f5b..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/rescue.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,27))
-├── locals: [:x]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,27))
-    └── body: (length: 3)
-        ├── @ RescueModifierNode (location: (1,0)-(1,14))
-        │   ├── expression:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── keyword_loc: (1,4)-(1,10) = "rescue"
-        │   └── rescue_expression:
-        │       @ CallNode (location: (1,11)-(1,14))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (1,11)-(1,14) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ RescueModifierNode (location: (2,0)-(2,21))
-        │   ├── expression:
-        │   │   @ CallNode (location: (2,0)-(2,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (2,0)-(2,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── keyword_loc: (2,4)-(2,10) = "rescue"
-        │   └── rescue_expression:
-        │       @ ReturnNode (location: (2,11)-(2,21))
-        │       ├── keyword_loc: (2,11)-(2,17) = "return"
-        │       └── arguments:
-        │           @ ArgumentsNode (location: (2,18)-(2,21))
-        │           ├── flags: ∅
-        │           └── arguments: (length: 1)
-        │               └── @ CallNode (location: (2,18)-(2,21))
-        │                   ├── flags: variable_call, ignore_visibility
-        │                   ├── receiver: ∅
-        │                   ├── call_operator_loc: ∅
-        │                   ├── name: :bar
-        │                   ├── message_loc: (2,18)-(2,21) = "bar"
-        │                   ├── opening_loc: ∅
-        │                   ├── arguments: ∅
-        │                   ├── closing_loc: ∅
-        │                   └── block: ∅
-        └── @ LocalVariableWriteNode (location: (3,0)-(3,27))
-            ├── name: :x
-            ├── depth: 0
-            ├── name_loc: (3,0)-(3,1) = "x"
-            ├── value:
-            │   @ ParenthesesNode (location: (3,4)-(3,27))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (3,5)-(3,26))
-            │   │   └── body: (length: 1)
-            │   │       └── @ RescueModifierNode (location: (3,5)-(3,26))
-            │   │           ├── expression:
-            │   │           │   @ CallNode (location: (3,5)-(3,8))
-            │   │           │   ├── flags: variable_call, ignore_visibility
-            │   │           │   ├── receiver: ∅
-            │   │           │   ├── call_operator_loc: ∅
-            │   │           │   ├── name: :foo
-            │   │           │   ├── message_loc: (3,5)-(3,8) = "foo"
-            │   │           │   ├── opening_loc: ∅
-            │   │           │   ├── arguments: ∅
-            │   │           │   ├── closing_loc: ∅
-            │   │           │   └── block: ∅
-            │   │           ├── keyword_loc: (3,9)-(3,15) = "rescue"
-            │   │           └── rescue_expression:
-            │   │               @ ReturnNode (location: (3,16)-(3,26))
-            │   │               ├── keyword_loc: (3,16)-(3,22) = "return"
-            │   │               └── arguments:
-            │   │                   @ ArgumentsNode (location: (3,23)-(3,26))
-            │   │                   ├── flags: ∅
-            │   │                   └── arguments: (length: 1)
-            │   │                       └── @ CallNode (location: (3,23)-(3,26))
-            │   │                           ├── flags: variable_call, ignore_visibility
-            │   │                           ├── receiver: ∅
-            │   │                           ├── call_operator_loc: ∅
-            │   │                           ├── name: :bar
-            │   │                           ├── message_loc: (3,23)-(3,26) = "bar"
-            │   │                           ├── opening_loc: ∅
-            │   │                           ├── arguments: ∅
-            │   │                           ├── closing_loc: ∅
-            │   │                           └── block: ∅
-            │   ├── opening_loc: (3,4)-(3,5) = "("
-            │   └── closing_loc: (3,26)-(3,27) = ")"
-            └── operator_loc: (3,2)-(3,3) = "="
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/send.txt b/test/mri/prism/snapshots/unparser/corpus/literal/send.txt
deleted file mode 100644
index b7eb064717a..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/send.txt
+++ /dev/null
@@ -1,2190 +0,0 @@
-@ ProgramNode (location: (1,0)-(84,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(84,7))
-    └── body: (length: 62)
-        ├── @ ModuleNode (location: (1,0)-(3,3))
-        │   ├── locals: [:foo, :a, :_]
-        │   ├── module_keyword_loc: (1,0)-(1,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (1,7)-(1,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,2)-(2,22))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableOrWriteNode (location: (2,2)-(2,22))
-        │   │           ├── name_loc: (2,2)-(2,5) = "foo"
-        │   │           ├── operator_loc: (2,6)-(2,9) = "||="
-        │   │           ├── value:
-        │   │           │   @ ParenthesesNode (location: (2,10)-(2,22))
-        │   │           │   ├── body:
-        │   │           │   │   @ StatementsNode (location: (2,11)-(2,21))
-        │   │           │   │   └── body: (length: 1)
-        │   │           │   │       └── @ MultiWriteNode (location: (2,11)-(2,21))
-        │   │           │   │           ├── lefts: (length: 2)
-        │   │           │   │           │   ├── @ LocalVariableTargetNode (location: (2,12)-(2,13))
-        │   │           │   │           │   │   ├── name: :a
-        │   │           │   │           │   │   └── depth: 0
-        │   │           │   │           │   └── @ LocalVariableTargetNode (location: (2,15)-(2,16))
-        │   │           │   │           │       ├── name: :_
-        │   │           │   │           │       └── depth: 0
-        │   │           │   │           ├── rest: ∅
-        │   │           │   │           ├── rights: (length: 0)
-        │   │           │   │           ├── lparen_loc: (2,11)-(2,12) = "("
-        │   │           │   │           ├── rparen_loc: (2,16)-(2,17) = ")"
-        │   │           │   │           ├── operator_loc: (2,18)-(2,19) = "="
-        │   │           │   │           └── value:
-        │   │           │   │               @ CallNode (location: (2,20)-(2,21))
-        │   │           │   │               ├── flags: variable_call, ignore_visibility
-        │   │           │   │               ├── receiver: ∅
-        │   │           │   │               ├── call_operator_loc: ∅
-        │   │           │   │               ├── name: :b
-        │   │           │   │               ├── message_loc: (2,20)-(2,21) = "b"
-        │   │           │   │               ├── opening_loc: ∅
-        │   │           │   │               ├── arguments: ∅
-        │   │           │   │               ├── closing_loc: ∅
-        │   │           │   │               └── block: ∅
-        │   │           │   ├── opening_loc: (2,10)-(2,11) = "("
-        │   │           │   └── closing_loc: (2,21)-(2,22) = ")"
-        │   │           ├── name: :foo
-        │   │           └── depth: 0
-        │   ├── end_keyword_loc: (3,0)-(3,3) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (5,0)-(8,3))
-        │   ├── locals: [:local]
-        │   ├── module_keyword_loc: (5,0)-(5,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (5,7)-(5,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (6,2)-(7,11))
-        │   │   └── body: (length: 2)
-        │   │       ├── @ LocalVariableWriteNode (location: (6,2)-(6,11))
-        │   │       │   ├── name: :local
-        │   │       │   ├── depth: 0
-        │   │       │   ├── name_loc: (6,2)-(6,7) = "local"
-        │   │       │   ├── value:
-        │   │       │   │   @ IntegerNode (location: (6,10)-(6,11))
-        │   │       │   │   ├── flags: decimal
-        │   │       │   │   └── value: 1
-        │   │       │   └── operator_loc: (6,8)-(6,9) = "="
-        │   │       └── @ CallNode (location: (7,2)-(7,11))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ LocalVariableReadNode (location: (7,2)-(7,7))
-        │   │           │   ├── name: :local
-        │   │           │   └── depth: 0
-        │   │           ├── call_operator_loc: (7,7)-(7,8) = "."
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (7,8)-(7,11) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── end_keyword_loc: (8,0)-(8,3) = "end"
-        │   └── name: :A
-        ├── @ CallNode (location: (9,0)-(10,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ClassNode (location: (9,0)-(10,3))
-        │   │   ├── locals: []
-        │   │   ├── class_keyword_loc: (9,0)-(9,5) = "class"
-        │   │   ├── constant_path:
-        │   │   │   @ ConstantReadNode (location: (9,6)-(9,7))
-        │   │   │   └── name: :A
-        │   │   ├── inheritance_operator_loc: ∅
-        │   │   ├── superclass: ∅
-        │   │   ├── body: ∅
-        │   │   ├── end_keyword_loc: (10,0)-(10,3) = "end"
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (10,3)-(10,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (10,4)-(10,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (11,0)-(12,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ModuleNode (location: (11,0)-(12,3))
-        │   │   ├── locals: []
-        │   │   ├── module_keyword_loc: (11,0)-(11,6) = "module"
-        │   │   ├── constant_path:
-        │   │   │   @ ConstantReadNode (location: (11,7)-(11,8))
-        │   │   │   └── name: :A
-        │   │   ├── body: ∅
-        │   │   ├── end_keyword_loc: (12,0)-(12,3) = "end"
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (12,3)-(12,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (12,4)-(12,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (13,0)-(15,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ BeginNode (location: (13,0)-(15,3))
-        │   │   ├── begin_keyword_loc: (13,0)-(13,5) = "begin"
-        │   │   ├── statements: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (14,0)-(14,6))
-        │   │   │   ├── keyword_loc: (14,0)-(14,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause: ∅
-        │   │   └── end_keyword_loc: (15,0)-(15,3) = "end"
-        │   ├── call_operator_loc: (15,3)-(15,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (15,4)-(15,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (16,0)-(19,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CaseNode (location: (16,0)-(19,3))
-        │   │   ├── predicate:
-        │   │   │   @ ParenthesesNode (location: (16,5)-(17,10))
-        │   │   │   ├── body:
-        │   │   │   │   @ StatementsNode (location: (16,6)-(17,9))
-        │   │   │   │   └── body: (length: 2)
-        │   │   │   │       ├── @ DefNode (location: (16,6)-(17,3))
-        │   │   │   │       │   ├── name: :foo
-        │   │   │   │       │   ├── name_loc: (16,10)-(16,13) = "foo"
-        │   │   │   │       │   ├── receiver: ∅
-        │   │   │   │       │   ├── parameters: ∅
-        │   │   │   │       │   ├── body: ∅
-        │   │   │   │       │   ├── locals: []
-        │   │   │   │       │   ├── def_keyword_loc: (16,6)-(16,9) = "def"
-        │   │   │   │       │   ├── operator_loc: ∅
-        │   │   │   │       │   ├── lparen_loc: ∅
-        │   │   │   │       │   ├── rparen_loc: ∅
-        │   │   │   │       │   ├── equal_loc: ∅
-        │   │   │   │       │   └── end_keyword_loc: (17,0)-(17,3) = "end"
-        │   │   │   │       └── @ SymbolNode (location: (17,5)-(17,9))
-        │   │   │   │           ├── flags: forced_us_ascii_encoding
-        │   │   │   │           ├── opening_loc: (17,5)-(17,6) = ":"
-        │   │   │   │           ├── value_loc: (17,6)-(17,9) = "bar"
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── unescaped: "bar"
-        │   │   │   ├── opening_loc: (16,5)-(16,6) = "("
-        │   │   │   └── closing_loc: (17,9)-(17,10) = ")"
-        │   │   ├── conditions: (length: 1)
-        │   │   │   └── @ WhenNode (location: (18,0)-(18,8))
-        │   │   │       ├── keyword_loc: (18,0)-(18,4) = "when"
-        │   │   │       ├── conditions: (length: 1)
-        │   │   │       │   └── @ CallNode (location: (18,5)-(18,8))
-        │   │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │   │       │       ├── receiver: ∅
-        │   │   │       │       ├── call_operator_loc: ∅
-        │   │   │       │       ├── name: :bar
-        │   │   │       │       ├── message_loc: (18,5)-(18,8) = "bar"
-        │   │   │       │       ├── opening_loc: ∅
-        │   │   │       │       ├── arguments: ∅
-        │   │   │       │       ├── closing_loc: ∅
-        │   │   │       │       └── block: ∅
-        │   │   │       ├── then_keyword_loc: ∅
-        │   │   │       └── statements: ∅
-        │   │   ├── consequent: ∅
-        │   │   ├── case_keyword_loc: (16,0)-(16,4) = "case"
-        │   │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        │   ├── call_operator_loc: (19,3)-(19,4) = "."
-        │   ├── name: :baz
-        │   ├── message_loc: (19,4)-(19,7) = "baz"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (20,0)-(22,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CaseNode (location: (20,0)-(22,3))
-        │   │   ├── predicate:
-        │   │   │   @ CallNode (location: (20,5)-(20,8))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (20,5)-(20,8) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── conditions: (length: 1)
-        │   │   │   └── @ WhenNode (location: (21,0)-(21,8))
-        │   │   │       ├── keyword_loc: (21,0)-(21,4) = "when"
-        │   │   │       ├── conditions: (length: 1)
-        │   │   │       │   └── @ CallNode (location: (21,5)-(21,8))
-        │   │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │   │       │       ├── receiver: ∅
-        │   │   │       │       ├── call_operator_loc: ∅
-        │   │   │       │       ├── name: :bar
-        │   │   │       │       ├── message_loc: (21,5)-(21,8) = "bar"
-        │   │   │       │       ├── opening_loc: ∅
-        │   │   │       │       ├── arguments: ∅
-        │   │   │       │       ├── closing_loc: ∅
-        │   │   │       │       └── block: ∅
-        │   │   │       ├── then_keyword_loc: ∅
-        │   │   │       └── statements: ∅
-        │   │   ├── consequent: ∅
-        │   │   ├── case_keyword_loc: (20,0)-(20,4) = "case"
-        │   │   └── end_keyword_loc: (22,0)-(22,3) = "end"
-        │   ├── call_operator_loc: (22,3)-(22,4) = "."
-        │   ├── name: :baz
-        │   ├── message_loc: (22,4)-(22,7) = "baz"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (23,0)-(24,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ SingletonClassNode (location: (23,0)-(24,3))
-        │   │   ├── locals: []
-        │   │   ├── class_keyword_loc: (23,0)-(23,5) = "class"
-        │   │   ├── operator_loc: (23,6)-(23,8) = "<<"
-        │   │   ├── expression:
-        │   │   │   @ SelfNode (location: (23,9)-(23,13))
-        │   │   ├── body: ∅
-        │   │   └── end_keyword_loc: (24,0)-(24,3) = "end"
-        │   ├── call_operator_loc: (24,3)-(24,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (24,4)-(24,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (25,0)-(26,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ DefNode (location: (25,0)-(26,3))
-        │   │   ├── name: :foo
-        │   │   ├── name_loc: (25,9)-(25,12) = "foo"
-        │   │   ├── receiver:
-        │   │   │   @ SelfNode (location: (25,4)-(25,8))
-        │   │   ├── parameters: ∅
-        │   │   ├── body: ∅
-        │   │   ├── locals: []
-        │   │   ├── def_keyword_loc: (25,0)-(25,3) = "def"
-        │   │   ├── operator_loc: (25,8)-(25,9) = "."
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── rparen_loc: ∅
-        │   │   ├── equal_loc: ∅
-        │   │   └── end_keyword_loc: (26,0)-(26,3) = "end"
-        │   ├── call_operator_loc: (26,3)-(26,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (26,4)-(26,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (27,0)-(28,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ DefNode (location: (27,0)-(28,3))
-        │   │   ├── name: :foo
-        │   │   ├── name_loc: (27,4)-(27,7) = "foo"
-        │   │   ├── receiver: ∅
-        │   │   ├── parameters: ∅
-        │   │   ├── body: ∅
-        │   │   ├── locals: []
-        │   │   ├── def_keyword_loc: (27,0)-(27,3) = "def"
-        │   │   ├── operator_loc: ∅
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── rparen_loc: ∅
-        │   │   ├── equal_loc: ∅
-        │   │   └── end_keyword_loc: (28,0)-(28,3) = "end"
-        │   ├── call_operator_loc: (28,3)-(28,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (28,4)-(28,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (29,0)-(30,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ UntilNode (location: (29,0)-(30,3))
-        │   │   ├── flags: ∅
-        │   │   ├── keyword_loc: (29,0)-(29,5) = "until"
-        │   │   ├── closing_loc: (30,0)-(30,3) = "end"
-        │   │   ├── predicate:
-        │   │   │   @ CallNode (location: (29,6)-(29,9))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (29,6)-(29,9) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── statements: ∅
-        │   ├── call_operator_loc: (30,3)-(30,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (30,4)-(30,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (31,0)-(32,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ WhileNode (location: (31,0)-(32,3))
-        │   │   ├── flags: ∅
-        │   │   ├── keyword_loc: (31,0)-(31,5) = "while"
-        │   │   ├── closing_loc: (32,0)-(32,3) = "end"
-        │   │   ├── predicate:
-        │   │   │   @ CallNode (location: (31,6)-(31,9))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (31,6)-(31,9) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── statements: ∅
-        │   ├── call_operator_loc: (32,3)-(32,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (32,4)-(32,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (33,0)-(34,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (33,0)-(34,1))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :loop
-        │   │   ├── message_loc: (33,0)-(33,4) = "loop"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (33,5)-(34,1))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (33,5)-(33,6) = "{"
-        │   │       └── closing_loc: (34,0)-(34,1) = "}"
-        │   ├── call_operator_loc: (34,1)-(34,2) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (34,2)-(34,5) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (35,0)-(36,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IfNode (location: (35,0)-(36,3))
-        │   │   ├── if_keyword_loc: (35,0)-(35,2) = "if"
-        │   │   ├── predicate:
-        │   │   │   @ CallNode (location: (35,3)-(35,6))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (35,3)-(35,6) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── then_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── consequent: ∅
-        │   │   └── end_keyword_loc: (36,0)-(36,3) = "end"
-        │   ├── call_operator_loc: (36,3)-(36,4) = "."
-        │   ├── name: :baz
-        │   ├── message_loc: (36,4)-(36,7) = "baz"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (37,0)-(37,19))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (37,0)-(37,15))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (37,1)-(37,14))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (37,1)-(37,14))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ RegularExpressionNode (location: (37,1)-(37,6))
-        │   │   │           │   ├── flags: forced_us_ascii_encoding
-        │   │   │           │   ├── opening_loc: (37,1)-(37,2) = "/"
-        │   │   │           │   ├── content_loc: (37,2)-(37,5) = "bar"
-        │   │   │           │   ├── closing_loc: (37,5)-(37,6) = "/"
-        │   │   │           │   └── unescaped: "bar"
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :=~
-        │   │   │           ├── message_loc: (37,7)-(37,9) = "=~"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (37,10)-(37,14))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ SymbolNode (location: (37,10)-(37,14))
-        │   │   │           │           ├── flags: forced_us_ascii_encoding
-        │   │   │           │           ├── opening_loc: (37,10)-(37,11) = ":"
-        │   │   │           │           ├── value_loc: (37,11)-(37,14) = "foo"
-        │   │   │           │           ├── closing_loc: ∅
-        │   │   │           │           └── unescaped: "foo"
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (37,0)-(37,1) = "("
-        │   │   └── closing_loc: (37,14)-(37,15) = ")"
-        │   ├── call_operator_loc: (37,15)-(37,16) = "."
-        │   ├── name: :foo
-        │   ├── message_loc: (37,16)-(37,19) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (38,0)-(38,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (38,0)-(38,6))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (38,1)-(38,5))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ RangeNode (location: (38,1)-(38,5))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── left:
-        │   │   │           │   @ IntegerNode (location: (38,1)-(38,2))
-        │   │   │           │   ├── flags: decimal
-        │   │   │           │   └── value: 1
-        │   │   │           ├── right:
-        │   │   │           │   @ IntegerNode (location: (38,4)-(38,5))
-        │   │   │           │   ├── flags: decimal
-        │   │   │           │   └── value: 2
-        │   │   │           └── operator_loc: (38,2)-(38,4) = ".."
-        │   │   ├── opening_loc: (38,0)-(38,1) = "("
-        │   │   └── closing_loc: (38,5)-(38,6) = ")"
-        │   ├── call_operator_loc: (38,6)-(38,7) = "."
-        │   ├── name: :max
-        │   ├── message_loc: (38,7)-(38,10) = "max"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (39,0)-(39,18))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (39,0)-(39,14))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (39,1)-(39,13))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (39,1)-(39,13))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ CallNode (location: (39,1)-(39,4))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :foo
-        │   │   │           │   ├── message_loc: (39,1)-(39,4) = "foo"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :=~
-        │   │   │           ├── message_loc: (39,5)-(39,7) = "=~"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (39,8)-(39,13))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ RegularExpressionNode (location: (39,8)-(39,13))
-        │   │   │           │           ├── flags: forced_us_ascii_encoding
-        │   │   │           │           ├── opening_loc: (39,8)-(39,9) = "/"
-        │   │   │           │           ├── content_loc: (39,9)-(39,12) = "bar"
-        │   │   │           │           ├── closing_loc: (39,12)-(39,13) = "/"
-        │   │   │           │           └── unescaped: "bar"
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (39,0)-(39,1) = "("
-        │   │   └── closing_loc: (39,13)-(39,14) = ")"
-        │   ├── call_operator_loc: (39,14)-(39,15) = "."
-        │   ├── name: :foo
-        │   ├── message_loc: (39,15)-(39,18) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (40,0)-(40,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RegularExpressionNode (location: (40,0)-(40,5))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (40,0)-(40,1) = "/"
-        │   │   ├── content_loc: (40,1)-(40,4) = "bar"
-        │   │   ├── closing_loc: (40,4)-(40,5) = "/"
-        │   │   └── unescaped: "bar"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :=~
-        │   ├── message_loc: (40,6)-(40,8) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (40,9)-(40,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SymbolNode (location: (40,9)-(40,13))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (40,9)-(40,10) = ":"
-        │   │           ├── value_loc: (40,10)-(40,13) = "foo"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "foo"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (41,0)-(41,12))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ RegularExpressionNode (location: (41,0)-(41,5))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (41,0)-(41,1) = "/"
-        │   │   ├── content_loc: (41,1)-(41,4) = "bar"
-        │   │   ├── closing_loc: (41,4)-(41,5) = "/"
-        │   │   └── unescaped: "bar"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :=~
-        │   ├── message_loc: (41,6)-(41,8) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (41,9)-(41,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (41,9)-(41,12))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (41,9)-(41,12) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ RangeNode (location: (42,0)-(42,8))
-        │   ├── flags: ∅
-        │   ├── left:
-        │   │   @ IntegerNode (location: (42,0)-(42,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── right:
-        │   │   @ CallNode (location: (42,3)-(42,8))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (42,3)-(42,4))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   ├── call_operator_loc: (42,4)-(42,5) = "."
-        │   │   ├── name: :max
-        │   │   ├── message_loc: (42,5)-(42,8) = "max"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (42,1)-(42,3) = ".."
-        ├── @ CallNode (location: (43,0)-(43,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (43,0)-(43,1))
-        │   │   └── name: :A
-        │   ├── call_operator_loc: (43,1)-(43,2) = "."
-        │   ├── name: :foo
-        │   ├── message_loc: (43,2)-(43,5) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (44,0)-(44,5))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :FOO
-        │   ├── message_loc: (44,0)-(44,3) = "FOO"
-        │   ├── opening_loc: (44,3)-(44,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (44,4)-(44,5) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (45,0)-(45,4))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (45,0)-(45,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (45,0)-(45,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (45,1)-(45,3) = "&."
-        │   ├── name: :b
-        │   ├── message_loc: (45,3)-(45,4) = "b"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (46,0)-(46,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (46,0)-(46,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (46,0)-(46,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (46,1)-(46,2) = "."
-        │   ├── name: :foo
-        │   ├── message_loc: (46,2)-(46,5) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (47,0)-(47,3))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (47,0)-(47,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (48,0)-(48,18))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (48,0)-(48,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (48,0)-(48,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<<
-        │   ├── message_loc: (48,4)-(48,6) = "<<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (48,7)-(48,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (48,7)-(48,18))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (48,8)-(48,17))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (48,8)-(48,17))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── receiver:
-        │   │           │           │   @ CallNode (location: (48,8)-(48,11))
-        │   │           │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │           │   ├── receiver: ∅
-        │   │           │           │   ├── call_operator_loc: ∅
-        │   │           │           │   ├── name: :bar
-        │   │           │           │   ├── message_loc: (48,8)-(48,11) = "bar"
-        │   │           │           │   ├── opening_loc: ∅
-        │   │           │           │   ├── arguments: ∅
-        │   │           │           │   ├── closing_loc: ∅
-        │   │           │           │   └── block: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :*
-        │   │           │           ├── message_loc: (48,12)-(48,13) = "*"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments:
-        │   │           │           │   @ ArgumentsNode (location: (48,14)-(48,17))
-        │   │           │           │   ├── flags: ∅
-        │   │           │           │   └── arguments: (length: 1)
-        │   │           │           │       └── @ CallNode (location: (48,14)-(48,17))
-        │   │           │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           │           ├── receiver: ∅
-        │   │           │           │           ├── call_operator_loc: ∅
-        │   │           │           │           ├── name: :baz
-        │   │           │           │           ├── message_loc: (48,14)-(48,17) = "baz"
-        │   │           │           │           ├── opening_loc: ∅
-        │   │           │           │           ├── arguments: ∅
-        │   │           │           │           ├── closing_loc: ∅
-        │   │           │           │           └── block: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── opening_loc: (48,7)-(48,8) = "("
-        │   │           └── closing_loc: (48,17)-(48,18) = ")"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (49,0)-(49,12))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (49,0)-(49,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (49,0)-(49,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :=~
-        │   ├── message_loc: (49,4)-(49,6) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (49,7)-(49,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ RegularExpressionNode (location: (49,7)-(49,12))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (49,7)-(49,8) = "/"
-        │   │           ├── content_loc: (49,8)-(49,11) = "bar"
-        │   │           ├── closing_loc: (49,11)-(49,12) = "/"
-        │   │           └── unescaped: "bar"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (50,0)-(50,17))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (50,0)-(50,3) = "foo"
-        │   ├── opening_loc: (50,3)-(50,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (50,17)-(50,18) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (50,4)-(50,17))
-        │       ├── expression:
-        │       │   @ ParenthesesNode (location: (50,5)-(50,17))
-        │       │   ├── body:
-        │       │   │   @ StatementsNode (location: (50,6)-(50,16))
-        │       │   │   └── body: (length: 1)
-        │       │   │       └── @ OrNode (location: (50,6)-(50,16))
-        │       │   │           ├── left:
-        │       │   │           │   @ CallNode (location: (50,6)-(50,9))
-        │       │   │           │   ├── flags: variable_call, ignore_visibility
-        │       │   │           │   ├── receiver: ∅
-        │       │   │           │   ├── call_operator_loc: ∅
-        │       │   │           │   ├── name: :foo
-        │       │   │           │   ├── message_loc: (50,6)-(50,9) = "foo"
-        │       │   │           │   ├── opening_loc: ∅
-        │       │   │           │   ├── arguments: ∅
-        │       │   │           │   ├── closing_loc: ∅
-        │       │   │           │   └── block: ∅
-        │       │   │           ├── right:
-        │       │   │           │   @ CallNode (location: (50,13)-(50,16))
-        │       │   │           │   ├── flags: variable_call, ignore_visibility
-        │       │   │           │   ├── receiver: ∅
-        │       │   │           │   ├── call_operator_loc: ∅
-        │       │   │           │   ├── name: :bar
-        │       │   │           │   ├── message_loc: (50,13)-(50,16) = "bar"
-        │       │   │           │   ├── opening_loc: ∅
-        │       │   │           │   ├── arguments: ∅
-        │       │   │           │   ├── closing_loc: ∅
-        │       │   │           │   └── block: ∅
-        │       │   │           └── operator_loc: (50,10)-(50,12) = "||"
-        │       │   ├── opening_loc: (50,5)-(50,6) = "("
-        │       │   └── closing_loc: (50,16)-(50,17) = ")"
-        │       └── operator_loc: (50,4)-(50,5) = "&"
-        ├── @ CallNode (location: (51,0)-(51,10))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (51,0)-(51,3) = "foo"
-        │   ├── opening_loc: (51,3)-(51,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (51,10)-(51,11) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (51,4)-(51,10))
-        │       ├── expression:
-        │       │   @ CallNode (location: (51,5)-(51,10))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :block
-        │       │   ├── message_loc: (51,5)-(51,10) = "block"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (51,4)-(51,5) = "&"
-        ├── @ CallNode (location: (52,0)-(52,17))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (52,0)-(52,3) = "foo"
-        │   ├── opening_loc: (52,3)-(52,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (52,4)-(52,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (52,4)-(52,9))
-        │   │           ├── operator_loc: (52,4)-(52,5) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (52,5)-(52,9))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :args
-        │   │               ├── message_loc: (52,5)-(52,9) = "args"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (52,17)-(52,18) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (52,11)-(52,17))
-        │       ├── expression:
-        │       │   @ CallNode (location: (52,12)-(52,17))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :block
-        │       │   ├── message_loc: (52,12)-(52,17) = "block"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (52,11)-(52,12) = "&"
-        ├── @ CallNode (location: (53,0)-(53,15))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (53,0)-(53,3) = "foo"
-        │   ├── opening_loc: (53,3)-(53,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (53,4)-(53,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (53,4)-(53,14))
-        │   │           ├── operator_loc: (53,4)-(53,5) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (53,5)-(53,14))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :arguments
-        │   │               ├── message_loc: (53,5)-(53,14) = "arguments"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (53,14)-(53,15) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (54,0)-(54,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (54,0)-(54,3) = "foo"
-        │   ├── opening_loc: (54,3)-(54,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (54,4)-(54,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ IntegerNode (location: (54,4)-(54,5))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── @ IntegerNode (location: (54,7)-(54,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: (54,8)-(54,9) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (55,0)-(55,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (55,0)-(55,3) = "foo"
-        │   ├── opening_loc: (55,3)-(55,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (55,4)-(55,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (55,4)-(55,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (55,4)-(55,7) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (55,7)-(55,8) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (56,0)-(56,15))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (56,0)-(56,3) = "foo"
-        │   ├── opening_loc: (56,3)-(56,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (56,4)-(56,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (56,4)-(56,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :bar
-        │   │       │   ├── message_loc: (56,4)-(56,7) = "bar"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ SplatNode (location: (56,9)-(56,14))
-        │   │           ├── operator_loc: (56,9)-(56,10) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (56,10)-(56,14))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :args
-        │   │               ├── message_loc: (56,10)-(56,14) = "args"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (56,14)-(56,15) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (57,0)-(57,17))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (57,0)-(57,3) = "foo"
-        │   ├── opening_loc: (57,3)-(57,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (57,4)-(57,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (57,4)-(57,16))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (57,4)-(57,7))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :foo
-        │   │           │   ├── message_loc: (57,4)-(57,7) = "foo"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :=~
-        │   │           ├── message_loc: (57,8)-(57,10) = "=~"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (57,11)-(57,16))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ RegularExpressionNode (location: (57,11)-(57,16))
-        │   │           │           ├── flags: forced_us_ascii_encoding
-        │   │           │           ├── opening_loc: (57,11)-(57,12) = "/"
-        │   │           │           ├── content_loc: (57,12)-(57,15) = "bar"
-        │   │           │           ├── closing_loc: (57,15)-(57,16) = "/"
-        │   │           │           └── unescaped: "bar"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (57,16)-(57,17) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (58,0)-(58,13))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (58,0)-(58,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (58,0)-(58,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (58,3)-(58,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (58,4)-(58,7) = "bar"
-        │   ├── opening_loc: (58,7)-(58,8) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (58,12)-(58,13) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (58,8)-(58,12))
-        │       ├── expression:
-        │       │   @ CallNode (location: (58,9)-(58,12))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :baz
-        │       │   ├── message_loc: (58,9)-(58,12) = "baz"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (58,8)-(58,9) = "&"
-        ├── @ CallNode (location: (59,0)-(59,26))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (59,0)-(59,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (59,0)-(59,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (59,3)-(59,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (59,4)-(59,7) = "bar"
-        │   ├── opening_loc: (59,7)-(59,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (59,8)-(59,25))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 3)
-        │   │       ├── @ SplatNode (location: (59,8)-(59,13))
-        │   │       │   ├── operator_loc: (59,8)-(59,9) = "*"
-        │   │       │   └── expression:
-        │   │       │       @ CallNode (location: (59,9)-(59,13))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :arga
-        │   │       │       ├── message_loc: (59,9)-(59,13) = "arga"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       ├── @ CallNode (location: (59,15)-(59,18))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (59,15)-(59,18) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ SplatNode (location: (59,20)-(59,25))
-        │   │           ├── operator_loc: (59,20)-(59,21) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (59,21)-(59,25))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :argb
-        │   │               ├── message_loc: (59,21)-(59,25) = "argb"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (59,25)-(59,26) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (60,0)-(60,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (60,0)-(60,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (60,0)-(60,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (60,3)-(60,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (60,4)-(60,7) = "bar"
-        │   ├── opening_loc: (60,7)-(60,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (60,8)-(60,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (60,8)-(60,13))
-        │   │           ├── operator_loc: (60,8)-(60,9) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (60,9)-(60,13))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :args
-        │   │               ├── message_loc: (60,9)-(60,13) = "args"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (60,13)-(60,14) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (61,0)-(61,19))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (61,0)-(61,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (61,0)-(61,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (61,3)-(61,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (61,4)-(61,7) = "bar"
-        │   ├── opening_loc: (61,7)-(61,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (61,8)-(61,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SplatNode (location: (61,8)-(61,13))
-        │   │       │   ├── operator_loc: (61,8)-(61,9) = "*"
-        │   │       │   └── expression:
-        │   │       │       @ CallNode (location: (61,9)-(61,13))
-        │   │       │       ├── flags: variable_call, ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :args
-        │   │       │       ├── message_loc: (61,9)-(61,13) = "args"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       └── @ CallNode (location: (61,15)-(61,18))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (61,15)-(61,18) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (61,18)-(61,19) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (62,0)-(62,19))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (62,0)-(62,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (62,0)-(62,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (62,3)-(62,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (62,4)-(62,7) = "bar"
-        │   ├── opening_loc: (62,7)-(62,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (62,8)-(62,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SymbolNode (location: (62,8)-(62,12))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (62,8)-(62,9) = ":"
-        │   │           ├── value_loc: (62,9)-(62,12) = "baz"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "baz"
-        │   ├── closing_loc: (62,18)-(62,19) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (62,14)-(62,18))
-        │       ├── expression:
-        │       │   @ CallNode (location: (62,15)-(62,18))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :baz
-        │       │   ├── message_loc: (62,15)-(62,18) = "baz"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (62,14)-(62,15) = "&"
-        ├── @ CallNode (location: (63,0)-(63,17))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (63,0)-(63,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (63,0)-(63,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (63,3)-(63,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (63,4)-(63,7) = "bar"
-        │   ├── opening_loc: (63,7)-(63,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (63,8)-(63,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (63,8)-(63,16))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (63,8)-(63,16))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (63,8)-(63,12))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (63,8)-(63,11) = "baz"
-        │   │                   │   ├── closing_loc: (63,11)-(63,12) = ":"
-        │   │                   │   └── unescaped: "baz"
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (63,13)-(63,16))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :boz
-        │   │                   │   ├── message_loc: (63,13)-(63,16) = "boz"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: (63,16)-(63,17) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (64,0)-(64,26))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (64,0)-(64,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (64,0)-(64,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (64,3)-(64,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (64,4)-(64,7) = "bar"
-        │   ├── opening_loc: (64,7)-(64,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (64,8)-(64,25))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (64,8)-(64,11))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (64,8)-(64,11) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ KeywordHashNode (location: (64,13)-(64,25))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (64,13)-(64,25))
-        │   │                   ├── key:
-        │   │                   │   @ StringNode (location: (64,13)-(64,18))
-        │   │                   │   ├── flags: frozen
-        │   │                   │   ├── opening_loc: (64,13)-(64,14) = "\""
-        │   │                   │   ├── content_loc: (64,14)-(64,17) = "baz"
-        │   │                   │   ├── closing_loc: (64,17)-(64,18) = "\""
-        │   │                   │   └── unescaped: "baz"
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (64,22)-(64,25))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :boz
-        │   │                   │   ├── message_loc: (64,22)-(64,25) = "boz"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: (64,19)-(64,21) = "=>"
-        │   ├── closing_loc: (64,25)-(64,26) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (65,0)-(65,19))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (65,0)-(65,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (65,0)-(65,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (65,3)-(65,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (65,4)-(65,7) = "bar"
-        │   ├── opening_loc: (65,7)-(65,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (65,8)-(65,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (65,8)-(65,11))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (65,8)-(65,11) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ SplatNode (location: (65,13)-(65,18))
-        │   │           ├── operator_loc: (65,13)-(65,14) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (65,14)-(65,18))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :args
-        │   │               ├── message_loc: (65,14)-(65,18) = "args"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (65,18)-(65,19) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (66,0)-(66,27))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (66,0)-(66,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (66,0)-(66,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (66,3)-(66,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (66,4)-(66,7) = "bar"
-        │   ├── opening_loc: (66,7)-(66,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (66,8)-(66,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (66,8)-(66,11))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (66,8)-(66,11) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ SplatNode (location: (66,13)-(66,18))
-        │   │           ├── operator_loc: (66,13)-(66,14) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (66,14)-(66,18))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :args
-        │   │               ├── message_loc: (66,14)-(66,18) = "args"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (66,26)-(66,27) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (66,20)-(66,26))
-        │       ├── expression:
-        │       │   @ CallNode (location: (66,21)-(66,26))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :block
-        │       │   ├── message_loc: (66,21)-(66,26) = "block"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (66,20)-(66,21) = "&"
-        ├── @ CallNode (location: (67,0)-(67,16))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (67,0)-(67,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (67,0)-(67,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (67,3)-(67,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (67,4)-(67,7) = "bar"
-        │   ├── opening_loc: (67,7)-(67,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (67,8)-(67,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (67,8)-(67,11))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (67,8)-(67,11) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ HashNode (location: (67,13)-(67,15))
-        │   │           ├── opening_loc: (67,13)-(67,14) = "{"
-        │   │           ├── elements: (length: 0)
-        │   │           └── closing_loc: (67,14)-(67,15) = "}"
-        │   ├── closing_loc: (67,15)-(67,16) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (68,0)-(68,26))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (68,0)-(68,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (68,0)-(68,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (68,3)-(68,4) = "."
-        │   ├── name: :bar
-        │   ├── message_loc: (68,4)-(68,7) = "bar"
-        │   ├── opening_loc: (68,7)-(68,8) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (68,8)-(68,25))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ HashNode (location: (68,8)-(68,20))
-        │   │       │   ├── opening_loc: (68,8)-(68,9) = "{"
-        │   │       │   ├── elements: (length: 1)
-        │   │       │   │   └── @ AssocNode (location: (68,10)-(68,18))
-        │   │       │   │       ├── key:
-        │   │       │   │       │   @ SymbolNode (location: (68,10)-(68,14))
-        │   │       │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │       │   ├── opening_loc: ∅
-        │   │       │   │       │   ├── value_loc: (68,10)-(68,13) = "foo"
-        │   │       │   │       │   ├── closing_loc: (68,13)-(68,14) = ":"
-        │   │       │   │       │   └── unescaped: "foo"
-        │   │       │   │       ├── value:
-        │   │       │   │       │   @ CallNode (location: (68,15)-(68,18))
-        │   │       │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   │       │   ├── receiver: ∅
-        │   │       │   │       │   ├── call_operator_loc: ∅
-        │   │       │   │       │   ├── name: :boz
-        │   │       │   │       │   ├── message_loc: (68,15)-(68,18) = "boz"
-        │   │       │   │       │   ├── opening_loc: ∅
-        │   │       │   │       │   ├── arguments: ∅
-        │   │       │   │       │   ├── closing_loc: ∅
-        │   │       │   │       │   └── block: ∅
-        │   │       │   │       └── operator_loc: ∅
-        │   │       │   └── closing_loc: (68,19)-(68,20) = "}"
-        │   │       └── @ CallNode (location: (68,22)-(68,25))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :boz
-        │   │           ├── message_loc: (68,22)-(68,25) = "boz"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (68,25)-(68,26) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (69,0)-(69,12))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (69,0)-(69,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (69,0)-(69,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (69,3)-(69,4) = "."
-        │   ├── name: :bar=
-        │   ├── message_loc: (69,4)-(69,7) = "bar"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (69,8)-(69,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SymbolNode (location: (69,8)-(69,12))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (69,8)-(69,9) = ":"
-        │   │           ├── value_loc: (69,9)-(69,12) = "baz"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "baz"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (70,0)-(70,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (70,0)-(70,3) = "foo"
-        │   ├── opening_loc: (70,3)-(70,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (70,4)-(70,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (70,4)-(70,8))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (70,4)-(70,8))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (70,4)-(70,6))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (70,4)-(70,5) = "a"
-        │   │                   │   ├── closing_loc: (70,5)-(70,6) = ":"
-        │   │                   │   └── unescaped: "a"
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (70,7)-(70,8))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :b
-        │   │                   │   ├── message_loc: (70,7)-(70,8) = "b"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: (70,8)-(70,9) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (71,0)-(71,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (71,0)-(71,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (71,0)-(71,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (71,3)-(71,4) = "."
-        │   ├── name: :&
-        │   ├── message_loc: (71,4)-(71,5) = "&"
-        │   ├── opening_loc: (71,5)-(71,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (71,6)-(71,10))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (71,6)-(71,10))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (71,6)-(71,10))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (71,6)-(71,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (71,6)-(71,7) = "a"
-        │   │                   │   ├── closing_loc: (71,7)-(71,8) = ":"
-        │   │                   │   └── unescaped: "a"
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (71,9)-(71,10))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :b
-        │   │                   │   ├── message_loc: (71,9)-(71,10) = "b"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: (71,10)-(71,11) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (72,0)-(72,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (72,0)-(72,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (72,0)-(72,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (72,3)-(72,4) = "."
-        │   ├── name: :&
-        │   ├── message_loc: (72,4)-(72,5) = "&"
-        │   ├── opening_loc: (72,5)-(72,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (72,6)-(72,9))
-        │   │   ├── flags: contains_keyword_splat
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (72,6)-(72,9))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocSplatNode (location: (72,6)-(72,9))
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (72,8)-(72,9))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :a
-        │   │                   │   ├── message_loc: (72,8)-(72,9) = "a"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: (72,6)-(72,8) = "**"
-        │   ├── closing_loc: (72,9)-(72,10) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (73,0)-(73,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (73,0)-(73,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (73,0)-(73,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (73,3)-(73,9) = "[*baz]"
-        │   ├── opening_loc: (73,3)-(73,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (73,4)-(73,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (73,4)-(73,8))
-        │   │           ├── operator_loc: (73,4)-(73,5) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (73,5)-(73,8))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :baz
-        │   │               ├── message_loc: (73,5)-(73,8) = "baz"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (73,8)-(73,9) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (74,0)-(74,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (74,0)-(74,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (74,0)-(74,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (74,3)-(74,9) = "[1, 2]"
-        │   ├── opening_loc: (74,3)-(74,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (74,4)-(74,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ IntegerNode (location: (74,4)-(74,5))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       └── @ IntegerNode (location: (74,7)-(74,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 2
-        │   ├── closing_loc: (74,8)-(74,9) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (75,0)-(75,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (75,0)-(75,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (75,0)-(75,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (75,3)-(75,5) = "[]"
-        │   ├── opening_loc: (75,3)-(75,4) = "["
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (75,4)-(75,5) = "]"
-        │   └── block: ∅
-        ├── @ CallNode (location: (76,0)-(76,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (76,0)-(76,4))
-        │   ├── call_operator_loc: (76,4)-(76,5) = "."
-        │   ├── name: :foo
-        │   ├── message_loc: (76,5)-(76,8) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (77,0)-(77,13))
-        │   ├── flags: attribute_write, ignore_visibility
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (77,0)-(77,4))
-        │   ├── call_operator_loc: (77,4)-(77,5) = "."
-        │   ├── name: :foo=
-        │   ├── message_loc: (77,5)-(77,8) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (77,9)-(77,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SymbolNode (location: (77,9)-(77,13))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (77,9)-(77,10) = ":"
-        │   │           ├── value_loc: (77,10)-(77,13) = "bar"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "bar"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (78,0)-(78,17))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (78,0)-(78,7))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (78,1)-(78,6))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (78,1)-(78,6))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ CallNode (location: (78,1)-(78,2))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :a
-        │   │   │           │   ├── message_loc: (78,1)-(78,2) = "a"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :+
-        │   │   │           ├── message_loc: (78,3)-(78,4) = "+"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (78,5)-(78,6))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ CallNode (location: (78,5)-(78,6))
-        │   │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │   │           │           ├── receiver: ∅
-        │   │   │           │           ├── call_operator_loc: ∅
-        │   │   │           │           ├── name: :b
-        │   │   │           │           ├── message_loc: (78,5)-(78,6) = "b"
-        │   │   │           │           ├── opening_loc: ∅
-        │   │   │           │           ├── arguments: ∅
-        │   │   │           │           ├── closing_loc: ∅
-        │   │   │           │           └── block: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (78,0)-(78,1) = "("
-        │   │   └── closing_loc: (78,6)-(78,7) = ")"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :/
-        │   ├── message_loc: (78,8)-(78,9) = "/"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (78,10)-(78,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (78,10)-(78,17))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (78,11)-(78,16))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (78,11)-(78,16))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── receiver:
-        │   │           │           │   @ CallNode (location: (78,11)-(78,12))
-        │   │           │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │           │   ├── receiver: ∅
-        │   │           │           │   ├── call_operator_loc: ∅
-        │   │           │           │   ├── name: :c
-        │   │           │           │   ├── message_loc: (78,11)-(78,12) = "c"
-        │   │           │           │   ├── opening_loc: ∅
-        │   │           │           │   ├── arguments: ∅
-        │   │           │           │   ├── closing_loc: ∅
-        │   │           │           │   └── block: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :-
-        │   │           │           ├── message_loc: (78,13)-(78,14) = "-"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments:
-        │   │           │           │   @ ArgumentsNode (location: (78,15)-(78,16))
-        │   │           │           │   ├── flags: ∅
-        │   │           │           │   └── arguments: (length: 1)
-        │   │           │           │       └── @ CallNode (location: (78,15)-(78,16))
-        │   │           │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           │           ├── receiver: ∅
-        │   │           │           │           ├── call_operator_loc: ∅
-        │   │           │           │           ├── name: :d
-        │   │           │           │           ├── message_loc: (78,15)-(78,16) = "d"
-        │   │           │           │           ├── opening_loc: ∅
-        │   │           │           │           ├── arguments: ∅
-        │   │           │           │           ├── closing_loc: ∅
-        │   │           │           │           └── block: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── opening_loc: (78,10)-(78,11) = "("
-        │   │           └── closing_loc: (78,16)-(78,17) = ")"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (79,0)-(79,19))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (79,0)-(79,7))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (79,1)-(79,6))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (79,1)-(79,6))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ CallNode (location: (79,1)-(79,2))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :a
-        │   │   │           │   ├── message_loc: (79,1)-(79,2) = "a"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :+
-        │   │   │           ├── message_loc: (79,3)-(79,4) = "+"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (79,5)-(79,6))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ CallNode (location: (79,5)-(79,6))
-        │   │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │   │           │           ├── receiver: ∅
-        │   │   │           │           ├── call_operator_loc: ∅
-        │   │   │           │           ├── name: :b
-        │   │   │           │           ├── message_loc: (79,5)-(79,6) = "b"
-        │   │   │           │           ├── opening_loc: ∅
-        │   │   │           │           ├── arguments: ∅
-        │   │   │           │           ├── closing_loc: ∅
-        │   │   │           │           └── block: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (79,0)-(79,1) = "("
-        │   │   └── closing_loc: (79,6)-(79,7) = ")"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :/
-        │   ├── message_loc: (79,8)-(79,9) = "/"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (79,10)-(79,19))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (79,10)-(79,19))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (79,10)-(79,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :c
-        │   │           │   ├── message_loc: (79,10)-(79,11) = "c"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: (79,11)-(79,12) = "."
-        │   │           ├── name: :-
-        │   │           ├── message_loc: (79,12)-(79,13) = "-"
-        │   │           ├── opening_loc: (79,13)-(79,14) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (79,14)-(79,18))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ CallNode (location: (79,14)-(79,15))
-        │   │           │       │   ├── flags: variable_call, ignore_visibility
-        │   │           │       │   ├── receiver: ∅
-        │   │           │       │   ├── call_operator_loc: ∅
-        │   │           │       │   ├── name: :e
-        │   │           │       │   ├── message_loc: (79,14)-(79,15) = "e"
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── arguments: ∅
-        │   │           │       │   ├── closing_loc: ∅
-        │   │           │       │   └── block: ∅
-        │   │           │       └── @ CallNode (location: (79,17)-(79,18))
-        │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :f
-        │   │           │           ├── message_loc: (79,17)-(79,18) = "f"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── closing_loc: (79,18)-(79,19) = ")"
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (80,0)-(80,17))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (80,0)-(80,7))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (80,1)-(80,6))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (80,1)-(80,6))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ CallNode (location: (80,1)-(80,2))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :a
-        │   │   │           │   ├── message_loc: (80,1)-(80,2) = "a"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :+
-        │   │   │           ├── message_loc: (80,3)-(80,4) = "+"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments:
-        │   │   │           │   @ ArgumentsNode (location: (80,5)-(80,6))
-        │   │   │           │   ├── flags: ∅
-        │   │   │           │   └── arguments: (length: 1)
-        │   │   │           │       └── @ CallNode (location: (80,5)-(80,6))
-        │   │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │   │           │           ├── receiver: ∅
-        │   │   │           │           ├── call_operator_loc: ∅
-        │   │   │           │           ├── name: :b
-        │   │   │           │           ├── message_loc: (80,5)-(80,6) = "b"
-        │   │   │           │           ├── opening_loc: ∅
-        │   │   │           │           ├── arguments: ∅
-        │   │   │           │           ├── closing_loc: ∅
-        │   │   │           │           └── block: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (80,0)-(80,1) = "("
-        │   │   └── closing_loc: (80,6)-(80,7) = ")"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :/
-        │   ├── message_loc: (80,8)-(80,9) = "/"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (80,10)-(80,17))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (80,10)-(80,17))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ CallNode (location: (80,10)-(80,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :c
-        │   │           │   ├── message_loc: (80,10)-(80,11) = "c"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── call_operator_loc: (80,11)-(80,12) = "."
-        │   │           ├── name: :-
-        │   │           ├── message_loc: (80,12)-(80,13) = "-"
-        │   │           ├── opening_loc: (80,13)-(80,14) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (80,14)-(80,16))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ SplatNode (location: (80,14)-(80,16))
-        │   │           │           ├── operator_loc: (80,14)-(80,15) = "*"
-        │   │           │           └── expression:
-        │   │           │               @ CallNode (location: (80,15)-(80,16))
-        │   │           │               ├── flags: variable_call, ignore_visibility
-        │   │           │               ├── receiver: ∅
-        │   │           │               ├── call_operator_loc: ∅
-        │   │           │               ├── name: :f
-        │   │           │               ├── message_loc: (80,15)-(80,16) = "f"
-        │   │           │               ├── opening_loc: ∅
-        │   │           │               ├── arguments: ∅
-        │   │           │               ├── closing_loc: ∅
-        │   │           │               └── block: ∅
-        │   │           ├── closing_loc: (80,16)-(80,17) = ")"
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (81,0)-(81,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :x
-        │   ├── message_loc: (81,0)-(81,1) = "x"
-        │   ├── opening_loc: (81,1)-(81,2) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (81,2)-(81,7))
-        │   │   ├── flags: contains_keyword_splat
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (81,2)-(81,7))
-        │   │           ├── flags: ∅
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocSplatNode (location: (81,2)-(81,7))
-        │   │                   ├── value:
-        │   │                   │   @ CallNode (location: (81,4)-(81,7))
-        │   │                   │   ├── flags: variable_call, ignore_visibility
-        │   │                   │   ├── receiver: ∅
-        │   │                   │   ├── call_operator_loc: ∅
-        │   │                   │   ├── name: :foo
-        │   │                   │   ├── message_loc: (81,4)-(81,7) = "foo"
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── arguments: ∅
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── block: ∅
-        │   │                   └── operator_loc: (81,2)-(81,4) = "**"
-        │   ├── closing_loc: (81,7)-(81,8) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (82,0)-(82,6))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (82,0)-(82,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (82,0)-(82,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (82,3)-(82,5) = "&."
-        │   ├── name: :!
-        │   ├── message_loc: (82,5)-(82,6) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (83,0)-(83,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (83,0)-(83,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (83,0)-(83,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (83,3)-(83,4) = "."
-        │   ├── name: :~
-        │   ├── message_loc: (83,4)-(83,5) = "~"
-        │   ├── opening_loc: (83,5)-(83,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (83,6)-(83,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (83,6)-(83,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (83,6)-(83,7) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (83,7)-(83,8) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (84,0)-(84,7))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (84,0)-(84,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (84,0)-(84,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (84,1)-(84,3) = "&."
-            ├── name: :+
-            ├── message_loc: (84,3)-(84,4) = "+"
-            ├── opening_loc: (84,4)-(84,5) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (84,5)-(84,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (84,5)-(84,6))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (84,5)-(84,6) = "b"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: (84,6)-(84,7) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/since/27.txt b/test/mri/prism/snapshots/unparser/corpus/literal/since/27.txt
deleted file mode 100644
index 60edc18604f..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/since/27.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,5))
-    └── body: (length: 2)
-        ├── @ LambdaNode (location: (1,0)-(3,1))
-        │   ├── locals: [:_1, :_2]
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (1,3)-(1,4) = "{"
-        │   ├── closing_loc: (3,0)-(3,1) = "}"
-        │   ├── parameters:
-        │   │   @ NumberedParametersNode (location: (1,0)-(3,1))
-        │   │   └── maximum: 2
-        │   └── body:
-        │       @ StatementsNode (location: (2,2)-(2,9))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (2,2)-(2,9))
-        │               ├── flags: ∅
-        │               ├── receiver:
-        │               │   @ LocalVariableReadNode (location: (2,2)-(2,4))
-        │               │   ├── name: :_1
-        │               │   └── depth: 0
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :+
-        │               ├── message_loc: (2,5)-(2,6) = "+"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (2,7)-(2,9))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 1)
-        │               │       └── @ LocalVariableReadNode (location: (2,7)-(2,9))
-        │               │           ├── name: :_2
-        │               │           └── depth: 0
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        └── @ ParenthesesNode (location: (4,0)-(4,5))
-            ├── body:
-            │   @ StatementsNode (location: (4,1)-(4,4))
-            │   └── body: (length: 1)
-            │       └── @ RangeNode (location: (4,1)-(4,4))
-            │           ├── flags: ∅
-            │           ├── left: ∅
-            │           ├── right:
-            │           │   @ IntegerNode (location: (4,3)-(4,4))
-            │           │   ├── flags: decimal
-            │           │   └── value: 1
-            │           └── operator_loc: (4,1)-(4,3) = ".."
-            ├── opening_loc: (4,0)-(4,1) = "("
-            └── closing_loc: (4,4)-(4,5) = ")"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/since/30.txt b/test/mri/prism/snapshots/unparser/corpus/literal/since/30.txt
deleted file mode 100644
index 300dd869f5a..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/since/30.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,17))
-├── locals: [:a, :foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,17))
-    └── body: (length: 4)
-        ├── @ MatchRequiredNode (location: (1,0)-(1,8))
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,0)-(1,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (1,5)-(1,8))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (1,6)-(1,7))
-        │   │   │       ├── name: :a
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (1,5)-(1,6) = "["
-        │   │   └── closing_loc: (1,7)-(1,8) = "]"
-        │   └── operator_loc: (1,2)-(1,4) = "=>"
-        ├── @ MatchRequiredNode (location: (2,0)-(2,8))
-        │   ├── value:
-        │   │   @ IntegerNode (location: (2,0)-(2,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (2,5)-(2,8))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ SplatNode (location: (2,6)-(2,7))
-        │   │   │   ├── operator_loc: (2,6)-(2,7) = "*"
-        │   │   │   └── expression: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (2,5)-(2,6) = "["
-        │   │   └── closing_loc: (2,7)-(2,8) = "]"
-        │   └── operator_loc: (2,2)-(2,4) = "=>"
-        ├── @ MatchPredicateNode (location: (3,0)-(3,15))
-        │   ├── value:
-        │   │   @ IntegerNode (location: (3,0)-(3,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── pattern:
-        │   │   @ FindPatternNode (location: (3,5)-(3,15))
-        │   │   ├── constant: ∅
-        │   │   ├── left:
-        │   │   │   @ SplatNode (location: (3,6)-(3,7))
-        │   │   │   ├── operator_loc: (3,6)-(3,7) = "*"
-        │   │   │   └── expression: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ IntegerNode (location: (3,9)-(3,11))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 42
-        │   │   ├── right:
-        │   │   │   @ SplatNode (location: (3,13)-(3,14))
-        │   │   │   ├── operator_loc: (3,13)-(3,14) = "*"
-        │   │   │   └── expression: ∅
-        │   │   ├── opening_loc: (3,5)-(3,6) = "["
-        │   │   └── closing_loc: (3,14)-(3,15) = "]"
-        │   └── operator_loc: (3,2)-(3,4) = "in"
-        └── @ MatchPredicateNode (location: (4,0)-(4,17))
-            ├── value:
-            │   @ IntegerNode (location: (4,0)-(4,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── pattern:
-            │   @ FindPatternNode (location: (4,5)-(4,17))
-            │   ├── constant: ∅
-            │   ├── left:
-            │   │   @ SplatNode (location: (4,6)-(4,7))
-            │   │   ├── operator_loc: (4,6)-(4,7) = "*"
-            │   │   └── expression: ∅
-            │   ├── requireds: (length: 1)
-            │   │   └── @ LocalVariableTargetNode (location: (4,9)-(4,10))
-            │   │       ├── name: :a
-            │   │       └── depth: 0
-            │   ├── right:
-            │   │   @ SplatNode (location: (4,12)-(4,16))
-            │   │   ├── operator_loc: (4,12)-(4,13) = "*"
-            │   │   └── expression:
-            │   │       @ LocalVariableTargetNode (location: (4,13)-(4,16))
-            │   │       ├── name: :foo
-            │   │       └── depth: 0
-            │   ├── opening_loc: (4,5)-(4,6) = "["
-            │   └── closing_loc: (4,16)-(4,17) = "]"
-            └── operator_loc: (4,2)-(4,4) = "in"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/since/31.txt b/test/mri/prism/snapshots/unparser/corpus/literal/since/31.txt
deleted file mode 100644
index 142a56ae832..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/since/31.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,3))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(3,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,8)-(1,9))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (1,8)-(1,9))
-        │   │       ├── flags: ∅
-        │   │       ├── name: ∅
-        │   │       ├── name_loc: ∅
-        │   │       └── operator_loc: (1,8)-(1,9) = "&"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,2)-(2,7))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,2)-(2,7))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (2,2)-(2,5) = "bar"
-        │   │           ├── opening_loc: (2,5)-(2,6) = "("
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: (2,7)-(2,8) = ")"
-        │   │           └── block:
-        │   │               @ BlockArgumentNode (location: (2,6)-(2,7))
-        │   │               ├── expression: ∅
-        │   │               └── operator_loc: (2,6)-(2,7) = "&"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,7)-(1,8) = "("
-        │   ├── rparen_loc: (1,9)-(1,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        └── @ DefNode (location: (5,0)-(7,3))
-            ├── name: :foo
-            ├── name_loc: (5,4)-(5,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (5,8)-(5,12))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (5,8)-(5,9))
-            │   │       ├── flags: ∅
-            │   │       └── name: :a
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block:
-            │       @ BlockParameterNode (location: (5,11)-(5,12))
-            │       ├── flags: ∅
-            │       ├── name: ∅
-            │       ├── name_loc: ∅
-            │       └── operator_loc: (5,11)-(5,12) = "&"
-            ├── body:
-            │   @ StatementsNode (location: (6,2)-(6,7))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (6,2)-(6,7))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (6,2)-(6,5) = "bar"
-            │           ├── opening_loc: (6,5)-(6,6) = "("
-            │           ├── arguments: ∅
-            │           ├── closing_loc: (6,7)-(6,8) = ")"
-            │           └── block:
-            │               @ BlockArgumentNode (location: (6,6)-(6,7))
-            │               ├── expression: ∅
-            │               └── operator_loc: (6,6)-(6,7) = "&"
-            ├── locals: [:a]
-            ├── def_keyword_loc: (5,0)-(5,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (5,7)-(5,8) = "("
-            ├── rparen_loc: (5,12)-(5,13) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (7,0)-(7,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/since/32.txt b/test/mri/prism/snapshots/unparser/corpus/literal/since/32.txt
deleted file mode 100644
index ee8dd7f53d1..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/since/32.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,3))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(3,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,8)-(1,20))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (1,8)-(1,16))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :argument
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ KeywordRestParameterNode (location: (1,18)-(1,20))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (1,18)-(1,20) = "**"
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,2)-(2,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,2)-(2,19))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (2,2)-(2,5) = "bar"
-        │   │           ├── opening_loc: (2,5)-(2,6) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (2,6)-(2,18))
-        │   │           │   ├── flags: contains_keyword_splat
-        │   │           │   └── arguments: (length: 2)
-        │   │           │       ├── @ LocalVariableReadNode (location: (2,6)-(2,14))
-        │   │           │       │   ├── name: :argument
-        │   │           │       │   └── depth: 0
-        │   │           │       └── @ KeywordHashNode (location: (2,16)-(2,18))
-        │   │           │           ├── flags: ∅
-        │   │           │           └── elements: (length: 1)
-        │   │           │               └── @ AssocSplatNode (location: (2,16)-(2,18))
-        │   │           │                   ├── value: ∅
-        │   │           │                   └── operator_loc: (2,16)-(2,18) = "**"
-        │   │           ├── closing_loc: (2,18)-(2,19) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: [:argument]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,7)-(1,8) = "("
-        │   ├── rparen_loc: (1,20)-(1,21) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        └── @ DefNode (location: (5,0)-(7,3))
-            ├── name: :foo
-            ├── name_loc: (5,4)-(5,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (5,8)-(5,19))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (5,8)-(5,16))
-            │   │       ├── flags: ∅
-            │   │       └── name: :argument
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (5,18)-(5,19))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (5,18)-(5,19) = "*"
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (6,2)-(6,18))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (6,2)-(6,18))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (6,2)-(6,5) = "bar"
-            │           ├── opening_loc: (6,5)-(6,6) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (6,6)-(6,17))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 2)
-            │           │       ├── @ LocalVariableReadNode (location: (6,6)-(6,14))
-            │           │       │   ├── name: :argument
-            │           │       │   └── depth: 0
-            │           │       └── @ SplatNode (location: (6,16)-(6,17))
-            │           │           ├── operator_loc: (6,16)-(6,17) = "*"
-            │           │           └── expression: ∅
-            │           ├── closing_loc: (6,17)-(6,18) = ")"
-            │           └── block: ∅
-            ├── locals: [:argument]
-            ├── def_keyword_loc: (5,0)-(5,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (5,7)-(5,8) = "("
-            ├── rparen_loc: (5,19)-(5,20) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (7,0)-(7,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/singletons.txt b/test/mri/prism/snapshots/unparser/corpus/literal/singletons.txt
deleted file mode 100644
index 45c06f7b07d..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/singletons.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,4))
-    └── body: (length: 4)
-        ├── @ FalseNode (location: (1,0)-(1,5))
-        ├── @ NilNode (location: (2,0)-(2,3))
-        ├── @ SelfNode (location: (3,0)-(3,4))
-        └── @ TrueNode (location: (4,0)-(4,4))
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/super.txt b/test/mri/prism/snapshots/unparser/corpus/literal/super.txt
deleted file mode 100644
index d5a78899197..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/super.txt
+++ /dev/null
@@ -1,277 +0,0 @@
-@ ProgramNode (location: (1,0)-(21,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(21,1))
-    └── body: (length: 11)
-        ├── @ ForwardingSuperNode (location: (1,0)-(1,5))
-        │   └── block: ∅
-        ├── @ SuperNode (location: (2,0)-(2,7))
-        │   ├── keyword_loc: (2,0)-(2,5) = "super"
-        │   ├── lparen_loc: (2,5)-(2,6) = "("
-        │   ├── arguments: ∅
-        │   ├── rparen_loc: (2,6)-(2,7) = ")"
-        │   └── block: ∅
-        ├── @ SuperNode (location: (3,0)-(3,8))
-        │   ├── keyword_loc: (3,0)-(3,5) = "super"
-        │   ├── lparen_loc: (3,5)-(3,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,6)-(3,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,6)-(3,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (3,6)-(3,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rparen_loc: (3,7)-(3,8) = ")"
-        │   └── block: ∅
-        ├── @ SuperNode (location: (4,0)-(4,11))
-        │   ├── keyword_loc: (4,0)-(4,5) = "super"
-        │   ├── lparen_loc: (4,5)-(4,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (4,6)-(4,10))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (4,6)-(4,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :a
-        │   │       │   ├── message_loc: (4,6)-(4,7) = "a"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (4,9)-(4,10))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (4,9)-(4,10) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rparen_loc: (4,10)-(4,11) = ")"
-        │   └── block: ∅
-        ├── @ SuperNode (location: (5,0)-(5,13))
-        │   ├── keyword_loc: (5,0)-(5,5) = "super"
-        │   ├── lparen_loc: (5,5)-(5,6) = "("
-        │   ├── arguments: ∅
-        │   ├── rparen_loc: (5,12)-(5,13) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (5,6)-(5,12))
-        │       ├── expression:
-        │       │   @ CallNode (location: (5,7)-(5,12))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :block
-        │       │   ├── message_loc: (5,7)-(5,12) = "block"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (5,6)-(5,7) = "&"
-        ├── @ SuperNode (location: (6,0)-(6,16))
-        │   ├── keyword_loc: (6,0)-(6,5) = "super"
-        │   ├── lparen_loc: (6,5)-(6,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (6,6)-(6,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (6,6)-(6,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (6,6)-(6,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rparen_loc: (6,15)-(6,16) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (6,9)-(6,15))
-        │       ├── expression:
-        │       │   @ CallNode (location: (6,10)-(6,15))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :block
-        │       │   ├── message_loc: (6,10)-(6,15) = "block"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (6,9)-(6,10) = "&"
-        ├── @ SuperNode (location: (7,0)-(9,2))
-        │   ├── keyword_loc: (7,0)-(7,5) = "super"
-        │   ├── lparen_loc: (7,5)-(7,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,6)-(9,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (7,6)-(9,1))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (7,6)-(7,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (7,8)-(9,1))
-        │   │               ├── locals: []
-        │   │               ├── parameters: ∅
-        │   │               ├── body:
-        │   │               │   @ StatementsNode (location: (8,2)-(8,5))
-        │   │               │   └── body: (length: 1)
-        │   │               │       └── @ CallNode (location: (8,2)-(8,5))
-        │   │               │           ├── flags: variable_call, ignore_visibility
-        │   │               │           ├── receiver: ∅
-        │   │               │           ├── call_operator_loc: ∅
-        │   │               │           ├── name: :foo
-        │   │               │           ├── message_loc: (8,2)-(8,5) = "foo"
-        │   │               │           ├── opening_loc: ∅
-        │   │               │           ├── arguments: ∅
-        │   │               │           ├── closing_loc: ∅
-        │   │               │           └── block: ∅
-        │   │               ├── opening_loc: (7,8)-(7,9) = "{"
-        │   │               └── closing_loc: (9,0)-(9,1) = "}"
-        │   ├── rparen_loc: (9,1)-(9,2) = ")"
-        │   └── block: ∅
-        ├── @ ForwardingSuperNode (location: (10,0)-(12,1))
-        │   └── block:
-        │       @ BlockNode (location: (10,6)-(12,1))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (11,2)-(11,5))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (11,2)-(11,5))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :foo
-        │       │           ├── message_loc: (11,2)-(11,5) = "foo"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (10,6)-(10,7) = "{"
-        │       └── closing_loc: (12,0)-(12,1) = "}"
-        ├── @ SuperNode (location: (13,0)-(15,1))
-        │   ├── keyword_loc: (13,0)-(13,5) = "super"
-        │   ├── lparen_loc: (13,5)-(13,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (13,6)-(13,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (13,6)-(13,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (13,6)-(13,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rparen_loc: (13,7)-(13,8) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (13,9)-(15,1))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (14,2)-(14,5))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (14,2)-(14,5))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :foo
-        │       │           ├── message_loc: (14,2)-(14,5) = "foo"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (13,9)-(13,10) = "{"
-        │       └── closing_loc: (15,0)-(15,1) = "}"
-        ├── @ SuperNode (location: (16,0)-(18,1))
-        │   ├── keyword_loc: (16,0)-(16,5) = "super"
-        │   ├── lparen_loc: (16,5)-(16,6) = "("
-        │   ├── arguments: ∅
-        │   ├── rparen_loc: (16,6)-(16,7) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (16,8)-(18,1))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (17,2)-(17,5))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (17,2)-(17,5))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :foo
-        │       │           ├── message_loc: (17,2)-(17,5) = "foo"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (16,8)-(16,9) = "{"
-        │       └── closing_loc: (18,0)-(18,1) = "}"
-        └── @ SuperNode (location: (19,0)-(21,1))
-            ├── keyword_loc: (19,0)-(19,5) = "super"
-            ├── lparen_loc: (19,5)-(19,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (19,6)-(19,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (19,6)-(19,7))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :a
-            │       │   ├── message_loc: (19,6)-(19,7) = "a"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ CallNode (location: (19,9)-(19,10))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (19,9)-(19,10) = "b"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rparen_loc: (19,10)-(19,11) = ")"
-            └── block:
-                @ BlockNode (location: (19,12)-(21,1))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (20,2)-(20,5))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (20,2)-(20,5))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :foo
-                │           ├── message_loc: (20,2)-(20,5) = "foo"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (19,12)-(19,13) = "{"
-                └── closing_loc: (21,0)-(21,1) = "}"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/unary.txt b/test/mri/prism/snapshots/unparser/corpus/literal/unary.txt
deleted file mode 100644
index 5e9563d811d..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/unary.txt
+++ /dev/null
@@ -1,248 +0,0 @@
-@ ProgramNode (location: (1,0)-(8,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(8,9))
-    └── body: (length: 8)
-        ├── @ CallNode (location: (1,0)-(1,2))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ IntegerNode (location: (1,1)-(1,2))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (1,0)-(1,1) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (2,0)-(2,5))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (2,1)-(2,5))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (2,2)-(2,4))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (2,2)-(2,4))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ IntegerNode (location: (2,3)-(2,4))
-        │   │   │           │   ├── flags: decimal
-        │   │   │           │   └── value: 1
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :!
-        │   │   │           ├── message_loc: (2,2)-(2,3) = "!"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (2,1)-(2,2) = "("
-        │   │   └── closing_loc: (2,4)-(2,5) = ")"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (2,0)-(2,1) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,16))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (3,1)-(3,16))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (3,2)-(3,15))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (3,2)-(3,15))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── receiver:
-        │   │   │           │   @ ParenthesesNode (location: (3,3)-(3,15))
-        │   │   │           │   ├── body:
-        │   │   │           │   │   @ StatementsNode (location: (3,4)-(3,14))
-        │   │   │           │   │   └── body: (length: 1)
-        │   │   │           │   │       └── @ OrNode (location: (3,4)-(3,14))
-        │   │   │           │   │           ├── left:
-        │   │   │           │   │           │   @ CallNode (location: (3,4)-(3,7))
-        │   │   │           │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   │           │   ├── receiver: ∅
-        │   │   │           │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   │           │   ├── name: :foo
-        │   │   │           │   │           │   ├── message_loc: (3,4)-(3,7) = "foo"
-        │   │   │           │   │           │   ├── opening_loc: ∅
-        │   │   │           │   │           │   ├── arguments: ∅
-        │   │   │           │   │           │   ├── closing_loc: ∅
-        │   │   │           │   │           │   └── block: ∅
-        │   │   │           │   │           ├── right:
-        │   │   │           │   │           │   @ CallNode (location: (3,11)-(3,14))
-        │   │   │           │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   │           │   ├── receiver: ∅
-        │   │   │           │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   │           │   ├── name: :bar
-        │   │   │           │   │           │   ├── message_loc: (3,11)-(3,14) = "bar"
-        │   │   │           │   │           │   ├── opening_loc: ∅
-        │   │   │           │   │           │   ├── arguments: ∅
-        │   │   │           │   │           │   ├── closing_loc: ∅
-        │   │   │           │   │           │   └── block: ∅
-        │   │   │           │   │           └── operator_loc: (3,8)-(3,10) = "||"
-        │   │   │           │   ├── opening_loc: (3,3)-(3,4) = "("
-        │   │   │           │   └── closing_loc: (3,14)-(3,15) = ")"
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :!
-        │   │   │           ├── message_loc: (3,2)-(3,3) = "!"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: (3,1)-(3,2) = "("
-        │   │   └── closing_loc: (3,15)-(3,16) = ")"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (3,0)-(3,1) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (4,0)-(4,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (4,1)-(4,9))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ ParenthesesNode (location: (4,1)-(4,5))
-        │   │   │   ├── body:
-        │   │   │   │   @ StatementsNode (location: (4,2)-(4,4))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (4,2)-(4,4))
-        │   │   │   │           ├── flags: ∅
-        │   │   │   │           ├── receiver:
-        │   │   │   │           │   @ IntegerNode (location: (4,3)-(4,4))
-        │   │   │   │           │   ├── flags: decimal
-        │   │   │   │           │   └── value: 1
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :!
-        │   │   │   │           ├── message_loc: (4,2)-(4,3) = "!"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── opening_loc: (4,1)-(4,2) = "("
-        │   │   │   └── closing_loc: (4,4)-(4,5) = ")"
-        │   │   ├── call_operator_loc: (4,5)-(4,6) = "."
-        │   │   ├── name: :baz
-        │   │   ├── message_loc: (4,6)-(4,9) = "baz"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (4,0)-(4,1) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,2))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (5,1)-(5,2))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (5,1)-(5,2) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :~
-        │   ├── message_loc: (5,0)-(5,1) = "~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (6,0)-(6,2))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (6,1)-(6,2))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (6,1)-(6,2) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :-@
-        │   ├── message_loc: (6,0)-(6,1) = "-"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (7,0)-(7,2))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (7,1)-(7,2))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (7,1)-(7,2) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+@
-        │   ├── message_loc: (7,0)-(7,1) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (8,0)-(8,9))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (8,1)-(8,9))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ ParenthesesNode (location: (8,1)-(8,5))
-            │   │   ├── body:
-            │   │   │   @ StatementsNode (location: (8,2)-(8,4))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (8,2)-(8,4))
-            │   │   │           ├── flags: ∅
-            │   │   │           ├── receiver:
-            │   │   │           │   @ CallNode (location: (8,3)-(8,4))
-            │   │   │           │   ├── flags: variable_call, ignore_visibility
-            │   │   │           │   ├── receiver: ∅
-            │   │   │           │   ├── call_operator_loc: ∅
-            │   │   │           │   ├── name: :a
-            │   │   │           │   ├── message_loc: (8,3)-(8,4) = "a"
-            │   │   │           │   ├── opening_loc: ∅
-            │   │   │           │   ├── arguments: ∅
-            │   │   │           │   ├── closing_loc: ∅
-            │   │   │           │   └── block: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :-@
-            │   │   │           ├── message_loc: (8,2)-(8,3) = "-"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   ├── opening_loc: (8,1)-(8,2) = "("
-            │   │   └── closing_loc: (8,4)-(8,5) = ")"
-            │   ├── call_operator_loc: (8,5)-(8,6) = "."
-            │   ├── name: :foo
-            │   ├── message_loc: (8,6)-(8,9) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :-@
-            ├── message_loc: (8,0)-(8,1) = "-"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/undef.txt b/test/mri/prism/snapshots/unparser/corpus/literal/undef.txt
deleted file mode 100644
index 282cbe8f872..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/undef.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,16))
-    └── body: (length: 2)
-        ├── @ UndefNode (location: (1,0)-(1,10))
-        │   ├── names: (length: 1)
-        │   │   └── @ SymbolNode (location: (1,6)-(1,10))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: (1,6)-(1,7) = ":"
-        │   │       ├── value_loc: (1,7)-(1,10) = "foo"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "foo"
-        │   └── keyword_loc: (1,0)-(1,5) = "undef"
-        └── @ UndefNode (location: (2,0)-(2,16))
-            ├── names: (length: 2)
-            │   ├── @ SymbolNode (location: (2,6)-(2,10))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: (2,6)-(2,7) = ":"
-            │   │   ├── value_loc: (2,7)-(2,10) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   └── @ SymbolNode (location: (2,12)-(2,16))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: (2,12)-(2,13) = ":"
-            │       ├── value_loc: (2,13)-(2,16) = "bar"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "bar"
-            └── keyword_loc: (2,0)-(2,5) = "undef"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/variables.txt b/test/mri/prism/snapshots/unparser/corpus/literal/variables.txt
deleted file mode 100644
index bf79de385c4..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/variables.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@ ProgramNode (location: (1,0)-(10,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(10,17))
-    └── body: (length: 10)
-        ├── @ CallNode (location: (1,0)-(1,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ InstanceVariableReadNode (location: (2,0)-(2,2))
-        │   └── name: :@a
-        ├── @ ClassVariableReadNode (location: (3,0)-(3,3))
-        │   └── name: :@@a
-        ├── @ GlobalVariableReadNode (location: (4,0)-(4,2))
-        │   └── name: :$a
-        ├── @ NumberedReferenceReadNode (location: (5,0)-(5,2))
-        │   └── number: 1
-        ├── @ BackReferenceReadNode (location: (6,0)-(6,2))
-        │   └── name: :$`
-        ├── @ ConstantReadNode (location: (7,0)-(7,5))
-        │   └── name: :CONST
-        ├── @ ConstantPathNode (location: (8,0)-(8,13))
-        │   ├── parent:
-        │   │   @ ConstantReadNode (location: (8,0)-(8,6))
-        │   │   └── name: :SCOPED
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (8,8)-(8,13))
-        │   │   └── name: :CONST
-        │   └── delimiter_loc: (8,6)-(8,8) = "::"
-        ├── @ ConstantPathNode (location: (9,0)-(9,10))
-        │   ├── parent: ∅
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (9,2)-(9,10))
-        │   │   └── name: :TOPLEVEL
-        │   └── delimiter_loc: (9,0)-(9,2) = "::"
-        └── @ ConstantPathNode (location: (10,0)-(10,17))
-            ├── parent:
-            │   @ ConstantPathNode (location: (10,0)-(10,10))
-            │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (10,2)-(10,10))
-            │   │   └── name: :TOPLEVEL
-            │   └── delimiter_loc: (10,0)-(10,2) = "::"
-            ├── child:
-            │   @ ConstantReadNode (location: (10,12)-(10,17))
-            │   └── name: :CONST
-            └── delimiter_loc: (10,10)-(10,12) = "::"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/while.txt b/test/mri/prism/snapshots/unparser/corpus/literal/while.txt
deleted file mode 100644
index 0f752f3392d..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/while.txt
+++ /dev/null
@@ -1,704 +0,0 @@
-@ ProgramNode (location: (1,0)-(73,3))
-├── locals: [:x]
-└── statements:
-    @ StatementsNode (location: (1,0)-(73,3))
-    └── body: (length: 17)
-        ├── @ ModuleNode (location: (1,0)-(7,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (1,0)-(1,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (1,7)-(1,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,2)-(6,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,2)-(6,3))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (2,2)-(2,5) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (2,6)-(6,3))
-        │   │               ├── locals: [:bar, :foo]
-        │   │               ├── parameters:
-        │   │               │   @ BlockParametersNode (location: (2,8)-(2,13))
-        │   │               │   ├── parameters:
-        │   │               │   │   @ ParametersNode (location: (2,9)-(2,12))
-        │   │               │   │   ├── requireds: (length: 1)
-        │   │               │   │   │   └── @ RequiredParameterNode (location: (2,9)-(2,12))
-        │   │               │   │   │       ├── flags: ∅
-        │   │               │   │   │       └── name: :bar
-        │   │               │   │   ├── optionals: (length: 0)
-        │   │               │   │   ├── rest: ∅
-        │   │               │   │   ├── posts: (length: 0)
-        │   │               │   │   ├── keywords: (length: 0)
-        │   │               │   │   ├── keyword_rest: ∅
-        │   │               │   │   └── block: ∅
-        │   │               │   ├── locals: (length: 0)
-        │   │               │   ├── opening_loc: (2,8)-(2,9) = "|"
-        │   │               │   └── closing_loc: (2,12)-(2,13) = "|"
-        │   │               ├── body:
-        │   │               │   @ StatementsNode (location: (3,4)-(5,7))
-        │   │               │   └── body: (length: 1)
-        │   │               │       └── @ WhileNode (location: (3,4)-(5,7))
-        │   │               │           ├── flags: ∅
-        │   │               │           ├── keyword_loc: (3,4)-(3,9) = "while"
-        │   │               │           ├── closing_loc: (5,4)-(5,7) = "end"
-        │   │               │           ├── predicate:
-        │   │               │           │   @ CallNode (location: (3,10)-(3,13))
-        │   │               │           │   ├── flags: variable_call, ignore_visibility
-        │   │               │           │   ├── receiver: ∅
-        │   │               │           │   ├── call_operator_loc: ∅
-        │   │               │           │   ├── name: :foo
-        │   │               │           │   ├── message_loc: (3,10)-(3,13) = "foo"
-        │   │               │           │   ├── opening_loc: ∅
-        │   │               │           │   ├── arguments: ∅
-        │   │               │           │   ├── closing_loc: ∅
-        │   │               │           │   └── block: ∅
-        │   │               │           └── statements:
-        │   │               │               @ StatementsNode (location: (4,6)-(4,15))
-        │   │               │               └── body: (length: 1)
-        │   │               │                   └── @ LocalVariableWriteNode (location: (4,6)-(4,15))
-        │   │               │                       ├── name: :foo
-        │   │               │                       ├── depth: 0
-        │   │               │                       ├── name_loc: (4,6)-(4,9) = "foo"
-        │   │               │                       ├── value:
-        │   │               │                       │   @ LocalVariableReadNode (location: (4,12)-(4,15))
-        │   │               │                       │   ├── name: :bar
-        │   │               │                       │   └── depth: 0
-        │   │               │                       └── operator_loc: (4,10)-(4,11) = "="
-        │   │               ├── opening_loc: (2,6)-(2,7) = "{"
-        │   │               └── closing_loc: (6,2)-(6,3) = "}"
-        │   ├── end_keyword_loc: (7,0)-(7,3) = "end"
-        │   └── name: :A
-        ├── @ DefNode (location: (9,0)-(11,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (9,4)-(9,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (10,2)-(10,28))
-        │   │   └── body: (length: 1)
-        │   │       └── @ WhileNode (location: (10,2)-(10,28))
-        │   │           ├── flags: ∅
-        │   │           ├── keyword_loc: (10,12)-(10,17) = "while"
-        │   │           ├── closing_loc: ∅
-        │   │           ├── predicate:
-        │   │           │   @ CallNode (location: (10,18)-(10,28))
-        │   │           │   ├── flags: ∅
-        │   │           │   ├── receiver:
-        │   │           │   │   @ LocalVariableReadNode (location: (10,18)-(10,21))
-        │   │           │   │   ├── name: :foo
-        │   │           │   │   └── depth: 0
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :!=
-        │   │           │   ├── message_loc: (10,22)-(10,24) = "!="
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments:
-        │   │           │   │   @ ArgumentsNode (location: (10,25)-(10,28))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   └── arguments: (length: 1)
-        │   │           │   │       └── @ CallNode (location: (10,25)-(10,28))
-        │   │           │   │           ├── flags: variable_call, ignore_visibility
-        │   │           │   │           ├── receiver: ∅
-        │   │           │   │           ├── call_operator_loc: ∅
-        │   │           │   │           ├── name: :baz
-        │   │           │   │           ├── message_loc: (10,25)-(10,28) = "baz"
-        │   │           │   │           ├── opening_loc: ∅
-        │   │           │   │           ├── arguments: ∅
-        │   │           │   │           ├── closing_loc: ∅
-        │   │           │   │           └── block: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           └── statements:
-        │   │               @ StatementsNode (location: (10,2)-(10,11))
-        │   │               └── body: (length: 1)
-        │   │                   └── @ LocalVariableWriteNode (location: (10,2)-(10,11))
-        │   │                       ├── name: :foo
-        │   │                       ├── depth: 0
-        │   │                       ├── name_loc: (10,2)-(10,5) = "foo"
-        │   │                       ├── value:
-        │   │                       │   @ CallNode (location: (10,8)-(10,11))
-        │   │                       │   ├── flags: variable_call, ignore_visibility
-        │   │                       │   ├── receiver: ∅
-        │   │                       │   ├── call_operator_loc: ∅
-        │   │                       │   ├── name: :bar
-        │   │                       │   ├── message_loc: (10,8)-(10,11) = "bar"
-        │   │                       │   ├── opening_loc: ∅
-        │   │                       │   ├── arguments: ∅
-        │   │                       │   ├── closing_loc: ∅
-        │   │                       │   └── block: ∅
-        │   │                       └── operator_loc: (10,6)-(10,7) = "="
-        │   ├── locals: [:foo]
-        │   ├── def_keyword_loc: (9,0)-(9,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        ├── @ ModuleNode (location: (13,0)-(15,3))
-        │   ├── locals: [:foo]
-        │   ├── module_keyword_loc: (13,0)-(13,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (13,7)-(13,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (14,2)-(14,21))
-        │   │   └── body: (length: 1)
-        │   │       └── @ WhileNode (location: (14,2)-(14,21))
-        │   │           ├── flags: ∅
-        │   │           ├── keyword_loc: (14,12)-(14,17) = "while"
-        │   │           ├── closing_loc: ∅
-        │   │           ├── predicate:
-        │   │           │   @ LocalVariableReadNode (location: (14,18)-(14,21))
-        │   │           │   ├── name: :foo
-        │   │           │   └── depth: 0
-        │   │           └── statements:
-        │   │               @ StatementsNode (location: (14,2)-(14,11))
-        │   │               └── body: (length: 1)
-        │   │                   └── @ LocalVariableWriteNode (location: (14,2)-(14,11))
-        │   │                       ├── name: :foo
-        │   │                       ├── depth: 0
-        │   │                       ├── name_loc: (14,2)-(14,5) = "foo"
-        │   │                       ├── value:
-        │   │                       │   @ CallNode (location: (14,8)-(14,11))
-        │   │                       │   ├── flags: variable_call, ignore_visibility
-        │   │                       │   ├── receiver: ∅
-        │   │                       │   ├── call_operator_loc: ∅
-        │   │                       │   ├── name: :bar
-        │   │                       │   ├── message_loc: (14,8)-(14,11) = "bar"
-        │   │                       │   ├── opening_loc: ∅
-        │   │                       │   ├── arguments: ∅
-        │   │                       │   ├── closing_loc: ∅
-        │   │                       │   └── block: ∅
-        │   │                       └── operator_loc: (14,6)-(14,7) = "="
-        │   ├── end_keyword_loc: (15,0)-(15,3) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (17,0)-(19,3))
-        │   ├── locals: [:foo]
-        │   ├── module_keyword_loc: (17,0)-(17,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (17,7)-(17,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (18,2)-(18,21))
-        │   │   └── body: (length: 1)
-        │   │       └── @ UntilNode (location: (18,2)-(18,21))
-        │   │           ├── flags: ∅
-        │   │           ├── keyword_loc: (18,12)-(18,17) = "until"
-        │   │           ├── closing_loc: ∅
-        │   │           ├── predicate:
-        │   │           │   @ LocalVariableReadNode (location: (18,18)-(18,21))
-        │   │           │   ├── name: :foo
-        │   │           │   └── depth: 0
-        │   │           └── statements:
-        │   │               @ StatementsNode (location: (18,2)-(18,11))
-        │   │               └── body: (length: 1)
-        │   │                   └── @ LocalVariableWriteNode (location: (18,2)-(18,11))
-        │   │                       ├── name: :foo
-        │   │                       ├── depth: 0
-        │   │                       ├── name_loc: (18,2)-(18,5) = "foo"
-        │   │                       ├── value:
-        │   │                       │   @ CallNode (location: (18,8)-(18,11))
-        │   │                       │   ├── flags: variable_call, ignore_visibility
-        │   │                       │   ├── receiver: ∅
-        │   │                       │   ├── call_operator_loc: ∅
-        │   │                       │   ├── name: :bar
-        │   │                       │   ├── message_loc: (18,8)-(18,11) = "bar"
-        │   │                       │   ├── opening_loc: ∅
-        │   │                       │   ├── arguments: ∅
-        │   │                       │   ├── closing_loc: ∅
-        │   │                       │   └── block: ∅
-        │   │                       └── operator_loc: (18,6)-(18,7) = "="
-        │   ├── end_keyword_loc: (19,0)-(19,3) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (21,0)-(25,3))
-        │   ├── locals: [:foo]
-        │   ├── module_keyword_loc: (21,0)-(21,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (21,7)-(21,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (22,2)-(24,5))
-        │   │   └── body: (length: 1)
-        │   │       └── @ WhileNode (location: (22,2)-(24,5))
-        │   │           ├── flags: ∅
-        │   │           ├── keyword_loc: (22,2)-(22,7) = "while"
-        │   │           ├── closing_loc: (24,2)-(24,5) = "end"
-        │   │           ├── predicate:
-        │   │           │   @ CallNode (location: (22,8)-(22,11))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :foo
-        │   │           │   ├── message_loc: (22,8)-(22,11) = "foo"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           └── statements:
-        │   │               @ StatementsNode (location: (23,4)-(23,13))
-        │   │               └── body: (length: 1)
-        │   │                   └── @ LocalVariableWriteNode (location: (23,4)-(23,13))
-        │   │                       ├── name: :foo
-        │   │                       ├── depth: 0
-        │   │                       ├── name_loc: (23,4)-(23,7) = "foo"
-        │   │                       ├── value:
-        │   │                       │   @ CallNode (location: (23,10)-(23,13))
-        │   │                       │   ├── flags: variable_call, ignore_visibility
-        │   │                       │   ├── receiver: ∅
-        │   │                       │   ├── call_operator_loc: ∅
-        │   │                       │   ├── name: :bar
-        │   │                       │   ├── message_loc: (23,10)-(23,13) = "bar"
-        │   │                       │   ├── opening_loc: ∅
-        │   │                       │   ├── arguments: ∅
-        │   │                       │   ├── closing_loc: ∅
-        │   │                       │   └── block: ∅
-        │   │                       └── operator_loc: (23,8)-(23,9) = "="
-        │   ├── end_keyword_loc: (25,0)-(25,3) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (27,0)-(33,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (27,0)-(27,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (27,7)-(27,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (28,2)-(32,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (28,2)-(32,3))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :each
-        │   │           ├── message_loc: (28,2)-(28,6) = "each"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (28,7)-(32,3))
-        │   │               ├── locals: [:baz, :foo]
-        │   │               ├── parameters:
-        │   │               │   @ BlockParametersNode (location: (28,9)-(28,14))
-        │   │               │   ├── parameters:
-        │   │               │   │   @ ParametersNode (location: (28,10)-(28,13))
-        │   │               │   │   ├── requireds: (length: 1)
-        │   │               │   │   │   └── @ RequiredParameterNode (location: (28,10)-(28,13))
-        │   │               │   │   │       ├── flags: ∅
-        │   │               │   │   │       └── name: :baz
-        │   │               │   │   ├── optionals: (length: 0)
-        │   │               │   │   ├── rest: ∅
-        │   │               │   │   ├── posts: (length: 0)
-        │   │               │   │   ├── keywords: (length: 0)
-        │   │               │   │   ├── keyword_rest: ∅
-        │   │               │   │   └── block: ∅
-        │   │               │   ├── locals: (length: 0)
-        │   │               │   ├── opening_loc: (28,9)-(28,10) = "|"
-        │   │               │   └── closing_loc: (28,13)-(28,14) = "|"
-        │   │               ├── body:
-        │   │               │   @ StatementsNode (location: (29,4)-(31,7))
-        │   │               │   └── body: (length: 1)
-        │   │               │       └── @ WhileNode (location: (29,4)-(31,7))
-        │   │               │           ├── flags: ∅
-        │   │               │           ├── keyword_loc: (29,4)-(29,9) = "while"
-        │   │               │           ├── closing_loc: (31,4)-(31,7) = "end"
-        │   │               │           ├── predicate:
-        │   │               │           │   @ CallNode (location: (29,10)-(29,13))
-        │   │               │           │   ├── flags: variable_call, ignore_visibility
-        │   │               │           │   ├── receiver: ∅
-        │   │               │           │   ├── call_operator_loc: ∅
-        │   │               │           │   ├── name: :foo
-        │   │               │           │   ├── message_loc: (29,10)-(29,13) = "foo"
-        │   │               │           │   ├── opening_loc: ∅
-        │   │               │           │   ├── arguments: ∅
-        │   │               │           │   ├── closing_loc: ∅
-        │   │               │           │   └── block: ∅
-        │   │               │           └── statements:
-        │   │               │               @ StatementsNode (location: (30,6)-(30,15))
-        │   │               │               └── body: (length: 1)
-        │   │               │                   └── @ LocalVariableWriteNode (location: (30,6)-(30,15))
-        │   │               │                       ├── name: :foo
-        │   │               │                       ├── depth: 0
-        │   │               │                       ├── name_loc: (30,6)-(30,9) = "foo"
-        │   │               │                       ├── value:
-        │   │               │                       │   @ CallNode (location: (30,12)-(30,15))
-        │   │               │                       │   ├── flags: variable_call, ignore_visibility
-        │   │               │                       │   ├── receiver: ∅
-        │   │               │                       │   ├── call_operator_loc: ∅
-        │   │               │                       │   ├── name: :bar
-        │   │               │                       │   ├── message_loc: (30,12)-(30,15) = "bar"
-        │   │               │                       │   ├── opening_loc: ∅
-        │   │               │                       │   ├── arguments: ∅
-        │   │               │                       │   ├── closing_loc: ∅
-        │   │               │                       │   └── block: ∅
-        │   │               │                       └── operator_loc: (30,10)-(30,11) = "="
-        │   │               ├── opening_loc: (28,7)-(28,8) = "{"
-        │   │               └── closing_loc: (32,2)-(32,3) = "}"
-        │   ├── end_keyword_loc: (33,0)-(33,3) = "end"
-        │   └── name: :A
-        ├── @ ModuleNode (location: (35,0)-(41,3))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (35,0)-(35,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (35,7)-(35,8))
-        │   │   └── name: :A
-        │   ├── body:
-        │   │   @ StatementsNode (location: (36,2)-(40,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (36,2)-(40,3))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :each
-        │   │           ├── message_loc: (36,2)-(36,6) = "each"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (36,7)-(40,3))
-        │   │               ├── locals: [:foo]
-        │   │               ├── parameters:
-        │   │               │   @ BlockParametersNode (location: (36,9)-(36,14))
-        │   │               │   ├── parameters:
-        │   │               │   │   @ ParametersNode (location: (36,10)-(36,13))
-        │   │               │   │   ├── requireds: (length: 1)
-        │   │               │   │   │   └── @ RequiredParameterNode (location: (36,10)-(36,13))
-        │   │               │   │   │       ├── flags: ∅
-        │   │               │   │   │       └── name: :foo
-        │   │               │   │   ├── optionals: (length: 0)
-        │   │               │   │   ├── rest: ∅
-        │   │               │   │   ├── posts: (length: 0)
-        │   │               │   │   ├── keywords: (length: 0)
-        │   │               │   │   ├── keyword_rest: ∅
-        │   │               │   │   └── block: ∅
-        │   │               │   ├── locals: (length: 0)
-        │   │               │   ├── opening_loc: (36,9)-(36,10) = "|"
-        │   │               │   └── closing_loc: (36,13)-(36,14) = "|"
-        │   │               ├── body:
-        │   │               │   @ StatementsNode (location: (37,4)-(39,7))
-        │   │               │   └── body: (length: 1)
-        │   │               │       └── @ WhileNode (location: (37,4)-(39,7))
-        │   │               │           ├── flags: ∅
-        │   │               │           ├── keyword_loc: (37,4)-(37,9) = "while"
-        │   │               │           ├── closing_loc: (39,4)-(39,7) = "end"
-        │   │               │           ├── predicate:
-        │   │               │           │   @ LocalVariableReadNode (location: (37,10)-(37,13))
-        │   │               │           │   ├── name: :foo
-        │   │               │           │   └── depth: 0
-        │   │               │           └── statements:
-        │   │               │               @ StatementsNode (location: (38,6)-(38,15))
-        │   │               │               └── body: (length: 1)
-        │   │               │                   └── @ LocalVariableWriteNode (location: (38,6)-(38,15))
-        │   │               │                       ├── name: :foo
-        │   │               │                       ├── depth: 0
-        │   │               │                       ├── name_loc: (38,6)-(38,9) = "foo"
-        │   │               │                       ├── value:
-        │   │               │                       │   @ CallNode (location: (38,12)-(38,15))
-        │   │               │                       │   ├── flags: variable_call, ignore_visibility
-        │   │               │                       │   ├── receiver: ∅
-        │   │               │                       │   ├── call_operator_loc: ∅
-        │   │               │                       │   ├── name: :bar
-        │   │               │                       │   ├── message_loc: (38,12)-(38,15) = "bar"
-        │   │               │                       │   ├── opening_loc: ∅
-        │   │               │                       │   ├── arguments: ∅
-        │   │               │                       │   ├── closing_loc: ∅
-        │   │               │                       │   └── block: ∅
-        │   │               │                       └── operator_loc: (38,10)-(38,11) = "="
-        │   │               ├── opening_loc: (36,7)-(36,8) = "{"
-        │   │               └── closing_loc: (40,2)-(40,3) = "}"
-        │   ├── end_keyword_loc: (41,0)-(41,3) = "end"
-        │   └── name: :A
-        ├── @ LocalVariableWriteNode (location: (42,0)-(44,14))
-        │   ├── name: :x
-        │   ├── depth: 0
-        │   ├── name_loc: (42,0)-(42,1) = "x"
-        │   ├── value:
-        │   │   @ ParenthesesNode (location: (42,4)-(44,14))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (42,5)-(44,13))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ WhileNode (location: (42,5)-(44,13))
-        │   │   │           ├── flags: begin_modifier
-        │   │   │           ├── keyword_loc: (44,4)-(44,9) = "while"
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           ├── predicate:
-        │   │   │           │   @ CallNode (location: (44,10)-(44,13))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :baz
-        │   │   │           │   ├── message_loc: (44,10)-(44,13) = "baz"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           └── statements:
-        │   │   │               @ StatementsNode (location: (42,5)-(44,3))
-        │   │   │               └── body: (length: 1)
-        │   │   │                   └── @ BeginNode (location: (42,5)-(44,3))
-        │   │   │                       ├── begin_keyword_loc: (42,5)-(42,10) = "begin"
-        │   │   │                       ├── statements:
-        │   │   │                       │   @ StatementsNode (location: (43,2)-(43,5))
-        │   │   │                       │   └── body: (length: 1)
-        │   │   │                       │       └── @ CallNode (location: (43,2)-(43,5))
-        │   │   │                       │           ├── flags: variable_call, ignore_visibility
-        │   │   │                       │           ├── receiver: ∅
-        │   │   │                       │           ├── call_operator_loc: ∅
-        │   │   │                       │           ├── name: :foo
-        │   │   │                       │           ├── message_loc: (43,2)-(43,5) = "foo"
-        │   │   │                       │           ├── opening_loc: ∅
-        │   │   │                       │           ├── arguments: ∅
-        │   │   │                       │           ├── closing_loc: ∅
-        │   │   │                       │           └── block: ∅
-        │   │   │                       ├── rescue_clause: ∅
-        │   │   │                       ├── else_clause: ∅
-        │   │   │                       ├── ensure_clause: ∅
-        │   │   │                       └── end_keyword_loc: (44,0)-(44,3) = "end"
-        │   │   ├── opening_loc: (42,4)-(42,5) = "("
-        │   │   └── closing_loc: (44,13)-(44,14) = ")"
-        │   └── operator_loc: (42,2)-(42,3) = "="
-        ├── @ WhileNode (location: (45,0)-(47,13))
-        │   ├── flags: begin_modifier
-        │   ├── keyword_loc: (47,4)-(47,9) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (47,10)-(47,13))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :baz
-        │   │   ├── message_loc: (47,10)-(47,13) = "baz"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (45,0)-(47,3))
-        │       └── body: (length: 1)
-        │           └── @ BeginNode (location: (45,0)-(47,3))
-        │               ├── begin_keyword_loc: (45,0)-(45,5) = "begin"
-        │               ├── statements:
-        │               │   @ StatementsNode (location: (46,2)-(46,5))
-        │               │   └── body: (length: 1)
-        │               │       └── @ CallNode (location: (46,2)-(46,5))
-        │               │           ├── flags: variable_call, ignore_visibility
-        │               │           ├── receiver: ∅
-        │               │           ├── call_operator_loc: ∅
-        │               │           ├── name: :foo
-        │               │           ├── message_loc: (46,2)-(46,5) = "foo"
-        │               │           ├── opening_loc: ∅
-        │               │           ├── arguments: ∅
-        │               │           ├── closing_loc: ∅
-        │               │           └── block: ∅
-        │               ├── rescue_clause: ∅
-        │               ├── else_clause: ∅
-        │               ├── ensure_clause: ∅
-        │               └── end_keyword_loc: (47,0)-(47,3) = "end"
-        ├── @ UntilNode (location: (48,0)-(51,13))
-        │   ├── flags: begin_modifier
-        │   ├── keyword_loc: (51,4)-(51,9) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (51,10)-(51,13))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :baz
-        │   │   ├── message_loc: (51,10)-(51,13) = "baz"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (48,0)-(51,3))
-        │       └── body: (length: 1)
-        │           └── @ BeginNode (location: (48,0)-(51,3))
-        │               ├── begin_keyword_loc: (48,0)-(48,5) = "begin"
-        │               ├── statements:
-        │               │   @ StatementsNode (location: (49,2)-(50,5))
-        │               │   └── body: (length: 2)
-        │               │       ├── @ CallNode (location: (49,2)-(49,5))
-        │               │       │   ├── flags: variable_call, ignore_visibility
-        │               │       │   ├── receiver: ∅
-        │               │       │   ├── call_operator_loc: ∅
-        │               │       │   ├── name: :foo
-        │               │       │   ├── message_loc: (49,2)-(49,5) = "foo"
-        │               │       │   ├── opening_loc: ∅
-        │               │       │   ├── arguments: ∅
-        │               │       │   ├── closing_loc: ∅
-        │               │       │   └── block: ∅
-        │               │       └── @ CallNode (location: (50,2)-(50,5))
-        │               │           ├── flags: variable_call, ignore_visibility
-        │               │           ├── receiver: ∅
-        │               │           ├── call_operator_loc: ∅
-        │               │           ├── name: :bar
-        │               │           ├── message_loc: (50,2)-(50,5) = "bar"
-        │               │           ├── opening_loc: ∅
-        │               │           ├── arguments: ∅
-        │               │           ├── closing_loc: ∅
-        │               │           └── block: ∅
-        │               ├── rescue_clause: ∅
-        │               ├── else_clause: ∅
-        │               ├── ensure_clause: ∅
-        │               └── end_keyword_loc: (51,0)-(51,3) = "end"
-        ├── @ WhileNode (location: (52,0)-(55,13))
-        │   ├── flags: begin_modifier
-        │   ├── keyword_loc: (55,4)-(55,9) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (55,10)-(55,13))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :baz
-        │   │   ├── message_loc: (55,10)-(55,13) = "baz"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (52,0)-(55,3))
-        │       └── body: (length: 1)
-        │           └── @ BeginNode (location: (52,0)-(55,3))
-        │               ├── begin_keyword_loc: (52,0)-(52,5) = "begin"
-        │               ├── statements:
-        │               │   @ StatementsNode (location: (53,2)-(54,5))
-        │               │   └── body: (length: 2)
-        │               │       ├── @ CallNode (location: (53,2)-(53,5))
-        │               │       │   ├── flags: variable_call, ignore_visibility
-        │               │       │   ├── receiver: ∅
-        │               │       │   ├── call_operator_loc: ∅
-        │               │       │   ├── name: :foo
-        │               │       │   ├── message_loc: (53,2)-(53,5) = "foo"
-        │               │       │   ├── opening_loc: ∅
-        │               │       │   ├── arguments: ∅
-        │               │       │   ├── closing_loc: ∅
-        │               │       │   └── block: ∅
-        │               │       └── @ CallNode (location: (54,2)-(54,5))
-        │               │           ├── flags: variable_call, ignore_visibility
-        │               │           ├── receiver: ∅
-        │               │           ├── call_operator_loc: ∅
-        │               │           ├── name: :bar
-        │               │           ├── message_loc: (54,2)-(54,5) = "bar"
-        │               │           ├── opening_loc: ∅
-        │               │           ├── arguments: ∅
-        │               │           ├── closing_loc: ∅
-        │               │           └── block: ∅
-        │               ├── rescue_clause: ∅
-        │               ├── else_clause: ∅
-        │               ├── ensure_clause: ∅
-        │               └── end_keyword_loc: (55,0)-(55,3) = "end"
-        ├── @ WhileNode (location: (56,0)-(57,3))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (56,0)-(56,5) = "while"
-        │   ├── closing_loc: (57,0)-(57,3) = "end"
-        │   ├── predicate:
-        │   │   @ FalseNode (location: (56,6)-(56,11))
-        │   └── statements: ∅
-        ├── @ WhileNode (location: (58,0)-(60,3))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (58,0)-(58,5) = "while"
-        │   ├── closing_loc: (60,0)-(60,3) = "end"
-        │   ├── predicate:
-        │   │   @ FalseNode (location: (58,6)-(58,11))
-        │   └── statements:
-        │       @ StatementsNode (location: (59,2)-(59,3))
-        │       └── body: (length: 1)
-        │           └── @ IntegerNode (location: (59,2)-(59,3))
-        │               ├── flags: decimal
-        │               └── value: 3
-        ├── @ WhileNode (location: (61,0)-(64,3))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (61,0)-(61,5) = "while"
-        │   ├── closing_loc: (64,0)-(64,3) = "end"
-        │   ├── predicate:
-        │   │   @ ParenthesesNode (location: (61,6)-(62,2))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (61,7)-(62,1))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (61,7)-(62,1))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :foo
-        │   │   │           ├── message_loc: (61,7)-(61,10) = "foo"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block:
-        │   │   │               @ BlockNode (location: (61,11)-(62,1))
-        │   │   │               ├── locals: []
-        │   │   │               ├── parameters: ∅
-        │   │   │               ├── body: ∅
-        │   │   │               ├── opening_loc: (61,11)-(61,12) = "{"
-        │   │   │               └── closing_loc: (62,0)-(62,1) = "}"
-        │   │   ├── opening_loc: (61,6)-(61,7) = "("
-        │   │   └── closing_loc: (62,1)-(62,2) = ")"
-        │   └── statements:
-        │       @ StatementsNode (location: (63,2)-(63,7))
-        │       └── body: (length: 1)
-        │           └── @ SymbolNode (location: (63,2)-(63,7))
-        │               ├── flags: forced_us_ascii_encoding
-        │               ├── opening_loc: (63,2)-(63,3) = ":"
-        │               ├── value_loc: (63,3)-(63,7) = "body"
-        │               ├── closing_loc: ∅
-        │               └── unescaped: "body"
-        ├── @ UntilNode (location: (65,0)-(66,3))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (65,0)-(65,5) = "until"
-        │   ├── closing_loc: (66,0)-(66,3) = "end"
-        │   ├── predicate:
-        │   │   @ FalseNode (location: (65,6)-(65,11))
-        │   └── statements: ∅
-        ├── @ UntilNode (location: (67,0)-(69,3))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (67,0)-(67,5) = "until"
-        │   ├── closing_loc: (69,0)-(69,3) = "end"
-        │   ├── predicate:
-        │   │   @ FalseNode (location: (67,6)-(67,11))
-        │   └── statements:
-        │       @ StatementsNode (location: (68,2)-(68,3))
-        │       └── body: (length: 1)
-        │           └── @ IntegerNode (location: (68,2)-(68,3))
-        │               ├── flags: decimal
-        │               └── value: 3
-        └── @ UntilNode (location: (70,0)-(73,3))
-            ├── flags: ∅
-            ├── keyword_loc: (70,0)-(70,5) = "until"
-            ├── closing_loc: (73,0)-(73,3) = "end"
-            ├── predicate:
-            │   @ ParenthesesNode (location: (70,6)-(71,2))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (70,7)-(71,1))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (70,7)-(71,1))
-            │   │           ├── flags: ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :foo
-            │   │           ├── message_loc: (70,7)-(70,10) = "foo"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block:
-            │   │               @ BlockNode (location: (70,11)-(71,1))
-            │   │               ├── locals: []
-            │   │               ├── parameters: ∅
-            │   │               ├── body: ∅
-            │   │               ├── opening_loc: (70,11)-(70,12) = "{"
-            │   │               └── closing_loc: (71,0)-(71,1) = "}"
-            │   ├── opening_loc: (70,6)-(70,7) = "("
-            │   └── closing_loc: (71,1)-(71,2) = ")"
-            └── statements:
-                @ StatementsNode (location: (72,2)-(72,7))
-                └── body: (length: 1)
-                    └── @ SymbolNode (location: (72,2)-(72,7))
-                        ├── flags: forced_us_ascii_encoding
-                        ├── opening_loc: (72,2)-(72,3) = ":"
-                        ├── value_loc: (72,3)-(72,7) = "body"
-                        ├── closing_loc: ∅
-                        └── unescaped: "body"
diff --git a/test/mri/prism/snapshots/unparser/corpus/literal/yield.txt b/test/mri/prism/snapshots/unparser/corpus/literal/yield.txt
deleted file mode 100644
index 4d2b272e35e..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/literal/yield.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,11))
-    └── body: (length: 3)
-        ├── @ YieldNode (location: (1,0)-(1,5))
-        │   ├── keyword_loc: (1,0)-(1,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments: ∅
-        │   └── rparen_loc: ∅
-        ├── @ YieldNode (location: (2,0)-(2,8))
-        │   ├── keyword_loc: (2,0)-(2,5) = "yield"
-        │   ├── lparen_loc: (2,5)-(2,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (2,6)-(2,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (2,6)-(2,7))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (2,6)-(2,7) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── rparen_loc: (2,7)-(2,8) = ")"
-        └── @ YieldNode (location: (3,0)-(3,11))
-            ├── keyword_loc: (3,0)-(3,5) = "yield"
-            ├── lparen_loc: (3,5)-(3,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,6)-(3,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (3,6)-(3,7))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :a
-            │       │   ├── message_loc: (3,6)-(3,7) = "a"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ CallNode (location: (3,9)-(3,10))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (3,9)-(3,10) = "b"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            └── rparen_loc: (3,10)-(3,11) = ")"
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/and.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/and.txt
deleted file mode 100644
index bc9d674e44e..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/and.txt
+++ /dev/null
@@ -1,235 +0,0 @@
-@ ProgramNode (location: (1,0)-(8,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(8,3))
-    └── body: (length: 4)
-        ├── @ OrNode (location: (1,0)-(1,14))
-        │   ├── left:
-        │   │   @ RangeNode (location: (1,0)-(1,5))
-        │   │   ├── flags: exclude_end
-        │   │   ├── left:
-        │   │   │   @ CallNode (location: (1,0)-(1,1))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :a
-        │   │   │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (1,4)-(1,5))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :b
-        │   │   │   ├── message_loc: (1,4)-(1,5) = "b"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (1,1)-(1,4) = "..."
-        │   ├── right:
-        │   │   @ RangeNode (location: (1,9)-(1,14))
-        │   │   ├── flags: exclude_end
-        │   │   ├── left:
-        │   │   │   @ CallNode (location: (1,9)-(1,10))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :c
-        │   │   │   ├── message_loc: (1,9)-(1,10) = "c"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (1,13)-(1,14))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :d
-        │   │   │   ├── message_loc: (1,13)-(1,14) = "d"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (1,10)-(1,13) = "..."
-        │   └── operator_loc: (1,6)-(1,8) = "or"
-        ├── @ AndNode (location: (2,0)-(2,15))
-        │   ├── left:
-        │   │   @ RangeNode (location: (2,0)-(2,5))
-        │   │   ├── flags: exclude_end
-        │   │   ├── left:
-        │   │   │   @ CallNode (location: (2,0)-(2,1))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :a
-        │   │   │   ├── message_loc: (2,0)-(2,1) = "a"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (2,4)-(2,5))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :b
-        │   │   │   ├── message_loc: (2,4)-(2,5) = "b"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (2,1)-(2,4) = "..."
-        │   ├── right:
-        │   │   @ RangeNode (location: (2,10)-(2,15))
-        │   │   ├── flags: exclude_end
-        │   │   ├── left:
-        │   │   │   @ CallNode (location: (2,10)-(2,11))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :c
-        │   │   │   ├── message_loc: (2,10)-(2,11) = "c"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (2,14)-(2,15))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :d
-        │   │   │   ├── message_loc: (2,14)-(2,15) = "d"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (2,11)-(2,14) = "..."
-        │   └── operator_loc: (2,6)-(2,9) = "and"
-        ├── @ IfNode (location: (4,0)-(5,3))
-        │   ├── if_keyword_loc: (4,0)-(4,2) = "if"
-        │   ├── predicate:
-        │   │   @ OrNode (location: (4,3)-(4,17))
-        │   │   ├── left:
-        │   │   │   @ FlipFlopNode (location: (4,3)-(4,8))
-        │   │   │   ├── flags: exclude_end
-        │   │   │   ├── left:
-        │   │   │   │   @ CallNode (location: (4,3)-(4,4))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :a
-        │   │   │   │   ├── message_loc: (4,3)-(4,4) = "a"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── right:
-        │   │   │   │   @ CallNode (location: (4,7)-(4,8))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :b
-        │   │   │   │   ├── message_loc: (4,7)-(4,8) = "b"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: (4,4)-(4,7) = "..."
-        │   │   ├── right:
-        │   │   │   @ FlipFlopNode (location: (4,12)-(4,17))
-        │   │   │   ├── flags: exclude_end
-        │   │   │   ├── left:
-        │   │   │   │   @ CallNode (location: (4,12)-(4,13))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :c
-        │   │   │   │   ├── message_loc: (4,12)-(4,13) = "c"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── right:
-        │   │   │   │   @ CallNode (location: (4,16)-(4,17))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :d
-        │   │   │   │   ├── message_loc: (4,16)-(4,17) = "d"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── operator_loc: (4,13)-(4,16) = "..."
-        │   │   └── operator_loc: (4,9)-(4,11) = "or"
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        └── @ IfNode (location: (7,0)-(8,3))
-            ├── if_keyword_loc: (7,0)-(7,2) = "if"
-            ├── predicate:
-            │   @ AndNode (location: (7,3)-(7,18))
-            │   ├── left:
-            │   │   @ FlipFlopNode (location: (7,3)-(7,8))
-            │   │   ├── flags: exclude_end
-            │   │   ├── left:
-            │   │   │   @ CallNode (location: (7,3)-(7,4))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :a
-            │   │   │   ├── message_loc: (7,3)-(7,4) = "a"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── right:
-            │   │   │   @ CallNode (location: (7,7)-(7,8))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :b
-            │   │   │   ├── message_loc: (7,7)-(7,8) = "b"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   └── operator_loc: (7,4)-(7,7) = "..."
-            │   ├── right:
-            │   │   @ FlipFlopNode (location: (7,13)-(7,18))
-            │   │   ├── flags: exclude_end
-            │   │   ├── left:
-            │   │   │   @ CallNode (location: (7,13)-(7,14))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :c
-            │   │   │   ├── message_loc: (7,13)-(7,14) = "c"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── right:
-            │   │   │   @ CallNode (location: (7,17)-(7,18))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :d
-            │   │   │   ├── message_loc: (7,17)-(7,18) = "d"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   └── operator_loc: (7,14)-(7,17) = "..."
-            │   └── operator_loc: (7,9)-(7,12) = "and"
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (8,0)-(8,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/block.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/block.txt
deleted file mode 100644
index b9aa6b21844..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/block.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-@ ProgramNode (location: (1,0)-(26,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(26,3))
-    └── body: (length: 6)
-        ├── @ CallNode (location: (1,0)-(2,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,4)-(2,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,4)-(1,6) = "do"
-        │       └── closing_loc: (2,0)-(2,3) = "end"
-        ├── @ CallNode (location: (4,0)-(6,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (4,0)-(4,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (4,4)-(6,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ BeginNode (location: (4,4)-(6,3))
-        │       │   ├── begin_keyword_loc: ∅
-        │       │   ├── statements: ∅
-        │       │   ├── rescue_clause:
-        │       │   │   @ RescueNode (location: (5,0)-(5,6))
-        │       │   │   ├── keyword_loc: (5,0)-(5,6) = "rescue"
-        │       │   │   ├── exceptions: (length: 0)
-        │       │   │   ├── operator_loc: ∅
-        │       │   │   ├── reference: ∅
-        │       │   │   ├── statements: ∅
-        │       │   │   └── consequent: ∅
-        │       │   ├── else_clause: ∅
-        │       │   ├── ensure_clause: ∅
-        │       │   └── end_keyword_loc: (6,0)-(6,3) = "end"
-        │       ├── opening_loc: (4,4)-(4,6) = "do"
-        │       └── closing_loc: (6,0)-(6,3) = "end"
-        ├── @ CallNode (location: (8,0)-(11,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (8,0)-(8,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (8,4)-(11,3))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body:
-        │       │   @ StatementsNode (location: (9,2)-(10,5))
-        │       │   └── body: (length: 2)
-        │       │       ├── @ RescueModifierNode (location: (9,2)-(9,16))
-        │       │       │   ├── expression:
-        │       │       │   │   @ NilNode (location: (9,2)-(9,5))
-        │       │       │   ├── keyword_loc: (9,6)-(9,12) = "rescue"
-        │       │       │   └── rescue_expression:
-        │       │       │       @ NilNode (location: (9,13)-(9,16))
-        │       │       └── @ NilNode (location: (10,2)-(10,5))
-        │       ├── opening_loc: (8,4)-(8,6) = "do"
-        │       └── closing_loc: (11,0)-(11,3) = "end"
-        ├── @ CallNode (location: (13,0)-(14,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (13,0)-(13,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (13,4)-(14,3))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (13,7)-(13,10))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (13,8)-(13,9))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (13,8)-(13,9))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (13,7)-(13,8) = "|"
-        │       │   └── closing_loc: (13,9)-(13,10) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (13,4)-(13,6) = "do"
-        │       └── closing_loc: (14,0)-(14,3) = "end"
-        ├── @ CallNode (location: (16,0)-(20,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (16,0)-(16,3) = "foo"
-        │   ├── opening_loc: (16,3)-(16,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (16,4)-(16,10))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (16,4)-(16,10))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (16,4)-(16,10) = "<<-DOC"
-        │   │           ├── content_loc: (17,0)-(18,0) = "  b\n"
-        │   │           ├── closing_loc: (18,0)-(19,0) = "DOC\n"
-        │   │           └── unescaped: "  b\n"
-        │   ├── closing_loc: (16,10)-(16,11) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (16,12)-(20,3))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (16,15)-(16,18))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (16,16)-(16,17))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (16,16)-(16,17))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (16,15)-(16,16) = "|"
-        │       │   └── closing_loc: (16,17)-(16,18) = "|"
-        │       ├── body:
-        │       │   @ StatementsNode (location: (19,2)-(19,3))
-        │       │   └── body: (length: 1)
-        │       │       └── @ LocalVariableReadNode (location: (19,2)-(19,3))
-        │       │           ├── name: :a
-        │       │           └── depth: 0
-        │       ├── opening_loc: (16,12)-(16,14) = "do"
-        │       └── closing_loc: (20,0)-(20,3) = "end"
-        └── @ CallNode (location: (22,0)-(26,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo
-            ├── message_loc: (22,0)-(22,3) = "foo"
-            ├── opening_loc: (22,3)-(22,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (22,4)-(22,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ StringNode (location: (22,4)-(22,10))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (22,4)-(22,10) = "<<-DOC"
-            │           ├── content_loc: (23,0)-(24,0) = "  b\n"
-            │           ├── closing_loc: (24,0)-(25,0) = "DOC\n"
-            │           └── unescaped: "  b\n"
-            ├── closing_loc: (22,10)-(22,11) = ")"
-            └── block:
-                @ BlockNode (location: (22,12)-(26,3))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (25,2)-(25,3))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (25,2)-(25,3))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :a
-                │           ├── message_loc: (25,2)-(25,3) = "a"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (22,12)-(22,14) = "do"
-                └── closing_loc: (26,0)-(26,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/def.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/def.txt
deleted file mode 100644
index b44983c2f37..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/def.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,3))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(3,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,2)-(2,9))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (2,2)-(2,9))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (2,3)-(2,8))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (2,3)-(2,8))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── receiver:
-        │   │           │           │   @ CallNode (location: (2,3)-(2,4))
-        │   │           │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │           │   ├── receiver: ∅
-        │   │           │           │   ├── call_operator_loc: ∅
-        │   │           │           │   ├── name: :a
-        │   │           │           │   ├── message_loc: (2,3)-(2,4) = "a"
-        │   │           │           │   ├── opening_loc: ∅
-        │   │           │           │   ├── arguments: ∅
-        │   │           │           │   ├── closing_loc: ∅
-        │   │           │           │   └── block: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :-
-        │   │           │           ├── message_loc: (2,5)-(2,6) = "-"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments:
-        │   │           │           │   @ ArgumentsNode (location: (2,7)-(2,8))
-        │   │           │           │   ├── flags: ∅
-        │   │           │           │   └── arguments: (length: 1)
-        │   │           │           │       └── @ CallNode (location: (2,7)-(2,8))
-        │   │           │           │           ├── flags: variable_call, ignore_visibility
-        │   │           │           │           ├── receiver: ∅
-        │   │           │           │           ├── call_operator_loc: ∅
-        │   │           │           │           ├── name: :b
-        │   │           │           │           ├── message_loc: (2,7)-(2,8) = "b"
-        │   │           │           │           ├── opening_loc: ∅
-        │   │           │           │           ├── arguments: ∅
-        │   │           │           │           ├── closing_loc: ∅
-        │   │           │           │           └── block: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── block: ∅
-        │   │           ├── opening_loc: (2,2)-(2,3) = "("
-        │   │           └── closing_loc: (2,8)-(2,9) = ")"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        └── @ DefNode (location: (5,0)-(7,3))
-            ├── name: :foo
-            ├── name_loc: (5,4)-(5,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (6,2)-(6,20))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (6,2)-(6,20))
-            │           ├── expression:
-            │           │   @ CallNode (location: (6,2)-(6,3))
-            │           │   ├── flags: variable_call, ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :a
-            │           │   ├── message_loc: (6,2)-(6,3) = "a"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments: ∅
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── keyword_loc: (6,4)-(6,10) = "rescue"
-            │           └── rescue_expression:
-            │               @ ConstantReadNode (location: (6,11)-(6,20))
-            │               └── name: :Exception
-            ├── locals: []
-            ├── def_keyword_loc: (5,0)-(5,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (7,0)-(7,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/dstr.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/dstr.txt
deleted file mode 100644
index 5ab954b6d41..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/dstr.txt
+++ /dev/null
@@ -1,570 +0,0 @@
-@ ProgramNode (location: (1,0)-(127,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(127,11))
-    └── body: (length: 33)
-        ├── @ StringNode (location: (1,0)-(1,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,5) = "<<DOC"
-        │   ├── content_loc: (2,0)-(2,0) = ""
-        │   ├── closing_loc: (2,0)-(3,0) = "DOC\n"
-        │   └── unescaped: ""
-        ├── @ StringNode (location: (4,0)-(4,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (4,0)-(4,7) = "<<'DOC'"
-        │   ├── content_loc: (5,0)-(5,0) = ""
-        │   ├── closing_loc: (5,0)-(6,0) = "DOC\n"
-        │   └── unescaped: ""
-        ├── @ StringNode (location: (7,0)-(7,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (7,0)-(7,6) = "<<~DOC"
-        │   ├── content_loc: (8,0)-(8,0) = ""
-        │   ├── closing_loc: (8,0)-(9,0) = "DOC\n"
-        │   └── unescaped: ""
-        ├── @ StringNode (location: (10,0)-(10,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (10,0)-(10,8) = "<<~'DOC'"
-        │   ├── content_loc: (11,0)-(11,0) = ""
-        │   ├── closing_loc: (11,0)-(12,0) = "DOC\n"
-        │   └── unescaped: ""
-        ├── @ StringNode (location: (13,0)-(13,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (13,0)-(13,5) = "<<DOC"
-        │   ├── content_loc: (14,0)-(15,0) = "  a\n"
-        │   ├── closing_loc: (15,0)-(16,0) = "DOC\n"
-        │   └── unescaped: "  a\n"
-        ├── @ StringNode (location: (17,0)-(17,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (17,0)-(17,7) = "<<'DOC'"
-        │   ├── content_loc: (18,0)-(19,0) = "  a\n"
-        │   ├── closing_loc: (19,0)-(20,0) = "DOC\n"
-        │   └── unescaped: "  a\n"
-        ├── @ InterpolatedStringNode (location: (21,0)-(21,5))
-        │   ├── opening_loc: (21,0)-(21,5) = "<<DOC"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (22,0)-(23,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (22,0)-(23,2) = "  a\n  "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "  a\n  "
-        │   │   ├── @ EmbeddedStatementsNode (location: (23,2)-(23,5))
-        │   │   │   ├── opening_loc: (23,2)-(23,4) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (23,4)-(23,5) = "}"
-        │   │   └── @ StringNode (location: (23,5)-(24,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (23,5)-(24,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (24,0)-(25,0) = "DOC\n"
-        ├── @ InterpolatedStringNode (location: (26,0)-(26,6))
-        │   ├── opening_loc: (26,0)-(26,6) = "<<~DOC"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (27,0)-(28,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (27,0)-(28,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (28,2)-(28,5))
-        │   │   │   ├── opening_loc: (28,2)-(28,4) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (28,4)-(28,5) = "}"
-        │   │   └── @ StringNode (location: (28,5)-(29,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (28,5)-(29,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (29,0)-(30,0) = "DOC\n"
-        ├── @ InterpolatedStringNode (location: (31,0)-(31,6))
-        │   ├── opening_loc: (31,0)-(31,6) = "<<~DOC"
-        │   ├── parts: (length: 4)
-        │   │   ├── @ StringNode (location: (32,0)-(33,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (32,0)-(33,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (33,2)-(33,5))
-        │   │   │   ├── opening_loc: (33,2)-(33,4) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (33,4)-(33,5) = "}"
-        │   │   ├── @ StringNode (location: (33,5)-(34,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (33,5)-(34,0) = "\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n"
-        │   │   └── @ StringNode (location: (34,0)-(35,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (34,0)-(35,0) = "  b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n"
-        │   └── closing_loc: (35,0)-(36,0) = "DOC\n"
-        ├── @ InterpolatedStringNode (location: (37,0)-(37,6))
-        │   ├── opening_loc: (37,0)-(37,6) = "<<~DOC"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (38,0)-(39,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (38,0)-(39,0) = "  a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   └── @ StringNode (location: (39,0)-(40,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (39,0)-(40,0) = "    b\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "  b\n"
-        │   └── closing_loc: (40,0)-(41,0) = "DOC\n"
-        ├── @ StringNode (location: (42,0)-(42,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (42,0)-(42,7) = "<<'DOC'"
-        │   ├── content_loc: (43,0)-(46,0) = "a\n\nb\n"
-        │   ├── closing_loc: (46,0)-(47,0) = "DOC\n"
-        │   └── unescaped: "a\n\nb\n"
-        ├── @ StringNode (location: (48,0)-(48,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (48,0)-(48,7) = "<<'DOC'"
-        │   ├── content_loc: (49,0)-(52,0) = " a\n\n b\n"
-        │   ├── closing_loc: (52,0)-(53,0) = "DOC\n"
-        │   └── unescaped: " a\n\n b\n"
-        ├── @ StringNode (location: (54,0)-(54,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (54,0)-(54,7) = "<<'DOC'"
-        │   ├── content_loc: (55,0)-(56,0) = " a\\nb\n"
-        │   ├── closing_loc: (56,0)-(57,0) = "DOC\n"
-        │   └── unescaped: " a\\nb\n"
-        ├── @ InterpolatedStringNode (location: (58,0)-(58,5))
-        │   ├── opening_loc: (58,0)-(58,5) = "<<DOC"
-        │   ├── parts: (length: 4)
-        │   │   ├── @ EmbeddedStatementsNode (location: (59,0)-(59,3))
-        │   │   │   ├── opening_loc: (59,0)-(59,2) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (59,2)-(59,3) = "}"
-        │   │   ├── @ StringNode (location: (59,3)-(60,1))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (59,3)-(60,1) = "a\n "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n "
-        │   │   ├── @ EmbeddedStatementsNode (location: (60,1)-(60,4))
-        │   │   │   ├── opening_loc: (60,1)-(60,3) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (60,3)-(60,4) = "}"
-        │   │   └── @ StringNode (location: (60,4)-(61,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (60,4)-(61,0) = "a\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a\n"
-        │   └── closing_loc: (61,0)-(62,0) = "DOC\n"
-        ├── @ InterpolatedStringNode (location: (63,0)-(63,5))
-        │   ├── opening_loc: (63,0)-(63,5) = "<<DOC"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (64,0)-(64,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (64,0)-(64,2) = "  "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "  "
-        │   │   ├── @ EmbeddedStatementsNode (location: (64,2)-(64,5))
-        │   │   │   ├── opening_loc: (64,2)-(64,4) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (64,4)-(64,5) = "}"
-        │   │   └── @ StringNode (location: (64,5)-(66,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (64,5)-(66,0) = "\n  \\\#{}\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n  \#{}\n"
-        │   └── closing_loc: (66,0)-(67,0) = "DOC\n"
-        ├── @ InterpolatedStringNode (location: (68,0)-(68,5))
-        │   ├── opening_loc: (68,0)-(68,5) = "<<DOC"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (69,0)-(69,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (69,0)-(69,2) = " a"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: " a"
-        │   │   ├── @ EmbeddedStatementsNode (location: (69,2)-(69,5))
-        │   │   │   ├── opening_loc: (69,2)-(69,4) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (69,4)-(69,5) = "}"
-        │   │   └── @ StringNode (location: (69,5)-(71,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (69,5)-(71,0) = "b\n c\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "b\n c\n"
-        │   └── closing_loc: (71,0)-(72,0) = "DOC\n"
-        ├── @ InterpolatedStringNode (location: (73,0)-(73,6))
-        │   ├── opening_loc: (73,0)-(73,6) = "<<~DOC"
-        │   ├── parts: (length: 2)
-        │   │   ├── @ EmbeddedStatementsNode (location: (74,2)-(74,5))
-        │   │   │   ├── opening_loc: (74,2)-(74,4) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (74,4)-(74,5) = "}"
-        │   │   └── @ StringNode (location: (74,5)-(75,0))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (74,5)-(75,0) = "\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\n"
-        │   └── closing_loc: (75,0)-(76,0) = "DOC\n"
-        ├── @ IfNode (location: (77,0)-(81,3))
-        │   ├── if_keyword_loc: (77,0)-(77,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (77,3)-(77,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (78,2)-(78,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (78,2)-(78,8))
-        │   │           ├── opening_loc: (78,2)-(78,8) = "<<~DOC"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (79,4)-(79,7))
-        │   │           │   │   ├── opening_loc: (79,4)-(79,6) = "\#{"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── closing_loc: (79,6)-(79,7) = "}"
-        │   │           │   └── @ StringNode (location: (79,7)-(80,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (79,7)-(80,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (80,0)-(81,0) = "  DOC\n"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (81,0)-(81,3) = "end"
-        ├── @ IfNode (location: (83,0)-(87,3))
-        │   ├── if_keyword_loc: (83,0)-(83,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (83,3)-(83,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (84,2)-(84,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (84,2)-(84,8))
-        │   │           ├── opening_loc: (84,2)-(84,8) = "<<~DOC"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (85,0)-(85,5))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (85,0)-(85,5) = "    b"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "b"
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (85,5)-(85,8))
-        │   │           │   │   ├── opening_loc: (85,5)-(85,7) = "\#{"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── closing_loc: (85,7)-(85,8) = "}"
-        │   │           │   └── @ StringNode (location: (85,8)-(86,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (85,8)-(86,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (86,0)-(87,0) = "  DOC\n"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (87,0)-(87,3) = "end"
-        ├── @ IfNode (location: (89,0)-(93,3))
-        │   ├── if_keyword_loc: (89,0)-(89,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (89,3)-(89,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (90,2)-(90,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (90,2)-(90,8))
-        │   │           ├── opening_loc: (90,2)-(90,8) = "<<~DOC"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (91,4)-(91,7))
-        │   │           │   │   ├── opening_loc: (91,4)-(91,6) = "\#{"
-        │   │           │   │   ├── statements: ∅
-        │   │           │   │   └── closing_loc: (91,6)-(91,7) = "}"
-        │   │           │   └── @ StringNode (location: (91,7)-(92,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (91,7)-(92,0) = "a\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "a\n"
-        │   │           └── closing_loc: (92,0)-(93,0) = "  DOC\n"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (93,0)-(93,3) = "end"
-        ├── @ IfNode (location: (95,0)-(101,3))
-        │   ├── if_keyword_loc: (95,0)-(95,2) = "if"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (95,3)-(95,7))
-        │   ├── then_keyword_loc: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (96,2)-(96,10))
-        │   │   └── body: (length: 1)
-        │   │       └── @ StringNode (location: (96,2)-(96,10))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (96,2)-(96,10) = "<<-'DOC'"
-        │   │           ├── content_loc: (97,0)-(100,0) = "   a\n\n   b\n"
-        │   │           ├── closing_loc: (100,0)-(101,0) = "  DOC\n"
-        │   │           └── unescaped: "   a\n\n   b\n"
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (101,0)-(101,3) = "end"
-        ├── @ InterpolatedStringNode (location: (103,0)-(103,6))
-        │   ├── opening_loc: (103,0)-(103,1) = "\""
-        │   ├── parts: (length: 2)
-        │   │   ├── @ EmbeddedStatementsNode (location: (103,1)-(103,4))
-        │   │   │   ├── opening_loc: (103,1)-(103,3) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (103,3)-(103,4) = "}"
-        │   │   └── @ StringNode (location: (103,4)-(103,5))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (103,4)-(103,5) = "a"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a"
-        │   └── closing_loc: (103,5)-(103,6) = "\""
-        ├── @ InterpolatedStringNode (location: (105,0)-(105,12))
-        │   ├── opening_loc: (105,0)-(105,2) = "%("
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (105,2)-(105,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (105,2)-(105,5) = "\\n\""
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "\n\""
-        │   │   ├── @ EmbeddedStatementsNode (location: (105,5)-(105,8))
-        │   │   │   ├── opening_loc: (105,5)-(105,7) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (105,7)-(105,8) = "}"
-        │   │   └── @ StringNode (location: (105,8)-(105,11))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (105,8)-(105,11) = "\"\\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\"\n"
-        │   └── closing_loc: (105,11)-(105,12) = ")"
-        ├── @ InterpolatedStringNode (location: (107,0)-(107,14))
-        │   ├── opening_loc: (107,0)-(107,3) = "%Q("
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (107,3)-(107,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (107,3)-(107,7) = "-\\n\""
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "-\n\""
-        │   │   ├── @ EmbeddedStatementsNode (location: (107,7)-(107,10))
-        │   │   │   ├── opening_loc: (107,7)-(107,9) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (107,9)-(107,10) = "}"
-        │   │   └── @ StringNode (location: (107,10)-(107,13))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (107,10)-(107,13) = "\"\\n"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\"\n"
-        │   └── closing_loc: (107,13)-(107,14) = ")"
-        ├── @ InterpolatedStringNode (location: (109,0)-(111,2))
-        │   ├── opening_loc: (109,0)-(109,1) = "\""
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (109,1)-(110,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (109,1)-(110,0) = "a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (110,0)-(110,3))
-        │   │   │   ├── opening_loc: (110,0)-(110,2) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (110,2)-(110,3) = "}"
-        │   │   └── @ StringNode (location: (110,3)-(111,1))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (110,3)-(111,1) = "\nb"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\nb"
-        │   └── closing_loc: (111,1)-(111,2) = "\""
-        ├── @ InterpolatedStringNode (location: (113,0)-(114,2))
-        │   ├── opening_loc: (113,0)-(113,1) = "\""
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (113,1)-(113,4))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (113,1)-(113,4) = "a\\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (113,4)-(113,7))
-        │   │   │   ├── opening_loc: (113,4)-(113,6) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (113,6)-(113,7) = "}"
-        │   │   └── @ StringNode (location: (113,7)-(114,1))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (113,7)-(114,1) = "\nb"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\nb"
-        │   └── closing_loc: (114,1)-(114,2) = "\""
-        ├── @ InterpolatedStringNode (location: (116,0)-(117,7))
-        │   ├── opening_loc: (116,0)-(116,1) = "\""
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (116,1)-(117,0))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (116,1)-(117,0) = "a\n"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "a\n"
-        │   │   ├── @ EmbeddedStatementsNode (location: (117,0)-(117,3))
-        │   │   │   ├── opening_loc: (117,0)-(117,2) = "\#{"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── closing_loc: (117,2)-(117,3) = "}"
-        │   │   └── @ StringNode (location: (117,3)-(117,6))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (117,3)-(117,6) = "\\nb"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\nb"
-        │   └── closing_loc: (117,6)-(117,7) = "\""
-        ├── @ InterpolatedStringNode (location: (119,0)-(120,5))
-        │   ├── opening_loc: ∅
-        │   ├── parts: (length: 2)
-        │   │   ├── @ StringNode (location: (119,0)-(119,3))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (119,0)-(119,1) = "'"
-        │   │   │   ├── content_loc: (119,1)-(119,2) = "a"
-        │   │   │   ├── closing_loc: (119,2)-(119,3) = "'"
-        │   │   │   └── unescaped: "a"
-        │   │   └── @ InterpolatedStringNode (location: (120,0)-(120,5))
-        │   │       ├── opening_loc: (120,0)-(120,1) = "\""
-        │   │       ├── parts: (length: 1)
-        │   │       │   └── @ EmbeddedStatementsNode (location: (120,1)-(120,4))
-        │   │       │       ├── opening_loc: (120,1)-(120,3) = "\#{"
-        │   │       │       ├── statements: ∅
-        │   │       │       └── closing_loc: (120,3)-(120,4) = "}"
-        │   │       └── closing_loc: (120,4)-(120,5) = "\""
-        │   └── closing_loc: ∅
-        ├── @ InterpolatedStringNode (location: (122,0)-(122,8))
-        │   ├── opening_loc: ∅
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (122,0)-(122,2))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (122,0)-(122,1) = "\""
-        │   │   │   ├── content_loc: (122,1)-(122,1) = ""
-        │   │   │   ├── closing_loc: (122,1)-(122,2) = "\""
-        │   │   │   └── unescaped: ""
-        │   │   ├── @ StringNode (location: (122,3)-(122,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: (122,3)-(122,4) = "\""
-        │   │   │   ├── content_loc: (122,4)-(122,4) = ""
-        │   │   │   ├── closing_loc: (122,4)-(122,5) = "\""
-        │   │   │   └── unescaped: ""
-        │   │   └── @ StringNode (location: (122,6)-(122,8))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (122,6)-(122,7) = "\""
-        │   │       ├── content_loc: (122,7)-(122,7) = ""
-        │   │       ├── closing_loc: (122,7)-(122,8) = "\""
-        │   │       └── unescaped: ""
-        │   └── closing_loc: ∅
-        ├── @ InterpolatedStringNode (location: (124,0)-(124,12))
-        │   ├── opening_loc: ∅
-        │   ├── parts: (length: 2)
-        │   │   ├── @ InterpolatedStringNode (location: (124,0)-(124,8))
-        │   │   │   ├── opening_loc: (124,0)-(124,1) = "\""
-        │   │   │   ├── parts: (length: 2)
-        │   │   │   │   ├── @ StringNode (location: (124,1)-(124,2))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   ├── content_loc: (124,1)-(124,2) = "a"
-        │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   └── unescaped: "a"
-        │   │   │   │   └── @ EmbeddedStatementsNode (location: (124,2)-(124,7))
-        │   │   │   │       ├── opening_loc: (124,2)-(124,4) = "\#{"
-        │   │   │   │       ├── statements:
-        │   │   │   │       │   @ StatementsNode (location: (124,4)-(124,6))
-        │   │   │   │       │   └── body: (length: 1)
-        │   │   │   │       │       └── @ InstanceVariableReadNode (location: (124,4)-(124,6))
-        │   │   │   │       │           └── name: :@a
-        │   │   │   │       └── closing_loc: (124,6)-(124,7) = "}"
-        │   │   │   └── closing_loc: (124,7)-(124,8) = "\""
-        │   │   └── @ StringNode (location: (124,9)-(124,12))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (124,9)-(124,10) = "\""
-        │   │       ├── content_loc: (124,10)-(124,11) = "b"
-        │   │       ├── closing_loc: (124,11)-(124,12) = "\""
-        │   │       └── unescaped: "b"
-        │   └── closing_loc: ∅
-        ├── @ InterpolatedStringNode (location: (125,0)-(125,10))
-        │   ├── opening_loc: ∅
-        │   ├── parts: (length: 2)
-        │   │   ├── @ InterpolatedStringNode (location: (125,0)-(125,6))
-        │   │   │   ├── opening_loc: (125,0)-(125,1) = "\""
-        │   │   │   ├── parts: (length: 2)
-        │   │   │   │   ├── @ StringNode (location: (125,1)-(125,2))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   ├── content_loc: (125,1)-(125,2) = "a"
-        │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   └── unescaped: "a"
-        │   │   │   │   └── @ EmbeddedVariableNode (location: (125,2)-(125,5))
-        │   │   │   │       ├── operator_loc: (125,2)-(125,3) = "#"
-        │   │   │   │       └── variable:
-        │   │   │   │           @ InstanceVariableReadNode (location: (125,3)-(125,5))
-        │   │   │   │           └── name: :@a
-        │   │   │   └── closing_loc: (125,5)-(125,6) = "\""
-        │   │   └── @ StringNode (location: (125,7)-(125,10))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (125,7)-(125,8) = "\""
-        │   │       ├── content_loc: (125,8)-(125,9) = "b"
-        │   │       ├── closing_loc: (125,9)-(125,10) = "\""
-        │   │       └── unescaped: "b"
-        │   └── closing_loc: ∅
-        ├── @ InterpolatedStringNode (location: (126,0)-(126,10))
-        │   ├── opening_loc: ∅
-        │   ├── parts: (length: 2)
-        │   │   ├── @ InterpolatedStringNode (location: (126,0)-(126,6))
-        │   │   │   ├── opening_loc: (126,0)-(126,1) = "\""
-        │   │   │   ├── parts: (length: 2)
-        │   │   │   │   ├── @ StringNode (location: (126,1)-(126,2))
-        │   │   │   │   │   ├── flags: ∅
-        │   │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   │   ├── content_loc: (126,1)-(126,2) = "a"
-        │   │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   │   └── unescaped: "a"
-        │   │   │   │   └── @ EmbeddedVariableNode (location: (126,2)-(126,5))
-        │   │   │   │       ├── operator_loc: (126,2)-(126,3) = "#"
-        │   │   │   │       └── variable:
-        │   │   │   │           @ GlobalVariableReadNode (location: (126,3)-(126,5))
-        │   │   │   │           └── name: :$a
-        │   │   │   └── closing_loc: (126,5)-(126,6) = "\""
-        │   │   └── @ StringNode (location: (126,7)-(126,10))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: (126,7)-(126,8) = "\""
-        │   │       ├── content_loc: (126,8)-(126,9) = "b"
-        │   │       ├── closing_loc: (126,9)-(126,10) = "\""
-        │   │       └── unescaped: "b"
-        │   └── closing_loc: ∅
-        └── @ InterpolatedStringNode (location: (127,0)-(127,11))
-            ├── opening_loc: ∅
-            ├── parts: (length: 2)
-            │   ├── @ InterpolatedStringNode (location: (127,0)-(127,7))
-            │   │   ├── opening_loc: (127,0)-(127,1) = "\""
-            │   │   ├── parts: (length: 2)
-            │   │   │   ├── @ StringNode (location: (127,1)-(127,2))
-            │   │   │   │   ├── flags: ∅
-            │   │   │   │   ├── opening_loc: ∅
-            │   │   │   │   ├── content_loc: (127,1)-(127,2) = "a"
-            │   │   │   │   ├── closing_loc: ∅
-            │   │   │   │   └── unescaped: "a"
-            │   │   │   └── @ EmbeddedVariableNode (location: (127,2)-(127,6))
-            │   │   │       ├── operator_loc: (127,2)-(127,3) = "#"
-            │   │   │       └── variable:
-            │   │   │           @ ClassVariableReadNode (location: (127,3)-(127,6))
-            │   │   │           └── name: :@@a
-            │   │   └── closing_loc: (127,6)-(127,7) = "\""
-            │   └── @ StringNode (location: (127,8)-(127,11))
-            │       ├── flags: ∅
-            │       ├── opening_loc: (127,8)-(127,9) = "\""
-            │       ├── content_loc: (127,9)-(127,10) = "b"
-            │       ├── closing_loc: (127,10)-(127,11) = "\""
-            │       └── unescaped: "b"
-            └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/kwbegin.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/kwbegin.txt
deleted file mode 100644
index 38486ddc12e..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/kwbegin.txt
+++ /dev/null
@@ -1,259 +0,0 @@
-@ ProgramNode (location: (1,0)-(42,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(42,3))
-    └── body: (length: 8)
-        ├── @ BeginNode (location: (1,0)-(3,3))
-        │   ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-        │   ├── statements: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (2,0)-(2,6))
-        │   │   ├── keyword_loc: (2,0)-(2,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        ├── @ BeginNode (location: (5,0)-(8,3))
-        │   ├── begin_keyword_loc: (5,0)-(5,5) = "begin"
-        │   ├── statements: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (6,0)-(6,6))
-        │   │   ├── keyword_loc: (6,0)-(6,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause:
-        │   │   @ ElseNode (location: (7,0)-(8,3))
-        │   │   ├── else_keyword_loc: (7,0)-(7,4) = "else"
-        │   │   ├── statements: ∅
-        │   │   └── end_keyword_loc: (8,0)-(8,3) = "end"
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (8,0)-(8,3) = "end"
-        ├── @ BeginNode (location: (10,0)-(12,3))
-        │   ├── begin_keyword_loc: (10,0)-(10,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (11,2)-(11,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (11,2)-(11,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (11,2)-(11,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (12,0)-(12,3) = "end"
-        ├── @ BeginNode (location: (14,0)-(18,3))
-        │   ├── begin_keyword_loc: (14,0)-(14,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (15,2)-(15,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (15,2)-(15,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (15,2)-(15,3) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (16,0)-(17,3))
-        │   │   ├── keyword_loc: (16,0)-(16,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (17,2)-(17,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (17,2)-(17,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (17,2)-(17,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (18,0)-(18,3) = "end"
-        ├── @ BeginNode (location: (20,0)-(25,3))
-        │   ├── begin_keyword_loc: (20,0)-(20,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (21,2)-(22,3))
-        │   │   └── body: (length: 2)
-        │   │       ├── @ CallNode (location: (21,2)-(21,3))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :a
-        │   │       │   ├── message_loc: (21,2)-(21,3) = "a"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (22,2)-(22,3))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :b
-        │   │           ├── message_loc: (22,2)-(22,3) = "b"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (23,0)-(24,3))
-        │   │   ├── keyword_loc: (23,0)-(23,6) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (24,2)-(24,3))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (24,2)-(24,3))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :b
-        │   │   │           ├── message_loc: (24,2)-(24,3) = "b"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (25,0)-(25,3) = "end"
-        ├── @ BeginNode (location: (27,0)-(30,3))
-        │   ├── begin_keyword_loc: (27,0)-(27,5) = "begin"
-        │   ├── statements: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (28,0)-(28,8))
-        │   │   ├── keyword_loc: (28,0)-(28,6) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (28,7)-(28,8))
-        │   │   │       └── name: :A
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause:
-        │   │   @ ElseNode (location: (29,0)-(30,3))
-        │   │   ├── else_keyword_loc: (29,0)-(29,4) = "else"
-        │   │   ├── statements: ∅
-        │   │   └── end_keyword_loc: (30,0)-(30,3) = "end"
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (30,0)-(30,3) = "end"
-        ├── @ BeginNode (location: (32,0)-(32,26))
-        │   ├── begin_keyword_loc: (32,0)-(32,5) = "begin"
-        │   ├── statements: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (32,7)-(32,15))
-        │   │   ├── keyword_loc: (32,7)-(32,13) = "rescue"
-        │   │   ├── exceptions: (length: 1)
-        │   │   │   └── @ ConstantReadNode (location: (32,14)-(32,15))
-        │   │   │       └── name: :A
-        │   │   ├── operator_loc: ∅
-        │   │   ├── reference: ∅
-        │   │   ├── statements: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause:
-        │   │   @ ElseNode (location: (32,17)-(32,26))
-        │   │   ├── else_keyword_loc: (32,17)-(32,21) = "else"
-        │   │   ├── statements: ∅
-        │   │   └── end_keyword_loc: (32,23)-(32,26) = "end"
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (32,23)-(32,26) = "end"
-        └── @ BeginNode (location: (34,0)-(42,3))
-            ├── begin_keyword_loc: (34,0)-(34,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (35,2)-(35,3))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (35,2)-(35,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :a
-            │           ├── message_loc: (35,2)-(35,3) = "a"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (36,0)-(39,3))
-            │   ├── keyword_loc: (36,0)-(36,6) = "rescue"
-            │   ├── exceptions: (length: 1)
-            │   │   └── @ ConstantReadNode (location: (36,7)-(36,8))
-            │   │       └── name: :A
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (37,2)-(37,3))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (37,2)-(37,3))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :b
-            │   │           ├── message_loc: (37,2)-(37,3) = "b"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent:
-            │       @ RescueNode (location: (38,0)-(39,3))
-            │       ├── keyword_loc: (38,0)-(38,6) = "rescue"
-            │       ├── exceptions: (length: 1)
-            │       │   └── @ ConstantReadNode (location: (38,7)-(38,8))
-            │       │       └── name: :B
-            │       ├── operator_loc: ∅
-            │       ├── reference: ∅
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (39,2)-(39,3))
-            │       │   └── body: (length: 1)
-            │       │       └── @ CallNode (location: (39,2)-(39,3))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :c
-            │       │           ├── message_loc: (39,2)-(39,3) = "c"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (40,0)-(42,3))
-            │   ├── ensure_keyword_loc: (40,0)-(40,6) = "ensure"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (41,2)-(41,3))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (41,2)-(41,3))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :d
-            │   │           ├── message_loc: (41,2)-(41,3) = "d"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (42,0)-(42,3) = "end"
-            └── end_keyword_loc: (42,0)-(42,3) = "end"
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/literal.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/literal.txt
deleted file mode 100644
index 59e02be64fc..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/literal.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-@ ProgramNode (location: (1,0)-(14,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(14,10))
-    └── body: (length: 14)
-        ├── @ RationalNode (location: (1,0)-(1,4))
-        │   └── numeric:
-        │       @ FloatNode (location: (1,0)-(1,3))
-        │       └── value: 1.0
-        ├── @ RationalNode (location: (2,0)-(2,3))
-        │   └── numeric:
-        │       @ IntegerNode (location: (2,0)-(2,2))
-        │       ├── flags: decimal
-        │       └── value: 0
-        ├── @ IntegerNode (location: (3,0)-(3,3))
-        │   ├── flags: hexadecimal
-        │   └── value: 1
-        ├── @ IntegerNode (location: (4,0)-(4,5))
-        │   ├── flags: decimal
-        │   └── value: 1000
-        ├── @ FloatNode (location: (5,0)-(5,4))
-        │   └── value: 10000000000.0
-        ├── @ FloatNode (location: (6,0)-(6,14))
-        │   └── value: Infinity
-        ├── @ FloatNode (location: (7,0)-(7,15))
-        │   └── value: -Infinity
-        ├── @ StringNode (location: (8,0)-(8,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (8,0)-(8,1) = "?"
-        │   ├── content_loc: (8,1)-(8,2) = "c"
-        │   ├── closing_loc: ∅
-        │   └── unescaped: "c"
-        ├── @ RegularExpressionNode (location: (9,0)-(9,5))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (9,0)-(9,3) = "%r("
-        │   ├── content_loc: (9,3)-(9,4) = "/"
-        │   ├── closing_loc: (9,4)-(9,5) = ")"
-        │   └── unescaped: "/"
-        ├── @ RegularExpressionNode (location: (10,0)-(10,6))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (10,0)-(10,3) = "%r("
-        │   ├── content_loc: (10,3)-(10,5) = "\\)"
-        │   ├── closing_loc: (10,5)-(10,6) = ")"
-        │   └── unescaped: "\\)"
-        ├── @ InterpolatedRegularExpressionNode (location: (11,0)-(11,14))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (11,0)-(11,3) = "%r("
-        │   ├── parts: (length: 2)
-        │   │   ├── @ EmbeddedStatementsNode (location: (11,3)-(11,10))
-        │   │   │   ├── opening_loc: (11,3)-(11,5) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (11,5)-(11,9))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ InstanceVariableReadNode (location: (11,5)-(11,9))
-        │   │   │   │           └── name: :@bar
-        │   │   │   └── closing_loc: (11,9)-(11,10) = "}"
-        │   │   └── @ StringNode (location: (11,10)-(11,13))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (11,10)-(11,13) = "baz"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "baz"
-        │   └── closing_loc: (11,13)-(11,14) = ")"
-        ├── @ FloatNode (location: (12,0)-(12,16))
-        │   └── value: Infinity
-        ├── @ FloatNode (location: (13,0)-(13,17))
-        │   └── value: -Infinity
-        └── @ CallNode (location: (14,0)-(14,10))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :w
-            ├── message_loc: (14,0)-(14,1) = "w"
-            ├── opening_loc: (14,1)-(14,2) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (14,2)-(14,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (14,2)-(14,9))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (14,2)-(14,5) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (14,6)-(14,9))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (14,6)-(14,9))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :bar
-            │           │           ├── message_loc: (14,6)-(14,9) = "bar"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: (14,9)-(14,10) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/send.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/send.txt
deleted file mode 100644
index 7c152c3bfbe..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/send.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,15))
-    └── body: (length: 4)
-        ├── @ CallNode (location: (1,0)-(1,3))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (2,0)-(2,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (2,0)-(2,3) = "foo"
-        │   ├── opening_loc: (2,3)-(2,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (2,4)-(2,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (2,4)-(2,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: (2,5)-(2,6) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (4,0)-(4,15))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (4,0)-(4,10))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ CallNode (location: (4,0)-(4,8))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── receiver:
-        │   │   │   │   @ CallNode (location: (4,0)-(4,1))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :a
-        │   │   │   │   ├── message_loc: (4,0)-(4,1) = "a"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   ├── call_operator_loc: (4,1)-(4,2) = "."
-        │   │   │   ├── name: :===
-        │   │   │   ├── message_loc: (4,2)-(4,5) = "==="
-        │   │   │   ├── opening_loc: (4,5)-(4,6) = "("
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (4,6)-(4,7))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (4,6)-(4,7))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :b
-        │   │   │   │           ├── message_loc: (4,6)-(4,7) = "b"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── closing_loc: (4,7)-(4,8) = ")"
-        │   │   │   └── block: ∅
-        │   │   ├── call_operator_loc: (4,8)-(4,9) = "."
-        │   │   ├── name: :c
-        │   │   ├── message_loc: (4,9)-(4,10) = "c"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :==
-        │   ├── message_loc: (4,11)-(4,13) = "=="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (4,14)-(4,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (4,14)-(4,15))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :d
-        │   │           ├── message_loc: (4,14)-(4,15) = "d"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (6,0)-(6,15))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (6,0)-(6,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (6,0)-(6,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :==
-            ├── message_loc: (6,2)-(6,4) = "=="
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (6,5)-(6,15))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (6,5)-(6,15))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ CallNode (location: (6,5)-(6,8))
-            │           │   ├── flags: ∅
-            │           │   ├── receiver:
-            │           │   │   @ CallNode (location: (6,5)-(6,6))
-            │           │   │   ├── flags: variable_call, ignore_visibility
-            │           │   │   ├── receiver: ∅
-            │           │   │   ├── call_operator_loc: ∅
-            │           │   │   ├── name: :d
-            │           │   │   ├── message_loc: (6,5)-(6,6) = "d"
-            │           │   │   ├── opening_loc: ∅
-            │           │   │   ├── arguments: ∅
-            │           │   │   ├── closing_loc: ∅
-            │           │   │   └── block: ∅
-            │           │   ├── call_operator_loc: (6,6)-(6,7) = "."
-            │           │   ├── name: :c
-            │           │   ├── message_loc: (6,7)-(6,8) = "c"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments: ∅
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── call_operator_loc: (6,8)-(6,9) = "."
-            │           ├── name: :===
-            │           ├── message_loc: (6,9)-(6,12) = "==="
-            │           ├── opening_loc: (6,12)-(6,13) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (6,13)-(6,14))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (6,13)-(6,14))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :c
-            │           │           ├── message_loc: (6,13)-(6,14) = "c"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: (6,14)-(6,15) = ")"
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/undef.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/undef.txt
deleted file mode 100644
index ecb073148d7..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/undef.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,14))
-    └── body: (length: 2)
-        ├── @ UndefNode (location: (1,0)-(1,9))
-        │   ├── names: (length: 1)
-        │   │   └── @ SymbolNode (location: (1,6)-(1,9))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (1,6)-(1,9) = "foo"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "foo"
-        │   └── keyword_loc: (1,0)-(1,5) = "undef"
-        └── @ UndefNode (location: (2,0)-(2,14))
-            ├── names: (length: 2)
-            │   ├── @ SymbolNode (location: (2,6)-(2,9))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (2,6)-(2,9) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   └── @ SymbolNode (location: (2,11)-(2,14))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: ∅
-            │       ├── value_loc: (2,11)-(2,14) = "bar"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "bar"
-            └── keyword_loc: (2,0)-(2,5) = "undef"
diff --git a/test/mri/prism/snapshots/unparser/corpus/semantic/while.txt b/test/mri/prism/snapshots/unparser/corpus/semantic/while.txt
deleted file mode 100644
index 36bfba5be69..00000000000
--- a/test/mri/prism/snapshots/unparser/corpus/semantic/while.txt
+++ /dev/null
@@ -1,277 +0,0 @@
-@ ProgramNode (location: (1,0)-(25,3))
-├── locals: [:foo, :a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(25,3))
-    └── body: (length: 7)
-        ├── @ UntilNode (location: (1,0)-(1,13))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (1,2)-(1,7) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,8)-(1,13))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :b?
-        │   │   ├── message_loc: (1,8)-(1,10) = "b?"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (1,11)-(1,13))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (1,11)-(1,12) = "{"
-        │   │       └── closing_loc: (1,12)-(1,13) = "}"
-        │   └── statements:
-        │       @ StatementsNode (location: (1,0)-(1,1))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (1,0)-(1,1))
-        │               ├── flags: variable_call, ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :a
-        │               ├── message_loc: (1,0)-(1,1) = "a"
-        │               ├── opening_loc: ∅
-        │               ├── arguments: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ UntilNode (location: (3,0)-(5,3))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (3,0)-(3,5) = "until"
-        │   ├── closing_loc: (5,0)-(5,3) = "end"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (3,6)-(3,11))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :b?
-        │   │   ├── message_loc: (3,6)-(3,8) = "b?"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (3,9)-(3,11))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (3,9)-(3,10) = "{"
-        │   │       └── closing_loc: (3,10)-(3,11) = "}"
-        │   └── statements:
-        │       @ StatementsNode (location: (4,2)-(4,3))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (4,2)-(4,3))
-        │               ├── flags: variable_call, ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :a
-        │               ├── message_loc: (4,2)-(4,3) = "a"
-        │               ├── opening_loc: ∅
-        │               ├── arguments: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ WhileNode (location: (7,0)-(7,19))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (7,10)-(7,15) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ LocalVariableReadNode (location: (7,16)-(7,19))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   └── statements:
-        │       @ StatementsNode (location: (7,0)-(7,9))
-        │       └── body: (length: 1)
-        │           └── @ LocalVariableWriteNode (location: (7,0)-(7,9))
-        │               ├── name: :foo
-        │               ├── depth: 0
-        │               ├── name_loc: (7,0)-(7,3) = "foo"
-        │               ├── value:
-        │               │   @ CallNode (location: (7,6)-(7,9))
-        │               │   ├── flags: variable_call, ignore_visibility
-        │               │   ├── receiver: ∅
-        │               │   ├── call_operator_loc: ∅
-        │               │   ├── name: :bar
-        │               │   ├── message_loc: (7,6)-(7,9) = "bar"
-        │               │   ├── opening_loc: ∅
-        │               │   ├── arguments: ∅
-        │               │   ├── closing_loc: ∅
-        │               │   └── block: ∅
-        │               └── operator_loc: (7,4)-(7,5) = "="
-        ├── @ UntilNode (location: (9,0)-(9,18))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (9,2)-(9,7) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ AndNode (location: (9,8)-(9,18))
-        │   │   ├── left:
-        │   │   │   @ CallNode (location: (9,8)-(9,9))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :b
-        │   │   │   ├── message_loc: (9,8)-(9,9) = "b"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── right:
-        │   │   │   @ CallNode (location: (9,13)-(9,18))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :a
-        │   │   │   ├── message_loc: (9,13)-(9,14) = "a"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block:
-        │   │   │       @ BlockNode (location: (9,15)-(9,18))
-        │   │   │       ├── locals: []
-        │   │   │       ├── parameters: ∅
-        │   │   │       ├── body: ∅
-        │   │   │       ├── opening_loc: (9,15)-(9,16) = "{"
-        │   │   │       └── closing_loc: (9,17)-(9,18) = "}"
-        │   │   └── operator_loc: (9,10)-(9,12) = "&&"
-        │   └── statements:
-        │       @ StatementsNode (location: (9,0)-(9,1))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (9,0)-(9,1))
-        │               ├── flags: variable_call, ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :a
-        │               ├── message_loc: (9,0)-(9,1) = "a"
-        │               ├── opening_loc: ∅
-        │               ├── arguments: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ WhileNode (location: (11,0)-(13,3))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (11,0)-(11,5) = "while"
-        │   ├── closing_loc: (13,0)-(13,3) = "end"
-        │   ├── predicate:
-        │   │   @ LocalVariableWriteNode (location: (11,6)-(11,11))
-        │   │   ├── name: :a
-        │   │   ├── depth: 0
-        │   │   ├── name_loc: (11,6)-(11,7) = "a"
-        │   │   ├── value:
-        │   │   │   @ CallNode (location: (11,10)-(11,11))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :b
-        │   │   │   ├── message_loc: (11,10)-(11,11) = "b"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (11,8)-(11,9) = "="
-        │   └── statements:
-        │       @ StatementsNode (location: (12,2)-(12,3))
-        │       └── body: (length: 1)
-        │           └── @ LocalVariableReadNode (location: (12,2)-(12,3))
-        │               ├── name: :a
-        │               └── depth: 0
-        ├── @ UntilNode (location: (15,0)-(18,3))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (15,2)-(15,7) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (15,8)-(18,3))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :b
-        │   │   ├── message_loc: (15,8)-(15,9) = "b"
-        │   │   ├── opening_loc: (15,9)-(15,10) = "("
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (15,10)-(15,16))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ StringNode (location: (15,10)-(15,16))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (15,10)-(15,16) = "<<-FOO"
-        │   │   │           ├── content_loc: (16,0)-(16,0) = ""
-        │   │   │           ├── closing_loc: (16,0)-(17,0) = "FOO\n"
-        │   │   │           └── unescaped: ""
-        │   │   ├── closing_loc: (15,16)-(15,17) = ")"
-        │   │   └── block:
-        │   │       @ BlockNode (location: (15,18)-(18,3))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body:
-        │   │       │   @ StatementsNode (location: (17,2)-(17,3))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ CallNode (location: (17,2)-(17,3))
-        │   │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │           ├── receiver: ∅
-        │   │       │           ├── call_operator_loc: ∅
-        │   │       │           ├── name: :c
-        │   │       │           ├── message_loc: (17,2)-(17,3) = "c"
-        │   │       │           ├── opening_loc: ∅
-        │   │       │           ├── arguments: ∅
-        │   │       │           ├── closing_loc: ∅
-        │   │       │           └── block: ∅
-        │   │       ├── opening_loc: (15,18)-(15,20) = "do"
-        │   │       └── closing_loc: (18,0)-(18,3) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (15,0)-(15,1))
-        │       └── body: (length: 1)
-        │           └── @ LocalVariableReadNode (location: (15,0)-(15,1))
-        │               ├── name: :a
-        │               └── depth: 0
-        └── @ ModuleNode (location: (20,0)-(25,3))
-            ├── locals: [:foo]
-            ├── module_keyword_loc: (20,0)-(20,6) = "module"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (20,7)-(20,8))
-            │   └── name: :A
-            ├── body:
-            │   @ StatementsNode (location: (21,2)-(24,5))
-            │   └── body: (length: 2)
-            │       ├── @ LocalVariableWriteNode (location: (21,2)-(21,11))
-            │       │   ├── name: :foo
-            │       │   ├── depth: 0
-            │       │   ├── name_loc: (21,2)-(21,5) = "foo"
-            │       │   ├── value:
-            │       │   │   @ CallNode (location: (21,8)-(21,11))
-            │       │   │   ├── flags: variable_call, ignore_visibility
-            │       │   │   ├── receiver: ∅
-            │       │   │   ├── call_operator_loc: ∅
-            │       │   │   ├── name: :exp
-            │       │   │   ├── message_loc: (21,8)-(21,11) = "exp"
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── arguments: ∅
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── block: ∅
-            │       │   └── operator_loc: (21,6)-(21,7) = "="
-            │       └── @ WhileNode (location: (22,2)-(24,5))
-            │           ├── flags: ∅
-            │           ├── keyword_loc: (22,2)-(22,7) = "while"
-            │           ├── closing_loc: (24,2)-(24,5) = "end"
-            │           ├── predicate:
-            │           │   @ LocalVariableReadNode (location: (22,8)-(22,11))
-            │           │   ├── name: :foo
-            │           │   └── depth: 0
-            │           └── statements:
-            │               @ StatementsNode (location: (23,4)-(23,13))
-            │               └── body: (length: 1)
-            │                   └── @ LocalVariableWriteNode (location: (23,4)-(23,13))
-            │                       ├── name: :foo
-            │                       ├── depth: 0
-            │                       ├── name_loc: (23,4)-(23,7) = "foo"
-            │                       ├── value:
-            │                       │   @ CallNode (location: (23,10)-(23,13))
-            │                       │   ├── flags: variable_call, ignore_visibility
-            │                       │   ├── receiver: ∅
-            │                       │   ├── call_operator_loc: ∅
-            │                       │   ├── name: :bar
-            │                       │   ├── message_loc: (23,10)-(23,13) = "bar"
-            │                       │   ├── opening_loc: ∅
-            │                       │   ├── arguments: ∅
-            │                       │   ├── closing_loc: ∅
-            │                       │   └── block: ∅
-            │                       └── operator_loc: (23,8)-(23,9) = "="
-            ├── end_keyword_loc: (25,0)-(25,3) = "end"
-            └── name: :A
diff --git a/test/mri/prism/snapshots/until.txt b/test/mri/prism/snapshots/until.txt
deleted file mode 100644
index fc7cb92c91a..00000000000
--- a/test/mri/prism/snapshots/until.txt
+++ /dev/null
@@ -1,143 +0,0 @@
-@ ProgramNode (location: (1,0)-(13,20))
-├── locals: [:baz]
-└── statements:
-    @ StatementsNode (location: (1,0)-(13,20))
-    └── body: (length: 7)
-        ├── @ UntilNode (location: (1,0)-(1,18))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (1,0)-(1,5) = "until"
-        │   ├── closing_loc: (1,15)-(1,18) = "end"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (1,6)-(1,10))
-        │   └── statements:
-        │       @ StatementsNode (location: (1,12)-(1,13))
-        │       └── body: (length: 1)
-        │           └── @ IntegerNode (location: (1,12)-(1,13))
-        │               ├── flags: decimal
-        │               └── value: 1
-        ├── @ UntilNode (location: (3,0)-(3,12))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (3,2)-(3,7) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (3,8)-(3,12))
-        │   └── statements:
-        │       @ StatementsNode (location: (3,0)-(3,1))
-        │       └── body: (length: 1)
-        │           └── @ IntegerNode (location: (3,0)-(3,1))
-        │               ├── flags: decimal
-        │               └── value: 1
-        ├── @ UntilNode (location: (5,0)-(5,16))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (5,6)-(5,11) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (5,12)-(5,16))
-        │   └── statements:
-        │       @ StatementsNode (location: (5,0)-(5,5))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (5,0)-(5,5))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (5,0)-(5,5) = "break"
-        ├── @ UntilNode (location: (7,0)-(7,15))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (7,5)-(7,10) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (7,11)-(7,15))
-        │   └── statements:
-        │       @ StatementsNode (location: (7,0)-(7,4))
-        │       └── body: (length: 1)
-        │           └── @ NextNode (location: (7,0)-(7,4))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (7,0)-(7,4) = "next"
-        ├── @ UntilNode (location: (9,0)-(9,17))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (9,7)-(9,12) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (9,13)-(9,17))
-        │   └── statements:
-        │       @ StatementsNode (location: (9,0)-(9,6))
-        │       └── body: (length: 1)
-        │           └── @ ReturnNode (location: (9,0)-(9,6))
-        │               ├── keyword_loc: (9,0)-(9,6) = "return"
-        │               └── arguments: ∅
-        ├── @ UntilNode (location: (11,0)-(11,21))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (11,11)-(11,16) = "until"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (11,17)-(11,21))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar?
-        │   │   ├── message_loc: (11,17)-(11,21) = "bar?"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (11,0)-(11,10))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (11,0)-(11,10))
-        │               ├── flags: ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :foo
-        │               ├── message_loc: (11,0)-(11,3) = "foo"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (11,4)-(11,10))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 2)
-        │               │       ├── @ SymbolNode (location: (11,4)-(11,6))
-        │               │       │   ├── flags: forced_us_ascii_encoding
-        │               │       │   ├── opening_loc: (11,4)-(11,5) = ":"
-        │               │       │   ├── value_loc: (11,5)-(11,6) = "a"
-        │               │       │   ├── closing_loc: ∅
-        │               │       │   └── unescaped: "a"
-        │               │       └── @ SymbolNode (location: (11,8)-(11,10))
-        │               │           ├── flags: forced_us_ascii_encoding
-        │               │           ├── opening_loc: (11,8)-(11,9) = ":"
-        │               │           ├── value_loc: (11,9)-(11,10) = "b"
-        │               │           ├── closing_loc: ∅
-        │               │           └── unescaped: "b"
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        └── @ WhileNode (location: (13,0)-(13,20))
-            ├── flags: ∅
-            ├── keyword_loc: (13,4)-(13,9) = "while"
-            ├── closing_loc: ∅
-            ├── predicate:
-            │   @ MatchPredicateNode (location: (13,10)-(13,20))
-            │   ├── value:
-            │   │   @ CallNode (location: (13,10)-(13,13))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :bar
-            │   │   ├── message_loc: (13,10)-(13,13) = "bar"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── pattern:
-            │   │   @ LocalVariableTargetNode (location: (13,17)-(13,20))
-            │   │   ├── name: :baz
-            │   │   └── depth: 0
-            │   └── operator_loc: (13,14)-(13,16) = "in"
-            └── statements:
-                @ StatementsNode (location: (13,0)-(13,3))
-                └── body: (length: 1)
-                    └── @ CallNode (location: (13,0)-(13,3))
-                        ├── flags: variable_call, ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :foo
-                        ├── message_loc: (13,0)-(13,3) = "foo"
-                        ├── opening_loc: ∅
-                        ├── arguments: ∅
-                        ├── closing_loc: ∅
-                        └── block: ∅
diff --git a/test/mri/prism/snapshots/variables.txt b/test/mri/prism/snapshots/variables.txt
deleted file mode 100644
index b79612f924f..00000000000
--- a/test/mri/prism/snapshots/variables.txt
+++ /dev/null
@@ -1,408 +0,0 @@
-@ ProgramNode (location: (1,0)-(47,17))
-├── locals: [:abc, :foo, :bar, :baz, :a, :b, :c, :d]
-└── statements:
-    @ StatementsNode (location: (1,0)-(47,17))
-    └── body: (length: 25)
-        ├── @ ClassVariableReadNode (location: (1,0)-(1,5))
-        │   └── name: :@@abc
-        ├── @ ClassVariableWriteNode (location: (3,0)-(3,9))
-        │   ├── name: :@@abc
-        │   ├── name_loc: (3,0)-(3,5) = "@@abc"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (3,8)-(3,9))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (3,6)-(3,7) = "="
-        ├── @ MultiWriteNode (location: (5,0)-(5,16))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ ClassVariableTargetNode (location: (5,0)-(5,5))
-        │   │   │   └── name: :@@foo
-        │   │   └── @ ClassVariableTargetNode (location: (5,7)-(5,12))
-        │   │       └── name: :@@bar
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (5,13)-(5,14) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (5,15)-(5,16))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ ClassVariableWriteNode (location: (7,0)-(7,12))
-        │   ├── name: :@@foo
-        │   ├── name_loc: (7,0)-(7,5) = "@@foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (7,8)-(7,12))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ IntegerNode (location: (7,8)-(7,9))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── @ IntegerNode (location: (7,11)-(7,12))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 2
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (7,6)-(7,7) = "="
-        ├── @ GlobalVariableWriteNode (location: (9,0)-(9,8))
-        │   ├── name: :$abc
-        │   ├── name_loc: (9,0)-(9,4) = "$abc"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (9,7)-(9,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (9,5)-(9,6) = "="
-        ├── @ GlobalVariableReadNode (location: (11,0)-(11,4))
-        │   └── name: :$abc
-        ├── @ InstanceVariableReadNode (location: (13,0)-(13,4))
-        │   └── name: :@abc
-        ├── @ InstanceVariableWriteNode (location: (15,0)-(15,8))
-        │   ├── name: :@abc
-        │   ├── name_loc: (15,0)-(15,4) = "@abc"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (15,7)-(15,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (15,5)-(15,6) = "="
-        ├── @ CallNode (location: (17,0)-(17,1))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (17,0)-(17,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ LocalVariableWriteNode (location: (19,0)-(19,7))
-        │   ├── name: :abc
-        │   ├── depth: 0
-        │   ├── name_loc: (19,0)-(19,3) = "abc"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (19,6)-(19,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (19,4)-(19,5) = "="
-        ├── @ MultiWriteNode (location: (21,0)-(21,14))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ GlobalVariableTargetNode (location: (21,0)-(21,4))
-        │   │   │   └── name: :$foo
-        │   │   └── @ GlobalVariableTargetNode (location: (21,6)-(21,10))
-        │   │       └── name: :$bar
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (21,11)-(21,12) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (21,13)-(21,14))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ GlobalVariableWriteNode (location: (23,0)-(23,11))
-        │   ├── name: :$foo
-        │   ├── name_loc: (23,0)-(23,4) = "$foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (23,7)-(23,11))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ IntegerNode (location: (23,7)-(23,8))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── @ IntegerNode (location: (23,10)-(23,11))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 2
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (23,5)-(23,6) = "="
-        ├── @ MultiWriteNode (location: (25,0)-(25,14))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ InstanceVariableTargetNode (location: (25,0)-(25,4))
-        │   │   │   └── name: :@foo
-        │   │   └── @ InstanceVariableTargetNode (location: (25,6)-(25,10))
-        │   │       └── name: :@bar
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (25,11)-(25,12) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (25,13)-(25,14))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ InstanceVariableWriteNode (location: (27,0)-(27,11))
-        │   ├── name: :@foo
-        │   ├── name_loc: (27,0)-(27,4) = "@foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (27,7)-(27,11))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ IntegerNode (location: (27,7)-(27,8))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── @ IntegerNode (location: (27,10)-(27,11))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 2
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (27,5)-(27,6) = "="
-        ├── @ LocalVariableWriteNode (location: (29,0)-(29,7))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (29,0)-(29,3) = "foo"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (29,6)-(29,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (29,4)-(29,5) = "="
-        ├── @ LocalVariableWriteNode (location: (29,9)-(29,19))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (29,9)-(29,12) = "foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (29,15)-(29,19))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ IntegerNode (location: (29,15)-(29,16))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── @ IntegerNode (location: (29,18)-(29,19))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 2
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (29,13)-(29,14) = "="
-        ├── @ LocalVariableWriteNode (location: (31,0)-(31,10))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (31,0)-(31,3) = "foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (31,6)-(31,10))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ IntegerNode (location: (31,6)-(31,7))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── @ IntegerNode (location: (31,9)-(31,10))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 2
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (31,4)-(31,5) = "="
-        ├── @ MultiWriteNode (location: (33,0)-(33,13))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (33,0)-(33,3))
-        │   │       ├── name: :foo
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ SplatNode (location: (33,5)-(33,6))
-        │   │   ├── operator_loc: (33,5)-(33,6) = "*"
-        │   │   └── expression: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (33,7)-(33,8) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (33,9)-(33,13))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (33,9)-(33,10))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (33,12)-(33,13))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ MultiWriteNode (location: (35,0)-(35,11))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (35,0)-(35,3))
-        │   │       ├── name: :foo
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ ImplicitRestNode (location: (35,3)-(35,4))
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (35,5)-(35,6) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (35,7)-(35,11))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (35,7)-(35,8))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (35,10)-(35,11))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ MultiWriteNode (location: (37,0)-(37,16))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (37,0)-(37,3))
-        │   │       ├── name: :foo
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ SplatNode (location: (37,5)-(37,9))
-        │   │   ├── operator_loc: (37,5)-(37,6) = "*"
-        │   │   └── expression:
-        │   │       @ LocalVariableTargetNode (location: (37,6)-(37,9))
-        │   │       ├── name: :bar
-        │   │       └── depth: 0
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (37,10)-(37,11) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (37,12)-(37,16))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (37,12)-(37,13))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (37,15)-(37,16))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ MultiWriteNode (location: (39,0)-(39,27))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (39,0)-(39,3))
-        │   │   │   ├── name: :foo
-        │   │   │   └── depth: 0
-        │   │   └── @ MultiTargetNode (location: (39,5)-(39,15))
-        │   │       ├── lefts: (length: 2)
-        │   │       │   ├── @ LocalVariableTargetNode (location: (39,6)-(39,9))
-        │   │       │   │   ├── name: :bar
-        │   │       │   │   └── depth: 0
-        │   │       │   └── @ LocalVariableTargetNode (location: (39,11)-(39,14))
-        │   │       │       ├── name: :baz
-        │   │       │       └── depth: 0
-        │   │       ├── rest: ∅
-        │   │       ├── rights: (length: 0)
-        │   │       ├── lparen_loc: (39,5)-(39,6) = "("
-        │   │       └── rparen_loc: (39,14)-(39,15) = ")"
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (39,16)-(39,17) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (39,18)-(39,27))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (39,18)-(39,19))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ ArrayNode (location: (39,21)-(39,27))
-        │       │       ├── flags: ∅
-        │       │       ├── elements: (length: 2)
-        │       │       │   ├── @ IntegerNode (location: (39,22)-(39,23))
-        │       │       │   │   ├── flags: decimal
-        │       │       │   │   └── value: 2
-        │       │       │   └── @ IntegerNode (location: (39,25)-(39,26))
-        │       │       │       ├── flags: decimal
-        │       │       │       └── value: 3
-        │       │       ├── opening_loc: (39,21)-(39,22) = "["
-        │       │       └── closing_loc: (39,26)-(39,27) = "]"
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ LocalVariableWriteNode (location: (41,0)-(41,10))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (41,0)-(41,3) = "foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (41,6)-(41,10))
-        │   │   ├── flags: contains_splat
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ SplatNode (location: (41,6)-(41,10))
-        │   │   │       ├── operator_loc: (41,6)-(41,7) = "*"
-        │   │   │       └── expression:
-        │   │   │           @ LocalVariableReadNode (location: (41,7)-(41,10))
-        │   │   │           ├── name: :bar
-        │   │   │           └── depth: 0
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (41,4)-(41,5) = "="
-        ├── @ ConstantWriteNode (location: (43,0)-(43,10))
-        │   ├── name: :Foo
-        │   ├── name_loc: (43,0)-(43,3) = "Foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (43,6)-(43,10))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ IntegerNode (location: (43,6)-(43,7))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── @ IntegerNode (location: (43,9)-(43,10))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 2
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (43,4)-(43,5) = "="
-        ├── @ ParenthesesNode (location: (45,0)-(45,9))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (45,1)-(45,8))
-        │   │   └── body: (length: 3)
-        │   │       ├── @ CallNode (location: (45,1)-(45,2))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :a
-        │   │       │   ├── message_loc: (45,1)-(45,2) = "a"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       ├── @ CallNode (location: (45,4)-(45,5))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (45,4)-(45,5) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ CallNode (location: (45,7)-(45,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :c
-        │   │           ├── message_loc: (45,7)-(45,8) = "c"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── opening_loc: (45,0)-(45,1) = "("
-        │   └── closing_loc: (45,8)-(45,9) = ")"
-        └── @ MultiWriteNode (location: (47,0)-(47,17))
-            ├── lefts: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (47,0)-(47,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   ├── @ MultiTargetNode (location: (47,3)-(47,9))
-            │   │   ├── lefts: (length: 2)
-            │   │   │   ├── @ LocalVariableTargetNode (location: (47,4)-(47,5))
-            │   │   │   │   ├── name: :b
-            │   │   │   │   └── depth: 0
-            │   │   │   └── @ LocalVariableTargetNode (location: (47,7)-(47,8))
-            │   │   │       ├── name: :c
-            │   │   │       └── depth: 0
-            │   │   ├── rest: ∅
-            │   │   ├── rights: (length: 0)
-            │   │   ├── lparen_loc: (47,3)-(47,4) = "("
-            │   │   └── rparen_loc: (47,8)-(47,9) = ")"
-            │   └── @ LocalVariableTargetNode (location: (47,11)-(47,12))
-            │       ├── name: :d
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (47,13)-(47,14) = "="
-            └── value:
-                @ ArrayNode (location: (47,15)-(47,17))
-                ├── flags: ∅
-                ├── elements: (length: 0)
-                ├── opening_loc: (47,15)-(47,16) = "["
-                └── closing_loc: (47,16)-(47,17) = "]"
diff --git a/test/mri/prism/snapshots/while.txt b/test/mri/prism/snapshots/while.txt
deleted file mode 100644
index 9f191647984..00000000000
--- a/test/mri/prism/snapshots/while.txt
+++ /dev/null
@@ -1,361 +0,0 @@
-@ ProgramNode (location: (1,0)-(23,20))
-├── locals: [:baz]
-└── statements:
-    @ StatementsNode (location: (1,0)-(23,20))
-    └── body: (length: 12)
-        ├── @ WhileNode (location: (1,0)-(1,18))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (1,0)-(1,5) = "while"
-        │   ├── closing_loc: (1,15)-(1,18) = "end"
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (1,6)-(1,10))
-        │   └── statements:
-        │       @ StatementsNode (location: (1,12)-(1,13))
-        │       └── body: (length: 1)
-        │           └── @ IntegerNode (location: (1,12)-(1,13))
-        │               ├── flags: decimal
-        │               └── value: 1
-        ├── @ WhileNode (location: (3,0)-(3,12))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (3,2)-(3,7) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (3,8)-(3,12))
-        │   └── statements:
-        │       @ StatementsNode (location: (3,0)-(3,1))
-        │       └── body: (length: 1)
-        │           └── @ IntegerNode (location: (3,0)-(3,1))
-        │               ├── flags: decimal
-        │               └── value: 1
-        ├── @ WhileNode (location: (5,0)-(5,16))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (5,6)-(5,11) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (5,12)-(5,16))
-        │   └── statements:
-        │       @ StatementsNode (location: (5,0)-(5,5))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (5,0)-(5,5))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (5,0)-(5,5) = "break"
-        ├── @ WhileNode (location: (7,0)-(7,15))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (7,5)-(7,10) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (7,11)-(7,15))
-        │   └── statements:
-        │       @ StatementsNode (location: (7,0)-(7,4))
-        │       └── body: (length: 1)
-        │           └── @ NextNode (location: (7,0)-(7,4))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (7,0)-(7,4) = "next"
-        ├── @ WhileNode (location: (9,0)-(9,17))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (9,7)-(9,12) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ TrueNode (location: (9,13)-(9,17))
-        │   └── statements:
-        │       @ StatementsNode (location: (9,0)-(9,6))
-        │       └── body: (length: 1)
-        │           └── @ ReturnNode (location: (9,0)-(9,6))
-        │               ├── keyword_loc: (9,0)-(9,6) = "return"
-        │               └── arguments: ∅
-        ├── @ WhileNode (location: (11,0)-(11,21))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (11,11)-(11,16) = "while"
-        │   ├── closing_loc: ∅
-        │   ├── predicate:
-        │   │   @ CallNode (location: (11,17)-(11,21))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar?
-        │   │   ├── message_loc: (11,17)-(11,21) = "bar?"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (11,0)-(11,10))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (11,0)-(11,10))
-        │               ├── flags: ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :foo
-        │               ├── message_loc: (11,0)-(11,3) = "foo"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (11,4)-(11,10))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 2)
-        │               │       ├── @ SymbolNode (location: (11,4)-(11,6))
-        │               │       │   ├── flags: forced_us_ascii_encoding
-        │               │       │   ├── opening_loc: (11,4)-(11,5) = ":"
-        │               │       │   ├── value_loc: (11,5)-(11,6) = "a"
-        │               │       │   ├── closing_loc: ∅
-        │               │       │   └── unescaped: "a"
-        │               │       └── @ SymbolNode (location: (11,8)-(11,10))
-        │               │           ├── flags: forced_us_ascii_encoding
-        │               │           ├── opening_loc: (11,8)-(11,9) = ":"
-        │               │           ├── value_loc: (11,9)-(11,10) = "b"
-        │               │           ├── closing_loc: ∅
-        │               │           └── unescaped: "b"
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ WhileNode (location: (13,0)-(13,50))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (13,0)-(13,5) = "while"
-        │   ├── closing_loc: (13,47)-(13,50) = "end"
-        │   ├── predicate:
-        │   │   @ DefNode (location: (13,6)-(13,38))
-        │   │   ├── name: :foo
-        │   │   ├── name_loc: (13,15)-(13,18) = "foo"
-        │   │   ├── receiver:
-        │   │   │   @ SelfNode (location: (13,10)-(13,14))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (13,19)-(13,33))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 1)
-        │   │   │   │   └── @ OptionalParameterNode (location: (13,19)-(13,33))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :a
-        │   │   │   │       ├── name_loc: (13,19)-(13,20) = "a"
-        │   │   │   │       ├── operator_loc: (13,21)-(13,22) = "="
-        │   │   │   │       └── value:
-        │   │   │   │           @ CallNode (location: (13,23)-(13,33))
-        │   │   │   │           ├── flags: ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :tap
-        │   │   │   │           ├── message_loc: (13,23)-(13,26) = "tap"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block:
-        │   │   │   │               @ BlockNode (location: (13,27)-(13,33))
-        │   │   │   │               ├── locals: []
-        │   │   │   │               ├── parameters: ∅
-        │   │   │   │               ├── body: ∅
-        │   │   │   │               ├── opening_loc: (13,27)-(13,29) = "do"
-        │   │   │   │               └── closing_loc: (13,30)-(13,33) = "end"
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── body: ∅
-        │   │   ├── locals: [:a]
-        │   │   ├── def_keyword_loc: (13,6)-(13,9) = "def"
-        │   │   ├── operator_loc: (13,14)-(13,15) = "."
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── rparen_loc: ∅
-        │   │   ├── equal_loc: ∅
-        │   │   └── end_keyword_loc: (13,35)-(13,38) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (13,40)-(13,45))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (13,40)-(13,45))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (13,40)-(13,45) = "break"
-        ├── @ WhileNode (location: (15,0)-(15,47))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (15,0)-(15,5) = "while"
-        │   ├── closing_loc: (15,44)-(15,47) = "end"
-        │   ├── predicate:
-        │   │   @ ClassNode (location: (15,6)-(15,35))
-        │   │   ├── locals: [:a]
-        │   │   ├── class_keyword_loc: (15,6)-(15,11) = "class"
-        │   │   ├── constant_path:
-        │   │   │   @ ConstantReadNode (location: (15,12)-(15,15))
-        │   │   │   └── name: :Foo
-        │   │   ├── inheritance_operator_loc: ∅
-        │   │   ├── superclass: ∅
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (15,16)-(15,30))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableWriteNode (location: (15,16)-(15,30))
-        │   │   │           ├── name: :a
-        │   │   │           ├── depth: 0
-        │   │   │           ├── name_loc: (15,16)-(15,17) = "a"
-        │   │   │           ├── value:
-        │   │   │           │   @ CallNode (location: (15,20)-(15,30))
-        │   │   │           │   ├── flags: ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :tap
-        │   │   │           │   ├── message_loc: (15,20)-(15,23) = "tap"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block:
-        │   │   │           │       @ BlockNode (location: (15,24)-(15,30))
-        │   │   │           │       ├── locals: []
-        │   │   │           │       ├── parameters: ∅
-        │   │   │           │       ├── body: ∅
-        │   │   │           │       ├── opening_loc: (15,24)-(15,26) = "do"
-        │   │   │           │       └── closing_loc: (15,27)-(15,30) = "end"
-        │   │   │           └── operator_loc: (15,18)-(15,19) = "="
-        │   │   ├── end_keyword_loc: (15,32)-(15,35) = "end"
-        │   │   └── name: :Foo
-        │   └── statements:
-        │       @ StatementsNode (location: (15,37)-(15,42))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (15,37)-(15,42))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (15,37)-(15,42) = "break"
-        ├── @ WhileNode (location: (17,0)-(17,48))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (17,0)-(17,5) = "while"
-        │   ├── closing_loc: (17,45)-(17,48) = "end"
-        │   ├── predicate:
-        │   │   @ SingletonClassNode (location: (17,6)-(17,36))
-        │   │   ├── locals: []
-        │   │   ├── class_keyword_loc: (17,6)-(17,11) = "class"
-        │   │   ├── operator_loc: (17,12)-(17,14) = "<<"
-        │   │   ├── expression:
-        │   │   │   @ SelfNode (location: (17,15)-(17,19))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (17,21)-(17,31))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (17,21)-(17,31))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :tap
-        │   │   │           ├── message_loc: (17,21)-(17,24) = "tap"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block:
-        │   │   │               @ BlockNode (location: (17,25)-(17,31))
-        │   │   │               ├── locals: []
-        │   │   │               ├── parameters: ∅
-        │   │   │               ├── body: ∅
-        │   │   │               ├── opening_loc: (17,25)-(17,27) = "do"
-        │   │   │               └── closing_loc: (17,28)-(17,31) = "end"
-        │   │   └── end_keyword_loc: (17,33)-(17,36) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (17,38)-(17,43))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (17,38)-(17,43))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (17,38)-(17,43) = "break"
-        ├── @ WhileNode (location: (19,0)-(19,52))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (19,0)-(19,5) = "while"
-        │   ├── closing_loc: (19,49)-(19,52) = "end"
-        │   ├── predicate:
-        │   │   @ SingletonClassNode (location: (19,6)-(19,40))
-        │   │   ├── locals: [:a]
-        │   │   ├── class_keyword_loc: (19,6)-(19,11) = "class"
-        │   │   ├── operator_loc: (19,12)-(19,14) = "<<"
-        │   │   ├── expression:
-        │   │   │   @ SelfNode (location: (19,15)-(19,19))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (19,21)-(19,35))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableWriteNode (location: (19,21)-(19,35))
-        │   │   │           ├── name: :a
-        │   │   │           ├── depth: 0
-        │   │   │           ├── name_loc: (19,21)-(19,22) = "a"
-        │   │   │           ├── value:
-        │   │   │           │   @ CallNode (location: (19,25)-(19,35))
-        │   │   │           │   ├── flags: ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :tap
-        │   │   │           │   ├── message_loc: (19,25)-(19,28) = "tap"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block:
-        │   │   │           │       @ BlockNode (location: (19,29)-(19,35))
-        │   │   │           │       ├── locals: []
-        │   │   │           │       ├── parameters: ∅
-        │   │   │           │       ├── body: ∅
-        │   │   │           │       ├── opening_loc: (19,29)-(19,31) = "do"
-        │   │   │           │       └── closing_loc: (19,32)-(19,35) = "end"
-        │   │   │           └── operator_loc: (19,23)-(19,24) = "="
-        │   │   └── end_keyword_loc: (19,37)-(19,40) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (19,42)-(19,47))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (19,42)-(19,47))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (19,42)-(19,47) = "break"
-        ├── @ WhileNode (location: (21,0)-(21,31))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (21,0)-(21,5) = "while"
-        │   ├── closing_loc: (21,28)-(21,31) = "end"
-        │   ├── predicate:
-        │   │   @ DefNode (location: (21,6)-(21,26))
-        │   │   ├── name: :foo
-        │   │   ├── name_loc: (21,10)-(21,13) = "foo"
-        │   │   ├── receiver: ∅
-        │   │   ├── parameters: ∅
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (21,16)-(21,26))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (21,16)-(21,26))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (21,16)-(21,19) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block:
-        │   │   │               @ BlockNode (location: (21,20)-(21,26))
-        │   │   │               ├── locals: []
-        │   │   │               ├── parameters: ∅
-        │   │   │               ├── body: ∅
-        │   │   │               ├── opening_loc: (21,20)-(21,22) = "do"
-        │   │   │               └── closing_loc: (21,23)-(21,26) = "end"
-        │   │   ├── locals: []
-        │   │   ├── def_keyword_loc: (21,6)-(21,9) = "def"
-        │   │   ├── operator_loc: ∅
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── rparen_loc: ∅
-        │   │   ├── equal_loc: (21,14)-(21,15) = "="
-        │   │   └── end_keyword_loc: ∅
-        │   └── statements: ∅
-        └── @ WhileNode (location: (23,0)-(23,20))
-            ├── flags: ∅
-            ├── keyword_loc: (23,4)-(23,9) = "while"
-            ├── closing_loc: ∅
-            ├── predicate:
-            │   @ MatchPredicateNode (location: (23,10)-(23,20))
-            │   ├── value:
-            │   │   @ CallNode (location: (23,10)-(23,13))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :bar
-            │   │   ├── message_loc: (23,10)-(23,13) = "bar"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── pattern:
-            │   │   @ LocalVariableTargetNode (location: (23,17)-(23,20))
-            │   │   ├── name: :baz
-            │   │   └── depth: 0
-            │   └── operator_loc: (23,14)-(23,16) = "in"
-            └── statements:
-                @ StatementsNode (location: (23,0)-(23,3))
-                └── body: (length: 1)
-                    └── @ CallNode (location: (23,0)-(23,3))
-                        ├── flags: variable_call, ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :foo
-                        ├── message_loc: (23,0)-(23,3) = "foo"
-                        ├── opening_loc: ∅
-                        ├── arguments: ∅
-                        ├── closing_loc: ∅
-                        └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/__ENCODING__.txt b/test/mri/prism/snapshots/whitequark/__ENCODING__.txt
deleted file mode 100644
index 1b223bd8fe7..00000000000
--- a/test/mri/prism/snapshots/whitequark/__ENCODING__.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ SourceEncodingNode (location: (1,0)-(1,12))
diff --git a/test/mri/prism/snapshots/whitequark/__ENCODING___legacy_.txt b/test/mri/prism/snapshots/whitequark/__ENCODING___legacy_.txt
deleted file mode 100644
index 1b223bd8fe7..00000000000
--- a/test/mri/prism/snapshots/whitequark/__ENCODING___legacy_.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ SourceEncodingNode (location: (1,0)-(1,12))
diff --git a/test/mri/prism/snapshots/whitequark/alias.txt b/test/mri/prism/snapshots/whitequark/alias.txt
deleted file mode 100644
index 509ea2b6334..00000000000
--- a/test/mri/prism/snapshots/whitequark/alias.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ AliasMethodNode (location: (1,0)-(1,14))
-            ├── new_name:
-            │   @ SymbolNode (location: (1,6)-(1,10))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (1,6)-(1,7) = ":"
-            │   ├── value_loc: (1,7)-(1,10) = "foo"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "foo"
-            ├── old_name:
-            │   @ SymbolNode (location: (1,11)-(1,14))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: ∅
-            │   ├── value_loc: (1,11)-(1,14) = "bar"
-            │   ├── closing_loc: ∅
-            │   └── unescaped: "bar"
-            └── keyword_loc: (1,0)-(1,5) = "alias"
diff --git a/test/mri/prism/snapshots/whitequark/alias_gvar.txt b/test/mri/prism/snapshots/whitequark/alias_gvar.txt
deleted file mode 100644
index d13f8165558..00000000000
--- a/test/mri/prism/snapshots/whitequark/alias_gvar.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,11))
-    └── body: (length: 2)
-        ├── @ AliasGlobalVariableNode (location: (1,0)-(1,11))
-        │   ├── new_name:
-        │   │   @ GlobalVariableReadNode (location: (1,6)-(1,8))
-        │   │   └── name: :$a
-        │   ├── old_name:
-        │   │   @ BackReferenceReadNode (location: (1,9)-(1,11))
-        │   │   └── name: :$+
-        │   └── keyword_loc: (1,0)-(1,5) = "alias"
-        └── @ AliasGlobalVariableNode (location: (3,0)-(3,11))
-            ├── new_name:
-            │   @ GlobalVariableReadNode (location: (3,6)-(3,8))
-            │   └── name: :$a
-            ├── old_name:
-            │   @ GlobalVariableReadNode (location: (3,9)-(3,11))
-            │   └── name: :$b
-            └── keyword_loc: (3,0)-(3,5) = "alias"
diff --git a/test/mri/prism/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt b/test/mri/prism/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
deleted file mode 100644
index c6a5c14934d..00000000000
--- a/test/mri/prism/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,15))
-            ├── if_keyword_loc: ∅
-            ├── predicate:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: (1,2)-(1,3) = "?"
-            ├── statements:
-            │   @ StatementsNode (location: (1,4)-(1,10))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,4)-(1,10))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ CallNode (location: (1,4)-(1,5))
-            │           │   ├── flags: variable_call, ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :b
-            │           │   ├── message_loc: (1,4)-(1,5) = "b"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments: ∅
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :&
-            │           ├── message_loc: (1,6)-(1,7) = "&"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,8)-(1,10))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ StringNode (location: (1,8)-(1,10))
-            │           │           ├── flags: ∅
-            │           │           ├── opening_loc: (1,8)-(1,9) = "'"
-            │           │           ├── content_loc: (1,9)-(1,9) = ""
-            │           │           ├── closing_loc: (1,9)-(1,10) = "'"
-            │           │           └── unescaped: ""
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent:
-            │   @ ElseNode (location: (1,10)-(1,15))
-            │   ├── else_keyword_loc: (1,10)-(1,11) = ":"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,12)-(1,15))
-            │   │   └── body: (length: 1)
-            │   │       └── @ NilNode (location: (1,12)-(1,15))
-            │   └── end_keyword_loc: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/and.txt b/test/mri/prism/snapshots/whitequark/and.txt
deleted file mode 100644
index d2e1b33c508..00000000000
--- a/test/mri/prism/snapshots/whitequark/and.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,11))
-    └── body: (length: 2)
-        ├── @ AndNode (location: (1,0)-(1,10))
-        │   ├── left:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (1,7)-(1,10))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (1,7)-(1,10) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (1,4)-(1,6) = "&&"
-        └── @ AndNode (location: (3,0)-(3,11))
-            ├── left:
-            │   @ CallNode (location: (3,0)-(3,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,0)-(3,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── right:
-            │   @ CallNode (location: (3,8)-(3,11))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :bar
-            │   ├── message_loc: (3,8)-(3,11) = "bar"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── operator_loc: (3,4)-(3,7) = "and"
diff --git a/test/mri/prism/snapshots/whitequark/and_asgn.txt b/test/mri/prism/snapshots/whitequark/and_asgn.txt
deleted file mode 100644
index 5c7a9a23191..00000000000
--- a/test/mri/prism/snapshots/whitequark/and_asgn.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,15))
-    └── body: (length: 2)
-        ├── @ CallAndWriteNode (location: (1,0)-(1,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── message_loc: (1,4)-(1,5) = "a"
-        │   ├── read_name: :a
-        │   ├── write_name: :a=
-        │   ├── operator_loc: (1,6)-(1,9) = "&&="
-        │   └── value:
-        │       @ IntegerNode (location: (1,10)-(1,11))
-        │       ├── flags: decimal
-        │       └── value: 1
-        └── @ IndexAndWriteNode (location: (3,0)-(3,15))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (3,0)-(3,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,0)-(3,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── opening_loc: (3,3)-(3,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,4)-(3,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (3,4)-(3,5))
-            │       │   ├── flags: decimal
-            │       │   └── value: 0
-            │       └── @ IntegerNode (location: (3,7)-(3,8))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (3,8)-(3,9) = "]"
-            ├── block: ∅
-            ├── operator_loc: (3,10)-(3,13) = "&&="
-            └── value:
-                @ IntegerNode (location: (3,14)-(3,15))
-                ├── flags: decimal
-                └── value: 2
diff --git a/test/mri/prism/snapshots/whitequark/and_or_masgn.txt b/test/mri/prism/snapshots/whitequark/and_or_masgn.txt
deleted file mode 100644
index 05aff040cd8..00000000000
--- a/test/mri/prism/snapshots/whitequark/and_or_masgn.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,19))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,19))
-    └── body: (length: 2)
-        ├── @ AndNode (location: (1,0)-(1,19))
-        │   ├── left:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ ParenthesesNode (location: (1,7)-(1,19))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (1,8)-(1,18))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ MultiWriteNode (location: (1,8)-(1,18))
-        │   │   │           ├── lefts: (length: 2)
-        │   │   │           │   ├── @ LocalVariableTargetNode (location: (1,8)-(1,9))
-        │   │   │           │   │   ├── name: :a
-        │   │   │           │   │   └── depth: 0
-        │   │   │           │   └── @ LocalVariableTargetNode (location: (1,11)-(1,12))
-        │   │   │           │       ├── name: :b
-        │   │   │           │       └── depth: 0
-        │   │   │           ├── rest: ∅
-        │   │   │           ├── rights: (length: 0)
-        │   │   │           ├── lparen_loc: ∅
-        │   │   │           ├── rparen_loc: ∅
-        │   │   │           ├── operator_loc: (1,13)-(1,14) = "="
-        │   │   │           └── value:
-        │   │   │               @ CallNode (location: (1,15)-(1,18))
-        │   │   │               ├── flags: variable_call, ignore_visibility
-        │   │   │               ├── receiver: ∅
-        │   │   │               ├── call_operator_loc: ∅
-        │   │   │               ├── name: :bar
-        │   │   │               ├── message_loc: (1,15)-(1,18) = "bar"
-        │   │   │               ├── opening_loc: ∅
-        │   │   │               ├── arguments: ∅
-        │   │   │               ├── closing_loc: ∅
-        │   │   │               └── block: ∅
-        │   │   ├── opening_loc: (1,7)-(1,8) = "("
-        │   │   └── closing_loc: (1,18)-(1,19) = ")"
-        │   └── operator_loc: (1,4)-(1,6) = "&&"
-        └── @ OrNode (location: (3,0)-(3,19))
-            ├── left:
-            │   @ CallNode (location: (3,0)-(3,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,0)-(3,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── right:
-            │   @ ParenthesesNode (location: (3,7)-(3,19))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (3,8)-(3,18))
-            │   │   └── body: (length: 1)
-            │   │       └── @ MultiWriteNode (location: (3,8)-(3,18))
-            │   │           ├── lefts: (length: 2)
-            │   │           │   ├── @ LocalVariableTargetNode (location: (3,8)-(3,9))
-            │   │           │   │   ├── name: :a
-            │   │           │   │   └── depth: 0
-            │   │           │   └── @ LocalVariableTargetNode (location: (3,11)-(3,12))
-            │   │           │       ├── name: :b
-            │   │           │       └── depth: 0
-            │   │           ├── rest: ∅
-            │   │           ├── rights: (length: 0)
-            │   │           ├── lparen_loc: ∅
-            │   │           ├── rparen_loc: ∅
-            │   │           ├── operator_loc: (3,13)-(3,14) = "="
-            │   │           └── value:
-            │   │               @ CallNode (location: (3,15)-(3,18))
-            │   │               ├── flags: variable_call, ignore_visibility
-            │   │               ├── receiver: ∅
-            │   │               ├── call_operator_loc: ∅
-            │   │               ├── name: :bar
-            │   │               ├── message_loc: (3,15)-(3,18) = "bar"
-            │   │               ├── opening_loc: ∅
-            │   │               ├── arguments: ∅
-            │   │               ├── closing_loc: ∅
-            │   │               └── block: ∅
-            │   ├── opening_loc: (3,7)-(3,8) = "("
-            │   └── closing_loc: (3,18)-(3,19) = ")"
-            └── operator_loc: (3,4)-(3,6) = "||"
diff --git a/test/mri/prism/snapshots/whitequark/anonymous_blockarg.txt b/test/mri/prism/snapshots/whitequark/anonymous_blockarg.txt
deleted file mode 100644
index 92cf1504a97..00000000000
--- a/test/mri/prism/snapshots/whitequark/anonymous_blockarg.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,23))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,9))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block:
-            │       @ BlockParameterNode (location: (1,8)-(1,9))
-            │       ├── flags: ∅
-            │       ├── name: ∅
-            │       ├── name_loc: ∅
-            │       └── operator_loc: (1,8)-(1,9) = "&"
-            ├── body:
-            │   @ StatementsNode (location: (1,12)-(1,17))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,12)-(1,17))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,12)-(1,15) = "bar"
-            │           ├── opening_loc: (1,15)-(1,16) = "("
-            │           ├── arguments: ∅
-            │           ├── closing_loc: (1,17)-(1,18) = ")"
-            │           └── block:
-            │               @ BlockArgumentNode (location: (1,16)-(1,17))
-            │               ├── expression: ∅
-            │               └── operator_loc: (1,16)-(1,17) = "&"
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,9)-(1,10) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,20)-(1,23) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/arg.txt b/test/mri/prism/snapshots/whitequark/arg.txt
deleted file mode 100644
index 38fdb190f36..00000000000
--- a/test/mri/prism/snapshots/whitequark/arg.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,20))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(1,15))
-        │   ├── name: :f
-        │   ├── name_loc: (1,4)-(1,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,6)-(1,9))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (1,6)-(1,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :foo
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:foo]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,5)-(1,6) = "("
-        │   ├── rparen_loc: (1,9)-(1,10) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,12)-(1,15) = "end"
-        └── @ DefNode (location: (3,0)-(3,20))
-            ├── name: :f
-            ├── name_loc: (3,4)-(3,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (3,6)-(3,14))
-            │   ├── requireds: (length: 2)
-            │   │   ├── @ RequiredParameterNode (location: (3,6)-(3,9))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── name: :foo
-            │   │   └── @ RequiredParameterNode (location: (3,11)-(3,14))
-            │   │       ├── flags: ∅
-            │   │       └── name: :bar
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:foo, :bar]
-            ├── def_keyword_loc: (3,0)-(3,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (3,5)-(3,6) = "("
-            ├── rparen_loc: (3,14)-(3,15) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (3,17)-(3,20) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/arg_duplicate_ignored.txt b/test/mri/prism/snapshots/whitequark/arg_duplicate_ignored.txt
deleted file mode 100644
index 21dc1b74178..00000000000
--- a/test/mri/prism/snapshots/whitequark/arg_duplicate_ignored.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,20))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(1,18))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,8)-(1,12))
-        │   │   ├── requireds: (length: 2)
-        │   │   │   ├── @ RequiredParameterNode (location: (1,8)-(1,9))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── name: :_
-        │   │   │   └── @ RequiredParameterNode (location: (1,11)-(1,12))
-        │   │   │       ├── flags: repeated_parameter
-        │   │   │       └── name: :_
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:_]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,7)-(1,8) = "("
-        │   ├── rparen_loc: (1,12)-(1,13) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,15)-(1,18) = "end"
-        └── @ DefNode (location: (3,0)-(3,20))
-            ├── name: :foo
-            ├── name_loc: (3,4)-(3,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (3,8)-(3,14))
-            │   ├── requireds: (length: 2)
-            │   │   ├── @ RequiredParameterNode (location: (3,8)-(3,10))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── name: :_a
-            │   │   └── @ RequiredParameterNode (location: (3,12)-(3,14))
-            │   │       ├── flags: repeated_parameter
-            │   │       └── name: :_a
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:_a]
-            ├── def_keyword_loc: (3,0)-(3,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (3,7)-(3,8) = "("
-            ├── rparen_loc: (3,14)-(3,15) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (3,17)-(3,20) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/arg_label.txt b/test/mri/prism/snapshots/whitequark/arg_label.txt
deleted file mode 100644
index b72ea59a5d0..00000000000
--- a/test/mri/prism/snapshots/whitequark/arg_label.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-@ ProgramNode (location: (1,0)-(6,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(6,12))
-    └── body: (length: 3)
-        ├── @ DefNode (location: (1,0)-(2,8))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,1)-(2,4))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,1)-(2,4))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (2,1)-(2,2) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (2,2)-(2,4))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ SymbolNode (location: (2,2)-(2,4))
-        │   │           │           ├── flags: forced_us_ascii_encoding
-        │   │           │           ├── opening_loc: (2,2)-(2,3) = ":"
-        │   │           │           ├── value_loc: (2,3)-(2,4) = "b"
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── unescaped: "b"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (2,5)-(2,8) = "end"
-        ├── @ DefNode (location: (4,0)-(4,17))
-        │   ├── name: :foo
-        │   ├── name_loc: (4,4)-(4,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (4,10)-(4,13))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (4,10)-(4,13))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :a
-        │   │           ├── message_loc: (4,10)-(4,11) = "a"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (4,11)-(4,13))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ SymbolNode (location: (4,11)-(4,13))
-        │   │           │           ├── flags: forced_us_ascii_encoding
-        │   │           │           ├── opening_loc: (4,11)-(4,12) = ":"
-        │   │           │           ├── value_loc: (4,12)-(4,13) = "b"
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           └── unescaped: "b"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (4,0)-(4,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (4,7)-(4,8) = "("
-        │   ├── rparen_loc: (4,8)-(4,9) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (4,14)-(4,17) = "end"
-        └── @ CallNode (location: (6,0)-(6,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (6,0)-(6,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (6,2)-(6,12))
-                ├── locals: []
-                ├── parameters:
-                │   @ BlockParametersNode (location: (6,4)-(6,6))
-                │   ├── parameters: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (6,4)-(6,5) = "|"
-                │   └── closing_loc: (6,5)-(6,6) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (6,7)-(6,10))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (6,7)-(6,10))
-                │           ├── flags: ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :a
-                │           ├── message_loc: (6,7)-(6,8) = "a"
-                │           ├── opening_loc: ∅
-                │           ├── arguments:
-                │           │   @ ArgumentsNode (location: (6,8)-(6,10))
-                │           │   ├── flags: ∅
-                │           │   └── arguments: (length: 1)
-                │           │       └── @ SymbolNode (location: (6,8)-(6,10))
-                │           │           ├── flags: forced_us_ascii_encoding
-                │           │           ├── opening_loc: (6,8)-(6,9) = ":"
-                │           │           ├── value_loc: (6,9)-(6,10) = "b"
-                │           │           ├── closing_loc: ∅
-                │           │           └── unescaped: "b"
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (6,2)-(6,3) = "{"
-                └── closing_loc: (6,11)-(6,12) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/arg_scope.txt b/test/mri/prism/snapshots/whitequark/arg_scope.txt
deleted file mode 100644
index c04356b8eea..00000000000
--- a/test/mri/prism/snapshots/whitequark/arg_scope.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :lambda
-            ├── message_loc: (1,0)-(1,6) = "lambda"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,6)-(1,13))
-                ├── locals: [:a]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,7)-(1,11))
-                │   ├── parameters: ∅
-                │   ├── locals: (length: 1)
-                │   │   └── @ BlockLocalVariableNode (location: (1,9)-(1,10))
-                │   │       ├── flags: ∅
-                │   │       └── name: :a
-                │   ├── opening_loc: (1,7)-(1,8) = "|"
-                │   └── closing_loc: (1,10)-(1,11) = "|"
-                ├── body:
-                │   @ StatementsNode (location: (1,11)-(1,12))
-                │   └── body: (length: 1)
-                │       └── @ LocalVariableReadNode (location: (1,11)-(1,12))
-                │           ├── name: :a
-                │           └── depth: 0
-                ├── opening_loc: (1,6)-(1,7) = "{"
-                └── closing_loc: (1,12)-(1,13) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/args.txt b/test/mri/prism/snapshots/whitequark/args.txt
deleted file mode 100644
index bc7ea8ad7db..00000000000
--- a/test/mri/prism/snapshots/whitequark/args.txt
+++ /dev/null
@@ -1,1075 +0,0 @@
-@ ProgramNode (location: (1,0)-(63,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(63,21))
-    └── body: (length: 31)
-        ├── @ DefNode (location: (1,0)-(1,13))
-        │   ├── name: :f
-        │   ├── name_loc: (1,4)-(1,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,6)-(1,8))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (1,6)-(1,8))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (1,7)-(1,8) = "b"
-        │   │       └── operator_loc: (1,6)-(1,7) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,10)-(1,13) = "end"
-        ├── @ DefNode (location: (3,0)-(3,18))
-        │   ├── name: :f
-        │   ├── name_loc: (3,4)-(3,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (3,7)-(3,12))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (3,7)-(3,12))
-        │   │   │       ├── lefts: (length: 1)
-        │   │   │       │   └── @ MultiTargetNode (location: (3,8)-(3,11))
-        │   │   │       │       ├── lefts: (length: 1)
-        │   │   │       │       │   └── @ RequiredParameterNode (location: (3,9)-(3,10))
-        │   │   │       │       │       ├── flags: ∅
-        │   │   │       │       │       └── name: :a
-        │   │   │       │       ├── rest: ∅
-        │   │   │       │       ├── rights: (length: 0)
-        │   │   │       │       ├── lparen_loc: (3,8)-(3,9) = "("
-        │   │   │       │       └── rparen_loc: (3,10)-(3,11) = ")"
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (3,7)-(3,8) = "("
-        │   │   │       └── rparen_loc: (3,11)-(3,12) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (3,6)-(3,7) = "("
-        │   ├── rparen_loc: (3,12)-(3,13) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,15)-(3,18) = "end"
-        ├── @ DefNode (location: (5,0)-(5,16))
-        │   ├── name: :f
-        │   ├── name_loc: (5,4)-(5,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (5,7)-(5,10))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (5,7)-(5,10))
-        │   │   │       ├── lefts: (length: 0)
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (5,8)-(5,9))
-        │   │   │       │   ├── operator_loc: (5,8)-(5,9) = "*"
-        │   │   │       │   └── expression: ∅
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (5,7)-(5,8) = "("
-        │   │   │       └── rparen_loc: (5,9)-(5,10) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (5,0)-(5,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (5,6)-(5,7) = "("
-        │   ├── rparen_loc: (5,10)-(5,11) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,13)-(5,16) = "end"
-        ├── @ DefNode (location: (7,0)-(7,19))
-        │   ├── name: :f
-        │   ├── name_loc: (7,4)-(7,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (7,7)-(7,13))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (7,7)-(7,13))
-        │   │   │       ├── lefts: (length: 0)
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (7,8)-(7,9))
-        │   │   │       │   ├── operator_loc: (7,8)-(7,9) = "*"
-        │   │   │       │   └── expression: ∅
-        │   │   │       ├── rights: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (7,11)-(7,12))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :p
-        │   │   │       ├── lparen_loc: (7,7)-(7,8) = "("
-        │   │   │       └── rparen_loc: (7,12)-(7,13) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:p]
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (7,6)-(7,7) = "("
-        │   ├── rparen_loc: (7,13)-(7,14) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (7,16)-(7,19) = "end"
-        ├── @ DefNode (location: (9,0)-(9,17))
-        │   ├── name: :f
-        │   ├── name_loc: (9,4)-(9,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (9,7)-(9,11))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (9,7)-(9,11))
-        │   │   │       ├── lefts: (length: 0)
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (9,8)-(9,10))
-        │   │   │       │   ├── operator_loc: (9,8)-(9,9) = "*"
-        │   │   │       │   └── expression:
-        │   │   │       │       @ RequiredParameterNode (location: (9,9)-(9,10))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :r
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (9,7)-(9,8) = "("
-        │   │   │       └── rparen_loc: (9,10)-(9,11) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:r]
-        │   ├── def_keyword_loc: (9,0)-(9,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (9,6)-(9,7) = "("
-        │   ├── rparen_loc: (9,11)-(9,12) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (9,14)-(9,17) = "end"
-        ├── @ DefNode (location: (11,0)-(11,20))
-        │   ├── name: :f
-        │   ├── name_loc: (11,4)-(11,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (11,7)-(11,14))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (11,7)-(11,14))
-        │   │   │       ├── lefts: (length: 0)
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (11,8)-(11,10))
-        │   │   │       │   ├── operator_loc: (11,8)-(11,9) = "*"
-        │   │   │       │   └── expression:
-        │   │   │       │       @ RequiredParameterNode (location: (11,9)-(11,10))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :r
-        │   │   │       ├── rights: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (11,12)-(11,13))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :p
-        │   │   │       ├── lparen_loc: (11,7)-(11,8) = "("
-        │   │   │       └── rparen_loc: (11,13)-(11,14) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:r, :p]
-        │   ├── def_keyword_loc: (11,0)-(11,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (11,6)-(11,7) = "("
-        │   ├── rparen_loc: (11,14)-(11,15) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (11,17)-(11,20) = "end"
-        ├── @ DefNode (location: (13,0)-(13,19))
-        │   ├── name: :f
-        │   ├── name_loc: (13,4)-(13,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (13,7)-(13,13))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (13,7)-(13,13))
-        │   │   │       ├── lefts: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (13,8)-(13,9))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :a
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (13,11)-(13,12))
-        │   │   │       │   ├── operator_loc: (13,11)-(13,12) = "*"
-        │   │   │       │   └── expression: ∅
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (13,7)-(13,8) = "("
-        │   │   │       └── rparen_loc: (13,12)-(13,13) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (13,0)-(13,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (13,6)-(13,7) = "("
-        │   ├── rparen_loc: (13,13)-(13,14) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (13,16)-(13,19) = "end"
-        ├── @ DefNode (location: (15,0)-(15,22))
-        │   ├── name: :f
-        │   ├── name_loc: (15,4)-(15,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (15,7)-(15,16))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (15,7)-(15,16))
-        │   │   │       ├── lefts: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (15,8)-(15,9))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :a
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (15,11)-(15,12))
-        │   │   │       │   ├── operator_loc: (15,11)-(15,12) = "*"
-        │   │   │       │   └── expression: ∅
-        │   │   │       ├── rights: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (15,14)-(15,15))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :p
-        │   │   │       ├── lparen_loc: (15,7)-(15,8) = "("
-        │   │   │       └── rparen_loc: (15,15)-(15,16) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :p]
-        │   ├── def_keyword_loc: (15,0)-(15,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (15,6)-(15,7) = "("
-        │   ├── rparen_loc: (15,16)-(15,17) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (15,19)-(15,22) = "end"
-        ├── @ DefNode (location: (17,0)-(17,20))
-        │   ├── name: :f
-        │   ├── name_loc: (17,4)-(17,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (17,7)-(17,14))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (17,7)-(17,14))
-        │   │   │       ├── lefts: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (17,8)-(17,9))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :a
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (17,11)-(17,13))
-        │   │   │       │   ├── operator_loc: (17,11)-(17,12) = "*"
-        │   │   │       │   └── expression:
-        │   │   │       │       @ RequiredParameterNode (location: (17,12)-(17,13))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :r
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (17,7)-(17,8) = "("
-        │   │   │       └── rparen_loc: (17,13)-(17,14) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :r]
-        │   ├── def_keyword_loc: (17,0)-(17,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (17,6)-(17,7) = "("
-        │   ├── rparen_loc: (17,14)-(17,15) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (17,17)-(17,20) = "end"
-        ├── @ DefNode (location: (19,0)-(19,23))
-        │   ├── name: :f
-        │   ├── name_loc: (19,4)-(19,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (19,7)-(19,17))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (19,7)-(19,17))
-        │   │   │       ├── lefts: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (19,8)-(19,9))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :a
-        │   │   │       ├── rest:
-        │   │   │       │   @ SplatNode (location: (19,11)-(19,13))
-        │   │   │       │   ├── operator_loc: (19,11)-(19,12) = "*"
-        │   │   │       │   └── expression:
-        │   │   │       │       @ RequiredParameterNode (location: (19,12)-(19,13))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :r
-        │   │   │       ├── rights: (length: 1)
-        │   │   │       │   └── @ RequiredParameterNode (location: (19,15)-(19,16))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :p
-        │   │   │       ├── lparen_loc: (19,7)-(19,8) = "("
-        │   │   │       └── rparen_loc: (19,16)-(19,17) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :r, :p]
-        │   ├── def_keyword_loc: (19,0)-(19,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (19,6)-(19,7) = "("
-        │   ├── rparen_loc: (19,17)-(19,18) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (19,20)-(19,23) = "end"
-        ├── @ DefNode (location: (21,0)-(21,20))
-        │   ├── name: :f
-        │   ├── name_loc: (21,4)-(21,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (21,7)-(21,14))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ MultiTargetNode (location: (21,7)-(21,14))
-        │   │   │       ├── lefts: (length: 2)
-        │   │   │       │   ├── @ RequiredParameterNode (location: (21,8)-(21,9))
-        │   │   │       │   │   ├── flags: ∅
-        │   │   │       │   │   └── name: :a
-        │   │   │       │   └── @ RequiredParameterNode (location: (21,11)-(21,13))
-        │   │   │       │       ├── flags: ∅
-        │   │   │       │       └── name: :a1
-        │   │   │       ├── rest: ∅
-        │   │   │       ├── rights: (length: 0)
-        │   │   │       ├── lparen_loc: (21,7)-(21,8) = "("
-        │   │   │       └── rparen_loc: (21,13)-(21,14) = ")"
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :a1]
-        │   ├── def_keyword_loc: (21,0)-(21,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (21,6)-(21,7) = "("
-        │   ├── rparen_loc: (21,14)-(21,15) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (21,17)-(21,20) = "end"
-        ├── @ DefNode (location: (23,0)-(23,23))
-        │   ├── name: :f
-        │   ├── name_loc: (23,4)-(23,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (23,7)-(23,17))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (23,7)-(23,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :foo
-        │   │   │       ├── name_loc: (23,7)-(23,11) = "foo:"
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (23,12)-(23,13))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (23,15)-(23,17))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (23,16)-(23,17) = "b"
-        │   │       └── operator_loc: (23,15)-(23,16) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:foo, :b]
-        │   ├── def_keyword_loc: (23,0)-(23,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (23,6)-(23,7) = "("
-        │   ├── rparen_loc: (23,17)-(23,18) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (23,20)-(23,23) = "end"
-        ├── @ DefNode (location: (25,0)-(25,38))
-        │   ├── name: :f
-        │   ├── name_loc: (25,4)-(25,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (25,7)-(25,32))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 2)
-        │   │   │   ├── @ OptionalKeywordParameterNode (location: (25,7)-(25,13))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: :foo
-        │   │   │   │   ├── name_loc: (25,7)-(25,11) = "foo:"
-        │   │   │   │   └── value:
-        │   │   │   │       @ IntegerNode (location: (25,12)-(25,13))
-        │   │   │   │       ├── flags: decimal
-        │   │   │   │       └── value: 1
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (25,15)-(25,21))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :bar
-        │   │   │       ├── name_loc: (25,15)-(25,19) = "bar:"
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (25,20)-(25,21))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 2
-        │   │   ├── keyword_rest:
-        │   │   │   @ KeywordRestParameterNode (location: (25,23)-(25,28))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── name_loc: (25,25)-(25,28) = "baz"
-        │   │   │   └── operator_loc: (25,23)-(25,25) = "**"
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (25,30)-(25,32))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (25,31)-(25,32) = "b"
-        │   │       └── operator_loc: (25,30)-(25,31) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:foo, :bar, :baz, :b]
-        │   ├── def_keyword_loc: (25,0)-(25,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (25,6)-(25,7) = "("
-        │   ├── rparen_loc: (25,32)-(25,33) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (25,35)-(25,38) = "end"
-        ├── @ DefNode (location: (27,0)-(27,20))
-        │   ├── name: :f
-        │   ├── name_loc: (27,4)-(27,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (27,6)-(27,15))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ KeywordRestParameterNode (location: (27,6)-(27,11))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :baz
-        │   │   │   ├── name_loc: (27,8)-(27,11) = "baz"
-        │   │   │   └── operator_loc: (27,6)-(27,8) = "**"
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (27,13)-(27,15))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (27,14)-(27,15) = "b"
-        │   │       └── operator_loc: (27,13)-(27,14) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:baz, :b]
-        │   ├── def_keyword_loc: (27,0)-(27,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (27,17)-(27,20) = "end"
-        ├── @ DefNode (location: (29,0)-(29,16))
-        │   ├── name: :f
-        │   ├── name_loc: (29,4)-(29,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (29,6)-(29,11))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (29,6)-(29,7))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (29,6)-(29,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ KeywordRestParameterNode (location: (29,9)-(29,11))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: ∅
-        │   │   │   ├── name_loc: ∅
-        │   │   │   └── operator_loc: (29,9)-(29,11) = "**"
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (29,0)-(29,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (29,13)-(29,16) = "end"
-        ├── @ DefNode (location: (31,0)-(31,17))
-        │   ├── name: :f
-        │   ├── name_loc: (31,4)-(31,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (31,6)-(31,12))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (31,6)-(31,8))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :r
-        │   │   │   ├── name_loc: (31,7)-(31,8) = "r"
-        │   │   │   └── operator_loc: (31,6)-(31,7) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (31,10)-(31,12))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (31,11)-(31,12) = "b"
-        │   │       └── operator_loc: (31,10)-(31,11) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:r, :b]
-        │   ├── def_keyword_loc: (31,0)-(31,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (31,14)-(31,17) = "end"
-        ├── @ DefNode (location: (33,0)-(33,20))
-        │   ├── name: :f
-        │   ├── name_loc: (33,4)-(33,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (33,6)-(33,15))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (33,6)-(33,8))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :r
-        │   │   │   ├── name_loc: (33,7)-(33,8) = "r"
-        │   │   │   └── operator_loc: (33,6)-(33,7) = "*"
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (33,10)-(33,11))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :p
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (33,13)-(33,15))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (33,14)-(33,15) = "b"
-        │   │       └── operator_loc: (33,13)-(33,14) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:r, :p, :b]
-        │   ├── def_keyword_loc: (33,0)-(33,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (33,17)-(33,20) = "end"
-        ├── @ DefNode (location: (35,0)-(35,11))
-        │   ├── name: :f
-        │   ├── name_loc: (35,4)-(35,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (35,0)-(35,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (35,8)-(35,11) = "end"
-        ├── @ DefNode (location: (37,0)-(37,16))
-        │   ├── name: :f
-        │   ├── name_loc: (37,4)-(37,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (37,6)-(37,11))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (37,6)-(37,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (37,9)-(37,11))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (37,10)-(37,11) = "b"
-        │   │       └── operator_loc: (37,9)-(37,10) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:a, :b]
-        │   ├── def_keyword_loc: (37,0)-(37,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (37,13)-(37,16) = "end"
-        ├── @ DefNode (location: (39,0)-(39,20))
-        │   ├── name: :f
-        │   ├── name_loc: (39,4)-(39,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (39,6)-(39,15))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (39,6)-(39,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (39,9)-(39,11))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :r
-        │   │   │   ├── name_loc: (39,10)-(39,11) = "r"
-        │   │   │   └── operator_loc: (39,9)-(39,10) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (39,13)-(39,15))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (39,14)-(39,15) = "b"
-        │   │       └── operator_loc: (39,13)-(39,14) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:a, :r, :b]
-        │   ├── def_keyword_loc: (39,0)-(39,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (39,17)-(39,20) = "end"
-        ├── @ DefNode (location: (41,0)-(41,23))
-        │   ├── name: :f
-        │   ├── name_loc: (41,4)-(41,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (41,6)-(41,18))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (41,6)-(41,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (41,9)-(41,11))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :r
-        │   │   │   ├── name_loc: (41,10)-(41,11) = "r"
-        │   │   │   └── operator_loc: (41,9)-(41,10) = "*"
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (41,13)-(41,14))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :p
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (41,16)-(41,18))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (41,17)-(41,18) = "b"
-        │   │       └── operator_loc: (41,16)-(41,17) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:a, :r, :p, :b]
-        │   ├── def_keyword_loc: (41,0)-(41,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (41,20)-(41,23) = "end"
-        ├── @ DefNode (location: (43,0)-(43,21))
-        │   ├── name: :f
-        │   ├── name_loc: (43,4)-(43,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (43,6)-(43,16))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (43,6)-(43,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (43,9)-(43,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :o
-        │   │   │       ├── name_loc: (43,9)-(43,10) = "o"
-        │   │   │       ├── operator_loc: (43,10)-(43,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (43,11)-(43,12))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (43,14)-(43,16))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (43,15)-(43,16) = "b"
-        │   │       └── operator_loc: (43,14)-(43,15) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:a, :o, :b]
-        │   ├── def_keyword_loc: (43,0)-(43,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (43,18)-(43,21) = "end"
-        ├── @ DefNode (location: (45,0)-(45,25))
-        │   ├── name: :f
-        │   ├── name_loc: (45,4)-(45,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (45,6)-(45,20))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (45,6)-(45,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (45,9)-(45,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :o
-        │   │   │       ├── name_loc: (45,9)-(45,10) = "o"
-        │   │   │       ├── operator_loc: (45,10)-(45,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (45,11)-(45,12))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (45,14)-(45,16))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :r
-        │   │   │   ├── name_loc: (45,15)-(45,16) = "r"
-        │   │   │   └── operator_loc: (45,14)-(45,15) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (45,18)-(45,20))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (45,19)-(45,20) = "b"
-        │   │       └── operator_loc: (45,18)-(45,19) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:a, :o, :r, :b]
-        │   ├── def_keyword_loc: (45,0)-(45,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (45,22)-(45,25) = "end"
-        ├── @ DefNode (location: (47,0)-(47,28))
-        │   ├── name: :f
-        │   ├── name_loc: (47,4)-(47,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (47,6)-(47,23))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (47,6)-(47,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (47,9)-(47,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :o
-        │   │   │       ├── name_loc: (47,9)-(47,10) = "o"
-        │   │   │       ├── operator_loc: (47,10)-(47,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (47,11)-(47,12))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (47,14)-(47,16))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :r
-        │   │   │   ├── name_loc: (47,15)-(47,16) = "r"
-        │   │   │   └── operator_loc: (47,14)-(47,15) = "*"
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (47,18)-(47,19))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :p
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (47,21)-(47,23))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (47,22)-(47,23) = "b"
-        │   │       └── operator_loc: (47,21)-(47,22) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:a, :o, :r, :p, :b]
-        │   ├── def_keyword_loc: (47,0)-(47,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (47,25)-(47,28) = "end"
-        ├── @ DefNode (location: (49,0)-(49,24))
-        │   ├── name: :f
-        │   ├── name_loc: (49,4)-(49,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (49,6)-(49,19))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (49,6)-(49,7))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (49,9)-(49,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :o
-        │   │   │       ├── name_loc: (49,9)-(49,10) = "o"
-        │   │   │       ├── operator_loc: (49,10)-(49,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (49,11)-(49,12))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (49,14)-(49,15))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :p
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (49,17)-(49,19))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (49,18)-(49,19) = "b"
-        │   │       └── operator_loc: (49,17)-(49,18) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:a, :o, :p, :b]
-        │   ├── def_keyword_loc: (49,0)-(49,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (49,21)-(49,24) = "end"
-        ├── @ DefNode (location: (51,0)-(52,5))
-        │   ├── name: :f
-        │   ├── name_loc: (51,4)-(51,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (51,6)-(51,10))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ RequiredKeywordParameterNode (location: (51,6)-(51,10))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :foo
-        │   │   │       └── name_loc: (51,6)-(51,10) = "foo:"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:foo]
-        │   ├── def_keyword_loc: (51,0)-(51,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (52,2)-(52,5) = "end"
-        ├── @ DefNode (location: (54,0)-(55,5))
-        │   ├── name: :f
-        │   ├── name_loc: (54,4)-(54,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (54,6)-(54,13))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ OptionalKeywordParameterNode (location: (54,6)-(54,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :foo
-        │   │   │       ├── name_loc: (54,6)-(54,10) = "foo:"
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (54,11)-(54,13))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: -1
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:foo]
-        │   ├── def_keyword_loc: (54,0)-(54,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (55,2)-(55,5) = "end"
-        ├── @ DefNode (location: (57,0)-(57,18))
-        │   ├── name: :f
-        │   ├── name_loc: (57,4)-(57,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (57,6)-(57,13))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (57,6)-(57,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :o
-        │   │   │       ├── name_loc: (57,6)-(57,7) = "o"
-        │   │   │       ├── operator_loc: (57,7)-(57,8) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (57,8)-(57,9))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (57,11)-(57,13))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (57,12)-(57,13) = "b"
-        │   │       └── operator_loc: (57,11)-(57,12) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:o, :b]
-        │   ├── def_keyword_loc: (57,0)-(57,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (57,15)-(57,18) = "end"
-        ├── @ DefNode (location: (59,0)-(59,22))
-        │   ├── name: :f
-        │   ├── name_loc: (59,4)-(59,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (59,6)-(59,17))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (59,6)-(59,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :o
-        │   │   │       ├── name_loc: (59,6)-(59,7) = "o"
-        │   │   │       ├── operator_loc: (59,7)-(59,8) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (59,8)-(59,9))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (59,11)-(59,13))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :r
-        │   │   │   ├── name_loc: (59,12)-(59,13) = "r"
-        │   │   │   └── operator_loc: (59,11)-(59,12) = "*"
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (59,15)-(59,17))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (59,16)-(59,17) = "b"
-        │   │       └── operator_loc: (59,15)-(59,16) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:o, :r, :b]
-        │   ├── def_keyword_loc: (59,0)-(59,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (59,19)-(59,22) = "end"
-        ├── @ DefNode (location: (61,0)-(61,25))
-        │   ├── name: :f
-        │   ├── name_loc: (61,4)-(61,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (61,6)-(61,20))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (61,6)-(61,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :o
-        │   │   │       ├── name_loc: (61,6)-(61,7) = "o"
-        │   │   │       ├── operator_loc: (61,7)-(61,8) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (61,8)-(61,9))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest:
-        │   │   │   @ RestParameterNode (location: (61,11)-(61,13))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── name: :r
-        │   │   │   ├── name_loc: (61,12)-(61,13) = "r"
-        │   │   │   └── operator_loc: (61,11)-(61,12) = "*"
-        │   │   ├── posts: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (61,15)-(61,16))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :p
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block:
-        │   │       @ BlockParameterNode (location: (61,18)-(61,20))
-        │   │       ├── flags: ∅
-        │   │       ├── name: :b
-        │   │       ├── name_loc: (61,19)-(61,20) = "b"
-        │   │       └── operator_loc: (61,18)-(61,19) = "&"
-        │   ├── body: ∅
-        │   ├── locals: [:o, :r, :p, :b]
-        │   ├── def_keyword_loc: (61,0)-(61,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (61,22)-(61,25) = "end"
-        └── @ DefNode (location: (63,0)-(63,21))
-            ├── name: :f
-            ├── name_loc: (63,4)-(63,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (63,6)-(63,16))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 1)
-            │   │   └── @ OptionalParameterNode (location: (63,6)-(63,9))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :o
-            │   │       ├── name_loc: (63,6)-(63,7) = "o"
-            │   │       ├── operator_loc: (63,7)-(63,8) = "="
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (63,8)-(63,9))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── rest: ∅
-            │   ├── posts: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (63,11)-(63,12))
-            │   │       ├── flags: ∅
-            │   │       └── name: :p
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block:
-            │       @ BlockParameterNode (location: (63,14)-(63,16))
-            │       ├── flags: ∅
-            │       ├── name: :b
-            │       ├── name_loc: (63,15)-(63,16) = "b"
-            │       └── operator_loc: (63,14)-(63,15) = "&"
-            ├── body: ∅
-            ├── locals: [:o, :p, :b]
-            ├── def_keyword_loc: (63,0)-(63,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (63,18)-(63,21) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/args_args_assocs.txt b/test/mri/prism/snapshots/whitequark/args_args_assocs.txt
deleted file mode 100644
index 6297f212d8e..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_args_assocs.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,24))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,19))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (1,0)-(1,3) = "fun"
-        │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,18))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (1,4)-(1,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (1,4)-(1,7) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ KeywordHashNode (location: (1,9)-(1,18))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (1,9)-(1,18))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (1,9)-(1,13))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (1,9)-(1,10) = ":"
-        │   │                   │   ├── value_loc: (1,10)-(1,13) = "foo"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "foo"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (1,17)-(1,18))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (1,14)-(1,16) = "=>"
-        │   ├── closing_loc: (1,18)-(1,19) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,24))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (3,0)-(3,3) = "fun"
-            ├── opening_loc: (3,3)-(3,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,4)-(3,18))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (3,4)-(3,7))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :foo
-            │       │   ├── message_loc: (3,4)-(3,7) = "foo"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ KeywordHashNode (location: (3,9)-(3,18))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (3,9)-(3,18))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (3,9)-(3,13))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (3,9)-(3,10) = ":"
-            │                   │   ├── value_loc: (3,10)-(3,13) = "foo"
-            │                   │   ├── closing_loc: ∅
-            │                   │   └── unescaped: "foo"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (3,17)-(3,18))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   └── operator_loc: (3,14)-(3,16) = "=>"
-            ├── closing_loc: (3,24)-(3,25) = ")"
-            └── block:
-                @ BlockArgumentNode (location: (3,20)-(3,24))
-                ├── expression:
-                │   @ CallNode (location: (3,21)-(3,24))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :baz
-                │   ├── message_loc: (3,21)-(3,24) = "baz"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                └── operator_loc: (3,20)-(3,21) = "&"
diff --git a/test/mri/prism/snapshots/whitequark/args_args_assocs_comma.txt b/test/mri/prism/snapshots/whitequark/args_args_assocs_comma.txt
deleted file mode 100644
index 969514a5112..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_args_assocs_comma.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,20))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,3)-(1,20) = "[bar, :baz => 1,]"
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,18))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (1,4)-(1,7))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :bar
-            │       │   ├── message_loc: (1,4)-(1,7) = "bar"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ KeywordHashNode (location: (1,9)-(1,18))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,9)-(1,18))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,9)-(1,13))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (1,9)-(1,10) = ":"
-            │                   │   ├── value_loc: (1,10)-(1,13) = "baz"
-            │                   │   ├── closing_loc: ∅
-            │                   │   └── unescaped: "baz"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,17)-(1,18))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   └── operator_loc: (1,14)-(1,16) = "=>"
-            ├── closing_loc: (1,19)-(1,20) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/args_args_comma.txt b/test/mri/prism/snapshots/whitequark/args_args_comma.txt
deleted file mode 100644
index 09113a72b61..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_args_comma.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,3)-(1,9) = "[bar,]"
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,4)-(1,7))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,4)-(1,7) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: (1,8)-(1,9) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/args_args_star.txt b/test/mri/prism/snapshots/whitequark/args_args_star.txt
deleted file mode 100644
index 26c9e72da34..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_args_star.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,19))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,14))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (1,0)-(1,3) = "fun"
-        │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (1,4)-(1,7))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (1,4)-(1,7) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ SplatNode (location: (1,9)-(1,13))
-        │   │           ├── operator_loc: (1,9)-(1,10) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (1,10)-(1,13))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :bar
-        │   │               ├── message_loc: (1,10)-(1,13) = "bar"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (1,13)-(1,14) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,19))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (3,0)-(3,3) = "fun"
-            ├── opening_loc: (3,3)-(3,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,4)-(3,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (3,4)-(3,7))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :foo
-            │       │   ├── message_loc: (3,4)-(3,7) = "foo"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ SplatNode (location: (3,9)-(3,13))
-            │           ├── operator_loc: (3,9)-(3,10) = "*"
-            │           └── expression:
-            │               @ CallNode (location: (3,10)-(3,13))
-            │               ├── flags: variable_call, ignore_visibility
-            │               ├── receiver: ∅
-            │               ├── call_operator_loc: ∅
-            │               ├── name: :bar
-            │               ├── message_loc: (3,10)-(3,13) = "bar"
-            │               ├── opening_loc: ∅
-            │               ├── arguments: ∅
-            │               ├── closing_loc: ∅
-            │               └── block: ∅
-            ├── closing_loc: (3,19)-(3,20) = ")"
-            └── block:
-                @ BlockArgumentNode (location: (3,15)-(3,19))
-                ├── expression:
-                │   @ CallNode (location: (3,16)-(3,19))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :baz
-                │   ├── message_loc: (3,16)-(3,19) = "baz"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                └── operator_loc: (3,15)-(3,16) = "&"
diff --git a/test/mri/prism/snapshots/whitequark/args_assocs.txt b/test/mri/prism/snapshots/whitequark/args_assocs.txt
deleted file mode 100644
index 47cb68d899b..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_assocs.txt
+++ /dev/null
@@ -1,195 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,17))
-    └── body: (length: 6)
-        ├── @ CallNode (location: (1,0)-(1,14))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (1,0)-(1,3) = "fun"
-        │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (1,4)-(1,13))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (1,4)-(1,13))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (1,4)-(1,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (1,4)-(1,5) = ":"
-        │   │                   │   ├── value_loc: (1,5)-(1,8) = "foo"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "foo"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (1,12)-(1,13))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (1,9)-(1,11) = "=>"
-        │   ├── closing_loc: (1,13)-(1,14) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,19))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (3,0)-(3,3) = "fun"
-        │   ├── opening_loc: (3,3)-(3,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,4)-(3,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (3,4)-(3,13))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (3,4)-(3,13))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (3,4)-(3,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (3,4)-(3,5) = ":"
-        │   │                   │   ├── value_loc: (3,5)-(3,8) = "foo"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "foo"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (3,12)-(3,13))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (3,9)-(3,11) = "=>"
-        │   ├── closing_loc: (3,19)-(3,20) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (3,15)-(3,19))
-        │       ├── expression:
-        │       │   @ CallNode (location: (3,16)-(3,19))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :baz
-        │       │   ├── message_loc: (3,16)-(3,19) = "baz"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (3,15)-(3,16) = "&"
-        ├── @ CallNode (location: (5,0)-(5,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (5,0)-(5,4))
-        │   ├── call_operator_loc: (5,4)-(5,5) = "."
-        │   ├── name: :[]=
-        │   ├── message_loc: (5,5)-(5,8) = "[]="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,9)-(5,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (5,9)-(5,12))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (5,9)-(5,12) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ KeywordHashNode (location: (5,14)-(5,21))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (5,14)-(5,21))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (5,14)-(5,16))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (5,14)-(5,15) = ":"
-        │   │                   │   ├── value_loc: (5,15)-(5,16) = "a"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "a"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (5,20)-(5,21))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (5,17)-(5,19) = "=>"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (7,0)-(7,15))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (7,0)-(7,4))
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (7,4)-(7,15) = "[:bar => 1]"
-        │   ├── opening_loc: (7,4)-(7,5) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,5)-(7,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (7,5)-(7,14))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (7,5)-(7,14))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (7,5)-(7,9))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (7,5)-(7,6) = ":"
-        │   │                   │   ├── value_loc: (7,6)-(7,9) = "bar"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "bar"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (7,13)-(7,14))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (7,10)-(7,12) = "=>"
-        │   ├── closing_loc: (7,14)-(7,15) = "]"
-        │   └── block: ∅
-        ├── @ SuperNode (location: (9,0)-(9,17))
-        │   ├── keyword_loc: (9,0)-(9,5) = "super"
-        │   ├── lparen_loc: (9,5)-(9,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,6)-(9,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (9,6)-(9,16))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (9,6)-(9,16))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (9,6)-(9,10))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (9,6)-(9,7) = ":"
-        │   │                   │   ├── value_loc: (9,7)-(9,10) = "foo"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "foo"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (9,14)-(9,16))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 42
-        │   │                   └── operator_loc: (9,11)-(9,13) = "=>"
-        │   ├── rparen_loc: (9,16)-(9,17) = ")"
-        │   └── block: ∅
-        └── @ YieldNode (location: (11,0)-(11,17))
-            ├── keyword_loc: (11,0)-(11,5) = "yield"
-            ├── lparen_loc: (11,5)-(11,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (11,6)-(11,16))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (11,6)-(11,16))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (11,6)-(11,16))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (11,6)-(11,10))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (11,6)-(11,7) = ":"
-            │                   │   ├── value_loc: (11,7)-(11,10) = "foo"
-            │                   │   ├── closing_loc: ∅
-            │                   │   └── unescaped: "foo"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (11,14)-(11,16))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 42
-            │                   └── operator_loc: (11,11)-(11,13) = "=>"
-            └── rparen_loc: (11,16)-(11,17) = ")"
diff --git a/test/mri/prism/snapshots/whitequark/args_assocs_comma.txt b/test/mri/prism/snapshots/whitequark/args_assocs_comma.txt
deleted file mode 100644
index b1b9fbeefeb..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_assocs_comma.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,15))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,3)-(1,15) = "[:baz => 1,]"
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,4)-(1,13))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,4)-(1,13))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,4)-(1,8))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (1,4)-(1,5) = ":"
-            │                   │   ├── value_loc: (1,5)-(1,8) = "baz"
-            │                   │   ├── closing_loc: ∅
-            │                   │   └── unescaped: "baz"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,12)-(1,13))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   └── operator_loc: (1,9)-(1,11) = "=>"
-            ├── closing_loc: (1,14)-(1,15) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/args_assocs_legacy.txt b/test/mri/prism/snapshots/whitequark/args_assocs_legacy.txt
deleted file mode 100644
index 47cb68d899b..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_assocs_legacy.txt
+++ /dev/null
@@ -1,195 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,17))
-    └── body: (length: 6)
-        ├── @ CallNode (location: (1,0)-(1,14))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (1,0)-(1,3) = "fun"
-        │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (1,4)-(1,13))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (1,4)-(1,13))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (1,4)-(1,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (1,4)-(1,5) = ":"
-        │   │                   │   ├── value_loc: (1,5)-(1,8) = "foo"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "foo"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (1,12)-(1,13))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (1,9)-(1,11) = "=>"
-        │   ├── closing_loc: (1,13)-(1,14) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,19))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (3,0)-(3,3) = "fun"
-        │   ├── opening_loc: (3,3)-(3,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,4)-(3,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (3,4)-(3,13))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (3,4)-(3,13))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (3,4)-(3,8))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (3,4)-(3,5) = ":"
-        │   │                   │   ├── value_loc: (3,5)-(3,8) = "foo"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "foo"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (3,12)-(3,13))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (3,9)-(3,11) = "=>"
-        │   ├── closing_loc: (3,19)-(3,20) = ")"
-        │   └── block:
-        │       @ BlockArgumentNode (location: (3,15)-(3,19))
-        │       ├── expression:
-        │       │   @ CallNode (location: (3,16)-(3,19))
-        │       │   ├── flags: variable_call, ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :baz
-        │       │   ├── message_loc: (3,16)-(3,19) = "baz"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       └── operator_loc: (3,15)-(3,16) = "&"
-        ├── @ CallNode (location: (5,0)-(5,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (5,0)-(5,4))
-        │   ├── call_operator_loc: (5,4)-(5,5) = "."
-        │   ├── name: :[]=
-        │   ├── message_loc: (5,5)-(5,8) = "[]="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,9)-(5,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (5,9)-(5,12))
-        │   │       │   ├── flags: variable_call, ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :foo
-        │   │       │   ├── message_loc: (5,9)-(5,12) = "foo"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block: ∅
-        │   │       └── @ KeywordHashNode (location: (5,14)-(5,21))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (5,14)-(5,21))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (5,14)-(5,16))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (5,14)-(5,15) = ":"
-        │   │                   │   ├── value_loc: (5,15)-(5,16) = "a"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "a"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (5,20)-(5,21))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (5,17)-(5,19) = "=>"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (7,0)-(7,15))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (7,0)-(7,4))
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :[]
-        │   ├── message_loc: (7,4)-(7,15) = "[:bar => 1]"
-        │   ├── opening_loc: (7,4)-(7,5) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,5)-(7,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (7,5)-(7,14))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (7,5)-(7,14))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (7,5)-(7,9))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (7,5)-(7,6) = ":"
-        │   │                   │   ├── value_loc: (7,6)-(7,9) = "bar"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "bar"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (7,13)-(7,14))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: (7,10)-(7,12) = "=>"
-        │   ├── closing_loc: (7,14)-(7,15) = "]"
-        │   └── block: ∅
-        ├── @ SuperNode (location: (9,0)-(9,17))
-        │   ├── keyword_loc: (9,0)-(9,5) = "super"
-        │   ├── lparen_loc: (9,5)-(9,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,6)-(9,16))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (9,6)-(9,16))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (9,6)-(9,16))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (9,6)-(9,10))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (9,6)-(9,7) = ":"
-        │   │                   │   ├── value_loc: (9,7)-(9,10) = "foo"
-        │   │                   │   ├── closing_loc: ∅
-        │   │                   │   └── unescaped: "foo"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (9,14)-(9,16))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 42
-        │   │                   └── operator_loc: (9,11)-(9,13) = "=>"
-        │   ├── rparen_loc: (9,16)-(9,17) = ")"
-        │   └── block: ∅
-        └── @ YieldNode (location: (11,0)-(11,17))
-            ├── keyword_loc: (11,0)-(11,5) = "yield"
-            ├── lparen_loc: (11,5)-(11,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (11,6)-(11,16))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (11,6)-(11,16))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (11,6)-(11,16))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (11,6)-(11,10))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (11,6)-(11,7) = ":"
-            │                   │   ├── value_loc: (11,7)-(11,10) = "foo"
-            │                   │   ├── closing_loc: ∅
-            │                   │   └── unescaped: "foo"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (11,14)-(11,16))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 42
-            │                   └── operator_loc: (11,11)-(11,13) = "=>"
-            └── rparen_loc: (11,16)-(11,17) = ")"
diff --git a/test/mri/prism/snapshots/whitequark/args_block_pass.txt b/test/mri/prism/snapshots/whitequark/args_block_pass.txt
deleted file mode 100644
index 99ffa81934f..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_block_pass.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (1,0)-(1,3) = "fun"
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments: ∅
-            ├── closing_loc: (1,8)-(1,9) = ")"
-            └── block:
-                @ BlockArgumentNode (location: (1,4)-(1,8))
-                ├── expression:
-                │   @ CallNode (location: (1,5)-(1,8))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :bar
-                │   ├── message_loc: (1,5)-(1,8) = "bar"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                └── operator_loc: (1,4)-(1,5) = "&"
diff --git a/test/mri/prism/snapshots/whitequark/args_cmd.txt b/test/mri/prism/snapshots/whitequark/args_cmd.txt
deleted file mode 100644
index 0089e561572..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_cmd.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,10))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (1,0)-(1,3) = "fun"
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,4)-(1,9))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :f
-            │           ├── message_loc: (1,4)-(1,5) = "f"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,6)-(1,9))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (1,6)-(1,9))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :bar
-            │           │           ├── message_loc: (1,6)-(1,9) = "bar"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: (1,9)-(1,10) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/args_star.txt b/test/mri/prism/snapshots/whitequark/args_star.txt
deleted file mode 100644
index c19577f106e..00000000000
--- a/test/mri/prism/snapshots/whitequark/args_star.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,14))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (1,0)-(1,3) = "fun"
-        │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ SplatNode (location: (1,4)-(1,8))
-        │   │           ├── operator_loc: (1,4)-(1,5) = "*"
-        │   │           └── expression:
-        │   │               @ CallNode (location: (1,5)-(1,8))
-        │   │               ├── flags: variable_call, ignore_visibility
-        │   │               ├── receiver: ∅
-        │   │               ├── call_operator_loc: ∅
-        │   │               ├── name: :bar
-        │   │               ├── message_loc: (1,5)-(1,8) = "bar"
-        │   │               ├── opening_loc: ∅
-        │   │               ├── arguments: ∅
-        │   │               ├── closing_loc: ∅
-        │   │               └── block: ∅
-        │   ├── closing_loc: (1,8)-(1,9) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (3,0)-(3,3) = "fun"
-            ├── opening_loc: (3,3)-(3,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,4)-(3,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ SplatNode (location: (3,4)-(3,8))
-            │           ├── operator_loc: (3,4)-(3,5) = "*"
-            │           └── expression:
-            │               @ CallNode (location: (3,5)-(3,8))
-            │               ├── flags: variable_call, ignore_visibility
-            │               ├── receiver: ∅
-            │               ├── call_operator_loc: ∅
-            │               ├── name: :bar
-            │               ├── message_loc: (3,5)-(3,8) = "bar"
-            │               ├── opening_loc: ∅
-            │               ├── arguments: ∅
-            │               ├── closing_loc: ∅
-            │               └── block: ∅
-            ├── closing_loc: (3,14)-(3,15) = ")"
-            └── block:
-                @ BlockArgumentNode (location: (3,10)-(3,14))
-                ├── expression:
-                │   @ CallNode (location: (3,11)-(3,14))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :baz
-                │   ├── message_loc: (3,11)-(3,14) = "baz"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                └── operator_loc: (3,10)-(3,11) = "&"
diff --git a/test/mri/prism/snapshots/whitequark/array_assocs.txt b/test/mri/prism/snapshots/whitequark/array_assocs.txt
deleted file mode 100644
index 3747e3f7d84..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_assocs.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,13))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(1,10))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ KeywordHashNode (location: (1,2)-(1,8))
-        │   │       ├── flags: ∅
-        │   │       └── elements: (length: 1)
-        │   │           └── @ AssocNode (location: (1,2)-(1,8))
-        │   │               ├── key:
-        │   │               │   @ IntegerNode (location: (1,2)-(1,3))
-        │   │               │   ├── flags: decimal
-        │   │               │   └── value: 1
-        │   │               ├── value:
-        │   │               │   @ IntegerNode (location: (1,7)-(1,8))
-        │   │               │   ├── flags: decimal
-        │   │               │   └── value: 2
-        │   │               └── operator_loc: (1,4)-(1,6) = "=>"
-        │   ├── opening_loc: (1,0)-(1,1) = "["
-        │   └── closing_loc: (1,9)-(1,10) = "]"
-        └── @ ArrayNode (location: (3,0)-(3,13))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ IntegerNode (location: (3,2)-(3,3))
-            │   │   ├── flags: decimal
-            │   │   └── value: 1
-            │   └── @ KeywordHashNode (location: (3,5)-(3,11))
-            │       ├── flags: ∅
-            │       └── elements: (length: 1)
-            │           └── @ AssocNode (location: (3,5)-(3,11))
-            │               ├── key:
-            │               │   @ IntegerNode (location: (3,5)-(3,6))
-            │               │   ├── flags: decimal
-            │               │   └── value: 2
-            │               ├── value:
-            │               │   @ IntegerNode (location: (3,10)-(3,11))
-            │               │   ├── flags: decimal
-            │               │   └── value: 3
-            │               └── operator_loc: (3,7)-(3,9) = "=>"
-            ├── opening_loc: (3,0)-(3,1) = "["
-            └── closing_loc: (3,12)-(3,13) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/array_plain.txt b/test/mri/prism/snapshots/whitequark/array_plain.txt
deleted file mode 100644
index b183a7ac6bb..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_plain.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ IntegerNode (location: (1,1)-(1,2))
-            │   │   ├── flags: decimal
-            │   │   └── value: 1
-            │   └── @ IntegerNode (location: (1,4)-(1,5))
-            │       ├── flags: decimal
-            │       └── value: 2
-            ├── opening_loc: (1,0)-(1,1) = "["
-            └── closing_loc: (1,5)-(1,6) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/array_splat.txt b/test/mri/prism/snapshots/whitequark/array_splat.txt
deleted file mode 100644
index f76563e9f48..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_splat.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,9))
-    └── body: (length: 3)
-        ├── @ ArrayNode (location: (1,0)-(1,6))
-        │   ├── flags: contains_splat
-        │   ├── elements: (length: 1)
-        │   │   └── @ SplatNode (location: (1,1)-(1,5))
-        │   │       ├── operator_loc: (1,1)-(1,2) = "*"
-        │   │       └── expression:
-        │   │           @ CallNode (location: (1,2)-(1,5))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (1,2)-(1,5) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "["
-        │   └── closing_loc: (1,5)-(1,6) = "]"
-        ├── @ ArrayNode (location: (3,0)-(3,12))
-        │   ├── flags: contains_splat
-        │   ├── elements: (length: 3)
-        │   │   ├── @ IntegerNode (location: (3,1)-(3,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 1
-        │   │   ├── @ SplatNode (location: (3,4)-(3,8))
-        │   │   │   ├── operator_loc: (3,4)-(3,5) = "*"
-        │   │   │   └── expression:
-        │   │   │       @ CallNode (location: (3,5)-(3,8))
-        │   │   │       ├── flags: variable_call, ignore_visibility
-        │   │   │       ├── receiver: ∅
-        │   │   │       ├── call_operator_loc: ∅
-        │   │   │       ├── name: :foo
-        │   │   │       ├── message_loc: (3,5)-(3,8) = "foo"
-        │   │   │       ├── opening_loc: ∅
-        │   │   │       ├── arguments: ∅
-        │   │   │       ├── closing_loc: ∅
-        │   │   │       └── block: ∅
-        │   │   └── @ IntegerNode (location: (3,10)-(3,11))
-        │   │       ├── flags: decimal
-        │   │       └── value: 2
-        │   ├── opening_loc: (3,0)-(3,1) = "["
-        │   └── closing_loc: (3,11)-(3,12) = "]"
-        └── @ ArrayNode (location: (5,0)-(5,9))
-            ├── flags: contains_splat
-            ├── elements: (length: 2)
-            │   ├── @ IntegerNode (location: (5,1)-(5,2))
-            │   │   ├── flags: decimal
-            │   │   └── value: 1
-            │   └── @ SplatNode (location: (5,4)-(5,8))
-            │       ├── operator_loc: (5,4)-(5,5) = "*"
-            │       └── expression:
-            │           @ CallNode (location: (5,5)-(5,8))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (5,5)-(5,8) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── opening_loc: (5,0)-(5,1) = "["
-            └── closing_loc: (5,8)-(5,9) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/array_symbols.txt b/test/mri/prism/snapshots/whitequark/array_symbols.txt
deleted file mode 100644
index 0662f01af1d..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_symbols.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,11))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ SymbolNode (location: (1,3)-(1,6))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,3)-(1,6) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   └── @ SymbolNode (location: (1,7)-(1,10))
-            │       ├── flags: forced_us_ascii_encoding
-            │       ├── opening_loc: ∅
-            │       ├── value_loc: (1,7)-(1,10) = "bar"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "bar"
-            ├── opening_loc: (1,0)-(1,3) = "%i["
-            └── closing_loc: (1,10)-(1,11) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/array_symbols_empty.txt b/test/mri/prism/snapshots/whitequark/array_symbols_empty.txt
deleted file mode 100644
index 1068ba6d0e8..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_symbols_empty.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,4))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(1,4))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (1,0)-(1,3) = "%I("
-        │   └── closing_loc: (1,3)-(1,4) = ")"
-        └── @ ArrayNode (location: (3,0)-(3,4))
-            ├── flags: ∅
-            ├── elements: (length: 0)
-            ├── opening_loc: (3,0)-(3,3) = "%i["
-            └── closing_loc: (3,3)-(3,4) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/array_symbols_interp.txt b/test/mri/prism/snapshots/whitequark/array_symbols_interp.txt
deleted file mode 100644
index 7583ad8833e..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_symbols_interp.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,13))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(1,14))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ SymbolNode (location: (1,3)-(1,6))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── value_loc: (1,3)-(1,6) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   └── @ InterpolatedSymbolNode (location: (1,7)-(1,13))
-        │   │       ├── opening_loc: ∅
-        │   │       ├── parts: (length: 1)
-        │   │       │   └── @ EmbeddedStatementsNode (location: (1,7)-(1,13))
-        │   │       │       ├── opening_loc: (1,7)-(1,9) = "\#{"
-        │   │       │       ├── statements:
-        │   │       │       │   @ StatementsNode (location: (1,9)-(1,12))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (1,9)-(1,12))
-        │   │       │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :bar
-        │   │       │       │           ├── message_loc: (1,9)-(1,12) = "bar"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       └── closing_loc: (1,12)-(1,13) = "}"
-        │   │       └── closing_loc: ∅
-        │   ├── opening_loc: (1,0)-(1,3) = "%I["
-        │   └── closing_loc: (1,13)-(1,14) = "]"
-        └── @ ArrayNode (location: (3,0)-(3,13))
-            ├── flags: ∅
-            ├── elements: (length: 1)
-            │   └── @ InterpolatedSymbolNode (location: (3,3)-(3,12))
-            │       ├── opening_loc: ∅
-            │       ├── parts: (length: 2)
-            │       │   ├── @ StringNode (location: (3,3)-(3,6))
-            │       │   │   ├── flags: ∅
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── content_loc: (3,3)-(3,6) = "foo"
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── unescaped: "foo"
-            │       │   └── @ EmbeddedStatementsNode (location: (3,6)-(3,12))
-            │       │       ├── opening_loc: (3,6)-(3,8) = "\#{"
-            │       │       ├── statements:
-            │       │       │   @ StatementsNode (location: (3,8)-(3,11))
-            │       │       │   └── body: (length: 1)
-            │       │       │       └── @ CallNode (location: (3,8)-(3,11))
-            │       │       │           ├── flags: variable_call, ignore_visibility
-            │       │       │           ├── receiver: ∅
-            │       │       │           ├── call_operator_loc: ∅
-            │       │       │           ├── name: :bar
-            │       │       │           ├── message_loc: (3,8)-(3,11) = "bar"
-            │       │       │           ├── opening_loc: ∅
-            │       │       │           ├── arguments: ∅
-            │       │       │           ├── closing_loc: ∅
-            │       │       │           └── block: ∅
-            │       │       └── closing_loc: (3,11)-(3,12) = "}"
-            │       └── closing_loc: ∅
-            ├── opening_loc: (3,0)-(3,3) = "%I["
-            └── closing_loc: (3,12)-(3,13) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/array_words.txt b/test/mri/prism/snapshots/whitequark/array_words.txt
deleted file mode 100644
index 84121de355d..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_words.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ ArrayNode (location: (1,0)-(1,11))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ StringNode (location: (1,3)-(1,6))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,3)-(1,6) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   └── @ StringNode (location: (1,7)-(1,10))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,7)-(1,10) = "bar"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "bar"
-            ├── opening_loc: (1,0)-(1,3) = "%w["
-            └── closing_loc: (1,10)-(1,11) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/array_words_empty.txt b/test/mri/prism/snapshots/whitequark/array_words_empty.txt
deleted file mode 100644
index e4dba94cdf1..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_words_empty.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,4))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(1,4))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 0)
-        │   ├── opening_loc: (1,0)-(1,3) = "%W("
-        │   └── closing_loc: (1,3)-(1,4) = ")"
-        └── @ ArrayNode (location: (3,0)-(3,4))
-            ├── flags: ∅
-            ├── elements: (length: 0)
-            ├── opening_loc: (3,0)-(3,3) = "%w["
-            └── closing_loc: (3,3)-(3,4) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/array_words_interp.txt b/test/mri/prism/snapshots/whitequark/array_words_interp.txt
deleted file mode 100644
index c2f23d2bf19..00000000000
--- a/test/mri/prism/snapshots/whitequark/array_words_interp.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,22))
-    └── body: (length: 2)
-        ├── @ ArrayNode (location: (1,0)-(1,14))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 2)
-        │   │   ├── @ StringNode (location: (1,3)-(1,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (1,3)-(1,6) = "foo"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo"
-        │   │   └── @ InterpolatedStringNode (location: (1,7)-(1,13))
-        │   │       ├── opening_loc: ∅
-        │   │       ├── parts: (length: 1)
-        │   │       │   └── @ EmbeddedStatementsNode (location: (1,7)-(1,13))
-        │   │       │       ├── opening_loc: (1,7)-(1,9) = "\#{"
-        │   │       │       ├── statements:
-        │   │       │       │   @ StatementsNode (location: (1,9)-(1,12))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (1,9)-(1,12))
-        │   │       │       │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :bar
-        │   │       │       │           ├── message_loc: (1,9)-(1,12) = "bar"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       └── closing_loc: (1,12)-(1,13) = "}"
-        │   │       └── closing_loc: ∅
-        │   ├── opening_loc: (1,0)-(1,3) = "%W["
-        │   └── closing_loc: (1,13)-(1,14) = "]"
-        └── @ ArrayNode (location: (3,0)-(3,22))
-            ├── flags: ∅
-            ├── elements: (length: 2)
-            │   ├── @ StringNode (location: (3,3)-(3,6))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (3,3)-(3,6) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   └── @ InterpolatedStringNode (location: (3,7)-(3,21))
-            │       ├── opening_loc: ∅
-            │       ├── parts: (length: 3)
-            │       │   ├── @ EmbeddedStatementsNode (location: (3,7)-(3,13))
-            │       │   │   ├── opening_loc: (3,7)-(3,9) = "\#{"
-            │       │   │   ├── statements:
-            │       │   │   │   @ StatementsNode (location: (3,9)-(3,12))
-            │       │   │   │   └── body: (length: 1)
-            │       │   │   │       └── @ CallNode (location: (3,9)-(3,12))
-            │       │   │   │           ├── flags: variable_call, ignore_visibility
-            │       │   │   │           ├── receiver: ∅
-            │       │   │   │           ├── call_operator_loc: ∅
-            │       │   │   │           ├── name: :bar
-            │       │   │   │           ├── message_loc: (3,9)-(3,12) = "bar"
-            │       │   │   │           ├── opening_loc: ∅
-            │       │   │   │           ├── arguments: ∅
-            │       │   │   │           ├── closing_loc: ∅
-            │       │   │   │           └── block: ∅
-            │       │   │   └── closing_loc: (3,12)-(3,13) = "}"
-            │       │   ├── @ StringNode (location: (3,13)-(3,16))
-            │       │   │   ├── flags: ∅
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── content_loc: (3,13)-(3,16) = "foo"
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── unescaped: "foo"
-            │       │   └── @ EmbeddedVariableNode (location: (3,16)-(3,21))
-            │       │       ├── operator_loc: (3,16)-(3,17) = "#"
-            │       │       └── variable:
-            │       │           @ InstanceVariableReadNode (location: (3,17)-(3,21))
-            │       │           └── name: :@baz
-            │       └── closing_loc: ∅
-            ├── opening_loc: (3,0)-(3,3) = "%W["
-            └── closing_loc: (3,21)-(3,22) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/asgn_cmd.txt b/test/mri/prism/snapshots/whitequark/asgn_cmd.txt
deleted file mode 100644
index 4a3c36680b8..00000000000
--- a/test/mri/prism/snapshots/whitequark/asgn_cmd.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,11))
-├── locals: [:foo, :bar]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,11))
-    └── body: (length: 2)
-        ├── @ LocalVariableWriteNode (location: (1,0)-(1,17))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (1,0)-(1,3) = "foo"
-        │   ├── value:
-        │   │   @ LocalVariableWriteNode (location: (1,6)-(1,17))
-        │   │   ├── name: :bar
-        │   │   ├── depth: 0
-        │   │   ├── name_loc: (1,6)-(1,9) = "bar"
-        │   │   ├── value:
-        │   │   │   @ CallNode (location: (1,12)-(1,17))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :m
-        │   │   │   ├── message_loc: (1,12)-(1,13) = "m"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (1,14)-(1,17))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ LocalVariableReadNode (location: (1,14)-(1,17))
-        │   │   │   │           ├── name: :foo
-        │   │   │   │           └── depth: 0
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (1,10)-(1,11) = "="
-        │   └── operator_loc: (1,4)-(1,5) = "="
-        └── @ LocalVariableWriteNode (location: (3,0)-(3,11))
-            ├── name: :foo
-            ├── depth: 0
-            ├── name_loc: (3,0)-(3,3) = "foo"
-            ├── value:
-            │   @ CallNode (location: (3,6)-(3,11))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :m
-            │   ├── message_loc: (3,6)-(3,7) = "m"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (3,8)-(3,11))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ LocalVariableReadNode (location: (3,8)-(3,11))
-            │   │           ├── name: :foo
-            │   │           └── depth: 0
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── operator_loc: (3,4)-(3,5) = "="
diff --git a/test/mri/prism/snapshots/whitequark/asgn_mrhs.txt b/test/mri/prism/snapshots/whitequark/asgn_mrhs.txt
deleted file mode 100644
index 41d5bdc5bff..00000000000
--- a/test/mri/prism/snapshots/whitequark/asgn_mrhs.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,15))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,15))
-    └── body: (length: 3)
-        ├── @ LocalVariableWriteNode (location: (1,0)-(1,10))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (1,0)-(1,3) = "foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (1,6)-(1,10))
-        │   │   ├── flags: contains_splat
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ SplatNode (location: (1,6)-(1,10))
-        │   │   │       ├── operator_loc: (1,6)-(1,7) = "*"
-        │   │   │       └── expression:
-        │   │   │           @ CallNode (location: (1,7)-(1,10))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (1,7)-(1,10) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (1,4)-(1,5) = "="
-        ├── @ LocalVariableWriteNode (location: (3,0)-(3,12))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (3,0)-(3,3) = "foo"
-        │   ├── value:
-        │   │   @ ArrayNode (location: (3,6)-(3,12))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ CallNode (location: (3,6)-(3,9))
-        │   │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   │   ├── receiver: ∅
-        │   │   │   │   ├── call_operator_loc: ∅
-        │   │   │   │   ├── name: :bar
-        │   │   │   │   ├── message_loc: (3,6)-(3,9) = "bar"
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── arguments: ∅
-        │   │   │   │   ├── closing_loc: ∅
-        │   │   │   │   └── block: ∅
-        │   │   │   └── @ IntegerNode (location: (3,11)-(3,12))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 1
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (3,4)-(3,5) = "="
-        └── @ LocalVariableWriteNode (location: (5,0)-(5,15))
-            ├── name: :foo
-            ├── depth: 0
-            ├── name_loc: (5,0)-(5,3) = "foo"
-            ├── value:
-            │   @ ArrayNode (location: (5,6)-(5,15))
-            │   ├── flags: contains_splat
-            │   ├── elements: (length: 2)
-            │   │   ├── @ CallNode (location: (5,6)-(5,9))
-            │   │   │   ├── flags: variable_call, ignore_visibility
-            │   │   │   ├── receiver: ∅
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :baz
-            │   │   │   ├── message_loc: (5,6)-(5,9) = "baz"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments: ∅
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   └── @ SplatNode (location: (5,11)-(5,15))
-            │   │       ├── operator_loc: (5,11)-(5,12) = "*"
-            │   │       └── expression:
-            │   │           @ CallNode (location: (5,12)-(5,15))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (5,12)-(5,15) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── opening_loc: ∅
-            │   └── closing_loc: ∅
-            └── operator_loc: (5,4)-(5,5) = "="
diff --git a/test/mri/prism/snapshots/whitequark/back_ref.txt b/test/mri/prism/snapshots/whitequark/back_ref.txt
deleted file mode 100644
index ea6b76faf72..00000000000
--- a/test/mri/prism/snapshots/whitequark/back_ref.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,2))
-    └── body: (length: 1)
-        └── @ BackReferenceReadNode (location: (1,0)-(1,2))
-            └── name: :$+
diff --git a/test/mri/prism/snapshots/whitequark/bang.txt b/test/mri/prism/snapshots/whitequark/bang.txt
deleted file mode 100644
index 997a8718c58..00000000000
--- a/test/mri/prism/snapshots/whitequark/bang.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,1)-(1,4))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,1)-(1,4) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,1) = "!"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/bang_cmd.txt b/test/mri/prism/snapshots/whitequark/bang_cmd.txt
deleted file mode 100644
index e487da5e574..00000000000
--- a/test/mri/prism/snapshots/whitequark/bang_cmd.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,1)-(1,6))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :m
-            │   ├── message_loc: (1,1)-(1,2) = "m"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,3)-(1,6))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,3)-(1,6))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :foo
-            │   │           ├── message_loc: (1,3)-(1,6) = "foo"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,1) = "!"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/begin_cmdarg.txt b/test/mri/prism/snapshots/whitequark/begin_cmdarg.txt
deleted file mode 100644
index b0c03c17544..00000000000
--- a/test/mri/prism/snapshots/whitequark/begin_cmdarg.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,28))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,28))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,28))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ BeginNode (location: (1,2)-(1,28))
-            │           ├── begin_keyword_loc: (1,2)-(1,7) = "begin"
-            │           ├── statements:
-            │           │   @ StatementsNode (location: (1,8)-(1,24))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (1,8)-(1,24))
-            │           │           ├── flags: ∅
-            │           │           ├── receiver:
-            │           │           │   @ IntegerNode (location: (1,8)-(1,9))
-            │           │           │   ├── flags: decimal
-            │           │           │   └── value: 1
-            │           │           ├── call_operator_loc: (1,9)-(1,10) = "."
-            │           │           ├── name: :times
-            │           │           ├── message_loc: (1,10)-(1,15) = "times"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block:
-            │           │               @ BlockNode (location: (1,16)-(1,24))
-            │           │               ├── locals: []
-            │           │               ├── parameters: ∅
-            │           │               ├── body:
-            │           │               │   @ StatementsNode (location: (1,19)-(1,20))
-            │           │               │   └── body: (length: 1)
-            │           │               │       └── @ IntegerNode (location: (1,19)-(1,20))
-            │           │               │           ├── flags: decimal
-            │           │               │           └── value: 1
-            │           │               ├── opening_loc: (1,16)-(1,18) = "do"
-            │           │               └── closing_loc: (1,21)-(1,24) = "end"
-            │           ├── rescue_clause: ∅
-            │           ├── else_clause: ∅
-            │           ├── ensure_clause: ∅
-            │           └── end_keyword_loc: (1,25)-(1,28) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/beginless_erange_after_newline.txt b/test/mri/prism/snapshots/whitequark/beginless_erange_after_newline.txt
deleted file mode 100644
index 69db24a1273..00000000000
--- a/test/mri/prism/snapshots/whitequark/beginless_erange_after_newline.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,6))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,3))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ RangeNode (location: (2,0)-(2,6))
-            ├── flags: exclude_end
-            ├── left: ∅
-            ├── right:
-            │   @ IntegerNode (location: (2,3)-(2,6))
-            │   ├── flags: decimal
-            │   └── value: 100
-            └── operator_loc: (2,0)-(2,3) = "..."
diff --git a/test/mri/prism/snapshots/whitequark/beginless_irange_after_newline.txt b/test/mri/prism/snapshots/whitequark/beginless_irange_after_newline.txt
deleted file mode 100644
index cbc11c83c13..00000000000
--- a/test/mri/prism/snapshots/whitequark/beginless_irange_after_newline.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,5))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,3))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ RangeNode (location: (2,0)-(2,5))
-            ├── flags: ∅
-            ├── left: ∅
-            ├── right:
-            │   @ IntegerNode (location: (2,2)-(2,5))
-            │   ├── flags: decimal
-            │   └── value: 100
-            └── operator_loc: (2,0)-(2,2) = ".."
diff --git a/test/mri/prism/snapshots/whitequark/beginless_range.txt b/test/mri/prism/snapshots/whitequark/beginless_range.txt
deleted file mode 100644
index 59e6f135add..00000000000
--- a/test/mri/prism/snapshots/whitequark/beginless_range.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,5))
-    └── body: (length: 2)
-        ├── @ RangeNode (location: (1,0)-(1,6))
-        │   ├── flags: exclude_end
-        │   ├── left: ∅
-        │   ├── right:
-        │   │   @ IntegerNode (location: (1,3)-(1,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 100
-        │   └── operator_loc: (1,0)-(1,3) = "..."
-        └── @ RangeNode (location: (3,0)-(3,5))
-            ├── flags: ∅
-            ├── left: ∅
-            ├── right:
-            │   @ IntegerNode (location: (3,2)-(3,5))
-            │   ├── flags: decimal
-            │   └── value: 100
-            └── operator_loc: (3,0)-(3,2) = ".."
diff --git a/test/mri/prism/snapshots/whitequark/blockarg.txt b/test/mri/prism/snapshots/whitequark/blockarg.txt
deleted file mode 100644
index 70b054e0737..00000000000
--- a/test/mri/prism/snapshots/whitequark/blockarg.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,18))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,12))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block:
-            │       @ BlockParameterNode (location: (1,6)-(1,12))
-            │       ├── flags: ∅
-            │       ├── name: :block
-            │       ├── name_loc: (1,7)-(1,12) = "block"
-            │       └── operator_loc: (1,6)-(1,7) = "&"
-            ├── body: ∅
-            ├── locals: [:block]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,12)-(1,13) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,15)-(1,18) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/blockargs.txt b/test/mri/prism/snapshots/whitequark/blockargs.txt
deleted file mode 100644
index 149c3765c94..00000000000
--- a/test/mri/prism/snapshots/whitequark/blockargs.txt
+++ /dev/null
@@ -1,1339 +0,0 @@
-@ ProgramNode (location: (1,0)-(71,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(71,7))
-    └── body: (length: 35)
-        ├── @ CallNode (location: (1,0)-(1,5))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (1,0)-(1,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,1)-(1,5))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,1)-(1,2) = "{"
-        │       └── closing_loc: (1,4)-(1,5) = "}"
-        ├── @ CallNode (location: (3,0)-(3,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (3,0)-(3,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (3,1)-(3,8))
-        │       ├── locals: []
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (3,3)-(3,6))
-        │       │   ├── parameters: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (3,3)-(3,4) = "|"
-        │       │   └── closing_loc: (3,5)-(3,6) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (3,1)-(3,2) = "{"
-        │       └── closing_loc: (3,7)-(3,8) = "}"
-        ├── @ CallNode (location: (5,0)-(5,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (5,0)-(5,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (5,1)-(5,9))
-        │       ├── locals: [:b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (5,3)-(5,7))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (5,4)-(5,6))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (5,4)-(5,6))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (5,5)-(5,6) = "b"
-        │       │   │       └── operator_loc: (5,4)-(5,5) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (5,3)-(5,4) = "|"
-        │       │   └── closing_loc: (5,6)-(5,7) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (5,1)-(5,2) = "{"
-        │       └── closing_loc: (5,8)-(5,9) = "}"
-        ├── @ CallNode (location: (7,0)-(7,16))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (7,0)-(7,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (7,1)-(7,16))
-        │       ├── locals: [:baz, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (7,3)-(7,14))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (7,4)-(7,13))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest:
-        │       │   │   │   @ KeywordRestParameterNode (location: (7,4)-(7,9))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :baz
-        │       │   │   │   ├── name_loc: (7,6)-(7,9) = "baz"
-        │       │   │   │   └── operator_loc: (7,4)-(7,6) = "**"
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (7,11)-(7,13))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (7,12)-(7,13) = "b"
-        │       │   │       └── operator_loc: (7,11)-(7,12) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (7,3)-(7,4) = "|"
-        │       │   └── closing_loc: (7,13)-(7,14) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (7,1)-(7,2) = "{"
-        │       └── closing_loc: (7,15)-(7,16) = "}"
-        ├── @ CallNode (location: (9,0)-(9,12))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (9,0)-(9,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (9,1)-(9,12))
-        │       ├── locals: [:b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (9,3)-(9,10))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (9,4)-(9,9))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (9,4)-(9,5))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: ∅
-        │       │   │   │   ├── name_loc: ∅
-        │       │   │   │   └── operator_loc: (9,4)-(9,5) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (9,7)-(9,9))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (9,8)-(9,9) = "b"
-        │       │   │       └── operator_loc: (9,7)-(9,8) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (9,3)-(9,4) = "|"
-        │       │   └── closing_loc: (9,9)-(9,10) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (9,1)-(9,2) = "{"
-        │       └── closing_loc: (9,11)-(9,12) = "}"
-        ├── @ CallNode (location: (11,0)-(11,16))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (11,0)-(11,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (11,1)-(11,16))
-        │       ├── locals: [:r, :p, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (11,3)-(11,14))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (11,4)-(11,13))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (11,4)-(11,6))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :r
-        │       │   │   │   ├── name_loc: (11,5)-(11,6) = "r"
-        │       │   │   │   └── operator_loc: (11,4)-(11,5) = "*"
-        │       │   │   ├── posts: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (11,8)-(11,9))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :p
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (11,11)-(11,13))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (11,12)-(11,13) = "b"
-        │       │   │       └── operator_loc: (11,11)-(11,12) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (11,3)-(11,4) = "|"
-        │       │   └── closing_loc: (11,13)-(11,14) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (11,1)-(11,2) = "{"
-        │       └── closing_loc: (11,15)-(11,16) = "}"
-        ├── @ CallNode (location: (13,0)-(13,13))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (13,0)-(13,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (13,1)-(13,13))
-        │       ├── locals: [:s, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (13,3)-(13,11))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (13,4)-(13,10))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (13,4)-(13,6))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :s
-        │       │   │   │   ├── name_loc: (13,5)-(13,6) = "s"
-        │       │   │   │   └── operator_loc: (13,4)-(13,5) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (13,8)-(13,10))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (13,9)-(13,10) = "b"
-        │       │   │       └── operator_loc: (13,8)-(13,9) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (13,3)-(13,4) = "|"
-        │       │   └── closing_loc: (13,10)-(13,11) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (13,1)-(13,2) = "{"
-        │       └── closing_loc: (13,12)-(13,13) = "}"
-        ├── @ CallNode (location: (15,0)-(15,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (15,0)-(15,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (15,1)-(15,9))
-        │       ├── locals: [:s]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (15,3)-(15,7))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (15,4)-(15,6))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (15,4)-(15,6))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :s
-        │       │   │   │   ├── name_loc: (15,5)-(15,6) = "s"
-        │       │   │   │   └── operator_loc: (15,4)-(15,5) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (15,3)-(15,4) = "|"
-        │       │   └── closing_loc: (15,6)-(15,7) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (15,1)-(15,2) = "{"
-        │       └── closing_loc: (15,8)-(15,9) = "}"
-        ├── @ CallNode (location: (17,0)-(17,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (17,0)-(17,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (17,1)-(17,8))
-        │       ├── locals: []
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (17,3)-(17,6))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (17,4)-(17,5))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (17,4)-(17,5))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: ∅
-        │       │   │   │   ├── name_loc: ∅
-        │       │   │   │   └── operator_loc: (17,4)-(17,5) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (17,3)-(17,4) = "|"
-        │       │   └── closing_loc: (17,5)-(17,6) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (17,1)-(17,2) = "{"
-        │       └── closing_loc: (17,7)-(17,8) = "}"
-        ├── @ CallNode (location: (19,0)-(21,3))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (19,0)-(19,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (19,1)-(21,3))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (19,3)-(21,1))
-        │       │   ├── parameters: ∅
-        │       │   ├── locals: (length: 1)
-        │       │   │   └── @ BlockLocalVariableNode (location: (20,0)-(20,1))
-        │       │   │       ├── flags: ∅
-        │       │   │       └── name: :a
-        │       │   ├── opening_loc: (19,3)-(19,4) = "|"
-        │       │   └── closing_loc: (21,0)-(21,1) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (19,1)-(19,2) = "{"
-        │       └── closing_loc: (21,2)-(21,3) = "}"
-        ├── @ CallNode (location: (23,0)-(23,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (23,0)-(23,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (23,1)-(23,9))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (23,3)-(23,7))
-        │       │   ├── parameters: ∅
-        │       │   ├── locals: (length: 1)
-        │       │   │   └── @ BlockLocalVariableNode (location: (23,5)-(23,6))
-        │       │   │       ├── flags: ∅
-        │       │   │       └── name: :a
-        │       │   ├── opening_loc: (23,3)-(23,4) = "|"
-        │       │   └── closing_loc: (23,6)-(23,7) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (23,1)-(23,2) = "{"
-        │       └── closing_loc: (23,8)-(23,9) = "}"
-        ├── @ CallNode (location: (25,0)-(25,12))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (25,0)-(25,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (25,1)-(25,12))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (25,3)-(25,10))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (25,4)-(25,9))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (25,4)-(25,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (25,7)-(25,9))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (25,8)-(25,9) = "b"
-        │       │   │       └── operator_loc: (25,7)-(25,8) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (25,3)-(25,4) = "|"
-        │       │   └── closing_loc: (25,9)-(25,10) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (25,1)-(25,2) = "{"
-        │       └── closing_loc: (25,11)-(25,12) = "}"
-        ├── @ CallNode (location: (27,0)-(27,15))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (27,0)-(27,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (27,1)-(27,15))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (27,3)-(27,13))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (27,4)-(27,12))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (27,4)-(27,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (27,7)-(27,8))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: ∅
-        │       │   │   │   ├── name_loc: ∅
-        │       │   │   │   └── operator_loc: (27,7)-(27,8) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (27,10)-(27,12))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (27,11)-(27,12) = "b"
-        │       │   │       └── operator_loc: (27,10)-(27,11) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (27,3)-(27,4) = "|"
-        │       │   └── closing_loc: (27,12)-(27,13) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (27,1)-(27,2) = "{"
-        │       └── closing_loc: (27,14)-(27,15) = "}"
-        ├── @ CallNode (location: (29,0)-(29,19))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (29,0)-(29,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (29,1)-(29,19))
-        │       ├── locals: [:a, :r, :p, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (29,3)-(29,17))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (29,4)-(29,16))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (29,4)-(29,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (29,7)-(29,9))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :r
-        │       │   │   │   ├── name_loc: (29,8)-(29,9) = "r"
-        │       │   │   │   └── operator_loc: (29,7)-(29,8) = "*"
-        │       │   │   ├── posts: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (29,11)-(29,12))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :p
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (29,14)-(29,16))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (29,15)-(29,16) = "b"
-        │       │   │       └── operator_loc: (29,14)-(29,15) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (29,3)-(29,4) = "|"
-        │       │   └── closing_loc: (29,16)-(29,17) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (29,1)-(29,2) = "{"
-        │       └── closing_loc: (29,18)-(29,19) = "}"
-        ├── @ CallNode (location: (31,0)-(31,16))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (31,0)-(31,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (31,1)-(31,16))
-        │       ├── locals: [:a, :s, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (31,3)-(31,14))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (31,4)-(31,13))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (31,4)-(31,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (31,7)-(31,9))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :s
-        │       │   │   │   ├── name_loc: (31,8)-(31,9) = "s"
-        │       │   │   │   └── operator_loc: (31,7)-(31,8) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (31,11)-(31,13))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (31,12)-(31,13) = "b"
-        │       │   │       └── operator_loc: (31,11)-(31,12) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (31,3)-(31,4) = "|"
-        │       │   └── closing_loc: (31,13)-(31,14) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (31,1)-(31,2) = "{"
-        │       └── closing_loc: (31,15)-(31,16) = "}"
-        ├── @ CallNode (location: (33,0)-(33,12))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (33,0)-(33,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (33,1)-(33,12))
-        │       ├── locals: [:a, :s]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (33,3)-(33,10))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (33,4)-(33,9))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (33,4)-(33,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (33,7)-(33,9))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :s
-        │       │   │   │   ├── name_loc: (33,8)-(33,9) = "s"
-        │       │   │   │   └── operator_loc: (33,7)-(33,8) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (33,3)-(33,4) = "|"
-        │       │   └── closing_loc: (33,9)-(33,10) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (33,1)-(33,2) = "{"
-        │       └── closing_loc: (33,11)-(33,12) = "}"
-        ├── @ CallNode (location: (35,0)-(35,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (35,0)-(35,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (35,1)-(35,11))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (35,3)-(35,9))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (35,4)-(35,8))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (35,4)-(35,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (35,7)-(35,8))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: ∅
-        │       │   │   │   ├── name_loc: ∅
-        │       │   │   │   └── operator_loc: (35,7)-(35,8) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (35,3)-(35,4) = "|"
-        │       │   └── closing_loc: (35,8)-(35,9) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (35,1)-(35,2) = "{"
-        │       └── closing_loc: (35,10)-(35,11) = "}"
-        ├── @ CallNode (location: (37,0)-(37,12))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (37,0)-(37,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (37,1)-(37,12))
-        │       ├── locals: [:a, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (37,3)-(37,10))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (37,4)-(37,9))
-        │       │   │   ├── requireds: (length: 2)
-        │       │   │   │   ├── @ RequiredParameterNode (location: (37,4)-(37,5))
-        │       │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   └── name: :a
-        │       │   │   │   └── @ RequiredParameterNode (location: (37,7)-(37,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :b
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ ImplicitRestNode (location: (37,8)-(37,9))
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (37,3)-(37,4) = "|"
-        │       │   └── closing_loc: (37,9)-(37,10) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (37,1)-(37,2) = "{"
-        │       └── closing_loc: (37,11)-(37,12) = "}"
-        ├── @ CallNode (location: (39,0)-(39,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (39,0)-(39,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (39,1)-(39,11))
-        │       ├── locals: [:a, :c]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (39,3)-(39,9))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (39,4)-(39,8))
-        │       │   │   ├── requireds: (length: 2)
-        │       │   │   │   ├── @ RequiredParameterNode (location: (39,4)-(39,5))
-        │       │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   └── name: :a
-        │       │   │   │   └── @ RequiredParameterNode (location: (39,7)-(39,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :c
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (39,3)-(39,4) = "|"
-        │       │   └── closing_loc: (39,8)-(39,9) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (39,1)-(39,2) = "{"
-        │       └── closing_loc: (39,10)-(39,11) = "}"
-        ├── @ CallNode (location: (41,0)-(41,17))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (41,0)-(41,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (41,1)-(41,17))
-        │       ├── locals: [:a, :o, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (41,3)-(41,15))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (41,4)-(41,14))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (41,4)-(41,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (41,7)-(41,10))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :o
-        │       │   │   │       ├── name_loc: (41,7)-(41,8) = "o"
-        │       │   │   │       ├── operator_loc: (41,8)-(41,9) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (41,9)-(41,10))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 1
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (41,12)-(41,14))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (41,13)-(41,14) = "b"
-        │       │   │       └── operator_loc: (41,12)-(41,13) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (41,3)-(41,4) = "|"
-        │       │   └── closing_loc: (41,14)-(41,15) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (41,1)-(41,2) = "{"
-        │       └── closing_loc: (41,16)-(41,17) = "}"
-        ├── @ CallNode (location: (43,0)-(43,24))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (43,0)-(43,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (43,1)-(43,24))
-        │       ├── locals: [:a, :o, :r, :p, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (43,3)-(43,22))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (43,4)-(43,21))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (43,4)-(43,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (43,7)-(43,10))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :o
-        │       │   │   │       ├── name_loc: (43,7)-(43,8) = "o"
-        │       │   │   │       ├── operator_loc: (43,8)-(43,9) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (43,9)-(43,10))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 1
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (43,12)-(43,14))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :r
-        │       │   │   │   ├── name_loc: (43,13)-(43,14) = "r"
-        │       │   │   │   └── operator_loc: (43,12)-(43,13) = "*"
-        │       │   │   ├── posts: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (43,16)-(43,17))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :p
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (43,19)-(43,21))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (43,20)-(43,21) = "b"
-        │       │   │       └── operator_loc: (43,19)-(43,20) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (43,3)-(43,4) = "|"
-        │       │   └── closing_loc: (43,21)-(43,22) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (43,1)-(43,2) = "{"
-        │       └── closing_loc: (43,23)-(43,24) = "}"
-        ├── @ CallNode (location: (45,0)-(45,27))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (45,0)-(45,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (45,1)-(45,27))
-        │       ├── locals: [:a, :o, :o1, :r, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (45,3)-(45,25))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (45,4)-(45,24))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (45,4)-(45,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 2)
-        │       │   │   │   ├── @ OptionalParameterNode (location: (45,7)-(45,10))
-        │       │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   ├── name: :o
-        │       │   │   │   │   ├── name_loc: (45,7)-(45,8) = "o"
-        │       │   │   │   │   ├── operator_loc: (45,8)-(45,9) = "="
-        │       │   │   │   │   └── value:
-        │       │   │   │   │       @ IntegerNode (location: (45,9)-(45,10))
-        │       │   │   │   │       ├── flags: decimal
-        │       │   │   │   │       └── value: 1
-        │       │   │   │   └── @ OptionalParameterNode (location: (45,12)-(45,16))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :o1
-        │       │   │   │       ├── name_loc: (45,12)-(45,14) = "o1"
-        │       │   │   │       ├── operator_loc: (45,14)-(45,15) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (45,15)-(45,16))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 2
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (45,18)-(45,20))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :r
-        │       │   │   │   ├── name_loc: (45,19)-(45,20) = "r"
-        │       │   │   │   └── operator_loc: (45,18)-(45,19) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (45,22)-(45,24))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (45,23)-(45,24) = "b"
-        │       │   │       └── operator_loc: (45,22)-(45,23) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (45,3)-(45,4) = "|"
-        │       │   └── closing_loc: (45,24)-(45,25) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (45,1)-(45,2) = "{"
-        │       └── closing_loc: (45,26)-(45,27) = "}"
-        ├── @ CallNode (location: (47,0)-(47,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (47,0)-(47,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (47,1)-(47,20))
-        │       ├── locals: [:a, :o, :p, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (47,3)-(47,18))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (47,4)-(47,17))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (47,4)-(47,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (47,7)-(47,10))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :o
-        │       │   │   │       ├── name_loc: (47,7)-(47,8) = "o"
-        │       │   │   │       ├── operator_loc: (47,8)-(47,9) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (47,9)-(47,10))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 1
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (47,12)-(47,13))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :p
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (47,15)-(47,17))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (47,16)-(47,17) = "b"
-        │       │   │       └── operator_loc: (47,15)-(47,16) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (47,3)-(47,4) = "|"
-        │       │   └── closing_loc: (47,17)-(47,18) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (47,1)-(47,2) = "{"
-        │       └── closing_loc: (47,19)-(47,20) = "}"
-        ├── @ CallNode (location: (49,0)-(49,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (49,0)-(49,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (49,1)-(49,9))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (49,3)-(49,7))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (49,4)-(49,6))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (49,4)-(49,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest:
-        │       │   │   │   @ ImplicitRestNode (location: (49,5)-(49,6))
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (49,3)-(49,4) = "|"
-        │       │   └── closing_loc: (49,6)-(49,7) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (49,1)-(49,2) = "{"
-        │       └── closing_loc: (49,8)-(49,9) = "}"
-        ├── @ CallNode (location: (51,0)-(51,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (51,0)-(51,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (51,1)-(51,8))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (51,3)-(51,6))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (51,4)-(51,5))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (51,4)-(51,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (51,3)-(51,4) = "|"
-        │       │   └── closing_loc: (51,5)-(51,6) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (51,1)-(51,2) = "{"
-        │       └── closing_loc: (51,7)-(51,8) = "}"
-        ├── @ CallNode (location: (53,0)-(53,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (53,0)-(53,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (53,1)-(53,8))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (53,3)-(53,6))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (53,4)-(53,5))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (53,4)-(53,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (53,3)-(53,4) = "|"
-        │       │   └── closing_loc: (53,5)-(53,6) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (53,1)-(53,2) = "{"
-        │       └── closing_loc: (53,7)-(53,8) = "}"
-        ├── @ CallNode (location: (55,0)-(55,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (55,0)-(55,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (55,1)-(55,8))
-        │       ├── locals: [:a]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (55,3)-(55,6))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (55,4)-(55,5))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (55,4)-(55,5))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :a
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (55,3)-(55,4) = "|"
-        │       │   └── closing_loc: (55,5)-(55,6) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (55,1)-(55,2) = "{"
-        │       └── closing_loc: (55,7)-(55,8) = "}"
-        ├── @ CallNode (location: (57,0)-(57,17))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (57,0)-(57,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (57,1)-(57,17))
-        │       ├── locals: [:foo, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (57,3)-(57,15))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (57,4)-(57,14))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 1)
-        │       │   │   │   └── @ OptionalKeywordParameterNode (location: (57,4)-(57,10))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :foo
-        │       │   │   │       ├── name_loc: (57,4)-(57,8) = "foo:"
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (57,9)-(57,10))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 1
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (57,12)-(57,14))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (57,13)-(57,14) = "b"
-        │       │   │       └── operator_loc: (57,12)-(57,13) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (57,3)-(57,4) = "|"
-        │       │   └── closing_loc: (57,14)-(57,15) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (57,1)-(57,2) = "{"
-        │       └── closing_loc: (57,16)-(57,17) = "}"
-        ├── @ CallNode (location: (59,0)-(59,32))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (59,0)-(59,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (59,1)-(59,32))
-        │       ├── locals: [:foo, :bar, :baz, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (59,3)-(59,30))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (59,4)-(59,29))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 2)
-        │       │   │   │   ├── @ OptionalKeywordParameterNode (location: (59,4)-(59,10))
-        │       │   │   │   │   ├── flags: ∅
-        │       │   │   │   │   ├── name: :foo
-        │       │   │   │   │   ├── name_loc: (59,4)-(59,8) = "foo:"
-        │       │   │   │   │   └── value:
-        │       │   │   │   │       @ IntegerNode (location: (59,9)-(59,10))
-        │       │   │   │   │       ├── flags: decimal
-        │       │   │   │   │       └── value: 1
-        │       │   │   │   └── @ OptionalKeywordParameterNode (location: (59,12)-(59,18))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :bar
-        │       │   │   │       ├── name_loc: (59,12)-(59,16) = "bar:"
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (59,17)-(59,18))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 2
-        │       │   │   ├── keyword_rest:
-        │       │   │   │   @ KeywordRestParameterNode (location: (59,20)-(59,25))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :baz
-        │       │   │   │   ├── name_loc: (59,22)-(59,25) = "baz"
-        │       │   │   │   └── operator_loc: (59,20)-(59,22) = "**"
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (59,27)-(59,29))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (59,28)-(59,29) = "b"
-        │       │   │       └── operator_loc: (59,27)-(59,28) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (59,3)-(59,4) = "|"
-        │       │   └── closing_loc: (59,29)-(59,30) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (59,1)-(59,2) = "{"
-        │       └── closing_loc: (59,31)-(59,32) = "}"
-        ├── @ CallNode (location: (61,0)-(61,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (61,0)-(61,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (61,1)-(61,11))
-        │       ├── locals: [:foo]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (61,3)-(61,9))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (61,4)-(61,8))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 1)
-        │       │   │   │   └── @ RequiredKeywordParameterNode (location: (61,4)-(61,8))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :foo
-        │       │   │   │       └── name_loc: (61,4)-(61,8) = "foo:"
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (61,3)-(61,4) = "|"
-        │       │   └── closing_loc: (61,8)-(61,9) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (61,1)-(61,2) = "{"
-        │       └── closing_loc: (61,10)-(61,11) = "}"
-        ├── @ CallNode (location: (63,0)-(63,14))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (63,0)-(63,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (63,1)-(63,14))
-        │       ├── locals: [:o, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (63,3)-(63,12))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (63,4)-(63,11))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (63,4)-(63,7))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :o
-        │       │   │   │       ├── name_loc: (63,4)-(63,5) = "o"
-        │       │   │   │       ├── operator_loc: (63,5)-(63,6) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (63,6)-(63,7))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 1
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (63,9)-(63,11))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (63,10)-(63,11) = "b"
-        │       │   │       └── operator_loc: (63,9)-(63,10) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (63,3)-(63,4) = "|"
-        │       │   └── closing_loc: (63,11)-(63,12) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (63,1)-(63,2) = "{"
-        │       └── closing_loc: (63,13)-(63,14) = "}"
-        ├── @ CallNode (location: (65,0)-(65,18))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (65,0)-(65,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (65,1)-(65,18))
-        │       ├── locals: [:o, :r, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (65,3)-(65,16))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (65,4)-(65,15))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (65,4)-(65,7))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :o
-        │       │   │   │       ├── name_loc: (65,4)-(65,5) = "o"
-        │       │   │   │       ├── operator_loc: (65,5)-(65,6) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (65,6)-(65,7))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 1
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (65,9)-(65,11))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :r
-        │       │   │   │   ├── name_loc: (65,10)-(65,11) = "r"
-        │       │   │   │   └── operator_loc: (65,9)-(65,10) = "*"
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (65,13)-(65,15))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (65,14)-(65,15) = "b"
-        │       │   │       └── operator_loc: (65,13)-(65,14) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (65,3)-(65,4) = "|"
-        │       │   └── closing_loc: (65,15)-(65,16) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (65,1)-(65,2) = "{"
-        │       └── closing_loc: (65,17)-(65,18) = "}"
-        ├── @ CallNode (location: (67,0)-(67,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (67,0)-(67,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (67,1)-(67,21))
-        │       ├── locals: [:o, :r, :p, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (67,3)-(67,19))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (67,4)-(67,18))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (67,4)-(67,7))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :o
-        │       │   │   │       ├── name_loc: (67,4)-(67,5) = "o"
-        │       │   │   │       ├── operator_loc: (67,5)-(67,6) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (67,6)-(67,7))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 1
-        │       │   │   ├── rest:
-        │       │   │   │   @ RestParameterNode (location: (67,9)-(67,11))
-        │       │   │   │   ├── flags: ∅
-        │       │   │   │   ├── name: :r
-        │       │   │   │   ├── name_loc: (67,10)-(67,11) = "r"
-        │       │   │   │   └── operator_loc: (67,9)-(67,10) = "*"
-        │       │   │   ├── posts: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (67,13)-(67,14))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :p
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (67,16)-(67,18))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (67,17)-(67,18) = "b"
-        │       │   │       └── operator_loc: (67,16)-(67,17) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (67,3)-(67,4) = "|"
-        │       │   └── closing_loc: (67,18)-(67,19) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (67,1)-(67,2) = "{"
-        │       └── closing_loc: (67,20)-(67,21) = "}"
-        ├── @ CallNode (location: (69,0)-(69,17))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (69,0)-(69,1) = "f"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (69,1)-(69,17))
-        │       ├── locals: [:o, :p, :b]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (69,3)-(69,15))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (69,4)-(69,14))
-        │       │   │   ├── requireds: (length: 0)
-        │       │   │   ├── optionals: (length: 1)
-        │       │   │   │   └── @ OptionalParameterNode (location: (69,4)-(69,7))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       ├── name: :o
-        │       │   │   │       ├── name_loc: (69,4)-(69,5) = "o"
-        │       │   │   │       ├── operator_loc: (69,5)-(69,6) = "="
-        │       │   │   │       └── value:
-        │       │   │   │           @ IntegerNode (location: (69,6)-(69,7))
-        │       │   │   │           ├── flags: decimal
-        │       │   │   │           └── value: 1
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 1)
-        │       │   │   │   └── @ RequiredParameterNode (location: (69,9)-(69,10))
-        │       │   │   │       ├── flags: ∅
-        │       │   │   │       └── name: :p
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block:
-        │       │   │       @ BlockParameterNode (location: (69,12)-(69,14))
-        │       │   │       ├── flags: ∅
-        │       │   │       ├── name: :b
-        │       │   │       ├── name_loc: (69,13)-(69,14) = "b"
-        │       │   │       └── operator_loc: (69,12)-(69,13) = "&"
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (69,3)-(69,4) = "|"
-        │       │   └── closing_loc: (69,14)-(69,15) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (69,1)-(69,2) = "{"
-        │       └── closing_loc: (69,16)-(69,17) = "}"
-        └── @ CallNode (location: (71,0)-(71,7))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (71,0)-(71,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (71,1)-(71,7))
-                ├── locals: []
-                ├── parameters:
-                │   @ BlockParametersNode (location: (71,3)-(71,5))
-                │   ├── parameters: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (71,3)-(71,4) = "|"
-                │   └── closing_loc: (71,4)-(71,5) = "|"
-                ├── body: ∅
-                ├── opening_loc: (71,1)-(71,2) = "{"
-                └── closing_loc: (71,6)-(71,7) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/break.txt b/test/mri/prism/snapshots/whitequark/break.txt
deleted file mode 100644
index 7ce2bfa1367..00000000000
--- a/test/mri/prism/snapshots/whitequark/break.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,10))
-    └── body: (length: 4)
-        ├── @ BreakNode (location: (1,0)-(1,5))
-        │   ├── arguments: ∅
-        │   └── keyword_loc: (1,0)-(1,5) = "break"
-        ├── @ BreakNode (location: (3,0)-(3,9))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,6)-(3,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,6)-(3,9))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (3,6)-(3,9) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── keyword_loc: (3,0)-(3,5) = "break"
-        ├── @ BreakNode (location: (5,0)-(5,7))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,5)-(5,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (5,5)-(5,7))
-        │   │           ├── body: ∅
-        │   │           ├── opening_loc: (5,5)-(5,6) = "("
-        │   │           └── closing_loc: (5,6)-(5,7) = ")"
-        │   └── keyword_loc: (5,0)-(5,5) = "break"
-        └── @ BreakNode (location: (7,0)-(7,10))
-            ├── arguments:
-            │   @ ArgumentsNode (location: (7,5)-(7,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (7,5)-(7,10))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (7,6)-(7,9))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (7,6)-(7,9))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :foo
-            │           │           ├── message_loc: (7,6)-(7,9) = "foo"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── opening_loc: (7,5)-(7,6) = "("
-            │           └── closing_loc: (7,9)-(7,10) = ")"
-            └── keyword_loc: (7,0)-(7,5) = "break"
diff --git a/test/mri/prism/snapshots/whitequark/break_block.txt b/test/mri/prism/snapshots/whitequark/break_block.txt
deleted file mode 100644
index 93228689445..00000000000
--- a/test/mri/prism/snapshots/whitequark/break_block.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ BreakNode (location: (1,0)-(1,20))
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,6)-(1,20))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,6)-(1,20))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :fun
-            │           ├── message_loc: (1,6)-(1,9) = "fun"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,10)-(1,13))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (1,10)-(1,13))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :foo
-            │           │           ├── message_loc: (1,10)-(1,13) = "foo"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: ∅
-            │           └── block:
-            │               @ BlockNode (location: (1,14)-(1,20))
-            │               ├── locals: []
-            │               ├── parameters: ∅
-            │               ├── body: ∅
-            │               ├── opening_loc: (1,14)-(1,16) = "do"
-            │               └── closing_loc: (1,17)-(1,20) = "end"
-            └── keyword_loc: (1,0)-(1,5) = "break"
diff --git a/test/mri/prism/snapshots/whitequark/bug_435.txt b/test/mri/prism/snapshots/whitequark/bug_435.txt
deleted file mode 100644
index e08874fa15b..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_435.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,14))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 1)
-            │   └── @ EmbeddedStatementsNode (location: (1,1)-(1,13))
-            │       ├── opening_loc: (1,1)-(1,3) = "\#{"
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,3)-(1,12))
-            │       │   └── body: (length: 1)
-            │       │       └── @ LambdaNode (location: (1,3)-(1,12))
-            │       │           ├── locals: [:foo]
-            │       │           ├── operator_loc: (1,3)-(1,5) = "->"
-            │       │           ├── opening_loc: (1,10)-(1,11) = "{"
-            │       │           ├── closing_loc: (1,11)-(1,12) = "}"
-            │       │           ├── parameters:
-            │       │           │   @ BlockParametersNode (location: (1,6)-(1,9))
-            │       │           │   ├── parameters:
-            │       │           │   │   @ ParametersNode (location: (1,6)-(1,9))
-            │       │           │   │   ├── requireds: (length: 1)
-            │       │           │   │   │   └── @ RequiredParameterNode (location: (1,6)-(1,9))
-            │       │           │   │   │       ├── flags: ∅
-            │       │           │   │   │       └── name: :foo
-            │       │           │   │   ├── optionals: (length: 0)
-            │       │           │   │   ├── rest: ∅
-            │       │           │   │   ├── posts: (length: 0)
-            │       │           │   │   ├── keywords: (length: 0)
-            │       │           │   │   ├── keyword_rest: ∅
-            │       │           │   │   └── block: ∅
-            │       │           │   ├── locals: (length: 0)
-            │       │           │   ├── opening_loc: ∅
-            │       │           │   └── closing_loc: ∅
-            │       │           └── body: ∅
-            │       └── closing_loc: (1,12)-(1,13) = "}"
-            └── closing_loc: (1,13)-(1,14) = "\""
diff --git a/test/mri/prism/snapshots/whitequark/bug_447.txt b/test/mri/prism/snapshots/whitequark/bug_447.txt
deleted file mode 100644
index 7291d011751..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_447.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,14))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (1,0)-(1,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,4))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ArrayNode (location: (1,2)-(1,4))
-        │   │           ├── flags: ∅
-        │   │           ├── elements: (length: 0)
-        │   │           ├── opening_loc: (1,2)-(1,3) = "["
-        │   │           └── closing_loc: (1,3)-(1,4) = "]"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,5)-(1,11))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,5)-(1,7) = "do"
-        │       └── closing_loc: (1,8)-(1,11) = "end"
-        └── @ CallNode (location: (3,0)-(3,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (3,0)-(3,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,2)-(3,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ ArrayNode (location: (3,2)-(3,4))
-            │       │   ├── flags: ∅
-            │       │   ├── elements: (length: 0)
-            │       │   ├── opening_loc: (3,2)-(3,3) = "["
-            │       │   └── closing_loc: (3,3)-(3,4) = "]"
-            │       └── @ IntegerNode (location: (3,6)-(3,7))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (3,8)-(3,14))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (3,8)-(3,10) = "do"
-                └── closing_loc: (3,11)-(3,14) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/bug_452.txt b/test/mri/prism/snapshots/whitequark/bug_452.txt
deleted file mode 100644
index e1ea52fbd13..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_452.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,37))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,37))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :td
-        │   ├── message_loc: (1,0)-(1,2) = "td"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,3)-(1,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (1,3)-(1,21))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ ParenthesesNode (location: (1,3)-(1,10))
-        │   │           │   ├── body:
-        │   │           │   │   @ StatementsNode (location: (1,4)-(1,9))
-        │   │           │   │   └── body: (length: 1)
-        │   │           │   │       └── @ IntegerNode (location: (1,4)-(1,9))
-        │   │           │   │           ├── flags: decimal
-        │   │           │   │           └── value: 1500
-        │   │           │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   │           │   └── closing_loc: (1,9)-(1,10) = ")"
-        │   │           ├── call_operator_loc: (1,10)-(1,11) = "."
-        │   │           ├── name: :toString
-        │   │           ├── message_loc: (1,11)-(1,19) = "toString"
-        │   │           ├── opening_loc: (1,19)-(1,20) = "("
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: (1,20)-(1,21) = ")"
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (1,23)-(1,37))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,23)-(1,25))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :td
-            │   ├── message_loc: (1,23)-(1,25) = "td"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,25)-(1,26) = "."
-            ├── name: :num
-            ├── message_loc: (1,26)-(1,29) = "num"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,30)-(1,37))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,30)-(1,32) = "do"
-                └── closing_loc: (1,34)-(1,37) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/bug_466.txt b/test/mri/prism/snapshots/whitequark/bug_466.txt
deleted file mode 100644
index 3f65dee0487..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_466.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,27))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,27))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,27))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo
-            ├── message_loc: (1,0)-(1,3) = "foo"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,19))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InterpolatedStringNode (location: (1,4)-(1,19))
-            │           ├── opening_loc: (1,4)-(1,5) = "\""
-            │           ├── parts: (length: 1)
-            │           │   └── @ EmbeddedStatementsNode (location: (1,5)-(1,18))
-            │           │       ├── opening_loc: (1,5)-(1,7) = "\#{"
-            │           │       ├── statements:
-            │           │       │   @ StatementsNode (location: (1,7)-(1,17))
-            │           │       │   └── body: (length: 1)
-            │           │       │       └── @ CallNode (location: (1,7)-(1,17))
-            │           │       │           ├── flags: ∅
-            │           │       │           ├── receiver:
-            │           │       │           │   @ ParenthesesNode (location: (1,7)-(1,12))
-            │           │       │           │   ├── body:
-            │           │       │           │   │   @ StatementsNode (location: (1,8)-(1,11))
-            │           │       │           │   │   └── body: (length: 1)
-            │           │       │           │   │       └── @ CallNode (location: (1,8)-(1,11))
-            │           │       │           │   │           ├── flags: ∅
-            │           │       │           │   │           ├── receiver:
-            │           │       │           │   │           │   @ IntegerNode (location: (1,8)-(1,9))
-            │           │       │           │   │           │   ├── flags: decimal
-            │           │       │           │   │           │   └── value: 1
-            │           │       │           │   │           ├── call_operator_loc: ∅
-            │           │       │           │   │           ├── name: :+
-            │           │       │           │   │           ├── message_loc: (1,9)-(1,10) = "+"
-            │           │       │           │   │           ├── opening_loc: ∅
-            │           │       │           │   │           ├── arguments:
-            │           │       │           │   │           │   @ ArgumentsNode (location: (1,10)-(1,11))
-            │           │       │           │   │           │   ├── flags: ∅
-            │           │       │           │   │           │   └── arguments: (length: 1)
-            │           │       │           │   │           │       └── @ IntegerNode (location: (1,10)-(1,11))
-            │           │       │           │   │           │           ├── flags: decimal
-            │           │       │           │   │           │           └── value: 1
-            │           │       │           │   │           ├── closing_loc: ∅
-            │           │       │           │   │           └── block: ∅
-            │           │       │           │   ├── opening_loc: (1,7)-(1,8) = "("
-            │           │       │           │   └── closing_loc: (1,11)-(1,12) = ")"
-            │           │       │           ├── call_operator_loc: (1,12)-(1,13) = "."
-            │           │       │           ├── name: :to_i
-            │           │       │           ├── message_loc: (1,13)-(1,17) = "to_i"
-            │           │       │           ├── opening_loc: ∅
-            │           │       │           ├── arguments: ∅
-            │           │       │           ├── closing_loc: ∅
-            │           │       │           └── block: ∅
-            │           │       └── closing_loc: (1,17)-(1,18) = "}"
-            │           └── closing_loc: (1,18)-(1,19) = "\""
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,20)-(1,27))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,20)-(1,22) = "do"
-                └── closing_loc: (1,24)-(1,27) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/bug_473.txt b/test/mri/prism/snapshots/whitequark/bug_473.txt
deleted file mode 100644
index 96991ebeb7a..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_473.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (1,0)-(1,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InterpolatedStringNode (location: (1,2)-(1,9))
-            │           ├── opening_loc: (1,2)-(1,3) = "\""
-            │           ├── parts: (length: 1)
-            │           │   └── @ EmbeddedStatementsNode (location: (1,3)-(1,8))
-            │           │       ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │           │       ├── statements:
-            │           │       │   @ StatementsNode (location: (1,5)-(1,7))
-            │           │       │   └── body: (length: 1)
-            │           │       │       └── @ ArrayNode (location: (1,5)-(1,7))
-            │           │       │           ├── flags: ∅
-            │           │       │           ├── elements: (length: 0)
-            │           │       │           ├── opening_loc: (1,5)-(1,6) = "["
-            │           │       │           └── closing_loc: (1,6)-(1,7) = "]"
-            │           │       └── closing_loc: (1,7)-(1,8) = "}"
-            │           └── closing_loc: (1,8)-(1,9) = "\""
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/bug_480.txt b/test/mri/prism/snapshots/whitequark/bug_480.txt
deleted file mode 100644
index f0a2a312e5d..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_480.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (1,0)-(1,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,12))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InterpolatedStringNode (location: (1,2)-(1,12))
-            │           ├── opening_loc: (1,2)-(1,3) = "\""
-            │           ├── parts: (length: 2)
-            │           │   ├── @ EmbeddedStatementsNode (location: (1,3)-(1,6))
-            │           │   │   ├── opening_loc: (1,3)-(1,5) = "\#{"
-            │           │   │   ├── statements: ∅
-            │           │   │   └── closing_loc: (1,5)-(1,6) = "}"
-            │           │   └── @ EmbeddedStatementsNode (location: (1,6)-(1,11))
-            │           │       ├── opening_loc: (1,6)-(1,8) = "\#{"
-            │           │       ├── statements:
-            │           │       │   @ StatementsNode (location: (1,8)-(1,10))
-            │           │       │   └── body: (length: 1)
-            │           │       │       └── @ ParenthesesNode (location: (1,8)-(1,10))
-            │           │       │           ├── body: ∅
-            │           │       │           ├── opening_loc: (1,8)-(1,9) = "("
-            │           │       │           └── closing_loc: (1,9)-(1,10) = ")"
-            │           │       └── closing_loc: (1,10)-(1,11) = "}"
-            │           └── closing_loc: (1,11)-(1,12) = "\""
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/bug_481.txt b/test/mri/prism/snapshots/whitequark/bug_481.txt
deleted file mode 100644
index 0b093d483c0..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_481.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,28))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,14))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (1,0)-(1,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ DefNode (location: (1,2)-(1,14))
-        │   │           ├── name: :x
-        │   │           ├── name_loc: (1,6)-(1,7) = "x"
-        │   │           ├── receiver: ∅
-        │   │           ├── parameters: ∅
-        │   │           ├── body: ∅
-        │   │           ├── locals: []
-        │   │           ├── def_keyword_loc: (1,2)-(1,5) = "def"
-        │   │           ├── operator_loc: ∅
-        │   │           ├── lparen_loc: (1,7)-(1,8) = "("
-        │   │           ├── rparen_loc: (1,8)-(1,9) = ")"
-        │   │           ├── equal_loc: ∅
-        │   │           └── end_keyword_loc: (1,11)-(1,14) = "end"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (1,16)-(1,28))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ IntegerNode (location: (1,16)-(1,17))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── call_operator_loc: (1,17)-(1,18) = "."
-            ├── name: :tap
-            ├── message_loc: (1,18)-(1,21) = "tap"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,22)-(1,28))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,22)-(1,24) = "do"
-                └── closing_loc: (1,25)-(1,28) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/bug_ascii_8bit_in_literal.txt b/test/mri/prism/snapshots/whitequark/bug_ascii_8bit_in_literal.txt
deleted file mode 100644
index 7aa8694f665..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_ascii_8bit_in_literal.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (2,9)-(2,75))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (2,9)-(2,75))
-    └── body: (length: 1)
-        └── @ StringNode (location: (2,9)-(2,75))
-            ├── flags: forced_utf8_encoding
-            ├── opening_loc: (2,9)-(2,10) = "\""
-            ├── content_loc: (2,10)-(2,74) = "\\xD0\\xBF\\xD1\\x80\\xD0\\xBE\\xD0\\xB2\\xD0\\xB5\\xD1\\x80\\xD0\\xBA\\xD0\\xB0"
-            ├── closing_loc: (2,74)-(2,75) = "\""
-            └── unescaped: "проверка"
diff --git a/test/mri/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt b/test/mri/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt
deleted file mode 100644
index 50c988fa1f0..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :desc
-            ├── message_loc: (1,0)-(1,4) = "desc"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ StringNode (location: (1,5)-(1,10))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (1,5)-(1,6) = "\""
-            │           ├── content_loc: (1,6)-(1,9) = "foo"
-            │           ├── closing_loc: (1,9)-(1,10) = "\""
-            │           └── unescaped: "foo"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,11)-(1,17))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,11)-(1,13) = "do"
-                └── closing_loc: (1,14)-(1,17) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/bug_cmdarg.txt b/test/mri/prism/snapshots/whitequark/bug_cmdarg.txt
deleted file mode 100644
index 509dd7e8182..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_cmdarg.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,26))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,15))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :assert
-        │   ├── message_loc: (1,0)-(1,6) = "assert"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,7)-(1,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (1,7)-(1,15))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (1,7)-(1,15))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (1,7)-(1,10))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (1,7)-(1,9) = "do"
-        │   │                   │   ├── closing_loc: (1,9)-(1,10) = ":"
-        │   │                   │   └── unescaped: "do"
-        │   │                   ├── value:
-        │   │                   │   @ TrueNode (location: (1,11)-(1,15))
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,11))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :assert
-        │   ├── message_loc: (3,0)-(3,6) = "assert"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,7)-(3,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,7)-(3,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :dogs
-        │   │           ├── message_loc: (3,7)-(3,11) = "dogs"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,26))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (5,0)-(5,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (5,2)-(5,26))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (5,2)-(5,26))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (5,2)-(5,26))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (5,2)-(5,4))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (5,2)-(5,3) = "x"
-            │                   │   ├── closing_loc: (5,3)-(5,4) = ":"
-            │                   │   └── unescaped: "x"
-            │                   ├── value:
-            │                   │   @ LambdaNode (location: (5,5)-(5,26))
-            │                   │   ├── locals: []
-            │                   │   ├── operator_loc: (5,5)-(5,7) = "->"
-            │                   │   ├── opening_loc: (5,8)-(5,10) = "do"
-            │                   │   ├── closing_loc: (5,23)-(5,26) = "end"
-            │                   │   ├── parameters: ∅
-            │                   │   └── body:
-            │                   │       @ StatementsNode (location: (5,11)-(5,22))
-            │                   │       └── body: (length: 1)
-            │                   │           └── @ CallNode (location: (5,11)-(5,22))
-            │                   │               ├── flags: ignore_visibility
-            │                   │               ├── receiver: ∅
-            │                   │               ├── call_operator_loc: ∅
-            │                   │               ├── name: :meth
-            │                   │               ├── message_loc: (5,11)-(5,15) = "meth"
-            │                   │               ├── opening_loc: ∅
-            │                   │               ├── arguments: ∅
-            │                   │               ├── closing_loc: ∅
-            │                   │               └── block:
-            │                   │                   @ BlockNode (location: (5,16)-(5,22))
-            │                   │                   ├── locals: []
-            │                   │                   ├── parameters: ∅
-            │                   │                   ├── body: ∅
-            │                   │                   ├── opening_loc: (5,16)-(5,18) = "do"
-            │                   │                   └── closing_loc: (5,19)-(5,22) = "end"
-            │                   └── operator_loc: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/bug_def_no_paren_eql_begin.txt b/test/mri/prism/snapshots/whitequark/bug_def_no_paren_eql_begin.txt
deleted file mode 100644
index 1b45d0132be..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_def_no_paren_eql_begin.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(4,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(4,3))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(4,3))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (4,0)-(4,3) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/bug_do_block_in_call_args.txt b/test/mri/prism/snapshots/whitequark/bug_do_block_in_call_args.txt
deleted file mode 100644
index 9b95adda352..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_do_block_in_call_args.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,33))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,33))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,33))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :bar
-            ├── message_loc: (1,0)-(1,3) = "bar"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,33))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ DefNode (location: (1,4)-(1,33))
-            │           ├── name: :foo
-            │           ├── name_loc: (1,8)-(1,11) = "foo"
-            │           ├── receiver: ∅
-            │           ├── parameters: ∅
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,13)-(1,29))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (1,13)-(1,29))
-            │           │           ├── flags: ignore_visibility
-            │           │           ├── receiver:
-            │           │           │   @ SelfNode (location: (1,13)-(1,17))
-            │           │           ├── call_operator_loc: (1,17)-(1,18) = "."
-            │           │           ├── name: :each
-            │           │           ├── message_loc: (1,18)-(1,22) = "each"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block:
-            │           │               @ BlockNode (location: (1,23)-(1,29))
-            │           │               ├── locals: []
-            │           │               ├── parameters: ∅
-            │           │               ├── body: ∅
-            │           │               ├── opening_loc: (1,23)-(1,25) = "do"
-            │           │               └── closing_loc: (1,26)-(1,29) = "end"
-            │           ├── locals: []
-            │           ├── def_keyword_loc: (1,4)-(1,7) = "def"
-            │           ├── operator_loc: ∅
-            │           ├── lparen_loc: ∅
-            │           ├── rparen_loc: ∅
-            │           ├── equal_loc: ∅
-            │           └── end_keyword_loc: (1,30)-(1,33) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt b/test/mri/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt
deleted file mode 100644
index 3946bc1a4a0..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,17))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :tap
-            ├── message_loc: (1,0)-(1,3) = "tap"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,17))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,4)-(1,17))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,5)-(1,16))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (1,5)-(1,16))
-            │           │           ├── flags: ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :proc
-            │           │           ├── message_loc: (1,5)-(1,9) = "proc"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block:
-            │           │               @ BlockNode (location: (1,10)-(1,16))
-            │           │               ├── locals: []
-            │           │               ├── parameters: ∅
-            │           │               ├── body: ∅
-            │           │               ├── opening_loc: (1,10)-(1,12) = "do"
-            │           │               └── closing_loc: (1,13)-(1,16) = "end"
-            │           ├── opening_loc: (1,4)-(1,5) = "("
-            │           └── closing_loc: (1,16)-(1,17) = ")"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/bug_do_block_in_hash_brace.txt b/test/mri/prism/snapshots/whitequark/bug_do_block_in_hash_brace.txt
deleted file mode 100644
index 183d465439f..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_do_block_in_hash_brace.txt
+++ /dev/null
@@ -1,383 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,52))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,52))
-    └── body: (length: 5)
-        ├── @ CallNode (location: (1,0)-(1,42))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (1,0)-(1,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,42))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (1,2)-(1,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (1,2)-(1,3) = ":"
-        │   │       │   ├── value_loc: (1,3)-(1,6) = "foo"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "foo"
-        │   │       └── @ HashNode (location: (1,8)-(1,42))
-        │   │           ├── opening_loc: (1,8)-(1,9) = "{"
-        │   │           ├── elements: (length: 2)
-        │   │           │   ├── @ AssocNode (location: (1,9)-(1,25))
-        │   │           │   │   ├── key:
-        │   │           │   │   │   @ SymbolNode (location: (1,9)-(1,13))
-        │   │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │           │   │   │   ├── opening_loc: (1,9)-(1,10) = "\""
-        │   │           │   │   │   ├── value_loc: (1,10)-(1,11) = "a"
-        │   │           │   │   │   ├── closing_loc: (1,11)-(1,13) = "\":"
-        │   │           │   │   │   └── unescaped: "a"
-        │   │           │   │   ├── value:
-        │   │           │   │   │   @ CallNode (location: (1,14)-(1,25))
-        │   │           │   │   │   ├── flags: ignore_visibility
-        │   │           │   │   │   ├── receiver: ∅
-        │   │           │   │   │   ├── call_operator_loc: ∅
-        │   │           │   │   │   ├── name: :proc
-        │   │           │   │   │   ├── message_loc: (1,14)-(1,18) = "proc"
-        │   │           │   │   │   ├── opening_loc: ∅
-        │   │           │   │   │   ├── arguments: ∅
-        │   │           │   │   │   ├── closing_loc: ∅
-        │   │           │   │   │   └── block:
-        │   │           │   │   │       @ BlockNode (location: (1,19)-(1,25))
-        │   │           │   │   │       ├── locals: []
-        │   │           │   │   │       ├── parameters: ∅
-        │   │           │   │   │       ├── body: ∅
-        │   │           │   │   │       ├── opening_loc: (1,19)-(1,21) = "do"
-        │   │           │   │   │       └── closing_loc: (1,22)-(1,25) = "end"
-        │   │           │   │   └── operator_loc: ∅
-        │   │           │   └── @ AssocNode (location: (1,27)-(1,41))
-        │   │           │       ├── key:
-        │   │           │       │   @ SymbolNode (location: (1,27)-(1,29))
-        │   │           │       │   ├── flags: forced_us_ascii_encoding
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── value_loc: (1,27)-(1,28) = "b"
-        │   │           │       │   ├── closing_loc: (1,28)-(1,29) = ":"
-        │   │           │       │   └── unescaped: "b"
-        │   │           │       ├── value:
-        │   │           │       │   @ CallNode (location: (1,30)-(1,41))
-        │   │           │       │   ├── flags: ignore_visibility
-        │   │           │       │   ├── receiver: ∅
-        │   │           │       │   ├── call_operator_loc: ∅
-        │   │           │       │   ├── name: :proc
-        │   │           │       │   ├── message_loc: (1,30)-(1,34) = "proc"
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── arguments: ∅
-        │   │           │       │   ├── closing_loc: ∅
-        │   │           │       │   └── block:
-        │   │           │       │       @ BlockNode (location: (1,35)-(1,41))
-        │   │           │       │       ├── locals: []
-        │   │           │       │       ├── parameters: ∅
-        │   │           │       │       ├── body: ∅
-        │   │           │       │       ├── opening_loc: (1,35)-(1,37) = "do"
-        │   │           │       │       └── closing_loc: (1,38)-(1,41) = "end"
-        │   │           │       └── operator_loc: ∅
-        │   │           └── closing_loc: (1,41)-(1,42) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,40))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (3,0)-(3,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,2)-(3,40))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (3,2)-(3,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (3,2)-(3,3) = ":"
-        │   │       │   ├── value_loc: (3,3)-(3,6) = "foo"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "foo"
-        │   │       └── @ HashNode (location: (3,8)-(3,40))
-        │   │           ├── opening_loc: (3,8)-(3,9) = "{"
-        │   │           ├── elements: (length: 2)
-        │   │           │   ├── @ AssocSplatNode (location: (3,9)-(3,23))
-        │   │           │   │   ├── value:
-        │   │           │   │   │   @ CallNode (location: (3,12)-(3,23))
-        │   │           │   │   │   ├── flags: ignore_visibility
-        │   │           │   │   │   ├── receiver: ∅
-        │   │           │   │   │   ├── call_operator_loc: ∅
-        │   │           │   │   │   ├── name: :proc
-        │   │           │   │   │   ├── message_loc: (3,12)-(3,16) = "proc"
-        │   │           │   │   │   ├── opening_loc: ∅
-        │   │           │   │   │   ├── arguments: ∅
-        │   │           │   │   │   ├── closing_loc: ∅
-        │   │           │   │   │   └── block:
-        │   │           │   │   │       @ BlockNode (location: (3,17)-(3,23))
-        │   │           │   │   │       ├── locals: []
-        │   │           │   │   │       ├── parameters: ∅
-        │   │           │   │   │       ├── body: ∅
-        │   │           │   │   │       ├── opening_loc: (3,17)-(3,19) = "do"
-        │   │           │   │   │       └── closing_loc: (3,20)-(3,23) = "end"
-        │   │           │   │   └── operator_loc: (3,9)-(3,11) = "**"
-        │   │           │   └── @ AssocNode (location: (3,25)-(3,39))
-        │   │           │       ├── key:
-        │   │           │       │   @ SymbolNode (location: (3,25)-(3,27))
-        │   │           │       │   ├── flags: forced_us_ascii_encoding
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── value_loc: (3,25)-(3,26) = "b"
-        │   │           │       │   ├── closing_loc: (3,26)-(3,27) = ":"
-        │   │           │       │   └── unescaped: "b"
-        │   │           │       ├── value:
-        │   │           │       │   @ CallNode (location: (3,28)-(3,39))
-        │   │           │       │   ├── flags: ignore_visibility
-        │   │           │       │   ├── receiver: ∅
-        │   │           │       │   ├── call_operator_loc: ∅
-        │   │           │       │   ├── name: :proc
-        │   │           │       │   ├── message_loc: (3,28)-(3,32) = "proc"
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── arguments: ∅
-        │   │           │       │   ├── closing_loc: ∅
-        │   │           │       │   └── block:
-        │   │           │       │       @ BlockNode (location: (3,33)-(3,39))
-        │   │           │       │       ├── locals: []
-        │   │           │       │       ├── parameters: ∅
-        │   │           │       │       ├── body: ∅
-        │   │           │       │       ├── opening_loc: (3,33)-(3,35) = "do"
-        │   │           │       │       └── closing_loc: (3,36)-(3,39) = "end"
-        │   │           │       └── operator_loc: ∅
-        │   │           └── closing_loc: (3,39)-(3,40) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,43))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (5,0)-(5,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,2)-(5,43))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (5,2)-(5,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (5,2)-(5,3) = ":"
-        │   │       │   ├── value_loc: (5,3)-(5,6) = "foo"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "foo"
-        │   │       └── @ HashNode (location: (5,8)-(5,43))
-        │   │           ├── opening_loc: (5,8)-(5,9) = "{"
-        │   │           ├── elements: (length: 2)
-        │   │           │   ├── @ AssocNode (location: (5,9)-(5,26))
-        │   │           │   │   ├── key:
-        │   │           │   │   │   @ SymbolNode (location: (5,9)-(5,11))
-        │   │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │           │   │   │   ├── opening_loc: (5,9)-(5,10) = ":"
-        │   │           │   │   │   ├── value_loc: (5,10)-(5,11) = "a"
-        │   │           │   │   │   ├── closing_loc: ∅
-        │   │           │   │   │   └── unescaped: "a"
-        │   │           │   │   ├── value:
-        │   │           │   │   │   @ CallNode (location: (5,15)-(5,26))
-        │   │           │   │   │   ├── flags: ignore_visibility
-        │   │           │   │   │   ├── receiver: ∅
-        │   │           │   │   │   ├── call_operator_loc: ∅
-        │   │           │   │   │   ├── name: :proc
-        │   │           │   │   │   ├── message_loc: (5,15)-(5,19) = "proc"
-        │   │           │   │   │   ├── opening_loc: ∅
-        │   │           │   │   │   ├── arguments: ∅
-        │   │           │   │   │   ├── closing_loc: ∅
-        │   │           │   │   │   └── block:
-        │   │           │   │   │       @ BlockNode (location: (5,20)-(5,26))
-        │   │           │   │   │       ├── locals: []
-        │   │           │   │   │       ├── parameters: ∅
-        │   │           │   │   │       ├── body: ∅
-        │   │           │   │   │       ├── opening_loc: (5,20)-(5,22) = "do"
-        │   │           │   │   │       └── closing_loc: (5,23)-(5,26) = "end"
-        │   │           │   │   └── operator_loc: (5,12)-(5,14) = "=>"
-        │   │           │   └── @ AssocNode (location: (5,28)-(5,42))
-        │   │           │       ├── key:
-        │   │           │       │   @ SymbolNode (location: (5,28)-(5,30))
-        │   │           │       │   ├── flags: forced_us_ascii_encoding
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── value_loc: (5,28)-(5,29) = "b"
-        │   │           │       │   ├── closing_loc: (5,29)-(5,30) = ":"
-        │   │           │       │   └── unescaped: "b"
-        │   │           │       ├── value:
-        │   │           │       │   @ CallNode (location: (5,31)-(5,42))
-        │   │           │       │   ├── flags: ignore_visibility
-        │   │           │       │   ├── receiver: ∅
-        │   │           │       │   ├── call_operator_loc: ∅
-        │   │           │       │   ├── name: :proc
-        │   │           │       │   ├── message_loc: (5,31)-(5,35) = "proc"
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── arguments: ∅
-        │   │           │       │   ├── closing_loc: ∅
-        │   │           │       │   └── block:
-        │   │           │       │       @ BlockNode (location: (5,36)-(5,42))
-        │   │           │       │       ├── locals: []
-        │   │           │       │       ├── parameters: ∅
-        │   │           │       │       ├── body: ∅
-        │   │           │       │       ├── opening_loc: (5,36)-(5,38) = "do"
-        │   │           │       │       └── closing_loc: (5,39)-(5,42) = "end"
-        │   │           │       └── operator_loc: ∅
-        │   │           └── closing_loc: (5,42)-(5,43) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (7,0)-(7,40))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (7,0)-(7,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,2)-(7,40))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ SymbolNode (location: (7,2)-(7,6))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (7,2)-(7,3) = ":"
-        │   │       │   ├── value_loc: (7,3)-(7,6) = "foo"
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── unescaped: "foo"
-        │   │       └── @ HashNode (location: (7,8)-(7,40))
-        │   │           ├── opening_loc: (7,8)-(7,9) = "{"
-        │   │           ├── elements: (length: 2)
-        │   │           │   ├── @ AssocNode (location: (7,9)-(7,23))
-        │   │           │   │   ├── key:
-        │   │           │   │   │   @ SymbolNode (location: (7,9)-(7,11))
-        │   │           │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │           │   │   │   ├── opening_loc: ∅
-        │   │           │   │   │   ├── value_loc: (7,9)-(7,10) = "a"
-        │   │           │   │   │   ├── closing_loc: (7,10)-(7,11) = ":"
-        │   │           │   │   │   └── unescaped: "a"
-        │   │           │   │   ├── value:
-        │   │           │   │   │   @ CallNode (location: (7,12)-(7,23))
-        │   │           │   │   │   ├── flags: ignore_visibility
-        │   │           │   │   │   ├── receiver: ∅
-        │   │           │   │   │   ├── call_operator_loc: ∅
-        │   │           │   │   │   ├── name: :proc
-        │   │           │   │   │   ├── message_loc: (7,12)-(7,16) = "proc"
-        │   │           │   │   │   ├── opening_loc: ∅
-        │   │           │   │   │   ├── arguments: ∅
-        │   │           │   │   │   ├── closing_loc: ∅
-        │   │           │   │   │   └── block:
-        │   │           │   │   │       @ BlockNode (location: (7,17)-(7,23))
-        │   │           │   │   │       ├── locals: []
-        │   │           │   │   │       ├── parameters: ∅
-        │   │           │   │   │       ├── body: ∅
-        │   │           │   │   │       ├── opening_loc: (7,17)-(7,19) = "do"
-        │   │           │   │   │       └── closing_loc: (7,20)-(7,23) = "end"
-        │   │           │   │   └── operator_loc: ∅
-        │   │           │   └── @ AssocNode (location: (7,25)-(7,39))
-        │   │           │       ├── key:
-        │   │           │       │   @ SymbolNode (location: (7,25)-(7,27))
-        │   │           │       │   ├── flags: forced_us_ascii_encoding
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── value_loc: (7,25)-(7,26) = "b"
-        │   │           │       │   ├── closing_loc: (7,26)-(7,27) = ":"
-        │   │           │       │   └── unescaped: "b"
-        │   │           │       ├── value:
-        │   │           │       │   @ CallNode (location: (7,28)-(7,39))
-        │   │           │       │   ├── flags: ignore_visibility
-        │   │           │       │   ├── receiver: ∅
-        │   │           │       │   ├── call_operator_loc: ∅
-        │   │           │       │   ├── name: :proc
-        │   │           │       │   ├── message_loc: (7,28)-(7,32) = "proc"
-        │   │           │       │   ├── opening_loc: ∅
-        │   │           │       │   ├── arguments: ∅
-        │   │           │       │   ├── closing_loc: ∅
-        │   │           │       │   └── block:
-        │   │           │       │       @ BlockNode (location: (7,33)-(7,39))
-        │   │           │       │       ├── locals: []
-        │   │           │       │       ├── parameters: ∅
-        │   │           │       │       ├── body: ∅
-        │   │           │       │       ├── opening_loc: (7,33)-(7,35) = "do"
-        │   │           │       │       └── closing_loc: (7,36)-(7,39) = "end"
-        │   │           │       └── operator_loc: ∅
-        │   │           └── closing_loc: (7,39)-(7,40) = "}"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (9,0)-(9,52))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (9,0)-(9,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (9,2)-(9,52))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ SymbolNode (location: (9,2)-(9,6))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (9,2)-(9,3) = ":"
-            │       │   ├── value_loc: (9,3)-(9,6) = "foo"
-            │       │   ├── closing_loc: ∅
-            │       │   └── unescaped: "foo"
-            │       └── @ HashNode (location: (9,8)-(9,52))
-            │           ├── opening_loc: (9,8)-(9,9) = "{"
-            │           ├── elements: (length: 2)
-            │           │   ├── @ AssocNode (location: (9,9)-(9,35))
-            │           │   │   ├── key:
-            │           │   │   │   @ CallNode (location: (9,9)-(9,20))
-            │           │   │   │   ├── flags: ignore_visibility
-            │           │   │   │   ├── receiver: ∅
-            │           │   │   │   ├── call_operator_loc: ∅
-            │           │   │   │   ├── name: :proc
-            │           │   │   │   ├── message_loc: (9,9)-(9,13) = "proc"
-            │           │   │   │   ├── opening_loc: ∅
-            │           │   │   │   ├── arguments: ∅
-            │           │   │   │   ├── closing_loc: ∅
-            │           │   │   │   └── block:
-            │           │   │   │       @ BlockNode (location: (9,14)-(9,20))
-            │           │   │   │       ├── locals: []
-            │           │   │   │       ├── parameters: ∅
-            │           │   │   │       ├── body: ∅
-            │           │   │   │       ├── opening_loc: (9,14)-(9,16) = "do"
-            │           │   │   │       └── closing_loc: (9,17)-(9,20) = "end"
-            │           │   │   ├── value:
-            │           │   │   │   @ CallNode (location: (9,24)-(9,35))
-            │           │   │   │   ├── flags: ignore_visibility
-            │           │   │   │   ├── receiver: ∅
-            │           │   │   │   ├── call_operator_loc: ∅
-            │           │   │   │   ├── name: :proc
-            │           │   │   │   ├── message_loc: (9,24)-(9,28) = "proc"
-            │           │   │   │   ├── opening_loc: ∅
-            │           │   │   │   ├── arguments: ∅
-            │           │   │   │   ├── closing_loc: ∅
-            │           │   │   │   └── block:
-            │           │   │   │       @ BlockNode (location: (9,29)-(9,35))
-            │           │   │   │       ├── locals: []
-            │           │   │   │       ├── parameters: ∅
-            │           │   │   │       ├── body: ∅
-            │           │   │   │       ├── opening_loc: (9,29)-(9,31) = "do"
-            │           │   │   │       └── closing_loc: (9,32)-(9,35) = "end"
-            │           │   │   └── operator_loc: (9,21)-(9,23) = "=>"
-            │           │   └── @ AssocNode (location: (9,37)-(9,51))
-            │           │       ├── key:
-            │           │       │   @ SymbolNode (location: (9,37)-(9,39))
-            │           │       │   ├── flags: forced_us_ascii_encoding
-            │           │       │   ├── opening_loc: ∅
-            │           │       │   ├── value_loc: (9,37)-(9,38) = "b"
-            │           │       │   ├── closing_loc: (9,38)-(9,39) = ":"
-            │           │       │   └── unescaped: "b"
-            │           │       ├── value:
-            │           │       │   @ CallNode (location: (9,40)-(9,51))
-            │           │       │   ├── flags: ignore_visibility
-            │           │       │   ├── receiver: ∅
-            │           │       │   ├── call_operator_loc: ∅
-            │           │       │   ├── name: :proc
-            │           │       │   ├── message_loc: (9,40)-(9,44) = "proc"
-            │           │       │   ├── opening_loc: ∅
-            │           │       │   ├── arguments: ∅
-            │           │       │   ├── closing_loc: ∅
-            │           │       │   └── block:
-            │           │       │       @ BlockNode (location: (9,45)-(9,51))
-            │           │       │       ├── locals: []
-            │           │       │       ├── parameters: ∅
-            │           │       │       ├── body: ∅
-            │           │       │       ├── opening_loc: (9,45)-(9,47) = "do"
-            │           │       │       └── closing_loc: (9,48)-(9,51) = "end"
-            │           │       └── operator_loc: ∅
-            │           └── closing_loc: (9,51)-(9,52) = "}"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/bug_heredoc_do.txt b/test/mri/prism/snapshots/whitequark/bug_heredoc_do.txt
deleted file mode 100644
index bf4dd645fbf..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_heredoc_do.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(3,3))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ StringNode (location: (1,2)-(1,10))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (1,2)-(1,10) = "<<-TABLE"
-            │           ├── content_loc: (2,0)-(2,0) = ""
-            │           ├── closing_loc: (2,0)-(3,0) = "TABLE\n"
-            │           └── unescaped: ""
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,11)-(3,3))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,11)-(1,13) = "do"
-                └── closing_loc: (3,0)-(3,3) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/bug_interp_single.txt b/test/mri/prism/snapshots/whitequark/bug_interp_single.txt
deleted file mode 100644
index 6a9d56b519e..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_interp_single.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,8))
-    └── body: (length: 2)
-        ├── @ InterpolatedStringNode (location: (1,0)-(1,6))
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── parts: (length: 1)
-        │   │   └── @ EmbeddedStatementsNode (location: (1,1)-(1,5))
-        │   │       ├── opening_loc: (1,1)-(1,3) = "\#{"
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (1,3)-(1,4))
-        │   │       │   └── body: (length: 1)
-        │   │       │       └── @ IntegerNode (location: (1,3)-(1,4))
-        │   │       │           ├── flags: decimal
-        │   │       │           └── value: 1
-        │   │       └── closing_loc: (1,4)-(1,5) = "}"
-        │   └── closing_loc: (1,5)-(1,6) = "\""
-        └── @ ArrayNode (location: (3,0)-(3,8))
-            ├── flags: ∅
-            ├── elements: (length: 1)
-            │   └── @ InterpolatedStringNode (location: (3,3)-(3,7))
-            │       ├── opening_loc: ∅
-            │       ├── parts: (length: 1)
-            │       │   └── @ EmbeddedStatementsNode (location: (3,3)-(3,7))
-            │       │       ├── opening_loc: (3,3)-(3,5) = "\#{"
-            │       │       ├── statements:
-            │       │       │   @ StatementsNode (location: (3,5)-(3,6))
-            │       │       │   └── body: (length: 1)
-            │       │       │       └── @ IntegerNode (location: (3,5)-(3,6))
-            │       │       │           ├── flags: decimal
-            │       │       │           └── value: 1
-            │       │       └── closing_loc: (3,6)-(3,7) = "}"
-            │       └── closing_loc: ∅
-            ├── opening_loc: (3,0)-(3,3) = "%W\""
-            └── closing_loc: (3,7)-(3,8) = "\""
diff --git a/test/mri/prism/snapshots/whitequark/bug_lambda_leakage.txt b/test/mri/prism/snapshots/whitequark/bug_lambda_leakage.txt
deleted file mode 100644
index 7178345a22e..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_lambda_leakage.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 2)
-        ├── @ LambdaNode (location: (1,0)-(1,12))
-        │   ├── locals: [:scope]
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (1,10)-(1,11) = "{"
-        │   ├── closing_loc: (1,11)-(1,12) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (1,2)-(1,9))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (1,3)-(1,8))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (1,3)-(1,8))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :scope
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (1,2)-(1,3) = "("
-        │   │   └── closing_loc: (1,8)-(1,9) = ")"
-        │   └── body: ∅
-        └── @ CallNode (location: (1,14)-(1,19))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :scope
-            ├── message_loc: (1,14)-(1,19) = "scope"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/bug_regex_verification.txt b/test/mri/prism/snapshots/whitequark/bug_regex_verification.txt
deleted file mode 100644
index 4464b66e38b..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_regex_verification.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ RegularExpressionNode (location: (1,0)-(1,5))
-            ├── flags: extended, forced_us_ascii_encoding
-            ├── opening_loc: (1,0)-(1,1) = "/"
-            ├── content_loc: (1,1)-(1,3) = "#)"
-            ├── closing_loc: (1,3)-(1,5) = "/x"
-            └── unescaped: "#)"
diff --git a/test/mri/prism/snapshots/whitequark/bug_rescue_empty_else.txt b/test/mri/prism/snapshots/whitequark/bug_rescue_empty_else.txt
deleted file mode 100644
index 52734cc1e9c..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_rescue_empty_else.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,34))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,34))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,34))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (1,7)-(1,23))
-            │   ├── keyword_loc: (1,7)-(1,13) = "rescue"
-            │   ├── exceptions: (length: 1)
-            │   │   └── @ ConstantReadNode (location: (1,14)-(1,23))
-            │   │       └── name: :LoadError
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements: ∅
-            │   └── consequent: ∅
-            ├── else_clause:
-            │   @ ElseNode (location: (1,25)-(1,34))
-            │   ├── else_keyword_loc: (1,25)-(1,29) = "else"
-            │   ├── statements: ∅
-            │   └── end_keyword_loc: (1,31)-(1,34) = "end"
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (1,31)-(1,34) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/bug_while_not_parens_do.txt b/test/mri/prism/snapshots/whitequark/bug_while_not_parens_do.txt
deleted file mode 100644
index aa8aa11cccd..00000000000
--- a/test/mri/prism/snapshots/whitequark/bug_while_not_parens_do.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ WhileNode (location: (1,0)-(1,23))
-            ├── flags: ∅
-            ├── keyword_loc: (1,0)-(1,5) = "while"
-            ├── closing_loc: (1,20)-(1,23) = "end"
-            ├── predicate:
-            │   @ CallNode (location: (1,6)-(1,16))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ ParenthesesNode (location: (1,10)-(1,16))
-            │   │   ├── body:
-            │   │   │   @ StatementsNode (location: (1,11)-(1,15))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ TrueNode (location: (1,11)-(1,15))
-            │   │   ├── opening_loc: (1,10)-(1,11) = "("
-            │   │   └── closing_loc: (1,15)-(1,16) = ")"
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :!
-            │   ├── message_loc: (1,6)-(1,9) = "not"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements: ∅
diff --git a/test/mri/prism/snapshots/whitequark/case_cond.txt b/test/mri/prism/snapshots/whitequark/case_cond.txt
deleted file mode 100644
index fbe17eaf8fe..00000000000
--- a/test/mri/prism/snapshots/whitequark/case_cond.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,26))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,26))
-            ├── predicate: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,6)-(1,21))
-            │       ├── keyword_loc: (1,6)-(1,10) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ CallNode (location: (1,11)-(1,14))
-            │       │       ├── flags: variable_call, ignore_visibility
-            │       │       ├── receiver: ∅
-            │       │       ├── call_operator_loc: ∅
-            │       │       ├── name: :foo
-            │       │       ├── message_loc: (1,11)-(1,14) = "foo"
-            │       │       ├── opening_loc: ∅
-            │       │       ├── arguments: ∅
-            │       │       ├── closing_loc: ∅
-            │       │       └── block: ∅
-            │       ├── then_keyword_loc: ∅
-            │       └── statements:
-            │           @ StatementsNode (location: (1,16)-(1,21))
-            │           └── body: (length: 1)
-            │               └── @ StringNode (location: (1,16)-(1,21))
-            │                   ├── flags: ∅
-            │                   ├── opening_loc: (1,16)-(1,17) = "'"
-            │                   ├── content_loc: (1,17)-(1,20) = "foo"
-            │                   ├── closing_loc: (1,20)-(1,21) = "'"
-            │                   └── unescaped: "foo"
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,23)-(1,26) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/case_cond_else.txt b/test/mri/prism/snapshots/whitequark/case_cond_else.txt
deleted file mode 100644
index b1aff2450ee..00000000000
--- a/test/mri/prism/snapshots/whitequark/case_cond_else.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,38))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,38))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,38))
-            ├── predicate: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,6)-(1,21))
-            │       ├── keyword_loc: (1,6)-(1,10) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ CallNode (location: (1,11)-(1,14))
-            │       │       ├── flags: variable_call, ignore_visibility
-            │       │       ├── receiver: ∅
-            │       │       ├── call_operator_loc: ∅
-            │       │       ├── name: :foo
-            │       │       ├── message_loc: (1,11)-(1,14) = "foo"
-            │       │       ├── opening_loc: ∅
-            │       │       ├── arguments: ∅
-            │       │       ├── closing_loc: ∅
-            │       │       └── block: ∅
-            │       ├── then_keyword_loc: ∅
-            │       └── statements:
-            │           @ StatementsNode (location: (1,16)-(1,21))
-            │           └── body: (length: 1)
-            │               └── @ StringNode (location: (1,16)-(1,21))
-            │                   ├── flags: ∅
-            │                   ├── opening_loc: (1,16)-(1,17) = "'"
-            │                   ├── content_loc: (1,17)-(1,20) = "foo"
-            │                   ├── closing_loc: (1,20)-(1,21) = "'"
-            │                   └── unescaped: "foo"
-            ├── consequent:
-            │   @ ElseNode (location: (1,23)-(1,38))
-            │   ├── else_keyword_loc: (1,23)-(1,27) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,28)-(1,33))
-            │   │   └── body: (length: 1)
-            │   │       └── @ StringNode (location: (1,28)-(1,33))
-            │   │           ├── flags: ∅
-            │   │           ├── opening_loc: (1,28)-(1,29) = "'"
-            │   │           ├── content_loc: (1,29)-(1,32) = "bar"
-            │   │           ├── closing_loc: (1,32)-(1,33) = "'"
-            │   │           └── unescaped: "bar"
-            │   └── end_keyword_loc: (1,35)-(1,38) = "end"
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,35)-(1,38) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/case_expr.txt b/test/mri/prism/snapshots/whitequark/case_expr.txt
deleted file mode 100644
index 23054ed132b..00000000000
--- a/test/mri/prism/snapshots/whitequark/case_expr.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,30))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,30))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,30))
-            ├── predicate:
-            │   @ CallNode (location: (1,5)-(1,8))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,5)-(1,8) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,10)-(1,25))
-            │       ├── keyword_loc: (1,10)-(1,14) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ StringNode (location: (1,15)-(1,20))
-            │       │       ├── flags: frozen
-            │       │       ├── opening_loc: (1,15)-(1,16) = "'"
-            │       │       ├── content_loc: (1,16)-(1,19) = "bar"
-            │       │       ├── closing_loc: (1,19)-(1,20) = "'"
-            │       │       └── unescaped: "bar"
-            │       ├── then_keyword_loc: ∅
-            │       └── statements:
-            │           @ StatementsNode (location: (1,22)-(1,25))
-            │           └── body: (length: 1)
-            │               └── @ CallNode (location: (1,22)-(1,25))
-            │                   ├── flags: variable_call, ignore_visibility
-            │                   ├── receiver: ∅
-            │                   ├── call_operator_loc: ∅
-            │                   ├── name: :bar
-            │                   ├── message_loc: (1,22)-(1,25) = "bar"
-            │                   ├── opening_loc: ∅
-            │                   ├── arguments: ∅
-            │                   ├── closing_loc: ∅
-            │                   └── block: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,27)-(1,30) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/case_expr_else.txt b/test/mri/prism/snapshots/whitequark/case_expr_else.txt
deleted file mode 100644
index 0624d97c84d..00000000000
--- a/test/mri/prism/snapshots/whitequark/case_expr_else.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,40))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,40))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,40))
-            ├── predicate:
-            │   @ CallNode (location: (1,5)-(1,8))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,5)-(1,8) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,10)-(1,25))
-            │       ├── keyword_loc: (1,10)-(1,14) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ StringNode (location: (1,15)-(1,20))
-            │       │       ├── flags: frozen
-            │       │       ├── opening_loc: (1,15)-(1,16) = "'"
-            │       │       ├── content_loc: (1,16)-(1,19) = "bar"
-            │       │       ├── closing_loc: (1,19)-(1,20) = "'"
-            │       │       └── unescaped: "bar"
-            │       ├── then_keyword_loc: ∅
-            │       └── statements:
-            │           @ StatementsNode (location: (1,22)-(1,25))
-            │           └── body: (length: 1)
-            │               └── @ CallNode (location: (1,22)-(1,25))
-            │                   ├── flags: variable_call, ignore_visibility
-            │                   ├── receiver: ∅
-            │                   ├── call_operator_loc: ∅
-            │                   ├── name: :bar
-            │                   ├── message_loc: (1,22)-(1,25) = "bar"
-            │                   ├── opening_loc: ∅
-            │                   ├── arguments: ∅
-            │                   ├── closing_loc: ∅
-            │                   └── block: ∅
-            ├── consequent:
-            │   @ ElseNode (location: (1,27)-(1,40))
-            │   ├── else_keyword_loc: (1,27)-(1,31) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,32)-(1,35))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,32)-(1,35))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :baz
-            │   │           ├── message_loc: (1,32)-(1,35) = "baz"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (1,37)-(1,40) = "end"
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,37)-(1,40) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/casgn_scoped.txt b/test/mri/prism/snapshots/whitequark/casgn_scoped.txt
deleted file mode 100644
index 4e3fd6fe446..00000000000
--- a/test/mri/prism/snapshots/whitequark/casgn_scoped.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ ConstantPathWriteNode (location: (1,0)-(1,13))
-            ├── target:
-            │   @ ConstantPathNode (location: (1,0)-(1,8))
-            │   ├── parent:
-            │   │   @ ConstantReadNode (location: (1,0)-(1,3))
-            │   │   └── name: :Bar
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,5)-(1,8))
-            │   │   └── name: :Foo
-            │   └── delimiter_loc: (1,3)-(1,5) = "::"
-            ├── operator_loc: (1,9)-(1,10) = "="
-            └── value:
-                @ IntegerNode (location: (1,11)-(1,13))
-                ├── flags: decimal
-                └── value: 10
diff --git a/test/mri/prism/snapshots/whitequark/casgn_toplevel.txt b/test/mri/prism/snapshots/whitequark/casgn_toplevel.txt
deleted file mode 100644
index 11facfefb36..00000000000
--- a/test/mri/prism/snapshots/whitequark/casgn_toplevel.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ ConstantPathWriteNode (location: (1,0)-(1,10))
-            ├── target:
-            │   @ ConstantPathNode (location: (1,0)-(1,5))
-            │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,2)-(1,5))
-            │   │   └── name: :Foo
-            │   └── delimiter_loc: (1,0)-(1,2) = "::"
-            ├── operator_loc: (1,6)-(1,7) = "="
-            └── value:
-                @ IntegerNode (location: (1,8)-(1,10))
-                ├── flags: decimal
-                └── value: 10
diff --git a/test/mri/prism/snapshots/whitequark/casgn_unscoped.txt b/test/mri/prism/snapshots/whitequark/casgn_unscoped.txt
deleted file mode 100644
index f535cafdc63..00000000000
--- a/test/mri/prism/snapshots/whitequark/casgn_unscoped.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ ConstantWriteNode (location: (1,0)-(1,8))
-            ├── name: :Foo
-            ├── name_loc: (1,0)-(1,3) = "Foo"
-            ├── value:
-            │   @ IntegerNode (location: (1,6)-(1,8))
-            │   ├── flags: decimal
-            │   └── value: 10
-            └── operator_loc: (1,4)-(1,5) = "="
diff --git a/test/mri/prism/snapshots/whitequark/character.txt b/test/mri/prism/snapshots/whitequark/character.txt
deleted file mode 100644
index b70f05b5445..00000000000
--- a/test/mri/prism/snapshots/whitequark/character.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,2))
-    └── body: (length: 1)
-        └── @ StringNode (location: (1,0)-(1,2))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,1) = "?"
-            ├── content_loc: (1,1)-(1,2) = "a"
-            ├── closing_loc: ∅
-            └── unescaped: "a"
diff --git a/test/mri/prism/snapshots/whitequark/class.txt b/test/mri/prism/snapshots/whitequark/class.txt
deleted file mode 100644
index e38bec6c476..00000000000
--- a/test/mri/prism/snapshots/whitequark/class.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,14))
-    └── body: (length: 2)
-        ├── @ ClassNode (location: (1,0)-(1,13))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (1,0)-(1,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (1,6)-(1,9))
-        │   │   └── name: :Foo
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (1,10)-(1,13) = "end"
-        │   └── name: :Foo
-        └── @ ClassNode (location: (3,0)-(3,14))
-            ├── locals: []
-            ├── class_keyword_loc: (3,0)-(3,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (3,6)-(3,9))
-            │   └── name: :Foo
-            ├── inheritance_operator_loc: ∅
-            ├── superclass: ∅
-            ├── body: ∅
-            ├── end_keyword_loc: (3,11)-(3,14) = "end"
-            └── name: :Foo
diff --git a/test/mri/prism/snapshots/whitequark/class_definition_in_while_cond.txt b/test/mri/prism/snapshots/whitequark/class_definition_in_while_cond.txt
deleted file mode 100644
index c02c88e79bf..00000000000
--- a/test/mri/prism/snapshots/whitequark/class_definition_in_while_cond.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,44))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,44))
-    └── body: (length: 4)
-        ├── @ WhileNode (location: (1,0)-(1,52))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (1,0)-(1,5) = "while"
-        │   ├── closing_loc: (1,49)-(1,52) = "end"
-        │   ├── predicate:
-        │   │   @ SingletonClassNode (location: (1,6)-(1,40))
-        │   │   ├── locals: [:a]
-        │   │   ├── class_keyword_loc: (1,6)-(1,11) = "class"
-        │   │   ├── operator_loc: (1,12)-(1,14) = "<<"
-        │   │   ├── expression:
-        │   │   │   @ SelfNode (location: (1,15)-(1,19))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (1,21)-(1,35))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableWriteNode (location: (1,21)-(1,35))
-        │   │   │           ├── name: :a
-        │   │   │           ├── depth: 0
-        │   │   │           ├── name_loc: (1,21)-(1,22) = "a"
-        │   │   │           ├── value:
-        │   │   │           │   @ CallNode (location: (1,25)-(1,35))
-        │   │   │           │   ├── flags: ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :tap
-        │   │   │           │   ├── message_loc: (1,25)-(1,28) = "tap"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block:
-        │   │   │           │       @ BlockNode (location: (1,29)-(1,35))
-        │   │   │           │       ├── locals: []
-        │   │   │           │       ├── parameters: ∅
-        │   │   │           │       ├── body: ∅
-        │   │   │           │       ├── opening_loc: (1,29)-(1,31) = "do"
-        │   │   │           │       └── closing_loc: (1,32)-(1,35) = "end"
-        │   │   │           └── operator_loc: (1,23)-(1,24) = "="
-        │   │   └── end_keyword_loc: (1,37)-(1,40) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (1,42)-(1,47))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (1,42)-(1,47))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (1,42)-(1,47) = "break"
-        ├── @ WhileNode (location: (3,0)-(3,48))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (3,0)-(3,5) = "while"
-        │   ├── closing_loc: (3,45)-(3,48) = "end"
-        │   ├── predicate:
-        │   │   @ SingletonClassNode (location: (3,6)-(3,36))
-        │   │   ├── locals: []
-        │   │   ├── class_keyword_loc: (3,6)-(3,11) = "class"
-        │   │   ├── operator_loc: (3,12)-(3,14) = "<<"
-        │   │   ├── expression:
-        │   │   │   @ SelfNode (location: (3,15)-(3,19))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (3,21)-(3,31))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (3,21)-(3,31))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :tap
-        │   │   │           ├── message_loc: (3,21)-(3,24) = "tap"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block:
-        │   │   │               @ BlockNode (location: (3,25)-(3,31))
-        │   │   │               ├── locals: []
-        │   │   │               ├── parameters: ∅
-        │   │   │               ├── body: ∅
-        │   │   │               ├── opening_loc: (3,25)-(3,27) = "do"
-        │   │   │               └── closing_loc: (3,28)-(3,31) = "end"
-        │   │   └── end_keyword_loc: (3,33)-(3,36) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (3,38)-(3,43))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (3,38)-(3,43))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (3,38)-(3,43) = "break"
-        ├── @ WhileNode (location: (5,0)-(5,47))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (5,0)-(5,5) = "while"
-        │   ├── closing_loc: (5,44)-(5,47) = "end"
-        │   ├── predicate:
-        │   │   @ ClassNode (location: (5,6)-(5,35))
-        │   │   ├── locals: [:a]
-        │   │   ├── class_keyword_loc: (5,6)-(5,11) = "class"
-        │   │   ├── constant_path:
-        │   │   │   @ ConstantReadNode (location: (5,12)-(5,15))
-        │   │   │   └── name: :Foo
-        │   │   ├── inheritance_operator_loc: ∅
-        │   │   ├── superclass: ∅
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (5,16)-(5,30))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableWriteNode (location: (5,16)-(5,30))
-        │   │   │           ├── name: :a
-        │   │   │           ├── depth: 0
-        │   │   │           ├── name_loc: (5,16)-(5,17) = "a"
-        │   │   │           ├── value:
-        │   │   │           │   @ CallNode (location: (5,20)-(5,30))
-        │   │   │           │   ├── flags: ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :tap
-        │   │   │           │   ├── message_loc: (5,20)-(5,23) = "tap"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block:
-        │   │   │           │       @ BlockNode (location: (5,24)-(5,30))
-        │   │   │           │       ├── locals: []
-        │   │   │           │       ├── parameters: ∅
-        │   │   │           │       ├── body: ∅
-        │   │   │           │       ├── opening_loc: (5,24)-(5,26) = "do"
-        │   │   │           │       └── closing_loc: (5,27)-(5,30) = "end"
-        │   │   │           └── operator_loc: (5,18)-(5,19) = "="
-        │   │   ├── end_keyword_loc: (5,32)-(5,35) = "end"
-        │   │   └── name: :Foo
-        │   └── statements:
-        │       @ StatementsNode (location: (5,37)-(5,42))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (5,37)-(5,42))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (5,37)-(5,42) = "break"
-        └── @ WhileNode (location: (7,0)-(7,44))
-            ├── flags: ∅
-            ├── keyword_loc: (7,0)-(7,5) = "while"
-            ├── closing_loc: (7,41)-(7,44) = "end"
-            ├── predicate:
-            │   @ ClassNode (location: (7,6)-(7,32))
-            │   ├── locals: []
-            │   ├── class_keyword_loc: (7,6)-(7,11) = "class"
-            │   ├── constant_path:
-            │   │   @ ConstantReadNode (location: (7,12)-(7,15))
-            │   │   └── name: :Foo
-            │   ├── inheritance_operator_loc: ∅
-            │   ├── superclass: ∅
-            │   ├── body:
-            │   │   @ StatementsNode (location: (7,17)-(7,27))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (7,17)-(7,27))
-            │   │           ├── flags: ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :tap
-            │   │           ├── message_loc: (7,17)-(7,20) = "tap"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block:
-            │   │               @ BlockNode (location: (7,21)-(7,27))
-            │   │               ├── locals: []
-            │   │               ├── parameters: ∅
-            │   │               ├── body: ∅
-            │   │               ├── opening_loc: (7,21)-(7,23) = "do"
-            │   │               └── closing_loc: (7,24)-(7,27) = "end"
-            │   ├── end_keyword_loc: (7,29)-(7,32) = "end"
-            │   └── name: :Foo
-            └── statements:
-                @ StatementsNode (location: (7,34)-(7,39))
-                └── body: (length: 1)
-                    └── @ BreakNode (location: (7,34)-(7,39))
-                        ├── arguments: ∅
-                        └── keyword_loc: (7,34)-(7,39) = "break"
diff --git a/test/mri/prism/snapshots/whitequark/class_super.txt b/test/mri/prism/snapshots/whitequark/class_super.txt
deleted file mode 100644
index ea8bbd70d9d..00000000000
--- a/test/mri/prism/snapshots/whitequark/class_super.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ ClassNode (location: (1,0)-(1,20))
-            ├── locals: []
-            ├── class_keyword_loc: (1,0)-(1,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (1,6)-(1,9))
-            │   └── name: :Foo
-            ├── inheritance_operator_loc: (1,10)-(1,11) = "<"
-            ├── superclass:
-            │   @ ConstantReadNode (location: (1,12)-(1,15))
-            │   └── name: :Bar
-            ├── body: ∅
-            ├── end_keyword_loc: (1,17)-(1,20) = "end"
-            └── name: :Foo
diff --git a/test/mri/prism/snapshots/whitequark/class_super_label.txt b/test/mri/prism/snapshots/whitequark/class_super_label.txt
deleted file mode 100644
index c873ea0c125..00000000000
--- a/test/mri/prism/snapshots/whitequark/class_super_label.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ ClassNode (location: (1,0)-(1,20))
-            ├── locals: []
-            ├── class_keyword_loc: (1,0)-(1,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (1,6)-(1,9))
-            │   └── name: :Foo
-            ├── inheritance_operator_loc: (1,10)-(1,11) = "<"
-            ├── superclass:
-            │   @ CallNode (location: (1,12)-(1,15))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,12)-(1,13) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,13)-(1,15))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ SymbolNode (location: (1,13)-(1,15))
-            │   │           ├── flags: forced_us_ascii_encoding
-            │   │           ├── opening_loc: (1,13)-(1,14) = ":"
-            │   │           ├── value_loc: (1,14)-(1,15) = "b"
-            │   │           ├── closing_loc: ∅
-            │   │           └── unescaped: "b"
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── end_keyword_loc: (1,17)-(1,20) = "end"
-            └── name: :Foo
diff --git a/test/mri/prism/snapshots/whitequark/comments_before_leading_dot__27.txt b/test/mri/prism/snapshots/whitequark/comments_before_leading_dot__27.txt
deleted file mode 100644
index e33f798ef58..00000000000
--- a/test/mri/prism/snapshots/whitequark/comments_before_leading_dot__27.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-@ ProgramNode (location: (1,0)-(18,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(18,4))
-    └── body: (length: 4)
-        ├── @ CallNode (location: (1,0)-(3,5))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (3,0)-(3,2) = "&."
-        │   ├── name: :foo
-        │   ├── message_loc: (3,2)-(3,5) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (6,0)-(8,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (6,0)-(6,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (6,0)-(6,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (8,0)-(8,1) = "."
-        │   ├── name: :foo
-        │   ├── message_loc: (8,1)-(8,4) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (11,0)-(13,5))
-        │   ├── flags: safe_navigation
-        │   ├── receiver:
-        │   │   @ CallNode (location: (11,0)-(11,1))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :a
-        │   │   ├── message_loc: (11,0)-(11,1) = "a"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (13,0)-(13,2) = "&."
-        │   ├── name: :foo
-        │   ├── message_loc: (13,2)-(13,5) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (16,0)-(18,4))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (16,0)-(16,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (16,0)-(16,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (18,0)-(18,1) = "."
-            ├── name: :foo
-            ├── message_loc: (18,1)-(18,4) = "foo"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/complex.txt b/test/mri/prism/snapshots/whitequark/complex.txt
deleted file mode 100644
index e688585a5f9..00000000000
--- a/test/mri/prism/snapshots/whitequark/complex.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,4))
-    └── body: (length: 4)
-        ├── @ ImaginaryNode (location: (1,0)-(1,5))
-        │   └── numeric:
-        │       @ FloatNode (location: (1,0)-(1,4))
-        │       └── value: 42.1
-        ├── @ ImaginaryNode (location: (3,0)-(3,6))
-        │   └── numeric:
-        │       @ RationalNode (location: (3,0)-(3,5))
-        │       └── numeric:
-        │           @ FloatNode (location: (3,0)-(3,4))
-        │           └── value: 42.1
-        ├── @ ImaginaryNode (location: (5,0)-(5,3))
-        │   └── numeric:
-        │       @ IntegerNode (location: (5,0)-(5,2))
-        │       ├── flags: decimal
-        │       └── value: 42
-        └── @ ImaginaryNode (location: (7,0)-(7,4))
-            └── numeric:
-                @ RationalNode (location: (7,0)-(7,3))
-                └── numeric:
-                    @ IntegerNode (location: (7,0)-(7,2))
-                    ├── flags: decimal
-                    └── value: 42
diff --git a/test/mri/prism/snapshots/whitequark/cond_begin.txt b/test/mri/prism/snapshots/whitequark/cond_begin.txt
deleted file mode 100644
index e349c198a56..00000000000
--- a/test/mri/prism/snapshots/whitequark/cond_begin.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,18))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ ParenthesesNode (location: (1,3)-(1,8))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (1,4)-(1,7))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,4)-(1,7))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (1,4)-(1,7) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── opening_loc: (1,3)-(1,4) = "("
-            │   └── closing_loc: (1,7)-(1,8) = ")"
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (1,10)-(1,13))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,10)-(1,13))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (1,10)-(1,13) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (1,15)-(1,18) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/cond_begin_masgn.txt b/test/mri/prism/snapshots/whitequark/cond_begin_masgn.txt
deleted file mode 100644
index b4e6d8682cd..00000000000
--- a/test/mri/prism/snapshots/whitequark/cond_begin_masgn.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,25))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ ParenthesesNode (location: (1,3)-(1,20))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (1,4)-(1,19))
-            │   │   └── body: (length: 2)
-            │   │       ├── @ CallNode (location: (1,4)-(1,7))
-            │   │       │   ├── flags: variable_call, ignore_visibility
-            │   │       │   ├── receiver: ∅
-            │   │       │   ├── call_operator_loc: ∅
-            │   │       │   ├── name: :bar
-            │   │       │   ├── message_loc: (1,4)-(1,7) = "bar"
-            │   │       │   ├── opening_loc: ∅
-            │   │       │   ├── arguments: ∅
-            │   │       │   ├── closing_loc: ∅
-            │   │       │   └── block: ∅
-            │   │       └── @ MultiWriteNode (location: (1,9)-(1,19))
-            │   │           ├── lefts: (length: 2)
-            │   │           │   ├── @ LocalVariableTargetNode (location: (1,9)-(1,10))
-            │   │           │   │   ├── name: :a
-            │   │           │   │   └── depth: 0
-            │   │           │   └── @ LocalVariableTargetNode (location: (1,12)-(1,13))
-            │   │           │       ├── name: :b
-            │   │           │       └── depth: 0
-            │   │           ├── rest: ∅
-            │   │           ├── rights: (length: 0)
-            │   │           ├── lparen_loc: ∅
-            │   │           ├── rparen_loc: ∅
-            │   │           ├── operator_loc: (1,14)-(1,15) = "="
-            │   │           └── value:
-            │   │               @ CallNode (location: (1,16)-(1,19))
-            │   │               ├── flags: variable_call, ignore_visibility
-            │   │               ├── receiver: ∅
-            │   │               ├── call_operator_loc: ∅
-            │   │               ├── name: :foo
-            │   │               ├── message_loc: (1,16)-(1,19) = "foo"
-            │   │               ├── opening_loc: ∅
-            │   │               ├── arguments: ∅
-            │   │               ├── closing_loc: ∅
-            │   │               └── block: ∅
-            │   ├── opening_loc: (1,3)-(1,4) = "("
-            │   └── closing_loc: (1,19)-(1,20) = ")"
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (1,22)-(1,25) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/cond_eflipflop.txt b/test/mri/prism/snapshots/whitequark/cond_eflipflop.txt
deleted file mode 100644
index 18fee58492e..00000000000
--- a/test/mri/prism/snapshots/whitequark/cond_eflipflop.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,17))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,12))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (1,1)-(1,12))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (1,2)-(1,11))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ FlipFlopNode (location: (1,2)-(1,11))
-        │   │   │           ├── flags: exclude_end
-        │   │   │           ├── left:
-        │   │   │           │   @ CallNode (location: (1,2)-(1,5))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :foo
-        │   │   │           │   ├── message_loc: (1,2)-(1,5) = "foo"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── right:
-        │   │   │           │   @ CallNode (location: (1,8)-(1,11))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :bar
-        │   │   │           │   ├── message_loc: (1,8)-(1,11) = "bar"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           └── operator_loc: (1,5)-(1,8) = "..."
-        │   │   ├── opening_loc: (1,1)-(1,2) = "("
-        │   │   └── closing_loc: (1,11)-(1,12) = ")"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (1,0)-(1,1) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ IfNode (location: (3,0)-(3,17))
-            ├── if_keyword_loc: (3,0)-(3,2) = "if"
-            ├── predicate:
-            │   @ FlipFlopNode (location: (3,3)-(3,12))
-            │   ├── flags: exclude_end
-            │   ├── left:
-            │   │   @ CallNode (location: (3,3)-(3,6))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :foo
-            │   │   ├── message_loc: (3,3)-(3,6) = "foo"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── right:
-            │   │   @ CallNode (location: (3,9)-(3,12))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :bar
-            │   │   ├── message_loc: (3,9)-(3,12) = "bar"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   └── operator_loc: (3,6)-(3,9) = "..."
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (3,14)-(3,17) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/cond_iflipflop.txt b/test/mri/prism/snapshots/whitequark/cond_iflipflop.txt
deleted file mode 100644
index f76a6636f64..00000000000
--- a/test/mri/prism/snapshots/whitequark/cond_iflipflop.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,16))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (1,1)-(1,11))
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (1,2)-(1,10))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ FlipFlopNode (location: (1,2)-(1,10))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── left:
-        │   │   │           │   @ CallNode (location: (1,2)-(1,5))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :foo
-        │   │   │           │   ├── message_loc: (1,2)-(1,5) = "foo"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           ├── right:
-        │   │   │           │   @ CallNode (location: (1,7)-(1,10))
-        │   │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │   │           │   ├── receiver: ∅
-        │   │   │           │   ├── call_operator_loc: ∅
-        │   │   │           │   ├── name: :bar
-        │   │   │           │   ├── message_loc: (1,7)-(1,10) = "bar"
-        │   │   │           │   ├── opening_loc: ∅
-        │   │   │           │   ├── arguments: ∅
-        │   │   │           │   ├── closing_loc: ∅
-        │   │   │           │   └── block: ∅
-        │   │   │           └── operator_loc: (1,5)-(1,7) = ".."
-        │   │   ├── opening_loc: (1,1)-(1,2) = "("
-        │   │   └── closing_loc: (1,10)-(1,11) = ")"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (1,0)-(1,1) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ IfNode (location: (3,0)-(3,16))
-            ├── if_keyword_loc: (3,0)-(3,2) = "if"
-            ├── predicate:
-            │   @ FlipFlopNode (location: (3,3)-(3,11))
-            │   ├── flags: ∅
-            │   ├── left:
-            │   │   @ CallNode (location: (3,3)-(3,6))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :foo
-            │   │   ├── message_loc: (3,3)-(3,6) = "foo"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── right:
-            │   │   @ CallNode (location: (3,8)-(3,11))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :bar
-            │   │   ├── message_loc: (3,8)-(3,11) = "bar"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   └── operator_loc: (3,6)-(3,8) = ".."
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (3,13)-(3,16) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/cond_match_current_line.txt b/test/mri/prism/snapshots/whitequark/cond_match_current_line.txt
deleted file mode 100644
index 700d0966f7c..00000000000
--- a/test/mri/prism/snapshots/whitequark/cond_match_current_line.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,13))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,6))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ MatchLastLineNode (location: (1,1)-(1,6))
-        │   │   ├── flags: forced_us_ascii_encoding
-        │   │   ├── opening_loc: (1,1)-(1,2) = "/"
-        │   │   ├── content_loc: (1,2)-(1,5) = "wat"
-        │   │   ├── closing_loc: (1,5)-(1,6) = "/"
-        │   │   └── unescaped: "wat"
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (1,0)-(1,1) = "!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ IfNode (location: (3,0)-(3,13))
-            ├── if_keyword_loc: (3,0)-(3,2) = "if"
-            ├── predicate:
-            │   @ MatchLastLineNode (location: (3,3)-(3,8))
-            │   ├── flags: forced_us_ascii_encoding
-            │   ├── opening_loc: (3,3)-(3,4) = "/"
-            │   ├── content_loc: (3,4)-(3,7) = "wat"
-            │   ├── closing_loc: (3,7)-(3,8) = "/"
-            │   └── unescaped: "wat"
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (3,10)-(3,13) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/const_op_asgn.txt b/test/mri/prism/snapshots/whitequark/const_op_asgn.txt
deleted file mode 100644
index 4985f3e54b9..00000000000
--- a/test/mri/prism/snapshots/whitequark/const_op_asgn.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,25))
-    └── body: (length: 5)
-        ├── @ ConstantPathOperatorWriteNode (location: (1,0)-(1,8))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (1,0)-(1,3))
-        │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (1,0)-(1,2) = "::"
-        │   ├── operator_loc: (1,4)-(1,6) = "+="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,7)-(1,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator: :+
-        ├── @ ConstantOperatorWriteNode (location: (3,0)-(3,6))
-        │   ├── name: :A
-        │   ├── name_loc: (3,0)-(3,1) = "A"
-        │   ├── operator_loc: (3,2)-(3,4) = "+="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (3,5)-(3,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator: :+
-        ├── @ ConstantPathOperatorWriteNode (location: (5,0)-(5,9))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (5,0)-(5,4))
-        │   │   ├── parent:
-        │   │   │   @ ConstantReadNode (location: (5,0)-(5,1))
-        │   │   │   └── name: :B
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,3)-(5,4))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (5,1)-(5,3) = "::"
-        │   ├── operator_loc: (5,5)-(5,7) = "+="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (5,8)-(5,9))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator: :+
-        ├── @ DefNode (location: (7,0)-(7,21))
-        │   ├── name: :x
-        │   ├── name_loc: (7,4)-(7,5) = "x"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (7,7)-(7,16))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ConstantPathOrWriteNode (location: (7,7)-(7,16))
-        │   │           ├── target:
-        │   │           │   @ ConstantPathNode (location: (7,7)-(7,10))
-        │   │           │   ├── parent: ∅
-        │   │           │   ├── child:
-        │   │           │   │   @ ConstantReadNode (location: (7,9)-(7,10))
-        │   │           │   │   └── name: :A
-        │   │           │   └── delimiter_loc: (7,7)-(7,9) = "::"
-        │   │           ├── operator_loc: (7,11)-(7,14) = "||="
-        │   │           └── value:
-        │   │               @ IntegerNode (location: (7,15)-(7,16))
-        │   │               ├── flags: decimal
-        │   │               └── value: 1
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (7,18)-(7,21) = "end"
-        └── @ DefNode (location: (9,0)-(9,25))
-            ├── name: :x
-            ├── name_loc: (9,4)-(9,5) = "x"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (9,7)-(9,20))
-            │   └── body: (length: 1)
-            │       └── @ ConstantPathOrWriteNode (location: (9,7)-(9,20))
-            │           ├── target:
-            │           │   @ ConstantPathNode (location: (9,7)-(9,14))
-            │           │   ├── parent:
-            │           │   │   @ SelfNode (location: (9,7)-(9,11))
-            │           │   ├── child:
-            │           │   │   @ ConstantReadNode (location: (9,13)-(9,14))
-            │           │   │   └── name: :A
-            │           │   └── delimiter_loc: (9,11)-(9,13) = "::"
-            │           ├── operator_loc: (9,15)-(9,18) = "||="
-            │           └── value:
-            │               @ IntegerNode (location: (9,19)-(9,20))
-            │               ├── flags: decimal
-            │               └── value: 1
-            ├── locals: []
-            ├── def_keyword_loc: (9,0)-(9,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (9,22)-(9,25) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/const_scoped.txt b/test/mri/prism/snapshots/whitequark/const_scoped.txt
deleted file mode 100644
index 1e2bccef968..00000000000
--- a/test/mri/prism/snapshots/whitequark/const_scoped.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ ConstantPathNode (location: (1,0)-(1,8))
-            ├── parent:
-            │   @ ConstantReadNode (location: (1,0)-(1,3))
-            │   └── name: :Bar
-            ├── child:
-            │   @ ConstantReadNode (location: (1,5)-(1,8))
-            │   └── name: :Foo
-            └── delimiter_loc: (1,3)-(1,5) = "::"
diff --git a/test/mri/prism/snapshots/whitequark/const_toplevel.txt b/test/mri/prism/snapshots/whitequark/const_toplevel.txt
deleted file mode 100644
index b54b069d06b..00000000000
--- a/test/mri/prism/snapshots/whitequark/const_toplevel.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ ConstantPathNode (location: (1,0)-(1,5))
-            ├── parent: ∅
-            ├── child:
-            │   @ ConstantReadNode (location: (1,2)-(1,5))
-            │   └── name: :Foo
-            └── delimiter_loc: (1,0)-(1,2) = "::"
diff --git a/test/mri/prism/snapshots/whitequark/const_unscoped.txt b/test/mri/prism/snapshots/whitequark/const_unscoped.txt
deleted file mode 100644
index 5e272e1775d..00000000000
--- a/test/mri/prism/snapshots/whitequark/const_unscoped.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ ConstantReadNode (location: (1,0)-(1,3))
-            └── name: :Foo
diff --git a/test/mri/prism/snapshots/whitequark/cpath.txt b/test/mri/prism/snapshots/whitequark/cpath.txt
deleted file mode 100644
index b8925256461..00000000000
--- a/test/mri/prism/snapshots/whitequark/cpath.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,20))
-    └── body: (length: 2)
-        ├── @ ModuleNode (location: (1,0)-(1,17))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (1,0)-(1,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (1,7)-(1,12))
-        │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (1,9)-(1,12))
-        │   │   │   └── name: :Foo
-        │   │   └── delimiter_loc: (1,7)-(1,9) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (1,14)-(1,17) = "end"
-        │   └── name: :Foo
-        └── @ ModuleNode (location: (3,0)-(3,20))
-            ├── locals: []
-            ├── module_keyword_loc: (3,0)-(3,6) = "module"
-            ├── constant_path:
-            │   @ ConstantPathNode (location: (3,7)-(3,15))
-            │   ├── parent:
-            │   │   @ ConstantReadNode (location: (3,7)-(3,10))
-            │   │   └── name: :Bar
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (3,12)-(3,15))
-            │   │   └── name: :Foo
-            │   └── delimiter_loc: (3,10)-(3,12) = "::"
-            ├── body: ∅
-            ├── end_keyword_loc: (3,17)-(3,20) = "end"
-            └── name: :Foo
diff --git a/test/mri/prism/snapshots/whitequark/cvar.txt b/test/mri/prism/snapshots/whitequark/cvar.txt
deleted file mode 100644
index 7847ce44954..00000000000
--- a/test/mri/prism/snapshots/whitequark/cvar.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ ClassVariableReadNode (location: (1,0)-(1,5))
-            └── name: :@@foo
diff --git a/test/mri/prism/snapshots/whitequark/cvasgn.txt b/test/mri/prism/snapshots/whitequark/cvasgn.txt
deleted file mode 100644
index f3eceed4a47..00000000000
--- a/test/mri/prism/snapshots/whitequark/cvasgn.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ ClassVariableWriteNode (location: (1,0)-(1,10))
-            ├── name: :@@var
-            ├── name_loc: (1,0)-(1,5) = "@@var"
-            ├── value:
-            │   @ IntegerNode (location: (1,8)-(1,10))
-            │   ├── flags: decimal
-            │   └── value: 10
-            └── operator_loc: (1,6)-(1,7) = "="
diff --git a/test/mri/prism/snapshots/whitequark/dedenting_heredoc.txt b/test/mri/prism/snapshots/whitequark/dedenting_heredoc.txt
deleted file mode 100644
index 49c44549151..00000000000
--- a/test/mri/prism/snapshots/whitequark/dedenting_heredoc.txt
+++ /dev/null
@@ -1,485 +0,0 @@
-@ ProgramNode (location: (1,0)-(72,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(72,8))
-    └── body: (length: 16)
-        ├── @ CallNode (location: (1,0)-(1,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (1,0)-(1,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (1,2)-(1,8))
-        │   │           ├── opening_loc: (1,2)-(1,8) = "<<~\"E\""
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (2,0)-(3,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (2,0)-(3,0) = "    x\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  x\n"
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (3,2)-(3,10))
-        │   │           │   │   ├── opening_loc: (3,2)-(3,4) = "\#{"
-        │   │           │   │   ├── statements:
-        │   │           │   │   │   @ StatementsNode (location: (3,4)-(3,9))
-        │   │           │   │   │   └── body: (length: 1)
-        │   │           │   │   │       └── @ StringNode (location: (3,4)-(3,9))
-        │   │           │   │   │           ├── flags: ∅
-        │   │           │   │   │           ├── opening_loc: (3,4)-(3,5) = "\""
-        │   │           │   │   │           ├── content_loc: (3,5)-(3,8) = "  y"
-        │   │           │   │   │           ├── closing_loc: (3,8)-(3,9) = "\""
-        │   │           │   │   │           └── unescaped: "  y"
-        │   │           │   │   └── closing_loc: (3,9)-(3,10) = "}"
-        │   │           │   └── @ StringNode (location: (3,10)-(4,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (3,10)-(4,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (4,0)-(5,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (6,0)-(6,8))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (6,0)-(6,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (6,2)-(6,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (6,2)-(6,8))
-        │   │           ├── opening_loc: (6,2)-(6,8) = "<<~\"E\""
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (7,0)-(8,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (7,0)-(8,0) = "    x\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  x\n"
-        │   │           │   ├── @ EmbeddedStatementsNode (location: (8,2)-(8,8))
-        │   │           │   │   ├── opening_loc: (8,2)-(8,4) = "\#{"
-        │   │           │   │   ├── statements:
-        │   │           │   │   │   @ StatementsNode (location: (8,4)-(8,7))
-        │   │           │   │   │   └── body: (length: 1)
-        │   │           │   │   │       └── @ CallNode (location: (8,4)-(8,7))
-        │   │           │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │           │   │   │           ├── receiver: ∅
-        │   │           │   │   │           ├── call_operator_loc: ∅
-        │   │           │   │   │           ├── name: :foo
-        │   │           │   │   │           ├── message_loc: (8,4)-(8,7) = "foo"
-        │   │           │   │   │           ├── opening_loc: ∅
-        │   │           │   │   │           ├── arguments: ∅
-        │   │           │   │   │           ├── closing_loc: ∅
-        │   │           │   │   │           └── block: ∅
-        │   │           │   │   └── closing_loc: (8,7)-(8,8) = "}"
-        │   │           │   └── @ StringNode (location: (8,8)-(9,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (8,8)-(9,0) = "\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\n"
-        │   │           └── closing_loc: (9,0)-(10,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (11,0)-(11,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (11,0)-(11,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (11,2)-(11,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (11,2)-(11,6))
-        │   │           ├── opening_loc: (11,2)-(11,6) = "<<~E"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (12,0)-(13,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (12,0)-(13,0) = "\tx\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "x\n"
-        │   │           │   └── @ StringNode (location: (13,0)-(14,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (13,0)-(14,0) = "        y\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "y\n"
-        │   │           └── closing_loc: (14,0)-(15,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (16,0)-(16,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (16,0)-(16,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (16,2)-(16,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (16,2)-(16,6))
-        │   │           ├── opening_loc: (16,2)-(16,6) = "<<~E"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (17,0)-(18,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (17,0)-(18,0) = "\tx\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "\tx\n"
-        │   │           │   └── @ StringNode (location: (18,0)-(19,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (18,0)-(19,0) = "    y\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "y\n"
-        │   │           └── closing_loc: (19,0)-(20,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (21,0)-(21,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (21,0)-(21,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,2)-(21,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (21,2)-(21,6))
-        │   │           ├── opening_loc: (21,2)-(21,6) = "<<~E"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (22,0)-(23,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (22,0)-(23,0) = "    \tx\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "x\n"
-        │   │           │   └── @ StringNode (location: (23,0)-(24,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (23,0)-(24,0) = "        y\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "y\n"
-        │   │           └── closing_loc: (24,0)-(25,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (26,0)-(26,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (26,0)-(26,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (26,2)-(26,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (26,2)-(26,6))
-        │   │           ├── opening_loc: (26,2)-(26,6) = "<<~E"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (27,0)-(28,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (27,0)-(28,0) = "        \tx\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "\tx\n"
-        │   │           │   └── @ StringNode (location: (28,0)-(29,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (28,0)-(29,0) = "\ty\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "y\n"
-        │   │           └── closing_loc: (29,0)-(30,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (31,0)-(31,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (31,0)-(31,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,2)-(31,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (31,2)-(31,6))
-        │   │           ├── opening_loc: (31,2)-(31,6) = "<<~E"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (32,0)-(33,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (32,0)-(33,0) = "    x\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  x\n"
-        │   │           │   └── @ StringNode (location: (33,0)-(34,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (33,0)-(34,0) = "  \\\ty\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "\ty\n"
-        │   │           └── closing_loc: (34,0)-(35,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (36,0)-(36,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (36,0)-(36,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (36,2)-(36,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (36,2)-(36,6))
-        │   │           ├── opening_loc: (36,2)-(36,6) = "<<~E"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (37,0)-(38,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (37,0)-(38,0) = "    x\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  x\n"
-        │   │           │   └── @ StringNode (location: (38,0)-(39,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (38,0)-(39,0) = "  \\  y\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "  y\n"
-        │   │           └── closing_loc: (39,0)-(40,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (41,0)-(41,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (41,0)-(41,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (41,2)-(41,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (41,2)-(41,6))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (41,2)-(41,6) = "<<~E"
-        │   │           ├── content_loc: (42,0)-(42,0) = ""
-        │   │           ├── closing_loc: (42,0)-(43,0) = "  E\n"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (44,0)-(44,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (44,0)-(44,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (44,2)-(44,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (44,2)-(44,6))
-        │   │           ├── opening_loc: (44,2)-(44,6) = "<<~E"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (45,0)-(46,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (45,0)-(46,0) = "  x\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  x\n"
-        │   │           │   ├── @ StringNode (location: (46,0)-(47,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (46,0)-(47,0) = "\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "\n"
-        │   │           │   └── @ StringNode (location: (47,0)-(48,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (47,0)-(48,0) = "y\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "y\n"
-        │   │           └── closing_loc: (48,0)-(49,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (50,0)-(50,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (50,0)-(50,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (50,2)-(50,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (50,2)-(50,6))
-        │   │           ├── opening_loc: (50,2)-(50,6) = "<<~E"
-        │   │           ├── parts: (length: 3)
-        │   │           │   ├── @ StringNode (location: (51,0)-(52,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (51,0)-(52,0) = "  x\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "x\n"
-        │   │           │   ├── @ StringNode (location: (52,0)-(53,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (52,0)-(53,0) = "    \n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "  \n"
-        │   │           │   └── @ StringNode (location: (53,0)-(54,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (53,0)-(54,0) = "  y\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "y\n"
-        │   │           └── closing_loc: (54,0)-(55,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (56,0)-(56,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (56,0)-(56,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (56,2)-(56,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ InterpolatedStringNode (location: (56,2)-(56,6))
-        │   │           ├── opening_loc: (56,2)-(56,6) = "<<~E"
-        │   │           ├── parts: (length: 2)
-        │   │           │   ├── @ StringNode (location: (57,0)-(58,0))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   ├── opening_loc: ∅
-        │   │           │   │   ├── content_loc: (57,0)-(58,0) = "  x\n"
-        │   │           │   │   ├── closing_loc: ∅
-        │   │           │   │   └── unescaped: "x\n"
-        │   │           │   └── @ StringNode (location: (58,0)-(59,0))
-        │   │           │       ├── flags: ∅
-        │   │           │       ├── opening_loc: ∅
-        │   │           │       ├── content_loc: (58,0)-(59,0) = "    y\n"
-        │   │           │       ├── closing_loc: ∅
-        │   │           │       └── unescaped: "  y\n"
-        │   │           └── closing_loc: (59,0)-(60,0) = "E\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (61,0)-(61,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (61,0)-(61,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (61,2)-(61,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (61,2)-(61,6))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (61,2)-(61,6) = "<<~E"
-        │   │           ├── content_loc: (62,0)-(63,0) = "  x\n"
-        │   │           ├── closing_loc: (63,0)-(64,0) = "E\n"
-        │   │           └── unescaped: "x\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (65,0)-(65,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (65,0)-(65,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (65,2)-(65,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (65,2)-(65,6))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (65,2)-(65,6) = "<<~E"
-        │   │           ├── content_loc: (66,0)-(67,0) = "  ð\n"
-        │   │           ├── closing_loc: (67,0)-(68,0) = "E\n"
-        │   │           └── unescaped: "ð\n"
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (69,0)-(69,6))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :p
-        │   ├── message_loc: (69,0)-(69,1) = "p"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (69,2)-(69,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ StringNode (location: (69,2)-(69,6))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (69,2)-(69,6) = "<<~E"
-        │   │           ├── content_loc: (70,0)-(70,0) = ""
-        │   │           ├── closing_loc: (70,0)-(71,0) = "E\n"
-        │   │           └── unescaped: ""
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (72,0)-(72,8))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (72,0)-(72,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (72,2)-(72,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InterpolatedXStringNode (location: (72,2)-(72,8))
-            │           ├── opening_loc: (72,2)-(72,8) = "<<~`E`"
-            │           ├── parts: (length: 3)
-            │           │   ├── @ StringNode (location: (73,0)-(74,0))
-            │           │   │   ├── flags: ∅
-            │           │   │   ├── opening_loc: ∅
-            │           │   │   ├── content_loc: (73,0)-(74,0) = "    x\n"
-            │           │   │   ├── closing_loc: ∅
-            │           │   │   └── unescaped: "  x\n"
-            │           │   ├── @ EmbeddedStatementsNode (location: (74,2)-(74,8))
-            │           │   │   ├── opening_loc: (74,2)-(74,4) = "\#{"
-            │           │   │   ├── statements:
-            │           │   │   │   @ StatementsNode (location: (74,4)-(74,7))
-            │           │   │   │   └── body: (length: 1)
-            │           │   │   │       └── @ CallNode (location: (74,4)-(74,7))
-            │           │   │   │           ├── flags: variable_call, ignore_visibility
-            │           │   │   │           ├── receiver: ∅
-            │           │   │   │           ├── call_operator_loc: ∅
-            │           │   │   │           ├── name: :foo
-            │           │   │   │           ├── message_loc: (74,4)-(74,7) = "foo"
-            │           │   │   │           ├── opening_loc: ∅
-            │           │   │   │           ├── arguments: ∅
-            │           │   │   │           ├── closing_loc: ∅
-            │           │   │   │           └── block: ∅
-            │           │   │   └── closing_loc: (74,7)-(74,8) = "}"
-            │           │   └── @ StringNode (location: (74,8)-(75,0))
-            │           │       ├── flags: ∅
-            │           │       ├── opening_loc: ∅
-            │           │       ├── content_loc: (74,8)-(75,0) = "\n"
-            │           │       ├── closing_loc: ∅
-            │           │       └── unescaped: "\n"
-            │           └── closing_loc: (75,0)-(76,0) = "E\n"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt b/test/mri/prism/snapshots/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt
deleted file mode 100644
index cc5be3d967f..00000000000
--- a/test/mri/prism/snapshots/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,8))
-            ├── opening_loc: (1,0)-(1,8) = "<<~'FOO'"
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (2,0)-(3,0) = "  baz\\\\\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "baz\\\\\n"
-            │   └── @ StringNode (location: (3,0)-(4,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (3,0)-(4,0) = "  qux\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "qux\n"
-            └── closing_loc: (4,0)-(5,0) = "FOO\n"
diff --git a/test/mri/prism/snapshots/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt b/test/mri/prism/snapshots/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt
deleted file mode 100644
index d9f7fe2ec7d..00000000000
--- a/test/mri/prism/snapshots/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,8))
-            ├── opening_loc: (1,0)-(1,8) = "<<~'FOO'"
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (2,0)-(3,0) = "  baz\\\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "baz\\\n"
-            │   └── @ StringNode (location: (3,0)-(4,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (3,0)-(4,0) = "  qux\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "qux\n"
-            └── closing_loc: (4,0)-(5,0) = "FOO\n"
diff --git a/test/mri/prism/snapshots/whitequark/def.txt b/test/mri/prism/snapshots/whitequark/def.txt
deleted file mode 100644
index d5e1139c4d2..00000000000
--- a/test/mri/prism/snapshots/whitequark/def.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,14))
-    └── body: (length: 6)
-        ├── @ DefNode (location: (1,0)-(1,14))
-        │   ├── name: :BEGIN
-        │   ├── name_loc: (1,4)-(1,9) = "BEGIN"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,11)-(1,14) = "end"
-        ├── @ DefNode (location: (3,0)-(3,12))
-        │   ├── name: :END
-        │   ├── name_loc: (3,4)-(3,7) = "END"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,9)-(3,12) = "end"
-        ├── @ DefNode (location: (5,0)-(5,15))
-        │   ├── name: :String
-        │   ├── name_loc: (5,4)-(5,10) = "String"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (5,0)-(5,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,12)-(5,15) = "end"
-        ├── @ DefNode (location: (7,0)-(7,16))
-        │   ├── name: :String=
-        │   ├── name_loc: (7,4)-(7,11) = "String="
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (7,13)-(7,16) = "end"
-        ├── @ DefNode (location: (9,0)-(9,12))
-        │   ├── name: :foo
-        │   ├── name_loc: (9,4)-(9,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (9,0)-(9,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (9,9)-(9,12) = "end"
-        └── @ DefNode (location: (11,0)-(11,14))
-            ├── name: :until
-            ├── name_loc: (11,4)-(11,9) = "until"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (11,0)-(11,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (11,11)-(11,14) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/defined.txt b/test/mri/prism/snapshots/whitequark/defined.txt
deleted file mode 100644
index 5e05870b216..00000000000
--- a/test/mri/prism/snapshots/whitequark/defined.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,13))
-    └── body: (length: 3)
-        ├── @ DefinedNode (location: (1,0)-(1,13))
-        │   ├── lparen_loc: ∅
-        │   ├── value:
-        │   │   @ InstanceVariableReadNode (location: (1,9)-(1,13))
-        │   │   └── name: :@foo
-        │   ├── rparen_loc: ∅
-        │   └── keyword_loc: (1,0)-(1,8) = "defined?"
-        ├── @ DefinedNode (location: (3,0)-(3,12))
-        │   ├── lparen_loc: ∅
-        │   ├── value:
-        │   │   @ CallNode (location: (3,9)-(3,12))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,9)-(3,12) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── rparen_loc: ∅
-        │   └── keyword_loc: (3,0)-(3,8) = "defined?"
-        └── @ DefinedNode (location: (5,0)-(5,13))
-            ├── lparen_loc: (5,8)-(5,9) = "("
-            ├── value:
-            │   @ CallNode (location: (5,9)-(5,12))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (5,9)-(5,12) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── rparen_loc: (5,12)-(5,13) = ")"
-            └── keyword_loc: (5,0)-(5,8) = "defined?"
diff --git a/test/mri/prism/snapshots/whitequark/defs.txt b/test/mri/prism/snapshots/whitequark/defs.txt
deleted file mode 100644
index 616cca6155a..00000000000
--- a/test/mri/prism/snapshots/whitequark/defs.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,18))
-    └── body: (length: 5)
-        ├── @ DefNode (location: (1,0)-(1,18))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,10)-(1,13) = "foo"
-        │   ├── receiver:
-        │   │   @ ParenthesesNode (location: (1,4)-(1,9))
-        │   │   ├── body:
-        │   │   │   @ CallNode (location: (1,5)-(1,8))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (1,5)-(1,8) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── opening_loc: (1,4)-(1,5) = "("
-        │   │   └── closing_loc: (1,8)-(1,9) = ")"
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: (1,9)-(1,10) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,15)-(1,18) = "end"
-        ├── @ DefNode (location: (3,0)-(3,19))
-        │   ├── name: :foo
-        │   ├── name_loc: (3,11)-(3,14) = "foo"
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (3,4)-(3,10))
-        │   │   └── name: :String
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: (3,10)-(3,11) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,16)-(3,19) = "end"
-        ├── @ DefNode (location: (5,0)-(5,20))
-        │   ├── name: :foo
-        │   ├── name_loc: (5,12)-(5,15) = "foo"
-        │   ├── receiver:
-        │   │   @ ConstantReadNode (location: (5,4)-(5,10))
-        │   │   └── name: :String
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (5,0)-(5,3) = "def"
-        │   ├── operator_loc: (5,10)-(5,12) = "::"
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (5,17)-(5,20) = "end"
-        ├── @ DefNode (location: (7,0)-(7,17))
-        │   ├── name: :foo
-        │   ├── name_loc: (7,9)-(7,12) = "foo"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (7,4)-(7,8))
-        │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: (7,8)-(7,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (7,14)-(7,17) = "end"
-        └── @ DefNode (location: (9,0)-(9,18))
-            ├── name: :foo
-            ├── name_loc: (9,10)-(9,13) = "foo"
-            ├── receiver:
-            │   @ SelfNode (location: (9,4)-(9,8))
-            ├── parameters: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (9,0)-(9,3) = "def"
-            ├── operator_loc: (9,8)-(9,10) = "::"
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (9,15)-(9,18) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/empty_stmt.txt b/test/mri/prism/snapshots/whitequark/empty_stmt.txt
deleted file mode 100644
index 3a21ce5559c..00000000000
--- a/test/mri/prism/snapshots/whitequark/empty_stmt.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,0))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,0))
-    └── body: (length: 0)
diff --git a/test/mri/prism/snapshots/whitequark/endless_comparison_method.txt b/test/mri/prism/snapshots/whitequark/endless_comparison_method.txt
deleted file mode 100644
index 28ec3843bb0..00000000000
--- a/test/mri/prism/snapshots/whitequark/endless_comparison_method.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,28))
-    └── body: (length: 6)
-        ├── @ DefNode (location: (1,0)-(1,28))
-        │   ├── name: :!=
-        │   ├── name_loc: (1,4)-(1,6) = "!="
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,7)-(1,12))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (1,7)-(1,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :other
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,16)-(1,28))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,16)-(1,28))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :do_something
-        │   │           ├── message_loc: (1,16)-(1,28) = "do_something"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:other]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,6)-(1,7) = "("
-        │   ├── rparen_loc: (1,12)-(1,13) = ")"
-        │   ├── equal_loc: (1,14)-(1,15) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (3,0)-(3,28))
-        │   ├── name: :!=
-        │   ├── name_loc: (3,4)-(3,6) = "!="
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (3,7)-(3,12))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (3,7)-(3,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :other
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,16)-(3,28))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (3,16)-(3,28))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :do_something
-        │   │           ├── message_loc: (3,16)-(3,28) = "do_something"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:other]
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (3,6)-(3,7) = "("
-        │   ├── rparen_loc: (3,12)-(3,13) = ")"
-        │   ├── equal_loc: (3,14)-(3,15) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (5,0)-(5,28))
-        │   ├── name: :<=
-        │   ├── name_loc: (5,4)-(5,6) = "<="
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (5,7)-(5,12))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (5,7)-(5,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :other
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (5,16)-(5,28))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (5,16)-(5,28))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :do_something
-        │   │           ├── message_loc: (5,16)-(5,28) = "do_something"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:other]
-        │   ├── def_keyword_loc: (5,0)-(5,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (5,6)-(5,7) = "("
-        │   ├── rparen_loc: (5,12)-(5,13) = ")"
-        │   ├── equal_loc: (5,14)-(5,15) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (7,0)-(7,28))
-        │   ├── name: :==
-        │   ├── name_loc: (7,4)-(7,6) = "=="
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (7,7)-(7,12))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (7,7)-(7,12))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :other
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (7,16)-(7,28))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (7,16)-(7,28))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :do_something
-        │   │           ├── message_loc: (7,16)-(7,28) = "do_something"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:other]
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (7,6)-(7,7) = "("
-        │   ├── rparen_loc: (7,12)-(7,13) = ")"
-        │   ├── equal_loc: (7,14)-(7,15) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (9,0)-(9,29))
-        │   ├── name: :===
-        │   ├── name_loc: (9,4)-(9,7) = "==="
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (9,8)-(9,13))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (9,8)-(9,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :other
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (9,17)-(9,29))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (9,17)-(9,29))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :do_something
-        │   │           ├── message_loc: (9,17)-(9,29) = "do_something"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:other]
-        │   ├── def_keyword_loc: (9,0)-(9,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (9,7)-(9,8) = "("
-        │   ├── rparen_loc: (9,13)-(9,14) = ")"
-        │   ├── equal_loc: (9,15)-(9,16) = "="
-        │   └── end_keyword_loc: ∅
-        └── @ DefNode (location: (11,0)-(11,28))
-            ├── name: :>=
-            ├── name_loc: (11,4)-(11,6) = ">="
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (11,7)-(11,12))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (11,7)-(11,12))
-            │   │       ├── flags: ∅
-            │   │       └── name: :other
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (11,16)-(11,28))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (11,16)-(11,28))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :do_something
-            │           ├── message_loc: (11,16)-(11,28) = "do_something"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: [:other]
-            ├── def_keyword_loc: (11,0)-(11,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (11,6)-(11,7) = "("
-            ├── rparen_loc: (11,12)-(11,13) = ")"
-            ├── equal_loc: (11,14)-(11,15) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/endless_method.txt b/test/mri/prism/snapshots/whitequark/endless_method.txt
deleted file mode 100644
index 17d3873b663..00000000000
--- a/test/mri/prism/snapshots/whitequark/endless_method.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,22))
-    └── body: (length: 4)
-        ├── @ DefNode (location: (1,0)-(1,14))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,12)-(1,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,12)-(1,14))
-        │   │           ├── flags: decimal
-        │   │           └── value: 42
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,7)-(1,8) = "("
-        │   ├── rparen_loc: (1,8)-(1,9) = ")"
-        │   ├── equal_loc: (1,10)-(1,11) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (3,0)-(3,18))
-        │   ├── name: :inc
-        │   ├── name_loc: (3,4)-(3,7) = "inc"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (3,8)-(3,9))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (3,8)-(3,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :x
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,13)-(3,18))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (3,13)-(3,18))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ LocalVariableReadNode (location: (3,13)-(3,14))
-        │   │           │   ├── name: :x
-        │   │           │   └── depth: 0
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :+
-        │   │           ├── message_loc: (3,15)-(3,16) = "+"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (3,17)-(3,18))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (3,17)-(3,18))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (3,7)-(3,8) = "("
-        │   ├── rparen_loc: (3,9)-(3,10) = ")"
-        │   ├── equal_loc: (3,11)-(3,12) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (5,0)-(5,18))
-        │   ├── name: :foo
-        │   ├── name_loc: (5,8)-(5,11) = "foo"
-        │   ├── receiver:
-        │   │   @ CallNode (location: (5,4)-(5,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :obj
-        │   │   ├── message_loc: (5,4)-(5,7) = "obj"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (5,16)-(5,18))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,16)-(5,18))
-        │   │           ├── flags: decimal
-        │   │           └── value: 42
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (5,0)-(5,3) = "def"
-        │   ├── operator_loc: (5,7)-(5,8) = "."
-        │   ├── lparen_loc: (5,11)-(5,12) = "("
-        │   ├── rparen_loc: (5,12)-(5,13) = ")"
-        │   ├── equal_loc: (5,14)-(5,15) = "="
-        │   └── end_keyword_loc: ∅
-        └── @ DefNode (location: (7,0)-(7,22))
-            ├── name: :inc
-            ├── name_loc: (7,8)-(7,11) = "inc"
-            ├── receiver:
-            │   @ CallNode (location: (7,4)-(7,7))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :obj
-            │   ├── message_loc: (7,4)-(7,7) = "obj"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (7,12)-(7,13))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (7,12)-(7,13))
-            │   │       ├── flags: ∅
-            │   │       └── name: :x
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (7,17)-(7,22))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (7,17)-(7,22))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ LocalVariableReadNode (location: (7,17)-(7,18))
-            │           │   ├── name: :x
-            │           │   └── depth: 0
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :+
-            │           ├── message_loc: (7,19)-(7,20) = "+"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (7,21)-(7,22))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ IntegerNode (location: (7,21)-(7,22))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: [:x]
-            ├── def_keyword_loc: (7,0)-(7,3) = "def"
-            ├── operator_loc: (7,7)-(7,8) = "."
-            ├── lparen_loc: (7,11)-(7,12) = "("
-            ├── rparen_loc: (7,13)-(7,14) = ")"
-            ├── equal_loc: (7,15)-(7,16) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/endless_method_command_syntax.txt b/test/mri/prism/snapshots/whitequark/endless_method_command_syntax.txt
deleted file mode 100644
index 334fb39d615..00000000000
--- a/test/mri/prism/snapshots/whitequark/endless_method_command_syntax.txt
+++ /dev/null
@@ -1,392 +0,0 @@
-@ ProgramNode (location: (1,0)-(15,62))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(15,62))
-    └── body: (length: 8)
-        ├── @ DefNode (location: (1,0)-(1,22))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,10)-(1,22))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,10)-(1,22))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :puts
-        │   │           ├── message_loc: (1,10)-(1,14) = "puts"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (1,15)-(1,22))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ StringNode (location: (1,15)-(1,22))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── opening_loc: (1,15)-(1,16) = "\""
-        │   │           │           ├── content_loc: (1,16)-(1,21) = "Hello"
-        │   │           │           ├── closing_loc: (1,21)-(1,22) = "\""
-        │   │           │           └── unescaped: "Hello"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (1,8)-(1,9) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (3,0)-(3,24))
-        │   ├── name: :foo
-        │   ├── name_loc: (3,4)-(3,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,12)-(3,24))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (3,12)-(3,24))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :puts
-        │   │           ├── message_loc: (3,12)-(3,16) = "puts"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (3,17)-(3,24))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ StringNode (location: (3,17)-(3,24))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── opening_loc: (3,17)-(3,18) = "\""
-        │   │           │           ├── content_loc: (3,18)-(3,23) = "Hello"
-        │   │           │           ├── closing_loc: (3,23)-(3,24) = "\""
-        │   │           │           └── unescaped: "Hello"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (3,7)-(3,8) = "("
-        │   ├── rparen_loc: (3,8)-(3,9) = ")"
-        │   ├── equal_loc: (3,10)-(3,11) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (5,0)-(5,19))
-        │   ├── name: :foo
-        │   ├── name_loc: (5,4)-(5,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (5,8)-(5,9))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (5,8)-(5,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :x
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (5,13)-(5,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (5,13)-(5,19))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :puts
-        │   │           ├── message_loc: (5,13)-(5,17) = "puts"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (5,18)-(5,19))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ LocalVariableReadNode (location: (5,18)-(5,19))
-        │   │           │           ├── name: :x
-        │   │           │           └── depth: 0
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (5,0)-(5,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (5,7)-(5,8) = "("
-        │   ├── rparen_loc: (5,9)-(5,10) = ")"
-        │   ├── equal_loc: (5,11)-(5,12) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (7,0)-(7,26))
-        │   ├── name: :foo
-        │   ├── name_loc: (7,8)-(7,11) = "foo"
-        │   ├── receiver:
-        │   │   @ CallNode (location: (7,4)-(7,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :obj
-        │   │   ├── message_loc: (7,4)-(7,7) = "obj"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (7,14)-(7,26))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (7,14)-(7,26))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :puts
-        │   │           ├── message_loc: (7,14)-(7,18) = "puts"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (7,19)-(7,26))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ StringNode (location: (7,19)-(7,26))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── opening_loc: (7,19)-(7,20) = "\""
-        │   │           │           ├── content_loc: (7,20)-(7,25) = "Hello"
-        │   │           │           ├── closing_loc: (7,25)-(7,26) = "\""
-        │   │           │           └── unescaped: "Hello"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: (7,7)-(7,8) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (7,12)-(7,13) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (9,0)-(9,28))
-        │   ├── name: :foo
-        │   ├── name_loc: (9,8)-(9,11) = "foo"
-        │   ├── receiver:
-        │   │   @ CallNode (location: (9,4)-(9,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :obj
-        │   │   ├── message_loc: (9,4)-(9,7) = "obj"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (9,16)-(9,28))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (9,16)-(9,28))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :puts
-        │   │           ├── message_loc: (9,16)-(9,20) = "puts"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (9,21)-(9,28))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ StringNode (location: (9,21)-(9,28))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── opening_loc: (9,21)-(9,22) = "\""
-        │   │           │           ├── content_loc: (9,22)-(9,27) = "Hello"
-        │   │           │           ├── closing_loc: (9,27)-(9,28) = "\""
-        │   │           │           └── unescaped: "Hello"
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (9,0)-(9,3) = "def"
-        │   ├── operator_loc: (9,7)-(9,8) = "."
-        │   ├── lparen_loc: (9,11)-(9,12) = "("
-        │   ├── rparen_loc: (9,12)-(9,13) = ")"
-        │   ├── equal_loc: (9,14)-(9,15) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (11,0)-(11,23))
-        │   ├── name: :foo
-        │   ├── name_loc: (11,8)-(11,11) = "foo"
-        │   ├── receiver:
-        │   │   @ CallNode (location: (11,4)-(11,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :obj
-        │   │   ├── message_loc: (11,4)-(11,7) = "obj"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (11,12)-(11,13))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (11,12)-(11,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :x
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (11,17)-(11,23))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (11,17)-(11,23))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :puts
-        │   │           ├── message_loc: (11,17)-(11,21) = "puts"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (11,22)-(11,23))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ LocalVariableReadNode (location: (11,22)-(11,23))
-        │   │           │           ├── name: :x
-        │   │           │           └── depth: 0
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (11,0)-(11,3) = "def"
-        │   ├── operator_loc: (11,7)-(11,8) = "."
-        │   ├── lparen_loc: (11,11)-(11,12) = "("
-        │   ├── rparen_loc: (11,13)-(11,14) = ")"
-        │   ├── equal_loc: (11,15)-(11,16) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (13,0)-(13,60))
-        │   ├── name: :rescued
-        │   ├── name_loc: (13,4)-(13,11) = "rescued"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (13,12)-(13,13))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (13,12)-(13,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :x
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (13,17)-(13,60))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RescueModifierNode (location: (13,17)-(13,60))
-        │   │           ├── expression:
-        │   │           │   @ CallNode (location: (13,17)-(13,37))
-        │   │           │   ├── flags: ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :raise
-        │   │           │   ├── message_loc: (13,17)-(13,22) = "raise"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments:
-        │   │           │   │   @ ArgumentsNode (location: (13,23)-(13,37))
-        │   │           │   │   ├── flags: ∅
-        │   │           │   │   └── arguments: (length: 1)
-        │   │           │   │       └── @ StringNode (location: (13,23)-(13,37))
-        │   │           │   │           ├── flags: ∅
-        │   │           │   │           ├── opening_loc: (13,23)-(13,24) = "\""
-        │   │           │   │           ├── content_loc: (13,24)-(13,36) = "to be caught"
-        │   │           │   │           ├── closing_loc: (13,36)-(13,37) = "\""
-        │   │           │   │           └── unescaped: "to be caught"
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── keyword_loc: (13,38)-(13,44) = "rescue"
-        │   │           └── rescue_expression:
-        │   │               @ InterpolatedStringNode (location: (13,45)-(13,60))
-        │   │               ├── opening_loc: (13,45)-(13,46) = "\""
-        │   │               ├── parts: (length: 2)
-        │   │               │   ├── @ StringNode (location: (13,46)-(13,55))
-        │   │               │   │   ├── flags: ∅
-        │   │               │   │   ├── opening_loc: ∅
-        │   │               │   │   ├── content_loc: (13,46)-(13,55) = "instance "
-        │   │               │   │   ├── closing_loc: ∅
-        │   │               │   │   └── unescaped: "instance "
-        │   │               │   └── @ EmbeddedStatementsNode (location: (13,55)-(13,59))
-        │   │               │       ├── opening_loc: (13,55)-(13,57) = "\#{"
-        │   │               │       ├── statements:
-        │   │               │       │   @ StatementsNode (location: (13,57)-(13,58))
-        │   │               │       │   └── body: (length: 1)
-        │   │               │       │       └── @ LocalVariableReadNode (location: (13,57)-(13,58))
-        │   │               │       │           ├── name: :x
-        │   │               │       │           └── depth: 0
-        │   │               │       └── closing_loc: (13,58)-(13,59) = "}"
-        │   │               └── closing_loc: (13,59)-(13,60) = "\""
-        │   ├── locals: [:x]
-        │   ├── def_keyword_loc: (13,0)-(13,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (13,11)-(13,12) = "("
-        │   ├── rparen_loc: (13,13)-(13,14) = ")"
-        │   ├── equal_loc: (13,15)-(13,16) = "="
-        │   └── end_keyword_loc: ∅
-        └── @ DefNode (location: (15,0)-(15,62))
-            ├── name: :rescued
-            ├── name_loc: (15,9)-(15,16) = "rescued"
-            ├── receiver:
-            │   @ SelfNode (location: (15,4)-(15,8))
-            ├── parameters:
-            │   @ ParametersNode (location: (15,17)-(15,18))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (15,17)-(15,18))
-            │   │       ├── flags: ∅
-            │   │       └── name: :x
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (15,22)-(15,62))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (15,22)-(15,62))
-            │           ├── expression:
-            │           │   @ CallNode (location: (15,22)-(15,42))
-            │           │   ├── flags: ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :raise
-            │           │   ├── message_loc: (15,22)-(15,27) = "raise"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments:
-            │           │   │   @ ArgumentsNode (location: (15,28)-(15,42))
-            │           │   │   ├── flags: ∅
-            │           │   │   └── arguments: (length: 1)
-            │           │   │       └── @ StringNode (location: (15,28)-(15,42))
-            │           │   │           ├── flags: ∅
-            │           │   │           ├── opening_loc: (15,28)-(15,29) = "\""
-            │           │   │           ├── content_loc: (15,29)-(15,41) = "to be caught"
-            │           │   │           ├── closing_loc: (15,41)-(15,42) = "\""
-            │           │   │           └── unescaped: "to be caught"
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── keyword_loc: (15,43)-(15,49) = "rescue"
-            │           └── rescue_expression:
-            │               @ InterpolatedStringNode (location: (15,50)-(15,62))
-            │               ├── opening_loc: (15,50)-(15,51) = "\""
-            │               ├── parts: (length: 2)
-            │               │   ├── @ StringNode (location: (15,51)-(15,57))
-            │               │   │   ├── flags: ∅
-            │               │   │   ├── opening_loc: ∅
-            │               │   │   ├── content_loc: (15,51)-(15,57) = "class "
-            │               │   │   ├── closing_loc: ∅
-            │               │   │   └── unescaped: "class "
-            │               │   └── @ EmbeddedStatementsNode (location: (15,57)-(15,61))
-            │               │       ├── opening_loc: (15,57)-(15,59) = "\#{"
-            │               │       ├── statements:
-            │               │       │   @ StatementsNode (location: (15,59)-(15,60))
-            │               │       │   └── body: (length: 1)
-            │               │       │       └── @ LocalVariableReadNode (location: (15,59)-(15,60))
-            │               │       │           ├── name: :x
-            │               │       │           └── depth: 0
-            │               │       └── closing_loc: (15,60)-(15,61) = "}"
-            │               └── closing_loc: (15,61)-(15,62) = "\""
-            ├── locals: [:x]
-            ├── def_keyword_loc: (15,0)-(15,3) = "def"
-            ├── operator_loc: (15,8)-(15,9) = "."
-            ├── lparen_loc: (15,16)-(15,17) = "("
-            ├── rparen_loc: (15,18)-(15,19) = ")"
-            ├── equal_loc: (15,20)-(15,21) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/endless_method_forwarded_args_legacy.txt b/test/mri/prism/snapshots/whitequark/endless_method_forwarded_args_legacy.txt
deleted file mode 100644
index 64a3ffa2520..00000000000
--- a/test/mri/prism/snapshots/whitequark/endless_method_forwarded_args_legacy.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,23))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,11))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (1,8)-(1,11))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,15)-(1,23))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,15)-(1,23))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,15)-(1,18) = "bar"
-            │           ├── opening_loc: (1,18)-(1,19) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,19)-(1,22))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ ForwardingArgumentsNode (location: (1,19)-(1,22))
-            │           ├── closing_loc: (1,22)-(1,23) = ")"
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,11)-(1,12) = ")"
-            ├── equal_loc: (1,13)-(1,14) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/endless_method_with_rescue_mod.txt b/test/mri/prism/snapshots/whitequark/endless_method_with_rescue_mod.txt
deleted file mode 100644
index 2284b243549..00000000000
--- a/test/mri/prism/snapshots/whitequark/endless_method_with_rescue_mod.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,25))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(1,20))
-        │   ├── name: :m
-        │   ├── name_loc: (1,4)-(1,5) = "m"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,10)-(1,20))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RescueModifierNode (location: (1,10)-(1,20))
-        │   │           ├── expression:
-        │   │           │   @ IntegerNode (location: (1,10)-(1,11))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 1
-        │   │           ├── keyword_loc: (1,12)-(1,18) = "rescue"
-        │   │           └── rescue_expression:
-        │   │               @ IntegerNode (location: (1,19)-(1,20))
-        │   │               ├── flags: decimal
-        │   │               └── value: 2
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,5)-(1,6) = "("
-        │   ├── rparen_loc: (1,6)-(1,7) = ")"
-        │   ├── equal_loc: (1,8)-(1,9) = "="
-        │   └── end_keyword_loc: ∅
-        └── @ DefNode (location: (3,0)-(3,25))
-            ├── name: :m
-            ├── name_loc: (3,9)-(3,10) = "m"
-            ├── receiver:
-            │   @ SelfNode (location: (3,4)-(3,8))
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (3,15)-(3,25))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (3,15)-(3,25))
-            │           ├── expression:
-            │           │   @ IntegerNode (location: (3,15)-(3,16))
-            │           │   ├── flags: decimal
-            │           │   └── value: 1
-            │           ├── keyword_loc: (3,17)-(3,23) = "rescue"
-            │           └── rescue_expression:
-            │               @ IntegerNode (location: (3,24)-(3,25))
-            │               ├── flags: decimal
-            │               └── value: 2
-            ├── locals: []
-            ├── def_keyword_loc: (3,0)-(3,3) = "def"
-            ├── operator_loc: (3,8)-(3,9) = "."
-            ├── lparen_loc: (3,10)-(3,11) = "("
-            ├── rparen_loc: (3,11)-(3,12) = ")"
-            ├── equal_loc: (3,13)-(3,14) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/endless_method_without_args.txt b/test/mri/prism/snapshots/whitequark/endless_method_without_args.txt
deleted file mode 100644
index a7a9c93ef34..00000000000
--- a/test/mri/prism/snapshots/whitequark/endless_method_without_args.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,28))
-    └── body: (length: 4)
-        ├── @ DefNode (location: (1,0)-(1,12))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,10)-(1,12))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,10)-(1,12))
-        │   │           ├── flags: decimal
-        │   │           └── value: 42
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (1,8)-(1,9) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (3,0)-(3,23))
-        │   ├── name: :foo
-        │   ├── name_loc: (3,4)-(3,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,10)-(3,23))
-        │   │   └── body: (length: 1)
-        │   │       └── @ RescueModifierNode (location: (3,10)-(3,23))
-        │   │           ├── expression:
-        │   │           │   @ IntegerNode (location: (3,10)-(3,12))
-        │   │           │   ├── flags: decimal
-        │   │           │   └── value: 42
-        │   │           ├── keyword_loc: (3,13)-(3,19) = "rescue"
-        │   │           └── rescue_expression:
-        │   │               @ NilNode (location: (3,20)-(3,23))
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (3,8)-(3,9) = "="
-        │   └── end_keyword_loc: ∅
-        ├── @ DefNode (location: (5,0)-(5,17))
-        │   ├── name: :foo
-        │   ├── name_loc: (5,9)-(5,12) = "foo"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (5,4)-(5,8))
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (5,15)-(5,17))
-        │   │   └── body: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,15)-(5,17))
-        │   │           ├── flags: decimal
-        │   │           └── value: 42
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (5,0)-(5,3) = "def"
-        │   ├── operator_loc: (5,8)-(5,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: (5,13)-(5,14) = "="
-        │   └── end_keyword_loc: ∅
-        └── @ DefNode (location: (7,0)-(7,28))
-            ├── name: :foo
-            ├── name_loc: (7,9)-(7,12) = "foo"
-            ├── receiver:
-            │   @ SelfNode (location: (7,4)-(7,8))
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (7,15)-(7,28))
-            │   └── body: (length: 1)
-            │       └── @ RescueModifierNode (location: (7,15)-(7,28))
-            │           ├── expression:
-            │           │   @ IntegerNode (location: (7,15)-(7,17))
-            │           │   ├── flags: decimal
-            │           │   └── value: 42
-            │           ├── keyword_loc: (7,18)-(7,24) = "rescue"
-            │           └── rescue_expression:
-            │               @ NilNode (location: (7,25)-(7,28))
-            ├── locals: []
-            ├── def_keyword_loc: (7,0)-(7,3) = "def"
-            ├── operator_loc: (7,8)-(7,9) = "."
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: (7,13)-(7,14) = "="
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/ensure.txt b/test/mri/prism/snapshots/whitequark/ensure.txt
deleted file mode 100644
index a48d2370e8d..00000000000
--- a/test/mri/prism/snapshots/whitequark/ensure.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,29))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,29))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,29))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,7)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,7)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (1,7)-(1,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (1,13)-(1,29))
-            │   ├── ensure_keyword_loc: (1,13)-(1,19) = "ensure"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,21)-(1,24))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,21)-(1,24))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (1,21)-(1,24) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (1,26)-(1,29) = "end"
-            └── end_keyword_loc: (1,26)-(1,29) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/ensure_empty.txt b/test/mri/prism/snapshots/whitequark/ensure_empty.txt
deleted file mode 100644
index 0bab5d80c36..00000000000
--- a/test/mri/prism/snapshots/whitequark/ensure_empty.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,16))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements: ∅
-            ├── rescue_clause: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (1,6)-(1,16))
-            │   ├── ensure_keyword_loc: (1,6)-(1,12) = "ensure"
-            │   ├── statements: ∅
-            │   └── end_keyword_loc: (1,13)-(1,16) = "end"
-            └── end_keyword_loc: (1,13)-(1,16) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/false.txt b/test/mri/prism/snapshots/whitequark/false.txt
deleted file mode 100644
index 00562f703a9..00000000000
--- a/test/mri/prism/snapshots/whitequark/false.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ FalseNode (location: (1,0)-(1,5))
diff --git a/test/mri/prism/snapshots/whitequark/float.txt b/test/mri/prism/snapshots/whitequark/float.txt
deleted file mode 100644
index 5e6a597db7d..00000000000
--- a/test/mri/prism/snapshots/whitequark/float.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,4))
-    └── body: (length: 2)
-        ├── @ FloatNode (location: (1,0)-(1,5))
-        │   └── value: -1.33
-        └── @ FloatNode (location: (3,0)-(3,4))
-            └── value: 1.33
diff --git a/test/mri/prism/snapshots/whitequark/for.txt b/test/mri/prism/snapshots/whitequark/for.txt
deleted file mode 100644
index fec8bdfd64f..00000000000
--- a/test/mri/prism/snapshots/whitequark/for.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,22))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,22))
-    └── body: (length: 2)
-        ├── @ ForNode (location: (1,0)-(1,24))
-        │   ├── index:
-        │   │   @ LocalVariableTargetNode (location: (1,4)-(1,5))
-        │   │   ├── name: :a
-        │   │   └── depth: 0
-        │   ├── collection:
-        │   │   @ CallNode (location: (1,9)-(1,12))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,9)-(1,12) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,16)-(1,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,16)-(1,19))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :p
-        │   │           ├── message_loc: (1,16)-(1,17) = "p"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (1,18)-(1,19))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ LocalVariableReadNode (location: (1,18)-(1,19))
-        │   │           │           ├── name: :a
-        │   │           │           └── depth: 0
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── for_keyword_loc: (1,0)-(1,3) = "for"
-        │   ├── in_keyword_loc: (1,6)-(1,8) = "in"
-        │   ├── do_keyword_loc: (1,13)-(1,15) = "do"
-        │   └── end_keyword_loc: (1,21)-(1,24) = "end"
-        └── @ ForNode (location: (3,0)-(3,22))
-            ├── index:
-            │   @ LocalVariableTargetNode (location: (3,4)-(3,5))
-            │   ├── name: :a
-            │   └── depth: 0
-            ├── collection:
-            │   @ CallNode (location: (3,9)-(3,12))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,9)-(3,12) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (3,14)-(3,17))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (3,14)-(3,17))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :p
-            │           ├── message_loc: (3,14)-(3,15) = "p"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (3,16)-(3,17))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ LocalVariableReadNode (location: (3,16)-(3,17))
-            │           │           ├── name: :a
-            │           │           └── depth: 0
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── for_keyword_loc: (3,0)-(3,3) = "for"
-            ├── in_keyword_loc: (3,6)-(3,8) = "in"
-            ├── do_keyword_loc: ∅
-            └── end_keyword_loc: (3,19)-(3,22) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/for_mlhs.txt b/test/mri/prism/snapshots/whitequark/for_mlhs.txt
deleted file mode 100644
index 42d8fa22585..00000000000
--- a/test/mri/prism/snapshots/whitequark/for_mlhs.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,28))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,28))
-    └── body: (length: 1)
-        └── @ ForNode (location: (1,0)-(1,28))
-            ├── index:
-            │   @ MultiTargetNode (location: (1,4)-(1,8))
-            │   ├── lefts: (length: 2)
-            │   │   ├── @ LocalVariableTargetNode (location: (1,4)-(1,5))
-            │   │   │   ├── name: :a
-            │   │   │   └── depth: 0
-            │   │   └── @ LocalVariableTargetNode (location: (1,7)-(1,8))
-            │   │       ├── name: :b
-            │   │       └── depth: 0
-            │   ├── rest: ∅
-            │   ├── rights: (length: 0)
-            │   ├── lparen_loc: ∅
-            │   └── rparen_loc: ∅
-            ├── collection:
-            │   @ CallNode (location: (1,12)-(1,15))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,12)-(1,15) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (1,17)-(1,23))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,17)-(1,23))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :p
-            │           ├── message_loc: (1,17)-(1,18) = "p"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,19)-(1,23))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 2)
-            │           │       ├── @ LocalVariableReadNode (location: (1,19)-(1,20))
-            │           │       │   ├── name: :a
-            │           │       │   └── depth: 0
-            │           │       └── @ LocalVariableReadNode (location: (1,22)-(1,23))
-            │           │           ├── name: :b
-            │           │           └── depth: 0
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── for_keyword_loc: (1,0)-(1,3) = "for"
-            ├── in_keyword_loc: (1,9)-(1,11) = "in"
-            ├── do_keyword_loc: ∅
-            └── end_keyword_loc: (1,25)-(1,28) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/forward_arg.txt b/test/mri/prism/snapshots/whitequark/forward_arg.txt
deleted file mode 100644
index 17504c64e02..00000000000
--- a/test/mri/prism/snapshots/whitequark/forward_arg.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,27))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,27))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,27))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,11))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (1,8)-(1,11))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,14)-(1,22))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,14)-(1,22))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,14)-(1,17) = "bar"
-            │           ├── opening_loc: (1,17)-(1,18) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,18)-(1,21))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ ForwardingArgumentsNode (location: (1,18)-(1,21))
-            │           ├── closing_loc: (1,21)-(1,22) = ")"
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,11)-(1,12) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,24)-(1,27) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/forward_arg_with_open_args.txt b/test/mri/prism/snapshots/whitequark/forward_arg_with_open_args.txt
deleted file mode 100644
index 7e58260b582..00000000000
--- a/test/mri/prism/snapshots/whitequark/forward_arg_with_open_args.txt
+++ /dev/null
@@ -1,404 +0,0 @@
-@ ProgramNode (location: (1,0)-(27,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(27,28))
-    └── body: (length: 10)
-        ├── @ ParenthesesNode (location: (1,0)-(3,4))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,1)-(3,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ DefNode (location: (1,1)-(3,3))
-        │   │           ├── name: :foo
-        │   │           ├── name_loc: (1,5)-(1,8) = "foo"
-        │   │           ├── receiver: ∅
-        │   │           ├── parameters:
-        │   │           │   @ ParametersNode (location: (1,9)-(1,12))
-        │   │           │   ├── requireds: (length: 0)
-        │   │           │   ├── optionals: (length: 0)
-        │   │           │   ├── rest: ∅
-        │   │           │   ├── posts: (length: 0)
-        │   │           │   ├── keywords: (length: 0)
-        │   │           │   ├── keyword_rest:
-        │   │           │   │   @ ForwardingParameterNode (location: (1,9)-(1,12))
-        │   │           │   └── block: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (2,2)-(2,10))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (2,2)-(2,10))
-        │   │           │           ├── flags: ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :bar
-        │   │           │           ├── message_loc: (2,2)-(2,5) = "bar"
-        │   │           │           ├── opening_loc: (2,5)-(2,6) = "("
-        │   │           │           ├── arguments:
-        │   │           │           │   @ ArgumentsNode (location: (2,6)-(2,9))
-        │   │           │           │   ├── flags: ∅
-        │   │           │           │   └── arguments: (length: 1)
-        │   │           │           │       └── @ ForwardingArgumentsNode (location: (2,6)-(2,9))
-        │   │           │           ├── closing_loc: (2,9)-(2,10) = ")"
-        │   │           │           └── block: ∅
-        │   │           ├── locals: []
-        │   │           ├── def_keyword_loc: (1,1)-(1,4) = "def"
-        │   │           ├── operator_loc: ∅
-        │   │           ├── lparen_loc: ∅
-        │   │           ├── rparen_loc: ∅
-        │   │           ├── equal_loc: ∅
-        │   │           └── end_keyword_loc: (3,0)-(3,3) = "end"
-        │   ├── opening_loc: (1,0)-(1,1) = "("
-        │   └── closing_loc: (3,3)-(3,4) = ")"
-        ├── @ ParenthesesNode (location: (5,0)-(5,28))
-        │   ├── body:
-        │   │   @ StatementsNode (location: (5,1)-(5,27))
-        │   │   └── body: (length: 1)
-        │   │       └── @ DefNode (location: (5,1)-(5,27))
-        │   │           ├── name: :foo
-        │   │           ├── name_loc: (5,5)-(5,8) = "foo"
-        │   │           ├── receiver: ∅
-        │   │           ├── parameters:
-        │   │           │   @ ParametersNode (location: (5,9)-(5,12))
-        │   │           │   ├── requireds: (length: 0)
-        │   │           │   ├── optionals: (length: 0)
-        │   │           │   ├── rest: ∅
-        │   │           │   ├── posts: (length: 0)
-        │   │           │   ├── keywords: (length: 0)
-        │   │           │   ├── keyword_rest:
-        │   │           │   │   @ ForwardingParameterNode (location: (5,9)-(5,12))
-        │   │           │   └── block: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (5,14)-(5,22))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (5,14)-(5,22))
-        │   │           │           ├── flags: ignore_visibility
-        │   │           │           ├── receiver: ∅
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :bar
-        │   │           │           ├── message_loc: (5,14)-(5,17) = "bar"
-        │   │           │           ├── opening_loc: (5,17)-(5,18) = "("
-        │   │           │           ├── arguments:
-        │   │           │           │   @ ArgumentsNode (location: (5,18)-(5,21))
-        │   │           │           │   ├── flags: ∅
-        │   │           │           │   └── arguments: (length: 1)
-        │   │           │           │       └── @ ForwardingArgumentsNode (location: (5,18)-(5,21))
-        │   │           │           ├── closing_loc: (5,21)-(5,22) = ")"
-        │   │           │           └── block: ∅
-        │   │           ├── locals: []
-        │   │           ├── def_keyword_loc: (5,1)-(5,4) = "def"
-        │   │           ├── operator_loc: ∅
-        │   │           ├── lparen_loc: ∅
-        │   │           ├── rparen_loc: ∅
-        │   │           ├── equal_loc: ∅
-        │   │           └── end_keyword_loc: (5,24)-(5,27) = "end"
-        │   ├── opening_loc: (5,0)-(5,1) = "("
-        │   └── closing_loc: (5,27)-(5,28) = ")"
-        ├── @ DefNode (location: (7,0)-(8,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (7,4)-(7,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (7,8)-(7,11))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (7,8)-(7,11))
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (8,0)-(8,3) = "end"
-        ├── @ DefNode (location: (10,0)-(10,26))
-        │   ├── name: :foo
-        │   ├── name_loc: (10,4)-(10,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (10,8)-(10,11))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (10,8)-(10,11))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (10,13)-(10,21))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (10,13)-(10,21))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (10,13)-(10,16) = "bar"
-        │   │           ├── opening_loc: (10,16)-(10,17) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (10,17)-(10,20))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ ForwardingArgumentsNode (location: (10,17)-(10,20))
-        │   │           ├── closing_loc: (10,20)-(10,21) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (10,0)-(10,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (10,23)-(10,26) = "end"
-        ├── @ DefNode (location: (12,0)-(14,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (12,4)-(12,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (12,8)-(12,14))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (12,8)-(12,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (12,11)-(12,14))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (13,2)-(13,10))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (13,2)-(13,10))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (13,2)-(13,5) = "bar"
-        │   │           ├── opening_loc: (13,5)-(13,6) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (13,6)-(13,9))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ ForwardingArgumentsNode (location: (13,6)-(13,9))
-        │   │           ├── closing_loc: (13,9)-(13,10) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (12,0)-(12,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (14,0)-(14,3) = "end"
-        ├── @ DefNode (location: (16,0)-(16,29))
-        │   ├── name: :foo
-        │   ├── name_loc: (16,4)-(16,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (16,8)-(16,14))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (16,8)-(16,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (16,11)-(16,14))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (16,16)-(16,24))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (16,16)-(16,24))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (16,16)-(16,19) = "bar"
-        │   │           ├── opening_loc: (16,19)-(16,20) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (16,20)-(16,23))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ ForwardingArgumentsNode (location: (16,20)-(16,23))
-        │   │           ├── closing_loc: (16,23)-(16,24) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: [:a]
-        │   ├── def_keyword_loc: (16,0)-(16,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (16,26)-(16,29) = "end"
-        ├── @ DefNode (location: (18,0)-(19,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (18,4)-(18,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (18,8)-(18,21))
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ RequiredParameterNode (location: (18,8)-(18,9))
-        │   │   │       ├── flags: ∅
-        │   │   │       └── name: :a
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (18,11)-(18,16))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :b
-        │   │   │       ├── name_loc: (18,11)-(18,12) = "b"
-        │   │   │       ├── operator_loc: (18,13)-(18,14) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (18,15)-(18,16))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (18,18)-(18,21))
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:a, :b]
-        │   ├── def_keyword_loc: (18,0)-(18,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (19,0)-(19,3) = "end"
-        ├── @ DefNode (location: (21,0)-(23,3))
-        │   ├── name: :foo
-        │   ├── name_loc: (21,4)-(21,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (21,8)-(21,18))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (21,8)-(21,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :b
-        │   │   │       ├── name_loc: (21,8)-(21,9) = "b"
-        │   │   │       ├── operator_loc: (21,10)-(21,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (21,12)-(21,13))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (21,15)-(21,18))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (22,2)-(22,10))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (22,2)-(22,10))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (22,2)-(22,5) = "bar"
-        │   │           ├── opening_loc: (22,5)-(22,6) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (22,6)-(22,9))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ ForwardingArgumentsNode (location: (22,6)-(22,9))
-        │   │           ├── closing_loc: (22,9)-(22,10) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (21,0)-(21,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (23,0)-(23,3) = "end"
-        ├── @ DefNode (location: (25,0)-(25,33))
-        │   ├── name: :foo
-        │   ├── name_loc: (25,4)-(25,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (25,8)-(25,18))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (25,8)-(25,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :b
-        │   │   │       ├── name_loc: (25,8)-(25,9) = "b"
-        │   │   │       ├── operator_loc: (25,10)-(25,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (25,12)-(25,13))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (25,15)-(25,18))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (25,20)-(25,28))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (25,20)-(25,28))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (25,20)-(25,23) = "bar"
-        │   │           ├── opening_loc: (25,23)-(25,24) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (25,24)-(25,27))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ ForwardingArgumentsNode (location: (25,24)-(25,27))
-        │   │           ├── closing_loc: (25,27)-(25,28) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (25,0)-(25,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (25,30)-(25,33) = "end"
-        └── @ DefNode (location: (27,0)-(27,28))
-            ├── name: :foo
-            ├── name_loc: (27,4)-(27,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (27,8)-(27,14))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (27,8)-(27,9))
-            │   │       ├── flags: ∅
-            │   │       └── name: :a
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (27,11)-(27,14))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (27,16)-(27,24))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (27,16)-(27,24))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (27,16)-(27,19) = "bar"
-            │           ├── opening_loc: (27,19)-(27,20) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (27,20)-(27,23))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ ForwardingArgumentsNode (location: (27,20)-(27,23))
-            │           ├── closing_loc: (27,23)-(27,24) = ")"
-            │           └── block: ∅
-            ├── locals: [:a]
-            ├── def_keyword_loc: (27,0)-(27,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (27,7)-(27,8) = "("
-            ├── rparen_loc: (27,14)-(27,15) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (27,25)-(27,28) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/forward_args_legacy.txt b/test/mri/prism/snapshots/whitequark/forward_args_legacy.txt
deleted file mode 100644
index f46967ba500..00000000000
--- a/test/mri/prism/snapshots/whitequark/forward_args_legacy.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,29))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,29))
-    └── body: (length: 3)
-        ├── @ DefNode (location: (1,0)-(1,27))
-        │   ├── name: :foo
-        │   ├── name_loc: (1,4)-(1,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,8)-(1,11))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (1,8)-(1,11))
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,14)-(1,22))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,14)-(1,22))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (1,14)-(1,17) = "bar"
-        │   │           ├── opening_loc: (1,17)-(1,18) = "("
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (1,18)-(1,21))
-        │   │           │   ├── flags: ∅
-        │   │           │   └── arguments: (length: 1)
-        │   │           │       └── @ ForwardingArgumentsNode (location: (1,18)-(1,21))
-        │   │           ├── closing_loc: (1,21)-(1,22) = ")"
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (1,7)-(1,8) = "("
-        │   ├── rparen_loc: (1,11)-(1,12) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,24)-(1,27) = "end"
-        ├── @ DefNode (location: (3,0)-(3,17))
-        │   ├── name: :foo
-        │   ├── name_loc: (3,4)-(3,7) = "foo"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (3,8)-(3,11))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ ForwardingParameterNode (location: (3,8)-(3,11))
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (3,7)-(3,8) = "("
-        │   ├── rparen_loc: (3,11)-(3,12) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,14)-(3,17) = "end"
-        └── @ DefNode (location: (5,0)-(5,29))
-            ├── name: :foo
-            ├── name_loc: (5,4)-(5,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (5,8)-(5,11))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (5,8)-(5,11))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (5,14)-(5,24))
-            │   └── body: (length: 1)
-            │       └── @ SuperNode (location: (5,14)-(5,24))
-            │           ├── keyword_loc: (5,14)-(5,19) = "super"
-            │           ├── lparen_loc: (5,19)-(5,20) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (5,20)-(5,23))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ ForwardingArgumentsNode (location: (5,20)-(5,23))
-            │           ├── rparen_loc: (5,23)-(5,24) = ")"
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (5,0)-(5,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (5,7)-(5,8) = "("
-            ├── rparen_loc: (5,11)-(5,12) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (5,26)-(5,29) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt b/test/mri/prism/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt
deleted file mode 100644
index c06818a98ba..00000000000
--- a/test/mri/prism/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,45))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,45))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,45))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,20))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,8)-(1,16))
-            │   │       ├── flags: ∅
-            │   │       └── name: :argument
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,18)-(1,20))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,18)-(1,20) = "**"
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,23)-(1,40))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,23)-(1,40))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,23)-(1,26) = "bar"
-            │           ├── opening_loc: (1,26)-(1,27) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,27)-(1,39))
-            │           │   ├── flags: contains_keyword_splat
-            │           │   └── arguments: (length: 2)
-            │           │       ├── @ LocalVariableReadNode (location: (1,27)-(1,35))
-            │           │       │   ├── name: :argument
-            │           │       │   └── depth: 0
-            │           │       └── @ KeywordHashNode (location: (1,37)-(1,39))
-            │           │           ├── flags: ∅
-            │           │           └── elements: (length: 1)
-            │           │               └── @ AssocSplatNode (location: (1,37)-(1,39))
-            │           │                   ├── value: ∅
-            │           │                   └── operator_loc: (1,37)-(1,39) = "**"
-            │           ├── closing_loc: (1,39)-(1,40) = ")"
-            │           └── block: ∅
-            ├── locals: [:argument]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,20)-(1,21) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,42)-(1,45) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/forwarded_argument_with_restarg.txt b/test/mri/prism/snapshots/whitequark/forwarded_argument_with_restarg.txt
deleted file mode 100644
index 367fad7fec8..00000000000
--- a/test/mri/prism/snapshots/whitequark/forwarded_argument_with_restarg.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,43))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,43))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,43))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,19))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (1,8)-(1,16))
-            │   │       ├── flags: ∅
-            │   │       └── name: :argument
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (1,18)-(1,19))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,18)-(1,19) = "*"
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,22)-(1,38))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,22)-(1,38))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,22)-(1,25) = "bar"
-            │           ├── opening_loc: (1,25)-(1,26) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,26)-(1,37))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 2)
-            │           │       ├── @ LocalVariableReadNode (location: (1,26)-(1,34))
-            │           │       │   ├── name: :argument
-            │           │       │   └── depth: 0
-            │           │       └── @ SplatNode (location: (1,36)-(1,37))
-            │           │           ├── operator_loc: (1,36)-(1,37) = "*"
-            │           │           └── expression: ∅
-            │           ├── closing_loc: (1,37)-(1,38) = ")"
-            │           └── block: ∅
-            ├── locals: [:argument]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,19)-(1,20) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,40)-(1,43) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/forwarded_kwrestarg.txt b/test/mri/prism/snapshots/whitequark/forwarded_kwrestarg.txt
deleted file mode 100644
index adaf111fd76..00000000000
--- a/test/mri/prism/snapshots/whitequark/forwarded_kwrestarg.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,25))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,10))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,8)-(1,10))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,8)-(1,10) = "**"
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,13)-(1,20))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,13)-(1,20))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,13)-(1,16) = "bar"
-            │           ├── opening_loc: (1,16)-(1,17) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,17)-(1,19))
-            │           │   ├── flags: contains_keyword_splat
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ KeywordHashNode (location: (1,17)-(1,19))
-            │           │           ├── flags: ∅
-            │           │           └── elements: (length: 1)
-            │           │               └── @ AssocSplatNode (location: (1,17)-(1,19))
-            │           │                   ├── value: ∅
-            │           │                   └── operator_loc: (1,17)-(1,19) = "**"
-            │           ├── closing_loc: (1,19)-(1,20) = ")"
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,10)-(1,11) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,22)-(1,25) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt b/test/mri/prism/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt
deleted file mode 100644
index a03421455ca..00000000000
--- a/test/mri/prism/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,41))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,41))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,41))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,10))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,8)-(1,10))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,8)-(1,10) = "**"
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,13)-(1,36))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,13)-(1,36))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,13)-(1,16) = "bar"
-            │           ├── opening_loc: (1,16)-(1,17) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,17)-(1,35))
-            │           │   ├── flags: contains_keyword_splat
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ KeywordHashNode (location: (1,17)-(1,35))
-            │           │           ├── flags: ∅
-            │           │           └── elements: (length: 2)
-            │           │               ├── @ AssocSplatNode (location: (1,17)-(1,19))
-            │           │               │   ├── value: ∅
-            │           │               │   └── operator_loc: (1,17)-(1,19) = "**"
-            │           │               └── @ AssocNode (location: (1,21)-(1,35))
-            │           │                   ├── key:
-            │           │                   │   @ SymbolNode (location: (1,21)-(1,30))
-            │           │                   │   ├── flags: forced_us_ascii_encoding
-            │           │                   │   ├── opening_loc: ∅
-            │           │                   │   ├── value_loc: (1,21)-(1,29) = "from_foo"
-            │           │                   │   ├── closing_loc: (1,29)-(1,30) = ":"
-            │           │                   │   └── unescaped: "from_foo"
-            │           │                   ├── value:
-            │           │                   │   @ TrueNode (location: (1,31)-(1,35))
-            │           │                   └── operator_loc: ∅
-            │           ├── closing_loc: (1,35)-(1,36) = ")"
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,10)-(1,11) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,38)-(1,41) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/forwarded_restarg.txt b/test/mri/prism/snapshots/whitequark/forwarded_restarg.txt
deleted file mode 100644
index 17ff8894afa..00000000000
--- a/test/mri/prism/snapshots/whitequark/forwarded_restarg.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,23))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,9))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (1,8)-(1,9))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,8)-(1,9) = "*"
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,12)-(1,18))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,12)-(1,18))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,12)-(1,15) = "bar"
-            │           ├── opening_loc: (1,15)-(1,16) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,16)-(1,17))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ SplatNode (location: (1,16)-(1,17))
-            │           │           ├── operator_loc: (1,16)-(1,17) = "*"
-            │           │           └── expression: ∅
-            │           ├── closing_loc: (1,17)-(1,18) = ")"
-            │           └── block: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,9)-(1,10) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,20)-(1,23) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/gvar.txt b/test/mri/prism/snapshots/whitequark/gvar.txt
deleted file mode 100644
index f4401c4389b..00000000000
--- a/test/mri/prism/snapshots/whitequark/gvar.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ GlobalVariableReadNode (location: (1,0)-(1,4))
-            └── name: :$foo
diff --git a/test/mri/prism/snapshots/whitequark/gvasgn.txt b/test/mri/prism/snapshots/whitequark/gvasgn.txt
deleted file mode 100644
index fc044054d88..00000000000
--- a/test/mri/prism/snapshots/whitequark/gvasgn.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ GlobalVariableWriteNode (location: (1,0)-(1,9))
-            ├── name: :$var
-            ├── name_loc: (1,0)-(1,4) = "$var"
-            ├── value:
-            │   @ IntegerNode (location: (1,7)-(1,9))
-            │   ├── flags: decimal
-            │   └── value: 10
-            └── operator_loc: (1,5)-(1,6) = "="
diff --git a/test/mri/prism/snapshots/whitequark/hash_empty.txt b/test/mri/prism/snapshots/whitequark/hash_empty.txt
deleted file mode 100644
index 38a2c15a9ad..00000000000
--- a/test/mri/prism/snapshots/whitequark/hash_empty.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,0)-(1,3))
-            ├── opening_loc: (1,0)-(1,1) = "{"
-            ├── elements: (length: 0)
-            └── closing_loc: (1,2)-(1,3) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/hash_hashrocket.txt b/test/mri/prism/snapshots/whitequark/hash_hashrocket.txt
deleted file mode 100644
index e661a7b0480..00000000000
--- a/test/mri/prism/snapshots/whitequark/hash_hashrocket.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,25))
-    └── body: (length: 2)
-        ├── @ HashNode (location: (1,0)-(1,10))
-        │   ├── opening_loc: (1,0)-(1,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (1,2)-(1,8))
-        │   │       ├── key:
-        │   │       │   @ IntegerNode (location: (1,2)-(1,3))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 1
-        │   │       ├── value:
-        │   │       │   @ IntegerNode (location: (1,7)-(1,8))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── operator_loc: (1,4)-(1,6) = "=>"
-        │   └── closing_loc: (1,9)-(1,10) = "}"
-        └── @ HashNode (location: (3,0)-(3,25))
-            ├── opening_loc: (3,0)-(3,1) = "{"
-            ├── elements: (length: 2)
-            │   ├── @ AssocNode (location: (3,2)-(3,8))
-            │   │   ├── key:
-            │   │   │   @ IntegerNode (location: (3,2)-(3,3))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 1
-            │   │   ├── value:
-            │   │   │   @ IntegerNode (location: (3,7)-(3,8))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 2
-            │   │   └── operator_loc: (3,4)-(3,6) = "=>"
-            │   └── @ AssocNode (location: (3,10)-(3,23))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (3,10)-(3,14))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (3,10)-(3,11) = ":"
-            │       │   ├── value_loc: (3,11)-(3,14) = "foo"
-            │       │   ├── closing_loc: ∅
-            │       │   └── unescaped: "foo"
-            │       ├── value:
-            │       │   @ StringNode (location: (3,18)-(3,23))
-            │       │   ├── flags: ∅
-            │       │   ├── opening_loc: (3,18)-(3,19) = "\""
-            │       │   ├── content_loc: (3,19)-(3,22) = "bar"
-            │       │   ├── closing_loc: (3,22)-(3,23) = "\""
-            │       │   └── unescaped: "bar"
-            │       └── operator_loc: (3,15)-(3,17) = "=>"
-            └── closing_loc: (3,24)-(3,25) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/hash_kwsplat.txt b/test/mri/prism/snapshots/whitequark/hash_kwsplat.txt
deleted file mode 100644
index a5d12174cc4..00000000000
--- a/test/mri/prism/snapshots/whitequark/hash_kwsplat.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,0)-(1,17))
-            ├── opening_loc: (1,0)-(1,1) = "{"
-            ├── elements: (length: 2)
-            │   ├── @ AssocNode (location: (1,2)-(1,8))
-            │   │   ├── key:
-            │   │   │   @ SymbolNode (location: (1,2)-(1,6))
-            │   │   │   ├── flags: forced_us_ascii_encoding
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── value_loc: (1,2)-(1,5) = "foo"
-            │   │   │   ├── closing_loc: (1,5)-(1,6) = ":"
-            │   │   │   └── unescaped: "foo"
-            │   │   ├── value:
-            │   │   │   @ IntegerNode (location: (1,7)-(1,8))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 2
-            │   │   └── operator_loc: ∅
-            │   └── @ AssocSplatNode (location: (1,10)-(1,15))
-            │       ├── value:
-            │       │   @ CallNode (location: (1,12)-(1,15))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :bar
-            │       │   ├── message_loc: (1,12)-(1,15) = "bar"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── operator_loc: (1,10)-(1,12) = "**"
-            └── closing_loc: (1,16)-(1,17) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/hash_label.txt b/test/mri/prism/snapshots/whitequark/hash_label.txt
deleted file mode 100644
index fdf7a21ed0c..00000000000
--- a/test/mri/prism/snapshots/whitequark/hash_label.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,0)-(1,10))
-            ├── opening_loc: (1,0)-(1,1) = "{"
-            ├── elements: (length: 1)
-            │   └── @ AssocNode (location: (1,2)-(1,8))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (1,2)-(1,6))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: ∅
-            │       │   ├── value_loc: (1,2)-(1,5) = "foo"
-            │       │   ├── closing_loc: (1,5)-(1,6) = ":"
-            │       │   └── unescaped: "foo"
-            │       ├── value:
-            │       │   @ IntegerNode (location: (1,7)-(1,8))
-            │       │   ├── flags: decimal
-            │       │   └── value: 2
-            │       └── operator_loc: ∅
-            └── closing_loc: (1,9)-(1,10) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/hash_label_end.txt b/test/mri/prism/snapshots/whitequark/hash_label_end.txt
deleted file mode 100644
index 88b70d38e2c..00000000000
--- a/test/mri/prism/snapshots/whitequark/hash_label_end.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,22))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,12))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :f
-        │   ├── message_loc: (1,0)-(1,1) = "f"
-        │   ├── opening_loc: (1,1)-(1,2) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IfNode (location: (1,2)-(1,11))
-        │   │           ├── if_keyword_loc: ∅
-        │   │           ├── predicate:
-        │   │           │   @ CallNode (location: (1,2)-(1,3))
-        │   │           │   ├── flags: variable_call, ignore_visibility
-        │   │           │   ├── receiver: ∅
-        │   │           │   ├── call_operator_loc: ∅
-        │   │           │   ├── name: :a
-        │   │           │   ├── message_loc: (1,2)-(1,3) = "a"
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   ├── arguments: ∅
-        │   │           │   ├── closing_loc: ∅
-        │   │           │   └── block: ∅
-        │   │           ├── then_keyword_loc: (1,4)-(1,5) = "?"
-        │   │           ├── statements:
-        │   │           │   @ StatementsNode (location: (1,6)-(1,9))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ StringNode (location: (1,6)-(1,9))
-        │   │           │           ├── flags: ∅
-        │   │           │           ├── opening_loc: (1,6)-(1,7) = "\""
-        │   │           │           ├── content_loc: (1,7)-(1,8) = "a"
-        │   │           │           ├── closing_loc: (1,8)-(1,9) = "\""
-        │   │           │           └── unescaped: "a"
-        │   │           ├── consequent:
-        │   │           │   @ ElseNode (location: (1,9)-(1,11))
-        │   │           │   ├── else_keyword_loc: (1,9)-(1,10) = ":"
-        │   │           │   ├── statements:
-        │   │           │   │   @ StatementsNode (location: (1,10)-(1,11))
-        │   │           │   │   └── body: (length: 1)
-        │   │           │   │       └── @ IntegerNode (location: (1,10)-(1,11))
-        │   │           │   │           ├── flags: decimal
-        │   │           │   │           └── value: 1
-        │   │           │   └── end_keyword_loc: ∅
-        │   │           └── end_keyword_loc: ∅
-        │   ├── closing_loc: (1,11)-(1,12) = ")"
-        │   └── block: ∅
-        ├── @ HashNode (location: (3,0)-(3,12))
-        │   ├── opening_loc: (3,0)-(3,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (3,2)-(3,10))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (3,2)-(3,8))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: (3,2)-(3,3) = "'"
-        │   │       │   ├── value_loc: (3,3)-(3,6) = "foo"
-        │   │       │   ├── closing_loc: (3,6)-(3,8) = "':"
-        │   │       │   └── unescaped: "foo"
-        │   │       ├── value:
-        │   │       │   @ IntegerNode (location: (3,9)-(3,10))
-        │   │       │   ├── flags: decimal
-        │   │       │   └── value: 2
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (3,11)-(3,12) = "}"
-        └── @ HashNode (location: (5,0)-(5,22))
-            ├── opening_loc: (5,0)-(5,1) = "{"
-            ├── elements: (length: 2)
-            │   ├── @ AssocNode (location: (5,2)-(5,10))
-            │   │   ├── key:
-            │   │   │   @ SymbolNode (location: (5,2)-(5,8))
-            │   │   │   ├── flags: forced_us_ascii_encoding
-            │   │   │   ├── opening_loc: (5,2)-(5,3) = "'"
-            │   │   │   ├── value_loc: (5,3)-(5,6) = "foo"
-            │   │   │   ├── closing_loc: (5,6)-(5,8) = "':"
-            │   │   │   └── unescaped: "foo"
-            │   │   ├── value:
-            │   │   │   @ IntegerNode (location: (5,9)-(5,10))
-            │   │   │   ├── flags: decimal
-            │   │   │   └── value: 2
-            │   │   └── operator_loc: ∅
-            │   └── @ AssocNode (location: (5,12)-(5,21))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (5,12)-(5,18))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: (5,12)-(5,13) = "'"
-            │       │   ├── value_loc: (5,13)-(5,16) = "bar"
-            │       │   ├── closing_loc: (5,16)-(5,18) = "':"
-            │       │   └── unescaped: "bar"
-            │       ├── value:
-            │       │   @ HashNode (location: (5,19)-(5,21))
-            │       │   ├── opening_loc: (5,19)-(5,20) = "{"
-            │       │   ├── elements: (length: 0)
-            │       │   └── closing_loc: (5,20)-(5,21) = "}"
-            │       └── operator_loc: ∅
-            └── closing_loc: (5,21)-(5,22) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/hash_pair_value_omission.txt b/test/mri/prism/snapshots/whitequark/hash_pair_value_omission.txt
deleted file mode 100644
index 455ba48407a..00000000000
--- a/test/mri/prism/snapshots/whitequark/hash_pair_value_omission.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,7))
-    └── body: (length: 3)
-        ├── @ HashNode (location: (1,0)-(1,6))
-        │   ├── opening_loc: (1,0)-(1,1) = "{"
-        │   ├── elements: (length: 1)
-        │   │   └── @ AssocNode (location: (1,1)-(1,5))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (1,1)-(1,5))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (1,1)-(1,4) = "BAR"
-        │   │       │   ├── closing_loc: (1,4)-(1,5) = ":"
-        │   │       │   └── unescaped: "BAR"
-        │   │       ├── value:
-        │   │       │   @ ImplicitNode (location: (1,1)-(1,5))
-        │   │       │   └── value:
-        │   │       │       @ ConstantReadNode (location: (1,1)-(1,5))
-        │   │       │       └── name: :BAR
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (1,5)-(1,6) = "}"
-        ├── @ HashNode (location: (3,0)-(3,8))
-        │   ├── opening_loc: (3,0)-(3,1) = "{"
-        │   ├── elements: (length: 2)
-        │   │   ├── @ AssocNode (location: (3,1)-(3,3))
-        │   │   │   ├── key:
-        │   │   │   │   @ SymbolNode (location: (3,1)-(3,3))
-        │   │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   ├── value_loc: (3,1)-(3,2) = "a"
-        │   │   │   │   ├── closing_loc: (3,2)-(3,3) = ":"
-        │   │   │   │   └── unescaped: "a"
-        │   │   │   ├── value:
-        │   │   │   │   @ ImplicitNode (location: (3,1)-(3,3))
-        │   │   │   │   └── value:
-        │   │   │   │       @ CallNode (location: (3,1)-(3,3))
-        │   │   │   │       ├── flags: ignore_visibility
-        │   │   │   │       ├── receiver: ∅
-        │   │   │   │       ├── call_operator_loc: ∅
-        │   │   │   │       ├── name: :a
-        │   │   │   │       ├── message_loc: (3,1)-(3,2) = "a"
-        │   │   │   │       ├── opening_loc: ∅
-        │   │   │   │       ├── arguments: ∅
-        │   │   │   │       ├── closing_loc: ∅
-        │   │   │   │       └── block: ∅
-        │   │   │   └── operator_loc: ∅
-        │   │   └── @ AssocNode (location: (3,5)-(3,7))
-        │   │       ├── key:
-        │   │       │   @ SymbolNode (location: (3,5)-(3,7))
-        │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── value_loc: (3,5)-(3,6) = "b"
-        │   │       │   ├── closing_loc: (3,6)-(3,7) = ":"
-        │   │       │   └── unescaped: "b"
-        │   │       ├── value:
-        │   │       │   @ ImplicitNode (location: (3,5)-(3,7))
-        │   │       │   └── value:
-        │   │       │       @ CallNode (location: (3,5)-(3,7))
-        │   │       │       ├── flags: ignore_visibility
-        │   │       │       ├── receiver: ∅
-        │   │       │       ├── call_operator_loc: ∅
-        │   │       │       ├── name: :b
-        │   │       │       ├── message_loc: (3,5)-(3,6) = "b"
-        │   │       │       ├── opening_loc: ∅
-        │   │       │       ├── arguments: ∅
-        │   │       │       ├── closing_loc: ∅
-        │   │       │       └── block: ∅
-        │   │       └── operator_loc: ∅
-        │   └── closing_loc: (3,7)-(3,8) = "}"
-        └── @ HashNode (location: (5,0)-(5,7))
-            ├── opening_loc: (5,0)-(5,1) = "{"
-            ├── elements: (length: 1)
-            │   └── @ AssocNode (location: (5,1)-(5,6))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (5,1)-(5,6))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: ∅
-            │       │   ├── value_loc: (5,1)-(5,5) = "puts"
-            │       │   ├── closing_loc: (5,5)-(5,6) = ":"
-            │       │   └── unescaped: "puts"
-            │       ├── value:
-            │       │   @ ImplicitNode (location: (5,1)-(5,6))
-            │       │   └── value:
-            │       │       @ CallNode (location: (5,1)-(5,6))
-            │       │       ├── flags: ignore_visibility
-            │       │       ├── receiver: ∅
-            │       │       ├── call_operator_loc: ∅
-            │       │       ├── name: :puts
-            │       │       ├── message_loc: (5,1)-(5,5) = "puts"
-            │       │       ├── opening_loc: ∅
-            │       │       ├── arguments: ∅
-            │       │       ├── closing_loc: ∅
-            │       │       └── block: ∅
-            │       └── operator_loc: ∅
-            └── closing_loc: (5,6)-(5,7) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/heredoc.txt b/test/mri/prism/snapshots/whitequark/heredoc.txt
deleted file mode 100644
index 86543097ee1..00000000000
--- a/test/mri/prism/snapshots/whitequark/heredoc.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,8))
-    └── body: (length: 3)
-        ├── @ StringNode (location: (1,0)-(1,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,8) = "<<'HERE'"
-        │   ├── content_loc: (2,0)-(4,0) = "foo\nbar\n"
-        │   ├── closing_loc: (4,0)-(5,0) = "HERE\n"
-        │   └── unescaped: "foo\nbar\n"
-        ├── @ StringNode (location: (6,0)-(6,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (6,0)-(6,6) = "<<HERE"
-        │   ├── content_loc: (7,0)-(9,0) = "foo\nbar\n"
-        │   ├── closing_loc: (9,0)-(10,0) = "HERE\n"
-        │   └── unescaped: "foo\nbar\n"
-        └── @ XStringNode (location: (11,0)-(11,8))
-            ├── flags: ∅
-            ├── opening_loc: (11,0)-(11,8) = "<<`HERE`"
-            ├── content_loc: (12,0)-(14,0) = "foo\nbar\n"
-            ├── closing_loc: (14,0)-(15,0) = "HERE\n"
-            └── unescaped: "foo\nbar\n"
diff --git a/test/mri/prism/snapshots/whitequark/if.txt b/test/mri/prism/snapshots/whitequark/if.txt
deleted file mode 100644
index 809a100f8c0..00000000000
--- a/test/mri/prism/snapshots/whitequark/if.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,16))
-    └── body: (length: 2)
-        ├── @ IfNode (location: (1,0)-(1,20))
-        │   ├── if_keyword_loc: (1,0)-(1,2) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,3)-(1,6))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,3)-(1,6) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (1,7)-(1,11) = "then"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,12)-(1,15))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,12)-(1,15))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (1,12)-(1,15) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (1,17)-(1,20) = "end"
-        └── @ IfNode (location: (3,0)-(3,16))
-            ├── if_keyword_loc: (3,0)-(3,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (3,3)-(3,6))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,3)-(3,6) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (3,8)-(3,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (3,8)-(3,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (3,8)-(3,11) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (3,13)-(3,16) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/if_else.txt b/test/mri/prism/snapshots/whitequark/if_else.txt
deleted file mode 100644
index c7dab47f137..00000000000
--- a/test/mri/prism/snapshots/whitequark/if_else.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,26))
-    └── body: (length: 2)
-        ├── @ IfNode (location: (1,0)-(1,30))
-        │   ├── if_keyword_loc: (1,0)-(1,2) = "if"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,3)-(1,6))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,3)-(1,6) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (1,7)-(1,11) = "then"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,12)-(1,15))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,12)-(1,15))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (1,12)-(1,15) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (1,17)-(1,30))
-        │   │   ├── else_keyword_loc: (1,17)-(1,21) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,22)-(1,25))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (1,22)-(1,25))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :baz
-        │   │   │           ├── message_loc: (1,22)-(1,25) = "baz"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (1,27)-(1,30) = "end"
-        │   └── end_keyword_loc: (1,27)-(1,30) = "end"
-        └── @ IfNode (location: (3,0)-(3,26))
-            ├── if_keyword_loc: (3,0)-(3,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (3,3)-(3,6))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,3)-(3,6) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (3,8)-(3,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (3,8)-(3,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (3,8)-(3,11) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent:
-            │   @ ElseNode (location: (3,13)-(3,26))
-            │   ├── else_keyword_loc: (3,13)-(3,17) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (3,18)-(3,21))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (3,18)-(3,21))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :baz
-            │   │           ├── message_loc: (3,18)-(3,21) = "baz"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (3,23)-(3,26) = "end"
-            └── end_keyword_loc: (3,23)-(3,26) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/if_elsif.txt b/test/mri/prism/snapshots/whitequark/if_elsif.txt
deleted file mode 100644
index 1bd1ab7f426..00000000000
--- a/test/mri/prism/snapshots/whitequark/if_elsif.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,38))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,38))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,38))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (1,3)-(1,6))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,3)-(1,6) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (1,8)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,8)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,8)-(1,11) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent:
-            │   @ IfNode (location: (1,13)-(1,38))
-            │   ├── if_keyword_loc: (1,13)-(1,18) = "elsif"
-            │   ├── predicate:
-            │   │   @ CallNode (location: (1,19)-(1,22))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :baz
-            │   │   ├── message_loc: (1,19)-(1,22) = "baz"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── then_keyword_loc: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,24)-(1,25))
-            │   │   └── body: (length: 1)
-            │   │       └── @ IntegerNode (location: (1,24)-(1,25))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── consequent:
-            │   │   @ ElseNode (location: (1,27)-(1,38))
-            │   │   ├── else_keyword_loc: (1,27)-(1,31) = "else"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,32)-(1,33))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ IntegerNode (location: (1,32)-(1,33))
-            │   │   │           ├── flags: decimal
-            │   │   │           └── value: 2
-            │   │   └── end_keyword_loc: (1,35)-(1,38) = "end"
-            │   └── end_keyword_loc: (1,35)-(1,38) = "end"
-            └── end_keyword_loc: (1,35)-(1,38) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/if_masgn__24.txt b/test/mri/prism/snapshots/whitequark/if_masgn__24.txt
deleted file mode 100644
index c76a93574db..00000000000
--- a/test/mri/prism/snapshots/whitequark/if_masgn__24.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,20))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ ParenthesesNode (location: (1,3)-(1,15))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (1,4)-(1,14))
-            │   │   └── body: (length: 1)
-            │   │       └── @ MultiWriteNode (location: (1,4)-(1,14))
-            │   │           ├── lefts: (length: 2)
-            │   │           │   ├── @ LocalVariableTargetNode (location: (1,4)-(1,5))
-            │   │           │   │   ├── name: :a
-            │   │           │   │   └── depth: 0
-            │   │           │   └── @ LocalVariableTargetNode (location: (1,7)-(1,8))
-            │   │           │       ├── name: :b
-            │   │           │       └── depth: 0
-            │   │           ├── rest: ∅
-            │   │           ├── rights: (length: 0)
-            │   │           ├── lparen_loc: ∅
-            │   │           ├── rparen_loc: ∅
-            │   │           ├── operator_loc: (1,9)-(1,10) = "="
-            │   │           └── value:
-            │   │               @ CallNode (location: (1,11)-(1,14))
-            │   │               ├── flags: variable_call, ignore_visibility
-            │   │               ├── receiver: ∅
-            │   │               ├── call_operator_loc: ∅
-            │   │               ├── name: :foo
-            │   │               ├── message_loc: (1,11)-(1,14) = "foo"
-            │   │               ├── opening_loc: ∅
-            │   │               ├── arguments: ∅
-            │   │               ├── closing_loc: ∅
-            │   │               └── block: ∅
-            │   ├── opening_loc: (1,3)-(1,4) = "("
-            │   └── closing_loc: (1,14)-(1,15) = ")"
-            ├── then_keyword_loc: ∅
-            ├── statements: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (1,17)-(1,20) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/if_mod.txt b/test/mri/prism/snapshots/whitequark/if_mod.txt
deleted file mode 100644
index 241918f020a..00000000000
--- a/test/mri/prism/snapshots/whitequark/if_mod.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,10))
-            ├── if_keyword_loc: (1,4)-(1,6) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (1,7)-(1,10))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,7)-(1,10) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (1,0)-(1,3))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,0)-(1,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,0)-(1,3) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/if_nl_then.txt b/test/mri/prism/snapshots/whitequark/if_nl_then.txt
deleted file mode 100644
index fbbafe7390e..00000000000
--- a/test/mri/prism/snapshots/whitequark/if_nl_then.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,12))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(2,12))
-            ├── if_keyword_loc: (1,0)-(1,2) = "if"
-            ├── predicate:
-            │   @ CallNode (location: (1,3)-(1,6))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,3)-(1,6) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: (2,0)-(2,4) = "then"
-            ├── statements:
-            │   @ StatementsNode (location: (2,5)-(2,8))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (2,5)-(2,8))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (2,5)-(2,8) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (2,9)-(2,12) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/if_while_after_class__since_32.txt b/test/mri/prism/snapshots/whitequark/if_while_after_class__since_32.txt
deleted file mode 100644
index 0a2982ed353..00000000000
--- a/test/mri/prism/snapshots/whitequark/if_while_after_class__since_32.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,48))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,48))
-    └── body: (length: 4)
-        ├── @ ClassNode (location: (1,0)-(1,38))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (1,0)-(1,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (1,6)-(1,33))
-        │   │   ├── parent:
-        │   │   │   @ IfNode (location: (1,6)-(1,25))
-        │   │   │   ├── if_keyword_loc: (1,6)-(1,8) = "if"
-        │   │   │   ├── predicate:
-        │   │   │   │   @ TrueNode (location: (1,9)-(1,13))
-        │   │   │   ├── then_keyword_loc: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (1,15)-(1,21))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ ConstantReadNode (location: (1,15)-(1,21))
-        │   │   │   │           └── name: :Object
-        │   │   │   ├── consequent: ∅
-        │   │   │   └── end_keyword_loc: (1,22)-(1,25) = "end"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (1,27)-(1,33))
-        │   │   │   └── name: :Kernel
-        │   │   └── delimiter_loc: (1,25)-(1,27) = "::"
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (1,35)-(1,38) = "end"
-        │   └── name: :Kernel
-        ├── @ ClassNode (location: (3,0)-(3,47))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (3,0)-(3,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (3,6)-(3,42))
-        │   │   ├── parent:
-        │   │   │   @ WhileNode (location: (3,6)-(3,34))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── keyword_loc: (3,6)-(3,11) = "while"
-        │   │   │   ├── closing_loc: (3,31)-(3,34) = "end"
-        │   │   │   ├── predicate:
-        │   │   │   │   @ TrueNode (location: (3,12)-(3,16))
-        │   │   │   └── statements:
-        │   │   │       @ StatementsNode (location: (3,18)-(3,30))
-        │   │   │       └── body: (length: 1)
-        │   │   │           └── @ BreakNode (location: (3,18)-(3,30))
-        │   │   │               ├── arguments:
-        │   │   │               │   @ ArgumentsNode (location: (3,24)-(3,30))
-        │   │   │               │   ├── flags: ∅
-        │   │   │               │   └── arguments: (length: 1)
-        │   │   │               │       └── @ ConstantReadNode (location: (3,24)-(3,30))
-        │   │   │               │           └── name: :Object
-        │   │   │               └── keyword_loc: (3,18)-(3,23) = "break"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (3,36)-(3,42))
-        │   │   │   └── name: :Kernel
-        │   │   └── delimiter_loc: (3,34)-(3,36) = "::"
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (3,44)-(3,47) = "end"
-        │   └── name: :Kernel
-        ├── @ ModuleNode (location: (5,0)-(5,39))
-        │   ├── locals: []
-        │   ├── module_keyword_loc: (5,0)-(5,6) = "module"
-        │   ├── constant_path:
-        │   │   @ ConstantPathNode (location: (5,7)-(5,34))
-        │   │   ├── parent:
-        │   │   │   @ IfNode (location: (5,7)-(5,26))
-        │   │   │   ├── if_keyword_loc: (5,7)-(5,9) = "if"
-        │   │   │   ├── predicate:
-        │   │   │   │   @ TrueNode (location: (5,10)-(5,14))
-        │   │   │   ├── then_keyword_loc: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (5,16)-(5,22))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ ConstantReadNode (location: (5,16)-(5,22))
-        │   │   │   │           └── name: :Object
-        │   │   │   ├── consequent: ∅
-        │   │   │   └── end_keyword_loc: (5,23)-(5,26) = "end"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,28)-(5,34))
-        │   │   │   └── name: :Kernel
-        │   │   └── delimiter_loc: (5,26)-(5,28) = "::"
-        │   ├── body: ∅
-        │   ├── end_keyword_loc: (5,36)-(5,39) = "end"
-        │   └── name: :Kernel
-        └── @ ModuleNode (location: (7,0)-(7,48))
-            ├── locals: []
-            ├── module_keyword_loc: (7,0)-(7,6) = "module"
-            ├── constant_path:
-            │   @ ConstantPathNode (location: (7,7)-(7,43))
-            │   ├── parent:
-            │   │   @ WhileNode (location: (7,7)-(7,35))
-            │   │   ├── flags: ∅
-            │   │   ├── keyword_loc: (7,7)-(7,12) = "while"
-            │   │   ├── closing_loc: (7,32)-(7,35) = "end"
-            │   │   ├── predicate:
-            │   │   │   @ TrueNode (location: (7,13)-(7,17))
-            │   │   └── statements:
-            │   │       @ StatementsNode (location: (7,19)-(7,31))
-            │   │       └── body: (length: 1)
-            │   │           └── @ BreakNode (location: (7,19)-(7,31))
-            │   │               ├── arguments:
-            │   │               │   @ ArgumentsNode (location: (7,25)-(7,31))
-            │   │               │   ├── flags: ∅
-            │   │               │   └── arguments: (length: 1)
-            │   │               │       └── @ ConstantReadNode (location: (7,25)-(7,31))
-            │   │               │           └── name: :Object
-            │   │               └── keyword_loc: (7,19)-(7,24) = "break"
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (7,37)-(7,43))
-            │   │   └── name: :Kernel
-            │   └── delimiter_loc: (7,35)-(7,37) = "::"
-            ├── body: ∅
-            ├── end_keyword_loc: (7,45)-(7,48) = "end"
-            └── name: :Kernel
diff --git a/test/mri/prism/snapshots/whitequark/int.txt b/test/mri/prism/snapshots/whitequark/int.txt
deleted file mode 100644
index 6fee32f1175..00000000000
--- a/test/mri/prism/snapshots/whitequark/int.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,2))
-    └── body: (length: 3)
-        ├── @ IntegerNode (location: (1,0)-(1,3))
-        │   ├── flags: decimal
-        │   └── value: 42
-        ├── @ IntegerNode (location: (3,0)-(3,3))
-        │   ├── flags: decimal
-        │   └── value: -42
-        └── @ IntegerNode (location: (5,0)-(5,2))
-            ├── flags: decimal
-            └── value: 42
diff --git a/test/mri/prism/snapshots/whitequark/int___LINE__.txt b/test/mri/prism/snapshots/whitequark/int___LINE__.txt
deleted file mode 100644
index bf2ea47102f..00000000000
--- a/test/mri/prism/snapshots/whitequark/int___LINE__.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ SourceLineNode (location: (1,0)-(1,8))
diff --git a/test/mri/prism/snapshots/whitequark/interp_digit_var.txt b/test/mri/prism/snapshots/whitequark/interp_digit_var.txt
deleted file mode 100644
index 09d90981058..00000000000
--- a/test/mri/prism/snapshots/whitequark/interp_digit_var.txt
+++ /dev/null
@@ -1,273 +0,0 @@
-@ ProgramNode (location: (1,1)-(85,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,1)-(85,9))
-    └── body: (length: 38)
-        ├── @ StringNode (location: (1,1)-(1,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,1)-(1,2) = "\""
-        │   ├── content_loc: (1,2)-(1,5) = "\#@1"
-        │   ├── closing_loc: (1,5)-(1,6) = "\""
-        │   └── unescaped: "\#@1"
-        ├── @ StringNode (location: (3,1)-(3,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (3,1)-(3,2) = "\""
-        │   ├── content_loc: (3,2)-(3,6) = "\#@@1"
-        │   ├── closing_loc: (3,6)-(3,7) = "\""
-        │   └── unescaped: "\#@@1"
-        ├── @ ArrayNode (location: (5,1)-(5,8))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ SymbolNode (location: (5,4)-(5,7))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (5,4)-(5,7) = "\#@1"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#@1"
-        │   ├── opening_loc: (5,1)-(5,4) = "%I["
-        │   └── closing_loc: (5,7)-(5,8) = "]"
-        ├── @ ArrayNode (location: (7,1)-(7,9))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ SymbolNode (location: (7,4)-(7,8))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (7,4)-(7,8) = "\#@@1"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#@@1"
-        │   ├── opening_loc: (7,1)-(7,4) = "%I["
-        │   └── closing_loc: (7,8)-(7,9) = "]"
-        ├── @ StringNode (location: (9,1)-(9,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (9,1)-(9,4) = "%Q{"
-        │   ├── content_loc: (9,4)-(9,7) = "\#@1"
-        │   ├── closing_loc: (9,7)-(9,8) = "}"
-        │   └── unescaped: "\#@1"
-        ├── @ StringNode (location: (11,1)-(11,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (11,1)-(11,4) = "%Q{"
-        │   ├── content_loc: (11,4)-(11,8) = "\#@@1"
-        │   ├── closing_loc: (11,8)-(11,9) = "}"
-        │   └── unescaped: "\#@@1"
-        ├── @ ArrayNode (location: (13,1)-(13,8))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (13,4)-(13,7))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (13,4)-(13,7) = "\#@1"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#@1"
-        │   ├── opening_loc: (13,1)-(13,4) = "%W["
-        │   └── closing_loc: (13,7)-(13,8) = "]"
-        ├── @ ArrayNode (location: (15,1)-(15,9))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (15,4)-(15,8))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (15,4)-(15,8) = "\#@@1"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#@@1"
-        │   ├── opening_loc: (15,1)-(15,4) = "%W["
-        │   └── closing_loc: (15,8)-(15,9) = "]"
-        ├── @ ArrayNode (location: (17,1)-(17,10))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ SymbolNode (location: (17,5)-(17,8))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (17,5)-(17,8) = "\#@1"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#@1"
-        │   ├── opening_loc: (17,1)-(17,4) = "%i["
-        │   └── closing_loc: (17,9)-(17,10) = "]"
-        ├── @ ArrayNode (location: (19,1)-(19,11))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ SymbolNode (location: (19,5)-(19,9))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (19,5)-(19,9) = "\#@@1"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#@@1"
-        │   ├── opening_loc: (19,1)-(19,4) = "%i["
-        │   └── closing_loc: (19,10)-(19,11) = "]"
-        ├── @ StringNode (location: (21,1)-(21,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (21,1)-(21,4) = "%q{"
-        │   ├── content_loc: (21,4)-(21,7) = "\#@1"
-        │   ├── closing_loc: (21,7)-(21,8) = "}"
-        │   └── unescaped: "\#@1"
-        ├── @ StringNode (location: (23,1)-(23,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (23,1)-(23,4) = "%q{"
-        │   ├── content_loc: (23,4)-(23,8) = "\#@@1"
-        │   ├── closing_loc: (23,8)-(23,9) = "}"
-        │   └── unescaped: "\#@@1"
-        ├── @ RegularExpressionNode (location: (25,1)-(25,8))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (25,1)-(25,4) = "%r{"
-        │   ├── content_loc: (25,4)-(25,7) = "\#@1"
-        │   ├── closing_loc: (25,7)-(25,8) = "}"
-        │   └── unescaped: "\#@1"
-        ├── @ RegularExpressionNode (location: (27,1)-(27,9))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (27,1)-(27,4) = "%r{"
-        │   ├── content_loc: (27,4)-(27,8) = "\#@@1"
-        │   ├── closing_loc: (27,8)-(27,9) = "}"
-        │   └── unescaped: "\#@@1"
-        ├── @ SymbolNode (location: (29,1)-(29,8))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (29,1)-(29,4) = "%s{"
-        │   ├── value_loc: (29,4)-(29,7) = "\#@1"
-        │   ├── closing_loc: (29,7)-(29,8) = "}"
-        │   └── unescaped: "\#@1"
-        ├── @ SymbolNode (location: (31,1)-(31,9))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (31,1)-(31,4) = "%s{"
-        │   ├── value_loc: (31,4)-(31,8) = "\#@@1"
-        │   ├── closing_loc: (31,8)-(31,9) = "}"
-        │   └── unescaped: "\#@@1"
-        ├── @ ArrayNode (location: (33,1)-(33,10))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (33,5)-(33,8))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (33,5)-(33,8) = "\#@1"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#@1"
-        │   ├── opening_loc: (33,1)-(33,4) = "%w["
-        │   └── closing_loc: (33,9)-(33,10) = "]"
-        ├── @ ArrayNode (location: (35,1)-(35,11))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (35,5)-(35,9))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (35,5)-(35,9) = "\#@@1"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "\#@@1"
-        │   ├── opening_loc: (35,1)-(35,4) = "%w["
-        │   └── closing_loc: (35,10)-(35,11) = "]"
-        ├── @ XStringNode (location: (37,1)-(37,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (37,1)-(37,4) = "%x{"
-        │   ├── content_loc: (37,4)-(37,7) = "\#@1"
-        │   ├── closing_loc: (37,7)-(37,8) = "}"
-        │   └── unescaped: "\#@1"
-        ├── @ XStringNode (location: (39,1)-(39,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (39,1)-(39,4) = "%x{"
-        │   ├── content_loc: (39,4)-(39,8) = "\#@@1"
-        │   ├── closing_loc: (39,8)-(39,9) = "}"
-        │   └── unescaped: "\#@@1"
-        ├── @ StringNode (location: (41,1)-(41,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (41,1)-(41,3) = "%{"
-        │   ├── content_loc: (41,3)-(41,6) = "\#@1"
-        │   ├── closing_loc: (41,6)-(41,7) = "}"
-        │   └── unescaped: "\#@1"
-        ├── @ StringNode (location: (43,1)-(43,8))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (43,1)-(43,3) = "%{"
-        │   ├── content_loc: (43,3)-(43,7) = "\#@@1"
-        │   ├── closing_loc: (43,7)-(43,8) = "}"
-        │   └── unescaped: "\#@@1"
-        ├── @ StringNode (location: (45,1)-(45,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (45,1)-(45,2) = "'"
-        │   ├── content_loc: (45,2)-(45,5) = "\#@1"
-        │   ├── closing_loc: (45,5)-(45,6) = "'"
-        │   └── unescaped: "\#@1"
-        ├── @ StringNode (location: (47,1)-(47,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (47,1)-(47,2) = "'"
-        │   ├── content_loc: (47,2)-(47,6) = "\#@@1"
-        │   ├── closing_loc: (47,6)-(47,7) = "'"
-        │   └── unescaped: "\#@@1"
-        ├── @ RegularExpressionNode (location: (49,1)-(49,6))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (49,1)-(49,2) = "/"
-        │   ├── content_loc: (49,2)-(49,5) = "\#@1"
-        │   ├── closing_loc: (49,5)-(49,6) = "/"
-        │   └── unescaped: "\#@1"
-        ├── @ RegularExpressionNode (location: (51,1)-(51,7))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (51,1)-(51,2) = "/"
-        │   ├── content_loc: (51,2)-(51,6) = "\#@@1"
-        │   ├── closing_loc: (51,6)-(51,7) = "/"
-        │   └── unescaped: "\#@@1"
-        ├── @ SymbolNode (location: (53,1)-(53,7))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (53,1)-(53,3) = ":\""
-        │   ├── value_loc: (53,3)-(53,6) = "\#@1"
-        │   ├── closing_loc: (53,6)-(53,7) = "\""
-        │   └── unescaped: "\#@1"
-        ├── @ SymbolNode (location: (55,1)-(55,8))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (55,1)-(55,3) = ":\""
-        │   ├── value_loc: (55,3)-(55,7) = "\#@@1"
-        │   ├── closing_loc: (55,7)-(55,8) = "\""
-        │   └── unescaped: "\#@@1"
-        ├── @ SymbolNode (location: (57,1)-(57,7))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (57,1)-(57,3) = ":'"
-        │   ├── value_loc: (57,3)-(57,6) = "\#@1"
-        │   ├── closing_loc: (57,6)-(57,7) = "'"
-        │   └── unescaped: "\#@1"
-        ├── @ SymbolNode (location: (59,1)-(59,8))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (59,1)-(59,3) = ":'"
-        │   ├── value_loc: (59,3)-(59,7) = "\#@@1"
-        │   ├── closing_loc: (59,7)-(59,8) = "'"
-        │   └── unescaped: "\#@@1"
-        ├── @ XStringNode (location: (61,1)-(61,6))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (61,1)-(61,2) = "`"
-        │   ├── content_loc: (61,2)-(61,5) = "\#@1"
-        │   ├── closing_loc: (61,5)-(61,6) = "`"
-        │   └── unescaped: "\#@1"
-        ├── @ XStringNode (location: (63,1)-(63,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (63,1)-(63,2) = "`"
-        │   ├── content_loc: (63,2)-(63,6) = "\#@@1"
-        │   ├── closing_loc: (63,6)-(63,7) = "`"
-        │   └── unescaped: "\#@@1"
-        ├── @ StringNode (location: (65,0)-(65,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (65,0)-(65,9) = "<<-\"HERE\""
-        │   ├── content_loc: (66,0)-(67,0) = "\#@1\n"
-        │   ├── closing_loc: (67,0)-(68,0) = "HERE\n"
-        │   └── unescaped: "\#@1\n"
-        ├── @ StringNode (location: (69,0)-(69,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (69,0)-(69,9) = "<<-\"HERE\""
-        │   ├── content_loc: (70,0)-(71,0) = "\#@@1\n"
-        │   ├── closing_loc: (71,0)-(72,0) = "HERE\n"
-        │   └── unescaped: "\#@@1\n"
-        ├── @ StringNode (location: (73,0)-(73,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (73,0)-(73,9) = "<<-'HERE'"
-        │   ├── content_loc: (74,0)-(75,0) = "\#@1\n"
-        │   ├── closing_loc: (75,0)-(76,0) = "HERE\n"
-        │   └── unescaped: "\#@1\n"
-        ├── @ StringNode (location: (77,0)-(77,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (77,0)-(77,9) = "<<-'HERE'"
-        │   ├── content_loc: (78,0)-(79,0) = "\#@@1\n"
-        │   ├── closing_loc: (79,0)-(80,0) = "HERE\n"
-        │   └── unescaped: "\#@@1\n"
-        ├── @ XStringNode (location: (81,0)-(81,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (81,0)-(81,9) = "<<-`HERE`"
-        │   ├── content_loc: (82,0)-(83,0) = "\#@1\n"
-        │   ├── closing_loc: (83,0)-(84,0) = "HERE\n"
-        │   └── unescaped: "\#@1\n"
-        └── @ XStringNode (location: (85,0)-(85,9))
-            ├── flags: ∅
-            ├── opening_loc: (85,0)-(85,9) = "<<-`HERE`"
-            ├── content_loc: (86,0)-(87,0) = "\#@@1\n"
-            ├── closing_loc: (87,0)-(88,0) = "HERE\n"
-            └── unescaped: "\#@@1\n"
diff --git a/test/mri/prism/snapshots/whitequark/ivar.txt b/test/mri/prism/snapshots/whitequark/ivar.txt
deleted file mode 100644
index 9c70e6e9595..00000000000
--- a/test/mri/prism/snapshots/whitequark/ivar.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ InstanceVariableReadNode (location: (1,0)-(1,4))
-            └── name: :@foo
diff --git a/test/mri/prism/snapshots/whitequark/ivasgn.txt b/test/mri/prism/snapshots/whitequark/ivasgn.txt
deleted file mode 100644
index 2b57f395541..00000000000
--- a/test/mri/prism/snapshots/whitequark/ivasgn.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ InstanceVariableWriteNode (location: (1,0)-(1,9))
-            ├── name: :@var
-            ├── name_loc: (1,0)-(1,4) = "@var"
-            ├── value:
-            │   @ IntegerNode (location: (1,7)-(1,9))
-            │   ├── flags: decimal
-            │   └── value: 10
-            └── operator_loc: (1,5)-(1,6) = "="
diff --git a/test/mri/prism/snapshots/whitequark/keyword_argument_omission.txt b/test/mri/prism/snapshots/whitequark/keyword_argument_omission.txt
deleted file mode 100644
index 62e8fecf4e9..00000000000
--- a/test/mri/prism/snapshots/whitequark/keyword_argument_omission.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,11))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo
-            ├── message_loc: (1,0)-(1,3) = "foo"
-            ├── opening_loc: (1,3)-(1,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,4)-(1,10))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 2)
-            │               ├── @ AssocNode (location: (1,4)-(1,6))
-            │               │   ├── key:
-            │               │   │   @ SymbolNode (location: (1,4)-(1,6))
-            │               │   │   ├── flags: forced_us_ascii_encoding
-            │               │   │   ├── opening_loc: ∅
-            │               │   │   ├── value_loc: (1,4)-(1,5) = "a"
-            │               │   │   ├── closing_loc: (1,5)-(1,6) = ":"
-            │               │   │   └── unescaped: "a"
-            │               │   ├── value:
-            │               │   │   @ ImplicitNode (location: (1,4)-(1,6))
-            │               │   │   └── value:
-            │               │   │       @ CallNode (location: (1,4)-(1,6))
-            │               │   │       ├── flags: ignore_visibility
-            │               │   │       ├── receiver: ∅
-            │               │   │       ├── call_operator_loc: ∅
-            │               │   │       ├── name: :a
-            │               │   │       ├── message_loc: (1,4)-(1,5) = "a"
-            │               │   │       ├── opening_loc: ∅
-            │               │   │       ├── arguments: ∅
-            │               │   │       ├── closing_loc: ∅
-            │               │   │       └── block: ∅
-            │               │   └── operator_loc: ∅
-            │               └── @ AssocNode (location: (1,8)-(1,10))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,8)-(1,10))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (1,8)-(1,9) = "b"
-            │                   │   ├── closing_loc: (1,9)-(1,10) = ":"
-            │                   │   └── unescaped: "b"
-            │                   ├── value:
-            │                   │   @ ImplicitNode (location: (1,8)-(1,10))
-            │                   │   └── value:
-            │                   │       @ CallNode (location: (1,8)-(1,10))
-            │                   │       ├── flags: ignore_visibility
-            │                   │       ├── receiver: ∅
-            │                   │       ├── call_operator_loc: ∅
-            │                   │       ├── name: :b
-            │                   │       ├── message_loc: (1,8)-(1,9) = "b"
-            │                   │       ├── opening_loc: ∅
-            │                   │       ├── arguments: ∅
-            │                   │       ├── closing_loc: ∅
-            │                   │       └── block: ∅
-            │                   └── operator_loc: ∅
-            ├── closing_loc: (1,10)-(1,11) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/kwarg.txt b/test/mri/prism/snapshots/whitequark/kwarg.txt
deleted file mode 100644
index 5969402356a..00000000000
--- a/test/mri/prism/snapshots/whitequark/kwarg.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,16))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,10))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ RequiredKeywordParameterNode (location: (1,6)-(1,10))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :foo
-            │   │       └── name_loc: (1,6)-(1,10) = "foo:"
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:foo]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,10)-(1,11) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,13)-(1,16) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/kwbegin_compstmt.txt b/test/mri/prism/snapshots/whitequark/kwbegin_compstmt.txt
deleted file mode 100644
index 376e628f8e4..00000000000
--- a/test/mri/prism/snapshots/whitequark/kwbegin_compstmt.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,20))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,20))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,6)-(1,16))
-            │   └── body: (length: 2)
-            │       ├── @ CallNode (location: (1,6)-(1,10))
-            │       │   ├── flags: ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :foo!
-            │       │   ├── message_loc: (1,6)-(1,10) = "foo!"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ CallNode (location: (1,12)-(1,16))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar!
-            │           ├── message_loc: (1,12)-(1,16) = "bar!"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (1,17)-(1,20) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/kwnilarg.txt b/test/mri/prism/snapshots/whitequark/kwnilarg.txt
deleted file mode 100644
index 492f8176969..00000000000
--- a/test/mri/prism/snapshots/whitequark/kwnilarg.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,13))
-    └── body: (length: 3)
-        ├── @ LambdaNode (location: (1,0)-(1,12))
-        │   ├── locals: []
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (1,10)-(1,11) = "{"
-        │   ├── closing_loc: (1,11)-(1,12) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (1,2)-(1,9))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (1,3)-(1,8))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest:
-        │   │   │   │   @ NoKeywordsParameterNode (location: (1,3)-(1,8))
-        │   │   │   │   ├── operator_loc: (1,3)-(1,5) = "**"
-        │   │   │   │   └── keyword_loc: (1,5)-(1,8) = "nil"
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (1,2)-(1,3) = "("
-        │   │   └── closing_loc: (1,8)-(1,9) = ")"
-        │   └── body: ∅
-        ├── @ DefNode (location: (3,0)-(3,17))
-        │   ├── name: :f
-        │   ├── name_loc: (3,4)-(3,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (3,6)-(3,11))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest:
-        │   │   │   @ NoKeywordsParameterNode (location: (3,6)-(3,11))
-        │   │   │   ├── operator_loc: (3,6)-(3,8) = "**"
-        │   │   │   └── keyword_loc: (3,8)-(3,11) = "nil"
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: (3,5)-(3,6) = "("
-        │   ├── rparen_loc: (3,11)-(3,12) = ")"
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,14)-(3,17) = "end"
-        └── @ CallNode (location: (5,0)-(5,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (5,0)-(5,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (5,2)-(5,13))
-                ├── locals: []
-                ├── parameters:
-                │   @ BlockParametersNode (location: (5,4)-(5,11))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (5,5)-(5,10))
-                │   │   ├── requireds: (length: 0)
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest:
-                │   │   │   @ NoKeywordsParameterNode (location: (5,5)-(5,10))
-                │   │   │   ├── operator_loc: (5,5)-(5,7) = "**"
-                │   │   │   └── keyword_loc: (5,7)-(5,10) = "nil"
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (5,4)-(5,5) = "|"
-                │   └── closing_loc: (5,10)-(5,11) = "|"
-                ├── body: ∅
-                ├── opening_loc: (5,2)-(5,3) = "{"
-                └── closing_loc: (5,12)-(5,13) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/kwoptarg.txt b/test/mri/prism/snapshots/whitequark/kwoptarg.txt
deleted file mode 100644
index 9c2c4f9c4ce..00000000000
--- a/test/mri/prism/snapshots/whitequark/kwoptarg.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,18))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,12))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,6)-(1,12))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :foo
-            │   │       ├── name_loc: (1,6)-(1,10) = "foo:"
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (1,11)-(1,12))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:foo]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,12)-(1,13) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,15)-(1,18) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt b/test/mri/prism/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt
deleted file mode 100644
index 6d0bdfb817b..00000000000
--- a/test/mri/prism/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,28))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,28))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,16))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 1)
-            │   │   └── @ OptionalKeywordParameterNode (location: (1,6)-(1,12))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :a
-            │   │       ├── name_loc: (1,6)-(1,8) = "a:"
-            │   │       └── value:
-            │   │           @ NilNode (location: (1,9)-(1,12))
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,14)-(1,16))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,14)-(1,16) = "**"
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,19)-(1,24))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,19)-(1,24))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :b
-            │           ├── message_loc: (1,19)-(1,20) = "b"
-            │           ├── opening_loc: (1,20)-(1,21) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,21)-(1,23))
-            │           │   ├── flags: contains_keyword_splat
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ KeywordHashNode (location: (1,21)-(1,23))
-            │           │           ├── flags: ∅
-            │           │           └── elements: (length: 1)
-            │           │               └── @ AssocSplatNode (location: (1,21)-(1,23))
-            │           │                   ├── value: ∅
-            │           │                   └── operator_loc: (1,21)-(1,23) = "**"
-            │           ├── closing_loc: (1,23)-(1,24) = ")"
-            │           └── block: ∅
-            ├── locals: [:a]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,16)-(1,17) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,25)-(1,28) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/kwrestarg_named.txt b/test/mri/prism/snapshots/whitequark/kwrestarg_named.txt
deleted file mode 100644
index d24426aed53..00000000000
--- a/test/mri/prism/snapshots/whitequark/kwrestarg_named.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,17))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,11))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,6)-(1,11))
-            │   │   ├── flags: ∅
-            │   │   ├── name: :foo
-            │   │   ├── name_loc: (1,8)-(1,11) = "foo"
-            │   │   └── operator_loc: (1,6)-(1,8) = "**"
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:foo]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,11)-(1,12) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,14)-(1,17) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/kwrestarg_unnamed.txt b/test/mri/prism/snapshots/whitequark/kwrestarg_unnamed.txt
deleted file mode 100644
index d471e5ab09b..00000000000
--- a/test/mri/prism/snapshots/whitequark/kwrestarg_unnamed.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,14))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,8))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ KeywordRestParameterNode (location: (1,6)-(1,8))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,6)-(1,8) = "**"
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,8)-(1,9) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,11)-(1,14) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt b/test/mri/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt
deleted file mode 100644
index f877fcd2703..00000000000
--- a/test/mri/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,22))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,22))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :let
-            ├── message_loc: (1,0)-(1,3) = "let"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,4)-(1,8))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,5)-(1,7))
-            │           │   └── body: (length: 1)
-            │           │       └── @ SymbolNode (location: (1,5)-(1,7))
-            │           │           ├── flags: forced_us_ascii_encoding
-            │           │           ├── opening_loc: (1,5)-(1,6) = ":"
-            │           │           ├── value_loc: (1,6)-(1,7) = "a"
-            │           │           ├── closing_loc: ∅
-            │           │           └── unescaped: "a"
-            │           ├── opening_loc: (1,4)-(1,5) = "("
-            │           └── closing_loc: (1,7)-(1,8) = ")"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,9)-(1,22))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (1,11)-(1,20))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (1,11)-(1,20))
-                │           ├── flags: ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :m
-                │           ├── message_loc: (1,11)-(1,12) = "m"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block:
-                │               @ BlockNode (location: (1,13)-(1,20))
-                │               ├── locals: []
-                │               ├── parameters: ∅
-                │               ├── body: ∅
-                │               ├── opening_loc: (1,13)-(1,15) = "do"
-                │               └── closing_loc: (1,17)-(1,20) = "end"
-                ├── opening_loc: (1,9)-(1,10) = "{"
-                └── closing_loc: (1,21)-(1,22) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/lparenarg_after_lvar__since_25.txt b/test/mri/prism/snapshots/whitequark/lparenarg_after_lvar__since_25.txt
deleted file mode 100644
index afddc9cd3c6..00000000000
--- a/test/mri/prism/snapshots/whitequark/lparenarg_after_lvar__since_25.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,15))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,14))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :foo
-        │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,4)-(1,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (1,4)-(1,14))
-        │   │           ├── flags: ∅
-        │   │           ├── receiver:
-        │   │           │   @ ParenthesesNode (location: (1,4)-(1,10))
-        │   │           │   ├── body:
-        │   │           │   │   @ StatementsNode (location: (1,5)-(1,9))
-        │   │           │   │   └── body: (length: 1)
-        │   │           │   │       └── @ FloatNode (location: (1,5)-(1,9))
-        │   │           │   │           └── value: -1.3
-        │   │           │   ├── opening_loc: (1,4)-(1,5) = "("
-        │   │           │   └── closing_loc: (1,9)-(1,10) = ")"
-        │   │           ├── call_operator_loc: (1,10)-(1,11) = "."
-        │   │           ├── name: :abs
-        │   │           ├── message_loc: (1,11)-(1,14) = "abs"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,15))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :meth
-            ├── message_loc: (3,0)-(3,4) = "meth"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,5)-(3,15))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (3,5)-(3,15))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ ParenthesesNode (location: (3,5)-(3,11))
-            │           │   ├── body:
-            │           │   │   @ StatementsNode (location: (3,6)-(3,10))
-            │           │   │   └── body: (length: 1)
-            │           │   │       └── @ FloatNode (location: (3,6)-(3,10))
-            │           │   │           └── value: -1.3
-            │           │   ├── opening_loc: (3,5)-(3,6) = "("
-            │           │   └── closing_loc: (3,10)-(3,11) = ")"
-            │           ├── call_operator_loc: (3,11)-(3,12) = "."
-            │           ├── name: :abs
-            │           ├── message_loc: (3,12)-(3,15) = "abs"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/lvar.txt b/test/mri/prism/snapshots/whitequark/lvar.txt
deleted file mode 100644
index afceb6a1a43..00000000000
--- a/test/mri/prism/snapshots/whitequark/lvar.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,3))
-            ├── flags: variable_call, ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :foo
-            ├── message_loc: (1,0)-(1,3) = "foo"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/lvar_injecting_match.txt b/test/mri/prism/snapshots/whitequark/lvar_injecting_match.txt
deleted file mode 100644
index 0d1df23d0d9..00000000000
--- a/test/mri/prism/snapshots/whitequark/lvar_injecting_match.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,31))
-├── locals: [:match]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,31))
-    └── body: (length: 2)
-        ├── @ MatchWriteNode (location: (1,0)-(1,24))
-        │   ├── call:
-        │   │   @ CallNode (location: (1,0)-(1,24))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ RegularExpressionNode (location: (1,0)-(1,15))
-        │   │   │   ├── flags: forced_us_ascii_encoding
-        │   │   │   ├── opening_loc: (1,0)-(1,1) = "/"
-        │   │   │   ├── content_loc: (1,1)-(1,14) = "(?<match>bar)"
-        │   │   │   ├── closing_loc: (1,14)-(1,15) = "/"
-        │   │   │   └── unescaped: "(?<match>bar)"
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :=~
-        │   │   ├── message_loc: (1,16)-(1,18) = "=~"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (1,19)-(1,24))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ StringNode (location: (1,19)-(1,24))
-        │   │   │           ├── flags: ∅
-        │   │   │           ├── opening_loc: (1,19)-(1,20) = "'"
-        │   │   │           ├── content_loc: (1,20)-(1,23) = "bar"
-        │   │   │           ├── closing_loc: (1,23)-(1,24) = "'"
-        │   │   │           └── unescaped: "bar"
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── targets: (length: 1)
-        │       └── @ LocalVariableTargetNode (location: (1,4)-(1,9))
-        │           ├── name: :match
-        │           └── depth: 0
-        └── @ LocalVariableReadNode (location: (1,26)-(1,31))
-            ├── name: :match
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/lvasgn.txt b/test/mri/prism/snapshots/whitequark/lvasgn.txt
deleted file mode 100644
index be35c005875..00000000000
--- a/test/mri/prism/snapshots/whitequark/lvasgn.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: [:var]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 2)
-        ├── @ LocalVariableWriteNode (location: (1,0)-(1,8))
-        │   ├── name: :var
-        │   ├── depth: 0
-        │   ├── name_loc: (1,0)-(1,3) = "var"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,6)-(1,8))
-        │   │   ├── flags: decimal
-        │   │   └── value: 10
-        │   └── operator_loc: (1,4)-(1,5) = "="
-        └── @ LocalVariableReadNode (location: (1,10)-(1,13))
-            ├── name: :var
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/masgn.txt b/test/mri/prism/snapshots/whitequark/masgn.txt
deleted file mode 100644
index 32e46bfdf7a..00000000000
--- a/test/mri/prism/snapshots/whitequark/masgn.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,20))
-├── locals: [:foo, :bar, :baz]
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,20))
-    └── body: (length: 3)
-        ├── @ MultiWriteNode (location: (1,0)-(1,17))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (1,1)-(1,4))
-        │   │   │   ├── name: :foo
-        │   │   │   └── depth: 0
-        │   │   └── @ LocalVariableTargetNode (location: (1,6)-(1,9))
-        │   │       ├── name: :bar
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (1,0)-(1,1) = "("
-        │   ├── rparen_loc: (1,9)-(1,10) = ")"
-        │   ├── operator_loc: (1,11)-(1,12) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (1,13)-(1,17))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (1,13)-(1,14))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (1,16)-(1,17))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ MultiWriteNode (location: (3,0)-(3,15))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (3,0)-(3,3))
-        │   │   │   ├── name: :foo
-        │   │   │   └── depth: 0
-        │   │   └── @ LocalVariableTargetNode (location: (3,5)-(3,8))
-        │   │       ├── name: :bar
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (3,9)-(3,10) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (3,11)-(3,15))
-        │       ├── flags: ∅
-        │       ├── elements: (length: 2)
-        │       │   ├── @ IntegerNode (location: (3,11)-(3,12))
-        │       │   │   ├── flags: decimal
-        │       │   │   └── value: 1
-        │       │   └── @ IntegerNode (location: (3,14)-(3,15))
-        │       │       ├── flags: decimal
-        │       │       └── value: 2
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        └── @ MultiWriteNode (location: (5,0)-(5,20))
-            ├── lefts: (length: 3)
-            │   ├── @ LocalVariableTargetNode (location: (5,0)-(5,3))
-            │   │   ├── name: :foo
-            │   │   └── depth: 0
-            │   ├── @ LocalVariableTargetNode (location: (5,5)-(5,8))
-            │   │   ├── name: :bar
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (5,10)-(5,13))
-            │       ├── name: :baz
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (5,14)-(5,15) = "="
-            └── value:
-                @ ArrayNode (location: (5,16)-(5,20))
-                ├── flags: ∅
-                ├── elements: (length: 2)
-                │   ├── @ IntegerNode (location: (5,16)-(5,17))
-                │   │   ├── flags: decimal
-                │   │   └── value: 1
-                │   └── @ IntegerNode (location: (5,19)-(5,20))
-                │       ├── flags: decimal
-                │       └── value: 2
-                ├── opening_loc: ∅
-                └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/masgn_attr.txt b/test/mri/prism/snapshots/whitequark/masgn_attr.txt
deleted file mode 100644
index f4f4276597f..00000000000
--- a/test/mri/prism/snapshots/whitequark/masgn_attr.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,18))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,18))
-    └── body: (length: 3)
-        ├── @ MultiWriteNode (location: (1,0)-(1,17))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ CallTargetNode (location: (1,0)-(1,6))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver:
-        │   │   │   │   @ SelfNode (location: (1,0)-(1,4))
-        │   │   │   ├── call_operator_loc: (1,4)-(1,5) = "."
-        │   │   │   ├── name: :A=
-        │   │   │   └── message_loc: (1,5)-(1,6) = "A"
-        │   │   └── @ LocalVariableTargetNode (location: (1,8)-(1,11))
-        │   │       ├── name: :foo
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (1,12)-(1,13) = "="
-        │   └── value:
-        │       @ LocalVariableReadNode (location: (1,14)-(1,17))
-        │       ├── name: :foo
-        │       └── depth: 0
-        ├── @ MultiWriteNode (location: (3,0)-(3,24))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ CallTargetNode (location: (3,0)-(3,6))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver:
-        │   │   │   │   @ SelfNode (location: (3,0)-(3,4))
-        │   │   │   ├── call_operator_loc: (3,4)-(3,5) = "."
-        │   │   │   ├── name: :a=
-        │   │   │   └── message_loc: (3,5)-(3,6) = "a"
-        │   │   └── @ IndexTargetNode (location: (3,8)-(3,18))
-        │   │       ├── flags: attribute_write, ignore_visibility
-        │   │       ├── receiver:
-        │   │       │   @ SelfNode (location: (3,8)-(3,12))
-        │   │       ├── opening_loc: (3,12)-(3,13) = "["
-        │   │       ├── arguments:
-        │   │       │   @ ArgumentsNode (location: (3,13)-(3,17))
-        │   │       │   ├── flags: ∅
-        │   │       │   └── arguments: (length: 2)
-        │   │       │       ├── @ IntegerNode (location: (3,13)-(3,14))
-        │   │       │       │   ├── flags: decimal
-        │   │       │       │   └── value: 1
-        │   │       │       └── @ IntegerNode (location: (3,16)-(3,17))
-        │   │       │           ├── flags: decimal
-        │   │       │           └── value: 2
-        │   │       ├── closing_loc: (3,17)-(3,18) = "]"
-        │   │       └── block: ∅
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (3,19)-(3,20) = "="
-        │   └── value:
-        │       @ LocalVariableReadNode (location: (3,21)-(3,24))
-        │       ├── name: :foo
-        │       └── depth: 0
-        └── @ MultiWriteNode (location: (5,0)-(5,18))
-            ├── lefts: (length: 2)
-            │   ├── @ CallTargetNode (location: (5,0)-(5,7))
-            │   │   ├── flags: ignore_visibility
-            │   │   ├── receiver:
-            │   │   │   @ SelfNode (location: (5,0)-(5,4))
-            │   │   ├── call_operator_loc: (5,4)-(5,6) = "::"
-            │   │   ├── name: :a=
-            │   │   └── message_loc: (5,6)-(5,7) = "a"
-            │   └── @ LocalVariableTargetNode (location: (5,9)-(5,12))
-            │       ├── name: :foo
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (5,13)-(5,14) = "="
-            └── value:
-                @ LocalVariableReadNode (location: (5,15)-(5,18))
-                ├── name: :foo
-                └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/masgn_cmd.txt b/test/mri/prism/snapshots/whitequark/masgn_cmd.txt
deleted file mode 100644
index 1c62658ab2b..00000000000
--- a/test/mri/prism/snapshots/whitequark/masgn_cmd.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: [:foo, :bar]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,16))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,3))
-            │   │   ├── name: :foo
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,5)-(1,8))
-            │       ├── name: :bar
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,9)-(1,10) = "="
-            └── value:
-                @ CallNode (location: (1,11)-(1,16))
-                ├── flags: ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :m
-                ├── message_loc: (1,11)-(1,12) = "m"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (1,13)-(1,16))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 1)
-                │       └── @ LocalVariableReadNode (location: (1,13)-(1,16))
-                │           ├── name: :foo
-                │           └── depth: 0
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/masgn_const.txt b/test/mri/prism/snapshots/whitequark/masgn_const.txt
deleted file mode 100644
index 56169deb17b..00000000000
--- a/test/mri/prism/snapshots/whitequark/masgn_const.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,18))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,18))
-    └── body: (length: 2)
-        ├── @ MultiWriteNode (location: (1,0)-(1,14))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ ConstantPathTargetNode (location: (1,0)-(1,3))
-        │   │   │   ├── parent: ∅
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-        │   │   │   │   └── name: :A
-        │   │   │   └── delimiter_loc: (1,0)-(1,2) = "::"
-        │   │   └── @ LocalVariableTargetNode (location: (1,5)-(1,8))
-        │   │       ├── name: :foo
-        │   │       └── depth: 0
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (1,9)-(1,10) = "="
-        │   └── value:
-        │       @ LocalVariableReadNode (location: (1,11)-(1,14))
-        │       ├── name: :foo
-        │       └── depth: 0
-        └── @ MultiWriteNode (location: (3,0)-(3,18))
-            ├── lefts: (length: 2)
-            │   ├── @ ConstantPathTargetNode (location: (3,0)-(3,7))
-            │   │   ├── parent:
-            │   │   │   @ SelfNode (location: (3,0)-(3,4))
-            │   │   ├── child:
-            │   │   │   @ ConstantReadNode (location: (3,6)-(3,7))
-            │   │   │   └── name: :A
-            │   │   └── delimiter_loc: (3,4)-(3,6) = "::"
-            │   └── @ LocalVariableTargetNode (location: (3,9)-(3,12))
-            │       ├── name: :foo
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (3,13)-(3,14) = "="
-            └── value:
-                @ LocalVariableReadNode (location: (3,15)-(3,18))
-                ├── name: :foo
-                └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/masgn_nested.txt b/test/mri/prism/snapshots/whitequark/masgn_nested.txt
deleted file mode 100644
index 3e4602472fd..00000000000
--- a/test/mri/prism/snapshots/whitequark/masgn_nested.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,15))
-├── locals: [:b, :a, :c]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,15))
-    └── body: (length: 2)
-        ├── @ MultiWriteNode (location: (1,0)-(1,13))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ MultiTargetNode (location: (1,1)-(1,6))
-        │   │       ├── lefts: (length: 1)
-        │   │       │   └── @ LocalVariableTargetNode (location: (1,2)-(1,3))
-        │   │       │       ├── name: :b
-        │   │       │       └── depth: 0
-        │   │       ├── rest:
-        │   │       │   @ ImplicitRestNode (location: (1,3)-(1,4))
-        │   │       ├── rights: (length: 0)
-        │   │       ├── lparen_loc: (1,1)-(1,2) = "("
-        │   │       └── rparen_loc: (1,5)-(1,6) = ")"
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: (1,0)-(1,1) = "("
-        │   ├── rparen_loc: (1,6)-(1,7) = ")"
-        │   ├── operator_loc: (1,8)-(1,9) = "="
-        │   └── value:
-        │       @ CallNode (location: (1,10)-(1,13))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :foo
-        │       ├── message_loc: (1,10)-(1,13) = "foo"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        └── @ MultiWriteNode (location: (3,0)-(3,15))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (3,0)-(3,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ MultiTargetNode (location: (3,3)-(3,9))
-            │       ├── lefts: (length: 2)
-            │       │   ├── @ LocalVariableTargetNode (location: (3,4)-(3,5))
-            │       │   │   ├── name: :b
-            │       │   │   └── depth: 0
-            │       │   └── @ LocalVariableTargetNode (location: (3,7)-(3,8))
-            │       │       ├── name: :c
-            │       │       └── depth: 0
-            │       ├── rest: ∅
-            │       ├── rights: (length: 0)
-            │       ├── lparen_loc: (3,3)-(3,4) = "("
-            │       └── rparen_loc: (3,8)-(3,9) = ")"
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (3,10)-(3,11) = "="
-            └── value:
-                @ CallNode (location: (3,12)-(3,15))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :foo
-                ├── message_loc: (3,12)-(3,15) = "foo"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/masgn_splat.txt b/test/mri/prism/snapshots/whitequark/masgn_splat.txt
deleted file mode 100644
index 0db040a3ab3..00000000000
--- a/test/mri/prism/snapshots/whitequark/masgn_splat.txt
+++ /dev/null
@@ -1,284 +0,0 @@
-@ ProgramNode (location: (1,0)-(19,16))
-├── locals: [:c, :d, :b, :a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(19,16))
-    └── body: (length: 10)
-        ├── @ MultiWriteNode (location: (1,0)-(1,7))
-        │   ├── lefts: (length: 0)
-        │   ├── rest:
-        │   │   @ SplatNode (location: (1,0)-(1,1))
-        │   │   ├── operator_loc: (1,0)-(1,1) = "*"
-        │   │   └── expression: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (1,2)-(1,3) = "="
-        │   └── value:
-        │       @ CallNode (location: (1,4)-(1,7))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (1,4)-(1,7) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ MultiWriteNode (location: (3,0)-(3,13))
-        │   ├── lefts: (length: 0)
-        │   ├── rest:
-        │   │   @ SplatNode (location: (3,0)-(3,1))
-        │   │   ├── operator_loc: (3,0)-(3,1) = "*"
-        │   │   └── expression: ∅
-        │   ├── rights: (length: 2)
-        │   │   ├── @ LocalVariableTargetNode (location: (3,3)-(3,4))
-        │   │   │   ├── name: :c
-        │   │   │   └── depth: 0
-        │   │   └── @ LocalVariableTargetNode (location: (3,6)-(3,7))
-        │   │       ├── name: :d
-        │   │       └── depth: 0
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (3,8)-(3,9) = "="
-        │   └── value:
-        │       @ CallNode (location: (3,10)-(3,13))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (3,10)-(3,13) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ MultiWriteNode (location: (5,0)-(5,8))
-        │   ├── lefts: (length: 0)
-        │   ├── rest:
-        │   │   @ SplatNode (location: (5,0)-(5,2))
-        │   │   ├── operator_loc: (5,0)-(5,1) = "*"
-        │   │   └── expression:
-        │   │       @ LocalVariableTargetNode (location: (5,1)-(5,2))
-        │   │       ├── name: :b
-        │   │       └── depth: 0
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (5,3)-(5,4) = "="
-        │   └── value:
-        │       @ CallNode (location: (5,5)-(5,8))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (5,5)-(5,8) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ MultiWriteNode (location: (7,0)-(7,11))
-        │   ├── lefts: (length: 0)
-        │   ├── rest:
-        │   │   @ SplatNode (location: (7,0)-(7,2))
-        │   │   ├── operator_loc: (7,0)-(7,1) = "*"
-        │   │   └── expression:
-        │   │       @ LocalVariableTargetNode (location: (7,1)-(7,2))
-        │   │       ├── name: :b
-        │   │       └── depth: 0
-        │   ├── rights: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (7,4)-(7,5))
-        │   │       ├── name: :c
-        │   │       └── depth: 0
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (7,6)-(7,7) = "="
-        │   └── value:
-        │       @ CallNode (location: (7,8)-(7,11))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (7,8)-(7,11) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ MultiWriteNode (location: (9,0)-(9,18))
-        │   ├── lefts: (length: 2)
-        │   │   ├── @ InstanceVariableTargetNode (location: (9,0)-(9,4))
-        │   │   │   └── name: :@foo
-        │   │   └── @ ClassVariableTargetNode (location: (9,6)-(9,11))
-        │   │       └── name: :@@bar
-        │   ├── rest: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (9,12)-(9,13) = "="
-        │   └── value:
-        │       @ ArrayNode (location: (9,14)-(9,18))
-        │       ├── flags: contains_splat
-        │       ├── elements: (length: 1)
-        │       │   └── @ SplatNode (location: (9,14)-(9,18))
-        │       │       ├── operator_loc: (9,14)-(9,15) = "*"
-        │       │       └── expression:
-        │       │           @ CallNode (location: (9,15)-(9,18))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :foo
-        │       │           ├── message_loc: (9,15)-(9,18) = "foo"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: ∅
-        │       └── closing_loc: ∅
-        ├── @ MultiWriteNode (location: (11,0)-(11,10))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (11,0)-(11,1))
-        │   │       ├── name: :a
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ SplatNode (location: (11,3)-(11,4))
-        │   │   ├── operator_loc: (11,3)-(11,4) = "*"
-        │   │   └── expression: ∅
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (11,5)-(11,6) = "="
-        │   └── value:
-        │       @ CallNode (location: (11,7)-(11,10))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (11,7)-(11,10) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ MultiWriteNode (location: (13,0)-(13,13))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (13,0)-(13,1))
-        │   │       ├── name: :a
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ SplatNode (location: (13,3)-(13,4))
-        │   │   ├── operator_loc: (13,3)-(13,4) = "*"
-        │   │   └── expression: ∅
-        │   ├── rights: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (13,6)-(13,7))
-        │   │       ├── name: :c
-        │   │       └── depth: 0
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (13,8)-(13,9) = "="
-        │   └── value:
-        │       @ CallNode (location: (13,10)-(13,13))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (13,10)-(13,13) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ MultiWriteNode (location: (15,0)-(15,11))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (15,0)-(15,1))
-        │   │       ├── name: :a
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ SplatNode (location: (15,3)-(15,5))
-        │   │   ├── operator_loc: (15,3)-(15,4) = "*"
-        │   │   └── expression:
-        │   │       @ LocalVariableTargetNode (location: (15,4)-(15,5))
-        │   │       ├── name: :b
-        │   │       └── depth: 0
-        │   ├── rights: (length: 0)
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (15,6)-(15,7) = "="
-        │   └── value:
-        │       @ CallNode (location: (15,8)-(15,11))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (15,8)-(15,11) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ MultiWriteNode (location: (17,0)-(17,14))
-        │   ├── lefts: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (17,0)-(17,1))
-        │   │       ├── name: :a
-        │   │       └── depth: 0
-        │   ├── rest:
-        │   │   @ SplatNode (location: (17,3)-(17,5))
-        │   │   ├── operator_loc: (17,3)-(17,4) = "*"
-        │   │   └── expression:
-        │   │       @ LocalVariableTargetNode (location: (17,4)-(17,5))
-        │   │       ├── name: :b
-        │   │       └── depth: 0
-        │   ├── rights: (length: 1)
-        │   │   └── @ LocalVariableTargetNode (location: (17,7)-(17,8))
-        │   │       ├── name: :c
-        │   │       └── depth: 0
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── operator_loc: (17,9)-(17,10) = "="
-        │   └── value:
-        │       @ CallNode (location: (17,11)-(17,14))
-        │       ├── flags: variable_call, ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :bar
-        │       ├── message_loc: (17,11)-(17,14) = "bar"
-        │       ├── opening_loc: ∅
-        │       ├── arguments: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        └── @ MultiWriteNode (location: (19,0)-(19,16))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (19,0)-(19,1))
-            │   │   ├── name: :a
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (19,3)-(19,4))
-            │       ├── name: :b
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (19,5)-(19,6) = "="
-            └── value:
-                @ ArrayNode (location: (19,7)-(19,16))
-                ├── flags: contains_splat
-                ├── elements: (length: 2)
-                │   ├── @ SplatNode (location: (19,7)-(19,11))
-                │   │   ├── operator_loc: (19,7)-(19,8) = "*"
-                │   │   └── expression:
-                │   │       @ CallNode (location: (19,8)-(19,11))
-                │   │       ├── flags: variable_call, ignore_visibility
-                │   │       ├── receiver: ∅
-                │   │       ├── call_operator_loc: ∅
-                │   │       ├── name: :foo
-                │   │       ├── message_loc: (19,8)-(19,11) = "foo"
-                │   │       ├── opening_loc: ∅
-                │   │       ├── arguments: ∅
-                │   │       ├── closing_loc: ∅
-                │   │       └── block: ∅
-                │   └── @ CallNode (location: (19,13)-(19,16))
-                │       ├── flags: variable_call, ignore_visibility
-                │       ├── receiver: ∅
-                │       ├── call_operator_loc: ∅
-                │       ├── name: :bar
-                │       ├── message_loc: (19,13)-(19,16) = "bar"
-                │       ├── opening_loc: ∅
-                │       ├── arguments: ∅
-                │       ├── closing_loc: ∅
-                │       └── block: ∅
-                ├── opening_loc: ∅
-                └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/method_definition_in_while_cond.txt b/test/mri/prism/snapshots/whitequark/method_definition_in_while_cond.txt
deleted file mode 100644
index 963686b73ec..00000000000
--- a/test/mri/prism/snapshots/whitequark/method_definition_in_while_cond.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,47))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,47))
-    └── body: (length: 4)
-        ├── @ WhileNode (location: (1,0)-(1,45))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (1,0)-(1,5) = "while"
-        │   ├── closing_loc: (1,42)-(1,45) = "end"
-        │   ├── predicate:
-        │   │   @ DefNode (location: (1,6)-(1,33))
-        │   │   ├── name: :foo
-        │   │   ├── name_loc: (1,10)-(1,13) = "foo"
-        │   │   ├── receiver: ∅
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (1,14)-(1,28))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 1)
-        │   │   │   │   └── @ OptionalParameterNode (location: (1,14)-(1,28))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :a
-        │   │   │   │       ├── name_loc: (1,14)-(1,15) = "a"
-        │   │   │   │       ├── operator_loc: (1,16)-(1,17) = "="
-        │   │   │   │       └── value:
-        │   │   │   │           @ CallNode (location: (1,18)-(1,28))
-        │   │   │   │           ├── flags: ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :tap
-        │   │   │   │           ├── message_loc: (1,18)-(1,21) = "tap"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block:
-        │   │   │   │               @ BlockNode (location: (1,22)-(1,28))
-        │   │   │   │               ├── locals: []
-        │   │   │   │               ├── parameters: ∅
-        │   │   │   │               ├── body: ∅
-        │   │   │   │               ├── opening_loc: (1,22)-(1,24) = "do"
-        │   │   │   │               └── closing_loc: (1,25)-(1,28) = "end"
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── body: ∅
-        │   │   ├── locals: [:a]
-        │   │   ├── def_keyword_loc: (1,6)-(1,9) = "def"
-        │   │   ├── operator_loc: ∅
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── rparen_loc: ∅
-        │   │   ├── equal_loc: ∅
-        │   │   └── end_keyword_loc: (1,30)-(1,33) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (1,35)-(1,40))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (1,35)-(1,40))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (1,35)-(1,40) = "break"
-        ├── @ WhileNode (location: (3,0)-(3,42))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (3,0)-(3,5) = "while"
-        │   ├── closing_loc: (3,39)-(3,42) = "end"
-        │   ├── predicate:
-        │   │   @ DefNode (location: (3,6)-(3,30))
-        │   │   ├── name: :foo
-        │   │   ├── name_loc: (3,10)-(3,13) = "foo"
-        │   │   ├── receiver: ∅
-        │   │   ├── parameters: ∅
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (3,15)-(3,25))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (3,15)-(3,25))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :tap
-        │   │   │           ├── message_loc: (3,15)-(3,18) = "tap"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block:
-        │   │   │               @ BlockNode (location: (3,19)-(3,25))
-        │   │   │               ├── locals: []
-        │   │   │               ├── parameters: ∅
-        │   │   │               ├── body: ∅
-        │   │   │               ├── opening_loc: (3,19)-(3,21) = "do"
-        │   │   │               └── closing_loc: (3,22)-(3,25) = "end"
-        │   │   ├── locals: []
-        │   │   ├── def_keyword_loc: (3,6)-(3,9) = "def"
-        │   │   ├── operator_loc: ∅
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── rparen_loc: ∅
-        │   │   ├── equal_loc: ∅
-        │   │   └── end_keyword_loc: (3,27)-(3,30) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (3,32)-(3,37))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (3,32)-(3,37))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (3,32)-(3,37) = "break"
-        ├── @ WhileNode (location: (5,0)-(5,50))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (5,0)-(5,5) = "while"
-        │   ├── closing_loc: (5,47)-(5,50) = "end"
-        │   ├── predicate:
-        │   │   @ DefNode (location: (5,6)-(5,38))
-        │   │   ├── name: :foo
-        │   │   ├── name_loc: (5,15)-(5,18) = "foo"
-        │   │   ├── receiver:
-        │   │   │   @ SelfNode (location: (5,10)-(5,14))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (5,19)-(5,33))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 1)
-        │   │   │   │   └── @ OptionalParameterNode (location: (5,19)-(5,33))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :a
-        │   │   │   │       ├── name_loc: (5,19)-(5,20) = "a"
-        │   │   │   │       ├── operator_loc: (5,21)-(5,22) = "="
-        │   │   │   │       └── value:
-        │   │   │   │           @ CallNode (location: (5,23)-(5,33))
-        │   │   │   │           ├── flags: ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :tap
-        │   │   │   │           ├── message_loc: (5,23)-(5,26) = "tap"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block:
-        │   │   │   │               @ BlockNode (location: (5,27)-(5,33))
-        │   │   │   │               ├── locals: []
-        │   │   │   │               ├── parameters: ∅
-        │   │   │   │               ├── body: ∅
-        │   │   │   │               ├── opening_loc: (5,27)-(5,29) = "do"
-        │   │   │   │               └── closing_loc: (5,30)-(5,33) = "end"
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── body: ∅
-        │   │   ├── locals: [:a]
-        │   │   ├── def_keyword_loc: (5,6)-(5,9) = "def"
-        │   │   ├── operator_loc: (5,14)-(5,15) = "."
-        │   │   ├── lparen_loc: ∅
-        │   │   ├── rparen_loc: ∅
-        │   │   ├── equal_loc: ∅
-        │   │   └── end_keyword_loc: (5,35)-(5,38) = "end"
-        │   └── statements:
-        │       @ StatementsNode (location: (5,40)-(5,45))
-        │       └── body: (length: 1)
-        │           └── @ BreakNode (location: (5,40)-(5,45))
-        │               ├── arguments: ∅
-        │               └── keyword_loc: (5,40)-(5,45) = "break"
-        └── @ WhileNode (location: (7,0)-(7,47))
-            ├── flags: ∅
-            ├── keyword_loc: (7,0)-(7,5) = "while"
-            ├── closing_loc: (7,44)-(7,47) = "end"
-            ├── predicate:
-            │   @ DefNode (location: (7,6)-(7,35))
-            │   ├── name: :foo
-            │   ├── name_loc: (7,15)-(7,18) = "foo"
-            │   ├── receiver:
-            │   │   @ SelfNode (location: (7,10)-(7,14))
-            │   ├── parameters: ∅
-            │   ├── body:
-            │   │   @ StatementsNode (location: (7,20)-(7,30))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (7,20)-(7,30))
-            │   │           ├── flags: ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :tap
-            │   │           ├── message_loc: (7,20)-(7,23) = "tap"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block:
-            │   │               @ BlockNode (location: (7,24)-(7,30))
-            │   │               ├── locals: []
-            │   │               ├── parameters: ∅
-            │   │               ├── body: ∅
-            │   │               ├── opening_loc: (7,24)-(7,26) = "do"
-            │   │               └── closing_loc: (7,27)-(7,30) = "end"
-            │   ├── locals: []
-            │   ├── def_keyword_loc: (7,6)-(7,9) = "def"
-            │   ├── operator_loc: (7,14)-(7,15) = "."
-            │   ├── lparen_loc: ∅
-            │   ├── rparen_loc: ∅
-            │   ├── equal_loc: ∅
-            │   └── end_keyword_loc: (7,32)-(7,35) = "end"
-            └── statements:
-                @ StatementsNode (location: (7,37)-(7,42))
-                └── body: (length: 1)
-                    └── @ BreakNode (location: (7,37)-(7,42))
-                        ├── arguments: ∅
-                        └── keyword_loc: (7,37)-(7,42) = "break"
diff --git a/test/mri/prism/snapshots/whitequark/module.txt b/test/mri/prism/snapshots/whitequark/module.txt
deleted file mode 100644
index 87348c4ec93..00000000000
--- a/test/mri/prism/snapshots/whitequark/module.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ ModuleNode (location: (1,0)-(1,15))
-            ├── locals: []
-            ├── module_keyword_loc: (1,0)-(1,6) = "module"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (1,7)-(1,10))
-            │   └── name: :Foo
-            ├── body: ∅
-            ├── end_keyword_loc: (1,12)-(1,15) = "end"
-            └── name: :Foo
diff --git a/test/mri/prism/snapshots/whitequark/multiple_pattern_matches.txt b/test/mri/prism/snapshots/whitequark/multiple_pattern_matches.txt
deleted file mode 100644
index afa3517e116..00000000000
--- a/test/mri/prism/snapshots/whitequark/multiple_pattern_matches.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,12))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,12))
-    └── body: (length: 4)
-        ├── @ MatchRequiredNode (location: (1,0)-(1,12))
-        │   ├── value:
-        │   │   @ HashNode (location: (1,0)-(1,6))
-        │   │   ├── opening_loc: (1,0)-(1,1) = "{"
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (1,1)-(1,5))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (1,1)-(1,3))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (1,1)-(1,2) = "a"
-        │   │   │       │   ├── closing_loc: (1,2)-(1,3) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ IntegerNode (location: (1,4)-(1,5))
-        │   │   │       │   ├── flags: decimal
-        │   │   │       │   └── value: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   └── closing_loc: (1,5)-(1,6) = "}"
-        │   ├── pattern:
-        │   │   @ HashPatternNode (location: (1,10)-(1,12))
-        │   │   ├── constant: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (1,10)-(1,12))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (1,10)-(1,12))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (1,10)-(1,11) = "a"
-        │   │   │       │   ├── closing_loc: (1,11)-(1,12) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ ImplicitNode (location: (1,10)-(1,11))
-        │   │   │       │   └── value:
-        │   │   │       │       @ LocalVariableTargetNode (location: (1,10)-(1,11))
-        │   │   │       │       ├── name: :a
-        │   │   │       │       └── depth: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   ├── rest: ∅
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (1,7)-(1,9) = "=>"
-        ├── @ MatchRequiredNode (location: (2,0)-(2,12))
-        │   ├── value:
-        │   │   @ HashNode (location: (2,0)-(2,6))
-        │   │   ├── opening_loc: (2,0)-(2,1) = "{"
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (2,1)-(2,5))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (2,1)-(2,3))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (2,1)-(2,2) = "a"
-        │   │   │       │   ├── closing_loc: (2,2)-(2,3) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ IntegerNode (location: (2,4)-(2,5))
-        │   │   │       │   ├── flags: decimal
-        │   │   │       │   └── value: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   └── closing_loc: (2,5)-(2,6) = "}"
-        │   ├── pattern:
-        │   │   @ HashPatternNode (location: (2,10)-(2,12))
-        │   │   ├── constant: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (2,10)-(2,12))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (2,10)-(2,12))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (2,10)-(2,11) = "a"
-        │   │   │       │   ├── closing_loc: (2,11)-(2,12) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ ImplicitNode (location: (2,10)-(2,11))
-        │   │   │       │   └── value:
-        │   │   │       │       @ LocalVariableTargetNode (location: (2,10)-(2,11))
-        │   │   │       │       ├── name: :a
-        │   │   │       │       └── depth: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   ├── rest: ∅
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (2,7)-(2,9) = "=>"
-        ├── @ MatchPredicateNode (location: (4,0)-(4,12))
-        │   ├── value:
-        │   │   @ HashNode (location: (4,0)-(4,6))
-        │   │   ├── opening_loc: (4,0)-(4,1) = "{"
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (4,1)-(4,5))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (4,1)-(4,3))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (4,1)-(4,2) = "a"
-        │   │   │       │   ├── closing_loc: (4,2)-(4,3) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ IntegerNode (location: (4,4)-(4,5))
-        │   │   │       │   ├── flags: decimal
-        │   │   │       │   └── value: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   └── closing_loc: (4,5)-(4,6) = "}"
-        │   ├── pattern:
-        │   │   @ HashPatternNode (location: (4,10)-(4,12))
-        │   │   ├── constant: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (4,10)-(4,12))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (4,10)-(4,12))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (4,10)-(4,11) = "a"
-        │   │   │       │   ├── closing_loc: (4,11)-(4,12) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ ImplicitNode (location: (4,10)-(4,11))
-        │   │   │       │   └── value:
-        │   │   │       │       @ LocalVariableTargetNode (location: (4,10)-(4,11))
-        │   │   │       │       ├── name: :a
-        │   │   │       │       └── depth: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   ├── rest: ∅
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (4,7)-(4,9) = "in"
-        └── @ MatchPredicateNode (location: (5,0)-(5,12))
-            ├── value:
-            │   @ HashNode (location: (5,0)-(5,6))
-            │   ├── opening_loc: (5,0)-(5,1) = "{"
-            │   ├── elements: (length: 1)
-            │   │   └── @ AssocNode (location: (5,1)-(5,5))
-            │   │       ├── key:
-            │   │       │   @ SymbolNode (location: (5,1)-(5,3))
-            │   │       │   ├── flags: forced_us_ascii_encoding
-            │   │       │   ├── opening_loc: ∅
-            │   │       │   ├── value_loc: (5,1)-(5,2) = "a"
-            │   │       │   ├── closing_loc: (5,2)-(5,3) = ":"
-            │   │       │   └── unescaped: "a"
-            │   │       ├── value:
-            │   │       │   @ IntegerNode (location: (5,4)-(5,5))
-            │   │       │   ├── flags: decimal
-            │   │       │   └── value: 0
-            │   │       └── operator_loc: ∅
-            │   └── closing_loc: (5,5)-(5,6) = "}"
-            ├── pattern:
-            │   @ HashPatternNode (location: (5,10)-(5,12))
-            │   ├── constant: ∅
-            │   ├── elements: (length: 1)
-            │   │   └── @ AssocNode (location: (5,10)-(5,12))
-            │   │       ├── key:
-            │   │       │   @ SymbolNode (location: (5,10)-(5,12))
-            │   │       │   ├── flags: forced_us_ascii_encoding
-            │   │       │   ├── opening_loc: ∅
-            │   │       │   ├── value_loc: (5,10)-(5,11) = "a"
-            │   │       │   ├── closing_loc: (5,11)-(5,12) = ":"
-            │   │       │   └── unescaped: "a"
-            │   │       ├── value:
-            │   │       │   @ ImplicitNode (location: (5,10)-(5,11))
-            │   │       │   └── value:
-            │   │       │       @ LocalVariableTargetNode (location: (5,10)-(5,11))
-            │   │       │       ├── name: :a
-            │   │       │       └── depth: 0
-            │   │       └── operator_loc: ∅
-            │   ├── rest: ∅
-            │   ├── opening_loc: ∅
-            │   └── closing_loc: ∅
-            └── operator_loc: (5,7)-(5,9) = "in"
diff --git a/test/mri/prism/snapshots/whitequark/newline_in_hash_argument.txt b/test/mri/prism/snapshots/whitequark/newline_in_hash_argument.txt
deleted file mode 100644
index d5e89d87f9c..00000000000
--- a/test/mri/prism/snapshots/whitequark/newline_in_hash_argument.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-@ ProgramNode (location: (1,0)-(14,1))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(14,1))
-    └── body: (length: 3)
-        ├── @ CaseMatchNode (location: (1,0)-(8,3))
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,5)-(1,8))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,5)-(1,8) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── conditions: (length: 2)
-        │   │   ├── @ InNode (location: (2,0)-(4,4))
-        │   │   │   ├── pattern:
-        │   │   │   │   @ HashPatternNode (location: (2,3)-(2,5))
-        │   │   │   │   ├── constant: ∅
-        │   │   │   │   ├── elements: (length: 1)
-        │   │   │   │   │   └── @ AssocNode (location: (2,3)-(2,5))
-        │   │   │   │   │       ├── key:
-        │   │   │   │   │       │   @ SymbolNode (location: (2,3)-(2,5))
-        │   │   │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │   │   │       │   ├── opening_loc: ∅
-        │   │   │   │   │       │   ├── value_loc: (2,3)-(2,4) = "a"
-        │   │   │   │   │       │   ├── closing_loc: (2,4)-(2,5) = ":"
-        │   │   │   │   │       │   └── unescaped: "a"
-        │   │   │   │   │       ├── value:
-        │   │   │   │   │       │   @ ImplicitNode (location: (2,3)-(2,4))
-        │   │   │   │   │       │   └── value:
-        │   │   │   │   │       │       @ LocalVariableTargetNode (location: (2,3)-(2,4))
-        │   │   │   │   │       │       ├── name: :a
-        │   │   │   │   │       │       └── depth: 0
-        │   │   │   │   │       └── operator_loc: ∅
-        │   │   │   │   ├── rest: ∅
-        │   │   │   │   ├── opening_loc: ∅
-        │   │   │   │   └── closing_loc: ∅
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (3,0)-(4,4))
-        │   │   │   │   └── body: (length: 2)
-        │   │   │   │       ├── @ IntegerNode (location: (3,0)-(3,1))
-        │   │   │   │       │   ├── flags: decimal
-        │   │   │   │       │   └── value: 0
-        │   │   │   │       └── @ TrueNode (location: (4,0)-(4,4))
-        │   │   │   ├── in_loc: (2,0)-(2,2) = "in"
-        │   │   │   └── then_loc: ∅
-        │   │   └── @ InNode (location: (5,0)-(7,4))
-        │   │       ├── pattern:
-        │   │       │   @ HashPatternNode (location: (5,3)-(5,7))
-        │   │       │   ├── constant: ∅
-        │   │       │   ├── elements: (length: 1)
-        │   │       │   │   └── @ AssocNode (location: (5,3)-(5,7))
-        │   │       │   │       ├── key:
-        │   │       │   │       │   @ SymbolNode (location: (5,3)-(5,7))
-        │   │       │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │       │   │       │   ├── opening_loc: (5,3)-(5,4) = "\""
-        │   │       │   │       │   ├── value_loc: (5,4)-(5,5) = "b"
-        │   │       │   │       │   ├── closing_loc: (5,5)-(5,7) = "\":"
-        │   │       │   │       │   └── unescaped: "b"
-        │   │       │   │       ├── value:
-        │   │       │   │       │   @ ImplicitNode (location: (5,4)-(5,5))
-        │   │       │   │       │   └── value:
-        │   │       │   │       │       @ LocalVariableTargetNode (location: (5,4)-(5,5))
-        │   │       │   │       │       ├── name: :b
-        │   │       │   │       │       └── depth: 0
-        │   │       │   │       └── operator_loc: ∅
-        │   │       │   ├── rest: ∅
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   └── closing_loc: ∅
-        │   │       ├── statements:
-        │   │       │   @ StatementsNode (location: (6,0)-(7,4))
-        │   │       │   └── body: (length: 2)
-        │   │       │       ├── @ IntegerNode (location: (6,0)-(6,1))
-        │   │       │       │   ├── flags: decimal
-        │   │       │       │   └── value: 0
-        │   │       │       └── @ TrueNode (location: (7,0)-(7,4))
-        │   │       ├── in_loc: (5,0)-(5,2) = "in"
-        │   │       └── then_loc: ∅
-        │   ├── consequent: ∅
-        │   ├── case_keyword_loc: (1,0)-(1,4) = "case"
-        │   └── end_keyword_loc: (8,0)-(8,3) = "end"
-        ├── @ CallNode (location: (10,0)-(11,1))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (10,0)-(10,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :obj
-        │   │   ├── message_loc: (10,0)-(10,3) = "obj"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (10,3)-(10,4) = "."
-        │   ├── name: :set
-        │   ├── message_loc: (10,4)-(10,7) = "set"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (10,8)-(11,1))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (10,8)-(11,1))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (10,8)-(11,1))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (10,8)-(10,14))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: (10,8)-(10,9) = "\""
-        │   │                   │   ├── value_loc: (10,9)-(10,12) = "foo"
-        │   │                   │   ├── closing_loc: (10,12)-(10,14) = "\":"
-        │   │                   │   └── unescaped: "foo"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (11,0)-(11,1))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (13,0)-(14,1))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (13,0)-(13,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :obj
-            │   ├── message_loc: (13,0)-(13,3) = "obj"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (13,3)-(13,4) = "."
-            ├── name: :set
-            ├── message_loc: (13,4)-(13,7) = "set"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (13,8)-(14,1))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (13,8)-(14,1))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (13,8)-(14,1))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (13,8)-(13,12))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (13,8)-(13,11) = "foo"
-            │                   │   ├── closing_loc: (13,11)-(13,12) = ":"
-            │                   │   └── unescaped: "foo"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (14,0)-(14,1))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   └── operator_loc: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/next.txt b/test/mri/prism/snapshots/whitequark/next.txt
deleted file mode 100644
index b58c2de4fb4..00000000000
--- a/test/mri/prism/snapshots/whitequark/next.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,9))
-    └── body: (length: 4)
-        ├── @ NextNode (location: (1,0)-(1,4))
-        │   ├── arguments: ∅
-        │   └── keyword_loc: (1,0)-(1,4) = "next"
-        ├── @ NextNode (location: (3,0)-(3,8))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,5)-(3,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,5)-(3,8))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (3,5)-(3,8) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── keyword_loc: (3,0)-(3,4) = "next"
-        ├── @ NextNode (location: (5,0)-(5,6))
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,4)-(5,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (5,4)-(5,6))
-        │   │           ├── body: ∅
-        │   │           ├── opening_loc: (5,4)-(5,5) = "("
-        │   │           └── closing_loc: (5,5)-(5,6) = ")"
-        │   └── keyword_loc: (5,0)-(5,4) = "next"
-        └── @ NextNode (location: (7,0)-(7,9))
-            ├── arguments:
-            │   @ ArgumentsNode (location: (7,4)-(7,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (7,4)-(7,9))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (7,5)-(7,8))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (7,5)-(7,8))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :foo
-            │           │           ├── message_loc: (7,5)-(7,8) = "foo"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── opening_loc: (7,4)-(7,5) = "("
-            │           └── closing_loc: (7,8)-(7,9) = ")"
-            └── keyword_loc: (7,0)-(7,4) = "next"
diff --git a/test/mri/prism/snapshots/whitequark/next_block.txt b/test/mri/prism/snapshots/whitequark/next_block.txt
deleted file mode 100644
index f1d65a44ed0..00000000000
--- a/test/mri/prism/snapshots/whitequark/next_block.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ NextNode (location: (1,0)-(1,19))
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,5)-(1,19))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,5)-(1,19))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :fun
-            │           ├── message_loc: (1,5)-(1,8) = "fun"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,9)-(1,12))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (1,9)-(1,12))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :foo
-            │           │           ├── message_loc: (1,9)-(1,12) = "foo"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: ∅
-            │           └── block:
-            │               @ BlockNode (location: (1,13)-(1,19))
-            │               ├── locals: []
-            │               ├── parameters: ∅
-            │               ├── body: ∅
-            │               ├── opening_loc: (1,13)-(1,15) = "do"
-            │               └── closing_loc: (1,16)-(1,19) = "end"
-            └── keyword_loc: (1,0)-(1,4) = "next"
diff --git a/test/mri/prism/snapshots/whitequark/nil.txt b/test/mri/prism/snapshots/whitequark/nil.txt
deleted file mode 100644
index 15774c02fd0..00000000000
--- a/test/mri/prism/snapshots/whitequark/nil.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ NilNode (location: (1,0)-(1,3))
diff --git a/test/mri/prism/snapshots/whitequark/nil_expression.txt b/test/mri/prism/snapshots/whitequark/nil_expression.txt
deleted file mode 100644
index 74211156111..00000000000
--- a/test/mri/prism/snapshots/whitequark/nil_expression.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,9))
-    └── body: (length: 2)
-        ├── @ ParenthesesNode (location: (1,0)-(1,2))
-        │   ├── body: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "("
-        │   └── closing_loc: (1,1)-(1,2) = ")"
-        └── @ BeginNode (location: (3,0)-(3,9))
-            ├── begin_keyword_loc: (3,0)-(3,5) = "begin"
-            ├── statements: ∅
-            ├── rescue_clause: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (3,6)-(3,9) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/non_lvar_injecting_match.txt b/test/mri/prism/snapshots/whitequark/non_lvar_injecting_match.txt
deleted file mode 100644
index 2df571e8dc1..00000000000
--- a/test/mri/prism/snapshots/whitequark/non_lvar_injecting_match.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,28))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,28))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ InterpolatedRegularExpressionNode (location: (1,0)-(1,19))
-            │   ├── flags: ∅
-            │   ├── opening_loc: (1,0)-(1,1) = "/"
-            │   ├── parts: (length: 2)
-            │   │   ├── @ EmbeddedStatementsNode (location: (1,1)-(1,5))
-            │   │   │   ├── opening_loc: (1,1)-(1,3) = "\#{"
-            │   │   │   ├── statements:
-            │   │   │   │   @ StatementsNode (location: (1,3)-(1,4))
-            │   │   │   │   └── body: (length: 1)
-            │   │   │   │       └── @ IntegerNode (location: (1,3)-(1,4))
-            │   │   │   │           ├── flags: decimal
-            │   │   │   │           └── value: 1
-            │   │   │   └── closing_loc: (1,4)-(1,5) = "}"
-            │   │   └── @ StringNode (location: (1,5)-(1,18))
-            │   │       ├── flags: ∅
-            │   │       ├── opening_loc: ∅
-            │   │       ├── content_loc: (1,5)-(1,18) = "(?<match>bar)"
-            │   │       ├── closing_loc: ∅
-            │   │       └── unescaped: "(?<match>bar)"
-            │   └── closing_loc: (1,18)-(1,19) = "/"
-            ├── call_operator_loc: ∅
-            ├── name: :=~
-            ├── message_loc: (1,20)-(1,22) = "=~"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,23)-(1,28))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ StringNode (location: (1,23)-(1,28))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (1,23)-(1,24) = "'"
-            │           ├── content_loc: (1,24)-(1,27) = "bar"
-            │           ├── closing_loc: (1,27)-(1,28) = "'"
-            │           └── unescaped: "bar"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/not.txt b/test/mri/prism/snapshots/whitequark/not.txt
deleted file mode 100644
index 0a6d60e5023..00000000000
--- a/test/mri/prism/snapshots/whitequark/not.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,8))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,4)-(1,7))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,4)-(1,7) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (1,0)-(1,3) = "not"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,5))
-        │   ├── flags: ∅
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!
-        │   ├── message_loc: (3,0)-(3,3) = "not"
-        │   ├── opening_loc: (3,3)-(3,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (3,4)-(3,5) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,8))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (5,4)-(5,7))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (5,4)-(5,7) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (5,0)-(5,3) = "not"
-            ├── opening_loc: (5,3)-(5,4) = "("
-            ├── arguments: ∅
-            ├── closing_loc: (5,7)-(5,8) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/not_cmd.txt b/test/mri/prism/snapshots/whitequark/not_cmd.txt
deleted file mode 100644
index 3b111272c6e..00000000000
--- a/test/mri/prism/snapshots/whitequark/not_cmd.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,4)-(1,9))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :m
-            │   ├── message_loc: (1,4)-(1,5) = "m"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,6)-(1,9))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ CallNode (location: (1,6)-(1,9))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :foo
-            │   │           ├── message_loc: (1,6)-(1,9) = "foo"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,3) = "not"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/not_masgn__24.txt b/test/mri/prism/snapshots/whitequark/not_masgn__24.txt
deleted file mode 100644
index 90124c38667..00000000000
--- a/test/mri/prism/snapshots/whitequark/not_masgn__24.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ ParenthesesNode (location: (1,1)-(1,13))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (1,2)-(1,12))
-            │   │   └── body: (length: 1)
-            │   │       └── @ MultiWriteNode (location: (1,2)-(1,12))
-            │   │           ├── lefts: (length: 2)
-            │   │           │   ├── @ LocalVariableTargetNode (location: (1,2)-(1,3))
-            │   │           │   │   ├── name: :a
-            │   │           │   │   └── depth: 0
-            │   │           │   └── @ LocalVariableTargetNode (location: (1,5)-(1,6))
-            │   │           │       ├── name: :b
-            │   │           │       └── depth: 0
-            │   │           ├── rest: ∅
-            │   │           ├── rights: (length: 0)
-            │   │           ├── lparen_loc: ∅
-            │   │           ├── rparen_loc: ∅
-            │   │           ├── operator_loc: (1,7)-(1,8) = "="
-            │   │           └── value:
-            │   │               @ CallNode (location: (1,9)-(1,12))
-            │   │               ├── flags: variable_call, ignore_visibility
-            │   │               ├── receiver: ∅
-            │   │               ├── call_operator_loc: ∅
-            │   │               ├── name: :foo
-            │   │               ├── message_loc: (1,9)-(1,12) = "foo"
-            │   │               ├── opening_loc: ∅
-            │   │               ├── arguments: ∅
-            │   │               ├── closing_loc: ∅
-            │   │               └── block: ∅
-            │   ├── opening_loc: (1,1)-(1,2) = "("
-            │   └── closing_loc: (1,12)-(1,13) = ")"
-            ├── call_operator_loc: ∅
-            ├── name: :!
-            ├── message_loc: (1,0)-(1,1) = "!"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/nth_ref.txt b/test/mri/prism/snapshots/whitequark/nth_ref.txt
deleted file mode 100644
index 1d386d518ba..00000000000
--- a/test/mri/prism/snapshots/whitequark/nth_ref.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,3))
-    └── body: (length: 1)
-        └── @ NumberedReferenceReadNode (location: (1,0)-(1,3))
-            └── number: 10
diff --git a/test/mri/prism/snapshots/whitequark/numbered_args_after_27.txt b/test/mri/prism/snapshots/whitequark/numbered_args_after_27.txt
deleted file mode 100644
index 56419adccda..00000000000
--- a/test/mri/prism/snapshots/whitequark/numbered_args_after_27.txt
+++ /dev/null
@@ -1,143 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,13))
-    └── body: (length: 4)
-        ├── @ LambdaNode (location: (1,0)-(1,17))
-        │   ├── locals: [:_1, :_2, :_3, :_4, :_5, :_6, :_7, :_8, :_9]
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (1,3)-(1,5) = "do"
-        │   ├── closing_loc: (1,14)-(1,17) = "end"
-        │   ├── parameters:
-        │   │   @ NumberedParametersNode (location: (1,0)-(1,17))
-        │   │   └── maximum: 9
-        │   └── body:
-        │       @ StatementsNode (location: (1,6)-(1,13))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (1,6)-(1,13))
-        │               ├── flags: ∅
-        │               ├── receiver:
-        │               │   @ LocalVariableReadNode (location: (1,6)-(1,8))
-        │               │   ├── name: :_1
-        │               │   └── depth: 0
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :+
-        │               ├── message_loc: (1,9)-(1,10) = "+"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (1,11)-(1,13))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 1)
-        │               │       └── @ LocalVariableReadNode (location: (1,11)-(1,13))
-        │               │           ├── name: :_9
-        │               │           └── depth: 0
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ LambdaNode (location: (3,0)-(3,13))
-        │   ├── locals: [:_1, :_2, :_3, :_4, :_5, :_6, :_7, :_8, :_9]
-        │   ├── operator_loc: (3,0)-(3,2) = "->"
-        │   ├── opening_loc: (3,3)-(3,4) = "{"
-        │   ├── closing_loc: (3,12)-(3,13) = "}"
-        │   ├── parameters:
-        │   │   @ NumberedParametersNode (location: (3,0)-(3,13))
-        │   │   └── maximum: 9
-        │   └── body:
-        │       @ StatementsNode (location: (3,5)-(3,12))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (3,5)-(3,12))
-        │               ├── flags: ∅
-        │               ├── receiver:
-        │               │   @ LocalVariableReadNode (location: (3,5)-(3,7))
-        │               │   ├── name: :_1
-        │               │   └── depth: 0
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :+
-        │               ├── message_loc: (3,8)-(3,9) = "+"
-        │               ├── opening_loc: ∅
-        │               ├── arguments:
-        │               │   @ ArgumentsNode (location: (3,10)-(3,12))
-        │               │   ├── flags: ∅
-        │               │   └── arguments: (length: 1)
-        │               │       └── @ LocalVariableReadNode (location: (3,10)-(3,12))
-        │               │           ├── name: :_9
-        │               │           └── depth: 0
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,16))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (5,0)-(5,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (5,2)-(5,16))
-        │       ├── locals: [:_1, :_2, :_3, :_4, :_5, :_6, :_7, :_8, :_9]
-        │       ├── parameters:
-        │       │   @ NumberedParametersNode (location: (5,2)-(5,16))
-        │       │   └── maximum: 9
-        │       ├── body:
-        │       │   @ StatementsNode (location: (5,5)-(5,12))
-        │       │   └── body: (length: 1)
-        │       │       └── @ CallNode (location: (5,5)-(5,12))
-        │       │           ├── flags: ∅
-        │       │           ├── receiver:
-        │       │           │   @ LocalVariableReadNode (location: (5,5)-(5,7))
-        │       │           │   ├── name: :_1
-        │       │           │   └── depth: 0
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :+
-        │       │           ├── message_loc: (5,8)-(5,9) = "+"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments:
-        │       │           │   @ ArgumentsNode (location: (5,10)-(5,12))
-        │       │           │   ├── flags: ∅
-        │       │           │   └── arguments: (length: 1)
-        │       │           │       └── @ LocalVariableReadNode (location: (5,10)-(5,12))
-        │       │           │           ├── name: :_9
-        │       │           │           └── depth: 0
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── opening_loc: (5,2)-(5,4) = "do"
-        │       └── closing_loc: (5,13)-(5,16) = "end"
-        └── @ CallNode (location: (7,0)-(7,13))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (7,0)-(7,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (7,2)-(7,13))
-                ├── locals: [:_1, :_2, :_3, :_4, :_5, :_6, :_7, :_8, :_9]
-                ├── parameters:
-                │   @ NumberedParametersNode (location: (7,2)-(7,13))
-                │   └── maximum: 9
-                ├── body:
-                │   @ StatementsNode (location: (7,4)-(7,11))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (7,4)-(7,11))
-                │           ├── flags: ∅
-                │           ├── receiver:
-                │           │   @ LocalVariableReadNode (location: (7,4)-(7,6))
-                │           │   ├── name: :_1
-                │           │   └── depth: 0
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :+
-                │           ├── message_loc: (7,7)-(7,8) = "+"
-                │           ├── opening_loc: ∅
-                │           ├── arguments:
-                │           │   @ ArgumentsNode (location: (7,9)-(7,11))
-                │           │   ├── flags: ∅
-                │           │   └── arguments: (length: 1)
-                │           │       └── @ LocalVariableReadNode (location: (7,9)-(7,11))
-                │           │           ├── name: :_9
-                │           │           └── depth: 0
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── opening_loc: (7,2)-(7,3) = "{"
-                └── closing_loc: (7,12)-(7,13) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/numparam_outside_block.txt b/test/mri/prism/snapshots/whitequark/numparam_outside_block.txt
deleted file mode 100644
index d79aedf7f96..00000000000
--- a/test/mri/prism/snapshots/whitequark/numparam_outside_block.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-@ ProgramNode (location: (1,0)-(9,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(9,17))
-    └── body: (length: 5)
-        ├── @ CallNode (location: (1,0)-(1,2))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :_1
-        │   ├── message_loc: (1,0)-(1,2) = "_1"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ SingletonClassNode (location: (3,0)-(3,21))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (3,0)-(3,5) = "class"
-        │   ├── operator_loc: (3,6)-(3,8) = "<<"
-        │   ├── expression:
-        │   │   @ CallNode (location: (3,9)-(3,12))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,9)-(3,12) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,14)-(3,16))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (3,14)-(3,16))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :_1
-        │   │           ├── message_loc: (3,14)-(3,16) = "_1"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── end_keyword_loc: (3,18)-(3,21) = "end"
-        ├── @ ClassNode (location: (5,0)-(5,16))
-        │   ├── locals: []
-        │   ├── class_keyword_loc: (5,0)-(5,5) = "class"
-        │   ├── constant_path:
-        │   │   @ ConstantReadNode (location: (5,6)-(5,7))
-        │   │   └── name: :A
-        │   ├── inheritance_operator_loc: ∅
-        │   ├── superclass: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (5,9)-(5,11))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (5,9)-(5,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :_1
-        │   │           ├── message_loc: (5,9)-(5,11) = "_1"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── end_keyword_loc: (5,13)-(5,16) = "end"
-        │   └── name: :A
-        ├── @ DefNode (location: (7,0)-(7,19))
-        │   ├── name: :m
-        │   ├── name_loc: (7,9)-(7,10) = "m"
-        │   ├── receiver:
-        │   │   @ SelfNode (location: (7,4)-(7,8))
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (7,12)-(7,14))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (7,12)-(7,14))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :_1
-        │   │           ├── message_loc: (7,12)-(7,14) = "_1"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (7,0)-(7,3) = "def"
-        │   ├── operator_loc: (7,8)-(7,9) = "."
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (7,16)-(7,19) = "end"
-        └── @ ModuleNode (location: (9,0)-(9,17))
-            ├── locals: []
-            ├── module_keyword_loc: (9,0)-(9,6) = "module"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (9,7)-(9,8))
-            │   └── name: :A
-            ├── body:
-            │   @ StatementsNode (location: (9,10)-(9,12))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (9,10)-(9,12))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :_1
-            │           ├── message_loc: (9,10)-(9,12) = "_1"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── end_keyword_loc: (9,14)-(9,17) = "end"
-            └── name: :A
diff --git a/test/mri/prism/snapshots/whitequark/op_asgn.txt b/test/mri/prism/snapshots/whitequark/op_asgn.txt
deleted file mode 100644
index 8f24a35ad0d..00000000000
--- a/test/mri/prism/snapshots/whitequark/op_asgn.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,11))
-    └── body: (length: 3)
-        ├── @ CallOperatorWriteNode (location: (1,0)-(1,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── message_loc: (1,4)-(1,5) = "A"
-        │   ├── read_name: :A
-        │   ├── write_name: :A=
-        │   ├── operator: :+
-        │   ├── operator_loc: (1,6)-(1,8) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (1,9)-(1,10))
-        │       ├── flags: decimal
-        │       └── value: 1
-        ├── @ CallOperatorWriteNode (location: (3,0)-(3,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (3,3)-(3,4) = "."
-        │   ├── message_loc: (3,4)-(3,5) = "a"
-        │   ├── read_name: :a
-        │   ├── write_name: :a=
-        │   ├── operator: :+
-        │   ├── operator_loc: (3,6)-(3,8) = "+="
-        │   └── value:
-        │       @ IntegerNode (location: (3,9)-(3,10))
-        │       ├── flags: decimal
-        │       └── value: 1
-        └── @ CallOperatorWriteNode (location: (5,0)-(5,11))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (5,0)-(5,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (5,0)-(5,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (5,3)-(5,5) = "::"
-            ├── message_loc: (5,5)-(5,6) = "a"
-            ├── read_name: :a
-            ├── write_name: :a=
-            ├── operator: :+
-            ├── operator_loc: (5,7)-(5,9) = "+="
-            └── value:
-                @ IntegerNode (location: (5,10)-(5,11))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/whitequark/op_asgn_cmd.txt b/test/mri/prism/snapshots/whitequark/op_asgn_cmd.txt
deleted file mode 100644
index 109c2fd2edd..00000000000
--- a/test/mri/prism/snapshots/whitequark/op_asgn_cmd.txt
+++ /dev/null
@@ -1,178 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,15))
-    └── body: (length: 4)
-        ├── @ CallOperatorWriteNode (location: (1,0)-(1,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── message_loc: (1,4)-(1,5) = "A"
-        │   ├── read_name: :A
-        │   ├── write_name: :A=
-        │   ├── operator: :+
-        │   ├── operator_loc: (1,6)-(1,8) = "+="
-        │   └── value:
-        │       @ CallNode (location: (1,9)-(1,14))
-        │       ├── flags: ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :m
-        │       ├── message_loc: (1,9)-(1,10) = "m"
-        │       ├── opening_loc: ∅
-        │       ├── arguments:
-        │       │   @ ArgumentsNode (location: (1,11)-(1,14))
-        │       │   ├── flags: ∅
-        │       │   └── arguments: (length: 1)
-        │       │       └── @ CallNode (location: (1,11)-(1,14))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :foo
-        │       │           ├── message_loc: (1,11)-(1,14) = "foo"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ CallOperatorWriteNode (location: (3,0)-(3,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (3,3)-(3,4) = "."
-        │   ├── message_loc: (3,4)-(3,5) = "a"
-        │   ├── read_name: :a
-        │   ├── write_name: :a=
-        │   ├── operator: :+
-        │   ├── operator_loc: (3,6)-(3,8) = "+="
-        │   └── value:
-        │       @ CallNode (location: (3,9)-(3,14))
-        │       ├── flags: ignore_visibility
-        │       ├── receiver: ∅
-        │       ├── call_operator_loc: ∅
-        │       ├── name: :m
-        │       ├── message_loc: (3,9)-(3,10) = "m"
-        │       ├── opening_loc: ∅
-        │       ├── arguments:
-        │       │   @ ArgumentsNode (location: (3,11)-(3,14))
-        │       │   ├── flags: ∅
-        │       │   └── arguments: (length: 1)
-        │       │       └── @ CallNode (location: (3,11)-(3,14))
-        │       │           ├── flags: variable_call, ignore_visibility
-        │       │           ├── receiver: ∅
-        │       │           ├── call_operator_loc: ∅
-        │       │           ├── name: :foo
-        │       │           ├── message_loc: (3,11)-(3,14) = "foo"
-        │       │           ├── opening_loc: ∅
-        │       │           ├── arguments: ∅
-        │       │           ├── closing_loc: ∅
-        │       │           └── block: ∅
-        │       ├── closing_loc: ∅
-        │       └── block: ∅
-        ├── @ ConstantPathOperatorWriteNode (location: (5,0)-(5,15))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (5,0)-(5,6))
-        │   │   ├── parent:
-        │   │   │   @ CallNode (location: (5,0)-(5,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (5,0)-(5,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,5)-(5,6))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (5,3)-(5,5) = "::"
-        │   ├── operator_loc: (5,7)-(5,9) = "+="
-        │   ├── value:
-        │   │   @ CallNode (location: (5,10)-(5,15))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :m
-        │   │   ├── message_loc: (5,10)-(5,11) = "m"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (5,12)-(5,15))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ CallNode (location: (5,12)-(5,15))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :foo
-        │   │   │           ├── message_loc: (5,12)-(5,15) = "foo"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator: :+
-        └── @ CallOperatorWriteNode (location: (7,0)-(7,15))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (7,0)-(7,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (7,0)-(7,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (7,3)-(7,5) = "::"
-            ├── message_loc: (7,5)-(7,6) = "a"
-            ├── read_name: :a
-            ├── write_name: :a=
-            ├── operator: :+
-            ├── operator_loc: (7,7)-(7,9) = "+="
-            └── value:
-                @ CallNode (location: (7,10)-(7,15))
-                ├── flags: ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :m
-                ├── message_loc: (7,10)-(7,11) = "m"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (7,12)-(7,15))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 1)
-                │       └── @ CallNode (location: (7,12)-(7,15))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :foo
-                │           ├── message_loc: (7,12)-(7,15) = "foo"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/op_asgn_index.txt b/test/mri/prism/snapshots/whitequark/op_asgn_index.txt
deleted file mode 100644
index fe077fae13f..00000000000
--- a/test/mri/prism/snapshots/whitequark/op_asgn_index.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ IndexOperatorWriteNode (location: (1,0)-(1,14))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (1,4)-(1,5))
-            │       │   ├── flags: decimal
-            │       │   └── value: 0
-            │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (1,8)-(1,9) = "]"
-            ├── block: ∅
-            ├── operator: :+
-            ├── operator_loc: (1,10)-(1,12) = "+="
-            └── value:
-                @ IntegerNode (location: (1,13)-(1,14))
-                ├── flags: decimal
-                └── value: 2
diff --git a/test/mri/prism/snapshots/whitequark/op_asgn_index_cmd.txt b/test/mri/prism/snapshots/whitequark/op_asgn_index_cmd.txt
deleted file mode 100644
index 87082aad947..00000000000
--- a/test/mri/prism/snapshots/whitequark/op_asgn_index_cmd.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,18))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,18))
-    └── body: (length: 1)
-        └── @ IndexOperatorWriteNode (location: (1,0)-(1,18))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (1,4)-(1,5))
-            │       │   ├── flags: decimal
-            │       │   └── value: 0
-            │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (1,8)-(1,9) = "]"
-            ├── block: ∅
-            ├── operator: :+
-            ├── operator_loc: (1,10)-(1,12) = "+="
-            └── value:
-                @ CallNode (location: (1,13)-(1,18))
-                ├── flags: ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :m
-                ├── message_loc: (1,13)-(1,14) = "m"
-                ├── opening_loc: ∅
-                ├── arguments:
-                │   @ ArgumentsNode (location: (1,15)-(1,18))
-                │   ├── flags: ∅
-                │   └── arguments: (length: 1)
-                │       └── @ CallNode (location: (1,15)-(1,18))
-                │           ├── flags: variable_call, ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :foo
-                │           ├── message_loc: (1,15)-(1,18) = "foo"
-                │           ├── opening_loc: ∅
-                │           ├── arguments: ∅
-                │           ├── closing_loc: ∅
-                │           └── block: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/optarg.txt b/test/mri/prism/snapshots/whitequark/optarg.txt
deleted file mode 100644
index 695ed827ad5..00000000000
--- a/test/mri/prism/snapshots/whitequark/optarg.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,24))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(1,18))
-        │   ├── name: :f
-        │   ├── name_loc: (1,4)-(1,5) = "f"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,6)-(1,13))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 1)
-        │   │   │   └── @ OptionalParameterNode (location: (1,6)-(1,13))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :foo
-        │   │   │       ├── name_loc: (1,6)-(1,9) = "foo"
-        │   │   │       ├── operator_loc: (1,10)-(1,11) = "="
-        │   │   │       └── value:
-        │   │   │           @ IntegerNode (location: (1,12)-(1,13))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 0)
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body: ∅
-        │   ├── locals: [:foo]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,15)-(1,18) = "end"
-        └── @ DefNode (location: (3,0)-(3,24))
-            ├── name: :f
-            ├── name_loc: (3,4)-(3,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (3,6)-(3,18))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 2)
-            │   │   ├── @ OptionalParameterNode (location: (3,6)-(3,11))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── name: :foo
-            │   │   │   ├── name_loc: (3,6)-(3,9) = "foo"
-            │   │   │   ├── operator_loc: (3,9)-(3,10) = "="
-            │   │   │   └── value:
-            │   │   │       @ IntegerNode (location: (3,10)-(3,11))
-            │   │   │       ├── flags: decimal
-            │   │   │       └── value: 1
-            │   │   └── @ OptionalParameterNode (location: (3,13)-(3,18))
-            │   │       ├── flags: ∅
-            │   │       ├── name: :bar
-            │   │       ├── name_loc: (3,13)-(3,16) = "bar"
-            │   │       ├── operator_loc: (3,16)-(3,17) = "="
-            │   │       └── value:
-            │   │           @ IntegerNode (location: (3,17)-(3,18))
-            │   │           ├── flags: decimal
-            │   │           └── value: 2
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:foo, :bar]
-            ├── def_keyword_loc: (3,0)-(3,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (3,5)-(3,6) = "("
-            ├── rparen_loc: (3,18)-(3,19) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (3,21)-(3,24) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/or.txt b/test/mri/prism/snapshots/whitequark/or.txt
deleted file mode 100644
index 439146b8dbe..00000000000
--- a/test/mri/prism/snapshots/whitequark/or.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,10))
-    └── body: (length: 2)
-        ├── @ OrNode (location: (1,0)-(1,10))
-        │   ├── left:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── right:
-        │   │   @ CallNode (location: (1,7)-(1,10))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :bar
-        │   │   ├── message_loc: (1,7)-(1,10) = "bar"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── operator_loc: (1,4)-(1,6) = "or"
-        └── @ OrNode (location: (3,0)-(3,10))
-            ├── left:
-            │   @ CallNode (location: (3,0)-(3,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,0)-(3,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── right:
-            │   @ CallNode (location: (3,7)-(3,10))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :bar
-            │   ├── message_loc: (3,7)-(3,10) = "bar"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── operator_loc: (3,4)-(3,6) = "||"
diff --git a/test/mri/prism/snapshots/whitequark/or_asgn.txt b/test/mri/prism/snapshots/whitequark/or_asgn.txt
deleted file mode 100644
index c0ded24b933..00000000000
--- a/test/mri/prism/snapshots/whitequark/or_asgn.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,15))
-    └── body: (length: 2)
-        ├── @ CallOrWriteNode (location: (1,0)-(1,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── message_loc: (1,4)-(1,5) = "a"
-        │   ├── read_name: :a
-        │   ├── write_name: :a=
-        │   ├── operator_loc: (1,6)-(1,9) = "||="
-        │   └── value:
-        │       @ IntegerNode (location: (1,10)-(1,11))
-        │       ├── flags: decimal
-        │       └── value: 1
-        └── @ IndexOrWriteNode (location: (3,0)-(3,15))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (3,0)-(3,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,0)-(3,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── opening_loc: (3,3)-(3,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,4)-(3,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (3,4)-(3,5))
-            │       │   ├── flags: decimal
-            │       │   └── value: 0
-            │       └── @ IntegerNode (location: (3,7)-(3,8))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (3,8)-(3,9) = "]"
-            ├── block: ∅
-            ├── operator_loc: (3,10)-(3,13) = "||="
-            └── value:
-                @ IntegerNode (location: (3,14)-(3,15))
-                ├── flags: decimal
-                └── value: 2
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_272.txt b/test/mri/prism/snapshots/whitequark/parser_bug_272.txt
deleted file mode 100644
index f158f255b93..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_272.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,15))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (1,0)-(1,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,4))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InstanceVariableReadNode (location: (1,2)-(1,4))
-            │           └── name: :@b
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,5)-(1,15))
-                ├── locals: [:c]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (1,8)-(1,11))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (1,9)-(1,10))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (1,9)-(1,10))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :c
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (1,8)-(1,9) = "|"
-                │   └── closing_loc: (1,10)-(1,11) = "|"
-                ├── body: ∅
-                ├── opening_loc: (1,5)-(1,7) = "do"
-                └── closing_loc: (1,12)-(1,15) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_490.txt b/test/mri/prism/snapshots/whitequark/parser_bug_490.txt
deleted file mode 100644
index 9e4cd2bd15d..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_490.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,45))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,45))
-    └── body: (length: 3)
-        ├── @ DefNode (location: (1,0)-(1,39))
-        │   ├── name: :m
-        │   ├── name_loc: (1,4)-(1,5) = "m"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,7)-(1,34))
-        │   │   └── body: (length: 1)
-        │   │       └── @ SingletonClassNode (location: (1,7)-(1,34))
-        │   │           ├── locals: []
-        │   │           ├── class_keyword_loc: (1,7)-(1,12) = "class"
-        │   │           ├── operator_loc: (1,13)-(1,15) = "<<"
-        │   │           ├── expression:
-        │   │           │   @ SelfNode (location: (1,16)-(1,20))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (1,22)-(1,29))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ ConstantWriteNode (location: (1,22)-(1,29))
-        │   │           │           ├── name: :A
-        │   │           │           ├── name_loc: (1,22)-(1,23) = "A"
-        │   │           │           ├── value:
-        │   │           │           │   @ NilNode (location: (1,26)-(1,29))
-        │   │           │           └── operator_loc: (1,24)-(1,25) = "="
-        │   │           └── end_keyword_loc: (1,31)-(1,34) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (1,36)-(1,39) = "end"
-        ├── @ DefNode (location: (3,0)-(3,44))
-        │   ├── name: :m
-        │   ├── name_loc: (3,4)-(3,5) = "m"
-        │   ├── receiver: ∅
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,7)-(3,39))
-        │   │   └── body: (length: 1)
-        │   │       └── @ SingletonClassNode (location: (3,7)-(3,39))
-        │   │           ├── locals: []
-        │   │           ├── class_keyword_loc: (3,7)-(3,12) = "class"
-        │   │           ├── operator_loc: (3,13)-(3,15) = "<<"
-        │   │           ├── expression:
-        │   │           │   @ SelfNode (location: (3,16)-(3,20))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (3,22)-(3,34))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ ClassNode (location: (3,22)-(3,34))
-        │   │           │           ├── locals: []
-        │   │           │           ├── class_keyword_loc: (3,22)-(3,27) = "class"
-        │   │           │           ├── constant_path:
-        │   │           │           │   @ ConstantReadNode (location: (3,28)-(3,29))
-        │   │           │           │   └── name: :C
-        │   │           │           ├── inheritance_operator_loc: ∅
-        │   │           │           ├── superclass: ∅
-        │   │           │           ├── body: ∅
-        │   │           │           ├── end_keyword_loc: (3,31)-(3,34) = "end"
-        │   │           │           └── name: :C
-        │   │           └── end_keyword_loc: (3,36)-(3,39) = "end"
-        │   ├── locals: []
-        │   ├── def_keyword_loc: (3,0)-(3,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,41)-(3,44) = "end"
-        └── @ DefNode (location: (5,0)-(5,45))
-            ├── name: :m
-            ├── name_loc: (5,4)-(5,5) = "m"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (5,7)-(5,40))
-            │   └── body: (length: 1)
-            │       └── @ SingletonClassNode (location: (5,7)-(5,40))
-            │           ├── locals: []
-            │           ├── class_keyword_loc: (5,7)-(5,12) = "class"
-            │           ├── operator_loc: (5,13)-(5,15) = "<<"
-            │           ├── expression:
-            │           │   @ SelfNode (location: (5,16)-(5,20))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (5,22)-(5,35))
-            │           │   └── body: (length: 1)
-            │           │       └── @ ModuleNode (location: (5,22)-(5,35))
-            │           │           ├── locals: []
-            │           │           ├── module_keyword_loc: (5,22)-(5,28) = "module"
-            │           │           ├── constant_path:
-            │           │           │   @ ConstantReadNode (location: (5,29)-(5,30))
-            │           │           │   └── name: :M
-            │           │           ├── body: ∅
-            │           │           ├── end_keyword_loc: (5,32)-(5,35) = "end"
-            │           │           └── name: :M
-            │           └── end_keyword_loc: (5,37)-(5,40) = "end"
-            ├── locals: []
-            ├── def_keyword_loc: (5,0)-(5,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (5,42)-(5,45) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_507.txt b/test/mri/prism/snapshots/whitequark/parser_bug_507.txt
deleted file mode 100644
index 7e5fc9ee35b..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_507.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: [:m]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,19))
-            ├── name: :m
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,1) = "m"
-            ├── value:
-            │   @ LambdaNode (location: (1,4)-(1,19))
-            │   ├── locals: [:args]
-            │   ├── operator_loc: (1,4)-(1,6) = "->"
-            │   ├── opening_loc: (1,13)-(1,15) = "do"
-            │   ├── closing_loc: (1,16)-(1,19) = "end"
-            │   ├── parameters:
-            │   │   @ BlockParametersNode (location: (1,7)-(1,12))
-            │   │   ├── parameters:
-            │   │   │   @ ParametersNode (location: (1,7)-(1,12))
-            │   │   │   ├── requireds: (length: 0)
-            │   │   │   ├── optionals: (length: 0)
-            │   │   │   ├── rest:
-            │   │   │   │   @ RestParameterNode (location: (1,7)-(1,12))
-            │   │   │   │   ├── flags: ∅
-            │   │   │   │   ├── name: :args
-            │   │   │   │   ├── name_loc: (1,8)-(1,12) = "args"
-            │   │   │   │   └── operator_loc: (1,7)-(1,8) = "*"
-            │   │   │   ├── posts: (length: 0)
-            │   │   │   ├── keywords: (length: 0)
-            │   │   │   ├── keyword_rest: ∅
-            │   │   │   └── block: ∅
-            │   │   ├── locals: (length: 0)
-            │   │   ├── opening_loc: ∅
-            │   │   └── closing_loc: ∅
-            │   └── body: ∅
-            └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_518.txt b/test/mri/prism/snapshots/whitequark/parser_bug_518.txt
deleted file mode 100644
index b63fbb8284e..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_518.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,3))
-    └── body: (length: 1)
-        └── @ ClassNode (location: (1,0)-(2,3))
-            ├── locals: []
-            ├── class_keyword_loc: (1,0)-(1,5) = "class"
-            ├── constant_path:
-            │   @ ConstantReadNode (location: (1,6)-(1,7))
-            │   └── name: :A
-            ├── inheritance_operator_loc: (1,8)-(1,9) = "<"
-            ├── superclass:
-            │   @ ConstantReadNode (location: (1,10)-(1,11))
-            │   └── name: :B
-            ├── body: ∅
-            ├── end_keyword_loc: (2,0)-(2,3) = "end"
-            └── name: :A
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_525.txt b/test/mri/prism/snapshots/whitequark/parser_bug_525.txt
deleted file mode 100644
index a69b8a207f0..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_525.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,32))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,32))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,32))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m1
-            ├── message_loc: (1,0)-(1,2) = "m1"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,3)-(1,11))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ KeywordHashNode (location: (1,3)-(1,11))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,3)-(1,11))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,3)-(1,5))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: (1,3)-(1,4) = ":"
-            │                   │   ├── value_loc: (1,4)-(1,5) = "k"
-            │                   │   ├── closing_loc: ∅
-            │                   │   └── unescaped: "k"
-            │                   ├── value:
-            │                   │   @ CallNode (location: (1,9)-(1,11))
-            │                   │   ├── flags: variable_call, ignore_visibility
-            │                   │   ├── receiver: ∅
-            │                   │   ├── call_operator_loc: ∅
-            │                   │   ├── name: :m2
-            │                   │   ├── message_loc: (1,9)-(1,11) = "m2"
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── arguments: ∅
-            │                   │   ├── closing_loc: ∅
-            │                   │   └── block: ∅
-            │                   └── operator_loc: (1,6)-(1,8) = "=>"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,12)-(1,32))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (1,16)-(1,27))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (1,16)-(1,27))
-                │           ├── flags: ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :m3
-                │           ├── message_loc: (1,16)-(1,18) = "m3"
-                │           ├── opening_loc: (1,18)-(1,19) = "("
-                │           ├── arguments: ∅
-                │           ├── closing_loc: (1,19)-(1,20) = ")"
-                │           └── block:
-                │               @ BlockNode (location: (1,21)-(1,27))
-                │               ├── locals: []
-                │               ├── parameters: ∅
-                │               ├── body: ∅
-                │               ├── opening_loc: (1,21)-(1,23) = "do"
-                │               └── closing_loc: (1,24)-(1,27) = "end"
-                ├── opening_loc: (1,12)-(1,14) = "do"
-                └── closing_loc: (1,29)-(1,32) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_604.txt b/test/mri/prism/snapshots/whitequark/parser_bug_604.txt
deleted file mode 100644
index 2577e3bc552..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_604.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,14))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (1,0)-(1,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,2)-(1,7))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ CallNode (location: (1,2)-(1,3))
-            │           │   ├── flags: variable_call, ignore_visibility
-            │           │   ├── receiver: ∅
-            │           │   ├── call_operator_loc: ∅
-            │           │   ├── name: :a
-            │           │   ├── message_loc: (1,2)-(1,3) = "a"
-            │           │   ├── opening_loc: ∅
-            │           │   ├── arguments: ∅
-            │           │   ├── closing_loc: ∅
-            │           │   └── block: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :+
-            │           ├── message_loc: (1,4)-(1,5) = "+"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (1,6)-(1,7))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :b
-            │           │           ├── message_loc: (1,6)-(1,7) = "b"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,8)-(1,14))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,8)-(1,10) = "do"
-                └── closing_loc: (1,11)-(1,14) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_640.txt b/test/mri/prism/snapshots/whitequark/parser_bug_640.txt
deleted file mode 100644
index a9d3f957e83..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_640.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,6))
-            ├── opening_loc: (1,0)-(1,6) = "<<~FOO"
-            ├── parts: (length: 2)
-            │   ├── @ StringNode (location: (2,0)-(3,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (2,0)-(3,0) = "  baz\\\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "baz"
-            │   └── @ StringNode (location: (3,0)-(4,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (3,0)-(4,0) = "  qux\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "qux\n"
-            └── closing_loc: (4,0)-(5,0) = "FOO\n"
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_645.txt b/test/mri/prism/snapshots/whitequark/parser_bug_645.txt
deleted file mode 100644
index 5700f3c3db4..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_645.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,14))
-            ├── locals: [:arg]
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,12)-(1,13) = "{"
-            ├── closing_loc: (1,13)-(1,14) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,3)-(1,11))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (1,4)-(1,10))
-            │   │   ├── requireds: (length: 0)
-            │   │   ├── optionals: (length: 1)
-            │   │   │   └── @ OptionalParameterNode (location: (1,4)-(1,10))
-            │   │   │       ├── flags: ∅
-            │   │   │       ├── name: :arg
-            │   │   │       ├── name_loc: (1,4)-(1,7) = "arg"
-            │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-            │   │   │       └── value:
-            │   │   │           @ HashNode (location: (1,8)-(1,10))
-            │   │   │           ├── opening_loc: (1,8)-(1,9) = "{"
-            │   │   │           ├── elements: (length: 0)
-            │   │   │           └── closing_loc: (1,9)-(1,10) = "}"
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: (1,3)-(1,4) = "("
-            │   └── closing_loc: (1,10)-(1,11) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/whitequark/parser_bug_830.txt b/test/mri/prism/snapshots/whitequark/parser_bug_830.txt
deleted file mode 100644
index e52b291d6a1..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_bug_830.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ RegularExpressionNode (location: (1,0)-(1,4))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (1,0)-(1,1) = "/"
-            ├── content_loc: (1,1)-(1,3) = "\\("
-            ├── closing_loc: (1,3)-(1,4) = "/"
-            └── unescaped: "\\("
diff --git a/test/mri/prism/snapshots/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt b/test/mri/prism/snapshots/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt
deleted file mode 100644
index d974435534f..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,7))
-            ├── opening_loc: (1,0)-(1,7) = "<<~HERE"
-            ├── parts: (length: 2)
-            │   ├── @ EmbeddedStatementsNode (location: (2,2)-(2,5))
-            │   │   ├── opening_loc: (2,2)-(2,4) = "\#{"
-            │   │   ├── statements: ∅
-            │   │   └── closing_loc: (2,4)-(2,5) = "}"
-            │   └── @ StringNode (location: (2,5)-(3,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (2,5)-(3,0) = "\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "\n"
-            └── closing_loc: (3,0)-(4,0) = "HERE\n"
diff --git a/test/mri/prism/snapshots/whitequark/parser_slash_slash_n_escaping_in_literals.txt b/test/mri/prism/snapshots/whitequark/parser_slash_slash_n_escaping_in_literals.txt
deleted file mode 100644
index 080d4d0e7d4..00000000000
--- a/test/mri/prism/snapshots/whitequark/parser_slash_slash_n_escaping_in_literals.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-@ ProgramNode (location: (1,0)-(62,2))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(62,2))
-    └── body: (length: 19)
-        ├── @ StringNode (location: (1,0)-(2,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,1) = "\""
-        │   ├── content_loc: (1,1)-(2,1) = "a\\\nb"
-        │   ├── closing_loc: (2,1)-(2,2) = "\""
-        │   └── unescaped: "ab"
-        ├── @ ArrayNode (location: (4,0)-(5,2))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ SymbolNode (location: (4,3)-(5,1))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (4,3)-(5,1) = "a\\\nb"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a\nb"
-        │   ├── opening_loc: (4,0)-(4,3) = "%I{"
-        │   └── closing_loc: (5,1)-(5,2) = "}"
-        ├── @ StringNode (location: (7,0)-(8,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (7,0)-(7,3) = "%Q{"
-        │   ├── content_loc: (7,3)-(8,1) = "a\\\nb"
-        │   ├── closing_loc: (8,1)-(8,2) = "}"
-        │   └── unescaped: "ab"
-        ├── @ ArrayNode (location: (10,0)-(11,2))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (10,3)-(11,1))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (10,3)-(11,1) = "a\\\nb"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a\nb"
-        │   ├── opening_loc: (10,0)-(10,3) = "%W{"
-        │   └── closing_loc: (11,1)-(11,2) = "}"
-        ├── @ ArrayNode (location: (13,0)-(14,2))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ SymbolNode (location: (13,3)-(14,1))
-        │   │       ├── flags: forced_us_ascii_encoding
-        │   │       ├── opening_loc: ∅
-        │   │       ├── value_loc: (13,3)-(14,1) = "a\\\nb"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a\nb"
-        │   ├── opening_loc: (13,0)-(13,3) = "%i{"
-        │   └── closing_loc: (14,1)-(14,2) = "}"
-        ├── @ StringNode (location: (16,0)-(17,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (16,0)-(16,3) = "%q{"
-        │   ├── content_loc: (16,3)-(17,1) = "a\\\nb"
-        │   ├── closing_loc: (17,1)-(17,2) = "}"
-        │   └── unescaped: "a\\\nb"
-        ├── @ RegularExpressionNode (location: (19,0)-(20,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (19,0)-(19,3) = "%r{"
-        │   ├── content_loc: (19,3)-(20,1) = "a\\\nb"
-        │   ├── closing_loc: (20,1)-(20,2) = "}"
-        │   └── unescaped: "ab"
-        ├── @ SymbolNode (location: (22,0)-(23,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (22,0)-(22,3) = "%s{"
-        │   ├── value_loc: (22,3)-(23,1) = "a\\\nb"
-        │   ├── closing_loc: (23,1)-(23,2) = "}"
-        │   └── unescaped: "a\\\nb"
-        ├── @ ArrayNode (location: (25,0)-(26,2))
-        │   ├── flags: ∅
-        │   ├── elements: (length: 1)
-        │   │   └── @ StringNode (location: (25,3)-(26,1))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (25,3)-(26,1) = "a\\\nb"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: "a\nb"
-        │   ├── opening_loc: (25,0)-(25,3) = "%w{"
-        │   └── closing_loc: (26,1)-(26,2) = "}"
-        ├── @ XStringNode (location: (28,0)-(29,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (28,0)-(28,3) = "%x{"
-        │   ├── content_loc: (28,3)-(29,1) = "a\\\nb"
-        │   ├── closing_loc: (29,1)-(29,2) = "}"
-        │   └── unescaped: "ab"
-        ├── @ StringNode (location: (31,0)-(32,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (31,0)-(31,2) = "%{"
-        │   ├── content_loc: (31,2)-(32,1) = "a\\\nb"
-        │   ├── closing_loc: (32,1)-(32,2) = "}"
-        │   └── unescaped: "ab"
-        ├── @ StringNode (location: (34,0)-(35,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (34,0)-(34,1) = "'"
-        │   ├── content_loc: (34,1)-(35,1) = "a\\\nb"
-        │   ├── closing_loc: (35,1)-(35,2) = "'"
-        │   └── unescaped: "a\\\nb"
-        ├── @ RegularExpressionNode (location: (37,0)-(38,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (37,0)-(37,1) = "/"
-        │   ├── content_loc: (37,1)-(38,1) = "a\\\nb"
-        │   ├── closing_loc: (38,1)-(38,2) = "/"
-        │   └── unescaped: "ab"
-        ├── @ SymbolNode (location: (40,0)-(41,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (40,0)-(40,2) = ":\""
-        │   ├── value_loc: (40,2)-(41,1) = "a\\\nb"
-        │   ├── closing_loc: (41,1)-(41,2) = "\""
-        │   └── unescaped: "ab"
-        ├── @ SymbolNode (location: (43,0)-(44,2))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (43,0)-(43,2) = ":'"
-        │   ├── value_loc: (43,2)-(44,1) = "a\\\nb"
-        │   ├── closing_loc: (44,1)-(44,2) = "'"
-        │   └── unescaped: "a\\\nb"
-        ├── @ StringNode (location: (46,0)-(46,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (46,0)-(46,9) = "<<-\"HERE\""
-        │   ├── content_loc: (47,0)-(49,0) = "a\\\nb\n"
-        │   ├── closing_loc: (49,0)-(50,0) = "HERE\n"
-        │   └── unescaped: "ab\n"
-        ├── @ StringNode (location: (51,0)-(51,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (51,0)-(51,9) = "<<-'HERE'"
-        │   ├── content_loc: (52,0)-(54,0) = "a\\\nb\n"
-        │   ├── closing_loc: (54,0)-(55,0) = "HERE\n"
-        │   └── unescaped: "a\\\nb\n"
-        ├── @ XStringNode (location: (56,0)-(56,9))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (56,0)-(56,9) = "<<-`HERE`"
-        │   ├── content_loc: (57,0)-(59,0) = "a\\\nb\n"
-        │   ├── closing_loc: (59,0)-(60,0) = "HERE\n"
-        │   └── unescaped: "ab\n"
-        └── @ XStringNode (location: (61,0)-(62,2))
-            ├── flags: ∅
-            ├── opening_loc: (61,0)-(61,1) = "`"
-            ├── content_loc: (61,1)-(62,1) = "a\\\nb"
-            ├── closing_loc: (62,1)-(62,2) = "`"
-            └── unescaped: "ab"
diff --git a/test/mri/prism/snapshots/whitequark/pattern_matching__FILE__LINE_literals.txt b/test/mri/prism/snapshots/whitequark/pattern_matching__FILE__LINE_literals.txt
deleted file mode 100644
index 6f315780adf..00000000000
--- a/test/mri/prism/snapshots/whitequark/pattern_matching__FILE__LINE_literals.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-@ ProgramNode (location: (1,8)-(3,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,8)-(3,11))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,8)-(3,11))
-            ├── predicate:
-            │   @ ArrayNode (location: (1,13)-(1,51))
-            │   ├── flags: ∅
-            │   ├── elements: (length: 3)
-            │   │   ├── @ SourceFileNode (location: (1,14)-(1,22))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── filepath: "whitequark/pattern_matching__FILE__LINE_literals.txt"
-            │   │   ├── @ CallNode (location: (1,24)-(1,36))
-            │   │   │   ├── flags: ∅
-            │   │   │   ├── receiver:
-            │   │   │   │   @ SourceLineNode (location: (1,24)-(1,32))
-            │   │   │   ├── call_operator_loc: ∅
-            │   │   │   ├── name: :+
-            │   │   │   ├── message_loc: (1,33)-(1,34) = "+"
-            │   │   │   ├── opening_loc: ∅
-            │   │   │   ├── arguments:
-            │   │   │   │   @ ArgumentsNode (location: (1,35)-(1,36))
-            │   │   │   │   ├── flags: ∅
-            │   │   │   │   └── arguments: (length: 1)
-            │   │   │   │       └── @ IntegerNode (location: (1,35)-(1,36))
-            │   │   │   │           ├── flags: decimal
-            │   │   │   │           └── value: 1
-            │   │   │   ├── closing_loc: ∅
-            │   │   │   └── block: ∅
-            │   │   └── @ SourceEncodingNode (location: (1,38)-(1,50))
-            │   ├── opening_loc: (1,13)-(1,14) = "["
-            │   └── closing_loc: (1,50)-(1,51) = "]"
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (2,10)-(2,47))
-            │       ├── pattern:
-            │       │   @ ArrayPatternNode (location: (2,13)-(2,47))
-            │       │   ├── constant: ∅
-            │       │   ├── requireds: (length: 3)
-            │       │   │   ├── @ SourceFileNode (location: (2,14)-(2,22))
-            │       │   │   │   ├── flags: ∅
-            │       │   │   │   └── filepath: "whitequark/pattern_matching__FILE__LINE_literals.txt"
-            │       │   │   ├── @ SourceLineNode (location: (2,24)-(2,32))
-            │       │   │   └── @ SourceEncodingNode (location: (2,34)-(2,46))
-            │       │   ├── rest: ∅
-            │       │   ├── posts: (length: 0)
-            │       │   ├── opening_loc: (2,13)-(2,14) = "["
-            │       │   └── closing_loc: (2,46)-(2,47) = "]"
-            │       ├── statements: ∅
-            │       ├── in_loc: (2,10)-(2,12) = "in"
-            │       └── then_loc: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,8)-(1,12) = "case"
-            └── end_keyword_loc: (3,8)-(3,11) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/pattern_matching_blank_else.txt b/test/mri/prism/snapshots/whitequark/pattern_matching_blank_else.txt
deleted file mode 100644
index 6015c000a98..00000000000
--- a/test/mri/prism/snapshots/whitequark/pattern_matching_blank_else.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,26))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,26))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(1,26))
-            ├── predicate:
-            │   @ IntegerNode (location: (1,5)-(1,6))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (1,8)-(1,15))
-            │       ├── pattern:
-            │       │   @ IntegerNode (location: (1,11)-(1,12))
-            │       │   ├── flags: decimal
-            │       │   └── value: 2
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,14)-(1,15))
-            │       │   └── body: (length: 1)
-            │       │       └── @ IntegerNode (location: (1,14)-(1,15))
-            │       │           ├── flags: decimal
-            │       │           └── value: 3
-            │       ├── in_loc: (1,8)-(1,10) = "in"
-            │       └── then_loc: ∅
-            ├── consequent:
-            │   @ ElseNode (location: (1,17)-(1,26))
-            │   ├── else_keyword_loc: (1,17)-(1,21) = "else"
-            │   ├── statements: ∅
-            │   └── end_keyword_loc: (1,23)-(1,26) = "end"
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,23)-(1,26) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/pattern_matching_else.txt b/test/mri/prism/snapshots/whitequark/pattern_matching_else.txt
deleted file mode 100644
index 7f83aafe993..00000000000
--- a/test/mri/prism/snapshots/whitequark/pattern_matching_else.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,29))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,29))
-    └── body: (length: 1)
-        └── @ CaseMatchNode (location: (1,0)-(1,29))
-            ├── predicate:
-            │   @ IntegerNode (location: (1,5)-(1,6))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── conditions: (length: 1)
-            │   └── @ InNode (location: (1,8)-(1,15))
-            │       ├── pattern:
-            │       │   @ IntegerNode (location: (1,11)-(1,12))
-            │       │   ├── flags: decimal
-            │       │   └── value: 2
-            │       ├── statements:
-            │       │   @ StatementsNode (location: (1,14)-(1,15))
-            │       │   └── body: (length: 1)
-            │       │       └── @ IntegerNode (location: (1,14)-(1,15))
-            │       │           ├── flags: decimal
-            │       │           └── value: 3
-            │       ├── in_loc: (1,8)-(1,10) = "in"
-            │       └── then_loc: ∅
-            ├── consequent:
-            │   @ ElseNode (location: (1,17)-(1,29))
-            │   ├── else_keyword_loc: (1,17)-(1,21) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,23)-(1,24))
-            │   │   └── body: (length: 1)
-            │   │       └── @ IntegerNode (location: (1,23)-(1,24))
-            │   │           ├── flags: decimal
-            │   │           └── value: 4
-            │   └── end_keyword_loc: (1,26)-(1,29) = "end"
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,26)-(1,29) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/pattern_matching_single_line.txt b/test/mri/prism/snapshots/whitequark/pattern_matching_single_line.txt
deleted file mode 100644
index 2396172dce7..00000000000
--- a/test/mri/prism/snapshots/whitequark/pattern_matching_single_line.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,11))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,11))
-    └── body: (length: 4)
-        ├── @ MatchRequiredNode (location: (1,0)-(1,8))
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,0)-(1,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (1,5)-(1,8))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (1,6)-(1,7))
-        │   │   │       ├── name: :a
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (1,5)-(1,6) = "["
-        │   │   └── closing_loc: (1,7)-(1,8) = "]"
-        │   └── operator_loc: (1,2)-(1,4) = "=>"
-        ├── @ LocalVariableReadNode (location: (1,10)-(1,11))
-        │   ├── name: :a
-        │   └── depth: 0
-        ├── @ MatchPredicateNode (location: (3,0)-(3,8))
-        │   ├── value:
-        │   │   @ IntegerNode (location: (3,0)-(3,1))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (3,5)-(3,8))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 1)
-        │   │   │   └── @ LocalVariableTargetNode (location: (3,6)-(3,7))
-        │   │   │       ├── name: :a
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: (3,5)-(3,6) = "["
-        │   │   └── closing_loc: (3,7)-(3,8) = "]"
-        │   └── operator_loc: (3,2)-(3,4) = "in"
-        └── @ LocalVariableReadNode (location: (3,10)-(3,11))
-            ├── name: :a
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt b/test/mri/prism/snapshots/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt
deleted file mode 100644
index 757a7780c25..00000000000
--- a/test/mri/prism/snapshots/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt
+++ /dev/null
@@ -1,249 +0,0 @@
-@ ProgramNode (location: (1,0)-(11,34))
-├── locals: [:a, :b, :value]
-└── statements:
-    @ StatementsNode (location: (1,0)-(11,34))
-    └── body: (length: 12)
-        ├── @ MatchRequiredNode (location: (1,0)-(1,14))
-        │   ├── value:
-        │   │   @ ArrayNode (location: (1,0)-(1,6))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ IntegerNode (location: (1,1)-(1,2))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── @ IntegerNode (location: (1,4)-(1,5))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 2
-        │   │   ├── opening_loc: (1,0)-(1,1) = "["
-        │   │   └── closing_loc: (1,5)-(1,6) = "]"
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (1,10)-(1,14))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 2)
-        │   │   │   ├── @ LocalVariableTargetNode (location: (1,10)-(1,11))
-        │   │   │   │   ├── name: :a
-        │   │   │   │   └── depth: 0
-        │   │   │   └── @ LocalVariableTargetNode (location: (1,13)-(1,14))
-        │   │   │       ├── name: :b
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (1,7)-(1,9) = "=>"
-        ├── @ LocalVariableReadNode (location: (1,16)-(1,17))
-        │   ├── name: :a
-        │   └── depth: 0
-        ├── @ MatchPredicateNode (location: (3,0)-(3,14))
-        │   ├── value:
-        │   │   @ ArrayNode (location: (3,0)-(3,6))
-        │   │   ├── flags: ∅
-        │   │   ├── elements: (length: 2)
-        │   │   │   ├── @ IntegerNode (location: (3,1)-(3,2))
-        │   │   │   │   ├── flags: decimal
-        │   │   │   │   └── value: 1
-        │   │   │   └── @ IntegerNode (location: (3,4)-(3,5))
-        │   │   │       ├── flags: decimal
-        │   │   │       └── value: 2
-        │   │   ├── opening_loc: (3,0)-(3,1) = "["
-        │   │   └── closing_loc: (3,5)-(3,6) = "]"
-        │   ├── pattern:
-        │   │   @ ArrayPatternNode (location: (3,10)-(3,14))
-        │   │   ├── constant: ∅
-        │   │   ├── requireds: (length: 2)
-        │   │   │   ├── @ LocalVariableTargetNode (location: (3,10)-(3,11))
-        │   │   │   │   ├── name: :a
-        │   │   │   │   └── depth: 0
-        │   │   │   └── @ LocalVariableTargetNode (location: (3,13)-(3,14))
-        │   │   │       ├── name: :b
-        │   │   │       └── depth: 0
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (3,7)-(3,9) = "in"
-        ├── @ LocalVariableReadNode (location: (3,16)-(3,17))
-        │   ├── name: :a
-        │   └── depth: 0
-        ├── @ MatchRequiredNode (location: (5,0)-(5,12))
-        │   ├── value:
-        │   │   @ HashNode (location: (5,0)-(5,6))
-        │   │   ├── opening_loc: (5,0)-(5,1) = "{"
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (5,1)-(5,5))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (5,1)-(5,3))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (5,1)-(5,2) = "a"
-        │   │   │       │   ├── closing_loc: (5,2)-(5,3) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ IntegerNode (location: (5,4)-(5,5))
-        │   │   │       │   ├── flags: decimal
-        │   │   │       │   └── value: 1
-        │   │   │       └── operator_loc: ∅
-        │   │   └── closing_loc: (5,5)-(5,6) = "}"
-        │   ├── pattern:
-        │   │   @ HashPatternNode (location: (5,10)-(5,12))
-        │   │   ├── constant: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (5,10)-(5,12))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (5,10)-(5,12))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (5,10)-(5,11) = "a"
-        │   │   │       │   ├── closing_loc: (5,11)-(5,12) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ ImplicitNode (location: (5,10)-(5,11))
-        │   │   │       │   └── value:
-        │   │   │       │       @ LocalVariableTargetNode (location: (5,10)-(5,11))
-        │   │   │       │       ├── name: :a
-        │   │   │       │       └── depth: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   ├── rest: ∅
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (5,7)-(5,9) = "=>"
-        ├── @ LocalVariableReadNode (location: (5,14)-(5,15))
-        │   ├── name: :a
-        │   └── depth: 0
-        ├── @ MatchPredicateNode (location: (7,0)-(7,12))
-        │   ├── value:
-        │   │   @ HashNode (location: (7,0)-(7,6))
-        │   │   ├── opening_loc: (7,0)-(7,1) = "{"
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (7,1)-(7,5))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (7,1)-(7,3))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (7,1)-(7,2) = "a"
-        │   │   │       │   ├── closing_loc: (7,2)-(7,3) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ IntegerNode (location: (7,4)-(7,5))
-        │   │   │       │   ├── flags: decimal
-        │   │   │       │   └── value: 1
-        │   │   │       └── operator_loc: ∅
-        │   │   └── closing_loc: (7,5)-(7,6) = "}"
-        │   ├── pattern:
-        │   │   @ HashPatternNode (location: (7,10)-(7,12))
-        │   │   ├── constant: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (7,10)-(7,12))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (7,10)-(7,12))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (7,10)-(7,11) = "a"
-        │   │   │       │   ├── closing_loc: (7,11)-(7,12) = ":"
-        │   │   │       │   └── unescaped: "a"
-        │   │   │       ├── value:
-        │   │   │       │   @ ImplicitNode (location: (7,10)-(7,11))
-        │   │   │       │   └── value:
-        │   │   │       │       @ LocalVariableTargetNode (location: (7,10)-(7,11))
-        │   │   │       │       ├── name: :a
-        │   │   │       │       └── depth: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   ├── rest: ∅
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (7,7)-(7,9) = "in"
-        ├── @ LocalVariableReadNode (location: (7,14)-(7,15))
-        │   ├── name: :a
-        │   └── depth: 0
-        ├── @ MatchRequiredNode (location: (9,0)-(9,27))
-        │   ├── value:
-        │   │   @ HashNode (location: (9,0)-(9,13))
-        │   │   ├── opening_loc: (9,0)-(9,1) = "{"
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (9,1)-(9,12))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (9,1)-(9,5))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (9,1)-(9,4) = "key"
-        │   │   │       │   ├── closing_loc: (9,4)-(9,5) = ":"
-        │   │   │       │   └── unescaped: "key"
-        │   │   │       ├── value:
-        │   │   │       │   @ SymbolNode (location: (9,6)-(9,12))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: (9,6)-(9,7) = ":"
-        │   │   │       │   ├── value_loc: (9,7)-(9,12) = "value"
-        │   │   │       │   ├── closing_loc: ∅
-        │   │   │       │   └── unescaped: "value"
-        │   │   │       └── operator_loc: ∅
-        │   │   └── closing_loc: (9,12)-(9,13) = "}"
-        │   ├── pattern:
-        │   │   @ HashPatternNode (location: (9,17)-(9,27))
-        │   │   ├── constant: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (9,17)-(9,27))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (9,17)-(9,21))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (9,17)-(9,20) = "key"
-        │   │   │       │   ├── closing_loc: (9,20)-(9,21) = ":"
-        │   │   │       │   └── unescaped: "key"
-        │   │   │       ├── value:
-        │   │   │       │   @ LocalVariableTargetNode (location: (9,22)-(9,27))
-        │   │   │       │   ├── name: :value
-        │   │   │       │   └── depth: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   ├── rest: ∅
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (9,14)-(9,16) = "=>"
-        ├── @ LocalVariableReadNode (location: (9,29)-(9,34))
-        │   ├── name: :value
-        │   └── depth: 0
-        ├── @ MatchPredicateNode (location: (11,0)-(11,27))
-        │   ├── value:
-        │   │   @ HashNode (location: (11,0)-(11,13))
-        │   │   ├── opening_loc: (11,0)-(11,1) = "{"
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (11,1)-(11,12))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (11,1)-(11,5))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (11,1)-(11,4) = "key"
-        │   │   │       │   ├── closing_loc: (11,4)-(11,5) = ":"
-        │   │   │       │   └── unescaped: "key"
-        │   │   │       ├── value:
-        │   │   │       │   @ SymbolNode (location: (11,6)-(11,12))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: (11,6)-(11,7) = ":"
-        │   │   │       │   ├── value_loc: (11,7)-(11,12) = "value"
-        │   │   │       │   ├── closing_loc: ∅
-        │   │   │       │   └── unescaped: "value"
-        │   │   │       └── operator_loc: ∅
-        │   │   └── closing_loc: (11,12)-(11,13) = "}"
-        │   ├── pattern:
-        │   │   @ HashPatternNode (location: (11,17)-(11,27))
-        │   │   ├── constant: ∅
-        │   │   ├── elements: (length: 1)
-        │   │   │   └── @ AssocNode (location: (11,17)-(11,27))
-        │   │   │       ├── key:
-        │   │   │       │   @ SymbolNode (location: (11,17)-(11,21))
-        │   │   │       │   ├── flags: forced_us_ascii_encoding
-        │   │   │       │   ├── opening_loc: ∅
-        │   │   │       │   ├── value_loc: (11,17)-(11,20) = "key"
-        │   │   │       │   ├── closing_loc: (11,20)-(11,21) = ":"
-        │   │   │       │   └── unescaped: "key"
-        │   │   │       ├── value:
-        │   │   │       │   @ LocalVariableTargetNode (location: (11,22)-(11,27))
-        │   │   │       │   ├── name: :value
-        │   │   │       │   └── depth: 0
-        │   │   │       └── operator_loc: ∅
-        │   │   ├── rest: ∅
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── operator_loc: (11,14)-(11,16) = "in"
-        └── @ LocalVariableReadNode (location: (11,29)-(11,34))
-            ├── name: :value
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/postexe.txt b/test/mri/prism/snapshots/whitequark/postexe.txt
deleted file mode 100644
index 6f273270639..00000000000
--- a/test/mri/prism/snapshots/whitequark/postexe.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ PostExecutionNode (location: (1,0)-(1,9))
-            ├── statements:
-            │   @ StatementsNode (location: (1,6)-(1,7))
-            │   └── body: (length: 1)
-            │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── keyword_loc: (1,0)-(1,3) = "END"
-            ├── opening_loc: (1,4)-(1,5) = "{"
-            └── closing_loc: (1,8)-(1,9) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/preexe.txt b/test/mri/prism/snapshots/whitequark/preexe.txt
deleted file mode 100644
index 5e4b88d0966..00000000000
--- a/test/mri/prism/snapshots/whitequark/preexe.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ PreExecutionNode (location: (1,0)-(1,11))
-            ├── statements:
-            │   @ StatementsNode (location: (1,8)-(1,9))
-            │   └── body: (length: 1)
-            │       └── @ IntegerNode (location: (1,8)-(1,9))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── keyword_loc: (1,0)-(1,5) = "BEGIN"
-            ├── opening_loc: (1,6)-(1,7) = "{"
-            └── closing_loc: (1,10)-(1,11) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/procarg0.txt b/test/mri/prism/snapshots/whitequark/procarg0.txt
deleted file mode 100644
index 378c7e5b36e..00000000000
--- a/test/mri/prism/snapshots/whitequark/procarg0.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,11))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,18))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (1,0)-(1,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,2)-(1,18))
-        │       ├── locals: [:foo, :bar]
-        │       ├── parameters:
-        │       │   @ BlockParametersNode (location: (1,4)-(1,16))
-        │       │   ├── parameters:
-        │       │   │   @ ParametersNode (location: (1,5)-(1,15))
-        │       │   │   ├── requireds: (length: 1)
-        │       │   │   │   └── @ MultiTargetNode (location: (1,5)-(1,15))
-        │       │   │   │       ├── lefts: (length: 2)
-        │       │   │   │       │   ├── @ RequiredParameterNode (location: (1,6)-(1,9))
-        │       │   │   │       │   │   ├── flags: ∅
-        │       │   │   │       │   │   └── name: :foo
-        │       │   │   │       │   └── @ RequiredParameterNode (location: (1,11)-(1,14))
-        │       │   │   │       │       ├── flags: ∅
-        │       │   │   │       │       └── name: :bar
-        │       │   │   │       ├── rest: ∅
-        │       │   │   │       ├── rights: (length: 0)
-        │       │   │   │       ├── lparen_loc: (1,5)-(1,6) = "("
-        │       │   │   │       └── rparen_loc: (1,14)-(1,15) = ")"
-        │       │   │   ├── optionals: (length: 0)
-        │       │   │   ├── rest: ∅
-        │       │   │   ├── posts: (length: 0)
-        │       │   │   ├── keywords: (length: 0)
-        │       │   │   ├── keyword_rest: ∅
-        │       │   │   └── block: ∅
-        │       │   ├── locals: (length: 0)
-        │       │   ├── opening_loc: (1,4)-(1,5) = "|"
-        │       │   └── closing_loc: (1,15)-(1,16) = "|"
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,2)-(1,3) = "{"
-        │       └── closing_loc: (1,17)-(1,18) = "}"
-        └── @ CallNode (location: (3,0)-(3,11))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (3,0)-(3,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (3,2)-(3,11))
-                ├── locals: [:foo]
-                ├── parameters:
-                │   @ BlockParametersNode (location: (3,4)-(3,9))
-                │   ├── parameters:
-                │   │   @ ParametersNode (location: (3,5)-(3,8))
-                │   │   ├── requireds: (length: 1)
-                │   │   │   └── @ RequiredParameterNode (location: (3,5)-(3,8))
-                │   │   │       ├── flags: ∅
-                │   │   │       └── name: :foo
-                │   │   ├── optionals: (length: 0)
-                │   │   ├── rest: ∅
-                │   │   ├── posts: (length: 0)
-                │   │   ├── keywords: (length: 0)
-                │   │   ├── keyword_rest: ∅
-                │   │   └── block: ∅
-                │   ├── locals: (length: 0)
-                │   ├── opening_loc: (3,4)-(3,5) = "|"
-                │   └── closing_loc: (3,8)-(3,9) = "|"
-                ├── body: ∅
-                ├── opening_loc: (3,2)-(3,3) = "{"
-                └── closing_loc: (3,10)-(3,11) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/range_exclusive.txt b/test/mri/prism/snapshots/whitequark/range_exclusive.txt
deleted file mode 100644
index f74077ce677..00000000000
--- a/test/mri/prism/snapshots/whitequark/range_exclusive.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ RangeNode (location: (1,0)-(1,5))
-            ├── flags: exclude_end
-            ├── left:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── right:
-            │   @ IntegerNode (location: (1,4)-(1,5))
-            │   ├── flags: decimal
-            │   └── value: 2
-            └── operator_loc: (1,1)-(1,4) = "..."
diff --git a/test/mri/prism/snapshots/whitequark/range_inclusive.txt b/test/mri/prism/snapshots/whitequark/range_inclusive.txt
deleted file mode 100644
index 18363120338..00000000000
--- a/test/mri/prism/snapshots/whitequark/range_inclusive.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ RangeNode (location: (1,0)-(1,4))
-            ├── flags: ∅
-            ├── left:
-            │   @ IntegerNode (location: (1,0)-(1,1))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── right:
-            │   @ IntegerNode (location: (1,3)-(1,4))
-            │   ├── flags: decimal
-            │   └── value: 2
-            └── operator_loc: (1,1)-(1,3) = ".."
diff --git a/test/mri/prism/snapshots/whitequark/rational.txt b/test/mri/prism/snapshots/whitequark/rational.txt
deleted file mode 100644
index 90bbd17929b..00000000000
--- a/test/mri/prism/snapshots/whitequark/rational.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,3))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,3))
-    └── body: (length: 2)
-        ├── @ RationalNode (location: (1,0)-(1,5))
-        │   └── numeric:
-        │       @ FloatNode (location: (1,0)-(1,4))
-        │       └── value: 42.1
-        └── @ RationalNode (location: (3,0)-(3,3))
-            └── numeric:
-                @ IntegerNode (location: (3,0)-(3,2))
-                ├── flags: decimal
-                └── value: 42
diff --git a/test/mri/prism/snapshots/whitequark/redo.txt b/test/mri/prism/snapshots/whitequark/redo.txt
deleted file mode 100644
index 48d3da9d52d..00000000000
--- a/test/mri/prism/snapshots/whitequark/redo.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ RedoNode (location: (1,0)-(1,4))
diff --git a/test/mri/prism/snapshots/whitequark/regex_interp.txt b/test/mri/prism/snapshots/whitequark/regex_interp.txt
deleted file mode 100644
index ee8caf22b9e..00000000000
--- a/test/mri/prism/snapshots/whitequark/regex_interp.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ InterpolatedRegularExpressionNode (location: (1,0)-(1,14))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,1) = "/"
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (1,1)-(1,4))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,1)-(1,4) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   ├── @ EmbeddedStatementsNode (location: (1,4)-(1,10))
-            │   │   ├── opening_loc: (1,4)-(1,6) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,6)-(1,9))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (1,6)-(1,9))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :bar
-            │   │   │           ├── message_loc: (1,6)-(1,9) = "bar"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (1,9)-(1,10) = "}"
-            │   └── @ StringNode (location: (1,10)-(1,13))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,10)-(1,13) = "baz"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "baz"
-            └── closing_loc: (1,13)-(1,14) = "/"
diff --git a/test/mri/prism/snapshots/whitequark/regex_plain.txt b/test/mri/prism/snapshots/whitequark/regex_plain.txt
deleted file mode 100644
index df771f7a21d..00000000000
--- a/test/mri/prism/snapshots/whitequark/regex_plain.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ RegularExpressionNode (location: (1,0)-(1,10))
-            ├── flags: ignore_case, multi_line, forced_us_ascii_encoding
-            ├── opening_loc: (1,0)-(1,1) = "/"
-            ├── content_loc: (1,1)-(1,7) = "source"
-            ├── closing_loc: (1,7)-(1,10) = "/im"
-            └── unescaped: "source"
diff --git a/test/mri/prism/snapshots/whitequark/resbody_list.txt b/test/mri/prism/snapshots/whitequark/resbody_list.txt
deleted file mode 100644
index 52fcfd02e01..00000000000
--- a/test/mri/prism/snapshots/whitequark/resbody_list.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,39))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,39))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,39))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,7)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,7)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (1,7)-(1,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (1,13)-(1,34))
-            │   ├── keyword_loc: (1,13)-(1,19) = "rescue"
-            │   ├── exceptions: (length: 1)
-            │   │   └── @ ConstantReadNode (location: (1,20)-(1,29))
-            │   │       └── name: :Exception
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,31)-(1,34))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,31)-(1,34))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (1,31)-(1,34) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (1,36)-(1,39) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/resbody_list_mrhs.txt b/test/mri/prism/snapshots/whitequark/resbody_list_mrhs.txt
deleted file mode 100644
index d48ddb120df..00000000000
--- a/test/mri/prism/snapshots/whitequark/resbody_list_mrhs.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,44))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,44))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,44))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,7)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,7)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (1,7)-(1,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (1,13)-(1,39))
-            │   ├── keyword_loc: (1,13)-(1,19) = "rescue"
-            │   ├── exceptions: (length: 2)
-            │   │   ├── @ ConstantReadNode (location: (1,20)-(1,29))
-            │   │   │   └── name: :Exception
-            │   │   └── @ CallNode (location: (1,31)-(1,34))
-            │   │       ├── flags: variable_call, ignore_visibility
-            │   │       ├── receiver: ∅
-            │   │       ├── call_operator_loc: ∅
-            │   │       ├── name: :foo
-            │   │       ├── message_loc: (1,31)-(1,34) = "foo"
-            │   │       ├── opening_loc: ∅
-            │   │       ├── arguments: ∅
-            │   │       ├── closing_loc: ∅
-            │   │       └── block: ∅
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,36)-(1,39))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,36)-(1,39))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (1,36)-(1,39) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (1,41)-(1,44) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/resbody_list_var.txt b/test/mri/prism/snapshots/whitequark/resbody_list_var.txt
deleted file mode 100644
index 85efb1a3dee..00000000000
--- a/test/mri/prism/snapshots/whitequark/resbody_list_var.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,39))
-├── locals: [:ex]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,39))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,39))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,7)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,7)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (1,7)-(1,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (1,13)-(1,34))
-            │   ├── keyword_loc: (1,13)-(1,19) = "rescue"
-            │   ├── exceptions: (length: 1)
-            │   │   └── @ CallNode (location: (1,20)-(1,23))
-            │   │       ├── flags: variable_call, ignore_visibility
-            │   │       ├── receiver: ∅
-            │   │       ├── call_operator_loc: ∅
-            │   │       ├── name: :foo
-            │   │       ├── message_loc: (1,20)-(1,23) = "foo"
-            │   │       ├── opening_loc: ∅
-            │   │       ├── arguments: ∅
-            │   │       ├── closing_loc: ∅
-            │   │       └── block: ∅
-            │   ├── operator_loc: (1,24)-(1,26) = "=>"
-            │   ├── reference:
-            │   │   @ LocalVariableTargetNode (location: (1,27)-(1,29))
-            │   │   ├── name: :ex
-            │   │   └── depth: 0
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,31)-(1,34))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,31)-(1,34))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (1,31)-(1,34) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (1,36)-(1,39) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/resbody_var.txt b/test/mri/prism/snapshots/whitequark/resbody_var.txt
deleted file mode 100644
index e12d921c75a..00000000000
--- a/test/mri/prism/snapshots/whitequark/resbody_var.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,35))
-├── locals: [:ex]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,35))
-    └── body: (length: 2)
-        ├── @ BeginNode (location: (1,0)-(1,36))
-        │   ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,7)-(1,11))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,7)-(1,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :meth
-        │   │           ├── message_loc: (1,7)-(1,11) = "meth"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rescue_clause:
-        │   │   @ RescueNode (location: (1,13)-(1,31))
-        │   │   ├── keyword_loc: (1,13)-(1,19) = "rescue"
-        │   │   ├── exceptions: (length: 0)
-        │   │   ├── operator_loc: (1,20)-(1,22) = "=>"
-        │   │   ├── reference:
-        │   │   │   @ InstanceVariableTargetNode (location: (1,23)-(1,26))
-        │   │   │   └── name: :@ex
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,28)-(1,31))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (1,28)-(1,31))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :bar
-        │   │   │           ├── message_loc: (1,28)-(1,31) = "bar"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── consequent: ∅
-        │   ├── else_clause: ∅
-        │   ├── ensure_clause: ∅
-        │   └── end_keyword_loc: (1,33)-(1,36) = "end"
-        └── @ BeginNode (location: (3,0)-(3,35))
-            ├── begin_keyword_loc: (3,0)-(3,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (3,7)-(3,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (3,7)-(3,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (3,7)-(3,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (3,13)-(3,30))
-            │   ├── keyword_loc: (3,13)-(3,19) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: (3,20)-(3,22) = "=>"
-            │   ├── reference:
-            │   │   @ LocalVariableTargetNode (location: (3,23)-(3,25))
-            │   │   ├── name: :ex
-            │   │   └── depth: 0
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (3,27)-(3,30))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (3,27)-(3,30))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (3,27)-(3,30) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (3,32)-(3,35) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/rescue.txt b/test/mri/prism/snapshots/whitequark/rescue.txt
deleted file mode 100644
index 28c4f11e672..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,29))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,29))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,29))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,7)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,7)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (1,7)-(1,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (1,13)-(1,24))
-            │   ├── keyword_loc: (1,13)-(1,19) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,21)-(1,24))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,21)-(1,24))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :foo
-            │   │           ├── message_loc: (1,21)-(1,24) = "foo"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (1,26)-(1,29) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/rescue_else.txt b/test/mri/prism/snapshots/whitequark/rescue_else.txt
deleted file mode 100644
index 36b01a7ef69..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_else.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,40))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,40))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,40))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,7)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,7)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (1,7)-(1,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (1,13)-(1,24))
-            │   ├── keyword_loc: (1,13)-(1,19) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,21)-(1,24))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,21)-(1,24))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :foo
-            │   │           ├── message_loc: (1,21)-(1,24) = "foo"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause:
-            │   @ ElseNode (location: (1,26)-(1,40))
-            │   ├── else_keyword_loc: (1,26)-(1,30) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,32)-(1,35))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,32)-(1,35))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (1,32)-(1,35) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (1,37)-(1,40) = "end"
-            ├── ensure_clause: ∅
-            └── end_keyword_loc: (1,37)-(1,40) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/rescue_else_ensure.txt b/test/mri/prism/snapshots/whitequark/rescue_else_ensure.txt
deleted file mode 100644
index d97821931b2..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_else_ensure.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,51))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,51))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,51))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,7)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,7)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (1,7)-(1,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (1,13)-(1,24))
-            │   ├── keyword_loc: (1,13)-(1,19) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,21)-(1,24))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,21)-(1,24))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :baz
-            │   │           ├── message_loc: (1,21)-(1,24) = "baz"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause:
-            │   @ ElseNode (location: (1,26)-(1,42))
-            │   ├── else_keyword_loc: (1,26)-(1,30) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,31)-(1,34))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,31)-(1,34))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :foo
-            │   │           ├── message_loc: (1,31)-(1,34) = "foo"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (1,36)-(1,42) = "ensure"
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (1,36)-(1,51))
-            │   ├── ensure_keyword_loc: (1,36)-(1,42) = "ensure"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,44)-(1,47))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,44)-(1,47))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (1,44)-(1,47) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (1,48)-(1,51) = "end"
-            └── end_keyword_loc: (1,48)-(1,51) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/rescue_ensure.txt b/test/mri/prism/snapshots/whitequark/rescue_ensure.txt
deleted file mode 100644
index f6cddbcc5e3..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_ensure.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,42))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,42))
-    └── body: (length: 1)
-        └── @ BeginNode (location: (1,0)-(1,42))
-            ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-            ├── statements:
-            │   @ StatementsNode (location: (1,7)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,7)-(1,11))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :meth
-            │           ├── message_loc: (1,7)-(1,11) = "meth"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rescue_clause:
-            │   @ RescueNode (location: (1,13)-(1,24))
-            │   ├── keyword_loc: (1,13)-(1,19) = "rescue"
-            │   ├── exceptions: (length: 0)
-            │   ├── operator_loc: ∅
-            │   ├── reference: ∅
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,21)-(1,24))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,21)-(1,24))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :baz
-            │   │           ├── message_loc: (1,21)-(1,24) = "baz"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── consequent: ∅
-            ├── else_clause: ∅
-            ├── ensure_clause:
-            │   @ EnsureNode (location: (1,26)-(1,42))
-            │   ├── ensure_keyword_loc: (1,26)-(1,32) = "ensure"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,34)-(1,37))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,34)-(1,37))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :bar
-            │   │           ├── message_loc: (1,34)-(1,37) = "bar"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (1,39)-(1,42) = "end"
-            └── end_keyword_loc: (1,39)-(1,42) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/rescue_in_lambda_block.txt b/test/mri/prism/snapshots/whitequark/rescue_in_lambda_block.txt
deleted file mode 100644
index 2ab854cdd77..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_in_lambda_block.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,17))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,17))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,17))
-            ├── locals: []
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,3)-(1,5) = "do"
-            ├── closing_loc: (1,14)-(1,17) = "end"
-            ├── parameters: ∅
-            └── body:
-                @ BeginNode (location: (1,3)-(1,17))
-                ├── begin_keyword_loc: ∅
-                ├── statements: ∅
-                ├── rescue_clause:
-                │   @ RescueNode (location: (1,6)-(1,12))
-                │   ├── keyword_loc: (1,6)-(1,12) = "rescue"
-                │   ├── exceptions: (length: 0)
-                │   ├── operator_loc: ∅
-                │   ├── reference: ∅
-                │   ├── statements: ∅
-                │   └── consequent: ∅
-                ├── else_clause: ∅
-                ├── ensure_clause: ∅
-                └── end_keyword_loc: (1,14)-(1,17) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/rescue_mod.txt b/test/mri/prism/snapshots/whitequark/rescue_mod.txt
deleted file mode 100644
index cd4f0fff45f..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_mod.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ RescueModifierNode (location: (1,0)-(1,15))
-            ├── expression:
-            │   @ CallNode (location: (1,0)-(1,4))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :meth
-            │   ├── message_loc: (1,0)-(1,4) = "meth"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── keyword_loc: (1,5)-(1,11) = "rescue"
-            └── rescue_expression:
-                @ CallNode (location: (1,12)-(1,15))
-                ├── flags: variable_call, ignore_visibility
-                ├── receiver: ∅
-                ├── call_operator_loc: ∅
-                ├── name: :bar
-                ├── message_loc: (1,12)-(1,15) = "bar"
-                ├── opening_loc: ∅
-                ├── arguments: ∅
-                ├── closing_loc: ∅
-                └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/rescue_mod_asgn.txt b/test/mri/prism/snapshots/whitequark/rescue_mod_asgn.txt
deleted file mode 100644
index ee094138e52..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_mod_asgn.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,21))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,21))
-    └── body: (length: 1)
-        └── @ LocalVariableWriteNode (location: (1,0)-(1,21))
-            ├── name: :foo
-            ├── depth: 0
-            ├── name_loc: (1,0)-(1,3) = "foo"
-            ├── value:
-            │   @ RescueModifierNode (location: (1,6)-(1,21))
-            │   ├── expression:
-            │   │   @ CallNode (location: (1,6)-(1,10))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :meth
-            │   │   ├── message_loc: (1,6)-(1,10) = "meth"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── keyword_loc: (1,11)-(1,17) = "rescue"
-            │   └── rescue_expression:
-            │       @ CallNode (location: (1,18)-(1,21))
-            │       ├── flags: variable_call, ignore_visibility
-            │       ├── receiver: ∅
-            │       ├── call_operator_loc: ∅
-            │       ├── name: :bar
-            │       ├── message_loc: (1,18)-(1,21) = "bar"
-            │       ├── opening_loc: ∅
-            │       ├── arguments: ∅
-            │       ├── closing_loc: ∅
-            │       └── block: ∅
-            └── operator_loc: (1,4)-(1,5) = "="
diff --git a/test/mri/prism/snapshots/whitequark/rescue_mod_masgn.txt b/test/mri/prism/snapshots/whitequark/rescue_mod_masgn.txt
deleted file mode 100644
index dbe289702fc..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_mod_masgn.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,29))
-├── locals: [:foo, :bar]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,29))
-    └── body: (length: 1)
-        └── @ MultiWriteNode (location: (1,0)-(1,29))
-            ├── lefts: (length: 2)
-            │   ├── @ LocalVariableTargetNode (location: (1,0)-(1,3))
-            │   │   ├── name: :foo
-            │   │   └── depth: 0
-            │   └── @ LocalVariableTargetNode (location: (1,5)-(1,8))
-            │       ├── name: :bar
-            │       └── depth: 0
-            ├── rest: ∅
-            ├── rights: (length: 0)
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── operator_loc: (1,9)-(1,10) = "="
-            └── value:
-                @ RescueModifierNode (location: (1,11)-(1,29))
-                ├── expression:
-                │   @ CallNode (location: (1,11)-(1,15))
-                │   ├── flags: variable_call, ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :meth
-                │   ├── message_loc: (1,11)-(1,15) = "meth"
-                │   ├── opening_loc: ∅
-                │   ├── arguments: ∅
-                │   ├── closing_loc: ∅
-                │   └── block: ∅
-                ├── keyword_loc: (1,16)-(1,22) = "rescue"
-                └── rescue_expression:
-                    @ ArrayNode (location: (1,23)-(1,29))
-                    ├── flags: ∅
-                    ├── elements: (length: 2)
-                    │   ├── @ IntegerNode (location: (1,24)-(1,25))
-                    │   │   ├── flags: decimal
-                    │   │   └── value: 1
-                    │   └── @ IntegerNode (location: (1,27)-(1,28))
-                    │       ├── flags: decimal
-                    │       └── value: 2
-                    ├── opening_loc: (1,23)-(1,24) = "["
-                    └── closing_loc: (1,28)-(1,29) = "]"
diff --git a/test/mri/prism/snapshots/whitequark/rescue_mod_op_assign.txt b/test/mri/prism/snapshots/whitequark/rescue_mod_op_assign.txt
deleted file mode 100644
index b269104f308..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_mod_op_assign.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,22))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,22))
-    └── body: (length: 1)
-        └── @ LocalVariableOperatorWriteNode (location: (1,0)-(1,22))
-            ├── name_loc: (1,0)-(1,3) = "foo"
-            ├── operator_loc: (1,4)-(1,6) = "+="
-            ├── value:
-            │   @ RescueModifierNode (location: (1,7)-(1,22))
-            │   ├── expression:
-            │   │   @ CallNode (location: (1,7)-(1,11))
-            │   │   ├── flags: variable_call, ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :meth
-            │   │   ├── message_loc: (1,7)-(1,11) = "meth"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments: ∅
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   ├── keyword_loc: (1,12)-(1,18) = "rescue"
-            │   └── rescue_expression:
-            │       @ CallNode (location: (1,19)-(1,22))
-            │       ├── flags: variable_call, ignore_visibility
-            │       ├── receiver: ∅
-            │       ├── call_operator_loc: ∅
-            │       ├── name: :bar
-            │       ├── message_loc: (1,19)-(1,22) = "bar"
-            │       ├── opening_loc: ∅
-            │       ├── arguments: ∅
-            │       ├── closing_loc: ∅
-            │       └── block: ∅
-            ├── name: :foo
-            ├── operator: :+
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/rescue_without_begin_end.txt b/test/mri/prism/snapshots/whitequark/rescue_without_begin_end.txt
deleted file mode 100644
index 4281442ab23..00000000000
--- a/test/mri/prism/snapshots/whitequark/rescue_without_begin_end.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,30))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,30))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,30))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :meth
-            ├── message_loc: (1,0)-(1,4) = "meth"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,5)-(1,30))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ BeginNode (location: (1,5)-(1,30))
-                │   ├── begin_keyword_loc: ∅
-                │   ├── statements:
-                │   │   @ StatementsNode (location: (1,9)-(1,12))
-                │   │   └── body: (length: 1)
-                │   │       └── @ CallNode (location: (1,9)-(1,12))
-                │   │           ├── flags: variable_call, ignore_visibility
-                │   │           ├── receiver: ∅
-                │   │           ├── call_operator_loc: ∅
-                │   │           ├── name: :foo
-                │   │           ├── message_loc: (1,9)-(1,12) = "foo"
-                │   │           ├── opening_loc: ∅
-                │   │           ├── arguments: ∅
-                │   │           ├── closing_loc: ∅
-                │   │           └── block: ∅
-                │   ├── rescue_clause:
-                │   │   @ RescueNode (location: (1,14)-(1,25))
-                │   │   ├── keyword_loc: (1,14)-(1,20) = "rescue"
-                │   │   ├── exceptions: (length: 0)
-                │   │   ├── operator_loc: ∅
-                │   │   ├── reference: ∅
-                │   │   ├── statements:
-                │   │   │   @ StatementsNode (location: (1,22)-(1,25))
-                │   │   │   └── body: (length: 1)
-                │   │   │       └── @ CallNode (location: (1,22)-(1,25))
-                │   │   │           ├── flags: variable_call, ignore_visibility
-                │   │   │           ├── receiver: ∅
-                │   │   │           ├── call_operator_loc: ∅
-                │   │   │           ├── name: :bar
-                │   │   │           ├── message_loc: (1,22)-(1,25) = "bar"
-                │   │   │           ├── opening_loc: ∅
-                │   │   │           ├── arguments: ∅
-                │   │   │           ├── closing_loc: ∅
-                │   │   │           └── block: ∅
-                │   │   └── consequent: ∅
-                │   ├── else_clause: ∅
-                │   ├── ensure_clause: ∅
-                │   └── end_keyword_loc: (1,27)-(1,30) = "end"
-                ├── opening_loc: (1,5)-(1,7) = "do"
-                └── closing_loc: (1,27)-(1,30) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/restarg_named.txt b/test/mri/prism/snapshots/whitequark/restarg_named.txt
deleted file mode 100644
index fab9dd9a79b..00000000000
--- a/test/mri/prism/snapshots/whitequark/restarg_named.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,16))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,10))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (1,6)-(1,10))
-            │   │   ├── flags: ∅
-            │   │   ├── name: :foo
-            │   │   ├── name_loc: (1,7)-(1,10) = "foo"
-            │   │   └── operator_loc: (1,6)-(1,7) = "*"
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: [:foo]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,10)-(1,11) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,13)-(1,16) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/restarg_unnamed.txt b/test/mri/prism/snapshots/whitequark/restarg_unnamed.txt
deleted file mode 100644
index 077230f7baa..00000000000
--- a/test/mri/prism/snapshots/whitequark/restarg_unnamed.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,13))
-            ├── name: :f
-            ├── name_loc: (1,4)-(1,5) = "f"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,6)-(1,7))
-            │   ├── requireds: (length: 0)
-            │   ├── optionals: (length: 0)
-            │   ├── rest:
-            │   │   @ RestParameterNode (location: (1,6)-(1,7))
-            │   │   ├── flags: ∅
-            │   │   ├── name: ∅
-            │   │   ├── name_loc: ∅
-            │   │   └── operator_loc: (1,6)-(1,7) = "*"
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body: ∅
-            ├── locals: []
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,5)-(1,6) = "("
-            ├── rparen_loc: (1,7)-(1,8) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,10)-(1,13) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/retry.txt b/test/mri/prism/snapshots/whitequark/retry.txt
deleted file mode 100644
index 671c3695146..00000000000
--- a/test/mri/prism/snapshots/whitequark/retry.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ RetryNode (location: (1,0)-(1,5))
diff --git a/test/mri/prism/snapshots/whitequark/return.txt b/test/mri/prism/snapshots/whitequark/return.txt
deleted file mode 100644
index ddfbae85c8b..00000000000
--- a/test/mri/prism/snapshots/whitequark/return.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,11))
-    └── body: (length: 4)
-        ├── @ ReturnNode (location: (1,0)-(1,6))
-        │   ├── keyword_loc: (1,0)-(1,6) = "return"
-        │   └── arguments: ∅
-        ├── @ ReturnNode (location: (3,0)-(3,10))
-        │   ├── keyword_loc: (3,0)-(3,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (3,7)-(3,10))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ CallNode (location: (3,7)-(3,10))
-        │               ├── flags: variable_call, ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :foo
-        │               ├── message_loc: (3,7)-(3,10) = "foo"
-        │               ├── opening_loc: ∅
-        │               ├── arguments: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        ├── @ ReturnNode (location: (5,0)-(5,8))
-        │   ├── keyword_loc: (5,0)-(5,6) = "return"
-        │   └── arguments:
-        │       @ ArgumentsNode (location: (5,6)-(5,8))
-        │       ├── flags: ∅
-        │       └── arguments: (length: 1)
-        │           └── @ ParenthesesNode (location: (5,6)-(5,8))
-        │               ├── body: ∅
-        │               ├── opening_loc: (5,6)-(5,7) = "("
-        │               └── closing_loc: (5,7)-(5,8) = ")"
-        └── @ ReturnNode (location: (7,0)-(7,11))
-            ├── keyword_loc: (7,0)-(7,6) = "return"
-            └── arguments:
-                @ ArgumentsNode (location: (7,6)-(7,11))
-                ├── flags: ∅
-                └── arguments: (length: 1)
-                    └── @ ParenthesesNode (location: (7,6)-(7,11))
-                        ├── body:
-                        │   @ StatementsNode (location: (7,7)-(7,10))
-                        │   └── body: (length: 1)
-                        │       └── @ CallNode (location: (7,7)-(7,10))
-                        │           ├── flags: variable_call, ignore_visibility
-                        │           ├── receiver: ∅
-                        │           ├── call_operator_loc: ∅
-                        │           ├── name: :foo
-                        │           ├── message_loc: (7,7)-(7,10) = "foo"
-                        │           ├── opening_loc: ∅
-                        │           ├── arguments: ∅
-                        │           ├── closing_loc: ∅
-                        │           └── block: ∅
-                        ├── opening_loc: (7,6)-(7,7) = "("
-                        └── closing_loc: (7,10)-(7,11) = ")"
diff --git a/test/mri/prism/snapshots/whitequark/return_block.txt b/test/mri/prism/snapshots/whitequark/return_block.txt
deleted file mode 100644
index 5b8141e4f33..00000000000
--- a/test/mri/prism/snapshots/whitequark/return_block.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,21))
-    └── body: (length: 1)
-        └── @ ReturnNode (location: (1,0)-(1,21))
-            ├── keyword_loc: (1,0)-(1,6) = "return"
-            └── arguments:
-                @ ArgumentsNode (location: (1,7)-(1,21))
-                ├── flags: ∅
-                └── arguments: (length: 1)
-                    └── @ CallNode (location: (1,7)-(1,21))
-                        ├── flags: ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :fun
-                        ├── message_loc: (1,7)-(1,10) = "fun"
-                        ├── opening_loc: ∅
-                        ├── arguments:
-                        │   @ ArgumentsNode (location: (1,11)-(1,14))
-                        │   ├── flags: ∅
-                        │   └── arguments: (length: 1)
-                        │       └── @ CallNode (location: (1,11)-(1,14))
-                        │           ├── flags: variable_call, ignore_visibility
-                        │           ├── receiver: ∅
-                        │           ├── call_operator_loc: ∅
-                        │           ├── name: :foo
-                        │           ├── message_loc: (1,11)-(1,14) = "foo"
-                        │           ├── opening_loc: ∅
-                        │           ├── arguments: ∅
-                        │           ├── closing_loc: ∅
-                        │           └── block: ∅
-                        ├── closing_loc: ∅
-                        └── block:
-                            @ BlockNode (location: (1,15)-(1,21))
-                            ├── locals: []
-                            ├── parameters: ∅
-                            ├── body: ∅
-                            ├── opening_loc: (1,15)-(1,17) = "do"
-                            └── closing_loc: (1,18)-(1,21) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_10279.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_10279.txt
deleted file mode 100644
index 66684350a42..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_10279.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ HashNode (location: (1,0)-(1,24))
-            ├── opening_loc: (1,0)-(1,1) = "{"
-            ├── elements: (length: 1)
-            │   └── @ AssocNode (location: (1,1)-(1,23))
-            │       ├── key:
-            │       │   @ SymbolNode (location: (1,1)-(1,3))
-            │       │   ├── flags: forced_us_ascii_encoding
-            │       │   ├── opening_loc: ∅
-            │       │   ├── value_loc: (1,1)-(1,2) = "a"
-            │       │   ├── closing_loc: (1,2)-(1,3) = ":"
-            │       │   └── unescaped: "a"
-            │       ├── value:
-            │       │   @ IfNode (location: (1,4)-(1,23))
-            │       │   ├── if_keyword_loc: (1,4)-(1,6) = "if"
-            │       │   ├── predicate:
-            │       │   │   @ TrueNode (location: (1,7)-(1,11))
-            │       │   ├── then_keyword_loc: (1,12)-(1,16) = "then"
-            │       │   ├── statements:
-            │       │   │   @ StatementsNode (location: (1,17)-(1,19))
-            │       │   │   └── body: (length: 1)
-            │       │   │       └── @ IntegerNode (location: (1,17)-(1,19))
-            │       │   │           ├── flags: decimal
-            │       │   │           └── value: 42
-            │       │   ├── consequent: ∅
-            │       │   └── end_keyword_loc: (1,20)-(1,23) = "end"
-            │       └── operator_loc: ∅
-            └── closing_loc: (1,23)-(1,24) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_10653.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_10653.txt
deleted file mode 100644
index 400a8c2861a..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_10653.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,31))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,31))
-    └── body: (length: 3)
-        ├── @ IfNode (location: (1,0)-(1,33))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ FalseNode (location: (1,0)-(1,5))
-        │   ├── then_keyword_loc: (1,6)-(1,7) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,8)-(1,20))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,8)-(1,20))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :raise
-        │   │           ├── message_loc: (1,8)-(1,13) = "raise"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (1,14)-(1,20))
-        │   │               ├── locals: []
-        │   │               ├── parameters: ∅
-        │   │               ├── body: ∅
-        │   │               ├── opening_loc: (1,14)-(1,16) = "do"
-        │   │               └── closing_loc: (1,17)-(1,20) = "end"
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (1,21)-(1,33))
-        │   │   ├── else_keyword_loc: (1,21)-(1,22) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,23)-(1,33))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (1,23)-(1,33))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :tap
-        │   │   │           ├── message_loc: (1,23)-(1,26) = "tap"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block:
-        │   │   │               @ BlockNode (location: (1,27)-(1,33))
-        │   │   │               ├── locals: []
-        │   │   │               ├── parameters: ∅
-        │   │   │               ├── body: ∅
-        │   │   │               ├── opening_loc: (1,27)-(1,29) = "do"
-        │   │   │               └── closing_loc: (1,30)-(1,33) = "end"
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        ├── @ IfNode (location: (3,0)-(3,25))
-        │   ├── if_keyword_loc: ∅
-        │   ├── predicate:
-        │   │   @ FalseNode (location: (3,0)-(3,5))
-        │   ├── then_keyword_loc: (3,6)-(3,7) = "?"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (3,8)-(3,16))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (3,8)-(3,16))
-        │   │           ├── flags: ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :raise
-        │   │           ├── message_loc: (3,8)-(3,13) = "raise"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block:
-        │   │               @ BlockNode (location: (3,14)-(3,16))
-        │   │               ├── locals: []
-        │   │               ├── parameters: ∅
-        │   │               ├── body: ∅
-        │   │               ├── opening_loc: (3,14)-(3,15) = "{"
-        │   │               └── closing_loc: (3,15)-(3,16) = "}"
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (3,17)-(3,25))
-        │   │   ├── else_keyword_loc: (3,17)-(3,18) = ":"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (3,19)-(3,25))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (3,19)-(3,25))
-        │   │   │           ├── flags: ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :tap
-        │   │   │           ├── message_loc: (3,19)-(3,22) = "tap"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block:
-        │   │   │               @ BlockNode (location: (3,23)-(3,25))
-        │   │   │               ├── locals: []
-        │   │   │               ├── parameters: ∅
-        │   │   │               ├── body: ∅
-        │   │   │               ├── opening_loc: (3,23)-(3,24) = "{"
-        │   │   │               └── closing_loc: (3,24)-(3,25) = "}"
-        │   │   └── end_keyword_loc: ∅
-        │   └── end_keyword_loc: ∅
-        └── @ IfNode (location: (5,0)-(5,31))
-            ├── if_keyword_loc: ∅
-            ├── predicate:
-            │   @ TrueNode (location: (5,0)-(5,4))
-            ├── then_keyword_loc: (5,5)-(5,6) = "?"
-            ├── statements:
-            │   @ StatementsNode (location: (5,7)-(5,27))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (5,7)-(5,27))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ IntegerNode (location: (5,7)-(5,8))
-            │           │   ├── flags: decimal
-            │           │   └── value: 1
-            │           ├── call_operator_loc: (5,8)-(5,9) = "."
-            │           ├── name: :tap
-            │           ├── message_loc: (5,9)-(5,12) = "tap"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block:
-            │               @ BlockNode (location: (5,13)-(5,27))
-            │               ├── locals: [:n]
-            │               ├── parameters:
-            │               │   @ BlockParametersNode (location: (5,16)-(5,19))
-            │               │   ├── parameters:
-            │               │   │   @ ParametersNode (location: (5,17)-(5,18))
-            │               │   │   ├── requireds: (length: 1)
-            │               │   │   │   └── @ RequiredParameterNode (location: (5,17)-(5,18))
-            │               │   │   │       ├── flags: ∅
-            │               │   │   │       └── name: :n
-            │               │   │   ├── optionals: (length: 0)
-            │               │   │   ├── rest: ∅
-            │               │   │   ├── posts: (length: 0)
-            │               │   │   ├── keywords: (length: 0)
-            │               │   │   ├── keyword_rest: ∅
-            │               │   │   └── block: ∅
-            │               │   ├── locals: (length: 0)
-            │               │   ├── opening_loc: (5,16)-(5,17) = "|"
-            │               │   └── closing_loc: (5,18)-(5,19) = "|"
-            │               ├── body:
-            │               │   @ StatementsNode (location: (5,20)-(5,23))
-            │               │   └── body: (length: 1)
-            │               │       └── @ CallNode (location: (5,20)-(5,23))
-            │               │           ├── flags: ignore_visibility
-            │               │           ├── receiver: ∅
-            │               │           ├── call_operator_loc: ∅
-            │               │           ├── name: :p
-            │               │           ├── message_loc: (5,20)-(5,21) = "p"
-            │               │           ├── opening_loc: ∅
-            │               │           ├── arguments:
-            │               │           │   @ ArgumentsNode (location: (5,22)-(5,23))
-            │               │           │   ├── flags: ∅
-            │               │           │   └── arguments: (length: 1)
-            │               │           │       └── @ LocalVariableReadNode (location: (5,22)-(5,23))
-            │               │           │           ├── name: :n
-            │               │           │           └── depth: 0
-            │               │           ├── closing_loc: ∅
-            │               │           └── block: ∅
-            │               ├── opening_loc: (5,13)-(5,15) = "do"
-            │               └── closing_loc: (5,24)-(5,27) = "end"
-            ├── consequent:
-            │   @ ElseNode (location: (5,28)-(5,31))
-            │   ├── else_keyword_loc: (5,28)-(5,29) = ":"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (5,30)-(5,31))
-            │   │   └── body: (length: 1)
-            │   │       └── @ IntegerNode (location: (5,30)-(5,31))
-            │   │           ├── flags: decimal
-            │   │           └── value: 0
-            │   └── end_keyword_loc: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_11107.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_11107.txt
deleted file mode 100644
index 36ece50d887..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_11107.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,24))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,24))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LambdaNode (location: (1,2)-(1,24))
-            │           ├── locals: []
-            │           ├── operator_loc: (1,2)-(1,4) = "->"
-            │           ├── opening_loc: (1,7)-(1,9) = "do"
-            │           ├── closing_loc: (1,21)-(1,24) = "end"
-            │           ├── parameters:
-            │           │   @ BlockParametersNode (location: (1,4)-(1,6))
-            │           │   ├── parameters: ∅
-            │           │   ├── locals: (length: 0)
-            │           │   ├── opening_loc: (1,4)-(1,5) = "("
-            │           │   └── closing_loc: (1,5)-(1,6) = ")"
-            │           └── body:
-            │               @ StatementsNode (location: (1,10)-(1,20))
-            │               └── body: (length: 1)
-            │                   └── @ CallNode (location: (1,10)-(1,20))
-            │                       ├── flags: ignore_visibility
-            │                       ├── receiver: ∅
-            │                       ├── call_operator_loc: ∅
-            │                       ├── name: :a
-            │                       ├── message_loc: (1,10)-(1,11) = "a"
-            │                       ├── opening_loc: (1,11)-(1,12) = "("
-            │                       ├── arguments: ∅
-            │                       ├── closing_loc: (1,12)-(1,13) = ")"
-            │                       └── block:
-            │                           @ BlockNode (location: (1,14)-(1,20))
-            │                           ├── locals: []
-            │                           ├── parameters: ∅
-            │                           ├── body: ∅
-            │                           ├── opening_loc: (1,14)-(1,16) = "do"
-            │                           └── closing_loc: (1,17)-(1,20) = "end"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_11380.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_11380.txt
deleted file mode 100644
index b7a7ef9a983..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_11380.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,28))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,28))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,28))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,21))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ LambdaNode (location: (1,2)-(1,15))
-            │       │   ├── locals: []
-            │       │   ├── operator_loc: (1,2)-(1,4) = "->"
-            │       │   ├── opening_loc: (1,5)-(1,6) = "{"
-            │       │   ├── closing_loc: (1,14)-(1,15) = "}"
-            │       │   ├── parameters: ∅
-            │       │   └── body:
-            │       │       @ StatementsNode (location: (1,7)-(1,13))
-            │       │       └── body: (length: 1)
-            │       │           └── @ SymbolNode (location: (1,7)-(1,13))
-            │       │               ├── flags: forced_us_ascii_encoding
-            │       │               ├── opening_loc: (1,7)-(1,8) = ":"
-            │       │               ├── value_loc: (1,8)-(1,13) = "hello"
-            │       │               ├── closing_loc: ∅
-            │       │               └── unescaped: "hello"
-            │       └── @ KeywordHashNode (location: (1,17)-(1,21))
-            │           ├── flags: symbol_keys
-            │           └── elements: (length: 1)
-            │               └── @ AssocNode (location: (1,17)-(1,21))
-            │                   ├── key:
-            │                   │   @ SymbolNode (location: (1,17)-(1,19))
-            │                   │   ├── flags: forced_us_ascii_encoding
-            │                   │   ├── opening_loc: ∅
-            │                   │   ├── value_loc: (1,17)-(1,18) = "a"
-            │                   │   ├── closing_loc: (1,18)-(1,19) = ":"
-            │                   │   └── unescaped: "a"
-            │                   ├── value:
-            │                   │   @ IntegerNode (location: (1,20)-(1,21))
-            │                   │   ├── flags: decimal
-            │                   │   └── value: 1
-            │                   └── operator_loc: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,22)-(1,28))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,22)-(1,24) = "do"
-                └── closing_loc: (1,25)-(1,28) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_11873.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_11873.txt
deleted file mode 100644
index 2999662cc43..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_11873.txt
+++ /dev/null
@@ -1,767 +0,0 @@
-@ ProgramNode (location: (1,0)-(23,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(23,22))
-    └── body: (length: 12)
-        ├── @ CallNode (location: (1,0)-(1,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (1,2)-(1,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (1,2)-(1,3) = "b"
-        │   │       │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (1,4)-(1,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (1,4)-(1,7))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (1,4)-(1,5) = "c"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (1,6)-(1,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (1,6)-(1,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (1,6)-(1,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (1,7)-(1,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ StringNode (location: (1,10)-(1,13))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (1,10)-(1,11) = "\""
-        │   │           ├── content_loc: (1,11)-(1,12) = "x"
-        │   │           ├── closing_loc: (1,12)-(1,13) = "\""
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,14)-(1,20))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,14)-(1,16) = "do"
-        │       └── closing_loc: (1,17)-(1,20) = "end"
-        ├── @ CallNode (location: (3,0)-(3,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (3,0)-(3,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,2)-(3,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (3,2)-(3,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (3,2)-(3,3) = "b"
-        │   │       │   ├── opening_loc: (3,3)-(3,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (3,4)-(3,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (3,4)-(3,7))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (3,4)-(3,5) = "c"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (3,6)-(3,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (3,6)-(3,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (3,6)-(3,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (3,7)-(3,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ RegularExpressionNode (location: (3,10)-(3,13))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (3,10)-(3,11) = "/"
-        │   │           ├── content_loc: (3,11)-(3,12) = "x"
-        │   │           ├── closing_loc: (3,12)-(3,13) = "/"
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (3,14)-(3,20))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (3,14)-(3,16) = "do"
-        │       └── closing_loc: (3,17)-(3,20) = "end"
-        ├── @ CallNode (location: (5,0)-(5,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (5,0)-(5,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,2)-(5,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (5,2)-(5,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (5,2)-(5,3) = "b"
-        │   │       │   ├── opening_loc: (5,3)-(5,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (5,4)-(5,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (5,4)-(5,7))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (5,4)-(5,5) = "c"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (5,6)-(5,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (5,6)-(5,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (5,6)-(5,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (5,7)-(5,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ RegularExpressionNode (location: (5,10)-(5,14))
-        │   │           ├── flags: multi_line, forced_us_ascii_encoding
-        │   │           ├── opening_loc: (5,10)-(5,11) = "/"
-        │   │           ├── content_loc: (5,11)-(5,12) = "x"
-        │   │           ├── closing_loc: (5,12)-(5,14) = "/m"
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (5,15)-(5,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (5,15)-(5,17) = "do"
-        │       └── closing_loc: (5,18)-(5,21) = "end"
-        ├── @ CallNode (location: (7,0)-(7,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (7,0)-(7,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,2)-(7,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (7,2)-(7,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (7,2)-(7,3) = "b"
-        │   │       │   ├── opening_loc: (7,3)-(7,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (7,4)-(7,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (7,4)-(7,8))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (7,4)-(7,5) = "c"
-        │   │       │   │           ├── opening_loc: (7,5)-(7,6) = "("
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (7,6)-(7,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (7,6)-(7,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (7,6)-(7,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: (7,7)-(7,8) = ")"
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (7,8)-(7,9) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ StringNode (location: (7,11)-(7,14))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (7,11)-(7,12) = "\""
-        │   │           ├── content_loc: (7,12)-(7,13) = "x"
-        │   │           ├── closing_loc: (7,13)-(7,14) = "\""
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (7,15)-(7,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (7,15)-(7,17) = "do"
-        │       └── closing_loc: (7,18)-(7,21) = "end"
-        ├── @ CallNode (location: (9,0)-(9,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (9,0)-(9,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,2)-(9,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (9,2)-(9,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (9,2)-(9,3) = "b"
-        │   │       │   ├── opening_loc: (9,3)-(9,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (9,4)-(9,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (9,4)-(9,8))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (9,4)-(9,5) = "c"
-        │   │       │   │           ├── opening_loc: (9,5)-(9,6) = "("
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (9,6)-(9,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (9,6)-(9,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (9,6)-(9,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: (9,7)-(9,8) = ")"
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (9,8)-(9,9) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ RegularExpressionNode (location: (9,11)-(9,14))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (9,11)-(9,12) = "/"
-        │   │           ├── content_loc: (9,12)-(9,13) = "x"
-        │   │           ├── closing_loc: (9,13)-(9,14) = "/"
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (9,15)-(9,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (9,15)-(9,17) = "do"
-        │       └── closing_loc: (9,18)-(9,21) = "end"
-        ├── @ CallNode (location: (11,0)-(11,22))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (11,0)-(11,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (11,2)-(11,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (11,2)-(11,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (11,2)-(11,3) = "b"
-        │   │       │   ├── opening_loc: (11,3)-(11,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (11,4)-(11,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (11,4)-(11,8))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (11,4)-(11,5) = "c"
-        │   │       │   │           ├── opening_loc: (11,5)-(11,6) = "("
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (11,6)-(11,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (11,6)-(11,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (11,6)-(11,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: (11,7)-(11,8) = ")"
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (11,8)-(11,9) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ RegularExpressionNode (location: (11,11)-(11,15))
-        │   │           ├── flags: multi_line, forced_us_ascii_encoding
-        │   │           ├── opening_loc: (11,11)-(11,12) = "/"
-        │   │           ├── content_loc: (11,12)-(11,13) = "x"
-        │   │           ├── closing_loc: (11,13)-(11,15) = "/m"
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (11,16)-(11,22))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (11,16)-(11,18) = "do"
-        │       └── closing_loc: (11,19)-(11,22) = "end"
-        ├── @ CallNode (location: (13,0)-(13,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (13,0)-(13,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (13,2)-(13,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (13,2)-(13,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (13,2)-(13,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (13,3)-(13,8))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (13,4)-(13,7))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (13,4)-(13,7))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (13,4)-(13,5) = "c"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (13,6)-(13,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (13,6)-(13,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (13,6)-(13,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (13,3)-(13,4) = "{"
-        │   │       │       └── closing_loc: (13,7)-(13,8) = "}"
-        │   │       └── @ StringNode (location: (13,10)-(13,13))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (13,10)-(13,11) = "\""
-        │   │           ├── content_loc: (13,11)-(13,12) = "x"
-        │   │           ├── closing_loc: (13,12)-(13,13) = "\""
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (13,14)-(13,20))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (13,14)-(13,16) = "do"
-        │       └── closing_loc: (13,17)-(13,20) = "end"
-        ├── @ CallNode (location: (15,0)-(15,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (15,0)-(15,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,2)-(15,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (15,2)-(15,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (15,2)-(15,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (15,3)-(15,8))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (15,4)-(15,7))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (15,4)-(15,7))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (15,4)-(15,5) = "c"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (15,6)-(15,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (15,6)-(15,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (15,6)-(15,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (15,3)-(15,4) = "{"
-        │   │       │       └── closing_loc: (15,7)-(15,8) = "}"
-        │   │       └── @ RegularExpressionNode (location: (15,10)-(15,13))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (15,10)-(15,11) = "/"
-        │   │           ├── content_loc: (15,11)-(15,12) = "x"
-        │   │           ├── closing_loc: (15,12)-(15,13) = "/"
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (15,14)-(15,20))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (15,14)-(15,16) = "do"
-        │       └── closing_loc: (15,17)-(15,20) = "end"
-        ├── @ CallNode (location: (17,0)-(17,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (17,0)-(17,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (17,2)-(17,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (17,2)-(17,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (17,2)-(17,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (17,3)-(17,8))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (17,4)-(17,7))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (17,4)-(17,7))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (17,4)-(17,5) = "c"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (17,6)-(17,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (17,6)-(17,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (17,6)-(17,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (17,3)-(17,4) = "{"
-        │   │       │       └── closing_loc: (17,7)-(17,8) = "}"
-        │   │       └── @ RegularExpressionNode (location: (17,10)-(17,14))
-        │   │           ├── flags: multi_line, forced_us_ascii_encoding
-        │   │           ├── opening_loc: (17,10)-(17,11) = "/"
-        │   │           ├── content_loc: (17,11)-(17,12) = "x"
-        │   │           ├── closing_loc: (17,12)-(17,14) = "/m"
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (17,15)-(17,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (17,15)-(17,17) = "do"
-        │       └── closing_loc: (17,18)-(17,21) = "end"
-        ├── @ CallNode (location: (19,0)-(19,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (19,0)-(19,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (19,2)-(19,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (19,2)-(19,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (19,2)-(19,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (19,3)-(19,9))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (19,4)-(19,8))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (19,4)-(19,8))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (19,4)-(19,5) = "c"
-        │   │       │       │           ├── opening_loc: (19,5)-(19,6) = "("
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (19,6)-(19,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (19,6)-(19,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (19,6)-(19,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: (19,7)-(19,8) = ")"
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (19,3)-(19,4) = "{"
-        │   │       │       └── closing_loc: (19,8)-(19,9) = "}"
-        │   │       └── @ StringNode (location: (19,11)-(19,14))
-        │   │           ├── flags: ∅
-        │   │           ├── opening_loc: (19,11)-(19,12) = "\""
-        │   │           ├── content_loc: (19,12)-(19,13) = "x"
-        │   │           ├── closing_loc: (19,13)-(19,14) = "\""
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (19,15)-(19,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (19,15)-(19,17) = "do"
-        │       └── closing_loc: (19,18)-(19,21) = "end"
-        ├── @ CallNode (location: (21,0)-(21,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (21,0)-(21,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,2)-(21,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (21,2)-(21,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (21,2)-(21,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (21,3)-(21,9))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (21,4)-(21,8))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (21,4)-(21,8))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (21,4)-(21,5) = "c"
-        │   │       │       │           ├── opening_loc: (21,5)-(21,6) = "("
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (21,6)-(21,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (21,6)-(21,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (21,6)-(21,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: (21,7)-(21,8) = ")"
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (21,3)-(21,4) = "{"
-        │   │       │       └── closing_loc: (21,8)-(21,9) = "}"
-        │   │       └── @ RegularExpressionNode (location: (21,11)-(21,14))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (21,11)-(21,12) = "/"
-        │   │           ├── content_loc: (21,12)-(21,13) = "x"
-        │   │           ├── closing_loc: (21,13)-(21,14) = "/"
-        │   │           └── unescaped: "x"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (21,15)-(21,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (21,15)-(21,17) = "do"
-        │       └── closing_loc: (21,18)-(21,21) = "end"
-        └── @ CallNode (location: (23,0)-(23,22))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (23,0)-(23,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (23,2)-(23,15))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (23,2)-(23,9))
-            │       │   ├── flags: ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :b
-            │       │   ├── message_loc: (23,2)-(23,3) = "b"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block:
-            │       │       @ BlockNode (location: (23,3)-(23,9))
-            │       │       ├── locals: []
-            │       │       ├── parameters: ∅
-            │       │       ├── body:
-            │       │       │   @ StatementsNode (location: (23,4)-(23,8))
-            │       │       │   └── body: (length: 1)
-            │       │       │       └── @ CallNode (location: (23,4)-(23,8))
-            │       │       │           ├── flags: ignore_visibility
-            │       │       │           ├── receiver: ∅
-            │       │       │           ├── call_operator_loc: ∅
-            │       │       │           ├── name: :c
-            │       │       │           ├── message_loc: (23,4)-(23,5) = "c"
-            │       │       │           ├── opening_loc: (23,5)-(23,6) = "("
-            │       │       │           ├── arguments:
-            │       │       │           │   @ ArgumentsNode (location: (23,6)-(23,7))
-            │       │       │           │   ├── flags: ∅
-            │       │       │           │   └── arguments: (length: 1)
-            │       │       │           │       └── @ CallNode (location: (23,6)-(23,7))
-            │       │       │           │           ├── flags: variable_call, ignore_visibility
-            │       │       │           │           ├── receiver: ∅
-            │       │       │           │           ├── call_operator_loc: ∅
-            │       │       │           │           ├── name: :d
-            │       │       │           │           ├── message_loc: (23,6)-(23,7) = "d"
-            │       │       │           │           ├── opening_loc: ∅
-            │       │       │           │           ├── arguments: ∅
-            │       │       │           │           ├── closing_loc: ∅
-            │       │       │           │           └── block: ∅
-            │       │       │           ├── closing_loc: (23,7)-(23,8) = ")"
-            │       │       │           └── block: ∅
-            │       │       ├── opening_loc: (23,3)-(23,4) = "{"
-            │       │       └── closing_loc: (23,8)-(23,9) = "}"
-            │       └── @ RegularExpressionNode (location: (23,11)-(23,15))
-            │           ├── flags: multi_line, forced_us_ascii_encoding
-            │           ├── opening_loc: (23,11)-(23,12) = "/"
-            │           ├── content_loc: (23,12)-(23,13) = "x"
-            │           ├── closing_loc: (23,13)-(23,15) = "/m"
-            │           └── unescaped: "x"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (23,16)-(23,22))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (23,16)-(23,18) = "do"
-                └── closing_loc: (23,19)-(23,22) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_11873_a.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_11873_a.txt
deleted file mode 100644
index 93418e64483..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_11873_a.txt
+++ /dev/null
@@ -1,1231 +0,0 @@
-@ ProgramNode (location: (1,0)-(39,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(39,20))
-    └── body: (length: 20)
-        ├── @ CallNode (location: (1,0)-(1,18))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,0)-(1,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (1,2)-(1,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (1,2)-(1,3) = "b"
-        │   │       │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (1,4)-(1,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (1,4)-(1,7))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (1,4)-(1,5) = "c"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (1,6)-(1,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (1,6)-(1,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (1,6)-(1,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (1,7)-(1,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ IntegerNode (location: (1,10)-(1,11))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,12)-(1,18))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,12)-(1,14) = "do"
-        │       └── closing_loc: (1,15)-(1,18) = "end"
-        ├── @ CallNode (location: (3,0)-(3,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (3,0)-(3,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,2)-(3,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (3,2)-(3,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (3,2)-(3,3) = "b"
-        │   │       │   ├── opening_loc: (3,3)-(3,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (3,4)-(3,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (3,4)-(3,7))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (3,4)-(3,5) = "c"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (3,6)-(3,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (3,6)-(3,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (3,6)-(3,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (3,7)-(3,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ FloatNode (location: (3,10)-(3,13))
-        │   │           └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (3,14)-(3,20))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (3,14)-(3,16) = "do"
-        │       └── closing_loc: (3,17)-(3,20) = "end"
-        ├── @ CallNode (location: (5,0)-(5,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (5,0)-(5,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,2)-(5,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (5,2)-(5,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (5,2)-(5,3) = "b"
-        │   │       │   ├── opening_loc: (5,3)-(5,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (5,4)-(5,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (5,4)-(5,7))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (5,4)-(5,5) = "c"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (5,6)-(5,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (5,6)-(5,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (5,6)-(5,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (5,7)-(5,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ ImaginaryNode (location: (5,10)-(5,14))
-        │   │           └── numeric:
-        │   │               @ FloatNode (location: (5,10)-(5,13))
-        │   │               └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (5,15)-(5,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (5,15)-(5,17) = "do"
-        │       └── closing_loc: (5,18)-(5,21) = "end"
-        ├── @ CallNode (location: (7,0)-(7,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (7,0)-(7,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,2)-(7,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (7,2)-(7,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (7,2)-(7,3) = "b"
-        │   │       │   ├── opening_loc: (7,3)-(7,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (7,4)-(7,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (7,4)-(7,7))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (7,4)-(7,5) = "c"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (7,6)-(7,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (7,6)-(7,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (7,6)-(7,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (7,7)-(7,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ RationalNode (location: (7,10)-(7,14))
-        │   │           └── numeric:
-        │   │               @ FloatNode (location: (7,10)-(7,13))
-        │   │               └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (7,15)-(7,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (7,15)-(7,17) = "do"
-        │       └── closing_loc: (7,18)-(7,21) = "end"
-        ├── @ CallNode (location: (9,0)-(9,19))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (9,0)-(9,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,2)-(9,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (9,2)-(9,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (9,2)-(9,3) = "b"
-        │   │       │   ├── opening_loc: (9,3)-(9,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (9,4)-(9,7))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (9,4)-(9,7))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (9,4)-(9,5) = "c"
-        │   │       │   │           ├── opening_loc: ∅
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (9,6)-(9,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (9,6)-(9,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (9,6)-(9,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: ∅
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (9,7)-(9,8) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ SymbolNode (location: (9,10)-(9,12))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (9,10)-(9,11) = ":"
-        │   │           ├── value_loc: (9,11)-(9,12) = "e"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "e"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (9,13)-(9,19))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (9,13)-(9,15) = "do"
-        │       └── closing_loc: (9,16)-(9,19) = "end"
-        ├── @ CallNode (location: (11,0)-(11,19))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (11,0)-(11,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (11,2)-(11,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (11,2)-(11,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (11,2)-(11,3) = "b"
-        │   │       │   ├── opening_loc: (11,3)-(11,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (11,4)-(11,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (11,4)-(11,8))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (11,4)-(11,5) = "c"
-        │   │       │   │           ├── opening_loc: (11,5)-(11,6) = "("
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (11,6)-(11,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (11,6)-(11,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (11,6)-(11,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: (11,7)-(11,8) = ")"
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (11,8)-(11,9) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ IntegerNode (location: (11,11)-(11,12))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (11,13)-(11,19))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (11,13)-(11,15) = "do"
-        │       └── closing_loc: (11,16)-(11,19) = "end"
-        ├── @ CallNode (location: (13,0)-(13,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (13,0)-(13,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (13,2)-(13,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (13,2)-(13,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (13,2)-(13,3) = "b"
-        │   │       │   ├── opening_loc: (13,3)-(13,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (13,4)-(13,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (13,4)-(13,8))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (13,4)-(13,5) = "c"
-        │   │       │   │           ├── opening_loc: (13,5)-(13,6) = "("
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (13,6)-(13,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (13,6)-(13,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (13,6)-(13,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: (13,7)-(13,8) = ")"
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (13,8)-(13,9) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ FloatNode (location: (13,11)-(13,14))
-        │   │           └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (13,15)-(13,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (13,15)-(13,17) = "do"
-        │       └── closing_loc: (13,18)-(13,21) = "end"
-        ├── @ CallNode (location: (15,0)-(15,22))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (15,0)-(15,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,2)-(15,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (15,2)-(15,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (15,2)-(15,3) = "b"
-        │   │       │   ├── opening_loc: (15,3)-(15,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (15,4)-(15,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (15,4)-(15,8))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (15,4)-(15,5) = "c"
-        │   │       │   │           ├── opening_loc: (15,5)-(15,6) = "("
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (15,6)-(15,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (15,6)-(15,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (15,6)-(15,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: (15,7)-(15,8) = ")"
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (15,8)-(15,9) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ ImaginaryNode (location: (15,11)-(15,15))
-        │   │           └── numeric:
-        │   │               @ FloatNode (location: (15,11)-(15,14))
-        │   │               └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (15,16)-(15,22))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (15,16)-(15,18) = "do"
-        │       └── closing_loc: (15,19)-(15,22) = "end"
-        ├── @ CallNode (location: (17,0)-(17,22))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (17,0)-(17,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (17,2)-(17,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (17,2)-(17,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (17,2)-(17,3) = "b"
-        │   │       │   ├── opening_loc: (17,3)-(17,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (17,4)-(17,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (17,4)-(17,8))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (17,4)-(17,5) = "c"
-        │   │       │   │           ├── opening_loc: (17,5)-(17,6) = "("
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (17,6)-(17,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (17,6)-(17,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (17,6)-(17,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: (17,7)-(17,8) = ")"
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (17,8)-(17,9) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ RationalNode (location: (17,11)-(17,15))
-        │   │           └── numeric:
-        │   │               @ FloatNode (location: (17,11)-(17,14))
-        │   │               └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (17,16)-(17,22))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (17,16)-(17,18) = "do"
-        │       └── closing_loc: (17,19)-(17,22) = "end"
-        ├── @ CallNode (location: (19,0)-(19,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (19,0)-(19,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (19,2)-(19,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (19,2)-(19,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (19,2)-(19,3) = "b"
-        │   │       │   ├── opening_loc: (19,3)-(19,4) = "("
-        │   │       │   ├── arguments:
-        │   │       │   │   @ ArgumentsNode (location: (19,4)-(19,8))
-        │   │       │   │   ├── flags: ∅
-        │   │       │   │   └── arguments: (length: 1)
-        │   │       │   │       └── @ CallNode (location: (19,4)-(19,8))
-        │   │       │   │           ├── flags: ignore_visibility
-        │   │       │   │           ├── receiver: ∅
-        │   │       │   │           ├── call_operator_loc: ∅
-        │   │       │   │           ├── name: :c
-        │   │       │   │           ├── message_loc: (19,4)-(19,5) = "c"
-        │   │       │   │           ├── opening_loc: (19,5)-(19,6) = "("
-        │   │       │   │           ├── arguments:
-        │   │       │   │           │   @ ArgumentsNode (location: (19,6)-(19,7))
-        │   │       │   │           │   ├── flags: ∅
-        │   │       │   │           │   └── arguments: (length: 1)
-        │   │       │   │           │       └── @ CallNode (location: (19,6)-(19,7))
-        │   │       │   │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │   │           │           ├── receiver: ∅
-        │   │       │   │           │           ├── call_operator_loc: ∅
-        │   │       │   │           │           ├── name: :d
-        │   │       │   │           │           ├── message_loc: (19,6)-(19,7) = "d"
-        │   │       │   │           │           ├── opening_loc: ∅
-        │   │       │   │           │           ├── arguments: ∅
-        │   │       │   │           │           ├── closing_loc: ∅
-        │   │       │   │           │           └── block: ∅
-        │   │       │   │           ├── closing_loc: (19,7)-(19,8) = ")"
-        │   │       │   │           └── block: ∅
-        │   │       │   ├── closing_loc: (19,8)-(19,9) = ")"
-        │   │       │   └── block: ∅
-        │   │       └── @ SymbolNode (location: (19,11)-(19,13))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (19,11)-(19,12) = ":"
-        │   │           ├── value_loc: (19,12)-(19,13) = "e"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "e"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (19,14)-(19,20))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (19,14)-(19,16) = "do"
-        │       └── closing_loc: (19,17)-(19,20) = "end"
-        ├── @ CallNode (location: (21,0)-(21,18))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (21,0)-(21,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,2)-(21,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (21,2)-(21,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (21,2)-(21,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (21,3)-(21,8))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (21,4)-(21,7))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (21,4)-(21,7))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (21,4)-(21,5) = "c"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (21,6)-(21,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (21,6)-(21,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (21,6)-(21,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (21,3)-(21,4) = "{"
-        │   │       │       └── closing_loc: (21,7)-(21,8) = "}"
-        │   │       └── @ IntegerNode (location: (21,10)-(21,11))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (21,12)-(21,18))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (21,12)-(21,14) = "do"
-        │       └── closing_loc: (21,15)-(21,18) = "end"
-        ├── @ CallNode (location: (23,0)-(23,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (23,0)-(23,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (23,2)-(23,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (23,2)-(23,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (23,2)-(23,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (23,3)-(23,8))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (23,4)-(23,7))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (23,4)-(23,7))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (23,4)-(23,5) = "c"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (23,6)-(23,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (23,6)-(23,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (23,6)-(23,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (23,3)-(23,4) = "{"
-        │   │       │       └── closing_loc: (23,7)-(23,8) = "}"
-        │   │       └── @ FloatNode (location: (23,10)-(23,13))
-        │   │           └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (23,14)-(23,20))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (23,14)-(23,16) = "do"
-        │       └── closing_loc: (23,17)-(23,20) = "end"
-        ├── @ CallNode (location: (25,0)-(25,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (25,0)-(25,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (25,2)-(25,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (25,2)-(25,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (25,2)-(25,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (25,3)-(25,8))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (25,4)-(25,7))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (25,4)-(25,7))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (25,4)-(25,5) = "c"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (25,6)-(25,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (25,6)-(25,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (25,6)-(25,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (25,3)-(25,4) = "{"
-        │   │       │       └── closing_loc: (25,7)-(25,8) = "}"
-        │   │       └── @ ImaginaryNode (location: (25,10)-(25,14))
-        │   │           └── numeric:
-        │   │               @ FloatNode (location: (25,10)-(25,13))
-        │   │               └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (25,15)-(25,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (25,15)-(25,17) = "do"
-        │       └── closing_loc: (25,18)-(25,21) = "end"
-        ├── @ CallNode (location: (27,0)-(27,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (27,0)-(27,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (27,2)-(27,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (27,2)-(27,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (27,2)-(27,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (27,3)-(27,8))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (27,4)-(27,7))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (27,4)-(27,7))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (27,4)-(27,5) = "c"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (27,6)-(27,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (27,6)-(27,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (27,6)-(27,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (27,3)-(27,4) = "{"
-        │   │       │       └── closing_loc: (27,7)-(27,8) = "}"
-        │   │       └── @ RationalNode (location: (27,10)-(27,14))
-        │   │           └── numeric:
-        │   │               @ FloatNode (location: (27,10)-(27,13))
-        │   │               └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (27,15)-(27,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (27,15)-(27,17) = "do"
-        │       └── closing_loc: (27,18)-(27,21) = "end"
-        ├── @ CallNode (location: (29,0)-(29,19))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (29,0)-(29,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (29,2)-(29,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (29,2)-(29,8))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (29,2)-(29,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (29,3)-(29,8))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (29,4)-(29,7))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (29,4)-(29,7))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (29,4)-(29,5) = "c"
-        │   │       │       │           ├── opening_loc: ∅
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (29,6)-(29,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (29,6)-(29,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (29,6)-(29,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: ∅
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (29,3)-(29,4) = "{"
-        │   │       │       └── closing_loc: (29,7)-(29,8) = "}"
-        │   │       └── @ SymbolNode (location: (29,10)-(29,12))
-        │   │           ├── flags: forced_us_ascii_encoding
-        │   │           ├── opening_loc: (29,10)-(29,11) = ":"
-        │   │           ├── value_loc: (29,11)-(29,12) = "e"
-        │   │           ├── closing_loc: ∅
-        │   │           └── unescaped: "e"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (29,13)-(29,19))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (29,13)-(29,15) = "do"
-        │       └── closing_loc: (29,16)-(29,19) = "end"
-        ├── @ CallNode (location: (31,0)-(31,19))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (31,0)-(31,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,2)-(31,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (31,2)-(31,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (31,2)-(31,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (31,3)-(31,9))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (31,4)-(31,8))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (31,4)-(31,8))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (31,4)-(31,5) = "c"
-        │   │       │       │           ├── opening_loc: (31,5)-(31,6) = "("
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (31,6)-(31,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (31,6)-(31,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (31,6)-(31,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: (31,7)-(31,8) = ")"
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (31,3)-(31,4) = "{"
-        │   │       │       └── closing_loc: (31,8)-(31,9) = "}"
-        │   │       └── @ IntegerNode (location: (31,11)-(31,12))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (31,13)-(31,19))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (31,13)-(31,15) = "do"
-        │       └── closing_loc: (31,16)-(31,19) = "end"
-        ├── @ CallNode (location: (33,0)-(33,21))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (33,0)-(33,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (33,2)-(33,14))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (33,2)-(33,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (33,2)-(33,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (33,3)-(33,9))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (33,4)-(33,8))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (33,4)-(33,8))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (33,4)-(33,5) = "c"
-        │   │       │       │           ├── opening_loc: (33,5)-(33,6) = "("
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (33,6)-(33,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (33,6)-(33,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (33,6)-(33,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: (33,7)-(33,8) = ")"
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (33,3)-(33,4) = "{"
-        │   │       │       └── closing_loc: (33,8)-(33,9) = "}"
-        │   │       └── @ FloatNode (location: (33,11)-(33,14))
-        │   │           └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (33,15)-(33,21))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (33,15)-(33,17) = "do"
-        │       └── closing_loc: (33,18)-(33,21) = "end"
-        ├── @ CallNode (location: (35,0)-(35,22))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (35,0)-(35,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (35,2)-(35,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (35,2)-(35,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (35,2)-(35,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (35,3)-(35,9))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (35,4)-(35,8))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (35,4)-(35,8))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (35,4)-(35,5) = "c"
-        │   │       │       │           ├── opening_loc: (35,5)-(35,6) = "("
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (35,6)-(35,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (35,6)-(35,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (35,6)-(35,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: (35,7)-(35,8) = ")"
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (35,3)-(35,4) = "{"
-        │   │       │       └── closing_loc: (35,8)-(35,9) = "}"
-        │   │       └── @ ImaginaryNode (location: (35,11)-(35,15))
-        │   │           └── numeric:
-        │   │               @ FloatNode (location: (35,11)-(35,14))
-        │   │               └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (35,16)-(35,22))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (35,16)-(35,18) = "do"
-        │       └── closing_loc: (35,19)-(35,22) = "end"
-        ├── @ CallNode (location: (37,0)-(37,22))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (37,0)-(37,1) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (37,2)-(37,15))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 2)
-        │   │       ├── @ CallNode (location: (37,2)-(37,9))
-        │   │       │   ├── flags: ignore_visibility
-        │   │       │   ├── receiver: ∅
-        │   │       │   ├── call_operator_loc: ∅
-        │   │       │   ├── name: :b
-        │   │       │   ├── message_loc: (37,2)-(37,3) = "b"
-        │   │       │   ├── opening_loc: ∅
-        │   │       │   ├── arguments: ∅
-        │   │       │   ├── closing_loc: ∅
-        │   │       │   └── block:
-        │   │       │       @ BlockNode (location: (37,3)-(37,9))
-        │   │       │       ├── locals: []
-        │   │       │       ├── parameters: ∅
-        │   │       │       ├── body:
-        │   │       │       │   @ StatementsNode (location: (37,4)-(37,8))
-        │   │       │       │   └── body: (length: 1)
-        │   │       │       │       └── @ CallNode (location: (37,4)-(37,8))
-        │   │       │       │           ├── flags: ignore_visibility
-        │   │       │       │           ├── receiver: ∅
-        │   │       │       │           ├── call_operator_loc: ∅
-        │   │       │       │           ├── name: :c
-        │   │       │       │           ├── message_loc: (37,4)-(37,5) = "c"
-        │   │       │       │           ├── opening_loc: (37,5)-(37,6) = "("
-        │   │       │       │           ├── arguments:
-        │   │       │       │           │   @ ArgumentsNode (location: (37,6)-(37,7))
-        │   │       │       │           │   ├── flags: ∅
-        │   │       │       │           │   └── arguments: (length: 1)
-        │   │       │       │           │       └── @ CallNode (location: (37,6)-(37,7))
-        │   │       │       │           │           ├── flags: variable_call, ignore_visibility
-        │   │       │       │           │           ├── receiver: ∅
-        │   │       │       │           │           ├── call_operator_loc: ∅
-        │   │       │       │           │           ├── name: :d
-        │   │       │       │           │           ├── message_loc: (37,6)-(37,7) = "d"
-        │   │       │       │           │           ├── opening_loc: ∅
-        │   │       │       │           │           ├── arguments: ∅
-        │   │       │       │           │           ├── closing_loc: ∅
-        │   │       │       │           │           └── block: ∅
-        │   │       │       │           ├── closing_loc: (37,7)-(37,8) = ")"
-        │   │       │       │           └── block: ∅
-        │   │       │       ├── opening_loc: (37,3)-(37,4) = "{"
-        │   │       │       └── closing_loc: (37,8)-(37,9) = "}"
-        │   │       └── @ RationalNode (location: (37,11)-(37,15))
-        │   │           └── numeric:
-        │   │               @ FloatNode (location: (37,11)-(37,14))
-        │   │               └── value: 1.0
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (37,16)-(37,22))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (37,16)-(37,18) = "do"
-        │       └── closing_loc: (37,19)-(37,22) = "end"
-        └── @ CallNode (location: (39,0)-(39,20))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :a
-            ├── message_loc: (39,0)-(39,1) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (39,2)-(39,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (39,2)-(39,9))
-            │       │   ├── flags: ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :b
-            │       │   ├── message_loc: (39,2)-(39,3) = "b"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block:
-            │       │       @ BlockNode (location: (39,3)-(39,9))
-            │       │       ├── locals: []
-            │       │       ├── parameters: ∅
-            │       │       ├── body:
-            │       │       │   @ StatementsNode (location: (39,4)-(39,8))
-            │       │       │   └── body: (length: 1)
-            │       │       │       └── @ CallNode (location: (39,4)-(39,8))
-            │       │       │           ├── flags: ignore_visibility
-            │       │       │           ├── receiver: ∅
-            │       │       │           ├── call_operator_loc: ∅
-            │       │       │           ├── name: :c
-            │       │       │           ├── message_loc: (39,4)-(39,5) = "c"
-            │       │       │           ├── opening_loc: (39,5)-(39,6) = "("
-            │       │       │           ├── arguments:
-            │       │       │           │   @ ArgumentsNode (location: (39,6)-(39,7))
-            │       │       │           │   ├── flags: ∅
-            │       │       │           │   └── arguments: (length: 1)
-            │       │       │           │       └── @ CallNode (location: (39,6)-(39,7))
-            │       │       │           │           ├── flags: variable_call, ignore_visibility
-            │       │       │           │           ├── receiver: ∅
-            │       │       │           │           ├── call_operator_loc: ∅
-            │       │       │           │           ├── name: :d
-            │       │       │           │           ├── message_loc: (39,6)-(39,7) = "d"
-            │       │       │           │           ├── opening_loc: ∅
-            │       │       │           │           ├── arguments: ∅
-            │       │       │           │           ├── closing_loc: ∅
-            │       │       │           │           └── block: ∅
-            │       │       │           ├── closing_loc: (39,7)-(39,8) = ")"
-            │       │       │           └── block: ∅
-            │       │       ├── opening_loc: (39,3)-(39,4) = "{"
-            │       │       └── closing_loc: (39,8)-(39,9) = "}"
-            │       └── @ SymbolNode (location: (39,11)-(39,13))
-            │           ├── flags: forced_us_ascii_encoding
-            │           ├── opening_loc: (39,11)-(39,12) = ":"
-            │           ├── value_loc: (39,12)-(39,13) = "e"
-            │           ├── closing_loc: ∅
-            │           └── unescaped: "e"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (39,14)-(39,20))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (39,14)-(39,16) = "do"
-                └── closing_loc: (39,17)-(39,20) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_11873_b.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_11873_b.txt
deleted file mode 100644
index 6aa8e55e54a..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_11873_b.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,25))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,25))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,25))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,18))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (1,2)-(1,13))
-            │       │   ├── flags: ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :p
-            │       │   ├── message_loc: (1,2)-(1,3) = "p"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block:
-            │       │       @ BlockNode (location: (1,3)-(1,13))
-            │       │       ├── locals: []
-            │       │       ├── parameters: ∅
-            │       │       ├── body:
-            │       │       │   @ StatementsNode (location: (1,4)-(1,12))
-            │       │       │   └── body: (length: 2)
-            │       │       │       ├── @ CallNode (location: (1,4)-(1,8))
-            │       │       │       │   ├── flags: ignore_visibility
-            │       │       │       │   ├── receiver: ∅
-            │       │       │       │   ├── call_operator_loc: ∅
-            │       │       │       │   ├── name: :p
-            │       │       │       │   ├── message_loc: (1,4)-(1,5) = "p"
-            │       │       │       │   ├── opening_loc: (1,5)-(1,6) = "("
-            │       │       │       │   ├── arguments:
-            │       │       │       │   │   @ ArgumentsNode (location: (1,6)-(1,7))
-            │       │       │       │   │   ├── flags: ∅
-            │       │       │       │   │   └── arguments: (length: 1)
-            │       │       │       │   │       └── @ CallNode (location: (1,6)-(1,7))
-            │       │       │       │   │           ├── flags: variable_call, ignore_visibility
-            │       │       │       │   │           ├── receiver: ∅
-            │       │       │       │   │           ├── call_operator_loc: ∅
-            │       │       │       │   │           ├── name: :p
-            │       │       │       │   │           ├── message_loc: (1,6)-(1,7) = "p"
-            │       │       │       │   │           ├── opening_loc: ∅
-            │       │       │       │   │           ├── arguments: ∅
-            │       │       │       │   │           ├── closing_loc: ∅
-            │       │       │       │   │           └── block: ∅
-            │       │       │       │   ├── closing_loc: (1,7)-(1,8) = ")"
-            │       │       │       │   └── block: ∅
-            │       │       │       └── @ CallNode (location: (1,9)-(1,12))
-            │       │       │           ├── flags: ignore_visibility
-            │       │       │           ├── receiver: ∅
-            │       │       │           ├── call_operator_loc: ∅
-            │       │       │           ├── name: :p
-            │       │       │           ├── message_loc: (1,9)-(1,10) = "p"
-            │       │       │           ├── opening_loc: ∅
-            │       │       │           ├── arguments:
-            │       │       │           │   @ ArgumentsNode (location: (1,11)-(1,12))
-            │       │       │           │   ├── flags: ∅
-            │       │       │           │   └── arguments: (length: 1)
-            │       │       │           │       └── @ CallNode (location: (1,11)-(1,12))
-            │       │       │           │           ├── flags: variable_call, ignore_visibility
-            │       │       │           │           ├── receiver: ∅
-            │       │       │           │           ├── call_operator_loc: ∅
-            │       │       │           │           ├── name: :p
-            │       │       │           │           ├── message_loc: (1,11)-(1,12) = "p"
-            │       │       │           │           ├── opening_loc: ∅
-            │       │       │           │           ├── arguments: ∅
-            │       │       │           │           ├── closing_loc: ∅
-            │       │       │           │           └── block: ∅
-            │       │       │           ├── closing_loc: ∅
-            │       │       │           └── block: ∅
-            │       │       ├── opening_loc: (1,3)-(1,4) = "{"
-            │       │       └── closing_loc: (1,12)-(1,13) = "}"
-            │       └── @ CallNode (location: (1,15)-(1,18))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :tap
-            │           ├── message_loc: (1,15)-(1,18) = "tap"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,19)-(1,25))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,19)-(1,21) = "do"
-                └── closing_loc: (1,22)-(1,25) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_11989.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_11989.txt
deleted file mode 100644
index fe17087e53a..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_11989.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ StringNode (location: (1,2)-(1,8))
-            │           ├── flags: ∅
-            │           ├── opening_loc: (1,2)-(1,8) = "<<~\"E\""
-            │           ├── content_loc: (2,0)-(3,0) = "  x\\n   y\n"
-            │           ├── closing_loc: (3,0)-(4,0) = "E\n"
-            │           └── unescaped: "x\n   y\n"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_11990.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_11990.txt
deleted file mode 100644
index 43c04e55a23..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_11990.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :p
-            ├── message_loc: (1,0)-(1,1) = "p"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,12))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ InterpolatedStringNode (location: (1,2)-(1,12))
-            │           ├── opening_loc: ∅
-            │           ├── parts: (length: 2)
-            │           │   ├── @ StringNode (location: (1,2)-(1,6))
-            │           │   │   ├── flags: ∅
-            │           │   │   ├── opening_loc: (1,2)-(1,6) = "<<~E"
-            │           │   │   ├── content_loc: (2,0)-(3,0) = "  x\n"
-            │           │   │   ├── closing_loc: (3,0)-(4,0) = "E\n"
-            │           │   │   └── unescaped: "x\n"
-            │           │   └── @ StringNode (location: (1,7)-(1,12))
-            │           │       ├── flags: ∅
-            │           │       ├── opening_loc: (1,7)-(1,8) = "\""
-            │           │       ├── content_loc: (1,8)-(1,11) = "  y"
-            │           │       ├── closing_loc: (1,11)-(1,12) = "\""
-            │           │       └── unescaped: "  y"
-            │           └── closing_loc: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_12073.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_12073.txt
deleted file mode 100644
index 9db30f6fec1..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_12073.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,34))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,34))
-    └── body: (length: 3)
-        ├── @ LocalVariableWriteNode (location: (1,0)-(1,5))
-        │   ├── name: :a
-        │   ├── depth: 0
-        │   ├── name_loc: (1,0)-(1,1) = "a"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,4)-(1,5))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (1,2)-(1,3) = "="
-        ├── @ CallNode (location: (1,7)-(1,13))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :a
-        │   ├── message_loc: (1,7)-(1,8) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,9)-(1,13))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ KeywordHashNode (location: (1,9)-(1,13))
-        │   │           ├── flags: symbol_keys
-        │   │           └── elements: (length: 1)
-        │   │               └── @ AssocNode (location: (1,9)-(1,13))
-        │   │                   ├── key:
-        │   │                   │   @ SymbolNode (location: (1,9)-(1,11))
-        │   │                   │   ├── flags: forced_us_ascii_encoding
-        │   │                   │   ├── opening_loc: ∅
-        │   │                   │   ├── value_loc: (1,9)-(1,10) = "b"
-        │   │                   │   ├── closing_loc: (1,10)-(1,11) = ":"
-        │   │                   │   └── unescaped: "b"
-        │   │                   ├── value:
-        │   │                   │   @ IntegerNode (location: (1,12)-(1,13))
-        │   │                   │   ├── flags: decimal
-        │   │                   │   └── value: 1
-        │   │                   └── operator_loc: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ DefNode (location: (3,0)-(3,34))
-            ├── name: :foo
-            ├── name_loc: (3,4)-(3,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (3,8)-(3,13))
-            │   ├── requireds: (length: 1)
-            │   │   └── @ RequiredParameterNode (location: (3,8)-(3,13))
-            │   │       ├── flags: ∅
-            │   │       └── name: :raise
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (3,15)-(3,29))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (3,15)-(3,29))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :raise
-            │           ├── message_loc: (3,15)-(3,20) = "raise"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (3,21)-(3,29))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 2)
-            │           │       ├── @ ConstantPathNode (location: (3,21)-(3,25))
-            │           │       │   ├── parent:
-            │           │       │   │   @ ConstantReadNode (location: (3,21)-(3,22))
-            │           │       │   │   └── name: :A
-            │           │       │   ├── child:
-            │           │       │   │   @ ConstantReadNode (location: (3,24)-(3,25))
-            │           │       │   │   └── name: :B
-            │           │       │   └── delimiter_loc: (3,22)-(3,24) = "::"
-            │           │       └── @ StringNode (location: (3,27)-(3,29))
-            │           │           ├── flags: ∅
-            │           │           ├── opening_loc: (3,27)-(3,28) = "'"
-            │           │           ├── content_loc: (3,28)-(3,28) = ""
-            │           │           ├── closing_loc: (3,28)-(3,29) = "'"
-            │           │           └── unescaped: ""
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── locals: [:raise]
-            ├── def_keyword_loc: (3,0)-(3,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (3,31)-(3,34) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_12402.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_12402.txt
deleted file mode 100644
index df5aea00c35..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_12402.txt
+++ /dev/null
@@ -1,567 +0,0 @@
-@ ProgramNode (location: (1,0)-(27,31))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(27,31))
-    └── body: (length: 14)
-        ├── @ LocalVariableOperatorWriteNode (location: (1,0)-(1,27))
-        │   ├── name_loc: (1,0)-(1,3) = "foo"
-        │   ├── operator_loc: (1,4)-(1,6) = "+="
-        │   ├── value:
-        │   │   @ RescueModifierNode (location: (1,7)-(1,27))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (1,7)-(1,16))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :raise
-        │   │   │   ├── message_loc: (1,7)-(1,12) = "raise"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (1,13)-(1,16))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (1,13)-(1,16))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           ├── message_loc: (1,13)-(1,16) = "bar"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── keyword_loc: (1,17)-(1,23) = "rescue"
-        │   │   └── rescue_expression:
-        │   │       @ NilNode (location: (1,24)-(1,27))
-        │   ├── name: :foo
-        │   ├── operator: :+
-        │   └── depth: 0
-        ├── @ LocalVariableOperatorWriteNode (location: (3,0)-(3,28))
-        │   ├── name_loc: (3,0)-(3,3) = "foo"
-        │   ├── operator_loc: (3,4)-(3,6) = "+="
-        │   ├── value:
-        │   │   @ RescueModifierNode (location: (3,7)-(3,28))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (3,7)-(3,17))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :raise
-        │   │   │   ├── message_loc: (3,7)-(3,12) = "raise"
-        │   │   │   ├── opening_loc: (3,12)-(3,13) = "("
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (3,13)-(3,16))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (3,13)-(3,16))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           ├── message_loc: (3,13)-(3,16) = "bar"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── closing_loc: (3,16)-(3,17) = ")"
-        │   │   │   └── block: ∅
-        │   │   ├── keyword_loc: (3,18)-(3,24) = "rescue"
-        │   │   └── rescue_expression:
-        │   │       @ NilNode (location: (3,25)-(3,28))
-        │   ├── name: :foo
-        │   ├── operator: :+
-        │   └── depth: 0
-        ├── @ LocalVariableWriteNode (location: (5,0)-(5,26))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (5,0)-(5,3) = "foo"
-        │   ├── value:
-        │   │   @ RescueModifierNode (location: (5,6)-(5,26))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (5,6)-(5,15))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :raise
-        │   │   │   ├── message_loc: (5,6)-(5,11) = "raise"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (5,12)-(5,15))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (5,12)-(5,15))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           ├── message_loc: (5,12)-(5,15) = "bar"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── keyword_loc: (5,16)-(5,22) = "rescue"
-        │   │   └── rescue_expression:
-        │   │       @ NilNode (location: (5,23)-(5,26))
-        │   └── operator_loc: (5,4)-(5,5) = "="
-        ├── @ LocalVariableWriteNode (location: (7,0)-(7,27))
-        │   ├── name: :foo
-        │   ├── depth: 0
-        │   ├── name_loc: (7,0)-(7,3) = "foo"
-        │   ├── value:
-        │   │   @ RescueModifierNode (location: (7,6)-(7,27))
-        │   │   ├── expression:
-        │   │   │   @ CallNode (location: (7,6)-(7,16))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :raise
-        │   │   │   ├── message_loc: (7,6)-(7,11) = "raise"
-        │   │   │   ├── opening_loc: (7,11)-(7,12) = "("
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (7,12)-(7,15))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (7,12)-(7,15))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           ├── message_loc: (7,12)-(7,15) = "bar"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   ├── closing_loc: (7,15)-(7,16) = ")"
-        │   │   │   └── block: ∅
-        │   │   ├── keyword_loc: (7,17)-(7,23) = "rescue"
-        │   │   └── rescue_expression:
-        │   │       @ NilNode (location: (7,24)-(7,27))
-        │   └── operator_loc: (7,4)-(7,5) = "="
-        ├── @ CallOperatorWriteNode (location: (9,0)-(9,29))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (9,0)-(9,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (9,3)-(9,4) = "."
-        │   ├── message_loc: (9,4)-(9,5) = "C"
-        │   ├── read_name: :C
-        │   ├── write_name: :C=
-        │   ├── operator: :+
-        │   ├── operator_loc: (9,6)-(9,8) = "+="
-        │   └── value:
-        │       @ RescueModifierNode (location: (9,9)-(9,29))
-        │       ├── expression:
-        │       │   @ CallNode (location: (9,9)-(9,18))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (9,9)-(9,14) = "raise"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (9,15)-(9,18))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (9,15)-(9,18))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (9,15)-(9,18) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (9,19)-(9,25) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (9,26)-(9,29))
-        ├── @ CallOperatorWriteNode (location: (11,0)-(11,30))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (11,0)-(11,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (11,3)-(11,4) = "."
-        │   ├── message_loc: (11,4)-(11,5) = "C"
-        │   ├── read_name: :C
-        │   ├── write_name: :C=
-        │   ├── operator: :+
-        │   ├── operator_loc: (11,6)-(11,8) = "+="
-        │   └── value:
-        │       @ RescueModifierNode (location: (11,9)-(11,30))
-        │       ├── expression:
-        │       │   @ CallNode (location: (11,9)-(11,19))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (11,9)-(11,14) = "raise"
-        │       │   ├── opening_loc: (11,14)-(11,15) = "("
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (11,15)-(11,18))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (11,15)-(11,18))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (11,15)-(11,18) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: (11,18)-(11,19) = ")"
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (11,20)-(11,26) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (11,27)-(11,30))
-        ├── @ CallOperatorWriteNode (location: (13,0)-(13,29))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (13,0)-(13,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (13,3)-(13,4) = "."
-        │   ├── message_loc: (13,4)-(13,5) = "m"
-        │   ├── read_name: :m
-        │   ├── write_name: :m=
-        │   ├── operator: :+
-        │   ├── operator_loc: (13,6)-(13,8) = "+="
-        │   └── value:
-        │       @ RescueModifierNode (location: (13,9)-(13,29))
-        │       ├── expression:
-        │       │   @ CallNode (location: (13,9)-(13,18))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (13,9)-(13,14) = "raise"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (13,15)-(13,18))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (13,15)-(13,18))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (13,15)-(13,18) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (13,19)-(13,25) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (13,26)-(13,29))
-        ├── @ CallOperatorWriteNode (location: (15,0)-(15,30))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (15,0)-(15,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (15,3)-(15,4) = "."
-        │   ├── message_loc: (15,4)-(15,5) = "m"
-        │   ├── read_name: :m
-        │   ├── write_name: :m=
-        │   ├── operator: :+
-        │   ├── operator_loc: (15,6)-(15,8) = "+="
-        │   └── value:
-        │       @ RescueModifierNode (location: (15,9)-(15,30))
-        │       ├── expression:
-        │       │   @ CallNode (location: (15,9)-(15,19))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (15,9)-(15,14) = "raise"
-        │       │   ├── opening_loc: (15,14)-(15,15) = "("
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (15,15)-(15,18))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (15,15)-(15,18))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (15,15)-(15,18) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: (15,18)-(15,19) = ")"
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (15,20)-(15,26) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (15,27)-(15,30))
-        ├── @ ConstantPathOrWriteNode (location: (17,0)-(17,31))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (17,0)-(17,6))
-        │   │   ├── parent:
-        │   │   │   @ LocalVariableReadNode (location: (17,0)-(17,3))
-        │   │   │   ├── name: :foo
-        │   │   │   └── depth: 0
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (17,5)-(17,6))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (17,3)-(17,5) = "::"
-        │   ├── operator_loc: (17,7)-(17,10) = "||="
-        │   └── value:
-        │       @ RescueModifierNode (location: (17,11)-(17,31))
-        │       ├── expression:
-        │       │   @ CallNode (location: (17,11)-(17,20))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (17,11)-(17,16) = "raise"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (17,17)-(17,20))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (17,17)-(17,20))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (17,17)-(17,20) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (17,21)-(17,27) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (17,28)-(17,31))
-        ├── @ ConstantPathOrWriteNode (location: (19,0)-(19,32))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (19,0)-(19,6))
-        │   │   ├── parent:
-        │   │   │   @ LocalVariableReadNode (location: (19,0)-(19,3))
-        │   │   │   ├── name: :foo
-        │   │   │   └── depth: 0
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (19,5)-(19,6))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (19,3)-(19,5) = "::"
-        │   ├── operator_loc: (19,7)-(19,10) = "||="
-        │   └── value:
-        │       @ RescueModifierNode (location: (19,11)-(19,32))
-        │       ├── expression:
-        │       │   @ CallNode (location: (19,11)-(19,21))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (19,11)-(19,16) = "raise"
-        │       │   ├── opening_loc: (19,16)-(19,17) = "("
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (19,17)-(19,20))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (19,17)-(19,20))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (19,17)-(19,20) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: (19,20)-(19,21) = ")"
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (19,22)-(19,28) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (19,29)-(19,32))
-        ├── @ CallOperatorWriteNode (location: (21,0)-(21,30))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (21,0)-(21,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (21,3)-(21,5) = "::"
-        │   ├── message_loc: (21,5)-(21,6) = "m"
-        │   ├── read_name: :m
-        │   ├── write_name: :m=
-        │   ├── operator: :+
-        │   ├── operator_loc: (21,7)-(21,9) = "+="
-        │   └── value:
-        │       @ RescueModifierNode (location: (21,10)-(21,30))
-        │       ├── expression:
-        │       │   @ CallNode (location: (21,10)-(21,19))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (21,10)-(21,15) = "raise"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (21,16)-(21,19))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (21,16)-(21,19))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (21,16)-(21,19) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (21,20)-(21,26) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (21,27)-(21,30))
-        ├── @ CallOperatorWriteNode (location: (23,0)-(23,31))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (23,0)-(23,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: (23,3)-(23,5) = "::"
-        │   ├── message_loc: (23,5)-(23,6) = "m"
-        │   ├── read_name: :m
-        │   ├── write_name: :m=
-        │   ├── operator: :+
-        │   ├── operator_loc: (23,7)-(23,9) = "+="
-        │   └── value:
-        │       @ RescueModifierNode (location: (23,10)-(23,31))
-        │       ├── expression:
-        │       │   @ CallNode (location: (23,10)-(23,20))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (23,10)-(23,15) = "raise"
-        │       │   ├── opening_loc: (23,15)-(23,16) = "("
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (23,16)-(23,19))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (23,16)-(23,19))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (23,16)-(23,19) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: (23,19)-(23,20) = ")"
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (23,21)-(23,27) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (23,28)-(23,31))
-        ├── @ IndexOperatorWriteNode (location: (25,0)-(25,30))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ LocalVariableReadNode (location: (25,0)-(25,3))
-        │   │   ├── name: :foo
-        │   │   └── depth: 0
-        │   ├── call_operator_loc: ∅
-        │   ├── opening_loc: (25,3)-(25,4) = "["
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (25,4)-(25,5))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (25,4)-(25,5))
-        │   │           ├── flags: decimal
-        │   │           └── value: 0
-        │   ├── closing_loc: (25,5)-(25,6) = "]"
-        │   ├── block: ∅
-        │   ├── operator: :+
-        │   ├── operator_loc: (25,7)-(25,9) = "+="
-        │   └── value:
-        │       @ RescueModifierNode (location: (25,10)-(25,30))
-        │       ├── expression:
-        │       │   @ CallNode (location: (25,10)-(25,19))
-        │       │   ├── flags: ignore_visibility
-        │       │   ├── receiver: ∅
-        │       │   ├── call_operator_loc: ∅
-        │       │   ├── name: :raise
-        │       │   ├── message_loc: (25,10)-(25,15) = "raise"
-        │       │   ├── opening_loc: ∅
-        │       │   ├── arguments:
-        │       │   │   @ ArgumentsNode (location: (25,16)-(25,19))
-        │       │   │   ├── flags: ∅
-        │       │   │   └── arguments: (length: 1)
-        │       │   │       └── @ CallNode (location: (25,16)-(25,19))
-        │       │   │           ├── flags: variable_call, ignore_visibility
-        │       │   │           ├── receiver: ∅
-        │       │   │           ├── call_operator_loc: ∅
-        │       │   │           ├── name: :bar
-        │       │   │           ├── message_loc: (25,16)-(25,19) = "bar"
-        │       │   │           ├── opening_loc: ∅
-        │       │   │           ├── arguments: ∅
-        │       │   │           ├── closing_loc: ∅
-        │       │   │           └── block: ∅
-        │       │   ├── closing_loc: ∅
-        │       │   └── block: ∅
-        │       ├── keyword_loc: (25,20)-(25,26) = "rescue"
-        │       └── rescue_expression:
-        │           @ NilNode (location: (25,27)-(25,30))
-        └── @ IndexOperatorWriteNode (location: (27,0)-(27,31))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ LocalVariableReadNode (location: (27,0)-(27,3))
-            │   ├── name: :foo
-            │   └── depth: 0
-            ├── call_operator_loc: ∅
-            ├── opening_loc: (27,3)-(27,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (27,4)-(27,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (27,4)-(27,5))
-            │           ├── flags: decimal
-            │           └── value: 0
-            ├── closing_loc: (27,5)-(27,6) = "]"
-            ├── block: ∅
-            ├── operator: :+
-            ├── operator_loc: (27,7)-(27,9) = "+="
-            └── value:
-                @ RescueModifierNode (location: (27,10)-(27,31))
-                ├── expression:
-                │   @ CallNode (location: (27,10)-(27,20))
-                │   ├── flags: ignore_visibility
-                │   ├── receiver: ∅
-                │   ├── call_operator_loc: ∅
-                │   ├── name: :raise
-                │   ├── message_loc: (27,10)-(27,15) = "raise"
-                │   ├── opening_loc: (27,15)-(27,16) = "("
-                │   ├── arguments:
-                │   │   @ ArgumentsNode (location: (27,16)-(27,19))
-                │   │   ├── flags: ∅
-                │   │   └── arguments: (length: 1)
-                │   │       └── @ CallNode (location: (27,16)-(27,19))
-                │   │           ├── flags: variable_call, ignore_visibility
-                │   │           ├── receiver: ∅
-                │   │           ├── call_operator_loc: ∅
-                │   │           ├── name: :bar
-                │   │           ├── message_loc: (27,16)-(27,19) = "bar"
-                │   │           ├── opening_loc: ∅
-                │   │           ├── arguments: ∅
-                │   │           ├── closing_loc: ∅
-                │   │           └── block: ∅
-                │   ├── closing_loc: (27,19)-(27,20) = ")"
-                │   └── block: ∅
-                ├── keyword_loc: (27,21)-(27,27) = "rescue"
-                └── rescue_expression:
-                    @ NilNode (location: (27,28)-(27,31))
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_12669.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_12669.txt
deleted file mode 100644
index 86b021351b8..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_12669.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,16))
-├── locals: [:a, :b]
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,16))
-    └── body: (length: 4)
-        ├── @ LocalVariableOperatorWriteNode (location: (1,0)-(1,18))
-        │   ├── name_loc: (1,0)-(1,1) = "a"
-        │   ├── operator_loc: (1,2)-(1,4) = "+="
-        │   ├── value:
-        │   │   @ LocalVariableOperatorWriteNode (location: (1,5)-(1,18))
-        │   │   ├── name_loc: (1,5)-(1,6) = "b"
-        │   │   ├── operator_loc: (1,7)-(1,9) = "+="
-        │   │   ├── value:
-        │   │   │   @ CallNode (location: (1,10)-(1,18))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :raise
-        │   │   │   ├── message_loc: (1,10)-(1,15) = "raise"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (1,16)-(1,18))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ SymbolNode (location: (1,16)-(1,18))
-        │   │   │   │           ├── flags: forced_us_ascii_encoding
-        │   │   │   │           ├── opening_loc: (1,16)-(1,17) = ":"
-        │   │   │   │           ├── value_loc: (1,17)-(1,18) = "x"
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── unescaped: "x"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── name: :b
-        │   │   ├── operator: :+
-        │   │   └── depth: 0
-        │   ├── name: :a
-        │   ├── operator: :+
-        │   └── depth: 0
-        ├── @ LocalVariableOperatorWriteNode (location: (3,0)-(3,17))
-        │   ├── name_loc: (3,0)-(3,1) = "a"
-        │   ├── operator_loc: (3,2)-(3,4) = "+="
-        │   ├── value:
-        │   │   @ LocalVariableWriteNode (location: (3,5)-(3,17))
-        │   │   ├── name: :b
-        │   │   ├── depth: 0
-        │   │   ├── name_loc: (3,5)-(3,6) = "b"
-        │   │   ├── value:
-        │   │   │   @ CallNode (location: (3,9)-(3,17))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :raise
-        │   │   │   ├── message_loc: (3,9)-(3,14) = "raise"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (3,15)-(3,17))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ SymbolNode (location: (3,15)-(3,17))
-        │   │   │   │           ├── flags: forced_us_ascii_encoding
-        │   │   │   │           ├── opening_loc: (3,15)-(3,16) = ":"
-        │   │   │   │           ├── value_loc: (3,16)-(3,17) = "x"
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── unescaped: "x"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   └── operator_loc: (3,7)-(3,8) = "="
-        │   ├── name: :a
-        │   ├── operator: :+
-        │   └── depth: 0
-        ├── @ LocalVariableWriteNode (location: (5,0)-(5,17))
-        │   ├── name: :a
-        │   ├── depth: 0
-        │   ├── name_loc: (5,0)-(5,1) = "a"
-        │   ├── value:
-        │   │   @ LocalVariableOperatorWriteNode (location: (5,4)-(5,17))
-        │   │   ├── name_loc: (5,4)-(5,5) = "b"
-        │   │   ├── operator_loc: (5,6)-(5,8) = "+="
-        │   │   ├── value:
-        │   │   │   @ CallNode (location: (5,9)-(5,17))
-        │   │   │   ├── flags: ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :raise
-        │   │   │   ├── message_loc: (5,9)-(5,14) = "raise"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments:
-        │   │   │   │   @ ArgumentsNode (location: (5,15)-(5,17))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   └── arguments: (length: 1)
-        │   │   │   │       └── @ SymbolNode (location: (5,15)-(5,17))
-        │   │   │   │           ├── flags: forced_us_ascii_encoding
-        │   │   │   │           ├── opening_loc: (5,15)-(5,16) = ":"
-        │   │   │   │           ├── value_loc: (5,16)-(5,17) = "x"
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── unescaped: "x"
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── name: :b
-        │   │   ├── operator: :+
-        │   │   └── depth: 0
-        │   └── operator_loc: (5,2)-(5,3) = "="
-        └── @ LocalVariableWriteNode (location: (7,0)-(7,16))
-            ├── name: :a
-            ├── depth: 0
-            ├── name_loc: (7,0)-(7,1) = "a"
-            ├── value:
-            │   @ LocalVariableWriteNode (location: (7,4)-(7,16))
-            │   ├── name: :b
-            │   ├── depth: 0
-            │   ├── name_loc: (7,4)-(7,5) = "b"
-            │   ├── value:
-            │   │   @ CallNode (location: (7,8)-(7,16))
-            │   │   ├── flags: ignore_visibility
-            │   │   ├── receiver: ∅
-            │   │   ├── call_operator_loc: ∅
-            │   │   ├── name: :raise
-            │   │   ├── message_loc: (7,8)-(7,13) = "raise"
-            │   │   ├── opening_loc: ∅
-            │   │   ├── arguments:
-            │   │   │   @ ArgumentsNode (location: (7,14)-(7,16))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── arguments: (length: 1)
-            │   │   │       └── @ SymbolNode (location: (7,14)-(7,16))
-            │   │   │           ├── flags: forced_us_ascii_encoding
-            │   │   │           ├── opening_loc: (7,14)-(7,15) = ":"
-            │   │   │           ├── value_loc: (7,15)-(7,16) = "x"
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── unescaped: "x"
-            │   │   ├── closing_loc: ∅
-            │   │   └── block: ∅
-            │   └── operator_loc: (7,6)-(7,7) = "="
-            └── operator_loc: (7,2)-(7,3) = "="
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_12686.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_12686.txt
deleted file mode 100644
index 427c96bbe0b..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_12686.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,16))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,16))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,16))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :f
-            ├── message_loc: (1,0)-(1,1) = "f"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,2)-(1,16))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,2)-(1,16))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,3)-(1,15))
-            │           │   └── body: (length: 1)
-            │           │       └── @ RescueModifierNode (location: (1,3)-(1,15))
-            │           │           ├── expression:
-            │           │           │   @ CallNode (location: (1,3)-(1,4))
-            │           │           │   ├── flags: variable_call, ignore_visibility
-            │           │           │   ├── receiver: ∅
-            │           │           │   ├── call_operator_loc: ∅
-            │           │           │   ├── name: :g
-            │           │           │   ├── message_loc: (1,3)-(1,4) = "g"
-            │           │           │   ├── opening_loc: ∅
-            │           │           │   ├── arguments: ∅
-            │           │           │   ├── closing_loc: ∅
-            │           │           │   └── block: ∅
-            │           │           ├── keyword_loc: (1,5)-(1,11) = "rescue"
-            │           │           └── rescue_expression:
-            │           │               @ NilNode (location: (1,12)-(1,15))
-            │           ├── opening_loc: (1,2)-(1,3) = "("
-            │           └── closing_loc: (1,15)-(1,16) = ")"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_13547.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_13547.txt
deleted file mode 100644
index eae9587ea0d..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_13547.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,4))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :meth
-            │   ├── message_loc: (1,0)-(1,4) = "meth"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,4)-(1,6) = "[]"
-            ├── opening_loc: (1,4)-(1,5) = "["
-            ├── arguments: ∅
-            ├── closing_loc: (1,5)-(1,6) = "]"
-            └── block:
-                @ BlockNode (location: (1,7)-(1,9))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,7)-(1,8) = "{"
-                └── closing_loc: (1,8)-(1,9) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_14690.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_14690.txt
deleted file mode 100644
index 36629797db7..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_14690.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,23))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,23))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :let
-            ├── message_loc: (1,0)-(1,3) = "let"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,4)-(1,6))
-            │           ├── body: ∅
-            │           ├── opening_loc: (1,4)-(1,5) = "("
-            │           └── closing_loc: (1,5)-(1,6) = ")"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,7)-(1,23))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body:
-                │   @ StatementsNode (location: (1,9)-(1,21))
-                │   └── body: (length: 1)
-                │       └── @ CallNode (location: (1,9)-(1,21))
-                │           ├── flags: ignore_visibility
-                │           ├── receiver: ∅
-                │           ├── call_operator_loc: ∅
-                │           ├── name: :m
-                │           ├── message_loc: (1,9)-(1,10) = "m"
-                │           ├── opening_loc: (1,10)-(1,11) = "("
-                │           ├── arguments:
-                │           │   @ ArgumentsNode (location: (1,11)-(1,12))
-                │           │   ├── flags: ∅
-                │           │   └── arguments: (length: 1)
-                │           │       └── @ CallNode (location: (1,11)-(1,12))
-                │           │           ├── flags: variable_call, ignore_visibility
-                │           │           ├── receiver: ∅
-                │           │           ├── call_operator_loc: ∅
-                │           │           ├── name: :a
-                │           │           ├── message_loc: (1,11)-(1,12) = "a"
-                │           │           ├── opening_loc: ∅
-                │           │           ├── arguments: ∅
-                │           │           ├── closing_loc: ∅
-                │           │           └── block: ∅
-                │           ├── closing_loc: (1,12)-(1,13) = ")"
-                │           └── block:
-                │               @ BlockNode (location: (1,14)-(1,21))
-                │               ├── locals: []
-                │               ├── parameters: ∅
-                │               ├── body: ∅
-                │               ├── opening_loc: (1,14)-(1,16) = "do"
-                │               └── closing_loc: (1,18)-(1,21) = "end"
-                ├── opening_loc: (1,7)-(1,8) = "{"
-                └── closing_loc: (1,22)-(1,23) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_15789.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_15789.txt
deleted file mode 100644
index db8bc1401f6..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_15789.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,19))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,20))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :m
-        │   ├── message_loc: (1,0)-(1,1) = "m"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,2)-(1,20))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ LambdaNode (location: (1,2)-(1,20))
-        │   │           ├── locals: [:a]
-        │   │           ├── operator_loc: (1,2)-(1,4) = "->"
-        │   │           ├── opening_loc: (1,17)-(1,18) = "{"
-        │   │           ├── closing_loc: (1,19)-(1,20) = "}"
-        │   │           ├── parameters:
-        │   │           │   @ BlockParametersNode (location: (1,4)-(1,16))
-        │   │           │   ├── parameters:
-        │   │           │   │   @ ParametersNode (location: (1,5)-(1,15))
-        │   │           │   │   ├── requireds: (length: 0)
-        │   │           │   │   ├── optionals: (length: 1)
-        │   │           │   │   │   └── @ OptionalParameterNode (location: (1,5)-(1,15))
-        │   │           │   │   │       ├── flags: ∅
-        │   │           │   │   │       ├── name: :a
-        │   │           │   │   │       ├── name_loc: (1,5)-(1,6) = "a"
-        │   │           │   │   │       ├── operator_loc: (1,7)-(1,8) = "="
-        │   │           │   │   │       └── value:
-        │   │           │   │   │           @ LambdaNode (location: (1,9)-(1,15))
-        │   │           │   │   │           ├── locals: [:_1]
-        │   │           │   │   │           ├── operator_loc: (1,9)-(1,11) = "->"
-        │   │           │   │   │           ├── opening_loc: (1,11)-(1,12) = "{"
-        │   │           │   │   │           ├── closing_loc: (1,14)-(1,15) = "}"
-        │   │           │   │   │           ├── parameters:
-        │   │           │   │   │           │   @ NumberedParametersNode (location: (1,9)-(1,15))
-        │   │           │   │   │           │   └── maximum: 1
-        │   │           │   │   │           └── body:
-        │   │           │   │   │               @ StatementsNode (location: (1,12)-(1,14))
-        │   │           │   │   │               └── body: (length: 1)
-        │   │           │   │   │                   └── @ LocalVariableReadNode (location: (1,12)-(1,14))
-        │   │           │   │   │                       ├── name: :_1
-        │   │           │   │   │                       └── depth: 0
-        │   │           │   │   ├── rest: ∅
-        │   │           │   │   ├── posts: (length: 0)
-        │   │           │   │   ├── keywords: (length: 0)
-        │   │           │   │   ├── keyword_rest: ∅
-        │   │           │   │   └── block: ∅
-        │   │           │   ├── locals: (length: 0)
-        │   │           │   ├── opening_loc: (1,4)-(1,5) = "("
-        │   │           │   └── closing_loc: (1,15)-(1,16) = ")"
-        │   │           └── body:
-        │   │               @ StatementsNode (location: (1,18)-(1,19))
-        │   │               └── body: (length: 1)
-        │   │                   └── @ LocalVariableReadNode (location: (1,18)-(1,19))
-        │   │                       ├── name: :a
-        │   │                       └── depth: 0
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,19))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :m
-            ├── message_loc: (3,0)-(3,1) = "m"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,2)-(3,19))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ LambdaNode (location: (3,2)-(3,19))
-            │           ├── locals: [:a]
-            │           ├── operator_loc: (3,2)-(3,4) = "->"
-            │           ├── opening_loc: (3,16)-(3,17) = "{"
-            │           ├── closing_loc: (3,18)-(3,19) = "}"
-            │           ├── parameters:
-            │           │   @ BlockParametersNode (location: (3,4)-(3,15))
-            │           │   ├── parameters:
-            │           │   │   @ ParametersNode (location: (3,5)-(3,14))
-            │           │   │   ├── requireds: (length: 0)
-            │           │   │   ├── optionals: (length: 0)
-            │           │   │   ├── rest: ∅
-            │           │   │   ├── posts: (length: 0)
-            │           │   │   ├── keywords: (length: 1)
-            │           │   │   │   └── @ OptionalKeywordParameterNode (location: (3,5)-(3,14))
-            │           │   │   │       ├── flags: ∅
-            │           │   │   │       ├── name: :a
-            │           │   │   │       ├── name_loc: (3,5)-(3,7) = "a:"
-            │           │   │   │       └── value:
-            │           │   │   │           @ LambdaNode (location: (3,8)-(3,14))
-            │           │   │   │           ├── locals: [:_1]
-            │           │   │   │           ├── operator_loc: (3,8)-(3,10) = "->"
-            │           │   │   │           ├── opening_loc: (3,10)-(3,11) = "{"
-            │           │   │   │           ├── closing_loc: (3,13)-(3,14) = "}"
-            │           │   │   │           ├── parameters:
-            │           │   │   │           │   @ NumberedParametersNode (location: (3,8)-(3,14))
-            │           │   │   │           │   └── maximum: 1
-            │           │   │   │           └── body:
-            │           │   │   │               @ StatementsNode (location: (3,11)-(3,13))
-            │           │   │   │               └── body: (length: 1)
-            │           │   │   │                   └── @ LocalVariableReadNode (location: (3,11)-(3,13))
-            │           │   │   │                       ├── name: :_1
-            │           │   │   │                       └── depth: 0
-            │           │   │   ├── keyword_rest: ∅
-            │           │   │   └── block: ∅
-            │           │   ├── locals: (length: 0)
-            │           │   ├── opening_loc: (3,4)-(3,5) = "("
-            │           │   └── closing_loc: (3,14)-(3,15) = ")"
-            │           └── body:
-            │               @ StatementsNode (location: (3,17)-(3,18))
-            │               └── body: (length: 1)
-            │                   └── @ LocalVariableReadNode (location: (3,17)-(3,18))
-            │                       ├── name: :a
-            │                       └── depth: 0
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/ruby_bug_9669.txt b/test/mri/prism/snapshots/whitequark/ruby_bug_9669.txt
deleted file mode 100644
index a73000bed0f..00000000000
--- a/test/mri/prism/snapshots/whitequark/ruby_bug_9669.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-@ ProgramNode (location: (1,0)-(8,1))
-├── locals: [:o]
-└── statements:
-    @ StatementsNode (location: (1,0)-(8,1))
-    └── body: (length: 2)
-        ├── @ DefNode (location: (1,0)-(3,3))
-        │   ├── name: :a
-        │   ├── name_loc: (1,4)-(1,5) = "a"
-        │   ├── receiver: ∅
-        │   ├── parameters:
-        │   │   @ ParametersNode (location: (1,6)-(1,8))
-        │   │   ├── requireds: (length: 0)
-        │   │   ├── optionals: (length: 0)
-        │   │   ├── rest: ∅
-        │   │   ├── posts: (length: 0)
-        │   │   ├── keywords: (length: 1)
-        │   │   │   └── @ RequiredKeywordParameterNode (location: (1,6)-(1,8))
-        │   │   │       ├── flags: ∅
-        │   │   │       ├── name: :b
-        │   │   │       └── name_loc: (1,6)-(1,8) = "b:"
-        │   │   ├── keyword_rest: ∅
-        │   │   └── block: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,0)-(2,6))
-        │   │   └── body: (length: 1)
-        │   │       └── @ ReturnNode (location: (2,0)-(2,6))
-        │   │           ├── keyword_loc: (2,0)-(2,6) = "return"
-        │   │           └── arguments: ∅
-        │   ├── locals: [:b]
-        │   ├── def_keyword_loc: (1,0)-(1,3) = "def"
-        │   ├── operator_loc: ∅
-        │   ├── lparen_loc: ∅
-        │   ├── rparen_loc: ∅
-        │   ├── equal_loc: ∅
-        │   └── end_keyword_loc: (3,0)-(3,3) = "end"
-        └── @ LocalVariableWriteNode (location: (5,0)-(8,1))
-            ├── name: :o
-            ├── depth: 0
-            ├── name_loc: (5,0)-(5,1) = "o"
-            ├── value:
-            │   @ HashNode (location: (5,4)-(8,1))
-            │   ├── opening_loc: (5,4)-(5,5) = "{"
-            │   ├── elements: (length: 1)
-            │   │   └── @ AssocNode (location: (6,0)-(7,1))
-            │   │       ├── key:
-            │   │       │   @ SymbolNode (location: (6,0)-(6,2))
-            │   │       │   ├── flags: forced_us_ascii_encoding
-            │   │       │   ├── opening_loc: ∅
-            │   │       │   ├── value_loc: (6,0)-(6,1) = "a"
-            │   │       │   ├── closing_loc: (6,1)-(6,2) = ":"
-            │   │       │   └── unescaped: "a"
-            │   │       ├── value:
-            │   │       │   @ IntegerNode (location: (7,0)-(7,1))
-            │   │       │   ├── flags: decimal
-            │   │       │   └── value: 1
-            │   │       └── operator_loc: ∅
-            │   └── closing_loc: (8,0)-(8,1) = "}"
-            └── operator_loc: (5,2)-(5,3) = "="
diff --git a/test/mri/prism/snapshots/whitequark/sclass.txt b/test/mri/prism/snapshots/whitequark/sclass.txt
deleted file mode 100644
index 53188a7b8a7..00000000000
--- a/test/mri/prism/snapshots/whitequark/sclass.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,22))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,22))
-    └── body: (length: 1)
-        └── @ SingletonClassNode (location: (1,0)-(1,22))
-            ├── locals: []
-            ├── class_keyword_loc: (1,0)-(1,5) = "class"
-            ├── operator_loc: (1,6)-(1,8) = "<<"
-            ├── expression:
-            │   @ CallNode (location: (1,9)-(1,12))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,9)-(1,12) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,14)-(1,17))
-            │   └── body: (length: 1)
-            │       └── @ NilNode (location: (1,14)-(1,17))
-            └── end_keyword_loc: (1,19)-(1,22) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/self.txt b/test/mri/prism/snapshots/whitequark/self.txt
deleted file mode 100644
index c69f8fa8c59..00000000000
--- a/test/mri/prism/snapshots/whitequark/self.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ SelfNode (location: (1,0)-(1,4))
diff --git a/test/mri/prism/snapshots/whitequark/send_attr_asgn.txt b/test/mri/prism/snapshots/whitequark/send_attr_asgn.txt
deleted file mode 100644
index 392ae5587eb..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_attr_asgn.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,10))
-    └── body: (length: 4)
-        ├── @ CallNode (location: (1,0)-(1,9))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── name: :A=
-        │   ├── message_loc: (1,4)-(1,5) = "A"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,8)-(1,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,8)-(1,9))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,9))
-        │   ├── flags: attribute_write
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (3,3)-(3,4) = "."
-        │   ├── name: :a=
-        │   ├── message_loc: (3,4)-(3,5) = "a"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,8)-(3,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (3,8)-(3,9))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ ConstantPathWriteNode (location: (5,0)-(5,10))
-        │   ├── target:
-        │   │   @ ConstantPathNode (location: (5,0)-(5,6))
-        │   │   ├── parent:
-        │   │   │   @ CallNode (location: (5,0)-(5,3))
-        │   │   │   ├── flags: variable_call, ignore_visibility
-        │   │   │   ├── receiver: ∅
-        │   │   │   ├── call_operator_loc: ∅
-        │   │   │   ├── name: :foo
-        │   │   │   ├── message_loc: (5,0)-(5,3) = "foo"
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── arguments: ∅
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,5)-(5,6))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (5,3)-(5,5) = "::"
-        │   ├── operator_loc: (5,7)-(5,8) = "="
-        │   └── value:
-        │       @ IntegerNode (location: (5,9)-(5,10))
-        │       ├── flags: decimal
-        │       └── value: 1
-        └── @ CallNode (location: (7,0)-(7,10))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (7,0)-(7,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (7,0)-(7,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (7,3)-(7,5) = "::"
-            ├── name: :a=
-            ├── message_loc: (7,5)-(7,6) = "a"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (7,9)-(7,10))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (7,9)-(7,10))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_attr_asgn_conditional.txt b/test/mri/prism/snapshots/whitequark/send_attr_asgn_conditional.txt
deleted file mode 100644
index 3cec95ae7cd..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_attr_asgn_conditional.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,8))
-            ├── flags: safe_navigation, attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── name: :b=
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,7)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_binary_op.txt b/test/mri/prism/snapshots/whitequark/send_binary_op.txt
deleted file mode 100644
index 540a7681dca..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_binary_op.txt
+++ /dev/null
@@ -1,551 +0,0 @@
-@ ProgramNode (location: (1,0)-(41,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(41,7))
-    └── body: (length: 21)
-        ├── @ CallNode (location: (1,0)-(1,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!=
-        │   ├── message_loc: (1,4)-(1,6) = "!="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,7)-(1,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,7)-(1,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :!~
-        │   ├── message_loc: (3,4)-(3,6) = "!~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,7)-(3,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (3,7)-(3,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (5,0)-(5,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (5,0)-(5,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (5,0)-(5,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :%
-        │   ├── message_loc: (5,4)-(5,5) = "%"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,6)-(5,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,6)-(5,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (7,0)-(7,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (7,0)-(7,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (7,0)-(7,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :&
-        │   ├── message_loc: (7,4)-(7,5) = "&"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,6)-(7,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (7,6)-(7,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (9,0)-(9,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (9,0)-(9,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (9,0)-(9,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :*
-        │   ├── message_loc: (9,4)-(9,5) = "*"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,6)-(9,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (9,6)-(9,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (11,0)-(11,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (11,0)-(11,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (11,0)-(11,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :**
-        │   ├── message_loc: (11,4)-(11,6) = "**"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (11,7)-(11,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (11,7)-(11,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (13,0)-(13,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (13,0)-(13,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (13,0)-(13,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+
-        │   ├── message_loc: (13,4)-(13,5) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (13,6)-(13,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (13,6)-(13,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (15,0)-(15,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (15,0)-(15,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (15,0)-(15,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :-
-        │   ├── message_loc: (15,4)-(15,5) = "-"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (15,6)-(15,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (15,6)-(15,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (17,0)-(17,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (17,0)-(17,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (17,0)-(17,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :/
-        │   ├── message_loc: (17,4)-(17,5) = "/"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (17,6)-(17,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (17,6)-(17,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (19,0)-(19,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (19,0)-(19,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (19,0)-(19,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<
-        │   ├── message_loc: (19,4)-(19,5) = "<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (19,6)-(19,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (19,6)-(19,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (21,0)-(21,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (21,0)-(21,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (21,0)-(21,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<<
-        │   ├── message_loc: (21,4)-(21,6) = "<<"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (21,7)-(21,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (21,7)-(21,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (23,0)-(23,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (23,0)-(23,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (23,0)-(23,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<=
-        │   ├── message_loc: (23,4)-(23,6) = "<="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (23,7)-(23,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (23,7)-(23,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (25,0)-(25,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (25,0)-(25,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (25,0)-(25,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :<=>
-        │   ├── message_loc: (25,4)-(25,7) = "<=>"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (25,8)-(25,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (25,8)-(25,9))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (27,0)-(27,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (27,0)-(27,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (27,0)-(27,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :==
-        │   ├── message_loc: (27,4)-(27,6) = "=="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (27,7)-(27,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (27,7)-(27,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (29,0)-(29,9))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (29,0)-(29,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (29,0)-(29,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :===
-        │   ├── message_loc: (29,4)-(29,7) = "==="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (29,8)-(29,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (29,8)-(29,9))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (31,0)-(31,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (31,0)-(31,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (31,0)-(31,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :=~
-        │   ├── message_loc: (31,4)-(31,6) = "=~"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (31,7)-(31,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (31,7)-(31,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (33,0)-(33,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (33,0)-(33,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (33,0)-(33,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>
-        │   ├── message_loc: (33,4)-(33,5) = ">"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (33,6)-(33,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (33,6)-(33,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (35,0)-(35,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (35,0)-(35,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (35,0)-(35,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>=
-        │   ├── message_loc: (35,4)-(35,6) = ">="
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (35,7)-(35,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (35,7)-(35,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (37,0)-(37,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (37,0)-(37,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (37,0)-(37,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :>>
-        │   ├── message_loc: (37,4)-(37,6) = ">>"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (37,7)-(37,8))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (37,7)-(37,8))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (39,0)-(39,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (39,0)-(39,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (39,0)-(39,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :^
-        │   ├── message_loc: (39,4)-(39,5) = "^"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (39,6)-(39,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (39,6)-(39,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (41,0)-(41,7))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (41,0)-(41,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (41,0)-(41,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :|
-            ├── message_loc: (41,4)-(41,5) = "|"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (41,6)-(41,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (41,6)-(41,7))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_block_chain_cmd.txt b/test/mri/prism/snapshots/whitequark/send_block_chain_cmd.txt
deleted file mode 100644
index 4013888882b..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_block_chain_cmd.txt
+++ /dev/null
@@ -1,325 +0,0 @@
-@ ProgramNode (location: (1,0)-(13,23))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(13,23))
-    └── body: (length: 7)
-        ├── @ CallNode (location: (1,0)-(1,21))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,13))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :meth
-        │   │   ├── message_loc: (1,0)-(1,4) = "meth"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (1,5)-(1,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (1,5)-(1,6))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (1,7)-(1,13))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (1,7)-(1,9) = "do"
-        │   │       └── closing_loc: (1,10)-(1,13) = "end"
-        │   ├── call_operator_loc: (1,13)-(1,14) = "."
-        │   ├── name: :fun
-        │   ├── message_loc: (1,14)-(1,17) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,18)-(1,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (1,18)-(1,21))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (1,18)-(1,21) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,28))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,13))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :meth
-        │   │   ├── message_loc: (3,0)-(3,4) = "meth"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (3,5)-(3,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (3,5)-(3,6))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (3,7)-(3,13))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (3,7)-(3,9) = "do"
-        │   │       └── closing_loc: (3,10)-(3,13) = "end"
-        │   ├── call_operator_loc: (3,13)-(3,14) = "."
-        │   ├── name: :fun
-        │   ├── message_loc: (3,14)-(3,17) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,18)-(3,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,18)-(3,21))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (3,18)-(3,21) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (3,22)-(3,28))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (3,22)-(3,24) = "do"
-        │       └── closing_loc: (3,25)-(3,28) = "end"
-        ├── @ CallNode (location: (5,0)-(5,20))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (5,0)-(5,13))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :meth
-        │   │   ├── message_loc: (5,0)-(5,4) = "meth"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (5,5)-(5,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (5,5)-(5,6))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (5,7)-(5,13))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (5,7)-(5,9) = "do"
-        │   │       └── closing_loc: (5,10)-(5,13) = "end"
-        │   ├── call_operator_loc: (5,13)-(5,14) = "."
-        │   ├── name: :fun
-        │   ├── message_loc: (5,14)-(5,17) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (5,18)-(5,20))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (5,18)-(5,19) = "{"
-        │       └── closing_loc: (5,19)-(5,20) = "}"
-        ├── @ CallNode (location: (7,0)-(7,22))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (7,0)-(7,13))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :meth
-        │   │   ├── message_loc: (7,0)-(7,4) = "meth"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (7,5)-(7,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (7,5)-(7,6))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (7,7)-(7,13))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (7,7)-(7,9) = "do"
-        │   │       └── closing_loc: (7,10)-(7,13) = "end"
-        │   ├── call_operator_loc: (7,13)-(7,14) = "."
-        │   ├── name: :fun
-        │   ├── message_loc: (7,14)-(7,17) = "fun"
-        │   ├── opening_loc: (7,17)-(7,18) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (7,18)-(7,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (7,18)-(7,21))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (7,18)-(7,21) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (7,21)-(7,22) = ")"
-        │   └── block: ∅
-        ├── @ CallNode (location: (9,0)-(9,25))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (9,0)-(9,13))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :meth
-        │   │   ├── message_loc: (9,0)-(9,4) = "meth"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (9,5)-(9,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (9,5)-(9,6))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (9,7)-(9,13))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (9,7)-(9,9) = "do"
-        │   │       └── closing_loc: (9,10)-(9,13) = "end"
-        │   ├── call_operator_loc: (9,13)-(9,14) = "."
-        │   ├── name: :fun
-        │   ├── message_loc: (9,14)-(9,17) = "fun"
-        │   ├── opening_loc: (9,17)-(9,18) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (9,18)-(9,21))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (9,18)-(9,21))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (9,18)-(9,21) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: (9,21)-(9,22) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (9,23)-(9,25))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (9,23)-(9,24) = "{"
-        │       └── closing_loc: (9,24)-(9,25) = "}"
-        ├── @ CallNode (location: (11,0)-(11,22))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (11,0)-(11,13))
-        │   │   ├── flags: ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :meth
-        │   │   ├── message_loc: (11,0)-(11,4) = "meth"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (11,5)-(11,6))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (11,5)-(11,6))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 1
-        │   │   ├── closing_loc: ∅
-        │   │   └── block:
-        │   │       @ BlockNode (location: (11,7)-(11,13))
-        │   │       ├── locals: []
-        │   │       ├── parameters: ∅
-        │   │       ├── body: ∅
-        │   │       ├── opening_loc: (11,7)-(11,9) = "do"
-        │   │       └── closing_loc: (11,10)-(11,13) = "end"
-        │   ├── call_operator_loc: (11,13)-(11,15) = "::"
-        │   ├── name: :fun
-        │   ├── message_loc: (11,15)-(11,18) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (11,19)-(11,22))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (11,19)-(11,22))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (11,19)-(11,22) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (13,0)-(13,23))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (13,0)-(13,13))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :meth
-            │   ├── message_loc: (13,0)-(13,4) = "meth"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (13,5)-(13,6))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ IntegerNode (location: (13,5)-(13,6))
-            │   │           ├── flags: decimal
-            │   │           └── value: 1
-            │   ├── closing_loc: ∅
-            │   └── block:
-            │       @ BlockNode (location: (13,7)-(13,13))
-            │       ├── locals: []
-            │       ├── parameters: ∅
-            │       ├── body: ∅
-            │       ├── opening_loc: (13,7)-(13,9) = "do"
-            │       └── closing_loc: (13,10)-(13,13) = "end"
-            ├── call_operator_loc: (13,13)-(13,15) = "::"
-            ├── name: :fun
-            ├── message_loc: (13,15)-(13,18) = "fun"
-            ├── opening_loc: (13,18)-(13,19) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (13,19)-(13,22))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (13,19)-(13,22))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (13,19)-(13,22) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: (13,22)-(13,23) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_block_conditional.txt b/test/mri/prism/snapshots/whitequark/send_block_conditional.txt
deleted file mode 100644
index 826d3c8464b..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_block_conditional.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,11))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,3)-(1,5) = "&."
-            ├── name: :bar
-            ├── message_loc: (1,5)-(1,8) = "bar"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,9)-(1,11))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,9)-(1,10) = "{"
-                └── closing_loc: (1,10)-(1,11) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/send_call.txt b/test/mri/prism/snapshots/whitequark/send_call.txt
deleted file mode 100644
index 48063e01212..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_call.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,8))
-    └── body: (length: 2)
-        ├── @ CallNode (location: (1,0)-(1,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── name: :call
-        │   ├── message_loc: ∅
-        │   ├── opening_loc: (1,4)-(1,5) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,5)-(1,6))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,5)-(1,6))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   ├── closing_loc: (1,6)-(1,7) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (3,0)-(3,8))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (3,0)-(3,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,0)-(3,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (3,3)-(3,5) = "::"
-            ├── name: :call
-            ├── message_loc: ∅
-            ├── opening_loc: (3,5)-(3,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,6)-(3,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (3,6)-(3,7))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (3,7)-(3,8) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_conditional.txt b/test/mri/prism/snapshots/whitequark/send_conditional.txt
deleted file mode 100644
index 7b402d9ef2f..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_conditional.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,4))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── name: :b
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_index.txt b/test/mri/prism/snapshots/whitequark/send_index.txt
deleted file mode 100644
index 6c9e08f2eac..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_index.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,3)-(1,9) = "[1, 2]"
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (1,4)-(1,5))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: (1,8)-(1,9) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_index_asgn.txt b/test/mri/prism/snapshots/whitequark/send_index_asgn.txt
deleted file mode 100644
index 9d2e6efcb67..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_index_asgn.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]=
-            ├── message_loc: (1,3)-(1,9) = "[1, 2]"
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 3)
-            │       ├── @ IntegerNode (location: (1,4)-(1,5))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       ├── @ IntegerNode (location: (1,7)-(1,8))
-            │       │   ├── flags: decimal
-            │       │   └── value: 2
-            │       └── @ IntegerNode (location: (1,12)-(1,13))
-            │           ├── flags: decimal
-            │           └── value: 3
-            ├── closing_loc: (1,8)-(1,9) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_index_asgn_legacy.txt b/test/mri/prism/snapshots/whitequark/send_index_asgn_legacy.txt
deleted file mode 100644
index 9d2e6efcb67..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_index_asgn_legacy.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,13))
-            ├── flags: attribute_write
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]=
-            ├── message_loc: (1,3)-(1,9) = "[1, 2]"
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 3)
-            │       ├── @ IntegerNode (location: (1,4)-(1,5))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       ├── @ IntegerNode (location: (1,7)-(1,8))
-            │       │   ├── flags: decimal
-            │       │   └── value: 2
-            │       └── @ IntegerNode (location: (1,12)-(1,13))
-            │           ├── flags: decimal
-            │           └── value: 3
-            ├── closing_loc: (1,8)-(1,9) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_index_cmd.txt b/test/mri/prism/snapshots/whitequark/send_index_cmd.txt
deleted file mode 100644
index 0a41fd051dc..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_index_cmd.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,10))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,3)-(1,10) = "[m bar]"
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,4)-(1,9))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :m
-            │           ├── message_loc: (1,4)-(1,5) = "m"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,6)-(1,9))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 1)
-            │           │       └── @ CallNode (location: (1,6)-(1,9))
-            │           │           ├── flags: variable_call, ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :bar
-            │           │           ├── message_loc: (1,6)-(1,9) = "bar"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: (1,9)-(1,10) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_index_legacy.txt b/test/mri/prism/snapshots/whitequark/send_index_legacy.txt
deleted file mode 100644
index 6c9e08f2eac..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_index_legacy.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :[]
-            ├── message_loc: (1,3)-(1,9) = "[1, 2]"
-            ├── opening_loc: (1,3)-(1,4) = "["
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,8))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ IntegerNode (location: (1,4)-(1,5))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │           ├── flags: decimal
-            │           └── value: 2
-            ├── closing_loc: (1,8)-(1,9) = "]"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_lambda.txt b/test/mri/prism/snapshots/whitequark/send_lambda.txt
deleted file mode 100644
index bf217005393..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_lambda.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,5))
-    └── body: (length: 3)
-        ├── @ LambdaNode (location: (1,0)-(1,8))
-        │   ├── locals: []
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (1,5)-(1,6) = "{"
-        │   ├── closing_loc: (1,7)-(1,8) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (1,3)-(1,4))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (1,3)-(1,4))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest:
-        │   │   │   │   @ RestParameterNode (location: (1,3)-(1,4))
-        │   │   │   │   ├── flags: ∅
-        │   │   │   │   ├── name: ∅
-        │   │   │   │   ├── name_loc: ∅
-        │   │   │   │   └── operator_loc: (1,3)-(1,4) = "*"
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── body: ∅
-        ├── @ LambdaNode (location: (3,0)-(3,9))
-        │   ├── locals: []
-        │   ├── operator_loc: (3,0)-(3,2) = "->"
-        │   ├── opening_loc: (3,3)-(3,5) = "do"
-        │   ├── closing_loc: (3,6)-(3,9) = "end"
-        │   ├── parameters: ∅
-        │   └── body: ∅
-        └── @ LambdaNode (location: (5,0)-(5,5))
-            ├── locals: []
-            ├── operator_loc: (5,0)-(5,2) = "->"
-            ├── opening_loc: (5,2)-(5,3) = "{"
-            ├── closing_loc: (5,4)-(5,5) = "}"
-            ├── parameters: ∅
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_lambda_args.txt b/test/mri/prism/snapshots/whitequark/send_lambda_args.txt
deleted file mode 100644
index f61f622bdd9..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_lambda_args.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,9))
-    └── body: (length: 2)
-        ├── @ LambdaNode (location: (1,0)-(1,10))
-        │   ├── locals: [:a]
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (1,7)-(1,8) = "{"
-        │   ├── closing_loc: (1,9)-(1,10) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (1,3)-(1,6))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (1,4)-(1,5))
-        │   │   │   ├── requireds: (length: 1)
-        │   │   │   │   └── @ RequiredParameterNode (location: (1,4)-(1,5))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       └── name: :a
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 0)
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: (1,3)-(1,4) = "("
-        │   │   └── closing_loc: (1,5)-(1,6) = ")"
-        │   └── body: ∅
-        └── @ LambdaNode (location: (3,0)-(3,9))
-            ├── locals: [:a]
-            ├── operator_loc: (3,0)-(3,2) = "->"
-            ├── opening_loc: (3,6)-(3,7) = "{"
-            ├── closing_loc: (3,8)-(3,9) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (3,2)-(3,5))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (3,3)-(3,4))
-            │   │   ├── requireds: (length: 1)
-            │   │   │   └── @ RequiredParameterNode (location: (3,3)-(3,4))
-            │   │   │       ├── flags: ∅
-            │   │   │       └── name: :a
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: (3,2)-(3,3) = "("
-            │   └── closing_loc: (3,4)-(3,5) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_lambda_args_noparen.txt b/test/mri/prism/snapshots/whitequark/send_lambda_args_noparen.txt
deleted file mode 100644
index 747656af6bc..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_lambda_args_noparen.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,9))
-    └── body: (length: 2)
-        ├── @ LambdaNode (location: (1,0)-(1,11))
-        │   ├── locals: [:a]
-        │   ├── operator_loc: (1,0)-(1,2) = "->"
-        │   ├── opening_loc: (1,8)-(1,9) = "{"
-        │   ├── closing_loc: (1,10)-(1,11) = "}"
-        │   ├── parameters:
-        │   │   @ BlockParametersNode (location: (1,3)-(1,7))
-        │   │   ├── parameters:
-        │   │   │   @ ParametersNode (location: (1,3)-(1,7))
-        │   │   │   ├── requireds: (length: 0)
-        │   │   │   ├── optionals: (length: 0)
-        │   │   │   ├── rest: ∅
-        │   │   │   ├── posts: (length: 0)
-        │   │   │   ├── keywords: (length: 1)
-        │   │   │   │   └── @ OptionalKeywordParameterNode (location: (1,3)-(1,7))
-        │   │   │   │       ├── flags: ∅
-        │   │   │   │       ├── name: :a
-        │   │   │   │       ├── name_loc: (1,3)-(1,5) = "a:"
-        │   │   │   │       └── value:
-        │   │   │   │           @ IntegerNode (location: (1,6)-(1,7))
-        │   │   │   │           ├── flags: decimal
-        │   │   │   │           └── value: 1
-        │   │   │   ├── keyword_rest: ∅
-        │   │   │   └── block: ∅
-        │   │   ├── locals: (length: 0)
-        │   │   ├── opening_loc: ∅
-        │   │   └── closing_loc: ∅
-        │   └── body: ∅
-        └── @ LambdaNode (location: (3,0)-(3,9))
-            ├── locals: [:a]
-            ├── operator_loc: (3,0)-(3,2) = "->"
-            ├── opening_loc: (3,6)-(3,7) = "{"
-            ├── closing_loc: (3,8)-(3,9) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (3,3)-(3,5))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (3,3)-(3,5))
-            │   │   ├── requireds: (length: 0)
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 1)
-            │   │   │   └── @ RequiredKeywordParameterNode (location: (3,3)-(3,5))
-            │   │   │       ├── flags: ∅
-            │   │   │       ├── name: :a
-            │   │   │       └── name_loc: (3,3)-(3,5) = "a:"
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 0)
-            │   ├── opening_loc: ∅
-            │   └── closing_loc: ∅
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_lambda_args_shadow.txt b/test/mri/prism/snapshots/whitequark/send_lambda_args_shadow.txt
deleted file mode 100644
index 34a63ec5031..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_lambda_args_shadow.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,19))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,19))
-            ├── locals: [:a, :foo, :bar]
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,16)-(1,17) = "{"
-            ├── closing_loc: (1,18)-(1,19) = "}"
-            ├── parameters:
-            │   @ BlockParametersNode (location: (1,2)-(1,15))
-            │   ├── parameters:
-            │   │   @ ParametersNode (location: (1,3)-(1,4))
-            │   │   ├── requireds: (length: 1)
-            │   │   │   └── @ RequiredParameterNode (location: (1,3)-(1,4))
-            │   │   │       ├── flags: ∅
-            │   │   │       └── name: :a
-            │   │   ├── optionals: (length: 0)
-            │   │   ├── rest: ∅
-            │   │   ├── posts: (length: 0)
-            │   │   ├── keywords: (length: 0)
-            │   │   ├── keyword_rest: ∅
-            │   │   └── block: ∅
-            │   ├── locals: (length: 2)
-            │   │   ├── @ BlockLocalVariableNode (location: (1,6)-(1,9))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── name: :foo
-            │   │   └── @ BlockLocalVariableNode (location: (1,11)-(1,14))
-            │   │       ├── flags: ∅
-            │   │       └── name: :bar
-            │   ├── opening_loc: (1,2)-(1,3) = "("
-            │   └── closing_loc: (1,14)-(1,15) = ")"
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_lambda_legacy.txt b/test/mri/prism/snapshots/whitequark/send_lambda_legacy.txt
deleted file mode 100644
index 3a64e941b6c..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_lambda_legacy.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ LambdaNode (location: (1,0)-(1,5))
-            ├── locals: []
-            ├── operator_loc: (1,0)-(1,2) = "->"
-            ├── opening_loc: (1,2)-(1,3) = "{"
-            ├── closing_loc: (1,4)-(1,5) = "}"
-            ├── parameters: ∅
-            └── body: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_op_asgn_conditional.txt b/test/mri/prism/snapshots/whitequark/send_op_asgn_conditional.txt
deleted file mode 100644
index 05966fc5a30..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_op_asgn_conditional.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,10))
-    └── body: (length: 1)
-        └── @ CallAndWriteNode (location: (1,0)-(1,10))
-            ├── flags: safe_navigation
-            ├── receiver:
-            │   @ CallNode (location: (1,0)-(1,1))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :a
-            │   ├── message_loc: (1,0)-(1,1) = "a"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (1,1)-(1,3) = "&."
-            ├── message_loc: (1,3)-(1,4) = "b"
-            ├── read_name: :b
-            ├── write_name: :b=
-            ├── operator_loc: (1,5)-(1,8) = "&&="
-            └── value:
-                @ IntegerNode (location: (1,9)-(1,10))
-                ├── flags: decimal
-                └── value: 1
diff --git a/test/mri/prism/snapshots/whitequark/send_plain.txt b/test/mri/prism/snapshots/whitequark/send_plain.txt
deleted file mode 100644
index be57bee5a08..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_plain.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,8))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,7))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── name: :fun
-        │   ├── message_loc: (1,4)-(1,7) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (3,3)-(3,5) = "::"
-        │   ├── name: :Fun
-        │   ├── message_loc: (3,5)-(3,8) = "Fun"
-        │   ├── opening_loc: (3,8)-(3,9) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (3,9)-(3,10) = ")"
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,8))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (5,0)-(5,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (5,0)-(5,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (5,3)-(5,5) = "::"
-            ├── name: :fun
-            ├── message_loc: (5,5)-(5,8) = "fun"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_plain_cmd.txt b/test/mri/prism/snapshots/whitequark/send_plain_cmd.txt
deleted file mode 100644
index 59236e114d4..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_plain_cmd.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,12))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,11))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── name: :fun
-        │   ├── message_loc: (1,4)-(1,7) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,8)-(1,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (1,8)-(1,11))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (1,8)-(1,11) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,12))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (3,3)-(3,5) = "::"
-        │   ├── name: :Fun
-        │   ├── message_loc: (3,5)-(3,8) = "Fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,9)-(3,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,9)-(3,12))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (3,9)-(3,12) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,12))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (5,0)-(5,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (5,0)-(5,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: (5,3)-(5,5) = "::"
-            ├── name: :fun
-            ├── message_loc: (5,5)-(5,8) = "fun"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (5,9)-(5,12))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (5,9)-(5,12))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (5,9)-(5,12) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_self.txt b/test/mri/prism/snapshots/whitequark/send_self.txt
deleted file mode 100644
index 41fd822110c..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_self.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,6))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,3))
-        │   ├── flags: variable_call, ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (1,0)-(1,3) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,4))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun!
-        │   ├── message_loc: (3,0)-(3,4) = "fun!"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,6))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (5,0)-(5,3) = "fun"
-            ├── opening_loc: (5,3)-(5,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (5,4)-(5,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (5,4)-(5,5))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (5,5)-(5,6) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/send_self_block.txt b/test/mri/prism/snapshots/whitequark/send_self_block.txt
deleted file mode 100644
index c92935603b7..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_self_block.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,10))
-    └── body: (length: 4)
-        ├── @ CallNode (location: (1,0)-(1,10))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (1,0)-(1,3) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,4)-(1,10))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,4)-(1,6) = "do"
-        │       └── closing_loc: (1,7)-(1,10) = "end"
-        ├── @ CallNode (location: (3,0)-(3,7))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (3,0)-(3,3) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (3,4)-(3,7))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (3,4)-(3,5) = "{"
-        │       └── closing_loc: (3,6)-(3,7) = "}"
-        ├── @ CallNode (location: (5,0)-(5,9))
-        │   ├── flags: ignore_visibility
-        │   ├── receiver: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :fun
-        │   ├── message_loc: (5,0)-(5,3) = "fun"
-        │   ├── opening_loc: (5,3)-(5,4) = "("
-        │   ├── arguments: ∅
-        │   ├── closing_loc: (5,4)-(5,5) = ")"
-        │   └── block:
-        │       @ BlockNode (location: (5,6)-(5,9))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (5,6)-(5,7) = "{"
-        │       └── closing_loc: (5,8)-(5,9) = "}"
-        └── @ CallNode (location: (7,0)-(7,10))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (7,0)-(7,3) = "fun"
-            ├── opening_loc: (7,3)-(7,4) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (7,4)-(7,5))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ IntegerNode (location: (7,4)-(7,5))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── closing_loc: (7,5)-(7,6) = ")"
-            └── block:
-                @ BlockNode (location: (7,7)-(7,10))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (7,7)-(7,8) = "{"
-                └── closing_loc: (7,9)-(7,10) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/send_unary_op.txt b/test/mri/prism/snapshots/whitequark/send_unary_op.txt
deleted file mode 100644
index 8ca1de79681..00000000000
--- a/test/mri/prism/snapshots/whitequark/send_unary_op.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,4))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,1)-(1,4))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,1)-(1,4) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :+@
-        │   ├── message_loc: (1,0)-(1,1) = "+"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,4))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,1)-(3,4))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,1)-(3,4) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :-@
-        │   ├── message_loc: (3,0)-(3,1) = "-"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,4))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (5,1)-(5,4))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (5,1)-(5,4) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :~
-            ├── message_loc: (5,0)-(5,1) = "~"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/slash_newline_in_heredocs.txt b/test/mri/prism/snapshots/whitequark/slash_newline_in_heredocs.txt
deleted file mode 100644
index 8d6fce2ba96..00000000000
--- a/test/mri/prism/snapshots/whitequark/slash_newline_in_heredocs.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(8,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(8,4))
-    └── body: (length: 2)
-        ├── @ StringNode (location: (1,0)-(1,4))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,4) = "<<-E"
-        │   ├── content_loc: (2,0)-(5,0) = "    1 \\\n    2\n    3\n"
-        │   ├── closing_loc: (5,0)-(6,0) = "E\n"
-        │   └── unescaped: "    1     2\n    3\n"
-        └── @ InterpolatedStringNode (location: (8,0)-(8,4))
-            ├── opening_loc: (8,0)-(8,4) = "<<~E"
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (9,0)-(10,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (9,0)-(10,0) = "    1 \\\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "1 "
-            │   ├── @ StringNode (location: (10,0)-(11,0))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (10,0)-(11,0) = "    2\n"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "2\n"
-            │   └── @ StringNode (location: (11,0)-(12,0))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (11,0)-(12,0) = "    3\n"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "3\n"
-            └── closing_loc: (12,0)-(13,0) = "E\n"
diff --git a/test/mri/prism/snapshots/whitequark/space_args_arg.txt b/test/mri/prism/snapshots/whitequark/space_args_arg.txt
deleted file mode 100644
index 55750d2b615..00000000000
--- a/test/mri/prism/snapshots/whitequark/space_args_arg.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,7))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (1,0)-(1,3) = "fun"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,4)-(1,7))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,5)-(1,6))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── opening_loc: (1,4)-(1,5) = "("
-            │           └── closing_loc: (1,6)-(1,7) = ")"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/space_args_arg_block.txt b/test/mri/prism/snapshots/whitequark/space_args_arg_block.txt
deleted file mode 100644
index a6224bcca10..00000000000
--- a/test/mri/prism/snapshots/whitequark/space_args_arg_block.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,10))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,14))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (1,0)-(1,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,0)-(1,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (1,3)-(1,4) = "."
-        │   ├── name: :fun
-        │   ├── message_loc: (1,4)-(1,7) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,8)-(1,11))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (1,8)-(1,11))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (1,9)-(1,10))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (1,9)-(1,10))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── opening_loc: (1,8)-(1,9) = "("
-        │   │           └── closing_loc: (1,10)-(1,11) = ")"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (1,12)-(1,14))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,12)-(1,13) = "{"
-        │       └── closing_loc: (1,13)-(1,14) = "}"
-        ├── @ CallNode (location: (3,0)-(3,15))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,0)-(3,3))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (3,0)-(3,3) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: (3,3)-(3,5) = "::"
-        │   ├── name: :fun
-        │   ├── message_loc: (3,5)-(3,8) = "fun"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,9)-(3,12))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ ParenthesesNode (location: (3,9)-(3,12))
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (3,10)-(3,11))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ IntegerNode (location: (3,10)-(3,11))
-        │   │           │           ├── flags: decimal
-        │   │           │           └── value: 1
-        │   │           ├── opening_loc: (3,9)-(3,10) = "("
-        │   │           └── closing_loc: (3,11)-(3,12) = ")"
-        │   ├── closing_loc: ∅
-        │   └── block:
-        │       @ BlockNode (location: (3,13)-(3,15))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (3,13)-(3,14) = "{"
-        │       └── closing_loc: (3,14)-(3,15) = "}"
-        └── @ CallNode (location: (5,0)-(5,10))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (5,0)-(5,3) = "fun"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (5,4)-(5,7))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (5,4)-(5,7))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (5,5)-(5,6))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (5,5)-(5,6))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── opening_loc: (5,4)-(5,5) = "("
-            │           └── closing_loc: (5,6)-(5,7) = ")"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (5,8)-(5,10))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (5,8)-(5,9) = "{"
-                └── closing_loc: (5,9)-(5,10) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/space_args_arg_call.txt b/test/mri/prism/snapshots/whitequark/space_args_arg_call.txt
deleted file mode 100644
index 767b099a8bb..00000000000
--- a/test/mri/prism/snapshots/whitequark/space_args_arg_call.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,12))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (1,0)-(1,3) = "fun"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,12))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (1,4)-(1,12))
-            │           ├── flags: ∅
-            │           ├── receiver:
-            │           │   @ ParenthesesNode (location: (1,4)-(1,7))
-            │           │   ├── body:
-            │           │   │   @ StatementsNode (location: (1,5)-(1,6))
-            │           │   │   └── body: (length: 1)
-            │           │   │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           │   │           ├── flags: decimal
-            │           │   │           └── value: 1
-            │           │   ├── opening_loc: (1,4)-(1,5) = "("
-            │           │   └── closing_loc: (1,6)-(1,7) = ")"
-            │           ├── call_operator_loc: (1,7)-(1,8) = "."
-            │           ├── name: :to_i
-            │           ├── message_loc: (1,8)-(1,12) = "to_i"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/space_args_arg_newline.txt b/test/mri/prism/snapshots/whitequark/space_args_arg_newline.txt
deleted file mode 100644
index 7727a5ddd9a..00000000000
--- a/test/mri/prism/snapshots/whitequark/space_args_arg_newline.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-@ ProgramNode (location: (1,0)-(2,1))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(2,1))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(2,1))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (1,0)-(1,3) = "fun"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(2,1))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,4)-(2,1))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,5)-(1,6))
-            │           │   └── body: (length: 1)
-            │           │       └── @ IntegerNode (location: (1,5)-(1,6))
-            │           │           ├── flags: decimal
-            │           │           └── value: 1
-            │           ├── opening_loc: (1,4)-(1,5) = "("
-            │           └── closing_loc: (2,0)-(2,1) = ")"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/space_args_block.txt b/test/mri/prism/snapshots/whitequark/space_args_block.txt
deleted file mode 100644
index 62b549a674c..00000000000
--- a/test/mri/prism/snapshots/whitequark/space_args_block.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,9))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,9))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,9))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (1,0)-(1,3) = "fun"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,6))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,4)-(1,6))
-            │           ├── body: ∅
-            │           ├── opening_loc: (1,4)-(1,5) = "("
-            │           └── closing_loc: (1,5)-(1,6) = ")"
-            ├── closing_loc: ∅
-            └── block:
-                @ BlockNode (location: (1,7)-(1,9))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (1,7)-(1,8) = "{"
-                └── closing_loc: (1,8)-(1,9) = "}"
diff --git a/test/mri/prism/snapshots/whitequark/space_args_cmd.txt b/test/mri/prism/snapshots/whitequark/space_args_cmd.txt
deleted file mode 100644
index 8a75bef6a88..00000000000
--- a/test/mri/prism/snapshots/whitequark/space_args_cmd.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ CallNode (location: (1,0)-(1,11))
-            ├── flags: ignore_visibility
-            ├── receiver: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :fun
-            ├── message_loc: (1,0)-(1,3) = "fun"
-            ├── opening_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (1,4)-(1,11))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ ParenthesesNode (location: (1,4)-(1,11))
-            │           ├── body:
-            │           │   @ StatementsNode (location: (1,5)-(1,10))
-            │           │   └── body: (length: 1)
-            │           │       └── @ CallNode (location: (1,5)-(1,10))
-            │           │           ├── flags: ignore_visibility
-            │           │           ├── receiver: ∅
-            │           │           ├── call_operator_loc: ∅
-            │           │           ├── name: :f
-            │           │           ├── message_loc: (1,5)-(1,6) = "f"
-            │           │           ├── opening_loc: ∅
-            │           │           ├── arguments:
-            │           │           │   @ ArgumentsNode (location: (1,7)-(1,10))
-            │           │           │   ├── flags: ∅
-            │           │           │   └── arguments: (length: 1)
-            │           │           │       └── @ CallNode (location: (1,7)-(1,10))
-            │           │           │           ├── flags: variable_call, ignore_visibility
-            │           │           │           ├── receiver: ∅
-            │           │           │           ├── call_operator_loc: ∅
-            │           │           │           ├── name: :bar
-            │           │           │           ├── message_loc: (1,7)-(1,10) = "bar"
-            │           │           │           ├── opening_loc: ∅
-            │           │           │           ├── arguments: ∅
-            │           │           │           ├── closing_loc: ∅
-            │           │           │           └── block: ∅
-            │           │           ├── closing_loc: ∅
-            │           │           └── block: ∅
-            │           ├── opening_loc: (1,4)-(1,5) = "("
-            │           └── closing_loc: (1,10)-(1,11) = ")"
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/string___FILE__.txt b/test/mri/prism/snapshots/whitequark/string___FILE__.txt
deleted file mode 100644
index a12499a6310..00000000000
--- a/test/mri/prism/snapshots/whitequark/string___FILE__.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ SourceFileNode (location: (1,0)-(1,8))
-            ├── flags: ∅
-            └── filepath: "whitequark/string___FILE__.txt"
diff --git a/test/mri/prism/snapshots/whitequark/string_concat.txt b/test/mri/prism/snapshots/whitequark/string_concat.txt
deleted file mode 100644
index 38ea0c745dd..00000000000
--- a/test/mri/prism/snapshots/whitequark/string_concat.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,14))
-            ├── opening_loc: ∅
-            ├── parts: (length: 2)
-            │   ├── @ InterpolatedStringNode (location: (1,0)-(1,8))
-            │   │   ├── opening_loc: (1,0)-(1,1) = "\""
-            │   │   ├── parts: (length: 2)
-            │   │   │   ├── @ StringNode (location: (1,1)-(1,4))
-            │   │   │   │   ├── flags: ∅
-            │   │   │   │   ├── opening_loc: ∅
-            │   │   │   │   ├── content_loc: (1,1)-(1,4) = "foo"
-            │   │   │   │   ├── closing_loc: ∅
-            │   │   │   │   └── unescaped: "foo"
-            │   │   │   └── @ EmbeddedVariableNode (location: (1,4)-(1,7))
-            │   │   │       ├── operator_loc: (1,4)-(1,5) = "#"
-            │   │   │       └── variable:
-            │   │   │           @ InstanceVariableReadNode (location: (1,5)-(1,7))
-            │   │   │           └── name: :@a
-            │   │   └── closing_loc: (1,7)-(1,8) = "\""
-            │   └── @ StringNode (location: (1,9)-(1,14))
-            │       ├── flags: ∅
-            │       ├── opening_loc: (1,9)-(1,10) = "\""
-            │       ├── content_loc: (1,10)-(1,13) = "bar"
-            │       ├── closing_loc: (1,13)-(1,14) = "\""
-            │       └── unescaped: "bar"
-            └── closing_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/string_dvar.txt b/test/mri/prism/snapshots/whitequark/string_dvar.txt
deleted file mode 100644
index 123b36e01d9..00000000000
--- a/test/mri/prism/snapshots/whitequark/string_dvar.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,14))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 5)
-            │   ├── @ EmbeddedVariableNode (location: (1,1)-(1,4))
-            │   │   ├── operator_loc: (1,1)-(1,2) = "#"
-            │   │   └── variable:
-            │   │       @ InstanceVariableReadNode (location: (1,2)-(1,4))
-            │   │       └── name: :@a
-            │   ├── @ StringNode (location: (1,4)-(1,5))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,4)-(1,5) = " "
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: " "
-            │   ├── @ EmbeddedVariableNode (location: (1,5)-(1,9))
-            │   │   ├── operator_loc: (1,5)-(1,6) = "#"
-            │   │   └── variable:
-            │   │       @ ClassVariableReadNode (location: (1,6)-(1,9))
-            │   │       └── name: :@@a
-            │   ├── @ StringNode (location: (1,9)-(1,10))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,9)-(1,10) = " "
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: " "
-            │   └── @ EmbeddedVariableNode (location: (1,10)-(1,13))
-            │       ├── operator_loc: (1,10)-(1,11) = "#"
-            │       └── variable:
-            │           @ GlobalVariableReadNode (location: (1,11)-(1,13))
-            │           └── name: :$a
-            └── closing_loc: (1,13)-(1,14) = "\""
diff --git a/test/mri/prism/snapshots/whitequark/string_interp.txt b/test/mri/prism/snapshots/whitequark/string_interp.txt
deleted file mode 100644
index a83323a0868..00000000000
--- a/test/mri/prism/snapshots/whitequark/string_interp.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ InterpolatedStringNode (location: (1,0)-(1,14))
-            ├── opening_loc: (1,0)-(1,1) = "\""
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (1,1)-(1,4))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,1)-(1,4) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   ├── @ EmbeddedStatementsNode (location: (1,4)-(1,10))
-            │   │   ├── opening_loc: (1,4)-(1,6) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,6)-(1,9))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (1,6)-(1,9))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :bar
-            │   │   │           ├── message_loc: (1,6)-(1,9) = "bar"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (1,9)-(1,10) = "}"
-            │   └── @ StringNode (location: (1,10)-(1,13))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,10)-(1,13) = "baz"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "baz"
-            └── closing_loc: (1,13)-(1,14) = "\""
diff --git a/test/mri/prism/snapshots/whitequark/string_plain.txt b/test/mri/prism/snapshots/whitequark/string_plain.txt
deleted file mode 100644
index 7534ac1844b..00000000000
--- a/test/mri/prism/snapshots/whitequark/string_plain.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,8))
-    └── body: (length: 2)
-        ├── @ StringNode (location: (1,0)-(1,10))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,3) = "%q("
-        │   ├── content_loc: (1,3)-(1,9) = "foobar"
-        │   ├── closing_loc: (1,9)-(1,10) = ")"
-        │   └── unescaped: "foobar"
-        └── @ StringNode (location: (3,0)-(3,8))
-            ├── flags: ∅
-            ├── opening_loc: (3,0)-(3,1) = "'"
-            ├── content_loc: (3,1)-(3,7) = "foobar"
-            ├── closing_loc: (3,7)-(3,8) = "'"
-            └── unescaped: "foobar"
diff --git a/test/mri/prism/snapshots/whitequark/super.txt b/test/mri/prism/snapshots/whitequark/super.txt
deleted file mode 100644
index 132b4912e4c..00000000000
--- a/test/mri/prism/snapshots/whitequark/super.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,10))
-    └── body: (length: 3)
-        ├── @ SuperNode (location: (1,0)-(1,9))
-        │   ├── keyword_loc: (1,0)-(1,5) = "super"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,6)-(1,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (1,6)-(1,9))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (1,6)-(1,9) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── rparen_loc: ∅
-        │   └── block: ∅
-        ├── @ SuperNode (location: (3,0)-(3,7))
-        │   ├── keyword_loc: (3,0)-(3,5) = "super"
-        │   ├── lparen_loc: (3,5)-(3,6) = "("
-        │   ├── arguments: ∅
-        │   ├── rparen_loc: (3,6)-(3,7) = ")"
-        │   └── block: ∅
-        └── @ SuperNode (location: (5,0)-(5,10))
-            ├── keyword_loc: (5,0)-(5,5) = "super"
-            ├── lparen_loc: (5,5)-(5,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (5,6)-(5,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (5,6)-(5,9))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (5,6)-(5,9) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rparen_loc: (5,9)-(5,10) = ")"
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/super_block.txt b/test/mri/prism/snapshots/whitequark/super_block.txt
deleted file mode 100644
index d9ce7b86be8..00000000000
--- a/test/mri/prism/snapshots/whitequark/super_block.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,21))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,21))
-    └── body: (length: 2)
-        ├── @ ForwardingSuperNode (location: (1,0)-(1,12))
-        │   └── block:
-        │       @ BlockNode (location: (1,6)-(1,12))
-        │       ├── locals: []
-        │       ├── parameters: ∅
-        │       ├── body: ∅
-        │       ├── opening_loc: (1,6)-(1,8) = "do"
-        │       └── closing_loc: (1,9)-(1,12) = "end"
-        └── @ SuperNode (location: (3,0)-(3,21))
-            ├── keyword_loc: (3,0)-(3,5) = "super"
-            ├── lparen_loc: ∅
-            ├── arguments:
-            │   @ ArgumentsNode (location: (3,6)-(3,14))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 2)
-            │       ├── @ CallNode (location: (3,6)-(3,9))
-            │       │   ├── flags: variable_call, ignore_visibility
-            │       │   ├── receiver: ∅
-            │       │   ├── call_operator_loc: ∅
-            │       │   ├── name: :foo
-            │       │   ├── message_loc: (3,6)-(3,9) = "foo"
-            │       │   ├── opening_loc: ∅
-            │       │   ├── arguments: ∅
-            │       │   ├── closing_loc: ∅
-            │       │   └── block: ∅
-            │       └── @ CallNode (location: (3,11)-(3,14))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (3,11)-(3,14) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── rparen_loc: ∅
-            └── block:
-                @ BlockNode (location: (3,15)-(3,21))
-                ├── locals: []
-                ├── parameters: ∅
-                ├── body: ∅
-                ├── opening_loc: (3,15)-(3,17) = "do"
-                └── closing_loc: (3,18)-(3,21) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/symbol_interp.txt b/test/mri/prism/snapshots/whitequark/symbol_interp.txt
deleted file mode 100644
index c108adddc73..00000000000
--- a/test/mri/prism/snapshots/whitequark/symbol_interp.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,15))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,15))
-    └── body: (length: 1)
-        └── @ InterpolatedSymbolNode (location: (1,0)-(1,15))
-            ├── opening_loc: (1,0)-(1,2) = ":\""
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (1,2)-(1,5))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,2)-(1,5) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   ├── @ EmbeddedStatementsNode (location: (1,5)-(1,11))
-            │   │   ├── opening_loc: (1,5)-(1,7) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,7)-(1,10))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (1,7)-(1,10))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :bar
-            │   │   │           ├── message_loc: (1,7)-(1,10) = "bar"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (1,10)-(1,11) = "}"
-            │   └── @ StringNode (location: (1,11)-(1,14))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,11)-(1,14) = "baz"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "baz"
-            └── closing_loc: (1,14)-(1,15) = "\""
diff --git a/test/mri/prism/snapshots/whitequark/symbol_plain.txt b/test/mri/prism/snapshots/whitequark/symbol_plain.txt
deleted file mode 100644
index a2466600f57..00000000000
--- a/test/mri/prism/snapshots/whitequark/symbol_plain.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,4))
-    └── body: (length: 2)
-        ├── @ SymbolNode (location: (1,0)-(1,6))
-        │   ├── flags: forced_us_ascii_encoding
-        │   ├── opening_loc: (1,0)-(1,2) = ":'"
-        │   ├── value_loc: (1,2)-(1,5) = "foo"
-        │   ├── closing_loc: (1,5)-(1,6) = "'"
-        │   └── unescaped: "foo"
-        └── @ SymbolNode (location: (3,0)-(3,4))
-            ├── flags: forced_us_ascii_encoding
-            ├── opening_loc: (3,0)-(3,1) = ":"
-            ├── value_loc: (3,1)-(3,4) = "foo"
-            ├── closing_loc: ∅
-            └── unescaped: "foo"
diff --git a/test/mri/prism/snapshots/whitequark/ternary.txt b/test/mri/prism/snapshots/whitequark/ternary.txt
deleted file mode 100644
index fa637ffb4e0..00000000000
--- a/test/mri/prism/snapshots/whitequark/ternary.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,11))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,11))
-    └── body: (length: 1)
-        └── @ IfNode (location: (1,0)-(1,11))
-            ├── if_keyword_loc: ∅
-            ├── predicate:
-            │   @ CallNode (location: (1,0)-(1,3))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,0)-(1,3) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: (1,4)-(1,5) = "?"
-            ├── statements:
-            │   @ StatementsNode (location: (1,6)-(1,7))
-            │   └── body: (length: 1)
-            │       └── @ IntegerNode (location: (1,6)-(1,7))
-            │           ├── flags: decimal
-            │           └── value: 1
-            ├── consequent:
-            │   @ ElseNode (location: (1,8)-(1,11))
-            │   ├── else_keyword_loc: (1,8)-(1,9) = ":"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,10)-(1,11))
-            │   │   └── body: (length: 1)
-            │   │       └── @ IntegerNode (location: (1,10)-(1,11))
-            │   │           ├── flags: decimal
-            │   │           └── value: 2
-            │   └── end_keyword_loc: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/ternary_ambiguous_symbol.txt b/test/mri/prism/snapshots/whitequark/ternary_ambiguous_symbol.txt
deleted file mode 100644
index 833afcff42b..00000000000
--- a/test/mri/prism/snapshots/whitequark/ternary_ambiguous_symbol.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,13))
-├── locals: [:t]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,13))
-    └── body: (length: 2)
-        ├── @ LocalVariableWriteNode (location: (1,0)-(1,3))
-        │   ├── name: :t
-        │   ├── depth: 0
-        │   ├── name_loc: (1,0)-(1,1) = "t"
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,2)-(1,3))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator_loc: (1,1)-(1,2) = "="
-        └── @ IfNode (location: (1,4)-(1,13))
-            ├── if_keyword_loc: ∅
-            ├── predicate:
-            │   @ ParenthesesNode (location: (1,4)-(1,9))
-            │   ├── body:
-            │   │   @ StatementsNode (location: (1,5)-(1,8))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (1,5)-(1,8))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :foo
-            │   │           ├── message_loc: (1,5)-(1,8) = "foo"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   ├── opening_loc: (1,4)-(1,5) = "("
-            │   └── closing_loc: (1,8)-(1,9) = ")"
-            ├── then_keyword_loc: (1,9)-(1,10) = "?"
-            ├── statements:
-            │   @ StatementsNode (location: (1,10)-(1,11))
-            │   └── body: (length: 1)
-            │       └── @ LocalVariableReadNode (location: (1,10)-(1,11))
-            │           ├── name: :t
-            │           └── depth: 0
-            ├── consequent:
-            │   @ ElseNode (location: (1,11)-(1,13))
-            │   ├── else_keyword_loc: (1,11)-(1,12) = ":"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (1,12)-(1,13))
-            │   │   └── body: (length: 1)
-            │   │       └── @ ConstantReadNode (location: (1,12)-(1,13))
-            │   │           └── name: :T
-            │   └── end_keyword_loc: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/trailing_forward_arg.txt b/test/mri/prism/snapshots/whitequark/trailing_forward_arg.txt
deleted file mode 100644
index e12dad132bb..00000000000
--- a/test/mri/prism/snapshots/whitequark/trailing_forward_arg.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,40))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,40))
-    └── body: (length: 1)
-        └── @ DefNode (location: (1,0)-(1,40))
-            ├── name: :foo
-            ├── name_loc: (1,4)-(1,7) = "foo"
-            ├── receiver: ∅
-            ├── parameters:
-            │   @ ParametersNode (location: (1,8)-(1,17))
-            │   ├── requireds: (length: 2)
-            │   │   ├── @ RequiredParameterNode (location: (1,8)-(1,9))
-            │   │   │   ├── flags: ∅
-            │   │   │   └── name: :a
-            │   │   └── @ RequiredParameterNode (location: (1,11)-(1,12))
-            │   │       ├── flags: ∅
-            │   │       └── name: :b
-            │   ├── optionals: (length: 0)
-            │   ├── rest: ∅
-            │   ├── posts: (length: 0)
-            │   ├── keywords: (length: 0)
-            │   ├── keyword_rest:
-            │   │   @ ForwardingParameterNode (location: (1,14)-(1,17))
-            │   └── block: ∅
-            ├── body:
-            │   @ StatementsNode (location: (1,20)-(1,35))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,20)-(1,35))
-            │           ├── flags: ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,20)-(1,23) = "bar"
-            │           ├── opening_loc: (1,23)-(1,24) = "("
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,24)-(1,34))
-            │           │   ├── flags: ∅
-            │           │   └── arguments: (length: 3)
-            │           │       ├── @ LocalVariableReadNode (location: (1,24)-(1,25))
-            │           │       │   ├── name: :a
-            │           │       │   └── depth: 0
-            │           │       ├── @ IntegerNode (location: (1,27)-(1,29))
-            │           │       │   ├── flags: decimal
-            │           │       │   └── value: 42
-            │           │       └── @ ForwardingArgumentsNode (location: (1,31)-(1,34))
-            │           ├── closing_loc: (1,34)-(1,35) = ")"
-            │           └── block: ∅
-            ├── locals: [:a, :b]
-            ├── def_keyword_loc: (1,0)-(1,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: (1,7)-(1,8) = "("
-            ├── rparen_loc: (1,17)-(1,18) = ")"
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (1,37)-(1,40) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/true.txt b/test/mri/prism/snapshots/whitequark/true.txt
deleted file mode 100644
index 3e1ceef586d..00000000000
--- a/test/mri/prism/snapshots/whitequark/true.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,4))
-    └── body: (length: 1)
-        └── @ TrueNode (location: (1,0)-(1,4))
diff --git a/test/mri/prism/snapshots/whitequark/unary_num_pow_precedence.txt b/test/mri/prism/snapshots/whitequark/unary_num_pow_precedence.txt
deleted file mode 100644
index e14b0567e74..00000000000
--- a/test/mri/prism/snapshots/whitequark/unary_num_pow_precedence.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-@ ProgramNode (location: (1,0)-(5,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(5,10))
-    └── body: (length: 3)
-        ├── @ CallNode (location: (1,0)-(1,10))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ FloatNode (location: (1,0)-(1,4))
-        │   │   └── value: 2.0
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :**
-        │   ├── message_loc: (1,5)-(1,7) = "**"
-        │   ├── opening_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (1,8)-(1,10))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (1,8)-(1,10))
-        │   │           ├── flags: decimal
-        │   │           └── value: 10
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        ├── @ CallNode (location: (3,0)-(3,8))
-        │   ├── flags: ∅
-        │   ├── receiver:
-        │   │   @ CallNode (location: (3,1)-(3,8))
-        │   │   ├── flags: ∅
-        │   │   ├── receiver:
-        │   │   │   @ IntegerNode (location: (3,1)-(3,2))
-        │   │   │   ├── flags: decimal
-        │   │   │   └── value: 2
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :**
-        │   │   ├── message_loc: (3,3)-(3,5) = "**"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments:
-        │   │   │   @ ArgumentsNode (location: (3,6)-(3,8))
-        │   │   │   ├── flags: ∅
-        │   │   │   └── arguments: (length: 1)
-        │   │   │       └── @ IntegerNode (location: (3,6)-(3,8))
-        │   │   │           ├── flags: decimal
-        │   │   │           └── value: 10
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── call_operator_loc: ∅
-        │   ├── name: :-@
-        │   ├── message_loc: (3,0)-(3,1) = "-"
-        │   ├── opening_loc: ∅
-        │   ├── arguments: ∅
-        │   ├── closing_loc: ∅
-        │   └── block: ∅
-        └── @ CallNode (location: (5,0)-(5,10))
-            ├── flags: ∅
-            ├── receiver:
-            │   @ CallNode (location: (5,1)-(5,10))
-            │   ├── flags: ∅
-            │   ├── receiver:
-            │   │   @ FloatNode (location: (5,1)-(5,4))
-            │   │   └── value: 2.0
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :**
-            │   ├── message_loc: (5,5)-(5,7) = "**"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (5,8)-(5,10))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ IntegerNode (location: (5,8)-(5,10))
-            │   │           ├── flags: decimal
-            │   │           └── value: 10
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── call_operator_loc: ∅
-            ├── name: :-@
-            ├── message_loc: (5,0)-(5,1) = "-"
-            ├── opening_loc: ∅
-            ├── arguments: ∅
-            ├── closing_loc: ∅
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/undef.txt b/test/mri/prism/snapshots/whitequark/undef.txt
deleted file mode 100644
index 5e6b5c7b769..00000000000
--- a/test/mri/prism/snapshots/whitequark/undef.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,27))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,27))
-    └── body: (length: 1)
-        └── @ UndefNode (location: (1,0)-(1,27))
-            ├── names: (length: 3)
-            │   ├── @ SymbolNode (location: (1,6)-(1,9))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: ∅
-            │   │   ├── value_loc: (1,6)-(1,9) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   ├── @ SymbolNode (location: (1,11)-(1,15))
-            │   │   ├── flags: forced_us_ascii_encoding
-            │   │   ├── opening_loc: (1,11)-(1,12) = ":"
-            │   │   ├── value_loc: (1,12)-(1,15) = "bar"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "bar"
-            │   └── @ InterpolatedSymbolNode (location: (1,17)-(1,27))
-            │       ├── opening_loc: (1,17)-(1,19) = ":\""
-            │       ├── parts: (length: 2)
-            │       │   ├── @ StringNode (location: (1,19)-(1,22))
-            │       │   │   ├── flags: ∅
-            │       │   │   ├── opening_loc: ∅
-            │       │   │   ├── content_loc: (1,19)-(1,22) = "foo"
-            │       │   │   ├── closing_loc: ∅
-            │       │   │   └── unescaped: "foo"
-            │       │   └── @ EmbeddedStatementsNode (location: (1,22)-(1,26))
-            │       │       ├── opening_loc: (1,22)-(1,24) = "\#{"
-            │       │       ├── statements:
-            │       │       │   @ StatementsNode (location: (1,24)-(1,25))
-            │       │       │   └── body: (length: 1)
-            │       │       │       └── @ IntegerNode (location: (1,24)-(1,25))
-            │       │       │           ├── flags: decimal
-            │       │       │           └── value: 1
-            │       │       └── closing_loc: (1,25)-(1,26) = "}"
-            │       └── closing_loc: (1,26)-(1,27) = "\""
-            └── keyword_loc: (1,0)-(1,5) = "undef"
diff --git a/test/mri/prism/snapshots/whitequark/unless.txt b/test/mri/prism/snapshots/whitequark/unless.txt
deleted file mode 100644
index a3bbbe69c81..00000000000
--- a/test/mri/prism/snapshots/whitequark/unless.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,20))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,20))
-    └── body: (length: 2)
-        ├── @ UnlessNode (location: (1,0)-(1,24))
-        │   ├── keyword_loc: (1,0)-(1,6) = "unless"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,7)-(1,10))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,7)-(1,10) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (1,11)-(1,15) = "then"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,16)-(1,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,16)-(1,19))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (1,16)-(1,19) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent: ∅
-        │   └── end_keyword_loc: (1,21)-(1,24) = "end"
-        └── @ UnlessNode (location: (3,0)-(3,20))
-            ├── keyword_loc: (3,0)-(3,6) = "unless"
-            ├── predicate:
-            │   @ CallNode (location: (3,7)-(3,10))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,7)-(3,10) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (3,12)-(3,15))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (3,12)-(3,15))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (3,12)-(3,15) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: (3,17)-(3,20) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/unless_else.txt b/test/mri/prism/snapshots/whitequark/unless_else.txt
deleted file mode 100644
index f4f95379e50..00000000000
--- a/test/mri/prism/snapshots/whitequark/unless_else.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,30))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,30))
-    └── body: (length: 2)
-        ├── @ UnlessNode (location: (1,0)-(1,34))
-        │   ├── keyword_loc: (1,0)-(1,6) = "unless"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,7)-(1,10))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,7)-(1,10) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   ├── then_keyword_loc: (1,11)-(1,15) = "then"
-        │   ├── statements:
-        │   │   @ StatementsNode (location: (1,16)-(1,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,16)-(1,19))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :bar
-        │   │           ├── message_loc: (1,16)-(1,19) = "bar"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   ├── consequent:
-        │   │   @ ElseNode (location: (1,21)-(1,34))
-        │   │   ├── else_keyword_loc: (1,21)-(1,25) = "else"
-        │   │   ├── statements:
-        │   │   │   @ StatementsNode (location: (1,26)-(1,29))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ CallNode (location: (1,26)-(1,29))
-        │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │           ├── receiver: ∅
-        │   │   │           ├── call_operator_loc: ∅
-        │   │   │           ├── name: :baz
-        │   │   │           ├── message_loc: (1,26)-(1,29) = "baz"
-        │   │   │           ├── opening_loc: ∅
-        │   │   │           ├── arguments: ∅
-        │   │   │           ├── closing_loc: ∅
-        │   │   │           └── block: ∅
-        │   │   └── end_keyword_loc: (1,31)-(1,34) = "end"
-        │   └── end_keyword_loc: (1,31)-(1,34) = "end"
-        └── @ UnlessNode (location: (3,0)-(3,30))
-            ├── keyword_loc: (3,0)-(3,6) = "unless"
-            ├── predicate:
-            │   @ CallNode (location: (3,7)-(3,10))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,7)-(3,10) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (3,12)-(3,15))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (3,12)-(3,15))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (3,12)-(3,15) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent:
-            │   @ ElseNode (location: (3,17)-(3,30))
-            │   ├── else_keyword_loc: (3,17)-(3,21) = "else"
-            │   ├── statements:
-            │   │   @ StatementsNode (location: (3,22)-(3,25))
-            │   │   └── body: (length: 1)
-            │   │       └── @ CallNode (location: (3,22)-(3,25))
-            │   │           ├── flags: variable_call, ignore_visibility
-            │   │           ├── receiver: ∅
-            │   │           ├── call_operator_loc: ∅
-            │   │           ├── name: :baz
-            │   │           ├── message_loc: (3,22)-(3,25) = "baz"
-            │   │           ├── opening_loc: ∅
-            │   │           ├── arguments: ∅
-            │   │           ├── closing_loc: ∅
-            │   │           └── block: ∅
-            │   └── end_keyword_loc: (3,27)-(3,30) = "end"
-            └── end_keyword_loc: (3,27)-(3,30) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/unless_mod.txt b/test/mri/prism/snapshots/whitequark/unless_mod.txt
deleted file mode 100644
index d4dfda6b2ce..00000000000
--- a/test/mri/prism/snapshots/whitequark/unless_mod.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ UnlessNode (location: (1,0)-(1,14))
-            ├── keyword_loc: (1,4)-(1,10) = "unless"
-            ├── predicate:
-            │   @ CallNode (location: (1,11)-(1,14))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,11)-(1,14) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── then_keyword_loc: ∅
-            ├── statements:
-            │   @ StatementsNode (location: (1,0)-(1,3))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,0)-(1,3))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :bar
-            │           ├── message_loc: (1,0)-(1,3) = "bar"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            ├── consequent: ∅
-            └── end_keyword_loc: ∅
diff --git a/test/mri/prism/snapshots/whitequark/until.txt b/test/mri/prism/snapshots/whitequark/until.txt
deleted file mode 100644
index e5f60a2cf7b..00000000000
--- a/test/mri/prism/snapshots/whitequark/until.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,19))
-    └── body: (length: 2)
-        ├── @ UntilNode (location: (1,0)-(1,21))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (1,0)-(1,5) = "until"
-        │   ├── closing_loc: (1,18)-(1,21) = "end"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,6)-(1,9))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,6)-(1,9) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (1,13)-(1,17))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (1,13)-(1,17))
-        │               ├── flags: variable_call, ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :meth
-        │               ├── message_loc: (1,13)-(1,17) = "meth"
-        │               ├── opening_loc: ∅
-        │               ├── arguments: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        └── @ UntilNode (location: (3,0)-(3,19))
-            ├── flags: ∅
-            ├── keyword_loc: (3,0)-(3,5) = "until"
-            ├── closing_loc: (3,16)-(3,19) = "end"
-            ├── predicate:
-            │   @ CallNode (location: (3,6)-(3,9))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,6)-(3,9) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (3,11)-(3,15))
-                └── body: (length: 1)
-                    └── @ CallNode (location: (3,11)-(3,15))
-                        ├── flags: variable_call, ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :meth
-                        ├── message_loc: (3,11)-(3,15) = "meth"
-                        ├── opening_loc: ∅
-                        ├── arguments: ∅
-                        ├── closing_loc: ∅
-                        └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/until_mod.txt b/test/mri/prism/snapshots/whitequark/until_mod.txt
deleted file mode 100644
index 0b7e2360b55..00000000000
--- a/test/mri/prism/snapshots/whitequark/until_mod.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ UntilNode (location: (1,0)-(1,14))
-            ├── flags: ∅
-            ├── keyword_loc: (1,5)-(1,10) = "until"
-            ├── closing_loc: ∅
-            ├── predicate:
-            │   @ CallNode (location: (1,11)-(1,14))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,11)-(1,14) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (1,0)-(1,4))
-                └── body: (length: 1)
-                    └── @ CallNode (location: (1,0)-(1,4))
-                        ├── flags: variable_call, ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :meth
-                        ├── message_loc: (1,0)-(1,4) = "meth"
-                        ├── opening_loc: ∅
-                        ├── arguments: ∅
-                        ├── closing_loc: ∅
-                        └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/until_post.txt b/test/mri/prism/snapshots/whitequark/until_post.txt
deleted file mode 100644
index 5b282c363ba..00000000000
--- a/test/mri/prism/snapshots/whitequark/until_post.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ UntilNode (location: (1,0)-(1,24))
-            ├── flags: begin_modifier
-            ├── keyword_loc: (1,15)-(1,20) = "until"
-            ├── closing_loc: ∅
-            ├── predicate:
-            │   @ CallNode (location: (1,21)-(1,24))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,21)-(1,24) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (1,0)-(1,14))
-                └── body: (length: 1)
-                    └── @ BeginNode (location: (1,0)-(1,14))
-                        ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-                        ├── statements:
-                        │   @ StatementsNode (location: (1,6)-(1,10))
-                        │   └── body: (length: 1)
-                        │       └── @ CallNode (location: (1,6)-(1,10))
-                        │           ├── flags: variable_call, ignore_visibility
-                        │           ├── receiver: ∅
-                        │           ├── call_operator_loc: ∅
-                        │           ├── name: :meth
-                        │           ├── message_loc: (1,6)-(1,10) = "meth"
-                        │           ├── opening_loc: ∅
-                        │           ├── arguments: ∅
-                        │           ├── closing_loc: ∅
-                        │           └── block: ∅
-                        ├── rescue_clause: ∅
-                        ├── else_clause: ∅
-                        ├── ensure_clause: ∅
-                        └── end_keyword_loc: (1,11)-(1,14) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/var_and_asgn.txt b/test/mri/prism/snapshots/whitequark/var_and_asgn.txt
deleted file mode 100644
index a3c90f804cf..00000000000
--- a/test/mri/prism/snapshots/whitequark/var_and_asgn.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ LocalVariableAndWriteNode (location: (1,0)-(1,7))
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── operator_loc: (1,2)-(1,5) = "&&="
-            ├── value:
-            │   @ IntegerNode (location: (1,6)-(1,7))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── name: :a
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/var_op_asgn.txt b/test/mri/prism/snapshots/whitequark/var_op_asgn.txt
deleted file mode 100644
index f423a62dee9..00000000000
--- a/test/mri/prism/snapshots/whitequark/var_op_asgn.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,23))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,23))
-    └── body: (length: 4)
-        ├── @ ClassVariableOperatorWriteNode (location: (1,0)-(1,11))
-        │   ├── name: :@@var
-        │   ├── name_loc: (1,0)-(1,5) = "@@var"
-        │   ├── operator_loc: (1,6)-(1,8) = "|="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (1,9)-(1,11))
-        │   │   ├── flags: decimal
-        │   │   └── value: 10
-        │   └── operator: :|
-        ├── @ InstanceVariableOperatorWriteNode (location: (3,0)-(3,7))
-        │   ├── name: :@a
-        │   ├── name_loc: (3,0)-(3,2) = "@a"
-        │   ├── operator_loc: (3,3)-(3,5) = "|="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (3,6)-(3,7))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   └── operator: :|
-        ├── @ LocalVariableOperatorWriteNode (location: (5,0)-(5,6))
-        │   ├── name_loc: (5,0)-(5,1) = "a"
-        │   ├── operator_loc: (5,2)-(5,4) = "+="
-        │   ├── value:
-        │   │   @ IntegerNode (location: (5,5)-(5,6))
-        │   │   ├── flags: decimal
-        │   │   └── value: 1
-        │   ├── name: :a
-        │   ├── operator: :+
-        │   └── depth: 0
-        └── @ DefNode (location: (7,0)-(7,23))
-            ├── name: :a
-            ├── name_loc: (7,4)-(7,5) = "a"
-            ├── receiver: ∅
-            ├── parameters: ∅
-            ├── body:
-            │   @ StatementsNode (location: (7,7)-(7,18))
-            │   └── body: (length: 1)
-            │       └── @ ClassVariableOperatorWriteNode (location: (7,7)-(7,18))
-            │           ├── name: :@@var
-            │           ├── name_loc: (7,7)-(7,12) = "@@var"
-            │           ├── operator_loc: (7,13)-(7,15) = "|="
-            │           ├── value:
-            │           │   @ IntegerNode (location: (7,16)-(7,18))
-            │           │   ├── flags: decimal
-            │           │   └── value: 10
-            │           └── operator: :|
-            ├── locals: []
-            ├── def_keyword_loc: (7,0)-(7,3) = "def"
-            ├── operator_loc: ∅
-            ├── lparen_loc: ∅
-            ├── rparen_loc: ∅
-            ├── equal_loc: ∅
-            └── end_keyword_loc: (7,20)-(7,23) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/var_op_asgn_cmd.txt b/test/mri/prism/snapshots/whitequark/var_op_asgn_cmd.txt
deleted file mode 100644
index d56c099c7ee..00000000000
--- a/test/mri/prism/snapshots/whitequark/var_op_asgn_cmd.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,12))
-├── locals: [:foo]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,12))
-    └── body: (length: 1)
-        └── @ LocalVariableOperatorWriteNode (location: (1,0)-(1,12))
-            ├── name_loc: (1,0)-(1,3) = "foo"
-            ├── operator_loc: (1,4)-(1,6) = "+="
-            ├── value:
-            │   @ CallNode (location: (1,7)-(1,12))
-            │   ├── flags: ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :m
-            │   ├── message_loc: (1,7)-(1,8) = "m"
-            │   ├── opening_loc: ∅
-            │   ├── arguments:
-            │   │   @ ArgumentsNode (location: (1,9)-(1,12))
-            │   │   ├── flags: ∅
-            │   │   └── arguments: (length: 1)
-            │   │       └── @ LocalVariableReadNode (location: (1,9)-(1,12))
-            │   │           ├── name: :foo
-            │   │           └── depth: 0
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── name: :foo
-            ├── operator: :+
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/var_or_asgn.txt b/test/mri/prism/snapshots/whitequark/var_or_asgn.txt
deleted file mode 100644
index a0531d2c306..00000000000
--- a/test/mri/prism/snapshots/whitequark/var_or_asgn.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,7))
-├── locals: [:a]
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,7))
-    └── body: (length: 1)
-        └── @ LocalVariableOrWriteNode (location: (1,0)-(1,7))
-            ├── name_loc: (1,0)-(1,1) = "a"
-            ├── operator_loc: (1,2)-(1,5) = "||="
-            ├── value:
-            │   @ IntegerNode (location: (1,6)-(1,7))
-            │   ├── flags: decimal
-            │   └── value: 1
-            ├── name: :a
-            └── depth: 0
diff --git a/test/mri/prism/snapshots/whitequark/when_multi.txt b/test/mri/prism/snapshots/whitequark/when_multi.txt
deleted file mode 100644
index 1c399b642dc..00000000000
--- a/test/mri/prism/snapshots/whitequark/when_multi.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,37))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,37))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,37))
-            ├── predicate:
-            │   @ CallNode (location: (1,5)-(1,8))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,5)-(1,8) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,10)-(1,32))
-            │       ├── keyword_loc: (1,10)-(1,14) = "when"
-            │       ├── conditions: (length: 2)
-            │       │   ├── @ StringNode (location: (1,15)-(1,20))
-            │       │   │   ├── flags: frozen
-            │       │   │   ├── opening_loc: (1,15)-(1,16) = "'"
-            │       │   │   ├── content_loc: (1,16)-(1,19) = "bar"
-            │       │   │   ├── closing_loc: (1,19)-(1,20) = "'"
-            │       │   │   └── unescaped: "bar"
-            │       │   └── @ StringNode (location: (1,22)-(1,27))
-            │       │       ├── flags: frozen
-            │       │       ├── opening_loc: (1,22)-(1,23) = "'"
-            │       │       ├── content_loc: (1,23)-(1,26) = "baz"
-            │       │       ├── closing_loc: (1,26)-(1,27) = "'"
-            │       │       └── unescaped: "baz"
-            │       ├── then_keyword_loc: ∅
-            │       └── statements:
-            │           @ StatementsNode (location: (1,29)-(1,32))
-            │           └── body: (length: 1)
-            │               └── @ CallNode (location: (1,29)-(1,32))
-            │                   ├── flags: variable_call, ignore_visibility
-            │                   ├── receiver: ∅
-            │                   ├── call_operator_loc: ∅
-            │                   ├── name: :bar
-            │                   ├── message_loc: (1,29)-(1,32) = "bar"
-            │                   ├── opening_loc: ∅
-            │                   ├── arguments: ∅
-            │                   ├── closing_loc: ∅
-            │                   └── block: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,34)-(1,37) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/when_splat.txt b/test/mri/prism/snapshots/whitequark/when_splat.txt
deleted file mode 100644
index 351631714e0..00000000000
--- a/test/mri/prism/snapshots/whitequark/when_splat.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,43))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,43))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,43))
-            ├── predicate:
-            │   @ CallNode (location: (1,5)-(1,8))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,5)-(1,8) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── conditions: (length: 2)
-            │   ├── @ WhenNode (location: (1,10)-(1,27))
-            │   │   ├── keyword_loc: (1,10)-(1,14) = "when"
-            │   │   ├── conditions: (length: 2)
-            │   │   │   ├── @ IntegerNode (location: (1,15)-(1,16))
-            │   │   │   │   ├── flags: decimal
-            │   │   │   │   └── value: 1
-            │   │   │   └── @ SplatNode (location: (1,18)-(1,22))
-            │   │   │       ├── operator_loc: (1,18)-(1,19) = "*"
-            │   │   │       └── expression:
-            │   │   │           @ CallNode (location: (1,19)-(1,22))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :baz
-            │   │   │           ├── message_loc: (1,19)-(1,22) = "baz"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   ├── then_keyword_loc: ∅
-            │   │   └── statements:
-            │   │       @ StatementsNode (location: (1,24)-(1,27))
-            │   │       └── body: (length: 1)
-            │   │           └── @ CallNode (location: (1,24)-(1,27))
-            │   │               ├── flags: variable_call, ignore_visibility
-            │   │               ├── receiver: ∅
-            │   │               ├── call_operator_loc: ∅
-            │   │               ├── name: :bar
-            │   │               ├── message_loc: (1,24)-(1,27) = "bar"
-            │   │               ├── opening_loc: ∅
-            │   │               ├── arguments: ∅
-            │   │               ├── closing_loc: ∅
-            │   │               └── block: ∅
-            │   └── @ WhenNode (location: (1,29)-(1,38))
-            │       ├── keyword_loc: (1,29)-(1,33) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ SplatNode (location: (1,34)-(1,38))
-            │       │       ├── operator_loc: (1,34)-(1,35) = "*"
-            │       │       └── expression:
-            │       │           @ CallNode (location: (1,35)-(1,38))
-            │       │           ├── flags: variable_call, ignore_visibility
-            │       │           ├── receiver: ∅
-            │       │           ├── call_operator_loc: ∅
-            │       │           ├── name: :foo
-            │       │           ├── message_loc: (1,35)-(1,38) = "foo"
-            │       │           ├── opening_loc: ∅
-            │       │           ├── arguments: ∅
-            │       │           ├── closing_loc: ∅
-            │       │           └── block: ∅
-            │       ├── then_keyword_loc: ∅
-            │       └── statements: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,40)-(1,43) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/when_then.txt b/test/mri/prism/snapshots/whitequark/when_then.txt
deleted file mode 100644
index eb6f261ba43..00000000000
--- a/test/mri/prism/snapshots/whitequark/when_then.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,34))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,34))
-    └── body: (length: 1)
-        └── @ CaseNode (location: (1,0)-(1,34))
-            ├── predicate:
-            │   @ CallNode (location: (1,5)-(1,8))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,5)-(1,8) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            ├── conditions: (length: 1)
-            │   └── @ WhenNode (location: (1,10)-(1,29))
-            │       ├── keyword_loc: (1,10)-(1,14) = "when"
-            │       ├── conditions: (length: 1)
-            │       │   └── @ StringNode (location: (1,15)-(1,20))
-            │       │       ├── flags: frozen
-            │       │       ├── opening_loc: (1,15)-(1,16) = "'"
-            │       │       ├── content_loc: (1,16)-(1,19) = "bar"
-            │       │       ├── closing_loc: (1,19)-(1,20) = "'"
-            │       │       └── unescaped: "bar"
-            │       ├── then_keyword_loc: (1,21)-(1,25) = "then"
-            │       └── statements:
-            │           @ StatementsNode (location: (1,26)-(1,29))
-            │           └── body: (length: 1)
-            │               └── @ CallNode (location: (1,26)-(1,29))
-            │                   ├── flags: variable_call, ignore_visibility
-            │                   ├── receiver: ∅
-            │                   ├── call_operator_loc: ∅
-            │                   ├── name: :bar
-            │                   ├── message_loc: (1,26)-(1,29) = "bar"
-            │                   ├── opening_loc: ∅
-            │                   ├── arguments: ∅
-            │                   ├── closing_loc: ∅
-            │                   └── block: ∅
-            ├── consequent: ∅
-            ├── case_keyword_loc: (1,0)-(1,4) = "case"
-            └── end_keyword_loc: (1,31)-(1,34) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/while.txt b/test/mri/prism/snapshots/whitequark/while.txt
deleted file mode 100644
index 72f9971fe55..00000000000
--- a/test/mri/prism/snapshots/whitequark/while.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-@ ProgramNode (location: (1,0)-(3,19))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(3,19))
-    └── body: (length: 2)
-        ├── @ WhileNode (location: (1,0)-(1,21))
-        │   ├── flags: ∅
-        │   ├── keyword_loc: (1,0)-(1,5) = "while"
-        │   ├── closing_loc: (1,18)-(1,21) = "end"
-        │   ├── predicate:
-        │   │   @ CallNode (location: (1,6)-(1,9))
-        │   │   ├── flags: variable_call, ignore_visibility
-        │   │   ├── receiver: ∅
-        │   │   ├── call_operator_loc: ∅
-        │   │   ├── name: :foo
-        │   │   ├── message_loc: (1,6)-(1,9) = "foo"
-        │   │   ├── opening_loc: ∅
-        │   │   ├── arguments: ∅
-        │   │   ├── closing_loc: ∅
-        │   │   └── block: ∅
-        │   └── statements:
-        │       @ StatementsNode (location: (1,13)-(1,17))
-        │       └── body: (length: 1)
-        │           └── @ CallNode (location: (1,13)-(1,17))
-        │               ├── flags: variable_call, ignore_visibility
-        │               ├── receiver: ∅
-        │               ├── call_operator_loc: ∅
-        │               ├── name: :meth
-        │               ├── message_loc: (1,13)-(1,17) = "meth"
-        │               ├── opening_loc: ∅
-        │               ├── arguments: ∅
-        │               ├── closing_loc: ∅
-        │               └── block: ∅
-        └── @ WhileNode (location: (3,0)-(3,19))
-            ├── flags: ∅
-            ├── keyword_loc: (3,0)-(3,5) = "while"
-            ├── closing_loc: (3,16)-(3,19) = "end"
-            ├── predicate:
-            │   @ CallNode (location: (3,6)-(3,9))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (3,6)-(3,9) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (3,11)-(3,15))
-                └── body: (length: 1)
-                    └── @ CallNode (location: (3,11)-(3,15))
-                        ├── flags: variable_call, ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :meth
-                        ├── message_loc: (3,11)-(3,15) = "meth"
-                        ├── opening_loc: ∅
-                        ├── arguments: ∅
-                        ├── closing_loc: ∅
-                        └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/while_mod.txt b/test/mri/prism/snapshots/whitequark/while_mod.txt
deleted file mode 100644
index 50a8f84d813..00000000000
--- a/test/mri/prism/snapshots/whitequark/while_mod.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ WhileNode (location: (1,0)-(1,14))
-            ├── flags: ∅
-            ├── keyword_loc: (1,5)-(1,10) = "while"
-            ├── closing_loc: ∅
-            ├── predicate:
-            │   @ CallNode (location: (1,11)-(1,14))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,11)-(1,14) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (1,0)-(1,4))
-                └── body: (length: 1)
-                    └── @ CallNode (location: (1,0)-(1,4))
-                        ├── flags: variable_call, ignore_visibility
-                        ├── receiver: ∅
-                        ├── call_operator_loc: ∅
-                        ├── name: :meth
-                        ├── message_loc: (1,0)-(1,4) = "meth"
-                        ├── opening_loc: ∅
-                        ├── arguments: ∅
-                        ├── closing_loc: ∅
-                        └── block: ∅
diff --git a/test/mri/prism/snapshots/whitequark/while_post.txt b/test/mri/prism/snapshots/whitequark/while_post.txt
deleted file mode 100644
index 63c6c84a247..00000000000
--- a/test/mri/prism/snapshots/whitequark/while_post.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,24))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,24))
-    └── body: (length: 1)
-        └── @ WhileNode (location: (1,0)-(1,24))
-            ├── flags: begin_modifier
-            ├── keyword_loc: (1,15)-(1,20) = "while"
-            ├── closing_loc: ∅
-            ├── predicate:
-            │   @ CallNode (location: (1,21)-(1,24))
-            │   ├── flags: variable_call, ignore_visibility
-            │   ├── receiver: ∅
-            │   ├── call_operator_loc: ∅
-            │   ├── name: :foo
-            │   ├── message_loc: (1,21)-(1,24) = "foo"
-            │   ├── opening_loc: ∅
-            │   ├── arguments: ∅
-            │   ├── closing_loc: ∅
-            │   └── block: ∅
-            └── statements:
-                @ StatementsNode (location: (1,0)-(1,14))
-                └── body: (length: 1)
-                    └── @ BeginNode (location: (1,0)-(1,14))
-                        ├── begin_keyword_loc: (1,0)-(1,5) = "begin"
-                        ├── statements:
-                        │   @ StatementsNode (location: (1,6)-(1,10))
-                        │   └── body: (length: 1)
-                        │       └── @ CallNode (location: (1,6)-(1,10))
-                        │           ├── flags: variable_call, ignore_visibility
-                        │           ├── receiver: ∅
-                        │           ├── call_operator_loc: ∅
-                        │           ├── name: :meth
-                        │           ├── message_loc: (1,6)-(1,10) = "meth"
-                        │           ├── opening_loc: ∅
-                        │           ├── arguments: ∅
-                        │           ├── closing_loc: ∅
-                        │           └── block: ∅
-                        ├── rescue_clause: ∅
-                        ├── else_clause: ∅
-                        ├── ensure_clause: ∅
-                        └── end_keyword_loc: (1,11)-(1,14) = "end"
diff --git a/test/mri/prism/snapshots/whitequark/xstring_interp.txt b/test/mri/prism/snapshots/whitequark/xstring_interp.txt
deleted file mode 100644
index e9543098c2b..00000000000
--- a/test/mri/prism/snapshots/whitequark/xstring_interp.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,14))
-    └── body: (length: 1)
-        └── @ InterpolatedXStringNode (location: (1,0)-(1,14))
-            ├── opening_loc: (1,0)-(1,1) = "`"
-            ├── parts: (length: 3)
-            │   ├── @ StringNode (location: (1,1)-(1,4))
-            │   │   ├── flags: ∅
-            │   │   ├── opening_loc: ∅
-            │   │   ├── content_loc: (1,1)-(1,4) = "foo"
-            │   │   ├── closing_loc: ∅
-            │   │   └── unescaped: "foo"
-            │   ├── @ EmbeddedStatementsNode (location: (1,4)-(1,10))
-            │   │   ├── opening_loc: (1,4)-(1,6) = "\#{"
-            │   │   ├── statements:
-            │   │   │   @ StatementsNode (location: (1,6)-(1,9))
-            │   │   │   └── body: (length: 1)
-            │   │   │       └── @ CallNode (location: (1,6)-(1,9))
-            │   │   │           ├── flags: variable_call, ignore_visibility
-            │   │   │           ├── receiver: ∅
-            │   │   │           ├── call_operator_loc: ∅
-            │   │   │           ├── name: :bar
-            │   │   │           ├── message_loc: (1,6)-(1,9) = "bar"
-            │   │   │           ├── opening_loc: ∅
-            │   │   │           ├── arguments: ∅
-            │   │   │           ├── closing_loc: ∅
-            │   │   │           └── block: ∅
-            │   │   └── closing_loc: (1,9)-(1,10) = "}"
-            │   └── @ StringNode (location: (1,10)-(1,13))
-            │       ├── flags: ∅
-            │       ├── opening_loc: ∅
-            │       ├── content_loc: (1,10)-(1,13) = "baz"
-            │       ├── closing_loc: ∅
-            │       └── unescaped: "baz"
-            └── closing_loc: (1,13)-(1,14) = "`"
diff --git a/test/mri/prism/snapshots/whitequark/xstring_plain.txt b/test/mri/prism/snapshots/whitequark/xstring_plain.txt
deleted file mode 100644
index 97084286d98..00000000000
--- a/test/mri/prism/snapshots/whitequark/xstring_plain.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,8))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,8))
-    └── body: (length: 1)
-        └── @ XStringNode (location: (1,0)-(1,8))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,1) = "`"
-            ├── content_loc: (1,1)-(1,7) = "foobar"
-            ├── closing_loc: (1,7)-(1,8) = "`"
-            └── unescaped: "foobar"
diff --git a/test/mri/prism/snapshots/whitequark/yield.txt b/test/mri/prism/snapshots/whitequark/yield.txt
deleted file mode 100644
index 2b37dd479f9..00000000000
--- a/test/mri/prism/snapshots/whitequark/yield.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,10))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,10))
-    └── body: (length: 4)
-        ├── @ YieldNode (location: (1,0)-(1,5))
-        │   ├── keyword_loc: (1,0)-(1,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments: ∅
-        │   └── rparen_loc: ∅
-        ├── @ YieldNode (location: (3,0)-(3,9))
-        │   ├── keyword_loc: (3,0)-(3,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (3,6)-(3,9))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ CallNode (location: (3,6)-(3,9))
-        │   │           ├── flags: variable_call, ignore_visibility
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (3,6)-(3,9) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           └── block: ∅
-        │   └── rparen_loc: ∅
-        ├── @ YieldNode (location: (5,0)-(5,7))
-        │   ├── keyword_loc: (5,0)-(5,5) = "yield"
-        │   ├── lparen_loc: (5,5)-(5,6) = "("
-        │   ├── arguments: ∅
-        │   └── rparen_loc: (5,6)-(5,7) = ")"
-        └── @ YieldNode (location: (7,0)-(7,10))
-            ├── keyword_loc: (7,0)-(7,5) = "yield"
-            ├── lparen_loc: (7,5)-(7,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (7,6)-(7,9))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 1)
-            │       └── @ CallNode (location: (7,6)-(7,9))
-            │           ├── flags: variable_call, ignore_visibility
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :foo
-            │           ├── message_loc: (7,6)-(7,9) = "foo"
-            │           ├── opening_loc: ∅
-            │           ├── arguments: ∅
-            │           ├── closing_loc: ∅
-            │           └── block: ∅
-            └── rparen_loc: (7,9)-(7,10) = ")"
diff --git a/test/mri/prism/snapshots/whitequark/zsuper.txt b/test/mri/prism/snapshots/whitequark/zsuper.txt
deleted file mode 100644
index 9c28128d06f..00000000000
--- a/test/mri/prism/snapshots/whitequark/zsuper.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,5))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,5))
-    └── body: (length: 1)
-        └── @ ForwardingSuperNode (location: (1,0)-(1,5))
-            └── block: ∅
diff --git a/test/mri/prism/snapshots/xstring.txt b/test/mri/prism/snapshots/xstring.txt
deleted file mode 100644
index 04b4cbf6ea7..00000000000
--- a/test/mri/prism/snapshots/xstring.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-@ ProgramNode (location: (1,0)-(13,4))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(13,4))
-    └── body: (length: 6)
-        ├── @ XStringNode (location: (1,0)-(1,7))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (1,0)-(1,3) = "%x["
-        │   ├── content_loc: (1,3)-(1,6) = "foo"
-        │   ├── closing_loc: (1,6)-(1,7) = "]"
-        │   └── unescaped: "foo"
-        ├── @ InterpolatedXStringNode (location: (3,0)-(3,16))
-        │   ├── opening_loc: (3,0)-(3,1) = "`"
-        │   ├── parts: (length: 3)
-        │   │   ├── @ StringNode (location: (3,1)-(3,5))
-        │   │   │   ├── flags: ∅
-        │   │   │   ├── opening_loc: ∅
-        │   │   │   ├── content_loc: (3,1)-(3,5) = "foo "
-        │   │   │   ├── closing_loc: ∅
-        │   │   │   └── unescaped: "foo "
-        │   │   ├── @ EmbeddedStatementsNode (location: (3,5)-(3,11))
-        │   │   │   ├── opening_loc: (3,5)-(3,7) = "\#{"
-        │   │   │   ├── statements:
-        │   │   │   │   @ StatementsNode (location: (3,7)-(3,10))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ CallNode (location: (3,7)-(3,10))
-        │   │   │   │           ├── flags: variable_call, ignore_visibility
-        │   │   │   │           ├── receiver: ∅
-        │   │   │   │           ├── call_operator_loc: ∅
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           ├── message_loc: (3,7)-(3,10) = "bar"
-        │   │   │   │           ├── opening_loc: ∅
-        │   │   │   │           ├── arguments: ∅
-        │   │   │   │           ├── closing_loc: ∅
-        │   │   │   │           └── block: ∅
-        │   │   │   └── closing_loc: (3,10)-(3,11) = "}"
-        │   │   └── @ StringNode (location: (3,11)-(3,15))
-        │   │       ├── flags: ∅
-        │   │       ├── opening_loc: ∅
-        │   │       ├── content_loc: (3,11)-(3,15) = " baz"
-        │   │       ├── closing_loc: ∅
-        │   │       └── unescaped: " baz"
-        │   └── closing_loc: (3,15)-(3,16) = "`"
-        ├── @ XStringNode (location: (5,0)-(5,5))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (5,0)-(5,1) = "`"
-        │   ├── content_loc: (5,1)-(5,4) = "foo"
-        │   ├── closing_loc: (5,4)-(5,5) = "`"
-        │   └── unescaped: "foo"
-        ├── @ XStringNode (location: (7,0)-(9,1))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (7,0)-(7,3) = "%x{"
-        │   ├── content_loc: (7,3)-(9,0) = "\n  foo\n"
-        │   ├── closing_loc: (9,0)-(9,1) = "}"
-        │   └── unescaped: "\n  foo\n"
-        ├── @ XStringNode (location: (11,0)-(11,2))
-        │   ├── flags: ∅
-        │   ├── opening_loc: (11,0)-(11,1) = "`"
-        │   ├── content_loc: (11,1)-(11,1) = ""
-        │   ├── closing_loc: (11,1)-(11,2) = "`"
-        │   └── unescaped: ""
-        └── @ XStringNode (location: (13,0)-(13,4))
-            ├── flags: ∅
-            ├── opening_loc: (13,0)-(13,3) = "%x{"
-            ├── content_loc: (13,3)-(13,3) = ""
-            ├── closing_loc: (13,3)-(13,4) = "}"
-            └── unescaped: ""
diff --git a/test/mri/prism/snapshots/xstring_with_backslash.txt b/test/mri/prism/snapshots/xstring_with_backslash.txt
deleted file mode 100644
index 7e0fa1ab5f9..00000000000
--- a/test/mri/prism/snapshots/xstring_with_backslash.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ ProgramNode (location: (1,0)-(1,6))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(1,6))
-    └── body: (length: 1)
-        └── @ XStringNode (location: (1,0)-(1,6))
-            ├── flags: ∅
-            ├── opening_loc: (1,0)-(1,1) = "`"
-            ├── content_loc: (1,1)-(1,5) = "f\\oo"
-            ├── closing_loc: (1,5)-(1,6) = "`"
-            └── unescaped: "foo"
diff --git a/test/mri/prism/snapshots/yield.txt b/test/mri/prism/snapshots/yield.txt
deleted file mode 100644
index 896dbac13f0..00000000000
--- a/test/mri/prism/snapshots/yield.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-@ ProgramNode (location: (1,0)-(7,14))
-├── locals: []
-└── statements:
-    @ StatementsNode (location: (1,0)-(7,14))
-    └── body: (length: 4)
-        ├── @ YieldNode (location: (1,0)-(1,5))
-        │   ├── keyword_loc: (1,0)-(1,5) = "yield"
-        │   ├── lparen_loc: ∅
-        │   ├── arguments: ∅
-        │   └── rparen_loc: ∅
-        ├── @ YieldNode (location: (3,0)-(3,7))
-        │   ├── keyword_loc: (3,0)-(3,5) = "yield"
-        │   ├── lparen_loc: (3,5)-(3,6) = "("
-        │   ├── arguments: ∅
-        │   └── rparen_loc: (3,6)-(3,7) = ")"
-        ├── @ YieldNode (location: (5,0)-(5,8))
-        │   ├── keyword_loc: (5,0)-(5,5) = "yield"
-        │   ├── lparen_loc: (5,5)-(5,6) = "("
-        │   ├── arguments:
-        │   │   @ ArgumentsNode (location: (5,6)-(5,7))
-        │   │   ├── flags: ∅
-        │   │   └── arguments: (length: 1)
-        │   │       └── @ IntegerNode (location: (5,6)-(5,7))
-        │   │           ├── flags: decimal
-        │   │           └── value: 1
-        │   └── rparen_loc: (5,7)-(5,8) = ")"
-        └── @ YieldNode (location: (7,0)-(7,14))
-            ├── keyword_loc: (7,0)-(7,5) = "yield"
-            ├── lparen_loc: (7,5)-(7,6) = "("
-            ├── arguments:
-            │   @ ArgumentsNode (location: (7,6)-(7,13))
-            │   ├── flags: ∅
-            │   └── arguments: (length: 3)
-            │       ├── @ IntegerNode (location: (7,6)-(7,7))
-            │       │   ├── flags: decimal
-            │       │   └── value: 1
-            │       ├── @ IntegerNode (location: (7,9)-(7,10))
-            │       │   ├── flags: decimal
-            │       │   └── value: 2
-            │       └── @ IntegerNode (location: (7,12)-(7,13))
-            │           ├── flags: decimal
-            │           └── value: 3
-            └── rparen_loc: (7,13)-(7,14) = ")"
diff --git a/test/mri/prism/snippets_test.rb b/test/mri/prism/snippets_test.rb
index 26847da184c..3c28d27a250 100644
--- a/test/mri/prism/snippets_test.rb
+++ b/test/mri/prism/snippets_test.rb
@@ -5,6 +5,7 @@
 module Prism
   class SnippetsTest < TestCase
     except = [
+      "encoding_binary.txt",
       "newline_terminated.txt",
       "seattlerb/begin_rescue_else_ensure_no_bodies.txt",
       "seattlerb/case_in.txt",
@@ -17,24 +18,24 @@ class SnippetsTest < TestCase
       "whitequark/multiple_pattern_matches.txt"
     ]
 
-    Fixture.each(except: except) do |fixture|
-      define_method(fixture.test_name) { assert_snippets(fixture) }
+    Fixture.each_with_all_versions(except: except) do |fixture, version|
+      define_method(fixture.test_name(version)) { assert_snippets(fixture, version) }
     end
 
     private
 
     # We test every snippet (separated by \n\n) in isolation to ensure the
     # parser does not try to read bytes further than the end of each snippet.
-    def assert_snippets(fixture)
+    def assert_snippets(fixture, version)
       fixture.read.split(/(?<=\S)\n\n(?=\S)/).each do |snippet|
         snippet = snippet.rstrip
 
-        result = Prism.parse(snippet, filepath: fixture.path)
+        result = Prism.parse(snippet, filepath: fixture.path, version: version)
         assert result.success?
 
         if !ENV["PRISM_BUILD_MINIMAL"]
-          dumped = Prism.dump(snippet, filepath: fixture.path)
-          assert_equal_nodes(result.value, Prism.load(snippet, dumped).value)
+          dumped = Prism.dump(snippet, filepath: fixture.path, version: version)
+          assert_equal_nodes(result.value, Prism.load(snippet, dumped, version: version).value)
         end
       end
     end
diff --git a/test/mri/prism/static_inspect_test.rb b/test/mri/prism/static_inspect_test.rb
deleted file mode 100644
index 41301693e3b..00000000000
--- a/test/mri/prism/static_inspect_test.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if Prism::BACKEND == :FFI
-
-module Prism
-  class StaticInspectTest < TestCase
-    def test_false
-      assert_equal "false", static_inspect("false")
-    end
-
-    def test_float
-      assert_equal "0.25", static_inspect("0.25")
-      assert_equal "5.125", static_inspect("5.125")
-
-      assert_equal "0.0", static_inspect("0.0")
-      assert_equal "-0.0", static_inspect("-0.0")
-
-      assert_equal "1.0e+100", static_inspect("1e100")
-      assert_equal "-1.0e+100", static_inspect("-1e100")
-
-      assert_equal "Infinity", static_inspect("1e1000")
-      assert_equal "-Infinity", static_inspect("-1e1000")
-    end
-
-    def test_imaginary
-      assert_equal "(0+1i)", static_inspect("1i")
-      assert_equal "(0-1i)", static_inspect("-1i")
-    end
-
-    def test_integer
-      assert_equal "1000", static_inspect("1_0_0_0")
-      assert_equal "10000000000000000000000000000", static_inspect("1_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0")
-    end
-
-    def test_nil
-      assert_equal "nil", static_inspect("nil")
-    end
-
-    def test_rational
-      assert_equal "(0/1)", static_inspect("0r")
-      assert_equal "(1/1)", static_inspect("1r")
-      assert_equal "(1/1)", static_inspect("1.0r")
-      assert_equal "(77777/1000)", static_inspect("77.777r")
-    end
-
-    def test_regular_expression
-      assert_equal "/.*/", static_inspect("/.*/")
-      assert_equal "/.*/i", static_inspect("/.*/i")
-      assert_equal "/.*/", static_inspect("/.*/u")
-      assert_equal "/.*/n", static_inspect("/.*/un")
-    end
-
-    def test_source_encoding
-      assert_equal "#<Encoding:UTF-8>", static_inspect("__ENCODING__")
-      assert_equal "#<Encoding:Shift_JIS>", static_inspect("__ENCODING__", encoding: "Shift_JIS")
-    end
-
-    def test_source_file
-      assert_equal __FILE__.inspect, static_inspect("__FILE__", filepath: __FILE__, frozen_string_literal: true)
-    end
-
-    def test_source_line
-      assert_equal "1", static_inspect("__LINE__")
-      assert_equal "5", static_inspect("__LINE__", line: 5)
-    end
-
-    def test_string
-      assert_equal "\"\"", static_inspect('""', frozen_string_literal: true)
-      assert_equal "\"Hello, World!\"", static_inspect('"Hello, World!"', frozen_string_literal: true)
-      assert_equal "\"\\a\"", static_inspect("\"\\a\"", frozen_string_literal: true)
-    end
-
-    def test_symbol
-      assert_equal ":foo", static_inspect(":foo")
-      assert_equal ":foo", static_inspect("%s[foo]")
-    end
-
-    def test_true
-      assert_equal "true", static_inspect("true")
-    end
-
-    private
-
-    def static_inspect(source, **options)
-      Debug.static_inspect(source, **options)
-    end
-  end
-end
diff --git a/test/mri/prism/static_literals_test.rb b/test/mri/prism/static_literals_test.rb
deleted file mode 100644
index 26699319741..00000000000
--- a/test/mri/prism/static_literals_test.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module Prism
-  class StaticLiteralsTest < TestCase
-    def test_static_literals
-      assert_warning("1")
-      assert_warning("0xA", "10", "10")
-      assert_warning("0o10", "8", "8")
-      assert_warning("0b10", "2", "2")
-      assert_warning("1_000", "1000", "1000")
-      assert_warning((2**32).to_s(10), "0x#{(2**32).to_s(16)}", (2**32).to_s(10))
-      assert_warning((2**64).to_s(10), "0x#{(2**64).to_s(16)}", (2**64).to_s(10))
-
-      refute_warning("1", "-1")
-      refute_warning((2**32).to_s(10), "-0x#{(2**32).to_s(16)}")
-      refute_warning((2**64).to_s(10), "-0x#{(2**64).to_s(16)}")
-
-      assert_warning("__LINE__", "2", "2")
-      assert_warning("3", "__LINE__", "3")
-
-      assert_warning("1.0")
-      assert_warning("1e2", "100.0", "100.0")
-
-      assert_warning("1r", "1r", "(1/1)")
-      assert_warning("1.0r", "1.0r", "(1/1)")
-
-      assert_warning("1i", "1i", "(0+1i)")
-      assert_warning("1.0i", "1.0i", "(0+1.0i)")
-
-      assert_warning("1ri", "1ri", "(0+(1/1)*i)")
-      assert_warning("1.0ri", "1.0ri", "(0+(1/1)*i)")
-
-      assert_warning("\"#{__FILE__}\"")
-      assert_warning("\"foo\"")
-
-      assert_warning("/foo/")
-
-      refute_warning("/foo/", "/foo/i")
-
-      assert_warning(":foo")
-      assert_warning("%s[foo]", ":foo", ":foo")
-
-      assert_warning("true")
-      assert_warning("false")
-      assert_warning("nil")
-      assert_warning("__ENCODING__", "__ENCODING__", "#<Encoding:UTF-8>")
-    end
-
-    private
-
-    def parse_warnings(left, right)
-      warnings = []
-
-      warnings << Prism.parse(<<~RUBY, filepath: __FILE__).warnings.first
-        {
-          #{left} => 1,
-          #{right} => 2
-        }
-      RUBY
-
-      warnings << Prism.parse(<<~RUBY, filepath: __FILE__).warnings.first
-        case foo
-        when #{left}
-        when #{right}
-        end
-      RUBY
-
-      warnings
-    end
-
-    def assert_warning(left, right = left, message = left)
-      hash_keys, when_clauses = parse_warnings(left, right)
-
-      assert_include hash_keys.message, message
-      assert_include hash_keys.message, "line 3"
-      assert_include when_clauses.message, "line 3"
-    end
-
-    def refute_warning(left, right)
-      assert_empty parse_warnings(left, right).compact
-    end
-  end
-end
diff --git a/test/mri/prism/test_helper.rb b/test/mri/prism/test_helper.rb
index b8485002831..43771110b42 100644
--- a/test/mri/prism/test_helper.rb
+++ b/test/mri/prism/test_helper.rb
@@ -38,7 +38,7 @@ class TestCase < ::Test::Unit::TestCase
     # are used to define test methods that assert against each fixture in some
     # way.
     class Fixture
-      BASE = File.join(__dir__, "fixtures")
+      BASE = ENV.fetch("FIXTURE_BASE", File.join(__dir__, "fixtures"))
 
       attr_reader :path
 
@@ -55,17 +55,45 @@ def full_path
       end
 
       def snapshot_path
-        File.join(__dir__, "snapshots", path)
+        File.join(File.expand_path("../..", __dir__), "snapshots", path)
       end
 
-      def test_name
-        :"test_#{path}"
+      def test_name(version = nil)
+        if version
+          :"test_#{version}_#{path}"
+        else
+          :"test_#{path}"
+        end
       end
 
       def self.each(except: [], &block)
-        paths = Dir[ENV.fetch("FOCUS") { File.join("**", "*.txt") }, base: BASE] - except
+        glob_pattern = ENV.fetch("FOCUS") { custom_base_path? ? File.join("**", "*.rb") : File.join("**", "*.txt") }
+        paths = Dir[glob_pattern, base: BASE] - except
         paths.each { |path| yield Fixture.new(path) }
       end
+
+      def self.each_for_version(except: [], version:, &block)
+        each(except: except) do |fixture|
+          next unless TestCase.ruby_versions_for(fixture.path).include?(version)
+          yield fixture
+        end
+      end
+
+      def self.each_for_current_ruby(except: [], &block)
+        each_for_version(except: except, version: CURRENT_MAJOR_MINOR, &block)
+      end
+
+      def self.each_with_all_versions(except: [], &block)
+        each(except: except) do |fixture|
+          TestCase.ruby_versions_for(fixture.path).each do |version|
+            yield fixture, version
+          end
+        end
+      end
+
+      def self.custom_base_path?
+        ENV.key?("FIXTURE_BASE")
+      end
     end
 
     # Yield each encoding that we want to test, along with a range of the
@@ -207,6 +235,41 @@ def self.each_encoding
       yield Encoding::EUC_TW, codepoints_euc_tw
     end
 
+    # True if the current platform is Windows.
+    def self.windows?
+      RbConfig::CONFIG["host_os"].match?(/bccwin|cygwin|djgpp|mingw|mswin|wince/i)
+    end
+
+    # All versions that prism can parse
+    SYNTAX_VERSIONS = %w[3.3 3.4 4.0 4.1]
+
+    # `RUBY_VERSION` with the patch version excluded
+    CURRENT_MAJOR_MINOR = RUBY_VERSION.split(".")[0, 2].join(".")
+
+    # Returns an array of ruby versions that a given filepath should test against:
+    # test.txt         # => all available versions
+    # 3.4/test.txt     # => versions since 3.4 (inclusive)
+    # 3.4-4.2/test.txt # => verisions since 3.4 (inclusive) up to 4.2 (inclusive)
+    def self.ruby_versions_for(filepath)
+      return [ENV['SYNTAX_VERSION']] if ENV['SYNTAX_VERSION']
+
+      parts = filepath.split("/")
+      return SYNTAX_VERSIONS if parts.size == 1
+
+      version_start, version_stop = parts[0].split("-")
+      if version_stop
+        SYNTAX_VERSIONS[SYNTAX_VERSIONS.index(version_start)..SYNTAX_VERSIONS.index(version_stop)]
+      else
+        SYNTAX_VERSIONS[SYNTAX_VERSIONS.index(version_start)..]
+      end
+    end
+
+    if RUBY_VERSION >= "3.3.0"
+      def test_all_syntax_versions_present
+        assert_include(SYNTAX_VERSIONS, CURRENT_MAJOR_MINOR)
+      end
+    end
+
     private
 
     if RUBY_ENGINE == "ruby" && RubyVM::InstructionSequence.compile("").to_a[4][:parser] != :prism
@@ -309,15 +372,16 @@ def assert_equal_nodes(expected, actual, compare_location: true, parent: nil)
       end
     end
 
-    def ignore_warnings
-      previous = $VERBOSE
-      $VERBOSE = nil
+    def capture_warnings
+      $stderr = StringIO.new
+      yield
+      $stderr.string
+    ensure
+      $stderr = STDERR
+    end
 
-      begin
-        yield
-      ensure
-        $VERBOSE = previous
-      end
+    def ignore_warnings
+      capture_warnings { return yield }
     end
   end
 end
diff --git a/test/mri/prism/unescape_test.rb b/test/mri/prism/unescape_test.rb
index f9e5a60e45a..d241f28c087 100644
--- a/test/mri/prism/unescape_test.rb
+++ b/test/mri/prism/unescape_test.rb
@@ -2,7 +2,9 @@
 
 require_relative "test_helper"
 
-return if RUBY_VERSION < "3.1.0" || Prism::BACKEND == :FFI
+return if Prism::BACKEND == :FFI
+return if RUBY_VERSION < "3.1.0"
+return if RUBY_VERSION >= "3.4.0"
 
 module Prism
   class UnescapeTest < TestCase
@@ -204,6 +206,9 @@ def assert_context(context)
         # \C-a \C-b \C-c ...
         assert_unescape(context, "C-#{chr}")
 
+        # \C-\a \C-\b \C-\c ...
+        assert_unescape(context, "C-\\#{chr}")
+
         # \ca \cb \cc ...
         assert_unescape(context, "c#{chr}")
 
diff --git a/test/mri/prism/warnings_test.rb b/test/mri/prism/warnings_test.rb
deleted file mode 100644
index 4da2af626a2..00000000000
--- a/test/mri/prism/warnings_test.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-# frozen_string_literal: true
-
-return if RUBY_VERSION < "3.1"
-
-require_relative "test_helper"
-require "stringio"
-
-module Prism
-  class WarningsTest < TestCase
-    def test_ambiguous_uminus
-      assert_warning("a -b", "ambiguous first argument")
-    end
-
-    def test_ambiguous_uplus
-      assert_warning("a +b", "ambiguous first argument")
-    end
-
-    def test_ambiguous_ustar
-      assert_warning("a *b", "argument prefix")
-    end
-
-    def test_ambiguous_regexp
-      assert_warning("a /b/", "wrap regexp in parentheses")
-    end
-
-    def test_equal_in_conditional
-      assert_warning("if a = 1; end", "should be ==")
-    end
-
-    def test_dot_dot_dot_eol
-      assert_warning("foo...", "... at EOL")
-      assert_warning("def foo(...) = bar ...", "... at EOL")
-
-      assert_warning("foo... #", "... at EOL")
-      assert_warning("foo... \t\v\f\n", "... at EOL")
-
-      refute_warning("p foo...bar")
-      refute_warning("p foo...      bar")
-    end
-
-    def test_END_in_method
-      assert_warning("def foo; END {}; end", "END in method")
-    end
-
-    def test_duplicated_hash_key
-      assert_warning("{ a: 1, a: 2 }", "duplicated and overwritten")
-    end
-
-    def test_duplicated_when_clause
-      assert_warning("case 1; when 1, 1; end", "clause with line")
-    end
-
-    def test_float_out_of_range
-      assert_warning("1.0e100000", "out of range")
-    end
-
-    def test_integer_in_flip_flop
-      assert_warning("1 if 2..foo", "integer")
-    end
-
-    def test_keyword_eol
-      assert_warning("if\ntrue; end", "end of line")
-      assert_warning("if true\nelsif\nfalse; end", "end of line")
-    end
-
-    def test_string_in_predicate
-      assert_warning("if 'foo'; end", "string")
-      assert_warning("if \"\#{foo}\"; end", "string")
-      assert_warning("if __FILE__; end", "string")
-    end
-
-    def test_symbol_in_predicate
-      assert_warning("if :foo; end", "symbol")
-      assert_warning("if :\"\#{foo}\"; end", "symbol")
-    end
-
-    def test_literal_in_predicate
-      assert_warning("if __LINE__; end", "literal")
-      assert_warning("if __ENCODING__; end", "literal")
-      assert_warning("if 1; end", "literal")
-      assert_warning("if 1.0; end", "literal")
-      assert_warning("if 1r; end", "literal")
-      assert_warning("if 1i; end", "literal")
-    end
-
-    def test_regexp_in_predicate
-      assert_warning("if /foo/; end", "regex")
-      assert_warning("if /foo\#{bar}/; end", "regex")
-    end
-
-    private
-
-    def assert_warning(source, message)
-      warnings = Prism.parse(source).warnings
-
-      assert_equal 1, warnings.length
-      assert_include warnings.first.message, message
-
-      if defined?(RubyVM::AbstractSyntaxTree)
-        assert_include capture_warning { RubyVM::AbstractSyntaxTree.parse(source) }, message
-      end
-    end
-
-    def refute_warning(source)
-      assert_empty Prism.parse(source).warnings
-
-      if defined?(RubyVM::AbstractSyntaxTree)
-        assert_empty capture_warning { RubyVM::AbstractSyntaxTree.parse(source) }
-      end
-    end
-
-    def capture_warning
-      stderr, $stderr, verbose, $VERBOSE = $stderr, StringIO.new, $VERBOSE, true
-
-      begin
-        yield
-        $stderr.string
-      ensure
-        $stderr, $VERBOSE = stderr, verbose
-      end
-    end
-  end
-end
diff --git a/test/mri/psych/test_data.rb b/test/mri/psych/test_data.rb
new file mode 100644
index 00000000000..57c3478193a
--- /dev/null
+++ b/test/mri/psych/test_data.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+require_relative 'helper'
+
+class PsychDataWithIvar < Data.define(:foo)
+  attr_reader :bar
+  def initialize(**)
+    @bar = 'hello'
+    super
+  end
+end unless RUBY_VERSION < "3.2"
+
+module Psych
+  class TestData < TestCase
+    class SelfReferentialData < Data.define(:foo)
+      attr_accessor :ref
+      def initialize(foo:)
+        @ref = self
+        super
+      end
+    end unless RUBY_VERSION < "3.2"
+
+    def setup
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+    end
+
+    # TODO: move to another test?
+    def test_dump_data
+      assert_equal <<~eoyml, Psych.dump(PsychDataWithIvar["bar"])
+        --- !ruby/data-with-ivars:PsychDataWithIvar
+        members:
+          foo: bar
+        ivars:
+          "@bar": hello
+      eoyml
+    end
+
+    def test_self_referential_data
+      circular = SelfReferentialData.new("foo")
+
+      loaded = Psych.unsafe_load(Psych.dump(circular))
+      assert_instance_of(SelfReferentialData, loaded.ref)
+
+      assert_equal(circular, loaded)
+      assert_same(loaded, loaded.ref)
+    end
+
+    def test_roundtrip
+      thing = PsychDataWithIvar.new("bar")
+      data = Psych.unsafe_load(Psych.dump(thing))
+
+      assert_equal "hello", data.bar
+      assert_equal "bar",   data.foo
+    end
+
+    def test_load
+      obj = Psych.unsafe_load(<<~eoyml)
+        --- !ruby/data-with-ivars:PsychDataWithIvar
+        members:
+          foo: bar
+        ivars:
+          "@bar": hello
+      eoyml
+
+      assert_equal "hello", obj.bar
+      assert_equal "bar",   obj.foo
+    end
+
+    def test_members_must_be_identical
+      TestData.const_set :D, Data.define(:a, :b)
+      d = Psych.dump(TestData::D.new(1, 2))
+
+      # more members
+      TestData.send :remove_const, :D
+      TestData.const_set :D, Data.define(:a, :b, :c)
+      e = assert_raise(ArgumentError) { Psych.unsafe_load d }
+      assert_equal 'missing keyword: :c', e.message
+
+      # less members
+      TestData.send :remove_const, :D
+      TestData.const_set :D, Data.define(:a)
+      e = assert_raise(ArgumentError) { Psych.unsafe_load d }
+      assert_equal 'unknown keyword: :b', e.message
+
+      # completely different members
+      TestData.send :remove_const, :D
+      TestData.const_set :D, Data.define(:foo, :bar)
+      e = assert_raise(ArgumentError) { Psych.unsafe_load d }
+      assert_equal 'unknown keywords: :a, :b', e.message
+    ensure
+      TestData.send :remove_const, :D
+    end
+  end
+end
+
diff --git a/test/mri/psych/test_date_time.rb b/test/mri/psych/test_date_time.rb
index 4565b8e7641..79a48e24720 100644
--- a/test/mri/psych/test_date_time.rb
+++ b/test/mri/psych/test_date_time.rb
@@ -85,5 +85,20 @@ def test_alias_with_time
       assert_match('&', yaml)
       assert_match('*', yaml)
     end
+
+    def test_overwritten_to_s
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+      s = Psych.dump(Date.new(2023, 9, 2), permitted_classes: [Date])
+      assert_separately(%W[-rpsych -rdate - #{s}], "#{<<~"begin;"}\n#{<<~'end;'}")
+      class Date
+        undef to_s
+        def to_s; strftime("%D"); end
+      end
+      expected = ARGV.shift
+      begin;
+        s = Psych.dump(Date.new(2023, 9, 2), permitted_classes: [Date])
+        assert_equal(expected, s)
+      end;
+    end
   end
 end
diff --git a/test/mri/psych/test_exception.rb b/test/mri/psych/test_exception.rb
index c1e69ab18d7..6fd92abf9d2 100644
--- a/test/mri/psych/test_exception.rb
+++ b/test/mri/psych/test_exception.rb
@@ -82,6 +82,19 @@ def test_load_stream_takes_file
       assert_equal 'omg!', ex.file
     end
 
+    def test_safe_load_stream_takes_file
+      ex = assert_raise(Psych::SyntaxError) do
+        Psych.safe_load_stream '--- `'
+      end
+      assert_nil ex.file
+      assert_match '(<unknown>)', ex.message
+
+      ex = assert_raise(Psych::SyntaxError) do
+        Psych.safe_load_stream '--- `', filename: 'omg!'
+      end
+      assert_equal 'omg!', ex.file
+    end
+
     def test_parse_file_exception
       Tempfile.create(['parsefile', 'yml']) {|t|
         t.binmode
diff --git a/test/mri/psych/test_object_references.rb b/test/mri/psych/test_object_references.rb
index 86bb9034b9b..0498d54eecc 100644
--- a/test/mri/psych/test_object_references.rb
+++ b/test/mri/psych/test_object_references.rb
@@ -31,6 +31,11 @@ def test_struct_has_references
       assert_reference_trip Struct.new(:foo).new(1)
     end
 
+    def test_data_has_references
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+      assert_reference_trip Data.define(:foo).new(1)
+    end
+
     def assert_reference_trip obj
       yml = Psych.dump([obj, obj])
       assert_match(/\*-?\d+/, yml)
diff --git a/test/mri/psych/test_psych.rb b/test/mri/psych/test_psych.rb
index 42586a87793..4455c471e71 100644
--- a/test/mri/psych/test_psych.rb
+++ b/test/mri/psych/test_psych.rb
@@ -89,6 +89,7 @@ def test_dump_stream
     things = [22, "foo \n", {}]
     stream = Psych.dump_stream(*things)
     assert_equal things, Psych.load_stream(stream)
+    assert_equal things, Psych.safe_load_stream(stream)
   end
 
   def test_dump_file
@@ -119,6 +120,8 @@ def test_libyaml_version
   def test_load_stream
     docs = Psych.load_stream("--- foo\n...\n--- bar\n...")
     assert_equal %w{ foo bar }, docs
+    safe_docs = Psych.safe_load_stream("--- foo\n...\n--- bar\n...")
+    assert_equal %w{ foo bar }, safe_docs
   end
 
   def test_load_stream_freeze
@@ -138,10 +141,18 @@ def test_load_stream_default_fallback
     assert_equal [], Psych.load_stream("")
   end
 
+  def test_safe_load_stream_default_fallback
+    assert_equal [], Psych.safe_load_stream("")
+  end
+
   def test_load_stream_raises_on_bad_input
     assert_raise(Psych::SyntaxError) { Psych.load_stream("--- `") }
   end
 
+  def test_safe_load_stream_raises_on_bad_input
+    assert_raise(Psych::SyntaxError) { Psych.safe_load_stream("--- `") }
+  end
+
   def test_parse_stream
     docs = Psych.parse_stream("--- foo\n...\n--- bar\n...")
     assert_equal(%w[foo bar], docs.children.map(&:transform))
diff --git a/test/mri/psych/test_psych_set.rb b/test/mri/psych/test_psych_set.rb
new file mode 100644
index 00000000000..c72cd73f180
--- /dev/null
+++ b/test/mri/psych/test_psych_set.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+require_relative 'helper'
+
+module Psych
+  class TestPsychSet < TestCase
+    def setup
+      super
+      @set = Psych::Set.new
+      @set['foo'] = 'bar'
+      @set['bar'] = 'baz'
+    end
+
+    def test_dump
+      assert_match(/!set/, Psych.dump(@set))
+    end
+
+    def test_roundtrip
+      assert_cycle(@set)
+    end
+
+    ###
+    # FIXME: Syck should also support !!set as shorthand
+    def test_load_from_yaml
+      loaded = Psych.unsafe_load(<<-eoyml)
+--- !set
+foo: bar
+bar: baz
+      eoyml
+      assert_equal(@set, loaded)
+    end
+
+    def test_loaded_class
+      assert_instance_of(Psych::Set, Psych.unsafe_load(Psych.dump(@set)))
+    end
+
+    def test_set_shorthand
+      loaded = Psych.unsafe_load(<<-eoyml)
+--- !!set
+foo: bar
+bar: baz
+      eoyml
+      assert_instance_of(Psych::Set, loaded)
+    end
+
+    def test_set_self_reference
+      @set['self'] = @set
+      assert_cycle(@set)
+    end
+
+    def test_stringify_names
+      @set[:symbol] = :value
+
+      assert_match(/^:symbol: :value/, Psych.dump(@set))
+      assert_match(/^symbol: :value/, Psych.dump(@set, stringify_names: true))
+    end
+  end
+end
diff --git a/test/mri/psych/test_ractor.rb b/test/mri/psych/test_ractor.rb
index 1b0d8106098..f1c8327aa34 100644
--- a/test/mri/psych/test_ractor.rb
+++ b/test/mri/psych/test_ractor.rb
@@ -7,7 +7,7 @@ def test_ractor_round_trip
       obj = {foo: [42]}
       obj2 = Ractor.new(obj) do |obj|
         Psych.unsafe_load(Psych.dump(obj))
-      end.take
+      end.value
       assert_equal obj, obj2
     RUBY
   end
@@ -33,7 +33,7 @@ def test_ractor_config
           val * 2
         end
         Psych.load('--- !!omap hello')
-      end.take
+      end.value
       assert_equal 'hellohello', r
       assert_equal 'hello', Psych.load('--- !!omap hello')
     RUBY
@@ -43,7 +43,7 @@ def test_ractor_constants
     assert_ractor(<<~RUBY, require_relative: 'helper')
       r = Ractor.new do
         Psych.libyaml_version.join('.') == Psych::LIBYAML_VERSION
-      end.take
+      end.value
       assert_equal true, r
     RUBY
   end
diff --git a/test/mri/psych/test_safe_load.rb b/test/mri/psych/test_safe_load.rb
index a9ed7375281..e6ca1e142b6 100644
--- a/test/mri/psych/test_safe_load.rb
+++ b/test/mri/psych/test_safe_load.rb
@@ -114,6 +114,38 @@ def test_anon_struct
       end
     end
 
+    D = Data.define(:d) unless RUBY_VERSION < "3.2"
+
+    def test_data_depends_on_sym
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+      assert_safe_cycle(D.new(nil), permitted_classes: [D, Symbol])
+      assert_raise(Psych::DisallowedClass) do
+        cycle D.new(nil), permitted_classes: [D]
+      end
+    end
+
+    def test_anon_data
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+      assert Psych.safe_load(<<-eoyml, permitted_classes: [Data, Symbol])
+--- !ruby/data
+  foo: bar
+      eoyml
+
+      assert_raise(Psych::DisallowedClass) do
+        Psych.safe_load(<<-eoyml, permitted_classes: [Data])
+--- !ruby/data
+  foo: bar
+        eoyml
+      end
+
+      assert_raise(Psych::DisallowedClass) do
+        Psych.safe_load(<<-eoyml, permitted_classes: [Symbol])
+--- !ruby/data
+  foo: bar
+        eoyml
+      end
+    end
+
     def test_safe_load_default_fallback
       assert_nil Psych.safe_load("")
     end
diff --git a/test/mri/psych/test_scalar_scanner.rb b/test/mri/psych/test_scalar_scanner.rb
index 2637a74df82..bc6a74ad8b2 100644
--- a/test/mri/psych/test_scalar_scanner.rb
+++ b/test/mri/psych/test_scalar_scanner.rb
@@ -138,6 +138,11 @@ def test_scan_strings_with_strict_int_delimiters
       assert_equal '-0b___', scanner.tokenize('-0b___')
     end
 
+    def test_scan_without_parse_symbols
+      scanner = Psych::ScalarScanner.new ClassLoader.new, parse_symbols: false
+      assert_equal ':foo', scanner.tokenize(':foo')
+    end
+
     def test_scan_int_commas_and_underscores
       # NB: This test is to ensure backward compatibility with prior Psych versions,
       # not to test against any actual YAML specification.
diff --git a/test/mri/psych/test_serialize_subclasses.rb b/test/mri/psych/test_serialize_subclasses.rb
index 344c79b3eff..640c331337d 100644
--- a/test/mri/psych/test_serialize_subclasses.rb
+++ b/test/mri/psych/test_serialize_subclasses.rb
@@ -35,5 +35,23 @@ def test_struct_subclass
       so = StructSubclass.new('foo', [1,2,3])
       assert_equal so, Psych.unsafe_load(Psych.dump(so))
     end
+
+    class DataSubclass < Data.define(:foo)
+      def initialize(foo:)
+        @bar = "hello #{foo}"
+        super(foo: foo)
+      end
+
+      def == other
+        super(other) && @bar == other.instance_eval{ @bar }
+      end
+    end unless RUBY_VERSION < "3.2"
+
+    def test_data_subclass
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+      so = DataSubclass.new('foo')
+      assert_equal so, Psych.unsafe_load(Psych.dump(so))
+    end
+
   end
 end
diff --git a/test/mri/psych/test_set.rb b/test/mri/psych/test_set.rb
index b4968d34252..ccd591c6263 100644
--- a/test/mri/psych/test_set.rb
+++ b/test/mri/psych/test_set.rb
@@ -1,57 +1,36 @@
+# encoding: UTF-8
 # frozen_string_literal: true
 require_relative 'helper'
+require 'set' unless defined?(Set)
 
 module Psych
   class TestSet < TestCase
     def setup
-      super
-      @set = Psych::Set.new
-      @set['foo'] = 'bar'
-      @set['bar'] = 'baz'
+      @set = ::Set.new([1, 2, 3])
     end
 
     def test_dump
-      assert_match(/!set/, Psych.dump(@set))
+      assert_equal <<~YAML, Psych.dump(@set)
+        --- !ruby/object:Set
+        hash:
+          1: true
+          2: true
+          3: true
+      YAML
     end
 
-    def test_roundtrip
-      assert_cycle(@set)
-    end
-
-    ###
-    # FIXME: Syck should also support !!set as shorthand
-    def test_load_from_yaml
-      loaded = Psych.unsafe_load(<<-eoyml)
---- !set
-foo: bar
-bar: baz
-      eoyml
-      assert_equal(@set, loaded)
+    def test_load
+      assert_equal @set, Psych.load(<<~YAML, permitted_classes: [::Set])
+        --- !ruby/object:Set
+        hash:
+          1: true
+          2: true
+          3: true
+      YAML
     end
 
-    def test_loaded_class
-      assert_instance_of(Psych::Set, Psych.unsafe_load(Psych.dump(@set)))
-    end
-
-    def test_set_shorthand
-      loaded = Psych.unsafe_load(<<-eoyml)
---- !!set
-foo: bar
-bar: baz
-      eoyml
-      assert_instance_of(Psych::Set, loaded)
-    end
-
-    def test_set_self_reference
-      @set['self'] = @set
-      assert_cycle(@set)
-    end
-
-    def test_stringify_names
-      @set[:symbol] = :value
-
-      assert_match(/^:symbol: :value/, Psych.dump(@set))
-      assert_match(/^symbol: :value/, Psych.dump(@set, stringify_names: true))
+    def test_roundtrip
+      assert_equal @set, Psych.load(Psych.dump(@set), permitted_classes: [::Set])
     end
   end
 end
diff --git a/test/mri/psych/test_stream.rb b/test/mri/psych/test_stream.rb
index 9b71c6d9965..ae940d1ee4e 100644
--- a/test/mri/psych/test_stream.rb
+++ b/test/mri/psych/test_stream.rb
@@ -54,6 +54,14 @@ def test_load_stream_yields_documents
       assert_equal %w{ foo bar }, list
     end
 
+    def test_safe_load_stream_yields_documents
+      list = []
+      Psych.safe_load_stream("--- foo\n...\n--- bar") do |ruby|
+        list << ruby
+      end
+      assert_equal %w{ foo bar }, list
+    end
+
     def test_load_stream_break
       list = []
       Psych.load_stream("--- foo\n...\n--- `") do |ruby|
diff --git a/test/mri/psych/test_stringio.rb b/test/mri/psych/test_stringio.rb
new file mode 100644
index 00000000000..7fef1402a0a
--- /dev/null
+++ b/test/mri/psych/test_stringio.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require_relative 'helper'
+
+module Psych
+  class TestStringIO < TestCase
+    # The superclass of StringIO before Ruby 3.0 was `Data`,
+    # which can interfere with the Ruby 3.2+ `Data` dumping.
+    def test_stringio
+      assert_nothing_raised do
+        Psych.dump(StringIO.new("foo"))
+      end
+    end
+  end
+end
diff --git a/test/mri/psych/test_yaml.rb b/test/mri/psych/test_yaml.rb
index 812a15dfcc7..134c346c905 100644
--- a/test/mri/psych/test_yaml.rb
+++ b/test/mri/psych/test_yaml.rb
@@ -2,11 +2,11 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
-require 'ostruct'
 
 # [ruby-core:01946]
 module Psych_Tests
     StructTest = Struct::new( :c )
+    DataTest   = Data.define( :c ) unless RUBY_VERSION < "3.2"
 end
 
 class Psych_Unit_Tests < Psych::TestCase
@@ -15,8 +15,14 @@ def teardown
     end
 
     def test_y_method
-      assert_raise(NoMethodError) do
-        OpenStruct.new.y 1
+      begin
+        require 'ostruct'
+
+        assert_raise(NoMethodError) do
+          OpenStruct.new.y 1
+        end
+      rescue LoadError
+        omit("OpenStruct is not available")
       end
     end
 
@@ -30,6 +36,10 @@ def test_multiline_regexp
         assert_cycle(Regexp.new("foo\nbar"))
     end
 
+    def test_regexp_with_slash
+      assert_cycle(Regexp.new('/'))
+    end
+
     # [ruby-core:34969]
     def test_regexp_with_n
         assert_cycle(Regexp.new('',Regexp::NOENCODING))
@@ -1032,7 +1042,6 @@ def test_ranges
     end
 
     def test_ruby_struct
-        Struct.send(:remove_const, :MyBookStruct) if Struct.const_defined?(:MyBookStruct)
         # Ruby structures
         book_struct = Struct::new( "MyBookStruct", :author, :title, :year, :isbn )
         assert_to_yaml(
@@ -1064,6 +1073,47 @@ def test_ruby_struct
 c: 123
 EOY
 
+    ensure
+        Struct.__send__(:remove_const, :MyBookStruct) if book_struct
+    end
+
+    def test_ruby_data
+        omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+        # Ruby Data value objects
+        book_class = Data.define(:author, :title, :year, :isbn)
+        Object.const_set(:MyBookData, book_class)
+        assert_to_yaml(
+            [ book_class.new( "Yukihiro Matsumoto", "Ruby in a Nutshell", 2002, "0-596-00214-9" ),
+              book_class.new( [ 'Dave Thomas', 'Andy Hunt' ], "The Pickaxe", 2002,
+                book_class.new( "This should be the ISBN", "but I have more data here", 2002, "None" )
+              )
+            ], <<EOY
+- !ruby/data:MyBookData
+  author: Yukihiro Matsumoto
+  title: Ruby in a Nutshell
+  year: 2002
+  isbn: 0-596-00214-9
+- !ruby/data:MyBookData
+  author:
+    - Dave Thomas
+    - Andy Hunt
+  title: The Pickaxe
+  year: 2002
+  isbn: !ruby/data:MyBookData
+    author: This should be the ISBN
+    title: but I have more data here
+    year: 2002
+    isbn: None
+EOY
+        )
+
+        assert_to_yaml( Psych_Tests::DataTest.new( 123 ), <<EOY )
+--- !ruby/data:Psych_Tests::DataTest
+c: 123
+EOY
+
+    ensure
+        Object.__send__(:remove_const, :MyBookData) if book_class
     end
 
     def test_ruby_rational
diff --git a/test/mri/psych/test_yaml_special_cases.rb b/test/mri/psych/test_yaml_special_cases.rb
index 205457bcae5..f1a607783ec 100644
--- a/test/mri/psych/test_yaml_special_cases.rb
+++ b/test/mri/psych/test_yaml_special_cases.rb
@@ -15,6 +15,7 @@ def test_empty_string
       s = ""
       assert_equal false, Psych.unsafe_load(s)
       assert_equal [], Psych.load_stream(s)
+      assert_equal [], Psych.safe_load_stream(s)
       assert_equal false, Psych.parse(s)
       assert_equal [], Psych.parse_stream(s).transform
       assert_nil   Psych.safe_load(s)
@@ -24,6 +25,7 @@ def test_false
       s = "false"
       assert_equal false, Psych.load(s)
       assert_equal [false], Psych.load_stream(s)
+      assert_equal [false], Psych.safe_load_stream(s)
       assert_equal false, Psych.parse(s).transform
       assert_equal [false], Psych.parse_stream(s).transform
       assert_equal false, Psych.safe_load(s)
@@ -33,6 +35,7 @@ def test_n
       s = "n"
       assert_equal "n", Psych.load(s)
       assert_equal ["n"], Psych.load_stream(s)
+      assert_equal ["n"], Psych.safe_load_stream(s)
       assert_equal "n", Psych.parse(s).transform
       assert_equal ["n"], Psych.parse_stream(s).transform
       assert_equal "n", Psych.safe_load(s)
@@ -42,6 +45,7 @@ def test_off
       s = "off"
       assert_equal false, Psych.load(s)
       assert_equal [false], Psych.load_stream(s)
+      assert_equal [false], Psych.safe_load_stream(s)
       assert_equal false, Psych.parse(s).transform
       assert_equal [false], Psych.parse_stream(s).transform
       assert_equal false, Psych.safe_load(s)
@@ -51,6 +55,7 @@ def test_inf
       s = "-.inf"
       assert_equal(-Float::INFINITY, Psych.load(s))
       assert_equal([-Float::INFINITY], Psych.load_stream(s))
+      assert_equal([-Float::INFINITY], Psych.safe_load_stream(s))
       assert_equal(-Float::INFINITY, Psych.parse(s).transform)
       assert_equal([-Float::INFINITY], Psych.parse_stream(s).transform)
       assert_equal(-Float::INFINITY, Psych.safe_load(s))
@@ -60,6 +65,7 @@ def test_NaN
       s = ".NaN"
       assert Psych.load(s).nan?
       assert Psych.load_stream(s).first.nan?
+      assert Psych.safe_load_stream(s).first.nan?
       assert Psych.parse(s).transform.nan?
       assert Psych.parse_stream(s).transform.first.nan?
       assert Psych.safe_load(s).nan?
@@ -69,6 +75,7 @@ def test_0xC
       s = "0xC"
       assert_equal 12, Psych.load(s)
       assert_equal [12], Psych.load_stream(s)
+      assert_equal [12], Psych.safe_load_stream(s)
       assert_equal 12, Psych.parse(s).transform
       assert_equal [12], Psych.parse_stream(s).transform
       assert_equal 12, Psych.safe_load(s)
@@ -78,6 +85,7 @@ def test_arrows
       s = "<<"
       assert_equal "<<", Psych.load(s)
       assert_equal ["<<"], Psych.load_stream(s)
+      assert_equal ["<<"], Psych.safe_load_stream(s)
       assert_equal "<<", Psych.parse(s).transform
       assert_equal ["<<"], Psych.parse_stream(s).transform
       assert_equal "<<", Psych.safe_load(s)
@@ -87,6 +95,7 @@ def test_arrows_hash
       s = "<<: {}"
       assert_equal({}, Psych.load(s))
       assert_equal [{}], Psych.load_stream(s)
+      assert_equal [{}], Psych.safe_load_stream(s)
       assert_equal({}, Psych.parse(s).transform)
       assert_equal [{}], Psych.parse_stream(s).transform
       assert_equal({}, Psych.safe_load(s))
@@ -96,6 +105,7 @@ def test_thousand
       s = "- 1000\n- +1000\n- 1_000"
       assert_equal [1000, 1000, 1000], Psych.load(s)
       assert_equal [[1000, 1000, 1000]], Psych.load_stream(s)
+      assert_equal [[1000, 1000, 1000]], Psych.safe_load_stream(s)
       assert_equal [1000, 1000, 1000], Psych.parse(s).transform
       assert_equal [[1000, 1000, 1000]], Psych.parse_stream(s).transform
       assert_equal [1000, 1000, 1000], Psych.safe_load(s)
@@ -105,6 +115,7 @@ def test_8
       s = "[8, 08, 0o10, 010]"
       assert_equal [8, "08", "0o10", 8], Psych.load(s)
       assert_equal [[8, "08", "0o10", 8]], Psych.load_stream(s)
+      assert_equal [[8, "08", "0o10", 8]], Psych.safe_load_stream(s)
       assert_equal [8, "08", "0o10", 8], Psych.parse(s).transform
       assert_equal [[8, "08", "0o10", 8]], Psych.parse_stream(s).transform
       assert_equal [8, "08", "0o10", 8], Psych.safe_load(s)
@@ -114,6 +125,7 @@ def test_null
       s = "null"
       assert_nil   Psych.load(s)
       assert_equal [nil], Psych.load_stream(s)
+      assert_equal [nil], Psych.safe_load_stream(s)
       assert_nil   Psych.parse(s).transform
       assert_equal [nil], Psych.parse_stream(s).transform
       assert_nil   Psych.safe_load(s)
diff --git a/test/mri/psych/test_yamlstore.rb b/test/mri/psych/test_yamlstore.rb
index 1a1be3700ef..c2721c41ea8 100644
--- a/test/mri/psych/test_yamlstore.rb
+++ b/test/mri/psych/test_yamlstore.rb
@@ -23,14 +23,18 @@ def load(content)
 
   class YAMLStoreTest < TestCase
     def setup
-      @dir = Dir.mktmpdir("rubytest-file")
-      File.chown(-1, Process.gid, @dir)
-      @yamlstore_file = make_tmp_filename("yamlstore")
-      @yamlstore = YAML::Store.new(@yamlstore_file)
+      if defined?(::PStore)
+        @dir = Dir.mktmpdir("rubytest-file")
+        File.chown(-1, Process.gid, @dir)
+        @yamlstore_file = make_tmp_filename("yamlstore")
+        @yamlstore = YAML::Store.new(@yamlstore_file)
+      else
+        omit "PStore is not available"
+      end
     end
 
     def teardown
-      FileUtils.remove_entry_secure @dir
+      FileUtils.remove_entry_secure(@dir) if @dir
     end
 
     def make_tmp_filename(prefix)
@@ -97,5 +101,5 @@ def test_writing_inside_readonly_transaction_raises_error
         end
       end
     end
-  end
+  end if defined?(::PStore)
 end if defined?(Psych)
diff --git a/test/mri/psych/visitors/test_to_ruby.rb b/test/mri/psych/visitors/test_to_ruby.rb
index 89c36766519..c9b501dfa27 100644
--- a/test/mri/psych/visitors/test_to_ruby.rb
+++ b/test/mri/psych/visitors/test_to_ruby.rb
@@ -328,6 +328,12 @@ def test_mapping_with_str_tag
         mapping.children << Nodes::Scalar.new('bar')
         assert_equal({'foo' => 'bar'}, mapping.to_ruby)
       end
+
+      def test_parse_symbols
+        node = Nodes::Scalar.new(':foo')
+        assert_equal :foo, node.to_ruby
+        assert_equal ':foo', node.to_ruby(parse_symbols: false)
+      end
     end
   end
 end
diff --git a/test/mri/psych/visitors/test_yaml_tree.rb b/test/mri/psych/visitors/test_yaml_tree.rb
index 01e685134ae..bd3919f83d6 100644
--- a/test/mri/psych/visitors/test_yaml_tree.rb
+++ b/test/mri/psych/visitors/test_yaml_tree.rb
@@ -73,6 +73,27 @@ def test_override_method
         assert_equal s.method, obj.method
       end
 
+      D = Data.define(:foo) unless RUBY_VERSION < "3.2"
+
+      def test_data
+        omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+        assert_cycle D.new('bar')
+      end
+
+      def test_data_anon
+        omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+        d = Data.define(:foo).new('bar')
+        obj =  Psych.unsafe_load(Psych.dump(d))
+        assert_equal d.foo, obj.foo
+      end
+
+      def test_data_override_method
+        omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+        d = Data.define(:method).new('override')
+        obj =  Psych.unsafe_load(Psych.dump(d))
+        assert_equal d.method, obj.method
+      end
+
       def test_exception
         ex = Exception.new 'foo'
         loaded = Psych.unsafe_load(Psych.dump(ex))
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text
deleted file mode 100644
index 0e9527f9311..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text	
+++ /dev/null
@@ -1,21 +0,0 @@
-AT&T has an ampersand in their name.
-
-AT&amp;T is another way to write it.
-
-This & that.
-
-4 < 5.
-
-6 > 5.
-
-Here's a [link] [1] with an ampersand in the URL.
-
-Here's a link with an amersand in the link text: [AT&T] [2].
-
-Here's an inline [link](/script?foo=1&bar=2).
-
-Here's an inline [link](</script?foo=1&bar=2>).
-
-
-[1]: http://example.com/?foo=1&bar=2
-[2]: http://att.com/  "AT&T"
\ No newline at end of file
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Auto links.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Auto links.text
deleted file mode 100644
index abbc48869de..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Auto links.text	
+++ /dev/null
@@ -1,13 +0,0 @@
-Link: <http://example.com/>.
-
-With an ampersand: <http://example.com/?foo=1&bar=2>
-
-* In a list?
-* <http://example.com/>
-* It should.
-
-> Blockquoted: <http://example.com/>
-
-Auto-links should not occur here: `<http://example.com/>`
-
-	or here: <http://example.com/>
\ No newline at end of file
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Backslash escapes.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Backslash escapes.text
deleted file mode 100644
index 5b014cb33d1..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Backslash escapes.text	
+++ /dev/null
@@ -1,120 +0,0 @@
-These should all get escaped:
-
-Backslash: \\
-
-Backtick: \`
-
-Asterisk: \*
-
-Underscore: \_
-
-Left brace: \{
-
-Right brace: \}
-
-Left bracket: \[
-
-Right bracket: \]
-
-Left paren: \(
-
-Right paren: \)
-
-Greater-than: \>
-
-Hash: \#
-
-Period: \.
-
-Bang: \!
-
-Plus: \+
-
-Minus: \-
-
-
-
-These should not, because they occur within a code block:
-
-	Backslash: \\
-
-	Backtick: \`
-
-	Asterisk: \*
-
-	Underscore: \_
-
-	Left brace: \{
-
-	Right brace: \}
-
-	Left bracket: \[
-
-	Right bracket: \]
-
-	Left paren: \(
-
-	Right paren: \)
-
-	Greater-than: \>
-
-	Hash: \#
-
-	Period: \.
-
-	Bang: \!
-
-	Plus: \+
-
-	Minus: \-
-
-
-Nor should these, which occur in code spans:
-
-Backslash: `\\`
-
-Backtick: `` \` ``
-
-Asterisk: `\*`
-
-Underscore: `\_`
-
-Left brace: `\{`
-
-Right brace: `\}`
-
-Left bracket: `\[`
-
-Right bracket: `\]`
-
-Left paren: `\(`
-
-Right paren: `\)`
-
-Greater-than: `\>`
-
-Hash: `\#`
-
-Period: `\.`
-
-Bang: `\!`
-
-Plus: `\+`
-
-Minus: `\-`
-
-
-These should get escaped, even though they're matching pairs for
-other Markdown constructs:
-
-\*asterisks\*
-
-\_underscores\_
-
-\`backticks\`
-
-This is a code span with a literal backslash-backtick sequence: `` \` ``
-
-This is a tag with unescaped backticks <span attr='`ticks`'>bar</span>.
-
-This is a tag with backslashes <span attr='\\backslashes\\'>bar</span>.
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text
deleted file mode 100644
index c31d171049d..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text	
+++ /dev/null
@@ -1,11 +0,0 @@
-> Example:
-> 
->     sub status {
->         print "working";
->     }
-> 
-> Or:
-> 
->     sub status {
->         return "working";
->     }
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Code Blocks.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Code Blocks.text
deleted file mode 100644
index b54b09285a7..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Code Blocks.text	
+++ /dev/null
@@ -1,14 +0,0 @@
-	code block on the first line
-	
-Regular text.
-
-    code block indented by spaces
-
-Regular text.
-
-	the lines in this block  
-	all contain trailing spaces  
-
-Regular Text.
-
-	code block on the last line
\ No newline at end of file
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Code Spans.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Code Spans.text
deleted file mode 100644
index 750a1973df9..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Code Spans.text	
+++ /dev/null
@@ -1,6 +0,0 @@
-`<test a="` content of attribute `">`
-
-Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span>
-
-Here's how you put `` `backticks` `` in a code span.
-
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text
deleted file mode 100644
index f8a5b27bf41..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text	
+++ /dev/null
@@ -1,8 +0,0 @@
-In Markdown 1.0.0 and earlier. Version
-8. This line turns into a list item.
-Because a hard-wrapped line in the
-middle of a paragraph looked like a
-list item.
-
-Here's one with a bullet.
-* criminey.
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Horizontal rules.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Horizontal rules.text
deleted file mode 100644
index 1594bda27b4..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Horizontal rules.text	
+++ /dev/null
@@ -1,67 +0,0 @@
-Dashes:
-
----
-
- ---
- 
-  ---
-
-   ---
-
-	---
-
-- - -
-
- - - -
- 
-  - - -
-
-   - - -
-
-	- - -
-
-
-Asterisks:
-
-***
-
- ***
- 
-  ***
-
-   ***
-
-	***
-
-* * *
-
- * * *
- 
-  * * *
-
-   * * *
-
-	* * *
-
-
-Underscores:
-
-___
-
- ___
- 
-  ___
-
-   ___
-
-    ___
-
-_ _ _
-
- _ _ _
- 
-  _ _ _
-
-   _ _ _
-
-    _ _ _
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text
deleted file mode 100644
index 86b7206d2a1..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text	
+++ /dev/null
@@ -1,15 +0,0 @@
-Simple block on one line:
-
-<div>foo</div>
-
-And nested without indentation:
-
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"/>
-</div>
-<div>bar</div>
-</div>
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text
deleted file mode 100644
index 14aa2dc272d..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text	
+++ /dev/null
@@ -1,69 +0,0 @@
-Here's a simple block:
-
-<div>
-	foo
-</div>
-
-This should be a code block, though:
-
-	<div>
-		foo
-	</div>
-
-As should this:
-
-	<div>foo</div>
-
-Now, nested:
-
-<div>
-	<div>
-		<div>
-			foo
-		</div>
-	</div>
-</div>
-
-This should just be an HTML comment:
-
-<!-- Comment -->
-
-Multiline:
-
-<!--
-Blah
-Blah
--->
-
-Code block:
-
-	<!-- Comment -->
-
-Just plain comment, with trailing spaces on the line:
-
-<!-- foo -->   
-
-Code:
-
-	<hr />
-	
-Hr's:
-
-<hr>
-
-<hr/>
-
-<hr />
-
-<hr>   
-
-<hr/>  
-
-<hr /> 
-
-<hr class="foo" id="bar" />
-
-<hr class="foo" id="bar"/>
-
-<hr class="foo" id="bar" >
-
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text
deleted file mode 100644
index 41d830d0385..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text	
+++ /dev/null
@@ -1,13 +0,0 @@
-Paragraph one.
-
-<!-- This is a simple comment -->
-
-<!--
-	This is another comment.
--->
-
-Paragraph two.
-
-<!-- one comment block -- -- with two comments -->
-
-The end.
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, inline style.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, inline style.text
deleted file mode 100644
index 09017a90c70..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, inline style.text	
+++ /dev/null
@@ -1,12 +0,0 @@
-Just a [URL](/url/).
-
-[URL and title](/url/ "title").
-
-[URL and title](/url/  "title preceded by two spaces").
-
-[URL and title](/url/	"title preceded by a tab").
-
-[URL and title](/url/ "title has spaces afterward"  ).
-
-
-[Empty]().
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, reference style.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, reference style.text
deleted file mode 100644
index 341ec88e3d0..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, reference style.text	
+++ /dev/null
@@ -1,71 +0,0 @@
-Foo [bar] [1].
-
-Foo [bar][1].
-
-Foo [bar]
-[1].
-
-[1]: /url/  "Title"
-
-
-With [embedded [brackets]] [b].
-
-
-Indented [once][].
-
-Indented [twice][].
-
-Indented [thrice][].
-
-Indented [four][] times.
-
- [once]: /url
-
-  [twice]: /url
-
-   [thrice]: /url
-
-    [four]: /url
-
-
-[b]: /url/
-
-* * *
-
-[this] [this] should work
-
-So should [this][this].
-
-And [this] [].
-
-And [this][].
-
-And [this].
-
-But not [that] [].
-
-Nor [that][].
-
-Nor [that].
-
-[Something in brackets like [this][] should work]
-
-[Same with [this].]
-
-In this case, [this](/somethingelse/) points to something else.
-
-Backslashing should suppress \[this] and [this\].
-
-[this]: foo
-
-
-* * *
-
-Here's one where the [link
-breaks] across lines.
-
-Here's another where the [link 
-breaks] across lines, but with a line-ending space.
-
-
-[link breaks]: /url/
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text
deleted file mode 100644
index 8c44c98feed..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text	
+++ /dev/null
@@ -1,20 +0,0 @@
-This is the [simple case].
-
-[simple case]: /simple
-
-
-
-This one has a [line
-break].
-
-This one has a [line 
-break] with a line-ending space.
-
-[line break]: /foo
-
-
-[this] [that] and the [other]
-
-[this]: /this
-[that]: /that
-[other]: /other
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text
deleted file mode 100644
index 29d0e4235b2..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text	
+++ /dev/null
@@ -1,7 +0,0 @@
-Foo [bar][].
-
-Foo [bar](/url/ "Title with "quotes" inside").
-
-
-  [bar]: /url/ "Title with "quotes" inside"
-
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text
deleted file mode 100644
index b499390f2dc..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text	
+++ /dev/null
@@ -1,306 +0,0 @@
-Markdown: Basics
-================
-
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a class="selected" title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-Getting the Gist of Markdown's Formatting Syntax
-------------------------------------------------
-
-This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.
-
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL] [src].
-
-  [s]: /projects/markdown/syntax  "Markdown Syntax"
-  [d]: /projects/markdown/dingus  "Markdown Dingus"
-  [src]: /projects/markdown/basics.text
-
-
-## Paragraphs, Headers, Blockquotes ##
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-Markdown offers two styles of headers: *Setext* and *atx*.
-Setext-style headers for `<h1>` and `<h2>` are created by
-"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
-To create an atx-style header, you put 1-6 hash marks (`#`) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.
-
-Blockquotes are indicated using email-style '`>`' angle brackets.
-
-Markdown:
-
-    A First Level Header
-    ====================
-    
-    A Second Level Header
-    ---------------------
-
-    Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.
-
-    The quick brown fox jumped over the lazy
-    dog's back.
-    
-    ### Header 3
-
-    > This is a blockquote.
-    > 
-    > This is the second paragraph in the blockquote.
-    >
-    > ## This is an H2 in a blockquote
-
-
-Output:
-
-    <h1>A First Level Header</h1>
-    
-    <h2>A Second Level Header</h2>
-    
-    <p>Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.</p>
-    
-    <p>The quick brown fox jumped over the lazy
-    dog's back.</p>
-    
-    <h3>Header 3</h3>
-    
-    <blockquote>
-        <p>This is a blockquote.</p>
-        
-        <p>This is the second paragraph in the blockquote.</p>
-        
-        <h2>This is an H2 in a blockquote</h2>
-    </blockquote>
-
-
-
-### Phrase Emphasis ###
-
-Markdown uses asterisks and underscores to indicate spans of emphasis.
-
-Markdown:
-
-    Some of these words *are emphasized*.
-    Some of these words _are emphasized also_.
-    
-    Use two asterisks for **strong emphasis**.
-    Or, if you prefer, __use two underscores instead__.
-
-Output:
-
-    <p>Some of these words <em>are emphasized</em>.
-    Some of these words <em>are emphasized also</em>.</p>
-    
-    <p>Use two asterisks for <strong>strong emphasis</strong>.
-    Or, if you prefer, <strong>use two underscores instead</strong>.</p>
-   
-
-
-## Lists ##
-
-Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
-`+`, and `-`) as list markers. These three markers are
-interchangeable; this:
-
-    *   Candy.
-    *   Gum.
-    *   Booze.
-
-this:
-
-    +   Candy.
-    +   Gum.
-    +   Booze.
-
-and this:
-
-    -   Candy.
-    -   Gum.
-    -   Booze.
-
-all produce the same output:
-
-    <ul>
-    <li>Candy.</li>
-    <li>Gum.</li>
-    <li>Booze.</li>
-    </ul>
-
-Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:
-
-    1.  Red
-    2.  Green
-    3.  Blue
-
-Output:
-
-    <ol>
-    <li>Red</li>
-    <li>Green</li>
-    <li>Blue</li>
-    </ol>
-
-If you put blank lines between items, you'll get `<p>` tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:
-
-    *   A list item.
-    
-        With multiple paragraphs.
-
-    *   Another item in the list.
-
-Output:
-
-    <ul>
-    <li><p>A list item.</p>
-    <p>With multiple paragraphs.</p></li>
-    <li><p>Another item in the list.</p></li>
-    </ul>
-    
-
-
-### Links ###
-
-Markdown supports two styles for creating links: *inline* and
-*reference*. With both styles, you use square brackets to delimit the
-text you want to turn into a link.
-
-Inline-style links use parentheses immediately after the link text.
-For example:
-
-    This is an [example link](http://example.com/).
-
-Output:
-
-    <p>This is an <a href="http://example.com/">
-    example link</a>.</p>
-
-Optionally, you may include a title attribute in the parentheses:
-
-    This is an [example link](http://example.com/ "With a Title").
-
-Output:
-
-    <p>This is an <a href="http://example.com/" title="With a Title">
-    example link</a>.</p>
-
-Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:
-
-    I get 10 times more traffic from [Google][1] than from
-    [Yahoo][2] or [MSN][3].
-
-    [1]: http://google.com/        "Google"
-    [2]: http://search.yahoo.com/  "Yahoo Search"
-    [3]: http://search.msn.com/    "MSN Search"
-
-Output:
-
-    <p>I get 10 times more traffic from <a href="http://google.com/"
-    title="Google">Google</a> than from <a href="http://search.yahoo.com/"
-    title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
-    title="MSN Search">MSN</a>.</p>
-
-The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are *not* case sensitive:
-
-    I start my morning with a cup of coffee and
-    [The New York Times][NY Times].
-
-    [ny times]: http://www.nytimes.com/
-
-Output:
-
-    <p>I start my morning with a cup of coffee and
-    <a href="http://www.nytimes.com/">The New York Times</a>.</p>
-
-
-### Images ###
-
-Image syntax is very much like link syntax.
-
-Inline (titles are optional):
-
-    ![alt text](/path/to/img.jpg "Title")
-
-Reference-style:
-
-    ![alt text][id]
-
-    [id]: /path/to/img.jpg "Title"
-
-Both of the above examples produce the same output:
-
-    <img src="/path/to/img.jpg" alt="alt text" title="Title" />
-
-
-
-### Code ###
-
-In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (`&`) and angle brackets (`<` or
-`>`) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:
-
-    I strongly recommend against using any `<blink>` tags.
-
-    I wish SmartyPants used named entities like `&mdash;`
-    instead of decimal-encoded entities like `&#8212;`.
-
-Output:
-
-    <p>I strongly recommend against using any
-    <code>&lt;blink&gt;</code> tags.</p>
-    
-    <p>I wish SmartyPants used named entities like
-    <code>&amp;mdash;</code> instead of decimal-encoded
-    entities like <code>&amp;#8212;</code>.</p>
-
-
-To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, `&`, `<`,
-and `>` characters will be escaped automatically.
-
-Markdown:
-
-    If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:
-
-        <blockquote>
-            <p>For example.</p>
-        </blockquote>
-
-Output:
-
-    <p>If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:</p>
-    
-    <pre><code>&lt;blockquote&gt;
-        &lt;p&gt;For example.&lt;/p&gt;
-    &lt;/blockquote&gt;
-    </code></pre>
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text
deleted file mode 100644
index 2fe1e3f00e3..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text	
+++ /dev/null
@@ -1,888 +0,0 @@
-Markdown: Syntax
-================
-
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-*   [Overview](#overview)
-    *   [Philosophy](#philosophy)
-    *   [Inline HTML](#html)
-    *   [Automatic Escaping for Special Characters](#autoescape)
-*   [Block Elements](#block)
-    *   [Paragraphs and Line Breaks](#p)
-    *   [Headers](#header)
-    *   [Blockquotes](#blockquote)
-    *   [Lists](#list)
-    *   [Code Blocks](#precode)
-    *   [Horizontal Rules](#hr)
-*   [Span Elements](#span)
-    *   [Links](#link)
-    *   [Emphasis](#em)
-    *   [Code](#code)
-    *   [Images](#img)
-*   [Miscellaneous](#misc)
-    *   [Backslash Escapes](#backslash)
-    *   [Automatic Links](#autolink)
-
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL][src].
-
-  [src]: /projects/markdown/syntax.text
-
-* * *
-
-<h2 id="overview">Overview</h2>
-
-<h3 id="philosophy">Philosophy</h3>
-
-Markdown is intended to be as easy-to-read and easy-to-write as is feasible.
-
-Readability, however, is emphasized above all else. A Markdown-formatted
-document should be publishable as-is, as plain text, without looking
-like it's been marked up with tags or formatting instructions. While
-Markdown's syntax has been influenced by several existing text-to-HTML
-filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
-[Grutatext] [5], and [EtText] [6] -- the single biggest source of
-inspiration for Markdown's syntax is the format of plain text email.
-
-  [1]: http://docutils.sourceforge.net/mirror/setext.html
-  [2]: http://www.aaronsw.com/2002/atx/
-  [3]: http://textism.com/tools/textile/
-  [4]: http://docutils.sourceforge.net/rst.html
-  [5]: http://www.triptico.com/software/grutatxt.html
-  [6]: http://ettext.taint.org/doc/
-
-To this end, Markdown's syntax is comprised entirely of punctuation
-characters, which punctuation characters have been carefully chosen so
-as to look like what they mean. E.g., asterisks around a word actually
-look like \*emphasis\*. Markdown lists look like, well, lists. Even
-blockquotes look like quoted passages of text, assuming you've ever
-used email.
-
-
-
-<h3 id="html">Inline HTML</h3>
-
-Markdown's syntax is intended for one purpose: to be used as a
-format for *writing* for the web.
-
-Markdown is not a replacement for HTML, or even close to it. Its
-syntax is very small, corresponding only to a very small subset of
-HTML tags. The idea is *not* to create a syntax that makes it easier
-to insert HTML tags. In my opinion, HTML tags are already easy to
-insert. The idea for Markdown is to make it easy to read, write, and
-edit prose. HTML is a *publishing* format; Markdown is a *writing*
-format. Thus, Markdown's formatting syntax only addresses issues that
-can be conveyed in plain text.
-
-For any markup that is not covered by Markdown's syntax, you simply
-use HTML itself. There's no need to preface it or delimit it to
-indicate that you're switching from Markdown to HTML; you just use
-the tags.
-
-The only restrictions are that block-level HTML elements -- e.g. `<div>`,
-`<table>`, `<pre>`, `<p>`, etc. -- must be separated from surrounding
-content by blank lines, and the start and end tags of the block should
-not be indented with tabs or spaces. Markdown is smart enough not
-to add extra (unwanted) `<p>` tags around HTML block-level tags.
-
-For example, to add an HTML table to a Markdown article:
-
-    This is a regular paragraph.
-
-    <table>
-        <tr>
-            <td>Foo</td>
-        </tr>
-    </table>
-
-    This is another regular paragraph.
-
-Note that Markdown formatting syntax is not processed within block-level
-HTML tags. E.g., you can't use Markdown-style `*emphasis*` inside an
-HTML block.
-
-Span-level HTML tags -- e.g. `<span>`, `<cite>`, or `<del>` -- can be
-used anywhere in a Markdown paragraph, list item, or header. If you
-want, you can even use HTML tags instead of Markdown formatting; e.g. if
-you'd prefer to use HTML `<a>` or `<img>` tags instead of Markdown's
-link or image syntax, go right ahead.
-
-Unlike block-level HTML tags, Markdown syntax *is* processed within
-span-level tags.
-
-
-<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
-
-In HTML, there are two characters that demand special treatment: `<`
-and `&`. Left angle brackets are used to start tags; ampersands are
-used to denote HTML entities. If you want to use them as literal
-characters, you must escape them as entities, e.g. `&lt;`, and
-`&amp;`.
-
-Ampersands in particular are bedeviling for web writers. If you want to
-write about 'AT&T', you need to write '`AT&amp;T`'. You even need to
-escape ampersands within URLs. Thus, if you want to link to:
-
-    http://images.google.com/images?num=30&q=larry+bird
-
-you need to encode the URL as:
-
-    http://images.google.com/images?num=30&amp;q=larry+bird
-
-in your anchor tag `href` attribute. Needless to say, this is easy to
-forget, and is probably the single most common source of HTML validation
-errors in otherwise well-marked-up web sites.
-
-Markdown allows you to use these characters naturally, taking care of
-all the necessary escaping for you. If you use an ampersand as part of
-an HTML entity, it remains unchanged; otherwise it will be translated
-into `&amp;`.
-
-So, if you want to include a copyright symbol in your article, you can write:
-
-    &copy;
-
-and Markdown will leave it alone. But if you write:
-
-    AT&T
-
-Markdown will translate it to:
-
-    AT&amp;T
-
-Similarly, because Markdown supports [inline HTML](#html), if you use
-angle brackets as delimiters for HTML tags, Markdown will treat them as
-such. But if you write:
-
-    4 < 5
-
-Markdown will translate it to:
-
-    4 &lt; 5
-
-However, inside Markdown code spans and blocks, angle brackets and
-ampersands are *always* encoded automatically. This makes it easy to use
-Markdown to write about HTML code. (As opposed to raw HTML, which is a
-terrible format for writing about HTML syntax, because every single `<`
-and `&` in your example code needs to be escaped.)
-
-
-* * *
-
-
-<h2 id="block">Block Elements</h2>
-
-
-<h3 id="p">Paragraphs and Line Breaks</h3>
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing but spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-The implication of the "one or more consecutive lines of text" rule is
-that Markdown supports "hard-wrapped" text paragraphs. This differs
-significantly from most other text-to-HTML formatters (including Movable
-Type's "Convert Line Breaks" option) which translate every line break
-character in a paragraph into a `<br />` tag.
-
-When you *do* want to insert a `<br />` break tag using Markdown, you
-end a line with two or more spaces, then type return.
-
-Yes, this takes a tad more effort to create a `<br />`, but a simplistic
-"every line break is a `<br />`" rule wouldn't work for Markdown.
-Markdown's email-style [blockquoting][bq] and multi-paragraph [list items][l]
-work best -- and look better -- when you format them with hard breaks.
-
-  [bq]: #blockquote
-  [l]:  #list
-
-
-
-<h3 id="header">Headers</h3>
-
-Markdown supports two styles of headers, [Setext] [1] and [atx] [2].
-
-Setext-style headers are "underlined" using equal signs (for first-level
-headers) and dashes (for second-level headers). For example:
-
-    This is an H1
-    =============
-
-    This is an H2
-    -------------
-
-Any number of underlining `=`'s or `-`'s will work.
-
-Atx-style headers use 1-6 hash characters at the start of the line,
-corresponding to header levels 1-6. For example:
-
-    # This is an H1
-
-    ## This is an H2
-
-    ###### This is an H6
-
-Optionally, you may "close" atx-style headers. This is purely
-cosmetic -- you can use this if you think it looks better. The
-closing hashes don't even need to match the number of hashes
-used to open the header. (The number of opening hashes
-determines the header level.) :
-
-    # This is an H1 #
-
-    ## This is an H2 ##
-
-    ### This is an H3 ######
-
-
-<h3 id="blockquote">Blockquotes</h3>
-
-Markdown uses email-style `>` characters for blockquoting. If you're
-familiar with quoting passages of text in an email message, then you
-know how to create a blockquote in Markdown. It looks best if you hard
-wrap the text and put a `>` before every line:
-
-    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-    > consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-    > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-    > 
-    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-    > id sem consectetuer libero luctus adipiscing.
-
-Markdown allows you to be lazy and only put the `>` before the first
-line of a hard-wrapped paragraph:
-
-    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-    consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-    Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-
-    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-    id sem consectetuer libero luctus adipiscing.
-
-Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
-adding additional levels of `>`:
-
-    > This is the first level of quoting.
-    >
-    > > This is nested blockquote.
-    >
-    > Back to the first level.
-
-Blockquotes can contain other Markdown elements, including headers, lists,
-and code blocks:
-
-	> ## This is a header.
-	> 
-	> 1.   This is the first list item.
-	> 2.   This is the second list item.
-	> 
-	> Here's some example code:
-	> 
-	>     return shell_exec("echo $input | $markdown_script");
-
-Any decent text editor should make email-style quoting easy. For
-example, with BBEdit, you can make a selection and choose Increase
-Quote Level from the Text menu.
-
-
-<h3 id="list">Lists</h3>
-
-Markdown supports ordered (numbered) and unordered (bulleted) lists.
-
-Unordered lists use asterisks, pluses, and hyphens -- interchangeably
--- as list markers:
-
-    *   Red
-    *   Green
-    *   Blue
-
-is equivalent to:
-
-    +   Red
-    +   Green
-    +   Blue
-
-and:
-
-    -   Red
-    -   Green
-    -   Blue
-
-Ordered lists use numbers followed by periods:
-
-    1.  Bird
-    2.  McHale
-    3.  Parish
-
-It's important to note that the actual numbers you use to mark the
-list have no effect on the HTML output Markdown produces. The HTML
-Markdown produces from the above list is:
-
-    <ol>
-    <li>Bird</li>
-    <li>McHale</li>
-    <li>Parish</li>
-    </ol>
-
-If you instead wrote the list in Markdown like this:
-
-    1.  Bird
-    1.  McHale
-    1.  Parish
-
-or even:
-
-    3. Bird
-    1. McHale
-    8. Parish
-
-you'd get the exact same HTML output. The point is, if you want to,
-you can use ordinal numbers in your ordered Markdown lists, so that
-the numbers in your source match the numbers in your published HTML.
-But if you want to be lazy, you don't have to.
-
-If you do use lazy list numbering, however, you should still start the
-list with the number 1. At some point in the future, Markdown may support
-starting ordered lists at an arbitrary number.
-
-List markers typically start at the left margin, but may be indented by
-up to three spaces. List markers must be followed by one or more spaces
-or a tab.
-
-To make lists look nice, you can wrap items with hanging indents:
-
-    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-        Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-        viverra nec, fringilla in, laoreet vitae, risus.
-    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-        Suspendisse id sem consectetuer libero luctus adipiscing.
-
-But if you want to be lazy, you don't have to:
-
-    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-    viverra nec, fringilla in, laoreet vitae, risus.
-    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-    Suspendisse id sem consectetuer libero luctus adipiscing.
-
-If list items are separated by blank lines, Markdown will wrap the
-items in `<p>` tags in the HTML output. For example, this input:
-
-    *   Bird
-    *   Magic
-
-will turn into:
-
-    <ul>
-    <li>Bird</li>
-    <li>Magic</li>
-    </ul>
-
-But this:
-
-    *   Bird
-
-    *   Magic
-
-will turn into:
-
-    <ul>
-    <li><p>Bird</p></li>
-    <li><p>Magic</p></li>
-    </ul>
-
-List items may consist of multiple paragraphs. Each subsequent
-paragraph in a list item must be intended by either 4 spaces
-or one tab:
-
-    1.  This is a list item with two paragraphs. Lorem ipsum dolor
-        sit amet, consectetuer adipiscing elit. Aliquam hendrerit
-        mi posuere lectus.
-
-        Vestibulum enim wisi, viverra nec, fringilla in, laoreet
-        vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
-        sit amet velit.
-
-    2.  Suspendisse id sem consectetuer libero luctus adipiscing.
-
-It looks nice if you indent every line of the subsequent
-paragraphs, but here again, Markdown will allow you to be
-lazy:
-
-    *   This is a list item with two paragraphs.
-
-        This is the second paragraph in the list item. You're
-    only required to indent the first line. Lorem ipsum dolor
-    sit amet, consectetuer adipiscing elit.
-
-    *   Another item in the same list.
-
-To put a blockquote within a list item, the blockquote's `>`
-delimiters need to be indented:
-
-    *   A list item with a blockquote:
-
-        > This is a blockquote
-        > inside a list item.
-
-To put a code block within a list item, the code block needs
-to be indented *twice* -- 8 spaces or two tabs:
-
-    *   A list item with a code block:
-
-            <code goes here>
-
-
-It's worth noting that it's possible to trigger an ordered list by
-accident, by writing something like this:
-
-    1986. What a great season.
-
-In other words, a *number-period-space* sequence at the beginning of a
-line. To avoid this, you can backslash-escape the period:
-
-    1986\. What a great season.
-
-
-
-<h3 id="precode">Code Blocks</h3>
-
-Pre-formatted code blocks are used for writing about programming or
-markup source code. Rather than forming normal paragraphs, the lines
-of a code block are interpreted literally. Markdown wraps a code block
-in both `<pre>` and `<code>` tags.
-
-To produce a code block in Markdown, simply indent every line of the
-block by at least 4 spaces or 1 tab. For example, given this input:
-
-    This is a normal paragraph:
-
-        This is a code block.
-
-Markdown will generate:
-
-    <p>This is a normal paragraph:</p>
-
-    <pre><code>This is a code block.
-    </code></pre>
-
-One level of indentation -- 4 spaces or 1 tab -- is removed from each
-line of the code block. For example, this:
-
-    Here is an example of AppleScript:
-
-        tell application "Foo"
-            beep
-        end tell
-
-will turn into:
-
-    <p>Here is an example of AppleScript:</p>
-
-    <pre><code>tell application "Foo"
-        beep
-    end tell
-    </code></pre>
-
-A code block continues until it reaches a line that is not indented
-(or the end of the article).
-
-Within a code block, ampersands (`&`) and angle brackets (`<` and `>`)
-are automatically converted into HTML entities. This makes it very
-easy to include example HTML source code using Markdown -- just paste
-it and indent it, and Markdown will handle the hassle of encoding the
-ampersands and angle brackets. For example, this:
-
-        <div class="footer">
-            &copy; 2004 Foo Corporation
-        </div>
-
-will turn into:
-
-    <pre><code>&lt;div class="footer"&gt;
-        &amp;copy; 2004 Foo Corporation
-    &lt;/div&gt;
-    </code></pre>
-
-Regular Markdown syntax is not processed within code blocks. E.g.,
-asterisks are just literal asterisks within a code block. This means
-it's also easy to use Markdown to write about Markdown's own syntax.
-
-
-
-<h3 id="hr">Horizontal Rules</h3>
-
-You can produce a horizontal rule tag (`<hr />`) by placing three or
-more hyphens, asterisks, or underscores on a line by themselves. If you
-wish, you may use spaces between the hyphens or asterisks. Each of the
-following lines will produce a horizontal rule:
-
-    * * *
-
-    ***
-
-    *****
-	
-    - - -
-
-    ---------------------------------------
-
-	_ _ _
-
-
-* * *
-
-<h2 id="span">Span Elements</h2>
-
-<h3 id="link">Links</h3>
-
-Markdown supports two style of links: *inline* and *reference*.
-
-In both styles, the link text is delimited by [square brackets].
-
-To create an inline link, use a set of regular parentheses immediately
-after the link text's closing square bracket. Inside the parentheses,
-put the URL where you want the link to point, along with an *optional*
-title for the link, surrounded in quotes. For example:
-
-    This is [an example](http://example.com/ "Title") inline link.
-
-    [This link](http://example.net/) has no title attribute.
-
-Will produce:
-
-    <p>This is <a href="http://example.com/" title="Title">
-    an example</a> inline link.</p>
-
-    <p><a href="http://example.net/">This link</a> has no
-    title attribute.</p>
-
-If you're referring to a local resource on the same server, you can
-use relative paths:
-
-    See my [About](/about/) page for details.
-
-Reference-style links use a second set of square brackets, inside
-which you place a label of your choosing to identify the link:
-
-    This is [an example][id] reference-style link.
-
-You can optionally use a space to separate the sets of brackets:
-
-    This is [an example] [id] reference-style link.
-
-Then, anywhere in the document, you define your link label like this,
-on a line by itself:
-
-    [id]: http://example.com/  "Optional Title Here"
-
-That is:
-
-*   Square brackets containing the link identifier (optionally
-    indented from the left margin using up to three spaces);
-*   followed by a colon;
-*   followed by one or more spaces (or tabs);
-*   followed by the URL for the link;
-*   optionally followed by a title attribute for the link, enclosed
-    in double or single quotes.
-
-The link URL may, optionally, be surrounded by angle brackets:
-
-    [id]: <http://example.com/>  "Optional Title Here"
-
-You can put the title attribute on the next line and use extra spaces
-or tabs for padding, which tends to look better with longer URLs:
-
-    [id]: http://example.com/longish/path/to/resource/here
-        "Optional Title Here"
-
-Link definitions are only used for creating links during Markdown
-processing, and are stripped from your document in the HTML output.
-
-Link definition names may consist of letters, numbers, spaces, and punctuation -- but they are *not* case sensitive. E.g. these two links:
-
-	[link text][a]
-	[link text][A]
-
-are equivalent.
-
-The *implicit link name* shortcut allows you to omit the name of the
-link, in which case the link text itself is used as the name.
-Just use an empty set of square brackets -- e.g., to link the word
-"Google" to the google.com web site, you could simply write:
-
-	[Google][]
-
-And then define the link:
-
-	[Google]: http://google.com/
-
-Because link names may contain spaces, this shortcut even works for
-multiple words in the link text:
-
-	Visit [Daring Fireball][] for more information.
-
-And then define the link:
-	
-	[Daring Fireball]: http://daringfireball.net/
-
-Link definitions can be placed anywhere in your Markdown document. I
-tend to put them immediately after each paragraph in which they're
-used, but if you want, you can put them all at the end of your
-document, sort of like footnotes.
-
-Here's an example of reference links in action:
-
-    I get 10 times more traffic from [Google] [1] than from
-    [Yahoo] [2] or [MSN] [3].
-
-      [1]: http://google.com/        "Google"
-      [2]: http://search.yahoo.com/  "Yahoo Search"
-      [3]: http://search.msn.com/    "MSN Search"
-
-Using the implicit link name shortcut, you could instead write:
-
-    I get 10 times more traffic from [Google][] than from
-    [Yahoo][] or [MSN][].
-
-      [google]: http://google.com/        "Google"
-      [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
-      [msn]:    http://search.msn.com/    "MSN Search"
-
-Both of the above examples will produce the following HTML output:
-
-    <p>I get 10 times more traffic from <a href="http://google.com/"
-    title="Google">Google</a> than from
-    <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
-    or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>
-
-For comparison, here is the same paragraph written using
-Markdown's inline link style:
-
-    I get 10 times more traffic from [Google](http://google.com/ "Google")
-    than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
-    [MSN](http://search.msn.com/ "MSN Search").
-
-The point of reference-style links is not that they're easier to
-write. The point is that with reference-style links, your document
-source is vastly more readable. Compare the above examples: using
-reference-style links, the paragraph itself is only 81 characters
-long; with inline-style links, it's 176 characters; and as raw HTML,
-it's 234 characters. In the raw HTML, there's more markup than there
-is text.
-
-With Markdown's reference-style links, a source document much more
-closely resembles the final output, as rendered in a browser. By
-allowing you to move the markup-related metadata out of the paragraph,
-you can add links without interrupting the narrative flow of your
-prose.
-
-
-<h3 id="em">Emphasis</h3>
-
-Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
-emphasis. Text wrapped with one `*` or `_` will be wrapped with an
-HTML `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML
-`<strong>` tag. E.g., this input:
-
-    *single asterisks*
-
-    _single underscores_
-
-    **double asterisks**
-
-    __double underscores__
-
-will produce:
-
-    <em>single asterisks</em>
-
-    <em>single underscores</em>
-
-    <strong>double asterisks</strong>
-
-    <strong>double underscores</strong>
-
-You can use whichever style you prefer; the lone restriction is that
-the same character must be used to open and close an emphasis span.
-
-Emphasis can be used in the middle of a word:
-
-    un*fucking*believable
-
-But if you surround an `*` or `_` with spaces, it'll be treated as a
-literal asterisk or underscore.
-
-To produce a literal asterisk or underscore at a position where it
-would otherwise be used as an emphasis delimiter, you can backslash
-escape it:
-
-    \*this text is surrounded by literal asterisks\*
-
-
-
-<h3 id="code">Code</h3>
-
-To indicate a span of code, wrap it with backtick quotes (`` ` ``).
-Unlike a pre-formatted code block, a code span indicates code within a
-normal paragraph. For example:
-
-    Use the `printf()` function.
-
-will produce:
-
-    <p>Use the <code>printf()</code> function.</p>
-
-To include a literal backtick character within a code span, you can use
-multiple backticks as the opening and closing delimiters:
-
-    ``There is a literal backtick (`) here.``
-
-which will produce this:
-
-    <p><code>There is a literal backtick (`) here.</code></p>
-
-The backtick delimiters surrounding a code span may include spaces --
-one after the opening, one before the closing. This allows you to place
-literal backtick characters at the beginning or end of a code span:
-
-	A single backtick in a code span: `` ` ``
-	
-	A backtick-delimited string in a code span: `` `foo` ``
-
-will produce:
-
-	<p>A single backtick in a code span: <code>`</code></p>
-	
-	<p>A backtick-delimited string in a code span: <code>`foo`</code></p>
-
-With a code span, ampersands and angle brackets are encoded as HTML
-entities automatically, which makes it easy to include example HTML
-tags. Markdown will turn this:
-
-    Please don't use any `<blink>` tags.
-
-into:
-
-    <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
-
-You can write this:
-
-    `&#8212;` is the decimal-encoded equivalent of `&mdash;`.
-
-to produce:
-
-    <p><code>&amp;#8212;</code> is the decimal-encoded
-    equivalent of <code>&amp;mdash;</code>.</p>
-
-
-
-<h3 id="img">Images</h3>
-
-Admittedly, it's fairly difficult to devise a "natural" syntax for
-placing images into a plain text document format.
-
-Markdown uses an image syntax that is intended to resemble the syntax
-for links, allowing for two styles: *inline* and *reference*.
-
-Inline image syntax looks like this:
-
-    ![Alt text](/path/to/img.jpg)
-
-    ![Alt text](/path/to/img.jpg "Optional title")
-
-That is:
-
-*   An exclamation mark: `!`;
-*   followed by a set of square brackets, containing the `alt`
-    attribute text for the image;
-*   followed by a set of parentheses, containing the URL or path to
-    the image, and an optional `title` attribute enclosed in double
-    or single quotes.
-
-Reference-style image syntax looks like this:
-
-    ![Alt text][id]
-
-Where "id" is the name of a defined image reference. Image references
-are defined using syntax identical to link references:
-
-    [id]: url/to/image  "Optional title attribute"
-
-As of this writing, Markdown has no syntax for specifying the
-dimensions of an image; if this is important to you, you can simply
-use regular HTML `<img>` tags.
-
-
-* * *
-
-
-<h2 id="misc">Miscellaneous</h2>
-
-<h3 id="autolink">Automatic Links</h3>
-
-Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:
-
-    <http://example.com/>
-    
-Markdown will turn this into:
-
-    <a href="http://example.com/">http://example.com/</a>
-
-Automatic links for email addresses work similarly, except that
-Markdown will also perform a bit of randomized decimal and hex
-entity-encoding to help obscure your address from address-harvesting
-spambots. For example, Markdown will turn this:
-
-    <address@example.com>
-
-into something like this:
-
-    <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
-    &#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
-    &#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
-    &#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>
-
-which will render in a browser as a clickable link to "address@example.com".
-
-(This sort of entity-encoding trick will indeed fool many, if not
-most, address-harvesting bots, but it definitely won't fool all of
-them. It's better than nothing, but an address published in this way
-will probably eventually start receiving spam.)
-
-
-
-<h3 id="backslash">Backslash Escapes</h3>
-
-Markdown allows you to use backslash escapes to generate literal
-characters which would otherwise have special meaning in Markdown's
-formatting syntax. For example, if you wanted to surround a word with
-literal asterisks (instead of an HTML `<em>` tag), you can backslashes
-before the asterisks, like this:
-
-    \*literal asterisks\*
-
-Markdown provides backslash escapes for the following characters:
-
-    \   backslash
-    `   backtick
-    *   asterisk
-    _   underscore
-    {}  curly braces
-    []  square brackets
-    ()  parentheses
-    #   hash mark
-	+	plus sign
-	-	minus sign (hyphen)
-    .   dot
-    !   exclamation mark
-
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text
deleted file mode 100644
index ed3c624ffbe..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text	
+++ /dev/null
@@ -1,5 +0,0 @@
-> foo
->
-> > bar
->
-> foo
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text
deleted file mode 100644
index 7f3b49777f2..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text	
+++ /dev/null
@@ -1,131 +0,0 @@
-## Unordered
-
-Asterisks tight:
-
-*	asterisk 1
-*	asterisk 2
-*	asterisk 3
-
-
-Asterisks loose:
-
-*	asterisk 1
-
-*	asterisk 2
-
-*	asterisk 3
-
-* * *
-
-Pluses tight:
-
-+	Plus 1
-+	Plus 2
-+	Plus 3
-
-
-Pluses loose:
-
-+	Plus 1
-
-+	Plus 2
-
-+	Plus 3
-
-* * *
-
-
-Minuses tight:
-
--	Minus 1
--	Minus 2
--	Minus 3
-
-
-Minuses loose:
-
--	Minus 1
-
--	Minus 2
-
--	Minus 3
-
-
-## Ordered
-
-Tight:
-
-1.	First
-2.	Second
-3.	Third
-
-and:
-
-1. One
-2. Two
-3. Three
-
-
-Loose using tabs:
-
-1.	First
-
-2.	Second
-
-3.	Third
-
-and using spaces:
-
-1. One
-
-2. Two
-
-3. Three
-
-Multiple paragraphs:
-
-1.	Item 1, graf one.
-
-	Item 2. graf two. The quick brown fox jumped over the lazy dog's
-	back.
-	
-2.	Item 2.
-
-3.	Item 3.
-
-
-
-## Nested
-
-*	Tab
-	*	Tab
-		*	Tab
-
-Here's another:
-
-1. First
-2. Second:
-	* Fee
-	* Fie
-	* Foe
-3. Third
-
-Same thing but with paragraphs:
-
-1. First
-
-2. Second:
-	* Fee
-	* Fie
-	* Foe
-
-3. Third
-
-
-This was an error in Markdown 1.0.1:
-
-*	this
-
-	*	sub
-
-	that
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Strong and em together.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Strong and em together.text
deleted file mode 100644
index 95ee690dbe2..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Strong and em together.text	
+++ /dev/null
@@ -1,7 +0,0 @@
-***This is strong and em.***
-
-So is ***this*** word.
-
-___This is strong and em.___
-
-So is ___this___ word.
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Tabs.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Tabs.text
deleted file mode 100644
index 589d1136e19..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Tabs.text
+++ /dev/null
@@ -1,21 +0,0 @@
-+	this is a list item
-	indented with tabs
-
-+   this is a list item
-    indented with spaces
-
-Code:
-
-	this code block is indented by one tab
-
-And:
-
-		this code block is indented by two tabs
-
-And:
-
-	+	this is an example list item
-		indented with tabs
-	
-	+   this is an example list item
-	    indented with spaces
diff --git a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Tidiness.text b/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Tidiness.text
deleted file mode 100644
index 5f18b8da214..00000000000
--- a/test/mri/rdoc/rdoc/MarkdownTest_1.0.3/Tidiness.text
+++ /dev/null
@@ -1,5 +0,0 @@
-> A list within a blockquote:
-> 
-> *	asterisk 1
-> *	asterisk 2
-> *	asterisk 3
diff --git a/test/mri/rdoc/rdoc/README b/test/mri/rdoc/rdoc/README
deleted file mode 100644
index 4ef17a77f77..00000000000
--- a/test/mri/rdoc/rdoc/README
+++ /dev/null
@@ -1 +0,0 @@
-you don't have to
diff --git a/test/mri/rdoc/rdoc/binary.dat b/test/mri/rdoc/rdoc/binary.dat
deleted file mode 100644
index 371950efe69..00000000000
Binary files a/test/mri/rdoc/rdoc/binary.dat and /dev/null differ
diff --git a/test/mri/rdoc/rdoc/helper.rb b/test/mri/rdoc/rdoc/helper.rb
deleted file mode 100644
index 79854330604..00000000000
--- a/test/mri/rdoc/rdoc/helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'support/test_case'
-require_relative 'support/formatter_test_case'
-require_relative 'support/text_formatter_test_case'
diff --git a/test/mri/rdoc/rdoc/hidden.zip.txt b/test/mri/rdoc/rdoc/hidden.zip.txt
deleted file mode 100644
index 2400e38b7de..00000000000
--- a/test/mri/rdoc/rdoc/hidden.zip.txt
+++ /dev/null
@@ -1 +0,0 @@
-PK
diff --git a/test/mri/rdoc/rdoc/rdoc_alias_test.rb b/test/mri/rdoc/rdoc/rdoc_alias_test.rb
deleted file mode 100644
index 827002e729c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_alias_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocAliasTest < XrefTestCase
-
-  def test_to_s
-    a = RDoc::Alias.new nil, 'a', 'b', ''
-    a.parent = @c2
-
-    assert_equal 'alias: b -> #a in: RDoc::NormalClass C2 < Object', a.to_s
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_any_method_test.rb b/test/mri/rdoc/rdoc/rdoc_any_method_test.rb
deleted file mode 100644
index e963a3a3453..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_any_method_test.rb
+++ /dev/null
@@ -1,609 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocAnyMethodTest < XrefTestCase
-
-  def test_aref
-    m = RDoc::AnyMethod.new nil, 'method?'
-
-    assert_equal 'method-i-method-3F', m.aref
-
-    m.singleton = true
-
-    assert_equal 'method-c-method-3F', m.aref
-  end
-
-  def test_arglists
-    m = RDoc::AnyMethod.new nil, 'method'
-
-    assert_nil m.arglists
-
-    m.params = "(a, b)"
-    m.block_params = "c, d"
-
-    assert_equal "method(a, b) { |c, d| ... }", m.arglists
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq.dup
-
-    assert_equal call_seq, m.arglists
-  end
-
-  def test_c_function
-    @c1_m.c_function = 'my_c1_m'
-
-    assert_equal 'my_c1_m', @c1_m.c_function
-  end
-
-  def test_call_seq_equals
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = ''
-
-    assert_nil m.call_seq
-
-    m.call_seq = 'foo'
-
-    assert_equal 'foo', m.call_seq
-  end
-
-  def test_call_seq_alias_for
-    a = RDoc::AnyMethod.new nil, "each"
-    m = RDoc::AnyMethod.new nil, "each_line"
-
-    a.call_seq = <<-CALLSEQ
-each(foo)
-each_line(foo)
-    CALLSEQ
-
-    m.is_alias_for = a
-
-    assert_equal "each_line(foo)", m.call_seq
-  end
-
-  def test_full_name
-    assert_equal 'C1::m', @c1.method_list.first.full_name
-  end
-
-  def test_has_call_seq?
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m2 = RDoc::AnyMethod.new nil, "each"
-    assert_equal false, m.has_call_seq?
-    m.call_seq = "each_line()"
-    assert_equal true, m.has_call_seq?
-
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m.is_alias_for = m2
-    assert_equal false, m.has_call_seq?
-    m2.call_seq = "each_line()"
-    assert_equal true, m.has_call_seq?
-  end
-
-  def test_is_alias_for
-    assert_equal @c2_b, @c2_a.is_alias_for
-
-    # set string on instance variable
-    loaded = Marshal.load Marshal.dump @c2_a
-
-    loaded.store = @store
-
-    assert_equal @c2_b, loaded.is_alias_for, 'Marshal.load'
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.store = @store
-    m1.instance_variable_set :@is_alias_for, ['Missing', false, 'method']
-
-    assert_nil m1.is_alias_for, 'missing alias'
-  end
-
-  def test_call_seq_handles_aliases
-    # see 0ead786
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-
-    method_with_call_seq = RDoc::AnyMethod.new(nil, "method_with_call_seq")
-    method_with_call_seq.call_seq = <<~SEQ
-      method_with_call_seq(a)
-      method_with_call_seq(a, b)
-      alias_to_method(a)
-      alias_to_method(a, b)
-    SEQ
-    cm.add_method(method_with_call_seq)
-
-    alias_to_method = method_with_call_seq.add_alias(
-      RDoc::Alias.new(nil, "method_with_call_seq", "alias_to_method", "comment"),
-      cm
-    )
-
-    assert_equal("method_with_call_seq(a)\nmethod_with_call_seq(a, b)",
-                 method_with_call_seq.call_seq)
-    assert_equal("alias_to_method(a)\nalias_to_method(a, b)",
-                 alias_to_method.call_seq)
-  end
-
-  def test_call_seq_returns_nil_if_alias_is_missing_from_call_seq
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-
-    method_with_call_seq = RDoc::AnyMethod.new(nil, "method_with_call_seq")
-    method_with_call_seq.call_seq = <<~SEQ
-      method_with_call_seq(a)
-      method_with_call_seq(a, b)
-    SEQ
-    cm.add_method(method_with_call_seq)
-
-    alias_to_method = method_with_call_seq.add_alias(
-      RDoc::Alias.new(nil, "method_with_call_seq", "alias_to_method", "comment"),
-      cm
-    )
-
-    assert_equal("method_with_call_seq(a)\nmethod_with_call_seq(a, b)",
-                 method_with_call_seq.call_seq)
-    assert_nil(alias_to_method.call_seq)
-  end
-
-  def test_markup_code
-    tokens = [
-      { :line_no => 0, :char_no => 0, :kind => :on_const, :text => 'CONSTANT' },
-    ]
-
-    @c2_a.collect_tokens
-    @c2_a.add_tokens(tokens)
-
-    expected = '<span class="ruby-constant">CONSTANT</span>'
-
-    assert_equal expected, @c2_a.markup_code
-  end
-
-  def test_markup_code_with_line_numbers
-    position_comment = "# File #{@file_name}, line 1"
-    tokens = [
-      { :line_no => 1, :char_no => 0, :kind => :on_comment, :text => position_comment },
-      { :line_no => 1, :char_no => position_comment.size, :kind => :on_nl, :text => "\n" },
-      { :line_no => 2, :char_no => 0, :kind => :on_const, :text => 'A' },
-      { :line_no => 2, :char_no => 1, :kind => :on_nl, :text => "\n" },
-      { :line_no => 3, :char_no => 0, :kind => :on_const, :text => 'B' }
-    ]
-
-    @c2_a.collect_tokens
-    @c2_a.add_tokens(tokens)
-
-    assert_equal <<-EXPECTED.chomp, @c2_a.markup_code
-<span class="ruby-comment"># File xref_data.rb, line 1</span>
-<span class="ruby-constant">A</span>
-<span class="ruby-constant">B</span>
-    EXPECTED
-
-    @c2_a.options.line_numbers = true
-    assert_equal <<-EXPECTED.chomp, @c2_a.markup_code
-  <span class="ruby-comment"># File xref_data.rb</span>
-<span class="line-num">1</span> <span class="ruby-constant">A</span>
-<span class="line-num">2</span> <span class="ruby-constant">B</span>
-    EXPECTED
-  end
-
-  def test_markup_code_empty
-    assert_equal '', @c2_a.markup_code
-  end
-
-  def test_markup_code_with_variable_expansion
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-    m.block_params = '"Hello, #{world}", yield_arg'
-    m.params = 'a'
-
-    assert_equal '(a) { |"Hello, #{world}", yield_arg| ... }', m.param_seq
-  end
-
-  def test_marshal_dump
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.block_params = 'some_block'
-    m.call_seq     = 'call_seq'
-    m.comment      = 'this is a comment'
-    m.params       = 'param'
-    m.record_location top_level
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load Marshal.dump m
-    loaded.store = @store
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_equal false,          loaded.singleton
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-  end
-
-  def test_marshal_load_aliased_method
-    aliased_method = Marshal.load Marshal.dump(@c2_a)
-
-    aliased_method.store = @store
-
-    assert_equal 'C2#a',  aliased_method.full_name
-    assert_equal 'C2',    aliased_method.parent_name
-    assert_equal '()',    aliased_method.params
-    assert_equal @c2_b,   aliased_method.is_alias_for, 'is_alias_for'
-    assert                aliased_method.display?
-  end
-
-  def test_marshal_load_aliased_method_with_nil_singleton
-    aliased_method = Marshal.load Marshal.dump(@c2_a)
-
-    aliased_method.store = @store
-    aliased_method.is_alias_for = ["C2", nil, "b"]
-
-    assert_equal 'C2#a',  aliased_method.full_name
-    assert_equal 'C2',    aliased_method.parent_name
-    assert_equal '()',    aliased_method.params
-    assert_equal @c2_b,   aliased_method.is_alias_for, 'is_alias_for'
-    assert                aliased_method.display?
-  end
-
-  def test_marshal_load_class_method
-    class_method = Marshal.load Marshal.dump(@c1.find_class_method_named 'm')
-
-    assert_equal 'C1::m', class_method.full_name
-    assert_equal 'C1',    class_method.parent_name
-    assert_equal '()',    class_method.params
-    assert                class_method.display?
-  end
-
-  def test_marshal_load_instance_method
-    instance_method = Marshal.load Marshal.dump(@c1.find_instance_method_named 'm')
-
-    assert_equal 'C1#m',  instance_method.full_name
-    assert_equal 'C1',    instance_method.parent_name
-    assert_equal '(foo)', instance_method.params
-    assert                instance_method.display?
-  end
-
-  def test_marshal_load_version_0
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
-                          "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
-                          "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-                          "\"\x16this is a comment\x06;\x06FI" +
-                          "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
-                          "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
-                          "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
-                          "\"\nparam\x06;\x06F"
-
-    loaded.store = @store
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal document,       loaded.comment.parse
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_nil                   loaded.singleton # defaults to nil
-    assert_equal :public,        loaded.visibility
-    assert_nil                   loaded.file
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-    assert_nil                   loaded.is_alias_for
-
-    assert loaded.display?
-  end
-
-  def test_marshal_dump_version_2
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.block_params = 'some_block'
-    m.call_seq     = 'call_seq'
-    m.comment      = 'this is a comment'
-    m.params       = 'param'
-    m.record_location top_level
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x14i\bI" +
-                          "\"\vmethod\x06:\x06ETI" +
-                          "\"\x11Klass#method\x06;\x06T0:\vpublic" +
-                          "o:\eRDoc::Markup::Document\b:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@file0" +
-                          ":0@omit_headings_from_table_of_contents_below0" +
-                          "I\"\rcall_seq\x06;\x06TI\"\x0Fsome_block\x06" +
-                          ";\x06T[\x06[\aI\"\faliased\x06;\x06To;\b\b;\t" +
-                          "[\x06o;\n\x06;\t[\x06I\"\x12alias comment\x06" +
-                          ";\x06T;\v0;\f0I\"\nparam\x06;\x06TI" +
-                          "\"\ffile.rb\x06;\x06TFI\"\nKlass\x06;\x06T" +
-                          "c\x16RDoc::ClassModule0"
-
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_nil                   loaded.singleton # defaults to nil
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-    assert_nil                   loaded.is_alias_for
-  end
-
-  def test_name
-    m = RDoc::AnyMethod.new nil, nil
-
-    assert_nil m.name
-  end
-
-  def test_name_call_seq
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = "yields(name)\nyields(name, description)"
-
-    assert_equal 'yields', m.name
-  end
-
-  def test_name_call_seq_dot
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = "obj.yields(name)\nobj.yields(name, description)"
-
-    assert_equal 'yields', m.name
-  end
-
-  def test_param_list_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.block_params = 'c, d'
-
-    assert_equal %w[c d], m.param_list
-  end
-
-  def test_param_list_call_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_default
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(b = default)'
-
-    assert_equal %w[b], m.param_list
-  end
-
-  def test_param_list_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b)'
-
-    assert_equal %w[a b], m.param_list
-  end
-
-  def test_param_list_params_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b)'
-    m.block_params = 'c, d'
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_empty_params_with_block
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '()'
-    m.block_params = 'a, b'
-
-    assert_equal %w[a b], m.param_list
-  end
-
-  def test_param_list_ampersand_param_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b, &block)'
-    m.block_params = 'c, d'
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_ampersand_param
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b, &block)'
-
-    assert_equal %w[a b block], m.param_list
-  end
-
-  def test_param_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-    m.params = 'a'
-
-    assert_equal '(a)', m.param_seq
-
-    m.params = '(a)'
-
-    assert_equal '(a)', m.param_seq
-
-    m.params = "(a,\n  b)"
-
-    assert_equal '(a, b)', m.param_seq
-
-    m.block_params = "c,\n  d"
-
-    assert_equal '(a, b) { |c, d| ... }', m.param_seq
-  end
-
-  def test_param_seq_call_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq
-
-    assert_equal '(a, b) { |c, d| }', m.param_seq
-
-  end
-
-  def test_parent_name
-    assert_equal 'C1', @c1.method_list.first.parent_name
-    assert_equal 'C1', @c1.method_list.last.parent_name
-  end
-
-  def test_skip_description?
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m2 = RDoc::AnyMethod.new nil, "each"
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m.is_alias_for = m2
-    m2.aliases << m
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m2.call_seq = "each()"
-    assert_equal true, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m2.call_seq = "each_line()"
-    assert_equal false, m.skip_description?
-    assert_equal true, m2.skip_description?
-
-    m2.call_seq = "each()\neach_line()"
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-  end
-
-  def test_store_equals
-    loaded = Marshal.load Marshal.dump(@c1.method_list.last)
-
-    loaded.store = @store
-
-    assert_equal @store, loaded.file.store
-  end
-
-  def test_superclass_method
-    m3 = RDoc::AnyMethod.new '', 'no_super'
-
-    m2 = RDoc::AnyMethod.new '', 'supers'
-    m2.calls_super = true
-
-    m1 = RDoc::AnyMethod.new '', 'supers'
-
-    c1 = RDoc::NormalClass.new 'Outer'
-    c1.store = @store
-    c1.add_method m1
-
-    c2 = RDoc::NormalClass.new 'Inner', c1
-    c2.store = @store
-    c2.add_method m2
-    c2.add_method m3
-
-    assert_nil m3.superclass_method,
-               'no superclass method for no_super'
-
-    assert_equal m1, m2.superclass_method,
-                 'superclass method missing for supers'
-  end
-
-  def test_superclass_method_multilevel
-    m2 = RDoc::AnyMethod.new '', 'supers'
-    m2.calls_super = true
-
-    m1 = RDoc::AnyMethod.new '', 'supers'
-
-    c1 = RDoc::NormalClass.new 'Outer'
-    c1.store = @store
-    c1.add_method m1
-
-    c2 = RDoc::NormalClass.new 'Middle', c1
-    c2.store = @store
-
-    c3 = RDoc::NormalClass.new 'Inner', c2
-    c3.store = @store
-    c3.add_method m2
-
-    assert_equal m1, m2.superclass_method,
-                 'superclass method missing for supers'
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_attr_test.rb b/test/mri/rdoc/rdoc/rdoc_attr_test.rb
deleted file mode 100644
index fcdbdfd422c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_attr_test.rb
+++ /dev/null
@@ -1,190 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocAttrTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @a = RDoc::Attr.new nil, 'attr', 'RW', ''
-  end
-
-  def test_aref
-    m = RDoc::Attr.new nil, 'attr', 'RW', nil
-
-    assert_equal 'attribute-i-attr', m.aref
-  end
-
-  def test_arglists
-    assert_nil @a.arglists
-  end
-
-  def test_block_params
-    assert_nil @a.block_params
-  end
-
-  def test_call_seq
-    assert_nil @a.call_seq
-  end
-
-  def test_definition
-    assert_equal 'attr_accessor', @a.definition
-
-    @a.rw = 'R'
-
-    assert_equal 'attr_reader', @a.definition
-
-    @a.rw = 'W'
-
-    assert_equal 'attr_writer', @a.definition
-  end
-
-  def test_full_name
-    assert_equal '(unknown)#attr', @a.full_name
-  end
-
-  def test_marshal_dump
-    tl = @store.add_file 'file.rb'
-
-    @a.comment = 'this is a comment'
-    @a.record_location tl
-
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    cm.add_attribute @a
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump @a
-    loaded.store = @store
-
-    assert_equal @a, loaded
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal document,      loaded.comment.parse
-    assert_equal 'file.rb',    loaded.file.relative_name
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-    assert_equal tl,           loaded.file
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-  end
-
-  def test_marshal_dump_singleton
-    tl = @store.add_file 'file.rb'
-
-    @a.comment = 'this is a comment'
-    @a.record_location tl
-
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    cm.add_attribute @a
-
-    section = cm.sections.first
-
-    @a.rw = 'R'
-    @a.singleton = true
-    @a.visibility = :protected
-
-    loaded = Marshal.load Marshal.dump @a
-    loaded.store = @store
-
-    assert_equal @a, loaded
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal document,      loaded.comment.parse
-    assert_equal 'Klass::attr', loaded.full_name
-    assert_equal 'attr',        loaded.name
-    assert_equal 'R',           loaded.rw
-    assert_equal true,          loaded.singleton
-    assert_equal :protected,    loaded.visibility
-    assert_equal tl,            loaded.file
-    assert_equal cm,            loaded.parent
-    assert_equal section,       loaded.section
-  end
-
-  def test_marshal_load_version_1
-    tl = @store.add_file 'file.rb'
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    data = "\x04\bU:\x0FRDoc::Attr[\fi\x06I\"\tattr\x06:\x06EF" +
-           "\"\x0FKlass#attrI\"\aRW\x06;\x06F:\vpublic" +
-           "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-           "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-           "\"\x16this is a comment\x06;\x06FF"
-
-    loaded = Marshal.load data
-    loaded.store = @store
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal document,     loaded.comment.parse
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-
-    # version 2
-    assert_nil                 loaded.file
-
-    # version 3
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-
-    assert                     loaded.display?
-  end
-
-  def test_marshal_load_version_2
-    tl = @store.add_file 'file.rb'
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    loaded = Marshal.load "\x04\bU:\x0FRDoc::Attr[\ri\aI\"\tattr\x06" +
-                          ":\x06ETI\"\x0FKlass#attr\x06;\x06TI\"\aRW\x06" +
-                          ";\x06T:\vpublico:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o:\x1CRDoc::Markup::Paragraph\x06;" +
-                          "\t[\x06I\"\x16this is a comment\x06;\x06T:\n" +
-                          "@file0FI\"\ffile.rb\x06;\x06T"
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal document,     loaded.comment.parse
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-    assert_equal tl,           loaded.file
-
-    # version 3
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-
-    assert loaded.display?
-  end
-
-  def test_params
-    assert_nil @a.params
-  end
-
-  def test_singleton
-    refute @a.singleton
-  end
-
-  def test_type
-    assert_equal 'instance', @a.type
-
-    @a.singleton = true
-    assert_equal 'class', @a.type
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_class_module_test.rb b/test/mri/rdoc/rdoc/rdoc_class_module_test.rb
deleted file mode 100644
index dec1a4c24b8..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_class_module_test.rb
+++ /dev/null
@@ -1,1706 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocClassModuleTest < XrefTestCase
-
-  def test_add_comment
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-    tl3 = @store.add_file 'three.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    comment_tl1 = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-    cm.add_comment comment_tl1, tl1
-
-    assert_equal [[comment_tl1, tl1]], cm.comment_location
-    assert_equal 'comment 1', cm.comment.text
-
-    comment_tl2 = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-    cm.add_comment comment_tl2, tl2
-
-    assert_equal [[comment_tl1, tl1], [comment_tl2, tl2]], cm.comment_location
-    assert_equal "comment 1\n---\ncomment 2", cm.comment
-
-    comment_tl3 = RDoc::Comment.new('# * comment 3', @top_level, :ruby)
-    cm.add_comment comment_tl3, tl3
-
-    assert_equal [[comment_tl1, tl1],
-                  [comment_tl2, tl2],
-                  [comment_tl3, tl3]], cm.comment_location
-    assert_equal "comment 1\n---\ncomment 2\n---\n* comment 3", cm.comment
-  end
-
-  def test_add_comment_comment
-    cm = RDoc::ClassModule.new 'Klass'
-
-    cm.add_comment comment('comment'), @top_level
-
-    assert_equal 'comment', cm.comment.text
-  end
-
-  def test_add_comment_duplicate
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    comment1 = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-    comment2 = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-    cm.add_comment comment1, tl1
-    cm.add_comment comment2, tl1
-
-    assert_equal [[comment1, tl1],
-                  [comment2, tl1]], cm.comment_location
-  end
-
-  def test_add_comment_stopdoc
-    tl = @store.add_file 'file.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.stop_doc
-
-    cm.add_comment '# comment 1', tl
-
-    assert_empty cm.comment
-  end
-
-  def test_ancestors
-    assert_equal [@parent, @object, "BasicObject"], @child.ancestors
-  end
-
-  def test_comment_equals
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-
-    assert_equal 'comment 1', cm.comment.to_s
-
-    cm.comment = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-
-    assert_equal "comment 1\n---\ncomment 2", cm.comment.to_s
-
-    cm.comment = RDoc::Comment.new('# * comment 3', @top_level, :ruby)
-
-    assert_equal "comment 1\n---\ncomment 2\n---\n* comment 3", cm.comment.to_s
-  end
-
-  def test_comment_equals_comment
-    cm = RDoc::ClassModule.new 'Klass'
-
-    cm.comment = comment 'comment'
-
-    assert_equal 'comment', cm.comment.text
-  end
-
-  def test_document_self_or_methods
-    assert @c1.document_self_or_methods
-
-    @c1.document_self = false
-
-    assert @c1.document_self_or_methods
-
-    @c1_plus.document_self = false
-    @c1_m.document_self = false
-
-    assert @c1.document_self_or_methods
-
-    @c1__m.document_self = false
-
-    refute @c1.document_self_or_methods
-  end
-
-  def test_documented_eh
-    cm = RDoc::ClassModule.new 'C'
-
-    refute cm.documented?, 'no comments, no markers'
-
-    cm.add_comment '', @top_level
-
-    refute cm.documented?, 'empty comment'
-
-    cm.add_comment 'hi', @top_level
-
-    assert cm.documented?, 'commented'
-
-    cm.comment_location.clear
-
-    refute cm.documented?, 'no comment'
-
-    cm.document_self = nil # notify :nodoc:
-
-    assert cm.documented?, ':nodoc:'
-  end
-
-  def test_each_ancestor
-    assert_equal [@parent, @object], @child.each_ancestor.to_a
-  end
-
-  def test_each_ancestor_cycle
-    m_incl = RDoc::Include.new 'M', nil
-
-    m = @top_level.add_module RDoc::NormalModule, 'M'
-    m.add_include m_incl
-
-    assert_empty m.each_ancestor.to_a
-  end
-
-  # handle making a short module alias of yourself
-
-  def test_find_class_named
-    @c2.classes_hash['C2'] = @c2
-
-    assert_nil @c2.find_class_named('C1')
-  end
-
-  def test_from_module_comment
-    tl = @store.add_file 'file.rb'
-    klass = tl.add_class RDoc::NormalModule, 'Klass'
-    klass.add_comment 'really a class', tl
-
-    klass = RDoc::ClassModule.from_module RDoc::NormalClass, klass
-
-    assert_equal [['really a class', tl]], klass.comment_location
-  end
-
-  def test_marshal_dump
-    @store.path = Dir.tmpdir
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.document_self = true
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', singleton: true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-    s0 = cm.sections.first
-    s1 = cm.add_section 'section', section_comment
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load Marshal.dump cm
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    document = RDoc::Markup::Document.new(inner)
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_equal [tl],               loaded.in_files
-    assert_equal 'Namespace',        loaded.parent.name
-
-    expected = { nil => s0, 'section' => s1 }
-    assert_equal expected, loaded.sections_hash
-
-    assert_equal tl, loaded.attributes.first.file
-
-    assert_equal tl, loaded.constants.first.file
-
-    assert_equal tl, loaded.includes.first.file
-
-    assert_equal tl, loaded.extends.first.file
-
-    assert_equal tl, loaded.method_list.first.file
-  end
-
-  def test_marshal_dump_visibility
-    @store.path = Dir.tmpdir
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a1.document_self = false
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-    m1.document_self = false
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-    c1.document_self = false
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-    i1.document_self = false
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-    e1.document_self = false
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-
-    cm.add_attribute a1
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load Marshal.dump cm
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    assert_empty loaded.attributes
-    assert_empty loaded.constants
-    assert_empty loaded.includes
-    assert_empty loaded.extends
-    assert_empty loaded.method_list
-  end
-
-  def test_marshal_load_version_0
-    tl = @store.add_file 'file.rb'
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-
-    a = RDoc::Attr.new(nil, 'a1', 'RW', '')
-    m = RDoc::AnyMethod.new(nil, 'm1')
-    c = RDoc::Constant.new('C1', nil, '')
-    i = RDoc::Include.new('I1', '')
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a
-    cm.add_method m
-    cm.add_constant c
-    cm.add_include i
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Ei\x00\"\nKlass" +
-                          "\"\x15Namespace::KlassI\"\nSuper\x06:\x06EF" +
-                          "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06F[\x06[\aI" +
-                          "\"\aa1\x06;\x06FI\"\aRW\x06;\x06F[\x06[\aI" +
-                          "\"\aC1\x06;\x06Fo;\a\x06;\b[\x00[\x06[\aI" +
-                          "\"\aI1\x06;\x06Fo;\a\x06;\b[\x00[\a[\aI" +
-                          "\"\nclass\x06;\x06F[\b[\a:\vpublic[\x00[\a" +
-                          ":\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\n[\x06I" +
-                          "\"\am1\x06;\x06F[\a;\v[\x00[\a;\f[\x00"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal [a],                loaded.attributes
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c],                loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i],                loaded.includes
-    assert_equal [m],                loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_nil                       loaded.file
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-
-    assert loaded.display?
-  end
-
-  def test_marshal_load_version_1
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', singleton: true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Ei\x06I\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    document = RDoc::Markup::Document.new(inner)
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_empty                     loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    assert_equal tl, loaded.attributes.first.file
-    assert_equal tl, loaded.constants.first.file
-    assert_equal tl, loaded.includes.first.file
-    assert_equal tl, loaded.method_list.first.file
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-  end
-
-  def test_marshal_load_version_2
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', singleton: true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Fi\aI\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    document = RDoc::Markup::Document.new(inner)
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    assert_equal tl, loaded.attributes. first.file
-    assert_equal tl, loaded.constants.  first.file
-    assert_equal tl, loaded.includes.   first.file
-    assert_equal tl, loaded.extends.    first.file
-    assert_equal tl, loaded.method_list.first.file
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-  end
-
-  def test_marshal_load_version_3
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', singleton: true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-    s0 = cm.sections.first
-    s1 = cm.add_section 'section', section_comment
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x13i\bI\"\nKlass" +
-                          "\x06:\x06ETI\"\x15Namespace::Klass\x06;\x06TI" +
-                          "\"\nSuper\x06;\x06To:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@fileI" +
-                          "\"\ffile.rb\x06;\x06T;\n0[\a[\nI\"\aa2\x06;" +
-                          "\x06TI\"\aRW\x06;\x06T:\vpublicT@\x11[\nI" +
-                          "\"\aa1\x06;\x06TI\"\aRW\x06;\x06T;\vF@\x11" +
-                          "[\x06U:\x13RDoc::Constant[\x0Fi\x00I\"\aC1\x06" +
-                          ";\x06TI\"\x19Namespace::Klass::C1\x06;\x06T00o" +
-                          ";\a\a;\b[\x00;\n0@\x11@\ac\x16RDoc::NormalClass0" +
-                          "[\x06[\bI\"\aI1\x06;\x06To;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06T[\b[\a;\v[\x00[\a" +
-                          ":\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06T[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06T@\x11[\a;\r[\x00[\a;\x0E[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06To;\a\a;\b[\x00;\n0@\x11" +
-                          "[\aU:\eRDoc::Context::Section[\bi\x000o;\a\a;\b" +
-                          "[\x00;\n0U;\x0F[\bi\x00I\"\fsection\x06;\x06To" +
-                          ";\a\a;\b[\x06o;\a\a;\b[\x06o;\t\x06;\b[\x06I" +
-                          "\"\x14section comment\x06;\x06T;\n@\x11;\n0" +
-                          "[\x06@\x11I\"\x0ENamespace\x06" +
-                          ";\x06Tc\x17RDoc::NormalModule"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    document = RDoc::Markup::Document.new(inner)
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_equal 'Namespace',        loaded.parent.name
-    assert                           loaded.current_section
-
-    expected = {
-      nil       => s0,
-      'section' => s1,
-    }
-
-    assert_equal expected,           loaded.sections_hash
-    assert_equal [tl],               loaded.in_files
-
-    assert_equal tl, loaded.attributes. first.file
-    assert_equal tl, loaded.constants.  first.file
-    assert_equal tl, loaded.includes.   first.file
-    assert_equal tl, loaded.extends.    first.file
-    assert_equal tl, loaded.method_list.first.file
-  end
-
-  def test_merge
-    tl = @store.add_file 'one.rb'
-    p1  = tl.add_class RDoc::NormalClass, 'Parent'
-    c1  = p1.add_class RDoc::NormalClass, 'Klass'
-
-    c2 = RDoc::NormalClass.new 'Klass'
-
-    c2.merge c1
-
-    assert_equal 'Parent', c1.parent_name, 'original parent name'
-    assert_equal 'Parent', c2.parent_name, 'merged parent name'
-
-    assert c1.current_section, 'original current_section'
-    assert c2.current_section, 'merged current_section'
-  end
-
-  def test_merge_attributes
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a4', 'R', '')
-    attr.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    # TODO allow merging when comment == ''
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
-    attr.record_location tl2
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
-    attr.record_location tl1
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a4', 'W', '')
-    attr.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Attr.new(nil, 'a2', 'RW', ''),
-      RDoc::Attr.new(nil, 'a3', 'W',  ''),
-      RDoc::Attr.new(nil, 'a4', 'W',  ''),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-    assert_equal expected, cm1.attributes.sort
-  end
-
-  def test_merge_attributes_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a4', 'R', '')
-    attr.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    # TODO allow merging when comment == ''
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a4', 'W', '')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Attr.new(nil, 'a1', 'RW', ''),
-      RDoc::Attr.new(nil, 'a2', 'RW', ''),
-      RDoc::Attr.new(nil, 'a3', 'RW', ''),
-      RDoc::Attr.new(nil, 'a4', 'RW', ''),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-    assert_equal expected, cm1.attributes.sort
-  end
-
-  def test_merge_collections_drop
-    tl = @store.add_file 'file'
-
-    cm1 = RDoc::ClassModule.new 'C'
-    cm1.record_location tl
-
-    const = cm1.add_constant RDoc::Constant.new('CONST', nil, nil)
-    const.record_location tl
-
-    cm2 = RDoc::ClassModule.new 'C'
-    cm2.record_location tl
-
-    added = []
-    removed = []
-
-    cm1.merge_collections cm1.constants, cm2.constants, cm2.in_files do |add, c|
-      if add then
-        added << c
-      else
-        removed << c
-      end
-    end
-
-    assert_empty added
-    assert_equal [const], removed
-  end
-
-  def test_merge_comment
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-    cm1.add_comment 'klass 1', tl1
-    cm1.record_location tl1
-
-    cm2 = tl1.add_class RDoc::NormalClass, 'Klass'
-    cm2.add_comment 'klass 2', tl2
-    cm2.add_comment 'klass 3', tl1
-    cm2.record_location tl1
-    cm2.record_location tl2
-
-    cm2 = Marshal.load Marshal.dump cm2
-    cm2.store = @store
-
-    cm1.merge cm2
-
-    inner1 = @RM::Document.new @RM::Paragraph.new 'klass 3'
-    inner1.file = 'one.rb'
-    inner2 = @RM::Document.new @RM::Paragraph.new 'klass 2'
-    inner2.file = 'two.rb'
-
-    expected = @RM::Document.new inner2, inner1
-
-    assert_equal expected, cm1.comment.parse
-  end
-
-  def test_merge_comment_version_0
-    tl = @store.add_file 'file.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-    cm1.add_comment 'klass 1', tl
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-
-    cm2.instance_variable_set(:@comment,
-                              @RM::Document.new(
-                                @RM::Paragraph.new('klass 2')))
-    cm2.instance_variable_set :@comment_location, @RM::Document.new(cm2.comment)
-
-    cm1.merge cm2
-
-    inner = @RM::Document.new @RM::Paragraph.new 'klass 1'
-    inner.file = 'file.rb'
-
-    expected = @RM::Document.new \
-      inner,
-      @RM::Document.new(@RM::Paragraph.new('klass 2'))
-
-    assert_equal expected, cm1.comment.parse
-  end
-
-  def test_merge_constants
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    const = cm1.add_constant RDoc::Constant.new('C1', nil, 'one')
-    const.record_location tl1
-    const = cm1.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-
-    store = RDoc::Store.new(RDoc::Options.new)
-    tl = store.add_file 'one.rb'
-    cm2 = tl.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    const = cm2.add_constant RDoc::Constant.new('C2', nil, 'two')
-    const.record_location tl2
-    const = cm2.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-    const = cm2.add_constant RDoc::Constant.new('C4', nil, 'one')
-    const.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Constant.new('C2', nil, 'two'),
-      RDoc::Constant.new('C3', nil, 'one'),
-      RDoc::Constant.new('C4', nil, 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.constants.sort
-  end
-
-  def test_merge_constants_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    const = cm1.add_constant RDoc::Constant.new('C1', nil, 'one')
-    const.record_location tl1
-    const = cm1.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-
-    store = RDoc::Store.new(RDoc::Options.new)
-    tl = store.add_file 'one.rb'
-    cm2 = tl.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    const = cm2.add_constant RDoc::Constant.new('C2', nil, 'two')
-    const = cm2.add_constant RDoc::Constant.new('C3', nil, 'two')
-    const = cm2.add_constant RDoc::Constant.new('C4', nil, 'two')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Constant.new('C1', nil, 'one'),
-      RDoc::Constant.new('C2', nil, 'two'),
-      RDoc::Constant.new('C3', nil, 'one'),
-      RDoc::Constant.new('C4', nil, 'two'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.constants.sort
-  end
-
-  def test_merge_extends
-    tl1 = @store.add_file 'one.rb'
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    ext = cm1.add_extend RDoc::Extend.new('I1', 'one')
-    ext.record_location tl1
-    ext = cm1.add_extend RDoc::Extend.new('I3', 'one')
-    ext.record_location tl1
-
-    tl2 = @store.add_file 'two.rb'
-    tl2.store = RDoc::Store.new(RDoc::Options.new)
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    ext = cm2.add_extend RDoc::Extend.new('I2', 'two')
-    ext.record_location tl2
-    ext = cm2.add_extend RDoc::Extend.new('I3', 'one')
-    ext.record_location tl1
-    ext = cm2.add_extend RDoc::Extend.new('I4', 'one')
-    ext.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Extend.new('I2', 'two'),
-      RDoc::Extend.new('I3', 'one'),
-      RDoc::Extend.new('I4', 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.extends.sort
-  end
-
-  def test_merge_includes
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    incl = cm1.add_include RDoc::Include.new('I1', 'one')
-    incl.record_location tl1
-    incl = cm1.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-
-    tl2 = @store.add_file 'two.rb'
-    tl2.store = RDoc::Store.new(RDoc::Options.new)
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    incl = cm2.add_include RDoc::Include.new('I2', 'two')
-    incl.record_location tl2
-    incl = cm2.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-    incl = cm2.add_include RDoc::Include.new('I4', 'one')
-    incl.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Include.new('I2', 'two'),
-      RDoc::Include.new('I3', 'one'),
-      RDoc::Include.new('I4', 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.includes.sort
-  end
-
-  def test_merge_includes_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    incl = cm1.add_include RDoc::Include.new('I1', 'one')
-    incl.record_location tl1
-    incl = cm1.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-
-    tl2 = @store.add_file 'one.rb'
-    tl2.store = RDoc::Store.new(RDoc::Options.new)
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    incl = cm2.add_include RDoc::Include.new('I2', 'two')
-    incl = cm2.add_include RDoc::Include.new('I3', 'two')
-    incl = cm2.add_include RDoc::Include.new('I4', 'two')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Include.new('I1', 'one'),
-      RDoc::Include.new('I2', 'two'),
-      RDoc::Include.new('I3', 'one'),
-      RDoc::Include.new('I4', 'two'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.includes.sort
-  end
-
-  def test_merge_methods
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::NormalClass, 'Klass'
-
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
-    meth.record_location tl1
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    cm2.store = @store
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
-    meth.record_location tl2
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm4')
-    meth.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::AnyMethod.new(nil, 'm2'),
-      RDoc::AnyMethod.new(nil, 'm3'),
-      RDoc::AnyMethod.new(nil, 'm4'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.method_list.sort
-  end
-
-  def test_merge_methods_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::NormalClass, 'Klass'
-
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
-    meth.record_location tl1
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    cm2.store = @store
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm4')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::AnyMethod.new(nil, 'm1'),
-      RDoc::AnyMethod.new(nil, 'm2'),
-      RDoc::AnyMethod.new(nil, 'm3'),
-      RDoc::AnyMethod.new(nil, 'm4'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.method_list.sort
-  end
-
-  def test_merge_sections
-    store1 = @store
-
-    tl1_1 = store1.add_file 'one.rb'
-
-    cm1  = tl1_1.add_class RDoc::ClassModule, 'Klass'
-    cm1.record_location tl1_1
-
-    s1_0 = cm1.sections.first
-    s1_1 = cm1.add_section 'section 1', comment('comment 1',   tl1_1)
-           cm1.add_section 'section 2', comment('comment 2 a', tl1_1)
-           cm1.add_section 'section 4', comment('comment 4 a', tl1_1)
-
-    store2 = RDoc::Store.new(RDoc::Options.new)
-    tl2_1 = store2.add_file 'one.rb'
-    tl2_2 = store2.add_file 'two.rb'
-
-    cm2  = tl2_1.add_class RDoc::ClassModule, 'Klass'
-    cm2.record_location tl2_1
-    cm2.record_location tl2_2
-
-           cm2.sections.first
-    s2_2 = cm2.add_section 'section 2', comment('comment 2 b', tl2_1)
-    s2_3 = cm2.add_section 'section 3', comment('comment 3',   tl2_2)
-           cm2.add_section 'section 4', comment('comment 4 b', tl2_2)
-
-    cm1.merge cm2
-
-    expected = [
-      s1_0,
-      s1_1,
-      s2_2,
-      s2_3,
-      RDoc::Context::Section.new(cm1, 'section 4', nil)
-    ]
-
-    merged_sections = cm1.sections.sort_by do |s|
-      s.title || ''
-    end
-
-    assert_equal expected, merged_sections
-
-    assert_equal [comment('comment 2 b', tl2_1)],
-                 cm1.sections_hash['section 2'].comments
-
-    expected_s4_comments = [
-      comment('comment 4 a', tl2_1),
-      comment('comment 4 b', tl2_2),
-    ]
-
-    assert_equal expected_s4_comments, cm1.sections_hash['section 4'].comments
-  end
-
-  def test_merge_sections_overlap
-    store1 = @store
-
-    tl1_1 = store1.add_file 'one.rb'
-    tl1_3 = store1.add_file 'three.rb'
-
-    cm1  = tl1_1.add_class RDoc::ClassModule, 'Klass'
-    cm1.record_location tl1_1
-
-    cm1.add_section 'section', comment('comment 1 a', tl1_1)
-    cm1.add_section 'section', comment('comment 3',   tl1_3)
-
-    store2 = RDoc::Store.new(RDoc::Options.new)
-    tl2_1 = store2.add_file 'one.rb'
-    tl2_2 = store2.add_file 'two.rb'
-    tl2_3 = store2.add_file 'three.rb'
-
-    cm2  = tl2_1.add_class RDoc::ClassModule, 'Klass'
-    cm2.record_location tl2_1
-    cm2.record_location tl2_2
-
-    s2_0 = cm2.sections.first
-    s2_1 = cm2.add_section 'section', comment('comment 1 b', tl1_1)
-           cm2.add_section 'section', comment('comment 2',   tl2_2)
-
-    cm1.merge_sections cm2
-
-    expected = [
-      s2_0,
-      s2_1,
-    ]
-
-    merged_sections = cm1.sections.sort_by do |s|
-      s.title || ''
-    end
-
-    assert_equal expected, merged_sections
-
-    expected = [
-      comment('comment 1 b', tl2_1),
-      comment('comment 3',   tl2_3),
-      comment('comment 2',   tl2_2),
-    ]
-
-    comments = cm1.sections_hash['section'].comments
-
-    assert_equal expected, comments.sort_by { |c| c.file.name }
-  end
-
-  def test_parse
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.add_comment 'comment 1', tl1
-    cm.add_comment 'comment 2', tl2
-
-    doc1 = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc1.file = tl1
-    doc2 = @RM::Document.new @RM::Paragraph.new 'comment 2'
-    doc2.file = tl2
-
-    expected = @RM::Document.new doc1, doc2
-
-    assert_equal expected, cm.parse(cm.comment_location)
-  end
-
-  def test_parse_comment
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = comment 'comment 1', tl1
-
-    doc = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc.file = tl1
-
-    assert_equal doc, cm.parse(cm.comment)
-  end
-
-  def test_parse_comment_format
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = comment 'comment ((*1*))', tl1
-    cm.comment.format = 'rd'
-
-    doc = @RM::Document.new @RM::Paragraph.new 'comment <em>1</em>'
-    doc.file = tl1
-
-    assert_equal doc, cm.parse(cm.comment)
-  end
-
-  def test_parse_comment_location
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm = tl1.add_class RDoc::NormalClass, 'Klass'
-    cm.add_comment 'comment 1', tl1
-    cm.add_comment 'comment 2', tl2
-
-    cm = Marshal.load Marshal.dump cm
-
-    doc1 = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc1.file = tl1
-    doc2 = @RM::Document.new @RM::Paragraph.new 'comment 2'
-    doc2.file = tl2
-
-    assert_same cm.comment_location, cm.parse(cm.comment_location)
-  end
-
-  def test_remove_nodoc_children
-    parent = @top_level.add_class RDoc::ClassModule, 'A'
-    parent.modules_hash.replace 'B' => true, 'C' => true
-    @store.modules_hash.replace 'A::B' => true
-
-    parent.classes_hash.replace 'D' => true, 'E' => true
-    @store.classes_hash.replace 'A::D' => true
-
-    parent.remove_nodoc_children
-
-    assert_equal %w[B], parent.modules_hash.keys
-    assert_equal %w[D], parent.classes_hash.keys
-  end
-
-  def test_search_record
-    @c2_c3.add_comment 'This is a comment.', @xref_data
-
-    expected = [
-      'C3',
-      'C2::C3',
-      'C2::C3',
-      '',
-      'C2/C3.html',
-      '',
-      "<p>This is a comment.\n"
-    ]
-
-    assert_equal expected, @c2_c3.search_record
-  end
-
-  def test_search_record_merged
-    @c2_c3.add_comment 'comment A', @store.add_file('a.rb')
-    @c2_c3.add_comment 'comment B', @store.add_file('b.rb')
-
-    expected = [
-      'C3',
-      'C2::C3',
-      'C2::C3',
-      '',
-      'C2/C3.html',
-      '',
-      "<p>comment A\n<p>comment B\n"
-    ]
-
-    assert_equal expected, @c2_c3.search_record
-  end
-
-  def test_store_equals
-    # version 2
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Fi\aI\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11"
-
-    loaded.store = @store
-
-    assert_same @store, loaded.store
-
-    a = loaded.attributes.first
-    assert_same @store, a.store
-    assert_same @store, a.file.store
-
-    c = loaded.constants.first
-    assert_same @store, c.store
-    assert_same @store, c.file.store
-
-    i = loaded.includes.first
-    assert_same @store, i.store
-    assert_same @store, i.file.store
-
-    e = loaded.extends.first
-    assert_same @store, e.store
-    assert_same @store, e.file.store
-
-    m = loaded.method_list.first
-    assert_same @store, m.store
-    assert_same @store, m.file.store
-  end
-
-  def test_superclass
-    assert_equal @c3_h1, @c3_h2.superclass
-  end
-
-  def test_setting_superclass
-    @c1.superclass = nil
-    assert_nil(@c1.superclass)
-    assert_nil(@c1.instance_variable_get("@superclass")) # proxy to test marshalling
-
-    @c1.superclass = @c4_c4.full_name
-    assert_equal(@c1.superclass, @c4_c4)
-    assert_equal(@c4_c4.full_name, @c1.instance_variable_get("@superclass"))
-
-    @c1.superclass = @c4_c4
-    assert_equal(@c1.superclass, @c4_c4)
-    assert_equal(@c4_c4.full_name, @c1.instance_variable_get("@superclass"))
-
-    # we could support this if we find we need to in the future.
-    assert_raise(TypeError) { @c1.superclass = Object }
-
-    # but this doesn't make sense.
-    assert_raise(TypeError) { @c1.superclass = Object.new }
-  end
-
-  def test_super_classes
-    rdoc_c3_h1 = @xref_data.find_module_named('C3::H1')
-    rdoc_object = @xref_data.find_module_named('Object')
-    assert_equal [rdoc_c3_h1, rdoc_object, "BasicObject"], @c3_h2.super_classes
-  end
-
-  def test_update_aliases_class
-    n1 = @xref_data.add_module RDoc::NormalClass, 'N1'
-    n1_k2 = n1.add_module RDoc::NormalClass, 'N2'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    n1.add_module_alias n1_k2, n1_k2.name, a1, @xref_data
-
-    n1_a1_c = n1.constants.find { |c| c.name == 'A1' }
-    refute_nil n1_a1_c
-    assert_equal n1_k2, n1_a1_c.is_alias_for, 'sanity check'
-
-    n1.update_aliases
-
-    n1_a1_k = @xref_data.find_class_or_module 'N1::A1'
-    refute_nil n1_a1_k
-    assert_equal n1_k2, n1_a1_k.is_alias_for
-    refute_equal n1_k2, n1_a1_k
-
-    assert_equal 1, n1_k2.aliases.length
-    assert_equal n1_a1_k, n1_k2.aliases.first
-
-    assert_equal 'N1::N2', n1_k2.full_name
-    assert_equal 'N1::A1', n1_a1_k.full_name
-  end
-
-  def test_update_aliases_module
-    n1 = @xref_data.add_module RDoc::NormalModule, 'N1'
-    n1_n2 = n1.add_module RDoc::NormalModule, 'N2'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    n1.add_module_alias n1_n2, n1_n2.name, a1, @xref_data
-
-    n1_a1_c = n1.constants.find { |c| c.name == 'A1' }
-    refute_nil n1_a1_c
-    assert_equal n1_n2, n1_a1_c.is_alias_for, 'sanity check'
-
-    n1.update_aliases
-
-    n1_a1_m = @xref_data.find_class_or_module 'N1::A1'
-    refute_nil n1_a1_m
-    assert_equal n1_n2, n1_a1_m.is_alias_for
-    refute_equal n1_n2, n1_a1_m
-
-    assert_equal 1, n1_n2.aliases.length
-    assert_equal n1_a1_m, n1_n2.aliases.first
-
-    assert_equal 'N1::N2', n1_n2.full_name
-    assert_equal 'N1::A1', n1_a1_m.full_name
-  end
-
-  def test_update_aliases_reparent
-    l1 = @xref_data.add_module RDoc::NormalModule, 'L1'
-    l1_l2 = l1.add_module RDoc::NormalModule, 'L2'
-    o1 = @xref_data.add_module RDoc::NormalModule, 'O1'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    o1.add_module_alias l1_l2, l1_l2.name, a1, @xref_data
-
-    o1_a1_c = o1.constants.find { |c| c.name == 'A1' }
-    refute_nil o1_a1_c
-    assert_equal l1_l2, o1_a1_c.is_alias_for
-    refute_equal l1_l2, o1_a1_c
-
-    o1.update_aliases
-
-    o1_a1_m = @xref_data.find_class_or_module 'O1::A1'
-    refute_nil o1_a1_m
-    assert_equal l1_l2, o1_a1_m.is_alias_for
-
-    assert_equal 1, l1_l2.aliases.length
-    assert_equal o1_a1_m, l1_l2.aliases[0]
-
-    assert_equal 'L1::L2', l1_l2.full_name
-    assert_equal 'O1::A1', o1_a1_m.full_name
-  end
-
-  def test_update_aliases_reparent_root
-    store = RDoc::Store.new(RDoc::Options.new)
-
-    top_level = store.add_file 'file.rb'
-
-    klass  = top_level.add_class RDoc::NormalClass, 'Klass'
-    object = top_level.add_class RDoc::NormalClass, 'Object'
-
-    const = RDoc::Constant.new 'A', nil, ''
-    const.record_location top_level
-    const.is_alias_for = klass
-
-    a = RDoc::Constant.new 'A', '', ''
-    top_level.add_module_alias klass, klass.name, a, top_level
-
-    object.add_constant const
-
-    object.update_aliases
-
-    assert_equal %w[A Klass Object], store.classes_hash.keys.sort
-
-    assert_equal 'A',     store.classes_hash['A'].full_name
-    assert_equal 'Klass', store.classes_hash['Klass'].full_name
-  end
-
-  def test_update_includes
-    a = RDoc::Include.new 'M1', nil
-    b = RDoc::Include.new 'M2', nil
-    c = RDoc::Include.new 'C', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.add_include c
-    @c1.ancestors # cache included modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_includes
-
-    assert_equal [a, c], @c1.includes
-  end
-
-  def test_update_includes_trim
-    a = RDoc::Include.new 'D::M', nil
-    b = RDoc::Include.new 'D::M', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.ancestors # cache included modules
-
-    @c1.update_includes
-
-    assert_equal [a], @c1.includes
-  end
-
-  def test_update_includes_with_colons
-    a = RDoc::Include.new 'M1', nil
-    b = RDoc::Include.new 'M1::M2', nil
-    c = RDoc::Include.new 'C', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.add_include c
-    @c1.ancestors # cache included modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_includes
-
-    assert_equal [a, c], @c1.includes
-  end
-
-  def test_update_extends
-    a = RDoc::Extend.new 'M1', nil
-    b = RDoc::Extend.new 'M2', nil
-    c = RDoc::Extend.new 'C', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.add_extend c
-    @c1.extends.each do |extend| extend.module end # cache extended modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_extends
-
-    assert_equal [a, b, c], @c1.extends
-  end
-
-  def test_update_extends_trim
-    a = RDoc::Extend.new 'D::M', nil
-    b = RDoc::Extend.new 'D::M', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.extends.each do |extend| extend.module end # cache extended modules
-
-    @c1.update_extends
-
-    assert_equal [a], @c1.extends
-  end
-
-  def test_update_extends_with_colons
-    a = RDoc::Extend.new 'M1', nil
-    b = RDoc::Extend.new 'M1::M2', nil
-    c = RDoc::Extend.new 'C', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.add_extend c
-    @c1.extends.each do |extend| extend.module end # cache extended modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_extends
-
-    assert_equal [a, c], @c1.extends
-  end
-
-  def test_nesting_namespaces
-    cm1 = RDoc::ClassModule.new "A"
-    assert_equal ["A"], cm1.nesting_namespaces
-
-    cm2 = RDoc::ClassModule.new "A::B"
-    assert_equal ["A", "B"], cm2.nesting_namespaces
-
-    cm3 = RDoc::ClassModule.new "::A::B::C"
-    assert_equal ["A", "B", "C"], cm3.nesting_namespaces
-  end
-
-  def test_fully_qualified_nesting_namespaces
-    cm1 = RDoc::ClassModule.new "A"
-    assert_equal ["A"], cm1.fully_qualified_nesting_namespaces
-
-    cm2 = RDoc::ClassModule.new "A::B"
-    assert_equal ["A", "A::B"], cm2.fully_qualified_nesting_namespaces
-
-    cm3 = RDoc::ClassModule.new "::A::B::C"
-    assert_equal ["A", "A::B", "A::B::C"], cm3.fully_qualified_nesting_namespaces
-  end
-
-  def test_path
-    assert_equal 'C1.html', @c1.path
-
-    @options.class_module_path_prefix = 'class'
-    assert_equal 'class/C1.html', @c1.path
-  end
-
-  class RDocClassModuleMixinsTest < XrefTestCase
-    def setup
-      super
-
-      klass_tl = @store.add_file("klass.rb")
-      @klass = klass_tl.add_class(RDoc::NormalClass, "Klass")
-
-      incmod_tl = @store.add_file("incmod.rb")
-      @incmod = incmod_tl.add_module(RDoc::NormalModule, "Incmod")
-
-      incmod_const = @incmod.add_constant(RDoc::Constant.new("INCMOD_CONST_WITHOUT_A_SECTION", nil, ""))
-      incmod_const = @incmod.add_constant(RDoc::Constant.new("INCMOD_CONST", nil, ""))
-      incmod_const.section = @incmod.add_section("Incmod const section")
-
-      incmod_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_method_without_a_section"))
-      incmod_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_method"))
-      incmod_method.section = @incmod.add_section("Incmod method section")
-
-      incmod_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_attr_without_a_section", "RW", ""))
-      incmod_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_attr", "RW", ""))
-      incmod_attr.section = @incmod.add_section("Incmod attr section")
-
-      incmod_private_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_private_method"))
-      incmod_private_method.visibility = :private
-
-      incmod_private_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_private_attr", "RW", ""))
-      incmod_private_attr.visibility = :private
-
-      extmod_tl = @store.add_file("extmod.rb")
-      @extmod = extmod_tl.add_module(RDoc::NormalModule, "Extmod")
-
-      extmod_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_method_without_a_section"))
-      extmod_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_method"))
-      extmod_method.section = @extmod.add_section("Extmod method section")
-
-      extmod_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_attr_without_a_section", "RW", "", singleton: true))
-      extmod_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_attr", "RW", "", singleton: true))
-      extmod_attr.section = @extmod.add_section("Extmod attr section")
-
-      extmod_private_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_private_method"))
-      extmod_private_method.visibility = :private
-
-      extmod_private_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_private_attr", "RW", "", singleton: true))
-      extmod_private_attr.visibility = :private
-
-      @klass.add_include(RDoc::Include.new("Incmod", nil))
-      @klass.add_extend(RDoc::Include.new("Extmod", nil))
-
-      @klass.add_include(RDoc::Include.new("ExternalInclude", nil))
-      # Test duplicationg removal
-      @klass.add_include(RDoc::Include.new("ExternalInclude", nil))
-
-      @klass.add_extend(RDoc::Include.new("ExternalExtend", nil))
-      # Test duplicationg removal
-      @klass.add_extend(RDoc::Include.new("ExternalExtend", nil))
-    end
-
-    def test_complete_clears_duplicated_includes_and_extends
-      @klass.complete(:protected)
-
-      assert_equal(["Incmod", "ExternalInclude"], @klass.includes.map(&:name))
-      assert_equal(["Extmod", "ExternalExtend"], @klass.extends.map(&:name))
-    end
-
-    def test_embed_mixin_when_false_does_not_embed_anything
-      assert_false(@klass.options.embed_mixins)
-      @klass.complete(:protected)
-
-      refute_includes(@klass.constants.map(&:name), "INCMOD_CONST")
-      refute_includes(@klass.method_list.map(&:name), "incmod_method")
-      refute_includes(@klass.method_list.map(&:name), "extmod_method")
-      refute_includes(@klass.attributes.map(&:name), "incmod_attr")
-      refute_includes(@klass.attributes.map(&:name), "extmod_attr")
-    end
-
-    def test_embed_mixin_when_true_embeds_methods_and_constants
-      @klass.options.embed_mixins = true
-      @klass.complete(:protected)
-
-      # assert on presence and identity of methods and constants
-      constant = @klass.constants.find { |c| c.name == "INCMOD_CONST" }
-      assert(constant, "constant from included mixin should be present")
-      assert_equal(@incmod, constant.mixin_from)
-
-      instance_method = @klass.method_list.find { |m| m.name == "incmod_method" }
-      assert(instance_method, "instance method from included mixin should be present")
-      refute(instance_method.singleton)
-      assert_equal(@incmod, instance_method.mixin_from)
-
-      instance_attr = @klass.attributes.find { |a| a.name == "incmod_attr" }
-      assert(instance_attr, "instance attr from included mixin should be present")
-      refute(instance_attr.singleton)
-      assert_equal(@incmod, instance_attr.mixin_from)
-
-      refute(@klass.method_list.find { |m| m.name == "incmod_private_method" })
-      refute(@klass.attributes.find { |m| m.name == "incmod_private_attr" })
-
-      class_method = @klass.method_list.find { |m| m.name == "extmod_method" }
-      assert(class_method, "class method from extended mixin should be present")
-      assert(class_method.singleton)
-      assert_equal(@extmod, class_method.mixin_from)
-
-      class_attr = @klass.attributes.find { |a| a.name == "extmod_attr" }
-      assert(class_attr, "class attr from extended mixin should be present")
-      assert(class_attr.singleton)
-      assert_equal(@extmod, class_attr.mixin_from)
-
-      refute(@klass.method_list.find { |m| m.name == "extmod_private_method" })
-      refute(@klass.attributes.find { |m| m.name == "extmod_private_attr" })
-
-      # assert that sections are also imported
-      constant_section = @klass.sections.find { |s| s.title == "Incmod const section" }
-      assert(constant_section, "constant from included mixin should have a section")
-      assert_equal(constant_section, constant.section)
-
-      instance_method_section = @klass.sections.find { |s| s.title == "Incmod method section" }
-      assert(instance_method_section, "instance method from included mixin should have a section")
-      assert_equal(instance_method_section, instance_method.section)
-
-      instance_attr_section = @klass.sections.find { |s| s.title == "Incmod attr section" }
-      assert(instance_attr_section, "instance attr from included mixin should have a section")
-      assert_equal(instance_attr_section, instance_attr.section)
-
-      class_method_section = @klass.sections.find { |s| s.title == "Extmod method section" }
-      assert(class_method_section, "class method from extended mixin should have a section")
-      assert_equal(class_method_section, class_method.section)
-
-      class_attr_section = @klass.sections.find { |s| s.title == "Extmod attr section" }
-      assert(class_attr_section, "class attr from extended mixin should have a section")
-      assert_equal(class_attr_section, class_attr.section)
-
-      # and check that code objects without a section still have no section
-      constant = @klass.constants.find { |c| c.name == "INCMOD_CONST_WITHOUT_A_SECTION" }
-      assert_nil(constant.section.title)
-
-      instance_method = @klass.method_list.find { |c| c.name == "incmod_method_without_a_section" }
-      assert_nil(instance_method.section.title)
-
-      instance_attr = @klass.attributes.find { |c| c.name == "incmod_attr_without_a_section" }
-      assert_nil(instance_attr.section.title)
-
-      class_method = @klass.method_list.find { |c| c.name == "extmod_method_without_a_section" }
-      assert_nil(class_method.section.title)
-
-      class_attr = @klass.attributes.find { |c| c.name == "extmod_attr_without_a_section" }
-      assert_nil(class_attr.section.title)
-    end
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_code_object_test.rb b/test/mri/rdoc/rdoc/rdoc_code_object_test.rb
deleted file mode 100644
index af5c34257c6..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_code_object_test.rb
+++ /dev/null
@@ -1,416 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'xref_test_case'
-
-class RDocCodeObjectTest < XrefTestCase
-
-  def setup
-    super
-
-    @co = RDoc::CodeObject.new
-  end
-
-  def test_initialize
-    assert @co.document_self, 'document_self'
-    assert @co.document_children, 'document_children'
-    refute @co.force_documentation, 'force_documentation'
-    refute @co.done_documenting, 'done_documenting'
-    refute @co.received_nodoc, 'received_nodoc'
-    assert_equal '', @co.comment, 'comment is empty'
-  end
-
-  def test_comment_equals
-    @co.comment = ''
-
-    assert_equal '', @co.comment
-
-    @co.comment = 'I am a comment'
-
-    assert_equal 'I am a comment', @co.comment
-  end
-
-  def test_comment_equals_comment
-    @co.comment = comment ''
-
-    assert_equal '', @co.comment.text
-
-    @co.comment = comment 'I am a comment'
-
-    assert_equal 'I am a comment', @co.comment.text
-  end
-
-  def test_comment_equals_empty_string
-    @co.comment = 'comment'
-
-    @co.comment = ''
-
-    assert_equal 'comment', @co.comment
-  end
-
-  def test_comment_equals_encoding
-    refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    input = 'text'
-    input = RDoc::Encoding.change_encoding input, Encoding::UTF_8
-
-    @co.comment = input
-
-    assert_equal 'text', @co.comment
-    assert_equal Encoding::UTF_8, @co.comment.encoding
-  end
-
-  def test_comment_equals_encoding_blank
-    refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    input = ''
-    input = RDoc::Encoding.change_encoding input, Encoding::UTF_8
-
-    @co.comment = input
-
-    assert_equal '', @co.comment
-    assert_equal Encoding::UTF_8, @co.comment.encoding
-  end
-
-  def test_display_eh_document_self
-    assert @co.display?
-
-    @co.document_self = false
-
-    refute @co.display?
-  end
-
-  def test_display_eh_ignore
-    assert @co.display?
-
-    @co.ignore
-
-    refute @co.display?
-
-    @co.stop_doc
-
-    refute @co.display?
-
-    @co.done_documenting = false
-
-    refute @co.display?
-  end
-
-  def test_display_eh_suppress
-    assert @co.display?
-
-    @co.suppress
-
-    refute @co.display?
-
-    @co.comment = comment('hi')
-
-    refute @co.display?
-
-    @co.done_documenting = false
-
-    assert @co.display?
-
-    @co.ignore
-    @co.done_documenting = false
-
-    refute @co.display?
-  end
-
-  def test_document_children_equals
-    @co.document_children = false
-
-    refute @co.document_children
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_children
-
-    @co.document_children = false
-
-    assert @co.document_children
-  end
-
-  def test_document_self_equals
-    @co.document_self = false
-    refute @co.document_self
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-
-    @co.document_self = false
-
-    assert @co.document_self
-  end
-
-  def test_documented_eh
-    refute @co.documented?
-
-    @co.comment = 'hi'
-
-    assert @co.documented?
-
-    @co.comment.replace ''
-
-    refute @co.documented?
-
-    @co.document_self = nil # notify :nodoc:
-
-    assert @co.documented?
-  end
-
-  def test_done_documenting
-    # once done_documenting is set, other properties refuse to go to "true"
-    @co.done_documenting = true
-
-    @co.document_self = true
-    refute @co.document_self
-
-    @co.document_children = true
-    refute @co.document_children
-
-    @co.force_documentation = true
-    refute @co.force_documentation
-
-    @co.start_doc
-    refute @co.document_self
-    refute @co.document_children
-
-    # turning done_documenting on
-    # resets others to true
-
-    @co.done_documenting = false
-    assert @co.document_self
-    assert @co.document_children
-
-    @co.done_documenting = true
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    refute @co.done_documenting
-
-    @co.done_documenting = true
-
-    refute @co.done_documenting
-  end
-
-  def test_file_name
-    assert_nil @co.file_name
-
-    @co.record_location @store.add_file 'lib/file.rb'
-
-    assert_equal 'lib/file.rb', @co.file_name
-  end
-
-  def test_full_name_equals
-    @co.full_name = 'hi'
-
-    assert_equal 'hi', @co.instance_variable_get(:@full_name)
-
-    @co.full_name = nil
-
-    assert_nil @co.instance_variable_get(:@full_name)
-  end
-
-  def test_ignore
-    @co.ignore
-
-    refute @co.document_self
-    refute @co.document_children
-    assert @co.ignored?
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.ignored?
-
-    @co.ignore
-
-    refute @co.ignored?
-  end
-
-  def test_ignore_eh
-    refute @co.ignored?
-
-    @co.ignore
-
-    assert @co.ignored?
-  end
-
-  def test_line
-    @c1_m.line = 5
-
-    assert_equal 5, @c1_m.line
-  end
-
-  def test_metadata
-    assert_empty @co.metadata
-
-    @co.metadata['markup'] = 'not_rdoc'
-
-    expected = { 'markup' => 'not_rdoc' }
-
-    assert_equal expected, @co.metadata
-
-    assert_equal 'not_rdoc', @co.metadata['markup']
-  end
-
-  def test_parent_name
-    assert_equal '(unknown)', @co.parent_name
-    assert_equal 'xref_data.rb', @c1.parent_name
-    assert_equal 'C2', @c2_c3.parent_name
-  end
-
-  def test_received_ndoc
-    @co.document_self = false
-    refute @co.received_nodoc
-
-    @co.document_self = nil
-    assert @co.received_nodoc
-
-    @co.document_self = true
-  end
-
-  def test_record_location
-    @co.record_location @xref_data
-
-    assert_equal 'xref_data.rb', @co.file.relative_name
-  end
-
-  def test_record_location_ignored
-    @co.ignore
-    @co.record_location @xref_data
-
-    refute @co.ignored?
-  end
-
-  def test_record_location_suppressed
-    @co.suppress
-    @co.record_location @xref_data
-
-    refute @co.suppressed?
-  end
-
-  def test_section
-    parent = RDoc::Context.new
-    section = parent.sections.first
-
-    @co.parent = parent
-    @co.instance_variable_set :@section, section
-
-    assert_equal section, @co.section
-
-    @co.instance_variable_set :@section, nil
-    @co.instance_variable_set :@section_title, nil
-
-    assert_equal section, @co.section
-
-    @co.instance_variable_set :@section, nil
-    @co.instance_variable_set :@section_title, 'new title'
-
-    assert_equal 'new title', @co.section.title
-  end
-
-  def test_start_doc
-    @co.document_self = false
-    @co.document_children = false
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-  end
-
-  def test_start_doc_ignored
-    @co.ignore
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.ignored?
-  end
-
-  def test_start_doc_suppressed
-    @co.suppress
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.suppressed?
-  end
-
-  def test_store_equals
-    @co.document_self = false
-
-    @co.store = @store
-
-    refute @co.document_self
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-  end
-
-  def test_stop_doc
-    @co.document_self = true
-    @co.document_children = true
-
-    @co.stop_doc
-
-    refute @co.document_self
-    refute @co.document_children
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-    assert @co.document_children
-
-    @co.stop_doc
-
-    assert @co.document_self
-    assert @co.document_children
-  end
-
-  def test_suppress
-    @co.suppress
-
-    refute @co.document_self
-    refute @co.document_children
-    assert @co.suppressed?
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    refute @co.suppressed?
-
-    @co.suppress
-
-    refute @co.suppressed?
-  end
-
-  def test_suppress_eh
-    refute @co.suppressed?
-
-    @co.suppress
-
-    assert @co.suppressed?
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_comment_test.rb b/test/mri/rdoc/rdoc/rdoc_comment_test.rb
deleted file mode 100644
index 1699575b9df..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_comment_test.rb
+++ /dev/null
@@ -1,480 +0,0 @@
-# coding: us-ascii
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocCommentTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-    @comment = RDoc::Comment.new
-    @comment.location = @top_level
-    @comment.text = 'this is a comment'
-  end
-
-  def test_empty
-    @comment.text = ''
-    assert_empty @comment
-    empty_doc = @comment.parse
-    assert_empty @comment
-    @comment.text = 'a'
-    refute_empty @comment
-    present_doc = @comment.parse
-    refute_empty @comment
-    assert_empty RDoc::Comment.from_document(empty_doc)
-    refute_empty RDoc::Comment.from_document(present_doc)
-  end
-
-  def test_equals2
-    assert_equal @comment, @comment.dup
-
-    c2 = @comment.dup
-    c2.text = nil
-
-    refute_equal @comment, c2
-
-    c3 = @comment.dup
-    c3.location = nil
-
-    refute_equal @comment, c3
-  end
-
-  def test_extract_call_seq
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-
-moar comment
-    COMMENT
-
-    assert_equal "bla => true or false\n", comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_blank
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-
-    COMMENT
-
-    assert_equal "bla => true or false\n", comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_commented
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# call-seq:
-#   bla => true or false
-#
-# moar comment
-    COMMENT
-
-    assert_nil comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_no_blank
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-    COMMENT
-
-    assert_equal "bla => true or false\n", comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_undent
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-moar comment
-    COMMENT
-
-    assert_equal "bla => true or false\nmoar comment\n", comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_c
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-  commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-  commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-If no arguments are given:
-* ruby 1.8: returns a +Date+ for 1582-10-15 (the Day of Calendar Reform in
-  Italy)
-* ruby 1.9: returns a +Date+ for julian day 0
-
-Otherwise, returns a +Date+ for the commercial week year, commercial week,
-and commercial week day given. Ignores the 4th argument.
-    COMMENT
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-    CALL_SEQ
-
-    assert_equal expected, comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_c_no_blank
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-  commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-  commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-    COMMENT
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-    CALL_SEQ
-
-    assert_equal expected, comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_c_separator
-    comment = RDoc::Comment.new <<-'COMMENT'
-call-seq:
-   ARGF.readlines(sep=$/)     -> array
-   ARGF.readlines(limit)      -> array
-   ARGF.readlines(sep, limit) -> array
-
-   ARGF.to_a(sep=$/)     -> array
-   ARGF.to_a(limit)      -> array
-   ARGF.to_a(sep, limit) -> array
-
-Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
-lines, one line per element. Lines are assumed to be separated by _sep_.
-
-   lines = ARGF.readlines
-   lines[0]                #=> "This is line one\n"
-
-    COMMENT
-
-    expected = <<-CALL_SEQ
-ARGF.readlines(sep=$/)     -> array
-ARGF.readlines(limit)      -> array
-ARGF.readlines(sep, limit) -> array
-ARGF.to_a(sep=$/)     -> array
-ARGF.to_a(limit)      -> array
-ARGF.to_a(sep, limit) -> array
-    CALL_SEQ
-
-    assert_equal expected, comment.extract_call_seq
-
-    expected = <<-'COMMENT'
-
-Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
-lines, one line per element. Lines are assumed to be separated by _sep_.
-
-   lines = ARGF.readlines
-   lines[0]                #=> "This is line one\n"
-
-    COMMENT
-
-    assert_equal expected, comment.text
-  end
-
-  # This test relies on AnyMethod#call_seq's behaviour as well
-  def test_extract_call_linear_performance
-    pre = ->(n) {[n, RDoc::Comment.new("\n"*n + 'call-seq:' + 'a'*n)]}
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-    assert_linear_performance((2..5).map {|i| 10**i}, pre: pre) do |n, comment|
-      method_obj.call_seq = comment.extract_call_seq
-      assert_equal n, method_obj.call_seq.size
-    end
-  end
-
-  def test_force_encoding
-    @comment = RDoc::Encoding.change_encoding @comment, Encoding::UTF_8
-
-    assert_equal Encoding::UTF_8, @comment.text.encoding
-  end
-
-  def test_format
-    assert_equal 'rdoc', @comment.format
-  end
-
-  def test_format_equals
-    c = comment 'content'
-    document = c.parse
-
-    c.format = RDoc::RD
-
-    assert_equal RDoc::RD, c.format
-    refute_same document, c.parse
-  end
-
-  def test_initialize_copy
-    copy = @comment.dup
-
-    refute_same @comment.text, copy.text
-    assert_same @comment.location, copy.location
-  end
-
-  def test_location
-    assert_equal @top_level, @comment.location
-  end
-
-  def test_normalize
-    @comment.text = <<-TEXT
-  # comment
-    TEXT
-    @comment.language = :ruby
-
-    assert_same @comment, @comment.normalize
-
-    assert_equal 'comment', @comment.text
-  end
-
-  def test_normalize_twice
-    @comment.text = <<-TEXT
-  # comment
-    TEXT
-
-    @comment.normalize
-
-    text = @comment.text
-
-    @comment.normalize
-
-    assert_same text, @comment.text, 'normalize not cached'
-  end
-
-  def test_normalize_document
-    @comment.text = nil
-    @comment.document = @RM::Document.new
-
-    assert_same @comment, @comment.normalize
-
-    assert_nil @comment.text
-  end
-
-  def test_normalize_eh
-    refute @comment.normalized?
-
-    @comment.normalize
-
-    assert @comment.normalized?
-  end
-
-  def test_text
-    assert_equal 'this is a comment', @comment.text
-  end
-
-  def test_text_equals
-    @comment.text = 'other'
-
-    assert_equal 'other', @comment.text
-    refute @comment.normalized?
-  end
-
-  def test_text_equals_no_text
-    c = RDoc::Comment.new nil, @top_level
-    c.document = @RM::Document.new
-
-    e = assert_raise RDoc::Error do
-      c.text = 'other'
-    end
-
-    assert_equal 'replacing document-only comment is not allowed', e.message
-  end
-
-  def test_text_equals_parsed
-    document = @comment.parse
-
-    @comment.text = 'other'
-
-    refute_equal document, @comment.parse
-  end
-
-  def test_tomdoc_eh
-    refute @comment.tomdoc?
-
-    @comment.format = 'tomdoc'
-
-    assert @comment.tomdoc?
-  end
-
-  def test_parse
-    parsed = @comment.parse
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new('this is a comment'))
-
-    expected.file = @top_level
-
-    assert_equal expected, parsed
-    assert_same  parsed, @comment.parse
-  end
-
-  def test_parse_rd
-    c = comment 'it ((*works*))'
-    c.format = 'rd'
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it <em>works</em>'))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_remove_private_encoding
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-  def test_remove_private_hash
-    @comment.text = <<-TEXT
-#--
-# private
-#++
-# public
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "# public\n", @comment.text
-  end
-
-  def test_remove_private_hash_trail
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_long
-    comment = RDoc::Comment.new <<-EOS, @top_level
-#-----
-#++
-# this is text
-#-----
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# this is text
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_rule
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text with a rule:
-# ---
-# this is also text
-    EOS
-
-    expected = comment.dup
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_star
-    @comment.text = <<-TEXT
-/*
- *--
- * private
- *++
- * public
- */
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "/*\n * public\n */\n", @comment.text
-  end
-
-  def test_remove_private_star2
-    @comment.text = <<-TEXT
-/*--
- * private
- *++
- * public
- */
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "/*--\n * private\n *++\n * public\n */\n", @comment.text
-  end
-
-  def test_remove_private_toggle
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-# This is text again.
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_toggle_encoding
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-  def test_remove_private_toggle_encoding_ruby_bug?
-    comment = RDoc::Comment.new <<-EOS, @top_level
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_constant_test.rb b/test/mri/rdoc/rdoc/rdoc_constant_test.rb
deleted file mode 100644
index f9f795101c2..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_constant_test.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocConstantTest < XrefTestCase
-
-  def setup
-    super
-
-    @const = @c1.constants.first
-  end
-
-  def test_documented_eh
-    top_level = @store.add_file 'file.rb'
-
-    const = RDoc::Constant.new 'CONST', nil, nil
-    top_level.add_constant const
-
-    refute const.documented?
-
-    const.comment = comment 'comment'
-
-    assert const.documented?
-  end
-
-  def test_documented_eh_alias
-    top_level = @store.add_file 'file.rb'
-
-    const = RDoc::Constant.new 'CONST', nil, nil
-    top_level.add_constant const
-
-    refute const.documented?
-
-    const.is_alias_for = 'C1'
-
-    refute const.documented?
-
-    @c1.add_comment comment('comment'), @top_level
-
-    assert const.documented?
-  end
-
-  def test_full_name
-    assert_equal 'C1::CONST', @const.full_name
-  end
-
-  def test_is_alias_for
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'comment'
-    top_level.add_constant c
-
-    assert_nil c.is_alias_for
-
-    c.is_alias_for = 'C1'
-
-    assert_equal @c1, c.is_alias_for
-
-    c.is_alias_for = 'unknown'
-
-    assert_equal 'unknown', c.is_alias_for
-  end
-
-  def test_marshal_dump
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-
-    aliased = top_level.add_class RDoc::NormalClass, 'Aliased'
-    c.is_alias_for = aliased
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal c, loaded
-
-    assert_equal aliased,        loaded.is_alias_for
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-  end
-
-  def test_marshal_load
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal c, loaded
-
-    assert_nil                   loaded.is_alias_for
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-
-    assert                       loaded.display?
-  end
-
-  def test_marshal_load_version_0
-    top_level = @store.add_file 'file.rb'
-
-    aliased = top_level.add_class RDoc::NormalClass, 'Aliased'
-    cm      = top_level.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    loaded = Marshal.load "\x04\bU:\x13RDoc::Constant[\x0Fi\x00I" +
-                          "\"\nCONST\x06:\x06ETI\"\x11Klass::CONST\x06" +
-                          ";\x06T0I\"\fAliased\x06;\x06To" +
-                          ":\eRDoc::Markup::Document\a:\v@parts[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@file0I" +
-                          "\"\ffile.rb\x06;\x06TI\"\nKlass\x06" +
-                          ";\x06Tc\x16RDoc::NormalClass0"
-
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal aliased,        loaded.is_alias_for
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-
-    assert loaded.display?
-  end
-
-  def test_marshal_round_trip
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-    c.is_alias_for = 'Unknown'
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    reloaded = Marshal.load Marshal.dump loaded
-    reloaded.store = @store
-
-    assert_equal section,   reloaded.section
-    assert_equal 'Unknown', reloaded.is_alias_for
-  end
-
-  def test_path
-    assert_equal 'C1.html#CONST', @const.path
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_context_section_test.rb b/test/mri/rdoc/rdoc/rdoc_context_section_test.rb
deleted file mode 100644
index 179ea95014c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_context_section_test.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocContextSectionTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-
-    @S = RDoc::Context::Section
-    @s = @S.new @klass, 'section', comment('# comment', @top_level, :ruby)
-  end
-
-  def test_add_comment
-    file1 = @store.add_file 'file1.rb'
-
-    klass = file1.add_class RDoc::NormalClass, 'Klass'
-
-    c1 = RDoc::Comment.new "# :section: section\n", file1
-    c2 = RDoc::Comment.new "# hello\n",             file1
-    c3 = RDoc::Comment.new "# world\n",             file1
-
-    s = @S.new klass, 'section', c1
-
-    assert_empty s.comments
-
-    s.add_comment nil
-
-    assert_empty s.comments
-
-    s.add_comment c2
-
-    assert_equal [c2], s.comments
-
-    s.add_comment c3
-
-    assert_equal [c2, c3], s.comments
-  end
-
-  def test_aref
-    assert_equal 'section', @s.aref
-
-    assert_equal '5Buntitled-5D', @S.new(nil, nil, nil).aref
-
-    assert_equal 'one+two', @S.new(nil, 'one two', nil).aref
-  end
-
-  def test_eql_eh
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert @s.eql? @s
-    assert @s.eql? @s.dup
-    refute @s.eql? other
-  end
-
-  def test_equals
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert_equal @s, @s
-    assert_equal @s, @s.dup
-    refute_equal @s, other
-  end
-
-  def test_extract_comment
-    assert_equal '',    @s.extract_comment(comment('')).text
-    assert_equal '',    @s.extract_comment(comment("# :section: b\n")).text
-    assert_equal '# c', @s.extract_comment(comment("# :section: b\n# c")).text
-    assert_equal '# c',
-                 @s.extract_comment(comment("# a\n# :section: b\n# c")).text
-  end
-
-  def test_hash
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert_equal @s.hash, @s.hash
-    assert_equal @s.hash, @s.dup.hash
-    refute_equal @s.hash, other.hash
-  end
-
-  def test_marshal_dump
-    loaded = Marshal.load Marshal.dump @s
-
-    expected = doc RDoc::Comment.new('comment', @top_level).parse
-
-    assert_equal 'section', loaded.title
-    assert_equal expected,  loaded.parse
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_marshal_dump_no_comment
-    s = @S.new @klass, 'section', comment('')
-
-    loaded = Marshal.load Marshal.dump s
-
-    assert_equal 'section', loaded.title
-    assert_empty            loaded.comments
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_marshal_load_version_0
-    loaded = Marshal.load "\x04\bU:\eRDoc::Context::Section" +
-                          "[\bi\x00I\"\fsection\x06:\x06EFo" +
-                          ":\eRDoc::Markup::Document\a:\v@parts" +
-                          "[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\fcomment\x06;\x06F:\n@fileI" +
-                          "\"\ffile.rb\x06;\x06F;\n0"
-
-    expected = doc RDoc::Comment.new('comment', @top_level).parse
-
-    assert_equal 'section', loaded.title
-    assert_equal expected,  loaded.parse
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_remove_comment_array
-    other = @store.add_file 'other.rb'
-
-    other_comment = comment('bogus', other)
-
-    @s.add_comment other_comment
-
-    @s.remove_comment comment('bogus', @top_level)
-
-    assert_equal [other_comment], @s.comments
-  end
-
-  def test_remove_comment_document
-    other = @store.add_file 'other.rb'
-
-    other_comment = comment('bogus', other)
-
-    @s.add_comment other_comment
-
-    loaded = Marshal.load Marshal.dump @s
-
-    loaded.remove_comment comment('bogus', @top_level)
-
-    assert_equal doc(other_comment.parse), loaded.parse
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_context_test.rb b/test/mri/rdoc/rdoc/rdoc_context_test.rb
deleted file mode 100644
index eaa4f236219..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_context_test.rb
+++ /dev/null
@@ -1,958 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocContextTest < XrefTestCase
-
-  def setup
-    super
-
-    @context = RDoc::Context.new
-    @context.store = @store
-  end
-
-  def test_initialize
-    assert_empty @context.in_files
-    assert_equal 'unknown', @context.name
-    assert_equal '', @context.comment
-    assert_nil   @context.parent
-    assert_equal :public, @context.visibility
-    assert_equal 1, @context.sections.length
-    assert_nil   @context.temporary_section
-
-    assert_empty @context.classes_hash
-    assert_empty @context.modules_hash
-
-    assert_empty @context.method_list
-    assert_empty @context.attributes
-    assert_empty @context.aliases
-    assert_empty @context.requires
-    assert_empty @context.includes
-    assert_empty @context.constants
-  end
-
-  def test_add_alias
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-
-    @context.add_alias as
-
-    assert_equal [as], @context.external_aliases
-    assert_equal [as], @context.unmatched_alias_lists['#old_name']
-  end
-
-  def test_add
-    @context.add RDoc::Extend,  'Ext', 'comment'
-    @context.add RDoc::Include, 'Incl', 'comment'
-
-    refute_empty @context.extends
-    refute_empty @context.includes
-  end
-
-  def test_add_alias_method_attr
-    top_level = @store.add_file 'file.rb'
-
-    attr = RDoc::Attr.new nil, 'old_name', 'R', ''
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    as.record_location top_level
-    as.parent = @context
-
-    @context.add_attribute attr
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.attributes.map { |m| m.name }
-
-    new = @context.attributes.last
-    assert_equal top_level, new.file
-  end
-
-  def test_add_alias_method
-    top_level = @store.add_file 'file.rb'
-
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-    meth.singleton = false
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    as.record_location top_level
-    as.parent = @context
-
-    @context.add_method meth
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-
-    new = @context.method_list.last
-    assert_equal top_level, new.file
-  end
-
-  def test_add_alias_method_singleton
-    meth = RDoc::AnyMethod.new nil, 'old_name', singleton: true
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment', singleton: true
-
-    as.parent = @context
-
-    @context.add_method meth
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-
-    assert @context.method_list.last.singleton
-  end
-
-  def test_add_class
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass'
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass'
-  end
-
-  def test_add_class_basic_object
-    @xref_data.add_class RDoc::NormalClass, 'BasicObject'
-
-    basic = @xref_data.find_module_named 'BasicObject'
-
-    assert_nil basic.superclass
-
-    @c1.add_class RDoc::NormalClass, 'BasicObject'
-
-    basic = @c1.find_module_named 'BasicObject'
-
-    assert_equal @object, basic.superclass
-  end
-
-  def test_add_class_object
-    @xref_data.add_class RDoc::NormalClass, 'Object'
-
-    object = @xref_data.find_module_named 'Object'
-
-    assert_equal 'BasicObject', object.superclass
-
-    @c1.add_class RDoc::NormalClass, 'Object'
-
-    object = @c1.find_module_named 'Object'
-
-    assert_equal 'Object', object.superclass.full_name
-  end
-
-  def test_add_class_singleton
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass'
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass'
-  end
-
-  def test_add_class_superclass
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Other'
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    klass = @c1.find_module_named 'Klass'
-    assert_equal 'Other', klass.superclass
-  end
-
-  def test_add_class_upgrade
-    @c1.add_module RDoc::NormalModule, 'Klass'
-    @c1.add_class RDoc::NormalClass, 'Klass', nil
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass',
-                    'c1 classes'
-    refute_includes @c1.modules.map { |k| k.full_name }, 'C1::Klass',
-                    'c1 modules'
-
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass',
-                    'TopLevel classes'
-    refute_includes @store.all_modules.map { |k| k.full_name }, 'C1::Klass',
-                    'TopLevel modules'
-  end
-
-  def test_add_constant
-    const = RDoc::Constant.new 'NAME', 'value', 'comment'
-    @context.add_constant const
-
-    assert_equal [const], @context.constants
-  end
-
-  def test_add_extend
-    ext = RDoc::Extend.new 'Name', 'comment'
-    @context.add_extend ext
-
-    assert_equal [ext], @context.extends
-  end
-
-  def test_add_include
-    incl = RDoc::Include.new 'Name', 'comment'
-    @context.add_include incl
-
-    assert_equal [incl], @context.includes
-  end
-
-  def test_add_method
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-    meth.visibility = nil
-
-    @context.add_method meth
-
-    assert_equal [meth], @context.method_list
-    assert_equal :public, meth.visibility
-  end
-
-  def test_add_method_alias
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-
-    @context.add_alias as
-    refute_empty @context.external_aliases
-
-    @context.add_method meth
-
-    assert_empty @context.external_aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-  end
-
-  def test_add_method_duplicate
-    @store.options.verbosity = 2
-
-    meth1 = RDoc::AnyMethod.new nil, 'name'
-    meth1.record_location @store.add_file 'first.rb'
-    meth1.visibility = nil
-    meth1.comment = comment 'first'
-
-    @context.add_method meth1
-
-    meth2 = RDoc::AnyMethod.new nil, 'name'
-    meth2.record_location @store.add_file 'second.rb'
-    meth2.comment = comment 'second'
-
-    _, err = verbose_capture_output do
-      @context.add_method meth2
-    end
-
-    expected = 'Duplicate method (unknown)#name in file second.rb, ' \
-               'previously in file first.rb'
-
-    assert_equal expected, err.chomp
-
-    method = @context.method_list.first
-
-    assert_equal 'first', method.comment.text
-  end
-
-  def test_add_method_duplicate_loading
-    @context.store = nil
-
-    meth1 = RDoc::AnyMethod.new nil, 'name'
-    meth1.record_location @store.add_file 'first.rb'
-    meth1.visibility = nil
-    meth1.comment = comment 'first'
-
-    @context.add_method meth1
-
-    meth2 = RDoc::AnyMethod.new nil, 'name'
-    meth2.record_location @store.add_file 'second.rb'
-    meth2.comment = comment 'second'
-
-    _, err = verbose_capture_output do
-      @context.add_method meth2
-    end
-
-    assert_empty err
-
-    method = @context.method_list.first
-
-    assert_equal 'first', method.comment.text
-  end
-
-  def test_add_module
-    @c1.add_module RDoc::NormalModule, 'Mod'
-
-    assert_includes @c1.modules.map { |m| m.full_name }, 'C1::Mod'
-  end
-
-  def test_add_module_alias
-    tl = @store.add_file 'file.rb'
-
-    c4 = RDoc::Constant.new 'C4', '', ''
-    c3_c4 = @c2.add_module_alias @c2_c3, @c2_c3.name, c4, tl
-
-    alias_constant = @c2.constants.first
-
-    assert_equal 'C2::C4', c3_c4.full_name
-    assert_equal tl, alias_constant.file
-  end
-
-  def test_add_module_alias_top_level
-    store = RDoc::Store.new(RDoc::Options.new)
-
-    top_level = store.add_file 'file.rb'
-
-    klass  = top_level.add_class RDoc::NormalClass, 'Klass'
-    klass.comment = 'klass comment'
-
-    object = top_level.add_class RDoc::NormalClass, 'Object'
-
-    a = RDoc::Constant.new 'A', '', ''
-    top_level.add_module_alias klass, klass.name, a, top_level
-
-    refute_empty object.constants
-
-    constant = object.constants.first
-
-    assert_equal 'klass comment', constant.comment
-  end
-
-  def test_add_module_class
-    k = @c1.add_class RDoc::NormalClass, 'Klass', nil
-    m = @c1.add_module RDoc::NormalModule, 'Klass'
-
-    assert_equal k, m, 'returns class'
-    assert_empty @c1.modules
-  end
-
-  def test_add_require
-    req = RDoc::Require.new 'require', 'comment'
-    @c1.add_require req
-
-    assert_empty @c1.requires
-    assert_includes @c1.top_level.requires, req
-  end
-
-  def test_add_section
-    default_section = @context.sections.first
-
-    @context.add_section nil, comment('comment', @top_level)
-
-    assert_equal 1, @context.sections.length
-    assert_equal [comment("comment", @top_level)],
-                 @context.sections.first.comments
-
-    @context.add_section nil, comment('new comment', @top_level)
-
-    assert_equal 1, @context.sections.length
-    assert_equal [comment('comment', @top_level),
-                  comment('new comment', @top_level)],
-                 @context.sections.first.comments
-
-    @context.add_section 'other', comment('', @top_level)
-
-    assert_equal 2, @context.sections.length
-
-    new_section = @context.sections.find { |section| section.title == 'other' }
-    assert new_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_add_section_no_comment
-    default_section = @context.sections.first
-
-    @context.add_section nil
-
-    assert_equal 1, @context.sections.length
-
-    @context.add_section 'other'
-
-    assert_equal 2, @context.sections.length
-
-    new_section = @context.sections.find { |section| section.title == 'other' }
-
-    assert new_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_add_to
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.add_to arr, incl
-
-    assert_includes arr, incl
-    assert_equal @context, incl.parent
-    assert_equal @context.current_section, incl.section
-  end
-
-  def test_add_to_temporary_section
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    section =
-      @context.add_section 'temporary', RDoc::Comment.new('', @top_level)
-    @context.temporary_section = section
-
-    @context.add_to arr, incl
-
-    assert_includes arr, incl
-    assert_equal @context, incl.parent
-    assert_equal section, incl.section
-  end
-
-  def test_add_to_no_document_self
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.document_self = false
-    @context.add_to arr, incl
-
-    refute_includes arr, incl
-  end
-
-  def test_add_to_done_documenting
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.done_documenting = true
-    @context.add_to arr, incl
-
-    refute_includes arr, incl
-  end
-
-  def bench_add_include
-    cm = RDoc::ClassModule.new 'Klass'
-
-    assert_performance_linear 0.5 do |count|
-      count.times do |i|
-        cm.add_include RDoc::Include.new("N::M#{i}", nil)
-      end
-    end
-  end
-
-  def test_child_name
-    assert_equal 'C1::C1', @c1.child_name('C1')
-  end
-
-  def test_classes
-    assert_equal %w[C2::C3], @c2.classes.map { |k| k.full_name }
-    assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name }.sort
-  end
-
-  def test_current_section
-    default_section = @context.current_section
-
-    new_section =
-      @context.add_section 'other', RDoc::Comment.new('', @top_level)
-    @context.temporary_section = new_section
-
-    assert_equal new_section, @context.current_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_equals2
-    assert_equal @c3,    @c3
-    refute_equal @c2,    @c3
-    refute_equal @c2_c3, @c3
-  end
-
-  def test_each_method_enumerator
-    assert_kind_of Enumerator, @c1.each_method
-  end
-
-  def test_each_section
-    sects  = []
-    consts = []
-    attrs  = []
-
-    @c1.each_section do |section, constants, attributes|
-      sects  << section
-      consts << constants
-      attrs  << attributes
-    end
-
-    assert_equal [nil, 'separate'], sects.map { |section| section.title }
-
-    expected_consts = [
-      [@c1.constants.first],
-      [],
-    ]
-
-    assert_equal expected_consts, consts
-
-    expected_attrs = [
-      [@c1.attributes[0], @c1.attributes[3]],
-      [@c1.attributes[1], @c1.attributes[2]],
-    ]
-
-    assert_equal expected_attrs, attrs
-  end
-
-  def test_each_section_only_display
-    sects  = []
-    consts = []
-    attrs  = []
-
-    @c7.each_section do |section, constants, attributes|
-      sects  << section
-      consts << constants
-      attrs  << attributes
-    end
-
-    assert_equal [nil], sects.map { |section| section.title }
-
-    expected_consts = [
-      @c7.constants.select(&:display?).sort
-    ]
-
-    assert_equal expected_consts, consts
-
-    expected_attrs = [
-      @c7.attributes.select(&:display?).sort
-    ]
-
-    assert_equal expected_attrs, attrs
-  end
-
-  def test_each_section_enumerator
-    assert_kind_of Enumerator, @c1.each_section
-  end
-
-  def test_find_attribute_named
-    assert_nil         @c1.find_attribute_named('none')
-    assert_equal 'R',  @c1.find_attribute_named('attr').rw
-    assert_equal 'R',  @c1.find_attribute_named('attr_reader').rw
-    assert_equal 'W',  @c1.find_attribute_named('attr_writer').rw
-    assert_equal 'RW', @c1.find_attribute_named('attr_accessor').rw
-  end
-
-  def test_find_class_method_named
-    assert_nil @c1.find_class_method_named('none')
-
-    m = @c1.find_class_method_named('m')
-    assert_instance_of RDoc::AnyMethod, m
-    assert m.singleton
-  end
-
-  def test_find_constant_named
-    assert_nil             @c1.find_constant_named('NONE')
-    assert_equal ':const', @c1.find_constant_named('CONST').value
-  end
-
-  def test_find_enclosing_module_named
-    assert_nil        @c2_c3.find_enclosing_module_named('NONE')
-    assert_equal @c1, @c2_c3.find_enclosing_module_named('C1')
-    assert_equal @c2, @c2_c3.find_enclosing_module_named('C2')
-  end
-
-  def test_find_instance_method_named
-    assert_nil @c1.find_instance_method_named('none')
-
-    m = @c1.find_instance_method_named('m')
-    assert_instance_of RDoc::AnyMethod, m
-    refute m.singleton
-  end
-
-  def test_find_local_symbol
-    assert_equal true,       @c1.find_local_symbol('m').singleton
-    assert_equal ':const',   @c1.find_local_symbol('CONST').value
-    assert_equal 'R',        @c1.find_local_symbol('attr').rw
-    assert_equal @xref_data, @c1.find_local_symbol(@file_name)
-    assert_equal @c2_c3,     @c2.find_local_symbol('C3')
-  end
-
-  def test_find_method
-    loaded_c2 = Marshal.load Marshal.dump @c2
-    assert_equal @c2_a, loaded_c2.find_method('a', false)
-    assert_equal @c2_b, loaded_c2.find_method('b', false)
-    assert_equal @c2_a, loaded_c2.find_method('a', nil)
-    assert_equal @c2_b, loaded_c2.find_method('b', nil)
-  end
-
-  def test_find_method_named
-    assert_equal true, @c1.find_method_named('m').singleton
-  end
-
-  def test_find_module_named
-    assert_equal @c2_c3, @c2.find_module_named('C3')
-    assert_equal @c2,    @c2.find_module_named('C2')
-    assert_equal @c1,    @c2.find_module_named('C1')
-
-    assert_equal 'C2::C3', @c2.find_module_named('C3').full_name
-  end
-
-  def test_find_symbol
-    c3 = @xref_data.find_module_named('C3')
-    assert_equal c3,     @xref_data.find_symbol('C3')
-    assert_equal c3,     @c2.find_symbol('::C3')
-    assert_equal @c2_c3, @c2.find_symbol('C3')
-  end
-
-  def test_find_symbol_method
-    assert_equal @c1__m, @c1.find_symbol('m')
-    assert_equal @c1_m,  @c1.find_symbol('#m')
-    assert_equal @c1__m, @c1.find_symbol('::m')
-  end
-
-  def test_find_symbol_module
-    assert_nil @m1_m2.find_symbol_module 'N'
-    assert_nil @m1_m2.find_symbol_module 'M2::M1'
-
-    @m1_m2.parent = nil # loaded from legacy ri store
-
-    assert_nil @m1_m2.find_symbol_module 'N'
-    assert_nil @m1_m2.find_symbol_module 'M2::M1'
-  end
-
-  def test_fully_documented_eh
-    context = RDoc::Context.new
-
-    refute context.fully_documented?
-
-    context.comment = 'hi'
-
-    assert context.fully_documented?
-
-    m = @c1_m
-
-    context.add_method m
-
-    refute context.fully_documented?
-
-    m.comment = 'hi'
-
-    assert context.fully_documented?
-
-    c = RDoc::Constant.new 'C', '0', nil
-
-    context.add_constant c
-
-    refute context.fully_documented?
-
-    c.comment = 'hi'
-
-    assert context.fully_documented?
-
-    a = RDoc::Attr.new '', 'a', 'RW', nil
-
-    context.add_attribute a
-
-    refute context.fully_documented?
-
-    a.comment = 'hi'
-
-    assert context.fully_documented?
-  end
-
-  def test_spaceship
-    assert_equal(-1, @c2.<=>(@c3))
-    assert_equal 0,  @c2.<=>(@c2)
-    assert_equal 1,  @c3.<=>(@c2)
-
-    assert_equal 1,  @c2_c3.<=>(@c2)
-    assert_equal(-1, @c2_c3.<=>(@c3))
-
-    assert_nil @c2.<=>(Gem.loaded_specs.values.first)
-  end
-
-  def test_methods_by_type
-    expected = {
-      'instance' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1_plus, @c1_m],
-      },
-      'class' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1__m],
-      },
-    }
-
-    assert_equal expected, @c1.methods_by_type
-  end
-
-  def test_methods_by_type_section
-    separate = @c1.sections_hash['separate']
-    @c1_m.section = separate
-
-    expected = {
-      'instance' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1_m],
-      },
-      'class' => {
-        :private   => [],
-        :protected => [],
-        :public    => [],
-      },
-    }
-
-    assert_equal expected, @c1.methods_by_type(separate)
-  end
-
-  def test_methods_matching
-    methods = []
-
-    @parent.methods_matching 'm' do |m|
-      methods << m
-    end
-
-    assert_equal [@parent_m], methods
-  end
-
-  def test_methods_matching_singleton
-    methods = []
-
-    @parent.methods_matching 'm', true do |m|
-      methods << m
-    end
-
-    assert_equal [@parent__m], methods
-  end
-
-  def test_methods_matching_inherit
-    methods = []
-
-    @child.methods_matching 'm' do |m|
-      methods << m
-    end
-
-    assert_equal [@parent_m], methods
-  end
-
-  def test_remove_invisible_private
-    util_visibilities
-
-    @vis.remove_invisible :private
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_nodoc
-    util_visibilities
-
-    @vis.remove_invisible :nodoc
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_protected
-    util_visibilities
-
-    @vis.remove_invisible :protected
-
-    assert_equal [@pub, @prot], @vis.method_list
-    assert_equal [@apub, @aprot], @vis.attributes
-    assert_equal [@cpub], @vis.constants
-  end
-
-  def test_remove_invisible_public
-    util_visibilities
-
-    @vis.remove_invisible :public
-
-    assert_equal [@pub], @vis.method_list
-    assert_equal [@apub], @vis.attributes
-    assert_equal [@cpub], @vis.constants
-  end
-
-  def test_remove_invisible_public_force
-    util_visibilities
-
-    @priv.force_documentation = true
-    @prot.force_documentation = true
-    @apriv.force_documentation = true
-    @aprot.force_documentation = true
-    @cpriv.force_documentation = true
-
-    @vis.remove_invisible :public
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_in_protected
-    util_visibilities
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :protected
-
-    assert_equal [@pub, @prot], methods
-  end
-
-  def test_remove_invisible_in_protected_force
-    util_visibilities
-
-    @priv.force_documentation = true
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :protected
-
-    assert_equal [@pub, @prot, @priv], methods
-  end
-
-  def test_remove_invisible_in_public
-    util_visibilities
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :public
-
-    assert_equal [@pub], methods
-  end
-
-  def test_remove_invisible_in_public_force
-    util_visibilities
-
-    @prot.force_documentation = true
-    @priv.force_documentation = true
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :public
-
-    assert_equal [@pub, @prot, @priv], methods
-  end
-
-  def test_section_contents
-    default = @context.sections.first
-    @context.add_method RDoc::AnyMethod.new(nil, 'm1')
-
-    b = @context.add_section 'B'
-    m = @context.add_method RDoc::AnyMethod.new(nil, 'm2')
-    m.section = b
-
-    assert_equal [default, b], @context.section_contents
-  end
-
-  def test_section_contents_no_default
-    @context = RDoc::Context.new
-    b = @context.add_section 'B'
-    m = @context.add_method RDoc::AnyMethod.new(nil, 'm')
-    m.section = b
-
-    assert_equal [b], @context.section_contents
-  end
-
-  def test_section_contents_only_default
-    @context = RDoc::Context.new
-
-    @context.add_method RDoc::AnyMethod.new(nil, 'm')
-
-    assert_empty @context.section_contents
-  end
-
-  def test_section_contents_unused
-    @context = RDoc::Context.new
-
-    @context.add_method RDoc::AnyMethod.new(nil, 'm')
-    @context.add_section 'B'
-
-    assert_empty @context.section_contents
-  end
-
-  def test_set_current_section
-    default_section = @context.sections.first
-
-    @context.set_current_section nil, RDoc::Comment.new('', @top_level)
-
-    assert_equal default_section, @context.current_section
-
-    @context.set_current_section 'other', RDoc::Comment.new('', @top_level)
-
-    new_section = @context.sections.find { |section|
-      section != default_section
-    }
-
-    assert_equal new_section, @context.current_section
-  end
-
-  def test_sort_sections
-    c = RDoc::Context.new
-    c.add_section 'C'
-    c.add_section 'A'
-    c.add_section 'B'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'A', 'B', 'C'], titles
-  end
-
-  def test_sort_sections_tomdoc
-    c = RDoc::Context.new
-    c.add_section 'Public'
-    c.add_section 'Internal'
-    c.add_section 'Deprecated'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'Public', 'Internal', 'Deprecated'], titles
-  end
-
-  def test_sort_sections_tomdoc_missing
-    c = RDoc::Context.new
-    c.add_section 'Internal'
-    c.add_section 'Public'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'Public', 'Internal'], titles
-  end
-
-  def test_visibility_def
-    assert_equal :private, @c6.find_method_named('priv1').visibility
-    assert_equal :protected, @c6.find_method_named('prot1').visibility
-    assert_equal :public, @c6.find_method_named('pub1').visibility
-    assert_equal :private, @c6.find_method_named('priv2').visibility
-    assert_equal :protected, @c6.find_method_named('prot2').visibility
-    assert_equal :public, @c6.find_method_named('pub2').visibility
-    assert_equal :private, @c6.find_method_named('priv3').visibility
-    assert_equal :protected, @c6.find_method_named('prot3').visibility
-    assert_equal :public, @c6.find_method_named('pub3').visibility
-    assert_equal :private, @c6.find_method_named('priv4').visibility
-    assert_equal :protected, @c6.find_method_named('prot4').visibility
-    assert_equal :public, @c6.find_method_named('pub4').visibility
-    assert_equal :private, @c6.find_method_named('priv5').visibility
-    assert_equal :protected, @c6.find_method_named('prot5').visibility
-    assert_equal :public, @c6.find_method_named('pub5').visibility
-    assert_equal :private, @c6.find_method_named('priv6').visibility
-    assert_equal :protected, @c6.find_method_named('prot6').visibility
-    assert_equal :public, @c6.find_method_named('pub6').visibility
-    assert_equal :public, @c6.find_method_named('s_pub1').visibility
-    assert_equal :public, @c6.find_method_named('s_pub2').visibility
-    assert_equal :public, @c6.find_method_named('s_pub3').visibility
-    assert_equal :public, @c6.find_method_named('s_pub4').visibility
-    assert_equal :private, @c6.find_method_named('s_priv1').visibility
-    assert_equal :protected, @c6.find_method_named('s_prot1').visibility
-  end
-
-  def util_visibilities
-    @pub  = RDoc::AnyMethod.new nil, 'pub'
-    @prot = RDoc::AnyMethod.new nil, 'prot'
-    @priv = RDoc::AnyMethod.new nil, 'priv'
-
-    @apub  = RDoc::Attr.new nil, 'pub',  'RW', nil
-    @aprot = RDoc::Attr.new nil, 'prot', 'RW', nil
-    @apriv = RDoc::Attr.new nil, 'priv', 'RW', nil
-
-    @cpub  = RDoc::Constant.new 'CONST_PUBLIC', nil, nil
-    @cpriv = RDoc::Constant.new 'CONST_PRIVATE', nil, nil
-
-    @vis = RDoc::NormalClass.new 'Vis'
-    @vis.add_method @pub
-    @vis.add_method @prot
-    @vis.add_method @priv
-
-    @vis.add_attribute @apub
-    @vis.add_attribute @aprot
-    @vis.add_attribute @apriv
-
-    @vis.add_constant @cpub
-    @vis.add_constant @cpriv
-
-    @prot.visibility = :protected
-    @priv.visibility = :private
-
-    @aprot.visibility = :protected
-    @apriv.visibility = :private
-
-    @cpriv.visibility = :private
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_cross_reference_test.rb b/test/mri/rdoc/rdoc/rdoc_cross_reference_test.rb
deleted file mode 100644
index 4f24fd77009..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_cross_reference_test.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocCrossReferenceTest < XrefTestCase
-  EXAMPLE_METHODS = %w'== === != =~ !~ < > <= >= <=> [] []= << >>
-    -@ +@ ! - + * / % ** !@ ` | & ^ ~ __id__
-  '
-
-  def setup
-    super
-
-    @xref = RDoc::CrossReference.new @c1
-  end
-
-  def assert_ref(expected, name)
-    assert_equal expected, @xref.resolve(name, 'fail')
-  end
-
-  def refute_ref(name)
-    assert_equal name, @xref.resolve(name, name)
-  end
-
-  def test_METHOD_REGEXP_STR
-    re = /\A(?:#{RDoc::CrossReference::METHOD_REGEXP_STR})\z/
-
-    EXAMPLE_METHODS.each do |x|
-      re =~ x
-      assert_equal x, $&
-    end
-  end
-
-  def test_resolve_C2
-    @xref = RDoc::CrossReference.new @c2
-
-    refute_ref '#m'
-
-    assert_ref @c1__m,    'C1::m'
-    assert_ref @c2_c3,    'C2::C3'
-    assert_ref @c2_c3_m,  'C2::C3#m'
-    assert_ref @c2_c3_h1, 'C3::H1'
-    assert_ref @c4,       'C4'
-
-    assert_ref @c3_h2, 'C3::H2'
-    refute_ref 'H1'
-  end
-
-  def test_resolve_C2_C3
-    @xref = RDoc::CrossReference.new @c2_c3
-
-    assert_ref @c2_c3_m, '#m'
-
-    assert_ref @c2_c3, 'C3'
-    assert_ref @c2_c3_m, 'C3#m'
-
-    assert_ref @c2_c3_h1, 'H1'
-    assert_ref @c2_c3_h1, 'C3::H1'
-
-    assert_ref @c4, 'C4'
-
-    assert_ref @c3_h2, 'C3::H2'
-  end
-
-  def test_resolve_C3
-    @xref = RDoc::CrossReference.new @c3
-
-    assert_ref @c3, 'C3'
-
-    refute_ref '#m'
-    refute_ref 'C3#m'
-
-    assert_ref @c3_h1, 'H1'
-
-    assert_ref @c3_h1, 'C3::H1'
-    assert_ref @c3_h2, 'C3::H2'
-
-    assert_ref @c4, 'C4'
-  end
-
-  def test_resolve_C4
-    @xref = RDoc::CrossReference.new @c4
-
-    # C4 ref inside a C4 containing a C4 should resolve to the contained class
-    assert_ref @c4_c4, 'C4'
-  end
-
-  def test_resolve_C4_C4
-    @xref = RDoc::CrossReference.new @c4_c4
-
-    # A C4 reference inside a C4 class contained within a C4 class should
-    # resolve to the inner C4 class.
-    assert_ref @c4_c4, 'C4'
-  end
-
-  def test_resolve_class_and_method_of_the_same_name
-    assert_ref @c10_class, 'C10'
-    assert_ref @c10_method, '#C10'
-    assert_ref @c11_class, 'C11'
-    assert_ref @c11_method, '#C11'
-    assert_ref @c10_c11_class, 'C10::C11'
-    assert_ref @c10_c11_method, 'C10#C11'
-  end
-
-  def test_resolve_class
-    assert_ref @c1, 'C1'
-    refute_ref 'H1'
-
-    assert_ref @c2,       'C2'
-    assert_ref @c2_c3,    'C2::C3'
-    assert_ref @c2_c3_h1, 'C2::C3::H1'
-
-    assert_ref @c3,    '::C3'
-    assert_ref @c3_h1, '::C3::H1'
-
-    assert_ref @c4_c4, 'C4::C4'
-  end
-
-  def test_resolve_file
-    refute_ref 'xref_data.rb'
-  end
-
-  def test_resolve_method
-    assert_ref @c1__m,    'm'
-    assert_ref @c1__m,    '::m'
-    assert_ref @c1_m,     '#m'
-    assert_ref @c1_plus,  '#+'
-
-    assert_ref @c1_m,     'C1#m'
-    assert_ref @c1_plus,  'C1#+'
-    assert_ref @c1__m,    'C1.m'
-    assert_ref @c1__m,    'C1::m'
-
-    assert_ref @c1_m, 'C1#m'
-    assert_ref @c1_m, 'C1#m()'
-    assert_ref @c1_m, 'C1#m(*)'
-
-    assert_ref @c1_plus, 'C1#+'
-    assert_ref @c1_plus, 'C1#+()'
-    assert_ref @c1_plus, 'C1#+(*)'
-
-    assert_ref @c1__m, 'C1.m'
-    assert_ref @c1__m, 'C1.m()'
-    assert_ref @c1__m, 'C1.m(*)'
-
-    assert_ref @c1__m, 'C1::m'
-    assert_ref @c1__m, 'C1::m()'
-    assert_ref @c1__m, 'C1::m(*)'
-
-    assert_ref @c2_c3_m, 'C2::C3#m'
-
-    assert_ref @c2_c3_m, 'C2::C3.m'
-
-    # TODO stop escaping - HTML5 allows anything but space
-    assert_ref @c2_c3_h1_meh, 'C2::C3::H1#m?'
-
-    assert_ref @c2_c3_m, '::C2::C3#m'
-    assert_ref @c2_c3_m, '::C2::C3#m()'
-    assert_ref @c2_c3_m, '::C2::C3#m(*)'
-  end
-
-  def test_resolve_the_same_name_in_instance_and_class_method
-    assert_ref @c9_a_i_foo, 'C9::A#foo'
-    assert_ref @c9_a_c_bar, 'C9::A::bar'
-    assert_ref @c9_b_c_foo, 'C9::B::foo'
-    assert_ref @c9_b_i_bar, 'C9::B#bar'
-    assert_ref @c9_b_c_foo, 'C9::B.foo'
-    assert_ref @c9_a_c_bar, 'C9::B.bar'
-  end
-
-  def test_resolve_page
-    page = @store.add_file 'README.txt', parser: RDoc::Parser::Simple
-
-    assert_ref page, 'README'
-  end
-
-  def assert_resolve_method(x)
-    @c1.methods_hash.clear
-
-    i_op = RDoc::AnyMethod.new nil, x
-    @c1.add_method i_op
-
-    c_op = RDoc::AnyMethod.new nil, x, singleton: true
-    @c1.add_method c_op
-
-    assert_ref i_op, x
-    assert_ref i_op, "##{x}"
-    assert_ref c_op, "::#{x}"
-
-    assert_ref i_op, "C1##{x}"
-    assert_ref c_op, "C1::#{x}"
-  end
-
-  EXAMPLE_METHODS.each do |x|
-    define_method("test_resolve_method:#{x}") do
-      assert_resolve_method(x)
-    end
-  end
-
-  def test_resolve_no_ref
-    assert_equal '', @xref.resolve('', '')
-
-    assert_equal "bogus",     @xref.resolve("bogus",     "bogus")
-    assert_equal "\\bogus",   @xref.resolve("\\bogus",   "\\bogus")
-    assert_equal "\\\\bogus", @xref.resolve("\\\\bogus", "\\\\bogus")
-
-    assert_equal "\\#n",    @xref.resolve("\\#n",    "fail")
-    assert_equal "\\#n()",  @xref.resolve("\\#n()",  "fail")
-    assert_equal "\\#n(*)", @xref.resolve("\\#n(*)", "fail")
-
-    assert_equal "C1",   @xref.resolve("\\C1",   "fail")
-    assert_equal "::C3", @xref.resolve("\\::C3", "fail")
-
-    assert_equal "succeed",      @xref.resolve("::C3::H1#n",    "succeed")
-    assert_equal "succeed",      @xref.resolve("::C3::H1#n(*)", "succeed")
-    assert_equal "\\::C3::H1#n", @xref.resolve("\\::C3::H1#n",  "fail")
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_encoding_test.rb b/test/mri/rdoc/rdoc/rdoc_encoding_test.rb
deleted file mode 100644
index fdb42afd7fd..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_encoding_test.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocEncodingTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new 'test_rdoc_encoding'
-  end
-
-  def teardown
-    @tempfile.close!
-
-    super
-  end
-
-  def test_class_read_file
-    @tempfile.write "hi everybody"
-    @tempfile.flush
-
-    assert_equal "hi everybody", RDoc::Encoding.read_file(@tempfile.path, nil)
-  end
-
-  def test_class_read_file_encoding
-    expected = "# coding: utf-8\nhi everybody"
-
-    @tempfile.write expected
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal "# coding: utf-8\nhi everybody", contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_read_file_encoding_convert
-    content = ""
-    content = RDoc::Encoding.change_encoding content, 'ISO-8859-1'
-    content << "# coding: ISO-8859-1\nhi \xE9verybody"
-
-    @tempfile.write content
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal Encoding::UTF_8, contents.encoding
-    assert_equal "# coding: ISO-8859-1\nhi \u00e9verybody", contents.sub("\r", '')
-  end
-
-  def test_class_read_file_encoding_fail
-    @tempfile.write "# coding: utf-8\n\317\200" # pi
-    @tempfile.flush
-
-    contents = :junk
-
-    _, err = verbose_capture_output do
-      contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII
-    end
-
-    assert_nil contents
-
-    assert_match %r%^unable to convert%, err
-  end
-
-  def test_class_read_file_encoding_fancy
-    expected = "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody"
-    expected = RDoc::Encoding.change_encoding expected, Encoding::UTF_8
-
-    @tempfile.write expected
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody", contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_read_file_encoding_force_transcode
-    @tempfile.write "# coding: utf-8\n\317\200" # pi
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII, true
-
-    assert_equal "# coding: utf-8\n?", contents
-    assert_equal Encoding::US_ASCII, contents.encoding
-  end
-
-  def test_class_read_file_encoding_guess
-    path = File.expand_path '../test.ja.txt', __FILE__
-    content = RDoc::Encoding.read_file path, Encoding::UTF_8
-
-    assert_equal Encoding::UTF_8, content.encoding
-  end
-
-  def test_class_read_file_encoding_invalid
-    @tempfile.write "# coding: ascii\nM\xE4r"
-    @tempfile.flush
-
-    contents = :junk
-    _, err = verbose_capture_output do
-      contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    end
-
-    assert_equal "unable to convert \"\\xE4\" on US-ASCII for #{@tempfile.path}, skipping\n", err
-
-    assert_nil contents
-  end
-
-  def test_class_read_file_encoding_with_signature
-    @tempfile.write "\xEF\xBB\xBFhi everybody"
-    @tempfile.flush
-
-    bug3360 = '[ruby-dev:41452]'
-    content = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal Encoding::UTF_8, content.encoding, bug3360
-    assert_equal "hi everybody", content, bug3360
-  end
-
-  def test_class_read_file_encoding_iso_2022_jp
-    input = "# coding: ISO-2022-JP\n:\e$B%3%^%s%I\e(B:"
-
-    @tempfile.write input
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-
-    expected = "# coding: ISO-2022-JP\n:\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89:"
-    expected = RDoc::Encoding.change_encoding expected, Encoding::UTF_8
-
-    assert_equal expected, contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_detect_encoding
-    s = "# coding: UTF-8\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    # sanity check for 1.8
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "#!/bin/ruby\n# coding: UTF-8\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "<?xml version='1.0' encoding='UTF-8'?>\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "<?xml version='1.0' encoding=\"UTF-8\"?>\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-  end
-
-  def test_class_set_encoding_bad
-    s = ""
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    s = "# vim:set fileencoding=utf-8:\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    s = "# vim:set fileencoding=utf-8:\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    assert_raise ArgumentError do
-      s = RDoc::Encoding.detect_encoding "# -*- encoding: undecided -*-\n"
-    end
-  end
-
-  def test_sanity
-    assert_equal Encoding::US_ASCII, ''.encoding,
-                 'If this file is not ASCII tests may incorrectly pass'
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_extend_test.rb b/test/mri/rdoc/rdoc/rdoc_extend_test.rb
deleted file mode 100644
index cf13eba0c51..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_extend_test.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocExtendTest < XrefTestCase
-
-  def setup
-    super
-
-    @ext = RDoc::Extend.new 'M1', 'comment'
-    @ext.parent = @m1
-    @ext.store = @store
-  end
-
-  def test_module
-    assert_equal @m1, @ext.module
-    assert_equal 'Unknown', RDoc::Extend.new('Unknown', 'comment').module
-  end
-
-  def test_module_extended
-    m1 = @xref_data.add_module RDoc::NormalModule, 'Mod1'
-                  m1.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2       = m1.add_module RDoc::NormalModule, 'Mod2'
-    m1_m2_m3    = m1_m2.add_module RDoc::NormalModule, 'Mod3'
-                  m1_m2_m3.add_module RDoc::NormalModule, 'Mod4'
-                  m1_m2.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_k0    = m1_m2.add_class RDoc::NormalClass, 'Klass0'
-    m1_m2_k0_m4 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod4'
-                  m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod6'
-                  m1_m2_k0.add_module RDoc::NormalModule, 'Mod5'
-
-    e0_m4 = RDoc::Extend.new 'Mod4', nil
-    e0_m5 = RDoc::Extend.new 'Mod5', nil
-    e0_m6 = RDoc::Extend.new 'Mod6', nil
-    e0_m1 = RDoc::Extend.new 'Mod1', nil
-    e0_m2 = RDoc::Extend.new 'Mod2', nil
-    e0_m3 = RDoc::Extend.new 'Mod3', nil
-
-    m1_m2_k0.add_extend e0_m4
-    m1_m2_k0.add_extend e0_m5
-    m1_m2_k0.add_extend e0_m6
-    m1_m2_k0.add_extend e0_m1
-    m1_m2_k0.add_extend e0_m2
-    m1_m2_k0.add_extend e0_m3
-
-    assert_equal [e0_m4, e0_m5, e0_m6, e0_m1, e0_m2, e0_m3], m1_m2_k0.extends
-    assert_equal [@object, 'BasicObject'], m1_m2_k0.ancestors
-
-    m1_k1 = m1.add_class RDoc::NormalClass, 'Klass1'
-
-    e1_m1 = RDoc::Extend.new 'Mod1', nil
-    e1_m2 = RDoc::Extend.new 'Mod2', nil
-    e1_m3 = RDoc::Extend.new 'Mod3', nil
-    e1_m4 = RDoc::Extend.new 'Mod4', nil
-    e1_k0_m4 = RDoc::Extend.new 'Klass0::Mod4', nil
-
-    m1_k1.add_extend e1_m1
-    m1_k1.add_extend e1_m2
-    m1_k1.add_extend e1_m3
-    m1_k1.add_extend e1_m4
-    m1_k1.add_extend e1_k0_m4
-
-    assert_equal [e1_m1, e1_m2, e1_m3, e1_m4, e1_k0_m4], m1_k1.extends
-    assert_equal [@object, 'BasicObject'], m1_k1.ancestors
-
-    m1_k2 = m1.add_class RDoc::NormalClass, 'Klass2'
-
-    e2_m1 = RDoc::Extend.new 'Mod1', nil
-    e2_m2 = RDoc::Extend.new 'Mod2', nil
-    e2_m3 = RDoc::Extend.new 'Mod3', nil
-    e2_k0_m4 = RDoc::Extend.new 'Klass0::Mod4', nil
-
-    m1_k2.add_extend e2_m1
-    m1_k2.add_extend e2_m3
-    m1_k2.add_extend e2_m2
-    m1_k2.add_extend e2_k0_m4
-
-    assert_equal [e2_m1, e2_m3, e2_m2, e2_k0_m4], m1_k2.extends
-    assert_equal [@object, 'BasicObject'], m1_k2.ancestors
-
-    m1_k3 = m1.add_class RDoc::NormalClass, 'Klass3'
-
-    e3_m1 = RDoc::Extend.new 'Mod1', nil
-    e3_m2 = RDoc::Extend.new 'Mod2', nil
-    e3_m4 = RDoc::Extend.new 'Mod4', nil
-
-    m1_k3.add_extend e3_m1
-    m1_k3.add_extend e3_m2
-    m1_k3.add_extend e3_m4
-
-    assert_equal [e3_m1, e3_m2, e3_m4], m1_k3.extends
-    assert_equal [@object, 'BasicObject'], m1_k3.ancestors
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_generator_darkfish_test.rb b/test/mri/rdoc/rdoc/rdoc_generator_darkfish_test.rb
deleted file mode 100644
index 67715951ecb..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_generator_darkfish_test.rb
+++ /dev/null
@@ -1,593 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorDarkfishTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @lib_dir = "#{@pwd}/lib"
-    $LOAD_PATH.unshift @lib_dir # ensure we load from this RDoc
-
-    @options = RDoc::Options.new
-    @options.option_parser = OptionParser.new
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_darkfish_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-    Dir.chdir @tmpdir
-    @options.op_dir = @tmpdir
-    @options.generator = RDoc::Generator::Darkfish
-
-    $LOAD_PATH.each do |path|
-      darkfish_dir = File.join path, 'rdoc/generator/template/darkfish/'
-      next unless File.directory? darkfish_dir
-      @options.template_dir = darkfish_dir
-      break
-    end
-
-    @rdoc.options = @options
-
-    @g = @options.generator.new @store, @options
-    @rdoc.generator = @g
-
-    @top_level = @store.add_file 'file.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-    @klass = @top_level.add_class RDoc::NormalClass, 'Klass'
-
-    @alias_constant = RDoc::Constant.new 'A', nil, ''
-    @alias_constant.record_location @top_level
-
-    @top_level.add_constant @alias_constant
-
-    @klass.add_module_alias @klass, @klass.name, @alias_constant, @top_level
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_with_html_tag_yield = RDoc::AnyMethod.new nil, 'method_with_html_tag_yield'
-    @meth_with_html_tag_yield.block_params = '%<<script>alert("atui")</script>>, yield_arg'
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_method @meth_with_html_tag_yield
-    @klass.add_attribute @attr
-
-    @ignored = @top_level.add_class RDoc::NormalClass, 'Ignored'
-    @ignored.ignore
-
-    @store.complete :private
-
-    @object      = @store.find_class_or_module 'Object'
-    @klass_alias = @store.find_class_or_module 'Klass::A'
-  end
-
-  def teardown
-    super
-
-    $LOAD_PATH.shift
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-    @klass.add_class RDoc::NormalClass, 'Inner'
-    @klass.add_comment <<~RDOC, top_level
-    = Heading 1
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-    == Heading 1.1
-    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-    === Heading 1.1.1
-    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-    ==== Heading 1.1.1.1
-    consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-    == Heading 1.2
-    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-    == Heading 1.3
-    non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    === Heading 1.3.1
-    etc etc...
-    RDOC
-
-    @g.generate
-
-    assert_file 'index.html'
-    assert_file 'Object.html'
-    assert_file 'Klass.html'
-    assert_file 'Klass/Inner.html'
-    assert_file 'table_of_contents.html'
-    assert_file 'js/search_index.js'
-
-    assert_hard_link 'css/rdoc.css'
-    assert_hard_link 'css/fonts.css'
-
-    assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
-    assert_hard_link 'fonts/SourceCodePro-Regular.ttf'
-
-    encoding = Regexp.escape Encoding::UTF_8.name
-
-    assert_match %r%<meta charset="#{encoding}">%, File.binread('index.html')
-    assert_match %r%<meta charset="#{encoding}">%, File.binread('Object.html')
-
-    refute_match(/Ignored/, File.binread('index.html'))
-    summary = File.binread('index.html')[%r[<summary.*Klass\.html.*</summary>.*</details>]m]
-    assert_match(%r[Klass/Inner\.html".*>Inner<], summary)
-
-    klass = File.binread('Klass.html')
-    klassnav = klass[%r[<div class="nav-section">.*]m]
-    assert_match(
-      %r[<li>\s*<details open>\s*<summary>\s*<a href=\S+>Heading 1</a>\s*</summary>\s*<ul]m,
-      klassnav
-    )
-    assert_match(
-      %r[<li>\s*<a href=\S+>Heading 1.1.1.1</a>\s*</ul>\s*</details>\s*</li>]m,
-      klassnav
-    )
-
-    assert_match(/<h1 id="class-Klass-label-Heading\+1">Heading 1(?!\.)/,
-                 klass[%r[<section class=\"description\">.*</section>]m])
-    toc = File.binread('table_of_contents.html')
-    assert_match(
-      %r[<a\s+href="Klass\.html#class-Klass-label-Heading\+1">Heading 1</a>]m,
-      toc[%r[<h2\s+id=\"classes\">.*(?=<h2\b)]m][%r[<a\s+href="Klass\.html".*(?=</li\b)]m]
-    )
-  end
-
-  def test_generate_index_with_main_page
-    top_level = @store.add_file 'file.rb'
-    top_level.comment = <<~RDOC
-    = Heading 1
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-    == Heading 1.1
-    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-    === Heading 1.1.1
-    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-    ==== Heading 1.1.1.1
-    consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-    == Heading 1.2
-    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-    == Heading 1.3
-    non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    === Heading 1.3.1
-    etc etc...
-    RDOC
-
-    @options.main_page = 'file.rb'
-    @options.title = 'My awesome Ruby project'
-
-    @g.generate
-
-    assert_file 'index.html'
-    assert_file 'table_of_contents.html'
-    assert_file 'js/search_index.js'
-
-    assert_hard_link 'css/rdoc.css'
-    assert_hard_link 'css/fonts.css'
-
-    assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
-    assert_hard_link 'fonts/SourceCodePro-Regular.ttf'
-
-    index_html = File.binread('index.html')
-
-    assert_include index_html, "<h3>Table of Contents</h3>"
-    assert_include index_html, '<h1 id="label-Heading+1">Heading 1'
-    # When there's a main page, the default description should not be shown
-    assert_not_include index_html, 'This is the API documentation for My awesome Ruby project.'
-  end
-
-  def test_generate_index_without_main_page
-    top_level = @store.add_file 'file.rb'
-    top_level.comment = <<~RDOC
-    = Heading 1
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-    == Heading 1.1
-    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-    === Heading 1.1.1
-    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-    ==== Heading 1.1.1.1
-    consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-    == Heading 1.2
-    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-    == Heading 1.3
-    non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    === Heading 1.3.1
-    etc etc...
-    RDOC
-
-    @options.title = 'My awesome Ruby project'
-
-    @g.generate
-
-    assert_file 'index.html'
-    assert_file 'table_of_contents.html'
-    assert_file 'js/search_index.js'
-
-    assert_hard_link 'css/rdoc.css'
-    assert_hard_link 'css/fonts.css'
-
-    assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
-    assert_hard_link 'fonts/SourceCodePro-Regular.ttf'
-
-    index_html = File.binread('index.html')
-
-    # If there is no main page, the index page should not have a table of contents
-    assert_not_include index_html, "<h3>Table of Contents</h3>"
-    assert_include index_html, 'This is the API documentation for My awesome Ruby project.'
-  end
-
-  def test_generate_page
-    @store.add_file 'outer.rdoc', parser: RDoc::Parser::Simple
-    @store.add_file 'outer/inner.rdoc', parser: RDoc::Parser::Simple
-    @g.generate
-    assert_file 'outer_rdoc.html'
-    assert_file 'outer/inner_rdoc.html'
-    index = File.binread('index.html')
-    re = %r[<summary><a href="\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, index)
-    summary = index[re]
-    assert_match %r[<a href="\./outer/inner_rdoc.html">inner</a>], summary
-    re = %r[<details open><summary><a href="\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, File.binread('outer_rdoc.html'))
-    re = %r[<details open><summary><a href="\.\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, File.binread('outer/inner_rdoc.html'))
-  end
-
-  def test_generate_dry_run
-    @g.dry_run = true
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    refute_file 'index.html'
-    refute_file 'Object.html'
-  end
-
-  def test_generate_static
-    FileUtils.mkdir_p 'dir/images'
-    FileUtils.touch 'dir/images/image.png'
-    FileUtils.mkdir_p 'file'
-    FileUtils.touch 'file/file.txt'
-
-    @options.static_path = [
-      File.expand_path('dir'),
-      File.expand_path('file/file.txt'),
-    ]
-
-    @g.generate
-
-    assert_file 'images/image.png'
-    assert_file 'file.txt'
-  end
-
-  def test_generate_static_dry_run
-    FileUtils.mkdir 'static'
-    FileUtils.touch 'static/image.png'
-
-    @options.static_path = [File.expand_path('static')]
-    @g.dry_run = true
-
-    @g.generate
-
-    refute_file 'image.png'
-  end
-
-  def test_install_rdoc_static_file
-    src = Pathname File.expand_path(__FILE__, @pwd)
-    dst = File.join @tmpdir, File.basename(src)
-    options = {}
-
-    @g.install_rdoc_static_file src, dst, options
-
-    assert_file dst
-    assert_hard_link dst
-  end
-
-  def test_install_rdoc_static_file_missing
-    src = Pathname(__FILE__) + 'nonexistent'
-    dst = File.join @tmpdir, File.basename(src)
-    options = {}
-
-    @g.install_rdoc_static_file src, dst, options
-
-    refute_file dst
-  end
-
-  def test_setup
-    @g.setup
-
-    assert_equal [@klass_alias, @ignored, @klass, @object],
-                 @g.classes.sort_by { |klass| klass.full_name }
-    assert_equal [@top_level],                           @g.files
-    assert_equal [@meth, @meth, @meth_bang, @meth_bang, @meth_with_html_tag_yield, @meth_with_html_tag_yield], @g.methods
-    assert_equal [@klass_alias, @klass, @object], @g.modsort
-  end
-
-  def test_template_for
-    classpage = Pathname.new @options.template_dir + 'class.rhtml'
-
-    template = @g.send(:template_for, classpage, true, RDoc::ERBIO)
-    assert_kind_of RDoc::ERBIO, template
-
-    assert_same template, @g.send(:template_for, classpage)
-  end
-
-  def test_template_for_dry_run
-    classpage = Pathname.new @options.template_dir + 'class.rhtml'
-
-    template = @g.send(:template_for, classpage, true, ERB)
-    assert_kind_of ERB, template
-
-    assert_same template, @g.send(:template_for, classpage)
-  end
-
-  def test_template_for_partial
-    partial = Pathname.new @options.template_dir + '_sidebar_classes.rhtml'
-
-    template = @g.send(:template_for, partial, false, RDoc::ERBPartial)
-
-    assert_kind_of RDoc::ERBPartial, template
-
-    assert_same template, @g.send(:template_for, partial)
-  end
-
-  def test_generated_method_with_html_tag_yield
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    path = File.join @tmpdir, 'A.html'
-
-    f = open(path)
-    internal_file = f.read
-    method_name_index = internal_file.index('<span class="method-name">method_with_html_tag_yield</span>')
-    last_of_method_name_index = method_name_index + internal_file[method_name_index..-1].index('<div class="method-description">') - 1
-    method_name = internal_file[method_name_index..last_of_method_name_index]
-    f.close
-
-    assert_includes method_name, '{ |%&lt;&lt;script&gt;alert(&quot;atui&quot;)&lt;/script&gt;&gt;, yield_arg| ... }'
-  end
-
-  def test_generated_filename_with_html_tag
-    filename = '"><em>should be escaped'
-    begin # in @tmpdir
-      File.write(filename, '')
-    rescue SystemCallError
-      # ", <, > chars are prohibited as filename
-      return
-    else
-      File.unlink(filename)
-    end
-    @store.add_file filename
-    doc = @store.all_files.last
-    doc.parser = RDoc::Parser::Simple
-
-    @g.generate
-
-    Dir.glob("*.html", base: @tmpdir) do |html|
-      File.binread(File.join(@tmpdir, html)).scan(/.*should be escaped.*/) do |line|
-        assert_not_include line, "<em>", html
-      end
-    end
-  end
-
-  def test_template_stylesheets
-    css = Tempfile.create(%W'hoge .css', Dir.mktmpdir('tmp', '.'))
-    File.write(css, '')
-    css.close
-    base = File.basename(css)
-    refute_file(base)
-
-    @options.template_stylesheets << css
-
-    @g.generate
-
-    assert_file base
-    assert_include File.binread('index.html'), %Q[href="./#{base}"]
-  end
-
-  def test_html_lang
-    @g.generate
-
-    content = File.binread("index.html")
-    assert_include(content, '<html lang="en">')
-  end
-
-  def test_html_lang_from_locale
-    @options.locale = RDoc::I18n::Locale.new 'ja'
-    @g.generate
-
-    content = File.binread("index.html")
-    assert_include(content, '<html lang="ja">')
-  end
-
-  def test_title
-    title = "RDoc Test".freeze
-    @options.title = title
-    @g.generate
-
-    assert_main_title(File.binread('index.html'), title)
-  end
-
-  def test_title_escape
-    title = %[<script>alert("RDoc")</script>].freeze
-    @options.title = title
-    @g.generate
-
-    assert_main_title(File.binread('index.html'), title)
-  end
-
-  def test_meta_tags_for_index
-    @options.title = "My awesome Ruby project"
-    @g.generate
-
-    content = File.binread("index.html")
-
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,My awesome Ruby project">')
-    assert_include(content, '<meta name="description" content="Documentation for My awesome Ruby project">')
-  end
-
-  def test_meta_tags_for_classes
-    top_level = @store.add_file("file.rb")
-    top_level.add_class(@klass.class, @klass.name)
-    inner = @klass.add_class(RDoc::NormalClass, "Inner")
-    inner.add_comment("This is a normal class. It is fully documented.", top_level)
-
-    @g.generate
-
-    content = File.binread("Klass/Inner.html")
-    assert_include(content, '<meta name="keywords" content="ruby,class,Klass::Inner">')
-    assert_include(
-      content,
-      '<meta name="description" content="class Klass::Inner: This is a normal class. It is fully documented.">',
-    )
-  end
-
-  def test_meta_tags_for_rdoc_files
-    top_level = @store.add_file("CONTRIBUTING.rdoc", parser: RDoc::Parser::Simple)
-    top_level.comment = <<~RDOC
-      = Contributing
-
-      Here are the instructions for contributing. Begin by installing Ruby.
-    RDOC
-
-    @g.generate
-
-    content = File.binread("CONTRIBUTING_rdoc.html")
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,CONTRIBUTING">')
-    assert_include(
-      content,
-      "<meta name=\"description\" content=\"CONTRIBUTING: Contributing Here are the instructions for contributing." \
-      " Begin by installing Ruby.\">",
-    )
-  end
-
-  def test_meta_tags_for_markdown_files_paragraph
-    top_level = @store.add_file("README.md", parser: RDoc::Parser::Simple)
-    top_level.comment = <<~MARKDOWN
-      # Distributed Ruby: dRuby
-
-      dRuby is a distributed object system for Ruby.  It allows an object.
-    MARKDOWN
-
-    @g.generate
-
-    content = File.binread("README_md.html")
-    assert_include(
-      content,
-      "<meta name=\"description\" content=\"" \
-      "README: dRuby " \
-      "dRuby is a distributed object system for Ruby. " \
-      "It allows an object."
-    )
-  end
-
-  def test_meta_tags_for_markdown_files
-    top_level = @store.add_file("MyPage.md", parser: RDoc::Parser::Markdown)
-    top_level.comment = <<~MARKDOWN
-      # MyPage
-
-      This is a comment
-    MARKDOWN
-
-    @g.generate
-
-    content = File.binread("MyPage_md.html")
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,MyPage">')
-    assert_include(
-      content,
-      '<meta name="description" content="MyPage: # MyPage This is a comment">',
-    )
-  end
-
-  def test_meta_tags_for_raw_pages
-    top_level = @store.add_file("MyPage", parser: RDoc::Parser::Simple)
-    comment = RDoc::Comment.new('this is a comment')
-    comment.document = RDoc::Markup::Document.new(RDoc::Markup::Paragraph.new('this is a comment'))
-    top_level.comment = comment
-
-    @g.generate
-
-    content = File.binread("MyPage.html")
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,MyPage">')
-    assert_include(content, '<meta name="description" content="MyPage: this is a comment">')
-  end
-
-  def test_meta_tags_for_empty_document
-    top_level = @store.add_file("MyPage", parser: RDoc::Parser::Simple)
-    top_level.comment = RDoc::Comment.from_document(RDoc::Markup::Document.new)
-
-    @g.generate
-
-    content = File.binread("MyPage.html")
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,MyPage">')
-    assert_include(
-      content,
-      '<meta name="description" content="MyPage: ">',
-    )
-  end
-
-  def test_canonical_url_for_index
-    @store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
-    @g.generate
-
-    content = File.binread("index.html")
-
-    assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/">')
-  end
-
-  def test_canonical_url_for_classes
-    top_level = @store.add_file("file.rb")
-    top_level.add_class(@klass.class, @klass.name)
-    inner = @klass.add_class(RDoc::NormalClass, "Inner")
-
-    @store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
-    @g.generate
-
-    content = File.binread("Klass/Inner.html")
-
-    assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/Klass/Inner.html">')
-  end
-
-  def test_canonical_url_for_rdoc_files
-    top_level = @store.add_file("CONTRIBUTING.rdoc", parser: RDoc::Parser::Simple)
-
-    @store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
-    @g.generate
-
-    content = File.binread("CONTRIBUTING_rdoc.html")
-
-    assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/CONTRIBUTING_rdoc.html">')
-  end
-
-  ##
-  # Asserts that +filename+ has a link count greater than 1 if hard links to
-  # @tmpdir are supported.
-
-  def assert_hard_link(filename)
-    assert_file filename
-
-    src = @g.template_dir + '_head.rhtml'
-    dst = File.join @tmpdir, 'hardlinktest'
-
-    begin
-      FileUtils.ln src, dst
-      nlink = File.stat(dst).nlink if File.identical? src, dst
-      FileUtils.rm dst
-      return if nlink == 1
-    rescue SystemCallError
-      return
-    end
-
-    assert_operator File.stat(filename).nlink, :>, 1,
-                    "#{filename} is not hard-linked"
-  end
-
-  def assert_main_title(content, title)
-    title = CGI.escapeHTML(title)
-    assert_equal(title, content[%r[<title>(.*?)<\/title>]im, 1])
-    assert_include(content[%r[<main\s[^<>]*+>\s*(.*?)</main>]im, 1], title)
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_generator_json_index_test.rb b/test/mri/rdoc/rdoc/rdoc_generator_json_index_test.rb
deleted file mode 100644
index aa7a2da0b16..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_generator_json_index_test.rb
+++ /dev/null
@@ -1,363 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocGeneratorJsonIndexTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tmpdir = Dir.mktmpdir "test_rdoc_generator_darkfish_#{$$}_"
-    FileUtils.mkdir_p @tmpdir
-
-    @options = RDoc::Options.new
-    @options.files = []
-    # JsonIndex is used in conjunction with another generator
-    @options.setup_generator 'darkfish'
-    @options.template_dir = ''
-    @options.op_dir = @tmpdir
-    @options.option_parser = OptionParser.new
-    @options.finish
-
-    @darkfish = RDoc::Generator::Darkfish.new @store, @options
-    @g = RDoc::Generator::JsonIndex.new @darkfish, @options
-
-    @rdoc.options = @options
-    @rdoc.generator = @g
-
-    @top_level = @store.add_file 'file.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'C'
-
-    @meth = @klass.add_method RDoc::AnyMethod.new(nil, 'meth')
-    @meth.record_location @top_level
-
-    @nest_klass = @klass.add_class RDoc::NormalClass, 'D'
-    @nest_klass.record_location @top_level
-
-    @nest_meth = @nest_klass.add_method RDoc::AnyMethod.new(nil, 'meth')
-
-    @ignored = @top_level.add_class RDoc::NormalClass, 'Ignored'
-    @ignored.ignore
-
-    @page = @store.add_file 'page.rdoc'
-    @page.parser = RDoc::Parser::Simple
-
-    @top_levels = [@top_level, @page].sort
-    @klasses    = [@klass, @nest_klass, @ignored]
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_build_index
-    index = @g.build_index
-
-    expected = {
-      :index => {
-        :searchIndex     => %w[c d meth() meth() page],
-        :longSearchIndex => %w[c c::d c#meth() c::d#meth()],
-        :info            => [
-          @klass.search_record[2..-1],
-          @nest_klass.search_record[2..-1],
-          @meth.search_record[2..-1],
-          @nest_meth.search_record[2..-1],
-          @page.search_record[2..-1],
-        ],
-      },
-    }
-
-    expected[:index][:longSearchIndex] << ''
-
-    assert_equal expected, index
-  end
-
-  def test_generate
-    @g.generate
-
-    assert_file 'js/searcher.js'
-    assert_file 'js/navigation.js'
-    assert_file 'js/search_index.js'
-
-    srcdir = File.expand_path('lib/rdoc', @pwd)
-    if !File.directory? srcdir
-      # for Ruby core repository
-      srcdir = File.expand_path("../../../lib/rdoc", __FILE__)
-    end
-
-    orig_file = Pathname(File.join srcdir, 'generator/template/json_index/js/navigation.js')
-    generated_file = Pathname(File.join @tmpdir, 'js/navigation.js')
-
-    # The following assertion for the generated file's modified time randomly
-    # fails in a ppc64le environment.
-    # https://github.com/ruby/rdoc/issues/1048
-    if orig_file.mtime.inspect != generated_file.mtime.inspect &&
-      RUBY_PLATFORM =~ /powerpc64le/
-      pend <<~EOC
-        Unstable test in ppc64le.
-        <#{orig_file.mtime.inspect}> expected but was
-        <#{generated_file.mtime.inspect}>.
-      EOC
-    end
-
-    # This is dirty hack on JRuby
-    assert_equal orig_file.mtime.inspect, generated_file.mtime.inspect,
-      '.js files should be the same timestamp of original'
-
-    json = File.read 'js/search_index.js'
-
-    json =~ /\Avar search_data = /
-
-    assignment = $&
-    index = $'
-
-    refute_empty assignment
-
-    index = JSON.parse index
-
-    info = [
-      @klass.search_record[2..-1],
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_generate_search_index_with_reproducible_builds
-    backup_epoch = ENV['SOURCE_DATE_EPOCH']
-    ruby_birthday = Time.parse 'Wed, 24 Feb 1993 21:00:00 +0900'
-    ENV['SOURCE_DATE_EPOCH'] = ruby_birthday.to_i.to_s
-
-    @g.generate
-
-    assert_file 'js/search_index.js'
-    generated_search_index = Pathname(File.join @tmpdir, 'js/search_index.js')
-    assert_equal ruby_birthday, generated_search_index.mtime
-
-    ENV['SOURCE_DATE_EPOCH'] = backup_epoch
-  end
-
-  def test_generate_gzipped
-    begin
-      require 'zlib'
-    rescue LoadError
-      omit "no zlib"
-    end
-    @g.generate
-    @g.generate_gzipped
-
-    assert_file 'js/searcher.js'
-    assert_file 'js/searcher.js.gz'
-    assert_file 'js/navigation.js'
-    assert_file 'js/navigation.js.gz'
-    assert_file 'js/search_index.js'
-    assert_file 'js/search_index.js.gz'
-
-    json = File.open('js/search_index.js.gz', 'rb') {|gzip|
-      Zlib::GzipReader.new(gzip).read
-    }
-
-    json =~ /\Avar search_data = /
-
-    assignment = $&
-    index = $'
-
-    refute_empty assignment
-
-    index = JSON.parse index
-
-    info = [
-      @klass.search_record[2..-1],
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_generate_utf_8
-    # JRuby fails this test with:
-    #   Encoding::UndefinedConversionError: "\xC2" from ASCII-8BIT to UTF-8
-    #     org/jruby/RubyIO.java:1639:in `write'
-    #     org/jruby/RubyIO.java:1612:in `write'
-    #     json/ext/GeneratorState.java:232:in `_generate'
-    #     json/ext/GeneratorState.java:137:in `generate'
-    #     /Users/runner/work/rdoc/rdoc/vendor/bundle/jruby/3.1.0/gems/json-2.9.0-java/lib/json/common.rb:824:in `dump'
-    #     /Users/runner/work/rdoc/rdoc/lib/rdoc/generator/json_index.rb:148:in `block in generate'
-    omit if RUBY_PLATFORM =~ /java/
-
-    text = "5\xB0"
-    text = RDoc::Encoding.change_encoding text, Encoding::ISO_8859_1
-    @klass.add_comment comment(text), @top_level
-
-    @g.generate
-
-    json = File.read 'js/search_index.js'
-    json.force_encoding Encoding::UTF_8
-
-    json =~ /\Avar search_data = /
-
-    index = $'
-
-    index = JSON.parse index
-
-    klass_record = @klass.search_record[2..-1]
-    klass_record[-1] = "<p>5\xc2\xb0\n"
-    klass_record[-1] = RDoc::Encoding.change_encoding klass_record[-1], Encoding::UTF_8
-
-    info = [
-      klass_record,
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_index_classes
-    @g.reset @top_levels, @klasses
-
-    @g.index_classes
-
-    expected = {
-      :searchIndex     => %w[c d],
-      :longSearchIndex => %w[c c::d],
-      :info            => [
-        @klass.search_record[2..-1],
-        @nest_klass.search_record[2..-1],
-      ],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_classes_nodoc
-    @klass.document_self      = false
-    @nest_klass.document_self = false
-    @meth.document_self       = false
-    @nest_meth.document_self  = false
-
-    @g.reset @top_levels, @klasses
-
-    @g.index_classes
-
-    expected = {
-      :searchIndex     => [],
-      :longSearchIndex => [],
-      :info            => [],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_methods
-    @g.reset @top_levels, @klasses
-
-    @g.index_methods
-
-    expected = {
-      :searchIndex     => %w[meth() meth()],
-      :longSearchIndex => %w[c#meth() c::d#meth()],
-      :info            => [
-        @meth.search_record[2..-1],
-        @nest_meth.search_record[2..-1],
-      ],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_pages
-    @g.reset @top_levels, @klasses
-
-    @g.index_pages
-
-    expected = {
-      :searchIndex     => %w[page],
-      :longSearchIndex => [''],
-      :info            => [@page.search_record[2..-1]],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_search_string
-    assert_equal 'cd', @g.search_string('C d')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_generator_markup_test.rb b/test/mri/rdoc/rdoc/rdoc_generator_markup_test.rb
deleted file mode 100644
index cd77e67e794..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_generator_markup_test.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorMarkupTest < RDoc::TestCase
-
-  include RDoc::Text
-  include RDoc::Generator::Markup
-
-  attr_reader :store
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @rdoc.options = @options
-
-    @parent = self
-    @path = '/index.html'
-    @symbols = {}
-  end
-
-  def test_aref_to
-    assert_equal 'Foo/Bar.html', aref_to('Foo/Bar.html')
-  end
-
-  def test_as_href
-    assert_equal '../index.html', as_href('Foo/Bar.html')
-  end
-
-  def test_cvs_url
-    assert_equal 'http://example/this_page',
-                 cvs_url('http://example/', 'this_page')
-
-    assert_equal 'http://example/?page=this_page&foo=bar',
-                 cvs_url('http://example/?page=%s&foo=bar', 'this_page')
-  end
-
-  def test_description
-    @comment = '= Hello'
-
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", description
-  end
-
-  def test_formatter
-    assert_kind_of RDoc::Markup::ToHtmlCrossref, formatter
-    refute formatter.show_hash
-    assert_same self, formatter.context
-  end
-
-  attr_reader :path
-
-  def find_symbol(name)
-    @symbols[name]
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_generator_pot_po_entry_test.rb b/test/mri/rdoc/rdoc/rdoc_generator_pot_po_entry_test.rb
deleted file mode 100644
index d058ff3f405..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_generator_pot_po_entry_test.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorPOTPOEntryTest < RDoc::TestCase
-
-  def test_msgid_normal
-    assert_equal <<-'ENTRY', entry("Hello", {}).to_s
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_multiple_lines
-    assert_equal <<-'ENTRY', entry("Hello\nWorld", {}).to_s
-msgid ""
-"Hello\n"
-"World"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_tab
-    assert_equal <<-'ENTRY', entry("Hello\tWorld", {}).to_s
-msgid "Hello\tWorld"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_back_slash
-    assert_equal <<-'ENTRY', entry("Hello \\ World", {}).to_s
-msgid "Hello \\ World"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_double_quote
-    assert_equal <<-'ENTRY', entry("Hello \"World\"!", {}).to_s
-msgid "Hello \"World\"!"
-msgstr ""
-    ENTRY
-  end
-
-  def test_translator_comment_normal
-    options = {:translator_comment => "Greeting"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_translator_comment_multiple_lines
-    options = {:translator_comment => "Greeting\nfor morning"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-# for morning
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_extracted_comment_normal
-    options = {:extracted_comment => "Object"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#. Object
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_extracted_comment_multiple_lines
-    options = {:extracted_comment => "Object\nMorning#greeting"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#. Object
-#. Morning#greeting
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_references_normal
-    options = {:references => [["lib/rdoc.rb", 29]]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#: lib/rdoc.rb:29
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_references_multiple
-    options = {:references => [["lib/rdoc.rb", 29], ["lib/rdoc/i18n.rb", 9]]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#: lib/rdoc.rb:29
-#: lib/rdoc/i18n.rb:9
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_flags_normal
-    options = {:flags => ["fuzzy"]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#, fuzzy
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_flags_multiple
-    options = {:flags => ["fuzzy", "ruby-format"]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#, fuzzy,ruby-format
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_full
-    options = {
-      :translator_comment => "Greeting",
-      :extracted_comment  => "Morning#greeting",
-      :references         => [["lib/rdoc.rb", 29]],
-      :flags              => ["fuzzy"],
-    }
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-#. Morning#greeting
-#: lib/rdoc.rb:29
-#, fuzzy
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  private
-  def entry(msgid, options)
-    RDoc::Generator::POT::POEntry.new(msgid, options)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_generator_pot_po_test.rb b/test/mri/rdoc/rdoc/rdoc_generator_pot_po_test.rb
deleted file mode 100644
index 83b4a5f1c33..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_generator_pot_po_test.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorPOTPOTest < RDoc::TestCase
-
-  def setup
-    super
-    @po = RDoc::Generator::POT::PO.new
-  end
-
-  def test_empty
-    assert_equal header, @po.to_s
-  end
-
-  def test_have_entry
-    @po.add(entry("Hello", {}))
-    assert_equal <<-PO, @po.to_s
-#{header}
-msgid "Hello"
-msgstr ""
-    PO
-  end
-
-  private
-
-  def entry(msgid, options)
-    RDoc::Generator::POT::POEntry.new(msgid, options)
-  end
-
-  def header
-    <<-'HEADER'
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSEION\n"
-"Report-Msgid-Bugs-To:\n"
-"PO-Revision-Date: YEAR-MO_DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language:\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-    HEADER
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_generator_pot_test.rb b/test/mri/rdoc/rdoc/rdoc_generator_pot_test.rb
deleted file mode 100644
index 736f9765e50..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_generator_pot_test.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorPOTTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_pot_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @generator = RDoc::Generator::POT.new @store, @options
-
-    @top_level = @store.add_file 'file.rb'
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-    @klass.add_comment 'This is a class', @top_level
-    @klass.add_section 'This is a section', comment('This is a section comment')
-
-    @const = RDoc::Constant.new "CONSTANT", "29", "This is a constant"
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-    @meth.comment = 'This is a method'
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-    @attr.comment = 'This is an attribute'
-
-    @klass.add_constant @const
-    @klass.add_method @meth
-    @klass.add_attribute @attr
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    @generator.generate
-
-    assert_equal <<-POT, File.read(File.join(@tmpdir, 'rdoc.pot'))
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSEION\\n"
-"Report-Msgid-Bugs-To:\\n"
-"PO-Revision-Date: YEAR-MO_DA HO:MI+ZONE\\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n"
-"Language-Team: LANGUAGE <LL@li.org>\\n"
-"Language:\\n"
-"MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=CHARSET\\n"
-"Content-Transfer-Encoding: 8bit\\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"
-
-#. Object
-msgid "This is a class"
-msgstr ""
-
-#. Object::CONSTANT
-msgid "This is a constant"
-msgstr ""
-
-#. Object#method
-msgid "This is a method"
-msgstr ""
-
-#. Object: section title
-msgid "This is a section"
-msgstr ""
-
-#. Object: This is a section
-msgid "This is a section comment"
-msgstr ""
-
-#. Object#attr
-msgid "This is an attribute"
-msgstr ""
-    POT
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_generator_ri_test.rb b/test/mri/rdoc/rdoc/rdoc_generator_ri_test.rb
deleted file mode 100644
index 9109d220676..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_generator_ri_test.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorRITest < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @options.encoding = Encoding::UTF_8
-    @store.encoding = Encoding::UTF_8
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_ri_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @g = RDoc::Generator::RI.new @store, @options
-
-    @top_level = @store.add_file 'file.rb'
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_bang.record_location @top_level
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_attribute @attr
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    @g.generate
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_file File.join(@tmpdir, 'Object', 'attr-i.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method%21-i.ri')
-
-    store = RDoc::RI::Store.new(@options, path: @tmpdir)
-    store.load_cache
-
-    encoding = Encoding::UTF_8
-
-    assert_equal encoding, store.encoding
-  end
-
-  def test_generate_dry_run
-    @store.dry_run = true
-    @g = RDoc::Generator::RI.new @store, @options
-
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    refute_file File.join(@tmpdir, 'cache.ri')
-    refute_file File.join(@tmpdir, 'Object')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_i18n_locale_test.rb b/test/mri/rdoc/rdoc/rdoc_i18n_locale_test.rb
deleted file mode 100644
index cfbc7c5bb2a..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_i18n_locale_test.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocI18nLocaleTest < RDoc::TestCase
-
-  def setup
-    super
-    @locale = locale('fr')
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_i18n_locale_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @locale_dir = @tmpdir
-  end
-
-  def teardown
-    FileUtils.rm_rf @tmpdir
-    super
-  end
-
-  def test_name
-    assert_equal 'fr', locale('fr').name
-  end
-
-  def test_load_nonexistent_po
-    locale = File.join(@locale_dir, 'nonexsitent-locale')
-    refute_file locale
-    refute @locale.load(locale)
-  end
-
-  def test_load_existent_po
-    begin
-      require 'gettext/po_parser'
-    rescue LoadError
-      omit 'gettext gem is not found'
-    end
-
-    fr_locale_dir = File.join @locale_dir, 'fr'
-    FileUtils.mkdir_p fr_locale_dir
-    File.open File.join(fr_locale_dir, 'rdoc.po'), 'w' do |po|
-      po.puts <<-PO
-msgid ""
-msgstr ""
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Hello"
-msgstr "Bonjour"
-      PO
-    end
-
-    assert @locale.load(@locale_dir)
-    assert_equal 'Bonjour', @locale.translate('Hello')
-  end
-
-  def test_translate_existent_message
-    messages = @locale.instance_variable_get(:@messages)
-    messages['Hello'] = 'Bonjour'
-    assert_equal 'Bonjour', @locale.translate('Hello')
-  end
-
-  def test_translate_nonexistent_message
-    assert_equal 'Hello', @locale.translate('Hello')
-  end
-
-  private
-
-  def locale(name)
-    RDoc::I18n::Locale.new(name)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_i18n_text_test.rb b/test/mri/rdoc/rdoc/rdoc_i18n_text_test.rb
deleted file mode 100644
index 888479d20da..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_i18n_text_test.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocI18nTextTest < RDoc::TestCase
-
-  def test_multiple_paragraphs
-    paragraph1 = <<-PARAGRAPH.strip
-RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying documentation
-from the command-line.
-    PARAGRAPH
-
-    paragraph2 = <<-PARAGRAPH.strip
-This command generates documentation for all the Ruby and C source
-files in and below the current directory.  These will be stored in a
-documentation tree starting in the subdirectory +doc+.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{paragraph1}
-
-#{paragraph2}
-    RAW
-
-    expected = [
-      {
-        :type      => :paragraph,
-        :paragraph => paragraph1,
-        :line_no   => 1,
-      },
-      {
-        :type      => :paragraph,
-        :paragraph => paragraph2,
-        :line_no   => 5,
-      },
-    ]
-    assert_equal expected, extract_messages(raw)
-  end
-
-  def test_translate_multiple_paragraphs
-    paragraph1 = <<-PARAGRAPH.strip
-Paragraph 1.
-    PARAGRAPH
-    paragraph2 = <<-PARAGRAPH.strip
-Paragraph 2.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{paragraph1}
-
-#{paragraph2}
-    RAW
-
-    expected = <<-TRANSLATED
-Paragraphe 1.
-
-Paragraphe 2.
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  def test_translate_not_translated_message
-    nonexistent_paragraph = <<-PARAGRAPH.strip
-Nonexistent paragraph.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{nonexistent_paragraph}
-    RAW
-
-    expected = <<-TRANSLATED
-#{nonexistent_paragraph}
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  def test_translate_keep_empty_lines
-    raw = <<-RAW
-Paragraph 1.
-
-
-
-
-Paragraph 2.
-    RAW
-
-    expected = <<-TRANSLATED
-Paragraphe 1.
-
-
-
-
-Paragraphe 2.
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  private
-
-  def extract_messages(raw)
-    text = RDoc::I18n::Text.new(raw)
-    messages = []
-    text.extract_messages do |message|
-      messages << message
-    end
-    messages
-  end
-
-  def locale
-    locale = RDoc::I18n::Locale.new('fr')
-    messages = locale.instance_variable_get(:@messages)
-    messages['markdown'] = 'markdown (markdown in fr)'
-    messages['Hello'] = 'Bonjour (Hello in fr)'
-    messages['Paragraph 1.'] = 'Paragraphe 1.'
-    messages['Paragraph 2.'] = 'Paragraphe 2.'
-    locale
-  end
-
-  def translate(raw)
-    text = RDoc::I18n::Text.new(raw)
-    text.translate(locale)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_include_test.rb b/test/mri/rdoc/rdoc/rdoc_include_test.rb
deleted file mode 100644
index 6b78d2a749c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_include_test.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocIncludeTest < XrefTestCase
-
-  def setup
-    super
-
-    @inc = RDoc::Include.new 'M1', 'comment'
-    @inc.parent = @m1
-    @inc.record_location @top_level
-    @inc.store = @store
-  end
-
-  def test_module
-    assert_equal @m1, @inc.module
-    assert_equal 'Unknown', RDoc::Include.new('Unknown', 'comment').module
-  end
-
-  def test_module_extended
-    m1 = @xref_data.add_module RDoc::NormalModule, 'Mod1'
-    m1_m3 = m1.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2 = m1.add_module RDoc::NormalModule, 'Mod2'
-    m1_m2_m3 = m1_m2.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2_m3_m4 = m1_m2_m3.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_m4 = m1_m2.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_k0 = m1_m2.add_class RDoc::NormalClass, 'Klass0'
-    m1_m2_k0_m4 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod4'
-    #m1_m2_k0_m4_m5 = m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod5'
-    m1_m2_k0_m4_m6 = m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod6'
-    m1_m2_k0_m5 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod5'
-
-    i0_m4 = RDoc::Include.new 'Mod4', nil
-    i0_m5 = RDoc::Include.new 'Mod5', nil
-    i0_m6 = RDoc::Include.new 'Mod6', nil
-    i0_m1 = RDoc::Include.new 'Mod1', nil
-    i0_m2 = RDoc::Include.new 'Mod2', nil
-    i0_m3 = RDoc::Include.new 'Mod3', nil
-
-    m1_m2_k0.add_include i0_m4
-    m1_m2_k0.add_include i0_m5
-    m1_m2_k0.add_include i0_m6
-    m1_m2_k0.add_include i0_m1
-    m1_m2_k0.add_include i0_m2
-    m1_m2_k0.add_include i0_m3
-
-    assert_equal [i0_m4, i0_m5, i0_m6, i0_m1, i0_m2, i0_m3], m1_m2_k0.includes
-    assert_equal [m1_m2_m3, m1_m2, m1, m1_m2_k0_m4_m6, m1_m2_k0_m5,
-                  m1_m2_k0_m4, @object, 'BasicObject'], m1_m2_k0.ancestors
-
-    m1_k1 = m1.add_class RDoc::NormalClass, 'Klass1'
-
-    i1_m1 = RDoc::Include.new 'Mod1', nil
-    i1_m2 = RDoc::Include.new 'Mod2', nil
-    i1_m3 = RDoc::Include.new 'Mod3', nil
-    i1_m4 = RDoc::Include.new 'Mod4', nil
-    i1_k0_m4 = RDoc::Include.new 'Klass0::Mod4', nil
-
-    m1_k1.add_include i1_m1
-    m1_k1.add_include i1_m2
-    m1_k1.add_include i1_m3
-    m1_k1.add_include i1_m4
-    m1_k1.add_include i1_k0_m4
-
-    assert_equal [i1_m1, i1_m2, i1_m3, i1_m4, i1_k0_m4], m1_k1.includes
-    assert_equal [m1_m2_k0_m4, m1_m2_m3_m4, m1_m2_m3, m1_m2, m1, @object,
-                  'BasicObject'], m1_k1.ancestors
-
-    m1_k2 = m1.add_class RDoc::NormalClass, 'Klass2'
-
-    i2_m1 = RDoc::Include.new 'Mod1', nil
-    i2_m2 = RDoc::Include.new 'Mod2', nil
-    i2_m3 = RDoc::Include.new 'Mod3', nil
-    i2_k0_m4 = RDoc::Include.new 'Klass0::Mod4', nil
-
-    m1_k2.add_include i2_m1
-    m1_k2.add_include i2_m3
-    m1_k2.add_include i2_m2
-    m1_k2.add_include i2_k0_m4
-
-    assert_equal [i2_m1, i2_m3, i2_m2, i2_k0_m4], m1_k2.includes
-    assert_equal [m1_m2_k0_m4, m1_m2, m1_m3, m1, @object, 'BasicObject'],
-                 m1_k2.ancestors
-
-    m1_k3 = m1.add_class RDoc::NormalClass, 'Klass3'
-
-    i3_m1 = RDoc::Include.new 'Mod1', nil
-    i3_m2 = RDoc::Include.new 'Mod2', nil
-    i3_m4 = RDoc::Include.new 'Mod4', nil
-
-    m1_k3.add_include i3_m1
-    m1_k3.add_include i3_m2
-    m1_k3.add_include i3_m4
-
-    assert_equal [i3_m1, i3_m2, i3_m4], m1_k3.includes
-    assert_equal [m1_m2_m4, m1_m2, m1, @object, 'BasicObject'], m1_k3.ancestors
-  end
-
-  def test_store_equals
-    incl = RDoc::Include.new 'M', nil
-    incl.record_location RDoc::TopLevel.new @top_level.name
-
-    incl.store = @store
-
-    assert_same @top_level, incl.file
-    assert_same @store,     incl.file.store
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markdown_test.rb b/test/mri/rdoc/rdoc/rdoc_markdown_test.rb
deleted file mode 100644
index 2764f94becd..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markdown_test.rb
+++ /dev/null
@@ -1,1140 +0,0 @@
-# coding: UTF-8
-# frozen_string_literal: true
-
-require_relative 'helper'
-require_relative '../../lib/rdoc/markup/block_quote'
-require_relative '../../lib/rdoc/markdown'
-
-class RDocMarkdownTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @RM = RDoc::Markup
-
-    @parser = RDoc::Markdown.new
-
-    @to_html = RDoc::Markup::ToHtml.new(RDoc::Options.new, nil)
-  end
-
-  def test_class_parse
-    doc = RDoc::Markdown.parse "hello\n\nworld"
-
-    expected = doc(para("hello"), para("world"))
-
-    assert_equal expected, doc
-  end
-
-  def test_emphasis
-    assert_equal '_word_',             @parser.emphasis('word')
-    assert_equal '<em>two words</em>', @parser.emphasis('two words')
-    assert_equal '<em>*bold*</em>',    @parser.emphasis('*bold*')
-  end
-
-  def test_parse_auto_link_email
-    doc = parse "Autolink: <nobody-0+_./!%~$@example>"
-
-    expected = doc(para("Autolink: mailto:nobody-0+_./!%~$@example"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_auto_link_url
-    doc = parse "Autolink: <http://example>"
-
-    expected = doc(para("Autolink: http://example"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote
-    doc = parse <<-BLOCK_QUOTE
-> this is
-> a block quote
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_continue
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_list
-    doc = parse <<-BLOCK_QUOTE
-> text
->
-> * one
-> * two
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("text"),
-          list(:BULLET,
-            item(nil, para("one")),
-            item(nil, para("two")))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_newline
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_separate
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-
-> that continues
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote"),
-          para("that continues")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_char_entity
-    doc = parse '&pi; &nn;'
-
-    expected = doc(para('π &nn;'))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_code
-    doc = parse "Code: `text`"
-    expected = doc(para("Code: <code>text</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: ` text `"
-    expected = doc(para("Code: <code>text</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: ``text`s``"
-    expected = doc(para("Code: <code>text`s</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: `` text`s ``"
-    expected = doc(para("Code: <code>text`s</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: ```text`s```"
-    expected = doc(para("Code: <code>text`s</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: ``` text`s ```"
-    expected = doc(para("Code: <code>text`s</code>"))
-    assert_equal expected, doc
-  end
-
-  def test_parse_code_github
-    doc = <<-MD
-Example:
-
-```
-code goes here
-```
-    MD
-
-    expected =
-      doc(
-        para("Example:"),
-        verb("code goes here\n"))
-
-    assert_equal expected, parse(doc)
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-
-    @parser.github = false
-
-    expected =
-      doc(para("Example:"),
-          para("<code>\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc)
-
-    expected =
-      doc(para("Example:\n<code>\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-  end
-
-  def test_parse_code_github_format
-    doc = <<-MD
-Example:
-
-``` ruby
-code goes here
-```
-    MD
-
-    code = verb("code goes here\n")
-    code.format = :ruby
-
-    expected =
-      doc(
-        para("Example:"),
-        code)
-
-    assert_equal expected, parse(doc)
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-
-    @parser.github = false
-
-    expected =
-      doc(para("Example:"),
-          para("<code>ruby\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc)
-
-    expected =
-      doc(para("Example:\n<code>ruby\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-  end
-
-  def test_parse_definition_list
-    doc = parse <<-MD
-one
-:   This is a definition
-
-two
-:   This is another definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one], para("This is a definition")),
-        item(%w[two], para("This is another definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_indents
-    doc = parse <<-MD
-zero
-: Indented zero characters
-
-one
- : Indented one characters
-
-two
-  : Indented two characters
-
-three
-   : Indented three characters
-
-four
-    : Indented four characters
-
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[zero],  para("Indented zero characters")),
-        item(%w[one],   para("Indented one characters")),
-        item(%w[two],   para("Indented two characters")),
-        item(%w[three], para("Indented three characters"))),
-      para("four\n : Indented four characters"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_description
-    doc = parse <<-MD
-label
-:   This is a definition
-
-:   This is another definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[label], para("This is a definition")),
-        item(nil,       para("This is another definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_label
-    doc = parse <<-MD
-one
-two
-:   This is a definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one two], para("This is a definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_line
-    doc = parse <<-MD
-one
-:   This is a definition
-that extends to two lines
-
-two
-:   This is another definition
-that also extends to two lines
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one],
-          para("This is a definition\nthat extends to two lines")),
-        item(%w[two],
-          para("This is another definition\nthat also extends to two lines"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_rich_label
-    doc = parse <<-MD
-`one`
-:    This is a definition
-
-**two**
-:    This is another definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[<code>one</code>],
-          para("This is a definition")),
-        item(%w[*two*],
-          para("This is another definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_no
-    @parser.definition_lists = false
-
-    doc = parse <<-MD
-one
-:   This is a definition
-
-two
-:   This is another definition
-    MD
-
-    expected = doc(
-        para("one\n: This is a definition"),
-        para("two\n: This is another definition"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_dec
-    doc = parse "Entity: &#65;"
-
-    expected = doc(para("Entity: A"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_hex
-    doc = parse "Entity: &#x41;"
-
-    expected = doc(para("Entity: A"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_named
-    doc = parse "Entity: &pi;"
-
-    expected = doc(para("Entity: π"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_star
-    doc = parse "it *works*\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it _works_"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore
-    doc = parse "it _works_\n"
-
-    expected =
-      doc(
-        para("it _works_"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore_embedded
-    doc = parse "foo_bar bar_baz\n"
-
-    expected =
-      doc(
-        para("foo_bar bar_baz"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore_in_word
-    doc = parse "it foo_bar_baz\n"
-
-    expected =
-      doc(
-        para("it foo_bar_baz"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_escape
-    assert_equal doc(para("Backtick: `")), parse("Backtick: \\`")
-
-    assert_equal doc(para("Backslash: \\")), parse("Backslash: \\\\")
-
-    assert_equal doc(para("Colon: :")), parse("Colon: \\:")
-  end
-
-  def test_parse_heading_atx
-    # CommonMark Example 62
-    (1..6).each do |level|
-      doc = parse "#{"#" * level} heading\n"
-
-      expected = @RM::Document.new(
-        @RM::Heading.new(level, "heading"))
-
-      assert_equal expected, doc
-    end
-
-    # CommonMark Example 64
-    doc = parse "#5 bolt\n\n#hashtag\n"
-
-    expected = @RM::Document.new(
-      para("#5 bolt"),
-      para("#hashtag"),
-    )
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_heading_setext_dash
-    doc = parse <<-MD
-heading
----
-    MD
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(2, "heading"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_heading_setext_equals
-    doc = parse <<-MD
-heading
-===
-    MD
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, "heading"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html
-    @parser.html = true
-
-    doc = parse "<address>Links here</address>\n"
-
-    expected = doc(
-      @RM::Raw.new("<address>Links here</address>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html_hr
-    @parser.html = true
-
-    doc = parse "<hr>\n"
-
-    expected = doc(raw("<hr>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html_no_html
-    @parser.html = false
-
-    doc = parse "<address>Links here</address>\n"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_image
-    doc = parse "image ![alt text](path/to/image.jpg)"
-
-    expected = doc(para("image rdoc-image:path/to/image.jpg:alt text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_image_link
-    @parser.html = true
-
-    doc = parse "[![alt text](path/to/image.jpg)](http://example.com)"
-
-    expected =
-      doc(
-        para('{rdoc-image:path/to/image.jpg:alt text}[http://example.com]'))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_line_break
-    doc = parse "Some text  \nwith extra lines"
-
-    expected = doc(
-      para("Some text", hard_break, "with extra lines"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id
-    doc = parse <<-MD
-This is [an example][id] reference-style link.
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_adjacent
-    doc = parse <<-MD
-[this] [this] should work
-
-[this]: example
-    MD
-
-    expected = doc(
-      para("{this}[example] should work"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_eof
-    doc = parse <<-MD.chomp
-This is [an example][id] reference-style link.
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_many
-    doc = parse <<-MD
-This is [an example][id] reference-style link.
-
-And [another][id].
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."),
-      para("And {another}[http://example.com]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_implicit
-    doc = parse <<-MD
-This is [an example][] reference-style link.
-
-[an example]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet
-    doc = parse <<-MD
-* one
-* two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_auto_link
-    doc = parse <<-MD
-* <http://example/>
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("http://example/"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_continue
-    doc = parse <<-MD
-* one
-
-* two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_multiline
-    doc = parse <<-MD
-* one
-  two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one\n two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest
-    doc = parse <<-MD
-* outer
-    * inner
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil,
-              para("inner"))))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest_loose
-    doc = parse <<-MD
-* outer
-
-    * inner
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil, para("inner"))))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest_continue
-    doc = parse <<-MD
-* outer
-    * inner
-  continue inner
-* outer 2
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil,
-              para("inner\n continue inner")))),
-        item(nil,
-          para("outer 2"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_number
-    doc = parse <<-MD
-1. one
-1. two
-    MD
-
-    expected = doc(
-      list(:NUMBER,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_number_continue
-    doc = parse <<-MD
-1. one
-
-1. two
-    MD
-
-    expected = doc(
-      list(:NUMBER,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text.[^1]
-
-[^1]: With a footnote
-    MD
-
-    expected = doc(
-      para("Some text.{*1}[rdoc-label:foottext-1:footmark-1]"),
-      @RM::Rule.new(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_indent
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text.[^1]
-
-[^1]: With a footnote
-
-    more
-    MD
-
-    expected = doc(
-      para("Some text.{*1}[rdoc-label:foottext-1:footmark-1]"),
-      rule(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote\n\nmore"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_inline
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text. ^[With a footnote]
-    MD
-
-    expected = doc(
-      para("Some text. {*1}[rdoc-label:foottext-1:footmark-1]"),
-      @RM::Rule.new(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_no_notes
-    @parser.notes = false
-
-    assert_raise RDoc::Markdown::ParseError do
-      parse "Some text.[^1]"
-    end
-  end
-
-  def test_parse_note_multiple
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text[^1]
-with inline notes^[like this]
-and an extra note.[^2]
-
-[^1]: With a footnote
-[^2]: Which should be numbered correctly
-    MD
-
-    expected = doc(
-      para("Some text{*1}[rdoc-label:foottext-1:footmark-1]\n" +
-           "with inline notes{*2}[rdoc-label:foottext-2:footmark-2]\n" +
-           "and an extra note.{*3}[rdoc-label:foottext-3:footmark-3]"),
-
-      rule(1),
-
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"),
-      para("{^2}[rdoc-label:footmark-2:foottext-2] like this"),
-      para("{^3}[rdoc-label:footmark-3:foottext-3] " +
-           "Which should be numbered correctly"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph
-    doc = parse "it worked\n"
-
-    expected = doc(para("it worked"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_break_on_newline
-    @parser.break_on_newline = true
-
-    doc = parse "one\ntwo\n"
-
-    expected = doc(para("one", hard_break, "two"))
-
-    assert_equal expected, doc
-
-    doc = parse "one  \ntwo\nthree\n"
-
-    expected = doc(para("one", hard_break, "two", hard_break, "three"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_stars
-    doc = parse "it worked ****\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it worked ****"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_html
-    @parser.html = true
-
-    doc = parse "<address>Links here</address>"
-
-    expected = doc(raw("<address>Links here</address>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_html_no_html
-    @parser.html = false
-
-    doc = parse "<address>Links here</address>"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_one
-    doc = parse <<-MD
- text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_two
-    doc = parse <<-MD
-  text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_three
-    doc = parse <<-MD
-   text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_multiline
-    doc = parse "one\ntwo"
-
-    expected = doc(para("one\ntwo"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_two
-    doc = parse "one\n\ntwo"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("one"),
-      @RM::Paragraph.new("two"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_plain
-    doc = parse "it worked"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it worked"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_reference_link_embedded_bracket
-    doc = parse "With [embedded [brackets]] [b].\n\n[b]: /url/\n"
-
-    expected =
-      doc(
-        para("With {embedded [brackets]}[/url/]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_dash
-    doc = parse "- - -\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_underscore
-    doc = parse "_ _ _\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_star
-    doc = parse "* * *\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_star
-    doc = parse "it **works**\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it *works*"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_underscore
-    doc = parse "it __works__\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it *works*"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_emphasis_star
-    doc = parse "it ***works***\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <b>_works_</b>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_emphasis_underscore
-    doc = parse "it ___works___\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <b>_works_</b>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_tilde
-    doc = parse "it ~~works~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it ~works~"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_words_tilde
-    doc = parse "it ~~works fine~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <s>works fine</s>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_tilde_no
-    @parser.strike = false
-
-    doc = parse "it ~~works fine~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it ~~works fine~~"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_style
-    @parser.css = true
-
-    doc = parse "<style>h1 { color: red }</style>\n"
-
-    expected = doc(
-      @RM::Raw.new("<style>h1 { color: red }</style>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_style_disabled
-    doc = parse "<style>h1 { color: red }</style>\n"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_verbatim
-    doc = parse <<-MD
-    text
-    MD
-
-    expected = doc(verb("text\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_verbatim_eof
-    doc = parse "    text"
-
-    expected = doc(verb("text\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_strong
-    assert_equal '*word*',            @parser.strong('word')
-    assert_equal '<b>two words</b>',  @parser.strong('two words')
-    assert_equal '<b>_emphasis_</b>', @parser.strong('_emphasis_')
-  end
-
-  def test_code_fence_with_unintended_array
-    doc = parse '```<ruby>```'
-
-    expected = doc(verb('<ruby>'))
-
-    assert_equal expected, doc
-  end
-
-  def test_gfm_table
-    doc = parse <<~MD
-    |      |                 |compare-ruby|built-ruby|
-    |------|:----------------|-----------:|---------:|
-    |test  | 1               |     11.618M|   10.757M|
-    |      |                 |       1.08x|         -|
-    |test  | 10              |      1.849M|    1.723M|
-    |      |                 |       1.07x|         -|
-    MD
-
-    head = ["", "", "compare-ruby", "built-ruby"]
-    align = [nil, :left, :right, :right]
-    body = [
-      ["test", "1", "11.618M", "10.757M"],
-      ["", "", "1.08x", "-"],
-      ["test", "10", "1.849M", "1.723M"],
-      ["", "", "1.07x", "-"],
-    ]
-    expected = doc(@RM::Table.new(head, align, body))
-
-    assert_equal expected, doc
-  end
-
-  def test_gfm_table_2
-    doc = parse <<~'MD'
-    | Cmd | Returns | Meaning
-    ----- | :-----: | -------
-    |"b"  | boolean | True if file1 is a block device
-    "c"   | boolean | True if file1 is a character device
-    |"\|" | boolean | escaped bar \| test
-    MD
-
-    head = %w[Cmd Returns Meaning]
-    align = [nil, :center, nil]
-    body = [
-      ['"b"', 'boolean', 'True if file1 is a block device'],
-      ['"c"', 'boolean', 'True if file1 is a character device'],
-      ['"|"', 'boolean', 'escaped bar | test'],
-    ]
-    expected = doc(@RM::Table.new(head, align, body))
-
-    assert_equal expected, doc
-  end
-
-  def parse(text)
-    @parser.parse text
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markdown_test_test.rb b/test/mri/rdoc/rdoc/rdoc_markdown_test_test.rb
deleted file mode 100644
index c28fe6bebdf..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markdown_test_test.rb
+++ /dev/null
@@ -1,1883 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-require 'pp'
-
-require_relative '../../lib/rdoc'
-require_relative '../../lib/rdoc/markdown'
-
-class RDocMarkdownTestTest < RDoc::TestCase
-
-  MARKDOWN_TEST_PATH = File.expand_path '../MarkdownTest_1.0.3/', __FILE__
-
-  def setup
-    super
-
-    @parser = RDoc::Markdown.new
-  end
-
-  def test_amps_and_angle_encoding
-    input = File.read "#{MARKDOWN_TEST_PATH}/Amps and angle encoding.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("AT&T has an ampersand in their name."),
-        para("AT&T is another way to write it."),
-        para("This & that."),
-        para("4 < 5."),
-        para("6 > 5."),
-        para("Here's a {link}[http://example.com/?foo=1&bar=2] with " +
-             "an ampersand in the URL."),
-        para("Here's a link with an amersand in the link text: " +
-             "{AT&T}[http://att.com/]."),
-        para("Here's an inline {link}[/script?foo=1&bar=2]."),
-        para("Here's an inline {link}[/script?foo=1&bar=2]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_auto_links
-    input = File.read "#{MARKDOWN_TEST_PATH}/Auto links.text"
-
-    doc = @parser.parse input
-
-    # TODO verify rdoc auto-links too
-    expected =
-      doc(
-        para("Link: http://example.com/."),
-        para("With an ampersand: http://example.com/?foo=1&bar=2"),
-        list(:BULLET,
-          item(nil, para("In a list?")),
-          item(nil, para("http://example.com/")),
-          item(nil, para("It should."))),
-        block(
-          para("Blockquoted: http://example.com/")),
-        para("Auto-links should not occur here: " +
-             "<code><http://example.com/></code>"),
-        verb("or here: <http://example.com/>\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_backslash_escapes
-    input = File.read "#{MARKDOWN_TEST_PATH}/Backslash escapes.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("These should all get escaped:"),
-
-        para("Backslash: \\"),
-        para("Backtick: `"),
-        para("Asterisk: *"),
-        para("Underscore: _"),
-        para("Left brace: {"),
-        para("Right brace: }"),
-        para("Left bracket: ["),
-        para("Right bracket: ]"),
-        para("Left paren: ("),
-        para("Right paren: )"),
-        para("Greater-than: >"),
-        para("Hash: #"),
-        para("Period: ."),
-        para("Bang: !"),
-        para("Plus: +"),
-        para("Minus: -"),
-
-        para("These should not, because they occur within a code block:"),
-
-        verb("Backslash: \\\\\n",
-             "\n",
-             "Backtick: \\`\n",
-             "\n",
-             "Asterisk: \\*\n",
-             "\n",
-             "Underscore: \\_\n",
-             "\n",
-             "Left brace: \\{\n",
-             "\n",
-             "Right brace: \\}\n",
-             "\n",
-             "Left bracket: \\[\n",
-             "\n",
-             "Right bracket: \\]\n",
-             "\n",
-             "Left paren: \\(\n",
-             "\n",
-             "Right paren: \\)\n",
-             "\n",
-             "Greater-than: \\>\n",
-             "\n",
-             "Hash: \\#\n",
-             "\n",
-             "Period: \\.\n",
-             "\n",
-             "Bang: \\!\n",
-             "\n",
-             "Plus: \\+\n",
-             "\n",
-             "Minus: \\-\n"),
-
-        para("Nor should these, which occur in code spans:"),
-
-        para("Backslash: <code>\\\\</code>"),
-        para("Backtick: <code>\\`</code>"),
-        para("Asterisk: <code>\\*</code>"),
-        para("Underscore: <code>\\_</code>"),
-        para("Left brace: <code>\\{</code>"),
-        para("Right brace: <code>\\}</code>"),
-        para("Left bracket: <code>\\[</code>"),
-        para("Right bracket: <code>\\]</code>"),
-        para("Left paren: <code>\\(</code>"),
-        para("Right paren: <code>\\)</code>"),
-        para("Greater-than: <code>\\></code>"),
-        para("Hash: <code>\\#</code>"),
-        para("Period: <code>\\.</code>"),
-        para("Bang: <code>\\!</code>"),
-        para("Plus: <code>\\+</code>"),
-        para("Minus: <code>\\-</code>"),
-
-        para("These should get escaped, even though they're matching pairs for\n" +
-             "other Markdown constructs:"),
-
-        para("\*asterisks\*"),
-        para("\_underscores\_"),
-        para("`backticks`"),
-
-        para("This is a code span with a literal backslash-backtick " +
-             "sequence: <code>\\`</code>"),
-
-        para("This is a tag with unescaped backticks " +
-             "<span attr='`ticks`'>bar</span>."),
-
-        para("This is a tag with backslashes " +
-             "<span attr='\\\\backslashes\\\\'>bar</span>."))
-
-    assert_equal expected, doc
-  end
-
-  def test_blockquotes_with_code_blocks
-    input = File.read "#{MARKDOWN_TEST_PATH}/Blockquotes with code blocks.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("Example:"),
-          verb("sub status {\n",
-               "    print \"working\";\n",
-               "}\n"),
-          para("Or:"),
-          verb("sub status {\n",
-               "    return \"working\";\n",
-               "}\n")))
-
-    assert_equal expected, doc
-  end
-
-  def test_code_blocks
-    input = File.read "#{MARKDOWN_TEST_PATH}/Code Blocks.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        verb("code block on the first line\n"),
-        para("Regular text."),
-
-        verb("code block indented by spaces\n"),
-        para("Regular text."),
-
-        verb("the lines in this block  \n",
-             "all contain trailing spaces  \n"),
-        para("Regular Text."),
-
-        verb("code block on the last line\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_code_spans
-    input = File.read "#{MARKDOWN_TEST_PATH}/Code Spans.text"
-
-    doc = @parser.parse input
-
-    expected = doc(
-      para("<code><test a=\"</code> content of attribute <code>\"></code>"),
-      para("Fix for backticks within HTML tag: " +
-           "<span attr='`ticks`'>like this</span>"),
-      para("Here's how you put <code>`backticks`</code> in a code span."))
-
-    assert_equal expected, doc
-  end
-
-  def test_hard_wrapped_paragraphs_with_list_like_lines
-    input = File.read "#{MARKDOWN_TEST_PATH}/Hard-wrapped paragraphs with list-like lines.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("In Markdown 1.0.0 and earlier. Version\n" +
-             "8. This line turns into a list item.\n"   +
-             "Because a hard-wrapped line in the\n"     +
-             "middle of a paragraph looked like a\n"    +
-             "list item."),
-        para("Here's one with a bullet.\n" +
-             "* criminey."))
-
-    assert_equal expected, doc
-  end
-
-  def test_horizontal_rules
-    input = File.read "#{MARKDOWN_TEST_PATH}/Horizontal rules.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Dashes:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("---\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("- - -\n"),
-
-        para("Asterisks:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("***\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("* * *\n"),
-
-        para("Underscores:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("___\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("_ _ _\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_advanced
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML (Advanced).text"
-
-    @parser.html = true
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Simple block on one line:"),
-        raw("<div>foo</div>"),
-        para("And nested without indentation:"),
-        raw(<<-RAW.chomp))
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"/>
-</div>
-<div>bar</div>
-</div>
-        RAW
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_simple
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML (Simple).text"
-
-    @parser.html = true
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-       para("Here's a simple block:"),
-       raw("<div>\n\tfoo\n</div>"),
-
-       para("This should be a code block, though:"),
-       verb("<div>\n",
-            "\tfoo\n",
-            "</div>\n"),
-
-       para("As should this:"),
-       verb("<div>foo</div>\n"),
-
-       para("Now, nested:"),
-       raw("<div>\n\t<div>\n\t\t<div>\n\t\t\tfoo\n" +
-           "\t\t</div>\n\t</div>\n</div>"),
-
-       para("This should just be an HTML comment:"),
-       raw("<!-- Comment -->"),
-
-       para("Multiline:"),
-       raw("<!--\nBlah\nBlah\n-->"),
-
-       para("Code block:"),
-       verb("<!-- Comment -->\n"),
-
-       para("Just plain comment, with trailing spaces on the line:"),
-       raw("<!-- foo -->"),
-
-       para("Code:"),
-       verb("<hr />\n"),
-
-       para("Hr's:"),
-       raw("<hr>"),
-       raw("<hr/>"),
-       raw("<hr />"),
-
-       raw("<hr>"),
-       raw("<hr/>"),
-       raw("<hr />"),
-
-       raw("<hr class=\"foo\" id=\"bar\" />"),
-       raw("<hr class=\"foo\" id=\"bar\"/>"),
-       raw("<hr class=\"foo\" id=\"bar\" >"))
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_comments
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML comments.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Paragraph one."),
-
-        raw("<!-- This is a simple comment -->"),
-
-        raw("<!--\n\tThis is another comment.\n-->"),
-
-        para("Paragraph two."),
-
-        raw("<!-- one comment block -- -- with two comments -->"),
-
-        para("The end."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_inline_style
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, inline style.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Just a {URL}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{Empty}[]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_reference_style
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, reference style.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."),
-
-        para("With {embedded [brackets]}[/url/]."),
-
-        para("Indented {once}[/url]."),
-        para("Indented {twice}[/url]."),
-        para("Indented {thrice}[/url]."),
-        para("Indented [four][] times."),
-
-        verb("[four]: /url\n"),
-
-        rule(1),
-
-        para("{this}[foo] should work"),
-        para("So should {this}[foo]."),
-        para("And {this}[foo]."),
-        para("And {this}[foo]."),
-        para("And {this}[foo]."),
-
-        para("But not [that] []."),
-        para("Nor [that][]."),
-        para("Nor [that]."),
-
-        para("[Something in brackets like {this}[foo] should work]"),
-        para("[Same with {this}[foo].]"),
-
-        para("In this case, {this}[/somethingelse/] points to something else."),
-        para("Backslashing should suppress [this] and [this]."),
-
-        rule(1),
-
-        para("Here's one where the {link breaks}[/url/] across lines."),
-        para("Here's another where the {link breaks}[/url/] across lines, " +
-             "but with a line-ending space."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_shortcut_references
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, shortcut references.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("This is the {simple case}[/simple]."),
-        para("This one has a {line break}[/foo]."),
-        para("This one has a {line break}[/foo] with a line-ending space."),
-        para("{this}[/that] and the {other}[/other]"))
-
-    assert_equal expected, doc
-  end
-
-  def test_literal_quotes_in_titles
-    input = File.read "#{MARKDOWN_TEST_PATH}/Literal quotes in titles.text"
-
-    doc = @parser.parse input
-
-    # TODO support title attribute
-    expected =
-      doc(
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_markdown_documentation_basics
-    input = File.read "#{MARKDOWN_TEST_PATH}/Markdown Documentation - Basics.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(1, "Markdown: Basics"),
-
-        raw(<<-RAW.chomp),
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a class="selected" title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-        RAW
-
-        head(2, "Getting the Gist of Markdown's Formatting Syntax"),
-
-        para("This page offers a brief overview of what it's like to use Markdown.\n" +
-             "The {syntax page}[/projects/markdown/syntax] provides complete, detailed documentation for\n" +
-             "every feature, but Markdown should be very easy to pick up simply by\n" +
-             "looking at a few examples of it in action. The examples on this page\n" +
-             "are written in a before/after style, showing example syntax and the\n" +
-             "HTML output produced by Markdown."),
-
-        para("It's also helpful to simply try Markdown out; the {Dingus}[/projects/markdown/dingus] is a\n" +
-             "web application that allows you type your own Markdown-formatted text\n" +
-             "and translate it to XHTML."),
-
-        para("<b>Note:</b> This document is itself written using Markdown; you\n" +
-             "can {see the source for it by adding '.text' to the URL}[/projects/markdown/basics.text]."),
-
-        head(2, "Paragraphs, Headers, Blockquotes"),
-
-        para("A paragraph is simply one or more consecutive lines of text, separated\n" +
-             "by one or more blank lines. (A blank line is any line that looks like a\n" +
-             "blank line -- a line containing nothing spaces or tabs is considered\n" +
-             "blank.) Normal paragraphs should not be intended with spaces or tabs."),
-
-        para("Markdown offers two styles of headers: _Setext_ and _atx_.\n" +
-             "Setext-style headers for <code><h1></code> and <code><h2></code> are created by\n" +
-             "\"underlining\" with equal signs (<code>=</code>) and hyphens (<code>-</code>), respectively.\n" +
-             "To create an atx-style header, you put 1-6 hash marks (<code>#</code>) at the\n" +
-             "beginning of the line -- the number of hashes equals the resulting\n" +
-             "HTML header level."),
-
-        para("Blockquotes are indicated using email-style '<code>></code>' angle brackets."),
-
-        para("Markdown:"),
-
-        verb("A First Level Header\n",
-             "====================\n",
-             "\n",
-             "A Second Level Header\n",
-             "---------------------\n",
-             "\n",
-             "Now is the time for all good men to come to\n",
-             "the aid of their country. This is just a\n",
-             "regular paragraph.\n",
-             "\n",
-             "The quick brown fox jumped over the lazy\n",
-             "dog's back.\n",
-             "\n",
-             "### Header 3\n",
-             "\n",
-             "> This is a blockquote.\n",
-             "> \n",
-             "> This is the second paragraph in the blockquote.\n",
-             ">\n",
-             "> ## This is an H2 in a blockquote\n"),
-
-        para("Output:"),
-
-        verb("<h1>A First Level Header</h1>\n",
-             "\n",
-             "<h2>A Second Level Header</h2>\n",
-             "\n",
-             "<p>Now is the time for all good men to come to\n",
-             "the aid of their country. This is just a\n",
-             "regular paragraph.</p>\n",
-             "\n",
-             "<p>The quick brown fox jumped over the lazy\n",
-             "dog's back.</p>\n",
-             "\n",
-             "<h3>Header 3</h3>\n",
-             "\n",
-             "<blockquote>\n",
-             "    <p>This is a blockquote.</p>\n",
-             "\n",
-             "    <p>This is the second paragraph in the blockquote.</p>\n",
-             "\n",
-             "    <h2>This is an H2 in a blockquote</h2>\n",
-             "</blockquote>\n"),
-
-        head(3, "Phrase Emphasis"),
-        para("Markdown uses asterisks and underscores to indicate spans of emphasis."),
-
-        para("Markdown:"),
-
-        verb("Some of these words *are emphasized*.\n",
-             "Some of these words _are emphasized also_.\n",
-             "\n",
-             "Use two asterisks for **strong emphasis**.\n",
-             "Or, if you prefer, __use two underscores instead__.\n"),
-
-        para("Output:"),
-
-        verb("<p>Some of these words <em>are emphasized</em>.\n",
-             "Some of these words <em>are emphasized also</em>.</p>\n",
-             "\n",
-             "<p>Use two asterisks for <strong>strong emphasis</strong>.\n",
-             "Or, if you prefer, <strong>use two underscores instead</strong>.</p>\n"),
-
-        head(2, "Lists"),
-
-        para("Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,\n" +
-             "<code>+</code>, and <code>-</code>) as list markers. These three markers are\n" +
-             "interchangeable; this:"),
-
-        verb("*   Candy.\n",
-             "*   Gum.\n",
-             "*   Booze.\n"),
-
-        para("this:"),
-
-        verb("+   Candy.\n",
-             "+   Gum.\n",
-             "+   Booze.\n"),
-
-        para("and this:"),
-
-        verb("-   Candy.\n",
-             "-   Gum.\n",
-             "-   Booze.\n"),
-
-        para("all produce the same output:"),
-
-        verb("<ul>\n",
-             "<li>Candy.</li>\n",
-             "<li>Gum.</li>\n",
-             "<li>Booze.</li>\n",
-             "</ul>\n"),
-
-        para("Ordered (numbered) lists use regular numbers, followed by periods, as\n" +
-             "list markers:"),
-
-        verb("1.  Red\n",
-             "2.  Green\n",
-             "3.  Blue\n"),
-
-        para("Output:"),
-
-        verb("<ol>\n",
-             "<li>Red</li>\n",
-             "<li>Green</li>\n",
-             "<li>Blue</li>\n",
-             "</ol>\n"),
-
-        para("If you put blank lines between items, you'll get <code><p></code> tags for the\n" +
-             "list item text. You can create multi-paragraph list items by indenting\n" +
-             "the paragraphs by 4 spaces or 1 tab:"),
-
-        verb("*   A list item.\n",
-             "\n",
-             "    With multiple paragraphs.\n",
-             "\n",
-             "*   Another item in the list.\n"),
-
-        para("Output:"),
-
-        verb("<ul>\n",
-             "<li><p>A list item.</p>\n",
-             "<p>With multiple paragraphs.</p></li>\n",
-             "<li><p>Another item in the list.</p></li>\n",
-             "</ul>\n"),
-
-        head(3, "Links"),
-
-        para("Markdown supports two styles for creating links: _inline_ and\n" +
-             "_reference_. With both styles, you use square brackets to delimit the\n" +
-             "text you want to turn into a link."),
-
-        para("Inline-style links use parentheses immediately after the link text.\n" +
-             "For example:"),
-
-        verb("This is an [example link](http://example.com/).\n"),
-
-        para("Output:"),
-
-        verb("<p>This is an <a href=\"http://example.com/\">\n",
-             "example link</a>.</p>\n"),
-
-        para("Optionally, you may include a title attribute in the parentheses:"),
-
-        verb("This is an [example link](http://example.com/ \"With a Title\").\n"),
-
-        para("Output:"),
-
-        verb("<p>This is an <a href=\"http://example.com/\" title=\"With a Title\">\n",
-             "example link</a>.</p>\n"),
-
-        para("Reference-style links allow you to refer to your links by names, which\n" +
-             "you define elsewhere in your document:"),
-
-        verb("I get 10 times more traffic from [Google][1] than from\n",
-             "[Yahoo][2] or [MSN][3].\n",
-             "\n",
-             "[1]: http://google.com/        \"Google\"\n",
-             "[2]: http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "[3]: http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Output:"),
-
-        verb("<p>I get 10 times more traffic from <a href=\"http://google.com/\"\n",
-             "title=\"Google\">Google</a> than from <a href=\"http://search.yahoo.com/\"\n",
-             "title=\"Yahoo Search\">Yahoo</a> or <a href=\"http://search.msn.com/\"\n",
-             "title=\"MSN Search\">MSN</a>.</p>\n"),
-
-        para("The title attribute is optional. Link names may contain letters,\n" +
-             "numbers and spaces, but are _not_ case sensitive:"),
-
-        verb("I start my morning with a cup of coffee and\n",
-             "[The New York Times][NY Times].\n",
-             "\n",
-             "[ny times]: http://www.nytimes.com/\n"),
-
-        para("Output:"),
-
-        verb("<p>I start my morning with a cup of coffee and\n",
-             "<a href=\"http://www.nytimes.com/\">The New York Times</a>.</p>\n"),
-
-        head(3, "Images"),
-
-        para("Image syntax is very much like link syntax."),
-
-        para("Inline (titles are optional):"),
-
-        verb("![alt text](/path/to/img.jpg \"Title\")\n"),
-
-        para("Reference-style:"),
-
-        verb("![alt text][id]\n",
-             "\n",
-             "[id]: /path/to/img.jpg \"Title\"\n"),
-
-        para("Both of the above examples produce the same output:"),
-
-        verb("<img src=\"/path/to/img.jpg\" alt=\"alt text\" title=\"Title\" />\n"),
-
-        head(3, "Code"),
-
-        para("In a regular paragraph, you can create code span by wrapping text in\n" +
-             "backtick quotes. Any ampersands (<code>&</code>) and angle brackets (<code><</code> or\n" +
-             "<code>></code>) will automatically be translated into HTML entities. This makes\n" +
-             "it easy to use Markdown to write about HTML example code:"),
-
-        verb(
-             "I strongly recommend against using any `<blink>` tags.\n",
-             "\n",
-             "I wish SmartyPants used named entities like `&mdash;`\n",
-             "instead of decimal-encoded entities like `&#8212;`.\n"),
-
-        para("Output:"),
-
-        verb("<p>I strongly recommend against using any\n",
-             "<code>&lt;blink&gt;</code> tags.</p>\n",
-             "\n",
-             "<p>I wish SmartyPants used named entities like\n",
-             "<code>&amp;mdash;</code> instead of decimal-encoded\n",
-             "entities like <code>&amp;#8212;</code>.</p>\n"),
-
-        para("To specify an entire block of pre-formatted code, indent every line of\n" +
-             "the block by 4 spaces or 1 tab. Just like with code spans, <code>&</code>, <code><</code>,\n" +
-             "and <code>></code> characters will be escaped automatically."),
-
-        para("Markdown:"),
-
-        verb("If you want your page to validate under XHTML 1.0 Strict,\n",
-             "you've got to put paragraph tags in your blockquotes:\n",
-             "\n",
-             "    <blockquote>\n",
-             "        <p>For example.</p>\n",
-             "    </blockquote>\n"),
-
-        para("Output:"),
-
-        verb("<p>If you want your page to validate under XHTML 1.0 Strict,\n",
-             "you've got to put paragraph tags in your blockquotes:</p>\n",
-             "\n",
-             "<pre><code>&lt;blockquote&gt;\n",
-             "    &lt;p&gt;For example.&lt;/p&gt;\n",
-             "&lt;/blockquote&gt;\n",
-             "</code></pre>\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_markdown_documentation_syntax
-    input = File.read "#{MARKDOWN_TEST_PATH}/Markdown Documentation - Syntax.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(1, "Markdown: Syntax"),
-
-        raw(<<-RAW.chomp),
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-        RAW
-
-        list(:BULLET,
-          item(nil,
-            para("{Overview}[#overview]"),
-            list(:BULLET,
-              item(nil,
-                para("{Philosophy}[#philosophy]")),
-              item(nil,
-                para("{Inline HTML}[#html]")),
-              item(nil,
-                para("{Automatic Escaping for Special Characters}[#autoescape]")))),
-          item(nil,
-            para("{Block Elements}[#block]"),
-            list(:BULLET,
-              item(nil,
-                para("{Paragraphs and Line Breaks}[#p]")),
-              item(nil,
-                para("{Headers}[#header]")),
-              item(nil,
-                para("{Blockquotes}[#blockquote]")),
-              item(nil,
-                para("{Lists}[#list]")),
-              item(nil,
-                para("{Code Blocks}[#precode]")),
-              item(nil,
-                para("{Horizontal Rules}[#hr]")))),
-          item(nil,
-            para("{Span Elements}[#span]"),
-            list(:BULLET,
-              item(nil,
-                para("{Links}[#link]")),
-              item(nil,
-                para("{Emphasis}[#em]")),
-              item(nil,
-                para("{Code}[#code]")),
-              item(nil,
-                para("{Images}[#img]")))),
-          item(nil,
-            para("{Miscellaneous}[#misc]"),
-            list(:BULLET,
-              item(nil,
-                para("{Backslash Escapes}[#backslash]")),
-              item(nil,
-                para("{Automatic Links}[#autolink]"))))),
-
-        para("<b>Note:</b> This document is itself written using Markdown; you\n" +
-             "can {see the source for it by adding '.text' to the URL}[/projects/markdown/syntax.text]."),
-
-        rule(1),
-
-        raw("<h2 id=\"overview\">Overview</h2>"),
-
-        raw("<h3 id=\"philosophy\">Philosophy</h3>"),
-
-        para("Markdown is intended to be as easy-to-read and easy-to-write as is feasible."),
-
-        para("Readability, however, is emphasized above all else. A Markdown-formatted\n" +
-             "document should be publishable as-is, as plain text, without looking\n" +
-             "like it's been marked up with tags or formatting instructions. While\n" +
-             "Markdown's syntax has been influenced by several existing text-to-HTML\n" +
-             "filters -- including {Setext}[http://docutils.sourceforge.net/mirror/setext.html], {atx}[http://www.aaronsw.com/2002/atx/], {Textile}[http://textism.com/tools/textile/], {reStructuredText}[http://docutils.sourceforge.net/rst.html],\n" +
-             "{Grutatext}[http://www.triptico.com/software/grutatxt.html], and {EtText}[http://ettext.taint.org/doc/] -- the single biggest source of\n" +
-             "inspiration for Markdown's syntax is the format of plain text email."),
-
-        para("To this end, Markdown's syntax is comprised entirely of punctuation\n" +
-             "characters, which punctuation characters have been carefully chosen so\n" +
-             "as to look like what they mean. E.g., asterisks around a word actually\n" +
-             "look like \*emphasis\*. Markdown lists look like, well, lists. Even\n" +
-             "blockquotes look like quoted passages of text, assuming you've ever\n" +
-             "used email."),
-
-        raw("<h3 id=\"html\">Inline HTML</h3>"),
-
-        para("Markdown's syntax is intended for one purpose: to be used as a\n" +
-             "format for _writing_ for the web."),
-
-        para("Markdown is not a replacement for HTML, or even close to it. Its\n" +
-             "syntax is very small, corresponding only to a very small subset of\n" +
-             "HTML tags. The idea is _not_ to create a syntax that makes it easier\n" +
-             "to insert HTML tags. In my opinion, HTML tags are already easy to\n" +
-             "insert. The idea for Markdown is to make it easy to read, write, and\n" +
-             "edit prose. HTML is a _publishing_ format; Markdown is a _writing_\n" +
-             "format. Thus, Markdown's formatting syntax only addresses issues that\n" +
-             "can be conveyed in plain text."),
-
-        para("For any markup that is not covered by Markdown's syntax, you simply\n" +
-             "use HTML itself. There's no need to preface it or delimit it to\n" +
-             "indicate that you're switching from Markdown to HTML; you just use\n" +
-             "the tags."),
-
-        para("The only restrictions are that block-level HTML elements -- e.g. <code><div></code>,\n" +
-             "<code><table></code>, <code><pre></code>, <code><p></code>, etc. -- must be separated from surrounding\n" +
-             "content by blank lines, and the start and end tags of the block should\n" +
-             "not be indented with tabs or spaces. Markdown is smart enough not\n" +
-             "to add extra (unwanted) <code><p></code> tags around HTML block-level tags."),
-
-        para("For example, to add an HTML table to a Markdown article:"),
-
-        verb("This is a regular paragraph.\n",
-             "\n",
-             "<table>\n",
-             "    <tr>\n",
-             "        <td>Foo</td>\n",
-             "    </tr>\n",
-             "</table>\n",
-             "\n",
-             "This is another regular paragraph.\n"),
-
-        para("Note that Markdown formatting syntax is not processed within block-level\n" +
-             "HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code> inside an\n" +
-             "HTML block."),
-
-        para("Span-level HTML tags -- e.g. <code><span></code>, <code><cite></code>, or <code><del></code> -- can be\n" +
-             "used anywhere in a Markdown paragraph, list item, or header. If you\n" +
-             "want, you can even use HTML tags instead of Markdown formatting; e.g. if\n" +
-             "you'd prefer to use HTML <code><a></code> or <code><img></code> tags instead of Markdown's\n" +
-             "link or image syntax, go right ahead."),
-
-        para("Unlike block-level HTML tags, Markdown syntax _is_ processed within\n" +
-             "span-level tags."),
-
-        raw("<h3 id=\"autoescape\">Automatic Escaping for Special Characters</h3>"),
-
-        para("In HTML, there are two characters that demand special treatment: <code><</code>\n" +
-             "and <code>&</code>. Left angle brackets are used to start tags; ampersands are\n" +
-             "used to denote HTML entities. If you want to use them as literal\n" +
-             "characters, you must escape them as entities, e.g. <code>&lt;</code>, and\n" +
-             "<code>&amp;</code>."),
-
-        para("Ampersands in particular are bedeviling for web writers. If you want to\n" +
-             "write about 'AT&T', you need to write '<code>AT&amp;T</code>'. You even need to\n" +
-             "escape ampersands within URLs. Thus, if you want to link to:"),
-
-        verb("http://images.google.com/images?num=30&q=larry+bird\n"),
-
-        para("you need to encode the URL as:"),
-
-        verb("http://images.google.com/images?num=30&amp;q=larry+bird\n"),
-
-        para("in your anchor tag <code>href</code> attribute. Needless to say, this is easy to\n" +
-             "forget, and is probably the single most common source of HTML validation\n" +
-             "errors in otherwise well-marked-up web sites."),
-
-        para("Markdown allows you to use these characters naturally, taking care of\n" +
-             "all the necessary escaping for you. If you use an ampersand as part of\n" +
-             "an HTML entity, it remains unchanged; otherwise it will be translated\n" +
-             "into <code>&amp;</code>."),
-
-        para("So, if you want to include a copyright symbol in your article, you can write:"),
-
-        verb("&copy;\n"),
-
-        para("and Markdown will leave it alone. But if you write:"),
-
-        verb("AT&T\n"),
-
-        para("Markdown will translate it to:"),
-
-        verb("AT&amp;T\n"),
-
-        para("Similarly, because Markdown supports {inline HTML}[#html], if you use\n" +
-             "angle brackets as delimiters for HTML tags, Markdown will treat them as\n" +
-             "such. But if you write:"),
-
-        verb("4 < 5\n"),
-
-        para("Markdown will translate it to:"),
-
-        verb("4 &lt; 5\n"),
-
-        para("However, inside Markdown code spans and blocks, angle brackets and\n" +
-             "ampersands are _always_ encoded automatically. This makes it easy to use\n" +
-             "Markdown to write about HTML code. (As opposed to raw HTML, which is a\n" +
-             "terrible format for writing about HTML syntax, because every single <code><</code>\n" +
-             "and <code>&</code> in your example code needs to be escaped.)"),
-
-        rule(1),
-
-        raw("<h2 id=\"block\">Block Elements</h2>"),
-
-        raw("<h3 id=\"p\">Paragraphs and Line Breaks</h3>"),
-
-        para("A paragraph is simply one or more consecutive lines of text, separated\n" +
-             "by one or more blank lines. (A blank line is any line that looks like a\n" +
-             "blank line -- a line containing nothing but spaces or tabs is considered\n" +
-             "blank.) Normal paragraphs should not be intended with spaces or tabs."),
-
-        para("The implication of the \"one or more consecutive lines of text\" rule is\n" +
-             "that Markdown supports \"hard-wrapped\" text paragraphs. This differs\n" +
-             "significantly from most other text-to-HTML formatters (including Movable\n" +
-             "Type's \"Convert Line Breaks\" option) which translate every line break\n" +
-             "character in a paragraph into a <code><br /></code> tag."),
-
-        para("When you _do_ want to insert a <code><br /></code> break tag using Markdown, you\n" +
-             "end a line with two or more spaces, then type return."),
-
-        para("Yes, this takes a tad more effort to create a <code><br /></code>, but a simplistic\n" +
-             "\"every line break is a <code><br /></code>\" rule wouldn't work for Markdown.\n" +
-             "Markdown's email-style {blockquoting}[#blockquote] and multi-paragraph {list items}[#list]\n" +
-             "work best -- and look better -- when you format them with hard breaks."),
-
-        raw("<h3 id=\"header\">Headers</h3>"),
-
-        para("Markdown supports two styles of headers, {Setext}[http://docutils.sourceforge.net/mirror/setext.html] and {atx}[http://www.aaronsw.com/2002/atx/]."),
-
-        para("Setext-style headers are \"underlined\" using equal signs (for first-level\n" +
-             "headers) and dashes (for second-level headers). For example:"),
-
-        verb("This is an H1\n",
-             "=============\n",
-             "\n",
-             "This is an H2\n",
-             "-------------\n"),
-
-        para("Any number of underlining <code>=</code>'s or <code>-</code>'s will work."),
-
-        para("Atx-style headers use 1-6 hash characters at the start of the line,\n" +
-             "corresponding to header levels 1-6. For example:"),
-
-        verb("# This is an H1\n",
-             "\n",
-             "## This is an H2\n",
-             "\n",
-             "###### This is an H6\n"),
-
-        para("Optionally, you may \"close\" atx-style headers. This is purely\n" +
-             "cosmetic -- you can use this if you think it looks better. The\n" +
-             "closing hashes don't even need to match the number of hashes\n" +
-             "used to open the header. (The number of opening hashes\n" +
-             "determines the header level.) :"),
-
-        verb("# This is an H1 #\n",
-             "\n",
-             "## This is an H2 ##\n",
-             "\n",
-             "### This is an H3 ######\n"),
-
-        raw("<h3 id=\"blockquote\">Blockquotes</h3>"),
-
-        para(
-             "Markdown uses email-style <code>></code> characters for blockquoting. If you're\n" +
-             "familiar with quoting passages of text in an email message, then you\n" +
-             "know how to create a blockquote in Markdown. It looks best if you hard\n" +
-             "wrap the text and put a <code>></code> before every line:"),
-
-        verb("> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,\n",
-             "> consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.\n",
-             "> Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "> \n",
-             "> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse\n",
-             "> id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("Markdown allows you to be lazy and only put the <code>></code> before the first\n" +
-             "line of a hard-wrapped paragraph:"),
-
-        verb("> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,\n",
-             "consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.\n",
-             "Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "\n",
-             "> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse\n",
-             "id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by\n" +
-             "adding additional levels of <code>></code>:"),
-
-        verb("> This is the first level of quoting.\n",
-             ">\n",
-             "> > This is nested blockquote.\n",
-             ">\n",
-             "> Back to the first level.\n"),
-
-        para("Blockquotes can contain other Markdown elements, including headers, lists,\n" +
-             "and code blocks:"),
-
-        verb("> ## This is a header.\n",
-             "> \n",
-             "> 1.   This is the first list item.\n",
-             "> 2.   This is the second list item.\n",
-             "> \n",
-             "> Here's some example code:\n",
-             "> \n",
-             ">     return shell_exec(\"echo $input | $markdown_script\");\n"),
-
-        para("Any decent text editor should make email-style quoting easy. For\n" +
-             "example, with BBEdit, you can make a selection and choose Increase\n" +
-             "Quote Level from the Text menu."),
-
-        raw("<h3 id=\"list\">Lists</h3>"),
-
-        para("Markdown supports ordered (numbered) and unordered (bulleted) lists."),
-
-        para("Unordered lists use asterisks, pluses, and hyphens -- interchangeably\n" +
-             "-- as list markers:"),
-
-        verb("*   Red\n",
-             "*   Green\n",
-             "*   Blue\n"),
-
-        para("is equivalent to:"),
-
-        verb("+   Red\n",
-             "+   Green\n",
-             "+   Blue\n"),
-
-        para("and:"),
-
-        verb("-   Red\n",
-             "-   Green\n",
-             "-   Blue\n"),
-
-        para("Ordered lists use numbers followed by periods:"),
-
-        verb("1.  Bird\n",
-             "2.  McHale\n",
-             "3.  Parish\n"),
-
-        para("It's important to note that the actual numbers you use to mark the\n" +
-             "list have no effect on the HTML output Markdown produces. The HTML\n" +
-             "Markdown produces from the above list is:"),
-
-        verb("<ol>\n",
-             "<li>Bird</li>\n",
-             "<li>McHale</li>\n",
-             "<li>Parish</li>\n",
-             "</ol>\n"),
-
-        para("If you instead wrote the list in Markdown like this:"),
-
-        verb("1.  Bird\n",
-             "1.  McHale\n",
-             "1.  Parish\n"),
-
-        para("or even:"),
-
-        verb("3. Bird\n",
-             "1. McHale\n",
-             "8. Parish\n"),
-
-        para("you'd get the exact same HTML output. The point is, if you want to,\n" +
-             "you can use ordinal numbers in your ordered Markdown lists, so that\n" +
-             "the numbers in your source match the numbers in your published HTML.\n" +
-             "But if you want to be lazy, you don't have to."),
-
-        para("If you do use lazy list numbering, however, you should still start the\n" +
-             "list with the number 1. At some point in the future, Markdown may support\n" +
-             "starting ordered lists at an arbitrary number."),
-
-        para("List markers typically start at the left margin, but may be indented by\n" +
-             "up to three spaces. List markers must be followed by one or more spaces\n" +
-             "or a tab."),
-
-        para("To make lists look nice, you can wrap items with hanging indents:"),
-
-        verb("*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\n",
-             "    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,\n",
-             "    viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.\n",
-             "    Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("But if you want to be lazy, you don't have to:"),
-
-        verb("*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\n",
-             "Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,\n",
-             "viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.\n",
-             "Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("If list items are separated by blank lines, Markdown will wrap the\n" +
-             "items in <code><p></code> tags in the HTML output. For example, this input:"),
-
-        verb("*   Bird\n",
-             "*   Magic\n"),
-
-        para("will turn into:"),
-
-        verb("<ul>\n",
-             "<li>Bird</li>\n",
-             "<li>Magic</li>\n",
-             "</ul>\n"),
-
-        para("But this:"),
-
-        verb("*   Bird\n",
-             "\n",
-             "*   Magic\n"),
-
-        para("will turn into:"),
-
-        verb("<ul>\n",
-             "<li><p>Bird</p></li>\n",
-             "<li><p>Magic</p></li>\n",
-             "</ul>\n"),
-
-        para("List items may consist of multiple paragraphs. Each subsequent\n" +
-             "paragraph in a list item must be intended by either 4 spaces\n" +
-             "or one tab:"),
-
-        verb("1.  This is a list item with two paragraphs. Lorem ipsum dolor\n",
-             "    sit amet, consectetuer adipiscing elit. Aliquam hendrerit\n",
-             "    mi posuere lectus.\n",
-             "\n",
-             "    Vestibulum enim wisi, viverra nec, fringilla in, laoreet\n",
-             "    vitae, risus. Donec sit amet nisl. Aliquam semper ipsum\n",
-             "    sit amet velit.\n",
-             "\n",
-             "2.  Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("It looks nice if you indent every line of the subsequent\n" +
-             "paragraphs, but here again, Markdown will allow you to be\n" +
-             "lazy:"),
-
-        verb("*   This is a list item with two paragraphs.\n",
-             "\n",
-             "    This is the second paragraph in the list item. You're\n",
-             "only required to indent the first line. Lorem ipsum dolor\n",
-             "sit amet, consectetuer adipiscing elit.\n",
-             "\n",
-             "*   Another item in the same list.\n"),
-
-        para("To put a blockquote within a list item, the blockquote's <code>></code>\n" +
-             "delimiters need to be indented:"),
-
-        verb("*   A list item with a blockquote:\n",
-             "\n",
-             "    > This is a blockquote\n",
-             "    > inside a list item.\n"),
-
-        para(
-             "To put a code block within a list item, the code block needs\n" +
-             "to be indented _twice_ -- 8 spaces or two tabs:"),
-
-        verb("*   A list item with a code block:\n",
-             "\n",
-             "        <code goes here>\n"),
-
-        para("It's worth noting that it's possible to trigger an ordered list by\n" +
-             "accident, by writing something like this:"),
-
-        verb("1986. What a great season.\n"),
-
-        para("In other words, a <em>number-period-space</em> sequence at the beginning of a\n" +
-             "line. To avoid this, you can backslash-escape the period:"),
-
-        verb("1986\\. What a great season.\n"),
-
-        raw("<h3 id=\"precode\">Code Blocks</h3>"),
-
-        para("Pre-formatted code blocks are used for writing about programming or\n" +
-             "markup source code. Rather than forming normal paragraphs, the lines\n" +
-             "of a code block are interpreted literally. Markdown wraps a code block\n" +
-             "in both <code><pre></code> and <code><code></code> tags."),
-
-        para("To produce a code block in Markdown, simply indent every line of the\n" +
-             "block by at least 4 spaces or 1 tab. For example, given this input:"),
-
-        verb("This is a normal paragraph:\n",
-             "\n",
-             "    This is a code block.\n"),
-
-        para("Markdown will generate:"),
-
-        verb("<p>This is a normal paragraph:</p>\n",
-             "\n",
-             "<pre><code>This is a code block.\n",
-             "</code></pre>\n"),
-
-        para("One level of indentation -- 4 spaces or 1 tab -- is removed from each\n" +
-             "line of the code block. For example, this:"),
-
-        verb("Here is an example of AppleScript:\n",
-             "\n",
-             "    tell application \"Foo\"\n",
-             "        beep\n",
-             "    end tell\n"),
-
-        para("will turn into:"),
-
-        verb("<p>Here is an example of AppleScript:</p>\n",
-             "\n",
-             "<pre><code>tell application \"Foo\"\n",
-             "    beep\n",
-             "end tell\n",
-             "</code></pre>\n"),
-
-        para("A code block continues until it reaches a line that is not indented\n" +
-             "(or the end of the article)."),
-
-        para("Within a code block, ampersands (<code>&</code>) and angle brackets (<code><</code> and <code>></code>)\n" +
-             "are automatically converted into HTML entities. This makes it very\n" +
-             "easy to include example HTML source code using Markdown -- just paste\n" +
-             "it and indent it, and Markdown will handle the hassle of encoding the\n" +
-             "ampersands and angle brackets. For example, this:"),
-
-        verb("    <div class=\"footer\">\n",
-             "        &copy; 2004 Foo Corporation\n",
-             "    </div>\n"),
-
-        para("will turn into:"),
-
-        verb("<pre><code>&lt;div class=\"footer\"&gt;\n",
-             "    &amp;copy; 2004 Foo Corporation\n",
-             "&lt;/div&gt;\n",
-             "</code></pre>\n"),
-
-        para("Regular Markdown syntax is not processed within code blocks. E.g.,\n" +
-             "asterisks are just literal asterisks within a code block. This means\n" +
-             "it's also easy to use Markdown to write about Markdown's own syntax."),
-
-        raw("<h3 id=\"hr\">Horizontal Rules</h3>"),
-
-        para("You can produce a horizontal rule tag (<code><hr /></code>) by placing three or\n" +
-             "more hyphens, asterisks, or underscores on a line by themselves. If you\n" +
-             "wish, you may use spaces between the hyphens or asterisks. Each of the\n" +
-             "following lines will produce a horizontal rule:"),
-
-        verb("* * *\n",
-             "\n",
-             "***\n",
-             "\n",
-             "*****\n",
-             "\n",
-             "- - -\n",
-             "\n",
-             "---------------------------------------\n",
-             "\n",
-             "_ _ _\n"),
-
-        rule(1),
-
-        raw("<h2 id=\"span\">Span Elements</h2>"),
-
-        raw("<h3 id=\"link\">Links</h3>"),
-
-        para("Markdown supports two style of links: _inline_ and _reference_."),
-
-        para("In both styles, the link text is delimited by [square brackets]."),
-
-        para("To create an inline link, use a set of regular parentheses immediately\n" +
-             "after the link text's closing square bracket. Inside the parentheses,\n" +
-             "put the URL where you want the link to point, along with an _optional_\n" +
-             "title for the link, surrounded in quotes. For example:"),
-
-        verb("This is [an example](http://example.com/ \"Title\") inline link.\n",
-             "\n",
-             "[This link](http://example.net/) has no title attribute.\n"),
-
-        para("Will produce:"),
-
-        verb("<p>This is <a href=\"http://example.com/\" title=\"Title\">\n",
-             "an example</a> inline link.</p>\n",
-             "\n",
-             "<p><a href=\"http://example.net/\">This link</a> has no\n",
-             "title attribute.</p>\n"),
-
-        para("If you're referring to a local resource on the same server, you can\n" +
-             "use relative paths:"),
-
-        verb("See my [About](/about/) page for details.\n"),
-
-        para("Reference-style links use a second set of square brackets, inside\n" +
-             "which you place a label of your choosing to identify the link:"),
-
-        verb("This is [an example][id] reference-style link.\n"),
-
-        para("You can optionally use a space to separate the sets of brackets:"),
-
-        verb("This is [an example] [id] reference-style link.\n"),
-
-        para("Then, anywhere in the document, you define your link label like this,\n" +
-             "on a line by itself:"),
-
-        verb("[id]: http://example.com/  \"Optional Title Here\"\n"),
-
-        para("That is:"),
-
-        list(:BULLET,
-          item(nil,
-            para("Square brackets containing the link identifier (optionally\n" +
-                 "indented from the left margin using up to three spaces);")),
-          item(nil,
-            para("followed by a colon;")),
-          item(nil,
-            para("followed by one or more spaces (or tabs);")),
-          item(nil,
-            para("followed by the URL for the link;")),
-          item(nil,
-            para("optionally followed by a title attribute for the link, enclosed\n" +
-                 "in double or single quotes."))),
-
-        para("The link URL may, optionally, be surrounded by angle brackets:"),
-
-        verb("[id]: <http://example.com/>  \"Optional Title Here\"\n"),
-
-        para("You can put the title attribute on the next line and use extra spaces\n" +
-             "or tabs for padding, which tends to look better with longer URLs:"),
-
-        verb("[id]: http://example.com/longish/path/to/resource/here\n",
-             "    \"Optional Title Here\"\n"),
-
-        para("Link definitions are only used for creating links during Markdown\n" +
-             "processing, and are stripped from your document in the HTML output."),
-
-        para("Link definition names may consist of letters, numbers, spaces, and punctuation -- but they are _not_ case sensitive. E.g. these two links:"),
-
-        verb("[link text][a]\n",
-             "[link text][A]\n"),
-
-        para("are equivalent."),
-
-        para("The <em>implicit link name</em> shortcut allows you to omit the name of the\n" +
-             "link, in which case the link text itself is used as the name.\n" +
-             "Just use an empty set of square brackets -- e.g., to link the word\n" +
-             "\"Google\" to the google.com web site, you could simply write:"),
-
-        verb("[Google][]\n"),
-
-        para("And then define the link:"),
-
-        verb("[Google]: http://google.com/\n"),
-
-        para("Because link names may contain spaces, this shortcut even works for\n" +
-            "multiple words in the link text:"),
-
-
-        verb("Visit [Daring Fireball][] for more information.\n"),
-
-        para("And then define the link:"),
-
-        verb("[Daring Fireball]: http://daringfireball.net/\n"),
-
-        para("Link definitions can be placed anywhere in your Markdown document. I\n" +
-             "tend to put them immediately after each paragraph in which they're\n" +
-             "used, but if you want, you can put them all at the end of your\n" +
-             "document, sort of like footnotes."),
-
-        para("Here's an example of reference links in action:"),
-
-        verb("I get 10 times more traffic from [Google] [1] than from\n",
-             "[Yahoo] [2] or [MSN] [3].\n",
-             "\n",
-             "  [1]: http://google.com/        \"Google\"\n",
-             "  [2]: http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "  [3]: http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Using the implicit link name shortcut, you could instead write:"),
-
-        verb("I get 10 times more traffic from [Google][] than from\n",
-             "[Yahoo][] or [MSN][].\n",
-             "\n",
-             "  [google]: http://google.com/        \"Google\"\n",
-             "  [yahoo]:  http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "  [msn]:    http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Both of the above examples will produce the following HTML output:"),
-
-        verb("<p>I get 10 times more traffic from <a href=\"http://google.com/\"\n",
-             "title=\"Google\">Google</a> than from\n",
-             "<a href=\"http://search.yahoo.com/\" title=\"Yahoo Search\">Yahoo</a>\n",
-             "or <a href=\"http://search.msn.com/\" title=\"MSN Search\">MSN</a>.</p>\n"),
-
-        para("For comparison, here is the same paragraph written using\n" +
-             "Markdown's inline link style:"),
-
-        verb("I get 10 times more traffic from [Google](http://google.com/ \"Google\")\n",
-             "than from [Yahoo](http://search.yahoo.com/ \"Yahoo Search\") or\n",
-             "[MSN](http://search.msn.com/ \"MSN Search\").\n"),
-
-        para("The point of reference-style links is not that they're easier to\n" +
-             "write. The point is that with reference-style links, your document\n" +
-             "source is vastly more readable. Compare the above examples: using\n" +
-             "reference-style links, the paragraph itself is only 81 characters\n" +
-             "long; with inline-style links, it's 176 characters; and as raw HTML,\n" +
-             "it's 234 characters. In the raw HTML, there's more markup than there\n" +
-             "is text."),
-
-        para("With Markdown's reference-style links, a source document much more\n" +
-             "closely resembles the final output, as rendered in a browser. By\n" +
-             "allowing you to move the markup-related metadata out of the paragraph,\n" +
-             "you can add links without interrupting the narrative flow of your\n" +
-             "prose."),
-
-        raw("<h3 id=\"em\">Emphasis</h3>"),
-
-        para("Markdown treats asterisks (<code>*</code>) and underscores (<code>_</code>) as indicators of\n" +
-             "emphasis. Text wrapped with one <code>*</code> or <code>_</code> will be wrapped with an\n" +
-             "HTML <code><em></code> tag; double <code>*</code>'s or <code>_</code>'s will be wrapped with an HTML\n" +
-             "<code><strong></code> tag. E.g., this input:"),
-
-        verb("*single asterisks*\n",
-             "\n",
-             "_single underscores_\n",
-             "\n",
-             "**double asterisks**\n",
-             "\n",
-             "__double underscores__\n"),
-
-        para("will produce:"),
-
-        verb("<em>single asterisks</em>\n",
-             "\n",
-             "<em>single underscores</em>\n",
-             "\n",
-             "<strong>double asterisks</strong>\n",
-             "\n",
-             "<strong>double underscores</strong>\n"),
-
-        para("You can use whichever style you prefer; the lone restriction is that\n" +
-             "the same character must be used to open and close an emphasis span."),
-
-        para("Emphasis can be used in the middle of a word:"),
-
-        verb("un*fucking*believable\n"),
-
-        para("But if you surround an <code>*</code> or <code>_</code> with spaces, it'll be treated as a\n" +
-             "literal asterisk or underscore."),
-
-        para("To produce a literal asterisk or underscore at a position where it\n" +
-             "would otherwise be used as an emphasis delimiter, you can backslash\n" +
-             "escape it:"),
-
-        verb("\\*this text is surrounded by literal asterisks\\*\n"),
-
-        raw("<h3 id=\"code\">Code</h3>"),
-
-        para("To indicate a span of code, wrap it with backtick quotes (<code>`</code>).\n" +
-             "Unlike a pre-formatted code block, a code span indicates code within a\n" +
-             "normal paragraph. For example:"),
-
-        verb("Use the `printf()` function.\n"),
-
-        para("will produce:"),
-
-        verb("<p>Use the <code>printf()</code> function.</p>\n"),
-
-        para("To include a literal backtick character within a code span, you can use\n" +
-             "multiple backticks as the opening and closing delimiters:"),
-
-        verb("``There is a literal backtick (`) here.``\n"),
-
-        para("which will produce this:"),
-
-        verb("<p><code>There is a literal backtick (`) here.</code></p>\n"),
-
-        para("The backtick delimiters surrounding a code span may include spaces --\n" +
-             "one after the opening, one before the closing. This allows you to place\n" +
-             "literal backtick characters at the beginning or end of a code span:"),
-
-        verb("A single backtick in a code span: `` ` ``\n",
-             "\n",
-             "A backtick-delimited string in a code span: `` `foo` ``\n"),
-
-        para("will produce:"),
-
-        verb("<p>A single backtick in a code span: <code>`</code></p>\n",
-             "\n",
-             "<p>A backtick-delimited string in a code span: <code>`foo`</code></p>\n"),
-
-        para("With a code span, ampersands and angle brackets are encoded as HTML\n" +
-             "entities automatically, which makes it easy to include example HTML\n" +
-             "tags. Markdown will turn this:"),
-
-        verb("Please don't use any `<blink>` tags.\n"),
-
-        para("into:"),
-
-        verb("<p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>\n"),
-
-        para("You can write this:"),
-
-        verb("`&#8212;` is the decimal-encoded equivalent of `&mdash;`.\n"),
-
-        para("to produce:"),
-
-        verb( "<p><code>&amp;#8212;</code> is the decimal-encoded\n",
-             "equivalent of <code>&amp;mdash;</code>.</p>\n"),
-
-        raw("<h3 id=\"img\">Images</h3>"),
-
-        para("Admittedly, it's fairly difficult to devise a \"natural\" syntax for\n" +
-             "placing images into a plain text document format."),
-
-        para("Markdown uses an image syntax that is intended to resemble the syntax\n" +
-             "for links, allowing for two styles: _inline_ and _reference_."),
-
-        para("Inline image syntax looks like this:"),
-
-        verb("![Alt text](/path/to/img.jpg)\n",
-             "\n",
-             "![Alt text](/path/to/img.jpg \"Optional title\")\n"),
-
-        para("That is:"),
-
-        list(:BULLET,
-          item(nil,
-            para("An exclamation mark: <code>!</code>;")),
-          item(nil,
-            para("followed by a set of square brackets, containing the <code>alt</code>\n" +
-                 "attribute text for the image;")),
-          item(nil,
-            para("followed by a set of parentheses, containing the URL or path to\n" +
-                 "the image, and an optional <code>title</code> attribute enclosed in double\n" +
-                 "or single quotes."))),
-
-        para("Reference-style image syntax looks like this:"),
-
-        verb("![Alt text][id]\n"),
-
-        para("Where \"id\" is the name of a defined image reference. Image references\n" +
-             "are defined using syntax identical to link references:"),
-
-        verb("[id]: url/to/image  \"Optional title attribute\"\n"),
-
-        para("As of this writing, Markdown has no syntax for specifying the\n" +
-             "dimensions of an image; if this is important to you, you can simply\n" +
-             "use regular HTML <code><img></code> tags."),
-
-        rule(1),
-
-        raw("<h2 id=\"misc\">Miscellaneous</h2>"),
-
-        raw("<h3 id=\"autolink\">Automatic Links</h3>"),
-
-        para("Markdown supports a shortcut style for creating \"automatic\" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:"),
-
-        verb("<http://example.com/>\n"),
-
-        para("Markdown will turn this into:"),
-
-        verb("<a href=\"http://example.com/\">http://example.com/</a>\n"),
-
-        para("Automatic links for email addresses work similarly, except that\n" +
-             "Markdown will also perform a bit of randomized decimal and hex\n" +
-             "entity-encoding to help obscure your address from address-harvesting\n" +
-             "spambots. For example, Markdown will turn this:"),
-
-        verb("<address@example.com>\n"),
-
-        para("into something like this:"),
-
-        verb("<a href=\"&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;\n",
-             "&#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;\n",
-             "&#109;\">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;\n",
-             "&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>\n"),
-
-        para("which will render in a browser as a clickable link to \"address@example.com\"."),
-
-        para("(This sort of entity-encoding trick will indeed fool many, if not\n" +
-               "most, address-harvesting bots, but it definitely won't fool all of\n" +
-               "them. It's better than nothing, but an address published in this way\n" +
-               "will probably eventually start receiving spam.)"),
-
-        raw("<h3 id=\"backslash\">Backslash Escapes</h3>"),
-
-        para("Markdown allows you to use backslash escapes to generate literal\n" +
-             "characters which would otherwise have special meaning in Markdown's\n" +
-             "formatting syntax. For example, if you wanted to surround a word with\n" +
-             "literal asterisks (instead of an HTML <code><em></code> tag), you can backslashes\n" +
-             "before the asterisks, like this:"),
-
-        verb("\\*literal asterisks\\*\n"),
-
-        para("Markdown provides backslash escapes for the following characters:"),
-
-        verb("\\   backslash\n",
-             "`   backtick\n",
-             "*   asterisk\n",
-             "_   underscore\n",
-             "{}  curly braces\n",
-             "[]  square brackets\n",
-             "()  parentheses\n",
-             "#   hash mark\n",
-             "+	plus sign\n",
-             "-	minus sign (hyphen)\n",
-             ".   dot\n",
-             "!   exclamation mark\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_nested_blockquotes
-    input = File.read "#{MARKDOWN_TEST_PATH}/Nested blockquotes.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("foo"),
-          block(
-            para("bar")),
-          para("foo")))
-
-    assert_equal expected, doc
-  end
-
-  def test_ordered_and_unordered_lists
-    input = File.read "#{MARKDOWN_TEST_PATH}/Ordered and unordered lists.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(2, 'Unordered'),
-
-        para('Asterisks tight:'),
-        list(:BULLET,
-          item(nil, para("asterisk 1")),
-          item(nil, para("asterisk 2")),
-          item(nil, para("asterisk 3"))),
-        para('Asterisks loose:'),
-        list(:BULLET,
-          item(nil, para("asterisk 1")),
-          item(nil, para("asterisk 2")),
-          item(nil, para("asterisk 3"))),
-
-        rule(1),
-
-        para("Pluses tight:"),
-        list(:BULLET,
-          item(nil, para("Plus 1")),
-          item(nil, para("Plus 2")),
-          item(nil, para("Plus 3"))),
-        para("Pluses loose:"),
-        list(:BULLET,
-          item(nil, para("Plus 1")),
-          item(nil, para("Plus 2")),
-          item(nil, para("Plus 3"))),
-
-        rule(1),
-
-        para("Minuses tight:"),
-        list(:BULLET,
-          item(nil, para("Minus 1")),
-          item(nil, para("Minus 2")),
-          item(nil, para("Minus 3"))),
-        para("Minuses loose:"),
-        list(:BULLET,
-          item(nil, para("Minus 1")),
-          item(nil, para("Minus 2")),
-          item(nil, para("Minus 3"))),
-
-        head(2, "Ordered"),
-
-        para("Tight:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second")),
-          item(nil, para("Third"))),
-        para("and:"),
-        list(:NUMBER,
-          item(nil, para("One")),
-          item(nil, para("Two")),
-          item(nil, para("Three"))),
-
-        para("Loose using tabs:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second")),
-          item(nil, para("Third"))),
-        para("and using spaces:"),
-        list(:NUMBER,
-          item(nil, para("One")),
-          item(nil, para("Two")),
-          item(nil, para("Three"))),
-
-        para("Multiple paragraphs:"),
-        list(:NUMBER,
-          item(nil,
-            para("Item 1, graf one."),
-            para("Item 2. graf two. The quick brown fox " +
-                 "jumped over the lazy dog's\nback.")),
-          item(nil, para("Item 2.")),
-          item(nil, para("Item 3."))),
-
-        head(2, "Nested"),
-        list(:BULLET,
-          item(nil,
-            para("Tab"),
-            list(:BULLET,
-              item(nil,
-                para("Tab"),
-                list(:BULLET,
-                  item(nil,
-                    para("Tab"))))))),
-
-        para("Here's another:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second:"),
-            list(:BULLET,
-              item(nil, para("Fee")),
-              item(nil, para("Fie")),
-              item(nil, para("Foe")))),
-          item(nil, para("Third"))),
-
-        para("Same thing but with paragraphs:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second:"),
-            list(:BULLET,
-              item(nil, para("Fee")),
-              item(nil, para("Fie")),
-              item(nil, para("Foe")))),
-          item(nil, para("Third"))),
-
-        para("This was an error in Markdown 1.0.1:"),
-        list(:BULLET,
-          item(nil,
-            para("this"),
-            list(:BULLET,
-              item(nil, para("sub"))),
-            para("that"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_strong_and_em_together
-    input = File.read "#{MARKDOWN_TEST_PATH}/Strong and em together.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("<b><em>This is strong and em.</em></b>"),
-        para("So is <b>_this_</b> word."),
-        para("<b><em>This is strong and em.</em></b>"),
-        para("So is <b>_this_</b> word."))
-
-    assert_equal expected, doc
-  end
-
-  def test_tabs
-    input = File.read "#{MARKDOWN_TEST_PATH}/Tabs.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("this is a list item\nindented with tabs")),
-          item(nil,
-            para("this is a list item\nindented with spaces"))),
-
-        para("Code:"),
-
-        verb("this code block is indented by one tab\n"),
-
-        para("And:"),
-
-        verb("\tthis code block is indented by two tabs\n"),
-
-        para("And:"),
-
-        verb(
-          "+\tthis is an example list item\n",
-          "\tindented with tabs\n",
-          "\n",
-          "+   this is an example list item\n",
-          "    indented with spaces\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_tidiness
-    input = File.read "#{MARKDOWN_TEST_PATH}/Tidiness.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("A list within a blockquote:"),
-          list(:BULLET,
-            item(nil, para("asterisk 1")),
-            item(nil, para("asterisk 2")),
-            item(nil, para("asterisk 3")))))
-
-    assert_equal expected, doc
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_attribute_manager_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_attribute_manager_test.rb
deleted file mode 100644
index 05bd9519902..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_attribute_manager_test.rb
+++ /dev/null
@@ -1,395 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupAttributeManagerTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @am = RDoc::Markup::AttributeManager.new
-
-    @bold_on  = @am.changed_attribute_by_name([], [:BOLD])
-    @bold_off = @am.changed_attribute_by_name([:BOLD], [])
-
-    @tt_on    = @am.changed_attribute_by_name([], [:TT])
-    @tt_off   = @am.changed_attribute_by_name([:TT], [])
-
-    @em_on    = @am.changed_attribute_by_name([], [:EM])
-    @em_off   = @am.changed_attribute_by_name([:EM], [])
-
-    @bold_em_on   = @am.changed_attribute_by_name([], [:BOLD] | [:EM])
-    @bold_em_off  = @am.changed_attribute_by_name([:BOLD] | [:EM], [])
-
-    @em_then_bold = @am.changed_attribute_by_name([:EM], [:EM] | [:BOLD])
-
-    @em_to_bold   = @am.changed_attribute_by_name([:EM], [:BOLD])
-
-    @am.add_word_pair("{", "}", :WOMBAT)
-    @wombat_on    = @am.changed_attribute_by_name([], [:WOMBAT])
-    @wombat_off   = @am.changed_attribute_by_name([:WOMBAT], [])
-
-    @klass = RDoc::Markup::AttributeManager
-    @formatter = RDoc::Markup::Formatter.new @rdoc.options
-    @formatter.add_tag :BOLD, '<B>', '</B>'
-    @formatter.add_tag :EM, '<EM>', '</EM>'
-    @formatter.add_tag :TT, '<CODE>', '</CODE>'
-  end
-
-  def crossref(text)
-    crossref_bitmap = @am.attributes.bitmap_for(:_REGEXP_HANDLING_) |
-                      @am.attributes.bitmap_for(:CROSSREF)
-
-    [ @am.changed_attribute_by_name([], [:CROSSREF, :_REGEXP_HANDLING_]),
-      RDoc::Markup::RegexpHandling.new(crossref_bitmap, text),
-      @am.changed_attribute_by_name([:CROSSREF, :_REGEXP_HANDLING_], [])
-    ]
-  end
-
-  def test_adding
-    assert_equal(["cat ", @wombat_on, "and", @wombat_off, " dog" ],
-                  @am.flow("cat {and} dog"))
-    #assert_equal(["cat {and} dog" ], @am.flow("cat \\{and} dog"))
-  end
-
-  def test_add_html_tag
-    @am.add_html("Test", :TEST)
-    tags = @am.html_tags
-    assert_equal(6, tags.size)
-    assert(tags.has_key?("test"))
-  end
-
-  def test_add_regexp_handling
-    @am.add_regexp_handling "WikiWord", :WIKIWORD
-    regexp_handlings = @am.regexp_handlings
-
-    assert_equal 1, regexp_handlings.size
-    assert regexp_handlings.assoc "WikiWord"
-  end
-
-  def test_add_word_pair
-    @am.add_word_pair '%', '&', 'percent and'
-
-    assert @am.word_pair_map.include?(/(%)(\S+)(&)/)
-    assert @am.protectable.include?('%')
-    assert !@am.protectable.include?('&')
-  end
-
-  def test_add_word_pair_angle
-    e = assert_raise ArgumentError do
-      @am.add_word_pair '<', '>', 'angles'
-    end
-
-    assert_equal "Word flags may not start with '<'", e.message
-  end
-
-  def test_add_word_pair_invalid
-    assert_raise ArgumentError do
-      @am.add_word_pair("<", "<", :TEST)
-    end
-  end
-
-  def test_add_word_pair_map
-    @am.add_word_pair("x", "y", :TEST)
-
-    word_pair_map = @am.word_pair_map
-
-    assert_includes word_pair_map.keys.map { |r| r.source }, "(x)(\\S+)(y)"
-  end
-
-  def test_add_word_pair_matching
-    @am.add_word_pair '^', '^', 'caret'
-
-    assert @am.matching_word_pairs.include?('^')
-    assert @am.protectable.include?('^')
-  end
-
-  def test_basic
-    assert_equal(["cat"], @am.flow("cat"))
-
-    assert_equal(["cat ", @bold_on, "and", @bold_off, " dog"],
-                  @am.flow("cat *and* dog"))
-
-    assert_equal(["cat ", @bold_on, "AND", @bold_off, " dog"],
-                  @am.flow("cat *AND* dog"))
-
-    assert_equal(["cat ", @em_on, "And", @em_off, " dog"],
-                  @am.flow("cat _And_ dog"))
-
-    assert_equal(["cat *and dog*"], @am.flow("cat *and dog*"))
-
-    assert_equal(["*cat and* dog"], @am.flow("*cat and* dog"))
-
-    assert_equal(["cat *and ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat *and *dog*"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " dog"],
-                  @am.flow("cat _and_ dog"))
-
-    assert_equal(["cat_and_dog"],
-                  @am.flow("cat_and_dog"))
-
-    assert_equal(["cat ", @tt_on, "and", @tt_off, " dog"],
-                  @am.flow("cat +and+ dog"))
-
-    assert_equal(["cat ", @tt_on, "X::Y", @tt_off, " dog"],
-                  @am.flow("cat +X::Y+ dog"))
-
-    assert_equal(["cat ", @bold_on, "a_b_c", @bold_off, " dog"],
-                  @am.flow("cat *a_b_c* dog"))
-
-    assert_equal(["cat __ dog"],
-                  @am.flow("cat __ dog"))
-
-    assert_equal(["cat ", @em_on, "_", @em_off, " dog"],
-                  @am.flow("cat ___ dog"))
-
-    assert_equal(["cat and ", @em_on, "5", @em_off, " dogs"],
-                  @am.flow("cat and _5_ dogs"))
-
-    assert_equal([@tt_on, "__id__", @tt_off], @am.flow("+__id__+"))
-  end
-
-  def test_bold
-    assert_equal [@bold_on, 'bold', @bold_off],
-                 @am.flow("*bold*")
-
-    assert_equal [@bold_on, 'Bold:', @bold_off],
-                 @am.flow("*Bold:*")
-
-    assert_equal [@bold_on, '\\bold', @bold_off],
-                 @am.flow("*\\bold*")
-  end
-
-  def test_bold_html_escaped
-    assert_equal ['cat <b>dog</b>'], @am.flow('cat \<b>dog</b>')
-  end
-
-  def test_combined
-    assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat _and_ *dog*"))
-
-    assert_equal(["cat ", @em_on, "a__nd", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat _a__nd_ *dog*"))
-  end
-
-  def test_convert_attrs
-    str = '+foo+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000foo\000", str
-
-    str = '+:foo:+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000:foo:\000", str
-
-    str = '+x-y+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000x-y\000", str
-  end
-
-  def test_convert_attrs_ignores_code
-    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <code>__send__</code> bar')
-  end
-
-  def test_convert_attrs_ignores_tt
-    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <tt>__send__</tt> bar')
-  end
-
-  def test_convert_attrs_preserves_double
-    assert_equal 'foo.__send__ :bar', output('foo.__send__ :bar')
-    assert_equal 'use __FILE__ to', output('use __FILE__ to')
-  end
-
-  def test_convert_attrs_does_not_ignore_after_tt
-    assert_equal 'the <CODE>IF:</CODE><EM>key</EM> directive', output('the <tt>IF:</tt>_key_ directive')
-  end
-
-  def test_escapes
-    assert_equal '<CODE>text</CODE>',   output('<tt>text</tt>')
-    assert_equal '<tt>text</tt>',       output('\\<tt>text</tt>')
-    assert_equal '<tt>',                output('\\<tt>')
-    assert_equal '<CODE><tt></CODE>',   output('<tt>\\<tt></tt>')
-    assert_equal '<CODE>\\<tt></CODE>', output('<tt>\\\\<tt></tt>')
-    assert_equal '<B>text</B>',         output('*text*')
-    assert_equal '*text*',              output('\\*text*')
-    assert_equal '\\',                  output('\\')
-    assert_equal '\\text',              output('\\text')
-    assert_equal '\\\\text',            output('\\\\text')
-    assert_equal 'text \\ text',        output('text \\ text')
-
-    assert_equal 'and <CODE>\\s</CODE> matches space',
-                 output('and <tt>\\s</tt> matches space')
-    assert_equal 'use <CODE><tt>text</CODE></tt> for code',
-                 output('use <tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <CODE><tt>text</tt></CODE> for code',
-                 output('use <tt>\\<tt>text\\</tt></tt> for code')
-    assert_equal 'use <tt><tt>text</tt></tt> for code',
-                 output('use \\<tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
-                 output('use \\<tt><tt>text</tt></tt> for code')
-    assert_equal 'use <CODE>+text+</CODE> for code',
-                 output('use <tt>\\+text+</tt> for code')
-    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
-                 output('use \\<tt>+text+</tt> for code')
-    assert_equal 'illegal <tag>not</tag> changed',
-                 output('illegal <tag>not</tag> changed')
-    assert_equal 'unhandled <p>tag</p> unchanged',
-                 output('unhandled <p>tag</p> unchanged')
-  end
-
-  def test_exclude_tag
-    assert_equal '<CODE>aaa</CODE>[:symbol]', output('+aaa+[:symbol]')
-    assert_equal '<CODE>aaa[:symbol]</CODE>', output('+aaa[:symbol]+')
-    assert_equal 'aaa[:symbol]', output('aaa[:symbol]')
-    assert_equal '<B><CODE>index</CODE></B>', output('<b><tt>index</tt></b>')
-  end
-
-  def test_exclude_tag_flow
-    assert_equal [@tt_on, "aaa", @tt_off, "[:symbol]"],
-                  @am.flow("+aaa+[:symbol]")
-    assert_equal [@tt_on, "aaa[:symbol]", @tt_off],
-                  @am.flow("+aaa[:symbol]+")
-    assert_equal ["aaa[:symbol]"],
-                  @am.flow("aaa[:symbol]")
-  end
-
-  def test_html_like_em_bold
-    assert_equal ["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("cat <i>and </i><b>dog</b>")
-  end
-
-  def test_html_like_em_bold_SGML
-    assert_equal ["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("cat <i>and <b></i>dog</b>")
-  end
-
-  def test_html_like_em_bold_nested_1
-    assert_equal(["cat ", @bold_em_on, "and", @bold_em_off, " dog"],
-                  @am.flow("cat <i><b>and</b></i> dog"))
-  end
-
-  def test_html_like_em_bold_nested_2
-    assert_equal ["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off],
-                  @am.flow("cat <i>and <b>dog</b></i>")
-  end
-
-  def test_html_like_em_bold_nested_mixed_case
-    assert_equal ["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off],
-                  @am.flow("cat <i>and <B>dog</B></I>")
-  end
-
-  def test_html_like_em_bold_mixed_case
-    assert_equal ["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat <i>and</i> <B>dog</b>")
-  end
-
-  def test_html_like_teletype
-    assert_equal ["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow("cat <tt>dog</Tt>")
-  end
-
-  def test_html_like_teletype_em_bold_SGML
-    assert_equal [@tt_on, "cat", @tt_off, " ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("<tt>cat</tt> <i>and <b></i>dog</b>")
-  end
-
-  def test_initial_html
-    html_tags = @am.html_tags
-    assert html_tags.is_a?(Hash)
-    assert_equal(5, html_tags.size)
-  end
-
-  def test_initial_word_pairs
-    word_pairs = @am.matching_word_pairs
-    assert word_pairs.is_a?(Hash)
-    assert_equal(3, word_pairs.size)
-  end
-
-  def test_mask_protected_sequence
-    def @am.str()     @str       end
-    def @am.str=(str) @str = str end
-
-    @am.str = '<code>foo</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo</code>",       @am.str
-
-    @am.str = '<code>foo\\</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo<\x04/code>", @am.str, 'escaped close'
-
-    @am.str = '<code>foo\\\\</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo\\</code>",     @am.str, 'escaped backslash'
-  end
-
-  def test_protect
-    assert_equal(['cat \\ dog'],
-                 @am.flow('cat \\ dog'))
-
-    assert_equal(["cat <tt>dog</Tt>"],
-                 @am.flow("cat \\<tt>dog</Tt>"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " <B>dog</b>"],
-                  @am.flow("cat <i>and</i> \\<B>dog</b>"))
-
-    assert_equal(["*word* or <b>text</b>"],
-                 @am.flow("\\*word* or \\<b>text</b>"))
-
-    assert_equal(["_cat_", @em_on, "dog", @em_off],
-                  @am.flow("\\_cat_<i>dog</i>"))
-  end
-
-  def test_lost_tag_for_the_second_time
-    str = "cat <tt>dog</tt>"
-    assert_equal(["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow(str))
-    assert_equal(["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow(str))
-  end
-
-  def test_regexp_handling
-    @am.add_regexp_handling(RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF)
-
-    #
-    # The apostrophes in "cats'" and "dogs'" suppress the flagging of these
-    # words as potential cross-references, which is necessary for the unit
-    # tests.  Unfortunately, the markup engine right now does not actually
-    # check whether a cross-reference is valid before flagging it.
-    #
-    assert_equal(["cats'"], @am.flow("cats'"))
-
-    assert_equal(["cats' ", crossref("#fred"), " dogs'"].flatten,
-                  @am.flow("cats' #fred dogs'"))
-
-    assert_equal([crossref("#fred"), " dogs'"].flatten,
-                  @am.flow("#fred dogs'"))
-
-    assert_equal(["cats' ", crossref("#fred")].flatten, @am.flow("cats' #fred"))
-
-    assert_equal(["(", crossref("#fred"), ")"].flatten, @am.flow("(#fred)"))
-  end
-
-  def test_tt_html
-    assert_equal [@tt_on, '"\n"', @tt_off],
-                 @am.flow('<tt>"\n"</tt>')
-  end
-
-  def output(str)
-    @formatter.convert_flow @am.flow str
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_attributes_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_attributes_test.rb
deleted file mode 100644
index f584a4762a4..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_attributes_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupAttributesTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @as = RDoc::Markup::Attributes.new
-  end
-
-  def test_bitmap_for
-    assert_equal 2, @as.bitmap_for('two')
-    assert_equal 2, @as.bitmap_for('two')
-    assert_equal 4, @as.bitmap_for('three')
-  end
-
-  def test_as_string
-    @as.bitmap_for 'two'
-    @as.bitmap_for 'three'
-
-    assert_equal 'none',                  @as.as_string(0)
-    assert_equal '_REGEXP_HANDLING_',     @as.as_string(1)
-    assert_equal 'two',                   @as.as_string(2)
-    assert_equal '_REGEXP_HANDLING_,two', @as.as_string(3)
-  end
-
-  def test_each_name_of
-    @as.bitmap_for 'two'
-    @as.bitmap_for 'three'
-
-    assert_equal %w[],          @as.each_name_of(0).to_a
-    assert_equal %w[],          @as.each_name_of(1).to_a
-    assert_equal %w[two],       @as.each_name_of(2).to_a
-    assert_equal %w[three],     @as.each_name_of(4).to_a
-    assert_equal %w[two three], @as.each_name_of(6).to_a
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_document_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_document_test.rb
deleted file mode 100644
index 6b118f4e54e..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_document_test.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupDocumentTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @d = @RM::Document.new
-  end
-
-  def test_append
-    @d << @RM::Paragraph.new('hi')
-
-    expected = @RM::Document.new @RM::Paragraph.new('hi')
-
-    assert_equal expected, @d
-  end
-
-  def test_append_document
-    @d << @RM::Document.new
-
-    assert_empty @d
-
-    @d << @RM::Document.new(@RM::Paragraph.new('hi'))
-
-    expected = @RM::Document.new @RM::Paragraph.new('hi'), @RM::BlankLine.new
-
-    assert_equal expected, @d
-  end
-
-  def test_append_string
-    @d << ''
-
-    assert_empty @d
-
-    assert_raise ArgumentError do
-      @d << 'hi'
-    end
-  end
-
-  def test_concat
-    @d.concat [@RM::BlankLine.new, @RM::BlankLine.new]
-
-    refute_empty @d
-  end
-
-  def test_each
-    a = @RM::Document.new
-    b = @RM::Document.new(@RM::Paragraph.new('hi'))
-
-    @d.push a, b
-
-    assert_equal [a, b], @d.map { |sub_doc| sub_doc }
-  end
-
-  def test_empty_eh
-    assert_empty @d
-
-    @d << @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_empty_eh_document
-    d = @RM::Document.new @d
-
-    assert_empty d
-  end
-
-  def test_equals2
-    d2 = @RM::Document.new
-
-    assert_equal @d, d2
-
-    d2 << @RM::BlankLine.new
-
-    refute_equal @d, d2
-  end
-
-  def test_equals2_file
-    d2 = @RM::Document.new
-    d2.file = 'file.rb'
-
-    refute_equal @d, d2
-
-    @d.file = 'file.rb'
-
-    assert_equal @d, d2
-  end
-
-  def test_file_equals
-    @d.file = 'file.rb'
-
-    assert_equal 'file.rb', @d.file
-  end
-
-  def test_file_equals_top_level
-    @d.file = @store.add_file 'file.rb'
-
-    assert_equal 'file.rb', @d.file
-  end
-
-  def test_lt2
-    @d << @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_merge
-    original = @RM::Document.new @RM::Paragraph.new 'original'
-    original.file = 'file.rb'
-    root = @RM::Document.new original
-
-    replace = @RM::Document.new @RM::Paragraph.new 'replace'
-    replace.file = 'file.rb'
-
-    other = @RM::Document.new replace
-
-    result = root.merge other
-
-    inner = @RM::Document.new @RM::Paragraph.new 'replace'
-    inner.file = 'file.rb'
-    expected = @RM::Document.new inner
-
-    assert_equal expected, result
-  end
-
-  def test_merge_add
-    original = @RM::Document.new @RM::Paragraph.new 'original'
-    original.file = 'file.rb'
-    root = @RM::Document.new original
-
-    addition = @RM::Document.new @RM::Paragraph.new 'addition'
-    addition.file = 'other.rb'
-
-    other = @RM::Document.new addition
-
-    result = root.merge other
-
-    expected = @RM::Document.new original, addition
-
-    assert_equal expected, result
-  end
-
-  def test_merge_empty
-    original = @RM::Document.new
-    root = @RM::Document.new original
-
-    replace = @RM::Document.new @RM::Paragraph.new 'replace'
-    replace.file = 'file.rb'
-
-    other = @RM::Document.new replace
-
-    result = root.merge other
-
-    inner = @RM::Document.new @RM::Paragraph.new 'replace'
-    inner.file = 'file.rb'
-    expected = @RM::Document.new inner
-
-    assert_equal expected, result
-  end
-
-  def test_push
-    @d.push @RM::BlankLine.new, @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_table_of_contents
-    doc = @RM::Document.new(
-      @RM::Heading.new(1, 'A'),
-      @RM::Paragraph.new('B'),
-      @RM::Heading.new(2, 'C'),
-      @RM::Paragraph.new('D'),
-      @RM::Heading.new(1, 'E'),
-      @RM::Paragraph.new('F'))
-
-    expected = [
-      @RM::Heading.new(1, 'A'),
-      @RM::Heading.new(2, 'C'),
-      @RM::Heading.new(1, 'E'),
-    ]
-
-    assert_equal expected, doc.table_of_contents
-  end
-
-  def test_table_of_contents_omit_headings_below
-    document = doc(
-      head(1, 'A'),
-      para('B'),
-      head(2, 'C'),
-      para('D'),
-      head(1, 'E'),
-      para('F'))
-
-    document.omit_headings_below = 1
-
-    expected = [
-      head(1, 'A'),
-      head(1, 'E'),
-    ]
-
-    assert_equal expected, document.table_of_contents
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_formatter_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_formatter_test.rb
deleted file mode 100644
index ee27f24e67c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_formatter_test.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupFormatterTest < RDoc::TestCase
-
-  class ToTest < RDoc::Markup::Formatter
-
-    def initialize(markup)
-      super nil, markup
-
-      add_tag :TT, '<code>', '</code>'
-    end
-
-    def accept_paragraph(paragraph)
-      @res += attributes(paragraph.text)
-    end
-
-    def attributes(text)
-      convert_flow @am.flow text.dup
-    end
-
-    def handle_regexp_CAPS(target)
-      "handled #{target.text}"
-    end
-
-    def start_accepting
-      @res = ""
-    end
-
-    def end_accepting
-      @res
-    end
-
-  end
-
-  def setup
-    super
-
-    @markup = @RM.new
-    @markup.add_regexp_handling(/[A-Z]+/, :CAPS)
-
-    @attribute_manager = @markup.attribute_manager
-    @attributes = @attribute_manager.attributes
-
-    @to = ToTest.new @markup
-
-    @caps            = @attributes.bitmap_for :CAPS
-    @regexp_handling = @attributes.bitmap_for :_REGEXP_HANDLING_
-    @tt              = @attributes.bitmap_for :TT
-  end
-
-  def test_class_gen_relative_url
-    def gen(from, to)
-      RDoc::Markup::ToHtml.gen_relative_url from, to
-    end
-
-    assert_equal 'a.html',    gen('a.html',   'a.html')
-    assert_equal 'b.html',    gen('a.html',   'b.html')
-
-    assert_equal 'd.html',    gen('a/c.html', 'a/d.html')
-    assert_equal '../a.html', gen('a/c.html', 'a.html')
-    assert_equal 'a/c.html',  gen('a.html',   'a/c.html')
-  end
-
-  def regexp_handling_names
-    @attribute_manager.regexp_handlings.map do |_, mask|
-      @attributes.as_string mask
-    end
-  end
-
-  def test_add_regexp_handling_RDOCLINK
-    @to.add_regexp_handling_RDOCLINK
-
-    assert_includes regexp_handling_names, 'RDOCLINK'
-
-    def @to.handle_regexp_RDOCLINK(target)
-      "<#{target.text}>"
-    end
-
-    document = doc(para('{foo}[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '{foo}[<rdoc-label:bar>].', formatted
-  end
-
-  def test_add_regexp_handling_TIDYLINK
-    @to.add_regexp_handling_TIDYLINK
-
-    assert_includes regexp_handling_names, 'TIDYLINK'
-
-    def @to.handle_regexp_TIDYLINK(target)
-      "<#{target.text}>"
-    end
-
-    document = doc(para('foo[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '<foo[rdoc-label:bar]>.', formatted
-
-    document = doc(para('{foo}[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '<{foo}[rdoc-label:bar]>.', formatted
-
-    document = doc(para('<tt>{abc}</tt>: {foo}[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '<code>{abc}</code>: <{foo}[rdoc-label:bar]>.', formatted
-  end
-
-  def test_parse_url
-    scheme, url, id = @to.parse_url 'example/foo'
-
-    assert_equal 'http',        scheme
-    assert_equal 'example/foo', url
-    assert_nil   id
-  end
-
-  def test_parse_url_anchor
-    scheme, url, id = @to.parse_url '#foottext-1'
-
-    assert_nil   scheme
-    assert_equal '#foottext-1', url
-    assert_nil   id
-  end
-
-  def test_parse_url_link
-    scheme, url, id = @to.parse_url 'link:README.txt'
-
-    assert_equal 'link',       scheme
-    assert_equal 'README.txt', url
-    assert_nil   id
-  end
-
-  def test_parse_url_link_id
-    scheme, url, id = @to.parse_url 'link:README.txt#label-foo'
-
-    assert_equal 'link',                 scheme
-    assert_equal 'README.txt#label-foo', url
-    assert_nil   id
-  end
-
-  def test_parse_url_rdoc_label
-    scheme, url, id = @to.parse_url 'rdoc-label:foo'
-
-    assert_equal 'link', scheme
-    assert_equal '#foo', url
-    assert_nil   id
-
-    scheme, url, id = @to.parse_url 'rdoc-label:foo:bar'
-
-    assert_equal 'link',      scheme
-    assert_equal '#foo',      url
-    assert_equal ' id="bar"', id
-  end
-
-  def test_parse_url_scheme
-    scheme, url, id = @to.parse_url 'http://example/foo'
-
-    assert_equal 'http',               scheme
-    assert_equal 'http://example/foo', url
-    assert_nil   id
-
-    scheme, url, id = @to.parse_url 'https://example/foo'
-
-    assert_equal 'https',               scheme
-    assert_equal 'https://example/foo', url
-    assert_nil   id
-  end
-
-  def test_convert_tt_regexp_handling
-    converted = @to.convert '<code>AAA</code>'
-
-    assert_equal '<code>AAA</code>', converted
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_hard_break_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_hard_break_test.rb
deleted file mode 100644
index 8ec8ffcfed6..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_hard_break_test.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupHardBreakTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @hb = RDoc::Markup::HardBreak.new
-  end
-
-  def test_accept
-    visitor = Object.new
-
-    def visitor.accept_hard_break(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    @hb.accept visitor
-
-    assert_same @hb, visitor.obj
-  end
-
-  def test_equals2
-    other = RDoc::Markup::HardBreak.new
-
-    assert_equal @hb, other
-
-    refute_equal @hb, Object.new
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_heading_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_heading_test.rb
deleted file mode 100644
index 3bf58ed5f77..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_heading_test.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupHeadingTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @h = RDoc::Markup::Heading.new 1, 'Hello *Friend*!'
-  end
-
-  def test_aref
-    assert_equal 'label-Hello+Friend-21', @h.aref
-  end
-
-  def test_label
-    assert_equal 'label-Hello+Friend-21', @h.label
-    assert_equal 'label-Hello+Friend-21', @h.label(nil)
-
-    context = RDoc::NormalClass.new 'Foo'
-
-    assert_equal 'class-Foo-label-Hello+Friend-21', @h.label(context)
-  end
-
-  def test_plain_html
-    assert_equal 'Hello <strong>Friend</strong>!', @h.plain_html
-  end
-
-  def test_plain_html_using_image_alt_as_text
-    h = RDoc::Markup::Heading.new 1, 'rdoc-image:foo.png:Hello World'
-
-    assert_equal 'Hello World', h.plain_html
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_include_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_include_test.rb
deleted file mode 100644
index 1544d25beea..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_include_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupIncludeTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @include = @RM::Include.new 'file', [Dir.tmpdir]
-  end
-
-  def test_equals2
-    assert_equal @include, @RM::Include.new('file', [Dir.tmpdir])
-    refute_equal @include, @RM::Include.new('file', %w[.])
-    refute_equal @include, @RM::Include.new('other', [Dir.tmpdir])
-    refute_equal @include, Object.new
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_indented_paragraph_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_indented_paragraph_test.rb
deleted file mode 100644
index 3be73b81db8..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_indented_paragraph_test.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupIndentedParagraphTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @IP = RDoc::Markup::IndentedParagraph
-  end
-
-  def test_initialize
-    ip = @IP.new 2, 'a', 'b'
-
-    assert_equal 2, ip.indent
-    assert_equal %w[a b], ip.parts
-  end
-
-  def test_accept
-    visitor = Object.new
-    def visitor.accept_indented_paragraph(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    paragraph = @IP.new 0
-
-    paragraph.accept visitor
-
-    assert_equal paragraph, visitor.obj
-  end
-
-  def test_equals2
-    one = @IP.new 1
-    two = @IP.new 2
-
-    assert_equal one, one
-    refute_equal one, two
-  end
-
-  def test_text
-    paragraph = @IP.new(2, 'hello', ' world')
-
-    assert_equal 'hello world', paragraph.text
-  end
-
-  def test_text_break
-    paragraph = @IP.new(2, 'hello', hard_break, 'world')
-
-    assert_equal 'helloworld', paragraph.text
-
-    assert_equal "hello\n  world", paragraph.text("\n")
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_paragraph_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_paragraph_test.rb
deleted file mode 100644
index 0f1b96e123a..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_paragraph_test.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupParagraphTest < RDoc::TestCase
-
-  def test_accept
-    visitor = Object.new
-    def visitor.accept_paragraph(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    paragraph = RDoc::Markup::Paragraph.new
-
-    paragraph.accept visitor
-
-    assert_same paragraph, visitor.obj
-  end
-
-  def test_text
-    paragraph = para('hello', ' world')
-
-    assert_equal 'hello world', paragraph.text
-  end
-
-  def test_text_break
-    paragraph = para('hello', hard_break, 'world')
-
-    assert_equal 'helloworld', paragraph.text
-
-    assert_equal "hello\nworld", paragraph.text("\n")
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_parser_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_parser_test.rb
deleted file mode 100644
index c157d9c213d..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_parser_test.rb
+++ /dev/null
@@ -1,1684 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocMarkupParserTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @RMP = @RM::Parser
-  end
-
-  def test_build_heading
-    parser = @RMP.new
-
-    parser.tokens.replace [
-      [:TEXT,    'heading three',  4, 0],
-      [:NEWLINE, "\n",            17, 0],
-    ]
-
-    assert_equal @RM::Heading.new(3, 'heading three'), parser.build_heading(3)
-  end
-
-  def test_get
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.get
-
-    assert_equal 7, parser.tokens.length
-  end
-
-  def test_parse_bullet
-    str = <<-STR
-* l1
-* l2
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_utf_8
-    str = <<-STR
-* 新しい機能
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('新しい機能'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_verbatim_heading
-    str = <<-STR
-* l1
-    v
-
-= H
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::Verbatim.new("v\n"))]),
-      @RM::Heading.new(1, 'H')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_heading
-    str = <<-STR
-* = l1
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Heading.new(1, 'l1'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_indent
-    str = <<-STR
-* l1
-  * l1.1
-* l2
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::List.new(:BULLET, *[
-            @RM::ListItem.new(nil,
-              @RM::Paragraph.new('l1.1'))])),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_paragraph
-    str = <<-STR
-now is
-* l1
-* l2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2')),
-      ]),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_multiline
-    str = <<-STR
-* l1
-  l1+
-* l2
-    STR
-
-    expected = [
-      list(:BULLET,
-        item(nil,
-          para('l1 ', 'l1+')),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_multiparagraph
-    str = <<-STR
-* l1
-
-  l1+
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::BlankLine.new,
-          @RM::Paragraph.new('l1+')),
-      ]),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_indent_verbatim
-    str = <<-STR
-* l1
-  * l1.1
-    text
-      code
-        code
-
-    text
-* l2
-    STR
-
-    expected = [
-      list(:BULLET,
-        item(nil,
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1 ', 'text'),
-              verb("code\n", "  code\n"),
-              para('text')))),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_dash
-    str = <<-STR
-- one
-- two
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('one')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('two'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading
-    str = '= heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_three
-    str = '=== heading three'
-
-    expected = [
-      @RM::Heading.new(3, 'heading three')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_bullet
-    str = '= * heading one'
-
-    expected = [
-      @RM::Heading.new(1, '* heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_empty
-    str = <<-STR
-===
-* bullet
-    STR
-
-    expected = [
-      @RM::Heading.new(3, ''),
-      @RM::BlankLine.new,
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('bullet'))]),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_heading
-    str = '= ='
-
-    expected = [
-      @RM::Heading.new(1, '=')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_lalpha
-    str = '= b. heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'b. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_label
-    str = '= [heading one]'
-
-    expected = [
-      @RM::Heading.new(1, '[heading one]')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_note
-    str = '= heading one::'
-
-    expected = [
-      @RM::Heading.new(1, 'heading one::')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_number
-    str = '= 5. heading one'
-
-    expected = [
-      @RM::Heading.new(1, '5. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_ualpha
-    str = '= B. heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'B. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label
-    str = <<-STR
-[one] item one
-[two] item two
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_bullet
-    str = <<-STR
-[cat] l1
-      * l1.1
-[dog] l2
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[cat],
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1')))),
-        item(%w[dog],
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_multi_label
-    str = <<-STR
-[one]
-[two] some description
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one two],
-          para('some description')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_multi_line
-    str = <<-STR
-[cat] l1
-      continuation
-[dog] l2
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[cat],
-          para('l1 ', 'continuation')),
-        item(%w[dog],
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_newline
-    str = <<-STR
-[one]
-  item one
-[two]
-  item two
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha
-    str = <<-STR
-a. l1
-b. l2
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha_ualpha
-    str = <<-STR
-a. l1
-b. l2
-A. l3
-A. l4
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))]),
-      @RM::List.new(:UALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l3')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l4'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha_utf_8
-    str = <<-STR
-a. 新しい機能
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('新しい機能'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_line_break
-    str = "now is\nthe time  \nfor all"
-
-    expected = [
-      para('now is ', 'the time'),
-      blank_line,
-      para('for all')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_list_1
-    str = <<-STR
-10. para 1
-
-    [label 1]
-      para 1.1
-
-        code
-
-      para 1.2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('para 1'),
-          blank_line,
-          list(:LABEL,
-            item(%w[label\ 1],
-              para('para 1.1'),
-              blank_line,
-              verb("code\n"),
-              para('para 1.2')))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_list_2
-    str = <<-STR
-6. para
-
-   label 1::  text 1
-   label 2::  text 2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('para'),
-          blank_line,
-          list(:NOTE,
-            item(%w[label\ 1],
-              para('text 1')),
-            item(%w[label\ 2],
-              para('text 2')))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_verbatim
-    str = <<-STR
-* one
-    verb1
-    verb2
-* two
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('one'),
-          @RM::Verbatim.new("verb1\n", "verb2\n")),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('two'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lists
-    str = <<-STR
-now is
-* l1
-1. n1
-2. n2
-* l2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'))]),
-      @RM::List.new(:NUMBER, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('n1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('n2'))]),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))]),
-      @RM::Paragraph.new('the time')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note
-    str = <<-STR
-one:: item one
-two:: item two
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note_empty
-    str = <<-STR
-one::
-two::
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one two],
-          blank_line))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note_note
-    str = <<-STR
-one:: two::
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one],
-          list(:NOTE,
-            item(%w[two],
-              blank_line))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_number_bullet
-    str = <<-STR
-1. l1
-   * l1.1
-2. l2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1')))),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph
-    str = <<-STR
-now is the time
-
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new('for all good men')]
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph_multiline
-    str = "now is the time\nfor all good men"
-
-    expected = @RM::Paragraph.new 'now is the time ', 'for all good men'
-    assert_equal [expected], @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph_verbatim
-    str = <<-STR
-now is the time
-  code _line_ here
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::Verbatim.new("code _line_ here\n"),
-      @RM::Paragraph.new('for all good men'),
-    ]
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_rule
-    str = <<-STR
-now is the time
-
----
-
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::BlankLine.new,
-      @RM::Rule.new(1),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new('for all good men')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_ualpha
-    str = <<-STR
-A. l1
-B. l2
-    STR
-
-    expected = [
-      @RM::List.new(:UALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_trailing_cr
-    expected = [ @RM::Paragraph.new('Text') ]
-    assert_equal expected, @RMP.parse("Text\r").parts
-  end
-
-  def test_parse_verbatim
-    str = <<-STR
-now is
-   code
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_bullet
-    str = <<-STR
-  * blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("* blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_dash
-    str = <<-STR
-  - blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("- blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_fold
-    str = <<-STR
-now is
-   code
-
-
-   code1
-
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_heading
-    str = <<-STR
-text
-   ===   heading three
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("===   heading three\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_heading2
-    str = "text\n   code\n=== heading three"
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("code\n"),
-      @RM::Heading.new(3, 'heading three')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_label
-    str = <<-STR
-  [blah] blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("[blah] blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_lalpha
-    str = <<-STR
-  b. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("b. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_markup_example
-    str = <<-STR
-text
-   code
-   === heading three
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("code\n", "=== heading three\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_merge
-    str = <<-STR
-now is
-   code
-
-   code1
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_merge2
-    str = <<-STR
-now is
-   code
-
-   code1
-
-   code2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n", "\n", "code2\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_multiline
-    str = <<-STR
-now is
-   code
-   code1
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_multilevel
-    str = <<-STR
-now is the time
-  code
- more code
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::Verbatim.new(" code\n",
-                        "more code\n"),
-      @RM::Paragraph.new('for all good men'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_note
-    str = <<-STR
-  blah:: blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("blah:: blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_number
-    str = <<-STR
-  2. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("2. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_rule
-    str = <<-STR
-text
-
-  --- lib/blah.rb.orig
-  +++ lib/blah.rb
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("--- lib/blah.rb.orig\n",
-                        "+++ lib/blah.rb\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_rule2
-    str = <<-STR.chomp
-text
-
-  ---
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("---")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_trim
-    str = <<-STR
-now is
-   code
-
-   code1
-
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n",
-                        "\n",
-                        "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_ualpha
-    str = <<-STR
-  B. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("B. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_whitespace
-    expected = [
-      @RM::Paragraph.new('hello'),
-    ]
-
-    assert_equal expected, @RMP.parse('hello').parts
-
-    expected = [
-      @RM::Verbatim.new('hello '),
-    ]
-
-    assert_equal expected, @RMP.parse('  hello ').parts
-
-    expected = [
-      @RM::Verbatim.new('hello          '),
-    ]
-
-    assert_equal expected, @RMP.parse('                 hello          ').parts
-
-    expected = [
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new("2\n", ' 3'),
-    ]
-
-    assert_equal expected, @RMP.parse("1\n 2\n  3").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "  3"),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n    3").parts
-
-    expected = [
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new("2\n",
-                        " 3\n"),
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new('2'),
-    ]
-
-    assert_equal expected, @RMP.parse("1\n 2\n  3\n1\n 2").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "  3\n",
-                        "1\n",
-                        ' 2'),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n    3\n  1\n   2").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "\n",
-                        '  3'),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n\n    3").parts
-  end
-
-  def test_parse_block_quote
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-    DOC
-
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"),
-                          @RM::Verbatim.new("code\n"),
-                          @RM::Paragraph.new("bar"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-    code
-  bar
-    DOC
-
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"),
-                          @RM::BlockQuote.new(@RM::Paragraph.new("bar")),
-                          @RM::Paragraph.new("zot"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-  >>>
-    bar
-  zot
-    DOC
-  end
-
-  def test_peek_token
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.peek_token
-
-    assert_equal 8, parser.tokens.length
-  end
-
-  def test_skip
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.skip(:HEADER)
-
-    assert_equal [:TEXT, 'Heading', 2, 0], parser.get
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-
-    assert_raise RDoc::Markup::Parser::ParseError do
-      parser.skip :NONE
-    end
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-
-    assert_nil parser.skip(:NONE, false)
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-  end
-
-  def test_tokenize_bullet
-    str = <<-STR
-* l1
-    STR
-
-    expected = [
-      [:BULLET,  '*',     0, 0],
-      [:TEXT,    'l1',    2, 0],
-      [:NEWLINE, "\n",    4, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_bullet_indent
-    str = <<-STR
-* l1
-  * l1.1
-    STR
-
-    expected = [
-      [:BULLET,  '*',     0, 0],
-      [:TEXT,    'l1',    2, 0],
-      [:NEWLINE, "\n",    4, 0],
-      [:BULLET,  '*',     2, 1],
-      [:TEXT,    'l1.1',  4, 1],
-      [:NEWLINE, "\n",    8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading
-    str = <<-STR
-= Heading
-== Heading 2
-    STR
-
-    expected = [
-      [:HEADER,  1,            0, 0],
-      [:TEXT,    'Heading',    2, 0],
-      [:NEWLINE, "\n",         9, 0],
-      [:HEADER,  2,            0, 1],
-      [:TEXT,    'Heading 2',  3, 1],
-      [:NEWLINE, "\n",        12, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_empty
-    str = <<-STR
-===
-* bullet
-    STR
-
-    expected = [
-      [:HEADER,  3,        0, 0],
-      [:NEWLINE, "\n",     3, 0],
-      [:BULLET,  "*",      0, 1],
-      [:TEXT,    "bullet", 2, 1],
-      [:NEWLINE, "\n",     8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_heading
-    str = <<-STR
-= =
-    STR
-
-    expected = [
-      [:HEADER,  1,    0, 0],
-      [:TEXT,    '=',  2, 0],
-      [:NEWLINE, "\n", 3, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_no_space
-    str = <<-STR
-=Heading
-==Heading 2
-    STR
-
-    expected = [
-      [:HEADER,  1,            0, 0],
-      [:TEXT,    'Heading',    1, 0],
-      [:NEWLINE, "\n",         8, 0],
-      [:HEADER,  2,            0, 1],
-      [:TEXT,    'Heading 2',  2, 1],
-      [:NEWLINE, "\n",        11, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label
-    str = <<-STR
-[cat] l1
-[dog] l1.1
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:TEXT,    'l1',    6, 0],
-      [:NEWLINE, "\n",    8, 0],
-      [:LABEL,   'dog',   0, 1],
-      [:TEXT,    'l1.1',  6, 1],
-      [:NEWLINE, "\n",   10, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_note
-    str = <<-STR
-[label]
-  note::
-    STR
-
-    expected = [
-      [:LABEL,   'label', 0, 0],
-      [:NEWLINE, "\n",    7, 0],
-      [:NOTE,    'note',  2, 1],
-      [:NEWLINE, "\n",    8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_newline
-    str = <<-STR
-[cat]
-  l1
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    4, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_newline_windows
-    str = <<-STR
-[cat]\r
-  l1\r
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:NEWLINE, "\n",    6, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_lalpha
-    str = <<-STR
-a. l1
-b. l1.1
-    STR
-
-    expected = [
-      [:LALPHA,  'a',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:LALPHA,  'b',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break
-    str = "now is\nthe time  \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',    0, 0],
-      [:NEWLINE, "\n",        6, 0],
-      [:TEXT,    'the time',  0, 1],
-      [:BREAK,   "  ",        8, 1],
-      [:NEWLINE, "\n",       10, 1],
-      [:TEXT,    'for all',   0, 2],
-      [:NEWLINE, "\n",        7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break_long
-    str = "now is\nthe time   \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',     0, 0],
-      [:NEWLINE, "\n",         6, 0],
-      [:TEXT,    'the time ',  0, 1],
-      [:BREAK,   '  ',         9, 1],
-      [:NEWLINE, "\n",        11, 1],
-      [:TEXT,    'for all',    0, 2],
-      [:NEWLINE, "\n",         7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break_no_short
-    str = "now is\nthe time \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',    0, 0],
-      [:NEWLINE, "\n",        6, 0],
-      [:TEXT,    'the time ', 0, 1],
-      [:NEWLINE, "\n",        9, 1],
-      [:TEXT,    'for all',   0, 2],
-      [:NEWLINE, "\n",        7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note
-    str = <<-STR
-cat:: l1
-dog:: l1.1
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:TEXT,    'l1',    6, 0],
-      [:NEWLINE, "\n",    8, 0],
-      [:NOTE,    'dog',   0, 1],
-      [:TEXT,    'l1.1',  6, 1],
-      [:NEWLINE, "\n",   10, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_empty
-    str = <<-STR
-cat::
-dog::
-    STR
-
-    expected = [
-      [:NOTE,    'cat', 0, 0],
-      [:NEWLINE, "\n",  5, 0],
-      [:NOTE,    'dog', 0, 1],
-      [:NEWLINE, "\n",  5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_newline
-    str = <<-STR
-cat::
-  l1
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    4, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_utf_8
-    str = <<-STR
-cät:: l1a
-      l1b
-døg:: l2a
-      l2b
-    STR
-
-    expected = [
-      [:NOTE,    'cät',   0, 0],
-      [:TEXT,    'l1a',   6, 0],
-      [:NEWLINE, "\n",    9, 0],
-      [:TEXT,    'l1b',   6, 1],
-      [:NEWLINE, "\n",    9, 1],
-      [:NOTE,    'døg',   0, 2],
-      [:TEXT,    'l2a',   6, 2],
-      [:NEWLINE, "\n",    9, 2],
-      [:TEXT,    'l2b',   6, 3],
-      [:NEWLINE, "\n",    9, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_newline_windows
-    str = <<-STR
-cat::\r
-  l1\r
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:NEWLINE, "\n",    6, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_not
-    str = <<-STR
-Cat::Dog
-    STR
-
-    expected = [
-      [:TEXT,    'Cat::Dog', 0, 0],
-      [:NEWLINE, "\n",       8, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number
-    str = <<-STR
-1. l1
-2. l1.1
-    STR
-
-    expected = [
-      [:NUMBER,  '1',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:NUMBER,  '2',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number_period
-    str = <<-STR
-1. blah blah blah
-   l.
-2. blah blah blah blah
-   d.
-    STR
-
-    expected = [
-      [:NUMBER,  "1",                    0, 0],
-      [:TEXT,    "blah blah blah",       3, 0],
-      [:NEWLINE, "\n",                  17, 0],
-
-      [:TEXT,    "l.",                   3, 1],
-      [:NEWLINE, "\n",                   5, 1],
-
-      [:NUMBER,  "2",                    0, 2],
-      [:TEXT,    "blah blah blah blah",  3, 2],
-      [:NEWLINE, "\n",                  22, 2],
-
-      [:TEXT,    "d.",                   3, 3],
-      [:NEWLINE, "\n",                   5, 3]
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number_period_continue
-    str = <<-STR
-1. blah blah blah
-   l.  more stuff
-2. blah blah blah blah
-   d. other stuff
-    STR
-
-    expected = [
-      [:NUMBER,  "1",                    0, 0],
-      [:TEXT,    "blah blah blah",       3, 0],
-      [:NEWLINE, "\n",                  17, 0],
-
-      [:LALPHA,  "l",                    3, 1],
-      [:TEXT,    "more stuff",           7, 1],
-      [:NEWLINE, "\n",                  17, 1],
-
-      [:NUMBER,  "2",                    0, 2],
-      [:TEXT,    "blah blah blah blah",  3, 2],
-      [:NEWLINE, "\n",                  22, 2],
-
-      [:LALPHA,  "d",                    3, 3],
-      [:TEXT,    "other stuff",          6, 3],
-      [:NEWLINE, "\n",                  17, 3]
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_paragraphs
-    str = <<-STR
-now is
-the time
-
-for all
-    STR
-
-    expected = [
-      [:TEXT,    'now is',   0, 0],
-      [:NEWLINE, "\n",       6, 0],
-      [:TEXT,    'the time', 0, 1],
-      [:NEWLINE, "\n",       8, 1],
-      [:NEWLINE, "\n",       0, 2],
-      [:TEXT,    'for all',  0, 3],
-      [:NEWLINE, "\n",       7, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_rule
-    str = <<-STR
----
-
---- blah ---
-    STR
-
-    expected = [
-      [:RULE,    1,            0, 0],
-      [:NEWLINE, "\n",         3, 0],
-      [:NEWLINE, "\n",         0, 1],
-      [:TEXT, "--- blah ---",  0, 2],
-      [:NEWLINE, "\n",        12, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_rule_windows
-    str = <<-STR
----\r
-
---- blah ---\r
-    STR
-
-    expected = [
-      [:RULE,    1,            0, 0],
-      [:NEWLINE, "\n",         4, 0],
-      [:NEWLINE, "\n",         0, 1],
-      [:TEXT, "--- blah ---",  0, 2],
-      [:NEWLINE, "\n",        13, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_ualpha
-    str = <<-STR
-A. l1
-B. l1.1
-    STR
-
-    expected = [
-      [:UALPHA,  'A',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:UALPHA,  'B',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_heading
-    str = <<-STR
-Example heading:
-
-   === heading three
-    STR
-
-    expected = [
-      [:TEXT,    'Example heading:',  0, 0],
-      [:NEWLINE, "\n",               16, 0],
-      [:NEWLINE, "\n",                0, 1],
-      [:HEADER,  3,                   3, 2],
-      [:TEXT,    'heading three',     7, 2],
-      [:NEWLINE, "\n",               20, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_rule
-    str = <<-STR
-  Verbatim section here that is double-underlined
-  ===============================================
-    STR
-
-    expected = [
-      [:TEXT,    'Verbatim section here that is double-underlined',  2, 0],
-      [:NEWLINE, "\n",                                              49, 0],
-      [:HEADER,  47,                                                 2, 1],
-      [:NEWLINE, "\n",                                              49, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_rule_fancy
-    str = <<-STR
-  A
-    b
-  ===============================================
-    c
-    STR
-
-    expected = [
-      [:TEXT,    'A',   2, 0],
-      [:NEWLINE, "\n",  3, 0],
-      [:TEXT,    'b',   4, 1],
-      [:NEWLINE, "\n",  5, 1],
-      [:HEADER,  47,    2, 2],
-      [:NEWLINE, "\n", 49, 2],
-      [:TEXT,    'c',   4, 3],
-      [:NEWLINE, "\n",  5, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  # HACK move to Verbatim test case
-  def test_verbatim_normalize
-    v = @RM::Verbatim.new "foo\n", "\n", "\n", "bar\n"
-
-    v.normalize
-
-    assert_equal ["foo\n", "\n", "bar\n"], v.parts
-
-    v = @RM::Verbatim.new "foo\n", "\n"
-
-    v.normalize
-
-    assert_equal ["foo\n"], v.parts
-  end
-
-  def test_unget
-    parser = util_parser
-
-    parser.get
-
-    parser.unget
-
-    assert_equal [:HEADER, 1, 0, 0], parser.peek_token
-
-    assert_raise @RMP::Error do
-      parser.unget
-    end
-
-    assert_equal 8, parser.tokens.length
-  end
-
-  def util_parser
-    str = <<-STR
-= Heading
-
-Some text here
-some more text over here
-    STR
-
-    @parser = @RMP.new
-    @parser.tokenize str
-    @parser
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_pre_process_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_pre_process_test.rb
deleted file mode 100644
index 2a8cd92dd04..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_pre_process_test.rb
+++ /dev/null
@@ -1,481 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDoc::Markup::PreProcessTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new 'test_rdoc_markup_pre_process'
-    @file_name = File.basename @tempfile.path
-    @dir  = File.dirname @tempfile.path
-
-    @pp = RDoc::Markup::PreProcess.new @tempfile.path, [@dir, File.dirname(__FILE__)]
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_class_register
-    RDoc::Markup::PreProcess.register 'for_test' do raise 'fail' end
-
-    assert_equal %w[for_test], RDoc::Markup::PreProcess.registered.keys
-  end
-
-  def test_class_post_process
-    RDoc::Markup::PreProcess.post_process do end
-
-    assert_equal 1, RDoc::Markup::PreProcess.post_processors.length,
-                 proc{RDoc::Markup::PreProcess.post_processors.inspect}
-  end
-
-  def test_include_file
-    @tempfile.write <<-INCLUDE
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    INCLUDE
-
-    @tempfile.flush
-    @tempfile.rewind
-
-    content = @pp.include_file @file_name, '', nil
-
-    expected = <<-EXPECTED
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    EXPECTED
-
-    assert_equal expected, content
-  end
-
-  def test_include_file_encoding_incompatible
-    @tempfile.write <<-INCLUDE
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-π
-    INCLUDE
-
-    @tempfile.flush
-    @tempfile.rewind
-
-    content = @pp.include_file @file_name, '', Encoding::US_ASCII
-
-    expected = "?\n"
-
-    assert_equal expected, content
-  end
-
-  def test_include_file_in_other_directory
-    content = nil
-    out, err = capture_output do
-      content = @pp.include_file "test.txt", '', nil
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal "test file\n", content
-  end
-
-  def test_handle
-    text = "# :main: M\n"
-    output = nil
-    _, err = capture_output do
-      output = @pp.handle text
-    end
-
-    assert_include err, "The :main: directive is deprecated and will be removed in RDoc 7."
-    assert_equal "#\n", output
-  end
-
-  def test_handle_comment
-    text = "# :main: M\n"
-    c = comment text
-
-    output = nil
-    _, err = capture_output do
-      output = @pp.handle c
-    end
-
-    assert_include err, "The :main: directive is deprecated and will be removed in RDoc 7."
-    assert_equal "#\n", output
-  end
-
-  def test_handle_markup
-    c = comment ':markup: rd'
-
-    @pp.handle c
-
-    assert_equal 'rd', c.format
-  end
-
-  def test_handle_markup_empty
-    c = comment ':markup:'
-
-    @pp.handle c
-
-    assert_equal 'rdoc', c.format
-  end
-
-  def test_handle_post_process
-    cd = RDoc::CodeObject.new
-
-    RDoc::Markup::PreProcess.post_process do |text, code_object|
-      code_object.metadata[:stuff] = text
-
-      :junk
-    end
-
-    text = "# a b c\n"
-
-    out = @pp.handle text, cd
-
-    assert_equal "# a b c\n", out
-    assert_equal "# a b c\n", cd.metadata[:stuff]
-  end
-
-  def test_handle_unregistered
-    text = "# :x: y\n"
-    out = @pp.handle text
-
-    assert_equal text, out
-  end
-
-  def test_handle_directive_blankline
-    result = @pp.handle_directive '#', 'arg', 'a, b'
-
-    assert_equal "#:arg: a, b\n", result
-  end
-
-  def test_handle_directive_downcase
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'ARG', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_arg
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'arg', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_arg_no_context
-    result = @pp.handle_directive '', 'arg', 'a, b', nil
-
-    assert_equal ":arg: a, b\n", result
-  end
-
-  def test_handle_directive_args
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'args', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_block
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_empty result
-  end
-
-  def test_handle_directive_block_false
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-  end
-
-  def test_handle_directive_block_nil
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      nil
-    end
-
-    assert_equal ":x: y\n", result
-  end
-
-  def test_handle_directive_category
-    context = RDoc::Context.new
-    original_section = context.current_section
-
-    @pp.handle_directive '', 'category', 'other', context
-
-    refute_equal original_section, context.current_section
-  end
-
-  def test_handle_directive_doc
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = false
-    code_object.force_documentation = false
-
-    @pp.handle_directive '', 'doc', nil, code_object
-
-    assert code_object.document_self
-    assert code_object.force_documentation
-  end
-
-  def test_handle_directive_doc_no_context
-    result = @pp.handle_directive '', 'doc', nil
-
-    assert_equal "\n", result
-  end
-
-  def test_handle_directive_enddoc
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'enddoc', nil, code_object
-
-    assert code_object.done_documenting
-  end
-
-  def test_handle_directive_include
-    @tempfile.write 'included'
-    @tempfile.flush
-
-    result = @pp.handle_directive '', 'include', @file_name
-
-    assert_equal 'included', result
-  end
-
-  def test_handle_directive_main
-    @pp.options = RDoc::Options.new
-
-    _, err = capture_output do
-      @pp.handle_directive '', 'main', 'M'
-    end
-
-    assert_include err, "The :main: directive is deprecated and will be removed in RDoc 7."
-    assert_equal 'M', @pp.options.main_page
-  end
-
-  def test_handle_directive_notnew
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'notnew', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_not_new
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'not_new', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_not_dash_new
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'not-new', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_nodoc
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = true
-    code_object.document_children = true
-
-    @pp.handle_directive '', 'nodoc', nil, code_object
-
-    refute code_object.document_self
-    assert code_object.document_children
-  end
-
-  def test_handle_directive_nodoc_all
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = true
-    code_object.document_children = true
-
-    @pp.handle_directive '', 'nodoc', 'all', code_object
-
-    refute code_object.document_self
-    refute code_object.document_children
-  end
-
-  def test_handle_directive_nodoc_no_context
-    result = @pp.handle_directive '', 'nodoc', nil
-
-    assert_equal "\n", result
-  end
-
-  def test_handle_directive_registered
-    RDoc::Markup::PreProcess.register 'x'
-
-    result = @pp.handle_directive '', 'x', 'y'
-
-    assert_nil result
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_equal '', result
-  end
-
-  def test_handle_directive_registered_block
-    called = nil
-
-    RDoc::Markup::PreProcess.register 'x' do |directive, param|
-      called = [directive, param]
-      'blah'
-    end
-
-    result = @pp.handle_directive '', 'x', 'y'
-
-    assert_equal 'blah', result
-    assert_equal %w[x y], called
-  end
-
-  def test_handle_directive_registered_code_object
-    RDoc::Markup::PreProcess.register 'x'
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-    assert_empty code_object.metadata
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_equal '', result
-    assert_empty code_object.metadata
-  end
-
-  def test_handle_directive_startdoc
-    code_object = RDoc::CodeObject.new
-    code_object.stop_doc
-    code_object.force_documentation = false
-
-    @pp.handle_directive '', 'startdoc', nil, code_object
-
-    assert code_object.document_self
-    assert code_object.document_children
-    assert code_object.force_documentation
-  end
-
-  def test_handle_directive_stopdoc
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'stopdoc', nil, code_object
-
-    refute code_object.document_self
-    refute code_object.document_children
-  end
-
-  def test_handle_directive_title
-    @pp.options = RDoc::Options.new
-
-    _, err = capture_output do
-      @pp.handle_directive '', 'title', 'T'
-    end
-
-    assert_include err, "The :title: directive is deprecated and will be removed in RDoc 7."
-    assert_equal 'T', @pp.options.title
-  end
-
-  def test_handle_directive_unhandled
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    @pp.handle_directive '', 'x', '', code_object
-
-    assert_includes code_object.metadata, 'x'
-  end
-
-  def test_handle_directive_unhandled_block
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      false
-    end
-
-    assert_empty code_object.metadata
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      nil
-    end
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      ''
-    end
-
-    assert_empty code_object.metadata
-  end
-
-  def test_handle_directive_yield
-    method = RDoc::AnyMethod.new nil, 'm'
-    method.params = 'index, &block'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-    assert_equal 'index', method.params
-  end
-
-  def test_handle_directive_yield_block_param
-    method = RDoc::AnyMethod.new nil, 'm'
-    method.params = '&block'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-    assert_empty method.params
-  end
-
-  def test_handle_directive_yield_no_context
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-  end
-
-  def test_handle_directive_yields
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'yields', 'item', method
-
-    assert_equal 'item', method.block_params
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_raw_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_raw_test.rb
deleted file mode 100644
index a1599ebb6c7..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_raw_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupRawTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @p = @RM::Raw.new
-  end
-
-  def test_push
-    @p.push 'hi', 'there'
-
-    assert_equal @RM::Raw.new('hi', 'there'), @p
-  end
-
-  def test_pretty_print
-    assert_equal '[raw: ]', mu_pp(@p)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_test.rb
deleted file mode 100644
index d9d3d25e227..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_test.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupTest < RDoc::TestCase
-
-  def test_class_parse
-    expected = @RM::Document.new(
-      @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::Markup.parse('hello')
-  end
-
-  def test_convert
-    str = <<-STR
-now is
-the time
-
-  hello
-  dave
-
-1. l1
-2. l2
-    STR
-
-    m = RDoc::Markup.new
-
-    tt = RDoc::Markup::ToTest.new m
-
-    out = m.convert str, tt
-
-    expected = [
-      "now is the time",
-      "\n",
-      "  hello\n  dave\n",
-      "1: ",
-      "l1",
-      "1: ",
-      "l2",
-    ]
-
-    assert_equal expected, out
-  end
-
-  def test_convert_custom_markup
-    str = <<-STR
-{stricken}
-    STR
-
-    m = RDoc::Markup.new
-    m.add_word_pair '{', '}', :STRIKE
-
-    tt = RDoc::Markup::ToTest.new nil, m
-    tt.add_tag :STRIKE, 'STRIKE ', ' STRIKE'
-
-    out = m.convert str, tt
-
-    expected = [
-      "STRIKE stricken STRIKE",
-    ]
-
-    assert_equal expected, out
-  end
-
-  def test_convert_document
-    doc = RDoc::Markup::Parser.parse <<-STR
-now is
-the time
-
-  hello
-  dave
-
-1. l1
-2. l2
-    STR
-
-    m = RDoc::Markup.new
-
-    tt = RDoc::Markup::ToTest.new m
-
-    out = m.convert doc, tt
-
-    expected = [
-      "now is the time",
-      "\n",
-      "  hello\n  dave\n",
-      "1: ",
-      "l1",
-      "1: ",
-      "l2",
-    ]
-
-    assert_equal expected, out
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_ansi_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_ansi_test.rb
deleted file mode 100644
index 020f5469973..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_ansi_test.rb
+++ /dev/null
@@ -1,380 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToAnsiTest < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToAnsi.new
-  end
-
-  def accept_blank_line
-    assert_equal "\e[0m\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\e[0m> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "\e[0mhello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "\e[0mHello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "\e[0mcat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "\e[0mcat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal %W"\e[0m", @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal %W"\e[0m", @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal %W"\e[0m", @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal %W"\e[0m", @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal %W"\e[0m", @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal %W"\e[0m", @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "\e[0m",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "\e[0m", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "\e[0mhi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-\e[0m<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "\e[0m#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "\e[0m  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "\e[0mhi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal %W"\e[0m", @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "\e[0m\e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "\e[0m\e[4;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "\e[0m\e[32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "\e[0mHello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "\e[0m   \e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "\e[0m\e[1;32m\e[1mHello\e[m\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "\e[0m\e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "\e[0m\e[7mteletype\e[m:\n  teletype description\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "\e[0mlabel:\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "\e[0mone\ntwo:\n  two headers\n\n",
-                 @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "\e[0mreg \e[1mbold words\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "\e[0mone\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "\e[0mhello\nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "\e[0mreg \e[4mitalic words\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-\e[0m   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "\e[0mreg \e[7mteletype\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "\e[0mreg \e[1mbold\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "\e[0mreg \e[4mitalic\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-\e[0mwords words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "\e[0m   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "\e[0m    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "\e[0m    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-\e[0m* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-\e[0m* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_table_align
-    expected = "\e[0m" + <<-EXPECTED
- AA |BB |CCCCC|DDDDD
-----|---|-----|-----
-    |bbb|    c|
-aaaa|b  |     | dd
- a  |   |   cc| dd
-    EXPECTED
-    assert_equal expected, @to.end_accepting
-  end
-
-  # functional test
-  def test_convert_list_note
-    note_list = <<-NOTE_LIST
-foo ::
-bar ::
-  hi
-    NOTE_LIST
-
-    expected = <<-EXPECTED
-\e[0mfoo
-bar:
-  hi
-
-    EXPECTED
-
-    assert_equal expected, @to.convert(note_list)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_bs_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_bs_test.rb
deleted file mode 100644
index d89d784422c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_bs_test.rb
+++ /dev/null
@@ -1,363 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToBsTest < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToBs.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "===== H\bHe\bel\bll\blo\bo\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "cat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [''], @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [''], @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [''], @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [''], @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [''], @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [''], @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [''], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "=== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "==== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   = H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "teletype:\n  teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label:\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one\ntwo:\n  two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg b\bbo\bol\bld\bd \b w\bwo\bor\brd\bds\bs reg\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello\nworld\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc_\b _\bw_\bo_\br_\bd_\bs reg\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg teletype reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg b\bbo\bol\bld\bd reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_table_align
-    expected = <<-EXPECTED
- AA |BB |CCCCC|DDDDD
-----|---|-----|-----
-    |bbb|    c|
-aaaa|b  |     | dd
- a  |   |   cc| dd
-    EXPECTED
-    assert_equal expected, @to.end_accepting
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_html_crossref_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_html_crossref_test.rb
deleted file mode 100644
index a52c7f1506d..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_html_crossref_test.rb
+++ /dev/null
@@ -1,325 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocMarkupToHtmlCrossrefTest < XrefTestCase
-
-  def setup
-    super
-
-    @options.hyperlink_all = true
-    @options.warn_missing_rdoc_ref = true
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'index.html', @c1
-  end
-
-  def test_convert_CROSSREF
-    result = @to.convert 'C1'
-
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-
-    result = @to.convert '+C1+'
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-
-    result = @to.convert 'Constant[rdoc-ref:C1]'
-    assert_equal para("<a href=\"C1.html\">Constant</a>"), result
-
-    result = @to.convert 'FOO'
-    assert_equal para("FOO"), result
-
-    result = @to.convert '+FOO+'
-    assert_equal para("<code>FOO</code>"), result
-
-    result = @to.convert '<tt># :stopdoc:</tt>:'
-    assert_equal para("<code># :stopdoc:</code>:"), result
-  end
-
-  def test_convert_CROSSREF_ignored_excluded_words
-    @options.autolink_excluded_words = ['C1']
-
-    result = @to.convert 'C1'
-    assert_equal para("C1"), result
-
-    result = @to.convert '+C1+'
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-
-    # Explicit linking with rdoc-ref is not ignored
-    result = @to.convert 'Constant[rdoc-ref:C1]'
-    assert_equal para("<a href=\"C1.html\">Constant</a>"), result
-  end
-
-  def test_convert_CROSSREF_method
-    result = @to.convert 'C1#m(foo, bar, baz)'
-
-    assert_equal para("<a href=\"C1.html#method-i-m\"><code>C1#m(foo, bar, baz)</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_label
-    result = @to.convert 'C1@foo'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>"), result
-
-    result = @to.convert 'C1#m@foo'
-    assert_equal para("<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>"),
-                 result
-  end
-
-  def test_convert_CROSSREF_label_for_md
-    result = @to.convert 'EXAMPLE@foo'
-    assert_equal para("<a href=\"EXAMPLE_md.html#label-foo\">foo at <code>EXAMPLE</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_label_period
-    result = @to.convert 'C1@foo.'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>."), result
-  end
-
-  def test_convert_CROSSREF_label_space
-    result = @to.convert 'C1@foo+bar'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo+bar\">foo bar at <code>C1</code></a>"),
-                 result
-  end
-
-  def test_convert_CROSSREF_section
-    @c1.add_section 'Section'
-
-    result = @to.convert 'C1@Section'
-    assert_equal para("<a href=\"C1.html#Section\">Section at <code>C1</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_constant
-    result = @to.convert 'C1::CONST'
-
-    assert_equal para("<a href=\"C1.html#CONST\"><code>C1::CONST</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref
-    result = @to.convert 'rdoc-ref:C1'
-
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_not_found
-    result = nil
-    stdout, _ = capture_output do
-      result = @to.convert 'rdoc-ref:FOO'
-    end
-
-    assert_equal para("FOO"), result
-    assert_include stdout, "index.html: `rdoc-ref:FOO` can't be resolved for `FOO`"
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method
-    result = @to.convert 'rdoc-ref:C1#m'
-
-    assert_equal para("<a href=\"C1.html#method-i-m\"><code>C1#m</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_label
-    result = @to.convert 'rdoc-ref:C1#m@foo'
-
-    assert_equal para("<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>"),
-                 result, 'rdoc-ref:C1#m@foo'
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_percent
-    m = @c1.add_method RDoc::AnyMethod.new nil, '%'
-
-    result = @to.convert 'rdoc-ref:C1#%'
-
-    assert_equal para("<a href=\"C1.html#method-i-25\"><code>C1#%</code></a>"), result
-
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::%'
-
-    assert_equal para("<a href=\"C1.html#method-c-25\"><code>C1::%</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_escape_html
-    m = @c1.add_method RDoc::AnyMethod.new nil, '<<'
-
-    result = @to.convert 'rdoc-ref:C1#<<'
-
-    assert_equal para("<a href=\"C1.html#method-i-3C-3C\"><code>C1#&lt;&lt;</code></a>"), result
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::<<'
-
-    assert_equal para("<a href=\"C1.html#method-c-3C-3C\"><code>C1::&lt;&lt;</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_percent_label
-    m = @c1.add_method RDoc::AnyMethod.new nil, '%'
-
-    result = @to.convert 'rdoc-ref:C1#%@f'
-
-    assert_equal para("<a href=\"C1.html#method-i-25-label-f\">f at <code>C1#%</code></a>"),
-                 result
-
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::%@f'
-
-    assert_equal para("<a href=\"C1.html#method-c-25-label-f\">f at <code>C1::%</code></a>"),
-                 result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_label
-    result = @to.convert 'rdoc-ref:C1@foo'
-
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>"), result,
-                 'rdoc-ref:C1@foo'
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_label_in_current_file
-    result = @to.convert 'rdoc-ref:@foo'
-
-    assert_equal para("<a href=\"#label-foo\">foo</a>"), result,
-                 'rdoc-ref:@foo'
-
-    result = @to.convert '{Foo}[rdoc-ref:@foo]'
-
-    assert_equal para("<a href=\"#label-foo\">Foo</a>"), result,
-                 '{Foo}[rdoc-ref:@foo]'
-  end
-
-  def test_gen_url
-    assert_equal '<a href="C1.html">Some class</a>',
-                 @to.gen_url('rdoc-ref:C1', 'Some class')
-
-    assert_equal '<a href="http://example">HTTP example</a>',
-                 @to.gen_url('http://example', 'HTTP example')
-  end
-
-  def test_gen_url_rdoc_ref_not_found
-    stdout, _ = capture_output do
-      @to.gen_url 'rdoc-ref:FOO', 'FOO'
-    end
-
-    assert_include stdout, "index.html: `rdoc-ref:FOO` can't be resolved for `FOO`"
-  end
-
-  def test_handle_regexp_CROSSREF
-    assert_equal "<a href=\"C2/C3.html\"><code>C2::C3</code></a>", REGEXP_HANDLING('C2::C3')
-  end
-
-  def test_handle_regexp_CROSSREF_label
-    assert_equal "<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>",
-                 REGEXP_HANDLING('C1#m@foo')
-  end
-
-  def test_handle_regexp_CROSSREF_show_hash_false
-    @to.show_hash = false
-
-    assert_equal "<a href=\"C1.html#method-i-m\"><code>m</code></a>",
-                 REGEXP_HANDLING('#m')
-  end
-
-  def test_handle_regexp_CROSSREF_with_arg_looks_like_TIDYLINK
-    result = @to.convert 'C1.m[:sym]'
-
-    assert_equal para("<a href=\"C1.html#method-c-m\"><code>C1.m[:sym]</code></a>"), result,
-                 'C1.m[:sym]'
-  end
-
-  def test_handle_regexp_HYPERLINK_rdoc
-    readme = @store.add_file 'README.txt'
-    readme.parser = RDoc::Parser::Simple
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c2
-
-    link = @to.handle_regexp_HYPERLINK hyper 'C2::C3'
-
-    assert_equal '<a href="C2/C3.html"><code>C2::C3</code></a>', link
-
-    link = @to.handle_regexp_HYPERLINK hyper 'C4'
-
-    assert_equal '<a href="C4.html"><code>C4</code></a>', link
-
-    link = @to.handle_regexp_HYPERLINK hyper 'README.txt'
-
-    assert_equal '<a href="README_txt.html">README.txt</a>', link
-  end
-
-  def test_handle_regexp_TIDYLINK_rdoc
-    readme = @store.add_file 'README.txt'
-    readme.parser = RDoc::Parser::Simple
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c2
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C2::C3'
-
-    assert_equal '<a href="C2/C3.html">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C4'
-
-    assert_equal '<a href="C4.html">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C1#m'
-
-    assert_equal '<a href="C1.html#method-i-m">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'README.txt'
-
-    assert_equal '<a href="README_txt.html">tidy</a>', link
-  end
-
-  def test_handle_regexp_TIDYLINK_label
-    link = @to.handle_regexp_TIDYLINK tidy 'C1#m@foo'
-
-    assert_equal "<a href=\"C1.html#method-i-m-label-foo\">tidy</a>",
-                 link, 'C1#m@foo'
-  end
-
-  def test_to_html_CROSSREF_email
-    @options.hyperlink_all = false
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'index.html', @c1
-
-    result = @to.to_html 'first.last@example.com'
-
-    assert_equal 'first.last@example.com', result
-  end
-
-  def test_to_html_CROSSREF_email_hyperlink_all
-    result = @to.to_html 'first.last@example.com'
-
-    assert_equal 'first.last@example.com', result
-  end
-
-  def test_link
-    assert_equal 'n', @to.link('n', 'n')
-
-    assert_equal '<a href="C1.html#method-c-m"><code>m</code></a>', @to.link('m', 'm')
-  end
-
-  def test_link_for_method_traverse
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c9
-    assert_equal '<a href="C9/A.html#method-i-foo"><code>C9::B#foo</code></a>', @to.link('C9::B#foo', 'C9::B#foo')
-  end
-
-  def test_link_class_method_full
-    assert_equal '<a href="Parent.html#method-c-m"><code>Parent::m</code></a>',
-                 @to.link('Parent::m', 'Parent::m')
-  end
-
-  def para(text)
-    "\n<p>#{text}</p>\n"
-  end
-
-  def REGEXP_HANDLING(text)
-    @to.handle_regexp_CROSSREF regexp_handling text
-  end
-
-  def hyper(reference)
-    RDoc::Markup::RegexpHandling.new 0, "rdoc-ref:#{reference}"
-  end
-
-  def regexp_handling(text)
-    RDoc::Markup::RegexpHandling.new 0, text
-  end
-
-  def tidy(reference)
-    RDoc::Markup::RegexpHandling.new 0, "{tidy}[rdoc-ref:#{reference}]"
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_html_snippet_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_html_snippet_test.rb
deleted file mode 100644
index 4a338271afe..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_html_snippet_test.rb
+++ /dev/null
@@ -1,709 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToHtmlSnippetTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 100, 100
-    @ellipsis = @to.to_html '...'
-  end
-
-  def accept_blank_line
-    assert_empty @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\n<blockquote><p>quote\n</blockquote>\n", @to.res.join
-
-    assert_equal 5, @to.characters
-  end
-
-  def accept_document
-    assert_equal "<p>hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_1
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_2
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_3
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_4
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_b
-    assert_equal "<p><strong>Hello</strong>\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_list_end_bullet
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_label
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_lalpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_number
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_note
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_ualpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_label
-    assert_equal [''], @to.in_list_entry
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_note
-    assert_equal [''], @to.in_list_entry
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_end_number
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_label
-    assert_equal "<p>cat &mdash; ", @to.res.join
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_note
-    assert_equal "<p>cat &mdash; ",
-                 @to.res.join
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_start_note_2
-    expected = <<-EXPECTED
-<p><code>teletype</code> &mdash; teletype description
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 29, @to.characters
-  end
-
-  def accept_list_item_start_note_multi_description
-    expected = <<-EXPECTED
-<p>label &mdash; description one
-<p>description two
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 37, @to.characters
-  end
-
-  def accept_list_item_start_note_multi_label
-    expected = <<-EXPECTED
-<p>one, two &mdash; two headers
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 18, @to.characters
-  end
-
-  def accept_list_item_start_number
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_bullet
-    assert_equal [:BULLET], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_label
-    assert_equal [:LABEL], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_lalpha
-    assert_equal [:LALPHA], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_note
-    assert_equal [:NOTE], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_number
-    assert_equal [:NUMBER], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_ualpha
-    assert_equal [:UALPHA], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_paragraph
-    assert_equal "<p>hi\n", @to.res.join
-
-    assert_equal 2, @to.characters
-  end
-
-  def accept_paragraph_b
-    assert_equal "<p>reg <strong>bold words</strong> reg\n", @to.res.join
-
-    assert_equal 18, @to.characters
-  end
-
-  def accept_paragraph_br
-    assert_equal "<p>one<br>two\n", @to.res.join
-
-    assert_equal 6, @to.characters
-  end
-
-  def accept_paragraph_break
-    assert_equal "<p>hello<br>\nworld\n", @to.res.join
-
-    assert_equal 11, @to.characters
-  end
-
-  def accept_paragraph_i
-    assert_equal "<p>reg <em>italic words</em> reg\n", @to.res.join
-
-    assert_equal 20, @to.characters
-  end
-
-  def accept_paragraph_plus
-    assert_equal "<p>reg <code>teletype</code> reg\n", @to.res.join
-
-    assert_equal 16, @to.characters
-  end
-
-  def accept_paragraph_star
-    assert_equal "<p>reg <strong>bold</strong> reg\n", @to.res.join
-
-    assert_equal 12, @to.characters
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "<p>reg <em>italic</em> reg\n", @to.res.join
-
-    assert_equal 14, @to.characters
-  end
-
-  def accept_raw
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_rule
-    assert_empty @to.res
-    assert_equal 0, @to.characters
-  end
-
-  def accept_verbatim
-    assert_equal "\n<pre class=\"ruby\"><span class=\"ruby-identifier\">hi</span>\n  <span class=\"ruby-identifier\">world</span>\n</pre>\n", @to.res.join
-    assert_equal 10, @to.characters
-  end
-
-  def end_accepting
-    assert_equal 'hi', @to.res.join
-  end
-
-  def start_accepting
-    assert_equal [], @to.res
-    assert_equal [], @to.in_list_entry
-    assert_equal [], @to.list
-    assert_equal 0,  @to.characters
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-<p>l1
-<p>l1.1
-
-<p>l2
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 8, @to.characters
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED
-<p>list stuff
-
-<pre>* list
-  with
-
-  second
-
-  1. indented
-  2. numbered
-
-  third
-
-* second</pre>
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-    assert_equal 81, @to.characters
-  end
-
-  def test_accept_heading_7
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(7, 'Hello')
-
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_heading_aref_class
-    @to.code_object = RDoc::NormalClass.new 'Foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "<p>Hello\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_heading_aref_method
-    @to.code_object = RDoc::AnyMethod.new nil, 'foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "<p>Hello\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_verbatim_ruby
-    options = RDoc::Options.new
-    rdoc = RDoc::RDoc.new
-    rdoc.options = options
-    RDoc::RDoc.current = rdoc
-
-    verb = @RM::Verbatim.new("class C\n", "end\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-keyword">class</span> <span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 11, @to.characters
-  end
-
-  def test_accept_verbatim_ruby_error
-    options = RDoc::Options.new
-    rdoc = RDoc::RDoc.new
-    rdoc.options = options
-    RDoc::RDoc.current = rdoc
-
-    verb = @RM::Verbatim.new("a % 09 # => blah\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    inner = CGI.escapeHTML "a % 09 # => blah"
-
-    expected = <<-EXPECTED
-
-<pre>#{inner}</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 16, @to.characters
-  end
-
-  def test_add_paragraph
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 0, 3
-    assert_throws :done do
-      @to.add_paragraph
-      @to.add_paragraph
-      @to.add_paragraph
-    end
-
-    assert_equal 3, @to.paragraphs
-  end
-
-  def test_convert_limit
-    rdoc = <<-RDOC
-= Hello
-
-This is some text, it *will* be cut off after 100 characters and an ellipsis
-must follow
-
-So there you have it
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Hello
-<p>This is some text, it <strong>will</strong> be cut off after 100 characters and an ellipsis must follow
-<p>So there you #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 111, @to.characters, 'snippet character length'
-  end
-
-  def test_convert_limit_2
-    rdoc = <<-RDOC
-Outputs formatted RI data for the class or method +name+.
-
-Returns true if +name+ was found, false if it was not an alternative could
-be guessed, raises an error if +name+ couldn't be guessed.
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Outputs formatted RI data for the class or method <code>name</code>.
-<p>Returns true if <code>name</code> was found, false if it was #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 159, @to.characters, 'snippet character length'
-  end
-
-  def test_convert_limit_paragraphs
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 100, 3
-
-    rdoc = <<-RDOC
-= \RDoc - Ruby Documentation System
-
-* {RDoc Project Page}[https://github.com/ruby/rdoc]
-* {RDoc Documentation}[https://ruby.github.io/rdoc]
-* {RDoc Bug Tracker}[https://github.com/ruby/rdoc/issues]
-
-== DESCRIPTION:
-
-RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying online
-documentation.
-
-See RDoc for a description of RDoc's markup and basic use.
-    RDOC
-
-    expected = <<-EXPECTED
-<p>RDoc - Ruby Documentation System
-<p>RDoc Project Page
-<p>RDoc Documentation
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 67, @to.characters
-  end
-
-  def test_convert_limit_in_tag
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 4
-    rdoc = "* ab *c* d\n"
-
-    expected = "<p>ab <strong>c</strong> #{@ellipsis}\n\n"
-
-    actual = @to.convert rdoc
-
-    assert_equal 4, @to.characters
-    assert_equal expected, actual
-  end
-
-  def test_convert_limit_verbatim
-    rdoc = <<-RDOC
-= Hello There
-
-This is some text, it *will* be cut off after 100 characters
-
-  This one is cut off in this verbatim section
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Hello There
-<p>This is some text, it <strong>will</strong> be cut off after 100 characters
-
-<pre>This one is cut off in this verbatim ...</pre>
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 113, @to.characters
-  end
-
-  def test_convert_limit_verbatim_2
-    rdoc = <<-RDOC
-Extracts the class, selector and method name parts from +name+ like
-Foo::Bar#baz.
-
-NOTE: Given Foo::Bar, Bar is considered a class even though it may be a
-      method
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Extracts the class, selector and method name parts from <code>name</code> like Foo::Bar#baz.
-<p>NOTE: Given Foo::Bar, #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 101, @to.characters
-  end
-
-  def test_convert_limit_verbatim_multiline
-    rdoc = <<-RDOC
-Look for directives in a normal comment block:
-
-  # :stopdoc:
-  # Don't display comment from this point forward
-
-This routine modifies its +comment+ parameter.
-    RDOC
-
-    inner = CGI.escapeHTML "# Don't display comment from this point forward"
-    expected = <<-EXPECTED
-<p>Look for directives in a normal comment block:
-
-<pre class=\"ruby\"><span class=\"ruby-comment\"># :stopdoc:</span>
-<span class=\"ruby-comment\">#{inner}</span>
-</pre>
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 105, @to.characters
-  end
-
-  def test_convert_limit_over
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 4
-    rdoc = "* text\n" * 2
-
-    expected = "<p>text\n"
-    expected = expected.chomp
-    expected << " #{@ellipsis}\n"
-
-    actual = @to.convert rdoc
-
-    assert_equal 4, @to.characters
-    assert_equal expected, actual
-  end
-
-  def test_convert_string
-    assert_equal '&lt;&gt;', @to.convert_string('<>')
-  end
-
-  def test_convert_RDOCLINK_label_label
-    result = @to.convert 'rdoc-label:label-One'
-
-    assert_equal "<p>One\n", result
-    assert_equal 3, @to.characters
-  end
-
-  def test_convert_RDOCLINK_label_foottext
-    result = @to.convert 'rdoc-label:foottext-1'
-
-    assert_equal "<p>1\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_RDOCLINK_label_footmark
-    result = @to.convert 'rdoc-label:footmark-1'
-
-    assert_equal "<p>1\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_RDOCLINK_ref
-    result = @to.convert 'rdoc-ref:C'
-
-    assert_equal "<p>C\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_TIDYLINK_rdoc_label
-    result = @to.convert '{foo}[rdoc-label:foottext-1]'
-
-    assert_equal "<p>foo\n", result
-    assert_equal 3, @to.characters
-  end
-
-  def test_handle_regexp_HYPERLINK_link
-    target = RDoc::Markup::RegexpHandling.new 0, 'link:README.txt'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal 'README.txt', link
-  end
-
-  def test_list_verbatim_2
-    str = "* one\n    verb1\n    verb2\n* two\n"
-
-    expected = <<-EXPECTED
-<p>one
-
-<pre class=\"ruby\"><span class=\"ruby-identifier\">verb1</span>
-<span class=\"ruby-identifier\">verb2</span>
-</pre>
-<p>two
-
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to)
-    assert_equal 17, @to.characters
-  end
-
-  def test_on_tags
-    on = RDoc::Markup::AttrChanger.new 2, 0
-
-    @to.on_tags [], on
-
-    assert_equal 2, @to.mask
-  end
-
-  def test_off_tags
-    on  = RDoc::Markup::AttrChanger.new 2, 0
-    off = RDoc::Markup::AttrChanger.new 0, 2
-
-    @to.on_tags  [], on
-    @to.off_tags [], off
-
-    assert_equal 0, @to.mask
-  end
-
-  def test_to_html
-    assert_equal "<p><code>--</code>\n", util_format("<tt>--</tt>")
-    assert_equal 2, @to.characters
-  end
-
-  def util_format(text)
-    paragraph = RDoc::Markup::Paragraph.new text
-
-    @to.start_accepting
-    @to.accept_paragraph paragraph
-    @to.end_accepting
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_html_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_html_test.rb
deleted file mode 100644
index e586e03cb9a..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_html_test.rb
+++ /dev/null
@@ -1,1024 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToHtmlTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToHtml.new @options
-  end
-
-  def accept_blank_line
-    assert_empty @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\n<blockquote>\n<p>quote</p>\n</blockquote>\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "\n<p>hello</p>\n", @to.res.join
-  end
-
-  def accept_heading
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-    expected = "\n<h5 id=\"label-Hello\">Hello#{links}</h5>\n"
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_heading_1
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", @to.res.join
-  end
-
-  def accept_heading_2
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h2 id=\"label-Hello\">Hello#{links}</h2>\n", @to.res.join
-  end
-
-  def accept_heading_3
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h3 id=\"label-Hello\">Hello#{links}</h3>\n", @to.res.join
-  end
-
-  def accept_heading_4
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h4 id=\"label-Hello\">Hello#{links}</h4>\n", @to.res.join
-  end
-
-  def accept_heading_b
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-    inner = "<strong>Hello</strong>"
-
-    assert_equal "\n<h1 id=\"label-Hello\">#{inner}#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def accept_heading_suppressed_crossref
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ul></ul>\n", @to.res.join
-  end
-
-  def accept_list_end_label
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list label-list\"></dl>\n", @to.res.join
-  end
-
-  def accept_list_end_lalpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: lower-alpha\"></ol>\n", @to.res.join
-  end
-
-  def accept_list_end_number
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol></ol>\n", @to.res.join
-  end
-
-  def accept_list_end_note
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list note-list\"></dl>\n", @to.res.join
-  end
-
-  def accept_list_end_ualpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: upper-alpha\"></ol>\n", @to.res.join
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_label
-    assert_equal %w[</dd>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_note
-    assert_equal %w[</dd>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_number
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal "<ul><li>", @to.res.join
-  end
-
-  def accept_list_item_start_label
-    assert_equal "<dl class=\"rdoc-list label-list\"><dt>cat</dt>\n<dd>", @to.res.join
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal "<ol style=\"list-style-type: lower-alpha\"><li>", @to.res.join
-  end
-
-  def accept_list_item_start_note
-    assert_equal "<dl class=\"rdoc-list note-list\"><dt>cat</dt>\n<dd>",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_2
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt><code>teletype</code></dt>
-<dd>
-<p>teletype description</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt>label</dt>
-<dd>
-<p>description one</p>
-</dd><dd>
-<p>description two</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt>one</dt>
-<dt>two</dt>
-<dd>
-<p>two headers</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_number
-    assert_equal "<ol><li>", @to.res.join
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal "<ol style=\"list-style-type: upper-alpha\"><li>", @to.res.join
-  end
-
-  def accept_list_start_bullet
-    assert_equal [:BULLET], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ul>", @to.res.join
-  end
-
-  def accept_list_start_label
-    assert_equal [:LABEL], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal '<dl class="rdoc-list label-list">', @to.res.join
-  end
-
-  def accept_list_start_lalpha
-    assert_equal [:LALPHA], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: lower-alpha\">", @to.res.join
-  end
-
-  def accept_list_start_note
-    assert_equal [:NOTE], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list note-list\">", @to.res.join
-  end
-
-  def accept_list_start_number
-    assert_equal [:NUMBER], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol>", @to.res.join
-  end
-
-  def accept_list_start_ualpha
-    assert_equal [:UALPHA], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: upper-alpha\">", @to.res.join
-  end
-
-  def accept_paragraph
-    assert_equal "\n<p>hi</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "\n<p>reg <strong>bold words</strong> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_br
-    assert_equal "\n<p>one<br>two</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_break
-    assert_equal "\n<p>hello<br> world</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_i
-    assert_equal "\n<p>reg <em>italic words</em> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_plus
-    assert_equal "\n<p>reg <code>teletype</code> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_star
-    assert_equal "\n<p>reg <strong>bold</strong> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "\n<p>reg <em>italic</em> reg</p>\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "<hr>\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "\n<pre class=\"ruby\"><span class=\"ruby-identifier\">hi</span>\n  <span class=\"ruby-identifier\">world</span>\n</pre>\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal 'hi', @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal [], @to.res
-    assert_equal [], @to.in_list_entry
-    assert_equal [], @to.list
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-<ul><li>
-<p>l1</p>
-<ul><li>
-<p>l1.1</p>
-</li></ul>
-</li><li>
-<p>l2</p>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED
-<ul><li>
-<p>list stuff</p>
-
-<pre>* list
-  with
-
-  second
-
-  1. indented
-  2. numbered
-
-  third
-
-* second</pre>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def test_accept_heading_7
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(7, 'Hello')
-
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h6 id=\"label-Hello\">Hello#{links}</h6>\n", @to.res.join
-  end
-
-  def test_accept_heading_aref_class
-    @to.code_object = RDoc::NormalClass.new 'Foo'
-    @to.start_accepting
-
-    @to.accept_heading head(1, 'Hello')
-
-    links = '<span><a href="#class-Foo-label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"class-Foo-label-Hello\">Hello#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def test_accept_heading_aref_method
-    @to.code_object = RDoc::AnyMethod.new nil, 'foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    links = '<span><a href="#method-i-foo-label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"method-i-foo-label-Hello\">Hello#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def test_accept_heading_pipe
-    @options.pipe = true
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello</h1>\n", @to.res.join
-  end
-
-  def test_accept_paragraph_newline
-    hellos = ["hello", "\u{393 3b5 3b9 3ac} \u{3c3 3bf 3c5}"]
-    worlds = ["world", "\u{3ba 3cc 3c3 3bc 3bf 3c2}"]
-    ohayo, sekai = %W"\u{304a 306f 3088 3046} \u{4e16 754c}"
-
-    hellos.product(worlds) do |hello, world|
-      @to.start_accepting
-      @to.accept_paragraph para("#{hello}\n", "#{world}\n")
-      assert_equal "\n<p>#{hello} #{world}</p>\n", @to.res.join
-    end
-
-    hellos.each do |hello|
-      @to.start_accepting
-      @to.accept_paragraph para("#{hello}\n", "#{sekai}\n")
-      assert_equal "\n<p>#{hello}#{sekai}</p>\n", @to.res.join
-    end
-
-    worlds.each do |world|
-      @to.start_accepting
-      @to.accept_paragraph para("#{ohayo}\n", "#{world}\n")
-      assert_equal "\n<p>#{ohayo}#{world}</p>\n", @to.res.join
-    end
-
-    @to.start_accepting
-    @to.accept_paragraph para("#{ohayo}\n", "#{sekai}\n")
-    assert_equal "\n<p>#{ohayo}#{sekai}</p>\n", @to.res.join
-
-    @to.start_accepting
-    @to.accept_paragraph para("+hello+\n", "world\n")
-    assert_equal "\n<p><code>hello</code> world</p>\n", @to.res.join
-
-    @to.start_accepting
-    @to.accept_paragraph para("hello\n", "+world+\n")
-    assert_equal "\n<p>hello <code>world</code></p>\n", @to.res.join
-
-    @to.start_accepting
-    @to.accept_paragraph para("+hello+\n", "+world+\n")
-    assert_equal "\n<p><code>hello</code> <code>world</code></p>\n", @to.res.join
-  end
-
-  def test_accept_heading_output_decoration
-    @options.output_decoration = false
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1>Hello<span><a href=\"#label-Hello\">&para;</a> <a href=\"#top\">&uarr;</a></span></h1>\n", @to.res.join
-  end
-
-  def test_accept_heading_output_decoration_with_pipe
-    @options.pipe = true
-    @options.output_decoration = false
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1>Hello</h1>\n", @to.res.join
-  end
-
-  def test_accept_verbatim_parseable
-    verb = @RM::Verbatim.new("class C\n", "end\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-keyword">class</span> <span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_parseable_error
-    verb = @RM::Verbatim.new("a % 09 # => blah\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    inner = CGI.escapeHTML "a % 09 # => blah"
-
-    expected = <<-EXPECTED
-
-<pre>#{inner}</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_nl_after_backslash
-    verb = @RM::Verbatim.new("a = 1 if first_flag_var and \\\n", "  this_is_flag_var\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-identifier">a</span> = <span class="ruby-value">1</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">first_flag_var</span> <span class="ruby-keyword">and</span> \\
-  <span class="ruby-identifier">this_is_flag_var</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_pipe
-    @options.pipe = true
-
-    verb = @RM::Verbatim.new("1 + 1\n")
-    verb.format = :ruby
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre><code>1 + 1
-</code></pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_escape_in_string
-    code = <<-'RUBY'
-def foo
-  [
-    '\\',
-    '\'',
-    "'",
-    "\'\"\`",
-    "\#",
-    "\#{}",
-    "#",
-    "#{}",
-    /'"/,
-    /\'\"/,
-    /\//,
-    /\\/,
-    /\#/,
-    /\#{}/,
-    /#/,
-    /#{}/
-  ]
-end
-def bar
-end
-    RUBY
-    verb = @RM::Verbatim.new(*code.split(/(?<=\n)/))
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-'EXPECTED'
-
-<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">foo</span>
-  [
-    <span class="ruby-string">&#39;\\&#39;</span>,
-    <span class="ruby-string">&#39;\&#39;&#39;</span>,
-    <span class="ruby-string">&quot;&#39;&quot;</span>,
-    <span class="ruby-string">&quot;\&#39;\&quot;\`&quot;</span>,
-    <span class="ruby-string">&quot;\#&quot;</span>,
-    <span class="ruby-string">&quot;\#{}&quot;</span>,
-    <span class="ruby-string">&quot;#&quot;</span>,
-    <span class="ruby-node">&quot;#{}&quot;</span>,
-    <span class="ruby-regexp">/&#39;&quot;/</span>,
-    <span class="ruby-regexp">/\&#39;\&quot;/</span>,
-    <span class="ruby-regexp">/\//</span>,
-    <span class="ruby-regexp">/\\/</span>,
-    <span class="ruby-regexp">/\#/</span>,
-    <span class="ruby-regexp">/\#{}/</span>,
-    <span class="ruby-regexp">/#/</span>,
-    <span class="ruby-regexp">/#{}/</span>
-  ]
-<span class="ruby-keyword">end</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">bar</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_escape_in_backtick
-    code = <<-'RUBY'
-def foo
-  [
-    `\\`,
-    `\'\"\``,
-    `\#`,
-    `\#{}`,
-    `#`,
-    `#{}`
-  ]
-end
-def bar
-end
-    RUBY
-    verb = @RM::Verbatim.new(*code.split(/(?<=\n)/))
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-'EXPECTED'
-
-<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">foo</span>
-  [
-    <span class="ruby-string">`\\`</span>,
-    <span class="ruby-string">`\&#39;\&quot;\``</span>,
-    <span class="ruby-string">`\#`</span>,
-    <span class="ruby-string">`\#{}`</span>,
-    <span class="ruby-string">`#`</span>,
-    <span class="ruby-node">`#{}`</span>
-  ]
-<span class="ruby-keyword">end</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">bar</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_ruby
-    verb = @RM::Verbatim.new("1 + 1\n")
-    verb.format = :ruby
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-value">1</span> <span class="ruby-operator">+</span> <span class="ruby-value">1</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_redefinable_operators
-    functions = %w[| ^ & <=> == === =~ > >= < <= << >> + - * / % ** ~ +@ -@ [] []= ` !  != !~].flat_map { |redefinable_op|
-      ["def #{redefinable_op}\n", "end\n"]
-    }
-
-    verb = @RM::Verbatim.new(*functions)
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby">
-    EXPECTED
-    expected = expected.rstrip
-
-    %w[| ^ &amp; &lt;=&gt; == === =~ &gt; &gt;= &lt; &lt;= &lt;&lt; &gt;&gt; + - * / % ** ~ +@ -@ [] []= ` !  != !~].each do |html_escaped_op|
-      expected += <<-EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">#{html_escaped_op}</span>
-<span class="ruby-keyword">end</span>
-      EXPECTED
-    end
-
-    expected += <<-EXPECTED
-</pre>
-EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_convert_string
-    assert_equal '&lt;&gt;', @to.convert_string('<>')
-  end
-
-  def test_convert_HYPERLINK_irc
-    result = @to.convert 'irc://irc.freenode.net/#ruby-lang'
-
-    assert_equal "\n<p><a href=\"irc://irc.freenode.net/#ruby-lang\">irc.freenode.net/#ruby-lang</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_label
-    result = @to.convert 'rdoc-label:label-One'
-
-    assert_equal "\n<p><a href=\"#label-One\">One</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_foottext
-    result = @to.convert 'rdoc-label:foottext-1'
-
-    assert_equal "\n<p><a href=\"#foottext-1\">1</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_footmark
-    result = @to.convert 'rdoc-label:footmark-1'
-
-    assert_equal "\n<p><a href=\"#footmark-1\">1</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_ref
-    result = @to.convert 'rdoc-ref:C'
-
-    assert_equal "\n<p>C</p>\n", result
-  end
-
-  def test_convert_RDOCLINK_escape_image
-    assert_escaped '<script>', 'rdoc-image:"><script>alert(`rdoc-image`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_label_id
-    assert_escaped '<script>', 'rdoc-label::path::"><script>alert(`rdoc-label_id`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_label_path
-    assert_escaped '<script>', 'rdoc-label::"><script>alert(`rdoc-label_path`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_ref
-    assert_escaped '<script>', 'rdoc-ref:"><script>alert(`rdoc-ref`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_xxx
-    assert_escaped '<script>', 'rdoc-xxx:"><script>alert(`rdoc-xxx`)</script>"'
-  end
-
-  def test_convert_TIDYLINK_footnote
-    result = @to.convert 'text{*1}[rdoc-label:foottext-1:footmark-1]'
-
-    assert_equal "\n<p>text<sup><a id=\"footmark-1\" href=\"#foottext-1\">1</a></sup></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_multiple
-    result = @to.convert '{a}[http://example] {b}[http://example]'
-
-    expected = <<-EXPECTED
-
-<p><a href=\"http://example\">a</a> <a href=\"http://example\">b</a></p>
-    EXPECTED
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_image
-    result =
-      @to.convert '{rdoc-image:path/to/image.jpg}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"path/to/image.jpg\"></a></p>\n"
-
-    assert_equal expected, result
-
-    result =
-      @to.convert '{rdoc-image:<script>alert`link text`</script>}[http://example.com]'
-
-    assert_not_include result, "<script>"
-  end
-
-  def test_convert_TIDYLINK_image_with_alt
-    result =
-      @to.convert '{rdoc-image:path/to/image.jpg:alt text}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"path/to/image.jpg\" alt=\"alt text\"></a></p>\n"
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_image_external
-    result =
-      @to.convert '{rdoc-image:http://example.com/path/to/image.jpg}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"http://example.com/path/to/image.jpg\"></a></p>\n"
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_image_external_with_alt
-    result =
-      @to.convert '{rdoc-image:http://example.com/path/to/image.jpg:alt text}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"http://example.com/path/to/image.jpg\" alt=\"alt text\"></a></p>\n"
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_rdoc_label
-    result = @to.convert '{foo}[rdoc-label:foottext-1]'
-
-    assert_equal "\n<p><a href=\"#foottext-1\">foo</a></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_irc
-    result = @to.convert '{ruby-lang}[irc://irc.freenode.net/#ruby-lang]'
-
-    assert_equal "\n<p><a href=\"irc://irc.freenode.net/#ruby-lang\">ruby-lang</a></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_escape_text
-    assert_escaped '<script>', '{<script>alert`link text`</script>}[a]'
-    assert_escaped '<script>', 'x:/<script>alert(1);</script>[[]'
-  end
-
-  def test_convert_TIDYLINK_escape_javascript
-    assert_not_include '{click}[javascript:alert`javascript_scheme`]', '<a href="javascript:'
-  end
-
-  def test_convert_TIDYLINK_escape_onmouseover
-    assert_escaped '"/onmouseover="', '{onmouseover}[http://"/onmouseover="alert`on_mouse_link`"]'
-  end
-
-  def test_convert_TIDYLINK_escape_onerror
-    assert_escaped '"onerror="', '{link_image}[http://"onerror="alert`link_image`".png]'
-  end
-
-  def test_convert_with_exclude_tag
-    assert_equal "\n<p><code>aaa</code>[:symbol]</p>\n", @to.convert('+aaa+[:symbol]')
-    assert_equal "\n<p><code>aaa[:symbol]</code></p>\n", @to.convert('+aaa[:symbol]+')
-    assert_equal "\n<p><code>https:</code>-foobar</p>\n", @to.convert('<tt>https:</tt>-foobar')
-    assert_equal "\n<p><a href=\":symbol\">aaa</a></p>\n", @to.convert('aaa[:symbol]')
-  end
-
-  def test_convert_underscore_adjacent_to_code
-    assert_equal "\n<p><code>aaa</code>_</p>\n", @to.convert(%q{+aaa+_})
-    assert_equal "\n<p>\u{2018}<code>i386-mswin32_</code><em>MSRTVERSION</em>\u{2019}</p>\n", @to.convert(%q{`+i386-mswin32_+_MSRTVERSION_'})
-  end
-
-  def test_gen_url
-    assert_equal '<a href="example">example</a>',
-                 @to.gen_url('link:example', 'example')
-  end
-
-  def test_gen_url_rdoc_label
-    assert_equal '<a href="#foottext-1">example</a>',
-                 @to.gen_url('rdoc-label:foottext-1', 'example')
-  end
-
-  def test_gen_url_rdoc_label_id
-    assert_equal '<sup><a id="footmark-1" href="#foottext-1">example</a></sup>',
-                 @to.gen_url('rdoc-label:foottext-1:footmark-1', 'example')
-  end
-
-  def test_gen_url_image_url
-    assert_equal '<img src="http://example.com/image.png" />', @to.gen_url('http://example.com/image.png', 'ignored')
-  end
-
-  def test_gen_url_ssl_image_url
-    assert_equal '<img src="https://example.com/image.png" />', @to.gen_url('https://example.com/image.png', 'ignored')
-  end
-
-  def test_gen_url_rdoc_file
-    assert_equal '<a href="example_rdoc.html">example</a>',
-                 @to.gen_url('example.rdoc', 'example')
-    assert_equal '<a href="doc/example_rdoc.html">example</a>',
-                 @to.gen_url('doc/example.rdoc', 'example')
-    assert_equal '<a href="../ex.doc/example_rdoc.html">example</a>',
-                 @to.gen_url('../ex.doc/example.rdoc', 'example')
-    assert_equal '<a href="doc/example_rdoc.html#label-one">example</a>',
-                 @to.gen_url('doc/example.rdoc#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_rdoc.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.rdoc#label-two', 'example')
-  end
-
-  def test_gen_url_md_file
-    assert_equal '<a href="example_md.html">example</a>',
-                 @to.gen_url('example.md', 'example')
-    assert_equal '<a href="doc/example_md.html">example</a>',
-                 @to.gen_url('doc/example.md', 'example')
-    assert_equal '<a href="../ex.doc/example_md.html">example</a>',
-                 @to.gen_url('../ex.doc/example.md', 'example')
-    assert_equal '<a href="doc/example_md.html#label-one">example</a>',
-                 @to.gen_url('doc/example.md#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_md.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.md#label-two', 'example')
-  end
-
-  def test_gen_url_rb_file
-    assert_equal '<a href="example_rb.html">example</a>',
-                 @to.gen_url('example.rb', 'example')
-    assert_equal '<a href="doc/example_rb.html">example</a>',
-                 @to.gen_url('doc/example.rb', 'example')
-    assert_equal '<a href="../ex.doc/example_rb.html">example</a>',
-                 @to.gen_url('../ex.doc/example.rb', 'example')
-    assert_equal '<a href="doc/example_rb.html#label-one">example</a>',
-                 @to.gen_url('doc/example.rb#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_rb.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.rb#label-two', 'example')
-  end
-
-  def test_handle_regexp_HYPERLINK_link
-    target = RDoc::Markup::RegexpHandling.new 0, 'link:README.txt'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal '<a href="README.txt">README.txt</a>', link
-  end
-
-  def test_handle_regexp_HYPERLINK_irc
-    target = RDoc::Markup::RegexpHandling.new 0, 'irc://irc.freenode.net/#ruby-lang'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal '<a href="irc://irc.freenode.net/#ruby-lang">irc.freenode.net/#ruby-lang</a>', link
-  end
-
-  def test_handle_regexp_HYPERLINK_escape
-    code = 'irc://irc.freenode.net/"><script>alert(`irc`)</script><a"'
-    assert_escaped '<script>', code
-  end
-
-  def test_list_verbatim_2
-    str = "* one\n    verb1\n    verb2\n* two\n"
-
-    expected = <<-EXPECTED
-<ul><li>
-<p>one</p>
-
-<pre class=\"ruby\"><span class=\"ruby-identifier\">verb1</span>
-<span class=\"ruby-identifier\">verb2</span>
-</pre>
-</li><li>
-<p>two</p>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to)
-  end
-
-  def test_block_quote_in_verbatim
-    str = "BlockQuote\n  >>>\n"
-
-    expected = <<-EXPECTED
-<p>BlockQuote</p>
-<pre>&gt;&gt;&gt;</pre>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to).gsub(/^\n/, "")
-
-    str = "BlockQuote\n  >>>  word\n"
-
-    expected = <<-EXPECTED
-<p>BlockQuote</p>
-<pre>&gt;&gt;&gt;  word</pre>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to).gsub(/^\n/, "")
-  end
-
-  def test_parseable_eh
-    valid_syntax = [
-      'def x() end',
-      'def x; end',
-      'class C; end',
-      "module M end",
-      'a # => blah',
-      'x { |y| nil }',
-      'x do |y| nil end',
-      '# only a comment',
-      'require "foo"',
-      'cls="foo"'
-    ]
-    invalid_syntax = [
-      'def x end',
-      'class C < end',
-      'module M < C end',
-      'a=># blah',
-      'x { |y| ... }',
-      'x do |y| ... end',
-      '// only a comment',
-      '<% require "foo" %>',
-      'class="foo"'
-    ]
-    valid_syntax.each do |t|
-      assert @to.parseable?(t), "valid syntax considered invalid: #{t}"
-    end
-    invalid_syntax.each do |t|
-      refute @to.parseable?(t), "invalid syntax considered valid: #{t}"
-    end
-  end
-
-  def test_to_html
-    assert_equal "\n<p><code>--</code></p>\n", util_format("<tt>--</tt>")
-  end
-
-  def util_format(text)
-    paragraph = RDoc::Markup::Paragraph.new text
-
-    @to.start_accepting
-    @to.accept_paragraph paragraph
-    @to.end_accepting
-  end
-
-  def test_accept_table
-    header = %w[Col1 Col2 Col3 Col4]
-    body = [
-      %w[cell1_1 cell1_2 cell1_3 cell1_4],
-      %w[cell2_1 cell2_2 cell2_3 cell2_4],
-      ['<script>alert("foo");</script>'],
-      %w[+code+ _em_ **strong** C1],
-    ]
-    aligns = [:left, :right, nil, :center]
-    @to.start_accepting
-    @to.accept_table(header, body, aligns)
-    res = @to.end_accepting
-    assert_include(res[%r<<th[^<>]*>Col1</th>>], 'align="left"')
-    assert_include(res[%r<<th[^<>]*>Col2</th>>], 'align="right"')
-    assert_not_include(res[%r<<th[^<>]*>Col3</th>>], 'align=')
-    assert_include(res[%r<<th[^<>]*>Col4</th>>], 'align="center"')
-    assert_include(res[%r<<td[^<>]*>cell1_1</td>>], 'align="left"')
-    assert_include(res[%r<<td[^<>]*>cell1_2</td>>], 'align="right"')
-    assert_not_include(res[%r<<td[^<>]*>cell1_3</td>>], 'align=')
-    assert_include(res[%r<<td[^<>]*>cell2_1</td>>], 'align="left"')
-    assert_include(res[%r<<td[^<>]*>cell2_2</td>>], 'align="right"')
-    assert_not_include(res[%r<<td[^<>]*>cell2_3</td>>], 'align=')
-    assert_include(res[%r<<td[^<>]*>cell2_4</td>>], 'align="center"')
-    assert_not_include(res, '<script>')
-    assert_include(res[%r<<td[^<>]*>.*script.*</td>>], '&lt;script&gt;')
-    assert_include(res[%r<<td[^<>]*>.*code.*</td>>], '<code>code</code>')
-    assert_include(res[%r<<td[^<>]*>.*em.*</td>>], '<em>em</em>')
-    assert_include(res[%r<<td[^<>]*>.*strong.*</td>>], '<strong>strong</strong>')
-    assert_include(res[%r<<td[^<>]*>C1</td>>], 'C1')
-  end
-
-  def assert_escaped(unexpected, code)
-    result = @to.convert(code)
-    assert_not_include result, unexpected
-    assert_include result, CGI.escapeHTML(unexpected)
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_joined_paragraph_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_joined_paragraph_test.rb
deleted file mode 100644
index 89e9736e8ac..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_joined_paragraph_test.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToJoinedParagraphTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToJoinedParagraph.new
-  end
-
-  def test_accept_paragraph
-    parsed = para('hello', ' ', 'world')
-
-    @to.accept_paragraph parsed
-
-    expected = para('hello world')
-
-    assert_equal expected, parsed
-  end
-
-  def test_accept_paragraph_break
-    parsed = para('hello', ' ', 'world', hard_break, 'everyone')
-
-    @to.accept_paragraph parsed
-
-    expected = para('hello world', hard_break, 'everyone')
-
-    assert_equal expected, parsed
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_label_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_label_test.rb
deleted file mode 100644
index a56480de84e..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_label_test.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToLabelTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToLabel.new
-  end
-
-  def empty
-    assert_empty @to.res
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.res
-  end
-
-  alias accept_blank_line                             empty
-  alias accept_block_quote                            empty
-  alias accept_document                               empty
-  alias accept_heading                                empty
-  alias accept_heading_1                              empty
-  alias accept_heading_2                              empty
-  alias accept_heading_3                              empty
-  alias accept_heading_4                              empty
-  alias accept_heading_b                              empty
-  alias accept_heading_suppressed_crossref            empty
-  alias accept_list_end_bullet                        empty
-  alias accept_list_end_label                         empty
-  alias accept_list_end_lalpha                        empty
-  alias accept_list_end_note                          empty
-  alias accept_list_end_number                        empty
-  alias accept_list_end_ualpha                        empty
-  alias accept_list_item_end_bullet                   empty
-  alias accept_list_item_end_label                    empty
-  alias accept_list_item_end_lalpha                   empty
-  alias accept_list_item_end_note                     empty
-  alias accept_list_item_end_number                   empty
-  alias accept_list_item_end_ualpha                   empty
-  alias accept_list_item_start_bullet                 empty
-  alias accept_list_item_start_label                  empty
-  alias accept_list_item_start_lalpha                 empty
-  alias accept_list_item_start_note                   empty
-  alias accept_list_item_start_note_2                 empty
-  alias accept_list_item_start_note_multi_description empty
-  alias accept_list_item_start_note_multi_label       empty
-  alias accept_list_item_start_number                 empty
-  alias accept_list_item_start_ualpha                 empty
-  alias accept_list_start_bullet                      empty
-  alias accept_list_start_label                       empty
-  alias accept_list_start_lalpha                      empty
-  alias accept_list_start_note                        empty
-  alias accept_list_start_number                      empty
-  alias accept_list_start_ualpha                      empty
-  alias accept_paragraph                              empty
-  alias accept_paragraph_b                            empty
-  alias accept_paragraph_br                           empty
-  alias accept_paragraph_break                        empty
-  alias accept_paragraph_i                            empty
-  alias accept_paragraph_plus                         empty
-  alias accept_paragraph_star                         empty
-  alias accept_paragraph_underscore                   empty
-  alias accept_raw                                    empty
-  alias accept_rule                                   empty
-  alias accept_verbatim                               empty
-  alias list_nested                                   empty
-  alias list_verbatim                                 empty
-  alias start_accepting                               empty
-
-  def test_convert_bold
-    assert_equal 'bold', @to.convert('<b>bold</b>')
-    assert_equal 'bold', @to.convert('*bold*')
-  end
-
-  def test_convert_crossref
-    assert_equal 'SomeClass', @to.convert('SomeClass')
-    assert_equal 'SomeClass', @to.convert('\\SomeClass')
-
-    assert_equal 'some_method', @to.convert('some_method')
-    assert_equal 'some_method', @to.convert('\\some_method')
-
-    assert_equal '23some_method', @to.convert('#some_method')
-    assert_equal '23some_method', @to.convert('\\#some_method')
-  end
-
-  def test_convert_em
-    assert_equal 'em', @to.convert('<em>em</em>')
-    assert_equal 'em', @to.convert('*em*')
-  end
-
-  def test_convert_em_dash # for HTML conversion
-    assert_equal '-', @to.convert('--')
-  end
-
-  def test_convert_escape
-    assert_equal 'a+-3E+b', @to.convert('a > b')
-  end
-
-  def test_convert_tidylink
-    assert_equal 'text', @to.convert('{text}[stuff]')
-    assert_equal 'text', @to.convert('text[stuff]')
-  end
-
-  def test_convert_tt
-    assert_equal 'tt', @to.convert('<tt>tt</tt>')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_markdown_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_markdown_test.rb
deleted file mode 100644
index 86fe5ce82bc..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_markdown_test.rb
+++ /dev/null
@@ -1,397 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToMarkdownTest < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToMarkdown.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "##### Hello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "cat\n:   \n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat\n:   \n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [""], @to.res
-    assert_equal '*   ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [""], @to.res
-    assert_equal "cat\n:   ", @to.prefix
-
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [""], @to.res
-    assert_equal "cat\n:   ", @to.prefix
-
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [4],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal [1],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [4],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal [1],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "---\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "    hi\n      world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [""], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "# Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "## Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "### Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "#### Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   # Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "# **Hello**\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "# Hello\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "`teletype`\n:   teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label\n:   description one\n\n:   description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one\ntwo\n:   two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg **bold words** reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one  \ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello  \nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg *italic words* reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg `teletype` reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg **bold** reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg *italic* reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   ---\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "      hi\n       world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "      hi\n      world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-*   l1
-    *   l1.1
-*   l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-*   list stuff
-
-        * list
-          with
-
-          second
-
-          1. indented
-          2. numbered
-
-          third
-
-        * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_table_align
-    expected = <<-EXPECTED
- AA |BB |CCCCC|DDDDD
-----|---|-----|-----
-    |bbb|    c|
-aaaa|b  |     | dd
- a  |   |   cc| dd
-    EXPECTED
-    assert_equal expected, @to.end_accepting
-  end
-
-  def test_convert_RDOCLINK
-    result = @to.convert 'rdoc-garbage:C'
-
-    assert_equal "C\n", result
-  end
-
-  def test_convert_RDOCLINK_image
-    result = @to.convert 'rdoc-image:/path/to/image.jpg'
-
-    assert_equal "![](/path/to/image.jpg)\n", result
-  end
-
-  def test_convert_TIDYLINK
-    result = @to.convert \
-      '{DSL}[https://en.wikipedia.org/wiki/Domain-specific_language]'
-
-    expected = "[DSL](https://en.wikipedia.org/wiki/Domain-specific_language)\n"
-
-    assert_equal expected, result
-  end
-
-  def test_handle_rdoc_link_label_footmark
-    assert_equal '[^1]:', @to.handle_rdoc_link('rdoc-label:footmark-1:x')
-  end
-
-  def test_handle_rdoc_link_label_foottext
-    assert_equal '[^1]',   @to.handle_rdoc_link('rdoc-label:foottext-1:x')
-  end
-
-  def test_handle_rdoc_link_label_label
-    assert_equal '[x](#label-x)', @to.handle_rdoc_link('rdoc-label:label-x')
-  end
-
-  def test_handle_rdoc_link_ref
-    assert_equal 'x', @to.handle_rdoc_link('rdoc-ref:x')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_rdoc_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_rdoc_test.rb
deleted file mode 100644
index c7d6120c0db..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_rdoc_test.rb
+++ /dev/null
@@ -1,388 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToRDocTest < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToRdoc.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "===== Hello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "[cat]\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat::\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [""], @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [""], @to.res
-    assert_equal "[cat]\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [""], @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [""], @to.res
-    assert_equal "cat::\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [""], @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [""], @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [""], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "= Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "=== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "==== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   = Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "= <b>Hello</b>\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "= Hello\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "<tt>teletype</tt>::\n  teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label::\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one::\ntwo::\n  two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg <b>bold words</b> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello\nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg <em>italic words</em> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg <tt>teletype</tt> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg <b>bold</b> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg <em>italic</em> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_table_align
-    expected = <<-EXPECTED
- AA |BB |CCCCC|DDDDD
-----|---|-----|-----
-    |bbb|    c|
-aaaa|b  |     | dd
- a  |   |   cc| dd
-    EXPECTED
-    assert_equal expected, @to.end_accepting
-  end
-
-  # functional test
-  def test_convert_list_note
-    note_list = <<-NOTE_LIST
-foo ::
-bar ::
-  hi
-    NOTE_LIST
-
-    expected = <<-EXPECTED
-foo::
-bar::
-  hi
-
-    EXPECTED
-
-    assert_equal expected, @to.convert(note_list)
-  end
-
-  def test_accept_indented_paragraph
-    ip = RDoc::Markup::IndentedParagraph.new 2, 'cats are cool'
-
-    @to.start_accepting
-
-    @to.accept_indented_paragraph ip
-
-    assert_equal "  cats are cool\n", @to.end_accepting
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_table_of_contents_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_table_of_contents_test.rb
deleted file mode 100644
index 3fb6fdeb427..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_table_of_contents_test.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToTableOfContentsTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToTableOfContents.new
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.res
-  end
-
-  def empty
-    assert_empty @to.res
-  end
-
-  def accept_heading
-    assert_equal [@RM::Heading.new(5, 'Hello')], @to.res
-  end
-
-  def accept_heading_1
-    assert_equal [@RM::Heading.new(1, 'Hello')], @to.res
-  end
-
-  def accept_heading_2
-    assert_equal [@RM::Heading.new(2, 'Hello')], @to.res
-  end
-
-  def accept_heading_3
-    assert_equal [@RM::Heading.new(3, 'Hello')], @to.res
-  end
-
-  def accept_heading_4
-    assert_equal [@RM::Heading.new(4, 'Hello')], @to.res
-  end
-
-  def accept_heading_b
-    assert_equal [@RM::Heading.new(1, '*Hello*')], @to.res
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal [@RM::Heading.new(1, '\\Hello')], @to.res
-  end
-
-  alias accept_blank_line                             empty
-  alias accept_block_quote                            empty
-  alias accept_document                               empty
-  alias accept_list_end_bullet                        empty
-  alias accept_list_end_label                         empty
-  alias accept_list_end_lalpha                        empty
-  alias accept_list_end_note                          empty
-  alias accept_list_end_number                        empty
-  alias accept_list_end_ualpha                        empty
-  alias accept_list_item_end_bullet                   empty
-  alias accept_list_item_end_label                    empty
-  alias accept_list_item_end_lalpha                   empty
-  alias accept_list_item_end_note                     empty
-  alias accept_list_item_end_number                   empty
-  alias accept_list_item_end_ualpha                   empty
-  alias accept_list_item_start_bullet                 empty
-  alias accept_list_item_start_label                  empty
-  alias accept_list_item_start_lalpha                 empty
-  alias accept_list_item_start_note                   empty
-  alias accept_list_item_start_note_2                 empty
-  alias accept_list_item_start_note_multi_description empty
-  alias accept_list_item_start_note_multi_label       empty
-  alias accept_list_item_start_number                 empty
-  alias accept_list_item_start_ualpha                 empty
-  alias accept_list_start_bullet                      empty
-  alias accept_list_start_label                       empty
-  alias accept_list_start_lalpha                      empty
-  alias accept_list_start_note                        empty
-  alias accept_list_start_number                      empty
-  alias accept_list_start_ualpha                      empty
-  alias accept_paragraph                              empty
-  alias accept_paragraph_b                            empty
-  alias accept_paragraph_br                           empty
-  alias accept_paragraph_break                        empty
-  alias accept_paragraph_i                            empty
-  alias accept_paragraph_plus                         empty
-  alias accept_paragraph_star                         empty
-  alias accept_paragraph_underscore                   empty
-  alias accept_raw                                    empty
-  alias accept_rule                                   empty
-  alias accept_verbatim                               empty
-  alias list_nested                                   empty
-  alias list_verbatim                                 empty
-  alias start_accepting                               empty
-
-  def test_accept_document_omit_headings_below
-    document = doc
-    document.omit_headings_below = 2
-
-    @to.accept_document document
-
-    assert_equal 2, @to.omit_headings_below
-  end
-
-  def test_accept_heading_suppressed
-    @to.start_accepting
-    @to.omit_headings_below = 4
-
-    suppressed = head 5, 'Hello'
-
-    @to.accept_heading suppressed
-
-    assert_empty @to.res
-  end
-
-  def test_suppressed_eh
-    @to.omit_headings_below = nil
-
-    refute @to.suppressed? head(1, '')
-
-    @to.omit_headings_below = 1
-
-    refute @to.suppressed? head(1, '')
-    assert @to.suppressed? head(2, '')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_to_tt_only_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_to_tt_only_test.rb
deleted file mode 100644
index e5dfc0be963..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_to_tt_only_test.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToTtOnlyTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToTtOnly.new
-  end
-
-  def accept_blank_line
-    assert_empty @to.end_accepting
-  end
-
-  def accept_block_quote
-    assert_empty @to.end_accepting
-  end
-
-  def accept_document
-    assert_equal [], @to.res
-  end
-
-  def accept_heading
-    assert_empty @to.end_accepting
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_end_label
-    assert_empty @to.res
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_end_note
-    assert_empty @to.res
-  end
-
-  def accept_list_end_number
-    assert_empty @to.res
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_label
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_note
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_number
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_label
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_note
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_number
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_start_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_start_label
-    assert_empty @to.res
-  end
-
-  def accept_list_start_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_start_note
-    assert_empty @to.res
-  end
-
-  def accept_list_start_number
-    assert_empty @to.res
-  end
-
-  def accept_list_start_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_paragraph
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_empty @to.end_accepting
-  end
-
-  def accept_raw
-    assert_empty @to.end_accepting
-  end
-
-  def accept_rule
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim
-    assert_empty @to.end_accepting
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.end_accepting
-  end
-
-  def start_accepting
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_1
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_empty @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal [nil, 'teletype', nil], @to.res
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_empty @to.res
-  end
-
-  def accept_paragraph_b
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal %w[teletype], @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    assert_empty @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_empty @to.end_accepting
-  end
-
-  def list_nested
-    assert_empty @to.end_accepting
-  end
-
-  def list_verbatim
-    assert_empty @to.end_accepting
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_markup_verbatim_test.rb b/test/mri/rdoc/rdoc/rdoc_markup_verbatim_test.rb
deleted file mode 100644
index 910095c9ab4..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_markup_verbatim_test.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupVerbatimTest < RDoc::TestCase
-
-  def test_equals2
-    v1 = verb('1 + 1')
-    v2 = verb('1 + 1')
-    v3 = verb('1 + 2')
-    v4 = verb('1 + 1')
-    v4.format = :ruby
-
-    assert_equal v1, v2
-
-    refute_equal v1, v3
-    refute_equal v1, v4
-  end
-
-  def test_ruby_eh
-    verbatim = RDoc::Markup::Verbatim.new
-
-    refute verbatim.ruby?
-
-    verbatim.format = :ruby
-
-    assert verbatim.ruby?
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_method_attr_test.rb b/test/mri/rdoc/rdoc/rdoc_method_attr_test.rb
deleted file mode 100644
index 54a2a0d395b..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_method_attr_test.rb
+++ /dev/null
@@ -1,210 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocMethodAttrTest < XrefTestCase
-
-  def test_initialize_copy
-    refute_same @c1_m.full_name, @c1_m.dup.full_name
-  end
-
-  def test_block_params_equal
-    m = RDoc::MethodAttr.new(nil, 'foo')
-
-    m.block_params = ''
-    assert_equal '', m.block_params
-
-    m.block_params = 'a_var'
-    assert_equal 'a_var', m.block_params
-
-    m.block_params = '()'
-    assert_equal '', m.block_params
-
-    m.block_params = '(a_var, b_var)'
-    assert_equal 'a_var, b_var', m.block_params
-
-    m.block_params = '.to_s + "</#{element.upcase}>"'
-    assert_equal '', m.block_params
-
-    m.block_params = 'i.name'
-    assert_equal 'name', m.block_params
-
-    m.block_params = 'attr.expanded_name, attr.value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = 'expanded_name, attr.value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = 'attr.expanded_name, value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = '(@base_notifier)'
-    assert_equal 'base_notifier', m.block_params
-
-    m.block_params = 'if @signal_status == :IN_LOAD'
-    assert_equal '', m.block_params
-
-    m.block_params = 'e if e.kind_of? Element'
-    assert_equal 'e', m.block_params
-
-    m.block_params = '(e, f) if e.kind_of? Element'
-    assert_equal 'e, f', m.block_params
-
-    m.block_params = 'back_path, back_name'
-    assert_equal 'back_path, back_name', m.block_params
-
-    m.block_params = '(*a[1..-1])'
-    assert_equal '*a', m.block_params
-
-    m.block_params = '@@context[:node] if defined? @@context[:node].namespace'
-    assert_equal 'context', m.block_params
-
-    m.block_params = '(result, klass.const_get(constant_name))'
-    assert_equal 'result, const', m.block_params
-
-    m.block_params = 'name.to_s if (bitmap & bit) != 0'
-    assert_equal 'name', m.block_params
-
-    m.block_params = 'line unless line.deleted'
-    assert_equal 'line', m.block_params
-
-    m.block_params = 'str + rs'
-    assert_equal 'str', m.block_params
-
-    m.block_params = 'f+rs'
-    assert_equal 'f', m.block_params
-
-    m.block_params = '[user, realm, hash[user]]'
-    assert_equal 'user, realm, hash', m.block_params
-
-    m.block_params = 'proc{|rc| rc == "rc" ? irbrc : irbrc+rc| ... }'
-    assert_equal 'proc', m.block_params
-
-    m.block_params = 'lambda { |x| x.to_i }'
-    assert_equal 'lambda', m.block_params
-
-    m.block_params = '$&'
-    assert_equal 'str', m.block_params
-
-    m.block_params = 'Inflections.instance'
-    assert_equal 'instance', m.block_params
-
-    m.block_params = 'self.class::STARTED'
-    assert_equal 'STARTED', m.block_params
-
-    m.block_params = 'Test::Unit::TestCase::STARTED'
-    assert_equal 'STARTED', m.block_params
-
-    m.block_params = 'ActiveSupport::OptionMerger.new(self, options)'
-    assert_equal 'option_merger', m.block_params
-
-    m.block_params = ', msg'
-    assert_equal '', m.block_params
-
-    m.block_params = '[size.to_s(16), term, chunk, term].join'
-    assert_equal '[size, term, chunk, term].join', m.block_params
-
-    m.block_params = 'YPath.new( path )'
-    assert_equal 'y_path', m.block_params
-
-  end
-
-  def test_find_method_or_attribute_recursive
-    inc = RDoc::Include.new 'M1', nil
-    @m1.add_include inc # M1 now includes itself
-
-    assert_nil @m1_m.find_method_or_attribute 'm'
-  end
-
-  def test_full_name
-    assert_equal 'C1#m',  @c1_m.full_name
-    assert_equal 'C1::m', @c1__m.full_name
-  end
-
-  def test_is_alias_for
-    assert_equal @c2_b, @c2_a.is_alias_for
-  end
-
-  def test_search_record
-    @c1_m.comment = 'This is a comment.'
-
-    expected = [
-      'm',
-      'C1#m',
-      'm',
-      'C1',
-      'C1.html#method-i-m',
-      '(foo)',
-      "<p>This is a comment.\n",
-    ]
-
-    assert_equal expected, @c1_m.search_record
-  end
-
-  def test_spaceship_returns_nil_on_inappropriate_types
-    assert_nil @c1_m.<=>(RDoc::CodeObject.new)
-  end
-
-  def test_spaceship_orders_symbols_first
-    # in the desired sort order
-    m_plus       = RDoc::AnyMethod.new nil, '+'
-    m_eqeq       = RDoc::AnyMethod.new nil, '=='
-    m_bracket    = RDoc::AnyMethod.new nil, '[]'
-    m_caret      = RDoc::AnyMethod.new nil, '^'
-    m_bar        = RDoc::AnyMethod.new nil, '|'
-    m_tilde      = RDoc::AnyMethod.new nil, '~'
-    m_Alpha      = RDoc::AnyMethod.new nil, 'Alpha'
-    m_Zero       = RDoc::AnyMethod.new nil, 'Zero'
-    m_alpha      = RDoc::AnyMethod.new nil, 'alpha'
-    m_zero       = RDoc::AnyMethod.new nil, 'zero'
-    m_konnichiwa = RDoc::AnyMethod.new nil, 'こんにちは'
-
-    assert_equal(-1, m_plus <=> m_eqeq)
-    assert_equal(-1, m_eqeq <=> m_bracket)
-    assert_equal(-1, m_bracket <=> m_caret)
-    assert_equal(-1, m_caret <=> m_bar)
-    assert_equal(-1, m_bar <=> m_tilde)
-    assert_equal(-1, m_tilde <=> m_Alpha)
-    assert_equal(-1, m_Alpha <=> m_Zero)
-    assert_equal(-1, m_Zero <=> m_alpha)
-    assert_equal(-1, m_alpha <=> m_zero)
-    assert_equal(-1, m_zero <=> m_konnichiwa)
-  end
-
-  def test_equals2
-    assert_equal @c1_m, @c1_m
-    refute_equal @c1_m, @parent_m
-  end
-
-  def test_pretty_print
-    temp_dir do |tmpdir|
-      s = RDoc::RI::Store.new(RDoc::Options.new, path: tmpdir)
-
-      top_level = s.add_file 'file.rb'
-      meth_bang = RDoc::AnyMethod.new nil, 'method!'
-      meth_bang.record_location top_level
-
-      meth_bang_alias = RDoc::Alias.new nil, 'method!', 'method_bang', ''
-      meth_bang_alias.record_location top_level
-
-      klass = top_level.add_class RDoc::NormalClass, 'Object'
-      klass.add_method meth_bang
-
-      meth_bang.add_alias meth_bang_alias, klass
-
-      s.save
-
-      meth_alias_from_store = s.load_method 'Object', '#method_bang'
-
-      expected = "[RDoc::AnyMethod Object#method_bang public alias for method!]"
-      actual =  mu_pp meth_alias_from_store
-      assert_equal expected, actual
-    end
-  end
-
-  def test_to_s
-    assert_equal 'RDoc::AnyMethod: C1#m',  @c1_m.to_s
-    assert_equal 'RDoc::AnyMethod: C2#b',  @c2_b.to_s
-    assert_equal 'RDoc::AnyMethod: C1::m', @c1__m.to_s
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_normal_class_test.rb b/test/mri/rdoc/rdoc/rdoc_normal_class_test.rb
deleted file mode 100644
index d61ef5ccd92..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_normal_class_test.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocNormalClassTest < XrefTestCase
-
-  def test_ancestors
-    klass = @top_level.add_class RDoc::NormalClass, 'Klass'
-    incl = RDoc::Include.new 'Incl', ''
-
-    sub_klass = @top_level.add_class RDoc::NormalClass, 'SubClass'
-    sub_klass.superclass = klass
-    sub_klass.add_include incl
-
-    assert_equal [incl.name, klass, @object, 'BasicObject'], sub_klass.ancestors
-  end
-
-  def test_ancestors_multilevel
-    c1 = @top_level.add_class RDoc::NormalClass, 'Outer'
-    c2 = @top_level.add_class RDoc::NormalClass, 'Middle', c1.full_name
-    c3 = @top_level.add_class RDoc::NormalClass, 'Inner', c2.full_name
-
-    assert_equal [c2, c1, @object, 'BasicObject'], c3.ancestors
-  end
-
-  def test_aref
-    assert_equal 'class-C1',     @c1.aref
-    assert_equal 'class-C2::C3', @c2_c3.aref
-  end
-
-  def test_direct_ancestors
-    incl = RDoc::Include.new 'Incl', ''
-
-    c1 = @top_level.add_class RDoc::NormalClass, 'Outer'
-    c2 = @top_level.add_class RDoc::NormalClass, 'Middle', c1.full_name
-    c3 = @top_level.add_class RDoc::NormalClass, 'Inner', c2.full_name
-    c3.add_include incl
-
-    assert_equal [incl.name, c2], c3.direct_ancestors
-  end
-
-  def test_definition
-    c = RDoc::NormalClass.new 'C'
-
-    assert_equal 'class C', c.definition
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_normal_module_test.rb b/test/mri/rdoc/rdoc/rdoc_normal_module_test.rb
deleted file mode 100644
index bb0a2afc768..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_normal_module_test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocNormalModuleTest < XrefTestCase
-
-  def setup
-    super
-
-    @mod = RDoc::NormalModule.new 'Mod'
-  end
-
-  def test_ancestors_module
-    top_level = @store.add_file 'file.rb'
-    mod = top_level.add_module RDoc::NormalModule, 'Mod'
-    incl = RDoc::Include.new 'Incl', ''
-
-    mod.add_include incl
-
-    assert_equal [incl.name], mod.ancestors
-
-    mod2 = top_level.add_module RDoc::NormalModule, 'Inc2'
-    inc2 = RDoc::Include.new 'Inc2', ''
-    mod.add_include inc2
-    assert_equal [mod2, incl.name], mod.ancestors
-  end
-
-  def test_aref
-    assert_equal 'module-M1',     @m1.aref
-    assert_equal 'module-M1::M2', @m1_m2.aref
-  end
-
-  def test_definition
-    m = RDoc::NormalModule.new 'M'
-
-    assert_equal 'module M', m.definition
-  end
-
-  def test_module_eh
-    assert @mod.module?
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_options_test.rb b/test/mri/rdoc/rdoc/rdoc_options_test.rb
deleted file mode 100644
index 097d0f5523c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_options_test.rb
+++ /dev/null
@@ -1,975 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocOptionsTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @generators = RDoc::RDoc::GENERATORS.dup
-  end
-
-  def teardown
-    super
-
-    RDoc::RDoc::GENERATORS.replace @generators
-  end
-
-  def test_check_files
-    omit "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    out, err = capture_output do
-      temp_dir do
-        FileUtils.touch 'unreadable'
-        FileUtils.chmod 0, 'unreadable'
-
-        @options.files = %w[nonexistent unreadable]
-
-        @options.check_files
-      end
-    end
-
-    assert_empty @options.files
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_check_files_warn
-    @options.verbosity = 2
-
-    out, err = verbose_capture_output do
-      @options.files = %w[nonexistent]
-
-      @options.check_files
-    end
-
-    assert_empty out
-    assert_equal "file 'nonexistent' not found\n", err
-    assert_empty @options.files
-  end
-
-  def test_dry_run_default
-    refute @options.dry_run
-  end
-
-  def test_to_yaml
-    RDoc.load_yaml
-
-    coder = YAML.load(@options.to_yaml)
-
-    encoding = 'UTF-8'
-
-    expected = {
-      'charset'               => 'UTF-8',
-      'encoding'              => encoding,
-      'embed_mixins'          => false,
-      'exclude'               => [],
-      'hyperlink_all'         => false,
-      'line_numbers'          => false,
-      'locale_dir'            => 'locale',
-      'locale_name'           => nil,
-      'main_page'             => nil,
-      'markup'                => 'rdoc',
-      'output_decoration'     => true,
-      'page_dir'              => nil,
-      'rdoc_include'          => [],
-      'show_hash'             => false,
-      'static_path'           => [],
-      'tab_width'             => 8,
-      'template_stylesheets'  => [],
-      'title'                 => nil,
-      'visibility'            => :protected,
-      'warn_missing_rdoc_ref' => true,
-      'webcvs'                => nil,
-      'skip_tests'            => true,
-      'apply_default_exclude' => true,
-      'autolink_excluded_words' => [],
-      'class_module_path_prefix' => nil,
-      'file_path_prefix' => nil,
-      'canonical_root' => nil,
-    }
-
-    assert_equal expected, coder
-  end
-
-  def test_to_yaml_trim_paths
-    RDoc.load_yaml
-
-    subdir = nil
-    coder = nil
-
-    temp_dir do |dir|
-      FileUtils.mkdir 'project'
-      FileUtils.mkdir 'dir'
-      FileUtils.touch 'file'
-
-      Dir.chdir 'project' do
-        subdir = File.expand_path 'subdir'
-        FileUtils.mkdir 'subdir'
-        @options.parse %w[
-          --copy subdir
-          --copy ../file
-          --copy ../
-          --copy /
-          --include subdir
-          --include ../dir
-          --include ../
-          --include /
-        ]
-
-        coder = YAML.load(@options.to_yaml)
-      end
-    end
-
-    assert_equal [subdir], coder['rdoc_include']
-
-    assert_equal [subdir], coder['static_path']
-  end
-
-  def test_encoding_default
-    assert_equal Encoding::UTF_8, @options.encoding
-  end
-
-  def test_generator_descriptions
-    # HACK autotest/isolate should take care of this
-    RDoc::RDoc::GENERATORS.clear
-    RDoc::RDoc::GENERATORS['darkfish'] = RDoc::Generator::Darkfish
-    RDoc::RDoc::GENERATORS['ri']       = RDoc::Generator::RI
-
-    expected = <<-EXPECTED.chomp
-  darkfish - HTML generator, written by Michael Granger
-  ri       - creates ri data files
-    EXPECTED
-
-    assert_equal expected, @options.generator_descriptions
-  end
-
-  def test_init_with_encoding
-    RDoc.load_yaml
-
-    @options.encoding = Encoding::IBM437
-
-    options = @options.to_yaml
-    options = YAML.safe_load(options, permitted_classes: [Symbol])
-    options = RDoc::Options.new(options)
-
-    assert_equal Encoding::IBM437, options.encoding
-  end
-
-  def test_init_with_trim_paths
-    RDoc.load_yaml
-
-    yaml = <<-YAML
----
-static_path:
-- /etc
-rdoc_include:
-- /etc
-    YAML
-
-    options = YAML.safe_load(yaml, permitted_classes: [Symbol])
-    options = RDoc::Options.new(options)
-
-    assert_empty options.rdoc_include
-    assert_empty options.static_path
-  end
-
-  def test_parse_copy_files_file_relative
-    file = File.basename __FILE__
-    expected = File.expand_path __FILE__
-
-    Dir.chdir File.expand_path('..', __FILE__) do
-      @options.parse %W[--copy-files #{file}]
-
-      assert_equal [expected], @options.static_path
-    end
-  end
-
-  def test_parse_copy_files_file_absolute
-    @options.parse %W[--copy-files #{File.expand_path __FILE__}]
-
-    assert_equal [File.expand_path(__FILE__)], @options.static_path
-  end
-
-  def test_parse_copy_files_directory_relative
-    @options.parse %w[--copy-files .]
-
-    assert_equal [@pwd], @options.static_path
-  end
-
-  def test_parse_copy_files_directory_absolute
-    @options.parse %w[--copy-files /]
-
-    assert_equal 1, @options.static_path.length
-
-    assert_match %r%^([A-Z]:)?/$%i, @options.static_path.first
-  end
-
-  def test_parse_coverage
-    @options.parse %w[--dcov]
-
-    assert @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_coverage_C
-    @options.parse %w[-C]
-
-    assert @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_coverage_no
-    @options.parse %w[--no-dcov]
-
-    refute @options.coverage_report
-  end
-
-  def test_parse_coverage_level_1
-    @options.parse %w[--dcov=1]
-
-    assert_equal 1, @options.coverage_report
-  end
-
-  def test_parse_coverage_C_level_1
-    @options.parse %w[-C1]
-
-    assert_equal 1, @options.coverage_report
-  end
-
-  def test_parse_coverage_C_level_0
-    @options.parse %w[-C0]
-
-    assert_equal 0, @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_dash_p
-    out, err = capture_output do
-      @options.parse %w[-p]
-    end
-
-    assert @options.pipe
-    refute_match %r%^Usage: %, err
-    refute_match %r%^invalid options%, err
-
-    assert_empty out
-  end
-
-  def test_parse_dash_p_files
-    out, err = capture_output do
-      @options.parse ['-p', File.expand_path(__FILE__)]
-    end
-
-    refute @options.pipe
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: -p .with files.%, err
-
-    assert_empty out
-  end
-
-  def test_parse_default
-    @options.parse []
-    @options.finish
-
-    assert_equal RDoc::Generator::Darkfish,             @options.generator
-    assert_equal 'darkfish',                            @options.template
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_deprecated
-    dep_hash = RDoc::Options::DEPRECATED
-    options = dep_hash.keys.sort
-
-    out, err = capture_output do
-      @options.parse options
-    end
-
-    dep_hash.each_pair do |opt, message|
-      assert_match %r%.*#{opt}.+#{message}%, err
-    end
-
-    assert_empty out
-  end
-
-  def test_parse_dry_run
-    @options.parse %w[--dry-run]
-
-    assert @options.dry_run
-  end
-
-  def test_parse_encoding
-    @options.parse %w[--encoding Big5]
-
-    assert_equal Encoding::Big5, @options.encoding
-    assert_equal 'Big5',         @options.charset
-  end
-
-  def test_parse_encoding_invalid
-    out, err = capture_output do
-      @options.parse %w[--encoding invalid]
-    end
-
-    assert_match %r%^invalid options: --encoding invalid%, err
-
-    assert_empty out
-  end
-
-  def test_parse_formatter
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --format ri]
-    end
-
-    assert_equal 'invalid option: --format generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_force_update
-    @options.parse %w[--force-update]
-
-    assert @options.force_update
-
-    @options.parse %w[--no-force-update]
-
-    assert !@options.force_update
-
-    @options.parse %w[-U]
-
-    assert @options.force_update
-  end
-
-  def test_parse_formatter_ri
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --ri]
-    end
-
-    assert_equal 'invalid option: --ri generator already set to darkfish',
-                 e.message
-
-    @options = RDoc::Options.new
-
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish -r]
-    end
-
-    assert_equal 'invalid option: -r generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_formatter_ri_site
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --ri-site]
-    end
-
-    assert_equal 'invalid option: --ri-site generator already set to darkfish',
-                 e.message
-
-    @options = RDoc::Options.new
-
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish -R]
-    end
-
-    assert_equal 'invalid option: -R generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_h
-    out, = capture_output do
-      begin
-        @options.parse %w[-h]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-  end
-
-  def test_parse_help
-    out, = capture_output do
-      begin
-        @options.parse %w[--help]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-  end
-
-  def test_parse_help_extra_generator
-    RDoc::RDoc::GENERATORS['test'] = Class.new do
-      def self.setup_options(options)
-        op = options.option_parser
-
-        op.separator 'test generator options:'
-      end
-    end
-
-    out, = capture_output do
-      begin
-        @options.parse %w[--help]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-    assert_equal 1, out.scan(/test generator options:/).length
-  end
-
-  def test_parse_format_for_extra_generator
-    RDoc::RDoc::GENERATORS['test'] = Class.new do
-      def self.setup_options(options)
-        op = options.option_parser
-
-        op.separator 'test generator options:'
-      end
-    end
-
-    @options.setup_generator 'test'
-
-    assert_equal @options.generator_name, 'test'
-  end
-
-  def test_parse_ignore_invalid
-    out, err = capture_output do
-      @options.parse %w[--ignore-invalid --bogus]
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus%, err
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_default
-    out, err = capture_output do
-      @options.parse %w[--bogus --main BLAH]
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus%, err
-
-    assert_equal 'BLAH', @options.main_page
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_no
-    out, err = capture_output do
-      assert_raise SystemExit do
-        @options.parse %w[--no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
-      end
-    end
-
-    assert_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus=arg, --bobogus, --visibility=extended%, err
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_no_quiet
-    out, err = capture_output do
-      assert_raise SystemExit do
-        @options.parse %w[--quiet --no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
-      end
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus=arg, --bobogus, --visibility=extended%, err
-
-    assert_empty out
-  end
-
-  def test_ignore_needless_arg
-    out, err = capture_output do
-      @options.parse %w[--ri=foo]
-    end
-
-    assert_match %r%^invalid options: --ri=foo%, err
-
-    assert_empty out
-  end
-
-  def test_ignore_missing_arg
-    out, err = capture_output do
-      @options.parse %w[--copy-files]
-    end
-
-    assert_match %r%^invalid options: --copy-files%, err
-
-    assert_empty out
-  end
-
-  def test_parse_main
-    out, err = capture_output do
-      @options.parse %w[--main MAIN]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'MAIN', @options.main_page
-  end
-
-  def test_parse_markup
-    out, err = capture_output do
-      @options.parse %w[--markup tomdoc]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'tomdoc', @options.markup
-  end
-
-  def test_parse_page_dir
-    assert_nil @options.page_dir
-
-    out, err = capture_output do
-      @options.parse %W[--page-dir #{Dir.tmpdir}]
-      @options.finish
-    end
-
-    assert_empty out
-    assert_empty err
-
-    expected = nil
-    begin
-      expected =
-        Pathname(Dir.tmpdir).expand_path.relative_path_from @options.root
-    rescue ArgumentError
-      # On Windows, sometimes crosses different drive letters.
-      expected = Pathname(Dir.tmpdir).expand_path
-    end
-
-    assert_equal expected,     @options.page_dir
-    assert_equal [Dir.tmpdir], @options.files
-  end
-
-  def test_parse_page_dir_root
-    assert_nil @options.page_dir
-
-    Dir.mktmpdir do |dir|
-      abs_root     = dir
-      abs_page_dir = File.join dir, 'pages'
-      FileUtils.mkdir abs_page_dir
-
-      out, err = capture_output do
-        @options.parse %W[--page-dir #{abs_page_dir} --root #{abs_root}]
-        @options.finish
-      end
-
-      assert_empty out
-      assert_empty err
-
-      assert_equal Pathname('pages'), @options.page_dir
-      assert_equal [abs_page_dir],    @options.files
-    end
-  end
-
-  def test_parse_ri_site
-    @options.parse %w[--ri-site]
-
-    assert_equal RDoc::Generator::RI,      @options.generator
-    assert_equal RDoc::RI::Paths.site_dir, @options.op_dir
-  end
-
-  def test_parse_root
-    assert_equal Pathname(Dir.pwd), @options.root
-
-    out, err = capture_output do
-      @options.parse %W[--root #{Dir.tmpdir}]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal Pathname(Dir.tmpdir), @options.root
-
-    @options.finish
-    assert_includes @options.rdoc_include, @options.root.to_s
-  end
-
-  def test_parse_embed_mixins
-    assert_false(@options.embed_mixins)
-
-    out, err = capture_output { @options.parse(["--embed-mixins"]) }
-    assert_empty(out)
-    assert_empty(err)
-    assert_true(@options.embed_mixins)
-
-    out, err = capture_output { @options.parse(["--no-embed-mixins"]) }
-    assert_empty(out)
-    assert_empty(err)
-    assert_false(@options.embed_mixins)
-  end
-
-  def test_parse_tab_width
-    @options.parse %w[--tab-width=1]
-    assert_equal 1, @options.tab_width
-
-    @options.parse %w[-w2]
-    assert_equal 2, @options.tab_width
-
-    _, err = capture_output do
-      @options.parse %w[-w=2]
-    end
-
-    assert_match 'invalid options', err
-
-    _, err = capture_output do
-      @options.parse %w[-w0]
-    end
-
-    assert_match 'invalid options', err
-  end
-
-  def test_parse_template
-    out, err = capture_output do
-      @options.parse %w[--template darkfish]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'darkfish', @options.template
-
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_template_nonexistent
-    out, err = capture_output do
-      @options.parse %w[--template NONEXISTENT]
-    end
-
-    assert_empty out
-    assert_equal "could not find template NONEXISTENT\n", err
-
-    @options.finish
-    assert_equal 'darkfish', @options.template
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_template_load_path
-    orig_LOAD_PATH = $LOAD_PATH.dup
-
-    template_dir = nil
-
-    Dir.mktmpdir do |dir|
-      $LOAD_PATH << dir
-
-      template_dir = File.join dir, 'rdoc', 'generator', 'template', 'load_path'
-
-      FileUtils.mkdir_p template_dir
-
-      out, err = capture_output do
-        @options.parse %w[--template load_path]
-      end
-
-      assert_empty out
-      assert_empty err
-    end
-
-    assert_equal 'load_path',  @options.template
-    assert_equal template_dir, @options.template_dir
-  ensure
-    $LOAD_PATH.replace orig_LOAD_PATH
-  end
-
-  def test_parse_template_stylesheets
-    css = nil
-    Dir.mktmpdir do |dir|
-      css = File.join(dir, "hoge.css")
-      File.write(css, "")
-      out, err = capture_output do
-        @options.parse %W[--template-stylesheets #{css}]
-      end
-
-      assert_empty out
-      assert_empty err
-    end
-    assert_include @options.template_stylesheets, css
-  end
-
-  def test_parse_visibility
-    @options.parse %w[--visibility=public]
-    assert_equal :public, @options.visibility
-
-    @options.parse %w[--visibility=protected]
-    assert_equal :protected, @options.visibility
-
-    @options.parse %w[--visibility=private]
-    assert_equal :private, @options.visibility
-
-    @options.parse %w[--visibility=nodoc]
-    assert_equal :nodoc, @options.visibility
-  end
-
-  def test_parse_write_options
-    tmpdir = File.join Dir.tmpdir, "test_rdoc_options_#{$$}"
-    FileUtils.mkdir_p tmpdir
-
-    Dir.chdir tmpdir do
-      e = assert_raise SystemExit do
-        @options.parse %w[--write-options]
-        @options.finish
-      end
-
-      assert_equal 0, e.status
-
-      assert File.exist? '.rdoc_options'
-    end
-  ensure
-    FileUtils.rm_rf tmpdir
-  end
-
-  def test_parse_extension_alias
-    out, err = capture_output do
-      @options.parse %w[--extension foobar=rdoc]
-    end
-
-    assert_includes RDoc::Parser.parsers, [/\.foobar$/, RDoc::Parser::Simple]
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_parse_locale_name_default
-    temp_dir do
-      @options.parse %w[]
-      assert_equal 'locale', @options.instance_variable_get(:@locale_dir)
-      assert_nil @options.instance_variable_get(:@locale_name)
-      assert_nil @options.locale
-      @options.finish
-      assert_nil @options.locale
-    end
-  end
-
-  def test_parse_locale_name
-    temp_dir do
-      @options.parse %w[--locale fr]
-      assert_equal 'locale', @options.instance_variable_get(:@locale_dir)
-      assert_equal 'fr', @options.instance_variable_get(:@locale_name)
-      assert_nil @options.locale
-      @options.finish
-      assert_equal 'fr', @options.locale.name
-    end
-  end
-
-  def test_setup_generator
-    test_generator = Class.new do
-      def self.setup_options(op)
-        @op = op
-      end
-
-      def self.op() @op end
-    end
-
-    RDoc::RDoc::GENERATORS['test'] = test_generator
-
-    @options.setup_generator 'test'
-
-    assert_equal test_generator, @options.generator
-    assert_equal [test_generator], @options.generator_options
-
-    assert_equal @options, test_generator.op
-  ensure
-    RDoc::RDoc::GENERATORS.delete 'test'
-  end
-
-  def test_setup_generator_no_option_parser
-    test_generator = Class.new do
-      def self.setup_options(op)
-        op.option_parser.separator nil
-        @op = op
-      end
-
-      def self.op() @op end
-    end
-
-    RDoc::RDoc::GENERATORS['test'] = test_generator
-
-    @options.setup_generator 'test'
-
-    assert_equal test_generator, @options.generator
-    assert_equal [test_generator], @options.generator_options
-
-    assert_equal @options, test_generator.op
-  ensure
-    RDoc::RDoc::GENERATORS.delete 'test'
-  end
-
-  def test_update_output_dir
-    assert @options.update_output_dir
-
-    @options.update_output_dir = false
-
-    refute @options.update_output_dir
-  end
-
-  def test_warn
-    out, err = capture_output do
-      @options.warn "warnings off"
-    end
-
-    assert_empty out
-    assert_empty err
-
-    @options.verbosity = 2
-
-    out, err = verbose_capture_output do
-      @options.warn "warnings on"
-    end
-
-    assert_empty out
-    assert_equal "warnings on\n", err
-  end
-
-  def test_write_options
-    temp_dir do |dir|
-      @options.write_options
-
-      assert File.exist? '.rdoc_options'
-
-      options = File.read('.rdoc_options')
-      options = YAML.safe_load(options, permitted_classes: [Symbol])
-      assert_equal @options, RDoc::Options.new(options)
-    end
-  end
-
-  def test_version
-    out, _ = capture_output do
-      begin
-        @options.parse %w[--version]
-      rescue SystemExit
-      end
-    end
-
-    assert out.include?(RDoc::VERSION)
-
-    out, _ = capture_output do
-      begin
-        @options.parse %w[-v]
-      rescue SystemExit
-      end
-    end
-
-    assert out.include?(RDoc::VERSION)
-  end
-
-  def test_visibility
-    @options.visibility = :all
-    assert_equal :private, @options.visibility
-  end
-
-  def test_load_options
-    temp_dir do
-      options = RDoc::Options.new
-      options.markup = 'tomdoc'
-      options.write_options
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'tomdoc', options.markup
-    end
-  end
-
-  def test_load_options_invalid
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-        io.write "a: !ruby.yaml.org,2002:str |\nfoo"
-      end
-
-      e = assert_raise RDoc::Error do
-        RDoc::Options.load_options
-      end
-
-      options_file = File.expand_path '.rdoc_options'
-      assert_equal "#{options_file} is not a valid rdoc options file", e.message
-    end
-  end
-
-  def test_load_options_empty_file
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-      end
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'rdoc', options.markup
-    end
-  end
-
-  def test_load_options_partial_override
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-        io.puts "markup: Markdown"
-        io.puts "encoding: iso-8859-1"
-        io.puts "static_path: [static]"
-        io.puts "rdoc_include: [.]"
-        io.puts "page_dir: pages"
-      end
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'Markdown', options.markup
-      assert_equal Encoding::ISO_8859_1, options.encoding
-      assert_equal ["static"], options.static_path
-      assert_equal ["."], options.rdoc_include
-      assert_equal "pages", options.page_dir
-    end
-  end
-
-  def test_load_options_no_file
-    temp_dir do
-      options = RDoc::Options.load_options
-
-      assert_kind_of RDoc::Options, options
-    end
-  end
-
-  def test_skip_test_default_value
-    @options.parse %w[]
-    assert_equal true, @options.skip_tests
-  end
-
-  def test_no_skip_test_value
-    @options.parse %w[--no-skipping-tests]
-    assert_equal false, @options.skip_tests
-  end
-
-  def test_apply_default_exclude_option
-    @options.parse %w[]
-    exclude = @options.exclude
-    assert_kind_of Regexp, exclude
-    assert_match exclude, "foo~"
-    assert_match exclude, "foo.orig"
-    assert_match exclude, "foo.rej"
-    assert_match exclude, "foo.bak"
-    assert_match exclude, "foo.gemspec"
-  end
-
-  def test_no_apply_default_exclude_option
-    @options.parse %w[--no-apply-default-exclude]
-    assert_nil @options.exclude
-  end
-
-  def test_exclude_option_without_default
-    @options.parse %w[--no-apply-default-exclude --exclude=\.old\z]
-    exclude = @options.exclude
-    assert_match exclude, "foo.old"
-    assert_not_match exclude, "foo~"
-  end
-
-  class DummyCoder < Hash
-    alias add :[]=
-    def tag=(tag)
-    end
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_parser_c_test.rb b/test/mri/rdoc/rdoc/rdoc_parser_c_test.rb
deleted file mode 100644
index 504e2f8b2ea..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_parser_c_test.rb
+++ /dev/null
@@ -1,2150 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-=begin
-  TODO: test call-seq parsing
-
-/*
- *  call-seq:
- *     ARGF.readlines(sep=$/)     -> array
- *     ARGF.readlines(limit)      -> array
- *     ARGF.readlines(sep, limit) -> array
- *
- *     ARGF.to_a(sep=$/)     -> array
- *     ARGF.to_a(limit)      -> array
- *     ARGF.to_a(sep, limit) -> array
- *
- *  Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
- *  lines, one line per element. Lines are assumed to be separated by _sep_.
- *
- *     lines = ARGF.readlines
- *     lines[0]                #=> "This is line one\n"
- */
-
-assert call-seq did not stop at first empty line
-
-/*
- * call-seq:
- *
- *  flt ** other  ->  float
- *
- * Raises <code>float</code> the <code>other</code> power.
- *
- *    2.0**3      #=> 8.0
- */
-
-assert call-seq correct (bug: was empty)
-
-/* call-seq: flt ** other  ->  float */
-
-assert call-seq correct
-
-=end
-
-class RDocParserCTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @options.verbosity = 2
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_class_can_parse
-    c_parser = RDoc::Parser::C
-
-    temp_dir do
-      FileUtils.touch 'file.C'
-      assert_equal c_parser, c_parser.can_parse('file.C')
-
-      FileUtils.touch 'file.CC'
-      assert_equal c_parser, c_parser.can_parse('file.CC')
-
-      FileUtils.touch 'file.H'
-      assert_equal c_parser, c_parser.can_parse('file.H')
-
-      FileUtils.touch 'file.HH'
-      assert_equal c_parser, c_parser.can_parse('file.HH')
-
-      FileUtils.touch 'file.c'
-      assert_equal c_parser, c_parser.can_parse('file.c')
-
-      FileUtils.touch 'file.cc'
-      assert_equal c_parser, c_parser.can_parse('file.cc')
-
-      FileUtils.touch 'file.cpp'
-      assert_equal c_parser, c_parser.can_parse('file.cpp')
-
-      FileUtils.touch 'file.cxx'
-      assert_equal c_parser, c_parser.can_parse('file.cxx')
-
-      FileUtils.touch 'file.h'
-      assert_equal c_parser, c_parser.can_parse('file.h')
-
-      FileUtils.touch 'file.hh'
-      assert_equal c_parser, c_parser.can_parse('file.hh')
-
-      FileUtils.touch 'file.y'
-      assert_equal c_parser, c_parser.can_parse('file.y')
-    end
-  end
-
-  def test_known_classes
-    RDoc::KNOWN_CLASSES.each do |var, name|
-      case name
-      when "Refinement"
-        next unless defined?(Refinement)
-      when "RubyVM"
-        next unless defined?(RubyVM)
-      when "Bignum", "Fixnum", "Data", "Socket", /\A(?![A-Z])/
-        next
-      end
-      obj = Object.const_get(name)
-      assert_equal obj.name, name
-      case var
-      when /\Arb_c/
-        assert_kind_of Class, obj
-      when /\Arb_m/
-        assert_kind_of Module, obj
-      when /\Arb_e/
-        assert_operator obj, :<=, Exception
-      else
-        raise "unknown prefix: #{var} => #{name}"
-      end
-    end
-  end
-
-  def test_initialize
-    some_ext        = @top_level.add_class RDoc::NormalClass, 'SomeExt'
-                      @top_level.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    @store.cache[:c_class_variables] = {
-      @fn => { 'cSomeExt' => 'SomeExt' }
-    }
-
-    @store.cache[:c_singleton_class_variables] = {
-      @fn => { 'cSomeExtSingle' => 'SomeExtSingle' }
-    }
-
-    parser = RDoc::Parser::C.new @top_level, '', @options, @stats
-
-    expected = { 'cSomeExt' => some_ext }
-    assert_equal expected, parser.classes
-
-    expected = { 'cSomeExtSingle' => 'SomeExtSingle' }
-    assert_equal expected, parser.singleton_classes
-
-    expected = {
-      'cSomeExt'       => 'SomeExt',
-      'cSomeExtSingle' => 'SomeExtSingle',
-    }
-    known_classes = parser.known_classes.delete_if do |key, _|
-      RDoc::KNOWN_CLASSES.keys.include? key
-    end
-
-    assert_equal expected, known_classes
-  end
-
-  def assert_do_attr(flags)
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This is an accessor
-   */
-  #{yield "cBlah", "accessor", flags[1], flags[1]};
-
-  /*
-   * This is a reader
-   */
-  #{yield "cBlah", "reader", flags[1], flags[0]};
-
-  /*
-   * This is a writer
-   */
-  #{yield "cBlah", "writer", flags[0], flags[1]};
-}
-    EOF
-
-    klass = util_get_class content, 'cBlah'
-
-    attrs = klass.attributes
-    assert_equal 3, attrs.length, attrs.inspect
-
-    accessor = attrs.shift
-    assert_equal 'accessor',            accessor.name
-    assert_equal 'RW',                  accessor.rw
-    assert_equal 'This is an accessor', accessor.comment.text
-    assert_equal @top_level,            accessor.file
-
-    reader = attrs.shift
-    assert_equal 'reader',           reader.name
-    assert_equal 'R',                reader.rw
-    assert_equal 'This is a reader', reader.comment.text
-
-    writer = attrs.shift
-    assert_equal 'writer',           writer.name
-    assert_equal 'W',                writer.rw
-    assert_equal 'This is a writer', writer.comment.text
-  end
-
-  {
-    num: %w[0 1],
-    macro: %w[FALSE TRUE],
-    ruby: %w[Qfalse Qtrue],
-    bool: %w[false true],
-  }.each_pair do |name, values|
-    define_method("test_do_attr:rb_attr:intern:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_attr(#{c}, rb_intern("#{name}"), #{r}, #{w}, Qfalse)]}
-    end
-    define_method("test_do_attr:rb_attr:intern_const:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_attr(#{c}, rb_intern_const("#{name}"), #{r}, #{w}, Qfalse)]}
-    end
-    define_method("test_do_attr:rb_define_attr:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_define_attr(#{c}, "#{name}", #{r}, #{w})]}
-    end
-  end
-
-  def test_do_aliases
-    content = <<-EOF
-/*
- * This should show up as an alias with documentation
- */
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1);
-
-  rb_define_alias(cDate, "bleh", "blah");
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-    assert_equal 2,      methods.length
-    assert_equal 'bleh', methods.last.name
-    assert_equal 'blah', methods.last.is_alias_for.name
-
-    assert_equal @top_level, methods.last.is_alias_for.file
-    assert_equal @top_level, methods.last.file
-  end
-
-  def test_do_aliases_singleton
-    content = <<-EOF
-/*
- * This should show up as a method with documentation
- */
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-
-  rb_define_method(sDate, "blah", blah, 1);
-
-  /*
-   * This should show up as an alias
-   */
-  rb_define_alias(sDate, "bleh", "blah");
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-
-    assert_equal 2,      methods.length
-    assert_equal 'bleh', methods.last.name
-    assert               methods.last.singleton
-    assert_equal 'blah', methods.last.is_alias_for.name
-    assert_equal 'This should show up as an alias', methods.last.comment.text
-  end
-
-  def test_do_aliases_missing_class
-    content = <<-EOF
-void Init_Blah(void) {
-  rb_define_alias(cDate, "b", "a");
-}
-    EOF
-
-    _, err = verbose_capture_output do
-      refute util_get_class(content, 'cDate')
-    end
-
-    assert_equal "Enclosing class or module \"cDate\" for alias b a is not known\n",
-                 err
-  end
-
-  def test_do_classes_class
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-  end
-
-  def test_do_classes_duplicate_class
-    content = <<-EOF
-/* Document-class: Foo
- * first
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-/* Document-class: Foo
- * second
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 1, klass.comment_location.size
-    first = klass.comment_location.first
-    first_comment = first[0]
-    assert_equal 'first', first_comment.text
-  end
-
-  def test_do_classes_struct
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_struct_define(
-        "Foo",
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-
-    attributes = klass.attributes
-    assert_equal 3, attributes.size, -> {attributes}
-    ["some", "various", "fields"].zip(attributes) do |name, attr|
-      assert_equal RDoc::Attr.new("", name, "RW", ""), attr
-    end
-  end
-
-  def test_do_classes_struct_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_struct_define_under(
-        rb_mKernel, "Foo",
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-
-    attributes = klass.attributes
-    assert_equal 3, attributes.size, -> {attributes}
-    ["some", "various", "fields"].zip(attributes) do |name, attr|
-      assert_equal RDoc::Attr.new("", name, "RW", ""), attr
-    end
-  end
-
-  def test_do_classes_struct_without_accessor
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_struct_define_without_accessor(
-        "Foo", rb_cObject, foo_alloc,
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-    assert_empty klass.attributes
-  end
-
-  def test_do_classes_struct_without_accessor_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_struct_define_without_accessor_under(
-        rb_mKernel, "Foo", rb_cObject, foo_alloc,
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-    assert_empty klass.attributes
-  end
-
-  def test_do_classes_class_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-  end
-
-  def test_do_classes_class_under_rb_path2class
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is Kernel::Foo < A::B
- */
-VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_path2class("A::B"));
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal 'A::B', klass.superclass
-    assert_equal 'this is Kernel::Foo < A::B', klass.comment.text
-  end
-
-  def test_do_classes_singleton
-    content = <<-EOF
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-VALUE cFooS = rb_singleton_class(cFoo);
-    EOF
-
-    util_get_class content, 'cFooS'
-
-    assert_equal 'Foo', @parser.singleton_classes['cFooS']
-  end
-
-  def test_do_classes_module
-    content = <<-EOF
-/* Document-module: Foo
- * this is the Foo module
- */
-VALUE mFoo = rb_define_module("Foo");
-    EOF
-
-    klass = util_get_class content, 'mFoo'
-    assert_equal "this is the Foo module", klass.comment.text
-  end
-
-  def test_do_classes_module_under
-    content = <<-EOF
-/* Document-module: Kernel::Foo
- * this is the Foo module under Kernel
- */
-VALUE mFoo = rb_define_module_under(rb_mKernel, "Foo");
-    EOF
-
-    klass = util_get_class content, 'mFoo'
-    assert_equal "this is the Foo module under Kernel", klass.comment.text
-  end
-
-  def test_do_constants
-    content = <<-'EOF'
-#include <ruby.h>
-
-void Init_foo(){
-   VALUE cFoo = rb_define_class("Foo", rb_cObject);
-
-   /* 300: The highest possible score in bowling */
-   rb_define_const(cFoo, "PERFECT", INT2FIX(300));
-
-   /* Huzzah!: What you cheer when you roll a perfect game */
-   rb_define_const(cFoo, "CHEER", rb_str_new2("Huzzah!"));
-
-   /* TEST\:TEST: Checking to see if escaped colon works */
-   rb_define_const(cFoo, "TEST", rb_str_new2("TEST:TEST"));
-
-   /* TEST: TEST:Checking to see if only word-ending colon works */
-   rb_define_const(cFoo, "TEST2", rb_str_new2("TEST:TEST"));
-
-   /* \\: The file separator on MS Windows */
-   rb_define_const(cFoo, "MSEPARATOR", rb_str_new2("\\"));
-
-   /* /: The file separator on Unix */
-   rb_define_const(cFoo, "SEPARATOR", rb_str_new2("/"));
-
-   /* C:\\Program Files\\Stuff: A directory on MS Windows */
-   rb_define_const(cFoo, "STUFF", rb_str_new2("C:\\Program Files\\Stuff"));
-
-   /* Default definition */
-   rb_define_const(cFoo, "NOSEMI", INT2FIX(99));
-
-   rb_define_const(cFoo, "NOCOMMENT", rb_str_new2("No comment"));
-
-   /*
-    * Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE", INT2FIX(1));
-
-   /*
-    * 1: Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE_VALUE", INT2FIX(1));
-
-   /* Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE_NOT_EMPTY", INT2FIX(1));
-
-   /*
-    * Multiline comment goes here because this comment spans multiple lines.
-    * 1: However, the value extraction should only happen for the first line
-    */
-   rb_define_const(cFoo, "MULTILINE_COLON_ON_SECOND_LINE", INT2FIX(1));
-
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['cFoo']
-    assert klass
-
-    constants = klass.constants
-    assert !klass.constants.empty?
-
-    assert_equal @top_level, constants.first.file
-
-    constants = constants.map { |c| [c.name, c.value, c.comment.text] }
-
-    assert_equal ['PERFECT', '300', 'The highest possible score in bowling   '],
-                 constants.shift
-    assert_equal ['CHEER', 'Huzzah!',
-                  'What you cheer when you roll a perfect game   '],
-                 constants.shift
-    assert_equal ['TEST', 'TEST:TEST',
-                  'Checking to see if escaped colon works   '],
-                 constants.shift
-    assert_equal ['TEST2', 'TEST',
-                  'TEST:Checking to see if only word-ending colon works   '],
-                 constants.shift
-    assert_equal ['MSEPARATOR', '\\',
-                  'The file separator on MS Windows   '],
-                 constants.shift
-    assert_equal ['SEPARATOR', '/',
-                  'The file separator on Unix   '],
-                 constants.shift
-    assert_equal ['STUFF', 'C:\\Program Files\\Stuff',
-                  'A directory on MS Windows   '],
-                 constants.shift
-    assert_equal ['NOSEMI', 'INT2FIX(99)',
-                  'Default definition   '],
-                 constants.shift
-    assert_equal ['NOCOMMENT', 'rb_str_new2("No comment")', ''],
-                 constants.shift
-
-    comment = <<-EOF.chomp
-Multiline comment goes here because this comment spans multiple lines.
-Multiline comment goes here because this comment spans multiple lines.
-    EOF
-    assert_equal ['MULTILINE',           'INT2FIX(1)', comment], constants.shift
-    assert_equal ['MULTILINE_VALUE',     '1',          comment], constants.shift
-    assert_equal ['MULTILINE_NOT_EMPTY', 'INT2FIX(1)', comment], constants.shift
-
-    comment = <<-EOF.chomp
-Multiline comment goes here because this comment spans multiple lines.
-1: However, the value extraction should only happen for the first line
-    EOF
-    assert_equal ['MULTILINE_COLON_ON_SECOND_LINE', 'INT2FIX(1)', comment],
-                 constants.shift
-
-    assert constants.empty?, constants.inspect
-  end
-
-  def test_do_constants_global
-    content = <<-'EOF'
-#include <ruby.h>
-
-void Init_foo(){
-
-   /* Toplevel const */
-   rb_define_global_const("ANSWER", INT2FIX(42));
-
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['rb_cObject']
-    assert klass
-
-    constants = klass.constants
-    assert !klass.constants.empty?
-
-    assert_equal @top_level, constants.first.file
-
-    constants = constants.map { |c| [c.name, c.value, c.comment.text] }
-    assert_equal ['ANSWER', 'INT2FIX(42)', "Toplevel const   "],
-                 constants.shift
-
-    assert constants.empty?, constants.inspect
-  end
-
-  def test_do_constants_curses
-    content = <<-EOF
-void Init_curses(){
-  mCurses = rb_define_module("Curses");
-
-  /*
-   * Value of the color black
-   */
-  rb_curses_define_const(COLOR_BLACK);
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['mCurses']
-
-    constants = klass.constants
-    refute_empty klass.constants
-
-    assert_equal 'COLOR_BLACK', constants.first.name
-    assert_equal 'UINT2NUM(COLOR_BLACK)', constants.first.value
-    assert_equal 'Value of the color black', constants.first.comment.text
-  end
-
-  def test_do_constants_file
-    content = <<-EOF
-void Init_File(void) {
-  /*
-   *  Shared lock
-   */
-  rb_file_const("LOCK_SH", INT2FIX(LOCK_SH));
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['rb_mFConst']
-
-    constants = klass.constants
-    refute_empty klass.constants
-
-    constant = constants.first
-
-    assert_equal 'LOCK_SH',          constant.name
-    assert_equal 'INT2FIX(LOCK_SH)', constant.value
-    assert_equal 'Shared lock',      constant.comment.text
-
-    @parser = util_parser <<-EOF
-void Init_File(void) {
-  rb_cFile = rb_define_class("File", rb_cIO);
-  rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
-}
-    EOF
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    assert_equal 'File::Constants',  klass.full_name
-  end
-
-  def test_do_includes
-    content = <<-EOF
-Init_foo() {
-   VALUE cFoo = rb_define_class("Foo", rb_cObject);
-   VALUE mInc = rb_define_module("Inc");
-
-   rb_include_module(cFoo, mInc);
-}
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-
-    incl = klass.includes.first
-    assert_equal 'Inc',      incl.name
-    assert_equal '',         incl.comment.text
-    assert_equal @top_level, incl.file
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_c
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.c */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.c ', err
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_cpp
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.cpp */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.cpp ', err
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_y
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.y */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.y ', err
-  end
-
-  def test_do_methods_singleton_class
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-
-  rb_define_method(sDate, "blah", blah, 1);
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-    assert_equal 1,      methods.length
-    assert_equal 'blah', methods.first.name
-    assert               methods.first.singleton
-  end
-
-  def test_do_missing
-    parser = util_parser
-
-    klass_a = @top_level.add_class RDoc::ClassModule, 'A'
-    parser.classes['a'] = klass_a
-
-    parser.enclosure_dependencies['c'] << 'b'
-    parser.enclosure_dependencies['b'] << 'a'
-    parser.enclosure_dependencies['d'] << 'a'
-
-    parser.missing_dependencies['d'] = ['d', :class, 'D', 'Object', 'a']
-    parser.missing_dependencies['c'] = ['c', :class, 'C', 'Object', 'b']
-    parser.missing_dependencies['b'] = ['b', :class, 'B', 'Object', 'a']
-
-    parser.do_missing
-
-    assert_equal %w[A A::B A::B::C A::D],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_do_missing_cycle
-    parser = util_parser
-
-    klass_a = @top_level.add_class RDoc::ClassModule, 'A'
-    parser.classes['a'] = klass_a
-
-    parser.enclosure_dependencies['c'] << 'b'
-    parser.enclosure_dependencies['b'] << 'a'
-
-    parser.missing_dependencies['c'] = ['c', :class, 'C', 'Object', 'b']
-    parser.missing_dependencies['b'] = ['b', :class, 'B', 'Object', 'a']
-
-    parser.enclosure_dependencies['y'] << 'z'
-    parser.enclosure_dependencies['z'] << 'y'
-
-    parser.missing_dependencies['y'] = ['y', :class, 'Y', 'Object', 'z']
-    parser.missing_dependencies['z'] = ['z', :class, 'Z', 'Object', 'y']
-
-    _, err = verbose_capture_output do
-      parser.do_missing
-    end
-
-    expected = 'Unable to create class Y (y), class Z (z) ' +
-               'due to a cyclic class or module creation'
-
-    assert_equal expected, err.chomp
-
-    assert_equal %w[A A::B A::B::C],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_find_alias_comment
-    parser = util_parser
-
-    comment = parser.find_alias_comment 'C', '[]', 'index'
-
-    assert_equal '', comment.text
-
-    parser = util_parser <<-C
-/*
- * comment
- */
-
-rb_define_alias(C, "[]", "index");
-    C
-
-    comment = parser.find_alias_comment 'C', '[]', 'index'
-
-    assert_equal "/*\n * comment\n */\n\n", comment.text
-  end
-
-  def test_find_attr_comment_document_attr
-    parser= util_parser <<-C
-/*
- * Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/*\n * \n * comment\n */", comment.text
-  end
-
-  def test_find_attr_comment_document_attr_oneline
-    parser= util_parser <<-C
-/* Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/* \n * comment\n */", comment.text
-  end
-
-  def test_find_attr_comment_document_attr_overlap
-    parser= util_parser <<-C
-/* Document-attr: x
- * comment
- */
-
-/* Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/* \n * comment\n */", comment.text
-  end
-
-  def test_find_class_comment
-    @options.rdoc_include << File.dirname(__FILE__)
-
-    content = <<-EOF
-/*
- * Comment 1
- */
-foo = rb_define_class("MyClassName1", rb_cObject);
-
-/*
- * Comment 2
- */
-bar = rb_define_class("MyClassName2", rb_cObject);
-    EOF
-
-    util_get_class content
-
-    assert_equal "Comment 1", @parser.classes['foo'].comment.text
-    assert_equal "Comment 2", @parser.classes['bar'].comment.text
-  end
-
-  def test_find_class_comment_init
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-void
-Init_Foo(void) {
-  VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-
-  def test_find_class_comment_initvm
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-void
-InitVM_Foo(void) {
-  VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-VALUE foo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_Init_Foo
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo on Init", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_Init_Foo_no_void
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo() {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo on Init", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_bogus_comment
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-void
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal '', klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_under
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-VALUE foo = rb_define_class_under(rb_cObject, "Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_under_Init
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class_under(rb_cObject, "Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    # the inner comment is used since Object::Foo is not necessarily the same
-    # thing as "Foo" for Init_
-    assert_equal "a comment for class Foo on rb_define_class",
-                 klass.comment.text
-  end
-
-  def test_find_const_comment_rb_define
-    content = <<-EOF
-/*
- * A comment
- */
-rb_define_const(cFoo, "CONST", value);
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment 'const', 'CONST'
-
-    assert_equal "/*\n * A comment\n */\n", comment.text
-  end
-
-  def test_find_const_comment_rb_define_global
-    content = <<-EOF
-/*
- * A comment
- */
-rb_define_global_const("CONST", value);
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment 'const', 'CONST'
-
-    assert_equal "/*\n * A comment\n */\n", comment.text
-  end
-
-  def test_find_const_comment_document_const
-    content = <<-EOF
-/*
- * Document-const: CONST
- *
- * A comment
- */
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment nil, 'CONST'
-
-    assert_equal "/*\n *\n * A comment\n */", comment.text
-  end
-
-  def test_find_const_comment_document_const_full_name
-    content = <<-EOF
-/*
- * Document-const: Foo::CONST
- *
- * A comment
- */
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment nil, 'CONST', 'Foo'
-
-    assert_equal "/*\n *\n * A comment\n */", comment.text
-  end
-
-  def test_find_body
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_body_2
-    content = <<-CONTENT
-/* Copyright (C) 2010  Sven Herzberg
- *
- * This file is free software; the author(s) gives unlimited
- * permission to copy and/or distribute it, with or without
- * modifications, as long as this notice is preserved.
- */
-
-#include <ruby.h>
-
-static VALUE
-wrap_initialize (VALUE  self)
-{
-  return self;
-}
-
-/* */
-static VALUE
-wrap_shift (VALUE self,
-            VALUE arg)
-{
-  return self;
-}
-
-void
-init_gi_repository (void)
-{
-  VALUE mTest = rb_define_module ("Test");
-  VALUE cTest = rb_define_class_under (mTest, "Test", rb_cObject);
-
-  rb_define_method (cTest, "initialize", wrap_initialize, 0);
-  rb_define_method (cTest, "shift", wrap_shift, 0);
-}
-    CONTENT
-
-    klass = util_get_class content, 'cTest'
-    assert_equal 2, klass.method_list.length
-  end
-
-  def test_find_body_cast
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", (METHOD)other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_body_define
-    content = <<-EOF
-#define something something_else
-
-#define other_function rb_other_function
-
-/*
- * a comment for rb_other_function
- */
-VALUE
-rb_other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal 'a comment for rb_other_function', other_function.comment.text
-    assert_equal '()', other_function.params
-    assert_equal 8, other_function.line
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nrb_other_function() {\n}", code
-  end
-
-  def test_find_body_define_comment
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-#define other_function rb_other_function
-
-/* */
-VALUE
-rb_other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal 'a comment for other_function', other_function.comment.text
-    assert_equal '()', other_function.params
-    assert_equal 4, other_function.line
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "#define other_function rb_other_function", code
-  end
-
-  def test_find_body_document_method
-    content = <<-EOF
-/*
- * Document-method: bar
- * Document-method: baz
- *
- * a comment for bar
- */
-VALUE
-bar() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "bar", bar, 0);
-    rb_define_method(foo, "baz", bar, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    assert_equal 2, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    bar = methods.first
-    assert_equal 'Foo#bar', bar.full_name
-    assert_equal "a comment for bar", bar.comment.text
-
-    baz = methods.last
-    assert_equal 'Foo#baz', baz.full_name
-    assert_equal "a comment for bar", baz.comment.text
-  end
-
-  def test_find_body_document_method_equals
-    content = <<-EOF
-/*
- * Document-method: Zlib::GzipFile#mtime=
- *
- * A comment
- */
-static VALUE
-rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
-{
-
-void
-Init_zlib() {
-    mZlib = rb_define_module("Zlib");
-    cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
-    cGzipWriter = rb_define_class_under(mZlib, "GzipWriter", cGzipFile);
-    rb_define_method(cGzipWriter, "mtime=", rb_gzfile_set_mtime, 1);
-}
-    EOF
-
-    klass = util_get_class content, 'cGzipWriter'
-    assert_equal 1, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    bar = methods.first
-    assert_equal 'Zlib::GzipWriter#mtime=', bar.full_name
-    assert_equal 'A comment', bar.comment.text
-  end
-
-  def test_find_body_document_method_same
-    content = <<-EOF
-VALUE
-s_bar() {
-}
-
-VALUE
-bar() {
-}
-
-/*
- * Document-method: Foo::bar
- *
- * a comment for Foo::bar
- */
-
-/*
- * Document-method: Foo#bar
- *
- * a comment for Foo#bar
- */
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_singleton_method(foo, "bar", s_bar, 0);
-    rb_define_method(foo, "bar", bar, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    assert_equal 2, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    s_bar = methods.first
-    assert_equal 'Foo::bar', s_bar.full_name
-    assert_equal "a comment for Foo::bar", s_bar.comment.text
-
-    bar = methods.last
-    assert_equal 'Foo#bar', bar.full_name
-    assert_equal "a comment for Foo#bar", bar.comment.text
-  end
-
-  def test_find_body_macro
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-DLL_LOCAL VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "DLL_LOCAL VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_body_static_inline
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-static inline VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "static inline VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_modifiers_call_seq
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-
-If no arguments are given:
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-
-    CALL_SEQ
-
-    assert_equal expected, method_obj.call_seq
-  end
-
-  def test_find_modifiers_nodoc
-    comment = RDoc::Comment.new <<-COMMENT
-/* :nodoc:
- *
- * Blah
- */
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    assert_nil method_obj.document_self
-  end
-
-  def test_find_modifiers_yields
-    comment = RDoc::Comment.new <<-COMMENT, @top_level, :c
-/* :yields: a, b
- *
- * Blah
- */
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    assert_equal 'a, b', method_obj.block_params
-
-    assert_equal "\n\nBlah", comment.text
-  end
-
-  def test_handle_method_args_minus_1
-    parser = util_parser "Document-method: Object#m\n blah */"
-
-    parser.content = <<-BODY
-VALUE
-rb_other(VALUE obj) {
-  rb_funcall(obj, rb_intern("other"), 0);
-  return rb_str_new2("blah, blah, blah");
-}
-
-VALUE
-rb_m(int argc, VALUE *argv, VALUE obj) {
-  VALUE o1, o2;
-  rb_scan_args(argc, argv, "1", &o1, &o2);
-}
-    BODY
-
-    parser.handle_method 'method', 'rb_cObject', 'm', 'rb_m', -1
-
-    m = @top_level.find_module_named('Object').method_list.first
-
-    assert_equal 'm', m.name
-    assert_equal @top_level, m.file
-    assert_equal 7, m.line
-
-    assert_equal '(p1)', m.params
-  end
-
-  def test_handle_method_args_0
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 0
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '()', equals2.params
-  end
-
-  def test_handle_method_args_1
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 1
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(p1)', equals2.params
-  end
-
-  def test_handle_method_args_2
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 2
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(p1, p2)', equals2.params
-  end
-
-  # test_handle_args_minus_1 handled by test_handle_method
-
-  def test_handle_method_args_minus_2
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', -2
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(*args)', equals2.params
-  end
-
-  def test_handle_method_initialize
-    parser = util_parser "Document-method: BasicObject::new\n blah */"
-
-    parser.handle_method('private_method', 'rb_cBasicObject',
-                         'initialize', 'rb_obj_dummy', -1)
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    new = bo.method_list.first
-
-    assert_equal 'new',   new.name
-    assert_equal :public, new.visibility
-  end
-
-  def test_handle_singleton
-    parser = util_parser <<-SINGLE
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-}
-    SINGLE
-
-    parser.scan
-
-    assert_equal 'Date', parser.known_classes['sDate']
-    assert_equal 'Date', parser.singleton_classes['sDate']
-  end
-
-  def test_look_for_directives_in
-    parser = util_parser
-
-    comment = RDoc::Comment.new "# :other: not_handled\n"
-
-    parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :other: not_handled\n", comment.text
-    assert_equal 'not_handled', @top_level.metadata['other']
-  end
-
-  def test_load_variable_map
-    some_ext = @top_level.add_class RDoc::NormalClass, 'SomeExt'
-               @top_level.add_class RDoc::NormalClass, 'OtherExt'
-
-    @store.cache[:c_class_variables][@fn]       = { 'cSomeExt'  => 'SomeExt'  }
-    @store.cache[:c_class_variables]['other.c'] = { 'cOtherExt' => 'OtherExt' }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    expected = { 'cSomeExt' => some_ext }
-
-    assert_equal expected, map
-
-    assert_equal 'SomeExt', parser.known_classes['cSomeExt']
-    assert_nil              parser.known_classes['cOtherExt']
-  end
-
-  def test_load_variable_map_empty
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    assert_empty map
-  end
-
-  def test_load_variable_map_legacy
-    @store.cache[:c_class_variables] = nil
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    assert_empty map
-  end
-
-  def test_load_variable_map_singleton
-    @top_level.add_class RDoc::NormalClass, 'SomeExt'
-    @top_level.add_class RDoc::NormalClass, 'OtherExt'
-
-    @store.cache[:c_singleton_class_variables][@fn] =
-      { 'cSomeExt'  => 'SomeExt'  }
-    @store.cache[:c_singleton_class_variables]['other.c'] =
-      { 'cOtherExt' => 'OtherExt' }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_singleton_class_variables
-
-    expected = { 'cSomeExt' => 'SomeExt' }
-
-    assert_equal expected, map
-
-    assert_equal 'SomeExt', parser.known_classes['cSomeExt']
-    assert_nil              parser.known_classes['cOtherExt']
-  end
-
-  def test_load_variable_map_trim
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-
-    @store.cache[:c_class_variables][@fn] = {
-      'cA'  => 'A',
-      'cB'  => 'B',
-    }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    expected = { 'cA' => a }
-
-    assert_equal expected, map
-  end
-
-  def test_define_method
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-    assert_nil read_method.section.title
-  end
-
-  def test_define_method_with_category
-    content = <<-EOF
-/* :category: Awesome Methods
-   Method Comment!
- */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!", read_method.comment.text.strip
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-    assert_equal "Awesome Methods", read_method.section.title
-  end
-
-  def test_define_method_dynamically
-    content = <<-EOF
-void
-Init_foo(void)
-{
-    rb_define_singleton_method(obj, "foo", foo, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'obj'
-    assert_nil klass
-  end
-
-  def test_define_method_with_prototype
-    content = <<-EOF
-static VALUE rb_io_s_read(int, VALUE*, VALUE);
-
-/* Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-  end
-
-  def test_define_method_private
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_private_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal 'IO#read', read_method.full_name
-    assert_equal :private, read_method.visibility
-    assert_equal "Method Comment!   ", read_method.comment.text
-  end
-
-  def test_define_method_private_singleton
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    VALUE rb_cIO_s = rb_singleton_class(rb_cIO);
-    rb_define_private_method(rb_cIO_s, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal :private, read_method.visibility
-    assert read_method.singleton
-  end
-
-  def test_define_method_singleton
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    VALUE rb_cIO_s = rb_singleton_class(rb_cIO);
-    rb_define_method(rb_cIO_s, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert read_method.singleton
-  end
-
-  def test_rb_scan_args
-    parser = util_parser
-
-    assert_equal '(p1)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1",)')
-    assert_equal '(p1, p2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "2",)')
-
-    assert_equal '(p1 = v1)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "01",)')
-    assert_equal '(p1 = v1, p2 = v2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "02",)')
-
-    assert_equal '(p1, p2 = v2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11",)')
-
-    assert_equal '(p1, *args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1*",)')
-    assert_equal '(p1, p2 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1:",)')
-    assert_equal '(p1, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1&",)')
-
-    assert_equal '(p1, p2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "101",)')
-
-    assert_equal '(p1, p2 = v2, p3)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "111",)')
-
-    assert_equal '(p1, *args, p3)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1*1",)')
-
-    assert_equal '(p1, p2 = v2, *args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11*",)')
-    assert_equal '(p1, p2 = v2, p3 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11:",)')
-    assert_equal '(p1, p2 = v2, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11&",)')
-
-    assert_equal '(p1, p2 = v2, *args, p4, p5 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11*1:&",)')
-
-    # The following aren't valid according to spec but are according to the
-    # implementation.
-    assert_equal '(*args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*",)')
-    assert_equal '(p1 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, ":",)')
-    assert_equal '(&block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "&",)')
-
-    assert_equal '(*args, p2 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*:",)')
-    assert_equal '(p1 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, ":&",)')
-    assert_equal '(*args, p2 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*:&",)')
-  end
-
-  def test_scan
-    parser = util_parser <<-C
-void Init(void) {
-    mM = rb_define_module("M");
-    cC = rb_define_class("C", rb_cObject);
-    sC = rb_singleton_class(cC);
-}
-    C
-
-    parser.scan
-
-    expected = {
-      @fn => {
-        'mM' => 'M',
-        'cC' => 'C', }}
-    assert_equal expected, @store.c_class_variables
-
-    expected = {
-      @fn => {
-        'sC' => 'C' } }
-    assert_equal expected, @store.c_singleton_class_variables
-  end
-
-  def test_scan_method_copy
-    parser = util_parser <<-C
-/*
- *  call-seq:
- *    pathname.to_s    -> string
- *    pathname.to_path -> string
- *
- *  Return the path as a String.
- *
- *  to_path is implemented so Pathname objects are usable with File.open, etc.
- */
-static VALUE
-path_to_s(VALUE self) { }
-
-/*
- *  call-seq:
- *     str[index]               -> new_str or nil
- *     str[start, length]       -> new_str or nil
- *     str.slice(index)         -> new_str or nil
- *     str.slice(start, length) -> new_str or nil
- */
-static VALUE
-path_aref_m(int argc, VALUE *argv, VALUE str) { }
-
-/*
- *  call-seq:
- *     string <=> other_string   -> -1, 0, +1 or nil
- */
-static VALUE
-path_cmp_m(VALUE str1, VALUE str2) { }
-
-/*
- *  call-seq:
- *     str == obj    -> true or false
- *     str === obj   -> true or false
- */
-VALUE
-rb_str_equal(VALUE str1, VALUE str2) { }
-
-Init_pathname()
-{
-    rb_cPathname = rb_define_class("Pathname", rb_cObject);
-
-    rb_define_method(rb_cPathname, "to_s",    path_to_s, 0);
-    rb_define_method(rb_cPathname, "to_path", path_to_s, 0);
-    rb_define_method(rb_cPathname, "[]",      path_aref_m, -1);
-    rb_define_method(rb_cPathname, "slice",   path_aref_m, -1);
-    rb_define_method(rb_cPathname, "<=>",     path_cmp_m, 1);
-    rb_define_method(rb_cPathname, "==",      rb_str_equal), 2);
-    rb_define_method(rb_cPathname, "===",     rb_str_equal), 2);
-}
-    C
-
-    parser.scan
-
-    pathname = @store.classes_hash['Pathname']
-
-    to_path = pathname.method_list.find { |m| m.name == 'to_path' }
-    assert_equal "pathname.to_path -> string", to_path.call_seq
-
-    to_s = pathname.method_list.find { |m| m.name == 'to_s' }
-    assert_equal "pathname.to_s    -> string", to_s.call_seq
-
-    index_expected = <<-EXPECTED.chomp
-str[index]               -> new_str or nil
-str[start, length]       -> new_str or nil
-    EXPECTED
-
-    index = pathname.method_list.find { |m| m.name == '[]' }
-    assert_equal index_expected, index.call_seq, '[]'
-
-    slice_expected = <<-EXPECTED.chomp
-str.slice(index)         -> new_str or nil
-str.slice(start, length) -> new_str or nil
-    EXPECTED
-
-    slice = pathname.method_list.find { |m| m.name == 'slice' }
-    assert_equal slice_expected, slice.call_seq
-
-    spaceship = pathname.method_list.find { |m| m.name == '<=>' }
-    assert_equal "string <=> other_string   -> -1, 0, +1 or nil",
-                 spaceship.call_seq
-
-    equals2 = pathname.method_list.find { |m| m.name == '==' }
-    assert_match 'str == obj', equals2.call_seq
-
-    equals3 = pathname.method_list.find { |m| m.name == '===' }
-    assert_match 'str === obj', equals3.call_seq
-  end
-
-  def test_scan_order_dependent
-    parser = util_parser <<-C
-void a(void) {
-    mA = rb_define_module("A");
-}
-
-void b(void) {
-    cB = rb_define_class_under(mA, "B", rb_cObject);
-}
-
-void c(void) {
-    mC = rb_define_module_under(cB, "C");
-}
-
-void d(void) {
-    mD = rb_define_class_under(mC, "D");
-}
-    C
-
-    parser.scan
-
-    assert_equal %w[A A::B A::B::C],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_markup_format_default
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This should be interpreted in the default format.
-   */
-  rb_attr(cBlah, rb_intern("default_format"), 1, 1, Qfalse);
-}
-    EOF
-
-    klass = util_get_class content, 'cBlah'
-    assert_equal("rdoc", klass.attributes.find {|a| a.name == "default_format"}.comment.format)
-  end
-
-  def test_markup_format_override
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This should be interpreted in the default format.
-   */
-  rb_attr(cBlah, rb_intern("default_format"), 1, 1, Qfalse);
-}
-    EOF
-
-    @options.markup = "markdown"
-    klass = util_get_class content, 'cBlah'
-    assert_equal("markdown", klass.attributes.find {|a| a.name == "default_format"}.comment.format)
-  end
-
-  def util_get_class(content, name = nil)
-    @parser = util_parser content
-    @parser.scan
-
-    @parser.classes[name] if name
-  end
-
-  def util_parser(content = '')
-    RDoc::Parser::C.new @top_level, content, @options, @stats
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_parser_changelog_test.rb b/test/mri/rdoc/rdoc/rdoc_parser_changelog_test.rb
deleted file mode 100644
index 4557eacae1f..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_parser_changelog_test.rb
+++ /dev/null
@@ -1,483 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocParserChangeLogTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile  = Tempfile.new 'ChangeLog'
-    @top_level = @store.add_file @tempfile.path
-    @options   = RDoc::Options.new
-    @stats     = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    @tempfile.close!
-
-    super
-  end
-
-  def test_class_can_parse
-    parser = RDoc::Parser::ChangeLog
-
-    temp_dir do
-      FileUtils.touch 'ChangeLog'
-      assert_equal parser, parser.can_parse('ChangeLog')
-
-      assert_equal parser, parser.can_parse(@tempfile.path)
-
-      FileUtils.touch 'ChangeLog.rb'
-      assert_equal RDoc::Parser::Ruby, parser.can_parse('ChangeLog.rb')
-    end
-  end
-
-  def test_continue_entry_body
-    parser = util_parser
-
-    entry_body = ['a'.dup]
-
-    parser.continue_entry_body entry_body, 'b'
-
-    assert_equal ['a b'], entry_body
-  end
-
-  def test_continue_entry_body_empty
-    parser = util_parser
-
-    entry_body = []
-
-    parser.continue_entry_body entry_body, ''
-
-    assert_empty entry_body
-  end
-
-  def test_continue_entry_body_function
-    parser = util_parser
-
-    entry_body = ['file: (func1)'.dup]
-
-    parser.continue_entry_body entry_body, '(func2): blah'
-
-    assert_equal ['file: (func1, func2): blah'], entry_body
-  end
-
-  def test_create_document
-    parser = util_parser
-
-    groups = {
-      '2012-12-04' => [
-        ['Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[a:one b:two]],
-        ['Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[c:three d:four]]],
-      '2012-12-03' => [
-        ['Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-          %w[e:five f:six]]],
-    }
-
-    expected =
-      doc(
-        head(1, File.basename(@tempfile.path)),
-        blank_line,
-        head(2, '2012-12-04'),
-        blank_line,
-        head(3, 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>'),
-        blank_line,
-        list(:NOTE, item('a', para('one')), item('b', para('two'))),
-        head(3, 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>'),
-        blank_line,
-        list(:NOTE, item('c', para('three')), item('d', para('four'))),
-        head(2, '2012-12-03'),
-        blank_line,
-        head(3, 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>'),
-        blank_line,
-        list(:NOTE, item('e', para('five')), item('f', para('six'))))
-
-    expected.file = @top_level
-
-    document = parser.create_document(groups)
-
-    assert_equal expected, document
-
-    assert_equal 2, document.omit_headings_below
-
-    headings = document.parts.select do |part|
-      RDoc::Markup::Heading === part and part.level == 2
-    end
-
-    refute headings.all? { |heading| heading.text.frozen? }
-  end
-
-  def test_create_entries
-    parser = util_parser
-
-    entries = [
-      ['Tue Dec  1 02:03:04 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[a:one b:two]],
-      ['Tue Dec  5 06:07:08 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[c:three d:four]],
-    ]
-
-    expected = [
-      head(3, 'Tue Dec  1 02:03:04 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE, item('a', para('one')), item('b', para('two'))),
-      head(3, 'Tue Dec  5 06:07:08 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE, item('c', para('three')), item('d', para('four'))),
-    ]
-
-    entries = parser.create_entries(entries)
-    assert_equal expected, entries
-  end
-
-  def test_create_entries_colons
-    parser = util_parser
-
-    entries = [
-      ['Wed Dec  5 12:17:11 2012  Naohisa Goto  <ngotogenome@gmail.com>',
-        ['func.rb (DL::Function#bind): log stuff [ruby-core:50562]']],
-    ]
-
-    expected = [
-      head(3,
-           'Wed Dec  5 12:17:11 2012  Naohisa Goto  <ngotogenome@gmail.com>'),
-      blank_line,
-      list(:NOTE,
-           item('func.rb (DL::Function#bind)',
-                para('log stuff [ruby-core:50562]')))]
-
-    assert_equal expected, parser.create_entries(entries)
-  end
-
-  def test_create_items
-    parser = util_parser
-
-    items = [
-	    'README.EXT:  Converted to RDoc format',
-	    'README.EXT.ja:  ditto',
-    ]
-
-    expected =
-      list(:NOTE,
-        item('README.EXT',
-          para('Converted to RDoc format')),
-        item('README.EXT.ja',
-          para('ditto')))
-
-    assert_equal expected, parser.create_items(items)
-  end
-
-  def test_group_entries
-    parser = util_parser
-
-    entries = [
-      [ 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[one two]],
-      [ 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[three four]],
-      [ 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-        %w[five six]],
-      [ '2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-        %w[seven eight]]]
-
-    expected = {
-      '2012-12-04' => [
-        ['Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[one two]],
-        ['Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[three four]]],
-      '2012-12-03' => [
-        ['Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-          %w[five six]]],
-      '2008-01-30' => [
-        ['2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-          %w[seven eight]]],
-    }
-
-    assert_equal expected, parser.group_entries(entries)
-  end
-
-  def test_parse_entries
-    parser = util_parser <<-ChangeLog
-Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>
-
-	* README.EXT:  Converted to RDoc format
-	* README.EXT.ja:  ditto
-
-Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_specialized_instruction):
-	  change condition of using `opt_send_simple'.
-	  More method invocations can be simple.
-
-commit\ 8187228de0142d3ac7950b7d977c2849e934c637
-
-Other note that will be ignored
-
-    ChangeLog
-
-    expected = [
-      [ 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-        [ 'README.EXT:  Converted to RDoc format',
-          'README.EXT.ja:  ditto']],
-      [ 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-        [ 'compile.c (iseq_specialized_instruction): change condition of ' +
-          'using `opt_send_simple\'. More method invocations can be simple.']]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_bad_time
-    parser = util_parser <<-ChangeLog
-2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>
-
-        PR libffi/34612
-        * src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when
-        returning struct.
-
-    ChangeLog
-
-    expected = [
-      [ '2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-        [ 'src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when ' +
-          'returning struct.']]
-    ]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_gnu
-    parser = util_parser <<-ChangeLog
-1998-08-17  Richard Stallman  <rms@gnu.org>
-
-* register.el (insert-register): Return nil.
-(jump-to-register): Likewise.
-
-* sort.el (sort-subr): Return nil.
-
-* keyboard.c (menu_bar_items, tool_bar_items)
-(Fexecute_extended_command): Deal with 'keymap' property.
-    ChangeLog
-
-    expected = [
-      [ '1998-08-17  Richard Stallman  <rms@gnu.org>',
-        [ 'register.el (insert-register): Return nil.',
-          '(jump-to-register): Likewise.',
-          'sort.el (sort-subr): Return nil.',
-          'keyboard.c (menu_bar_items, tool_bar_items, ' +
-          'Fexecute_extended_command): Deal with \'keymap\' property.']]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_git
-    parser = util_parser <<-ChangeLog
-commit\ 709bed2afaee50e2ce803f87bf1ee8291bea41e3
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-21 01:03:52 +0900
-
-    * 2021-01-21 [ci skip]
-ChangeLog
-
-    expected = [
-      [ "709bed2afaee50e2ce80",
-       [ "git", "svn-admin@ruby-lang.org",
-         "2021-01-21 01:03:52 +0900",
-         "* 2021-01-21 [ci skip]\n"]]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_scan
-    parser = util_parser <<-ChangeLog
-Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/driver.rb:  Fixed ri page display for files with
-	  extensions.
-	* test/rdoc/test_rdoc_ri_driver.rb:  Test for above
-
-Mon Dec  3 20:37:22 2012  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_exec.c: check VM_COLLECT_USAGE_DETAILS.
-
-    ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, '2012-12-04'),
-      blank_line,
-      head(3, 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE,
-        item('lib/rdoc/ri/driver.rb', para('Fixed ri page display for ' +
-                       'files with extensions.')),
-        item('test/rdoc/test_rdoc_ri_driver.rb', para('Test for above'))),
-      head(2, '2012-12-03'),
-      blank_line,
-      head(3, 'Mon Dec  3 20:37:22 2012  Koichi Sasada  <ko1@atdot.net>'),
-      blank_line,
-      list(:NOTE,
-        item('vm_exec.c', para('check VM_COLLECT_USAGE_DETAILS.'))))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def test_scan_git
-    parser = util_parser <<-ChangeLog
-commit\ 38816887962ec167ee46acf500f68df5c3013163
-Author: git <svn-admin@ruby-lang.org>
-Date:   Sun Jan 24 14:35:51 2021 +0900
-
-    * 2021-01-24 [ci skip]
-
-commit\ db7d0b89f6eca66cc7eb155c95f9123133da1ffc
-Author: git <svn-admin@ruby-lang.org>
-Date:   Sat, 23 Jan 2021 06:01:39 +0900
-
-    * 2021-01-23 [ci skip]
-
-commit\ a3efbda7128ef20b55505b32d1608ea48f80af4a
-Author: git <svn-admin@ruby-lang.org>
-Date:   2021-01-22T02:49:39+09:00
-
-    * 2021-01-22 [ci skip]
-
-commit\ 709bed2afaee50e2ce803f87bf1ee8291bea41e3
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-21 01:03:52 +0900
-
-    * 2021-01-21 [ci skip]
-
-commit\ a8dc5156e183489c5121fb1759bda5d9406d9175
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-20 01:58:26 +0900
-
-    * 2021-01-20 [ci skip]
-
-commit\ de5f8a92d5001799bedb3b1a271a2d9b23c6c8fb
-  Author: Masataka Pocke Kuwabara <kuwabara@pocke.me>
-  Date:   2021-01-01 14:25:08 +0900
-
-    Make args info for RubyVM::AST to available on endless method without parens
-
-    Problem
-    ===
-
-    Arguments information is missing for endless method without parens.
-    For example:
-
-    ```ruby
-    # ok
-    ```
-
-    It causes an error if a program expects `args` node exists.
-
-    Solution
-    ===
-
-    Call `new_args` on this case.
-ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, '2021-01-24'),
-      blank_line,
-      log_entry(nil, '38816887962ec167ee46',
-                'git', 'svn-admin@ruby-lang.org', 'Sun Jan 24 14:35:51 2021 +0900',
-                [list(:BULLET, item(nil, para('2021-01-24 [ci skip]')))]),
-      head(2, '2021-01-23'),
-      blank_line,
-      log_entry(nil, 'db7d0b89f6eca66cc7eb',
-                'git', 'svn-admin@ruby-lang.org', 'Sat, 23 Jan 2021 06:01:39 +0900',
-                [list(:BULLET, item(nil, para('2021-01-23 [ci skip]')))]),
-      head(2, '2021-01-22'),
-      blank_line,
-      log_entry(nil, 'a3efbda7128ef20b5550',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-22T02:49:39+09:00',
-                [list(:BULLET, item(nil, para('2021-01-22 [ci skip]')))]),
-      head(2, '2021-01-21'),
-      blank_line,
-      log_entry(nil, '709bed2afaee50e2ce80',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-21 01:03:52 +0900',
-                [list(:BULLET, item(nil, para('2021-01-21 [ci skip]')))]),
-      head(2, '2021-01-20'),
-      blank_line,
-      log_entry(nil, 'a8dc5156e183489c5121',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-20 01:58:26 +0900',
-                [list(:BULLET, item(nil, para('2021-01-20 [ci skip]')))]),
-      head(2, '2021-01-01'),
-      blank_line,
-      log_entry(nil, 'de5f8a92d5001799bedb',
-                'Masataka Pocke Kuwabara', 'kuwabara@pocke.me', '2021-01-01 14:25:08 +0900',
-                [head(4, 'Make args info for RubyVM::AST to available on endless method without parens'),
-                 head(5, 'Problem'),
-                 para("Arguments information is missing for endless method without parens.\n" +
-                      "For example:"),
-                 verb("# ok\n").tap {|v| v.format = :ruby},
-                 para('It causes an error if a program expects <code>args</code> node exists.'),
-                 head(5, 'Solution'),
-                 para('Call <code>new_args</code> on this case.')]))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def test_scan_git_commit_date
-    parser = util_parser <<-ChangeLog
-commit\ ee1e690a2df901adb279d7a63fbd92c64e0a5ae6
-  Author:     Igor Zubkov <igor.zubkov@gmail.com>
-  AuthorDate: 2016-10-25 03:56:11 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2021-01-07 13:40:42 +0900
-
-    We don't need "require 'uri'" after "require 'net/http'".
-
-commit\ 4d0985a7bd8f591dff4b430e288bfd83af782e51
-  Author:     git <svn-admin@ruby-lang.org>
-  AuthorDate: 2021-01-07 10:21:34 +0900
-  Commit:     git <svn-admin@ruby-lang.org>
-  CommitDate: 2021-01-07 10:21:34 +0900
-
-    * 2021-01-07 [ci skip]
-ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, "2021-01-07"),
-      blank_line,
-      log_entry(nil, 'ee1e690a2df901adb279',
-                'Igor Zubkov', 'igor.zubkov@gmail.com',
-                '2016-10-25 03:56:11 +0900',
-                [head(4, %[We don't need "require 'uri'" after "require 'net/http'".])]),
-      log_entry(nil, '4d0985a7bd8f591dff4b',
-                'git', 'svn-admin@ruby-lang.org',
-                '2021-01-07 10:21:34 +0900',
-                [list(:BULLET, item(nil, para("2021-01-07 [ci skip]")))]))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def util_parser(content = '')
-    RDoc::Parser::ChangeLog.new @top_level, content, @options, @stats
-  end
-
-  def log_entry(*a)
-    RDoc::Parser::ChangeLog::Git::LogEntry.new(*a)
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_parser_markdown_test.rb b/test/mri/rdoc/rdoc/rdoc_parser_markdown_test.rb
deleted file mode 100644
index 49da5693d60..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_parser_markdown_test.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocParserMarkdownTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @RP = RDoc::Parser
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_file
-    assert_kind_of RDoc::Parser::Text, util_parser('')
-  end
-
-  def test_class_can_parse
-    temp_dir do
-      FileUtils.touch 'foo.md'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.md')
-      FileUtils.touch 'foo.md.ja'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.md.ja')
-
-      FileUtils.touch 'foo.markdown'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.markdown')
-      FileUtils.touch 'foo.markdown.ja'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.markdown.ja')
-    end
-  end
-
-  def test_scan
-    parser = util_parser 'it *really* works'
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it _really_ works'))
-    expected.file = @top_level
-
-    parser.scan
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def util_parser(content)
-    RDoc::Parser::Markdown.new @top_level, content, @options, @stats
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_parser_prism_ruby_test.rb b/test/mri/rdoc/rdoc/rdoc_parser_prism_ruby_test.rb
deleted file mode 100644
index 578123b740a..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_parser_prism_ruby_test.rb
+++ /dev/null
@@ -1,2165 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-require 'rdoc/parser'
-require 'rdoc/parser/prism_ruby'
-
-module RDocParserPrismTestCases
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    @filename = @tempfile.path
-
-    @top_level = @store.add_file @filename
-
-    @options = RDoc::Options.new
-    @options.quiet = true
-    @options.option_parser = OptionParser.new
-
-    @comment = RDoc::Comment.new '', @top_level
-
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_look_for_directives_in_section
-    util_parser <<~RUBY
-      # :section: new section
-    RUBY
-    section = @top_level.current_section
-    assert_equal 'new section', section.title
-  end
-
-  def test_look_for_directives_in_commented
-    util_parser <<~RUBY
-      # how to make a section:
-      # # :section: new section
-    RUBY
-    section = @top_level.current_section
-    assert_nil   section.title
-  end
-
-  def test_look_for_directives_in_unhandled
-    util_parser <<~RUBY
-      # :unhandled: blah
-    RUBY
-    assert_equal 'blah', @top_level.metadata['unhandled']
-  end
-
-  def test_block_comment
-    util_parser <<~RUBY
-      =begin rdoc
-      foo
-      =end
-      class A
-      =begin
-      bar
-      baz
-      =end
-        def f; end
-      end
-    RUBY
-    klass = @top_level.classes.first
-    meth = klass.method_list.first
-    assert_equal 'foo', klass.comment.text.strip
-    assert_equal "bar\nbaz", meth.comment.text.strip
-  end
-
-  def test_module
-    util_parser <<~RUBY
-      # my module
-      module Foo
-      end
-    RUBY
-    mod = @top_level.modules.first
-    assert_equal 'Foo', mod.full_name
-    assert_equal 'my module', mod.comment.text
-    assert_equal [@top_level], mod.in_files
-  end
-
-  def test_nested_module_with_colon
-    util_parser <<~RUBY
-      module Foo
-        module Bar; end
-        module Bar::Baz1; end
-        module ::Foo
-          module Bar2; end
-        end
-      end
-      module ::Baz; end
-      module Foo::Bar::Baz2
-        module ::Foo2
-          module Bar; end
-        end
-        module Blah; end
-      end
-    RUBY
-    module_names = @store.all_modules.map(&:full_name)
-    expected = %w[
-      Foo Foo::Bar Foo::Bar::Baz1 Foo::Bar2 Baz Foo::Bar::Baz2 Foo2 Foo2::Bar Foo::Bar::Baz2::Blah
-    ]
-    assert_equal expected.sort, module_names.sort
-  end
-
-  def test_class
-    util_parser <<~RUBY
-      # my class
-      class Foo
-      end
-    RUBY
-    klass = @top_level.classes.first
-    assert_equal 'Foo', klass.full_name
-    assert_equal 'my class', klass.comment.text
-    assert_equal [@top_level], klass.in_files
-    assert_equal 2, klass.line
-  end
-
-  def test_nested_class_with_colon
-    util_parser <<~RUBY
-      class Foo
-        class Bar; end
-        class Bar::Baz1; end
-        class ::Foo
-          class Bar2; end
-        end
-      end
-      class ::Baz; end
-      class Foo::Bar::Baz2
-        class ::Foo2
-          class Bar; end
-        end
-        class Blah; end
-      end
-    RUBY
-    class_names = @store.all_classes.map(&:full_name)
-    expected = %w[
-      Foo Foo::Bar Foo::Bar::Baz1 Foo::Bar2 Baz Foo::Bar::Baz2 Foo2 Foo2::Bar Foo::Bar::Baz2::Blah
-    ]
-    assert_equal expected.sort, class_names.sort
-  end
-
-  def test_open_class_with_superclass
-    util_parser <<~RUBY
-      class A; end
-
-      class B < A
-        def m1; end
-      end
-
-      class B < A
-        def m2; end
-      end
-
-      class C < String
-        def m1; end
-      end
-
-      class C < String
-        def m2; end
-      end
-    RUBY
-    classes = @top_level.classes
-    assert_equal 3, classes.size
-    _a, b, c = classes
-    assert_equal 'A', b.superclass.full_name
-    assert_equal 'String', c.superclass
-    assert_equal ['m1', 'm2'], b.method_list.map(&:name)
-    assert_equal ['m1', 'm2'], c.method_list.map(&:name)
-  end
-
-  def test_open_class_with_superclass_specified_later
-    util_parser <<~RUBY
-      # file_2
-      require 'file_1'
-      class A; end
-      class B; end
-      class C; end
-    RUBY
-    _a, b, c = @top_level.classes
-    assert_equal 'Object', b.superclass
-    assert_equal 'Object', c.superclass
-
-    util_parser <<~RUBY
-      # file_1
-      class B < A; end
-      class C < Unknown; end
-    RUBY
-    assert_equal 'A', b.superclass.full_name
-    assert_equal 'Unknown', c.superclass
-  end
-
-  def test_open_class_with_superclass_specified_later_with_object_defined
-    util_parser <<~RUBY
-      # file_2
-      require 'file_1'
-      class Object; end
-      class A; end
-      class B; end
-      class C; end
-    RUBY
-    _object, _a, b, c = @top_level.classes
-    # If Object exists, superclass will be a NormalClass(Object) instead of string "Object"
-    assert_equal 'Object', b.superclass.full_name
-    assert_equal 'Object', c.superclass.full_name
-
-    util_parser <<~RUBY
-      # file_1
-      class B < A; end
-      class C < Unknown; end
-    RUBY
-    assert_equal 'A', b.superclass.full_name
-    assert_equal 'Unknown', c.superclass
-  end
-
-  def test_confusing_superclass
-    util_parser <<~RUBY
-      module A
-        class B; end
-      end
-
-      module A
-        class C1 < A::B; end
-      end
-
-      class A::C2 < A::B; end
-
-      module A::A
-        class B; end
-      end
-
-      module A
-        class C3 < A::B; end
-      end
-
-      class A::C4 < A::B; end
-    RUBY
-    mod = @top_level.modules.first
-    classes = mod.classes
-    assert_equal ['A::B', 'A::C1', 'A::C2', 'A::C3', 'A::C4'], classes.map(&:full_name)
-    assert_equal ['A::B', 'A::B', 'A::A::B', 'A::B'], classes.drop(1).map(&:superclass).map(&:full_name)
-  end
-
-  def test_pseudo_recursive_superclass
-    util_parser <<~RUBY
-      module Foo
-        class Bar
-          class Foo < Bar; end
-          # This class definition is used in OpenSSL::Cipher::Cipher
-          class Bar < Bar; end
-          class Baz < Bar; end
-        end
-      end
-    RUBY
-    foo_klass = @store.find_class_named 'Foo::Bar::Foo'
-    bar_klass = @store.find_class_named 'Foo::Bar::Bar'
-    baz_klass = @store.find_class_named 'Foo::Bar::Baz'
-    assert_equal 'Foo::Bar', foo_klass.superclass.full_name
-    assert_equal 'Foo::Bar', bar_klass.superclass.full_name
-    assert_equal 'Foo::Bar::Bar', baz_klass.superclass.full_name
-  end
-
-  def test_class_module_nodoc
-    util_parser <<~RUBY
-      class Foo # :nodoc:
-      end
-
-      class Bar
-      end # :nodoc:
-
-      class Baz; end
-
-      class Baz::A; end # :nodoc:
-
-      module MFoo # :nodoc:
-      end
-
-      module MBar
-      end # :nodoc:
-
-      module MBaz; end
-
-      module MBaz::M; end; # :nodoc:
-    RUBY
-    documentables = @store.all_classes_and_modules.select(&:document_self)
-    assert_equal ['Baz', 'MBaz'], documentables.map(&:full_name) unless accept_legacy_bug?
-  end
-
-  def test_class_module_stopdoc
-    util_parser <<~RUBY
-      # comment
-      class Foo
-        class A; end
-        # :stopdoc:
-        class B; end
-      end
-
-      # comment
-      module Bar
-        module A; end
-        # :stopdoc:
-        module B; end
-      end
-    RUBY
-    klass = @top_level.classes.first
-    mod = @top_level.modules.first
-    assert_equal 'comment', klass.comment.text.strip
-    assert_equal 'comment', mod.comment.text.strip
-    assert_equal ['Foo::A'], klass.classes.select(&:document_self).map(&:full_name)
-    assert_equal ['Bar::A'], mod.modules.select(&:document_self).map(&:full_name)
-  end
-
-  def test_class_superclass
-    util_parser <<~RUBY
-      class Foo; end
-      class Bar < Foo
-      end
-      class Baz < (any expression)
-      end
-    RUBY
-    assert_equal ['Foo', 'Bar', 'Baz'], @top_level.classes.map(&:full_name)
-    foo, bar, baz = @top_level.classes
-    assert_equal foo, bar.superclass
-    assert_equal '(any expression)', baz.superclass
-  end
-
-  def test_class_new_notnew
-    util_parser <<~RUBY
-      class A
-        def initialize(*args); end
-      end
-
-      class B
-        ##
-        # :args: a, b, c
-        def initialize(*args); end
-      end
-
-      class C
-        def self.initialize(*args); end
-      end
-
-      class D
-        ##
-        # :args: a, b, c
-        def initialize(*args); end # :notnew:
-      end
-
-      class E
-        def initialize(*args); end # :not-new:
-      end
-
-      class F
-        def initialize(*args); end # :not_new:
-      end
-
-      class G
-        def initialize(*args)
-        end # :notnew:
-      end
-    RUBY
-
-    expected = [
-      'new(*args)', 'new(a, b, c)',
-      'initialize(*args)', 'initialize(a, b, c)',
-      'initialize(*args)', 'initialize(*args)',
-      'initialize(*args)'
-    ]
-    arglists = @top_level.classes.map { |c| c.method_list.first.arglists }
-    assert_equal expected, arglists
-  end
-
-  def test_class_mistaken_for_module
-    util_parser <<~RUBY
-      class A::Foo; end
-      class B::Foo; end
-      module C::Bar; end
-      module D::Baz; end
-      class A; end
-      class X < C; end
-    RUBY
-    assert_equal ['A', 'C', 'X'], @top_level.classes.map(&:full_name)
-    assert_equal ['B', 'D'], @top_level.modules.map(&:full_name)
-  end
-
-  def test_parenthesized_cdecl
-    util_parser <<~RUBY
-      module DidYouMean
-        # Not a module, but creates a dummy module for document
-        class << (NameErrorCheckers = Object.new)
-          def new; end
-        end
-      end
-    RUBY
-
-    mod = @store.find_class_or_module('DidYouMean').modules.first
-    assert_equal 'DidYouMean::NameErrorCheckers', mod.full_name
-    assert_equal ['DidYouMean::NameErrorCheckers::new'], mod.method_list.map(&:full_name)
-  end
-
-  def test_ghost_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # :method: one
-        #
-        # my method one
-
-        ##
-        # :method:
-        # :call-seq:
-        #   two(name)
-        #
-        # my method two
-
-        ##
-        # :method: three
-        # :args: a, b
-        #
-        # my method three
-
-        # :stopdoc:
-
-        ##
-        # :method: hidden1
-        #
-        # comment
-
-        ##
-        # :method:
-        # :call-seq:
-        #   hidden2(name)
-        #
-        # comment
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal 3, klass.method_list.size
-    one, two, three = klass.method_list
-    assert_equal 'Foo#one', one.full_name
-    assert_equal 'Foo#two', two.full_name
-    assert_equal 'Foo#three', three.full_name
-    assert_equal 'two(name)', two.call_seq.chomp
-    assert_equal 'three(a, b)', three.arglists
-    assert_equal 'my method one', one.comment.text.strip
-    assert_equal 'my method two', two.comment.text.strip
-    assert_equal 'my method three', three.comment.text.strip
-    assert_equal 3, one.line
-    assert_equal 8, two.line
-    assert_equal 15, three.line
-    assert_equal @top_level, one.file
-    assert_equal @top_level, two.file
-    assert_equal @top_level, three.file
-  end
-
-  def test_invalid_meta_method
-    util_parser <<~RUBY
-      class Foo
-        # These are invalid meta method comments
-        # because meta method comment should start with `##`
-        # but rdoc accepts them as meta method comments for now.
-
-        # :method: m1
-
-        # :singleton-method: sm1
-
-        # :attr: a1
-
-        # :attr_reader: ar1
-
-        # :attr_writer: aw1
-
-        # :attr_accessor: arw1
-
-        # If there is a node following meta-like normal comment, it is not a meta method comment
-
-        # :method: m2
-        add_my_method(name)
-
-        # :singleton-method: sm2
-        add_my_singleton_method(name)
-
-        # :method:
-        add_my_method(:m3)
-
-        # :singleton-method:
-        add_my_singleton_method(:sm3)
-
-        # :attr:
-        add_my_attribute(:a2)
-
-        # :attr-reader:
-        add_my_attribute(:ar2)
-
-        # :attr-writer:
-        add_my_attribute(:aw2)
-
-        # :attr-accessor:
-        add_my_attribute(:arw2)
-
-        # :attr: a3
-        add_my_attribute_a3
-
-        # :attr-reader: ar3
-        add_my_attribute_ar3
-
-        # :attr-writer: aw3
-        add_my_attribute_aw2
-
-        # :attr-accessor: arw3
-        add_my_attribute_arw3
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['m1', 'sm1'], klass.method_list.map(&:name)
-    assert_equal ['a1', 'ar1', 'aw1', 'arw1'], klass.attributes.map(&:name)
-  end
-
-  def test_unknown_meta_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # :call-seq:
-        #   two(name)
-        #
-        # method or singleton-method directive is missing
-      end
-
-      class Bar
-        ##
-        # unknown meta method
-        add_my_method("foo" + "bar")
-      end
-    RUBY
-
-    foo = @store.find_class_named 'Foo'
-    bar = @store.find_class_named 'Bar'
-    assert_equal [], foo.method_list.map(&:name)
-    assert_equal ['unknown'], bar.method_list.map(&:name)
-  end
-
-  def test_method
-    util_parser <<~RUBY
-      class Foo
-        # my method one
-        def one; end
-        # my method two
-        def two(x); end
-        # my method three
-        def three x; end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal 3, klass.method_list.size
-    one, two, three = klass.method_list
-    assert_equal 'Foo#one', one.full_name
-    assert_equal 'Foo#two', two.full_name
-    assert_equal 'Foo#three', three.full_name
-    assert_equal 'one()', one.arglists
-    assert_equal 'two(x)', two.arglists
-    assert_equal 'three(x)', three.arglists unless accept_legacy_bug?
-    assert_equal 'my method one', one.comment.text.strip
-    assert_equal 'my method two', two.comment.text.strip
-    assert_equal 'my method three', three.comment.text.strip
-    assert_equal 3, one.line
-    assert_equal 5, two.line
-    assert_equal 7, three.line
-    assert_equal @top_level, one.file
-    assert_equal @top_level, two.file
-    assert_equal @top_level, three.file
-  end
-
-  def test_method_with_modifier_if_unless
-    util_parser <<~RUBY
-      class Foo
-        # my method one
-        def one
-        end if foo
-
-        # my method two
-        def two
-        end unless foo
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    one, two = klass.method_list
-    assert_equal 'Foo#one', one.full_name
-    assert_equal 'my method one', one.comment.text.strip
-    assert_equal 'Foo#two', two.full_name
-    assert_equal 'my method two', two.comment.text.strip
-  end
-
-  def test_method_toplevel
-    util_parser <<~RUBY
-      # comment
-      def foo; end
-    RUBY
-
-    object = @store.find_class_named 'Object'
-    foo = object.method_list.first
-    assert_equal 'Object#foo', foo.full_name
-    assert_equal 'comment', foo.comment.text.strip
-    assert_equal @top_level, foo.file
-  end
-
-  def test_meta_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # my method
-        add_my_method :method_foo, :arg
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal 1, klass.method_list.size
-    method = klass.method_list.first
-    assert_equal 'Foo#method_foo', method.full_name
-    assert_equal 'my method', method.comment.text.strip
-    assert_equal 4, method.line
-    assert_equal @top_level, method.file
-  end
-
-  def test_first_comment_is_not_a_meta_method
-    util_parser <<~RUBY
-      ##
-      # first comment is not a meta method
-      add_my_method :foo
-
-      ##
-      # this is a meta method
-      add_my_method :bar
-    RUBY
-
-    object = @store.find_class_named 'Object'
-    assert_equal ['bar'], object.method_list.map(&:name)
-  end
-
-  def test_meta_method_unknown
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # my method
-        add_my_method (:foo), :bar
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal 1, klass.method_list.size
-    method = klass.method_list.first
-    assert_equal 'Foo#unknown', method.full_name
-    assert_equal 'my method', method.comment.text.strip
-    assert_equal 4, method.line
-    assert_equal @top_level, method.file
-  end
-
-  def test_meta_define_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # comment 1
-        define_method :foo do end
-        ##
-        # comment 2
-        define_method :bar, ->{}
-        # not a meta comment, not a meta method
-        define_method :ignored do end
-        class << self
-          ##
-          # comment 3
-          define_method :baz do end
-        end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    klass.method_list.last.singleton = true if accept_legacy_bug?
-    assert_equal 3, klass.method_list.size
-    assert_equal ['Foo#foo', 'Foo#bar', 'Foo::baz'], klass.method_list.map(&:full_name)
-    assert_equal [false, false, true], klass.method_list.map(&:singleton)
-    assert_equal ['comment 1', 'comment 2', 'comment 3'], klass.method_list.map { |m| m.comment.text.strip }
-    assert_equal [4, 7, 13], klass.method_list.map(&:line)
-    assert_equal [@top_level] * 3, klass.method_list.map(&:file)
-  end
-
-  def test_method_definition_nested_inside_block
-    util_parser <<~RUBY
-      module A
-        extend ActiveSupport::Concern
-        included do
-          ##
-          # :singleton-method:
-          # comment foo
-          mattr_accessor :foo
-
-          ##
-          # :method: bar
-          # comment bar
-          add_my_method :bar
-        end
-
-        metaprogramming do
-          # class that defines this method is unknown
-          def baz1; end
-        end
-
-        my_decorator def self.baz2; end
-
-        self.my_decorator def baz3; end
-      end
-    RUBY
-    mod = @store.find_module_named 'A'
-    methods = mod.method_list
-    unless accept_legacy_bug?
-      assert_equal ['A::foo', 'A#bar', 'A::baz2', 'A#baz3'], methods.map(&:full_name)
-    end
-    assert_equal ['comment foo', 'comment bar'], methods.take(2).map { |m| m.comment.text.strip }
-  end
-
-  def test_method_yields_directive
-    util_parser <<~RUBY
-      class Foo
-        def f1(a, &b); end
-
-        def f2
-          def o.foo
-            yield :dummy
-          end
-          yield
-        end
-
-        def f3(&b)
-          yield a, *b, c: 1
-          yield 1, 2, 3
-        end
-
-        def f4(a, &b) # :yields: d, e
-          yields 1, 2
-        end
-
-        def f5 # :yield: f
-          yields 1, 2
-        end
-
-        def f6; end # :yields:
-
-        ##
-        # :yields: g, h
-        add_my_method :f7
-      end
-    RUBY
-
-    klass = @top_level.classes.first
-    methods = klass.method_list
-    expected = [
-      'f1(a, &b)',
-      'f2() { || ... }',
-      'f3() { |a, *b, c: 1| ... }',
-      'f4(a) { |d, e| ... }',
-      'f5() { |f| ... }',
-      'f6() { || ... }',
-      'f7() { |g, h| ... }'
-    ]
-    assert_equal expected, methods.map(&:arglists)
-  end
-
-  def test_calls_super
-    util_parser <<~RUBY
-      class A
-        def m1; foo; bar; end
-        def m2; if cond; super(a); end; end # SuperNode
-        def m3; tap do; super; end; end # ForwardingSuperNode
-        def m4; def a.b; super; end; end # super inside another method
-      end
-    RUBY
-
-    klass = @store.find_class_named 'A'
-    methods = klass.method_list
-    assert_equal ['m1', 'm2', 'm3', 'm4'], methods.map(&:name)
-    assert_equal [false, true, true, false], methods.map(&:calls_super)
-  end
-
-  def test_method_args_directive
-    util_parser <<~RUBY
-      class Foo
-        def method1 # :args: a, b, c
-        end
-
-        ##
-        # :args: d, e, f
-        def method2(*args); end
-
-        ##
-        # :args: g, h
-        add_my_method :method3
-      end
-    RUBY
-
-    klass = @top_level.classes.first
-    methods = klass.method_list
-    assert_equal ['method1(a, b, c)', 'method2(d, e, f)', 'method3(g, h)'], methods.map(&:arglists)
-  end
-
-  def test_class_repeatedly
-    util_parser <<~RUBY
-      class Foo
-        def foo; end
-      end
-      class Foo
-        def bar; end
-      end
-    RUBY
-    util_parser <<~RUBY
-      class Foo
-        def baz; end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['Foo#foo', 'Foo#bar', 'Foo#baz'], klass.method_list.map(&:full_name)
-  end
-
-  def test_undefined_singleton_class_defines_module
-    util_parser <<~RUBY
-      module A
-        class << Foo
-        end
-        class << ::Bar
-        end
-        Baz1 = ''
-        class << Baz1
-        end
-        class << Baz2 # :nodoc:
-        end
-      end
-    RUBY
-
-    modules = @store.all_modules
-    modules = modules.take(3) if accept_legacy_bug?
-    assert_equal ['A', 'A::Foo', 'Bar'], modules.map(&:full_name)
-  end
-
-  def test_singleton_class
-    util_parser <<~RUBY
-      class A; end
-      class Foo
-        def self.m1; end
-        def (any expression).dummy1; end
-        class << self
-          def m2; end
-          def self.dummy2; end
-        end
-        class << A
-          def dummy3; end
-        end
-        class << Foo
-          def m3; end
-          def self.dummy4; end
-        end
-        class << ::Foo
-          def m4; end
-        end
-        class << (any expression)
-          def dummy5; end
-        end
-      end
-      class << Foo
-        def m5; end
-      end
-      class << ::Foo
-        def m6; end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    methods = klass.method_list
-    methods = methods.reject {|m| m.name =~ /dummy2|dummy4/ } if accept_legacy_bug?
-    assert_equal ['m1', 'm2', 'm3', 'm4', 'm5', 'm6'], methods.map(&:name)
-    assert_equal [true] * 6, methods.map(&:singleton)
-  end
-
-  def test_singleton_class_meta_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # :singleton-method: m1
-
-        ##
-        # :singleton-method:
-        add_my_smethod :m2, :arg
-
-        ##
-        # :singleton-method:
-        add_my_smethod 'm3', :arg
-
-        # comment
-        class << self
-          ##
-          # method of a singleton class is a singleton method
-          # :method: m4
-
-          ##
-          # :singleton-method: m5
-        end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['m1', 'm2', 'm3', 'm4', 'm5'], klass.method_list.map(&:name)
-    klass.method_list[3].singleton = true if accept_legacy_bug?
-    assert_equal [true] * 5, klass.method_list.map(&:singleton)
-  end
-
-  def test_method_nested_visibility
-    util_parser <<~RUBY
-      class A
-        def pub1; end
-        private
-        def pri1; end
-        class B
-          def pub_b1; end
-          private
-          def pri_b1; end
-          public
-          def pub_b2; end
-        end
-        def pri2; end
-      end
-      class A
-        def pub2; end
-        private
-        def pri2; end
-      end
-    RUBY
-    klass_a = @store.find_class_named 'A'
-    klass_b = klass_a.find_class_named 'B'
-    public_a = klass_a.method_list.select { |m| m.visibility == :public }.map(&:name)
-    public_b = klass_b.method_list.select { |m| m.visibility == :public }.map(&:name)
-    assert_equal ['pub1', 'pub2'], public_a
-    assert_equal ['pub_b1', 'pub_b2'], public_b
-  end
-
-  def test_attributes_visibility
-    util_parser <<~RUBY
-      class A
-        attr :pub_a
-        attr_reader :pub_r
-        attr_writer :pub_w
-        attr_accessor :pub_rw
-        private
-        attr :pri_a
-        attr_reader :pri_r
-        attr_writer :pri_w
-        attr_accessor :pri_rw
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    assert_equal ['pub_a', 'pub_r', 'pub_w', 'pub_rw', 'pri_a', 'pri_r', 'pri_w', 'pri_rw'], klass.attributes.map(&:name)
-    assert_equal [:public] * 4 + [:private] * 4, klass.attributes.map(&:visibility)
-  end
-
-  def test_method_singleton_class_visibility
-    util_parser <<~RUBY
-      class A
-        def self.pub1; end
-        private
-        def self.pub2; end
-        class << self
-          def pub3; end
-          private
-          def pri1; end
-          public
-          def pub4; end
-          private
-        end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    public_singleton_methods = klass.method_list.select { |m| m.singleton && m.visibility == :public }
-    assert_equal ['pub1', 'pub2', 'pub3', 'pub4'], public_singleton_methods.map(&:name)
-  end
-
-  def test_private_def_public_def
-    util_parser <<~RUBY
-      class A
-        private def m1; end
-        public def m2; end
-        private
-        public def m3; end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    public_methods = klass.method_list.select { |m| m.visibility == :public }
-    assert_equal ['m2', 'm3'], public_methods.map(&:name)
-  end
-
-  def test_define_method_visibility
-    util_parser <<~RUBY
-      class A
-        private
-        ##
-        # my private method
-        define_method :m1 do end
-        public
-        ##
-        # my public method
-        define_method :m2 do end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    methods = klass.method_list
-    assert_equal ['m1', 'm2'], methods.map(&:name)
-    assert_equal [:private, :public], methods.map(&:visibility)
-  end
-
-  def test_module_function
-    util_parser <<~RUBY
-      module A
-        def m1; end
-        def m2; end
-        def m3; end
-        module_function :m1, :m3
-        module_function def m4; end
-      end
-    RUBY
-    mod = @store.find_module_named 'A'
-    instance_methods = mod.method_list.reject(&:singleton)
-    singleton_methods = mod.method_list.select(&:singleton)
-    if accept_legacy_bug?
-      instance_methods.last.visibility = :private
-      singleton_methods << singleton_methods.last.dup
-      singleton_methods.last.name = 'm4'
-    end
-    assert_equal ['m1', 'm2', 'm3', 'm4'], instance_methods.map(&:name)
-    assert_equal [:private, :public, :private, :private], instance_methods.map(&:visibility)
-    assert_equal ['m1', 'm3', 'm4'], singleton_methods.map(&:name)
-    assert_equal [:public, :public, :public], singleton_methods.map(&:visibility)
-  end
-
-  def test_class_method_visibility
-    util_parser <<~RUBY
-      class A
-        def self.m1; end
-        def self.m2; end
-        def self.m3; end
-        private_class_method :m1, :m2
-        public_class_method :m1, :m3
-        private_class_method def self.m4; end
-        public_class_method def self.m5; end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    public_methods = klass.method_list.select { |m| m.visibility == :public }
-    assert_equal ['m1', 'm3', 'm5'], public_methods.map(&:name) unless accept_legacy_bug?
-  end
-
-  def test_method_change_visibility
-    util_parser <<~RUBY
-      class A
-        def m1; end
-        def m2; end
-        def m3; end
-        def m4; end
-        def m5; end
-        private :m2, :m3, :m4
-        public :m1, :m3
-      end
-      class << A
-        def m1; end
-        def m2; end
-        def m3; end
-        def m4; end
-        def m5; end
-        private :m1, :m2, :m3
-        public :m2, :m4
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    public_methods = klass.method_list.select { |m| !m.singleton && m.visibility == :public }
-    public_singleton_methods = klass.method_list.select { |m| m.singleton && m.visibility == :public }
-    assert_equal ['m1', 'm3', 'm5'], public_methods.map(&:name)
-    assert_equal ['m2', 'm4', 'm5'], public_singleton_methods.map(&:name)
-  end
-
-  def test_undocumentable_change_visibility
-    omit if accept_legacy_bug?
-    util_parser <<~RUBY
-      class A
-        def m1; end
-        def self.m2; end
-        private 42, :m # maybe not Module#private
-        # ignore all non-standard `private def` and `private_class_method def`
-        private def self.m1; end
-        private_class_method def m2; end
-        private def to_s.m1; end
-        private_class_method def to_s.m2; end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    assert_equal [:public] * 4, klass.method_list.map(&:visibility)
-  end
-
-  def test_singleton_class_def_with_visibility
-    util_parser <<~RUBY
-      class A
-        class <<self
-          private def m1; end
-        end
-        private def self.m2; end
-      end
-      class <<A
-        private def m3; end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    assert_equal [true, true, true], klass.method_list.map(&:singleton)
-    assert_equal [:private, :public, :private], klass.method_list.map(&:visibility)
-  end
-
-  def test_method_visibility_change_in_subclass
-    omit 'not implemented' if accept_legacy_bug?
-    util_parser <<~RUBY
-      class A
-        def m1; end
-        def m2; end
-        private :m2
-      end
-      class B < A
-        private :m1
-        public :m2
-      end
-    RUBY
-
-    superclass = @store.find_class_named('A')
-    klass = @store.find_class_named('B')
-    assert_equal ['m1', 'm2'], superclass.method_list.map(&:name)
-    assert_equal ['m1', 'm2'], klass.method_list.map(&:name)
-    assert_equal [:public, :private], superclass.method_list.map(&:visibility)
-    assert_equal [:private, :public], klass.method_list.map(&:visibility)
-  end
-
-  def test_singleton_method_visibility_change_in_subclass
-    util_parser <<~RUBY
-      class A
-        def self.m1; end
-        def self.m2; end
-        private_class_method :m2
-      end
-      class B < A
-        private_class_method :m1
-        public_class_method :m2
-      end
-    RUBY
-
-    superclass = @store.find_class_named('A')
-    klass = @store.find_class_named('B')
-    assert_equal ['m1', 'm2'], superclass.method_list.map(&:name)
-    assert_equal ['m1', 'm2'], klass.method_list.map(&:name)
-    assert_equal [:public, :private], superclass.method_list.map(&:visibility)
-    assert_equal [:private, :public], klass.method_list.map(&:visibility)
-  end
-
-  def test_alias
-    util_parser <<~RUBY
-      class Foo
-        def bar; end
-        def bar2; alias :dummy :bar; end
-        # comment
-        alias :baz1 :bar # :nodoc:
-        alias :baz2 :bar
-        # :stopdoc:
-        alias :baz3 :bar
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['Foo#bar', 'Foo#bar2', 'Foo#baz2'], klass.method_list.map(&:full_name)
-    m = klass.method_list.last
-    assert_equal 'Foo#bar', m.is_alias_for.full_name
-    assert_equal 'Foo#baz2', m.full_name
-    assert_equal klass, m.parent
-  end
-
-  def test_alias_singleton
-    util_parser <<~RUBY
-      class Foo
-        class << self
-          def bar; end
-          # comment
-          alias :baz :bar
-          # :stopdoc:
-          alias :baz2 :bar
-        end
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    m = klass.class_method_list.last
-    assert_equal 'Foo::bar', m.is_alias_for.full_name
-    assert_equal 'Foo::baz', m.full_name
-    assert_equal 'comment', m.comment.text
-    assert_equal klass, m.parent
-  end
-
-  def test_alias_method
-    util_parser <<~RUBY
-      class Foo
-        def foo; end
-        private
-        alias_method :foo2, :foo
-        def bar; end
-        public
-        alias_method :bar2, :bar
-        private :foo
-        public :bar
-      end
-    RUBY
-    foo, foo2, bar, bar2 = @top_level.classes.first.method_list
-    assert_equal 'foo', foo.name
-    assert_equal 'bar', bar.name
-    assert_equal 'foo2', foo2.name
-    assert_equal 'bar2', bar2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-    assert_equal 'bar', bar2.is_alias_for.name
-    unless accept_legacy_bug?
-      assert_equal :private, foo.visibility
-      assert_equal :public, foo2.visibility
-      assert_equal :public, bar.visibility
-      assert_equal :private, bar2.visibility
-    end
-  end
-
-  def test_invalid_alias_method
-    omit if accept_legacy_bug?
-    util_parser <<~RUBY
-      class Foo
-        def foo; end
-        alias_method
-        alias_method :foo
-        alias_method :foo, :bar, :baz
-        alias_method 42, :foo
-      end
-    RUBY
-    assert_equal ['foo'], @top_level.classes.first.method_list.map(&:name)
-  end
-
-  def test_alias_method_stopdoc_nodoc
-    util_parser <<~RUBY
-      class Foo
-        def foo; end
-        # :stopdoc:
-        alias_method :foo2, :foo
-        # :startdoc:
-        alias_method :foo3, :foo # :nodoc:
-        alias_method :foo4, :foo
-      end
-    RUBY
-    assert_equal ['foo', 'foo4'], @top_level.classes.first.method_list.map(&:name)
-  end
-
-  def test_attributes
-    util_parser <<~RUBY
-      class Foo
-        # attrs
-        attr :attr1, :attr2
-        # readers
-        attr_reader :reader1, :reader2
-        # writers
-        attr_writer :writer1, :writer2
-        # accessors
-        attr_accessor :accessor1, :accessor2
-        # :stopdoc:
-        attr :attr3, :attr4
-        attr_reader :reader3, :reader4
-        attr_writer :write3, :writer4
-        attr_accessor :accessor3, :accessor4
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    if accept_legacy_bug?
-      a, r1, r2, w1, w2, rw1, rw2 = klass.attributes
-      a1 = a.dup
-      a2 = a.dup
-      a1.rw = a2.rw = 'R'
-      a2.name = 'attr2'
-    else
-      assert_equal 8, klass.attributes.size
-      a1, a2, r1, r2, w1, w2, rw1, rw2 = klass.attributes
-    end
-    assert_equal ['attr1', 'attr2'], [a1.name, a2.name]
-    assert_equal ['reader1', 'reader2'], [r1.name, r2.name]
-    assert_equal ['writer1', 'writer2'], [w1.name, w2.name]
-    assert_equal ['accessor1', 'accessor2'], [rw1.name, rw2.name]
-    assert_equal ['R', 'R'], [a1.rw, a2.rw]
-    assert_equal ['R', 'R'], [r1.rw, r2.rw]
-    assert_equal ['W', 'W'], [w1.rw, w2.rw]
-    assert_equal ['RW', 'RW'], [rw1.rw, rw2.rw]
-    assert_equal ['attrs', 'attrs'], [a1.comment.text, a2.comment.text]
-    assert_equal ['readers', 'readers'], [r1.comment.text, r2.comment.text]
-    assert_equal ['writers', 'writers'], [w1.comment.text, w2.comment.text]
-    assert_equal ['accessors', 'accessors'], [rw1.comment.text, rw2.comment.text]
-    assert_equal [3, 3], [a1.line, a2.line]
-    assert_equal [5, 5], [r1.line, r2.line]
-    assert_equal [7, 7], [w1.line, w2.line]
-    assert_equal [9, 9], [rw1.line, rw2.line]
-    assert_equal [@top_level] * 8, [a1, a2, r1, r2, w1, w2, rw1, rw2].map(&:file)
-  end
-
-  def test_undocumentable_attributes
-    util_parser <<~RUBY
-      class Foo
-        attr
-        attr 42, :foo
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_empty klass.method_list
-    assert_empty klass.attributes
-  end
-
-  def test_singleton_class_attributes
-    util_parser <<~RUBY
-      class Foo
-        class << self
-          attr :a
-          attr_reader :r
-          attr_writer :w
-          attr_accessor :rw
-        end
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    attributes = klass.attributes
-    assert_equal ['a', 'r', 'w', 'rw'], attributes.map(&:name)
-    assert_equal [true] * 4, attributes.map(&:singleton)
-  end
-
-  def test_attributes_nodoc
-    util_parser <<~RUBY
-      class Foo
-        attr :attr1, :attr2 # :nodoc:
-        attr :attr3
-        attr_reader :reader1, :reader2 # :nodoc:
-        attr_reader :reader3
-        attr_writer :writer1, :writer2 # :nodoc:
-        attr_writer :writer3
-        attr_accessor :accessor1, :accessor2 # :nodoc:
-        attr_accessor :accessor3
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    unless accept_legacy_bug?
-      assert_equal 4, klass.attributes.size
-    end
-  end
-
-  def test_attributes_nodoc_track
-    @options.visibility = :nodoc
-    util_parser <<~RUBY
-      class Foo
-        attr :attr1, :attr2 # :nodoc:
-        attr :attr3
-        attr_reader :reader1, :reader2 # :nodoc:
-        attr_reader :reader3
-        attr_writer :writer1, :writer2 # :nodoc:
-        attr_writer :writer3
-        attr_accessor :accessor1, :accessor2 # :nodoc:
-        attr_accessor :accessor3
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    unless accept_legacy_bug?
-      assert_equal 12, klass.attributes.size
-    end
-  end
-
-  def test_method_nodoc_stopdoc
-    util_parser <<~RUBY
-      class Foo
-        def doc1; end
-        def nodoc1; end # :nodoc:
-        def doc2; end
-        def nodoc2 # :nodoc:
-        end
-        def doc3; end
-        def nodoc3
-        end # :nodoc:
-        def nodoc4(arg1,
-                   arg2) # :nodoc:
-        end
-        def doc4; end
-        # :stopdoc:
-        def nodoc5; end
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['doc1', 'doc2', 'doc3', 'doc4'], klass.method_list.map(&:name)
-  end
-
-  def test_method_nodoc_track
-    @options.visibility = :nodoc
-    util_parser <<~RUBY
-      class Foo
-        def doc1; end
-        def nodoc1; end # :nodoc:
-        def doc2; end
-        def nodoc2 # :nodoc:
-        end
-        def doc3; end
-        def nodoc3
-        end # :nodoc:
-        def doc4; end
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['doc1', 'nodoc1', 'doc2', 'nodoc2', 'doc3', 'nodoc3', 'doc4'], klass.method_list.map(&:name)
-    assert_equal [true, nil, true, nil, true, nil, true], klass.method_list.map(&:document_self)
-  end
-
-  def test_meta_attributes
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # :attr:
-        # attrs
-        add_my_method :attr1, :attr2
-        ##
-        # :attr_reader:
-        # readers
-        add_my_method :reader1, :reader2
-        ##
-        # :attr_writer:
-        # writers
-        add_my_method :writer1, :writer2
-        ##
-        # :attr_accessor:
-        # accessors
-        add_my_method :accessor1, :accessor2
-
-        # :stopdoc:
-
-        ##
-        # :attr:
-        add_my_method :attr3
-        ##
-        # :attr_reader:
-        add_my_method :reader3
-        ##
-        # :attr_writer:
-        add_my_method :writer3
-        ##
-        # :attr_accessor:
-        add_my_method :accessor3
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal 8, klass.attributes.size
-    a1, a2, r1, r2, w1, w2, rw1, rw2 = klass.attributes
-    assert_equal ['attr1', 'attr2'], [a1.name, a2.name]
-    assert_equal ['reader1', 'reader2'], [r1.name, r2.name]
-    assert_equal ['writer1', 'writer2'], [w1.name, w2.name]
-    assert_equal ['accessor1', 'accessor2'], [rw1.name, rw2.name]
-    a1.rw = a2.rw = 'R' if accept_legacy_bug?
-    assert_equal ['R', 'R'], [a1.rw, a2.rw]
-    assert_equal ['R', 'R'], [r1.rw, r2.rw]
-    assert_equal ['W', 'W'], [w1.rw, w2.rw]
-    assert_equal ['RW', 'RW'], [rw1.rw, rw2.rw]
-    assert_equal ['attrs', 'attrs'], [a1.comment.text, a2.comment.text]
-    assert_equal ['readers', 'readers'], [r1.comment.text, r2.comment.text]
-    assert_equal ['writers', 'writers'], [w1.comment.text, w2.comment.text]
-    assert_equal ['accessors', 'accessors'], [rw1.comment.text, rw2.comment.text]
-    assert_equal [@top_level] * 8, [a1, a2, r1, r2, w1, w2, rw1, rw2].map(&:file)
-  end
-
-  def test_meta_attributes_named
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # comment a
-        # :attr: attr1
-        add_my_method :a1
-        ##
-        # comment r
-        # :attr_reader: reader1
-        add_my_method :r1
-        ##
-        # comment w
-        # :attr_writer: writer1
-        add_my_method :w1
-        ##
-        # comment rw
-        # :attr_accessor: accessor1
-        add_my_method :rw1
-
-        # :stopdoc:
-
-        ##
-        # :attr: attr2
-        add_my_method :a2
-        ##
-        # :attr_reader: reader2
-        add_my_method :r2
-        ##
-        # :attr_writer: writer2
-        add_my_method :w2
-        ##
-        # :attr_accessor: accessor2
-        add_my_method :rw2
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal 4, klass.attributes.size
-    a, r, w, rw = klass.attributes
-    assert_equal 'attr1', a.name
-    assert_equal 'reader1', r.name
-    assert_equal 'writer1', w.name
-    assert_equal 'accessor1', rw.name
-    a.rw = 'R' if accept_legacy_bug?
-    assert_equal 'R', a.rw
-    assert_equal 'R', r.rw
-    assert_equal 'W', w.rw
-    assert_equal 'RW', rw.rw
-    assert_equal 'comment a', a.comment.text
-    assert_equal 'comment r', r.comment.text
-    assert_equal 'comment w', w.comment.text
-    assert_equal 'comment rw', rw.comment.text
-    assert_equal [@top_level] * 4, [a, r, w, rw].map(&:file)
-  end
-
-  def test_constant
-    util_parser <<~RUBY
-      class Foo
-        A = (any expression 1)
-        def f
-          DUMMY1 = (any expression 2)
-        end
-        class Bar; end
-        Bar::B = (any expression 3)
-        ::C = (any expression 4)
-        # :stopdoc:
-        DUMMY2 = 1
-        # :startdoc:
-        D = (any expression 5)
-        E = (any expression 6) # :nodoc:
-        F = (
-          any expression 7
-        ) # :nodoc:
-      end
-      G = (any expression 8)
-    RUBY
-    foo = @top_level.classes.first
-    bar = foo.classes.first
-    object = @top_level.find_class_or_module('Object')
-    assert_equal ['A', 'D', 'E', 'F'], foo.constants.map(&:name) unless accept_legacy_bug?
-    assert_equal '(any expression 1)', foo.constants.first.value
-    assert_equal ['B'], bar.constants.map(&:name)
-    assert_equal ['C', 'G'], object.constants.map(&:name) unless accept_legacy_bug?
-    all_constants = foo.constants + bar.constants + object.constants
-    assert_equal [@top_level] * 7, all_constants.map(&:file) unless accept_legacy_bug?
-    assert_equal [2, 12, 13, 14, 7, 8, 18], all_constants.map(&:line) unless accept_legacy_bug?
-  end
-
-  def test_nodoc_constant_assigned_without_nodoc_comment
-    util_parser <<~RUBY
-      module Foo
-        A = 1
-        B = 1 # :nodoc:
-        begin
-          C = 1 # :nodoc:
-        rescue
-          C = 2
-        end
-      end
-      Foo::B = 2
-      Foo::D = 2
-    RUBY
-    mod = @top_level.modules.first
-    assert_equal ['A', 'B', 'C', 'D'], mod.constants.map(&:name)
-    assert_equal [false, true, true, false], mod.constants.map(&:received_nodoc)
-  end
-
-  def test_constant_visibility
-    util_parser <<~RUBY
-      class C
-        A = 1
-        B = 2
-        C = 3
-        private_constant
-        private_constant foo
-        private_constant :A
-        private_constant :B, :C
-        public_constant :B
-      end
-    RUBY
-    klass = @store.find_class_named 'C'
-    const_a, const_b, const_c = klass.constants.sort_by(&:name)
-
-    assert_equal 'A', const_a.name
-    assert_equal :private, const_a.visibility
-
-    assert_equal 'B', const_b.name
-    assert_equal :public, const_b.visibility
-
-    assert_equal 'C', const_c.name
-    assert_equal :private, const_c.visibility
-  end
-
-  def test_constant_assignment_to_undefined_module_path
-    util_parser <<~RUBY
-      A::B::C = 1
-    RUBY
-    a = @top_level.find_module_named 'A'
-    b = a.find_module_named 'B'
-    c = b.constants.first
-    assert_equal 'A::B::C', c.full_name
-  end
-
-  def test_constant_alias
-    util_parser <<~RUBY
-      class Foo
-        class Bar; end
-        A = Bar
-        # B = ::Foo # master branch has bug
-        C = Foo::Bar
-      end
-    RUBY
-    klass = @top_level.classes.first
-    assert_equal [], klass.modules.map(&:full_name)
-    assert_equal ['Foo::Bar', 'Foo::A', 'Foo::C'], klass.classes.map(&:full_name)
-    assert_equal ['Foo::A', 'Foo::C'], klass.constants.map(&:full_name)
-    assert_equal 'Foo::A', klass.find_module_named('A').full_name
-    assert_equal 'Foo::C', klass.find_module_named('C').full_name
-  end
-
-  def test_constant_with_singleton_class
-    omit if accept_legacy_bug?
-    util_parser <<~RUBY
-      class Foo
-        class Bar; end
-        A = 1
-        class <<Bar
-          B = 1
-          Foo::Bar::B2 = 1
-        end
-        class Bar
-          C = 1
-        end
-        class <<(p(D = 1))
-          E = 1
-        end
-        class (F = 1)::Baz
-          G = 1
-        end
-        module (H = 1)::Baz
-          I = 1
-        end
-      end
-      J = 1
-    RUBY
-    foo, bar = @store.all_classes
-    assert_equal ['J'], @store.find_class_named('Object').constants.map(&:name)
-    assert_equal ['A', 'D', 'F', 'H'], foo.constants.map(&:name)
-    assert_equal ['B2', 'C'], bar.constants.map(&:name)
-  end
-
-  def test_constant_method
-    util_parser <<~RUBY
-      def Object.foo; end
-      class A
-        class B
-          class C
-            def B.bar; end
-          end
-        end
-      end
-      def UNKNOWN.baz; end
-    RUBY
-
-    object = @store.find_class_named 'Object'
-    klass = @store.find_class_named 'A::B'
-    unknown = @store.find_module_named('UNKNOWN')
-    assert_equal 'Object::foo', object.method_list.first.full_name
-    assert_equal 'A::B::bar', klass.method_list.first.full_name
-    assert_equal 'UNKNOWN::baz', unknown.method_list.first.full_name
-  end
-
-  def test_true_false_nil_method
-    util_parser <<~RUBY
-      def nil.foo; end
-      def true.bar; end
-      def false.baz; end
-    RUBY
-    sep = accept_legacy_bug? ? '::' : '#'
-    assert_equal "NilClass#{sep}foo", @store.find_class_named('NilClass').method_list.first.full_name
-    assert_equal "TrueClass#{sep}bar", @store.find_class_named('TrueClass').method_list.first.full_name
-    assert_equal "FalseClass#{sep}baz", @store.find_class_named('FalseClass').method_list.first.full_name
-  end
-
-  def test_include_extend
-    util_parser <<~RUBY
-      module I; end
-      module E; end
-      class C
-        # my include
-        include I
-        # my extend
-        extend E
-      end
-      module M
-        include I
-        extend E
-      end
-    RUBY
-    klass = @store.find_class_named 'C'
-    mod = @store.find_module_named 'M'
-    assert_equal ['I'], klass.includes.map(&:name)
-    assert_equal ['E'], klass.extends.map(&:name)
-    assert_equal ['I'], mod.includes.map(&:name)
-    assert_equal ['E'], mod.extends.map(&:name)
-    assert_equal 'my include', klass.includes.first.comment.text.strip
-    assert_equal 'my extend', klass.extends.first.comment.text.strip
-  end
-
-  def test_include_extend_to_singleton_class
-    omit 'not implemented' if accept_legacy_bug?
-    util_parser <<~RUBY
-      class Foo
-        class << self
-          # include to singleton class is extend
-          include I
-          # extend to singleton class is not documentable
-          extend E
-        end
-      end
-    RUBY
-
-    klass = @top_level.classes.first
-    assert_equal [], klass.includes.map(&:name)
-    assert_equal ['I'], klass.extends.map(&:name)
-  end
-
-  def test_include_with_module_nesting
-    util_parser <<~RUBY
-      module A
-        module M; end
-        module B
-          module M; end
-          module C
-            module M; end
-            module D
-              module M; end
-            end
-          end
-        end
-      end
-
-      module A::B
-        class C::D::Foo
-          include M
-        end
-      end
-      # TODO: make test pass with the following code appended
-      # module A::B::C
-      #   class D::Foo
-      #     include M
-      #   end
-      # end
-    RUBY
-    klass = @store.find_class_named 'A::B::C::D::Foo'
-    assert_equal 'A::B::M', klass.includes.first.module.full_name
-  end
-
-  def test_various_argument_include
-    omit 'not implemented' if accept_legacy_bug?
-    util_parser <<~RUBY
-      module A; end
-      module B; end
-      module C; end
-      class A
-        include
-        include A, B
-        include 42, C # Maybe not Module#include
-      end
-    RUBY
-    klass = @top_level.classes.first
-    assert_equal ['A', 'B'], klass.includes.map(&:name)
-  end
-
-  def test_require
-    util_parser <<~RUBY
-      require
-      require 'foo/bar'
-      require_relative 'is/not/supported/yet'
-      require "\#{embed}"
-      require (any expression)
-    RUBY
-    assert_equal ['foo/bar'], @top_level.requires.map(&:name)
-  end
-
-  def test_statements_identifier_alias_method_before_original_method
-    # This is not strictly legal Ruby code, but it simulates finding an alias
-    # for a method before finding the original method, which might happen
-    # to rdoc if the alias is in a different file than the original method
-    # and rdoc processes the alias' file first.
-    util_parser <<~RUBY
-      class Foo
-        alias_method :foo2, :foo
-        alias_method :foo3, :foo
-      end
-
-      class Foo
-        def foo(); end
-        alias_method :foo4, :foo
-        alias_method :foo5, :unknown
-      end
-    RUBY
-
-    foo = @top_level.classes.first.method_list[0]
-    assert_equal 'foo', foo.name
-
-    foo2 = @top_level.classes.first.method_list[1]
-    assert_equal 'foo2', foo2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-
-    foo3 = @top_level.classes.first.method_list[2]
-    assert_equal 'foo3', foo3.name
-    assert_equal 'foo', foo3.is_alias_for.name
-
-    foo4 = @top_level.classes.first.method_list.last
-    assert_equal 'foo4', foo4.name
-    assert_equal 'foo', foo4.is_alias_for.name
-
-    assert_equal 'unknown', @top_level.classes.first.external_aliases[0].old_name
-  end
-
-  def test_class_definition_encountered_after_class_reference
-    # The code below is not legal Ruby (Foo must have been defined before
-    # Foo.bar is encountered), but RDoc might encounter Foo.bar before Foo if
-    # they live in different files.
-
-    util_parser <<-RUBY
-      def Foo.bar
-      end
-
-      class Foo < IO
-      end
-    RUBY
-
-    assert_empty @store.modules_hash
-    assert_empty @store.all_modules
-
-    klass = @top_level.classes.first
-    assert_equal 'Foo', klass.full_name
-    assert_equal 'IO', klass.superclass
-
-    assert_equal 'bar', klass.method_list.first.name
-  end
-
-  def test_scan_duplicate_module
-    util_parser <<~RUBY
-      # comment a
-      module Foo
-      end
-
-      # comment b
-      module Foo
-      end
-    RUBY
-
-    mod = @top_level.modules.first
-
-    expected = [
-      RDoc::Comment.new('comment a', @top_level),
-      RDoc::Comment.new('comment b', @top_level)
-    ]
-
-    assert_equal expected, mod.comment_location.map { |c, _l| c }
-  end
-
-  def test_enddoc
-    util_parser <<~RUBY
-      class A
-        class B; end
-        # :enddoc:
-        # :startdoc:
-        class C; end
-      end
-      class D; end
-      # :enddoc:
-      # :startdoc:
-      class E; end
-    RUBY
-
-    assert_equal ['A', 'A::B', 'D'], @store.all_classes.reject(&:ignored?).map(&:full_name)
-  end
-
-  def test_top_level_enddoc
-    util_parser <<~RUBY
-      class A; end
-      # :enddoc:
-      class B; end
-      # :startdoc:
-      class C; end
-    RUBY
-
-    assert_equal ['A'], @top_level.classes.reject(&:ignored?).map(&:name)
-  end
-
-  def test_section
-    util_parser <<~RUBY
-      class Foo
-        # :section: section1
-        attr :a1
-        def m1; end
-        # :section:
-        def m2; end
-        attr :a2
-        # :section: section2
-        def m3; end
-        attr :a3
-        module Bar
-          def m4; end
-          attr :a4
-          # :section: section3
-          def m5; end
-          attr :a5
-        end
-        attr :a6
-        def m6; end
-      end
-    RUBY
-    foo = @top_level.classes.first
-    bar = foo.modules.first
-    assert_equal ['section1', nil, 'section2', 'section2'], foo.attributes.map { |m| m.section.title }
-    assert_equal ['section1', nil, 'section2', 'section2'], foo.method_list.map { |m| m.section.title }
-    assert_equal [nil, 'section3'], bar.attributes.map { |m| m.section.title }
-    assert_equal [nil, 'section3'], bar.method_list.map { |m| m.section.title }
-  end
-
-  def test_category
-    util_parser <<~RUBY
-      class A
-        # :category: cat1
-
-        # comment
-        attr :a1
-        attr :a2
-        def m1; end
-        # :category: cat2
-
-        # comment
-        def m2; end
-        def m3; end
-        attr :a3
-
-        # :category:
-        attr :a4
-        # :category:
-        def m4; end
-
-        ##
-        # :category: cat3
-        def m5; end
-
-        ##
-        # :category: cat4
-        # :method: m6
-      end
-    RUBY
-    klass = @top_level.classes.first
-    assert_equal ['cat1', nil, nil, nil], klass.attributes.map { |m| m.section.title }
-    assert_equal [nil, 'cat2', nil, nil, 'cat3', 'cat4'], klass.method_list.map { |m| m.section.title }
-  end
-
-  def test_ignore_constant_assign_rhs
-    # Struct is not supported yet. Right hand side of constant assignment should be ignored.
-    util_parser <<~RUBY
-      module Foo
-        def a; end
-        Bar = Struct.new do
-          def b; end
-          ##
-          # :method: c
-        end
-        Bar::Baz = Struct.new do
-          def d; end
-          ##
-          # :method: e
-        end
-        ##
-        # :method: f
-      end
-    RUBY
-    mod = @top_level.modules.first
-    assert_equal ['a', 'f'], mod.method_list.map(&:name)
-  end
-
-  def test_include_extend_suppressed_within_block
-    util_parser <<~RUBY
-      module M; end
-      module N; end
-      module O: end
-      class A
-        metaprogramming do
-          include M
-          extend N
-          class B
-            include M
-            extend N
-          end
-          include M
-          extend N
-        end
-        include O
-        extend O
-      end
-    RUBY
-    a, b = @store.all_classes
-    unless accept_legacy_bug?
-      assert_equal ['O'], a.includes.map(&:name)
-      assert_equal ['O'], a.extends.map(&:name)
-    end
-    assert_equal ['M'], b.includes.map(&:name)
-    assert_equal ['N'], b.extends.map(&:name)
-  end
-
-  def test_multibyte_method_name
-    content = <<~RUBY
-      class Foo
-        # comment ω
-        def ω() end
-      end
-    RUBY
-    util_parser content
-    assert_equal Encoding::UTF_8, content.encoding
-    method = @top_level.classes.first.method_list.first
-    assert_equal 'comment ω', method.comment.text.strip
-    assert_equal 'ω', method.name
-  end
-
-  def test_options_encoding
-    @options.encoding = Encoding::CP852
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # this is my method
-        add_my_method :foo
-      end
-    RUBY
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'this is my method', foo.comment.text
-    assert_equal Encoding::CP852, foo.comment.text.encoding
-  end
-
-  def test_read_directive_linear_performance
-    assert_linear_performance((1..5).map{|i|10**i}) do |i|
-      util_parser '# ' + '0'*i + '=000:' + "\n def f; end"
-    end
-  end
-
-
-  def test_markup_first_comment
-    util_parser <<~RUBY
-      # :markup: rd
-
-      # ((*awesome*))
-      class C
-        # ((*radical*))
-        def m
-        end
-      end
-    RUBY
-
-    c = @top_level.classes.first
-    assert_equal 'rd', c.comment.format
-    assert_equal 'rd', c.method_list.first.comment.format
-  end
-
-  def test_markup_override
-    util_parser <<~RUBY
-      # *awesome*
-      class C
-        # :markup: rd
-        # ((*radical*))
-        def m1; end
-
-        # *awesome*
-        def m2; end
-      end
-    RUBY
-
-    c = @top_level.classes.first
-
-    assert_equal 'rdoc', c.comment.format
-
-    assert_equal ['rd', 'rdoc'], c.method_list.map { |m| m.comment.format }
-  end
-
-  def test_tomdoc_meta
-    util_parser <<~RUBY
-      # :markup: tomdoc
-
-      class C
-
-        # Signature
-        #
-        #   find_by_<field>[_and_<field>...](args)
-        #
-        # field - A field name.
-
-      end
-    RUBY
-
-    c = @top_level.classes.first
-
-    m = c.method_list.first
-
-    assert_equal "find_by_<field>[_and_<field>...]", m.name
-    assert_equal "find_by_<field>[_and_<field>...](args)\n", m.call_seq
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[field],
-            para('A field name.'))))
-    expected.file = @top_level
-
-    assert_equal expected, m.comment.parse
-  end
-end
-
-class RDocParserPrismRubyTest < RDoc::TestCase
-  include RDocParserPrismTestCases
-
-  def accept_legacy_bug?
-    false
-  end
-
-  def util_parser(content)
-    @parser = RDoc::Parser::PrismRuby.new @top_level, content, @options, @stats
-    @parser.scan
-  end
-end
-
-# Run the same test with the original RDoc::Parser::Ruby
-class RDocParserRubyWithPrismRubyTestCasesTest < RDoc::TestCase
-  include RDocParserPrismTestCases
-
-  def accept_legacy_bug?
-    true
-  end
-
-  def util_parser(content)
-    @parser = RDoc::Parser::Ruby.new @top_level, content, @options, @stats
-    @parser.scan
-  end
-end unless ENV['RDOC_USE_PRISM_PARSER']
diff --git a/test/mri/rdoc/rdoc/rdoc_parser_rd_test.rb b/test/mri/rdoc/rdoc/rdoc_parser_rd_test.rb
deleted file mode 100644
index a1e552252a4..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_parser_rd_test.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocParserRdTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @RP = RDoc::Parser
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_file
-    assert_kind_of RDoc::Parser::Text, util_parser('')
-  end
-
-  def test_class_can_parse
-    temp_dir do
-      FileUtils.touch 'foo.rd'
-      assert_equal @RP::RD, @RP.can_parse('foo.rd')
-
-      FileUtils.touch 'foo.rd.ja'
-      assert_equal @RP::RD, @RP.can_parse('foo.rd.ja')
-    end
-  end
-
-  def test_scan
-    parser = util_parser 'it ((*really*)) works'
-
-    expected = doc(para('it <em>really</em> works'))
-    expected.file = @top_level
-
-    parser.scan
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def util_parser(content)
-    RDoc::Parser::RD.new @top_level, content, @options, @stats
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_parser_ruby_test.rb b/test/mri/rdoc/rdoc/rdoc_parser_ruby_test.rb
deleted file mode 100644
index 2f4665a25fe..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_parser_ruby_test.rb
+++ /dev/null
@@ -1,4396 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-return if ENV['RDOC_USE_PRISM_PARSER']
-
-class RDocParserRubyTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    @filename = @tempfile.path
-
-    # Some tests need two paths.
-    @tempfile2 = Tempfile.new self.class.name
-    @filename2 = @tempfile2.path
-
-    @top_level = @store.add_file @filename
-    @top_level2 = @store.add_file @filename2
-
-    @options = RDoc::Options.new
-    @options.quiet = true
-    @options.option_parser = OptionParser.new
-
-    @comment = RDoc::Comment.new '', @top_level
-
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-    @tempfile2.close!
-  end
-
-  def test_collect_first_comment
-    p = util_parser <<-CONTENT
-# first
-
-# second
-class C; end
-    CONTENT
-
-    comment = p.collect_first_comment
-
-    assert_equal RDoc::Comment.new("# first\n", @top_level), comment
-  end
-
-  def test_collect_first_comment_encoding
-    @options.encoding = Encoding::CP852
-
-    p = util_parser <<-CONTENT
-# first
-
-# second
-class C; end
-    CONTENT
-
-    comment = p.collect_first_comment
-
-    assert_equal Encoding::CP852, comment.text.encoding
-  end
-
-  def test_collect_first_comment_rd_hash
-    parser = util_parser <<-CONTENT
-=begin
-first
-=end
-
-# second
-class C; end
-    CONTENT
-
-    comment = parser.collect_first_comment
-
-    assert_equal RDoc::Comment.new("first\n", @top_level), comment
-  end
-
-  def test_get_class_or_module
-    ctxt = RDoc::Context.new
-    ctxt.store = @store
-
-    cont, name_t, given_name = util_parser('A')    .get_class_or_module ctxt
-
-    assert_equal ctxt, cont
-    assert_equal 'A', name_t[:text]
-    assert_equal 'A', given_name
-
-    cont, name_t, given_name = util_parser('B::C') .get_class_or_module ctxt
-
-    b = @store.find_module_named('B')
-    assert_equal b, cont
-    assert_equal [@top_level], b.in_files
-    assert_equal 'C', name_t[:text]
-    assert_equal 'B::C', given_name
-
-    cont, name_t, given_name = util_parser('D:: E').get_class_or_module ctxt
-
-    assert_equal @store.find_module_named('D'), cont
-    assert_equal 'E', name_t[:text]
-    assert_equal 'D::E', given_name
-
-    assert_nothing_raised do
-      util_parser("A::\nB").get_class_or_module ctxt
-    end
-  end
-
-  def test_get_class_or_module_document_children
-    ctxt = @top_level.add_class RDoc::NormalClass, 'A'
-    ctxt.stop_doc
-
-    util_parser('B::C').get_class_or_module ctxt
-
-    b = @store.find_module_named('A::B')
-    assert b.ignored?
-
-    d = @top_level.add_class RDoc::NormalClass, 'A::D'
-
-    util_parser('D::E').get_class_or_module ctxt
-
-    refute d.ignored?
-  end
-
-  def test_get_class_or_module_ignore_constants
-    ctxt = RDoc::Context.new
-    ctxt.store = @store
-
-    util_parser('A')   .get_class_or_module ctxt, true
-    util_parser('A::B').get_class_or_module ctxt, true
-
-    assert_empty ctxt.constants
-    assert_empty @store.modules_hash.keys
-    assert_empty @store.classes_hash.keys
-  end
-
-  def test_get_class_specification
-    assert_equal 'A',    util_parser('A')   .get_class_specification
-    assert_equal 'A::B', util_parser('A::B').get_class_specification
-    assert_equal '::A',  util_parser('::A').get_class_specification
-
-    assert_equal 'self', util_parser('self').get_class_specification
-
-    assert_equal '',     util_parser('').get_class_specification
-
-    assert_equal '',     util_parser('$g').get_class_specification
-  end
-
-  def test_get_symbol_or_name
-    util_parser "* & | + 5 / 4"
-
-    assert_equal '*', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '&', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '|', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '+', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-    @parser.get_tk
-    @parser.skip_tkspace
-
-    assert_equal '/', @parser.get_symbol_or_name
-  end
-
-  def test_suppress_parents
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-    b = a.add_class RDoc::NormalClass, 'B'
-    c = b.add_class RDoc::NormalClass, 'C'
-
-    util_parser ''
-
-    @parser.suppress_parents c, a
-
-    assert c.suppressed?
-    assert b.suppressed?
-    refute a.suppressed?
-  end
-
-  def test_suppress_parents_documented
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-    b = a.add_class RDoc::NormalClass, 'B'
-    b.add_comment RDoc::Comment.new("hello"), @top_level
-    c = b.add_class RDoc::NormalClass, 'C'
-
-    util_parser ''
-
-    @parser.suppress_parents c, a
-
-    assert c.suppressed?
-    refute b.suppressed?
-    refute a.suppressed?
-  end
-
-  def test_look_for_directives_in_attr
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :attr: my_attr\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr: my_attr\n", comment.text
-
-    comment = RDoc::Comment.new "# :attr_reader: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr_reader: my_method\n", comment.text
-
-    comment = RDoc::Comment.new "# :attr_writer: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr_writer: my_method\n", comment.text
-  end
-
-  def test_look_for_directives_in_commented
-    util_parser ""
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# how to make a section:
-# # :section: new section
-    COMMENT
-
-    @parser.look_for_directives_in @top_level, comment
-
-    section = @top_level.current_section
-    assert_nil   section.title
-    assert_nil   section.comment
-
-    assert_equal "# how to make a section:\n# # :section: new section\n",
-                 comment.text
-  end
-
-  def test_look_for_directives_in_method
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :method: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :method: my_method\n", comment.text
-
-    comment = RDoc::Comment.new "# :singleton-method: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :singleton-method: my_method\n", comment.text
-  end
-
-  def test_look_for_directives_in_section
-    util_parser ""
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# :section: new section
-# woo stuff
-    COMMENT
-
-    @parser.look_for_directives_in @top_level, comment
-
-    section = @top_level.current_section
-    assert_equal 'new section', section.title
-    assert_equal [comment("# woo stuff\n", @top_level)], section.comments
-
-    assert_empty comment
-  end
-
-  def test_look_for_directives_in_unhandled
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :unhandled: blah\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal 'blah', @top_level.metadata['unhandled']
-  end
-
-  def test_parse_for_in
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new '', @top_level
-
-    util_parser <<ruby
-def sum(n)
-  result = 0
-  for i in 1..n do
-    result += i
-  end
-  result
-end
-ruby
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    sum = klass.method_list.first
-    assert_equal 'sum',      sum.name
-    assert_equal @top_level, sum.file
-  end
-
-  def test_parse_on_ignored_nl_with_nil_text
-    util_parser <<ruby
-class Foo
-  def meth
-    variable # comment
-      .chain
-  end
-end
-ruby
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">meth</span>
-  <span class="ruby-identifier">variable</span> <span class="ruby-comment"># comment</span>
-    .<span class="ruby-identifier">chain</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @store.find_class_named 'Foo'
-    meth = foo.method_list.first
-
-    assert_equal 'meth',     meth.name
-    assert_equal @top_level, meth.file
-
-    markup_code = meth.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_redefined_op_with_constant
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new '', @top_level
-
-    util_parser <<ruby
-def meth
-  Integer::**()
-  return Integer::**()
-  break Integer::**()
-  case Integer::**()
-  when Integer::**()
-  end
-  while Integer::**()
-  end
-  yield Integer::**()
-  defined? Integer::**()
-  if Integer::**()
-  end
-end
-ruby
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    meth = klass.method_list.first
-    assert_equal 'meth',     meth.name
-  end
-
-  def test_parse_alias
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_equal 'bar',      alas.old_name
-    assert_equal 'next=',    alas.new_name
-    assert_equal klass,      alas.parent
-    assert_equal 'comment',  alas.comment
-    assert_equal @top_level, alas.file
-    assert_equal 1,          alas.line
-  end
-
-  def test_parse_alias_singleton
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::SINGLE, tk, 'comment'
-
-    assert_equal 'bar',      alas.old_name
-    assert_equal 'next=',    alas.new_name
-    assert_equal klass,      alas.parent
-    assert_equal 'comment',  alas.comment
-    assert_equal @top_level, alas.file
-    assert                   alas.singleton
-  end
-
-  def test_parse_alias_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_alias_meta
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias m.chop m"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_nil alas
-  end
-
-  def test_parse_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 1, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_accessor :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-
-    bar = klass.attributes.last
-    assert_equal 'bar', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-  end
-
-  def test_parse_attr_accessor_with_newline
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_accessor :foo, :bar,\n  :baz,\n  :qux"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 4, klass.attributes.length
-
-    foo = klass.attributes[0]
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-
-    bar = klass.attributes[1]
-    assert_equal 'bar', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-
-    bar = klass.attributes[2]
-    assert_equal 'baz', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-
-    bar = klass.attributes[3]
-    assert_equal 'qux', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-  end
-
-  def test_parse_attr_accessor_nodoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr_accessor :foo, :bar # :nodoc:"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 0, klass.attributes.length
-  end
-
-  def test_parse_attr_accessor_nodoc_track
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    @options.visibility = :nodoc
-
-    util_parser "attr_accessor :foo, :bar # :nodoc:"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    refute_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr_accessor :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor_writer
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_writer :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'W', foo.rw
-    assert_equal "my attr", foo.comment.text
-    assert_equal @top_level, foo.file
-
-    bar = klass.attributes.last
-    assert_equal 'bar', bar.name
-    assert_equal 'W', bar.rw
-    assert_equal "my attr", bar.comment.text
-  end
-
-  def test_parse_meta_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal "my method", foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_accessor
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_accessor: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_named
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 1, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_reader
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_reader: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'R', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :attr: \n# my method\n", @top_level
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_meta_attr_writer
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_writer: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'W', foo.rw
-    assert_equal "my method", foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_class
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level, :ruby
-
-    util_parser "class Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'my class', foo.comment.text
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_singleton
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser <<-RUBY
-class C
-  class << self
-  end
-end
-    RUBY
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    c = @top_level.classes.first
-    assert_equal 'C', c.full_name
-    assert_equal 1, c.line
-  end
-
-  def test_parse_class_ghost_method
-    util_parser <<-CLASS
-class Foo
-  ##
-  # :method: blah
-  # my method
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal 'Foo#blah', blah.full_name
-    assert_equal 3, blah.line
-    assert_equal @top_level, blah.file
-  end
-
-  def test_parse_class_in_a_file_repeatedly
-    @filename = 'a.rb'
-    comment_a = RDoc::Comment.new "# aaa\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_a
-    comment_b = RDoc::Comment.new "# bbb\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_b
-
-    @filename = 'b.rb'
-    comment_c = RDoc::Comment.new "# ccc\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_c
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal [[comment_a, @top_level],
-                  [comment_b, @top_level],
-                  [comment_c, @top_level]], foo.comment_location
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_ghost_method_yields
-    util_parser <<-CLASS
-class Foo
-  ##
-  # :method:
-  # :call-seq:
-  #   yields(name)
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal 'Foo#yields', blah.full_name
-    assert_equal 'yields(name)', blah.call_seq
-    assert_equal 3, blah.line
-    assert_equal @top_level, blah.file
-  end
-
-  def test_parse_call_syntax_sugar_for_constant
-    util_parser <<-CODE
-Foo = proc{}
-Foo::()
-    CODE
-
-    assert_nothing_raised do
-      @parser.scan
-    end
-  end
-
-  def test_parse_class_multi_ghost_methods
-    util_parser <<-'CLASS'
-class Foo
-  ##
-  # :method: one
-  #
-  # my method
-
-  ##
-  # :method: two
-  #
-  # my method
-
-  [:one, :two].each do |t|
-    eval("def #{t}; \"#{t}\"; end")
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    assert_equal 2, foo.method_list.length
-  end
-
-  def test_parse_class_nodoc
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class Foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_single_root
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class << ::Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @store.all_modules.first
-    assert_equal 'Foo', foo.full_name
-  end
-
-  def test_parse_class_stopdoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty @top_level.classes.first.comment
-  end
-
-  def test_parse_class_lower_name_warning
-    @options.verbosity = 2
-    stds = capture_output do
-      util_parser "class foo\nend"
-      tk = @parser.get_tk
-      @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-    end
-    err = stds[1]
-    assert_match(/Expected class name or '<<\'\. Got/, err)
-  end
-
-  def test_parse_syntax_error_code
-    @options.verbosity = 2
-    stds = capture_output do
-      begin
-        util_parser <<INVALID_CODE
-# invalid class name
-class Invalid::@@Code
-end
-INVALID_CODE
-        @parser.scan
-      rescue
-      end
-    end
-    err = stds[1]
-
-    expected = <<EXPECTED
-RDoc::Parser::Ruby failure around line 2 of
-#{@filename}
-
-class Invalid::@@Code
-EXPECTED
-
-    assert_match(expected, err)
-  end
-
-  def test_parse_multi_ghost_methods
-    util_parser <<-'CLASS'
-class Foo
-  ##
-  # :method: one
-  #
-  # my method
-
-  ##
-  # :method: two
-  #
-  # my method
-
-  [:one, :two].each do |t|
-    eval("def #{t}; \"#{t}\"; end")
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    assert_equal 2, foo.method_list.length
-  end
-
-  def test_parse_const_fail_w_meta
-    util_parser <<-CLASS
-class ConstFailMeta
-  ##
-  # :attr: one
-  #
-  # an attribute
-
-  OtherModule.define_attr(self, :one)
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    const_fail_meta = @top_level.classes.first
-    assert_equal 'ConstFailMeta', const_fail_meta.full_name
-
-    assert_equal 1, const_fail_meta.attributes.length
-  end
-
-  def test_parse_class_nested_superclass
-    foo = @top_level.add_module RDoc::NormalModule, 'Foo'
-
-    util_parser "class Bar < Super\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class foo, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    bar = foo.classes.first
-    assert_equal 'Super', bar.superclass
-  end
-
-  def test_parse_module
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level, :ruby
-
-    util_parser "module Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'my module', foo.comment.text
-  end
-
-  def test_parse_module_nodoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level
-
-    util_parser "module Foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-  end
-
-  def test_parse_module_stopdoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level
-
-    util_parser "module Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-  end
-
-  def test_parse_class_colon3
-    code = <<-CODE
-class A
-  class ::B
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A B], @store.all_classes.map { |c| c.full_name }.sort
-  end
-
-  def test_parse_class_colon3_self_reference
-    code = <<-CODE
-class A::B
-  class ::A
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A A::B], @store.all_classes.map { |c| c.full_name }.sort
-  end
-
-  def test_parse_class_single
-    code = <<-CODE
-class A
-  class << B
-  end
-  class << d = Object.new
-    def foo; end
-    alias bar foo
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A], @store.all_classes.map { |c| c.full_name }
-
-    modules = @store.all_modules.sort_by { |c| c.full_name }
-    assert_equal %w[A::B A::d], modules.map { |c| c.full_name }
-
-    b = modules.first
-    assert_equal 2,  b.line
-
-    # make sure method/alias was not added to enclosing class/module
-    a = @store.classes_hash['A']
-    assert_empty a.method_list
-
-    # make sure non-constant-named module will be removed from documentation
-    d = @store.modules_hash['A::d']
-    assert d.remove_from_documentation?
-  end
-
-  def test_parse_class_single_gvar
-    code = <<-CODE
-class << $g
-  def m
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, ''
-
-    assert_empty @store.all_classes
-    mod = @store.all_modules.first
-
-    refute mod.document_self
-
-    assert_empty mod.method_list
-  end
-
-  # TODO this is really a Context#add_class test
-  def test_parse_class_object
-    code = <<-CODE
-module A
-  class B
-  end
-  class Object
-  end
-  class C < Object
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_module @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A],
-      @store.all_modules.map { |c| c.full_name }
-    assert_equal %w[A::B A::C A::Object],
-      @store.all_classes.map { |c| c.full_name }.sort
-
-    assert_equal 'Object',    @store.classes_hash['A::B'].superclass
-    assert_equal 'Object',    @store.classes_hash['A::Object'].superclass
-    assert_equal 'A::Object', @store.classes_hash['A::C'].superclass.full_name
-  end
-
-  def test_parse_class_mistaken_for_module
-    # The code below is not strictly legal Ruby (Foo must have been defined
-    # before Foo::Bar is encountered), but RDoc might encounter Foo::Bar
-    # before Foo if they live in different files.
-
-    code = <<-RUBY
-class Foo::Bar
-end
-
-module Foo::Baz
-end
-
-class Foo
-end
-    RUBY
-
-    util_parser code
-
-    @parser.scan
-
-    assert_equal %w[Foo::Baz], @store.modules_hash.keys
-    assert_empty @top_level.modules
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    bar = foo.classes.first
-    assert_equal 'Foo::Bar', bar.full_name
-
-    baz = foo.modules.first
-    assert_equal 'Foo::Baz', baz.full_name
-  end
-
-  def test_parse_class_definition_encountered_after_class_reference
-    # The code below is not legal Ruby (Foo must have been defined before
-    # Foo.bar is encountered), but RDoc might encounter Foo.bar before Foo if
-    # they live in different files.
-
-    code = <<-EOF
-def Foo.bar
-end
-
-class Foo < IO
-end
-    EOF
-
-    util_parser code
-
-    @parser.scan
-
-    assert_empty @store.modules_hash
-    assert_empty @store.all_modules
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'IO', foo.superclass
-
-    bar = foo.method_list.first
-    assert_equal 'bar', bar.name
-  end
-
-  def test_parse_module_relative_to_top_level_namespace
-    comment = RDoc::Comment.new <<-EOF, @top_level
-#
-# Weirdly named module
-#
-EOF
-
-    code = <<-EOF
-#{comment.text}
-module ::Foo
-  class Helper
-  end
-end
-EOF
-
-    util_parser code
-    @parser.scan()
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'Weirdly named module', foo.comment.text
-
-    helper = foo.classes.first
-    assert_equal 'Foo::Helper', helper.full_name
-  end
-
-  def test_parse_comment_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my attr\n", @top_level, :ruby
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo',      foo.name
-    assert_equal 'RW',       foo.rw
-    assert_equal 'my attr',  foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1,          foo.line
-
-    assert_equal true,       foo.document_children
-    assert_equal true,       foo.document_self
-    assert_equal false,      foo.done_documenting
-    assert_equal false,      foo.force_documentation
-    assert_equal klass,      foo.parent
-    assert_equal :public,    foo.visibility
-    assert_equal "\n",       foo.text
-
-    assert_equal klass.current_section, foo.section
-  end
-
-  def test_parse_comment_attr_attr_reader
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr_reader: foo\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo',      foo.name
-    assert_equal 'R',        foo.rw
-  end
-
-  def test_parse_comment_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my attr\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_comment_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :method: foo\n# my method\n", @top_level, :ruby
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 2,           foo.line
-
-    assert_equal [],          foo.aliases
-    assert_nil                foo.block_params
-    assert_nil                foo.call_seq
-    assert_nil                foo.is_alias_for
-    assert_equal true,        foo.document_children
-    assert_equal true,        foo.document_self
-    assert_equal '',          foo.params
-    assert_equal false,       foo.done_documenting
-    assert_equal false,       foo.dont_rename_initialize
-    assert_equal false,       foo.force_documentation
-    assert_equal klass,       foo.parent
-    assert_equal false,       foo.singleton
-    assert_equal :public,     foo.visibility
-    assert_equal "\n",        foo.text
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 2, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 2"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_comment_method_args
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk,
-                          comment("##\n# :method: foo\n# :args: a, b\n")
-
-    foo = klass.method_list.first
-    assert_equal 'foo',  foo.name
-    assert_equal 'a, b', foo.params
-  end
-
-  def test_parse_comment_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :method: foo\n# my method\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_constant
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    foo = klass.constants.first
-
-    assert_equal 'A', foo.name
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_constant_attrasgn
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A[k] = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert klass.constants.empty?
-  end
-
-  def test_parse_constant_alias
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-    klass.add_class RDoc::NormalClass, 'B'
-
-    util_parser "A = B"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_equal [], klass.modules.map(&:full_name)
-    assert_equal ['Foo::B', 'Foo::A'], klass.classes.map(&:full_name)
-    assert_equal ['Foo::A'], klass.constants.map(&:full_name)
-    assert_equal 'Foo::A', klass.find_module_named('A').full_name
-  end
-
-  def test_parse_constant_alias_same_name
-    foo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @top_level.add_class RDoc::NormalClass, 'Bar'
-    bar = foo.add_class RDoc::NormalClass, 'Bar'
-
-    assert @store.find_class_or_module('::Bar')
-
-    util_parser "A = ::Bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant foo, tk, @comment
-
-    assert_equal 'A', bar.find_module_named('A').full_name
-  end
-
-  def test_parse_constant_in_method
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser 'A::B = v'
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment, true
-
-    assert_empty klass.constants
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[Foo], @store.classes_hash.keys
-  end
-
-  def test_parse_constant_rescue
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A => e"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_empty klass.constants
-    assert_empty klass.modules
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[Foo], @store.classes_hash.keys
-  end
-
-  def test_parse_constant_stopdoc
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-    klass.stop_doc
-
-    util_parser "A = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_empty klass.constants
-  end
-
-  def test_parse_comment_nested
-    content = <<-CONTENT
-A::B::C = 1
-    CONTENT
-
-    util_parser content
-
-    tk = @parser.get_tk
-
-    parsed = @parser.parse_constant @top_level, tk, 'comment'
-
-    assert parsed
-
-    a = @top_level.find_module_named 'A'
-    b = a.find_module_named 'B'
-    c = b.constants.first
-
-    assert_equal 'A::B::C', c.full_name
-    assert_equal 'comment', c.comment
-  end
-
-  def test_parse_class_the_same_of_outside
-    util_parser <<-RUBY
-module A
-  class A::B
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    assert_includes @store.modules_hash, 'A'
-    module_a = @store.find_module_named 'A'
-    refute_empty module_a.classes_hash
-    assert_includes module_a.classes_hash, 'B'
-    refute_includes module_a.classes_hash, 'A'
-  end
-
-  def test_parse_constant_the_same_of_outside
-    util_parser <<-RUBY
-module A
-  class B
-    class C
-    end
-  end
-
-  def self.foo
-    A::B::C
-  end
-end
-    RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">foo</span>
-  <span class="ruby-constant">A</span><span class="ruby-operator">::</span><span class="ruby-constant">B</span><span class="ruby-operator">::</span><span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    module_a = @store.find_module_named 'A'
-    foo = module_a.method_list.first
-    markup_code = foo.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_constant_with_bracket
-    util_parser <<-RUBY
-class Klass
-end
-
-class Klass2
-  CONSTANT = Klass
-end
-
-class Klass3
-  CONSTANT_2 = {}
-  CONSTANT_2[1] = Klass
-end
-    RUBY
-
-    @parser.scan
-
-    klass = @store.find_class_named 'Klass'
-    klass2 = @store.find_class_named 'Klass2'
-    klass3 = @store.find_class_named 'Klass3'
-    assert_equal klass, klass2.constants.first.is_alias_for
-    refute_equal klass, klass3.constants.first.is_alias_for
-    assert_nil klass3.find_module_named 'CONSTANT_2'
-  end
-
-  def test_parse_extend_or_include_extend
-    klass = RDoc::NormalClass.new 'C'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "# my extend\n", @top_level, :ruby
-
-    util_parser "extend I"
-
-    @parser.get_tk # extend
-
-    @parser.parse_extend_or_include RDoc::Extend, klass, comment
-
-    assert_equal 1, klass.extends.length
-
-    ext = klass.extends.first
-    assert_equal 'I', ext.name
-    assert_equal 'my extend', ext.comment.text
-    assert_equal @top_level, ext.file
-  end
-
-  def test_parse_extend_or_include_include
-    klass = RDoc::NormalClass.new 'C'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "# my include\n", @top_level, :ruby
-
-    util_parser "include I"
-
-    @parser.get_tk # include
-
-    @parser.parse_extend_or_include RDoc::Include, klass, comment
-
-    assert_equal 1, klass.includes.length
-
-    incl = klass.includes.first
-    assert_equal 'I', incl.name
-    assert_equal 'my include', incl.comment.text
-    assert_equal @top_level, incl.file
-  end
-
-  def test_parse_meta_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 1,           foo.line
-
-    assert_equal [],      foo.aliases
-    assert_nil            foo.block_params
-    assert_nil            foo.call_seq
-    assert_equal true,    foo.document_children
-    assert_equal true,    foo.document_self
-    assert_equal false,   foo.done_documenting
-    assert_equal false,   foo.dont_rename_initialize
-    assert_equal false,   foo.force_documentation
-    assert_nil            foo.is_alias_for
-    assert_equal '',      foo.params
-    assert_equal klass,   foo.parent
-    assert_equal false,   foo.singleton
-    assert_equal 'add_my_method :foo', foo.text
-    assert_equal :public, foo.visibility
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 1, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 1"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 1, :char_no => 0, :kind => :on_ident, :text => 'add_my_method' },
-      { :line_no => 1, :char_no => 13, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 14, :kind => :on_symbol, :text => ':foo' },
-      { :line_no => 1, :char_no => 18, :kind => :on_comma, :text => ',' },
-      { :line_no => 1, :char_no => 19, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 20, :kind => :on_symbol, :text => ':bar' },
-      { :line_no => 1, :char_no => 24, :kind => :on_nl, :text => "\n" }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_meta_method_block
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    content = <<-CONTENT
-inline(:my_method) do |*args|
-  "this method causes z to disappear"
-end
-    CONTENT
-
-    util_parser content
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    rest = { :line_no => 3, :char_no => 3, :kind => :on_nl, :text => "\n" }
-    tk = @parser.get_tk
-    tk = { :line_no => tk[:line_no], :char_no => tk[:char_no], :kind => tk[:kind], :text => tk[:text] }
-    assert_equal rest, tk
-  end
-
-  def test_parse_meta_method_define_method
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "define_method :foo do end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_name
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :method: woo_hoo!\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'woo_hoo!',  foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_singleton
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :singleton-method:\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal true, foo.singleton, 'singleton method'
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_singleton_name
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :singleton-method: woo_hoo!\n# my method\n",
-                        @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'woo_hoo!', foo.name
-    assert_equal true, foo.singleton, 'singleton method'
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_string_name
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method 'foo'"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_meta_method_unknown
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method ('foo')"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'unknown', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "def foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 1,           foo.line
-
-    assert_equal [],        foo.aliases
-    assert_nil              foo.block_params
-    assert_nil              foo.call_seq
-    assert_nil              foo.is_alias_for
-    assert_equal true,      foo.document_children
-    assert_equal true,      foo.document_self
-    assert_equal '()',      foo.params
-    assert_equal false,     foo.done_documenting
-    assert_equal false,     foo.dont_rename_initialize
-    assert_equal false,     foo.force_documentation
-    assert_equal klass,     foo.parent
-    assert_equal false,     foo.singleton
-    assert_equal :public,   foo.visibility
-    assert_equal 'def foo', foo.text
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 1, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 1" },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 1, :char_no => 0, :kind => :on_kw, :text => 'def' },
-      { :line_no => 1, :char_no => 3, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 4, :kind => :on_ident, :text => 'foo' },
-      { :line_no => 1, :char_no => 7, :kind => :on_lparen, :text => '(' },
-      { :line_no => 1, :char_no => 8, :kind => :on_rparen, :text => ')' },
-      { :line_no => 1, :char_no => 9, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 10, :kind => :on_symbol, :text => ':bar' },
-      { :line_no => 1, :char_no => 14, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 15, :kind => :on_kw, :text => 'end' }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_redefinable_methods
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "", @top_level
-
-    redefinable_ops = %w[| ^ & <=> == === =~ > >= < <= << >> + - * / % ** ~ +@ -@ [] []= ` !  != !~]
-    redefinable_ops.each do |redefinable_op|
-      util_parser "def #{redefinable_op}\nend\n"
-      tk = @parser.get_tk
-      @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-    end
-
-    klass.method_list.each do |method|
-      assert_equal :on_ident, method.token_stream[5][:kind]
-      assert_includes redefinable_ops, method.token_stream[5][:text]
-    end
-  end
-
-  def test_parse_method_with_args_directive
-    util_parser <<-RUBY
-class C
-  def meth_with_args_after # :args: a, b, c
-  end
-
-  ##
-  # :args: d, e, f
-  def meth_with_args_before
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    assert_equal 'C#meth_with_args_after', c.method_list[0].full_name
-    assert_equal 'a, b, c', c.method_list[0].params
-    assert_equal 'C#meth_with_args_before', c.method_list[1].full_name
-    assert_equal 'd, e, f', c.method_list[1].params
-  end
-
-  def test_parse_method_bracket
-    util_parser <<-RUBY
-class C
-  def []; end
-  def self.[]; end
-  def []=; end
-  def self.[]=; end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    assert_equal 4, c.method_list.size
-    assert_equal 'C#[]', c.method_list[0].full_name
-    assert_equal 'C::[]', c.method_list[1].full_name
-    assert_equal 'C#[]=', c.method_list[2].full_name
-    assert_equal 'C::[]=', c.method_list[3].full_name
-    assert c.aliases.empty?
-  end
-
-  def test_parse_method_alias
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def m() alias a b; end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert klass.aliases.empty?
-  end
-
-  def test_parse_method_ampersand
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def self.&\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    ampersand = klass.method_list.first
-    assert_equal '&', ampersand.name
-    assert            ampersand.singleton
-  end
-
-  def test_parse_method_constant
-    c = RDoc::Constant.new 'CONST', nil, ''
-    m = @top_level.add_class RDoc::NormalModule, 'M'
-    m.add_constant c
-
-    util_parser "def CONST.m() end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method m, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[M], @store.classes_hash.keys
-  end
-
-  def test_parse_method_false
-    util_parser "def false.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'FalseClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_funky
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def (blah).foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_gvar
-    util_parser "def $stdout.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert @top_level.method_list.empty?
-  end
-
-  def test_parse_method_gvar_insane
-    util_parser "def $stdout.foo() class << $other; end; end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert @top_level.method_list.empty?
-
-    assert_empty @store.all_classes
-
-    assert_equal 1, @store.all_modules.length
-
-    refute @store.all_modules.first.document_self
-  end
-
-  def test_parse_method_internal_gvar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def $blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_internal_ivar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def @blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_internal_lvar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_nil
-    util_parser "def nil.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'NilClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_nodoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment('')
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_nodoc_track
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    @options.visibility = :nodoc
-
-    util_parser "def foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment('')
-
-    refute_empty klass.method_list
-  end
-
-  def test_parse_method_no_parens
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2 = {}\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2 = {})', foo.params
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_method_parameters_comment
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2 # some useful comment\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2)', foo.params
-  end
-
-  def test_parse_method_parameters_comment_continue
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2, # some useful comment\narg3\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2, arg3)', foo.params
-  end
-
-  def test_parse_method_parameters_with_paren_comment_continue
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo(arg1, arg2, # some useful comment\narg3)\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2, arg3)', foo.params
-  end
-
-  def test_parse_method_star
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def self.*\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    ampersand = klass.method_list.first
-    assert_equal '*', ampersand.name
-    assert            ampersand.singleton
-  end
-
-  def test_parse_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "def foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_toplevel
-    klass = @top_level
-
-    util_parser "def foo arg1, arg2\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    object = @store.find_class_named 'Object'
-
-    foo = object.method_list.first
-    assert_equal 'Object#foo', foo.full_name
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_method_toplevel_class
-    klass = @top_level
-
-    util_parser "def Object.foo arg1, arg2\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    object = @store.find_class_named 'Object'
-
-    foo = object.method_list.first
-    assert_equal 'Object::foo', foo.full_name
-  end
-
-  def test_parse_method_true
-    util_parser "def true.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'TrueClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_utf8
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    method = "def ω() end"
-
-    assert_equal Encoding::UTF_8, method.encoding
-
-    util_parser method
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    omega = klass.method_list.first
-    assert_equal "def \317\211", omega.text
-  end
-
-  def test_parse_method_dummy
-    util_parser ".method() end"
-
-    @parser.parse_method_dummy @top_level
-
-    assert_nil @parser.get_tk
-  end
-
-  def test_parse_method_or_yield_parameters_hash
-    util_parser "({})\n"
-
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    result = @parser.parse_method_or_yield_parameters m
-
-    assert_equal '({})', result
-  end
-
-  def test_parse_statements_class_if
-    util_parser <<-CODE
-module Foo
-  X = if TRUE then
-        ''
-      end
-
-  def blah
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name, 'module Foo'
-
-    methods = foo.method_list
-    assert_equal 1, methods.length
-    assert_equal 'Foo#blah', methods.first.full_name
-  end
-
-  def test_parse_statements_postfix_if_unless
-    util_parser <<-CODE
-class C
-  def foo
-    1 if nil
-  end
-
-  def bar
-    2 unless nil
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    c = @top_level.classes.first
-    assert_equal 'C', c.full_name, 'class C'
-
-    methods = c.method_list
-    assert_equal 2, methods.length
-    assert_equal 'C#foo', methods[0].full_name
-    assert_equal 'C#bar', methods[1].full_name
-  end
-
-  def test_parse_statements_postfix_if_unless_with_expr_mid
-    util_parser <<-CODE
-class A
-  class B
-    def foo
-      return if nil
-    end
-  end
-
-  class C
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    a = @top_level.classes.first
-    assert_equal 'A', a.full_name, 'class A'
-    assert_equal 2, a.classes.length
-    b = a.classes[0]
-    assert_equal 'A::B', b.full_name, 'class A::B'
-    c = a.classes[1]
-    assert_equal 'A::C', c.full_name, 'class A::C'
-  end
-
-  def test_parse_statements_class_nested
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "module Foo\n#{comment.text}class Bar\nend\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name, 'module Foo'
-
-    bar = foo.classes.first
-    assert_equal 'Foo::Bar', bar.full_name, 'class Foo::Bar'
-    assert_equal 'my method', bar.comment.text
-  end
-
-  def test_parse_statements_def_percent_string_pound
-    util_parser "class C\ndef a\n%r{#}\n%r{\#{}}\nend\ndef b() end\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    x = @top_level.classes.first
-
-    assert_equal 2, x.method_list.length
-    a = x.method_list.first
-
-
-    expected = [
-      {
-        :line_no => 2, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@filename}, line 2"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 2, :char_no => 0, :kind => :on_kw, :text => 'def' },
-      { :line_no => 2, :char_no => 3, :kind => :on_sp, :text => ' ' },
-      { :line_no => 2, :char_no => 4, :kind => :on_ident, :text => 'a' },
-      { :line_no => 2, :char_no => 5, :kind => :on_nl, :text => "\n" },
-      { :line_no => 3, :char_no => 0, :kind => :on_regexp, :text => '%r{#}' },
-      { :line_no => 3, :char_no => 5, :kind => :on_nl, :text => "\n" },
-      { :line_no => 4, :char_no => 0, :kind => :on_regexp, :text => '%r{#{}}' },
-      { :line_no => 4, :char_no => 7, :kind => :on_nl, :text => "\n" },
-      { :line_no => 5, :char_no => 0, :kind => :on_kw, :text => 'end' }
-    ]
-    parsed_stream = a.token_stream.map { |tk|
-      {
-        :line_no => tk[:line_no],
-        :char_no => tk[:char_no],
-        :kind => tk[:kind],
-        :text => tk[:text]
-      }
-    }
-
-    assert_equal expected, parsed_stream
-  end
-
-  def test_parse_statements_encoding
-    @options.encoding = Encoding::CP852
-
-    content = <<-EOF
-class Foo
-  ##
-  # this is my method
-  add_my_method :foo
-end
-    EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'this is my method', foo.comment.text
-    assert_equal Encoding::CP852, foo.comment.text.encoding
-  end
-
-  def test_parse_statements_enddoc
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :enddoc:"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert klass.done_documenting
-  end
-
-  def test_parse_statements_enddoc_top_level
-    util_parser "\n# :enddoc:"
-
-    assert_throws :eof do
-      @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-    end
-  end
-
-  def test_parse_statements_identifier_meta_method
-    content = <<-EOF
-class Foo
-  ##
-  # this is my method
-  add_my_method :foo
-end
-    EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_statements_identifier_alias_method
-    content = <<-RUBY
-class Foo
-  def foo() end
-  alias_method :foo2, :foo
-end
-    RUBY
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list[0]
-    assert_equal 'foo', foo.name
-
-    foo2 = @top_level.classes.first.method_list.last
-    assert_equal 'foo2', foo2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-    assert @top_level.classes.first.aliases.empty?
-  end
-
-  def test_parse_statements_identifier_alias_method_before_original_method
-    # This is not strictly legal Ruby code, but it simulates finding an alias
-    # for a method before finding the original method, which might happen
-    # to rdoc if the alias is in a different file than the original method
-    # and rdoc processes the alias' file first.
-    content = <<-EOF
-class Foo
-  alias_method :foo2, :foo
-
-  alias_method :foo3, :foo
-
-  def foo()
-  end
-
-  alias_method :foo4, :foo
-
-  alias_method :foo5, :unknown
-end
-EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list[0]
-    assert_equal 'foo', foo.name
-
-    foo2 = @top_level.classes.first.method_list[1]
-    assert_equal 'foo2', foo2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-
-    foo3 = @top_level.classes.first.method_list[2]
-    assert_equal 'foo3', foo3.name
-    assert_equal 'foo', foo3.is_alias_for.name
-
-    foo4 = @top_level.classes.first.method_list.last
-    assert_equal 'foo4', foo4.name
-    assert_equal 'foo', foo4.is_alias_for.name
-
-    assert_equal 'unknown', @top_level.classes.first.external_aliases[0].old_name
-  end
-
-  def test_parse_statements_identifier_args
-    comment = "##\n# :args: x\n# :method: b\n# my method\n"
-
-    util_parser "module M\n#{comment}def_delegator :a, :b, :b\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    m = @top_level.modules.first
-    assert_equal 'M', m.full_name
-
-    b = m.method_list.first
-    assert_equal 'M#b', b.full_name
-    assert_equal 'x', b.params
-    assert_equal 'my method', b.comment.text
-
-    assert_nil m.params, 'Module parameter not removed'
-  end
-
-  def test_parse_statements_identifier_constant
-    sixth_constant = <<-EOF
-Class.new do
-  rule :file do
-    all(x, y, z) {
-      def value
-        find(:require).each {|r| require r.value }
-        find(:grammar).map {|g| g.value }
-      end
-      def min; end
-    }
-  end
-end
-    EOF
-
-    content = <<-EOF
-class Foo
-  FIRST_CONSTANT = 5
-
-  SECOND_CONSTANT = [
-     1,
-     2,
-     3
-  ]
-
-  THIRD_CONSTANT = {
-     :foo => 'bar',
-     :x => 'y'
-  }
-
-  FOURTH_CONSTANT = SECOND_CONSTANT.map do |element|
-    element + 1
-    element + 2
-  end
-
-  FIFTH_CONSTANT = SECOND_CONSTANT.map { |element| element + 1 }
-
-  SIXTH_CONSTANT = #{sixth_constant}
-
-  SEVENTH_CONSTANT = proc { |i| begin i end }
-
-  EIGHTH_CONSTANT = "a" \\
-                    "b"
-end
-EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    constants = @top_level.classes.first.constants
-
-    constant = constants[0]
-    assert_equal 'FIRST_CONSTANT', constant.name
-    assert_equal '5', constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[1]
-    assert_equal 'SECOND_CONSTANT', constant.name
-    assert_equal "[\n1,\n2,\n3\n]", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[2]
-    assert_equal 'THIRD_CONSTANT', constant.name
-    assert_equal "{\n:foo => 'bar',\n:x => 'y'\n}", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[3]
-    assert_equal 'FOURTH_CONSTANT', constant.name
-    assert_equal "SECOND_CONSTANT.map do |element|\nelement + 1\nelement + 2\nend", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[4]
-    assert_equal 'FIFTH_CONSTANT', constant.name
-    assert_equal 'SECOND_CONSTANT.map { |element| element + 1 }', constant.value
-    assert_equal @top_level, constant.file
-
-    # TODO: parse as class
-    constant = constants[5]
-    assert_equal 'SIXTH_CONSTANT', constant.name
-    assert_equal sixth_constant.lines.map(&:strip).join("\n"), constant.value
-    assert_equal @top_level, constant.file
-
-    # TODO: parse as method
-    constant = constants[6]
-    assert_equal 'SEVENTH_CONSTANT', constant.name
-    assert_equal "proc { |i| begin i end }", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[7]
-    assert_equal 'EIGHTH_CONSTANT', constant.name
-    assert_equal "\"a\" \\\n\"b\"", constant.value
-    assert_equal @top_level, constant.file
-  end
-
-  def test_parse_statements_identifier_attr
-    content = "class Foo\nattr :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'R', foo.rw
-  end
-
-  def test_parse_statements_identifier_attr_accessor
-    content = "class Foo\nattr_accessor :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-  end
-
-  def test_parse_statements_identifier_define_method
-    util_parser <<-RUBY
-class C
-  ##
-  # :method: a
-  define_method :a do end
-  ##
-  # :method: b
-  define_method :b do end
-end
-    RUBY
-
-    @parser.parse_statements @top_level
-    c = @top_level.classes.first
-
-    assert_equal %w[a b], c.method_list.map { |m| m.name }
-  end
-
-  def test_parse_statements_identifier_include
-    content = "class Foo\ninclude Bar\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.name
-    assert_equal 1, foo.includes.length
-  end
-
-  def test_parse_statements_identifier_module_function
-    content = "module Foo\ndef foo() end\nmodule_function :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo, s_foo = @top_level.modules.first.method_list
-    assert_equal 'foo',    foo.name,       'instance method name'
-    assert_equal :private, foo.visibility, 'instance method visibility'
-    assert_equal false,    foo.singleton,  'instance method singleton'
-
-    assert_equal 'foo',   s_foo.name,       'module function name'
-    assert_equal :public, s_foo.visibility, 'module function visibility'
-    assert_equal true,    s_foo.singleton,  'module function singleton'
-  end
-
-  def test_parse_statements_identifier_private
-    content = "class Foo\nprivate\ndef foo() end\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal :private, foo.visibility
-  end
-
-  def test_parse_statements_identifier_public_class_method
-    content = <<-CONTENT
-class Date
-  def self.now; end
-  private_class_method :now
-end
-
-class DateTime < Date
-  public_class_method :now
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    date, date_time = @top_level.classes.sort_by { |c| c.full_name }
-
-    date_now      = date.method_list.first
-    date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
-
-    assert_equal :private, date_now.visibility
-    assert_equal :public,  date_time_now.visibility
-  end
-
-  def test_parse_statements_identifier_private_class_method
-    content = <<-CONTENT
-class Date
-  def self.now; end
-  public_class_method :now
-end
-
-class DateTime < Date
-  private_class_method :now
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    # TODO sort classes by default
-    date, date_time = @top_level.classes.sort_by { |c| c.full_name }
-
-    date_now      = date.method_list.first
-    date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
-
-    assert_equal :public,  date_now.visibility,      date_now.full_name
-    assert_equal :private, date_time_now.visibility, date_time_now.full_name
-  end
-
-  def test_parse_statements_complex_condition_in_for
-    util_parser <<RUBY
-class Foo
-  def blah()
-    for i in (k)...n do
-    end
-    for i in (k)...n
-    end
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-  <span class="ruby-keyword">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword">in</span> (<span class="ruby-identifier">k</span>)<span class="ruby-operator">...</span><span class="ruby-identifier">n</span> <span class="ruby-keyword">do</span>
-  <span class="ruby-keyword">end</span>
-  <span class="ruby-keyword">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword">in</span> (<span class="ruby-identifier">k</span>)<span class="ruby-operator">...</span><span class="ruby-identifier">n</span>
-  <span class="ruby-keyword">end</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_instance_operation_method
-    util_parser <<-RUBY
-class Foo
-  def self.& end
-end
-    RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">&amp;</span> <span class="ruby-keyword">end</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_statements_postfix_if_after_heredocbeg
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  def blah()
-    <<-EOM if true
-    EOM
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-    <span class="ruby-identifier">&lt;&lt;-EOM</span> <span class="ruby-keyword">if</span> <span class="ruby-keyword">true</span>
-<span class="ruby-value"></span><span class="ruby-identifier">    EOM</span>
-  <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_mutable_heredocbeg
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  def blah()
-    @str = -<<-EOM
-    EOM
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-    <span class="ruby-ivar">@str</span> = <span class="ruby-identifier">-&lt;&lt;-EOM</span>
-<span class="ruby-value"></span><span class="ruby-identifier">    EOM</span>
-  <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_heredoc_end
-    code = "A = <<eos\n""OK\n""eos\n"
-    util_parser code
-    @parser.parse_statements @top_level
-    @parser.scan
-    c = @top_level.classes.first.constants.first
-    assert_equal("A", c.name)
-
-    util_parser code.gsub(/$/, "\r")
-    @parser.parse_statements @top_level
-    @parser.scan
-    c = @top_level.classes.first.constants.first
-    assert_equal("A", c.name)
-  end
-
-  def test_parse_statements_method_oneliner_with_regexp
-    util_parser <<RUBY
-class Foo
-  def blah() /bar/ end
-end
-RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>() <span class="ruby-regexp">/bar/</span> <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_statements_embdoc_in_document
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  # doc
-  #
-  #   =begin
-  #   test embdoc
-  #   =end
-  #
-  def blah
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-<p>doc
-
-<pre class="ruby"><span class="ruby-comment">=begin
-test embdoc
-=end</span>
-</pre>
-EXPECTED
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_comment = blah.search_record[6]
-    assert_equal expected, markup_comment
-  end
-
-  def test_parse_require_dynamic_string
-    content = <<-RUBY
-prefix = 'path'
-require "\#{prefix}/a_library"
-require 'test'
-RUBY
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_equal 1, @top_level.requires.length
-  end
-
-  def test_parse_postfix_nodoc
-    util_parser <<-RUBY
-class A
-end # :nodoc:
-
-class B
-  def a
-  end # :nodoc:
-
-  def b
-  end
-end
-RUBY
-
-    @parser.parse_statements @top_level
-
-    c_a = @top_level.classes.select(&:document_self).first
-    assert_equal 'B', c_a.full_name
-
-    assert_equal 2, @top_level.classes.length
-    assert_equal 1, @top_level.classes.count(&:document_self)
-    assert_equal 1, c_a.method_list.length
-    assert_equal 'B#b', c_a.method_list.first.full_name
-  end
-
-  def test_parse_statements_identifier_require
-    content = "require 'bar'"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_equal 1, @top_level.requires.length
-  end
-
-  def test_parse_statements_identifier_yields
-    comment = "##\n# :yields: x\n# :method: b\n# my method\n"
-
-    util_parser "module M\n#{comment}def_delegator :a, :b, :b\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    m = @top_level.modules.first
-    assert_equal 'M', m.full_name
-
-    b = m.method_list.first
-    assert_equal 'M#b', b.full_name
-    assert_equal 'x', b.block_params
-    assert_equal 'my method', b.comment.text
-
-    assert_nil m.params, 'Module parameter not removed'
-  end
-
-  def test_parse_statements_nodoc_identifier_alias
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\nalias :old :new # :nodoc:"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_nodoc_identifier_alias_method
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\nalias_method :old :new # :nodoc:"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_stopdoc_alias
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nalias old new"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_stopdoc_identifier_alias_method
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nalias_method :old :new"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_stopdoc_identifier_metaprogrammed
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\n# attr :meta"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.method_list
-    assert_empty klass.attributes
-  end
-
-  def test_parse_statements_stopdoc_constant
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nA = v"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.constants
-  end
-
-  def test_parse_statements_stopdoc_def
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\ndef m\n end"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_statements_super
-    m = RDoc::AnyMethod.new '', 'm'
-    util_parser 'super'
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, m
-
-    assert m.calls_super
-  end
-
-  def test_parse_statements_super_no_method
-    content = "super"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_nil @parser.get_tk
-  end
-
-  def test_parse_statements_while_begin
-    util_parser <<-RUBY
-class A
-  def a
-    while begin a; b end
-    end
-  end
-
-  def b
-  end
-end
-    RUBY
-
-    @parser.parse_statements @top_level
-
-    c_a = @top_level.classes.first
-    assert_equal 'A', c_a.full_name
-
-    assert_equal 1, @top_level.classes.length
-
-    m_a = c_a.method_list.first
-    m_b = c_a.method_list.last
-
-    assert_equal 'A#a', m_a.full_name
-    assert_equal 'A#b', m_b.full_name
-  end
-
-
-  def test_parse_symbol_in_paren_arg
-    util_parser <<RUBY
-class Foo
-  def blah
-  end
-  private(:blah)
-end
-RUBY
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal :private, blah.visibility
-  end
-
-  def test_parse_symbol_in_arg
-    util_parser '[:blah, "blah", "#{blah}", blah]'
-    @parser.get_tk # skip '['
-
-    assert_equal 'blah', @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_equal 'blah', @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_nil @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_nil @parser.parse_symbol_in_arg
-  end
-
-  def test_parse_percent_symbol
-    content = '%s[foo bar]'
-    util_parser content
-    tk = @parser.get_tk
-    assert_equal :on_symbol, tk[:kind]
-    assert_equal content, tk[:text]
-  end
-
-  def test_parse_statements_alias_method
-    content = <<-CONTENT
-class A
-  alias_method :a, :[] unless c
-end
-
-B = A
-
-class C
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    # HACK where are the assertions?
-  end
-
-  def test_parse_top_level_statements_enddoc
-    util_parser <<-CONTENT
-# :enddoc:
-    CONTENT
-
-    assert_throws :eof do
-      @parser.parse_top_level_statements @top_level
-    end
-  end
-
-  def test_parse_top_level_statements_stopdoc
-    @top_level.stop_doc
-    content = "# this is the top-level comment"
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    assert_empty @top_level.comment
-  end
-
-  def test_parse_top_level_statements_stopdoc_integration
-    content = <<-CONTENT
-# :stopdoc:
-
-class Example
-  def method_name
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    assert_equal 1, @top_level.classes.length
-    assert_empty @top_level.modules
-
-    assert @top_level.find_module_named('Example').ignored?
-  end
-
-  # This tests parse_comment
-  def test_parse_top_level_statements_constant_nodoc_integration
-    content = <<-CONTENT
-class A
-  C = A # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    klass = @top_level.find_module_named('A')
-
-    c = klass.constants.first
-
-    assert_nil c.document_self, 'C should not be documented'
-  end
-
-  def test_parse_yield_in_braces_with_parens
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo\nn.times { |i| yield nth(i) }\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal 'nth(i)', foo.block_params
-  end
-
-  def test_read_directive
-    parser = util_parser '# :category: test'
-
-    directive, value = parser.read_directive %w[category]
-
-    assert_equal 'category', directive
-    assert_equal 'test', value
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_allow
-    parser = util_parser '# :category: test'
-
-    directive = parser.read_directive []
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_empty
-    parser = util_parser '# test'
-
-    directive = parser.read_directive %w[category]
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_no_comment
-    parser = util_parser ''
-
-    directive = parser.read_directive %w[category]
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_one_liner
-    parser = util_parser 'AAA = 1 # :category: test'
-
-    directive, value = parser.read_directive %w[category]
-
-    assert_equal 'category', directive
-    assert_equal 'test', value
-
-    assert_equal :on_const, parser.get_tk[:kind]
-  end
-
-  def test_read_directive_linear_performance
-    omit "JRuby intermittently times out" if RUBY_ENGINE == 'jruby'
-    pre = ->(i) {util_parser '# ' + '0'*i + '=000:'}
-    assert_linear_performance((1..5).map{|i|10**i}, pre: pre) do |parser|
-      assert_nil parser.read_directive []
-    end
-  end
-
-  def test_read_documentation_modifiers
-    c = RDoc::Context.new
-
-    parser = util_parser '# :category: test'
-
-    parser.read_documentation_modifiers c, %w[category]
-
-    assert_equal 'test', c.current_section.title
-  end
-
-  def test_read_documentation_modifiers_notnew
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :notnew: test'
-
-    parser.read_documentation_modifiers m, %w[notnew]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_read_documentation_modifiers_not_dash_new
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :not-new: test'
-
-    parser.read_documentation_modifiers m, %w[not-new]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_read_documentation_modifiers_not_new
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :not_new: test'
-
-    parser.read_documentation_modifiers m, %w[not_new]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_sanity_integer
-    util_parser '1'
-    assert_equal '1', @parser.get_tk[:text]
-
-    util_parser '1.0'
-    assert_equal '1.0', @parser.get_tk[:text]
-  end
-
-  def test_sanity_interpolation
-    last_tk = nil
-    util_parser 'class A; B = "#{c}"; end'
-
-    while tk = @parser.get_tk do last_tk = tk end
-
-    assert_equal 'end', last_tk[:text]
-  end
-
-  # If you're writing code like this you're doing it wrong
-
-  def test_sanity_interpolation_crazy
-    util_parser '"#{"#{"a")}" if b}"'
-
-    assert_equal '"#{"#{"a")}" if b}"', @parser.get_tk[:text]
-    assert_nil @parser.get_tk
-  end
-
-  def test_sanity_interpolation_curly
-    util_parser '%{ #{} }'
-
-    assert_equal '%{ #{} }', @parser.get_tk[:text]
-    assert_nil @parser.get_tk
-  end
-
-  def test_sanity_interpolation_format
-    util_parser '"#{stftime("%m-%d")}"'
-
-    while @parser.get_tk do end
-  end
-
-  def test_sanity_symbol_interpolation
-    util_parser ':"#{bar}="'
-
-    while @parser.get_tk do end
-  end
-
-  def test_scan_cr
-    content = <<-CONTENT
-class C\r
-  def m\r
-    a=\\\r
-      123\r
-  end\r
-end\r
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 1, c.method_list.length
-  end
-
-  def test_scan_block_comment
-    content = <<-CONTENT
-=begin rdoc
-Foo comment
-=end
-
-class Foo
-
-=begin
-m comment
-=end
-
-  def m() end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-
-    assert_equal 'Foo comment', foo.comment.text
-
-    m = foo.method_list.first
-
-    assert_equal 'm comment', m.comment.text
-  end
-
-  def test_scan_block_comment_nested # Issue #41
-    content = <<-CONTENT
-require 'something'
-=begin rdoc
-findmeindoc
-=end
-module Foo
-    class Bar
-    end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.modules.first
-
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'findmeindoc', foo.comment.text
-
-    bar = foo.classes.first
-
-    assert_equal 'Foo::Bar', bar.full_name
-    assert_equal '', bar.comment.text
-  end
-
-  def test_scan_block_comment_notflush
-  ##
-  #
-  # The previous test assumes that between the =begin/=end blocks that there
-  # is only one line, or minima formatting directives. This test tests for
-  # those who use the =begin block with longer / more advanced formatting
-  # within.
-  #
-  ##
-    content = <<-CONTENT
-=begin rdoc
-
-= DESCRIPTION
-
-This is a simple test class
-
-= RUMPUS
-
-Is a silly word
-
-=end
-class StevenSimpleClass
-  # A band on my iPhone as I wrote this test
-  FRUIT_BATS="Make nice music"
-
-=begin rdoc
-A nice girl
-=end
-
-  def lauren
-    puts "Summoning Lauren!"
-  end
-end
-    CONTENT
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-
-    assert_equal "= DESCRIPTION\n\nThis is a simple test class\n\n= RUMPUS\n\nIs a silly word",
-      foo.comment.text
-
-    m = foo.method_list.first
-
-    assert_equal 'A nice girl', m.comment.text
-  end
-
-  def test_scan_class_nested_nodoc
-    content = <<-CONTENT
-class A::B # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    visible = @store.all_classes_and_modules.select { |mod| mod.display? }
-
-    assert_empty visible.map { |mod| mod.full_name }
-  end
-
-  def test_scan_constant_in_method
-    content = <<-CONTENT # newline is after M is important
-module M
-  def m
-    A
-    B::C
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    m = @top_level.modules.first
-
-    assert_empty m.constants
-
-    assert_empty @store.classes_hash.keys
-    assert_equal %w[M], @store.modules_hash.keys
-  end
-
-  def test_scan_constant_in_rescue
-    content = <<-CONTENT # newline is after M is important
-module M
-  def m
-  rescue A::B
-  rescue A::C => e
-  rescue A::D, A::E
-  rescue A::F,
-         A::G
-  rescue H
-  rescue I => e
-  rescue J, K
-  rescue L =>
-    e
-  rescue M;
-  rescue N,
-         O => e
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    m = @top_level.modules.first
-
-    assert_empty m.constants
-
-    assert_empty @store.classes_hash.keys
-    assert_equal %w[M], @store.modules_hash.keys
-  end
-
-  def test_scan_constant_nodoc
-    content = <<-CONTENT # newline is after M is important
-module M
-
-  C = v # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.modules.first.constants.first
-
-    assert c.documented?
-  end
-
-  def test_scan_constant_nodoc_block
-    content = <<-CONTENT # newline is after M is important
-module M
-
-  C = v do # :nodoc:
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.modules.first.constants.first
-
-    assert c.documented?
-  end
-
-  def test_scan_duplicate_module
-    content = <<-CONTENT
-# comment a
-module Foo
-end
-
-# comment b
-module Foo
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.modules.first
-
-    expected = [
-      RDoc::Comment.new('comment a', @top_level),
-      RDoc::Comment.new('comment b', @top_level)
-    ]
-
-    assert_equal expected, foo.comment_location.map { |c, l| c }
-  end
-
-  def test_scan_meta_method_block
-    content = <<-CONTENT
-class C
-
-  ##
-  #  my method
-
-  inline(:my_method) do |*args|
-    "this method used to cause z to disappear"
-  end
-
-  def z
-  end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    assert_equal 2, @top_level.classes.first.method_list.length
-  end
-
-  def test_scan_method_semi_method
-    content = <<-CONTENT
-class A
-  def self.m() end; def self.m=() end
-end
-
-class B
-  def self.m() end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    a = @store.find_class_named 'A'
-    assert a, 'missing A'
-
-    assert_equal 2, a.method_list.length
-
-    b = @store.find_class_named 'B'
-    assert b, 'missing B'
-
-    assert_equal 1, b.method_list.length
-  end
-
-  def test_scan_markup_override
-    content = <<-CONTENT
-# *awesome*
-class C
-  # :markup: rd
-  # ((*radical*))
-  def m
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 'rdoc', c.comment.format
-
-    assert_equal 'rd', c.method_list.first.comment.format
-  end
-
-  def test_scan_markup_first_comment
-    content = <<-CONTENT
-# :markup: rd
-
-# ((*awesome*))
-class C
-  # ((*radical*))
-  def m
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 'rd', c.comment.format
-
-    assert_equal 'rd', c.method_list.first.comment.format
-  end
-
-  def test_scan_rails_routes
-    util_parser <<-ROUTES_RB
-namespace :api do
-  scope module: :v1 do
-  end
-end
-    ROUTES_RB
-
-    @parser.scan
-
-    assert_empty @top_level.classes
-    assert_empty @top_level.modules
-  end
-
-  def test_scan_tomdoc_meta
-    util_parser <<-RUBY
-# :markup: tomdoc
-
-class C
-
-  # Signature
-  #
-  #   find_by_<field>[_and_<field>...](args)
-  #
-  # field - A field name.
-
-end
-
-    RUBY
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    m = c.method_list.first
-
-    assert_equal "find_by_<field>[_and_<field>...]", m.name
-    assert_equal "find_by_<field>[_and_<field>...](args)\n", m.call_seq
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[field],
-            para('A field name.'))))
-    expected.file = @top_level
-
-    assert_equal expected, m.comment.parse
-  end
-
-  def test_scan_stopdoc
-    util_parser <<-RUBY
-class C
-  # :stopdoc:
-  class Hidden
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    hidden = c.classes.first
-
-    refute hidden.document_self
-    assert hidden.ignored?
-  end
-
-  def test_scan_stopdoc_class_alias
-    util_parser <<-RUBY
-# :stopdoc:
-module A
-  B = C
-end
-    RUBY
-
-    @parser.scan
-
-    assert_empty @store.all_classes
-
-    assert_equal 1, @store.all_modules.length
-    m = @store.all_modules.first
-
-    assert m.ignored?
-  end
-
-  def test_scan_stopdoc_nested
-    util_parser <<-RUBY
-# :stopdoc:
-class A::B
-end
-    RUBY
-
-    @parser.scan
-
-    a   = @store.modules_hash['A']
-    a_b = @store.classes_hash['A::B']
-
-    refute a.document_self, 'A is inside stopdoc'
-    assert a.ignored?,      'A is inside stopdoc'
-
-    refute a_b.document_self, 'A::B is inside stopdoc'
-    assert a_b.ignored?,      'A::B is inside stopdoc'
-  end
-
-  def test_scan_struct_self_brackets
-    util_parser <<-RUBY
-class C < M.m
-  def self.[]
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-    assert_equal %w[C::[]], c.method_list.map { |m| m.full_name }
-  end
-
-  def test_scan_visibility
-    util_parser <<-RUBY
-class C
-   def a() end
-
-   private :a
-
-   class << self
-     def b() end
-     private :b
-   end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    c_a = c.find_method_named 'a'
-
-    assert_equal :private, c_a.visibility
-    refute c_a.singleton
-
-    c_b = c.find_method_named 'b'
-
-    assert_equal :private, c_b.visibility
-    assert c_b.singleton
-  end
-
-  def test_scan_visibility_count
-    util_parser <<-RUBY
-class C < Original::Base
-  class C2 < Original::Base
-    def m0() end
-    def m1() end
-
-    private
-
-    def m2() end
-    def m3() end
-    def m4() end
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C::C2'
-
-    private_method_count = c.method_list.count { |m| :private == m.visibility }
-    assert_equal 3, private_method_count
-
-    public_method_count = c.method_list.count { |m| :public == m.visibility }
-    assert_equal 2, public_method_count
-  end
-
-  def test_scan_constant_visibility
-    util_parser <<-RUBY
-class C
-   CONST_A = 123
-
-   CONST_B = 234
-   private_constant :CONST_B
-
-   CONST_C = 345
-   public_constant :CONST_C
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-    const_a, const_b, const_c = c.constants.sort_by(&:name)
-
-    assert_equal 'CONST_A', const_a.name
-    assert_equal :public, const_a.visibility
-
-    assert_equal 'CONST_B', const_b.name
-    assert_equal :private, const_b.visibility
-
-    assert_equal 'CONST_C', const_c.name
-    assert_equal :public, const_c.visibility
-  end
-
-  def test_document_after_rescue_inside_paren
-    util_parser <<-RUBY
-class C
-  attr_accessor :sample if (1.inexistent_method rescue false)
-  # first
-  # second
-  def a
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    c_a = c.find_method_named 'a'
-    assert_equal "first\nsecond", c_a.comment.text
-  end
-
-  def test_singleton_method_via_eigenclass
-    util_parser <<-RUBY
-class C
-   class << self
-     def a() end
-   end
-end
-    RUBY
-
-    @parser.scan
-
-    c   = @store.find_class_named 'C'
-    c_a = c.find_method_named 'a'
-
-    assert_equal :public, c_a.visibility
-    assert c_a.singleton
-  end
-
-  def test_stopdoc_after_comment
-    util_parser <<-EOS
-      module Bar
-        # hello
-        module Foo
-          # :stopdoc:
-        end
-        # there
-        class Baz
-          # :stopdoc:
-        end
-      end
-    EOS
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.modules.first.modules.first
-    assert_equal 'Foo', foo.name
-    assert_equal 'hello', foo.comment.text
-
-    baz = @top_level.modules.first.classes.first
-    assert_equal 'Baz', baz.name
-    assert_equal 'there', baz.comment.text
-  end
-
-  def util_parser(content)
-    @parser = RDoc::Parser::Ruby.new @top_level, content, @options, @stats
-  end
-
-  def util_two_parsers(first_file_content, second_file_content)
-    util_parser first_file_content
-
-    @parser2 = RDoc::Parser::Ruby.new @top_level2, @filename,
-                                      second_file_content, @options, @stats
-  end
-
-  def test_parse_const_third_party
-    util_parser <<-CLASS
-class A
-  true if B
-  true if B::C
-  true if B::C::D
-
-  module B
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    a = @top_level.classes.first
-    assert_equal 'A', a.full_name
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A::B'], visible
-  end
-
-  def test_parse_const_alias_defined_elsewhere
-    util_parser <<-CLASS
-module A
-  Aliased = Defined
-end
-
-module A
-  class Defined
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @top_level.modules.first
-    assert_equal 'A', a.full_name
-    aliased = a.constants.first
-    assert_equal 'A::Aliased', aliased.full_name
-    assert_equal [], a.modules.map(&:full_name)
-    assert_equal ['A::Defined', 'A::Aliased'], a.classes.map(&:full_name)
-    assert_equal ['A::Aliased'], a.constants.map(&:full_name)
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A'], visible
-  end
-
-  def test_parse_const_alias_defined_far_away
-    util_parser <<-CLASS
-module A
-  Aliased = ::B::C::Defined
-end
-
-module B
-  module C
-    class Defined
-    end
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @top_level.modules.first
-    assert_equal 'A', a.full_name
-    assert_empty a.classes
-    assert_empty a.modules
-    assert_equal ['A::Aliased'], a.constants.map(&:full_name)
-
-    defined = @store.find_class_named 'B::C::Defined'
-    assert_equal 'B::C::Defined', defined.full_name
-
-    aliased = @store.find_class_named 'B::C::Aliased'
-    assert_equal 'B::C::Aliased', aliased.full_name
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A', 'B', 'B::C'], visible
-  end
-
-  def test_parse_include_by_dynamic_definition
-    util_parser <<-CLASS
-module A
-  class B
-    include(Module.new do
-      def e(m)
-      end
-    end)
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_without_paren
-    util_parser <<-CLASS
-module A
-  class B
-    include(Module.new do
-      def e m
-      end
-    end)
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_via_variable
-    util_parser <<-CLASS
-module A
-  class B
-    m = Module.new do
-      def e(m)
-      end
-    end
-    include m
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_with_brace
-    util_parser <<-CLASS
-module A
-  class B
-    extend(e {
-      def f(g)
-      end
-    })
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_directly
-    util_parser <<-CLASS
-module A
-  class B
-    include Module.new do
-      def e m
-      end
-    end
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_included
-    util_parser <<-CLASS
-module A
-  module B
-    extend ActiveSupport::Concern
-    included do
-      ##
-      # :singleton-method:
-      # Hello
-      mattr_accessor :foo
-    end
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_module_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    meth = a_b.method_list.first
-    assert_equal 'foo', meth.name
-    assert_equal 'Hello', meth.comment.text
-  end
-
-  def test_end_that_doesnt_belong_to_class_doesnt_change_visibility
-    util_parser <<-CLASS
-class A
-  private
-
-  begin
-  end
-
-  # Hello
-  def foo() end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_class_named 'A'
-    assert_equal 'A', a.full_name
-    assert_equal 'foo', a.find_method_named('foo').name
-    meth = a.method_list.first
-    assert_equal 'Hello', meth.comment.text
-  end
-
-  def test_parenthesized_cdecl
-    util_parser <<-RUBY
-module DidYouMean
-  class << (NameErrorCheckers = Object.new)
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    refute_predicate @store.find_class_or_module('DidYouMean'), :nil?
-    refute_predicate @store.find_class_or_module('DidYouMean::NameErrorCheckers'), :nil?
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_parser_simple_test.rb b/test/mri/rdoc/rdoc/rdoc_parser_simple_test.rb
deleted file mode 100644
index 7296a40064f..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_parser_simple_test.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocParserSimpleTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_initialize_metadata
-    parser = util_parser ":unhandled: \n"
-
-    assert_includes @top_level.metadata, 'unhandled'
-
-    assert_equal ":unhandled: \n", parser.content
-  end
-
-  def test_remove_coding_comment
-    parser = util_parser <<-TEXT
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    TEXT
-
-    parser.scan
-
-    expected = <<-TEXT.strip
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    TEXT
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  # RDoc stops processing comments if it finds a comment line CONTAINING
-  # '<tt>#--</tt>'. This can be used to separate external from internal
-  # comments, or to stop a comment being associated with a method,
-  # class, or module. Commenting CAN be turned back on with
-  # a line that STARTS '<tt>#++</tt>'.
-  #
-  # I've seen guys that comment their code like this:
-  #   # This method....
-  #   #-----------------
-  #   def method
-  #
-  # => either we do it only in ruby code, or we require the leading #
-  #    (to avoid conflict with rules).
-  #
-  #   TODO: require the leading #, to provide the feature in simple text files.
-  #   Note: in ruby & C code, we require '#--' & '#++' or '*--' & '*++',
-  #   to allow rules:
-  #
-  #   # this is a comment
-  #   #---
-  #   # private text
-  #   #+++
-  #   # this is a rule:
-  #   # ---
-
-  def test_remove_private_comments
-    parser = util_parser "foo\n\n--\nbar\n++\n\nbaz\n"
-
-    parser.scan
-
-    expected = "foo\n\n\nbaz"
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  def test_remove_private_comments_rule
-    parser = util_parser "foo\n---\nbar"
-
-    parser.scan
-
-    expected = "foo\n---\nbar"
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  def test_remove_private_comments_star
-    parser = util_parser "* foo\n* bar\n"
-
-    parser.scan
-
-    assert_equal "* foo\n* bar", @top_level.comment.text
-  end
-
-  def test_scan
-    parser = util_parser 'it *really* works'
-
-    parser.scan
-
-    assert_equal 'it *really* works', @top_level.comment.text
-  end
-
-  def util_parser(content)
-    RDoc::Parser::Simple.new @top_level, content, @options, @stats
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_parser_test.rb b/test/mri/rdoc/rdoc/rdoc_parser_test.rb
deleted file mode 100644
index 7b890f703d2..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_parser_test.rb
+++ /dev/null
@@ -1,334 +0,0 @@
-# -*- coding: us-ascii -*-
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocParserTest < RDoc::TestCase
-  def setup
-    super
-
-    @RP = RDoc::Parser
-    @binary_dat_fixture_path = File.expand_path '../binary.dat', __FILE__
-    @options = RDoc::Options.new
-  end
-
-  def test_class_binary_eh_ISO_2022_JP
-    iso_2022_jp = File.join Dir.tmpdir, "test_rdoc_parser_#{$$}.rd"
-
-    File.open iso_2022_jp, 'wb' do |io|
-      io.write "# coding: ISO-2022-JP\n"
-      io.write ":\e$B%3%^%s%I\e(B:\n"
-    end
-
-    refute @RP.binary? iso_2022_jp
-  ensure
-    File.unlink iso_2022_jp
-  end
-
-  def test_class_binary_eh_marshal
-    marshal = File.join Dir.tmpdir, "test_rdoc_parser_#{$$}.marshal"
-    File.open marshal, 'wb' do |io|
-      io.write Marshal.dump('')
-      io.write 'lots of text ' * 500
-    end
-
-    assert @RP.binary?(marshal)
-  ensure
-    File.unlink marshal
-  end
-
-  def test_class_binary_japanese_text
-    file_name = File.expand_path '../test.ja.txt', __FILE__
-    refute @RP.binary?(file_name)
-  end
-
-  def test_class_binary_large_japanese_rdoc
-    capture_output do
-      begin
-        extenc, Encoding.default_external =
-          Encoding.default_external, Encoding::US_ASCII
-        file_name = File.expand_path '../test.ja.largedoc', __FILE__
-        assert !@RP.binary?(file_name)
-      ensure
-        Encoding.default_external = extenc
-      end
-    end
-  end
-
-  def test_class_binary_japanese_rdoc
-    file_name = File.expand_path '../test.ja.rdoc', __FILE__
-    refute @RP.binary?(file_name)
-  end
-
-  def test_class_can_parse
-    assert_equal @RP.can_parse(__FILE__), @RP::Ruby
-
-    readme_file_name = File.expand_path '../test.txt', __FILE__
-
-    assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
-
-    assert_equal @RP::Simple, @RP.can_parse(@binary_dat_fixture_path)
-
-    jtest_file_name = File.expand_path '../test.ja.txt', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_file_name)
-
-    jtest_rdoc_file_name = File.expand_path '../test.ja.rdoc', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_rdoc_file_name)
-
-    readme_file_name = File.expand_path '../README', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
-
-    jtest_largerdoc_file_name = File.expand_path '../test.ja.largedoc', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
-
-    @RP.alias_extension 'rdoc', 'largedoc'
-    assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
-  end
-
-  def test_class_for_executable
-    with_top_level("app", "#!/usr/bin/env ruby -w\n") do |top_level, content|
-      parser = @RP.for top_level, content, @options, :stats
-
-      assert_kind_of RDoc::Parser::Ruby, parser
-
-      assert_equal top_level.absolute_name, parser.file_name
-    end
-  end
-
-  def test_class_for_forbidden
-    omit 'chmod not supported' if Gem.win_platform?
-
-    tf = Tempfile.open 'forbidden' do |io|
-      begin
-        File.chmod 0000, io.path
-        forbidden = @store.add_file io.path
-
-        parser = @RP.for forbidden, '', @options, :stats
-
-        assert_nil parser
-      ensure
-        File.chmod 0400, io.path
-      end
-      io
-    end
-    tf.close!
-  end
-
-  def test_class_for_modeline
-    with_top_level("NEWS", "# -*- rdoc -*-\n= NEWS\n") do |top_level, content|
-      parser = @RP.for top_level, content, @options, :stats
-
-      assert_kind_of RDoc::Parser::Simple, parser
-
-      assert_equal "= NEWS\n", parser.content
-    end
-  end
-
-  def test_can_parse_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- rdoc -*- created at: Mon Aug 7 16:45:54 JST 1995"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal RDoc::Parser::Simple, @RP.can_parse(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_can_parse_modeline_c
-    readme_inc = File.join Dir.tmpdir, "README.inc.#{$$}"
-
-    File.open readme_inc, 'w' do |io|
-      io.puts "/* README.inc -  -*- c -*- created at: Mon Aug 7 16:45:54 JST 1995 */"
-      io.puts
-      io.puts "/* This document explains how to make extension libraries for Ruby. */"
-    end
-
-    assert_equal RDoc::Parser::C, @RP.can_parse(readme_inc)
-  ensure
-    File.unlink readme_inc
-  end
-
-  ##
-  # Selenium hides a .jar file using a .txt extension.
-
-  def test_class_can_parse_zip
-    hidden_zip = File.expand_path '../hidden.zip.txt', __FILE__
-    assert_nil @RP.can_parse(hidden_zip)
-  end
-
-  def test_check_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal 'rdoc', @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_coding
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# -*- coding: utf-8 -*-"
-    end
-
-    assert_nil @RP.check_modeline readme_ext
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_with_other
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- mode: RDoc; indent-tabs-mode: nil -*-"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal 'rdoc', @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_no_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_nil @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_class_for_binary
-    dat_fixture = File.read(@binary_dat_fixture_path)
-    with_top_level("binary.dat", dat_fixture) do |top_level, content|
-      assert_nil @RP.for(top_level, content, @options, nil)
-    end
-  end
-
-  def test_class_for_markup
-    with_top_level("file.rb", "# coding: utf-8 markup: rd") do |top_level, content|
-      parser = @RP.for top_level, content, @options, nil
-
-      assert_kind_of @RP::RD, parser
-    end
-  end
-
-  def test_class_use_markup
-    content = <<-CONTENT
-# coding: utf-8 markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_markdown
-    content = <<-CONTENT
-# coding: utf-8 markup: markdown
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::Ruby, parser
-  end
-
-  def test_class_use_markup_modeline
-    content = <<-CONTENT
-# -*- coding: utf-8 -*-
-# markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_modeline_shebang
-    content = <<-CONTENT
-#!/bin/sh
-/* -*- coding: utf-8 -*-
- * markup: rd
- */
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_shebang
-    content = <<-CONTENT
-#!/usr/bin/env ruby
-# coding: utf-8 markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_tomdoc
-    content = <<-CONTENT
-# coding: utf-8 markup: tomdoc
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::Ruby, parser
-  end
-
-  def test_class_use_markup_none
-    parser = @RP.use_markup ''
-
-    assert_nil parser
-  end
-
-  def test_class_use_markup_unknown
-    content = <<-CONTENT
-# :markup: RDoc
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_nil parser
-  end
-
-  def test_initialize
-    with_top_level("file.rb", "") do |top_level, content|
-      @RP.new top_level, content, @options, nil
-
-      assert_equal @RP, top_level.parser
-    end
-  end
-
-  private
-
-  def with_top_level(filename, content, &block)
-    absoluate_filename  = File.join Dir.tmpdir, filename
-    File.open absoluate_filename, 'w' do |io|
-      io.write content
-    end
-
-    top_level = RDoc::TopLevel.new absoluate_filename
-
-    yield(top_level, content)
-  ensure
-    File.unlink absoluate_filename
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_rd_block_parser_test.rb b/test/mri/rdoc/rdoc/rdoc_rd_block_parser_test.rb
deleted file mode 100644
index 50bf075a5a7..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_rd_block_parser_test.rb
+++ /dev/null
@@ -1,557 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRdBlockParserTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @block_parser = RDoc::RD::BlockParser.new
-  end
-
-  def test_add_footnote
-    index = @block_parser.add_footnote 'context'
-
-    assert_equal 1, index
-
-    expected = [
-      para('{^1}[rdoc-label:footmark-1:foottext-1]', ' ', 'context'),
-      blank_line,
-    ]
-
-    assert_equal expected, @block_parser.footnotes
-
-    index = @block_parser.add_footnote 'other'
-
-    assert_equal 2, index
-  end
-
-  def test_parse_desclist
-    list = <<-LIST
-:one
-  desc one
-:two
-  desc two
-    LIST
-
-    expected =
-      doc(
-        list(:NOTE,
-          item("one", para("desc one")),
-          item("two", para("desc two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist
-    list = <<-LIST
-(1) one
-(1) two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil, para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_paragraphs
-    list = <<-LIST
-(1) one
-
-    two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("one"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_multiline
-    list = <<-LIST
-(1) one
-    two
-    LIST
-
-    contents = "one\n     two" # 1.8 vs 1.9
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para(*contents))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_verbatim
-    list = <<-LIST
-(1) item
-      verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("item"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_verbatim_continue
-    list = <<-LIST
-(1) one
-      verbatim
-    two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("one"),
-            verb("verbatim\n"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_footnote
-    expected =
-      doc(
-        para("{*1}[rdoc-label:foottext-1:footmark-1]"),
-        rule(1),
-        para("{^1}[rdoc-label:footmark-1:foottext-1]", " ", "text"),
-        blank_line)
-
-    assert_equal expected, parse("((-text-))")
-  end
-
-  def test_parse_include
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected = doc(@RM::Include.new("parse_include", [Dir.tmpdir]))
-
-    assert_equal expected, parse("<<< parse_include")
-  end
-
-  def test_parse_include_subtree
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected =
-      doc(
-        blank_line,
-        para("include <em>worked</em>"),
-        blank_line,
-        blank_line)
-
-    tf = Tempfile.open %w[parse_include .rd] do |io|
-      io.puts "=begin\ninclude ((*worked*))\n=end"
-      io.flush
-
-      str = <<-STR
-<<< #{File.basename io.path}
-      STR
-
-      assert_equal expected, parse(str)
-      io
-    end
-    tf.close!
-  end
-
-=begin
-  def test_parse_include_other_format
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected =
-      doc(
-        blank_line,
-        para("include ((*worked*))"),
-        blank_line,
-        blank_line)
-
-    str = <<~STR
-    =begin nonrd
-    <<< worked
-    =end
-    STR
-
-    assert_equal(expected, @block_parser.parse str.lines.to_a)
-  end
-=end
-
-  def test_parse_heading
-    assert_equal doc(head(1, "H")), parse("= H")
-    assert_equal doc(head(2, "H")), parse("== H")
-    assert_equal doc(head(3, "H")), parse("=== H")
-    assert_equal doc(head(4, "H")), parse("==== H")
-    assert_equal doc(head(5, "H")), parse("+ H")
-    assert_equal doc(head(6, "H")), parse("++ H")
-  end
-
-  def test_parse_itemlist
-    list = <<-LIST
-* one
-* two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil, para("one")),
-          item(nil, para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_multiline
-    list = <<-LIST
-* one
-  two
-    LIST
-
-    contents = "one\n   two" # 1.8 vs 1.9
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil, para(*contents))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_nest
-    list = <<-LIST
-* one
-  * inner
-* two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            list(:BULLET,
-              item(nil, para("inner")))),
-          item(nil,
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_paragraphs
-    list = <<-LIST
-* one
-
-  two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_verbatim
-    list = <<-LIST
-* item
-    verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("item"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_verbatim_continue
-    list = <<-LIST
-* one
-    verbatim
-  two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            verb("verbatim\n"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists
-    list = <<-LIST
-(1) one
-(1) two
-* three
-* four
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil, para("two"))),
-        list(:BULLET,
-          item(nil, para("three")),
-          item(nil, para("four"))),
-        list(:NUMBER,
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four")))),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest_verbatim
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-     verbatim
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four"))),
-            verb("verbatim\n")),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest_verbatim2
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-      verbatim
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four"))),
-            verb("verbatim\n")),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist
-    list = <<-LIST
---- Array#each {|i| ... }
-      yield block for each item.
---- Array#index(val)
-      return index of first item which equals with val. if it hasn't
-      same item, return nil.
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>Array#each {|i| ... }</tt>",
-            para("yield block for each item.")),
-          item(
-            "<tt>Array#index(val)</tt>",
-            para("return index of first item which equals with val. if it hasn't same item, return nil."))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_empty
-    list = <<-LIST
---- A#b
-
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item("<tt>A#b</tt>")))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph
-    list = <<-LIST
---- A#b
-
-    one
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("one"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph2
-    list = <<-LIST.chomp
---- A#b
-
-    one
-two
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("one"))),
-        para("two"))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph_verbatim
-    list = <<-LIST.chomp
---- A#b
-
-    text
-      verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("text"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_verbatim
-    assert_equal doc(verb("verbatim\n")), parse("  verbatim")
-  end
-
-  def test_parse_verbatim_blankline
-    expected = doc(verb("one\n", "\n", "two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-
-  two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_verbatim_indent
-    expected = doc(verb("one\n", " two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-   two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_verbatim_multi
-    expected = doc(verb("one\n", "two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-  two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_textblock
-    assert_equal doc(para("text")), parse("text")
-  end
-
-  def test_parse_textblock_multi
-    expected = doc(para("one two"))
-
-    assert_equal expected, parse("one\ntwo")
-  end
-
-  def parse(text)
-    text = ["=begin", text, "=end"].join "\n"
-
-    doc = @block_parser.parse text.lines.to_a
-
-    assert_equal blank_line, doc.parts.shift, "=begin blankline"
-    assert_equal blank_line, doc.parts.pop, "=end blankline"
-
-    doc
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_rd_inline_parser_test.rb b/test/mri/rdoc/rdoc/rdoc_rd_inline_parser_test.rb
deleted file mode 100644
index e484dbe8334..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_rd_inline_parser_test.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRdInlineParserTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @block_parser = RDoc::RD::BlockParser.new
-    @block_parser.instance_variable_set :@i, 0
-    @inline_parser = RDoc::RD::InlineParser.new @block_parser
-  end
-
-  def test_parse
-    assert_equal 'regular <em>emphasis</em>', parse('regular ((*emphasis*))')
-  end
-
-  def test_parse_code
-    assert_equal '<code>text</code>', parse('(({text}))')
-  end
-
-  def test_parse_em
-    assert_equal '<em>text</em>', parse('((*text*))')
-  end
-
-  def test_parse_footnote
-    assert_equal '{*1}[rdoc-label:foottext-1:footmark-1]', parse('((-text-))')
-
-    expected = [
-      @RM::Paragraph.new('{^1}[rdoc-label:footmark-1:foottext-1]', ' ', 'text'),
-      blank_line,
-    ]
-
-    assert_equal expected, @block_parser.footnotes
-  end
-
-  def test_parse_index
-    assert_equal '<span id="label-text">text</span>', parse('((:text:))')
-
-    assert_includes @block_parser.labels, 'text'
-  end
-
-  def test_parse_kbd
-    assert_equal '<tt>text</tt>', parse('((%text%))')
-  end
-
-  def test_parse_multiple
-    assert_equal '<em>one</em> <em>two</em>', parse('((*one*)) ((*two*))')
-  end
-
-  def test_parse_newline
-    assert_equal "one\ntwo", parse("one\ntwo")
-  end
-
-  def test_parse_quote
-    assert_equal 'one " two', parse('one " two')
-  end
-
-  def test_parse_ref
-    assert_equal '{text}[rdoc-label:text]', parse('((<text>))')
-  end
-
-  def test_parse_ref_em
-    assert_equal '{<em>text</em>}[rdoc-label:text]', parse('((<((*text*))>))')
-  end
-
-  def test_parse_ref_filename_quote
-    assert_equal '{RD/foo}[rdoc-label:RD/foo]', parse('((<RD/"foo">))')
-  end
-
-  def test_parse_ref_filename
-    assert_equal '{RD}[rdoc-label:RD/]', parse('((<RD/>))')
-  end
-
-  def test_parse_ref_quote
-    assert_equal '{text \\"}[rdoc-label:text \\"]', parse('((<text \">))')
-  end
-
-  def test_parse_ref_quote_content
-    assert_equal '{<em>text</em>}[rdoc-label:text]',
-                 parse('((<"((*text*))">))')
-  end
-
-  def test_parse_ref_quote_content_multi
-    assert_equal '{<em>one</em> <em>two</em>}[rdoc-label:one two]',
-                 parse('((<"((*one*)) ((*two*))">))')
-  end
-
-  def test_parse_ref_substitute
-    assert_equal '{text}[rdoc-label:thing]', parse('((<text|thing>))')
-  end
-
-  def test_parse_ref_substitute_element_quote
-    assert_equal '{text}[rdoc-label:"RD"]',
-                 parse('((<text|"RD">))')
-  end
-
-  def test_parse_ref_substitute_filename
-    assert_equal '{text}[rdoc-label:RD/]', parse('((<text|RD/>))')
-  end
-
-  def test_parse_ref_substitute_filename_label
-    assert_equal '{text}[rdoc-label:RD/label]',
-                 parse('((<text|RD/label>))')
-  end
-
-  def test_parse_ref_substitute_filename_quote
-    assert_equal '{text}[rdoc-label:"RD"/]', parse('((<text|"RD"/>))')
-  end
-
-  def test_parse_ref_substitute_multi_content
-    assert_equal '{<em>one</em> two}[rdoc-label:thing]',
-                 parse('((<((*one*)) two|thing>))')
-  end
-
-  def test_parse_ref_substitute_multi_content2
-    assert_equal '{<em>one</em> \\" two}[rdoc-label:thing]',
-                 parse('((<((*one*)) \" two|thing>))')
-  end
-
-  def test_parse_ref_substitute_multi_content3
-    assert_equal '{<em>one</em> \\" <em>two</em>}[rdoc-label:thing]',
-                 parse('((<((*one*)) \" ((*two*))|thing>))')
-  end
-
-  def test_parse_ref_substitute_quote
-    assert_equal '{one | two}[rdoc-label:thing]',
-                 parse('((<"one | two"|thing>))')
-  end
-
-  def test_parse_ref_substitute_quote_content
-    assert_equal '{<em>text</em>}[rdoc-label:thing]',
-                 parse('((<"((*text*))"|thing>))')
-  end
-
-  def test_parse_ref_substitute_url
-    assert_equal '{text}[http://example]',
-                 parse('((<text|URL:http://example>))')
-  end
-
-  def test_parse_ref_url
-    assert_equal '{http://example}[http://example]',
-                 parse('((<URL:http://example>))')
-  end
-
-  def test_parse_var
-    assert_equal '+text+', parse('((|text|))')
-  end
-
-  def test_parse_verb
-    assert_equal '<tt>text</tt>', parse("(('text'))")
-  end
-
-  def test_parse_verb_backslash
-    assert_equal "<tt>(('text'))</tt>", parse("(('(('text\\'))'))")
-  end
-
-  def test_parse_verb_backslash_backslash
-    assert_equal '<tt>text \\</tt>', parse("(('text \\\\'))")
-  end
-
-  def test_parse_verb_backslash_quote
-    assert_equal '<tt>text "</tt>', parse("(('text \\\"'))")
-  end
-
-  def test_parse_verb_emphasis
-    assert_equal '<tt>((*emphasis*))</tt>', parse("(('((*emphasis*))'))")
-  end
-
-  def test_parse_verb_multiple
-    assert_equal '<tt>((*text*))</tt>', parse("(('((*text*))'))")
-  end
-
-  def parse(text)
-    @inline_parser.parse text
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_rd_inline_test.rb b/test/mri/rdoc/rdoc/rdoc_rd_inline_test.rb
deleted file mode 100644
index c4984949f4c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_rd_inline_test.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRdInlineTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @inline = RDoc::RD::Inline.new '+text+', 'text'
-  end
-
-  def test_class_new
-    inline = RDoc::RD::Inline.new @inline
-
-    refute_equal inline.rdoc, inline.reference
-  end
-
-  def test_initialize
-    inline = RDoc::RD::Inline.new 'text'
-
-    assert_equal inline.rdoc, inline.reference
-    refute_same  inline.rdoc, inline.reference
-  end
-
-  def test_initialize_inline
-    inline = RDoc::RD::Inline.new @inline
-
-    assert_equal '+text+', inline.rdoc
-    assert_equal 'text',   inline.reference
-  end
-
-  def test_append_inline
-    out = @inline.append @inline
-
-    assert_same @inline, out
-
-    assert_equal '+text++text+', @inline.rdoc
-    assert_equal 'texttext',     @inline.reference
-  end
-
-  def test_append_string
-    @inline.append ' more'
-
-    assert_equal '+text+ more', @inline.rdoc
-    assert_equal 'text more',   @inline.reference
-  end
-
-  def test_equals2
-    assert_equal @inline, RDoc::RD::Inline.new('+text+', 'text')
-    refute_equal @inline, RDoc::RD::Inline.new('+text+', 'other')
-    refute_equal @inline, RDoc::RD::Inline.new('+other+', 'text')
-    refute_equal @inline, Object.new
-  end
-
-  def test_inspect
-    assert_equal '(inline: +text+)', @inline.inspect
-  end
-
-  def test_to_s
-    assert_equal '+text+', @inline.to_s
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_rd_test.rb b/test/mri/rdoc/rdoc/rdoc_rd_test.rb
deleted file mode 100644
index 8842aaccbee..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_rd_test.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRdTest < RDoc::TestCase
-
-  def test_class_parse
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("hello")
-  end
-
-  def test_class_parse_begin_end
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("=begin\nhello\n=end\n")
-  end
-
-  def test_class_parse_newline
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("hello\n")
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_rdoc_test.rb b/test/mri/rdoc/rdoc/rdoc_rdoc_test.rb
deleted file mode 100644
index 6760badfe2c..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_rdoc_test.rb
+++ /dev/null
@@ -1,582 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRDocTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @rdoc = RDoc::RDoc.new
-    @options = RDoc::Options.new
-    @rdoc.options = @options
-
-    @stats = RDoc::Stats.new @store, 0, 0
-    @rdoc.instance_variable_set :@stats, @stats
-  end
-
-  def test_document # functional test
-    options = RDoc::Options.new
-    options.files = [File.expand_path('../xref_data.rb', __FILE__)]
-    options.setup_generator 'ri'
-    options.main_page = 'MAIN_PAGE.rdoc'
-    options.root      = Pathname File.expand_path('..', __FILE__)
-    options.title     = 'title'
-
-    rdoc = RDoc::RDoc.new
-
-    temp_dir do
-      options.op_dir = 'ri'
-
-      capture_output do
-        rdoc.document options
-      end
-
-      assert File.directory? 'ri'
-    end
-
-    store = rdoc.store
-
-    assert_equal 'MAIN_PAGE.rdoc', store.main
-    assert_equal 'title',          store.title
-  end
-
-  def test_document_with_dry_run # functional test
-    options = RDoc::Options.new
-    options.files = [File.expand_path('../xref_data.rb', __FILE__)]
-    options.setup_generator 'darkfish'
-    options.main_page = 'MAIN_PAGE.rdoc'
-    options.root      = Pathname File.expand_path('..', __FILE__)
-    options.title     = 'title'
-    options.dry_run = true
-
-    rdoc = RDoc::RDoc.new
-
-    out = nil
-    temp_dir do
-      out, = capture_output do
-        rdoc.document options
-      end
-
-      refute File.directory? 'doc'
-    end
-    assert_includes out, '100%'
-
-    store = rdoc.store
-
-    assert_equal 'MAIN_PAGE.rdoc', store.main
-    assert_equal 'title',          store.title
-  end
-
-  def test_gather_files
-    a = File.expand_path __FILE__
-    b = File.expand_path '../rdoc_text_test.rb', __FILE__
-
-    assert_equal [a, b], @rdoc.gather_files([b, a, b])
-
-    assert_empty @rdoc.gather_files([b, a, b])
-
-    @rdoc.last_modified[a] -= 10
-    assert_equal [a, b], @rdoc.gather_files([b, a, b])
-  end
-
-  def test_handle_pipe
-    $stdin = StringIO.new "hello"
-
-    out, = capture_output do
-      @rdoc.handle_pipe
-    end
-
-    assert_equal "\n<p>hello</p>\n", out
-  ensure
-    $stdin = STDIN
-  end
-
-  def test_handle_pipe_rd
-    $stdin = StringIO.new "=begin\nhello\n=end"
-
-    @rdoc.options.markup = 'rd'
-
-    out, = capture_output do
-      @rdoc.handle_pipe
-    end
-
-    assert_equal "\n<p>hello</p>\n", out
-  ensure
-    $stdin = STDIN
-  end
-
-  def test_normalized_file_list
-    test_path = File.expand_path(__FILE__)
-    files = temp_dir do |dir|
-      flag_file = @rdoc.output_flag_file dir
-
-      FileUtils.touch flag_file
-
-      @rdoc.normalized_file_list [test_path, flag_file]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal [test_path], files
-  end
-
-  def test_normalized_file_list_not_modified
-    @rdoc.last_modified[__FILE__] = File.stat(__FILE__).mtime
-
-    files = @rdoc.normalized_file_list [__FILE__]
-
-    files = files.collect {|file, mtime| file if mtime}.compact
-
-    assert_empty(files)
-  end
-
-  def test_normalized_file_list_non_file_directory
-    dev = File::NULL
-    omit "#{dev} is not a character special" unless
-      File.chardev? dev
-
-    files = nil
-
-    out, err = verbose_capture_output do
-      files = @rdoc.normalized_file_list [dev]
-    end
-
-    files = files.map { |file| File.expand_path file }
-
-    assert_empty files
-
-    assert_empty out
-    assert_match %r"^rdoc can't parse", err
-    assert_match %r"#{dev}$",           err
-  end
-
-  def test_normalized_file_list_with_dot_doc
-    expected_files = []
-    files = temp_dir do |dir|
-      a = File.expand_path('a.rb')
-      b = File.expand_path('b.rb')
-      c = File.expand_path('c.rb')
-      FileUtils.touch a
-      FileUtils.touch b
-      FileUtils.touch c
-      # Use Dir.glob to convert short path of Dir.tmpdir to long path.
-      a = Dir.glob(a).first
-      b = Dir.glob(b).first
-      c = Dir.glob(c).first
-
-      File.write('.document', "a.rb\n""b.rb\n")
-      expected_files << a
-      expected_files << b
-
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal expected_files, files
-  end
-
-  def test_normalized_file_list_with_dot_doc_overridden_by_exclude_option
-    expected_files = []
-    files = temp_dir do |dir|
-      a = File.expand_path('a.rb')
-      b = File.expand_path('b.rb')
-      c = File.expand_path('c.rb')
-      FileUtils.touch a
-      FileUtils.touch b
-      FileUtils.touch c
-      # Use Dir.glob to convert short path of Dir.tmpdir to long path.
-      a = Dir.glob(a).first
-      b = Dir.glob(b).first
-      c = Dir.glob(c).first
-
-      File.write('.document', "a.rb\n""b.rb\n")
-      expected_files << a
-
-      @rdoc.options.exclude = /b\.rb$/
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal expected_files, files
-  end
-
-  def test_normalized_file_list_with_skipping_tests_enabled
-    files = temp_dir do |dir|
-      @a = File.expand_path('a.rb')
-      spec_dir = File.expand_path('spec')
-      spec_file = File.expand_path(File.join('spec', 'my_spec.rb'))
-      test_dir = File.expand_path('test')
-      test_file = File.expand_path(File.join('test', 'my_test.rb'))
-      FileUtils.touch @a
-      FileUtils.mkdir_p spec_dir
-      FileUtils.touch spec_file
-      FileUtils.mkdir_p test_dir
-      FileUtils.touch test_file
-
-      @rdoc.options.skip_tests = true
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-    assert_equal [@a], files
-  end
-
-  def test_normalized_file_list_with_skipping_tests_disabled
-    files = temp_dir do |dir|
-      @a = File.expand_path('a.rb')
-      spec_dir = File.expand_path('spec')
-      @spec_file = File.expand_path(File.join('spec', 'my_spec.rb'))
-      test_dir = File.expand_path('test')
-      @test_file = File.expand_path(File.join('test', 'my_test.rb'))
-      FileUtils.touch @a
-      FileUtils.mkdir_p spec_dir
-      FileUtils.touch @spec_file
-      FileUtils.mkdir_p test_dir
-      FileUtils.touch @test_file
-
-      @rdoc.options.skip_tests = false
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-    assert_equal [@a, @spec_file, @test_file], files.sort
-  end
-
-  def test_parse_file
-    @rdoc.store = RDoc::Store.new(@options)
-
-    temp_dir do |dir|
-      @rdoc.options.root = Pathname(Dir.pwd)
-
-      File.open 'test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      top_level = @rdoc.parse_file 'test.txt'
-
-      assert_equal 'test.txt', top_level.absolute_name
-      assert_equal 'test.txt', top_level.relative_name
-    end
-  end
-
-  def test_parse_file_binary
-    @rdoc.store = RDoc::Store.new(@options)
-
-    root = File.dirname __FILE__
-
-    @rdoc.options.root = Pathname root
-
-    out, err = capture_output do
-      Dir.chdir root do
-        assert_nil @rdoc.parse_file 'binary.dat'
-      end
-    end
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_parse_file_include_root
-    @rdoc.store = RDoc::Store.new(@options)
-
-    test_path = File.expand_path('..', __FILE__)
-    top_level = nil
-    temp_dir do |dir|
-      @rdoc.options.parse %W[--root #{test_path}]
-      @rdoc.options.finish
-
-      File.open 'include.txt', 'w' do |io|
-        io.puts ':include: test.txt'
-      end
-
-      out, err = capture_output do
-        top_level = @rdoc.parse_file 'include.txt'
-      end
-      assert_empty out
-      assert_empty err
-    end
-    assert_equal "test file", top_level.comment.text
-  end
-
-  def test_parse_file_page_dir
-    @rdoc.store = RDoc::Store.new(@options)
-
-    temp_dir do |dir|
-      FileUtils.mkdir 'pages'
-      @rdoc.options.page_dir = Pathname('pages')
-      @rdoc.options.root = Pathname(Dir.pwd)
-
-      File.open 'pages/test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      top_level = @rdoc.parse_file 'pages/test.txt'
-
-      assert_equal 'pages/test.txt', top_level.absolute_name
-      assert_equal 'test.txt',       top_level.relative_name
-    end
-  end
-
-  def test_parse_file_relative
-    pwd = Dir.pwd
-
-    @rdoc.store = RDoc::Store.new(@options)
-
-    temp_dir do |dir|
-      @rdoc.options.root = Pathname(dir)
-
-      File.open 'test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      test_txt = File.join dir, 'test.txt'
-
-      Dir.chdir pwd do
-        top_level = @rdoc.parse_file test_txt
-
-        assert_equal test_txt,   top_level.absolute_name
-        assert_equal 'test.txt', top_level.relative_name
-      end
-    end
-  end
-
-  def test_parse_file_encoding
-    @rdoc.options.encoding = Encoding::ISO_8859_1
-    @rdoc.store = RDoc::Store.new(@options)
-
-    tf = Tempfile.open 'test.txt' do |io|
-      io.write 'hi'
-      io.rewind
-
-      top_level = @rdoc.parse_file io.path
-
-      assert_equal Encoding::ISO_8859_1, top_level.absolute_name.encoding
-      io
-    end
-    tf.close!
-  end
-
-  def test_parse_file_forbidden
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    @rdoc.store = RDoc::Store.new(@options)
-
-    tf = Tempfile.open 'test.txt' do |io|
-      io.write 'hi'
-      io.rewind
-
-      File.chmod 0000, io.path
-
-      begin
-        top_level = :bug
-
-        _, err = capture_output do
-          top_level = @rdoc.parse_file io.path
-        end
-
-        assert_match "Unable to read #{io.path},", err
-
-        assert_nil top_level
-      ensure
-        File.chmod 0400, io.path
-      end
-      io
-    end
-    tf.close!
-  end
-
-  def test_remove_unparseable
-    file_list = %w[
-      blah.class
-      blah.eps
-      blah.erb
-      blah.scpt.txt
-      blah.svg
-      blah.ttf
-      blah.yml
-    ]
-
-    assert_empty @rdoc.remove_unparseable file_list
-  end
-
-  def test_remove_unparseable_tags_emacs
-    temp_dir do
-      File.open 'TAGS', 'wb' do |io| # emacs
-        io.write "\f\nlib/foo.rb,43\n"
-      end
-
-      file_list = %w[
-        TAGS
-      ]
-
-      assert_empty @rdoc.remove_unparseable file_list
-    end
-  end
-
-  def test_remove_unparseable_tags_vim
-    temp_dir do
-      File.open 'TAGS', 'w' do |io| # emacs
-        io.write "!_TAG_"
-      end
-
-      file_list = %w[
-        TAGS
-      ]
-
-      assert_empty @rdoc.remove_unparseable file_list
-    end
-  end
-
-  def test_remove_unparseable_CVE_2021_31799
-    omit 'for Un*x platforms' if Gem.win_platform?
-    temp_dir do
-      file_list = ['| touch evil.txt && echo tags']
-      file_list.each do |f|
-        FileUtils.touch f rescue omit
-      end
-
-      assert_equal file_list, @rdoc.remove_unparseable(file_list)
-      assert_equal file_list, Dir.children('.')
-    end
-  end
-
-  def test_setup_output_dir
-    Dir.mktmpdir {|d|
-      path = File.join d, 'testdir'
-
-      last = @rdoc.setup_output_dir path, false
-
-      assert_empty last
-
-      assert File.directory? path
-      assert File.exist? @rdoc.output_flag_file path
-    }
-  end
-
-  def test_setup_output_dir_dry_run
-    @rdoc.options.dry_run = true
-
-    Dir.mktmpdir do |d|
-      path = File.join d, 'testdir'
-
-      @rdoc.setup_output_dir path, false
-
-      refute File.exist? path
-    end
-  end
-
-  def test_setup_output_dir_exists
-    Dir.mktmpdir {|path|
-      File.open @rdoc.output_flag_file(path), 'w' do |io|
-        io.puts Time.at 0
-        io.puts "./lib/rdoc.rb\t#{Time.at 86400}"
-      end
-
-      last = @rdoc.setup_output_dir path, false
-
-      assert_equal 1, last.size
-      assert_equal Time.at(86400), last['./lib/rdoc.rb']
-    }
-  end
-
-  def test_setup_output_dir_exists_empty_created_rid
-    Dir.mktmpdir {|path|
-      File.open @rdoc.output_flag_file(path), 'w' do end
-
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir path, false
-      end
-
-      assert_match %r%Directory #{Regexp.escape path} already exists%, e.message
-    }
-  end
-
-  def test_setup_output_dir_exists_file
-    tf = Tempfile.open 'test_rdoc_rdoc' do |tempfile|
-      path = tempfile.path
-
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir path, false
-      end
-
-      assert_match(%r%#{Regexp.escape path} exists and is not a directory%,
-                   e.message)
-      tempfile
-    end
-    tf.close!
-  end
-
-  def test_setup_output_dir_exists_not_rdoc
-    Dir.mktmpdir do |dir|
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir dir, false
-      end
-
-      assert_match %r%Directory #{Regexp.escape dir} already exists%, e.message
-    end
-  end
-
-  def test_update_output_dir
-    Dir.mktmpdir do |d|
-      @rdoc.update_output_dir d, Time.now, {}
-
-      assert File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_dont
-    Dir.mktmpdir do |d|
-      @rdoc.options.update_output_dir = false
-      @rdoc.update_output_dir d, Time.now, {}
-
-      refute File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_dry_run
-    Dir.mktmpdir do |d|
-      @rdoc.options.dry_run = true
-      @rdoc.update_output_dir d, Time.now, {}
-
-      refute File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_with_reproducible_time
-    Dir.mktmpdir do |d|
-      backup_epoch = ENV['SOURCE_DATE_EPOCH']
-      ruby_birthday = Time.parse 'Wed, 24 Feb 1993 21:00:00 +0900'
-      ENV['SOURCE_DATE_EPOCH'] = ruby_birthday.to_i.to_s
-
-      @rdoc.update_output_dir d, Time.now, {}
-
-      assert File.exist? "#{d}/created.rid"
-
-      f = File.open("#{d}/created.rid", 'r')
-      head_timestamp = Time.parse f.gets.chomp
-      f.close
-      assert_equal ruby_birthday, head_timestamp
-
-      ENV['SOURCE_DATE_EPOCH'] = backup_epoch
-    end
-  end
-
-  def test_normalized_file_list_removes_created_rid_dir
-    temp_dir do |d|
-      FileUtils.mkdir "doc"
-      flag_file = @rdoc.output_flag_file "doc"
-      file = File.join "doc", "test"
-      FileUtils.touch flag_file
-      FileUtils.touch file
-
-      file_list = ["doc"]
-
-      output = @rdoc.normalized_file_list file_list
-
-      assert_empty output
-    end
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_require_test.rb b/test/mri/rdoc/rdoc/rdoc_require_test.rb
deleted file mode 100644
index e90f8520a21..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_require_test.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocRequireTest < XrefTestCase
-
-  def setup
-    super
-
-    @req = RDoc::Require.new 'foo', 'comment'
-  end
-
-  def test_initialize
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '"foo"', ''
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '\'foo\'', ''
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '|foo|', ''
-    assert_equal 'foo', @req.name, 'for fortran?'
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_ri_driver_test.rb b/test/mri/rdoc/rdoc/rdoc_ri_driver_test.rb
deleted file mode 100644
index 1cb459909a4..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_ri_driver_test.rb
+++ /dev/null
@@ -1,1610 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRIDriverTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @home_ri = File.join @test_home, 'dot_ri'
-
-    FileUtils.mkdir_p @home_ri
-
-    @orig_ri = ENV.delete('RI')
-    @rdoc_home = File.join @test_home, ".rdoc"
-    FileUtils.mkdir_p @rdoc_home
-
-    @options = RDoc::RI::Driver.default_options
-    @options[:use_system] = false
-    @options[:use_site]   = false
-    @options[:use_home]   = false
-    @options[:use_gems]   = false
-
-    @options[:home]       = @rdoc_home
-    @options[:use_stdout] = true
-    @options[:formatter]  = @RM::ToRdoc
-    @rdoc_options = RDoc::Options.new
-
-    @driver = RDoc::RI::Driver.new @options
-  end
-
-  def teardown
-    defined?(@orig_ri) and ENV['RI'] = @orig_ri
-
-    super
-  end
-
-  case RUBY_PLATFORM
-  when /mswin|mingw/
-    DUMMY_PAGER = "type nul"
-  else
-    DUMMY_PAGER = "true"
-  end
-
-  def with_dummy_pager
-    pager_env, ENV['RI_PAGER'] = ENV['RI_PAGER'], DUMMY_PAGER
-    yield
-  ensure
-    ENV['RI_PAGER'] = pager_env
-  end
-
-  def test_self_dump
-    util_store
-
-    out, = capture_output do
-      RDoc::RI::Driver.dump @store1.cache_path
-    end
-
-    assert_match %r%:class_methods|class_methods:%,       out
-    assert_match %r%:modules|modules:%,                   out
-    assert_match %r%:instance_methods|instance_methods:%, out
-    assert_match %r%:ancestors|ancestors:%,               out
-  end
-
-  def test_add_also_in_empty
-    out = @RM::Document.new
-
-    @driver.add_also_in out, []
-
-    assert_empty out
-  end
-
-  def test_add_also_in
-    util_multi_store
-    @store1.type = :system
-    @store2.type = :home
-
-    out = @RM::Document.new
-
-    @driver.add_also_in out, [@store1, @store2]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Paragraph.new('Also found in:'),
-      @RM::Verbatim.new("ruby core", "\n",
-                        @rdoc_home, "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_class
-    util_multi_store
-
-    out = @RM::Document.new
-
-    @driver.add_class out, 'Bar', [@cBar]
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Bar < Foo'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_from
-    util_store
-    @store1.type = :system
-
-    out = @RM::Document.new
-
-    @driver.add_from out, @store1
-
-    expected = @RM::Document.new @RM::Paragraph.new("(from ruby core)")
-
-    assert_equal expected, out
-  end
-
-  def test_add_extends
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_extends out, [[[@cFooExt], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Extended by:"),
-      @RM::Paragraph.new("Ext (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Extend thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_empty
-    out = @RM::Document.new
-
-    @driver.add_extension_modules out, 'Includes', []
-
-    assert_empty out
-  end
-
-  def test_add_extension_modules_many
-    util_store
-
-    out = @RM::Document.new
-
-    enum = RDoc::Include.new 'Enumerable', nil
-    @cFoo.add_include enum
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc, enum], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("(from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Inc"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("Enumerable", "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_many_no_doc
-    util_store
-
-    out = @RM::Document.new
-
-    enum = RDoc::Include.new 'Enumerable', nil
-    @cFoo.add_include enum
-    @cFooInc.instance_variable_set :@comment, ''
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc, enum], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("(from #{@store1.friendly_path})"),
-      @RM::Verbatim.new("Inc", "\n",
-                        "Enumerable", "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_one
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("Inc (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_includes
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_includes out, [[[@cFooInc], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("Inc (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Foo::Bar#blah'
-
-    expected =
-      doc(
-        head(1, 'Foo::Bar#blah'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        head(3, 'Implementation from Bar'),
-        rule(1),
-        verb("blah(5) => 5\n",
-             "blah(6) => 6\n"),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_with_rdoc_ref_link
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Foo::Bar#blah_with_rdoc_ref'
-
-    expected =
-      doc(
-        head(1, 'Foo::Bar#blah_with_rdoc_ref'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        head(3, 'Implementation from Bar'),
-        rule(1),
-        verb("blah(5) => 5\n", "See also {Doc}[rdoc-ref:README.rdoc]\n"),
-        rule(1),
-        blank_line,
-        blank_line
-      )
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_that_is_alias_for_original
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Qux#aliased'
-
-    expected =
-      doc(
-        head(1, 'Qux#aliased'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        para('alias comment'),
-        blank_line,
-        blank_line,
-        para('(This method is an alias for Qux#original.)'),
-        blank_line,
-        para('original comment'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_attribute
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Foo::Bar#attr'
-
-    expected =
-      doc(
-        head(1, 'Foo::Bar#attr'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_inherited
-    util_multi_store
-
-    out = doc
-
-    @driver.add_method out, 'Bar#inherit'
-
-    expected =
-      doc(
-        head(1, 'Bar#inherit'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        head(3, 'Implementation from Foo'),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_overridden
-    util_multi_store
-
-    out = doc
-
-    @driver.add_method out, 'Bar#override'
-
-    expected =
-      doc(
-        head(1, 'Bar#override'),
-        blank_line,
-        para("(from #{@store2.path})"),
-        rule(1),
-        blank_line,
-        para('must be displayed'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_documentation
-    util_store
-
-    out = doc()
-
-    missing = RDoc::AnyMethod.new nil, 'missing'
-    @cFoo.add_method missing
-
-    @driver.add_method_documentation out, @cFoo
-
-    expected =
-      doc(
-        head(1, 'Foo#inherit'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        blank_line,
-        head(1, 'Foo#override'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        para('must not be displayed in Bar#override'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list
-    out = @RM::Document.new
-
-    @driver.add_method_list out, %w[new parse], 'Class methods'
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Class methods:'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new('new'),
-      @RM::Verbatim.new('parse'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_output_width
-    @options[:width] = 10
-    driver = RDoc::RI::Driver.new @options
-
-    doc = @RM::Document.new
-    doc << @RM::IndentedParagraph.new(0, 'new, parse, foo, bar, baz')
-
-    out, = capture_output do
-      driver.display doc
-    end
-
-    expected = "new, parse, foo,\nbar, baz\n"
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list_interative
-    @options[:interactive] = true
-    driver = RDoc::RI::Driver.new @options
-
-    out = @RM::Document.new
-
-    driver.add_method_list out, %w[new parse], 'Class methods'
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Class methods:'),
-      @RM::BlankLine.new,
-      @RM::IndentedParagraph.new(2, 'new, parse'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list_none
-    out = @RM::Document.new
-
-    @driver.add_method_list out, [], 'Class'
-
-    assert_equal @RM::Document.new, out
-  end
-
-  def test_ancestors_of
-    util_ancestors_store
-
-    assert_equal %w[X Mixin Object Foo], @driver.ancestors_of('Foo::Bar')
-  end
-
-  def test_ancestors_of_chained_inclusion
-    # Store represents something like:
-    #
-    #   module X
-    #   end
-    #
-    #   module Y
-    #     include X
-    #   end
-    #
-    #   class Z
-    #     include Y
-    #   end
-    #
-    # Y is not chosen randomly, it has to be after Object in the alphabet
-    # to reproduce https://github.com/ruby/rdoc/issues/814.
-    store = RDoc::RI::Store.new(@rdoc_options, path: @home_ri)
-    store.cache[:ancestors] = { "Z" => ["Object", "Y"], "Y" => ["X"] }
-    store.cache[:modules] = %W[X Y Z]
-    @driver.stores = [store]
-
-    assert_equal %w[X Y Object], @driver.ancestors_of('Z')
-  end
-
-  def test_classes
-    util_multi_store
-
-    expected = {
-      'Ambiguous' => [@store1, @store2],
-      'Bar'       => [@store2],
-      'Ext'       => [@store1],
-      'Foo'       => [@store1, @store2],
-      'Foo::Bar'  => [@store1],
-      'Foo::Baz'  => [@store1, @store2],
-      'Inc'       => [@store1],
-      'Qux'       => [@store1],
-    }
-
-    classes = @driver.classes
-
-    assert_equal expected.keys.sort, classes.keys.sort
-
-    expected.each do |klass, stores|
-      assert_equal stores, classes[klass].sort_by { |store| store.path },
-                   "mismatch for #{klass}"
-    end
-  end
-
-  def test_class_document
-    util_store
-
-    tl1 = @store1.add_file 'one.rb'
-    tl2 = @store1.add_file 'two.rb'
-
-    @cFoo.add_comment 'one', tl1
-    @cFoo.add_comment 'two', tl2
-
-    @store1.save_class @cFoo
-
-    found = [
-      [@store1, @store1.load_class(@cFoo.full_name)]
-    ]
-
-    extends  = [[[@cFooExt], @store1]]
-    includes = [[[@cFooInc], @store1]]
-
-    out = @driver.class_document @cFoo.full_name, found, [], includes, extends
-
-    expected = @RM::Document.new
-    @driver.add_class expected, 'Foo', []
-    @driver.add_includes expected, includes
-    @driver.add_extends  expected, extends
-    @driver.add_from expected, @store1
-    expected << @RM::Rule.new(1)
-
-    doc = @RM::Document.new(@RM::Paragraph.new('one'))
-    doc.file = 'one.rb'
-    expected.push doc
-    expected << @RM::BlankLine.new
-    doc = @RM::Document.new(@RM::Paragraph.new('two'))
-    doc.file = 'two.rb'
-    expected.push doc
-
-    expected << @RM::Rule.new(1)
-    expected << @RM::Heading.new(1, 'Instance methods:')
-    expected << @RM::BlankLine.new
-    expected << @RM::Verbatim.new('inherit')
-    expected << @RM::Verbatim.new('override')
-    expected << @RM::BlankLine.new
-
-    assert_equal expected, out
-  end
-
-  def test_complete
-    store = RDoc::RI::Store.new(@rdoc_options, path: @home_ri)
-    store.cache[:ancestors] = {
-      'Foo'      => %w[Object],
-      'Foo::Bar' => %w[Object],
-    }
-    store.cache[:class_methods] = {
-      'Foo' => %w[bar]
-    }
-    store.cache[:instance_methods] = {
-      'Foo' => %w[Bar]
-    }
-    store.cache[:modules] = %w[
-      Foo
-      Foo::Bar
-    ]
-
-    @driver.stores = [store]
-
-    assert_equal %w[Foo         ], @driver.complete('F')
-    assert_equal %w[    Foo::Bar], @driver.complete('Foo::B')
-
-    assert_equal %w[Foo#Bar],           @driver.complete('Foo#'),   'Foo#'
-    assert_equal %w[Foo.Bar  Foo.bar],  @driver.complete('Foo.'),   'Foo.'
-    assert_equal %w[Foo::Bar Foo::bar], @driver.complete('Foo::'),  'Foo::'
-
-    assert_equal %w[         Foo::bar], @driver.complete('Foo::b'), 'Foo::b'
-  end
-
-  def test_complete_ancestor
-    util_ancestors_store
-
-    assert_equal %w[Foo::Bar#i_method], @driver.complete('Foo::Bar#')
-
-    assert_equal %w[Foo::Bar::c_method Foo::Bar::new], @driver.complete('Foo::Bar::')
-
-    assert_equal %w[Foo::Bar.c_method Foo::Bar.i_method Foo::Bar.new],
-                 @driver.complete('Foo::Bar.')
-  end
-
-  def test_complete_classes
-    util_store
-
-    assert_equal %w[                       ], @driver.complete('[')
-    assert_equal %w[                       ], @driver.complete('[::')
-    assert_equal %w[Foo                    ], @driver.complete('F')
-    assert_equal %w[Foo:: Foo::Bar Foo::Baz], @driver.complete('Foo::')
-    assert_equal %w[      Foo::Bar Foo::Baz], @driver.complete('Foo::B')
-  end
-
-  def test_complete_multistore
-    util_multi_store
-
-    assert_equal %w[Bar], @driver.complete('B')
-    assert_equal %w[Foo], @driver.complete('F')
-    assert_equal %w[Foo::Bar Foo::Baz], @driver.complete('Foo::B')
-  end
-
-  def test_display
-    doc = @RM::Document.new(
-            @RM::Paragraph.new('hi'))
-
-    out, = capture_output do
-      @driver.display doc
-    end
-
-    assert_equal "hi\n", out
-  end
-
-  def test_display_class
-    util_store
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Bar'
-    end
-
-    assert_match %r%^= Foo::Bar%, out
-    assert_match %r%^\(from%, out
-
-    assert_match %r%^= Class methods:%, out
-    assert_match %r%^  new%, out
-    assert_match %r%^= Instance methods:%, out
-    assert_match %r%^  blah%, out
-    assert_match %r%^= Attributes:%, out
-    assert_match %r%^  attr_accessor attr%, out
-
-    assert_equal 2, out.scan(/^-{50,}$/).length, out
-
-    refute_match %r%Foo::Bar#blah%, out
-  end
-
-  def test_display_class_all
-    util_store
-
-    @driver.show_all = true
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Bar'
-    end
-
-    assert_match %r%^= Foo::Bar%, out
-    assert_match %r%^\(from%, out
-
-    assert_match %r%^= Class methods:%, out
-    assert_match %r%^  new%, out
-    assert_match %r%^= Instance methods:%, out
-    assert_match %r%^  blah%, out
-    assert_match %r%^= Attributes:%, out
-    assert_match %r%^  attr_accessor attr%, out
-
-    assert_equal 9, out.scan(/^-{50,}$/).length, out
-
-    assert_match %r%Foo::Bar#blah%, out
-    assert_match %r%Foo::Bar#blah_with_rdoc_ref%, out
-    # From Foo::Bar and Foo::Bar#blah_with_rdoc_ref
-    assert_equal 2, out.scan(/rdoc-ref:README.rdoc/).length
-    # But README.rdoc should only be displayed once
-    assert_equal 1, out.scan(/Expanded from README.rdoc/).length
-  end
-
-  def test_rdoc_refs_expansion_can_be_disabled
-    util_store
-
-    @driver.instance_variable_set :@expand_rdoc_refs, false
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Bar'
-    end
-
-    # From Foo::Bar
-    assert_equal 1, out.scan(/rdoc-ref:README.rdoc/).length
-    # But README.rdoc should not be expanded
-    assert_empty out.scan(/Expanded from README.rdoc/)
-  end
-
-  def test_display_class_ambiguous
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Ambiguous'
-    end
-
-    assert_match %r%^= Ambiguous < Object$%, out
-  end
-
-  def test_display_class_multi_no_doc
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Baz'
-    end
-
-    assert_match %r%^= Foo::Baz%, out
-    assert_match %r%-\n%, out
-    assert_match %r%Also found in:%, out
-    assert_match %r%#{Regexp.escape @home_ri}%, out
-    assert_match %r%#{Regexp.escape @home_ri2}%, out
-  end
-
-  def test_display_class_superclass
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Bar'
-    end
-
-    assert_match %r%^= Bar < Foo%, out
-  end
-
-  def test_display_class_module
-    util_store
-
-    out, = capture_output do
-      @driver.display_class 'Inc'
-    end
-
-    assert_match %r%^= Inc$%, out
-  end
-
-  def test_display_class_page
-    out, = capture_output do
-      @driver.display_class 'ruby:README'
-    end
-
-    assert_empty out
-  end
-
-  def test_display_method
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#blah'
-    end
-
-    assert_match %r%Foo::Bar#blah%, out
-    assert_match %r%blah.5%,        out
-    assert_match %r%blah.6%,        out
-  end
-
-  def test_display_method_attribute
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#attr'
-    end
-
-    assert_match %r%Foo::Bar#attr%, out
-    refute_match %r%Implementation from%, out
-  end
-
-  def test_display_method_inherited
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_method 'Bar#inherit'
-    end
-
-    assert_match %r%^= Bar#inherit%, out
-    assert_match %r%^=== Implementation from Foo%, out
-  end
-
-  def test_display_method_overridden
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_method 'Bar#override'
-    end
-
-    refute_match %r%must not be displayed%, out
-  end
-
-  def test_display_name
-    util_store
-
-    out, = capture_output do
-      assert_equal true, @driver.display_name('home:README.rdoc')
-    end
-
-    expected = <<-EXPECTED
-= README
-This is a README
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_class
-    util_store
-
-    out, = capture_output do
-      assert_equal false, @driver.display_name('Foo::B')
-    end
-
-    expected = <<-EXPECTED
-Foo::B not found, maybe you meant:
-
-Foo::Bar
-Foo::Baz
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_method
-    util_store
-
-    out, = capture_output do
-      assert_equal false, @driver.display_name('Foo::Bar#b')
-    end
-
-    expected = <<-EXPECTED
-Foo::Bar#b not found, maybe you meant:
-
-Foo::Bar#blah
-Foo::Bar#blah_with_rdoc_ref
-Foo::Bar#bother
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_special
-    util_store
-
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      assert_equal false, @driver.display_name('Set#[]')
-    end
-  end
-
-  def test_display_method_params
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#bother'
-    end
-
-    assert_match %r%things.*stuff%, out
-  end
-
-  def test_display_page
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:README.rdoc'
-    end
-
-    assert_match %r%= README%, out
-  end
-
-  def test_display_page_add_extension
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:README'
-    end
-
-    assert_match %r%= README%, out
-  end
-
-  def test_display_page_ambiguous
-    util_store
-
-    other = @store1.add_file 'README.md'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      RDoc::Comment.from_document(doc(
-        head(1, 'README.md'),
-        para('This is the other README')))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:README'
-    end
-
-    assert_match %r%= README pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,               out
-    assert_match %r%README\.md%,                 out
-  end
-
-  def test_display_page_extension
-    util_store
-
-    other = @store1.add_file 'README.EXT'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      RDoc::Comment.from_document(doc(
-        head(1, 'README.EXT'),
-        para('This is the other README')))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:README.EXT'
-    end
-
-    assert_match 'other README', out
-  end
-
-  def test_display_page_ignore_directory
-    util_store
-
-    other = @store1.add_file 'doc/globals.rdoc'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      RDoc::Comment.from_document(doc(
-        head(1, 'globals.rdoc'),
-        para('Globals go here')))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:globals'
-    end
-
-    assert_match %r%= globals\.rdoc%, out
-  end
-
-  def test_display_page_missing
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:missing'
-    end
-
-    out, = capture_output do
-      @driver.display_page_list @store1
-    end
-
-    assert_match %r%= Pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,        out
-  end
-
-  def test_display_page_list
-    util_store
-
-    other = @store1.add_file 'OTHER.rdoc'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      RDoc::Comment.from_document(doc(
-        head(1, 'OTHER'),
-        para('This is OTHER')))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page_list @store1
-    end
-
-    assert_match %r%= Pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,        out
-    assert_match %r%OTHER\.rdoc%,         out
-  end
-
-  def test_expand_class
-    util_store
-
-    assert_equal 'Foo',       @driver.expand_class('F')
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::Bar')
-
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_class 'F::B'
-    end
-  end
-
-  def test_expand_class_2
-    @store1 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri, type: :home)
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mFox = @top_level.add_module RDoc::NormalModule, 'Fox'
-    @cFoo_Bar = @cFoo.add_class RDoc::NormalClass, 'Bar'
-    @store1.save
-
-    @driver.stores = [@store1]
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_class 'F'
-    end
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::Bar')
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::B')
-  end
-
-  def test_expand_class_3
-    @store1 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri, type: :home)
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mFox = @top_level.add_module RDoc::NormalModule, 'FooBar'
-    @store1.save
-
-    @driver.stores = [@store1]
-
-    assert_equal 'Foo',  @driver.expand_class('Foo')
-  end
-
-  def test_expand_name
-    util_store
-
-    assert_equal '.b',        @driver.expand_name('b')
-    assert_equal 'Foo',       @driver.expand_name('F')
-    assert_equal 'Foo::Bar#', @driver.expand_name('F::Bar#')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_name 'Z'
-    end
-
-    assert_equal 'Z', e.name
-
-    @driver.stores << RDoc::Store.new(@rdoc_options, type: :system)
-
-    assert_equal 'ruby:README', @driver.expand_name('ruby:README')
-    assert_equal 'ruby:',       @driver.expand_name('ruby:')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_name 'nonexistent_gem:'
-    end
-
-    assert_equal 'nonexistent_gem', e.name
-  end
-
-  def test_find_methods
-    util_store
-
-    items = []
-
-    @driver.find_methods 'Foo::Bar.' do |store, klass, ancestor, types, method|
-      items << [store, klass, ancestor, types, method]
-    end
-
-    expected = [
-      [@store1, 'Foo::Bar', 'Foo::Bar', :both, nil],
-    ]
-
-    assert_equal expected, items
-  end
-
-  def test_find_methods_method
-    util_store
-
-    items = []
-
-    @driver.find_methods '.blah' do |store, klass, ancestor, types, method|
-      items << [store, klass, ancestor, types, method]
-    end
-
-    expected = [
-      [@store1, 'Ambiguous', 'Ambiguous', :both, 'blah'],
-      [@store1, 'Ext',       'Ext',       :both, 'blah'],
-      [@store1, 'Foo',       'Foo',       :both, 'blah'],
-      [@store1, 'Foo::Bar',  'Foo::Bar',  :both, 'blah'],
-      [@store1, 'Foo::Baz',  'Foo::Baz',  :both, 'blah'],
-      [@store1, 'Inc',       'Inc',       :both, 'blah'],
-      [@store1, 'Qux',       'Qux',       :both, 'blah'],
-    ]
-
-    assert_equal expected, items
-  end
-
-  def test_filter_methods
-    util_multi_store
-
-    name = 'Bar#override'
-
-    found = @driver.load_methods_matching name
-
-    sorted = @driver.filter_methods found, name
-
-    expected = [[@store2, [@override]]]
-
-    assert_equal expected, sorted
-  end
-
-  def test_filter_methods_not_found
-    util_multi_store
-
-    name = 'Bar#inherit'
-
-    found = @driver.load_methods_matching name
-
-    sorted = @driver.filter_methods found, name
-
-    assert_equal found, sorted
-  end
-
-  def test_find_store
-    @driver.stores << RDoc::Store.new(@rdoc_options, type: :system)
-    @driver.stores << RDoc::Store.new(@rdoc_options, path: 'doc/gem-1.0/ri', type: :gem)
-
-    assert_equal 'ruby',    @driver.find_store('ruby')
-    assert_equal 'gem-1.0', @driver.find_store('gem-1.0')
-    assert_equal 'gem-1.0', @driver.find_store('gem')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.find_store 'nonexistent'
-    end
-
-    assert_equal 'nonexistent', e.name
-  end
-
-  def test_did_you_mean
-    omit 'skip test with did_you_men' unless defined? DidYouMean::SpellChecker
-
-    util_ancestors_store
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo.i_methdo'
-    end
-    assert_equal "Nothing known about Foo.i_methdo\nDid you mean?  i_method", e.message
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo#i_methdo'
-    end
-    assert_equal "Nothing known about Foo#i_methdo\nDid you mean?  i_method", e.message
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo::i_methdo'
-    end
-    assert_equal "Nothing known about Foo::i_methdo\nDid you mean?  c_method", e.message
-  end
-
-  def test_formatter
-    tty = Object.new
-    def tty.tty?() true; end
-
-    @options.delete :use_stdout
-    @options.delete :formatter
-
-    driver = RDoc::RI::Driver.new @options
-
-    assert_instance_of @RM::ToAnsi, driver.formatter(tty)
-
-    assert_instance_of @RM::ToBs, driver.formatter(StringIO.new)
-
-    driver.instance_variable_set :@paging, true
-
-    assert_instance_of @RM::ToBs, driver.formatter(StringIO.new)
-  end
-
-  def test_method_type
-    assert_equal :both,     @driver.method_type(nil)
-    assert_equal :both,     @driver.method_type('.')
-    assert_equal :instance, @driver.method_type('#')
-    assert_equal :class,    @driver.method_type('::')
-  end
-
-  def test_name_regexp
-    assert_equal %r%^RDoc::AnyMethod#new$%,
-                 @driver.name_regexp('RDoc::AnyMethod#new')
-
-    assert_equal %r%^RDoc::AnyMethod::new$%,
-                 @driver.name_regexp('RDoc::AnyMethod::new')
-
-    assert_equal %r%^RDoc::AnyMethod(#|::)new$%,
-                 @driver.name_regexp('RDoc::AnyMethod.new')
-
-    assert_equal %r%^Hash(#|::)\[\]$%,
-                 @driver.name_regexp('Hash.[]')
-
-    assert_equal %r%^Hash::\[\]$%,
-                 @driver.name_regexp('Hash::[]')
-  end
-
-  def test_list_known_classes
-    util_store
-
-    out, = capture_output do
-      @driver.list_known_classes
-    end
-
-    assert_equal "Ambiguous\nExt\nFoo\nFoo::Bar\nFoo::Baz\nInc\nQux\n", out
-  end
-
-  def test_list_known_classes_name
-    util_store
-
-    out, = capture_output do
-      @driver.list_known_classes %w[F I]
-    end
-
-    assert_equal "Foo\nFoo::Bar\nFoo::Baz\nInc\n", out
-  end
-
-  def test_list_methods_matching
-    util_store
-
-    assert_equal %w[
-        Foo::Bar#attr
-        Foo::Bar#blah
-        Foo::Bar#blah_with_rdoc_ref
-        Foo::Bar#bother
-        Foo::Bar::new
-      ],
-      @driver.list_methods_matching('Foo::Bar.').sort
-  end
-
-  def test_list_methods_matching_inherit
-    util_multi_store
-
-    assert_equal %w[
-        Bar#baz
-        Bar#inherit
-        Bar#override
-      ],
-      @driver.list_methods_matching('Bar.').sort
-  end
-
-  def test_list_methods_matching_regexp
-    util_store
-
-    index = RDoc::AnyMethod.new nil, '[]'
-    index.record_location @top_level
-    @cFoo.add_method index
-    @store1.save_method @cFoo, index
-
-    c_index = RDoc::AnyMethod.new nil, '[]', singleton: true
-    c_index.record_location @top_level
-    @cFoo.add_method c_index
-    @store1.save_method @cFoo, c_index
-
-    @store1.save_cache
-
-    assert_equal %w[Foo#[]], @driver.list_methods_matching('Foo#[]')
-    assert_equal %w[Foo::[]], @driver.list_methods_matching('Foo::[]')
-  end
-
-  def test_load_method
-    util_store
-
-    method = @driver.load_method(@store1, :instance_methods, 'Foo', '#',
-                                 'inherit')
-
-    assert_equal @inherit, method
-  end
-
-  def test_load_method_inherited
-    util_multi_store
-
-    method = @driver.load_method(@store2, :instance_methods, 'Bar', '#',
-                                 'inherit')
-
-    assert_nil method
-  end
-
-  def test_load_methods_matching
-    util_store
-
-    expected = [[@store1, [@inherit]]]
-
-    assert_equal expected, @driver.load_methods_matching('Foo#inherit')
-
-    expected = [[@store1, [@blah]]]
-
-    assert_equal expected, @driver.load_methods_matching('.blah')
-
-    assert_empty @driver.load_methods_matching('.b')
-  end
-
-  def test_load_methods_matching_inherited
-    util_multi_store
-
-    expected = [[@store1, [@inherit]]]
-
-    assert_equal expected, @driver.load_methods_matching('Bar#inherit')
-  end
-
-  def test_load_method_missing
-    util_store
-
-    FileUtils.rm @store1.method_file 'Foo', '#inherit'
-
-    method = @driver.load_method(@store1, :instance_methods, 'Foo', '#',
-                                 'inherit')
-
-    assert_equal '(unknown)#inherit', method.full_name
-  end
-
-  def test_page
-    @driver.use_stdout = false
-
-    with_dummy_pager do
-      @driver.page do |io|
-        omit "couldn't find a standard pager" if io == $stdout
-
-        assert @driver.paging?
-      end
-    end
-
-    refute @driver.paging?
-  end
-
-  def test_page_in_presence_of_child_status
-    @driver.use_stdout = false
-
-    with_dummy_pager do
-      @driver.page do |io|
-        refute_equal $stdout, io
-        assert @driver.paging?
-      end
-    end
-  end
-
-  def test_page_stdout
-    @driver.use_stdout = true
-
-    @driver.page do |io|
-      assert_equal $stdout, io
-    end
-
-    refute @driver.paging?
-  end
-
-  def test_parse_name_method
-    klass, type, meth = @driver.parse_name 'foo'
-
-    assert_equal '',    klass, 'foo class'
-    assert_equal '.',   type,  'foo type'
-    assert_equal 'foo', meth,  'foo method'
-
-    klass, type, meth = @driver.parse_name '#foo'
-
-    assert_equal '',    klass, '#foo class'
-    assert_equal '#',   type,  '#foo type'
-    assert_equal 'foo', meth,  '#foo method'
-
-    klass, type, meth = @driver.parse_name '::foo'
-
-    assert_equal '',    klass, '::foo class'
-    assert_equal '::',  type,  '::foo type'
-    assert_equal 'foo', meth,  '::foo method'
-  end
-
-  def test_parse_name_page
-    klass, type, meth = @driver.parse_name 'ruby:README'
-
-    assert_equal 'ruby',   klass, 'ruby project'
-    assert_equal ':',      type,  'ruby type'
-    assert_equal 'README', meth,  'ruby page'
-
-    klass, type, meth = @driver.parse_name 'ruby:'
-
-    assert_equal 'ruby',   klass, 'ruby project'
-    assert_equal ':',      type,  'ruby type'
-    assert_nil             meth,  'ruby page'
-  end
-
-  def test_parse_name_page_extenson
-    klass, type, meth = @driver.parse_name 'ruby:README.EXT'
-
-    assert_equal 'ruby',      klass, 'ruby project'
-    assert_equal ':',         type,  'ruby type'
-    assert_equal 'README.EXT', meth,  'ruby page'
-  end
-
-  def test_parse_name_single_class
-    klass, type, meth = @driver.parse_name 'Foo'
-
-    assert_equal 'Foo', klass, 'Foo class'
-    assert_nil          type,  'Foo type'
-    assert_nil          meth,  'Foo method'
-
-    klass, type, meth = @driver.parse_name 'Foo#'
-
-    assert_equal 'Foo', klass, 'Foo# class'
-    assert_equal '#',   type,  'Foo# type'
-    assert_nil          meth,  'Foo# method'
-
-    klass, type, meth = @driver.parse_name 'Foo::'
-
-    assert_equal 'Foo', klass, 'Foo:: class'
-    assert_equal '::',  type,  'Foo:: type'
-    assert_nil          meth,  'Foo:: method'
-
-    klass, type, meth = @driver.parse_name 'Foo.'
-
-    assert_equal 'Foo', klass, 'Foo. class'
-    assert_equal '.',   type,  'Foo. type'
-    assert_nil          meth,  'Foo. method'
-
-    klass, type, meth = @driver.parse_name 'Foo#Bar'
-
-    assert_equal 'Foo', klass, 'Foo#Bar class'
-    assert_equal '#',   type,  'Foo#Bar type'
-    assert_equal 'Bar', meth,  'Foo#Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo.Bar'
-
-    assert_equal 'Foo', klass, 'Foo.Bar class'
-    assert_equal '.',   type,  'Foo.Bar type'
-    assert_equal 'Bar', meth,  'Foo.Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo::bar'
-
-    assert_equal 'Foo', klass, 'Foo::bar class'
-    assert_equal '::',  type,  'Foo::bar type'
-    assert_equal 'bar', meth,  'Foo::bar method'
-  end
-
-  def test_parse_name_namespace
-    klass, type, meth = @driver.parse_name 'Foo::Bar'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar class'
-    assert_nil               type,  'Foo::Bar type'
-    assert_nil               meth,  'Foo::Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo::Bar#'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar# class'
-    assert_equal '#',        type,  'Foo::Bar# type'
-    assert_nil               meth,  'Foo::Bar# method'
-
-    klass, type, meth = @driver.parse_name 'Foo::Bar#baz'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar#baz class'
-    assert_equal '#',        type,  'Foo::Bar#baz type'
-    assert_equal 'baz',      meth,  'Foo::Bar#baz method'
-  end
-
-  def test_parse_name_special
-    specials = %w[
-      %
-      &
-      *
-      +
-      +@
-      -
-      -@
-      /
-      <
-      <<
-      <=
-      <=>
-      ==
-      ===
-      =>
-      =~
-      >
-      >>
-      []
-      []=
-      ^
-      `
-      |
-      ~
-      ~@
-    ]
-
-    specials.each do |special|
-      parsed = @driver.parse_name special
-
-      assert_equal ['', '.', special], parsed
-    end
-  end
-
-  def test_setup_pager # this test doesn't do anything anymore :(
-    @driver.use_stdout = false
-
-    pager = with_dummy_pager do @driver.setup_pager end
-
-    omit "couldn't find a standard pager" unless pager
-
-    assert @driver.paging?
-  ensure
-    pager.close if pager
-  end
-
-  def util_ancestors_store
-    store1 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri)
-    store1.cache[:ancestors] = {
-      'Foo'      => %w[Object],
-      'Foo::Bar' => %w[Foo],
-    }
-    store1.cache[:class_methods] = {
-      'Foo'      => %w[c_method new],
-      'Foo::Bar' => %w[new],
-    }
-    store1.cache[:instance_methods] = {
-      'Foo' => %w[i_method],
-    }
-    store1.cache[:modules] = %w[
-      Foo
-      Foo::Bar
-    ]
-
-    store2 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri)
-    store2.cache[:ancestors] = {
-      'Foo'    => %w[Mixin Object],
-      'Mixin'  => %w[],
-      'Object' => %w[X Object],
-      'X'      => %w[Object],
-    }
-    store2.cache[:class_methods] = {
-      'Foo'    => %w[c_method new],
-      'Mixin'  => %w[],
-      'X'      => %w[],
-      'Object' => %w[],
-    }
-    store2.cache[:instance_methods] = {
-      'Foo'   => %w[i_method],
-      'Mixin' => %w[],
-    }
-    store2.cache[:modules] = %w[
-      Foo
-      Mixin
-      Object
-      X
-    ]
-
-    @driver.stores = store1, store2
-  end
-
-  def util_multi_store
-    util_store
-
-    @home_ri2 = "#{@home_ri}2"
-    @store2 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri2)
-
-    @top_level = @store2.add_file 'file.rb'
-
-    # as if seen in a namespace like class Ambiguous::Other
-    @mAmbiguous = @top_level.add_module RDoc::NormalModule, 'Ambiguous'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    @cBar = @top_level.add_class RDoc::NormalClass, 'Bar', 'Foo'
-    @cFoo_Baz = @cFoo.add_class RDoc::NormalClass, 'Baz'
-
-    @baz = @cBar.add_method RDoc::AnyMethod.new(nil, 'baz')
-    @baz.record_location @top_level
-
-    @override = @cBar.add_method RDoc::AnyMethod.new(nil, 'override')
-    @override.comment = 'must be displayed'
-    @override.record_location @top_level
-
-    @store2.save
-
-    @driver.stores = [@store1, @store2]
-  end
-
-  def util_store
-    @store1 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri, type: :home)
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @readme = @store1.add_file 'README.rdoc'
-    @readme.parser = RDoc::Parser::Simple
-    @readme.comment = RDoc::Comment.from_document(doc(head(1, 'README'), para('This is a README')))
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mExt = @top_level.add_module RDoc::NormalModule, 'Ext'
-    @mInc = @top_level.add_module RDoc::NormalModule, 'Inc'
-    @cAmbiguous = @top_level.add_class RDoc::NormalClass, 'Ambiguous'
-
-    doc = @RM::Document.new @RM::Paragraph.new('Extend thingy')
-    @cFooExt = @cFoo.add_extend RDoc::Extend.new('Ext', RDoc::Comment.from_document(doc))
-    @cFooExt.record_location @top_level
-    doc = @RM::Document.new @RM::Paragraph.new('Include thingy')
-    @cFooInc = @cFoo.add_include RDoc::Include.new('Inc', RDoc::Comment.from_document(doc))
-    @cFooInc.record_location @top_level
-
-    @cFoo_Bar = @cFoo.add_class RDoc::NormalClass, 'Bar'
-    @cFoo_Bar.add_comment "See also {Doc}[rdoc-ref:README.rdoc]", @top_level
-    @cFoo_Bar.record_location @top_level
-
-    @blah = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'blah')
-    @blah.call_seq = "blah(5) => 5\nblah(6) => 6\n"
-    @blah.record_location @top_level
-
-    @blah_with_rdoc_ref = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'blah_with_rdoc_ref')
-    @blah_with_rdoc_ref.call_seq = "blah(5) => 5\nSee also {Doc}[rdoc-ref:README.rdoc]"
-    @blah_with_rdoc_ref.record_location @top_level
-
-    @bother = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'bother')
-    @bother.block_params = "stuff"
-    @bother.params = "(things)"
-    @bother.record_location @top_level
-
-    @new = @cFoo_Bar.add_method RDoc::AnyMethod.new nil, 'new', singleton: true
-    @new.record_location @top_level
-
-    @attr = @cFoo_Bar.add_attribute RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-
-    @cFoo_Baz = @cFoo.add_class RDoc::NormalClass, 'Baz'
-    @cFoo_Baz.record_location @top_level
-
-    @inherit = @cFoo.add_method RDoc::AnyMethod.new(nil, 'inherit')
-    @inherit.record_location @top_level
-
-    # overridden by Bar in multi_store
-    @overridden = @cFoo.add_method RDoc::AnyMethod.new(nil, 'override')
-    @overridden.comment = 'must not be displayed in Bar#override'
-    @overridden.record_location @top_level
-
-    @cQux = @top_level.add_class RDoc::NormalClass, 'Qux'
-
-    @original = @cQux.add_method RDoc::AnyMethod.new(nil, 'original')
-    @original.comment = 'original comment'
-    @original.record_location @top_level
-
-    @aliased = @original.add_alias RDoc::Alias.new(nil, 'original', 'aliased', 'alias comment'), @cQux
-    @aliased.record_location @top_level
-
-    @store1.save
-
-    @driver.stores = [@store1]
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_ri_paths_test.rb b/test/mri/rdoc/rdoc/rdoc_ri_paths_test.rb
deleted file mode 100644
index 7a9fc6fde4f..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_ri_paths_test.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRIPathsTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @orig_env = ENV.to_hash
-    @orig_gem_path = Gem.path
-
-    @tempdir = File.join Dir.tmpdir, "test_rdoc_ri_paths_#{$$}"
-    Gem.use_paths @tempdir
-    Gem.ensure_gem_subdirectories @tempdir
-
-    specs = [
-      @rake_10   = Gem::Specification.new('rake', '10.0.1'),
-      @rdoc_4_0  = Gem::Specification.new('rdoc', '4.0'),
-      @rdoc_3_12 = Gem::Specification.new('rdoc', '3.12'),
-      @nodoc     = Gem::Specification.new('nodoc', '1.0'),
-    ]
-
-    specs.each do |spec|
-      spec.loaded_from = spec.spec_file
-
-      File.open spec.spec_file, 'w' do |file|
-        file.write spec.to_ruby_for_cache
-      end
-
-      FileUtils.mkdir_p File.join(spec.doc_dir, 'ri') unless
-        spec.name == 'nodoc'
-    end
-
-    Gem::Specification.reset
-    Gem::Specification.all = specs
-  end
-
-  def teardown
-    Gem.use_paths(*@orig_gem_path)
-    Gem::Specification.reset
-    FileUtils.rm_rf @tempdir
-    ENV.replace(@orig_env)
-
-    super
-  end
-
-  def test_class_each
-    enum = RDoc::RI::Paths.each true, true, true, :all
-
-    path = enum.map { |dir,| dir }
-
-    assert_equal RDoc::RI::Paths.system_dir,          path.shift
-    assert_equal RDoc::RI::Paths.site_dir,            path.shift
-    assert_equal RDoc::RI::Paths.home_dir,            path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@nodoc.doc_dir, 'ri'),     path.shift
-    assert_equal File.join(@rake_10.doc_dir, 'ri'),   path.shift
-    assert_equal File.join(@rdoc_4_0.doc_dir, 'ri'),  path.shift
-    assert_equal File.join(@rdoc_3_12.doc_dir, 'ri'), path.shift
-    assert_empty path
-  end
-
-  def test_class_gemdirs_latest
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs :latest
-
-      expected = [
-        File.join(@rake_10.doc_dir, 'ri'),
-        File.join(@rdoc_4_0.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gemdirs_legacy
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs true
-
-      expected = [
-        File.join(@rake_10.doc_dir, 'ri'),
-        File.join(@rdoc_4_0.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gemdirs_all
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs :all
-
-      expected = [
-        File.join(@nodoc.doc_dir,     'ri'),
-        File.join(@rake_10.doc_dir,   'ri'),
-        File.join(@rdoc_4_0.doc_dir,  'ri'),
-        File.join(@rdoc_3_12.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gem_dir
-    dir = RDoc::RI::Paths.gem_dir 'rake', '10.0.1'
-
-    expected = File.join @rake_10.doc_dir, 'ri'
-
-    assert_equal expected, dir
-  end
-
-  def test_class_home_dir
-    dir = RDoc::RI::Paths.home_dir
-
-    assert_equal RDoc::RI::Paths::HOMEDIR, dir
-  end
-
-  def test_class_path_nonexistent
-    temp_dir do |dir|
-      nonexistent = File.join dir, 'nonexistent'
-      dir = RDoc::RI::Paths.path true, true, true, true, nonexistent
-
-      refute_includes dir, nonexistent
-    end
-  end
-
-  def test_class_raw_path
-    path = RDoc::RI::Paths.raw_path true, true, true, true
-
-    assert_equal RDoc::RI::Paths.system_dir,        path.shift
-    assert_equal RDoc::RI::Paths.site_dir,          path.shift
-    assert_equal RDoc::RI::Paths.home_dir,          path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
-  end
-
-  def test_class_raw_path_extra_dirs
-    path = RDoc::RI::Paths.raw_path true, true, true, true, '/nonexistent'
-
-    assert_equal '/nonexistent',                    path.shift
-    assert_equal RDoc::RI::Paths.system_dir,        path.shift
-    assert_equal RDoc::RI::Paths.site_dir,          path.shift
-    assert_equal RDoc::RI::Paths.home_dir,          path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
-  end
-
-  def test_class_site_dir
-    dir = RDoc::RI::Paths.site_dir
-
-    assert_equal File.join(RDoc::RI::Paths::BASE, 'site'), dir
-  end
-
-  def test_class_system_dir
-    dir = RDoc::RI::Paths.system_dir
-
-    assert_equal File.join(RDoc::RI::Paths::BASE, 'system'), dir
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_rubygems_hook_test.rb b/test/mri/rdoc/rdoc/rdoc_rubygems_hook_test.rb
deleted file mode 100644
index 99194c59d85..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_rubygems_hook_test.rb
+++ /dev/null
@@ -1,329 +0,0 @@
-# frozen_string_literal: true
-require 'rubygems'
-require 'fileutils'
-require 'tmpdir'
-require_relative '../../lib/rdoc/rubygems_hook'
-require 'test/unit'
-
-class RDocRubyGemsHookTest < Test::Unit::TestCase
-  def setup
-    @a = Gem::Specification.new do |s|
-      s.platform    = Gem::Platform::RUBY
-      s.name        = "a"
-      s.version     = 2
-      s.rdoc_options = %w[--main MyTitle]
-      s.extra_rdoc_files = %w[README]
-    end
-    @tempdir = File.realpath(Dir.mktmpdir("test_rubygems_hook_"))
-
-    @orig_envs = %w[
-      GEM_VENDOR
-      GEMRC
-      XDG_CACHE_HOME
-      XDG_CONFIG_HOME
-      XDG_DATA_HOME
-      SOURCE_DATE_EPOCH
-      BUNDLER_VERSION
-      HOME
-      RDOCOPT
-    ].map {|e| [e, ENV.delete(e)]}.to_h
-    ENV["HOME"] = @tempdir
-
-    Gem.configuration = nil
-
-    @a.instance_variable_set(:@doc_dir, File.join(@tempdir, "doc"))
-    @a.instance_variable_set(:@gem_dir, File.join(@tempdir, "a-2"))
-    @a.instance_variable_set(:@full_gem_path, File.join(@tempdir, "a-2"))
-    @a.loaded_from = File.join(@tempdir, 'a-2', 'a-2.gemspec')
-
-    FileUtils.mkdir_p File.join(@tempdir, 'a-2', 'lib')
-    FileUtils.touch   File.join(@tempdir, 'a-2', 'README')
-    File.open(File.join(@tempdir, 'a-2', 'lib', 'a.rb'), 'w') do |f|
-      f.puts '# comment'
-      f.puts '# :include: include.txt'
-      f.puts 'class A; end'
-    end
-    File.open(File.join(@tempdir, 'a-2', 'include.txt'), 'w') do |f|
-      f.puts 'included content'
-    end
-
-    @hook = RDoc::RubyGemsHook.new @a
-
-    begin
-      RDoc::RubyGemsHook.load_rdoc
-    rescue Gem::DocumentError => e
-      omit e.message
-    end
-    @old_ui = Gem::DefaultUserInteraction.ui
-    Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
-  end
-
-  def teardown
-    ui = Gem::DefaultUserInteraction.ui
-    Gem::DefaultUserInteraction.ui = @old_ui
-    FileUtils.rm_rf @tempdir
-    ui.close
-    ENV.update(@orig_envs)
-  end
-
-  def test_initialize
-    refute @hook.generate_rdoc
-    assert @hook.generate_ri
-
-    rdoc = RDoc::RubyGemsHook.new @a, false, false
-
-    refute rdoc.generate_rdoc
-    refute rdoc.generate_ri
-  end
-
-  def test_delete_legacy_args
-    args = %w[
-      --inline-source
-      --one-file
-      --promiscuous
-      -p
-    ]
-
-    @hook.delete_legacy_args args
-
-    assert_empty args
-  end
-
-  def test_document
-    options = RDoc::Options.new
-    options.files = []
-
-    rdoc = @hook.new_rdoc
-    rdoc.store = RDoc::Store.new(options)
-    @hook.instance_variable_set :@rdoc, rdoc
-    @hook.instance_variable_set :@file_info, []
-
-    @hook.document 'darkfish', options, @a.doc_dir('rdoc')
-
-    assert @hook.rdoc_installed?
-  end
-
-  def test_generate
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    assert @hook.ri_installed?
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    refute rdoc.options.hyperlink_all
-    assert_equal Pathname(@a.full_gem_path), rdoc.options.root
-    assert_equal %w[README lib], rdoc.options.files.sort
-
-    assert_equal 'MyTitle', rdoc.store.main
-
-    klass = rdoc.store.find_class_named('A')
-    refute_nil klass
-    assert_includes klass.comment.text, 'included content'
-  end
-
-  def test_generate_all
-    @hook.generate_rdoc = true
-    @hook.generate_ri   = true
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    assert @hook.rdoc_installed?
-    assert @hook.ri_installed?
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    refute rdoc.options.hyperlink_all
-    assert_equal Pathname(@a.full_gem_path), rdoc.options.root
-    assert_equal %w[README lib], rdoc.options.files.sort
-
-    assert_equal 'MyTitle', rdoc.store.main
-  end
-
-  def test_generate_configuration_rdoc_array
-    Gem.configuration[:rdoc] = %w[-A]
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end
-
-  def test_generate_configuration_rdoc_string
-    Gem.configuration[:rdoc] = '-A'
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end
-
-  def test_generate_default_gem
-    Gem::Deprecate.skip_during do
-      if Gem.respond_to?(:default_specifications_dir)
-        klass = Gem
-      else
-        klass = Gem::Specification
-      end
-      @a.loaded_from = File.join klass.default_specifications_dir, 'a.gemspec'
-    end
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-  end
-
-  def test_generate_disabled
-    @hook.generate_rdoc = false
-    @hook.generate_ri   = false
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-  end
-
-  def test_generate_force
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.force = true
-
-    @hook.generate
-
-    assert_path_not_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_exist File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
-
-  def test_generate_rubygems_compatible
-    original_default_gem_method = RDoc::RubygemsHook.method(:default_gem?)
-    RDoc::RubygemsHook.singleton_class.remove_method(:default_gem?)
-    RDoc::RubygemsHook.define_singleton_method(:default_gem?) { true }
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    # rubygems/lib/rubygems/commands/rdoc_command.rb calls this
-    hook = RDoc::RubygemsHook.new @a, true, true
-    hook.force = true
-    hook.generate
-
-    assert_path_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-  ensure
-    RDoc::RubygemsHook.singleton_class.remove_method(:default_gem?)
-    RDoc::RubygemsHook.define_singleton_method(:default_gem?, &original_default_gem_method)
-  end
-
-  def test_generate_no_overwrite
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    assert_path_not_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_not_exist File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
-
-  def test_generate_with_ri_opt
-    @a.rdoc_options << '--ri'
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-    @hook.generate_rdoc = true
-    @hook.generate_ri   = true
-    @hook.generate
-
-    assert_path_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_exist File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
-
-  def test_new_rdoc
-    assert_kind_of RDoc::RDoc, @hook.new_rdoc
-  end
-
-  def test_rdoc_installed?
-    refute @hook.rdoc_installed?
-
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-
-    assert @hook.rdoc_installed?
-  end
-
-  def test_remove
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-
-    @hook.remove
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-
-    assert_path_exist @a.doc_dir
-  end
-
-  def test_remove_unwritable
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    FileUtils.mkdir_p @a.base_dir
-    FileUtils.chmod 0, @a.base_dir
-
-    e = assert_raise Gem::FilePermissionError do
-      @hook.remove
-    end
-
-    assert_equal @a.base_dir, e.directory
-  ensure
-    FileUtils.chmod(0755, @a.base_dir) if File.directory?(@a.base_dir)
-  end
-
-  def test_ri_installed?
-    refute @hook.ri_installed?
-
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-
-    assert @hook.ri_installed?
-  end
-
-  def test_setup
-    @hook.setup
-
-    assert_path_exist @a.doc_dir
-  end
-
-  def test_setup_unwritable
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.chmod 0, @a.doc_dir
-
-    e = assert_raise Gem::FilePermissionError do
-      @hook.setup
-    end
-
-    assert_equal @a.doc_dir, e.directory
-  ensure
-    if File.exist? @a.doc_dir
-      FileUtils.chmod 0755, @a.doc_dir
-      FileUtils.rm_r @a.doc_dir
-    end
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_servlet_test.rb b/test/mri/rdoc/rdoc/rdoc_servlet_test.rb
deleted file mode 100644
index 825abdf4ab7..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_servlet_test.rb
+++ /dev/null
@@ -1,553 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-begin
-  require 'webrick'
-rescue LoadError
-end
-
-class RDocServletTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @orig_gem_path = Gem.path
-
-    @tempdir = File.join Dir.tmpdir, "test_rdoc_servlet_#{$$}"
-    Gem.use_paths @tempdir
-    Gem.ensure_gem_subdirectories @tempdir
-
-    @spec = Gem::Specification.new 'spec', '1.0'
-    @spec.loaded_from = @spec.spec_file
-
-    Gem::Specification.reset
-    Gem::Specification.all = [@spec]
-
-    @server = {}
-    def @server.mount(*) end
-
-    @stores = {}
-    @cache  = Hash.new { |hash, store| hash[store] = {} }
-
-    @extra_dirs = [File.join(@tempdir, 'extra1'), File.join(@tempdir, 'extra2')]
-
-    @s = RDoc::Servlet.new @server, @stores, @cache, nil, @extra_dirs
-
-    @req = WEBrick::HTTPRequest.new :Logger => nil
-    @res = WEBrick::HTTPResponse.new :HTTPVersion => '1.0'
-
-    def @req.path=(path)
-      instance_variable_set :@path, path
-    end
-
-    @req.instance_variable_set :@header, Hash.new { |h, k| h[k] = [] }
-
-    @base        = File.join @tempdir, 'base'
-    @system_dir  = File.join @tempdir, 'base', 'system'
-    @home_dir    = File.join @tempdir, 'home'
-    @gem_doc_dir = File.join @tempdir, 'doc'
-    @options     = RDoc::Options.new
-
-    @orig_base = RDoc::RI::Paths::BASE
-    RDoc::RI::Paths::BASE.replace @base
-    @orig_ri_path_homedir = RDoc::RI::Paths::HOMEDIR
-    RDoc::RI::Paths.send :remove_const, :HOMEDIR
-    RDoc::RI::Paths.const_set :HOMEDIR, @home_dir
-
-    RDoc::RI::Paths.instance_variable_set \
-      :@gemdirs, %w[/nonexistent/gems/example-1.0/ri]
-  end
-
-  def teardown
-    super
-
-    Gem.use_paths(*@orig_gem_path)
-    Gem::Specification.reset
-
-    FileUtils.rm_rf @tempdir
-
-    RDoc::RI::Paths::BASE.replace @orig_base
-    RDoc::RI::Paths.send :remove_const, :HOMEDIR
-    RDoc::RI::Paths.const_set :HOMEDIR, @orig_ri_path_homedir
-    RDoc::RI::Paths.instance_variable_set :@gemdirs, nil
-  end
-
-  def test_asset
-    temp_dir do
-      FileUtils.mkdir 'css'
-
-      now = Time.now
-      File.open 'css/rdoc.css', 'w' do |io| io.write 'h1 { color: red }' end
-      File.utime now, now, 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/css/rdoc.css'
-
-      @s.asset :darkfish, @req, @res
-
-      assert_equal 'h1 { color: red }', @res.body
-      assert_equal 'text/css',          @res.content_type
-      assert_equal now.httpdate,        @res['last-modified']
-    end
-  end
-
-  def test_do_GET
-    touch_system_cache_path
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.do_GET @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_do_GET_asset_darkfish
-    temp_dir do
-      FileUtils.mkdir 'css'
-      FileUtils.touch 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/css/rdoc.css'
-
-      @s.do_GET @req, @res
-
-      assert_equal 'text/css',          @res.content_type
-    end
-  end
-
-  def test_do_GET_asset_json_index
-    temp_dir do
-      FileUtils.mkdir 'js'
-      FileUtils.touch 'js/navigation.js'
-
-      @s.asset_dirs[:json_index] = '.'
-
-      @req.path = '/js/navigation.js'
-
-      @s.do_GET @req, @res
-
-      assert_equal 'application/javascript', @res.content_type
-    end
-  end
-
-  def test_do_GET_error
-    touch_system_cache_path
-
-    def @req.path() raise 'no' end
-
-    @s.do_GET @req, @res
-
-    assert_equal 500, @res.status
-  end
-
-  def test_do_GET_mount_path
-    @s = RDoc::Servlet.new @server, @stores, @cache, '/mount/path'
-
-    temp_dir do
-      FileUtils.mkdir 'css'
-      FileUtils.touch 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/mount/path/css/rdoc.css'.dup
-
-      @s.do_GET @req, @res
-
-      assert_equal 'text/css', @res.content_type
-    end
-  end
-
-  def do_GET_not_found
-    touch_system_cache_path
-
-    @req.path = "/#{@spec.full_name}"
-
-    @s.do_GET @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_do_GET_not_modified
-    touch_system_cache_path
-    @req.header['if-modified-since'] = [(Time.now + 10).httpdate]
-    @req.path = '/ruby/Missing.html'
-
-    assert_raise WEBrick::HTTPStatus::NotModified do
-      @s.do_GET @req, @res
-    end
-  end
-
-  def test_do_GET_root
-    touch_system_cache_path
-
-    @req.path = '/'
-
-    @s.do_GET @req, @res
-
-    assert_equal 'text/html',                                 @res.content_type
-    assert_match %r%<title>Local RDoc Documentation</title>%, @res.body
-  end
-
-  def test_do_GET_root_search
-    touch_system_cache_path
-
-    @req.path = '/js/search_index.js'
-
-    @s.do_GET @req, @res
-
-    assert_equal 'application/javascript', @res.content_type, @res.body
-  end
-
-  def test_documentation_page_class
-    store = RDoc::Store.new(@options)
-
-    generator = @s.generator_for store
-
-    file      = store.add_file 'file.rb'
-    klass     = file.add_class RDoc::NormalClass, 'Klass'
-                klass.add_class RDoc::NormalClass, 'Sub'
-
-    @s.documentation_page store, generator, 'Klass::Sub.html', @req, @res
-
-    assert_match %r%<title>class Klass::Sub - </title>%,            @res.body
-    assert_match %r%<body id="top" role="document" class="class">%, @res.body
-  end
-
-  def test_documentation_page_not_found
-    store = RDoc::Store.new(@options)
-
-    generator = @s.generator_for store
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.documentation_page store, generator, 'Missing.html', @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_documentation_page_page
-    store = RDoc::Store.new(@options)
-
-    generator = @s.generator_for store
-
-    store.add_file 'README.rdoc', parser: RDoc::Parser::Simple
-
-    @s.documentation_page store, generator, 'README_rdoc.html', @req, @res
-
-    assert_match %r%<title>README - </title>%, @res.body
-    assert_match %r%<body [^>]+ class="file">%,      @res.body
-  end
-
-  def test_documentation_page_page_with_nesting
-    store = RDoc::Store.new(@options)
-
-    generator = @s.generator_for store
-
-    store.add_file 'nesting/README.rdoc', parser: RDoc::Parser::Simple
-
-    @s.documentation_page store, generator, 'nesting/README_rdoc.html', @req, @res
-
-    assert_equal 200, @res.status
-  end
-
-  def test_documentation_source
-    store, path = @s.documentation_source '/ruby/Object.html'
-
-    assert_equal @system_dir, store.path
-
-    assert_equal 'Object.html', path
-  end
-
-  def test_documentation_source_cached
-    cached_store = RDoc::Store.new(@options)
-
-    @stores['ruby'] = cached_store
-
-    store, path = @s.documentation_source '/ruby/Object.html'
-
-    assert_same cached_store, store
-
-    assert_equal 'Object.html', path
-  end
-
-  def test_error
-    e = RuntimeError.new 'foo'
-    e.set_backtrace caller
-
-    @s.error e, @req, @res
-
-    assert_equal 'text/html',      @res.content_type
-    assert_equal 500,              @res.status
-    assert_match %r%<title>Error%, @res.body
-  end
-
-  def test_generator_for
-    store = RDoc::Store.new(@options)
-    store.main  = 'MAIN_PAGE.rdoc'
-    store.title = 'Title'
-
-    generator = @s.generator_for store
-
-    refute generator.file_output
-
-    assert_equal '..', generator.asset_rel_path
-
-    assert_equal 'MAIN_PAGE.rdoc', @s.options.main_page
-    assert_equal 'Title',          @s.options.title
-  end
-
-  def test_if_modified_since
-    omit 'File.utime on directory not supported' if Gem.win_platform?
-
-    temp_dir do
-      now = Time.now
-      File.utime now, now, '.'
-
-      @s.if_modified_since @req, @res, '.'
-
-      assert_equal now.to_i, Time.parse(@res['last-modified']).to_i
-    end
-  end
-
-  def test_if_modified_since_not_modified
-    omit 'File.utime on directory not supported' if Gem.win_platform?
-
-    temp_dir do
-      now = Time.now
-      File.utime now, now, '.'
-
-      @req.header['if-modified-since'] = [(now + 10).httpdate]
-
-      assert_raise WEBrick::HTTPStatus::NotModified do
-        @s.if_modified_since @req, @res, '.'
-      end
-
-      assert_equal now.to_i, Time.parse(@res['last-modified']).to_i
-    end
-  end
-
-  def test_installed_docs
-    touch_system_cache_path
-    touch_extra_cache_path
-
-    expected = [
-      ['My Extra Documentation', 'extra-1/', true, :extra,
-        @extra_dirs[0]],
-      ['Extra Documentation', 'extra-2/', false, :extra,
-        @extra_dirs[1]],
-      ['Ruby Documentation', 'ruby/', true,  :system,
-        @system_dir],
-      ['Site Documentation', 'site/', false, :site,
-        File.join(@base, 'site')],
-      ['Home Documentation', 'home/', false, :home,
-        RDoc::RI::Paths::HOMEDIR],
-      ['spec-1.0', 'spec-1.0/',       false, :gem,
-        File.join(@spec.doc_dir, 'ri')],
-    ]
-
-    assert_equal expected, @s.installed_docs
-  end
-
-  def test_not_found
-    generator = @s.generator_for RDoc::Store.new(@options)
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.not_found generator, @req, @res
-
-    assert_equal 404,                                @res.status
-    assert_match %r%<title>Not Found</title>%,       @res.body
-    assert_match %r%<kbd>/ruby/Missing\.html</kbd>%, @res.body
-  end
-
-  def test_not_found_message
-    generator = @s.generator_for RDoc::Store.new(@options)
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.not_found generator, @req, @res, 'woo, this is a message'
-
-    assert_equal 404,                          @res.status
-    assert_match %r%<title>Not Found</title>%, @res.body
-    assert_match %r%woo, this is a message%,   @res.body
-  end
-
-  def test_ri_paths
-    paths = @s.ri_paths
-
-    expected = [
-      [@extra_dirs[0],                 :extra],
-      [@extra_dirs[1],                 :extra],
-      [@system_dir,                    :system],
-      [File.join(@base, 'site'),       :site],
-      [RDoc::RI::Paths::HOMEDIR,       :home],
-      [File.join(@spec.doc_dir, 'ri'), :gem],
-    ]
-
-    assert_equal expected, paths.to_a
-  end
-
-  def test_root
-    @s.root @req, @res
-
-    assert_equal 'text/html',                                 @res.content_type
-    assert_match %r%<title>Local RDoc Documentation</title>%, @res.body
-  end
-
-  def test_root_search
-    touch_system_cache_path
-    touch_extra_cache_path
-
-    @s.root_search @req, @res
-
-    assert_equal 'application/javascript', @res.content_type
-
-    @res.body =~ /\{.*\}/
-
-    index = JSON.parse $&
-
-    expected = {
-      'index' => {
-        'searchIndex' => %w[
-          My\ Extra\ Documentation
-          Ruby\ Documentation
-        ],
-        'longSearchIndex' => %w[
-          My\ Extra\ Documentation
-          Ruby\ Documentation
-        ],
-        'info' => [
-          ['My Extra Documentation', '', @extra_dirs[0], '',
-            'My Extra Documentation'],
-          ['Ruby Documentation', '', 'ruby', '',
-            'Documentation for the Ruby standard library'],
-        ],
-      }
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_show_documentation_index
-    touch_system_cache_path
-
-    @req.path = '/ruby'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'text/html',                               @res.content_type
-    assert_match %r%<title>Standard Library Documentation%, @res.body
-  end
-
-  def test_show_documentation_table_of_contents
-    touch_system_cache_path
-
-    @req.path = '/ruby/table_of_contents.html'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'text/html',         @res.content_type
-    assert_match %r%<title>Table of Contents - Standard Library Documentation%,
-                 @res.body
-  end
-
-  def test_show_documentation_page
-    touch_system_cache_path
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_show_documentation_search_index
-    touch_system_cache_path
-
-    @req.path = '/ruby/js/search_index.js'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'application/javascript', @res.content_type
-    assert_match %r%\Avar search_data =%,  @res.body
-  end
-
-  def test_store_for_gem
-    ri_dir = File.join @gem_doc_dir, 'spec-1.0', 'ri'
-    FileUtils.mkdir_p ri_dir
-    FileUtils.touch File.join ri_dir, 'cache.ri'
-
-    store = @s.store_for 'spec-1.0'
-
-    assert_equal File.join(@gem_doc_dir, 'spec-1.0', 'ri'), store.path
-    assert_equal :gem, store.type
-  end
-
-  def test_store_for_home
-    store = @s.store_for 'home'
-
-    assert_equal @home_dir, store.path
-    assert_equal :home, store.type
-  end
-
-  def test_store_for_missing_documentation
-    FileUtils.mkdir_p(File.join @gem_doc_dir, 'spec-1.0', 'ri')
-
-    e = assert_raise WEBrick::HTTPStatus::NotFound do
-      @s.store_for 'spec-1.0'
-    end
-
-    assert_equal 'Could not find documentation for "spec-1.0". Please run `gem rdoc --ri gem_name`',
-                 e.message
-  end
-
-  def test_store_for_missing_gem
-    e = assert_raise WEBrick::HTTPStatus::NotFound do
-      @s.store_for 'missing'
-    end
-
-    assert_equal 'Could not find gem "missing". Are you sure you installed it?',
-                 e.message
-  end
-
-  def test_store_for_ruby
-    store = @s.store_for 'ruby'
-
-    assert_equal @system_dir, store.path
-    assert_equal :system, store.type
-  end
-
-  def test_store_for_site
-    store = @s.store_for 'site'
-
-    assert_equal File.join(@base, 'site'), store.path
-    assert_equal :site, store.type
-  end
-
-  def test_store_for_extra
-    store = @s.store_for 'extra-1'
-
-    assert_equal @extra_dirs.first, store.path
-    assert_equal :extra, store.type
-  end
-
-  def touch_system_cache_path
-    store = RDoc::Store.new(@options, path: @system_dir)
-    store.title = 'Standard Library Documentation'
-
-    FileUtils.mkdir_p File.dirname store.cache_path
-
-    store.save
-  end
-
-  def touch_extra_cache_path
-    store = RDoc::Store.new(@options, path: @extra_dirs.first)
-    store.title = 'My Extra Documentation'
-
-    FileUtils.mkdir_p File.dirname store.cache_path
-
-    store.save
-  end
-
-end if defined?(WEBrick)
diff --git a/test/mri/rdoc/rdoc/rdoc_single_class_test.rb b/test/mri/rdoc/rdoc/rdoc_single_class_test.rb
deleted file mode 100644
index 6bbc5a2bd45..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_single_class_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocSingleClassTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @c = RDoc::SingleClass.new 'C'
-  end
-
-  def test_aref_prefix
-    assert_equal 'sclass', @c.aref_prefix
-  end
-
-  def test_definition
-    assert_equal 'class << C', @c.definition
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_stats_test.rb b/test/mri/rdoc/rdoc/rdoc_stats_test.rb
deleted file mode 100644
index 1f02e460c39..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_stats_test.rb
+++ /dev/null
@@ -1,720 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocStatsTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @s = RDoc::Stats.new @store, 0
-
-    @tl = @store.add_file 'file.rb'
-    @tl.parser = RDoc::Parser::Ruby
-  end
-
-  def test_doc_stats
-    c = RDoc::CodeObject.new
-
-    assert_equal [1, 1], @s.doc_stats([c])
-  end
-
-  def test_doc_stats_documented
-    c = RDoc::CodeObject.new
-    c.comment = comment 'x'
-
-    assert_equal [1, 0], @s.doc_stats([c])
-  end
-
-  def test_doc_stats_display_eh
-    c = RDoc::CodeObject.new
-    c.ignore
-
-    assert_equal [0, 0], @s.doc_stats([c])
-  end
-
-  def test_report_attr
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    c.add_attribute a
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "class C # is documented\n",
-          "\n",
-          "  attr_accessor :a # in file file.rb\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_attr_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', 'a'
-    a.record_location @tl
-    c.add_attribute a
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_attr_line
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    a.line = 3
-    c.add_attribute a
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:3', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_constant
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, nil
-    c.record_location @tl
-    m.add_constant c
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "module M # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  C = nil\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_constant_alias
-    mod = @tl.add_module RDoc::NormalModule, 'M'
-
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    mod.add_constant c
-
-    ca = RDoc::Constant.new 'CA', nil, nil
-    ca.is_alias_for = c
-
-    @tl.add_constant ca
-
-    @store.complete :public
-
-    report = @s.report
-
-    # TODO change this to refute match, aliases should be ignored as they are
-    # programmer convenience constructs
-    assert_match 'class Object', report.accept(to_rdoc)
-  end
-
-  def test_report_constant_documented
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, 'C'
-    c.record_location @tl
-    m.add_constant c
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_constant_line
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, nil
-    c.record_location @tl
-    c.line = 5
-    m.add_constant c
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:5', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_class
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_skip_object
-    c = @tl.add_class RDoc::NormalClass, 'Object'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    refute_match %r%^class Object$%, @s.report.accept(to_rdoc)
-  end
-
-  def test_report_class_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_class_documented_level_1
-    c1 = @tl.add_class RDoc::NormalClass, 'C1'
-    c1.record_location @tl
-    c1.add_comment 'C1', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    c1.add_method m1
-    m1.comment = 'm1'
-
-    c2 = @tl.add_class RDoc::NormalClass, 'C2'
-    c2.record_location @tl
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c2.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C2\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_empty
-    @tl.add_class RDoc::NormalClass, 'C'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('class C is referenced but empty.'),
-        para("It probably came from another project.  I'm sorry I'm holding it against you."),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_empty_2
-    c1 = @tl.add_class RDoc::NormalClass, 'C1'
-    c1.record_location @tl
-
-    c2 = @tl.add_class RDoc::NormalClass, 'C2'
-    c2.record_location @tl
-    c2.add_comment 'C2', @tl
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C1\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_method_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_module_ignore
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.ignore
-
-    @store.complete :public
-
-    report = @s.report_class_module c
-
-    assert_nil report
-  end
-
-  def test_report_empty
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  def m1; end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_class
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1', singleton: true
-    m1.record_location @tl
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2', singleton: true
-    m2.record_location @tl
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  def self.m1; end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method_line
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    m1.line = 4
-    c.add_method m1
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:4', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_method_parameters
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    m1.params = '(p1, p2)'
-    m1.comment = 'Stuff with +p1+'
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  # +p2+ is not documented\n",
-          "  def m1(p1, p2); end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_parameters_documented
-    @tl.parser = RDoc::Parser::Ruby
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.params = '(p1)'
-    m.comment = 'Stuff with +p1+'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method_parameters_yield
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.call_seq = <<-SEQ
-m(a) { |c| ... }
-m(a, b) { |c, d| ... }
-    SEQ
-    m.comment = 'Stuff with +a+, yields +c+ for you to do stuff with'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  # +b+, +d+ is not documented\n",
-          "  def m; end\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_summary
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    c.add_attribute a
-
-    c_c = RDoc::Constant.new 'C', nil, nil
-    c_c.record_location @tl
-    c.add_constant c_c
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-
-    @store.complete :public
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (1 undocumented)
-  Modules:    1 (1 undocumented)
-  Constants:  1 (1 undocumented)
-  Attributes: 1 (1 undocumented)
-  Methods:    1 (1 undocumented)
-
-  Total:      5 (5 undocumented)
-    0.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def test_summary_level_false
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    @store.complete :public
-
-    @s.coverage_level = false
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (1 undocumented)
-  Modules:    0 (0 undocumented)
-  Constants:  0 (0 undocumented)
-  Attributes: 0 (0 undocumented)
-  Methods:    0 (0 undocumented)
-
-  Total:      1 (1 undocumented)
-    0.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def test_summary_level_1
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.params = '(p1, p2)'
-    m.comment = 'Stuff with +p1+'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    @s.report
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (0 undocumented)
-  Modules:    0 (0 undocumented)
-  Constants:  0 (0 undocumented)
-  Attributes: 0 (0 undocumented)
-  Methods:    1 (0 undocumented)
-  Parameters: 2 (1 undocumented)
-
-  Total:      4 (1 undocumented)
-   75.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def to_rdoc
-    RDoc::Markup::ToRdoc.new
-  end
-
-  def test_undoc_params
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(a)'
-    method.comment = comment 'comment'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1,     total
-    assert_equal %w[a], undoc
-  end
-
-  def test_undoc_params_block
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(&a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_documented
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_keywords
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(**a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_splat
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(*a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_store_test.rb b/test/mri/rdoc/rdoc/rdoc_store_test.rb
deleted file mode 100644
index d22516100ec..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_store_test.rb
+++ /dev/null
@@ -1,1057 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocStoreTest < XrefTestCase
-
-  OBJECT_ANCESTORS = %w[BasicObject]
-
-  def setup
-    super
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_store_#{$$}"
-    @s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-
-    @top_level = @s.add_file 'file.rb'
-
-    @page = @s.add_file 'README.txt', parser: RDoc::Parser::Simple
-    @page.comment = RDoc::Comment.new 'This is a page', @page
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-    @klass.add_comment 'original', @top_level
-    @klass.record_location @top_level
-
-    @cmeth = RDoc::AnyMethod.new nil, 'cmethod', singleton: true
-    @cmeth.record_location @top_level
-
-    @meth_comment = RDoc::Comment.new 'method comment'
-    @meth_comment.location = @top_level
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-    @meth.comment = @meth_comment
-
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_bang.record_location @top_level
-
-    @meth_bang_alias = RDoc::Alias.new nil, 'method!', 'method_bang', ''
-    @meth_bang_alias.record_location @top_level
-
-    @meth_bang.add_alias @meth_bang_alias, @klass
-
-    @attr_comment = RDoc::Comment.new 'attribute comment'
-    @attr_comment.location = @top_level
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-    @attr.comment = @attr_comment
-
-    @klass.add_method @cmeth
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_attribute @attr
-
-    @nest_klass = @klass.add_class RDoc::NormalClass, 'SubClass'
-    @nest_meth = RDoc::AnyMethod.new nil, 'method'
-    @nest_meth.record_location @top_level
-
-    @nest_incl = RDoc::Include.new 'Incl', ''
-    @nest_incl.record_location @top_level
-
-    @nest_klass.add_method @nest_meth
-    @nest_klass.add_include @nest_incl
-
-    @mod = @top_level.add_module RDoc::NormalModule, 'Mod'
-    @mod.record_location @top_level
-  end
-
-  def using_prism_ruby_parser?
-    RDoc::Parser::Ruby.name == 'RDoc::Parser::PrismRuby'
-  end
-
-  def teardown
-    super
-
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def assert_cache(imethods, cmethods, attrs, modules,
-                   ancestors = {}, pages = [], main = nil, title = nil)
-    imethods ||= { 'Object' => %w[method method! method_bang] }
-    cmethods ||= { 'Object' => %w[cmethod] }
-    attrs    ||= { 'Object' => ['attr_accessor attr'] }
-
-    # this is sort-of a hack
-    @s.clean_cache_collection ancestors
-
-    expected = {
-      :ancestors                   => ancestors,
-      :attributes                  => attrs,
-      :class_methods               => cmethods,
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => Encoding::UTF_8,
-      :instance_methods            => imethods,
-      :modules                     => modules,
-      :pages                       => pages,
-      :main                        => main,
-      :title                       => title,
-    }
-
-    @s.save_cache
-
-    assert_equal expected, @s.cache
-  end
-
-  def test_add_c_enclosure
-    @s.add_c_enclosure 'cC1', @c1
-
-    expected = { 'cC1' => @c1 }
-
-    assert_equal expected, @s.c_enclosure_classes
-  end
-
-  def test_add_c_variables
-    options = RDoc::Options.new
-
-    c_file = @s.add_file 'ext.c'
-
-    some_ext   = c_file.add_class RDoc::NormalClass, 'SomeExt'
-                 c_file.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    c_parser = RDoc::Parser::C.new c_file, '', options, nil
-
-    c_parser.classes['cSomeExt']             = some_ext
-    c_parser.singleton_classes['s_cSomeExt'] = 'SomeExtSingle'
-
-    @s.add_c_variables c_parser
-
-    expected = { 'ext.c' => { 'cSomeExt' => 'SomeExt' } }
-
-    assert_equal expected, @s.c_class_variables
-
-    expected = { 'ext.c' => { 's_cSomeExt' => 'SomeExtSingle' } }
-
-    assert_equal expected, @s.c_singleton_class_variables
-  end
-
-  def test_add_file
-    top_level = @store.add_file 'file.rb'
-
-    assert_kind_of RDoc::TopLevel, top_level
-    assert_equal @store, top_level.store
-    assert_equal 'file.rb', top_level.name
-    assert_includes @store.all_files, top_level
-
-    assert_same top_level, @store.add_file('file.rb')
-    refute_same top_level, @store.add_file('other.rb')
-  end
-
-  def test_add_file_relative
-    top_level = @store.add_file 'path/file.rb', relative_name: 'file.rb'
-
-    assert_kind_of RDoc::TopLevel, top_level
-    assert_equal @store, top_level.store
-
-    assert_equal 'path/file.rb', top_level.absolute_name
-    assert_equal 'file.rb',      top_level.relative_name
-
-    assert_includes @store.all_files, top_level
-
-    assert_same top_level, @store.add_file('file.rb')
-    refute_same top_level, @store.add_file('other.rb')
-  end
-
-  def test_all_classes_and_modules
-    expected = %w[
-      C1 C10 C10::C11 C11 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 C6 C7 C8 C9 C9::A C9::B
-      Child
-      M1 M1::M2
-      Object
-      Parent
-    ]
-
-    # C8::S1 does not exist. It should not be in the list.
-    # class C8; class << something; class S1; end; end; end
-    expected = (expected + ['C8::S1']).sort unless using_prism_ruby_parser?
-
-    assert_equal expected,
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_all_files
-    assert_equal %w[EXAMPLE.md xref_data.rb],
-                 @store.all_files.map { |m| m.full_name }.sort
-  end
-
-  def test_all_modules
-    assert_equal %w[M1 M1::M2],
-                 @store.all_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_attributes
-    @s.cache[:attributes]['Object'] = %w[attr]
-
-    expected = { 'Object' => %w[attr] }
-
-    assert_equal expected, @s.attributes
-  end
-
-  def test_class_file
-    assert_equal File.join(@tmpdir, 'Object', 'cdesc-Object.ri'),
-                 @s.class_file('Object')
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri'),
-                 @s.class_file('Object::SubClass')
-  end
-
-  def test_class_methods
-    @s.cache[:class_methods]['Object'] = %w[method]
-
-    expected = { 'Object' => %w[method] }
-
-    assert_equal expected, @s.class_methods
-  end
-
-  def test_class_path
-    assert_equal File.join(@tmpdir, 'Object'), @s.class_path('Object')
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass'),
-                 @s.class_path('Object::SubClass')
-  end
-
-  def test_classes
-    expected = %w[
-      C1 C10 C10::C11 C11 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 C6 C7 C8 C9 C9::A C9::B
-      Child
-      Object
-      Parent
-    ]
-
-    # C8::S1 does not exist. It should not be in the list.
-    # class C8; class << something; class S1; end; end; end
-    expected = (expected + ['C8::S1']).sort unless using_prism_ruby_parser?
-
-    assert_equal expected, @store.all_classes.map { |m| m.full_name }.sort
-  end
-
-  def test_complete
-    a1 = RDoc::Constant.new 'A1', '', ''
-    @c2.add_module_alias @c2_c3, @c2_c3.name, a1, @top_level
-
-    @store.complete :public
-
-    a1 = @xref_data.find_class_or_module 'C2::A1'
-
-    assert_equal 'C2::A1', a1.full_name
-    refute_empty a1.aliases
-  end
-
-  def test_complete_nodoc
-    c_nodoc = @top_level.add_class RDoc::NormalClass, 'Nodoc'
-    c_nodoc.record_location @top_level
-    c_nodoc.document_self = nil
-
-    @s.complete :nodoc
-
-    assert_includes @s.classes_hash.keys, 'Nodoc'
-  end
-
-  def test_find_c_enclosure
-    assert_nil @s.find_c_enclosure 'cC1'
-
-    @s.add_c_enclosure 'cC1', @c1
-
-    assert_equal @c1, @s.find_c_enclosure('cC1')
-  end
-
-  def test_find_c_enclosure_from_cache
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_nil @s.find_c_enclosure 'cObject'
-
-    @s.c_enclosure_names['cObject'] = 'Object'
-
-    klass = @s.find_c_enclosure('cObject')
-    assert_equal @klass, klass
-
-    assert_empty klass.comment_location
-    assert_equal @top_level, klass.parent
-
-    assert_includes @s.c_enclosure_classes, 'cObject'
-  end
-
-  def test_find_c_enclosure_from_cache_legacy
-    @klass.in_files.clear
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_nil @s.find_c_enclosure 'cObject'
-
-    @s.c_enclosure_names['cObject'] = 'Object'
-
-    assert_nil @s.find_c_enclosure('cObject')
-  end
-
-  def test_resolve_c_superclasses
-    # first parse a child that references an unknown parent
-    c_file1 = @s.add_file 'ext1.c'
-    c_file1.add_class RDoc::NormalClass, 'Child', 'cExternParent'
-
-    # then parse the parent and register the C variable name as a C enclosure
-    c_file2 = @s.add_file 'ext2.c'
-    parent = c_file2.add_class RDoc::NormalClass, 'Parent', 'rb_cObject'
-
-    @s.add_c_enclosure('cExternParent', parent)
-
-    # at this point, the child's superclass is still the name of the C variable
-    assert_equal("cExternParent", @s.classes_hash['Child'].superclass)
-
-    @s.resolve_c_superclasses
-
-    # now the ancestor tree correctly references the NormalClass objects
-    assert_equal(parent, @s.classes_hash['Child'].superclass)
-  end
-
-  def test_find_class_named
-    assert_equal @c1, @store.find_class_named('C1')
-
-    assert_equal @c2_c3, @store.find_class_named('C2::C3')
-  end
-
-  def test_find_class_named_from
-    assert_equal @c5_c1, @store.find_class_named_from('C1', 'C5')
-
-    assert_equal @c1,    @store.find_class_named_from('C1', 'C4')
-  end
-
-  def test_find_class_or_module
-    assert_equal @m1, @store.find_class_or_module('M1')
-    assert_equal @c1, @store.find_class_or_module('C1')
-
-    assert_equal @m1, @store.find_class_or_module('::M1')
-    assert_equal @c1, @store.find_class_or_module('::C1')
-  end
-
-  def test_find_file_named
-    assert_equal @xref_data, @store.find_file_named(@file_name)
-  end
-
-  def test_find_module_named
-    assert_equal @m1,    @store.find_module_named('M1')
-    assert_equal @m1_m2, @store.find_module_named('M1::M2')
-  end
-
-  def test_find_text_page
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.find_text_page 'no such page'
-
-    assert_equal page, @store.find_text_page('PAGE.txt')
-  end
-
-  def test_friendly_path
-    @orig_xdg_data_home = ENV.delete('XDG_DATA_HOME')
-
-    @s.path = @tmpdir
-    @s.type = nil
-    assert_equal @s.path, @s.friendly_path
-
-    @s.type = :extra
-    assert_equal @s.path, @s.friendly_path
-
-    @s.type = :system
-    assert_equal "ruby core", @s.friendly_path
-
-    @s.type = :site
-    assert_equal "ruby site", @s.friendly_path
-
-    @s.type = :home
-    assert_equal File.expand_path("~/.local/share/rdoc"), @s.friendly_path
-
-    @s.type = :gem
-    @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
-    assert_equal "gem gem_name-1.0", @s.friendly_path
-  ensure
-    ENV['XDG_DATA_HOME'] = @orig_xdg_data_home
-  end
-
-  def test_dry_run
-    refute @s.dry_run
-
-    @s.dry_run = true
-
-    assert @s.dry_run
-  end
-
-  def test_instance_methods
-    @s.cache[:instance_methods]['Object'] = %w[method]
-
-    expected = { 'Object' => %w[method] }
-
-    assert_equal expected, @s.instance_methods
-  end
-
-  def test_load_all
-    FileUtils.mkdir_p @tmpdir
-
-    @s.save
-
-    s = RDoc::Store.new(RDoc::Options.new, path: @tmpdir)
-
-    s.load_all
-
-    assert_equal [@klass, @nest_klass], s.all_classes.sort
-    assert_equal [@mod],                s.all_modules.sort
-    assert_equal [@page, @top_level],   s.all_files.sort
-
-    methods = s.all_classes_and_modules.flat_map do |mod|
-      mod.method_list
-    end.sort
-
-    _meth_bang_alias = RDoc::AnyMethod.new nil, 'method_bang'
-    _meth_bang_alias.parent = @klass
-
-    assert_equal [@meth, @meth_bang, _meth_bang_alias, @nest_meth, @cmeth],
-                 methods.sort_by { |m| m.full_name }
-
-    method = methods.find { |m| m == @meth }
-    assert_equal @meth_comment.parse, method.comment.parse
-
-    assert_equal @klass, methods.last.parent
-
-    attributes = s.all_classes_and_modules.flat_map do |mod|
-      mod.attributes
-    end.sort
-
-    assert_equal [@attr], attributes
-
-    assert_equal @attr_comment.parse, attributes.first.comment.parse
-  end
-
-  def test_load_cache
-    cache = {
-      :c_class_variables           =>
-        { 'file.c' => { 'cKlass' => 'Klass' } },
-      :c_singleton_class_variables =>
-        { 'file.c' => { 'sKlass' => 'KlassSingle' } },
-      :encoding                    => :encoding_value,
-      :methods                     => { "Object" => %w[Object#method] },
-      :main                        => @page.full_name,
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    # Store prioritize @encoding over the cached value
-    # See we need to unset @encoding to test the cached value
-    @s.encoding = nil
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-
-    assert_equal :encoding_value, @s.encoding
-    assert_equal 'README.txt',    @s.main
-
-    expected = { 'file.c' => { 'cKlass' => 'Klass' } }
-    assert_equal expected, @s.cache[:c_class_variables]
-
-    expected = { 'file.c' => { 'sKlass' => 'KlassSingle' } }
-    assert_equal expected, @s.cache[:c_singleton_class_variables]
-
-    expected = { 'cKlass' => 'Klass' }
-    assert_equal expected, @s.c_enclosure_names
-  end
-
-  def test_load_cache_encoding_differs
-    cache = {
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => Encoding::ISO_8859_1,
-      :main                        => nil,
-      :methods                     => { "Object" => %w[Object#method] },
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    @s.encoding = Encoding::UTF_8
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-
-    assert_equal Encoding::UTF_8, @s.encoding
-  end
-
-  def test_load_cache_no_cache
-    cache = {
-      :ancestors                   => {},
-      :attributes                  => {},
-      :class_methods               => {},
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => Encoding::UTF_8,
-      :instance_methods            => {},
-      :main                        => nil,
-      :modules                     => [],
-      :pages                       => [],
-      :title                       => nil,
-    }
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-  end
-
-  def test_load_cache_legacy
-    cache = {
-      :ancestors        => {},
-      :attributes       => {},
-      :class_methods    => {},
-      :encoding         => :encoding_value,
-      :instance_methods => { "Object" => %w[Object#method] },
-      :modules          => %w[Object],
-      # no :pages
-      # no :main
-      # no :c_class_variables
-      # no :c_singleton_class_variables
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    # Store prioritize @encoding over the cached value
-    # See we need to unset @encoding to test the cached value
-    @s.encoding = nil
-
-    @s.load_cache
-
-    expected = {
-      :ancestors                   => {},
-      :attributes                  => {},
-      :class_methods               => {},
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => :encoding_value,
-      :instance_methods            => { "Object" => %w[Object#method] },
-      :main                        => nil,
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    assert_equal expected, @s.cache
-
-    assert_equal :encoding_value, @s.encoding
-    assert_nil                    @s.main
-  end
-
-  def test_load_class
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_equal @klass, @s.load_class('Object')
-
-    assert_includes @s.classes_hash, 'Object'
-  end
-
-  def test_load_single_class
-    if using_prism_ruby_parser?
-      # Class defined inside singleton class is not documentable.
-      # @c8_s1 should be nil because C8::S1 does not exist.
-      assert_nil @c8_s1
-      return
-    end
-
-    @s.save_class @c8_s1
-    @s.classes_hash.clear
-
-    assert_equal @c8_s1, @s.load_class('C8::S1')
-
-    assert_includes @s.classes_hash, 'C8::S1'
-  end
-
-  def test_load_method
-    @s.save_method @klass, @meth_bang
-
-    meth = @s.load_method('Object', '#method!')
-    assert_equal @meth_bang, meth
-    assert_equal @klass, meth.parent
-    assert_equal @s, meth.store
-  end
-
-  def test_load_method_legacy
-    @s.save_method @klass, @meth
-
-    file = @s.method_file @klass.full_name, @meth.full_name
-
-    File.open file, 'wb' do |io|
-      io.write "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
-               "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
-               "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-               "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-               "\"\x16this is a comment\x06;\x06FI" +
-               "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
-               "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
-               "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
-               "\"\nparam\x06;\x06F"
-    end
-
-    meth = @s.load_method('Object', '#method')
-    assert_equal 'Klass#method', meth.full_name
-    assert_equal @klass,         meth.parent
-    assert_equal @s,             meth.store
-  end
-
-  def test_load_page
-    @s.save_page @page
-
-    assert_equal @page, @s.load_page('README.txt')
-  end
-
-  def test_main
-    assert_nil @s.main
-
-    @s.main = 'README.txt'
-
-    assert_equal 'README.txt', @s.main
-  end
-
-  def test_method_file
-    assert_equal File.join(@tmpdir, 'Object', 'method-i.ri'),
-                 @s.method_file('Object', 'Object#method')
-
-    assert_equal File.join(@tmpdir, 'Object', 'method%21-i.ri'),
-                 @s.method_file('Object', 'Object#method!')
-
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'method%21-i.ri'),
-                 @s.method_file('Object::SubClass', 'Object::SubClass#method!')
-
-    assert_equal File.join(@tmpdir, 'Object', 'method-c.ri'),
-                 @s.method_file('Object', 'Object::method')
-  end
-
-  def test_module_names
-    @s.save_class @klass
-
-    assert_equal %w[Object], @s.module_names
-  end
-
-  def test_page
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.page 'no such page'
-
-    assert_equal page, @store.page('PAGE')
-  end
-
-  def test_page_with_extension
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.page 'no such page'
-
-    assert_equal page, @store.page('PAGE.txt')
-  end
-
-  def test_save
-    FileUtils.mkdir_p @tmpdir
-
-    @s.save
-
-    assert_directory File.join(@tmpdir, 'Object')
-
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-    assert_file File.join(@tmpdir, 'page-README_txt.ri')
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    expected = {
-      :ancestors => {
-        'Object::SubClass' => %w[Incl Object],
-      },
-      :attributes => { 'Object' => ['attr_accessor attr'] },
-      :class_methods => { 'Object' => %w[cmethod] },
-      :c_class_variables => {},
-      :c_singleton_class_variables => {},
-      :instance_methods => {
-        'Object' => %w[attr method method! method_bang],
-        'Object::SubClass' => %w[method],
-      },
-      :main => nil,
-      :modules => %w[Mod Object Object::SubClass],
-      :encoding => Encoding::UTF_8,
-      :pages => %w[README.txt],
-      :title => nil,
-    }
-
-    expected[:ancestors]['Object'] = %w[BasicObject]
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
-      cache = Marshal.load io.read
-
-      assert_equal expected, cache
-    end
-  end
-
-  def test_save_cache
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @cmeth
-    @s.save_class @nest_klass
-    @s.save_page @page
-    @s.encoding = :encoding_value
-    @s.main     = @page.full_name
-    @s.title    = 'title'
-
-    options = RDoc::Options.new
-
-    c_file = @s.add_file 'ext.c'
-
-    some_ext   = c_file.add_class RDoc::NormalClass, 'SomeExt'
-                 c_file.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    c_parser = RDoc::Parser::C.new c_file, '', options, nil
-
-    c_parser.classes['cSomeExt']             = some_ext
-    c_parser.singleton_classes['s_cSomeExt'] = 'SomeExtSingle'
-
-    @s.add_c_variables c_parser
-
-    @s.save_cache
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    c_class_variables = {
-      'ext.c' => {
-        'cSomeExt' => 'SomeExt'
-      }
-    }
-
-    c_singleton_class_variables = {
-      'ext.c' => {
-        's_cSomeExt' => 'SomeExtSingle'
-      }
-    }
-
-    expected = {
-      :ancestors => {
-        'Object::SubClass' => %w[Incl Object],
-      },
-      :attributes => { 'Object' => ['attr_accessor attr'] },
-      :class_methods => { 'Object' => %w[cmethod] },
-      :c_class_variables => c_class_variables,
-      :c_singleton_class_variables => c_singleton_class_variables,
-      :instance_methods => {
-        'Object' => %w[method method! method_bang],
-        'Object::SubClass' => %w[method],
-      },
-      :main => @page.full_name,
-      :modules => %w[Object Object::SubClass],
-      :encoding => :encoding_value,
-      :pages => %w[README.txt],
-      :title => 'title',
-    }
-
-    expected[:ancestors]['Object'] = %w[BasicObject]
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
-      cache = Marshal.load io.read
-
-      assert_equal expected, cache
-    end
-  end
-
-  def test_save_cache_dry_run
-    @s.dry_run = true
-
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @cmeth
-    @s.save_class @nest_klass
-
-    @s.save_cache
-
-    refute_file File.join(@tmpdir, 'cache.ri')
-  end
-
-  def test_save_cache_duplicate_methods
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @meth
-
-    @s.save_cache
-
-    assert_cache({ 'Object' => %w[method] }, {}, {}, [])
-  end
-
-  def test_save_cache_duplicate_pages
-    @s.save_page @page
-    @s.save_page @page
-
-    @s.save_cache
-
-    assert_cache({}, {}, {}, [], {}, %w[README.txt])
-  end
-
-  def test_save_class
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache nil, nil, nil, %w[Object], 'Object' => OBJECT_ANCESTORS
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_basic_object
-    @klass.instance_variable_set :@superclass, nil
-
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache(nil, nil, nil, %w[Object])
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_delete
-    # save original
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @meth_bang
-    @s.save_method @klass, @cmeth
-    @s.save_method @klass, @attr
-    @s.save_cache
-
-    klass = RDoc::NormalClass.new 'Object'
-
-    meth = klass.add_method RDoc::AnyMethod.new(nil, 'replace')
-    meth.record_location @top_level
-
-    # load original, save newly updated class
-    @s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-    @s.load_cache
-    @s.save_class klass
-    @s.save_cache
-
-    # load from disk again
-    @s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-    @s.load_cache
-
-    @s.load_class 'Object'
-
-    assert_cache({ 'Object' => %w[replace] }, {},
-                 { 'Object' => %w[attr_accessor\ attr] }, %w[Object],
-                   'Object' => OBJECT_ANCESTORS)
-
-    # assert these files were deleted
-    refute_file @s.method_file(@klass.full_name, @meth.full_name)
-    refute_file @s.method_file(@klass.full_name, @meth_bang.full_name)
-    refute_file @s.method_file(@klass.full_name, @cmeth.full_name)
-
-    # assert these files were not deleted
-    assert_file @s.method_file(@klass.full_name, @attr.full_name)
-  end
-
-  def test_save_class_dry_run
-    @s.dry_run = true
-
-    @s.save_class @klass
-
-    refute_file File.join(@tmpdir, 'Object')
-    refute_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-  end
-
-  def test_save_class_loaded
-    @s.save
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file      File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_file @s.method_file(@klass.full_name, @attr.full_name)
-    assert_file @s.method_file(@klass.full_name, @cmeth.full_name)
-    assert_file @s.method_file(@klass.full_name, @meth.full_name)
-    assert_file @s.method_file(@klass.full_name, @meth_bang.full_name)
-
-    s = RDoc::Store.new(RDoc::Options.new, path: @s.path)
-    s.load_cache
-
-    loaded = s.load_class 'Object'
-
-    assert_equal @klass, loaded
-
-    s.save_class loaded
-
-    s = RDoc::Store.new(RDoc::Options.new, path: @s.path)
-    s.load_cache
-
-    reloaded = s.load_class 'Object'
-
-    assert_equal @klass, reloaded
-
-    # assert these files were not deleted.  Bug #171
-    assert_file s.method_file(@klass.full_name, @attr.full_name)
-    assert_file s.method_file(@klass.full_name, @cmeth.full_name)
-    assert_file s.method_file(@klass.full_name, @meth.full_name)
-    assert_file s.method_file(@klass.full_name, @meth_bang.full_name)
-  end
-
-  def test_save_class_merge
-    @s.save_class @klass
-
-    klass = RDoc::NormalClass.new 'Object'
-    klass.add_comment 'new comment', @top_level
-
-    s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-    s.save_class klass
-
-    s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-
-    inner = @RM::Document.new @RM::Paragraph.new 'new comment'
-    inner.file = @top_level
-
-    document = @RM::Document.new inner
-
-    assert_equal document, s.load_class('Object').comment_location
-  end
-
-  # This is a functional test
-  def test_save_class_merge_constant
-    store = RDoc::Store.new(RDoc::Options.new)
-    tl = store.add_file 'file.rb'
-
-    klass = tl.add_class RDoc::NormalClass, 'C'
-    klass.add_comment 'comment', tl
-
-    const = klass.add_constant RDoc::Constant.new('CONST', nil, nil)
-    const.record_location tl
-
-    @s.save_class klass
-
-    # separate parse run, independent store
-    store = RDoc::Store.new(RDoc::Options.new)
-    tl = store.add_file 'file.rb'
-    klass2 = tl.add_class RDoc::NormalClass, 'C'
-    klass2.record_location tl
-
-    s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-    s.save_class klass2
-
-    # separate `ri` run, independent store
-    s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-
-    result = s.load_class 'C'
-
-    assert_empty result.constants
-  end
-
-  def test_save_class_methods
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache nil, nil, nil, %w[Object], 'Object' => OBJECT_ANCESTORS
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_nested
-    @s.save_class @nest_klass
-
-    assert_directory File.join(@tmpdir, 'Object', 'SubClass')
-    assert_file File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri')
-
-    assert_cache({ 'Object::SubClass' => %w[method] }, {}, {},
-                 %w[Object::SubClass], 'Object::SubClass' => %w[Incl Object])
-  end
-
-  def test_save_method
-    @s.save_method @klass, @meth
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-
-    assert_cache({ 'Object' => %w[method] }, {}, {}, [])
-
-    assert_equal @meth, @s.load_method('Object', '#method')
-  end
-
-  def test_save_method_dry_run
-    @s.dry_run = true
-
-    @s.save_method @klass, @meth
-
-    refute_file File.join(@tmpdir, 'Object')
-    refute_file File.join(@tmpdir, 'Object', 'method-i.ri')
-  end
-
-  def test_save_method_nested
-    @s.save_method @nest_klass, @nest_meth
-
-    assert_directory File.join(@tmpdir, 'Object', 'SubClass')
-    assert_file File.join(@tmpdir, 'Object', 'SubClass', 'method-i.ri')
-
-    assert_cache({ 'Object::SubClass' => %w[method] }, {}, {}, [])
-  end
-
-  def test_save_page
-    @s.save_page @page
-
-    assert_file File.join(@tmpdir, 'page-README_txt.ri')
-
-    assert_cache({}, {}, {}, [], {}, %w[README.txt])
-  end
-
-  def test_save_page_file
-    @s.save_page @top_level
-
-    refute_file File.join(@tmpdir, 'page-file_rb.ri')
-  end
-
-  def test_source
-    @s.path = @tmpdir
-    @s.type = nil
-    assert_equal @s.path, @s.source
-
-    @s.type = :extra
-    assert_equal @s.path, @s.source
-
-    @s.type = :system
-    assert_equal "ruby", @s.source
-
-    @s.type = :site
-    assert_equal "site", @s.source
-
-    @s.type = :home
-    assert_equal "home", @s.source
-
-    @s.type = :gem
-    @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
-    assert_equal "gem_name-1.0", @s.source
-  end
-
-  def test_title
-    assert_nil @s.title
-
-    @s.title = 'rdoc'
-
-    assert_equal 'rdoc', @s.title
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_task_test.rb b/test/mri/rdoc/rdoc/rdoc_task_test.rb
deleted file mode 100644
index cd37b2520e1..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_task_test.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-begin
-  require 'rake'
-rescue LoadError
-end
-
-class RDocTaskTest < RDoc::TestCase
-
-  def setup
-    super
-
-    Rake::Task.clear
-
-    @t = RDoc::Task.new
-  end
-
-  def test_clobber_task_description
-    assert_equal 'Remove RDoc HTML files', @t.clobber_task_description
-  end
-
-  def test_inline_source
-    _, err = verbose_capture_output do
-      assert @t.inline_source
-    end
-
-    assert_equal "RDoc::Task#inline_source is deprecated\n", err
-
-    _, err = verbose_capture_output do
-      @t.inline_source = false
-    end
-
-    assert_equal "RDoc::Task#inline_source is deprecated\n", err
-
-    capture_output do
-      assert @t.inline_source
-    end
-  end
-
-  def test_markup_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.markup = "tomdoc"
-    end
-
-    assert_equal %w[-o html --markup tomdoc], rdoc_task.option_list
-  end
-
-  def test_tasks_creation
-    RDoc::Task.new
-    assert Rake::Task[:rdoc]
-    assert Rake::Task[:clobber_rdoc]
-    assert Rake::Task[:rerdoc]
-    assert Rake::Task[:"rdoc:coverage"]
-    assert_equal ["html/created.rid"], Rake::Task[:rdoc].prerequisites
-  end
-
-  def test_tasks_creation_with_custom_name_symbol
-    rd = RDoc::Task.new(:rdoc_dev)
-    assert Rake::Task[:rdoc_dev]
-    assert Rake::Task[:clobber_rdoc_dev]
-    assert Rake::Task[:rerdoc_dev]
-    assert Rake::Task[:"rdoc_dev:coverage"]
-    assert_equal :rdoc_dev, rd.name
-  end
-
-  def test_tasks_option_parser
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.title = "Test Tasks Option Parser"
-      rd.main = "README.md"
-      rd.rdoc_files.include("README.md")
-      rd.options << "--all"
-    end
-
-    assert_equal "Test Tasks Option Parser", rdoc_task.title
-    assert_equal "README.md", rdoc_task.main
-    assert rdoc_task.rdoc_files.include?("README.md")
-    assert rdoc_task.options.include?("--all")
-
-    args = %w[--all -o html --main README.md] << "--title" << "Test Tasks Option Parser" << "README.md"
-    assert_equal args, rdoc_task.option_list + rdoc_task.rdoc_files
-  end
-
-  def test_generator_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.generator = "ri"
-    end
-
-    assert_equal %w[-o html -f ri], rdoc_task.option_list
-  end
-
-  def test_main_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.main = "README.md"
-    end
-
-    assert_equal %w[-o html --main README.md], rdoc_task.option_list
-  end
-
-  def test_output_dir_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.rdoc_dir = "zomg"
-    end
-
-    assert_equal %w[-o zomg], rdoc_task.option_list
-  end
-
-  def test_rdoc_task_description
-    assert_equal 'Build RDoc HTML files', @t.rdoc_task_description
-  end
-
-  def test_rerdoc_task_description
-    assert_equal 'Rebuild RDoc HTML files', @t.rerdoc_task_description
-  end
-
-  def test_coverage_task_description
-    assert_equal 'Print RDoc coverage report', @t.coverage_task_description
-  end
-
-  def test_tasks_creation_with_custom_name_string
-    rd = RDoc::Task.new("rdoc_dev")
-    assert Rake::Task[:rdoc_dev]
-    assert Rake::Task[:clobber_rdoc_dev]
-    assert Rake::Task[:rerdoc_dev]
-    assert Rake::Task[:"rdoc_dev:coverage"]
-    assert_equal "rdoc_dev", rd.name
-  end
-
-  def test_tasks_creation_with_custom_name_hash
-    options = {
-      :rdoc => "rdoc",
-      :clobber_rdoc => "rdoc:clean",
-      :rerdoc => "rdoc:force"
-    }
-
-    Rake::Task.clear
-
-    rd = RDoc::Task.new(options)
-    assert Rake::Task[:"rdoc"]
-    assert Rake::Task[:"rdoc:clean"]
-    assert Rake::Task[:"rdoc:force"]
-    assert Rake::Task[:"rdoc:coverage"]
-    assert_raise(RuntimeError) { Rake::Task[:clobber_rdoc] }
-    assert_equal options, rd.name
-  end
-
-  def test_tasks_creation_with_custom_name_hash_will_use_default_if_an_option_isnt_given
-    RDoc::Task.new(:clobber_rdoc => "rdoc:clean")
-    assert Rake::Task[:rdoc]
-    assert Rake::Task[:"rdoc:clean"]
-    assert Rake::Task[:rerdoc]
-    assert Rake::Task[:"rdoc:coverage"]
-  end
-
-  def test_tasks_creation_with_custom_name_hash_raises_exception_if_invalid_option_given
-    assert_raise(ArgumentError) do
-      RDoc::Task.new(:foo => "bar")
-    end
-
-    begin
-      RDoc::Task.new(:foo => "bar")
-    rescue ArgumentError => e
-      assert_match(/foo/, e.message)
-    end
-  end
-
-  def test_template_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.template = "foo"
-    end
-
-    assert_equal %w[-o html -T foo], rdoc_task.option_list
-  end
-
-  def test_title_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.title = "Test Title Option"
-    end
-
-    assert_equal %w[-o html] << "--title" << "Test Title Option", rdoc_task.option_list
-  end
-
-end if defined?(Rake::Task)
diff --git a/test/mri/rdoc/rdoc/rdoc_text_test.rb b/test/mri/rdoc/rdoc/rdoc_text_test.rb
deleted file mode 100644
index 2fd97614007..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_text_test.rb
+++ /dev/null
@@ -1,585 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-require 'timeout'
-
-class RDocTextTest < RDoc::TestCase
-
-  include RDoc::Text
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-
-    @top_level = @store.add_file 'file.rb'
-    @language = nil
-  end
-
-  def test_self_encode_fallback
-    assert_equal '…',
-                 RDoc::Text::encode_fallback('…', Encoding::UTF_8,    '...')
-    assert_equal '...',
-                 RDoc::Text::encode_fallback('…', Encoding::US_ASCII, '...')
-  end
-
-  def test_expand_tabs
-    assert_equal("hello\n  dave",
-                 expand_tabs("hello\n  dave"), 'spaces')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n\tdave"), 'tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n \tdave"), '1 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n  \tdave"), '2 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n   \tdave"), '3 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n    \tdave"), '4 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n     \tdave"), '5 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n      \tdave"), '6 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n       \tdave"), '7 space tab')
-
-    assert_equal("hello\n                dave",
-                 expand_tabs("hello\n         \tdave"), '8 space tab')
-
-    assert_equal('.               .',
-                 expand_tabs(".\t\t."), 'dot tab tab dot')
-
-    assert_equal('a       a',
-                 Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return")
-  end
-
-  def test_expand_tabs_encoding
-    inn = "hello\ns\tdave"
-    inn = RDoc::Encoding.change_encoding inn, Encoding::BINARY
-
-    out = expand_tabs inn
-
-    assert_equal "hello\ns       dave", out
-    assert_equal Encoding::BINARY, out.encoding
-  end
-
-  def test_flush_left
-    text = <<-TEXT
-
-  we don't worry too much.
-
-  The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED
-
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    assert_equal expected, flush_left(text)
-  end
-
-  def test_flush_left_encoding
-    text = <<-TEXT
-
-  we don't worry too much.
-
-  The comments associated with
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::US_ASCII
-
-    expected = <<-EXPECTED
-
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    result = flush_left text
-
-    assert_equal expected, result
-    assert_equal Encoding::US_ASCII, result.encoding
-  end
-
-  def test_markup_string
-    out = markup('hi').gsub("\n", '')
-
-    assert_equal '<p>hi</p>', out
-  end
-
-  def test_markup_comment
-    out = markup(comment('hi')).gsub("\n", '')
-
-    assert_equal '<p>hi</p>', out
-  end
-
-  def test_normalize_comment_hash
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :ruby
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_normalize_comment_stars_single_space
-    text = <<-TEXT
-/*
- * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :c
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_normalize_comment_stars_single_double_space
-    text = <<-TEXT
-/*
- *  we don't worry too much.
- *
- *  The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :c
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_parse
-    assert_kind_of RDoc::Markup::Document, parse('hi')
-  end
-
-  def test_parse_comment
-    expected = RDoc::Markup::Document.new
-    expected.file = @top_level
-
-    c = comment ''
-    parsed = parse c
-
-    assert_equal expected, parsed
-    assert_same parsed, parse(c)
-  end
-
-  def test_parse_document
-    assert_equal RDoc::Markup::Document.new, parse(RDoc::Markup::Document.new)
-  end
-
-  def test_parse_empty
-    assert_equal RDoc::Markup::Document.new, parse('')
-  end
-
-  def test_parse_empty_newline
-    @language = :ruby
-
-    assert_equal RDoc::Markup::Document.new, parse("#\n")
-  end
-
-  def test_parse_format_markdown
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it _works_'))
-
-    parsed = parse 'it *works*', 'markdown'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_format_rd
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it <em>works</em>'))
-
-    parsed = parse 'it ((*works*))', 'rd'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_format_tomdoc
-    code = verb('1 + 1')
-    code.format = :ruby
-
-    expected =
-      doc(
-        para('It does a thing'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code)
-
-    text = <<-TOMDOC
-It does a thing
-
-Examples
-
-  1 + 1
-    TOMDOC
-
-    parsed = parse text, 'tomdoc'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_newline
-    assert_equal RDoc::Markup::Document.new, parse("\n")
-  end
-
-  def test_snippet
-    text = <<-TEXT
-This is one-hundred characters or more of text in a single paragraph.  This
-paragraph will be cut off some point after the one-hundredth character.
-    TEXT
-
-    expected = <<-EXPECTED
-<p>This is one-hundred characters or more of text in a single paragraph.  This paragraph will be cut off …
-    EXPECTED
-
-    assert_equal expected, snippet(text)
-  end
-
-  def test_snippet_comment
-    c = comment 'This is a comment'
-
-    assert_equal "<p>This is a comment\n", snippet(c)
-  end
-
-  def test_snippet_short
-    text = 'This is a comment'
-
-    assert_equal "<p>#{text}\n", snippet(text)
-  end
-
-  def test_strip_hashes
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED
-
-  we don't worry too much.
-
-  The comments associated with
-    EXPECTED
-
-    assert_equal expected, strip_hashes(text)
-  end
-
-  def test_strip_hashes_encoding
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::CP852
-
-    expected = <<-EXPECTED
-
-  we don't worry too much.
-
-  The comments associated with
-    EXPECTED
-
-    stripped = strip_hashes text
-
-    assert_equal expected, stripped
-    assert_equal Encoding::CP852, stripped.encoding
-  end
-
-  def test_strip_newlines
-    assert_equal ' ',  strip_newlines("\n \n")
-
-    assert_equal 'hi', strip_newlines("\n\nhi")
-
-    assert_equal 'hi', strip_newlines(    "hi\n\n")
-
-    assert_equal 'hi', strip_newlines("\n\nhi\n\n")
-  end
-
-  def test_strip_newlines_encoding
-    assert_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    text = " \n"
-    text = RDoc::Encoding.change_encoding text, Encoding::US_ASCII
-
-    stripped = strip_newlines text
-
-    assert_equal ' ', stripped
-
-    assert_equal Encoding::US_ASCII, stripped.encoding
-  end
-
-  def test_strip_stars
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_document_method
-    text = <<-TEXT
-/*
- * Document-method: Zlib::GzipFile#mtime=
- *
- * A comment
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   A comment
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_document_method_special
-    text = <<-TEXT
-/*
- * Document-method: Zlib::GzipFile#mtime=
- * Document-method: []
- * Document-method: `
- * Document-method: |
- * Document-method: &
- * Document-method: <=>
- * Document-method: =~
- * Document-method: +
- * Document-method: -
- * Document-method: +@
- *
- * A comment
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   A comment
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_encoding
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::CP852
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    result = strip_stars text
-
-    assert_equal expected, result
-    assert_equal Encoding::CP852, result.encoding
-  end
-
-  def test_strip_stars_encoding2
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::BINARY
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    result = strip_stars text
-
-    assert_equal expected, result
-    assert_equal Encoding::BINARY, result.encoding
-  end
-
-  def test_strip_stars_no_stars
-    text = <<-TEXT
-* we don't worry too much.
-
-The comments associated with
-
-    TEXT
-
-    expected = <<-EXPECTED
-* we don't worry too much.
-
-The comments associated with
-
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_to_html_apostrophe
-    assert_equal '‘a', to_html("'a")
-    assert_equal 'a’', to_html("a'")
-
-    assert_equal '‘a’ ‘', to_html("'a' '")
-  end
-
-  def test_to_html_apostrophe_entity
-    assert_equal '‘a', to_html("&#39;a")
-    assert_equal 'a’', to_html("a&#39;")
-
-    assert_equal '‘a’ ‘', to_html("&#39;a&#39; &#39;")
-  end
-
-  def test_to_html_backslash
-    assert_equal 'S', to_html('\\S')
-  end
-
-  def test_to_html_br
-    assert_equal '<br>', to_html('<br>')
-  end
-
-  def test_to_html_copyright
-    assert_equal '©', to_html('(c)')
-    assert_equal '©', to_html('(C)')
-  end
-
-  def test_to_html_dash
-    assert_equal '-',  to_html('-')
-    assert_equal '–',  to_html('--')
-    assert_equal '—',  to_html('---')
-    assert_equal '—-', to_html('----')
-  end
-
-  def test_to_html_double_backtick
-    assert_equal '“a',  to_html('``a')
-    assert_equal '“a“', to_html('``a``')
-    assert_equal '“a”', to_html("``a''")
-  end
-
-  def test_to_html_double_quote
-    assert_equal '“a',  to_html('"a')
-    assert_equal '“a”', to_html('"a"')
-  end
-
-  def test_to_html_double_quote_quot
-    assert_equal '“a',  to_html('&quot;a')
-    assert_equal '“a”', to_html('&quot;a&quot;')
-  end
-
-  def test_to_html_double_tick
-    assert_equal '”a',        to_html("''a")
-    assert_equal '”a”', to_html("''a''")
-  end
-
-  def test_to_html_ellipsis
-    assert_equal '..', to_html('..')
-    assert_equal '…',  to_html('...')
-    assert_equal '.…', to_html('....')
-  end
-
-  def test_to_html_encoding
-    s = '...(c)'.encode Encoding::Shift_JIS
-
-    html = to_html s
-
-    assert_equal Encoding::Shift_JIS, html.encoding
-
-    expected = '…(c)'.encode Encoding::Shift_JIS
-
-    assert_equal expected, html
-  end
-
-  def test_to_html_html_tag
-    assert_equal '<a href="http://example">hi’s</a>',
-                 to_html('<a href="http://example">hi\'s</a>')
-  end
-
-  def test_to_html_registered_trademark
-    assert_equal '®', to_html('(r)')
-    assert_equal '®', to_html('(R)')
-  end
-
-  def test_to_html_tt_tag
-    assert_equal '<tt>hi\'s</tt>',   to_html('<tt>hi\'s</tt>')
-    assert_equal '<tt>hi\\\'s</tt>', to_html('<tt>hi\\\\\'s</tt>')
-  end
-
-  def test_to_html_tt_tag_mismatch
-    _, err = verbose_capture_output do
-      assert_equal '<tt>hi', to_html('<tt>hi')
-    end
-
-    assert_equal "mismatched <tt> tag\n", err
-  end
-
-  def formatter
-    RDoc::Markup::ToHtml.new @options
-  end
-
-  def options
-    @options
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_token_stream_test.rb b/test/mri/rdoc/rdoc/rdoc_token_stream_test.rb
deleted file mode 100644
index a5f1930daa6..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_token_stream_test.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocTokenStreamTest < RDoc::TestCase
-
-  def test_class_to_html
-    tokens = [
-      { :line_no => 0, :char_no => 0, :kind => :on_const, :text => 'CONSTANT' },
-      { :line_no => 0, :char_no => 0, :kind => :on_kw, :text => 'KW' },
-      { :line_no => 0, :char_no => 0, :kind => :on_ivar, :text => 'IVAR' },
-      { :line_no => 0, :char_no => 0, :kind => :on_op, :text => 'Op' },
-      { :line_no => 0, :char_no => 0, :kind => :on_ident, :text => 'Id' },
-      { :line_no => 0, :char_no => 0, :kind => :on_backref, :text => 'Node' },
-      { :line_no => 0, :char_no => 0, :kind => :on_comment, :text => 'COMMENT' },
-      { :line_no => 0, :char_no => 0, :kind => :on_regexp, :text => 'REGEXP' },
-      { :line_no => 0, :char_no => 0, :kind => :on_tstring, :text => 'STRING' },
-      { :line_no => 0, :char_no => 0, :kind => :on_int, :text => 'Val' },
-      { :line_no => 0, :char_no => 0, :kind => :on_unknown, :text => '\\' }
-    ]
-
-    expected = [
-      '<span class="ruby-constant">CONSTANT</span>',
-      '<span class="ruby-keyword">KW</span>',
-      '<span class="ruby-ivar">IVAR</span>',
-      '<span class="ruby-operator">Op</span>',
-      '<span class="ruby-identifier">Id</span>',
-      '<span class="ruby-node">Node</span>',
-      '<span class="ruby-comment">COMMENT</span>',
-      '<span class="ruby-regexp">REGEXP</span>',
-      '<span class="ruby-string">STRING</span>',
-      '<span class="ruby-value">Val</span>',
-      '\\'
-    ].join
-
-    assert_equal expected, RDoc::TokenStream.to_html(tokens)
-  end
-
-  def test_class_to_html_empty
-    assert_equal '', RDoc::TokenStream.to_html([])
-  end
-
-  def test_add_tokens
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    foo.collect_tokens
-    foo.add_tokens([:token])
-    assert_equal [:token], foo.token_stream
-  end
-
-  def test_add_token
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    foo.collect_tokens
-    foo.add_token(:token)
-    assert_equal [:token], foo.token_stream
-  end
-
-  def test_collect_tokens
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    foo.collect_tokens
-    assert_equal [], foo.token_stream
-  end
-
-  def test_pop_token
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    foo.collect_tokens
-    foo.add_token(:token)
-    foo.pop_token
-    assert_equal [], foo.token_stream
-  end
-
-  def test_token_stream
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    assert_equal nil, foo.token_stream
-  end
-
-  def test_tokens_to_s
-    foo = Class.new do
-      include RDoc::TokenStream
-
-      def initialize
-        @token_stream = [
-          { line_no: 0, char_no: 0, kind: :on_ident,   text: "foo" },
-          { line_no: 0, char_no: 0, kind: :on_sp,      text: " " },
-          { line_no: 0, char_no: 0, kind: :on_tstring, text: "'bar'" },
-        ]
-      end
-    end.new
-
-    assert_equal "foo 'bar'", foo.tokens_to_s
-
-    foo = Class.new do
-      include RDoc::TokenStream
-
-      def initialize
-        @token_stream = nil
-      end
-    end.new
-    assert_equal "", foo.tokens_to_s
-  end
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_tom_doc_test.rb b/test/mri/rdoc/rdoc/rdoc_tom_doc_test.rb
deleted file mode 100644
index 941d027f243..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_tom_doc_test.rb
+++ /dev/null
@@ -1,579 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocTomDocTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-
-    @TD = RDoc::TomDoc
-    @td = @TD.new
-  end
-
-  def test_class_add_post_processor
-    RDoc::TomDoc.add_post_processor
-
-    pp = RDoc::Markup::PreProcess.new __FILE__, []
-
-    text = "# Public: Do some stuff\n"
-
-    comment = RDoc::Comment.new text, nil
-    comment.format = 'tomdoc'
-
-    parent = RDoc::Context.new
-
-    pp.handle comment, parent
-
-    method = parent.add_method RDoc::AnyMethod.new(nil, 'm')
-
-    assert_equal 'Public', method.section.title
-    assert_equal "# Do some stuff\n", comment.text
-  end
-
-  def test_class_signature
-    c = comment <<-COMMENT
-Signature
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-  end
-
-  def test_class_signature_no_space
-    c = comment <<-COMMENT
-Signature
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[here],
-            para('something'))))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_class_signature_none
-    c = comment ''
-    c.format = 'tomdoc'
-
-    assert_nil @TD.signature c
-  end
-
-  def test_class_rdoc
-    c = comment <<-COMMENT
-=== Signature
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'rdoc'
-
-    signature = @TD.signature c
-
-    assert_nil signature
-  end
-
-  def test_class_signature_two_space
-    c = comment <<-COMMENT
-Signature
-
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[here],
-            para('something'))))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_parse_paragraph
-    text = "Public: Do some stuff\n"
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('Do some stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_multiline_paragraph
-    text = "Public: Do some stuff\n"
-    text += "On a new line\n"
-
-    expected =
-      doc(
-        para('Do some stuff', ' ', 'On a new line'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments
-    text = <<-TEXT
-Create new Arg object.
-
-name        - name of argument
-description - arguments description
-    TEXT
-
-    expected =
-      doc(
-        para('Create new Arg object.'),
-        blank_line,
-        list(:NOTE,
-          item(%w[name],
-            para('name of argument')),
-          item(%w[description],
-            para('arguments description'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_array
-    text = <<-TEXT
-Create new Arg object.
-
-names[] - names of arguments
-    TEXT
-
-    expected =
-      doc(
-        para('Create new Arg object.'),
-        blank_line,
-        list(:NOTE,
-          item(%w[names[]],
-            para('names of arguments'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_multiline
-    text = <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-  and is more than one line
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        list(:NOTE,
-          item(%w[foo],
-            para('A comment goes here', ' ', 'and is more than one line'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_nested
-    text = <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-      :bar - bar documentation
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        list(:NOTE,
-          item(%w[foo],
-            para('A comment goes here'),
-            list(:NOTE,
-              item(%w[:bar],
-                para('bar documentation'))))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_examples
-    text = <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-    TEXT
-
-    code = verb("1 + 1\n")
-    code.format = :ruby
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code)
-
-    document = @TD.parse(text)
-    assert_equal expected, document
-    assert document.parts.last.ruby?
-  end
-
-  def test_parse_examples_signature
-    text = <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-
-Signature
-
-  foo(args)
-    TEXT
-
-    code1 = verb("1 + 1\n")
-    code1.format = :ruby
-
-    code2 = verb("foo(args)\n")
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code1,
-        head(3, 'Signature'),
-        blank_line,
-        code2)
-
-    document = @TD.parse text
-
-    assert_equal expected, document
-  end
-
-  def test_parse_returns
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-
-Returns another thing
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing'),
-        blank_line,
-        para('Returns another thing'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_with_raises
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-Raises ArgumentError when stuff
-Raises StandardError when stuff
-    TEXT
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing'),
-        para('Raises ArgumentError when stuff'),
-        para('Raises StandardError when stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_raises_without_returns
-    text = <<-TEXT
-Do some stuff
-
-Raises ArgumentError when stuff
-    TEXT
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Raises ArgumentError when stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_multiline
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing', ' ', 'that is multiline'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_multiline_and_raises
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-Raises ArgumentError
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing', ' ', 'that is multiline'),
-        para('Raises ArgumentError'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_signature
-    text = <<-TEXT
-Do some stuff
-
-Signature
-
-  some_method(args)
-    TEXT
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('Do some stuff'),
-        @RM::BlankLine.new,
-        @RM::Heading.new(3, 'Signature'),
-        @RM::BlankLine.new,
-        @RM::Verbatim.new("some_method(args)\n"))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_tokenize_paragraph
-    @td.tokenize "Public: Do some stuff\n"
-
-    expected = [
-      [:TEXT,    "Do some stuff",  0, 0],
-      [:NEWLINE, "\n",            13, 0],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_multiline_paragraph
-    text = "Public: Do some stuff\n"
-    text += "On a new line\n"
-
-    @td.tokenize text
-
-    expected = [
-      [:TEXT,     "Do some stuff",   0, 0],
-      [:NEWLINE,  "\n",             13, 0],
-      [:TEXT,     "On a new line",   0, 1],
-      [:NEWLINE,  "\n",             13, 1]
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments
-    @td.tokenize <<-TEXT
-Create new Arg object.
-
-name        - name of argument
-description - arguments description
-    TEXT
-
-    expected = [
-      [:TEXT,    "Create new Arg object.",  0, 0],
-      [:NEWLINE, "\n",                     22, 0],
-      [:NEWLINE, "\n",                      0, 1],
-      [:NOTE,    "name",                    0, 2],
-      [:TEXT,    "name of argument",       14, 2],
-      [:NEWLINE, "\n",                     30, 2],
-      [:NOTE,    "description",             0, 3],
-      [:TEXT,    "arguments description",  14, 3],
-      [:NEWLINE, "\n",                     35, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_array
-    @td.tokenize <<-TEXT
-Create new Arg object.
-
-names[stuff] - names of arguments
-    TEXT
-
-    expected = [
-      [:TEXT,    "Create new Arg object.",  0, 0],
-      [:NEWLINE, "\n",                     22, 0],
-      [:NEWLINE, "\n",                      0, 1],
-      [:NOTE,    "names[stuff]",            0, 2],
-      [:TEXT,    "names of arguments",     15, 2],
-      [:NEWLINE, "\n",                     33, 2],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_multiline
-    @td.tokenize <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-  and is more than one line
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",              0, 0],
-      [:NEWLINE, "\n",                        13, 0],
-      [:NEWLINE, "\n",                         0, 1],
-      [:NOTE,    "foo",                        0, 2],
-      [:TEXT,    "A comment goes here",        6, 2],
-      [:NEWLINE, "\n",                        25, 2],
-      [:TEXT,    "and is more than one line",  2, 3],
-      [:NEWLINE, "\n",                        27, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_nested
-    @td.tokenize <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-      :bar - bar documentation
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",              0, 0],
-      [:NEWLINE, "\n",                        13, 0],
-      [:NEWLINE, "\n",                         0, 1],
-      [:NOTE,    "foo",                        0, 2],
-      [:TEXT,    "A comment goes here",        6, 2],
-      [:NEWLINE, "\n",                        25, 2],
-      [:NOTE,    ":bar",                       6, 3],
-      [:TEXT,    "bar documentation",         13, 3],
-      [:NEWLINE, "\n",                        30, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_examples
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",  0, 0],
-      [:NEWLINE, "\n",            13, 0],
-      [:NEWLINE, "\n",             0, 1],
-      [:HEADER,  3,                0, 2],
-      [:TEXT,    "Examples",       0, 2],
-      [:NEWLINE, "\n",             8, 2],
-      [:NEWLINE, "\n",             0, 3],
-      [:TEXT,    "1 + 1",          2, 4],
-      [:NEWLINE, "\n",             7, 4],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_returns
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Returns a thing
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",    0, 0],
-      [:NEWLINE, "\n",              13, 0],
-      [:NEWLINE, "\n",               0, 1],
-      [:TEXT,    "Returns a thing",  0, 2],
-      [:NEWLINE, "\n",              15, 2],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_returns_multiline
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",      0, 0],
-      [:NEWLINE, "\n",                13, 0],
-      [:NEWLINE, "\n",                 0, 1],
-      [:TEXT,    "Returns a thing",    0, 2],
-      [:NEWLINE, "\n",                15, 2],
-      [:TEXT,    "that is multiline",  2, 3],
-      [:NEWLINE, "\n",                19, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/rdoc_top_level_test.rb b/test/mri/rdoc/rdoc/rdoc_top_level_test.rb
deleted file mode 100644
index 385860517b3..00000000000
--- a/test/mri/rdoc/rdoc/rdoc_top_level_test.rb
+++ /dev/null
@@ -1,289 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocTopLevelTest < XrefTestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'path/top_level.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-  end
-
-  def test_initialize
-    t = RDoc::TopLevel.new 'path/file.rb'
-
-    assert_equal 'path/file.rb', t.absolute_name
-    assert_equal 'path/file.rb', t.relative_name
-  end
-
-  def test_initialize_relative
-    t = RDoc::TopLevel.new 'path/file.rb', 'file.rb'
-
-    assert_equal 'path/file.rb', t.absolute_name
-    assert_equal 'file.rb',      t.relative_name
-  end
-
-  def test_add_alias
-    a = RDoc::Alias.new nil, 'old', 'new', nil
-    @top_level.add_alias a
-
-    object = @store.find_class_named 'Object'
-    expected = { '#old' => [a] }
-    assert_equal expected, object.unmatched_alias_lists
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_alias_nodoc
-    @top_level.document_self = false
-
-    a = RDoc::Alias.new nil, 'old', 'new', nil
-    @top_level.add_alias a
-
-    object = @store.find_class_named('Object')
-    assert_empty object.unmatched_alias_lists
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_constant
-    const = RDoc::Constant.new 'C', nil, nil
-    @top_level.add_constant const
-
-    object = @store.find_class_named 'Object'
-    assert_equal [const], object.constants
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_constant_nodoc
-    @top_level.document_self = false
-
-    const = RDoc::Constant.new 'C', nil, nil
-    @top_level.add_constant const
-
-    object = @store.find_class_named 'Object'
-    assert_empty object.constants
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_include
-    include = RDoc::Include.new 'C', nil
-    @top_level.add_include include
-
-    object = @store.find_class_named 'Object'
-    assert_equal [include], object.includes
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_include_nodoc
-    @top_level.document_self = false
-
-    include = RDoc::Include.new 'C', nil
-    @top_level.add_include include
-
-    object = @store.find_class_named('Object')
-    assert_empty object.includes
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_method
-    method = RDoc::AnyMethod.new nil, 'm'
-    @top_level.add_method method
-
-    object = @store.find_class_named 'Object'
-    assert_equal [@c10_method, @c11_method, method], object.method_list
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_method_stopdoc
-    @top_level.document_self = false
-
-    method = RDoc::AnyMethod.new nil, 'm'
-    @top_level.add_method method
-
-    object = @store.find_class_named('Object')
-    assert_equal [@c10_method, @c11_method], object.method_list
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_base_name
-    assert_equal 'top_level.rb', @top_level.base_name
-  end
-
-  def test_display_eh
-    refute @top_level.display?
-
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-
-    assert page.display?
-  end
-
-  def test_eql_eh
-    top_level2 = @store.add_file 'path/top_level.rb'
-    other_level = @store.add_file 'path/other_level.rb'
-
-    assert_operator @top_level, :eql?, top_level2
-
-    refute_operator other_level, :eql?, @top_level
-  end
-
-  def test_equals2
-    top_level2 = @store.add_file 'path/top_level.rb'
-    other_level = @store.add_file 'path/other_level.rb'
-
-    assert_equal @top_level, top_level2
-
-    refute_equal other_level, @top_level
-  end
-
-  def test_find_class_or_module
-    assert_equal @c1,    @xref_data.find_class_or_module('C1')
-    assert_equal @c2_c3, @xref_data.find_class_or_module('C2::C3')
-    assert_equal @c4,    @xref_data.find_class_or_module('C4')
-    assert_equal @m1_m2, @xref_data.find_class_or_module('M1::M2')
-  end
-
-  def test_full_name
-    assert_equal 'path/top_level.rb', @top_level.full_name
-  end
-
-  def test_hash
-    tl2 = @store.add_file 'path/top_level.rb'
-    tl3 = @store.add_file 'other/top_level.rb'
-
-    assert_equal @top_level.hash, tl2.hash
-    refute_equal @top_level.hash, tl3.hash
-  end
-
-  def test_http_url
-    assert_equal 'path/top_level_rb.html', @top_level.http_url
-
-    other_level = @store.add_file 'path.other/level.rb'
-    assert_equal 'path_other/level_rb.html', other_level.http_url
-  end
-
-  def test_path
-    assert_equal 'path/top_level_rb.html', @top_level.path
-
-    @options.file_path_prefix = 'file'
-    assert_equal 'file/path/top_level_rb.html', @top_level.path
-  end
-
-  def test_marshal_dump
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-    page.comment = RDoc::Comment.new 'This is a page', page
-
-    loaded = Marshal.load Marshal.dump page
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('This is a page'))
-    document.file = loaded
-
-    assert_equal page, loaded
-
-    assert_equal 'README.txt', loaded.absolute_name
-    assert_equal 'README.txt', loaded.relative_name
-
-    assert_equal RDoc::Parser::Simple, loaded.parser
-
-    assert_equal document, loaded.comment.parse
-  end
-
-  def test_marshal_load_version_0
-    loaded = Marshal.load "\x04\bU:\x13RDoc::TopLevel" +
-                          "[\ti\x00I\"\x0FREADME.txt\x06:\x06EF" +
-                          "c\x19RDoc::Parser::Simple" +
-                          "o:\eRDoc::Markup::Document\a:\v@parts" +
-                          "[\x06o:\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x13This is a page\x06;\x06F:\n@file@\a"
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('This is a page'))
-    document.file = loaded
-
-    assert_equal 'README.txt', loaded.absolute_name
-    assert_equal 'README.txt', loaded.relative_name
-
-    assert_equal RDoc::Parser::Simple, loaded.parser
-
-    assert_equal document, loaded.comment.parse
-
-    assert loaded.display?
-  end
-
-  def test_name
-    assert_equal 'top_level.rb', @top_level.name
-  end
-
-  def test_page_name
-    assert_equal 'top_level', @top_level.page_name
-
-    tl = @store.add_file 'README.ja'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'Rakefile'
-
-    assert_equal 'Rakefile', tl.page_name
-  end
-
-  def test_page_name_trim_extension
-    tl = @store.add_file 'README.ja.rdoc'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'README.ja.md'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'README.txt'
-
-    assert_equal 'README', tl.page_name
-  end
-
-  def test_search_record
-    assert_nil @xref_data.search_record
-  end
-
-  def test_search_record_page
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-    page.comment = 'This is a comment.'
-
-    expected = [
-      'README',
-      '',
-      'README',
-      '',
-      'README_txt.html',
-      '',
-      "<p>This is a comment.\n",
-    ]
-
-    assert_equal expected, page.search_record
-  end
-
-  def test_text_eh
-    refute @xref_data.text?
-
-    rd = @store.add_file 'rd_format.rd'
-    rd.parser = RDoc::Parser::RD
-
-    assert rd.text?
-
-    simple = @store.add_file 'simple.txt'
-    simple.parser = RDoc::Parser::Simple
-
-    assert simple.text?
-  end
-
-  def test_text_eh_no_parser
-    refute @xref_data.text?
-
-    rd = @store.add_file 'rd_format.rd'
-
-    refute rd.text?
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/support/formatter_test_case.rb b/test/mri/rdoc/rdoc/support/formatter_test_case.rb
deleted file mode 100644
index ae081f51880..00000000000
--- a/test/mri/rdoc/rdoc/support/formatter_test_case.rb
+++ /dev/null
@@ -1,764 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-
-##
-# Test case for creating new RDoc::Markup formatters.  See
-# test/test_rdoc_markup_to_*.rb for examples.
-#
-# This test case adds a variety of tests to your subclass when
-# #add_visitor_tests is called.  Most tests set up a scenario then call a
-# method you will provide to perform the assertion on the output.
-#
-# Your subclass must instantiate a visitor and assign it to <tt>@to</tt>.
-#
-# For example, test_accept_blank_line sets up a RDoc::Markup::BlockLine then
-# calls accept_blank_line on your visitor.  You are responsible for asserting
-# that the output is correct.
-#
-# Example:
-#
-#  class RDocMarkupToNewFormatTest < RDoc::Markup::FormatterTestCase
-#
-#    add_visitor_tests
-#
-#    def setup
-#      super
-#
-#      @to = RDoc::Markup::ToNewFormat.new
-#    end
-#
-#    def accept_blank_line
-#      assert_equal :junk, @to.res.join
-#    end
-#
-#    # ...
-#
-#  end
-
-class RDoc::Markup::FormatterTestCase < RDoc::TestCase
-
-  ##
-  # Call #setup when inheriting from this test case.
-  #
-  # Provides the following instance variables:
-  #
-  # +@m+::           RDoc::Markup.new
-  # +@RM+::          RDoc::Markup # to reduce typing
-  # +@bullet_list+:: @RM::List.new :BULLET, # ...
-  # +@label_list+::  @RM::List.new :LABEL, # ...
-  # +@lalpha_list+:: @RM::List.new :LALPHA, # ...
-  # +@note_list+::   @RM::List.new :NOTE, # ...
-  # +@number_list+:: @RM::List.new :NUMBER, # ...
-  # +@ualpha_list+:: @RM::List.new :UALPHA, # ...
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-
-    @m = @RM.new
-
-    @bullet_list = @RM::List.new(:BULLET,
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
-
-    @label_list = @RM::List.new(:LABEL,
-      @RM::ListItem.new('cat', @RM::Paragraph.new('cats are cool')),
-      @RM::ListItem.new('dog', @RM::Paragraph.new('dogs are cool too')))
-
-    @lalpha_list = @RM::List.new(:LALPHA,
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
-
-    @note_list = @RM::List.new(:NOTE,
-      @RM::ListItem.new('cat', @RM::Paragraph.new('cats are cool')),
-      @RM::ListItem.new('dog', @RM::Paragraph.new('dogs are cool too')))
-
-    @number_list = @RM::List.new(:NUMBER,
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
-
-    @ualpha_list = @RM::List.new(:UALPHA,
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
-  end
-
-  ##
-  # Call to add the visitor tests to your test case
-
-  def self.add_visitor_tests
-    class_eval do
-
-      ##
-      # Calls start_accepting which needs to verify startup state
-
-      def test_start_accepting
-        @to.start_accepting
-
-        start_accepting
-      end
-
-      ##
-      # Calls end_accepting on your test case which needs to call
-      # <tt>@to.end_accepting</tt> and verify document generation
-
-      def test_end_accepting
-        @to.start_accepting
-        @to.res << 'hi'
-
-        end_accepting
-      end
-
-      ##
-      # Calls accept_blank_line
-
-      def test_accept_blank_line
-        @to.start_accepting
-
-        @to.accept_blank_line @RM::BlankLine.new
-
-        accept_blank_line
-      end
-
-      ##
-      # Calls accept_block_quote
-
-      def test_accept_block_quote
-        @to.start_accepting
-
-        @to.accept_block_quote block para 'quote'
-
-        accept_block_quote
-      end
-      ##
-      # Test case that calls <tt>@to.accept_document</tt>
-
-      def test_accept_document
-        @to.start_accepting
-        @to.accept_document @RM::Document.new @RM::Paragraph.new 'hello'
-
-        accept_document
-      end
-
-      ##
-      # Calls accept_heading with a level 5 RDoc::Markup::Heading
-
-      def test_accept_heading
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(5, 'Hello')
-
-        accept_heading
-      end
-
-      ##
-      # Calls accept_heading_1 with a level 1 RDoc::Markup::Heading
-
-      def test_accept_heading_1
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-        accept_heading_1
-      end
-
-      ##
-      # Calls accept_heading_2 with a level 2 RDoc::Markup::Heading
-
-      def test_accept_heading_2
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(2, 'Hello')
-
-        accept_heading_2
-      end
-
-      ##
-      # Calls accept_heading_3 with a level 3 RDoc::Markup::Heading
-
-      def test_accept_heading_3
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(3, 'Hello')
-
-        accept_heading_3
-      end
-
-      ##
-      # Calls accept_heading_4 with a level 4 RDoc::Markup::Heading
-
-      def test_accept_heading_4
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(4, 'Hello')
-
-        accept_heading_4
-      end
-
-      ##
-      # Calls accept_heading_b with a bold level 1 RDoc::Markup::Heading
-
-      def test_accept_heading_b
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(1, '*Hello*')
-
-        accept_heading_b
-      end
-
-      ##
-      # Calls accept_heading_suppressed_crossref with a level 1
-      # RDoc::Markup::Heading containing a suppressed crossref
-
-      def test_accept_heading_suppressed_crossref # HACK to_html_crossref test
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(1, '\\Hello')
-
-        accept_heading_suppressed_crossref
-      end
-
-      ##
-      # Calls accept_paragraph
-
-      def test_accept_paragraph
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('hi')
-
-        accept_paragraph
-      end
-
-      ##
-      # Calls accept_paragraph_b with a RDoc::Markup::Paragraph containing
-      # bold words
-
-      def test_accept_paragraph_b
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg <b>bold words</b> reg')
-
-        accept_paragraph_b
-      end
-
-      ##
-      # Calls accept_paragraph_br with a RDoc::Markup::Paragraph containing
-      # a \<br>
-
-      def test_accept_paragraph_br
-        @to.start_accepting
-
-        @to.accept_paragraph para 'one<br>two'
-
-        accept_paragraph_br
-      end
-
-      ##
-      # Calls accept_paragraph with a Paragraph containing a hard break
-
-      def test_accept_paragraph_break
-        @to.start_accepting
-
-        @to.accept_paragraph para('hello', hard_break, 'world')
-
-        accept_paragraph_break
-      end
-
-      ##
-      # Calls accept_paragraph_i with a RDoc::Markup::Paragraph containing
-      # emphasized words
-
-      def test_accept_paragraph_i
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg <em>italic words</em> reg')
-
-        accept_paragraph_i
-      end
-
-      ##
-      # Calls accept_paragraph_plus with a RDoc::Markup::Paragraph containing
-      # teletype words
-
-      def test_accept_paragraph_plus
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg +teletype+ reg')
-
-        accept_paragraph_plus
-      end
-
-      ##
-      # Calls accept_paragraph_star with a RDoc::Markup::Paragraph containing
-      # bold words
-
-      def test_accept_paragraph_star
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg *bold* reg')
-
-        accept_paragraph_star
-      end
-
-      ##
-      # Calls accept_paragraph_underscore with a RDoc::Markup::Paragraph
-      # containing emphasized words
-
-      def test_accept_paragraph_underscore
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg _italic_ reg')
-
-        accept_paragraph_underscore
-      end
-
-      ##
-      # Calls accept_verbatim with a RDoc::Markup::Verbatim
-
-      def test_accept_verbatim
-        @to.start_accepting
-
-        @to.accept_verbatim @RM::Verbatim.new("hi\n", "  world\n")
-
-        accept_verbatim
-      end
-
-      ##
-      # Calls accept_raw with a RDoc::Markup::Raw
-
-      def test_accept_raw
-        @to.start_accepting
-
-        @to.accept_raw @RM::Raw.new("<table>",
-                                    "<tr><th>Name<th>Count",
-                                    "<tr><td>a<td>1",
-                                    "<tr><td>b<td>2",
-                                    "</table>")
-
-        accept_raw
-      end
-
-      ##
-      # Calls accept_rule with a RDoc::Markup::Rule
-
-      def test_accept_rule
-        @to.start_accepting
-
-        @to.accept_rule @RM::Rule.new(4)
-
-        accept_rule
-      end
-
-      ##
-      # Calls accept_list_item_start_bullet
-
-      def test_accept_list_item_start_bullet
-        @to.start_accepting
-
-        @to.accept_list_start @bullet_list
-
-        @to.accept_list_item_start @bullet_list.items.first
-
-        accept_list_item_start_bullet
-      end
-
-      ##
-      # Calls accept_list_item_start_label
-
-      def test_accept_list_item_start_label
-        @to.start_accepting
-
-        @to.accept_list_start @label_list
-
-        @to.accept_list_item_start @label_list.items.first
-
-        accept_list_item_start_label
-      end
-
-      ##
-      # Calls accept_list_item_start_lalpha
-
-      def test_accept_list_item_start_lalpha
-        @to.start_accepting
-
-        @to.accept_list_start @lalpha_list
-
-        @to.accept_list_item_start @lalpha_list.items.first
-
-        accept_list_item_start_lalpha
-      end
-
-      ##
-      # Calls accept_list_item_start_note
-
-      def test_accept_list_item_start_note
-        @to.start_accepting
-
-        @to.accept_list_start @note_list
-
-        @to.accept_list_item_start @note_list.items.first
-
-        accept_list_item_start_note
-      end
-
-      ##
-      # Calls accept_list_item_start_note_2
-
-      def test_accept_list_item_start_note_2
-        list = list(:NOTE,
-                 item('<tt>teletype</tt>',
-                   para('teletype description')))
-
-        @to.start_accepting
-
-        list.accept @to
-
-        @to.end_accepting
-
-        accept_list_item_start_note_2
-      end
-
-      ##
-      # Calls accept_list_item_start_note_multi_description
-
-      def test_accept_list_item_start_note_multi_description
-        list = list(:NOTE,
-                 item(%w[label],
-                   para('description one')),
-                 item(nil, para('description two')))
-
-        @to.start_accepting
-
-        list.accept @to
-
-        @to.end_accepting
-
-        accept_list_item_start_note_multi_description
-      end
-
-      ##
-      # Calls accept_list_item_start_note_multi_label
-
-      def test_accept_list_item_start_note_multi_label
-        list = list(:NOTE,
-                 item(%w[one two],
-                   para('two headers')))
-
-        @to.start_accepting
-
-        list.accept @to
-
-        @to.end_accepting
-
-        accept_list_item_start_note_multi_label
-      end
-
-      ##
-      # Calls accept_list_item_start_number
-
-      def test_accept_list_item_start_number
-        @to.start_accepting
-
-        @to.accept_list_start @number_list
-
-        @to.accept_list_item_start @number_list.items.first
-
-        accept_list_item_start_number
-      end
-
-      ##
-      # Calls accept_list_item_start_ualpha
-
-      def test_accept_list_item_start_ualpha
-        @to.start_accepting
-
-        @to.accept_list_start @ualpha_list
-
-        @to.accept_list_item_start @ualpha_list.items.first
-
-        accept_list_item_start_ualpha
-      end
-
-      ##
-      # Calls accept_list_item_end_bullet
-
-      def test_accept_list_item_end_bullet
-        @to.start_accepting
-
-        @to.accept_list_start @bullet_list
-
-        @to.accept_list_item_start @bullet_list.items.first
-
-        @to.accept_list_item_end @bullet_list.items.first
-
-        accept_list_item_end_bullet
-      end
-
-      ##
-      # Calls accept_list_item_end_label
-
-      def test_accept_list_item_end_label
-        @to.start_accepting
-
-        @to.accept_list_start @label_list
-
-        @to.accept_list_item_start @label_list.items.first
-
-        @to.accept_list_item_end @label_list.items.first
-
-        accept_list_item_end_label
-      end
-
-      ##
-      # Calls accept_list_item_end_lalpha
-
-      def test_accept_list_item_end_lalpha
-        @to.start_accepting
-
-        @to.accept_list_start @lalpha_list
-
-        @to.accept_list_item_start @lalpha_list.items.first
-
-        @to.accept_list_item_end @lalpha_list.items.first
-
-        accept_list_item_end_lalpha
-      end
-
-      ##
-      # Calls accept_list_item_end_note
-
-      def test_accept_list_item_end_note
-        @to.start_accepting
-
-        @to.accept_list_start @note_list
-
-        @to.accept_list_item_start @note_list.items.first
-
-        @to.accept_list_item_end @note_list.items.first
-
-        accept_list_item_end_note
-      end
-
-      ##
-      # Calls accept_list_item_end_number
-
-      def test_accept_list_item_end_number
-        @to.start_accepting
-
-        @to.accept_list_start @number_list
-
-        @to.accept_list_item_start @number_list.items.first
-
-        @to.accept_list_item_end @number_list.items.first
-
-        accept_list_item_end_number
-      end
-
-      ##
-      # Calls accept_list_item_end_ualpha
-
-      def test_accept_list_item_end_ualpha
-        @to.start_accepting
-
-        @to.accept_list_start @ualpha_list
-
-        @to.accept_list_item_start @ualpha_list.items.first
-
-        @to.accept_list_item_end @ualpha_list.items.first
-
-        accept_list_item_end_ualpha
-      end
-
-      ##
-      # Calls accept_list_start_bullet
-
-      def test_accept_list_start_bullet
-        @to.start_accepting
-
-        @to.accept_list_start @bullet_list
-
-        accept_list_start_bullet
-      end
-
-      ##
-      # Calls accept_list_start_label
-
-      def test_accept_list_start_label
-        @to.start_accepting
-
-        @to.accept_list_start @label_list
-
-        accept_list_start_label
-      end
-
-      ##
-      # Calls accept_list_start_lalpha
-
-      def test_accept_list_start_lalpha
-        @to.start_accepting
-
-        @to.accept_list_start @lalpha_list
-
-        accept_list_start_lalpha
-      end
-
-      ##
-      # Calls accept_list_start_note
-
-      def test_accept_list_start_note
-        @to.start_accepting
-
-        @to.accept_list_start @note_list
-
-        accept_list_start_note
-      end
-
-      ##
-      # Calls accept_list_start_number
-
-      def test_accept_list_start_number
-        @to.start_accepting
-
-        @to.accept_list_start @number_list
-
-        accept_list_start_number
-      end
-
-      ##
-      # Calls accept_list_start_ualpha
-
-      def test_accept_list_start_ualpha
-        @to.start_accepting
-
-        @to.accept_list_start @ualpha_list
-
-        accept_list_start_ualpha
-      end
-
-      ##
-      # Calls accept_list_end_bullet
-
-      def test_accept_list_end_bullet
-        @to.start_accepting
-
-        @to.accept_list_start @bullet_list
-
-        @to.accept_list_end @bullet_list
-
-        accept_list_end_bullet
-      end
-
-      ##
-      # Calls accept_list_end_label
-
-      def test_accept_list_end_label
-        @to.start_accepting
-
-        @to.accept_list_start @label_list
-
-        @to.accept_list_end @label_list
-
-        accept_list_end_label
-      end
-
-      ##
-      # Calls accept_list_end_lalpha
-
-      def test_accept_list_end_lalpha
-        @to.start_accepting
-
-        @to.accept_list_start @lalpha_list
-
-        @to.accept_list_end @lalpha_list
-
-        accept_list_end_lalpha
-      end
-
-      ##
-      # Calls accept_list_end_number
-
-      def test_accept_list_end_number
-        @to.start_accepting
-
-        @to.accept_list_start @number_list
-
-        @to.accept_list_end @number_list
-
-        accept_list_end_number
-      end
-
-      ##
-      # Calls accept_list_end_note
-
-      def test_accept_list_end_note
-        @to.start_accepting
-
-        @to.accept_list_start @note_list
-
-        @to.accept_list_end @note_list
-
-        accept_list_end_note
-      end
-
-      ##
-      # Calls accept_list_end_ualpha
-
-      def test_accept_list_end_ualpha
-        @to.start_accepting
-
-        @to.accept_list_start @ualpha_list
-
-        @to.accept_list_end @ualpha_list
-
-        accept_list_end_ualpha
-      end
-
-      ##
-      # Calls list_nested with a two-level list
-
-      def test_list_nested
-        doc = @RM::Document.new(
-                @RM::List.new(:BULLET,
-                  @RM::ListItem.new(nil,
-                    @RM::Paragraph.new('l1'),
-                    @RM::List.new(:BULLET,
-                      @RM::ListItem.new(nil,
-                        @RM::Paragraph.new('l1.1')))),
-                  @RM::ListItem.new(nil,
-                    @RM::Paragraph.new('l2'))))
-
-        doc.accept @to
-
-        list_nested
-      end
-
-      ##
-      # Calls list_verbatim with a list containing a verbatim block
-
-      def test_list_verbatim # HACK overblown
-        doc =
-          doc(
-            list(:BULLET,
-              item(nil,
-                para('list stuff'),
-                blank_line,
-                verb("* list\n",
-                     "  with\n",
-                     "\n",
-                     "  second\n",
-                     "\n",
-                     "  1. indented\n",
-                     "  2. numbered\n",
-                     "\n",
-                     "  third\n",
-                     "\n",
-                     "* second\n"))))
-
-        doc.accept @to
-
-        list_verbatim
-      end
-    end
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/support/test_case.rb b/test/mri/rdoc/rdoc/support/test_case.rb
deleted file mode 100644
index cb1a3bddd97..00000000000
--- a/test/mri/rdoc/rdoc/support/test_case.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-require 'bundler/errors'
-begin
-  gem 'test-unit'
-rescue NoMethodError, Gem::LoadError, Bundler::GemfileNotFound
-  # for ruby tests
-end
-
-require 'test/unit'
-
-require 'fileutils'
-require 'pp'
-require 'tempfile'
-require 'tmpdir'
-require 'stringio'
-
-begin
-  require_relative '../../lib/helper'
-rescue LoadError
-end
-require_relative '../../../lib/rdoc'
-
-##
-# RDoc::TestCase is an abstract TestCase to provide common setup and teardown
-# across all RDoc tests.  The test case uses test-unit, so all the assertions
-# of test-unit may be used.
-#
-# The testcase provides the following:
-#
-# * A reset code-object tree
-# * A reset markup preprocessor (RDoc::Markup::PreProcess)
-# * The <code>@RM</code> alias of RDoc::Markup (for less typing)
-# * <code>@pwd</code> containing the current working directory
-# * FileUtils, pp, Tempfile, Dir.tmpdir and StringIO
-
-class RDoc::TestCase < Test::Unit::TestCase
-
-  ##
-  # Abstract test-case setup
-
-  def setup
-    super
-
-    @orig_home = ENV["HOME"]
-    FileUtils.mkdir_p(@test_home = Dir.mktmpdir("test_rdoc_"))
-    ENV["HOME"] = @test_home
-
-    @top_level = nil
-
-    @RM = RDoc::Markup
-
-    @pwd = Dir.pwd
-
-    @options = RDoc::Options.new
-    @store = RDoc::Store.new(@options)
-
-    @rdoc = RDoc::RDoc.new
-    @rdoc.store = @store
-    @rdoc.options = @options
-
-    @rdoc.generator = Object.new
-
-    RDoc::Markup::PreProcess.reset
-  end
-
-  ##
-  # Abstract test-case teardown
-
-  def teardown
-    ENV["HOME"] = @orig_home if defined?(@orig_home)
-    defined?(@test_home) and FileUtils.rm_rf @test_home
-
-    super
-  end
-
-  ##
-  # Asserts +path+ is a file
-
-  def assert_file(path)
-    assert File.file?(path), "#{path} is not a file"
-  end
-
-  ##
-  # Asserts +path+ is a directory
-
-  def assert_directory(path)
-    assert File.directory?(path), "#{path} is not a directory"
-  end
-
-  ##
-  # Refutes +path+ exists
-
-  def refute_file(path)
-    refute File.exist?(path), "#{path} exists"
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::BlankLine.new
-
-  def blank_line
-    @RM::BlankLine.new
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::BlockQuote.new with +contents+
-
-  def block *contents
-    @RM::BlockQuote.new(*contents)
-  end
-
-  ##
-  # Creates an RDoc::Comment with +text+ which was defined on +top_level+.
-  # By default the comment has the 'rdoc' format.
-
-  def comment(text, top_level = @top_level, language = nil)
-    comment = RDoc::Comment.new text, top_level, language
-    comment
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Document.new with +contents+
-
-  def doc *contents
-    @RM::Document.new(*contents)
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::HardBreak.new
-
-  def hard_break
-    @RM::HardBreak.new
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Heading.new with +level+ and +text+
-
-  def head(level, text)
-    @RM::Heading.new level, text
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::ListItem.new with +label+ and +parts+
-
-  def item label = nil, *parts
-    @RM::ListItem.new label, *parts
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::List.new with +type+ and +items+
-
-  def list type = nil, *items
-    @RM::List.new type, *items
-  end
-
-  ##
-  # Enables pretty-print output
-
-  def mu_pp(obj) # :nodoc:
-    s = obj.pretty_inspect
-    s = RDoc::Encoding.change_encoding s, Encoding.default_external
-    s.chomp
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Paragraph.new with +contents+
-
-  def para *a
-    @RM::Paragraph.new(*a)
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Rule.new with +weight+
-
-  def rule(weight)
-    @RM::Rule.new weight
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Raw.new with +contents+
-
-  def raw *contents
-    @RM::Raw.new(*contents)
-  end
-
-  ##
-  # Creates a temporary directory changes the current directory to it for the
-  # duration of the block.
-  #
-  # Depends upon Dir.mktmpdir
-
-  def temp_dir
-    Dir.mktmpdir do |temp_dir|
-      Dir.chdir temp_dir do
-        yield temp_dir
-      end
-    end
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Verbatim.new with +parts+
-
-  def verb *parts
-    @RM::Verbatim.new(*parts)
-  end
-
-  ##
-  # run capture_io with setting $VERBOSE = true
-
-  def verbose_capture_output
-    capture_output do
-      begin
-        orig_verbose = $VERBOSE
-        $VERBOSE = true
-        yield
-      ensure
-        $VERBOSE = orig_verbose
-      end
-    end
-  end
-end
diff --git a/test/mri/rdoc/rdoc/support/text_formatter_test_case.rb b/test/mri/rdoc/rdoc/support/text_formatter_test_case.rb
deleted file mode 100644
index c45078ce46e..00000000000
--- a/test/mri/rdoc/rdoc/support/text_formatter_test_case.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-##
-# Test case for creating new plain-text RDoc::Markup formatters.  See also
-# RDoc::Markup::FormatterTestCase
-#
-# See test_rdoc_markup_to_rdoc.rb for a complete example.
-#
-# Example:
-#
-#  class RDocMarkupToNewTextFormatTest < RDoc::Markup::TextFormatterTestCase
-#
-#    add_visitor_tests
-#    add_text_tests
-#
-#    def setup
-#      super
-#
-#      @to = RDoc::Markup::ToNewTextFormat.new
-#    end
-#
-#    def accept_blank_line
-#      assert_equal :junk, @to.res.join
-#    end
-#
-#    # ...
-#
-#  end
-
-class RDoc::Markup::TextFormatterTestCase < RDoc::Markup::FormatterTestCase
-
-  ##
-  # Adds test cases to the calling TestCase.
-
-  def self.add_text_tests
-    self.class_eval do
-
-      ##
-      # Test case that calls <tt>@to.accept_heading</tt>
-
-      def test_accept_heading_indent
-        @to.start_accepting
-        @to.indent = 3
-        @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-        accept_heading_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_rule</tt>
-
-      def test_accept_rule_indent
-        @to.start_accepting
-        @to.indent = 3
-        @to.accept_rule @RM::Rule.new(1)
-
-        accept_rule_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_verbatim</tt>
-
-      def test_accept_verbatim_indent
-        @to.start_accepting
-        @to.indent = 2
-        @to.accept_verbatim @RM::Verbatim.new("hi\n", " world\n")
-
-        accept_verbatim_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_verbatim</tt> with a big indent
-
-      def test_accept_verbatim_big_indent
-        @to.start_accepting
-        @to.indent = 2
-        @to.accept_verbatim @RM::Verbatim.new("hi\n", "world\n")
-
-        accept_verbatim_big_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_paragraph</tt> with an indent
-
-      def test_accept_paragraph_indent
-        @to.start_accepting
-        @to.indent = 3
-        @to.accept_paragraph @RM::Paragraph.new(('words ' * 30).strip)
-
-        accept_paragraph_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_paragraph</tt> with a long line
-
-      def test_accept_paragraph_wrap
-        @to.start_accepting
-        @to.accept_paragraph @RM::Paragraph.new(('words ' * 30).strip)
-
-        accept_paragraph_wrap
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_table</tt>
-
-      def test_accept_table_align
-        header = ['AA', 'BB', 'CCCCC', 'DDDDD']
-        body = [
-          ['', 'bbb', 'c', ''],
-          ['aaaa', 'b', '', 'dd'],
-          ['a', '', 'cc', 'dd']
-        ]
-        aligns = [nil, :left, :right, :center]
-        @to.start_accepting
-        @to.accept_table header, body, aligns
-
-        accept_table_align
-      end
-
-      ##
-      # Test case that calls <tt>@to.attributes</tt> with an escaped
-      # cross-reference.  If this test doesn't pass something may be very
-      # wrong.
-
-      def test_attributes
-        assert_equal 'Dog', @to.attributes("\\Dog")
-      end
-
-    end
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc/test.ja.largedoc b/test/mri/rdoc/rdoc/test.ja.largedoc
deleted file mode 100644
index a9c6c4691c7..00000000000
--- a/test/mri/rdoc/rdoc/test.ja.largedoc
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
- 吾輩（わがはい）は猫である。名前はまだ無い。
- どこで生れたかとんと見当（けんとう）がつかぬ。何でも薄暗いじめじめした所でニャーニャー泣いていた事だけは記憶している。吾輩はここで始めて人間というものを見た。しかもあとで聞くとそれは書生という人間中で一番獰悪（どうあく）な種族であったそうだ。この書生というのは時々我々を捕（つかま）えて煮（に）て食うという話である。しかしその当時は何という考もなかったから別段恐しいとも思わなかった。ただ彼の掌（てのひら）に載せられてスーと持ち上げられた時何だかフワフワした感じがあったばかりである。掌の上で少し落ちついて書生の顔を見たのがいわゆる人間というものの見始（みはじめ）であろう。この時妙なものだと思った感じが今でも残っている。第一毛をもって装飾されべきはずの顔がつるつるしてまるで薬缶（やかん）だ。その後（ご）猫にもだいぶ逢（あ）ったがこんな片輪（かたわ）には一度も出会（でく）わした事がない。のみならず顔の真中があまりに突起している。そうしてその穴の中から時々ぷうぷうと煙（けむり）を吹く。どうも咽（む）せぽくて実に弱った。これが人間の飲む煙草（たばこ）というものである事はようやくこの頃知った。
diff --git a/test/mri/rdoc/rdoc/test.ja.rdoc b/test/mri/rdoc/rdoc/test.ja.rdoc
deleted file mode 100644
index cd01cab37a1..00000000000
--- a/test/mri/rdoc/rdoc/test.ja.rdoc
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-
-こんにちは！
-
-初めまして。アーロンと申します。
-
-どんな食べ物が好きですか？私はフランスの料理が大好きです。
-日本の料理も大好きです。
-
-食べ物を食べるのが大好きだけど、お皿を洗うのが大嫌いです。
diff --git a/test/mri/rdoc/rdoc/test.ja.txt b/test/mri/rdoc/rdoc/test.ja.txt
deleted file mode 100644
index 96e1db93d36..00000000000
--- a/test/mri/rdoc/rdoc/test.ja.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-こんにちは！
-
-初めまして。アーロンと申します。
-
-どんな食べ物が好きですか？私はフランスの料理が大好きです。
-日本の料理も大好きです。
-
-食べ物を食べるのが大好きだけど、お皿を洗うのが大嫌いです。
diff --git a/test/mri/rdoc/rdoc/test.txt b/test/mri/rdoc/rdoc/test.txt
deleted file mode 100644
index 16b14f5da9e..00000000000
--- a/test/mri/rdoc/rdoc/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-test file
diff --git a/test/mri/rdoc/rdoc/xref_data.rb b/test/mri/rdoc/rdoc/xref_data.rb
deleted file mode 100644
index acfc0ce3ff6..00000000000
--- a/test/mri/rdoc/rdoc/xref_data.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-# frozen_string_literal: true
-XREF_DATA = <<-XREF_DATA
-class C1
-
-  attr :attr
-
-  # :section: separate
-
-  attr_reader :attr_reader
-  attr_writer :attr_writer
-
-  # :section:
-  attr_accessor :attr_accessor
-
-  CONST = :const
-
-  def self.m
-  end
-
-  def m foo
-  end
-
-  def +
-  end
-end
-
-class C2
-  def b
-  end
-
-  alias a b
-
-  class C3
-    def m
-    end
-
-    class H1
-      def m?
-      end
-    end
-  end
-end
-
-class C3
-  class H1
-  end
-
-  class H2 < H1
-  end
-end
-
-class C4
-  class C4
-  end
-end
-
-class C5
-  class C1
-  end
-end
-
-class C6
-  private def priv1() end
-  def pub1() end
-  protected def prot1() end
-  def pub2() end
-  public def pub3() end
-  def pub4() end
-
-  private
-  private def priv2() end
-  def priv3() end
-  protected def prot2() end
-  def priv4() end
-  public def pub5() end
-  def priv5() end
-  def self.s_pub1() end
-  class << self
-    def s_pub2() end
-    private
-    def s_priv1() end
-  end
-
-  protected
-  private def priv6() end
-  def prot3() end
-  protected def prot4() end
-  def prot5() end
-  public def pub6() end
-  def prot6() end
-  def self.s_pub3() end
-  class << self
-    def s_pub4() end
-    protected
-    def s_prot1() end
-  end
-end
-
-class C7
-  attr_reader :attr_reader
-  attr_reader :attr_reader_nodoc # :nodoc:
-  attr_writer :attr_writer
-  attr_writer :attr_writer_nodoc # :nodoc:
-  attr_accessor :attr_accessor
-  attr_accessor :attr_accessor_nodoc # :nodoc:
-
-  CONST = :const
-  CONST_NODOC = :const_nodoc # :nodoc:
-end
-
-class C8
-  class << self
-    # This is C8.singleton_class::S1. C8::S1 does not exist.
-    class S1
-    end
-  end
-end
-
-class C9
-  class A
-    def foo() end
-    def self.bar() end
-  end
-
-  class B < A
-    def self.foo() end
-    def bar() end
-  end
-end
-
-class C10
-  class C11
-  end
-
-  def C11
-  end
-end
-
-def C10
-end
-
-class C11
-end
-
-def C11
-end
-
-module M1
-  def m
-  end
-end
-
-module M1::M2
-end
-
-class Parent
-  def m() end
-  def self.m() end
-end
-
-class Child < Parent
-end
-
-XREF_DATA
diff --git a/test/mri/rdoc/rdoc/xref_test_case.rb b/test/mri/rdoc/rdoc/xref_test_case.rb
deleted file mode 100644
index 4c3e3166b24..00000000000
--- a/test/mri/rdoc/rdoc/xref_test_case.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-ENV['RDOC_TEST'] = 'yes'
-
-require_relative 'helper'
-require File.expand_path '../xref_data', __FILE__
-
-class XrefTestCase < RDoc::TestCase
-
-  def setup
-    super
-
-    @options.quiet = true
-
-    @file_name = 'xref_data.rb'
-    @xref_data = @store.add_file @file_name
-    @top_level = @xref_data
-
-    stats = RDoc::Stats.new @store, 0
-
-    parser = RDoc::Parser::Ruby.new @xref_data, XREF_DATA, @options, stats
-
-    @example_md = @store.add_file 'EXAMPLE.md'
-    @example_md.parser = RDoc::Parser::Markdown
-
-    @top_levels = []
-    @top_levels.push parser.scan
-    @top_levels.push @example_md
-
-    generator = Object.new
-    @rdoc.generator = generator
-
-    @c1       = @xref_data.find_module_named 'C1'
-    @c1__m    = @c1.find_class_method_named 'm' # C1::m
-    @c1_m     = @c1.find_instance_method_named 'm'  # C1#m
-    @c1_plus  = @c1.find_instance_method_named '+'
-
-    @c2    = @xref_data.find_module_named 'C2'
-    @c2_a  = @c2.method_list.last
-    @c2_b  = @c2.method_list.first
-
-    @c2_c3 = @xref_data.find_module_named 'C2::C3'
-    @c2_c3_m = @c2_c3.method_list.first # C2::C3#m
-
-    @c2_c3_h1 = @xref_data.find_module_named 'C2::C3::H1'
-    @c2_c3_h1_meh = @c2_c3_h1.method_list.first # C2::C3::H1#m?
-
-    @c3    = @xref_data.find_module_named 'C3'
-    @c4    = @xref_data.find_module_named 'C4'
-    @c4_c4 = @xref_data.find_module_named 'C4::C4'
-    @c5_c1 = @xref_data.find_module_named 'C5::C1'
-    @c3_h1 = @xref_data.find_module_named 'C3::H1'
-    @c3_h2 = @xref_data.find_module_named 'C3::H2'
-    @c6    = @xref_data.find_module_named 'C6'
-    @c7    = @xref_data.find_module_named 'C7'
-    @c8    = @xref_data.find_module_named 'C8'
-    @c8_s1 = @xref_data.find_module_named 'C8::S1'
-
-    @c9         = @xref_data.find_module_named 'C9'
-    @c9_a       = @xref_data.find_module_named 'C9::A'
-    @c9_a_i_foo = @c9_a.method_list.first
-    @c9_a_c_bar = @c9_a.method_list.last
-    @c9_b       = @xref_data.find_module_named 'C9::B'
-    @c9_b_c_foo = @c9_b.method_list.first
-    @c9_b_i_bar = @c9_b.method_list.last
-
-    @object         = @xref_data.find_module_named 'Object'
-    @c10_class      = @xref_data.find_module_named 'C10'
-    @c10_method     = @object.find_method_named 'C10'
-    @c11_class      = @xref_data.find_module_named 'C11'
-    @c10_c11_class  = @c10_class.find_module_named 'C11'
-    @c10_c11_method = @c10_class.find_method_named 'C11'
-    @c11_method     = @object.find_method_named 'C11'
-
-    @m1    = @xref_data.find_module_named 'M1'
-    @m1_m  = @m1.method_list.first
-
-    @m1_m2 = @xref_data.find_module_named 'M1::M2'
-
-    @parent = @xref_data.find_module_named 'Parent'
-    @child  = @xref_data.find_module_named 'Child'
-
-    @parent_m  = @parent.method_list.first # Parent#m
-    @parent__m = @parent.method_list.last  # Parent::m
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_alias_test.rb b/test/mri/rdoc/rdoc_alias_test.rb
deleted file mode 100644
index 827002e729c..00000000000
--- a/test/mri/rdoc/rdoc_alias_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocAliasTest < XrefTestCase
-
-  def test_to_s
-    a = RDoc::Alias.new nil, 'a', 'b', ''
-    a.parent = @c2
-
-    assert_equal 'alias: b -> #a in: RDoc::NormalClass C2 < Object', a.to_s
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_any_method_test.rb b/test/mri/rdoc/rdoc_any_method_test.rb
deleted file mode 100644
index e963a3a3453..00000000000
--- a/test/mri/rdoc/rdoc_any_method_test.rb
+++ /dev/null
@@ -1,609 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocAnyMethodTest < XrefTestCase
-
-  def test_aref
-    m = RDoc::AnyMethod.new nil, 'method?'
-
-    assert_equal 'method-i-method-3F', m.aref
-
-    m.singleton = true
-
-    assert_equal 'method-c-method-3F', m.aref
-  end
-
-  def test_arglists
-    m = RDoc::AnyMethod.new nil, 'method'
-
-    assert_nil m.arglists
-
-    m.params = "(a, b)"
-    m.block_params = "c, d"
-
-    assert_equal "method(a, b) { |c, d| ... }", m.arglists
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq.dup
-
-    assert_equal call_seq, m.arglists
-  end
-
-  def test_c_function
-    @c1_m.c_function = 'my_c1_m'
-
-    assert_equal 'my_c1_m', @c1_m.c_function
-  end
-
-  def test_call_seq_equals
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = ''
-
-    assert_nil m.call_seq
-
-    m.call_seq = 'foo'
-
-    assert_equal 'foo', m.call_seq
-  end
-
-  def test_call_seq_alias_for
-    a = RDoc::AnyMethod.new nil, "each"
-    m = RDoc::AnyMethod.new nil, "each_line"
-
-    a.call_seq = <<-CALLSEQ
-each(foo)
-each_line(foo)
-    CALLSEQ
-
-    m.is_alias_for = a
-
-    assert_equal "each_line(foo)", m.call_seq
-  end
-
-  def test_full_name
-    assert_equal 'C1::m', @c1.method_list.first.full_name
-  end
-
-  def test_has_call_seq?
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m2 = RDoc::AnyMethod.new nil, "each"
-    assert_equal false, m.has_call_seq?
-    m.call_seq = "each_line()"
-    assert_equal true, m.has_call_seq?
-
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m.is_alias_for = m2
-    assert_equal false, m.has_call_seq?
-    m2.call_seq = "each_line()"
-    assert_equal true, m.has_call_seq?
-  end
-
-  def test_is_alias_for
-    assert_equal @c2_b, @c2_a.is_alias_for
-
-    # set string on instance variable
-    loaded = Marshal.load Marshal.dump @c2_a
-
-    loaded.store = @store
-
-    assert_equal @c2_b, loaded.is_alias_for, 'Marshal.load'
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.store = @store
-    m1.instance_variable_set :@is_alias_for, ['Missing', false, 'method']
-
-    assert_nil m1.is_alias_for, 'missing alias'
-  end
-
-  def test_call_seq_handles_aliases
-    # see 0ead786
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-
-    method_with_call_seq = RDoc::AnyMethod.new(nil, "method_with_call_seq")
-    method_with_call_seq.call_seq = <<~SEQ
-      method_with_call_seq(a)
-      method_with_call_seq(a, b)
-      alias_to_method(a)
-      alias_to_method(a, b)
-    SEQ
-    cm.add_method(method_with_call_seq)
-
-    alias_to_method = method_with_call_seq.add_alias(
-      RDoc::Alias.new(nil, "method_with_call_seq", "alias_to_method", "comment"),
-      cm
-    )
-
-    assert_equal("method_with_call_seq(a)\nmethod_with_call_seq(a, b)",
-                 method_with_call_seq.call_seq)
-    assert_equal("alias_to_method(a)\nalias_to_method(a, b)",
-                 alias_to_method.call_seq)
-  end
-
-  def test_call_seq_returns_nil_if_alias_is_missing_from_call_seq
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-
-    method_with_call_seq = RDoc::AnyMethod.new(nil, "method_with_call_seq")
-    method_with_call_seq.call_seq = <<~SEQ
-      method_with_call_seq(a)
-      method_with_call_seq(a, b)
-    SEQ
-    cm.add_method(method_with_call_seq)
-
-    alias_to_method = method_with_call_seq.add_alias(
-      RDoc::Alias.new(nil, "method_with_call_seq", "alias_to_method", "comment"),
-      cm
-    )
-
-    assert_equal("method_with_call_seq(a)\nmethod_with_call_seq(a, b)",
-                 method_with_call_seq.call_seq)
-    assert_nil(alias_to_method.call_seq)
-  end
-
-  def test_markup_code
-    tokens = [
-      { :line_no => 0, :char_no => 0, :kind => :on_const, :text => 'CONSTANT' },
-    ]
-
-    @c2_a.collect_tokens
-    @c2_a.add_tokens(tokens)
-
-    expected = '<span class="ruby-constant">CONSTANT</span>'
-
-    assert_equal expected, @c2_a.markup_code
-  end
-
-  def test_markup_code_with_line_numbers
-    position_comment = "# File #{@file_name}, line 1"
-    tokens = [
-      { :line_no => 1, :char_no => 0, :kind => :on_comment, :text => position_comment },
-      { :line_no => 1, :char_no => position_comment.size, :kind => :on_nl, :text => "\n" },
-      { :line_no => 2, :char_no => 0, :kind => :on_const, :text => 'A' },
-      { :line_no => 2, :char_no => 1, :kind => :on_nl, :text => "\n" },
-      { :line_no => 3, :char_no => 0, :kind => :on_const, :text => 'B' }
-    ]
-
-    @c2_a.collect_tokens
-    @c2_a.add_tokens(tokens)
-
-    assert_equal <<-EXPECTED.chomp, @c2_a.markup_code
-<span class="ruby-comment"># File xref_data.rb, line 1</span>
-<span class="ruby-constant">A</span>
-<span class="ruby-constant">B</span>
-    EXPECTED
-
-    @c2_a.options.line_numbers = true
-    assert_equal <<-EXPECTED.chomp, @c2_a.markup_code
-  <span class="ruby-comment"># File xref_data.rb</span>
-<span class="line-num">1</span> <span class="ruby-constant">A</span>
-<span class="line-num">2</span> <span class="ruby-constant">B</span>
-    EXPECTED
-  end
-
-  def test_markup_code_empty
-    assert_equal '', @c2_a.markup_code
-  end
-
-  def test_markup_code_with_variable_expansion
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-    m.block_params = '"Hello, #{world}", yield_arg'
-    m.params = 'a'
-
-    assert_equal '(a) { |"Hello, #{world}", yield_arg| ... }', m.param_seq
-  end
-
-  def test_marshal_dump
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.block_params = 'some_block'
-    m.call_seq     = 'call_seq'
-    m.comment      = 'this is a comment'
-    m.params       = 'param'
-    m.record_location top_level
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load Marshal.dump m
-    loaded.store = @store
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_equal false,          loaded.singleton
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-  end
-
-  def test_marshal_load_aliased_method
-    aliased_method = Marshal.load Marshal.dump(@c2_a)
-
-    aliased_method.store = @store
-
-    assert_equal 'C2#a',  aliased_method.full_name
-    assert_equal 'C2',    aliased_method.parent_name
-    assert_equal '()',    aliased_method.params
-    assert_equal @c2_b,   aliased_method.is_alias_for, 'is_alias_for'
-    assert                aliased_method.display?
-  end
-
-  def test_marshal_load_aliased_method_with_nil_singleton
-    aliased_method = Marshal.load Marshal.dump(@c2_a)
-
-    aliased_method.store = @store
-    aliased_method.is_alias_for = ["C2", nil, "b"]
-
-    assert_equal 'C2#a',  aliased_method.full_name
-    assert_equal 'C2',    aliased_method.parent_name
-    assert_equal '()',    aliased_method.params
-    assert_equal @c2_b,   aliased_method.is_alias_for, 'is_alias_for'
-    assert                aliased_method.display?
-  end
-
-  def test_marshal_load_class_method
-    class_method = Marshal.load Marshal.dump(@c1.find_class_method_named 'm')
-
-    assert_equal 'C1::m', class_method.full_name
-    assert_equal 'C1',    class_method.parent_name
-    assert_equal '()',    class_method.params
-    assert                class_method.display?
-  end
-
-  def test_marshal_load_instance_method
-    instance_method = Marshal.load Marshal.dump(@c1.find_instance_method_named 'm')
-
-    assert_equal 'C1#m',  instance_method.full_name
-    assert_equal 'C1',    instance_method.parent_name
-    assert_equal '(foo)', instance_method.params
-    assert                instance_method.display?
-  end
-
-  def test_marshal_load_version_0
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
-                          "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
-                          "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-                          "\"\x16this is a comment\x06;\x06FI" +
-                          "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
-                          "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
-                          "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
-                          "\"\nparam\x06;\x06F"
-
-    loaded.store = @store
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal document,       loaded.comment.parse
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_nil                   loaded.singleton # defaults to nil
-    assert_equal :public,        loaded.visibility
-    assert_nil                   loaded.file
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-    assert_nil                   loaded.is_alias_for
-
-    assert loaded.display?
-  end
-
-  def test_marshal_dump_version_2
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.block_params = 'some_block'
-    m.call_seq     = 'call_seq'
-    m.comment      = 'this is a comment'
-    m.params       = 'param'
-    m.record_location top_level
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x14i\bI" +
-                          "\"\vmethod\x06:\x06ETI" +
-                          "\"\x11Klass#method\x06;\x06T0:\vpublic" +
-                          "o:\eRDoc::Markup::Document\b:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@file0" +
-                          ":0@omit_headings_from_table_of_contents_below0" +
-                          "I\"\rcall_seq\x06;\x06TI\"\x0Fsome_block\x06" +
-                          ";\x06T[\x06[\aI\"\faliased\x06;\x06To;\b\b;\t" +
-                          "[\x06o;\n\x06;\t[\x06I\"\x12alias comment\x06" +
-                          ";\x06T;\v0;\f0I\"\nparam\x06;\x06TI" +
-                          "\"\ffile.rb\x06;\x06TFI\"\nKlass\x06;\x06T" +
-                          "c\x16RDoc::ClassModule0"
-
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_nil                   loaded.singleton # defaults to nil
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-    assert_nil                   loaded.is_alias_for
-  end
-
-  def test_name
-    m = RDoc::AnyMethod.new nil, nil
-
-    assert_nil m.name
-  end
-
-  def test_name_call_seq
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = "yields(name)\nyields(name, description)"
-
-    assert_equal 'yields', m.name
-  end
-
-  def test_name_call_seq_dot
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = "obj.yields(name)\nobj.yields(name, description)"
-
-    assert_equal 'yields', m.name
-  end
-
-  def test_param_list_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.block_params = 'c, d'
-
-    assert_equal %w[c d], m.param_list
-  end
-
-  def test_param_list_call_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_default
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(b = default)'
-
-    assert_equal %w[b], m.param_list
-  end
-
-  def test_param_list_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b)'
-
-    assert_equal %w[a b], m.param_list
-  end
-
-  def test_param_list_params_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b)'
-    m.block_params = 'c, d'
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_empty_params_with_block
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '()'
-    m.block_params = 'a, b'
-
-    assert_equal %w[a b], m.param_list
-  end
-
-  def test_param_list_ampersand_param_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b, &block)'
-    m.block_params = 'c, d'
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_ampersand_param
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b, &block)'
-
-    assert_equal %w[a b block], m.param_list
-  end
-
-  def test_param_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-    m.params = 'a'
-
-    assert_equal '(a)', m.param_seq
-
-    m.params = '(a)'
-
-    assert_equal '(a)', m.param_seq
-
-    m.params = "(a,\n  b)"
-
-    assert_equal '(a, b)', m.param_seq
-
-    m.block_params = "c,\n  d"
-
-    assert_equal '(a, b) { |c, d| ... }', m.param_seq
-  end
-
-  def test_param_seq_call_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq
-
-    assert_equal '(a, b) { |c, d| }', m.param_seq
-
-  end
-
-  def test_parent_name
-    assert_equal 'C1', @c1.method_list.first.parent_name
-    assert_equal 'C1', @c1.method_list.last.parent_name
-  end
-
-  def test_skip_description?
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m2 = RDoc::AnyMethod.new nil, "each"
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m.is_alias_for = m2
-    m2.aliases << m
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m2.call_seq = "each()"
-    assert_equal true, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m2.call_seq = "each_line()"
-    assert_equal false, m.skip_description?
-    assert_equal true, m2.skip_description?
-
-    m2.call_seq = "each()\neach_line()"
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-  end
-
-  def test_store_equals
-    loaded = Marshal.load Marshal.dump(@c1.method_list.last)
-
-    loaded.store = @store
-
-    assert_equal @store, loaded.file.store
-  end
-
-  def test_superclass_method
-    m3 = RDoc::AnyMethod.new '', 'no_super'
-
-    m2 = RDoc::AnyMethod.new '', 'supers'
-    m2.calls_super = true
-
-    m1 = RDoc::AnyMethod.new '', 'supers'
-
-    c1 = RDoc::NormalClass.new 'Outer'
-    c1.store = @store
-    c1.add_method m1
-
-    c2 = RDoc::NormalClass.new 'Inner', c1
-    c2.store = @store
-    c2.add_method m2
-    c2.add_method m3
-
-    assert_nil m3.superclass_method,
-               'no superclass method for no_super'
-
-    assert_equal m1, m2.superclass_method,
-                 'superclass method missing for supers'
-  end
-
-  def test_superclass_method_multilevel
-    m2 = RDoc::AnyMethod.new '', 'supers'
-    m2.calls_super = true
-
-    m1 = RDoc::AnyMethod.new '', 'supers'
-
-    c1 = RDoc::NormalClass.new 'Outer'
-    c1.store = @store
-    c1.add_method m1
-
-    c2 = RDoc::NormalClass.new 'Middle', c1
-    c2.store = @store
-
-    c3 = RDoc::NormalClass.new 'Inner', c2
-    c3.store = @store
-    c3.add_method m2
-
-    assert_equal m1, m2.superclass_method,
-                 'superclass method missing for supers'
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_attr_test.rb b/test/mri/rdoc/rdoc_attr_test.rb
deleted file mode 100644
index fcdbdfd422c..00000000000
--- a/test/mri/rdoc/rdoc_attr_test.rb
+++ /dev/null
@@ -1,190 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocAttrTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @a = RDoc::Attr.new nil, 'attr', 'RW', ''
-  end
-
-  def test_aref
-    m = RDoc::Attr.new nil, 'attr', 'RW', nil
-
-    assert_equal 'attribute-i-attr', m.aref
-  end
-
-  def test_arglists
-    assert_nil @a.arglists
-  end
-
-  def test_block_params
-    assert_nil @a.block_params
-  end
-
-  def test_call_seq
-    assert_nil @a.call_seq
-  end
-
-  def test_definition
-    assert_equal 'attr_accessor', @a.definition
-
-    @a.rw = 'R'
-
-    assert_equal 'attr_reader', @a.definition
-
-    @a.rw = 'W'
-
-    assert_equal 'attr_writer', @a.definition
-  end
-
-  def test_full_name
-    assert_equal '(unknown)#attr', @a.full_name
-  end
-
-  def test_marshal_dump
-    tl = @store.add_file 'file.rb'
-
-    @a.comment = 'this is a comment'
-    @a.record_location tl
-
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    cm.add_attribute @a
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump @a
-    loaded.store = @store
-
-    assert_equal @a, loaded
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal document,      loaded.comment.parse
-    assert_equal 'file.rb',    loaded.file.relative_name
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-    assert_equal tl,           loaded.file
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-  end
-
-  def test_marshal_dump_singleton
-    tl = @store.add_file 'file.rb'
-
-    @a.comment = 'this is a comment'
-    @a.record_location tl
-
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    cm.add_attribute @a
-
-    section = cm.sections.first
-
-    @a.rw = 'R'
-    @a.singleton = true
-    @a.visibility = :protected
-
-    loaded = Marshal.load Marshal.dump @a
-    loaded.store = @store
-
-    assert_equal @a, loaded
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal document,      loaded.comment.parse
-    assert_equal 'Klass::attr', loaded.full_name
-    assert_equal 'attr',        loaded.name
-    assert_equal 'R',           loaded.rw
-    assert_equal true,          loaded.singleton
-    assert_equal :protected,    loaded.visibility
-    assert_equal tl,            loaded.file
-    assert_equal cm,            loaded.parent
-    assert_equal section,       loaded.section
-  end
-
-  def test_marshal_load_version_1
-    tl = @store.add_file 'file.rb'
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    data = "\x04\bU:\x0FRDoc::Attr[\fi\x06I\"\tattr\x06:\x06EF" +
-           "\"\x0FKlass#attrI\"\aRW\x06;\x06F:\vpublic" +
-           "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-           "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-           "\"\x16this is a comment\x06;\x06FF"
-
-    loaded = Marshal.load data
-    loaded.store = @store
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal document,     loaded.comment.parse
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-
-    # version 2
-    assert_nil                 loaded.file
-
-    # version 3
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-
-    assert                     loaded.display?
-  end
-
-  def test_marshal_load_version_2
-    tl = @store.add_file 'file.rb'
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    loaded = Marshal.load "\x04\bU:\x0FRDoc::Attr[\ri\aI\"\tattr\x06" +
-                          ":\x06ETI\"\x0FKlass#attr\x06;\x06TI\"\aRW\x06" +
-                          ";\x06T:\vpublico:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o:\x1CRDoc::Markup::Paragraph\x06;" +
-                          "\t[\x06I\"\x16this is a comment\x06;\x06T:\n" +
-                          "@file0FI\"\ffile.rb\x06;\x06T"
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal document,     loaded.comment.parse
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-    assert_equal tl,           loaded.file
-
-    # version 3
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-
-    assert loaded.display?
-  end
-
-  def test_params
-    assert_nil @a.params
-  end
-
-  def test_singleton
-    refute @a.singleton
-  end
-
-  def test_type
-    assert_equal 'instance', @a.type
-
-    @a.singleton = true
-    assert_equal 'class', @a.type
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_class_module_test.rb b/test/mri/rdoc/rdoc_class_module_test.rb
deleted file mode 100644
index dec1a4c24b8..00000000000
--- a/test/mri/rdoc/rdoc_class_module_test.rb
+++ /dev/null
@@ -1,1706 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocClassModuleTest < XrefTestCase
-
-  def test_add_comment
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-    tl3 = @store.add_file 'three.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    comment_tl1 = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-    cm.add_comment comment_tl1, tl1
-
-    assert_equal [[comment_tl1, tl1]], cm.comment_location
-    assert_equal 'comment 1', cm.comment.text
-
-    comment_tl2 = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-    cm.add_comment comment_tl2, tl2
-
-    assert_equal [[comment_tl1, tl1], [comment_tl2, tl2]], cm.comment_location
-    assert_equal "comment 1\n---\ncomment 2", cm.comment
-
-    comment_tl3 = RDoc::Comment.new('# * comment 3', @top_level, :ruby)
-    cm.add_comment comment_tl3, tl3
-
-    assert_equal [[comment_tl1, tl1],
-                  [comment_tl2, tl2],
-                  [comment_tl3, tl3]], cm.comment_location
-    assert_equal "comment 1\n---\ncomment 2\n---\n* comment 3", cm.comment
-  end
-
-  def test_add_comment_comment
-    cm = RDoc::ClassModule.new 'Klass'
-
-    cm.add_comment comment('comment'), @top_level
-
-    assert_equal 'comment', cm.comment.text
-  end
-
-  def test_add_comment_duplicate
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    comment1 = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-    comment2 = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-    cm.add_comment comment1, tl1
-    cm.add_comment comment2, tl1
-
-    assert_equal [[comment1, tl1],
-                  [comment2, tl1]], cm.comment_location
-  end
-
-  def test_add_comment_stopdoc
-    tl = @store.add_file 'file.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.stop_doc
-
-    cm.add_comment '# comment 1', tl
-
-    assert_empty cm.comment
-  end
-
-  def test_ancestors
-    assert_equal [@parent, @object, "BasicObject"], @child.ancestors
-  end
-
-  def test_comment_equals
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-
-    assert_equal 'comment 1', cm.comment.to_s
-
-    cm.comment = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-
-    assert_equal "comment 1\n---\ncomment 2", cm.comment.to_s
-
-    cm.comment = RDoc::Comment.new('# * comment 3', @top_level, :ruby)
-
-    assert_equal "comment 1\n---\ncomment 2\n---\n* comment 3", cm.comment.to_s
-  end
-
-  def test_comment_equals_comment
-    cm = RDoc::ClassModule.new 'Klass'
-
-    cm.comment = comment 'comment'
-
-    assert_equal 'comment', cm.comment.text
-  end
-
-  def test_document_self_or_methods
-    assert @c1.document_self_or_methods
-
-    @c1.document_self = false
-
-    assert @c1.document_self_or_methods
-
-    @c1_plus.document_self = false
-    @c1_m.document_self = false
-
-    assert @c1.document_self_or_methods
-
-    @c1__m.document_self = false
-
-    refute @c1.document_self_or_methods
-  end
-
-  def test_documented_eh
-    cm = RDoc::ClassModule.new 'C'
-
-    refute cm.documented?, 'no comments, no markers'
-
-    cm.add_comment '', @top_level
-
-    refute cm.documented?, 'empty comment'
-
-    cm.add_comment 'hi', @top_level
-
-    assert cm.documented?, 'commented'
-
-    cm.comment_location.clear
-
-    refute cm.documented?, 'no comment'
-
-    cm.document_self = nil # notify :nodoc:
-
-    assert cm.documented?, ':nodoc:'
-  end
-
-  def test_each_ancestor
-    assert_equal [@parent, @object], @child.each_ancestor.to_a
-  end
-
-  def test_each_ancestor_cycle
-    m_incl = RDoc::Include.new 'M', nil
-
-    m = @top_level.add_module RDoc::NormalModule, 'M'
-    m.add_include m_incl
-
-    assert_empty m.each_ancestor.to_a
-  end
-
-  # handle making a short module alias of yourself
-
-  def test_find_class_named
-    @c2.classes_hash['C2'] = @c2
-
-    assert_nil @c2.find_class_named('C1')
-  end
-
-  def test_from_module_comment
-    tl = @store.add_file 'file.rb'
-    klass = tl.add_class RDoc::NormalModule, 'Klass'
-    klass.add_comment 'really a class', tl
-
-    klass = RDoc::ClassModule.from_module RDoc::NormalClass, klass
-
-    assert_equal [['really a class', tl]], klass.comment_location
-  end
-
-  def test_marshal_dump
-    @store.path = Dir.tmpdir
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.document_self = true
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', singleton: true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-    s0 = cm.sections.first
-    s1 = cm.add_section 'section', section_comment
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load Marshal.dump cm
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    document = RDoc::Markup::Document.new(inner)
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_equal [tl],               loaded.in_files
-    assert_equal 'Namespace',        loaded.parent.name
-
-    expected = { nil => s0, 'section' => s1 }
-    assert_equal expected, loaded.sections_hash
-
-    assert_equal tl, loaded.attributes.first.file
-
-    assert_equal tl, loaded.constants.first.file
-
-    assert_equal tl, loaded.includes.first.file
-
-    assert_equal tl, loaded.extends.first.file
-
-    assert_equal tl, loaded.method_list.first.file
-  end
-
-  def test_marshal_dump_visibility
-    @store.path = Dir.tmpdir
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a1.document_self = false
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-    m1.document_self = false
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-    c1.document_self = false
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-    i1.document_self = false
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-    e1.document_self = false
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-
-    cm.add_attribute a1
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load Marshal.dump cm
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    assert_empty loaded.attributes
-    assert_empty loaded.constants
-    assert_empty loaded.includes
-    assert_empty loaded.extends
-    assert_empty loaded.method_list
-  end
-
-  def test_marshal_load_version_0
-    tl = @store.add_file 'file.rb'
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-
-    a = RDoc::Attr.new(nil, 'a1', 'RW', '')
-    m = RDoc::AnyMethod.new(nil, 'm1')
-    c = RDoc::Constant.new('C1', nil, '')
-    i = RDoc::Include.new('I1', '')
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a
-    cm.add_method m
-    cm.add_constant c
-    cm.add_include i
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Ei\x00\"\nKlass" +
-                          "\"\x15Namespace::KlassI\"\nSuper\x06:\x06EF" +
-                          "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06F[\x06[\aI" +
-                          "\"\aa1\x06;\x06FI\"\aRW\x06;\x06F[\x06[\aI" +
-                          "\"\aC1\x06;\x06Fo;\a\x06;\b[\x00[\x06[\aI" +
-                          "\"\aI1\x06;\x06Fo;\a\x06;\b[\x00[\a[\aI" +
-                          "\"\nclass\x06;\x06F[\b[\a:\vpublic[\x00[\a" +
-                          ":\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\n[\x06I" +
-                          "\"\am1\x06;\x06F[\a;\v[\x00[\a;\f[\x00"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal [a],                loaded.attributes
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c],                loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i],                loaded.includes
-    assert_equal [m],                loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_nil                       loaded.file
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-
-    assert loaded.display?
-  end
-
-  def test_marshal_load_version_1
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', singleton: true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Ei\x06I\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    document = RDoc::Markup::Document.new(inner)
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_empty                     loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    assert_equal tl, loaded.attributes.first.file
-    assert_equal tl, loaded.constants.first.file
-    assert_equal tl, loaded.includes.first.file
-    assert_equal tl, loaded.method_list.first.file
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-  end
-
-  def test_marshal_load_version_2
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', singleton: true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Fi\aI\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    document = RDoc::Markup::Document.new(inner)
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    assert_equal tl, loaded.attributes. first.file
-    assert_equal tl, loaded.constants.  first.file
-    assert_equal tl, loaded.includes.   first.file
-    assert_equal tl, loaded.extends.    first.file
-    assert_equal tl, loaded.method_list.first.file
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-  end
-
-  def test_marshal_load_version_3
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', singleton: true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-    s0 = cm.sections.first
-    s1 = cm.add_section 'section', section_comment
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x13i\bI\"\nKlass" +
-                          "\x06:\x06ETI\"\x15Namespace::Klass\x06;\x06TI" +
-                          "\"\nSuper\x06;\x06To:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@fileI" +
-                          "\"\ffile.rb\x06;\x06T;\n0[\a[\nI\"\aa2\x06;" +
-                          "\x06TI\"\aRW\x06;\x06T:\vpublicT@\x11[\nI" +
-                          "\"\aa1\x06;\x06TI\"\aRW\x06;\x06T;\vF@\x11" +
-                          "[\x06U:\x13RDoc::Constant[\x0Fi\x00I\"\aC1\x06" +
-                          ";\x06TI\"\x19Namespace::Klass::C1\x06;\x06T00o" +
-                          ";\a\a;\b[\x00;\n0@\x11@\ac\x16RDoc::NormalClass0" +
-                          "[\x06[\bI\"\aI1\x06;\x06To;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06T[\b[\a;\v[\x00[\a" +
-                          ":\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06T[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06T@\x11[\a;\r[\x00[\a;\x0E[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06To;\a\a;\b[\x00;\n0@\x11" +
-                          "[\aU:\eRDoc::Context::Section[\bi\x000o;\a\a;\b" +
-                          "[\x00;\n0U;\x0F[\bi\x00I\"\fsection\x06;\x06To" +
-                          ";\a\a;\b[\x06o;\a\a;\b[\x06o;\t\x06;\b[\x06I" +
-                          "\"\x14section comment\x06;\x06T;\n@\x11;\n0" +
-                          "[\x06@\x11I\"\x0ENamespace\x06" +
-                          ";\x06Tc\x17RDoc::NormalModule"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    document = RDoc::Markup::Document.new(inner)
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal document,           loaded.comment.parse
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_equal 'Namespace',        loaded.parent.name
-    assert                           loaded.current_section
-
-    expected = {
-      nil       => s0,
-      'section' => s1,
-    }
-
-    assert_equal expected,           loaded.sections_hash
-    assert_equal [tl],               loaded.in_files
-
-    assert_equal tl, loaded.attributes. first.file
-    assert_equal tl, loaded.constants.  first.file
-    assert_equal tl, loaded.includes.   first.file
-    assert_equal tl, loaded.extends.    first.file
-    assert_equal tl, loaded.method_list.first.file
-  end
-
-  def test_merge
-    tl = @store.add_file 'one.rb'
-    p1  = tl.add_class RDoc::NormalClass, 'Parent'
-    c1  = p1.add_class RDoc::NormalClass, 'Klass'
-
-    c2 = RDoc::NormalClass.new 'Klass'
-
-    c2.merge c1
-
-    assert_equal 'Parent', c1.parent_name, 'original parent name'
-    assert_equal 'Parent', c2.parent_name, 'merged parent name'
-
-    assert c1.current_section, 'original current_section'
-    assert c2.current_section, 'merged current_section'
-  end
-
-  def test_merge_attributes
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a4', 'R', '')
-    attr.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    # TODO allow merging when comment == ''
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
-    attr.record_location tl2
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
-    attr.record_location tl1
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a4', 'W', '')
-    attr.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Attr.new(nil, 'a2', 'RW', ''),
-      RDoc::Attr.new(nil, 'a3', 'W',  ''),
-      RDoc::Attr.new(nil, 'a4', 'W',  ''),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-    assert_equal expected, cm1.attributes.sort
-  end
-
-  def test_merge_attributes_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a4', 'R', '')
-    attr.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    # TODO allow merging when comment == ''
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a4', 'W', '')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Attr.new(nil, 'a1', 'RW', ''),
-      RDoc::Attr.new(nil, 'a2', 'RW', ''),
-      RDoc::Attr.new(nil, 'a3', 'RW', ''),
-      RDoc::Attr.new(nil, 'a4', 'RW', ''),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-    assert_equal expected, cm1.attributes.sort
-  end
-
-  def test_merge_collections_drop
-    tl = @store.add_file 'file'
-
-    cm1 = RDoc::ClassModule.new 'C'
-    cm1.record_location tl
-
-    const = cm1.add_constant RDoc::Constant.new('CONST', nil, nil)
-    const.record_location tl
-
-    cm2 = RDoc::ClassModule.new 'C'
-    cm2.record_location tl
-
-    added = []
-    removed = []
-
-    cm1.merge_collections cm1.constants, cm2.constants, cm2.in_files do |add, c|
-      if add then
-        added << c
-      else
-        removed << c
-      end
-    end
-
-    assert_empty added
-    assert_equal [const], removed
-  end
-
-  def test_merge_comment
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-    cm1.add_comment 'klass 1', tl1
-    cm1.record_location tl1
-
-    cm2 = tl1.add_class RDoc::NormalClass, 'Klass'
-    cm2.add_comment 'klass 2', tl2
-    cm2.add_comment 'klass 3', tl1
-    cm2.record_location tl1
-    cm2.record_location tl2
-
-    cm2 = Marshal.load Marshal.dump cm2
-    cm2.store = @store
-
-    cm1.merge cm2
-
-    inner1 = @RM::Document.new @RM::Paragraph.new 'klass 3'
-    inner1.file = 'one.rb'
-    inner2 = @RM::Document.new @RM::Paragraph.new 'klass 2'
-    inner2.file = 'two.rb'
-
-    expected = @RM::Document.new inner2, inner1
-
-    assert_equal expected, cm1.comment.parse
-  end
-
-  def test_merge_comment_version_0
-    tl = @store.add_file 'file.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-    cm1.add_comment 'klass 1', tl
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-
-    cm2.instance_variable_set(:@comment,
-                              @RM::Document.new(
-                                @RM::Paragraph.new('klass 2')))
-    cm2.instance_variable_set :@comment_location, @RM::Document.new(cm2.comment)
-
-    cm1.merge cm2
-
-    inner = @RM::Document.new @RM::Paragraph.new 'klass 1'
-    inner.file = 'file.rb'
-
-    expected = @RM::Document.new \
-      inner,
-      @RM::Document.new(@RM::Paragraph.new('klass 2'))
-
-    assert_equal expected, cm1.comment.parse
-  end
-
-  def test_merge_constants
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    const = cm1.add_constant RDoc::Constant.new('C1', nil, 'one')
-    const.record_location tl1
-    const = cm1.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-
-    store = RDoc::Store.new(RDoc::Options.new)
-    tl = store.add_file 'one.rb'
-    cm2 = tl.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    const = cm2.add_constant RDoc::Constant.new('C2', nil, 'two')
-    const.record_location tl2
-    const = cm2.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-    const = cm2.add_constant RDoc::Constant.new('C4', nil, 'one')
-    const.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Constant.new('C2', nil, 'two'),
-      RDoc::Constant.new('C3', nil, 'one'),
-      RDoc::Constant.new('C4', nil, 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.constants.sort
-  end
-
-  def test_merge_constants_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    const = cm1.add_constant RDoc::Constant.new('C1', nil, 'one')
-    const.record_location tl1
-    const = cm1.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-
-    store = RDoc::Store.new(RDoc::Options.new)
-    tl = store.add_file 'one.rb'
-    cm2 = tl.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    const = cm2.add_constant RDoc::Constant.new('C2', nil, 'two')
-    const = cm2.add_constant RDoc::Constant.new('C3', nil, 'two')
-    const = cm2.add_constant RDoc::Constant.new('C4', nil, 'two')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Constant.new('C1', nil, 'one'),
-      RDoc::Constant.new('C2', nil, 'two'),
-      RDoc::Constant.new('C3', nil, 'one'),
-      RDoc::Constant.new('C4', nil, 'two'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.constants.sort
-  end
-
-  def test_merge_extends
-    tl1 = @store.add_file 'one.rb'
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    ext = cm1.add_extend RDoc::Extend.new('I1', 'one')
-    ext.record_location tl1
-    ext = cm1.add_extend RDoc::Extend.new('I3', 'one')
-    ext.record_location tl1
-
-    tl2 = @store.add_file 'two.rb'
-    tl2.store = RDoc::Store.new(RDoc::Options.new)
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    ext = cm2.add_extend RDoc::Extend.new('I2', 'two')
-    ext.record_location tl2
-    ext = cm2.add_extend RDoc::Extend.new('I3', 'one')
-    ext.record_location tl1
-    ext = cm2.add_extend RDoc::Extend.new('I4', 'one')
-    ext.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Extend.new('I2', 'two'),
-      RDoc::Extend.new('I3', 'one'),
-      RDoc::Extend.new('I4', 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.extends.sort
-  end
-
-  def test_merge_includes
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    incl = cm1.add_include RDoc::Include.new('I1', 'one')
-    incl.record_location tl1
-    incl = cm1.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-
-    tl2 = @store.add_file 'two.rb'
-    tl2.store = RDoc::Store.new(RDoc::Options.new)
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    incl = cm2.add_include RDoc::Include.new('I2', 'two')
-    incl.record_location tl2
-    incl = cm2.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-    incl = cm2.add_include RDoc::Include.new('I4', 'one')
-    incl.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Include.new('I2', 'two'),
-      RDoc::Include.new('I3', 'one'),
-      RDoc::Include.new('I4', 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.includes.sort
-  end
-
-  def test_merge_includes_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    incl = cm1.add_include RDoc::Include.new('I1', 'one')
-    incl.record_location tl1
-    incl = cm1.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-
-    tl2 = @store.add_file 'one.rb'
-    tl2.store = RDoc::Store.new(RDoc::Options.new)
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    incl = cm2.add_include RDoc::Include.new('I2', 'two')
-    incl = cm2.add_include RDoc::Include.new('I3', 'two')
-    incl = cm2.add_include RDoc::Include.new('I4', 'two')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Include.new('I1', 'one'),
-      RDoc::Include.new('I2', 'two'),
-      RDoc::Include.new('I3', 'one'),
-      RDoc::Include.new('I4', 'two'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.includes.sort
-  end
-
-  def test_merge_methods
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::NormalClass, 'Klass'
-
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
-    meth.record_location tl1
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    cm2.store = @store
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
-    meth.record_location tl2
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm4')
-    meth.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::AnyMethod.new(nil, 'm2'),
-      RDoc::AnyMethod.new(nil, 'm3'),
-      RDoc::AnyMethod.new(nil, 'm4'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.method_list.sort
-  end
-
-  def test_merge_methods_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::NormalClass, 'Klass'
-
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
-    meth.record_location tl1
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    cm2.store = @store
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm4')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::AnyMethod.new(nil, 'm1'),
-      RDoc::AnyMethod.new(nil, 'm2'),
-      RDoc::AnyMethod.new(nil, 'm3'),
-      RDoc::AnyMethod.new(nil, 'm4'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.method_list.sort
-  end
-
-  def test_merge_sections
-    store1 = @store
-
-    tl1_1 = store1.add_file 'one.rb'
-
-    cm1  = tl1_1.add_class RDoc::ClassModule, 'Klass'
-    cm1.record_location tl1_1
-
-    s1_0 = cm1.sections.first
-    s1_1 = cm1.add_section 'section 1', comment('comment 1',   tl1_1)
-           cm1.add_section 'section 2', comment('comment 2 a', tl1_1)
-           cm1.add_section 'section 4', comment('comment 4 a', tl1_1)
-
-    store2 = RDoc::Store.new(RDoc::Options.new)
-    tl2_1 = store2.add_file 'one.rb'
-    tl2_2 = store2.add_file 'two.rb'
-
-    cm2  = tl2_1.add_class RDoc::ClassModule, 'Klass'
-    cm2.record_location tl2_1
-    cm2.record_location tl2_2
-
-           cm2.sections.first
-    s2_2 = cm2.add_section 'section 2', comment('comment 2 b', tl2_1)
-    s2_3 = cm2.add_section 'section 3', comment('comment 3',   tl2_2)
-           cm2.add_section 'section 4', comment('comment 4 b', tl2_2)
-
-    cm1.merge cm2
-
-    expected = [
-      s1_0,
-      s1_1,
-      s2_2,
-      s2_3,
-      RDoc::Context::Section.new(cm1, 'section 4', nil)
-    ]
-
-    merged_sections = cm1.sections.sort_by do |s|
-      s.title || ''
-    end
-
-    assert_equal expected, merged_sections
-
-    assert_equal [comment('comment 2 b', tl2_1)],
-                 cm1.sections_hash['section 2'].comments
-
-    expected_s4_comments = [
-      comment('comment 4 a', tl2_1),
-      comment('comment 4 b', tl2_2),
-    ]
-
-    assert_equal expected_s4_comments, cm1.sections_hash['section 4'].comments
-  end
-
-  def test_merge_sections_overlap
-    store1 = @store
-
-    tl1_1 = store1.add_file 'one.rb'
-    tl1_3 = store1.add_file 'three.rb'
-
-    cm1  = tl1_1.add_class RDoc::ClassModule, 'Klass'
-    cm1.record_location tl1_1
-
-    cm1.add_section 'section', comment('comment 1 a', tl1_1)
-    cm1.add_section 'section', comment('comment 3',   tl1_3)
-
-    store2 = RDoc::Store.new(RDoc::Options.new)
-    tl2_1 = store2.add_file 'one.rb'
-    tl2_2 = store2.add_file 'two.rb'
-    tl2_3 = store2.add_file 'three.rb'
-
-    cm2  = tl2_1.add_class RDoc::ClassModule, 'Klass'
-    cm2.record_location tl2_1
-    cm2.record_location tl2_2
-
-    s2_0 = cm2.sections.first
-    s2_1 = cm2.add_section 'section', comment('comment 1 b', tl1_1)
-           cm2.add_section 'section', comment('comment 2',   tl2_2)
-
-    cm1.merge_sections cm2
-
-    expected = [
-      s2_0,
-      s2_1,
-    ]
-
-    merged_sections = cm1.sections.sort_by do |s|
-      s.title || ''
-    end
-
-    assert_equal expected, merged_sections
-
-    expected = [
-      comment('comment 1 b', tl2_1),
-      comment('comment 3',   tl2_3),
-      comment('comment 2',   tl2_2),
-    ]
-
-    comments = cm1.sections_hash['section'].comments
-
-    assert_equal expected, comments.sort_by { |c| c.file.name }
-  end
-
-  def test_parse
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.add_comment 'comment 1', tl1
-    cm.add_comment 'comment 2', tl2
-
-    doc1 = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc1.file = tl1
-    doc2 = @RM::Document.new @RM::Paragraph.new 'comment 2'
-    doc2.file = tl2
-
-    expected = @RM::Document.new doc1, doc2
-
-    assert_equal expected, cm.parse(cm.comment_location)
-  end
-
-  def test_parse_comment
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = comment 'comment 1', tl1
-
-    doc = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc.file = tl1
-
-    assert_equal doc, cm.parse(cm.comment)
-  end
-
-  def test_parse_comment_format
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = comment 'comment ((*1*))', tl1
-    cm.comment.format = 'rd'
-
-    doc = @RM::Document.new @RM::Paragraph.new 'comment <em>1</em>'
-    doc.file = tl1
-
-    assert_equal doc, cm.parse(cm.comment)
-  end
-
-  def test_parse_comment_location
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm = tl1.add_class RDoc::NormalClass, 'Klass'
-    cm.add_comment 'comment 1', tl1
-    cm.add_comment 'comment 2', tl2
-
-    cm = Marshal.load Marshal.dump cm
-
-    doc1 = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc1.file = tl1
-    doc2 = @RM::Document.new @RM::Paragraph.new 'comment 2'
-    doc2.file = tl2
-
-    assert_same cm.comment_location, cm.parse(cm.comment_location)
-  end
-
-  def test_remove_nodoc_children
-    parent = @top_level.add_class RDoc::ClassModule, 'A'
-    parent.modules_hash.replace 'B' => true, 'C' => true
-    @store.modules_hash.replace 'A::B' => true
-
-    parent.classes_hash.replace 'D' => true, 'E' => true
-    @store.classes_hash.replace 'A::D' => true
-
-    parent.remove_nodoc_children
-
-    assert_equal %w[B], parent.modules_hash.keys
-    assert_equal %w[D], parent.classes_hash.keys
-  end
-
-  def test_search_record
-    @c2_c3.add_comment 'This is a comment.', @xref_data
-
-    expected = [
-      'C3',
-      'C2::C3',
-      'C2::C3',
-      '',
-      'C2/C3.html',
-      '',
-      "<p>This is a comment.\n"
-    ]
-
-    assert_equal expected, @c2_c3.search_record
-  end
-
-  def test_search_record_merged
-    @c2_c3.add_comment 'comment A', @store.add_file('a.rb')
-    @c2_c3.add_comment 'comment B', @store.add_file('b.rb')
-
-    expected = [
-      'C3',
-      'C2::C3',
-      'C2::C3',
-      '',
-      'C2/C3.html',
-      '',
-      "<p>comment A\n<p>comment B\n"
-    ]
-
-    assert_equal expected, @c2_c3.search_record
-  end
-
-  def test_store_equals
-    # version 2
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Fi\aI\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11"
-
-    loaded.store = @store
-
-    assert_same @store, loaded.store
-
-    a = loaded.attributes.first
-    assert_same @store, a.store
-    assert_same @store, a.file.store
-
-    c = loaded.constants.first
-    assert_same @store, c.store
-    assert_same @store, c.file.store
-
-    i = loaded.includes.first
-    assert_same @store, i.store
-    assert_same @store, i.file.store
-
-    e = loaded.extends.first
-    assert_same @store, e.store
-    assert_same @store, e.file.store
-
-    m = loaded.method_list.first
-    assert_same @store, m.store
-    assert_same @store, m.file.store
-  end
-
-  def test_superclass
-    assert_equal @c3_h1, @c3_h2.superclass
-  end
-
-  def test_setting_superclass
-    @c1.superclass = nil
-    assert_nil(@c1.superclass)
-    assert_nil(@c1.instance_variable_get("@superclass")) # proxy to test marshalling
-
-    @c1.superclass = @c4_c4.full_name
-    assert_equal(@c1.superclass, @c4_c4)
-    assert_equal(@c4_c4.full_name, @c1.instance_variable_get("@superclass"))
-
-    @c1.superclass = @c4_c4
-    assert_equal(@c1.superclass, @c4_c4)
-    assert_equal(@c4_c4.full_name, @c1.instance_variable_get("@superclass"))
-
-    # we could support this if we find we need to in the future.
-    assert_raise(TypeError) { @c1.superclass = Object }
-
-    # but this doesn't make sense.
-    assert_raise(TypeError) { @c1.superclass = Object.new }
-  end
-
-  def test_super_classes
-    rdoc_c3_h1 = @xref_data.find_module_named('C3::H1')
-    rdoc_object = @xref_data.find_module_named('Object')
-    assert_equal [rdoc_c3_h1, rdoc_object, "BasicObject"], @c3_h2.super_classes
-  end
-
-  def test_update_aliases_class
-    n1 = @xref_data.add_module RDoc::NormalClass, 'N1'
-    n1_k2 = n1.add_module RDoc::NormalClass, 'N2'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    n1.add_module_alias n1_k2, n1_k2.name, a1, @xref_data
-
-    n1_a1_c = n1.constants.find { |c| c.name == 'A1' }
-    refute_nil n1_a1_c
-    assert_equal n1_k2, n1_a1_c.is_alias_for, 'sanity check'
-
-    n1.update_aliases
-
-    n1_a1_k = @xref_data.find_class_or_module 'N1::A1'
-    refute_nil n1_a1_k
-    assert_equal n1_k2, n1_a1_k.is_alias_for
-    refute_equal n1_k2, n1_a1_k
-
-    assert_equal 1, n1_k2.aliases.length
-    assert_equal n1_a1_k, n1_k2.aliases.first
-
-    assert_equal 'N1::N2', n1_k2.full_name
-    assert_equal 'N1::A1', n1_a1_k.full_name
-  end
-
-  def test_update_aliases_module
-    n1 = @xref_data.add_module RDoc::NormalModule, 'N1'
-    n1_n2 = n1.add_module RDoc::NormalModule, 'N2'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    n1.add_module_alias n1_n2, n1_n2.name, a1, @xref_data
-
-    n1_a1_c = n1.constants.find { |c| c.name == 'A1' }
-    refute_nil n1_a1_c
-    assert_equal n1_n2, n1_a1_c.is_alias_for, 'sanity check'
-
-    n1.update_aliases
-
-    n1_a1_m = @xref_data.find_class_or_module 'N1::A1'
-    refute_nil n1_a1_m
-    assert_equal n1_n2, n1_a1_m.is_alias_for
-    refute_equal n1_n2, n1_a1_m
-
-    assert_equal 1, n1_n2.aliases.length
-    assert_equal n1_a1_m, n1_n2.aliases.first
-
-    assert_equal 'N1::N2', n1_n2.full_name
-    assert_equal 'N1::A1', n1_a1_m.full_name
-  end
-
-  def test_update_aliases_reparent
-    l1 = @xref_data.add_module RDoc::NormalModule, 'L1'
-    l1_l2 = l1.add_module RDoc::NormalModule, 'L2'
-    o1 = @xref_data.add_module RDoc::NormalModule, 'O1'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    o1.add_module_alias l1_l2, l1_l2.name, a1, @xref_data
-
-    o1_a1_c = o1.constants.find { |c| c.name == 'A1' }
-    refute_nil o1_a1_c
-    assert_equal l1_l2, o1_a1_c.is_alias_for
-    refute_equal l1_l2, o1_a1_c
-
-    o1.update_aliases
-
-    o1_a1_m = @xref_data.find_class_or_module 'O1::A1'
-    refute_nil o1_a1_m
-    assert_equal l1_l2, o1_a1_m.is_alias_for
-
-    assert_equal 1, l1_l2.aliases.length
-    assert_equal o1_a1_m, l1_l2.aliases[0]
-
-    assert_equal 'L1::L2', l1_l2.full_name
-    assert_equal 'O1::A1', o1_a1_m.full_name
-  end
-
-  def test_update_aliases_reparent_root
-    store = RDoc::Store.new(RDoc::Options.new)
-
-    top_level = store.add_file 'file.rb'
-
-    klass  = top_level.add_class RDoc::NormalClass, 'Klass'
-    object = top_level.add_class RDoc::NormalClass, 'Object'
-
-    const = RDoc::Constant.new 'A', nil, ''
-    const.record_location top_level
-    const.is_alias_for = klass
-
-    a = RDoc::Constant.new 'A', '', ''
-    top_level.add_module_alias klass, klass.name, a, top_level
-
-    object.add_constant const
-
-    object.update_aliases
-
-    assert_equal %w[A Klass Object], store.classes_hash.keys.sort
-
-    assert_equal 'A',     store.classes_hash['A'].full_name
-    assert_equal 'Klass', store.classes_hash['Klass'].full_name
-  end
-
-  def test_update_includes
-    a = RDoc::Include.new 'M1', nil
-    b = RDoc::Include.new 'M2', nil
-    c = RDoc::Include.new 'C', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.add_include c
-    @c1.ancestors # cache included modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_includes
-
-    assert_equal [a, c], @c1.includes
-  end
-
-  def test_update_includes_trim
-    a = RDoc::Include.new 'D::M', nil
-    b = RDoc::Include.new 'D::M', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.ancestors # cache included modules
-
-    @c1.update_includes
-
-    assert_equal [a], @c1.includes
-  end
-
-  def test_update_includes_with_colons
-    a = RDoc::Include.new 'M1', nil
-    b = RDoc::Include.new 'M1::M2', nil
-    c = RDoc::Include.new 'C', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.add_include c
-    @c1.ancestors # cache included modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_includes
-
-    assert_equal [a, c], @c1.includes
-  end
-
-  def test_update_extends
-    a = RDoc::Extend.new 'M1', nil
-    b = RDoc::Extend.new 'M2', nil
-    c = RDoc::Extend.new 'C', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.add_extend c
-    @c1.extends.each do |extend| extend.module end # cache extended modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_extends
-
-    assert_equal [a, b, c], @c1.extends
-  end
-
-  def test_update_extends_trim
-    a = RDoc::Extend.new 'D::M', nil
-    b = RDoc::Extend.new 'D::M', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.extends.each do |extend| extend.module end # cache extended modules
-
-    @c1.update_extends
-
-    assert_equal [a], @c1.extends
-  end
-
-  def test_update_extends_with_colons
-    a = RDoc::Extend.new 'M1', nil
-    b = RDoc::Extend.new 'M1::M2', nil
-    c = RDoc::Extend.new 'C', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.add_extend c
-    @c1.extends.each do |extend| extend.module end # cache extended modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_extends
-
-    assert_equal [a, c], @c1.extends
-  end
-
-  def test_nesting_namespaces
-    cm1 = RDoc::ClassModule.new "A"
-    assert_equal ["A"], cm1.nesting_namespaces
-
-    cm2 = RDoc::ClassModule.new "A::B"
-    assert_equal ["A", "B"], cm2.nesting_namespaces
-
-    cm3 = RDoc::ClassModule.new "::A::B::C"
-    assert_equal ["A", "B", "C"], cm3.nesting_namespaces
-  end
-
-  def test_fully_qualified_nesting_namespaces
-    cm1 = RDoc::ClassModule.new "A"
-    assert_equal ["A"], cm1.fully_qualified_nesting_namespaces
-
-    cm2 = RDoc::ClassModule.new "A::B"
-    assert_equal ["A", "A::B"], cm2.fully_qualified_nesting_namespaces
-
-    cm3 = RDoc::ClassModule.new "::A::B::C"
-    assert_equal ["A", "A::B", "A::B::C"], cm3.fully_qualified_nesting_namespaces
-  end
-
-  def test_path
-    assert_equal 'C1.html', @c1.path
-
-    @options.class_module_path_prefix = 'class'
-    assert_equal 'class/C1.html', @c1.path
-  end
-
-  class RDocClassModuleMixinsTest < XrefTestCase
-    def setup
-      super
-
-      klass_tl = @store.add_file("klass.rb")
-      @klass = klass_tl.add_class(RDoc::NormalClass, "Klass")
-
-      incmod_tl = @store.add_file("incmod.rb")
-      @incmod = incmod_tl.add_module(RDoc::NormalModule, "Incmod")
-
-      incmod_const = @incmod.add_constant(RDoc::Constant.new("INCMOD_CONST_WITHOUT_A_SECTION", nil, ""))
-      incmod_const = @incmod.add_constant(RDoc::Constant.new("INCMOD_CONST", nil, ""))
-      incmod_const.section = @incmod.add_section("Incmod const section")
-
-      incmod_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_method_without_a_section"))
-      incmod_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_method"))
-      incmod_method.section = @incmod.add_section("Incmod method section")
-
-      incmod_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_attr_without_a_section", "RW", ""))
-      incmod_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_attr", "RW", ""))
-      incmod_attr.section = @incmod.add_section("Incmod attr section")
-
-      incmod_private_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_private_method"))
-      incmod_private_method.visibility = :private
-
-      incmod_private_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_private_attr", "RW", ""))
-      incmod_private_attr.visibility = :private
-
-      extmod_tl = @store.add_file("extmod.rb")
-      @extmod = extmod_tl.add_module(RDoc::NormalModule, "Extmod")
-
-      extmod_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_method_without_a_section"))
-      extmod_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_method"))
-      extmod_method.section = @extmod.add_section("Extmod method section")
-
-      extmod_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_attr_without_a_section", "RW", "", singleton: true))
-      extmod_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_attr", "RW", "", singleton: true))
-      extmod_attr.section = @extmod.add_section("Extmod attr section")
-
-      extmod_private_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_private_method"))
-      extmod_private_method.visibility = :private
-
-      extmod_private_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_private_attr", "RW", "", singleton: true))
-      extmod_private_attr.visibility = :private
-
-      @klass.add_include(RDoc::Include.new("Incmod", nil))
-      @klass.add_extend(RDoc::Include.new("Extmod", nil))
-
-      @klass.add_include(RDoc::Include.new("ExternalInclude", nil))
-      # Test duplicationg removal
-      @klass.add_include(RDoc::Include.new("ExternalInclude", nil))
-
-      @klass.add_extend(RDoc::Include.new("ExternalExtend", nil))
-      # Test duplicationg removal
-      @klass.add_extend(RDoc::Include.new("ExternalExtend", nil))
-    end
-
-    def test_complete_clears_duplicated_includes_and_extends
-      @klass.complete(:protected)
-
-      assert_equal(["Incmod", "ExternalInclude"], @klass.includes.map(&:name))
-      assert_equal(["Extmod", "ExternalExtend"], @klass.extends.map(&:name))
-    end
-
-    def test_embed_mixin_when_false_does_not_embed_anything
-      assert_false(@klass.options.embed_mixins)
-      @klass.complete(:protected)
-
-      refute_includes(@klass.constants.map(&:name), "INCMOD_CONST")
-      refute_includes(@klass.method_list.map(&:name), "incmod_method")
-      refute_includes(@klass.method_list.map(&:name), "extmod_method")
-      refute_includes(@klass.attributes.map(&:name), "incmod_attr")
-      refute_includes(@klass.attributes.map(&:name), "extmod_attr")
-    end
-
-    def test_embed_mixin_when_true_embeds_methods_and_constants
-      @klass.options.embed_mixins = true
-      @klass.complete(:protected)
-
-      # assert on presence and identity of methods and constants
-      constant = @klass.constants.find { |c| c.name == "INCMOD_CONST" }
-      assert(constant, "constant from included mixin should be present")
-      assert_equal(@incmod, constant.mixin_from)
-
-      instance_method = @klass.method_list.find { |m| m.name == "incmod_method" }
-      assert(instance_method, "instance method from included mixin should be present")
-      refute(instance_method.singleton)
-      assert_equal(@incmod, instance_method.mixin_from)
-
-      instance_attr = @klass.attributes.find { |a| a.name == "incmod_attr" }
-      assert(instance_attr, "instance attr from included mixin should be present")
-      refute(instance_attr.singleton)
-      assert_equal(@incmod, instance_attr.mixin_from)
-
-      refute(@klass.method_list.find { |m| m.name == "incmod_private_method" })
-      refute(@klass.attributes.find { |m| m.name == "incmod_private_attr" })
-
-      class_method = @klass.method_list.find { |m| m.name == "extmod_method" }
-      assert(class_method, "class method from extended mixin should be present")
-      assert(class_method.singleton)
-      assert_equal(@extmod, class_method.mixin_from)
-
-      class_attr = @klass.attributes.find { |a| a.name == "extmod_attr" }
-      assert(class_attr, "class attr from extended mixin should be present")
-      assert(class_attr.singleton)
-      assert_equal(@extmod, class_attr.mixin_from)
-
-      refute(@klass.method_list.find { |m| m.name == "extmod_private_method" })
-      refute(@klass.attributes.find { |m| m.name == "extmod_private_attr" })
-
-      # assert that sections are also imported
-      constant_section = @klass.sections.find { |s| s.title == "Incmod const section" }
-      assert(constant_section, "constant from included mixin should have a section")
-      assert_equal(constant_section, constant.section)
-
-      instance_method_section = @klass.sections.find { |s| s.title == "Incmod method section" }
-      assert(instance_method_section, "instance method from included mixin should have a section")
-      assert_equal(instance_method_section, instance_method.section)
-
-      instance_attr_section = @klass.sections.find { |s| s.title == "Incmod attr section" }
-      assert(instance_attr_section, "instance attr from included mixin should have a section")
-      assert_equal(instance_attr_section, instance_attr.section)
-
-      class_method_section = @klass.sections.find { |s| s.title == "Extmod method section" }
-      assert(class_method_section, "class method from extended mixin should have a section")
-      assert_equal(class_method_section, class_method.section)
-
-      class_attr_section = @klass.sections.find { |s| s.title == "Extmod attr section" }
-      assert(class_attr_section, "class attr from extended mixin should have a section")
-      assert_equal(class_attr_section, class_attr.section)
-
-      # and check that code objects without a section still have no section
-      constant = @klass.constants.find { |c| c.name == "INCMOD_CONST_WITHOUT_A_SECTION" }
-      assert_nil(constant.section.title)
-
-      instance_method = @klass.method_list.find { |c| c.name == "incmod_method_without_a_section" }
-      assert_nil(instance_method.section.title)
-
-      instance_attr = @klass.attributes.find { |c| c.name == "incmod_attr_without_a_section" }
-      assert_nil(instance_attr.section.title)
-
-      class_method = @klass.method_list.find { |c| c.name == "extmod_method_without_a_section" }
-      assert_nil(class_method.section.title)
-
-      class_attr = @klass.attributes.find { |c| c.name == "extmod_attr_without_a_section" }
-      assert_nil(class_attr.section.title)
-    end
-  end
-end
diff --git a/test/mri/rdoc/rdoc_code_object_test.rb b/test/mri/rdoc/rdoc_code_object_test.rb
deleted file mode 100644
index af5c34257c6..00000000000
--- a/test/mri/rdoc/rdoc_code_object_test.rb
+++ /dev/null
@@ -1,416 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'xref_test_case'
-
-class RDocCodeObjectTest < XrefTestCase
-
-  def setup
-    super
-
-    @co = RDoc::CodeObject.new
-  end
-
-  def test_initialize
-    assert @co.document_self, 'document_self'
-    assert @co.document_children, 'document_children'
-    refute @co.force_documentation, 'force_documentation'
-    refute @co.done_documenting, 'done_documenting'
-    refute @co.received_nodoc, 'received_nodoc'
-    assert_equal '', @co.comment, 'comment is empty'
-  end
-
-  def test_comment_equals
-    @co.comment = ''
-
-    assert_equal '', @co.comment
-
-    @co.comment = 'I am a comment'
-
-    assert_equal 'I am a comment', @co.comment
-  end
-
-  def test_comment_equals_comment
-    @co.comment = comment ''
-
-    assert_equal '', @co.comment.text
-
-    @co.comment = comment 'I am a comment'
-
-    assert_equal 'I am a comment', @co.comment.text
-  end
-
-  def test_comment_equals_empty_string
-    @co.comment = 'comment'
-
-    @co.comment = ''
-
-    assert_equal 'comment', @co.comment
-  end
-
-  def test_comment_equals_encoding
-    refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    input = 'text'
-    input = RDoc::Encoding.change_encoding input, Encoding::UTF_8
-
-    @co.comment = input
-
-    assert_equal 'text', @co.comment
-    assert_equal Encoding::UTF_8, @co.comment.encoding
-  end
-
-  def test_comment_equals_encoding_blank
-    refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    input = ''
-    input = RDoc::Encoding.change_encoding input, Encoding::UTF_8
-
-    @co.comment = input
-
-    assert_equal '', @co.comment
-    assert_equal Encoding::UTF_8, @co.comment.encoding
-  end
-
-  def test_display_eh_document_self
-    assert @co.display?
-
-    @co.document_self = false
-
-    refute @co.display?
-  end
-
-  def test_display_eh_ignore
-    assert @co.display?
-
-    @co.ignore
-
-    refute @co.display?
-
-    @co.stop_doc
-
-    refute @co.display?
-
-    @co.done_documenting = false
-
-    refute @co.display?
-  end
-
-  def test_display_eh_suppress
-    assert @co.display?
-
-    @co.suppress
-
-    refute @co.display?
-
-    @co.comment = comment('hi')
-
-    refute @co.display?
-
-    @co.done_documenting = false
-
-    assert @co.display?
-
-    @co.ignore
-    @co.done_documenting = false
-
-    refute @co.display?
-  end
-
-  def test_document_children_equals
-    @co.document_children = false
-
-    refute @co.document_children
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_children
-
-    @co.document_children = false
-
-    assert @co.document_children
-  end
-
-  def test_document_self_equals
-    @co.document_self = false
-    refute @co.document_self
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-
-    @co.document_self = false
-
-    assert @co.document_self
-  end
-
-  def test_documented_eh
-    refute @co.documented?
-
-    @co.comment = 'hi'
-
-    assert @co.documented?
-
-    @co.comment.replace ''
-
-    refute @co.documented?
-
-    @co.document_self = nil # notify :nodoc:
-
-    assert @co.documented?
-  end
-
-  def test_done_documenting
-    # once done_documenting is set, other properties refuse to go to "true"
-    @co.done_documenting = true
-
-    @co.document_self = true
-    refute @co.document_self
-
-    @co.document_children = true
-    refute @co.document_children
-
-    @co.force_documentation = true
-    refute @co.force_documentation
-
-    @co.start_doc
-    refute @co.document_self
-    refute @co.document_children
-
-    # turning done_documenting on
-    # resets others to true
-
-    @co.done_documenting = false
-    assert @co.document_self
-    assert @co.document_children
-
-    @co.done_documenting = true
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    refute @co.done_documenting
-
-    @co.done_documenting = true
-
-    refute @co.done_documenting
-  end
-
-  def test_file_name
-    assert_nil @co.file_name
-
-    @co.record_location @store.add_file 'lib/file.rb'
-
-    assert_equal 'lib/file.rb', @co.file_name
-  end
-
-  def test_full_name_equals
-    @co.full_name = 'hi'
-
-    assert_equal 'hi', @co.instance_variable_get(:@full_name)
-
-    @co.full_name = nil
-
-    assert_nil @co.instance_variable_get(:@full_name)
-  end
-
-  def test_ignore
-    @co.ignore
-
-    refute @co.document_self
-    refute @co.document_children
-    assert @co.ignored?
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.ignored?
-
-    @co.ignore
-
-    refute @co.ignored?
-  end
-
-  def test_ignore_eh
-    refute @co.ignored?
-
-    @co.ignore
-
-    assert @co.ignored?
-  end
-
-  def test_line
-    @c1_m.line = 5
-
-    assert_equal 5, @c1_m.line
-  end
-
-  def test_metadata
-    assert_empty @co.metadata
-
-    @co.metadata['markup'] = 'not_rdoc'
-
-    expected = { 'markup' => 'not_rdoc' }
-
-    assert_equal expected, @co.metadata
-
-    assert_equal 'not_rdoc', @co.metadata['markup']
-  end
-
-  def test_parent_name
-    assert_equal '(unknown)', @co.parent_name
-    assert_equal 'xref_data.rb', @c1.parent_name
-    assert_equal 'C2', @c2_c3.parent_name
-  end
-
-  def test_received_ndoc
-    @co.document_self = false
-    refute @co.received_nodoc
-
-    @co.document_self = nil
-    assert @co.received_nodoc
-
-    @co.document_self = true
-  end
-
-  def test_record_location
-    @co.record_location @xref_data
-
-    assert_equal 'xref_data.rb', @co.file.relative_name
-  end
-
-  def test_record_location_ignored
-    @co.ignore
-    @co.record_location @xref_data
-
-    refute @co.ignored?
-  end
-
-  def test_record_location_suppressed
-    @co.suppress
-    @co.record_location @xref_data
-
-    refute @co.suppressed?
-  end
-
-  def test_section
-    parent = RDoc::Context.new
-    section = parent.sections.first
-
-    @co.parent = parent
-    @co.instance_variable_set :@section, section
-
-    assert_equal section, @co.section
-
-    @co.instance_variable_set :@section, nil
-    @co.instance_variable_set :@section_title, nil
-
-    assert_equal section, @co.section
-
-    @co.instance_variable_set :@section, nil
-    @co.instance_variable_set :@section_title, 'new title'
-
-    assert_equal 'new title', @co.section.title
-  end
-
-  def test_start_doc
-    @co.document_self = false
-    @co.document_children = false
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-  end
-
-  def test_start_doc_ignored
-    @co.ignore
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.ignored?
-  end
-
-  def test_start_doc_suppressed
-    @co.suppress
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.suppressed?
-  end
-
-  def test_store_equals
-    @co.document_self = false
-
-    @co.store = @store
-
-    refute @co.document_self
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-  end
-
-  def test_stop_doc
-    @co.document_self = true
-    @co.document_children = true
-
-    @co.stop_doc
-
-    refute @co.document_self
-    refute @co.document_children
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-    assert @co.document_children
-
-    @co.stop_doc
-
-    assert @co.document_self
-    assert @co.document_children
-  end
-
-  def test_suppress
-    @co.suppress
-
-    refute @co.document_self
-    refute @co.document_children
-    assert @co.suppressed?
-
-    @store.options.visibility = :nodoc
-
-    @co.store = @store
-
-    refute @co.suppressed?
-
-    @co.suppress
-
-    refute @co.suppressed?
-  end
-
-  def test_suppress_eh
-    refute @co.suppressed?
-
-    @co.suppress
-
-    assert @co.suppressed?
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_comment_test.rb b/test/mri/rdoc/rdoc_comment_test.rb
deleted file mode 100644
index 1699575b9df..00000000000
--- a/test/mri/rdoc/rdoc_comment_test.rb
+++ /dev/null
@@ -1,480 +0,0 @@
-# coding: us-ascii
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocCommentTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-    @comment = RDoc::Comment.new
-    @comment.location = @top_level
-    @comment.text = 'this is a comment'
-  end
-
-  def test_empty
-    @comment.text = ''
-    assert_empty @comment
-    empty_doc = @comment.parse
-    assert_empty @comment
-    @comment.text = 'a'
-    refute_empty @comment
-    present_doc = @comment.parse
-    refute_empty @comment
-    assert_empty RDoc::Comment.from_document(empty_doc)
-    refute_empty RDoc::Comment.from_document(present_doc)
-  end
-
-  def test_equals2
-    assert_equal @comment, @comment.dup
-
-    c2 = @comment.dup
-    c2.text = nil
-
-    refute_equal @comment, c2
-
-    c3 = @comment.dup
-    c3.location = nil
-
-    refute_equal @comment, c3
-  end
-
-  def test_extract_call_seq
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-
-moar comment
-    COMMENT
-
-    assert_equal "bla => true or false\n", comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_blank
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-
-    COMMENT
-
-    assert_equal "bla => true or false\n", comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_commented
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# call-seq:
-#   bla => true or false
-#
-# moar comment
-    COMMENT
-
-    assert_nil comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_no_blank
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-    COMMENT
-
-    assert_equal "bla => true or false\n", comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_undent
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-moar comment
-    COMMENT
-
-    assert_equal "bla => true or false\nmoar comment\n", comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_c
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-  commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-  commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-If no arguments are given:
-* ruby 1.8: returns a +Date+ for 1582-10-15 (the Day of Calendar Reform in
-  Italy)
-* ruby 1.9: returns a +Date+ for julian day 0
-
-Otherwise, returns a +Date+ for the commercial week year, commercial week,
-and commercial week day given. Ignores the 4th argument.
-    COMMENT
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-    CALL_SEQ
-
-    assert_equal expected, comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_c_no_blank
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-  commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-  commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-    COMMENT
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-    CALL_SEQ
-
-    assert_equal expected, comment.extract_call_seq
-  end
-
-  def test_extract_call_seq_c_separator
-    comment = RDoc::Comment.new <<-'COMMENT'
-call-seq:
-   ARGF.readlines(sep=$/)     -> array
-   ARGF.readlines(limit)      -> array
-   ARGF.readlines(sep, limit) -> array
-
-   ARGF.to_a(sep=$/)     -> array
-   ARGF.to_a(limit)      -> array
-   ARGF.to_a(sep, limit) -> array
-
-Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
-lines, one line per element. Lines are assumed to be separated by _sep_.
-
-   lines = ARGF.readlines
-   lines[0]                #=> "This is line one\n"
-
-    COMMENT
-
-    expected = <<-CALL_SEQ
-ARGF.readlines(sep=$/)     -> array
-ARGF.readlines(limit)      -> array
-ARGF.readlines(sep, limit) -> array
-ARGF.to_a(sep=$/)     -> array
-ARGF.to_a(limit)      -> array
-ARGF.to_a(sep, limit) -> array
-    CALL_SEQ
-
-    assert_equal expected, comment.extract_call_seq
-
-    expected = <<-'COMMENT'
-
-Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
-lines, one line per element. Lines are assumed to be separated by _sep_.
-
-   lines = ARGF.readlines
-   lines[0]                #=> "This is line one\n"
-
-    COMMENT
-
-    assert_equal expected, comment.text
-  end
-
-  # This test relies on AnyMethod#call_seq's behaviour as well
-  def test_extract_call_linear_performance
-    pre = ->(n) {[n, RDoc::Comment.new("\n"*n + 'call-seq:' + 'a'*n)]}
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-    assert_linear_performance((2..5).map {|i| 10**i}, pre: pre) do |n, comment|
-      method_obj.call_seq = comment.extract_call_seq
-      assert_equal n, method_obj.call_seq.size
-    end
-  end
-
-  def test_force_encoding
-    @comment = RDoc::Encoding.change_encoding @comment, Encoding::UTF_8
-
-    assert_equal Encoding::UTF_8, @comment.text.encoding
-  end
-
-  def test_format
-    assert_equal 'rdoc', @comment.format
-  end
-
-  def test_format_equals
-    c = comment 'content'
-    document = c.parse
-
-    c.format = RDoc::RD
-
-    assert_equal RDoc::RD, c.format
-    refute_same document, c.parse
-  end
-
-  def test_initialize_copy
-    copy = @comment.dup
-
-    refute_same @comment.text, copy.text
-    assert_same @comment.location, copy.location
-  end
-
-  def test_location
-    assert_equal @top_level, @comment.location
-  end
-
-  def test_normalize
-    @comment.text = <<-TEXT
-  # comment
-    TEXT
-    @comment.language = :ruby
-
-    assert_same @comment, @comment.normalize
-
-    assert_equal 'comment', @comment.text
-  end
-
-  def test_normalize_twice
-    @comment.text = <<-TEXT
-  # comment
-    TEXT
-
-    @comment.normalize
-
-    text = @comment.text
-
-    @comment.normalize
-
-    assert_same text, @comment.text, 'normalize not cached'
-  end
-
-  def test_normalize_document
-    @comment.text = nil
-    @comment.document = @RM::Document.new
-
-    assert_same @comment, @comment.normalize
-
-    assert_nil @comment.text
-  end
-
-  def test_normalize_eh
-    refute @comment.normalized?
-
-    @comment.normalize
-
-    assert @comment.normalized?
-  end
-
-  def test_text
-    assert_equal 'this is a comment', @comment.text
-  end
-
-  def test_text_equals
-    @comment.text = 'other'
-
-    assert_equal 'other', @comment.text
-    refute @comment.normalized?
-  end
-
-  def test_text_equals_no_text
-    c = RDoc::Comment.new nil, @top_level
-    c.document = @RM::Document.new
-
-    e = assert_raise RDoc::Error do
-      c.text = 'other'
-    end
-
-    assert_equal 'replacing document-only comment is not allowed', e.message
-  end
-
-  def test_text_equals_parsed
-    document = @comment.parse
-
-    @comment.text = 'other'
-
-    refute_equal document, @comment.parse
-  end
-
-  def test_tomdoc_eh
-    refute @comment.tomdoc?
-
-    @comment.format = 'tomdoc'
-
-    assert @comment.tomdoc?
-  end
-
-  def test_parse
-    parsed = @comment.parse
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new('this is a comment'))
-
-    expected.file = @top_level
-
-    assert_equal expected, parsed
-    assert_same  parsed, @comment.parse
-  end
-
-  def test_parse_rd
-    c = comment 'it ((*works*))'
-    c.format = 'rd'
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it <em>works</em>'))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_remove_private_encoding
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-  def test_remove_private_hash
-    @comment.text = <<-TEXT
-#--
-# private
-#++
-# public
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "# public\n", @comment.text
-  end
-
-  def test_remove_private_hash_trail
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_long
-    comment = RDoc::Comment.new <<-EOS, @top_level
-#-----
-#++
-# this is text
-#-----
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# this is text
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_rule
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text with a rule:
-# ---
-# this is also text
-    EOS
-
-    expected = comment.dup
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_star
-    @comment.text = <<-TEXT
-/*
- *--
- * private
- *++
- * public
- */
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "/*\n * public\n */\n", @comment.text
-  end
-
-  def test_remove_private_star2
-    @comment.text = <<-TEXT
-/*--
- * private
- *++
- * public
- */
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "/*--\n * private\n *++\n * public\n */\n", @comment.text
-  end
-
-  def test_remove_private_toggle
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-# This is text again.
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_toggle_encoding
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-  def test_remove_private_toggle_encoding_ruby_bug?
-    comment = RDoc::Comment.new <<-EOS, @top_level
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_constant_test.rb b/test/mri/rdoc/rdoc_constant_test.rb
deleted file mode 100644
index f9f795101c2..00000000000
--- a/test/mri/rdoc/rdoc_constant_test.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocConstantTest < XrefTestCase
-
-  def setup
-    super
-
-    @const = @c1.constants.first
-  end
-
-  def test_documented_eh
-    top_level = @store.add_file 'file.rb'
-
-    const = RDoc::Constant.new 'CONST', nil, nil
-    top_level.add_constant const
-
-    refute const.documented?
-
-    const.comment = comment 'comment'
-
-    assert const.documented?
-  end
-
-  def test_documented_eh_alias
-    top_level = @store.add_file 'file.rb'
-
-    const = RDoc::Constant.new 'CONST', nil, nil
-    top_level.add_constant const
-
-    refute const.documented?
-
-    const.is_alias_for = 'C1'
-
-    refute const.documented?
-
-    @c1.add_comment comment('comment'), @top_level
-
-    assert const.documented?
-  end
-
-  def test_full_name
-    assert_equal 'C1::CONST', @const.full_name
-  end
-
-  def test_is_alias_for
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'comment'
-    top_level.add_constant c
-
-    assert_nil c.is_alias_for
-
-    c.is_alias_for = 'C1'
-
-    assert_equal @c1, c.is_alias_for
-
-    c.is_alias_for = 'unknown'
-
-    assert_equal 'unknown', c.is_alias_for
-  end
-
-  def test_marshal_dump
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-
-    aliased = top_level.add_class RDoc::NormalClass, 'Aliased'
-    c.is_alias_for = aliased
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal c, loaded
-
-    assert_equal aliased,        loaded.is_alias_for
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-  end
-
-  def test_marshal_load
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal c, loaded
-
-    assert_nil                   loaded.is_alias_for
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-
-    assert                       loaded.display?
-  end
-
-  def test_marshal_load_version_0
-    top_level = @store.add_file 'file.rb'
-
-    aliased = top_level.add_class RDoc::NormalClass, 'Aliased'
-    cm      = top_level.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    loaded = Marshal.load "\x04\bU:\x13RDoc::Constant[\x0Fi\x00I" +
-                          "\"\nCONST\x06:\x06ETI\"\x11Klass::CONST\x06" +
-                          ";\x06T0I\"\fAliased\x06;\x06To" +
-                          ":\eRDoc::Markup::Document\a:\v@parts[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@file0I" +
-                          "\"\ffile.rb\x06;\x06TI\"\nKlass\x06" +
-                          ";\x06Tc\x16RDoc::NormalClass0"
-
-    loaded.store = @store
-
-    document = doc(para('this is a comment'))
-
-    assert_equal aliased,        loaded.is_alias_for
-    assert_equal document,       loaded.comment.parse
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-
-    assert loaded.display?
-  end
-
-  def test_marshal_round_trip
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-    c.is_alias_for = 'Unknown'
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    reloaded = Marshal.load Marshal.dump loaded
-    reloaded.store = @store
-
-    assert_equal section,   reloaded.section
-    assert_equal 'Unknown', reloaded.is_alias_for
-  end
-
-  def test_path
-    assert_equal 'C1.html#CONST', @const.path
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_context_section_test.rb b/test/mri/rdoc/rdoc_context_section_test.rb
deleted file mode 100644
index 179ea95014c..00000000000
--- a/test/mri/rdoc/rdoc_context_section_test.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocContextSectionTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-
-    @S = RDoc::Context::Section
-    @s = @S.new @klass, 'section', comment('# comment', @top_level, :ruby)
-  end
-
-  def test_add_comment
-    file1 = @store.add_file 'file1.rb'
-
-    klass = file1.add_class RDoc::NormalClass, 'Klass'
-
-    c1 = RDoc::Comment.new "# :section: section\n", file1
-    c2 = RDoc::Comment.new "# hello\n",             file1
-    c3 = RDoc::Comment.new "# world\n",             file1
-
-    s = @S.new klass, 'section', c1
-
-    assert_empty s.comments
-
-    s.add_comment nil
-
-    assert_empty s.comments
-
-    s.add_comment c2
-
-    assert_equal [c2], s.comments
-
-    s.add_comment c3
-
-    assert_equal [c2, c3], s.comments
-  end
-
-  def test_aref
-    assert_equal 'section', @s.aref
-
-    assert_equal '5Buntitled-5D', @S.new(nil, nil, nil).aref
-
-    assert_equal 'one+two', @S.new(nil, 'one two', nil).aref
-  end
-
-  def test_eql_eh
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert @s.eql? @s
-    assert @s.eql? @s.dup
-    refute @s.eql? other
-  end
-
-  def test_equals
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert_equal @s, @s
-    assert_equal @s, @s.dup
-    refute_equal @s, other
-  end
-
-  def test_extract_comment
-    assert_equal '',    @s.extract_comment(comment('')).text
-    assert_equal '',    @s.extract_comment(comment("# :section: b\n")).text
-    assert_equal '# c', @s.extract_comment(comment("# :section: b\n# c")).text
-    assert_equal '# c',
-                 @s.extract_comment(comment("# a\n# :section: b\n# c")).text
-  end
-
-  def test_hash
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert_equal @s.hash, @s.hash
-    assert_equal @s.hash, @s.dup.hash
-    refute_equal @s.hash, other.hash
-  end
-
-  def test_marshal_dump
-    loaded = Marshal.load Marshal.dump @s
-
-    expected = doc RDoc::Comment.new('comment', @top_level).parse
-
-    assert_equal 'section', loaded.title
-    assert_equal expected,  loaded.parse
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_marshal_dump_no_comment
-    s = @S.new @klass, 'section', comment('')
-
-    loaded = Marshal.load Marshal.dump s
-
-    assert_equal 'section', loaded.title
-    assert_empty            loaded.comments
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_marshal_load_version_0
-    loaded = Marshal.load "\x04\bU:\eRDoc::Context::Section" +
-                          "[\bi\x00I\"\fsection\x06:\x06EFo" +
-                          ":\eRDoc::Markup::Document\a:\v@parts" +
-                          "[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\fcomment\x06;\x06F:\n@fileI" +
-                          "\"\ffile.rb\x06;\x06F;\n0"
-
-    expected = doc RDoc::Comment.new('comment', @top_level).parse
-
-    assert_equal 'section', loaded.title
-    assert_equal expected,  loaded.parse
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_remove_comment_array
-    other = @store.add_file 'other.rb'
-
-    other_comment = comment('bogus', other)
-
-    @s.add_comment other_comment
-
-    @s.remove_comment comment('bogus', @top_level)
-
-    assert_equal [other_comment], @s.comments
-  end
-
-  def test_remove_comment_document
-    other = @store.add_file 'other.rb'
-
-    other_comment = comment('bogus', other)
-
-    @s.add_comment other_comment
-
-    loaded = Marshal.load Marshal.dump @s
-
-    loaded.remove_comment comment('bogus', @top_level)
-
-    assert_equal doc(other_comment.parse), loaded.parse
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_context_test.rb b/test/mri/rdoc/rdoc_context_test.rb
deleted file mode 100644
index eaa4f236219..00000000000
--- a/test/mri/rdoc/rdoc_context_test.rb
+++ /dev/null
@@ -1,958 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocContextTest < XrefTestCase
-
-  def setup
-    super
-
-    @context = RDoc::Context.new
-    @context.store = @store
-  end
-
-  def test_initialize
-    assert_empty @context.in_files
-    assert_equal 'unknown', @context.name
-    assert_equal '', @context.comment
-    assert_nil   @context.parent
-    assert_equal :public, @context.visibility
-    assert_equal 1, @context.sections.length
-    assert_nil   @context.temporary_section
-
-    assert_empty @context.classes_hash
-    assert_empty @context.modules_hash
-
-    assert_empty @context.method_list
-    assert_empty @context.attributes
-    assert_empty @context.aliases
-    assert_empty @context.requires
-    assert_empty @context.includes
-    assert_empty @context.constants
-  end
-
-  def test_add_alias
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-
-    @context.add_alias as
-
-    assert_equal [as], @context.external_aliases
-    assert_equal [as], @context.unmatched_alias_lists['#old_name']
-  end
-
-  def test_add
-    @context.add RDoc::Extend,  'Ext', 'comment'
-    @context.add RDoc::Include, 'Incl', 'comment'
-
-    refute_empty @context.extends
-    refute_empty @context.includes
-  end
-
-  def test_add_alias_method_attr
-    top_level = @store.add_file 'file.rb'
-
-    attr = RDoc::Attr.new nil, 'old_name', 'R', ''
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    as.record_location top_level
-    as.parent = @context
-
-    @context.add_attribute attr
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.attributes.map { |m| m.name }
-
-    new = @context.attributes.last
-    assert_equal top_level, new.file
-  end
-
-  def test_add_alias_method
-    top_level = @store.add_file 'file.rb'
-
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-    meth.singleton = false
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    as.record_location top_level
-    as.parent = @context
-
-    @context.add_method meth
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-
-    new = @context.method_list.last
-    assert_equal top_level, new.file
-  end
-
-  def test_add_alias_method_singleton
-    meth = RDoc::AnyMethod.new nil, 'old_name', singleton: true
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment', singleton: true
-
-    as.parent = @context
-
-    @context.add_method meth
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-
-    assert @context.method_list.last.singleton
-  end
-
-  def test_add_class
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass'
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass'
-  end
-
-  def test_add_class_basic_object
-    @xref_data.add_class RDoc::NormalClass, 'BasicObject'
-
-    basic = @xref_data.find_module_named 'BasicObject'
-
-    assert_nil basic.superclass
-
-    @c1.add_class RDoc::NormalClass, 'BasicObject'
-
-    basic = @c1.find_module_named 'BasicObject'
-
-    assert_equal @object, basic.superclass
-  end
-
-  def test_add_class_object
-    @xref_data.add_class RDoc::NormalClass, 'Object'
-
-    object = @xref_data.find_module_named 'Object'
-
-    assert_equal 'BasicObject', object.superclass
-
-    @c1.add_class RDoc::NormalClass, 'Object'
-
-    object = @c1.find_module_named 'Object'
-
-    assert_equal 'Object', object.superclass.full_name
-  end
-
-  def test_add_class_singleton
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass'
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass'
-  end
-
-  def test_add_class_superclass
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Other'
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    klass = @c1.find_module_named 'Klass'
-    assert_equal 'Other', klass.superclass
-  end
-
-  def test_add_class_upgrade
-    @c1.add_module RDoc::NormalModule, 'Klass'
-    @c1.add_class RDoc::NormalClass, 'Klass', nil
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass',
-                    'c1 classes'
-    refute_includes @c1.modules.map { |k| k.full_name }, 'C1::Klass',
-                    'c1 modules'
-
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass',
-                    'TopLevel classes'
-    refute_includes @store.all_modules.map { |k| k.full_name }, 'C1::Klass',
-                    'TopLevel modules'
-  end
-
-  def test_add_constant
-    const = RDoc::Constant.new 'NAME', 'value', 'comment'
-    @context.add_constant const
-
-    assert_equal [const], @context.constants
-  end
-
-  def test_add_extend
-    ext = RDoc::Extend.new 'Name', 'comment'
-    @context.add_extend ext
-
-    assert_equal [ext], @context.extends
-  end
-
-  def test_add_include
-    incl = RDoc::Include.new 'Name', 'comment'
-    @context.add_include incl
-
-    assert_equal [incl], @context.includes
-  end
-
-  def test_add_method
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-    meth.visibility = nil
-
-    @context.add_method meth
-
-    assert_equal [meth], @context.method_list
-    assert_equal :public, meth.visibility
-  end
-
-  def test_add_method_alias
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-
-    @context.add_alias as
-    refute_empty @context.external_aliases
-
-    @context.add_method meth
-
-    assert_empty @context.external_aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-  end
-
-  def test_add_method_duplicate
-    @store.options.verbosity = 2
-
-    meth1 = RDoc::AnyMethod.new nil, 'name'
-    meth1.record_location @store.add_file 'first.rb'
-    meth1.visibility = nil
-    meth1.comment = comment 'first'
-
-    @context.add_method meth1
-
-    meth2 = RDoc::AnyMethod.new nil, 'name'
-    meth2.record_location @store.add_file 'second.rb'
-    meth2.comment = comment 'second'
-
-    _, err = verbose_capture_output do
-      @context.add_method meth2
-    end
-
-    expected = 'Duplicate method (unknown)#name in file second.rb, ' \
-               'previously in file first.rb'
-
-    assert_equal expected, err.chomp
-
-    method = @context.method_list.first
-
-    assert_equal 'first', method.comment.text
-  end
-
-  def test_add_method_duplicate_loading
-    @context.store = nil
-
-    meth1 = RDoc::AnyMethod.new nil, 'name'
-    meth1.record_location @store.add_file 'first.rb'
-    meth1.visibility = nil
-    meth1.comment = comment 'first'
-
-    @context.add_method meth1
-
-    meth2 = RDoc::AnyMethod.new nil, 'name'
-    meth2.record_location @store.add_file 'second.rb'
-    meth2.comment = comment 'second'
-
-    _, err = verbose_capture_output do
-      @context.add_method meth2
-    end
-
-    assert_empty err
-
-    method = @context.method_list.first
-
-    assert_equal 'first', method.comment.text
-  end
-
-  def test_add_module
-    @c1.add_module RDoc::NormalModule, 'Mod'
-
-    assert_includes @c1.modules.map { |m| m.full_name }, 'C1::Mod'
-  end
-
-  def test_add_module_alias
-    tl = @store.add_file 'file.rb'
-
-    c4 = RDoc::Constant.new 'C4', '', ''
-    c3_c4 = @c2.add_module_alias @c2_c3, @c2_c3.name, c4, tl
-
-    alias_constant = @c2.constants.first
-
-    assert_equal 'C2::C4', c3_c4.full_name
-    assert_equal tl, alias_constant.file
-  end
-
-  def test_add_module_alias_top_level
-    store = RDoc::Store.new(RDoc::Options.new)
-
-    top_level = store.add_file 'file.rb'
-
-    klass  = top_level.add_class RDoc::NormalClass, 'Klass'
-    klass.comment = 'klass comment'
-
-    object = top_level.add_class RDoc::NormalClass, 'Object'
-
-    a = RDoc::Constant.new 'A', '', ''
-    top_level.add_module_alias klass, klass.name, a, top_level
-
-    refute_empty object.constants
-
-    constant = object.constants.first
-
-    assert_equal 'klass comment', constant.comment
-  end
-
-  def test_add_module_class
-    k = @c1.add_class RDoc::NormalClass, 'Klass', nil
-    m = @c1.add_module RDoc::NormalModule, 'Klass'
-
-    assert_equal k, m, 'returns class'
-    assert_empty @c1.modules
-  end
-
-  def test_add_require
-    req = RDoc::Require.new 'require', 'comment'
-    @c1.add_require req
-
-    assert_empty @c1.requires
-    assert_includes @c1.top_level.requires, req
-  end
-
-  def test_add_section
-    default_section = @context.sections.first
-
-    @context.add_section nil, comment('comment', @top_level)
-
-    assert_equal 1, @context.sections.length
-    assert_equal [comment("comment", @top_level)],
-                 @context.sections.first.comments
-
-    @context.add_section nil, comment('new comment', @top_level)
-
-    assert_equal 1, @context.sections.length
-    assert_equal [comment('comment', @top_level),
-                  comment('new comment', @top_level)],
-                 @context.sections.first.comments
-
-    @context.add_section 'other', comment('', @top_level)
-
-    assert_equal 2, @context.sections.length
-
-    new_section = @context.sections.find { |section| section.title == 'other' }
-    assert new_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_add_section_no_comment
-    default_section = @context.sections.first
-
-    @context.add_section nil
-
-    assert_equal 1, @context.sections.length
-
-    @context.add_section 'other'
-
-    assert_equal 2, @context.sections.length
-
-    new_section = @context.sections.find { |section| section.title == 'other' }
-
-    assert new_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_add_to
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.add_to arr, incl
-
-    assert_includes arr, incl
-    assert_equal @context, incl.parent
-    assert_equal @context.current_section, incl.section
-  end
-
-  def test_add_to_temporary_section
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    section =
-      @context.add_section 'temporary', RDoc::Comment.new('', @top_level)
-    @context.temporary_section = section
-
-    @context.add_to arr, incl
-
-    assert_includes arr, incl
-    assert_equal @context, incl.parent
-    assert_equal section, incl.section
-  end
-
-  def test_add_to_no_document_self
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.document_self = false
-    @context.add_to arr, incl
-
-    refute_includes arr, incl
-  end
-
-  def test_add_to_done_documenting
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.done_documenting = true
-    @context.add_to arr, incl
-
-    refute_includes arr, incl
-  end
-
-  def bench_add_include
-    cm = RDoc::ClassModule.new 'Klass'
-
-    assert_performance_linear 0.5 do |count|
-      count.times do |i|
-        cm.add_include RDoc::Include.new("N::M#{i}", nil)
-      end
-    end
-  end
-
-  def test_child_name
-    assert_equal 'C1::C1', @c1.child_name('C1')
-  end
-
-  def test_classes
-    assert_equal %w[C2::C3], @c2.classes.map { |k| k.full_name }
-    assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name }.sort
-  end
-
-  def test_current_section
-    default_section = @context.current_section
-
-    new_section =
-      @context.add_section 'other', RDoc::Comment.new('', @top_level)
-    @context.temporary_section = new_section
-
-    assert_equal new_section, @context.current_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_equals2
-    assert_equal @c3,    @c3
-    refute_equal @c2,    @c3
-    refute_equal @c2_c3, @c3
-  end
-
-  def test_each_method_enumerator
-    assert_kind_of Enumerator, @c1.each_method
-  end
-
-  def test_each_section
-    sects  = []
-    consts = []
-    attrs  = []
-
-    @c1.each_section do |section, constants, attributes|
-      sects  << section
-      consts << constants
-      attrs  << attributes
-    end
-
-    assert_equal [nil, 'separate'], sects.map { |section| section.title }
-
-    expected_consts = [
-      [@c1.constants.first],
-      [],
-    ]
-
-    assert_equal expected_consts, consts
-
-    expected_attrs = [
-      [@c1.attributes[0], @c1.attributes[3]],
-      [@c1.attributes[1], @c1.attributes[2]],
-    ]
-
-    assert_equal expected_attrs, attrs
-  end
-
-  def test_each_section_only_display
-    sects  = []
-    consts = []
-    attrs  = []
-
-    @c7.each_section do |section, constants, attributes|
-      sects  << section
-      consts << constants
-      attrs  << attributes
-    end
-
-    assert_equal [nil], sects.map { |section| section.title }
-
-    expected_consts = [
-      @c7.constants.select(&:display?).sort
-    ]
-
-    assert_equal expected_consts, consts
-
-    expected_attrs = [
-      @c7.attributes.select(&:display?).sort
-    ]
-
-    assert_equal expected_attrs, attrs
-  end
-
-  def test_each_section_enumerator
-    assert_kind_of Enumerator, @c1.each_section
-  end
-
-  def test_find_attribute_named
-    assert_nil         @c1.find_attribute_named('none')
-    assert_equal 'R',  @c1.find_attribute_named('attr').rw
-    assert_equal 'R',  @c1.find_attribute_named('attr_reader').rw
-    assert_equal 'W',  @c1.find_attribute_named('attr_writer').rw
-    assert_equal 'RW', @c1.find_attribute_named('attr_accessor').rw
-  end
-
-  def test_find_class_method_named
-    assert_nil @c1.find_class_method_named('none')
-
-    m = @c1.find_class_method_named('m')
-    assert_instance_of RDoc::AnyMethod, m
-    assert m.singleton
-  end
-
-  def test_find_constant_named
-    assert_nil             @c1.find_constant_named('NONE')
-    assert_equal ':const', @c1.find_constant_named('CONST').value
-  end
-
-  def test_find_enclosing_module_named
-    assert_nil        @c2_c3.find_enclosing_module_named('NONE')
-    assert_equal @c1, @c2_c3.find_enclosing_module_named('C1')
-    assert_equal @c2, @c2_c3.find_enclosing_module_named('C2')
-  end
-
-  def test_find_instance_method_named
-    assert_nil @c1.find_instance_method_named('none')
-
-    m = @c1.find_instance_method_named('m')
-    assert_instance_of RDoc::AnyMethod, m
-    refute m.singleton
-  end
-
-  def test_find_local_symbol
-    assert_equal true,       @c1.find_local_symbol('m').singleton
-    assert_equal ':const',   @c1.find_local_symbol('CONST').value
-    assert_equal 'R',        @c1.find_local_symbol('attr').rw
-    assert_equal @xref_data, @c1.find_local_symbol(@file_name)
-    assert_equal @c2_c3,     @c2.find_local_symbol('C3')
-  end
-
-  def test_find_method
-    loaded_c2 = Marshal.load Marshal.dump @c2
-    assert_equal @c2_a, loaded_c2.find_method('a', false)
-    assert_equal @c2_b, loaded_c2.find_method('b', false)
-    assert_equal @c2_a, loaded_c2.find_method('a', nil)
-    assert_equal @c2_b, loaded_c2.find_method('b', nil)
-  end
-
-  def test_find_method_named
-    assert_equal true, @c1.find_method_named('m').singleton
-  end
-
-  def test_find_module_named
-    assert_equal @c2_c3, @c2.find_module_named('C3')
-    assert_equal @c2,    @c2.find_module_named('C2')
-    assert_equal @c1,    @c2.find_module_named('C1')
-
-    assert_equal 'C2::C3', @c2.find_module_named('C3').full_name
-  end
-
-  def test_find_symbol
-    c3 = @xref_data.find_module_named('C3')
-    assert_equal c3,     @xref_data.find_symbol('C3')
-    assert_equal c3,     @c2.find_symbol('::C3')
-    assert_equal @c2_c3, @c2.find_symbol('C3')
-  end
-
-  def test_find_symbol_method
-    assert_equal @c1__m, @c1.find_symbol('m')
-    assert_equal @c1_m,  @c1.find_symbol('#m')
-    assert_equal @c1__m, @c1.find_symbol('::m')
-  end
-
-  def test_find_symbol_module
-    assert_nil @m1_m2.find_symbol_module 'N'
-    assert_nil @m1_m2.find_symbol_module 'M2::M1'
-
-    @m1_m2.parent = nil # loaded from legacy ri store
-
-    assert_nil @m1_m2.find_symbol_module 'N'
-    assert_nil @m1_m2.find_symbol_module 'M2::M1'
-  end
-
-  def test_fully_documented_eh
-    context = RDoc::Context.new
-
-    refute context.fully_documented?
-
-    context.comment = 'hi'
-
-    assert context.fully_documented?
-
-    m = @c1_m
-
-    context.add_method m
-
-    refute context.fully_documented?
-
-    m.comment = 'hi'
-
-    assert context.fully_documented?
-
-    c = RDoc::Constant.new 'C', '0', nil
-
-    context.add_constant c
-
-    refute context.fully_documented?
-
-    c.comment = 'hi'
-
-    assert context.fully_documented?
-
-    a = RDoc::Attr.new '', 'a', 'RW', nil
-
-    context.add_attribute a
-
-    refute context.fully_documented?
-
-    a.comment = 'hi'
-
-    assert context.fully_documented?
-  end
-
-  def test_spaceship
-    assert_equal(-1, @c2.<=>(@c3))
-    assert_equal 0,  @c2.<=>(@c2)
-    assert_equal 1,  @c3.<=>(@c2)
-
-    assert_equal 1,  @c2_c3.<=>(@c2)
-    assert_equal(-1, @c2_c3.<=>(@c3))
-
-    assert_nil @c2.<=>(Gem.loaded_specs.values.first)
-  end
-
-  def test_methods_by_type
-    expected = {
-      'instance' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1_plus, @c1_m],
-      },
-      'class' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1__m],
-      },
-    }
-
-    assert_equal expected, @c1.methods_by_type
-  end
-
-  def test_methods_by_type_section
-    separate = @c1.sections_hash['separate']
-    @c1_m.section = separate
-
-    expected = {
-      'instance' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1_m],
-      },
-      'class' => {
-        :private   => [],
-        :protected => [],
-        :public    => [],
-      },
-    }
-
-    assert_equal expected, @c1.methods_by_type(separate)
-  end
-
-  def test_methods_matching
-    methods = []
-
-    @parent.methods_matching 'm' do |m|
-      methods << m
-    end
-
-    assert_equal [@parent_m], methods
-  end
-
-  def test_methods_matching_singleton
-    methods = []
-
-    @parent.methods_matching 'm', true do |m|
-      methods << m
-    end
-
-    assert_equal [@parent__m], methods
-  end
-
-  def test_methods_matching_inherit
-    methods = []
-
-    @child.methods_matching 'm' do |m|
-      methods << m
-    end
-
-    assert_equal [@parent_m], methods
-  end
-
-  def test_remove_invisible_private
-    util_visibilities
-
-    @vis.remove_invisible :private
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_nodoc
-    util_visibilities
-
-    @vis.remove_invisible :nodoc
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_protected
-    util_visibilities
-
-    @vis.remove_invisible :protected
-
-    assert_equal [@pub, @prot], @vis.method_list
-    assert_equal [@apub, @aprot], @vis.attributes
-    assert_equal [@cpub], @vis.constants
-  end
-
-  def test_remove_invisible_public
-    util_visibilities
-
-    @vis.remove_invisible :public
-
-    assert_equal [@pub], @vis.method_list
-    assert_equal [@apub], @vis.attributes
-    assert_equal [@cpub], @vis.constants
-  end
-
-  def test_remove_invisible_public_force
-    util_visibilities
-
-    @priv.force_documentation = true
-    @prot.force_documentation = true
-    @apriv.force_documentation = true
-    @aprot.force_documentation = true
-    @cpriv.force_documentation = true
-
-    @vis.remove_invisible :public
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_in_protected
-    util_visibilities
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :protected
-
-    assert_equal [@pub, @prot], methods
-  end
-
-  def test_remove_invisible_in_protected_force
-    util_visibilities
-
-    @priv.force_documentation = true
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :protected
-
-    assert_equal [@pub, @prot, @priv], methods
-  end
-
-  def test_remove_invisible_in_public
-    util_visibilities
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :public
-
-    assert_equal [@pub], methods
-  end
-
-  def test_remove_invisible_in_public_force
-    util_visibilities
-
-    @prot.force_documentation = true
-    @priv.force_documentation = true
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :public
-
-    assert_equal [@pub, @prot, @priv], methods
-  end
-
-  def test_section_contents
-    default = @context.sections.first
-    @context.add_method RDoc::AnyMethod.new(nil, 'm1')
-
-    b = @context.add_section 'B'
-    m = @context.add_method RDoc::AnyMethod.new(nil, 'm2')
-    m.section = b
-
-    assert_equal [default, b], @context.section_contents
-  end
-
-  def test_section_contents_no_default
-    @context = RDoc::Context.new
-    b = @context.add_section 'B'
-    m = @context.add_method RDoc::AnyMethod.new(nil, 'm')
-    m.section = b
-
-    assert_equal [b], @context.section_contents
-  end
-
-  def test_section_contents_only_default
-    @context = RDoc::Context.new
-
-    @context.add_method RDoc::AnyMethod.new(nil, 'm')
-
-    assert_empty @context.section_contents
-  end
-
-  def test_section_contents_unused
-    @context = RDoc::Context.new
-
-    @context.add_method RDoc::AnyMethod.new(nil, 'm')
-    @context.add_section 'B'
-
-    assert_empty @context.section_contents
-  end
-
-  def test_set_current_section
-    default_section = @context.sections.first
-
-    @context.set_current_section nil, RDoc::Comment.new('', @top_level)
-
-    assert_equal default_section, @context.current_section
-
-    @context.set_current_section 'other', RDoc::Comment.new('', @top_level)
-
-    new_section = @context.sections.find { |section|
-      section != default_section
-    }
-
-    assert_equal new_section, @context.current_section
-  end
-
-  def test_sort_sections
-    c = RDoc::Context.new
-    c.add_section 'C'
-    c.add_section 'A'
-    c.add_section 'B'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'A', 'B', 'C'], titles
-  end
-
-  def test_sort_sections_tomdoc
-    c = RDoc::Context.new
-    c.add_section 'Public'
-    c.add_section 'Internal'
-    c.add_section 'Deprecated'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'Public', 'Internal', 'Deprecated'], titles
-  end
-
-  def test_sort_sections_tomdoc_missing
-    c = RDoc::Context.new
-    c.add_section 'Internal'
-    c.add_section 'Public'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'Public', 'Internal'], titles
-  end
-
-  def test_visibility_def
-    assert_equal :private, @c6.find_method_named('priv1').visibility
-    assert_equal :protected, @c6.find_method_named('prot1').visibility
-    assert_equal :public, @c6.find_method_named('pub1').visibility
-    assert_equal :private, @c6.find_method_named('priv2').visibility
-    assert_equal :protected, @c6.find_method_named('prot2').visibility
-    assert_equal :public, @c6.find_method_named('pub2').visibility
-    assert_equal :private, @c6.find_method_named('priv3').visibility
-    assert_equal :protected, @c6.find_method_named('prot3').visibility
-    assert_equal :public, @c6.find_method_named('pub3').visibility
-    assert_equal :private, @c6.find_method_named('priv4').visibility
-    assert_equal :protected, @c6.find_method_named('prot4').visibility
-    assert_equal :public, @c6.find_method_named('pub4').visibility
-    assert_equal :private, @c6.find_method_named('priv5').visibility
-    assert_equal :protected, @c6.find_method_named('prot5').visibility
-    assert_equal :public, @c6.find_method_named('pub5').visibility
-    assert_equal :private, @c6.find_method_named('priv6').visibility
-    assert_equal :protected, @c6.find_method_named('prot6').visibility
-    assert_equal :public, @c6.find_method_named('pub6').visibility
-    assert_equal :public, @c6.find_method_named('s_pub1').visibility
-    assert_equal :public, @c6.find_method_named('s_pub2').visibility
-    assert_equal :public, @c6.find_method_named('s_pub3').visibility
-    assert_equal :public, @c6.find_method_named('s_pub4').visibility
-    assert_equal :private, @c6.find_method_named('s_priv1').visibility
-    assert_equal :protected, @c6.find_method_named('s_prot1').visibility
-  end
-
-  def util_visibilities
-    @pub  = RDoc::AnyMethod.new nil, 'pub'
-    @prot = RDoc::AnyMethod.new nil, 'prot'
-    @priv = RDoc::AnyMethod.new nil, 'priv'
-
-    @apub  = RDoc::Attr.new nil, 'pub',  'RW', nil
-    @aprot = RDoc::Attr.new nil, 'prot', 'RW', nil
-    @apriv = RDoc::Attr.new nil, 'priv', 'RW', nil
-
-    @cpub  = RDoc::Constant.new 'CONST_PUBLIC', nil, nil
-    @cpriv = RDoc::Constant.new 'CONST_PRIVATE', nil, nil
-
-    @vis = RDoc::NormalClass.new 'Vis'
-    @vis.add_method @pub
-    @vis.add_method @prot
-    @vis.add_method @priv
-
-    @vis.add_attribute @apub
-    @vis.add_attribute @aprot
-    @vis.add_attribute @apriv
-
-    @vis.add_constant @cpub
-    @vis.add_constant @cpriv
-
-    @prot.visibility = :protected
-    @priv.visibility = :private
-
-    @aprot.visibility = :protected
-    @apriv.visibility = :private
-
-    @cpriv.visibility = :private
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_cross_reference_test.rb b/test/mri/rdoc/rdoc_cross_reference_test.rb
deleted file mode 100644
index 4f24fd77009..00000000000
--- a/test/mri/rdoc/rdoc_cross_reference_test.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocCrossReferenceTest < XrefTestCase
-  EXAMPLE_METHODS = %w'== === != =~ !~ < > <= >= <=> [] []= << >>
-    -@ +@ ! - + * / % ** !@ ` | & ^ ~ __id__
-  '
-
-  def setup
-    super
-
-    @xref = RDoc::CrossReference.new @c1
-  end
-
-  def assert_ref(expected, name)
-    assert_equal expected, @xref.resolve(name, 'fail')
-  end
-
-  def refute_ref(name)
-    assert_equal name, @xref.resolve(name, name)
-  end
-
-  def test_METHOD_REGEXP_STR
-    re = /\A(?:#{RDoc::CrossReference::METHOD_REGEXP_STR})\z/
-
-    EXAMPLE_METHODS.each do |x|
-      re =~ x
-      assert_equal x, $&
-    end
-  end
-
-  def test_resolve_C2
-    @xref = RDoc::CrossReference.new @c2
-
-    refute_ref '#m'
-
-    assert_ref @c1__m,    'C1::m'
-    assert_ref @c2_c3,    'C2::C3'
-    assert_ref @c2_c3_m,  'C2::C3#m'
-    assert_ref @c2_c3_h1, 'C3::H1'
-    assert_ref @c4,       'C4'
-
-    assert_ref @c3_h2, 'C3::H2'
-    refute_ref 'H1'
-  end
-
-  def test_resolve_C2_C3
-    @xref = RDoc::CrossReference.new @c2_c3
-
-    assert_ref @c2_c3_m, '#m'
-
-    assert_ref @c2_c3, 'C3'
-    assert_ref @c2_c3_m, 'C3#m'
-
-    assert_ref @c2_c3_h1, 'H1'
-    assert_ref @c2_c3_h1, 'C3::H1'
-
-    assert_ref @c4, 'C4'
-
-    assert_ref @c3_h2, 'C3::H2'
-  end
-
-  def test_resolve_C3
-    @xref = RDoc::CrossReference.new @c3
-
-    assert_ref @c3, 'C3'
-
-    refute_ref '#m'
-    refute_ref 'C3#m'
-
-    assert_ref @c3_h1, 'H1'
-
-    assert_ref @c3_h1, 'C3::H1'
-    assert_ref @c3_h2, 'C3::H2'
-
-    assert_ref @c4, 'C4'
-  end
-
-  def test_resolve_C4
-    @xref = RDoc::CrossReference.new @c4
-
-    # C4 ref inside a C4 containing a C4 should resolve to the contained class
-    assert_ref @c4_c4, 'C4'
-  end
-
-  def test_resolve_C4_C4
-    @xref = RDoc::CrossReference.new @c4_c4
-
-    # A C4 reference inside a C4 class contained within a C4 class should
-    # resolve to the inner C4 class.
-    assert_ref @c4_c4, 'C4'
-  end
-
-  def test_resolve_class_and_method_of_the_same_name
-    assert_ref @c10_class, 'C10'
-    assert_ref @c10_method, '#C10'
-    assert_ref @c11_class, 'C11'
-    assert_ref @c11_method, '#C11'
-    assert_ref @c10_c11_class, 'C10::C11'
-    assert_ref @c10_c11_method, 'C10#C11'
-  end
-
-  def test_resolve_class
-    assert_ref @c1, 'C1'
-    refute_ref 'H1'
-
-    assert_ref @c2,       'C2'
-    assert_ref @c2_c3,    'C2::C3'
-    assert_ref @c2_c3_h1, 'C2::C3::H1'
-
-    assert_ref @c3,    '::C3'
-    assert_ref @c3_h1, '::C3::H1'
-
-    assert_ref @c4_c4, 'C4::C4'
-  end
-
-  def test_resolve_file
-    refute_ref 'xref_data.rb'
-  end
-
-  def test_resolve_method
-    assert_ref @c1__m,    'm'
-    assert_ref @c1__m,    '::m'
-    assert_ref @c1_m,     '#m'
-    assert_ref @c1_plus,  '#+'
-
-    assert_ref @c1_m,     'C1#m'
-    assert_ref @c1_plus,  'C1#+'
-    assert_ref @c1__m,    'C1.m'
-    assert_ref @c1__m,    'C1::m'
-
-    assert_ref @c1_m, 'C1#m'
-    assert_ref @c1_m, 'C1#m()'
-    assert_ref @c1_m, 'C1#m(*)'
-
-    assert_ref @c1_plus, 'C1#+'
-    assert_ref @c1_plus, 'C1#+()'
-    assert_ref @c1_plus, 'C1#+(*)'
-
-    assert_ref @c1__m, 'C1.m'
-    assert_ref @c1__m, 'C1.m()'
-    assert_ref @c1__m, 'C1.m(*)'
-
-    assert_ref @c1__m, 'C1::m'
-    assert_ref @c1__m, 'C1::m()'
-    assert_ref @c1__m, 'C1::m(*)'
-
-    assert_ref @c2_c3_m, 'C2::C3#m'
-
-    assert_ref @c2_c3_m, 'C2::C3.m'
-
-    # TODO stop escaping - HTML5 allows anything but space
-    assert_ref @c2_c3_h1_meh, 'C2::C3::H1#m?'
-
-    assert_ref @c2_c3_m, '::C2::C3#m'
-    assert_ref @c2_c3_m, '::C2::C3#m()'
-    assert_ref @c2_c3_m, '::C2::C3#m(*)'
-  end
-
-  def test_resolve_the_same_name_in_instance_and_class_method
-    assert_ref @c9_a_i_foo, 'C9::A#foo'
-    assert_ref @c9_a_c_bar, 'C9::A::bar'
-    assert_ref @c9_b_c_foo, 'C9::B::foo'
-    assert_ref @c9_b_i_bar, 'C9::B#bar'
-    assert_ref @c9_b_c_foo, 'C9::B.foo'
-    assert_ref @c9_a_c_bar, 'C9::B.bar'
-  end
-
-  def test_resolve_page
-    page = @store.add_file 'README.txt', parser: RDoc::Parser::Simple
-
-    assert_ref page, 'README'
-  end
-
-  def assert_resolve_method(x)
-    @c1.methods_hash.clear
-
-    i_op = RDoc::AnyMethod.new nil, x
-    @c1.add_method i_op
-
-    c_op = RDoc::AnyMethod.new nil, x, singleton: true
-    @c1.add_method c_op
-
-    assert_ref i_op, x
-    assert_ref i_op, "##{x}"
-    assert_ref c_op, "::#{x}"
-
-    assert_ref i_op, "C1##{x}"
-    assert_ref c_op, "C1::#{x}"
-  end
-
-  EXAMPLE_METHODS.each do |x|
-    define_method("test_resolve_method:#{x}") do
-      assert_resolve_method(x)
-    end
-  end
-
-  def test_resolve_no_ref
-    assert_equal '', @xref.resolve('', '')
-
-    assert_equal "bogus",     @xref.resolve("bogus",     "bogus")
-    assert_equal "\\bogus",   @xref.resolve("\\bogus",   "\\bogus")
-    assert_equal "\\\\bogus", @xref.resolve("\\\\bogus", "\\\\bogus")
-
-    assert_equal "\\#n",    @xref.resolve("\\#n",    "fail")
-    assert_equal "\\#n()",  @xref.resolve("\\#n()",  "fail")
-    assert_equal "\\#n(*)", @xref.resolve("\\#n(*)", "fail")
-
-    assert_equal "C1",   @xref.resolve("\\C1",   "fail")
-    assert_equal "::C3", @xref.resolve("\\::C3", "fail")
-
-    assert_equal "succeed",      @xref.resolve("::C3::H1#n",    "succeed")
-    assert_equal "succeed",      @xref.resolve("::C3::H1#n(*)", "succeed")
-    assert_equal "\\::C3::H1#n", @xref.resolve("\\::C3::H1#n",  "fail")
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_encoding_test.rb b/test/mri/rdoc/rdoc_encoding_test.rb
deleted file mode 100644
index fdb42afd7fd..00000000000
--- a/test/mri/rdoc/rdoc_encoding_test.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocEncodingTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new 'test_rdoc_encoding'
-  end
-
-  def teardown
-    @tempfile.close!
-
-    super
-  end
-
-  def test_class_read_file
-    @tempfile.write "hi everybody"
-    @tempfile.flush
-
-    assert_equal "hi everybody", RDoc::Encoding.read_file(@tempfile.path, nil)
-  end
-
-  def test_class_read_file_encoding
-    expected = "# coding: utf-8\nhi everybody"
-
-    @tempfile.write expected
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal "# coding: utf-8\nhi everybody", contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_read_file_encoding_convert
-    content = ""
-    content = RDoc::Encoding.change_encoding content, 'ISO-8859-1'
-    content << "# coding: ISO-8859-1\nhi \xE9verybody"
-
-    @tempfile.write content
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal Encoding::UTF_8, contents.encoding
-    assert_equal "# coding: ISO-8859-1\nhi \u00e9verybody", contents.sub("\r", '')
-  end
-
-  def test_class_read_file_encoding_fail
-    @tempfile.write "# coding: utf-8\n\317\200" # pi
-    @tempfile.flush
-
-    contents = :junk
-
-    _, err = verbose_capture_output do
-      contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII
-    end
-
-    assert_nil contents
-
-    assert_match %r%^unable to convert%, err
-  end
-
-  def test_class_read_file_encoding_fancy
-    expected = "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody"
-    expected = RDoc::Encoding.change_encoding expected, Encoding::UTF_8
-
-    @tempfile.write expected
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody", contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_read_file_encoding_force_transcode
-    @tempfile.write "# coding: utf-8\n\317\200" # pi
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII, true
-
-    assert_equal "# coding: utf-8\n?", contents
-    assert_equal Encoding::US_ASCII, contents.encoding
-  end
-
-  def test_class_read_file_encoding_guess
-    path = File.expand_path '../test.ja.txt', __FILE__
-    content = RDoc::Encoding.read_file path, Encoding::UTF_8
-
-    assert_equal Encoding::UTF_8, content.encoding
-  end
-
-  def test_class_read_file_encoding_invalid
-    @tempfile.write "# coding: ascii\nM\xE4r"
-    @tempfile.flush
-
-    contents = :junk
-    _, err = verbose_capture_output do
-      contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    end
-
-    assert_equal "unable to convert \"\\xE4\" on US-ASCII for #{@tempfile.path}, skipping\n", err
-
-    assert_nil contents
-  end
-
-  def test_class_read_file_encoding_with_signature
-    @tempfile.write "\xEF\xBB\xBFhi everybody"
-    @tempfile.flush
-
-    bug3360 = '[ruby-dev:41452]'
-    content = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal Encoding::UTF_8, content.encoding, bug3360
-    assert_equal "hi everybody", content, bug3360
-  end
-
-  def test_class_read_file_encoding_iso_2022_jp
-    input = "# coding: ISO-2022-JP\n:\e$B%3%^%s%I\e(B:"
-
-    @tempfile.write input
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-
-    expected = "# coding: ISO-2022-JP\n:\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89:"
-    expected = RDoc::Encoding.change_encoding expected, Encoding::UTF_8
-
-    assert_equal expected, contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_detect_encoding
-    s = "# coding: UTF-8\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    # sanity check for 1.8
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "#!/bin/ruby\n# coding: UTF-8\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "<?xml version='1.0' encoding='UTF-8'?>\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "<?xml version='1.0' encoding=\"UTF-8\"?>\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-  end
-
-  def test_class_set_encoding_bad
-    s = ""
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    s = "# vim:set fileencoding=utf-8:\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    s = "# vim:set fileencoding=utf-8:\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    assert_raise ArgumentError do
-      s = RDoc::Encoding.detect_encoding "# -*- encoding: undecided -*-\n"
-    end
-  end
-
-  def test_sanity
-    assert_equal Encoding::US_ASCII, ''.encoding,
-                 'If this file is not ASCII tests may incorrectly pass'
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_extend_test.rb b/test/mri/rdoc/rdoc_extend_test.rb
deleted file mode 100644
index cf13eba0c51..00000000000
--- a/test/mri/rdoc/rdoc_extend_test.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocExtendTest < XrefTestCase
-
-  def setup
-    super
-
-    @ext = RDoc::Extend.new 'M1', 'comment'
-    @ext.parent = @m1
-    @ext.store = @store
-  end
-
-  def test_module
-    assert_equal @m1, @ext.module
-    assert_equal 'Unknown', RDoc::Extend.new('Unknown', 'comment').module
-  end
-
-  def test_module_extended
-    m1 = @xref_data.add_module RDoc::NormalModule, 'Mod1'
-                  m1.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2       = m1.add_module RDoc::NormalModule, 'Mod2'
-    m1_m2_m3    = m1_m2.add_module RDoc::NormalModule, 'Mod3'
-                  m1_m2_m3.add_module RDoc::NormalModule, 'Mod4'
-                  m1_m2.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_k0    = m1_m2.add_class RDoc::NormalClass, 'Klass0'
-    m1_m2_k0_m4 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod4'
-                  m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod6'
-                  m1_m2_k0.add_module RDoc::NormalModule, 'Mod5'
-
-    e0_m4 = RDoc::Extend.new 'Mod4', nil
-    e0_m5 = RDoc::Extend.new 'Mod5', nil
-    e0_m6 = RDoc::Extend.new 'Mod6', nil
-    e0_m1 = RDoc::Extend.new 'Mod1', nil
-    e0_m2 = RDoc::Extend.new 'Mod2', nil
-    e0_m3 = RDoc::Extend.new 'Mod3', nil
-
-    m1_m2_k0.add_extend e0_m4
-    m1_m2_k0.add_extend e0_m5
-    m1_m2_k0.add_extend e0_m6
-    m1_m2_k0.add_extend e0_m1
-    m1_m2_k0.add_extend e0_m2
-    m1_m2_k0.add_extend e0_m3
-
-    assert_equal [e0_m4, e0_m5, e0_m6, e0_m1, e0_m2, e0_m3], m1_m2_k0.extends
-    assert_equal [@object, 'BasicObject'], m1_m2_k0.ancestors
-
-    m1_k1 = m1.add_class RDoc::NormalClass, 'Klass1'
-
-    e1_m1 = RDoc::Extend.new 'Mod1', nil
-    e1_m2 = RDoc::Extend.new 'Mod2', nil
-    e1_m3 = RDoc::Extend.new 'Mod3', nil
-    e1_m4 = RDoc::Extend.new 'Mod4', nil
-    e1_k0_m4 = RDoc::Extend.new 'Klass0::Mod4', nil
-
-    m1_k1.add_extend e1_m1
-    m1_k1.add_extend e1_m2
-    m1_k1.add_extend e1_m3
-    m1_k1.add_extend e1_m4
-    m1_k1.add_extend e1_k0_m4
-
-    assert_equal [e1_m1, e1_m2, e1_m3, e1_m4, e1_k0_m4], m1_k1.extends
-    assert_equal [@object, 'BasicObject'], m1_k1.ancestors
-
-    m1_k2 = m1.add_class RDoc::NormalClass, 'Klass2'
-
-    e2_m1 = RDoc::Extend.new 'Mod1', nil
-    e2_m2 = RDoc::Extend.new 'Mod2', nil
-    e2_m3 = RDoc::Extend.new 'Mod3', nil
-    e2_k0_m4 = RDoc::Extend.new 'Klass0::Mod4', nil
-
-    m1_k2.add_extend e2_m1
-    m1_k2.add_extend e2_m3
-    m1_k2.add_extend e2_m2
-    m1_k2.add_extend e2_k0_m4
-
-    assert_equal [e2_m1, e2_m3, e2_m2, e2_k0_m4], m1_k2.extends
-    assert_equal [@object, 'BasicObject'], m1_k2.ancestors
-
-    m1_k3 = m1.add_class RDoc::NormalClass, 'Klass3'
-
-    e3_m1 = RDoc::Extend.new 'Mod1', nil
-    e3_m2 = RDoc::Extend.new 'Mod2', nil
-    e3_m4 = RDoc::Extend.new 'Mod4', nil
-
-    m1_k3.add_extend e3_m1
-    m1_k3.add_extend e3_m2
-    m1_k3.add_extend e3_m4
-
-    assert_equal [e3_m1, e3_m2, e3_m4], m1_k3.extends
-    assert_equal [@object, 'BasicObject'], m1_k3.ancestors
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_generator_darkfish_test.rb b/test/mri/rdoc/rdoc_generator_darkfish_test.rb
deleted file mode 100644
index 67715951ecb..00000000000
--- a/test/mri/rdoc/rdoc_generator_darkfish_test.rb
+++ /dev/null
@@ -1,593 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorDarkfishTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @lib_dir = "#{@pwd}/lib"
-    $LOAD_PATH.unshift @lib_dir # ensure we load from this RDoc
-
-    @options = RDoc::Options.new
-    @options.option_parser = OptionParser.new
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_darkfish_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-    Dir.chdir @tmpdir
-    @options.op_dir = @tmpdir
-    @options.generator = RDoc::Generator::Darkfish
-
-    $LOAD_PATH.each do |path|
-      darkfish_dir = File.join path, 'rdoc/generator/template/darkfish/'
-      next unless File.directory? darkfish_dir
-      @options.template_dir = darkfish_dir
-      break
-    end
-
-    @rdoc.options = @options
-
-    @g = @options.generator.new @store, @options
-    @rdoc.generator = @g
-
-    @top_level = @store.add_file 'file.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-    @klass = @top_level.add_class RDoc::NormalClass, 'Klass'
-
-    @alias_constant = RDoc::Constant.new 'A', nil, ''
-    @alias_constant.record_location @top_level
-
-    @top_level.add_constant @alias_constant
-
-    @klass.add_module_alias @klass, @klass.name, @alias_constant, @top_level
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_with_html_tag_yield = RDoc::AnyMethod.new nil, 'method_with_html_tag_yield'
-    @meth_with_html_tag_yield.block_params = '%<<script>alert("atui")</script>>, yield_arg'
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_method @meth_with_html_tag_yield
-    @klass.add_attribute @attr
-
-    @ignored = @top_level.add_class RDoc::NormalClass, 'Ignored'
-    @ignored.ignore
-
-    @store.complete :private
-
-    @object      = @store.find_class_or_module 'Object'
-    @klass_alias = @store.find_class_or_module 'Klass::A'
-  end
-
-  def teardown
-    super
-
-    $LOAD_PATH.shift
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-    @klass.add_class RDoc::NormalClass, 'Inner'
-    @klass.add_comment <<~RDOC, top_level
-    = Heading 1
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-    == Heading 1.1
-    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-    === Heading 1.1.1
-    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-    ==== Heading 1.1.1.1
-    consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-    == Heading 1.2
-    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-    == Heading 1.3
-    non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    === Heading 1.3.1
-    etc etc...
-    RDOC
-
-    @g.generate
-
-    assert_file 'index.html'
-    assert_file 'Object.html'
-    assert_file 'Klass.html'
-    assert_file 'Klass/Inner.html'
-    assert_file 'table_of_contents.html'
-    assert_file 'js/search_index.js'
-
-    assert_hard_link 'css/rdoc.css'
-    assert_hard_link 'css/fonts.css'
-
-    assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
-    assert_hard_link 'fonts/SourceCodePro-Regular.ttf'
-
-    encoding = Regexp.escape Encoding::UTF_8.name
-
-    assert_match %r%<meta charset="#{encoding}">%, File.binread('index.html')
-    assert_match %r%<meta charset="#{encoding}">%, File.binread('Object.html')
-
-    refute_match(/Ignored/, File.binread('index.html'))
-    summary = File.binread('index.html')[%r[<summary.*Klass\.html.*</summary>.*</details>]m]
-    assert_match(%r[Klass/Inner\.html".*>Inner<], summary)
-
-    klass = File.binread('Klass.html')
-    klassnav = klass[%r[<div class="nav-section">.*]m]
-    assert_match(
-      %r[<li>\s*<details open>\s*<summary>\s*<a href=\S+>Heading 1</a>\s*</summary>\s*<ul]m,
-      klassnav
-    )
-    assert_match(
-      %r[<li>\s*<a href=\S+>Heading 1.1.1.1</a>\s*</ul>\s*</details>\s*</li>]m,
-      klassnav
-    )
-
-    assert_match(/<h1 id="class-Klass-label-Heading\+1">Heading 1(?!\.)/,
-                 klass[%r[<section class=\"description\">.*</section>]m])
-    toc = File.binread('table_of_contents.html')
-    assert_match(
-      %r[<a\s+href="Klass\.html#class-Klass-label-Heading\+1">Heading 1</a>]m,
-      toc[%r[<h2\s+id=\"classes\">.*(?=<h2\b)]m][%r[<a\s+href="Klass\.html".*(?=</li\b)]m]
-    )
-  end
-
-  def test_generate_index_with_main_page
-    top_level = @store.add_file 'file.rb'
-    top_level.comment = <<~RDOC
-    = Heading 1
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-    == Heading 1.1
-    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-    === Heading 1.1.1
-    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-    ==== Heading 1.1.1.1
-    consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-    == Heading 1.2
-    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-    == Heading 1.3
-    non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    === Heading 1.3.1
-    etc etc...
-    RDOC
-
-    @options.main_page = 'file.rb'
-    @options.title = 'My awesome Ruby project'
-
-    @g.generate
-
-    assert_file 'index.html'
-    assert_file 'table_of_contents.html'
-    assert_file 'js/search_index.js'
-
-    assert_hard_link 'css/rdoc.css'
-    assert_hard_link 'css/fonts.css'
-
-    assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
-    assert_hard_link 'fonts/SourceCodePro-Regular.ttf'
-
-    index_html = File.binread('index.html')
-
-    assert_include index_html, "<h3>Table of Contents</h3>"
-    assert_include index_html, '<h1 id="label-Heading+1">Heading 1'
-    # When there's a main page, the default description should not be shown
-    assert_not_include index_html, 'This is the API documentation for My awesome Ruby project.'
-  end
-
-  def test_generate_index_without_main_page
-    top_level = @store.add_file 'file.rb'
-    top_level.comment = <<~RDOC
-    = Heading 1
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-    == Heading 1.1
-    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-    === Heading 1.1.1
-    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-    ==== Heading 1.1.1.1
-    consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-    == Heading 1.2
-    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-    == Heading 1.3
-    non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    === Heading 1.3.1
-    etc etc...
-    RDOC
-
-    @options.title = 'My awesome Ruby project'
-
-    @g.generate
-
-    assert_file 'index.html'
-    assert_file 'table_of_contents.html'
-    assert_file 'js/search_index.js'
-
-    assert_hard_link 'css/rdoc.css'
-    assert_hard_link 'css/fonts.css'
-
-    assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
-    assert_hard_link 'fonts/SourceCodePro-Regular.ttf'
-
-    index_html = File.binread('index.html')
-
-    # If there is no main page, the index page should not have a table of contents
-    assert_not_include index_html, "<h3>Table of Contents</h3>"
-    assert_include index_html, 'This is the API documentation for My awesome Ruby project.'
-  end
-
-  def test_generate_page
-    @store.add_file 'outer.rdoc', parser: RDoc::Parser::Simple
-    @store.add_file 'outer/inner.rdoc', parser: RDoc::Parser::Simple
-    @g.generate
-    assert_file 'outer_rdoc.html'
-    assert_file 'outer/inner_rdoc.html'
-    index = File.binread('index.html')
-    re = %r[<summary><a href="\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, index)
-    summary = index[re]
-    assert_match %r[<a href="\./outer/inner_rdoc.html">inner</a>], summary
-    re = %r[<details open><summary><a href="\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, File.binread('outer_rdoc.html'))
-    re = %r[<details open><summary><a href="\.\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, File.binread('outer/inner_rdoc.html'))
-  end
-
-  def test_generate_dry_run
-    @g.dry_run = true
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    refute_file 'index.html'
-    refute_file 'Object.html'
-  end
-
-  def test_generate_static
-    FileUtils.mkdir_p 'dir/images'
-    FileUtils.touch 'dir/images/image.png'
-    FileUtils.mkdir_p 'file'
-    FileUtils.touch 'file/file.txt'
-
-    @options.static_path = [
-      File.expand_path('dir'),
-      File.expand_path('file/file.txt'),
-    ]
-
-    @g.generate
-
-    assert_file 'images/image.png'
-    assert_file 'file.txt'
-  end
-
-  def test_generate_static_dry_run
-    FileUtils.mkdir 'static'
-    FileUtils.touch 'static/image.png'
-
-    @options.static_path = [File.expand_path('static')]
-    @g.dry_run = true
-
-    @g.generate
-
-    refute_file 'image.png'
-  end
-
-  def test_install_rdoc_static_file
-    src = Pathname File.expand_path(__FILE__, @pwd)
-    dst = File.join @tmpdir, File.basename(src)
-    options = {}
-
-    @g.install_rdoc_static_file src, dst, options
-
-    assert_file dst
-    assert_hard_link dst
-  end
-
-  def test_install_rdoc_static_file_missing
-    src = Pathname(__FILE__) + 'nonexistent'
-    dst = File.join @tmpdir, File.basename(src)
-    options = {}
-
-    @g.install_rdoc_static_file src, dst, options
-
-    refute_file dst
-  end
-
-  def test_setup
-    @g.setup
-
-    assert_equal [@klass_alias, @ignored, @klass, @object],
-                 @g.classes.sort_by { |klass| klass.full_name }
-    assert_equal [@top_level],                           @g.files
-    assert_equal [@meth, @meth, @meth_bang, @meth_bang, @meth_with_html_tag_yield, @meth_with_html_tag_yield], @g.methods
-    assert_equal [@klass_alias, @klass, @object], @g.modsort
-  end
-
-  def test_template_for
-    classpage = Pathname.new @options.template_dir + 'class.rhtml'
-
-    template = @g.send(:template_for, classpage, true, RDoc::ERBIO)
-    assert_kind_of RDoc::ERBIO, template
-
-    assert_same template, @g.send(:template_for, classpage)
-  end
-
-  def test_template_for_dry_run
-    classpage = Pathname.new @options.template_dir + 'class.rhtml'
-
-    template = @g.send(:template_for, classpage, true, ERB)
-    assert_kind_of ERB, template
-
-    assert_same template, @g.send(:template_for, classpage)
-  end
-
-  def test_template_for_partial
-    partial = Pathname.new @options.template_dir + '_sidebar_classes.rhtml'
-
-    template = @g.send(:template_for, partial, false, RDoc::ERBPartial)
-
-    assert_kind_of RDoc::ERBPartial, template
-
-    assert_same template, @g.send(:template_for, partial)
-  end
-
-  def test_generated_method_with_html_tag_yield
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    path = File.join @tmpdir, 'A.html'
-
-    f = open(path)
-    internal_file = f.read
-    method_name_index = internal_file.index('<span class="method-name">method_with_html_tag_yield</span>')
-    last_of_method_name_index = method_name_index + internal_file[method_name_index..-1].index('<div class="method-description">') - 1
-    method_name = internal_file[method_name_index..last_of_method_name_index]
-    f.close
-
-    assert_includes method_name, '{ |%&lt;&lt;script&gt;alert(&quot;atui&quot;)&lt;/script&gt;&gt;, yield_arg| ... }'
-  end
-
-  def test_generated_filename_with_html_tag
-    filename = '"><em>should be escaped'
-    begin # in @tmpdir
-      File.write(filename, '')
-    rescue SystemCallError
-      # ", <, > chars are prohibited as filename
-      return
-    else
-      File.unlink(filename)
-    end
-    @store.add_file filename
-    doc = @store.all_files.last
-    doc.parser = RDoc::Parser::Simple
-
-    @g.generate
-
-    Dir.glob("*.html", base: @tmpdir) do |html|
-      File.binread(File.join(@tmpdir, html)).scan(/.*should be escaped.*/) do |line|
-        assert_not_include line, "<em>", html
-      end
-    end
-  end
-
-  def test_template_stylesheets
-    css = Tempfile.create(%W'hoge .css', Dir.mktmpdir('tmp', '.'))
-    File.write(css, '')
-    css.close
-    base = File.basename(css)
-    refute_file(base)
-
-    @options.template_stylesheets << css
-
-    @g.generate
-
-    assert_file base
-    assert_include File.binread('index.html'), %Q[href="./#{base}"]
-  end
-
-  def test_html_lang
-    @g.generate
-
-    content = File.binread("index.html")
-    assert_include(content, '<html lang="en">')
-  end
-
-  def test_html_lang_from_locale
-    @options.locale = RDoc::I18n::Locale.new 'ja'
-    @g.generate
-
-    content = File.binread("index.html")
-    assert_include(content, '<html lang="ja">')
-  end
-
-  def test_title
-    title = "RDoc Test".freeze
-    @options.title = title
-    @g.generate
-
-    assert_main_title(File.binread('index.html'), title)
-  end
-
-  def test_title_escape
-    title = %[<script>alert("RDoc")</script>].freeze
-    @options.title = title
-    @g.generate
-
-    assert_main_title(File.binread('index.html'), title)
-  end
-
-  def test_meta_tags_for_index
-    @options.title = "My awesome Ruby project"
-    @g.generate
-
-    content = File.binread("index.html")
-
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,My awesome Ruby project">')
-    assert_include(content, '<meta name="description" content="Documentation for My awesome Ruby project">')
-  end
-
-  def test_meta_tags_for_classes
-    top_level = @store.add_file("file.rb")
-    top_level.add_class(@klass.class, @klass.name)
-    inner = @klass.add_class(RDoc::NormalClass, "Inner")
-    inner.add_comment("This is a normal class. It is fully documented.", top_level)
-
-    @g.generate
-
-    content = File.binread("Klass/Inner.html")
-    assert_include(content, '<meta name="keywords" content="ruby,class,Klass::Inner">')
-    assert_include(
-      content,
-      '<meta name="description" content="class Klass::Inner: This is a normal class. It is fully documented.">',
-    )
-  end
-
-  def test_meta_tags_for_rdoc_files
-    top_level = @store.add_file("CONTRIBUTING.rdoc", parser: RDoc::Parser::Simple)
-    top_level.comment = <<~RDOC
-      = Contributing
-
-      Here are the instructions for contributing. Begin by installing Ruby.
-    RDOC
-
-    @g.generate
-
-    content = File.binread("CONTRIBUTING_rdoc.html")
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,CONTRIBUTING">')
-    assert_include(
-      content,
-      "<meta name=\"description\" content=\"CONTRIBUTING: Contributing Here are the instructions for contributing." \
-      " Begin by installing Ruby.\">",
-    )
-  end
-
-  def test_meta_tags_for_markdown_files_paragraph
-    top_level = @store.add_file("README.md", parser: RDoc::Parser::Simple)
-    top_level.comment = <<~MARKDOWN
-      # Distributed Ruby: dRuby
-
-      dRuby is a distributed object system for Ruby.  It allows an object.
-    MARKDOWN
-
-    @g.generate
-
-    content = File.binread("README_md.html")
-    assert_include(
-      content,
-      "<meta name=\"description\" content=\"" \
-      "README: dRuby " \
-      "dRuby is a distributed object system for Ruby. " \
-      "It allows an object."
-    )
-  end
-
-  def test_meta_tags_for_markdown_files
-    top_level = @store.add_file("MyPage.md", parser: RDoc::Parser::Markdown)
-    top_level.comment = <<~MARKDOWN
-      # MyPage
-
-      This is a comment
-    MARKDOWN
-
-    @g.generate
-
-    content = File.binread("MyPage_md.html")
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,MyPage">')
-    assert_include(
-      content,
-      '<meta name="description" content="MyPage: # MyPage This is a comment">',
-    )
-  end
-
-  def test_meta_tags_for_raw_pages
-    top_level = @store.add_file("MyPage", parser: RDoc::Parser::Simple)
-    comment = RDoc::Comment.new('this is a comment')
-    comment.document = RDoc::Markup::Document.new(RDoc::Markup::Paragraph.new('this is a comment'))
-    top_level.comment = comment
-
-    @g.generate
-
-    content = File.binread("MyPage.html")
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,MyPage">')
-    assert_include(content, '<meta name="description" content="MyPage: this is a comment">')
-  end
-
-  def test_meta_tags_for_empty_document
-    top_level = @store.add_file("MyPage", parser: RDoc::Parser::Simple)
-    top_level.comment = RDoc::Comment.from_document(RDoc::Markup::Document.new)
-
-    @g.generate
-
-    content = File.binread("MyPage.html")
-    assert_include(content, '<meta name="keywords" content="ruby,documentation,MyPage">')
-    assert_include(
-      content,
-      '<meta name="description" content="MyPage: ">',
-    )
-  end
-
-  def test_canonical_url_for_index
-    @store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
-    @g.generate
-
-    content = File.binread("index.html")
-
-    assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/">')
-  end
-
-  def test_canonical_url_for_classes
-    top_level = @store.add_file("file.rb")
-    top_level.add_class(@klass.class, @klass.name)
-    inner = @klass.add_class(RDoc::NormalClass, "Inner")
-
-    @store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
-    @g.generate
-
-    content = File.binread("Klass/Inner.html")
-
-    assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/Klass/Inner.html">')
-  end
-
-  def test_canonical_url_for_rdoc_files
-    top_level = @store.add_file("CONTRIBUTING.rdoc", parser: RDoc::Parser::Simple)
-
-    @store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
-    @g.generate
-
-    content = File.binread("CONTRIBUTING_rdoc.html")
-
-    assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/CONTRIBUTING_rdoc.html">')
-  end
-
-  ##
-  # Asserts that +filename+ has a link count greater than 1 if hard links to
-  # @tmpdir are supported.
-
-  def assert_hard_link(filename)
-    assert_file filename
-
-    src = @g.template_dir + '_head.rhtml'
-    dst = File.join @tmpdir, 'hardlinktest'
-
-    begin
-      FileUtils.ln src, dst
-      nlink = File.stat(dst).nlink if File.identical? src, dst
-      FileUtils.rm dst
-      return if nlink == 1
-    rescue SystemCallError
-      return
-    end
-
-    assert_operator File.stat(filename).nlink, :>, 1,
-                    "#{filename} is not hard-linked"
-  end
-
-  def assert_main_title(content, title)
-    title = CGI.escapeHTML(title)
-    assert_equal(title, content[%r[<title>(.*?)<\/title>]im, 1])
-    assert_include(content[%r[<main\s[^<>]*+>\s*(.*?)</main>]im, 1], title)
-  end
-end
diff --git a/test/mri/rdoc/rdoc_generator_json_index_test.rb b/test/mri/rdoc/rdoc_generator_json_index_test.rb
deleted file mode 100644
index aa7a2da0b16..00000000000
--- a/test/mri/rdoc/rdoc_generator_json_index_test.rb
+++ /dev/null
@@ -1,363 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocGeneratorJsonIndexTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tmpdir = Dir.mktmpdir "test_rdoc_generator_darkfish_#{$$}_"
-    FileUtils.mkdir_p @tmpdir
-
-    @options = RDoc::Options.new
-    @options.files = []
-    # JsonIndex is used in conjunction with another generator
-    @options.setup_generator 'darkfish'
-    @options.template_dir = ''
-    @options.op_dir = @tmpdir
-    @options.option_parser = OptionParser.new
-    @options.finish
-
-    @darkfish = RDoc::Generator::Darkfish.new @store, @options
-    @g = RDoc::Generator::JsonIndex.new @darkfish, @options
-
-    @rdoc.options = @options
-    @rdoc.generator = @g
-
-    @top_level = @store.add_file 'file.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'C'
-
-    @meth = @klass.add_method RDoc::AnyMethod.new(nil, 'meth')
-    @meth.record_location @top_level
-
-    @nest_klass = @klass.add_class RDoc::NormalClass, 'D'
-    @nest_klass.record_location @top_level
-
-    @nest_meth = @nest_klass.add_method RDoc::AnyMethod.new(nil, 'meth')
-
-    @ignored = @top_level.add_class RDoc::NormalClass, 'Ignored'
-    @ignored.ignore
-
-    @page = @store.add_file 'page.rdoc'
-    @page.parser = RDoc::Parser::Simple
-
-    @top_levels = [@top_level, @page].sort
-    @klasses    = [@klass, @nest_klass, @ignored]
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_build_index
-    index = @g.build_index
-
-    expected = {
-      :index => {
-        :searchIndex     => %w[c d meth() meth() page],
-        :longSearchIndex => %w[c c::d c#meth() c::d#meth()],
-        :info            => [
-          @klass.search_record[2..-1],
-          @nest_klass.search_record[2..-1],
-          @meth.search_record[2..-1],
-          @nest_meth.search_record[2..-1],
-          @page.search_record[2..-1],
-        ],
-      },
-    }
-
-    expected[:index][:longSearchIndex] << ''
-
-    assert_equal expected, index
-  end
-
-  def test_generate
-    @g.generate
-
-    assert_file 'js/searcher.js'
-    assert_file 'js/navigation.js'
-    assert_file 'js/search_index.js'
-
-    srcdir = File.expand_path('lib/rdoc', @pwd)
-    if !File.directory? srcdir
-      # for Ruby core repository
-      srcdir = File.expand_path("../../../lib/rdoc", __FILE__)
-    end
-
-    orig_file = Pathname(File.join srcdir, 'generator/template/json_index/js/navigation.js')
-    generated_file = Pathname(File.join @tmpdir, 'js/navigation.js')
-
-    # The following assertion for the generated file's modified time randomly
-    # fails in a ppc64le environment.
-    # https://github.com/ruby/rdoc/issues/1048
-    if orig_file.mtime.inspect != generated_file.mtime.inspect &&
-      RUBY_PLATFORM =~ /powerpc64le/
-      pend <<~EOC
-        Unstable test in ppc64le.
-        <#{orig_file.mtime.inspect}> expected but was
-        <#{generated_file.mtime.inspect}>.
-      EOC
-    end
-
-    # This is dirty hack on JRuby
-    assert_equal orig_file.mtime.inspect, generated_file.mtime.inspect,
-      '.js files should be the same timestamp of original'
-
-    json = File.read 'js/search_index.js'
-
-    json =~ /\Avar search_data = /
-
-    assignment = $&
-    index = $'
-
-    refute_empty assignment
-
-    index = JSON.parse index
-
-    info = [
-      @klass.search_record[2..-1],
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_generate_search_index_with_reproducible_builds
-    backup_epoch = ENV['SOURCE_DATE_EPOCH']
-    ruby_birthday = Time.parse 'Wed, 24 Feb 1993 21:00:00 +0900'
-    ENV['SOURCE_DATE_EPOCH'] = ruby_birthday.to_i.to_s
-
-    @g.generate
-
-    assert_file 'js/search_index.js'
-    generated_search_index = Pathname(File.join @tmpdir, 'js/search_index.js')
-    assert_equal ruby_birthday, generated_search_index.mtime
-
-    ENV['SOURCE_DATE_EPOCH'] = backup_epoch
-  end
-
-  def test_generate_gzipped
-    begin
-      require 'zlib'
-    rescue LoadError
-      omit "no zlib"
-    end
-    @g.generate
-    @g.generate_gzipped
-
-    assert_file 'js/searcher.js'
-    assert_file 'js/searcher.js.gz'
-    assert_file 'js/navigation.js'
-    assert_file 'js/navigation.js.gz'
-    assert_file 'js/search_index.js'
-    assert_file 'js/search_index.js.gz'
-
-    json = File.open('js/search_index.js.gz', 'rb') {|gzip|
-      Zlib::GzipReader.new(gzip).read
-    }
-
-    json =~ /\Avar search_data = /
-
-    assignment = $&
-    index = $'
-
-    refute_empty assignment
-
-    index = JSON.parse index
-
-    info = [
-      @klass.search_record[2..-1],
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_generate_utf_8
-    # JRuby fails this test with:
-    #   Encoding::UndefinedConversionError: "\xC2" from ASCII-8BIT to UTF-8
-    #     org/jruby/RubyIO.java:1639:in `write'
-    #     org/jruby/RubyIO.java:1612:in `write'
-    #     json/ext/GeneratorState.java:232:in `_generate'
-    #     json/ext/GeneratorState.java:137:in `generate'
-    #     /Users/runner/work/rdoc/rdoc/vendor/bundle/jruby/3.1.0/gems/json-2.9.0-java/lib/json/common.rb:824:in `dump'
-    #     /Users/runner/work/rdoc/rdoc/lib/rdoc/generator/json_index.rb:148:in `block in generate'
-    omit if RUBY_PLATFORM =~ /java/
-
-    text = "5\xB0"
-    text = RDoc::Encoding.change_encoding text, Encoding::ISO_8859_1
-    @klass.add_comment comment(text), @top_level
-
-    @g.generate
-
-    json = File.read 'js/search_index.js'
-    json.force_encoding Encoding::UTF_8
-
-    json =~ /\Avar search_data = /
-
-    index = $'
-
-    index = JSON.parse index
-
-    klass_record = @klass.search_record[2..-1]
-    klass_record[-1] = "<p>5\xc2\xb0\n"
-    klass_record[-1] = RDoc::Encoding.change_encoding klass_record[-1], Encoding::UTF_8
-
-    info = [
-      klass_record,
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_index_classes
-    @g.reset @top_levels, @klasses
-
-    @g.index_classes
-
-    expected = {
-      :searchIndex     => %w[c d],
-      :longSearchIndex => %w[c c::d],
-      :info            => [
-        @klass.search_record[2..-1],
-        @nest_klass.search_record[2..-1],
-      ],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_classes_nodoc
-    @klass.document_self      = false
-    @nest_klass.document_self = false
-    @meth.document_self       = false
-    @nest_meth.document_self  = false
-
-    @g.reset @top_levels, @klasses
-
-    @g.index_classes
-
-    expected = {
-      :searchIndex     => [],
-      :longSearchIndex => [],
-      :info            => [],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_methods
-    @g.reset @top_levels, @klasses
-
-    @g.index_methods
-
-    expected = {
-      :searchIndex     => %w[meth() meth()],
-      :longSearchIndex => %w[c#meth() c::d#meth()],
-      :info            => [
-        @meth.search_record[2..-1],
-        @nest_meth.search_record[2..-1],
-      ],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_pages
-    @g.reset @top_levels, @klasses
-
-    @g.index_pages
-
-    expected = {
-      :searchIndex     => %w[page],
-      :longSearchIndex => [''],
-      :info            => [@page.search_record[2..-1]],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_search_string
-    assert_equal 'cd', @g.search_string('C d')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_generator_markup_test.rb b/test/mri/rdoc/rdoc_generator_markup_test.rb
deleted file mode 100644
index cd77e67e794..00000000000
--- a/test/mri/rdoc/rdoc_generator_markup_test.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorMarkupTest < RDoc::TestCase
-
-  include RDoc::Text
-  include RDoc::Generator::Markup
-
-  attr_reader :store
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @rdoc.options = @options
-
-    @parent = self
-    @path = '/index.html'
-    @symbols = {}
-  end
-
-  def test_aref_to
-    assert_equal 'Foo/Bar.html', aref_to('Foo/Bar.html')
-  end
-
-  def test_as_href
-    assert_equal '../index.html', as_href('Foo/Bar.html')
-  end
-
-  def test_cvs_url
-    assert_equal 'http://example/this_page',
-                 cvs_url('http://example/', 'this_page')
-
-    assert_equal 'http://example/?page=this_page&foo=bar',
-                 cvs_url('http://example/?page=%s&foo=bar', 'this_page')
-  end
-
-  def test_description
-    @comment = '= Hello'
-
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", description
-  end
-
-  def test_formatter
-    assert_kind_of RDoc::Markup::ToHtmlCrossref, formatter
-    refute formatter.show_hash
-    assert_same self, formatter.context
-  end
-
-  attr_reader :path
-
-  def find_symbol(name)
-    @symbols[name]
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_generator_pot_po_entry_test.rb b/test/mri/rdoc/rdoc_generator_pot_po_entry_test.rb
deleted file mode 100644
index d058ff3f405..00000000000
--- a/test/mri/rdoc/rdoc_generator_pot_po_entry_test.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorPOTPOEntryTest < RDoc::TestCase
-
-  def test_msgid_normal
-    assert_equal <<-'ENTRY', entry("Hello", {}).to_s
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_multiple_lines
-    assert_equal <<-'ENTRY', entry("Hello\nWorld", {}).to_s
-msgid ""
-"Hello\n"
-"World"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_tab
-    assert_equal <<-'ENTRY', entry("Hello\tWorld", {}).to_s
-msgid "Hello\tWorld"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_back_slash
-    assert_equal <<-'ENTRY', entry("Hello \\ World", {}).to_s
-msgid "Hello \\ World"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_double_quote
-    assert_equal <<-'ENTRY', entry("Hello \"World\"!", {}).to_s
-msgid "Hello \"World\"!"
-msgstr ""
-    ENTRY
-  end
-
-  def test_translator_comment_normal
-    options = {:translator_comment => "Greeting"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_translator_comment_multiple_lines
-    options = {:translator_comment => "Greeting\nfor morning"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-# for morning
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_extracted_comment_normal
-    options = {:extracted_comment => "Object"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#. Object
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_extracted_comment_multiple_lines
-    options = {:extracted_comment => "Object\nMorning#greeting"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#. Object
-#. Morning#greeting
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_references_normal
-    options = {:references => [["lib/rdoc.rb", 29]]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#: lib/rdoc.rb:29
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_references_multiple
-    options = {:references => [["lib/rdoc.rb", 29], ["lib/rdoc/i18n.rb", 9]]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#: lib/rdoc.rb:29
-#: lib/rdoc/i18n.rb:9
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_flags_normal
-    options = {:flags => ["fuzzy"]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#, fuzzy
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_flags_multiple
-    options = {:flags => ["fuzzy", "ruby-format"]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#, fuzzy,ruby-format
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_full
-    options = {
-      :translator_comment => "Greeting",
-      :extracted_comment  => "Morning#greeting",
-      :references         => [["lib/rdoc.rb", 29]],
-      :flags              => ["fuzzy"],
-    }
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-#. Morning#greeting
-#: lib/rdoc.rb:29
-#, fuzzy
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  private
-  def entry(msgid, options)
-    RDoc::Generator::POT::POEntry.new(msgid, options)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_generator_pot_po_test.rb b/test/mri/rdoc/rdoc_generator_pot_po_test.rb
deleted file mode 100644
index 83b4a5f1c33..00000000000
--- a/test/mri/rdoc/rdoc_generator_pot_po_test.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorPOTPOTest < RDoc::TestCase
-
-  def setup
-    super
-    @po = RDoc::Generator::POT::PO.new
-  end
-
-  def test_empty
-    assert_equal header, @po.to_s
-  end
-
-  def test_have_entry
-    @po.add(entry("Hello", {}))
-    assert_equal <<-PO, @po.to_s
-#{header}
-msgid "Hello"
-msgstr ""
-    PO
-  end
-
-  private
-
-  def entry(msgid, options)
-    RDoc::Generator::POT::POEntry.new(msgid, options)
-  end
-
-  def header
-    <<-'HEADER'
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSEION\n"
-"Report-Msgid-Bugs-To:\n"
-"PO-Revision-Date: YEAR-MO_DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language:\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-    HEADER
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_generator_pot_test.rb b/test/mri/rdoc/rdoc_generator_pot_test.rb
deleted file mode 100644
index 736f9765e50..00000000000
--- a/test/mri/rdoc/rdoc_generator_pot_test.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorPOTTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_pot_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @generator = RDoc::Generator::POT.new @store, @options
-
-    @top_level = @store.add_file 'file.rb'
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-    @klass.add_comment 'This is a class', @top_level
-    @klass.add_section 'This is a section', comment('This is a section comment')
-
-    @const = RDoc::Constant.new "CONSTANT", "29", "This is a constant"
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-    @meth.comment = 'This is a method'
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-    @attr.comment = 'This is an attribute'
-
-    @klass.add_constant @const
-    @klass.add_method @meth
-    @klass.add_attribute @attr
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    @generator.generate
-
-    assert_equal <<-POT, File.read(File.join(@tmpdir, 'rdoc.pot'))
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSEION\\n"
-"Report-Msgid-Bugs-To:\\n"
-"PO-Revision-Date: YEAR-MO_DA HO:MI+ZONE\\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n"
-"Language-Team: LANGUAGE <LL@li.org>\\n"
-"Language:\\n"
-"MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=CHARSET\\n"
-"Content-Transfer-Encoding: 8bit\\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"
-
-#. Object
-msgid "This is a class"
-msgstr ""
-
-#. Object::CONSTANT
-msgid "This is a constant"
-msgstr ""
-
-#. Object#method
-msgid "This is a method"
-msgstr ""
-
-#. Object: section title
-msgid "This is a section"
-msgstr ""
-
-#. Object: This is a section
-msgid "This is a section comment"
-msgstr ""
-
-#. Object#attr
-msgid "This is an attribute"
-msgstr ""
-    POT
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_generator_ri_test.rb b/test/mri/rdoc/rdoc_generator_ri_test.rb
deleted file mode 100644
index 9109d220676..00000000000
--- a/test/mri/rdoc/rdoc_generator_ri_test.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocGeneratorRITest < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @options.encoding = Encoding::UTF_8
-    @store.encoding = Encoding::UTF_8
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_ri_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @g = RDoc::Generator::RI.new @store, @options
-
-    @top_level = @store.add_file 'file.rb'
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_bang.record_location @top_level
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_attribute @attr
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    @g.generate
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_file File.join(@tmpdir, 'Object', 'attr-i.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method%21-i.ri')
-
-    store = RDoc::RI::Store.new(@options, path: @tmpdir)
-    store.load_cache
-
-    encoding = Encoding::UTF_8
-
-    assert_equal encoding, store.encoding
-  end
-
-  def test_generate_dry_run
-    @store.dry_run = true
-    @g = RDoc::Generator::RI.new @store, @options
-
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    refute_file File.join(@tmpdir, 'cache.ri')
-    refute_file File.join(@tmpdir, 'Object')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_i18n_locale_test.rb b/test/mri/rdoc/rdoc_i18n_locale_test.rb
deleted file mode 100644
index cfbc7c5bb2a..00000000000
--- a/test/mri/rdoc/rdoc_i18n_locale_test.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocI18nLocaleTest < RDoc::TestCase
-
-  def setup
-    super
-    @locale = locale('fr')
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_i18n_locale_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @locale_dir = @tmpdir
-  end
-
-  def teardown
-    FileUtils.rm_rf @tmpdir
-    super
-  end
-
-  def test_name
-    assert_equal 'fr', locale('fr').name
-  end
-
-  def test_load_nonexistent_po
-    locale = File.join(@locale_dir, 'nonexsitent-locale')
-    refute_file locale
-    refute @locale.load(locale)
-  end
-
-  def test_load_existent_po
-    begin
-      require 'gettext/po_parser'
-    rescue LoadError
-      omit 'gettext gem is not found'
-    end
-
-    fr_locale_dir = File.join @locale_dir, 'fr'
-    FileUtils.mkdir_p fr_locale_dir
-    File.open File.join(fr_locale_dir, 'rdoc.po'), 'w' do |po|
-      po.puts <<-PO
-msgid ""
-msgstr ""
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Hello"
-msgstr "Bonjour"
-      PO
-    end
-
-    assert @locale.load(@locale_dir)
-    assert_equal 'Bonjour', @locale.translate('Hello')
-  end
-
-  def test_translate_existent_message
-    messages = @locale.instance_variable_get(:@messages)
-    messages['Hello'] = 'Bonjour'
-    assert_equal 'Bonjour', @locale.translate('Hello')
-  end
-
-  def test_translate_nonexistent_message
-    assert_equal 'Hello', @locale.translate('Hello')
-  end
-
-  private
-
-  def locale(name)
-    RDoc::I18n::Locale.new(name)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_i18n_text_test.rb b/test/mri/rdoc/rdoc_i18n_text_test.rb
deleted file mode 100644
index 888479d20da..00000000000
--- a/test/mri/rdoc/rdoc_i18n_text_test.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocI18nTextTest < RDoc::TestCase
-
-  def test_multiple_paragraphs
-    paragraph1 = <<-PARAGRAPH.strip
-RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying documentation
-from the command-line.
-    PARAGRAPH
-
-    paragraph2 = <<-PARAGRAPH.strip
-This command generates documentation for all the Ruby and C source
-files in and below the current directory.  These will be stored in a
-documentation tree starting in the subdirectory +doc+.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{paragraph1}
-
-#{paragraph2}
-    RAW
-
-    expected = [
-      {
-        :type      => :paragraph,
-        :paragraph => paragraph1,
-        :line_no   => 1,
-      },
-      {
-        :type      => :paragraph,
-        :paragraph => paragraph2,
-        :line_no   => 5,
-      },
-    ]
-    assert_equal expected, extract_messages(raw)
-  end
-
-  def test_translate_multiple_paragraphs
-    paragraph1 = <<-PARAGRAPH.strip
-Paragraph 1.
-    PARAGRAPH
-    paragraph2 = <<-PARAGRAPH.strip
-Paragraph 2.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{paragraph1}
-
-#{paragraph2}
-    RAW
-
-    expected = <<-TRANSLATED
-Paragraphe 1.
-
-Paragraphe 2.
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  def test_translate_not_translated_message
-    nonexistent_paragraph = <<-PARAGRAPH.strip
-Nonexistent paragraph.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{nonexistent_paragraph}
-    RAW
-
-    expected = <<-TRANSLATED
-#{nonexistent_paragraph}
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  def test_translate_keep_empty_lines
-    raw = <<-RAW
-Paragraph 1.
-
-
-
-
-Paragraph 2.
-    RAW
-
-    expected = <<-TRANSLATED
-Paragraphe 1.
-
-
-
-
-Paragraphe 2.
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  private
-
-  def extract_messages(raw)
-    text = RDoc::I18n::Text.new(raw)
-    messages = []
-    text.extract_messages do |message|
-      messages << message
-    end
-    messages
-  end
-
-  def locale
-    locale = RDoc::I18n::Locale.new('fr')
-    messages = locale.instance_variable_get(:@messages)
-    messages['markdown'] = 'markdown (markdown in fr)'
-    messages['Hello'] = 'Bonjour (Hello in fr)'
-    messages['Paragraph 1.'] = 'Paragraphe 1.'
-    messages['Paragraph 2.'] = 'Paragraphe 2.'
-    locale
-  end
-
-  def translate(raw)
-    text = RDoc::I18n::Text.new(raw)
-    text.translate(locale)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_include_test.rb b/test/mri/rdoc/rdoc_include_test.rb
deleted file mode 100644
index 6b78d2a749c..00000000000
--- a/test/mri/rdoc/rdoc_include_test.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocIncludeTest < XrefTestCase
-
-  def setup
-    super
-
-    @inc = RDoc::Include.new 'M1', 'comment'
-    @inc.parent = @m1
-    @inc.record_location @top_level
-    @inc.store = @store
-  end
-
-  def test_module
-    assert_equal @m1, @inc.module
-    assert_equal 'Unknown', RDoc::Include.new('Unknown', 'comment').module
-  end
-
-  def test_module_extended
-    m1 = @xref_data.add_module RDoc::NormalModule, 'Mod1'
-    m1_m3 = m1.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2 = m1.add_module RDoc::NormalModule, 'Mod2'
-    m1_m2_m3 = m1_m2.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2_m3_m4 = m1_m2_m3.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_m4 = m1_m2.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_k0 = m1_m2.add_class RDoc::NormalClass, 'Klass0'
-    m1_m2_k0_m4 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod4'
-    #m1_m2_k0_m4_m5 = m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod5'
-    m1_m2_k0_m4_m6 = m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod6'
-    m1_m2_k0_m5 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod5'
-
-    i0_m4 = RDoc::Include.new 'Mod4', nil
-    i0_m5 = RDoc::Include.new 'Mod5', nil
-    i0_m6 = RDoc::Include.new 'Mod6', nil
-    i0_m1 = RDoc::Include.new 'Mod1', nil
-    i0_m2 = RDoc::Include.new 'Mod2', nil
-    i0_m3 = RDoc::Include.new 'Mod3', nil
-
-    m1_m2_k0.add_include i0_m4
-    m1_m2_k0.add_include i0_m5
-    m1_m2_k0.add_include i0_m6
-    m1_m2_k0.add_include i0_m1
-    m1_m2_k0.add_include i0_m2
-    m1_m2_k0.add_include i0_m3
-
-    assert_equal [i0_m4, i0_m5, i0_m6, i0_m1, i0_m2, i0_m3], m1_m2_k0.includes
-    assert_equal [m1_m2_m3, m1_m2, m1, m1_m2_k0_m4_m6, m1_m2_k0_m5,
-                  m1_m2_k0_m4, @object, 'BasicObject'], m1_m2_k0.ancestors
-
-    m1_k1 = m1.add_class RDoc::NormalClass, 'Klass1'
-
-    i1_m1 = RDoc::Include.new 'Mod1', nil
-    i1_m2 = RDoc::Include.new 'Mod2', nil
-    i1_m3 = RDoc::Include.new 'Mod3', nil
-    i1_m4 = RDoc::Include.new 'Mod4', nil
-    i1_k0_m4 = RDoc::Include.new 'Klass0::Mod4', nil
-
-    m1_k1.add_include i1_m1
-    m1_k1.add_include i1_m2
-    m1_k1.add_include i1_m3
-    m1_k1.add_include i1_m4
-    m1_k1.add_include i1_k0_m4
-
-    assert_equal [i1_m1, i1_m2, i1_m3, i1_m4, i1_k0_m4], m1_k1.includes
-    assert_equal [m1_m2_k0_m4, m1_m2_m3_m4, m1_m2_m3, m1_m2, m1, @object,
-                  'BasicObject'], m1_k1.ancestors
-
-    m1_k2 = m1.add_class RDoc::NormalClass, 'Klass2'
-
-    i2_m1 = RDoc::Include.new 'Mod1', nil
-    i2_m2 = RDoc::Include.new 'Mod2', nil
-    i2_m3 = RDoc::Include.new 'Mod3', nil
-    i2_k0_m4 = RDoc::Include.new 'Klass0::Mod4', nil
-
-    m1_k2.add_include i2_m1
-    m1_k2.add_include i2_m3
-    m1_k2.add_include i2_m2
-    m1_k2.add_include i2_k0_m4
-
-    assert_equal [i2_m1, i2_m3, i2_m2, i2_k0_m4], m1_k2.includes
-    assert_equal [m1_m2_k0_m4, m1_m2, m1_m3, m1, @object, 'BasicObject'],
-                 m1_k2.ancestors
-
-    m1_k3 = m1.add_class RDoc::NormalClass, 'Klass3'
-
-    i3_m1 = RDoc::Include.new 'Mod1', nil
-    i3_m2 = RDoc::Include.new 'Mod2', nil
-    i3_m4 = RDoc::Include.new 'Mod4', nil
-
-    m1_k3.add_include i3_m1
-    m1_k3.add_include i3_m2
-    m1_k3.add_include i3_m4
-
-    assert_equal [i3_m1, i3_m2, i3_m4], m1_k3.includes
-    assert_equal [m1_m2_m4, m1_m2, m1, @object, 'BasicObject'], m1_k3.ancestors
-  end
-
-  def test_store_equals
-    incl = RDoc::Include.new 'M', nil
-    incl.record_location RDoc::TopLevel.new @top_level.name
-
-    incl.store = @store
-
-    assert_same @top_level, incl.file
-    assert_same @store,     incl.file.store
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markdown_test.rb b/test/mri/rdoc/rdoc_markdown_test.rb
deleted file mode 100644
index 2764f94becd..00000000000
--- a/test/mri/rdoc/rdoc_markdown_test.rb
+++ /dev/null
@@ -1,1140 +0,0 @@
-# coding: UTF-8
-# frozen_string_literal: true
-
-require_relative 'helper'
-require_relative '../../lib/rdoc/markup/block_quote'
-require_relative '../../lib/rdoc/markdown'
-
-class RDocMarkdownTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @RM = RDoc::Markup
-
-    @parser = RDoc::Markdown.new
-
-    @to_html = RDoc::Markup::ToHtml.new(RDoc::Options.new, nil)
-  end
-
-  def test_class_parse
-    doc = RDoc::Markdown.parse "hello\n\nworld"
-
-    expected = doc(para("hello"), para("world"))
-
-    assert_equal expected, doc
-  end
-
-  def test_emphasis
-    assert_equal '_word_',             @parser.emphasis('word')
-    assert_equal '<em>two words</em>', @parser.emphasis('two words')
-    assert_equal '<em>*bold*</em>',    @parser.emphasis('*bold*')
-  end
-
-  def test_parse_auto_link_email
-    doc = parse "Autolink: <nobody-0+_./!%~$@example>"
-
-    expected = doc(para("Autolink: mailto:nobody-0+_./!%~$@example"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_auto_link_url
-    doc = parse "Autolink: <http://example>"
-
-    expected = doc(para("Autolink: http://example"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote
-    doc = parse <<-BLOCK_QUOTE
-> this is
-> a block quote
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_continue
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_list
-    doc = parse <<-BLOCK_QUOTE
-> text
->
-> * one
-> * two
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("text"),
-          list(:BULLET,
-            item(nil, para("one")),
-            item(nil, para("two")))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_newline
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_separate
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-
-> that continues
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote"),
-          para("that continues")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_char_entity
-    doc = parse '&pi; &nn;'
-
-    expected = doc(para('π &nn;'))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_code
-    doc = parse "Code: `text`"
-    expected = doc(para("Code: <code>text</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: ` text `"
-    expected = doc(para("Code: <code>text</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: ``text`s``"
-    expected = doc(para("Code: <code>text`s</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: `` text`s ``"
-    expected = doc(para("Code: <code>text`s</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: ```text`s```"
-    expected = doc(para("Code: <code>text`s</code>"))
-    assert_equal expected, doc
-
-    doc = parse "Code: ``` text`s ```"
-    expected = doc(para("Code: <code>text`s</code>"))
-    assert_equal expected, doc
-  end
-
-  def test_parse_code_github
-    doc = <<-MD
-Example:
-
-```
-code goes here
-```
-    MD
-
-    expected =
-      doc(
-        para("Example:"),
-        verb("code goes here\n"))
-
-    assert_equal expected, parse(doc)
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-
-    @parser.github = false
-
-    expected =
-      doc(para("Example:"),
-          para("<code>\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc)
-
-    expected =
-      doc(para("Example:\n<code>\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-  end
-
-  def test_parse_code_github_format
-    doc = <<-MD
-Example:
-
-``` ruby
-code goes here
-```
-    MD
-
-    code = verb("code goes here\n")
-    code.format = :ruby
-
-    expected =
-      doc(
-        para("Example:"),
-        code)
-
-    assert_equal expected, parse(doc)
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-
-    @parser.github = false
-
-    expected =
-      doc(para("Example:"),
-          para("<code>ruby\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc)
-
-    expected =
-      doc(para("Example:\n<code>ruby\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-  end
-
-  def test_parse_definition_list
-    doc = parse <<-MD
-one
-:   This is a definition
-
-two
-:   This is another definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one], para("This is a definition")),
-        item(%w[two], para("This is another definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_indents
-    doc = parse <<-MD
-zero
-: Indented zero characters
-
-one
- : Indented one characters
-
-two
-  : Indented two characters
-
-three
-   : Indented three characters
-
-four
-    : Indented four characters
-
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[zero],  para("Indented zero characters")),
-        item(%w[one],   para("Indented one characters")),
-        item(%w[two],   para("Indented two characters")),
-        item(%w[three], para("Indented three characters"))),
-      para("four\n : Indented four characters"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_description
-    doc = parse <<-MD
-label
-:   This is a definition
-
-:   This is another definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[label], para("This is a definition")),
-        item(nil,       para("This is another definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_label
-    doc = parse <<-MD
-one
-two
-:   This is a definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one two], para("This is a definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_line
-    doc = parse <<-MD
-one
-:   This is a definition
-that extends to two lines
-
-two
-:   This is another definition
-that also extends to two lines
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one],
-          para("This is a definition\nthat extends to two lines")),
-        item(%w[two],
-          para("This is another definition\nthat also extends to two lines"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_rich_label
-    doc = parse <<-MD
-`one`
-:    This is a definition
-
-**two**
-:    This is another definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[<code>one</code>],
-          para("This is a definition")),
-        item(%w[*two*],
-          para("This is another definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_no
-    @parser.definition_lists = false
-
-    doc = parse <<-MD
-one
-:   This is a definition
-
-two
-:   This is another definition
-    MD
-
-    expected = doc(
-        para("one\n: This is a definition"),
-        para("two\n: This is another definition"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_dec
-    doc = parse "Entity: &#65;"
-
-    expected = doc(para("Entity: A"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_hex
-    doc = parse "Entity: &#x41;"
-
-    expected = doc(para("Entity: A"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_named
-    doc = parse "Entity: &pi;"
-
-    expected = doc(para("Entity: π"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_star
-    doc = parse "it *works*\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it _works_"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore
-    doc = parse "it _works_\n"
-
-    expected =
-      doc(
-        para("it _works_"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore_embedded
-    doc = parse "foo_bar bar_baz\n"
-
-    expected =
-      doc(
-        para("foo_bar bar_baz"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore_in_word
-    doc = parse "it foo_bar_baz\n"
-
-    expected =
-      doc(
-        para("it foo_bar_baz"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_escape
-    assert_equal doc(para("Backtick: `")), parse("Backtick: \\`")
-
-    assert_equal doc(para("Backslash: \\")), parse("Backslash: \\\\")
-
-    assert_equal doc(para("Colon: :")), parse("Colon: \\:")
-  end
-
-  def test_parse_heading_atx
-    # CommonMark Example 62
-    (1..6).each do |level|
-      doc = parse "#{"#" * level} heading\n"
-
-      expected = @RM::Document.new(
-        @RM::Heading.new(level, "heading"))
-
-      assert_equal expected, doc
-    end
-
-    # CommonMark Example 64
-    doc = parse "#5 bolt\n\n#hashtag\n"
-
-    expected = @RM::Document.new(
-      para("#5 bolt"),
-      para("#hashtag"),
-    )
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_heading_setext_dash
-    doc = parse <<-MD
-heading
----
-    MD
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(2, "heading"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_heading_setext_equals
-    doc = parse <<-MD
-heading
-===
-    MD
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, "heading"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html
-    @parser.html = true
-
-    doc = parse "<address>Links here</address>\n"
-
-    expected = doc(
-      @RM::Raw.new("<address>Links here</address>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html_hr
-    @parser.html = true
-
-    doc = parse "<hr>\n"
-
-    expected = doc(raw("<hr>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html_no_html
-    @parser.html = false
-
-    doc = parse "<address>Links here</address>\n"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_image
-    doc = parse "image ![alt text](path/to/image.jpg)"
-
-    expected = doc(para("image rdoc-image:path/to/image.jpg:alt text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_image_link
-    @parser.html = true
-
-    doc = parse "[![alt text](path/to/image.jpg)](http://example.com)"
-
-    expected =
-      doc(
-        para('{rdoc-image:path/to/image.jpg:alt text}[http://example.com]'))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_line_break
-    doc = parse "Some text  \nwith extra lines"
-
-    expected = doc(
-      para("Some text", hard_break, "with extra lines"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id
-    doc = parse <<-MD
-This is [an example][id] reference-style link.
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_adjacent
-    doc = parse <<-MD
-[this] [this] should work
-
-[this]: example
-    MD
-
-    expected = doc(
-      para("{this}[example] should work"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_eof
-    doc = parse <<-MD.chomp
-This is [an example][id] reference-style link.
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_many
-    doc = parse <<-MD
-This is [an example][id] reference-style link.
-
-And [another][id].
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."),
-      para("And {another}[http://example.com]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_implicit
-    doc = parse <<-MD
-This is [an example][] reference-style link.
-
-[an example]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet
-    doc = parse <<-MD
-* one
-* two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_auto_link
-    doc = parse <<-MD
-* <http://example/>
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("http://example/"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_continue
-    doc = parse <<-MD
-* one
-
-* two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_multiline
-    doc = parse <<-MD
-* one
-  two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one\n two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest
-    doc = parse <<-MD
-* outer
-    * inner
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil,
-              para("inner"))))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest_loose
-    doc = parse <<-MD
-* outer
-
-    * inner
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil, para("inner"))))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest_continue
-    doc = parse <<-MD
-* outer
-    * inner
-  continue inner
-* outer 2
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil,
-              para("inner\n continue inner")))),
-        item(nil,
-          para("outer 2"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_number
-    doc = parse <<-MD
-1. one
-1. two
-    MD
-
-    expected = doc(
-      list(:NUMBER,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_number_continue
-    doc = parse <<-MD
-1. one
-
-1. two
-    MD
-
-    expected = doc(
-      list(:NUMBER,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text.[^1]
-
-[^1]: With a footnote
-    MD
-
-    expected = doc(
-      para("Some text.{*1}[rdoc-label:foottext-1:footmark-1]"),
-      @RM::Rule.new(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_indent
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text.[^1]
-
-[^1]: With a footnote
-
-    more
-    MD
-
-    expected = doc(
-      para("Some text.{*1}[rdoc-label:foottext-1:footmark-1]"),
-      rule(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote\n\nmore"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_inline
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text. ^[With a footnote]
-    MD
-
-    expected = doc(
-      para("Some text. {*1}[rdoc-label:foottext-1:footmark-1]"),
-      @RM::Rule.new(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_no_notes
-    @parser.notes = false
-
-    assert_raise RDoc::Markdown::ParseError do
-      parse "Some text.[^1]"
-    end
-  end
-
-  def test_parse_note_multiple
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text[^1]
-with inline notes^[like this]
-and an extra note.[^2]
-
-[^1]: With a footnote
-[^2]: Which should be numbered correctly
-    MD
-
-    expected = doc(
-      para("Some text{*1}[rdoc-label:foottext-1:footmark-1]\n" +
-           "with inline notes{*2}[rdoc-label:foottext-2:footmark-2]\n" +
-           "and an extra note.{*3}[rdoc-label:foottext-3:footmark-3]"),
-
-      rule(1),
-
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"),
-      para("{^2}[rdoc-label:footmark-2:foottext-2] like this"),
-      para("{^3}[rdoc-label:footmark-3:foottext-3] " +
-           "Which should be numbered correctly"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph
-    doc = parse "it worked\n"
-
-    expected = doc(para("it worked"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_break_on_newline
-    @parser.break_on_newline = true
-
-    doc = parse "one\ntwo\n"
-
-    expected = doc(para("one", hard_break, "two"))
-
-    assert_equal expected, doc
-
-    doc = parse "one  \ntwo\nthree\n"
-
-    expected = doc(para("one", hard_break, "two", hard_break, "three"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_stars
-    doc = parse "it worked ****\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it worked ****"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_html
-    @parser.html = true
-
-    doc = parse "<address>Links here</address>"
-
-    expected = doc(raw("<address>Links here</address>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_html_no_html
-    @parser.html = false
-
-    doc = parse "<address>Links here</address>"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_one
-    doc = parse <<-MD
- text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_two
-    doc = parse <<-MD
-  text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_three
-    doc = parse <<-MD
-   text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_multiline
-    doc = parse "one\ntwo"
-
-    expected = doc(para("one\ntwo"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_two
-    doc = parse "one\n\ntwo"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("one"),
-      @RM::Paragraph.new("two"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_plain
-    doc = parse "it worked"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it worked"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_reference_link_embedded_bracket
-    doc = parse "With [embedded [brackets]] [b].\n\n[b]: /url/\n"
-
-    expected =
-      doc(
-        para("With {embedded [brackets]}[/url/]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_dash
-    doc = parse "- - -\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_underscore
-    doc = parse "_ _ _\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_star
-    doc = parse "* * *\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_star
-    doc = parse "it **works**\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it *works*"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_underscore
-    doc = parse "it __works__\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it *works*"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_emphasis_star
-    doc = parse "it ***works***\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <b>_works_</b>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_emphasis_underscore
-    doc = parse "it ___works___\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <b>_works_</b>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_tilde
-    doc = parse "it ~~works~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it ~works~"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_words_tilde
-    doc = parse "it ~~works fine~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <s>works fine</s>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_tilde_no
-    @parser.strike = false
-
-    doc = parse "it ~~works fine~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it ~~works fine~~"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_style
-    @parser.css = true
-
-    doc = parse "<style>h1 { color: red }</style>\n"
-
-    expected = doc(
-      @RM::Raw.new("<style>h1 { color: red }</style>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_style_disabled
-    doc = parse "<style>h1 { color: red }</style>\n"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_verbatim
-    doc = parse <<-MD
-    text
-    MD
-
-    expected = doc(verb("text\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_verbatim_eof
-    doc = parse "    text"
-
-    expected = doc(verb("text\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_strong
-    assert_equal '*word*',            @parser.strong('word')
-    assert_equal '<b>two words</b>',  @parser.strong('two words')
-    assert_equal '<b>_emphasis_</b>', @parser.strong('_emphasis_')
-  end
-
-  def test_code_fence_with_unintended_array
-    doc = parse '```<ruby>```'
-
-    expected = doc(verb('<ruby>'))
-
-    assert_equal expected, doc
-  end
-
-  def test_gfm_table
-    doc = parse <<~MD
-    |      |                 |compare-ruby|built-ruby|
-    |------|:----------------|-----------:|---------:|
-    |test  | 1               |     11.618M|   10.757M|
-    |      |                 |       1.08x|         -|
-    |test  | 10              |      1.849M|    1.723M|
-    |      |                 |       1.07x|         -|
-    MD
-
-    head = ["", "", "compare-ruby", "built-ruby"]
-    align = [nil, :left, :right, :right]
-    body = [
-      ["test", "1", "11.618M", "10.757M"],
-      ["", "", "1.08x", "-"],
-      ["test", "10", "1.849M", "1.723M"],
-      ["", "", "1.07x", "-"],
-    ]
-    expected = doc(@RM::Table.new(head, align, body))
-
-    assert_equal expected, doc
-  end
-
-  def test_gfm_table_2
-    doc = parse <<~'MD'
-    | Cmd | Returns | Meaning
-    ----- | :-----: | -------
-    |"b"  | boolean | True if file1 is a block device
-    "c"   | boolean | True if file1 is a character device
-    |"\|" | boolean | escaped bar \| test
-    MD
-
-    head = %w[Cmd Returns Meaning]
-    align = [nil, :center, nil]
-    body = [
-      ['"b"', 'boolean', 'True if file1 is a block device'],
-      ['"c"', 'boolean', 'True if file1 is a character device'],
-      ['"|"', 'boolean', 'escaped bar | test'],
-    ]
-    expected = doc(@RM::Table.new(head, align, body))
-
-    assert_equal expected, doc
-  end
-
-  def parse(text)
-    @parser.parse text
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markdown_test_test.rb b/test/mri/rdoc/rdoc_markdown_test_test.rb
deleted file mode 100644
index c28fe6bebdf..00000000000
--- a/test/mri/rdoc/rdoc_markdown_test_test.rb
+++ /dev/null
@@ -1,1883 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-require 'pp'
-
-require_relative '../../lib/rdoc'
-require_relative '../../lib/rdoc/markdown'
-
-class RDocMarkdownTestTest < RDoc::TestCase
-
-  MARKDOWN_TEST_PATH = File.expand_path '../MarkdownTest_1.0.3/', __FILE__
-
-  def setup
-    super
-
-    @parser = RDoc::Markdown.new
-  end
-
-  def test_amps_and_angle_encoding
-    input = File.read "#{MARKDOWN_TEST_PATH}/Amps and angle encoding.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("AT&T has an ampersand in their name."),
-        para("AT&T is another way to write it."),
-        para("This & that."),
-        para("4 < 5."),
-        para("6 > 5."),
-        para("Here's a {link}[http://example.com/?foo=1&bar=2] with " +
-             "an ampersand in the URL."),
-        para("Here's a link with an amersand in the link text: " +
-             "{AT&T}[http://att.com/]."),
-        para("Here's an inline {link}[/script?foo=1&bar=2]."),
-        para("Here's an inline {link}[/script?foo=1&bar=2]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_auto_links
-    input = File.read "#{MARKDOWN_TEST_PATH}/Auto links.text"
-
-    doc = @parser.parse input
-
-    # TODO verify rdoc auto-links too
-    expected =
-      doc(
-        para("Link: http://example.com/."),
-        para("With an ampersand: http://example.com/?foo=1&bar=2"),
-        list(:BULLET,
-          item(nil, para("In a list?")),
-          item(nil, para("http://example.com/")),
-          item(nil, para("It should."))),
-        block(
-          para("Blockquoted: http://example.com/")),
-        para("Auto-links should not occur here: " +
-             "<code><http://example.com/></code>"),
-        verb("or here: <http://example.com/>\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_backslash_escapes
-    input = File.read "#{MARKDOWN_TEST_PATH}/Backslash escapes.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("These should all get escaped:"),
-
-        para("Backslash: \\"),
-        para("Backtick: `"),
-        para("Asterisk: *"),
-        para("Underscore: _"),
-        para("Left brace: {"),
-        para("Right brace: }"),
-        para("Left bracket: ["),
-        para("Right bracket: ]"),
-        para("Left paren: ("),
-        para("Right paren: )"),
-        para("Greater-than: >"),
-        para("Hash: #"),
-        para("Period: ."),
-        para("Bang: !"),
-        para("Plus: +"),
-        para("Minus: -"),
-
-        para("These should not, because they occur within a code block:"),
-
-        verb("Backslash: \\\\\n",
-             "\n",
-             "Backtick: \\`\n",
-             "\n",
-             "Asterisk: \\*\n",
-             "\n",
-             "Underscore: \\_\n",
-             "\n",
-             "Left brace: \\{\n",
-             "\n",
-             "Right brace: \\}\n",
-             "\n",
-             "Left bracket: \\[\n",
-             "\n",
-             "Right bracket: \\]\n",
-             "\n",
-             "Left paren: \\(\n",
-             "\n",
-             "Right paren: \\)\n",
-             "\n",
-             "Greater-than: \\>\n",
-             "\n",
-             "Hash: \\#\n",
-             "\n",
-             "Period: \\.\n",
-             "\n",
-             "Bang: \\!\n",
-             "\n",
-             "Plus: \\+\n",
-             "\n",
-             "Minus: \\-\n"),
-
-        para("Nor should these, which occur in code spans:"),
-
-        para("Backslash: <code>\\\\</code>"),
-        para("Backtick: <code>\\`</code>"),
-        para("Asterisk: <code>\\*</code>"),
-        para("Underscore: <code>\\_</code>"),
-        para("Left brace: <code>\\{</code>"),
-        para("Right brace: <code>\\}</code>"),
-        para("Left bracket: <code>\\[</code>"),
-        para("Right bracket: <code>\\]</code>"),
-        para("Left paren: <code>\\(</code>"),
-        para("Right paren: <code>\\)</code>"),
-        para("Greater-than: <code>\\></code>"),
-        para("Hash: <code>\\#</code>"),
-        para("Period: <code>\\.</code>"),
-        para("Bang: <code>\\!</code>"),
-        para("Plus: <code>\\+</code>"),
-        para("Minus: <code>\\-</code>"),
-
-        para("These should get escaped, even though they're matching pairs for\n" +
-             "other Markdown constructs:"),
-
-        para("\*asterisks\*"),
-        para("\_underscores\_"),
-        para("`backticks`"),
-
-        para("This is a code span with a literal backslash-backtick " +
-             "sequence: <code>\\`</code>"),
-
-        para("This is a tag with unescaped backticks " +
-             "<span attr='`ticks`'>bar</span>."),
-
-        para("This is a tag with backslashes " +
-             "<span attr='\\\\backslashes\\\\'>bar</span>."))
-
-    assert_equal expected, doc
-  end
-
-  def test_blockquotes_with_code_blocks
-    input = File.read "#{MARKDOWN_TEST_PATH}/Blockquotes with code blocks.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("Example:"),
-          verb("sub status {\n",
-               "    print \"working\";\n",
-               "}\n"),
-          para("Or:"),
-          verb("sub status {\n",
-               "    return \"working\";\n",
-               "}\n")))
-
-    assert_equal expected, doc
-  end
-
-  def test_code_blocks
-    input = File.read "#{MARKDOWN_TEST_PATH}/Code Blocks.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        verb("code block on the first line\n"),
-        para("Regular text."),
-
-        verb("code block indented by spaces\n"),
-        para("Regular text."),
-
-        verb("the lines in this block  \n",
-             "all contain trailing spaces  \n"),
-        para("Regular Text."),
-
-        verb("code block on the last line\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_code_spans
-    input = File.read "#{MARKDOWN_TEST_PATH}/Code Spans.text"
-
-    doc = @parser.parse input
-
-    expected = doc(
-      para("<code><test a=\"</code> content of attribute <code>\"></code>"),
-      para("Fix for backticks within HTML tag: " +
-           "<span attr='`ticks`'>like this</span>"),
-      para("Here's how you put <code>`backticks`</code> in a code span."))
-
-    assert_equal expected, doc
-  end
-
-  def test_hard_wrapped_paragraphs_with_list_like_lines
-    input = File.read "#{MARKDOWN_TEST_PATH}/Hard-wrapped paragraphs with list-like lines.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("In Markdown 1.0.0 and earlier. Version\n" +
-             "8. This line turns into a list item.\n"   +
-             "Because a hard-wrapped line in the\n"     +
-             "middle of a paragraph looked like a\n"    +
-             "list item."),
-        para("Here's one with a bullet.\n" +
-             "* criminey."))
-
-    assert_equal expected, doc
-  end
-
-  def test_horizontal_rules
-    input = File.read "#{MARKDOWN_TEST_PATH}/Horizontal rules.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Dashes:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("---\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("- - -\n"),
-
-        para("Asterisks:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("***\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("* * *\n"),
-
-        para("Underscores:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("___\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("_ _ _\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_advanced
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML (Advanced).text"
-
-    @parser.html = true
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Simple block on one line:"),
-        raw("<div>foo</div>"),
-        para("And nested without indentation:"),
-        raw(<<-RAW.chomp))
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"/>
-</div>
-<div>bar</div>
-</div>
-        RAW
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_simple
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML (Simple).text"
-
-    @parser.html = true
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-       para("Here's a simple block:"),
-       raw("<div>\n\tfoo\n</div>"),
-
-       para("This should be a code block, though:"),
-       verb("<div>\n",
-            "\tfoo\n",
-            "</div>\n"),
-
-       para("As should this:"),
-       verb("<div>foo</div>\n"),
-
-       para("Now, nested:"),
-       raw("<div>\n\t<div>\n\t\t<div>\n\t\t\tfoo\n" +
-           "\t\t</div>\n\t</div>\n</div>"),
-
-       para("This should just be an HTML comment:"),
-       raw("<!-- Comment -->"),
-
-       para("Multiline:"),
-       raw("<!--\nBlah\nBlah\n-->"),
-
-       para("Code block:"),
-       verb("<!-- Comment -->\n"),
-
-       para("Just plain comment, with trailing spaces on the line:"),
-       raw("<!-- foo -->"),
-
-       para("Code:"),
-       verb("<hr />\n"),
-
-       para("Hr's:"),
-       raw("<hr>"),
-       raw("<hr/>"),
-       raw("<hr />"),
-
-       raw("<hr>"),
-       raw("<hr/>"),
-       raw("<hr />"),
-
-       raw("<hr class=\"foo\" id=\"bar\" />"),
-       raw("<hr class=\"foo\" id=\"bar\"/>"),
-       raw("<hr class=\"foo\" id=\"bar\" >"))
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_comments
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML comments.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Paragraph one."),
-
-        raw("<!-- This is a simple comment -->"),
-
-        raw("<!--\n\tThis is another comment.\n-->"),
-
-        para("Paragraph two."),
-
-        raw("<!-- one comment block -- -- with two comments -->"),
-
-        para("The end."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_inline_style
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, inline style.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Just a {URL}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{Empty}[]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_reference_style
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, reference style.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."),
-
-        para("With {embedded [brackets]}[/url/]."),
-
-        para("Indented {once}[/url]."),
-        para("Indented {twice}[/url]."),
-        para("Indented {thrice}[/url]."),
-        para("Indented [four][] times."),
-
-        verb("[four]: /url\n"),
-
-        rule(1),
-
-        para("{this}[foo] should work"),
-        para("So should {this}[foo]."),
-        para("And {this}[foo]."),
-        para("And {this}[foo]."),
-        para("And {this}[foo]."),
-
-        para("But not [that] []."),
-        para("Nor [that][]."),
-        para("Nor [that]."),
-
-        para("[Something in brackets like {this}[foo] should work]"),
-        para("[Same with {this}[foo].]"),
-
-        para("In this case, {this}[/somethingelse/] points to something else."),
-        para("Backslashing should suppress [this] and [this]."),
-
-        rule(1),
-
-        para("Here's one where the {link breaks}[/url/] across lines."),
-        para("Here's another where the {link breaks}[/url/] across lines, " +
-             "but with a line-ending space."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_shortcut_references
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, shortcut references.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("This is the {simple case}[/simple]."),
-        para("This one has a {line break}[/foo]."),
-        para("This one has a {line break}[/foo] with a line-ending space."),
-        para("{this}[/that] and the {other}[/other]"))
-
-    assert_equal expected, doc
-  end
-
-  def test_literal_quotes_in_titles
-    input = File.read "#{MARKDOWN_TEST_PATH}/Literal quotes in titles.text"
-
-    doc = @parser.parse input
-
-    # TODO support title attribute
-    expected =
-      doc(
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_markdown_documentation_basics
-    input = File.read "#{MARKDOWN_TEST_PATH}/Markdown Documentation - Basics.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(1, "Markdown: Basics"),
-
-        raw(<<-RAW.chomp),
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a class="selected" title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-        RAW
-
-        head(2, "Getting the Gist of Markdown's Formatting Syntax"),
-
-        para("This page offers a brief overview of what it's like to use Markdown.\n" +
-             "The {syntax page}[/projects/markdown/syntax] provides complete, detailed documentation for\n" +
-             "every feature, but Markdown should be very easy to pick up simply by\n" +
-             "looking at a few examples of it in action. The examples on this page\n" +
-             "are written in a before/after style, showing example syntax and the\n" +
-             "HTML output produced by Markdown."),
-
-        para("It's also helpful to simply try Markdown out; the {Dingus}[/projects/markdown/dingus] is a\n" +
-             "web application that allows you type your own Markdown-formatted text\n" +
-             "and translate it to XHTML."),
-
-        para("<b>Note:</b> This document is itself written using Markdown; you\n" +
-             "can {see the source for it by adding '.text' to the URL}[/projects/markdown/basics.text]."),
-
-        head(2, "Paragraphs, Headers, Blockquotes"),
-
-        para("A paragraph is simply one or more consecutive lines of text, separated\n" +
-             "by one or more blank lines. (A blank line is any line that looks like a\n" +
-             "blank line -- a line containing nothing spaces or tabs is considered\n" +
-             "blank.) Normal paragraphs should not be intended with spaces or tabs."),
-
-        para("Markdown offers two styles of headers: _Setext_ and _atx_.\n" +
-             "Setext-style headers for <code><h1></code> and <code><h2></code> are created by\n" +
-             "\"underlining\" with equal signs (<code>=</code>) and hyphens (<code>-</code>), respectively.\n" +
-             "To create an atx-style header, you put 1-6 hash marks (<code>#</code>) at the\n" +
-             "beginning of the line -- the number of hashes equals the resulting\n" +
-             "HTML header level."),
-
-        para("Blockquotes are indicated using email-style '<code>></code>' angle brackets."),
-
-        para("Markdown:"),
-
-        verb("A First Level Header\n",
-             "====================\n",
-             "\n",
-             "A Second Level Header\n",
-             "---------------------\n",
-             "\n",
-             "Now is the time for all good men to come to\n",
-             "the aid of their country. This is just a\n",
-             "regular paragraph.\n",
-             "\n",
-             "The quick brown fox jumped over the lazy\n",
-             "dog's back.\n",
-             "\n",
-             "### Header 3\n",
-             "\n",
-             "> This is a blockquote.\n",
-             "> \n",
-             "> This is the second paragraph in the blockquote.\n",
-             ">\n",
-             "> ## This is an H2 in a blockquote\n"),
-
-        para("Output:"),
-
-        verb("<h1>A First Level Header</h1>\n",
-             "\n",
-             "<h2>A Second Level Header</h2>\n",
-             "\n",
-             "<p>Now is the time for all good men to come to\n",
-             "the aid of their country. This is just a\n",
-             "regular paragraph.</p>\n",
-             "\n",
-             "<p>The quick brown fox jumped over the lazy\n",
-             "dog's back.</p>\n",
-             "\n",
-             "<h3>Header 3</h3>\n",
-             "\n",
-             "<blockquote>\n",
-             "    <p>This is a blockquote.</p>\n",
-             "\n",
-             "    <p>This is the second paragraph in the blockquote.</p>\n",
-             "\n",
-             "    <h2>This is an H2 in a blockquote</h2>\n",
-             "</blockquote>\n"),
-
-        head(3, "Phrase Emphasis"),
-        para("Markdown uses asterisks and underscores to indicate spans of emphasis."),
-
-        para("Markdown:"),
-
-        verb("Some of these words *are emphasized*.\n",
-             "Some of these words _are emphasized also_.\n",
-             "\n",
-             "Use two asterisks for **strong emphasis**.\n",
-             "Or, if you prefer, __use two underscores instead__.\n"),
-
-        para("Output:"),
-
-        verb("<p>Some of these words <em>are emphasized</em>.\n",
-             "Some of these words <em>are emphasized also</em>.</p>\n",
-             "\n",
-             "<p>Use two asterisks for <strong>strong emphasis</strong>.\n",
-             "Or, if you prefer, <strong>use two underscores instead</strong>.</p>\n"),
-
-        head(2, "Lists"),
-
-        para("Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,\n" +
-             "<code>+</code>, and <code>-</code>) as list markers. These three markers are\n" +
-             "interchangeable; this:"),
-
-        verb("*   Candy.\n",
-             "*   Gum.\n",
-             "*   Booze.\n"),
-
-        para("this:"),
-
-        verb("+   Candy.\n",
-             "+   Gum.\n",
-             "+   Booze.\n"),
-
-        para("and this:"),
-
-        verb("-   Candy.\n",
-             "-   Gum.\n",
-             "-   Booze.\n"),
-
-        para("all produce the same output:"),
-
-        verb("<ul>\n",
-             "<li>Candy.</li>\n",
-             "<li>Gum.</li>\n",
-             "<li>Booze.</li>\n",
-             "</ul>\n"),
-
-        para("Ordered (numbered) lists use regular numbers, followed by periods, as\n" +
-             "list markers:"),
-
-        verb("1.  Red\n",
-             "2.  Green\n",
-             "3.  Blue\n"),
-
-        para("Output:"),
-
-        verb("<ol>\n",
-             "<li>Red</li>\n",
-             "<li>Green</li>\n",
-             "<li>Blue</li>\n",
-             "</ol>\n"),
-
-        para("If you put blank lines between items, you'll get <code><p></code> tags for the\n" +
-             "list item text. You can create multi-paragraph list items by indenting\n" +
-             "the paragraphs by 4 spaces or 1 tab:"),
-
-        verb("*   A list item.\n",
-             "\n",
-             "    With multiple paragraphs.\n",
-             "\n",
-             "*   Another item in the list.\n"),
-
-        para("Output:"),
-
-        verb("<ul>\n",
-             "<li><p>A list item.</p>\n",
-             "<p>With multiple paragraphs.</p></li>\n",
-             "<li><p>Another item in the list.</p></li>\n",
-             "</ul>\n"),
-
-        head(3, "Links"),
-
-        para("Markdown supports two styles for creating links: _inline_ and\n" +
-             "_reference_. With both styles, you use square brackets to delimit the\n" +
-             "text you want to turn into a link."),
-
-        para("Inline-style links use parentheses immediately after the link text.\n" +
-             "For example:"),
-
-        verb("This is an [example link](http://example.com/).\n"),
-
-        para("Output:"),
-
-        verb("<p>This is an <a href=\"http://example.com/\">\n",
-             "example link</a>.</p>\n"),
-
-        para("Optionally, you may include a title attribute in the parentheses:"),
-
-        verb("This is an [example link](http://example.com/ \"With a Title\").\n"),
-
-        para("Output:"),
-
-        verb("<p>This is an <a href=\"http://example.com/\" title=\"With a Title\">\n",
-             "example link</a>.</p>\n"),
-
-        para("Reference-style links allow you to refer to your links by names, which\n" +
-             "you define elsewhere in your document:"),
-
-        verb("I get 10 times more traffic from [Google][1] than from\n",
-             "[Yahoo][2] or [MSN][3].\n",
-             "\n",
-             "[1]: http://google.com/        \"Google\"\n",
-             "[2]: http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "[3]: http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Output:"),
-
-        verb("<p>I get 10 times more traffic from <a href=\"http://google.com/\"\n",
-             "title=\"Google\">Google</a> than from <a href=\"http://search.yahoo.com/\"\n",
-             "title=\"Yahoo Search\">Yahoo</a> or <a href=\"http://search.msn.com/\"\n",
-             "title=\"MSN Search\">MSN</a>.</p>\n"),
-
-        para("The title attribute is optional. Link names may contain letters,\n" +
-             "numbers and spaces, but are _not_ case sensitive:"),
-
-        verb("I start my morning with a cup of coffee and\n",
-             "[The New York Times][NY Times].\n",
-             "\n",
-             "[ny times]: http://www.nytimes.com/\n"),
-
-        para("Output:"),
-
-        verb("<p>I start my morning with a cup of coffee and\n",
-             "<a href=\"http://www.nytimes.com/\">The New York Times</a>.</p>\n"),
-
-        head(3, "Images"),
-
-        para("Image syntax is very much like link syntax."),
-
-        para("Inline (titles are optional):"),
-
-        verb("![alt text](/path/to/img.jpg \"Title\")\n"),
-
-        para("Reference-style:"),
-
-        verb("![alt text][id]\n",
-             "\n",
-             "[id]: /path/to/img.jpg \"Title\"\n"),
-
-        para("Both of the above examples produce the same output:"),
-
-        verb("<img src=\"/path/to/img.jpg\" alt=\"alt text\" title=\"Title\" />\n"),
-
-        head(3, "Code"),
-
-        para("In a regular paragraph, you can create code span by wrapping text in\n" +
-             "backtick quotes. Any ampersands (<code>&</code>) and angle brackets (<code><</code> or\n" +
-             "<code>></code>) will automatically be translated into HTML entities. This makes\n" +
-             "it easy to use Markdown to write about HTML example code:"),
-
-        verb(
-             "I strongly recommend against using any `<blink>` tags.\n",
-             "\n",
-             "I wish SmartyPants used named entities like `&mdash;`\n",
-             "instead of decimal-encoded entities like `&#8212;`.\n"),
-
-        para("Output:"),
-
-        verb("<p>I strongly recommend against using any\n",
-             "<code>&lt;blink&gt;</code> tags.</p>\n",
-             "\n",
-             "<p>I wish SmartyPants used named entities like\n",
-             "<code>&amp;mdash;</code> instead of decimal-encoded\n",
-             "entities like <code>&amp;#8212;</code>.</p>\n"),
-
-        para("To specify an entire block of pre-formatted code, indent every line of\n" +
-             "the block by 4 spaces or 1 tab. Just like with code spans, <code>&</code>, <code><</code>,\n" +
-             "and <code>></code> characters will be escaped automatically."),
-
-        para("Markdown:"),
-
-        verb("If you want your page to validate under XHTML 1.0 Strict,\n",
-             "you've got to put paragraph tags in your blockquotes:\n",
-             "\n",
-             "    <blockquote>\n",
-             "        <p>For example.</p>\n",
-             "    </blockquote>\n"),
-
-        para("Output:"),
-
-        verb("<p>If you want your page to validate under XHTML 1.0 Strict,\n",
-             "you've got to put paragraph tags in your blockquotes:</p>\n",
-             "\n",
-             "<pre><code>&lt;blockquote&gt;\n",
-             "    &lt;p&gt;For example.&lt;/p&gt;\n",
-             "&lt;/blockquote&gt;\n",
-             "</code></pre>\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_markdown_documentation_syntax
-    input = File.read "#{MARKDOWN_TEST_PATH}/Markdown Documentation - Syntax.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(1, "Markdown: Syntax"),
-
-        raw(<<-RAW.chomp),
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-        RAW
-
-        list(:BULLET,
-          item(nil,
-            para("{Overview}[#overview]"),
-            list(:BULLET,
-              item(nil,
-                para("{Philosophy}[#philosophy]")),
-              item(nil,
-                para("{Inline HTML}[#html]")),
-              item(nil,
-                para("{Automatic Escaping for Special Characters}[#autoescape]")))),
-          item(nil,
-            para("{Block Elements}[#block]"),
-            list(:BULLET,
-              item(nil,
-                para("{Paragraphs and Line Breaks}[#p]")),
-              item(nil,
-                para("{Headers}[#header]")),
-              item(nil,
-                para("{Blockquotes}[#blockquote]")),
-              item(nil,
-                para("{Lists}[#list]")),
-              item(nil,
-                para("{Code Blocks}[#precode]")),
-              item(nil,
-                para("{Horizontal Rules}[#hr]")))),
-          item(nil,
-            para("{Span Elements}[#span]"),
-            list(:BULLET,
-              item(nil,
-                para("{Links}[#link]")),
-              item(nil,
-                para("{Emphasis}[#em]")),
-              item(nil,
-                para("{Code}[#code]")),
-              item(nil,
-                para("{Images}[#img]")))),
-          item(nil,
-            para("{Miscellaneous}[#misc]"),
-            list(:BULLET,
-              item(nil,
-                para("{Backslash Escapes}[#backslash]")),
-              item(nil,
-                para("{Automatic Links}[#autolink]"))))),
-
-        para("<b>Note:</b> This document is itself written using Markdown; you\n" +
-             "can {see the source for it by adding '.text' to the URL}[/projects/markdown/syntax.text]."),
-
-        rule(1),
-
-        raw("<h2 id=\"overview\">Overview</h2>"),
-
-        raw("<h3 id=\"philosophy\">Philosophy</h3>"),
-
-        para("Markdown is intended to be as easy-to-read and easy-to-write as is feasible."),
-
-        para("Readability, however, is emphasized above all else. A Markdown-formatted\n" +
-             "document should be publishable as-is, as plain text, without looking\n" +
-             "like it's been marked up with tags or formatting instructions. While\n" +
-             "Markdown's syntax has been influenced by several existing text-to-HTML\n" +
-             "filters -- including {Setext}[http://docutils.sourceforge.net/mirror/setext.html], {atx}[http://www.aaronsw.com/2002/atx/], {Textile}[http://textism.com/tools/textile/], {reStructuredText}[http://docutils.sourceforge.net/rst.html],\n" +
-             "{Grutatext}[http://www.triptico.com/software/grutatxt.html], and {EtText}[http://ettext.taint.org/doc/] -- the single biggest source of\n" +
-             "inspiration for Markdown's syntax is the format of plain text email."),
-
-        para("To this end, Markdown's syntax is comprised entirely of punctuation\n" +
-             "characters, which punctuation characters have been carefully chosen so\n" +
-             "as to look like what they mean. E.g., asterisks around a word actually\n" +
-             "look like \*emphasis\*. Markdown lists look like, well, lists. Even\n" +
-             "blockquotes look like quoted passages of text, assuming you've ever\n" +
-             "used email."),
-
-        raw("<h3 id=\"html\">Inline HTML</h3>"),
-
-        para("Markdown's syntax is intended for one purpose: to be used as a\n" +
-             "format for _writing_ for the web."),
-
-        para("Markdown is not a replacement for HTML, or even close to it. Its\n" +
-             "syntax is very small, corresponding only to a very small subset of\n" +
-             "HTML tags. The idea is _not_ to create a syntax that makes it easier\n" +
-             "to insert HTML tags. In my opinion, HTML tags are already easy to\n" +
-             "insert. The idea for Markdown is to make it easy to read, write, and\n" +
-             "edit prose. HTML is a _publishing_ format; Markdown is a _writing_\n" +
-             "format. Thus, Markdown's formatting syntax only addresses issues that\n" +
-             "can be conveyed in plain text."),
-
-        para("For any markup that is not covered by Markdown's syntax, you simply\n" +
-             "use HTML itself. There's no need to preface it or delimit it to\n" +
-             "indicate that you're switching from Markdown to HTML; you just use\n" +
-             "the tags."),
-
-        para("The only restrictions are that block-level HTML elements -- e.g. <code><div></code>,\n" +
-             "<code><table></code>, <code><pre></code>, <code><p></code>, etc. -- must be separated from surrounding\n" +
-             "content by blank lines, and the start and end tags of the block should\n" +
-             "not be indented with tabs or spaces. Markdown is smart enough not\n" +
-             "to add extra (unwanted) <code><p></code> tags around HTML block-level tags."),
-
-        para("For example, to add an HTML table to a Markdown article:"),
-
-        verb("This is a regular paragraph.\n",
-             "\n",
-             "<table>\n",
-             "    <tr>\n",
-             "        <td>Foo</td>\n",
-             "    </tr>\n",
-             "</table>\n",
-             "\n",
-             "This is another regular paragraph.\n"),
-
-        para("Note that Markdown formatting syntax is not processed within block-level\n" +
-             "HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code> inside an\n" +
-             "HTML block."),
-
-        para("Span-level HTML tags -- e.g. <code><span></code>, <code><cite></code>, or <code><del></code> -- can be\n" +
-             "used anywhere in a Markdown paragraph, list item, or header. If you\n" +
-             "want, you can even use HTML tags instead of Markdown formatting; e.g. if\n" +
-             "you'd prefer to use HTML <code><a></code> or <code><img></code> tags instead of Markdown's\n" +
-             "link or image syntax, go right ahead."),
-
-        para("Unlike block-level HTML tags, Markdown syntax _is_ processed within\n" +
-             "span-level tags."),
-
-        raw("<h3 id=\"autoescape\">Automatic Escaping for Special Characters</h3>"),
-
-        para("In HTML, there are two characters that demand special treatment: <code><</code>\n" +
-             "and <code>&</code>. Left angle brackets are used to start tags; ampersands are\n" +
-             "used to denote HTML entities. If you want to use them as literal\n" +
-             "characters, you must escape them as entities, e.g. <code>&lt;</code>, and\n" +
-             "<code>&amp;</code>."),
-
-        para("Ampersands in particular are bedeviling for web writers. If you want to\n" +
-             "write about 'AT&T', you need to write '<code>AT&amp;T</code>'. You even need to\n" +
-             "escape ampersands within URLs. Thus, if you want to link to:"),
-
-        verb("http://images.google.com/images?num=30&q=larry+bird\n"),
-
-        para("you need to encode the URL as:"),
-
-        verb("http://images.google.com/images?num=30&amp;q=larry+bird\n"),
-
-        para("in your anchor tag <code>href</code> attribute. Needless to say, this is easy to\n" +
-             "forget, and is probably the single most common source of HTML validation\n" +
-             "errors in otherwise well-marked-up web sites."),
-
-        para("Markdown allows you to use these characters naturally, taking care of\n" +
-             "all the necessary escaping for you. If you use an ampersand as part of\n" +
-             "an HTML entity, it remains unchanged; otherwise it will be translated\n" +
-             "into <code>&amp;</code>."),
-
-        para("So, if you want to include a copyright symbol in your article, you can write:"),
-
-        verb("&copy;\n"),
-
-        para("and Markdown will leave it alone. But if you write:"),
-
-        verb("AT&T\n"),
-
-        para("Markdown will translate it to:"),
-
-        verb("AT&amp;T\n"),
-
-        para("Similarly, because Markdown supports {inline HTML}[#html], if you use\n" +
-             "angle brackets as delimiters for HTML tags, Markdown will treat them as\n" +
-             "such. But if you write:"),
-
-        verb("4 < 5\n"),
-
-        para("Markdown will translate it to:"),
-
-        verb("4 &lt; 5\n"),
-
-        para("However, inside Markdown code spans and blocks, angle brackets and\n" +
-             "ampersands are _always_ encoded automatically. This makes it easy to use\n" +
-             "Markdown to write about HTML code. (As opposed to raw HTML, which is a\n" +
-             "terrible format for writing about HTML syntax, because every single <code><</code>\n" +
-             "and <code>&</code> in your example code needs to be escaped.)"),
-
-        rule(1),
-
-        raw("<h2 id=\"block\">Block Elements</h2>"),
-
-        raw("<h3 id=\"p\">Paragraphs and Line Breaks</h3>"),
-
-        para("A paragraph is simply one or more consecutive lines of text, separated\n" +
-             "by one or more blank lines. (A blank line is any line that looks like a\n" +
-             "blank line -- a line containing nothing but spaces or tabs is considered\n" +
-             "blank.) Normal paragraphs should not be intended with spaces or tabs."),
-
-        para("The implication of the \"one or more consecutive lines of text\" rule is\n" +
-             "that Markdown supports \"hard-wrapped\" text paragraphs. This differs\n" +
-             "significantly from most other text-to-HTML formatters (including Movable\n" +
-             "Type's \"Convert Line Breaks\" option) which translate every line break\n" +
-             "character in a paragraph into a <code><br /></code> tag."),
-
-        para("When you _do_ want to insert a <code><br /></code> break tag using Markdown, you\n" +
-             "end a line with two or more spaces, then type return."),
-
-        para("Yes, this takes a tad more effort to create a <code><br /></code>, but a simplistic\n" +
-             "\"every line break is a <code><br /></code>\" rule wouldn't work for Markdown.\n" +
-             "Markdown's email-style {blockquoting}[#blockquote] and multi-paragraph {list items}[#list]\n" +
-             "work best -- and look better -- when you format them with hard breaks."),
-
-        raw("<h3 id=\"header\">Headers</h3>"),
-
-        para("Markdown supports two styles of headers, {Setext}[http://docutils.sourceforge.net/mirror/setext.html] and {atx}[http://www.aaronsw.com/2002/atx/]."),
-
-        para("Setext-style headers are \"underlined\" using equal signs (for first-level\n" +
-             "headers) and dashes (for second-level headers). For example:"),
-
-        verb("This is an H1\n",
-             "=============\n",
-             "\n",
-             "This is an H2\n",
-             "-------------\n"),
-
-        para("Any number of underlining <code>=</code>'s or <code>-</code>'s will work."),
-
-        para("Atx-style headers use 1-6 hash characters at the start of the line,\n" +
-             "corresponding to header levels 1-6. For example:"),
-
-        verb("# This is an H1\n",
-             "\n",
-             "## This is an H2\n",
-             "\n",
-             "###### This is an H6\n"),
-
-        para("Optionally, you may \"close\" atx-style headers. This is purely\n" +
-             "cosmetic -- you can use this if you think it looks better. The\n" +
-             "closing hashes don't even need to match the number of hashes\n" +
-             "used to open the header. (The number of opening hashes\n" +
-             "determines the header level.) :"),
-
-        verb("# This is an H1 #\n",
-             "\n",
-             "## This is an H2 ##\n",
-             "\n",
-             "### This is an H3 ######\n"),
-
-        raw("<h3 id=\"blockquote\">Blockquotes</h3>"),
-
-        para(
-             "Markdown uses email-style <code>></code> characters for blockquoting. If you're\n" +
-             "familiar with quoting passages of text in an email message, then you\n" +
-             "know how to create a blockquote in Markdown. It looks best if you hard\n" +
-             "wrap the text and put a <code>></code> before every line:"),
-
-        verb("> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,\n",
-             "> consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.\n",
-             "> Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "> \n",
-             "> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse\n",
-             "> id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("Markdown allows you to be lazy and only put the <code>></code> before the first\n" +
-             "line of a hard-wrapped paragraph:"),
-
-        verb("> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,\n",
-             "consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.\n",
-             "Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "\n",
-             "> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse\n",
-             "id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by\n" +
-             "adding additional levels of <code>></code>:"),
-
-        verb("> This is the first level of quoting.\n",
-             ">\n",
-             "> > This is nested blockquote.\n",
-             ">\n",
-             "> Back to the first level.\n"),
-
-        para("Blockquotes can contain other Markdown elements, including headers, lists,\n" +
-             "and code blocks:"),
-
-        verb("> ## This is a header.\n",
-             "> \n",
-             "> 1.   This is the first list item.\n",
-             "> 2.   This is the second list item.\n",
-             "> \n",
-             "> Here's some example code:\n",
-             "> \n",
-             ">     return shell_exec(\"echo $input | $markdown_script\");\n"),
-
-        para("Any decent text editor should make email-style quoting easy. For\n" +
-             "example, with BBEdit, you can make a selection and choose Increase\n" +
-             "Quote Level from the Text menu."),
-
-        raw("<h3 id=\"list\">Lists</h3>"),
-
-        para("Markdown supports ordered (numbered) and unordered (bulleted) lists."),
-
-        para("Unordered lists use asterisks, pluses, and hyphens -- interchangeably\n" +
-             "-- as list markers:"),
-
-        verb("*   Red\n",
-             "*   Green\n",
-             "*   Blue\n"),
-
-        para("is equivalent to:"),
-
-        verb("+   Red\n",
-             "+   Green\n",
-             "+   Blue\n"),
-
-        para("and:"),
-
-        verb("-   Red\n",
-             "-   Green\n",
-             "-   Blue\n"),
-
-        para("Ordered lists use numbers followed by periods:"),
-
-        verb("1.  Bird\n",
-             "2.  McHale\n",
-             "3.  Parish\n"),
-
-        para("It's important to note that the actual numbers you use to mark the\n" +
-             "list have no effect on the HTML output Markdown produces. The HTML\n" +
-             "Markdown produces from the above list is:"),
-
-        verb("<ol>\n",
-             "<li>Bird</li>\n",
-             "<li>McHale</li>\n",
-             "<li>Parish</li>\n",
-             "</ol>\n"),
-
-        para("If you instead wrote the list in Markdown like this:"),
-
-        verb("1.  Bird\n",
-             "1.  McHale\n",
-             "1.  Parish\n"),
-
-        para("or even:"),
-
-        verb("3. Bird\n",
-             "1. McHale\n",
-             "8. Parish\n"),
-
-        para("you'd get the exact same HTML output. The point is, if you want to,\n" +
-             "you can use ordinal numbers in your ordered Markdown lists, so that\n" +
-             "the numbers in your source match the numbers in your published HTML.\n" +
-             "But if you want to be lazy, you don't have to."),
-
-        para("If you do use lazy list numbering, however, you should still start the\n" +
-             "list with the number 1. At some point in the future, Markdown may support\n" +
-             "starting ordered lists at an arbitrary number."),
-
-        para("List markers typically start at the left margin, but may be indented by\n" +
-             "up to three spaces. List markers must be followed by one or more spaces\n" +
-             "or a tab."),
-
-        para("To make lists look nice, you can wrap items with hanging indents:"),
-
-        verb("*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\n",
-             "    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,\n",
-             "    viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.\n",
-             "    Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("But if you want to be lazy, you don't have to:"),
-
-        verb("*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\n",
-             "Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,\n",
-             "viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.\n",
-             "Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("If list items are separated by blank lines, Markdown will wrap the\n" +
-             "items in <code><p></code> tags in the HTML output. For example, this input:"),
-
-        verb("*   Bird\n",
-             "*   Magic\n"),
-
-        para("will turn into:"),
-
-        verb("<ul>\n",
-             "<li>Bird</li>\n",
-             "<li>Magic</li>\n",
-             "</ul>\n"),
-
-        para("But this:"),
-
-        verb("*   Bird\n",
-             "\n",
-             "*   Magic\n"),
-
-        para("will turn into:"),
-
-        verb("<ul>\n",
-             "<li><p>Bird</p></li>\n",
-             "<li><p>Magic</p></li>\n",
-             "</ul>\n"),
-
-        para("List items may consist of multiple paragraphs. Each subsequent\n" +
-             "paragraph in a list item must be intended by either 4 spaces\n" +
-             "or one tab:"),
-
-        verb("1.  This is a list item with two paragraphs. Lorem ipsum dolor\n",
-             "    sit amet, consectetuer adipiscing elit. Aliquam hendrerit\n",
-             "    mi posuere lectus.\n",
-             "\n",
-             "    Vestibulum enim wisi, viverra nec, fringilla in, laoreet\n",
-             "    vitae, risus. Donec sit amet nisl. Aliquam semper ipsum\n",
-             "    sit amet velit.\n",
-             "\n",
-             "2.  Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("It looks nice if you indent every line of the subsequent\n" +
-             "paragraphs, but here again, Markdown will allow you to be\n" +
-             "lazy:"),
-
-        verb("*   This is a list item with two paragraphs.\n",
-             "\n",
-             "    This is the second paragraph in the list item. You're\n",
-             "only required to indent the first line. Lorem ipsum dolor\n",
-             "sit amet, consectetuer adipiscing elit.\n",
-             "\n",
-             "*   Another item in the same list.\n"),
-
-        para("To put a blockquote within a list item, the blockquote's <code>></code>\n" +
-             "delimiters need to be indented:"),
-
-        verb("*   A list item with a blockquote:\n",
-             "\n",
-             "    > This is a blockquote\n",
-             "    > inside a list item.\n"),
-
-        para(
-             "To put a code block within a list item, the code block needs\n" +
-             "to be indented _twice_ -- 8 spaces or two tabs:"),
-
-        verb("*   A list item with a code block:\n",
-             "\n",
-             "        <code goes here>\n"),
-
-        para("It's worth noting that it's possible to trigger an ordered list by\n" +
-             "accident, by writing something like this:"),
-
-        verb("1986. What a great season.\n"),
-
-        para("In other words, a <em>number-period-space</em> sequence at the beginning of a\n" +
-             "line. To avoid this, you can backslash-escape the period:"),
-
-        verb("1986\\. What a great season.\n"),
-
-        raw("<h3 id=\"precode\">Code Blocks</h3>"),
-
-        para("Pre-formatted code blocks are used for writing about programming or\n" +
-             "markup source code. Rather than forming normal paragraphs, the lines\n" +
-             "of a code block are interpreted literally. Markdown wraps a code block\n" +
-             "in both <code><pre></code> and <code><code></code> tags."),
-
-        para("To produce a code block in Markdown, simply indent every line of the\n" +
-             "block by at least 4 spaces or 1 tab. For example, given this input:"),
-
-        verb("This is a normal paragraph:\n",
-             "\n",
-             "    This is a code block.\n"),
-
-        para("Markdown will generate:"),
-
-        verb("<p>This is a normal paragraph:</p>\n",
-             "\n",
-             "<pre><code>This is a code block.\n",
-             "</code></pre>\n"),
-
-        para("One level of indentation -- 4 spaces or 1 tab -- is removed from each\n" +
-             "line of the code block. For example, this:"),
-
-        verb("Here is an example of AppleScript:\n",
-             "\n",
-             "    tell application \"Foo\"\n",
-             "        beep\n",
-             "    end tell\n"),
-
-        para("will turn into:"),
-
-        verb("<p>Here is an example of AppleScript:</p>\n",
-             "\n",
-             "<pre><code>tell application \"Foo\"\n",
-             "    beep\n",
-             "end tell\n",
-             "</code></pre>\n"),
-
-        para("A code block continues until it reaches a line that is not indented\n" +
-             "(or the end of the article)."),
-
-        para("Within a code block, ampersands (<code>&</code>) and angle brackets (<code><</code> and <code>></code>)\n" +
-             "are automatically converted into HTML entities. This makes it very\n" +
-             "easy to include example HTML source code using Markdown -- just paste\n" +
-             "it and indent it, and Markdown will handle the hassle of encoding the\n" +
-             "ampersands and angle brackets. For example, this:"),
-
-        verb("    <div class=\"footer\">\n",
-             "        &copy; 2004 Foo Corporation\n",
-             "    </div>\n"),
-
-        para("will turn into:"),
-
-        verb("<pre><code>&lt;div class=\"footer\"&gt;\n",
-             "    &amp;copy; 2004 Foo Corporation\n",
-             "&lt;/div&gt;\n",
-             "</code></pre>\n"),
-
-        para("Regular Markdown syntax is not processed within code blocks. E.g.,\n" +
-             "asterisks are just literal asterisks within a code block. This means\n" +
-             "it's also easy to use Markdown to write about Markdown's own syntax."),
-
-        raw("<h3 id=\"hr\">Horizontal Rules</h3>"),
-
-        para("You can produce a horizontal rule tag (<code><hr /></code>) by placing three or\n" +
-             "more hyphens, asterisks, or underscores on a line by themselves. If you\n" +
-             "wish, you may use spaces between the hyphens or asterisks. Each of the\n" +
-             "following lines will produce a horizontal rule:"),
-
-        verb("* * *\n",
-             "\n",
-             "***\n",
-             "\n",
-             "*****\n",
-             "\n",
-             "- - -\n",
-             "\n",
-             "---------------------------------------\n",
-             "\n",
-             "_ _ _\n"),
-
-        rule(1),
-
-        raw("<h2 id=\"span\">Span Elements</h2>"),
-
-        raw("<h3 id=\"link\">Links</h3>"),
-
-        para("Markdown supports two style of links: _inline_ and _reference_."),
-
-        para("In both styles, the link text is delimited by [square brackets]."),
-
-        para("To create an inline link, use a set of regular parentheses immediately\n" +
-             "after the link text's closing square bracket. Inside the parentheses,\n" +
-             "put the URL where you want the link to point, along with an _optional_\n" +
-             "title for the link, surrounded in quotes. For example:"),
-
-        verb("This is [an example](http://example.com/ \"Title\") inline link.\n",
-             "\n",
-             "[This link](http://example.net/) has no title attribute.\n"),
-
-        para("Will produce:"),
-
-        verb("<p>This is <a href=\"http://example.com/\" title=\"Title\">\n",
-             "an example</a> inline link.</p>\n",
-             "\n",
-             "<p><a href=\"http://example.net/\">This link</a> has no\n",
-             "title attribute.</p>\n"),
-
-        para("If you're referring to a local resource on the same server, you can\n" +
-             "use relative paths:"),
-
-        verb("See my [About](/about/) page for details.\n"),
-
-        para("Reference-style links use a second set of square brackets, inside\n" +
-             "which you place a label of your choosing to identify the link:"),
-
-        verb("This is [an example][id] reference-style link.\n"),
-
-        para("You can optionally use a space to separate the sets of brackets:"),
-
-        verb("This is [an example] [id] reference-style link.\n"),
-
-        para("Then, anywhere in the document, you define your link label like this,\n" +
-             "on a line by itself:"),
-
-        verb("[id]: http://example.com/  \"Optional Title Here\"\n"),
-
-        para("That is:"),
-
-        list(:BULLET,
-          item(nil,
-            para("Square brackets containing the link identifier (optionally\n" +
-                 "indented from the left margin using up to three spaces);")),
-          item(nil,
-            para("followed by a colon;")),
-          item(nil,
-            para("followed by one or more spaces (or tabs);")),
-          item(nil,
-            para("followed by the URL for the link;")),
-          item(nil,
-            para("optionally followed by a title attribute for the link, enclosed\n" +
-                 "in double or single quotes."))),
-
-        para("The link URL may, optionally, be surrounded by angle brackets:"),
-
-        verb("[id]: <http://example.com/>  \"Optional Title Here\"\n"),
-
-        para("You can put the title attribute on the next line and use extra spaces\n" +
-             "or tabs for padding, which tends to look better with longer URLs:"),
-
-        verb("[id]: http://example.com/longish/path/to/resource/here\n",
-             "    \"Optional Title Here\"\n"),
-
-        para("Link definitions are only used for creating links during Markdown\n" +
-             "processing, and are stripped from your document in the HTML output."),
-
-        para("Link definition names may consist of letters, numbers, spaces, and punctuation -- but they are _not_ case sensitive. E.g. these two links:"),
-
-        verb("[link text][a]\n",
-             "[link text][A]\n"),
-
-        para("are equivalent."),
-
-        para("The <em>implicit link name</em> shortcut allows you to omit the name of the\n" +
-             "link, in which case the link text itself is used as the name.\n" +
-             "Just use an empty set of square brackets -- e.g., to link the word\n" +
-             "\"Google\" to the google.com web site, you could simply write:"),
-
-        verb("[Google][]\n"),
-
-        para("And then define the link:"),
-
-        verb("[Google]: http://google.com/\n"),
-
-        para("Because link names may contain spaces, this shortcut even works for\n" +
-            "multiple words in the link text:"),
-
-
-        verb("Visit [Daring Fireball][] for more information.\n"),
-
-        para("And then define the link:"),
-
-        verb("[Daring Fireball]: http://daringfireball.net/\n"),
-
-        para("Link definitions can be placed anywhere in your Markdown document. I\n" +
-             "tend to put them immediately after each paragraph in which they're\n" +
-             "used, but if you want, you can put them all at the end of your\n" +
-             "document, sort of like footnotes."),
-
-        para("Here's an example of reference links in action:"),
-
-        verb("I get 10 times more traffic from [Google] [1] than from\n",
-             "[Yahoo] [2] or [MSN] [3].\n",
-             "\n",
-             "  [1]: http://google.com/        \"Google\"\n",
-             "  [2]: http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "  [3]: http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Using the implicit link name shortcut, you could instead write:"),
-
-        verb("I get 10 times more traffic from [Google][] than from\n",
-             "[Yahoo][] or [MSN][].\n",
-             "\n",
-             "  [google]: http://google.com/        \"Google\"\n",
-             "  [yahoo]:  http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "  [msn]:    http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Both of the above examples will produce the following HTML output:"),
-
-        verb("<p>I get 10 times more traffic from <a href=\"http://google.com/\"\n",
-             "title=\"Google\">Google</a> than from\n",
-             "<a href=\"http://search.yahoo.com/\" title=\"Yahoo Search\">Yahoo</a>\n",
-             "or <a href=\"http://search.msn.com/\" title=\"MSN Search\">MSN</a>.</p>\n"),
-
-        para("For comparison, here is the same paragraph written using\n" +
-             "Markdown's inline link style:"),
-
-        verb("I get 10 times more traffic from [Google](http://google.com/ \"Google\")\n",
-             "than from [Yahoo](http://search.yahoo.com/ \"Yahoo Search\") or\n",
-             "[MSN](http://search.msn.com/ \"MSN Search\").\n"),
-
-        para("The point of reference-style links is not that they're easier to\n" +
-             "write. The point is that with reference-style links, your document\n" +
-             "source is vastly more readable. Compare the above examples: using\n" +
-             "reference-style links, the paragraph itself is only 81 characters\n" +
-             "long; with inline-style links, it's 176 characters; and as raw HTML,\n" +
-             "it's 234 characters. In the raw HTML, there's more markup than there\n" +
-             "is text."),
-
-        para("With Markdown's reference-style links, a source document much more\n" +
-             "closely resembles the final output, as rendered in a browser. By\n" +
-             "allowing you to move the markup-related metadata out of the paragraph,\n" +
-             "you can add links without interrupting the narrative flow of your\n" +
-             "prose."),
-
-        raw("<h3 id=\"em\">Emphasis</h3>"),
-
-        para("Markdown treats asterisks (<code>*</code>) and underscores (<code>_</code>) as indicators of\n" +
-             "emphasis. Text wrapped with one <code>*</code> or <code>_</code> will be wrapped with an\n" +
-             "HTML <code><em></code> tag; double <code>*</code>'s or <code>_</code>'s will be wrapped with an HTML\n" +
-             "<code><strong></code> tag. E.g., this input:"),
-
-        verb("*single asterisks*\n",
-             "\n",
-             "_single underscores_\n",
-             "\n",
-             "**double asterisks**\n",
-             "\n",
-             "__double underscores__\n"),
-
-        para("will produce:"),
-
-        verb("<em>single asterisks</em>\n",
-             "\n",
-             "<em>single underscores</em>\n",
-             "\n",
-             "<strong>double asterisks</strong>\n",
-             "\n",
-             "<strong>double underscores</strong>\n"),
-
-        para("You can use whichever style you prefer; the lone restriction is that\n" +
-             "the same character must be used to open and close an emphasis span."),
-
-        para("Emphasis can be used in the middle of a word:"),
-
-        verb("un*fucking*believable\n"),
-
-        para("But if you surround an <code>*</code> or <code>_</code> with spaces, it'll be treated as a\n" +
-             "literal asterisk or underscore."),
-
-        para("To produce a literal asterisk or underscore at a position where it\n" +
-             "would otherwise be used as an emphasis delimiter, you can backslash\n" +
-             "escape it:"),
-
-        verb("\\*this text is surrounded by literal asterisks\\*\n"),
-
-        raw("<h3 id=\"code\">Code</h3>"),
-
-        para("To indicate a span of code, wrap it with backtick quotes (<code>`</code>).\n" +
-             "Unlike a pre-formatted code block, a code span indicates code within a\n" +
-             "normal paragraph. For example:"),
-
-        verb("Use the `printf()` function.\n"),
-
-        para("will produce:"),
-
-        verb("<p>Use the <code>printf()</code> function.</p>\n"),
-
-        para("To include a literal backtick character within a code span, you can use\n" +
-             "multiple backticks as the opening and closing delimiters:"),
-
-        verb("``There is a literal backtick (`) here.``\n"),
-
-        para("which will produce this:"),
-
-        verb("<p><code>There is a literal backtick (`) here.</code></p>\n"),
-
-        para("The backtick delimiters surrounding a code span may include spaces --\n" +
-             "one after the opening, one before the closing. This allows you to place\n" +
-             "literal backtick characters at the beginning or end of a code span:"),
-
-        verb("A single backtick in a code span: `` ` ``\n",
-             "\n",
-             "A backtick-delimited string in a code span: `` `foo` ``\n"),
-
-        para("will produce:"),
-
-        verb("<p>A single backtick in a code span: <code>`</code></p>\n",
-             "\n",
-             "<p>A backtick-delimited string in a code span: <code>`foo`</code></p>\n"),
-
-        para("With a code span, ampersands and angle brackets are encoded as HTML\n" +
-             "entities automatically, which makes it easy to include example HTML\n" +
-             "tags. Markdown will turn this:"),
-
-        verb("Please don't use any `<blink>` tags.\n"),
-
-        para("into:"),
-
-        verb("<p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>\n"),
-
-        para("You can write this:"),
-
-        verb("`&#8212;` is the decimal-encoded equivalent of `&mdash;`.\n"),
-
-        para("to produce:"),
-
-        verb( "<p><code>&amp;#8212;</code> is the decimal-encoded\n",
-             "equivalent of <code>&amp;mdash;</code>.</p>\n"),
-
-        raw("<h3 id=\"img\">Images</h3>"),
-
-        para("Admittedly, it's fairly difficult to devise a \"natural\" syntax for\n" +
-             "placing images into a plain text document format."),
-
-        para("Markdown uses an image syntax that is intended to resemble the syntax\n" +
-             "for links, allowing for two styles: _inline_ and _reference_."),
-
-        para("Inline image syntax looks like this:"),
-
-        verb("![Alt text](/path/to/img.jpg)\n",
-             "\n",
-             "![Alt text](/path/to/img.jpg \"Optional title\")\n"),
-
-        para("That is:"),
-
-        list(:BULLET,
-          item(nil,
-            para("An exclamation mark: <code>!</code>;")),
-          item(nil,
-            para("followed by a set of square brackets, containing the <code>alt</code>\n" +
-                 "attribute text for the image;")),
-          item(nil,
-            para("followed by a set of parentheses, containing the URL or path to\n" +
-                 "the image, and an optional <code>title</code> attribute enclosed in double\n" +
-                 "or single quotes."))),
-
-        para("Reference-style image syntax looks like this:"),
-
-        verb("![Alt text][id]\n"),
-
-        para("Where \"id\" is the name of a defined image reference. Image references\n" +
-             "are defined using syntax identical to link references:"),
-
-        verb("[id]: url/to/image  \"Optional title attribute\"\n"),
-
-        para("As of this writing, Markdown has no syntax for specifying the\n" +
-             "dimensions of an image; if this is important to you, you can simply\n" +
-             "use regular HTML <code><img></code> tags."),
-
-        rule(1),
-
-        raw("<h2 id=\"misc\">Miscellaneous</h2>"),
-
-        raw("<h3 id=\"autolink\">Automatic Links</h3>"),
-
-        para("Markdown supports a shortcut style for creating \"automatic\" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:"),
-
-        verb("<http://example.com/>\n"),
-
-        para("Markdown will turn this into:"),
-
-        verb("<a href=\"http://example.com/\">http://example.com/</a>\n"),
-
-        para("Automatic links for email addresses work similarly, except that\n" +
-             "Markdown will also perform a bit of randomized decimal and hex\n" +
-             "entity-encoding to help obscure your address from address-harvesting\n" +
-             "spambots. For example, Markdown will turn this:"),
-
-        verb("<address@example.com>\n"),
-
-        para("into something like this:"),
-
-        verb("<a href=\"&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;\n",
-             "&#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;\n",
-             "&#109;\">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;\n",
-             "&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>\n"),
-
-        para("which will render in a browser as a clickable link to \"address@example.com\"."),
-
-        para("(This sort of entity-encoding trick will indeed fool many, if not\n" +
-               "most, address-harvesting bots, but it definitely won't fool all of\n" +
-               "them. It's better than nothing, but an address published in this way\n" +
-               "will probably eventually start receiving spam.)"),
-
-        raw("<h3 id=\"backslash\">Backslash Escapes</h3>"),
-
-        para("Markdown allows you to use backslash escapes to generate literal\n" +
-             "characters which would otherwise have special meaning in Markdown's\n" +
-             "formatting syntax. For example, if you wanted to surround a word with\n" +
-             "literal asterisks (instead of an HTML <code><em></code> tag), you can backslashes\n" +
-             "before the asterisks, like this:"),
-
-        verb("\\*literal asterisks\\*\n"),
-
-        para("Markdown provides backslash escapes for the following characters:"),
-
-        verb("\\   backslash\n",
-             "`   backtick\n",
-             "*   asterisk\n",
-             "_   underscore\n",
-             "{}  curly braces\n",
-             "[]  square brackets\n",
-             "()  parentheses\n",
-             "#   hash mark\n",
-             "+	plus sign\n",
-             "-	minus sign (hyphen)\n",
-             ".   dot\n",
-             "!   exclamation mark\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_nested_blockquotes
-    input = File.read "#{MARKDOWN_TEST_PATH}/Nested blockquotes.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("foo"),
-          block(
-            para("bar")),
-          para("foo")))
-
-    assert_equal expected, doc
-  end
-
-  def test_ordered_and_unordered_lists
-    input = File.read "#{MARKDOWN_TEST_PATH}/Ordered and unordered lists.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(2, 'Unordered'),
-
-        para('Asterisks tight:'),
-        list(:BULLET,
-          item(nil, para("asterisk 1")),
-          item(nil, para("asterisk 2")),
-          item(nil, para("asterisk 3"))),
-        para('Asterisks loose:'),
-        list(:BULLET,
-          item(nil, para("asterisk 1")),
-          item(nil, para("asterisk 2")),
-          item(nil, para("asterisk 3"))),
-
-        rule(1),
-
-        para("Pluses tight:"),
-        list(:BULLET,
-          item(nil, para("Plus 1")),
-          item(nil, para("Plus 2")),
-          item(nil, para("Plus 3"))),
-        para("Pluses loose:"),
-        list(:BULLET,
-          item(nil, para("Plus 1")),
-          item(nil, para("Plus 2")),
-          item(nil, para("Plus 3"))),
-
-        rule(1),
-
-        para("Minuses tight:"),
-        list(:BULLET,
-          item(nil, para("Minus 1")),
-          item(nil, para("Minus 2")),
-          item(nil, para("Minus 3"))),
-        para("Minuses loose:"),
-        list(:BULLET,
-          item(nil, para("Minus 1")),
-          item(nil, para("Minus 2")),
-          item(nil, para("Minus 3"))),
-
-        head(2, "Ordered"),
-
-        para("Tight:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second")),
-          item(nil, para("Third"))),
-        para("and:"),
-        list(:NUMBER,
-          item(nil, para("One")),
-          item(nil, para("Two")),
-          item(nil, para("Three"))),
-
-        para("Loose using tabs:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second")),
-          item(nil, para("Third"))),
-        para("and using spaces:"),
-        list(:NUMBER,
-          item(nil, para("One")),
-          item(nil, para("Two")),
-          item(nil, para("Three"))),
-
-        para("Multiple paragraphs:"),
-        list(:NUMBER,
-          item(nil,
-            para("Item 1, graf one."),
-            para("Item 2. graf two. The quick brown fox " +
-                 "jumped over the lazy dog's\nback.")),
-          item(nil, para("Item 2.")),
-          item(nil, para("Item 3."))),
-
-        head(2, "Nested"),
-        list(:BULLET,
-          item(nil,
-            para("Tab"),
-            list(:BULLET,
-              item(nil,
-                para("Tab"),
-                list(:BULLET,
-                  item(nil,
-                    para("Tab"))))))),
-
-        para("Here's another:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second:"),
-            list(:BULLET,
-              item(nil, para("Fee")),
-              item(nil, para("Fie")),
-              item(nil, para("Foe")))),
-          item(nil, para("Third"))),
-
-        para("Same thing but with paragraphs:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second:"),
-            list(:BULLET,
-              item(nil, para("Fee")),
-              item(nil, para("Fie")),
-              item(nil, para("Foe")))),
-          item(nil, para("Third"))),
-
-        para("This was an error in Markdown 1.0.1:"),
-        list(:BULLET,
-          item(nil,
-            para("this"),
-            list(:BULLET,
-              item(nil, para("sub"))),
-            para("that"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_strong_and_em_together
-    input = File.read "#{MARKDOWN_TEST_PATH}/Strong and em together.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("<b><em>This is strong and em.</em></b>"),
-        para("So is <b>_this_</b> word."),
-        para("<b><em>This is strong and em.</em></b>"),
-        para("So is <b>_this_</b> word."))
-
-    assert_equal expected, doc
-  end
-
-  def test_tabs
-    input = File.read "#{MARKDOWN_TEST_PATH}/Tabs.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("this is a list item\nindented with tabs")),
-          item(nil,
-            para("this is a list item\nindented with spaces"))),
-
-        para("Code:"),
-
-        verb("this code block is indented by one tab\n"),
-
-        para("And:"),
-
-        verb("\tthis code block is indented by two tabs\n"),
-
-        para("And:"),
-
-        verb(
-          "+\tthis is an example list item\n",
-          "\tindented with tabs\n",
-          "\n",
-          "+   this is an example list item\n",
-          "    indented with spaces\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_tidiness
-    input = File.read "#{MARKDOWN_TEST_PATH}/Tidiness.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("A list within a blockquote:"),
-          list(:BULLET,
-            item(nil, para("asterisk 1")),
-            item(nil, para("asterisk 2")),
-            item(nil, para("asterisk 3")))))
-
-    assert_equal expected, doc
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_attribute_manager_test.rb b/test/mri/rdoc/rdoc_markup_attribute_manager_test.rb
deleted file mode 100644
index 05bd9519902..00000000000
--- a/test/mri/rdoc/rdoc_markup_attribute_manager_test.rb
+++ /dev/null
@@ -1,395 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupAttributeManagerTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @am = RDoc::Markup::AttributeManager.new
-
-    @bold_on  = @am.changed_attribute_by_name([], [:BOLD])
-    @bold_off = @am.changed_attribute_by_name([:BOLD], [])
-
-    @tt_on    = @am.changed_attribute_by_name([], [:TT])
-    @tt_off   = @am.changed_attribute_by_name([:TT], [])
-
-    @em_on    = @am.changed_attribute_by_name([], [:EM])
-    @em_off   = @am.changed_attribute_by_name([:EM], [])
-
-    @bold_em_on   = @am.changed_attribute_by_name([], [:BOLD] | [:EM])
-    @bold_em_off  = @am.changed_attribute_by_name([:BOLD] | [:EM], [])
-
-    @em_then_bold = @am.changed_attribute_by_name([:EM], [:EM] | [:BOLD])
-
-    @em_to_bold   = @am.changed_attribute_by_name([:EM], [:BOLD])
-
-    @am.add_word_pair("{", "}", :WOMBAT)
-    @wombat_on    = @am.changed_attribute_by_name([], [:WOMBAT])
-    @wombat_off   = @am.changed_attribute_by_name([:WOMBAT], [])
-
-    @klass = RDoc::Markup::AttributeManager
-    @formatter = RDoc::Markup::Formatter.new @rdoc.options
-    @formatter.add_tag :BOLD, '<B>', '</B>'
-    @formatter.add_tag :EM, '<EM>', '</EM>'
-    @formatter.add_tag :TT, '<CODE>', '</CODE>'
-  end
-
-  def crossref(text)
-    crossref_bitmap = @am.attributes.bitmap_for(:_REGEXP_HANDLING_) |
-                      @am.attributes.bitmap_for(:CROSSREF)
-
-    [ @am.changed_attribute_by_name([], [:CROSSREF, :_REGEXP_HANDLING_]),
-      RDoc::Markup::RegexpHandling.new(crossref_bitmap, text),
-      @am.changed_attribute_by_name([:CROSSREF, :_REGEXP_HANDLING_], [])
-    ]
-  end
-
-  def test_adding
-    assert_equal(["cat ", @wombat_on, "and", @wombat_off, " dog" ],
-                  @am.flow("cat {and} dog"))
-    #assert_equal(["cat {and} dog" ], @am.flow("cat \\{and} dog"))
-  end
-
-  def test_add_html_tag
-    @am.add_html("Test", :TEST)
-    tags = @am.html_tags
-    assert_equal(6, tags.size)
-    assert(tags.has_key?("test"))
-  end
-
-  def test_add_regexp_handling
-    @am.add_regexp_handling "WikiWord", :WIKIWORD
-    regexp_handlings = @am.regexp_handlings
-
-    assert_equal 1, regexp_handlings.size
-    assert regexp_handlings.assoc "WikiWord"
-  end
-
-  def test_add_word_pair
-    @am.add_word_pair '%', '&', 'percent and'
-
-    assert @am.word_pair_map.include?(/(%)(\S+)(&)/)
-    assert @am.protectable.include?('%')
-    assert !@am.protectable.include?('&')
-  end
-
-  def test_add_word_pair_angle
-    e = assert_raise ArgumentError do
-      @am.add_word_pair '<', '>', 'angles'
-    end
-
-    assert_equal "Word flags may not start with '<'", e.message
-  end
-
-  def test_add_word_pair_invalid
-    assert_raise ArgumentError do
-      @am.add_word_pair("<", "<", :TEST)
-    end
-  end
-
-  def test_add_word_pair_map
-    @am.add_word_pair("x", "y", :TEST)
-
-    word_pair_map = @am.word_pair_map
-
-    assert_includes word_pair_map.keys.map { |r| r.source }, "(x)(\\S+)(y)"
-  end
-
-  def test_add_word_pair_matching
-    @am.add_word_pair '^', '^', 'caret'
-
-    assert @am.matching_word_pairs.include?('^')
-    assert @am.protectable.include?('^')
-  end
-
-  def test_basic
-    assert_equal(["cat"], @am.flow("cat"))
-
-    assert_equal(["cat ", @bold_on, "and", @bold_off, " dog"],
-                  @am.flow("cat *and* dog"))
-
-    assert_equal(["cat ", @bold_on, "AND", @bold_off, " dog"],
-                  @am.flow("cat *AND* dog"))
-
-    assert_equal(["cat ", @em_on, "And", @em_off, " dog"],
-                  @am.flow("cat _And_ dog"))
-
-    assert_equal(["cat *and dog*"], @am.flow("cat *and dog*"))
-
-    assert_equal(["*cat and* dog"], @am.flow("*cat and* dog"))
-
-    assert_equal(["cat *and ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat *and *dog*"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " dog"],
-                  @am.flow("cat _and_ dog"))
-
-    assert_equal(["cat_and_dog"],
-                  @am.flow("cat_and_dog"))
-
-    assert_equal(["cat ", @tt_on, "and", @tt_off, " dog"],
-                  @am.flow("cat +and+ dog"))
-
-    assert_equal(["cat ", @tt_on, "X::Y", @tt_off, " dog"],
-                  @am.flow("cat +X::Y+ dog"))
-
-    assert_equal(["cat ", @bold_on, "a_b_c", @bold_off, " dog"],
-                  @am.flow("cat *a_b_c* dog"))
-
-    assert_equal(["cat __ dog"],
-                  @am.flow("cat __ dog"))
-
-    assert_equal(["cat ", @em_on, "_", @em_off, " dog"],
-                  @am.flow("cat ___ dog"))
-
-    assert_equal(["cat and ", @em_on, "5", @em_off, " dogs"],
-                  @am.flow("cat and _5_ dogs"))
-
-    assert_equal([@tt_on, "__id__", @tt_off], @am.flow("+__id__+"))
-  end
-
-  def test_bold
-    assert_equal [@bold_on, 'bold', @bold_off],
-                 @am.flow("*bold*")
-
-    assert_equal [@bold_on, 'Bold:', @bold_off],
-                 @am.flow("*Bold:*")
-
-    assert_equal [@bold_on, '\\bold', @bold_off],
-                 @am.flow("*\\bold*")
-  end
-
-  def test_bold_html_escaped
-    assert_equal ['cat <b>dog</b>'], @am.flow('cat \<b>dog</b>')
-  end
-
-  def test_combined
-    assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat _and_ *dog*"))
-
-    assert_equal(["cat ", @em_on, "a__nd", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat _a__nd_ *dog*"))
-  end
-
-  def test_convert_attrs
-    str = '+foo+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000foo\000", str
-
-    str = '+:foo:+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000:foo:\000", str
-
-    str = '+x-y+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000x-y\000", str
-  end
-
-  def test_convert_attrs_ignores_code
-    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <code>__send__</code> bar')
-  end
-
-  def test_convert_attrs_ignores_tt
-    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <tt>__send__</tt> bar')
-  end
-
-  def test_convert_attrs_preserves_double
-    assert_equal 'foo.__send__ :bar', output('foo.__send__ :bar')
-    assert_equal 'use __FILE__ to', output('use __FILE__ to')
-  end
-
-  def test_convert_attrs_does_not_ignore_after_tt
-    assert_equal 'the <CODE>IF:</CODE><EM>key</EM> directive', output('the <tt>IF:</tt>_key_ directive')
-  end
-
-  def test_escapes
-    assert_equal '<CODE>text</CODE>',   output('<tt>text</tt>')
-    assert_equal '<tt>text</tt>',       output('\\<tt>text</tt>')
-    assert_equal '<tt>',                output('\\<tt>')
-    assert_equal '<CODE><tt></CODE>',   output('<tt>\\<tt></tt>')
-    assert_equal '<CODE>\\<tt></CODE>', output('<tt>\\\\<tt></tt>')
-    assert_equal '<B>text</B>',         output('*text*')
-    assert_equal '*text*',              output('\\*text*')
-    assert_equal '\\',                  output('\\')
-    assert_equal '\\text',              output('\\text')
-    assert_equal '\\\\text',            output('\\\\text')
-    assert_equal 'text \\ text',        output('text \\ text')
-
-    assert_equal 'and <CODE>\\s</CODE> matches space',
-                 output('and <tt>\\s</tt> matches space')
-    assert_equal 'use <CODE><tt>text</CODE></tt> for code',
-                 output('use <tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <CODE><tt>text</tt></CODE> for code',
-                 output('use <tt>\\<tt>text\\</tt></tt> for code')
-    assert_equal 'use <tt><tt>text</tt></tt> for code',
-                 output('use \\<tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
-                 output('use \\<tt><tt>text</tt></tt> for code')
-    assert_equal 'use <CODE>+text+</CODE> for code',
-                 output('use <tt>\\+text+</tt> for code')
-    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
-                 output('use \\<tt>+text+</tt> for code')
-    assert_equal 'illegal <tag>not</tag> changed',
-                 output('illegal <tag>not</tag> changed')
-    assert_equal 'unhandled <p>tag</p> unchanged',
-                 output('unhandled <p>tag</p> unchanged')
-  end
-
-  def test_exclude_tag
-    assert_equal '<CODE>aaa</CODE>[:symbol]', output('+aaa+[:symbol]')
-    assert_equal '<CODE>aaa[:symbol]</CODE>', output('+aaa[:symbol]+')
-    assert_equal 'aaa[:symbol]', output('aaa[:symbol]')
-    assert_equal '<B><CODE>index</CODE></B>', output('<b><tt>index</tt></b>')
-  end
-
-  def test_exclude_tag_flow
-    assert_equal [@tt_on, "aaa", @tt_off, "[:symbol]"],
-                  @am.flow("+aaa+[:symbol]")
-    assert_equal [@tt_on, "aaa[:symbol]", @tt_off],
-                  @am.flow("+aaa[:symbol]+")
-    assert_equal ["aaa[:symbol]"],
-                  @am.flow("aaa[:symbol]")
-  end
-
-  def test_html_like_em_bold
-    assert_equal ["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("cat <i>and </i><b>dog</b>")
-  end
-
-  def test_html_like_em_bold_SGML
-    assert_equal ["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("cat <i>and <b></i>dog</b>")
-  end
-
-  def test_html_like_em_bold_nested_1
-    assert_equal(["cat ", @bold_em_on, "and", @bold_em_off, " dog"],
-                  @am.flow("cat <i><b>and</b></i> dog"))
-  end
-
-  def test_html_like_em_bold_nested_2
-    assert_equal ["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off],
-                  @am.flow("cat <i>and <b>dog</b></i>")
-  end
-
-  def test_html_like_em_bold_nested_mixed_case
-    assert_equal ["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off],
-                  @am.flow("cat <i>and <B>dog</B></I>")
-  end
-
-  def test_html_like_em_bold_mixed_case
-    assert_equal ["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat <i>and</i> <B>dog</b>")
-  end
-
-  def test_html_like_teletype
-    assert_equal ["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow("cat <tt>dog</Tt>")
-  end
-
-  def test_html_like_teletype_em_bold_SGML
-    assert_equal [@tt_on, "cat", @tt_off, " ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("<tt>cat</tt> <i>and <b></i>dog</b>")
-  end
-
-  def test_initial_html
-    html_tags = @am.html_tags
-    assert html_tags.is_a?(Hash)
-    assert_equal(5, html_tags.size)
-  end
-
-  def test_initial_word_pairs
-    word_pairs = @am.matching_word_pairs
-    assert word_pairs.is_a?(Hash)
-    assert_equal(3, word_pairs.size)
-  end
-
-  def test_mask_protected_sequence
-    def @am.str()     @str       end
-    def @am.str=(str) @str = str end
-
-    @am.str = '<code>foo</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo</code>",       @am.str
-
-    @am.str = '<code>foo\\</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo<\x04/code>", @am.str, 'escaped close'
-
-    @am.str = '<code>foo\\\\</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo\\</code>",     @am.str, 'escaped backslash'
-  end
-
-  def test_protect
-    assert_equal(['cat \\ dog'],
-                 @am.flow('cat \\ dog'))
-
-    assert_equal(["cat <tt>dog</Tt>"],
-                 @am.flow("cat \\<tt>dog</Tt>"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " <B>dog</b>"],
-                  @am.flow("cat <i>and</i> \\<B>dog</b>"))
-
-    assert_equal(["*word* or <b>text</b>"],
-                 @am.flow("\\*word* or \\<b>text</b>"))
-
-    assert_equal(["_cat_", @em_on, "dog", @em_off],
-                  @am.flow("\\_cat_<i>dog</i>"))
-  end
-
-  def test_lost_tag_for_the_second_time
-    str = "cat <tt>dog</tt>"
-    assert_equal(["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow(str))
-    assert_equal(["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow(str))
-  end
-
-  def test_regexp_handling
-    @am.add_regexp_handling(RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF)
-
-    #
-    # The apostrophes in "cats'" and "dogs'" suppress the flagging of these
-    # words as potential cross-references, which is necessary for the unit
-    # tests.  Unfortunately, the markup engine right now does not actually
-    # check whether a cross-reference is valid before flagging it.
-    #
-    assert_equal(["cats'"], @am.flow("cats'"))
-
-    assert_equal(["cats' ", crossref("#fred"), " dogs'"].flatten,
-                  @am.flow("cats' #fred dogs'"))
-
-    assert_equal([crossref("#fred"), " dogs'"].flatten,
-                  @am.flow("#fred dogs'"))
-
-    assert_equal(["cats' ", crossref("#fred")].flatten, @am.flow("cats' #fred"))
-
-    assert_equal(["(", crossref("#fred"), ")"].flatten, @am.flow("(#fred)"))
-  end
-
-  def test_tt_html
-    assert_equal [@tt_on, '"\n"', @tt_off],
-                 @am.flow('<tt>"\n"</tt>')
-  end
-
-  def output(str)
-    @formatter.convert_flow @am.flow str
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_attributes_test.rb b/test/mri/rdoc/rdoc_markup_attributes_test.rb
deleted file mode 100644
index f584a4762a4..00000000000
--- a/test/mri/rdoc/rdoc_markup_attributes_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupAttributesTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @as = RDoc::Markup::Attributes.new
-  end
-
-  def test_bitmap_for
-    assert_equal 2, @as.bitmap_for('two')
-    assert_equal 2, @as.bitmap_for('two')
-    assert_equal 4, @as.bitmap_for('three')
-  end
-
-  def test_as_string
-    @as.bitmap_for 'two'
-    @as.bitmap_for 'three'
-
-    assert_equal 'none',                  @as.as_string(0)
-    assert_equal '_REGEXP_HANDLING_',     @as.as_string(1)
-    assert_equal 'two',                   @as.as_string(2)
-    assert_equal '_REGEXP_HANDLING_,two', @as.as_string(3)
-  end
-
-  def test_each_name_of
-    @as.bitmap_for 'two'
-    @as.bitmap_for 'three'
-
-    assert_equal %w[],          @as.each_name_of(0).to_a
-    assert_equal %w[],          @as.each_name_of(1).to_a
-    assert_equal %w[two],       @as.each_name_of(2).to_a
-    assert_equal %w[three],     @as.each_name_of(4).to_a
-    assert_equal %w[two three], @as.each_name_of(6).to_a
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_document_test.rb b/test/mri/rdoc/rdoc_markup_document_test.rb
deleted file mode 100644
index 6b118f4e54e..00000000000
--- a/test/mri/rdoc/rdoc_markup_document_test.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupDocumentTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @d = @RM::Document.new
-  end
-
-  def test_append
-    @d << @RM::Paragraph.new('hi')
-
-    expected = @RM::Document.new @RM::Paragraph.new('hi')
-
-    assert_equal expected, @d
-  end
-
-  def test_append_document
-    @d << @RM::Document.new
-
-    assert_empty @d
-
-    @d << @RM::Document.new(@RM::Paragraph.new('hi'))
-
-    expected = @RM::Document.new @RM::Paragraph.new('hi'), @RM::BlankLine.new
-
-    assert_equal expected, @d
-  end
-
-  def test_append_string
-    @d << ''
-
-    assert_empty @d
-
-    assert_raise ArgumentError do
-      @d << 'hi'
-    end
-  end
-
-  def test_concat
-    @d.concat [@RM::BlankLine.new, @RM::BlankLine.new]
-
-    refute_empty @d
-  end
-
-  def test_each
-    a = @RM::Document.new
-    b = @RM::Document.new(@RM::Paragraph.new('hi'))
-
-    @d.push a, b
-
-    assert_equal [a, b], @d.map { |sub_doc| sub_doc }
-  end
-
-  def test_empty_eh
-    assert_empty @d
-
-    @d << @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_empty_eh_document
-    d = @RM::Document.new @d
-
-    assert_empty d
-  end
-
-  def test_equals2
-    d2 = @RM::Document.new
-
-    assert_equal @d, d2
-
-    d2 << @RM::BlankLine.new
-
-    refute_equal @d, d2
-  end
-
-  def test_equals2_file
-    d2 = @RM::Document.new
-    d2.file = 'file.rb'
-
-    refute_equal @d, d2
-
-    @d.file = 'file.rb'
-
-    assert_equal @d, d2
-  end
-
-  def test_file_equals
-    @d.file = 'file.rb'
-
-    assert_equal 'file.rb', @d.file
-  end
-
-  def test_file_equals_top_level
-    @d.file = @store.add_file 'file.rb'
-
-    assert_equal 'file.rb', @d.file
-  end
-
-  def test_lt2
-    @d << @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_merge
-    original = @RM::Document.new @RM::Paragraph.new 'original'
-    original.file = 'file.rb'
-    root = @RM::Document.new original
-
-    replace = @RM::Document.new @RM::Paragraph.new 'replace'
-    replace.file = 'file.rb'
-
-    other = @RM::Document.new replace
-
-    result = root.merge other
-
-    inner = @RM::Document.new @RM::Paragraph.new 'replace'
-    inner.file = 'file.rb'
-    expected = @RM::Document.new inner
-
-    assert_equal expected, result
-  end
-
-  def test_merge_add
-    original = @RM::Document.new @RM::Paragraph.new 'original'
-    original.file = 'file.rb'
-    root = @RM::Document.new original
-
-    addition = @RM::Document.new @RM::Paragraph.new 'addition'
-    addition.file = 'other.rb'
-
-    other = @RM::Document.new addition
-
-    result = root.merge other
-
-    expected = @RM::Document.new original, addition
-
-    assert_equal expected, result
-  end
-
-  def test_merge_empty
-    original = @RM::Document.new
-    root = @RM::Document.new original
-
-    replace = @RM::Document.new @RM::Paragraph.new 'replace'
-    replace.file = 'file.rb'
-
-    other = @RM::Document.new replace
-
-    result = root.merge other
-
-    inner = @RM::Document.new @RM::Paragraph.new 'replace'
-    inner.file = 'file.rb'
-    expected = @RM::Document.new inner
-
-    assert_equal expected, result
-  end
-
-  def test_push
-    @d.push @RM::BlankLine.new, @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_table_of_contents
-    doc = @RM::Document.new(
-      @RM::Heading.new(1, 'A'),
-      @RM::Paragraph.new('B'),
-      @RM::Heading.new(2, 'C'),
-      @RM::Paragraph.new('D'),
-      @RM::Heading.new(1, 'E'),
-      @RM::Paragraph.new('F'))
-
-    expected = [
-      @RM::Heading.new(1, 'A'),
-      @RM::Heading.new(2, 'C'),
-      @RM::Heading.new(1, 'E'),
-    ]
-
-    assert_equal expected, doc.table_of_contents
-  end
-
-  def test_table_of_contents_omit_headings_below
-    document = doc(
-      head(1, 'A'),
-      para('B'),
-      head(2, 'C'),
-      para('D'),
-      head(1, 'E'),
-      para('F'))
-
-    document.omit_headings_below = 1
-
-    expected = [
-      head(1, 'A'),
-      head(1, 'E'),
-    ]
-
-    assert_equal expected, document.table_of_contents
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_formatter_test.rb b/test/mri/rdoc/rdoc_markup_formatter_test.rb
deleted file mode 100644
index ee27f24e67c..00000000000
--- a/test/mri/rdoc/rdoc_markup_formatter_test.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupFormatterTest < RDoc::TestCase
-
-  class ToTest < RDoc::Markup::Formatter
-
-    def initialize(markup)
-      super nil, markup
-
-      add_tag :TT, '<code>', '</code>'
-    end
-
-    def accept_paragraph(paragraph)
-      @res += attributes(paragraph.text)
-    end
-
-    def attributes(text)
-      convert_flow @am.flow text.dup
-    end
-
-    def handle_regexp_CAPS(target)
-      "handled #{target.text}"
-    end
-
-    def start_accepting
-      @res = ""
-    end
-
-    def end_accepting
-      @res
-    end
-
-  end
-
-  def setup
-    super
-
-    @markup = @RM.new
-    @markup.add_regexp_handling(/[A-Z]+/, :CAPS)
-
-    @attribute_manager = @markup.attribute_manager
-    @attributes = @attribute_manager.attributes
-
-    @to = ToTest.new @markup
-
-    @caps            = @attributes.bitmap_for :CAPS
-    @regexp_handling = @attributes.bitmap_for :_REGEXP_HANDLING_
-    @tt              = @attributes.bitmap_for :TT
-  end
-
-  def test_class_gen_relative_url
-    def gen(from, to)
-      RDoc::Markup::ToHtml.gen_relative_url from, to
-    end
-
-    assert_equal 'a.html',    gen('a.html',   'a.html')
-    assert_equal 'b.html',    gen('a.html',   'b.html')
-
-    assert_equal 'd.html',    gen('a/c.html', 'a/d.html')
-    assert_equal '../a.html', gen('a/c.html', 'a.html')
-    assert_equal 'a/c.html',  gen('a.html',   'a/c.html')
-  end
-
-  def regexp_handling_names
-    @attribute_manager.regexp_handlings.map do |_, mask|
-      @attributes.as_string mask
-    end
-  end
-
-  def test_add_regexp_handling_RDOCLINK
-    @to.add_regexp_handling_RDOCLINK
-
-    assert_includes regexp_handling_names, 'RDOCLINK'
-
-    def @to.handle_regexp_RDOCLINK(target)
-      "<#{target.text}>"
-    end
-
-    document = doc(para('{foo}[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '{foo}[<rdoc-label:bar>].', formatted
-  end
-
-  def test_add_regexp_handling_TIDYLINK
-    @to.add_regexp_handling_TIDYLINK
-
-    assert_includes regexp_handling_names, 'TIDYLINK'
-
-    def @to.handle_regexp_TIDYLINK(target)
-      "<#{target.text}>"
-    end
-
-    document = doc(para('foo[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '<foo[rdoc-label:bar]>.', formatted
-
-    document = doc(para('{foo}[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '<{foo}[rdoc-label:bar]>.', formatted
-
-    document = doc(para('<tt>{abc}</tt>: {foo}[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '<code>{abc}</code>: <{foo}[rdoc-label:bar]>.', formatted
-  end
-
-  def test_parse_url
-    scheme, url, id = @to.parse_url 'example/foo'
-
-    assert_equal 'http',        scheme
-    assert_equal 'example/foo', url
-    assert_nil   id
-  end
-
-  def test_parse_url_anchor
-    scheme, url, id = @to.parse_url '#foottext-1'
-
-    assert_nil   scheme
-    assert_equal '#foottext-1', url
-    assert_nil   id
-  end
-
-  def test_parse_url_link
-    scheme, url, id = @to.parse_url 'link:README.txt'
-
-    assert_equal 'link',       scheme
-    assert_equal 'README.txt', url
-    assert_nil   id
-  end
-
-  def test_parse_url_link_id
-    scheme, url, id = @to.parse_url 'link:README.txt#label-foo'
-
-    assert_equal 'link',                 scheme
-    assert_equal 'README.txt#label-foo', url
-    assert_nil   id
-  end
-
-  def test_parse_url_rdoc_label
-    scheme, url, id = @to.parse_url 'rdoc-label:foo'
-
-    assert_equal 'link', scheme
-    assert_equal '#foo', url
-    assert_nil   id
-
-    scheme, url, id = @to.parse_url 'rdoc-label:foo:bar'
-
-    assert_equal 'link',      scheme
-    assert_equal '#foo',      url
-    assert_equal ' id="bar"', id
-  end
-
-  def test_parse_url_scheme
-    scheme, url, id = @to.parse_url 'http://example/foo'
-
-    assert_equal 'http',               scheme
-    assert_equal 'http://example/foo', url
-    assert_nil   id
-
-    scheme, url, id = @to.parse_url 'https://example/foo'
-
-    assert_equal 'https',               scheme
-    assert_equal 'https://example/foo', url
-    assert_nil   id
-  end
-
-  def test_convert_tt_regexp_handling
-    converted = @to.convert '<code>AAA</code>'
-
-    assert_equal '<code>AAA</code>', converted
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_hard_break_test.rb b/test/mri/rdoc/rdoc_markup_hard_break_test.rb
deleted file mode 100644
index 8ec8ffcfed6..00000000000
--- a/test/mri/rdoc/rdoc_markup_hard_break_test.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupHardBreakTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @hb = RDoc::Markup::HardBreak.new
-  end
-
-  def test_accept
-    visitor = Object.new
-
-    def visitor.accept_hard_break(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    @hb.accept visitor
-
-    assert_same @hb, visitor.obj
-  end
-
-  def test_equals2
-    other = RDoc::Markup::HardBreak.new
-
-    assert_equal @hb, other
-
-    refute_equal @hb, Object.new
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_heading_test.rb b/test/mri/rdoc/rdoc_markup_heading_test.rb
deleted file mode 100644
index 3bf58ed5f77..00000000000
--- a/test/mri/rdoc/rdoc_markup_heading_test.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupHeadingTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @h = RDoc::Markup::Heading.new 1, 'Hello *Friend*!'
-  end
-
-  def test_aref
-    assert_equal 'label-Hello+Friend-21', @h.aref
-  end
-
-  def test_label
-    assert_equal 'label-Hello+Friend-21', @h.label
-    assert_equal 'label-Hello+Friend-21', @h.label(nil)
-
-    context = RDoc::NormalClass.new 'Foo'
-
-    assert_equal 'class-Foo-label-Hello+Friend-21', @h.label(context)
-  end
-
-  def test_plain_html
-    assert_equal 'Hello <strong>Friend</strong>!', @h.plain_html
-  end
-
-  def test_plain_html_using_image_alt_as_text
-    h = RDoc::Markup::Heading.new 1, 'rdoc-image:foo.png:Hello World'
-
-    assert_equal 'Hello World', h.plain_html
-  end
-end
diff --git a/test/mri/rdoc/rdoc_markup_include_test.rb b/test/mri/rdoc/rdoc_markup_include_test.rb
deleted file mode 100644
index 1544d25beea..00000000000
--- a/test/mri/rdoc/rdoc_markup_include_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupIncludeTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @include = @RM::Include.new 'file', [Dir.tmpdir]
-  end
-
-  def test_equals2
-    assert_equal @include, @RM::Include.new('file', [Dir.tmpdir])
-    refute_equal @include, @RM::Include.new('file', %w[.])
-    refute_equal @include, @RM::Include.new('other', [Dir.tmpdir])
-    refute_equal @include, Object.new
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_indented_paragraph_test.rb b/test/mri/rdoc/rdoc_markup_indented_paragraph_test.rb
deleted file mode 100644
index 3be73b81db8..00000000000
--- a/test/mri/rdoc/rdoc_markup_indented_paragraph_test.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupIndentedParagraphTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @IP = RDoc::Markup::IndentedParagraph
-  end
-
-  def test_initialize
-    ip = @IP.new 2, 'a', 'b'
-
-    assert_equal 2, ip.indent
-    assert_equal %w[a b], ip.parts
-  end
-
-  def test_accept
-    visitor = Object.new
-    def visitor.accept_indented_paragraph(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    paragraph = @IP.new 0
-
-    paragraph.accept visitor
-
-    assert_equal paragraph, visitor.obj
-  end
-
-  def test_equals2
-    one = @IP.new 1
-    two = @IP.new 2
-
-    assert_equal one, one
-    refute_equal one, two
-  end
-
-  def test_text
-    paragraph = @IP.new(2, 'hello', ' world')
-
-    assert_equal 'hello world', paragraph.text
-  end
-
-  def test_text_break
-    paragraph = @IP.new(2, 'hello', hard_break, 'world')
-
-    assert_equal 'helloworld', paragraph.text
-
-    assert_equal "hello\n  world", paragraph.text("\n")
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_paragraph_test.rb b/test/mri/rdoc/rdoc_markup_paragraph_test.rb
deleted file mode 100644
index 0f1b96e123a..00000000000
--- a/test/mri/rdoc/rdoc_markup_paragraph_test.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupParagraphTest < RDoc::TestCase
-
-  def test_accept
-    visitor = Object.new
-    def visitor.accept_paragraph(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    paragraph = RDoc::Markup::Paragraph.new
-
-    paragraph.accept visitor
-
-    assert_same paragraph, visitor.obj
-  end
-
-  def test_text
-    paragraph = para('hello', ' world')
-
-    assert_equal 'hello world', paragraph.text
-  end
-
-  def test_text_break
-    paragraph = para('hello', hard_break, 'world')
-
-    assert_equal 'helloworld', paragraph.text
-
-    assert_equal "hello\nworld", paragraph.text("\n")
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_parser_test.rb b/test/mri/rdoc/rdoc_markup_parser_test.rb
deleted file mode 100644
index c157d9c213d..00000000000
--- a/test/mri/rdoc/rdoc_markup_parser_test.rb
+++ /dev/null
@@ -1,1684 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocMarkupParserTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @RMP = @RM::Parser
-  end
-
-  def test_build_heading
-    parser = @RMP.new
-
-    parser.tokens.replace [
-      [:TEXT,    'heading three',  4, 0],
-      [:NEWLINE, "\n",            17, 0],
-    ]
-
-    assert_equal @RM::Heading.new(3, 'heading three'), parser.build_heading(3)
-  end
-
-  def test_get
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.get
-
-    assert_equal 7, parser.tokens.length
-  end
-
-  def test_parse_bullet
-    str = <<-STR
-* l1
-* l2
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_utf_8
-    str = <<-STR
-* 新しい機能
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('新しい機能'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_verbatim_heading
-    str = <<-STR
-* l1
-    v
-
-= H
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::Verbatim.new("v\n"))]),
-      @RM::Heading.new(1, 'H')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_heading
-    str = <<-STR
-* = l1
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Heading.new(1, 'l1'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_indent
-    str = <<-STR
-* l1
-  * l1.1
-* l2
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::List.new(:BULLET, *[
-            @RM::ListItem.new(nil,
-              @RM::Paragraph.new('l1.1'))])),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_paragraph
-    str = <<-STR
-now is
-* l1
-* l2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2')),
-      ]),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_multiline
-    str = <<-STR
-* l1
-  l1+
-* l2
-    STR
-
-    expected = [
-      list(:BULLET,
-        item(nil,
-          para('l1 ', 'l1+')),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_multiparagraph
-    str = <<-STR
-* l1
-
-  l1+
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::BlankLine.new,
-          @RM::Paragraph.new('l1+')),
-      ]),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_indent_verbatim
-    str = <<-STR
-* l1
-  * l1.1
-    text
-      code
-        code
-
-    text
-* l2
-    STR
-
-    expected = [
-      list(:BULLET,
-        item(nil,
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1 ', 'text'),
-              verb("code\n", "  code\n"),
-              para('text')))),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_dash
-    str = <<-STR
-- one
-- two
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('one')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('two'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading
-    str = '= heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_three
-    str = '=== heading three'
-
-    expected = [
-      @RM::Heading.new(3, 'heading three')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_bullet
-    str = '= * heading one'
-
-    expected = [
-      @RM::Heading.new(1, '* heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_empty
-    str = <<-STR
-===
-* bullet
-    STR
-
-    expected = [
-      @RM::Heading.new(3, ''),
-      @RM::BlankLine.new,
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('bullet'))]),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_heading
-    str = '= ='
-
-    expected = [
-      @RM::Heading.new(1, '=')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_lalpha
-    str = '= b. heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'b. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_label
-    str = '= [heading one]'
-
-    expected = [
-      @RM::Heading.new(1, '[heading one]')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_note
-    str = '= heading one::'
-
-    expected = [
-      @RM::Heading.new(1, 'heading one::')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_number
-    str = '= 5. heading one'
-
-    expected = [
-      @RM::Heading.new(1, '5. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_ualpha
-    str = '= B. heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'B. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label
-    str = <<-STR
-[one] item one
-[two] item two
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_bullet
-    str = <<-STR
-[cat] l1
-      * l1.1
-[dog] l2
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[cat],
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1')))),
-        item(%w[dog],
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_multi_label
-    str = <<-STR
-[one]
-[two] some description
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one two],
-          para('some description')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_multi_line
-    str = <<-STR
-[cat] l1
-      continuation
-[dog] l2
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[cat],
-          para('l1 ', 'continuation')),
-        item(%w[dog],
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_newline
-    str = <<-STR
-[one]
-  item one
-[two]
-  item two
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha
-    str = <<-STR
-a. l1
-b. l2
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha_ualpha
-    str = <<-STR
-a. l1
-b. l2
-A. l3
-A. l4
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))]),
-      @RM::List.new(:UALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l3')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l4'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha_utf_8
-    str = <<-STR
-a. 新しい機能
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('新しい機能'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_line_break
-    str = "now is\nthe time  \nfor all"
-
-    expected = [
-      para('now is ', 'the time'),
-      blank_line,
-      para('for all')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_list_1
-    str = <<-STR
-10. para 1
-
-    [label 1]
-      para 1.1
-
-        code
-
-      para 1.2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('para 1'),
-          blank_line,
-          list(:LABEL,
-            item(%w[label\ 1],
-              para('para 1.1'),
-              blank_line,
-              verb("code\n"),
-              para('para 1.2')))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_list_2
-    str = <<-STR
-6. para
-
-   label 1::  text 1
-   label 2::  text 2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('para'),
-          blank_line,
-          list(:NOTE,
-            item(%w[label\ 1],
-              para('text 1')),
-            item(%w[label\ 2],
-              para('text 2')))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_verbatim
-    str = <<-STR
-* one
-    verb1
-    verb2
-* two
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('one'),
-          @RM::Verbatim.new("verb1\n", "verb2\n")),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('two'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lists
-    str = <<-STR
-now is
-* l1
-1. n1
-2. n2
-* l2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'))]),
-      @RM::List.new(:NUMBER, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('n1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('n2'))]),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))]),
-      @RM::Paragraph.new('the time')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note
-    str = <<-STR
-one:: item one
-two:: item two
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note_empty
-    str = <<-STR
-one::
-two::
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one two],
-          blank_line))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note_note
-    str = <<-STR
-one:: two::
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one],
-          list(:NOTE,
-            item(%w[two],
-              blank_line))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_number_bullet
-    str = <<-STR
-1. l1
-   * l1.1
-2. l2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1')))),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph
-    str = <<-STR
-now is the time
-
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new('for all good men')]
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph_multiline
-    str = "now is the time\nfor all good men"
-
-    expected = @RM::Paragraph.new 'now is the time ', 'for all good men'
-    assert_equal [expected], @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph_verbatim
-    str = <<-STR
-now is the time
-  code _line_ here
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::Verbatim.new("code _line_ here\n"),
-      @RM::Paragraph.new('for all good men'),
-    ]
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_rule
-    str = <<-STR
-now is the time
-
----
-
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::BlankLine.new,
-      @RM::Rule.new(1),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new('for all good men')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_ualpha
-    str = <<-STR
-A. l1
-B. l2
-    STR
-
-    expected = [
-      @RM::List.new(:UALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_trailing_cr
-    expected = [ @RM::Paragraph.new('Text') ]
-    assert_equal expected, @RMP.parse("Text\r").parts
-  end
-
-  def test_parse_verbatim
-    str = <<-STR
-now is
-   code
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_bullet
-    str = <<-STR
-  * blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("* blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_dash
-    str = <<-STR
-  - blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("- blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_fold
-    str = <<-STR
-now is
-   code
-
-
-   code1
-
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_heading
-    str = <<-STR
-text
-   ===   heading three
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("===   heading three\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_heading2
-    str = "text\n   code\n=== heading three"
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("code\n"),
-      @RM::Heading.new(3, 'heading three')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_label
-    str = <<-STR
-  [blah] blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("[blah] blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_lalpha
-    str = <<-STR
-  b. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("b. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_markup_example
-    str = <<-STR
-text
-   code
-   === heading three
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("code\n", "=== heading three\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_merge
-    str = <<-STR
-now is
-   code
-
-   code1
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_merge2
-    str = <<-STR
-now is
-   code
-
-   code1
-
-   code2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n", "\n", "code2\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_multiline
-    str = <<-STR
-now is
-   code
-   code1
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_multilevel
-    str = <<-STR
-now is the time
-  code
- more code
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::Verbatim.new(" code\n",
-                        "more code\n"),
-      @RM::Paragraph.new('for all good men'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_note
-    str = <<-STR
-  blah:: blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("blah:: blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_number
-    str = <<-STR
-  2. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("2. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_rule
-    str = <<-STR
-text
-
-  --- lib/blah.rb.orig
-  +++ lib/blah.rb
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("--- lib/blah.rb.orig\n",
-                        "+++ lib/blah.rb\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_rule2
-    str = <<-STR.chomp
-text
-
-  ---
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("---")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_trim
-    str = <<-STR
-now is
-   code
-
-   code1
-
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n",
-                        "\n",
-                        "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_ualpha
-    str = <<-STR
-  B. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("B. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_whitespace
-    expected = [
-      @RM::Paragraph.new('hello'),
-    ]
-
-    assert_equal expected, @RMP.parse('hello').parts
-
-    expected = [
-      @RM::Verbatim.new('hello '),
-    ]
-
-    assert_equal expected, @RMP.parse('  hello ').parts
-
-    expected = [
-      @RM::Verbatim.new('hello          '),
-    ]
-
-    assert_equal expected, @RMP.parse('                 hello          ').parts
-
-    expected = [
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new("2\n", ' 3'),
-    ]
-
-    assert_equal expected, @RMP.parse("1\n 2\n  3").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "  3"),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n    3").parts
-
-    expected = [
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new("2\n",
-                        " 3\n"),
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new('2'),
-    ]
-
-    assert_equal expected, @RMP.parse("1\n 2\n  3\n1\n 2").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "  3\n",
-                        "1\n",
-                        ' 2'),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n    3\n  1\n   2").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "\n",
-                        '  3'),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n\n    3").parts
-  end
-
-  def test_parse_block_quote
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-    DOC
-
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"),
-                          @RM::Verbatim.new("code\n"),
-                          @RM::Paragraph.new("bar"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-    code
-  bar
-    DOC
-
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"),
-                          @RM::BlockQuote.new(@RM::Paragraph.new("bar")),
-                          @RM::Paragraph.new("zot"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-  >>>
-    bar
-  zot
-    DOC
-  end
-
-  def test_peek_token
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.peek_token
-
-    assert_equal 8, parser.tokens.length
-  end
-
-  def test_skip
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.skip(:HEADER)
-
-    assert_equal [:TEXT, 'Heading', 2, 0], parser.get
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-
-    assert_raise RDoc::Markup::Parser::ParseError do
-      parser.skip :NONE
-    end
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-
-    assert_nil parser.skip(:NONE, false)
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-  end
-
-  def test_tokenize_bullet
-    str = <<-STR
-* l1
-    STR
-
-    expected = [
-      [:BULLET,  '*',     0, 0],
-      [:TEXT,    'l1',    2, 0],
-      [:NEWLINE, "\n",    4, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_bullet_indent
-    str = <<-STR
-* l1
-  * l1.1
-    STR
-
-    expected = [
-      [:BULLET,  '*',     0, 0],
-      [:TEXT,    'l1',    2, 0],
-      [:NEWLINE, "\n",    4, 0],
-      [:BULLET,  '*',     2, 1],
-      [:TEXT,    'l1.1',  4, 1],
-      [:NEWLINE, "\n",    8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading
-    str = <<-STR
-= Heading
-== Heading 2
-    STR
-
-    expected = [
-      [:HEADER,  1,            0, 0],
-      [:TEXT,    'Heading',    2, 0],
-      [:NEWLINE, "\n",         9, 0],
-      [:HEADER,  2,            0, 1],
-      [:TEXT,    'Heading 2',  3, 1],
-      [:NEWLINE, "\n",        12, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_empty
-    str = <<-STR
-===
-* bullet
-    STR
-
-    expected = [
-      [:HEADER,  3,        0, 0],
-      [:NEWLINE, "\n",     3, 0],
-      [:BULLET,  "*",      0, 1],
-      [:TEXT,    "bullet", 2, 1],
-      [:NEWLINE, "\n",     8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_heading
-    str = <<-STR
-= =
-    STR
-
-    expected = [
-      [:HEADER,  1,    0, 0],
-      [:TEXT,    '=',  2, 0],
-      [:NEWLINE, "\n", 3, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_no_space
-    str = <<-STR
-=Heading
-==Heading 2
-    STR
-
-    expected = [
-      [:HEADER,  1,            0, 0],
-      [:TEXT,    'Heading',    1, 0],
-      [:NEWLINE, "\n",         8, 0],
-      [:HEADER,  2,            0, 1],
-      [:TEXT,    'Heading 2',  2, 1],
-      [:NEWLINE, "\n",        11, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label
-    str = <<-STR
-[cat] l1
-[dog] l1.1
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:TEXT,    'l1',    6, 0],
-      [:NEWLINE, "\n",    8, 0],
-      [:LABEL,   'dog',   0, 1],
-      [:TEXT,    'l1.1',  6, 1],
-      [:NEWLINE, "\n",   10, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_note
-    str = <<-STR
-[label]
-  note::
-    STR
-
-    expected = [
-      [:LABEL,   'label', 0, 0],
-      [:NEWLINE, "\n",    7, 0],
-      [:NOTE,    'note',  2, 1],
-      [:NEWLINE, "\n",    8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_newline
-    str = <<-STR
-[cat]
-  l1
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    4, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_newline_windows
-    str = <<-STR
-[cat]\r
-  l1\r
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:NEWLINE, "\n",    6, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_lalpha
-    str = <<-STR
-a. l1
-b. l1.1
-    STR
-
-    expected = [
-      [:LALPHA,  'a',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:LALPHA,  'b',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break
-    str = "now is\nthe time  \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',    0, 0],
-      [:NEWLINE, "\n",        6, 0],
-      [:TEXT,    'the time',  0, 1],
-      [:BREAK,   "  ",        8, 1],
-      [:NEWLINE, "\n",       10, 1],
-      [:TEXT,    'for all',   0, 2],
-      [:NEWLINE, "\n",        7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break_long
-    str = "now is\nthe time   \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',     0, 0],
-      [:NEWLINE, "\n",         6, 0],
-      [:TEXT,    'the time ',  0, 1],
-      [:BREAK,   '  ',         9, 1],
-      [:NEWLINE, "\n",        11, 1],
-      [:TEXT,    'for all',    0, 2],
-      [:NEWLINE, "\n",         7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break_no_short
-    str = "now is\nthe time \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',    0, 0],
-      [:NEWLINE, "\n",        6, 0],
-      [:TEXT,    'the time ', 0, 1],
-      [:NEWLINE, "\n",        9, 1],
-      [:TEXT,    'for all',   0, 2],
-      [:NEWLINE, "\n",        7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note
-    str = <<-STR
-cat:: l1
-dog:: l1.1
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:TEXT,    'l1',    6, 0],
-      [:NEWLINE, "\n",    8, 0],
-      [:NOTE,    'dog',   0, 1],
-      [:TEXT,    'l1.1',  6, 1],
-      [:NEWLINE, "\n",   10, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_empty
-    str = <<-STR
-cat::
-dog::
-    STR
-
-    expected = [
-      [:NOTE,    'cat', 0, 0],
-      [:NEWLINE, "\n",  5, 0],
-      [:NOTE,    'dog', 0, 1],
-      [:NEWLINE, "\n",  5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_newline
-    str = <<-STR
-cat::
-  l1
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    4, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_utf_8
-    str = <<-STR
-cät:: l1a
-      l1b
-døg:: l2a
-      l2b
-    STR
-
-    expected = [
-      [:NOTE,    'cät',   0, 0],
-      [:TEXT,    'l1a',   6, 0],
-      [:NEWLINE, "\n",    9, 0],
-      [:TEXT,    'l1b',   6, 1],
-      [:NEWLINE, "\n",    9, 1],
-      [:NOTE,    'døg',   0, 2],
-      [:TEXT,    'l2a',   6, 2],
-      [:NEWLINE, "\n",    9, 2],
-      [:TEXT,    'l2b',   6, 3],
-      [:NEWLINE, "\n",    9, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_newline_windows
-    str = <<-STR
-cat::\r
-  l1\r
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:NEWLINE, "\n",    6, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_not
-    str = <<-STR
-Cat::Dog
-    STR
-
-    expected = [
-      [:TEXT,    'Cat::Dog', 0, 0],
-      [:NEWLINE, "\n",       8, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number
-    str = <<-STR
-1. l1
-2. l1.1
-    STR
-
-    expected = [
-      [:NUMBER,  '1',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:NUMBER,  '2',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number_period
-    str = <<-STR
-1. blah blah blah
-   l.
-2. blah blah blah blah
-   d.
-    STR
-
-    expected = [
-      [:NUMBER,  "1",                    0, 0],
-      [:TEXT,    "blah blah blah",       3, 0],
-      [:NEWLINE, "\n",                  17, 0],
-
-      [:TEXT,    "l.",                   3, 1],
-      [:NEWLINE, "\n",                   5, 1],
-
-      [:NUMBER,  "2",                    0, 2],
-      [:TEXT,    "blah blah blah blah",  3, 2],
-      [:NEWLINE, "\n",                  22, 2],
-
-      [:TEXT,    "d.",                   3, 3],
-      [:NEWLINE, "\n",                   5, 3]
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number_period_continue
-    str = <<-STR
-1. blah blah blah
-   l.  more stuff
-2. blah blah blah blah
-   d. other stuff
-    STR
-
-    expected = [
-      [:NUMBER,  "1",                    0, 0],
-      [:TEXT,    "blah blah blah",       3, 0],
-      [:NEWLINE, "\n",                  17, 0],
-
-      [:LALPHA,  "l",                    3, 1],
-      [:TEXT,    "more stuff",           7, 1],
-      [:NEWLINE, "\n",                  17, 1],
-
-      [:NUMBER,  "2",                    0, 2],
-      [:TEXT,    "blah blah blah blah",  3, 2],
-      [:NEWLINE, "\n",                  22, 2],
-
-      [:LALPHA,  "d",                    3, 3],
-      [:TEXT,    "other stuff",          6, 3],
-      [:NEWLINE, "\n",                  17, 3]
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_paragraphs
-    str = <<-STR
-now is
-the time
-
-for all
-    STR
-
-    expected = [
-      [:TEXT,    'now is',   0, 0],
-      [:NEWLINE, "\n",       6, 0],
-      [:TEXT,    'the time', 0, 1],
-      [:NEWLINE, "\n",       8, 1],
-      [:NEWLINE, "\n",       0, 2],
-      [:TEXT,    'for all',  0, 3],
-      [:NEWLINE, "\n",       7, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_rule
-    str = <<-STR
----
-
---- blah ---
-    STR
-
-    expected = [
-      [:RULE,    1,            0, 0],
-      [:NEWLINE, "\n",         3, 0],
-      [:NEWLINE, "\n",         0, 1],
-      [:TEXT, "--- blah ---",  0, 2],
-      [:NEWLINE, "\n",        12, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_rule_windows
-    str = <<-STR
----\r
-
---- blah ---\r
-    STR
-
-    expected = [
-      [:RULE,    1,            0, 0],
-      [:NEWLINE, "\n",         4, 0],
-      [:NEWLINE, "\n",         0, 1],
-      [:TEXT, "--- blah ---",  0, 2],
-      [:NEWLINE, "\n",        13, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_ualpha
-    str = <<-STR
-A. l1
-B. l1.1
-    STR
-
-    expected = [
-      [:UALPHA,  'A',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:UALPHA,  'B',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_heading
-    str = <<-STR
-Example heading:
-
-   === heading three
-    STR
-
-    expected = [
-      [:TEXT,    'Example heading:',  0, 0],
-      [:NEWLINE, "\n",               16, 0],
-      [:NEWLINE, "\n",                0, 1],
-      [:HEADER,  3,                   3, 2],
-      [:TEXT,    'heading three',     7, 2],
-      [:NEWLINE, "\n",               20, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_rule
-    str = <<-STR
-  Verbatim section here that is double-underlined
-  ===============================================
-    STR
-
-    expected = [
-      [:TEXT,    'Verbatim section here that is double-underlined',  2, 0],
-      [:NEWLINE, "\n",                                              49, 0],
-      [:HEADER,  47,                                                 2, 1],
-      [:NEWLINE, "\n",                                              49, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_rule_fancy
-    str = <<-STR
-  A
-    b
-  ===============================================
-    c
-    STR
-
-    expected = [
-      [:TEXT,    'A',   2, 0],
-      [:NEWLINE, "\n",  3, 0],
-      [:TEXT,    'b',   4, 1],
-      [:NEWLINE, "\n",  5, 1],
-      [:HEADER,  47,    2, 2],
-      [:NEWLINE, "\n", 49, 2],
-      [:TEXT,    'c',   4, 3],
-      [:NEWLINE, "\n",  5, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  # HACK move to Verbatim test case
-  def test_verbatim_normalize
-    v = @RM::Verbatim.new "foo\n", "\n", "\n", "bar\n"
-
-    v.normalize
-
-    assert_equal ["foo\n", "\n", "bar\n"], v.parts
-
-    v = @RM::Verbatim.new "foo\n", "\n"
-
-    v.normalize
-
-    assert_equal ["foo\n"], v.parts
-  end
-
-  def test_unget
-    parser = util_parser
-
-    parser.get
-
-    parser.unget
-
-    assert_equal [:HEADER, 1, 0, 0], parser.peek_token
-
-    assert_raise @RMP::Error do
-      parser.unget
-    end
-
-    assert_equal 8, parser.tokens.length
-  end
-
-  def util_parser
-    str = <<-STR
-= Heading
-
-Some text here
-some more text over here
-    STR
-
-    @parser = @RMP.new
-    @parser.tokenize str
-    @parser
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_pre_process_test.rb b/test/mri/rdoc/rdoc_markup_pre_process_test.rb
deleted file mode 100644
index 2a8cd92dd04..00000000000
--- a/test/mri/rdoc/rdoc_markup_pre_process_test.rb
+++ /dev/null
@@ -1,481 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDoc::Markup::PreProcessTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new 'test_rdoc_markup_pre_process'
-    @file_name = File.basename @tempfile.path
-    @dir  = File.dirname @tempfile.path
-
-    @pp = RDoc::Markup::PreProcess.new @tempfile.path, [@dir, File.dirname(__FILE__)]
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_class_register
-    RDoc::Markup::PreProcess.register 'for_test' do raise 'fail' end
-
-    assert_equal %w[for_test], RDoc::Markup::PreProcess.registered.keys
-  end
-
-  def test_class_post_process
-    RDoc::Markup::PreProcess.post_process do end
-
-    assert_equal 1, RDoc::Markup::PreProcess.post_processors.length,
-                 proc{RDoc::Markup::PreProcess.post_processors.inspect}
-  end
-
-  def test_include_file
-    @tempfile.write <<-INCLUDE
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    INCLUDE
-
-    @tempfile.flush
-    @tempfile.rewind
-
-    content = @pp.include_file @file_name, '', nil
-
-    expected = <<-EXPECTED
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    EXPECTED
-
-    assert_equal expected, content
-  end
-
-  def test_include_file_encoding_incompatible
-    @tempfile.write <<-INCLUDE
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-π
-    INCLUDE
-
-    @tempfile.flush
-    @tempfile.rewind
-
-    content = @pp.include_file @file_name, '', Encoding::US_ASCII
-
-    expected = "?\n"
-
-    assert_equal expected, content
-  end
-
-  def test_include_file_in_other_directory
-    content = nil
-    out, err = capture_output do
-      content = @pp.include_file "test.txt", '', nil
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal "test file\n", content
-  end
-
-  def test_handle
-    text = "# :main: M\n"
-    output = nil
-    _, err = capture_output do
-      output = @pp.handle text
-    end
-
-    assert_include err, "The :main: directive is deprecated and will be removed in RDoc 7."
-    assert_equal "#\n", output
-  end
-
-  def test_handle_comment
-    text = "# :main: M\n"
-    c = comment text
-
-    output = nil
-    _, err = capture_output do
-      output = @pp.handle c
-    end
-
-    assert_include err, "The :main: directive is deprecated and will be removed in RDoc 7."
-    assert_equal "#\n", output
-  end
-
-  def test_handle_markup
-    c = comment ':markup: rd'
-
-    @pp.handle c
-
-    assert_equal 'rd', c.format
-  end
-
-  def test_handle_markup_empty
-    c = comment ':markup:'
-
-    @pp.handle c
-
-    assert_equal 'rdoc', c.format
-  end
-
-  def test_handle_post_process
-    cd = RDoc::CodeObject.new
-
-    RDoc::Markup::PreProcess.post_process do |text, code_object|
-      code_object.metadata[:stuff] = text
-
-      :junk
-    end
-
-    text = "# a b c\n"
-
-    out = @pp.handle text, cd
-
-    assert_equal "# a b c\n", out
-    assert_equal "# a b c\n", cd.metadata[:stuff]
-  end
-
-  def test_handle_unregistered
-    text = "# :x: y\n"
-    out = @pp.handle text
-
-    assert_equal text, out
-  end
-
-  def test_handle_directive_blankline
-    result = @pp.handle_directive '#', 'arg', 'a, b'
-
-    assert_equal "#:arg: a, b\n", result
-  end
-
-  def test_handle_directive_downcase
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'ARG', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_arg
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'arg', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_arg_no_context
-    result = @pp.handle_directive '', 'arg', 'a, b', nil
-
-    assert_equal ":arg: a, b\n", result
-  end
-
-  def test_handle_directive_args
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'args', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_block
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_empty result
-  end
-
-  def test_handle_directive_block_false
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-  end
-
-  def test_handle_directive_block_nil
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      nil
-    end
-
-    assert_equal ":x: y\n", result
-  end
-
-  def test_handle_directive_category
-    context = RDoc::Context.new
-    original_section = context.current_section
-
-    @pp.handle_directive '', 'category', 'other', context
-
-    refute_equal original_section, context.current_section
-  end
-
-  def test_handle_directive_doc
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = false
-    code_object.force_documentation = false
-
-    @pp.handle_directive '', 'doc', nil, code_object
-
-    assert code_object.document_self
-    assert code_object.force_documentation
-  end
-
-  def test_handle_directive_doc_no_context
-    result = @pp.handle_directive '', 'doc', nil
-
-    assert_equal "\n", result
-  end
-
-  def test_handle_directive_enddoc
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'enddoc', nil, code_object
-
-    assert code_object.done_documenting
-  end
-
-  def test_handle_directive_include
-    @tempfile.write 'included'
-    @tempfile.flush
-
-    result = @pp.handle_directive '', 'include', @file_name
-
-    assert_equal 'included', result
-  end
-
-  def test_handle_directive_main
-    @pp.options = RDoc::Options.new
-
-    _, err = capture_output do
-      @pp.handle_directive '', 'main', 'M'
-    end
-
-    assert_include err, "The :main: directive is deprecated and will be removed in RDoc 7."
-    assert_equal 'M', @pp.options.main_page
-  end
-
-  def test_handle_directive_notnew
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'notnew', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_not_new
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'not_new', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_not_dash_new
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'not-new', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_nodoc
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = true
-    code_object.document_children = true
-
-    @pp.handle_directive '', 'nodoc', nil, code_object
-
-    refute code_object.document_self
-    assert code_object.document_children
-  end
-
-  def test_handle_directive_nodoc_all
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = true
-    code_object.document_children = true
-
-    @pp.handle_directive '', 'nodoc', 'all', code_object
-
-    refute code_object.document_self
-    refute code_object.document_children
-  end
-
-  def test_handle_directive_nodoc_no_context
-    result = @pp.handle_directive '', 'nodoc', nil
-
-    assert_equal "\n", result
-  end
-
-  def test_handle_directive_registered
-    RDoc::Markup::PreProcess.register 'x'
-
-    result = @pp.handle_directive '', 'x', 'y'
-
-    assert_nil result
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_equal '', result
-  end
-
-  def test_handle_directive_registered_block
-    called = nil
-
-    RDoc::Markup::PreProcess.register 'x' do |directive, param|
-      called = [directive, param]
-      'blah'
-    end
-
-    result = @pp.handle_directive '', 'x', 'y'
-
-    assert_equal 'blah', result
-    assert_equal %w[x y], called
-  end
-
-  def test_handle_directive_registered_code_object
-    RDoc::Markup::PreProcess.register 'x'
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-    assert_empty code_object.metadata
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_equal '', result
-    assert_empty code_object.metadata
-  end
-
-  def test_handle_directive_startdoc
-    code_object = RDoc::CodeObject.new
-    code_object.stop_doc
-    code_object.force_documentation = false
-
-    @pp.handle_directive '', 'startdoc', nil, code_object
-
-    assert code_object.document_self
-    assert code_object.document_children
-    assert code_object.force_documentation
-  end
-
-  def test_handle_directive_stopdoc
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'stopdoc', nil, code_object
-
-    refute code_object.document_self
-    refute code_object.document_children
-  end
-
-  def test_handle_directive_title
-    @pp.options = RDoc::Options.new
-
-    _, err = capture_output do
-      @pp.handle_directive '', 'title', 'T'
-    end
-
-    assert_include err, "The :title: directive is deprecated and will be removed in RDoc 7."
-    assert_equal 'T', @pp.options.title
-  end
-
-  def test_handle_directive_unhandled
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    @pp.handle_directive '', 'x', '', code_object
-
-    assert_includes code_object.metadata, 'x'
-  end
-
-  def test_handle_directive_unhandled_block
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      false
-    end
-
-    assert_empty code_object.metadata
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      nil
-    end
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      ''
-    end
-
-    assert_empty code_object.metadata
-  end
-
-  def test_handle_directive_yield
-    method = RDoc::AnyMethod.new nil, 'm'
-    method.params = 'index, &block'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-    assert_equal 'index', method.params
-  end
-
-  def test_handle_directive_yield_block_param
-    method = RDoc::AnyMethod.new nil, 'm'
-    method.params = '&block'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-    assert_empty method.params
-  end
-
-  def test_handle_directive_yield_no_context
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-  end
-
-  def test_handle_directive_yields
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'yields', 'item', method
-
-    assert_equal 'item', method.block_params
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_raw_test.rb b/test/mri/rdoc/rdoc_markup_raw_test.rb
deleted file mode 100644
index a1599ebb6c7..00000000000
--- a/test/mri/rdoc/rdoc_markup_raw_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupRawTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @p = @RM::Raw.new
-  end
-
-  def test_push
-    @p.push 'hi', 'there'
-
-    assert_equal @RM::Raw.new('hi', 'there'), @p
-  end
-
-  def test_pretty_print
-    assert_equal '[raw: ]', mu_pp(@p)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_test.rb b/test/mri/rdoc/rdoc_markup_test.rb
deleted file mode 100644
index d9d3d25e227..00000000000
--- a/test/mri/rdoc/rdoc_markup_test.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupTest < RDoc::TestCase
-
-  def test_class_parse
-    expected = @RM::Document.new(
-      @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::Markup.parse('hello')
-  end
-
-  def test_convert
-    str = <<-STR
-now is
-the time
-
-  hello
-  dave
-
-1. l1
-2. l2
-    STR
-
-    m = RDoc::Markup.new
-
-    tt = RDoc::Markup::ToTest.new m
-
-    out = m.convert str, tt
-
-    expected = [
-      "now is the time",
-      "\n",
-      "  hello\n  dave\n",
-      "1: ",
-      "l1",
-      "1: ",
-      "l2",
-    ]
-
-    assert_equal expected, out
-  end
-
-  def test_convert_custom_markup
-    str = <<-STR
-{stricken}
-    STR
-
-    m = RDoc::Markup.new
-    m.add_word_pair '{', '}', :STRIKE
-
-    tt = RDoc::Markup::ToTest.new nil, m
-    tt.add_tag :STRIKE, 'STRIKE ', ' STRIKE'
-
-    out = m.convert str, tt
-
-    expected = [
-      "STRIKE stricken STRIKE",
-    ]
-
-    assert_equal expected, out
-  end
-
-  def test_convert_document
-    doc = RDoc::Markup::Parser.parse <<-STR
-now is
-the time
-
-  hello
-  dave
-
-1. l1
-2. l2
-    STR
-
-    m = RDoc::Markup.new
-
-    tt = RDoc::Markup::ToTest.new m
-
-    out = m.convert doc, tt
-
-    expected = [
-      "now is the time",
-      "\n",
-      "  hello\n  dave\n",
-      "1: ",
-      "l1",
-      "1: ",
-      "l2",
-    ]
-
-    assert_equal expected, out
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_ansi_test.rb b/test/mri/rdoc/rdoc_markup_to_ansi_test.rb
deleted file mode 100644
index 020f5469973..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_ansi_test.rb
+++ /dev/null
@@ -1,380 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToAnsiTest < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToAnsi.new
-  end
-
-  def accept_blank_line
-    assert_equal "\e[0m\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\e[0m> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "\e[0mhello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "\e[0mHello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "\e[0mcat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "\e[0mcat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal %W"\e[0m", @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal %W"\e[0m", @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal %W"\e[0m", @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal %W"\e[0m", @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal %W"\e[0m", @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal %W"\e[0m", @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "\e[0m",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "\e[0m", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "\e[0mhi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-\e[0m<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "\e[0m#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "\e[0m  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "\e[0mhi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal %W"\e[0m", @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "\e[0m\e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "\e[0m\e[4;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "\e[0m\e[32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "\e[0mHello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "\e[0m   \e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "\e[0m\e[1;32m\e[1mHello\e[m\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "\e[0m\e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "\e[0m\e[7mteletype\e[m:\n  teletype description\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "\e[0mlabel:\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "\e[0mone\ntwo:\n  two headers\n\n",
-                 @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "\e[0mreg \e[1mbold words\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "\e[0mone\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "\e[0mhello\nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "\e[0mreg \e[4mitalic words\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-\e[0m   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "\e[0mreg \e[7mteletype\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "\e[0mreg \e[1mbold\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "\e[0mreg \e[4mitalic\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-\e[0mwords words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "\e[0m   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "\e[0m    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "\e[0m    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-\e[0m* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-\e[0m* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_table_align
-    expected = "\e[0m" + <<-EXPECTED
- AA |BB |CCCCC|DDDDD
-----|---|-----|-----
-    |bbb|    c|
-aaaa|b  |     | dd
- a  |   |   cc| dd
-    EXPECTED
-    assert_equal expected, @to.end_accepting
-  end
-
-  # functional test
-  def test_convert_list_note
-    note_list = <<-NOTE_LIST
-foo ::
-bar ::
-  hi
-    NOTE_LIST
-
-    expected = <<-EXPECTED
-\e[0mfoo
-bar:
-  hi
-
-    EXPECTED
-
-    assert_equal expected, @to.convert(note_list)
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_bs_test.rb b/test/mri/rdoc/rdoc_markup_to_bs_test.rb
deleted file mode 100644
index d89d784422c..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_bs_test.rb
+++ /dev/null
@@ -1,363 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToBsTest < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToBs.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "===== H\bHe\bel\bll\blo\bo\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "cat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [''], @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [''], @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [''], @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [''], @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [''], @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [''], @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [''], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "=== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "==== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   = H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "teletype:\n  teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label:\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one\ntwo:\n  two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg b\bbo\bol\bld\bd \b w\bwo\bor\brd\bds\bs reg\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello\nworld\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc_\b _\bw_\bo_\br_\bd_\bs reg\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg teletype reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg b\bbo\bol\bld\bd reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_table_align
-    expected = <<-EXPECTED
- AA |BB |CCCCC|DDDDD
-----|---|-----|-----
-    |bbb|    c|
-aaaa|b  |     | dd
- a  |   |   cc| dd
-    EXPECTED
-    assert_equal expected, @to.end_accepting
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_html_crossref_test.rb b/test/mri/rdoc/rdoc_markup_to_html_crossref_test.rb
deleted file mode 100644
index a52c7f1506d..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_html_crossref_test.rb
+++ /dev/null
@@ -1,325 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocMarkupToHtmlCrossrefTest < XrefTestCase
-
-  def setup
-    super
-
-    @options.hyperlink_all = true
-    @options.warn_missing_rdoc_ref = true
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'index.html', @c1
-  end
-
-  def test_convert_CROSSREF
-    result = @to.convert 'C1'
-
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-
-    result = @to.convert '+C1+'
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-
-    result = @to.convert 'Constant[rdoc-ref:C1]'
-    assert_equal para("<a href=\"C1.html\">Constant</a>"), result
-
-    result = @to.convert 'FOO'
-    assert_equal para("FOO"), result
-
-    result = @to.convert '+FOO+'
-    assert_equal para("<code>FOO</code>"), result
-
-    result = @to.convert '<tt># :stopdoc:</tt>:'
-    assert_equal para("<code># :stopdoc:</code>:"), result
-  end
-
-  def test_convert_CROSSREF_ignored_excluded_words
-    @options.autolink_excluded_words = ['C1']
-
-    result = @to.convert 'C1'
-    assert_equal para("C1"), result
-
-    result = @to.convert '+C1+'
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-
-    # Explicit linking with rdoc-ref is not ignored
-    result = @to.convert 'Constant[rdoc-ref:C1]'
-    assert_equal para("<a href=\"C1.html\">Constant</a>"), result
-  end
-
-  def test_convert_CROSSREF_method
-    result = @to.convert 'C1#m(foo, bar, baz)'
-
-    assert_equal para("<a href=\"C1.html#method-i-m\"><code>C1#m(foo, bar, baz)</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_label
-    result = @to.convert 'C1@foo'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>"), result
-
-    result = @to.convert 'C1#m@foo'
-    assert_equal para("<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>"),
-                 result
-  end
-
-  def test_convert_CROSSREF_label_for_md
-    result = @to.convert 'EXAMPLE@foo'
-    assert_equal para("<a href=\"EXAMPLE_md.html#label-foo\">foo at <code>EXAMPLE</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_label_period
-    result = @to.convert 'C1@foo.'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>."), result
-  end
-
-  def test_convert_CROSSREF_label_space
-    result = @to.convert 'C1@foo+bar'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo+bar\">foo bar at <code>C1</code></a>"),
-                 result
-  end
-
-  def test_convert_CROSSREF_section
-    @c1.add_section 'Section'
-
-    result = @to.convert 'C1@Section'
-    assert_equal para("<a href=\"C1.html#Section\">Section at <code>C1</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_constant
-    result = @to.convert 'C1::CONST'
-
-    assert_equal para("<a href=\"C1.html#CONST\"><code>C1::CONST</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref
-    result = @to.convert 'rdoc-ref:C1'
-
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_not_found
-    result = nil
-    stdout, _ = capture_output do
-      result = @to.convert 'rdoc-ref:FOO'
-    end
-
-    assert_equal para("FOO"), result
-    assert_include stdout, "index.html: `rdoc-ref:FOO` can't be resolved for `FOO`"
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method
-    result = @to.convert 'rdoc-ref:C1#m'
-
-    assert_equal para("<a href=\"C1.html#method-i-m\"><code>C1#m</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_label
-    result = @to.convert 'rdoc-ref:C1#m@foo'
-
-    assert_equal para("<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>"),
-                 result, 'rdoc-ref:C1#m@foo'
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_percent
-    m = @c1.add_method RDoc::AnyMethod.new nil, '%'
-
-    result = @to.convert 'rdoc-ref:C1#%'
-
-    assert_equal para("<a href=\"C1.html#method-i-25\"><code>C1#%</code></a>"), result
-
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::%'
-
-    assert_equal para("<a href=\"C1.html#method-c-25\"><code>C1::%</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_escape_html
-    m = @c1.add_method RDoc::AnyMethod.new nil, '<<'
-
-    result = @to.convert 'rdoc-ref:C1#<<'
-
-    assert_equal para("<a href=\"C1.html#method-i-3C-3C\"><code>C1#&lt;&lt;</code></a>"), result
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::<<'
-
-    assert_equal para("<a href=\"C1.html#method-c-3C-3C\"><code>C1::&lt;&lt;</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_percent_label
-    m = @c1.add_method RDoc::AnyMethod.new nil, '%'
-
-    result = @to.convert 'rdoc-ref:C1#%@f'
-
-    assert_equal para("<a href=\"C1.html#method-i-25-label-f\">f at <code>C1#%</code></a>"),
-                 result
-
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::%@f'
-
-    assert_equal para("<a href=\"C1.html#method-c-25-label-f\">f at <code>C1::%</code></a>"),
-                 result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_label
-    result = @to.convert 'rdoc-ref:C1@foo'
-
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>"), result,
-                 'rdoc-ref:C1@foo'
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_label_in_current_file
-    result = @to.convert 'rdoc-ref:@foo'
-
-    assert_equal para("<a href=\"#label-foo\">foo</a>"), result,
-                 'rdoc-ref:@foo'
-
-    result = @to.convert '{Foo}[rdoc-ref:@foo]'
-
-    assert_equal para("<a href=\"#label-foo\">Foo</a>"), result,
-                 '{Foo}[rdoc-ref:@foo]'
-  end
-
-  def test_gen_url
-    assert_equal '<a href="C1.html">Some class</a>',
-                 @to.gen_url('rdoc-ref:C1', 'Some class')
-
-    assert_equal '<a href="http://example">HTTP example</a>',
-                 @to.gen_url('http://example', 'HTTP example')
-  end
-
-  def test_gen_url_rdoc_ref_not_found
-    stdout, _ = capture_output do
-      @to.gen_url 'rdoc-ref:FOO', 'FOO'
-    end
-
-    assert_include stdout, "index.html: `rdoc-ref:FOO` can't be resolved for `FOO`"
-  end
-
-  def test_handle_regexp_CROSSREF
-    assert_equal "<a href=\"C2/C3.html\"><code>C2::C3</code></a>", REGEXP_HANDLING('C2::C3')
-  end
-
-  def test_handle_regexp_CROSSREF_label
-    assert_equal "<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>",
-                 REGEXP_HANDLING('C1#m@foo')
-  end
-
-  def test_handle_regexp_CROSSREF_show_hash_false
-    @to.show_hash = false
-
-    assert_equal "<a href=\"C1.html#method-i-m\"><code>m</code></a>",
-                 REGEXP_HANDLING('#m')
-  end
-
-  def test_handle_regexp_CROSSREF_with_arg_looks_like_TIDYLINK
-    result = @to.convert 'C1.m[:sym]'
-
-    assert_equal para("<a href=\"C1.html#method-c-m\"><code>C1.m[:sym]</code></a>"), result,
-                 'C1.m[:sym]'
-  end
-
-  def test_handle_regexp_HYPERLINK_rdoc
-    readme = @store.add_file 'README.txt'
-    readme.parser = RDoc::Parser::Simple
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c2
-
-    link = @to.handle_regexp_HYPERLINK hyper 'C2::C3'
-
-    assert_equal '<a href="C2/C3.html"><code>C2::C3</code></a>', link
-
-    link = @to.handle_regexp_HYPERLINK hyper 'C4'
-
-    assert_equal '<a href="C4.html"><code>C4</code></a>', link
-
-    link = @to.handle_regexp_HYPERLINK hyper 'README.txt'
-
-    assert_equal '<a href="README_txt.html">README.txt</a>', link
-  end
-
-  def test_handle_regexp_TIDYLINK_rdoc
-    readme = @store.add_file 'README.txt'
-    readme.parser = RDoc::Parser::Simple
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c2
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C2::C3'
-
-    assert_equal '<a href="C2/C3.html">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C4'
-
-    assert_equal '<a href="C4.html">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C1#m'
-
-    assert_equal '<a href="C1.html#method-i-m">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'README.txt'
-
-    assert_equal '<a href="README_txt.html">tidy</a>', link
-  end
-
-  def test_handle_regexp_TIDYLINK_label
-    link = @to.handle_regexp_TIDYLINK tidy 'C1#m@foo'
-
-    assert_equal "<a href=\"C1.html#method-i-m-label-foo\">tidy</a>",
-                 link, 'C1#m@foo'
-  end
-
-  def test_to_html_CROSSREF_email
-    @options.hyperlink_all = false
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'index.html', @c1
-
-    result = @to.to_html 'first.last@example.com'
-
-    assert_equal 'first.last@example.com', result
-  end
-
-  def test_to_html_CROSSREF_email_hyperlink_all
-    result = @to.to_html 'first.last@example.com'
-
-    assert_equal 'first.last@example.com', result
-  end
-
-  def test_link
-    assert_equal 'n', @to.link('n', 'n')
-
-    assert_equal '<a href="C1.html#method-c-m"><code>m</code></a>', @to.link('m', 'm')
-  end
-
-  def test_link_for_method_traverse
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c9
-    assert_equal '<a href="C9/A.html#method-i-foo"><code>C9::B#foo</code></a>', @to.link('C9::B#foo', 'C9::B#foo')
-  end
-
-  def test_link_class_method_full
-    assert_equal '<a href="Parent.html#method-c-m"><code>Parent::m</code></a>',
-                 @to.link('Parent::m', 'Parent::m')
-  end
-
-  def para(text)
-    "\n<p>#{text}</p>\n"
-  end
-
-  def REGEXP_HANDLING(text)
-    @to.handle_regexp_CROSSREF regexp_handling text
-  end
-
-  def hyper(reference)
-    RDoc::Markup::RegexpHandling.new 0, "rdoc-ref:#{reference}"
-  end
-
-  def regexp_handling(text)
-    RDoc::Markup::RegexpHandling.new 0, text
-  end
-
-  def tidy(reference)
-    RDoc::Markup::RegexpHandling.new 0, "{tidy}[rdoc-ref:#{reference}]"
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_html_snippet_test.rb b/test/mri/rdoc/rdoc_markup_to_html_snippet_test.rb
deleted file mode 100644
index 4a338271afe..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_html_snippet_test.rb
+++ /dev/null
@@ -1,709 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToHtmlSnippetTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 100, 100
-    @ellipsis = @to.to_html '...'
-  end
-
-  def accept_blank_line
-    assert_empty @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\n<blockquote><p>quote\n</blockquote>\n", @to.res.join
-
-    assert_equal 5, @to.characters
-  end
-
-  def accept_document
-    assert_equal "<p>hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_1
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_2
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_3
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_4
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_b
-    assert_equal "<p><strong>Hello</strong>\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_list_end_bullet
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_label
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_lalpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_number
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_note
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_ualpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_label
-    assert_equal [''], @to.in_list_entry
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_note
-    assert_equal [''], @to.in_list_entry
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_end_number
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_label
-    assert_equal "<p>cat &mdash; ", @to.res.join
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_note
-    assert_equal "<p>cat &mdash; ",
-                 @to.res.join
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_start_note_2
-    expected = <<-EXPECTED
-<p><code>teletype</code> &mdash; teletype description
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 29, @to.characters
-  end
-
-  def accept_list_item_start_note_multi_description
-    expected = <<-EXPECTED
-<p>label &mdash; description one
-<p>description two
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 37, @to.characters
-  end
-
-  def accept_list_item_start_note_multi_label
-    expected = <<-EXPECTED
-<p>one, two &mdash; two headers
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 18, @to.characters
-  end
-
-  def accept_list_item_start_number
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_bullet
-    assert_equal [:BULLET], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_label
-    assert_equal [:LABEL], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_lalpha
-    assert_equal [:LALPHA], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_note
-    assert_equal [:NOTE], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_number
-    assert_equal [:NUMBER], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_ualpha
-    assert_equal [:UALPHA], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_paragraph
-    assert_equal "<p>hi\n", @to.res.join
-
-    assert_equal 2, @to.characters
-  end
-
-  def accept_paragraph_b
-    assert_equal "<p>reg <strong>bold words</strong> reg\n", @to.res.join
-
-    assert_equal 18, @to.characters
-  end
-
-  def accept_paragraph_br
-    assert_equal "<p>one<br>two\n", @to.res.join
-
-    assert_equal 6, @to.characters
-  end
-
-  def accept_paragraph_break
-    assert_equal "<p>hello<br>\nworld\n", @to.res.join
-
-    assert_equal 11, @to.characters
-  end
-
-  def accept_paragraph_i
-    assert_equal "<p>reg <em>italic words</em> reg\n", @to.res.join
-
-    assert_equal 20, @to.characters
-  end
-
-  def accept_paragraph_plus
-    assert_equal "<p>reg <code>teletype</code> reg\n", @to.res.join
-
-    assert_equal 16, @to.characters
-  end
-
-  def accept_paragraph_star
-    assert_equal "<p>reg <strong>bold</strong> reg\n", @to.res.join
-
-    assert_equal 12, @to.characters
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "<p>reg <em>italic</em> reg\n", @to.res.join
-
-    assert_equal 14, @to.characters
-  end
-
-  def accept_raw
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_rule
-    assert_empty @to.res
-    assert_equal 0, @to.characters
-  end
-
-  def accept_verbatim
-    assert_equal "\n<pre class=\"ruby\"><span class=\"ruby-identifier\">hi</span>\n  <span class=\"ruby-identifier\">world</span>\n</pre>\n", @to.res.join
-    assert_equal 10, @to.characters
-  end
-
-  def end_accepting
-    assert_equal 'hi', @to.res.join
-  end
-
-  def start_accepting
-    assert_equal [], @to.res
-    assert_equal [], @to.in_list_entry
-    assert_equal [], @to.list
-    assert_equal 0,  @to.characters
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-<p>l1
-<p>l1.1
-
-<p>l2
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 8, @to.characters
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED
-<p>list stuff
-
-<pre>* list
-  with
-
-  second
-
-  1. indented
-  2. numbered
-
-  third
-
-* second</pre>
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-    assert_equal 81, @to.characters
-  end
-
-  def test_accept_heading_7
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(7, 'Hello')
-
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_heading_aref_class
-    @to.code_object = RDoc::NormalClass.new 'Foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "<p>Hello\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_heading_aref_method
-    @to.code_object = RDoc::AnyMethod.new nil, 'foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "<p>Hello\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_verbatim_ruby
-    options = RDoc::Options.new
-    rdoc = RDoc::RDoc.new
-    rdoc.options = options
-    RDoc::RDoc.current = rdoc
-
-    verb = @RM::Verbatim.new("class C\n", "end\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-keyword">class</span> <span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 11, @to.characters
-  end
-
-  def test_accept_verbatim_ruby_error
-    options = RDoc::Options.new
-    rdoc = RDoc::RDoc.new
-    rdoc.options = options
-    RDoc::RDoc.current = rdoc
-
-    verb = @RM::Verbatim.new("a % 09 # => blah\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    inner = CGI.escapeHTML "a % 09 # => blah"
-
-    expected = <<-EXPECTED
-
-<pre>#{inner}</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 16, @to.characters
-  end
-
-  def test_add_paragraph
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 0, 3
-    assert_throws :done do
-      @to.add_paragraph
-      @to.add_paragraph
-      @to.add_paragraph
-    end
-
-    assert_equal 3, @to.paragraphs
-  end
-
-  def test_convert_limit
-    rdoc = <<-RDOC
-= Hello
-
-This is some text, it *will* be cut off after 100 characters and an ellipsis
-must follow
-
-So there you have it
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Hello
-<p>This is some text, it <strong>will</strong> be cut off after 100 characters and an ellipsis must follow
-<p>So there you #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 111, @to.characters, 'snippet character length'
-  end
-
-  def test_convert_limit_2
-    rdoc = <<-RDOC
-Outputs formatted RI data for the class or method +name+.
-
-Returns true if +name+ was found, false if it was not an alternative could
-be guessed, raises an error if +name+ couldn't be guessed.
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Outputs formatted RI data for the class or method <code>name</code>.
-<p>Returns true if <code>name</code> was found, false if it was #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 159, @to.characters, 'snippet character length'
-  end
-
-  def test_convert_limit_paragraphs
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 100, 3
-
-    rdoc = <<-RDOC
-= \RDoc - Ruby Documentation System
-
-* {RDoc Project Page}[https://github.com/ruby/rdoc]
-* {RDoc Documentation}[https://ruby.github.io/rdoc]
-* {RDoc Bug Tracker}[https://github.com/ruby/rdoc/issues]
-
-== DESCRIPTION:
-
-RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying online
-documentation.
-
-See RDoc for a description of RDoc's markup and basic use.
-    RDOC
-
-    expected = <<-EXPECTED
-<p>RDoc - Ruby Documentation System
-<p>RDoc Project Page
-<p>RDoc Documentation
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 67, @to.characters
-  end
-
-  def test_convert_limit_in_tag
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 4
-    rdoc = "* ab *c* d\n"
-
-    expected = "<p>ab <strong>c</strong> #{@ellipsis}\n\n"
-
-    actual = @to.convert rdoc
-
-    assert_equal 4, @to.characters
-    assert_equal expected, actual
-  end
-
-  def test_convert_limit_verbatim
-    rdoc = <<-RDOC
-= Hello There
-
-This is some text, it *will* be cut off after 100 characters
-
-  This one is cut off in this verbatim section
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Hello There
-<p>This is some text, it <strong>will</strong> be cut off after 100 characters
-
-<pre>This one is cut off in this verbatim ...</pre>
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 113, @to.characters
-  end
-
-  def test_convert_limit_verbatim_2
-    rdoc = <<-RDOC
-Extracts the class, selector and method name parts from +name+ like
-Foo::Bar#baz.
-
-NOTE: Given Foo::Bar, Bar is considered a class even though it may be a
-      method
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Extracts the class, selector and method name parts from <code>name</code> like Foo::Bar#baz.
-<p>NOTE: Given Foo::Bar, #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 101, @to.characters
-  end
-
-  def test_convert_limit_verbatim_multiline
-    rdoc = <<-RDOC
-Look for directives in a normal comment block:
-
-  # :stopdoc:
-  # Don't display comment from this point forward
-
-This routine modifies its +comment+ parameter.
-    RDOC
-
-    inner = CGI.escapeHTML "# Don't display comment from this point forward"
-    expected = <<-EXPECTED
-<p>Look for directives in a normal comment block:
-
-<pre class=\"ruby\"><span class=\"ruby-comment\"># :stopdoc:</span>
-<span class=\"ruby-comment\">#{inner}</span>
-</pre>
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 105, @to.characters
-  end
-
-  def test_convert_limit_over
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 4
-    rdoc = "* text\n" * 2
-
-    expected = "<p>text\n"
-    expected = expected.chomp
-    expected << " #{@ellipsis}\n"
-
-    actual = @to.convert rdoc
-
-    assert_equal 4, @to.characters
-    assert_equal expected, actual
-  end
-
-  def test_convert_string
-    assert_equal '&lt;&gt;', @to.convert_string('<>')
-  end
-
-  def test_convert_RDOCLINK_label_label
-    result = @to.convert 'rdoc-label:label-One'
-
-    assert_equal "<p>One\n", result
-    assert_equal 3, @to.characters
-  end
-
-  def test_convert_RDOCLINK_label_foottext
-    result = @to.convert 'rdoc-label:foottext-1'
-
-    assert_equal "<p>1\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_RDOCLINK_label_footmark
-    result = @to.convert 'rdoc-label:footmark-1'
-
-    assert_equal "<p>1\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_RDOCLINK_ref
-    result = @to.convert 'rdoc-ref:C'
-
-    assert_equal "<p>C\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_TIDYLINK_rdoc_label
-    result = @to.convert '{foo}[rdoc-label:foottext-1]'
-
-    assert_equal "<p>foo\n", result
-    assert_equal 3, @to.characters
-  end
-
-  def test_handle_regexp_HYPERLINK_link
-    target = RDoc::Markup::RegexpHandling.new 0, 'link:README.txt'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal 'README.txt', link
-  end
-
-  def test_list_verbatim_2
-    str = "* one\n    verb1\n    verb2\n* two\n"
-
-    expected = <<-EXPECTED
-<p>one
-
-<pre class=\"ruby\"><span class=\"ruby-identifier\">verb1</span>
-<span class=\"ruby-identifier\">verb2</span>
-</pre>
-<p>two
-
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to)
-    assert_equal 17, @to.characters
-  end
-
-  def test_on_tags
-    on = RDoc::Markup::AttrChanger.new 2, 0
-
-    @to.on_tags [], on
-
-    assert_equal 2, @to.mask
-  end
-
-  def test_off_tags
-    on  = RDoc::Markup::AttrChanger.new 2, 0
-    off = RDoc::Markup::AttrChanger.new 0, 2
-
-    @to.on_tags  [], on
-    @to.off_tags [], off
-
-    assert_equal 0, @to.mask
-  end
-
-  def test_to_html
-    assert_equal "<p><code>--</code>\n", util_format("<tt>--</tt>")
-    assert_equal 2, @to.characters
-  end
-
-  def util_format(text)
-    paragraph = RDoc::Markup::Paragraph.new text
-
-    @to.start_accepting
-    @to.accept_paragraph paragraph
-    @to.end_accepting
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_html_test.rb b/test/mri/rdoc/rdoc_markup_to_html_test.rb
deleted file mode 100644
index e586e03cb9a..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_html_test.rb
+++ /dev/null
@@ -1,1024 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToHtmlTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToHtml.new @options
-  end
-
-  def accept_blank_line
-    assert_empty @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\n<blockquote>\n<p>quote</p>\n</blockquote>\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "\n<p>hello</p>\n", @to.res.join
-  end
-
-  def accept_heading
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-    expected = "\n<h5 id=\"label-Hello\">Hello#{links}</h5>\n"
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_heading_1
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", @to.res.join
-  end
-
-  def accept_heading_2
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h2 id=\"label-Hello\">Hello#{links}</h2>\n", @to.res.join
-  end
-
-  def accept_heading_3
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h3 id=\"label-Hello\">Hello#{links}</h3>\n", @to.res.join
-  end
-
-  def accept_heading_4
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h4 id=\"label-Hello\">Hello#{links}</h4>\n", @to.res.join
-  end
-
-  def accept_heading_b
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-    inner = "<strong>Hello</strong>"
-
-    assert_equal "\n<h1 id=\"label-Hello\">#{inner}#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def accept_heading_suppressed_crossref
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ul></ul>\n", @to.res.join
-  end
-
-  def accept_list_end_label
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list label-list\"></dl>\n", @to.res.join
-  end
-
-  def accept_list_end_lalpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: lower-alpha\"></ol>\n", @to.res.join
-  end
-
-  def accept_list_end_number
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol></ol>\n", @to.res.join
-  end
-
-  def accept_list_end_note
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list note-list\"></dl>\n", @to.res.join
-  end
-
-  def accept_list_end_ualpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: upper-alpha\"></ol>\n", @to.res.join
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_label
-    assert_equal %w[</dd>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_note
-    assert_equal %w[</dd>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_number
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal "<ul><li>", @to.res.join
-  end
-
-  def accept_list_item_start_label
-    assert_equal "<dl class=\"rdoc-list label-list\"><dt>cat</dt>\n<dd>", @to.res.join
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal "<ol style=\"list-style-type: lower-alpha\"><li>", @to.res.join
-  end
-
-  def accept_list_item_start_note
-    assert_equal "<dl class=\"rdoc-list note-list\"><dt>cat</dt>\n<dd>",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_2
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt><code>teletype</code></dt>
-<dd>
-<p>teletype description</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt>label</dt>
-<dd>
-<p>description one</p>
-</dd><dd>
-<p>description two</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt>one</dt>
-<dt>two</dt>
-<dd>
-<p>two headers</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_number
-    assert_equal "<ol><li>", @to.res.join
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal "<ol style=\"list-style-type: upper-alpha\"><li>", @to.res.join
-  end
-
-  def accept_list_start_bullet
-    assert_equal [:BULLET], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ul>", @to.res.join
-  end
-
-  def accept_list_start_label
-    assert_equal [:LABEL], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal '<dl class="rdoc-list label-list">', @to.res.join
-  end
-
-  def accept_list_start_lalpha
-    assert_equal [:LALPHA], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: lower-alpha\">", @to.res.join
-  end
-
-  def accept_list_start_note
-    assert_equal [:NOTE], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list note-list\">", @to.res.join
-  end
-
-  def accept_list_start_number
-    assert_equal [:NUMBER], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol>", @to.res.join
-  end
-
-  def accept_list_start_ualpha
-    assert_equal [:UALPHA], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: upper-alpha\">", @to.res.join
-  end
-
-  def accept_paragraph
-    assert_equal "\n<p>hi</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "\n<p>reg <strong>bold words</strong> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_br
-    assert_equal "\n<p>one<br>two</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_break
-    assert_equal "\n<p>hello<br> world</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_i
-    assert_equal "\n<p>reg <em>italic words</em> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_plus
-    assert_equal "\n<p>reg <code>teletype</code> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_star
-    assert_equal "\n<p>reg <strong>bold</strong> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "\n<p>reg <em>italic</em> reg</p>\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "<hr>\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "\n<pre class=\"ruby\"><span class=\"ruby-identifier\">hi</span>\n  <span class=\"ruby-identifier\">world</span>\n</pre>\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal 'hi', @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal [], @to.res
-    assert_equal [], @to.in_list_entry
-    assert_equal [], @to.list
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-<ul><li>
-<p>l1</p>
-<ul><li>
-<p>l1.1</p>
-</li></ul>
-</li><li>
-<p>l2</p>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED
-<ul><li>
-<p>list stuff</p>
-
-<pre>* list
-  with
-
-  second
-
-  1. indented
-  2. numbered
-
-  third
-
-* second</pre>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def test_accept_heading_7
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(7, 'Hello')
-
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h6 id=\"label-Hello\">Hello#{links}</h6>\n", @to.res.join
-  end
-
-  def test_accept_heading_aref_class
-    @to.code_object = RDoc::NormalClass.new 'Foo'
-    @to.start_accepting
-
-    @to.accept_heading head(1, 'Hello')
-
-    links = '<span><a href="#class-Foo-label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"class-Foo-label-Hello\">Hello#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def test_accept_heading_aref_method
-    @to.code_object = RDoc::AnyMethod.new nil, 'foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    links = '<span><a href="#method-i-foo-label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"method-i-foo-label-Hello\">Hello#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def test_accept_heading_pipe
-    @options.pipe = true
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello</h1>\n", @to.res.join
-  end
-
-  def test_accept_paragraph_newline
-    hellos = ["hello", "\u{393 3b5 3b9 3ac} \u{3c3 3bf 3c5}"]
-    worlds = ["world", "\u{3ba 3cc 3c3 3bc 3bf 3c2}"]
-    ohayo, sekai = %W"\u{304a 306f 3088 3046} \u{4e16 754c}"
-
-    hellos.product(worlds) do |hello, world|
-      @to.start_accepting
-      @to.accept_paragraph para("#{hello}\n", "#{world}\n")
-      assert_equal "\n<p>#{hello} #{world}</p>\n", @to.res.join
-    end
-
-    hellos.each do |hello|
-      @to.start_accepting
-      @to.accept_paragraph para("#{hello}\n", "#{sekai}\n")
-      assert_equal "\n<p>#{hello}#{sekai}</p>\n", @to.res.join
-    end
-
-    worlds.each do |world|
-      @to.start_accepting
-      @to.accept_paragraph para("#{ohayo}\n", "#{world}\n")
-      assert_equal "\n<p>#{ohayo}#{world}</p>\n", @to.res.join
-    end
-
-    @to.start_accepting
-    @to.accept_paragraph para("#{ohayo}\n", "#{sekai}\n")
-    assert_equal "\n<p>#{ohayo}#{sekai}</p>\n", @to.res.join
-
-    @to.start_accepting
-    @to.accept_paragraph para("+hello+\n", "world\n")
-    assert_equal "\n<p><code>hello</code> world</p>\n", @to.res.join
-
-    @to.start_accepting
-    @to.accept_paragraph para("hello\n", "+world+\n")
-    assert_equal "\n<p>hello <code>world</code></p>\n", @to.res.join
-
-    @to.start_accepting
-    @to.accept_paragraph para("+hello+\n", "+world+\n")
-    assert_equal "\n<p><code>hello</code> <code>world</code></p>\n", @to.res.join
-  end
-
-  def test_accept_heading_output_decoration
-    @options.output_decoration = false
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1>Hello<span><a href=\"#label-Hello\">&para;</a> <a href=\"#top\">&uarr;</a></span></h1>\n", @to.res.join
-  end
-
-  def test_accept_heading_output_decoration_with_pipe
-    @options.pipe = true
-    @options.output_decoration = false
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1>Hello</h1>\n", @to.res.join
-  end
-
-  def test_accept_verbatim_parseable
-    verb = @RM::Verbatim.new("class C\n", "end\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-keyword">class</span> <span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_parseable_error
-    verb = @RM::Verbatim.new("a % 09 # => blah\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    inner = CGI.escapeHTML "a % 09 # => blah"
-
-    expected = <<-EXPECTED
-
-<pre>#{inner}</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_nl_after_backslash
-    verb = @RM::Verbatim.new("a = 1 if first_flag_var and \\\n", "  this_is_flag_var\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-identifier">a</span> = <span class="ruby-value">1</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">first_flag_var</span> <span class="ruby-keyword">and</span> \\
-  <span class="ruby-identifier">this_is_flag_var</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_pipe
-    @options.pipe = true
-
-    verb = @RM::Verbatim.new("1 + 1\n")
-    verb.format = :ruby
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre><code>1 + 1
-</code></pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_escape_in_string
-    code = <<-'RUBY'
-def foo
-  [
-    '\\',
-    '\'',
-    "'",
-    "\'\"\`",
-    "\#",
-    "\#{}",
-    "#",
-    "#{}",
-    /'"/,
-    /\'\"/,
-    /\//,
-    /\\/,
-    /\#/,
-    /\#{}/,
-    /#/,
-    /#{}/
-  ]
-end
-def bar
-end
-    RUBY
-    verb = @RM::Verbatim.new(*code.split(/(?<=\n)/))
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-'EXPECTED'
-
-<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">foo</span>
-  [
-    <span class="ruby-string">&#39;\\&#39;</span>,
-    <span class="ruby-string">&#39;\&#39;&#39;</span>,
-    <span class="ruby-string">&quot;&#39;&quot;</span>,
-    <span class="ruby-string">&quot;\&#39;\&quot;\`&quot;</span>,
-    <span class="ruby-string">&quot;\#&quot;</span>,
-    <span class="ruby-string">&quot;\#{}&quot;</span>,
-    <span class="ruby-string">&quot;#&quot;</span>,
-    <span class="ruby-node">&quot;#{}&quot;</span>,
-    <span class="ruby-regexp">/&#39;&quot;/</span>,
-    <span class="ruby-regexp">/\&#39;\&quot;/</span>,
-    <span class="ruby-regexp">/\//</span>,
-    <span class="ruby-regexp">/\\/</span>,
-    <span class="ruby-regexp">/\#/</span>,
-    <span class="ruby-regexp">/\#{}/</span>,
-    <span class="ruby-regexp">/#/</span>,
-    <span class="ruby-regexp">/#{}/</span>
-  ]
-<span class="ruby-keyword">end</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">bar</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_escape_in_backtick
-    code = <<-'RUBY'
-def foo
-  [
-    `\\`,
-    `\'\"\``,
-    `\#`,
-    `\#{}`,
-    `#`,
-    `#{}`
-  ]
-end
-def bar
-end
-    RUBY
-    verb = @RM::Verbatim.new(*code.split(/(?<=\n)/))
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-'EXPECTED'
-
-<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">foo</span>
-  [
-    <span class="ruby-string">`\\`</span>,
-    <span class="ruby-string">`\&#39;\&quot;\``</span>,
-    <span class="ruby-string">`\#`</span>,
-    <span class="ruby-string">`\#{}`</span>,
-    <span class="ruby-string">`#`</span>,
-    <span class="ruby-node">`#{}`</span>
-  ]
-<span class="ruby-keyword">end</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">bar</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_ruby
-    verb = @RM::Verbatim.new("1 + 1\n")
-    verb.format = :ruby
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-value">1</span> <span class="ruby-operator">+</span> <span class="ruby-value">1</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_redefinable_operators
-    functions = %w[| ^ & <=> == === =~ > >= < <= << >> + - * / % ** ~ +@ -@ [] []= ` !  != !~].flat_map { |redefinable_op|
-      ["def #{redefinable_op}\n", "end\n"]
-    }
-
-    verb = @RM::Verbatim.new(*functions)
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby">
-    EXPECTED
-    expected = expected.rstrip
-
-    %w[| ^ &amp; &lt;=&gt; == === =~ &gt; &gt;= &lt; &lt;= &lt;&lt; &gt;&gt; + - * / % ** ~ +@ -@ [] []= ` !  != !~].each do |html_escaped_op|
-      expected += <<-EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">#{html_escaped_op}</span>
-<span class="ruby-keyword">end</span>
-      EXPECTED
-    end
-
-    expected += <<-EXPECTED
-</pre>
-EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_convert_string
-    assert_equal '&lt;&gt;', @to.convert_string('<>')
-  end
-
-  def test_convert_HYPERLINK_irc
-    result = @to.convert 'irc://irc.freenode.net/#ruby-lang'
-
-    assert_equal "\n<p><a href=\"irc://irc.freenode.net/#ruby-lang\">irc.freenode.net/#ruby-lang</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_label
-    result = @to.convert 'rdoc-label:label-One'
-
-    assert_equal "\n<p><a href=\"#label-One\">One</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_foottext
-    result = @to.convert 'rdoc-label:foottext-1'
-
-    assert_equal "\n<p><a href=\"#foottext-1\">1</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_footmark
-    result = @to.convert 'rdoc-label:footmark-1'
-
-    assert_equal "\n<p><a href=\"#footmark-1\">1</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_ref
-    result = @to.convert 'rdoc-ref:C'
-
-    assert_equal "\n<p>C</p>\n", result
-  end
-
-  def test_convert_RDOCLINK_escape_image
-    assert_escaped '<script>', 'rdoc-image:"><script>alert(`rdoc-image`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_label_id
-    assert_escaped '<script>', 'rdoc-label::path::"><script>alert(`rdoc-label_id`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_label_path
-    assert_escaped '<script>', 'rdoc-label::"><script>alert(`rdoc-label_path`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_ref
-    assert_escaped '<script>', 'rdoc-ref:"><script>alert(`rdoc-ref`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_xxx
-    assert_escaped '<script>', 'rdoc-xxx:"><script>alert(`rdoc-xxx`)</script>"'
-  end
-
-  def test_convert_TIDYLINK_footnote
-    result = @to.convert 'text{*1}[rdoc-label:foottext-1:footmark-1]'
-
-    assert_equal "\n<p>text<sup><a id=\"footmark-1\" href=\"#foottext-1\">1</a></sup></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_multiple
-    result = @to.convert '{a}[http://example] {b}[http://example]'
-
-    expected = <<-EXPECTED
-
-<p><a href=\"http://example\">a</a> <a href=\"http://example\">b</a></p>
-    EXPECTED
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_image
-    result =
-      @to.convert '{rdoc-image:path/to/image.jpg}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"path/to/image.jpg\"></a></p>\n"
-
-    assert_equal expected, result
-
-    result =
-      @to.convert '{rdoc-image:<script>alert`link text`</script>}[http://example.com]'
-
-    assert_not_include result, "<script>"
-  end
-
-  def test_convert_TIDYLINK_image_with_alt
-    result =
-      @to.convert '{rdoc-image:path/to/image.jpg:alt text}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"path/to/image.jpg\" alt=\"alt text\"></a></p>\n"
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_image_external
-    result =
-      @to.convert '{rdoc-image:http://example.com/path/to/image.jpg}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"http://example.com/path/to/image.jpg\"></a></p>\n"
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_image_external_with_alt
-    result =
-      @to.convert '{rdoc-image:http://example.com/path/to/image.jpg:alt text}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"http://example.com/path/to/image.jpg\" alt=\"alt text\"></a></p>\n"
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_rdoc_label
-    result = @to.convert '{foo}[rdoc-label:foottext-1]'
-
-    assert_equal "\n<p><a href=\"#foottext-1\">foo</a></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_irc
-    result = @to.convert '{ruby-lang}[irc://irc.freenode.net/#ruby-lang]'
-
-    assert_equal "\n<p><a href=\"irc://irc.freenode.net/#ruby-lang\">ruby-lang</a></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_escape_text
-    assert_escaped '<script>', '{<script>alert`link text`</script>}[a]'
-    assert_escaped '<script>', 'x:/<script>alert(1);</script>[[]'
-  end
-
-  def test_convert_TIDYLINK_escape_javascript
-    assert_not_include '{click}[javascript:alert`javascript_scheme`]', '<a href="javascript:'
-  end
-
-  def test_convert_TIDYLINK_escape_onmouseover
-    assert_escaped '"/onmouseover="', '{onmouseover}[http://"/onmouseover="alert`on_mouse_link`"]'
-  end
-
-  def test_convert_TIDYLINK_escape_onerror
-    assert_escaped '"onerror="', '{link_image}[http://"onerror="alert`link_image`".png]'
-  end
-
-  def test_convert_with_exclude_tag
-    assert_equal "\n<p><code>aaa</code>[:symbol]</p>\n", @to.convert('+aaa+[:symbol]')
-    assert_equal "\n<p><code>aaa[:symbol]</code></p>\n", @to.convert('+aaa[:symbol]+')
-    assert_equal "\n<p><code>https:</code>-foobar</p>\n", @to.convert('<tt>https:</tt>-foobar')
-    assert_equal "\n<p><a href=\":symbol\">aaa</a></p>\n", @to.convert('aaa[:symbol]')
-  end
-
-  def test_convert_underscore_adjacent_to_code
-    assert_equal "\n<p><code>aaa</code>_</p>\n", @to.convert(%q{+aaa+_})
-    assert_equal "\n<p>\u{2018}<code>i386-mswin32_</code><em>MSRTVERSION</em>\u{2019}</p>\n", @to.convert(%q{`+i386-mswin32_+_MSRTVERSION_'})
-  end
-
-  def test_gen_url
-    assert_equal '<a href="example">example</a>',
-                 @to.gen_url('link:example', 'example')
-  end
-
-  def test_gen_url_rdoc_label
-    assert_equal '<a href="#foottext-1">example</a>',
-                 @to.gen_url('rdoc-label:foottext-1', 'example')
-  end
-
-  def test_gen_url_rdoc_label_id
-    assert_equal '<sup><a id="footmark-1" href="#foottext-1">example</a></sup>',
-                 @to.gen_url('rdoc-label:foottext-1:footmark-1', 'example')
-  end
-
-  def test_gen_url_image_url
-    assert_equal '<img src="http://example.com/image.png" />', @to.gen_url('http://example.com/image.png', 'ignored')
-  end
-
-  def test_gen_url_ssl_image_url
-    assert_equal '<img src="https://example.com/image.png" />', @to.gen_url('https://example.com/image.png', 'ignored')
-  end
-
-  def test_gen_url_rdoc_file
-    assert_equal '<a href="example_rdoc.html">example</a>',
-                 @to.gen_url('example.rdoc', 'example')
-    assert_equal '<a href="doc/example_rdoc.html">example</a>',
-                 @to.gen_url('doc/example.rdoc', 'example')
-    assert_equal '<a href="../ex.doc/example_rdoc.html">example</a>',
-                 @to.gen_url('../ex.doc/example.rdoc', 'example')
-    assert_equal '<a href="doc/example_rdoc.html#label-one">example</a>',
-                 @to.gen_url('doc/example.rdoc#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_rdoc.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.rdoc#label-two', 'example')
-  end
-
-  def test_gen_url_md_file
-    assert_equal '<a href="example_md.html">example</a>',
-                 @to.gen_url('example.md', 'example')
-    assert_equal '<a href="doc/example_md.html">example</a>',
-                 @to.gen_url('doc/example.md', 'example')
-    assert_equal '<a href="../ex.doc/example_md.html">example</a>',
-                 @to.gen_url('../ex.doc/example.md', 'example')
-    assert_equal '<a href="doc/example_md.html#label-one">example</a>',
-                 @to.gen_url('doc/example.md#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_md.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.md#label-two', 'example')
-  end
-
-  def test_gen_url_rb_file
-    assert_equal '<a href="example_rb.html">example</a>',
-                 @to.gen_url('example.rb', 'example')
-    assert_equal '<a href="doc/example_rb.html">example</a>',
-                 @to.gen_url('doc/example.rb', 'example')
-    assert_equal '<a href="../ex.doc/example_rb.html">example</a>',
-                 @to.gen_url('../ex.doc/example.rb', 'example')
-    assert_equal '<a href="doc/example_rb.html#label-one">example</a>',
-                 @to.gen_url('doc/example.rb#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_rb.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.rb#label-two', 'example')
-  end
-
-  def test_handle_regexp_HYPERLINK_link
-    target = RDoc::Markup::RegexpHandling.new 0, 'link:README.txt'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal '<a href="README.txt">README.txt</a>', link
-  end
-
-  def test_handle_regexp_HYPERLINK_irc
-    target = RDoc::Markup::RegexpHandling.new 0, 'irc://irc.freenode.net/#ruby-lang'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal '<a href="irc://irc.freenode.net/#ruby-lang">irc.freenode.net/#ruby-lang</a>', link
-  end
-
-  def test_handle_regexp_HYPERLINK_escape
-    code = 'irc://irc.freenode.net/"><script>alert(`irc`)</script><a"'
-    assert_escaped '<script>', code
-  end
-
-  def test_list_verbatim_2
-    str = "* one\n    verb1\n    verb2\n* two\n"
-
-    expected = <<-EXPECTED
-<ul><li>
-<p>one</p>
-
-<pre class=\"ruby\"><span class=\"ruby-identifier\">verb1</span>
-<span class=\"ruby-identifier\">verb2</span>
-</pre>
-</li><li>
-<p>two</p>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to)
-  end
-
-  def test_block_quote_in_verbatim
-    str = "BlockQuote\n  >>>\n"
-
-    expected = <<-EXPECTED
-<p>BlockQuote</p>
-<pre>&gt;&gt;&gt;</pre>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to).gsub(/^\n/, "")
-
-    str = "BlockQuote\n  >>>  word\n"
-
-    expected = <<-EXPECTED
-<p>BlockQuote</p>
-<pre>&gt;&gt;&gt;  word</pre>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to).gsub(/^\n/, "")
-  end
-
-  def test_parseable_eh
-    valid_syntax = [
-      'def x() end',
-      'def x; end',
-      'class C; end',
-      "module M end",
-      'a # => blah',
-      'x { |y| nil }',
-      'x do |y| nil end',
-      '# only a comment',
-      'require "foo"',
-      'cls="foo"'
-    ]
-    invalid_syntax = [
-      'def x end',
-      'class C < end',
-      'module M < C end',
-      'a=># blah',
-      'x { |y| ... }',
-      'x do |y| ... end',
-      '// only a comment',
-      '<% require "foo" %>',
-      'class="foo"'
-    ]
-    valid_syntax.each do |t|
-      assert @to.parseable?(t), "valid syntax considered invalid: #{t}"
-    end
-    invalid_syntax.each do |t|
-      refute @to.parseable?(t), "invalid syntax considered valid: #{t}"
-    end
-  end
-
-  def test_to_html
-    assert_equal "\n<p><code>--</code></p>\n", util_format("<tt>--</tt>")
-  end
-
-  def util_format(text)
-    paragraph = RDoc::Markup::Paragraph.new text
-
-    @to.start_accepting
-    @to.accept_paragraph paragraph
-    @to.end_accepting
-  end
-
-  def test_accept_table
-    header = %w[Col1 Col2 Col3 Col4]
-    body = [
-      %w[cell1_1 cell1_2 cell1_3 cell1_4],
-      %w[cell2_1 cell2_2 cell2_3 cell2_4],
-      ['<script>alert("foo");</script>'],
-      %w[+code+ _em_ **strong** C1],
-    ]
-    aligns = [:left, :right, nil, :center]
-    @to.start_accepting
-    @to.accept_table(header, body, aligns)
-    res = @to.end_accepting
-    assert_include(res[%r<<th[^<>]*>Col1</th>>], 'align="left"')
-    assert_include(res[%r<<th[^<>]*>Col2</th>>], 'align="right"')
-    assert_not_include(res[%r<<th[^<>]*>Col3</th>>], 'align=')
-    assert_include(res[%r<<th[^<>]*>Col4</th>>], 'align="center"')
-    assert_include(res[%r<<td[^<>]*>cell1_1</td>>], 'align="left"')
-    assert_include(res[%r<<td[^<>]*>cell1_2</td>>], 'align="right"')
-    assert_not_include(res[%r<<td[^<>]*>cell1_3</td>>], 'align=')
-    assert_include(res[%r<<td[^<>]*>cell2_1</td>>], 'align="left"')
-    assert_include(res[%r<<td[^<>]*>cell2_2</td>>], 'align="right"')
-    assert_not_include(res[%r<<td[^<>]*>cell2_3</td>>], 'align=')
-    assert_include(res[%r<<td[^<>]*>cell2_4</td>>], 'align="center"')
-    assert_not_include(res, '<script>')
-    assert_include(res[%r<<td[^<>]*>.*script.*</td>>], '&lt;script&gt;')
-    assert_include(res[%r<<td[^<>]*>.*code.*</td>>], '<code>code</code>')
-    assert_include(res[%r<<td[^<>]*>.*em.*</td>>], '<em>em</em>')
-    assert_include(res[%r<<td[^<>]*>.*strong.*</td>>], '<strong>strong</strong>')
-    assert_include(res[%r<<td[^<>]*>C1</td>>], 'C1')
-  end
-
-  def assert_escaped(unexpected, code)
-    result = @to.convert(code)
-    assert_not_include result, unexpected
-    assert_include result, CGI.escapeHTML(unexpected)
-  end
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_joined_paragraph_test.rb b/test/mri/rdoc/rdoc_markup_to_joined_paragraph_test.rb
deleted file mode 100644
index 89e9736e8ac..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_joined_paragraph_test.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToJoinedParagraphTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToJoinedParagraph.new
-  end
-
-  def test_accept_paragraph
-    parsed = para('hello', ' ', 'world')
-
-    @to.accept_paragraph parsed
-
-    expected = para('hello world')
-
-    assert_equal expected, parsed
-  end
-
-  def test_accept_paragraph_break
-    parsed = para('hello', ' ', 'world', hard_break, 'everyone')
-
-    @to.accept_paragraph parsed
-
-    expected = para('hello world', hard_break, 'everyone')
-
-    assert_equal expected, parsed
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_label_test.rb b/test/mri/rdoc/rdoc_markup_to_label_test.rb
deleted file mode 100644
index a56480de84e..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_label_test.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToLabelTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToLabel.new
-  end
-
-  def empty
-    assert_empty @to.res
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.res
-  end
-
-  alias accept_blank_line                             empty
-  alias accept_block_quote                            empty
-  alias accept_document                               empty
-  alias accept_heading                                empty
-  alias accept_heading_1                              empty
-  alias accept_heading_2                              empty
-  alias accept_heading_3                              empty
-  alias accept_heading_4                              empty
-  alias accept_heading_b                              empty
-  alias accept_heading_suppressed_crossref            empty
-  alias accept_list_end_bullet                        empty
-  alias accept_list_end_label                         empty
-  alias accept_list_end_lalpha                        empty
-  alias accept_list_end_note                          empty
-  alias accept_list_end_number                        empty
-  alias accept_list_end_ualpha                        empty
-  alias accept_list_item_end_bullet                   empty
-  alias accept_list_item_end_label                    empty
-  alias accept_list_item_end_lalpha                   empty
-  alias accept_list_item_end_note                     empty
-  alias accept_list_item_end_number                   empty
-  alias accept_list_item_end_ualpha                   empty
-  alias accept_list_item_start_bullet                 empty
-  alias accept_list_item_start_label                  empty
-  alias accept_list_item_start_lalpha                 empty
-  alias accept_list_item_start_note                   empty
-  alias accept_list_item_start_note_2                 empty
-  alias accept_list_item_start_note_multi_description empty
-  alias accept_list_item_start_note_multi_label       empty
-  alias accept_list_item_start_number                 empty
-  alias accept_list_item_start_ualpha                 empty
-  alias accept_list_start_bullet                      empty
-  alias accept_list_start_label                       empty
-  alias accept_list_start_lalpha                      empty
-  alias accept_list_start_note                        empty
-  alias accept_list_start_number                      empty
-  alias accept_list_start_ualpha                      empty
-  alias accept_paragraph                              empty
-  alias accept_paragraph_b                            empty
-  alias accept_paragraph_br                           empty
-  alias accept_paragraph_break                        empty
-  alias accept_paragraph_i                            empty
-  alias accept_paragraph_plus                         empty
-  alias accept_paragraph_star                         empty
-  alias accept_paragraph_underscore                   empty
-  alias accept_raw                                    empty
-  alias accept_rule                                   empty
-  alias accept_verbatim                               empty
-  alias list_nested                                   empty
-  alias list_verbatim                                 empty
-  alias start_accepting                               empty
-
-  def test_convert_bold
-    assert_equal 'bold', @to.convert('<b>bold</b>')
-    assert_equal 'bold', @to.convert('*bold*')
-  end
-
-  def test_convert_crossref
-    assert_equal 'SomeClass', @to.convert('SomeClass')
-    assert_equal 'SomeClass', @to.convert('\\SomeClass')
-
-    assert_equal 'some_method', @to.convert('some_method')
-    assert_equal 'some_method', @to.convert('\\some_method')
-
-    assert_equal '23some_method', @to.convert('#some_method')
-    assert_equal '23some_method', @to.convert('\\#some_method')
-  end
-
-  def test_convert_em
-    assert_equal 'em', @to.convert('<em>em</em>')
-    assert_equal 'em', @to.convert('*em*')
-  end
-
-  def test_convert_em_dash # for HTML conversion
-    assert_equal '-', @to.convert('--')
-  end
-
-  def test_convert_escape
-    assert_equal 'a+-3E+b', @to.convert('a > b')
-  end
-
-  def test_convert_tidylink
-    assert_equal 'text', @to.convert('{text}[stuff]')
-    assert_equal 'text', @to.convert('text[stuff]')
-  end
-
-  def test_convert_tt
-    assert_equal 'tt', @to.convert('<tt>tt</tt>')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_markdown_test.rb b/test/mri/rdoc/rdoc_markup_to_markdown_test.rb
deleted file mode 100644
index 86fe5ce82bc..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_markdown_test.rb
+++ /dev/null
@@ -1,397 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToMarkdownTest < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToMarkdown.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "##### Hello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "cat\n:   \n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat\n:   \n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [""], @to.res
-    assert_equal '*   ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [""], @to.res
-    assert_equal "cat\n:   ", @to.prefix
-
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [""], @to.res
-    assert_equal "cat\n:   ", @to.prefix
-
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [4],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal [1],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [4],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal [1],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "---\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "    hi\n      world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [""], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "# Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "## Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "### Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "#### Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   # Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "# **Hello**\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "# Hello\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "`teletype`\n:   teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label\n:   description one\n\n:   description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one\ntwo\n:   two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg **bold words** reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one  \ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello  \nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg *italic words* reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg `teletype` reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg **bold** reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg *italic* reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   ---\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "      hi\n       world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "      hi\n      world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-*   l1
-    *   l1.1
-*   l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-*   list stuff
-
-        * list
-          with
-
-          second
-
-          1. indented
-          2. numbered
-
-          third
-
-        * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_table_align
-    expected = <<-EXPECTED
- AA |BB |CCCCC|DDDDD
-----|---|-----|-----
-    |bbb|    c|
-aaaa|b  |     | dd
- a  |   |   cc| dd
-    EXPECTED
-    assert_equal expected, @to.end_accepting
-  end
-
-  def test_convert_RDOCLINK
-    result = @to.convert 'rdoc-garbage:C'
-
-    assert_equal "C\n", result
-  end
-
-  def test_convert_RDOCLINK_image
-    result = @to.convert 'rdoc-image:/path/to/image.jpg'
-
-    assert_equal "![](/path/to/image.jpg)\n", result
-  end
-
-  def test_convert_TIDYLINK
-    result = @to.convert \
-      '{DSL}[https://en.wikipedia.org/wiki/Domain-specific_language]'
-
-    expected = "[DSL](https://en.wikipedia.org/wiki/Domain-specific_language)\n"
-
-    assert_equal expected, result
-  end
-
-  def test_handle_rdoc_link_label_footmark
-    assert_equal '[^1]:', @to.handle_rdoc_link('rdoc-label:footmark-1:x')
-  end
-
-  def test_handle_rdoc_link_label_foottext
-    assert_equal '[^1]',   @to.handle_rdoc_link('rdoc-label:foottext-1:x')
-  end
-
-  def test_handle_rdoc_link_label_label
-    assert_equal '[x](#label-x)', @to.handle_rdoc_link('rdoc-label:label-x')
-  end
-
-  def test_handle_rdoc_link_ref
-    assert_equal 'x', @to.handle_rdoc_link('rdoc-ref:x')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_rdoc_test.rb b/test/mri/rdoc/rdoc_markup_to_rdoc_test.rb
deleted file mode 100644
index c7d6120c0db..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_rdoc_test.rb
+++ /dev/null
@@ -1,388 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToRDocTest < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToRdoc.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "===== Hello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "[cat]\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat::\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [""], @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [""], @to.res
-    assert_equal "[cat]\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [""], @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [""], @to.res
-    assert_equal "cat::\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [""], @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [""], @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [""], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "= Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "=== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "==== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   = Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "= <b>Hello</b>\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "= Hello\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "<tt>teletype</tt>::\n  teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label::\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one::\ntwo::\n  two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg <b>bold words</b> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello\nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg <em>italic words</em> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg <tt>teletype</tt> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg <b>bold</b> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg <em>italic</em> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_table_align
-    expected = <<-EXPECTED
- AA |BB |CCCCC|DDDDD
-----|---|-----|-----
-    |bbb|    c|
-aaaa|b  |     | dd
- a  |   |   cc| dd
-    EXPECTED
-    assert_equal expected, @to.end_accepting
-  end
-
-  # functional test
-  def test_convert_list_note
-    note_list = <<-NOTE_LIST
-foo ::
-bar ::
-  hi
-    NOTE_LIST
-
-    expected = <<-EXPECTED
-foo::
-bar::
-  hi
-
-    EXPECTED
-
-    assert_equal expected, @to.convert(note_list)
-  end
-
-  def test_accept_indented_paragraph
-    ip = RDoc::Markup::IndentedParagraph.new 2, 'cats are cool'
-
-    @to.start_accepting
-
-    @to.accept_indented_paragraph ip
-
-    assert_equal "  cats are cool\n", @to.end_accepting
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_table_of_contents_test.rb b/test/mri/rdoc/rdoc_markup_to_table_of_contents_test.rb
deleted file mode 100644
index 3fb6fdeb427..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_table_of_contents_test.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToTableOfContentsTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToTableOfContents.new
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.res
-  end
-
-  def empty
-    assert_empty @to.res
-  end
-
-  def accept_heading
-    assert_equal [@RM::Heading.new(5, 'Hello')], @to.res
-  end
-
-  def accept_heading_1
-    assert_equal [@RM::Heading.new(1, 'Hello')], @to.res
-  end
-
-  def accept_heading_2
-    assert_equal [@RM::Heading.new(2, 'Hello')], @to.res
-  end
-
-  def accept_heading_3
-    assert_equal [@RM::Heading.new(3, 'Hello')], @to.res
-  end
-
-  def accept_heading_4
-    assert_equal [@RM::Heading.new(4, 'Hello')], @to.res
-  end
-
-  def accept_heading_b
-    assert_equal [@RM::Heading.new(1, '*Hello*')], @to.res
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal [@RM::Heading.new(1, '\\Hello')], @to.res
-  end
-
-  alias accept_blank_line                             empty
-  alias accept_block_quote                            empty
-  alias accept_document                               empty
-  alias accept_list_end_bullet                        empty
-  alias accept_list_end_label                         empty
-  alias accept_list_end_lalpha                        empty
-  alias accept_list_end_note                          empty
-  alias accept_list_end_number                        empty
-  alias accept_list_end_ualpha                        empty
-  alias accept_list_item_end_bullet                   empty
-  alias accept_list_item_end_label                    empty
-  alias accept_list_item_end_lalpha                   empty
-  alias accept_list_item_end_note                     empty
-  alias accept_list_item_end_number                   empty
-  alias accept_list_item_end_ualpha                   empty
-  alias accept_list_item_start_bullet                 empty
-  alias accept_list_item_start_label                  empty
-  alias accept_list_item_start_lalpha                 empty
-  alias accept_list_item_start_note                   empty
-  alias accept_list_item_start_note_2                 empty
-  alias accept_list_item_start_note_multi_description empty
-  alias accept_list_item_start_note_multi_label       empty
-  alias accept_list_item_start_number                 empty
-  alias accept_list_item_start_ualpha                 empty
-  alias accept_list_start_bullet                      empty
-  alias accept_list_start_label                       empty
-  alias accept_list_start_lalpha                      empty
-  alias accept_list_start_note                        empty
-  alias accept_list_start_number                      empty
-  alias accept_list_start_ualpha                      empty
-  alias accept_paragraph                              empty
-  alias accept_paragraph_b                            empty
-  alias accept_paragraph_br                           empty
-  alias accept_paragraph_break                        empty
-  alias accept_paragraph_i                            empty
-  alias accept_paragraph_plus                         empty
-  alias accept_paragraph_star                         empty
-  alias accept_paragraph_underscore                   empty
-  alias accept_raw                                    empty
-  alias accept_rule                                   empty
-  alias accept_verbatim                               empty
-  alias list_nested                                   empty
-  alias list_verbatim                                 empty
-  alias start_accepting                               empty
-
-  def test_accept_document_omit_headings_below
-    document = doc
-    document.omit_headings_below = 2
-
-    @to.accept_document document
-
-    assert_equal 2, @to.omit_headings_below
-  end
-
-  def test_accept_heading_suppressed
-    @to.start_accepting
-    @to.omit_headings_below = 4
-
-    suppressed = head 5, 'Hello'
-
-    @to.accept_heading suppressed
-
-    assert_empty @to.res
-  end
-
-  def test_suppressed_eh
-    @to.omit_headings_below = nil
-
-    refute @to.suppressed? head(1, '')
-
-    @to.omit_headings_below = 1
-
-    refute @to.suppressed? head(1, '')
-    assert @to.suppressed? head(2, '')
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_to_tt_only_test.rb b/test/mri/rdoc/rdoc_markup_to_tt_only_test.rb
deleted file mode 100644
index e5dfc0be963..00000000000
--- a/test/mri/rdoc/rdoc_markup_to_tt_only_test.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupToTtOnlyTest < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToTtOnly.new
-  end
-
-  def accept_blank_line
-    assert_empty @to.end_accepting
-  end
-
-  def accept_block_quote
-    assert_empty @to.end_accepting
-  end
-
-  def accept_document
-    assert_equal [], @to.res
-  end
-
-  def accept_heading
-    assert_empty @to.end_accepting
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_end_label
-    assert_empty @to.res
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_end_note
-    assert_empty @to.res
-  end
-
-  def accept_list_end_number
-    assert_empty @to.res
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_label
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_note
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_number
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_label
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_note
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_number
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_start_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_start_label
-    assert_empty @to.res
-  end
-
-  def accept_list_start_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_start_note
-    assert_empty @to.res
-  end
-
-  def accept_list_start_number
-    assert_empty @to.res
-  end
-
-  def accept_list_start_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_paragraph
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_empty @to.end_accepting
-  end
-
-  def accept_raw
-    assert_empty @to.end_accepting
-  end
-
-  def accept_rule
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim
-    assert_empty @to.end_accepting
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.end_accepting
-  end
-
-  def start_accepting
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_1
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_empty @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal [nil, 'teletype', nil], @to.res
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_empty @to.res
-  end
-
-  def accept_paragraph_b
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal %w[teletype], @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    assert_empty @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_empty @to.end_accepting
-  end
-
-  def list_nested
-    assert_empty @to.end_accepting
-  end
-
-  def list_verbatim
-    assert_empty @to.end_accepting
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_markup_verbatim_test.rb b/test/mri/rdoc/rdoc_markup_verbatim_test.rb
deleted file mode 100644
index 910095c9ab4..00000000000
--- a/test/mri/rdoc/rdoc_markup_verbatim_test.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocMarkupVerbatimTest < RDoc::TestCase
-
-  def test_equals2
-    v1 = verb('1 + 1')
-    v2 = verb('1 + 1')
-    v3 = verb('1 + 2')
-    v4 = verb('1 + 1')
-    v4.format = :ruby
-
-    assert_equal v1, v2
-
-    refute_equal v1, v3
-    refute_equal v1, v4
-  end
-
-  def test_ruby_eh
-    verbatim = RDoc::Markup::Verbatim.new
-
-    refute verbatim.ruby?
-
-    verbatim.format = :ruby
-
-    assert verbatim.ruby?
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_method_attr_test.rb b/test/mri/rdoc/rdoc_method_attr_test.rb
deleted file mode 100644
index 54a2a0d395b..00000000000
--- a/test/mri/rdoc/rdoc_method_attr_test.rb
+++ /dev/null
@@ -1,210 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocMethodAttrTest < XrefTestCase
-
-  def test_initialize_copy
-    refute_same @c1_m.full_name, @c1_m.dup.full_name
-  end
-
-  def test_block_params_equal
-    m = RDoc::MethodAttr.new(nil, 'foo')
-
-    m.block_params = ''
-    assert_equal '', m.block_params
-
-    m.block_params = 'a_var'
-    assert_equal 'a_var', m.block_params
-
-    m.block_params = '()'
-    assert_equal '', m.block_params
-
-    m.block_params = '(a_var, b_var)'
-    assert_equal 'a_var, b_var', m.block_params
-
-    m.block_params = '.to_s + "</#{element.upcase}>"'
-    assert_equal '', m.block_params
-
-    m.block_params = 'i.name'
-    assert_equal 'name', m.block_params
-
-    m.block_params = 'attr.expanded_name, attr.value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = 'expanded_name, attr.value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = 'attr.expanded_name, value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = '(@base_notifier)'
-    assert_equal 'base_notifier', m.block_params
-
-    m.block_params = 'if @signal_status == :IN_LOAD'
-    assert_equal '', m.block_params
-
-    m.block_params = 'e if e.kind_of? Element'
-    assert_equal 'e', m.block_params
-
-    m.block_params = '(e, f) if e.kind_of? Element'
-    assert_equal 'e, f', m.block_params
-
-    m.block_params = 'back_path, back_name'
-    assert_equal 'back_path, back_name', m.block_params
-
-    m.block_params = '(*a[1..-1])'
-    assert_equal '*a', m.block_params
-
-    m.block_params = '@@context[:node] if defined? @@context[:node].namespace'
-    assert_equal 'context', m.block_params
-
-    m.block_params = '(result, klass.const_get(constant_name))'
-    assert_equal 'result, const', m.block_params
-
-    m.block_params = 'name.to_s if (bitmap & bit) != 0'
-    assert_equal 'name', m.block_params
-
-    m.block_params = 'line unless line.deleted'
-    assert_equal 'line', m.block_params
-
-    m.block_params = 'str + rs'
-    assert_equal 'str', m.block_params
-
-    m.block_params = 'f+rs'
-    assert_equal 'f', m.block_params
-
-    m.block_params = '[user, realm, hash[user]]'
-    assert_equal 'user, realm, hash', m.block_params
-
-    m.block_params = 'proc{|rc| rc == "rc" ? irbrc : irbrc+rc| ... }'
-    assert_equal 'proc', m.block_params
-
-    m.block_params = 'lambda { |x| x.to_i }'
-    assert_equal 'lambda', m.block_params
-
-    m.block_params = '$&'
-    assert_equal 'str', m.block_params
-
-    m.block_params = 'Inflections.instance'
-    assert_equal 'instance', m.block_params
-
-    m.block_params = 'self.class::STARTED'
-    assert_equal 'STARTED', m.block_params
-
-    m.block_params = 'Test::Unit::TestCase::STARTED'
-    assert_equal 'STARTED', m.block_params
-
-    m.block_params = 'ActiveSupport::OptionMerger.new(self, options)'
-    assert_equal 'option_merger', m.block_params
-
-    m.block_params = ', msg'
-    assert_equal '', m.block_params
-
-    m.block_params = '[size.to_s(16), term, chunk, term].join'
-    assert_equal '[size, term, chunk, term].join', m.block_params
-
-    m.block_params = 'YPath.new( path )'
-    assert_equal 'y_path', m.block_params
-
-  end
-
-  def test_find_method_or_attribute_recursive
-    inc = RDoc::Include.new 'M1', nil
-    @m1.add_include inc # M1 now includes itself
-
-    assert_nil @m1_m.find_method_or_attribute 'm'
-  end
-
-  def test_full_name
-    assert_equal 'C1#m',  @c1_m.full_name
-    assert_equal 'C1::m', @c1__m.full_name
-  end
-
-  def test_is_alias_for
-    assert_equal @c2_b, @c2_a.is_alias_for
-  end
-
-  def test_search_record
-    @c1_m.comment = 'This is a comment.'
-
-    expected = [
-      'm',
-      'C1#m',
-      'm',
-      'C1',
-      'C1.html#method-i-m',
-      '(foo)',
-      "<p>This is a comment.\n",
-    ]
-
-    assert_equal expected, @c1_m.search_record
-  end
-
-  def test_spaceship_returns_nil_on_inappropriate_types
-    assert_nil @c1_m.<=>(RDoc::CodeObject.new)
-  end
-
-  def test_spaceship_orders_symbols_first
-    # in the desired sort order
-    m_plus       = RDoc::AnyMethod.new nil, '+'
-    m_eqeq       = RDoc::AnyMethod.new nil, '=='
-    m_bracket    = RDoc::AnyMethod.new nil, '[]'
-    m_caret      = RDoc::AnyMethod.new nil, '^'
-    m_bar        = RDoc::AnyMethod.new nil, '|'
-    m_tilde      = RDoc::AnyMethod.new nil, '~'
-    m_Alpha      = RDoc::AnyMethod.new nil, 'Alpha'
-    m_Zero       = RDoc::AnyMethod.new nil, 'Zero'
-    m_alpha      = RDoc::AnyMethod.new nil, 'alpha'
-    m_zero       = RDoc::AnyMethod.new nil, 'zero'
-    m_konnichiwa = RDoc::AnyMethod.new nil, 'こんにちは'
-
-    assert_equal(-1, m_plus <=> m_eqeq)
-    assert_equal(-1, m_eqeq <=> m_bracket)
-    assert_equal(-1, m_bracket <=> m_caret)
-    assert_equal(-1, m_caret <=> m_bar)
-    assert_equal(-1, m_bar <=> m_tilde)
-    assert_equal(-1, m_tilde <=> m_Alpha)
-    assert_equal(-1, m_Alpha <=> m_Zero)
-    assert_equal(-1, m_Zero <=> m_alpha)
-    assert_equal(-1, m_alpha <=> m_zero)
-    assert_equal(-1, m_zero <=> m_konnichiwa)
-  end
-
-  def test_equals2
-    assert_equal @c1_m, @c1_m
-    refute_equal @c1_m, @parent_m
-  end
-
-  def test_pretty_print
-    temp_dir do |tmpdir|
-      s = RDoc::RI::Store.new(RDoc::Options.new, path: tmpdir)
-
-      top_level = s.add_file 'file.rb'
-      meth_bang = RDoc::AnyMethod.new nil, 'method!'
-      meth_bang.record_location top_level
-
-      meth_bang_alias = RDoc::Alias.new nil, 'method!', 'method_bang', ''
-      meth_bang_alias.record_location top_level
-
-      klass = top_level.add_class RDoc::NormalClass, 'Object'
-      klass.add_method meth_bang
-
-      meth_bang.add_alias meth_bang_alias, klass
-
-      s.save
-
-      meth_alias_from_store = s.load_method 'Object', '#method_bang'
-
-      expected = "[RDoc::AnyMethod Object#method_bang public alias for method!]"
-      actual =  mu_pp meth_alias_from_store
-      assert_equal expected, actual
-    end
-  end
-
-  def test_to_s
-    assert_equal 'RDoc::AnyMethod: C1#m',  @c1_m.to_s
-    assert_equal 'RDoc::AnyMethod: C2#b',  @c2_b.to_s
-    assert_equal 'RDoc::AnyMethod: C1::m', @c1__m.to_s
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_normal_class_test.rb b/test/mri/rdoc/rdoc_normal_class_test.rb
deleted file mode 100644
index d61ef5ccd92..00000000000
--- a/test/mri/rdoc/rdoc_normal_class_test.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocNormalClassTest < XrefTestCase
-
-  def test_ancestors
-    klass = @top_level.add_class RDoc::NormalClass, 'Klass'
-    incl = RDoc::Include.new 'Incl', ''
-
-    sub_klass = @top_level.add_class RDoc::NormalClass, 'SubClass'
-    sub_klass.superclass = klass
-    sub_klass.add_include incl
-
-    assert_equal [incl.name, klass, @object, 'BasicObject'], sub_klass.ancestors
-  end
-
-  def test_ancestors_multilevel
-    c1 = @top_level.add_class RDoc::NormalClass, 'Outer'
-    c2 = @top_level.add_class RDoc::NormalClass, 'Middle', c1.full_name
-    c3 = @top_level.add_class RDoc::NormalClass, 'Inner', c2.full_name
-
-    assert_equal [c2, c1, @object, 'BasicObject'], c3.ancestors
-  end
-
-  def test_aref
-    assert_equal 'class-C1',     @c1.aref
-    assert_equal 'class-C2::C3', @c2_c3.aref
-  end
-
-  def test_direct_ancestors
-    incl = RDoc::Include.new 'Incl', ''
-
-    c1 = @top_level.add_class RDoc::NormalClass, 'Outer'
-    c2 = @top_level.add_class RDoc::NormalClass, 'Middle', c1.full_name
-    c3 = @top_level.add_class RDoc::NormalClass, 'Inner', c2.full_name
-    c3.add_include incl
-
-    assert_equal [incl.name, c2], c3.direct_ancestors
-  end
-
-  def test_definition
-    c = RDoc::NormalClass.new 'C'
-
-    assert_equal 'class C', c.definition
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_normal_module_test.rb b/test/mri/rdoc/rdoc_normal_module_test.rb
deleted file mode 100644
index bb0a2afc768..00000000000
--- a/test/mri/rdoc/rdoc_normal_module_test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocNormalModuleTest < XrefTestCase
-
-  def setup
-    super
-
-    @mod = RDoc::NormalModule.new 'Mod'
-  end
-
-  def test_ancestors_module
-    top_level = @store.add_file 'file.rb'
-    mod = top_level.add_module RDoc::NormalModule, 'Mod'
-    incl = RDoc::Include.new 'Incl', ''
-
-    mod.add_include incl
-
-    assert_equal [incl.name], mod.ancestors
-
-    mod2 = top_level.add_module RDoc::NormalModule, 'Inc2'
-    inc2 = RDoc::Include.new 'Inc2', ''
-    mod.add_include inc2
-    assert_equal [mod2, incl.name], mod.ancestors
-  end
-
-  def test_aref
-    assert_equal 'module-M1',     @m1.aref
-    assert_equal 'module-M1::M2', @m1_m2.aref
-  end
-
-  def test_definition
-    m = RDoc::NormalModule.new 'M'
-
-    assert_equal 'module M', m.definition
-  end
-
-  def test_module_eh
-    assert @mod.module?
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_options_test.rb b/test/mri/rdoc/rdoc_options_test.rb
deleted file mode 100644
index 097d0f5523c..00000000000
--- a/test/mri/rdoc/rdoc_options_test.rb
+++ /dev/null
@@ -1,975 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocOptionsTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @generators = RDoc::RDoc::GENERATORS.dup
-  end
-
-  def teardown
-    super
-
-    RDoc::RDoc::GENERATORS.replace @generators
-  end
-
-  def test_check_files
-    omit "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    out, err = capture_output do
-      temp_dir do
-        FileUtils.touch 'unreadable'
-        FileUtils.chmod 0, 'unreadable'
-
-        @options.files = %w[nonexistent unreadable]
-
-        @options.check_files
-      end
-    end
-
-    assert_empty @options.files
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_check_files_warn
-    @options.verbosity = 2
-
-    out, err = verbose_capture_output do
-      @options.files = %w[nonexistent]
-
-      @options.check_files
-    end
-
-    assert_empty out
-    assert_equal "file 'nonexistent' not found\n", err
-    assert_empty @options.files
-  end
-
-  def test_dry_run_default
-    refute @options.dry_run
-  end
-
-  def test_to_yaml
-    RDoc.load_yaml
-
-    coder = YAML.load(@options.to_yaml)
-
-    encoding = 'UTF-8'
-
-    expected = {
-      'charset'               => 'UTF-8',
-      'encoding'              => encoding,
-      'embed_mixins'          => false,
-      'exclude'               => [],
-      'hyperlink_all'         => false,
-      'line_numbers'          => false,
-      'locale_dir'            => 'locale',
-      'locale_name'           => nil,
-      'main_page'             => nil,
-      'markup'                => 'rdoc',
-      'output_decoration'     => true,
-      'page_dir'              => nil,
-      'rdoc_include'          => [],
-      'show_hash'             => false,
-      'static_path'           => [],
-      'tab_width'             => 8,
-      'template_stylesheets'  => [],
-      'title'                 => nil,
-      'visibility'            => :protected,
-      'warn_missing_rdoc_ref' => true,
-      'webcvs'                => nil,
-      'skip_tests'            => true,
-      'apply_default_exclude' => true,
-      'autolink_excluded_words' => [],
-      'class_module_path_prefix' => nil,
-      'file_path_prefix' => nil,
-      'canonical_root' => nil,
-    }
-
-    assert_equal expected, coder
-  end
-
-  def test_to_yaml_trim_paths
-    RDoc.load_yaml
-
-    subdir = nil
-    coder = nil
-
-    temp_dir do |dir|
-      FileUtils.mkdir 'project'
-      FileUtils.mkdir 'dir'
-      FileUtils.touch 'file'
-
-      Dir.chdir 'project' do
-        subdir = File.expand_path 'subdir'
-        FileUtils.mkdir 'subdir'
-        @options.parse %w[
-          --copy subdir
-          --copy ../file
-          --copy ../
-          --copy /
-          --include subdir
-          --include ../dir
-          --include ../
-          --include /
-        ]
-
-        coder = YAML.load(@options.to_yaml)
-      end
-    end
-
-    assert_equal [subdir], coder['rdoc_include']
-
-    assert_equal [subdir], coder['static_path']
-  end
-
-  def test_encoding_default
-    assert_equal Encoding::UTF_8, @options.encoding
-  end
-
-  def test_generator_descriptions
-    # HACK autotest/isolate should take care of this
-    RDoc::RDoc::GENERATORS.clear
-    RDoc::RDoc::GENERATORS['darkfish'] = RDoc::Generator::Darkfish
-    RDoc::RDoc::GENERATORS['ri']       = RDoc::Generator::RI
-
-    expected = <<-EXPECTED.chomp
-  darkfish - HTML generator, written by Michael Granger
-  ri       - creates ri data files
-    EXPECTED
-
-    assert_equal expected, @options.generator_descriptions
-  end
-
-  def test_init_with_encoding
-    RDoc.load_yaml
-
-    @options.encoding = Encoding::IBM437
-
-    options = @options.to_yaml
-    options = YAML.safe_load(options, permitted_classes: [Symbol])
-    options = RDoc::Options.new(options)
-
-    assert_equal Encoding::IBM437, options.encoding
-  end
-
-  def test_init_with_trim_paths
-    RDoc.load_yaml
-
-    yaml = <<-YAML
----
-static_path:
-- /etc
-rdoc_include:
-- /etc
-    YAML
-
-    options = YAML.safe_load(yaml, permitted_classes: [Symbol])
-    options = RDoc::Options.new(options)
-
-    assert_empty options.rdoc_include
-    assert_empty options.static_path
-  end
-
-  def test_parse_copy_files_file_relative
-    file = File.basename __FILE__
-    expected = File.expand_path __FILE__
-
-    Dir.chdir File.expand_path('..', __FILE__) do
-      @options.parse %W[--copy-files #{file}]
-
-      assert_equal [expected], @options.static_path
-    end
-  end
-
-  def test_parse_copy_files_file_absolute
-    @options.parse %W[--copy-files #{File.expand_path __FILE__}]
-
-    assert_equal [File.expand_path(__FILE__)], @options.static_path
-  end
-
-  def test_parse_copy_files_directory_relative
-    @options.parse %w[--copy-files .]
-
-    assert_equal [@pwd], @options.static_path
-  end
-
-  def test_parse_copy_files_directory_absolute
-    @options.parse %w[--copy-files /]
-
-    assert_equal 1, @options.static_path.length
-
-    assert_match %r%^([A-Z]:)?/$%i, @options.static_path.first
-  end
-
-  def test_parse_coverage
-    @options.parse %w[--dcov]
-
-    assert @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_coverage_C
-    @options.parse %w[-C]
-
-    assert @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_coverage_no
-    @options.parse %w[--no-dcov]
-
-    refute @options.coverage_report
-  end
-
-  def test_parse_coverage_level_1
-    @options.parse %w[--dcov=1]
-
-    assert_equal 1, @options.coverage_report
-  end
-
-  def test_parse_coverage_C_level_1
-    @options.parse %w[-C1]
-
-    assert_equal 1, @options.coverage_report
-  end
-
-  def test_parse_coverage_C_level_0
-    @options.parse %w[-C0]
-
-    assert_equal 0, @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_dash_p
-    out, err = capture_output do
-      @options.parse %w[-p]
-    end
-
-    assert @options.pipe
-    refute_match %r%^Usage: %, err
-    refute_match %r%^invalid options%, err
-
-    assert_empty out
-  end
-
-  def test_parse_dash_p_files
-    out, err = capture_output do
-      @options.parse ['-p', File.expand_path(__FILE__)]
-    end
-
-    refute @options.pipe
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: -p .with files.%, err
-
-    assert_empty out
-  end
-
-  def test_parse_default
-    @options.parse []
-    @options.finish
-
-    assert_equal RDoc::Generator::Darkfish,             @options.generator
-    assert_equal 'darkfish',                            @options.template
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_deprecated
-    dep_hash = RDoc::Options::DEPRECATED
-    options = dep_hash.keys.sort
-
-    out, err = capture_output do
-      @options.parse options
-    end
-
-    dep_hash.each_pair do |opt, message|
-      assert_match %r%.*#{opt}.+#{message}%, err
-    end
-
-    assert_empty out
-  end
-
-  def test_parse_dry_run
-    @options.parse %w[--dry-run]
-
-    assert @options.dry_run
-  end
-
-  def test_parse_encoding
-    @options.parse %w[--encoding Big5]
-
-    assert_equal Encoding::Big5, @options.encoding
-    assert_equal 'Big5',         @options.charset
-  end
-
-  def test_parse_encoding_invalid
-    out, err = capture_output do
-      @options.parse %w[--encoding invalid]
-    end
-
-    assert_match %r%^invalid options: --encoding invalid%, err
-
-    assert_empty out
-  end
-
-  def test_parse_formatter
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --format ri]
-    end
-
-    assert_equal 'invalid option: --format generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_force_update
-    @options.parse %w[--force-update]
-
-    assert @options.force_update
-
-    @options.parse %w[--no-force-update]
-
-    assert !@options.force_update
-
-    @options.parse %w[-U]
-
-    assert @options.force_update
-  end
-
-  def test_parse_formatter_ri
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --ri]
-    end
-
-    assert_equal 'invalid option: --ri generator already set to darkfish',
-                 e.message
-
-    @options = RDoc::Options.new
-
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish -r]
-    end
-
-    assert_equal 'invalid option: -r generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_formatter_ri_site
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --ri-site]
-    end
-
-    assert_equal 'invalid option: --ri-site generator already set to darkfish',
-                 e.message
-
-    @options = RDoc::Options.new
-
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish -R]
-    end
-
-    assert_equal 'invalid option: -R generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_h
-    out, = capture_output do
-      begin
-        @options.parse %w[-h]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-  end
-
-  def test_parse_help
-    out, = capture_output do
-      begin
-        @options.parse %w[--help]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-  end
-
-  def test_parse_help_extra_generator
-    RDoc::RDoc::GENERATORS['test'] = Class.new do
-      def self.setup_options(options)
-        op = options.option_parser
-
-        op.separator 'test generator options:'
-      end
-    end
-
-    out, = capture_output do
-      begin
-        @options.parse %w[--help]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-    assert_equal 1, out.scan(/test generator options:/).length
-  end
-
-  def test_parse_format_for_extra_generator
-    RDoc::RDoc::GENERATORS['test'] = Class.new do
-      def self.setup_options(options)
-        op = options.option_parser
-
-        op.separator 'test generator options:'
-      end
-    end
-
-    @options.setup_generator 'test'
-
-    assert_equal @options.generator_name, 'test'
-  end
-
-  def test_parse_ignore_invalid
-    out, err = capture_output do
-      @options.parse %w[--ignore-invalid --bogus]
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus%, err
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_default
-    out, err = capture_output do
-      @options.parse %w[--bogus --main BLAH]
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus%, err
-
-    assert_equal 'BLAH', @options.main_page
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_no
-    out, err = capture_output do
-      assert_raise SystemExit do
-        @options.parse %w[--no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
-      end
-    end
-
-    assert_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus=arg, --bobogus, --visibility=extended%, err
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_no_quiet
-    out, err = capture_output do
-      assert_raise SystemExit do
-        @options.parse %w[--quiet --no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
-      end
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus=arg, --bobogus, --visibility=extended%, err
-
-    assert_empty out
-  end
-
-  def test_ignore_needless_arg
-    out, err = capture_output do
-      @options.parse %w[--ri=foo]
-    end
-
-    assert_match %r%^invalid options: --ri=foo%, err
-
-    assert_empty out
-  end
-
-  def test_ignore_missing_arg
-    out, err = capture_output do
-      @options.parse %w[--copy-files]
-    end
-
-    assert_match %r%^invalid options: --copy-files%, err
-
-    assert_empty out
-  end
-
-  def test_parse_main
-    out, err = capture_output do
-      @options.parse %w[--main MAIN]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'MAIN', @options.main_page
-  end
-
-  def test_parse_markup
-    out, err = capture_output do
-      @options.parse %w[--markup tomdoc]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'tomdoc', @options.markup
-  end
-
-  def test_parse_page_dir
-    assert_nil @options.page_dir
-
-    out, err = capture_output do
-      @options.parse %W[--page-dir #{Dir.tmpdir}]
-      @options.finish
-    end
-
-    assert_empty out
-    assert_empty err
-
-    expected = nil
-    begin
-      expected =
-        Pathname(Dir.tmpdir).expand_path.relative_path_from @options.root
-    rescue ArgumentError
-      # On Windows, sometimes crosses different drive letters.
-      expected = Pathname(Dir.tmpdir).expand_path
-    end
-
-    assert_equal expected,     @options.page_dir
-    assert_equal [Dir.tmpdir], @options.files
-  end
-
-  def test_parse_page_dir_root
-    assert_nil @options.page_dir
-
-    Dir.mktmpdir do |dir|
-      abs_root     = dir
-      abs_page_dir = File.join dir, 'pages'
-      FileUtils.mkdir abs_page_dir
-
-      out, err = capture_output do
-        @options.parse %W[--page-dir #{abs_page_dir} --root #{abs_root}]
-        @options.finish
-      end
-
-      assert_empty out
-      assert_empty err
-
-      assert_equal Pathname('pages'), @options.page_dir
-      assert_equal [abs_page_dir],    @options.files
-    end
-  end
-
-  def test_parse_ri_site
-    @options.parse %w[--ri-site]
-
-    assert_equal RDoc::Generator::RI,      @options.generator
-    assert_equal RDoc::RI::Paths.site_dir, @options.op_dir
-  end
-
-  def test_parse_root
-    assert_equal Pathname(Dir.pwd), @options.root
-
-    out, err = capture_output do
-      @options.parse %W[--root #{Dir.tmpdir}]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal Pathname(Dir.tmpdir), @options.root
-
-    @options.finish
-    assert_includes @options.rdoc_include, @options.root.to_s
-  end
-
-  def test_parse_embed_mixins
-    assert_false(@options.embed_mixins)
-
-    out, err = capture_output { @options.parse(["--embed-mixins"]) }
-    assert_empty(out)
-    assert_empty(err)
-    assert_true(@options.embed_mixins)
-
-    out, err = capture_output { @options.parse(["--no-embed-mixins"]) }
-    assert_empty(out)
-    assert_empty(err)
-    assert_false(@options.embed_mixins)
-  end
-
-  def test_parse_tab_width
-    @options.parse %w[--tab-width=1]
-    assert_equal 1, @options.tab_width
-
-    @options.parse %w[-w2]
-    assert_equal 2, @options.tab_width
-
-    _, err = capture_output do
-      @options.parse %w[-w=2]
-    end
-
-    assert_match 'invalid options', err
-
-    _, err = capture_output do
-      @options.parse %w[-w0]
-    end
-
-    assert_match 'invalid options', err
-  end
-
-  def test_parse_template
-    out, err = capture_output do
-      @options.parse %w[--template darkfish]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'darkfish', @options.template
-
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_template_nonexistent
-    out, err = capture_output do
-      @options.parse %w[--template NONEXISTENT]
-    end
-
-    assert_empty out
-    assert_equal "could not find template NONEXISTENT\n", err
-
-    @options.finish
-    assert_equal 'darkfish', @options.template
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_template_load_path
-    orig_LOAD_PATH = $LOAD_PATH.dup
-
-    template_dir = nil
-
-    Dir.mktmpdir do |dir|
-      $LOAD_PATH << dir
-
-      template_dir = File.join dir, 'rdoc', 'generator', 'template', 'load_path'
-
-      FileUtils.mkdir_p template_dir
-
-      out, err = capture_output do
-        @options.parse %w[--template load_path]
-      end
-
-      assert_empty out
-      assert_empty err
-    end
-
-    assert_equal 'load_path',  @options.template
-    assert_equal template_dir, @options.template_dir
-  ensure
-    $LOAD_PATH.replace orig_LOAD_PATH
-  end
-
-  def test_parse_template_stylesheets
-    css = nil
-    Dir.mktmpdir do |dir|
-      css = File.join(dir, "hoge.css")
-      File.write(css, "")
-      out, err = capture_output do
-        @options.parse %W[--template-stylesheets #{css}]
-      end
-
-      assert_empty out
-      assert_empty err
-    end
-    assert_include @options.template_stylesheets, css
-  end
-
-  def test_parse_visibility
-    @options.parse %w[--visibility=public]
-    assert_equal :public, @options.visibility
-
-    @options.parse %w[--visibility=protected]
-    assert_equal :protected, @options.visibility
-
-    @options.parse %w[--visibility=private]
-    assert_equal :private, @options.visibility
-
-    @options.parse %w[--visibility=nodoc]
-    assert_equal :nodoc, @options.visibility
-  end
-
-  def test_parse_write_options
-    tmpdir = File.join Dir.tmpdir, "test_rdoc_options_#{$$}"
-    FileUtils.mkdir_p tmpdir
-
-    Dir.chdir tmpdir do
-      e = assert_raise SystemExit do
-        @options.parse %w[--write-options]
-        @options.finish
-      end
-
-      assert_equal 0, e.status
-
-      assert File.exist? '.rdoc_options'
-    end
-  ensure
-    FileUtils.rm_rf tmpdir
-  end
-
-  def test_parse_extension_alias
-    out, err = capture_output do
-      @options.parse %w[--extension foobar=rdoc]
-    end
-
-    assert_includes RDoc::Parser.parsers, [/\.foobar$/, RDoc::Parser::Simple]
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_parse_locale_name_default
-    temp_dir do
-      @options.parse %w[]
-      assert_equal 'locale', @options.instance_variable_get(:@locale_dir)
-      assert_nil @options.instance_variable_get(:@locale_name)
-      assert_nil @options.locale
-      @options.finish
-      assert_nil @options.locale
-    end
-  end
-
-  def test_parse_locale_name
-    temp_dir do
-      @options.parse %w[--locale fr]
-      assert_equal 'locale', @options.instance_variable_get(:@locale_dir)
-      assert_equal 'fr', @options.instance_variable_get(:@locale_name)
-      assert_nil @options.locale
-      @options.finish
-      assert_equal 'fr', @options.locale.name
-    end
-  end
-
-  def test_setup_generator
-    test_generator = Class.new do
-      def self.setup_options(op)
-        @op = op
-      end
-
-      def self.op() @op end
-    end
-
-    RDoc::RDoc::GENERATORS['test'] = test_generator
-
-    @options.setup_generator 'test'
-
-    assert_equal test_generator, @options.generator
-    assert_equal [test_generator], @options.generator_options
-
-    assert_equal @options, test_generator.op
-  ensure
-    RDoc::RDoc::GENERATORS.delete 'test'
-  end
-
-  def test_setup_generator_no_option_parser
-    test_generator = Class.new do
-      def self.setup_options(op)
-        op.option_parser.separator nil
-        @op = op
-      end
-
-      def self.op() @op end
-    end
-
-    RDoc::RDoc::GENERATORS['test'] = test_generator
-
-    @options.setup_generator 'test'
-
-    assert_equal test_generator, @options.generator
-    assert_equal [test_generator], @options.generator_options
-
-    assert_equal @options, test_generator.op
-  ensure
-    RDoc::RDoc::GENERATORS.delete 'test'
-  end
-
-  def test_update_output_dir
-    assert @options.update_output_dir
-
-    @options.update_output_dir = false
-
-    refute @options.update_output_dir
-  end
-
-  def test_warn
-    out, err = capture_output do
-      @options.warn "warnings off"
-    end
-
-    assert_empty out
-    assert_empty err
-
-    @options.verbosity = 2
-
-    out, err = verbose_capture_output do
-      @options.warn "warnings on"
-    end
-
-    assert_empty out
-    assert_equal "warnings on\n", err
-  end
-
-  def test_write_options
-    temp_dir do |dir|
-      @options.write_options
-
-      assert File.exist? '.rdoc_options'
-
-      options = File.read('.rdoc_options')
-      options = YAML.safe_load(options, permitted_classes: [Symbol])
-      assert_equal @options, RDoc::Options.new(options)
-    end
-  end
-
-  def test_version
-    out, _ = capture_output do
-      begin
-        @options.parse %w[--version]
-      rescue SystemExit
-      end
-    end
-
-    assert out.include?(RDoc::VERSION)
-
-    out, _ = capture_output do
-      begin
-        @options.parse %w[-v]
-      rescue SystemExit
-      end
-    end
-
-    assert out.include?(RDoc::VERSION)
-  end
-
-  def test_visibility
-    @options.visibility = :all
-    assert_equal :private, @options.visibility
-  end
-
-  def test_load_options
-    temp_dir do
-      options = RDoc::Options.new
-      options.markup = 'tomdoc'
-      options.write_options
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'tomdoc', options.markup
-    end
-  end
-
-  def test_load_options_invalid
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-        io.write "a: !ruby.yaml.org,2002:str |\nfoo"
-      end
-
-      e = assert_raise RDoc::Error do
-        RDoc::Options.load_options
-      end
-
-      options_file = File.expand_path '.rdoc_options'
-      assert_equal "#{options_file} is not a valid rdoc options file", e.message
-    end
-  end
-
-  def test_load_options_empty_file
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-      end
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'rdoc', options.markup
-    end
-  end
-
-  def test_load_options_partial_override
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-        io.puts "markup: Markdown"
-        io.puts "encoding: iso-8859-1"
-        io.puts "static_path: [static]"
-        io.puts "rdoc_include: [.]"
-        io.puts "page_dir: pages"
-      end
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'Markdown', options.markup
-      assert_equal Encoding::ISO_8859_1, options.encoding
-      assert_equal ["static"], options.static_path
-      assert_equal ["."], options.rdoc_include
-      assert_equal "pages", options.page_dir
-    end
-  end
-
-  def test_load_options_no_file
-    temp_dir do
-      options = RDoc::Options.load_options
-
-      assert_kind_of RDoc::Options, options
-    end
-  end
-
-  def test_skip_test_default_value
-    @options.parse %w[]
-    assert_equal true, @options.skip_tests
-  end
-
-  def test_no_skip_test_value
-    @options.parse %w[--no-skipping-tests]
-    assert_equal false, @options.skip_tests
-  end
-
-  def test_apply_default_exclude_option
-    @options.parse %w[]
-    exclude = @options.exclude
-    assert_kind_of Regexp, exclude
-    assert_match exclude, "foo~"
-    assert_match exclude, "foo.orig"
-    assert_match exclude, "foo.rej"
-    assert_match exclude, "foo.bak"
-    assert_match exclude, "foo.gemspec"
-  end
-
-  def test_no_apply_default_exclude_option
-    @options.parse %w[--no-apply-default-exclude]
-    assert_nil @options.exclude
-  end
-
-  def test_exclude_option_without_default
-    @options.parse %w[--no-apply-default-exclude --exclude=\.old\z]
-    exclude = @options.exclude
-    assert_match exclude, "foo.old"
-    assert_not_match exclude, "foo~"
-  end
-
-  class DummyCoder < Hash
-    alias add :[]=
-    def tag=(tag)
-    end
-  end
-end
diff --git a/test/mri/rdoc/rdoc_parser_c_test.rb b/test/mri/rdoc/rdoc_parser_c_test.rb
deleted file mode 100644
index 504e2f8b2ea..00000000000
--- a/test/mri/rdoc/rdoc_parser_c_test.rb
+++ /dev/null
@@ -1,2150 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-=begin
-  TODO: test call-seq parsing
-
-/*
- *  call-seq:
- *     ARGF.readlines(sep=$/)     -> array
- *     ARGF.readlines(limit)      -> array
- *     ARGF.readlines(sep, limit) -> array
- *
- *     ARGF.to_a(sep=$/)     -> array
- *     ARGF.to_a(limit)      -> array
- *     ARGF.to_a(sep, limit) -> array
- *
- *  Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
- *  lines, one line per element. Lines are assumed to be separated by _sep_.
- *
- *     lines = ARGF.readlines
- *     lines[0]                #=> "This is line one\n"
- */
-
-assert call-seq did not stop at first empty line
-
-/*
- * call-seq:
- *
- *  flt ** other  ->  float
- *
- * Raises <code>float</code> the <code>other</code> power.
- *
- *    2.0**3      #=> 8.0
- */
-
-assert call-seq correct (bug: was empty)
-
-/* call-seq: flt ** other  ->  float */
-
-assert call-seq correct
-
-=end
-
-class RDocParserCTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @options.verbosity = 2
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_class_can_parse
-    c_parser = RDoc::Parser::C
-
-    temp_dir do
-      FileUtils.touch 'file.C'
-      assert_equal c_parser, c_parser.can_parse('file.C')
-
-      FileUtils.touch 'file.CC'
-      assert_equal c_parser, c_parser.can_parse('file.CC')
-
-      FileUtils.touch 'file.H'
-      assert_equal c_parser, c_parser.can_parse('file.H')
-
-      FileUtils.touch 'file.HH'
-      assert_equal c_parser, c_parser.can_parse('file.HH')
-
-      FileUtils.touch 'file.c'
-      assert_equal c_parser, c_parser.can_parse('file.c')
-
-      FileUtils.touch 'file.cc'
-      assert_equal c_parser, c_parser.can_parse('file.cc')
-
-      FileUtils.touch 'file.cpp'
-      assert_equal c_parser, c_parser.can_parse('file.cpp')
-
-      FileUtils.touch 'file.cxx'
-      assert_equal c_parser, c_parser.can_parse('file.cxx')
-
-      FileUtils.touch 'file.h'
-      assert_equal c_parser, c_parser.can_parse('file.h')
-
-      FileUtils.touch 'file.hh'
-      assert_equal c_parser, c_parser.can_parse('file.hh')
-
-      FileUtils.touch 'file.y'
-      assert_equal c_parser, c_parser.can_parse('file.y')
-    end
-  end
-
-  def test_known_classes
-    RDoc::KNOWN_CLASSES.each do |var, name|
-      case name
-      when "Refinement"
-        next unless defined?(Refinement)
-      when "RubyVM"
-        next unless defined?(RubyVM)
-      when "Bignum", "Fixnum", "Data", "Socket", /\A(?![A-Z])/
-        next
-      end
-      obj = Object.const_get(name)
-      assert_equal obj.name, name
-      case var
-      when /\Arb_c/
-        assert_kind_of Class, obj
-      when /\Arb_m/
-        assert_kind_of Module, obj
-      when /\Arb_e/
-        assert_operator obj, :<=, Exception
-      else
-        raise "unknown prefix: #{var} => #{name}"
-      end
-    end
-  end
-
-  def test_initialize
-    some_ext        = @top_level.add_class RDoc::NormalClass, 'SomeExt'
-                      @top_level.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    @store.cache[:c_class_variables] = {
-      @fn => { 'cSomeExt' => 'SomeExt' }
-    }
-
-    @store.cache[:c_singleton_class_variables] = {
-      @fn => { 'cSomeExtSingle' => 'SomeExtSingle' }
-    }
-
-    parser = RDoc::Parser::C.new @top_level, '', @options, @stats
-
-    expected = { 'cSomeExt' => some_ext }
-    assert_equal expected, parser.classes
-
-    expected = { 'cSomeExtSingle' => 'SomeExtSingle' }
-    assert_equal expected, parser.singleton_classes
-
-    expected = {
-      'cSomeExt'       => 'SomeExt',
-      'cSomeExtSingle' => 'SomeExtSingle',
-    }
-    known_classes = parser.known_classes.delete_if do |key, _|
-      RDoc::KNOWN_CLASSES.keys.include? key
-    end
-
-    assert_equal expected, known_classes
-  end
-
-  def assert_do_attr(flags)
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This is an accessor
-   */
-  #{yield "cBlah", "accessor", flags[1], flags[1]};
-
-  /*
-   * This is a reader
-   */
-  #{yield "cBlah", "reader", flags[1], flags[0]};
-
-  /*
-   * This is a writer
-   */
-  #{yield "cBlah", "writer", flags[0], flags[1]};
-}
-    EOF
-
-    klass = util_get_class content, 'cBlah'
-
-    attrs = klass.attributes
-    assert_equal 3, attrs.length, attrs.inspect
-
-    accessor = attrs.shift
-    assert_equal 'accessor',            accessor.name
-    assert_equal 'RW',                  accessor.rw
-    assert_equal 'This is an accessor', accessor.comment.text
-    assert_equal @top_level,            accessor.file
-
-    reader = attrs.shift
-    assert_equal 'reader',           reader.name
-    assert_equal 'R',                reader.rw
-    assert_equal 'This is a reader', reader.comment.text
-
-    writer = attrs.shift
-    assert_equal 'writer',           writer.name
-    assert_equal 'W',                writer.rw
-    assert_equal 'This is a writer', writer.comment.text
-  end
-
-  {
-    num: %w[0 1],
-    macro: %w[FALSE TRUE],
-    ruby: %w[Qfalse Qtrue],
-    bool: %w[false true],
-  }.each_pair do |name, values|
-    define_method("test_do_attr:rb_attr:intern:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_attr(#{c}, rb_intern("#{name}"), #{r}, #{w}, Qfalse)]}
-    end
-    define_method("test_do_attr:rb_attr:intern_const:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_attr(#{c}, rb_intern_const("#{name}"), #{r}, #{w}, Qfalse)]}
-    end
-    define_method("test_do_attr:rb_define_attr:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_define_attr(#{c}, "#{name}", #{r}, #{w})]}
-    end
-  end
-
-  def test_do_aliases
-    content = <<-EOF
-/*
- * This should show up as an alias with documentation
- */
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1);
-
-  rb_define_alias(cDate, "bleh", "blah");
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-    assert_equal 2,      methods.length
-    assert_equal 'bleh', methods.last.name
-    assert_equal 'blah', methods.last.is_alias_for.name
-
-    assert_equal @top_level, methods.last.is_alias_for.file
-    assert_equal @top_level, methods.last.file
-  end
-
-  def test_do_aliases_singleton
-    content = <<-EOF
-/*
- * This should show up as a method with documentation
- */
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-
-  rb_define_method(sDate, "blah", blah, 1);
-
-  /*
-   * This should show up as an alias
-   */
-  rb_define_alias(sDate, "bleh", "blah");
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-
-    assert_equal 2,      methods.length
-    assert_equal 'bleh', methods.last.name
-    assert               methods.last.singleton
-    assert_equal 'blah', methods.last.is_alias_for.name
-    assert_equal 'This should show up as an alias', methods.last.comment.text
-  end
-
-  def test_do_aliases_missing_class
-    content = <<-EOF
-void Init_Blah(void) {
-  rb_define_alias(cDate, "b", "a");
-}
-    EOF
-
-    _, err = verbose_capture_output do
-      refute util_get_class(content, 'cDate')
-    end
-
-    assert_equal "Enclosing class or module \"cDate\" for alias b a is not known\n",
-                 err
-  end
-
-  def test_do_classes_class
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-  end
-
-  def test_do_classes_duplicate_class
-    content = <<-EOF
-/* Document-class: Foo
- * first
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-/* Document-class: Foo
- * second
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 1, klass.comment_location.size
-    first = klass.comment_location.first
-    first_comment = first[0]
-    assert_equal 'first', first_comment.text
-  end
-
-  def test_do_classes_struct
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_struct_define(
-        "Foo",
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-
-    attributes = klass.attributes
-    assert_equal 3, attributes.size, -> {attributes}
-    ["some", "various", "fields"].zip(attributes) do |name, attr|
-      assert_equal RDoc::Attr.new("", name, "RW", ""), attr
-    end
-  end
-
-  def test_do_classes_struct_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_struct_define_under(
-        rb_mKernel, "Foo",
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-
-    attributes = klass.attributes
-    assert_equal 3, attributes.size, -> {attributes}
-    ["some", "various", "fields"].zip(attributes) do |name, attr|
-      assert_equal RDoc::Attr.new("", name, "RW", ""), attr
-    end
-  end
-
-  def test_do_classes_struct_without_accessor
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_struct_define_without_accessor(
-        "Foo", rb_cObject, foo_alloc,
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-    assert_empty klass.attributes
-  end
-
-  def test_do_classes_struct_without_accessor_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_struct_define_without_accessor_under(
-        rb_mKernel, "Foo", rb_cObject, foo_alloc,
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-    assert_empty klass.attributes
-  end
-
-  def test_do_classes_class_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-  end
-
-  def test_do_classes_class_under_rb_path2class
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is Kernel::Foo < A::B
- */
-VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_path2class("A::B"));
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal 'A::B', klass.superclass
-    assert_equal 'this is Kernel::Foo < A::B', klass.comment.text
-  end
-
-  def test_do_classes_singleton
-    content = <<-EOF
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-VALUE cFooS = rb_singleton_class(cFoo);
-    EOF
-
-    util_get_class content, 'cFooS'
-
-    assert_equal 'Foo', @parser.singleton_classes['cFooS']
-  end
-
-  def test_do_classes_module
-    content = <<-EOF
-/* Document-module: Foo
- * this is the Foo module
- */
-VALUE mFoo = rb_define_module("Foo");
-    EOF
-
-    klass = util_get_class content, 'mFoo'
-    assert_equal "this is the Foo module", klass.comment.text
-  end
-
-  def test_do_classes_module_under
-    content = <<-EOF
-/* Document-module: Kernel::Foo
- * this is the Foo module under Kernel
- */
-VALUE mFoo = rb_define_module_under(rb_mKernel, "Foo");
-    EOF
-
-    klass = util_get_class content, 'mFoo'
-    assert_equal "this is the Foo module under Kernel", klass.comment.text
-  end
-
-  def test_do_constants
-    content = <<-'EOF'
-#include <ruby.h>
-
-void Init_foo(){
-   VALUE cFoo = rb_define_class("Foo", rb_cObject);
-
-   /* 300: The highest possible score in bowling */
-   rb_define_const(cFoo, "PERFECT", INT2FIX(300));
-
-   /* Huzzah!: What you cheer when you roll a perfect game */
-   rb_define_const(cFoo, "CHEER", rb_str_new2("Huzzah!"));
-
-   /* TEST\:TEST: Checking to see if escaped colon works */
-   rb_define_const(cFoo, "TEST", rb_str_new2("TEST:TEST"));
-
-   /* TEST: TEST:Checking to see if only word-ending colon works */
-   rb_define_const(cFoo, "TEST2", rb_str_new2("TEST:TEST"));
-
-   /* \\: The file separator on MS Windows */
-   rb_define_const(cFoo, "MSEPARATOR", rb_str_new2("\\"));
-
-   /* /: The file separator on Unix */
-   rb_define_const(cFoo, "SEPARATOR", rb_str_new2("/"));
-
-   /* C:\\Program Files\\Stuff: A directory on MS Windows */
-   rb_define_const(cFoo, "STUFF", rb_str_new2("C:\\Program Files\\Stuff"));
-
-   /* Default definition */
-   rb_define_const(cFoo, "NOSEMI", INT2FIX(99));
-
-   rb_define_const(cFoo, "NOCOMMENT", rb_str_new2("No comment"));
-
-   /*
-    * Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE", INT2FIX(1));
-
-   /*
-    * 1: Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE_VALUE", INT2FIX(1));
-
-   /* Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE_NOT_EMPTY", INT2FIX(1));
-
-   /*
-    * Multiline comment goes here because this comment spans multiple lines.
-    * 1: However, the value extraction should only happen for the first line
-    */
-   rb_define_const(cFoo, "MULTILINE_COLON_ON_SECOND_LINE", INT2FIX(1));
-
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['cFoo']
-    assert klass
-
-    constants = klass.constants
-    assert !klass.constants.empty?
-
-    assert_equal @top_level, constants.first.file
-
-    constants = constants.map { |c| [c.name, c.value, c.comment.text] }
-
-    assert_equal ['PERFECT', '300', 'The highest possible score in bowling   '],
-                 constants.shift
-    assert_equal ['CHEER', 'Huzzah!',
-                  'What you cheer when you roll a perfect game   '],
-                 constants.shift
-    assert_equal ['TEST', 'TEST:TEST',
-                  'Checking to see if escaped colon works   '],
-                 constants.shift
-    assert_equal ['TEST2', 'TEST',
-                  'TEST:Checking to see if only word-ending colon works   '],
-                 constants.shift
-    assert_equal ['MSEPARATOR', '\\',
-                  'The file separator on MS Windows   '],
-                 constants.shift
-    assert_equal ['SEPARATOR', '/',
-                  'The file separator on Unix   '],
-                 constants.shift
-    assert_equal ['STUFF', 'C:\\Program Files\\Stuff',
-                  'A directory on MS Windows   '],
-                 constants.shift
-    assert_equal ['NOSEMI', 'INT2FIX(99)',
-                  'Default definition   '],
-                 constants.shift
-    assert_equal ['NOCOMMENT', 'rb_str_new2("No comment")', ''],
-                 constants.shift
-
-    comment = <<-EOF.chomp
-Multiline comment goes here because this comment spans multiple lines.
-Multiline comment goes here because this comment spans multiple lines.
-    EOF
-    assert_equal ['MULTILINE',           'INT2FIX(1)', comment], constants.shift
-    assert_equal ['MULTILINE_VALUE',     '1',          comment], constants.shift
-    assert_equal ['MULTILINE_NOT_EMPTY', 'INT2FIX(1)', comment], constants.shift
-
-    comment = <<-EOF.chomp
-Multiline comment goes here because this comment spans multiple lines.
-1: However, the value extraction should only happen for the first line
-    EOF
-    assert_equal ['MULTILINE_COLON_ON_SECOND_LINE', 'INT2FIX(1)', comment],
-                 constants.shift
-
-    assert constants.empty?, constants.inspect
-  end
-
-  def test_do_constants_global
-    content = <<-'EOF'
-#include <ruby.h>
-
-void Init_foo(){
-
-   /* Toplevel const */
-   rb_define_global_const("ANSWER", INT2FIX(42));
-
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['rb_cObject']
-    assert klass
-
-    constants = klass.constants
-    assert !klass.constants.empty?
-
-    assert_equal @top_level, constants.first.file
-
-    constants = constants.map { |c| [c.name, c.value, c.comment.text] }
-    assert_equal ['ANSWER', 'INT2FIX(42)', "Toplevel const   "],
-                 constants.shift
-
-    assert constants.empty?, constants.inspect
-  end
-
-  def test_do_constants_curses
-    content = <<-EOF
-void Init_curses(){
-  mCurses = rb_define_module("Curses");
-
-  /*
-   * Value of the color black
-   */
-  rb_curses_define_const(COLOR_BLACK);
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['mCurses']
-
-    constants = klass.constants
-    refute_empty klass.constants
-
-    assert_equal 'COLOR_BLACK', constants.first.name
-    assert_equal 'UINT2NUM(COLOR_BLACK)', constants.first.value
-    assert_equal 'Value of the color black', constants.first.comment.text
-  end
-
-  def test_do_constants_file
-    content = <<-EOF
-void Init_File(void) {
-  /*
-   *  Shared lock
-   */
-  rb_file_const("LOCK_SH", INT2FIX(LOCK_SH));
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['rb_mFConst']
-
-    constants = klass.constants
-    refute_empty klass.constants
-
-    constant = constants.first
-
-    assert_equal 'LOCK_SH',          constant.name
-    assert_equal 'INT2FIX(LOCK_SH)', constant.value
-    assert_equal 'Shared lock',      constant.comment.text
-
-    @parser = util_parser <<-EOF
-void Init_File(void) {
-  rb_cFile = rb_define_class("File", rb_cIO);
-  rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
-}
-    EOF
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    assert_equal 'File::Constants',  klass.full_name
-  end
-
-  def test_do_includes
-    content = <<-EOF
-Init_foo() {
-   VALUE cFoo = rb_define_class("Foo", rb_cObject);
-   VALUE mInc = rb_define_module("Inc");
-
-   rb_include_module(cFoo, mInc);
-}
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-
-    incl = klass.includes.first
-    assert_equal 'Inc',      incl.name
-    assert_equal '',         incl.comment.text
-    assert_equal @top_level, incl.file
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_c
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.c */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.c ', err
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_cpp
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.cpp */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.cpp ', err
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_y
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.y */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.y ', err
-  end
-
-  def test_do_methods_singleton_class
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-
-  rb_define_method(sDate, "blah", blah, 1);
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-    assert_equal 1,      methods.length
-    assert_equal 'blah', methods.first.name
-    assert               methods.first.singleton
-  end
-
-  def test_do_missing
-    parser = util_parser
-
-    klass_a = @top_level.add_class RDoc::ClassModule, 'A'
-    parser.classes['a'] = klass_a
-
-    parser.enclosure_dependencies['c'] << 'b'
-    parser.enclosure_dependencies['b'] << 'a'
-    parser.enclosure_dependencies['d'] << 'a'
-
-    parser.missing_dependencies['d'] = ['d', :class, 'D', 'Object', 'a']
-    parser.missing_dependencies['c'] = ['c', :class, 'C', 'Object', 'b']
-    parser.missing_dependencies['b'] = ['b', :class, 'B', 'Object', 'a']
-
-    parser.do_missing
-
-    assert_equal %w[A A::B A::B::C A::D],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_do_missing_cycle
-    parser = util_parser
-
-    klass_a = @top_level.add_class RDoc::ClassModule, 'A'
-    parser.classes['a'] = klass_a
-
-    parser.enclosure_dependencies['c'] << 'b'
-    parser.enclosure_dependencies['b'] << 'a'
-
-    parser.missing_dependencies['c'] = ['c', :class, 'C', 'Object', 'b']
-    parser.missing_dependencies['b'] = ['b', :class, 'B', 'Object', 'a']
-
-    parser.enclosure_dependencies['y'] << 'z'
-    parser.enclosure_dependencies['z'] << 'y'
-
-    parser.missing_dependencies['y'] = ['y', :class, 'Y', 'Object', 'z']
-    parser.missing_dependencies['z'] = ['z', :class, 'Z', 'Object', 'y']
-
-    _, err = verbose_capture_output do
-      parser.do_missing
-    end
-
-    expected = 'Unable to create class Y (y), class Z (z) ' +
-               'due to a cyclic class or module creation'
-
-    assert_equal expected, err.chomp
-
-    assert_equal %w[A A::B A::B::C],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_find_alias_comment
-    parser = util_parser
-
-    comment = parser.find_alias_comment 'C', '[]', 'index'
-
-    assert_equal '', comment.text
-
-    parser = util_parser <<-C
-/*
- * comment
- */
-
-rb_define_alias(C, "[]", "index");
-    C
-
-    comment = parser.find_alias_comment 'C', '[]', 'index'
-
-    assert_equal "/*\n * comment\n */\n\n", comment.text
-  end
-
-  def test_find_attr_comment_document_attr
-    parser= util_parser <<-C
-/*
- * Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/*\n * \n * comment\n */", comment.text
-  end
-
-  def test_find_attr_comment_document_attr_oneline
-    parser= util_parser <<-C
-/* Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/* \n * comment\n */", comment.text
-  end
-
-  def test_find_attr_comment_document_attr_overlap
-    parser= util_parser <<-C
-/* Document-attr: x
- * comment
- */
-
-/* Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/* \n * comment\n */", comment.text
-  end
-
-  def test_find_class_comment
-    @options.rdoc_include << File.dirname(__FILE__)
-
-    content = <<-EOF
-/*
- * Comment 1
- */
-foo = rb_define_class("MyClassName1", rb_cObject);
-
-/*
- * Comment 2
- */
-bar = rb_define_class("MyClassName2", rb_cObject);
-    EOF
-
-    util_get_class content
-
-    assert_equal "Comment 1", @parser.classes['foo'].comment.text
-    assert_equal "Comment 2", @parser.classes['bar'].comment.text
-  end
-
-  def test_find_class_comment_init
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-void
-Init_Foo(void) {
-  VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-
-  def test_find_class_comment_initvm
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-void
-InitVM_Foo(void) {
-  VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-VALUE foo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_Init_Foo
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo on Init", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_Init_Foo_no_void
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo() {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo on Init", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_bogus_comment
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-void
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal '', klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_under
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-VALUE foo = rb_define_class_under(rb_cObject, "Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_under_Init
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class_under(rb_cObject, "Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    # the inner comment is used since Object::Foo is not necessarily the same
-    # thing as "Foo" for Init_
-    assert_equal "a comment for class Foo on rb_define_class",
-                 klass.comment.text
-  end
-
-  def test_find_const_comment_rb_define
-    content = <<-EOF
-/*
- * A comment
- */
-rb_define_const(cFoo, "CONST", value);
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment 'const', 'CONST'
-
-    assert_equal "/*\n * A comment\n */\n", comment.text
-  end
-
-  def test_find_const_comment_rb_define_global
-    content = <<-EOF
-/*
- * A comment
- */
-rb_define_global_const("CONST", value);
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment 'const', 'CONST'
-
-    assert_equal "/*\n * A comment\n */\n", comment.text
-  end
-
-  def test_find_const_comment_document_const
-    content = <<-EOF
-/*
- * Document-const: CONST
- *
- * A comment
- */
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment nil, 'CONST'
-
-    assert_equal "/*\n *\n * A comment\n */", comment.text
-  end
-
-  def test_find_const_comment_document_const_full_name
-    content = <<-EOF
-/*
- * Document-const: Foo::CONST
- *
- * A comment
- */
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment nil, 'CONST', 'Foo'
-
-    assert_equal "/*\n *\n * A comment\n */", comment.text
-  end
-
-  def test_find_body
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_body_2
-    content = <<-CONTENT
-/* Copyright (C) 2010  Sven Herzberg
- *
- * This file is free software; the author(s) gives unlimited
- * permission to copy and/or distribute it, with or without
- * modifications, as long as this notice is preserved.
- */
-
-#include <ruby.h>
-
-static VALUE
-wrap_initialize (VALUE  self)
-{
-  return self;
-}
-
-/* */
-static VALUE
-wrap_shift (VALUE self,
-            VALUE arg)
-{
-  return self;
-}
-
-void
-init_gi_repository (void)
-{
-  VALUE mTest = rb_define_module ("Test");
-  VALUE cTest = rb_define_class_under (mTest, "Test", rb_cObject);
-
-  rb_define_method (cTest, "initialize", wrap_initialize, 0);
-  rb_define_method (cTest, "shift", wrap_shift, 0);
-}
-    CONTENT
-
-    klass = util_get_class content, 'cTest'
-    assert_equal 2, klass.method_list.length
-  end
-
-  def test_find_body_cast
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", (METHOD)other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_body_define
-    content = <<-EOF
-#define something something_else
-
-#define other_function rb_other_function
-
-/*
- * a comment for rb_other_function
- */
-VALUE
-rb_other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal 'a comment for rb_other_function', other_function.comment.text
-    assert_equal '()', other_function.params
-    assert_equal 8, other_function.line
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nrb_other_function() {\n}", code
-  end
-
-  def test_find_body_define_comment
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-#define other_function rb_other_function
-
-/* */
-VALUE
-rb_other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal 'a comment for other_function', other_function.comment.text
-    assert_equal '()', other_function.params
-    assert_equal 4, other_function.line
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "#define other_function rb_other_function", code
-  end
-
-  def test_find_body_document_method
-    content = <<-EOF
-/*
- * Document-method: bar
- * Document-method: baz
- *
- * a comment for bar
- */
-VALUE
-bar() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "bar", bar, 0);
-    rb_define_method(foo, "baz", bar, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    assert_equal 2, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    bar = methods.first
-    assert_equal 'Foo#bar', bar.full_name
-    assert_equal "a comment for bar", bar.comment.text
-
-    baz = methods.last
-    assert_equal 'Foo#baz', baz.full_name
-    assert_equal "a comment for bar", baz.comment.text
-  end
-
-  def test_find_body_document_method_equals
-    content = <<-EOF
-/*
- * Document-method: Zlib::GzipFile#mtime=
- *
- * A comment
- */
-static VALUE
-rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
-{
-
-void
-Init_zlib() {
-    mZlib = rb_define_module("Zlib");
-    cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
-    cGzipWriter = rb_define_class_under(mZlib, "GzipWriter", cGzipFile);
-    rb_define_method(cGzipWriter, "mtime=", rb_gzfile_set_mtime, 1);
-}
-    EOF
-
-    klass = util_get_class content, 'cGzipWriter'
-    assert_equal 1, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    bar = methods.first
-    assert_equal 'Zlib::GzipWriter#mtime=', bar.full_name
-    assert_equal 'A comment', bar.comment.text
-  end
-
-  def test_find_body_document_method_same
-    content = <<-EOF
-VALUE
-s_bar() {
-}
-
-VALUE
-bar() {
-}
-
-/*
- * Document-method: Foo::bar
- *
- * a comment for Foo::bar
- */
-
-/*
- * Document-method: Foo#bar
- *
- * a comment for Foo#bar
- */
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_singleton_method(foo, "bar", s_bar, 0);
-    rb_define_method(foo, "bar", bar, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    assert_equal 2, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    s_bar = methods.first
-    assert_equal 'Foo::bar', s_bar.full_name
-    assert_equal "a comment for Foo::bar", s_bar.comment.text
-
-    bar = methods.last
-    assert_equal 'Foo#bar', bar.full_name
-    assert_equal "a comment for Foo#bar", bar.comment.text
-  end
-
-  def test_find_body_macro
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-DLL_LOCAL VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "DLL_LOCAL VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_body_static_inline
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-static inline VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "static inline VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_modifiers_call_seq
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-
-If no arguments are given:
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-
-    CALL_SEQ
-
-    assert_equal expected, method_obj.call_seq
-  end
-
-  def test_find_modifiers_nodoc
-    comment = RDoc::Comment.new <<-COMMENT
-/* :nodoc:
- *
- * Blah
- */
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    assert_nil method_obj.document_self
-  end
-
-  def test_find_modifiers_yields
-    comment = RDoc::Comment.new <<-COMMENT, @top_level, :c
-/* :yields: a, b
- *
- * Blah
- */
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    assert_equal 'a, b', method_obj.block_params
-
-    assert_equal "\n\nBlah", comment.text
-  end
-
-  def test_handle_method_args_minus_1
-    parser = util_parser "Document-method: Object#m\n blah */"
-
-    parser.content = <<-BODY
-VALUE
-rb_other(VALUE obj) {
-  rb_funcall(obj, rb_intern("other"), 0);
-  return rb_str_new2("blah, blah, blah");
-}
-
-VALUE
-rb_m(int argc, VALUE *argv, VALUE obj) {
-  VALUE o1, o2;
-  rb_scan_args(argc, argv, "1", &o1, &o2);
-}
-    BODY
-
-    parser.handle_method 'method', 'rb_cObject', 'm', 'rb_m', -1
-
-    m = @top_level.find_module_named('Object').method_list.first
-
-    assert_equal 'm', m.name
-    assert_equal @top_level, m.file
-    assert_equal 7, m.line
-
-    assert_equal '(p1)', m.params
-  end
-
-  def test_handle_method_args_0
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 0
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '()', equals2.params
-  end
-
-  def test_handle_method_args_1
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 1
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(p1)', equals2.params
-  end
-
-  def test_handle_method_args_2
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 2
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(p1, p2)', equals2.params
-  end
-
-  # test_handle_args_minus_1 handled by test_handle_method
-
-  def test_handle_method_args_minus_2
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', -2
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(*args)', equals2.params
-  end
-
-  def test_handle_method_initialize
-    parser = util_parser "Document-method: BasicObject::new\n blah */"
-
-    parser.handle_method('private_method', 'rb_cBasicObject',
-                         'initialize', 'rb_obj_dummy', -1)
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    new = bo.method_list.first
-
-    assert_equal 'new',   new.name
-    assert_equal :public, new.visibility
-  end
-
-  def test_handle_singleton
-    parser = util_parser <<-SINGLE
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-}
-    SINGLE
-
-    parser.scan
-
-    assert_equal 'Date', parser.known_classes['sDate']
-    assert_equal 'Date', parser.singleton_classes['sDate']
-  end
-
-  def test_look_for_directives_in
-    parser = util_parser
-
-    comment = RDoc::Comment.new "# :other: not_handled\n"
-
-    parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :other: not_handled\n", comment.text
-    assert_equal 'not_handled', @top_level.metadata['other']
-  end
-
-  def test_load_variable_map
-    some_ext = @top_level.add_class RDoc::NormalClass, 'SomeExt'
-               @top_level.add_class RDoc::NormalClass, 'OtherExt'
-
-    @store.cache[:c_class_variables][@fn]       = { 'cSomeExt'  => 'SomeExt'  }
-    @store.cache[:c_class_variables]['other.c'] = { 'cOtherExt' => 'OtherExt' }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    expected = { 'cSomeExt' => some_ext }
-
-    assert_equal expected, map
-
-    assert_equal 'SomeExt', parser.known_classes['cSomeExt']
-    assert_nil              parser.known_classes['cOtherExt']
-  end
-
-  def test_load_variable_map_empty
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    assert_empty map
-  end
-
-  def test_load_variable_map_legacy
-    @store.cache[:c_class_variables] = nil
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    assert_empty map
-  end
-
-  def test_load_variable_map_singleton
-    @top_level.add_class RDoc::NormalClass, 'SomeExt'
-    @top_level.add_class RDoc::NormalClass, 'OtherExt'
-
-    @store.cache[:c_singleton_class_variables][@fn] =
-      { 'cSomeExt'  => 'SomeExt'  }
-    @store.cache[:c_singleton_class_variables]['other.c'] =
-      { 'cOtherExt' => 'OtherExt' }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_singleton_class_variables
-
-    expected = { 'cSomeExt' => 'SomeExt' }
-
-    assert_equal expected, map
-
-    assert_equal 'SomeExt', parser.known_classes['cSomeExt']
-    assert_nil              parser.known_classes['cOtherExt']
-  end
-
-  def test_load_variable_map_trim
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-
-    @store.cache[:c_class_variables][@fn] = {
-      'cA'  => 'A',
-      'cB'  => 'B',
-    }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    expected = { 'cA' => a }
-
-    assert_equal expected, map
-  end
-
-  def test_define_method
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-    assert_nil read_method.section.title
-  end
-
-  def test_define_method_with_category
-    content = <<-EOF
-/* :category: Awesome Methods
-   Method Comment!
- */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!", read_method.comment.text.strip
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-    assert_equal "Awesome Methods", read_method.section.title
-  end
-
-  def test_define_method_dynamically
-    content = <<-EOF
-void
-Init_foo(void)
-{
-    rb_define_singleton_method(obj, "foo", foo, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'obj'
-    assert_nil klass
-  end
-
-  def test_define_method_with_prototype
-    content = <<-EOF
-static VALUE rb_io_s_read(int, VALUE*, VALUE);
-
-/* Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-  end
-
-  def test_define_method_private
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_private_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal 'IO#read', read_method.full_name
-    assert_equal :private, read_method.visibility
-    assert_equal "Method Comment!   ", read_method.comment.text
-  end
-
-  def test_define_method_private_singleton
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    VALUE rb_cIO_s = rb_singleton_class(rb_cIO);
-    rb_define_private_method(rb_cIO_s, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal :private, read_method.visibility
-    assert read_method.singleton
-  end
-
-  def test_define_method_singleton
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    VALUE rb_cIO_s = rb_singleton_class(rb_cIO);
-    rb_define_method(rb_cIO_s, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert read_method.singleton
-  end
-
-  def test_rb_scan_args
-    parser = util_parser
-
-    assert_equal '(p1)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1",)')
-    assert_equal '(p1, p2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "2",)')
-
-    assert_equal '(p1 = v1)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "01",)')
-    assert_equal '(p1 = v1, p2 = v2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "02",)')
-
-    assert_equal '(p1, p2 = v2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11",)')
-
-    assert_equal '(p1, *args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1*",)')
-    assert_equal '(p1, p2 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1:",)')
-    assert_equal '(p1, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1&",)')
-
-    assert_equal '(p1, p2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "101",)')
-
-    assert_equal '(p1, p2 = v2, p3)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "111",)')
-
-    assert_equal '(p1, *args, p3)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1*1",)')
-
-    assert_equal '(p1, p2 = v2, *args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11*",)')
-    assert_equal '(p1, p2 = v2, p3 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11:",)')
-    assert_equal '(p1, p2 = v2, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11&",)')
-
-    assert_equal '(p1, p2 = v2, *args, p4, p5 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11*1:&",)')
-
-    # The following aren't valid according to spec but are according to the
-    # implementation.
-    assert_equal '(*args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*",)')
-    assert_equal '(p1 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, ":",)')
-    assert_equal '(&block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "&",)')
-
-    assert_equal '(*args, p2 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*:",)')
-    assert_equal '(p1 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, ":&",)')
-    assert_equal '(*args, p2 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*:&",)')
-  end
-
-  def test_scan
-    parser = util_parser <<-C
-void Init(void) {
-    mM = rb_define_module("M");
-    cC = rb_define_class("C", rb_cObject);
-    sC = rb_singleton_class(cC);
-}
-    C
-
-    parser.scan
-
-    expected = {
-      @fn => {
-        'mM' => 'M',
-        'cC' => 'C', }}
-    assert_equal expected, @store.c_class_variables
-
-    expected = {
-      @fn => {
-        'sC' => 'C' } }
-    assert_equal expected, @store.c_singleton_class_variables
-  end
-
-  def test_scan_method_copy
-    parser = util_parser <<-C
-/*
- *  call-seq:
- *    pathname.to_s    -> string
- *    pathname.to_path -> string
- *
- *  Return the path as a String.
- *
- *  to_path is implemented so Pathname objects are usable with File.open, etc.
- */
-static VALUE
-path_to_s(VALUE self) { }
-
-/*
- *  call-seq:
- *     str[index]               -> new_str or nil
- *     str[start, length]       -> new_str or nil
- *     str.slice(index)         -> new_str or nil
- *     str.slice(start, length) -> new_str or nil
- */
-static VALUE
-path_aref_m(int argc, VALUE *argv, VALUE str) { }
-
-/*
- *  call-seq:
- *     string <=> other_string   -> -1, 0, +1 or nil
- */
-static VALUE
-path_cmp_m(VALUE str1, VALUE str2) { }
-
-/*
- *  call-seq:
- *     str == obj    -> true or false
- *     str === obj   -> true or false
- */
-VALUE
-rb_str_equal(VALUE str1, VALUE str2) { }
-
-Init_pathname()
-{
-    rb_cPathname = rb_define_class("Pathname", rb_cObject);
-
-    rb_define_method(rb_cPathname, "to_s",    path_to_s, 0);
-    rb_define_method(rb_cPathname, "to_path", path_to_s, 0);
-    rb_define_method(rb_cPathname, "[]",      path_aref_m, -1);
-    rb_define_method(rb_cPathname, "slice",   path_aref_m, -1);
-    rb_define_method(rb_cPathname, "<=>",     path_cmp_m, 1);
-    rb_define_method(rb_cPathname, "==",      rb_str_equal), 2);
-    rb_define_method(rb_cPathname, "===",     rb_str_equal), 2);
-}
-    C
-
-    parser.scan
-
-    pathname = @store.classes_hash['Pathname']
-
-    to_path = pathname.method_list.find { |m| m.name == 'to_path' }
-    assert_equal "pathname.to_path -> string", to_path.call_seq
-
-    to_s = pathname.method_list.find { |m| m.name == 'to_s' }
-    assert_equal "pathname.to_s    -> string", to_s.call_seq
-
-    index_expected = <<-EXPECTED.chomp
-str[index]               -> new_str or nil
-str[start, length]       -> new_str or nil
-    EXPECTED
-
-    index = pathname.method_list.find { |m| m.name == '[]' }
-    assert_equal index_expected, index.call_seq, '[]'
-
-    slice_expected = <<-EXPECTED.chomp
-str.slice(index)         -> new_str or nil
-str.slice(start, length) -> new_str or nil
-    EXPECTED
-
-    slice = pathname.method_list.find { |m| m.name == 'slice' }
-    assert_equal slice_expected, slice.call_seq
-
-    spaceship = pathname.method_list.find { |m| m.name == '<=>' }
-    assert_equal "string <=> other_string   -> -1, 0, +1 or nil",
-                 spaceship.call_seq
-
-    equals2 = pathname.method_list.find { |m| m.name == '==' }
-    assert_match 'str == obj', equals2.call_seq
-
-    equals3 = pathname.method_list.find { |m| m.name == '===' }
-    assert_match 'str === obj', equals3.call_seq
-  end
-
-  def test_scan_order_dependent
-    parser = util_parser <<-C
-void a(void) {
-    mA = rb_define_module("A");
-}
-
-void b(void) {
-    cB = rb_define_class_under(mA, "B", rb_cObject);
-}
-
-void c(void) {
-    mC = rb_define_module_under(cB, "C");
-}
-
-void d(void) {
-    mD = rb_define_class_under(mC, "D");
-}
-    C
-
-    parser.scan
-
-    assert_equal %w[A A::B A::B::C],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_markup_format_default
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This should be interpreted in the default format.
-   */
-  rb_attr(cBlah, rb_intern("default_format"), 1, 1, Qfalse);
-}
-    EOF
-
-    klass = util_get_class content, 'cBlah'
-    assert_equal("rdoc", klass.attributes.find {|a| a.name == "default_format"}.comment.format)
-  end
-
-  def test_markup_format_override
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This should be interpreted in the default format.
-   */
-  rb_attr(cBlah, rb_intern("default_format"), 1, 1, Qfalse);
-}
-    EOF
-
-    @options.markup = "markdown"
-    klass = util_get_class content, 'cBlah'
-    assert_equal("markdown", klass.attributes.find {|a| a.name == "default_format"}.comment.format)
-  end
-
-  def util_get_class(content, name = nil)
-    @parser = util_parser content
-    @parser.scan
-
-    @parser.classes[name] if name
-  end
-
-  def util_parser(content = '')
-    RDoc::Parser::C.new @top_level, content, @options, @stats
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_parser_changelog_test.rb b/test/mri/rdoc/rdoc_parser_changelog_test.rb
deleted file mode 100644
index 4557eacae1f..00000000000
--- a/test/mri/rdoc/rdoc_parser_changelog_test.rb
+++ /dev/null
@@ -1,483 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocParserChangeLogTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile  = Tempfile.new 'ChangeLog'
-    @top_level = @store.add_file @tempfile.path
-    @options   = RDoc::Options.new
-    @stats     = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    @tempfile.close!
-
-    super
-  end
-
-  def test_class_can_parse
-    parser = RDoc::Parser::ChangeLog
-
-    temp_dir do
-      FileUtils.touch 'ChangeLog'
-      assert_equal parser, parser.can_parse('ChangeLog')
-
-      assert_equal parser, parser.can_parse(@tempfile.path)
-
-      FileUtils.touch 'ChangeLog.rb'
-      assert_equal RDoc::Parser::Ruby, parser.can_parse('ChangeLog.rb')
-    end
-  end
-
-  def test_continue_entry_body
-    parser = util_parser
-
-    entry_body = ['a'.dup]
-
-    parser.continue_entry_body entry_body, 'b'
-
-    assert_equal ['a b'], entry_body
-  end
-
-  def test_continue_entry_body_empty
-    parser = util_parser
-
-    entry_body = []
-
-    parser.continue_entry_body entry_body, ''
-
-    assert_empty entry_body
-  end
-
-  def test_continue_entry_body_function
-    parser = util_parser
-
-    entry_body = ['file: (func1)'.dup]
-
-    parser.continue_entry_body entry_body, '(func2): blah'
-
-    assert_equal ['file: (func1, func2): blah'], entry_body
-  end
-
-  def test_create_document
-    parser = util_parser
-
-    groups = {
-      '2012-12-04' => [
-        ['Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[a:one b:two]],
-        ['Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[c:three d:four]]],
-      '2012-12-03' => [
-        ['Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-          %w[e:five f:six]]],
-    }
-
-    expected =
-      doc(
-        head(1, File.basename(@tempfile.path)),
-        blank_line,
-        head(2, '2012-12-04'),
-        blank_line,
-        head(3, 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>'),
-        blank_line,
-        list(:NOTE, item('a', para('one')), item('b', para('two'))),
-        head(3, 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>'),
-        blank_line,
-        list(:NOTE, item('c', para('three')), item('d', para('four'))),
-        head(2, '2012-12-03'),
-        blank_line,
-        head(3, 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>'),
-        blank_line,
-        list(:NOTE, item('e', para('five')), item('f', para('six'))))
-
-    expected.file = @top_level
-
-    document = parser.create_document(groups)
-
-    assert_equal expected, document
-
-    assert_equal 2, document.omit_headings_below
-
-    headings = document.parts.select do |part|
-      RDoc::Markup::Heading === part and part.level == 2
-    end
-
-    refute headings.all? { |heading| heading.text.frozen? }
-  end
-
-  def test_create_entries
-    parser = util_parser
-
-    entries = [
-      ['Tue Dec  1 02:03:04 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[a:one b:two]],
-      ['Tue Dec  5 06:07:08 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[c:three d:four]],
-    ]
-
-    expected = [
-      head(3, 'Tue Dec  1 02:03:04 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE, item('a', para('one')), item('b', para('two'))),
-      head(3, 'Tue Dec  5 06:07:08 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE, item('c', para('three')), item('d', para('four'))),
-    ]
-
-    entries = parser.create_entries(entries)
-    assert_equal expected, entries
-  end
-
-  def test_create_entries_colons
-    parser = util_parser
-
-    entries = [
-      ['Wed Dec  5 12:17:11 2012  Naohisa Goto  <ngotogenome@gmail.com>',
-        ['func.rb (DL::Function#bind): log stuff [ruby-core:50562]']],
-    ]
-
-    expected = [
-      head(3,
-           'Wed Dec  5 12:17:11 2012  Naohisa Goto  <ngotogenome@gmail.com>'),
-      blank_line,
-      list(:NOTE,
-           item('func.rb (DL::Function#bind)',
-                para('log stuff [ruby-core:50562]')))]
-
-    assert_equal expected, parser.create_entries(entries)
-  end
-
-  def test_create_items
-    parser = util_parser
-
-    items = [
-	    'README.EXT:  Converted to RDoc format',
-	    'README.EXT.ja:  ditto',
-    ]
-
-    expected =
-      list(:NOTE,
-        item('README.EXT',
-          para('Converted to RDoc format')),
-        item('README.EXT.ja',
-          para('ditto')))
-
-    assert_equal expected, parser.create_items(items)
-  end
-
-  def test_group_entries
-    parser = util_parser
-
-    entries = [
-      [ 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[one two]],
-      [ 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[three four]],
-      [ 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-        %w[five six]],
-      [ '2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-        %w[seven eight]]]
-
-    expected = {
-      '2012-12-04' => [
-        ['Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[one two]],
-        ['Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[three four]]],
-      '2012-12-03' => [
-        ['Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-          %w[five six]]],
-      '2008-01-30' => [
-        ['2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-          %w[seven eight]]],
-    }
-
-    assert_equal expected, parser.group_entries(entries)
-  end
-
-  def test_parse_entries
-    parser = util_parser <<-ChangeLog
-Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>
-
-	* README.EXT:  Converted to RDoc format
-	* README.EXT.ja:  ditto
-
-Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_specialized_instruction):
-	  change condition of using `opt_send_simple'.
-	  More method invocations can be simple.
-
-commit\ 8187228de0142d3ac7950b7d977c2849e934c637
-
-Other note that will be ignored
-
-    ChangeLog
-
-    expected = [
-      [ 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-        [ 'README.EXT:  Converted to RDoc format',
-          'README.EXT.ja:  ditto']],
-      [ 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-        [ 'compile.c (iseq_specialized_instruction): change condition of ' +
-          'using `opt_send_simple\'. More method invocations can be simple.']]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_bad_time
-    parser = util_parser <<-ChangeLog
-2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>
-
-        PR libffi/34612
-        * src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when
-        returning struct.
-
-    ChangeLog
-
-    expected = [
-      [ '2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-        [ 'src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when ' +
-          'returning struct.']]
-    ]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_gnu
-    parser = util_parser <<-ChangeLog
-1998-08-17  Richard Stallman  <rms@gnu.org>
-
-* register.el (insert-register): Return nil.
-(jump-to-register): Likewise.
-
-* sort.el (sort-subr): Return nil.
-
-* keyboard.c (menu_bar_items, tool_bar_items)
-(Fexecute_extended_command): Deal with 'keymap' property.
-    ChangeLog
-
-    expected = [
-      [ '1998-08-17  Richard Stallman  <rms@gnu.org>',
-        [ 'register.el (insert-register): Return nil.',
-          '(jump-to-register): Likewise.',
-          'sort.el (sort-subr): Return nil.',
-          'keyboard.c (menu_bar_items, tool_bar_items, ' +
-          'Fexecute_extended_command): Deal with \'keymap\' property.']]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_git
-    parser = util_parser <<-ChangeLog
-commit\ 709bed2afaee50e2ce803f87bf1ee8291bea41e3
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-21 01:03:52 +0900
-
-    * 2021-01-21 [ci skip]
-ChangeLog
-
-    expected = [
-      [ "709bed2afaee50e2ce80",
-       [ "git", "svn-admin@ruby-lang.org",
-         "2021-01-21 01:03:52 +0900",
-         "* 2021-01-21 [ci skip]\n"]]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_scan
-    parser = util_parser <<-ChangeLog
-Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/driver.rb:  Fixed ri page display for files with
-	  extensions.
-	* test/rdoc/test_rdoc_ri_driver.rb:  Test for above
-
-Mon Dec  3 20:37:22 2012  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_exec.c: check VM_COLLECT_USAGE_DETAILS.
-
-    ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, '2012-12-04'),
-      blank_line,
-      head(3, 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE,
-        item('lib/rdoc/ri/driver.rb', para('Fixed ri page display for ' +
-                       'files with extensions.')),
-        item('test/rdoc/test_rdoc_ri_driver.rb', para('Test for above'))),
-      head(2, '2012-12-03'),
-      blank_line,
-      head(3, 'Mon Dec  3 20:37:22 2012  Koichi Sasada  <ko1@atdot.net>'),
-      blank_line,
-      list(:NOTE,
-        item('vm_exec.c', para('check VM_COLLECT_USAGE_DETAILS.'))))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def test_scan_git
-    parser = util_parser <<-ChangeLog
-commit\ 38816887962ec167ee46acf500f68df5c3013163
-Author: git <svn-admin@ruby-lang.org>
-Date:   Sun Jan 24 14:35:51 2021 +0900
-
-    * 2021-01-24 [ci skip]
-
-commit\ db7d0b89f6eca66cc7eb155c95f9123133da1ffc
-Author: git <svn-admin@ruby-lang.org>
-Date:   Sat, 23 Jan 2021 06:01:39 +0900
-
-    * 2021-01-23 [ci skip]
-
-commit\ a3efbda7128ef20b55505b32d1608ea48f80af4a
-Author: git <svn-admin@ruby-lang.org>
-Date:   2021-01-22T02:49:39+09:00
-
-    * 2021-01-22 [ci skip]
-
-commit\ 709bed2afaee50e2ce803f87bf1ee8291bea41e3
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-21 01:03:52 +0900
-
-    * 2021-01-21 [ci skip]
-
-commit\ a8dc5156e183489c5121fb1759bda5d9406d9175
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-20 01:58:26 +0900
-
-    * 2021-01-20 [ci skip]
-
-commit\ de5f8a92d5001799bedb3b1a271a2d9b23c6c8fb
-  Author: Masataka Pocke Kuwabara <kuwabara@pocke.me>
-  Date:   2021-01-01 14:25:08 +0900
-
-    Make args info for RubyVM::AST to available on endless method without parens
-
-    Problem
-    ===
-
-    Arguments information is missing for endless method without parens.
-    For example:
-
-    ```ruby
-    # ok
-    ```
-
-    It causes an error if a program expects `args` node exists.
-
-    Solution
-    ===
-
-    Call `new_args` on this case.
-ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, '2021-01-24'),
-      blank_line,
-      log_entry(nil, '38816887962ec167ee46',
-                'git', 'svn-admin@ruby-lang.org', 'Sun Jan 24 14:35:51 2021 +0900',
-                [list(:BULLET, item(nil, para('2021-01-24 [ci skip]')))]),
-      head(2, '2021-01-23'),
-      blank_line,
-      log_entry(nil, 'db7d0b89f6eca66cc7eb',
-                'git', 'svn-admin@ruby-lang.org', 'Sat, 23 Jan 2021 06:01:39 +0900',
-                [list(:BULLET, item(nil, para('2021-01-23 [ci skip]')))]),
-      head(2, '2021-01-22'),
-      blank_line,
-      log_entry(nil, 'a3efbda7128ef20b5550',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-22T02:49:39+09:00',
-                [list(:BULLET, item(nil, para('2021-01-22 [ci skip]')))]),
-      head(2, '2021-01-21'),
-      blank_line,
-      log_entry(nil, '709bed2afaee50e2ce80',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-21 01:03:52 +0900',
-                [list(:BULLET, item(nil, para('2021-01-21 [ci skip]')))]),
-      head(2, '2021-01-20'),
-      blank_line,
-      log_entry(nil, 'a8dc5156e183489c5121',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-20 01:58:26 +0900',
-                [list(:BULLET, item(nil, para('2021-01-20 [ci skip]')))]),
-      head(2, '2021-01-01'),
-      blank_line,
-      log_entry(nil, 'de5f8a92d5001799bedb',
-                'Masataka Pocke Kuwabara', 'kuwabara@pocke.me', '2021-01-01 14:25:08 +0900',
-                [head(4, 'Make args info for RubyVM::AST to available on endless method without parens'),
-                 head(5, 'Problem'),
-                 para("Arguments information is missing for endless method without parens.\n" +
-                      "For example:"),
-                 verb("# ok\n").tap {|v| v.format = :ruby},
-                 para('It causes an error if a program expects <code>args</code> node exists.'),
-                 head(5, 'Solution'),
-                 para('Call <code>new_args</code> on this case.')]))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def test_scan_git_commit_date
-    parser = util_parser <<-ChangeLog
-commit\ ee1e690a2df901adb279d7a63fbd92c64e0a5ae6
-  Author:     Igor Zubkov <igor.zubkov@gmail.com>
-  AuthorDate: 2016-10-25 03:56:11 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2021-01-07 13:40:42 +0900
-
-    We don't need "require 'uri'" after "require 'net/http'".
-
-commit\ 4d0985a7bd8f591dff4b430e288bfd83af782e51
-  Author:     git <svn-admin@ruby-lang.org>
-  AuthorDate: 2021-01-07 10:21:34 +0900
-  Commit:     git <svn-admin@ruby-lang.org>
-  CommitDate: 2021-01-07 10:21:34 +0900
-
-    * 2021-01-07 [ci skip]
-ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, "2021-01-07"),
-      blank_line,
-      log_entry(nil, 'ee1e690a2df901adb279',
-                'Igor Zubkov', 'igor.zubkov@gmail.com',
-                '2016-10-25 03:56:11 +0900',
-                [head(4, %[We don't need "require 'uri'" after "require 'net/http'".])]),
-      log_entry(nil, '4d0985a7bd8f591dff4b',
-                'git', 'svn-admin@ruby-lang.org',
-                '2021-01-07 10:21:34 +0900',
-                [list(:BULLET, item(nil, para("2021-01-07 [ci skip]")))]))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def util_parser(content = '')
-    RDoc::Parser::ChangeLog.new @top_level, content, @options, @stats
-  end
-
-  def log_entry(*a)
-    RDoc::Parser::ChangeLog::Git::LogEntry.new(*a)
-  end
-end
diff --git a/test/mri/rdoc/rdoc_parser_markdown_test.rb b/test/mri/rdoc/rdoc_parser_markdown_test.rb
deleted file mode 100644
index 49da5693d60..00000000000
--- a/test/mri/rdoc/rdoc_parser_markdown_test.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocParserMarkdownTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @RP = RDoc::Parser
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_file
-    assert_kind_of RDoc::Parser::Text, util_parser('')
-  end
-
-  def test_class_can_parse
-    temp_dir do
-      FileUtils.touch 'foo.md'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.md')
-      FileUtils.touch 'foo.md.ja'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.md.ja')
-
-      FileUtils.touch 'foo.markdown'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.markdown')
-      FileUtils.touch 'foo.markdown.ja'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.markdown.ja')
-    end
-  end
-
-  def test_scan
-    parser = util_parser 'it *really* works'
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it _really_ works'))
-    expected.file = @top_level
-
-    parser.scan
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def util_parser(content)
-    RDoc::Parser::Markdown.new @top_level, content, @options, @stats
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_parser_prism_ruby_test.rb b/test/mri/rdoc/rdoc_parser_prism_ruby_test.rb
deleted file mode 100644
index 578123b740a..00000000000
--- a/test/mri/rdoc/rdoc_parser_prism_ruby_test.rb
+++ /dev/null
@@ -1,2165 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-require 'rdoc/parser'
-require 'rdoc/parser/prism_ruby'
-
-module RDocParserPrismTestCases
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    @filename = @tempfile.path
-
-    @top_level = @store.add_file @filename
-
-    @options = RDoc::Options.new
-    @options.quiet = true
-    @options.option_parser = OptionParser.new
-
-    @comment = RDoc::Comment.new '', @top_level
-
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_look_for_directives_in_section
-    util_parser <<~RUBY
-      # :section: new section
-    RUBY
-    section = @top_level.current_section
-    assert_equal 'new section', section.title
-  end
-
-  def test_look_for_directives_in_commented
-    util_parser <<~RUBY
-      # how to make a section:
-      # # :section: new section
-    RUBY
-    section = @top_level.current_section
-    assert_nil   section.title
-  end
-
-  def test_look_for_directives_in_unhandled
-    util_parser <<~RUBY
-      # :unhandled: blah
-    RUBY
-    assert_equal 'blah', @top_level.metadata['unhandled']
-  end
-
-  def test_block_comment
-    util_parser <<~RUBY
-      =begin rdoc
-      foo
-      =end
-      class A
-      =begin
-      bar
-      baz
-      =end
-        def f; end
-      end
-    RUBY
-    klass = @top_level.classes.first
-    meth = klass.method_list.first
-    assert_equal 'foo', klass.comment.text.strip
-    assert_equal "bar\nbaz", meth.comment.text.strip
-  end
-
-  def test_module
-    util_parser <<~RUBY
-      # my module
-      module Foo
-      end
-    RUBY
-    mod = @top_level.modules.first
-    assert_equal 'Foo', mod.full_name
-    assert_equal 'my module', mod.comment.text
-    assert_equal [@top_level], mod.in_files
-  end
-
-  def test_nested_module_with_colon
-    util_parser <<~RUBY
-      module Foo
-        module Bar; end
-        module Bar::Baz1; end
-        module ::Foo
-          module Bar2; end
-        end
-      end
-      module ::Baz; end
-      module Foo::Bar::Baz2
-        module ::Foo2
-          module Bar; end
-        end
-        module Blah; end
-      end
-    RUBY
-    module_names = @store.all_modules.map(&:full_name)
-    expected = %w[
-      Foo Foo::Bar Foo::Bar::Baz1 Foo::Bar2 Baz Foo::Bar::Baz2 Foo2 Foo2::Bar Foo::Bar::Baz2::Blah
-    ]
-    assert_equal expected.sort, module_names.sort
-  end
-
-  def test_class
-    util_parser <<~RUBY
-      # my class
-      class Foo
-      end
-    RUBY
-    klass = @top_level.classes.first
-    assert_equal 'Foo', klass.full_name
-    assert_equal 'my class', klass.comment.text
-    assert_equal [@top_level], klass.in_files
-    assert_equal 2, klass.line
-  end
-
-  def test_nested_class_with_colon
-    util_parser <<~RUBY
-      class Foo
-        class Bar; end
-        class Bar::Baz1; end
-        class ::Foo
-          class Bar2; end
-        end
-      end
-      class ::Baz; end
-      class Foo::Bar::Baz2
-        class ::Foo2
-          class Bar; end
-        end
-        class Blah; end
-      end
-    RUBY
-    class_names = @store.all_classes.map(&:full_name)
-    expected = %w[
-      Foo Foo::Bar Foo::Bar::Baz1 Foo::Bar2 Baz Foo::Bar::Baz2 Foo2 Foo2::Bar Foo::Bar::Baz2::Blah
-    ]
-    assert_equal expected.sort, class_names.sort
-  end
-
-  def test_open_class_with_superclass
-    util_parser <<~RUBY
-      class A; end
-
-      class B < A
-        def m1; end
-      end
-
-      class B < A
-        def m2; end
-      end
-
-      class C < String
-        def m1; end
-      end
-
-      class C < String
-        def m2; end
-      end
-    RUBY
-    classes = @top_level.classes
-    assert_equal 3, classes.size
-    _a, b, c = classes
-    assert_equal 'A', b.superclass.full_name
-    assert_equal 'String', c.superclass
-    assert_equal ['m1', 'm2'], b.method_list.map(&:name)
-    assert_equal ['m1', 'm2'], c.method_list.map(&:name)
-  end
-
-  def test_open_class_with_superclass_specified_later
-    util_parser <<~RUBY
-      # file_2
-      require 'file_1'
-      class A; end
-      class B; end
-      class C; end
-    RUBY
-    _a, b, c = @top_level.classes
-    assert_equal 'Object', b.superclass
-    assert_equal 'Object', c.superclass
-
-    util_parser <<~RUBY
-      # file_1
-      class B < A; end
-      class C < Unknown; end
-    RUBY
-    assert_equal 'A', b.superclass.full_name
-    assert_equal 'Unknown', c.superclass
-  end
-
-  def test_open_class_with_superclass_specified_later_with_object_defined
-    util_parser <<~RUBY
-      # file_2
-      require 'file_1'
-      class Object; end
-      class A; end
-      class B; end
-      class C; end
-    RUBY
-    _object, _a, b, c = @top_level.classes
-    # If Object exists, superclass will be a NormalClass(Object) instead of string "Object"
-    assert_equal 'Object', b.superclass.full_name
-    assert_equal 'Object', c.superclass.full_name
-
-    util_parser <<~RUBY
-      # file_1
-      class B < A; end
-      class C < Unknown; end
-    RUBY
-    assert_equal 'A', b.superclass.full_name
-    assert_equal 'Unknown', c.superclass
-  end
-
-  def test_confusing_superclass
-    util_parser <<~RUBY
-      module A
-        class B; end
-      end
-
-      module A
-        class C1 < A::B; end
-      end
-
-      class A::C2 < A::B; end
-
-      module A::A
-        class B; end
-      end
-
-      module A
-        class C3 < A::B; end
-      end
-
-      class A::C4 < A::B; end
-    RUBY
-    mod = @top_level.modules.first
-    classes = mod.classes
-    assert_equal ['A::B', 'A::C1', 'A::C2', 'A::C3', 'A::C4'], classes.map(&:full_name)
-    assert_equal ['A::B', 'A::B', 'A::A::B', 'A::B'], classes.drop(1).map(&:superclass).map(&:full_name)
-  end
-
-  def test_pseudo_recursive_superclass
-    util_parser <<~RUBY
-      module Foo
-        class Bar
-          class Foo < Bar; end
-          # This class definition is used in OpenSSL::Cipher::Cipher
-          class Bar < Bar; end
-          class Baz < Bar; end
-        end
-      end
-    RUBY
-    foo_klass = @store.find_class_named 'Foo::Bar::Foo'
-    bar_klass = @store.find_class_named 'Foo::Bar::Bar'
-    baz_klass = @store.find_class_named 'Foo::Bar::Baz'
-    assert_equal 'Foo::Bar', foo_klass.superclass.full_name
-    assert_equal 'Foo::Bar', bar_klass.superclass.full_name
-    assert_equal 'Foo::Bar::Bar', baz_klass.superclass.full_name
-  end
-
-  def test_class_module_nodoc
-    util_parser <<~RUBY
-      class Foo # :nodoc:
-      end
-
-      class Bar
-      end # :nodoc:
-
-      class Baz; end
-
-      class Baz::A; end # :nodoc:
-
-      module MFoo # :nodoc:
-      end
-
-      module MBar
-      end # :nodoc:
-
-      module MBaz; end
-
-      module MBaz::M; end; # :nodoc:
-    RUBY
-    documentables = @store.all_classes_and_modules.select(&:document_self)
-    assert_equal ['Baz', 'MBaz'], documentables.map(&:full_name) unless accept_legacy_bug?
-  end
-
-  def test_class_module_stopdoc
-    util_parser <<~RUBY
-      # comment
-      class Foo
-        class A; end
-        # :stopdoc:
-        class B; end
-      end
-
-      # comment
-      module Bar
-        module A; end
-        # :stopdoc:
-        module B; end
-      end
-    RUBY
-    klass = @top_level.classes.first
-    mod = @top_level.modules.first
-    assert_equal 'comment', klass.comment.text.strip
-    assert_equal 'comment', mod.comment.text.strip
-    assert_equal ['Foo::A'], klass.classes.select(&:document_self).map(&:full_name)
-    assert_equal ['Bar::A'], mod.modules.select(&:document_self).map(&:full_name)
-  end
-
-  def test_class_superclass
-    util_parser <<~RUBY
-      class Foo; end
-      class Bar < Foo
-      end
-      class Baz < (any expression)
-      end
-    RUBY
-    assert_equal ['Foo', 'Bar', 'Baz'], @top_level.classes.map(&:full_name)
-    foo, bar, baz = @top_level.classes
-    assert_equal foo, bar.superclass
-    assert_equal '(any expression)', baz.superclass
-  end
-
-  def test_class_new_notnew
-    util_parser <<~RUBY
-      class A
-        def initialize(*args); end
-      end
-
-      class B
-        ##
-        # :args: a, b, c
-        def initialize(*args); end
-      end
-
-      class C
-        def self.initialize(*args); end
-      end
-
-      class D
-        ##
-        # :args: a, b, c
-        def initialize(*args); end # :notnew:
-      end
-
-      class E
-        def initialize(*args); end # :not-new:
-      end
-
-      class F
-        def initialize(*args); end # :not_new:
-      end
-
-      class G
-        def initialize(*args)
-        end # :notnew:
-      end
-    RUBY
-
-    expected = [
-      'new(*args)', 'new(a, b, c)',
-      'initialize(*args)', 'initialize(a, b, c)',
-      'initialize(*args)', 'initialize(*args)',
-      'initialize(*args)'
-    ]
-    arglists = @top_level.classes.map { |c| c.method_list.first.arglists }
-    assert_equal expected, arglists
-  end
-
-  def test_class_mistaken_for_module
-    util_parser <<~RUBY
-      class A::Foo; end
-      class B::Foo; end
-      module C::Bar; end
-      module D::Baz; end
-      class A; end
-      class X < C; end
-    RUBY
-    assert_equal ['A', 'C', 'X'], @top_level.classes.map(&:full_name)
-    assert_equal ['B', 'D'], @top_level.modules.map(&:full_name)
-  end
-
-  def test_parenthesized_cdecl
-    util_parser <<~RUBY
-      module DidYouMean
-        # Not a module, but creates a dummy module for document
-        class << (NameErrorCheckers = Object.new)
-          def new; end
-        end
-      end
-    RUBY
-
-    mod = @store.find_class_or_module('DidYouMean').modules.first
-    assert_equal 'DidYouMean::NameErrorCheckers', mod.full_name
-    assert_equal ['DidYouMean::NameErrorCheckers::new'], mod.method_list.map(&:full_name)
-  end
-
-  def test_ghost_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # :method: one
-        #
-        # my method one
-
-        ##
-        # :method:
-        # :call-seq:
-        #   two(name)
-        #
-        # my method two
-
-        ##
-        # :method: three
-        # :args: a, b
-        #
-        # my method three
-
-        # :stopdoc:
-
-        ##
-        # :method: hidden1
-        #
-        # comment
-
-        ##
-        # :method:
-        # :call-seq:
-        #   hidden2(name)
-        #
-        # comment
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal 3, klass.method_list.size
-    one, two, three = klass.method_list
-    assert_equal 'Foo#one', one.full_name
-    assert_equal 'Foo#two', two.full_name
-    assert_equal 'Foo#three', three.full_name
-    assert_equal 'two(name)', two.call_seq.chomp
-    assert_equal 'three(a, b)', three.arglists
-    assert_equal 'my method one', one.comment.text.strip
-    assert_equal 'my method two', two.comment.text.strip
-    assert_equal 'my method three', three.comment.text.strip
-    assert_equal 3, one.line
-    assert_equal 8, two.line
-    assert_equal 15, three.line
-    assert_equal @top_level, one.file
-    assert_equal @top_level, two.file
-    assert_equal @top_level, three.file
-  end
-
-  def test_invalid_meta_method
-    util_parser <<~RUBY
-      class Foo
-        # These are invalid meta method comments
-        # because meta method comment should start with `##`
-        # but rdoc accepts them as meta method comments for now.
-
-        # :method: m1
-
-        # :singleton-method: sm1
-
-        # :attr: a1
-
-        # :attr_reader: ar1
-
-        # :attr_writer: aw1
-
-        # :attr_accessor: arw1
-
-        # If there is a node following meta-like normal comment, it is not a meta method comment
-
-        # :method: m2
-        add_my_method(name)
-
-        # :singleton-method: sm2
-        add_my_singleton_method(name)
-
-        # :method:
-        add_my_method(:m3)
-
-        # :singleton-method:
-        add_my_singleton_method(:sm3)
-
-        # :attr:
-        add_my_attribute(:a2)
-
-        # :attr-reader:
-        add_my_attribute(:ar2)
-
-        # :attr-writer:
-        add_my_attribute(:aw2)
-
-        # :attr-accessor:
-        add_my_attribute(:arw2)
-
-        # :attr: a3
-        add_my_attribute_a3
-
-        # :attr-reader: ar3
-        add_my_attribute_ar3
-
-        # :attr-writer: aw3
-        add_my_attribute_aw2
-
-        # :attr-accessor: arw3
-        add_my_attribute_arw3
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['m1', 'sm1'], klass.method_list.map(&:name)
-    assert_equal ['a1', 'ar1', 'aw1', 'arw1'], klass.attributes.map(&:name)
-  end
-
-  def test_unknown_meta_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # :call-seq:
-        #   two(name)
-        #
-        # method or singleton-method directive is missing
-      end
-
-      class Bar
-        ##
-        # unknown meta method
-        add_my_method("foo" + "bar")
-      end
-    RUBY
-
-    foo = @store.find_class_named 'Foo'
-    bar = @store.find_class_named 'Bar'
-    assert_equal [], foo.method_list.map(&:name)
-    assert_equal ['unknown'], bar.method_list.map(&:name)
-  end
-
-  def test_method
-    util_parser <<~RUBY
-      class Foo
-        # my method one
-        def one; end
-        # my method two
-        def two(x); end
-        # my method three
-        def three x; end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal 3, klass.method_list.size
-    one, two, three = klass.method_list
-    assert_equal 'Foo#one', one.full_name
-    assert_equal 'Foo#two', two.full_name
-    assert_equal 'Foo#three', three.full_name
-    assert_equal 'one()', one.arglists
-    assert_equal 'two(x)', two.arglists
-    assert_equal 'three(x)', three.arglists unless accept_legacy_bug?
-    assert_equal 'my method one', one.comment.text.strip
-    assert_equal 'my method two', two.comment.text.strip
-    assert_equal 'my method three', three.comment.text.strip
-    assert_equal 3, one.line
-    assert_equal 5, two.line
-    assert_equal 7, three.line
-    assert_equal @top_level, one.file
-    assert_equal @top_level, two.file
-    assert_equal @top_level, three.file
-  end
-
-  def test_method_with_modifier_if_unless
-    util_parser <<~RUBY
-      class Foo
-        # my method one
-        def one
-        end if foo
-
-        # my method two
-        def two
-        end unless foo
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    one, two = klass.method_list
-    assert_equal 'Foo#one', one.full_name
-    assert_equal 'my method one', one.comment.text.strip
-    assert_equal 'Foo#two', two.full_name
-    assert_equal 'my method two', two.comment.text.strip
-  end
-
-  def test_method_toplevel
-    util_parser <<~RUBY
-      # comment
-      def foo; end
-    RUBY
-
-    object = @store.find_class_named 'Object'
-    foo = object.method_list.first
-    assert_equal 'Object#foo', foo.full_name
-    assert_equal 'comment', foo.comment.text.strip
-    assert_equal @top_level, foo.file
-  end
-
-  def test_meta_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # my method
-        add_my_method :method_foo, :arg
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal 1, klass.method_list.size
-    method = klass.method_list.first
-    assert_equal 'Foo#method_foo', method.full_name
-    assert_equal 'my method', method.comment.text.strip
-    assert_equal 4, method.line
-    assert_equal @top_level, method.file
-  end
-
-  def test_first_comment_is_not_a_meta_method
-    util_parser <<~RUBY
-      ##
-      # first comment is not a meta method
-      add_my_method :foo
-
-      ##
-      # this is a meta method
-      add_my_method :bar
-    RUBY
-
-    object = @store.find_class_named 'Object'
-    assert_equal ['bar'], object.method_list.map(&:name)
-  end
-
-  def test_meta_method_unknown
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # my method
-        add_my_method (:foo), :bar
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal 1, klass.method_list.size
-    method = klass.method_list.first
-    assert_equal 'Foo#unknown', method.full_name
-    assert_equal 'my method', method.comment.text.strip
-    assert_equal 4, method.line
-    assert_equal @top_level, method.file
-  end
-
-  def test_meta_define_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # comment 1
-        define_method :foo do end
-        ##
-        # comment 2
-        define_method :bar, ->{}
-        # not a meta comment, not a meta method
-        define_method :ignored do end
-        class << self
-          ##
-          # comment 3
-          define_method :baz do end
-        end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    klass.method_list.last.singleton = true if accept_legacy_bug?
-    assert_equal 3, klass.method_list.size
-    assert_equal ['Foo#foo', 'Foo#bar', 'Foo::baz'], klass.method_list.map(&:full_name)
-    assert_equal [false, false, true], klass.method_list.map(&:singleton)
-    assert_equal ['comment 1', 'comment 2', 'comment 3'], klass.method_list.map { |m| m.comment.text.strip }
-    assert_equal [4, 7, 13], klass.method_list.map(&:line)
-    assert_equal [@top_level] * 3, klass.method_list.map(&:file)
-  end
-
-  def test_method_definition_nested_inside_block
-    util_parser <<~RUBY
-      module A
-        extend ActiveSupport::Concern
-        included do
-          ##
-          # :singleton-method:
-          # comment foo
-          mattr_accessor :foo
-
-          ##
-          # :method: bar
-          # comment bar
-          add_my_method :bar
-        end
-
-        metaprogramming do
-          # class that defines this method is unknown
-          def baz1; end
-        end
-
-        my_decorator def self.baz2; end
-
-        self.my_decorator def baz3; end
-      end
-    RUBY
-    mod = @store.find_module_named 'A'
-    methods = mod.method_list
-    unless accept_legacy_bug?
-      assert_equal ['A::foo', 'A#bar', 'A::baz2', 'A#baz3'], methods.map(&:full_name)
-    end
-    assert_equal ['comment foo', 'comment bar'], methods.take(2).map { |m| m.comment.text.strip }
-  end
-
-  def test_method_yields_directive
-    util_parser <<~RUBY
-      class Foo
-        def f1(a, &b); end
-
-        def f2
-          def o.foo
-            yield :dummy
-          end
-          yield
-        end
-
-        def f3(&b)
-          yield a, *b, c: 1
-          yield 1, 2, 3
-        end
-
-        def f4(a, &b) # :yields: d, e
-          yields 1, 2
-        end
-
-        def f5 # :yield: f
-          yields 1, 2
-        end
-
-        def f6; end # :yields:
-
-        ##
-        # :yields: g, h
-        add_my_method :f7
-      end
-    RUBY
-
-    klass = @top_level.classes.first
-    methods = klass.method_list
-    expected = [
-      'f1(a, &b)',
-      'f2() { || ... }',
-      'f3() { |a, *b, c: 1| ... }',
-      'f4(a) { |d, e| ... }',
-      'f5() { |f| ... }',
-      'f6() { || ... }',
-      'f7() { |g, h| ... }'
-    ]
-    assert_equal expected, methods.map(&:arglists)
-  end
-
-  def test_calls_super
-    util_parser <<~RUBY
-      class A
-        def m1; foo; bar; end
-        def m2; if cond; super(a); end; end # SuperNode
-        def m3; tap do; super; end; end # ForwardingSuperNode
-        def m4; def a.b; super; end; end # super inside another method
-      end
-    RUBY
-
-    klass = @store.find_class_named 'A'
-    methods = klass.method_list
-    assert_equal ['m1', 'm2', 'm3', 'm4'], methods.map(&:name)
-    assert_equal [false, true, true, false], methods.map(&:calls_super)
-  end
-
-  def test_method_args_directive
-    util_parser <<~RUBY
-      class Foo
-        def method1 # :args: a, b, c
-        end
-
-        ##
-        # :args: d, e, f
-        def method2(*args); end
-
-        ##
-        # :args: g, h
-        add_my_method :method3
-      end
-    RUBY
-
-    klass = @top_level.classes.first
-    methods = klass.method_list
-    assert_equal ['method1(a, b, c)', 'method2(d, e, f)', 'method3(g, h)'], methods.map(&:arglists)
-  end
-
-  def test_class_repeatedly
-    util_parser <<~RUBY
-      class Foo
-        def foo; end
-      end
-      class Foo
-        def bar; end
-      end
-    RUBY
-    util_parser <<~RUBY
-      class Foo
-        def baz; end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['Foo#foo', 'Foo#bar', 'Foo#baz'], klass.method_list.map(&:full_name)
-  end
-
-  def test_undefined_singleton_class_defines_module
-    util_parser <<~RUBY
-      module A
-        class << Foo
-        end
-        class << ::Bar
-        end
-        Baz1 = ''
-        class << Baz1
-        end
-        class << Baz2 # :nodoc:
-        end
-      end
-    RUBY
-
-    modules = @store.all_modules
-    modules = modules.take(3) if accept_legacy_bug?
-    assert_equal ['A', 'A::Foo', 'Bar'], modules.map(&:full_name)
-  end
-
-  def test_singleton_class
-    util_parser <<~RUBY
-      class A; end
-      class Foo
-        def self.m1; end
-        def (any expression).dummy1; end
-        class << self
-          def m2; end
-          def self.dummy2; end
-        end
-        class << A
-          def dummy3; end
-        end
-        class << Foo
-          def m3; end
-          def self.dummy4; end
-        end
-        class << ::Foo
-          def m4; end
-        end
-        class << (any expression)
-          def dummy5; end
-        end
-      end
-      class << Foo
-        def m5; end
-      end
-      class << ::Foo
-        def m6; end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    methods = klass.method_list
-    methods = methods.reject {|m| m.name =~ /dummy2|dummy4/ } if accept_legacy_bug?
-    assert_equal ['m1', 'm2', 'm3', 'm4', 'm5', 'm6'], methods.map(&:name)
-    assert_equal [true] * 6, methods.map(&:singleton)
-  end
-
-  def test_singleton_class_meta_method
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # :singleton-method: m1
-
-        ##
-        # :singleton-method:
-        add_my_smethod :m2, :arg
-
-        ##
-        # :singleton-method:
-        add_my_smethod 'm3', :arg
-
-        # comment
-        class << self
-          ##
-          # method of a singleton class is a singleton method
-          # :method: m4
-
-          ##
-          # :singleton-method: m5
-        end
-      end
-    RUBY
-
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['m1', 'm2', 'm3', 'm4', 'm5'], klass.method_list.map(&:name)
-    klass.method_list[3].singleton = true if accept_legacy_bug?
-    assert_equal [true] * 5, klass.method_list.map(&:singleton)
-  end
-
-  def test_method_nested_visibility
-    util_parser <<~RUBY
-      class A
-        def pub1; end
-        private
-        def pri1; end
-        class B
-          def pub_b1; end
-          private
-          def pri_b1; end
-          public
-          def pub_b2; end
-        end
-        def pri2; end
-      end
-      class A
-        def pub2; end
-        private
-        def pri2; end
-      end
-    RUBY
-    klass_a = @store.find_class_named 'A'
-    klass_b = klass_a.find_class_named 'B'
-    public_a = klass_a.method_list.select { |m| m.visibility == :public }.map(&:name)
-    public_b = klass_b.method_list.select { |m| m.visibility == :public }.map(&:name)
-    assert_equal ['pub1', 'pub2'], public_a
-    assert_equal ['pub_b1', 'pub_b2'], public_b
-  end
-
-  def test_attributes_visibility
-    util_parser <<~RUBY
-      class A
-        attr :pub_a
-        attr_reader :pub_r
-        attr_writer :pub_w
-        attr_accessor :pub_rw
-        private
-        attr :pri_a
-        attr_reader :pri_r
-        attr_writer :pri_w
-        attr_accessor :pri_rw
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    assert_equal ['pub_a', 'pub_r', 'pub_w', 'pub_rw', 'pri_a', 'pri_r', 'pri_w', 'pri_rw'], klass.attributes.map(&:name)
-    assert_equal [:public] * 4 + [:private] * 4, klass.attributes.map(&:visibility)
-  end
-
-  def test_method_singleton_class_visibility
-    util_parser <<~RUBY
-      class A
-        def self.pub1; end
-        private
-        def self.pub2; end
-        class << self
-          def pub3; end
-          private
-          def pri1; end
-          public
-          def pub4; end
-          private
-        end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    public_singleton_methods = klass.method_list.select { |m| m.singleton && m.visibility == :public }
-    assert_equal ['pub1', 'pub2', 'pub3', 'pub4'], public_singleton_methods.map(&:name)
-  end
-
-  def test_private_def_public_def
-    util_parser <<~RUBY
-      class A
-        private def m1; end
-        public def m2; end
-        private
-        public def m3; end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    public_methods = klass.method_list.select { |m| m.visibility == :public }
-    assert_equal ['m2', 'm3'], public_methods.map(&:name)
-  end
-
-  def test_define_method_visibility
-    util_parser <<~RUBY
-      class A
-        private
-        ##
-        # my private method
-        define_method :m1 do end
-        public
-        ##
-        # my public method
-        define_method :m2 do end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    methods = klass.method_list
-    assert_equal ['m1', 'm2'], methods.map(&:name)
-    assert_equal [:private, :public], methods.map(&:visibility)
-  end
-
-  def test_module_function
-    util_parser <<~RUBY
-      module A
-        def m1; end
-        def m2; end
-        def m3; end
-        module_function :m1, :m3
-        module_function def m4; end
-      end
-    RUBY
-    mod = @store.find_module_named 'A'
-    instance_methods = mod.method_list.reject(&:singleton)
-    singleton_methods = mod.method_list.select(&:singleton)
-    if accept_legacy_bug?
-      instance_methods.last.visibility = :private
-      singleton_methods << singleton_methods.last.dup
-      singleton_methods.last.name = 'm4'
-    end
-    assert_equal ['m1', 'm2', 'm3', 'm4'], instance_methods.map(&:name)
-    assert_equal [:private, :public, :private, :private], instance_methods.map(&:visibility)
-    assert_equal ['m1', 'm3', 'm4'], singleton_methods.map(&:name)
-    assert_equal [:public, :public, :public], singleton_methods.map(&:visibility)
-  end
-
-  def test_class_method_visibility
-    util_parser <<~RUBY
-      class A
-        def self.m1; end
-        def self.m2; end
-        def self.m3; end
-        private_class_method :m1, :m2
-        public_class_method :m1, :m3
-        private_class_method def self.m4; end
-        public_class_method def self.m5; end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    public_methods = klass.method_list.select { |m| m.visibility == :public }
-    assert_equal ['m1', 'm3', 'm5'], public_methods.map(&:name) unless accept_legacy_bug?
-  end
-
-  def test_method_change_visibility
-    util_parser <<~RUBY
-      class A
-        def m1; end
-        def m2; end
-        def m3; end
-        def m4; end
-        def m5; end
-        private :m2, :m3, :m4
-        public :m1, :m3
-      end
-      class << A
-        def m1; end
-        def m2; end
-        def m3; end
-        def m4; end
-        def m5; end
-        private :m1, :m2, :m3
-        public :m2, :m4
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    public_methods = klass.method_list.select { |m| !m.singleton && m.visibility == :public }
-    public_singleton_methods = klass.method_list.select { |m| m.singleton && m.visibility == :public }
-    assert_equal ['m1', 'm3', 'm5'], public_methods.map(&:name)
-    assert_equal ['m2', 'm4', 'm5'], public_singleton_methods.map(&:name)
-  end
-
-  def test_undocumentable_change_visibility
-    omit if accept_legacy_bug?
-    util_parser <<~RUBY
-      class A
-        def m1; end
-        def self.m2; end
-        private 42, :m # maybe not Module#private
-        # ignore all non-standard `private def` and `private_class_method def`
-        private def self.m1; end
-        private_class_method def m2; end
-        private def to_s.m1; end
-        private_class_method def to_s.m2; end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    assert_equal [:public] * 4, klass.method_list.map(&:visibility)
-  end
-
-  def test_singleton_class_def_with_visibility
-    util_parser <<~RUBY
-      class A
-        class <<self
-          private def m1; end
-        end
-        private def self.m2; end
-      end
-      class <<A
-        private def m3; end
-      end
-    RUBY
-    klass = @store.find_class_named 'A'
-    assert_equal [true, true, true], klass.method_list.map(&:singleton)
-    assert_equal [:private, :public, :private], klass.method_list.map(&:visibility)
-  end
-
-  def test_method_visibility_change_in_subclass
-    omit 'not implemented' if accept_legacy_bug?
-    util_parser <<~RUBY
-      class A
-        def m1; end
-        def m2; end
-        private :m2
-      end
-      class B < A
-        private :m1
-        public :m2
-      end
-    RUBY
-
-    superclass = @store.find_class_named('A')
-    klass = @store.find_class_named('B')
-    assert_equal ['m1', 'm2'], superclass.method_list.map(&:name)
-    assert_equal ['m1', 'm2'], klass.method_list.map(&:name)
-    assert_equal [:public, :private], superclass.method_list.map(&:visibility)
-    assert_equal [:private, :public], klass.method_list.map(&:visibility)
-  end
-
-  def test_singleton_method_visibility_change_in_subclass
-    util_parser <<~RUBY
-      class A
-        def self.m1; end
-        def self.m2; end
-        private_class_method :m2
-      end
-      class B < A
-        private_class_method :m1
-        public_class_method :m2
-      end
-    RUBY
-
-    superclass = @store.find_class_named('A')
-    klass = @store.find_class_named('B')
-    assert_equal ['m1', 'm2'], superclass.method_list.map(&:name)
-    assert_equal ['m1', 'm2'], klass.method_list.map(&:name)
-    assert_equal [:public, :private], superclass.method_list.map(&:visibility)
-    assert_equal [:private, :public], klass.method_list.map(&:visibility)
-  end
-
-  def test_alias
-    util_parser <<~RUBY
-      class Foo
-        def bar; end
-        def bar2; alias :dummy :bar; end
-        # comment
-        alias :baz1 :bar # :nodoc:
-        alias :baz2 :bar
-        # :stopdoc:
-        alias :baz3 :bar
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['Foo#bar', 'Foo#bar2', 'Foo#baz2'], klass.method_list.map(&:full_name)
-    m = klass.method_list.last
-    assert_equal 'Foo#bar', m.is_alias_for.full_name
-    assert_equal 'Foo#baz2', m.full_name
-    assert_equal klass, m.parent
-  end
-
-  def test_alias_singleton
-    util_parser <<~RUBY
-      class Foo
-        class << self
-          def bar; end
-          # comment
-          alias :baz :bar
-          # :stopdoc:
-          alias :baz2 :bar
-        end
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    m = klass.class_method_list.last
-    assert_equal 'Foo::bar', m.is_alias_for.full_name
-    assert_equal 'Foo::baz', m.full_name
-    assert_equal 'comment', m.comment.text
-    assert_equal klass, m.parent
-  end
-
-  def test_alias_method
-    util_parser <<~RUBY
-      class Foo
-        def foo; end
-        private
-        alias_method :foo2, :foo
-        def bar; end
-        public
-        alias_method :bar2, :bar
-        private :foo
-        public :bar
-      end
-    RUBY
-    foo, foo2, bar, bar2 = @top_level.classes.first.method_list
-    assert_equal 'foo', foo.name
-    assert_equal 'bar', bar.name
-    assert_equal 'foo2', foo2.name
-    assert_equal 'bar2', bar2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-    assert_equal 'bar', bar2.is_alias_for.name
-    unless accept_legacy_bug?
-      assert_equal :private, foo.visibility
-      assert_equal :public, foo2.visibility
-      assert_equal :public, bar.visibility
-      assert_equal :private, bar2.visibility
-    end
-  end
-
-  def test_invalid_alias_method
-    omit if accept_legacy_bug?
-    util_parser <<~RUBY
-      class Foo
-        def foo; end
-        alias_method
-        alias_method :foo
-        alias_method :foo, :bar, :baz
-        alias_method 42, :foo
-      end
-    RUBY
-    assert_equal ['foo'], @top_level.classes.first.method_list.map(&:name)
-  end
-
-  def test_alias_method_stopdoc_nodoc
-    util_parser <<~RUBY
-      class Foo
-        def foo; end
-        # :stopdoc:
-        alias_method :foo2, :foo
-        # :startdoc:
-        alias_method :foo3, :foo # :nodoc:
-        alias_method :foo4, :foo
-      end
-    RUBY
-    assert_equal ['foo', 'foo4'], @top_level.classes.first.method_list.map(&:name)
-  end
-
-  def test_attributes
-    util_parser <<~RUBY
-      class Foo
-        # attrs
-        attr :attr1, :attr2
-        # readers
-        attr_reader :reader1, :reader2
-        # writers
-        attr_writer :writer1, :writer2
-        # accessors
-        attr_accessor :accessor1, :accessor2
-        # :stopdoc:
-        attr :attr3, :attr4
-        attr_reader :reader3, :reader4
-        attr_writer :write3, :writer4
-        attr_accessor :accessor3, :accessor4
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    if accept_legacy_bug?
-      a, r1, r2, w1, w2, rw1, rw2 = klass.attributes
-      a1 = a.dup
-      a2 = a.dup
-      a1.rw = a2.rw = 'R'
-      a2.name = 'attr2'
-    else
-      assert_equal 8, klass.attributes.size
-      a1, a2, r1, r2, w1, w2, rw1, rw2 = klass.attributes
-    end
-    assert_equal ['attr1', 'attr2'], [a1.name, a2.name]
-    assert_equal ['reader1', 'reader2'], [r1.name, r2.name]
-    assert_equal ['writer1', 'writer2'], [w1.name, w2.name]
-    assert_equal ['accessor1', 'accessor2'], [rw1.name, rw2.name]
-    assert_equal ['R', 'R'], [a1.rw, a2.rw]
-    assert_equal ['R', 'R'], [r1.rw, r2.rw]
-    assert_equal ['W', 'W'], [w1.rw, w2.rw]
-    assert_equal ['RW', 'RW'], [rw1.rw, rw2.rw]
-    assert_equal ['attrs', 'attrs'], [a1.comment.text, a2.comment.text]
-    assert_equal ['readers', 'readers'], [r1.comment.text, r2.comment.text]
-    assert_equal ['writers', 'writers'], [w1.comment.text, w2.comment.text]
-    assert_equal ['accessors', 'accessors'], [rw1.comment.text, rw2.comment.text]
-    assert_equal [3, 3], [a1.line, a2.line]
-    assert_equal [5, 5], [r1.line, r2.line]
-    assert_equal [7, 7], [w1.line, w2.line]
-    assert_equal [9, 9], [rw1.line, rw2.line]
-    assert_equal [@top_level] * 8, [a1, a2, r1, r2, w1, w2, rw1, rw2].map(&:file)
-  end
-
-  def test_undocumentable_attributes
-    util_parser <<~RUBY
-      class Foo
-        attr
-        attr 42, :foo
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_empty klass.method_list
-    assert_empty klass.attributes
-  end
-
-  def test_singleton_class_attributes
-    util_parser <<~RUBY
-      class Foo
-        class << self
-          attr :a
-          attr_reader :r
-          attr_writer :w
-          attr_accessor :rw
-        end
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    attributes = klass.attributes
-    assert_equal ['a', 'r', 'w', 'rw'], attributes.map(&:name)
-    assert_equal [true] * 4, attributes.map(&:singleton)
-  end
-
-  def test_attributes_nodoc
-    util_parser <<~RUBY
-      class Foo
-        attr :attr1, :attr2 # :nodoc:
-        attr :attr3
-        attr_reader :reader1, :reader2 # :nodoc:
-        attr_reader :reader3
-        attr_writer :writer1, :writer2 # :nodoc:
-        attr_writer :writer3
-        attr_accessor :accessor1, :accessor2 # :nodoc:
-        attr_accessor :accessor3
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    unless accept_legacy_bug?
-      assert_equal 4, klass.attributes.size
-    end
-  end
-
-  def test_attributes_nodoc_track
-    @options.visibility = :nodoc
-    util_parser <<~RUBY
-      class Foo
-        attr :attr1, :attr2 # :nodoc:
-        attr :attr3
-        attr_reader :reader1, :reader2 # :nodoc:
-        attr_reader :reader3
-        attr_writer :writer1, :writer2 # :nodoc:
-        attr_writer :writer3
-        attr_accessor :accessor1, :accessor2 # :nodoc:
-        attr_accessor :accessor3
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    unless accept_legacy_bug?
-      assert_equal 12, klass.attributes.size
-    end
-  end
-
-  def test_method_nodoc_stopdoc
-    util_parser <<~RUBY
-      class Foo
-        def doc1; end
-        def nodoc1; end # :nodoc:
-        def doc2; end
-        def nodoc2 # :nodoc:
-        end
-        def doc3; end
-        def nodoc3
-        end # :nodoc:
-        def nodoc4(arg1,
-                   arg2) # :nodoc:
-        end
-        def doc4; end
-        # :stopdoc:
-        def nodoc5; end
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['doc1', 'doc2', 'doc3', 'doc4'], klass.method_list.map(&:name)
-  end
-
-  def test_method_nodoc_track
-    @options.visibility = :nodoc
-    util_parser <<~RUBY
-      class Foo
-        def doc1; end
-        def nodoc1; end # :nodoc:
-        def doc2; end
-        def nodoc2 # :nodoc:
-        end
-        def doc3; end
-        def nodoc3
-        end # :nodoc:
-        def doc4; end
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal ['doc1', 'nodoc1', 'doc2', 'nodoc2', 'doc3', 'nodoc3', 'doc4'], klass.method_list.map(&:name)
-    assert_equal [true, nil, true, nil, true, nil, true], klass.method_list.map(&:document_self)
-  end
-
-  def test_meta_attributes
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # :attr:
-        # attrs
-        add_my_method :attr1, :attr2
-        ##
-        # :attr_reader:
-        # readers
-        add_my_method :reader1, :reader2
-        ##
-        # :attr_writer:
-        # writers
-        add_my_method :writer1, :writer2
-        ##
-        # :attr_accessor:
-        # accessors
-        add_my_method :accessor1, :accessor2
-
-        # :stopdoc:
-
-        ##
-        # :attr:
-        add_my_method :attr3
-        ##
-        # :attr_reader:
-        add_my_method :reader3
-        ##
-        # :attr_writer:
-        add_my_method :writer3
-        ##
-        # :attr_accessor:
-        add_my_method :accessor3
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal 8, klass.attributes.size
-    a1, a2, r1, r2, w1, w2, rw1, rw2 = klass.attributes
-    assert_equal ['attr1', 'attr2'], [a1.name, a2.name]
-    assert_equal ['reader1', 'reader2'], [r1.name, r2.name]
-    assert_equal ['writer1', 'writer2'], [w1.name, w2.name]
-    assert_equal ['accessor1', 'accessor2'], [rw1.name, rw2.name]
-    a1.rw = a2.rw = 'R' if accept_legacy_bug?
-    assert_equal ['R', 'R'], [a1.rw, a2.rw]
-    assert_equal ['R', 'R'], [r1.rw, r2.rw]
-    assert_equal ['W', 'W'], [w1.rw, w2.rw]
-    assert_equal ['RW', 'RW'], [rw1.rw, rw2.rw]
-    assert_equal ['attrs', 'attrs'], [a1.comment.text, a2.comment.text]
-    assert_equal ['readers', 'readers'], [r1.comment.text, r2.comment.text]
-    assert_equal ['writers', 'writers'], [w1.comment.text, w2.comment.text]
-    assert_equal ['accessors', 'accessors'], [rw1.comment.text, rw2.comment.text]
-    assert_equal [@top_level] * 8, [a1, a2, r1, r2, w1, w2, rw1, rw2].map(&:file)
-  end
-
-  def test_meta_attributes_named
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # comment a
-        # :attr: attr1
-        add_my_method :a1
-        ##
-        # comment r
-        # :attr_reader: reader1
-        add_my_method :r1
-        ##
-        # comment w
-        # :attr_writer: writer1
-        add_my_method :w1
-        ##
-        # comment rw
-        # :attr_accessor: accessor1
-        add_my_method :rw1
-
-        # :stopdoc:
-
-        ##
-        # :attr: attr2
-        add_my_method :a2
-        ##
-        # :attr_reader: reader2
-        add_my_method :r2
-        ##
-        # :attr_writer: writer2
-        add_my_method :w2
-        ##
-        # :attr_accessor: accessor2
-        add_my_method :rw2
-      end
-    RUBY
-    klass = @store.find_class_named 'Foo'
-    assert_equal 4, klass.attributes.size
-    a, r, w, rw = klass.attributes
-    assert_equal 'attr1', a.name
-    assert_equal 'reader1', r.name
-    assert_equal 'writer1', w.name
-    assert_equal 'accessor1', rw.name
-    a.rw = 'R' if accept_legacy_bug?
-    assert_equal 'R', a.rw
-    assert_equal 'R', r.rw
-    assert_equal 'W', w.rw
-    assert_equal 'RW', rw.rw
-    assert_equal 'comment a', a.comment.text
-    assert_equal 'comment r', r.comment.text
-    assert_equal 'comment w', w.comment.text
-    assert_equal 'comment rw', rw.comment.text
-    assert_equal [@top_level] * 4, [a, r, w, rw].map(&:file)
-  end
-
-  def test_constant
-    util_parser <<~RUBY
-      class Foo
-        A = (any expression 1)
-        def f
-          DUMMY1 = (any expression 2)
-        end
-        class Bar; end
-        Bar::B = (any expression 3)
-        ::C = (any expression 4)
-        # :stopdoc:
-        DUMMY2 = 1
-        # :startdoc:
-        D = (any expression 5)
-        E = (any expression 6) # :nodoc:
-        F = (
-          any expression 7
-        ) # :nodoc:
-      end
-      G = (any expression 8)
-    RUBY
-    foo = @top_level.classes.first
-    bar = foo.classes.first
-    object = @top_level.find_class_or_module('Object')
-    assert_equal ['A', 'D', 'E', 'F'], foo.constants.map(&:name) unless accept_legacy_bug?
-    assert_equal '(any expression 1)', foo.constants.first.value
-    assert_equal ['B'], bar.constants.map(&:name)
-    assert_equal ['C', 'G'], object.constants.map(&:name) unless accept_legacy_bug?
-    all_constants = foo.constants + bar.constants + object.constants
-    assert_equal [@top_level] * 7, all_constants.map(&:file) unless accept_legacy_bug?
-    assert_equal [2, 12, 13, 14, 7, 8, 18], all_constants.map(&:line) unless accept_legacy_bug?
-  end
-
-  def test_nodoc_constant_assigned_without_nodoc_comment
-    util_parser <<~RUBY
-      module Foo
-        A = 1
-        B = 1 # :nodoc:
-        begin
-          C = 1 # :nodoc:
-        rescue
-          C = 2
-        end
-      end
-      Foo::B = 2
-      Foo::D = 2
-    RUBY
-    mod = @top_level.modules.first
-    assert_equal ['A', 'B', 'C', 'D'], mod.constants.map(&:name)
-    assert_equal [false, true, true, false], mod.constants.map(&:received_nodoc)
-  end
-
-  def test_constant_visibility
-    util_parser <<~RUBY
-      class C
-        A = 1
-        B = 2
-        C = 3
-        private_constant
-        private_constant foo
-        private_constant :A
-        private_constant :B, :C
-        public_constant :B
-      end
-    RUBY
-    klass = @store.find_class_named 'C'
-    const_a, const_b, const_c = klass.constants.sort_by(&:name)
-
-    assert_equal 'A', const_a.name
-    assert_equal :private, const_a.visibility
-
-    assert_equal 'B', const_b.name
-    assert_equal :public, const_b.visibility
-
-    assert_equal 'C', const_c.name
-    assert_equal :private, const_c.visibility
-  end
-
-  def test_constant_assignment_to_undefined_module_path
-    util_parser <<~RUBY
-      A::B::C = 1
-    RUBY
-    a = @top_level.find_module_named 'A'
-    b = a.find_module_named 'B'
-    c = b.constants.first
-    assert_equal 'A::B::C', c.full_name
-  end
-
-  def test_constant_alias
-    util_parser <<~RUBY
-      class Foo
-        class Bar; end
-        A = Bar
-        # B = ::Foo # master branch has bug
-        C = Foo::Bar
-      end
-    RUBY
-    klass = @top_level.classes.first
-    assert_equal [], klass.modules.map(&:full_name)
-    assert_equal ['Foo::Bar', 'Foo::A', 'Foo::C'], klass.classes.map(&:full_name)
-    assert_equal ['Foo::A', 'Foo::C'], klass.constants.map(&:full_name)
-    assert_equal 'Foo::A', klass.find_module_named('A').full_name
-    assert_equal 'Foo::C', klass.find_module_named('C').full_name
-  end
-
-  def test_constant_with_singleton_class
-    omit if accept_legacy_bug?
-    util_parser <<~RUBY
-      class Foo
-        class Bar; end
-        A = 1
-        class <<Bar
-          B = 1
-          Foo::Bar::B2 = 1
-        end
-        class Bar
-          C = 1
-        end
-        class <<(p(D = 1))
-          E = 1
-        end
-        class (F = 1)::Baz
-          G = 1
-        end
-        module (H = 1)::Baz
-          I = 1
-        end
-      end
-      J = 1
-    RUBY
-    foo, bar = @store.all_classes
-    assert_equal ['J'], @store.find_class_named('Object').constants.map(&:name)
-    assert_equal ['A', 'D', 'F', 'H'], foo.constants.map(&:name)
-    assert_equal ['B2', 'C'], bar.constants.map(&:name)
-  end
-
-  def test_constant_method
-    util_parser <<~RUBY
-      def Object.foo; end
-      class A
-        class B
-          class C
-            def B.bar; end
-          end
-        end
-      end
-      def UNKNOWN.baz; end
-    RUBY
-
-    object = @store.find_class_named 'Object'
-    klass = @store.find_class_named 'A::B'
-    unknown = @store.find_module_named('UNKNOWN')
-    assert_equal 'Object::foo', object.method_list.first.full_name
-    assert_equal 'A::B::bar', klass.method_list.first.full_name
-    assert_equal 'UNKNOWN::baz', unknown.method_list.first.full_name
-  end
-
-  def test_true_false_nil_method
-    util_parser <<~RUBY
-      def nil.foo; end
-      def true.bar; end
-      def false.baz; end
-    RUBY
-    sep = accept_legacy_bug? ? '::' : '#'
-    assert_equal "NilClass#{sep}foo", @store.find_class_named('NilClass').method_list.first.full_name
-    assert_equal "TrueClass#{sep}bar", @store.find_class_named('TrueClass').method_list.first.full_name
-    assert_equal "FalseClass#{sep}baz", @store.find_class_named('FalseClass').method_list.first.full_name
-  end
-
-  def test_include_extend
-    util_parser <<~RUBY
-      module I; end
-      module E; end
-      class C
-        # my include
-        include I
-        # my extend
-        extend E
-      end
-      module M
-        include I
-        extend E
-      end
-    RUBY
-    klass = @store.find_class_named 'C'
-    mod = @store.find_module_named 'M'
-    assert_equal ['I'], klass.includes.map(&:name)
-    assert_equal ['E'], klass.extends.map(&:name)
-    assert_equal ['I'], mod.includes.map(&:name)
-    assert_equal ['E'], mod.extends.map(&:name)
-    assert_equal 'my include', klass.includes.first.comment.text.strip
-    assert_equal 'my extend', klass.extends.first.comment.text.strip
-  end
-
-  def test_include_extend_to_singleton_class
-    omit 'not implemented' if accept_legacy_bug?
-    util_parser <<~RUBY
-      class Foo
-        class << self
-          # include to singleton class is extend
-          include I
-          # extend to singleton class is not documentable
-          extend E
-        end
-      end
-    RUBY
-
-    klass = @top_level.classes.first
-    assert_equal [], klass.includes.map(&:name)
-    assert_equal ['I'], klass.extends.map(&:name)
-  end
-
-  def test_include_with_module_nesting
-    util_parser <<~RUBY
-      module A
-        module M; end
-        module B
-          module M; end
-          module C
-            module M; end
-            module D
-              module M; end
-            end
-          end
-        end
-      end
-
-      module A::B
-        class C::D::Foo
-          include M
-        end
-      end
-      # TODO: make test pass with the following code appended
-      # module A::B::C
-      #   class D::Foo
-      #     include M
-      #   end
-      # end
-    RUBY
-    klass = @store.find_class_named 'A::B::C::D::Foo'
-    assert_equal 'A::B::M', klass.includes.first.module.full_name
-  end
-
-  def test_various_argument_include
-    omit 'not implemented' if accept_legacy_bug?
-    util_parser <<~RUBY
-      module A; end
-      module B; end
-      module C; end
-      class A
-        include
-        include A, B
-        include 42, C # Maybe not Module#include
-      end
-    RUBY
-    klass = @top_level.classes.first
-    assert_equal ['A', 'B'], klass.includes.map(&:name)
-  end
-
-  def test_require
-    util_parser <<~RUBY
-      require
-      require 'foo/bar'
-      require_relative 'is/not/supported/yet'
-      require "\#{embed}"
-      require (any expression)
-    RUBY
-    assert_equal ['foo/bar'], @top_level.requires.map(&:name)
-  end
-
-  def test_statements_identifier_alias_method_before_original_method
-    # This is not strictly legal Ruby code, but it simulates finding an alias
-    # for a method before finding the original method, which might happen
-    # to rdoc if the alias is in a different file than the original method
-    # and rdoc processes the alias' file first.
-    util_parser <<~RUBY
-      class Foo
-        alias_method :foo2, :foo
-        alias_method :foo3, :foo
-      end
-
-      class Foo
-        def foo(); end
-        alias_method :foo4, :foo
-        alias_method :foo5, :unknown
-      end
-    RUBY
-
-    foo = @top_level.classes.first.method_list[0]
-    assert_equal 'foo', foo.name
-
-    foo2 = @top_level.classes.first.method_list[1]
-    assert_equal 'foo2', foo2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-
-    foo3 = @top_level.classes.first.method_list[2]
-    assert_equal 'foo3', foo3.name
-    assert_equal 'foo', foo3.is_alias_for.name
-
-    foo4 = @top_level.classes.first.method_list.last
-    assert_equal 'foo4', foo4.name
-    assert_equal 'foo', foo4.is_alias_for.name
-
-    assert_equal 'unknown', @top_level.classes.first.external_aliases[0].old_name
-  end
-
-  def test_class_definition_encountered_after_class_reference
-    # The code below is not legal Ruby (Foo must have been defined before
-    # Foo.bar is encountered), but RDoc might encounter Foo.bar before Foo if
-    # they live in different files.
-
-    util_parser <<-RUBY
-      def Foo.bar
-      end
-
-      class Foo < IO
-      end
-    RUBY
-
-    assert_empty @store.modules_hash
-    assert_empty @store.all_modules
-
-    klass = @top_level.classes.first
-    assert_equal 'Foo', klass.full_name
-    assert_equal 'IO', klass.superclass
-
-    assert_equal 'bar', klass.method_list.first.name
-  end
-
-  def test_scan_duplicate_module
-    util_parser <<~RUBY
-      # comment a
-      module Foo
-      end
-
-      # comment b
-      module Foo
-      end
-    RUBY
-
-    mod = @top_level.modules.first
-
-    expected = [
-      RDoc::Comment.new('comment a', @top_level),
-      RDoc::Comment.new('comment b', @top_level)
-    ]
-
-    assert_equal expected, mod.comment_location.map { |c, _l| c }
-  end
-
-  def test_enddoc
-    util_parser <<~RUBY
-      class A
-        class B; end
-        # :enddoc:
-        # :startdoc:
-        class C; end
-      end
-      class D; end
-      # :enddoc:
-      # :startdoc:
-      class E; end
-    RUBY
-
-    assert_equal ['A', 'A::B', 'D'], @store.all_classes.reject(&:ignored?).map(&:full_name)
-  end
-
-  def test_top_level_enddoc
-    util_parser <<~RUBY
-      class A; end
-      # :enddoc:
-      class B; end
-      # :startdoc:
-      class C; end
-    RUBY
-
-    assert_equal ['A'], @top_level.classes.reject(&:ignored?).map(&:name)
-  end
-
-  def test_section
-    util_parser <<~RUBY
-      class Foo
-        # :section: section1
-        attr :a1
-        def m1; end
-        # :section:
-        def m2; end
-        attr :a2
-        # :section: section2
-        def m3; end
-        attr :a3
-        module Bar
-          def m4; end
-          attr :a4
-          # :section: section3
-          def m5; end
-          attr :a5
-        end
-        attr :a6
-        def m6; end
-      end
-    RUBY
-    foo = @top_level.classes.first
-    bar = foo.modules.first
-    assert_equal ['section1', nil, 'section2', 'section2'], foo.attributes.map { |m| m.section.title }
-    assert_equal ['section1', nil, 'section2', 'section2'], foo.method_list.map { |m| m.section.title }
-    assert_equal [nil, 'section3'], bar.attributes.map { |m| m.section.title }
-    assert_equal [nil, 'section3'], bar.method_list.map { |m| m.section.title }
-  end
-
-  def test_category
-    util_parser <<~RUBY
-      class A
-        # :category: cat1
-
-        # comment
-        attr :a1
-        attr :a2
-        def m1; end
-        # :category: cat2
-
-        # comment
-        def m2; end
-        def m3; end
-        attr :a3
-
-        # :category:
-        attr :a4
-        # :category:
-        def m4; end
-
-        ##
-        # :category: cat3
-        def m5; end
-
-        ##
-        # :category: cat4
-        # :method: m6
-      end
-    RUBY
-    klass = @top_level.classes.first
-    assert_equal ['cat1', nil, nil, nil], klass.attributes.map { |m| m.section.title }
-    assert_equal [nil, 'cat2', nil, nil, 'cat3', 'cat4'], klass.method_list.map { |m| m.section.title }
-  end
-
-  def test_ignore_constant_assign_rhs
-    # Struct is not supported yet. Right hand side of constant assignment should be ignored.
-    util_parser <<~RUBY
-      module Foo
-        def a; end
-        Bar = Struct.new do
-          def b; end
-          ##
-          # :method: c
-        end
-        Bar::Baz = Struct.new do
-          def d; end
-          ##
-          # :method: e
-        end
-        ##
-        # :method: f
-      end
-    RUBY
-    mod = @top_level.modules.first
-    assert_equal ['a', 'f'], mod.method_list.map(&:name)
-  end
-
-  def test_include_extend_suppressed_within_block
-    util_parser <<~RUBY
-      module M; end
-      module N; end
-      module O: end
-      class A
-        metaprogramming do
-          include M
-          extend N
-          class B
-            include M
-            extend N
-          end
-          include M
-          extend N
-        end
-        include O
-        extend O
-      end
-    RUBY
-    a, b = @store.all_classes
-    unless accept_legacy_bug?
-      assert_equal ['O'], a.includes.map(&:name)
-      assert_equal ['O'], a.extends.map(&:name)
-    end
-    assert_equal ['M'], b.includes.map(&:name)
-    assert_equal ['N'], b.extends.map(&:name)
-  end
-
-  def test_multibyte_method_name
-    content = <<~RUBY
-      class Foo
-        # comment ω
-        def ω() end
-      end
-    RUBY
-    util_parser content
-    assert_equal Encoding::UTF_8, content.encoding
-    method = @top_level.classes.first.method_list.first
-    assert_equal 'comment ω', method.comment.text.strip
-    assert_equal 'ω', method.name
-  end
-
-  def test_options_encoding
-    @options.encoding = Encoding::CP852
-    util_parser <<~RUBY
-      class Foo
-        ##
-        # this is my method
-        add_my_method :foo
-      end
-    RUBY
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'this is my method', foo.comment.text
-    assert_equal Encoding::CP852, foo.comment.text.encoding
-  end
-
-  def test_read_directive_linear_performance
-    assert_linear_performance((1..5).map{|i|10**i}) do |i|
-      util_parser '# ' + '0'*i + '=000:' + "\n def f; end"
-    end
-  end
-
-
-  def test_markup_first_comment
-    util_parser <<~RUBY
-      # :markup: rd
-
-      # ((*awesome*))
-      class C
-        # ((*radical*))
-        def m
-        end
-      end
-    RUBY
-
-    c = @top_level.classes.first
-    assert_equal 'rd', c.comment.format
-    assert_equal 'rd', c.method_list.first.comment.format
-  end
-
-  def test_markup_override
-    util_parser <<~RUBY
-      # *awesome*
-      class C
-        # :markup: rd
-        # ((*radical*))
-        def m1; end
-
-        # *awesome*
-        def m2; end
-      end
-    RUBY
-
-    c = @top_level.classes.first
-
-    assert_equal 'rdoc', c.comment.format
-
-    assert_equal ['rd', 'rdoc'], c.method_list.map { |m| m.comment.format }
-  end
-
-  def test_tomdoc_meta
-    util_parser <<~RUBY
-      # :markup: tomdoc
-
-      class C
-
-        # Signature
-        #
-        #   find_by_<field>[_and_<field>...](args)
-        #
-        # field - A field name.
-
-      end
-    RUBY
-
-    c = @top_level.classes.first
-
-    m = c.method_list.first
-
-    assert_equal "find_by_<field>[_and_<field>...]", m.name
-    assert_equal "find_by_<field>[_and_<field>...](args)\n", m.call_seq
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[field],
-            para('A field name.'))))
-    expected.file = @top_level
-
-    assert_equal expected, m.comment.parse
-  end
-end
-
-class RDocParserPrismRubyTest < RDoc::TestCase
-  include RDocParserPrismTestCases
-
-  def accept_legacy_bug?
-    false
-  end
-
-  def util_parser(content)
-    @parser = RDoc::Parser::PrismRuby.new @top_level, content, @options, @stats
-    @parser.scan
-  end
-end
-
-# Run the same test with the original RDoc::Parser::Ruby
-class RDocParserRubyWithPrismRubyTestCasesTest < RDoc::TestCase
-  include RDocParserPrismTestCases
-
-  def accept_legacy_bug?
-    true
-  end
-
-  def util_parser(content)
-    @parser = RDoc::Parser::Ruby.new @top_level, content, @options, @stats
-    @parser.scan
-  end
-end unless ENV['RDOC_USE_PRISM_PARSER']
diff --git a/test/mri/rdoc/rdoc_parser_rd_test.rb b/test/mri/rdoc/rdoc_parser_rd_test.rb
deleted file mode 100644
index a1e552252a4..00000000000
--- a/test/mri/rdoc/rdoc_parser_rd_test.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocParserRdTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @RP = RDoc::Parser
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_file
-    assert_kind_of RDoc::Parser::Text, util_parser('')
-  end
-
-  def test_class_can_parse
-    temp_dir do
-      FileUtils.touch 'foo.rd'
-      assert_equal @RP::RD, @RP.can_parse('foo.rd')
-
-      FileUtils.touch 'foo.rd.ja'
-      assert_equal @RP::RD, @RP.can_parse('foo.rd.ja')
-    end
-  end
-
-  def test_scan
-    parser = util_parser 'it ((*really*)) works'
-
-    expected = doc(para('it <em>really</em> works'))
-    expected.file = @top_level
-
-    parser.scan
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def util_parser(content)
-    RDoc::Parser::RD.new @top_level, content, @options, @stats
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_parser_ruby_test.rb b/test/mri/rdoc/rdoc_parser_ruby_test.rb
deleted file mode 100644
index 2f4665a25fe..00000000000
--- a/test/mri/rdoc/rdoc_parser_ruby_test.rb
+++ /dev/null
@@ -1,4396 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-return if ENV['RDOC_USE_PRISM_PARSER']
-
-class RDocParserRubyTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    @filename = @tempfile.path
-
-    # Some tests need two paths.
-    @tempfile2 = Tempfile.new self.class.name
-    @filename2 = @tempfile2.path
-
-    @top_level = @store.add_file @filename
-    @top_level2 = @store.add_file @filename2
-
-    @options = RDoc::Options.new
-    @options.quiet = true
-    @options.option_parser = OptionParser.new
-
-    @comment = RDoc::Comment.new '', @top_level
-
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-    @tempfile2.close!
-  end
-
-  def test_collect_first_comment
-    p = util_parser <<-CONTENT
-# first
-
-# second
-class C; end
-    CONTENT
-
-    comment = p.collect_first_comment
-
-    assert_equal RDoc::Comment.new("# first\n", @top_level), comment
-  end
-
-  def test_collect_first_comment_encoding
-    @options.encoding = Encoding::CP852
-
-    p = util_parser <<-CONTENT
-# first
-
-# second
-class C; end
-    CONTENT
-
-    comment = p.collect_first_comment
-
-    assert_equal Encoding::CP852, comment.text.encoding
-  end
-
-  def test_collect_first_comment_rd_hash
-    parser = util_parser <<-CONTENT
-=begin
-first
-=end
-
-# second
-class C; end
-    CONTENT
-
-    comment = parser.collect_first_comment
-
-    assert_equal RDoc::Comment.new("first\n", @top_level), comment
-  end
-
-  def test_get_class_or_module
-    ctxt = RDoc::Context.new
-    ctxt.store = @store
-
-    cont, name_t, given_name = util_parser('A')    .get_class_or_module ctxt
-
-    assert_equal ctxt, cont
-    assert_equal 'A', name_t[:text]
-    assert_equal 'A', given_name
-
-    cont, name_t, given_name = util_parser('B::C') .get_class_or_module ctxt
-
-    b = @store.find_module_named('B')
-    assert_equal b, cont
-    assert_equal [@top_level], b.in_files
-    assert_equal 'C', name_t[:text]
-    assert_equal 'B::C', given_name
-
-    cont, name_t, given_name = util_parser('D:: E').get_class_or_module ctxt
-
-    assert_equal @store.find_module_named('D'), cont
-    assert_equal 'E', name_t[:text]
-    assert_equal 'D::E', given_name
-
-    assert_nothing_raised do
-      util_parser("A::\nB").get_class_or_module ctxt
-    end
-  end
-
-  def test_get_class_or_module_document_children
-    ctxt = @top_level.add_class RDoc::NormalClass, 'A'
-    ctxt.stop_doc
-
-    util_parser('B::C').get_class_or_module ctxt
-
-    b = @store.find_module_named('A::B')
-    assert b.ignored?
-
-    d = @top_level.add_class RDoc::NormalClass, 'A::D'
-
-    util_parser('D::E').get_class_or_module ctxt
-
-    refute d.ignored?
-  end
-
-  def test_get_class_or_module_ignore_constants
-    ctxt = RDoc::Context.new
-    ctxt.store = @store
-
-    util_parser('A')   .get_class_or_module ctxt, true
-    util_parser('A::B').get_class_or_module ctxt, true
-
-    assert_empty ctxt.constants
-    assert_empty @store.modules_hash.keys
-    assert_empty @store.classes_hash.keys
-  end
-
-  def test_get_class_specification
-    assert_equal 'A',    util_parser('A')   .get_class_specification
-    assert_equal 'A::B', util_parser('A::B').get_class_specification
-    assert_equal '::A',  util_parser('::A').get_class_specification
-
-    assert_equal 'self', util_parser('self').get_class_specification
-
-    assert_equal '',     util_parser('').get_class_specification
-
-    assert_equal '',     util_parser('$g').get_class_specification
-  end
-
-  def test_get_symbol_or_name
-    util_parser "* & | + 5 / 4"
-
-    assert_equal '*', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '&', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '|', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '+', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-    @parser.get_tk
-    @parser.skip_tkspace
-
-    assert_equal '/', @parser.get_symbol_or_name
-  end
-
-  def test_suppress_parents
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-    b = a.add_class RDoc::NormalClass, 'B'
-    c = b.add_class RDoc::NormalClass, 'C'
-
-    util_parser ''
-
-    @parser.suppress_parents c, a
-
-    assert c.suppressed?
-    assert b.suppressed?
-    refute a.suppressed?
-  end
-
-  def test_suppress_parents_documented
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-    b = a.add_class RDoc::NormalClass, 'B'
-    b.add_comment RDoc::Comment.new("hello"), @top_level
-    c = b.add_class RDoc::NormalClass, 'C'
-
-    util_parser ''
-
-    @parser.suppress_parents c, a
-
-    assert c.suppressed?
-    refute b.suppressed?
-    refute a.suppressed?
-  end
-
-  def test_look_for_directives_in_attr
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :attr: my_attr\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr: my_attr\n", comment.text
-
-    comment = RDoc::Comment.new "# :attr_reader: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr_reader: my_method\n", comment.text
-
-    comment = RDoc::Comment.new "# :attr_writer: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr_writer: my_method\n", comment.text
-  end
-
-  def test_look_for_directives_in_commented
-    util_parser ""
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# how to make a section:
-# # :section: new section
-    COMMENT
-
-    @parser.look_for_directives_in @top_level, comment
-
-    section = @top_level.current_section
-    assert_nil   section.title
-    assert_nil   section.comment
-
-    assert_equal "# how to make a section:\n# # :section: new section\n",
-                 comment.text
-  end
-
-  def test_look_for_directives_in_method
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :method: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :method: my_method\n", comment.text
-
-    comment = RDoc::Comment.new "# :singleton-method: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :singleton-method: my_method\n", comment.text
-  end
-
-  def test_look_for_directives_in_section
-    util_parser ""
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# :section: new section
-# woo stuff
-    COMMENT
-
-    @parser.look_for_directives_in @top_level, comment
-
-    section = @top_level.current_section
-    assert_equal 'new section', section.title
-    assert_equal [comment("# woo stuff\n", @top_level)], section.comments
-
-    assert_empty comment
-  end
-
-  def test_look_for_directives_in_unhandled
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :unhandled: blah\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal 'blah', @top_level.metadata['unhandled']
-  end
-
-  def test_parse_for_in
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new '', @top_level
-
-    util_parser <<ruby
-def sum(n)
-  result = 0
-  for i in 1..n do
-    result += i
-  end
-  result
-end
-ruby
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    sum = klass.method_list.first
-    assert_equal 'sum',      sum.name
-    assert_equal @top_level, sum.file
-  end
-
-  def test_parse_on_ignored_nl_with_nil_text
-    util_parser <<ruby
-class Foo
-  def meth
-    variable # comment
-      .chain
-  end
-end
-ruby
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">meth</span>
-  <span class="ruby-identifier">variable</span> <span class="ruby-comment"># comment</span>
-    .<span class="ruby-identifier">chain</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @store.find_class_named 'Foo'
-    meth = foo.method_list.first
-
-    assert_equal 'meth',     meth.name
-    assert_equal @top_level, meth.file
-
-    markup_code = meth.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_redefined_op_with_constant
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new '', @top_level
-
-    util_parser <<ruby
-def meth
-  Integer::**()
-  return Integer::**()
-  break Integer::**()
-  case Integer::**()
-  when Integer::**()
-  end
-  while Integer::**()
-  end
-  yield Integer::**()
-  defined? Integer::**()
-  if Integer::**()
-  end
-end
-ruby
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    meth = klass.method_list.first
-    assert_equal 'meth',     meth.name
-  end
-
-  def test_parse_alias
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_equal 'bar',      alas.old_name
-    assert_equal 'next=',    alas.new_name
-    assert_equal klass,      alas.parent
-    assert_equal 'comment',  alas.comment
-    assert_equal @top_level, alas.file
-    assert_equal 1,          alas.line
-  end
-
-  def test_parse_alias_singleton
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::SINGLE, tk, 'comment'
-
-    assert_equal 'bar',      alas.old_name
-    assert_equal 'next=',    alas.new_name
-    assert_equal klass,      alas.parent
-    assert_equal 'comment',  alas.comment
-    assert_equal @top_level, alas.file
-    assert                   alas.singleton
-  end
-
-  def test_parse_alias_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_alias_meta
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias m.chop m"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_nil alas
-  end
-
-  def test_parse_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 1, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_accessor :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-
-    bar = klass.attributes.last
-    assert_equal 'bar', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-  end
-
-  def test_parse_attr_accessor_with_newline
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_accessor :foo, :bar,\n  :baz,\n  :qux"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 4, klass.attributes.length
-
-    foo = klass.attributes[0]
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-
-    bar = klass.attributes[1]
-    assert_equal 'bar', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-
-    bar = klass.attributes[2]
-    assert_equal 'baz', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-
-    bar = klass.attributes[3]
-    assert_equal 'qux', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-  end
-
-  def test_parse_attr_accessor_nodoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr_accessor :foo, :bar # :nodoc:"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 0, klass.attributes.length
-  end
-
-  def test_parse_attr_accessor_nodoc_track
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    @options.visibility = :nodoc
-
-    util_parser "attr_accessor :foo, :bar # :nodoc:"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    refute_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr_accessor :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor_writer
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_writer :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'W', foo.rw
-    assert_equal "my attr", foo.comment.text
-    assert_equal @top_level, foo.file
-
-    bar = klass.attributes.last
-    assert_equal 'bar', bar.name
-    assert_equal 'W', bar.rw
-    assert_equal "my attr", bar.comment.text
-  end
-
-  def test_parse_meta_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal "my method", foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_accessor
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_accessor: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_named
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 1, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_reader
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_reader: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'R', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :attr: \n# my method\n", @top_level
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_meta_attr_writer
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_writer: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'W', foo.rw
-    assert_equal "my method", foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_class
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level, :ruby
-
-    util_parser "class Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'my class', foo.comment.text
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_singleton
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser <<-RUBY
-class C
-  class << self
-  end
-end
-    RUBY
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    c = @top_level.classes.first
-    assert_equal 'C', c.full_name
-    assert_equal 1, c.line
-  end
-
-  def test_parse_class_ghost_method
-    util_parser <<-CLASS
-class Foo
-  ##
-  # :method: blah
-  # my method
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal 'Foo#blah', blah.full_name
-    assert_equal 3, blah.line
-    assert_equal @top_level, blah.file
-  end
-
-  def test_parse_class_in_a_file_repeatedly
-    @filename = 'a.rb'
-    comment_a = RDoc::Comment.new "# aaa\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_a
-    comment_b = RDoc::Comment.new "# bbb\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_b
-
-    @filename = 'b.rb'
-    comment_c = RDoc::Comment.new "# ccc\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_c
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal [[comment_a, @top_level],
-                  [comment_b, @top_level],
-                  [comment_c, @top_level]], foo.comment_location
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_ghost_method_yields
-    util_parser <<-CLASS
-class Foo
-  ##
-  # :method:
-  # :call-seq:
-  #   yields(name)
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal 'Foo#yields', blah.full_name
-    assert_equal 'yields(name)', blah.call_seq
-    assert_equal 3, blah.line
-    assert_equal @top_level, blah.file
-  end
-
-  def test_parse_call_syntax_sugar_for_constant
-    util_parser <<-CODE
-Foo = proc{}
-Foo::()
-    CODE
-
-    assert_nothing_raised do
-      @parser.scan
-    end
-  end
-
-  def test_parse_class_multi_ghost_methods
-    util_parser <<-'CLASS'
-class Foo
-  ##
-  # :method: one
-  #
-  # my method
-
-  ##
-  # :method: two
-  #
-  # my method
-
-  [:one, :two].each do |t|
-    eval("def #{t}; \"#{t}\"; end")
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    assert_equal 2, foo.method_list.length
-  end
-
-  def test_parse_class_nodoc
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class Foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_single_root
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class << ::Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @store.all_modules.first
-    assert_equal 'Foo', foo.full_name
-  end
-
-  def test_parse_class_stopdoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty @top_level.classes.first.comment
-  end
-
-  def test_parse_class_lower_name_warning
-    @options.verbosity = 2
-    stds = capture_output do
-      util_parser "class foo\nend"
-      tk = @parser.get_tk
-      @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-    end
-    err = stds[1]
-    assert_match(/Expected class name or '<<\'\. Got/, err)
-  end
-
-  def test_parse_syntax_error_code
-    @options.verbosity = 2
-    stds = capture_output do
-      begin
-        util_parser <<INVALID_CODE
-# invalid class name
-class Invalid::@@Code
-end
-INVALID_CODE
-        @parser.scan
-      rescue
-      end
-    end
-    err = stds[1]
-
-    expected = <<EXPECTED
-RDoc::Parser::Ruby failure around line 2 of
-#{@filename}
-
-class Invalid::@@Code
-EXPECTED
-
-    assert_match(expected, err)
-  end
-
-  def test_parse_multi_ghost_methods
-    util_parser <<-'CLASS'
-class Foo
-  ##
-  # :method: one
-  #
-  # my method
-
-  ##
-  # :method: two
-  #
-  # my method
-
-  [:one, :two].each do |t|
-    eval("def #{t}; \"#{t}\"; end")
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    assert_equal 2, foo.method_list.length
-  end
-
-  def test_parse_const_fail_w_meta
-    util_parser <<-CLASS
-class ConstFailMeta
-  ##
-  # :attr: one
-  #
-  # an attribute
-
-  OtherModule.define_attr(self, :one)
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    const_fail_meta = @top_level.classes.first
-    assert_equal 'ConstFailMeta', const_fail_meta.full_name
-
-    assert_equal 1, const_fail_meta.attributes.length
-  end
-
-  def test_parse_class_nested_superclass
-    foo = @top_level.add_module RDoc::NormalModule, 'Foo'
-
-    util_parser "class Bar < Super\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class foo, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    bar = foo.classes.first
-    assert_equal 'Super', bar.superclass
-  end
-
-  def test_parse_module
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level, :ruby
-
-    util_parser "module Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'my module', foo.comment.text
-  end
-
-  def test_parse_module_nodoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level
-
-    util_parser "module Foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-  end
-
-  def test_parse_module_stopdoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level
-
-    util_parser "module Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-  end
-
-  def test_parse_class_colon3
-    code = <<-CODE
-class A
-  class ::B
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A B], @store.all_classes.map { |c| c.full_name }.sort
-  end
-
-  def test_parse_class_colon3_self_reference
-    code = <<-CODE
-class A::B
-  class ::A
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A A::B], @store.all_classes.map { |c| c.full_name }.sort
-  end
-
-  def test_parse_class_single
-    code = <<-CODE
-class A
-  class << B
-  end
-  class << d = Object.new
-    def foo; end
-    alias bar foo
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A], @store.all_classes.map { |c| c.full_name }
-
-    modules = @store.all_modules.sort_by { |c| c.full_name }
-    assert_equal %w[A::B A::d], modules.map { |c| c.full_name }
-
-    b = modules.first
-    assert_equal 2,  b.line
-
-    # make sure method/alias was not added to enclosing class/module
-    a = @store.classes_hash['A']
-    assert_empty a.method_list
-
-    # make sure non-constant-named module will be removed from documentation
-    d = @store.modules_hash['A::d']
-    assert d.remove_from_documentation?
-  end
-
-  def test_parse_class_single_gvar
-    code = <<-CODE
-class << $g
-  def m
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, ''
-
-    assert_empty @store.all_classes
-    mod = @store.all_modules.first
-
-    refute mod.document_self
-
-    assert_empty mod.method_list
-  end
-
-  # TODO this is really a Context#add_class test
-  def test_parse_class_object
-    code = <<-CODE
-module A
-  class B
-  end
-  class Object
-  end
-  class C < Object
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_module @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A],
-      @store.all_modules.map { |c| c.full_name }
-    assert_equal %w[A::B A::C A::Object],
-      @store.all_classes.map { |c| c.full_name }.sort
-
-    assert_equal 'Object',    @store.classes_hash['A::B'].superclass
-    assert_equal 'Object',    @store.classes_hash['A::Object'].superclass
-    assert_equal 'A::Object', @store.classes_hash['A::C'].superclass.full_name
-  end
-
-  def test_parse_class_mistaken_for_module
-    # The code below is not strictly legal Ruby (Foo must have been defined
-    # before Foo::Bar is encountered), but RDoc might encounter Foo::Bar
-    # before Foo if they live in different files.
-
-    code = <<-RUBY
-class Foo::Bar
-end
-
-module Foo::Baz
-end
-
-class Foo
-end
-    RUBY
-
-    util_parser code
-
-    @parser.scan
-
-    assert_equal %w[Foo::Baz], @store.modules_hash.keys
-    assert_empty @top_level.modules
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    bar = foo.classes.first
-    assert_equal 'Foo::Bar', bar.full_name
-
-    baz = foo.modules.first
-    assert_equal 'Foo::Baz', baz.full_name
-  end
-
-  def test_parse_class_definition_encountered_after_class_reference
-    # The code below is not legal Ruby (Foo must have been defined before
-    # Foo.bar is encountered), but RDoc might encounter Foo.bar before Foo if
-    # they live in different files.
-
-    code = <<-EOF
-def Foo.bar
-end
-
-class Foo < IO
-end
-    EOF
-
-    util_parser code
-
-    @parser.scan
-
-    assert_empty @store.modules_hash
-    assert_empty @store.all_modules
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'IO', foo.superclass
-
-    bar = foo.method_list.first
-    assert_equal 'bar', bar.name
-  end
-
-  def test_parse_module_relative_to_top_level_namespace
-    comment = RDoc::Comment.new <<-EOF, @top_level
-#
-# Weirdly named module
-#
-EOF
-
-    code = <<-EOF
-#{comment.text}
-module ::Foo
-  class Helper
-  end
-end
-EOF
-
-    util_parser code
-    @parser.scan()
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'Weirdly named module', foo.comment.text
-
-    helper = foo.classes.first
-    assert_equal 'Foo::Helper', helper.full_name
-  end
-
-  def test_parse_comment_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my attr\n", @top_level, :ruby
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo',      foo.name
-    assert_equal 'RW',       foo.rw
-    assert_equal 'my attr',  foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1,          foo.line
-
-    assert_equal true,       foo.document_children
-    assert_equal true,       foo.document_self
-    assert_equal false,      foo.done_documenting
-    assert_equal false,      foo.force_documentation
-    assert_equal klass,      foo.parent
-    assert_equal :public,    foo.visibility
-    assert_equal "\n",       foo.text
-
-    assert_equal klass.current_section, foo.section
-  end
-
-  def test_parse_comment_attr_attr_reader
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr_reader: foo\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo',      foo.name
-    assert_equal 'R',        foo.rw
-  end
-
-  def test_parse_comment_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my attr\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_comment_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :method: foo\n# my method\n", @top_level, :ruby
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 2,           foo.line
-
-    assert_equal [],          foo.aliases
-    assert_nil                foo.block_params
-    assert_nil                foo.call_seq
-    assert_nil                foo.is_alias_for
-    assert_equal true,        foo.document_children
-    assert_equal true,        foo.document_self
-    assert_equal '',          foo.params
-    assert_equal false,       foo.done_documenting
-    assert_equal false,       foo.dont_rename_initialize
-    assert_equal false,       foo.force_documentation
-    assert_equal klass,       foo.parent
-    assert_equal false,       foo.singleton
-    assert_equal :public,     foo.visibility
-    assert_equal "\n",        foo.text
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 2, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 2"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_comment_method_args
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk,
-                          comment("##\n# :method: foo\n# :args: a, b\n")
-
-    foo = klass.method_list.first
-    assert_equal 'foo',  foo.name
-    assert_equal 'a, b', foo.params
-  end
-
-  def test_parse_comment_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :method: foo\n# my method\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_constant
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    foo = klass.constants.first
-
-    assert_equal 'A', foo.name
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_constant_attrasgn
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A[k] = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert klass.constants.empty?
-  end
-
-  def test_parse_constant_alias
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-    klass.add_class RDoc::NormalClass, 'B'
-
-    util_parser "A = B"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_equal [], klass.modules.map(&:full_name)
-    assert_equal ['Foo::B', 'Foo::A'], klass.classes.map(&:full_name)
-    assert_equal ['Foo::A'], klass.constants.map(&:full_name)
-    assert_equal 'Foo::A', klass.find_module_named('A').full_name
-  end
-
-  def test_parse_constant_alias_same_name
-    foo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @top_level.add_class RDoc::NormalClass, 'Bar'
-    bar = foo.add_class RDoc::NormalClass, 'Bar'
-
-    assert @store.find_class_or_module('::Bar')
-
-    util_parser "A = ::Bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant foo, tk, @comment
-
-    assert_equal 'A', bar.find_module_named('A').full_name
-  end
-
-  def test_parse_constant_in_method
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser 'A::B = v'
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment, true
-
-    assert_empty klass.constants
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[Foo], @store.classes_hash.keys
-  end
-
-  def test_parse_constant_rescue
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A => e"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_empty klass.constants
-    assert_empty klass.modules
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[Foo], @store.classes_hash.keys
-  end
-
-  def test_parse_constant_stopdoc
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-    klass.stop_doc
-
-    util_parser "A = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_empty klass.constants
-  end
-
-  def test_parse_comment_nested
-    content = <<-CONTENT
-A::B::C = 1
-    CONTENT
-
-    util_parser content
-
-    tk = @parser.get_tk
-
-    parsed = @parser.parse_constant @top_level, tk, 'comment'
-
-    assert parsed
-
-    a = @top_level.find_module_named 'A'
-    b = a.find_module_named 'B'
-    c = b.constants.first
-
-    assert_equal 'A::B::C', c.full_name
-    assert_equal 'comment', c.comment
-  end
-
-  def test_parse_class_the_same_of_outside
-    util_parser <<-RUBY
-module A
-  class A::B
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    assert_includes @store.modules_hash, 'A'
-    module_a = @store.find_module_named 'A'
-    refute_empty module_a.classes_hash
-    assert_includes module_a.classes_hash, 'B'
-    refute_includes module_a.classes_hash, 'A'
-  end
-
-  def test_parse_constant_the_same_of_outside
-    util_parser <<-RUBY
-module A
-  class B
-    class C
-    end
-  end
-
-  def self.foo
-    A::B::C
-  end
-end
-    RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">foo</span>
-  <span class="ruby-constant">A</span><span class="ruby-operator">::</span><span class="ruby-constant">B</span><span class="ruby-operator">::</span><span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    module_a = @store.find_module_named 'A'
-    foo = module_a.method_list.first
-    markup_code = foo.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_constant_with_bracket
-    util_parser <<-RUBY
-class Klass
-end
-
-class Klass2
-  CONSTANT = Klass
-end
-
-class Klass3
-  CONSTANT_2 = {}
-  CONSTANT_2[1] = Klass
-end
-    RUBY
-
-    @parser.scan
-
-    klass = @store.find_class_named 'Klass'
-    klass2 = @store.find_class_named 'Klass2'
-    klass3 = @store.find_class_named 'Klass3'
-    assert_equal klass, klass2.constants.first.is_alias_for
-    refute_equal klass, klass3.constants.first.is_alias_for
-    assert_nil klass3.find_module_named 'CONSTANT_2'
-  end
-
-  def test_parse_extend_or_include_extend
-    klass = RDoc::NormalClass.new 'C'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "# my extend\n", @top_level, :ruby
-
-    util_parser "extend I"
-
-    @parser.get_tk # extend
-
-    @parser.parse_extend_or_include RDoc::Extend, klass, comment
-
-    assert_equal 1, klass.extends.length
-
-    ext = klass.extends.first
-    assert_equal 'I', ext.name
-    assert_equal 'my extend', ext.comment.text
-    assert_equal @top_level, ext.file
-  end
-
-  def test_parse_extend_or_include_include
-    klass = RDoc::NormalClass.new 'C'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "# my include\n", @top_level, :ruby
-
-    util_parser "include I"
-
-    @parser.get_tk # include
-
-    @parser.parse_extend_or_include RDoc::Include, klass, comment
-
-    assert_equal 1, klass.includes.length
-
-    incl = klass.includes.first
-    assert_equal 'I', incl.name
-    assert_equal 'my include', incl.comment.text
-    assert_equal @top_level, incl.file
-  end
-
-  def test_parse_meta_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 1,           foo.line
-
-    assert_equal [],      foo.aliases
-    assert_nil            foo.block_params
-    assert_nil            foo.call_seq
-    assert_equal true,    foo.document_children
-    assert_equal true,    foo.document_self
-    assert_equal false,   foo.done_documenting
-    assert_equal false,   foo.dont_rename_initialize
-    assert_equal false,   foo.force_documentation
-    assert_nil            foo.is_alias_for
-    assert_equal '',      foo.params
-    assert_equal klass,   foo.parent
-    assert_equal false,   foo.singleton
-    assert_equal 'add_my_method :foo', foo.text
-    assert_equal :public, foo.visibility
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 1, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 1"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 1, :char_no => 0, :kind => :on_ident, :text => 'add_my_method' },
-      { :line_no => 1, :char_no => 13, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 14, :kind => :on_symbol, :text => ':foo' },
-      { :line_no => 1, :char_no => 18, :kind => :on_comma, :text => ',' },
-      { :line_no => 1, :char_no => 19, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 20, :kind => :on_symbol, :text => ':bar' },
-      { :line_no => 1, :char_no => 24, :kind => :on_nl, :text => "\n" }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_meta_method_block
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    content = <<-CONTENT
-inline(:my_method) do |*args|
-  "this method causes z to disappear"
-end
-    CONTENT
-
-    util_parser content
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    rest = { :line_no => 3, :char_no => 3, :kind => :on_nl, :text => "\n" }
-    tk = @parser.get_tk
-    tk = { :line_no => tk[:line_no], :char_no => tk[:char_no], :kind => tk[:kind], :text => tk[:text] }
-    assert_equal rest, tk
-  end
-
-  def test_parse_meta_method_define_method
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "define_method :foo do end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_name
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :method: woo_hoo!\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'woo_hoo!',  foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_singleton
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :singleton-method:\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal true, foo.singleton, 'singleton method'
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_singleton_name
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :singleton-method: woo_hoo!\n# my method\n",
-                        @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'woo_hoo!', foo.name
-    assert_equal true, foo.singleton, 'singleton method'
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_string_name
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method 'foo'"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_meta_method_unknown
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method ('foo')"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'unknown', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "def foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 1,           foo.line
-
-    assert_equal [],        foo.aliases
-    assert_nil              foo.block_params
-    assert_nil              foo.call_seq
-    assert_nil              foo.is_alias_for
-    assert_equal true,      foo.document_children
-    assert_equal true,      foo.document_self
-    assert_equal '()',      foo.params
-    assert_equal false,     foo.done_documenting
-    assert_equal false,     foo.dont_rename_initialize
-    assert_equal false,     foo.force_documentation
-    assert_equal klass,     foo.parent
-    assert_equal false,     foo.singleton
-    assert_equal :public,   foo.visibility
-    assert_equal 'def foo', foo.text
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 1, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 1" },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 1, :char_no => 0, :kind => :on_kw, :text => 'def' },
-      { :line_no => 1, :char_no => 3, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 4, :kind => :on_ident, :text => 'foo' },
-      { :line_no => 1, :char_no => 7, :kind => :on_lparen, :text => '(' },
-      { :line_no => 1, :char_no => 8, :kind => :on_rparen, :text => ')' },
-      { :line_no => 1, :char_no => 9, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 10, :kind => :on_symbol, :text => ':bar' },
-      { :line_no => 1, :char_no => 14, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 15, :kind => :on_kw, :text => 'end' }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_redefinable_methods
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "", @top_level
-
-    redefinable_ops = %w[| ^ & <=> == === =~ > >= < <= << >> + - * / % ** ~ +@ -@ [] []= ` !  != !~]
-    redefinable_ops.each do |redefinable_op|
-      util_parser "def #{redefinable_op}\nend\n"
-      tk = @parser.get_tk
-      @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-    end
-
-    klass.method_list.each do |method|
-      assert_equal :on_ident, method.token_stream[5][:kind]
-      assert_includes redefinable_ops, method.token_stream[5][:text]
-    end
-  end
-
-  def test_parse_method_with_args_directive
-    util_parser <<-RUBY
-class C
-  def meth_with_args_after # :args: a, b, c
-  end
-
-  ##
-  # :args: d, e, f
-  def meth_with_args_before
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    assert_equal 'C#meth_with_args_after', c.method_list[0].full_name
-    assert_equal 'a, b, c', c.method_list[0].params
-    assert_equal 'C#meth_with_args_before', c.method_list[1].full_name
-    assert_equal 'd, e, f', c.method_list[1].params
-  end
-
-  def test_parse_method_bracket
-    util_parser <<-RUBY
-class C
-  def []; end
-  def self.[]; end
-  def []=; end
-  def self.[]=; end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    assert_equal 4, c.method_list.size
-    assert_equal 'C#[]', c.method_list[0].full_name
-    assert_equal 'C::[]', c.method_list[1].full_name
-    assert_equal 'C#[]=', c.method_list[2].full_name
-    assert_equal 'C::[]=', c.method_list[3].full_name
-    assert c.aliases.empty?
-  end
-
-  def test_parse_method_alias
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def m() alias a b; end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert klass.aliases.empty?
-  end
-
-  def test_parse_method_ampersand
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def self.&\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    ampersand = klass.method_list.first
-    assert_equal '&', ampersand.name
-    assert            ampersand.singleton
-  end
-
-  def test_parse_method_constant
-    c = RDoc::Constant.new 'CONST', nil, ''
-    m = @top_level.add_class RDoc::NormalModule, 'M'
-    m.add_constant c
-
-    util_parser "def CONST.m() end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method m, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[M], @store.classes_hash.keys
-  end
-
-  def test_parse_method_false
-    util_parser "def false.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'FalseClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_funky
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def (blah).foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_gvar
-    util_parser "def $stdout.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert @top_level.method_list.empty?
-  end
-
-  def test_parse_method_gvar_insane
-    util_parser "def $stdout.foo() class << $other; end; end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert @top_level.method_list.empty?
-
-    assert_empty @store.all_classes
-
-    assert_equal 1, @store.all_modules.length
-
-    refute @store.all_modules.first.document_self
-  end
-
-  def test_parse_method_internal_gvar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def $blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_internal_ivar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def @blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_internal_lvar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_nil
-    util_parser "def nil.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'NilClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_nodoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment('')
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_nodoc_track
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    @options.visibility = :nodoc
-
-    util_parser "def foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment('')
-
-    refute_empty klass.method_list
-  end
-
-  def test_parse_method_no_parens
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2 = {}\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2 = {})', foo.params
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_method_parameters_comment
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2 # some useful comment\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2)', foo.params
-  end
-
-  def test_parse_method_parameters_comment_continue
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2, # some useful comment\narg3\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2, arg3)', foo.params
-  end
-
-  def test_parse_method_parameters_with_paren_comment_continue
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo(arg1, arg2, # some useful comment\narg3)\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2, arg3)', foo.params
-  end
-
-  def test_parse_method_star
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def self.*\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    ampersand = klass.method_list.first
-    assert_equal '*', ampersand.name
-    assert            ampersand.singleton
-  end
-
-  def test_parse_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "def foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_toplevel
-    klass = @top_level
-
-    util_parser "def foo arg1, arg2\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    object = @store.find_class_named 'Object'
-
-    foo = object.method_list.first
-    assert_equal 'Object#foo', foo.full_name
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_method_toplevel_class
-    klass = @top_level
-
-    util_parser "def Object.foo arg1, arg2\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    object = @store.find_class_named 'Object'
-
-    foo = object.method_list.first
-    assert_equal 'Object::foo', foo.full_name
-  end
-
-  def test_parse_method_true
-    util_parser "def true.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'TrueClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_utf8
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    method = "def ω() end"
-
-    assert_equal Encoding::UTF_8, method.encoding
-
-    util_parser method
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    omega = klass.method_list.first
-    assert_equal "def \317\211", omega.text
-  end
-
-  def test_parse_method_dummy
-    util_parser ".method() end"
-
-    @parser.parse_method_dummy @top_level
-
-    assert_nil @parser.get_tk
-  end
-
-  def test_parse_method_or_yield_parameters_hash
-    util_parser "({})\n"
-
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    result = @parser.parse_method_or_yield_parameters m
-
-    assert_equal '({})', result
-  end
-
-  def test_parse_statements_class_if
-    util_parser <<-CODE
-module Foo
-  X = if TRUE then
-        ''
-      end
-
-  def blah
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name, 'module Foo'
-
-    methods = foo.method_list
-    assert_equal 1, methods.length
-    assert_equal 'Foo#blah', methods.first.full_name
-  end
-
-  def test_parse_statements_postfix_if_unless
-    util_parser <<-CODE
-class C
-  def foo
-    1 if nil
-  end
-
-  def bar
-    2 unless nil
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    c = @top_level.classes.first
-    assert_equal 'C', c.full_name, 'class C'
-
-    methods = c.method_list
-    assert_equal 2, methods.length
-    assert_equal 'C#foo', methods[0].full_name
-    assert_equal 'C#bar', methods[1].full_name
-  end
-
-  def test_parse_statements_postfix_if_unless_with_expr_mid
-    util_parser <<-CODE
-class A
-  class B
-    def foo
-      return if nil
-    end
-  end
-
-  class C
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    a = @top_level.classes.first
-    assert_equal 'A', a.full_name, 'class A'
-    assert_equal 2, a.classes.length
-    b = a.classes[0]
-    assert_equal 'A::B', b.full_name, 'class A::B'
-    c = a.classes[1]
-    assert_equal 'A::C', c.full_name, 'class A::C'
-  end
-
-  def test_parse_statements_class_nested
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "module Foo\n#{comment.text}class Bar\nend\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name, 'module Foo'
-
-    bar = foo.classes.first
-    assert_equal 'Foo::Bar', bar.full_name, 'class Foo::Bar'
-    assert_equal 'my method', bar.comment.text
-  end
-
-  def test_parse_statements_def_percent_string_pound
-    util_parser "class C\ndef a\n%r{#}\n%r{\#{}}\nend\ndef b() end\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    x = @top_level.classes.first
-
-    assert_equal 2, x.method_list.length
-    a = x.method_list.first
-
-
-    expected = [
-      {
-        :line_no => 2, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@filename}, line 2"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 2, :char_no => 0, :kind => :on_kw, :text => 'def' },
-      { :line_no => 2, :char_no => 3, :kind => :on_sp, :text => ' ' },
-      { :line_no => 2, :char_no => 4, :kind => :on_ident, :text => 'a' },
-      { :line_no => 2, :char_no => 5, :kind => :on_nl, :text => "\n" },
-      { :line_no => 3, :char_no => 0, :kind => :on_regexp, :text => '%r{#}' },
-      { :line_no => 3, :char_no => 5, :kind => :on_nl, :text => "\n" },
-      { :line_no => 4, :char_no => 0, :kind => :on_regexp, :text => '%r{#{}}' },
-      { :line_no => 4, :char_no => 7, :kind => :on_nl, :text => "\n" },
-      { :line_no => 5, :char_no => 0, :kind => :on_kw, :text => 'end' }
-    ]
-    parsed_stream = a.token_stream.map { |tk|
-      {
-        :line_no => tk[:line_no],
-        :char_no => tk[:char_no],
-        :kind => tk[:kind],
-        :text => tk[:text]
-      }
-    }
-
-    assert_equal expected, parsed_stream
-  end
-
-  def test_parse_statements_encoding
-    @options.encoding = Encoding::CP852
-
-    content = <<-EOF
-class Foo
-  ##
-  # this is my method
-  add_my_method :foo
-end
-    EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'this is my method', foo.comment.text
-    assert_equal Encoding::CP852, foo.comment.text.encoding
-  end
-
-  def test_parse_statements_enddoc
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :enddoc:"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert klass.done_documenting
-  end
-
-  def test_parse_statements_enddoc_top_level
-    util_parser "\n# :enddoc:"
-
-    assert_throws :eof do
-      @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-    end
-  end
-
-  def test_parse_statements_identifier_meta_method
-    content = <<-EOF
-class Foo
-  ##
-  # this is my method
-  add_my_method :foo
-end
-    EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_statements_identifier_alias_method
-    content = <<-RUBY
-class Foo
-  def foo() end
-  alias_method :foo2, :foo
-end
-    RUBY
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list[0]
-    assert_equal 'foo', foo.name
-
-    foo2 = @top_level.classes.first.method_list.last
-    assert_equal 'foo2', foo2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-    assert @top_level.classes.first.aliases.empty?
-  end
-
-  def test_parse_statements_identifier_alias_method_before_original_method
-    # This is not strictly legal Ruby code, but it simulates finding an alias
-    # for a method before finding the original method, which might happen
-    # to rdoc if the alias is in a different file than the original method
-    # and rdoc processes the alias' file first.
-    content = <<-EOF
-class Foo
-  alias_method :foo2, :foo
-
-  alias_method :foo3, :foo
-
-  def foo()
-  end
-
-  alias_method :foo4, :foo
-
-  alias_method :foo5, :unknown
-end
-EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list[0]
-    assert_equal 'foo', foo.name
-
-    foo2 = @top_level.classes.first.method_list[1]
-    assert_equal 'foo2', foo2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-
-    foo3 = @top_level.classes.first.method_list[2]
-    assert_equal 'foo3', foo3.name
-    assert_equal 'foo', foo3.is_alias_for.name
-
-    foo4 = @top_level.classes.first.method_list.last
-    assert_equal 'foo4', foo4.name
-    assert_equal 'foo', foo4.is_alias_for.name
-
-    assert_equal 'unknown', @top_level.classes.first.external_aliases[0].old_name
-  end
-
-  def test_parse_statements_identifier_args
-    comment = "##\n# :args: x\n# :method: b\n# my method\n"
-
-    util_parser "module M\n#{comment}def_delegator :a, :b, :b\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    m = @top_level.modules.first
-    assert_equal 'M', m.full_name
-
-    b = m.method_list.first
-    assert_equal 'M#b', b.full_name
-    assert_equal 'x', b.params
-    assert_equal 'my method', b.comment.text
-
-    assert_nil m.params, 'Module parameter not removed'
-  end
-
-  def test_parse_statements_identifier_constant
-    sixth_constant = <<-EOF
-Class.new do
-  rule :file do
-    all(x, y, z) {
-      def value
-        find(:require).each {|r| require r.value }
-        find(:grammar).map {|g| g.value }
-      end
-      def min; end
-    }
-  end
-end
-    EOF
-
-    content = <<-EOF
-class Foo
-  FIRST_CONSTANT = 5
-
-  SECOND_CONSTANT = [
-     1,
-     2,
-     3
-  ]
-
-  THIRD_CONSTANT = {
-     :foo => 'bar',
-     :x => 'y'
-  }
-
-  FOURTH_CONSTANT = SECOND_CONSTANT.map do |element|
-    element + 1
-    element + 2
-  end
-
-  FIFTH_CONSTANT = SECOND_CONSTANT.map { |element| element + 1 }
-
-  SIXTH_CONSTANT = #{sixth_constant}
-
-  SEVENTH_CONSTANT = proc { |i| begin i end }
-
-  EIGHTH_CONSTANT = "a" \\
-                    "b"
-end
-EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    constants = @top_level.classes.first.constants
-
-    constant = constants[0]
-    assert_equal 'FIRST_CONSTANT', constant.name
-    assert_equal '5', constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[1]
-    assert_equal 'SECOND_CONSTANT', constant.name
-    assert_equal "[\n1,\n2,\n3\n]", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[2]
-    assert_equal 'THIRD_CONSTANT', constant.name
-    assert_equal "{\n:foo => 'bar',\n:x => 'y'\n}", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[3]
-    assert_equal 'FOURTH_CONSTANT', constant.name
-    assert_equal "SECOND_CONSTANT.map do |element|\nelement + 1\nelement + 2\nend", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[4]
-    assert_equal 'FIFTH_CONSTANT', constant.name
-    assert_equal 'SECOND_CONSTANT.map { |element| element + 1 }', constant.value
-    assert_equal @top_level, constant.file
-
-    # TODO: parse as class
-    constant = constants[5]
-    assert_equal 'SIXTH_CONSTANT', constant.name
-    assert_equal sixth_constant.lines.map(&:strip).join("\n"), constant.value
-    assert_equal @top_level, constant.file
-
-    # TODO: parse as method
-    constant = constants[6]
-    assert_equal 'SEVENTH_CONSTANT', constant.name
-    assert_equal "proc { |i| begin i end }", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[7]
-    assert_equal 'EIGHTH_CONSTANT', constant.name
-    assert_equal "\"a\" \\\n\"b\"", constant.value
-    assert_equal @top_level, constant.file
-  end
-
-  def test_parse_statements_identifier_attr
-    content = "class Foo\nattr :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'R', foo.rw
-  end
-
-  def test_parse_statements_identifier_attr_accessor
-    content = "class Foo\nattr_accessor :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-  end
-
-  def test_parse_statements_identifier_define_method
-    util_parser <<-RUBY
-class C
-  ##
-  # :method: a
-  define_method :a do end
-  ##
-  # :method: b
-  define_method :b do end
-end
-    RUBY
-
-    @parser.parse_statements @top_level
-    c = @top_level.classes.first
-
-    assert_equal %w[a b], c.method_list.map { |m| m.name }
-  end
-
-  def test_parse_statements_identifier_include
-    content = "class Foo\ninclude Bar\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.name
-    assert_equal 1, foo.includes.length
-  end
-
-  def test_parse_statements_identifier_module_function
-    content = "module Foo\ndef foo() end\nmodule_function :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo, s_foo = @top_level.modules.first.method_list
-    assert_equal 'foo',    foo.name,       'instance method name'
-    assert_equal :private, foo.visibility, 'instance method visibility'
-    assert_equal false,    foo.singleton,  'instance method singleton'
-
-    assert_equal 'foo',   s_foo.name,       'module function name'
-    assert_equal :public, s_foo.visibility, 'module function visibility'
-    assert_equal true,    s_foo.singleton,  'module function singleton'
-  end
-
-  def test_parse_statements_identifier_private
-    content = "class Foo\nprivate\ndef foo() end\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal :private, foo.visibility
-  end
-
-  def test_parse_statements_identifier_public_class_method
-    content = <<-CONTENT
-class Date
-  def self.now; end
-  private_class_method :now
-end
-
-class DateTime < Date
-  public_class_method :now
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    date, date_time = @top_level.classes.sort_by { |c| c.full_name }
-
-    date_now      = date.method_list.first
-    date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
-
-    assert_equal :private, date_now.visibility
-    assert_equal :public,  date_time_now.visibility
-  end
-
-  def test_parse_statements_identifier_private_class_method
-    content = <<-CONTENT
-class Date
-  def self.now; end
-  public_class_method :now
-end
-
-class DateTime < Date
-  private_class_method :now
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    # TODO sort classes by default
-    date, date_time = @top_level.classes.sort_by { |c| c.full_name }
-
-    date_now      = date.method_list.first
-    date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
-
-    assert_equal :public,  date_now.visibility,      date_now.full_name
-    assert_equal :private, date_time_now.visibility, date_time_now.full_name
-  end
-
-  def test_parse_statements_complex_condition_in_for
-    util_parser <<RUBY
-class Foo
-  def blah()
-    for i in (k)...n do
-    end
-    for i in (k)...n
-    end
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-  <span class="ruby-keyword">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword">in</span> (<span class="ruby-identifier">k</span>)<span class="ruby-operator">...</span><span class="ruby-identifier">n</span> <span class="ruby-keyword">do</span>
-  <span class="ruby-keyword">end</span>
-  <span class="ruby-keyword">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword">in</span> (<span class="ruby-identifier">k</span>)<span class="ruby-operator">...</span><span class="ruby-identifier">n</span>
-  <span class="ruby-keyword">end</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_instance_operation_method
-    util_parser <<-RUBY
-class Foo
-  def self.& end
-end
-    RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">&amp;</span> <span class="ruby-keyword">end</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_statements_postfix_if_after_heredocbeg
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  def blah()
-    <<-EOM if true
-    EOM
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-    <span class="ruby-identifier">&lt;&lt;-EOM</span> <span class="ruby-keyword">if</span> <span class="ruby-keyword">true</span>
-<span class="ruby-value"></span><span class="ruby-identifier">    EOM</span>
-  <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_mutable_heredocbeg
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  def blah()
-    @str = -<<-EOM
-    EOM
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-    <span class="ruby-ivar">@str</span> = <span class="ruby-identifier">-&lt;&lt;-EOM</span>
-<span class="ruby-value"></span><span class="ruby-identifier">    EOM</span>
-  <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_heredoc_end
-    code = "A = <<eos\n""OK\n""eos\n"
-    util_parser code
-    @parser.parse_statements @top_level
-    @parser.scan
-    c = @top_level.classes.first.constants.first
-    assert_equal("A", c.name)
-
-    util_parser code.gsub(/$/, "\r")
-    @parser.parse_statements @top_level
-    @parser.scan
-    c = @top_level.classes.first.constants.first
-    assert_equal("A", c.name)
-  end
-
-  def test_parse_statements_method_oneliner_with_regexp
-    util_parser <<RUBY
-class Foo
-  def blah() /bar/ end
-end
-RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>() <span class="ruby-regexp">/bar/</span> <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_statements_embdoc_in_document
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  # doc
-  #
-  #   =begin
-  #   test embdoc
-  #   =end
-  #
-  def blah
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-<p>doc
-
-<pre class="ruby"><span class="ruby-comment">=begin
-test embdoc
-=end</span>
-</pre>
-EXPECTED
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_comment = blah.search_record[6]
-    assert_equal expected, markup_comment
-  end
-
-  def test_parse_require_dynamic_string
-    content = <<-RUBY
-prefix = 'path'
-require "\#{prefix}/a_library"
-require 'test'
-RUBY
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_equal 1, @top_level.requires.length
-  end
-
-  def test_parse_postfix_nodoc
-    util_parser <<-RUBY
-class A
-end # :nodoc:
-
-class B
-  def a
-  end # :nodoc:
-
-  def b
-  end
-end
-RUBY
-
-    @parser.parse_statements @top_level
-
-    c_a = @top_level.classes.select(&:document_self).first
-    assert_equal 'B', c_a.full_name
-
-    assert_equal 2, @top_level.classes.length
-    assert_equal 1, @top_level.classes.count(&:document_self)
-    assert_equal 1, c_a.method_list.length
-    assert_equal 'B#b', c_a.method_list.first.full_name
-  end
-
-  def test_parse_statements_identifier_require
-    content = "require 'bar'"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_equal 1, @top_level.requires.length
-  end
-
-  def test_parse_statements_identifier_yields
-    comment = "##\n# :yields: x\n# :method: b\n# my method\n"
-
-    util_parser "module M\n#{comment}def_delegator :a, :b, :b\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    m = @top_level.modules.first
-    assert_equal 'M', m.full_name
-
-    b = m.method_list.first
-    assert_equal 'M#b', b.full_name
-    assert_equal 'x', b.block_params
-    assert_equal 'my method', b.comment.text
-
-    assert_nil m.params, 'Module parameter not removed'
-  end
-
-  def test_parse_statements_nodoc_identifier_alias
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\nalias :old :new # :nodoc:"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_nodoc_identifier_alias_method
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\nalias_method :old :new # :nodoc:"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_stopdoc_alias
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nalias old new"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_stopdoc_identifier_alias_method
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nalias_method :old :new"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_stopdoc_identifier_metaprogrammed
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\n# attr :meta"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.method_list
-    assert_empty klass.attributes
-  end
-
-  def test_parse_statements_stopdoc_constant
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nA = v"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.constants
-  end
-
-  def test_parse_statements_stopdoc_def
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\ndef m\n end"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_statements_super
-    m = RDoc::AnyMethod.new '', 'm'
-    util_parser 'super'
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, m
-
-    assert m.calls_super
-  end
-
-  def test_parse_statements_super_no_method
-    content = "super"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_nil @parser.get_tk
-  end
-
-  def test_parse_statements_while_begin
-    util_parser <<-RUBY
-class A
-  def a
-    while begin a; b end
-    end
-  end
-
-  def b
-  end
-end
-    RUBY
-
-    @parser.parse_statements @top_level
-
-    c_a = @top_level.classes.first
-    assert_equal 'A', c_a.full_name
-
-    assert_equal 1, @top_level.classes.length
-
-    m_a = c_a.method_list.first
-    m_b = c_a.method_list.last
-
-    assert_equal 'A#a', m_a.full_name
-    assert_equal 'A#b', m_b.full_name
-  end
-
-
-  def test_parse_symbol_in_paren_arg
-    util_parser <<RUBY
-class Foo
-  def blah
-  end
-  private(:blah)
-end
-RUBY
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal :private, blah.visibility
-  end
-
-  def test_parse_symbol_in_arg
-    util_parser '[:blah, "blah", "#{blah}", blah]'
-    @parser.get_tk # skip '['
-
-    assert_equal 'blah', @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_equal 'blah', @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_nil @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_nil @parser.parse_symbol_in_arg
-  end
-
-  def test_parse_percent_symbol
-    content = '%s[foo bar]'
-    util_parser content
-    tk = @parser.get_tk
-    assert_equal :on_symbol, tk[:kind]
-    assert_equal content, tk[:text]
-  end
-
-  def test_parse_statements_alias_method
-    content = <<-CONTENT
-class A
-  alias_method :a, :[] unless c
-end
-
-B = A
-
-class C
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    # HACK where are the assertions?
-  end
-
-  def test_parse_top_level_statements_enddoc
-    util_parser <<-CONTENT
-# :enddoc:
-    CONTENT
-
-    assert_throws :eof do
-      @parser.parse_top_level_statements @top_level
-    end
-  end
-
-  def test_parse_top_level_statements_stopdoc
-    @top_level.stop_doc
-    content = "# this is the top-level comment"
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    assert_empty @top_level.comment
-  end
-
-  def test_parse_top_level_statements_stopdoc_integration
-    content = <<-CONTENT
-# :stopdoc:
-
-class Example
-  def method_name
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    assert_equal 1, @top_level.classes.length
-    assert_empty @top_level.modules
-
-    assert @top_level.find_module_named('Example').ignored?
-  end
-
-  # This tests parse_comment
-  def test_parse_top_level_statements_constant_nodoc_integration
-    content = <<-CONTENT
-class A
-  C = A # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    klass = @top_level.find_module_named('A')
-
-    c = klass.constants.first
-
-    assert_nil c.document_self, 'C should not be documented'
-  end
-
-  def test_parse_yield_in_braces_with_parens
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo\nn.times { |i| yield nth(i) }\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal 'nth(i)', foo.block_params
-  end
-
-  def test_read_directive
-    parser = util_parser '# :category: test'
-
-    directive, value = parser.read_directive %w[category]
-
-    assert_equal 'category', directive
-    assert_equal 'test', value
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_allow
-    parser = util_parser '# :category: test'
-
-    directive = parser.read_directive []
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_empty
-    parser = util_parser '# test'
-
-    directive = parser.read_directive %w[category]
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_no_comment
-    parser = util_parser ''
-
-    directive = parser.read_directive %w[category]
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_one_liner
-    parser = util_parser 'AAA = 1 # :category: test'
-
-    directive, value = parser.read_directive %w[category]
-
-    assert_equal 'category', directive
-    assert_equal 'test', value
-
-    assert_equal :on_const, parser.get_tk[:kind]
-  end
-
-  def test_read_directive_linear_performance
-    omit "JRuby intermittently times out" if RUBY_ENGINE == 'jruby'
-    pre = ->(i) {util_parser '# ' + '0'*i + '=000:'}
-    assert_linear_performance((1..5).map{|i|10**i}, pre: pre) do |parser|
-      assert_nil parser.read_directive []
-    end
-  end
-
-  def test_read_documentation_modifiers
-    c = RDoc::Context.new
-
-    parser = util_parser '# :category: test'
-
-    parser.read_documentation_modifiers c, %w[category]
-
-    assert_equal 'test', c.current_section.title
-  end
-
-  def test_read_documentation_modifiers_notnew
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :notnew: test'
-
-    parser.read_documentation_modifiers m, %w[notnew]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_read_documentation_modifiers_not_dash_new
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :not-new: test'
-
-    parser.read_documentation_modifiers m, %w[not-new]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_read_documentation_modifiers_not_new
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :not_new: test'
-
-    parser.read_documentation_modifiers m, %w[not_new]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_sanity_integer
-    util_parser '1'
-    assert_equal '1', @parser.get_tk[:text]
-
-    util_parser '1.0'
-    assert_equal '1.0', @parser.get_tk[:text]
-  end
-
-  def test_sanity_interpolation
-    last_tk = nil
-    util_parser 'class A; B = "#{c}"; end'
-
-    while tk = @parser.get_tk do last_tk = tk end
-
-    assert_equal 'end', last_tk[:text]
-  end
-
-  # If you're writing code like this you're doing it wrong
-
-  def test_sanity_interpolation_crazy
-    util_parser '"#{"#{"a")}" if b}"'
-
-    assert_equal '"#{"#{"a")}" if b}"', @parser.get_tk[:text]
-    assert_nil @parser.get_tk
-  end
-
-  def test_sanity_interpolation_curly
-    util_parser '%{ #{} }'
-
-    assert_equal '%{ #{} }', @parser.get_tk[:text]
-    assert_nil @parser.get_tk
-  end
-
-  def test_sanity_interpolation_format
-    util_parser '"#{stftime("%m-%d")}"'
-
-    while @parser.get_tk do end
-  end
-
-  def test_sanity_symbol_interpolation
-    util_parser ':"#{bar}="'
-
-    while @parser.get_tk do end
-  end
-
-  def test_scan_cr
-    content = <<-CONTENT
-class C\r
-  def m\r
-    a=\\\r
-      123\r
-  end\r
-end\r
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 1, c.method_list.length
-  end
-
-  def test_scan_block_comment
-    content = <<-CONTENT
-=begin rdoc
-Foo comment
-=end
-
-class Foo
-
-=begin
-m comment
-=end
-
-  def m() end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-
-    assert_equal 'Foo comment', foo.comment.text
-
-    m = foo.method_list.first
-
-    assert_equal 'm comment', m.comment.text
-  end
-
-  def test_scan_block_comment_nested # Issue #41
-    content = <<-CONTENT
-require 'something'
-=begin rdoc
-findmeindoc
-=end
-module Foo
-    class Bar
-    end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.modules.first
-
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'findmeindoc', foo.comment.text
-
-    bar = foo.classes.first
-
-    assert_equal 'Foo::Bar', bar.full_name
-    assert_equal '', bar.comment.text
-  end
-
-  def test_scan_block_comment_notflush
-  ##
-  #
-  # The previous test assumes that between the =begin/=end blocks that there
-  # is only one line, or minima formatting directives. This test tests for
-  # those who use the =begin block with longer / more advanced formatting
-  # within.
-  #
-  ##
-    content = <<-CONTENT
-=begin rdoc
-
-= DESCRIPTION
-
-This is a simple test class
-
-= RUMPUS
-
-Is a silly word
-
-=end
-class StevenSimpleClass
-  # A band on my iPhone as I wrote this test
-  FRUIT_BATS="Make nice music"
-
-=begin rdoc
-A nice girl
-=end
-
-  def lauren
-    puts "Summoning Lauren!"
-  end
-end
-    CONTENT
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-
-    assert_equal "= DESCRIPTION\n\nThis is a simple test class\n\n= RUMPUS\n\nIs a silly word",
-      foo.comment.text
-
-    m = foo.method_list.first
-
-    assert_equal 'A nice girl', m.comment.text
-  end
-
-  def test_scan_class_nested_nodoc
-    content = <<-CONTENT
-class A::B # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    visible = @store.all_classes_and_modules.select { |mod| mod.display? }
-
-    assert_empty visible.map { |mod| mod.full_name }
-  end
-
-  def test_scan_constant_in_method
-    content = <<-CONTENT # newline is after M is important
-module M
-  def m
-    A
-    B::C
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    m = @top_level.modules.first
-
-    assert_empty m.constants
-
-    assert_empty @store.classes_hash.keys
-    assert_equal %w[M], @store.modules_hash.keys
-  end
-
-  def test_scan_constant_in_rescue
-    content = <<-CONTENT # newline is after M is important
-module M
-  def m
-  rescue A::B
-  rescue A::C => e
-  rescue A::D, A::E
-  rescue A::F,
-         A::G
-  rescue H
-  rescue I => e
-  rescue J, K
-  rescue L =>
-    e
-  rescue M;
-  rescue N,
-         O => e
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    m = @top_level.modules.first
-
-    assert_empty m.constants
-
-    assert_empty @store.classes_hash.keys
-    assert_equal %w[M], @store.modules_hash.keys
-  end
-
-  def test_scan_constant_nodoc
-    content = <<-CONTENT # newline is after M is important
-module M
-
-  C = v # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.modules.first.constants.first
-
-    assert c.documented?
-  end
-
-  def test_scan_constant_nodoc_block
-    content = <<-CONTENT # newline is after M is important
-module M
-
-  C = v do # :nodoc:
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.modules.first.constants.first
-
-    assert c.documented?
-  end
-
-  def test_scan_duplicate_module
-    content = <<-CONTENT
-# comment a
-module Foo
-end
-
-# comment b
-module Foo
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.modules.first
-
-    expected = [
-      RDoc::Comment.new('comment a', @top_level),
-      RDoc::Comment.new('comment b', @top_level)
-    ]
-
-    assert_equal expected, foo.comment_location.map { |c, l| c }
-  end
-
-  def test_scan_meta_method_block
-    content = <<-CONTENT
-class C
-
-  ##
-  #  my method
-
-  inline(:my_method) do |*args|
-    "this method used to cause z to disappear"
-  end
-
-  def z
-  end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    assert_equal 2, @top_level.classes.first.method_list.length
-  end
-
-  def test_scan_method_semi_method
-    content = <<-CONTENT
-class A
-  def self.m() end; def self.m=() end
-end
-
-class B
-  def self.m() end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    a = @store.find_class_named 'A'
-    assert a, 'missing A'
-
-    assert_equal 2, a.method_list.length
-
-    b = @store.find_class_named 'B'
-    assert b, 'missing B'
-
-    assert_equal 1, b.method_list.length
-  end
-
-  def test_scan_markup_override
-    content = <<-CONTENT
-# *awesome*
-class C
-  # :markup: rd
-  # ((*radical*))
-  def m
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 'rdoc', c.comment.format
-
-    assert_equal 'rd', c.method_list.first.comment.format
-  end
-
-  def test_scan_markup_first_comment
-    content = <<-CONTENT
-# :markup: rd
-
-# ((*awesome*))
-class C
-  # ((*radical*))
-  def m
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 'rd', c.comment.format
-
-    assert_equal 'rd', c.method_list.first.comment.format
-  end
-
-  def test_scan_rails_routes
-    util_parser <<-ROUTES_RB
-namespace :api do
-  scope module: :v1 do
-  end
-end
-    ROUTES_RB
-
-    @parser.scan
-
-    assert_empty @top_level.classes
-    assert_empty @top_level.modules
-  end
-
-  def test_scan_tomdoc_meta
-    util_parser <<-RUBY
-# :markup: tomdoc
-
-class C
-
-  # Signature
-  #
-  #   find_by_<field>[_and_<field>...](args)
-  #
-  # field - A field name.
-
-end
-
-    RUBY
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    m = c.method_list.first
-
-    assert_equal "find_by_<field>[_and_<field>...]", m.name
-    assert_equal "find_by_<field>[_and_<field>...](args)\n", m.call_seq
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[field],
-            para('A field name.'))))
-    expected.file = @top_level
-
-    assert_equal expected, m.comment.parse
-  end
-
-  def test_scan_stopdoc
-    util_parser <<-RUBY
-class C
-  # :stopdoc:
-  class Hidden
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    hidden = c.classes.first
-
-    refute hidden.document_self
-    assert hidden.ignored?
-  end
-
-  def test_scan_stopdoc_class_alias
-    util_parser <<-RUBY
-# :stopdoc:
-module A
-  B = C
-end
-    RUBY
-
-    @parser.scan
-
-    assert_empty @store.all_classes
-
-    assert_equal 1, @store.all_modules.length
-    m = @store.all_modules.first
-
-    assert m.ignored?
-  end
-
-  def test_scan_stopdoc_nested
-    util_parser <<-RUBY
-# :stopdoc:
-class A::B
-end
-    RUBY
-
-    @parser.scan
-
-    a   = @store.modules_hash['A']
-    a_b = @store.classes_hash['A::B']
-
-    refute a.document_self, 'A is inside stopdoc'
-    assert a.ignored?,      'A is inside stopdoc'
-
-    refute a_b.document_self, 'A::B is inside stopdoc'
-    assert a_b.ignored?,      'A::B is inside stopdoc'
-  end
-
-  def test_scan_struct_self_brackets
-    util_parser <<-RUBY
-class C < M.m
-  def self.[]
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-    assert_equal %w[C::[]], c.method_list.map { |m| m.full_name }
-  end
-
-  def test_scan_visibility
-    util_parser <<-RUBY
-class C
-   def a() end
-
-   private :a
-
-   class << self
-     def b() end
-     private :b
-   end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    c_a = c.find_method_named 'a'
-
-    assert_equal :private, c_a.visibility
-    refute c_a.singleton
-
-    c_b = c.find_method_named 'b'
-
-    assert_equal :private, c_b.visibility
-    assert c_b.singleton
-  end
-
-  def test_scan_visibility_count
-    util_parser <<-RUBY
-class C < Original::Base
-  class C2 < Original::Base
-    def m0() end
-    def m1() end
-
-    private
-
-    def m2() end
-    def m3() end
-    def m4() end
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C::C2'
-
-    private_method_count = c.method_list.count { |m| :private == m.visibility }
-    assert_equal 3, private_method_count
-
-    public_method_count = c.method_list.count { |m| :public == m.visibility }
-    assert_equal 2, public_method_count
-  end
-
-  def test_scan_constant_visibility
-    util_parser <<-RUBY
-class C
-   CONST_A = 123
-
-   CONST_B = 234
-   private_constant :CONST_B
-
-   CONST_C = 345
-   public_constant :CONST_C
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-    const_a, const_b, const_c = c.constants.sort_by(&:name)
-
-    assert_equal 'CONST_A', const_a.name
-    assert_equal :public, const_a.visibility
-
-    assert_equal 'CONST_B', const_b.name
-    assert_equal :private, const_b.visibility
-
-    assert_equal 'CONST_C', const_c.name
-    assert_equal :public, const_c.visibility
-  end
-
-  def test_document_after_rescue_inside_paren
-    util_parser <<-RUBY
-class C
-  attr_accessor :sample if (1.inexistent_method rescue false)
-  # first
-  # second
-  def a
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    c_a = c.find_method_named 'a'
-    assert_equal "first\nsecond", c_a.comment.text
-  end
-
-  def test_singleton_method_via_eigenclass
-    util_parser <<-RUBY
-class C
-   class << self
-     def a() end
-   end
-end
-    RUBY
-
-    @parser.scan
-
-    c   = @store.find_class_named 'C'
-    c_a = c.find_method_named 'a'
-
-    assert_equal :public, c_a.visibility
-    assert c_a.singleton
-  end
-
-  def test_stopdoc_after_comment
-    util_parser <<-EOS
-      module Bar
-        # hello
-        module Foo
-          # :stopdoc:
-        end
-        # there
-        class Baz
-          # :stopdoc:
-        end
-      end
-    EOS
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.modules.first.modules.first
-    assert_equal 'Foo', foo.name
-    assert_equal 'hello', foo.comment.text
-
-    baz = @top_level.modules.first.classes.first
-    assert_equal 'Baz', baz.name
-    assert_equal 'there', baz.comment.text
-  end
-
-  def util_parser(content)
-    @parser = RDoc::Parser::Ruby.new @top_level, content, @options, @stats
-  end
-
-  def util_two_parsers(first_file_content, second_file_content)
-    util_parser first_file_content
-
-    @parser2 = RDoc::Parser::Ruby.new @top_level2, @filename,
-                                      second_file_content, @options, @stats
-  end
-
-  def test_parse_const_third_party
-    util_parser <<-CLASS
-class A
-  true if B
-  true if B::C
-  true if B::C::D
-
-  module B
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    a = @top_level.classes.first
-    assert_equal 'A', a.full_name
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A::B'], visible
-  end
-
-  def test_parse_const_alias_defined_elsewhere
-    util_parser <<-CLASS
-module A
-  Aliased = Defined
-end
-
-module A
-  class Defined
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @top_level.modules.first
-    assert_equal 'A', a.full_name
-    aliased = a.constants.first
-    assert_equal 'A::Aliased', aliased.full_name
-    assert_equal [], a.modules.map(&:full_name)
-    assert_equal ['A::Defined', 'A::Aliased'], a.classes.map(&:full_name)
-    assert_equal ['A::Aliased'], a.constants.map(&:full_name)
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A'], visible
-  end
-
-  def test_parse_const_alias_defined_far_away
-    util_parser <<-CLASS
-module A
-  Aliased = ::B::C::Defined
-end
-
-module B
-  module C
-    class Defined
-    end
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @top_level.modules.first
-    assert_equal 'A', a.full_name
-    assert_empty a.classes
-    assert_empty a.modules
-    assert_equal ['A::Aliased'], a.constants.map(&:full_name)
-
-    defined = @store.find_class_named 'B::C::Defined'
-    assert_equal 'B::C::Defined', defined.full_name
-
-    aliased = @store.find_class_named 'B::C::Aliased'
-    assert_equal 'B::C::Aliased', aliased.full_name
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A', 'B', 'B::C'], visible
-  end
-
-  def test_parse_include_by_dynamic_definition
-    util_parser <<-CLASS
-module A
-  class B
-    include(Module.new do
-      def e(m)
-      end
-    end)
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_without_paren
-    util_parser <<-CLASS
-module A
-  class B
-    include(Module.new do
-      def e m
-      end
-    end)
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_via_variable
-    util_parser <<-CLASS
-module A
-  class B
-    m = Module.new do
-      def e(m)
-      end
-    end
-    include m
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_with_brace
-    util_parser <<-CLASS
-module A
-  class B
-    extend(e {
-      def f(g)
-      end
-    })
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_directly
-    util_parser <<-CLASS
-module A
-  class B
-    include Module.new do
-      def e m
-      end
-    end
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_included
-    util_parser <<-CLASS
-module A
-  module B
-    extend ActiveSupport::Concern
-    included do
-      ##
-      # :singleton-method:
-      # Hello
-      mattr_accessor :foo
-    end
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_module_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    meth = a_b.method_list.first
-    assert_equal 'foo', meth.name
-    assert_equal 'Hello', meth.comment.text
-  end
-
-  def test_end_that_doesnt_belong_to_class_doesnt_change_visibility
-    util_parser <<-CLASS
-class A
-  private
-
-  begin
-  end
-
-  # Hello
-  def foo() end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_class_named 'A'
-    assert_equal 'A', a.full_name
-    assert_equal 'foo', a.find_method_named('foo').name
-    meth = a.method_list.first
-    assert_equal 'Hello', meth.comment.text
-  end
-
-  def test_parenthesized_cdecl
-    util_parser <<-RUBY
-module DidYouMean
-  class << (NameErrorCheckers = Object.new)
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    refute_predicate @store.find_class_or_module('DidYouMean'), :nil?
-    refute_predicate @store.find_class_or_module('DidYouMean::NameErrorCheckers'), :nil?
-  end
-end
diff --git a/test/mri/rdoc/rdoc_parser_simple_test.rb b/test/mri/rdoc/rdoc_parser_simple_test.rb
deleted file mode 100644
index 7296a40064f..00000000000
--- a/test/mri/rdoc/rdoc_parser_simple_test.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocParserSimpleTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_initialize_metadata
-    parser = util_parser ":unhandled: \n"
-
-    assert_includes @top_level.metadata, 'unhandled'
-
-    assert_equal ":unhandled: \n", parser.content
-  end
-
-  def test_remove_coding_comment
-    parser = util_parser <<-TEXT
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    TEXT
-
-    parser.scan
-
-    expected = <<-TEXT.strip
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    TEXT
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  # RDoc stops processing comments if it finds a comment line CONTAINING
-  # '<tt>#--</tt>'. This can be used to separate external from internal
-  # comments, or to stop a comment being associated with a method,
-  # class, or module. Commenting CAN be turned back on with
-  # a line that STARTS '<tt>#++</tt>'.
-  #
-  # I've seen guys that comment their code like this:
-  #   # This method....
-  #   #-----------------
-  #   def method
-  #
-  # => either we do it only in ruby code, or we require the leading #
-  #    (to avoid conflict with rules).
-  #
-  #   TODO: require the leading #, to provide the feature in simple text files.
-  #   Note: in ruby & C code, we require '#--' & '#++' or '*--' & '*++',
-  #   to allow rules:
-  #
-  #   # this is a comment
-  #   #---
-  #   # private text
-  #   #+++
-  #   # this is a rule:
-  #   # ---
-
-  def test_remove_private_comments
-    parser = util_parser "foo\n\n--\nbar\n++\n\nbaz\n"
-
-    parser.scan
-
-    expected = "foo\n\n\nbaz"
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  def test_remove_private_comments_rule
-    parser = util_parser "foo\n---\nbar"
-
-    parser.scan
-
-    expected = "foo\n---\nbar"
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  def test_remove_private_comments_star
-    parser = util_parser "* foo\n* bar\n"
-
-    parser.scan
-
-    assert_equal "* foo\n* bar", @top_level.comment.text
-  end
-
-  def test_scan
-    parser = util_parser 'it *really* works'
-
-    parser.scan
-
-    assert_equal 'it *really* works', @top_level.comment.text
-  end
-
-  def util_parser(content)
-    RDoc::Parser::Simple.new @top_level, content, @options, @stats
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_parser_test.rb b/test/mri/rdoc/rdoc_parser_test.rb
deleted file mode 100644
index 7b890f703d2..00000000000
--- a/test/mri/rdoc/rdoc_parser_test.rb
+++ /dev/null
@@ -1,334 +0,0 @@
-# -*- coding: us-ascii -*-
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RDocParserTest < RDoc::TestCase
-  def setup
-    super
-
-    @RP = RDoc::Parser
-    @binary_dat_fixture_path = File.expand_path '../binary.dat', __FILE__
-    @options = RDoc::Options.new
-  end
-
-  def test_class_binary_eh_ISO_2022_JP
-    iso_2022_jp = File.join Dir.tmpdir, "test_rdoc_parser_#{$$}.rd"
-
-    File.open iso_2022_jp, 'wb' do |io|
-      io.write "# coding: ISO-2022-JP\n"
-      io.write ":\e$B%3%^%s%I\e(B:\n"
-    end
-
-    refute @RP.binary? iso_2022_jp
-  ensure
-    File.unlink iso_2022_jp
-  end
-
-  def test_class_binary_eh_marshal
-    marshal = File.join Dir.tmpdir, "test_rdoc_parser_#{$$}.marshal"
-    File.open marshal, 'wb' do |io|
-      io.write Marshal.dump('')
-      io.write 'lots of text ' * 500
-    end
-
-    assert @RP.binary?(marshal)
-  ensure
-    File.unlink marshal
-  end
-
-  def test_class_binary_japanese_text
-    file_name = File.expand_path '../test.ja.txt', __FILE__
-    refute @RP.binary?(file_name)
-  end
-
-  def test_class_binary_large_japanese_rdoc
-    capture_output do
-      begin
-        extenc, Encoding.default_external =
-          Encoding.default_external, Encoding::US_ASCII
-        file_name = File.expand_path '../test.ja.largedoc', __FILE__
-        assert !@RP.binary?(file_name)
-      ensure
-        Encoding.default_external = extenc
-      end
-    end
-  end
-
-  def test_class_binary_japanese_rdoc
-    file_name = File.expand_path '../test.ja.rdoc', __FILE__
-    refute @RP.binary?(file_name)
-  end
-
-  def test_class_can_parse
-    assert_equal @RP.can_parse(__FILE__), @RP::Ruby
-
-    readme_file_name = File.expand_path '../test.txt', __FILE__
-
-    assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
-
-    assert_equal @RP::Simple, @RP.can_parse(@binary_dat_fixture_path)
-
-    jtest_file_name = File.expand_path '../test.ja.txt', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_file_name)
-
-    jtest_rdoc_file_name = File.expand_path '../test.ja.rdoc', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_rdoc_file_name)
-
-    readme_file_name = File.expand_path '../README', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
-
-    jtest_largerdoc_file_name = File.expand_path '../test.ja.largedoc', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
-
-    @RP.alias_extension 'rdoc', 'largedoc'
-    assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
-  end
-
-  def test_class_for_executable
-    with_top_level("app", "#!/usr/bin/env ruby -w\n") do |top_level, content|
-      parser = @RP.for top_level, content, @options, :stats
-
-      assert_kind_of RDoc::Parser::Ruby, parser
-
-      assert_equal top_level.absolute_name, parser.file_name
-    end
-  end
-
-  def test_class_for_forbidden
-    omit 'chmod not supported' if Gem.win_platform?
-
-    tf = Tempfile.open 'forbidden' do |io|
-      begin
-        File.chmod 0000, io.path
-        forbidden = @store.add_file io.path
-
-        parser = @RP.for forbidden, '', @options, :stats
-
-        assert_nil parser
-      ensure
-        File.chmod 0400, io.path
-      end
-      io
-    end
-    tf.close!
-  end
-
-  def test_class_for_modeline
-    with_top_level("NEWS", "# -*- rdoc -*-\n= NEWS\n") do |top_level, content|
-      parser = @RP.for top_level, content, @options, :stats
-
-      assert_kind_of RDoc::Parser::Simple, parser
-
-      assert_equal "= NEWS\n", parser.content
-    end
-  end
-
-  def test_can_parse_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- rdoc -*- created at: Mon Aug 7 16:45:54 JST 1995"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal RDoc::Parser::Simple, @RP.can_parse(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_can_parse_modeline_c
-    readme_inc = File.join Dir.tmpdir, "README.inc.#{$$}"
-
-    File.open readme_inc, 'w' do |io|
-      io.puts "/* README.inc -  -*- c -*- created at: Mon Aug 7 16:45:54 JST 1995 */"
-      io.puts
-      io.puts "/* This document explains how to make extension libraries for Ruby. */"
-    end
-
-    assert_equal RDoc::Parser::C, @RP.can_parse(readme_inc)
-  ensure
-    File.unlink readme_inc
-  end
-
-  ##
-  # Selenium hides a .jar file using a .txt extension.
-
-  def test_class_can_parse_zip
-    hidden_zip = File.expand_path '../hidden.zip.txt', __FILE__
-    assert_nil @RP.can_parse(hidden_zip)
-  end
-
-  def test_check_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal 'rdoc', @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_coding
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# -*- coding: utf-8 -*-"
-    end
-
-    assert_nil @RP.check_modeline readme_ext
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_with_other
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- mode: RDoc; indent-tabs-mode: nil -*-"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal 'rdoc', @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_no_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_nil @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_class_for_binary
-    dat_fixture = File.read(@binary_dat_fixture_path)
-    with_top_level("binary.dat", dat_fixture) do |top_level, content|
-      assert_nil @RP.for(top_level, content, @options, nil)
-    end
-  end
-
-  def test_class_for_markup
-    with_top_level("file.rb", "# coding: utf-8 markup: rd") do |top_level, content|
-      parser = @RP.for top_level, content, @options, nil
-
-      assert_kind_of @RP::RD, parser
-    end
-  end
-
-  def test_class_use_markup
-    content = <<-CONTENT
-# coding: utf-8 markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_markdown
-    content = <<-CONTENT
-# coding: utf-8 markup: markdown
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::Ruby, parser
-  end
-
-  def test_class_use_markup_modeline
-    content = <<-CONTENT
-# -*- coding: utf-8 -*-
-# markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_modeline_shebang
-    content = <<-CONTENT
-#!/bin/sh
-/* -*- coding: utf-8 -*-
- * markup: rd
- */
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_shebang
-    content = <<-CONTENT
-#!/usr/bin/env ruby
-# coding: utf-8 markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_tomdoc
-    content = <<-CONTENT
-# coding: utf-8 markup: tomdoc
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::Ruby, parser
-  end
-
-  def test_class_use_markup_none
-    parser = @RP.use_markup ''
-
-    assert_nil parser
-  end
-
-  def test_class_use_markup_unknown
-    content = <<-CONTENT
-# :markup: RDoc
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_nil parser
-  end
-
-  def test_initialize
-    with_top_level("file.rb", "") do |top_level, content|
-      @RP.new top_level, content, @options, nil
-
-      assert_equal @RP, top_level.parser
-    end
-  end
-
-  private
-
-  def with_top_level(filename, content, &block)
-    absoluate_filename  = File.join Dir.tmpdir, filename
-    File.open absoluate_filename, 'w' do |io|
-      io.write content
-    end
-
-    top_level = RDoc::TopLevel.new absoluate_filename
-
-    yield(top_level, content)
-  ensure
-    File.unlink absoluate_filename
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_rd_block_parser_test.rb b/test/mri/rdoc/rdoc_rd_block_parser_test.rb
deleted file mode 100644
index 50bf075a5a7..00000000000
--- a/test/mri/rdoc/rdoc_rd_block_parser_test.rb
+++ /dev/null
@@ -1,557 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRdBlockParserTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @block_parser = RDoc::RD::BlockParser.new
-  end
-
-  def test_add_footnote
-    index = @block_parser.add_footnote 'context'
-
-    assert_equal 1, index
-
-    expected = [
-      para('{^1}[rdoc-label:footmark-1:foottext-1]', ' ', 'context'),
-      blank_line,
-    ]
-
-    assert_equal expected, @block_parser.footnotes
-
-    index = @block_parser.add_footnote 'other'
-
-    assert_equal 2, index
-  end
-
-  def test_parse_desclist
-    list = <<-LIST
-:one
-  desc one
-:two
-  desc two
-    LIST
-
-    expected =
-      doc(
-        list(:NOTE,
-          item("one", para("desc one")),
-          item("two", para("desc two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist
-    list = <<-LIST
-(1) one
-(1) two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil, para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_paragraphs
-    list = <<-LIST
-(1) one
-
-    two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("one"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_multiline
-    list = <<-LIST
-(1) one
-    two
-    LIST
-
-    contents = "one\n     two" # 1.8 vs 1.9
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para(*contents))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_verbatim
-    list = <<-LIST
-(1) item
-      verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("item"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_verbatim_continue
-    list = <<-LIST
-(1) one
-      verbatim
-    two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("one"),
-            verb("verbatim\n"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_footnote
-    expected =
-      doc(
-        para("{*1}[rdoc-label:foottext-1:footmark-1]"),
-        rule(1),
-        para("{^1}[rdoc-label:footmark-1:foottext-1]", " ", "text"),
-        blank_line)
-
-    assert_equal expected, parse("((-text-))")
-  end
-
-  def test_parse_include
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected = doc(@RM::Include.new("parse_include", [Dir.tmpdir]))
-
-    assert_equal expected, parse("<<< parse_include")
-  end
-
-  def test_parse_include_subtree
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected =
-      doc(
-        blank_line,
-        para("include <em>worked</em>"),
-        blank_line,
-        blank_line)
-
-    tf = Tempfile.open %w[parse_include .rd] do |io|
-      io.puts "=begin\ninclude ((*worked*))\n=end"
-      io.flush
-
-      str = <<-STR
-<<< #{File.basename io.path}
-      STR
-
-      assert_equal expected, parse(str)
-      io
-    end
-    tf.close!
-  end
-
-=begin
-  def test_parse_include_other_format
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected =
-      doc(
-        blank_line,
-        para("include ((*worked*))"),
-        blank_line,
-        blank_line)
-
-    str = <<~STR
-    =begin nonrd
-    <<< worked
-    =end
-    STR
-
-    assert_equal(expected, @block_parser.parse str.lines.to_a)
-  end
-=end
-
-  def test_parse_heading
-    assert_equal doc(head(1, "H")), parse("= H")
-    assert_equal doc(head(2, "H")), parse("== H")
-    assert_equal doc(head(3, "H")), parse("=== H")
-    assert_equal doc(head(4, "H")), parse("==== H")
-    assert_equal doc(head(5, "H")), parse("+ H")
-    assert_equal doc(head(6, "H")), parse("++ H")
-  end
-
-  def test_parse_itemlist
-    list = <<-LIST
-* one
-* two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil, para("one")),
-          item(nil, para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_multiline
-    list = <<-LIST
-* one
-  two
-    LIST
-
-    contents = "one\n   two" # 1.8 vs 1.9
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil, para(*contents))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_nest
-    list = <<-LIST
-* one
-  * inner
-* two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            list(:BULLET,
-              item(nil, para("inner")))),
-          item(nil,
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_paragraphs
-    list = <<-LIST
-* one
-
-  two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_verbatim
-    list = <<-LIST
-* item
-    verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("item"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_verbatim_continue
-    list = <<-LIST
-* one
-    verbatim
-  two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            verb("verbatim\n"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists
-    list = <<-LIST
-(1) one
-(1) two
-* three
-* four
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil, para("two"))),
-        list(:BULLET,
-          item(nil, para("three")),
-          item(nil, para("four"))),
-        list(:NUMBER,
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four")))),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest_verbatim
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-     verbatim
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four"))),
-            verb("verbatim\n")),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest_verbatim2
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-      verbatim
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four"))),
-            verb("verbatim\n")),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist
-    list = <<-LIST
---- Array#each {|i| ... }
-      yield block for each item.
---- Array#index(val)
-      return index of first item which equals with val. if it hasn't
-      same item, return nil.
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>Array#each {|i| ... }</tt>",
-            para("yield block for each item.")),
-          item(
-            "<tt>Array#index(val)</tt>",
-            para("return index of first item which equals with val. if it hasn't same item, return nil."))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_empty
-    list = <<-LIST
---- A#b
-
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item("<tt>A#b</tt>")))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph
-    list = <<-LIST
---- A#b
-
-    one
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("one"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph2
-    list = <<-LIST.chomp
---- A#b
-
-    one
-two
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("one"))),
-        para("two"))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph_verbatim
-    list = <<-LIST.chomp
---- A#b
-
-    text
-      verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("text"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_verbatim
-    assert_equal doc(verb("verbatim\n")), parse("  verbatim")
-  end
-
-  def test_parse_verbatim_blankline
-    expected = doc(verb("one\n", "\n", "two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-
-  two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_verbatim_indent
-    expected = doc(verb("one\n", " two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-   two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_verbatim_multi
-    expected = doc(verb("one\n", "two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-  two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_textblock
-    assert_equal doc(para("text")), parse("text")
-  end
-
-  def test_parse_textblock_multi
-    expected = doc(para("one two"))
-
-    assert_equal expected, parse("one\ntwo")
-  end
-
-  def parse(text)
-    text = ["=begin", text, "=end"].join "\n"
-
-    doc = @block_parser.parse text.lines.to_a
-
-    assert_equal blank_line, doc.parts.shift, "=begin blankline"
-    assert_equal blank_line, doc.parts.pop, "=end blankline"
-
-    doc
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_rd_inline_parser_test.rb b/test/mri/rdoc/rdoc_rd_inline_parser_test.rb
deleted file mode 100644
index e484dbe8334..00000000000
--- a/test/mri/rdoc/rdoc_rd_inline_parser_test.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRdInlineParserTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @block_parser = RDoc::RD::BlockParser.new
-    @block_parser.instance_variable_set :@i, 0
-    @inline_parser = RDoc::RD::InlineParser.new @block_parser
-  end
-
-  def test_parse
-    assert_equal 'regular <em>emphasis</em>', parse('regular ((*emphasis*))')
-  end
-
-  def test_parse_code
-    assert_equal '<code>text</code>', parse('(({text}))')
-  end
-
-  def test_parse_em
-    assert_equal '<em>text</em>', parse('((*text*))')
-  end
-
-  def test_parse_footnote
-    assert_equal '{*1}[rdoc-label:foottext-1:footmark-1]', parse('((-text-))')
-
-    expected = [
-      @RM::Paragraph.new('{^1}[rdoc-label:footmark-1:foottext-1]', ' ', 'text'),
-      blank_line,
-    ]
-
-    assert_equal expected, @block_parser.footnotes
-  end
-
-  def test_parse_index
-    assert_equal '<span id="label-text">text</span>', parse('((:text:))')
-
-    assert_includes @block_parser.labels, 'text'
-  end
-
-  def test_parse_kbd
-    assert_equal '<tt>text</tt>', parse('((%text%))')
-  end
-
-  def test_parse_multiple
-    assert_equal '<em>one</em> <em>two</em>', parse('((*one*)) ((*two*))')
-  end
-
-  def test_parse_newline
-    assert_equal "one\ntwo", parse("one\ntwo")
-  end
-
-  def test_parse_quote
-    assert_equal 'one " two', parse('one " two')
-  end
-
-  def test_parse_ref
-    assert_equal '{text}[rdoc-label:text]', parse('((<text>))')
-  end
-
-  def test_parse_ref_em
-    assert_equal '{<em>text</em>}[rdoc-label:text]', parse('((<((*text*))>))')
-  end
-
-  def test_parse_ref_filename_quote
-    assert_equal '{RD/foo}[rdoc-label:RD/foo]', parse('((<RD/"foo">))')
-  end
-
-  def test_parse_ref_filename
-    assert_equal '{RD}[rdoc-label:RD/]', parse('((<RD/>))')
-  end
-
-  def test_parse_ref_quote
-    assert_equal '{text \\"}[rdoc-label:text \\"]', parse('((<text \">))')
-  end
-
-  def test_parse_ref_quote_content
-    assert_equal '{<em>text</em>}[rdoc-label:text]',
-                 parse('((<"((*text*))">))')
-  end
-
-  def test_parse_ref_quote_content_multi
-    assert_equal '{<em>one</em> <em>two</em>}[rdoc-label:one two]',
-                 parse('((<"((*one*)) ((*two*))">))')
-  end
-
-  def test_parse_ref_substitute
-    assert_equal '{text}[rdoc-label:thing]', parse('((<text|thing>))')
-  end
-
-  def test_parse_ref_substitute_element_quote
-    assert_equal '{text}[rdoc-label:"RD"]',
-                 parse('((<text|"RD">))')
-  end
-
-  def test_parse_ref_substitute_filename
-    assert_equal '{text}[rdoc-label:RD/]', parse('((<text|RD/>))')
-  end
-
-  def test_parse_ref_substitute_filename_label
-    assert_equal '{text}[rdoc-label:RD/label]',
-                 parse('((<text|RD/label>))')
-  end
-
-  def test_parse_ref_substitute_filename_quote
-    assert_equal '{text}[rdoc-label:"RD"/]', parse('((<text|"RD"/>))')
-  end
-
-  def test_parse_ref_substitute_multi_content
-    assert_equal '{<em>one</em> two}[rdoc-label:thing]',
-                 parse('((<((*one*)) two|thing>))')
-  end
-
-  def test_parse_ref_substitute_multi_content2
-    assert_equal '{<em>one</em> \\" two}[rdoc-label:thing]',
-                 parse('((<((*one*)) \" two|thing>))')
-  end
-
-  def test_parse_ref_substitute_multi_content3
-    assert_equal '{<em>one</em> \\" <em>two</em>}[rdoc-label:thing]',
-                 parse('((<((*one*)) \" ((*two*))|thing>))')
-  end
-
-  def test_parse_ref_substitute_quote
-    assert_equal '{one | two}[rdoc-label:thing]',
-                 parse('((<"one | two"|thing>))')
-  end
-
-  def test_parse_ref_substitute_quote_content
-    assert_equal '{<em>text</em>}[rdoc-label:thing]',
-                 parse('((<"((*text*))"|thing>))')
-  end
-
-  def test_parse_ref_substitute_url
-    assert_equal '{text}[http://example]',
-                 parse('((<text|URL:http://example>))')
-  end
-
-  def test_parse_ref_url
-    assert_equal '{http://example}[http://example]',
-                 parse('((<URL:http://example>))')
-  end
-
-  def test_parse_var
-    assert_equal '+text+', parse('((|text|))')
-  end
-
-  def test_parse_verb
-    assert_equal '<tt>text</tt>', parse("(('text'))")
-  end
-
-  def test_parse_verb_backslash
-    assert_equal "<tt>(('text'))</tt>", parse("(('(('text\\'))'))")
-  end
-
-  def test_parse_verb_backslash_backslash
-    assert_equal '<tt>text \\</tt>', parse("(('text \\\\'))")
-  end
-
-  def test_parse_verb_backslash_quote
-    assert_equal '<tt>text "</tt>', parse("(('text \\\"'))")
-  end
-
-  def test_parse_verb_emphasis
-    assert_equal '<tt>((*emphasis*))</tt>', parse("(('((*emphasis*))'))")
-  end
-
-  def test_parse_verb_multiple
-    assert_equal '<tt>((*text*))</tt>', parse("(('((*text*))'))")
-  end
-
-  def parse(text)
-    @inline_parser.parse text
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_rd_inline_test.rb b/test/mri/rdoc/rdoc_rd_inline_test.rb
deleted file mode 100644
index c4984949f4c..00000000000
--- a/test/mri/rdoc/rdoc_rd_inline_test.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRdInlineTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @inline = RDoc::RD::Inline.new '+text+', 'text'
-  end
-
-  def test_class_new
-    inline = RDoc::RD::Inline.new @inline
-
-    refute_equal inline.rdoc, inline.reference
-  end
-
-  def test_initialize
-    inline = RDoc::RD::Inline.new 'text'
-
-    assert_equal inline.rdoc, inline.reference
-    refute_same  inline.rdoc, inline.reference
-  end
-
-  def test_initialize_inline
-    inline = RDoc::RD::Inline.new @inline
-
-    assert_equal '+text+', inline.rdoc
-    assert_equal 'text',   inline.reference
-  end
-
-  def test_append_inline
-    out = @inline.append @inline
-
-    assert_same @inline, out
-
-    assert_equal '+text++text+', @inline.rdoc
-    assert_equal 'texttext',     @inline.reference
-  end
-
-  def test_append_string
-    @inline.append ' more'
-
-    assert_equal '+text+ more', @inline.rdoc
-    assert_equal 'text more',   @inline.reference
-  end
-
-  def test_equals2
-    assert_equal @inline, RDoc::RD::Inline.new('+text+', 'text')
-    refute_equal @inline, RDoc::RD::Inline.new('+text+', 'other')
-    refute_equal @inline, RDoc::RD::Inline.new('+other+', 'text')
-    refute_equal @inline, Object.new
-  end
-
-  def test_inspect
-    assert_equal '(inline: +text+)', @inline.inspect
-  end
-
-  def test_to_s
-    assert_equal '+text+', @inline.to_s
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_rd_test.rb b/test/mri/rdoc/rdoc_rd_test.rb
deleted file mode 100644
index 8842aaccbee..00000000000
--- a/test/mri/rdoc/rdoc_rd_test.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRdTest < RDoc::TestCase
-
-  def test_class_parse
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("hello")
-  end
-
-  def test_class_parse_begin_end
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("=begin\nhello\n=end\n")
-  end
-
-  def test_class_parse_newline
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("hello\n")
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_rdoc_test.rb b/test/mri/rdoc/rdoc_rdoc_test.rb
deleted file mode 100644
index 6760badfe2c..00000000000
--- a/test/mri/rdoc/rdoc_rdoc_test.rb
+++ /dev/null
@@ -1,582 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRDocTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @rdoc = RDoc::RDoc.new
-    @options = RDoc::Options.new
-    @rdoc.options = @options
-
-    @stats = RDoc::Stats.new @store, 0, 0
-    @rdoc.instance_variable_set :@stats, @stats
-  end
-
-  def test_document # functional test
-    options = RDoc::Options.new
-    options.files = [File.expand_path('../xref_data.rb', __FILE__)]
-    options.setup_generator 'ri'
-    options.main_page = 'MAIN_PAGE.rdoc'
-    options.root      = Pathname File.expand_path('..', __FILE__)
-    options.title     = 'title'
-
-    rdoc = RDoc::RDoc.new
-
-    temp_dir do
-      options.op_dir = 'ri'
-
-      capture_output do
-        rdoc.document options
-      end
-
-      assert File.directory? 'ri'
-    end
-
-    store = rdoc.store
-
-    assert_equal 'MAIN_PAGE.rdoc', store.main
-    assert_equal 'title',          store.title
-  end
-
-  def test_document_with_dry_run # functional test
-    options = RDoc::Options.new
-    options.files = [File.expand_path('../xref_data.rb', __FILE__)]
-    options.setup_generator 'darkfish'
-    options.main_page = 'MAIN_PAGE.rdoc'
-    options.root      = Pathname File.expand_path('..', __FILE__)
-    options.title     = 'title'
-    options.dry_run = true
-
-    rdoc = RDoc::RDoc.new
-
-    out = nil
-    temp_dir do
-      out, = capture_output do
-        rdoc.document options
-      end
-
-      refute File.directory? 'doc'
-    end
-    assert_includes out, '100%'
-
-    store = rdoc.store
-
-    assert_equal 'MAIN_PAGE.rdoc', store.main
-    assert_equal 'title',          store.title
-  end
-
-  def test_gather_files
-    a = File.expand_path __FILE__
-    b = File.expand_path '../rdoc_text_test.rb', __FILE__
-
-    assert_equal [a, b], @rdoc.gather_files([b, a, b])
-
-    assert_empty @rdoc.gather_files([b, a, b])
-
-    @rdoc.last_modified[a] -= 10
-    assert_equal [a, b], @rdoc.gather_files([b, a, b])
-  end
-
-  def test_handle_pipe
-    $stdin = StringIO.new "hello"
-
-    out, = capture_output do
-      @rdoc.handle_pipe
-    end
-
-    assert_equal "\n<p>hello</p>\n", out
-  ensure
-    $stdin = STDIN
-  end
-
-  def test_handle_pipe_rd
-    $stdin = StringIO.new "=begin\nhello\n=end"
-
-    @rdoc.options.markup = 'rd'
-
-    out, = capture_output do
-      @rdoc.handle_pipe
-    end
-
-    assert_equal "\n<p>hello</p>\n", out
-  ensure
-    $stdin = STDIN
-  end
-
-  def test_normalized_file_list
-    test_path = File.expand_path(__FILE__)
-    files = temp_dir do |dir|
-      flag_file = @rdoc.output_flag_file dir
-
-      FileUtils.touch flag_file
-
-      @rdoc.normalized_file_list [test_path, flag_file]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal [test_path], files
-  end
-
-  def test_normalized_file_list_not_modified
-    @rdoc.last_modified[__FILE__] = File.stat(__FILE__).mtime
-
-    files = @rdoc.normalized_file_list [__FILE__]
-
-    files = files.collect {|file, mtime| file if mtime}.compact
-
-    assert_empty(files)
-  end
-
-  def test_normalized_file_list_non_file_directory
-    dev = File::NULL
-    omit "#{dev} is not a character special" unless
-      File.chardev? dev
-
-    files = nil
-
-    out, err = verbose_capture_output do
-      files = @rdoc.normalized_file_list [dev]
-    end
-
-    files = files.map { |file| File.expand_path file }
-
-    assert_empty files
-
-    assert_empty out
-    assert_match %r"^rdoc can't parse", err
-    assert_match %r"#{dev}$",           err
-  end
-
-  def test_normalized_file_list_with_dot_doc
-    expected_files = []
-    files = temp_dir do |dir|
-      a = File.expand_path('a.rb')
-      b = File.expand_path('b.rb')
-      c = File.expand_path('c.rb')
-      FileUtils.touch a
-      FileUtils.touch b
-      FileUtils.touch c
-      # Use Dir.glob to convert short path of Dir.tmpdir to long path.
-      a = Dir.glob(a).first
-      b = Dir.glob(b).first
-      c = Dir.glob(c).first
-
-      File.write('.document', "a.rb\n""b.rb\n")
-      expected_files << a
-      expected_files << b
-
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal expected_files, files
-  end
-
-  def test_normalized_file_list_with_dot_doc_overridden_by_exclude_option
-    expected_files = []
-    files = temp_dir do |dir|
-      a = File.expand_path('a.rb')
-      b = File.expand_path('b.rb')
-      c = File.expand_path('c.rb')
-      FileUtils.touch a
-      FileUtils.touch b
-      FileUtils.touch c
-      # Use Dir.glob to convert short path of Dir.tmpdir to long path.
-      a = Dir.glob(a).first
-      b = Dir.glob(b).first
-      c = Dir.glob(c).first
-
-      File.write('.document', "a.rb\n""b.rb\n")
-      expected_files << a
-
-      @rdoc.options.exclude = /b\.rb$/
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal expected_files, files
-  end
-
-  def test_normalized_file_list_with_skipping_tests_enabled
-    files = temp_dir do |dir|
-      @a = File.expand_path('a.rb')
-      spec_dir = File.expand_path('spec')
-      spec_file = File.expand_path(File.join('spec', 'my_spec.rb'))
-      test_dir = File.expand_path('test')
-      test_file = File.expand_path(File.join('test', 'my_test.rb'))
-      FileUtils.touch @a
-      FileUtils.mkdir_p spec_dir
-      FileUtils.touch spec_file
-      FileUtils.mkdir_p test_dir
-      FileUtils.touch test_file
-
-      @rdoc.options.skip_tests = true
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-    assert_equal [@a], files
-  end
-
-  def test_normalized_file_list_with_skipping_tests_disabled
-    files = temp_dir do |dir|
-      @a = File.expand_path('a.rb')
-      spec_dir = File.expand_path('spec')
-      @spec_file = File.expand_path(File.join('spec', 'my_spec.rb'))
-      test_dir = File.expand_path('test')
-      @test_file = File.expand_path(File.join('test', 'my_test.rb'))
-      FileUtils.touch @a
-      FileUtils.mkdir_p spec_dir
-      FileUtils.touch @spec_file
-      FileUtils.mkdir_p test_dir
-      FileUtils.touch @test_file
-
-      @rdoc.options.skip_tests = false
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-    assert_equal [@a, @spec_file, @test_file], files.sort
-  end
-
-  def test_parse_file
-    @rdoc.store = RDoc::Store.new(@options)
-
-    temp_dir do |dir|
-      @rdoc.options.root = Pathname(Dir.pwd)
-
-      File.open 'test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      top_level = @rdoc.parse_file 'test.txt'
-
-      assert_equal 'test.txt', top_level.absolute_name
-      assert_equal 'test.txt', top_level.relative_name
-    end
-  end
-
-  def test_parse_file_binary
-    @rdoc.store = RDoc::Store.new(@options)
-
-    root = File.dirname __FILE__
-
-    @rdoc.options.root = Pathname root
-
-    out, err = capture_output do
-      Dir.chdir root do
-        assert_nil @rdoc.parse_file 'binary.dat'
-      end
-    end
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_parse_file_include_root
-    @rdoc.store = RDoc::Store.new(@options)
-
-    test_path = File.expand_path('..', __FILE__)
-    top_level = nil
-    temp_dir do |dir|
-      @rdoc.options.parse %W[--root #{test_path}]
-      @rdoc.options.finish
-
-      File.open 'include.txt', 'w' do |io|
-        io.puts ':include: test.txt'
-      end
-
-      out, err = capture_output do
-        top_level = @rdoc.parse_file 'include.txt'
-      end
-      assert_empty out
-      assert_empty err
-    end
-    assert_equal "test file", top_level.comment.text
-  end
-
-  def test_parse_file_page_dir
-    @rdoc.store = RDoc::Store.new(@options)
-
-    temp_dir do |dir|
-      FileUtils.mkdir 'pages'
-      @rdoc.options.page_dir = Pathname('pages')
-      @rdoc.options.root = Pathname(Dir.pwd)
-
-      File.open 'pages/test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      top_level = @rdoc.parse_file 'pages/test.txt'
-
-      assert_equal 'pages/test.txt', top_level.absolute_name
-      assert_equal 'test.txt',       top_level.relative_name
-    end
-  end
-
-  def test_parse_file_relative
-    pwd = Dir.pwd
-
-    @rdoc.store = RDoc::Store.new(@options)
-
-    temp_dir do |dir|
-      @rdoc.options.root = Pathname(dir)
-
-      File.open 'test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      test_txt = File.join dir, 'test.txt'
-
-      Dir.chdir pwd do
-        top_level = @rdoc.parse_file test_txt
-
-        assert_equal test_txt,   top_level.absolute_name
-        assert_equal 'test.txt', top_level.relative_name
-      end
-    end
-  end
-
-  def test_parse_file_encoding
-    @rdoc.options.encoding = Encoding::ISO_8859_1
-    @rdoc.store = RDoc::Store.new(@options)
-
-    tf = Tempfile.open 'test.txt' do |io|
-      io.write 'hi'
-      io.rewind
-
-      top_level = @rdoc.parse_file io.path
-
-      assert_equal Encoding::ISO_8859_1, top_level.absolute_name.encoding
-      io
-    end
-    tf.close!
-  end
-
-  def test_parse_file_forbidden
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    @rdoc.store = RDoc::Store.new(@options)
-
-    tf = Tempfile.open 'test.txt' do |io|
-      io.write 'hi'
-      io.rewind
-
-      File.chmod 0000, io.path
-
-      begin
-        top_level = :bug
-
-        _, err = capture_output do
-          top_level = @rdoc.parse_file io.path
-        end
-
-        assert_match "Unable to read #{io.path},", err
-
-        assert_nil top_level
-      ensure
-        File.chmod 0400, io.path
-      end
-      io
-    end
-    tf.close!
-  end
-
-  def test_remove_unparseable
-    file_list = %w[
-      blah.class
-      blah.eps
-      blah.erb
-      blah.scpt.txt
-      blah.svg
-      blah.ttf
-      blah.yml
-    ]
-
-    assert_empty @rdoc.remove_unparseable file_list
-  end
-
-  def test_remove_unparseable_tags_emacs
-    temp_dir do
-      File.open 'TAGS', 'wb' do |io| # emacs
-        io.write "\f\nlib/foo.rb,43\n"
-      end
-
-      file_list = %w[
-        TAGS
-      ]
-
-      assert_empty @rdoc.remove_unparseable file_list
-    end
-  end
-
-  def test_remove_unparseable_tags_vim
-    temp_dir do
-      File.open 'TAGS', 'w' do |io| # emacs
-        io.write "!_TAG_"
-      end
-
-      file_list = %w[
-        TAGS
-      ]
-
-      assert_empty @rdoc.remove_unparseable file_list
-    end
-  end
-
-  def test_remove_unparseable_CVE_2021_31799
-    omit 'for Un*x platforms' if Gem.win_platform?
-    temp_dir do
-      file_list = ['| touch evil.txt && echo tags']
-      file_list.each do |f|
-        FileUtils.touch f rescue omit
-      end
-
-      assert_equal file_list, @rdoc.remove_unparseable(file_list)
-      assert_equal file_list, Dir.children('.')
-    end
-  end
-
-  def test_setup_output_dir
-    Dir.mktmpdir {|d|
-      path = File.join d, 'testdir'
-
-      last = @rdoc.setup_output_dir path, false
-
-      assert_empty last
-
-      assert File.directory? path
-      assert File.exist? @rdoc.output_flag_file path
-    }
-  end
-
-  def test_setup_output_dir_dry_run
-    @rdoc.options.dry_run = true
-
-    Dir.mktmpdir do |d|
-      path = File.join d, 'testdir'
-
-      @rdoc.setup_output_dir path, false
-
-      refute File.exist? path
-    end
-  end
-
-  def test_setup_output_dir_exists
-    Dir.mktmpdir {|path|
-      File.open @rdoc.output_flag_file(path), 'w' do |io|
-        io.puts Time.at 0
-        io.puts "./lib/rdoc.rb\t#{Time.at 86400}"
-      end
-
-      last = @rdoc.setup_output_dir path, false
-
-      assert_equal 1, last.size
-      assert_equal Time.at(86400), last['./lib/rdoc.rb']
-    }
-  end
-
-  def test_setup_output_dir_exists_empty_created_rid
-    Dir.mktmpdir {|path|
-      File.open @rdoc.output_flag_file(path), 'w' do end
-
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir path, false
-      end
-
-      assert_match %r%Directory #{Regexp.escape path} already exists%, e.message
-    }
-  end
-
-  def test_setup_output_dir_exists_file
-    tf = Tempfile.open 'test_rdoc_rdoc' do |tempfile|
-      path = tempfile.path
-
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir path, false
-      end
-
-      assert_match(%r%#{Regexp.escape path} exists and is not a directory%,
-                   e.message)
-      tempfile
-    end
-    tf.close!
-  end
-
-  def test_setup_output_dir_exists_not_rdoc
-    Dir.mktmpdir do |dir|
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir dir, false
-      end
-
-      assert_match %r%Directory #{Regexp.escape dir} already exists%, e.message
-    end
-  end
-
-  def test_update_output_dir
-    Dir.mktmpdir do |d|
-      @rdoc.update_output_dir d, Time.now, {}
-
-      assert File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_dont
-    Dir.mktmpdir do |d|
-      @rdoc.options.update_output_dir = false
-      @rdoc.update_output_dir d, Time.now, {}
-
-      refute File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_dry_run
-    Dir.mktmpdir do |d|
-      @rdoc.options.dry_run = true
-      @rdoc.update_output_dir d, Time.now, {}
-
-      refute File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_with_reproducible_time
-    Dir.mktmpdir do |d|
-      backup_epoch = ENV['SOURCE_DATE_EPOCH']
-      ruby_birthday = Time.parse 'Wed, 24 Feb 1993 21:00:00 +0900'
-      ENV['SOURCE_DATE_EPOCH'] = ruby_birthday.to_i.to_s
-
-      @rdoc.update_output_dir d, Time.now, {}
-
-      assert File.exist? "#{d}/created.rid"
-
-      f = File.open("#{d}/created.rid", 'r')
-      head_timestamp = Time.parse f.gets.chomp
-      f.close
-      assert_equal ruby_birthday, head_timestamp
-
-      ENV['SOURCE_DATE_EPOCH'] = backup_epoch
-    end
-  end
-
-  def test_normalized_file_list_removes_created_rid_dir
-    temp_dir do |d|
-      FileUtils.mkdir "doc"
-      flag_file = @rdoc.output_flag_file "doc"
-      file = File.join "doc", "test"
-      FileUtils.touch flag_file
-      FileUtils.touch file
-
-      file_list = ["doc"]
-
-      output = @rdoc.normalized_file_list file_list
-
-      assert_empty output
-    end
-  end
-end
diff --git a/test/mri/rdoc/rdoc_require_test.rb b/test/mri/rdoc/rdoc_require_test.rb
deleted file mode 100644
index e90f8520a21..00000000000
--- a/test/mri/rdoc/rdoc_require_test.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocRequireTest < XrefTestCase
-
-  def setup
-    super
-
-    @req = RDoc::Require.new 'foo', 'comment'
-  end
-
-  def test_initialize
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '"foo"', ''
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '\'foo\'', ''
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '|foo|', ''
-    assert_equal 'foo', @req.name, 'for fortran?'
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_ri_driver_test.rb b/test/mri/rdoc/rdoc_ri_driver_test.rb
deleted file mode 100644
index 1cb459909a4..00000000000
--- a/test/mri/rdoc/rdoc_ri_driver_test.rb
+++ /dev/null
@@ -1,1610 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRIDriverTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @home_ri = File.join @test_home, 'dot_ri'
-
-    FileUtils.mkdir_p @home_ri
-
-    @orig_ri = ENV.delete('RI')
-    @rdoc_home = File.join @test_home, ".rdoc"
-    FileUtils.mkdir_p @rdoc_home
-
-    @options = RDoc::RI::Driver.default_options
-    @options[:use_system] = false
-    @options[:use_site]   = false
-    @options[:use_home]   = false
-    @options[:use_gems]   = false
-
-    @options[:home]       = @rdoc_home
-    @options[:use_stdout] = true
-    @options[:formatter]  = @RM::ToRdoc
-    @rdoc_options = RDoc::Options.new
-
-    @driver = RDoc::RI::Driver.new @options
-  end
-
-  def teardown
-    defined?(@orig_ri) and ENV['RI'] = @orig_ri
-
-    super
-  end
-
-  case RUBY_PLATFORM
-  when /mswin|mingw/
-    DUMMY_PAGER = "type nul"
-  else
-    DUMMY_PAGER = "true"
-  end
-
-  def with_dummy_pager
-    pager_env, ENV['RI_PAGER'] = ENV['RI_PAGER'], DUMMY_PAGER
-    yield
-  ensure
-    ENV['RI_PAGER'] = pager_env
-  end
-
-  def test_self_dump
-    util_store
-
-    out, = capture_output do
-      RDoc::RI::Driver.dump @store1.cache_path
-    end
-
-    assert_match %r%:class_methods|class_methods:%,       out
-    assert_match %r%:modules|modules:%,                   out
-    assert_match %r%:instance_methods|instance_methods:%, out
-    assert_match %r%:ancestors|ancestors:%,               out
-  end
-
-  def test_add_also_in_empty
-    out = @RM::Document.new
-
-    @driver.add_also_in out, []
-
-    assert_empty out
-  end
-
-  def test_add_also_in
-    util_multi_store
-    @store1.type = :system
-    @store2.type = :home
-
-    out = @RM::Document.new
-
-    @driver.add_also_in out, [@store1, @store2]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Paragraph.new('Also found in:'),
-      @RM::Verbatim.new("ruby core", "\n",
-                        @rdoc_home, "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_class
-    util_multi_store
-
-    out = @RM::Document.new
-
-    @driver.add_class out, 'Bar', [@cBar]
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Bar < Foo'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_from
-    util_store
-    @store1.type = :system
-
-    out = @RM::Document.new
-
-    @driver.add_from out, @store1
-
-    expected = @RM::Document.new @RM::Paragraph.new("(from ruby core)")
-
-    assert_equal expected, out
-  end
-
-  def test_add_extends
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_extends out, [[[@cFooExt], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Extended by:"),
-      @RM::Paragraph.new("Ext (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Extend thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_empty
-    out = @RM::Document.new
-
-    @driver.add_extension_modules out, 'Includes', []
-
-    assert_empty out
-  end
-
-  def test_add_extension_modules_many
-    util_store
-
-    out = @RM::Document.new
-
-    enum = RDoc::Include.new 'Enumerable', nil
-    @cFoo.add_include enum
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc, enum], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("(from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Inc"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("Enumerable", "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_many_no_doc
-    util_store
-
-    out = @RM::Document.new
-
-    enum = RDoc::Include.new 'Enumerable', nil
-    @cFoo.add_include enum
-    @cFooInc.instance_variable_set :@comment, ''
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc, enum], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("(from #{@store1.friendly_path})"),
-      @RM::Verbatim.new("Inc", "\n",
-                        "Enumerable", "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_one
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("Inc (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_includes
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_includes out, [[[@cFooInc], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("Inc (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Foo::Bar#blah'
-
-    expected =
-      doc(
-        head(1, 'Foo::Bar#blah'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        head(3, 'Implementation from Bar'),
-        rule(1),
-        verb("blah(5) => 5\n",
-             "blah(6) => 6\n"),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_with_rdoc_ref_link
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Foo::Bar#blah_with_rdoc_ref'
-
-    expected =
-      doc(
-        head(1, 'Foo::Bar#blah_with_rdoc_ref'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        head(3, 'Implementation from Bar'),
-        rule(1),
-        verb("blah(5) => 5\n", "See also {Doc}[rdoc-ref:README.rdoc]\n"),
-        rule(1),
-        blank_line,
-        blank_line
-      )
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_that_is_alias_for_original
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Qux#aliased'
-
-    expected =
-      doc(
-        head(1, 'Qux#aliased'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        para('alias comment'),
-        blank_line,
-        blank_line,
-        para('(This method is an alias for Qux#original.)'),
-        blank_line,
-        para('original comment'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_attribute
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Foo::Bar#attr'
-
-    expected =
-      doc(
-        head(1, 'Foo::Bar#attr'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_inherited
-    util_multi_store
-
-    out = doc
-
-    @driver.add_method out, 'Bar#inherit'
-
-    expected =
-      doc(
-        head(1, 'Bar#inherit'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        head(3, 'Implementation from Foo'),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_overridden
-    util_multi_store
-
-    out = doc
-
-    @driver.add_method out, 'Bar#override'
-
-    expected =
-      doc(
-        head(1, 'Bar#override'),
-        blank_line,
-        para("(from #{@store2.path})"),
-        rule(1),
-        blank_line,
-        para('must be displayed'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_documentation
-    util_store
-
-    out = doc()
-
-    missing = RDoc::AnyMethod.new nil, 'missing'
-    @cFoo.add_method missing
-
-    @driver.add_method_documentation out, @cFoo
-
-    expected =
-      doc(
-        head(1, 'Foo#inherit'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        blank_line,
-        head(1, 'Foo#override'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        para('must not be displayed in Bar#override'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list
-    out = @RM::Document.new
-
-    @driver.add_method_list out, %w[new parse], 'Class methods'
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Class methods:'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new('new'),
-      @RM::Verbatim.new('parse'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_output_width
-    @options[:width] = 10
-    driver = RDoc::RI::Driver.new @options
-
-    doc = @RM::Document.new
-    doc << @RM::IndentedParagraph.new(0, 'new, parse, foo, bar, baz')
-
-    out, = capture_output do
-      driver.display doc
-    end
-
-    expected = "new, parse, foo,\nbar, baz\n"
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list_interative
-    @options[:interactive] = true
-    driver = RDoc::RI::Driver.new @options
-
-    out = @RM::Document.new
-
-    driver.add_method_list out, %w[new parse], 'Class methods'
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Class methods:'),
-      @RM::BlankLine.new,
-      @RM::IndentedParagraph.new(2, 'new, parse'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list_none
-    out = @RM::Document.new
-
-    @driver.add_method_list out, [], 'Class'
-
-    assert_equal @RM::Document.new, out
-  end
-
-  def test_ancestors_of
-    util_ancestors_store
-
-    assert_equal %w[X Mixin Object Foo], @driver.ancestors_of('Foo::Bar')
-  end
-
-  def test_ancestors_of_chained_inclusion
-    # Store represents something like:
-    #
-    #   module X
-    #   end
-    #
-    #   module Y
-    #     include X
-    #   end
-    #
-    #   class Z
-    #     include Y
-    #   end
-    #
-    # Y is not chosen randomly, it has to be after Object in the alphabet
-    # to reproduce https://github.com/ruby/rdoc/issues/814.
-    store = RDoc::RI::Store.new(@rdoc_options, path: @home_ri)
-    store.cache[:ancestors] = { "Z" => ["Object", "Y"], "Y" => ["X"] }
-    store.cache[:modules] = %W[X Y Z]
-    @driver.stores = [store]
-
-    assert_equal %w[X Y Object], @driver.ancestors_of('Z')
-  end
-
-  def test_classes
-    util_multi_store
-
-    expected = {
-      'Ambiguous' => [@store1, @store2],
-      'Bar'       => [@store2],
-      'Ext'       => [@store1],
-      'Foo'       => [@store1, @store2],
-      'Foo::Bar'  => [@store1],
-      'Foo::Baz'  => [@store1, @store2],
-      'Inc'       => [@store1],
-      'Qux'       => [@store1],
-    }
-
-    classes = @driver.classes
-
-    assert_equal expected.keys.sort, classes.keys.sort
-
-    expected.each do |klass, stores|
-      assert_equal stores, classes[klass].sort_by { |store| store.path },
-                   "mismatch for #{klass}"
-    end
-  end
-
-  def test_class_document
-    util_store
-
-    tl1 = @store1.add_file 'one.rb'
-    tl2 = @store1.add_file 'two.rb'
-
-    @cFoo.add_comment 'one', tl1
-    @cFoo.add_comment 'two', tl2
-
-    @store1.save_class @cFoo
-
-    found = [
-      [@store1, @store1.load_class(@cFoo.full_name)]
-    ]
-
-    extends  = [[[@cFooExt], @store1]]
-    includes = [[[@cFooInc], @store1]]
-
-    out = @driver.class_document @cFoo.full_name, found, [], includes, extends
-
-    expected = @RM::Document.new
-    @driver.add_class expected, 'Foo', []
-    @driver.add_includes expected, includes
-    @driver.add_extends  expected, extends
-    @driver.add_from expected, @store1
-    expected << @RM::Rule.new(1)
-
-    doc = @RM::Document.new(@RM::Paragraph.new('one'))
-    doc.file = 'one.rb'
-    expected.push doc
-    expected << @RM::BlankLine.new
-    doc = @RM::Document.new(@RM::Paragraph.new('two'))
-    doc.file = 'two.rb'
-    expected.push doc
-
-    expected << @RM::Rule.new(1)
-    expected << @RM::Heading.new(1, 'Instance methods:')
-    expected << @RM::BlankLine.new
-    expected << @RM::Verbatim.new('inherit')
-    expected << @RM::Verbatim.new('override')
-    expected << @RM::BlankLine.new
-
-    assert_equal expected, out
-  end
-
-  def test_complete
-    store = RDoc::RI::Store.new(@rdoc_options, path: @home_ri)
-    store.cache[:ancestors] = {
-      'Foo'      => %w[Object],
-      'Foo::Bar' => %w[Object],
-    }
-    store.cache[:class_methods] = {
-      'Foo' => %w[bar]
-    }
-    store.cache[:instance_methods] = {
-      'Foo' => %w[Bar]
-    }
-    store.cache[:modules] = %w[
-      Foo
-      Foo::Bar
-    ]
-
-    @driver.stores = [store]
-
-    assert_equal %w[Foo         ], @driver.complete('F')
-    assert_equal %w[    Foo::Bar], @driver.complete('Foo::B')
-
-    assert_equal %w[Foo#Bar],           @driver.complete('Foo#'),   'Foo#'
-    assert_equal %w[Foo.Bar  Foo.bar],  @driver.complete('Foo.'),   'Foo.'
-    assert_equal %w[Foo::Bar Foo::bar], @driver.complete('Foo::'),  'Foo::'
-
-    assert_equal %w[         Foo::bar], @driver.complete('Foo::b'), 'Foo::b'
-  end
-
-  def test_complete_ancestor
-    util_ancestors_store
-
-    assert_equal %w[Foo::Bar#i_method], @driver.complete('Foo::Bar#')
-
-    assert_equal %w[Foo::Bar::c_method Foo::Bar::new], @driver.complete('Foo::Bar::')
-
-    assert_equal %w[Foo::Bar.c_method Foo::Bar.i_method Foo::Bar.new],
-                 @driver.complete('Foo::Bar.')
-  end
-
-  def test_complete_classes
-    util_store
-
-    assert_equal %w[                       ], @driver.complete('[')
-    assert_equal %w[                       ], @driver.complete('[::')
-    assert_equal %w[Foo                    ], @driver.complete('F')
-    assert_equal %w[Foo:: Foo::Bar Foo::Baz], @driver.complete('Foo::')
-    assert_equal %w[      Foo::Bar Foo::Baz], @driver.complete('Foo::B')
-  end
-
-  def test_complete_multistore
-    util_multi_store
-
-    assert_equal %w[Bar], @driver.complete('B')
-    assert_equal %w[Foo], @driver.complete('F')
-    assert_equal %w[Foo::Bar Foo::Baz], @driver.complete('Foo::B')
-  end
-
-  def test_display
-    doc = @RM::Document.new(
-            @RM::Paragraph.new('hi'))
-
-    out, = capture_output do
-      @driver.display doc
-    end
-
-    assert_equal "hi\n", out
-  end
-
-  def test_display_class
-    util_store
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Bar'
-    end
-
-    assert_match %r%^= Foo::Bar%, out
-    assert_match %r%^\(from%, out
-
-    assert_match %r%^= Class methods:%, out
-    assert_match %r%^  new%, out
-    assert_match %r%^= Instance methods:%, out
-    assert_match %r%^  blah%, out
-    assert_match %r%^= Attributes:%, out
-    assert_match %r%^  attr_accessor attr%, out
-
-    assert_equal 2, out.scan(/^-{50,}$/).length, out
-
-    refute_match %r%Foo::Bar#blah%, out
-  end
-
-  def test_display_class_all
-    util_store
-
-    @driver.show_all = true
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Bar'
-    end
-
-    assert_match %r%^= Foo::Bar%, out
-    assert_match %r%^\(from%, out
-
-    assert_match %r%^= Class methods:%, out
-    assert_match %r%^  new%, out
-    assert_match %r%^= Instance methods:%, out
-    assert_match %r%^  blah%, out
-    assert_match %r%^= Attributes:%, out
-    assert_match %r%^  attr_accessor attr%, out
-
-    assert_equal 9, out.scan(/^-{50,}$/).length, out
-
-    assert_match %r%Foo::Bar#blah%, out
-    assert_match %r%Foo::Bar#blah_with_rdoc_ref%, out
-    # From Foo::Bar and Foo::Bar#blah_with_rdoc_ref
-    assert_equal 2, out.scan(/rdoc-ref:README.rdoc/).length
-    # But README.rdoc should only be displayed once
-    assert_equal 1, out.scan(/Expanded from README.rdoc/).length
-  end
-
-  def test_rdoc_refs_expansion_can_be_disabled
-    util_store
-
-    @driver.instance_variable_set :@expand_rdoc_refs, false
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Bar'
-    end
-
-    # From Foo::Bar
-    assert_equal 1, out.scan(/rdoc-ref:README.rdoc/).length
-    # But README.rdoc should not be expanded
-    assert_empty out.scan(/Expanded from README.rdoc/)
-  end
-
-  def test_display_class_ambiguous
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Ambiguous'
-    end
-
-    assert_match %r%^= Ambiguous < Object$%, out
-  end
-
-  def test_display_class_multi_no_doc
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Baz'
-    end
-
-    assert_match %r%^= Foo::Baz%, out
-    assert_match %r%-\n%, out
-    assert_match %r%Also found in:%, out
-    assert_match %r%#{Regexp.escape @home_ri}%, out
-    assert_match %r%#{Regexp.escape @home_ri2}%, out
-  end
-
-  def test_display_class_superclass
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Bar'
-    end
-
-    assert_match %r%^= Bar < Foo%, out
-  end
-
-  def test_display_class_module
-    util_store
-
-    out, = capture_output do
-      @driver.display_class 'Inc'
-    end
-
-    assert_match %r%^= Inc$%, out
-  end
-
-  def test_display_class_page
-    out, = capture_output do
-      @driver.display_class 'ruby:README'
-    end
-
-    assert_empty out
-  end
-
-  def test_display_method
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#blah'
-    end
-
-    assert_match %r%Foo::Bar#blah%, out
-    assert_match %r%blah.5%,        out
-    assert_match %r%blah.6%,        out
-  end
-
-  def test_display_method_attribute
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#attr'
-    end
-
-    assert_match %r%Foo::Bar#attr%, out
-    refute_match %r%Implementation from%, out
-  end
-
-  def test_display_method_inherited
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_method 'Bar#inherit'
-    end
-
-    assert_match %r%^= Bar#inherit%, out
-    assert_match %r%^=== Implementation from Foo%, out
-  end
-
-  def test_display_method_overridden
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_method 'Bar#override'
-    end
-
-    refute_match %r%must not be displayed%, out
-  end
-
-  def test_display_name
-    util_store
-
-    out, = capture_output do
-      assert_equal true, @driver.display_name('home:README.rdoc')
-    end
-
-    expected = <<-EXPECTED
-= README
-This is a README
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_class
-    util_store
-
-    out, = capture_output do
-      assert_equal false, @driver.display_name('Foo::B')
-    end
-
-    expected = <<-EXPECTED
-Foo::B not found, maybe you meant:
-
-Foo::Bar
-Foo::Baz
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_method
-    util_store
-
-    out, = capture_output do
-      assert_equal false, @driver.display_name('Foo::Bar#b')
-    end
-
-    expected = <<-EXPECTED
-Foo::Bar#b not found, maybe you meant:
-
-Foo::Bar#blah
-Foo::Bar#blah_with_rdoc_ref
-Foo::Bar#bother
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_special
-    util_store
-
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      assert_equal false, @driver.display_name('Set#[]')
-    end
-  end
-
-  def test_display_method_params
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#bother'
-    end
-
-    assert_match %r%things.*stuff%, out
-  end
-
-  def test_display_page
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:README.rdoc'
-    end
-
-    assert_match %r%= README%, out
-  end
-
-  def test_display_page_add_extension
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:README'
-    end
-
-    assert_match %r%= README%, out
-  end
-
-  def test_display_page_ambiguous
-    util_store
-
-    other = @store1.add_file 'README.md'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      RDoc::Comment.from_document(doc(
-        head(1, 'README.md'),
-        para('This is the other README')))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:README'
-    end
-
-    assert_match %r%= README pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,               out
-    assert_match %r%README\.md%,                 out
-  end
-
-  def test_display_page_extension
-    util_store
-
-    other = @store1.add_file 'README.EXT'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      RDoc::Comment.from_document(doc(
-        head(1, 'README.EXT'),
-        para('This is the other README')))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:README.EXT'
-    end
-
-    assert_match 'other README', out
-  end
-
-  def test_display_page_ignore_directory
-    util_store
-
-    other = @store1.add_file 'doc/globals.rdoc'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      RDoc::Comment.from_document(doc(
-        head(1, 'globals.rdoc'),
-        para('Globals go here')))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:globals'
-    end
-
-    assert_match %r%= globals\.rdoc%, out
-  end
-
-  def test_display_page_missing
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:missing'
-    end
-
-    out, = capture_output do
-      @driver.display_page_list @store1
-    end
-
-    assert_match %r%= Pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,        out
-  end
-
-  def test_display_page_list
-    util_store
-
-    other = @store1.add_file 'OTHER.rdoc'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      RDoc::Comment.from_document(doc(
-        head(1, 'OTHER'),
-        para('This is OTHER')))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page_list @store1
-    end
-
-    assert_match %r%= Pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,        out
-    assert_match %r%OTHER\.rdoc%,         out
-  end
-
-  def test_expand_class
-    util_store
-
-    assert_equal 'Foo',       @driver.expand_class('F')
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::Bar')
-
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_class 'F::B'
-    end
-  end
-
-  def test_expand_class_2
-    @store1 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri, type: :home)
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mFox = @top_level.add_module RDoc::NormalModule, 'Fox'
-    @cFoo_Bar = @cFoo.add_class RDoc::NormalClass, 'Bar'
-    @store1.save
-
-    @driver.stores = [@store1]
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_class 'F'
-    end
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::Bar')
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::B')
-  end
-
-  def test_expand_class_3
-    @store1 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri, type: :home)
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mFox = @top_level.add_module RDoc::NormalModule, 'FooBar'
-    @store1.save
-
-    @driver.stores = [@store1]
-
-    assert_equal 'Foo',  @driver.expand_class('Foo')
-  end
-
-  def test_expand_name
-    util_store
-
-    assert_equal '.b',        @driver.expand_name('b')
-    assert_equal 'Foo',       @driver.expand_name('F')
-    assert_equal 'Foo::Bar#', @driver.expand_name('F::Bar#')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_name 'Z'
-    end
-
-    assert_equal 'Z', e.name
-
-    @driver.stores << RDoc::Store.new(@rdoc_options, type: :system)
-
-    assert_equal 'ruby:README', @driver.expand_name('ruby:README')
-    assert_equal 'ruby:',       @driver.expand_name('ruby:')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_name 'nonexistent_gem:'
-    end
-
-    assert_equal 'nonexistent_gem', e.name
-  end
-
-  def test_find_methods
-    util_store
-
-    items = []
-
-    @driver.find_methods 'Foo::Bar.' do |store, klass, ancestor, types, method|
-      items << [store, klass, ancestor, types, method]
-    end
-
-    expected = [
-      [@store1, 'Foo::Bar', 'Foo::Bar', :both, nil],
-    ]
-
-    assert_equal expected, items
-  end
-
-  def test_find_methods_method
-    util_store
-
-    items = []
-
-    @driver.find_methods '.blah' do |store, klass, ancestor, types, method|
-      items << [store, klass, ancestor, types, method]
-    end
-
-    expected = [
-      [@store1, 'Ambiguous', 'Ambiguous', :both, 'blah'],
-      [@store1, 'Ext',       'Ext',       :both, 'blah'],
-      [@store1, 'Foo',       'Foo',       :both, 'blah'],
-      [@store1, 'Foo::Bar',  'Foo::Bar',  :both, 'blah'],
-      [@store1, 'Foo::Baz',  'Foo::Baz',  :both, 'blah'],
-      [@store1, 'Inc',       'Inc',       :both, 'blah'],
-      [@store1, 'Qux',       'Qux',       :both, 'blah'],
-    ]
-
-    assert_equal expected, items
-  end
-
-  def test_filter_methods
-    util_multi_store
-
-    name = 'Bar#override'
-
-    found = @driver.load_methods_matching name
-
-    sorted = @driver.filter_methods found, name
-
-    expected = [[@store2, [@override]]]
-
-    assert_equal expected, sorted
-  end
-
-  def test_filter_methods_not_found
-    util_multi_store
-
-    name = 'Bar#inherit'
-
-    found = @driver.load_methods_matching name
-
-    sorted = @driver.filter_methods found, name
-
-    assert_equal found, sorted
-  end
-
-  def test_find_store
-    @driver.stores << RDoc::Store.new(@rdoc_options, type: :system)
-    @driver.stores << RDoc::Store.new(@rdoc_options, path: 'doc/gem-1.0/ri', type: :gem)
-
-    assert_equal 'ruby',    @driver.find_store('ruby')
-    assert_equal 'gem-1.0', @driver.find_store('gem-1.0')
-    assert_equal 'gem-1.0', @driver.find_store('gem')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.find_store 'nonexistent'
-    end
-
-    assert_equal 'nonexistent', e.name
-  end
-
-  def test_did_you_mean
-    omit 'skip test with did_you_men' unless defined? DidYouMean::SpellChecker
-
-    util_ancestors_store
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo.i_methdo'
-    end
-    assert_equal "Nothing known about Foo.i_methdo\nDid you mean?  i_method", e.message
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo#i_methdo'
-    end
-    assert_equal "Nothing known about Foo#i_methdo\nDid you mean?  i_method", e.message
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo::i_methdo'
-    end
-    assert_equal "Nothing known about Foo::i_methdo\nDid you mean?  c_method", e.message
-  end
-
-  def test_formatter
-    tty = Object.new
-    def tty.tty?() true; end
-
-    @options.delete :use_stdout
-    @options.delete :formatter
-
-    driver = RDoc::RI::Driver.new @options
-
-    assert_instance_of @RM::ToAnsi, driver.formatter(tty)
-
-    assert_instance_of @RM::ToBs, driver.formatter(StringIO.new)
-
-    driver.instance_variable_set :@paging, true
-
-    assert_instance_of @RM::ToBs, driver.formatter(StringIO.new)
-  end
-
-  def test_method_type
-    assert_equal :both,     @driver.method_type(nil)
-    assert_equal :both,     @driver.method_type('.')
-    assert_equal :instance, @driver.method_type('#')
-    assert_equal :class,    @driver.method_type('::')
-  end
-
-  def test_name_regexp
-    assert_equal %r%^RDoc::AnyMethod#new$%,
-                 @driver.name_regexp('RDoc::AnyMethod#new')
-
-    assert_equal %r%^RDoc::AnyMethod::new$%,
-                 @driver.name_regexp('RDoc::AnyMethod::new')
-
-    assert_equal %r%^RDoc::AnyMethod(#|::)new$%,
-                 @driver.name_regexp('RDoc::AnyMethod.new')
-
-    assert_equal %r%^Hash(#|::)\[\]$%,
-                 @driver.name_regexp('Hash.[]')
-
-    assert_equal %r%^Hash::\[\]$%,
-                 @driver.name_regexp('Hash::[]')
-  end
-
-  def test_list_known_classes
-    util_store
-
-    out, = capture_output do
-      @driver.list_known_classes
-    end
-
-    assert_equal "Ambiguous\nExt\nFoo\nFoo::Bar\nFoo::Baz\nInc\nQux\n", out
-  end
-
-  def test_list_known_classes_name
-    util_store
-
-    out, = capture_output do
-      @driver.list_known_classes %w[F I]
-    end
-
-    assert_equal "Foo\nFoo::Bar\nFoo::Baz\nInc\n", out
-  end
-
-  def test_list_methods_matching
-    util_store
-
-    assert_equal %w[
-        Foo::Bar#attr
-        Foo::Bar#blah
-        Foo::Bar#blah_with_rdoc_ref
-        Foo::Bar#bother
-        Foo::Bar::new
-      ],
-      @driver.list_methods_matching('Foo::Bar.').sort
-  end
-
-  def test_list_methods_matching_inherit
-    util_multi_store
-
-    assert_equal %w[
-        Bar#baz
-        Bar#inherit
-        Bar#override
-      ],
-      @driver.list_methods_matching('Bar.').sort
-  end
-
-  def test_list_methods_matching_regexp
-    util_store
-
-    index = RDoc::AnyMethod.new nil, '[]'
-    index.record_location @top_level
-    @cFoo.add_method index
-    @store1.save_method @cFoo, index
-
-    c_index = RDoc::AnyMethod.new nil, '[]', singleton: true
-    c_index.record_location @top_level
-    @cFoo.add_method c_index
-    @store1.save_method @cFoo, c_index
-
-    @store1.save_cache
-
-    assert_equal %w[Foo#[]], @driver.list_methods_matching('Foo#[]')
-    assert_equal %w[Foo::[]], @driver.list_methods_matching('Foo::[]')
-  end
-
-  def test_load_method
-    util_store
-
-    method = @driver.load_method(@store1, :instance_methods, 'Foo', '#',
-                                 'inherit')
-
-    assert_equal @inherit, method
-  end
-
-  def test_load_method_inherited
-    util_multi_store
-
-    method = @driver.load_method(@store2, :instance_methods, 'Bar', '#',
-                                 'inherit')
-
-    assert_nil method
-  end
-
-  def test_load_methods_matching
-    util_store
-
-    expected = [[@store1, [@inherit]]]
-
-    assert_equal expected, @driver.load_methods_matching('Foo#inherit')
-
-    expected = [[@store1, [@blah]]]
-
-    assert_equal expected, @driver.load_methods_matching('.blah')
-
-    assert_empty @driver.load_methods_matching('.b')
-  end
-
-  def test_load_methods_matching_inherited
-    util_multi_store
-
-    expected = [[@store1, [@inherit]]]
-
-    assert_equal expected, @driver.load_methods_matching('Bar#inherit')
-  end
-
-  def test_load_method_missing
-    util_store
-
-    FileUtils.rm @store1.method_file 'Foo', '#inherit'
-
-    method = @driver.load_method(@store1, :instance_methods, 'Foo', '#',
-                                 'inherit')
-
-    assert_equal '(unknown)#inherit', method.full_name
-  end
-
-  def test_page
-    @driver.use_stdout = false
-
-    with_dummy_pager do
-      @driver.page do |io|
-        omit "couldn't find a standard pager" if io == $stdout
-
-        assert @driver.paging?
-      end
-    end
-
-    refute @driver.paging?
-  end
-
-  def test_page_in_presence_of_child_status
-    @driver.use_stdout = false
-
-    with_dummy_pager do
-      @driver.page do |io|
-        refute_equal $stdout, io
-        assert @driver.paging?
-      end
-    end
-  end
-
-  def test_page_stdout
-    @driver.use_stdout = true
-
-    @driver.page do |io|
-      assert_equal $stdout, io
-    end
-
-    refute @driver.paging?
-  end
-
-  def test_parse_name_method
-    klass, type, meth = @driver.parse_name 'foo'
-
-    assert_equal '',    klass, 'foo class'
-    assert_equal '.',   type,  'foo type'
-    assert_equal 'foo', meth,  'foo method'
-
-    klass, type, meth = @driver.parse_name '#foo'
-
-    assert_equal '',    klass, '#foo class'
-    assert_equal '#',   type,  '#foo type'
-    assert_equal 'foo', meth,  '#foo method'
-
-    klass, type, meth = @driver.parse_name '::foo'
-
-    assert_equal '',    klass, '::foo class'
-    assert_equal '::',  type,  '::foo type'
-    assert_equal 'foo', meth,  '::foo method'
-  end
-
-  def test_parse_name_page
-    klass, type, meth = @driver.parse_name 'ruby:README'
-
-    assert_equal 'ruby',   klass, 'ruby project'
-    assert_equal ':',      type,  'ruby type'
-    assert_equal 'README', meth,  'ruby page'
-
-    klass, type, meth = @driver.parse_name 'ruby:'
-
-    assert_equal 'ruby',   klass, 'ruby project'
-    assert_equal ':',      type,  'ruby type'
-    assert_nil             meth,  'ruby page'
-  end
-
-  def test_parse_name_page_extenson
-    klass, type, meth = @driver.parse_name 'ruby:README.EXT'
-
-    assert_equal 'ruby',      klass, 'ruby project'
-    assert_equal ':',         type,  'ruby type'
-    assert_equal 'README.EXT', meth,  'ruby page'
-  end
-
-  def test_parse_name_single_class
-    klass, type, meth = @driver.parse_name 'Foo'
-
-    assert_equal 'Foo', klass, 'Foo class'
-    assert_nil          type,  'Foo type'
-    assert_nil          meth,  'Foo method'
-
-    klass, type, meth = @driver.parse_name 'Foo#'
-
-    assert_equal 'Foo', klass, 'Foo# class'
-    assert_equal '#',   type,  'Foo# type'
-    assert_nil          meth,  'Foo# method'
-
-    klass, type, meth = @driver.parse_name 'Foo::'
-
-    assert_equal 'Foo', klass, 'Foo:: class'
-    assert_equal '::',  type,  'Foo:: type'
-    assert_nil          meth,  'Foo:: method'
-
-    klass, type, meth = @driver.parse_name 'Foo.'
-
-    assert_equal 'Foo', klass, 'Foo. class'
-    assert_equal '.',   type,  'Foo. type'
-    assert_nil          meth,  'Foo. method'
-
-    klass, type, meth = @driver.parse_name 'Foo#Bar'
-
-    assert_equal 'Foo', klass, 'Foo#Bar class'
-    assert_equal '#',   type,  'Foo#Bar type'
-    assert_equal 'Bar', meth,  'Foo#Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo.Bar'
-
-    assert_equal 'Foo', klass, 'Foo.Bar class'
-    assert_equal '.',   type,  'Foo.Bar type'
-    assert_equal 'Bar', meth,  'Foo.Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo::bar'
-
-    assert_equal 'Foo', klass, 'Foo::bar class'
-    assert_equal '::',  type,  'Foo::bar type'
-    assert_equal 'bar', meth,  'Foo::bar method'
-  end
-
-  def test_parse_name_namespace
-    klass, type, meth = @driver.parse_name 'Foo::Bar'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar class'
-    assert_nil               type,  'Foo::Bar type'
-    assert_nil               meth,  'Foo::Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo::Bar#'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar# class'
-    assert_equal '#',        type,  'Foo::Bar# type'
-    assert_nil               meth,  'Foo::Bar# method'
-
-    klass, type, meth = @driver.parse_name 'Foo::Bar#baz'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar#baz class'
-    assert_equal '#',        type,  'Foo::Bar#baz type'
-    assert_equal 'baz',      meth,  'Foo::Bar#baz method'
-  end
-
-  def test_parse_name_special
-    specials = %w[
-      %
-      &
-      *
-      +
-      +@
-      -
-      -@
-      /
-      <
-      <<
-      <=
-      <=>
-      ==
-      ===
-      =>
-      =~
-      >
-      >>
-      []
-      []=
-      ^
-      `
-      |
-      ~
-      ~@
-    ]
-
-    specials.each do |special|
-      parsed = @driver.parse_name special
-
-      assert_equal ['', '.', special], parsed
-    end
-  end
-
-  def test_setup_pager # this test doesn't do anything anymore :(
-    @driver.use_stdout = false
-
-    pager = with_dummy_pager do @driver.setup_pager end
-
-    omit "couldn't find a standard pager" unless pager
-
-    assert @driver.paging?
-  ensure
-    pager.close if pager
-  end
-
-  def util_ancestors_store
-    store1 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri)
-    store1.cache[:ancestors] = {
-      'Foo'      => %w[Object],
-      'Foo::Bar' => %w[Foo],
-    }
-    store1.cache[:class_methods] = {
-      'Foo'      => %w[c_method new],
-      'Foo::Bar' => %w[new],
-    }
-    store1.cache[:instance_methods] = {
-      'Foo' => %w[i_method],
-    }
-    store1.cache[:modules] = %w[
-      Foo
-      Foo::Bar
-    ]
-
-    store2 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri)
-    store2.cache[:ancestors] = {
-      'Foo'    => %w[Mixin Object],
-      'Mixin'  => %w[],
-      'Object' => %w[X Object],
-      'X'      => %w[Object],
-    }
-    store2.cache[:class_methods] = {
-      'Foo'    => %w[c_method new],
-      'Mixin'  => %w[],
-      'X'      => %w[],
-      'Object' => %w[],
-    }
-    store2.cache[:instance_methods] = {
-      'Foo'   => %w[i_method],
-      'Mixin' => %w[],
-    }
-    store2.cache[:modules] = %w[
-      Foo
-      Mixin
-      Object
-      X
-    ]
-
-    @driver.stores = store1, store2
-  end
-
-  def util_multi_store
-    util_store
-
-    @home_ri2 = "#{@home_ri}2"
-    @store2 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri2)
-
-    @top_level = @store2.add_file 'file.rb'
-
-    # as if seen in a namespace like class Ambiguous::Other
-    @mAmbiguous = @top_level.add_module RDoc::NormalModule, 'Ambiguous'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    @cBar = @top_level.add_class RDoc::NormalClass, 'Bar', 'Foo'
-    @cFoo_Baz = @cFoo.add_class RDoc::NormalClass, 'Baz'
-
-    @baz = @cBar.add_method RDoc::AnyMethod.new(nil, 'baz')
-    @baz.record_location @top_level
-
-    @override = @cBar.add_method RDoc::AnyMethod.new(nil, 'override')
-    @override.comment = 'must be displayed'
-    @override.record_location @top_level
-
-    @store2.save
-
-    @driver.stores = [@store1, @store2]
-  end
-
-  def util_store
-    @store1 = RDoc::RI::Store.new(@rdoc_options, path: @home_ri, type: :home)
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @readme = @store1.add_file 'README.rdoc'
-    @readme.parser = RDoc::Parser::Simple
-    @readme.comment = RDoc::Comment.from_document(doc(head(1, 'README'), para('This is a README')))
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mExt = @top_level.add_module RDoc::NormalModule, 'Ext'
-    @mInc = @top_level.add_module RDoc::NormalModule, 'Inc'
-    @cAmbiguous = @top_level.add_class RDoc::NormalClass, 'Ambiguous'
-
-    doc = @RM::Document.new @RM::Paragraph.new('Extend thingy')
-    @cFooExt = @cFoo.add_extend RDoc::Extend.new('Ext', RDoc::Comment.from_document(doc))
-    @cFooExt.record_location @top_level
-    doc = @RM::Document.new @RM::Paragraph.new('Include thingy')
-    @cFooInc = @cFoo.add_include RDoc::Include.new('Inc', RDoc::Comment.from_document(doc))
-    @cFooInc.record_location @top_level
-
-    @cFoo_Bar = @cFoo.add_class RDoc::NormalClass, 'Bar'
-    @cFoo_Bar.add_comment "See also {Doc}[rdoc-ref:README.rdoc]", @top_level
-    @cFoo_Bar.record_location @top_level
-
-    @blah = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'blah')
-    @blah.call_seq = "blah(5) => 5\nblah(6) => 6\n"
-    @blah.record_location @top_level
-
-    @blah_with_rdoc_ref = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'blah_with_rdoc_ref')
-    @blah_with_rdoc_ref.call_seq = "blah(5) => 5\nSee also {Doc}[rdoc-ref:README.rdoc]"
-    @blah_with_rdoc_ref.record_location @top_level
-
-    @bother = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'bother')
-    @bother.block_params = "stuff"
-    @bother.params = "(things)"
-    @bother.record_location @top_level
-
-    @new = @cFoo_Bar.add_method RDoc::AnyMethod.new nil, 'new', singleton: true
-    @new.record_location @top_level
-
-    @attr = @cFoo_Bar.add_attribute RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-
-    @cFoo_Baz = @cFoo.add_class RDoc::NormalClass, 'Baz'
-    @cFoo_Baz.record_location @top_level
-
-    @inherit = @cFoo.add_method RDoc::AnyMethod.new(nil, 'inherit')
-    @inherit.record_location @top_level
-
-    # overridden by Bar in multi_store
-    @overridden = @cFoo.add_method RDoc::AnyMethod.new(nil, 'override')
-    @overridden.comment = 'must not be displayed in Bar#override'
-    @overridden.record_location @top_level
-
-    @cQux = @top_level.add_class RDoc::NormalClass, 'Qux'
-
-    @original = @cQux.add_method RDoc::AnyMethod.new(nil, 'original')
-    @original.comment = 'original comment'
-    @original.record_location @top_level
-
-    @aliased = @original.add_alias RDoc::Alias.new(nil, 'original', 'aliased', 'alias comment'), @cQux
-    @aliased.record_location @top_level
-
-    @store1.save
-
-    @driver.stores = [@store1]
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_ri_paths_test.rb b/test/mri/rdoc/rdoc_ri_paths_test.rb
deleted file mode 100644
index 7a9fc6fde4f..00000000000
--- a/test/mri/rdoc/rdoc_ri_paths_test.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocRIPathsTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @orig_env = ENV.to_hash
-    @orig_gem_path = Gem.path
-
-    @tempdir = File.join Dir.tmpdir, "test_rdoc_ri_paths_#{$$}"
-    Gem.use_paths @tempdir
-    Gem.ensure_gem_subdirectories @tempdir
-
-    specs = [
-      @rake_10   = Gem::Specification.new('rake', '10.0.1'),
-      @rdoc_4_0  = Gem::Specification.new('rdoc', '4.0'),
-      @rdoc_3_12 = Gem::Specification.new('rdoc', '3.12'),
-      @nodoc     = Gem::Specification.new('nodoc', '1.0'),
-    ]
-
-    specs.each do |spec|
-      spec.loaded_from = spec.spec_file
-
-      File.open spec.spec_file, 'w' do |file|
-        file.write spec.to_ruby_for_cache
-      end
-
-      FileUtils.mkdir_p File.join(spec.doc_dir, 'ri') unless
-        spec.name == 'nodoc'
-    end
-
-    Gem::Specification.reset
-    Gem::Specification.all = specs
-  end
-
-  def teardown
-    Gem.use_paths(*@orig_gem_path)
-    Gem::Specification.reset
-    FileUtils.rm_rf @tempdir
-    ENV.replace(@orig_env)
-
-    super
-  end
-
-  def test_class_each
-    enum = RDoc::RI::Paths.each true, true, true, :all
-
-    path = enum.map { |dir,| dir }
-
-    assert_equal RDoc::RI::Paths.system_dir,          path.shift
-    assert_equal RDoc::RI::Paths.site_dir,            path.shift
-    assert_equal RDoc::RI::Paths.home_dir,            path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@nodoc.doc_dir, 'ri'),     path.shift
-    assert_equal File.join(@rake_10.doc_dir, 'ri'),   path.shift
-    assert_equal File.join(@rdoc_4_0.doc_dir, 'ri'),  path.shift
-    assert_equal File.join(@rdoc_3_12.doc_dir, 'ri'), path.shift
-    assert_empty path
-  end
-
-  def test_class_gemdirs_latest
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs :latest
-
-      expected = [
-        File.join(@rake_10.doc_dir, 'ri'),
-        File.join(@rdoc_4_0.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gemdirs_legacy
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs true
-
-      expected = [
-        File.join(@rake_10.doc_dir, 'ri'),
-        File.join(@rdoc_4_0.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gemdirs_all
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs :all
-
-      expected = [
-        File.join(@nodoc.doc_dir,     'ri'),
-        File.join(@rake_10.doc_dir,   'ri'),
-        File.join(@rdoc_4_0.doc_dir,  'ri'),
-        File.join(@rdoc_3_12.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gem_dir
-    dir = RDoc::RI::Paths.gem_dir 'rake', '10.0.1'
-
-    expected = File.join @rake_10.doc_dir, 'ri'
-
-    assert_equal expected, dir
-  end
-
-  def test_class_home_dir
-    dir = RDoc::RI::Paths.home_dir
-
-    assert_equal RDoc::RI::Paths::HOMEDIR, dir
-  end
-
-  def test_class_path_nonexistent
-    temp_dir do |dir|
-      nonexistent = File.join dir, 'nonexistent'
-      dir = RDoc::RI::Paths.path true, true, true, true, nonexistent
-
-      refute_includes dir, nonexistent
-    end
-  end
-
-  def test_class_raw_path
-    path = RDoc::RI::Paths.raw_path true, true, true, true
-
-    assert_equal RDoc::RI::Paths.system_dir,        path.shift
-    assert_equal RDoc::RI::Paths.site_dir,          path.shift
-    assert_equal RDoc::RI::Paths.home_dir,          path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
-  end
-
-  def test_class_raw_path_extra_dirs
-    path = RDoc::RI::Paths.raw_path true, true, true, true, '/nonexistent'
-
-    assert_equal '/nonexistent',                    path.shift
-    assert_equal RDoc::RI::Paths.system_dir,        path.shift
-    assert_equal RDoc::RI::Paths.site_dir,          path.shift
-    assert_equal RDoc::RI::Paths.home_dir,          path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
-  end
-
-  def test_class_site_dir
-    dir = RDoc::RI::Paths.site_dir
-
-    assert_equal File.join(RDoc::RI::Paths::BASE, 'site'), dir
-  end
-
-  def test_class_system_dir
-    dir = RDoc::RI::Paths.system_dir
-
-    assert_equal File.join(RDoc::RI::Paths::BASE, 'system'), dir
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_rubygems_hook_test.rb b/test/mri/rdoc/rdoc_rubygems_hook_test.rb
deleted file mode 100644
index 99194c59d85..00000000000
--- a/test/mri/rdoc/rdoc_rubygems_hook_test.rb
+++ /dev/null
@@ -1,329 +0,0 @@
-# frozen_string_literal: true
-require 'rubygems'
-require 'fileutils'
-require 'tmpdir'
-require_relative '../../lib/rdoc/rubygems_hook'
-require 'test/unit'
-
-class RDocRubyGemsHookTest < Test::Unit::TestCase
-  def setup
-    @a = Gem::Specification.new do |s|
-      s.platform    = Gem::Platform::RUBY
-      s.name        = "a"
-      s.version     = 2
-      s.rdoc_options = %w[--main MyTitle]
-      s.extra_rdoc_files = %w[README]
-    end
-    @tempdir = File.realpath(Dir.mktmpdir("test_rubygems_hook_"))
-
-    @orig_envs = %w[
-      GEM_VENDOR
-      GEMRC
-      XDG_CACHE_HOME
-      XDG_CONFIG_HOME
-      XDG_DATA_HOME
-      SOURCE_DATE_EPOCH
-      BUNDLER_VERSION
-      HOME
-      RDOCOPT
-    ].map {|e| [e, ENV.delete(e)]}.to_h
-    ENV["HOME"] = @tempdir
-
-    Gem.configuration = nil
-
-    @a.instance_variable_set(:@doc_dir, File.join(@tempdir, "doc"))
-    @a.instance_variable_set(:@gem_dir, File.join(@tempdir, "a-2"))
-    @a.instance_variable_set(:@full_gem_path, File.join(@tempdir, "a-2"))
-    @a.loaded_from = File.join(@tempdir, 'a-2', 'a-2.gemspec')
-
-    FileUtils.mkdir_p File.join(@tempdir, 'a-2', 'lib')
-    FileUtils.touch   File.join(@tempdir, 'a-2', 'README')
-    File.open(File.join(@tempdir, 'a-2', 'lib', 'a.rb'), 'w') do |f|
-      f.puts '# comment'
-      f.puts '# :include: include.txt'
-      f.puts 'class A; end'
-    end
-    File.open(File.join(@tempdir, 'a-2', 'include.txt'), 'w') do |f|
-      f.puts 'included content'
-    end
-
-    @hook = RDoc::RubyGemsHook.new @a
-
-    begin
-      RDoc::RubyGemsHook.load_rdoc
-    rescue Gem::DocumentError => e
-      omit e.message
-    end
-    @old_ui = Gem::DefaultUserInteraction.ui
-    Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
-  end
-
-  def teardown
-    ui = Gem::DefaultUserInteraction.ui
-    Gem::DefaultUserInteraction.ui = @old_ui
-    FileUtils.rm_rf @tempdir
-    ui.close
-    ENV.update(@orig_envs)
-  end
-
-  def test_initialize
-    refute @hook.generate_rdoc
-    assert @hook.generate_ri
-
-    rdoc = RDoc::RubyGemsHook.new @a, false, false
-
-    refute rdoc.generate_rdoc
-    refute rdoc.generate_ri
-  end
-
-  def test_delete_legacy_args
-    args = %w[
-      --inline-source
-      --one-file
-      --promiscuous
-      -p
-    ]
-
-    @hook.delete_legacy_args args
-
-    assert_empty args
-  end
-
-  def test_document
-    options = RDoc::Options.new
-    options.files = []
-
-    rdoc = @hook.new_rdoc
-    rdoc.store = RDoc::Store.new(options)
-    @hook.instance_variable_set :@rdoc, rdoc
-    @hook.instance_variable_set :@file_info, []
-
-    @hook.document 'darkfish', options, @a.doc_dir('rdoc')
-
-    assert @hook.rdoc_installed?
-  end
-
-  def test_generate
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    assert @hook.ri_installed?
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    refute rdoc.options.hyperlink_all
-    assert_equal Pathname(@a.full_gem_path), rdoc.options.root
-    assert_equal %w[README lib], rdoc.options.files.sort
-
-    assert_equal 'MyTitle', rdoc.store.main
-
-    klass = rdoc.store.find_class_named('A')
-    refute_nil klass
-    assert_includes klass.comment.text, 'included content'
-  end
-
-  def test_generate_all
-    @hook.generate_rdoc = true
-    @hook.generate_ri   = true
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    assert @hook.rdoc_installed?
-    assert @hook.ri_installed?
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    refute rdoc.options.hyperlink_all
-    assert_equal Pathname(@a.full_gem_path), rdoc.options.root
-    assert_equal %w[README lib], rdoc.options.files.sort
-
-    assert_equal 'MyTitle', rdoc.store.main
-  end
-
-  def test_generate_configuration_rdoc_array
-    Gem.configuration[:rdoc] = %w[-A]
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end
-
-  def test_generate_configuration_rdoc_string
-    Gem.configuration[:rdoc] = '-A'
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end
-
-  def test_generate_default_gem
-    Gem::Deprecate.skip_during do
-      if Gem.respond_to?(:default_specifications_dir)
-        klass = Gem
-      else
-        klass = Gem::Specification
-      end
-      @a.loaded_from = File.join klass.default_specifications_dir, 'a.gemspec'
-    end
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-  end
-
-  def test_generate_disabled
-    @hook.generate_rdoc = false
-    @hook.generate_ri   = false
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-  end
-
-  def test_generate_force
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.force = true
-
-    @hook.generate
-
-    assert_path_not_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_exist File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
-
-  def test_generate_rubygems_compatible
-    original_default_gem_method = RDoc::RubygemsHook.method(:default_gem?)
-    RDoc::RubygemsHook.singleton_class.remove_method(:default_gem?)
-    RDoc::RubygemsHook.define_singleton_method(:default_gem?) { true }
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    # rubygems/lib/rubygems/commands/rdoc_command.rb calls this
-    hook = RDoc::RubygemsHook.new @a, true, true
-    hook.force = true
-    hook.generate
-
-    assert_path_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-  ensure
-    RDoc::RubygemsHook.singleton_class.remove_method(:default_gem?)
-    RDoc::RubygemsHook.define_singleton_method(:default_gem?, &original_default_gem_method)
-  end
-
-  def test_generate_no_overwrite
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    assert_path_not_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_not_exist File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
-
-  def test_generate_with_ri_opt
-    @a.rdoc_options << '--ri'
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-    @hook.generate_rdoc = true
-    @hook.generate_ri   = true
-    @hook.generate
-
-    assert_path_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_exist File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
-
-  def test_new_rdoc
-    assert_kind_of RDoc::RDoc, @hook.new_rdoc
-  end
-
-  def test_rdoc_installed?
-    refute @hook.rdoc_installed?
-
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-
-    assert @hook.rdoc_installed?
-  end
-
-  def test_remove
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-
-    @hook.remove
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-
-    assert_path_exist @a.doc_dir
-  end
-
-  def test_remove_unwritable
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    FileUtils.mkdir_p @a.base_dir
-    FileUtils.chmod 0, @a.base_dir
-
-    e = assert_raise Gem::FilePermissionError do
-      @hook.remove
-    end
-
-    assert_equal @a.base_dir, e.directory
-  ensure
-    FileUtils.chmod(0755, @a.base_dir) if File.directory?(@a.base_dir)
-  end
-
-  def test_ri_installed?
-    refute @hook.ri_installed?
-
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-
-    assert @hook.ri_installed?
-  end
-
-  def test_setup
-    @hook.setup
-
-    assert_path_exist @a.doc_dir
-  end
-
-  def test_setup_unwritable
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.chmod 0, @a.doc_dir
-
-    e = assert_raise Gem::FilePermissionError do
-      @hook.setup
-    end
-
-    assert_equal @a.doc_dir, e.directory
-  ensure
-    if File.exist? @a.doc_dir
-      FileUtils.chmod 0755, @a.doc_dir
-      FileUtils.rm_r @a.doc_dir
-    end
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_servlet_test.rb b/test/mri/rdoc/rdoc_servlet_test.rb
deleted file mode 100644
index 825abdf4ab7..00000000000
--- a/test/mri/rdoc/rdoc_servlet_test.rb
+++ /dev/null
@@ -1,553 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-begin
-  require 'webrick'
-rescue LoadError
-end
-
-class RDocServletTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @orig_gem_path = Gem.path
-
-    @tempdir = File.join Dir.tmpdir, "test_rdoc_servlet_#{$$}"
-    Gem.use_paths @tempdir
-    Gem.ensure_gem_subdirectories @tempdir
-
-    @spec = Gem::Specification.new 'spec', '1.0'
-    @spec.loaded_from = @spec.spec_file
-
-    Gem::Specification.reset
-    Gem::Specification.all = [@spec]
-
-    @server = {}
-    def @server.mount(*) end
-
-    @stores = {}
-    @cache  = Hash.new { |hash, store| hash[store] = {} }
-
-    @extra_dirs = [File.join(@tempdir, 'extra1'), File.join(@tempdir, 'extra2')]
-
-    @s = RDoc::Servlet.new @server, @stores, @cache, nil, @extra_dirs
-
-    @req = WEBrick::HTTPRequest.new :Logger => nil
-    @res = WEBrick::HTTPResponse.new :HTTPVersion => '1.0'
-
-    def @req.path=(path)
-      instance_variable_set :@path, path
-    end
-
-    @req.instance_variable_set :@header, Hash.new { |h, k| h[k] = [] }
-
-    @base        = File.join @tempdir, 'base'
-    @system_dir  = File.join @tempdir, 'base', 'system'
-    @home_dir    = File.join @tempdir, 'home'
-    @gem_doc_dir = File.join @tempdir, 'doc'
-    @options     = RDoc::Options.new
-
-    @orig_base = RDoc::RI::Paths::BASE
-    RDoc::RI::Paths::BASE.replace @base
-    @orig_ri_path_homedir = RDoc::RI::Paths::HOMEDIR
-    RDoc::RI::Paths.send :remove_const, :HOMEDIR
-    RDoc::RI::Paths.const_set :HOMEDIR, @home_dir
-
-    RDoc::RI::Paths.instance_variable_set \
-      :@gemdirs, %w[/nonexistent/gems/example-1.0/ri]
-  end
-
-  def teardown
-    super
-
-    Gem.use_paths(*@orig_gem_path)
-    Gem::Specification.reset
-
-    FileUtils.rm_rf @tempdir
-
-    RDoc::RI::Paths::BASE.replace @orig_base
-    RDoc::RI::Paths.send :remove_const, :HOMEDIR
-    RDoc::RI::Paths.const_set :HOMEDIR, @orig_ri_path_homedir
-    RDoc::RI::Paths.instance_variable_set :@gemdirs, nil
-  end
-
-  def test_asset
-    temp_dir do
-      FileUtils.mkdir 'css'
-
-      now = Time.now
-      File.open 'css/rdoc.css', 'w' do |io| io.write 'h1 { color: red }' end
-      File.utime now, now, 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/css/rdoc.css'
-
-      @s.asset :darkfish, @req, @res
-
-      assert_equal 'h1 { color: red }', @res.body
-      assert_equal 'text/css',          @res.content_type
-      assert_equal now.httpdate,        @res['last-modified']
-    end
-  end
-
-  def test_do_GET
-    touch_system_cache_path
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.do_GET @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_do_GET_asset_darkfish
-    temp_dir do
-      FileUtils.mkdir 'css'
-      FileUtils.touch 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/css/rdoc.css'
-
-      @s.do_GET @req, @res
-
-      assert_equal 'text/css',          @res.content_type
-    end
-  end
-
-  def test_do_GET_asset_json_index
-    temp_dir do
-      FileUtils.mkdir 'js'
-      FileUtils.touch 'js/navigation.js'
-
-      @s.asset_dirs[:json_index] = '.'
-
-      @req.path = '/js/navigation.js'
-
-      @s.do_GET @req, @res
-
-      assert_equal 'application/javascript', @res.content_type
-    end
-  end
-
-  def test_do_GET_error
-    touch_system_cache_path
-
-    def @req.path() raise 'no' end
-
-    @s.do_GET @req, @res
-
-    assert_equal 500, @res.status
-  end
-
-  def test_do_GET_mount_path
-    @s = RDoc::Servlet.new @server, @stores, @cache, '/mount/path'
-
-    temp_dir do
-      FileUtils.mkdir 'css'
-      FileUtils.touch 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/mount/path/css/rdoc.css'.dup
-
-      @s.do_GET @req, @res
-
-      assert_equal 'text/css', @res.content_type
-    end
-  end
-
-  def do_GET_not_found
-    touch_system_cache_path
-
-    @req.path = "/#{@spec.full_name}"
-
-    @s.do_GET @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_do_GET_not_modified
-    touch_system_cache_path
-    @req.header['if-modified-since'] = [(Time.now + 10).httpdate]
-    @req.path = '/ruby/Missing.html'
-
-    assert_raise WEBrick::HTTPStatus::NotModified do
-      @s.do_GET @req, @res
-    end
-  end
-
-  def test_do_GET_root
-    touch_system_cache_path
-
-    @req.path = '/'
-
-    @s.do_GET @req, @res
-
-    assert_equal 'text/html',                                 @res.content_type
-    assert_match %r%<title>Local RDoc Documentation</title>%, @res.body
-  end
-
-  def test_do_GET_root_search
-    touch_system_cache_path
-
-    @req.path = '/js/search_index.js'
-
-    @s.do_GET @req, @res
-
-    assert_equal 'application/javascript', @res.content_type, @res.body
-  end
-
-  def test_documentation_page_class
-    store = RDoc::Store.new(@options)
-
-    generator = @s.generator_for store
-
-    file      = store.add_file 'file.rb'
-    klass     = file.add_class RDoc::NormalClass, 'Klass'
-                klass.add_class RDoc::NormalClass, 'Sub'
-
-    @s.documentation_page store, generator, 'Klass::Sub.html', @req, @res
-
-    assert_match %r%<title>class Klass::Sub - </title>%,            @res.body
-    assert_match %r%<body id="top" role="document" class="class">%, @res.body
-  end
-
-  def test_documentation_page_not_found
-    store = RDoc::Store.new(@options)
-
-    generator = @s.generator_for store
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.documentation_page store, generator, 'Missing.html', @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_documentation_page_page
-    store = RDoc::Store.new(@options)
-
-    generator = @s.generator_for store
-
-    store.add_file 'README.rdoc', parser: RDoc::Parser::Simple
-
-    @s.documentation_page store, generator, 'README_rdoc.html', @req, @res
-
-    assert_match %r%<title>README - </title>%, @res.body
-    assert_match %r%<body [^>]+ class="file">%,      @res.body
-  end
-
-  def test_documentation_page_page_with_nesting
-    store = RDoc::Store.new(@options)
-
-    generator = @s.generator_for store
-
-    store.add_file 'nesting/README.rdoc', parser: RDoc::Parser::Simple
-
-    @s.documentation_page store, generator, 'nesting/README_rdoc.html', @req, @res
-
-    assert_equal 200, @res.status
-  end
-
-  def test_documentation_source
-    store, path = @s.documentation_source '/ruby/Object.html'
-
-    assert_equal @system_dir, store.path
-
-    assert_equal 'Object.html', path
-  end
-
-  def test_documentation_source_cached
-    cached_store = RDoc::Store.new(@options)
-
-    @stores['ruby'] = cached_store
-
-    store, path = @s.documentation_source '/ruby/Object.html'
-
-    assert_same cached_store, store
-
-    assert_equal 'Object.html', path
-  end
-
-  def test_error
-    e = RuntimeError.new 'foo'
-    e.set_backtrace caller
-
-    @s.error e, @req, @res
-
-    assert_equal 'text/html',      @res.content_type
-    assert_equal 500,              @res.status
-    assert_match %r%<title>Error%, @res.body
-  end
-
-  def test_generator_for
-    store = RDoc::Store.new(@options)
-    store.main  = 'MAIN_PAGE.rdoc'
-    store.title = 'Title'
-
-    generator = @s.generator_for store
-
-    refute generator.file_output
-
-    assert_equal '..', generator.asset_rel_path
-
-    assert_equal 'MAIN_PAGE.rdoc', @s.options.main_page
-    assert_equal 'Title',          @s.options.title
-  end
-
-  def test_if_modified_since
-    omit 'File.utime on directory not supported' if Gem.win_platform?
-
-    temp_dir do
-      now = Time.now
-      File.utime now, now, '.'
-
-      @s.if_modified_since @req, @res, '.'
-
-      assert_equal now.to_i, Time.parse(@res['last-modified']).to_i
-    end
-  end
-
-  def test_if_modified_since_not_modified
-    omit 'File.utime on directory not supported' if Gem.win_platform?
-
-    temp_dir do
-      now = Time.now
-      File.utime now, now, '.'
-
-      @req.header['if-modified-since'] = [(now + 10).httpdate]
-
-      assert_raise WEBrick::HTTPStatus::NotModified do
-        @s.if_modified_since @req, @res, '.'
-      end
-
-      assert_equal now.to_i, Time.parse(@res['last-modified']).to_i
-    end
-  end
-
-  def test_installed_docs
-    touch_system_cache_path
-    touch_extra_cache_path
-
-    expected = [
-      ['My Extra Documentation', 'extra-1/', true, :extra,
-        @extra_dirs[0]],
-      ['Extra Documentation', 'extra-2/', false, :extra,
-        @extra_dirs[1]],
-      ['Ruby Documentation', 'ruby/', true,  :system,
-        @system_dir],
-      ['Site Documentation', 'site/', false, :site,
-        File.join(@base, 'site')],
-      ['Home Documentation', 'home/', false, :home,
-        RDoc::RI::Paths::HOMEDIR],
-      ['spec-1.0', 'spec-1.0/',       false, :gem,
-        File.join(@spec.doc_dir, 'ri')],
-    ]
-
-    assert_equal expected, @s.installed_docs
-  end
-
-  def test_not_found
-    generator = @s.generator_for RDoc::Store.new(@options)
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.not_found generator, @req, @res
-
-    assert_equal 404,                                @res.status
-    assert_match %r%<title>Not Found</title>%,       @res.body
-    assert_match %r%<kbd>/ruby/Missing\.html</kbd>%, @res.body
-  end
-
-  def test_not_found_message
-    generator = @s.generator_for RDoc::Store.new(@options)
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.not_found generator, @req, @res, 'woo, this is a message'
-
-    assert_equal 404,                          @res.status
-    assert_match %r%<title>Not Found</title>%, @res.body
-    assert_match %r%woo, this is a message%,   @res.body
-  end
-
-  def test_ri_paths
-    paths = @s.ri_paths
-
-    expected = [
-      [@extra_dirs[0],                 :extra],
-      [@extra_dirs[1],                 :extra],
-      [@system_dir,                    :system],
-      [File.join(@base, 'site'),       :site],
-      [RDoc::RI::Paths::HOMEDIR,       :home],
-      [File.join(@spec.doc_dir, 'ri'), :gem],
-    ]
-
-    assert_equal expected, paths.to_a
-  end
-
-  def test_root
-    @s.root @req, @res
-
-    assert_equal 'text/html',                                 @res.content_type
-    assert_match %r%<title>Local RDoc Documentation</title>%, @res.body
-  end
-
-  def test_root_search
-    touch_system_cache_path
-    touch_extra_cache_path
-
-    @s.root_search @req, @res
-
-    assert_equal 'application/javascript', @res.content_type
-
-    @res.body =~ /\{.*\}/
-
-    index = JSON.parse $&
-
-    expected = {
-      'index' => {
-        'searchIndex' => %w[
-          My\ Extra\ Documentation
-          Ruby\ Documentation
-        ],
-        'longSearchIndex' => %w[
-          My\ Extra\ Documentation
-          Ruby\ Documentation
-        ],
-        'info' => [
-          ['My Extra Documentation', '', @extra_dirs[0], '',
-            'My Extra Documentation'],
-          ['Ruby Documentation', '', 'ruby', '',
-            'Documentation for the Ruby standard library'],
-        ],
-      }
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_show_documentation_index
-    touch_system_cache_path
-
-    @req.path = '/ruby'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'text/html',                               @res.content_type
-    assert_match %r%<title>Standard Library Documentation%, @res.body
-  end
-
-  def test_show_documentation_table_of_contents
-    touch_system_cache_path
-
-    @req.path = '/ruby/table_of_contents.html'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'text/html',         @res.content_type
-    assert_match %r%<title>Table of Contents - Standard Library Documentation%,
-                 @res.body
-  end
-
-  def test_show_documentation_page
-    touch_system_cache_path
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_show_documentation_search_index
-    touch_system_cache_path
-
-    @req.path = '/ruby/js/search_index.js'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'application/javascript', @res.content_type
-    assert_match %r%\Avar search_data =%,  @res.body
-  end
-
-  def test_store_for_gem
-    ri_dir = File.join @gem_doc_dir, 'spec-1.0', 'ri'
-    FileUtils.mkdir_p ri_dir
-    FileUtils.touch File.join ri_dir, 'cache.ri'
-
-    store = @s.store_for 'spec-1.0'
-
-    assert_equal File.join(@gem_doc_dir, 'spec-1.0', 'ri'), store.path
-    assert_equal :gem, store.type
-  end
-
-  def test_store_for_home
-    store = @s.store_for 'home'
-
-    assert_equal @home_dir, store.path
-    assert_equal :home, store.type
-  end
-
-  def test_store_for_missing_documentation
-    FileUtils.mkdir_p(File.join @gem_doc_dir, 'spec-1.0', 'ri')
-
-    e = assert_raise WEBrick::HTTPStatus::NotFound do
-      @s.store_for 'spec-1.0'
-    end
-
-    assert_equal 'Could not find documentation for "spec-1.0". Please run `gem rdoc --ri gem_name`',
-                 e.message
-  end
-
-  def test_store_for_missing_gem
-    e = assert_raise WEBrick::HTTPStatus::NotFound do
-      @s.store_for 'missing'
-    end
-
-    assert_equal 'Could not find gem "missing". Are you sure you installed it?',
-                 e.message
-  end
-
-  def test_store_for_ruby
-    store = @s.store_for 'ruby'
-
-    assert_equal @system_dir, store.path
-    assert_equal :system, store.type
-  end
-
-  def test_store_for_site
-    store = @s.store_for 'site'
-
-    assert_equal File.join(@base, 'site'), store.path
-    assert_equal :site, store.type
-  end
-
-  def test_store_for_extra
-    store = @s.store_for 'extra-1'
-
-    assert_equal @extra_dirs.first, store.path
-    assert_equal :extra, store.type
-  end
-
-  def touch_system_cache_path
-    store = RDoc::Store.new(@options, path: @system_dir)
-    store.title = 'Standard Library Documentation'
-
-    FileUtils.mkdir_p File.dirname store.cache_path
-
-    store.save
-  end
-
-  def touch_extra_cache_path
-    store = RDoc::Store.new(@options, path: @extra_dirs.first)
-    store.title = 'My Extra Documentation'
-
-    FileUtils.mkdir_p File.dirname store.cache_path
-
-    store.save
-  end
-
-end if defined?(WEBrick)
diff --git a/test/mri/rdoc/rdoc_single_class_test.rb b/test/mri/rdoc/rdoc_single_class_test.rb
deleted file mode 100644
index 6bbc5a2bd45..00000000000
--- a/test/mri/rdoc/rdoc_single_class_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocSingleClassTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @c = RDoc::SingleClass.new 'C'
-  end
-
-  def test_aref_prefix
-    assert_equal 'sclass', @c.aref_prefix
-  end
-
-  def test_definition
-    assert_equal 'class << C', @c.definition
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_stats_test.rb b/test/mri/rdoc/rdoc_stats_test.rb
deleted file mode 100644
index 1f02e460c39..00000000000
--- a/test/mri/rdoc/rdoc_stats_test.rb
+++ /dev/null
@@ -1,720 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocStatsTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @s = RDoc::Stats.new @store, 0
-
-    @tl = @store.add_file 'file.rb'
-    @tl.parser = RDoc::Parser::Ruby
-  end
-
-  def test_doc_stats
-    c = RDoc::CodeObject.new
-
-    assert_equal [1, 1], @s.doc_stats([c])
-  end
-
-  def test_doc_stats_documented
-    c = RDoc::CodeObject.new
-    c.comment = comment 'x'
-
-    assert_equal [1, 0], @s.doc_stats([c])
-  end
-
-  def test_doc_stats_display_eh
-    c = RDoc::CodeObject.new
-    c.ignore
-
-    assert_equal [0, 0], @s.doc_stats([c])
-  end
-
-  def test_report_attr
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    c.add_attribute a
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "class C # is documented\n",
-          "\n",
-          "  attr_accessor :a # in file file.rb\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_attr_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', 'a'
-    a.record_location @tl
-    c.add_attribute a
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_attr_line
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    a.line = 3
-    c.add_attribute a
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:3', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_constant
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, nil
-    c.record_location @tl
-    m.add_constant c
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "module M # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  C = nil\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_constant_alias
-    mod = @tl.add_module RDoc::NormalModule, 'M'
-
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    mod.add_constant c
-
-    ca = RDoc::Constant.new 'CA', nil, nil
-    ca.is_alias_for = c
-
-    @tl.add_constant ca
-
-    @store.complete :public
-
-    report = @s.report
-
-    # TODO change this to refute match, aliases should be ignored as they are
-    # programmer convenience constructs
-    assert_match 'class Object', report.accept(to_rdoc)
-  end
-
-  def test_report_constant_documented
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, 'C'
-    c.record_location @tl
-    m.add_constant c
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_constant_line
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, nil
-    c.record_location @tl
-    c.line = 5
-    m.add_constant c
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:5', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_class
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_skip_object
-    c = @tl.add_class RDoc::NormalClass, 'Object'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    refute_match %r%^class Object$%, @s.report.accept(to_rdoc)
-  end
-
-  def test_report_class_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_class_documented_level_1
-    c1 = @tl.add_class RDoc::NormalClass, 'C1'
-    c1.record_location @tl
-    c1.add_comment 'C1', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    c1.add_method m1
-    m1.comment = 'm1'
-
-    c2 = @tl.add_class RDoc::NormalClass, 'C2'
-    c2.record_location @tl
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c2.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C2\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_empty
-    @tl.add_class RDoc::NormalClass, 'C'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('class C is referenced but empty.'),
-        para("It probably came from another project.  I'm sorry I'm holding it against you."),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_empty_2
-    c1 = @tl.add_class RDoc::NormalClass, 'C1'
-    c1.record_location @tl
-
-    c2 = @tl.add_class RDoc::NormalClass, 'C2'
-    c2.record_location @tl
-    c2.add_comment 'C2', @tl
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C1\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_method_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_module_ignore
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.ignore
-
-    @store.complete :public
-
-    report = @s.report_class_module c
-
-    assert_nil report
-  end
-
-  def test_report_empty
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  def m1; end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_class
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1', singleton: true
-    m1.record_location @tl
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2', singleton: true
-    m2.record_location @tl
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  def self.m1; end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method_line
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    m1.line = 4
-    c.add_method m1
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:4', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_method_parameters
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    m1.params = '(p1, p2)'
-    m1.comment = 'Stuff with +p1+'
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  # +p2+ is not documented\n",
-          "  def m1(p1, p2); end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_parameters_documented
-    @tl.parser = RDoc::Parser::Ruby
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.params = '(p1)'
-    m.comment = 'Stuff with +p1+'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method_parameters_yield
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.call_seq = <<-SEQ
-m(a) { |c| ... }
-m(a, b) { |c, d| ... }
-    SEQ
-    m.comment = 'Stuff with +a+, yields +c+ for you to do stuff with'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  # +b+, +d+ is not documented\n",
-          "  def m; end\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_summary
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    c.add_attribute a
-
-    c_c = RDoc::Constant.new 'C', nil, nil
-    c_c.record_location @tl
-    c.add_constant c_c
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-
-    @store.complete :public
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (1 undocumented)
-  Modules:    1 (1 undocumented)
-  Constants:  1 (1 undocumented)
-  Attributes: 1 (1 undocumented)
-  Methods:    1 (1 undocumented)
-
-  Total:      5 (5 undocumented)
-    0.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def test_summary_level_false
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    @store.complete :public
-
-    @s.coverage_level = false
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (1 undocumented)
-  Modules:    0 (0 undocumented)
-  Constants:  0 (0 undocumented)
-  Attributes: 0 (0 undocumented)
-  Methods:    0 (0 undocumented)
-
-  Total:      1 (1 undocumented)
-    0.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def test_summary_level_1
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.params = '(p1, p2)'
-    m.comment = 'Stuff with +p1+'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    @s.report
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (0 undocumented)
-  Modules:    0 (0 undocumented)
-  Constants:  0 (0 undocumented)
-  Attributes: 0 (0 undocumented)
-  Methods:    1 (0 undocumented)
-  Parameters: 2 (1 undocumented)
-
-  Total:      4 (1 undocumented)
-   75.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def to_rdoc
-    RDoc::Markup::ToRdoc.new
-  end
-
-  def test_undoc_params
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(a)'
-    method.comment = comment 'comment'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1,     total
-    assert_equal %w[a], undoc
-  end
-
-  def test_undoc_params_block
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(&a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_documented
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_keywords
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(**a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_splat
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(*a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_store_test.rb b/test/mri/rdoc/rdoc_store_test.rb
deleted file mode 100644
index d22516100ec..00000000000
--- a/test/mri/rdoc/rdoc_store_test.rb
+++ /dev/null
@@ -1,1057 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocStoreTest < XrefTestCase
-
-  OBJECT_ANCESTORS = %w[BasicObject]
-
-  def setup
-    super
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_store_#{$$}"
-    @s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-
-    @top_level = @s.add_file 'file.rb'
-
-    @page = @s.add_file 'README.txt', parser: RDoc::Parser::Simple
-    @page.comment = RDoc::Comment.new 'This is a page', @page
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-    @klass.add_comment 'original', @top_level
-    @klass.record_location @top_level
-
-    @cmeth = RDoc::AnyMethod.new nil, 'cmethod', singleton: true
-    @cmeth.record_location @top_level
-
-    @meth_comment = RDoc::Comment.new 'method comment'
-    @meth_comment.location = @top_level
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-    @meth.comment = @meth_comment
-
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_bang.record_location @top_level
-
-    @meth_bang_alias = RDoc::Alias.new nil, 'method!', 'method_bang', ''
-    @meth_bang_alias.record_location @top_level
-
-    @meth_bang.add_alias @meth_bang_alias, @klass
-
-    @attr_comment = RDoc::Comment.new 'attribute comment'
-    @attr_comment.location = @top_level
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-    @attr.comment = @attr_comment
-
-    @klass.add_method @cmeth
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_attribute @attr
-
-    @nest_klass = @klass.add_class RDoc::NormalClass, 'SubClass'
-    @nest_meth = RDoc::AnyMethod.new nil, 'method'
-    @nest_meth.record_location @top_level
-
-    @nest_incl = RDoc::Include.new 'Incl', ''
-    @nest_incl.record_location @top_level
-
-    @nest_klass.add_method @nest_meth
-    @nest_klass.add_include @nest_incl
-
-    @mod = @top_level.add_module RDoc::NormalModule, 'Mod'
-    @mod.record_location @top_level
-  end
-
-  def using_prism_ruby_parser?
-    RDoc::Parser::Ruby.name == 'RDoc::Parser::PrismRuby'
-  end
-
-  def teardown
-    super
-
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def assert_cache(imethods, cmethods, attrs, modules,
-                   ancestors = {}, pages = [], main = nil, title = nil)
-    imethods ||= { 'Object' => %w[method method! method_bang] }
-    cmethods ||= { 'Object' => %w[cmethod] }
-    attrs    ||= { 'Object' => ['attr_accessor attr'] }
-
-    # this is sort-of a hack
-    @s.clean_cache_collection ancestors
-
-    expected = {
-      :ancestors                   => ancestors,
-      :attributes                  => attrs,
-      :class_methods               => cmethods,
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => Encoding::UTF_8,
-      :instance_methods            => imethods,
-      :modules                     => modules,
-      :pages                       => pages,
-      :main                        => main,
-      :title                       => title,
-    }
-
-    @s.save_cache
-
-    assert_equal expected, @s.cache
-  end
-
-  def test_add_c_enclosure
-    @s.add_c_enclosure 'cC1', @c1
-
-    expected = { 'cC1' => @c1 }
-
-    assert_equal expected, @s.c_enclosure_classes
-  end
-
-  def test_add_c_variables
-    options = RDoc::Options.new
-
-    c_file = @s.add_file 'ext.c'
-
-    some_ext   = c_file.add_class RDoc::NormalClass, 'SomeExt'
-                 c_file.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    c_parser = RDoc::Parser::C.new c_file, '', options, nil
-
-    c_parser.classes['cSomeExt']             = some_ext
-    c_parser.singleton_classes['s_cSomeExt'] = 'SomeExtSingle'
-
-    @s.add_c_variables c_parser
-
-    expected = { 'ext.c' => { 'cSomeExt' => 'SomeExt' } }
-
-    assert_equal expected, @s.c_class_variables
-
-    expected = { 'ext.c' => { 's_cSomeExt' => 'SomeExtSingle' } }
-
-    assert_equal expected, @s.c_singleton_class_variables
-  end
-
-  def test_add_file
-    top_level = @store.add_file 'file.rb'
-
-    assert_kind_of RDoc::TopLevel, top_level
-    assert_equal @store, top_level.store
-    assert_equal 'file.rb', top_level.name
-    assert_includes @store.all_files, top_level
-
-    assert_same top_level, @store.add_file('file.rb')
-    refute_same top_level, @store.add_file('other.rb')
-  end
-
-  def test_add_file_relative
-    top_level = @store.add_file 'path/file.rb', relative_name: 'file.rb'
-
-    assert_kind_of RDoc::TopLevel, top_level
-    assert_equal @store, top_level.store
-
-    assert_equal 'path/file.rb', top_level.absolute_name
-    assert_equal 'file.rb',      top_level.relative_name
-
-    assert_includes @store.all_files, top_level
-
-    assert_same top_level, @store.add_file('file.rb')
-    refute_same top_level, @store.add_file('other.rb')
-  end
-
-  def test_all_classes_and_modules
-    expected = %w[
-      C1 C10 C10::C11 C11 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 C6 C7 C8 C9 C9::A C9::B
-      Child
-      M1 M1::M2
-      Object
-      Parent
-    ]
-
-    # C8::S1 does not exist. It should not be in the list.
-    # class C8; class << something; class S1; end; end; end
-    expected = (expected + ['C8::S1']).sort unless using_prism_ruby_parser?
-
-    assert_equal expected,
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_all_files
-    assert_equal %w[EXAMPLE.md xref_data.rb],
-                 @store.all_files.map { |m| m.full_name }.sort
-  end
-
-  def test_all_modules
-    assert_equal %w[M1 M1::M2],
-                 @store.all_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_attributes
-    @s.cache[:attributes]['Object'] = %w[attr]
-
-    expected = { 'Object' => %w[attr] }
-
-    assert_equal expected, @s.attributes
-  end
-
-  def test_class_file
-    assert_equal File.join(@tmpdir, 'Object', 'cdesc-Object.ri'),
-                 @s.class_file('Object')
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri'),
-                 @s.class_file('Object::SubClass')
-  end
-
-  def test_class_methods
-    @s.cache[:class_methods]['Object'] = %w[method]
-
-    expected = { 'Object' => %w[method] }
-
-    assert_equal expected, @s.class_methods
-  end
-
-  def test_class_path
-    assert_equal File.join(@tmpdir, 'Object'), @s.class_path('Object')
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass'),
-                 @s.class_path('Object::SubClass')
-  end
-
-  def test_classes
-    expected = %w[
-      C1 C10 C10::C11 C11 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 C6 C7 C8 C9 C9::A C9::B
-      Child
-      Object
-      Parent
-    ]
-
-    # C8::S1 does not exist. It should not be in the list.
-    # class C8; class << something; class S1; end; end; end
-    expected = (expected + ['C8::S1']).sort unless using_prism_ruby_parser?
-
-    assert_equal expected, @store.all_classes.map { |m| m.full_name }.sort
-  end
-
-  def test_complete
-    a1 = RDoc::Constant.new 'A1', '', ''
-    @c2.add_module_alias @c2_c3, @c2_c3.name, a1, @top_level
-
-    @store.complete :public
-
-    a1 = @xref_data.find_class_or_module 'C2::A1'
-
-    assert_equal 'C2::A1', a1.full_name
-    refute_empty a1.aliases
-  end
-
-  def test_complete_nodoc
-    c_nodoc = @top_level.add_class RDoc::NormalClass, 'Nodoc'
-    c_nodoc.record_location @top_level
-    c_nodoc.document_self = nil
-
-    @s.complete :nodoc
-
-    assert_includes @s.classes_hash.keys, 'Nodoc'
-  end
-
-  def test_find_c_enclosure
-    assert_nil @s.find_c_enclosure 'cC1'
-
-    @s.add_c_enclosure 'cC1', @c1
-
-    assert_equal @c1, @s.find_c_enclosure('cC1')
-  end
-
-  def test_find_c_enclosure_from_cache
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_nil @s.find_c_enclosure 'cObject'
-
-    @s.c_enclosure_names['cObject'] = 'Object'
-
-    klass = @s.find_c_enclosure('cObject')
-    assert_equal @klass, klass
-
-    assert_empty klass.comment_location
-    assert_equal @top_level, klass.parent
-
-    assert_includes @s.c_enclosure_classes, 'cObject'
-  end
-
-  def test_find_c_enclosure_from_cache_legacy
-    @klass.in_files.clear
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_nil @s.find_c_enclosure 'cObject'
-
-    @s.c_enclosure_names['cObject'] = 'Object'
-
-    assert_nil @s.find_c_enclosure('cObject')
-  end
-
-  def test_resolve_c_superclasses
-    # first parse a child that references an unknown parent
-    c_file1 = @s.add_file 'ext1.c'
-    c_file1.add_class RDoc::NormalClass, 'Child', 'cExternParent'
-
-    # then parse the parent and register the C variable name as a C enclosure
-    c_file2 = @s.add_file 'ext2.c'
-    parent = c_file2.add_class RDoc::NormalClass, 'Parent', 'rb_cObject'
-
-    @s.add_c_enclosure('cExternParent', parent)
-
-    # at this point, the child's superclass is still the name of the C variable
-    assert_equal("cExternParent", @s.classes_hash['Child'].superclass)
-
-    @s.resolve_c_superclasses
-
-    # now the ancestor tree correctly references the NormalClass objects
-    assert_equal(parent, @s.classes_hash['Child'].superclass)
-  end
-
-  def test_find_class_named
-    assert_equal @c1, @store.find_class_named('C1')
-
-    assert_equal @c2_c3, @store.find_class_named('C2::C3')
-  end
-
-  def test_find_class_named_from
-    assert_equal @c5_c1, @store.find_class_named_from('C1', 'C5')
-
-    assert_equal @c1,    @store.find_class_named_from('C1', 'C4')
-  end
-
-  def test_find_class_or_module
-    assert_equal @m1, @store.find_class_or_module('M1')
-    assert_equal @c1, @store.find_class_or_module('C1')
-
-    assert_equal @m1, @store.find_class_or_module('::M1')
-    assert_equal @c1, @store.find_class_or_module('::C1')
-  end
-
-  def test_find_file_named
-    assert_equal @xref_data, @store.find_file_named(@file_name)
-  end
-
-  def test_find_module_named
-    assert_equal @m1,    @store.find_module_named('M1')
-    assert_equal @m1_m2, @store.find_module_named('M1::M2')
-  end
-
-  def test_find_text_page
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.find_text_page 'no such page'
-
-    assert_equal page, @store.find_text_page('PAGE.txt')
-  end
-
-  def test_friendly_path
-    @orig_xdg_data_home = ENV.delete('XDG_DATA_HOME')
-
-    @s.path = @tmpdir
-    @s.type = nil
-    assert_equal @s.path, @s.friendly_path
-
-    @s.type = :extra
-    assert_equal @s.path, @s.friendly_path
-
-    @s.type = :system
-    assert_equal "ruby core", @s.friendly_path
-
-    @s.type = :site
-    assert_equal "ruby site", @s.friendly_path
-
-    @s.type = :home
-    assert_equal File.expand_path("~/.local/share/rdoc"), @s.friendly_path
-
-    @s.type = :gem
-    @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
-    assert_equal "gem gem_name-1.0", @s.friendly_path
-  ensure
-    ENV['XDG_DATA_HOME'] = @orig_xdg_data_home
-  end
-
-  def test_dry_run
-    refute @s.dry_run
-
-    @s.dry_run = true
-
-    assert @s.dry_run
-  end
-
-  def test_instance_methods
-    @s.cache[:instance_methods]['Object'] = %w[method]
-
-    expected = { 'Object' => %w[method] }
-
-    assert_equal expected, @s.instance_methods
-  end
-
-  def test_load_all
-    FileUtils.mkdir_p @tmpdir
-
-    @s.save
-
-    s = RDoc::Store.new(RDoc::Options.new, path: @tmpdir)
-
-    s.load_all
-
-    assert_equal [@klass, @nest_klass], s.all_classes.sort
-    assert_equal [@mod],                s.all_modules.sort
-    assert_equal [@page, @top_level],   s.all_files.sort
-
-    methods = s.all_classes_and_modules.flat_map do |mod|
-      mod.method_list
-    end.sort
-
-    _meth_bang_alias = RDoc::AnyMethod.new nil, 'method_bang'
-    _meth_bang_alias.parent = @klass
-
-    assert_equal [@meth, @meth_bang, _meth_bang_alias, @nest_meth, @cmeth],
-                 methods.sort_by { |m| m.full_name }
-
-    method = methods.find { |m| m == @meth }
-    assert_equal @meth_comment.parse, method.comment.parse
-
-    assert_equal @klass, methods.last.parent
-
-    attributes = s.all_classes_and_modules.flat_map do |mod|
-      mod.attributes
-    end.sort
-
-    assert_equal [@attr], attributes
-
-    assert_equal @attr_comment.parse, attributes.first.comment.parse
-  end
-
-  def test_load_cache
-    cache = {
-      :c_class_variables           =>
-        { 'file.c' => { 'cKlass' => 'Klass' } },
-      :c_singleton_class_variables =>
-        { 'file.c' => { 'sKlass' => 'KlassSingle' } },
-      :encoding                    => :encoding_value,
-      :methods                     => { "Object" => %w[Object#method] },
-      :main                        => @page.full_name,
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    # Store prioritize @encoding over the cached value
-    # See we need to unset @encoding to test the cached value
-    @s.encoding = nil
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-
-    assert_equal :encoding_value, @s.encoding
-    assert_equal 'README.txt',    @s.main
-
-    expected = { 'file.c' => { 'cKlass' => 'Klass' } }
-    assert_equal expected, @s.cache[:c_class_variables]
-
-    expected = { 'file.c' => { 'sKlass' => 'KlassSingle' } }
-    assert_equal expected, @s.cache[:c_singleton_class_variables]
-
-    expected = { 'cKlass' => 'Klass' }
-    assert_equal expected, @s.c_enclosure_names
-  end
-
-  def test_load_cache_encoding_differs
-    cache = {
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => Encoding::ISO_8859_1,
-      :main                        => nil,
-      :methods                     => { "Object" => %w[Object#method] },
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    @s.encoding = Encoding::UTF_8
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-
-    assert_equal Encoding::UTF_8, @s.encoding
-  end
-
-  def test_load_cache_no_cache
-    cache = {
-      :ancestors                   => {},
-      :attributes                  => {},
-      :class_methods               => {},
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => Encoding::UTF_8,
-      :instance_methods            => {},
-      :main                        => nil,
-      :modules                     => [],
-      :pages                       => [],
-      :title                       => nil,
-    }
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-  end
-
-  def test_load_cache_legacy
-    cache = {
-      :ancestors        => {},
-      :attributes       => {},
-      :class_methods    => {},
-      :encoding         => :encoding_value,
-      :instance_methods => { "Object" => %w[Object#method] },
-      :modules          => %w[Object],
-      # no :pages
-      # no :main
-      # no :c_class_variables
-      # no :c_singleton_class_variables
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    # Store prioritize @encoding over the cached value
-    # See we need to unset @encoding to test the cached value
-    @s.encoding = nil
-
-    @s.load_cache
-
-    expected = {
-      :ancestors                   => {},
-      :attributes                  => {},
-      :class_methods               => {},
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => :encoding_value,
-      :instance_methods            => { "Object" => %w[Object#method] },
-      :main                        => nil,
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    assert_equal expected, @s.cache
-
-    assert_equal :encoding_value, @s.encoding
-    assert_nil                    @s.main
-  end
-
-  def test_load_class
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_equal @klass, @s.load_class('Object')
-
-    assert_includes @s.classes_hash, 'Object'
-  end
-
-  def test_load_single_class
-    if using_prism_ruby_parser?
-      # Class defined inside singleton class is not documentable.
-      # @c8_s1 should be nil because C8::S1 does not exist.
-      assert_nil @c8_s1
-      return
-    end
-
-    @s.save_class @c8_s1
-    @s.classes_hash.clear
-
-    assert_equal @c8_s1, @s.load_class('C8::S1')
-
-    assert_includes @s.classes_hash, 'C8::S1'
-  end
-
-  def test_load_method
-    @s.save_method @klass, @meth_bang
-
-    meth = @s.load_method('Object', '#method!')
-    assert_equal @meth_bang, meth
-    assert_equal @klass, meth.parent
-    assert_equal @s, meth.store
-  end
-
-  def test_load_method_legacy
-    @s.save_method @klass, @meth
-
-    file = @s.method_file @klass.full_name, @meth.full_name
-
-    File.open file, 'wb' do |io|
-      io.write "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
-               "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
-               "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-               "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-               "\"\x16this is a comment\x06;\x06FI" +
-               "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
-               "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
-               "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
-               "\"\nparam\x06;\x06F"
-    end
-
-    meth = @s.load_method('Object', '#method')
-    assert_equal 'Klass#method', meth.full_name
-    assert_equal @klass,         meth.parent
-    assert_equal @s,             meth.store
-  end
-
-  def test_load_page
-    @s.save_page @page
-
-    assert_equal @page, @s.load_page('README.txt')
-  end
-
-  def test_main
-    assert_nil @s.main
-
-    @s.main = 'README.txt'
-
-    assert_equal 'README.txt', @s.main
-  end
-
-  def test_method_file
-    assert_equal File.join(@tmpdir, 'Object', 'method-i.ri'),
-                 @s.method_file('Object', 'Object#method')
-
-    assert_equal File.join(@tmpdir, 'Object', 'method%21-i.ri'),
-                 @s.method_file('Object', 'Object#method!')
-
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'method%21-i.ri'),
-                 @s.method_file('Object::SubClass', 'Object::SubClass#method!')
-
-    assert_equal File.join(@tmpdir, 'Object', 'method-c.ri'),
-                 @s.method_file('Object', 'Object::method')
-  end
-
-  def test_module_names
-    @s.save_class @klass
-
-    assert_equal %w[Object], @s.module_names
-  end
-
-  def test_page
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.page 'no such page'
-
-    assert_equal page, @store.page('PAGE')
-  end
-
-  def test_page_with_extension
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.page 'no such page'
-
-    assert_equal page, @store.page('PAGE.txt')
-  end
-
-  def test_save
-    FileUtils.mkdir_p @tmpdir
-
-    @s.save
-
-    assert_directory File.join(@tmpdir, 'Object')
-
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-    assert_file File.join(@tmpdir, 'page-README_txt.ri')
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    expected = {
-      :ancestors => {
-        'Object::SubClass' => %w[Incl Object],
-      },
-      :attributes => { 'Object' => ['attr_accessor attr'] },
-      :class_methods => { 'Object' => %w[cmethod] },
-      :c_class_variables => {},
-      :c_singleton_class_variables => {},
-      :instance_methods => {
-        'Object' => %w[attr method method! method_bang],
-        'Object::SubClass' => %w[method],
-      },
-      :main => nil,
-      :modules => %w[Mod Object Object::SubClass],
-      :encoding => Encoding::UTF_8,
-      :pages => %w[README.txt],
-      :title => nil,
-    }
-
-    expected[:ancestors]['Object'] = %w[BasicObject]
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
-      cache = Marshal.load io.read
-
-      assert_equal expected, cache
-    end
-  end
-
-  def test_save_cache
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @cmeth
-    @s.save_class @nest_klass
-    @s.save_page @page
-    @s.encoding = :encoding_value
-    @s.main     = @page.full_name
-    @s.title    = 'title'
-
-    options = RDoc::Options.new
-
-    c_file = @s.add_file 'ext.c'
-
-    some_ext   = c_file.add_class RDoc::NormalClass, 'SomeExt'
-                 c_file.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    c_parser = RDoc::Parser::C.new c_file, '', options, nil
-
-    c_parser.classes['cSomeExt']             = some_ext
-    c_parser.singleton_classes['s_cSomeExt'] = 'SomeExtSingle'
-
-    @s.add_c_variables c_parser
-
-    @s.save_cache
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    c_class_variables = {
-      'ext.c' => {
-        'cSomeExt' => 'SomeExt'
-      }
-    }
-
-    c_singleton_class_variables = {
-      'ext.c' => {
-        's_cSomeExt' => 'SomeExtSingle'
-      }
-    }
-
-    expected = {
-      :ancestors => {
-        'Object::SubClass' => %w[Incl Object],
-      },
-      :attributes => { 'Object' => ['attr_accessor attr'] },
-      :class_methods => { 'Object' => %w[cmethod] },
-      :c_class_variables => c_class_variables,
-      :c_singleton_class_variables => c_singleton_class_variables,
-      :instance_methods => {
-        'Object' => %w[method method! method_bang],
-        'Object::SubClass' => %w[method],
-      },
-      :main => @page.full_name,
-      :modules => %w[Object Object::SubClass],
-      :encoding => :encoding_value,
-      :pages => %w[README.txt],
-      :title => 'title',
-    }
-
-    expected[:ancestors]['Object'] = %w[BasicObject]
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
-      cache = Marshal.load io.read
-
-      assert_equal expected, cache
-    end
-  end
-
-  def test_save_cache_dry_run
-    @s.dry_run = true
-
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @cmeth
-    @s.save_class @nest_klass
-
-    @s.save_cache
-
-    refute_file File.join(@tmpdir, 'cache.ri')
-  end
-
-  def test_save_cache_duplicate_methods
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @meth
-
-    @s.save_cache
-
-    assert_cache({ 'Object' => %w[method] }, {}, {}, [])
-  end
-
-  def test_save_cache_duplicate_pages
-    @s.save_page @page
-    @s.save_page @page
-
-    @s.save_cache
-
-    assert_cache({}, {}, {}, [], {}, %w[README.txt])
-  end
-
-  def test_save_class
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache nil, nil, nil, %w[Object], 'Object' => OBJECT_ANCESTORS
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_basic_object
-    @klass.instance_variable_set :@superclass, nil
-
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache(nil, nil, nil, %w[Object])
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_delete
-    # save original
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @meth_bang
-    @s.save_method @klass, @cmeth
-    @s.save_method @klass, @attr
-    @s.save_cache
-
-    klass = RDoc::NormalClass.new 'Object'
-
-    meth = klass.add_method RDoc::AnyMethod.new(nil, 'replace')
-    meth.record_location @top_level
-
-    # load original, save newly updated class
-    @s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-    @s.load_cache
-    @s.save_class klass
-    @s.save_cache
-
-    # load from disk again
-    @s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-    @s.load_cache
-
-    @s.load_class 'Object'
-
-    assert_cache({ 'Object' => %w[replace] }, {},
-                 { 'Object' => %w[attr_accessor\ attr] }, %w[Object],
-                   'Object' => OBJECT_ANCESTORS)
-
-    # assert these files were deleted
-    refute_file @s.method_file(@klass.full_name, @meth.full_name)
-    refute_file @s.method_file(@klass.full_name, @meth_bang.full_name)
-    refute_file @s.method_file(@klass.full_name, @cmeth.full_name)
-
-    # assert these files were not deleted
-    assert_file @s.method_file(@klass.full_name, @attr.full_name)
-  end
-
-  def test_save_class_dry_run
-    @s.dry_run = true
-
-    @s.save_class @klass
-
-    refute_file File.join(@tmpdir, 'Object')
-    refute_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-  end
-
-  def test_save_class_loaded
-    @s.save
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file      File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_file @s.method_file(@klass.full_name, @attr.full_name)
-    assert_file @s.method_file(@klass.full_name, @cmeth.full_name)
-    assert_file @s.method_file(@klass.full_name, @meth.full_name)
-    assert_file @s.method_file(@klass.full_name, @meth_bang.full_name)
-
-    s = RDoc::Store.new(RDoc::Options.new, path: @s.path)
-    s.load_cache
-
-    loaded = s.load_class 'Object'
-
-    assert_equal @klass, loaded
-
-    s.save_class loaded
-
-    s = RDoc::Store.new(RDoc::Options.new, path: @s.path)
-    s.load_cache
-
-    reloaded = s.load_class 'Object'
-
-    assert_equal @klass, reloaded
-
-    # assert these files were not deleted.  Bug #171
-    assert_file s.method_file(@klass.full_name, @attr.full_name)
-    assert_file s.method_file(@klass.full_name, @cmeth.full_name)
-    assert_file s.method_file(@klass.full_name, @meth.full_name)
-    assert_file s.method_file(@klass.full_name, @meth_bang.full_name)
-  end
-
-  def test_save_class_merge
-    @s.save_class @klass
-
-    klass = RDoc::NormalClass.new 'Object'
-    klass.add_comment 'new comment', @top_level
-
-    s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-    s.save_class klass
-
-    s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-
-    inner = @RM::Document.new @RM::Paragraph.new 'new comment'
-    inner.file = @top_level
-
-    document = @RM::Document.new inner
-
-    assert_equal document, s.load_class('Object').comment_location
-  end
-
-  # This is a functional test
-  def test_save_class_merge_constant
-    store = RDoc::Store.new(RDoc::Options.new)
-    tl = store.add_file 'file.rb'
-
-    klass = tl.add_class RDoc::NormalClass, 'C'
-    klass.add_comment 'comment', tl
-
-    const = klass.add_constant RDoc::Constant.new('CONST', nil, nil)
-    const.record_location tl
-
-    @s.save_class klass
-
-    # separate parse run, independent store
-    store = RDoc::Store.new(RDoc::Options.new)
-    tl = store.add_file 'file.rb'
-    klass2 = tl.add_class RDoc::NormalClass, 'C'
-    klass2.record_location tl
-
-    s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-    s.save_class klass2
-
-    # separate `ri` run, independent store
-    s = RDoc::RI::Store.new(RDoc::Options.new, path: @tmpdir)
-
-    result = s.load_class 'C'
-
-    assert_empty result.constants
-  end
-
-  def test_save_class_methods
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache nil, nil, nil, %w[Object], 'Object' => OBJECT_ANCESTORS
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_nested
-    @s.save_class @nest_klass
-
-    assert_directory File.join(@tmpdir, 'Object', 'SubClass')
-    assert_file File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri')
-
-    assert_cache({ 'Object::SubClass' => %w[method] }, {}, {},
-                 %w[Object::SubClass], 'Object::SubClass' => %w[Incl Object])
-  end
-
-  def test_save_method
-    @s.save_method @klass, @meth
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-
-    assert_cache({ 'Object' => %w[method] }, {}, {}, [])
-
-    assert_equal @meth, @s.load_method('Object', '#method')
-  end
-
-  def test_save_method_dry_run
-    @s.dry_run = true
-
-    @s.save_method @klass, @meth
-
-    refute_file File.join(@tmpdir, 'Object')
-    refute_file File.join(@tmpdir, 'Object', 'method-i.ri')
-  end
-
-  def test_save_method_nested
-    @s.save_method @nest_klass, @nest_meth
-
-    assert_directory File.join(@tmpdir, 'Object', 'SubClass')
-    assert_file File.join(@tmpdir, 'Object', 'SubClass', 'method-i.ri')
-
-    assert_cache({ 'Object::SubClass' => %w[method] }, {}, {}, [])
-  end
-
-  def test_save_page
-    @s.save_page @page
-
-    assert_file File.join(@tmpdir, 'page-README_txt.ri')
-
-    assert_cache({}, {}, {}, [], {}, %w[README.txt])
-  end
-
-  def test_save_page_file
-    @s.save_page @top_level
-
-    refute_file File.join(@tmpdir, 'page-file_rb.ri')
-  end
-
-  def test_source
-    @s.path = @tmpdir
-    @s.type = nil
-    assert_equal @s.path, @s.source
-
-    @s.type = :extra
-    assert_equal @s.path, @s.source
-
-    @s.type = :system
-    assert_equal "ruby", @s.source
-
-    @s.type = :site
-    assert_equal "site", @s.source
-
-    @s.type = :home
-    assert_equal "home", @s.source
-
-    @s.type = :gem
-    @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
-    assert_equal "gem_name-1.0", @s.source
-  end
-
-  def test_title
-    assert_nil @s.title
-
-    @s.title = 'rdoc'
-
-    assert_equal 'rdoc', @s.title
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_task_test.rb b/test/mri/rdoc/rdoc_task_test.rb
deleted file mode 100644
index cd37b2520e1..00000000000
--- a/test/mri/rdoc/rdoc_task_test.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-begin
-  require 'rake'
-rescue LoadError
-end
-
-class RDocTaskTest < RDoc::TestCase
-
-  def setup
-    super
-
-    Rake::Task.clear
-
-    @t = RDoc::Task.new
-  end
-
-  def test_clobber_task_description
-    assert_equal 'Remove RDoc HTML files', @t.clobber_task_description
-  end
-
-  def test_inline_source
-    _, err = verbose_capture_output do
-      assert @t.inline_source
-    end
-
-    assert_equal "RDoc::Task#inline_source is deprecated\n", err
-
-    _, err = verbose_capture_output do
-      @t.inline_source = false
-    end
-
-    assert_equal "RDoc::Task#inline_source is deprecated\n", err
-
-    capture_output do
-      assert @t.inline_source
-    end
-  end
-
-  def test_markup_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.markup = "tomdoc"
-    end
-
-    assert_equal %w[-o html --markup tomdoc], rdoc_task.option_list
-  end
-
-  def test_tasks_creation
-    RDoc::Task.new
-    assert Rake::Task[:rdoc]
-    assert Rake::Task[:clobber_rdoc]
-    assert Rake::Task[:rerdoc]
-    assert Rake::Task[:"rdoc:coverage"]
-    assert_equal ["html/created.rid"], Rake::Task[:rdoc].prerequisites
-  end
-
-  def test_tasks_creation_with_custom_name_symbol
-    rd = RDoc::Task.new(:rdoc_dev)
-    assert Rake::Task[:rdoc_dev]
-    assert Rake::Task[:clobber_rdoc_dev]
-    assert Rake::Task[:rerdoc_dev]
-    assert Rake::Task[:"rdoc_dev:coverage"]
-    assert_equal :rdoc_dev, rd.name
-  end
-
-  def test_tasks_option_parser
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.title = "Test Tasks Option Parser"
-      rd.main = "README.md"
-      rd.rdoc_files.include("README.md")
-      rd.options << "--all"
-    end
-
-    assert_equal "Test Tasks Option Parser", rdoc_task.title
-    assert_equal "README.md", rdoc_task.main
-    assert rdoc_task.rdoc_files.include?("README.md")
-    assert rdoc_task.options.include?("--all")
-
-    args = %w[--all -o html --main README.md] << "--title" << "Test Tasks Option Parser" << "README.md"
-    assert_equal args, rdoc_task.option_list + rdoc_task.rdoc_files
-  end
-
-  def test_generator_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.generator = "ri"
-    end
-
-    assert_equal %w[-o html -f ri], rdoc_task.option_list
-  end
-
-  def test_main_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.main = "README.md"
-    end
-
-    assert_equal %w[-o html --main README.md], rdoc_task.option_list
-  end
-
-  def test_output_dir_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.rdoc_dir = "zomg"
-    end
-
-    assert_equal %w[-o zomg], rdoc_task.option_list
-  end
-
-  def test_rdoc_task_description
-    assert_equal 'Build RDoc HTML files', @t.rdoc_task_description
-  end
-
-  def test_rerdoc_task_description
-    assert_equal 'Rebuild RDoc HTML files', @t.rerdoc_task_description
-  end
-
-  def test_coverage_task_description
-    assert_equal 'Print RDoc coverage report', @t.coverage_task_description
-  end
-
-  def test_tasks_creation_with_custom_name_string
-    rd = RDoc::Task.new("rdoc_dev")
-    assert Rake::Task[:rdoc_dev]
-    assert Rake::Task[:clobber_rdoc_dev]
-    assert Rake::Task[:rerdoc_dev]
-    assert Rake::Task[:"rdoc_dev:coverage"]
-    assert_equal "rdoc_dev", rd.name
-  end
-
-  def test_tasks_creation_with_custom_name_hash
-    options = {
-      :rdoc => "rdoc",
-      :clobber_rdoc => "rdoc:clean",
-      :rerdoc => "rdoc:force"
-    }
-
-    Rake::Task.clear
-
-    rd = RDoc::Task.new(options)
-    assert Rake::Task[:"rdoc"]
-    assert Rake::Task[:"rdoc:clean"]
-    assert Rake::Task[:"rdoc:force"]
-    assert Rake::Task[:"rdoc:coverage"]
-    assert_raise(RuntimeError) { Rake::Task[:clobber_rdoc] }
-    assert_equal options, rd.name
-  end
-
-  def test_tasks_creation_with_custom_name_hash_will_use_default_if_an_option_isnt_given
-    RDoc::Task.new(:clobber_rdoc => "rdoc:clean")
-    assert Rake::Task[:rdoc]
-    assert Rake::Task[:"rdoc:clean"]
-    assert Rake::Task[:rerdoc]
-    assert Rake::Task[:"rdoc:coverage"]
-  end
-
-  def test_tasks_creation_with_custom_name_hash_raises_exception_if_invalid_option_given
-    assert_raise(ArgumentError) do
-      RDoc::Task.new(:foo => "bar")
-    end
-
-    begin
-      RDoc::Task.new(:foo => "bar")
-    rescue ArgumentError => e
-      assert_match(/foo/, e.message)
-    end
-  end
-
-  def test_template_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.template = "foo"
-    end
-
-    assert_equal %w[-o html -T foo], rdoc_task.option_list
-  end
-
-  def test_title_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.title = "Test Title Option"
-    end
-
-    assert_equal %w[-o html] << "--title" << "Test Title Option", rdoc_task.option_list
-  end
-
-end if defined?(Rake::Task)
diff --git a/test/mri/rdoc/rdoc_text_test.rb b/test/mri/rdoc/rdoc_text_test.rb
deleted file mode 100644
index 2fd97614007..00000000000
--- a/test/mri/rdoc/rdoc_text_test.rb
+++ /dev/null
@@ -1,585 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-require 'timeout'
-
-class RDocTextTest < RDoc::TestCase
-
-  include RDoc::Text
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-
-    @top_level = @store.add_file 'file.rb'
-    @language = nil
-  end
-
-  def test_self_encode_fallback
-    assert_equal '…',
-                 RDoc::Text::encode_fallback('…', Encoding::UTF_8,    '...')
-    assert_equal '...',
-                 RDoc::Text::encode_fallback('…', Encoding::US_ASCII, '...')
-  end
-
-  def test_expand_tabs
-    assert_equal("hello\n  dave",
-                 expand_tabs("hello\n  dave"), 'spaces')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n\tdave"), 'tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n \tdave"), '1 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n  \tdave"), '2 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n   \tdave"), '3 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n    \tdave"), '4 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n     \tdave"), '5 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n      \tdave"), '6 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n       \tdave"), '7 space tab')
-
-    assert_equal("hello\n                dave",
-                 expand_tabs("hello\n         \tdave"), '8 space tab')
-
-    assert_equal('.               .',
-                 expand_tabs(".\t\t."), 'dot tab tab dot')
-
-    assert_equal('a       a',
-                 Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return")
-  end
-
-  def test_expand_tabs_encoding
-    inn = "hello\ns\tdave"
-    inn = RDoc::Encoding.change_encoding inn, Encoding::BINARY
-
-    out = expand_tabs inn
-
-    assert_equal "hello\ns       dave", out
-    assert_equal Encoding::BINARY, out.encoding
-  end
-
-  def test_flush_left
-    text = <<-TEXT
-
-  we don't worry too much.
-
-  The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED
-
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    assert_equal expected, flush_left(text)
-  end
-
-  def test_flush_left_encoding
-    text = <<-TEXT
-
-  we don't worry too much.
-
-  The comments associated with
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::US_ASCII
-
-    expected = <<-EXPECTED
-
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    result = flush_left text
-
-    assert_equal expected, result
-    assert_equal Encoding::US_ASCII, result.encoding
-  end
-
-  def test_markup_string
-    out = markup('hi').gsub("\n", '')
-
-    assert_equal '<p>hi</p>', out
-  end
-
-  def test_markup_comment
-    out = markup(comment('hi')).gsub("\n", '')
-
-    assert_equal '<p>hi</p>', out
-  end
-
-  def test_normalize_comment_hash
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :ruby
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_normalize_comment_stars_single_space
-    text = <<-TEXT
-/*
- * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :c
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_normalize_comment_stars_single_double_space
-    text = <<-TEXT
-/*
- *  we don't worry too much.
- *
- *  The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :c
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_parse
-    assert_kind_of RDoc::Markup::Document, parse('hi')
-  end
-
-  def test_parse_comment
-    expected = RDoc::Markup::Document.new
-    expected.file = @top_level
-
-    c = comment ''
-    parsed = parse c
-
-    assert_equal expected, parsed
-    assert_same parsed, parse(c)
-  end
-
-  def test_parse_document
-    assert_equal RDoc::Markup::Document.new, parse(RDoc::Markup::Document.new)
-  end
-
-  def test_parse_empty
-    assert_equal RDoc::Markup::Document.new, parse('')
-  end
-
-  def test_parse_empty_newline
-    @language = :ruby
-
-    assert_equal RDoc::Markup::Document.new, parse("#\n")
-  end
-
-  def test_parse_format_markdown
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it _works_'))
-
-    parsed = parse 'it *works*', 'markdown'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_format_rd
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it <em>works</em>'))
-
-    parsed = parse 'it ((*works*))', 'rd'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_format_tomdoc
-    code = verb('1 + 1')
-    code.format = :ruby
-
-    expected =
-      doc(
-        para('It does a thing'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code)
-
-    text = <<-TOMDOC
-It does a thing
-
-Examples
-
-  1 + 1
-    TOMDOC
-
-    parsed = parse text, 'tomdoc'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_newline
-    assert_equal RDoc::Markup::Document.new, parse("\n")
-  end
-
-  def test_snippet
-    text = <<-TEXT
-This is one-hundred characters or more of text in a single paragraph.  This
-paragraph will be cut off some point after the one-hundredth character.
-    TEXT
-
-    expected = <<-EXPECTED
-<p>This is one-hundred characters or more of text in a single paragraph.  This paragraph will be cut off …
-    EXPECTED
-
-    assert_equal expected, snippet(text)
-  end
-
-  def test_snippet_comment
-    c = comment 'This is a comment'
-
-    assert_equal "<p>This is a comment\n", snippet(c)
-  end
-
-  def test_snippet_short
-    text = 'This is a comment'
-
-    assert_equal "<p>#{text}\n", snippet(text)
-  end
-
-  def test_strip_hashes
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED
-
-  we don't worry too much.
-
-  The comments associated with
-    EXPECTED
-
-    assert_equal expected, strip_hashes(text)
-  end
-
-  def test_strip_hashes_encoding
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::CP852
-
-    expected = <<-EXPECTED
-
-  we don't worry too much.
-
-  The comments associated with
-    EXPECTED
-
-    stripped = strip_hashes text
-
-    assert_equal expected, stripped
-    assert_equal Encoding::CP852, stripped.encoding
-  end
-
-  def test_strip_newlines
-    assert_equal ' ',  strip_newlines("\n \n")
-
-    assert_equal 'hi', strip_newlines("\n\nhi")
-
-    assert_equal 'hi', strip_newlines(    "hi\n\n")
-
-    assert_equal 'hi', strip_newlines("\n\nhi\n\n")
-  end
-
-  def test_strip_newlines_encoding
-    assert_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    text = " \n"
-    text = RDoc::Encoding.change_encoding text, Encoding::US_ASCII
-
-    stripped = strip_newlines text
-
-    assert_equal ' ', stripped
-
-    assert_equal Encoding::US_ASCII, stripped.encoding
-  end
-
-  def test_strip_stars
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_document_method
-    text = <<-TEXT
-/*
- * Document-method: Zlib::GzipFile#mtime=
- *
- * A comment
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   A comment
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_document_method_special
-    text = <<-TEXT
-/*
- * Document-method: Zlib::GzipFile#mtime=
- * Document-method: []
- * Document-method: `
- * Document-method: |
- * Document-method: &
- * Document-method: <=>
- * Document-method: =~
- * Document-method: +
- * Document-method: -
- * Document-method: +@
- *
- * A comment
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   A comment
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_encoding
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::CP852
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    result = strip_stars text
-
-    assert_equal expected, result
-    assert_equal Encoding::CP852, result.encoding
-  end
-
-  def test_strip_stars_encoding2
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::BINARY
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    result = strip_stars text
-
-    assert_equal expected, result
-    assert_equal Encoding::BINARY, result.encoding
-  end
-
-  def test_strip_stars_no_stars
-    text = <<-TEXT
-* we don't worry too much.
-
-The comments associated with
-
-    TEXT
-
-    expected = <<-EXPECTED
-* we don't worry too much.
-
-The comments associated with
-
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_to_html_apostrophe
-    assert_equal '‘a', to_html("'a")
-    assert_equal 'a’', to_html("a'")
-
-    assert_equal '‘a’ ‘', to_html("'a' '")
-  end
-
-  def test_to_html_apostrophe_entity
-    assert_equal '‘a', to_html("&#39;a")
-    assert_equal 'a’', to_html("a&#39;")
-
-    assert_equal '‘a’ ‘', to_html("&#39;a&#39; &#39;")
-  end
-
-  def test_to_html_backslash
-    assert_equal 'S', to_html('\\S')
-  end
-
-  def test_to_html_br
-    assert_equal '<br>', to_html('<br>')
-  end
-
-  def test_to_html_copyright
-    assert_equal '©', to_html('(c)')
-    assert_equal '©', to_html('(C)')
-  end
-
-  def test_to_html_dash
-    assert_equal '-',  to_html('-')
-    assert_equal '–',  to_html('--')
-    assert_equal '—',  to_html('---')
-    assert_equal '—-', to_html('----')
-  end
-
-  def test_to_html_double_backtick
-    assert_equal '“a',  to_html('``a')
-    assert_equal '“a“', to_html('``a``')
-    assert_equal '“a”', to_html("``a''")
-  end
-
-  def test_to_html_double_quote
-    assert_equal '“a',  to_html('"a')
-    assert_equal '“a”', to_html('"a"')
-  end
-
-  def test_to_html_double_quote_quot
-    assert_equal '“a',  to_html('&quot;a')
-    assert_equal '“a”', to_html('&quot;a&quot;')
-  end
-
-  def test_to_html_double_tick
-    assert_equal '”a',        to_html("''a")
-    assert_equal '”a”', to_html("''a''")
-  end
-
-  def test_to_html_ellipsis
-    assert_equal '..', to_html('..')
-    assert_equal '…',  to_html('...')
-    assert_equal '.…', to_html('....')
-  end
-
-  def test_to_html_encoding
-    s = '...(c)'.encode Encoding::Shift_JIS
-
-    html = to_html s
-
-    assert_equal Encoding::Shift_JIS, html.encoding
-
-    expected = '…(c)'.encode Encoding::Shift_JIS
-
-    assert_equal expected, html
-  end
-
-  def test_to_html_html_tag
-    assert_equal '<a href="http://example">hi’s</a>',
-                 to_html('<a href="http://example">hi\'s</a>')
-  end
-
-  def test_to_html_registered_trademark
-    assert_equal '®', to_html('(r)')
-    assert_equal '®', to_html('(R)')
-  end
-
-  def test_to_html_tt_tag
-    assert_equal '<tt>hi\'s</tt>',   to_html('<tt>hi\'s</tt>')
-    assert_equal '<tt>hi\\\'s</tt>', to_html('<tt>hi\\\\\'s</tt>')
-  end
-
-  def test_to_html_tt_tag_mismatch
-    _, err = verbose_capture_output do
-      assert_equal '<tt>hi', to_html('<tt>hi')
-    end
-
-    assert_equal "mismatched <tt> tag\n", err
-  end
-
-  def formatter
-    RDoc::Markup::ToHtml.new @options
-  end
-
-  def options
-    @options
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_token_stream_test.rb b/test/mri/rdoc/rdoc_token_stream_test.rb
deleted file mode 100644
index a5f1930daa6..00000000000
--- a/test/mri/rdoc/rdoc_token_stream_test.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocTokenStreamTest < RDoc::TestCase
-
-  def test_class_to_html
-    tokens = [
-      { :line_no => 0, :char_no => 0, :kind => :on_const, :text => 'CONSTANT' },
-      { :line_no => 0, :char_no => 0, :kind => :on_kw, :text => 'KW' },
-      { :line_no => 0, :char_no => 0, :kind => :on_ivar, :text => 'IVAR' },
-      { :line_no => 0, :char_no => 0, :kind => :on_op, :text => 'Op' },
-      { :line_no => 0, :char_no => 0, :kind => :on_ident, :text => 'Id' },
-      { :line_no => 0, :char_no => 0, :kind => :on_backref, :text => 'Node' },
-      { :line_no => 0, :char_no => 0, :kind => :on_comment, :text => 'COMMENT' },
-      { :line_no => 0, :char_no => 0, :kind => :on_regexp, :text => 'REGEXP' },
-      { :line_no => 0, :char_no => 0, :kind => :on_tstring, :text => 'STRING' },
-      { :line_no => 0, :char_no => 0, :kind => :on_int, :text => 'Val' },
-      { :line_no => 0, :char_no => 0, :kind => :on_unknown, :text => '\\' }
-    ]
-
-    expected = [
-      '<span class="ruby-constant">CONSTANT</span>',
-      '<span class="ruby-keyword">KW</span>',
-      '<span class="ruby-ivar">IVAR</span>',
-      '<span class="ruby-operator">Op</span>',
-      '<span class="ruby-identifier">Id</span>',
-      '<span class="ruby-node">Node</span>',
-      '<span class="ruby-comment">COMMENT</span>',
-      '<span class="ruby-regexp">REGEXP</span>',
-      '<span class="ruby-string">STRING</span>',
-      '<span class="ruby-value">Val</span>',
-      '\\'
-    ].join
-
-    assert_equal expected, RDoc::TokenStream.to_html(tokens)
-  end
-
-  def test_class_to_html_empty
-    assert_equal '', RDoc::TokenStream.to_html([])
-  end
-
-  def test_add_tokens
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    foo.collect_tokens
-    foo.add_tokens([:token])
-    assert_equal [:token], foo.token_stream
-  end
-
-  def test_add_token
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    foo.collect_tokens
-    foo.add_token(:token)
-    assert_equal [:token], foo.token_stream
-  end
-
-  def test_collect_tokens
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    foo.collect_tokens
-    assert_equal [], foo.token_stream
-  end
-
-  def test_pop_token
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    foo.collect_tokens
-    foo.add_token(:token)
-    foo.pop_token
-    assert_equal [], foo.token_stream
-  end
-
-  def test_token_stream
-    foo = Class.new do
-      include RDoc::TokenStream
-    end.new
-    assert_equal nil, foo.token_stream
-  end
-
-  def test_tokens_to_s
-    foo = Class.new do
-      include RDoc::TokenStream
-
-      def initialize
-        @token_stream = [
-          { line_no: 0, char_no: 0, kind: :on_ident,   text: "foo" },
-          { line_no: 0, char_no: 0, kind: :on_sp,      text: " " },
-          { line_no: 0, char_no: 0, kind: :on_tstring, text: "'bar'" },
-        ]
-      end
-    end.new
-
-    assert_equal "foo 'bar'", foo.tokens_to_s
-
-    foo = Class.new do
-      include RDoc::TokenStream
-
-      def initialize
-        @token_stream = nil
-      end
-    end.new
-    assert_equal "", foo.tokens_to_s
-  end
-end
diff --git a/test/mri/rdoc/rdoc_tom_doc_test.rb b/test/mri/rdoc/rdoc_tom_doc_test.rb
deleted file mode 100644
index 941d027f243..00000000000
--- a/test/mri/rdoc/rdoc_tom_doc_test.rb
+++ /dev/null
@@ -1,579 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class RDocTomDocTest < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-
-    @TD = RDoc::TomDoc
-    @td = @TD.new
-  end
-
-  def test_class_add_post_processor
-    RDoc::TomDoc.add_post_processor
-
-    pp = RDoc::Markup::PreProcess.new __FILE__, []
-
-    text = "# Public: Do some stuff\n"
-
-    comment = RDoc::Comment.new text, nil
-    comment.format = 'tomdoc'
-
-    parent = RDoc::Context.new
-
-    pp.handle comment, parent
-
-    method = parent.add_method RDoc::AnyMethod.new(nil, 'm')
-
-    assert_equal 'Public', method.section.title
-    assert_equal "# Do some stuff\n", comment.text
-  end
-
-  def test_class_signature
-    c = comment <<-COMMENT
-Signature
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-  end
-
-  def test_class_signature_no_space
-    c = comment <<-COMMENT
-Signature
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[here],
-            para('something'))))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_class_signature_none
-    c = comment ''
-    c.format = 'tomdoc'
-
-    assert_nil @TD.signature c
-  end
-
-  def test_class_rdoc
-    c = comment <<-COMMENT
-=== Signature
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'rdoc'
-
-    signature = @TD.signature c
-
-    assert_nil signature
-  end
-
-  def test_class_signature_two_space
-    c = comment <<-COMMENT
-Signature
-
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[here],
-            para('something'))))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_parse_paragraph
-    text = "Public: Do some stuff\n"
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('Do some stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_multiline_paragraph
-    text = "Public: Do some stuff\n"
-    text += "On a new line\n"
-
-    expected =
-      doc(
-        para('Do some stuff', ' ', 'On a new line'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments
-    text = <<-TEXT
-Create new Arg object.
-
-name        - name of argument
-description - arguments description
-    TEXT
-
-    expected =
-      doc(
-        para('Create new Arg object.'),
-        blank_line,
-        list(:NOTE,
-          item(%w[name],
-            para('name of argument')),
-          item(%w[description],
-            para('arguments description'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_array
-    text = <<-TEXT
-Create new Arg object.
-
-names[] - names of arguments
-    TEXT
-
-    expected =
-      doc(
-        para('Create new Arg object.'),
-        blank_line,
-        list(:NOTE,
-          item(%w[names[]],
-            para('names of arguments'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_multiline
-    text = <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-  and is more than one line
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        list(:NOTE,
-          item(%w[foo],
-            para('A comment goes here', ' ', 'and is more than one line'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_nested
-    text = <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-      :bar - bar documentation
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        list(:NOTE,
-          item(%w[foo],
-            para('A comment goes here'),
-            list(:NOTE,
-              item(%w[:bar],
-                para('bar documentation'))))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_examples
-    text = <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-    TEXT
-
-    code = verb("1 + 1\n")
-    code.format = :ruby
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code)
-
-    document = @TD.parse(text)
-    assert_equal expected, document
-    assert document.parts.last.ruby?
-  end
-
-  def test_parse_examples_signature
-    text = <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-
-Signature
-
-  foo(args)
-    TEXT
-
-    code1 = verb("1 + 1\n")
-    code1.format = :ruby
-
-    code2 = verb("foo(args)\n")
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code1,
-        head(3, 'Signature'),
-        blank_line,
-        code2)
-
-    document = @TD.parse text
-
-    assert_equal expected, document
-  end
-
-  def test_parse_returns
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-
-Returns another thing
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing'),
-        blank_line,
-        para('Returns another thing'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_with_raises
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-Raises ArgumentError when stuff
-Raises StandardError when stuff
-    TEXT
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing'),
-        para('Raises ArgumentError when stuff'),
-        para('Raises StandardError when stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_raises_without_returns
-    text = <<-TEXT
-Do some stuff
-
-Raises ArgumentError when stuff
-    TEXT
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Raises ArgumentError when stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_multiline
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing', ' ', 'that is multiline'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_multiline_and_raises
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-Raises ArgumentError
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing', ' ', 'that is multiline'),
-        para('Raises ArgumentError'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_signature
-    text = <<-TEXT
-Do some stuff
-
-Signature
-
-  some_method(args)
-    TEXT
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('Do some stuff'),
-        @RM::BlankLine.new,
-        @RM::Heading.new(3, 'Signature'),
-        @RM::BlankLine.new,
-        @RM::Verbatim.new("some_method(args)\n"))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_tokenize_paragraph
-    @td.tokenize "Public: Do some stuff\n"
-
-    expected = [
-      [:TEXT,    "Do some stuff",  0, 0],
-      [:NEWLINE, "\n",            13, 0],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_multiline_paragraph
-    text = "Public: Do some stuff\n"
-    text += "On a new line\n"
-
-    @td.tokenize text
-
-    expected = [
-      [:TEXT,     "Do some stuff",   0, 0],
-      [:NEWLINE,  "\n",             13, 0],
-      [:TEXT,     "On a new line",   0, 1],
-      [:NEWLINE,  "\n",             13, 1]
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments
-    @td.tokenize <<-TEXT
-Create new Arg object.
-
-name        - name of argument
-description - arguments description
-    TEXT
-
-    expected = [
-      [:TEXT,    "Create new Arg object.",  0, 0],
-      [:NEWLINE, "\n",                     22, 0],
-      [:NEWLINE, "\n",                      0, 1],
-      [:NOTE,    "name",                    0, 2],
-      [:TEXT,    "name of argument",       14, 2],
-      [:NEWLINE, "\n",                     30, 2],
-      [:NOTE,    "description",             0, 3],
-      [:TEXT,    "arguments description",  14, 3],
-      [:NEWLINE, "\n",                     35, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_array
-    @td.tokenize <<-TEXT
-Create new Arg object.
-
-names[stuff] - names of arguments
-    TEXT
-
-    expected = [
-      [:TEXT,    "Create new Arg object.",  0, 0],
-      [:NEWLINE, "\n",                     22, 0],
-      [:NEWLINE, "\n",                      0, 1],
-      [:NOTE,    "names[stuff]",            0, 2],
-      [:TEXT,    "names of arguments",     15, 2],
-      [:NEWLINE, "\n",                     33, 2],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_multiline
-    @td.tokenize <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-  and is more than one line
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",              0, 0],
-      [:NEWLINE, "\n",                        13, 0],
-      [:NEWLINE, "\n",                         0, 1],
-      [:NOTE,    "foo",                        0, 2],
-      [:TEXT,    "A comment goes here",        6, 2],
-      [:NEWLINE, "\n",                        25, 2],
-      [:TEXT,    "and is more than one line",  2, 3],
-      [:NEWLINE, "\n",                        27, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_nested
-    @td.tokenize <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-      :bar - bar documentation
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",              0, 0],
-      [:NEWLINE, "\n",                        13, 0],
-      [:NEWLINE, "\n",                         0, 1],
-      [:NOTE,    "foo",                        0, 2],
-      [:TEXT,    "A comment goes here",        6, 2],
-      [:NEWLINE, "\n",                        25, 2],
-      [:NOTE,    ":bar",                       6, 3],
-      [:TEXT,    "bar documentation",         13, 3],
-      [:NEWLINE, "\n",                        30, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_examples
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",  0, 0],
-      [:NEWLINE, "\n",            13, 0],
-      [:NEWLINE, "\n",             0, 1],
-      [:HEADER,  3,                0, 2],
-      [:TEXT,    "Examples",       0, 2],
-      [:NEWLINE, "\n",             8, 2],
-      [:NEWLINE, "\n",             0, 3],
-      [:TEXT,    "1 + 1",          2, 4],
-      [:NEWLINE, "\n",             7, 4],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_returns
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Returns a thing
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",    0, 0],
-      [:NEWLINE, "\n",              13, 0],
-      [:NEWLINE, "\n",               0, 1],
-      [:TEXT,    "Returns a thing",  0, 2],
-      [:NEWLINE, "\n",              15, 2],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_returns_multiline
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",      0, 0],
-      [:NEWLINE, "\n",                13, 0],
-      [:NEWLINE, "\n",                 0, 1],
-      [:TEXT,    "Returns a thing",    0, 2],
-      [:NEWLINE, "\n",                15, 2],
-      [:TEXT,    "that is multiline",  2, 3],
-      [:NEWLINE, "\n",                19, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-end
diff --git a/test/mri/rdoc/rdoc_top_level_test.rb b/test/mri/rdoc/rdoc_top_level_test.rb
deleted file mode 100644
index 385860517b3..00000000000
--- a/test/mri/rdoc/rdoc_top_level_test.rb
+++ /dev/null
@@ -1,289 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class RDocTopLevelTest < XrefTestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'path/top_level.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-  end
-
-  def test_initialize
-    t = RDoc::TopLevel.new 'path/file.rb'
-
-    assert_equal 'path/file.rb', t.absolute_name
-    assert_equal 'path/file.rb', t.relative_name
-  end
-
-  def test_initialize_relative
-    t = RDoc::TopLevel.new 'path/file.rb', 'file.rb'
-
-    assert_equal 'path/file.rb', t.absolute_name
-    assert_equal 'file.rb',      t.relative_name
-  end
-
-  def test_add_alias
-    a = RDoc::Alias.new nil, 'old', 'new', nil
-    @top_level.add_alias a
-
-    object = @store.find_class_named 'Object'
-    expected = { '#old' => [a] }
-    assert_equal expected, object.unmatched_alias_lists
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_alias_nodoc
-    @top_level.document_self = false
-
-    a = RDoc::Alias.new nil, 'old', 'new', nil
-    @top_level.add_alias a
-
-    object = @store.find_class_named('Object')
-    assert_empty object.unmatched_alias_lists
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_constant
-    const = RDoc::Constant.new 'C', nil, nil
-    @top_level.add_constant const
-
-    object = @store.find_class_named 'Object'
-    assert_equal [const], object.constants
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_constant_nodoc
-    @top_level.document_self = false
-
-    const = RDoc::Constant.new 'C', nil, nil
-    @top_level.add_constant const
-
-    object = @store.find_class_named 'Object'
-    assert_empty object.constants
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_include
-    include = RDoc::Include.new 'C', nil
-    @top_level.add_include include
-
-    object = @store.find_class_named 'Object'
-    assert_equal [include], object.includes
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_include_nodoc
-    @top_level.document_self = false
-
-    include = RDoc::Include.new 'C', nil
-    @top_level.add_include include
-
-    object = @store.find_class_named('Object')
-    assert_empty object.includes
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_method
-    method = RDoc::AnyMethod.new nil, 'm'
-    @top_level.add_method method
-
-    object = @store.find_class_named 'Object'
-    assert_equal [@c10_method, @c11_method, method], object.method_list
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_method_stopdoc
-    @top_level.document_self = false
-
-    method = RDoc::AnyMethod.new nil, 'm'
-    @top_level.add_method method
-
-    object = @store.find_class_named('Object')
-    assert_equal [@c10_method, @c11_method], object.method_list
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_base_name
-    assert_equal 'top_level.rb', @top_level.base_name
-  end
-
-  def test_display_eh
-    refute @top_level.display?
-
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-
-    assert page.display?
-  end
-
-  def test_eql_eh
-    top_level2 = @store.add_file 'path/top_level.rb'
-    other_level = @store.add_file 'path/other_level.rb'
-
-    assert_operator @top_level, :eql?, top_level2
-
-    refute_operator other_level, :eql?, @top_level
-  end
-
-  def test_equals2
-    top_level2 = @store.add_file 'path/top_level.rb'
-    other_level = @store.add_file 'path/other_level.rb'
-
-    assert_equal @top_level, top_level2
-
-    refute_equal other_level, @top_level
-  end
-
-  def test_find_class_or_module
-    assert_equal @c1,    @xref_data.find_class_or_module('C1')
-    assert_equal @c2_c3, @xref_data.find_class_or_module('C2::C3')
-    assert_equal @c4,    @xref_data.find_class_or_module('C4')
-    assert_equal @m1_m2, @xref_data.find_class_or_module('M1::M2')
-  end
-
-  def test_full_name
-    assert_equal 'path/top_level.rb', @top_level.full_name
-  end
-
-  def test_hash
-    tl2 = @store.add_file 'path/top_level.rb'
-    tl3 = @store.add_file 'other/top_level.rb'
-
-    assert_equal @top_level.hash, tl2.hash
-    refute_equal @top_level.hash, tl3.hash
-  end
-
-  def test_http_url
-    assert_equal 'path/top_level_rb.html', @top_level.http_url
-
-    other_level = @store.add_file 'path.other/level.rb'
-    assert_equal 'path_other/level_rb.html', other_level.http_url
-  end
-
-  def test_path
-    assert_equal 'path/top_level_rb.html', @top_level.path
-
-    @options.file_path_prefix = 'file'
-    assert_equal 'file/path/top_level_rb.html', @top_level.path
-  end
-
-  def test_marshal_dump
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-    page.comment = RDoc::Comment.new 'This is a page', page
-
-    loaded = Marshal.load Marshal.dump page
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('This is a page'))
-    document.file = loaded
-
-    assert_equal page, loaded
-
-    assert_equal 'README.txt', loaded.absolute_name
-    assert_equal 'README.txt', loaded.relative_name
-
-    assert_equal RDoc::Parser::Simple, loaded.parser
-
-    assert_equal document, loaded.comment.parse
-  end
-
-  def test_marshal_load_version_0
-    loaded = Marshal.load "\x04\bU:\x13RDoc::TopLevel" +
-                          "[\ti\x00I\"\x0FREADME.txt\x06:\x06EF" +
-                          "c\x19RDoc::Parser::Simple" +
-                          "o:\eRDoc::Markup::Document\a:\v@parts" +
-                          "[\x06o:\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x13This is a page\x06;\x06F:\n@file@\a"
-
-    document = RDoc::Markup::Document.new(
-                 RDoc::Markup::Paragraph.new('This is a page'))
-    document.file = loaded
-
-    assert_equal 'README.txt', loaded.absolute_name
-    assert_equal 'README.txt', loaded.relative_name
-
-    assert_equal RDoc::Parser::Simple, loaded.parser
-
-    assert_equal document, loaded.comment.parse
-
-    assert loaded.display?
-  end
-
-  def test_name
-    assert_equal 'top_level.rb', @top_level.name
-  end
-
-  def test_page_name
-    assert_equal 'top_level', @top_level.page_name
-
-    tl = @store.add_file 'README.ja'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'Rakefile'
-
-    assert_equal 'Rakefile', tl.page_name
-  end
-
-  def test_page_name_trim_extension
-    tl = @store.add_file 'README.ja.rdoc'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'README.ja.md'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'README.txt'
-
-    assert_equal 'README', tl.page_name
-  end
-
-  def test_search_record
-    assert_nil @xref_data.search_record
-  end
-
-  def test_search_record_page
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-    page.comment = 'This is a comment.'
-
-    expected = [
-      'README',
-      '',
-      'README',
-      '',
-      'README_txt.html',
-      '',
-      "<p>This is a comment.\n",
-    ]
-
-    assert_equal expected, page.search_record
-  end
-
-  def test_text_eh
-    refute @xref_data.text?
-
-    rd = @store.add_file 'rd_format.rd'
-    rd.parser = RDoc::Parser::RD
-
-    assert rd.text?
-
-    simple = @store.add_file 'simple.txt'
-    simple.parser = RDoc::Parser::Simple
-
-    assert simple.text?
-  end
-
-  def test_text_eh_no_parser
-    refute @xref_data.text?
-
-    rd = @store.add_file 'rd_format.rd'
-
-    refute rd.text?
-  end
-
-end
diff --git a/test/mri/reline/helper.rb b/test/mri/reline/helper.rb
deleted file mode 100644
index 37a99bb18a8..00000000000
--- a/test/mri/reline/helper.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-ENV['TERM'] = 'xterm' # for some CI environments
-
-require 'reline'
-require 'test/unit'
-
-begin
-  require 'rbconfig'
-rescue LoadError
-end
-
-begin
-  # This should exist and available in load path when this file is mirrored to ruby/ruby and running at there
-  if File.exist?(File.expand_path('../../tool/lib/envutil.rb', __dir__))
-    require 'envutil'
-  end
-rescue LoadError
-end
-
-module Reline
-  class << self
-    def test_mode(ansi: false)
-      @original_iogate = IOGate
-
-      if defined?(RELINE_TEST_ENCODING)
-        encoding = RELINE_TEST_ENCODING
-      else
-        encoding = Encoding::UTF_8
-      end
-
-      if ansi
-        new_io_gate = ANSI.new
-        # Setting ANSI gate's screen size through set_screen_size will also change the tester's stdin's screen size
-        # Let's avoid that side-effect by stubbing the get_screen_size method
-        new_io_gate.define_singleton_method(:get_screen_size) do
-          [24, 80]
-        end
-        new_io_gate.define_singleton_method(:encoding) do
-          encoding
-        end
-      else
-        new_io_gate = Dumb.new(encoding: encoding)
-      end
-
-      remove_const('IOGate')
-      const_set('IOGate', new_io_gate)
-      core.config.instance_variable_set(:@test_mode, true)
-      core.config.reset
-    end
-
-    def test_reset
-      remove_const('IOGate')
-      const_set('IOGate', @original_iogate)
-      Reline.instance_variable_set(:@core, nil)
-    end
-
-    # Return a executable name to spawn Ruby process. In certain build configuration,
-    # "ruby" may not be available.
-    def test_rubybin
-      # When this test suite is running in ruby/ruby, prefer EnvUtil result over original implementation
-      if const_defined?(:EnvUtil)
-        return EnvUtil.rubybin
-      end
-
-      # The following is a simplified port of EnvUtil.rubybin in ruby/ruby
-      if ruby = ENV["RUBY"]
-        return ruby
-      end
-      ruby = "ruby"
-      exeext = RbConfig::CONFIG["EXEEXT"]
-      rubyexe = (ruby + exeext if exeext and !exeext.empty?)
-      if File.exist? ruby and File.executable? ruby and !File.directory? ruby
-        return File.expand_path(ruby)
-      end
-      if rubyexe and File.exist? rubyexe and File.executable? rubyexe
-        return File.expand_path(rubyexe)
-      end
-      if defined?(RbConfig.ruby)
-        RbConfig.ruby
-      else
-        "ruby"
-      end
-    end
-  end
-end
-
-class Reline::TestCase < Test::Unit::TestCase
-  private def convert_str(input, options = {}, normalized = nil)
-    return nil if input.nil?
-    input = input.chars.map { |c|
-      if Reline::Unicode::EscapedChars.include?(c.ord)
-        c
-      else
-        c.encode(@line_editor.encoding, Encoding::UTF_8, **options)
-      end
-    }.join
-  rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-    if unicode?(input.encoding)
-      input = input.unicode_normalize(:nfc)
-      if normalized
-        options[:undef] = :replace
-        options[:replace] = '?'
-      end
-      normalized = true
-      retry
-    end
-    input
-  end
-
-  def input_key_by_symbol(method_symbol, char: nil, csi: false)
-    char ||= csi ? "\e[A" : "\C-a"
-    @line_editor.input_key(Reline::Key.new(char, method_symbol, false))
-  end
-
-  def input_keys(input, convert = true)
-    # Reline does not support convert-meta, but test data includes \M-char. It should be converted to ESC+char.
-    # Note that mixing unicode chars and \M-char is not recommended. "\M-C\M-\C-A" is a single unicode character.
-    input = input.chars.map do |c|
-      c.valid_encoding? ? c : "\e#{(c.bytes[0] & 0x7f).chr}"
-    end.join
-    input_raw_keys(input, convert)
-  end
-
-  def input_raw_keys(input, convert = true)
-    input = convert_str(input) if convert
-    key_stroke = Reline::KeyStroke.new(@config, @encoding)
-    input_bytes = input.bytes
-    until input_bytes.empty?
-      expanded, input_bytes = key_stroke.expand(input_bytes)
-      expanded.each do |key|
-        @line_editor.input_key(key)
-      end
-    end
-  end
-
-  def set_line_around_cursor(before, after)
-    input_keys("\C-a\C-k")
-    input_keys(after)
-    input_keys("\C-a")
-    input_keys(before)
-  end
-
-  def assert_line_around_cursor(before, after)
-    before = convert_str(before)
-    after = convert_str(after)
-    line = @line_editor.current_line
-    byte_pointer = @line_editor.instance_variable_get(:@byte_pointer)
-    actual_before = line.byteslice(0, byte_pointer)
-    actual_after = line.byteslice(byte_pointer..)
-    assert_equal([before, after], [actual_before, actual_after])
-  end
-
-  def assert_byte_pointer_size(expected)
-    expected = convert_str(expected)
-    byte_pointer = @line_editor.instance_variable_get(:@byte_pointer)
-    chunk = @line_editor.line.byteslice(0, byte_pointer)
-    assert_equal(
-      expected.bytesize, byte_pointer,
-      <<~EOM)
-        <#{expected.inspect} (#{expected.encoding.inspect})> expected but was
-        <#{chunk.inspect} (#{chunk.encoding.inspect})> in <Terminal #{Reline::Dumb.new.encoding.inspect}>
-      EOM
-  end
-
-  def assert_line_index(expected)
-    assert_equal(expected, @line_editor.instance_variable_get(:@line_index))
-  end
-
-  def assert_whole_lines(expected)
-    assert_equal(expected, @line_editor.whole_lines)
-  end
-
-  def assert_key_binding(input, method_symbol, editing_modes = [:emacs, :vi_insert, :vi_command])
-    editing_modes.each do |editing_mode|
-      @config.editing_mode = editing_mode
-      assert_equal(method_symbol, @config.editing_mode.get(input.bytes))
-    end
-  end
-
-  private def unicode?(encoding)
-    [Encoding::UTF_8, Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].include?(encoding)
-  end
-end
diff --git a/test/mri/reline/test_ansi.rb b/test/mri/reline/test_ansi.rb
deleted file mode 100644
index 5e28e72b06c..00000000000
--- a/test/mri/reline/test_ansi.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-require_relative 'helper'
-require 'reline'
-
-class Reline::ANSITest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode, ansi: true)
-    @config = Reline::Config.new
-    Reline.core.io_gate.set_default_key_bindings(@config)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_home
-    assert_key_binding("\e[1~", :ed_move_to_beg) # Console (80x25)
-    assert_key_binding("\e[H", :ed_move_to_beg) # KDE
-    assert_key_binding("\e[7~", :ed_move_to_beg) # urxvt / exoterm
-    assert_key_binding("\eOH", :ed_move_to_beg) # GNOME
-  end
-
-  def test_end
-    assert_key_binding("\e[4~", :ed_move_to_end) # Console (80x25)
-    assert_key_binding("\e[F", :ed_move_to_end) # KDE
-    assert_key_binding("\e[8~", :ed_move_to_end) # urxvt / exoterm
-    assert_key_binding("\eOF", :ed_move_to_end) # GNOME
-  end
-
-  def test_delete
-    assert_key_binding("\e[3~", :key_delete)
-  end
-
-  def test_up_arrow
-    assert_key_binding("\e[A", :ed_prev_history) # Console (80x25)
-    assert_key_binding("\eOA", :ed_prev_history)
-  end
-
-  def test_down_arrow
-    assert_key_binding("\e[B", :ed_next_history) # Console (80x25)
-    assert_key_binding("\eOB", :ed_next_history)
-  end
-
-  def test_right_arrow
-    assert_key_binding("\e[C", :ed_next_char) # Console (80x25)
-    assert_key_binding("\eOC", :ed_next_char)
-  end
-
-  def test_left_arrow
-    assert_key_binding("\e[D", :ed_prev_char) # Console (80x25)
-    assert_key_binding("\eOD", :ed_prev_char)
-  end
-
-  # Ctrl+arrow and Meta+arrow
-  def test_extended
-    assert_key_binding("\e[1;5C", :em_next_word) # Ctrl+→
-    assert_key_binding("\e[1;5D", :ed_prev_word) # Ctrl+←
-    assert_key_binding("\e[1;3C", :em_next_word) # Meta+→
-    assert_key_binding("\e[1;3D", :ed_prev_word) # Meta+←
-    assert_key_binding("\e\e[C", :em_next_word) # Meta+→
-    assert_key_binding("\e\e[D", :ed_prev_word) # Meta+←
-  end
-
-  def test_shift_tab
-    assert_key_binding("\e[Z", :completion_journey_up, [:emacs, :vi_insert])
-  end
-
-  # A few emacs bindings that are always mapped
-  def test_more_emacs
-    assert_key_binding("\e ", :em_set_mark, [:emacs])
-    assert_key_binding("\C-x\C-x", :em_exchange_mark, [:emacs])
-  end
-end
diff --git a/test/mri/reline/test_config.rb b/test/mri/reline/test_config.rb
deleted file mode 100644
index 3c9094eeced..00000000000
--- a/test/mri/reline/test_config.rb
+++ /dev/null
@@ -1,616 +0,0 @@
-require_relative 'helper'
-
-class Reline::Config::Test < Reline::TestCase
-  def setup
-    @pwd = Dir.pwd
-    @tmpdir = File.join(Dir.tmpdir, "test_reline_config_#{$$}")
-    begin
-      Dir.mkdir(@tmpdir)
-    rescue Errno::EEXIST
-      FileUtils.rm_rf(@tmpdir)
-      Dir.mkdir(@tmpdir)
-    end
-    Dir.chdir(@tmpdir)
-    Reline.test_mode
-    @config = Reline::Config.new
-    @inputrc_backup = ENV['INPUTRC']
-  end
-
-  def teardown
-    Dir.chdir(@pwd)
-    FileUtils.rm_rf(@tmpdir)
-    Reline.test_reset
-    @config.reset
-    ENV['INPUTRC'] = @inputrc_backup
-  end
-
-  def get_config_variable(variable)
-    @config.instance_variable_get(variable)
-  end
-
-  def additional_key_bindings(keymap_label)
-    get_config_variable(:@additional_key_bindings)[keymap_label].instance_variable_get(:@key_bindings)
-  end
-
-  def registered_key_bindings(keys)
-    key_bindings = @config.key_bindings
-    keys.to_h { |key| [key, key_bindings.get(key)] }
-  end
-
-  def test_read_lines
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-    LINES
-
-    assert_equal true, get_config_variable(:@show_mode_in_prompt)
-  end
-
-  def test_read_lines_with_variable
-    @config.read_lines(<<~LINES.lines)
-      set disable-completion on
-    LINES
-
-    assert_equal true, get_config_variable(:@disable_completion)
-  end
-
-  def test_string_value
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string Emacs
-    LINES
-
-    assert_equal 'Emacs', get_config_variable(:@emacs_mode_string)
-  end
-
-  def test_string_value_with_brackets
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string [Emacs]
-    LINES
-
-    assert_equal '[Emacs]', get_config_variable(:@emacs_mode_string)
-  end
-
-  def test_string_value_with_brackets_and_quotes
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string "[Emacs]"
-    LINES
-
-    assert_equal '[Emacs]', get_config_variable(:@emacs_mode_string)
-  end
-
-  def test_string_value_with_parens
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string (Emacs)
-    LINES
-
-    assert_equal '(Emacs)', get_config_variable(:@emacs_mode_string)
-  end
-
-  def test_string_value_with_parens_and_quotes
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string "(Emacs)"
-    LINES
-
-    assert_equal '(Emacs)', get_config_variable(:@emacs_mode_string)
-  end
-
-  def test_encoding_is_ascii
-    @config.reset
-    Reline.core.io_gate.instance_variable_set(:@encoding, Encoding::US_ASCII)
-    @config = Reline::Config.new
-
-    assert_equal true, @config.convert_meta
-  end
-
-  def test_encoding_is_not_ascii
-    @config = Reline::Config.new
-
-    assert_equal false, @config.convert_meta
-  end
-
-  def test_invalid_keystroke
-    @config.read_lines(<<~LINES.lines)
-      #"a": comment
-      a: error
-      "b": no-error
-    LINES
-    key_bindings = additional_key_bindings(:emacs)
-    assert_not_include key_bindings, 'a'.bytes
-    assert_not_include key_bindings, nil
-    assert_not_include key_bindings, []
-    assert_include key_bindings, 'b'.bytes
-  end
-
-  def test_bind_key
-    assert_equal ['input'.bytes, 'abcde'.bytes], @config.parse_key_binding('"input"', '"abcde"')
-  end
-
-  def test_bind_key_with_macro
-
-    assert_equal ['input'.bytes, :abcde], @config.parse_key_binding('"input"', 'abcde')
-  end
-
-  def test_bind_key_with_escaped_chars
-    assert_equal ['input'.bytes, "\e \\ \" ' \a \b \d \f \n \r \t \v".bytes], @config.parse_key_binding('"input"', '"\\e \\\\ \\" \\\' \\a \\b \\d \\f \\n \\r \\t \\v"')
-  end
-
-  def test_bind_key_with_ctrl_chars
-    assert_equal ['input'.bytes, "\C-h\C-h\C-_".bytes], @config.parse_key_binding('"input"', '"\C-h\C-H\C-_"')
-    assert_equal ['input'.bytes, "\C-h\C-h\C-_".bytes], @config.parse_key_binding('"input"', '"\Control-h\Control-H\Control-_"')
-  end
-
-  def test_bind_key_with_meta_chars
-    assert_equal ['input'.bytes, "\eh\eH\e_".bytes], @config.parse_key_binding('"input"', '"\M-h\M-H\M-_"')
-    assert_equal ['input'.bytes, "\eh\eH\e_".bytes], @config.parse_key_binding('"input"', '"\Meta-h\Meta-H\M-_"')
-  end
-
-  def test_bind_key_with_ctrl_meta_chars
-    assert_equal ['input'.bytes, "\e\C-h\e\C-h\e\C-_".bytes], @config.parse_key_binding('"input"', '"\M-\C-h\C-\M-H\M-\C-_"')
-    assert_equal ['input'.bytes, "\e\C-h\e\C-_".bytes], @config.parse_key_binding('"input"', '"\Meta-\Control-h\Control-\Meta-_"')
-  end
-
-  def test_bind_key_with_octal_number
-    input = %w{i n p u t}.map(&:ord)
-    assert_equal [input, "\1".bytes], @config.parse_key_binding('"input"', '"\1"')
-    assert_equal [input, "\12".bytes], @config.parse_key_binding('"input"', '"\12"')
-    assert_equal [input, "\123".bytes], @config.parse_key_binding('"input"', '"\123"')
-    assert_equal [input, "\123".bytes + '4'.bytes], @config.parse_key_binding('"input"', '"\1234"')
-  end
-
-  def test_bind_key_with_hexadecimal_number
-    input = %w{i n p u t}.map(&:ord)
-    assert_equal [input, "\x4".bytes], @config.parse_key_binding('"input"', '"\x4"')
-    assert_equal [input, "\x45".bytes], @config.parse_key_binding('"input"', '"\x45"')
-    assert_equal [input, "\x45".bytes + '6'.bytes], @config.parse_key_binding('"input"', '"\x456"')
-  end
-
-  def test_include
-    File.open('included_partial', 'wt') do |f|
-      f.write(<<~PARTIAL_LINES)
-        set show-mode-in-prompt on
-      PARTIAL_LINES
-    end
-    @config.read_lines(<<~LINES.lines)
-      $include included_partial
-    LINES
-
-    assert_equal true, get_config_variable(:@show_mode_in_prompt)
-  end
-
-  def test_include_expand_path
-    home_backup = ENV['HOME']
-    File.open('included_partial', 'wt') do |f|
-      f.write(<<~PARTIAL_LINES)
-        set show-mode-in-prompt on
-      PARTIAL_LINES
-    end
-    ENV['HOME'] = Dir.pwd
-    @config.read_lines(<<~LINES.lines)
-      $include ~/included_partial
-    LINES
-
-    assert_equal true, get_config_variable(:@show_mode_in_prompt)
-  ensure
-    ENV['HOME'] = home_backup
-  end
-
-  def test_if
-    @config.read_lines(<<~LINES.lines)
-      $if Ruby
-      set vi-cmd-mode-string (cmd)
-      $else
-      set vi-cmd-mode-string [cmd]
-      $endif
-    LINES
-
-    assert_equal '(cmd)', get_config_variable(:@vi_cmd_mode_string)
-  end
-
-  def test_if_with_false
-    @config.read_lines(<<~LINES.lines)
-      $if Python
-      set vi-cmd-mode-string (cmd)
-      $else
-      set vi-cmd-mode-string [cmd]
-      $endif
-    LINES
-
-    assert_equal '[cmd]', get_config_variable(:@vi_cmd_mode_string)
-  end
-
-  def test_if_with_indent
-    %w[Ruby Reline].each do |cond|
-      @config.read_lines(<<~LINES.lines)
-        set vi-cmd-mode-string {cmd}
-          $if #{cond}
-            set vi-cmd-mode-string (cmd)
-          $else
-            set vi-cmd-mode-string [cmd]
-          $endif
-      LINES
-
-      assert_equal '(cmd)', get_config_variable(:@vi_cmd_mode_string)
-    end
-  end
-
-  def test_nested_if_else
-    @config.read_lines(<<~LINES.lines)
-      $if Ruby
-        "\x1": "O"
-        $if NotRuby
-          "\x2": "X"
-        $else
-          "\x3": "O"
-          $if Ruby
-            "\x4": "O"
-          $else
-            "\x5": "X"
-          $endif
-          "\x6": "O"
-        $endif
-        "\x7": "O"
-      $else
-        "\x8": "X"
-        $if NotRuby
-          "\x9": "X"
-        $else
-          "\xA": "X"
-        $endif
-        "\xB": "X"
-      $endif
-      "\xC": "O"
-    LINES
-    keys = [0x1, 0x3, 0x4, 0x6, 0x7, 0xC]
-    key_bindings = keys.to_h { |k| [[k], ['O'.ord]] }
-    assert_equal(key_bindings, additional_key_bindings(:emacs))
-  end
-
-  def test_unclosed_if
-    e = assert_raise(Reline::Config::InvalidInputrc) do
-      @config.read_lines(<<~LINES.lines, "INPUTRC")
-        $if Ruby
-      LINES
-    end
-    assert_equal "INPUTRC:1: unclosed if", e.message
-  end
-
-  def test_unmatched_else
-    e = assert_raise(Reline::Config::InvalidInputrc) do
-      @config.read_lines(<<~LINES.lines, "INPUTRC")
-        $else
-      LINES
-    end
-    assert_equal "INPUTRC:1: unmatched else", e.message
-  end
-
-  def test_unmatched_endif
-    e = assert_raise(Reline::Config::InvalidInputrc) do
-      @config.read_lines(<<~LINES.lines, "INPUTRC")
-        $endif
-      LINES
-    end
-    assert_equal "INPUTRC:1: unmatched endif", e.message
-  end
-
-  def test_if_with_mode
-    @config.read_lines(<<~LINES.lines)
-      $if mode=emacs
-        "\C-e": history-search-backward # comment
-      $else
-        "\C-f": history-search-forward
-      $endif
-    LINES
-
-    assert_equal({[5] => :history_search_backward}, additional_key_bindings(:emacs))
-    assert_equal({}, additional_key_bindings(:vi_insert))
-    assert_equal({}, additional_key_bindings(:vi_command))
-  end
-
-  def test_else
-    @config.read_lines(<<~LINES.lines)
-      $if mode=vi
-        "\C-e": history-search-backward # comment
-      $else
-        "\C-f": history-search-forward
-      $endif
-    LINES
-
-    assert_equal({[6] => :history_search_forward}, additional_key_bindings(:emacs))
-    assert_equal({}, additional_key_bindings(:vi_insert))
-    assert_equal({}, additional_key_bindings(:vi_command))
-  end
-
-  def test_if_with_invalid_mode
-    @config.read_lines(<<~LINES.lines)
-      $if mode=vim
-        "\C-e": history-search-backward
-      $else
-        "\C-f": history-search-forward # comment
-      $endif
-    LINES
-
-    assert_equal({[6] => :history_search_forward}, additional_key_bindings(:emacs))
-    assert_equal({}, additional_key_bindings(:vi_insert))
-    assert_equal({}, additional_key_bindings(:vi_command))
-  end
-
-  def test_mode_label_differs_from_keymap_label
-    @config.read_lines(<<~LINES.lines)
-      # Sets mode_label and keymap_label to vi
-      set editing-mode vi
-      # Change keymap_label to emacs. mode_label is still vi.
-      set keymap emacs
-      # condition=true because current mode_label is vi
-      $if mode=vi
-        # sets keybinding to current keymap_label=emacs
-        "\C-e": history-search-backward
-      $endif
-    LINES
-    assert_equal({[5] => :history_search_backward}, additional_key_bindings(:emacs))
-    assert_equal({}, additional_key_bindings(:vi_insert))
-    assert_equal({}, additional_key_bindings(:vi_command))
-  end
-
-  def test_if_without_else_condition
-    @config.read_lines(<<~LINES.lines)
-      set editing-mode vi
-      $if mode=vi
-        "\C-e": history-search-backward
-      $endif
-    LINES
-
-    assert_equal({}, additional_key_bindings(:emacs))
-    assert_equal({[5] => :history_search_backward}, additional_key_bindings(:vi_insert))
-    assert_equal({}, additional_key_bindings(:vi_command))
-  end
-
-  def test_default_key_bindings
-    @config.add_default_key_binding('abcd'.bytes, 'EFGH'.bytes)
-    @config.read_lines(<<~'LINES'.lines)
-      "abcd": "ABCD"
-      "ijkl": "IJKL"
-    LINES
-
-    expected = { 'abcd'.bytes => 'ABCD'.bytes, 'ijkl'.bytes => 'IJKL'.bytes }
-    assert_equal expected, registered_key_bindings(expected.keys)
-  end
-
-  def test_additional_key_bindings
-    @config.read_lines(<<~'LINES'.lines)
-      "ef": "EF"
-      "gh": "GH"
-    LINES
-
-    expected = { 'ef'.bytes => 'EF'.bytes, 'gh'.bytes => 'GH'.bytes }
-    assert_equal expected, registered_key_bindings(expected.keys)
-  end
-
-  def test_unquoted_additional_key_bindings
-    @config.read_lines(<<~'LINES'.lines)
-      Meta-a: "Ma"
-      Control-b: "Cb"
-      Meta-Control-c: "MCc"
-      Control-Meta-d: "CMd"
-      M-C-e: "MCe"
-      C-M-f: "CMf"
-    LINES
-
-    expected = { "\ea".bytes => 'Ma'.bytes, "\C-b".bytes => 'Cb'.bytes, "\e\C-c".bytes => 'MCc'.bytes, "\e\C-d".bytes => 'CMd'.bytes, "\e\C-e".bytes => 'MCe'.bytes, "\e\C-f".bytes => 'CMf'.bytes }
-    assert_equal expected, registered_key_bindings(expected.keys)
-  end
-
-  def test_additional_key_bindings_with_nesting_and_comment_out
-    @config.read_lines(<<~'LINES'.lines)
-      #"ab": "AB"
-        #"cd": "cd"
-      "ef": "EF"
-        "gh": "GH"
-    LINES
-
-    expected = { 'ef'.bytes => 'EF'.bytes, 'gh'.bytes => 'GH'.bytes }
-    assert_equal expected, registered_key_bindings(expected.keys)
-  end
-
-  def test_additional_key_bindings_for_other_keymap
-    @config.read_lines(<<~'LINES'.lines)
-      set keymap vi-command
-      "ab": "AB"
-      set keymap vi-insert
-      "cd": "CD"
-      set keymap emacs
-      "ef": "EF"
-      set editing-mode vi # keymap changes to be vi-insert
-    LINES
-
-    expected = { 'cd'.bytes => 'CD'.bytes }
-    assert_equal expected, registered_key_bindings(expected.keys)
-  end
-
-  def test_additional_key_bindings_for_auxiliary_emacs_keymaps
-    @config.read_lines(<<~'LINES'.lines)
-      set keymap emacs
-      "ab": "AB"
-      set keymap emacs-standard
-      "cd": "CD"
-      set keymap emacs-ctlx
-      "ef": "EF"
-      set keymap emacs-meta
-      "gh": "GH"
-      set editing-mode emacs # keymap changes to be emacs
-    LINES
-
-    expected = {
-      'ab'.bytes => 'AB'.bytes,
-      'cd'.bytes => 'CD'.bytes,
-      "\C-xef".bytes => 'EF'.bytes,
-      "\egh".bytes => 'GH'.bytes,
-    }
-    assert_equal expected, registered_key_bindings(expected.keys)
-  end
-
-  def test_key_bindings_with_reset
-    # @config.reset is called after each readline.
-    # inputrc file is read once, so key binding shouldn't be cleared by @config.reset
-    @config.add_default_key_binding('default'.bytes, 'DEFAULT'.bytes)
-    @config.read_lines(<<~'LINES'.lines)
-      "additional": "ADDITIONAL"
-    LINES
-    @config.reset
-    expected = { 'default'.bytes => 'DEFAULT'.bytes, 'additional'.bytes => 'ADDITIONAL'.bytes }
-    assert_equal expected, registered_key_bindings(expected.keys)
-  end
-
-  def test_history_size
-    @config.read_lines(<<~LINES.lines)
-      set history-size 5000
-    LINES
-
-    assert_equal 5000, get_config_variable(:@history_size)
-    history = Reline::History.new(@config)
-    history << "a\n"
-    assert_equal 1, history.size
-  end
-
-  def test_empty_inputrc_env
-    inputrc_backup = ENV['INPUTRC']
-    ENV['INPUTRC'] = ''
-    assert_nothing_raised do
-      @config.read
-    end
-  ensure
-    ENV['INPUTRC'] = inputrc_backup
-  end
-
-  def test_inputrc
-    inputrc_backup = ENV['INPUTRC']
-    expected = "#{@tmpdir}/abcde"
-    ENV['INPUTRC'] = expected
-    assert_equal expected, @config.inputrc_path
-  ensure
-    ENV['INPUTRC'] = inputrc_backup
-  end
-
-  def test_inputrc_raw_value
-    @config.read_lines(<<~'LINES'.lines)
-      set editing-mode vi ignored-string
-      set vi-ins-mode-string aaa aaa
-      set vi-cmd-mode-string bbb ccc # comment
-    LINES
-    assert_equal :vi_insert, get_config_variable(:@editing_mode_label)
-    assert_equal 'aaa aaa', @config.vi_ins_mode_string
-    assert_equal 'bbb ccc # comment', @config.vi_cmd_mode_string
-  end
-
-  def test_inputrc_with_utf8
-    # This file is encoded by UTF-8 so this heredoc string is also UTF-8.
-    @config.read_lines(<<~'LINES'.lines)
-      set editing-mode vi
-      set vi-cmd-mode-string 🍸
-      set vi-ins-mode-string 🍶
-    LINES
-    assert_equal '🍸', @config.vi_cmd_mode_string
-    assert_equal '🍶', @config.vi_ins_mode_string
-  rescue Reline::ConfigEncodingConversionError
-    # do nothing
-  end
-
-  def test_inputrc_with_eucjp
-    @config.read_lines(<<~"LINES".encode(Encoding::EUC_JP).lines)
-      set editing-mode vi
-      set vi-cmd-mode-string ｫｬｯ
-      set vi-ins-mode-string 能
-    LINES
-    assert_equal 'ｫｬｯ'.encode(Reline.encoding_system_needs), @config.vi_cmd_mode_string
-    assert_equal '能'.encode(Reline.encoding_system_needs), @config.vi_ins_mode_string
-  rescue Reline::ConfigEncodingConversionError
-    # do nothing
-  end
-
-  def test_empty_inputrc
-    assert_nothing_raised do
-      @config.read_lines([])
-    end
-  end
-
-  def test_xdg_config_home
-    home_backup = ENV['HOME']
-    xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
-    inputrc_backup = ENV['INPUTRC']
-    xdg_config_home = File.expand_path("#{@tmpdir}/.config/example_dir")
-    expected = File.expand_path("#{xdg_config_home}/readline/inputrc")
-    FileUtils.mkdir_p(File.dirname(expected))
-    FileUtils.touch(expected)
-    ENV['HOME'] = @tmpdir
-    ENV['XDG_CONFIG_HOME'] = xdg_config_home
-    ENV['INPUTRC'] = ''
-    assert_equal expected, @config.inputrc_path
-  ensure
-    FileUtils.rm(expected)
-    ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
-    ENV['HOME'] = home_backup
-    ENV['INPUTRC'] = inputrc_backup
-  end
-
-  def test_empty_xdg_config_home
-    home_backup = ENV['HOME']
-    xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
-    inputrc_backup = ENV['INPUTRC']
-    ENV['HOME'] = @tmpdir
-    ENV['XDG_CONFIG_HOME'] = ''
-    ENV['INPUTRC'] = ''
-    expected = File.expand_path('~/.config/readline/inputrc')
-    FileUtils.mkdir_p(File.dirname(expected))
-    FileUtils.touch(expected)
-    assert_equal expected, @config.inputrc_path
-  ensure
-    FileUtils.rm(expected)
-    ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
-    ENV['HOME'] = home_backup
-    ENV['INPUTRC'] = inputrc_backup
-  end
-
-  def test_relative_xdg_config_home
-    home_backup = ENV['HOME']
-    xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
-    inputrc_backup = ENV['INPUTRC']
-    ENV['HOME'] = @tmpdir
-    ENV['INPUTRC'] = ''
-    expected = File.expand_path('~/.config/readline/inputrc')
-    FileUtils.mkdir_p(File.dirname(expected))
-    FileUtils.touch(expected)
-    result = Dir.chdir(@tmpdir) do
-      xdg_config_home = ".config/example_dir"
-      ENV['XDG_CONFIG_HOME'] = xdg_config_home
-      inputrc = "#{xdg_config_home}/readline/inputrc"
-      FileUtils.mkdir_p(File.dirname(inputrc))
-      FileUtils.touch(inputrc)
-      @config.inputrc_path
-    end
-    assert_equal expected, result
-    FileUtils.rm(expected)
-    ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
-    ENV['HOME'] = home_backup
-    ENV['INPUTRC'] = inputrc_backup
-  end
-
-  def test_reload
-    inputrc = "#{@tmpdir}/inputrc"
-    ENV['INPUTRC'] = inputrc
-
-    File.write(inputrc, "set emacs-mode-string !")
-    @config.read
-    assert_equal '!', @config.emacs_mode_string
-
-    File.write(inputrc, "set emacs-mode-string ?")
-    @config.reload
-    assert_equal '?', @config.emacs_mode_string
-
-    File.write(inputrc, "")
-    @config.reload
-    assert_equal '@', @config.emacs_mode_string
-  end
-end
diff --git a/test/mri/reline/test_face.rb b/test/mri/reline/test_face.rb
deleted file mode 100644
index 8fa2be8fa44..00000000000
--- a/test/mri/reline/test_face.rb
+++ /dev/null
@@ -1,257 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class Reline::Face::Test < Reline::TestCase
-  RESET_SGR = "\e[0m"
-
-  def setup
-    @colorterm_backup = ENV['COLORTERM']
-    ENV['COLORTERM'] = 'truecolor'
-  end
-
-  def teardown
-    Reline::Face.reset_to_initial_configs
-    ENV['COLORTERM'] = @colorterm_backup
-  end
-
-  class WithInsufficientSetupTest < self
-    def setup
-      super
-      Reline::Face.config(:my_insufficient_config) do |face|
-      end
-      @face = Reline::Face[:my_insufficient_config]
-    end
-
-    def test_my_insufficient_config_line
-      assert_equal RESET_SGR, @face[:default]
-      assert_equal RESET_SGR, @face[:enhanced]
-      assert_equal RESET_SGR, @face[:scrollbar]
-    end
-
-    def test_my_insufficient_configs
-      my_configs = Reline::Face.configs[:my_insufficient_config]
-      assert_equal(
-        {
-          default: { style: :reset, escape_sequence: RESET_SGR },
-          enhanced: { style: :reset, escape_sequence: RESET_SGR },
-          scrollbar: { style: :reset, escape_sequence: RESET_SGR }
-        },
-        my_configs
-      )
-    end
-  end
-
-  class WithSetupTest < self
-    def setup
-      super
-      Reline::Face.config(:my_config) do |face|
-        face.define :default, foreground: :blue
-        face.define :enhanced, foreground: "#FF1020", background: :black, style: [:bold, :underlined]
-      end
-      Reline::Face.config(:another_config) do |face|
-        face.define :another_label, foreground: :red
-      end
-      @face = Reline::Face[:my_config]
-    end
-
-    def test_now_there_are_four_configs
-      assert_equal %i(default completion_dialog my_config another_config), Reline::Face.configs.keys
-    end
-
-    def test_resetting_config_discards_user_defined_configs
-      Reline::Face.reset_to_initial_configs
-      assert_equal %i(default completion_dialog), Reline::Face.configs.keys
-    end
-
-    def test_my_configs
-      my_configs = Reline::Face.configs[:my_config]
-      assert_equal(
-        {
-          default: {
-            escape_sequence: "#{RESET_SGR}\e[34m", foreground: :blue
-          },
-          enhanced: {
-            background: :black,
-            foreground: "#FF1020",
-            style: [:bold, :underlined],
-            escape_sequence: "\e[0m\e[38;2;255;16;32;40;1;4m"
-          },
-          scrollbar: {
-            style: :reset,
-            escape_sequence: "\e[0m"
-          }
-        },
-        my_configs
-      )
-    end
-
-    def test_my_config_line
-      assert_equal "#{RESET_SGR}\e[34m", @face[:default]
-    end
-
-    def test_my_config_enhanced
-      assert_equal "#{RESET_SGR}\e[38;2;255;16;32;40;1;4m", @face[:enhanced]
-    end
-
-    def test_not_respond_to_another_label
-      assert_equal false, @face.respond_to?(:another_label)
-    end
-  end
-
-  class WithoutSetupTest < self
-    def test_my_config_default
-      Reline::Face.config(:my_config) do |face|
-        # do nothing
-      end
-      face = Reline::Face[:my_config]
-      assert_equal RESET_SGR, face[:default]
-    end
-
-    def test_style_does_not_exist
-      face = Reline::Face[:default]
-      assert_raise ArgumentError do
-        face[:style_does_not_exist]
-      end
-    end
-
-    def test_invalid_keyword
-      assert_raise ArgumentError do
-        Reline::Face.config(:invalid_config) do |face|
-          face.define :default, invalid_keyword: :red
-        end
-      end
-    end
-
-    def test_invalid_foreground_name
-      assert_raise ArgumentError do
-        Reline::Face.config(:invalid_config) do |face|
-          face.define :default, foreground: :invalid_name
-        end
-      end
-    end
-
-    def test_invalid_background_name
-      assert_raise ArgumentError do
-        Reline::Face.config(:invalid_config) do |face|
-          face.define :default, background: :invalid_name
-        end
-      end
-    end
-
-    def test_invalid_style_name
-      assert_raise ArgumentError do
-        Reline::Face.config(:invalid_config) do |face|
-          face.define :default, style: :invalid_name
-        end
-      end
-    end
-
-    def test_private_constants
-      [:SGR_PARAMETER, :Config, :CONFIGS].each do |name|
-        assert_equal false, Reline::Face.constants.include?(name)
-      end
-    end
-  end
-
-  class ConfigTest < self
-    def setup
-      super
-      @config = Reline::Face.const_get(:Config).new(:my_config) { }
-    end
-
-    def teardown
-      super
-      Reline::Face.instance_variable_set(:@force_truecolor, nil)
-    end
-
-    def test_rgb?
-      assert_equal true, @config.send(:rgb_expression?, "#FFFFFF")
-    end
-
-    def test_invalid_rgb?
-      assert_equal false, @config.send(:rgb_expression?, "FFFFFF")
-      assert_equal false, @config.send(:rgb_expression?, "#FFFFF")
-    end
-
-    def test_format_to_sgr_preserves_order
-      assert_equal(
-        "#{RESET_SGR}\e[37;41;1;3m",
-        @config.send(:format_to_sgr, foreground: :white, background: :red, style: [:bold, :italicized])
-      )
-
-      assert_equal(
-        "#{RESET_SGR}\e[37;1;3;41m",
-        @config.send(:format_to_sgr, foreground: :white, style: [:bold, :italicized], background: :red)
-      )
-    end
-
-    def test_format_to_sgr_with_reset
-      assert_equal(
-        RESET_SGR,
-        @config.send(:format_to_sgr, style: :reset)
-      )
-      assert_equal(
-        "#{RESET_SGR}\e[37;0;41m",
-        @config.send(:format_to_sgr, foreground: :white, style: :reset, background: :red)
-      )
-    end
-
-    def test_format_to_sgr_with_single_style
-      assert_equal(
-        "#{RESET_SGR}\e[37;41;1m",
-        @config.send(:format_to_sgr, foreground: :white, background: :red, style: :bold)
-      )
-    end
-
-    def test_truecolor
-      ENV['COLORTERM'] = 'truecolor'
-      assert_equal true, Reline::Face.truecolor?
-      ENV['COLORTERM'] = '24bit'
-      assert_equal true, Reline::Face.truecolor?
-      ENV['COLORTERM'] = nil
-      assert_equal false, Reline::Face.truecolor?
-      Reline::Face.force_truecolor
-      assert_equal true, Reline::Face.truecolor?
-    end
-
-    def test_sgr_rgb_truecolor
-      ENV['COLORTERM'] = 'truecolor'
-      assert_equal "38;2;255;255;255", @config.send(:sgr_rgb, :foreground, "#ffffff")
-      assert_equal "48;2;18;52;86", @config.send(:sgr_rgb, :background, "#123456")
-    end
-
-    def test_sgr_rgb_256color
-      ENV['COLORTERM'] = nil
-      assert_equal '38;5;231', @config.send(:sgr_rgb, :foreground, '#ffffff')
-      assert_equal '48;5;16', @config.send(:sgr_rgb, :background, '#000000')
-      # Color steps are [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff]
-      assert_equal '38;5;24', @config.send(:sgr_rgb, :foreground, '#005f87')
-      assert_equal '38;5;67', @config.send(:sgr_rgb, :foreground, '#5f87af')
-      assert_equal '48;5;110', @config.send(:sgr_rgb, :background, '#87afd7')
-      assert_equal '48;5;153', @config.send(:sgr_rgb, :background, '#afd7ff')
-      # Boundary values are [0x30, 0x73, 0x9b, 0xc3, 0xeb]
-      assert_equal '38;5;24', @config.send(:sgr_rgb, :foreground, '#2f729a')
-      assert_equal '38;5;67', @config.send(:sgr_rgb, :foreground, '#30739b')
-      assert_equal '48;5;110', @config.send(:sgr_rgb, :background, '#9ac2ea')
-      assert_equal '48;5;153', @config.send(:sgr_rgb, :background, '#9bc3eb')
-    end
-
-    def test_force_truecolor_reconfigure
-      ENV['COLORTERM'] = nil
-
-      Reline::Face.config(:my_config) do |face|
-        face.define :default, foreground: '#005f87'
-        face.define :enhanced, background: '#afd7ff'
-      end
-
-      assert_equal "\e[0m\e[38;5;24m", Reline::Face[:my_config][:default]
-      assert_equal "\e[0m\e[48;5;153m", Reline::Face[:my_config][:enhanced]
-
-      Reline::Face.force_truecolor
-
-      assert_equal "\e[0m\e[38;2;0;95;135m", Reline::Face[:my_config][:default]
-      assert_equal "\e[0m\e[48;2;175;215;255m", Reline::Face[:my_config][:enhanced]
-    end
-  end
-end
diff --git a/test/mri/reline/test_history.rb b/test/mri/reline/test_history.rb
deleted file mode 100644
index ea902b06539..00000000000
--- a/test/mri/reline/test_history.rb
+++ /dev/null
@@ -1,317 +0,0 @@
-require_relative 'helper'
-require "reline/history"
-
-class Reline::History::Test < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_ancestors
-    assert_equal(Reline::History.ancestors.include?(Array), true)
-  end
-
-  def test_to_s
-    history = history_new
-    expected = "HISTORY"
-    assert_equal(expected, history.to_s)
-  end
-
-  def test_get
-    history, lines = lines = history_new_and_push_history(5)
-    lines.each_with_index do |s, i|
-      assert_external_string_equal(s, history[i])
-    end
-  end
-
-  def test_get__negative
-    history, lines = lines = history_new_and_push_history(5)
-    (1..5).each do |i|
-      assert_equal(lines[-i], history[-i])
-    end
-  end
-
-  def test_get__out_of_range
-    history, _ = history_new_and_push_history(5)
-    invalid_indexes = [5, 6, 100, -6, -7, -100]
-    invalid_indexes.each do |i|
-      assert_raise(IndexError, "i=<#{i}>") do
-        history[i]
-      end
-    end
-
-    invalid_indexes = [100_000_000_000_000_000_000,
-                       -100_000_000_000_000_000_000]
-    invalid_indexes.each do |i|
-      assert_raise(RangeError, "i=<#{i}>") do
-        history[i]
-      end
-    end
-  end
-
-  def test_set
-    begin
-      history, _ = history_new_and_push_history(5)
-      5.times do |i|
-        expected = "set: #{i}"
-        history[i] = expected
-        assert_external_string_equal(expected, history[i])
-      end
-    rescue NotImplementedError
-    end
-  end
-
-  def test_set__out_of_range
-    history = history_new
-    assert_raise(IndexError, NotImplementedError, "index=<0>") do
-      history[0] = "set: 0"
-    end
-
-    history, _ = history_new_and_push_history(5)
-    invalid_indexes = [5, 6, 100, -6, -7, -100]
-    invalid_indexes.each do |i|
-      assert_raise(IndexError, NotImplementedError, "index=<#{i}>") do
-        history[i] = "set: #{i}"
-      end
-    end
-
-    invalid_indexes = [100_000_000_000_000_000_000,
-                       -100_000_000_000_000_000_000]
-    invalid_indexes.each do |i|
-      assert_raise(RangeError, NotImplementedError, "index=<#{i}>") do
-        history[i] = "set: #{i}"
-      end
-    end
-  end
-
-  def test_push
-    history = history_new
-    5.times do |i|
-      s = i.to_s
-      assert_equal(history, history.push(s))
-      assert_external_string_equal(s, history[i])
-    end
-    assert_equal(5, history.length)
-  end
-
-  def test_push__operator
-    history = history_new
-    5.times do |i|
-      s = i.to_s
-      assert_equal(history, history << s)
-      assert_external_string_equal(s, history[i])
-    end
-    assert_equal(5, history.length)
-  end
-
-  def test_push__plural
-    history = history_new
-    assert_equal(history, history.push("0", "1", "2", "3", "4"))
-    (0..4).each do |i|
-      assert_external_string_equal(i.to_s, history[i])
-    end
-    assert_equal(5, history.length)
-
-    assert_equal(history, history.push("5", "6", "7", "8", "9"))
-    (5..9).each do |i|
-      assert_external_string_equal(i.to_s, history[i])
-    end
-    assert_equal(10, history.length)
-  end
-
-  def test_pop
-    history = history_new
-    begin
-      assert_equal(nil, history.pop)
-
-      history, lines = lines = history_new_and_push_history(5)
-      (1..5).each do |i|
-        assert_external_string_equal(lines[-i], history.pop)
-        assert_equal(lines.length - i, history.length)
-      end
-
-      assert_equal(nil, history.pop)
-    rescue NotImplementedError
-    end
-  end
-
-  def test_shift
-    history = history_new
-    begin
-      assert_equal(nil, history.shift)
-
-      history, lines = lines = history_new_and_push_history(5)
-      (0..4).each do |i|
-        assert_external_string_equal(lines[i], history.shift)
-        assert_equal(lines.length - (i + 1), history.length)
-      end
-
-      assert_equal(nil, history.shift)
-    rescue NotImplementedError
-    end
-  end
-
-  def test_each
-    history = history_new
-    e = history.each do |s|
-      assert(false) # not reachable
-    end
-    assert_equal(history, e)
-    history, lines = lines = history_new_and_push_history(5)
-    i = 0
-    e = history.each do |s|
-      assert_external_string_equal(history[i], s)
-      assert_external_string_equal(lines[i], s)
-      i += 1
-    end
-    assert_equal(history, e)
-  end
-
-  def test_each__enumerator
-    history = history_new
-    e = history.each
-    assert_instance_of(Enumerator, e)
-  end
-
-  def test_length
-    history = history_new
-    assert_equal(0, history.length)
-    push_history(history, 1)
-    assert_equal(1, history.length)
-    push_history(history, 4)
-    assert_equal(5, history.length)
-    history.clear
-    assert_equal(0, history.length)
-  end
-
-  def test_empty_p
-    history = history_new
-    2.times do
-      assert(history.empty?)
-      history.push("s")
-      assert_equal(false, history.empty?)
-      history.clear
-      assert(history.empty?)
-    end
-  end
-
-  def test_delete_at
-    begin
-      history, lines = lines = history_new_and_push_history(5)
-      (0..4).each do |i|
-        assert_external_string_equal(lines[i], history.delete_at(0))
-      end
-      assert(history.empty?)
-
-      history, lines = lines = history_new_and_push_history(5)
-      (1..5).each do |i|
-        assert_external_string_equal(lines[lines.length - i], history.delete_at(-1))
-      end
-      assert(history.empty?)
-
-      history, lines = lines = history_new_and_push_history(5)
-      assert_external_string_equal(lines[0], history.delete_at(0))
-      assert_external_string_equal(lines[4], history.delete_at(3))
-      assert_external_string_equal(lines[1], history.delete_at(0))
-      assert_external_string_equal(lines[3], history.delete_at(1))
-      assert_external_string_equal(lines[2], history.delete_at(0))
-      assert(history.empty?)
-    rescue NotImplementedError
-    end
-  end
-
-  def test_delete_at__out_of_range
-    history = history_new
-    assert_raise(IndexError, NotImplementedError, "index=<0>") do
-      history.delete_at(0)
-    end
-
-    history, _ = history_new_and_push_history(5)
-    invalid_indexes = [5, 6, 100, -6, -7, -100]
-    invalid_indexes.each do |i|
-      assert_raise(IndexError, NotImplementedError, "index=<#{i}>") do
-        history.delete_at(i)
-      end
-    end
-
-    invalid_indexes = [100_000_000_000_000_000_000,
-                       -100_000_000_000_000_000_000]
-    invalid_indexes.each do |i|
-      assert_raise(RangeError, NotImplementedError, "index=<#{i}>") do
-        history.delete_at(i)
-      end
-    end
-  end
-
-  def test_history_size_zero
-    history = history_new(history_size: 0)
-    assert_equal 0, history.size
-    history << 'aa'
-    history << 'bb'
-    assert_equal 0, history.size
-    history.push(*%w{aa bb cc})
-    assert_equal 0, history.size
-  end
-
-  def test_history_size_negative_unlimited
-    history = history_new(history_size: -1)
-    assert_equal 0, history.size
-    history << 'aa'
-    history << 'bb'
-    assert_equal 2, history.size
-    history.push(*%w{aa bb cc})
-    assert_equal 5, history.size
-  end
-
-  def test_history_encoding_conversion
-    history = history_new
-    text1 = String.new("a\u{65535}b\xFFc", encoding: Encoding::UTF_8)
-    text2 = String.new("d\xFFe", encoding: Encoding::Shift_JIS)
-    history.push(text1.dup, text2.dup)
-    expected = [text1, text2].map { |s| s.encode(Reline.encoding_system_needs, invalid: :replace, undef: :replace) }
-    assert_equal(expected, history.to_a)
-  end
-
-  private
-
-  def history_new(history_size: 10)
-    Reline::History.new(Struct.new(:history_size).new(history_size))
-  end
-
-  def push_history(history, num)
-    lines = []
-    num.times do |i|
-      s = "a"
-      i.times do
-        s = s.succ
-      end
-      lines.push("#{i + 1}:#{s}")
-    end
-    history.push(*lines)
-    return history, lines
-  end
-
-  def history_new_and_push_history(num)
-    history = history_new(history_size: 100)
-    return push_history(history, num)
-  end
-
-  def assert_external_string_equal(expected, actual)
-    assert_equal(expected, actual)
-    mes = "Encoding of #{actual.inspect} is expected #{get_default_internal_encoding.inspect} but #{actual.encoding}"
-    assert_equal(get_default_internal_encoding, actual.encoding, mes)
-  end
-
-  def get_default_internal_encoding
-    if encoding = Reline.core.encoding
-      encoding
-    elsif RUBY_PLATFORM =~ /mswin|mingw/
-      Encoding.default_internal || Encoding::UTF_8
-    else
-      Encoding.default_internal || Encoding.find("locale")
-    end
-  end
-end
diff --git a/test/mri/reline/test_key_actor_emacs.rb b/test/mri/reline/test_key_actor_emacs.rb
deleted file mode 100644
index e52c6c2d9ae..00000000000
--- a/test/mri/reline/test_key_actor_emacs.rb
+++ /dev/null
@@ -1,1721 +0,0 @@
-require_relative 'helper'
-
-class Reline::KeyActor::EmacsTest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @prompt = '> '
-    @config = Reline::Config.new # Emacs mode is default
-    @config.autocompletion = false
-    Reline::HISTORY.instance_variable_set(:@config, @config)
-    Reline::HISTORY.clear
-    @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config)
-    @line_editor.reset(@prompt)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_ed_insert_one
-    input_keys('a')
-    assert_line_around_cursor('a', '')
-  end
-
-  def test_ed_insert_two
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-  end
-
-  def test_ed_insert_mbchar_one
-    input_keys('か')
-    assert_line_around_cursor('か', '')
-  end
-
-  def test_ed_insert_mbchar_two
-    input_keys('かき')
-    assert_line_around_cursor('かき', '')
-  end
-
-  def test_ed_insert_for_mbchar_by_plural_code_points
-    input_keys("か\u3099")
-    assert_line_around_cursor("か\u3099", '')
-  end
-
-  def test_ed_insert_for_plural_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_line_around_cursor("か\u3099き\u3099", '')
-  end
-
-  def test_move_next_and_prev
-    input_keys('abd')
-    assert_line_around_cursor('abd', '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('ab', 'd')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('a', 'bd')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('ab', 'd')
-    input_keys('c')
-    assert_line_around_cursor('abc', 'd')
-  end
-
-  def test_move_next_and_prev_for_mbchar
-    input_keys('かきけ')
-    assert_line_around_cursor('かきけ', '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('かき', 'け')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('か', 'きけ')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('かき', 'け')
-    input_keys('く')
-    assert_line_around_cursor('かきく', 'け')
-  end
-
-  def test_move_next_and_prev_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099け\u3099")
-    assert_line_around_cursor("か\u3099き\u3099け\u3099", '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor("か\u3099き\u3099", "け\u3099")
-    input_keys("\C-b", false)
-    assert_line_around_cursor("か\u3099", "き\u3099け\u3099")
-    input_keys("\C-f", false)
-    assert_line_around_cursor("か\u3099き\u3099", "け\u3099")
-    input_keys("く\u3099")
-    assert_line_around_cursor("か\u3099き\u3099く\u3099", "け\u3099")
-  end
-
-  def test_move_to_beg_end
-    input_keys('bcd')
-    assert_line_around_cursor('bcd', '')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'bcd')
-    input_keys('a')
-    assert_line_around_cursor('a', 'bcd')
-    input_keys("\C-e", false)
-    assert_line_around_cursor('abcd', '')
-    input_keys('e')
-    assert_line_around_cursor('abcde', '')
-  end
-
-  def test_ed_newline_with_cr
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-    refute(@line_editor.finished?)
-    input_keys("\C-m", false)
-    assert_line_around_cursor('ab', '')
-    assert(@line_editor.finished?)
-  end
-
-  def test_ed_newline_with_lf
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-    refute(@line_editor.finished?)
-    input_keys("\C-j", false)
-    assert_line_around_cursor('ab', '')
-    assert(@line_editor.finished?)
-  end
-
-  def test_em_delete_prev_char
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-    input_keys("\C-h", false)
-    assert_line_around_cursor('a', '')
-  end
-
-  def test_em_delete_prev_char_for_mbchar
-    input_keys('かき')
-    assert_line_around_cursor('かき', '')
-    input_keys("\C-h", false)
-    assert_line_around_cursor('か', '')
-  end
-
-  def test_em_delete_prev_char_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_line_around_cursor("か\u3099き\u3099", '')
-    input_keys("\C-h", false)
-    assert_line_around_cursor("か\u3099", '')
-  end
-
-  def test_bracketed_paste_insert
-    set_line_around_cursor('A', 'Z')
-    input_key_by_symbol(:insert_multiline_text, char: "abc\n\C-abc")
-    assert_whole_lines(['Aabc', "\C-abcZ"])
-    assert_line_around_cursor("\C-abc", 'Z')
-  end
-
-  def test_ed_quoted_insert
-    set_line_around_cursor('A', 'Z')
-    input_key_by_symbol(:insert_raw_char, char: "\C-a")
-    assert_line_around_cursor("A\C-a", 'Z')
-  end
-
-  def test_ed_quoted_insert_with_vi_arg
-    input_keys("a\C-[3")
-    input_key_by_symbol(:insert_raw_char, char: "\C-a")
-    input_keys("b\C-[4")
-    input_key_by_symbol(:insert_raw_char, char: '1')
-    assert_line_around_cursor("a\C-a\C-a\C-ab1111", '')
-  end
-
-  def test_ed_kill_line
-    input_keys("\C-k", false)
-    assert_line_around_cursor('', '')
-    input_keys('abc')
-    assert_line_around_cursor('abc', '')
-    input_keys("\C-k", false)
-    assert_line_around_cursor('abc', '')
-    input_keys("\C-b\C-k", false)
-    assert_line_around_cursor('ab', '')
-  end
-
-  def test_em_kill_line
-    input_key_by_symbol(:em_kill_line)
-    assert_line_around_cursor('', '')
-    input_keys('abc')
-    input_key_by_symbol(:em_kill_line)
-    assert_line_around_cursor('', '')
-    input_keys('abc')
-    input_keys("\C-b", false)
-    input_key_by_symbol(:em_kill_line)
-    assert_line_around_cursor('', '')
-    input_keys('abc')
-    input_keys("\C-a", false)
-    input_key_by_symbol(:em_kill_line)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_ed_move_to_beg
-    input_keys('abd')
-    assert_line_around_cursor('abd', '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('ab', 'd')
-    input_keys('c')
-    assert_line_around_cursor('abc', 'd')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'abcd')
-    input_keys('012')
-    assert_line_around_cursor('012', 'abcd')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', '012abcd')
-    input_keys('ABC')
-    assert_line_around_cursor('ABC', '012abcd')
-    input_keys("\C-f" * 10 + "\C-a", false)
-    assert_line_around_cursor('', 'ABC012abcd')
-    input_keys('a')
-    assert_line_around_cursor('a', 'ABC012abcd')
-  end
-
-  def test_ed_move_to_beg_with_blank
-    input_keys('  abc')
-    assert_line_around_cursor('  abc', '')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', '  abc')
-  end
-
-  def test_ed_move_to_end
-    input_keys('abd')
-    assert_line_around_cursor('abd', '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('ab', 'd')
-    input_keys('c')
-    assert_line_around_cursor('abc', 'd')
-    input_keys("\C-e", false)
-    assert_line_around_cursor('abcd', '')
-    input_keys('012')
-    assert_line_around_cursor('abcd012', '')
-    input_keys("\C-e", false)
-    assert_line_around_cursor('abcd012', '')
-    input_keys('ABC')
-    assert_line_around_cursor('abcd012ABC', '')
-    input_keys("\C-b" * 10 + "\C-e", false)
-    assert_line_around_cursor('abcd012ABC', '')
-    input_keys('a')
-    assert_line_around_cursor('abcd012ABCa', '')
-  end
-
-  def test_em_delete
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'ab')
-    input_keys("\C-d", false)
-    assert_line_around_cursor('', 'b')
-  end
-
-  def test_em_delete_for_mbchar
-    input_keys('かき')
-    assert_line_around_cursor('かき', '')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'かき')
-    input_keys("\C-d", false)
-    assert_line_around_cursor('', 'き')
-  end
-
-  def test_em_delete_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_line_around_cursor("か\u3099き\u3099", '')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', "か\u3099き\u3099")
-    input_keys("\C-d", false)
-    assert_line_around_cursor('', "き\u3099")
-  end
-
-  def test_em_delete_ends_editing
-    input_keys("\C-d") # quit from inputing
-    assert_nil(@line_editor.line)
-    assert(@line_editor.finished?)
-  end
-
-  def test_ed_clear_screen
-    @line_editor.instance_variable_get(:@rendered_screen).lines = [[]]
-    input_keys("\C-l", false)
-    assert_empty(@line_editor.instance_variable_get(:@rendered_screen).lines)
-  end
-
-  def test_ed_clear_screen_with_inputted
-    input_keys('abc')
-    input_keys("\C-b", false)
-    @line_editor.instance_variable_get(:@rendered_screen).lines = [[]]
-    assert_line_around_cursor('ab', 'c')
-    input_keys("\C-l", false)
-    assert_empty(@line_editor.instance_variable_get(:@rendered_screen).lines)
-    assert_line_around_cursor('ab', 'c')
-  end
-
-  def test_key_delete
-    input_keys('abc')
-    assert_line_around_cursor('abc', '')
-    input_key_by_symbol(:key_delete)
-    assert_line_around_cursor('abc', '')
-  end
-
-  def test_key_delete_does_not_end_editing
-    input_key_by_symbol(:key_delete)
-    assert_line_around_cursor('', '')
-    refute(@line_editor.finished?)
-  end
-
-  def test_key_delete_preserves_cursor
-    input_keys('abc')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('ab', 'c')
-    input_key_by_symbol(:key_delete)
-    assert_line_around_cursor('ab', '')
-  end
-
-  def test_em_next_word
-    assert_line_around_cursor('', '')
-    input_keys('abc def{bbb}ccc')
-    input_keys("\C-a\M-F", false)
-    assert_line_around_cursor('abc', ' def{bbb}ccc')
-    input_keys("\M-F", false)
-    assert_line_around_cursor('abc def', '{bbb}ccc')
-    input_keys("\M-F", false)
-    assert_line_around_cursor('abc def{bbb', '}ccc')
-    input_keys("\M-F", false)
-    assert_line_around_cursor('abc def{bbb}ccc', '')
-    input_keys("\M-F", false)
-    assert_line_around_cursor('abc def{bbb}ccc', '')
-  end
-
-  def test_em_next_word_for_mbchar
-    assert_line_around_cursor('', '')
-    input_keys('あいう かきく{さしす}たちつ')
-    input_keys("\C-a\M-F", false)
-    assert_line_around_cursor('あいう', ' かきく{さしす}たちつ')
-    input_keys("\M-F", false)
-    assert_line_around_cursor('あいう かきく', '{さしす}たちつ')
-    input_keys("\M-F", false)
-    assert_line_around_cursor('あいう かきく{さしす', '}たちつ')
-    input_keys("\M-F", false)
-    assert_line_around_cursor('あいう かきく{さしす}たちつ', '')
-    input_keys("\M-F", false)
-    assert_line_around_cursor('あいう かきく{さしす}たちつ', '')
-  end
-
-  def test_em_next_word_for_mbchar_by_plural_code_points
-    assert_line_around_cursor("", "")
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\C-a\M-F", false)
-    assert_line_around_cursor("あいう", " か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\M-F", false)
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099", "{さしす}たちつ")
-    input_keys("\M-F", false)
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす", "}たちつ")
-    input_keys("\M-F", false)
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす}たちつ", "")
-    input_keys("\M-F", false)
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす}たちつ", "")
-  end
-
-  def test_em_prev_word
-    input_keys('abc def{bbb}ccc')
-    assert_line_around_cursor('abc def{bbb}ccc', '')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('abc def{bbb}', 'ccc')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('abc def{', 'bbb}ccc')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('abc ', 'def{bbb}ccc')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('', 'abc def{bbb}ccc')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('', 'abc def{bbb}ccc')
-  end
-
-  def test_em_prev_word_for_mbchar
-    input_keys('あいう かきく{さしす}たちつ')
-    assert_line_around_cursor('あいう かきく{さしす}たちつ', '')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('あいう かきく{さしす}', 'たちつ')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('あいう かきく{', 'さしす}たちつ')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('あいう ', 'かきく{さしす}たちつ')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('', 'あいう かきく{さしす}たちつ')
-    input_keys("\M-B", false)
-    assert_line_around_cursor('', 'あいう かきく{さしす}たちつ')
-  end
-
-  def test_em_prev_word_for_mbchar_by_plural_code_points
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす}たちつ", "")
-    input_keys("\M-B", false)
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす}", "たちつ")
-    input_keys("\M-B", false)
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{", "さしす}たちつ")
-    input_keys("\M-B", false)
-    assert_line_around_cursor("あいう ", "か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\M-B", false)
-    assert_line_around_cursor("", "あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\M-B", false)
-    assert_line_around_cursor("", "あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-  end
-
-  def test_em_delete_next_word
-    input_keys('abc def{bbb}ccc')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'abc def{bbb}ccc')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', ' def{bbb}ccc')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '{bbb}ccc')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '}ccc')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_em_delete_next_word_for_mbchar
-    input_keys('あいう かきく{さしす}たちつ')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'あいう かきく{さしす}たちつ')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', ' かきく{さしす}たちつ')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '{さしす}たちつ')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '}たちつ')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_em_delete_next_word_for_mbchar_by_plural_code_points
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', "あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', " か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '{さしす}たちつ')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '}たちつ')
-    input_keys("\M-d", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_ed_delete_prev_word
-    input_keys('abc def{bbb}ccc')
-    assert_line_around_cursor('abc def{bbb}ccc', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('abc def{bbb}', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('abc def{', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('abc ', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_ed_delete_prev_word_for_mbchar
-    input_keys('あいう かきく{さしす}たちつ')
-    assert_line_around_cursor('あいう かきく{さしす}たちつ', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('あいう かきく{さしす}', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('あいう かきく{', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('あいう ', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_ed_delete_prev_word_for_mbchar_by_plural_code_points
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす}たちつ", '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす}", '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{", '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('あいう ', '')
-    input_keys("\M-\C-H", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_ed_transpose_chars
-    input_keys('abc')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'abc')
-    input_keys("\C-t", false)
-    assert_line_around_cursor('', 'abc')
-    input_keys("\C-f\C-t", false)
-    assert_line_around_cursor('ba', 'c')
-    input_keys("\C-t", false)
-    assert_line_around_cursor('bca', '')
-    input_keys("\C-t", false)
-    assert_line_around_cursor('bac', '')
-  end
-
-  def test_ed_transpose_chars_for_mbchar
-    input_keys('あかさ')
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'あかさ')
-    input_keys("\C-t", false)
-    assert_line_around_cursor('', 'あかさ')
-    input_keys("\C-f\C-t", false)
-    assert_line_around_cursor('かあ', 'さ')
-    input_keys("\C-t", false)
-    assert_line_around_cursor('かさあ', '')
-    input_keys("\C-t", false)
-    assert_line_around_cursor('かあさ', '')
-  end
-
-  def test_ed_transpose_chars_for_mbchar_by_plural_code_points
-    input_keys("あか\u3099さ")
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', "あか\u3099さ")
-    input_keys("\C-t", false)
-    assert_line_around_cursor('', "あか\u3099さ")
-    input_keys("\C-f\C-t", false)
-    assert_line_around_cursor("か\u3099あ", 'さ')
-    input_keys("\C-t", false)
-    assert_line_around_cursor("か\u3099さあ", '')
-    input_keys("\C-t", false)
-    assert_line_around_cursor("か\u3099あさ", '')
-  end
-
-  def test_ed_transpose_words
-    input_keys('abc def')
-    assert_line_around_cursor('abc def', '')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('def abc', '')
-    input_keys("\C-a\C-k", false)
-    input_keys(' abc  def   ')
-    input_keys("\C-b" * 4, false)
-    assert_line_around_cursor(' abc  de', 'f   ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor(' def  abc', '   ')
-    input_keys("\C-a\C-k", false)
-    input_keys(' abc  def   ')
-    input_keys("\C-b" * 6, false)
-    assert_line_around_cursor(' abc  ', 'def   ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor(' def  abc', '   ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor(' abc     def', '')
-  end
-
-  def test_ed_transpose_words_for_mbchar
-    input_keys('あいう かきく')
-    assert_line_around_cursor('あいう かきく', '')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('かきく あいう', '')
-    input_keys("\C-a\C-k", false)
-    input_keys(' あいう  かきく   ')
-    input_keys("\C-b" * 4, false)
-    assert_line_around_cursor(' あいう  かき', 'く   ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor(' かきく  あいう', '   ')
-    input_keys("\C-a\C-k", false)
-    input_keys(' あいう  かきく   ')
-    input_keys("\C-b" * 6, false)
-    assert_line_around_cursor(' あいう  ', 'かきく   ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor(' かきく  あいう', '   ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor(' あいう     かきく', '')
-  end
-
-  def test_ed_transpose_words_with_one_word
-    input_keys('abc  ')
-    assert_line_around_cursor('abc  ', '')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('abc  ', '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('abc ', ' ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('abc ', ' ')
-    input_keys("\C-b" * 2, false)
-    assert_line_around_cursor('ab', 'c  ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('ab', 'c  ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('ab', 'c  ')
-  end
-
-  def test_ed_transpose_words_with_one_word_for_mbchar
-    input_keys('あいう  ')
-    assert_line_around_cursor('あいう  ', '')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('あいう  ', '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('あいう ', ' ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('あいう ', ' ')
-    input_keys("\C-b" * 2, false)
-    assert_line_around_cursor('あい', 'う  ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('あい', 'う  ')
-    input_keys("\M-t", false)
-    assert_line_around_cursor('あい', 'う  ')
-  end
-
-  def test_ed_digit
-    input_keys('0123')
-    assert_line_around_cursor('0123', '')
-  end
-
-  def test_ed_next_and_prev_char
-    input_keys('abc')
-    assert_line_around_cursor('abc', '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('ab', 'c')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('a', 'bc')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('', 'abc')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('', 'abc')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('a', 'bc')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('ab', 'c')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('abc', '')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('abc', '')
-  end
-
-  def test_ed_next_and_prev_char_for_mbchar
-    input_keys('あいう')
-    assert_line_around_cursor('あいう', '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('あい', 'う')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('あ', 'いう')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('', 'あいう')
-    input_keys("\C-b", false)
-    assert_line_around_cursor('', 'あいう')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('あ', 'いう')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('あい', 'う')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('あいう', '')
-    input_keys("\C-f", false)
-    assert_line_around_cursor('あいう', '')
-  end
-
-  def test_ed_next_and_prev_char_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099く\u3099")
-    assert_line_around_cursor("か\u3099き\u3099く\u3099", '')
-    input_keys("\C-b", false)
-    assert_line_around_cursor("か\u3099き\u3099", "く\u3099")
-    input_keys("\C-b", false)
-    assert_line_around_cursor("か\u3099", "き\u3099く\u3099")
-    input_keys("\C-b", false)
-    assert_line_around_cursor('', "か\u3099き\u3099く\u3099")
-    input_keys("\C-b", false)
-    assert_line_around_cursor('', "か\u3099き\u3099く\u3099")
-    input_keys("\C-f", false)
-    assert_line_around_cursor("か\u3099", "き\u3099く\u3099")
-    input_keys("\C-f", false)
-    assert_line_around_cursor("か\u3099き\u3099", "く\u3099")
-    input_keys("\C-f", false)
-    assert_line_around_cursor("か\u3099き\u3099く\u3099", '')
-    input_keys("\C-f", false)
-    assert_line_around_cursor("か\u3099き\u3099く\u3099", '')
-  end
-
-  def test_em_capitol_case
-    input_keys('abc def{bbb}ccc')
-    input_keys("\C-a\M-c", false)
-    assert_line_around_cursor('Abc', ' def{bbb}ccc')
-    input_keys("\M-c", false)
-    assert_line_around_cursor('Abc Def', '{bbb}ccc')
-    input_keys("\M-c", false)
-    assert_line_around_cursor('Abc Def{Bbb', '}ccc')
-    input_keys("\M-c", false)
-    assert_line_around_cursor('Abc Def{Bbb}Ccc', '')
-  end
-
-  def test_em_capitol_case_with_complex_example
-    input_keys('{}#*    AaA!!!cCc   ')
-    input_keys("\C-a\M-c", false)
-    assert_line_around_cursor('{}#*    Aaa', '!!!cCc   ')
-    input_keys("\M-c", false)
-    assert_line_around_cursor('{}#*    Aaa!!!Ccc', '   ')
-    input_keys("\M-c", false)
-    assert_line_around_cursor('{}#*    Aaa!!!Ccc   ', '')
-  end
-
-  def test_em_lower_case
-    input_keys('AbC def{bBb}CCC')
-    input_keys("\C-a\M-l", false)
-    assert_line_around_cursor('abc', ' def{bBb}CCC')
-    input_keys("\M-l", false)
-    assert_line_around_cursor('abc def', '{bBb}CCC')
-    input_keys("\M-l", false)
-    assert_line_around_cursor('abc def{bbb', '}CCC')
-    input_keys("\M-l", false)
-    assert_line_around_cursor('abc def{bbb}ccc', '')
-  end
-
-  def test_em_lower_case_with_complex_example
-    input_keys('{}#*    AaA!!!cCc   ')
-    input_keys("\C-a\M-l", false)
-    assert_line_around_cursor('{}#*    aaa', '!!!cCc   ')
-    input_keys("\M-l", false)
-    assert_line_around_cursor('{}#*    aaa!!!ccc', '   ')
-    input_keys("\M-l", false)
-    assert_line_around_cursor('{}#*    aaa!!!ccc   ', '')
-  end
-
-  def test_em_upper_case
-    input_keys('AbC def{bBb}CCC')
-    input_keys("\C-a\M-u", false)
-    assert_line_around_cursor('ABC', ' def{bBb}CCC')
-    input_keys("\M-u", false)
-    assert_line_around_cursor('ABC DEF', '{bBb}CCC')
-    input_keys("\M-u", false)
-    assert_line_around_cursor('ABC DEF{BBB', '}CCC')
-    input_keys("\M-u", false)
-    assert_line_around_cursor('ABC DEF{BBB}CCC', '')
-  end
-
-  def test_em_upper_case_with_complex_example
-    input_keys('{}#*    AaA!!!cCc   ')
-    input_keys("\C-a\M-u", false)
-    assert_line_around_cursor('{}#*    AAA', '!!!cCc   ')
-    input_keys("\M-u", false)
-    assert_line_around_cursor('{}#*    AAA!!!CCC', '   ')
-    input_keys("\M-u", false)
-    assert_line_around_cursor('{}#*    AAA!!!CCC   ', '')
-  end
-
-  def test_em_delete_or_list
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_bar
-        foo_baz
-        qux
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('fooo')
-    assert_line_around_cursor('fooo', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-b", false)
-    assert_line_around_cursor('foo', 'o')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_key_by_symbol(:em_delete_or_list)
-    assert_line_around_cursor('foo', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_key_by_symbol(:em_delete_or_list)
-    assert_line_around_cursor('foo', '')
-    assert_equal(%w{foo_foo foo_bar foo_baz}, @line_editor.instance_variable_get(:@menu_info).list)
-  end
-
-  def test_completion_duplicated_list
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_foo
-        foo_bar
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo_')
-    assert_line_around_cursor('foo_', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(%w{foo_foo foo_bar}, @line_editor.instance_variable_get(:@menu_info).list)
-  end
-
-  def test_completion
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_bar
-        foo_baz
-        qux
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('fo')
-    assert_line_around_cursor('fo', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(%w{foo_foo foo_bar foo_baz}, @line_editor.instance_variable_get(:@menu_info).list)
-    input_keys('a')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_a', '')
-    input_keys("\C-h", false)
-    input_keys('b')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_ba', '')
-    input_keys("\C-h")
-    input_key_by_symbol(:complete)
-    assert_line_around_cursor('foo_ba', '')
-    input_keys("\C-h", false)
-    input_key_by_symbol(:menu_complete)
-    assert_line_around_cursor('foo_bar', '')
-    input_key_by_symbol(:menu_complete)
-    assert_line_around_cursor('foo_baz', '')
-    input_keys("\C-h", false)
-    input_key_by_symbol(:menu_complete_backward)
-    assert_line_around_cursor('foo_baz', '')
-    input_key_by_symbol(:menu_complete_backward)
-    assert_line_around_cursor('foo_bar', '')
-  end
-
-  def test_autocompletion
-    @config.autocompletion = true
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        Readline
-        Regexp
-        RegexpError
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('Re')
-    assert_line_around_cursor('Re', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('Readline', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('Regexp', '')
-    input_key_by_symbol(:completion_journey_up)
-    assert_line_around_cursor('Readline', '')
-    input_key_by_symbol(:complete)
-    assert_line_around_cursor('Regexp', '')
-    input_key_by_symbol(:menu_complete_backward)
-    assert_line_around_cursor('Readline', '')
-    input_key_by_symbol(:menu_complete)
-    assert_line_around_cursor('Regexp', '')
-  ensure
-    @config.autocompletion = false
-  end
-
-  def test_completion_with_indent
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_bar
-        foo_baz
-        qux
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('  fo')
-    assert_line_around_cursor('  fo', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('  foo_', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('  foo_', '')
-    assert_equal(%w{foo_foo foo_bar foo_baz}, @line_editor.instance_variable_get(:@menu_info).list)
-  end
-
-  def test_completion_with_perfect_match
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo
-        foo_bar
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    matched = nil
-    @line_editor.dig_perfect_match_proc = proc { |m|
-      matched = m
-    }
-    input_keys('fo')
-    assert_line_around_cursor('fo', '')
-    assert_equal(Reline::LineEditor::CompletionState::NORMAL, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo', '')
-    assert_equal(Reline::LineEditor::CompletionState::MENU_WITH_PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo', '')
-    assert_equal(Reline::LineEditor::CompletionState::PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo', '')
-    assert_equal(Reline::LineEditor::CompletionState::PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal('foo', matched)
-    matched = nil
-    input_keys('_')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_bar', '')
-    assert_equal(Reline::LineEditor::CompletionState::PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_bar', '')
-    assert_equal(Reline::LineEditor::CompletionState::PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal('foo_bar', matched)
-  end
-
-  def test_continuous_completion_with_perfect_match
-    @line_editor.completion_proc = proc { |word|
-      word == 'f' ? ['foo'] : %w[foobar foobaz]
-    }
-    input_keys('f')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('fooba', '')
-  end
-
-  def test_continuous_completion_disabled_with_perfect_match
-    @line_editor.completion_proc = proc { |word|
-      word == 'f' ? ['foo'] : %w[foobar foobaz]
-    }
-    @line_editor.dig_perfect_match_proc = proc {}
-    input_keys('f')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo', '')
-  end
-
-  def test_completion_append_character
-    @line_editor.completion_proc = proc { |word|
-      %w[foo_ foo_foo foo_bar].select { |s| s.start_with? word }
-    }
-    @line_editor.completion_append_character = 'X'
-    input_keys('f')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    input_keys('f')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_fooX', '')
-    input_keys(' foo_bar')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_fooX foo_barX', '')
-  end
-
-  def test_completion_with_quote_append
-    @line_editor.completion_proc = proc { |word|
-      %w[foo bar baz].select { |s| s.start_with? word }
-    }
-    set_line_around_cursor('x = "b', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('x = "ba', '')
-    set_line_around_cursor('x = "f', ' ')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('x = "foo', ' ')
-    set_line_around_cursor("x = 'f", '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor("x = 'foo'", '')
-    set_line_around_cursor('"a "f', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('"a "foo', '')
-    set_line_around_cursor('"a\\" "f', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('"a\\" "foo', '')
-    set_line_around_cursor('"a" "f', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('"a" "foo"', '')
-  end
-
-  def test_completion_with_completion_ignore_case
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_bar
-        Foo_baz
-        qux
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('fo')
-    assert_line_around_cursor('fo', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(%w{foo_foo foo_bar}, @line_editor.instance_variable_get(:@menu_info).list)
-    @config.completion_ignore_case = true
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(%w{foo_foo foo_bar Foo_baz}, @line_editor.instance_variable_get(:@menu_info).list)
-    input_keys('a')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_a', '')
-    input_keys("\C-h", false)
-    input_keys('b')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_ba', '')
-    input_keys('Z')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('Foo_baz', '')
-  end
-
-  def test_completion_in_middle_of_line
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_bar
-        foo_baz
-        qux
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('abcde fo ABCDE')
-    assert_line_around_cursor('abcde fo ABCDE', '')
-    input_keys("\C-b" * 6 + "\C-i", false)
-    assert_line_around_cursor('abcde foo_', ' ABCDE')
-    input_keys("\C-b" * 2 + "\C-i", false)
-    assert_line_around_cursor('abcde foo_', 'o_ ABCDE')
-  end
-
-  def test_completion_with_nil_value
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_bar
-        Foo_baz
-        qux
-      }.map { |i|
-        i.encode(@encoding)
-      }.prepend(nil)
-    }
-    @config.completion_ignore_case = true
-    input_keys('fo')
-    assert_line_around_cursor('fo', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(nil, @line_editor.instance_variable_get(:@menu_info))
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_', '')
-    assert_equal(%w{foo_foo foo_bar Foo_baz}, @line_editor.instance_variable_get(:@menu_info).list)
-    input_keys('a')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_a', '')
-    input_keys("\C-h", false)
-    input_keys('b')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('foo_ba', '')
-  end
-
-  def test_em_kill_region
-    input_keys('abc   def{bbb}ccc   ddd   ')
-    assert_line_around_cursor('abc   def{bbb}ccc   ddd   ', '')
-    input_keys("\C-w", false)
-    assert_line_around_cursor('abc   def{bbb}ccc   ', '')
-    input_keys("\C-w", false)
-    assert_line_around_cursor('abc   ', '')
-    input_keys("\C-w", false)
-    assert_line_around_cursor('', '')
-    input_keys("\C-w", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_em_kill_region_mbchar
-    input_keys('あ   い   う{う}う   ')
-    assert_line_around_cursor('あ   い   う{う}う   ', '')
-    input_keys("\C-w", false)
-    assert_line_around_cursor('あ   い   ', '')
-    input_keys("\C-w", false)
-    assert_line_around_cursor('あ   ', '')
-    input_keys("\C-w", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_search_prev
-    Reline::HISTORY.concat(%w{abc 123 AAA})
-    assert_line_around_cursor('', '')
-    input_keys("\C-ra\C-j")
-    assert_line_around_cursor('', 'abc')
-  end
-
-  def test_larger_histories_than_history_size
-    history_size = @config.history_size
-    @config.history_size = 2
-    Reline::HISTORY.concat(%w{abc 123 AAA})
-    assert_line_around_cursor('', '')
-    input_keys("\C-p")
-    assert_line_around_cursor('AAA', '')
-    input_keys("\C-p")
-    assert_line_around_cursor('123', '')
-    input_keys("\C-p")
-    assert_line_around_cursor('123', '')
-  ensure
-    @config.history_size = history_size
-  end
-
-  def test_search_history_to_back
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line_around_cursor('', '')
-    input_keys("\C-r123")
-    assert_line_around_cursor('1234', '')
-    input_keys("\C-ha")
-    assert_line_around_cursor('12aa', '')
-    input_keys("\C-h3")
-    assert_line_around_cursor('1235', '')
-  end
-
-  def test_search_history_to_front
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line_around_cursor('', '')
-    input_keys("\C-s123")
-    assert_line_around_cursor('1235', '')
-    input_keys("\C-ha")
-    assert_line_around_cursor('12aa', '')
-    input_keys("\C-h3")
-    assert_line_around_cursor('1234', '')
-  end
-
-  def test_search_history_front_and_back
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line_around_cursor('', '')
-    input_keys("\C-s12")
-    assert_line_around_cursor('1235', '')
-    input_keys("\C-s")
-    assert_line_around_cursor('12aa', '')
-    input_keys("\C-r")
-    assert_line_around_cursor('12aa', '')
-    input_keys("\C-r")
-    assert_line_around_cursor('1235', '')
-  end
-
-  def test_search_history_back_and_front
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line_around_cursor('', '')
-    input_keys("\C-r12")
-    assert_line_around_cursor('1234', '')
-    input_keys("\C-r")
-    assert_line_around_cursor('12aa', '')
-    input_keys("\C-s")
-    assert_line_around_cursor('12aa', '')
-    input_keys("\C-s")
-    assert_line_around_cursor('1234', '')
-  end
-
-  def test_search_history_to_back_in_the_middle_of_histories
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line_around_cursor('', '')
-    input_keys("\C-p\C-p")
-    assert_line_around_cursor('12aa', '')
-    input_keys("\C-r123")
-    assert_line_around_cursor('1235', '')
-  end
-
-  def test_search_history_twice
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line_around_cursor('', '')
-    input_keys("\C-r123")
-    assert_line_around_cursor('1234', '')
-    input_keys("\C-r")
-    assert_line_around_cursor('1235', '')
-  end
-
-  def test_search_history_by_last_determined
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line_around_cursor('', '')
-    input_keys("\C-r123")
-    assert_line_around_cursor('1234', '')
-    input_keys("\C-j")
-    assert_line_around_cursor('', '1234')
-    input_keys("\C-k") # delete
-    assert_line_around_cursor('', '')
-    input_keys("\C-r")
-    assert_line_around_cursor('', '')
-    input_keys("\C-r")
-    assert_line_around_cursor('1235', '')
-  end
-
-  def test_search_history_with_isearch_terminator
-    @config.read_lines(<<~LINES.split(/(?<=\n)/))
-      set isearch-terminators "XYZ"
-    LINES
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line_around_cursor('', '')
-    input_keys("\C-r12a")
-    assert_line_around_cursor('12aa', '')
-    input_keys('Y')
-    assert_line_around_cursor('', '12aa')
-    input_keys('x')
-    assert_line_around_cursor('x', '12aa')
-  end
-
-  def test_em_set_mark_and_em_exchange_mark
-    input_keys('aaa bbb ccc ddd')
-    assert_line_around_cursor('aaa bbb ccc ddd', '')
-    input_keys("\C-a\M-F\M-F", false)
-    assert_line_around_cursor('aaa bbb', ' ccc ddd')
-    assert_equal(nil, @line_editor.instance_variable_get(:@mark_pointer))
-    input_keys("\x00", false) # C-Space
-    assert_line_around_cursor('aaa bbb', ' ccc ddd')
-    assert_equal([7, 0], @line_editor.instance_variable_get(:@mark_pointer))
-    input_keys("\C-a", false)
-    assert_line_around_cursor('', 'aaa bbb ccc ddd')
-    assert_equal([7, 0], @line_editor.instance_variable_get(:@mark_pointer))
-    input_key_by_symbol(:em_exchange_mark)
-    assert_line_around_cursor('aaa bbb', ' ccc ddd')
-    assert_equal([0, 0], @line_editor.instance_variable_get(:@mark_pointer))
-  end
-
-  def test_em_exchange_mark_without_mark
-    input_keys('aaa bbb ccc ddd')
-    assert_line_around_cursor('aaa bbb ccc ddd', '')
-    input_keys("\C-a\M-f", false)
-    assert_line_around_cursor('aaa', ' bbb ccc ddd')
-    assert_equal(nil, @line_editor.instance_variable_get(:@mark_pointer))
-    input_key_by_symbol(:em_exchange_mark)
-    assert_line_around_cursor('aaa', ' bbb ccc ddd')
-    assert_equal(nil, @line_editor.instance_variable_get(:@mark_pointer))
-  end
-
-  def test_modify_lines_with_wrong_rs
-    verbose, $VERBOSE = $VERBOSE, nil
-    original_global_slash = $/
-    $/ = 'b'
-    $VERBOSE = verbose
-    @line_editor.output_modifier_proc = proc { |output| Reline::Unicode.escape_for_print(output) }
-    input_keys("abcdef\n")
-    result = @line_editor.__send__(:modify_lines, @line_editor.whole_lines, @line_editor.finished?)
-    $/ = nil
-    assert_equal(['abcdef'], result)
-  ensure
-    $VERBOSE = nil
-    $/ = original_global_slash
-    $VERBOSE = verbose
-  end
-
-  def test_ed_search_prev_history
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    input_keys('123')
-    # The ed_search_prev_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_around_cursor('123', '45')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_around_cursor('123', '56')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_around_cursor('123', '56')
-  end
-
-  def test_ed_search_prev_history_with_empty
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    # The ed_search_prev_history doesn't have default binding
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12345', '')
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12aaa', '')
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12356', '')
-    input_key_by_symbol(:ed_search_next_history)
-    assert_line_around_cursor('12aaa', '')
-    input_key_by_symbol(:ed_prev_char)
-    input_key_by_symbol(:ed_next_char)
-    assert_line_around_cursor('12aaa', '')
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12aaa', '')
-    3.times { input_key_by_symbol(:ed_prev_char) }
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12', '356')
-  end
-
-  def test_ed_search_prev_history_without_match
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    input_keys('ABC')
-    # The ed_search_prev_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_around_cursor('ABC', '')
-  end
-
-  def test_ed_search_next_history
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    input_keys('123')
-    # The ed_search_prev_history and ed_search_next_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_around_cursor('123', '45')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_around_cursor('123', '56')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_around_cursor('123', '56')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_line_around_cursor('123', '45')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_line_around_cursor('123', '45')
-  end
-
-  def test_ed_search_next_history_with_empty
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    # The ed_search_prev_history and ed_search_next_history doesn't have default binding
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12345', '')
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12aaa', '')
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12356', '')
-    input_key_by_symbol(:ed_search_next_history)
-    assert_line_around_cursor('12aaa', '')
-    input_key_by_symbol(:ed_search_next_history)
-    assert_line_around_cursor('12345', '')
-    input_key_by_symbol(:ed_search_prev_history)
-    assert_line_around_cursor('12aaa', '')
-    input_key_by_symbol(:ed_prev_char)
-    input_key_by_symbol(:ed_next_char)
-    input_key_by_symbol(:ed_search_next_history)
-    assert_line_around_cursor('12aaa', '')
-    3.times { input_key_by_symbol(:ed_prev_char) }
-    input_key_by_symbol(:ed_search_next_history)
-    assert_line_around_cursor('12', '345')
-  end
-
-  def test_incremental_search_history_cancel_by_symbol_key
-    # ed_prev_char should move cursor left and cancel incremental search
-    input_keys("abc\C-r")
-    input_key_by_symbol(:ed_prev_char, csi: true)
-    input_keys('d')
-    assert_line_around_cursor('abd', 'c')
-  end
-
-  def test_incremental_search_history_saves_and_restores_last_input
-    Reline::HISTORY.concat(['abc', '123'])
-    input_keys("abcd")
-    # \C-j: terminate incremental search
-    input_keys("\C-r12\C-j")
-    assert_line_around_cursor('', '123')
-    input_key_by_symbol(:ed_next_history)
-    assert_line_around_cursor('abcd', '')
-    # Most non-printable keys also terminates incremental search
-    input_keys("\C-r12\C-i")
-    assert_line_around_cursor('', '123')
-    input_key_by_symbol(:ed_next_history)
-    assert_line_around_cursor('abcd', '')
-    # \C-g: cancel incremental search and restore input, cursor position and history index
-    input_key_by_symbol(:ed_prev_history)
-    input_keys("\C-b\C-b")
-    assert_line_around_cursor('1', '23')
-    input_keys("\C-rab\C-g")
-    assert_line_around_cursor('1', '23')
-    input_key_by_symbol(:ed_next_history)
-    assert_line_around_cursor('abcd', '')
-  end
-
-  # Unicode emoji test
-  def test_ed_insert_for_include_zwj_emoji
-    omit "This test is for UTF-8 but the locale is #{Reline.core.encoding}" if Reline.core.encoding != Encoding::UTF_8
-    # U+1F468 U+200D U+1F469 U+200D U+1F467 U+200D U+1F466 is family: man, woman, girl, boy "👨‍👩‍👧‍👦"
-    input_keys("\u{1F468}") # U+1F468 is man "👨"
-    assert_line_around_cursor('👨', '')
-    input_keys("\u200D") # U+200D is ZERO WIDTH JOINER
-    assert_line_around_cursor('👨‍', '')
-    input_keys("\u{1F469}") # U+1F469 is woman "👩"
-    assert_line_around_cursor('👨‍👩', '')
-    input_keys("\u200D") # U+200D is ZERO WIDTH JOINER
-    assert_line_around_cursor('👨‍👩‍', '')
-    input_keys("\u{1F467}") # U+1F467 is girl "👧"
-    assert_line_around_cursor('👨‍👩‍👧', '')
-    input_keys("\u200D") # U+200D is ZERO WIDTH JOINER
-    assert_line_around_cursor('👨‍👩‍👧‍', '')
-    input_keys("\u{1F466}") # U+1F466 is boy "👦"
-    assert_line_around_cursor('👨‍👩‍👧‍👦', '')
-    # U+1F468 U+200D U+1F469 U+200D U+1F467 U+200D U+1F466 is family: man, woman, girl, boy "👨‍👩‍👧‍👦"
-    input_keys("\u{1F468 200D 1F469 200D 1F467 200D 1F466}")
-    assert_line_around_cursor('👨‍👩‍👧‍👦👨‍👩‍👧‍👦', '')
-  end
-
-  def test_ed_insert_for_include_valiation_selector
-    omit "This test is for UTF-8 but the locale is #{Reline.core.encoding}" if Reline.core.encoding != Encoding::UTF_8
-    # U+0030 U+FE00 is DIGIT ZERO + VARIATION SELECTOR-1 "0︀"
-    input_keys("\u0030") # U+0030 is DIGIT ZERO
-    assert_line_around_cursor('0', '')
-    input_keys("\uFE00") # U+FE00 is VARIATION SELECTOR-1
-    assert_line_around_cursor('0︀', '')
-  end
-
-  def test_em_yank_pop
-    input_keys("def hoge\C-w\C-b\C-f\C-w", false)
-    assert_line_around_cursor('', '')
-    input_keys("\C-y", false)
-    assert_line_around_cursor('def ', '')
-    input_keys("\M-\C-y", false)
-    assert_line_around_cursor('hoge', '')
-  end
-
-  def test_em_kill_region_with_kill_ring
-    input_keys("def hoge\C-b\C-b\C-b\C-b", false)
-    assert_line_around_cursor('def ', 'hoge')
-    input_keys("\C-k\C-w", false)
-    assert_line_around_cursor('', '')
-    input_keys("\C-y", false)
-    assert_line_around_cursor('def hoge', '')
-  end
-
-  def test_ed_search_prev_next_history_in_multibyte
-    Reline::HISTORY.concat([
-      "def hoge\n  67890\n  12345\nend", # old
-      "def aiu\n  0xDEADBEEF\nend",
-      "def foo\n  12345\nend" # new
-    ])
-    @line_editor.multiline_on
-    input_keys('  123')
-    # The ed_search_prev_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_whole_lines(['def foo', '  12345', 'end'])
-    assert_line_index(1)
-    assert_whole_lines(['def foo', '  12345', 'end'])
-    assert_line_around_cursor('  123', '45')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_index(2)
-    assert_whole_lines(['def hoge', '  67890', '  12345', 'end'])
-    assert_line_around_cursor('  123', '45')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_index(2)
-    assert_whole_lines(['def hoge', '  67890', '  12345', 'end'])
-    assert_line_around_cursor('  123', '45')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_line_index(1)
-    assert_whole_lines(['def foo', '  12345', 'end'])
-    assert_line_around_cursor('  123', '45')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_line_index(1)
-    assert_whole_lines(['def foo', '  12345', 'end'])
-    assert_line_around_cursor('  123', '45')
-  end
-
-  def test_ignore_NUL_by_ed_quoted_insert
-    input_keys('"')
-    input_key_by_symbol(:insert_raw_char, char: 0.chr)
-    input_keys('"')
-    assert_line_around_cursor('""', '')
-  end
-
-  def test_ed_argument_digit_by_meta_num
-    input_keys('abcdef')
-    assert_line_around_cursor('abcdef', '')
-    input_keys("\M-2", false)
-    input_keys("\C-h", false)
-    assert_line_around_cursor('abcd', '')
-  end
-
-  def test_halfwidth_kana_width_dakuten
-    omit "This test is for UTF-8 but the locale is #{Reline.core.encoding}" if Reline.core.encoding != Encoding::UTF_8
-    input_raw_keys('ｶﾞｷﾞｹﾞｺﾞ')
-    assert_line_around_cursor('ｶﾞｷﾞｹﾞｺﾞ', '')
-    input_keys("\C-b\C-b", false)
-    assert_line_around_cursor('ｶﾞｷﾞ', 'ｹﾞｺﾞ')
-    input_raw_keys('ｸﾞ', false)
-    assert_line_around_cursor('ｶﾞｷﾞｸﾞ', 'ｹﾞｺﾞ')
-  end
-
-  def test_input_unknown_char
-    input_keys('͸') # U+0378 (unassigned)
-    assert_line_around_cursor('͸', '')
-  end
-
-  def test_unix_line_discard
-    input_keys("\C-u", false)
-    assert_line_around_cursor('', '')
-    input_keys('abc')
-    assert_line_around_cursor('abc', '')
-    input_keys("\C-b\C-u", false)
-    assert_line_around_cursor('', 'c')
-    input_keys("\C-f\C-u", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_editing_mode
-    @line_editor.__send__(:vi_editing_mode, nil)
-    assert(@config.editing_mode_is?(:vi_insert))
-  end
-
-  def test_undo
-    input_keys("\C-_", false)
-    assert_line_around_cursor('', '')
-    input_keys("aあb\C-h\C-h\C-h".encode(@encoding), false)
-    assert_line_around_cursor('', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('a', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('aあ', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('aあb', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('aあ', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('a', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('', '')
-  end
-
-  def test_undo_with_cursor_position
-    input_keys("abc\C-b\C-h", false)
-    assert_line_around_cursor('a', 'c')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('ab', 'c')
-    input_keys("あいう\C-b\C-h".encode(@encoding), false)
-    assert_line_around_cursor('abあ', 'うc')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('abあい', 'うc')
-  end
-
-  def test_undo_with_multiline
-    @line_editor.multiline_on
-    @line_editor.confirm_multiline_termination_proc = proc {}
-    input_keys("1\n2\n3", false)
-    assert_whole_lines(["1", "2", "3"])
-    assert_line_index(2)
-    assert_line_around_cursor('3', '')
-    input_keys("\C-p\C-h\C-h", false)
-    assert_whole_lines(["1", "3"])
-    assert_line_index(0)
-    assert_line_around_cursor('1', '')
-    input_keys("\C-_", false)
-    assert_whole_lines(["1", "", "3"])
-    assert_line_index(1)
-    assert_line_around_cursor('', '')
-    input_keys("\C-_", false)
-    assert_whole_lines(["1", "2", "3"])
-    assert_line_index(1)
-    assert_line_around_cursor('2', '')
-    input_keys("\C-_", false)
-    assert_whole_lines(["1", "2", ""])
-    assert_line_index(2)
-    assert_line_around_cursor('', '')
-    input_keys("\C-_", false)
-    assert_whole_lines(["1", "2"])
-    assert_line_index(1)
-    assert_line_around_cursor('2', '')
-  end
-
-  def test_undo_with_many_times
-    str = "a" + "b" * 99
-    input_keys(str, false)
-    100.times { input_keys("\C-_", false) }
-    assert_line_around_cursor('a', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('a', '')
-  end
-
-  def test_redo
-    input_keys("aあb".encode(@encoding), false)
-    assert_line_around_cursor('aあb', '')
-    input_keys("\M-\C-_", false)
-    assert_line_around_cursor('aあb', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('aあ', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('a', '')
-    input_keys("\M-\C-_", false)
-    assert_line_around_cursor('aあ', '')
-    input_keys("\M-\C-_", false)
-    assert_line_around_cursor('aあb', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('aあ', '')
-    input_keys("c", false)
-    assert_line_around_cursor('aあc', '')
-    input_keys("\M-\C-_", false)
-    assert_line_around_cursor('aあc', '')
-  end
-
-  def test_redo_with_cursor_position
-    input_keys("abc\C-b\C-h", false)
-    assert_line_around_cursor('a', 'c')
-    input_keys("\M-\C-_", false)
-    assert_line_around_cursor('a', 'c')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('ab', 'c')
-    input_keys("\M-\C-_", false)
-    assert_line_around_cursor('a', 'c')
-  end
-
-  def test_redo_with_multiline
-    @line_editor.multiline_on
-    @line_editor.confirm_multiline_termination_proc = proc {}
-    input_keys("1\n2\n3", false)
-    assert_whole_lines(["1", "2", "3"])
-    assert_line_index(2)
-    assert_line_around_cursor('3', '')
-
-    input_keys("\C-_", false)
-    assert_whole_lines(["1", "2", ""])
-    assert_line_index(2)
-    assert_line_around_cursor('', '')
-
-    input_keys("\C-_", false)
-    assert_whole_lines(["1", "2"])
-    assert_line_index(1)
-    assert_line_around_cursor('2', '')
-
-    input_keys("\M-\C-_", false)
-    assert_whole_lines(["1", "2", ""])
-    assert_line_index(2)
-    assert_line_around_cursor('', '')
-
-    input_keys("\M-\C-_", false)
-    assert_whole_lines(["1", "2", "3"])
-    assert_line_index(2)
-    assert_line_around_cursor('3', '')
-
-    input_keys("\C-p\C-h\C-h", false)
-    assert_whole_lines(["1", "3"])
-    assert_line_index(0)
-    assert_line_around_cursor('1', '')
-
-    input_keys("\C-n", false)
-    assert_whole_lines(["1", "3"])
-    assert_line_index(1)
-    assert_line_around_cursor('3', '')
-
-    input_keys("\C-_", false)
-    assert_whole_lines(["1", "", "3"])
-    assert_line_index(1)
-    assert_line_around_cursor('', '')
-
-    input_keys("\C-_", false)
-    assert_whole_lines(["1", "2", "3"])
-    assert_line_index(1)
-    assert_line_around_cursor('2', '')
-
-    input_keys("\M-\C-_", false)
-    assert_whole_lines(["1", "", "3"])
-    assert_line_index(1)
-    assert_line_around_cursor('', '')
-
-    input_keys("\M-\C-_", false)
-    assert_whole_lines(["1", "3"])
-    assert_line_index(1)
-    assert_line_around_cursor('3', '')
-  end
-
-  def test_undo_redo_restores_indentation
-    @line_editor.multiline_on
-    @line_editor.confirm_multiline_termination_proc = proc {}
-    input_keys(" 1", false)
-    assert_whole_lines([' 1'])
-    input_keys("2", false)
-    assert_whole_lines([' 12'])
-    @line_editor.auto_indent_proc = proc { 2 }
-    input_keys("\C-_", false)
-    assert_whole_lines([' 1'])
-    input_keys("\M-\C-_", false)
-    assert_whole_lines([' 12'])
-  end
-
-  def test_redo_with_many_times
-    str = "a" + "b" * 98 + "c"
-    input_keys(str, false)
-    100.times { input_keys("\C-_", false) }
-    assert_line_around_cursor('a', '')
-    input_keys("\C-_", false)
-    assert_line_around_cursor('a', '')
-    100.times { input_keys("\M-\C-_", false) }
-    assert_line_around_cursor(str, '')
-    input_keys("\M-\C-_", false)
-    assert_line_around_cursor(str, '')
-  end
-end
diff --git a/test/mri/reline/test_key_actor_vi.rb b/test/mri/reline/test_key_actor_vi.rb
deleted file mode 100644
index 928adace2b4..00000000000
--- a/test/mri/reline/test_key_actor_vi.rb
+++ /dev/null
@@ -1,960 +0,0 @@
-require_relative 'helper'
-
-class Reline::ViInsertTest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @prompt = '> '
-    @config = Reline::Config.new
-    @config.read_lines(<<~LINES.split(/(?<=\n)/))
-      set editing-mode vi
-    LINES
-    @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config)
-    @line_editor.reset(@prompt)
-  end
-
-  def editing_mode_label
-    @config.instance_variable_get(:@editing_mode_label)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_vi_command_mode
-    input_keys("\C-[")
-    assert_equal(:vi_command, editing_mode_label)
-  end
-
-  def test_vi_command_mode_with_input
-    input_keys("abc\C-[")
-    assert_equal(:vi_command, editing_mode_label)
-    assert_line_around_cursor('ab', 'c')
-  end
-
-  def test_vi_insert
-    assert_equal(:vi_insert, editing_mode_label)
-    input_keys('i')
-    assert_line_around_cursor('i', '')
-    assert_equal(:vi_insert, editing_mode_label)
-    input_keys("\C-[")
-    assert_line_around_cursor('', 'i')
-    assert_equal(:vi_command, editing_mode_label)
-    input_keys('i')
-    assert_line_around_cursor('', 'i')
-    assert_equal(:vi_insert, editing_mode_label)
-  end
-
-  def test_vi_add
-    assert_equal(:vi_insert, editing_mode_label)
-    input_keys('a')
-    assert_line_around_cursor('a', '')
-    assert_equal(:vi_insert, editing_mode_label)
-    input_keys("\C-[")
-    assert_line_around_cursor('', 'a')
-    assert_equal(:vi_command, editing_mode_label)
-    input_keys('a')
-    assert_line_around_cursor('a', '')
-    assert_equal(:vi_insert, editing_mode_label)
-  end
-
-  def test_vi_insert_at_bol
-    input_keys('I')
-    assert_line_around_cursor('I', '')
-    assert_equal(:vi_insert, editing_mode_label)
-    input_keys("12345\C-[hh")
-    assert_line_around_cursor('I12', '345')
-    assert_equal(:vi_command, editing_mode_label)
-    input_keys('I')
-    assert_line_around_cursor('', 'I12345')
-    assert_equal(:vi_insert, editing_mode_label)
-  end
-
-  def test_vi_add_at_eol
-    input_keys('A')
-    assert_line_around_cursor('A', '')
-    assert_equal(:vi_insert, editing_mode_label)
-    input_keys("12345\C-[hh")
-    assert_line_around_cursor('A12', '345')
-    assert_equal(:vi_command, editing_mode_label)
-    input_keys('A')
-    assert_line_around_cursor('A12345', '')
-    assert_equal(:vi_insert, editing_mode_label)
-  end
-
-  def test_ed_insert_one
-    input_keys('a')
-    assert_line_around_cursor('a', '')
-  end
-
-  def test_ed_insert_two
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-  end
-
-  def test_ed_insert_mbchar_one
-    input_keys('か')
-    assert_line_around_cursor('か', '')
-  end
-
-  def test_ed_insert_mbchar_two
-    input_keys('かき')
-    assert_line_around_cursor('かき', '')
-  end
-
-  def test_ed_insert_for_mbchar_by_plural_code_points
-    input_keys("か\u3099")
-    assert_line_around_cursor("か\u3099", '')
-  end
-
-  def test_ed_insert_for_plural_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_line_around_cursor("か\u3099き\u3099", '')
-  end
-
-  def test_ed_insert_ignore_in_vi_command
-    input_keys("\C-[")
-    chars_to_be_ignored = "\C-Oあ=".chars
-    input_keys(chars_to_be_ignored.join)
-    assert_line_around_cursor('', '')
-    input_keys(chars_to_be_ignored.map {|c| "5#{c}" }.join)
-    assert_line_around_cursor('', '')
-    input_keys('iい')
-    assert_line_around_cursor("い", '')
-  end
-
-  def test_ed_next_char
-    input_keys("abcdef\C-[0")
-    assert_line_around_cursor('', 'abcdef')
-    input_keys('l')
-    assert_line_around_cursor('a', 'bcdef')
-    input_keys('2l')
-    assert_line_around_cursor('abc', 'def')
-  end
-
-  def test_ed_prev_char
-    input_keys("abcdef\C-[")
-    assert_line_around_cursor('abcde', 'f')
-    input_keys('h')
-    assert_line_around_cursor('abcd', 'ef')
-    input_keys('2h')
-    assert_line_around_cursor('ab', 'cdef')
-  end
-
-  def test_history
-    Reline::HISTORY.concat(%w{abc 123 AAA})
-    input_keys("\C-[")
-    assert_line_around_cursor('', '')
-    input_keys('k')
-    assert_line_around_cursor('', 'AAA')
-    input_keys('2k')
-    assert_line_around_cursor('', 'abc')
-    input_keys('j')
-    assert_line_around_cursor('', '123')
-    input_keys('2j')
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_paste_prev
-    input_keys("abcde\C-[3h")
-    assert_line_around_cursor('a', 'bcde')
-    input_keys('P')
-    assert_line_around_cursor('a', 'bcde')
-    input_keys('d$')
-    assert_line_around_cursor('', 'a')
-    input_keys('P')
-    assert_line_around_cursor('bcd', 'ea')
-    input_keys('2P')
-    assert_line_around_cursor('bcdbcdbcd', 'eeea')
-  end
-
-  def test_vi_paste_next
-    input_keys("abcde\C-[3h")
-    assert_line_around_cursor('a', 'bcde')
-    input_keys('p')
-    assert_line_around_cursor('a', 'bcde')
-    input_keys('d$')
-    assert_line_around_cursor('', 'a')
-    input_keys('p')
-    assert_line_around_cursor('abcd', 'e')
-    input_keys('2p')
-    assert_line_around_cursor('abcdebcdebcd', 'e')
-  end
-
-  def test_vi_paste_prev_for_mbchar
-    input_keys("あいうえお\C-[3h")
-    assert_line_around_cursor('あ', 'いうえお')
-    input_keys('P')
-    assert_line_around_cursor('あ', 'いうえお')
-    input_keys('d$')
-    assert_line_around_cursor('', 'あ')
-    input_keys('P')
-    assert_line_around_cursor('いうえ', 'おあ')
-    input_keys('2P')
-    assert_line_around_cursor('いうえいうえいうえ', 'おおおあ')
-  end
-
-  def test_vi_paste_next_for_mbchar
-    input_keys("あいうえお\C-[3h")
-    assert_line_around_cursor('あ', 'いうえお')
-    input_keys('p')
-    assert_line_around_cursor('あ', 'いうえお')
-    input_keys('d$')
-    assert_line_around_cursor('', 'あ')
-    input_keys('p')
-    assert_line_around_cursor('あいうえ', 'お')
-    input_keys('2p')
-    assert_line_around_cursor('あいうえおいうえおいうえ', 'お')
-  end
-
-  def test_vi_paste_prev_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099く\u3099け\u3099こ\u3099\C-[3h")
-    assert_line_around_cursor("か\u3099", "き\u3099く\u3099け\u3099こ\u3099")
-    input_keys('P')
-    assert_line_around_cursor("か\u3099", "き\u3099く\u3099け\u3099こ\u3099")
-    input_keys('d$')
-    assert_line_around_cursor('', "か\u3099")
-    input_keys('P')
-    assert_line_around_cursor("き\u3099く\u3099け\u3099", "こ\u3099か\u3099")
-    input_keys('2P')
-    assert_line_around_cursor("き\u3099く\u3099け\u3099き\u3099く\u3099け\u3099き\u3099く\u3099け\u3099", "こ\u3099こ\u3099こ\u3099か\u3099")
-  end
-
-  def test_vi_paste_next_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099く\u3099け\u3099こ\u3099\C-[3h")
-    assert_line_around_cursor("か\u3099", "き\u3099く\u3099け\u3099こ\u3099")
-    input_keys('p')
-    assert_line_around_cursor("か\u3099", "き\u3099く\u3099け\u3099こ\u3099")
-    input_keys('d$')
-    assert_line_around_cursor('', "か\u3099")
-    input_keys('p')
-    assert_line_around_cursor("か\u3099き\u3099く\u3099け\u3099", "こ\u3099")
-    input_keys('2p')
-    assert_line_around_cursor("か\u3099き\u3099く\u3099け\u3099こ\u3099き\u3099く\u3099け\u3099こ\u3099き\u3099く\u3099け\u3099", "こ\u3099")
-  end
-
-  def test_vi_prev_next_word
-    input_keys("aaa b{b}b ccc\C-[0")
-    assert_line_around_cursor('', 'aaa b{b}b ccc')
-    input_keys('w')
-    assert_line_around_cursor('aaa ', 'b{b}b ccc')
-    input_keys('w')
-    assert_line_around_cursor('aaa b', '{b}b ccc')
-    input_keys('w')
-    assert_line_around_cursor('aaa b{', 'b}b ccc')
-    input_keys('w')
-    assert_line_around_cursor('aaa b{b', '}b ccc')
-    input_keys('w')
-    assert_line_around_cursor('aaa b{b}', 'b ccc')
-    input_keys('w')
-    assert_line_around_cursor('aaa b{b}b ', 'ccc')
-    input_keys('w')
-    assert_line_around_cursor('aaa b{b}b cc', 'c')
-    input_keys('b')
-    assert_line_around_cursor('aaa b{b}b ', 'ccc')
-    input_keys('b')
-    assert_line_around_cursor('aaa b{b}', 'b ccc')
-    input_keys('b')
-    assert_line_around_cursor('aaa b{b', '}b ccc')
-    input_keys('b')
-    assert_line_around_cursor('aaa b{', 'b}b ccc')
-    input_keys('b')
-    assert_line_around_cursor('aaa b', '{b}b ccc')
-    input_keys('b')
-    assert_line_around_cursor('aaa ', 'b{b}b ccc')
-    input_keys('b')
-    assert_line_around_cursor('', 'aaa b{b}b ccc')
-    input_keys('3w')
-    assert_line_around_cursor('aaa b{', 'b}b ccc')
-    input_keys('3w')
-    assert_line_around_cursor('aaa b{b}b ', 'ccc')
-    input_keys('3w')
-    assert_line_around_cursor('aaa b{b}b cc', 'c')
-    input_keys('3b')
-    assert_line_around_cursor('aaa b{b', '}b ccc')
-    input_keys('3b')
-    assert_line_around_cursor('aaa ', 'b{b}b ccc')
-    input_keys('3b')
-    assert_line_around_cursor('', 'aaa b{b}b ccc')
-  end
-
-  def test_vi_end_word
-    input_keys("aaa   b{b}}}b   ccc\C-[0")
-    assert_line_around_cursor('', 'aaa   b{b}}}b   ccc')
-    input_keys('e')
-    assert_line_around_cursor('aa', 'a   b{b}}}b   ccc')
-    input_keys('e')
-    assert_line_around_cursor('aaa   ', 'b{b}}}b   ccc')
-    input_keys('e')
-    assert_line_around_cursor('aaa   b', '{b}}}b   ccc')
-    input_keys('e')
-    assert_line_around_cursor('aaa   b{', 'b}}}b   ccc')
-    input_keys('e')
-    assert_line_around_cursor('aaa   b{b}}', '}b   ccc')
-    input_keys('e')
-    assert_line_around_cursor('aaa   b{b}}}', 'b   ccc')
-    input_keys('e')
-    assert_line_around_cursor('aaa   b{b}}}b   cc', 'c')
-    input_keys('e')
-    assert_line_around_cursor('aaa   b{b}}}b   cc', 'c')
-    input_keys('03e')
-    assert_line_around_cursor('aaa   b', '{b}}}b   ccc')
-    input_keys('3e')
-    assert_line_around_cursor('aaa   b{b}}}', 'b   ccc')
-    input_keys('3e')
-    assert_line_around_cursor('aaa   b{b}}}b   cc', 'c')
-  end
-
-  def test_vi_prev_next_big_word
-    input_keys("aaa b{b}b ccc\C-[0")
-    assert_line_around_cursor('', 'aaa b{b}b ccc')
-    input_keys('W')
-    assert_line_around_cursor('aaa ', 'b{b}b ccc')
-    input_keys('W')
-    assert_line_around_cursor('aaa b{b}b ', 'ccc')
-    input_keys('W')
-    assert_line_around_cursor('aaa b{b}b cc', 'c')
-    input_keys('B')
-    assert_line_around_cursor('aaa b{b}b ', 'ccc')
-    input_keys('B')
-    assert_line_around_cursor('aaa ', 'b{b}b ccc')
-    input_keys('B')
-    assert_line_around_cursor('', 'aaa b{b}b ccc')
-    input_keys('2W')
-    assert_line_around_cursor('aaa b{b}b ', 'ccc')
-    input_keys('2W')
-    assert_line_around_cursor('aaa b{b}b cc', 'c')
-    input_keys('2B')
-    assert_line_around_cursor('aaa ', 'b{b}b ccc')
-    input_keys('2B')
-    assert_line_around_cursor('', 'aaa b{b}b ccc')
-  end
-
-  def test_vi_end_big_word
-    input_keys("aaa   b{b}}}b   ccc\C-[0")
-    assert_line_around_cursor('', 'aaa   b{b}}}b   ccc')
-    input_keys('E')
-    assert_line_around_cursor('aa', 'a   b{b}}}b   ccc')
-    input_keys('E')
-    assert_line_around_cursor('aaa   b{b}}}', 'b   ccc')
-    input_keys('E')
-    assert_line_around_cursor('aaa   b{b}}}b   cc', 'c')
-    input_keys('E')
-    assert_line_around_cursor('aaa   b{b}}}b   cc', 'c')
-  end
-
-  def test_ed_quoted_insert
-    input_keys('ab')
-    input_key_by_symbol(:insert_raw_char, char: "\C-a")
-    assert_line_around_cursor("ab\C-a", '')
-  end
-
-  def test_ed_quoted_insert_with_vi_arg
-    input_keys("ab\C-[3")
-    input_key_by_symbol(:insert_raw_char, char: "\C-a")
-    input_keys('4')
-    input_key_by_symbol(:insert_raw_char, char: '1')
-    assert_line_around_cursor("a\C-a\C-a\C-a1111", 'b')
-  end
-
-  def test_vi_replace_char
-    input_keys("abcdef\C-[03l")
-    assert_line_around_cursor('abc', 'def')
-    input_keys('rz')
-    assert_line_around_cursor('abc', 'zef')
-    input_keys('2rx')
-    assert_line_around_cursor('abcxx', 'f')
-  end
-
-  def test_vi_replace_char_with_mbchar
-    input_keys("あいうえお\C-[0l")
-    assert_line_around_cursor('あ', 'いうえお')
-    input_keys('rx')
-    assert_line_around_cursor('あ', 'xうえお')
-    input_keys('l2ry')
-    assert_line_around_cursor('あxyy', 'お')
-  end
-
-  def test_vi_next_char
-    input_keys("abcdef\C-[0")
-    assert_line_around_cursor('', 'abcdef')
-    input_keys('fz')
-    assert_line_around_cursor('', 'abcdef')
-    input_keys('fe')
-    assert_line_around_cursor('abcd', 'ef')
-  end
-
-  def test_vi_to_next_char
-    input_keys("abcdef\C-[0")
-    assert_line_around_cursor('', 'abcdef')
-    input_keys('tz')
-    assert_line_around_cursor('', 'abcdef')
-    input_keys('te')
-    assert_line_around_cursor('abc', 'def')
-  end
-
-  def test_vi_prev_char
-    input_keys("abcdef\C-[")
-    assert_line_around_cursor('abcde', 'f')
-    input_keys('Fz')
-    assert_line_around_cursor('abcde', 'f')
-    input_keys('Fa')
-    assert_line_around_cursor('', 'abcdef')
-  end
-
-  def test_vi_to_prev_char
-    input_keys("abcdef\C-[")
-    assert_line_around_cursor('abcde', 'f')
-    input_keys('Tz')
-    assert_line_around_cursor('abcde', 'f')
-    input_keys('Ta')
-    assert_line_around_cursor('a', 'bcdef')
-  end
-
-  def test_vi_delete_next_char
-    input_keys("abc\C-[h")
-    assert_line_around_cursor('a', 'bc')
-    input_keys('x')
-    assert_line_around_cursor('a', 'c')
-    input_keys('x')
-    assert_line_around_cursor('', 'a')
-    input_keys('x')
-    assert_line_around_cursor('', '')
-    input_keys('x')
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_delete_next_char_for_mbchar
-    input_keys("あいう\C-[h")
-    assert_line_around_cursor('あ', 'いう')
-    input_keys('x')
-    assert_line_around_cursor('あ', 'う')
-    input_keys('x')
-    assert_line_around_cursor('', 'あ')
-    input_keys('x')
-    assert_line_around_cursor('', '')
-    input_keys('x')
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_delete_next_char_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099く\u3099\C-[h")
-    assert_line_around_cursor("か\u3099", "き\u3099く\u3099")
-    input_keys('x')
-    assert_line_around_cursor("か\u3099", "く\u3099")
-    input_keys('x')
-    assert_line_around_cursor('', "か\u3099")
-    input_keys('x')
-    assert_line_around_cursor('', '')
-    input_keys('x')
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_delete_prev_char
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-    input_keys("\C-h")
-    assert_line_around_cursor('a', '')
-  end
-
-  def test_vi_delete_prev_char_for_mbchar
-    input_keys('かき')
-    assert_line_around_cursor('かき', '')
-    input_keys("\C-h")
-    assert_line_around_cursor('か', '')
-  end
-
-  def test_vi_delete_prev_char_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_line_around_cursor("か\u3099き\u3099", '')
-    input_keys("\C-h")
-    assert_line_around_cursor("か\u3099", '')
-  end
-
-  def test_ed_delete_prev_char
-    input_keys("abcdefg\C-[h")
-    assert_line_around_cursor('abcde', 'fg')
-    input_keys('X')
-    assert_line_around_cursor('abcd', 'fg')
-    input_keys('3X')
-    assert_line_around_cursor('a', 'fg')
-    input_keys('p')
-    assert_line_around_cursor('afbc', 'dg')
-  end
-
-  def test_ed_delete_prev_word
-    input_keys('abc def{bbb}ccc')
-    assert_line_around_cursor('abc def{bbb}ccc', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('abc def{bbb}', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('abc def{', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('abc ', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('', '')
-  end
-
-  def test_ed_delete_prev_word_for_mbchar
-    input_keys('あいう かきく{さしす}たちつ')
-    assert_line_around_cursor('あいう かきく{さしす}たちつ', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('あいう かきく{さしす}', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('あいう かきく{', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('あいう ', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('', '')
-  end
-
-  def test_ed_delete_prev_word_for_mbchar_by_plural_code_points
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす}たちつ", '')
-    input_keys("\C-w")
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{さしす}", '')
-    input_keys("\C-w")
-    assert_line_around_cursor("あいう か\u3099き\u3099く\u3099{", '')
-    input_keys("\C-w")
-    assert_line_around_cursor('あいう ', '')
-    input_keys("\C-w")
-    assert_line_around_cursor('', '')
-  end
-
-  def test_ed_newline_with_cr
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-    refute(@line_editor.finished?)
-    input_keys("\C-m")
-    assert_line_around_cursor('ab', '')
-    assert(@line_editor.finished?)
-  end
-
-  def test_ed_newline_with_lf
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-    refute(@line_editor.finished?)
-    input_keys("\C-j")
-    assert_line_around_cursor('ab', '')
-    assert(@line_editor.finished?)
-  end
-
-  def test_vi_list_or_eof
-    input_keys("\C-d") # quit from inputing
-    assert_nil(@line_editor.line)
-    assert(@line_editor.finished?)
-  end
-
-  def test_vi_list_or_eof_with_non_empty_line
-    input_keys('ab')
-    assert_line_around_cursor('ab', '')
-    refute(@line_editor.finished?)
-    input_keys("\C-d")
-    assert_line_around_cursor('ab', '')
-    assert(@line_editor.finished?)
-  end
-
-  def test_completion_journey
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo')
-    assert_line_around_cursor('foo', '')
-    input_keys("\C-n")
-    assert_line_around_cursor('foo_bar', '')
-    input_keys("\C-n")
-    assert_line_around_cursor('foo_bar_baz', '')
-    input_keys("\C-n")
-    assert_line_around_cursor('foo', '')
-    input_keys("\C-n")
-    assert_line_around_cursor('foo_bar', '')
-    input_keys("_\C-n")
-    assert_line_around_cursor('foo_bar_baz', '')
-    input_keys("\C-n")
-    assert_line_around_cursor('foo_bar_', '')
-  end
-
-  def test_completion_journey_reverse
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo')
-    assert_line_around_cursor('foo', '')
-    input_keys("\C-p")
-    assert_line_around_cursor('foo_bar_baz', '')
-    input_keys("\C-p")
-    assert_line_around_cursor('foo_bar', '')
-    input_keys("\C-p")
-    assert_line_around_cursor('foo', '')
-    input_keys("\C-p")
-    assert_line_around_cursor('foo_bar_baz', '')
-    input_keys("\C-h\C-p")
-    assert_line_around_cursor('foo_bar_baz', '')
-    input_keys("\C-p")
-    assert_line_around_cursor('foo_bar_ba', '')
-  end
-
-  def test_completion_journey_in_middle_of_line
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('abcde fo ABCDE')
-    assert_line_around_cursor('abcde fo ABCDE', '')
-    input_keys("\C-[" + 'h' * 5 + "i\C-n")
-    assert_line_around_cursor('abcde foo_bar', ' ABCDE')
-    input_keys("\C-n")
-    assert_line_around_cursor('abcde foo_bar_baz', ' ABCDE')
-    input_keys("\C-n")
-    assert_line_around_cursor('abcde fo', ' ABCDE')
-    input_keys("\C-n")
-    assert_line_around_cursor('abcde foo_bar', ' ABCDE')
-    input_keys("_\C-n")
-    assert_line_around_cursor('abcde foo_bar_baz', ' ABCDE')
-    input_keys("\C-n")
-    assert_line_around_cursor('abcde foo_bar_', ' ABCDE')
-    input_keys("\C-n")
-    assert_line_around_cursor('abcde foo_bar_baz', ' ABCDE')
-  end
-
-  def test_completion
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo')
-    assert_line_around_cursor('foo', '')
-    input_keys("\C-i")
-    assert_line_around_cursor('foo_bar', '')
-  end
-
-  def test_autocompletion_with_upward_navigation
-    @config.autocompletion = true
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        Readline
-        Regexp
-        RegexpError
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('Re')
-    assert_line_around_cursor('Re', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('Readline', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('Regexp', '')
-    input_key_by_symbol(:completion_journey_up)
-    assert_line_around_cursor('Readline', '')
-  ensure
-    @config.autocompletion = false
-  end
-
-  def test_autocompletion_with_upward_navigation_and_menu_complete_backward
-    @config.autocompletion = true
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        Readline
-        Regexp
-        RegexpError
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('Re')
-    assert_line_around_cursor('Re', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('Readline', '')
-    input_keys("\C-i", false)
-    assert_line_around_cursor('Regexp', '')
-    input_key_by_symbol(:menu_complete_backward)
-    assert_line_around_cursor('Readline', '')
-  ensure
-    @config.autocompletion = false
-  end
-
-  def test_completion_with_disable_completion
-    @config.disable_completion = true
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo')
-    assert_line_around_cursor('foo', '')
-    input_keys("\C-i")
-    assert_line_around_cursor('foo', '')
-  end
-
-  def test_vi_first_print
-    input_keys("abcde\C-[^")
-    assert_line_around_cursor('', 'abcde')
-    input_keys("0\C-ki")
-    input_keys(" abcde\C-[^")
-    assert_line_around_cursor(' ', 'abcde')
-    input_keys("0\C-ki")
-    input_keys("   abcde  ABCDE  \C-[^")
-    assert_line_around_cursor('   ', 'abcde  ABCDE  ')
-  end
-
-  def test_ed_move_to_beg
-    input_keys("abcde\C-[0")
-    assert_line_around_cursor('', 'abcde')
-    input_keys("0\C-ki")
-    input_keys(" abcde\C-[0")
-    assert_line_around_cursor('', ' abcde')
-    input_keys("0\C-ki")
-    input_keys("   abcde  ABCDE  \C-[0")
-    assert_line_around_cursor('', '   abcde  ABCDE  ')
-  end
-
-  def test_vi_to_column
-    input_keys("a一二三\C-[0")
-    input_keys('1|')
-    assert_line_around_cursor('', 'a一二三')
-    input_keys('2|')
-    assert_line_around_cursor('a', '一二三')
-    input_keys('3|')
-    assert_line_around_cursor('a', '一二三')
-    input_keys('4|')
-    assert_line_around_cursor('a一', '二三')
-    input_keys('9|')
-    assert_line_around_cursor('a一二', '三')
-  end
-
-  def test_vi_delete_meta
-    input_keys("aaa bbb ccc ddd eee\C-[02w")
-    assert_line_around_cursor('aaa bbb ', 'ccc ddd eee')
-    input_keys('dw')
-    assert_line_around_cursor('aaa bbb ', 'ddd eee')
-    input_keys('db')
-    assert_line_around_cursor('aaa ', 'ddd eee')
-  end
-
-  def test_vi_delete_meta_nothing
-    input_keys("foo\C-[0")
-    assert_line_around_cursor('', 'foo')
-    input_keys('dhp')
-    assert_line_around_cursor('', 'foo')
-  end
-
-  def test_vi_delete_meta_with_vi_next_word_at_eol
-    input_keys("foo bar\C-[0w")
-    assert_line_around_cursor('foo ', 'bar')
-    input_keys('w')
-    assert_line_around_cursor('foo ba', 'r')
-    input_keys('0dw')
-    assert_line_around_cursor('', 'bar')
-    input_keys('dw')
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_delete_meta_with_vi_next_char
-    input_keys("aaa bbb ccc ___ ddd\C-[02w")
-    assert_line_around_cursor('aaa bbb ', 'ccc ___ ddd')
-    input_keys('df_')
-    assert_line_around_cursor('aaa bbb ', '__ ddd')
-  end
-
-  def test_vi_delete_meta_with_arg
-    input_keys("aaa bbb ccc ddd\C-[03w")
-    assert_line_around_cursor('aaa bbb ccc ', 'ddd')
-    input_keys('2dl')
-    assert_line_around_cursor('aaa bbb ccc ', 'd')
-    input_keys('d2h')
-    assert_line_around_cursor('aaa bbb cc', 'd')
-    input_keys('2d3h')
-    assert_line_around_cursor('aaa ', 'd')
-    input_keys('dd')
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_change_meta
-    input_keys("aaa bbb ccc ddd eee\C-[02w")
-    assert_line_around_cursor('aaa bbb ', 'ccc ddd eee')
-    input_keys('cwaiueo')
-    assert_line_around_cursor('aaa bbb aiueo', ' ddd eee')
-    input_keys("\C-[")
-    assert_line_around_cursor('aaa bbb aiue', 'o ddd eee')
-    input_keys('cb')
-    assert_line_around_cursor('aaa bbb ', 'o ddd eee')
-  end
-
-  def test_vi_change_meta_with_vi_next_word
-    input_keys("foo  bar  baz\C-[0w")
-    assert_line_around_cursor('foo  ', 'bar  baz')
-    input_keys('cwhoge')
-    assert_line_around_cursor('foo  hoge', '  baz')
-    input_keys("\C-[")
-    assert_line_around_cursor('foo  hog', 'e  baz')
-  end
-
-  def test_vi_waiting_operator_with_waiting_proc
-    input_keys("foo foo foo foo foo\C-[0")
-    input_keys('2d3fo')
-    assert_line_around_cursor('', ' foo foo')
-    input_keys('fo')
-    assert_line_around_cursor(' f', 'oo foo')
-  end
-
-  def test_waiting_operator_arg_including_zero
-    input_keys("a111111111111222222222222\C-[0")
-    input_keys('10df1')
-    assert_line_around_cursor('', '11222222222222')
-    input_keys('d10f2')
-    assert_line_around_cursor('', '22')
-  end
-
-  def test_vi_waiting_operator_cancel
-    input_keys("aaa bbb ccc\C-[02w")
-    assert_line_around_cursor('aaa bbb ', 'ccc')
-    # dc dy should cancel delete_meta
-    input_keys('dch')
-    input_keys('dyh')
-    # cd cy should cancel change_meta
-    input_keys('cdh')
-    input_keys('cyh')
-    # yd yc should cancel yank_meta
-    # P should not paste yanked text because yank_meta is canceled
-    input_keys('ydhP')
-    input_keys('ychP')
-    assert_line_around_cursor('aa', 'a bbb ccc')
-  end
-
-  def test_cancel_waiting_with_symbol_key
-    input_keys("aaa bbb lll\C-[0")
-    assert_line_around_cursor('', 'aaa bbb lll')
-    # ed_next_char should move cursor right and cancel vi_next_char
-    input_keys('f')
-    input_key_by_symbol(:ed_next_char, csi: true)
-    input_keys('l')
-    assert_line_around_cursor('aa', 'a bbb lll')
-    # vi_delete_meta + ed_next_char should delete character
-    input_keys('d')
-    input_key_by_symbol(:ed_next_char, csi: true)
-    input_keys('l')
-    assert_line_around_cursor('aa ', 'bbb lll')
-  end
-
-  def test_unimplemented_vi_command_should_be_no_op
-    input_keys("abc\C-[h")
-    assert_line_around_cursor('a', 'bc')
-    input_keys('@')
-    assert_line_around_cursor('a', 'bc')
-  end
-
-  def test_vi_yank
-    input_keys("foo bar\C-[2h")
-    assert_line_around_cursor('foo ', 'bar')
-    input_keys('y3l')
-    assert_line_around_cursor('foo ', 'bar')
-    input_keys('P')
-    assert_line_around_cursor('foo ba', 'rbar')
-    input_keys('3h3yhP')
-    assert_line_around_cursor('foofo', 'o barbar')
-    input_keys('yyP')
-    assert_line_around_cursor('foofofoofoo barba', 'ro barbar')
-  end
-
-  def test_vi_yank_nothing
-    input_keys("foo\C-[0")
-    assert_line_around_cursor('', 'foo')
-    input_keys('yhp')
-    assert_line_around_cursor('', 'foo')
-  end
-
-  def test_vi_end_word_with_operator
-    input_keys("foo bar\C-[0")
-    assert_line_around_cursor('', 'foo bar')
-    input_keys('de')
-    assert_line_around_cursor('', ' bar')
-    input_keys('de')
-    assert_line_around_cursor('', '')
-    input_keys('de')
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_end_big_word_with_operator
-    input_keys("aaa   b{b}}}b\C-[0")
-    assert_line_around_cursor('', 'aaa   b{b}}}b')
-    input_keys('dE')
-    assert_line_around_cursor('', '   b{b}}}b')
-    input_keys('dE')
-    assert_line_around_cursor('', '')
-    input_keys('dE')
-    assert_line_around_cursor('', '')
-  end
-
-  def test_vi_next_char_with_operator
-    input_keys("foo bar\C-[0")
-    assert_line_around_cursor('', 'foo bar')
-    input_keys('df ')
-    assert_line_around_cursor('', 'bar')
-  end
-
-  def test_ed_delete_next_char_at_eol
-    input_keys('"あ"')
-    assert_line_around_cursor('"あ"', '')
-    input_keys("\C-[")
-    assert_line_around_cursor('"あ', '"')
-    input_keys('xa"')
-    assert_line_around_cursor('"あ"', '')
-  end
-
-  def test_vi_kill_line_prev
-    input_keys("\C-u", false)
-    assert_line_around_cursor('', '')
-    input_keys('abc')
-    assert_line_around_cursor('abc', '')
-    input_keys("\C-u", false)
-    assert_line_around_cursor('', '')
-    input_keys('abc')
-    input_keys("\C-[\C-u", false)
-    assert_line_around_cursor('', 'c')
-    input_keys("\C-u", false)
-    assert_line_around_cursor('', 'c')
-  end
-
-  def test_vi_change_to_eol
-    input_keys("abcdef\C-[2hC")
-    assert_line_around_cursor('abc', '')
-    input_keys("\C-[0C")
-    assert_line_around_cursor('', '')
-    assert_equal(:vi_insert, editing_mode_label)
-  end
-
-  def test_vi_motion_operators
-    assert_equal(:vi_insert, editing_mode_label)
-
-    assert_nothing_raised do
-      input_keys("test = { foo: bar }\C-[BBBldt}b")
-    end
-  end
-
-  def test_emacs_editing_mode
-    @line_editor.__send__(:emacs_editing_mode, nil)
-    assert(@config.editing_mode_is?(:emacs))
-  end
-end
diff --git a/test/mri/reline/test_key_stroke.rb b/test/mri/reline/test_key_stroke.rb
deleted file mode 100644
index fb2cb1c8b82..00000000000
--- a/test/mri/reline/test_key_stroke.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-require_relative 'helper'
-
-class Reline::KeyStroke::Test < Reline::TestCase
-  def encoding
-    Reline.core.encoding
-  end
-
-  def test_match_status
-    config = Reline::Config.new
-    {
-      'a' => 'xx',
-      'ab' => 'y',
-      'abc' => 'z',
-      'x' => 'rr'
-    }.each_pair do |key, func|
-      config.add_default_key_binding(key.bytes, func.bytes)
-    end
-    stroke = Reline::KeyStroke.new(config, encoding)
-    assert_equal(Reline::KeyStroke::MATCHING_MATCHED, stroke.match_status("a".bytes))
-    assert_equal(Reline::KeyStroke::MATCHING_MATCHED, stroke.match_status("ab".bytes))
-    assert_equal(Reline::KeyStroke::MATCHED, stroke.match_status("abc".bytes))
-    assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status("abz".bytes))
-    assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status("abcx".bytes))
-    assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status("aa".bytes))
-    assert_equal(Reline::KeyStroke::MATCHED, stroke.match_status("x".bytes))
-    assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status("xa".bytes))
-  end
-
-  def test_match_unknown
-    config = Reline::Config.new
-    config.add_default_key_binding("\e[9abc".bytes, 'x')
-    stroke = Reline::KeyStroke.new(config, encoding)
-    sequences = [
-      "\e[9abc",
-      "\e[9d",
-      "\e[A", # Up
-      "\e[1;1R", # Cursor position report
-      "\e[15~", # F5
-      "\eOP", # F1
-      "\e\e[A", # Option+Up
-      "\eX",
-      "\e\eX"
-    ]
-    sequences.each do |seq|
-      assert_equal(Reline::KeyStroke::MATCHED, stroke.match_status(seq.bytes))
-      assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status(seq.bytes + [32]))
-      (2...seq.size).each do |i|
-        assert_equal(Reline::KeyStroke::MATCHING, stroke.match_status(seq.bytes.take(i)))
-      end
-    end
-  end
-
-  def test_expand
-    config = Reline::Config.new
-    {
-      'abc' => 'AB',
-      'ab' => "1\C-a"
-    }.each_pair do |key, func|
-      config.add_default_key_binding(key.bytes, func.bytes)
-    end
-    stroke = Reline::KeyStroke.new(config, encoding)
-    assert_equal([[Reline::Key.new('A', :ed_insert, false), Reline::Key.new('B', :ed_insert, false)], 'de'.bytes], stroke.expand('abcde'.bytes))
-    assert_equal([[Reline::Key.new('1', :ed_digit, false), Reline::Key.new("\C-a", :ed_move_to_beg, false)], 'de'.bytes], stroke.expand('abde'.bytes))
-    # CSI sequence
-    assert_equal([[], 'bc'.bytes], stroke.expand("\e[1;2;3;4;5abc".bytes))
-    assert_equal([[], 'BC'.bytes], stroke.expand("\e\e[ABC".bytes))
-    # SS3 sequence
-    assert_equal([[], 'QR'.bytes], stroke.expand("\eOPQR".bytes))
-  end
-
-  def test_oneshot_key_bindings
-    config = Reline::Config.new
-    {
-      'abc'.bytes => '123',
-      # IRB version <= 1.13.1 wrongly uses Reline::Key with wrong argument. It should be ignored without error.
-      [Reline::Key.new(nil, 0xE4, true)] => '012',
-      "\eda".bytes => 'abc', # Alt+d a
-      [195, 164] => 'def'
-    }.each_pair do |key, func|
-      config.add_oneshot_key_binding(key, func.bytes)
-    end
-    stroke = Reline::KeyStroke.new(config, encoding)
-    assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status('zzz'.bytes))
-    assert_equal(Reline::KeyStroke::MATCHED, stroke.match_status('abc'.bytes))
-    assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status('da'.bytes))
-    assert_equal(Reline::KeyStroke::MATCHED, stroke.match_status("\eda".bytes))
-    assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status(" \eda".bytes))
-    assert_equal(Reline::KeyStroke::MATCHED, stroke.match_status([195, 164]))
-  end
-
-  def test_multibyte_matching
-    begin
-      char = 'あ'.encode(encoding)
-    rescue Encoding::UndefinedConversionError
-      omit
-    end
-    config = Reline::Config.new
-    stroke = Reline::KeyStroke.new(config, encoding)
-    key = Reline::Key.new(char, :ed_insert, false)
-    bytes = char.bytes
-    assert_equal(Reline::KeyStroke::MATCHED, stroke.match_status(bytes))
-    assert_equal([[key], []], stroke.expand(bytes))
-    assert_equal(Reline::KeyStroke::UNMATCHED, stroke.match_status(bytes * 2))
-    assert_equal([[key], bytes], stroke.expand(bytes * 2))
-    (1...bytes.size).each do |i|
-      partial_bytes = bytes.take(i)
-      assert_equal(Reline::KeyStroke::MATCHING_MATCHED, stroke.match_status(partial_bytes))
-      assert_equal([[], []], stroke.expand(partial_bytes))
-    end
-  end
-end
diff --git a/test/mri/reline/test_kill_ring.rb b/test/mri/reline/test_kill_ring.rb
deleted file mode 100644
index 9f6e0c3e74e..00000000000
--- a/test/mri/reline/test_kill_ring.rb
+++ /dev/null
@@ -1,268 +0,0 @@
-require_relative 'helper'
-
-class Reline::KillRing::Test < Reline::TestCase
-  def setup
-    @prompt = '> '
-    @kill_ring = Reline::KillRing.new
-  end
-
-  def test_append_one
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('a', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('a', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['a', 'a'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['a', 'a'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_two
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('b', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('b', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['a', 'b'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['b', 'a'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_three
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('c', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('c', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['b', 'c'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['a', 'b'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['c', 'a'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_three_with_max_two
-    @kill_ring = Reline::KillRing.new(2)
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('c', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('c', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['b', 'c'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['c', 'b'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['b', 'c'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_four_with_max_two
-    @kill_ring = Reline::KillRing.new(2)
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('d')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('d', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('d', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['c', 'd'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['d', 'c'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['c', 'd'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_after
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('ab', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('ab', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ab', 'ab'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ab', 'ab'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_before
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b', true)
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('ba', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('ba', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ba', 'ba'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ba', 'ba'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_chain_two
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('d')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('cd', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('cd', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ab', 'cd'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['cd', 'ab'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_complex_chain
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('d')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b', true)
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('e')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a', true)
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('A')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('B')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('AB', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('AB', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['abcde', 'AB'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['AB', 'abcde'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_enumerable
-    @kill_ring.append('a')
-    @kill_ring.process
-    @kill_ring.process
-    @kill_ring.append('b')
-    @kill_ring.process
-    @kill_ring.process
-    @kill_ring.append('c')
-    @kill_ring.process
-    assert_equal(%w{c b a}, @kill_ring.to_a)
-  end
-end
diff --git a/test/mri/reline/test_line_editor.rb b/test/mri/reline/test_line_editor.rb
deleted file mode 100644
index 28fcbfa6df8..00000000000
--- a/test/mri/reline/test_line_editor.rb
+++ /dev/null
@@ -1,271 +0,0 @@
-require_relative 'helper'
-require 'reline/line_editor'
-require 'stringio'
-
-class Reline::LineEditor
-
-  class CompletionBlockTest < Reline::TestCase
-    def setup
-      @original_quote_characters = Reline.completer_quote_characters
-      @original_word_break_characters = Reline.completer_word_break_characters
-      @line_editor = Reline::LineEditor.new(nil)
-    end
-
-    def retrieve_completion_block(lines, line_index, byte_pointer)
-      @line_editor.instance_variable_set(:@buffer_of_lines, lines)
-      @line_editor.instance_variable_set(:@line_index, line_index)
-      @line_editor.instance_variable_set(:@byte_pointer, byte_pointer)
-      @line_editor.retrieve_completion_block
-    end
-
-    def retrieve_completion_quote(line)
-      _, _, _, quote = retrieve_completion_block([line], 0, line.bytesize)
-      quote
-    end
-
-    def teardown
-      Reline.completer_quote_characters = @original_quote_characters
-      Reline.completer_word_break_characters = @original_word_break_characters
-    end
-
-    def test_retrieve_completion_block
-      Reline.completer_word_break_characters = ' ([{'
-      Reline.completer_quote_characters = ''
-      assert_equal(['', '', 'foo', nil], retrieve_completion_block(['foo'], 0, 0))
-      assert_equal(['', 'f', 'oo', nil], retrieve_completion_block(['foo'], 0, 1))
-      assert_equal(['foo ', 'ba', 'r baz', nil], retrieve_completion_block(['foo bar baz'], 0, 6))
-      assert_equal(['foo([', 'b', 'ar])baz', nil], retrieve_completion_block(['foo([bar])baz'], 0, 6))
-      assert_equal(['foo([{', '', '}])baz', nil], retrieve_completion_block(['foo([{}])baz'], 0, 6))
-      assert_equal(["abc\nfoo ", 'ba', "r baz\ndef", nil], retrieve_completion_block(['abc', 'foo bar baz', 'def'], 1, 6))
-    end
-
-    def test_retrieve_completion_block_with_quote_characters
-      Reline.completer_word_break_characters = ' ([{'
-      Reline.completer_quote_characters = ''
-      assert_equal(['"" ', '"wo', 'rd', nil], retrieve_completion_block(['"" "word'], 0, 6))
-      Reline.completer_quote_characters = '"'
-      assert_equal(['"" "', 'wo', 'rd', nil], retrieve_completion_block(['"" "word'], 0, 6))
-    end
-
-    def test_retrieve_completion_quote
-      Reline.completer_quote_characters = '"\''
-      assert_equal('"', retrieve_completion_quote('"\''))
-      assert_equal(nil, retrieve_completion_quote('""'))
-      assert_equal("'", retrieve_completion_quote('""\'"'))
-      assert_equal(nil, retrieve_completion_quote('""\'\''))
-      assert_equal('"', retrieve_completion_quote('"\\"'))
-      assert_equal(nil, retrieve_completion_quote('"\\""'))
-      assert_equal(nil, retrieve_completion_quote('"\\\\"'))
-    end
-  end
-
-  class CursorPositionTest < Reline::TestCase
-    def setup
-      @line_editor = Reline::LineEditor.new(nil)
-      @line_editor.instance_variable_set(:@config, Reline::Config.new)
-    end
-
-    def test_cursor_position_with_escaped_input
-      @line_editor.instance_variable_set(:@screen_size, [4, 16])
-      @line_editor.instance_variable_set(:@prompt, "\e[1mprompt\e[0m> ")
-      @line_editor.instance_variable_set(:@buffer_of_lines, ["\e[1m\0\1\2\3\4\5\6\7abcd"])
-      @line_editor.instance_variable_set(:@line_index, 0)
-      # prompt> ^[[1m^@^
-      # A^B^C^D^E^F^Gabc
-      # d
-      @line_editor.instance_variable_set(:@byte_pointer, 0)
-      assert_equal [8, 0], @line_editor.wrapped_cursor_position
-      @line_editor.instance_variable_set(:@byte_pointer, 5)
-      assert_equal [15, 0], @line_editor.wrapped_cursor_position
-      @line_editor.instance_variable_set(:@byte_pointer, 6)
-      assert_equal [1, 1], @line_editor.wrapped_cursor_position
-      @line_editor.instance_variable_set(:@byte_pointer, 14)
-      assert_equal [15, 1], @line_editor.wrapped_cursor_position
-      @line_editor.instance_variable_set(:@byte_pointer, 15)
-      assert_equal [0, 2], @line_editor.wrapped_cursor_position
-      @line_editor.instance_variable_set(:@byte_pointer, 16)
-      assert_equal [1, 2], @line_editor.wrapped_cursor_position
-    end
-  end
-
-  class RenderLineDifferentialTest < Reline::TestCase
-    class TestIO < Reline::IO
-      def write(string)
-        @output << string
-      end
-
-      def move_cursor_column(col)
-        @output << "[COL_#{col}]"
-      end
-
-      def erase_after_cursor
-        @output << '[ERASE]'
-      end
-    end
-
-    def setup
-      verbose, $VERBOSE = $VERBOSE, nil
-      @line_editor = Reline::LineEditor.new(nil)
-      @original_iogate = Reline::IOGate
-      @output = StringIO.new
-      @line_editor.instance_variable_set(:@screen_size, [24, 80])
-      Reline.send(:remove_const, :IOGate)
-      Reline.const_set(:IOGate, TestIO.new)
-      Reline::IOGate.instance_variable_set(:@output, @output)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def assert_output(expected)
-      @output.reopen(+'')
-      yield
-      actual = @output.string
-      assert_equal(expected, actual.gsub("\e[0m", ''))
-    end
-
-    def teardown
-      Reline.send(:remove_const, :IOGate)
-      Reline.const_set(:IOGate, @original_iogate)
-    end
-
-    def test_line_increase_decrease
-      assert_output '[COL_0]bb' do
-        @line_editor.render_line_differential([[0, 1, 'a']], [[0, 2, 'bb']])
-      end
-
-      assert_output '[COL_0]b[COL_1][ERASE]' do
-        @line_editor.render_line_differential([[0, 2, 'aa']], [[0, 1, 'b']])
-      end
-    end
-
-    def test_dialog_appear_disappear
-      assert_output '[COL_3]dialog' do
-        @line_editor.render_line_differential([[0, 1, 'a']], [[0, 1, 'a'], [3, 6, 'dialog']])
-      end
-
-      assert_output '[COL_3]dialog' do
-        @line_editor.render_line_differential([[0, 10, 'a' * 10]], [[0, 10, 'a' * 10], [3, 6, 'dialog']])
-      end
-
-      assert_output '[COL_1][ERASE]' do
-        @line_editor.render_line_differential([[0, 1, 'a'], [3, 6, 'dialog']], [[0, 1, 'a']])
-      end
-
-      assert_output '[COL_3]aaaaaa' do
-        @line_editor.render_line_differential([[0, 10, 'a' * 10], [3, 6, 'dialog']], [[0, 10, 'a' * 10]])
-      end
-    end
-
-    def test_dialog_change
-      assert_output '[COL_3]DIALOG' do
-        @line_editor.render_line_differential([[0, 2, 'a'], [3, 6, 'dialog']], [[0, 2, 'a'], [3, 6, 'DIALOG']])
-      end
-
-      assert_output '[COL_3]DIALOG' do
-        @line_editor.render_line_differential([[0, 10, 'a' * 10], [3, 6, 'dialog']], [[0, 10, 'a' * 10], [3, 6, 'DIALOG']])
-      end
-    end
-
-    def test_update_under_dialog
-      assert_output '[COL_0]b[COL_1] ' do
-        @line_editor.render_line_differential([[0, 2, 'aa'], [4, 6, 'dialog']], [[0, 1, 'b'], [4, 6, 'dialog']])
-      end
-
-      assert_output '[COL_0]bbb[COL_9]b' do
-        @line_editor.render_line_differential([[0, 10, 'a' * 10], [3, 6, 'dialog']], [[0, 10, 'b' * 10], [3, 6, 'dialog']])
-      end
-
-      assert_output '[COL_0]b[COL_1]  [COL_9][ERASE]' do
-        @line_editor.render_line_differential([[0, 10, 'a' * 10], [3, 6, 'dialog']], [[0, 1, 'b'], [3, 6, 'dialog']])
-      end
-    end
-
-    def test_dialog_move
-      assert_output '[COL_3]dialog[COL_9][ERASE]' do
-        @line_editor.render_line_differential([[0, 1, 'a'], [4, 6, 'dialog']], [[0, 1, 'a'], [3, 6, 'dialog']])
-      end
-
-      assert_output '[COL_4] [COL_5]dialog' do
-        @line_editor.render_line_differential([[0, 1, 'a'], [4, 6, 'dialog']], [[0, 1, 'a'], [5, 6, 'dialog']])
-      end
-
-      assert_output '[COL_2]dialog[COL_8]a' do
-        @line_editor.render_line_differential([[0, 10, 'a' * 10], [3, 6, 'dialog']], [[0, 10, 'a' * 10], [2, 6, 'dialog']])
-      end
-
-      assert_output '[COL_2]a[COL_3]dialog' do
-        @line_editor.render_line_differential([[0, 10, 'a' * 10], [2, 6, 'dialog']], [[0, 10, 'a' * 10], [3, 6, 'dialog']])
-      end
-    end
-
-    def test_multibyte
-      base = [0, 12, '一二三一二三']
-      left = [0, 3, 'LLL']
-      right = [9, 3, 'RRR']
-      front = [3, 6, 'FFFFFF']
-      # 一 FFFFFF 三
-      # 一二三一二三
-      assert_output '[COL_2]二三一二' do
-        @line_editor.render_line_differential([base, front], [base, nil])
-      end
-
-      # LLLFFFFFF 三
-      # LLL 三一二三
-      assert_output '[COL_3] 三一二' do
-        @line_editor.render_line_differential([base, left, front], [base, left, nil])
-      end
-
-      # 一 FFFFFFRRR
-      # 一二三一 RRR
-      assert_output '[COL_2]二三一 ' do
-        @line_editor.render_line_differential([base, right, front], [base, right, nil])
-      end
-
-      # LLLFFFFFFRRR
-      # LLL 三一 RRR
-      assert_output '[COL_3] 三一 ' do
-        @line_editor.render_line_differential([base, left, right, front], [base, left, right, nil])
-      end
-    end
-
-    def test_complicated
-      state_a = [nil, [19, 7, 'bbbbbbb'], [15, 8, 'cccccccc'], [10, 5, 'ddddd'], [18, 4, 'eeee'], [1, 3, 'fff'], [17, 2, 'gg'], [7, 1, 'h']]
-      state_b = [[5, 9, 'aaaaaaaaa'], nil, [15, 8, 'cccccccc'], nil, [18, 4, 'EEEE'], [25, 4, 'ffff'], [17, 2, 'gg'], [2, 2, 'hh']]
-      # state_a: " fff   h  dddddccggeeecbbb"
-      # state_b: "  hh aaaaaaaaa ccggEEEc  ffff"
-
-      assert_output '[COL_1] [COL_2]hh[COL_5]aaaaaaaaa[COL_14] [COL_19]EEE[COL_23]  [COL_25]ffff' do
-        @line_editor.render_line_differential(state_a, state_b)
-      end
-
-      assert_output '[COL_1]fff[COL_5]  [COL_7]h[COL_8]  [COL_10]ddddd[COL_19]eee[COL_23]bbb[COL_26][ERASE]' do
-        @line_editor.render_line_differential(state_b, state_a)
-      end
-    end
-  end
-
-  def test_menu_info_format
-    list = %w[aa b c d e f g hhh i j k]
-    col3 = [
-      'aa   e    i',
-      'b    f    j',
-      'c    g    k',
-      'd    hhh'
-    ]
-    col2 = [
-      'aa   g',
-      'b    hhh',
-      'c    i',
-      'd    j',
-      'e    k',
-      'f'
-    ]
-    assert_equal(col3, Reline::LineEditor::MenuInfo.new(list).lines(19))
-    assert_equal(col3, Reline::LineEditor::MenuInfo.new(list).lines(15))
-    assert_equal(col2, Reline::LineEditor::MenuInfo.new(list).lines(14))
-    assert_equal(col2, Reline::LineEditor::MenuInfo.new(list).lines(10))
-    assert_equal(list, Reline::LineEditor::MenuInfo.new(list).lines(9))
-    assert_equal(list, Reline::LineEditor::MenuInfo.new(list).lines(0))
-    assert_equal([], Reline::LineEditor::MenuInfo.new([]).lines(10))
-  end
-end
diff --git a/test/mri/reline/test_macro.rb b/test/mri/reline/test_macro.rb
deleted file mode 100644
index cacdb76c603..00000000000
--- a/test/mri/reline/test_macro.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require_relative 'helper'
-
-class Reline::MacroTest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @config = Reline::Config.new
-    @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config)
-    @output = Reline::IOGate.output = File.open(IO::NULL, "w")
-  end
-
-  def teardown
-    @output.close
-    Reline.test_reset
-  end
-
-  def input_key(char, method_symbol = :ed_insert)
-    @line_editor.input_key(Reline::Key.new(char, method_symbol, false))
-  end
-
-  def input(str)
-    str.each_char {|c| input_key(c)}
-  end
-
-  def test_simple_input
-    input('abc')
-    assert_equal 'abc', @line_editor.line
-  end
-
-  def test_alias
-    class << @line_editor
-      alias delete_char ed_delete_prev_char
-    end
-    input('abc')
-    assert_nothing_raised(ArgumentError) {
-      input_key('x', :delete_char)
-    }
-    assert_equal 'ab', @line_editor.line
-  end
-end
diff --git a/test/mri/reline/test_reline.rb b/test/mri/reline/test_reline.rb
deleted file mode 100644
index 0a4f38986b0..00000000000
--- a/test/mri/reline/test_reline.rb
+++ /dev/null
@@ -1,487 +0,0 @@
-require_relative 'helper'
-require 'reline'
-require 'stringio'
-begin
-  require "pty"
-rescue LoadError # some platforms don't support PTY
-end
-
-class Reline::Test < Reline::TestCase
-  class DummyCallbackObject
-    def call; end
-  end
-
-  def setup
-    Reline.send(:test_mode)
-    Reline.output_modifier_proc = nil
-    Reline.completion_proc = nil
-    Reline.prompt_proc = nil
-    Reline.auto_indent_proc = nil
-    Reline.pre_input_hook = nil
-    Reline.dig_perfect_match_proc = nil
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_completion_append_character
-    completion_append_character = Reline.completion_append_character
-
-    assert_equal(nil, Reline.completion_append_character)
-
-    Reline.completion_append_character = ""
-    assert_equal(nil, Reline.completion_append_character)
-
-    Reline.completion_append_character = "a".encode(Encoding::ASCII)
-    assert_equal("a", Reline.completion_append_character)
-    assert_equal(get_reline_encoding, Reline.completion_append_character.encoding)
-
-    Reline.completion_append_character = "ba".encode(Encoding::ASCII)
-    assert_equal("b", Reline.completion_append_character)
-    assert_equal(get_reline_encoding, Reline.completion_append_character.encoding)
-
-    Reline.completion_append_character = "cba".encode(Encoding::ASCII)
-    assert_equal("c", Reline.completion_append_character)
-    assert_equal(get_reline_encoding, Reline.completion_append_character.encoding)
-
-    Reline.completion_append_character = nil
-    assert_equal(nil, Reline.completion_append_character)
-  ensure
-    Reline.completion_append_character = completion_append_character
-  end
-
-  def test_basic_word_break_characters
-    basic_word_break_characters = Reline.basic_word_break_characters
-
-    assert_equal(" \t\n`><=;|&{(", Reline.basic_word_break_characters)
-
-    Reline.basic_word_break_characters = "[".encode(Encoding::ASCII)
-    assert_equal("[", Reline.basic_word_break_characters)
-    assert_equal(get_reline_encoding, Reline.basic_word_break_characters.encoding)
-  ensure
-    Reline.basic_word_break_characters = basic_word_break_characters
-  end
-
-  def test_completer_word_break_characters
-    completer_word_break_characters = Reline.completer_word_break_characters
-
-    assert_equal(" \t\n`><=;|&{(", Reline.completer_word_break_characters)
-
-    Reline.completer_word_break_characters = "[".encode(Encoding::ASCII)
-    assert_equal("[", Reline.completer_word_break_characters)
-    assert_equal(get_reline_encoding, Reline.completer_word_break_characters.encoding)
-
-    assert_nothing_raised { Reline.completer_word_break_characters = '' }
-  ensure
-    Reline.completer_word_break_characters = completer_word_break_characters
-  end
-
-  def test_basic_quote_characters
-    basic_quote_characters = Reline.basic_quote_characters
-
-    assert_equal('"\'', Reline.basic_quote_characters)
-
-    Reline.basic_quote_characters = "`".encode(Encoding::ASCII)
-    assert_equal("`", Reline.basic_quote_characters)
-    assert_equal(get_reline_encoding, Reline.basic_quote_characters.encoding)
-  ensure
-    Reline.basic_quote_characters = basic_quote_characters
-  end
-
-  def test_completer_quote_characters
-    completer_quote_characters = Reline.completer_quote_characters
-
-    assert_equal('"\'', Reline.completer_quote_characters)
-
-    Reline.completer_quote_characters = "`".encode(Encoding::ASCII)
-    assert_equal("`", Reline.completer_quote_characters)
-    assert_equal(get_reline_encoding, Reline.completer_quote_characters.encoding)
-
-    assert_nothing_raised { Reline.completer_quote_characters = '' }
-  ensure
-    Reline.completer_quote_characters = completer_quote_characters
-  end
-
-  def test_filename_quote_characters
-    filename_quote_characters = Reline.filename_quote_characters
-
-    assert_equal('', Reline.filename_quote_characters)
-
-    Reline.filename_quote_characters = "\'".encode(Encoding::ASCII)
-    assert_equal("\'", Reline.filename_quote_characters)
-    assert_equal(get_reline_encoding, Reline.filename_quote_characters.encoding)
-  ensure
-    Reline.filename_quote_characters = filename_quote_characters
-  end
-
-  def test_special_prefixes
-    special_prefixes = Reline.special_prefixes
-
-    assert_equal('', Reline.special_prefixes)
-
-    Reline.special_prefixes = "\'".encode(Encoding::ASCII)
-    assert_equal("\'", Reline.special_prefixes)
-    assert_equal(get_reline_encoding, Reline.special_prefixes.encoding)
-  ensure
-    Reline.special_prefixes = special_prefixes
-  end
-
-  def test_completion_case_fold
-    completion_case_fold = Reline.completion_case_fold
-
-    assert_equal(nil, Reline.completion_case_fold)
-
-    Reline.completion_case_fold = true
-    assert_equal(true, Reline.completion_case_fold)
-
-    Reline.completion_case_fold = "hoge".encode(Encoding::ASCII)
-    assert_equal("hoge", Reline.completion_case_fold)
-  ensure
-    Reline.completion_case_fold = completion_case_fold
-  end
-
-  def test_completion_proc
-    omit unless Reline.completion_proc == nil
-    # Another test can set Reline.completion_proc
-
-    # assert_equal(nil, Reline.completion_proc)
-
-    dummy_proc = proc {}
-    Reline.completion_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.completion_proc)
-
-    l = lambda {}
-    Reline.completion_proc = l
-    assert_equal(l, Reline.completion_proc)
-
-    assert_raise(ArgumentError) { Reline.completion_proc = 42 }
-    assert_raise(ArgumentError) { Reline.completion_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.completion_proc = dummy
-    assert_equal(dummy, Reline.completion_proc)
-  end
-
-  def test_output_modifier_proc
-    assert_equal(nil, Reline.output_modifier_proc)
-
-    dummy_proc = proc {}
-    Reline.output_modifier_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.output_modifier_proc)
-
-    l = lambda {}
-    Reline.output_modifier_proc = l
-    assert_equal(l, Reline.output_modifier_proc)
-
-    assert_raise(ArgumentError) { Reline.output_modifier_proc = 42 }
-    assert_raise(ArgumentError) { Reline.output_modifier_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.output_modifier_proc = dummy
-    assert_equal(dummy, Reline.output_modifier_proc)
-  end
-
-  def test_prompt_proc
-    assert_equal(nil, Reline.prompt_proc)
-
-    dummy_proc = proc {}
-    Reline.prompt_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.prompt_proc)
-
-    l = lambda {}
-    Reline.prompt_proc = l
-    assert_equal(l, Reline.prompt_proc)
-
-    assert_raise(ArgumentError) { Reline.prompt_proc = 42 }
-    assert_raise(ArgumentError) { Reline.prompt_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.prompt_proc = dummy
-    assert_equal(dummy, Reline.prompt_proc)
-  end
-
-  def test_auto_indent_proc
-    assert_equal(nil, Reline.auto_indent_proc)
-
-    dummy_proc = proc {}
-    Reline.auto_indent_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.auto_indent_proc)
-
-    l = lambda {}
-    Reline.auto_indent_proc = l
-    assert_equal(l, Reline.auto_indent_proc)
-
-    assert_raise(ArgumentError) { Reline.auto_indent_proc = 42 }
-    assert_raise(ArgumentError) { Reline.auto_indent_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.auto_indent_proc = dummy
-    assert_equal(dummy, Reline.auto_indent_proc)
-  end
-
-  def test_pre_input_hook
-    assert_equal(nil, Reline.pre_input_hook)
-
-    dummy_proc = proc {}
-    Reline.pre_input_hook = dummy_proc
-    assert_equal(dummy_proc, Reline.pre_input_hook)
-
-    l = lambda {}
-    Reline.pre_input_hook = l
-    assert_equal(l, Reline.pre_input_hook)
-  end
-
-  def test_dig_perfect_match_proc
-    assert_equal(nil, Reline.dig_perfect_match_proc)
-
-    dummy_proc = proc {}
-    Reline.dig_perfect_match_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.dig_perfect_match_proc)
-
-    l = lambda {}
-    Reline.dig_perfect_match_proc = l
-    assert_equal(l, Reline.dig_perfect_match_proc)
-
-    assert_raise(ArgumentError) { Reline.dig_perfect_match_proc = 42 }
-    assert_raise(ArgumentError) { Reline.dig_perfect_match_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.dig_perfect_match_proc = dummy
-    assert_equal(dummy, Reline.dig_perfect_match_proc)
-  end
-
-  def test_insert_text
-    assert_equal('', Reline.line_buffer)
-    assert_equal(0, Reline.point)
-    Reline.insert_text('abc')
-    assert_equal('abc', Reline.line_buffer)
-    assert_equal(3, Reline.point)
-  end
-
-  def test_delete_text
-    assert_equal('', Reline.line_buffer)
-    assert_equal(0, Reline.point)
-    Reline.insert_text('abc')
-    assert_equal('abc', Reline.line_buffer)
-    assert_equal(3, Reline.point)
-    Reline.delete_text()
-    assert_equal('', Reline.line_buffer)
-    assert_equal(0, Reline.point)
-    Reline.insert_text('abc')
-    Reline.delete_text(1)
-    assert_equal('a', Reline.line_buffer)
-    assert_equal(1, Reline.point)
-    Reline.insert_text('defghi')
-    Reline.delete_text(2, 2)
-    assert_equal('adghi', Reline.line_buffer)
-    assert_equal(5, Reline.point)
-  end
-
-  def test_set_input_and_output
-    assert_raise(TypeError) do
-      Reline.input = "This is not a file."
-    end
-    assert_raise(TypeError) do
-      Reline.output = "This is not a file."
-    end
-
-    input, to_write = IO.pipe
-    to_read, output = IO.pipe
-    unless Reline.__send__(:input=, input)
-      omit "Setting to input is not effective on #{Reline.core.io_gate}"
-    end
-    Reline.output = output
-
-    to_write.write "a\n"
-    result = Reline.readline
-    to_write.close
-    read_text = to_read.read_nonblock(100)
-    assert_equal('a', result)
-    refute(read_text.empty?)
-  ensure
-    input&.close
-    output&.close
-    to_read&.close
-  end
-
-  def test_vi_editing_mode
-    Reline.vi_editing_mode
-    assert_equal(:vi_insert, Reline.core.config.instance_variable_get(:@editing_mode_label))
-  end
-
-  def test_emacs_editing_mode
-    Reline.emacs_editing_mode
-    assert_equal(:emacs, Reline.core.config.instance_variable_get(:@editing_mode_label))
-  end
-
-  def test_add_dialog_proc
-    dummy_proc = proc {}
-    Reline.add_dialog_proc(:test_proc, dummy_proc)
-    d = Reline.dialog_proc(:test_proc)
-    assert_equal(dummy_proc, d.dialog_proc)
-
-    dummy_proc_2 = proc {}
-    Reline.add_dialog_proc(:test_proc, dummy_proc_2)
-    d = Reline.dialog_proc(:test_proc)
-    assert_equal(dummy_proc_2, d.dialog_proc)
-
-    Reline.add_dialog_proc(:test_proc, nil)
-    assert_nil(Reline.dialog_proc(:test_proc))
-
-    l = lambda {}
-    Reline.add_dialog_proc(:test_lambda, l)
-    d = Reline.dialog_proc(:test_lambda)
-    assert_equal(l, d.dialog_proc)
-
-    assert_equal(nil, Reline.dialog_proc(:test_nothing))
-
-    assert_raise(ArgumentError) { Reline.add_dialog_proc(:error, 42) }
-    assert_raise(ArgumentError) { Reline.add_dialog_proc(:error, 'hoge') }
-    assert_raise(ArgumentError) { Reline.add_dialog_proc('error', proc {} ) }
-
-    dummy = DummyCallbackObject.new
-    Reline.add_dialog_proc(:dummy, dummy)
-    d = Reline.dialog_proc(:dummy)
-    assert_equal(dummy, d.dialog_proc)
-  end
-
-  def test_add_dialog_proc_with_context
-    dummy_proc = proc {}
-    array = Array.new
-    Reline.add_dialog_proc(:test_proc, dummy_proc, array)
-    d = Reline.dialog_proc(:test_proc)
-    assert_equal(dummy_proc, d.dialog_proc)
-    assert_equal(array, d.context)
-
-    Reline.add_dialog_proc(:test_proc, dummy_proc, nil)
-    d = Reline.dialog_proc(:test_proc)
-    assert_equal(dummy_proc, d.dialog_proc)
-    assert_equal(nil, d.context)
-  end
-
-  def test_readmultiline
-    # readmultiline is module function
-    assert_include(Reline.methods, :readmultiline)
-    assert_include(Reline.private_instance_methods, :readmultiline)
-  end
-
-  def test_readline
-    # readline is module function
-    assert_include(Reline.methods, :readline)
-    assert_include(Reline.private_instance_methods, :readline)
-  end
-
-  def test_read_io
-    # TODO in Reline::Core
-  end
-
-  def test_dumb_terminal
-    lib = File.expand_path("../../lib", __dir__)
-    out = IO.popen([{"TERM"=>"dumb"}, Reline.test_rubybin, "-I#{lib}", "-rreline", "-e", "p Reline.core.io_gate"], &:read)
-    assert_match(/#<Reline::Dumb/, out.chomp)
-  end
-
-  def test_print_prompt_before_everything_else
-    pend if win?
-    lib = File.expand_path("../../lib", __dir__)
-    code = "p Reline::IOGate.class; p Reline.readline 'prompt> '"
-    out = IO.popen([Reline.test_rubybin, "-I#{lib}", "-rreline", "-e", code], "r+") do |io|
-      io.write "abc\n"
-      io.close_write
-      io.read
-    end
-    assert_match(/\AReline::ANSI\nprompt> /, out)
-  end
-
-  def test_read_eof_returns_input
-    pend if win?
-    lib = File.expand_path("../../lib", __dir__)
-    code = "p result: Reline.readline"
-    out = IO.popen([Reline.test_rubybin, "-I#{lib}", "-rreline", "-e", code], "r+") do |io|
-      io.write "a\C-a"
-      io.close_write
-      io.read
-    end
-    assert_include(out, { result: 'a' }.inspect)
-  end
-
-  def test_read_eof_returns_nil_if_empty
-    pend if win?
-    lib = File.expand_path("../../lib", __dir__)
-    code = "p result: Reline.readline"
-    out = IO.popen([Reline.test_rubybin, "-I#{lib}", "-rreline", "-e", code], "r+") do |io|
-      io.write "a\C-h"
-      io.close_write
-      io.read
-    end
-    assert_include(out, { result: nil }.inspect)
-  end
-
-  def test_require_reline_should_not_trigger_winsize
-    pend if win?
-    lib = File.expand_path("../../lib", __dir__)
-    code = <<~RUBY
-      require "io/console"
-      def STDIN.tty?; true; end
-      def STDOUT.tty?; true; end
-      def STDIN.winsize; raise; end
-      require("reline") && p(Reline.core.io_gate)
-    RUBY
-    out = IO.popen([{}, Reline.test_rubybin, "-I#{lib}", "-e", code], &:read)
-    assert_include(out.chomp, "Reline::ANSI")
-  end
-
-  def win?
-    /mswin|mingw/.match?(RUBY_PLATFORM)
-  end
-
-  def test_tty_amibuous_width
-    omit unless defined?(PTY)
-    ruby_file = Tempfile.create('rubyfile')
-    ruby_file.write(<<~RUBY)
-      require 'reline'
-      Thread.new { sleep 2; puts 'timeout'; exit }
-      p [Reline.ambiguous_width, gets.chomp]
-    RUBY
-    ruby_file.close
-    lib = File.expand_path('../../lib', __dir__)
-    cmd = [{ 'TERM' => 'xterm' }, 'ruby', '-I', lib, ruby_file.to_path]
-
-    # Calculate ambiguous width from cursor position
-    [1, 2].each do |ambiguous_width|
-      PTY.spawn(*cmd) do |r, w, pid|
-        loop { break if r.readpartial(1024).include?("\e[6n") }
-        w.puts "hello\e[10;#{ambiguous_width + 1}Rworld"
-        assert_include(r.gets, [ambiguous_width, 'helloworld'].inspect)
-      ensure
-        r.close
-        w.close
-        Process.waitpid pid
-      end
-    end
-
-    # Ambiguous width = 1 when cursor pos timed out
-    PTY.spawn(*cmd) do |r, w, pid|
-      loop { break if r.readpartial(1024).include?("\e[6n") }
-      w.puts "hello\e[10;2Sworld"
-      assert_include(r.gets, [1, "hello\e[10;2Sworld"].inspect)
-    ensure
-      r.close
-      w.close
-      Process.waitpid pid
-    end
-  ensure
-    File.delete(ruby_file.path) if ruby_file
-  end
-
-  def get_reline_encoding
-    if encoding = Reline.core.encoding
-      encoding
-    elsif win?
-      Encoding::UTF_8
-    else
-      Encoding::default_external
-    end
-  end
-end
diff --git a/test/mri/reline/test_reline_key.rb b/test/mri/reline/test_reline_key.rb
deleted file mode 100644
index b6260d57d6f..00000000000
--- a/test/mri/reline/test_reline_key.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_relative 'helper'
-require "reline"
-
-class Reline::TestKey < Reline::TestCase
-  def test_match_symbol
-    assert(Reline::Key.new('a', :key1, false).match?(:key1))
-    refute(Reline::Key.new('a', :key1, false).match?(:key2))
-    refute(Reline::Key.new('a', :key1, false).match?(nil))
-  end
-end
diff --git a/test/mri/reline/test_string_processing.rb b/test/mri/reline/test_string_processing.rb
deleted file mode 100644
index a105be9abad..00000000000
--- a/test/mri/reline/test_string_processing.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require_relative 'helper'
-
-class Reline::LineEditor::StringProcessingTest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @prompt = '> '
-    @config = Reline::Config.new
-    Reline::HISTORY.instance_variable_set(:@config, @config)
-    @line_editor = Reline::LineEditor.new(@config)
-    @line_editor.reset(@prompt)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_calculate_width
-    width = @line_editor.send(:calculate_width, 'Ruby string')
-    assert_equal('Ruby string'.size, width)
-  end
-
-  def test_calculate_width_with_escape_sequence
-    width = @line_editor.send(:calculate_width, "\1\e[31m\2RubyColor\1\e[34m\2 default string \1\e[m\2>", true)
-    assert_equal('RubyColor default string >'.size, width)
-  end
-
-  def test_completion_proc_with_preposing_and_postposing
-    buf = ['def hoge', '  puts :aaa', 'end']
-
-    @line_editor.instance_variable_set(:@is_multiline, true)
-    @line_editor.instance_variable_set(:@buffer_of_lines, buf)
-    @line_editor.instance_variable_set(:@byte_pointer, 6)
-    @line_editor.instance_variable_set(:@line_index, 1)
-    completion_proc_called = false
-    @line_editor.instance_variable_set(:@completion_proc, proc { |target, pre, post|
-      assert_equal('puts', target)
-      assert_equal("def hoge\n  ", pre)
-      assert_equal(" :aaa\nend", post)
-      completion_proc_called = true
-    })
-
-    assert_equal(["def hoge\n  ", 'puts', " :aaa\nend", nil], @line_editor.retrieve_completion_block)
-    @line_editor.__send__(:call_completion_proc, "def hoge\n  ", 'puts', " :aaa\nend", nil)
-    assert(completion_proc_called)
-  end
-end
diff --git a/test/mri/reline/test_unicode.rb b/test/mri/reline/test_unicode.rb
deleted file mode 100644
index 0778306c323..00000000000
--- a/test/mri/reline/test_unicode.rb
+++ /dev/null
@@ -1,286 +0,0 @@
-require_relative 'helper'
-require "reline/unicode"
-
-class Reline::Unicode::Test < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_get_mbchar_width
-    assert_equal Reline.ambiguous_width, Reline::Unicode.get_mbchar_width('é')
-  end
-
-  def test_ambiguous_width
-    assert_equal 1, Reline::Unicode.calculate_width('√', true)
-  end
-
-  def test_csi_regexp
-    csi_sequences = ["\e[m", "\e[1m", "\e[12;34m", "\e[12;34H"]
-    assert_equal(csi_sequences, "text#{csi_sequences.join('text')}text".scan(Reline::Unicode::CSI_REGEXP))
-  end
-
-  def test_osc_regexp
-    osc_sequences = ["\e]1\a", "\e]0;OSC\a", "\e]1\e\\", "\e]0;OSC\e\\"]
-    separator = "text\atext"
-    assert_equal(osc_sequences, "#{separator}#{osc_sequences.join(separator)}#{separator}".scan(Reline::Unicode::OSC_REGEXP))
-  end
-
-  def test_split_by_width
-    # IRB uses this method.
-    assert_equal [['abc', 'de'], 2], Reline::Unicode.split_by_width('abcde', 3)
-  end
-
-  def test_split_line_by_width
-    assert_equal ['abc', 'de'], Reline::Unicode.split_line_by_width('abcde', 3)
-    assert_equal ['abc', 'def', ''], Reline::Unicode.split_line_by_width('abcdef', 3)
-    assert_equal ['ab', 'あd', 'ef'], Reline::Unicode.split_line_by_width('abあdef', 3)
-    assert_equal ['ab[zero]c', 'def', ''], Reline::Unicode.split_line_by_width("ab\1[zero]\2cdef", 3)
-    assert_equal ["\e[31mabc", "\e[31md\e[42mef", "\e[31m\e[42mg"], Reline::Unicode.split_line_by_width("\e[31mabcd\e[42mefg", 3)
-    assert_equal ["ab\e]0;1\ac", "\e]0;1\ad"], Reline::Unicode.split_line_by_width("ab\e]0;1\acd", 3)
-  end
-
-  def test_split_line_by_width_csi_reset_sgr_optimization
-    assert_equal ["\e[1ma\e[mb\e[2mc", "\e[2md\e[0me\e[3mf", "\e[3mg"], Reline::Unicode.split_line_by_width("\e[1ma\e[mb\e[2mcd\e[0me\e[3mfg", 3)
-    assert_equal ["\e[1ma\e[mzero\e[0m\e[2mb", "\e[1m\e[2mc"], Reline::Unicode.split_line_by_width("\e[1ma\1\e[mzero\e[0m\2\e[2mbc", 2)
-  end
-
-  def test_take_range
-    assert_equal 'cdef', Reline::Unicode.take_range('abcdefghi', 2, 4)
-    assert_equal 'あde', Reline::Unicode.take_range('abあdef', 2, 4)
-    assert_equal '[zero]cdef', Reline::Unicode.take_range("ab\1[zero]\2cdef", 2, 4)
-    assert_equal 'b[zero]cde', Reline::Unicode.take_range("ab\1[zero]\2cdef", 1, 4)
-    assert_equal "\e[31mcd\e[42mef", Reline::Unicode.take_range("\e[31mabcd\e[42mefg", 2, 4)
-    assert_equal "\e]0;1\acd", Reline::Unicode.take_range("ab\e]0;1\acd", 2, 3)
-    assert_equal 'いう', Reline::Unicode.take_range('あいうえお', 2, 4)
-  end
-
-  def test_nonprinting_start_end
-    # \1 and \2 should be removed
-    assert_equal 'ab[zero]cd', Reline::Unicode.take_range("ab\1[zero]\2cdef", 0, 4)
-    assert_equal ['ab[zero]cd', 'ef'], Reline::Unicode.split_line_by_width("ab\1[zero]\2cdef", 4)
-    # CSI between \1 and \2 does not need to be applied to the sebsequent line
-    assert_equal ["\e[31mab\e[32mcd", "\e[31mef"], Reline::Unicode.split_line_by_width("\e[31mab\1\e[32m\2cdef", 4)
-  end
-
-  def test_strip_non_printing_start_end
-    assert_equal "ab[zero]cd[ze\1ro]ef[zero]", Reline::Unicode.strip_non_printing_start_end("ab\1[zero]\2cd\1[ze\1ro]\2ef\1[zero]")
-  end
-
-  def test_calculate_width
-    assert_equal 9, Reline::Unicode.calculate_width('abcdefghi')
-    assert_equal 9, Reline::Unicode.calculate_width('abcdefghi', true)
-    assert_equal 7, Reline::Unicode.calculate_width('abあdef')
-    assert_equal 7, Reline::Unicode.calculate_width('abあdef', true)
-    assert_equal 16, Reline::Unicode.calculate_width("ab\1[zero]\2cdef")
-    assert_equal 6, Reline::Unicode.calculate_width("ab\1[zero]\2cdef", true)
-    assert_equal 19, Reline::Unicode.calculate_width("\e[31mabcd\e[42mefg")
-    assert_equal 7, Reline::Unicode.calculate_width("\e[31mabcd\e[42mefg", true)
-    assert_equal 12, Reline::Unicode.calculate_width("ab\e]0;1\acd")
-    assert_equal 4, Reline::Unicode.calculate_width("ab\e]0;1\acd", true)
-    assert_equal 10, Reline::Unicode.calculate_width('あいうえお')
-    assert_equal 10, Reline::Unicode.calculate_width('あいうえお', true)
-  end
-
-  def test_take_mbchar_range
-    assert_equal ['cdef', 2, 4], Reline::Unicode.take_mbchar_range('abcdefghi', 2, 4)
-    assert_equal ['cdef', 2, 4], Reline::Unicode.take_mbchar_range('abcdefghi', 2, 4, padding: true)
-    assert_equal ['cdef', 2, 4], Reline::Unicode.take_mbchar_range('abcdefghi', 2, 4, cover_begin: true)
-    assert_equal ['cdef', 2, 4], Reline::Unicode.take_mbchar_range('abcdefghi', 2, 4, cover_end: true)
-    assert_equal ['いう', 2, 4], Reline::Unicode.take_mbchar_range('あいうえお', 2, 4)
-    assert_equal ['いう', 2, 4], Reline::Unicode.take_mbchar_range('あいうえお', 2, 4, padding: true)
-    assert_equal ['いう', 2, 4], Reline::Unicode.take_mbchar_range('あいうえお', 2, 4, cover_begin: true)
-    assert_equal ['いう', 2, 4], Reline::Unicode.take_mbchar_range('あいうえお', 2, 4, cover_end: true)
-    assert_equal ['う', 4, 2], Reline::Unicode.take_mbchar_range('あいうえお', 3, 4)
-    assert_equal [' う ', 3, 4], Reline::Unicode.take_mbchar_range('あいうえお', 3, 4, padding: true)
-    assert_equal ['いう', 2, 4], Reline::Unicode.take_mbchar_range('あいうえお', 3, 4, cover_begin: true)
-    assert_equal ['うえ', 4, 4], Reline::Unicode.take_mbchar_range('あいうえお', 3, 4, cover_end: true)
-    assert_equal ['いう ', 2, 5], Reline::Unicode.take_mbchar_range('あいうえお', 3, 4, cover_begin: true, padding: true)
-    assert_equal [' うえ', 3, 5], Reline::Unicode.take_mbchar_range('あいうえお', 3, 4, cover_end: true, padding: true)
-    assert_equal [' うえお   ', 3, 10], Reline::Unicode.take_mbchar_range('あいうえお', 3, 10, padding: true)
-    assert_equal [" \e[41mうえお\e[0m   ", 3, 10], Reline::Unicode.take_mbchar_range("あい\e[41mうえお", 3, 10, padding: true)
-    assert_equal ["\e[41m \e[42mい\e[43m ", 1, 4], Reline::Unicode.take_mbchar_range("\e[41mあ\e[42mい\e[43mう", 1, 4, padding: true)
-    assert_equal ["\e[31mc[ABC]d\e[0mef", 2, 4], Reline::Unicode.take_mbchar_range("\e[31mabc\1[ABC]\2d\e[0mefghi", 2, 4)
-    assert_equal ["\e[41m \e[42mい\e[43m ", 1, 4], Reline::Unicode.take_mbchar_range("\e[41mあ\e[42mい\e[43mう", 1, 4, padding: true)
-  end
-
-  def test_common_prefix
-    assert_equal('', Reline::Unicode.common_prefix([]))
-    assert_equal('abc', Reline::Unicode.common_prefix(['abc']))
-    assert_equal('12', Reline::Unicode.common_prefix(['123', '123️⃣']))
-    assert_equal('', Reline::Unicode.common_prefix(['abc', 'xyz']))
-    assert_equal('ab', Reline::Unicode.common_prefix(['abcd', 'abc', 'abx', 'abcd']))
-    assert_equal('A', Reline::Unicode.common_prefix(['AbcD', 'ABC', 'AbX', 'AbCD']))
-    assert_equal('Ab', Reline::Unicode.common_prefix(['AbcD', 'ABC', 'AbX', 'AbCD'], ignore_case: true))
-  end
-
-  def test_encoding_conversion
-    texts = [
-      String.new("invalid\xFFutf8", encoding: 'utf-8'),
-      String.new("invalid\xFFsjis", encoding: 'sjis'),
-      "utf8#{33111.chr('sjis')}convertible",
-      "utf8#{33222.chr('sjis')}inconvertible",
-      "sjis->utf8->sjis#{60777.chr('sjis')}irreversible"
-    ]
-    utf8_texts = [
-      'invalid�utf8',
-      'invalid�sjis',
-      'utf8仝convertible',
-      'utf8�inconvertible',
-      'sjis->utf8->sjis劦irreversible'
-    ]
-    sjis_texts = [
-      'invalid?utf8',
-      'invalid?sjis',
-      "utf8#{33111.chr('sjis')}convertible",
-      'utf8?inconvertible',
-      "sjis->utf8->sjis#{60777.chr('sjis')}irreversible"
-    ]
-    assert_equal(utf8_texts, texts.map { |s| Reline::Unicode.safe_encode(s, 'utf-8') })
-    assert_equal(utf8_texts, texts.map { |s| Reline::Unicode.safe_encode(s, Encoding::UTF_8) })
-    assert_equal(sjis_texts, texts.map { |s| Reline::Unicode.safe_encode(s, 'sjis') })
-    assert_equal(sjis_texts, texts.map { |s| Reline::Unicode.safe_encode(s, Encoding::Windows_31J) })
-  end
-
-  def test_em_forward_word
-    assert_equal(12, Reline::Unicode.em_forward_word('abc---fooあbar-baz', 3))
-    assert_equal(11, Reline::Unicode.em_forward_word('abc---fooあbar-baz'.encode('sjis'), 3))
-    assert_equal(3, Reline::Unicode.em_forward_word('abcfoo', 3))
-    assert_equal(3, Reline::Unicode.em_forward_word('abc---', 3))
-    assert_equal(0, Reline::Unicode.em_forward_word('abc', 3))
-  end
-
-  def test_em_forward_word_with_capitalization
-    assert_equal([12, '---Fooあbar'], Reline::Unicode.em_forward_word_with_capitalization('abc---foOあBar-baz', 3))
-    assert_equal([11, '---Fooあbar'.encode('sjis')], Reline::Unicode.em_forward_word_with_capitalization('abc---foOあBar-baz'.encode('sjis'), 3))
-    assert_equal([3, 'Foo'], Reline::Unicode.em_forward_word_with_capitalization('abcfOo', 3))
-    assert_equal([3, '---'], Reline::Unicode.em_forward_word_with_capitalization('abc---', 3))
-    assert_equal([0, ''], Reline::Unicode.em_forward_word_with_capitalization('abc', 3))
-    assert_equal([6, 'Ii̇i̇'], Reline::Unicode.em_forward_word_with_capitalization('ıİİ', 0))
-  end
-
-  def test_em_backward_word
-    assert_equal(12, Reline::Unicode.em_backward_word('abc foo-barあbaz--- xyz', 20))
-    assert_equal(11, Reline::Unicode.em_backward_word('abc foo-barあbaz--- xyz'.encode('sjis'), 19))
-    assert_equal(2, Reline::Unicode.em_backward_word('  ', 2))
-    assert_equal(2, Reline::Unicode.em_backward_word('ab', 2))
-    assert_equal(0, Reline::Unicode.em_backward_word('ab', 0))
-  end
-
-  def test_em_big_backward_word
-    assert_equal(16, Reline::Unicode.em_big_backward_word('abc foo-barあbaz--- xyz', 20))
-    assert_equal(15, Reline::Unicode.em_big_backward_word('abc foo-barあbaz--- xyz'.encode('sjis'), 19))
-    assert_equal(2, Reline::Unicode.em_big_backward_word('  ', 2))
-    assert_equal(2, Reline::Unicode.em_big_backward_word('ab', 2))
-    assert_equal(0, Reline::Unicode.em_big_backward_word('ab', 0))
-  end
-
-  def test_ed_transpose_words
-    # any value that does not trigger transpose
-    assert_equal([0, 0, 0, 2], Reline::Unicode.ed_transpose_words('aa bb cc  ', 1))
-
-    assert_equal([0, 2, 3, 5], Reline::Unicode.ed_transpose_words('aa bb cc  ', 2))
-    assert_equal([0, 2, 3, 5], Reline::Unicode.ed_transpose_words('aa bb cc  ', 4))
-    assert_equal([3, 5, 6, 8], Reline::Unicode.ed_transpose_words('aa bb cc  ', 5))
-    assert_equal([3, 5, 6, 8], Reline::Unicode.ed_transpose_words('aa bb cc  ', 7))
-    assert_equal([3, 5, 6, 10], Reline::Unicode.ed_transpose_words('aa bb cc  ', 8))
-    assert_equal([3, 5, 6, 10], Reline::Unicode.ed_transpose_words('aa bb cc  ', 9))
-    ['sjis', 'utf-8'].each do |encoding|
-      texts = ['fooあ', 'barあbaz', 'aaa  -', '- -', '-  bbb']
-      word1, word2, left, middle, right = texts.map { |text| text.encode(encoding) }
-      expected = [left.bytesize, (left + word1).bytesize, (left + word1 + middle).bytesize, (left + word1 + middle + word2).bytesize]
-      assert_equal(expected, Reline::Unicode.ed_transpose_words(left + word1 + middle + word2 + right, left.bytesize + word1.bytesize))
-      assert_equal(expected, Reline::Unicode.ed_transpose_words(left + word1 + middle + word2 + right, left.bytesize + word1.bytesize + middle.bytesize))
-      assert_equal(expected, Reline::Unicode.ed_transpose_words(left + word1 + middle + word2 + right, left.bytesize + word1.bytesize + middle.bytesize + word2.bytesize - 1))
-    end
-  end
-
-  def test_vi_big_forward_word
-    assert_equal(18, Reline::Unicode.vi_big_forward_word('abc---fooあbar-baz  xyz', 3))
-    assert_equal(8, Reline::Unicode.vi_big_forward_word('abcfooあ  --', 3))
-    assert_equal(7, Reline::Unicode.vi_big_forward_word('abcfooあ  --'.encode('sjis'), 3))
-    assert_equal(6, Reline::Unicode.vi_big_forward_word('abcfooあ', 3))
-    assert_equal(3, Reline::Unicode.vi_big_forward_word('abc-  ', 3))
-    assert_equal(0, Reline::Unicode.vi_big_forward_word('abc', 3))
-  end
-
-  def test_vi_big_forward_end_word
-    assert_equal(4, Reline::Unicode.vi_big_forward_end_word('a  bb c', 0))
-    assert_equal(4, Reline::Unicode.vi_big_forward_end_word('-  bb c', 0))
-    assert_equal(1, Reline::Unicode.vi_big_forward_end_word('-a b', 0))
-    assert_equal(1, Reline::Unicode.vi_big_forward_end_word('a- b', 0))
-    assert_equal(1, Reline::Unicode.vi_big_forward_end_word('aa b', 0))
-    assert_equal(3, Reline::Unicode.vi_big_forward_end_word('  aa b', 0))
-    assert_equal(15, Reline::Unicode.vi_big_forward_end_word('abc---fooあbar-baz  xyz', 3))
-    assert_equal(14, Reline::Unicode.vi_big_forward_end_word('abc---fooあbar-baz  xyz'.encode('sjis'), 3))
-    assert_equal(3, Reline::Unicode.vi_big_forward_end_word('abcfooあ  --', 3))
-    assert_equal(3, Reline::Unicode.vi_big_forward_end_word('abcfooあ', 3))
-    assert_equal(2, Reline::Unicode.vi_big_forward_end_word('abc-  ', 3))
-    assert_equal(0, Reline::Unicode.vi_big_forward_end_word('abc', 3))
-  end
-
-  def test_vi_big_backward_word
-    assert_equal(16, Reline::Unicode.vi_big_backward_word('abc foo-barあbaz--- xyz', 20))
-    assert_equal(15, Reline::Unicode.vi_big_backward_word('abc foo-barあbaz--- xyz'.encode('sjis'), 19))
-    assert_equal(2, Reline::Unicode.vi_big_backward_word('  ', 2))
-    assert_equal(2, Reline::Unicode.vi_big_backward_word('ab', 2))
-    assert_equal(0, Reline::Unicode.vi_big_backward_word('ab', 0))
-  end
-
-  def test_vi_forward_word
-    assert_equal(3, Reline::Unicode.vi_forward_word('abc---fooあbar-baz', 3))
-    assert_equal(9, Reline::Unicode.vi_forward_word('abc---fooあbar-baz', 6))
-    assert_equal(8, Reline::Unicode.vi_forward_word('abc---fooあbar-baz'.encode('sjis'), 6))
-    assert_equal(6, Reline::Unicode.vi_forward_word('abcfooあ', 3))
-    assert_equal(3, Reline::Unicode.vi_forward_word('abc---', 3))
-    assert_equal(0, Reline::Unicode.vi_forward_word('abc', 3))
-    assert_equal(2, Reline::Unicode.vi_forward_word('abc   def', 1, true))
-    assert_equal(5, Reline::Unicode.vi_forward_word('abc   def', 1, false))
-  end
-
-  def test_vi_forward_end_word
-    assert_equal(2, Reline::Unicode.vi_forward_end_word('abc---fooあbar-baz', 3))
-    assert_equal(8, Reline::Unicode.vi_forward_end_word('abc---fooあbar-baz', 6))
-    assert_equal(7, Reline::Unicode.vi_forward_end_word('abc---fooあbar-baz'.encode('sjis'), 6))
-    assert_equal(3, Reline::Unicode.vi_forward_end_word('abcfooあ', 3))
-    assert_equal(2, Reline::Unicode.vi_forward_end_word('abc---', 3))
-    assert_equal(0, Reline::Unicode.vi_forward_end_word('abc', 3))
-  end
-
-  def test_vi_backward_word
-    assert_equal(3, Reline::Unicode.vi_backward_word('abc foo-barあbaz--- xyz', 20))
-    assert_equal(9, Reline::Unicode.vi_backward_word('abc foo-barあbaz--- xyz', 17))
-    assert_equal(8, Reline::Unicode.vi_backward_word('abc foo-barあbaz--- xyz'.encode('sjis'), 16))
-    assert_equal(2, Reline::Unicode.vi_backward_word('  ', 2))
-    assert_equal(2, Reline::Unicode.vi_backward_word('ab', 2))
-    assert_equal(0, Reline::Unicode.vi_backward_word('ab', 0))
-  end
-
-  def test_vi_first_print
-    assert_equal(3, Reline::Unicode.vi_first_print('   abcdefg'))
-    assert_equal(3, Reline::Unicode.vi_first_print('   '))
-    assert_equal(0, Reline::Unicode.vi_first_print('abc'))
-    assert_equal(0, Reline::Unicode.vi_first_print('あ'))
-    assert_equal(0, Reline::Unicode.vi_first_print('あ'.encode('sjis')))
-    assert_equal(0, Reline::Unicode.vi_first_print(''))
-  end
-
-  def test_character_type
-    assert(Reline::Unicode.word_character?('a'))
-    assert(Reline::Unicode.word_character?('あ'))
-    assert(Reline::Unicode.word_character?('あ'.encode('sjis')))
-    refute(Reline::Unicode.word_character?(33345.chr('sjis')))
-    refute(Reline::Unicode.word_character?('-'))
-    refute(Reline::Unicode.word_character?(nil))
-
-    assert(Reline::Unicode.space_character?(' '))
-    refute(Reline::Unicode.space_character?('あ'))
-    refute(Reline::Unicode.space_character?('あ'.encode('sjis')))
-    refute(Reline::Unicode.space_character?(33345.chr('sjis')))
-    refute(Reline::Unicode.space_character?('-'))
-    refute(Reline::Unicode.space_character?(nil))
-  end
-end
diff --git a/test/mri/reline/test_within_pipe.rb b/test/mri/reline/test_within_pipe.rb
deleted file mode 100644
index 4f05255301b..00000000000
--- a/test/mri/reline/test_within_pipe.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require_relative 'helper'
-
-class Reline::WithinPipeTest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @encoding = Reline.core.encoding
-    @input_reader, @writer = IO.pipe(@encoding)
-    Reline.input = @input_reader
-    @reader, @output_writer = IO.pipe(@encoding)
-    @output = Reline.output = @output_writer
-    @config = Reline.core.config
-    @config.keyseq_timeout *= 600 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # for --jit-wait CI
-    @line_editor = Reline.core.line_editor
-  end
-
-  def teardown
-    Reline.input = STDIN
-    Reline.output = STDOUT
-    Reline.point = 0
-    Reline.delete_text
-    @input_reader.close
-    @writer.close
-    @reader.close
-    @output_writer.close
-    @config.reset
-    Reline.test_reset
-  end
-
-  def test_simple_input
-    @writer.write("abc\n")
-    assert_equal 'abc', Reline.readmultiline(&proc{ true })
-  end
-
-  def test_unknown_macro
-    @config.add_default_key_binding('abc'.bytes, :unknown_macro)
-    @writer.write("abcd\n")
-    assert_equal 'd', Reline.readmultiline(&proc{ true })
-  end
-
-  def test_macro_commands_for_moving
-    @config.add_default_key_binding("\C-x\C-a".bytes, :beginning_of_line)
-    @config.add_default_key_binding("\C-x\C-e".bytes, :end_of_line)
-    @config.add_default_key_binding("\C-x\C-f".bytes, :forward_char)
-    @config.add_default_key_binding("\C-x\C-b".bytes, :backward_char)
-    @config.add_default_key_binding("\C-x\M-f".bytes, :forward_word)
-    @config.add_default_key_binding("\C-x\M-b".bytes, :backward_word)
-    @writer.write(" def\C-x\C-aabc\C-x\C-e ghi\C-x\C-a\C-x\C-f\C-x\C-f_\C-x\C-b\C-x\C-b_\C-x\C-f\C-x\C-f\C-x\C-f\C-x\M-f_\C-x\M-b\n")
-    assert_equal 'a_b_c def_ ghi', Reline.readmultiline(&proc{ true })
-  end
-
-  def test_macro_commands_for_editing
-    @config.add_default_key_binding("\C-x\C-d".bytes, :delete_char)
-    @config.add_default_key_binding("\C-x\C-h".bytes, :backward_delete_char)
-    @config.add_default_key_binding("\C-x\C-v".bytes, :quoted_insert)
-    #@config.add_default_key_binding("\C-xa".bytes, :self_insert)
-    @config.add_default_key_binding("\C-x\C-t".bytes, :transpose_chars)
-    @config.add_default_key_binding("\C-x\M-t".bytes, :transpose_words)
-    @config.add_default_key_binding("\C-x\M-u".bytes, :upcase_word)
-    @config.add_default_key_binding("\C-x\M-l".bytes, :downcase_word)
-    @config.add_default_key_binding("\C-x\M-c".bytes, :capitalize_word)
-    @writer.write("abcde\C-b\C-b\C-b\C-x\C-d\C-x\C-h\C-x\C-v\C-a\C-f\C-f EF\C-x\C-t gh\C-x\M-t\C-b\C-b\C-b\C-b\C-b\C-b\C-b\C-b\C-x\M-u\C-x\M-l\C-x\M-c\n")
-    assert_equal "a\C-aDE gh Fe", Reline.readmultiline(&proc{ true })
-  end
-
-  def test_delete_text_in_multiline
-    @writer.write("abc\ndef\nxyz\n")
-    result = Reline.readmultiline(&proc{ |str|
-      if str.include?('xyz')
-        Reline.delete_text
-        true
-      else
-        false
-      end
-    })
-    assert_equal "abc\ndef", result
-  end
-end
diff --git a/test/mri/reline/windows/test_key_event_record.rb b/test/mri/reline/windows/test_key_event_record.rb
deleted file mode 100644
index 25c860606ac..00000000000
--- a/test/mri/reline/windows/test_key_event_record.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require_relative '../helper'
-return unless Reline.const_defined?(:Windows)
-
-class Reline::Windows
-  class KeyEventRecord::Test < Reline::TestCase
-
-    def setup
-      # Ctrl+A
-      @key = Reline::Windows::KeyEventRecord.new(0x41, 1, Reline::Windows::LEFT_CTRL_PRESSED)
-    end
-
-    def test_matches__with_no_arguments_raises_error
-      assert_raise(ArgumentError) { @key.match? }
-    end
-
-    def test_matches_char_code
-      assert @key.match?(char_code: 0x1)
-    end
-
-    def test_matches_virtual_key_code
-      assert @key.match?(virtual_key_code: 0x41)
-    end
-
-    def test_matches_control_keys
-      assert @key.match?(control_keys: :CTRL)
-    end
-
-    def test_doesnt_match_alt
-      refute @key.match?(control_keys: :ALT)
-    end
-
-    def test_doesnt_match_empty_control_key
-      refute @key.match?(control_keys: [])
-    end
-
-    def test_matches_control_keys_and_virtual_key_code
-      assert @key.match?(control_keys: :CTRL, virtual_key_code: 0x41)
-    end
-
-  end
-end
diff --git a/test/mri/reline/yamatanooroti/multiline_repl b/test/mri/reline/yamatanooroti/multiline_repl
deleted file mode 100755
index 8b82be60f4b..00000000000
--- a/test/mri/reline/yamatanooroti/multiline_repl
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/usr/bin/env ruby
-
-
-require 'bundler'
-Bundler.require
-
-require 'reline'
-require 'optparse'
-require_relative 'termination_checker'
-
-opt = OptionParser.new
-opt.on('--dynamic-prompt') {
-  Reline.prompt_proc = proc { |lines|
-    lines.each_with_index.map { |l, i|
-      "\e[1m[%04d]>\e[m " % i
-    }
-  }
-}
-opt.on('--broken-dynamic-prompt') {
-  Reline.prompt_proc = proc { |lines|
-    range = lines.size > 1 ? (0..(lines.size - 2)) : (0..0)
-    lines[range].each_with_index.map { |l, i|
-      '[%04d]> ' % i
-    }
-  }
-}
-opt.on('--dynamic-prompt-returns-empty') {
-  Reline.prompt_proc = proc { |l| [] }
-}
-opt.on('--dynamic-prompt-with-newline') {
-  Reline.prompt_proc = proc { |lines|
-    range = lines.size > 1 ? (0..(lines.size - 2)) : (0..0)
-    lines[range].each_with_index.map { |l, i|
-      '[%04d\n]> ' % i
-    }
-  }
-}
-opt.on('--broken-dynamic-prompt-assert-no-escape-sequence') {
-  Reline.prompt_proc = proc { |lines|
-    has_escape_sequence = lines.join.include?("\e")
-    (lines.size + 1).times.map { |i|
-      has_escape_sequence ? 'error>' : '[%04d]> ' % i
-    }
-  }
-}
-opt.on('--color-bold') {
-  Reline.output_modifier_proc = ->(output, complete:){
-    output.gsub(/./) { |c| "\e[1m#{c}\e[0m" }
-  }
-}
-opt.on('--dynamic-prompt-show-line') {
-  Reline.prompt_proc = proc { |lines|
-    lines.map { |l|
-      '[%4.4s]> ' % l
-    }
-  }
-}
-
-def assert_auto_indent_params(lines, line_index, byte_pointer, is_newline)
-  raise 'Wrong lines type' unless lines.all?(String)
-
-  line = lines[line_index]
-  raise 'Wrong line_index value' unless line
-
-  # The condition `byte_pointer <= line.bytesize` is not satisfied. Maybe bug.
-  # Instead, loose constraint `byte_pointer <= line.bytesize + 1` seems to be satisfied when is_newline is false.
-  return if is_newline
-
-  raise 'byte_pointer out of bounds' unless byte_pointer <= line.bytesize + 1
-  raise 'Invalid byte_pointer' unless line.byteslice(0, byte_pointer).valid_encoding?
-end
-
-opt.on('--auto-indent') {
-  Reline.auto_indent_proc = lambda do |lines, line_index, byte_pointer, is_newline|
-    assert_auto_indent_params(lines, line_index, byte_pointer, is_newline)
-    AutoIndent.calculate_indent(lines, line_index, byte_pointer, is_newline)
-  end
-}
-opt.on('--dialog VAL') { |v|
-  Reline.add_dialog_proc(:simple_dialog, lambda {
-    return nil if v.include?('nil')
-    if v.include?('simple')
-      contents = <<~RUBY.split("\n")
-        Ruby is...
-        A dynamic, open source programming
-        language with a focus on simplicity
-        and productivity. It has an elegant
-        syntax that is natural to read and
-        easy to write.
-      RUBY
-    elsif v.include?('long')
-      contents = <<~RUBY.split("\n")
-        Ruby is...
-        A dynamic, open
-        source programming
-        language with a
-        focus on simplicity
-        and productivity.
-        It has an elegant
-        syntax that is
-        natural to read
-        and easy to write.
-      RUBY
-    elsif v.include?('fullwidth')
-      contents = <<~RUBY.split("\n")
-        Rubyとは...
-
-        オープンソースの動的なプログラミン
-        グ言語で、シンプルさと高い生産性を
-        備えています。エレガントな文法を持
-        ち、自然に読み書きができます。
-      RUBY
-    end
-    if v.include?('scrollkey')
-      dialog.trap_key = nil
-      if key and key.match?(dialog.name)
-        if dialog.pointer.nil?
-          dialog.pointer = 0
-        elsif dialog.pointer >= (contents.size - 1)
-          dialog.pointer = 0
-        else
-          dialog.pointer += 1
-        end
-      end
-      dialog.trap_key = [?j.ord]
-      height = 4
-    end
-    scrollbar = false
-    if v.include?('scrollbar')
-      scrollbar = true
-    end
-    if v.include?('alt-scrollbar')
-      scrollbar = true
-    end
-    Reline::DialogRenderInfo.new(pos: cursor_pos, contents: contents, height: height, scrollbar: scrollbar, face: :completion_dialog)
-  })
-  if v.include?('alt-scrollbar')
-    ENV['RELINE_ALT_SCROLLBAR'] = '1'
-  end
-}
-opt.on('--complete') {
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{String ScriptError SyntaxError Signal}.select{ |c| c.start_with?(target) }
-  }
-}
-opt.on('--complete-menu-with-perfect-match') {
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{abs abs2}.select{ |c| c.start_with?(target) }
-  }
-}
-opt.on('--autocomplete') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{String Struct Symbol ScriptError SyntaxError Signal}.select{ |c| c.start_with?(target) }
-  }
-}
-opt.on('--autocomplete-empty') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil| [] }
-}
-opt.on('--autocomplete-long') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{
-      String
-      Struct
-      Symbol
-      StopIteration
-      SystemCallError
-      SystemExit
-      SystemStackError
-      ScriptError
-      SyntaxError
-      Signal
-      SizedQueue
-      Set
-      SecureRandom
-      Socket
-      StringIO
-      StringScanner
-      Shellwords
-      Syslog
-      Singleton
-      SDBM
-    }.select{ |c| c.start_with?(target) }
-  }
-}
-opt.on('--autocomplete-super-long') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    c = +'A'
-    2000.times.map{ s = "Str_#{c}"; c.succ!; s }.select{ |c| c.start_with?(target) }
-  }
-}
-
-opt.on('--autocomplete-width-long') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{
-        remove_instance_variable
-        respond_to?
-        ruby2_keywords
-        rand
-        readline
-        readlines
-        require
-        require_relative
-        raise
-        respond_to_missing?
-        redo
-        rescue
-        retry
-        return
-    }.select{ |c| c.start_with?(target) }
-  }
-}
-opt.parse!(ARGV)
-
-begin
-  stty_save = `stty -g`.chomp
-rescue
-end
-
-begin
-  prompt = ENV['RELINE_TEST_PROMPT'] || "\e[1mprompt>\e[m "
-  puts 'Multiline REPL.'
-  while code = Reline.readmultiline(prompt, true) { |code| TerminationChecker.terminated?(code) }
-    case code.chomp
-    when 'exit', 'quit', 'q'
-      exit 0
-    when ''
-      # NOOP
-    else
-      begin
-        result = eval(code)
-        puts "=> #{result.inspect}"
-      rescue ScriptError, StandardError => e
-        puts "Traceback (most recent call last):"
-        e.backtrace.reverse_each do |f|
-          puts "        #{f}"
-        end
-        puts e.message
-      end
-    end
-  end
-rescue Interrupt
-  puts '^C'
-  `stty #{stty_save}` if stty_save
-  exit 0
-ensure
-  `stty #{stty_save}` if stty_save
-end
-begin
-  puts
-rescue Errno::EIO
-  # Maybe the I/O has been closed.
-end
diff --git a/test/mri/reline/yamatanooroti/termination_checker.rb b/test/mri/reline/yamatanooroti/termination_checker.rb
deleted file mode 100644
index b97c798c593..00000000000
--- a/test/mri/reline/yamatanooroti/termination_checker.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'ripper'
-
-module TerminationChecker
-  def self.terminated?(code)
-    Ripper.sexp(code) ? true : false
-  end
-end
-
-module AutoIndent
-  def self.calculate_indent(lines, line_index, byte_pointer, is_newline)
-    if is_newline
-      2 * nesting_level(lines[0..line_index - 1])
-    else
-      lines = lines.dup
-      lines[line_index] = lines[line_index]&.byteslice(0, byte_pointer)
-      prev_level = nesting_level(lines[0..line_index - 1])
-      level = nesting_level(lines[0..line_index])
-      2 * level if level < prev_level
-    end
-  end
-
-  def self.nesting_level(lines)
-    code = lines.join("\n")
-    code.scan(/if|def|\(|\[|\{/).size - code.scan(/end|\)|\]|\}/).size
-  end
-end
diff --git a/test/mri/reline/yamatanooroti/test_rendering.rb b/test/mri/reline/yamatanooroti/test_rendering.rb
deleted file mode 100644
index e9f9ee66d2a..00000000000
--- a/test/mri/reline/yamatanooroti/test_rendering.rb
+++ /dev/null
@@ -1,1870 +0,0 @@
-require 'reline'
-
-begin
-  require 'yamatanooroti'
-
-  class Reline::RenderingTest < Yamatanooroti::TestCase
-
-    FACE_CONFIGS = { no_config: "", valid_config: <<~VALID_CONFIG, incomplete_config: <<~INCOMPLETE_CONFIG }
-      require "reline"
-      Reline::Face.config(:completion_dialog) do |face|
-        face.define :default, foreground: :white, background: :blue
-        face.define :enhanced, foreground: :white, background: :magenta
-        face.define :scrollbar, foreground: :white, background: :blue
-      end
-    VALID_CONFIG
-      require "reline"
-      Reline::Face.config(:completion_dialog) do |face|
-        face.define :default, foreground: :white, background: :black
-        face.define :scrollbar, foreground: :white, background: :cyan
-      end
-    INCOMPLETE_CONFIG
-
-    def iterate_over_face_configs(&block)
-      FACE_CONFIGS.each do |config_name, face_config|
-        config_file = Tempfile.create(%w{face_config- .rb})
-        config_file.write face_config
-        block.call(config_name, config_file)
-      ensure
-        config_file.close
-        File.delete(config_file)
-      end
-    end
-
-    def setup
-      @pwd = Dir.pwd
-      suffix = '%010d' % Random.rand(0..65535)
-      @tmpdir = File.join(File.expand_path(Dir.tmpdir), "test_reline_config_#{$$}_#{suffix}")
-      begin
-        Dir.mkdir(@tmpdir)
-      rescue Errno::EEXIST
-        FileUtils.rm_rf(@tmpdir)
-        Dir.mkdir(@tmpdir)
-      end
-      @inputrc_backup = ENV['INPUTRC']
-      @inputrc_file = ENV['INPUTRC'] = File.join(@tmpdir, 'temporaty_inputrc')
-      File.unlink(@inputrc_file) if File.exist?(@inputrc_file)
-    end
-
-    def teardown
-      FileUtils.rm_rf(@tmpdir)
-      ENV['INPUTRC'] = @inputrc_backup
-      ENV.delete('RELINE_TEST_PROMPT') if ENV['RELINE_TEST_PROMPT']
-    end
-
-    def test_history_back
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":a\n")
-      write("\C-p")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :a
-        => :a
-        prompt> :a
-      EOC
-      close
-    end
-
-    def test_backspace
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":abc\C-h\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :ab
-        => :ab
-        prompt>
-      EOC
-      close
-    end
-
-    def test_autowrap
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write('01234567890123456789012')
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 0123456789012345678901
-        2
-      EOC
-      close
-    end
-
-    def test_fullwidth
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":あ\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :あ
-        => :あ
-        prompt>
-      EOC
-      close
-    end
-
-    def test_two_fullwidth
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":あい\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :あい
-        => :あい
-        prompt>
-      EOC
-      close
-    end
-
-    def test_finish_autowrapped_line
-      start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("[{'user'=>{'email'=>'a@a', 'id'=>'ABC'}, 'version'=>4, 'status'=>'succeeded'}]\n")
-      expected = [{'user'=>{'email'=>'a@a', 'id'=>'ABC'}, 'version'=>4, 'status'=>'succeeded'}].inspect
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> [{'user'=>{'email'=>'a@a', 'id'=
-        >'ABC'}, 'version'=>4, 'status'=>'succee
-        ded'}]
-        #{fold_multiline("=> " + expected, 40)}
-        prompt>
-      EOC
-      close
-    end
-
-    def test_finish_autowrapped_line_in_the_middle_of_lines
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("[{'user'=>{'email'=>'abcdef@abcdef', 'id'=>'ABC'}, 'version'=>4, 'status'=>'succeeded'}]#{"\C-b"*7}")
-      write("\n")
-      expected = [{'user'=>{'email'=>'abcdef@abcdef', 'id'=>'ABC'}, 'version'=>4, 'status'=>'succeeded'}].inspect
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> [{'user'=>{'email'=>'a
-        bcdef@abcdef', 'id'=>'ABC'}, '
-        version'=>4, 'status'=>'succee
-        ded'}]
-        #{fold_multiline("=> " + expected, 30)}
-        prompt>
-      EOC
-      close
-    end
-
-    def test_finish_autowrapped_line_in_the_middle_of_multilines
-      omit if RUBY_VERSION < '2.7'
-      start_terminal(30, 16, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("<<~EOM\n  ABCDEFG\nEOM\n")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> <<~EOM
-        prompt>   ABCDEF
-        G
-        prompt> EOM
-        => "ABCDEFG\n"
-        prompt>
-      EOC
-      close
-    end
-
-    def test_prompt
-      write_inputrc <<~'LINES'
-        "abc": "123"
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("abc\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 123
-        => 123
-        prompt>
-      EOC
-      close
-    end
-
-    def test_mode_string_emacs
-      write_inputrc <<~LINES
-        set show-mode-in-prompt on
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        @prompt>
-      EOC
-      close
-    end
-
-    def test_mode_string_vi
-      write_inputrc <<~LINES
-        set editing-mode vi
-        set show-mode-in-prompt on
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":a\n\C-[k")
-      write("i\n:a")
-      write("\C-[h")
-      assert_screen(<<~EOC)
-        (ins)prompt> :a
-        => :a
-        (ins)prompt> :a
-        => :a
-        (cmd)prompt> :a
-      EOC
-      close
-    end
-
-    def test_original_mode_string_emacs
-      write_inputrc <<~LINES
-        set show-mode-in-prompt on
-        set emacs-mode-string [emacs]
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [emacs]prompt>
-      EOC
-      close
-    end
-
-    def test_original_mode_string_with_quote
-      write_inputrc <<~LINES
-        set show-mode-in-prompt on
-        set emacs-mode-string "[emacs]"
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [emacs]prompt>
-      EOC
-      close
-    end
-
-    def test_original_mode_string_vi
-      write_inputrc <<~LINES
-        set editing-mode vi
-        set show-mode-in-prompt on
-        set vi-ins-mode-string "{InS}"
-        set vi-cmd-mode-string "{CmD}"
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":a\n\C-[k")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        {InS}prompt> :a
-        => :a
-        {CmD}prompt> :a
-      EOC
-      close
-    end
-
-    def test_mode_string_vi_changing
-      write_inputrc <<~LINES
-        set editing-mode vi
-        set show-mode-in-prompt on
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":a\C-[ab\C-[ac\C-h\C-h\C-h\C-h:a")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        (ins)prompt> :a
-      EOC
-      close
-    end
-
-    def test_esc_input
-      omit if Reline::IOGate.win?
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def\C-aabc")
-      write("\e") # single ESC
-      sleep 1
-      write("A")
-      write("B\eAC") # ESC + A (M-A, no key specified in Reline::KeyActor::Emacs)
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> abcABCdef
-      EOC
-      close
-    end
-
-    def test_prompt_with_escape_sequence
-      ENV['RELINE_TEST_PROMPT'] = "\1\e[30m\2prompt> \1\e[m\2"
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("123\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 123
-        => 123
-        prompt>
-      EOC
-      close
-    end
-
-    def test_prompt_with_escape_sequence_and_autowrap
-      ENV['RELINE_TEST_PROMPT'] = "\1\e[30m\2prompt> \1\e[m\2"
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("1234567890123\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 123456789012
-        3
-        => 1234567890123
-        prompt>
-      EOC
-      close
-    end
-
-    def test_readline_with_multiline_input
-      start_terminal(5, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dynamic-prompt}, startup_message: 'Multiline REPL.')
-      write("def foo\n  bar\nend\n")
-      write("Reline.readline('prompt> ')\n")
-      write("\C-p\C-p")
-      assert_screen(<<~EOC)
-        => :foo
-        [0000]> Reline.readline('prompt> ')
-        prompt> def foo
-          bar
-        end
-      EOC
-      close
-    end
-
-    def test_multiline_and_autowrap
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def aaaaaaaaaa\n  33333333\n           end\C-a\C-pputs\C-e\e\C-m888888888888888")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def aaaaaaaa
-        aa
-        prompt> puts  333333
-        33
-        prompt> 888888888888
-        888
-        prompt>            e
-        nd
-      EOC
-      close
-    end
-
-    def test_multiline_add_new_line_and_autowrap
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def aaaaaaaaaa")
-      write("\n")
-      write("  bbbbbbbbbbbb")
-      write("\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def aaaaaaaa
-        aa
-        prompt>   bbbbbbbbbb
-        bb
-        prompt>
-      EOC
-      close
-    end
-
-    def test_clear
-      start_terminal(10, 15, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("3\C-l")
-      assert_screen(<<~EOC)
-        prompt> 3
-      EOC
-      close
-    end
-
-    def test_clear_multiline_and_autowrap
-      start_terminal(10, 15, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def aaaaaa\n  3\n\C-lend")
-      assert_screen(<<~EOC)
-        prompt> def aaa
-        aaa
-        prompt>   3
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_nearest_cursor
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def ああ\n  :いい\nend\C-pbb\C-pcc")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def ccああ
-        prompt>   :bbいい
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_delete_line
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\n\nend\C-p\C-h")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def a
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_last_line_of_screen
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("\n\n\n\n\ndef a\nend")
-      assert_screen(<<~EOC)
-        prompt>
-        prompt>
-        prompt>
-        prompt> def a
-        prompt> end
-      EOC
-      close
-    end
-
-    # c17a09b7454352e2aff5a7d8722e80afb73e454b
-    def test_autowrap_at_last_line_of_screen
-      start_terminal(5, 15, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\nend\n\C-p")
-      assert_screen(<<~EOC)
-        prompt> def a
-        prompt> end
-        => :a
-        prompt> def a
-        prompt> end
-      EOC
-      close
-    end
-
-    # f002483b27cdb325c5edf9e0fe4fa4e1c71c4b0e
-    def test_insert_line_in_the_middle_of_line
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("333\C-b\C-b\e\C-m8")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 3
-        prompt> 833
-      EOC
-      close
-    end
-
-    # 9d8978961c5de5064f949d56d7e0286df9e18f43
-    def test_insert_line_in_the_middle_of_line_at_last_line_of_screen
-      start_terminal(3, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("333333333333333\C-a\C-f\e\C-m")
-      assert_screen(<<~EOC)
-        prompt> 3
-        prompt> 333333333333
-        33
-      EOC
-      close
-    end
-
-    def test_insert_after_clear
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\n  01234\nend\C-l\C-p5678")
-      assert_screen(<<~EOC)
-        prompt> def a
-        prompt>   056781234
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_foced_newline_insertion
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      #write("def a\nend\C-p\C-e\e\C-m  3")
-      write("def a\nend\C-p\C-e\e\x0D")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def a
-        prompt>
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_multiline_incremental_search
-      start_terminal(6, 25, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\n  8\nend\ndef b\n  3\nend\C-s8")
-      assert_screen(<<~EOC)
-        prompt>   8
-        prompt> end
-        => :a
-        (i-search)`8'def a
-        (i-search)`8'  8
-        (i-search)`8'end
-      EOC
-      close
-    end
-
-    def test_multiline_incremental_search_finish
-      start_terminal(6, 25, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\n  8\nend\ndef b\n  3\nend\C-r8\C-j")
-      assert_screen(<<~EOC)
-        prompt>   8
-        prompt> end
-        => :a
-        prompt> def a
-        prompt>   8
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_binding_for_vi_movement_mode
-      write_inputrc <<~LINES
-        set editing-mode vi
-        "\\C-a": vi-movement-mode
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":1234\C-ahhhi0")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :01234
-      EOC
-      close
-    end
-
-    def test_broken_prompt_list
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --broken-dynamic-prompt}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  3\nend")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [0000]> def hoge
-        [0001]>   3
-        [0001]> end
-      EOC
-      close
-    end
-
-    def test_no_escape_sequence_passed_to_dynamic_prompt
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl  --autocomplete --color-bold --broken-dynamic-prompt-assert-no-escape-sequence}, startup_message: 'Multiline REPL.')
-      write("%[ S")
-      write("\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [0000]> %[ S
-        [0001]>
-      EOC
-      close
-    end
-
-    def test_bracketed_paste
-      omit if Reline.core.io_gate.win?
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("\e[200~def hoge\r\t3\rend\e[201~")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   3
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_bracketed_paste_with_undo_redo
-      omit if Reline.core.io_gate.win?
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("abc")
-      write("\e[200~def hoge\r\t3\rend\e[201~")
-      write("\C-_")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> abc
-      EOC
-      write("\M-\C-_")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> abcdef hoge
-        prompt>   3
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_backspace_until_returns_to_initial
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("ABC")
-      write("\C-h\C-h\C-h")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt>
-      EOC
-      close
-    end
-
-    def test_longer_than_screen_height
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(<<~EOC.chomp)
-        def each_top_level_statement
-          initialize_input
-          catch(:TERM_INPUT) do
-            loop do
-              begin
-                prompt
-                unless l = lex
-                  throw :TERM_INPUT if @line == ''
-                else
-                  @line_no += l.count("\n")
-                  next if l == "\n"
-                  @line.concat l
-                  if @code_block_open or @ltype or @continue or @indent > 0
-                    next
-                  end
-                end
-                if @line != "\n"
-                  @line.force_encoding(@io.encoding)
-                  yield @line, @exp_line_no
-                end
-                break if @io.eof?
-                @line = ''
-                @exp_line_no = @line_no
-                #
-                @indent = 0
-              rescue TerminateLineInput
-                initialize_input
-                prompt
-              end
-            end
-          end
-        end
-      EOC
-      assert_screen(<<~EOC)
-        prompt>         prompt
-        prompt>       end
-        prompt>     end
-        prompt>   end
-        prompt> end
-      EOC
-      write("\C-p" * 6)
-      assert_screen(<<~EOC)
-        prompt>       rescue Terminate
-        LineInput
-        prompt>         initialize_inp
-        ut
-        prompt>         prompt
-      EOC
-      write("\C-n" * 4)
-      assert_screen(<<~EOC)
-        prompt>         initialize_inp
-        ut
-        prompt>         prompt
-        prompt>       end
-        prompt>     end
-      EOC
-      close
-    end
-
-    def test_longer_than_screen_height_nearest_cursor_with_scroll_back
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(<<~EOC.chomp)
-        if 1
-          if 2
-            if 3
-              if 4
-                puts
-              end
-            end
-          end
-        end
-      EOC
-      write("\C-p" * 4 + "\C-e" + "\C-p" * 4)
-      write("2")
-      assert_screen(<<~EOC)
-        prompt> if 12
-        prompt>   if 2
-        prompt>     if 3
-        prompt>       if 4
-        prompt>         puts
-      EOC
-      close
-    end
-
-    def test_update_cursor_correctly_when_just_cursor_moving
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  01234678")
-      write("\C-p")
-      write("\C-b")
-      write("\C-n")
-      write('5')
-      write("\C-e")
-      write('9')
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   0123456789
-      EOC
-      close
-    end
-
-    def test_auto_indent
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      "def hoge\nputs(\n1,\n2\n)\nend".lines do |line|
-        write line
-      end
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   puts(
-        prompt>     1,
-        prompt>     2
-        prompt>   )
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_auto_indent_when_inserting_line
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write 'aa(bb(cc(dd(ee('
-      write "\C-b" * 5 + "\n"
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> aa(bb(cc(d
-        prompt>       d(ee(
-      EOC
-      close
-    end
-
-    def test_auto_indent_multibyte_insert_line
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write "if true\n"
-      write "あいうえお\n"
-      4.times { write "\C-b\C-b\C-b\C-b\e\r" }
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> if true
-        prompt>   あ
-        prompt>   い
-        prompt>   う
-        prompt>   え
-        prompt>   お
-        prompt>
-      EOC
-      close
-    end
-
-    def test_newline_after_wrong_indent
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write "if 1\n    aa"
-      write "\n"
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> if 1
-        prompt>   aa
-        prompt>
-      EOC
-      close
-    end
-
-    def test_suppress_auto_indent_just_after_pasted
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  [[\n      3]]\ned")
-      write("\C-bn")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   [[
-        prompt>       3]]
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_suppress_auto_indent_for_adding_newlines_in_pasting
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write("<<~Q\n")
-      write("{\n  #\n}")
-      write("#")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> <<~Q
-        prompt> {
-        prompt>   #
-        prompt> }#
-      EOC
-      close
-    end
-
-    def test_auto_indent_with_various_spaces
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write "(\n\C-v"
-      write "\C-k\n\C-v"
-      write "\C-k)"
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> (
-        prompt> ^K
-        prompt> )
-      EOC
-      close
-    end
-
-    def test_autowrap_in_the_middle_of_a_line
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def abcdefg; end\C-b\C-b\C-b\C-b\C-b")
-      %w{h i}.each do |c|
-        write(c)
-      end
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def abcdefgh
-        i; end
-      EOC
-      close
-    end
-
-    def test_terminate_in_the_middle_of_lines
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  1\n  2\n  3\n  4\nend\n")
-      write("\C-p\C-p\C-p\C-e\n")
-      assert_screen(<<~EOC)
-        prompt>   3
-        prompt>   4
-        prompt> end
-        => :hoge
-        prompt>
-      EOC
-      close
-    end
-
-    def test_dynamic_prompt_returns_empty
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dynamic-prompt-returns-empty}, startup_message: 'Multiline REPL.')
-      write("def hoge\nend\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt> end
-        => :hoge
-        prompt>
-      EOC
-      close
-    end
-
-    def test_reset_rest_height_when_clear_screen
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("\n\n\n\C-l3\n")
-      assert_screen(<<~EOC)
-        prompt> 3
-        => 3
-        prompt>
-      EOC
-      close
-    end
-
-    def test_meta_key
-      start_terminal(30, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def ge\M-bho")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-      EOC
-      close
-    end
-
-    def test_not_meta_key
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("おだんご") # "だ" in UTF-8 contains "\xA0"
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> おだんご
-      EOC
-      close
-    end
-
-    def test_force_enter
-      start_terminal(30, 120, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def hoge\nend\C-p\C-e")
-      write("\M-\x0D")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_nontty
-      omit if Reline.core.io_gate.win?
-      cmd = %Q{ruby -e 'puts(%Q{ello\C-ah\C-e})' | ruby -I#{@pwd}/lib -rreline -e 'p Reline.readline(%{> })' | ruby -e 'print STDIN.read'}
-      start_terminal(40, 50, ['bash', '-c', cmd])
-      assert_screen(<<~'EOC')
-        > hello
-        "hello"
-      EOC
-      close
-    end
-
-    def test_eof_with_newline
-      omit if Reline.core.io_gate.win?
-      cmd = %Q{ruby -e 'print(%Q{abc def \\e\\r})' | ruby -I#{@pwd}/lib -rreline -e 'p Reline.readline(%{> })'}
-      start_terminal(40, 50, ['bash', '-c', cmd])
-      assert_screen(<<~'EOC')
-        > abc def
-        "abc def "
-      EOC
-      close
-    end
-
-    def test_eof_without_newline
-      omit if Reline.core.io_gate.win?
-      cmd = %Q{ruby -e 'print(%{hello})' | ruby -I#{@pwd}/lib -rreline -e 'p Reline.readline(%{> })'}
-      start_terminal(40, 50, ['bash', '-c', cmd])
-      assert_screen(<<~'EOC')
-        > hello
-        "hello"
-      EOC
-      close
-    end
-
-    def test_em_set_mark_and_em_exchange_mark
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("aaa bbb ccc ddd\M-b\M-b\M-\x20\M-b\C-x\C-xX\C-x\C-xY")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> aaa Ybbb Xccc ddd
-      EOC
-      close
-    end
-
-    def test_multiline_completion
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  St\n  St\C-p\t")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   String
-        prompt>   St
-      EOC
-      close
-    end
-
-    def test_completion_journey_2nd_line
-      write_inputrc <<~LINES
-        set editing-mode vi
-      LINES
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  S\C-n")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   String
-      EOC
-      close
-    end
-
-    def test_completion_journey_with_empty_line
-      write_inputrc <<~LINES
-        set editing-mode vi
-      LINES
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete}, startup_message: 'Multiline REPL.')
-      write("\C-n\C-p")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>
-      EOC
-      close
-    end
-
-    def test_completion_menu_is_displayed_horizontally
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete}, startup_message: 'Multiline REPL.')
-      write("S\t\t")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> S
-        ScriptError  String
-        Signal       SyntaxError
-      EOC
-      close
-    end
-
-    def test_show_all_if_ambiguous_on
-      write_inputrc <<~LINES
-        set show-all-if-ambiguous on
-      LINES
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete}, startup_message: 'Multiline REPL.')
-      write("S\t")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> S
-        ScriptError  String
-        Signal       SyntaxError
-      EOC
-      close
-    end
-
-    def test_show_all_if_ambiguous_on_and_menu_with_perfect_match
-      write_inputrc <<~LINES
-        set show-all-if-ambiguous on
-      LINES
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete-menu-with-perfect-match}, startup_message: 'Multiline REPL.')
-      write("a\t")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> abs
-        abs   abs2
-      EOC
-      close
-    end
-
-    def test_simple_dialog
-      iterate_over_face_configs do |config_name, config_file|
-        start_terminal(20, 50, %W{ruby -I#{@pwd}/lib -r#{config_file.path} #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: 'Multiline REPL.')
-        write('a')
-        write('b')
-        write('c')
-        write("\C-h")
-        close
-        assert_screen(<<~'EOC', "Failed with `#{config_name}` in Face")
-          Multiline REPL.
-          prompt> ab
-                    Ruby is...
-                    A dynamic, open source programming
-                    language with a focus on simplicity
-                    and productivity. It has an elegant
-                    syntax that is natural to read and
-                    easy to write.
-        EOC
-      end
-    end
-
-    def test_simple_dialog_at_right_edge
-      iterate_over_face_configs do |config_name, config_file|
-        start_terminal(20, 40, %W{ruby -I#{@pwd}/lib -r#{config_file.path} #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: 'Multiline REPL.')
-        write('a')
-        write('b')
-        write('c')
-        write("\C-h")
-        close
-        assert_screen(<<~'EOC')
-          Multiline REPL.
-          prompt> ab
-               Ruby is...
-               A dynamic, open source programming
-               language with a focus on simplicity
-               and productivity. It has an elegant
-               syntax that is natural to read and
-               easy to write.
-        EOC
-      end
-    end
-
-    def test_dialog_scroll_pushup_condition
-      iterate_over_face_configs do |config_name, config_file|
-        start_terminal(10, 50, %W{ruby -I#{@pwd}/lib -r#{config_file.path} #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-        write("\n" * 10)
-        write("if 1\n  sSts\nend")
-        write("\C-p\C-h\C-e\C-h")
-        assert_screen(<<~'EOC')
-          prompt>
-          prompt>
-          prompt>
-          prompt>
-          prompt>
-          prompt>
-          prompt> if 1
-          prompt>   St
-          prompt> enString
-                    Struct
-        EOC
-        close
-      end
-    end
-
-    def test_simple_dialog_with_scroll_screen
-      iterate_over_face_configs do |config_name, config_file|
-        start_terminal(5, 50, %W{ruby -I#{@pwd}/lib -r#{config_file.path} #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: /prompt>/)
-        write("if 1\n  2\n  3\n  4\n  5\n  6")
-        write("\C-p\C-n\C-p\C-p\C-p#")
-        close
-        assert_screen(<<~'EOC')
-          prompt>   2
-          prompt>   3#
-          prompt>   4
-          prompt>   5 Ruby is...
-          prompt>   6 A dynamic, open source programming
-        EOC
-      end
-    end
-
-    def test_autocomplete_at_bottom
-      start_terminal(15, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('def hoge' + "\C-m" * 10 + "end\C-p  ")
-      write('S')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>
-        prompt>
-        prompt>   String
-        prompt>   Struct
-        prompt>   Symbol
-        prompt>   ScriptError
-        prompt>   SyntaxError
-        prompt>   Signal
-        prompt>   S
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_autocomplete_return_to_original
-      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('S')
-      write('t')
-      write('r')
-      3.times{ write("\C-i") }
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Str
-                String
-                Struct
-      EOC
-      close
-    end
-
-    def test_autocomplete_target_is_wrapped
-      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('          ')
-      write('S')
-      write('t')
-      write('r')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>           St
-        r
-        String
-        Struct
-      EOC
-      close
-    end
-
-    def test_autocomplete_target_at_end_of_line
-      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('         ')
-      write('Str')
-      write("\C-i")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>          Str
-        ing           String
-                      Struct
-      EOC
-      close
-    end
-
-    def test_autocomplete_completed_input_is_wrapped
-      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('        ')
-      write('Str')
-      write("\C-i")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>         Stri
-        ng            String
-                      Struct
-      EOC
-      close
-    end
-
-    def test_force_insert_before_autocomplete
-      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('Sy')
-      write(";St\t\t")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Sy;Struct
-                   String
-                   Struct
-      EOC
-      close
-    end
-
-    def test_simple_dialog_with_scroll_key
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog long,scrollkey}, startup_message: 'Multiline REPL.')
-      write('a')
-      5.times{ write('j') }
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> a
-                 A dynamic, open
-                 source programming
-                 language with a
-                 focus on simplicity
-      EOC
-      close
-    end
-
-    def test_simple_dialog_scrollbar_with_moving_to_right
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog long,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
-      6.times{ write('j') }
-      write('a')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> a
-                 source programming ▄
-                 language with a    █
-                 focus on simplicity
-                 and productivity.
-      EOC
-      close
-    end
-
-    def test_simple_dialog_scrollbar_with_moving_to_left
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog long,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
-      write('a')
-      6.times{ write('j') }
-      write("\C-h")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>
-                source programming ▄
-                language with a    █
-                focus on simplicity
-                and productivity.
-      EOC
-      close
-    end
-
-    def test_dialog_with_fullwidth_chars
-      ENV['RELINE_TEST_PROMPT'] = '> '
-      start_terminal(20, 5, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
-      6.times{ write('j') }
-      assert_screen(<<~'EOC')
-        Multi
-        line
-        REPL.
-        >
-        オー
-        グ言▄
-        備え█
-        ち、█
-      EOC
-      close
-    end
-
-    def test_dialog_with_fullwidth_chars_split
-      ENV['RELINE_TEST_PROMPT'] = '> '
-      start_terminal(20, 6, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
-      6.times{ write('j') }
-      assert_screen(<<~'EOC')
-        Multil
-        ine RE
-        PL.
-        >
-        オー
-        グ言 ▄
-        備え █
-        ち、 █
-      EOC
-      close
-    end
-
-    def test_autocomplete_empty
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('Street')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Street
-      EOC
-      close
-    end
-
-    def test_autocomplete
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('Str')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Str
-                String
-                Struct
-      EOC
-      close
-    end
-
-    def test_autocomplete_empty_string
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("\C-i")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> String
-                String     █
-                Struct     ▀
-                Symbol
-      EOC
-      close
-    end
-
-    def test_paste_code_with_tab_indent_does_not_fail
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-empty}, startup_message: 'Multiline REPL.')
-      write("2.times do\n\tputs\n\tputs\nend")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> 2.times do
-        prompt> puts
-        prompt> puts
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_autocomplete_after_2nd_line
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  Str")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   Str
-                  String
-                  Struct
-      EOC
-      close
-    end
-
-    def test_autocomplete_rerender_under_dialog
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("def hoge\n\n  123456\n  456789\nend\C-p\C-p\C-p  a = Str")
-      write('i')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   a = Stri
-        prompt>   1234String
-        prompt>   456789
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_rerender_multiple_dialog
-      start_terminal(20, 60, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete --dialog simple}, startup_message: 'Multiline REPL.')
-      write("if\n  abcdef\n  123456\n  456789\nend\C-p\C-p\C-p\C-p Str")
-      write("\t")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> if String
-        prompt>   aStringRuby is...
-        prompt>   1StructA dynamic, open source programming
-        prompt>   456789 language with a focus on simplicity
-        prompt> end      and productivity. It has an elegant
-                         syntax that is natural to read and
-                         easy to write.
-      EOC
-      close
-    end
-
-    def test_autocomplete_long_with_scrollbar
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-long}, startup_message: 'Multiline REPL.')
-      write('S')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> S
-                String          █
-                Struct          █
-                Symbol          █
-                StopIteration   █
-                SystemCallError █
-                SystemExit      █
-                SystemStackError█
-                ScriptError     █
-                SyntaxError     █
-                Signal          █
-                SizedQueue      █
-                Set
-                SecureRandom
-                Socket
-                StringIO
-      EOC
-      write("\C-i" * 16)
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> StringScanner
-                Struct          ▄
-                Symbol          █
-                StopIteration   █
-                SystemCallError █
-                SystemExit      █
-                SystemStackError█
-                ScriptError     █
-                SyntaxError     █
-                Signal          █
-                SizedQueue      █
-                Set             █
-                SecureRandom    ▀
-                Socket
-                StringIO
-                StringScanner
-      EOC
-      close
-    end
-
-    def test_autocomplete_super_long_scroll_to_bottom
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-super-long}, startup_message: 'Multiline REPL.')
-      shift_tab = [27, 91, 90]
-      write('S' + shift_tab.map(&:chr).join)
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Str_BXX
-                Str_BXJ
-                Str_BXK
-                Str_BXL
-                Str_BXM
-                Str_BXN
-                Str_BXO
-                Str_BXP
-                Str_BXQ
-                Str_BXR
-                Str_BXS
-                Str_BXT
-                Str_BXU
-                Str_BXV
-                Str_BXW
-                Str_BXX▄
-      EOC
-      close
-    end
-
-    def test_autocomplete_super_long_and_backspace
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-super-long}, startup_message: 'Multiline REPL.')
-      shift_tab = [27, 91, 90]
-      write('S' + shift_tab.map(&:chr).join)
-      write("\C-h")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Str_BX
-                Str_BX █
-                Str_BXA█
-                Str_BXB█
-                Str_BXC█
-                Str_BXD█
-                Str_BXE█
-                Str_BXF█
-                Str_BXG█
-                Str_BXH█
-                Str_BXI
-                Str_BXJ
-                Str_BXK
-                Str_BXL
-                Str_BXM
-                Str_BXN
-      EOC
-      close
-    end
-
-    def test_dialog_callback_returns_nil
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog nil}, startup_message: 'Multiline REPL.')
-      write('a')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> a
-      EOC
-      close
-    end
-
-    def test_dialog_narrower_than_screen
-      start_terminal(20, 11, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: 'Multiline REPL.')
-      assert_screen(<<~'EOC')
-        Multiline R
-        EPL.
-        prompt>
-        Ruby is...
-        A dynamic,
-        language wi
-        and product
-        syntax that
-        easy to wri
-      EOC
-      close
-    end
-
-    def test_dialog_narrower_than_screen_with_scrollbar
-      start_terminal(20, 11, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-long}, startup_message: 'Multiline REPL.')
-      write('S' + "\C-i" * 3)
-      assert_screen(<<~'EOC')
-        Multiline R
-        EPL.
-        prompt> Sym
-        String    █
-        Struct    █
-        Symbol    █
-        StopIterat█
-        SystemCall█
-        SystemExit█
-        SystemStac█
-        ScriptErro█
-        SyntaxErro█
-        Signal    █
-        SizedQueue█
-        Set
-        SecureRand
-        Socket
-        StringIO
-      EOC
-      close
-    end
-
-    def test_dialog_with_fullwidth_scrollbar
-      start_terminal(20, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple,scrollkey,alt-scrollbar}, startup_message: 'Multiline REPL.')
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>
-           Ruby is...                         ::
-           A dynamic, open source programming ::
-           language with a focus on simplicity''
-           and productivity. It has an elegant
-      EOC
-      close
-    end
-
-    def test_rerender_argument_prompt_after_pasting
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write('abcdef')
-      write("\M-3\C-h")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> abc
-      EOC
-      close
-    end
-
-    def test_autocomplete_old_dialog_width_greater_than_dialog_width
-      start_terminal(40, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-width-long}, startup_message: 'Multiline REPL.')
-      write("0+ \n12345678901234")
-      write("\C-p")
-      write("r")
-      write("a")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> 0+ ra
-        prompt> 123rand 901234
-                   raise
-      EOC
-      close
-    end
-
-    def test_scroll_at_bottom_for_dialog
-      start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("\n\n\n\n\n\n\n\n\n\n\n")
-      write("def hoge\n\nend\C-p\C-e")
-      write("  S")
-      assert_screen(<<~'EOC')
-        prompt>
-        prompt>
-        prompt>
-        prompt>
-        prompt>
-        prompt> def hoge
-        prompt>   S
-        prompt> enString     █
-                  Struct     ▀
-                  Symbol
-      EOC
-      close
-    end
-
-    def test_clear_dialog_in_pasting
-      start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("S")
-      write("tring ")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> String
-      EOC
-      close
-    end
-
-    def test_prompt_with_newline
-      ENV['RELINE_TEST_PROMPT'] = "::\n> "
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  3\nend")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        ::\n> def hoge
-        ::\n>   3
-        ::\n> end
-      EOC
-      close
-    end
-
-    def test_dynamic_prompt_with_newline
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dynamic-prompt-with-newline}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  3\nend")
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        [0000\n]> def hoge
-        [0001\n]>   3
-        [0001\n]> end
-      EOC
-      close
-    end
-
-    def test_lines_passed_to_dynamic_prompt
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dynamic-prompt-show-line}, startup_message: 'Multiline REPL.')
-      write("if true")
-      write("\n")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [if t]> if true
-        [    ]>
-      EOC
-      close
-    end
-
-    def test_clear_dialog_when_just_move_cursor_at_last_line
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("class A\n  3\nend\n\n\n")
-      write("\C-p\C-p\C-e; S")
-      assert_screen(/String/)
-      write("\C-n")
-      write(";")
-      assert_screen(<<~'EOC')
-        prompt>   3
-        prompt> end
-        => 3
-        prompt>
-        prompt>
-        prompt> class A
-        prompt>   3; S
-        prompt> end;
-      EOC
-      close
-    end
-
-    def test_clear_dialog_when_adding_new_line_to_end_of_buffer
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("class A\n  def a\n    3\n    3\n  end\nend")
-      write("\n")
-      write("class S")
-      write("\n")
-      write("  3")
-      assert_screen(<<~'EOC')
-        prompt>   def a
-        prompt>     3
-        prompt>     3
-        prompt>   end
-        prompt> end
-        => :a
-        prompt> class S
-        prompt>   3
-      EOC
-      close
-    end
-
-    def test_insert_newline_in_the_middle_of_buffer_just_after_dialog
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("class A\n  def a\n    3\n  end\nend")
-      write("\n")
-      write("\C-p\C-p\C-p\C-p\C-p\C-e\C-hS")
-      write("\M-\x0D")
-      write("  3")
-      assert_screen(<<~'EOC')
-        prompt>     3
-        prompt>   end
-        prompt> end
-        => :a
-        prompt> class S
-        prompt>   3
-        prompt>   def a
-        prompt>     3
-        prompt>   end
-        prompt> end
-      EOC
-      close
-    end
-
-    def test_incremental_search_on_not_last_line
-      start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("def abc\nend\n")
-      write("def def\nend\n")
-      write("\C-p\C-p\C-e")
-      write("\C-r")
-      write("a")
-      write("\n\n")
-      assert_screen(<<~'EOC')
-        prompt> def abc
-        prompt> end
-        => :abc
-        prompt> def def
-        prompt> end
-        => :def
-        prompt> def abc
-        prompt> end
-        => :abc
-        prompt>
-      EOC
-      close
-    end
-
-    def test_bracket_newline_indent
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write("[\n")
-      write("1")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> [
-        prompt>   1
-      EOC
-      close
-    end
-
-    def test_repeated_input_delete
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("a\C-h" * 4000)
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>
-      EOC
-      close
-    end
-
-    def test_exit_with_ctrl_d
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      begin
-        write("\C-d")
-        close
-      rescue EOFError
-        # EOFError is raised when process terminated.
-      end
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt>
-      EOC
-      close
-    end
-
-    def test_print_before_readline
-      code = <<~RUBY
-        puts 'Multiline REPL.'
-        2.times do
-          print 'a' * 10
-          Reline.readline '>'
-        end
-      RUBY
-      start_terminal(6, 30, ['ruby', "-I#{@pwd}/lib", '-rreline', '-e', code], startup_message: 'Multiline REPL.')
-      write "x\n"
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        >x
-        >
-      EOC
-      close
-    end
-
-    def test_pre_input_hook_with_redisplay
-      code = <<~'RUBY'
-        puts 'Multiline REPL.'
-        Reline.pre_input_hook = -> do
-          Reline.insert_text 'abc'
-          Reline.redisplay # Reline doesn't need this but Readline requires calling redisplay
-        end
-        Reline.readline('prompt> ')
-      RUBY
-      start_terminal(6, 30, ['ruby', "-I#{@pwd}/lib", '-rreline', '-e', code], startup_message: 'Multiline REPL.')
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> abc
-      EOC
-      close
-    end
-
-    def test_pre_input_hook_with_multiline_text_insert
-      # Frequently used pattern of pre_input_hook
-      code = <<~'RUBY'
-        puts 'Multiline REPL.'
-        Reline.pre_input_hook = -> do
-          Reline.insert_text "abc\nef"
-        end
-        Reline.readline('>')
-      RUBY
-      start_terminal(6, 30, ['ruby', "-I#{@pwd}/lib", '-rreline', '-e', code], startup_message: 'Multiline REPL.')
-      write("\C-ad")
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        >abc
-        def
-      EOC
-      close
-    end
-
-    def test_thread_safe
-      start_terminal(6, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write("[Thread.new{Reline.readline'>'},Thread.new{Reline.readmultiline('>'){true}}].map(&:join).size\n")
-      write("exit\n")
-      write("exit\n")
-      write("42\n")
-      assert_screen(<<~EOC)
-        >exit
-        >exit
-        => 2
-        prompt> 42
-        => 42
-        prompt>
-      EOC
-      close
-    end
-
-    def test_user_defined_winch
-      omit if Reline.core.io_gate.win?
-      pidfile = Tempfile.create('pidfile')
-      rubyfile = Tempfile.create('rubyfile')
-      rubyfile.write <<~RUBY
-        File.write(#{pidfile.path.inspect}, Process.pid)
-        winch_called = false
-        Signal.trap(:WINCH, ->(_arg){ winch_called = true })
-        p Reline.readline('>')
-        puts "winch: \#{winch_called}"
-      RUBY
-      rubyfile.close
-
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib -rreline #{rubyfile.path}})
-      assert_screen(/^>/)
-      write 'a'
-      assert_screen(/^>a/)
-      pid = pidfile.tap(&:rewind).read.to_i
-      Process.kill(:WINCH, pid) unless pid.zero?
-      write "b\n"
-      assert_screen(/"ab"\nwinch: true/)
-      close
-    ensure
-      File.delete(rubyfile.path) if rubyfile
-      pidfile.close if pidfile
-      File.delete(pidfile.path) if pidfile
-    end
-
-    def test_stop_continue
-      omit if Reline.core.io_gate.win?
-      pidfile = Tempfile.create('pidfile')
-      rubyfile = Tempfile.create('rubyfile')
-      rubyfile.write <<~RUBY
-        File.write(#{pidfile.path.inspect}, Process.pid)
-        cont_called = false
-        Signal.trap(:CONT, ->(_arg){ cont_called = true })
-        Reline.readmultiline('>'){|input| input.match?(/ghi/) }
-        puts "cont: \#{cont_called}"
-      RUBY
-      rubyfile.close
-      start_terminal(10, 50, ['bash'])
-      write "ruby -I#{@pwd}/lib -rreline #{rubyfile.path}\n"
-      assert_screen(/^>/)
-      write "abc\ndef\nhi"
-      pid = pidfile.tap(&:rewind).read.to_i
-      Process.kill(:STOP, pid) unless pid.zero?
-      write "fg\n"
-      assert_screen(/fg\n.*>/m)
-      write "\ebg"
-      assert_screen(/>abc\n>def\n>ghi\n/)
-      write "\n"
-      assert_screen(/cont: true/)
-      close
-    ensure
-      File.delete(rubyfile.path) if rubyfile
-      pidfile.close if pidfile
-      File.delete(pidfile.path) if pidfile
-    end
-
-    def write_inputrc(content)
-      File.open(@inputrc_file, 'w') do |f|
-        f.write content
-      end
-    end
-
-    def fold_multiline(str, width)
-      str.scan(/.{1,#{width}}/).each(&:rstrip!).join("\n")
-    end
-  end
-rescue LoadError, NameError
-  # On Ruby repository, this test suit doesn't run because Ruby repo doesn't
-  # have the yamatanooroti gem.
-end
diff --git a/test/mri/resolv/test_dns.rb b/test/mri/resolv/test_dns.rb
index 0a06fba3e70..d5d2648e1bc 100644
--- a/test/mri/resolv/test_dns.rb
+++ b/test/mri/resolv/test_dns.rb
@@ -525,6 +525,8 @@ def test_no_server
       if RUBY_PLATFORM.match?(/mingw/)
         # cannot repo locally
         omit 'Timeout Error on MinGW CI'
+      elsif macos?([26,1]..[])
+        omit 'Timeout Error on macOS 26.1+'
       else
         raise Timeout::Error
       end
@@ -627,6 +629,13 @@ def test_too_big_label_address
     assert_operator(2**14, :<, m.to_s.length)
   end
 
+  def test_too_long_address
+    too_long_address_message = [0, 0, 1, 0, 0, 0].pack("n*") + "\x01x" * 129 + [0, 0, 0].pack("cnn")
+    assert_raise_with_message(Resolv::DNS::DecodeError, /name label data exceed 255 octets/) do
+      Resolv::DNS::Message.decode too_long_address_message
+    end
+  end
+
   def assert_no_fd_leak
     socket = assert_throw(self) do |tag|
       Resolv::DNS.stub(:bind_random_port, ->(s, *) {throw(tag, s)}) do
diff --git a/test/mri/resolv/test_win32_config.rb b/test/mri/resolv/test_win32_config.rb
new file mode 100644
index 00000000000..6167af6605d
--- /dev/null
+++ b/test/mri/resolv/test_win32_config.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'test/unit'
+require 'resolv'
+
+if defined?(Win32::Resolve)
+  class TestWin32Config < Test::Unit::TestCase
+    def test_get_item_property_string
+      # Test reading a string registry value
+      result = Win32::Resolv.send(:get_hosts_dir)
+
+      # Should return a string (empty or with a path)
+      assert_instance_of String, result
+    end
+
+    # Test reading a non-existent registry key
+    def test_nonexistent_key
+      assert_nil(Win32::Resolv.send(:tcpip_params) {|reg| reg.open('NonExistentKeyThatShouldNotExist')})
+    end
+
+    # Test reading a non-existent registry value
+    def test_nonexistent_value
+      assert_nil(Win32::Resolv.send(:tcpip_params) {|reg| reg.value('NonExistentKeyThatShouldNotExist')})
+    end
+  end
+end
diff --git a/test/mri/ripper/assert_parse_files.rb b/test/mri/ripper/assert_parse_files.rb
index 81f59b7124b..0d583a99e3e 100644
--- a/test/mri/ripper/assert_parse_files.rb
+++ b/test/mri/ripper/assert_parse_files.rb
@@ -3,8 +3,7 @@
 
 module TestRipper; end
 class TestRipper::Generic < Test::Unit::TestCase
-  # Modified for JRuby
-  SRCDIR = File.expand_path("../../../..", __FILE__)
+  SRCDIR = File.expand_path("../../..", __FILE__)
 
   def assert_parse_files(dir, pattern = "**/*.rb", exclude: nil, gc_stress: GC.stress, test_ratio: nil)
     test_ratio ||= ENV["TEST_RIPPER_RATIO"]&.tap {|s|break s.to_f} || 0.05 # testing all files needs too long time...
diff --git a/test/mri/ripper/test_files_ext.rb b/test/mri/ripper/test_files_ext.rb
index 121fff38e66..b77ec0fc8de 100644
--- a/test/mri/ripper/test_files_ext.rb
+++ b/test/mri/ripper/test_files_ext.rb
@@ -1,7 +1,6 @@
 require_relative 'assert_parse_files.rb'
 class TestRipper::Generic
-  # Modified for JRuby internal Ruby sources, roughly equivalent to ext
-  %w[core/src/main/ruby].each do |dir|
+  %w[ext].each do |dir|
     define_method("test_parse_files:#{dir}") do
       assert_parse_files(dir)
     end
diff --git a/test/mri/ripper/test_files_lib.rb b/test/mri/ripper/test_files_lib.rb
index 9e249ae8a9e..19f204da568 100644
--- a/test/mri/ripper/test_files_lib.rb
+++ b/test/mri/ripper/test_files_lib.rb
@@ -1,7 +1,6 @@
 require_relative 'assert_parse_files.rb'
 class TestRipper::Generic
-  # Modified for JRuby stdlib location
-  %w[lib/ruby/stdlib].each do |dir|
+  %w[lib].each do |dir|
     define_method("test_parse_files:#{dir}") do
       assert_parse_files(dir, "*.rb")
     end
diff --git a/test/mri/ripper/test_files_sample.rb b/test/mri/ripper/test_files_sample.rb
index cf8f93b2d13..57538b1358b 100644
--- a/test/mri/ripper/test_files_sample.rb
+++ b/test/mri/ripper/test_files_sample.rb
@@ -1,7 +1,6 @@
 require_relative 'assert_parse_files.rb'
 class TestRipper::Generic
-  # Modified for JRuby's samples dir
-  %w[samples].each do |dir|
+  %w[sample].each do |dir|
     define_method("test_parse_files:#{dir}") do
       assert_parse_files(dir)
     end
diff --git a/test/mri/ripper/test_files_test.rb b/test/mri/ripper/test_files_test.rb
index e8fd01e1c53..5a8e368c718 100644
--- a/test/mri/ripper/test_files_test.rb
+++ b/test/mri/ripper/test_files_test.rb
@@ -1,7 +1,6 @@
 require_relative 'assert_parse_files.rb'
 class TestRipper::Generic
-  # Modified for JRuby's copy of CRuby tests
-  %w[test/mri].each do |dir|
+  %w[test].each do |dir|
     define_method("test_parse_files:#{dir}") do
       assert_parse_files(dir, "*.rb")
     end
diff --git a/test/mri/ripper/test_files_test_1.rb b/test/mri/ripper/test_files_test_1.rb
index 71f6d81c508..25db87783ea 100644
--- a/test/mri/ripper/test_files_test_1.rb
+++ b/test/mri/ripper/test_files_test_1.rb
@@ -1,7 +1,6 @@
 require_relative 'assert_parse_files.rb'
 class TestRipper::Generic
-  # Modified for JRuby's copy of CRuby tests
-  Dir["#{SRCDIR}/test/mri/[-a-n]*/"].each do |dir|
+  Dir["#{SRCDIR}/test/[-a-n]*/"].each do |dir|
     dir = dir[(SRCDIR.length+1)..-2]
     define_method("test_parse_files:#{dir}") do
       assert_parse_files(dir)
diff --git a/test/mri/ripper/test_files_test_2.rb b/test/mri/ripper/test_files_test_2.rb
index d7fd0a90fa0..24e935e71eb 100644
--- a/test/mri/ripper/test_files_test_2.rb
+++ b/test/mri/ripper/test_files_test_2.rb
@@ -1,7 +1,6 @@
 require_relative 'assert_parse_files.rb'
 class TestRipper::Generic
-  # Modified for JRuby's copy of CRuby tests
-  Dir["#{SRCDIR}/test/mri/[o-z]*/"].each do |dir|
+  Dir["#{SRCDIR}/test/[o-z]*/"].each do |dir|
     dir = dir[(SRCDIR.length+1)..-2]
     define_method("test_parse_files:#{dir}") do
       assert_parse_files(dir)
diff --git a/test/mri/ripper/test_lexer.rb b/test/mri/ripper/test_lexer.rb
index 4e8c0003db7..7a2c22ff2d1 100644
--- a/test/mri/ripper/test_lexer.rb
+++ b/test/mri/ripper/test_lexer.rb
@@ -344,6 +344,47 @@ def test_nested_heredoc
     ]
 
     assert_lexer(expected, code)
+
+    code = <<~'HEREDOC'
+      <<H1
+      #{<<H2}a
+      H2
+      b
+    HEREDOC
+
+    expected = [
+      [[1, 0], :on_heredoc_beg, "<<H1", state(:EXPR_BEG)],
+      [[1, 4], :on_nl, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_embexpr_beg, "\#{", state(:EXPR_BEG)],
+      [[2, 2], :on_heredoc_beg, "<<H2", state(:EXPR_BEG)],
+      [[2, 6], :on_embexpr_end, "}", state(:EXPR_END)],
+      [[2, 7], :on_tstring_content, "a\n", state(:EXPR_BEG)],
+      [[3, 0], :on_heredoc_end, "H2\n", state(:EXPR_BEG)],
+      [[4, 0], :on_tstring_content, "b\n", state(:EXPR_BEG)]
+    ]
+
+    assert_lexer(expected, code)
+
+    code = <<~'HEREDOC'
+      <<H1
+      #{<<H2}a
+      H2
+      b
+      c
+    HEREDOC
+
+    expected = [
+      [[1, 0], :on_heredoc_beg, "<<H1", state(:EXPR_BEG)],
+      [[1, 4], :on_nl, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_embexpr_beg, "\#{", state(:EXPR_BEG)],
+      [[2, 2], :on_heredoc_beg, "<<H2", state(:EXPR_BEG)],
+      [[2, 6], :on_embexpr_end, "}", state(:EXPR_END)],
+      [[2, 7], :on_tstring_content, "a\n", state(:EXPR_BEG)],
+      [[3, 0], :on_heredoc_end, "H2\n", state(:EXPR_BEG)],
+      [[4, 0], :on_tstring_content, "b\nc\n", state(:EXPR_BEG)]
+    ]
+
+    assert_lexer(expected, code)
   end
 
   def test_invalid_escape_ctrl_mbchar
@@ -355,6 +396,15 @@ def test_invalid_escape_ctrl_mbchar
     ]
 
     assert_lexer(expected, code)
+
+    code = %["\\C-\\\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\C-\\\u{3042}", state(:EXPR_BEG)],
+      [[1, 8], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
   end
 
   def test_invalid_escape_meta_mbchar
@@ -366,6 +416,15 @@ def test_invalid_escape_meta_mbchar
     ]
 
     assert_lexer(expected, code)
+
+    code = %["\\M-\\\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\M-\\\u{3042}", state(:EXPR_BEG)],
+      [[1, 8], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
   end
 
   def test_invalid_escape_meta_ctrl_mbchar
@@ -377,6 +436,15 @@ def test_invalid_escape_meta_ctrl_mbchar
     ]
 
     assert_lexer(expected, code)
+
+    code = %["\\M-\\C-\\\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\M-\\C-\\\u{3042}", state(:EXPR_BEG)],
+      [[1, 11], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
   end
 
   def test_invalid_escape_ctrl_meta_mbchar
@@ -388,6 +456,15 @@ def test_invalid_escape_ctrl_meta_mbchar
     ]
 
     assert_lexer(expected, code)
+
+    code = %["\\C-\\M-\\\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\C-\\M-\\\u{3042}", state(:EXPR_BEG)],
+      [[1, 11], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
   end
 
   def test_invalid_escape_string
diff --git a/test/mri/ripper/test_parser_events.rb b/test/mri/ripper/test_parser_events.rb
index aa7434c083f..3e72c7a3315 100644
--- a/test/mri/ripper/test_parser_events.rb
+++ b/test/mri/ripper/test_parser_events.rb
@@ -480,6 +480,13 @@ def test_call
     assert_equal true, thru_call
     assert_equal "[call(vcall(foo),.,call,[])]", tree
 
+    thru_call = false
+    assert_nothing_raised {
+      tree = parse("a b do end.()", :on_call) {thru_call = true}
+    }
+    assert_equal true, thru_call
+    assert_equal "[call(command(a,[vcall(b)],&do_block(,bodystmt([void()]))),.,call,[])]", tree
+
     thru_call = false
     assert_nothing_raised {
       tree = parse("self::foo", :on_call) {thru_call = true}
diff --git a/test/mri/ripper/test_ripper.rb b/test/mri/ripper/test_ripper.rb
index 414ce83b7d8..2b3421d8270 100644
--- a/test/mri/ripper/test_ripper.rb
+++ b/test/mri/ripper/test_ripper.rb
@@ -156,7 +156,7 @@ def test_assignable_in_regexp
   end
 
   def test_invalid_multibyte_character_in_regexp
-    lex = Ripper.lex(%q[/#{"\xcd"}/])
+    lex = Ripper::Lexer.new(%q[/#{"\xcd"}/]).scan.map(&:to_a)
     assert_equal([[1, 0], :on_regexp_beg, "/", state(:EXPR_BEG)], lex.shift)
     assert_equal([[1, 1], :on_embexpr_beg, "\#{", state(:EXPR_BEG)], lex.shift)
     assert_equal([[1, 3], :on_tstring_beg, "\"", state(:EXPR_BEG)], lex.shift)
@@ -187,6 +187,13 @@ def test_no_memory_leak
         Ripper.parse("-> {")
       end
     end;
+
+    # [Bug #21004]
+    assert_no_memory_leak(%w(-rripper), "", <<~RUBY, rss: true)
+      1_000_000.times do
+        Ripper.parse("-> do it end")
+      end
+    RUBY
   end
 
   def test_sexp_no_memory_leak
diff --git a/test/mri/ruby/box/a.1_1_0.rb b/test/mri/ruby/box/a.1_1_0.rb
new file mode 100644
index 00000000000..03225850975
--- /dev/null
+++ b/test/mri/ruby/box/a.1_1_0.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class BOX_A
+  VERSION = "1.1.0"
+
+  def yay
+    "yay #{VERSION}"
+  end
+end
+
+module BOX_B
+  VERSION = "1.1.0"
+
+  def self.yay
+    "yay_b1"
+  end
+end
diff --git a/test/mri/ruby/box/a.1_2_0.rb b/test/mri/ruby/box/a.1_2_0.rb
new file mode 100644
index 00000000000..29813ea57b2
--- /dev/null
+++ b/test/mri/ruby/box/a.1_2_0.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class BOX_A
+  VERSION = "1.2.0"
+
+  def yay
+    "yay #{VERSION}"
+  end
+end
+
+module BOX_B
+  VERSION = "1.2.0"
+
+  def self.yay
+    "yay_b1"
+  end
+end
diff --git a/test/mri/ruby/box/a.rb b/test/mri/ruby/box/a.rb
new file mode 100644
index 00000000000..26a622c92b5
--- /dev/null
+++ b/test/mri/ruby/box/a.rb
@@ -0,0 +1,15 @@
+class BOX_A
+  FOO = "foo_a1"
+
+  def yay
+    "yay_a1"
+  end
+end
+
+module BOX_B
+  BAR = "bar_b1"
+
+  def self.yay
+    "yay_b1"
+  end
+end
diff --git a/test/mri/ruby/box/autoloading.rb b/test/mri/ruby/box/autoloading.rb
new file mode 100644
index 00000000000..cba57ab3776
--- /dev/null
+++ b/test/mri/ruby/box/autoloading.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+autoload :BOX_A, File.join(__dir__, 'a.1_1_0')
+BOX_A.new.yay
+
+module BOX_B
+  autoload :BAR, File.join(__dir__, 'a')
+end
diff --git a/test/mri/ruby/box/blank.rb b/test/mri/ruby/box/blank.rb
new file mode 100644
index 00000000000..6d201b09669
--- /dev/null
+++ b/test/mri/ruby/box/blank.rb
@@ -0,0 +1,2 @@
+module Blank1
+end
diff --git a/test/mri/ruby/box/blank1.rb b/test/mri/ruby/box/blank1.rb
new file mode 100644
index 00000000000..6d201b09669
--- /dev/null
+++ b/test/mri/ruby/box/blank1.rb
@@ -0,0 +1,2 @@
+module Blank1
+end
diff --git a/test/mri/ruby/box/blank2.rb b/test/mri/ruby/box/blank2.rb
new file mode 100644
index 00000000000..ba38c1d6dbe
--- /dev/null
+++ b/test/mri/ruby/box/blank2.rb
@@ -0,0 +1,2 @@
+module Blank2
+end
diff --git a/test/mri/ruby/box/box.rb b/test/mri/ruby/box/box.rb
new file mode 100644
index 00000000000..3b7da14e9d7
--- /dev/null
+++ b/test/mri/ruby/box/box.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+BOX1 = Ruby::Box.new
+BOX1.require_relative('a.1_1_0')
+
+def yay
+  BOX1::BOX_B::yay
+end
+
+yay
diff --git a/test/mri/ruby/box/call_proc.rb b/test/mri/ruby/box/call_proc.rb
new file mode 100644
index 00000000000..8acf538fc18
--- /dev/null
+++ b/test/mri/ruby/box/call_proc.rb
@@ -0,0 +1,5 @@
+module Bar
+  def self.caller(proc_value)
+    proc_value.call
+  end
+end
diff --git a/test/mri/ruby/box/call_toplevel.rb b/test/mri/ruby/box/call_toplevel.rb
new file mode 100644
index 00000000000..c311a37028d
--- /dev/null
+++ b/test/mri/ruby/box/call_toplevel.rb
@@ -0,0 +1,8 @@
+foo
+
+#### TODO: this code should be valid, but can't be for now
+# module Foo
+#   def self.wow
+#     foo
+#   end
+# end
diff --git a/test/mri/ruby/box/consts.rb b/test/mri/ruby/box/consts.rb
new file mode 100644
index 00000000000..e40cd5c50c7
--- /dev/null
+++ b/test/mri/ruby/box/consts.rb
@@ -0,0 +1,148 @@
+$VERBOSE = nil
+class String
+  STR_CONST1 = 111
+  STR_CONST2 = 222
+  STR_CONST3 = 333
+end
+
+class String
+  STR_CONST1 = 112
+
+  def self.set0(val)
+    const_set(:STR_CONST0, val)
+  end
+
+  def self.remove0
+    remove_const(:STR_CONST0)
+  end
+
+  def refer0
+    STR_CONST0
+  end
+
+  def refer1
+    STR_CONST1
+  end
+
+  def refer2
+    STR_CONST2
+  end
+
+  def refer3
+    STR_CONST3
+  end
+end
+
+module ForConsts
+  CONST1 = 111
+end
+
+TOP_CONST = 10
+
+module ForConsts
+  CONST1 = 112
+  CONST2 = 222
+  CONST3 = 333
+
+  def self.refer_all
+    ForConsts::CONST1
+    ForConsts::CONST2
+    ForConsts::CONST3
+    String::STR_CONST1
+    String::STR_CONST2
+    String::STR_CONST3
+  end
+
+  def self.refer1
+    CONST1
+  end
+
+  def self.get1
+    const_get(:CONST1)
+  end
+
+  def self.refer2
+    CONST2
+  end
+
+  def self.get2
+    const_get(:CONST2)
+  end
+
+  def self.refer3
+    CONST3
+  end
+
+  def self.get3
+    const_get(:CONST3)
+  end
+
+  def self.refer_top_const
+    TOP_CONST
+  end
+
+  # for String
+  class Proxy
+    def call_str_refer0
+      String.new.refer0
+    end
+
+    def call_str_get0
+      String.const_get(:STR_CONST0)
+    end
+
+    def call_str_set0(val)
+      String.set0(val)
+    end
+
+    def call_str_remove0
+      String.remove0
+    end
+
+    def call_str_refer1
+      String.new.refer1
+    end
+
+    def call_str_get1
+      String.const_get(:STR_CONST1)
+    end
+
+    String::STR_CONST2 = 223
+
+    def call_str_refer2
+      String.new.refer2
+    end
+
+    def call_str_get2
+      String.const_get(:STR_CONST2)
+    end
+
+    def call_str_set3
+      String.const_set(:STR_CONST3, 334)
+    end
+
+    def call_str_refer3
+      String.new.refer3
+    end
+
+    def call_str_get3
+      String.const_get(:STR_CONST3)
+    end
+
+    # for Integer
+    Integer::INT_CONST1 = 1
+
+    def refer_int_const1
+      Integer::INT_CONST1
+    end
+  end
+end
+
+# should not raise errors
+ForConsts.refer_all
+String::STR_CONST1
+Integer::INT_CONST1
+
+# If we execute this sentence once, the constant value will be cached on ISeq inline constant cache.
+# And it changes the behavior of ForConsts.refer_consts_directly called from global.
+# ForConsts.refer_consts_directly # should not raise errors too
diff --git a/test/mri/ruby/box/define_toplevel.rb b/test/mri/ruby/box/define_toplevel.rb
new file mode 100644
index 00000000000..aa77db3a135
--- /dev/null
+++ b/test/mri/ruby/box/define_toplevel.rb
@@ -0,0 +1,5 @@
+def foo
+  "foooooooooo"
+end
+
+foo # should not raise errors
diff --git a/test/mri/ruby/box/global_vars.rb b/test/mri/ruby/box/global_vars.rb
new file mode 100644
index 00000000000..590363f6173
--- /dev/null
+++ b/test/mri/ruby/box/global_vars.rb
@@ -0,0 +1,37 @@
+module LineSplitter
+  def self.read
+    $-0
+  end
+
+  def self.write(char)
+    $-0 = char
+  end
+end
+
+module FieldSplitter
+  def self.read
+    $,
+  end
+
+  def self.write(char)
+    $, = char
+  end
+end
+
+module UniqueGvar
+  def self.read
+    $used_only_in_box
+  end
+
+  def self.write(val)
+    $used_only_in_box = val
+  end
+
+  def self.write_only(val)
+    $write_only_var_in_box = val
+  end
+
+  def self.gvars_in_box
+    global_variables
+  end
+end
diff --git a/test/mri/ruby/box/instance_variables.rb b/test/mri/ruby/box/instance_variables.rb
new file mode 100644
index 00000000000..1562ad5d450
--- /dev/null
+++ b/test/mri/ruby/box/instance_variables.rb
@@ -0,0 +1,21 @@
+class String
+  class << self
+    attr_reader :str_ivar1
+
+    def str_ivar2
+      @str_ivar2
+    end
+  end
+
+  @str_ivar1 = 111
+  @str_ivar2 = 222
+end
+
+class StringDelegator < BasicObject
+private
+  def method_missing(...)
+    ::String.public_send(...)
+  end
+end
+
+StringDelegatorObj = StringDelegator.new
diff --git a/test/mri/ruby/box/line_splitter.rb b/test/mri/ruby/box/line_splitter.rb
new file mode 100644
index 00000000000..2596975ad73
--- /dev/null
+++ b/test/mri/ruby/box/line_splitter.rb
@@ -0,0 +1,9 @@
+module LineSplitter
+  def self.read
+    $-0
+  end
+
+  def self.write(char)
+    $-0 = char
+  end
+end
diff --git a/test/mri/ruby/box/load_path.rb b/test/mri/ruby/box/load_path.rb
new file mode 100644
index 00000000000..7e5a83ef96c
--- /dev/null
+++ b/test/mri/ruby/box/load_path.rb
@@ -0,0 +1,26 @@
+module LoadPathCheck
+  FIRST_LOAD_PATH = $LOAD_PATH.dup
+  FIRST_LOAD_PATH_RESPOND_TO_RESOLVE = $LOAD_PATH.respond_to?(:resolve_feature_path)
+  FIRST_LOADED_FEATURES = $LOADED_FEATURES.dup
+
+  HERE = File.dirname(__FILE__)
+
+  def self.current_load_path
+    $LOAD_PATH
+  end
+
+  def self.current_loaded_features
+    $LOADED_FEATURES
+  end
+
+  def self.require_blank1
+    $LOAD_PATH << HERE
+    require 'blank1'
+  end
+
+  def self.require_blank2
+    require 'blank2'
+  end
+end
+
+LoadPathCheck.require_blank1
diff --git a/test/mri/ruby/box/open_class_with_include.rb b/test/mri/ruby/box/open_class_with_include.rb
new file mode 100644
index 00000000000..ad8fd58ea03
--- /dev/null
+++ b/test/mri/ruby/box/open_class_with_include.rb
@@ -0,0 +1,31 @@
+module StringExt
+  FOO = "foo 1"
+  def say_foo
+    "I'm saying " + FOO
+  end
+end
+
+class String
+  include StringExt
+  def say
+    say_foo
+  end
+end
+
+module OpenClassWithInclude
+  def self.say
+    String.new.say
+  end
+
+  def self.say_foo
+    String.new.say_foo
+  end
+
+  def self.say_with_obj(str)
+    str.say
+  end
+
+  def self.refer_foo
+    String::FOO
+  end
+end
diff --git a/test/mri/ruby/box/proc_callee.rb b/test/mri/ruby/box/proc_callee.rb
new file mode 100644
index 00000000000..d30ab5d9f3b
--- /dev/null
+++ b/test/mri/ruby/box/proc_callee.rb
@@ -0,0 +1,14 @@
+module Target
+  def self.foo
+    "fooooo"
+  end
+end
+
+module Foo
+  def self.callee
+    lambda do
+      Target.foo
+    end
+  end
+end
+
diff --git a/test/mri/ruby/box/proc_caller.rb b/test/mri/ruby/box/proc_caller.rb
new file mode 100644
index 00000000000..8acf538fc18
--- /dev/null
+++ b/test/mri/ruby/box/proc_caller.rb
@@ -0,0 +1,5 @@
+module Bar
+  def self.caller(proc_value)
+    proc_value.call
+  end
+end
diff --git a/test/mri/ruby/box/procs.rb b/test/mri/ruby/box/procs.rb
new file mode 100644
index 00000000000..1c39a8231bf
--- /dev/null
+++ b/test/mri/ruby/box/procs.rb
@@ -0,0 +1,64 @@
+class String
+  FOO = "foo"
+  def yay
+    "yay"
+  end
+end
+
+module ProcLookupTestA
+  module B
+    VALUE = 222
+  end
+end
+
+module ProcInBox
+  def self.make_proc_from_block(&b)
+    b
+  end
+
+  def self.call_proc(proc_arg)
+    proc_arg.call
+  end
+
+  def self.make_str_proc(type)
+    case type
+    when :proc_new then Proc.new { String.new.yay }
+    when :proc_f   then proc { String.new.yay }
+    when :lambda_f then lambda { String.new.yay }
+    when :lambda_l then ->(){ String.new.yay }
+    when :block    then make_proc_from_block { String.new.yay }
+    else
+      raise "invalid type :#{type}"
+    end
+  end
+
+  def self.make_const_proc(type)
+    case type
+    when :proc_new then Proc.new { ProcLookupTestA::B::VALUE }
+    when :proc_f   then proc { ProcLookupTestA::B::VALUE }
+    when :lambda_f then lambda { ProcLookupTestA::B::VALUE }
+    when :lambda_l then ->(){ ProcLookupTestA::B::VALUE }
+    when :block    then make_proc_from_block { ProcLookupTestA::B::VALUE }
+    else
+      raise "invalid type :#{type}"
+    end
+  end
+
+  def self.make_str_const_proc(type)
+    case type
+    when :proc_new then Proc.new { String::FOO }
+    when :proc_f   then proc { String::FOO }
+    when :lambda_f then lambda { String::FOO }
+    when :lambda_l then ->(){ String::FOO }
+    when :block    then make_proc_from_block { String::FOO }
+    else
+      raise "invalid type :#{type}"
+    end
+  end
+
+  CONST_PROC_NEW = Proc.new { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+  CONST_PROC_F   = proc { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+  CONST_LAMBDA_F = lambda { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+  CONST_LAMBDA_L = ->() { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+  CONST_BLOCK    = make_proc_from_block { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+end
diff --git a/test/mri/ruby/box/raise.rb b/test/mri/ruby/box/raise.rb
new file mode 100644
index 00000000000..efb67f85c5b
--- /dev/null
+++ b/test/mri/ruby/box/raise.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+raise "Yay!"
diff --git a/test/mri/ruby/box/returns_proc.rb b/test/mri/ruby/box/returns_proc.rb
new file mode 100644
index 00000000000..bb816e5024d
--- /dev/null
+++ b/test/mri/ruby/box/returns_proc.rb
@@ -0,0 +1,12 @@
+module Foo
+  def self.foo
+    "fooooo"
+  end
+
+  def self.callee
+    lambda do
+      Foo.foo
+    end
+  end
+end
+
diff --git a/test/mri/ruby/box/singleton_methods.rb b/test/mri/ruby/box/singleton_methods.rb
new file mode 100644
index 00000000000..05470932d25
--- /dev/null
+++ b/test/mri/ruby/box/singleton_methods.rb
@@ -0,0 +1,65 @@
+class String
+  def self.greeting
+    "Good evening!"
+  end
+end
+
+class Integer
+  class << self
+    def answer
+      42
+    end
+  end
+end
+
+class Array
+  def a
+    size
+  end
+  def self.blank
+    []
+  end
+  def b
+    size
+  end
+end
+
+class Hash
+  def a
+    size
+  end
+  class << self
+    def http_200
+      {status: 200, body: 'OK'}
+    end
+  end
+  def b
+    size
+  end
+end
+
+module SingletonMethods
+  def self.string_greeing
+    String.greeting
+  end
+
+  def self.integer_answer
+    Integer.answer
+  end
+
+  def self.array_blank
+    Array.blank
+  end
+
+  def self.hash_http_200
+    Hash.http_200
+  end
+
+  def self.array_instance_methods_return_size(ary)
+    [ary.a, ary.b]
+  end
+
+  def self.hash_instance_methods_return_size(hash)
+    [hash.a, hash.b]
+  end
+end
diff --git a/test/mri/ruby/box/string_ext.rb b/test/mri/ruby/box/string_ext.rb
new file mode 100644
index 00000000000..d8c5a3d661f
--- /dev/null
+++ b/test/mri/ruby/box/string_ext.rb
@@ -0,0 +1,13 @@
+class String
+  def yay
+    "yay"
+  end
+end
+
+String.new.yay # check this doesn't raise NoMethodError
+
+module Bar
+  def self.yay
+    String.new.yay
+  end
+end
diff --git a/test/mri/ruby/box/string_ext_caller.rb b/test/mri/ruby/box/string_ext_caller.rb
new file mode 100644
index 00000000000..b8345d98edf
--- /dev/null
+++ b/test/mri/ruby/box/string_ext_caller.rb
@@ -0,0 +1,5 @@
+module Foo
+  def self.yay
+    String.new.yay
+  end
+end
diff --git a/test/mri/ruby/box/string_ext_calling.rb b/test/mri/ruby/box/string_ext_calling.rb
new file mode 100644
index 00000000000..6467b728dd9
--- /dev/null
+++ b/test/mri/ruby/box/string_ext_calling.rb
@@ -0,0 +1 @@
+Foo.yay
diff --git a/test/mri/ruby/box/string_ext_eval_caller.rb b/test/mri/ruby/box/string_ext_eval_caller.rb
new file mode 100644
index 00000000000..0e6b20c19f5
--- /dev/null
+++ b/test/mri/ruby/box/string_ext_eval_caller.rb
@@ -0,0 +1,12 @@
+module Baz
+  def self.yay
+    eval 'String.new.yay'
+  end
+
+  def self.yay_with_binding
+    suffix = ", yay!"
+    eval 'String.new.yay + suffix', binding
+  end
+end
+
+Baz.yay # should not raise NeMethodError
diff --git a/test/mri/ruby/box/top_level.rb b/test/mri/ruby/box/top_level.rb
new file mode 100644
index 00000000000..90df1455782
--- /dev/null
+++ b/test/mri/ruby/box/top_level.rb
@@ -0,0 +1,33 @@
+def yaaay
+  "yay!"
+end
+
+module Foo
+  def self.foo
+    yaaay
+  end
+end
+
+eval 'def foo; "foo"; end'
+
+Foo.foo # Should not raise NameError
+
+foo
+
+module Bar
+  def self.bar
+    foo
+  end
+end
+
+Bar.bar
+
+$def_retval_in_namespace = def boooo
+  "boo"
+end
+
+module Baz
+  def self.baz
+    raise "#{$def_retval_in_namespace}"
+  end
+end
diff --git a/test/mri/ruby/enc/test_case_comprehensive.rb b/test/mri/ruby/enc/test_case_comprehensive.rb
index de18ac865c1..b812b88b832 100644
--- a/test/mri/ruby/enc/test_case_comprehensive.rb
+++ b/test/mri/ruby/enc/test_case_comprehensive.rb
@@ -161,15 +161,14 @@ def self.generate_unicode_case_mapping_tests(encoding)
     end
   end
 
-  def self.generate_case_mapping_tests(encoding)
+  def self.generate_single_byte_case_mapping_tests(encoding)
     all_tests
-    # preselect codepoints to speed up testing for small encodings
-    codepoints = @@codepoints.select do |code|
+    # precalculate codepoints to speed up testing for small encodings
+    codepoints = []
+    (0..255).each do |cp|
       begin
-        code.encode(encoding)
-        true
-      rescue Encoding::UndefinedConversionError
-        false
+        codepoints << cp.chr(encoding).encode('UTF-8')
+      rescue Encoding::UndefinedConversionError, RangeError
       end
     end
     all_tests.each do |test|
@@ -264,23 +263,23 @@ def self.generate_ascii_only_case_mapping_tests(encoding)
     end
   end
 
-  generate_case_mapping_tests 'US-ASCII'
-  generate_case_mapping_tests 'ASCII-8BIT'
-  generate_case_mapping_tests 'ISO-8859-1'
-  generate_case_mapping_tests 'ISO-8859-2'
-  generate_case_mapping_tests 'ISO-8859-3'
-  generate_case_mapping_tests 'ISO-8859-4'
-  generate_case_mapping_tests 'ISO-8859-5'
-  generate_case_mapping_tests 'ISO-8859-6'
-  generate_case_mapping_tests 'ISO-8859-7'
-  generate_case_mapping_tests 'ISO-8859-8'
-  generate_case_mapping_tests 'ISO-8859-9'
-  generate_case_mapping_tests 'ISO-8859-10'
-  generate_case_mapping_tests 'ISO-8859-11'
-  generate_case_mapping_tests 'ISO-8859-13'
-  generate_case_mapping_tests 'ISO-8859-14'
-  generate_case_mapping_tests 'ISO-8859-15'
-  generate_case_mapping_tests 'ISO-8859-16'
+  generate_single_byte_case_mapping_tests 'US-ASCII'
+  generate_single_byte_case_mapping_tests 'ASCII-8BIT'
+  generate_single_byte_case_mapping_tests 'ISO-8859-1'
+  generate_single_byte_case_mapping_tests 'ISO-8859-2'
+  generate_single_byte_case_mapping_tests 'ISO-8859-3'
+  generate_single_byte_case_mapping_tests 'ISO-8859-4'
+  generate_single_byte_case_mapping_tests 'ISO-8859-5'
+  generate_single_byte_case_mapping_tests 'ISO-8859-6'
+  generate_single_byte_case_mapping_tests 'ISO-8859-7'
+  generate_single_byte_case_mapping_tests 'ISO-8859-8'
+  generate_single_byte_case_mapping_tests 'ISO-8859-9'
+  generate_single_byte_case_mapping_tests 'ISO-8859-10'
+  generate_single_byte_case_mapping_tests 'ISO-8859-11'
+  generate_single_byte_case_mapping_tests 'ISO-8859-13'
+  generate_single_byte_case_mapping_tests 'ISO-8859-14'
+  generate_single_byte_case_mapping_tests 'ISO-8859-15'
+  generate_single_byte_case_mapping_tests 'ISO-8859-16'
   generate_ascii_only_case_mapping_tests 'KOI8-R'
   generate_ascii_only_case_mapping_tests 'KOI8-U'
   generate_ascii_only_case_mapping_tests 'Big5'
@@ -291,14 +290,14 @@ def self.generate_ascii_only_case_mapping_tests(encoding)
   generate_ascii_only_case_mapping_tests 'GBK'
   generate_ascii_only_case_mapping_tests 'Shift_JIS'
   generate_ascii_only_case_mapping_tests 'Windows-31J'
-  generate_case_mapping_tests 'Windows-1250'
-  generate_case_mapping_tests 'Windows-1251'
-  generate_case_mapping_tests 'Windows-1252'
-  generate_case_mapping_tests 'Windows-1253'
-  generate_case_mapping_tests 'Windows-1254'
-  generate_case_mapping_tests 'Windows-1255'
+  generate_single_byte_case_mapping_tests 'Windows-1250'
+  generate_single_byte_case_mapping_tests 'Windows-1251'
+  generate_single_byte_case_mapping_tests 'Windows-1252'
+  generate_single_byte_case_mapping_tests 'Windows-1253'
+  generate_single_byte_case_mapping_tests 'Windows-1254'
+  generate_single_byte_case_mapping_tests 'Windows-1255'
   generate_ascii_only_case_mapping_tests 'Windows-1256'
-  generate_case_mapping_tests 'Windows-1257'
+  generate_single_byte_case_mapping_tests 'Windows-1257'
   generate_unicode_case_mapping_tests 'UTF-8'
   generate_unicode_case_mapping_tests 'UTF-16BE'
   generate_unicode_case_mapping_tests 'UTF-16LE'
diff --git a/test/mri/ruby/enc/test_emoji_breaks.rb b/test/mri/ruby/enc/test_emoji_breaks.rb
index bb5114680e6..0873e681c39 100644
--- a/test/mri/ruby/enc/test_emoji_breaks.rb
+++ b/test/mri/ruby/enc/test_emoji_breaks.rb
@@ -53,7 +53,7 @@ def self.files
   EMOJI_DATA_FILES  = %w[emoji-sequences emoji-test emoji-zwj-sequences].map do |basename|
     BreakFile.new(basename, EMOJI_DATA_PATH, EMOJI_VERSION)
   end
-  UNICODE_DATA_FILE = BreakFile.new('emoji-variation-sequences', UNICODE_DATA_PATH, UNICODE_VERSION)
+  UNICODE_DATA_FILE = BreakFile.new('emoji-variation-sequences', UNICODE_DATA_PATH, EMOJI_VERSION)
   EMOJI_DATA_FILES << UNICODE_DATA_FILE
 
   def self.data_files_available?
diff --git a/test/mri/ruby/rjit/test_assembler.rb b/test/mri/ruby/rjit/test_assembler.rb
deleted file mode 100644
index fbf780d6c3e..00000000000
--- a/test/mri/ruby/rjit/test_assembler.rb
+++ /dev/null
@@ -1,368 +0,0 @@
-require 'test/unit'
-require_relative '../../lib/jit_support'
-
-return unless JITSupport.rjit_supported?
-return unless RubyVM::RJIT.enabled?
-return unless RubyVM::RJIT::C.HAVE_LIBCAPSTONE
-
-require 'stringio'
-require 'ruby_vm/rjit/assembler'
-
-module RubyVM::RJIT
-  class TestAssembler < Test::Unit::TestCase
-    MEM_SIZE = 16 * 1024
-
-    def setup
-      @mem_block ||= C.mmap(MEM_SIZE)
-      @cb = CodeBlock.new(mem_block: @mem_block, mem_size: MEM_SIZE)
-    end
-
-    def test_add
-      asm = Assembler.new
-      asm.add([:rcx], 1)        # ADD r/m64, imm8 (Mod 00: [reg])
-      asm.add(:rax, 0x7f)       # ADD r/m64, imm8 (Mod 11: reg)
-      asm.add(:rbx, 0x7fffffff) # ADD r/m64 imm32 (Mod 11: reg)
-      asm.add(:rsi, :rdi)       # ADD r/m64, r64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: add qword ptr [rcx], 1
-        0x4: add rax, 0x7f
-        0x8: add rbx, 0x7fffffff
-        0xf: add rsi, rdi
-      EOS
-    end
-
-    def test_and
-      asm = Assembler.new
-      asm.and(:rax, 0)          # AND r/m64, imm8 (Mod 11: reg)
-      asm.and(:rbx, 0x7fffffff) # AND r/m64, imm32 (Mod 11: reg)
-      asm.and(:rcx, [:rdi, 8])  # AND r64, r/m64 (Mod 01: [reg]+disp8)
-      assert_compile(asm, <<~EOS)
-        0x0: and rax, 0
-        0x4: and rbx, 0x7fffffff
-        0xb: and rcx, qword ptr [rdi + 8]
-      EOS
-    end
-
-    def test_call
-      asm = Assembler.new
-      asm.call(rel32(0xff)) # CALL rel32
-      asm.call(:rax)        # CALL r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: call 0xff
-        0x5: call rax
-      EOS
-    end
-
-    def test_cmove
-      asm = Assembler.new
-      asm.cmove(:rax, :rcx) # CMOVE r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmove rax, rcx
-      EOS
-    end
-
-    def test_cmovg
-      asm = Assembler.new
-      asm.cmovg(:rbx, :rdi) # CMOVG r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmovg rbx, rdi
-      EOS
-    end
-
-    def test_cmovge
-      asm = Assembler.new
-      asm.cmovge(:rsp, :rbp) # CMOVGE r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmovge rsp, rbp
-      EOS
-    end
-
-    def test_cmovl
-      asm = Assembler.new
-      asm.cmovl(:rdx, :rsp) # CMOVL r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmovl rdx, rsp
-      EOS
-    end
-
-    def test_cmovle
-      asm = Assembler.new
-      asm.cmovle(:rax, :rax) # CMOVLE r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmovle rax, rax
-      EOS
-    end
-
-    def test_cmovne
-      asm = Assembler.new
-      asm.cmovne(:rax, :rbx) # CMOVNE r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS) # cmovne == cmovnz
-        0x0: cmovne rax, rbx
-      EOS
-    end
-
-    def test_cmovnz
-      asm = Assembler.new
-      asm.cmovnz(:rax, :rbx) # CMOVNZ r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS) # cmovne == cmovnz
-        0x0: cmovne rax, rbx
-      EOS
-    end
-
-    def test_cmovz
-      asm = Assembler.new
-      asm.cmovz(:rax, :rbx) # CMOVZ r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS) # cmove == cmovz
-        0x0: cmove rax, rbx
-      EOS
-    end
-
-    def test_cmp
-      asm = Assembler.new
-      asm.cmp(BytePtr[:rax, 8], 8)      # CMP r/m8, imm8 (Mod 01: [reg]+disp8)
-      asm.cmp(DwordPtr[:rax, 8], 0x100) # CMP r/m32, imm32 (Mod 01: [reg]+disp8)
-      asm.cmp([:rax, 8], 8)             # CMP r/m64, imm8 (Mod 01: [reg]+disp8)
-      asm.cmp([:rbx, 8], 0x100)         # CMP r/m64, imm32 (Mod 01: [reg]+disp8)
-      asm.cmp([:rax, 0x100], 8)         # CMP r/m64, imm8 (Mod 10: [reg]+disp32)
-      asm.cmp(:rax, 8)                  # CMP r/m64, imm8 (Mod 11: reg)
-      asm.cmp(:rax, 0x100)              # CMP r/m64, imm32 (Mod 11: reg)
-      asm.cmp([:rax, 8], :rbx)          # CMP r/m64, r64 (Mod 01: [reg]+disp8)
-      asm.cmp([:rax, -0x100], :rbx)     # CMP r/m64, r64 (Mod 10: [reg]+disp32)
-      asm.cmp(:rax, :rbx)               # CMP r/m64, r64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmp byte ptr [rax + 8], 8
-        0x4: cmp dword ptr [rax + 8], 0x100
-        0xb: cmp qword ptr [rax + 8], 8
-        0x10: cmp qword ptr [rbx + 8], 0x100
-        0x18: cmp qword ptr [rax + 0x100], 8
-        0x20: cmp rax, 8
-        0x24: cmp rax, 0x100
-        0x2b: cmp qword ptr [rax + 8], rbx
-        0x2f: cmp qword ptr [rax - 0x100], rbx
-        0x36: cmp rax, rbx
-      EOS
-    end
-
-    def test_jbe
-      asm = Assembler.new
-      asm.jbe(rel32(0xff)) # JBE rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jbe 0xff
-      EOS
-    end
-
-    def test_je
-      asm = Assembler.new
-      asm.je(rel32(0xff)) # JE rel32
-      assert_compile(asm, <<~EOS)
-        0x0: je 0xff
-      EOS
-    end
-
-    def test_jl
-      asm = Assembler.new
-      asm.jl(rel32(0xff)) # JL rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jl 0xff
-      EOS
-    end
-
-    def test_jmp
-      asm = Assembler.new
-      label = asm.new_label('label')
-      asm.jmp(label)       # JZ rel8
-      asm.write_label(label)
-      asm.jmp(rel32(0xff)) # JMP rel32
-      asm.jmp([:rax, 8])   # JMP r/m64 (Mod 01: [reg]+disp8)
-      asm.jmp(:rax)        # JMP r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: jmp 2
-        0x2: jmp 0xff
-        0x7: jmp qword ptr [rax + 8]
-        0xa: jmp rax
-      EOS
-    end
-
-    def test_jne
-      asm = Assembler.new
-      asm.jne(rel32(0xff)) # JNE rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jne 0xff
-      EOS
-    end
-
-    def test_jnz
-      asm = Assembler.new
-      asm.jnz(rel32(0xff)) # JNZ rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jne 0xff
-      EOS
-    end
-
-    def test_jo
-      asm = Assembler.new
-      asm.jo(rel32(0xff)) # JO rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jo 0xff
-      EOS
-    end
-
-    def test_jz
-      asm = Assembler.new
-      asm.jz(rel32(0xff)) # JZ rel32
-      assert_compile(asm, <<~EOS)
-        0x0: je 0xff
-      EOS
-    end
-
-    def test_lea
-      asm = Assembler.new
-      asm.lea(:rax, [:rax, 8])      # LEA r64,m (Mod 01: [reg]+disp8)
-      asm.lea(:rax, [:rax, 0xffff]) # LEA r64,m (Mod 10: [reg]+disp32)
-      assert_compile(asm, <<~EOS)
-        0x0: lea rax, [rax + 8]
-        0x4: lea rax, [rax + 0xffff]
-      EOS
-    end
-
-    def test_mov
-      asm = Assembler.new
-      asm.mov(:eax, DwordPtr[:rbx, 8])  # MOV r32 r/m32 (Mod 01: [reg]+disp8)
-      asm.mov(:eax, 0x100)              # MOV r32, imm32 (Mod 11: reg)
-      asm.mov(:rax, [:rbx])             # MOV r64, r/m64 (Mod 00: [reg])
-      asm.mov(:rax, [:rbx, 8])          # MOV r64, r/m64 (Mod 01: [reg]+disp8)
-      asm.mov(:rax, [:rbx, 0x100])      # MOV r64, r/m64 (Mod 10: [reg]+disp32)
-      asm.mov(:rax, :rbx)               # MOV r64, r/m64 (Mod 11: reg)
-      asm.mov(:rax, 0x100)              # MOV r/m64, imm32 (Mod 11: reg)
-      asm.mov(:rax, 0x100000000)        # MOV r64, imm64
-      asm.mov(DwordPtr[:rax, 8], 0x100) # MOV r/m32, imm32 (Mod 01: [reg]+disp8)
-      asm.mov([:rax], 0x100)            # MOV r/m64, imm32 (Mod 00: [reg])
-      asm.mov([:rax], :rbx)             # MOV r/m64, r64 (Mod 00: [reg])
-      asm.mov([:rax, 8], 0x100)         # MOV r/m64, imm32 (Mod 01: [reg]+disp8)
-      asm.mov([:rax, 8], :rbx)          # MOV r/m64, r64 (Mod 01: [reg]+disp8)
-      asm.mov([:rax, 0x100], 0x100)     # MOV r/m64, imm32 (Mod 10: [reg]+disp32)
-      asm.mov([:rax, 0x100], :rbx)      # MOV r/m64, r64 (Mod 10: [reg]+disp32)
-      assert_compile(asm, <<~EOS)
-        0x0: mov eax, dword ptr [rbx + 8]
-        0x3: mov eax, 0x100
-        0x8: mov rax, qword ptr [rbx]
-        0xb: mov rax, qword ptr [rbx + 8]
-        0xf: mov rax, qword ptr [rbx + 0x100]
-        0x16: mov rax, rbx
-        0x19: mov rax, 0x100
-        0x20: movabs rax, 0x100000000
-        0x2a: mov dword ptr [rax + 8], 0x100
-        0x31: mov qword ptr [rax], 0x100
-        0x38: mov qword ptr [rax], rbx
-        0x3b: mov qword ptr [rax + 8], 0x100
-        0x43: mov qword ptr [rax + 8], rbx
-        0x47: mov qword ptr [rax + 0x100], 0x100
-        0x52: mov qword ptr [rax + 0x100], rbx
-      EOS
-    end
-
-    def test_or
-      asm = Assembler.new
-      asm.or(:rax, 0)         # OR r/m64, imm8 (Mod 11: reg)
-      asm.or(:rax, 0xffff)    # OR r/m64, imm32 (Mod 11: reg)
-      asm.or(:rax, [:rbx, 8]) # OR r64, r/m64 (Mod 01: [reg]+disp8)
-      assert_compile(asm, <<~EOS)
-        0x0: or rax, 0
-        0x4: or rax, 0xffff
-        0xb: or rax, qword ptr [rbx + 8]
-      EOS
-    end
-
-    def test_push
-      asm = Assembler.new
-      asm.push(:rax) # PUSH r64
-      assert_compile(asm, <<~EOS)
-        0x0: push rax
-      EOS
-    end
-
-    def test_pop
-      asm = Assembler.new
-      asm.pop(:rax) # POP r64
-      assert_compile(asm, <<~EOS)
-        0x0: pop rax
-      EOS
-    end
-
-    def test_ret
-      asm = Assembler.new
-      asm.ret # RET
-      assert_compile(asm, "0x0: ret \n")
-    end
-
-    def test_sar
-      asm = Assembler.new
-      asm.sar(:rax, 0) # SAR r/m64, imm8 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: sar rax, 0
-      EOS
-    end
-
-    def test_sub
-      asm = Assembler.new
-      asm.sub(:rax, 8)    # SUB r/m64, imm8 (Mod 11: reg)
-      asm.sub(:rax, :rbx) # SUB r/m64, r64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: sub rax, 8
-        0x4: sub rax, rbx
-      EOS
-    end
-
-    def test_test
-      asm = Assembler.new
-      asm.test(BytePtr[:rax, 8], 16)   # TEST r/m8*, imm8 (Mod 01: [reg]+disp8)
-      asm.test([:rax, 8], 8)           # TEST r/m64, imm32 (Mod 01: [reg]+disp8)
-      asm.test([:rax, 0xffff], 0xffff) # TEST r/m64, imm32 (Mod 10: [reg]+disp32)
-      asm.test(:rax, 0xffff)           # TEST r/m64, imm32 (Mod 11: reg)
-      asm.test(:eax, :ebx)             # TEST r/m32, r32 (Mod 11: reg)
-      asm.test(:rax, :rbx)             # TEST r/m64, r64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: test byte ptr [rax + 8], 0x10
-        0x4: test qword ptr [rax + 8], 8
-        0xc: test qword ptr [rax + 0xffff], 0xffff
-        0x17: test rax, 0xffff
-        0x1e: test eax, ebx
-        0x20: test rax, rbx
-      EOS
-    end
-
-    def test_xor
-      asm = Assembler.new
-      asm.xor(:rax, :rbx)
-      assert_compile(asm, <<~EOS)
-        0x0: xor rax, rbx
-      EOS
-    end
-
-    private
-
-    def rel32(offset)
-      @cb.write_addr + 0xff
-    end
-
-    def assert_compile(asm, expected)
-      actual = compile(asm)
-      assert_equal expected, actual, "---\n#{actual}---"
-    end
-
-    def compile(asm)
-      start_addr = @cb.write_addr
-      @cb.write(asm)
-      end_addr = @cb.write_addr
-
-      io = StringIO.new
-      @cb.dump_disasm(start_addr, end_addr, io:, color: false, test: true)
-      io.seek(0)
-      disasm = io.read
-
-      disasm.gsub!(/^  /, '')
-      disasm.sub!(/\n\z/, '')
-      disasm
-    end
-  end
-end
diff --git a/test/mri/ruby/test_alias.rb b/test/mri/ruby/test_alias.rb
index 6d4fcc085b3..539cd494887 100644
--- a/test/mri/ruby/test_alias.rb
+++ b/test/mri/ruby/test_alias.rb
@@ -328,4 +328,17 @@ def foo = 3
       }
     end;
   end
+
+  def test_undef_method_error_message_with_zsuper_method
+    modules = [
+      Module.new { private :class },
+      Module.new { prepend Module.new { private :class } },
+    ]
+    message = "undefined method 'class' for module '%s'"
+    modules.each do |mod|
+      assert_raise_with_message(NameError, message % mod) do
+        mod.alias_method :xyz, :class
+      end
+    end
+  end
 end
diff --git a/test/mri/ruby/test_allocation.rb b/test/mri/ruby/test_allocation.rb
index 9ba01dfcf94..90d7c04f9b0 100644
--- a/test/mri/ruby/test_allocation.rb
+++ b/test/mri/ruby/test_allocation.rb
@@ -2,6 +2,12 @@
 require 'test/unit'
 
 class TestAllocation < Test::Unit::TestCase
+  def setup
+    # The namespace changes on i686 platform triggers a bug to allocate objects unexpectedly.
+    # For now, skip these tests only on i686
+    pend if RUBY_PLATFORM =~ /^i686/
+  end
+
   def munge_checks(checks)
     checks
   end
@@ -60,9 +66,7 @@ def self.num_allocations
 
       #{checks}
 
-      unless failures.empty?
-        assert_equal(true, false, failures.join("\n"))
-      end
+      assert_empty(failures)
     RUBY
   end
 
@@ -94,13 +98,14 @@ class MethodCall < self
     def block
       ''
     end
+    alias only_block block
 
     def test_no_parameters
-      only_block = block.empty? ? block : block[2..]
       check_allocations(<<~RUBY)
         def self.none(#{only_block}); end
 
         check_allocations(0, 0, "none(#{only_block})")
+        check_allocations(0, 0, "none(*nil#{block})")
         check_allocations(0, 0, "none(*empty_array#{block})")
         check_allocations(0, 0, "none(**empty_hash#{block})")
         check_allocations(0, 0, "none(*empty_array, **empty_hash#{block})")
@@ -156,6 +161,9 @@ def self.optional(x=nil#{block}); end
         check_allocations(0, 0, "optional(*r2k_empty_array1#{block})")
         check_allocations(0, 1, "optional(*r2k_array#{block})")
 
+        check_allocations(0, 0, "optional(*empty_array#{block})")
+        check_allocations(0, 0, "optional(*nil#{block})")
+        check_allocations(0, 0, "optional(#{only_block})")
         check_allocations(0, 1, "optional(*empty_array, **hash1, **empty_hash#{block})")
       RUBY
     end
@@ -179,6 +187,8 @@ def self.splat(*x#{block}); end
         check_allocations(1, 0, "splat(1, *array1, **empty_hash#{block})")
         check_allocations(1, 0, "splat(1, *array1, *empty_array, **empty_hash#{block})")
 
+        check_allocations(1, 0, "splat(*nil#{block})")
+        check_allocations(1, 0, "splat(#{only_block})")
         check_allocations(1, 1, "splat(**hash1#{block})")
 
         check_allocations(1, 1, "splat(**hash1, **empty_hash#{block})")
@@ -196,6 +206,7 @@ def test_required_and_positional_splat_parameters
         def self.req_splat(x, *y#{block}); end
 
         check_allocations(1, 0, "req_splat(1#{block})")
+        check_allocations(1, 0, "req_splat(1, *nil#{block})")
         check_allocations(1, 0, "req_splat(1, *empty_array#{block})")
         check_allocations(1, 0, "req_splat(1, **empty_hash#{block})")
         check_allocations(1, 0, "req_splat(1, *empty_array, **empty_hash#{block})")
@@ -226,6 +237,7 @@ def test_positional_splat_and_post_parameters
         def self.splat_post(*x, y#{block}); end
 
         check_allocations(1, 0, "splat_post(1#{block})")
+        check_allocations(1, 0, "splat_post(1, *nil#{block})")
         check_allocations(1, 0, "splat_post(1, *empty_array#{block})")
         check_allocations(1, 0, "splat_post(1, **empty_hash#{block})")
         check_allocations(1, 0, "splat_post(1, *empty_array, **empty_hash#{block})")
@@ -267,6 +279,7 @@ def self.keyword(a: nil#{block}); end
         check_allocations(0, 1, "keyword(**hash1, **empty_hash#{block})")
         check_allocations(0, 1, "keyword(**empty_hash, **hash1#{block})")
 
+        check_allocations(0, 0, "keyword(*nil#{block})")
         check_allocations(0, 0, "keyword(*empty_array#{block})")
         check_allocations(1, 0, "keyword(*empty_array, *empty_array, **empty_hash#{block})")
 
@@ -294,6 +307,7 @@ def self.keyword_splat(**kw#{block}); end
         check_allocations(0, 1, "keyword_splat(**hash1, **empty_hash#{block})")
         check_allocations(0, 1, "keyword_splat(**empty_hash, **hash1#{block})")
 
+        check_allocations(0, 1, "keyword_splat(*nil#{block})")
         check_allocations(0, 1, "keyword_splat(*empty_array#{block})")
         check_allocations(1, 1, "keyword_splat(*empty_array, *empty_array, **empty_hash#{block})")
 
@@ -321,6 +335,7 @@ def self.keyword_and_keyword_splat(a: 1, **kw#{block}); end
         check_allocations(0, 1, "keyword_and_keyword_splat(**hash1, **empty_hash#{block})")
         check_allocations(0, 1, "keyword_and_keyword_splat(**empty_hash, **hash1#{block})")
 
+        check_allocations(0, 1, "keyword_and_keyword_splat(*nil#{block})")
         check_allocations(0, 1, "keyword_and_keyword_splat(*empty_array#{block})")
         check_allocations(1, 1, "keyword_and_keyword_splat(*empty_array, *empty_array, **empty_hash#{block})")
 
@@ -348,6 +363,7 @@ def self.required_and_keyword(b, a: nil#{block}); end
         check_allocations(0, 1, "required_and_keyword(1, **hash1, **empty_hash#{block})")
         check_allocations(0, 1, "required_and_keyword(1, **empty_hash, **hash1#{block})")
 
+        check_allocations(0, 0, "required_and_keyword(1, *nil#{block})")
         check_allocations(0, 0, "required_and_keyword(1, *empty_array#{block})")
         check_allocations(1, 0, "required_and_keyword(1, *empty_array, *empty_array, **empty_hash#{block})")
 
@@ -391,6 +407,7 @@ def self.splat_and_keyword(*b, a: nil#{block}); end
         check_allocations(1, 1, "splat_and_keyword(1, **hash1, **empty_hash#{block})")
         check_allocations(1, 1, "splat_and_keyword(1, **empty_hash, **hash1#{block})")
 
+        check_allocations(1, 0, "splat_and_keyword(1, *nil#{block})")
         check_allocations(1, 0, "splat_and_keyword(1, *empty_array#{block})")
         check_allocations(1, 0, "splat_and_keyword(1, *empty_array, *empty_array, **empty_hash#{block})")
 
@@ -436,6 +453,7 @@ def self.required_and_keyword_splat(b, **kw#{block}); end
         check_allocations(0, 1, "required_and_keyword_splat(1, **hash1, **empty_hash#{block})")
         check_allocations(0, 1, "required_and_keyword_splat(1, **empty_hash, **hash1#{block})")
 
+        check_allocations(0, 1, "required_and_keyword_splat(1, *nil#{block})")
         check_allocations(0, 1, "required_and_keyword_splat(1, *empty_array#{block})")
         check_allocations(1, 1, "required_and_keyword_splat(1, *empty_array, *empty_array, **empty_hash#{block})")
 
@@ -479,6 +497,7 @@ def self.splat_and_keyword_splat(*b, **kw#{block}); end
         check_allocations(1, 1, "splat_and_keyword_splat(1, **hash1, **empty_hash#{block})")
         check_allocations(1, 1, "splat_and_keyword_splat(1, **empty_hash, **hash1#{block})")
 
+        check_allocations(1, 1, "splat_and_keyword_splat(1, *nil#{block})")
         check_allocations(1, 1, "splat_and_keyword_splat(1, *empty_array#{block})")
         check_allocations(1, 1, "splat_and_keyword_splat(1, *empty_array, *empty_array, **empty_hash#{block})")
 
@@ -508,7 +527,61 @@ def self.splat_and_keyword_splat(*b, **kw#{block}); end
       RUBY
     end
 
+    def test_anonymous_splat_parameter
+      only_block = block.empty? ? block : block[2..]
+      check_allocations(<<~RUBY)
+        def self.anon_splat(*#{block}); end
+
+        check_allocations(1, 1, "anon_splat(1, a: 2#{block})")
+        check_allocations(1, 1, "anon_splat(1, *empty_array, a: 2#{block})")
+        check_allocations(1, 1, "anon_splat(1, a:2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(1, 0, "anon_splat(1, **nil#{block})")
+        check_allocations(1, 0, "anon_splat(1, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat(1, **hash1#{block})")
+        check_allocations(1, 1, "anon_splat(1, *empty_array, **hash1#{block})")
+        check_allocations(1, 1, "anon_splat(1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(1, 0, "anon_splat(1, *empty_array#{block})")
+        check_allocations(1, 0, "anon_splat(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "anon_splat(*array1, a: 2#{block})")
+
+        check_allocations(0, 0, "anon_splat(*nil, **nill#{block})")
+        check_allocations(0, 0, "anon_splat(*array1, **nill#{block})")
+        check_allocations(0, 0, "anon_splat(*array1, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat(*array1, **hash1#{block})")
+        check_allocations(1, 1, "anon_splat(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 0, "anon_splat(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "anon_splat(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "anon_splat(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(0, 0, "anon_splat(#{only_block})")
+        check_allocations(1, 1, "anon_splat(a: 2#{block})")
+        check_allocations(0, 0, "anon_splat(**empty_hash#{block})")
+
+        check_allocations(1, 1, "anon_splat(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(1, 1, "anon_splat(*array1, **hash1, **empty_hash#{block})")
+
+        unless defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
+          check_allocations(0, 0, "anon_splat(*array1, **nil#{block})")
+          check_allocations(1, 0, "anon_splat(*r2k_empty_array#{block})")
+          check_allocations(1, 1, "anon_splat(*r2k_array#{block})")
+          check_allocations(1, 0, "anon_splat(*r2k_empty_array1#{block})")
+          check_allocations(1, 1, "anon_splat(*r2k_array1#{block})")
+        end
+      RUBY
+    end
+
     def test_anonymous_splat_and_anonymous_keyword_splat_parameters
+      only_block = block.empty? ? block : block[2..]
       check_allocations(<<~RUBY)
         def self.anon_splat_and_anon_keyword_splat(*, **#{block}); end
 
@@ -529,6 +602,7 @@ def self.anon_splat_and_anon_keyword_splat(*, **#{block}); end
 
         check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, a: 2#{block})")
 
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*nil, **nill#{block})")
         check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **nill#{block})")
         check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **empty_hash#{block})")
         check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **hash1#{block})")
@@ -540,6 +614,10 @@ def self.anon_splat_and_anon_keyword_splat(*, **#{block}); end
         check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, a: 2, **empty_hash#{block})")
         check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, **hash1, **empty_hash#{block})")
 
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(#{only_block})")
+        check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(a: 2#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(**empty_hash#{block})")
+
         check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, *empty_array, a: 2, **empty_hash#{block})")
         check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, *empty_array, **hash1, **empty_hash#{block})")
         check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(*array1, **empty_hash, a: 2#{block})")
@@ -554,6 +632,7 @@ def self.anon_splat_and_anon_keyword_splat(*, **#{block}); end
     end
 
     def test_nested_anonymous_splat_and_anonymous_keyword_splat_parameters
+      only_block = block.empty? ? block : block[2..]
       check_allocations(<<~RUBY)
         def self.t(*, **#{block}); end
         def self.anon_splat_and_anon_keyword_splat(*, **#{block}); t(*, **) end
@@ -575,6 +654,7 @@ def self.anon_splat_and_anon_keyword_splat(*, **#{block}); t(*, **) end
 
         check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, a: 2#{block})")
 
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*nil, **nill#{block})")
         check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **nill#{block})")
         check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **empty_hash#{block})")
         check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **hash1#{block})")
@@ -586,6 +666,10 @@ def self.anon_splat_and_anon_keyword_splat(*, **#{block}); t(*, **) end
         check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, a: 2, **empty_hash#{block})")
         check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, **hash1, **empty_hash#{block})")
 
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(#{only_block})")
+        check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(a: 2#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(**empty_hash#{block})")
+
         check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, *empty_array, a: 2, **empty_hash#{block})")
         check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, *empty_array, **hash1, **empty_hash#{block})")
         check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(*array1, **empty_hash, a: 2#{block})")
@@ -620,6 +704,8 @@ def self.argument_forwarding(...); end
 
         check_allocations(0, 0, "argument_forwarding(*array1, a: 2#{block})")
 
+        check_allocations(0, 0, "argument_forwarding(**nill#{block})")
+        check_allocations(0, 0, "argument_forwarding(*nil, **nill#{block})")
         check_allocations(0, 0, "argument_forwarding(*array1, **nill#{block})")
         check_allocations(0, 0, "argument_forwarding(*array1, **empty_hash#{block})")
         check_allocations(0, 0, "argument_forwarding(*array1, **hash1#{block})")
@@ -666,6 +752,8 @@ def self.argument_forwarding(...); t(...) end
 
         check_allocations(0, 0, "argument_forwarding(*array1, a: 2#{block})")
 
+        check_allocations(0, 0, "argument_forwarding(**nill#{block})")
+        check_allocations(0, 0, "argument_forwarding(*nil, **nill#{block})")
         check_allocations(0, 0, "argument_forwarding(*array1, **nill#{block})")
         check_allocations(0, 0, "argument_forwarding(*array1, **empty_hash#{block})")
         check_allocations(0, 0, "argument_forwarding(*array1, **hash1#{block})")
@@ -712,6 +800,8 @@ def self.r2k(*a#{block}); end
 
         check_allocations(1, 1, "r2k(*array1, a: 2#{block})")
 
+        check_allocations(1, 0, "r2k(**nill#{block})")
+        check_allocations(1, 0, "r2k(*nil, **nill#{block})")
         check_allocations(1, 0, "r2k(*array1, **nill#{block})")
         check_allocations(1, 0, "r2k(*array1, **empty_hash#{block})")
         check_allocations(1, 1, "r2k(*array1, **hash1#{block})")
@@ -730,9 +820,9 @@ def self.r2k(*a#{block}); end
         check_allocations(1, 0, "r2k(*array1, **nil#{block})")
 
         check_allocations(1, 0, "r2k(*r2k_empty_array#{block})")
-        check_allocations(1, 1, "r2k(*r2k_array#{block})")
         unless defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
           # YJIT may or may not allocate depending on arch?
+          check_allocations(1, 1, "r2k(*r2k_array#{block})")
           check_allocations(1, 0, "r2k(*r2k_empty_array1#{block})")
           check_allocations(1, 1, "r2k(*r2k_array1#{block})")
         end
@@ -742,13 +832,16 @@ def self.r2k(*a#{block}); end
     def test_no_array_allocation_with_splat_and_nonstatic_keywords
       check_allocations(<<~RUBY)
         def self.keyword(a: nil, b: nil#{block}); end
+        def self.Object; Object end
 
+        check_allocations(0, 1, "keyword(*nil, a: empty_array#{block})") # LVAR
         check_allocations(0, 1, "keyword(*empty_array, a: empty_array#{block})") # LVAR
         check_allocations(0, 1, "->{keyword(*empty_array, a: empty_array#{block})}.call") # DVAR
         check_allocations(0, 1, "$x = empty_array;  keyword(*empty_array, a: $x#{block})") # GVAR
         check_allocations(0, 1, "@x = empty_array; keyword(*empty_array, a: @x#{block})") # IVAR
         check_allocations(0, 1, "self.class.const_set(:X, empty_array); keyword(*empty_array, a: X#{block})") # CONST
-        check_allocations(0, 1, "keyword(*empty_array, a: Object::X#{block})") # COLON2
+        check_allocations(0, 1, "keyword(*empty_array, a: Object::X#{block})") # COLON2 - safe
+        check_allocations(1, 1, "keyword(*empty_array, a: Object()::X#{block})") # COLON2 - unsafe
         check_allocations(0, 1, "keyword(*empty_array, a: ::X#{block})") # COLON3
         check_allocations(0, 1, "T = self; #{'B = block' unless block.empty?}; class Object; @@x = X; T.keyword(*X, a: @@x#{', &B' unless block.empty?}) end") # CVAR
         check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: 1#{block})") # INTEGER
@@ -765,6 +858,13 @@ def self.keyword(a: nil, b: nil#{block}); end
         check_allocations(0, 1, "keyword(*empty_array, a: ->{}#{block})") # LAMBDA
         check_allocations(0, 1, "keyword(*empty_array, a: $1#{block})") # NTH_REF
         check_allocations(0, 1, "keyword(*empty_array, a: $`#{block})") # BACK_REF
+
+        # LIST: Only 1 array (literal [:c]), not 2 (one for [:c] and one for *empty_array)
+        check_allocations(1, 1, "keyword(*empty_array, a: empty_array, b: [:c]#{block})")
+        check_allocations(1, 1, "keyword(*empty_array, a: empty_array, b: [:c, $x]#{block})")
+        # LIST unsafe: 2 (one for [Object()] and one for *empty_array)
+        check_allocations(2, 1, "keyword(*empty_array, a: empty_array, b: [Object()]#{block})")
+        check_allocations(2, 1, "keyword(*empty_array, a: empty_array, b: [:c, $x, Object()]#{block})")
       RUBY
     end
 
@@ -772,6 +872,9 @@ class WithBlock < self
       def block
         ', &block'
       end
+      def only_block
+        '&block'
+      end
     end
   end
 
@@ -807,13 +910,15 @@ def test_no_array_allocation_with_splat_and_nonstatic_keywords
 
       check_allocations(<<~RUBY)
         keyword = keyword = proc{ |a: nil, b: nil #{block}| }
+        def self.Object; Object end
 
         check_allocations(0, 1, "keyword.(*empty_array, a: empty_array#{block})") # LVAR
         check_allocations(0, 1, "->{keyword.(*empty_array, a: empty_array#{block})}.call") # DVAR
         check_allocations(0, 1, "$x = empty_array;  keyword.(*empty_array, a: $x#{block})") # GVAR
         check_allocations(0, 1, "@x = empty_array; keyword.(*empty_array, a: @x#{block})") # IVAR
         check_allocations(0, 1, "self.class.const_set(:X, empty_array); keyword.(*empty_array, a: X#{block})") # CONST
-        check_allocations(0, 1, "keyword.(*empty_array, a: Object::X#{block})") # COLON2
+        check_allocations(0, 1, "keyword.(*empty_array, a: Object::X#{block})") # COLON2 - safe
+        check_allocations(1, 1, "keyword.(*empty_array, a: Object()::X#{block})") # COLON2 - unsafe
         check_allocations(0, 1, "keyword.(*empty_array, a: ::X#{block})") # COLON3
         check_allocations(0, 1, "T = keyword; #{'B = block' unless block.empty?}; class Object; @@x = X; T.(*X, a: @@x#{', &B' unless block.empty?}) end") # CVAR
         check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: 1#{block})") # INTEGER
@@ -830,6 +935,13 @@ def test_no_array_allocation_with_splat_and_nonstatic_keywords
         check_allocations(0, 1, "keyword.(*empty_array, a: ->{}#{block})") # LAMBDA
         check_allocations(0, 1, "keyword.(*empty_array, a: $1#{block})") # NTH_REF
         check_allocations(0, 1, "keyword.(*empty_array, a: $`#{block})") # BACK_REF
+
+        # LIST safe: Only 1 array (literal [:c]), not 2 (one for [:c] and one for *empty_array)
+        check_allocations(1, 1, "keyword.(*empty_array, a: empty_array, b: [:c]#{block})")
+        check_allocations(1, 1, "keyword.(*empty_array, a: empty_array, b: [:c, $x]#{block})")
+        # LIST unsafe: 2 (one for [:c] and one for *empty_array)
+        check_allocations(2, 1, "keyword.(*empty_array, a: empty_array, b: [Object()]#{block})")
+        check_allocations(2, 1, "keyword.(*empty_array, a: empty_array, b: [:c, $x, Object()]#{block})")
       RUBY
     end
 
@@ -837,6 +949,9 @@ class WithBlock < self
       def block
         ', &block'
       end
+      def only_block
+        '&block'
+      end
     end
   end
 end
diff --git a/test/mri/ruby/test_array.rb b/test/mri/ruby/test_array.rb
index 797ae95e978..d93b86e7953 100644
--- a/test/mri/ruby/test_array.rb
+++ b/test/mri/ruby/test_array.rb
@@ -1309,32 +1309,7 @@ def test_pack
     assert_equal(ary.join(':'), ary2.join(':'))
     assert_not_nil(x =~ /def/)
 
-=begin
-    skipping "Not tested:
-        D,d & double-precision float, native format\\
-        E & double-precision float, little-endian byte order\\
-        e & single-precision float, little-endian byte order\\
-        F,f & single-precision float, native format\\
-        G & double-precision float, network (big-endian) byte order\\
-        g & single-precision float, network (big-endian) byte order\\
-        I & unsigned integer\\
-        i & integer\\
-        L & unsigned long\\
-        l & long\\
-
-        N & long, network (big-endian) byte order\\
-        n & short, network (big-endian) byte-order\\
-        P & pointer to a structure (fixed-length string)\\
-        p & pointer to a null-terminated string\\
-        S & unsigned short\\
-        s & short\\
-        V & long, little-endian byte order\\
-        v & short, little-endian byte order\\
-        X & back up a byte\\
-        x & null byte\\
-        Z & ASCII string (null padded, count is width)\\
-"
-=end
+    # more comprehensive tests are in test_pack.rb
   end
 
   def test_pack_with_buffer
@@ -2716,6 +2691,18 @@ def test_fetch
     assert_equal(2, [0, 1].fetch(2, 2))
   end
 
+  def test_fetch_values
+    ary = @cls[1, 2, 3]
+    assert_equal([], ary.fetch_values())
+    assert_equal([1], ary.fetch_values(0))
+    assert_equal([3, 1, 3], ary.fetch_values(2, 0, -1))
+    assert_raise(TypeError) {ary.fetch_values("")}
+    assert_raise(IndexError) {ary.fetch_values(10)}
+    assert_raise(IndexError) {ary.fetch_values(-20)}
+    assert_equal(["10 not found"], ary.fetch_values(10) {|i| "#{i} not found"})
+    assert_equal(["10 not found", 3], ary.fetch_values(10, 2) {|i| "#{i} not found"})
+  end
+
   def test_index2
     a = [0, 1, 2]
     assert_equal(a, a.index.to_a)
@@ -3032,13 +3019,12 @@ def test_shuffle
     end
   end
 
-  def test_shuffle_random
-    gen = proc do
-      10000000
-    end
-    class << gen
-      alias rand call
-    end
+  def test_shuffle_random_out_of_range
+    gen = random_generator {10000000}
+    assert_raise(RangeError) {
+      [*0..2].shuffle(random: gen)
+    }
+    gen = random_generator {-1}
     assert_raise(RangeError) {
       [*0..2].shuffle(random: gen)
     }
@@ -3046,27 +3032,16 @@ class << gen
 
   def test_shuffle_random_clobbering
     ary = (0...10000).to_a
-    gen = proc do
+    gen = random_generator do
       ary.replace([])
       0.5
     end
-    class << gen
-      alias rand call
-    end
     assert_raise(RuntimeError) {ary.shuffle!(random: gen)}
   end
 
   def test_shuffle_random_zero
-    zero = Object.new
-    def zero.to_int
-      0
-    end
-    gen_to_int = proc do |max|
-      zero
-    end
-    class << gen_to_int
-      alias rand call
-    end
+    zero = Struct.new(:to_int).new(0)
+    gen_to_int = random_generator {|max| zero}
     ary = (0...10000).to_a
     assert_equal(ary.rotate, ary.shuffle(random: gen_to_int))
   end
@@ -3134,19 +3109,11 @@ def test_sample_unknown_keyword
   def test_sample_random_generator
     ary = (0...10000).to_a
     assert_raise(ArgumentError) {ary.sample(1, 2, random: nil)}
-    gen0 = proc do |max|
-      max/2
-    end
-    class << gen0
-      alias rand call
-    end
-    gen1 = proc do |max|
+    gen0 = random_generator {|max| max/2}
+    gen1 = random_generator do |max|
       ary.replace([])
       max/2
     end
-    class << gen1
-      alias rand call
-    end
     assert_equal(5000, ary.sample(random: gen0))
     assert_nil(ary.sample(random: gen1))
     assert_equal([], ary)
@@ -3177,20 +3144,23 @@ class << gen1
   end
 
   def test_sample_random_generator_half
-    half = Object.new
-    def half.to_int
-      5000
-    end
-    gen_to_int = proc do |max|
-      half
-    end
-    class << gen_to_int
-      alias rand call
-    end
+    half = Struct.new(:to_int).new(5000)
+    gen_to_int = random_generator {|max| half}
     ary = (0...10000).to_a
     assert_equal(5000, ary.sample(random: gen_to_int))
   end
 
+  def test_sample_random_out_of_range
+    gen = random_generator {10000000}
+    assert_raise(RangeError) {
+      [*0..2].sample(random: gen)
+    }
+    gen = random_generator {-1}
+    assert_raise(RangeError) {
+      [*0..2].sample(random: gen)
+    }
+  end
+
   def test_sample_random_invalid_generator
     ary = (0..10).to_a
     assert_raise(NoMethodError) {
@@ -3614,6 +3584,23 @@ def test_array_safely_modified_by_sort_block
     assert_equal((1..67).to_a.reverse, var_0)
   end
 
+  def test_find
+    ary = [1, 2, 3, 4, 5]
+    assert_equal(2, ary.find {|x| x % 2 == 0 })
+    assert_equal(nil, ary.find {|x| false })
+    assert_equal(:foo, ary.find(proc { :foo }) {|x| false })
+  end
+
+  def test_rfind
+    ary = [1, 2, 3, 4, 5]
+    assert_equal(4, ary.rfind {|x| x % 2 == 0 })
+    assert_equal(1, ary.rfind {|x| x < 2 })
+    assert_equal(5, ary.rfind {|x| x > 4 })
+    assert_equal(nil, ary.rfind {|x| false })
+    assert_equal(:foo, ary.rfind(proc { :foo }) {|x| false })
+    assert_equal(nil, ary.rfind {|x| ary.clear; false })
+  end
+
   private
   def need_continuation
     unless respond_to?(:callcc, true)
@@ -3621,6 +3608,13 @@ def need_continuation
     end
     omit 'requires callcc support' unless respond_to?(:callcc, true)
   end
+
+  def random_generator(&block)
+    class << block
+      alias rand call
+    end
+    block
+  end
 end
 
 class TestArraySubclass < TestArray
diff --git a/test/mri/ruby/test_ast.rb b/test/mri/ruby/test_ast.rb
index edfc25c43d9..c7a946dec86 100644
--- a/test/mri/ruby/test_ast.rb
+++ b/test/mri/ruby/test_ast.rb
@@ -48,7 +48,7 @@ def initialize(path, src: nil)
       @path = path
       @errors = []
       @debug = false
-      @ast = RubyVM::AbstractSyntaxTree.parse(src) if src
+      @ast = EnvUtil.suppress_warning { RubyVM::AbstractSyntaxTree.parse(src) } if src
     end
 
     def validate_range
@@ -67,7 +67,7 @@ def validate_not_cared
 
     def ast
       return @ast if defined?(@ast)
-      @ast = RubyVM::AbstractSyntaxTree.parse_file(@path)
+      @ast = EnvUtil.suppress_warning { RubyVM::AbstractSyntaxTree.parse_file(@path) }
     end
 
     private
@@ -135,7 +135,7 @@ def validate_not_cared0(node)
 
   Dir.glob("test/**/*.rb", base: SRCDIR).each do |path|
     define_method("test_all_tokens:#{path}") do
-      node = RubyVM::AbstractSyntaxTree.parse_file("#{SRCDIR}/#{path}", keep_tokens: true)
+      node = EnvUtil.suppress_warning { RubyVM::AbstractSyntaxTree.parse_file("#{SRCDIR}/#{path}", keep_tokens: true) }
       tokens = node.all_tokens.sort_by { [_1.last[0], _1.last[1]] }
       tokens_bytes = tokens.map { _1[2]}.join.bytes
       source_bytes = File.read("#{SRCDIR}/#{path}").bytes
@@ -337,6 +337,19 @@ def test_invalid_yield
     assert_parse("END {defined? yield}")
   end
 
+  def test_invalid_yield_no_memory_leak
+    # [Bug #21383]
+    assert_no_memory_leak([], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
+      code = proc do
+        eval("class C; yield; end")
+      rescue SyntaxError
+      end
+      1_000.times(&code)
+    begin;
+      100_000.times(&code)
+    end;
+  end
+
   def test_node_id_for_location
     omit if ParserSupport.prism_enabled?
 
@@ -352,6 +365,50 @@ def test_node_id_for_location
     assert_equal node.node_id, node_id
   end
 
+  def add(x, y)
+  end
+
+  def test_node_id_for_backtrace_location_of_method_definition
+    omit if ParserSupport.prism_enabled?
+
+    begin
+      add(1)
+    rescue ArgumentError => exc
+      loc = exc.backtrace_locations.first
+      node_id = RubyVM::AbstractSyntaxTree.node_id_for_backtrace_location(loc)
+      node = RubyVM::AbstractSyntaxTree.of(method(:add))
+      assert_equal node.node_id, node_id
+    end
+  end
+
+  def test_node_id_for_backtrace_location_of_lambda
+    omit if ParserSupport.prism_enabled?
+
+    v = -> {}
+    begin
+      v.call(1)
+    rescue ArgumentError => exc
+      loc = exc.backtrace_locations.first
+      node_id = RubyVM::AbstractSyntaxTree.node_id_for_backtrace_location(loc)
+      node = RubyVM::AbstractSyntaxTree.of(v)
+      assert_equal node.node_id, node_id
+    end
+  end
+
+  def test_node_id_for_backtrace_location_of_lambda_method
+    omit if ParserSupport.prism_enabled?
+
+    v = lambda {}
+    begin
+      v.call(1)
+    rescue ArgumentError => exc
+      loc = exc.backtrace_locations.first
+      node_id = RubyVM::AbstractSyntaxTree.node_id_for_backtrace_location(loc)
+      node = RubyVM::AbstractSyntaxTree.of(v)
+      assert_equal node.node_id, node_id
+    end
+  end
+
   def test_node_id_for_backtrace_location_raises_argument_error
     bug19262 = '[ruby-core:111435]'
 
@@ -788,7 +845,7 @@ def test_keep_script_lines_for_of
     node_proc = RubyVM::AbstractSyntaxTree.of(proc, keep_script_lines: true)
     node_method = RubyVM::AbstractSyntaxTree.of(method, keep_script_lines: true)
 
-    assert_equal("{ 1 + 2 }", node_proc.source)
+    assert_equal("Proc.new { 1 + 2 }", node_proc.source)
     assert_equal("def test_keep_script_lines_for_of\n", node_method.source.lines.first)
   end
 
@@ -865,7 +922,7 @@ def test_e_option
     omit if ParserSupport.prism_enabled? || ParserSupport.prism_enabled_in_subprocess?
 
     assert_in_out_err(["-e", "def foo; end; pp RubyVM::AbstractSyntaxTree.of(method(:foo)).type"],
-                      "", [":SCOPE"], [])
+                      "", [":DEFN"], [])
   end
 
   def test_error_tolerant
@@ -1376,6 +1433,145 @@ def test_case3_locations
       assert_locations(node.children[-1].locations, [[1, 0, 1, 17], [1, 0, 1, 4], [1, 14, 1, 17]])
     end
 
+    def test_class_locations
+      node = ast_parse("class A end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 11], [1, 0, 1, 5], nil, [1, 8, 1, 11]])
+
+      node = ast_parse("class A < B; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 16], [1, 0, 1, 5], [1, 8, 1, 9], [1, 13, 1, 16]])
+    end
+
+    def test_colon2_locations
+      node = ast_parse("A::B")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 4], [1, 1, 1, 3], [1, 3, 1, 4]])
+
+      node = ast_parse("A::B::C")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 7], [1, 4, 1, 6], [1, 6, 1, 7]])
+      assert_locations(node.children[-1].children[0].locations, [[1, 0, 1, 4], [1, 1, 1, 3], [1, 3, 1, 4]])
+    end
+
+    def test_colon3_locations
+      node = ast_parse("::A")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 3], [1, 0, 1, 2], [1, 2, 1, 3]])
+
+      node = ast_parse("::A::B")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 3, 1, 5], [1, 5, 1, 6]])
+      assert_locations(node.children[-1].children[0].locations, [[1, 0, 1, 3], [1, 0, 1, 2], [1, 2, 1, 3]])
+    end
+
+    def test_defined_locations
+      node = ast_parse("defined? x")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 10], [1, 0, 1, 8]])
+
+      node = ast_parse("defined?(x)")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 11], [1, 0, 1, 8]])
+    end
+
+    def test_dot2_locations
+      node = ast_parse("1..2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 4], [1, 1, 1, 3]])
+
+      node = ast_parse("foo(1..2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 8], [1, 5, 1, 7]])
+
+      node = ast_parse("foo(1..2, 3)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 8], [1, 5, 1, 7]])
+
+      node = ast_parse("foo(..2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 7], [1, 4, 1, 6]])
+    end
+
+    def test_dot3_locations
+      node = ast_parse("1...2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 5], [1, 1, 1, 4]])
+
+      node = ast_parse("foo(1...2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 9], [1, 5, 1, 8]])
+
+      node = ast_parse("foo(1...2, 3)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 9], [1, 5, 1, 8]])
+
+      node = ast_parse("foo(...2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 8], [1, 4, 1, 7]])
+    end
+
+    def test_evstr_locations
+      node = ast_parse('"#{foo}"')
+      assert_locations(node.children[-1].children[1].locations, [[1, 0, 1, 8], [1, 1, 1, 3], [1, 6, 1, 7]])
+
+      node = ast_parse('"#$1"')
+      assert_locations(node.children[-1].children[1].locations, [[1, 0, 1, 5], [1, 1, 1, 2], nil])
+    end
+
+    def test_flip2_locations
+      node = ast_parse("if 'a'..'z'; foo; end")
+      assert_locations(node.children[-1].children[0].locations, [[1, 3, 1, 11], [1, 6, 1, 8]])
+
+      node = ast_parse('if 1..5; foo; end')
+      assert_locations(node.children[-1].children[0].locations, [[1, 3, 1, 7], [1, 4, 1, 6]])
+    end
+
+    def test_flip3_locations
+      node = ast_parse("if 'a'...('z'); foo; end")
+      assert_locations(node.children[-1].children[0].locations, [[1, 3, 1, 14], [1, 6, 1, 9]])
+
+      node = ast_parse('if 1...5; foo; end')
+      assert_locations(node.children[-1].children[0].locations, [[1, 3, 1, 8], [1, 4, 1, 7]])
+    end
+
+    def test_for_locations
+      node = ast_parse("for a in b; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 15], [1, 0, 1, 3], [1, 6, 1, 8], nil, [1, 12, 1, 15]])
+
+      node = ast_parse("for a in b do; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 18], [1, 0, 1, 3], [1, 6, 1, 8], [1, 11, 1, 13], [1, 15, 1, 18]])
+    end
+
+    def test_lambda_locations
+      node = ast_parse("-> (a, b) { foo }")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 17], [1, 0, 1, 2], [1, 10, 1, 11], [1, 16, 1, 17]])
+
+      node = ast_parse("-> (a, b) do foo end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 20], [1, 0, 1, 2], [1, 10, 1, 12], [1, 17, 1, 20]])
+    end
+
+    def test_module_locations
+      node = ast_parse('module A end')
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 12], [1, 0, 1, 6], [1, 9, 1, 12]])
+    end
+
+    def test_if_locations
+      node = ast_parse("if cond then 1 else 2 end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 25], [1, 0, 1, 2], [1, 8, 1, 12], [1, 22, 1, 25]])
+
+      node = ast_parse("1 if 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 2, 1, 4], nil, nil])
+
+      node = ast_parse("if 1; elsif 2; else end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 23], [1, 0, 1, 2], [1, 4, 1, 5], [1, 20, 1, 23]])
+      assert_locations(node.children[-1].children[-1].locations, [[1, 6, 1, 19], [1, 6, 1, 11], [1, 13, 1, 14], [1, 20, 1, 23]])
+
+      node = ast_parse("true ? 1 : 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 12], nil, [1, 9, 1, 10], nil])
+
+      node = ast_parse("case a; in b if c; end")
+      assert_locations(node.children[-1].children[1].children[0].locations, [[1, 11, 1, 17], [1, 13, 1, 15], nil, nil])
+    end
+
+    def test_in_locations
+      node = ast_parse("case 1; in 2 then 3; end")
+      assert_locations(node.children[-1].children[1].locations, [[1, 8, 1, 20], [1, 8, 1, 10], [1, 13, 1, 17], nil])
+
+      node = ast_parse("1 => a")
+      assert_locations(node.children[-1].children[1].locations, [[1, 5, 1, 6], nil, nil, [1, 2, 1, 4]])
+
+      node = ast_parse("1 in a")
+      assert_locations(node.children[-1].children[1].locations, [[1, 5, 1, 6], [1, 2, 1, 4], nil, nil])
+
+      node = ast_parse("case 1; in 2; 3; end")
+      assert_locations(node.children[-1].children[1].locations, [[1, 8, 1, 16], [1, 8, 1, 10], [1, 12, 1, 13], nil])
+    end
+
     def test_next_locations
       node = ast_parse("loop { next 1 }")
       assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 7, 1, 13], [1, 7, 1, 11]])
@@ -1411,11 +1607,27 @@ def test_op_asgn2_locations
       assert_locations(node.children[-1].children[-1].locations, [[1, 4, 1, 15], [1, 8, 1, 9], [1, 9, 1, 10], [1, 11, 1, 13]])
     end
 
+    def test_postexe_locations
+      node = ast_parse("END {  }")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 8], [1, 0, 1, 3], [1, 4, 1, 5], [1, 7, 1, 8]])
+
+      node = ast_parse("END { 1 }")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 9], [1, 0, 1, 3], [1, 4, 1, 5], [1, 8, 1, 9]])
+    end
+
     def test_redo_locations
       node = ast_parse("loop { redo }")
       assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 7, 1, 11], [1, 7, 1, 11]])
     end
 
+    def test_regx_locations
+      node = ast_parse("/foo/")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 5], [1, 0, 1, 1], [1, 1, 1, 4], [1, 4, 1, 5]])
+
+      node = ast_parse("/foo/i")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 0, 1, 1], [1, 1, 1, 4], [1, 4, 1, 6]])
+    end
+
     def test_return_locations
       node = ast_parse("return 1")
       assert_locations(node.children[-1].locations, [[1, 0, 1, 8], [1, 0, 1, 6]])
@@ -1424,6 +1636,14 @@ def test_return_locations
       assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 0, 1, 6]])
     end
 
+    def test_sclass_locations
+      node = ast_parse("class << self; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 18], [1, 0, 1, 5], [1, 6, 1, 8], [1, 15, 1, 18]])
+
+      node = ast_parse("class << obj; foo; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 22], [1, 0, 1, 5], [1, 6, 1, 8], [1, 19, 1, 22]])
+    end
+
     def test_splat_locations
       node = ast_parse("a = *1")
       assert_locations(node.children[-1].children[1].locations, [[1, 4, 1, 6], [1, 4, 1, 5]])
@@ -1438,6 +1658,14 @@ def test_splat_locations
       assert_locations(node.children[-1].children[1].children[0].children[0].locations, [[1, 13, 1, 15], [1, 13, 1, 14]])
     end
 
+    def test_super_locations
+      node = ast_parse("super 1")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 7], [1, 0, 1, 5], nil, nil])
+
+      node = ast_parse("super(1)")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 8], [1, 0, 1, 5], [1, 5, 1, 6], [1, 7, 1, 8]])
+    end
+
     def test_unless_locations
       node = ast_parse("unless cond then 1 else 2 end")
       assert_locations(node.children[-1].locations, [[1, 0, 1, 29], [1, 0, 1, 6], [1, 12, 1, 16], [1, 26, 1, 29]])
@@ -1460,6 +1688,15 @@ def test_valias_locations
 
       node = ast_parse("alias $foo $&")
       assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
+
+      node = ast_parse("alias $foo $`")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
+
+      node = ast_parse("alias $foo $'")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
+
+      node = ast_parse("alias $foo $+")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
     end
 
     def test_when_locations
@@ -1483,10 +1720,24 @@ def test_until_locations
       assert_locations(node.children[-1].locations, [[1, 0, 1, 9], [1, 2, 1, 7], nil])
     end
 
+    def test_yield_locations
+      node = ast_parse("def foo; yield end")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 9, 1, 14], [1, 9, 1, 14], nil, nil])
+
+      node = ast_parse("def foo; yield() end")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 9, 1, 16], [1, 9, 1, 14], [1, 14, 1, 15], [1, 15, 1, 16]])
+
+      node = ast_parse("def foo; yield 1, 2 end")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 9, 1, 19], [1, 9, 1, 14], nil, nil])
+
+      node = ast_parse("def foo; yield(1, 2) end")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 9, 1, 20], [1, 9, 1, 14], [1, 14, 1, 15], [1, 19, 1, 20]])
+    end
+
     private
     def ast_parse(src, **options)
       begin
-        verbose_bak, $VERBOSE = $VERBOSE, false
+        verbose_bak, $VERBOSE = $VERBOSE, nil
         RubyVM::AbstractSyntaxTree.parse(src, **options)
       ensure
         $VERBOSE = verbose_bak
diff --git a/test/mri/ruby/test_autoload.rb b/test/mri/ruby/test_autoload.rb
index ca3e3d5f7fe..feadafc2e52 100644
--- a/test/mri/ruby/test_autoload.rb
+++ b/test/mri/ruby/test_autoload.rb
@@ -224,11 +224,22 @@ def ruby_impl_require
     Kernel.module_eval do
       alias old_require require
     end
+    if defined?(Ruby::Box)
+      Ruby::Box.module_eval do
+        alias old_require require
+      end
+    end
     called_with = []
     Kernel.send :define_method, :require do |path|
       called_with << path
       old_require path
     end
+    if defined?(Ruby::Box)
+      Ruby::Box.send :define_method, :require do |path|
+        called_with << path
+        old_require path
+      end
+    end
     yield called_with
   ensure
     Kernel.module_eval do
@@ -236,6 +247,13 @@ def ruby_impl_require
       alias require old_require
       undef old_require
     end
+    if defined?(Ruby::Box)
+      Ruby::Box.module_eval do
+        undef require
+        alias require old_require
+        undef old_require
+      end
+    end
   end
 
   def test_require_implemented_in_ruby_is_called
@@ -249,7 +267,8 @@ def test_require_implemented_in_ruby_is_called
         ensure
           remove_autoload_constant
         end
-        assert_equal [file.path], called_with
+        # .dup to prevent breaking called_with by autoloading pp, etc
+        assert_equal [file.path], called_with.dup
       }
     end
   end
@@ -267,7 +286,8 @@ def test_autoload_while_autoloading
           ensure
             remove_autoload_constant
           end
-          assert_equal [a.path, b.path], called_with
+          # .dup to prevent breaking called_with by autoloading pp, etc
+          assert_equal [a.path, b.path], called_with.dup
         end
       end
     end
@@ -599,4 +619,10 @@ module SomeNamespace
       RUBY
     end
   end
+
+  private
+
+  def assert_separately(*args, **kwargs)
+    super(*args, **{ timeout: 60 }.merge(kwargs))
+  end
 end
diff --git a/test/mri/ruby/test_backtrace.rb b/test/mri/ruby/test_backtrace.rb
index fca7b620302..dad7dfcb558 100644
--- a/test/mri/ruby/test_backtrace.rb
+++ b/test/mri/ruby/test_backtrace.rb
@@ -454,4 +454,16 @@ def (foo::Bar).baz = raise
     foo::Bar.baz
     end;
   end
+
+  def test_backtrace_internal_frame
+    backtrace = tap { break caller_locations(0) }
+    assert_equal(__FILE__, backtrace[1].path) # not "<internal:kernel>"
+    assert_equal("Kernel#tap", backtrace[1].label)
+  end
+
+  def test_backtrace_on_argument_error
+    lineno = __LINE__; [1, 2].inject(:tap)
+  rescue ArgumentError
+    assert_equal("#{ __FILE__ }:#{ lineno }:in 'Kernel#tap'", $!.backtrace[0].to_s)
+  end
 end
diff --git a/test/mri/ruby/test_bignum.rb b/test/mri/ruby/test_bignum.rb
index beef33e2a60..c366f794b2a 100644
--- a/test/mri/ruby/test_bignum.rb
+++ b/test/mri/ruby/test_bignum.rb
@@ -605,6 +605,49 @@ def test_aref
     assert_equal(1, (-2**(BIGNUM_MIN_BITS*4))[BIGNUM_MIN_BITS*4])
   end
 
+  def test_aref2
+    x = (0x123456789abcdef << (BIGNUM_MIN_BITS + 32)) | 0x12345678
+    assert_equal(x, x[0, x.bit_length])
+    assert_equal(x >> 10, x[10, x.bit_length])
+    assert_equal(0x45678, x[0, 20])
+    assert_equal(0x6780, x[-4, 16])
+    assert_equal(0x123456, x[x.bit_length - 21, 40])
+    assert_equal(0x6789ab, x[x.bit_length - 41, 24])
+    assert_equal(0, x[-20, 10])
+    assert_equal(0, x[x.bit_length + 10, 10])
+
+    assert_equal(0, x[5, 0])
+    assert_equal(0, (-x)[5, 0])
+
+    assert_equal(x >> 5, x[5, -1])
+    assert_equal(x << 5, x[-5, -1])
+    assert_equal((-x) >> 5, (-x)[5, -1])
+    assert_equal((-x) << 5, (-x)[-5, -1])
+
+    assert_equal(x << 5, x[-5, FIXNUM_MAX])
+    assert_equal(x >> 5, x[5, FIXNUM_MAX])
+    assert_equal(0, x[FIXNUM_MIN, 100])
+    assert_equal(0, (-x)[FIXNUM_MIN, 100])
+
+    y = (x << 160) | 0x1234_0000_0000_0000_1234_0000_0000_0000
+    assert_equal(0xffffedcc00, (-y)[40, 40])
+    assert_equal(0xfffffffedc, (-y)[52, 40])
+    assert_equal(0xffffedcbff, (-y)[104, 40])
+    assert_equal(0xfffff6e5d4, (-y)[y.bit_length - 20, 40])
+    assert_equal(0, (-y)[-20, 10])
+    assert_equal(0xfff, (-y)[y.bit_length + 10, 12])
+
+    z = (1 << (BIGNUM_MIN_BITS * 2)) - 1
+    assert_equal(0x400, (-z)[-10, 20])
+    assert_equal(1, (-z)[0, 20])
+    assert_equal(0, (-z)[10, 20])
+    assert_equal(1, (-z)[0, z.bit_length])
+    assert_equal(0, (-z)[z.bit_length - 10, 10])
+    assert_equal(0x400, (-z)[z.bit_length - 10, 11])
+    assert_equal(0xfff, (-z)[z.bit_length, 12])
+    assert_equal(0xfff00, (-z)[z.bit_length - 8, 20])
+  end
+
   def test_hash
     assert_nothing_raised { T31P.hash }
   end
@@ -778,6 +821,9 @@ def test_digits
     assert_equal([7215, 2413, 6242], T1024P.digits(10_000).first(3))
     assert_equal([11], 11.digits(T1024P))
     assert_equal([T1024P - 1, 1], (T1024P + T1024P - 1).digits(T1024P))
+    bug21680 = '[ruby-core:123769] [Bug #21680]'
+    assert_equal([0] * 64 + [1], (2**512).digits(256), bug21680)
+    assert_equal([0] * 128 + [1], (123**128).digits(123), bug21680)
   end
 
   def test_digits_for_negative_numbers
diff --git a/test/mri/ruby/test_box.rb b/test/mri/ruby/test_box.rb
new file mode 100644
index 00000000000..a531afa6796
--- /dev/null
+++ b/test/mri/ruby/test_box.rb
@@ -0,0 +1,857 @@
+# frozen_string_literal: true
+
+require 'test/unit'
+
+class TestBox < Test::Unit::TestCase
+  EXPERIMENTAL_WARNING_LINE_PATTERNS = [
+    /ruby(\.exe)?: warning: Ruby::Box is experimental, and the behavior may change in the future!/,
+    %r{See https://docs.ruby-lang.org/en/(master|\d\.\d)/Ruby/Box.html for known issues, etc.}
+  ]
+  ENV_ENABLE_BOX = {'RUBY_BOX' => '1', 'TEST_DIR' => __dir__}
+
+  def setup
+    @box = nil
+    @dir = __dir__
+  end
+
+  def teardown
+    @box = nil
+  end
+
+  def setup_box
+    pend unless Ruby::Box.enabled?
+    @box = Ruby::Box.new
+  end
+
+  def test_box_availability_in_default
+    assert_separately(['RUBY_BOX'=>nil], __FILE__, __LINE__, "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      assert_nil ENV['RUBY_BOX']
+      assert !Ruby::Box.enabled?
+    end;
+  end
+
+  def test_box_availability_when_enabled
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      assert '1', ENV['RUBY_BOX']
+      assert Ruby::Box.enabled?
+    end;
+  end
+
+  def test_current_box_in_main
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      assert_equal Ruby::Box.main, Ruby::Box.current
+      assert Ruby::Box.main.main?
+    end;
+  end
+
+  def test_require_rb_separately
+    setup_box
+
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+
+    @box.require(File.join(__dir__, 'box', 'a.1_1_0'))
+
+    assert_not_nil @box::BOX_A
+    assert_not_nil @box::BOX_B
+    assert_equal "1.1.0", @box::BOX_A::VERSION
+    assert_equal "yay 1.1.0", @box::BOX_A.new.yay
+    assert_equal "1.1.0", @box::BOX_B::VERSION
+    assert_equal "yay_b1", @box::BOX_B.yay
+
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+  end
+
+  def test_require_relative_rb_separately
+    setup_box
+
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+
+    @box.require_relative('box/a.1_1_0')
+
+    assert_not_nil @box::BOX_A
+    assert_not_nil @box::BOX_B
+    assert_equal "1.1.0", @box::BOX_A::VERSION
+    assert_equal "yay 1.1.0", @box::BOX_A.new.yay
+    assert_equal "1.1.0", @box::BOX_B::VERSION
+    assert_equal "yay_b1", @box::BOX_B.yay
+
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+  end
+
+  def test_load_separately
+    setup_box
+
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+
+    @box.load(File.join(__dir__, 'box', 'a.1_1_0.rb'))
+
+    assert_not_nil @box::BOX_A
+    assert_not_nil @box::BOX_B
+    assert_equal "1.1.0", @box::BOX_A::VERSION
+    assert_equal "yay 1.1.0", @box::BOX_A.new.yay
+    assert_equal "1.1.0", @box::BOX_B::VERSION
+    assert_equal "yay_b1", @box::BOX_B.yay
+
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+  end
+
+  def test_box_in_box
+    setup_box
+
+    assert_raise(NameError) { BOX1 }
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+
+    @box.require_relative('box/box')
+
+    assert_not_nil @box::BOX1
+    assert_not_nil @box::BOX1::BOX_A
+    assert_not_nil @box::BOX1::BOX_B
+    assert_equal "1.1.0", @box::BOX1::BOX_A::VERSION
+    assert_equal "yay 1.1.0", @box::BOX1::BOX_A.new.yay
+    assert_equal "1.1.0", @box::BOX1::BOX_B::VERSION
+    assert_equal "yay_b1", @box::BOX1::BOX_B.yay
+
+    assert_raise(NameError) { BOX1 }
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+  end
+
+  def test_require_rb_2versiobox
+    setup_box
+
+    assert_raise(NameError) { BOX_A }
+
+    @box.require(File.join(__dir__, 'box', 'a.1_2_0'))
+    assert_equal "1.2.0", @box::BOX_A::VERSION
+    assert_equal "yay 1.2.0", @box::BOX_A.new.yay
+
+    n2 = Ruby::Box.new
+    n2.require(File.join(__dir__, 'box', 'a.1_1_0'))
+    assert_equal "1.1.0", n2::BOX_A::VERSION
+    assert_equal "yay 1.1.0", n2::BOX_A.new.yay
+
+    # recheck @box is not affected by the following require
+    assert_equal "1.2.0", @box::BOX_A::VERSION
+    assert_equal "yay 1.2.0", @box::BOX_A.new.yay
+
+    assert_raise(NameError) { BOX_A }
+  end
+
+  def test_raising_errors_in_require
+    setup_box
+
+    assert_raise(RuntimeError, "Yay!") { @box.require(File.join(__dir__, 'box', 'raise')) }
+    assert Ruby::Box.current.inspect.include?("main")
+  end
+
+  def test_autoload_in_box
+    setup_box
+
+    assert_raise(NameError) { BOX_A }
+
+    @box.require_relative('box/autoloading')
+    # autoloaded A is visible from global
+    assert_equal '1.1.0', @box::BOX_A::VERSION
+
+    assert_raise(NameError) { BOX_A }
+
+    # autoload trigger BOX_B::BAR is valid even from global
+    assert_equal 'bar_b1', @box::BOX_B::BAR
+
+    assert_raise(NameError) { BOX_A }
+    assert_raise(NameError) { BOX_B }
+  end
+
+  def test_continuous_top_level_method_in_a_box
+    setup_box
+
+    @box.require_relative('box/define_toplevel')
+    @box.require_relative('box/call_toplevel')
+
+    assert_raise(NameError) { foo }
+  end
+
+  def test_top_level_methods_in_box
+    pend # TODO: fix loading/current box detection
+    setup_box
+    @box.require_relative('box/top_level')
+    assert_equal "yay!", @box::Foo.foo
+    assert_raise(NameError) { yaaay }
+    assert_equal "foo", @box::Bar.bar
+    assert_raise_with_message(RuntimeError, "boooo") { @box::Baz.baz }
+  end
+
+  def test_proc_defined_in_box_refers_module_in_box
+    setup_box
+
+    # require_relative dosn't work well in assert_separately even with __FILE__ and __LINE__
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "here = '#{__dir__}'; #{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      box1 = Ruby::Box.new
+      box1.require("#{here}/box/proc_callee")
+      proc_v = box1::Foo.callee
+      assert_raise(NameError) { Target }
+      assert box1::Target
+      assert_equal "fooooo", proc_v.call # refers Target in the box box1
+      box1.require("#{here}/box/proc_caller")
+      assert_equal "fooooo", box1::Bar.caller(proc_v)
+
+      box2 = Ruby::Box.new
+      box2.require("#{here}/box/proc_caller")
+      assert_raise(NameError) { box2::Target }
+      assert_equal "fooooo", box2::Bar.caller(proc_v) # refers Target in the box box1
+    end;
+  end
+
+  def test_proc_defined_globally_refers_global_module
+    setup_box
+
+    # require_relative dosn't work well in assert_separately even with __FILE__ and __LINE__
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "here = '#{__dir__}'; #{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      require("#{here}/box/proc_callee")
+      def Target.foo
+        "yay"
+      end
+      proc_v = Foo.callee
+      assert Target
+      assert_equal "yay", proc_v.call # refers global Foo
+      box1 = Ruby::Box.new
+      box1.require("#{here}/box/proc_caller")
+      assert_equal "yay", box1::Bar.caller(proc_v)
+
+      box2 = Ruby::Box.new
+      box2.require("#{here}/box/proc_callee")
+      box2.require("#{here}/box/proc_caller")
+      assert_equal "fooooo", box2::Foo.callee.call
+      assert_equal "yay", box2::Bar.caller(proc_v) # should refer the global Target, not Foo in box2
+    end;
+  end
+
+  def test_instance_variable
+    setup_box
+
+    @box.require_relative('box/instance_variables')
+
+    assert_equal [], String.instance_variables
+    assert_equal [:@str_ivar1, :@str_ivar2], @box::StringDelegatorObj.instance_variables
+    assert_equal 111, @box::StringDelegatorObj.str_ivar1
+    assert_equal 222, @box::StringDelegatorObj.str_ivar2
+    assert_equal 222, @box::StringDelegatorObj.instance_variable_get(:@str_ivar2)
+
+    @box::StringDelegatorObj.instance_variable_set(:@str_ivar3, 333)
+    assert_equal 333, @box::StringDelegatorObj.instance_variable_get(:@str_ivar3)
+    @box::StringDelegatorObj.remove_instance_variable(:@str_ivar1)
+    assert_nil @box::StringDelegatorObj.str_ivar1
+    assert_equal [:@str_ivar2, :@str_ivar3], @box::StringDelegatorObj.instance_variables
+
+    assert_equal [], String.instance_variables
+  end
+
+  def test_methods_added_in_box_are_invisible_globally
+    setup_box
+
+    @box.require_relative('box/string_ext')
+
+    assert_equal "yay", @box::Bar.yay
+
+    assert_raise(NoMethodError){ String.new.yay }
+  end
+
+  def test_continuous_method_definitions_in_a_box
+    setup_box
+
+    @box.require_relative('box/string_ext')
+    assert_equal "yay", @box::Bar.yay
+
+    @box.require_relative('box/string_ext_caller')
+    assert_equal "yay", @box::Foo.yay
+
+    @box.require_relative('box/string_ext_calling')
+  end
+
+  def test_methods_added_in_box_later_than_caller_code
+    setup_box
+
+    @box.require_relative('box/string_ext_caller')
+    @box.require_relative('box/string_ext')
+
+    assert_equal "yay", @box::Bar.yay
+    assert_equal "yay", @box::Foo.yay
+  end
+
+  def test_method_added_in_box_are_available_on_eval
+    setup_box
+
+    @box.require_relative('box/string_ext')
+    @box.require_relative('box/string_ext_eval_caller')
+
+    assert_equal "yay", @box::Baz.yay
+  end
+
+  def test_method_added_in_box_are_available_on_eval_with_binding
+    setup_box
+
+    @box.require_relative('box/string_ext')
+    @box.require_relative('box/string_ext_eval_caller')
+
+    assert_equal "yay, yay!", @box::Baz.yay_with_binding
+  end
+
+  def test_methods_and_constants_added_by_include
+    setup_box
+
+    @box.require_relative('box/open_class_with_include')
+
+    assert_equal "I'm saying foo 1", @box::OpenClassWithInclude.say
+    assert_equal "I'm saying foo 1", @box::OpenClassWithInclude.say_foo
+    assert_equal "I'm saying foo 1", @box::OpenClassWithInclude.say_with_obj("wow")
+
+    assert_raise(NameError) { String::FOO }
+
+    assert_equal "foo 1", @box::OpenClassWithInclude.refer_foo
+  end
+end
+
+module ProcLookupTestA
+  module B
+    VALUE = 111
+  end
+end
+
+class TestBox < Test::Unit::TestCase
+  def make_proc_from_block(&b)
+    b
+  end
+
+  def test_proc_from_main_works_with_global_definitions
+    setup_box
+
+    @box.require_relative('box/procs')
+
+    proc_and_labels = [
+      [Proc.new { String.new.yay }, "Proc.new"],
+      [proc { String.new.yay }, "proc{}"],
+      [lambda { String.new.yay }, "lambda{}"],
+      [->(){ String.new.yay }, "->(){}"],
+      [make_proc_from_block { String.new.yay }, "make_proc_from_block"],
+      [@box::ProcInBox.make_proc_from_block { String.new.yay }, "make_proc_from_block in @box"],
+    ]
+
+    proc_and_labels.each do |str_pr|
+      pr, pr_label = str_pr
+      assert_raise(NoMethodError, "NoMethodError expected: #{pr_label}, called in main") { pr.call }
+      assert_raise(NoMethodError, "NoMethodError expected: #{pr_label}, called in @box") { @box::ProcInBox.call_proc(pr) }
+    end
+
+    const_and_labels = [
+      [Proc.new { ProcLookupTestA::B::VALUE }, "Proc.new"],
+      [proc { ProcLookupTestA::B::VALUE }, "proc{}"],
+      [lambda { ProcLookupTestA::B::VALUE }, "lambda{}"],
+      [->(){ ProcLookupTestA::B::VALUE }, "->(){}"],
+      [make_proc_from_block { ProcLookupTestA::B::VALUE }, "make_proc_from_block"],
+      [@box::ProcInBox.make_proc_from_block { ProcLookupTestA::B::VALUE }, "make_proc_from_block in @box"],
+    ]
+
+    const_and_labels.each do |const_pr|
+      pr, pr_label = const_pr
+      assert_equal 111, pr.call, "111 expected, #{pr_label} called in main"
+      assert_equal 111, @box::ProcInBox.call_proc(pr), "111 expected, #{pr_label} called in @box"
+    end
+  end
+
+  def test_proc_from_box_works_with_definitions_in_box
+    setup_box
+
+    @box.require_relative('box/procs')
+
+    proc_types = [:proc_new, :proc_f, :lambda_f, :lambda_l, :block]
+
+    proc_types.each do |proc_type|
+      assert_equal 222, @box::ProcInBox.make_const_proc(proc_type).call, "ProcLookupTestA::B::VALUE should be 222 in @box"
+      assert_equal "foo", @box::ProcInBox.make_str_const_proc(proc_type).call, "String::FOO should be \"foo\" in @box"
+      assert_equal "yay", @box::ProcInBox.make_str_proc(proc_type).call, "String#yay should be callable in @box"
+      #
+      # TODO: method calls not-in-methods nor procs can't handle the current box correctly.
+      #
+      # assert_equal "yay,foo,222",
+      #              @box::ProcInBox.const_get(('CONST_' + proc_type.to_s.upcase).to_sym).call,
+      #              "Proc assigned to constants should refer constants correctly in @box"
+    end
+  end
+
+  def test_class_module_singleton_methods
+    setup_box
+
+    @box.require_relative('box/singleton_methods')
+
+    assert_equal "Good evening!", @box::SingletonMethods.string_greeing # def self.greeting
+    assert_equal 42, @box::SingletonMethods.integer_answer # class << self; def answer
+    assert_equal([], @box::SingletonMethods.array_blank) # def self.blank w/ instance methods
+    assert_equal({status: 200, body: 'OK'}, @box::SingletonMethods.hash_http_200) # class << self; def ... w/ instance methods
+
+    assert_equal([4, 4], @box::SingletonMethods.array_instance_methods_return_size([1, 2, 3, 4]))
+    assert_equal([3, 3], @box::SingletonMethods.hash_instance_methods_return_size({a: 2, b: 4, c: 8}))
+
+    assert_raise(NoMethodError) { String.greeting }
+    assert_raise(NoMethodError) { Integer.answer }
+    assert_raise(NoMethodError) { Array.blank }
+    assert_raise(NoMethodError) { Hash.http_200 }
+  end
+
+  def test_add_constants_in_box
+    setup_box
+
+    @box.require('envutil')
+
+    String.const_set(:STR_CONST0, 999)
+    assert_equal 999, String::STR_CONST0
+    assert_equal 999, String.const_get(:STR_CONST0)
+
+    assert_raise(NameError) { String.const_get(:STR_CONST1) }
+    assert_raise(NameError) { String::STR_CONST2 }
+    assert_raise(NameError) { String::STR_CONST3 }
+    assert_raise(NameError) { Integer.const_get(:INT_CONST1) }
+
+    EnvUtil.verbose_warning do
+      @box.require_relative('box/consts')
+    end
+
+    assert_equal 999, String::STR_CONST0
+    assert_raise(NameError) { String::STR_CONST1 }
+    assert_raise(NameError) { String::STR_CONST2 }
+    assert_raise(NameError) { Integer::INT_CONST1 }
+
+    assert_not_nil @box::ForConsts.refer_all
+
+    assert_equal 112, @box::ForConsts.refer1
+    assert_equal 112, @box::ForConsts.get1
+    assert_equal 112, @box::ForConsts::CONST1
+    assert_equal 222, @box::ForConsts.refer2
+    assert_equal 222, @box::ForConsts.get2
+    assert_equal 222, @box::ForConsts::CONST2
+    assert_equal 333, @box::ForConsts.refer3
+    assert_equal 333, @box::ForConsts.get3
+    assert_equal 333, @box::ForConsts::CONST3
+
+    @box::EnvUtil.suppress_warning do
+      @box::ForConsts.const_set(:CONST3, 334)
+    end
+    assert_equal 334, @box::ForConsts::CONST3
+    assert_equal 334, @box::ForConsts.refer3
+    assert_equal 334, @box::ForConsts.get3
+
+    assert_equal 10, @box::ForConsts.refer_top_const
+
+    # use Proxy object to use usual methods instead of singleton methods
+    proxy = @box::ForConsts::Proxy.new
+
+    assert_raise(NameError){ proxy.call_str_refer0 }
+    assert_raise(NameError){ proxy.call_str_get0 }
+
+    proxy.call_str_set0(30)
+    assert_equal 30, proxy.call_str_refer0
+    assert_equal 30, proxy.call_str_get0
+    assert_equal 999, String::STR_CONST0
+
+    proxy.call_str_remove0
+    assert_raise(NameError){ proxy.call_str_refer0 }
+    assert_raise(NameError){ proxy.call_str_get0 }
+
+    assert_equal 112, proxy.call_str_refer1
+    assert_equal 112, proxy.call_str_get1
+    assert_equal 223, proxy.call_str_refer2
+    assert_equal 223, proxy.call_str_get2
+    assert_equal 333, proxy.call_str_refer3
+    assert_equal 333, proxy.call_str_get3
+
+    EnvUtil.suppress_warning do
+      proxy.call_str_set3
+    end
+    assert_equal 334, proxy.call_str_refer3
+    assert_equal 334, proxy.call_str_get3
+
+    assert_equal 1, proxy.refer_int_const1
+
+    assert_equal 999, String::STR_CONST0
+    assert_raise(NameError) { String::STR_CONST1 }
+    assert_raise(NameError) { String::STR_CONST2 }
+    assert_raise(NameError) { String::STR_CONST3 }
+    assert_raise(NameError) { Integer::INT_CONST1 }
+  end
+
+  def test_global_variables
+    default_l = $-0
+    default_f = $,
+
+    setup_box
+
+    assert_equal "\n", $-0 # equal to $/, line splitter
+    assert_equal nil, $,   # field splitter
+
+    @box.require_relative('box/global_vars')
+
+    # read first
+    assert_equal "\n", @box::LineSplitter.read
+    @box::LineSplitter.write("\r\n")
+    assert_equal "\r\n", @box::LineSplitter.read
+    assert_equal "\n", $-0
+
+    # write first
+    @box::FieldSplitter.write(",")
+    assert_equal ",", @box::FieldSplitter.read
+    assert_equal nil, $,
+
+    # used only in box
+    assert !global_variables.include?(:$used_only_in_box)
+    @box::UniqueGvar.write(123)
+    assert_equal 123, @box::UniqueGvar.read
+    assert_nil $used_only_in_box
+
+    # Kernel#global_variables returns the sum of all gvars.
+    global_gvars = global_variables.sort
+    assert_equal global_gvars, @box::UniqueGvar.gvars_in_box.sort
+    @box::UniqueGvar.write_only(456)
+    assert_equal (global_gvars + [:$write_only_var_in_box]).sort, @box::UniqueGvar.gvars_in_box.sort
+    assert_equal (global_gvars + [:$write_only_var_in_box]).sort, global_variables.sort
+  ensure
+    EnvUtil.suppress_warning do
+      $-0 = default_l
+      $, = default_f
+    end
+  end
+
+  def test_load_path_and_loaded_features
+    setup_box
+
+    assert $LOAD_PATH.respond_to?(:resolve_feature_path)
+
+    @box.require_relative('box/load_path')
+
+    assert_not_equal $LOAD_PATH, @box::LoadPathCheck::FIRST_LOAD_PATH
+
+    assert @box::LoadPathCheck::FIRST_LOAD_PATH_RESPOND_TO_RESOLVE
+
+    box_dir = File.join(__dir__, 'box')
+    # TODO: $LOADED_FEATURES in method calls should refer the current box in addition to the loading box.
+    # assert @box::LoadPathCheck.current_loaded_features.include?(File.join(box_dir, 'blank1.rb'))
+    # assert !@box::LoadPathCheck.current_loaded_features.include?(File.join(box_dir, 'blank2.rb'))
+    # assert @box::LoadPathCheck.require_blank2
+    # assert @box::LoadPathCheck.current_loaded_features.include?(File.join(box_dir, 'blank2.rb'))
+
+    assert !$LOADED_FEATURES.include?(File.join(box_dir, 'blank1.rb'))
+    assert !$LOADED_FEATURES.include?(File.join(box_dir, 'blank2.rb'))
+  end
+
+  def test_eval_basic
+    setup_box
+
+    # Test basic evaluation
+    result = @box.eval("1 + 1")
+    assert_equal 2, result
+
+    # Test string evaluation
+    result = @box.eval("'hello ' + 'world'")
+    assert_equal "hello world", result
+  end
+
+  def test_eval_with_constants
+    setup_box
+
+    # Define a constant in the box via eval
+    @box.eval("TEST_CONST = 42")
+    assert_equal 42, @box::TEST_CONST
+
+    # Constant should not be visible in main box
+    assert_raise(NameError) { TEST_CONST }
+  end
+
+  def test_eval_with_classes
+    setup_box
+
+    # Define a class in the box via eval
+    @box.eval("class TestClass; def hello; 'from box'; end; end")
+
+    # Class should be accessible in the box
+    instance = @box::TestClass.new
+    assert_equal "from box", instance.hello
+
+    # Class should not be visible in main box
+    assert_raise(NameError) { TestClass }
+  end
+
+  def test_eval_isolation
+    setup_box
+
+    # Create another box
+    n2 = Ruby::Box.new
+
+    # Define different constants in each box
+    @box.eval("ISOLATION_TEST = 'first'")
+    n2.eval("ISOLATION_TEST = 'second'")
+
+    # Each box should have its own constant
+    assert_equal "first", @box::ISOLATION_TEST
+    assert_equal "second", n2::ISOLATION_TEST
+
+    # Constants should not interfere with each other
+    assert_not_equal @box::ISOLATION_TEST, n2::ISOLATION_TEST
+  end
+
+  def test_eval_with_variables
+    setup_box
+
+    # Test local variable access (should work within the eval context)
+    result = @box.eval("x = 10; y = 20; x + y")
+    assert_equal 30, result
+  end
+
+  def test_eval_error_handling
+    setup_box
+
+    # Test syntax error
+    assert_raise(SyntaxError) { @box.eval("1 +") }
+
+    # Test name error
+    assert_raise(NameError) { @box.eval("undefined_variable") }
+
+    # Test that box is properly restored after error
+    begin
+      @box.eval("raise RuntimeError, 'test error'")
+    rescue RuntimeError
+      # Should be able to continue using the box
+      result = @box.eval("2 + 2")
+      assert_equal 4, result
+    end
+  end
+
+  # Tests which run always (w/o RUBY_BOX=1 globally)
+
+  def test_prelude_gems_and_loaded_features
+    assert_in_out_err([ENV_ENABLE_BOX, "--enable=gems"], "#{<<-"begin;"}\n#{<<-'end;'}") do |output, error|
+      begin;
+        puts ["before:", $LOADED_FEATURES.select{ it.end_with?("/bundled_gems.rb") }&.first].join
+        puts ["before:", $LOADED_FEATURES.select{ it.end_with?("/error_highlight.rb") }&.first].join
+
+        require "error_highlight"
+
+        puts ["after:", $LOADED_FEATURES.select{ it.end_with?("/bundled_gems.rb") }&.first].join
+        puts ["after:", $LOADED_FEATURES.select{ it.end_with?("/error_highlight.rb") }&.first].join
+      end;
+
+      # No additional warnings except for experimental warnings
+      assert_equal 2, error.size
+      assert_match EXPERIMENTAL_WARNING_LINE_PATTERNS[0], error[0]
+      assert_match EXPERIMENTAL_WARNING_LINE_PATTERNS[1], error[1]
+
+      assert_includes output.grep(/^before:/).join("\n"), '/bundled_gems.rb'
+      assert_includes output.grep(/^before:/).join("\n"), '/error_highlight.rb'
+      assert_includes output.grep(/^after:/).join("\n"), '/bundled_gems.rb'
+      assert_includes output.grep(/^after:/).join("\n"), '/error_highlight.rb'
+    end
+  end
+
+  def test_prelude_gems_and_loaded_features_with_disable_gems
+    assert_in_out_err([ENV_ENABLE_BOX, "--disable=gems"], "#{<<-"begin;"}\n#{<<-'end;'}") do |output, error|
+      begin;
+        puts ["before:", $LOADED_FEATURES.select{ it.end_with?("/bundled_gems.rb") }&.first].join
+        puts ["before:", $LOADED_FEATURES.select{ it.end_with?("/error_highlight.rb") }&.first].join
+
+        require "error_highlight"
+
+        puts ["after:", $LOADED_FEATURES.select{ it.end_with?("/bundled_gems.rb") }&.first].join
+        puts ["after:", $LOADED_FEATURES.select{ it.end_with?("/error_highlight.rb") }&.first].join
+      end;
+
+      assert_equal 2, error.size
+      assert_match EXPERIMENTAL_WARNING_LINE_PATTERNS[0], error[0]
+      assert_match EXPERIMENTAL_WARNING_LINE_PATTERNS[1], error[1]
+
+      refute_includes output.grep(/^before:/).join("\n"), '/bundled_gems.rb'
+      refute_includes output.grep(/^before:/).join("\n"), '/error_highlight.rb'
+      refute_includes output.grep(/^after:/).join("\n"), '/bundled_gems.rb'
+      assert_includes output.grep(/^after:/).join("\n"), '/error_highlight.rb'
+    end
+  end
+
+  def test_root_and_main_methods
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      pend unless Ruby::Box.respond_to?(:root) and Ruby::Box.respond_to?(:main) # for RUBY_DEBUG > 0
+
+      assert Ruby::Box.root.respond_to?(:root?)
+      assert Ruby::Box.main.respond_to?(:main?)
+
+      assert Ruby::Box.root.root?
+      assert Ruby::Box.main.main?
+      assert_equal Ruby::Box.main, Ruby::Box.current
+
+      $a = 1
+      $LOADED_FEATURES.push("/tmp/foobar")
+
+      assert_equal 2, Ruby::Box.root.eval('$a = 2; $a')
+      assert !Ruby::Box.root.eval('$LOADED_FEATURES.push("/tmp/barbaz"); $LOADED_FEATURES.include?("/tmp/foobar")')
+      assert "FooClass", Ruby::Box.root.eval('class FooClass; end; Object.const_get(:FooClass).to_s')
+
+      assert_equal 1, $a
+      assert !$LOADED_FEATURES.include?("/tmp/barbaz")
+      assert !Object.const_defined?(:FooClass)
+    end;
+  end
+
+  def test_basic_box_detections
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      box = Ruby::Box.new
+      $gvar1 = 'bar'
+      code = <<~EOC
+      BOX1 = Ruby::Box.current
+      $gvar1 = 'foo'
+
+      def toplevel = $gvar1
+
+      class Foo
+        BOX2 = Ruby::Box.current
+        BOX2_proc = ->(){ BOX2 }
+        BOX3_proc = ->(){ Ruby::Box.current }
+
+        def box4 = Ruby::Box.current
+        def self.box5 = BOX2
+        def self.box6 = Ruby::Box.current
+        def self.box6_proc = ->(){ Ruby::Box.current }
+        def self.box7
+          res = []
+          [1,2].chunk{ it.even? }.each do |bool, members|
+            res << Ruby::Box.current.object_id.to_s + ":" + bool.to_s + ":" + members.map(&:to_s).join(",")
+          end
+          res
+        end
+
+        def self.yield_block = yield
+        def self.call_block(&b) = b.call
+
+        def self.gvar1 = $gvar1
+        def self.call_toplevel = toplevel
+      end
+      FOO_NAME = Foo.name
+
+      module Kernel
+        def foo_box = Ruby::Box.current
+        module_function :foo_box
+      end
+
+      BOX_X = Foo.new.box4
+      BOX_Y = foo_box
+      EOC
+      box.eval(code)
+      outer = Ruby::Box.current
+      assert_equal box, box::BOX1 # on TOP frame
+      assert_equal box, box::Foo::BOX2 # on CLASS frame
+      assert_equal box, box::Foo::BOX2_proc.call # proc -> a const on CLASS
+      assert_equal box, box::Foo::BOX3_proc.call # proc -> the current
+      assert_equal box, box::Foo.new.box4 # instance method  -> the current
+      assert_equal box, box::Foo.box5     # singleton method -> a const on CLASS
+      assert_equal box, box::Foo.box6     # singleton method -> the current
+      assert_equal box, box::Foo.box6_proc.call # method returns a proc -> the current
+
+      # a block after CFUNC/IFUNC in a method -> the current
+      assert_equal ["#{box.object_id}:false:1", "#{box.object_id}:true:2"], box::Foo.box7
+
+      assert_equal outer, box::Foo.yield_block{ Ruby::Box.current } # method yields
+      assert_equal outer, box::Foo.call_block{ Ruby::Box.current }  # method calls a block
+
+      assert_equal 'foo', box::Foo.gvar1 # method refers gvar
+      assert_equal 'bar', $gvar1        # gvar value out of the box
+      assert_equal 'foo', box::Foo.call_toplevel # toplevel method referring gvar
+
+      assert_equal box, box::BOX_X # on TOP frame, referring a class in the current
+      assert_equal box, box::BOX_Y # on TOP frame, referring Kernel method defined by a CFUNC method
+
+      assert_equal "Foo", box::FOO_NAME
+      assert_equal "Foo", box::Foo.name
+    end;
+  end
+
+  def test_loading_extension_libs_in_main_box_1
+    pend if /mswin|mingw/ =~ RUBY_PLATFORM # timeout on windows environments
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      require "prism"
+      require "optparse"
+      require "date"
+      require "time"
+      require "delegate"
+      require "singleton"
+      require "pp"
+      require "fileutils"
+      require "tempfile"
+      require "tmpdir"
+      require "json"
+      require "psych"
+      require "yaml"
+      expected = 1
+      assert_equal expected, 1
+    end;
+  end
+
+  def test_loading_extension_libs_in_main_box_2
+    pend if /mswin|mingw/ =~ RUBY_PLATFORM # timeout on windows environments
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      require "zlib"
+      require "open3"
+      require "ipaddr"
+      require "net/http"
+      require "openssl"
+      require "socket"
+      require "uri"
+      require "digest"
+      require "erb"
+      require "stringio"
+      require "monitor"
+      require "timeout"
+      require "securerandom"
+      expected = 1
+      assert_equal expected, 1
+    end;
+  end
+
+  def test_mark_box_object_referred_only_from_binding
+    assert_separately([ENV_ENABLE_BOX], __FILE__, __LINE__, "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      box = Ruby::Box.new
+      box.eval('class Integer; def +(*)=42; end')
+      b = box.eval('binding')
+      box = nil # remove direct reference to the box
+
+      assert_equal 42, b.eval('1+2')
+
+      GC.stress = true
+      GC.start
+
+      assert_equal 42, b.eval('1+2')
+    end;
+  end
+
+  def test_loaded_extension_deleted_in_user_box
+    require 'tmpdir'
+    Dir.mktmpdir do |tmpdir|
+      env = ENV_ENABLE_BOX.merge({'TMPDIR'=>tmpdir})
+      assert_ruby_status([env], "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        require "json"
+      end;
+      assert_empty(Dir.children(tmpdir))
+    end
+  end
+end
diff --git a/test/mri/ruby/test_call.rb b/test/mri/ruby/test_call.rb
index ffbda1fdb96..1b30ed34d88 100644
--- a/test/mri/ruby/test_call.rb
+++ b/test/mri/ruby/test_call.rb
@@ -374,6 +374,84 @@ def o.foo(a, **h)= h[:splat_modified] = true
     assert_equal({splat_modified: false}, b)
   end
 
+  def test_anon_splat
+    r2kh = Hash.ruby2_keywords_hash(kw: 2)
+    r2kea = [r2kh]
+    r2ka = [1, r2kh]
+
+    def self.s(*) ->(*a){a}.call(*) end
+    assert_equal([], s)
+    assert_equal([1], s(1))
+    assert_equal([{kw: 2}], s(kw: 2))
+    assert_equal([{kw: 2}], s(**{kw: 2}))
+    assert_equal([1, {kw: 2}], s(1, kw: 2))
+    assert_equal([1, {kw: 2}], s(1, **{kw: 2}))
+    assert_equal([{kw: 2}], s(*r2kea))
+    assert_equal([1, {kw: 2}], s(*r2ka))
+
+    singleton_class.remove_method(:s)
+    def self.s(*, kw: 0) [*->(*a){a}.call(*), kw] end
+    assert_equal([0], s)
+    assert_equal([1, 0], s(1))
+    assert_equal([2], s(kw: 2))
+    assert_equal([2], s(**{kw: 2}))
+    assert_equal([1, 2], s(1, kw: 2))
+    assert_equal([1, 2], s(1, **{kw: 2}))
+    assert_equal([2], s(*r2kea))
+    assert_equal([1, 2], s(*r2ka))
+
+    singleton_class.remove_method(:s)
+    def self.s(*, **kw) [*->(*a){a}.call(*), kw] end
+    assert_equal([{}], s)
+    assert_equal([1, {}], s(1))
+    assert_equal([{kw: 2}], s(kw: 2))
+    assert_equal([{kw: 2}], s(**{kw: 2}))
+    assert_equal([1, {kw: 2}], s(1, kw: 2))
+    assert_equal([1, {kw: 2}], s(1, **{kw: 2}))
+    assert_equal([{kw: 2}], s(*r2kea))
+    assert_equal([1, {kw: 2}], s(*r2ka))
+
+    singleton_class.remove_method(:s)
+    def self.s(*, kw: 0, **kws) [*->(*a){a}.call(*), kw, kws] end
+    assert_equal([0, {}], s)
+    assert_equal([1, 0, {}], s(1))
+    assert_equal([2, {}], s(kw: 2))
+    assert_equal([2, {}], s(**{kw: 2}))
+    assert_equal([1, 2, {}], s(1, kw: 2))
+    assert_equal([1, 2, {}], s(1, **{kw: 2}))
+    assert_equal([2, {}], s(*r2kea))
+    assert_equal([1, 2, {}], s(*r2ka))
+  end
+
+  def test_anon_splat_mutated_bug_21757
+    args = [1, 2]
+    kw = {bug: true}
+
+    def self.m(*); end
+    m(*args, bug: true)
+    assert_equal(2, args.length)
+
+    proc = ->(*) { }
+    proc.(*args, bug: true)
+    assert_equal(2, args.length)
+
+    def self.m2(*); end
+    m2(*args, **kw)
+    assert_equal(2, args.length)
+
+    proc = ->(*) { }
+    proc.(*args, **kw)
+    assert_equal(2, args.length)
+
+    def self.m3(*, **nil); end
+    assert_raise(ArgumentError) { m3(*args, bug: true) }
+    assert_equal(2, args.length)
+
+    proc = ->(*, **nil) { }
+    assert_raise(ArgumentError) { proc.(*args, bug: true) }
+    assert_equal(2, args.length)
+  end
+
   def test_kwsplat_block_eval_order
     def self.t(**kw, &b) [kw, b] end
 
diff --git a/test/mri/ruby/test_class.rb b/test/mri/ruby/test_class.rb
index 456362ef217..8f12e06685b 100644
--- a/test/mri/ruby/test_class.rb
+++ b/test/mri/ruby/test_class.rb
@@ -259,6 +259,46 @@ def test_initialize_copy
     assert_raise(TypeError) { BasicObject.dup }
   end
 
+  def test_class_hierarchy_inside_initialize_dup_bug_21538
+    ancestors = sc_ancestors = nil
+    b = Class.new
+    b.define_singleton_method(:initialize_dup) do |x|
+      ancestors = self.ancestors
+      sc_ancestors = singleton_class.ancestors
+      super(x)
+    end
+
+    a = Class.new(b)
+
+    c = a.dup
+
+    expected_ancestors = [c, b, *Object.ancestors]
+    expected_sc_ancestors = [c.singleton_class, b.singleton_class, *Object.singleton_class.ancestors]
+    assert_equal expected_ancestors, ancestors
+    assert_equal expected_sc_ancestors, sc_ancestors
+    assert_equal expected_ancestors, c.ancestors
+    assert_equal expected_sc_ancestors, c.singleton_class.ancestors
+  end
+
+  def test_class_hierarchy_inside_initialize_clone_bug_21538
+    ancestors = sc_ancestors = nil
+    a = Class.new
+    a.define_singleton_method(:initialize_clone) do |x|
+      ancestors = self.ancestors
+      sc_ancestors = singleton_class.ancestors
+      super(x)
+    end
+
+    c = a.clone
+
+    expected_ancestors = [c,  *Object.ancestors]
+    expected_sc_ancestors = [c.singleton_class, *Object.singleton_class.ancestors]
+    assert_equal expected_ancestors, ancestors
+    assert_equal expected_sc_ancestors, sc_ancestors
+    assert_equal expected_ancestors, c.ancestors
+    assert_equal expected_sc_ancestors, c.singleton_class.ancestors
+  end
+
   def test_singleton_class
     assert_raise(TypeError) { 1.extend(Module.new) }
     assert_raise(TypeError) { 1.0.extend(Module.new) }
@@ -283,12 +323,8 @@ def test_uninitialized
     assert_raise(TypeError, bug6863) { Class.new(Class.allocate) }
 
     allocator = Class.instance_method(:allocate)
-    assert_raise_with_message(TypeError, /prohibited/) {
-      allocator.bind(Rational).call
-    }
-    assert_raise_with_message(TypeError, /prohibited/) {
-      allocator.bind_call(Rational)
-    }
+    assert_nothing_raised { allocator.bind(Rational).call }
+    assert_nothing_raised { allocator.bind_call(Rational) }
   end
 
   def test_nonascii_name
@@ -565,7 +601,7 @@ def test_singleton_class_of_frozen_object
     obj = Object.new
     c = obj.singleton_class
     obj.freeze
-    assert_raise_with_message(FrozenError, /frozen object/) {
+    assert_raise_with_message(FrozenError, /frozen Object/) {
       c.class_eval {def f; end}
     }
   end
@@ -700,9 +736,11 @@ def xyzzy
   def test_namescope_error_message
     m = Module.new
     o = m.module_eval "class A\u{3042}; self; end.new"
-    assert_raise_with_message(TypeError, /A\u{3042}/) {
-      o::Foo
-    }
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(TypeError, /A\u{3042}/) {
+        o::Foo
+      }
+    end
   end
 
   def test_redefinition_mismatch
@@ -841,4 +879,70 @@ def test_instance_freeze_dont_freeze_the_class_bug_19164
     klass.define_method(:bar) {}
     assert_equal klass, klass.remove_method(:bar), '[Bug #19164]'
   end
+
+  def test_method_table_assignment_just_after_class_init
+    assert_normal_exit "#{<<~"begin;"}\n#{<<~'end;'}", 'm_tbl assignment should be done only when Class object is not promoted'
+    begin;
+      GC.stress = true
+      class C; end
+    end;
+  end
+
+  def test_singleton_cc_invalidation
+    assert_separately([], "#{<<~"begin;"}\n#{<<~"end;"}")
+    begin;
+      class T
+        def hi
+          "hi"
+        end
+      end
+
+      t = T.new
+      t.singleton_class
+
+      def hello(t)
+        t.hi
+      end
+
+      5.times do
+        hello(t) # populate inline cache on `t.singleton_class`.
+      end
+
+      class T
+        remove_method :hi # invalidate `t.singleton_class` ccs for `hi`
+      end
+
+      assert_raise NoMethodError do
+        hello(t)
+      end
+    end;
+  end
+
+  def test_safe_multi_ractor_subclasses_list_mutation
+    assert_ractor "#{<<~"begin;"}\n#{<<~'end;'}"
+    begin;
+      4.times.map do
+        Ractor.new do
+          20_000.times do
+            Object.new.singleton_class
+          end
+        end
+      end.each(&:join)
+    end;
+  end
+
+  def test_safe_multi_ractor_singleton_class_access
+    assert_ractor "#{<<~"begin;"}\n#{<<~'end;'}"
+    begin;
+      class A; end
+      4.times.map do
+        Ractor.new do
+          a = A
+          100.times do
+            a = a.singleton_class
+          end
+        end
+      end.each(&:join)
+    end;
+  end
 end
diff --git a/test/mri/ruby/test_compile_prism.rb b/test/mri/ruby/test_compile_prism.rb
index a2e8b7bd97d..76b961b37ef 100644
--- a/test/mri/ruby/test_compile_prism.rb
+++ b/test/mri/ruby/test_compile_prism.rb
@@ -213,6 +213,12 @@ def test_DefinedNode
       assert_prism_eval("defined?(a(itself))")
       assert_prism_eval("defined?(itself(itself))")
 
+      # method chain with a block on the inside
+      assert_prism_eval("defined?(itself { 1 }.itself)")
+
+      # method chain with parenthesized receiver
+      assert_prism_eval("defined?((itself).itself)")
+
       # Method chain on a constant
       assert_prism_eval(<<~RUBY)
         class PrismDefinedNode
@@ -1040,13 +1046,19 @@ def o.bar = @ret.length < 3
     end
 
     def test_ForNode
-      assert_prism_eval("for i in [1,2] do; i; end")
-      assert_prism_eval("for @i in [1,2] do; @i; end")
-      assert_prism_eval("for $i in [1,2] do; $i; end")
+      assert_prism_eval("r = []; for i in [1,2] do; r << i; end; r")
+      assert_prism_eval("r = []; for @i in [1,2] do; r << @i; end; r")
+      assert_prism_eval("r = []; for $i in [1,2] do; r << $i; end; r")
+
+      assert_prism_eval("r = []; for foo, in  [1,2,3] do r << foo end; r")
 
-      assert_prism_eval("for foo, in  [1,2,3] do end")
+      assert_prism_eval("r = []; for i, j in {a: 'b'} do; r << [i, j]; end; r")
 
-      assert_prism_eval("for i, j in {a: 'b'} do; i; j; end")
+      # Test splat node as index in for loop
+      assert_prism_eval("r = []; for *x in [[1,2], [3,4]] do; r << x; end; r")
+      assert_prism_eval("r = []; for * in [[1,2], [3,4]] do; r << 'ok'; end; r")
+      assert_prism_eval("r = []; for x, * in [[1,2], [3,4]] do; r << x; end; r")
+      assert_prism_eval("r = []; for x, *y in [[1,2], [3,4]] do; r << [x, y]; end; r")
     end
 
     ############################################################################
@@ -2174,6 +2186,56 @@ def o.foo(...) = 1.times { bar(...) }
       RUBY
     end
 
+    def test_ForwardingArgumentsNode_instruction_sequence_consistency
+      # Test that both parsers generate identical instruction sequences for forwarding arguments
+      # This prevents regressions like the one fixed in prism_compile.c for PM_FORWARDING_ARGUMENTS_NODE
+
+      # Test case from the bug report: def bar(buz, ...) = foo(buz, ...)
+      source = <<~RUBY
+        def foo(*, &block) = block
+        def bar(buz, ...) = foo(buz, ...)
+      RUBY
+
+      compare_instruction_sequences(source)
+
+      # Test simple forwarding
+      source = <<~RUBY
+        def target(...) = nil
+        def forwarder(...) = target(...)
+      RUBY
+
+      compare_instruction_sequences(source)
+
+      # Test mixed forwarding with regular arguments
+      source = <<~RUBY
+        def target(a, b, c) = [a, b, c]
+        def forwarder(x, ...) = target(x, ...)
+      RUBY
+
+      compare_instruction_sequences(source)
+
+      # Test forwarding with splat
+      source = <<~RUBY
+        def target(a, b, c) = [a, b, c]
+        def forwarder(x, ...); target(*x, ...); end
+      RUBY
+
+      compare_instruction_sequences(source)
+    end
+
+    private
+
+    def compare_instruction_sequences(source)
+      # Get instruction sequences from both parsers
+      parsey_iseq = RubyVM::InstructionSequence.compile_parsey(source)
+      prism_iseq = RubyVM::InstructionSequence.compile_prism(source)
+
+      # Compare instruction sequences
+      assert_equal parsey_iseq.disasm, prism_iseq.disasm
+    end
+
+    public
+
     def test_ForwardingSuperNode
       assert_prism_eval("class Forwarding; def to_s; super; end; end")
       assert_prism_eval("class Forwarding; def eval(code); super { code }; end; end")
diff --git a/test/mri/ruby/test_data.rb b/test/mri/ruby/test_data.rb
index bb38f8ec919..dd698fdcc4a 100644
--- a/test/mri/ruby/test_data.rb
+++ b/test/mri/ruby/test_data.rb
@@ -280,4 +280,10 @@ def test_marshal
     assert_not_same(test, loaded)
     assert_predicate(loaded, :frozen?)
   end
+
+  def test_frozen_subclass
+    test = Class.new(Data.define(:a)).freeze.new(a: 0)
+    assert_kind_of(Data, test)
+    assert_equal([:a], test.members)
+  end
 end
diff --git a/test/mri/ruby/test_defined.rb b/test/mri/ruby/test_defined.rb
index 3a8065d9590..db1fdc8e25a 100644
--- a/test/mri/ruby/test_defined.rb
+++ b/test/mri/ruby/test_defined.rb
@@ -243,6 +243,26 @@ def test_defined_empty_paren_arg
     assert_nil(defined?(p () + 1))
   end
 
+  def test_defined_paren_void_stmts
+    assert_equal("expression", defined? (;x))
+    assert_equal("expression", defined? (x;))
+    assert_nil(defined? (
+
+      x
+
+    ))
+
+    x = 1
+
+    assert_equal("expression", defined? (;x))
+    assert_equal("expression", defined? (x;))
+    assert_equal("local-variable", defined? (
+
+      x
+
+    ))
+  end
+
   def test_defined_impl_specific
     feature7035 = '[ruby-core:47558]' # not spec
     assert_predicate(defined?(Foo), :frozen?, feature7035)
diff --git a/test/mri/ruby/test_dir.rb b/test/mri/ruby/test_dir.rb
index 78371a096b4..edb5210af16 100644
--- a/test/mri/ruby/test_dir.rb
+++ b/test/mri/ruby/test_dir.rb
@@ -641,6 +641,21 @@ def test_home_at_startup_windows
         assert_equal("C:/ruby/homepath", Dir.home)
       end;
     end
+
+    def test_children_long_name
+      Dir.mktmpdir do |dirname|
+        longest_possible_component = "b" * 255
+        long_path = File.join(dirname, longest_possible_component)
+        Dir.mkdir(long_path)
+        File.write("#{long_path}/c", "")
+        assert_equal(%w[c], Dir.children(long_path))
+      ensure
+        File.unlink("#{long_path}/c")
+        Dir.rmdir(long_path)
+      end
+    rescue Errno::ENOENT
+      omit "File system does not support long file name"
+    end
   end
 
   def test_home
diff --git a/test/mri/ruby/test_encoding.rb b/test/mri/ruby/test_encoding.rb
index 388b94df39a..5c1eb50bb13 100644
--- a/test/mri/ruby/test_encoding.rb
+++ b/test/mri/ruby/test_encoding.rb
@@ -33,7 +33,7 @@ def test_singleton
     encodings.each do |e|
       assert_raise(TypeError) { e.dup }
       assert_raise(TypeError) { e.clone }
-      assert_equal(e.object_id, Marshal.load(Marshal.dump(e)).object_id)
+      assert_same(e, Marshal.load(Marshal.dump(e)))
     end
   end
 
@@ -130,10 +130,50 @@ def test_nonascii_library_path
   def test_ractor_load_encoding
     assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
-      Ractor.new{}.take
+      Ractor.new{}.join
       $-w = nil
       Encoding.default_external = Encoding::ISO8859_2
       assert "[Bug #19562]"
     end;
   end
+
+  def test_ractor_lazy_load_encoding_concurrently
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      rs = []
+      autoload_encodings = Encoding.list.select { |e| e.inspect.include?("(autoload)") }.freeze
+      7.times do
+        rs << Ractor.new(autoload_encodings) do |encodings|
+          str = "abc".dup
+          encodings.each do |enc|
+            str.force_encoding(enc)
+          end
+        end
+      end
+      while rs.any?
+        r, _obj = Ractor.select(*rs)
+        rs.delete(r)
+      end
+      assert rs.empty?
+    end;
+  end
+
+  def test_ractor_set_default_external_string
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+    $-w = nil
+    rs = []
+    7.times do |i|
+      rs << Ractor.new(i) do |i|
+        Encoding.default_external = "us-ascii"
+      end
+    end
+
+    while rs.any?
+      r, _obj = Ractor.select(*rs)
+      rs.delete(r)
+    end
+    assert rs.empty?
+    end;
+  end
 end
diff --git a/test/mri/ruby/test_enumerator.rb b/test/mri/ruby/test_enumerator.rb
index cd62cd8acb7..9b972d7b22e 100644
--- a/test/mri/ruby/test_enumerator.rb
+++ b/test/mri/ruby/test_enumerator.rb
@@ -886,6 +886,7 @@ def test_chain_undef_methods
 
   def test_produce
     assert_raise(ArgumentError) { Enumerator.produce }
+    assert_raise(ArgumentError) { Enumerator.produce(a: 1, b: 1) {} }
 
     # Without initial object
     passed_args = []
@@ -903,14 +904,6 @@ def test_produce
     assert_equal [1, 2, 3], enum.take(3)
     assert_equal [1, 2], passed_args
 
-    # With initial keyword arguments
-    passed_args = []
-    enum = Enumerator.produce(a: 1, b: 1) { |obj| passed_args << obj; obj.shift if obj.respond_to?(:shift)}
-    assert_instance_of(Enumerator, enum)
-    assert_equal Float::INFINITY, enum.size
-    assert_equal [{b: 1}, [1], :a, nil], enum.take(4)
-    assert_equal [{b: 1}, [1], :a], passed_args
-
     # Raising StopIteration
     words = "The quick brown fox jumps over the lazy dog.".scan(/\w+/)
     enum = Enumerator.produce { words.shift or raise StopIteration }
@@ -935,6 +928,25 @@ def test_produce
         "abc",
       ], enum.to_a
     }
+
+    # With size keyword argument
+    enum = Enumerator.produce(1, size: 10) { |obj| obj.succ }
+    assert_equal 10, enum.size
+    assert_equal [1, 2, 3], enum.take(3)
+
+    enum = Enumerator.produce(1, size: -> { 5 }) { |obj| obj.succ }
+    assert_equal 5, enum.size
+
+    enum = Enumerator.produce(1, size: nil) { |obj| obj.succ }
+    assert_equal nil, enum.size
+
+    enum = Enumerator.produce(1, size: Float::INFINITY) { |obj| obj.succ }
+    assert_equal Float::INFINITY, enum.size
+
+    # Without initial value but with size
+    enum = Enumerator.produce(size: 3) { |obj| (obj || 0).succ }
+    assert_equal 3, enum.size
+    assert_equal [1, 2, 3], enum.take(3)
   end
 
   def test_chain_each_lambda
diff --git a/test/mri/ruby/test_env.rb b/test/mri/ruby/test_env.rb
index a68d9c00a28..2727620c198 100644
--- a/test/mri/ruby/test_env.rb
+++ b/test/mri/ruby/test_env.rb
@@ -363,7 +363,7 @@ def test_inspect_encoding
     ENV.clear
     key = "VAR\u{e5 e1 e2 e4 e3 101 3042}"
     ENV[key] = "foo"
-    assert_equal(%{{"VAR\u{e5 e1 e2 e4 e3 101 3042}" => "foo"}}, ENV.inspect)
+    assert_equal(%{{#{(key.encode(ENCODING) rescue key.b).inspect} => "foo"}}, ENV.inspect)
   end
 
   def test_to_a
@@ -601,13 +601,13 @@ def str_for_yielding_exception_class(code_str, exception_var: "raised_exception"
       rescue Exception => e
         #{exception_var} = e
       end
-      Ractor.yield #{exception_var}.class
+      port.send #{exception_var}.class
     end;
   end
 
   def str_for_assert_raise_on_yielded_exception_class(expected_error_class, ractor_var)
     <<-"end;"
-      error_class = #{ractor_var}.take
+      error_class = #{ractor_var}.receive
       assert_raise(#{expected_error_class}) do
         if error_class < Exception
           raise error_class
@@ -649,100 +649,101 @@ def check(as, bs)
 
   def test_bracket_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        Ractor.yield ENV['test']
-        Ractor.yield ENV['TEST']
+      Ractor.new port = Ractor::Port.new do |port|
+        port << ENV['test']
+        port << ENV['TEST']
         ENV['test'] = 'foo'
-        Ractor.yield ENV['test']
-        Ractor.yield ENV['TEST']
+        port << ENV['test']
+        port << ENV['TEST']
         ENV['TEST'] = 'bar'
-        Ractor.yield ENV['TEST']
-        Ractor.yield ENV['test']
+        port << ENV['TEST']
+        port << ENV['test']
         #{str_for_yielding_exception_class("ENV[1]")}
         #{str_for_yielding_exception_class("ENV[1] = 'foo'")}
         #{str_for_yielding_exception_class("ENV['test'] = 0")}
       end
-      assert_nil(r.take)
-      assert_nil(r.take)
-      assert_equal('foo', r.take)
+      assert_nil(port.receive)
+      assert_nil(port.receive)
+      assert_equal('foo', port.receive)
       if #{ignore_case_str}
-        assert_equal('foo', r.take)
+        assert_equal('foo', port.receive)
       else
-        assert_nil(r.take)
+        assert_nil(port.receive)
       end
-      assert_equal('bar', r.take)
+      assert_equal('bar', port.receive)
       if #{ignore_case_str}
-        assert_equal('bar', r.take)
+        assert_equal('bar', port.receive)
       else
-        assert_equal('foo', r.take)
+        assert_equal('foo', port.receive)
       end
       3.times do
-        #{str_for_assert_raise_on_yielded_exception_class(TypeError, "r")}
+        #{str_for_assert_raise_on_yielded_exception_class(TypeError, "port")}
       end
     end;
   end
 
   def test_dup_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_for_yielding_exception_class("ENV.dup")}
       end
-      #{str_for_assert_raise_on_yielded_exception_class(TypeError, "r")}
+      #{str_for_assert_raise_on_yielded_exception_class(TypeError, "port")}
     end;
   end
 
   def test_has_value_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      port = Ractor::Port.new
+      Ractor.new port do |port|
         val = 'a'
         val.succ! while ENV.has_value?(val) || ENV.has_value?(val.upcase)
         ENV['test'] = val[0...-1]
-        Ractor.yield(ENV.has_value?(val))
-        Ractor.yield(ENV.has_value?(val.upcase))
+        port.send(ENV.has_value?(val))
+        port.send(ENV.has_value?(val.upcase))
         ENV['test'] = val
-        Ractor.yield(ENV.has_value?(val))
-        Ractor.yield(ENV.has_value?(val.upcase))
+        port.send(ENV.has_value?(val))
+        port.send(ENV.has_value?(val.upcase))
         ENV['test'] = val.upcase
-        Ractor.yield ENV.has_value?(val)
-        Ractor.yield ENV.has_value?(val.upcase)
-      end
-      assert_equal(false, r.take)
-      assert_equal(false, r.take)
-      assert_equal(true, r.take)
-      assert_equal(false, r.take)
-      assert_equal(false, r.take)
-      assert_equal(true, r.take)
+        port.send ENV.has_value?(val)
+        port.send ENV.has_value?(val.upcase)
+      end
+      assert_equal(false, port.receive)
+      assert_equal(false, port.receive)
+      assert_equal(true, port.receive)
+      assert_equal(false, port.receive)
+      assert_equal(false, port.receive)
+      assert_equal(true, port.receive)
     end;
   end
 
   def test_key_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         val = 'a'
         val.succ! while ENV.has_value?(val) || ENV.has_value?(val.upcase)
         ENV['test'] = val[0...-1]
-        Ractor.yield ENV.key(val)
-        Ractor.yield ENV.key(val.upcase)
+        port.send ENV.key(val)
+        port.send ENV.key(val.upcase)
         ENV['test'] = val
-        Ractor.yield ENV.key(val)
-        Ractor.yield ENV.key(val.upcase)
+        port.send ENV.key(val)
+        port.send ENV.key(val.upcase)
         ENV['test'] = val.upcase
-        Ractor.yield ENV.key(val)
-        Ractor.yield ENV.key(val.upcase)
+        port.send ENV.key(val)
+        port.send ENV.key(val.upcase)
       end
-      assert_nil(r.take)
-      assert_nil(r.take)
+      assert_nil(port.receive)
+      assert_nil(port.receive)
       if #{ignore_case_str}
-        assert_equal('TEST', r.take.upcase)
+        assert_equal('TEST', port.receive.upcase)
       else
-        assert_equal('test', r.take)
+        assert_equal('test', port.receive)
       end
-      assert_nil(r.take)
-      assert_nil(r.take)
+      assert_nil(port.receive)
+      assert_nil(port.receive)
       if #{ignore_case_str}
-        assert_equal('TEST', r.take.upcase)
+        assert_equal('TEST', port.receive.upcase)
       else
-        assert_equal('test', r.take)
+        assert_equal('test', port.receive)
       end
     end;
 
@@ -750,87 +751,87 @@ def test_key_in_ractor
 
   def test_delete_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_to_yield_invalid_envvar_errors("v", "ENV.delete(v)")}
-        Ractor.yield ENV.delete("TEST")
+        port.send ENV.delete("TEST")
         #{str_for_yielding_exception_class("ENV.delete('#{PATH_ENV}')")}
-        Ractor.yield(ENV.delete("TEST"){|name| "NO "+name})
+        port.send(ENV.delete("TEST"){|name| "NO "+name})
       end
-      #{str_to_receive_invalid_envvar_errors("r")}
-      assert_nil(r.take)
-      exception_class = r.take
+      #{str_to_receive_invalid_envvar_errors("port")}
+      assert_nil(port.receive)
+      exception_class = port.receive
       assert_equal(NilClass, exception_class)
-      assert_equal("NO TEST", r.take)
+      assert_equal("NO TEST", port.receive)
     end;
   end
 
   def test_getenv_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_to_yield_invalid_envvar_errors("v", "ENV[v]")}
         ENV["#{PATH_ENV}"] = ""
-        Ractor.yield ENV["#{PATH_ENV}"]
-        Ractor.yield ENV[""]
+        port.send ENV["#{PATH_ENV}"]
+        port.send ENV[""]
       end
-      #{str_to_receive_invalid_envvar_errors("r")}
-      assert_equal("", r.take)
-      assert_nil(r.take)
+      #{str_to_receive_invalid_envvar_errors("port")}
+      assert_equal("", port.receive)
+      assert_nil(port.receive)
     end;
   end
 
   def test_fetch_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["test"] = "foo"
-        Ractor.yield ENV.fetch("test")
+        port.send ENV.fetch("test")
         ENV.delete("test")
         #{str_for_yielding_exception_class("ENV.fetch('test')", exception_var: "ex")}
-        Ractor.yield ex.receiver.object_id
-        Ractor.yield ex.key
-        Ractor.yield ENV.fetch("test", "foo")
-        Ractor.yield(ENV.fetch("test"){"bar"})
+        port.send ex.receiver.object_id
+        port.send ex.key
+        port.send ENV.fetch("test", "foo")
+        port.send(ENV.fetch("test"){"bar"})
         #{str_to_yield_invalid_envvar_errors("v", "ENV.fetch(v)")}
         #{str_for_yielding_exception_class("ENV.fetch('#{PATH_ENV}', 'foo')")}
         ENV['#{PATH_ENV}'] = ""
-        Ractor.yield ENV.fetch('#{PATH_ENV}')
-      end
-      assert_equal("foo", r.take)
-      #{str_for_assert_raise_on_yielded_exception_class(KeyError, "r")}
-      assert_equal(ENV.object_id, r.take)
-      assert_equal("test", r.take)
-      assert_equal("foo", r.take)
-      assert_equal("bar", r.take)
-      #{str_to_receive_invalid_envvar_errors("r")}
-      exception_class = r.take
+        port.send ENV.fetch('#{PATH_ENV}')
+      end
+      assert_equal("foo", port.receive)
+      #{str_for_assert_raise_on_yielded_exception_class(KeyError, "port")}
+      assert_equal(ENV.object_id, port.receive)
+      assert_equal("test", port.receive)
+      assert_equal("foo", port.receive)
+      assert_equal("bar", port.receive)
+      #{str_to_receive_invalid_envvar_errors("port")}
+      exception_class = port.receive
       assert_equal(NilClass, exception_class)
-      assert_equal("", r.take)
+      assert_equal("", port.receive)
     end;
   end
 
   def test_aset_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_for_yielding_exception_class("ENV['test'] = nil")}
         ENV["test"] = nil
-        Ractor.yield ENV["test"]
+        port.send ENV["test"]
         #{str_to_yield_invalid_envvar_errors("v", "ENV[v] = 'test'")}
         #{str_to_yield_invalid_envvar_errors("v", "ENV['test'] = v")}
       end
-      exception_class = r.take
+      exception_class = port.receive
       assert_equal(NilClass, exception_class)
-      assert_nil(r.take)
-      #{str_to_receive_invalid_envvar_errors("r")}
-      #{str_to_receive_invalid_envvar_errors("r")}
+      assert_nil(port.receive)
+      #{str_to_receive_invalid_envvar_errors("port")}
+      #{str_to_receive_invalid_envvar_errors("port")}
     end;
   end
 
   def test_keys_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         a = ENV.keys
-        Ractor.yield a
+        port.send a
       end
-      a = r.take
+      a = port.receive
       assert_kind_of(Array, a)
       a.each {|k| assert_kind_of(String, k) }
     end;
@@ -839,11 +840,11 @@ def test_keys_in_ractor
 
   def test_each_key_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        ENV.each_key {|k| Ractor.yield(k)}
-        Ractor.yield "finished"
+      Ractor.new port = Ractor::Port.new do |port|
+        ENV.each_key {|k| port.send(k)}
+        port.send "finished"
       end
-      while((x=r.take) != "finished")
+      while((x=port.receive) != "finished")
         assert_kind_of(String, x)
       end
     end;
@@ -851,11 +852,11 @@ def test_each_key_in_ractor
 
   def test_values_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         a = ENV.values
-        Ractor.yield a
+        port.send a
       end
-      a = r.take
+      a = port.receive
       assert_kind_of(Array, a)
       a.each {|k| assert_kind_of(String, k) }
     end;
@@ -863,11 +864,11 @@ def test_values_in_ractor
 
   def test_each_value_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        ENV.each_value {|k| Ractor.yield(k)}
-        Ractor.yield "finished"
+      Ractor.new port = Ractor::Port.new do |port|
+        ENV.each_value {|k| port.send(k)}
+        port.send "finished"
       end
-      while((x=r.take) != "finished")
+      while((x=port.receive) != "finished")
         assert_kind_of(String, x)
       end
     end;
@@ -875,11 +876,11 @@ def test_each_value_in_ractor
 
   def test_each_pair_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        ENV.each_pair {|k, v| Ractor.yield([k,v])}
-        Ractor.yield "finished"
+      Ractor.new port = Ractor::Port.new do |port|
+        ENV.each_pair {|k, v| port.send([k,v])}
+        port.send "finished"
       end
-      while((k,v=r.take) != "finished")
+      while((k,v=port.receive) != "finished")
         assert_kind_of(String, k)
         assert_kind_of(String, v)
       end
@@ -888,116 +889,116 @@ def test_each_pair_in_ractor
 
   def test_reject_bang_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.reject! {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield(ENV.reject! {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" })
+        port.send [h1, h2]
+        port.send(ENV.reject! {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_nil(r.take)
+      assert_nil(port.receive)
     end;
   end
 
   def test_delete_if_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.delete_if {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield (ENV.delete_if {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }).object_id
+        port.send [h1, h2]
+        port.send (ENV.delete_if {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_equal(ENV.object_id, r.take)
+      assert_same(ENV, port.receive)
     end;
   end
 
   def test_select_bang_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.select! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield(ENV.select! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
+        port.send [h1, h2]
+        port.send(ENV.select! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_nil(r.take)
+      assert_nil(port.receive)
     end;
   end
 
   def test_filter_bang_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.filter! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield(ENV.filter! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
+        port.send [h1, h2]
+        port.send(ENV.filter! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_nil(r.take)
+      assert_nil(port.receive)
     end;
   end
 
   def test_keep_if_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.keep_if {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield (ENV.keep_if {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" }).object_id
+        port.send [h1, h2]
+        port.send (ENV.keep_if {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_equal(ENV.object_id, r.take)
+      assert_equal(ENV, port.receive)
     end;
   end
 
   def test_values_at_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["test"] = "foo"
-        Ractor.yield ENV.values_at("test", "test")
+        port.send ENV.values_at("test", "test")
       end
-      assert_equal(["foo", "foo"], r.take)
+      assert_equal(["foo", "foo"], port.receive)
     end;
   end
 
   def test_select_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["test"] = "foo"
         h = ENV.select {|k| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
-        Ractor.yield h.size
+        port.send h.size
         k = h.keys.first
         v = h.values.first
-        Ractor.yield [k, v]
+        port.send [k, v]
       end
-      assert_equal(1, r.take)
-      k, v = r.take
+      assert_equal(1, port.receive)
+      k, v = port.receive
       if #{ignore_case_str}
         assert_equal("TEST", k.upcase)
         assert_equal("FOO", v.upcase)
@@ -1010,16 +1011,16 @@ def test_select_in_ractor
 
   def test_filter_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["test"] = "foo"
         h = ENV.filter {|k| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
-        Ractor.yield(h.size)
+        port.send(h.size)
         k = h.keys.first
         v = h.values.first
-        Ractor.yield [k, v]
+        port.send [k, v]
       end
-      assert_equal(1, r.take)
-      k, v = r.take
+      assert_equal(1, port.receive)
+      k, v = port.receive
       if #{ignore_case_str}
         assert_equal("TEST", k.upcase)
         assert_equal("FOO", v.upcase)
@@ -1032,49 +1033,49 @@ def test_filter_in_ractor
 
   def test_slice_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         ENV["bar"] = "rab"
-        Ractor.yield(ENV.slice())
-        Ractor.yield(ENV.slice(""))
-        Ractor.yield(ENV.slice("unknown"))
-        Ractor.yield(ENV.slice("foo", "baz"))
-      end
-      assert_equal({}, r.take)
-      assert_equal({}, r.take)
-      assert_equal({}, r.take)
-      assert_equal({"foo"=>"bar", "baz"=>"qux"}, r.take)
+        port.send(ENV.slice())
+        port.send(ENV.slice(""))
+        port.send(ENV.slice("unknown"))
+        port.send(ENV.slice("foo", "baz"))
+      end
+      assert_equal({}, port.receive)
+      assert_equal({}, port.receive)
+      assert_equal({}, port.receive)
+      assert_equal({"foo"=>"bar", "baz"=>"qux"}, port.receive)
     end;
   end
 
   def test_except_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         ENV["bar"] = "rab"
-        Ractor.yield ENV.except()
-        Ractor.yield ENV.except("")
-        Ractor.yield ENV.except("unknown")
-        Ractor.yield ENV.except("foo", "baz")
-      end
-      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, r.take)
-      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, r.take)
-      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, r.take)
-      assert_equal({"bar"=>"rab"}, r.take)
+        port.send ENV.except()
+        port.send ENV.except("")
+        port.send ENV.except("unknown")
+        port.send ENV.except("foo", "baz")
+      end
+      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, port.receive)
+      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, port.receive)
+      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, port.receive)
+      assert_equal({"bar"=>"rab"}, port.receive)
     end;
   end
 
   def test_clear_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
-        Ractor.yield ENV.size
+        port.send ENV.size
       end
-      assert_equal(0, r.take)
+      assert_equal(0, port.receive)
     end;
   end
 
@@ -1083,20 +1084,20 @@ def test_to_s_in_ractor
       r = Ractor.new do
         ENV.to_s
       end
-      assert_equal("ENV", r.take)
+      assert_equal("ENV", r.value)
     end;
   end
 
   def test_inspect_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         s = ENV.inspect
-        Ractor.yield s
+        port.send s
       end
-      s = r.take
+      s = port.receive
       expected = ['"foo" => "bar"', '"baz" => "qux"']
       unless s.start_with?(/\{"foo"/i)
         expected.reverse!
@@ -1112,14 +1113,14 @@ def test_inspect_in_ractor
 
   def test_to_a_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         a = ENV.to_a
-        Ractor.yield a
+        port.send a
       end
-      a = r.take
+      a = port.receive
       assert_equal(2, a.size)
       expected = [%w(baz qux), %w(foo bar)]
       if #{ignore_case_str}
@@ -1136,59 +1137,59 @@ def test_rehash_in_ractor
       r = Ractor.new do
         ENV.rehash
       end
-      assert_nil(r.take)
+      assert_nil(r.value)
     end;
   end
 
   def test_size_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         s = ENV.size
         ENV["test"] = "foo"
-        Ractor.yield [s, ENV.size]
+        port.send [s, ENV.size]
       end
-      s, s2 = r.take
+      s, s2 = port.receive
       assert_equal(s + 1, s2)
     end;
   end
 
   def test_empty_p_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
-        Ractor.yield ENV.empty?
+        port.send ENV.empty?
         ENV["test"] = "foo"
-        Ractor.yield ENV.empty?
+        port.send ENV.empty?
       end
-      assert r.take
-      assert !r.take
+      assert port.receive
+      assert !port.receive
     end;
   end
 
   def test_has_key_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        Ractor.yield ENV.has_key?("test")
+      Ractor.new port = Ractor::Port.new do |port|
+        port.send ENV.has_key?("test")
         ENV["test"] = "foo"
-        Ractor.yield ENV.has_key?("test")
+        port.send ENV.has_key?("test")
         #{str_to_yield_invalid_envvar_errors("v", "ENV.has_key?(v)")}
       end
-      assert !r.take
-      assert r.take
-      #{str_to_receive_invalid_envvar_errors("r")}
+      assert !port.receive
+      assert port.receive
+      #{str_to_receive_invalid_envvar_errors("port")}
     end;
   end
 
   def test_assoc_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        Ractor.yield ENV.assoc("test")
+      Ractor.new port = Ractor::Port.new do |port|
+        port.send ENV.assoc("test")
         ENV["test"] = "foo"
-        Ractor.yield ENV.assoc("test")
+        port.send ENV.assoc("test")
         #{str_to_yield_invalid_envvar_errors("v", "ENV.assoc(v)")}
       end
-      assert_nil(r.take)
-      k, v = r.take
+      assert_nil(port.receive)
+      k, v = port.receive
       if #{ignore_case_str}
         assert_equal("TEST", k.upcase)
         assert_equal("FOO", v.upcase)
@@ -1196,7 +1197,7 @@ def test_assoc_in_ractor
         assert_equal("test", k)
         assert_equal("foo", v)
       end
-      #{str_to_receive_invalid_envvar_errors("r")}
+      #{str_to_receive_invalid_envvar_errors("port")}
       encoding = /mswin|mingw/ =~ RUBY_PLATFORM ? Encoding::UTF_8 : Encoding.find("locale")
       assert_equal(encoding, v.encoding)
     end;
@@ -1204,29 +1205,29 @@ def test_assoc_in_ractor
 
   def test_has_value2_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
-        Ractor.yield ENV.has_value?("foo")
+        port.send ENV.has_value?("foo")
         ENV["test"] = "foo"
-        Ractor.yield ENV.has_value?("foo")
+        port.send ENV.has_value?("foo")
       end
-      assert !r.take
-      assert r.take
+      assert !port.receive
+      assert port.receive
     end;
   end
 
   def test_rassoc_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
-        Ractor.yield ENV.rassoc("foo")
+        port.send ENV.rassoc("foo")
         ENV["foo"] = "bar"
         ENV["test"] = "foo"
         ENV["baz"] = "qux"
-        Ractor.yield ENV.rassoc("foo")
+        port.send ENV.rassoc("foo")
       end
-      assert_nil(r.take)
-      k, v = r.take
+      assert_nil(port.receive)
+      k, v = port.receive
       if #{ignore_case_str}
         assert_equal("TEST", k.upcase)
         assert_equal("FOO", v.upcase)
@@ -1239,39 +1240,39 @@ def test_rassoc_in_ractor
 
   def test_to_hash_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h = {}
         ENV.each {|k, v| h[k] = v }
-        Ractor.yield [h, ENV.to_hash]
+        port.send [h, ENV.to_hash]
       end
-      h, h2 = r.take
+      h, h2 = port.receive
       assert_equal(h, h2)
     end;
   end
 
   def test_to_h_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        Ractor.yield [ENV.to_hash, ENV.to_h]
-        Ractor.yield [ENV.map {|k, v| ["$\#{k}", v.size]}.to_h, ENV.to_h {|k, v| ["$\#{k}", v.size]}]
+      Ractor.new port = Ractor::Port.new do |port|
+        port.send [ENV.to_hash, ENV.to_h]
+        port.send [ENV.map {|k, v| ["$\#{k}", v.size]}.to_h, ENV.to_h {|k, v| ["$\#{k}", v.size]}]
       end
-      a, b = r.take
+      a, b = port.receive
       assert_equal(a,b)
-      c, d = r.take
+      c, d = port.receive
       assert_equal(c,d)
     end;
   end
 
   def test_reject_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         h2 = ENV.reject {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
-        Ractor.yield [h1, h2]
+        port.send [h1, h2]
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
     end;
   end
@@ -1279,86 +1280,86 @@ def test_reject_in_ractor
   def test_shift_in_ractor
     assert_ractor(<<-"end;")
       #{STR_DEFINITION_FOR_CHECK}
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         a = ENV.shift
         b = ENV.shift
-        Ractor.yield [a,b]
-        Ractor.yield ENV.shift
+        port.send [a,b]
+        port.send ENV.shift
       end
-      a,b = r.take
+      a,b = port.receive
       check([a, b], [%w(foo bar), %w(baz qux)])
-      assert_nil(r.take)
+      assert_nil(port.receive)
     end;
   end
 
   def test_invert_in_ractor
     assert_ractor(<<-"end;")
       #{STR_DEFINITION_FOR_CHECK}
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
-        Ractor.yield(ENV.invert)
+        port.send(ENV.invert)
       end
-      check(r.take.to_a, [%w(bar foo), %w(qux baz)])
+      check(port.receive.to_a, [%w(bar foo), %w(qux baz)])
     end;
   end
 
   def test_replace_in_ractor
     assert_ractor(<<-"end;")
       #{STR_DEFINITION_FOR_CHECK}
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["foo"] = "xxx"
         ENV.replace({"foo"=>"bar", "baz"=>"qux"})
-        Ractor.yield ENV.to_hash
+        port.send ENV.to_hash
         ENV.replace({"Foo"=>"Bar", "Baz"=>"Qux"})
-        Ractor.yield ENV.to_hash
+        port.send ENV.to_hash
       end
-      check(r.take.to_a, [%w(foo bar), %w(baz qux)])
-      check(r.take.to_a, [%w(Foo Bar), %w(Baz Qux)])
+      check(port.receive.to_a, [%w(foo bar), %w(baz qux)])
+      check(port.receive.to_a, [%w(Foo Bar), %w(Baz Qux)])
     end;
   end
 
   def test_update_in_ractor
     assert_ractor(<<-"end;")
       #{STR_DEFINITION_FOR_CHECK}
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         ENV.update({"baz"=>"quux","a"=>"b"})
-        Ractor.yield ENV.to_hash
+        port.send ENV.to_hash
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         ENV.update({"baz"=>"quux","a"=>"b"}) {|k, v1, v2| k + "_" + v1 + "_" + v2 }
-        Ractor.yield ENV.to_hash
+        port.send ENV.to_hash
       end
-      check(r.take.to_a, [%w(foo bar), %w(baz quux), %w(a b)])
-      check(r.take.to_a, [%w(foo bar), %w(baz baz_qux_quux), %w(a b)])
+      check(port.receive.to_a, [%w(foo bar), %w(baz quux), %w(a b)])
+      check(port.receive.to_a, [%w(foo bar), %w(baz baz_qux_quux), %w(a b)])
     end;
   end
 
   def test_huge_value_in_ractor
     assert_ractor(<<-"end;")
       huge_value = "bar" * 40960
-      r = Ractor.new huge_value do |v|
+      Ractor.new port = Ractor::Port.new, huge_value do |port, v|
         ENV["foo"] = "bar"
         #{str_for_yielding_exception_class("ENV['foo'] = v ")}
-        Ractor.yield ENV["foo"]
+        port.send ENV["foo"]
       end
 
       if /mswin|ucrt/ =~ RUBY_PLATFORM
-        #{str_for_assert_raise_on_yielded_exception_class(Errno::EINVAL, "r")}
-        result = r.take
+        #{str_for_assert_raise_on_yielded_exception_class(Errno::EINVAL, "port")}
+        result = port.receive
         assert_equal("bar", result)
       else
-        exception_class = r.take
+        exception_class = port.receive
         assert_equal(NilClass, exception_class)
-        result = r.take
+        result = port.receive
         assert_equal(huge_value, result)
       end
     end;
@@ -1366,34 +1367,34 @@ def test_huge_value_in_ractor
 
   def test_frozen_env_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_for_yielding_exception_class("ENV.freeze")}
       end
-      #{str_for_assert_raise_on_yielded_exception_class(TypeError, "r")}
+      #{str_for_assert_raise_on_yielded_exception_class(TypeError, "port")}
     end;
   end
 
   def test_frozen_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["#{PATH_ENV}"] = "/"
         ENV.each do |k, v|
-          Ractor.yield [k.frozen?]
-          Ractor.yield [v.frozen?]
+          port.send [k.frozen?]
+          port.send [v.frozen?]
         end
         ENV.each_key do |k|
-          Ractor.yield [k.frozen?]
+          port.send [k.frozen?]
         end
         ENV.each_value do |v|
-          Ractor.yield [v.frozen?]
+          port.send [v.frozen?]
         end
         ENV.each_key do |k|
-          Ractor.yield [ENV[k].frozen?, "[\#{k.dump}]"]
-          Ractor.yield [ENV.fetch(k).frozen?, "fetch(\#{k.dump})"]
+          port.send [ENV[k].frozen?, "[\#{k.dump}]"]
+          port.send [ENV.fetch(k).frozen?, "fetch(\#{k.dump})"]
         end
-        Ractor.yield "finished"
+        port.send "finished"
       end
-      while((params=r.take) != "finished")
+      while((params=port.receive) != "finished")
         assert(*params)
       end
     end;
@@ -1401,7 +1402,7 @@ def test_frozen_in_ractor
 
   def test_shared_substring_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         bug12475 = '[ruby-dev:49655] [Bug #12475]'
         n = [*"0".."9"].join("")*3
         e0 = ENV[n0 = "E\#{n}"]
@@ -1411,9 +1412,9 @@ def test_shared_substring_in_ractor
         ENV[n1.chop] = "T\#{n}.".chop
         ENV[n0], e0 = e0, ENV[n0]
         ENV[n1], e1 = e1, ENV[n1]
-        Ractor.yield [n, e0, e1, bug12475]
+        port.send [n, e0, e1, bug12475]
       end
-      n, e0, e1, bug12475 = r.take
+      n, e0, e1, bug12475 = port.receive
       assert_equal("T\#{n}", e0, bug12475)
       assert_nil(e1, bug12475)
     end;
@@ -1429,7 +1430,7 @@ def test_ivar_in_env_should_not_be_access_from_non_main_ractors
     rescue Ractor::IsolationError => e
       e
     end
-    assert_equal Ractor::IsolationError, r_get.take.class
+    assert_equal Ractor::IsolationError, r_get.value.class
 
     r_get =  Ractor.new do
       ENV.instance_eval{ @a }
@@ -1437,7 +1438,7 @@ def test_ivar_in_env_should_not_be_access_from_non_main_ractors
       e
     end
 
-    assert_equal Ractor::IsolationError, r_get.take.class
+    assert_equal Ractor::IsolationError, r_get.value.class
 
     r_set = Ractor.new do
       ENV.instance_eval{ @b = "hello" }
@@ -1445,7 +1446,7 @@ def test_ivar_in_env_should_not_be_access_from_non_main_ractors
       e
     end
 
-    assert_equal Ractor::IsolationError, r_set.take.class
+    assert_equal Ractor::IsolationError, r_set.value.class
     RUBY
   end
 
@@ -1492,11 +1493,8 @@ def test_memory_leak_shift
 
     def test_utf8
       text = "testing \u{e5 e1 e2 e4 e3 101 3042}"
-      test = ENV["test"]
       ENV["test"] = text
       assert_equal text, ENV["test"]
-    ensure
-      ENV["test"] = test
     end
 
     def test_utf8_empty
diff --git a/test/mri/ruby/test_exception.rb b/test/mri/ruby/test_exception.rb
index 84581180b60..1605825cbdb 100644
--- a/test/mri/ruby/test_exception.rb
+++ b/test/mri/ruby/test_exception.rb
@@ -1525,4 +1525,31 @@ def detailed_message(**)
       assert_in_out_err(%W[-r#{lib} #{main}], "", [], [:*, "\n""path=#{main}\n", :*])
     end
   end
+
+  class Ex; end
+
+  def test_exception_message_for_unexpected_implicit_conversion_type
+    a = Ex.new
+    def self.x(a) = nil
+
+    assert_raise_with_message(TypeError, "no implicit conversion of TestException::Ex into Hash") do
+      x(**a)
+    end
+    assert_raise_with_message(TypeError, "no implicit conversion of TestException::Ex into Proc") do
+      x(&a)
+    end
+
+    def a.to_a = 1
+    def a.to_hash = 1
+    def a.to_proc = 1
+    assert_raise_with_message(TypeError, "can't convert TestException::Ex into Array (TestException::Ex#to_a gives Integer)") do
+      x(*a)
+    end
+    assert_raise_with_message(TypeError, "can't convert TestException::Ex into Hash (TestException::Ex#to_hash gives Integer)") do
+      x(**a)
+    end
+    assert_raise_with_message(TypeError, "can't convert TestException::Ex into Proc (TestException::Ex#to_proc gives Integer)") do
+      x(&a)
+    end
+  end
 end
diff --git a/test/mri/ruby/test_fiber.rb b/test/mri/ruby/test_fiber.rb
index 19cd52f7c8f..b7d2b71c196 100644
--- a/test/mri/ruby/test_fiber.rb
+++ b/test/mri/ruby/test_fiber.rb
@@ -34,7 +34,6 @@ def test_term
   end
 
   def test_many_fibers
-    omit 'This is unstable on GitHub Actions --jit-wait. TODO: debug it' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     max = 1000
     assert_equal(max, max.times{
       Fiber.new{}
@@ -50,7 +49,7 @@ def test_many_fibers
   end
 
   def test_many_fibers_with_threads
-    assert_normal_exit <<-SRC, timeout: (/solaris/i =~ RUBY_PLATFORM ? 1000 : 60)
+    assert_normal_exit <<-SRC, timeout: 60
       max = 1000
       @cnt = 0
       (1..100).map{|ti|
@@ -499,7 +498,7 @@ def test_create_fiber_in_new_thread
   end
 
   def test_machine_stack_gc
-    assert_normal_exit <<-RUBY, '[Bug #14561]', timeout: 10
+    assert_normal_exit <<-RUBY, '[Bug #14561]', timeout: 60
       enum = Enumerator.new { |y| y << 1 }
       thread = Thread.new { enum.peek }
       thread.join
diff --git a/test/mri/ruby/test_file.rb b/test/mri/ruby/test_file.rb
index eae9a8e7b03..a3d6221c0f9 100644
--- a/test/mri/ruby/test_file.rb
+++ b/test/mri/ruby/test_file.rb
@@ -372,9 +372,9 @@ def measure_time
   end
 
   def test_stat
-    tb = Process.clock_gettime(Process::CLOCK_REALTIME)
+    btime = Process.clock_gettime(Process::CLOCK_REALTIME)
     Tempfile.create("stat") {|file|
-      tb = (tb + Process.clock_gettime(Process::CLOCK_REALTIME)) / 2
+      btime = (btime + Process.clock_gettime(Process::CLOCK_REALTIME)) / 2
       file.close
       path = file.path
 
@@ -384,33 +384,32 @@ def test_stat
 
       sleep 2
 
-      t1 = measure_time do
+      mtime = measure_time do
         File.write(path, "bar")
       end
 
       sleep 2
 
-      t2 = measure_time do
-        File.read(path)
+      ctime = measure_time do
         File.chmod(0644, path)
       end
 
       sleep 2
 
-      t3 = measure_time do
+      atime = measure_time do
         File.read(path)
       end
 
       delta = 1
       stat = File.stat(path)
-      assert_in_delta tb, stat.birthtime.to_f, delta
-      assert_in_delta t1, stat.mtime.to_f, delta
+      assert_in_delta btime, stat.birthtime.to_f, delta
+      assert_in_delta mtime, stat.mtime.to_f, delta
       if stat.birthtime != stat.ctime
-        assert_in_delta t2, stat.ctime.to_f, delta
+        assert_in_delta ctime, stat.ctime.to_f, delta
       end
       if /mswin|mingw/ !~ RUBY_PLATFORM && !Bug::File::Fs.noatime?(path)
         # Windows delays updating atime
-        assert_in_delta t3, stat.atime.to_f, delta
+        assert_in_delta atime, stat.atime.to_f, delta
       end
     }
   rescue NotImplementedError
diff --git a/test/mri/ruby/test_file_exhaustive.rb b/test/mri/ruby/test_file_exhaustive.rb
index f3068cb1891..394dc47603f 100644
--- a/test/mri/ruby/test_file_exhaustive.rb
+++ b/test/mri/ruby/test_file_exhaustive.rb
@@ -6,7 +6,8 @@
 require '-test-/file'
 
 class TestFileExhaustive < Test::Unit::TestCase
-  DRIVE = Dir.pwd[%r'\A(?:[a-z]:|//[^/]+/[^/]+)'i]
+  ROOT_REGEXP = %r'\A(?:[a-z]:(?=(/))|//[^/]+/[^/]+)'i
+  DRIVE = Dir.pwd[ROOT_REGEXP]
   POSIX = /cygwin|mswin|bccwin|mingw|emx/ !~ RUBY_PLATFORM
   NTFS = !(/mingw|mswin|bccwin/ !~ RUBY_PLATFORM)
 
@@ -196,12 +197,32 @@ def test_path
     [regular_file, utf8_file].each do |file|
       assert_equal(file, File.open(file) {|f| f.path})
       assert_equal(file, File.path(file))
-      o = Object.new
-      class << o; self; end.class_eval do
-        define_method(:to_path) { file }
-      end
+      o = Struct.new(:to_path).new(file)
+      assert_equal(file, File.path(o))
+      o = Struct.new(:to_str).new(file)
       assert_equal(file, File.path(o))
     end
+
+    conv_error = ->(method, msg = "converting with #{method}") {
+      test = ->(&new) do
+        o = new.(42)
+        assert_raise(TypeError, msg) {File.path(o)}
+
+        o = new.("abc".encode(Encoding::UTF_32BE))
+        assert_raise(Encoding::CompatibilityError, msg) {File.path(o)}
+
+        ["\0", "a\0", "a\0c"].each do |path|
+          o = new.(path)
+          assert_raise(ArgumentError, msg) {File.path(o)}
+        end
+      end
+
+      test.call(&:itself)
+      test.call(&Struct.new(method).method(:new))
+    }
+
+    conv_error[:to_path]
+    conv_error[:to_str]
   end
 
   def assert_integer(n)
@@ -1278,9 +1299,10 @@ def test_dirname
     assert_equal(regular_file, File.dirname(regular_file, 0))
     assert_equal(@dir, File.dirname(regular_file, 1))
     assert_equal(File.dirname(@dir), File.dirname(regular_file, 2))
-    return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # rootdir and tmpdir are in different drives
-    assert_equal(rootdir, File.dirname(regular_file, regular_file.count('/')))
     assert_raise(ArgumentError) {File.dirname(regular_file, -1)}
+    root = "#{@dir[ROOT_REGEXP]||?/}#{$1}"
+    assert_equal(root, File.dirname(regular_file, regular_file.count('/')))
+    assert_equal(root, File.dirname(regular_file, regular_file.count('/') + 100))
   end
 
   def test_dirname_encoding
@@ -1475,6 +1497,7 @@ def test_flock_shared
   end
 
   def test_test
+    omit 'timestamp check is unstable on macOS' if RUBY_PLATFORM =~ /darwin/
     fn1 = regular_file
     hardlinkfile
     sleep(1.1)
diff --git a/test/mri/ruby/test_float.rb b/test/mri/ruby/test_float.rb
index f2c56d1b41f..d0d180593ab 100644
--- a/test/mri/ruby/test_float.rb
+++ b/test/mri/ruby/test_float.rb
@@ -838,6 +838,10 @@ def test_Float
     assert_equal(15, Float('0xf.p0'))
     assert_equal(15.9375, Float('0xf.f'))
     assert_raise(ArgumentError) { Float('0xf.fp') }
+    assert_equal(0x10a, Float("0x1_0a"))
+    assert_equal(1.625, Float("0x1.a_0"))
+    assert_equal(3.25, Float("0x1.ap0_1"))
+    assert_raise(ArgumentError) { Float("0x1.ap0a") }
     begin
       verbose_bak, $VERBOSE = $VERBOSE, nil
       assert_equal(Float::INFINITY, Float('0xf.fp1000000000000000'))
@@ -857,7 +861,9 @@ def o.to_f; inf = Float::INFINITY; inf/inf; end
     assert_raise(Encoding::CompatibilityError) {Float("0".encode("utf-32le"))}
     assert_raise(Encoding::CompatibilityError) {Float("0".encode("iso-2022-jp"))}
 
-    assert_raise_with_message(ArgumentError, /\u{1f4a1}/) {Float("\u{1f4a1}")}
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(ArgumentError, /\u{1f4a1}/) {Float("\u{1f4a1}")}
+    end
   end
 
   def test_invalid_str
diff --git a/test/mri/ruby/test_frozen.rb b/test/mri/ruby/test_frozen.rb
index 2918a2afd82..6721cb11286 100644
--- a/test/mri/ruby/test_frozen.rb
+++ b/test/mri/ruby/test_frozen.rb
@@ -27,4 +27,20 @@ def test_setting_ivar_on_frozen_string_with_ivars
     str.freeze
     assert_raise(FrozenError) { str.instance_variable_set(:@b, 1) }
   end
+
+  def test_setting_ivar_on_frozen_string_with_singleton_class
+    str = "str"
+    str.singleton_class
+    str.freeze
+    assert_raise_with_message(FrozenError, "can't modify frozen String: \"str\"") { str.instance_variable_set(:@a, 1) }
+  end
+
+  class A
+    freeze
+  end
+
+  def test_setting_ivar_on_frozen_class
+    assert_raise_with_message(FrozenError, "can't modify frozen Class: TestFrozen::A") { A.instance_variable_set(:@a, 1) }
+    assert_raise_with_message(FrozenError, "can't modify frozen Class: #<Class:TestFrozen::A>") { A.singleton_class.instance_variable_set(:@a, 1) }
+  end
 end
diff --git a/test/mri/ruby/test_gc.rb b/test/mri/ruby/test_gc.rb
index 72fab5c43cb..6639013a54c 100644
--- a/test/mri/ruby/test_gc.rb
+++ b/test/mri/ruby/test_gc.rb
@@ -75,12 +75,9 @@ def test_gc_config_setting_returns_updated_config_hash
     GC.start
   end
 
-  def test_gc_config_setting_returns_nil_for_missing_keys
-    missing_value = GC.config(no_such_key: true)[:no_such_key]
-    assert_nil(missing_value)
-  ensure
-    GC.config(full_mark: true)
-    GC.start
+  def test_gc_config_setting_returns_config_hash
+    hash = GC.config(no_such_key: true)
+    assert_equal(GC.config, hash)
   end
 
   def test_gc_config_disable_major
@@ -211,7 +208,7 @@ def test_stat_constraints
     assert_equal stat[:total_allocated_pages], stat[:heap_allocated_pages] + stat[:total_freed_pages]
     assert_equal stat[:heap_available_slots], stat[:heap_live_slots] + stat[:heap_free_slots] + stat[:heap_final_slots]
     assert_equal stat[:heap_live_slots], stat[:total_allocated_objects] - stat[:total_freed_objects] - stat[:heap_final_slots]
-    assert_equal stat[:heap_allocated_pages], stat[:heap_eden_pages]
+    assert_equal stat[:heap_allocated_pages], stat[:heap_eden_pages] + stat[:heap_empty_pages]
 
     if use_rgengc?
       assert_equal stat[:count], stat[:major_gc_count] + stat[:minor_gc_count]
@@ -234,6 +231,9 @@ def test_stat_heap
       end
 
       assert_equal (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] + GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD]) * (2**i), stat_heap[:slot_size]
+      assert_operator stat_heap[:heap_live_slots], :<=, stat[:heap_live_slots]
+      assert_operator stat_heap[:heap_free_slots], :<=, stat[:heap_free_slots]
+      assert_operator stat_heap[:heap_final_slots], :<=, stat[:heap_final_slots]
       assert_operator stat_heap[:heap_eden_pages], :<=, stat[:heap_eden_pages]
       assert_operator stat_heap[:heap_eden_slots], :>=, 0
       assert_operator stat_heap[:total_allocated_pages], :>=, 0
@@ -253,7 +253,6 @@ def test_stat_heap
   end
 
   def test_stat_heap_all
-    omit "flaky with RJIT, which allocates objects itself" if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     stat_heap_all = {}
     stat_heap = {}
     # Initialize to prevent GC in future calls
@@ -265,7 +264,7 @@ def test_stat_heap_all
       GC.stat_heap(i, stat_heap)
 
       # Remove keys that can vary between invocations
-      %i(total_allocated_objects).each do |sym|
+      %i(total_allocated_objects heap_live_slots heap_free_slots).each do |sym|
         stat_heap[sym] = stat_heap_all[i][sym] = 0
       end
 
@@ -290,6 +289,9 @@ def test_stat_heap_constraints
       hash.each { |k, v| stat_heap_sum[k] += v }
     end
 
+    assert_equal stat[:heap_live_slots], stat_heap_sum[:heap_live_slots]
+    assert_equal stat[:heap_free_slots], stat_heap_sum[:heap_free_slots]
+    assert_equal stat[:heap_final_slots], stat_heap_sum[:heap_final_slots]
     assert_equal stat[:heap_eden_pages], stat_heap_sum[:heap_eden_pages]
     assert_equal stat[:heap_available_slots], stat_heap_sum[:heap_eden_slots]
     assert_equal stat[:total_allocated_objects], stat_heap_sum[:total_allocated_objects]
@@ -297,7 +299,7 @@ def test_stat_heap_constraints
   end
 
   def test_measure_total_time
-    assert_separately([], __FILE__, __LINE__, <<~RUBY)
+    assert_separately([], __FILE__, __LINE__, <<~RUBY, timeout: 60)
       GC.measure_total_time = false
 
       time_before = GC.stat(:time)
@@ -357,13 +359,14 @@ def test_latest_gc_info_need_major_by
     3.times { GC.start }
     assert_nil GC.latest_gc_info(:need_major_by)
 
-    # allocate objects until need_major_by is set or major GC happens
-    objects = []
-    while GC.latest_gc_info(:need_major_by).nil?
-      objects.append(100.times.map { '*' })
-    end
-
     EnvUtil.without_gc do
+      # allocate objects until need_major_by is set or major GC happens
+      objects = []
+      while GC.latest_gc_info(:need_major_by).nil?
+        objects.append(100.times.map { '*' })
+        GC.start(full_mark: false)
+      end
+
       # We need to ensure that no GC gets ran before the call to GC.start since
       # it would trigger a major GC. Assertions could allocate objects and
       # trigger a GC so we don't run assertions until we perform the major GC.
@@ -393,12 +396,10 @@ def test_latest_gc_info_weak_references_count
 
       # Create some objects and place it in a WeakMap
       wmap = ObjectSpace::WeakMap.new
-      ary = Array.new(count)
-      enum = count.times
-      enum.each.with_index do |i|
+      ary = Array.new(count) do |i|
         obj = Object.new
-        ary[i] = obj
         wmap[obj] = nil
+        obj
       end
 
       # Run full GC to collect stats about weak references
@@ -411,6 +412,8 @@ def test_latest_gc_info_weak_references_count
       before_weak_references_count = GC.latest_gc_info(:weak_references_count)
       before_retained_weak_references_count = GC.latest_gc_info(:retained_weak_references_count)
 
+      # Clear ary, so if ary itself is somewhere on the stack, it won't hold all references
+      ary.clear
       ary = nil
 
       # Free ary, which should empty out the wmap
@@ -418,8 +421,8 @@ def test_latest_gc_info_weak_references_count
       # Run full GC again to collect stats about weak references
       GC.start
 
-      # Sometimes the WeakMap has one element, which might be held on by registers.
-      assert_operator(wmap.size, :<=, 1)
+      # Sometimes the WeakMap has a few elements, which might be held on by registers.
+      assert_operator(wmap.size, :<=, count / 1000)
 
       assert_operator(GC.latest_gc_info(:weak_references_count), :<=, before_weak_references_count - count + error_tolerance)
       assert_operator(GC.latest_gc_info(:retained_weak_references_count), :<=, before_retained_weak_references_count - count + error_tolerance)
@@ -450,7 +453,7 @@ def obj.bar() raise "obj.foo is called, but this is obj.bar" end
   end
 
   def test_singleton_method_added
-    assert_in_out_err([], <<-EOS, [], [], "[ruby-dev:44436]")
+    assert_in_out_err([], <<-EOS, [], [], "[ruby-dev:44436]", timeout: 30)
       class BasicObject
         undef singleton_method_added
         def singleton_method_added(mid)
@@ -533,6 +536,8 @@ def test_gc_parameter
   end
 
   def test_gc_parameter_init_slots
+    omit "[Bug #21203] This test is flaky and intermittently failing now"
+
     assert_separately([], __FILE__, __LINE__, <<~RUBY, timeout: 60)
       # Constant from gc.c.
       GC_HEAP_INIT_SLOTS = 10_000
@@ -677,13 +682,39 @@ def test_thrashing_for_young_objects
 
       # Should not be thrashing in page creation
       assert_equal before_stats[:heap_allocated_pages], after_stats[:heap_allocated_pages], debug_msg
-      assert_equal 0, after_stats[:heap_empty_pages], debug_msg
       assert_equal 0, after_stats[:total_freed_pages], debug_msg
       # Only young objects, so should not trigger major GC
       assert_equal before_stats[:major_gc_count], after_stats[:major_gc_count], debug_msg
     RUBY
   end
 
+  def test_heaps_grow_independently
+    # [Bug #21214]
+
+    assert_separately([], __FILE__, __LINE__, <<-'RUBY', timeout: 60)
+      COUNT = 1_000_000
+
+      def allocate_small_object = []
+      def allocate_large_object = Array.new(10)
+
+      @arys = Array.new(COUNT) do
+        # Allocate 10 small transient objects
+        10.times { allocate_small_object }
+        # Allocate 1 large object that is persistent
+        allocate_large_object
+      end
+
+      # Running GC here is required to prevent this test from being flaky because
+      # the heap for the small transient objects may not have been cleared by the
+      # GC causing heap_available_slots to be slightly over 2 * COUNT.
+      GC.start
+
+      heap_available_slots = GC.stat(:heap_available_slots)
+
+      assert_operator(heap_available_slots, :<, COUNT * 2, "GC.stat: #{GC.stat}\nGC.stat_heap: #{GC.stat_heap}")
+    RUBY
+  end
+
   def test_gc_internals
     assert_not_nil GC::INTERNAL_CONSTANTS[:HEAP_PAGE_OBJ_LIMIT]
     assert_not_nil GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE]
@@ -717,6 +748,7 @@ def test_exception_in_finalizer
   end
 
   def test_interrupt_in_finalizer
+    omit 'randomly hangs on many platforms' if ENV.key?('GITHUB_ACTIONS')
     bug10595 = '[ruby-core:66825] [Bug #10595]'
     src = <<-'end;'
       Signal.trap(:INT, 'DEFAULT')
@@ -732,7 +764,7 @@ def test_interrupt_in_finalizer
         ObjectSpace.define_finalizer(Object.new, f)
       end
     end;
-    out, err, status = assert_in_out_err(["-e", src], "", [], [], bug10595, signal: :SEGV) do |*result|
+    out, err, status = assert_in_out_err(["-e", src], "", [], [], bug10595, signal: :SEGV, timeout: 100) do |*result|
       break result
     end
     unless /mswin|mingw/ =~ RUBY_PLATFORM
@@ -799,6 +831,8 @@ def test_vm_object
   end
 
   def test_exception_in_finalizer_procs
+    require '-test-/stack'
+    omit 'failing with ASAN' if Thread.asan?
     assert_in_out_err(["-W0"], "#{<<~"begin;"}\n#{<<~'end;'}", %w[c1 c2])
     c1 = proc do
       puts "c1"
@@ -819,6 +853,8 @@ def test_exception_in_finalizer_procs
   end
 
   def test_exception_in_finalizer_method
+    require '-test-/stack'
+    omit 'failing with ASAN' if Thread.asan?
     assert_in_out_err(["-W0"], "#{<<~"begin;"}\n#{<<~'end;'}", %w[c1 c2])
     def self.c1(x)
       puts "c1"
@@ -884,4 +920,25 @@ def test_old_to_young_reference
       assert_include ObjectSpace.dump(young_obj), '"old":true'
     end
   end
+
+  def test_finalizer_not_run_with_vm_lock
+    assert_ractor(<<~'RUBY')
+      Thread.new do
+        loop do
+          Encoding.list.each do |enc|
+            enc.names
+          end
+        end
+      end
+
+      o = Object.new
+      ObjectSpace.define_finalizer(o, proc do
+        sleep 0.5 # finalizer shouldn't be run with VM lock, otherwise this context switch will crash
+      end)
+      o = nil
+      4.times do
+        GC.start
+      end
+    RUBY
+  end
 end
diff --git a/test/mri/ruby/test_gc_compact.rb b/test/mri/ruby/test_gc_compact.rb
index 4c8aa20215f..a03535171c4 100644
--- a/test/mri/ruby/test_gc_compact.rb
+++ b/test/mri/ruby/test_gc_compact.rb
@@ -324,7 +324,7 @@ def test_moving_arrays_up_heaps
       }.resume
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
-      assert_operator(stats.dig(:moved_up, :T_ARRAY) || 0, :>=, ARY_COUNT - 10)
+      assert_operator(stats.dig(:moved_up, :T_ARRAY) || 0, :>=, ARY_COUNT - 15)
       refute_empty($arys.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
     end;
   end
@@ -356,11 +356,27 @@ def add_ivars
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      assert_operator(stats.dig(:moved_up, :T_OBJECT) || 0, :>=, OBJ_COUNT - 10)
+      assert_operator(stats.dig(:moved_up, :T_OBJECT) || 0, :>=, OBJ_COUNT - 15)
       refute_empty($ary.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
     end;
   end
 
+  def test_compact_objects_of_varying_sizes
+    omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
+
+    assert_separately([], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
+    begin;
+      $objects = []
+      160.times do |n|
+        obj = Class.new.new
+        n.times { |i| obj.instance_variable_set("@foo" + i.to_s, 0) }
+        $objects << obj
+      end
+
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+    end;
+  end
+
   def test_moving_strings_up_heaps
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
 
@@ -377,7 +393,7 @@ def test_moving_strings_up_heaps
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      assert_operator(stats[:moved_up][:T_STRING], :>=, STR_COUNT - 10)
+      assert_operator(stats[:moved_up][:T_STRING], :>=, STR_COUNT - 15)
       refute_empty($ary.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
     end;
   end
@@ -452,4 +468,21 @@ def set_a
       assert_raise(FrozenError) { a.set_a }
     end;
   end
+
+  def test_moving_too_complex_generic_ivar
+    omit "not compiled with SHAPE_DEBUG" unless defined?(RubyVM::Shape)
+
+    assert_separately([], <<~RUBY)
+      RubyVM::Shape.exhaust_shapes
+
+      obj = []
+      obj.instance_variable_set(:@fixnum, 123)
+      obj.instance_variable_set(:@str, "hello")
+
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+      assert_equal(123, obj.instance_variable_get(:@fixnum))
+      assert_equal("hello", obj.instance_variable_get(:@str))
+    RUBY
+  end
 end
diff --git a/test/mri/ruby/test_hash.rb b/test/mri/ruby/test_hash.rb
index 87eb1912d98..32384f5a5c1 100644
--- a/test/mri/ruby/test_hash.rb
+++ b/test/mri/ruby/test_hash.rb
@@ -880,21 +880,20 @@ def test_inspect
     assert_equal(quote1, eval(quote1).inspect)
     assert_equal(quote2, eval(quote2).inspect)
     assert_equal(quote3, eval(quote3).inspect)
-    begin
-      verbose_bak, $VERBOSE = $VERBOSE, nil
-      enc = Encoding.default_external
-      Encoding.default_external = Encoding::ASCII
+
+    EnvUtil.with_default_external(Encoding::ASCII) do
       utf8_ascii_hash = '{"\\u3042": 1}'
       assert_equal(eval(utf8_ascii_hash).inspect, utf8_ascii_hash)
-      Encoding.default_external = Encoding::UTF_8
+    end
+
+    EnvUtil.with_default_external(Encoding::UTF_8) do
       utf8_hash = "{\u3042: 1}"
       assert_equal(eval(utf8_hash).inspect, utf8_hash)
-      Encoding.default_external = Encoding::Windows_31J
+    end
+
+    EnvUtil.with_default_external(Encoding::Windows_31J) do
       sjis_hash = "{\x87]: 1}".force_encoding('sjis')
       assert_equal(eval(sjis_hash).inspect, sjis_hash)
-    ensure
-      Encoding.default_external = enc
-      $VERBOSE = verbose_bak
     end
   end
 
@@ -1297,6 +1296,17 @@ def test_update5
     assert_equal(@cls[a: 10, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10], h)
   end
 
+  def test_update_modify_in_block
+    a = @cls[]
+    (1..1337).each {|k| a[k] = k}
+    b = {1=>1338}
+    assert_raise_with_message(RuntimeError, /rehash during iteration/) do
+      a.update(b) {|k, o, n|
+        a.rehash
+      }
+    end
+  end
+
   def test_update_on_identhash
     key = +'a'
     i = @cls[].compare_by_identity
@@ -1853,6 +1863,14 @@ def test_transform_values_bang
       end
     end
     assert_equal(@cls[a: 2, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10], x)
+
+    x = (1..1337).to_h {|k| [k, k]}
+    assert_raise_with_message(RuntimeError, /rehash during iteration/) do
+      x.transform_values! {|v|
+        x.rehash if v == 1337
+        v * 2
+      }
+    end
   end
 
   def hrec h, n, &b
@@ -1986,9 +2004,12 @@ def test_AREF_fstring_key
     ObjectSpace.count_objects
 
     h = {"abc" => 1}
-    before = ObjectSpace.count_objects[:T_STRING]
-    5.times{ h["abc"] }
-    assert_equal before, ObjectSpace.count_objects[:T_STRING]
+
+    EnvUtil.without_gc do
+      before = ObjectSpace.count_objects[:T_STRING]
+      5.times{ h["abc".freeze] }
+      assert_equal before, ObjectSpace.count_objects[:T_STRING]
+    end
   end
 
   def test_AREF_fstring_key_default_proc
@@ -2116,7 +2137,9 @@ def hash_iter_recursion(h, level)
 
   def test_iterlevel_in_ivar_bug19589
     h = { a: nil }
-    hash_iter_recursion(h, 200)
+    # Recursion level should be over 127 to actually test iterlevel being set in an instance variable,
+    # but it should be under 131 not to overflow the stack under MN threads/ractors.
+    hash_iter_recursion(h, 130)
     assert true
   end
 
@@ -2333,6 +2356,11 @@ def test_bug_12706
     end
   end
 
+  def test_bug_21357
+    h = {x: []}.merge(x: nil) { |_k, v1, _v2| v1 }
+    assert_equal({x: []}, h)
+  end
+
   def test_any_hash_fixable
     20.times do
       assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
@@ -2389,4 +2417,18 @@ def hash
       end
     end;
   end
+
+  def test_ar_to_st_reserved_value
+    klass = Class.new do
+      attr_reader :hash
+      def initialize(val) = @hash = val
+    end
+
+    values = 0.downto(-16).to_a
+    hash = {}
+    values.each do |val|
+      hash[klass.new(val)] = val
+    end
+    assert_equal values, hash.values, "[ruby-core:121239] [Bug #21170]"
+  end
 end
diff --git a/test/mri/ruby/test_integer.rb b/test/mri/ruby/test_integer.rb
index 1dbb3fbb457..c3d9d311c84 100644
--- a/test/mri/ruby/test_integer.rb
+++ b/test/mri/ruby/test_integer.rb
@@ -158,7 +158,9 @@ def obj.to_i; "str"; end
     assert_raise(Encoding::CompatibilityError, bug6192) {Integer("0".encode("utf-32le"))}
     assert_raise(Encoding::CompatibilityError, bug6192) {Integer("0".encode("iso-2022-jp"))}
 
-    assert_raise_with_message(ArgumentError, /\u{1f4a1}/) {Integer("\u{1f4a1}")}
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(ArgumentError, /\u{1f4a1}/) {Integer("\u{1f4a1}")}
+    end
 
     obj = Struct.new(:s).new(%w[42 not-an-integer])
     def obj.to_str; s.shift; end
@@ -708,6 +710,10 @@ def test_square_root
     assert_equal(x, Integer.sqrt(x ** 2), "[ruby-core:95453]")
   end
 
+  def test_bug_21217
+    assert_equal(0x10000 * 2**10, Integer.sqrt(0x100000008 * 2**20))
+  end
+
   def test_fdiv
     assert_equal(1.0, 1.fdiv(1))
     assert_equal(0.5, 1.fdiv(2))
@@ -745,7 +751,7 @@ def o.to_int; 1; end
 
     o = Object.new
     def o.to_int; Object.new; end
-    assert_raise_with_message(TypeError, /can't convert Object to Integer/) {Integer.try_convert(o)}
+    assert_raise_with_message(TypeError, /can't convert Object into Integer/) {Integer.try_convert(o)}
   end
 
   def test_ceildiv
diff --git a/test/mri/ruby/test_io.rb b/test/mri/ruby/test_io.rb
index ec080080c57..1adf47ac51a 100644
--- a/test/mri/ruby/test_io.rb
+++ b/test/mri/ruby/test_io.rb
@@ -467,6 +467,24 @@ def test_each_codepoint_closed
     }
   end
 
+  def test_each_codepoint_with_ungetc
+    bug21562 = '[ruby-core:123176] [Bug #21562]'
+    with_read_pipe("") {|p|
+      p.binmode
+      p.ungetc("aa")
+      a = ""
+      p.each_codepoint { |c| a << c }
+      assert_equal("aa", a, bug21562)
+    }
+    with_read_pipe("") {|p|
+      p.set_encoding("ascii-8bit", universal_newline: true)
+      p.ungetc("aa")
+      a = ""
+      p.each_codepoint { |c| a << c }
+      assert_equal("aa", a, bug21562)
+    }
+  end
+
   def test_rubydev33072
     t = make_tempfile
     path = t.path
@@ -681,7 +699,6 @@ def test_copy_stream_file_to_pipe
 
   if have_nonblock?
     def test_copy_stream_no_busy_wait
-      omit "RJIT has busy wait on GC. This sometimes fails with --jit." if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
       omit "multiple threads already active" if Thread.list.size > 1
 
       msg = 'r58534 [ruby-core:80969] [Backport #13533]'
@@ -1142,6 +1159,34 @@ def test_copy_stream_pathname_to_pathname
     }
   end
 
+  def test_copy_stream_dup_buffer
+    bug21131 = '[ruby-core:120961] [Bug #21131]'
+    mkcdtmpdir do
+      dst_class = Class.new do
+        def initialize(&block)
+          @block = block
+        end
+
+        def write(data)
+          @block.call(data.dup)
+          data.bytesize
+        end
+      end
+
+      rng = Random.new(42)
+      body = Tempfile.new("ruby-bug", binmode: true)
+      body.write(rng.bytes(16_385))
+      body.rewind
+
+      payload = []
+      IO.copy_stream(body, dst_class.new{payload << it})
+      body.rewind
+      assert_equal(body.read, payload.join, bug21131)
+    ensure
+      body&.close
+    end
+  end
+
   def test_copy_stream_write_in_binmode
     bug8767 = '[ruby-core:56518] [Bug #8767]'
     mkcdtmpdir {
@@ -1705,7 +1750,6 @@ def test_read_nonblock_invalid_exception
   end if have_nonblock?
 
   def test_read_nonblock_no_exceptions
-    omit '[ruby-core:90895] RJIT worker may leave fd open in a forked child' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # TODO: consider acquiring GVL from RJIT worker.
     with_pipe {|r, w|
       assert_equal :wait_readable, r.read_nonblock(4096, exception: false)
       w.puts "HI!"
@@ -2515,10 +2559,6 @@ def test_autoclose
   end
 
   def test_autoclose_true_closed_by_finalizer
-    # http://ci.rvm.jp/results/trunk-rjit@silicon-docker/1465760
-    # http://ci.rvm.jp/results/trunk-rjit@silicon-docker/1469765
-    omit 'this randomly fails with RJIT' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-
     feature2250 = '[ruby-core:26222]'
     pre = 'ft2250'
     t = Tempfile.new(pre)
@@ -2579,36 +2619,15 @@ def o.to_open(kw); kw; end
     assert_equal({:a=>1}, open(o, {a: 1}))
   end
 
-  def test_open_pipe
-    assert_deprecated_warning(/Kernel#open with a leading '\|'/) do # https://bugs.ruby-lang.org/issues/19630
-      open("|" + EnvUtil.rubybin, "r+") do |f|
-        f.puts "puts 'foo'"
-        f.close_write
-        assert_equal("foo\n", f.read)
-      end
-    end
-  end
+  def test_path_with_pipe
+    mkcdtmpdir do
+      cmd = "|echo foo"
+      assert_file.not_exist?(cmd)
 
-  def test_read_command
-    assert_deprecated_warning(/IO process creation with a leading '\|'/) do # https://bugs.ruby-lang.org/issues/19630
-      assert_equal("foo\n", IO.read("|echo foo"))
-    end
-    assert_raise(Errno::ENOENT, Errno::EINVAL) do
-      File.read("|#{EnvUtil.rubybin} -e puts")
-    end
-    assert_raise(Errno::ENOENT, Errno::EINVAL) do
-      File.binread("|#{EnvUtil.rubybin} -e puts")
-    end
-    assert_raise(Errno::ENOENT, Errno::EINVAL) do
-      Class.new(IO).read("|#{EnvUtil.rubybin} -e puts")
-    end
-    assert_raise(Errno::ENOENT, Errno::EINVAL) do
-      Class.new(IO).binread("|#{EnvUtil.rubybin} -e puts")
-    end
-    assert_raise(Errno::ESPIPE) do
-      assert_deprecated_warning(/IO process creation with a leading '\|'/) do # https://bugs.ruby-lang.org/issues/19630
-        IO.read("|#{EnvUtil.rubybin} -e 'puts :foo'", 1, 1)
-      end
+      pipe_errors = [Errno::ENOENT, Errno::EINVAL, Errno::EACCES, Errno::EPERM]
+      assert_raise(*pipe_errors) { open(cmd, "r+") }
+      assert_raise(*pipe_errors) { IO.read(cmd) }
+      assert_raise(*pipe_errors) { IO.foreach(cmd) {|x| assert false } }
     end
   end
 
@@ -2813,19 +2832,6 @@ def test_reopen_ivar
   end
 
   def test_foreach
-    a = []
-
-    assert_deprecated_warning(/IO process creation with a leading '\|'/) do # https://bugs.ruby-lang.org/issues/19630
-      IO.foreach("|" + EnvUtil.rubybin + " -e 'puts :foo; puts :bar; puts :baz'") {|x| a << x }
-    end
-    assert_equal(["foo\n", "bar\n", "baz\n"], a)
-
-    a = []
-    assert_deprecated_warning(/IO process creation with a leading '\|'/) do # https://bugs.ruby-lang.org/issues/19630
-      IO.foreach("|" + EnvUtil.rubybin + " -e 'puts :zot'", :open_args => ["r"]) {|x| a << x }
-    end
-    assert_equal(["zot\n"], a)
-
     make_tempfile {|t|
       a = []
       IO.foreach(t.path) {|x| a << x }
@@ -2901,10 +2907,10 @@ def test_print
   end
 
   def test_print_separators
-    EnvUtil.suppress_warning {
-      $, = ':'
-      $\ = "\n"
-    }
+    assert_deprecated_warning(/non-nil '\$,'/) {$, = ":"}
+    assert_raise(TypeError) {$, = 1}
+    assert_deprecated_warning(/non-nil '\$\\'/) {$\ = "\n"}
+    assert_raise(TypeError) {$/ = 1}
     pipe(proc do |w|
       w.print('a')
       EnvUtil.suppress_warning {w.print('a','b','c')}
@@ -3804,7 +3810,7 @@ def test_io_select_with_many_files
       end
 
       tempfiles = []
-      (0..fd_setsize+1).map {|i|
+      (0...fd_setsize).map {|i|
         tempfiles << Tempfile.create("test_io_select_with_many_files")
       }
 
@@ -4240,6 +4246,23 @@ def test_select_exceptfds
     end
   end if Socket.const_defined?(:MSG_OOB)
 
+  def test_select_timeout
+    assert_equal(nil, IO.select(nil,nil,nil,0))
+    assert_equal(nil, IO.select(nil,nil,nil,0.0))
+    assert_raise(TypeError) { IO.select(nil,nil,nil,"invalid-timeout") }
+    assert_raise(ArgumentError) { IO.select(nil,nil,nil,-1) }
+    assert_raise(ArgumentError) { IO.select(nil,nil,nil,-0.1) }
+    assert_raise(ArgumentError) { IO.select(nil,nil,nil,-Float::INFINITY) }
+    assert_raise(RangeError) { IO.select(nil,nil,nil,Float::NAN) }
+    IO.pipe {|r, w|
+      w << "x"
+      ret = [[r], [], []]
+      assert_equal(ret, IO.select([r],nil,nil,0.1))
+      assert_equal(ret, IO.select([r],nil,nil,1))
+      assert_equal(ret, IO.select([r],nil,nil,Float::INFINITY))
+    }
+  end
+
   def test_recycled_fd_close
     dot = -'.'
     IO.pipe do |sig_rd, sig_wr|
@@ -4351,4 +4374,55 @@ def test_stdout_to_closed_pipe
       end
     end
   end
+
+  def test_blocking_timeout
+    assert_separately([], <<~'RUBY')
+      IO.pipe do |r, w|
+        trap(:INT) do
+          w.puts "INT"
+        end
+
+        main = Thread.current
+        thread = Thread.new do
+          # Wait until the main thread has entered `$stdin.gets`:
+          Thread.pass until main.status == 'sleep'
+
+          # Cause an interrupt while handling `$stdin.gets`:
+          Process.kill :INT, $$
+        end
+
+        r.timeout = 1
+        assert_equal("INT", r.gets.chomp)
+      rescue IO::TimeoutError
+        # Ignore - some platforms don't support interrupting `gets`.
+      ensure
+        thread&.join
+      end
+    RUBY
+  end
+
+  def test_fork_close
+    omit "fork is not supported" unless Process.respond_to?(:fork)
+
+    assert_separately([], <<~'RUBY')
+      r, w = IO.pipe
+
+      thread = Thread.new do
+        r.read
+      end
+
+      Thread.pass until thread.status == "sleep"
+
+      pid = fork do
+        r.close
+      end
+
+      w.close
+
+      status = Process.wait2(pid).last
+      thread.join
+
+      assert_predicate(status, :success?)
+    RUBY
+  end
 end
diff --git a/test/mri/ruby/test_io_buffer.rb b/test/mri/ruby/test_io_buffer.rb
index 55296c1f232..e996fc39b88 100644
--- a/test/mri/ruby/test_io_buffer.rb
+++ b/test/mri/ruby/test_io_buffer.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: false
 
 require 'tempfile'
+require 'rbconfig/sizeof'
 
 class TestIOBuffer < Test::Unit::TestCase
   experimental = Warning[:experimental]
@@ -73,12 +74,64 @@ def test_new_readonly
 
   def test_file_mapped
     buffer = File.open(__FILE__) {|file| IO::Buffer.map(file, nil, 0, IO::Buffer::READONLY)}
-    contents = buffer.get_string
+    assert_equal File.size(__FILE__), buffer.size
 
+    contents = buffer.get_string
     assert_include contents, "Hello World"
     assert_equal Encoding::BINARY, contents.encoding
   end
 
+  def test_file_mapped_with_size
+    buffer = File.open(__FILE__) {|file| IO::Buffer.map(file, 30, 0, IO::Buffer::READONLY)}
+    assert_equal 30, buffer.size
+
+    contents = buffer.get_string
+    assert_equal "# frozen_string_literal: false", contents
+    assert_equal Encoding::BINARY, contents.encoding
+  end
+
+  def test_file_mapped_size_too_large
+    assert_raise ArgumentError do
+      File.open(__FILE__) {|file| IO::Buffer.map(file, 200_000, 0, IO::Buffer::READONLY)}
+    end
+    assert_raise ArgumentError do
+      File.open(__FILE__) {|file| IO::Buffer.map(file, File.size(__FILE__) + 1, 0, IO::Buffer::READONLY)}
+    end
+  end
+
+  def test_file_mapped_size_just_enough
+    File.open(__FILE__) {|file|
+      assert_equal File.size(__FILE__), IO::Buffer.map(file, File.size(__FILE__), 0, IO::Buffer::READONLY).size
+    }
+  end
+
+  def test_file_mapped_offset_too_large
+    assert_raise ArgumentError do
+      File.open(__FILE__) {|file| IO::Buffer.map(file, nil, IO::Buffer::PAGE_SIZE * 100, IO::Buffer::READONLY)}
+    end
+    assert_raise ArgumentError do
+      File.open(__FILE__) {|file| IO::Buffer.map(file, 20, IO::Buffer::PAGE_SIZE * 100, IO::Buffer::READONLY)}
+    end
+  end
+
+  def test_file_mapped_zero_size
+    assert_raise ArgumentError do
+      File.open(__FILE__) {|file| IO::Buffer.map(file, 0, 0, IO::Buffer::READONLY)}
+    end
+  end
+
+  def test_file_mapped_negative_size
+    assert_raise ArgumentError do
+      File.open(__FILE__) {|file| IO::Buffer.map(file, -10, 0, IO::Buffer::READONLY)}
+    end
+  end
+
+  def test_file_mapped_negative_offset
+    assert_raise ArgumentError do
+      File.open(__FILE__) {|file| IO::Buffer.map(file, 20, -1, IO::Buffer::READONLY)}
+    end
+  end
+
   def test_file_mapped_invalid
     assert_raise TypeError do
       IO::Buffer.map("foobar")
@@ -121,6 +174,16 @@ def test_string_mapped_buffer_locked
     end
   end
 
+  def test_string_mapped_buffer_frozen
+    string = "Hello World".freeze
+    IO::Buffer.for(string) do |buffer|
+      assert_raise IO::Buffer::AccessError, "Buffer is not writable!" do
+        buffer.set_string("abc")
+      end
+      assert_equal "H".ord, buffer.get_value(:U8, 0)
+    end
+  end
+
   def test_non_string
     not_string = Object.new
 
@@ -343,10 +406,17 @@ def test_zero_length_get_string
     :u64 => [0, 2**64-1],
     :s64 => [-2**63, 0, 2**63-1],
 
+    :U128 => [0, 2**64, 2**127-1, 2**128-1],
+    :S128 => [-2**127, -2**63-1, -1, 0, 2**63, 2**127-1],
+    :u128 => [0, 2**64, 2**127-1, 2**128-1],
+    :s128 => [-2**127, -2**63-1, -1, 0, 2**63, 2**127-1],
+
     :F32 => [-1.0, 0.0, 0.5, 1.0, 128.0],
     :F64 => [-1.0, 0.0, 0.5, 1.0, 128.0],
   }
 
+  SIZE_MAX = RbConfig::LIMITS["SIZE_MAX"]
+
   def test_get_set_value
     buffer = IO::Buffer.new(128)
 
@@ -355,6 +425,16 @@ def test_get_set_value
         buffer.set_value(data_type, 0, value)
         assert_equal value, buffer.get_value(data_type, 0), "Converting #{value} as #{data_type}."
       end
+      assert_raise(ArgumentError) {buffer.get_value(data_type, 128)}
+      assert_raise(ArgumentError) {buffer.set_value(data_type, 128, 0)}
+      case data_type
+      when :U8, :S8
+      else
+        assert_raise(ArgumentError) {buffer.get_value(data_type, 127)}
+        assert_raise(ArgumentError) {buffer.set_value(data_type, 127, 0)}
+        assert_raise(ArgumentError) {buffer.get_value(data_type, SIZE_MAX)}
+        assert_raise(ArgumentError) {buffer.set_value(data_type, SIZE_MAX, 0)}
+      end
     end
   end
 
@@ -411,6 +491,7 @@ def test_each_byte
     buffer = IO::Buffer.for(string)
 
     assert_equal string.bytes, buffer.each_byte.to_a
+    assert_equal string.bytes[3, 5], buffer.each_byte(3, 5).to_a
   end
 
   def test_zero_length_each_byte
@@ -421,7 +502,21 @@ def test_zero_length_each_byte
 
   def test_clear
     buffer = IO::Buffer.new(16)
-    buffer.set_string("Hello World!")
+    assert_equal "\0" * 16, buffer.get_string
+    buffer.clear(1)
+    assert_equal "\1" * 16, buffer.get_string
+    buffer.clear(2, 1, 2)
+    assert_equal "\1" + "\2"*2 + "\1"*13, buffer.get_string
+    buffer.clear(2, 1)
+    assert_equal "\1" + "\2"*15, buffer.get_string
+    buffer.clear(260)
+    assert_equal "\4" * 16, buffer.get_string
+    assert_raise(TypeError) {buffer.clear("x")}
+
+    assert_raise(ArgumentError) {buffer.clear(0, 20)}
+    assert_raise(ArgumentError) {buffer.clear(0, 0, 20)}
+    assert_raise(ArgumentError) {buffer.clear(0, 10, 10)}
+    assert_raise(ArgumentError) {buffer.clear(0, SIZE_MAX-7, 10)}
   end
 
   def test_invalidation
@@ -683,4 +778,156 @@ def test_set_string_null_destination
     buf.set_string('a', 0, 0)
     assert_predicate buf, :empty?
   end
+
+  # https://bugs.ruby-lang.org/issues/21210
+  def test_bug_21210
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
+    str = +"hello"
+    buf = IO::Buffer.for(str)
+    assert_predicate buf, :valid?
+
+    GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+    assert_predicate buf, :valid?
+  end
+
+  def test_128_bit_integers
+    buffer = IO::Buffer.new(32)
+
+    # Test unsigned 128-bit integers
+    test_values_u128 = [
+      0,
+      1,
+      2**64 - 1,
+      2**64,
+      2**127 - 1,
+      2**128 - 1,
+    ]
+
+    test_values_u128.each do |value|
+      buffer.set_value(:u128, 0, value)
+      assert_equal value, buffer.get_value(:u128, 0), "u128: #{value}"
+
+      buffer.set_value(:U128, 0, value)
+      assert_equal value, buffer.get_value(:U128, 0), "U128: #{value}"
+    end
+
+    # Test signed 128-bit integers
+    test_values_s128 = [
+      -2**127,
+      -2**63 - 1,
+      -1,
+      0,
+      1,
+      2**63,
+      2**127 - 1,
+    ]
+
+    test_values_s128.each do |value|
+      buffer.set_value(:s128, 0, value)
+      assert_equal value, buffer.get_value(:s128, 0), "s128: #{value}"
+
+      buffer.set_value(:S128, 0, value)
+      assert_equal value, buffer.get_value(:S128, 0), "S128: #{value}"
+    end
+
+    # Test size_of
+    assert_equal 16, IO::Buffer.size_of(:u128)
+    assert_equal 16, IO::Buffer.size_of(:U128)
+    assert_equal 16, IO::Buffer.size_of(:s128)
+    assert_equal 16, IO::Buffer.size_of(:S128)
+    assert_equal 32, IO::Buffer.size_of([:u128, :u128])
+  end
+
+  def test_integer_endianness_swapping
+    # Test that byte order is swapped correctly for all signed and unsigned integers > 1 byte
+    host_is_le = IO::Buffer::HOST_ENDIAN == IO::Buffer::LITTLE_ENDIAN
+    host_is_be = IO::Buffer::HOST_ENDIAN == IO::Buffer::BIG_ENDIAN
+
+    # Test values that will produce different byte patterns when swapped
+    # Format: [little_endian_type, big_endian_type, test_value, expected_swapped_value]
+    # expected_swapped_value is the result when writing as le_type and reading as be_type
+    # (or vice versa) on a little-endian host
+    test_cases = [
+      [:u16, :U16, 0x1234, 0x3412],
+      [:s16, :S16, 0x1234, 0x3412],
+      [:u32, :U32, 0x12345678, 0x78563412],
+      [:s32, :S32, 0x12345678, 0x78563412],
+      [:u64, :U64, 0x0123456789ABCDEF, 0xEFCDAB8967452301],
+      [:s64, :S64, 0x0123456789ABCDEF, -1167088121787636991],
+      [:u128, :U128, 0x0123456789ABCDEF0123456789ABCDEF, 0xEFCDAB8967452301EFCDAB8967452301],
+      [:u128, :U128, 0x0123456789ABCDEFFEDCBA9876543210, 0x1032547698BADCFEEFCDAB8967452301],
+      [:u128, :U128, 0xFEDCBA98765432100123456789ABCDEF, 0xEFCDAB89674523011032547698BADCFE],
+      [:u128, :U128, 0x123456789ABCDEF0FEDCBA9876543210, 0x1032547698BADCFEF0DEBC9A78563412],
+      [:s128, :S128, 0x0123456789ABCDEF0123456789ABCDEF, -21528975894082904073953971026863512831],
+      [:s128, :S128, 0x0123456789ABCDEFFEDCBA9876543210, 0x1032547698BADCFEEFCDAB8967452301],
+    ]
+
+    test_cases.each do |le_type, be_type, value, expected_swapped|
+      buffer_size = IO::Buffer.size_of(le_type)
+      buffer = IO::Buffer.new(buffer_size * 2)
+
+      # Test little-endian round-trip
+      buffer.set_value(le_type, 0, value)
+      result_le = buffer.get_value(le_type, 0)
+      assert_equal value, result_le, "#{le_type}: round-trip failed"
+
+      # Test big-endian round-trip
+      buffer.set_value(be_type, buffer_size, value)
+      result_be = buffer.get_value(be_type, buffer_size)
+      assert_equal value, result_be, "#{be_type}: round-trip failed"
+
+      # Verify byte patterns are different when endianness differs from host
+      if host_is_le
+        # On little-endian host: le_type should match host, be_type should be swapped
+        # So the byte patterns should be different (unless value is symmetric)
+        # Read back with opposite endianness to verify swapping
+        result_le_read_as_be = buffer.get_value(be_type, 0)
+        result_be_read_as_le = buffer.get_value(le_type, buffer_size)
+
+        # The swapped reads should NOT equal the original value (unless it's symmetric)
+        # For most values, this will be different
+        if value != 0 && value != -1 && value.abs != 1
+          refute_equal value, result_le_read_as_be, "#{le_type} written, read as #{be_type} should be swapped on LE host"
+          refute_equal value, result_be_read_as_le, "#{be_type} written, read as #{le_type} should be swapped on LE host"
+        end
+
+        # Verify that reading back with correct endianness works
+        assert_equal value, buffer.get_value(le_type, 0), "#{le_type} should read correctly on LE host"
+        assert_equal value, buffer.get_value(be_type, buffer_size), "#{be_type} should read correctly on LE host (with swapping)"
+      elsif host_is_be
+        # On big-endian host: be_type should match host, le_type should be swapped
+        result_le_read_as_be = buffer.get_value(be_type, 0)
+        result_be_read_as_le = buffer.get_value(le_type, buffer_size)
+
+        # The swapped reads should NOT equal the original value (unless it's symmetric)
+        if value != 0 && value != -1 && value.abs != 1
+          refute_equal value, result_le_read_as_be, "#{le_type} written, read as #{be_type} should be swapped on BE host"
+          refute_equal value, result_be_read_as_le, "#{be_type} written, read as #{le_type} should be swapped on BE host"
+        end
+
+        # Verify that reading back with correct endianness works
+        assert_equal value, buffer.get_value(be_type, buffer_size), "#{be_type} should read correctly on BE host"
+        assert_equal value, buffer.get_value(le_type, 0), "#{le_type} should read correctly on BE host (with swapping)"
+      end
+
+      # Verify that when we write with one endianness and read with the opposite,
+      # we get the expected swapped value
+      buffer.set_value(le_type, 0, value)
+      swapped_value_le_to_be = buffer.get_value(be_type, 0)
+      assert_equal expected_swapped, swapped_value_le_to_be, "#{le_type} written, read as #{be_type} should produce expected swapped value"
+
+      # Also verify the reverse direction
+      buffer.set_value(be_type, buffer_size, value)
+      swapped_value_be_to_le = buffer.get_value(le_type, buffer_size)
+      assert_equal expected_swapped, swapped_value_be_to_le, "#{be_type} written, read as #{le_type} should produce expected swapped value"
+
+      # Verify that writing the swapped value back and reading with original endianness
+      # gives us the original value (double-swap should restore original)
+      buffer.set_value(be_type, 0, swapped_value_le_to_be)
+      round_trip_value = buffer.get_value(le_type, 0)
+      assert_equal value, round_trip_value, "#{le_type}/#{be_type}: double-swap should restore original value"
+    end
+  end
 end
diff --git a/test/mri/ruby/test_io_m17n.rb b/test/mri/ruby/test_io_m17n.rb
index b01d627d920..83d4fb0c7b5 100644
--- a/test/mri/ruby/test_io_m17n.rb
+++ b/test/mri/ruby/test_io_m17n.rb
@@ -1395,30 +1395,6 @@ def test_popenv_r_enc_enc_in_opt2
     }
   end
 
-  def test_open_pipe_r_enc
-    EnvUtil.suppress_warning do # https://bugs.ruby-lang.org/issues/19630
-      open("|#{EnvUtil.rubybin} -e 'putc 255'", "r:ascii-8bit") {|f|
-        assert_equal(Encoding::ASCII_8BIT, f.external_encoding)
-        assert_equal(nil, f.internal_encoding)
-        s = f.read
-        assert_equal(Encoding::ASCII_8BIT, s.encoding)
-        assert_equal("\xff".force_encoding("ascii-8bit"), s)
-      }
-    end
-  end
-
-  def test_open_pipe_r_enc2
-    EnvUtil.suppress_warning do # https://bugs.ruby-lang.org/issues/19630
-      open("|#{EnvUtil.rubybin} -e 'putc \"\\u3042\"'", "r:UTF-8") {|f|
-        assert_equal(Encoding::UTF_8, f.external_encoding)
-        assert_equal(nil, f.internal_encoding)
-        s = f.read
-        assert_equal(Encoding::UTF_8, s.encoding)
-        assert_equal("\u3042", s)
-      }
-    end
-  end
-
   def test_s_foreach_enc
     with_tmpdir {
       generate_file("t", "\xff")
@@ -2748,8 +2724,8 @@ def test_pos_dont_move_cursor_position
   def test_pos_with_buffer_end_cr
     bug6401 = '[ruby-core:44874]'
     with_tmpdir {
-      # Read buffer size is 8191. This generates '\r' at 8191.
-      lines = ["X" * 8187, "X"]
+      # Read buffer size is 8192. This generates '\r' at 8192.
+      lines = ["X" * 8188, "X"]
       generate_file("tmp", lines.join("\r\n") + "\r\n")
 
       open("tmp", "r") do |f|
@@ -2830,4 +2806,17 @@ def test_each_codepoint_need_more
       flunk failure.join("\n---\n")
     end
   end
+
+  def test_each_codepoint_encoding_with_ungetc
+    File.open(File::NULL, "rt:utf-8") do |f|
+      f.ungetc(%Q[\u{3042}\u{3044}\u{3046}])
+      assert_equal [0x3042, 0x3044, 0x3046], f.each_codepoint.to_a
+    end
+    File.open(File::NULL, "rt:us-ascii") do |f|
+      f.ungetc(%Q[\u{3042}\u{3044}\u{3046}])
+      assert_raise(ArgumentError) do
+        f.each_codepoint.to_a
+      end
+    end
+  end
 end
diff --git a/test/mri/ruby/test_iseq.rb b/test/mri/ruby/test_iseq.rb
index 9eb9c84602f..fa716787fe9 100644
--- a/test/mri/ruby/test_iseq.rb
+++ b/test/mri/ruby/test_iseq.rb
@@ -92,7 +92,7 @@ def test_cdhash_after_roundtrip
         42
       end
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_forwardable
@@ -102,7 +102,7 @@ def bar(a, b); a + b; end
         def foo(...); bar(...); end
       }
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval.new.foo(40, 2))
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval.new.foo(40, 2))
   end
 
   def test_super_with_block
@@ -112,7 +112,7 @@ def (Object.new).touch(*) # :nodoc:
       end
       42
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_super_with_block_hash_0
@@ -123,7 +123,7 @@ def (Object.new).touch(req, *)
       end
       42
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_super_with_block_and_kwrest
@@ -133,17 +133,16 @@ def (Object.new).touch(**) # :nodoc:
       end
       42
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_lambda_with_ractor_roundtrip
     iseq = compile(<<~EOF, __LINE__+1)
       x = 42
-      y = nil.instance_eval{ lambda { x } }
-      Ractor.make_shareable(y)
+      y = Ractor.shareable_lambda{x}
       y.call
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_super_with_anonymous_block
@@ -153,27 +152,23 @@ def (Object.new).touch(&) # :nodoc:
       end
       42
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_ractor_unshareable_outer_variable
     name = "\u{2603 26a1}"
-    y = nil.instance_eval do
-      eval("proc {#{name} = nil; proc {|x| #{name} = x}}").call
-    end
     assert_raise_with_message(ArgumentError, /\(#{name}\)/) do
-      Ractor.make_shareable(y)
-    end
-    y = nil.instance_eval do
-      eval("proc {#{name} = []; proc {|x| #{name}}}").call
+      eval("#{name} = nil; Ractor.shareable_proc{#{name} = nil}")
     end
-    assert_raise_with_message(Ractor::IsolationError, /'#{name}'/) do
-      Ractor.make_shareable(y)
+
+    assert_raise_with_message(Ractor::IsolationError, /\'#{name}\'/) do
+      eval("#{name} = []; Ractor.shareable_proc{#{name}}")
     end
+
     obj = Object.new
-    def obj.foo(*) nil.instance_eval{ ->{super} } end
-    assert_raise_with_message(Ractor::IsolationError, /refer unshareable object \[\] from variable '\*'/) do
-      Ractor.make_shareable(obj.foo)
+    def obj.foo(*) Ractor.shareable_proc{super} end
+    assert_raise_with_message(Ractor::IsolationError, /cannot make a shareable Proc because it can refer unshareable object \[\]/) do
+      obj.foo(*[])
     end
   end
 
@@ -182,7 +177,7 @@ def test_ractor_shareable_value_frozen_core
       # shareable_constant_value: literal
       REGEX = /#{}/ # [Bug #20569]
     RUBY
-    assert_includes iseq.to_binary, "REGEX".b
+    assert_includes iseq_to_binary(iseq), "REGEX".b
   end
 
   def test_disasm_encoding
@@ -297,6 +292,56 @@ def test_invalid_source
     assert_raise(TypeError, bug11159) {compile(1)}
   end
 
+  def test_invalid_source_no_memory_leak
+    # [Bug #21394]
+    assert_no_memory_leak(["-rtempfile"], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
+      code = proc do |t|
+        RubyVM::InstructionSequence.new(nil)
+      rescue TypeError
+      else
+        raise "TypeError was not raised during RubyVM::InstructionSequence.new"
+      end
+
+      10.times(&code)
+    begin;
+      1_000_000.times(&code)
+    end;
+
+    # [Bug #21394]
+    # RubyVM::InstructionSequence.new calls rb_io_path, which dups the string
+    # and can leak memory if the dup raises
+    assert_no_memory_leak(["-rtempfile"], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
+      MyError = Class.new(StandardError)
+      String.prepend(Module.new do
+        def initialize_dup(_)
+          if $raise_on_dup
+            raise MyError
+          else
+            super
+          end
+        end
+      end)
+
+      code = proc do |t|
+        Tempfile.create do |f|
+          $raise_on_dup = true
+          t.times do
+            RubyVM::InstructionSequence.new(f)
+          rescue MyError
+          else
+            raise "MyError was not raised during RubyVM::InstructionSequence.new"
+          end
+        ensure
+          $raise_on_dup = false
+        end
+      end
+
+      code.call(100)
+    begin;
+      code.call(1_000_000)
+    end;
+  end
+
   def test_frozen_string_literal_compile_option
     $f = 'f'
     line = __LINE__ + 2
@@ -566,16 +611,20 @@ def hexdump(bin)
     }
   end
 
+  def iseq_to_binary(iseq)
+    iseq.to_binary
+  rescue RuntimeError => e
+    omit e.message if /compile with coverage/ =~ e.message
+    raise
+  end
+
   def assert_iseq_to_binary(code, mesg = nil)
     iseq = RubyVM::InstructionSequence.compile(code)
     bin = assert_nothing_raised(mesg) do
-      iseq.to_binary
-    rescue RuntimeError => e
-      omit e.message if /compile with coverage/ =~ e.message
-      raise
+      iseq_to_binary(iseq)
     end
     10.times do
-      bin2 = iseq.to_binary
+      bin2 = iseq_to_binary(iseq)
       assert_equal(bin, bin2, message(mesg) {diff hexdump(bin), hexdump(bin2)})
     end
     iseq2 = RubyVM::InstructionSequence.load_from_binary(bin)
@@ -593,7 +642,7 @@ def assert_iseq_to_binary(code, mesg = nil)
   def test_to_binary_with_hidden_local_variables
     assert_iseq_to_binary("for _foo in bar; end")
 
-    bin = RubyVM::InstructionSequence.compile(<<-RUBY).to_binary
+    bin = iseq_to_binary(RubyVM::InstructionSequence.compile(<<-RUBY))
       Object.new.instance_eval do
         a = []
         def self.bar; [1] end
@@ -668,7 +717,7 @@ def self.foo
       end
     RUBY
 
-    iseq_bin = iseq.to_binary
+    iseq_bin = iseq_to_binary(iseq)
     iseq = ISeq.load_from_binary(iseq_bin)
     lines = []
     TracePoint.new(tracepoint_type){|tp|
@@ -764,7 +813,7 @@ def test_iseq_builtin_to_a
   def test_iseq_builtin_load
     Tempfile.create(["builtin", ".iseq"]) do |f|
       f.binmode
-      f.write(RubyVM::InstructionSequence.of(1.method(:abs)).to_binary)
+      f.write(iseq_to_binary(RubyVM::InstructionSequence.of(1.method(:abs))))
       f.close
       assert_separately(["-", f.path], "#{<<~"begin;"}\n#{<<~'end;'}")
       begin;
@@ -804,7 +853,7 @@ def Float(n)
         GC.start
         Float(30)
       }
-      assert_equal :new, r.take
+      assert_equal :new, r.value
     RUBY
   end
 
@@ -855,9 +904,28 @@ def test_unreachable_next_in_block
     end
   end
 
+  def test_serialize_anonymous_outer_variables
+    iseq = RubyVM::InstructionSequence.compile(<<~'RUBY')
+      obj = Object.new
+      def obj.test
+        [1].each do
+          raise "Oops"
+        rescue
+          return it
+        end
+      end
+      obj
+    RUBY
+
+    binary = iseq.to_binary # [Bug # 21370]
+    roundtripped_iseq = RubyVM::InstructionSequence.load_from_binary(binary)
+    object = roundtripped_iseq.eval
+    assert_equal 1, object.test
+  end
+
   def test_loading_kwargs_memory_leak
     assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~'end;'}", rss: true)
-    a = RubyVM::InstructionSequence.compile("foo(bar: :baz)").to_binary
+      a = RubyVM::InstructionSequence.compile("foo(bar: :baz)").to_binary
     begin;
       1_000_000.times do
         RubyVM::InstructionSequence.load_from_binary(a)
@@ -868,7 +936,7 @@ def test_loading_kwargs_memory_leak
   def test_ibf_bignum
     iseq = RubyVM::InstructionSequence.compile("0x0"+"_0123_4567_89ab_cdef"*5)
     expected = iseq.eval
-    result = RubyVM::InstructionSequence.load_from_binary(iseq.to_binary).eval
+    result = RubyVM::InstructionSequence.load_from_binary(iseq_to_binary(iseq)).eval
     assert_equal expected, result, proc {sprintf("expected: %x, result: %x", expected, result)}
   end
 
@@ -919,4 +987,10 @@ def test_while_in_until_condition
       assert_predicate(status, :success?)
     end
   end
+
+  def test_compile_empty_under_gc_stress
+    EnvUtil.under_gc_stress do
+      RubyVM::InstructionSequence.compile_file(File::NULL)
+    end
+  end
 end
diff --git a/test/mri/ruby/test_keyword.rb b/test/mri/ruby/test_keyword.rb
index 4563308fa2e..c836abd0c66 100644
--- a/test/mri/ruby/test_keyword.rb
+++ b/test/mri/ruby/test_keyword.rb
@@ -2424,6 +2424,21 @@ class << c
     assert_raise(ArgumentError) { m.call(42, a: 1, **h2) }
   end
 
+  def test_ruby2_keywords_post_arg
+    def self.a(*c, **kw) [c, kw] end
+    def self.b(*a, b) a(*a, b) end
+    assert_warn(/Skipping set of ruby2_keywords flag for b \(method accepts keywords or post arguments or method does not accept argument splat\)/) do
+      assert_nil(singleton_class.send(:ruby2_keywords, :b))
+    end
+    assert_equal([[{foo: 1}, {bar: 1}], {}], b({foo: 1}, bar: 1))
+
+    b = ->(*a, b){a(*a, b)}
+    assert_warn(/Skipping set of ruby2_keywords flag for proc \(proc accepts keywords or post arguments or proc does not accept argument splat\)/) do
+      b.ruby2_keywords
+    end
+    assert_equal([[{foo: 1}, {bar: 1}], {}], b.({foo: 1}, bar: 1))
+  end
+
   def test_proc_ruby2_keywords
     h1 = {:a=>1}
     foo = ->(*args, &block){block.call(*args)}
@@ -2436,8 +2451,8 @@ def test_proc_ruby2_keywords
     assert_raise(ArgumentError) { foo.call(:a=>1, &->(arg, **kw){[arg, kw]}) }
     assert_equal(h1, foo.call(:a=>1, &->(arg){arg}))
 
-    [->(){}, ->(arg){}, ->(*args, **kw){}, ->(*args, k: 1){}, ->(*args, k: ){}].each do |pr|
-      assert_warn(/Skipping set of ruby2_keywords flag for proc \(proc accepts keywords or proc does not accept argument splat\)/) do
+    [->(){}, ->(arg){}, ->(*args, x){}, ->(*args, **kw){}, ->(*args, k: 1){}, ->(*args, k: ){}].each do |pr|
+      assert_warn(/Skipping set of ruby2_keywords flag for proc \(proc accepts keywords or post arguments or proc does not accept argument splat\)/) do
         pr.ruby2_keywords
       end
     end
@@ -2790,10 +2805,21 @@ def method_missing(*args)
     assert_equal(:opt, o.clear_last_opt(a: 1))
     assert_nothing_raised(ArgumentError) { o.clear_last_empty_method(a: 1) }
 
-    assert_warn(/Skipping set of ruby2_keywords flag for bar \(method accepts keywords or method does not accept argument splat\)/) do
+    assert_warn(/Skipping set of ruby2_keywords flag for bar \(method accepts keywords or post arguments or method does not accept argument splat\)/) do
       assert_nil(c.send(:ruby2_keywords, :bar))
     end
 
+    c.class_eval do
+      def bar_post(*a, x) = nil
+      define_method(:bar_post_bmethod) { |*a, x| }
+    end
+    assert_warn(/Skipping set of ruby2_keywords flag for bar_post \(method accepts keywords or post arguments or method does not accept argument splat\)/) do
+      assert_nil(c.send(:ruby2_keywords, :bar_post))
+    end
+    assert_warn(/Skipping set of ruby2_keywords flag for bar_post_bmethod \(method accepts keywords or post arguments or method does not accept argument splat\)/) do
+      assert_nil(c.send(:ruby2_keywords, :bar_post_bmethod))
+    end
+
     utf16_sym = "abcdef".encode("UTF-16LE").to_sym
     c.send(:define_method, utf16_sym, c.instance_method(:itself))
     assert_warn(/abcdef/) do
@@ -4033,7 +4059,7 @@ def m(a: [])
       tap { m }
       GC.start
       tap { m }
-    }, bug8964
+    }, bug8964, timeout: 30
     assert_normal_exit %q{
       prc = Proc.new {|a: []|}
       GC.stress = true
diff --git a/test/mri/ruby/test_literal.rb b/test/mri/ruby/test_literal.rb
index 1fdc6aa853a..dbff3c47342 100644
--- a/test/mri/ruby/test_literal.rb
+++ b/test/mri/ruby/test_literal.rb
@@ -97,6 +97,12 @@ def test_string
     assert_equal "ab", eval("?a 'b'")
     assert_equal "a\nb", eval("<<A 'b'\na\nA")
 
+    assert_raise(SyntaxError) {eval('"\C-' "\u3042" '"')}
+    assert_raise(SyntaxError) {eval('"\C-\\' "\u3042" '"')}
+    assert_raise(SyntaxError) {eval('"\M-' "\u3042" '"')}
+    assert_raise(SyntaxError) {eval('"\M-\\' "\u3042" '"')}
+
+    assert_equal "\x09 \xC9 \x89", eval('"\C-\111 \M-\111 \M-\C-\111"')
   ensure
     $VERBOSE = verbose_bak
   end
diff --git a/test/mri/ruby/test_m17n.rb b/test/mri/ruby/test_m17n.rb
index 93366ed02aa..9f7a3c7f4b7 100644
--- a/test/mri/ruby/test_m17n.rb
+++ b/test/mri/ruby/test_m17n.rb
@@ -69,15 +69,6 @@ def assert_regexp_fixed_utf8(r)
     assert_regexp_fixed_encoding(r)
   end
 
-  def assert_regexp_usascii_literal(r, enc, ex = nil)
-    code = "# -*- encoding: US-ASCII -*-\n#{r}.encoding"
-    if ex
-      assert_raise(ex) { eval(code) }
-    else
-      assert_equal(enc, eval(code))
-    end
-  end
-
   def encdump(str)
     d = str.dump
     if /\.force_encoding\("[A-Za-z0-9.:_+-]*"\)\z/ =~ d
@@ -195,33 +186,35 @@ def test_string_inspect_invalid
   end
 
   def test_string_inspect_encoding
-    EnvUtil.suppress_warning do
-      begin
-        orig_int = Encoding.default_internal
-        orig_ext = Encoding.default_external
-        Encoding.default_internal = nil
-        [Encoding::UTF_8, Encoding::EUC_JP, Encoding::Windows_31J, Encoding::GB18030].
-          each do |e|
-          Encoding.default_external = e
-          str = "\x81\x30\x81\x30".force_encoding('GB18030')
-          assert_equal(Encoding::GB18030 == e ? %{"#{str}"} : '"\x{81308130}"', str.inspect)
-          str = e("\xa1\x8f\xa1\xa1")
-          expected = "\"\\xA1\x8F\xA1\xA1\"".force_encoding("EUC-JP")
-          assert_equal(Encoding::EUC_JP == e ? expected : "\"\\xA1\\x{8FA1A1}\"", str.inspect)
-          str = s("\x81@")
-          assert_equal(Encoding::Windows_31J == e ? %{"#{str}"} : '"\x{8140}"', str.inspect)
-          str = "\u3042\u{10FFFD}"
-          assert_equal(Encoding::UTF_8 == e ? %{"#{str}"} : '"\u3042\u{10FFFD}"', str.inspect)
-          end
-        Encoding.default_external = Encoding::UTF_8
-        [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE,
-          Encoding::UTF8_SOFTBANK].each do |e|
-          str = "abc".encode(e)
-          assert_equal('"abc"', str.inspect)
-          end
-      ensure
-        Encoding.default_internal = orig_int
-        Encoding.default_external = orig_ext
+    [
+      Encoding::UTF_8,
+      Encoding::EUC_JP,
+      Encoding::Windows_31J,
+      Encoding::GB18030,
+    ].each do |e|
+      EnvUtil.with_default_external(e) do
+        str = "\x81\x30\x81\x30".force_encoding('GB18030')
+        assert_equal(Encoding::GB18030 == e ? %{"#{str}"} : '"\x{81308130}"', str.inspect)
+        str = e("\xa1\x8f\xa1\xa1")
+        expected = "\"\\xA1\x8F\xA1\xA1\"".force_encoding("EUC-JP")
+        assert_equal(Encoding::EUC_JP == e ? expected : "\"\\xA1\\x{8FA1A1}\"", str.inspect)
+        str = s("\x81@")
+        assert_equal(Encoding::Windows_31J == e ? %{"#{str}"} : '"\x{8140}"', str.inspect)
+        str = "\u3042\u{10FFFD}"
+        assert_equal(Encoding::UTF_8 == e ? %{"#{str}"} : '"\u3042\u{10FFFD}"', str.inspect)
+      end
+    end
+
+    EnvUtil.with_default_external(Encoding::UTF_8) do
+      [
+        Encoding::UTF_16BE,
+        Encoding::UTF_16LE,
+        Encoding::UTF_32BE,
+        Encoding::UTF_32LE,
+        Encoding::UTF8_SOFTBANK
+      ].each do |e|
+        str = "abc".encode(e)
+        assert_equal('"abc"', str.inspect)
       end
     end
   end
@@ -255,59 +248,43 @@ def test_utf_without_bom_valid
   end
 
   def test_object_utf16_32_inspect
-    EnvUtil.suppress_warning do
-      begin
-        orig_int = Encoding.default_internal
-        orig_ext = Encoding.default_external
-        Encoding.default_internal = nil
-        Encoding.default_external = Encoding::UTF_8
-        o = Object.new
-        [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].each do |e|
-          o.instance_eval "undef inspect;def inspect;'abc'.encode('#{e}');end"
-          assert_equal '[abc]', [o].inspect
-        end
-      ensure
-        Encoding.default_internal = orig_int
-        Encoding.default_external = orig_ext
+    EnvUtil.with_default_external(Encoding::UTF_8) do
+      o = Object.new
+      [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].each do |e|
+        o.instance_eval "undef inspect;def inspect;'abc'.encode('#{e}');end"
+        assert_equal '[abc]', [o].inspect
       end
     end
   end
 
   def test_object_inspect_external
-    orig_v, $VERBOSE = $VERBOSE, false
-    orig_int, Encoding.default_internal = Encoding.default_internal, nil
-    orig_ext = Encoding.default_external
-
     omit "https://bugs.ruby-lang.org/issues/18338"
 
     o = Object.new
 
-    Encoding.default_external = Encoding::UTF_16BE
-    def o.inspect
-      "abc"
-    end
-    assert_nothing_raised(Encoding::CompatibilityError) { [o].inspect }
+    EnvUtil.with_default_external(Encoding::UTF_16BE) do
+      def o.inspect
+        "abc"
+      end
+      assert_nothing_raised(Encoding::CompatibilityError) { [o].inspect }
 
-    def o.inspect
-      "abc".encode(Encoding.default_external)
+      def o.inspect
+        "abc".encode(Encoding.default_external)
+      end
+      assert_equal '[abc]', [o].inspect
     end
 
-    assert_equal '[abc]', [o].inspect
-
-    Encoding.default_external = Encoding::US_ASCII
-    def o.inspect
-      "\u3042"
-    end
-    assert_equal '[\u3042]', [o].inspect
+    EnvUtil.with_default_external(Encoding::US_ASCII) do
+      def o.inspect
+        "\u3042"
+      end
+      assert_equal '[\u3042]', [o].inspect
 
-    def o.inspect
-      "\x82\xa0".force_encoding(Encoding::Windows_31J)
+      def o.inspect
+        "\x82\xa0".force_encoding(Encoding::Windows_31J)
+      end
+      assert_equal '[\x{82A0}]', [o].inspect
     end
-    assert_equal '[\x{82A0}]', [o].inspect
-  ensure
-    Encoding.default_internal = orig_int
-    Encoding.default_external = orig_ext
-    $VERBOSE = orig_v
   end
 
   def test_str_dump
@@ -1436,31 +1413,42 @@ def test_magic_comment_at_various_positions
   end
 
   def test_regexp_usascii
-    assert_regexp_usascii_literal('//', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/#{ }/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/#{"a"}/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/#{%q"\x80"}/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/#{"\x80"}/', Encoding::ASCII_8BIT)
-
-    assert_regexp_usascii_literal('/a/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/a#{ }/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/a#{"a"}/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/a#{%q"\x80"}/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/a#{"\x80"}/', Encoding::ASCII_8BIT)
-
-    assert_regexp_usascii_literal('/\x80/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/\x80#{ }/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/\x80#{"a"}/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/\x80#{%q"\x80"}/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/\x80#{"\x80"}/', Encoding::ASCII_8BIT)
-
-    assert_regexp_usascii_literal('/\u1234/', Encoding::UTF_8)
-    assert_regexp_usascii_literal('/\u1234#{ }/', Encoding::UTF_8)
-    assert_regexp_usascii_literal('/\u1234#{"a"}/', Encoding::UTF_8)
-    assert_regexp_usascii_literal('/\u1234#{%q"\x80"}/', nil, SyntaxError)
-    assert_regexp_usascii_literal('/\u1234#{"\x80"}/', nil, SyntaxError)
-    assert_regexp_usascii_literal('/\u1234\x80/', nil, SyntaxError)
-    assert_regexp_usascii_literal('/\u1234#{ }\x80/', nil, RegexpError)
+    tests = [
+      [__LINE__, '//', Encoding::US_ASCII],
+      [__LINE__, '/#{ }/', Encoding::US_ASCII],
+      [__LINE__, '/#{"a"}/', Encoding::US_ASCII],
+      [__LINE__, '/#{%q"\x80"}/', Encoding::US_ASCII],
+      [__LINE__, '/#{"\x80"}/', Encoding::ASCII_8BIT],
+
+      [__LINE__, '/a/', Encoding::US_ASCII],
+      [__LINE__, '/a#{ }/', Encoding::US_ASCII],
+      [__LINE__, '/a#{"a"}/', Encoding::US_ASCII],
+      [__LINE__, '/a#{%q"\x80"}/', Encoding::ASCII_8BIT],
+      [__LINE__, '/a#{"\x80"}/', Encoding::ASCII_8BIT],
+
+      [__LINE__, '/\x80/', Encoding::ASCII_8BIT],
+      [__LINE__, '/\x80#{ }/', Encoding::ASCII_8BIT],
+      [__LINE__, '/\x80#{"a"}/', Encoding::ASCII_8BIT],
+      [__LINE__, '/\x80#{%q"\x80"}/', Encoding::ASCII_8BIT],
+      [__LINE__, '/\x80#{"\x80"}/', Encoding::ASCII_8BIT],
+
+      [__LINE__, '/\u1234/', Encoding::UTF_8],
+      [__LINE__, '/\u1234#{ }/', Encoding::UTF_8],
+      [__LINE__, '/\u1234#{"a"}/', Encoding::UTF_8],
+
+      [__LINE__, '/\u1234#{%q"\x80"}/', nil, SyntaxError],
+      [__LINE__, '/\u1234#{"\x80"}/', nil, SyntaxError],
+      [__LINE__, '/\u1234\x80/', nil, SyntaxError],
+      [__LINE__, '/\u1234#{ }\x80/', nil, RegexpError],
+    ]
+    all_assertions_foreach(nil, *tests) do |line, r, enc, ex|
+      code = "# -*- encoding: US-ASCII -*-\n#{r}.encoding"
+      if ex
+        assert_raise(ex) {eval(code, nil, __FILE__, line-1)}
+      else
+        assert_equal(enc, eval(code, nil, __FILE__, line-1))
+      end
+    end
   end
 
   def test_gbk
diff --git a/test/mri/ruby/test_marshal.rb b/test/mri/ruby/test_marshal.rb
index bcd8892f238..eb669948017 100644
--- a/test/mri/ruby/test_marshal.rb
+++ b/test/mri/ruby/test_marshal.rb
@@ -268,7 +268,11 @@ def test_symlink_in_ivar
   classISO8859_1.name
   ClassISO8859_1 = classISO8859_1
 
-  def test_class_nonascii
+  moduleUTF8 = const_set("C\u{30af 30e9 30b9}", Module.new)
+  moduleUTF8.name
+  ModuleUTF8 = moduleUTF8
+
+  def test_nonascii_class_instance
     a = ClassUTF8.new
     assert_instance_of(ClassUTF8, Marshal.load(Marshal.dump(a)), '[ruby-core:24790]')
 
@@ -301,6 +305,12 @@ def test_class_nonascii
     end
   end
 
+  def test_nonascii_class_module
+    assert_same(ClassUTF8, Marshal.load(Marshal.dump(ClassUTF8)))
+    assert_same(ClassISO8859_1, Marshal.load(Marshal.dump(ClassISO8859_1)))
+    assert_same(ModuleUTF8, Marshal.load(Marshal.dump(ModuleUTF8)))
+  end
+
   def test_regexp2
     assert_equal(/\\u/, Marshal.load("\004\b/\b\\\\u\000"))
     assert_equal(/u/, Marshal.load("\004\b/\a\\u\000"))
@@ -459,6 +469,30 @@ def test_marshal_private_class
     assert_equal(o1.foo, o2.foo)
   end
 
+  class TooComplex
+    def initialize
+      @marshal_too_complex = 1
+    end
+  end
+
+  def test_complex_shape_object_id_not_dumped
+    if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS)
+      assert_equal 8, RubyVM::Shape::SHAPE_MAX_VARIATIONS
+    end
+    8.times do |i|
+      TooComplex.new.instance_variable_set("@TestObjectIdTooComplex#{i}", 1)
+    end
+    obj = TooComplex.new
+    ivar = "@a#{rand(10_000).to_s.rjust(5, '0')}"
+    obj.instance_variable_set(ivar, 1)
+
+    if defined?(RubyVM::Shape)
+      assert_predicate(RubyVM::Shape.of(obj), :too_complex?)
+    end
+    obj.object_id
+    assert_equal "\x04\bo:\x1CTestMarshal::TooComplex\a:\x19@marshal_too_complexi\x06:\f#{ivar}i\x06".b, Marshal.dump(obj)
+  end
+
   def test_marshal_complex
     assert_raise(ArgumentError){Marshal.load("\x04\bU:\fComplex[\x05")}
     assert_raise(ArgumentError){Marshal.load("\x04\bU:\fComplex[\x06i\x00")}
@@ -653,10 +687,10 @@ def test_unloadable_data
       Marshal.load(d)
     }
 
-    # cleanup
+  ensure
     self.class.class_eval do
       remove_const name
-    end
+    end if c
   end
 
   def test_unloadable_userdef
@@ -670,9 +704,17 @@ class << c
       Marshal.load(d)
     }
 
-    # cleanup
+  ensure
     self.class.class_eval do
       remove_const name
+    end if c
+  end
+
+  def test_recursive_userdef
+    t = Time.utc(0)
+    t.instance_eval {@v = t}
+    assert_raise_with_message(RuntimeError, /recursive\b.*\b_dump/) do
+      Marshal.dump(t)
     end
   end
 
diff --git a/test/mri/ruby/test_math.rb b/test/mri/ruby/test_math.rb
index 6e67099c6b0..e134600cc44 100644
--- a/test/mri/ruby/test_math.rb
+++ b/test/mri/ruby/test_math.rb
@@ -147,6 +147,13 @@ def test_exp
     check(Math::E ** 2, Math.exp(2))
   end
 
+  def test_expm1
+    check(0, Math.expm1(0))
+    check(Math.sqrt(Math::E) - 1, Math.expm1(0.5))
+    check(Math::E - 1, Math.expm1(1))
+    check(Math::E ** 2 - 1, Math.expm1(2))
+  end
+
   def test_log
     check(0, Math.log(1))
     check(1, Math.log(Math::E))
@@ -201,6 +208,19 @@ def test_log10
     assert_nothing_raised { assert_infinity(-Math.log10(0)) }
   end
 
+  def test_log1p
+    check(0, Math.log1p(0))
+    check(1, Math.log1p(Math::E - 1))
+    check(Math.log(2.0 ** 64 + 1), Math.log1p(1 << 64))
+    check(Math.log(2) * 1024.0, Math.log1p(2 ** 1024))
+    assert_nothing_raised { assert_infinity(Math.log1p(1.0/0)) }
+    assert_nothing_raised { assert_infinity(-Math.log1p(-1.0)) }
+    assert_raise_with_message(Math::DomainError, /\blog1p\b/) { Math.log1p(-1.1) }
+    assert_raise_with_message(Math::DomainError, /\blog1p\b/) { Math.log1p(-Float::EPSILON-1) }
+    assert_nothing_raised { assert_nan(Math.log1p(Float::NAN)) }
+    assert_nothing_raised { assert_infinity(-Math.log1p(-1)) }
+  end
+
   def test_sqrt
     check(0, Math.sqrt(0))
     check(1, Math.sqrt(1))
@@ -301,11 +321,21 @@ def test_lgamma
     assert_float_and_int([Math.log(6),                1], Math.lgamma(4))
 
     assert_raise_with_message(Math::DomainError, /\blgamma\b/) { Math.lgamma(-Float::INFINITY) }
+
+    x, sign = Math.lgamma(+0.0)
+    mesg = "Math.lgamma(+0.0) should be [INF, +1]"
+    assert_infinity(x, mesg)
+    assert_equal(+1, sign, mesg)
+
     x, sign = Math.lgamma(-0.0)
     mesg = "Math.lgamma(-0.0) should be [INF, -1]"
     assert_infinity(x, mesg)
     assert_equal(-1, sign, mesg)
-    x, sign = Math.lgamma(Float::NAN)
+
+    x, = Math.lgamma(-1)
+    assert_infinity(x, "Math.lgamma(-1) should be +INF")
+
+    x, = Math.lgamma(Float::NAN)
     assert_nan(x)
   end
 
diff --git a/test/mri/ruby/test_memory_view.rb b/test/mri/ruby/test_memory_view.rb
index 5a39084d180..d0122ddd591 100644
--- a/test/mri/ruby/test_memory_view.rb
+++ b/test/mri/ruby/test_memory_view.rb
@@ -335,7 +335,7 @@ def test_ractor
         p mv[[0, 2]]
         mv[[1, 3]]
       end
-      p r.take
+      p r.value
     end;
   end
 end
diff --git a/test/mri/ruby/test_method.rb b/test/mri/ruby/test_method.rb
index a865f6100bb..8561f841a8c 100644
--- a/test/mri/ruby/test_method.rb
+++ b/test/mri/ruby/test_method.rb
@@ -284,8 +284,10 @@ def o.bar; end
     assert_raise(TypeError) { m.bind(Object.new) }
 
     cx = EnvUtil.labeled_class("X\u{1f431}")
-    assert_raise_with_message(TypeError, /X\u{1f431}/) do
-      o.method(cx)
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(TypeError, /X\u{1f431}/) do
+        o.method(cx)
+      end
     end
   end
 
@@ -315,9 +317,12 @@ def o.bar; :bar; end
     assert_raise(TypeError) do
       Class.new.class_eval { define_method(:bar, o.method(:bar)) }
     end
+
     cx = EnvUtil.labeled_class("X\u{1f431}")
-    assert_raise_with_message(TypeError, /X\u{1F431}/) do
-      Class.new {define_method(cx) {}}
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(TypeError, /X\u{1F431}/) do
+        Class.new {define_method(cx) {}}
+      end
     end
   end
 
@@ -1612,7 +1617,7 @@ def test_argument_error_location
         begin
           foo(1)
         rescue ArgumentError => e
-          assert_equal "main.rb:#{$line_method}:in 'foo'", e.backtrace.first
+          assert_equal "main.rb:#{$line_method}:in 'Object#foo'", e.backtrace.first
         end
       EOS
     END_OF_BODY
diff --git a/test/mri/ruby/test_module.rb b/test/mri/ruby/test_module.rb
index 4c171bb4394..30a7c5d9bc1 100644
--- a/test/mri/ruby/test_module.rb
+++ b/test/mri/ruby/test_module.rb
@@ -412,19 +412,6 @@ def test_constants
     assert_equal([:MIXIN, :USER], User.constants.sort)
   end
 
-  def test_initialize_copy
-    mod = Module.new { define_method(:foo) {:first} }
-    klass = Class.new { include mod }
-    instance = klass.new
-    assert_equal(:first, instance.foo)
-    new_mod = Module.new { define_method(:foo) { :second } }
-    assert_raise(TypeError) do
-      mod.send(:initialize_copy, new_mod)
-    end
-    4.times { GC.start }
-    assert_equal(:first, instance.foo) # [BUG] unreachable
-  end
-
   def test_initialize_copy_empty
     m = Module.new do
       def x
@@ -435,11 +422,6 @@ def x
     assert_equal([:x], m.instance_methods)
     assert_equal([:@x], m.instance_variables)
     assert_equal([:X], m.constants)
-    assert_raise(TypeError) do
-      m.module_eval do
-        initialize_copy(Module.new)
-      end
-    end
 
     m = Class.new(Module) do
       def initialize_copy(other)
@@ -1291,8 +1273,11 @@ def test_const_set_invalid_name
     assert_raise(NameError) { c1.const_set("X\u{3042}".encode("utf-16le"), :foo) }
     assert_raise(NameError) { c1.const_set("X\u{3042}".encode("utf-32be"), :foo) }
     assert_raise(NameError) { c1.const_set("X\u{3042}".encode("utf-32le"), :foo) }
+
     cx = EnvUtil.labeled_class("X\u{3042}")
-    assert_raise_with_message(TypeError, /X\u{3042}/) { c1.const_set(cx, :foo) }
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(TypeError, /X\u{3042}/) { c1.const_set(cx, :foo) }
+    end
   end
 
   def test_const_get_invalid_name
@@ -1449,6 +1434,7 @@ def test_attr
       c.instance_eval { attr_reader :"." }
     end
 
+    c = Class.new
     assert_equal([:a], c.class_eval { attr :a })
     assert_equal([:b, :c], c.class_eval { attr :b, :c })
     assert_equal([:d], c.class_eval { attr_reader :d })
@@ -1457,6 +1443,16 @@ def test_attr
     assert_equal([:h=, :i=], c.class_eval { attr_writer :h, :i })
     assert_equal([:j, :j=], c.class_eval { attr_accessor :j })
     assert_equal([:k, :k=, :l, :l=], c.class_eval { attr_accessor :k, :l })
+
+    c = Class.new
+    assert_equal([:a], c.class_eval { attr "a" })
+    assert_equal([:b, :c], c.class_eval { attr "b", "c" })
+    assert_equal([:d], c.class_eval { attr_reader "d" })
+    assert_equal([:e, :f], c.class_eval { attr_reader "e", "f" })
+    assert_equal([:g=], c.class_eval { attr_writer "g" })
+    assert_equal([:h=, :i=], c.class_eval { attr_writer "h", "i" })
+    assert_equal([:j, :j=], c.class_eval { attr_accessor "j" })
+    assert_equal([:k, :k=, :l, :l=], c.class_eval { attr_accessor "k", "l" })
   end
 
   def test_alias_method
@@ -3020,17 +3016,17 @@ def test_frozen_visibility
     bug11532 = '[ruby-core:70828] [Bug #11532]'
 
     c = Class.new {const_set(:A, 1)}.freeze
-    assert_raise_with_message(FrozenError, /frozen class/, bug11532) {
+    assert_raise_with_message(FrozenError, /frozen Class/, bug11532) {
       c.class_eval {private_constant :A}
     }
 
     c = Class.new {const_set(:A, 1); private_constant :A}.freeze
-    assert_raise_with_message(FrozenError, /frozen class/, bug11532) {
+    assert_raise_with_message(FrozenError, /frozen Class/, bug11532) {
       c.class_eval {public_constant :A}
     }
 
     c = Class.new {const_set(:A, 1)}.freeze
-    assert_raise_with_message(FrozenError, /frozen class/, bug11532) {
+    assert_raise_with_message(FrozenError, /frozen Class/, bug11532) {
       c.class_eval {deprecate_constant :A}
     }
   end
@@ -3207,7 +3203,6 @@ def test_define_method_with_unbound_method
   end
 
   def test_redefinition_mismatch
-    omit "Investigating trunk-rjit failure on ci.rvm.jp" if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     m = Module.new
     m.module_eval "A = 1", __FILE__, line = __LINE__
     e = assert_raise_with_message(TypeError, /is not a module/) {
@@ -3365,6 +3360,53 @@ def test_module_clone_memory_leak
     CODE
   end
 
+  def test_set_temporary_name
+    m = Module.new
+    assert_nil m.name
+
+    m.const_set(:N, Module.new)
+
+    assert_match(/\A#<Module:0x\h+>::N\z/, m::N.name)
+    assert_same m::N, m::N.set_temporary_name(name = "fake_name_under_M")
+    name.upcase!
+    assert_equal("fake_name_under_M", m::N.name)
+    assert_raise(FrozenError) {m::N.name.upcase!}
+    assert_same m::N, m::N.set_temporary_name(nil)
+    assert_nil(m::N.name)
+
+    m::N.const_set(:O, Module.new)
+    m.const_set(:Recursive, m)
+    m::N.const_set(:Recursive, m)
+    m.const_set(:A, 42)
+
+    assert_same m, m.set_temporary_name(name = "fake_name")
+    name.upcase!
+    assert_equal("fake_name", m.name)
+    assert_raise(FrozenError) {m.name.upcase!}
+    assert_equal("fake_name::N", m::N.name)
+    assert_equal("fake_name::N::O", m::N::O.name)
+
+    assert_same m, m.set_temporary_name(nil)
+    assert_nil m.name
+    assert_nil m::N.name
+    assert_nil m::N::O.name
+
+    assert_raise_with_message(ArgumentError, "empty class/module name") do
+      m.set_temporary_name("")
+    end
+    %w[A A::B ::A ::A::B].each do |name|
+      assert_raise_with_message(ArgumentError, /must not be a constant path/) do
+        m.set_temporary_name(name)
+      end
+    end
+
+    [Object, User, AClass].each do |mod|
+      assert_raise_with_message(RuntimeError, /permanent name/) do
+        mod.set_temporary_name("fake_name")
+      end
+    end
+  end
+
   private
 
   def assert_top_method_is_private(method)
diff --git a/test/mri/ruby/test_nomethod_error.rb b/test/mri/ruby/test_nomethod_error.rb
index 6d413e63914..aa2a88b2d8f 100644
--- a/test/mri/ruby/test_nomethod_error.rb
+++ b/test/mri/ruby/test_nomethod_error.rb
@@ -106,4 +106,32 @@ def name
 
     assert_match(/undefined method.+this_method_does_not_exist.+for.+Module/, err.to_s)
   end
+
+  def test_send_forward_raises
+    t = EnvUtil.labeled_class("Test") do
+      def foo(...)
+        forward(...)
+      end
+    end
+    obj = t.new
+    assert_raise(NoMethodError) do
+      obj.foo
+    end
+  end
+
+  # [Bug #21535]
+  def test_send_forward_raises_when_called_through_vcall
+    t = EnvUtil.labeled_class("Test") do
+      def foo(...)
+        forward(...)
+      end
+      def foo_indirect
+        foo # vcall
+      end
+    end
+    obj = t.new
+    assert_raise(NoMethodError) do
+      obj.foo_indirect
+    end
+  end
 end
diff --git a/test/mri/ruby/test_numeric.rb b/test/mri/ruby/test_numeric.rb
index ab492743f6e..3bf93ef20dc 100644
--- a/test/mri/ruby/test_numeric.rb
+++ b/test/mri/ruby/test_numeric.rb
@@ -18,18 +18,24 @@ def test_coerce
     assert_raise_with_message(TypeError, /can't be coerced into /) {1|:foo}
     assert_raise_with_message(TypeError, /can't be coerced into /) {1^:foo}
 
-    assert_raise_with_message(TypeError, /:\u{3042}/) {1+:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:\u{3042}/) {1&:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:\u{3042}/) {1|:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:\u{3042}/) {1^:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:"\\u3042"/) {1+:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:"\\u3042"/) {1&:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:"\\u3042"/) {1|:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:"\\u3042"/) {1^:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:\u{3044}/) {1+"\u{3044}".to_sym}
-    assert_raise_with_message(TypeError, /:\u{3044}/) {1&"\u{3044}".to_sym}
-    assert_raise_with_message(TypeError, /:\u{3044}/) {1|"\u{3044}".to_sym}
-    assert_raise_with_message(TypeError, /:\u{3044}/) {1^"\u{3044}".to_sym}
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(TypeError, /:\u{3042}/) {1+:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:\u{3042}/) {1&:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:\u{3042}/) {1|:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:\u{3042}/) {1^:"\u{3042}"}
+
+      assert_raise_with_message(TypeError, /:\u{3044}/) {1+"\u{3044}".to_sym}
+      assert_raise_with_message(TypeError, /:\u{3044}/) {1&"\u{3044}".to_sym}
+      assert_raise_with_message(TypeError, /:\u{3044}/) {1|"\u{3044}".to_sym}
+      assert_raise_with_message(TypeError, /:\u{3044}/) {1^"\u{3044}".to_sym}
+    end
+
+    EnvUtil.with_default_internal(Encoding::US_ASCII) do
+      assert_raise_with_message(TypeError, /:"\\u3042"/) {1+:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:"\\u3042"/) {1&:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:"\\u3042"/) {1|:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:"\\u3042"/) {1^:"\u{3042}"}
+    end
 
     bug10711 = '[ruby-core:67405] [Bug #10711]'
     exp = "1.2 can't be coerced into Integer"
diff --git a/test/mri/ruby/test_object.rb b/test/mri/ruby/test_object.rb
index 7d004226295..f4dfe2251b8 100644
--- a/test/mri/ruby/test_object.rb
+++ b/test/mri/ruby/test_object.rb
@@ -280,6 +280,12 @@ def test_methods_prepend_singleton
     assert_equal([:foo], k.private_methods(false))
   end
 
+  class ToStrCounter
+    def initialize(str = "@foo") @str = str; @count = 0; end
+    def to_str; @count += 1; @str; end
+    def count; @count; end
+  end
+
   def test_instance_variable_get
     o = Object.new
     o.instance_eval { @foo = :foo }
@@ -291,9 +297,7 @@ def test_instance_variable_get
     assert_raise(NameError) { o.instance_variable_get("bar") }
     assert_raise(TypeError) { o.instance_variable_get(1) }
 
-    n = Object.new
-    def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@foo"; end
-    def n.count; @count; end
+    n = ToStrCounter.new
     assert_equal(:foo, o.instance_variable_get(n))
     assert_equal(1, n.count)
   end
@@ -308,9 +312,7 @@ def test_instance_variable_set
     assert_raise(NameError) { o.instance_variable_set("bar", 1) }
     assert_raise(TypeError) { o.instance_variable_set(1, 1) }
 
-    n = Object.new
-    def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@foo"; end
-    def n.count; @count; end
+    n = ToStrCounter.new
     o.instance_variable_set(n, :bar)
     assert_equal(:bar, o.instance_eval { @foo })
     assert_equal(1, n.count)
@@ -327,9 +329,7 @@ def test_instance_variable_defined
     assert_raise(NameError) { o.instance_variable_defined?("bar") }
     assert_raise(TypeError) { o.instance_variable_defined?(1) }
 
-    n = Object.new
-    def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@foo"; end
-    def n.count; @count; end
+    n = ToStrCounter.new
     assert_equal(true, o.instance_variable_defined?(n))
     assert_equal(1, n.count)
   end
@@ -356,38 +356,41 @@ def test_remove_instance_variable
   end
 
   def test_remove_instance_variable_re_embed
-    require "objspace"
-
-    c = Class.new do
-      def a = @a
-
-      def b = @b
-
-      def c = @c
-    end
-
-    o1 = c.new
-    o2 = c.new
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      c = Class.new do
+        attr_reader :a, :b, :c
 
-    o1.instance_variable_set(:@foo, 5)
-    o1.instance_variable_set(:@a, 0)
-    o1.instance_variable_set(:@b, 1)
-    o1.instance_variable_set(:@c, 2)
-    refute_includes ObjectSpace.dump(o1), '"embedded":true'
-    o1.remove_instance_variable(:@foo)
-    assert_includes ObjectSpace.dump(o1), '"embedded":true'
-
-    o2.instance_variable_set(:@a, 0)
-    o2.instance_variable_set(:@b, 1)
-    o2.instance_variable_set(:@c, 2)
-    assert_includes ObjectSpace.dump(o2), '"embedded":true'
+        def initialize
+          @a = nil
+          @b = nil
+          @c = nil
+        end
+      end
 
-    assert_equal(0, o1.a)
-    assert_equal(1, o1.b)
-    assert_equal(2, o1.c)
-    assert_equal(0, o2.a)
-    assert_equal(1, o2.b)
-    assert_equal(2, o2.c)
+      o1 = c.new
+      o2 = c.new
+
+      o1.instance_variable_set(:@foo, 5)
+      o1.instance_variable_set(:@a, 0)
+      o1.instance_variable_set(:@b, 1)
+      o1.instance_variable_set(:@c, 2)
+      refute_includes ObjectSpace.dump(o1), '"embedded":true'
+      o1.remove_instance_variable(:@foo)
+      assert_includes ObjectSpace.dump(o1), '"embedded":true'
+
+      o2.instance_variable_set(:@a, 0)
+      o2.instance_variable_set(:@b, 1)
+      o2.instance_variable_set(:@c, 2)
+      assert_includes ObjectSpace.dump(o2), '"embedded":true'
+
+      assert_equal(0, o1.a)
+      assert_equal(1, o1.b)
+      assert_equal(2, o1.c)
+      assert_equal(0, o2.a)
+      assert_equal(1, o2.b)
+      assert_equal(2, o2.c)
+    end;
   end
 
   def test_convert_string
@@ -950,6 +953,19 @@ def initialize
     assert_match(/\bInspect\u{3042}:.* @\u{3044}=42\b/, x.inspect)
     x.instance_variable_set("@\u{3046}".encode(Encoding::EUC_JP), 6)
     assert_match(/@\u{3046}=6\b/, x.inspect)
+
+    x = Object.new
+    x.singleton_class.class_eval do
+      private def instance_variables_to_inspect = [:@host, :@user]
+    end
+
+    x.instance_variable_set(:@host, "localhost")
+    x.instance_variable_set(:@user, "root")
+    x.instance_variable_set(:@password, "hunter2")
+    s = x.inspect
+    assert_include(s, "@host=\"localhost\"")
+    assert_include(s, "@user=\"root\"")
+    assert_not_include(s, "@password=")
   end
 
   def test_singleton_methods
diff --git a/test/mri/ruby/test_object_id.rb b/test/mri/ruby/test_object_id.rb
new file mode 100644
index 00000000000..adb819febce
--- /dev/null
+++ b/test/mri/ruby/test_object_id.rb
@@ -0,0 +1,303 @@
+require 'test/unit'
+require "securerandom"
+
+class TestObjectId < Test::Unit::TestCase
+  def setup
+    @obj = Object.new
+  end
+
+  def test_dup_new_id
+    id = @obj.object_id
+    refute_equal id, @obj.dup.object_id
+  end
+
+  def test_dup_with_ivar_and_id
+    id = @obj.object_id
+    @obj.instance_variable_set(:@foo, 42)
+
+    copy = @obj.dup
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_dup_with_id_and_ivar
+    @obj.instance_variable_set(:@foo, 42)
+    id = @obj.object_id
+
+    copy = @obj.dup
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_dup_with_id_and_ivar_and_frozen
+    @obj.instance_variable_set(:@foo, 42)
+    @obj.freeze
+    id = @obj.object_id
+
+    copy = @obj.dup
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+    refute_predicate copy, :frozen?
+  end
+
+  def test_clone_new_id
+    id = @obj.object_id
+    refute_equal id, @obj.clone.object_id
+  end
+
+  def test_clone_with_ivar_and_id
+    id = @obj.object_id
+    @obj.instance_variable_set(:@foo, 42)
+
+    copy = @obj.clone
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_clone_with_id_and_ivar
+    @obj.instance_variable_set(:@foo, 42)
+    id = @obj.object_id
+
+    copy = @obj.clone
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_clone_with_id_and_ivar_and_frozen
+    @obj.instance_variable_set(:@foo, 42)
+    @obj.freeze
+    id = @obj.object_id
+
+    copy = @obj.clone
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+    assert_predicate copy, :frozen?
+  end
+
+  def test_marshal_new_id
+    return pass if @obj.is_a?(Module)
+
+    id = @obj.object_id
+    refute_equal id, Marshal.load(Marshal.dump(@obj)).object_id
+  end
+
+  def test_marshal_with_ivar_and_id
+    return pass if @obj.is_a?(Module)
+
+    id = @obj.object_id
+    @obj.instance_variable_set(:@foo, 42)
+
+    copy = Marshal.load(Marshal.dump(@obj))
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_marshal_with_id_and_ivar
+    return pass if @obj.is_a?(Module)
+
+    @obj.instance_variable_set(:@foo, 42)
+    id = @obj.object_id
+
+    copy = Marshal.load(Marshal.dump(@obj))
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_marshal_with_id_and_ivar_and_frozen
+    return pass if @obj.is_a?(Module)
+
+    @obj.instance_variable_set(:@foo, 42)
+    @obj.freeze
+    id = @obj.object_id
+
+    copy = Marshal.load(Marshal.dump(@obj))
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+    refute_predicate copy, :frozen?
+  end
+
+  def test_object_id_need_resize
+    (3 - @obj.instance_variables.size).times do |i|
+      @obj.instance_variable_set("@a_#{i}", "[Bug #21445]")
+    end
+    @obj.object_id
+    GC.start
+  end
+end
+
+class TestObjectIdClass < TestObjectId
+  def setup
+    @obj = Class.new
+  end
+end
+
+class TestObjectIdGeneric < TestObjectId
+  def setup
+    @obj = Array.new
+  end
+end
+
+class TestObjectIdTooComplex < TestObjectId
+  class TooComplex
+    def initialize
+      @too_complex_obj_id_test = 1
+    end
+  end
+
+  def setup
+    if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS)
+      assert_equal 8, RubyVM::Shape::SHAPE_MAX_VARIATIONS
+    end
+    8.times do |i|
+      TooComplex.new.instance_variable_set("@TestObjectIdTooComplex#{i}", 1)
+    end
+    @obj = TooComplex.new
+    @obj.instance_variable_set("@a#{rand(10_000)}", 1)
+
+    if defined?(RubyVM::Shape)
+      assert_predicate(RubyVM::Shape.of(@obj), :too_complex?)
+    end
+  end
+end
+
+class TestObjectIdTooComplexClass < TestObjectId
+  class TooComplex < Module
+  end
+
+  def setup
+    if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS)
+      assert_equal 8, RubyVM::Shape::SHAPE_MAX_VARIATIONS
+    end
+
+    @obj = TooComplex.new
+
+    @obj.instance_variable_set("@___#{SecureRandom.hex}", 1)
+
+    8.times do |i|
+      @obj.instance_variable_set("@TestObjectIdTooComplexClass#{i}", 1)
+      @obj.remove_instance_variable("@TestObjectIdTooComplexClass#{i}")
+    end
+
+    @obj.instance_variable_set("@test", 1)
+
+    if defined?(RubyVM::Shape)
+      assert_predicate(RubyVM::Shape.of(@obj), :too_complex?)
+    end
+  end
+end
+
+class TestObjectIdTooComplexGeneric < TestObjectId
+  class TooComplex < Array
+  end
+
+  def setup
+    if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS)
+      assert_equal 8, RubyVM::Shape::SHAPE_MAX_VARIATIONS
+    end
+    8.times do |i|
+      TooComplex.new.instance_variable_set("@TestObjectIdTooComplexGeneric#{i}", 1)
+    end
+    @obj = TooComplex.new
+    @obj.instance_variable_set("@a#{rand(10_000)}", 1)
+    @obj.instance_variable_set("@a#{rand(10_000)}", 1)
+
+    if defined?(RubyVM::Shape)
+      assert_predicate(RubyVM::Shape.of(@obj), :too_complex?)
+    end
+  end
+end
+
+class TestObjectIdRactor < Test::Unit::TestCase
+  def test_object_id_race_free
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      Warning[:experimental] = false
+      class MyClass
+        attr_reader :a, :b, :c
+        def initialize
+          @a = @b = @c = nil
+        end
+      end
+      N = 10_000
+      objs = Ractor.make_shareable(N.times.map { MyClass.new })
+      results = 4.times.map{
+        Ractor.new(objs) { |objs|
+          vars = []
+          ids = []
+          objs.each do |obj|
+            vars << obj.a << obj.b << obj.c
+            ids << obj.object_id
+          end
+          [vars, ids]
+        }
+      }.map(&:value)
+      assert_equal 1, results.uniq.size
+    end;
+  end
+
+  def test_external_object_id_ractor_move
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      Warning[:experimental] = false
+      class MyClass
+        attr_reader :a, :b, :c
+        def initialize
+          @a = @b = @c = nil
+        end
+      end
+      obj = Ractor.make_shareable(MyClass.new)
+      object_id = obj.object_id
+      obj = Ractor.new { Ractor.receive }.send(obj, move: true).value
+      assert_equal object_id, obj.object_id
+    end;
+  end
+end
+
+class TestObjectIdStruct < TestObjectId
+  EmbeddedStruct = Struct.new(:embedded_field)
+
+  def setup
+    @obj = EmbeddedStruct.new
+  end
+end
+
+class TestObjectIdStructGenIvar < TestObjectId
+  GenIvarStruct = Struct.new(:a, :b, :c)
+
+  def setup
+    @obj = GenIvarStruct.new
+  end
+end
+
+class TestObjectIdStructNotEmbed < TestObjectId
+  MANY_IVS = 80
+
+  StructNotEmbed = Struct.new(*MANY_IVS.times.map { |i| :"field_#{i}" })
+
+  def setup
+    @obj = StructNotEmbed.new
+  end
+end
+
+class TestObjectIdStructTooComplex < TestObjectId
+  StructTooComplex = Struct.new(:a) do
+    def initialize
+      @too_complex_obj_id_test = 1
+    end
+  end
+
+  def setup
+    if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS)
+      assert_equal 8, RubyVM::Shape::SHAPE_MAX_VARIATIONS
+    end
+    8.times do |i|
+      StructTooComplex.new.instance_variable_set("@TestObjectIdStructTooComplex#{i}", 1)
+    end
+    @obj = StructTooComplex.new
+    @obj.instance_variable_set("@a#{rand(10_000)}", 1)
+
+    if defined?(RubyVM::Shape)
+      assert_predicate(RubyVM::Shape.of(@obj), :too_complex?)
+    end
+  end
+end
diff --git a/test/mri/ruby/test_objectspace.rb b/test/mri/ruby/test_objectspace.rb
index 5c79983b7e8..a479547599a 100644
--- a/test/mri/ruby/test_objectspace.rb
+++ b/test/mri/ruby/test_objectspace.rb
@@ -8,7 +8,7 @@ def self.deftest_id2ref(obj)
     line = $1.to_i
     code = <<"End"
     define_method("test_id2ref_#{line}") {\
-      o = ObjectSpace._id2ref(obj.object_id);\
+      o = EnvUtil.suppress_warning { ObjectSpace._id2ref(obj.object_id) }
       assert_same(obj, o, "didn't round trip: \#{obj.inspect}");\
     }
 End
@@ -57,20 +57,20 @@ def test_id2ref_liveness
 
   def test_id2ref_invalid_argument
     msg = /no implicit conversion/
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(nil)}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(false)}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(true)}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(:a)}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref("0")}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(Object.new)}
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(nil) } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(false) } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(true) } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(:a) } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref("0") } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(Object.new) } }
   end
 
   def test_id2ref_invalid_symbol_id
     # RB_STATIC_SYM_P checks for static symbols by checking that the bottom
     # 8 bits of the object is equal to RUBY_SYMBOL_FLAG, so we need to make
     # sure that the bottom 8 bits remain unchanged.
-    msg = /is not symbol id value/
-    assert_raise_with_message(RangeError, msg) { ObjectSpace._id2ref(:a.object_id + 256) }
+    msg = /is not a symbol id value/
+    assert_raise_with_message(RangeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(:a.object_id + 256) } }
   end
 
   def test_count_objects
@@ -94,7 +94,7 @@ def test_count_objects
   end
 
   def test_finalizer
-    assert_in_out_err(["-e", <<-END], "", %w(:ok :ok :ok :ok), [])
+    assert_in_out_err(["-e", <<-END], "", %w(:ok :ok :ok), [])
       a = []
       ObjectSpace.define_finalizer(a) { p :ok }
       b = a.dup
@@ -137,6 +137,25 @@ class << fin
     }
   end
 
+  def test_finalizer_copy
+    assert_in_out_err(["-e", <<~'RUBY'], "", %w(:ok), [])
+      def fin
+        ids = Set.new
+        ->(id) { puts "object_id (#{id}) reused" unless ids.add?(id) }
+      end
+
+      OBJ = Object.new
+      ObjectSpace.define_finalizer(OBJ, fin)
+      OBJ.freeze
+
+      10.times do
+        OBJ.clone
+      end
+
+      p :ok
+    RUBY
+  end
+
   def test_finalizer_with_super
     assert_in_out_err(["-e", <<-END], "", %w(:ok), [])
       class A
@@ -265,6 +284,21 @@ def test_each_object_recursive_key
     end;
   end
 
+  def test_id2ref_table_build
+    assert_separately([], <<-End)
+      10.times do
+        Object.new.object_id
+      end
+
+      GC.start(immediate_mark: false)
+
+      obj = Object.new
+      EnvUtil.suppress_warning do
+        assert_equal obj, ObjectSpace._id2ref(obj.object_id)
+      end
+    End
+  end
+
   def test_each_object_singleton_class
     assert_separately([], <<-End)
       class C
diff --git a/test/mri/ruby/test_optimization.rb b/test/mri/ruby/test_optimization.rb
index 5aaf9647a89..089c5fbd1d0 100644
--- a/test/mri/ruby/test_optimization.rb
+++ b/test/mri/ruby/test_optimization.rb
@@ -591,7 +591,6 @@ def run(current, final)
   end
 
   def test_tailcall_not_to_grow_stack
-    omit 'currently JIT-ed code always creates a new stack frame' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     bug16161 = '[ruby-core:94881]'
 
     tailcall("#{<<-"begin;"}\n#{<<~"end;"}")
@@ -607,11 +606,11 @@ def foo(n)
   end
 
   class Bug10557
-    def [](_)
+    def [](_, &)
       block_given?
     end
 
-    def []=(_, _)
+    def []=(_, _, &)
       block_given?
     end
   end
@@ -1216,4 +1215,58 @@ def == x
       end
     RUBY
   end
+
+  def test_opt_new_with_safe_navigation
+    payload = nil
+    assert_nil payload&.new
+  end
+
+  def test_opt_new
+    pos_initialize = "
+      def initialize a, b
+        @a = a
+        @b = b
+      end
+    "
+    kw_initialize = "
+      def initialize a:, b:
+        @a = a
+        @b = b
+      end
+    "
+    kw_hash_initialize = "
+      def initialize a, **kw
+        @a = a
+        @b = kw[:b]
+      end
+    "
+    pos_prelude = "class OptNewFoo; #{pos_initialize}; end;"
+    kw_prelude = "class OptNewFoo; #{kw_initialize}; end;"
+    kw_hash_prelude = "class OptNewFoo; #{kw_hash_initialize}; end;"
+    [
+      "#{pos_prelude} OptNewFoo.new 1, 2",
+      "#{pos_prelude} a = 1; b = 2; OptNewFoo.new a, b",
+      "#{pos_prelude} def optnew_foo(a, b) = OptNewFoo.new(a, b); optnew_foo 1, 2",
+      "#{pos_prelude} def optnew_foo(*a) = OptNewFoo.new(*a); optnew_foo 1, 2",
+      "#{pos_prelude} def optnew_foo(...) = OptNewFoo.new(...); optnew_foo 1, 2",
+      "#{kw_prelude} def optnew_foo(**a) = OptNewFoo.new(**a); optnew_foo a: 1, b: 2",
+      "#{kw_hash_prelude} def optnew_foo(*a, **b) = OptNewFoo.new(*a, **b); optnew_foo 1, b: 2",
+    ].each do |code|
+      iseq = RubyVM::InstructionSequence.compile(code)
+      insn = iseq.disasm
+      assert_match(/opt_new/, insn)
+      assert_match(/OptNewFoo:.+@a=1, @b=2/, iseq.eval.inspect)
+      # clean up to avoid warnings
+      Object.send :remove_const, :OptNewFoo
+      Object.remove_method :optnew_foo if defined?(optnew_foo)
+    end
+    [
+      'def optnew_foo(&) = OptNewFoo.new(&)',
+      'def optnew_foo(a, ...) = OptNewFoo.new(a, ...)',
+    ].each do |code|
+      iseq = RubyVM::InstructionSequence.compile(code)
+      insn = iseq.disasm
+      assert_no_match(/opt_new/, insn)
+    end
+  end
 end
diff --git a/test/mri/ruby/test_parse.rb b/test/mri/ruby/test_parse.rb
index a2f64200f37..9fa4dad41e2 100644
--- a/test/mri/ruby/test_parse.rb
+++ b/test/mri/ruby/test_parse.rb
@@ -186,6 +186,15 @@ def foo
       end;
     end
 
+    c = Class.new
+    c.freeze
+    assert_valid_syntax("#{<<~"begin;"}\n#{<<~'end;'}") do
+      begin;
+        c::FOO &= p 1
+        ::FOO &= p 1
+      end;
+    end
+
     assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /Can't set variable/) do
       begin;
         $1 &= 1
@@ -343,6 +352,21 @@ def test_call_method
     assert_equal("foobar", b)
   end
 
+  def test_call_command
+    a = b = nil
+    o = Object.new
+    def o.m(*arg); proc {|a| arg.join + a }; end
+
+    assert_nothing_raised do
+      o.instance_eval <<-END, __FILE__, __LINE__+1
+        a = o.m "foo", "bar" do end.("buz")
+        b = o.m "foo", "bar" do end::("buz")
+      END
+    end
+    assert_equal("foobarbuz", a)
+    assert_equal("foobarbuz", b)
+  end
+
   def test_xstring
     assert_raise(Errno::ENOENT) do
       eval("``")
@@ -466,6 +490,12 @@ def test_define_singleton_error
     assert_parse_error(%q[def (:"#{42}").foo; end], msg)
     assert_parse_error(%q[def ([]).foo; end], msg)
     assert_parse_error(%q[def ([1]).foo; end], msg)
+    assert_parse_error(%q[def (__FILE__).foo; end], msg)
+    assert_parse_error(%q[def (__LINE__).foo; end], msg)
+    assert_parse_error(%q[def (__ENCODING__).foo; end], msg)
+    assert_parse_error(%q[def __FILE__.foo; end], msg)
+    assert_parse_error(%q[def __LINE__.foo; end], msg)
+    assert_parse_error(%q[def __ENCODING__.foo; end], msg)
   end
 
   def test_flip_flop
@@ -648,6 +678,8 @@ def test_question
     assert_equal("\u{1234}", eval('?\u{1234}'))
     assert_equal("\u{1234}", eval('?\u1234'))
     assert_syntax_error('?\u{41 42}', 'Multiple codepoints at single character literal')
+    assert_syntax_error("?and", /unexpected '\?'/)
+    assert_syntax_error("?\u1234and", /unexpected '\?'/)
     e = assert_syntax_error('"#{?\u123}"', 'invalid Unicode escape')
     assert_not_match(/end-of-input/, e.message)
 
@@ -1527,7 +1559,7 @@ def test_shareable_constant_value_ignored
   end
 
   def test_shareable_constant_value_simple
-    obj = [['unsharable_value']]
+    obj = [['unshareable_value']]
     a, b, c = eval_separately("#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
       # shareable_constant_value: experimental_everything
@@ -1721,6 +1753,15 @@ def o.freeze; self; end
     end;
   end
 
+  def test_shareable_constant_value_massign
+    a = eval_separately("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      # shareable_constant_value: experimental_everything
+      A, = 1
+    end;
+    assert_equal(1, a)
+  end
+
   def test_if_after_class
     assert_valid_syntax('module if true; Object end::Kernel; end')
     assert_valid_syntax('module while true; break Object end::Kernel; end')
diff --git a/test/mri/ruby/test_pattern_matching.rb b/test/mri/ruby/test_pattern_matching.rb
index 92a3244fc2a..96aa2a7fd6b 100644
--- a/test/mri/ruby/test_pattern_matching.rb
+++ b/test/mri/ruby/test_pattern_matching.rb
@@ -197,11 +197,49 @@ def test_alternative_pattern
       end
     end
 
-    assert_syntax_error(%q{
+    assert_valid_syntax(%{
+      case 0
+      in [ :a | :b, x]
+        true
+      end
+    })
+
+    assert_in_out_err(['-c'], %q{
       case 0
       in a | 0
       end
-    }, /illegal variable in alternative pattern/)
+    }, [], /alternative pattern/,
+    success: false)
+
+    assert_in_out_err(['-c'], %q{
+      case 0
+      in 0 | a
+      end
+    }, [], /alternative pattern/,
+    success: false)
+  end
+
+  def test_alternative_pattern_nested
+    assert_in_out_err(['-c'], %q{
+      case 0
+      in [a] | 1
+      end
+    }, [], /alternative pattern/,
+    success: false)
+
+    assert_in_out_err(['-c'], %q{
+      case 0
+      in { a: b } | 1
+      end
+    }, [], /alternative pattern/,
+    success: false)
+
+    assert_in_out_err(['-c'], %q{
+      case 0
+      in [{ a: [{ b: [{ c: }] }] }] | 1
+      end
+    }, [], /alternative pattern/,
+    success: false)
   end
 
   def test_var_pattern
diff --git a/test/mri/ruby/test_proc.rb b/test/mri/ruby/test_proc.rb
index 6ca9e0cfb44..f74342322f5 100644
--- a/test/mri/ruby/test_proc.rb
+++ b/test/mri/ruby/test_proc.rb
@@ -1382,7 +1382,8 @@ def test_parameters
     assert_equal([[:opt, :a], [:rest, :b], [:opt, :c]], proc {|a, *b, c|}.parameters)
     assert_equal([[:opt, :a], [:rest, :b], [:opt, :c], [:block, :d]], proc {|a, *b, c, &d|}.parameters)
     assert_equal([[:opt, :a], [:opt, :b], [:rest, :c], [:opt, :d], [:block, :e]], proc {|a, b=:b, *c, d, &e|}.parameters)
-    assert_equal([[:opt, nil], [:block, :b]], proc {|(a), &b|a}.parameters)
+    assert_equal([[:opt], [:block, :b]], proc {|(a), &b|a}.parameters)
+    assert_equal([[:opt], [:rest, :_], [:opt]], proc {|(a_), *_, (b_)|}.parameters)
     assert_equal([[:opt, :a], [:opt, :b], [:opt, :c], [:opt, :d], [:rest, :e], [:opt, :f], [:opt, :g], [:block, :h]], proc {|a,b,c=:c,d=:d,*e,f,g,&h|}.parameters)
 
     assert_equal([[:req]], method(:putc).parameters)
@@ -1390,6 +1391,8 @@ def test_parameters
 
     pr = eval("proc{|"+"(_),"*30+"|}")
     assert_empty(pr.parameters.map{|_,n|n}.compact)
+
+    assert_equal([[:opt]], proc { it }.parameters)
   end
 
   def test_proc_autosplat_with_multiple_args_with_ruby2_keywords_splat_bug_19759
@@ -1438,6 +1441,9 @@ def test_parameters_lambda
 
     assert_equal([[:opt, :a]], lambda {|a|}.parameters(lambda: false))
     assert_equal([[:opt, :a], [:opt, :b], [:opt, :c], [:opt, :d], [:rest, :e], [:opt, :f], [:opt, :g], [:block, :h]], lambda {|a,b,c=:c,d=:d,*e,f,g,&h|}.parameters(lambda: false))
+
+    assert_equal([[:req]], proc { it }.parameters(lambda: true))
+    assert_equal([[:opt]], lambda { it }.parameters(lambda: false))
   end
 
   def pm0() end
@@ -1627,6 +1633,10 @@ def test_local_variable_get
     assert_equal(3, b.local_variable_get(:when))
     assert_equal(4, b.local_variable_get(:begin))
     assert_equal(5, b.local_variable_get(:end))
+
+    assert_raise_with_message(NameError, /local variable \Wdefault\W/) {
+      binding.local_variable_get(:default)
+    }
   end
 
   def test_local_variable_set
@@ -1639,6 +1649,274 @@ def test_local_variable_set
     assert_equal(20, b.eval("b"))
   end
 
+  def test_numparam_is_not_local_variables
+    "foo".tap do
+      _9 and flunk
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:_9) }
+      assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      assert_raise(NameError) { binding.local_variable_defined?(:_9) }
+      "bar".tap do
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:_9) }
+        assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+        assert_raise(NameError) { binding.local_variable_defined?(:_9) }
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:_9) }
+      assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      assert_raise(NameError) { binding.local_variable_defined?(:_9) }
+    end
+
+    "foo".tap do
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:_9) }
+      assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      assert_raise(NameError) { binding.local_variable_defined?(:_9) }
+      "bar".tap do
+        _9 and flunk
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:_9) }
+        assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+        assert_raise(NameError) { binding.local_variable_defined?(:_9) }
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:_9) }
+      assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      assert_raise(NameError) { binding.local_variable_defined?(:_9) }
+    end
+  end
+
+  def test_implicit_parameters_for_numparams
+    x = x = 1
+    assert_raise(NameError) { binding.implicit_parameter_get(:x) }
+    assert_raise(NameError) { binding.implicit_parameter_defined?(:x) }
+
+    "foo".tap do
+      _5 and flunk
+      assert_equal([:_1, :_2, :_3, :_4, :_5], binding.implicit_parameters)
+      assert_equal("foo", binding.implicit_parameter_get(:_1))
+      assert_equal(nil, binding.implicit_parameter_get(:_5))
+      assert_raise(NameError) { binding.implicit_parameter_get(:_6) }
+      assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+      assert_equal(true, binding.implicit_parameter_defined?(:_1))
+      assert_equal(true, binding.implicit_parameter_defined?(:_5))
+      assert_equal(false, binding.implicit_parameter_defined?(:_6))
+      assert_equal(false, binding.implicit_parameter_defined?(:it))
+      "bar".tap do
+        assert_equal([], binding.implicit_parameters)
+        assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+        assert_raise(NameError) { binding.implicit_parameter_get(:_6) }
+        assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+        assert_equal(false, binding.implicit_parameter_defined?(:_1))
+        assert_equal(false, binding.implicit_parameter_defined?(:_6))
+        assert_equal(false, binding.implicit_parameter_defined?(:it))
+      end
+      assert_equal([:_1, :_2, :_3, :_4, :_5], binding.implicit_parameters)
+      assert_equal("foo", binding.implicit_parameter_get(:_1))
+      assert_equal(nil, binding.implicit_parameter_get(:_5))
+      assert_raise(NameError) { binding.implicit_parameter_get(:_6) }
+      assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+      assert_equal(true, binding.implicit_parameter_defined?(:_1))
+      assert_equal(true, binding.implicit_parameter_defined?(:_5))
+      assert_equal(false, binding.implicit_parameter_defined?(:_6))
+      assert_equal(false, binding.implicit_parameter_defined?(:it))
+    end
+
+    "foo".tap do
+      assert_equal([], binding.implicit_parameters)
+      assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+      assert_raise(NameError) { binding.implicit_parameter_get(:_6) }
+      assert_equal(false, binding.implicit_parameter_defined?(:_1))
+      assert_equal(false, binding.implicit_parameter_defined?(:_6))
+      assert_equal(false, binding.implicit_parameter_defined?(:it))
+      "bar".tap do
+        _5 and flunk
+        assert_equal([:_1, :_2, :_3, :_4, :_5], binding.implicit_parameters)
+        assert_equal("bar", binding.implicit_parameter_get(:_1))
+        assert_equal(nil, binding.implicit_parameter_get(:_5))
+        assert_raise(NameError) { binding.implicit_parameter_get(:_6) }
+        assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+        assert_equal(true, binding.implicit_parameter_defined?(:_1))
+        assert_equal(true, binding.implicit_parameter_defined?(:_5))
+        assert_equal(false, binding.implicit_parameter_defined?(:_6))
+        assert_equal(false, binding.implicit_parameter_defined?(:it))
+      end
+      assert_equal([], binding.implicit_parameters)
+      assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+      assert_raise(NameError) { binding.implicit_parameter_get(:_6) }
+      assert_equal(false, binding.implicit_parameter_defined?(:_1))
+      assert_equal(false, binding.implicit_parameter_defined?(:_6))
+      assert_equal(false, binding.implicit_parameter_defined?(:it))
+    end
+  end
+
+  def test_it_is_not_local_variable
+    "foo".tap do
+      it
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
+      "bar".tap do
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:it) }
+        assert_equal(false, binding.local_variable_defined?(:it))
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
+      "bar".tap do
+        it
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:it) }
+        assert_equal(false, binding.local_variable_defined?(:it))
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
+    end
+
+    "foo".tap do
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
+      "bar".tap do
+        it
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:it) }
+        assert_equal(false, binding.local_variable_defined?(:it))
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
+    end
+  end
+
+  def test_implicit_parameters_for_it
+    "foo".tap do
+      it or flunk
+      assert_equal([:it], binding.implicit_parameters)
+      assert_equal("foo", binding.implicit_parameter_get(:it))
+      assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+      assert_equal(true, binding.implicit_parameter_defined?(:it))
+      assert_equal(false, binding.implicit_parameter_defined?(:_1))
+      "bar".tap do
+        assert_equal([], binding.implicit_parameters)
+        assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+        assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+        assert_equal(false, binding.implicit_parameter_defined?(:it))
+        assert_equal(false, binding.implicit_parameter_defined?(:_1))
+      end
+      assert_equal([:it], binding.implicit_parameters)
+      assert_equal("foo", binding.implicit_parameter_get(:it))
+      assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+      assert_equal(true, binding.implicit_parameter_defined?(:it))
+      assert_equal(false, binding.implicit_parameter_defined?(:_1))
+    end
+
+    "foo".tap do
+      assert_equal([], binding.implicit_parameters)
+      assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+      assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+      assert_equal(false, binding.implicit_parameter_defined?(:it))
+      assert_equal(false, binding.implicit_parameter_defined?(:_1))
+      "bar".tap do
+        it or flunk
+        assert_equal([:it], binding.implicit_parameters)
+        assert_equal("bar", binding.implicit_parameter_get(:it))
+        assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+        assert_equal(true, binding.implicit_parameter_defined?(:it))
+        assert_equal(false, binding.implicit_parameter_defined?(:_1))
+      end
+      assert_equal([], binding.implicit_parameters)
+      assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+      assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+      assert_equal(false, binding.implicit_parameter_defined?(:it))
+      assert_equal(false, binding.implicit_parameter_defined?(:_1))
+    end
+  end
+
+  def test_implicit_parameters_for_it_complex
+    "foo".tap do
+      it = it = "bar"
+
+      assert_equal([], binding.implicit_parameters)
+      assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+      assert_equal(false, binding.implicit_parameter_defined?(:it))
+
+      assert_equal([:it], binding.local_variables)
+      assert_equal("bar", binding.local_variable_get(:it))
+      assert_equal(true, binding.local_variable_defined?(:it))
+    end
+
+    "foo".tap do
+      it or flunk
+
+      assert_equal([:it], binding.implicit_parameters)
+      assert_equal("foo", binding.implicit_parameter_get(:it))
+      assert_equal(true, binding.implicit_parameter_defined?(:it))
+
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
+    end
+
+    "foo".tap do
+      it or flunk
+      it = it = "bar"
+
+      assert_equal([:it], binding.implicit_parameters)
+      assert_equal("foo", binding.implicit_parameter_get(:it))
+      assert_equal(true, binding.implicit_parameter_defined?(:it))
+
+      assert_equal([:it], binding.local_variables)
+      assert_equal("bar", binding.local_variable_get(:it))
+      assert_equal(true, binding.local_variable_defined?(:it))
+    end
+  end
+
+  def test_implicit_parameters_for_it_and_numparams
+    "foo".tap do
+      it or flunk
+      "bar".tap do
+        _5 and flunk
+        assert_equal([:_1, :_2, :_3, :_4, :_5], binding.implicit_parameters)
+        assert_raise(NameError) { binding.implicit_parameter_get(:it) }
+        assert_equal("bar", binding.implicit_parameter_get(:_1))
+        assert_equal(nil, binding.implicit_parameter_get(:_5))
+        assert_raise(NameError) { binding.implicit_parameter_get(:_6) }
+        assert_equal(false, binding.implicit_parameter_defined?(:it))
+        assert_equal(true, binding.implicit_parameter_defined?(:_1))
+        assert_equal(true, binding.implicit_parameter_defined?(:_5))
+        assert_equal(false, binding.implicit_parameter_defined?(:_6))
+      end
+    end
+
+    "foo".tap do
+      _5 and flunk
+      "bar".tap do
+        it or flunk
+        assert_equal([:it], binding.implicit_parameters)
+        assert_equal("bar", binding.implicit_parameter_get(:it))
+        assert_raise(NameError) { binding.implicit_parameter_get(:_1) }
+        assert_raise(NameError) { binding.implicit_parameter_get(:_5) }
+        assert_raise(NameError) { binding.implicit_parameter_get(:_6) }
+        assert_equal(true, binding.implicit_parameter_defined?(:it))
+        assert_equal(false, binding.implicit_parameter_defined?(:_1))
+        assert_equal(false, binding.implicit_parameter_defined?(:_5))
+        assert_equal(false, binding.implicit_parameter_defined?(:_6))
+      end
+    end
+  end
+
+  def test_implicit_parameter_invalid_name
+    message_pattern = /is not an implicit parameter/
+    assert_raise_with_message(NameError, message_pattern) { binding.implicit_parameter_defined?(:foo) }
+    assert_raise_with_message(NameError, message_pattern) { binding.implicit_parameter_get(:foo) }
+    assert_raise_with_message(NameError, message_pattern) { binding.implicit_parameter_defined?("wrong_implicit_parameter_name_#{rand(10000)}") }
+    assert_raise_with_message(NameError, message_pattern) { binding.implicit_parameter_get("wrong_implicit_parameter_name_#{rand(10000)}") }
+  end
+
   def test_local_variable_set_wb
     assert_ruby_status([], <<-'end;', '[Bug #13605]', timeout: 30)
       b = binding
diff --git a/test/mri/ruby/test_process.rb b/test/mri/ruby/test_process.rb
index af72053234f..857ceab6762 100644
--- a/test/mri/ruby/test_process.rb
+++ b/test/mri/ruby/test_process.rb
@@ -58,6 +58,8 @@ def rlimit_exist?
 
   def test_rlimit_nofile
     return unless rlimit_exist?
+    omit "LSAN needs to open proc file" if Test::Sanitizers.lsan_enabled?
+
     with_tmpchdir {
       File.write 's', <<-"End"
         # Too small RLIMIT_NOFILE, such as zero, causes problems.
@@ -114,14 +116,19 @@ def test_rlimit_name
     }
     assert_raise(ArgumentError) { Process.getrlimit(:FOO) }
     assert_raise(ArgumentError) { Process.getrlimit("FOO") }
-    assert_raise_with_message(ArgumentError, /\u{30eb 30d3 30fc}/) { Process.getrlimit("\u{30eb 30d3 30fc}") }
+
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(ArgumentError, /\u{30eb 30d3 30fc}/) { Process.getrlimit("\u{30eb 30d3 30fc}") }
+    end
   end
 
   def test_rlimit_value
     return unless rlimit_exist?
     assert_raise(ArgumentError) { Process.setrlimit(:FOO, 0) }
     assert_raise(ArgumentError) { Process.setrlimit(:CORE, :FOO) }
-    assert_raise_with_message(ArgumentError, /\u{30eb 30d3 30fc}/) { Process.setrlimit("\u{30eb 30d3 30fc}", 0) }
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(ArgumentError, /\u{30eb 30d3 30fc}/) { Process.setrlimit("\u{30eb 30d3 30fc}", 0) }
+    end
     assert_raise_with_message(ArgumentError, /\u{30eb 30d3 30fc}/) { Process.setrlimit(:CORE, "\u{30eb 30d3 30fc}") }
     with_tmpchdir do
       s = run_in_child(<<-'End')
@@ -275,21 +282,22 @@ def test_overwrite_ENV
     end;
   end
 
-  MANDATORY_ENVS = %w[RUBYLIB RJIT_SEARCH_BUILD_DIR]
-  case RbConfig::CONFIG['target_os']
-  when /linux/
-    MANDATORY_ENVS << 'LD_PRELOAD'
-  when /mswin|mingw/
-    MANDATORY_ENVS.concat(%w[HOME USER TMPDIR])
-  when /darwin/
-    MANDATORY_ENVS.concat(ENV.keys.grep(/\A__CF_/))
-  end
+  MANDATORY_ENVS = %w[RUBYLIB GEM_HOME GEM_PATH RUBY_FREE_AT_EXIT]
   if e = RbConfig::CONFIG['LIBPATHENV']
     MANDATORY_ENVS << e
   end
   if e = RbConfig::CONFIG['PRELOADENV'] and !e.empty?
     MANDATORY_ENVS << e
   end
+  case RbConfig::CONFIG['target_os']
+  when /mswin|mingw/
+    MANDATORY_ENVS.concat(%w[HOME USER TMPDIR PROCESSOR_ARCHITECTURE])
+  when /darwin/
+    MANDATORY_ENVS.concat(%w[TMPDIR], ENV.keys.grep(/\A__CF_/))
+    # IO.popen([ENV.keys.to_h {|e| [e, nil]},
+    #           RUBY, "-e", %q[print ENV.keys.join(?\0)]],
+    #          &:read).split(?\0)
+  end
   PREENVARG = ['-e', "%w[#{MANDATORY_ENVS.join(' ')}].each{|e|ENV.delete(e)}"]
   ENVARG = ['-e', 'ENV.each {|k,v| puts "#{k}=#{v}" }']
   ENVCOMMAND = [RUBY].concat(PREENVARG).concat(ENVARG)
@@ -1468,15 +1476,6 @@ def test_status
       assert_equal(s, s)
       assert_equal(s, s.to_i)
 
-      assert_deprecated_warn(/\buse .*Process::Status/) do
-        assert_equal(s.to_i & 0x55555555, s & 0x55555555)
-      end
-      assert_deprecated_warn(/\buse .*Process::Status/) do
-        assert_equal(s.to_i >> 1, s >> 1)
-      end
-      assert_raise(ArgumentError) do
-        s >> -1
-      end
       assert_equal(false, s.stopped?)
       assert_equal(nil, s.stopsig)
 
@@ -1691,9 +1690,10 @@ def test_uid_from_name
       if u = Etc.getpwuid(Process.uid)
         assert_equal(Process.uid, Process::UID.from_name(u.name), u.name)
       end
-      assert_raise_with_message(ArgumentError, /\u{4e0d 5b58 5728}/) {
+      exc = assert_raise_kind_of(ArgumentError, SystemCallError) {
         Process::UID.from_name("\u{4e0d 5b58 5728}")
       }
+      assert_match(/\u{4e0d 5b58 5728}/, exc.message) if exc.is_a?(ArgumentError)
     end
   end
 
@@ -1702,12 +1702,7 @@ def test_gid_from_name
       if g = Etc.getgrgid(Process.gid)
         assert_equal(Process.gid, Process::GID.from_name(g.name), g.name)
       end
-      expected_excs = [ArgumentError]
-      expected_excs << Errno::ENOENT if defined?(Errno::ENOENT)
-      expected_excs << Errno::ESRCH if defined?(Errno::ESRCH) # WSL 2 actually raises Errno::ESRCH
-      expected_excs << Errno::EBADF if defined?(Errno::EBADF)
-      expected_excs << Errno::EPERM if defined?(Errno::EPERM)
-      exc = assert_raise(*expected_excs) do
+      exc = assert_raise_kind_of(ArgumentError, SystemCallError) do
         Process::GID.from_name("\u{4e0d 5b58 5728}") # fu son zai ("absent" in Kanji)
       end
       assert_match(/\u{4e0d 5b58 5728}/, exc.message) if exc.is_a?(ArgumentError)
@@ -1762,11 +1757,7 @@ def test_wait_and_sigchild
       end
       assert_send [sig_r, :wait_readable, 5], 'self-pipe not readable'
     end
-    if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # checking -DRJIT_FORCE_ENABLE. It may trigger extra SIGCHLD.
-      assert_equal [true], signal_received.uniq, "[ruby-core:19744]"
-    else
-      assert_equal [true], signal_received, "[ruby-core:19744]"
-    end
+    assert_equal [true], signal_received, "[ruby-core:19744]"
   rescue NotImplementedError, ArgumentError
   ensure
     begin
@@ -1776,15 +1767,12 @@ def test_wait_and_sigchild
   end
 
   def test_no_curdir
-    if /solaris/i =~ RUBY_PLATFORM
-      omit "Temporary omit to avoid CI failures after commit to use realpath on required files"
-    end
     with_tmpchdir {|d|
       Dir.mkdir("vd")
       status = nil
       Dir.chdir("vd") {
         dir = "#{d}/vd"
-        # OpenSolaris cannot remove the current directory.
+        # Windows cannot remove the current directory with permission issues.
         system(RUBY, "--disable-gems", "-e", "Dir.chdir '..'; Dir.rmdir #{dir.dump}", err: File::NULL)
         system({"RUBYLIB"=>nil}, RUBY, "--disable-gems", "-e", "exit true")
         status = $?
@@ -1818,9 +1806,6 @@ def test_spawn_too_long_path
   end
 
   def test_aspawn_too_long_path
-    if /solaris/i =~ RUBY_PLATFORM && !defined?(Process::RLIMIT_NPROC)
-      omit "Too exhaustive test on platforms without Process::RLIMIT_NPROC such as Solaris 10"
-    end
     bug4315 = '[ruby-core:34833] #7904 [ruby-core:52628] #11613'
     assert_fail_too_long_path(%w"echo |", bug4315)
   end
@@ -2793,7 +2778,9 @@ def test_warmup_frees_pages
 
       Process.warmup
 
-      assert_equal(total_slots_before, GC.stat(:heap_available_slots) + GC.stat(:heap_allocatable_slots))
+      # TODO: flaky
+      # assert_equal(total_slots_before, GC.stat(:heap_available_slots) + GC.stat(:heap_allocatable_slots))
+
       assert_equal(0, GC.stat(:heap_empty_pages))
       assert_operator(GC.stat(:total_freed_pages), :>, 0)
     end;
diff --git a/test/mri/ruby/test_ractor.rb b/test/mri/ruby/test_ractor.rb
new file mode 100644
index 00000000000..6ae511217ac
--- /dev/null
+++ b/test/mri/ruby/test_ractor.rb
@@ -0,0 +1,229 @@
+# frozen_string_literal: false
+require 'test/unit'
+
+class TestRactor < Test::Unit::TestCase
+  def test_shareability_of_iseq_proc
+    assert_raise Ractor::IsolationError do
+      foo = []
+      Ractor.shareable_proc{ foo }
+    end
+  end
+
+  def test_shareability_of_method_proc
+    # TODO: fix with Ractor.shareable_proc/lambda
+=begin
+    str = +""
+
+    x = str.instance_exec { proc { to_s } }
+    assert_unshareable(x, /Proc\'s self is not shareable/)
+
+    x = str.instance_exec { method(:to_s) }
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+
+    x = str.instance_exec { method(:to_s).to_proc }
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+
+    x = str.instance_exec { method(:itself).to_proc }
+    assert_unshareable(x, "can not make shareable object for #<Method: String(Kernel)#itself()>", exception: Ractor::Error)
+
+    str.freeze
+
+    x = str.instance_exec { proc { to_s } }
+    assert_make_shareable(x)
+
+    x = str.instance_exec { method(:to_s) }
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+
+    x = str.instance_exec { method(:to_s).to_proc }
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+
+    x = str.instance_exec { method(:itself).to_proc }
+    assert_unshareable(x, "can not make shareable object for #<Method: String(Kernel)#itself()>", exception: Ractor::Error)
+=end
+  end
+
+  def test_shareability_error_uses_inspect
+    x = (+"").instance_exec { method(:to_s) }
+    def x.to_s
+      raise "this should not be called"
+    end
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()> because it refers unshareable objects", exception: Ractor::Error)
+  end
+
+  def test_default_thread_group
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      Warning[:experimental] = false
+
+      main_ractor_id = Thread.current.group.object_id
+      ractor_id = Ractor.new { Thread.current.group.object_id }.value
+      refute_equal main_ractor_id, ractor_id
+    end;
+  end
+
+  def test_class_instance_variables
+    assert_ractor(<<~'RUBY')
+      # Once we're in multi-ractor mode, the codepaths
+      # for class instance variables are a bit different.
+      Ractor.new {}.value
+
+      class TestClass
+        @a = 1
+        @b = 2
+        @c = 3
+        @d = 4
+      end
+
+      assert_equal 4, TestClass.remove_instance_variable(:@d)
+      assert_nil TestClass.instance_variable_get(:@d)
+      assert_equal 4, TestClass.instance_variable_set(:@d, 4)
+      assert_equal 4, TestClass.instance_variable_get(:@d)
+    RUBY
+  end
+
+  def test_struct_instance_variables
+    assert_ractor(<<~'RUBY')
+      StructIvar = Struct.new(:member) do
+        def initialize(*)
+          super
+          @ivar = "ivar"
+        end
+        attr_reader :ivar
+      end
+      obj = StructIvar.new("member")
+      obj_copy = Ractor.new { Ractor.receive }.send(obj).value
+      assert_equal obj.ivar, obj_copy.ivar
+      refute_same obj.ivar, obj_copy.ivar
+      assert_equal obj.member, obj_copy.member
+      refute_same obj.member, obj_copy.member
+    RUBY
+  end
+
+  def test_move_nested_hash_during_gc_with_yjit
+    assert_ractor(<<~'RUBY', args: [{ "RUBY_YJIT_ENABLE" => "1" }])
+      GC.stress = true
+      hash = { foo: { bar: "hello" }, baz: { qux: "there" } }
+      result = Ractor.new { Ractor.receive }.send(hash, move: true).value
+      assert_equal "hello", result[:foo][:bar]
+      assert_equal "there", result[:baz][:qux]
+    RUBY
+  end
+
+  def test_fork_raise_isolation_error
+    assert_ractor(<<~'RUBY')
+      ractor = Ractor.new do
+        Process.fork
+      rescue Ractor::IsolationError => e
+        e
+      end
+      assert_equal Ractor::IsolationError, ractor.value.class
+    RUBY
+  end if Process.respond_to?(:fork)
+
+  def test_require_raises_and_no_ractor_belonging_issue
+    assert_ractor(<<~'RUBY')
+      require "tempfile"
+      f = Tempfile.new(["file_to_require_from_ractor", ".rb"])
+      f.write("raise 'uh oh'")
+      f.flush
+      err_msg = Ractor.new(f.path) do |path|
+        begin
+          require path
+        rescue RuntimeError => e
+          e.message # had confirm belonging issue here
+        else
+          nil
+        end
+      end.value
+      assert_equal "uh oh", err_msg
+    RUBY
+  end
+
+  def test_require_non_string
+    assert_ractor(<<~'RUBY')
+      require "tempfile"
+      require "pathname"
+      f = Tempfile.new(["file_to_require_from_ractor", ".rb"])
+      f.write("")
+      f.flush
+      result = Ractor.new(f.path) do |path|
+        require Pathname.new(path)
+        "success"
+      end.value
+      assert_equal "success", result
+    RUBY
+  end
+
+  # [Bug #21398]
+  def test_port_receive_dnt_with_port_send
+    omit 'unstable on windows and macos-14' if RUBY_PLATFORM =~ /mswin|mingw|darwin/
+    assert_ractor(<<~'RUBY', timeout: 90)
+      THREADS = 10
+      JOBS_PER_THREAD = 50
+      ARRAY_SIZE = 20_000
+      def ractor_job(job_count, array_size)
+        port = Ractor::Port.new
+        workers = (1..4).map do |i|
+          Ractor.new(port) do |job_port|
+            while job = Ractor.receive
+              result = job.map { |x| x * 2 }.sum
+              job_port.send result
+            end
+          end
+        end
+        jobs = Array.new(job_count) { Array.new(array_size) { rand(1000) } }
+        jobs.each_with_index do |job, i|
+          w_idx = i % 4
+          workers[w_idx].send(job)
+        end
+        results = []
+        jobs.size.times do
+          result = port.receive # dnt receive
+          results << result
+        end
+        results
+      end
+      threads = []
+      # creates 40 ractors (THREADSx4)
+      THREADS.times do
+        threads << Thread.new do
+          ractor_job(JOBS_PER_THREAD, ARRAY_SIZE)
+        end
+      end
+      threads.each(&:join)
+    RUBY
+  end
+
+  # [Bug #20146]
+  def test_max_cpu_1
+    assert_ractor(<<~'RUBY', args: [{ "RUBY_MAX_CPU" => "1" }])
+      assert_equal :ok, Ractor.new { :ok }.value
+    RUBY
+  end
+
+  def test_symbol_proc_is_shareable
+    pr = :symbol.to_proc
+    assert_make_shareable(pr)
+  end
+
+  # [Bug #21775]
+  def test_ifunc_proc_not_shareable
+    h = Hash.new { self }
+    pr = h.to_proc
+    assert_unshareable(pr, /not supported yet/, exception: RuntimeError)
+  end
+
+  def assert_make_shareable(obj)
+    refute Ractor.shareable?(obj), "object was already shareable"
+    Ractor.make_shareable(obj)
+    assert Ractor.shareable?(obj), "object didn't become shareable"
+  end
+
+  def assert_unshareable(obj, msg=nil, exception: Ractor::IsolationError)
+    refute Ractor.shareable?(obj), "object is already shareable"
+    assert_raise_with_message(exception, msg) do
+      Ractor.make_shareable(obj)
+    end
+    refute Ractor.shareable?(obj), "despite raising, object became shareable"
+  end
+end
diff --git a/test/mri/ruby/test_range.rb b/test/mri/ruby/test_range.rb
index 480f213029e..ff17dca69ee 100644
--- a/test/mri/ruby/test_range.rb
+++ b/test/mri/ruby/test_range.rb
@@ -36,6 +36,7 @@ def test_range_string
     assert_equal(["a"], ("a" ... "b").to_a)
     assert_equal(["a", "b"], ("a" .. "b").to_a)
     assert_equal([*"a".."z", "aa"], ("a"..).take(27))
+    assert_equal([*"a".."z"], eval("('a' || 'b')..'z'").to_a)
   end
 
   def test_range_numeric_string
@@ -121,13 +122,15 @@ def test_max
 
     assert_equal([10,9,8], (0..10).max(3))
     assert_equal([9,8,7], (0...10).max(3))
+    assert_equal([10,9,8], (..10).max(3))
+    assert_equal([9,8,7], (...10).max(3))
     assert_raise(RangeError) { (1..).max(3) }
     assert_raise(RangeError) { (1...).max(3) }
 
     assert_raise(RangeError) { (..0).min {|a, b| a <=> b } }
 
     assert_equal(2, (..2).max)
-    assert_raise(TypeError) { (...2).max }
+    assert_equal(1, (...2).max)
     assert_raise(TypeError) { (...2.0).max }
 
     assert_equal(Float::INFINITY, (1..Float::INFINITY).max)
@@ -594,6 +597,22 @@ def test_step_ruby_core_35753
     assert_equal(4, (1.0...5.6).step(1.5).to_a.size)
   end
 
+  def test_step_with_nonnumeric_endpoint
+    num = Data.define(:value) do
+      def coerce(o); [o, 100]; end
+      def <=>(o) value<=>o; end
+      def +(o) with(value: value + o) end
+    end
+    i = num.new(100)
+
+    assert_equal([100], (100..100).step(10).to_a)
+    assert_equal([], (100...100).step(10).to_a)
+    assert_equal([100], (100..i).step(10).to_a)
+    assert_equal([i], (i..100).step(10).to_a)
+    assert_equal([], (100...i).step(10).to_a)
+    assert_equal([], (i...100).step(10).to_a)
+  end
+
   def test_each
     a = []
     (0..10).each {|x| a << x }
@@ -854,16 +873,20 @@ def test_begin_end
   def test_first_last
     assert_equal([0, 1, 2], (0..10).first(3))
     assert_equal([8, 9, 10], (0..10).last(3))
+    assert_equal([8, 9, 10], (nil..10).last(3))
     assert_equal(0, (0..10).first)
     assert_equal(10, (0..10).last)
+    assert_equal(10, (nil..10).last)
     assert_equal("a", ("a".."c").first)
     assert_equal("c", ("a".."c").last)
     assert_equal(0, (2..0).last)
 
     assert_equal([0, 1, 2], (0...10).first(3))
     assert_equal([7, 8, 9], (0...10).last(3))
+    assert_equal([7, 8, 9], (nil...10).last(3))
     assert_equal(0, (0...10).first)
     assert_equal(10, (0...10).last)
+    assert_equal(10, (nil...10).last)
     assert_equal("a", ("a"..."c").first)
     assert_equal("c", ("a"..."c").last)
     assert_equal(0, (2...0).last)
@@ -1435,6 +1458,12 @@ def test_to_a
     assert_raise(RangeError) { (1..).to_a }
   end
 
+  def test_to_set
+    assert_equal(Set[1,2,3,4,5], (1..5).to_set)
+    assert_equal(Set[1,2,3,4], (1...5).to_set)
+    assert_raise(RangeError) { (1..).to_set }
+  end
+
   def test_beginless_range_iteration
     assert_raise(TypeError) { (..1).each { } }
   end
@@ -1491,6 +1520,7 @@ def test_overlap?
     assert_operator((nil..nil), :overlap?, (3..))
     assert_operator((nil...nil), :overlap?, (nil..))
     assert_operator((nil..nil), :overlap?, (..3))
+    assert_operator((..3), :overlap?, (nil..nil))
 
     assert_raise(TypeError) { (1..3).overlap?(1) }
 
diff --git a/test/mri/ruby/test_rational.rb b/test/mri/ruby/test_rational.rb
index 89bb7b20a8c..e0edbde4637 100644
--- a/test/mri/ruby/test_rational.rb
+++ b/test/mri/ruby/test_rational.rb
@@ -117,9 +117,13 @@ def test_conv
     assert_equal(Rational(111, 1000), Rational('1.11e-1'))
     assert_raise(TypeError){Rational(nil)}
     assert_raise(ArgumentError){Rational('')}
-    assert_raise_with_message(ArgumentError, /\u{221a 2668}/) {
-      Rational("\u{221a 2668}")
-    }
+
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(ArgumentError, /\u{221a 2668}/) {
+        Rational("\u{221a 2668}")
+      }
+    end
+
     assert_warning('') {
       assert_predicate(Rational('1e-99999999999999999999'), :zero?)
     }
diff --git a/test/mri/ruby/test_refinement.rb b/test/mri/ruby/test_refinement.rb
index 6ce434790be..209e55294b1 100644
--- a/test/mri/ruby/test_refinement.rb
+++ b/test/mri/ruby/test_refinement.rb
@@ -1933,6 +1933,29 @@ module PublicCows
     end;
   end
 
+  def test_public_in_refine_for_method_in_superclass
+    assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}")
+    begin;
+      bug21446 = '[ruby-core:122558] [Bug #21446]'
+
+      class CowSuper
+        private
+        def moo() "Moo"; end
+      end
+      class Cow < CowSuper
+      end
+
+      module PublicCows
+        refine(Cow) {
+          public :moo
+        }
+      end
+
+      using PublicCows
+      assert_equal("Moo", Cow.new.moo, bug21446)
+    end;
+  end
+
   module SuperToModule
     class Parent
     end
@@ -2712,6 +2735,30 @@ def test
     INPUT
   end
 
+  def test_refined_module_method
+    m = Module.new {
+      x = Module.new {def qux;end}
+      refine(x) {def qux;end}
+      break x
+    }
+    extend m
+    meth = method(:qux)
+    assert_equal m, meth.owner
+    assert_equal :qux, meth.name
+  end
+
+  def test_symbol_proc_from_using_scope
+    # assert_separately to contain the side effects of refining Kernel
+    assert_separately([], <<~RUBY)
+      class RefinedScope
+        using(Module.new { refine(Kernel) { def itself = 0 } })
+        ITSELF = :itself.to_proc
+      end
+
+      assert_equal(1, RefinedScope::ITSELF[1], "[Bug #21265]")
+    RUBY
+  end
+
   private
 
   def eval_using(mod, s)
diff --git a/test/mri/ruby/test_regexp.rb b/test/mri/ruby/test_regexp.rb
index a4e9d7ec8e2..2d7a67dd549 100644
--- a/test/mri/ruby/test_regexp.rb
+++ b/test/mri/ruby/test_regexp.rb
@@ -999,6 +999,18 @@ def test_regsub_K
     assert_equal('foobazquux/foobazquux', result, bug8856)
   end
 
+  def test_regsub_no_memory_leak
+    assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~"end;"}", rss: true)
+      code = proc do
+        "aaaaaaaaaaa".gsub(/a/, "")
+      end
+
+      1_000.times(&code)
+    begin;
+      100_000.times(&code)
+    end;
+  end
+
   def test_ignorecase
     v = assert_deprecated_warning(/variable \$= is no longer effective/) { $= }
     assert_equal(false, v)
@@ -1024,10 +1036,12 @@ def test_match_without_regexp
     [Encoding::UTF_8, Encoding::Shift_JIS, Encoding::EUC_JP].each do |enc|
       idx = key.encode(enc)
       pat = /#{idx}/
-      test.call {|m| assert_raise_with_message(IndexError, pat, bug10877) {m[idx]} }
-      test.call {|m| assert_raise_with_message(IndexError, pat, bug18160) {m.offset(idx)} }
-      test.call {|m| assert_raise_with_message(IndexError, pat, bug18160) {m.begin(idx)} }
-      test.call {|m| assert_raise_with_message(IndexError, pat, bug18160) {m.end(idx)} }
+      EnvUtil.with_default_internal(enc) do
+        test.call {|m| assert_raise_with_message(IndexError, pat, bug10877) {m[idx]} }
+        test.call {|m| assert_raise_with_message(IndexError, pat, bug18160) {m.offset(idx)} }
+        test.call {|m| assert_raise_with_message(IndexError, pat, bug18160) {m.begin(idx)} }
+        test.call {|m| assert_raise_with_message(IndexError, pat, bug18160) {m.end(idx)} }
+      end
     end
     test.call {|m| assert_equal(/a/, m.regexp) }
     test.call {|m| assert_equal("abc", m.string) }
@@ -1296,6 +1310,9 @@ def test_posix_bracket
     assert_match(/\A[[:space:]]+\z/, "\r\n\v\f\r\s\u0085")
     assert_match(/\A[[:ascii:]]+\z/, "\x00\x7F")
     assert_no_match(/[[:ascii:]]/, "\x80\xFF")
+
+    assert_match(/[[:word:]]/, "\u{200C}")
+    assert_match(/[[:word:]]/, "\u{200D}")
   end
 
   def test_cclass_R
@@ -1499,6 +1516,120 @@ def test_unicode_age_15_0
                        "CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF")
   end
 
+  def test_unicode_age_15_1
+    @matches   = %w"15.1"
+    @unmatches = %w"15.0"
+
+    # https://www.unicode.org/Public/15.1.0/ucd/DerivedAge.txt
+    assert_unicode_age("\u{2FFC}".."\u{2FFF}",
+                       "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION")
+    assert_unicode_age("\u{31EF}",
+                       "IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION")
+    assert_unicode_age("\u{2EBF0}".."\u{2EE5D}",
+                       "CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D")
+  end
+
+  def test_unicode_age_16_0
+    @matches   = %w"16.0"
+    @unmatches = %w"15.1"
+
+    # https://www.unicode.org/Public/16.0.0/ucd/DerivedAge.txt
+    assert_unicode_age("\u{0897}",
+                       "ARABIC PEPET")
+    assert_unicode_age("\u{1B4E}".."\u{1B4F}",
+                       "BALINESE INVERTED CARIK SIKI..BALINESE INVERTED CARIK PAREREN")
+    assert_unicode_age("\u{1B7F}",
+                       "BALINESE PANTI BAWAK")
+    assert_unicode_age("\u{1C89}".."\u{1C8A}",
+                       "CYRILLIC CAPITAL LETTER TJE..CYRILLIC SMALL LETTER TJE")
+    assert_unicode_age("\u{2427}".."\u{2429}",
+                       "SYMBOL FOR DELETE SQUARE CHECKER BOARD FORM..SYMBOL FOR DELETE MEDIUM SHADE FORM")
+    assert_unicode_age("\u{31E4}".."\u{31E5}",
+                       "CJK STROKE HXG..CJK STROKE SZP")
+    assert_unicode_age("\u{A7CB}".."\u{A7CD}",
+                       "LATIN CAPITAL LETTER RAMS HORN..LATIN SMALL LETTER S WITH DIAGONAL STROKE")
+    assert_unicode_age("\u{A7DA}".."\u{A7DC}",
+                       "LATIN CAPITAL LETTER LAMBDA..LATIN CAPITAL LETTER LAMBDA WITH STROKE")
+    assert_unicode_age("\u{105C0}".."\u{105F3}",
+                       "TODHRI LETTER A..TODHRI LETTER OO")
+    assert_unicode_age("\u{10D40}".."\u{10D65}",
+                       "GARAY DIGIT ZERO..GARAY CAPITAL LETTER OLD NA")
+    assert_unicode_age("\u{10D69}".."\u{10D85}",
+                       "GARAY VOWEL SIGN E..GARAY SMALL LETTER OLD NA")
+    assert_unicode_age("\u{10D8E}".."\u{10D8F}",
+                       "GARAY PLUS SIGN..GARAY MINUS SIGN")
+    assert_unicode_age("\u{10EC2}".."\u{10EC4}",
+                       "ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW")
+    assert_unicode_age("\u{10EFC}",
+                       "ARABIC COMBINING ALEF OVERLAY")
+    assert_unicode_age("\u{11380}".."\u{11389}",
+                       "TULU-TIGALARI LETTER A..TULU-TIGALARI LETTER VOCALIC LL")
+    assert_unicode_age("\u{1138B}",
+                       "TULU-TIGALARI LETTER EE")
+    assert_unicode_age("\u{1138E}",
+                       "TULU-TIGALARI LETTER AI")
+    assert_unicode_age("\u{11390}".."\u{113B5}",
+                       "TULU-TIGALARI LETTER OO..TULU-TIGALARI LETTER LLLA")
+    assert_unicode_age("\u{113B7}".."\u{113C0}",
+                       "TULU-TIGALARI SIGN AVAGRAHA..TULU-TIGALARI VOWEL SIGN VOCALIC LL")
+    assert_unicode_age("\u{113C2}",
+                       "TULU-TIGALARI VOWEL SIGN EE")
+    assert_unicode_age("\u{113C5}",
+                       "TULU-TIGALARI VOWEL SIGN AI")
+    assert_unicode_age("\u{113C7}".."\u{113CA}",
+                       "TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI SIGN CANDRA ANUNASIKA")
+    assert_unicode_age("\u{113CC}".."\u{113D5}",
+                       "TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI DOUBLE DANDA")
+    assert_unicode_age("\u{113D7}".."\u{113D8}",
+                       "TULU-TIGALARI SIGN OM PUSHPIKA..TULU-TIGALARI SIGN SHRII PUSHPIKA")
+    assert_unicode_age("\u{113E1}".."\u{113E2}",
+                       "TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA")
+    assert_unicode_age("\u{116D0}".."\u{116E3}",
+                       "MYANMAR PAO DIGIT ZERO..MYANMAR EASTERN PWO KAREN DIGIT NINE")
+    assert_unicode_age("\u{11BC0}".."\u{11BE1}",
+                       "SUNUWAR LETTER DEVI..SUNUWAR SIGN PVO")
+    assert_unicode_age("\u{11BF0}".."\u{11BF9}",
+                       "SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE")
+    assert_unicode_age("\u{11F5A}",
+                       "KAWI SIGN NUKTA")
+    assert_unicode_age("\u{13460}".."\u{143FA}",
+                       "EGYPTIAN HIEROGLYPH-13460..EGYPTIAN HIEROGLYPH-143FA")
+    assert_unicode_age("\u{16100}".."\u{16139}",
+                       "GURUNG KHEMA LETTER A..GURUNG KHEMA DIGIT NINE")
+    assert_unicode_age("\u{16D40}".."\u{16D79}",
+                       "KIRAT RAI SIGN ANUSVARA..KIRAT RAI DIGIT NINE")
+    assert_unicode_age("\u{18CFF}",
+                       "KHITAN SMALL SCRIPT CHARACTER-18CFF")
+    assert_unicode_age("\u{1CC00}".."\u{1CCF9}",
+                       "UP-POINTING GO-KART..OUTLINED DIGIT NINE")
+    assert_unicode_age("\u{1CD00}".."\u{1CEB3}",
+                       "BLOCK OCTANT-3..BLACK RIGHT TRIANGLE CARET")
+    assert_unicode_age("\u{1E5D0}".."\u{1E5FA}",
+                       "OL ONAL LETTER O..OL ONAL DIGIT NINE")
+    assert_unicode_age("\u{1E5FF}",
+                       "OL ONAL ABBREVIATION SIGN")
+    assert_unicode_age("\u{1F8B2}".."\u{1F8BB}",
+                       "RIGHTWARDS ARROW WITH LOWER HOOK..SOUTH WEST ARROW FROM BAR")
+    assert_unicode_age("\u{1F8C0}".."\u{1F8C1}",
+                       "LEFTWARDS ARROW FROM DOWNWARDS ARROW..RIGHTWARDS ARROW FROM DOWNWARDS ARROW")
+    assert_unicode_age("\u{1FA89}",
+                       "HARP")
+    assert_unicode_age("\u{1FA8F}",
+                       "SHOVEL")
+    assert_unicode_age("\u{1FABE}",
+                       "LEAFLESS TREE")
+    assert_unicode_age("\u{1FAC6}",
+                       "FINGERPRINT")
+    assert_unicode_age("\u{1FADC}",
+                       "ROOT VEGETABLE")
+    assert_unicode_age("\u{1FADF}",
+                       "SPLATTER")
+    assert_unicode_age("\u{1FAE9}",
+                       "FACE WITH BAGS UNDER EYES")
+    assert_unicode_age("\u{1FBCB}".."\u{1FBEF}",
+                       "WHITE CROSS MARK..TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE")
+  end
+
   UnicodeAgeRegexps = Hash.new do |h, age|
     h[age] = [/\A\p{age=#{age}}+\z/u, /\A\P{age=#{age}}+\z/u].freeze
   end
@@ -1612,6 +1743,33 @@ def test_conditional_expression
     assert_raise(RegexpError, bug12418){ Regexp.new('(0?0|(?(5)||)|(?(5)||))?') }
   end
 
+  def test_quick_search
+    assert_match_at('(?i) *TOOKY', 'Mozilla/5.0 (Linux; Android 4.0.3; TOOKY', [[34, 40]])   # Issue #120
+  end
+
+  def test_ss_in_look_behind
+    assert_match_at("(?i:ss)", "ss", [[0, 2]])
+    assert_match_at("(?i:ss)", "Ss", [[0, 2]])
+    assert_match_at("(?i:ss)", "SS", [[0, 2]])
+    assert_match_at("(?i:ss)", "\u017fS", [[0, 2]])  # LATIN SMALL LETTER LONG S
+    assert_match_at("(?i:ss)", "s\u017f", [[0, 2]])
+    assert_match_at("(?i:ss)", "\u00df", [[0, 1]])   # LATIN SMALL LETTER SHARP S
+    assert_match_at("(?i:ss)", "\u1e9e", [[0, 1]])   # LATIN CAPITAL LETTER SHARP S
+    assert_match_at("(?i:xssy)", "xssy", [[0, 4]])
+    assert_match_at("(?i:xssy)", "xSsy", [[0, 4]])
+    assert_match_at("(?i:xssy)", "xSSy", [[0, 4]])
+    assert_match_at("(?i:xssy)", "x\u017fSy", [[0, 4]])
+    assert_match_at("(?i:xssy)", "xs\u017fy", [[0, 4]])
+    assert_match_at("(?i:xssy)", "x\u00dfy", [[0, 3]])
+    assert_match_at("(?i:xssy)", "x\u1e9ey", [[0, 3]])
+    assert_match_at("(?i:\u00df)", "ss", [[0, 2]])
+    assert_match_at("(?i:\u00df)", "SS", [[0, 2]])
+    assert_match_at("(?i:[\u00df])", "ss", [[0, 2]])
+    assert_match_at("(?i:[\u00df])", "SS", [[0, 2]])
+    assert_match_at("(?i)(?<!ss)\u2728", "qq\u2728", [[2, 3]])     # Issue #92
+    assert_match_at("(?i)(?<!xss)\u2728", "qq\u2728", [[2, 3]])
+  end
+
   def test_options_in_look_behind
     assert_nothing_raised {
       assert_match_at("(?<=(?i)ab)cd", "ABcd", [[2,4]])
@@ -1749,6 +1907,12 @@ def test_invalid_group
     end;
   end
 
+  def test_too_big_number_for_repeat_range
+    assert_raise_with_message(SyntaxError, /too big number for repeat range/) do
+      eval(%[/|{1000000}/])
+    end
+  end
+
   # This assertion is for porting x2() tests in testpy.py of Onigmo.
   def assert_match_at(re, str, positions, msg = nil)
     re = Regexp.new(re) unless re.is_a?(Regexp)
@@ -1853,7 +2017,7 @@ def test_bug_20886
   end
 
   def per_instance_redos_test(global_timeout, per_instance_timeout, expected_timeout)
-    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}", timeout: 60)
       global_timeout = #{ EnvUtil.apply_timeout_scale(global_timeout).inspect }
       per_instance_timeout = #{ (per_instance_timeout ? EnvUtil.apply_timeout_scale(per_instance_timeout) : nil).inspect }
       expected_timeout = #{ EnvUtil.apply_timeout_scale(expected_timeout).inspect }
@@ -1971,7 +2135,7 @@ def test_match_cache_positive_look_ahead
   end
 
   def test_match_cache_positive_look_ahead_complex
-    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}", timeout: 30)
       timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
     begin;
        Regexp.timeout = timeout
@@ -2114,4 +2278,17 @@ def test_linear_performance
       re =~ s
     end
   end
+
+  def test_bug_16145_and_bug_21176_caseinsensitive_small # [Bug#16145] [Bug#21176]
+    encodings = [Encoding::UTF_8, Encoding::ISO_8859_1]
+    encodings.each do |enc|
+      o_acute_lower = "\u00F3".encode(enc)
+      o_acute_upper = "\u00D3".encode(enc)
+      assert_match(/[x#{o_acute_lower}]/i, "abc#{o_acute_upper}", "should match o acute case insensitive")
+
+      e_acute_lower = "\u00E9".encode(enc)
+      e_acute_upper = "\u00C9".encode(enc)
+      assert_match(/[x#{e_acute_lower}]/i, "CAF#{e_acute_upper}", "should match e acute case insensitive")
+    end
+  end
 end
diff --git a/test/mri/ruby/test_require.rb b/test/mri/ruby/test_require.rb
index 5aadf779fba..bbec9a5f954 100644
--- a/test/mri/ruby/test_require.rb
+++ b/test/mri/ruby/test_require.rb
@@ -532,7 +532,7 @@ def test_relative_symlink_realpath
 
   def test_frozen_loaded_features
     bug3756 = '[ruby-core:31913]'
-    assert_in_out_err(['-e', '$LOADED_FEATURES.freeze; require "ostruct"'], "",
+    assert_in_out_err(['-e', '$LOADED_FEATURES.freeze; require "erb"'], "",
                       [], /\$LOADED_FEATURES is frozen; cannot append feature \(RuntimeError\)$/,
                       bug3756)
   end
@@ -840,6 +840,36 @@ def test_require_with_loaded_features_pop
         p :ok
       end;
     }
+
+    # [Bug #21567]
+    assert_separately(%w[-rtempfile], "#{<<~"begin;"}\n#{<<~"end;"}")
+    begin;
+      class MyString
+        def initialize(path)
+          @path = path
+        end
+
+        def to_str
+          $LOADED_FEATURES.clear
+          @path
+        end
+
+        def to_path = @path
+      end
+
+      FILES = []
+
+      def create_ruby_file
+        file = Tempfile.open(["test", ".rb"])
+        FILES << file
+        file.path
+      end
+
+      require MyString.new(create_ruby_file)
+      $LOADED_FEATURES.unshift(create_ruby_file)
+      $LOADED_FEATURES << MyString.new(create_ruby_file)
+      require create_ruby_file
+    end;
   end
 
   def test_loading_fifo_threading_raise
@@ -1011,4 +1041,18 @@ class Object
       end
     RUBY
   end
+
+  def test_bug_21568
+    load_path = $LOAD_PATH.dup
+    loaded_featrures = $LOADED_FEATURES.dup
+
+    $LOAD_PATH.clear
+    $LOADED_FEATURES.replace(["foo.so", "a/foo.rb", "b/foo.rb"])
+
+    assert_nothing_raised(LoadError) { require "foo" }
+
+  ensure
+    $LOAD_PATH.replace(load_path) if load_path
+    $LOADED_FEATURES.replace loaded_featrures
+  end
 end
diff --git a/test/mri/ruby/test_require_lib.rb b/test/mri/ruby/test_require_lib.rb
index 740d1ffed54..44dfbcf9ec2 100644
--- a/test/mri/ruby/test_require_lib.rb
+++ b/test/mri/ruby/test_require_lib.rb
@@ -2,8 +2,7 @@
 require 'test/unit'
 
 class TestRequireLib < Test::Unit::TestCase
-  # Modified for JRuby
-  libdir = __dir__ + '/../../../lib/ruby/stdlib'
+  libdir = __dir__ + '/../../lib'
 
   # .rb files at lib
   scripts = Dir.glob('*.rb', base: libdir).map {|f| f.chomp('.rb')}
@@ -14,11 +13,11 @@ class TestRequireLib < Test::Unit::TestCase
   scripts.concat(Dir.glob(dirs.map {|d| d + '/*.rb'}, base: libdir).map {|f| f.chomp('.rb')})
 
   # skip some problems
-  scripts -= %w[bundler bundled_gems rubygems mkmf]
+  scripts -= %w[bundler bundled_gems rubygems mkmf set/sorted_set]
 
   scripts.each do |lib|
     define_method "test_thread_size:#{lib}" do
-      assert_separately(['-W0'], "#{<<~"begin;"}\n#{<<~"end;"}")
+      assert_separately(['-W0'], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 60)
       begin;
         n = Thread.list.size
         require #{lib.dump}
diff --git a/test/mri/ruby/test_rubyoptions.rb b/test/mri/ruby/test_rubyoptions.rb
index ac4b5870eb5..735d2681fb6 100644
--- a/test/mri/ruby/test_rubyoptions.rb
+++ b/test/mri/ruby/test_rubyoptions.rb
@@ -8,9 +8,6 @@
 require_relative '../lib/parser_support'
 
 class TestRubyOptions < Test::Unit::TestCase
-  def self.rjit_enabled? = defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-  def self.yjit_enabled? = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
-
   # Here we're defining our own RUBY_DESCRIPTION without "+PRISM". We do this
   # here so that the various tests that reference RUBY_DESCRIPTION don't have to
   # worry about it. The flag itself is tested in its own test.
@@ -22,10 +19,11 @@ def self.yjit_enabled? = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
     end
 
   NO_JIT_DESCRIPTION =
-    if rjit_enabled?
-      RUBY_DESCRIPTION.sub(/\+RJIT /, '')
-    elsif yjit_enabled?
-      RUBY_DESCRIPTION.sub(/\+YJIT( (dev|dev_nodebug|stats))? /, '')
+    case
+    when JITSupport.yjit_enabled?
+      RUBY_DESCRIPTION.sub(/\+YJIT( \w+)? /, '')
+    when JITSupport.zjit_enabled?
+      RUBY_DESCRIPTION.sub(/\+ZJIT( \w+)? /, '')
     else
       RUBY_DESCRIPTION
     end
@@ -173,21 +171,10 @@ def test_debug
     end
   private_constant :VERSION_PATTERN
 
-  VERSION_PATTERN_WITH_RJIT =
-    case RUBY_ENGINE
-    when 'ruby'
-      /^ruby #{q[RUBY_VERSION]}(?:[p ]|dev|rc).*? \+RJIT (\+MN )?(\+PRISM )?(\+GC)?(\[\w+\]\s|\s)?\[#{q[RUBY_PLATFORM]}\]$/
-    else
-      VERSION_PATTERN
-    end
-  private_constant :VERSION_PATTERN_WITH_RJIT
-
   def test_verbose
     assert_in_out_err([{'RUBY_YJIT_ENABLE' => nil}, "-vve", ""]) do |r, e|
       assert_match(VERSION_PATTERN, r[0])
-      if self.class.rjit_enabled? && !JITSupport.rjit_force_enabled?
-        assert_equal(NO_JIT_DESCRIPTION, r[0])
-      elsif self.class.yjit_enabled? && !JITSupport.yjit_force_enabled?
+      if (JITSupport.yjit_enabled? && !JITSupport.yjit_force_enabled?) || JITSupport.zjit_enabled?
         assert_equal(NO_JIT_DESCRIPTION, r[0])
       else
         assert_equal(RUBY_DESCRIPTION, r[0])
@@ -212,15 +199,12 @@ def test_enable
       assert_in_out_err(%w(--enable all -e) + [""], "", [], [])
       assert_in_out_err(%w(--enable-all -e) + [""], "", [], [])
       assert_in_out_err(%w(--enable=all -e) + [""], "", [], [])
-    elsif JITSupport.rjit_supported?
-      # Avoid failing tests by RJIT warnings
-      assert_in_out_err(%w(--enable all --disable rjit -e) + [""], "", [], [])
-      assert_in_out_err(%w(--enable-all --disable-rjit -e) + [""], "", [], [])
-      assert_in_out_err(%w(--enable=all --disable=rjit -e) + [""], "", [], [])
     end
     assert_in_out_err(%w(--enable foobarbazqux -e) + [""], "", [],
                       /unknown argument for --enable: 'foobarbazqux'/)
     assert_in_out_err(%w(--enable), "", [], /missing argument for --enable/)
+    assert_in_out_err(%w(-e) + ['p defined? Gem'], "", %w["constant"], [], gems: true)
+    assert_in_out_err(%w(-e) + ['p defined? Gem'], "", %w["constant"], [], gems: nil)
   end
 
   def test_disable
@@ -230,7 +214,7 @@ def test_disable
     assert_in_out_err(%w(--disable foobarbazqux -e) + [""], "", [],
                       /unknown argument for --disable: 'foobarbazqux'/)
     assert_in_out_err(%w(--disable), "", [], /missing argument for --disable/)
-    assert_in_out_err(%w(-e) + ['p defined? Gem'], "", ["nil"], [])
+    assert_in_out_err(%w(-e) + ['p defined? Gem'], "", ["nil"], [], gems: false)
     assert_in_out_err(%w(--disable-did_you_mean -e) + ['p defined? DidYouMean'], "", ["nil"], [])
     assert_in_out_err(%w(-e) + ['p defined? DidYouMean'], "", ["nil"], [])
   end
@@ -258,7 +242,7 @@ def test_version
       assert_match(VERSION_PATTERN, r[0])
       if ENV['RUBY_YJIT_ENABLE'] == '1'
         assert_equal(NO_JIT_DESCRIPTION, r[0])
-      elsif self.class.rjit_enabled? || self.class.yjit_enabled? # checking -D(M|Y)JIT_FORCE_ENABLE
+      elsif JITSupport.yjit_enabled? || JITSupport.zjit_enabled? # checking -DYJIT_FORCE_ENABLE
         assert_equal(EnvUtil.invoke_ruby(['-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0])
       else
         assert_equal(RUBY_DESCRIPTION, r[0])
@@ -267,46 +251,6 @@ def test_version
     end
   end
 
-  def test_rjit_disabled_version
-    return unless JITSupport.rjit_supported?
-    return if JITSupport.yjit_force_enabled?
-
-    env = { 'RUBY_YJIT_ENABLE' => nil } # unset in children
-    [
-      %w(--version --rjit --disable=rjit),
-      %w(--version --enable=rjit --disable=rjit),
-      %w(--version --enable-rjit --disable-rjit),
-    ].each do |args|
-      assert_in_out_err([env] + args) do |r, e|
-        assert_match(VERSION_PATTERN, r[0])
-        assert_match(NO_JIT_DESCRIPTION, r[0])
-        assert_equal([], e)
-      end
-    end
-  end
-
-  def test_rjit_version
-    return unless JITSupport.rjit_supported?
-    return if JITSupport.yjit_force_enabled?
-
-    env = { 'RUBY_YJIT_ENABLE' => nil } # unset in children
-    [
-      %w(--version --rjit),
-      %w(--version --enable=rjit),
-      %w(--version --enable-rjit),
-    ].each do |args|
-      assert_in_out_err([env] + args) do |r, e|
-        assert_match(VERSION_PATTERN_WITH_RJIT, r[0])
-        if JITSupport.rjit_force_enabled?
-          assert_equal(RUBY_DESCRIPTION, r[0])
-        else
-          assert_equal(EnvUtil.invoke_ruby([env, '--rjit', '-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0])
-        end
-        assert_equal([], e)
-      end
-    end
-  end
-
   def test_enabled_gc
     omit unless /linux|darwin/ =~ RUBY_PLATFORM
 
@@ -318,6 +262,8 @@ def test_enabled_gc
   end
 
   def test_parser_flag
+    omit if ENV["RUBYOPT"]&.include?("--parser=")
+
     assert_in_out_err(%w(--parser=prism -e) + ["puts :hi"], "", %w(hi), [])
     assert_in_out_err(%w(--parser=prism --dump=parsetree -e _=:hi), "", /"hi"/, [])
 
@@ -441,11 +387,15 @@ def test_invalid_option
 
     assert_in_out_err(%W(-\r -e) + [""], "", [], [])
 
-    assert_in_out_err(%W(-\rx), "", [], /invalid option -[\r\n]  \(-h will show valid options\) \(RuntimeError\)/)
+    assert_in_out_err(%W(-\rx), "", [], /invalid option -\\r  \(-h will show valid options\) \(RuntimeError\)/)
 
-    assert_in_out_err(%W(-\x01), "", [], /invalid option -\x01  \(-h will show valid options\) \(RuntimeError\)/)
+    assert_in_out_err(%W(-\x01), "", [], /invalid option -\\x01  \(-h will show valid options\) \(RuntimeError\)/)
 
     assert_in_out_err(%w(-Z), "", [], /invalid option -Z  \(-h will show valid options\) \(RuntimeError\)/)
+
+    assert_in_out_err(%W(-\u{1f608}), "", [],
+                      /invalid option -(\\xf0|\u{1f608})  \(-h will show valid options\) \(RuntimeError\)/,
+                      encoding: Encoding::UTF_8)
   end
 
   def test_rubyopt
@@ -573,6 +523,8 @@ def test_sflag
 
     assert_in_out_err(%w(- -#=foo), "#!ruby -s\n", [],
                       /invalid name for global variable - -# \(NameError\)/)
+
+    assert_in_out_err(['-s', '-e', 'GC.start; p $DEBUG', '--', '-DEBUG=x'], "", ['"x"'])
   end
 
   def test_option_missing_argument
@@ -839,14 +791,22 @@ module SEGVTest
     unless /mswin|mingw/ =~ RUBY_PLATFORM
       opts[:rlimit_core] = 0
     end
+    opts[:failed] = proc do |status, message = "", out = ""|
+      if (sig = status.termsig) && Signal.list["SEGV"] == sig
+        out = ""
+      end
+      Test::Unit::CoreAssertions::FailDesc[status, message]
+    end
     ExecOptions = opts.freeze
 
+    # The regexp list that should match the entire stderr output.
+    # see assert_pattern_list
     ExpectedStderrList = [
       %r(
-        -e:(?:1:)?\s\[BUG\]\sSegmentation\sfault.*\n
+        (?:-e:(?:1:)?\s)?\[BUG\]\sSegmentation\sfault.*\n
       )x,
       %r(
-        #{ Regexp.quote((TestRubyOptions.rjit_enabled? && !JITSupport.rjit_force_enabled?) ? NO_JIT_DESCRIPTION : RUBY_DESCRIPTION) }\n\n
+        #{ Regexp.quote(RUBY_DESCRIPTION) }\n\n
       )x,
       %r(
         (?:--\s(?:.+\n)*\n)?
@@ -886,20 +846,24 @@ module SEGVTest
   end
 
   def assert_segv(args, message=nil, list: SEGVTest::ExpectedStderrList, **opt, &block)
-    pend "macOS 15 is not working with this assertion" if macos?(15)
-
     # We want YJIT to be enabled in the subprocess if it's enabled for us
     # so that the Ruby description matches.
     env = Hash === args.first ? args.shift : {}
-    args.unshift("--yjit") if self.class.yjit_enabled?
+    args.unshift("--yjit") if JITSupport.yjit_enabled?
+    args.unshift("--zjit") if JITSupport.zjit_enabled?
     env.update({'RUBY_ON_BUG' => nil})
+    env['RUBY_CRASH_REPORT'] ||= nil # default to not passing down parent setting
     # ASAN registers a segv handler which prints out "AddressSanitizer: DEADLYSIGNAL" when
     # catching sigsegv; we don't expect that output, so suppress it.
-    env.update({'ASAN_OPTIONS' => 'handle_segv=0'})
+    env.update({'ASAN_OPTIONS' => 'handle_segv=0', 'LSAN_OPTIONS' => 'handle_segv=0'})
     args.unshift(env)
 
     test_stdin = ""
-    tests = [//, list] unless block
+    if !block
+      tests = [//, list, message]
+    elsif message
+      tests = [[], [], message]
+    end
 
     assert_in_out_err(args, test_stdin, *tests, encoding: "ASCII-8BIT",
                       **SEGVTest::ExecOptions, **opt, &block)
@@ -912,13 +876,12 @@ def test_segv_test
   def test_segv_loaded_features
     bug7402 = '[ruby-core:49573]'
 
-    status = assert_segv(['-e', "END {#{SEGVTest::KILL_SELF}}",
-                          '-e', 'class Bogus; def to_str; exit true; end; end',
-                          '-e', '$".clear',
-                          '-e', '$".unshift Bogus.new',
-                          '-e', '(p $"; abort) unless $".size == 1',
-                         ])
-    assert_not_predicate(status, :success?, "segv but success #{bug7402}")
+    assert_segv(['-e', "END {#{SEGVTest::KILL_SELF}}",
+                 '-e', 'class Bogus; def to_str; exit true; end; end',
+                 '-e', '$".clear',
+                 '-e', '$".unshift Bogus.new',
+                 '-e', '(p $"; abort) unless $".size == 1',
+                ], bug7402, success: false)
   end
 
   def test_segv_setproctitle
@@ -931,8 +894,6 @@ def test_segv_setproctitle
   end
 
   def assert_crash_report(path, cmd = nil, &block)
-    pend "macOS 15 is not working with this assertion" if macos?(15)
-
     Dir.mktmpdir("ruby_crash_report") do |dir|
       list = SEGVTest::ExpectedStderrList
       if cmd
@@ -986,6 +947,27 @@ def test_crash_report_pipe
     end
   end
 
+  def test_crash_report_pipe_script
+    omit "only runs on Linux" unless RUBY_PLATFORM.include?("linux")
+
+    Tempfile.create(["script", ".sh"]) do |script|
+      Tempfile.create("crash_report") do |crash_report|
+        script.write(<<~BASH)
+          #!/usr/bin/env bash
+
+          cat > #{crash_report.path}
+        BASH
+        script.close
+
+        FileUtils.chmod("+x", script)
+
+        assert_crash_report("| #{script.path}") do
+          assert_include(File.read(crash_report.path), "[BUG] Segmentation fault at")
+        end
+      end
+    end
+  end
+
   def test_DATA
     Tempfile.create(["test_ruby_test_rubyoption", ".rb"]) {|t|
       t.puts "puts DATA.read.inspect"
@@ -1032,7 +1014,7 @@ def test_script_from_stdin
           pid = spawn(EnvUtil.rubybin, :in => s, :out => w)
           w.close
           assert_nothing_raised('[ruby-dev:37798]') do
-            result = EnvUtil.timeout(3) {r.read}
+            result = EnvUtil.timeout(10) {r.read}
           end
           Process.wait pid
         }
@@ -1328,17 +1310,12 @@ def test_free_at_exit_env_var
   end
 
   def test_toplevel_ruby
-    reserved = ["", [], /::Ruby is reserved/]
-    env = {"RUBYOPT"=>""}
-    args = %w[-e Ruby=1]
-    assert_in_out_err([env, *args])
-    assert_in_out_err([env, "-w", *args], *reserved)
-    assert_in_out_err([env, "-W:deprecated", *args], *reserved)
-    assert_in_out_err([env, "-w", "-W:no-deprecated", *args])
-
-    args = ["-e", "class A; Ruby=1; end"]
-    assert_in_out_err([env, *args])
-    assert_in_out_err([env, "-w", *args])
-    assert_in_out_err([env, "-W:deprecated", *args])
+    assert_instance_of Module, ::Ruby
+  end
+
+  def test_ruby_patchlevel
+    # We stopped bumping RUBY_PATCHLEVEL at Ruby 4.0.0.
+    # Released versions have RUBY_PATCHLEVEL 0, and un-released versions have -1.
+    assert_include [-1, 0], RUBY_PATCHLEVEL
   end
 end
diff --git a/test/mri/set/test_set.rb b/test/mri/ruby/test_set.rb
similarity index 82%
rename from test/mri/set/test_set.rb
rename to test/mri/ruby/test_set.rb
index 565946096ee..70a61aa3b5d 100644
--- a/test/mri/set/test_set.rb
+++ b/test/mri/ruby/test_set.rb
@@ -3,7 +3,36 @@
 require 'set'
 
 class TC_Set < Test::Unit::TestCase
-  class Set2 < Set
+  class SetSubclass < Set
+  end
+  class CoreSetSubclass < Set::CoreSet
+  end
+  ALL_SET_CLASSES = [Set, SetSubclass, CoreSetSubclass].freeze
+
+  def test_marshal
+    set = Set[1, 2, 3]
+    mset = Marshal.load(Marshal.dump(set))
+    assert_equal(set, mset)
+    assert_equal(set.compare_by_identity?, mset.compare_by_identity?)
+
+    set.compare_by_identity
+    mset = Marshal.load(Marshal.dump(set))
+    assert_equal(set, mset)
+    assert_equal(set.compare_by_identity?, mset.compare_by_identity?)
+
+    set.instance_variable_set(:@a, 1)
+    mset = Marshal.load(Marshal.dump(set))
+    assert_equal(set, mset)
+    assert_equal(set.compare_by_identity?, mset.compare_by_identity?)
+    assert_equal(1, mset.instance_variable_get(:@a))
+
+    old_stdlib_set_data = "\x04\bo:\bSet\x06:\n@hash}\bi\x06Ti\aTi\bTF".b
+    set = Marshal.load(old_stdlib_set_data)
+    assert_equal(Set[1, 2, 3], set)
+
+    old_stdlib_set_cbi_data = "\x04\bo:\bSet\x06:\n@hashC:\tHash}\ai\x06Ti\aTF".b
+    set = Marshal.load(old_stdlib_set_cbi_data)
+    assert_equal(Set[1, 2].compare_by_identity, set)
   end
 
   def test_aref
@@ -103,6 +132,12 @@ def test_replace
     assert_same(set, ret)
     assert_equal(Set['a','b','c'], set)
 
+    set = Set[1,2]
+    ret = set.replace(Set.new('a'..'c'))
+
+    assert_same(set, ret)
+    assert_equal(Set['a','b','c'], set)
+
     set = Set[1,2]
     assert_raise(ArgumentError) {
       set.replace(3)
@@ -232,7 +267,7 @@ def test_superset?
       set.superset?([2])
     }
 
-    [Set, Set2].each { |klass|
+    ALL_SET_CLASSES.each { |klass|
       assert_equal(true, set.superset?(klass[]), klass.name)
       assert_equal(true, set.superset?(klass[1,2]), klass.name)
       assert_equal(true, set.superset?(klass[1,2,3]), klass.name)
@@ -261,7 +296,7 @@ def test_proper_superset?
       set.proper_superset?([2])
     }
 
-    [Set, Set2].each { |klass|
+    ALL_SET_CLASSES.each { |klass|
       assert_equal(true, set.proper_superset?(klass[]), klass.name)
       assert_equal(true, set.proper_superset?(klass[1,2]), klass.name)
       assert_equal(false, set.proper_superset?(klass[1,2,3]), klass.name)
@@ -290,7 +325,7 @@ def test_subset?
       set.subset?([2])
     }
 
-    [Set, Set2].each { |klass|
+    ALL_SET_CLASSES.each { |klass|
       assert_equal(true, set.subset?(klass[1,2,3,4]), klass.name)
       assert_equal(true, set.subset?(klass[1,2,3]), klass.name)
       assert_equal(false, set.subset?(klass[1,2]), klass.name)
@@ -319,7 +354,7 @@ def test_proper_subset?
       set.proper_subset?([2])
     }
 
-    [Set, Set2].each { |klass|
+    ALL_SET_CLASSES.each { |klass|
       assert_equal(true, set.proper_subset?(klass[1,2,3,4]), klass.name)
       assert_equal(false, set.proper_subset?(klass[1,2,3]), klass.name)
       assert_equal(false, set.proper_subset?(klass[1,2]), klass.name)
@@ -339,7 +374,7 @@ def test_spacecraft_operator
 
     assert_nil(set <=> set.to_a)
 
-    [Set, Set2].each { |klass|
+    ALL_SET_CLASSES.each { |klass|
       assert_equal(-1,  set <=> klass[1,2,3,4], klass.name)
       assert_equal( 0,  set <=> klass[3,2,1]  , klass.name)
       assert_equal(nil, set <=> klass[1,2,4]  , klass.name)
@@ -606,6 +641,22 @@ def test_merge
     }
   end
 
+  def test_merge_mutating_hash_bug_21305
+    a = (1..100).to_a
+    o = Object.new
+    o.define_singleton_method(:hash) do
+      a.clear
+      0
+    end
+    a.unshift o
+    assert_equal([o], Set.new.merge(a).to_a)
+  end
+
+  def test_initialize_mutating_array_bug_21306
+    a = (1..100).to_a
+    assert_equal(Set[0], Set.new(a){a.clear; 0})
+  end
+
   def test_subtract
     set = Set[1,2,3]
 
@@ -639,15 +690,28 @@ def test_and
   end
 
   def test_xor
-    set = Set[1,2,3,4]
-    ret = set ^ [2,4,5,5]
-    assert_not_same(set, ret)
-    assert_equal(Set[1,3,5], ret)
+    ALL_SET_CLASSES.each { |klass|
+      set = klass[1,2,3,4]
+      ret = set ^ [2,4,5,5]
+      assert_not_same(set, ret)
+      assert_equal(klass[1,3,5], ret)
+
+      set2 = klass[1,2,3,4]
+      ret2 = set2 ^ [2,4,5,5]
+      assert_instance_of(klass, ret2)
+      assert_equal(klass[1,3,5], ret2)
+    }
+  end
+
+  def test_xor_does_not_mutate_other_set
+    a = Set[1]
+    b = Set[1, 2]
+    original_b = b.dup
 
-    set2 = Set2[1,2,3,4]
-    ret2 = set2 ^ [2,4,5,5]
-    assert_instance_of(Set2, ret2)
-    assert_equal(Set2[1,3,5], ret2)
+    result = a ^ b
+
+    assert_equal(original_b, b)
+    assert_equal(Set[2], result)
   end
 
   def test_eq
@@ -733,6 +797,10 @@ def test_divide
     ret.each { |s| n += s.size }
     assert_equal(set.size, n)
     assert_equal(set, ret.flatten)
+
+    set = Set[2,12,9,11,13,4,10,15,3,8,5,0,1,7,14]
+    ret = set.divide { |a,b| (a - b).abs == 1 }
+    assert_equal(2, ret.size)
   end
 
   def test_freeze
@@ -787,24 +855,32 @@ def test_join
 
   def test_inspect
     set1 = Set[1, 2]
-    assert_equal('#<Set: {1, 2}>', set1.inspect)
+    assert_equal('Set[1, 2]', set1.inspect)
 
     set2 = Set[Set[0], 1, 2, set1]
-    assert_equal('#<Set: {#<Set: {0}>, 1, 2, #<Set: {1, 2}>}>', set2.inspect)
+    assert_equal('Set[Set[0], 1, 2, Set[1, 2]]', set2.inspect)
 
     set1.add(set2)
-    assert_equal('#<Set: {#<Set: {0}>, 1, 2, #<Set: {1, 2, #<Set: {...}>}>}>', set2.inspect)
+    assert_equal('Set[Set[0], 1, 2, Set[1, 2, Set[...]]]', set2.inspect)
+
+    c = Class.new(Set::CoreSet)
+    c.set_temporary_name("_MySet")
+    assert_equal('_MySet[1, 2]', c[1, 2].inspect)
+
+    c = Class.new(Set)
+    c.set_temporary_name("_MySet")
+    assert_equal('#<_MySet: {1, 2}>', c[1, 2].inspect)
   end
 
   def test_to_s
     set1 = Set[1, 2]
-    assert_equal('#<Set: {1, 2}>', set1.to_s)
+    assert_equal('Set[1, 2]', set1.to_s)
 
     set2 = Set[Set[0], 1, 2, set1]
-    assert_equal('#<Set: {#<Set: {0}>, 1, 2, #<Set: {1, 2}>}>', set2.to_s)
+    assert_equal('Set[Set[0], 1, 2, Set[1, 2]]', set2.to_s)
 
     set1.add(set2)
-    assert_equal('#<Set: {#<Set: {0}>, 1, 2, #<Set: {1, 2, #<Set: {...}>}>}>', set2.to_s)
+    assert_equal('Set[Set[0], 1, 2, Set[1, 2, Set[...]]]', set2.to_s)
   end
 
   def test_compare_by_identity
@@ -838,6 +914,55 @@ def test_reset
       assert_equal(klass.new([a]), set, klass.name)
     }
   end
+
+  def test_set_gc_compact_does_not_allocate
+    assert_in_out_err([], <<-"end;", [], [])
+    def x
+      s = Set.new
+      s << Object.new
+      s
+    end
+
+    x
+    begin
+      GC.compact
+    rescue NotImplementedError
+    end
+    end;
+  end
+
+  def test_larger_sets
+    set = Set.new
+    10_000.times do |i|
+      set << i
+    end
+    set = set.dup
+
+    10_000.times do |i|
+      assert_includes set, i
+    end
+  end
+
+  def test_subclass_new_calls_add
+    c = Class.new(Set) do
+      def add(o)
+        super
+        super(o+1)
+      end
+    end
+    assert_equal([1, 2], c.new([1]).to_a)
+  end
+
+  def test_subclass_aref_calls_initialize
+    c = Class.new(Set) do
+      def initialize(enum)
+        super
+        add(1)
+      end
+    end
+    assert_equal([2, 1], c[2].to_a)
+  end
+
 end
 
 class TC_Enumerable < Test::Unit::TestCase
@@ -855,6 +980,36 @@ def test_to_set
     assert_same set, set.to_set
     assert_not_same set, set.to_set { |o| o }
   end
+
+  class MyEnum
+    include Enumerable
+
+    def initialize(array)
+      @array = array
+    end
+
+    def each(&block)
+      @array.each(&block)
+    end
+
+    def size
+      raise "should not be called"
+    end
+  end
+
+  def test_to_set_not_calling_size
+    enum = MyEnum.new([1,2,3])
+
+    set = assert_nothing_raised { enum.to_set }
+    assert(set.is_a?(Set))
+    assert_equal(Set[1,2,3], set)
+
+    enumerator = enum.to_enum
+
+    set = assert_nothing_raised { enumerator.to_set }
+    assert(set.is_a?(Set))
+    assert_equal(Set[1,2,3], set)
+  end
 end
 
 class TC_Set_Builtin < Test::Unit::TestCase
diff --git a/test/mri/ruby/test_settracefunc.rb b/test/mri/ruby/test_settracefunc.rb
index 37358757a67..776534a2b54 100644
--- a/test/mri/ruby/test_settracefunc.rb
+++ b/test/mri/ruby/test_settracefunc.rb
@@ -845,6 +845,9 @@ def test_tracepoint_disable
     args = nil
     trace = TracePoint.trace(:call){|tp|
       next if !target_thread?
+      # In parallel testing, unexpected events like IO operations may be traced,
+      # so we filter out events here.
+      next unless [TracePoint, TestSetTraceFunc].include?(tp.defined_class)
       ary << tp.method_id
     }
     foo
@@ -1996,7 +1999,7 @@ def m
     TracePoint.new(:c_call, &capture_events).enable{
       c.new
     }
-    assert_equal [:c_call, :itself, :initialize], events[1]
+    assert_equal [:c_call, :itself, :initialize], events[0]
     events.clear
 
     o = Class.new{
@@ -2262,9 +2265,6 @@ def test_thread_add_trace_func
     }
     # it is dirty hack. usually we shouldn't use such technique
     Thread.pass until t.status == 'sleep'
-    # When RJIT thread exists, t.status becomes 'sleep' even if it does not reach m2t_q.pop.
-    # This sleep forces it to reach m2t_q.pop for --jit-wait.
-    sleep 1 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
 
     t.add_trace_func proc{|ev, file, line, *args|
       if file == __FILE__
@@ -2724,7 +2724,7 @@ def obj.example
   end
 
   def test_disable_local_tracepoint_in_trace
-    assert_normal_exit <<-EOS
+    assert_normal_exit(<<-EOS, timeout: 60)
     def foo
       trace = TracePoint.new(:b_return){|tp|
         tp.disable
@@ -2957,4 +2957,210 @@ def test_tracepoint_thread_end_with_exception
 
     assert_kind_of(Thread, target_thread)
   end
+
+  def test_tracepoint_garbage_collected_when_disable
+    before_count_stat = 0
+    before_count_objspace = 0
+    TracePoint.stat.each do
+      before_count_stat += 1
+    end
+    ObjectSpace.each_object(TracePoint) do
+      before_count_objspace += 1
+    end
+    tp = TracePoint.new(:c_call, :c_return) do
+    end
+    tp.enable
+    Class.inspect # c_call, c_return invoked
+    tp.disable
+    tp_id = tp.object_id
+    tp = nil
+
+    gc_times = 0
+    gc_max_retries = 10
+    EnvUtil.suppress_warning do
+      until (ObjectSpace._id2ref(tp_id) rescue nil).nil?
+        GC.start
+        gc_times += 1
+        if gc_times == gc_max_retries
+          break
+        end
+      end
+    end
+    return if gc_times == gc_max_retries
+
+    after_count_stat = 0
+    TracePoint.stat.each do |v|
+      after_count_stat += 1
+    end
+    assert after_count_stat <= before_count_stat
+    after_count_objspace = 0
+    ObjectSpace.each_object(TracePoint) do
+      after_count_objspace += 1
+    end
+    assert after_count_objspace <= before_count_objspace
+  end
+
+  def test_tp_ractor_local_untargeted
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+    r = Ractor.new do
+      results = []
+      tp = TracePoint.new(:line) { |tp| results << tp.path }
+      tp.enable
+      Ractor.main << :continue
+      Ractor.receive
+      tp.disable
+      results
+    end
+    outer_results = []
+    outer_tp = TracePoint.new(:line) { |tp| outer_results << tp.path }
+    outer_tp.enable
+    Ractor.receive
+    GC.start # so I can check <internal:gc> path
+    r << :continue
+    inner_results = r.value
+    outer_tp.disable
+    assert_equal 1, outer_results.select { |path| path.match?(/internal:gc/) }.size
+    assert_equal 0, inner_results.select { |path| path.match?(/internal:gc/) }.size
+    end;
+  end
+
+  def test_tp_targeted_ractor_local_bmethod
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+      mname = :foo
+      prok = Ractor.shareable_proc do
+      end
+      klass = EnvUtil.labeled_class(:Klass) do
+        define_method(mname, &prok)
+      end
+      outer_results = 0
+      _outer_tp = TracePoint.new(:call) do
+        outer_results += 1
+      end # not enabled
+      rs = 10.times.map do
+        Ractor.new(mname, klass) do |mname, klass0|
+          inner_results = 0
+          tp = TracePoint.new(:call) { |tp| inner_results += 1 }
+          target = klass0.instance_method(mname)
+          tp.enable(target: target)
+          obj = klass0.new
+          10.times { obj.send(mname) }
+          tp.disable
+          inner_results
+        end
+      end
+      inner_results = rs.map(&:value).sum
+      obj = klass.new
+      10.times { obj.send(mname) }
+      assert_equal 100, inner_results
+      assert_equal 0, outer_results
+    end;
+  end
+
+  def test_tp_targeted_ractor_local_method
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+      def foo
+      end
+      outer_results = 0
+      _outer_tp = TracePoint.new(:call) do
+        outer_results += 1
+      end # not enabled
+
+      rs = 10.times.map do
+        Ractor.new do
+          inner_results = 0
+          tp = TracePoint.new(:call) do
+             inner_results += 1
+          end
+          tp.enable(target: method(:foo))
+          10.times { foo }
+          tp.disable
+          inner_results
+        end
+      end
+
+      inner_results = rs.map(&:value).sum
+      10.times { foo }
+      assert_equal 100, inner_results
+      assert_equal 0,   outer_results
+    end;
+  end
+
+  def test_tracepoints_not_disabled_by_ractor_gc
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+    $-w = nil # uses ObjectSpace._id2ref
+    def hi = "hi"
+    greetings = 0
+    tp_target = TracePoint.new(:call) do |tp|
+      greetings += 1
+    end
+    tp_target.enable(target: method(:hi))
+
+    raises = 0
+    tp_global = TracePoint.new(:raise) do |tp|
+      raises += 1
+    end
+    tp_global.enable
+
+    r = Ractor.new { 10 }
+    r.join
+    ractor_id = r.object_id
+    r = nil # allow gc for ractor
+    gc_max_retries = 15
+    gc_times = 0
+    # force GC of ractor (or try, because we have a conservative GC)
+    until (ObjectSpace._id2ref(ractor_id) rescue nil).nil?
+      GC.start
+      gc_times += 1
+      if gc_times == gc_max_retries
+        break
+      end
+    end
+
+    # tracepoints should still be enabled after GC of `r`
+    5.times {
+      hi
+    }
+    6.times {
+      raise "uh oh" rescue nil
+    }
+    tp_target.disable
+    tp_global.disable
+    assert_equal 5, greetings
+    if gc_times == gc_max_retries # _id2ref never raised
+      assert_equal 6, raises
+    else
+      assert_equal 7, raises
+    end
+    end;
+  end
+
+  def test_lots_of_enabled_tracepoints_ractor_gc
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      def foo; end
+      sum = 8.times.map do
+        Ractor.new do
+          called = 0
+          TracePoint.new(:call) do |tp|
+            next if tp.callee_id != :foo
+            called += 1
+          end.enable
+          200.times do
+            TracePoint.new(:line) {
+              # all these allocations shouldn't GC these tracepoints while the ractor is alive.
+              Object.new
+            }.enable
+          end
+          100.times { foo }
+          called
+        end
+      end.map(&:value).sum
+      assert_equal 800, sum
+      4.times { GC.start } # Now the tracepoints can be GC'd because the ractors can be GC'd
+    end;
+  end
 end
diff --git a/test/mri/ruby/test_shapes.rb b/test/mri/ruby/test_shapes.rb
index 9b025043844..453ca8f6a72 100644
--- a/test/mri/ruby/test_shapes.rb
+++ b/test/mri/ruby/test_shapes.rb
@@ -2,6 +2,7 @@
 require 'test/unit'
 require 'objspace'
 require 'json'
+require 'securerandom'
 
 # These test the functionality of object shapes
 class TestShapes < Test::Unit::TestCase
@@ -92,15 +93,18 @@ def write_iv
   # RubyVM::Shape.of returns new instances of shape objects for
   # each call. This helper method allows us to define equality for
   # shapes
-  def assert_shape_equal(shape1, shape2)
-    assert_equal(shape1.id, shape2.id)
-    assert_equal(shape1.parent_id, shape2.parent_id)
-    assert_equal(shape1.depth, shape2.depth)
-    assert_equal(shape1.type, shape2.type)
+  def assert_shape_equal(e, a)
+    assert_equal(
+      {id: e.id, parent_id: e.parent_id, depth: e.depth, type: e.type},
+      {id: a.id, parent_id: a.parent_id, depth: a.depth, type: a.type},
+    )
   end
 
-  def refute_shape_equal(shape1, shape2)
-    refute_equal(shape1.id, shape2.id)
+  def refute_shape_equal(e, a)
+    refute_equal(
+      {id: e.id, parent_id: e.parent_id, depth: e.depth, type: e.type},
+      {id: a.id, parent_id: a.parent_id, depth: a.depth, type: a.type},
+    )
   end
 
   def test_iv_order_correct_on_complex_objects
@@ -146,11 +150,14 @@ class Hi; end
   def test_too_many_ivs_on_class
     obj = Class.new
 
-    (MANY_IVS + 1).times do
+    obj.instance_variable_set(:@test_too_many_ivs_on_class, 1)
+    refute_predicate RubyVM::Shape.of(obj), :too_complex?
+
+    MANY_IVS.times do
       obj.instance_variable_set(:"@a#{_1}", 1)
     end
 
-    assert_false RubyVM::Shape.of(obj).too_complex?
+    refute_predicate RubyVM::Shape.of(obj), :too_complex?
   end
 
   def test_removing_when_too_many_ivs_on_class
@@ -596,8 +603,8 @@ class TooComplex
 
       assert_predicate RubyVM::Shape.of(tc), :too_complex?
       assert_equal 3, tc.very_unique
-      assert_equal 3, Ractor.new(tc) { |x| Ractor.yield(x.very_unique) }.take
-      assert_equal tc.instance_variables.sort, Ractor.new(tc) { |x| Ractor.yield(x.instance_variables) }.take.sort
+      assert_equal 3, Ractor.new(tc) { |x| x.very_unique }.value
+      assert_equal tc.instance_variables.sort, Ractor.new(tc) { |x| x.instance_variables }.value.sort
     end;
   end
 
@@ -622,6 +629,97 @@ class TooComplex
     end;
   end
 
+  def test_too_complex_and_frozen
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      $VERBOSE = nil
+      class TooComplex
+        attr_reader :very_unique
+      end
+
+      RubyVM::Shape::SHAPE_MAX_VARIATIONS.times do
+        TooComplex.new.instance_variable_set(:"@unique_#{_1}", Object.new)
+      end
+
+      tc = TooComplex.new
+      tc.instance_variable_set(:"@very_unique", 3)
+
+      shape = RubyVM::Shape.of(tc)
+      assert_predicate shape, :too_complex?
+      refute_predicate shape, :shape_frozen?
+      tc.freeze
+      frozen_shape = RubyVM::Shape.of(tc)
+      refute_equal shape.id, frozen_shape.id
+      assert_predicate frozen_shape, :too_complex?
+      assert_predicate frozen_shape, :shape_frozen?
+
+      assert_equal 3, tc.very_unique
+      assert_equal 3, Ractor.make_shareable(tc).very_unique
+    end;
+  end
+
+  def test_object_id_transition_too_complex
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      obj = Object.new
+      obj.instance_variable_set(:@a, 1)
+      RubyVM::Shape.exhaust_shapes
+      assert_equal obj.object_id, obj.object_id
+    end;
+
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class Hi; end
+      obj = Hi.new
+      obj.instance_variable_set(:@a, 1)
+      obj.instance_variable_set(:@b, 2)
+      old_id = obj.object_id
+
+      RubyVM::Shape.exhaust_shapes
+      obj.remove_instance_variable(:@a)
+
+      assert_equal old_id, obj.object_id
+    end;
+  end
+
+  def test_too_complex_and_frozen_and_object_id
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      $VERBOSE = nil
+      class TooComplex
+        attr_reader :very_unique
+      end
+
+      RubyVM::Shape::SHAPE_MAX_VARIATIONS.times do
+        TooComplex.new.instance_variable_set(:"@unique_#{_1}", Object.new)
+      end
+
+      tc = TooComplex.new
+      tc.instance_variable_set(:"@very_unique", 3)
+
+      shape = RubyVM::Shape.of(tc)
+      assert_predicate shape, :too_complex?
+      refute_predicate shape, :shape_frozen?
+      tc.freeze
+      frozen_shape = RubyVM::Shape.of(tc)
+      refute_equal shape.id, frozen_shape.id
+      assert_predicate frozen_shape, :too_complex?
+      assert_predicate frozen_shape, :shape_frozen?
+      refute_predicate frozen_shape, :has_object_id?
+
+      assert_equal tc.object_id, tc.object_id
+
+      id_shape = RubyVM::Shape.of(tc)
+      refute_equal frozen_shape.id, id_shape.id
+      assert_predicate id_shape, :too_complex?
+      assert_predicate id_shape, :has_object_id?
+      assert_predicate id_shape, :shape_frozen?
+
+      assert_equal 3, tc.very_unique
+      assert_equal 3, Ractor.make_shareable(tc).very_unique
+    end;
+  end
+
   def test_too_complex_obj_ivar_ractor_share
     assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
@@ -632,10 +730,10 @@ def test_too_complex_obj_ivar_ractor_share
       r = Ractor.new do
         o = Object.new
         o.instance_variable_set(:@a, "hello")
-        Ractor.yield(o)
+        o
       end
 
-      o = r.take
+      o = r.value
       assert_equal "hello", o.instance_variable_get(:@a)
     end;
   end
@@ -650,10 +748,10 @@ def test_too_complex_generic_ivar_ractor_share
       r = Ractor.new do
         o = []
         o.instance_variable_set(:@a, "hello")
-        Ractor.yield(o)
+        o
       end
 
-      o = r.take
+      o = r.value
       assert_equal "hello", o.instance_variable_get(:@a)
     end;
   end
@@ -721,9 +819,42 @@ def test_delete_iv_after_complex
     assert_equal 3, tc.a3_m # make sure IV is initialized
     assert tc.instance_variable_defined?(:@a3)
     tc.remove_instance_variable(:@a3)
+    refute tc.instance_variable_defined?(:@a3)
+    assert_nil tc.a3
+  end
+
+  def test_delete_iv_after_complex_and_object_id
+    ensure_complex
+
+    tc = TooComplex.new
+    tc.send("a#{RubyVM::Shape::SHAPE_MAX_VARIATIONS}_m")
+    assert_predicate RubyVM::Shape.of(tc), :too_complex?
+
+    assert_equal 3, tc.a3_m # make sure IV is initialized
+    assert tc.instance_variable_defined?(:@a3)
+    tc.object_id
+    tc.remove_instance_variable(:@a3)
+    refute tc.instance_variable_defined?(:@a3)
     assert_nil tc.a3
   end
 
+  def test_delete_iv_after_complex_and_freeze
+    ensure_complex
+
+    tc = TooComplex.new
+    tc.send("a#{RubyVM::Shape::SHAPE_MAX_VARIATIONS}_m")
+    assert_predicate RubyVM::Shape.of(tc), :too_complex?
+
+    assert_equal 3, tc.a3_m # make sure IV is initialized
+    assert tc.instance_variable_defined?(:@a3)
+    tc.freeze
+    assert_raise FrozenError do
+      tc.remove_instance_variable(:@a3)
+    end
+    assert tc.instance_variable_defined?(:@a3)
+    assert_equal 3, tc.a3
+  end
+
   def test_delete_undefined_after_complex
     ensure_complex
 
@@ -786,13 +917,15 @@ def test_remove_instance_variable_when_out_of_shapes
   def test_remove_instance_variable_capacity_transition
     assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
-      t_object_shape = RubyVM::Shape.find_by_id(RubyVM::Shape::FIRST_T_OBJECT_SHAPE_ID)
-      assert_equal(RubyVM::Shape::SHAPE_T_OBJECT, t_object_shape.type)
-
-      initial_capacity = t_object_shape.capacity
 
       # a does not transition in capacity
       a = Class.new.new
+      root_shape = RubyVM::Shape.of(a)
+
+      assert_equal(RubyVM::Shape::SHAPE_ROOT, root_shape.type)
+      initial_capacity = root_shape.capacity
+      refute_equal(0, initial_capacity)
+
       initial_capacity.times do |i|
         a.instance_variable_set(:"@ivar#{i + 1}", i)
       end
@@ -852,13 +985,13 @@ def test_shape_order
   def test_iv_index
     example = RemoveAndAdd.new
     initial_shape = RubyVM::Shape.of(example)
-    assert_equal 0, initial_shape.next_iv_index
+    assert_equal 0, initial_shape.next_field_index
 
     example.add_foo # makes a transition
     add_foo_shape = RubyVM::Shape.of(example)
     assert_equal([:@foo], example.instance_variables)
-    assert_equal(initial_shape.id, add_foo_shape.parent.id)
-    assert_equal(1, add_foo_shape.next_iv_index)
+    assert_equal(initial_shape.raw_id, add_foo_shape.parent.raw_id)
+    assert_equal(1, add_foo_shape.next_field_index)
 
     example.remove_foo # makes a transition
     remove_foo_shape = RubyVM::Shape.of(example)
@@ -868,8 +1001,8 @@ def test_iv_index
     example.add_bar # makes a transition
     bar_shape = RubyVM::Shape.of(example)
     assert_equal([:@bar], example.instance_variables)
-    assert_equal(initial_shape.id, bar_shape.parent_id)
-    assert_equal(1, bar_shape.next_iv_index)
+    assert_equal(initial_shape.raw_id, bar_shape.parent_id)
+    assert_equal(1, bar_shape.next_field_index)
   end
 
   def test_remove_then_add_again
@@ -888,7 +1021,7 @@ class TestObject; end
   def test_new_obj_has_t_object_shape
     obj = TestObject.new
     shape = RubyVM::Shape.of(obj)
-    assert_equal RubyVM::Shape::SHAPE_T_OBJECT, shape.type
+    assert_equal RubyVM::Shape::SHAPE_ROOT, shape.type
     assert_nil shape.parent
   end
 
@@ -900,20 +1033,32 @@ def test_array_has_root_shape
     assert_shape_equal(RubyVM::Shape.root_shape, RubyVM::Shape.of([]))
   end
 
-  def test_true_has_special_const_shape_id
-    assert_equal(RubyVM::Shape::SPECIAL_CONST_SHAPE_ID, RubyVM::Shape.of(true).id)
-  end
-
-  def test_nil_has_special_const_shape_id
-    assert_equal(RubyVM::Shape::SPECIAL_CONST_SHAPE_ID, RubyVM::Shape.of(nil).id)
+  def test_raise_on_special_consts
+    assert_raise ArgumentError do
+      RubyVM::Shape.of(true)
+    end
+    assert_raise ArgumentError do
+      RubyVM::Shape.of(false)
+    end
+    assert_raise ArgumentError do
+      RubyVM::Shape.of(nil)
+    end
+    assert_raise ArgumentError do
+      RubyVM::Shape.of(0)
+    end
+    # 32-bit platforms don't have flonums or static symbols as special
+    # constants
+    # TODO(max): Add ArgumentError tests for symbol and flonum, skipping if
+    # RUBY_PLATFORM =~ /i686/
   end
 
-  def test_root_shape_transition_to_special_const_on_frozen
-    assert_equal(RubyVM::Shape::SPECIAL_CONST_SHAPE_ID, RubyVM::Shape.of([].freeze).id)
+  def test_root_shape_frozen
+    frozen_root_shape = RubyVM::Shape.of([].freeze)
+    assert_predicate(frozen_root_shape, :frozen?)
+    assert_equal(RubyVM::Shape.root_shape.id, frozen_root_shape.raw_id)
   end
 
   def test_basic_shape_transition
-    omit "Failing with RJIT for some reason" if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     obj = Example.new
     shape = RubyVM::Shape.of(obj)
     refute_equal(RubyVM::Shape.root_shape, shape)
@@ -921,7 +1066,7 @@ def test_basic_shape_transition
     assert_equal RubyVM::Shape::SHAPE_IVAR, shape.type
 
     shape = shape.parent
-    assert_equal RubyVM::Shape::SHAPE_T_OBJECT, shape.type
+    assert_equal RubyVM::Shape::SHAPE_ROOT, shape.type
     assert_nil shape.parent
 
     assert_equal(1, obj.instance_variable_get(:@a))
@@ -956,11 +1101,12 @@ def test_duplicating_too_complex_objects_memory_leak
 
   def test_freezing_and_duplicating_object
     obj = Object.new.freeze
+    assert_predicate(RubyVM::Shape.of(obj), :shape_frozen?)
+
+    # dup'd objects shouldn't be frozen
     obj2 = obj.dup
     refute_predicate(obj2, :frozen?)
-    # dup'd objects shouldn't be frozen, and the shape should be the
-    # parent shape of the copied object
-    assert_equal(RubyVM::Shape.of(obj).parent.id, RubyVM::Shape.of(obj2).id)
+    refute_predicate(RubyVM::Shape.of(obj2), :shape_frozen?)
   end
 
   def test_freezing_and_duplicating_object_with_ivars
@@ -977,6 +1123,7 @@ def test_freezing_and_duplicating_string_with_ivars
     str.freeze
     str2 = str.dup
     refute_predicate(str2, :frozen?)
+
     refute_equal(RubyVM::Shape.of(str).id, RubyVM::Shape.of(str2).id)
     assert_equal(str2.instance_variable_get(:@a), 1)
   end
@@ -993,8 +1140,7 @@ def test_cloning_with_freeze_option
     obj2 = obj.clone(freeze: true)
     assert_predicate(obj2, :frozen?)
     refute_shape_equal(RubyVM::Shape.of(obj), RubyVM::Shape.of(obj2))
-    assert_equal(RubyVM::Shape::SHAPE_FROZEN, RubyVM::Shape.of(obj2).type)
-    assert_shape_equal(RubyVM::Shape.of(obj), RubyVM::Shape.of(obj2).parent)
+    assert_predicate(RubyVM::Shape.of(obj2), :shape_frozen?)
   end
 
   def test_freezing_and_cloning_object_with_ivars
@@ -1037,4 +1183,30 @@ def ensure_complex
       tc.send("a#{_1}_m")
     end
   end
+
+  def assert_too_complex_during_delete(obj)
+    obj.instance_variable_set("@___#{SecureRandom.hex}", 1)
+
+    (RubyVM::Shape::SHAPE_MAX_VARIATIONS * 2).times do |i|
+      obj.instance_variable_set("@ivar#{i}", i)
+    end
+
+    refute_predicate RubyVM::Shape.of(obj), :too_complex?
+    (RubyVM::Shape::SHAPE_MAX_VARIATIONS * 2).times do |i|
+      obj.remove_instance_variable("@ivar#{i}")
+    end
+    assert_predicate RubyVM::Shape.of(obj), :too_complex?
+  end
+
+  def test_object_too_complex_during_delete
+    assert_too_complex_during_delete(Class.new.new)
+  end
+
+  def test_class_too_complex_during_delete
+    assert_too_complex_during_delete(Module.new)
+  end
+
+  def test_generic_too_complex_during_delete
+    assert_too_complex_during_delete(Class.new(Array).new)
+  end
 end if defined?(RubyVM::Shape)
diff --git a/test/mri/ruby/test_string.rb b/test/mri/ruby/test_string.rb
index d2099607fd4..2458d38ef4b 100644
--- a/test/mri/ruby/test_string.rb
+++ b/test/mri/ruby/test_string.rb
@@ -872,6 +872,10 @@ def test_undump
     assert_equal('\#', S('"\\\\#"').undump)
     assert_equal('\#{', S('"\\\\\#{"').undump)
 
+    assert_undump("\0\u{ABCD}")
+    assert_undump(S('"\x00\u3042"'.force_encoding("SJIS")))
+    assert_undump(S('"\u3042\x7E"'.force_encoding("SJIS")))
+
     assert_raise(RuntimeError) { S('\u3042').undump }
     assert_raise(RuntimeError) { S('"\x82\xA0\u3042"'.force_encoding("SJIS")).undump }
     assert_raise(RuntimeError) { S('"\u3042\x82\xA0"'.force_encoding("SJIS")).undump }
@@ -1869,6 +1873,13 @@ def test_split_with_block
 
     result = []; S("aaa,bbb,ccc,ddd").split(/,/) {|s| result << s.gsub(/./, "A")}
     assert_equal(["AAA"]*4, result)
+
+    s = S("abc ") * 20
+    assert_raise(RuntimeError) {
+      10.times do
+        s.split {s.prepend("xxx" * 100)}
+      end
+    }
   ensure
     EnvUtil.suppress_warning {$; = fs}
   end
@@ -1876,9 +1887,24 @@ def test_split_with_block
   def test_fs
     return unless @cls == String
 
-    assert_raise_with_message(TypeError, /\$;/) {
-      $; = []
-    }
+    begin
+      fs = $;
+      assert_deprecated_warning(/non-nil '\$;'/) {$; = "x"}
+      assert_raise_with_message(TypeError, /\$;/) {$; = []}
+    ensure
+      EnvUtil.suppress_warning {$; = fs}
+    end
+    name = "\u{5206 5217}"
+    assert_separately([], "#{<<~"do;"}\n#{<<~"end;"}")
+    do;
+      alias $#{name} $;
+      assert_deprecated_warning(/\\$#{name}/) { $#{name} = "" }
+      assert_raise_with_message(TypeError, /\\$#{name}/) { $#{name} = 1 }
+    end;
+  end
+
+  def test_fs_gc
+    return unless @cls == String
 
     assert_separately(%W[-W0], "#{<<~"begin;"}\n#{<<~'end;'}")
     bug = '[ruby-core:79582] $; must not be GCed'
@@ -2027,6 +2053,117 @@ def test_strip!
     assert_equal(S("x") ,a)
   end
 
+  def test_strip_with_selectors
+    assert_equal(S("abc"), S("---abc+++").strip("-+"))
+    assert_equal(S("abc"), S("+++abc---").strip("-+"))
+    assert_equal(S("abc"), S("+-+abc-+-").strip("-+"))
+    assert_equal(S(""), S("---+++").strip("-+"))
+    assert_equal(S("abc   "), S("---abc   ").strip("-"))
+    assert_equal(S("   abc"), S("   abc+++").strip("+"))
+
+    # Test with multibyte characters
+    assert_equal(S("abc"), S("あああabcいいい").strip("あい"))
+    assert_equal(S("abc"), S("いいいabcあああ").strip("あい"))
+
+    # Test with NUL characters
+    assert_equal(S("abc\0"), S("---abc\0--").strip("-"))
+    assert_equal(S("\0abc"), S("--\0abc---").strip("-"))
+
+    # Test without modification
+    assert_equal(S("abc"), S("abc").strip("-+"))
+    assert_equal(S("abc"), S("abc").strip(""))
+
+    # Test with range
+    assert_equal(S("abc"), S("012abc345").strip("0-9"))
+    assert_equal(S("abc"), S("012abc345").strip("^a-z"))
+
+    # Test with multiple selectors
+    assert_equal(S("4abc56"), S("01234abc56789").strip("0-9", "^4-6"))
+  end
+
+  def test_strip_bang_with_chars
+    a = S("---abc+++")
+    assert_equal(S("abc"), a.strip!("-+"))
+    assert_equal(S("abc"), a)
+
+    a = S("+++abc---")
+    assert_equal(S("abc"), a.strip!("-+"))
+    assert_equal(S("abc"), a)
+
+    a = S("abc")
+    assert_nil(a.strip!("-+"))
+    assert_equal(S("abc"), a)
+
+    # Test with multibyte characters
+    a = S("あああabcいいい")
+    assert_equal(S("abc"), a.strip!("あい"))
+    assert_equal(S("abc"), a)
+  end
+
+  def test_lstrip_with_selectors
+    assert_equal(S("abc+++"), S("---abc+++").lstrip("-"))
+    assert_equal(S("abc---"), S("+++abc---").lstrip("+"))
+    assert_equal(S("abc"), S("---abc").lstrip("-"))
+    assert_equal(S(""), S("---").lstrip("-"))
+
+    # Test with multibyte characters
+    assert_equal(S("abcいいい"), S("あああabcいいい").lstrip("あ"))
+
+    # Test with NUL characters
+    assert_equal(S("\0abc+++"), S("--\0abc+++").lstrip("-"))
+
+    # Test without modification
+    assert_equal(S("abc"), S("abc").lstrip("-"))
+
+    # Test with range
+    assert_equal(S("abc345"), S("012abc345").lstrip("0-9"))
+
+    # Test with multiple selectors
+    assert_equal(S("4abc56789"), S("01234abc56789").lstrip("0-9", "^4-6"))
+  end
+
+  def test_lstrip_bang_with_chars
+    a = S("---abc+++")
+    assert_equal(S("abc+++"), a.lstrip!("-"))
+    assert_equal(S("abc+++"), a)
+
+    a = S("abc")
+    assert_nil(a.lstrip!("-"))
+    assert_equal(S("abc"), a)
+  end
+
+  def test_rstrip_with_selectors
+    assert_equal(S("---abc"), S("---abc+++").rstrip("+"))
+    assert_equal(S("+++abc"), S("+++abc---").rstrip("-"))
+    assert_equal(S("abc"), S("abc+++").rstrip("+"))
+    assert_equal(S(""), S("+++").rstrip("+"))
+
+    # Test with multibyte characters
+    assert_equal(S("あああabc"), S("あああabcいいい").rstrip("い"))
+
+    # Test with NUL characters
+    assert_equal(S("---abc\0"), S("---abc\0++").rstrip("+"))
+
+    # Test without modification
+    assert_equal(S("abc"), S("abc").rstrip("-"))
+
+    # Test with range
+    assert_equal(S("012abc"), S("012abc345").rstrip("0-9"))
+
+    # Test with multiple selectors
+    assert_equal(S("01234abc56"), S("01234abc56789").rstrip("0-9", "^4-6"))
+  end
+
+  def test_rstrip_bang_with_chars
+    a = S("---abc+++")
+    assert_equal(S("---abc"), a.rstrip!("+"))
+    assert_equal(S("---abc"), a)
+
+    a = S("abc")
+    assert_nil(a.rstrip!("+"))
+    assert_equal(S("abc"), a)
+  end
+
   def test_sub
     assert_equal(S("h*llo"),    S("hello").sub(/[aeiou]/, S('*')))
     assert_equal(S("h<e>llo"),  S("hello").sub(/([aeiou])/, S('<\1>')))
@@ -2462,33 +2599,7 @@ def test_unpack
 
     assert_equal([0xa9, 0x42, 0x2260], S("\xc2\xa9B\xe2\x89\xa0").unpack(S("U*")))
 
-=begin
-    skipping "Not tested:
-        D,d & double-precision float, native format\\
-        E & double-precision float, little-endian byte order\\
-        e & single-precision float, little-endian byte order\\
-        F,f & single-precision float, native format\\
-        G & double-precision float, network (big-endian) byte order\\
-        g & single-precision float, network (big-endian) byte order\\
-        I & unsigned integer\\
-        i & integer\\
-        L & unsigned long\\
-        l & long\\
-
-        m & string encoded in base64 (uuencoded)\\
-        N & long, network (big-endian) byte order\\
-        n & short, network (big-endian) byte-order\\
-        P & pointer to a structure (fixed-length string)\\
-        p & pointer to a null-terminated string\\
-        S & unsigned short\\
-        s & short\\
-        V & long, little-endian byte order\\
-        v & short, little-endian byte order\\
-        X & back up a byte\\
-        x & null byte\\
-        Z & ASCII string (null padded, count is width)\\
-"
-=end
+    # more comprehensive tests are in test_pack.rb
   end
 
   def test_upcase
@@ -2780,14 +2891,21 @@ def (hyphen = Object.new).to_str; "-"; end
     assert_equal([S("abcdb"), S("c"), S("e")], S("abcdbce").rpartition(/b\Kc/))
   end
 
-  def test_fs_setter
+  def test_rs
     return unless @cls == String
 
-    assert_raise(TypeError) { $/ = 1 }
+    begin
+      rs = $/
+      assert_deprecated_warning(/non-nil '\$\/'/) { $/ = "" }
+      assert_raise(TypeError) { $/ = 1 }
+    ensure
+      EnvUtil.suppress_warning { $/ = rs }
+    end
     name = "\u{5206 884c}"
     assert_separately([], "#{<<~"do;"}\n#{<<~"end;"}")
     do;
       alias $#{name} $/
+      assert_deprecated_warning(/\\$#{name}/) { $#{name} = "" }
       assert_raise_with_message(TypeError, /\\$#{name}/) { $#{name} = 1 }
     end;
   end
@@ -2838,27 +2956,45 @@ def test_substr_negative_begin
     assert_equal("\u3042", ("\u3042" * 100)[-1])
   end
 
-=begin
   def test_compare_different_encoding_string
     s1 = S("\xff".force_encoding("UTF-8"))
     s2 = S("\xff".force_encoding("ISO-2022-JP"))
     assert_equal([-1, 1], [s1 <=> s2, s2 <=> s1].sort)
+
+    s3 = S("あ".force_encoding("UTF-16LE"))
+    s4 = S("a".force_encoding("IBM437"))
+    assert_equal([-1, 1], [s3 <=> s4, s4 <=> s3].sort)
   end
-=end
 
   def test_casecmp
     assert_equal(0, S("FoO").casecmp("fOO"))
     assert_equal(1, S("FoO").casecmp("BaR"))
+    assert_equal(-1, S("foo").casecmp("FOOBAR"))
     assert_equal(-1, S("baR").casecmp("FoO"))
     assert_equal(1, S("\u3042B").casecmp("\u3042a"))
     assert_equal(-1, S("foo").casecmp("foo\0"))
+    assert_equal(1,  S("FOOBAR").casecmp("foo"))
+    assert_equal(0, S("foo\0bar").casecmp("FOO\0BAR"))
 
     assert_nil(S("foo").casecmp(:foo))
     assert_nil(S("foo").casecmp(Object.new))
 
+    assert_nil(S("foo").casecmp(0))
+    assert_nil(S("foo").casecmp(5.00))
+
     o = Object.new
     def o.to_str; "fOO"; end
     assert_equal(0, S("FoO").casecmp(o))
+
+    assert_equal(0, S("#" * 128 + "A" * 256 + "b").casecmp("#" * 128 + "a" * 256 + "B"))
+    assert_equal(0, S("a" * 256 + "B").casecmp("A" * 256 + "b"))
+
+    assert_equal(-1, S("@").casecmp("`"))
+    assert_equal(0, S("hello\u00E9X").casecmp("HELLO\u00E9x"))
+
+    s1 = S("\xff".force_encoding("UTF-8"))
+    s2 = S("\xff".force_encoding("ISO-2022-JP"))
+    assert_nil(s1.casecmp(s2))
   end
 
   def test_casecmp?
@@ -2871,9 +3007,16 @@ def test_casecmp?
     assert_nil(S("foo").casecmp?(:foo))
     assert_nil(S("foo").casecmp?(Object.new))
 
+    assert_nil(S("foo").casecmp(0))
+    assert_nil(S("foo").casecmp(5.00))
+
     o = Object.new
     def o.to_str; "fOO"; end
     assert_equal(true, S("FoO").casecmp?(o))
+
+    s1 = S("\xff".force_encoding("UTF-8"))
+    s2 = S("\xff".force_encoding("ISO-2022-JP"))
+    assert_nil(s1.casecmp?(s2))
   end
 
   def test_upcase2
@@ -2946,7 +3089,6 @@ def test_lstrip_bang
     s5 = S("\u0000\u3042")
     assert_equal("\u3042", s5.lstrip!)
     assert_equal("\u3042", s5)
-
   end
 
   def test_delete_prefix_type_error
@@ -3246,18 +3388,12 @@ def test_ascii_incomat_inspect
       assert_equal('"\\u3042\\u3044\\u3046"', S("\u3042\u3044\u3046".encode(e)).inspect)
       assert_equal('"ab\\"c"', S("ab\"c".encode(e)).inspect, bug4081)
     end
-    begin
-      verbose, $VERBOSE = $VERBOSE, nil
-      ext = Encoding.default_external
-      Encoding.default_external = "us-ascii"
-      $VERBOSE = verbose
+
+    EnvUtil.with_default_external(Encoding::US_ASCII) do
       i = S("abc\"\\".force_encoding("utf-8")).inspect
-    ensure
-      $VERBOSE = nil
-      Encoding.default_external = ext
-      $VERBOSE = verbose
+
+      assert_equal('"abc\\"\\\\"', i, bug4081)
     end
-    assert_equal('"abc\\"\\\\"', i, bug4081)
   end
 
   def test_dummy_inspect
@@ -3314,6 +3450,11 @@ def test_byteslice
 
     assert_equal(u("\x82")+("\u3042"*9), S("\u3042"*10).byteslice(2, 28))
 
+    assert_equal("\xE3", S("こんにちは").byteslice(0))
+    assert_equal("こんにちは", S("こんにちは").byteslice(0, 15))
+    assert_equal("こ", S("こんにちは").byteslice(0, 3))
+    assert_equal("は", S("こんにちは").byteslice(12, 15))
+
     bug7954 = '[ruby-dev:47108]'
     assert_equal(false, S("\u3042").byteslice(0, 2).valid_encoding?, bug7954)
     assert_equal(false, ("\u3042"*10).byteslice(0, 20).valid_encoding?, bug7954)
@@ -3397,6 +3538,12 @@ def test_uplus_minus
     assert_same(str, bar, "uminus deduplicates [Feature #13077] str: #{ObjectSpace.dump(str)} bar: #{ObjectSpace.dump(bar)}")
   end
 
+  def test_uminus_dedup_in_place
+    dynamic = "this string is unique and frozen #{rand}".freeze
+    assert_same dynamic, -dynamic
+    assert_same dynamic, -dynamic.dup
+  end
+
   def test_uminus_frozen
     return unless @cls == String
 
@@ -3431,6 +3578,17 @@ def test_uminus_no_freeze_not_bare
     assert_equal(false, str.frozen?)
   end
 
+  def test_uminus_no_embed_gc
+    pad = "a"*2048
+    File.open(IO::NULL, "w") do |dev_null|
+      ("aa".."zz").each do |c|
+        fstr = -(c + pad).freeze
+        dev_null.write(fstr)
+      end
+    end
+    GC.start
+  end
+
   def test_ord
     assert_equal(97, S("a").ord)
     assert_equal(97, S("abc").ord)
@@ -3737,6 +3895,96 @@ def test_chilled_string_substring
     Warning[:deprecated] = deprecated
   end
 
+  def test_encode_fallback_raise_memory_leak
+    {
+      "hash" => <<~RUBY,
+        fallback = Hash.new { raise MyError }
+      RUBY
+      "proc" => <<~RUBY,
+        fallback = proc { raise MyError }
+      RUBY
+      "method" => <<~RUBY,
+        def my_method(_str) = raise MyError
+        fallback = method(:my_method)
+      RUBY
+      "aref" => <<~RUBY,
+        fallback = Object.new
+        def fallback.[](_str) = raise MyError
+      RUBY
+    }.each do |type, code|
+      assert_no_memory_leak([], '', <<~RUBY, "fallback type is #{type}", rss: true)
+        class MyError < StandardError; end
+
+        #{code}
+
+        100_000.times do |i|
+          "\\ufffd".encode(Encoding::US_ASCII, fallback:)
+        rescue MyError
+        end
+      RUBY
+    end
+  end
+
+  def test_encode_fallback_too_big_memory_leak
+    {
+      "hash" => <<~RUBY,
+        fallback = Hash.new { "\\uffee" }
+      RUBY
+      "proc" => <<~RUBY,
+        fallback = proc { "\\uffee" }
+      RUBY
+      "method" => <<~RUBY,
+        def my_method(_str) = "\\uffee"
+        fallback = method(:my_method)
+      RUBY
+      "aref" => <<~RUBY,
+        fallback = Object.new
+        def fallback.[](_str) = "\\uffee"
+      RUBY
+    }.each do |type, code|
+      assert_no_memory_leak([], '', <<~RUBY, "fallback type is #{type}", rss: true)
+        class MyError < StandardError; end
+
+        #{code}
+
+        100_000.times do |i|
+          "\\ufffd".encode(Encoding::US_ASCII, fallback:)
+        rescue ArgumentError
+        end
+      RUBY
+    end
+  end
+
+  def test_encode_fallback_not_string_memory_leak
+    {
+      "hash" => <<~RUBY,
+        fallback = Hash.new { Object.new }
+      RUBY
+      "proc" => <<~RUBY,
+        fallback = proc { Object.new }
+      RUBY
+      "method" => <<~RUBY,
+        def my_method(_str) = Object.new
+        fallback = method(:my_method)
+      RUBY
+      "aref" => <<~RUBY,
+        fallback = Object.new
+        def fallback.[](_str) = Object.new
+      RUBY
+    }.each do |type, code|
+      assert_no_memory_leak([], '', <<~RUBY, "fallback type is #{type}", rss: true)
+        class MyError < StandardError; end
+
+        #{code}
+
+        100_000.times do |i|
+          "\\ufffd".encode(Encoding::US_ASCII, fallback:)
+        rescue TypeError
+        end
+      RUBY
+    end
+  end
+
   private
 
   def assert_bytesplice_result(expected, s, *args)
@@ -3783,6 +4031,10 @@ def assert_byteindex(expected, string, match, *rest)
   def assert_byterindex(expected, string, match, *rest)
     assert_index_like(:byterindex, expected, string, match, *rest)
   end
+
+  def assert_undump(str, *rest)
+    assert_equal(str, str.dump.undump, *rest)
+  end
 end
 
 class TestString2 < TestString
diff --git a/test/mri/ruby/test_struct.rb b/test/mri/ruby/test_struct.rb
index 3d727adf04e..01e5cc68f6e 100644
--- a/test/mri/ruby/test_struct.rb
+++ b/test/mri/ruby/test_struct.rb
@@ -535,6 +535,8 @@ def test_parameters
   end
 
   def test_named_structs_are_not_rooted
+    omit 'skip on riscv64-linux CI machine. See https://github.com/ruby/ruby/pull/13422' if ENV['RUBY_DEBUG'] == 'ci' && /riscv64-linux/ =~ RUBY_DESCRIPTION
+
     # [Bug #20311]
     assert_no_memory_leak([], <<~PREP, <<~CODE, rss: true)
       code = proc do
@@ -542,12 +544,18 @@ def test_named_structs_are_not_rooted
         Struct.send(:remove_const, :A)
       end
 
-      1_000.times(&code)
+      10_000.times(&code)
     PREP
       50_000.times(&code)
     CODE
   end
 
+  def test_frozen_subclass
+    test = Class.new(@Struct.new(:a)).freeze.new(a: 0)
+    assert_kind_of(@Struct, test)
+    assert_equal([:a], test.members)
+  end
+
   class TopStruct < Test::Unit::TestCase
     include TestStruct
 
diff --git a/test/mri/ruby/test_super.rb b/test/mri/ruby/test_super.rb
index 8e973b0f7f4..25bad2242af 100644
--- a/test/mri/ruby/test_super.rb
+++ b/test/mri/ruby/test_super.rb
@@ -759,4 +759,19 @@ def initialize
     inherited = inherited_class.new
     assert_equal 2, inherited.test # it may read index=1 while it should be index=2
   end
+
+  def test_super_in_basic_object
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class ::BasicObject
+        def no_super
+          super()
+        rescue ::NameError
+          :ok
+        end
+      end
+
+      assert_equal :ok, "[Bug #21694]".no_super
+    end;
+  end
 end
diff --git a/test/mri/ruby/test_syntax.rb b/test/mri/ruby/test_syntax.rb
index 62f1d99bdc8..94a2e03940b 100644
--- a/test/mri/ruby/test_syntax.rb
+++ b/test/mri/ruby/test_syntax.rb
@@ -1259,6 +1259,56 @@ def test_fluent_dot
     assert_valid_syntax("a #\n#\n&.foo\n")
   end
 
+  def test_fluent_and
+    omit if /\+PRISM\b/ =~ RUBY_DESCRIPTION
+
+    assert_valid_syntax("a\n" "&& foo")
+    assert_valid_syntax("a\n" "and foo")
+
+    assert_equal(:ok, eval("#{<<~"begin;"}\n#{<<~'end;'}"))
+    begin;
+      a = true
+      if a
+      && (a = :ok; true)
+        a
+      end
+    end;
+
+    assert_equal(:ok, eval("#{<<~"begin;"}\n#{<<~'end;'}"))
+    begin;
+      a = true
+      if a
+      and (a = :ok; true)
+        a
+      end
+    end;
+  end
+
+  def test_fluent_or
+    omit if /\+PRISM\b/ =~ RUBY_DESCRIPTION
+
+    assert_valid_syntax("a\n" "|| foo")
+    assert_valid_syntax("a\n" "or foo")
+
+    assert_equal(:ok, eval("#{<<~"begin;"}\n#{<<~'end;'}"))
+    begin;
+      a = false
+      if a
+      || (a = :ok; true)
+        a
+      end
+    end;
+
+    assert_equal(:ok, eval("#{<<~"begin;"}\n#{<<~'end;'}"))
+    begin;
+      a = false
+      if a
+      or (a = :ok; true)
+        a
+      end
+    end;
+  end
+
   def test_safe_call_in_massign_lhs
     assert_syntax_error("*a&.x=0", /multiple assignment destination/)
     assert_syntax_error("a&.x,=0", /multiple assignment destination/)
@@ -1794,15 +1844,12 @@ def test_methoddef_endless_command
     assert_equal("class ok", k.rescued("ok"))
     assert_equal("instance ok", k.new.rescued("ok"))
 
-    # Current technical limitation: cannot prepend "private" or something for command endless def
-    error = /(syntax error,|\^~*) unexpected string literal/
-    error2 = /(syntax error,|\^~*) unexpected local variable or method/
-    assert_syntax_error('private def foo = puts "Hello"', error)
-    assert_syntax_error('private def foo() = puts "Hello"', error)
-    assert_syntax_error('private def foo(x) = puts x', error2)
-    assert_syntax_error('private def obj.foo = puts "Hello"', error)
-    assert_syntax_error('private def obj.foo() = puts "Hello"', error)
-    assert_syntax_error('private def obj.foo(x) = puts x', error2)
+    assert_valid_syntax('private def foo = puts "Hello"')
+    assert_valid_syntax('private def foo() = puts "Hello"')
+    assert_valid_syntax('private def foo(x) = puts x')
+    assert_valid_syntax('private def obj.foo = puts "Hello"')
+    assert_valid_syntax('private def obj.foo() = puts "Hello"')
+    assert_valid_syntax('private def obj.foo(x) = puts x')
   end
 
   def test_methoddef_in_cond
@@ -1946,6 +1993,28 @@ def test_it
     end
     assert_valid_syntax('proc {def foo(_);end;it}')
     assert_syntax_error('p { [it **2] }', /unexpected \*\*/)
+    assert_equal(1, eval('1.then { raise rescue it }'))
+    assert_equal(2, eval('1.then { 2.then { raise rescue it } }'))
+    assert_equal(3, eval('3.then { begin; raise; rescue; it; end }'))
+    assert_equal(4, eval('4.tap { begin; raise ; rescue; raise rescue it; end; }'))
+    assert_equal(5, eval('a = 0; 5.then { begin; nil; ensure; a = it; end }; a'))
+    assert_equal(6, eval('a = 0; 6.then { begin; nil; rescue; ensure; a = it; end }; a'))
+    assert_equal(7, eval('a = 0; 7.then { begin; raise; ensure; a = it; end } rescue a'))
+    assert_equal(8, eval('a = 0; 8.then { begin; raise; rescue; ensure; a = it; end }; a'))
+    assert_equal(/9/, eval('9.then { /#{it}/o }'))
+  end
+
+  def test_it_with_splat_super_method
+    bug21256 = '[ruby-core:121592] [Bug #21256]'
+
+    a = Class.new do
+      define_method(:foo) { it }
+    end
+    b = Class.new(a) do
+      def foo(*args) = super
+    end
+
+    assert_equal(1, b.new.foo(1), bug21256)
   end
 
   def test_value_expr_in_condition
@@ -2018,10 +2087,11 @@ def obj1.bar(*args, **kws, &block)
     end
     obj4 = obj1.clone
     obj5 = obj1.clone
+    obj6 = obj1.clone
     obj1.instance_eval('def foo(...) bar(...) end', __FILE__, __LINE__)
-    obj1.instance_eval('def foo(...) eval("bar(...)") end', __FILE__, __LINE__)
     obj4.instance_eval("def foo ...\n  bar(...)\n""end", __FILE__, __LINE__)
     obj5.instance_eval("def foo ...; bar(...); end", __FILE__, __LINE__)
+    obj6.instance_eval('def foo(...) eval("bar(...)") end', __FILE__, __LINE__)
 
     klass = Class.new {
       def foo(*args, **kws, &block)
@@ -2050,7 +2120,7 @@ def obj3.bar(*args, &block)
     end
     obj3.instance_eval('def foo(...) bar(...) end', __FILE__, __LINE__)
 
-    [obj1, obj2, obj3, obj4, obj5].each do |obj|
+    [obj1, obj2, obj3, obj4, obj5, obj6].each do |obj|
       assert_warning('') {
         assert_equal([[1, 2, 3], {k1: 4, k2: 5}], obj.foo(1, 2, 3, k1: 4, k2: 5) {|*x| x})
       }
diff --git a/test/mri/ruby/test_thread.rb b/test/mri/ruby/test_thread.rb
index 6620ccbf336..c08d41cb863 100644
--- a/test/mri/ruby/test_thread.rb
+++ b/test/mri/ruby/test_thread.rb
@@ -243,6 +243,10 @@ def test_join2
 
   def test_join_argument_conversion
     t = Thread.new {}
+
+    # Make sure that the thread terminates
+    Thread.pass while t.status
+
     assert_raise(TypeError) {t.join(:foo)}
 
     limit = Struct.new(:to_f, :count).new(0.05)
@@ -323,7 +327,6 @@ def test_wakeup
       s += 1
     end
     Thread.pass until t.stop?
-    sleep 1 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # t.stop? behaves unexpectedly with --jit-wait
     assert_equal(1, s)
     t.wakeup
     Thread.pass while t.alive?
@@ -1479,9 +1482,6 @@ def test_thread_native_thread_id_across_fork_on_linux
   def test_thread_interrupt_for_killed_thread
     opts = { timeout: 5, timeout_error: nil }
 
-    # prevent SIGABRT from slow shutdown with RJIT
-    opts[:reprieve] = 3 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-
     assert_normal_exit(<<-_end, '[Bug #8996]', **opts)
       Thread.report_on_exception = false
       trap(:TERM){exit}
@@ -1557,4 +1557,96 @@ def test_pending_interrupt?
     assert_equal(true, t.pending_interrupt?(Exception))
     assert_equal(false, t.pending_interrupt?(ArgumentError))
   end
+
+  def test_deadlock_backtrace
+    bug21127 = '[ruby-core:120930] [Bug #21127]'
+
+    expected_stderr = [
+      /-:12:in 'Thread#join': No live threads left. Deadlock\? \(fatal\)\n/,
+      /2 threads, 2 sleeps current:\w+ main thread:\w+\n/,
+      /\* #<Thread:\w+ sleep_forever>\n/,
+      :*,
+      /^\s*-:6:in 'Object#frame_for_deadlock_test_2'/,
+      :*,
+      /\* #<Thread:\w+ -:10 sleep_forever>\n/,
+      :*,
+      /^\s*-:2:in 'Object#frame_for_deadlock_test_1'/,
+      :*,
+    ]
+
+    assert_in_out_err([], <<-INPUT, [], expected_stderr, bug21127)
+      def frame_for_deadlock_test_1
+        yield
+      end
+
+      def frame_for_deadlock_test_2
+        yield
+      end
+
+      q = Thread::Queue.new
+      t = Thread.new { frame_for_deadlock_test_1 { q.pop } }
+
+      frame_for_deadlock_test_2 { t.join }
+    INPUT
+  end
+
+  # [Bug #21342]
+  def test_unlock_locked_mutex_with_collected_fiber
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      5.times do
+        m = Mutex.new
+        Thread.new do
+          m.synchronize do
+          end
+        end.join
+        Fiber.new do
+          GC.start
+          m.lock
+        end.resume
+      end
+    end;
+  end
+
+  def test_unlock_locked_mutex_with_collected_fiber2
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      MUTEXES = []
+      5.times do
+        m = Mutex.new
+        Fiber.new do
+          GC.start
+          m.lock
+        end.resume
+        MUTEXES << m
+      end
+      10.times do
+        MUTEXES.clear
+        GC.start
+      end
+    end;
+  end
+
+  def test_mutexes_locked_in_fiber_dont_have_aba_issue_with_new_fibers
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      mutexes = 1000.times.map do
+        Mutex.new
+      end
+
+      mutexes.map do |m|
+        Fiber.new do
+          m.lock
+        end.resume
+      end
+
+      GC.start
+
+      1000.times.map do
+        Fiber.new do
+          raise "FAILED!" if mutexes.any?(&:owned?)
+        end.resume
+      end
+    end;
+  end
 end
diff --git a/test/mri/ruby/test_thread_cv.rb b/test/mri/ruby/test_thread_cv.rb
index eb88b9606ce..81201f134f0 100644
--- a/test/mri/ruby/test_thread_cv.rb
+++ b/test/mri/ruby/test_thread_cv.rb
@@ -76,7 +76,7 @@ def test_condvar_wait_and_broadcast
       condvar.broadcast
       result << "P2"
     end
-    Timeout.timeout(5) do
+    Timeout.timeout(60) do
       nr_threads.times do |i|
         threads[i].join
       end
diff --git a/test/mri/ruby/test_thread_queue.rb b/test/mri/ruby/test_thread_queue.rb
index 545bf98888b..9485528977e 100644
--- a/test/mri/ruby/test_thread_queue.rb
+++ b/test/mri/ruby/test_thread_queue.rb
@@ -235,8 +235,14 @@ def test_thr_kill
           end
         _eom
       rescue Timeout::Error
+        # record load average:
+        uptime = `uptime` rescue nil
+        if uptime && /(load average: [\d.]+),/ =~ uptime
+          la = " (#{$1})"
+        end
+
         count = File.read("#{d}/test_thr_kill_count").to_i
-        flunk "only #{count}/#{total_count} done in #{timeout} seconds."
+        flunk "only #{count}/#{total_count} done in #{timeout} seconds.#{la}"
       end
     }
   end
diff --git a/test/mri/ruby/test_time_tz.rb b/test/mri/ruby/test_time_tz.rb
index f66cd9bec2e..473c3cabcb4 100644
--- a/test/mri/ruby/test_time_tz.rb
+++ b/test/mri/ruby/test_time_tz.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'test/unit'
-require '-test-/time'
 
 class TestTimeTZ < Test::Unit::TestCase
   has_right_tz = true
diff --git a/test/mri/ruby/test_transcode.rb b/test/mri/ruby/test_transcode.rb
index 63d37f4ba4f..15e290728be 100644
--- a/test/mri/ruby/test_transcode.rb
+++ b/test/mri/ruby/test_transcode.rb
@@ -2320,6 +2320,93 @@ def test_newline_options
     assert_equal("A\nB\nC", s.encode(usascii, newline: :lf))
   end
 
+  def test_ractor_lazy_load_encoding
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}", timeout: 60)
+    begin;
+      rs = []
+      autoload_encodings = Encoding.list.select { |e| e.inspect.include?("(autoload)") }.freeze
+      7.times do
+        rs << Ractor.new(autoload_encodings) do |encodings|
+          str = "\u0300"
+          encodings.each do |enc|
+            str.encode(enc) rescue Encoding::UndefinedConversionError
+          end
+        end
+      end
+
+      while rs.any?
+        r, _obj = Ractor.select(*rs)
+        rs.delete(r)
+      end
+      assert rs.empty?
+    end;
+  end
+
+  def test_ractor_lazy_load_encoding_random
+    omit 'unstable on s390x and windows' if RUBY_PLATFORM =~ /s390x|mswin/
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      rs = []
+      100.times do
+        rs << Ractor.new do
+          "\u0300".encode(Encoding.list.sample) rescue Encoding::UndefinedConversionError
+        end
+      end
+
+      while rs.any?
+        r, _obj = Ractor.select(*rs)
+        rs.delete(r)
+      end
+      assert rs.empty?
+    end;
+  end
+
+  def test_ractor_asciicompat_encoding_exists
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      rs = []
+      7.times do
+        rs << Ractor.new do
+          string = "ISO-2022-JP"
+          encoding = Encoding.find(string)
+          20_000.times do
+            Encoding::Converter.asciicompat_encoding(string)
+            Encoding::Converter.asciicompat_encoding(encoding)
+          end
+        end
+      end
+
+      while rs.any?
+        r, _obj = Ractor.select(*rs)
+        rs.delete(r)
+      end
+      assert rs.empty?
+    end;
+  end
+
+  def test_ractor_asciicompat_encoding_doesnt_exist
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}", timeout: 60)
+    begin;
+      rs = []
+      NO_EXIST = "I".freeze
+      7.times do
+        rs << Ractor.new do
+          50.times do
+            if (val = Encoding::Converter.asciicompat_encoding(NO_EXIST))
+              raise "Got #{val}, expected nil"
+            end
+          end
+        end
+      end
+
+      while rs.any?
+        r, _obj = Ractor.select(*rs)
+        rs.delete(r)
+      end
+      assert rs.empty?
+    end;
+  end
+
   private
 
   def assert_conversion_both_ways_utf8(utf8, raw, encoding)
diff --git a/test/mri/ruby/test_variable.rb b/test/mri/ruby/test_variable.rb
index 49fec2d40e9..13b8a7905f2 100644
--- a/test/mri/ruby/test_variable.rb
+++ b/test/mri/ruby/test_variable.rb
@@ -388,6 +388,61 @@ def test_special_constant_ivars
     end
   end
 
+  class RemoveIvar
+    class << self
+      attr_reader :ivar
+
+      def add_ivar
+        @ivar = 1
+      end
+    end
+
+    attr_reader :ivar
+
+    def add_ivar
+      @ivar = 1
+    end
+  end
+
+  def add_and_remove_ivar(obj)
+    assert_nil obj.ivar
+    assert_equal 1, obj.add_ivar
+    assert_equal 1, obj.instance_variable_get(:@ivar)
+    assert_equal 1, obj.ivar
+
+    obj.remove_instance_variable(:@ivar)
+    assert_nil obj.ivar
+
+    assert_raise NameError do
+      obj.remove_instance_variable(:@ivar)
+    end
+  end
+
+  def test_remove_instance_variables_object
+    obj = RemoveIvar.new
+    add_and_remove_ivar(obj)
+    add_and_remove_ivar(obj)
+  end
+
+  def test_remove_instance_variables_class
+    add_and_remove_ivar(RemoveIvar)
+    add_and_remove_ivar(RemoveIvar)
+  end
+
+  class RemoveIvarGeneric < Array
+    attr_reader :ivar
+
+    def add_ivar
+      @ivar = 1
+    end
+  end
+
+  def test_remove_instance_variables_generic
+    obj = RemoveIvarGeneric.new
+    add_and_remove_ivar(obj)
+    add_and_remove_ivar(obj)
+  end
+
   class ExIvar < Hash
     def initialize
       @a = 1
@@ -407,6 +462,21 @@ def test_external_ivars
     }
   end
 
+  def test_exivar_resize_with_compaction_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    objs = 10_000.times.map do
+      ExIvar.new
+    end
+    EnvUtil.under_gc_compact_stress do
+      10.times do
+        x = ExIvar.new
+        x.instance_variable_set(:@resize, 1)
+        x
+      end
+    end
+    objs or flunk
+  end
+
   def test_local_variables_with_kwarg
     bug11674 = '[ruby-core:71437] [Bug #11674]'
     v = with_kwargs_11(v1:1,v2:2,v3:3,v4:4,v5:5,v6:6,v7:7,v8:8,v9:9,v10:10,v11:11)
@@ -426,12 +496,55 @@ def test_many_instance_variables
   end
 
   def test_local_variables_encoding
-    α = 1
+    α = 1 or flunk
     b = binding
     b.eval("".encode("us-ascii"))
     assert_equal(%i[α b], b.local_variables)
   end
 
+  def test_genivar_cache
+    bug21547 = '[Bug #21547]'
+    klass = Class.new(Array)
+    instance = klass.new
+    instance.instance_variable_set(:@a1, 1)
+    instance.instance_variable_set(:@a2, 2)
+    Fiber.new do
+      instance.instance_variable_set(:@a3, 3)
+      instance.instance_variable_set(:@a4, 4)
+    end.resume
+    assert_equal 4, instance.instance_variable_get(:@a4), bug21547
+  end
+
+  def test_genivar_cache_free
+    str = +"hello"
+    str.instance_variable_set(:@x, :old_value)
+
+    str.instance_variable_get(:@x) # populate cache
+
+    Fiber.new {
+      str.remove_instance_variable(:@x)
+      str.instance_variable_set(:@x, :new_value)
+    }.resume
+
+    assert_equal :new_value, str.instance_variable_get(:@x)
+  end
+
+  def test_genivar_cache_invalidated_by_gc
+    str = +"hello"
+    str.instance_variable_set(:@x, :old_value)
+
+    str.instance_variable_get(:@x) # populate cache
+
+    Fiber.new {
+      str.remove_instance_variable(:@x)
+      str.instance_variable_set(:@x, :new_value)
+    }.resume
+
+    GC.start
+
+    assert_equal :new_value, str.instance_variable_get(:@x)
+  end
+
   private
   def with_kwargs_11(v1:, v2:, v3:, v4:, v5:, v6:, v7:, v8:, v9:, v10:, v11:)
     local_variables
diff --git a/test/mri/ruby/test_vm_dump.rb b/test/mri/ruby/test_vm_dump.rb
index 709fd5eadf5..d183e033915 100644
--- a/test/mri/ruby/test_vm_dump.rb
+++ b/test/mri/ruby/test_vm_dump.rb
@@ -5,8 +5,7 @@
 
 class TestVMDump < Test::Unit::TestCase
   def assert_darwin_vm_dump_works(args, timeout=nil)
-    pend "macOS 15 is not working with this assertion" if macos?(15)
-
+    args.unshift({"RUBY_ON_BUG" => nil, "RUBY_CRASH_REPORT" => nil})
     assert_in_out_err(args, "", [], /^\[IMPORTANT\]/, timeout: timeout || 300)
   end
 
@@ -15,7 +14,7 @@ def test_darwin_invalid_call
   end
 
   def test_darwin_segv_in_syscall
-    assert_darwin_vm_dump_works('-e1.times{Process.kill :SEGV,$$}')
+    assert_darwin_vm_dump_works(['-e1.times{Process.kill :SEGV,$$}'])
   end
 
   def test_darwin_invalid_access
diff --git a/test/mri/ruby/test_yjit.rb b/test/mri/ruby/test_yjit.rb
index 0e476588f49..2096585451c 100644
--- a/test/mri/ruby/test_yjit.rb
+++ b/test/mri/ruby/test_yjit.rb
@@ -142,6 +142,36 @@ def test_yjit_enable_with_monkey_patch
     RUBY
   end
 
+  def test_yjit_enable_with_valid_runtime_call_threshold_option
+    assert_in_out_err(['--yjit-disable', '-e',
+                       'RubyVM::YJIT.enable(call_threshold: 1); puts RubyVM::YJIT.enabled?']) do |stdout, stderr, _status|
+      assert_empty stderr
+      assert_include stdout.join, "true"
+    end
+  end
+
+  def test_yjit_enable_with_invalid_runtime_call_threshold_option
+    assert_in_out_err(['--yjit-disable', '-e', 'RubyVM::YJIT.enable(mem_size: 0)']) do |stdout, stderr, status|
+      assert_not_empty stderr
+      assert_match(/ArgumentError/, stderr.join)
+      assert_equal 1, status.exitstatus
+    end
+  end
+
+  def test_yjit_enable_with_invalid_runtime_mem_size_option
+    assert_in_out_err(['--yjit-disable', '-e', 'RubyVM::YJIT.enable(mem_size: 0)']) do |stdout, stderr, status|
+      assert_not_empty stderr
+      assert_match(/ArgumentError/, stderr.join)
+      assert_equal 1, status.exitstatus
+    end
+  end
+
+  if JITSupport.zjit_supported?
+    def test_yjit_enable_with_zjit_enabled
+      assert_in_out_err(['--zjit'], 'puts RubyVM::YJIT.enable', ['false'], ['Only one JIT can be enabled at the same time.'])
+    end
+  end
+
   def test_yjit_stats_and_v_no_error
     _stdout, stderr, _status = invoke_ruby(%w(-v --yjit-stats), '', true, true)
     refute_includes(stderr, "NoMethodError")
@@ -1316,7 +1346,7 @@ def +(x) = self - -x
   end
 
   def test_tracing_str_uplus
-    assert_compiles(<<~RUBY, frozen_string_literal: true, result: :ok, exits: { putspecialobject: 1, definemethod: 1 })
+    assert_compiles(<<~RUBY, frozen_string_literal: true, result: :ok, exits: { putspecialobject: 1 })
       def str_uplus
         _ = 1
         _ = 2
@@ -1504,14 +1534,6 @@ def test = $stderr.to_i
     RUBY
   end
 
-  def test_opt_aref_with
-    assert_compiles(<<~RUBY, insns: %i[opt_aref_with], result: "bar", frozen_string_literal: false)
-      h = {"foo" => "bar"}
-
-      h["foo"]
-    RUBY
-  end
-
   def test_proc_block_arg
     assert_compiles(<<~RUBY, result: [:proc, :no_block])
       def yield_if_given = block_given? ? yield : :no_block
@@ -1637,7 +1659,7 @@ def test = :ok
 
       [
         stats[:object_shape_count].is_a?(Integer),
-        stats[:ratio_in_yjit].is_a?(Float),
+        stats[:ratio_in_yjit].nil? || stats[:ratio_in_yjit].is_a?(Float),
       ].all?
     RUBY
   end
@@ -1648,7 +1670,7 @@ def test = :ok
       3.times { test }
 
       # Collect single stat.
-      stat = RubyVM::YJIT.runtime_stats(:ratio_in_yjit)
+      stat = RubyVM::YJIT.runtime_stats(:yjit_alloc_size)
 
       # Ensure this invocation had stats.
       return true unless RubyVM::YJIT.runtime_stats[:all_stats]
@@ -1750,6 +1772,18 @@ def req2kws = yield a: 1, b: 2
     RUBY
   end
 
+  def test_proc_block_with_kwrest
+    # When the bug was present this required --yjit-stats to trigger.
+    assert_compiles(<<~RUBY, result: {extra: 5})
+      def foo = bar(w: 1, x: 2, y: 3, z: 4, extra: 5, &proc { _1 })
+      def bar(w:, x:, y:, z:, **kwrest) = yield kwrest
+
+      GC.stress = true
+      foo
+      foo
+    RUBY
+  end
+
   private
 
   def code_gc_helpers
diff --git a/test/mri/ruby/test_zjit.rb b/test/mri/ruby/test_zjit.rb
new file mode 100644
index 00000000000..805ecb98b20
--- /dev/null
+++ b/test/mri/ruby/test_zjit.rb
@@ -0,0 +1,3803 @@
+# frozen_string_literal: true
+#
+# This set of tests can be run with:
+# make test-all TESTS=test/ruby/test_zjit.rb
+
+require 'test/unit'
+require 'envutil'
+require_relative '../lib/jit_support'
+return unless JITSupport.zjit_supported?
+
+class TestZJIT < Test::Unit::TestCase
+  def test_enabled
+    assert_runs 'false', <<~RUBY, zjit: false
+      RubyVM::ZJIT.enabled?
+    RUBY
+    assert_runs 'true', <<~RUBY, zjit: true
+      RubyVM::ZJIT.enabled?
+    RUBY
+  end
+
+  def test_stats_enabled
+    assert_runs 'false', <<~RUBY, stats: false
+      RubyVM::ZJIT.stats_enabled?
+    RUBY
+    assert_runs 'true', <<~RUBY, stats: true
+      RubyVM::ZJIT.stats_enabled?
+    RUBY
+  end
+
+  def test_stats_quiet
+    # Test that --zjit-stats-quiet collects stats but doesn't print them
+    script = <<~RUBY
+      def test = 42
+      test
+      test
+      puts RubyVM::ZJIT.stats_enabled?
+    RUBY
+
+    stats_header = "***ZJIT: Printing ZJIT statistics on exit***"
+
+    # With --zjit-stats, stats should be printed to stderr
+    out, err, status = eval_with_jit(script, stats: true)
+    assert_success(out, err, status)
+    assert_includes(err, stats_header)
+    assert_equal("true\n", out)
+
+    # With --zjit-stats-quiet, stats should NOT be printed but still enabled
+    out, err, status = eval_with_jit(script, stats: :quiet)
+    assert_success(out, err, status)
+    refute_includes(err, stats_header)
+    assert_equal("true\n", out)
+
+    # With --zjit-stats=<path>, stats should be printed to the path
+    Tempfile.create("zjit-stats-") {|tmp|
+      stats_file = tmp.path
+      tmp.puts("Lorem ipsum dolor sit amet, consectetur adipiscing elit, ...")
+      tmp.close
+
+      out, err, status = eval_with_jit(script, stats: stats_file)
+      assert_success(out, err, status)
+      refute_includes(err, stats_header)
+      assert_equal("true\n", out)
+      assert_equal stats_header, File.open(stats_file) {|f| f.gets(chomp: true)}, "should be overwritten"
+    }
+  end
+
+  def test_enable_through_env
+    child_env = {'RUBY_YJIT_ENABLE' => nil, 'RUBY_ZJIT_ENABLE' => '1'}
+    assert_in_out_err([child_env, '-v'], '') do |stdout, stderr|
+      assert_includes(stdout.first, '+ZJIT')
+      assert_equal([], stderr)
+    end
+  end
+
+  def test_zjit_enable
+    # --disable-all is important in case the build/environment has YJIT enabled by
+    # default through e.g. -DYJIT_FORCE_ENABLE. Can't enable ZJIT when YJIT is on.
+    assert_separately(["--disable-all"], <<~'RUBY')
+      refute_predicate RubyVM::ZJIT, :enabled?
+      refute_predicate RubyVM::ZJIT, :stats_enabled?
+      refute_includes RUBY_DESCRIPTION, "+ZJIT"
+
+      RubyVM::ZJIT.enable
+
+      assert_predicate RubyVM::ZJIT, :enabled?
+      refute_predicate RubyVM::ZJIT, :stats_enabled?
+      assert_includes RUBY_DESCRIPTION, "+ZJIT"
+    RUBY
+  end
+
+  def test_zjit_disable
+    assert_separately(["--zjit", "--zjit-disable"], <<~'RUBY')
+      refute_predicate RubyVM::ZJIT, :enabled?
+      refute_includes RUBY_DESCRIPTION, "+ZJIT"
+
+      RubyVM::ZJIT.enable
+
+      assert_predicate RubyVM::ZJIT, :enabled?
+      assert_includes RUBY_DESCRIPTION, "+ZJIT"
+    RUBY
+  end
+
+  def test_zjit_enable_respects_existing_options
+    assert_separately(['--zjit-disable', '--zjit-stats-quiet'], <<~RUBY)
+      refute_predicate RubyVM::ZJIT, :enabled?
+      assert_predicate RubyVM::ZJIT, :stats_enabled?
+
+      RubyVM::ZJIT.enable
+
+      assert_predicate RubyVM::ZJIT, :enabled?
+      assert_predicate RubyVM::ZJIT, :stats_enabled?
+    RUBY
+  end
+
+  def test_call_itself
+    assert_compiles '42', <<~RUBY, call_threshold: 2
+      def test = 42.itself
+      test
+      test
+    RUBY
+  end
+
+  def test_nil
+    assert_compiles 'nil', %q{
+      def test = nil
+      test
+    }
+  end
+
+  def test_putobject
+    assert_compiles '1', %q{
+      def test = 1
+      test
+    }
+  end
+
+  def test_putstring
+    assert_compiles '""', %q{
+      def test = "#{""}"
+      test
+    }, insns: [:putstring]
+  end
+
+  def test_putchilldedstring
+    assert_compiles '""', %q{
+      def test = ""
+      test
+    }, insns: [:putchilledstring]
+  end
+
+  def test_leave_param
+    assert_compiles '5', %q{
+      def test(n) = n
+      test(5)
+    }
+  end
+
+  def test_getglobal_with_warning
+    assert_compiles('"rescued"', %q{
+      Warning[:deprecated] = true
+
+      module Warning
+        def warn(message)
+          raise
+        end
+      end
+
+      def test
+        $=
+      rescue
+        "rescued"
+      end
+
+      $VERBOSE = true
+      test
+    }, insns: [:getglobal])
+  end
+
+  def test_setglobal
+    assert_compiles '1', %q{
+      def test
+        $a = 1
+        $a
+      end
+
+      test
+    }, insns: [:setglobal]
+  end
+
+  def test_string_intern
+    assert_compiles ':foo123', %q{
+      def test
+        :"foo#{123}"
+      end
+
+      test
+    }, insns: [:intern]
+  end
+
+  def test_duphash
+    assert_compiles '{a: 1}', %q{
+      def test
+        {a: 1}
+      end
+
+      test
+    }, insns: [:duphash]
+  end
+
+  def test_pushtoarray
+    assert_compiles '[1, 2, 3]', %q{
+      def test
+        [*[], 1, 2, 3]
+      end
+      test
+    }, insns: [:pushtoarray]
+  end
+
+  def test_splatarray_new_array
+    assert_compiles '[1, 2, 3]', %q{
+      def test a
+        [*a, 3]
+      end
+      test [1, 2]
+    }, insns: [:splatarray]
+  end
+
+  def test_splatarray_existing_array
+    assert_compiles '[1, 2, 3]', %q{
+      def foo v
+        [1, 2, v]
+      end
+      def test a
+        foo(*a)
+      end
+      test [3]
+    }, insns: [:splatarray]
+  end
+
+  def test_concattoarray
+    assert_compiles '[1, 2, 3]', %q{
+      def test(*a)
+        [1, 2, *a]
+      end
+      test 3
+    }, insns: [:concattoarray]
+  end
+
+  def test_definedivar
+    assert_compiles '[nil, "instance-variable", nil]', %q{
+      def test
+        v0 = defined?(@a)
+        @a = nil
+        v1 = defined?(@a)
+        remove_instance_variable :@a
+        v2 = defined?(@a)
+        [v0, v1, v2]
+      end
+      test
+    }, insns: [:definedivar]
+  end
+
+  def test_setglobal_with_trace_var_exception
+    assert_compiles '"rescued"', %q{
+      def test
+        $a = 1
+      rescue
+        "rescued"
+      end
+
+      trace_var(:$a) { raise }
+      test
+    }, insns: [:setglobal]
+  end
+
+  def test_toplevel_binding
+    # Not using assert_compiles, which doesn't use the toplevel frame for `test_script`.
+    out, err, status = eval_with_jit(%q{
+      a = 1
+      b = 2
+      TOPLEVEL_BINDING.local_variable_set(:b, 3)
+      c = 4
+      print [a, b, c]
+    })
+    assert_success(out, err, status)
+    assert_equal "[1, 3, 4]", out
+  end
+
+  def test_toplevel_local_after_eval
+    # Not using assert_compiles, which doesn't use the toplevel frame for `test_script`.
+    out, err, status = eval_with_jit(%q{
+      a = 1
+      b = 2
+      eval('b = 3')
+      c = 4
+      print [a, b, c]
+    })
+    assert_success(out, err, status)
+    assert_equal "[1, 3, 4]", out
+  end
+
+  def test_getlocal_after_eval
+    assert_compiles '2', %q{
+      def test
+        a = 1
+        eval('a = 2')
+        a
+      end
+      test
+    }
+  end
+
+  def test_getlocal_after_instance_eval
+    assert_compiles '2', %q{
+      def test
+        a = 1
+        instance_eval('a = 2')
+        a
+      end
+      test
+    }
+  end
+
+  def test_getlocal_after_module_eval
+    assert_compiles '2', %q{
+      def test
+        a = 1
+        Kernel.module_eval('a = 2')
+        a
+      end
+      test
+    }
+  end
+
+  def test_getlocal_after_class_eval
+    assert_compiles '2', %q{
+      def test
+        a = 1
+        Kernel.class_eval('a = 2')
+        a
+      end
+      test
+    }
+  end
+
+  def test_setlocal
+    assert_compiles '3', %q{
+      def test(n)
+        m = n
+        m
+      end
+      test(3)
+    }
+  end
+
+  def test_return_nonparam_local
+    # Use dead code (if false) to create a local without initialization instructions.
+    assert_compiles 'nil', %q{
+      def foo(a)
+        if false
+          x = nil
+        end
+        x
+      end
+      def test = foo(1)
+      test
+      test
+    }, call_threshold: 2
+  end
+
+  def test_nonparam_local_nil_in_jit_call
+    # Non-parameter locals must be initialized to nil in JIT-to-JIT calls.
+    # Use dead code (if false) to create locals without initialization instructions.
+    # Then eval a string that accesses the uninitialized locals.
+    assert_compiles '["x", "x", "x", "x"]', %q{
+      def f(a)
+        a ||= 1
+        if false; b = 1; end
+        eval("-> { p 'x#{b}' }")
+      end
+
+      4.times.map { f(1).call }
+    }, call_threshold: 2
+  end
+
+  def test_setlocal_on_eval
+    assert_compiles '1', %q{
+      @b = binding
+      eval('a = 1', @b)
+      eval('a', @b)
+    }
+  end
+
+  def test_optional_arguments
+    assert_compiles '[[1, 2, 3], [10, 20, 3], [100, 200, 300]]', %q{
+      def test(a, b = 2, c = 3)
+        [a, b, c]
+      end
+      [test(1), test(10, 20), test(100, 200, 300)]
+    }
+  end
+
+  def test_optional_arguments_setlocal
+    assert_compiles '[[2, 2], [1, nil]]', %q{
+      def test(a = (b = 2))
+        [a, b]
+      end
+      [test, test(1)]
+    }
+  end
+
+  def test_optional_arguments_cyclic
+    assert_compiles '[nil, 1]', %q{
+      test = proc { |a=a| a }
+      [test.call, test.call(1)]
+    }
+  end
+
+  def test_optional_arguments_side_exit
+    # This leads to FailedOptionalArguments, so not using assert_compiles
+    assert_runs '[:foo, nil, 1]', %q{
+      def test(a = (def foo = nil)) = a
+      [test, (undef :foo), test(1)]
+    }
+  end
+
+  def test_getblockparamproxy
+    assert_compiles '1', %q{
+      def test(&block)
+        0.then(&block)
+      end
+      test { 1 }
+    }, insns: [:getblockparamproxy]
+  end
+
+  def test_call_a_forwardable_method
+    assert_runs '[]', %q{
+      def test_root = forwardable
+      def forwardable(...) = Array.[](...)
+      test_root
+      test_root
+    }, call_threshold: 2
+  end
+
+  def test_setlocal_on_eval_with_spill
+    assert_compiles '1', %q{
+      @b = binding
+      eval('a = 1; itself', @b)
+      eval('a', @b)
+    }
+  end
+
+  def test_nested_local_access
+    assert_compiles '[1, 2, 3]', %q{
+      1.times do |l2|
+        1.times do |l1|
+          define_method(:test) do
+            l1 = 1
+            l2 = 2
+            l3 = 3
+            [l1, l2, l3]
+          end
+        end
+      end
+
+      test
+      test
+      test
+    }, call_threshold: 3, insns: [:getlocal, :setlocal, :getlocal_WC_0, :setlocal_WC_1]
+  end
+
+  def test_send_with_local_written_by_blockiseq
+    assert_compiles '[1, 2]', %q{
+      def test
+        l1 = nil
+        l2 = nil
+        tap do |_|
+          l1 = 1
+          tap do |_|
+            l2 = 2
+          end
+        end
+
+        [l1, l2]
+      end
+
+      test
+      test
+    }, call_threshold: 2
+  end
+
+  def test_send_without_block
+    assert_compiles '[1, 2, 3]', %q{
+      def foo = 1
+      def bar(a) = a - 1
+      def baz(a, b) = a - b
+
+      def test1 = foo
+      def test2 = bar(3)
+      def test3 = baz(4, 1)
+
+      [test1, test2, test3]
+    }
+  end
+
+  def test_send_with_six_args
+    assert_compiles '[1, 2, 3, 4, 5, 6]', %q{
+      def foo(a1, a2, a3, a4, a5, a6)
+        [a1, a2, a3, a4, a5, a6]
+      end
+
+      def test
+        foo(1, 2, 3, 4, 5, 6)
+      end
+
+      test # profile send
+      test
+    }, call_threshold: 2
+  end
+
+  def test_send_on_heap_object_in_spilled_arg
+    # This leads to a register spill, so not using `assert_compiles`
+    assert_runs 'Hash', %q{
+      def entry(a1, a2, a3, a4, a5, a6, a7, a8, a9)
+        a9.itself.class
+      end
+
+      entry(1, 2, 3, 4, 5, 6, 7, 8, {}) # profile
+      entry(1, 2, 3, 4, 5, 6, 7, 8, {})
+    }, call_threshold: 2
+  end
+
+  def test_send_exit_with_uninitialized_locals
+    assert_runs 'nil', %q{
+      def entry(init)
+        function_stub_exit(init)
+      end
+
+      def function_stub_exit(init)
+        uninitialized_local = 1 if init
+        uninitialized_local
+      end
+
+      entry(true) # profile and set 1 to the local slot
+      entry(false)
+    }, call_threshold: 2, allowed_iseqs: 'entry@-e:2'
+  end
+
+  def test_send_optional_arguments
+    assert_compiles '[[1, 2], [3, 4]]', %q{
+      def test(a, b = 2) = [a, b]
+      def entry = [test(1), test(3, 4)]
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_nil_block_arg
+    assert_compiles 'false', %q{
+      def test = block_given?
+      def entry = test(&nil)
+      test
+    }
+  end
+
+  def test_send_symbol_block_arg
+    assert_compiles '["1", "2"]', %q{
+      def test = [1, 2].map(&:to_s)
+      test
+    }
+  end
+
+  def test_send_variadic_with_block
+    assert_compiles '[[1, "a"], [2, "b"], [3, "c"]]', %q{
+      A = [1, 2, 3]
+      B = ["a", "b", "c"]
+
+      def test
+        result = []
+        A.zip(B) { |x, y| result << [x, y] }
+        result
+      end
+
+      test; test
+    }, call_threshold: 2
+  end
+
+  def test_send_splat
+    assert_runs '[1, 2]', %q{
+      def test(a, b) = [a, b]
+      def entry(arr) = test(*arr)
+      entry([1, 2])
+    }
+  end
+
+  def test_send_kwarg
+    assert_runs '[1, 2]', %q{
+      def test(a:, b:) = [a, b]
+      def entry = test(b: 2, a: 1) # change order
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwarg_optional
+    assert_compiles '[1, 2]', %q{
+      def test(a: 1, b: 2) = [a, b]
+      def entry = test
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwarg_optional_too_many
+    assert_compiles '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]', %q{
+      def test(a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10) = [a, b, c, d, e, f, g, h, i, j]
+      def entry = test
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwarg_required_and_optional
+    assert_compiles '[3, 2]', %q{
+      def test(a:, b: 2) = [a, b]
+      def entry = test(a: 3)
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwarg_to_hash
+    assert_compiles '{a: 3}', %q{
+      def test(hash) = hash
+      def entry = test(a: 3)
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwarg_to_ccall
+    assert_compiles '["a", "b", "c"]', %q{
+      def test(s) = s.each_line(chomp: true).to_a
+      def entry = test(%(a\nb\nc))
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwarg_and_block_to_ccall
+    assert_compiles '["a", "b", "c"]', %q{
+      def test(s)
+        a = []
+        s.each_line(chomp: true) { |l| a << l }
+        a
+      end
+      def entry = test(%(a\nb\nc))
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwarg_with_too_many_args_to_c_call
+    assert_compiles '"a b c d {kwargs: :e}"', %q{
+      def test(a:, b:, c:, d:, e:) = sprintf("%s %s %s %s %s", a, b, c, d, kwargs: e)
+      def entry = test(e: :e, d: :d, c: :c, a: :a, b: :b)
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwsplat
+    assert_compiles '3', %q{
+      def test(a:) = a
+      def entry = test(**{a: 3})
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_kwrest
+    assert_compiles '{a: 3}', %q{
+      def test(**kwargs) = kwargs
+      def entry = test(a: 3)
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_req_kwreq
+    assert_compiles '[1, 3]', %q{
+      def test(a, c:) = [a, c]
+      def entry = test(1, c: 3)
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_req_opt_kwreq
+    assert_compiles '[[1, 2, 3], [-1, -2, -3]]', %q{
+      def test(a, b = 2, c:) = [a, b, c]
+      def entry = [test(1, c: 3), test(-1, -2, c: -3)] # specify all, change kw order
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_req_opt_kwreq_kwopt
+    assert_compiles '[[1, 2, 3, 4], [-1, -2, -3, -4]]', %q{
+      def test(a, b = 2, c:, d: 4) = [a, b, c, d]
+      def entry = [test(1, c: 3), test(-1, -2, d: -4, c: -3)] # specify all, change kw order
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_unexpected_keyword
+    assert_compiles ':error', %q{
+      def test(a: 1) = a*2
+      def entry
+        test(z: 2)
+      rescue ArgumentError
+        :error
+      end
+
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_all_arg_types
+    assert_compiles '[:req, :opt, :post, :kwr, :kwo, true]', %q{
+      def test(a, b = :opt, c, d:, e: :kwo) = [a, b, c, d, e, block_given?]
+      def entry = test(:req, :post, d: :kwr) {}
+      entry
+      entry
+    }, call_threshold: 2
+  end
+
+  def test_send_ccall_variadic_with_different_receiver_classes
+    assert_compiles '[true, true]', %q{
+      def test(obj) = obj.start_with?("a")
+      [test("abc"), test(:abc)]
+    }, call_threshold: 2
+  end
+
+  def test_forwardable_iseq
+    assert_compiles '1', %q{
+      def test(...) = 1
+      test
+    }
+  end
+
+  def test_sendforward
+    assert_compiles '[1, 2]', %q{
+      def callee(a, b) = [a, b]
+      def test(...) = callee(...)
+      test(1, 2)
+    }, insns: [:sendforward]
+  end
+
+  def test_iseq_with_optional_arguments
+    assert_compiles '[[1, 2], [3, 4]]', %q{
+      def test(a, b = 2) = [a, b]
+      [test(1), test(3, 4)]
+    }
+  end
+
+  def test_invokesuper
+    assert_compiles '[6, 60]', %q{
+      class Foo
+        def foo(a) = a + 1
+        def bar(a) = a + 10
+      end
+
+      class Bar < Foo
+        def foo(a) = super(a) + 2
+        def bar(a) = super + 20
+      end
+
+      bar = Bar.new
+      [bar.foo(3), bar.bar(30)]
+    }
+  end
+
+  def test_invokesuper_with_local_written_by_blockiseq
+    # Using `assert_runs` because we don't compile invokeblock yet
+    assert_runs '3', %q{
+      class Foo
+        def test
+          yield
+        end
+      end
+
+      class Bar < Foo
+        def test
+          a = 1
+          super do
+            a += 2
+          end
+          a
+        end
+      end
+
+      Bar.new.test
+    }
+  end
+
+  def test_invokebuiltin
+    # Not using assert_compiles due to register spill
+    assert_runs '["."]', %q{
+      def test = Dir.glob(".")
+      test
+    }
+  end
+
+  def test_invokebuiltin_delegate
+    assert_compiles '[[], true]', %q{
+      def test = [].clone(freeze: true)
+      r = test
+      [r, r.frozen?]
+    }
+  end
+
+  def test_opt_plus_const
+    assert_compiles '3', %q{
+      def test = 1 + 2
+      test # profile opt_plus
+      test
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_fixnum
+    assert_compiles '3', %q{
+      def test(a, b) = a + b
+      test(0, 1) # profile opt_plus
+      test(1, 2)
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_chain
+    assert_compiles '6', %q{
+      def test(a, b, c) = a + b + c
+      test(0, 1, 2) # profile opt_plus
+      test(1, 2, 3)
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_left_imm
+    assert_compiles '3', %q{
+      def test(a) = 1 + a
+      test(1) # profile opt_plus
+      test(2)
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_type_guard_exit
+    assert_compiles '[3, 3.0]', %q{
+      def test(a) = 1 + a
+      test(1) # profile opt_plus
+      [test(2), test(2.0)]
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_type_guard_exit_with_locals
+    assert_compiles '[6, 6.0]', %q{
+      def test(a)
+        local = 3
+        1 + a + local
+      end
+      test(1) # profile opt_plus
+      [test(2), test(2.0)]
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_type_guard_nested_exit
+    assert_compiles '[4, 4.0]', %q{
+      def side_exit(n) = 1 + n
+      def jit_frame(n) = 1 + side_exit(n)
+      def entry(n) = jit_frame(n)
+      entry(2) # profile send
+      [entry(2), entry(2.0)]
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_type_guard_nested_exit_with_locals
+    assert_compiles '[9, 9.0]', %q{
+      def side_exit(n)
+        local = 2
+        1 + n + local
+      end
+      def jit_frame(n)
+        local = 3
+        1 + side_exit(n) + local
+      end
+      def entry(n) = jit_frame(n)
+      entry(2) # profile send
+      [entry(2), entry(2.0)]
+    }, call_threshold: 2
+  end
+
+  # Test argument ordering
+  def test_opt_minus
+    assert_compiles '2', %q{
+      def test(a, b) = a - b
+      test(2, 1) # profile opt_minus
+      test(6, 4)
+    }, call_threshold: 2
+  end
+
+  def test_opt_mult
+    assert_compiles '6', %q{
+      def test(a, b) = a * b
+      test(1, 2) # profile opt_mult
+      test(2, 3)
+    }, call_threshold: 2
+  end
+
+  def test_opt_mult_overflow
+    assert_compiles '[6, -6, 9671406556917033397649408, -9671406556917033397649408, 21267647932558653966460912964485513216]', %q{
+      def test(a, b)
+        a * b
+      end
+      test(1, 1) # profile opt_mult
+
+      r1 = test(2, 3)
+      r2 = test(2, -3)
+      r3 = test(2 << 40, 2 << 41)
+      r4 = test(2 << 40, -2 << 41)
+      r5 = test(1 << 62, 1 << 62)
+
+      [r1, r2, r3, r4, r5]
+    }, call_threshold: 2
+  end
+
+  def test_opt_eq
+    assert_compiles '[true, false]', %q{
+      def test(a, b) = a == b
+      test(0, 2) # profile opt_eq
+      [test(1, 1), test(0, 1)]
+    }, insns: [:opt_eq], call_threshold: 2
+  end
+
+  def test_opt_eq_with_minus_one
+    assert_compiles '[false, true]', %q{
+      def test(a) = a == -1
+      test(1) # profile opt_eq
+      [test(0), test(-1)]
+    }, insns: [:opt_eq], call_threshold: 2
+  end
+
+  def test_opt_neq_dynamic
+    # TODO(max): Don't split this test; instead, run all tests with and without
+    # profiling.
+    assert_compiles '[false, true]', %q{
+      def test(a, b) = a != b
+      test(0, 2) # profile opt_neq
+      [test(1, 1), test(0, 1)]
+    }, insns: [:opt_neq], call_threshold: 1
+  end
+
+  def test_opt_neq_fixnum
+    assert_compiles '[false, true]', %q{
+      def test(a, b) = a != b
+      test(0, 2) # profile opt_neq
+      [test(1, 1), test(0, 1)]
+    }, call_threshold: 2
+  end
+
+  def test_opt_lt
+    assert_compiles '[true, false, false]', %q{
+      def test(a, b) = a < b
+      test(2, 3) # profile opt_lt
+      [test(0, 1), test(0, 0), test(1, 0)]
+    }, insns: [:opt_lt], call_threshold: 2
+  end
+
+  def test_opt_lt_with_literal_lhs
+    assert_compiles '[false, false, true]', %q{
+      def test(n) = 2 < n
+      test(2) # profile opt_lt
+      [test(1), test(2), test(3)]
+    }, insns: [:opt_lt], call_threshold: 2
+  end
+
+  def test_opt_le
+    assert_compiles '[true, true, false]', %q{
+      def test(a, b) = a <= b
+      test(2, 3) # profile opt_le
+      [test(0, 1), test(0, 0), test(1, 0)]
+    }, insns: [:opt_le], call_threshold: 2
+  end
+
+  def test_opt_gt
+    assert_compiles '[false, false, true]', %q{
+      def test(a, b) = a > b
+      test(2, 3) # profile opt_gt
+      [test(0, 1), test(0, 0), test(1, 0)]
+    }, insns: [:opt_gt], call_threshold: 2
+  end
+
+  def test_opt_empty_p
+    assert_compiles('[false, false, true]', <<~RUBY, insns: [:opt_empty_p])
+      def test(x) = x.empty?
+      return test([1]), test("1"), test({})
+    RUBY
+  end
+
+  def test_opt_succ
+    assert_compiles('[0, "B"]', <<~RUBY, insns: [:opt_succ])
+      def test(obj) = obj.succ
+      return test(-1), test("A")
+    RUBY
+  end
+
+  def test_opt_and
+    assert_compiles('[1, [3, 2, 1]]', <<~RUBY, insns: [:opt_and])
+      def test(x, y) = x & y
+      return test(0b1101, 3), test([3, 2, 1, 4], [8, 1, 2, 3])
+    RUBY
+  end
+
+  def test_opt_or
+    assert_compiles('[11, [3, 2, 1]]', <<~RUBY, insns: [:opt_or])
+      def test(x, y) = x | y
+      return test(0b1000, 3), test([3, 2, 1], [1, 2, 3])
+    RUBY
+  end
+
+  def test_fixnum_and
+    assert_compiles '[1, 2, 4]', %q{
+      def test(a, b) = a & b
+      [
+        test(5, 3),
+        test(0b011, 0b110),
+        test(-0b011, 0b110)
+      ]
+    }, call_threshold: 2, insns: [:opt_and]
+  end
+
+  def test_fixnum_and_side_exit
+    assert_compiles '[2, 2, false]', %q{
+      def test(a, b) = a & b
+      [
+        test(2, 2),
+        test(0b011, 0b110),
+        test(true, false)
+      ]
+    }, call_threshold: 2, insns: [:opt_and]
+  end
+
+  def test_fixnum_or
+    assert_compiles '[7, 3, -3]', %q{
+      def test(a, b) = a | b
+      [
+        test(5, 3),
+        test(1, 2),
+        test(1, -4)
+      ]
+    }, call_threshold: 2, insns: [:opt_or]
+  end
+
+  def test_fixnum_or_side_exit
+    assert_compiles '[3, 2, true]', %q{
+      def test(a, b) = a | b
+      [
+        test(1, 2),
+        test(2, 2),
+        test(true, false)
+      ]
+    }, call_threshold: 2, insns: [:opt_or]
+  end
+
+  def test_fixnum_xor
+    assert_compiles '[6, -8, 3]', %q{
+      def test(a, b) = a ^ b
+      [
+        test(5, 3),
+        test(-5, 3),
+        test(1, 2)
+      ]
+    }, call_threshold: 2
+  end
+
+  def test_fixnum_xor_side_exit
+    assert_compiles '[6, 6, true]', %q{
+      def test(a, b) = a ^ b
+      [
+        test(5, 3),
+        test(5, 3),
+        test(true, false)
+      ]
+    }, call_threshold: 2
+  end
+
+  def test_fixnum_mul
+    assert_compiles '12', %q{
+      C = 3
+      def test(n) = C * n
+      test(4)
+      test(4)
+      test(4)
+    }, call_threshold: 2, insns: [:opt_mult]
+  end
+
+  def test_fixnum_div
+    assert_compiles '12', %q{
+      C = 48
+      def test(n) = C / n
+      test(4)
+      test(4)
+    }, call_threshold: 2, insns: [:opt_div]
+  end
+
+  def test_fixnum_floor
+    assert_compiles '0', %q{
+      C = 3
+      def test(n) = C / n
+      test(4)
+      test(4)
+    }, call_threshold: 2, insns: [:opt_div]
+  end
+
+  def test_fixnum_div_zero
+    assert_runs '"divided by 0"', %q{
+      def test(n)
+        n / 0
+      rescue ZeroDivisionError => e
+        e.message
+      end
+
+      test(0)
+      test(0)
+    }, call_threshold: 2, insns: [:opt_div]
+  end
+
+  def test_opt_not
+    assert_compiles('[true, true, false]', <<~RUBY, insns: [:opt_not])
+      def test(obj) = !obj
+      return test(nil), test(false), test(0)
+    RUBY
+  end
+
+  def test_opt_regexpmatch2
+    assert_compiles('[1, nil]', <<~RUBY, insns: [:opt_regexpmatch2])
+      def test(haystack) = /needle/ =~ haystack
+      return test("kneedle"), test("")
+    RUBY
+  end
+
+  def test_opt_ge
+    assert_compiles '[false, true, true]', %q{
+      def test(a, b) = a >= b
+      test(2, 3) # profile opt_ge
+      [test(0, 1), test(0, 0), test(1, 0)]
+    }, insns: [:opt_ge], call_threshold: 2
+  end
+
+  def test_opt_new_does_not_push_frame
+    assert_compiles 'nil', %q{
+      class Foo
+        attr_reader :backtrace
+
+        def initialize
+          @backtrace = caller
+        end
+      end
+      def test = Foo.new
+
+      foo = test
+      foo.backtrace.find do |frame|
+        frame.include?('Class#new')
+      end
+    }, insns: [:opt_new]
+  end
+
+  def test_opt_new_with_redefined
+    assert_compiles '"foo"', %q{
+      class Foo
+        def self.new = "foo"
+
+        def initialize = raise("unreachable")
+      end
+      def test = Foo.new
+
+      test
+    }, insns: [:opt_new]
+  end
+
+  def test_opt_new_invalidate_new
+    assert_compiles '["Foo", "foo"]', %q{
+      class Foo; end
+      def test = Foo.new
+      test; test
+      result = [test.class.name]
+      def Foo.new = "foo"
+      result << test
+      result
+    }, insns: [:opt_new], call_threshold: 2
+  end
+
+  def test_opt_new_with_custom_allocator
+    assert_compiles '"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"', %q{
+      require "digest"
+      def test = Digest::SHA256.new.hexdigest
+      test; test
+    }, insns: [:opt_new], call_threshold: 2
+  end
+
+  def test_opt_new_with_custom_allocator_raises
+    assert_compiles '[42, 42]', %q{
+      require "digest"
+      class C < Digest::Base; end
+      def test
+        begin
+          Digest::Base.new
+        rescue NotImplementedError
+          42
+        end
+      end
+      [test, test]
+    }, insns: [:opt_new], call_threshold: 2
+  end
+
+  def test_opt_newarray_send_include_p
+    assert_compiles '[true, false]', %q{
+      def test(x)
+        [:y, 1, Object.new].include?(x)
+      end
+      [test(1), test("n")]
+    }, insns: [:opt_newarray_send], call_threshold: 1
+  end
+
+  def test_opt_newarray_send_include_p_redefined
+    assert_compiles '[:true, :false]', %q{
+      class Array
+        alias_method :old_include?, :include?
+        def include?(x)
+          old_include?(x) ? :true : :false
+        end
+      end
+
+      def test(x)
+        [:y, 1, Object.new].include?(x)
+      end
+      [test(1), test("n")]
+    }, insns: [:opt_newarray_send], call_threshold: 1
+  end
+
+  def test_opt_duparray_send_include_p
+    assert_compiles '[true, false]', %q{
+      def test(x)
+        [:y, 1].include?(x)
+      end
+      [test(1), test("n")]
+    }, insns: [:opt_duparray_send], call_threshold: 1
+  end
+
+  def test_opt_duparray_send_include_p_redefined
+    assert_compiles '[:true, :false]', %q{
+      class Array
+        alias_method :old_include?, :include?
+        def include?(x)
+          old_include?(x) ? :true : :false
+        end
+      end
+
+      def test(x)
+        [:y, 1].include?(x)
+      end
+      [test(1), test("n")]
+    }, insns: [:opt_duparray_send], call_threshold: 1
+  end
+
+  def test_opt_newarray_send_pack_buffer
+    assert_compiles '["ABC", "ABC", "ABC", "ABC"]', %q{
+      def test(num, buffer)
+        [num].pack('C', buffer:)
+      end
+      buf = ""
+      [test(65, buf), test(66, buf), test(67, buf), buf]
+    }, insns: [:opt_newarray_send], call_threshold: 1
+  end
+
+  def test_opt_newarray_send_pack_buffer_redefined
+    assert_compiles '["b", "A"]', %q{
+      class Array
+        alias_method :old_pack, :pack
+        def pack(fmt, buffer: nil)
+          old_pack(fmt, buffer: buffer)
+          "b"
+        end
+      end
+
+      def test(num, buffer)
+        [num].pack('C', buffer:)
+      end
+      buf = ""
+      [test(65, buf), buf]
+    }, insns: [:opt_newarray_send], call_threshold: 1
+  end
+
+  def test_opt_newarray_send_hash
+    assert_compiles 'Integer', %q{
+      def test(x)
+        [1, 2, x].hash
+      end
+      test(20).class
+    }, insns: [:opt_newarray_send], call_threshold: 1
+  end
+
+  def test_opt_newarray_send_hash_redefined
+    assert_compiles '42', %q{
+      Array.class_eval { def hash = 42 }
+
+      def test(x)
+        [1, 2, x].hash
+      end
+      test(20)
+    }, insns: [:opt_newarray_send], call_threshold: 1
+  end
+
+  def test_opt_newarray_send_max
+    assert_compiles '[20, 40]', %q{
+      def test(a,b) = [a,b].max
+      [test(10, 20), test(40, 30)]
+    }, insns: [:opt_newarray_send], call_threshold: 1
+  end
+
+  def test_opt_newarray_send_max_redefined
+    assert_compiles '[60, 90]', %q{
+      class Array
+        alias_method :old_max, :max
+        def max
+          old_max * 2
+        end
+      end
+
+      def test(a,b) = [a,b].max
+      [test(15, 30), test(45, 35)]
+    }, insns: [:opt_newarray_send], call_threshold: 1
+  end
+
+  def test_new_hash_empty
+    assert_compiles '{}', %q{
+      def test = {}
+      test
+    }, insns: [:newhash]
+  end
+
+  def test_new_hash_nonempty
+    assert_compiles '{"key" => "value", 42 => 100}', %q{
+      def test
+        key = "key"
+        value = "value"
+        num = 42
+        result = 100
+        {key => value, num => result}
+      end
+      test
+    }, insns: [:newhash]
+  end
+
+  def test_new_hash_single_key_value
+    assert_compiles '{"key" => "value"}', %q{
+      def test = {"key" => "value"}
+      test
+    }, insns: [:newhash]
+  end
+
+  def test_new_hash_with_computation
+    assert_compiles '{"sum" => 5, "product" => 6}', %q{
+      def test(a, b)
+        {"sum" => a + b, "product" => a * b}
+      end
+      test(2, 3)
+    }, insns: [:newhash]
+  end
+
+  def test_new_hash_with_user_defined_hash_method
+    assert_runs 'true', %q{
+      class CustomKey
+        attr_reader :val
+
+        def initialize(val)
+          @val = val
+        end
+
+        def hash
+          @val.hash
+        end
+
+        def eql?(other)
+          other.is_a?(CustomKey) && @val == other.val
+        end
+      end
+
+      def test
+        key = CustomKey.new("key")
+        hash = {key => "value"}
+        hash[key] == "value"
+      end
+      test
+    }
+  end
+
+  def test_new_hash_with_user_hash_method_exception
+    assert_runs 'RuntimeError', %q{
+      class BadKey
+        def hash
+          raise "Hash method failed!"
+        end
+      end
+
+      def test
+        key = BadKey.new
+        {key => "value"}
+      end
+
+      begin
+        test
+      rescue => e
+        e.class
+      end
+    }
+  end
+
+  def test_new_hash_with_user_eql_method_exception
+    assert_runs 'RuntimeError', %q{
+      class BadKey
+        def hash
+          42
+        end
+
+        def eql?(other)
+          raise "Eql method failed!"
+        end
+      end
+
+      def test
+        key1 = BadKey.new
+        key2 = BadKey.new
+        {key1 => "value1", key2 => "value2"}
+      end
+
+      begin
+        test
+      rescue => e
+        e.class
+      end
+    }
+  end
+
+  def test_opt_hash_freeze
+    assert_compiles "[{}, 5]", %q{
+      def test = {}.freeze
+      result = [test]
+      class Hash
+        def freeze = 5
+      end
+      result << test
+    }, insns: [:opt_hash_freeze], call_threshold: 1
+  end
+
+  def test_opt_hash_freeze_rewritten
+    assert_compiles "5", %q{
+      class Hash
+        def freeze = 5
+      end
+      def test = {}.freeze
+      test
+    }, insns: [:opt_hash_freeze], call_threshold: 1
+  end
+
+  def test_opt_aset_hash
+    assert_compiles '42', %q{
+      def test(h, k, v)
+        h[k] = v
+      end
+      h = {}
+      test(h, :key, 42)
+      test(h, :key, 42)
+      h[:key]
+    }, call_threshold: 2, insns: [:opt_aset]
+  end
+
+  def test_opt_aset_hash_returns_value
+    assert_compiles '100', %q{
+      def test(h, k, v)
+        h[k] = v
+      end
+      test({}, :key, 100)
+      test({}, :key, 100)
+    }, call_threshold: 2
+  end
+
+  def test_opt_aset_hash_string_key
+    assert_compiles '"bar"', %q{
+      def test(h, k, v)
+        h[k] = v
+      end
+      h = {}
+      test(h, "foo", "bar")
+      test(h, "foo", "bar")
+      h["foo"]
+    }, call_threshold: 2
+  end
+
+  def test_opt_aset_hash_subclass
+    assert_compiles '42', %q{
+      class MyHash < Hash; end
+      def test(h, k, v)
+        h[k] = v
+      end
+      h = MyHash.new
+      test(h, :key, 42)
+      test(h, :key, 42)
+      h[:key]
+    }, call_threshold: 2
+  end
+
+  def test_opt_aset_hash_too_few_args
+    assert_compiles '"ArgumentError"', %q{
+      def test(h)
+        h.[]= 123
+      rescue ArgumentError
+        "ArgumentError"
+      end
+      test({})
+      test({})
+    }, call_threshold: 2
+  end
+
+  def test_opt_aset_hash_too_many_args
+    assert_compiles '"ArgumentError"', %q{
+      def test(h)
+        h[:a, :b] = :c
+      rescue ArgumentError
+        "ArgumentError"
+      end
+      test({})
+      test({})
+    }, call_threshold: 2
+  end
+
+  def test_opt_ary_freeze
+    assert_compiles "[[], 5]", %q{
+      def test = [].freeze
+      result = [test]
+      class Array
+        def freeze = 5
+      end
+      result << test
+    }, insns: [:opt_ary_freeze], call_threshold: 1
+  end
+
+  def test_opt_ary_freeze_rewritten
+    assert_compiles "5", %q{
+      class Array
+        def freeze = 5
+      end
+      def test = [].freeze
+      test
+    }, insns: [:opt_ary_freeze], call_threshold: 1
+  end
+
+  def test_opt_str_freeze
+    assert_compiles "[\"\", 5]", %q{
+      def test = ''.freeze
+      result = [test]
+      class String
+        def freeze = 5
+      end
+      result << test
+    }, insns: [:opt_str_freeze], call_threshold: 1
+  end
+
+  def test_opt_str_freeze_rewritten
+    assert_compiles "5", %q{
+      class String
+        def freeze = 5
+      end
+      def test = ''.freeze
+      test
+    }, insns: [:opt_str_freeze], call_threshold: 1
+  end
+
+  def test_opt_str_uminus
+    assert_compiles "[\"\", 5]", %q{
+      def test = -''
+      result = [test]
+      class String
+        def -@ = 5
+      end
+      result << test
+    }, insns: [:opt_str_uminus], call_threshold: 1
+  end
+
+  def test_opt_str_uminus_rewritten
+    assert_compiles "5", %q{
+      class String
+        def -@ = 5
+      end
+      def test = -''
+      test
+    }, insns: [:opt_str_uminus], call_threshold: 1
+  end
+
+  def test_new_array_empty
+    assert_compiles '[]', %q{
+      def test = []
+      test
+    }, insns: [:newarray]
+  end
+
+  def test_new_array_nonempty
+    assert_compiles '[5]', %q{
+      def a = 5
+      def test = [a]
+      test
+    }
+  end
+
+  def test_new_array_order
+    assert_compiles '[3, 2, 1]', %q{
+      def a = 3
+      def b = 2
+      def c = 1
+      def test = [a, b, c]
+      test
+    }
+  end
+
+  def test_array_dup
+    assert_compiles '[1, 2, 3]', %q{
+      def test = [1,2,3]
+      test
+    }
+  end
+
+  def test_array_fixnum_aref
+    assert_compiles '3', %q{
+      def test(x) = [1,2,3][x]
+      test(2)
+      test(2)
+    }, call_threshold: 2, insns: [:opt_aref]
+  end
+
+  def test_empty_array_pop
+    assert_compiles 'nil', %q{
+      def test(arr) = arr.pop
+      test([])
+      test([])
+    }, call_threshold: 2
+  end
+
+  def test_array_pop_no_arg
+    assert_compiles '42', %q{
+      def test(arr) = arr.pop
+      test([32, 33, 42])
+      test([32, 33, 42])
+    }, call_threshold: 2
+  end
+
+  def test_array_pop_arg
+    assert_compiles '[33, 42]', %q{
+      def test(arr) = arr.pop(2)
+      test([32, 33, 42])
+      test([32, 33, 42])
+    }, call_threshold: 2
+  end
+
+  def test_new_range_inclusive
+    assert_compiles '1..5', %q{
+      def test(a, b) = a..b
+      test(1, 5)
+    }
+  end
+
+  def test_new_range_exclusive
+    assert_compiles '1...5', %q{
+      def test(a, b) = a...b
+      test(1, 5)
+    }
+  end
+
+  def test_new_range_with_literal
+    assert_compiles '3..10', %q{
+      def test(n) = n..10
+      test(3)
+    }
+  end
+
+  def test_new_range_fixnum_both_literals_inclusive
+    assert_compiles '1..2', %q{
+      def test()
+        a = 2
+        (1..a)
+      end
+      test; test
+    }, call_threshold: 2, insns: [:newrange]
+  end
+
+  def test_new_range_fixnum_both_literals_exclusive
+    assert_compiles '1...2', %q{
+      def test()
+        a = 2
+        (1...a)
+      end
+      test; test
+    }, call_threshold: 2, insns: [:newrange]
+  end
+
+  def test_new_range_fixnum_low_literal_inclusive
+    assert_compiles '1..3', %q{
+      def test(a)
+        (1..a)
+      end
+      test(2); test(3)
+    }, call_threshold: 2, insns: [:newrange]
+  end
+
+  def test_new_range_fixnum_low_literal_exclusive
+    assert_compiles '1...3', %q{
+      def test(a)
+        (1...a)
+      end
+      test(2); test(3)
+    }, call_threshold: 2, insns: [:newrange]
+  end
+
+  def test_new_range_fixnum_high_literal_inclusive
+    assert_compiles '3..10', %q{
+      def test(a)
+        (a..10)
+      end
+      test(2); test(3)
+    }, call_threshold: 2, insns: [:newrange]
+  end
+
+  def test_new_range_fixnum_high_literal_exclusive
+    assert_compiles '3...10', %q{
+      def test(a)
+        (a...10)
+      end
+      test(2); test(3)
+    }, call_threshold: 2, insns: [:newrange]
+  end
+
+  def test_if
+    assert_compiles '[0, nil]', %q{
+      def test(n)
+        if n < 5
+          0
+        end
+      end
+      [test(3), test(7)]
+    }
+  end
+
+  def test_if_else
+    assert_compiles '[0, 1]', %q{
+      def test(n)
+        if n < 5
+          0
+        else
+          1
+        end
+      end
+      [test(3), test(7)]
+    }
+  end
+
+  def test_if_else_params
+    assert_compiles '[1, 20]', %q{
+      def test(n, a, b)
+        if n < 5
+          a
+        else
+          b
+        end
+      end
+      [test(3, 1, 2), test(7, 10, 20)]
+    }
+  end
+
+  def test_if_else_nested
+    assert_compiles '[3, 8, 9, 14]', %q{
+      def test(a, b, c, d, e)
+        if 2 < a
+          if a < 4
+            b
+          else
+            c
+          end
+        else
+          if a < 0
+            d
+          else
+            e
+          end
+        end
+      end
+      [
+        test(-1,  1,  2,  3,  4),
+        test( 0,  5,  6,  7,  8),
+        test( 3,  9, 10, 11, 12),
+        test( 5, 13, 14, 15, 16),
+      ]
+    }
+  end
+
+  def test_if_else_chained
+    assert_compiles '[12, 11, 21]', %q{
+      def test(a)
+        (if 2 < a then 1 else 2 end) + (if a < 4 then 10 else 20 end)
+      end
+      [test(0), test(3), test(5)]
+    }
+  end
+
+  def test_if_elsif_else
+    assert_compiles '[0, 2, 1]', %q{
+      def test(n)
+        if n < 5
+          0
+        elsif 8 < n
+          1
+        else
+          2
+        end
+      end
+      [test(3), test(7), test(9)]
+    }
+  end
+
+  def test_ternary_operator
+    assert_compiles '[1, 20]', %q{
+      def test(n, a, b)
+        n < 5 ? a : b
+      end
+      [test(3, 1, 2), test(7, 10, 20)]
+    }
+  end
+
+  def test_ternary_operator_nested
+    assert_compiles '[2, 21]', %q{
+      def test(n, a, b)
+        (n < 5 ? a : b) + 1
+      end
+      [test(3, 1, 2), test(7, 10, 20)]
+    }
+  end
+
+  def test_while_loop
+    assert_compiles '10', %q{
+      def test(n)
+        i = 0
+        while i < n
+          i = i + 1
+        end
+        i
+      end
+      test(10)
+    }
+  end
+
+  def test_while_loop_chain
+    assert_compiles '[135, 270]', %q{
+      def test(n)
+        i = 0
+        while i < n
+          i = i + 1
+        end
+        while i < n * 10
+          i = i * 3
+        end
+        i
+      end
+      [test(5), test(10)]
+    }
+  end
+
+  def test_while_loop_nested
+    assert_compiles '[0, 4, 12]', %q{
+      def test(n, m)
+        i = 0
+        while i < n
+          j = 0
+          while j < m
+            j += 2
+          end
+          i += j
+        end
+        i
+      end
+      [test(0, 0), test(1, 3), test(10, 5)]
+    }
+  end
+
+  def test_while_loop_if_else
+    assert_compiles '[9, -1]', %q{
+      def test(n)
+        i = 0
+        while i < n
+          if n >= 10
+            return -1
+          else
+            i = i + 1
+          end
+        end
+        i
+      end
+      [test(9), test(10)]
+    }
+  end
+
+  def test_if_while_loop
+    assert_compiles '[9, 12]', %q{
+      def test(n)
+        i = 0
+        if n < 10
+          while i < n
+            i += 1
+          end
+        else
+          while i < n
+            i += 3
+          end
+        end
+        i
+      end
+      [test(9), test(10)]
+    }
+  end
+
+  def test_live_reg_past_ccall
+    assert_compiles '2', %q{
+      def callee = 1
+      def test = callee + callee
+      test
+    }
+  end
+
+  def test_method_call
+    assert_compiles '12', %q{
+      def callee(a, b)
+        a - b
+      end
+
+      def test
+        callee(4, 2) + 10
+      end
+
+      test # profile test
+      test
+    }, call_threshold: 2
+  end
+
+  def test_recursive_fact
+    assert_compiles '[1, 6, 720]', %q{
+      def fact(n)
+        if n == 0
+          return 1
+        end
+        return n * fact(n-1)
+      end
+      [fact(0), fact(3), fact(6)]
+    }
+  end
+
+  def test_profiled_fact
+    assert_compiles '[1, 6, 720]', %q{
+      def fact(n)
+        if n == 0
+          return 1
+        end
+        return n * fact(n-1)
+      end
+      fact(1) # profile fact
+      [fact(0), fact(3), fact(6)]
+    }, call_threshold: 3, num_profiles: 2
+  end
+
+  def test_recursive_fib
+    assert_compiles '[0, 2, 3]', %q{
+      def fib(n)
+        if n < 2
+          return n
+        end
+        return fib(n-1) + fib(n-2)
+      end
+      [fib(0), fib(3), fib(4)]
+    }
+  end
+
+  def test_profiled_fib
+    assert_compiles '[0, 2, 3]', %q{
+      def fib(n)
+        if n < 2
+          return n
+        end
+        return fib(n-1) + fib(n-2)
+      end
+      fib(3) # profile fib
+      [fib(0), fib(3), fib(4)]
+    }, call_threshold: 5, num_profiles: 3
+  end
+
+  def test_spilled_basic_block_args
+    assert_compiles '55', %q{
+      def test(n1, n2)
+        n3 = 3
+        n4 = 4
+        n5 = 5
+        n6 = 6
+        n7 = 7
+        n8 = 8
+        n9 = 9
+        n10 = 10
+        if n1 < n2
+          n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8 + n9 + n10
+        end
+      end
+      test(1, 2)
+    }
+  end
+
+  def test_spilled_method_args
+    assert_runs '55', %q{
+      def foo(n1, n2, n3, n4, n5, n6, n7, n8, n9, n10)
+        n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8 + n9 + n10
+      end
+
+      def test
+        foo(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+      end
+
+      test
+    }
+
+    # TODO(Shopify/ruby#716): Support spills and change to assert_compiles
+    assert_runs '1', %q{
+      def a(n1,n2,n3,n4,n5,n6,n7,n8,n9) = n1+n9
+      a(2,0,0,0,0,0,0,0,-1)
+    }
+
+    # TODO(Shopify/ruby#716): Support spills and change to assert_compiles
+    assert_runs '0', %q{
+      def a(n1,n2,n3,n4,n5,n6,n7,n8) = n8
+      a(1,1,1,1,1,1,1,0)
+    }
+
+    # TODO(Shopify/ruby#716): Support spills and change to assert_compiles
+    # self param with spilled param
+    assert_runs '"main"', %q{
+      def a(n1,n2,n3,n4,n5,n6,n7,n8) = self
+      a(1,0,0,0,0,0,0,0).to_s
+    }
+  end
+
+  def test_spilled_param_new_arary
+    # TODO(Shopify/ruby#716): Support spills and change to assert_compiles
+    assert_runs '[:ok]', %q{
+      def a(n1,n2,n3,n4,n5,n6,n7,n8) = [n8]
+      a(0,0,0,0,0,0,0, :ok)
+    }
+  end
+
+  def test_forty_param_method
+    # This used to a trigger a miscomp on A64 due
+    # to a memory displacement larger than 9 bits.
+    # Using assert_runs again due to register spill.
+    # TODO: It should be fixed by register spill support.
+    assert_runs '1', %Q{
+      def foo(#{'_,' * 39} n40) = n40
+
+      foo(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1)
+    }
+  end
+
+  def test_putself
+    assert_compiles '3', %q{
+      class Integer
+        def minus(a)
+          self - a
+        end
+      end
+      5.minus(2)
+    }
+  end
+
+  def test_getinstancevariable
+    assert_compiles 'nil', %q{
+      def test() = @foo
+
+      test()
+    }
+    assert_compiles '3', %q{
+      @foo = 3
+      def test() = @foo
+
+      test()
+    }
+  end
+
+  def test_getinstancevariable_miss
+    assert_compiles '[1, 1, 4]', %q{
+      class C
+        def foo
+          @foo
+        end
+
+        def foo_then_bar
+          @foo = 1
+          @bar = 2
+        end
+
+        def bar_then_foo
+          @bar = 3
+          @foo = 4
+        end
+      end
+
+      o1 = C.new
+      o1.foo_then_bar
+      result = []
+      result << o1.foo
+      result << o1.foo
+      o2 = C.new
+      o2.bar_then_foo
+      result << o2.foo
+      result
+    }
+  end
+
+  def test_setinstancevariable
+    assert_compiles '1', %q{
+      def test() = @foo = 1
+
+      test()
+      @foo
+    }
+  end
+
+  def test_getclassvariable
+    assert_compiles '42', %q{
+      class Foo
+        def self.test = @@x
+      end
+
+      Foo.class_variable_set(:@@x, 42)
+      Foo.test()
+    }
+  end
+
+  def test_getclassvariable_raises
+    assert_compiles '"uninitialized class variable @@x in Foo"', %q{
+      class Foo
+        def self.test = @@x
+      end
+
+      begin
+        Foo.test
+      rescue NameError => e
+        e.message
+      end
+    }
+  end
+
+  def test_setclassvariable
+    assert_compiles '42', %q{
+      class Foo
+        def self.test = @@x = 42
+      end
+
+      Foo.test()
+      Foo.class_variable_get(:@@x)
+    }
+  end
+
+  def test_setclassvariable_raises
+    assert_compiles '"can\'t modify frozen Class: Foo"', %q{
+      class Foo
+        def self.test = @@x = 42
+        freeze
+      end
+
+      begin
+        Foo.test
+      rescue FrozenError => e
+        e.message
+      end
+    }
+  end
+
+  def test_attr_reader
+    assert_compiles '[4, 4]', %q{
+      class C
+        attr_reader :foo
+
+        def initialize
+          @foo = 4
+        end
+      end
+
+      def test(c) = c.foo
+      c = C.new
+      [test(c), test(c)]
+    }, call_threshold: 2, insns: [:opt_send_without_block]
+  end
+
+  def test_attr_accessor_getivar
+    assert_compiles '[4, 4]', %q{
+      class C
+        attr_accessor :foo
+
+        def initialize
+          @foo = 4
+        end
+      end
+
+      def test(c) = c.foo
+      c = C.new
+      [test(c), test(c)]
+    }, call_threshold: 2, insns: [:opt_send_without_block]
+  end
+
+  def test_attr_accessor_setivar
+    assert_compiles '[5, 5]', %q{
+      class C
+        attr_accessor :foo
+
+        def initialize
+          @foo = 4
+        end
+      end
+
+      def test(c)
+        c.foo = 5
+        c.foo
+      end
+
+      c = C.new
+      [test(c), test(c)]
+    }, call_threshold: 2, insns: [:opt_send_without_block]
+  end
+
+  def test_attr_writer
+    assert_compiles '[5, 5]', %q{
+      class C
+        attr_writer :foo
+
+        def initialize
+          @foo = 4
+        end
+
+        def get_foo = @foo
+      end
+
+      def test(c)
+        c.foo = 5
+        c.get_foo
+      end
+      c = C.new
+      [test(c), test(c)]
+    }, call_threshold: 2, insns: [:opt_send_without_block]
+  end
+
+  def test_uncached_getconstant_path
+    assert_compiles RUBY_COPYRIGHT.dump, %q{
+      def test = RUBY_COPYRIGHT
+      test
+    }, call_threshold: 1, insns: [:opt_getconstant_path]
+  end
+
+  def test_expandarray_no_splat
+    assert_compiles '[3, 4]', %q{
+      def test(o)
+        a, b = o
+        [a, b]
+      end
+      test [3, 4]
+    }, call_threshold: 1, insns: [:expandarray]
+  end
+
+  def test_expandarray_splat
+    assert_compiles '[3, [4]]', %q{
+      def test(o)
+        a, *b = o
+        [a, b]
+      end
+      test [3, 4]
+    }, call_threshold: 1, insns: [:expandarray]
+  end
+
+  def test_expandarray_splat_post
+    assert_compiles '[3, [4], 5]', %q{
+      def test(o)
+        a, *b, c = o
+        [a, b, c]
+      end
+      test [3, 4, 5]
+    }, call_threshold: 1, insns: [:expandarray]
+  end
+
+  def test_getconstant_path_autoload
+    # A constant-referencing expression can run arbitrary code through Kernel#autoload.
+    Dir.mktmpdir('autoload') do |tmpdir|
+      autoload_path = File.join(tmpdir, 'test_getconstant_path_autoload.rb')
+      File.write(autoload_path, 'X = RUBY_COPYRIGHT')
+
+      assert_compiles RUBY_COPYRIGHT.dump, %Q{
+        Object.autoload(:X, #{File.realpath(autoload_path).inspect})
+        def test = X
+        test
+      }, call_threshold: 1, insns: [:opt_getconstant_path]
+    end
+  end
+
+  def test_constant_invalidation
+    assert_compiles '123', <<~RUBY, call_threshold: 2, insns: [:opt_getconstant_path]
+      class C; end
+      def test = C
+      test
+      test
+
+      C = 123
+      test
+    RUBY
+  end
+
+  def test_constant_path_invalidation
+    assert_compiles '["Foo::C", "Foo::C", "Bar::C"]', <<~RUBY, call_threshold: 2, insns: [:opt_getconstant_path]
+      module A
+        module B; end
+      end
+
+      module Foo
+        C = "Foo::C"
+      end
+
+      module Bar
+        C = "Bar::C"
+      end
+
+      A::B = Foo
+
+      def test = A::B::C
+
+      result = []
+
+      result << test
+      result << test
+
+      A::B = Bar
+
+      result << test
+      result
+    RUBY
+  end
+
+  def test_single_ractor_mode_invalidation
+    # Without invalidating the single-ractor mode, the test would crash
+    assert_compiles '"errored but not crashed"', <<~RUBY, call_threshold: 2, insns: [:opt_getconstant_path]
+      C = Object.new
+
+      def test
+        C
+      rescue Ractor::IsolationError
+        "errored but not crashed"
+      end
+
+      test
+      test
+
+      Ractor.new {
+        test
+      }.value
+    RUBY
+  end
+
+  def test_dupn
+    assert_compiles '[[1], [1, 1], :rhs, [nil, :rhs]]', <<~RUBY, insns: [:dupn]
+      def test(array) = (array[1, 2] ||= :rhs)
+
+      one = [1, 1]
+      start_empty = []
+      [test(one), one, test(start_empty), start_empty]
+    RUBY
+  end
+
+  def test_send_backtrace
+    backtrace = [
+      "-e:2:in 'Object#jit_frame1'",
+      "-e:3:in 'Object#entry'",
+      "-e:5:in 'block in <main>'",
+      "-e:6:in '<main>'",
+    ]
+    assert_compiles backtrace.inspect, %q{
+      def jit_frame2 = caller     # 1
+      def jit_frame1 = jit_frame2 # 2
+      def entry = jit_frame1      # 3
+      entry # profile send        # 4
+      entry                       # 5
+    }, call_threshold: 2
+  end
+
+  def test_bop_invalidation
+    assert_compiles '100', %q{
+      def test
+        eval(<<~RUBY)
+          class Integer
+            def +(_) = 100
+          end
+        RUBY
+        1 + 2
+      end
+      test
+    }
+  end
+
+  def test_defined_with_defined_values
+    assert_compiles '["constant", "method", "global-variable"]', %q{
+      class Foo; end
+      def bar; end
+      $ruby = 1
+
+      def test = return defined?(Foo), defined?(bar), defined?($ruby)
+
+      test
+    }, insns: [:defined]
+  end
+
+  def test_defined_with_undefined_values
+    assert_compiles '[nil, nil, nil]', %q{
+      def test = return defined?(Foo), defined?(bar), defined?($ruby)
+
+      test
+    }, insns: [:defined]
+  end
+
+  def test_defined_with_method_call
+    assert_compiles '["method", nil]', %q{
+      def test = return defined?("x".reverse(1)), defined?("x".reverse(1).reverse)
+
+      test
+    }, insns: [:defined]
+  end
+
+  def test_defined_method_raise
+    assert_compiles '[nil, nil, nil]', %q{
+      class C
+        def assert_equal expected, actual
+          if expected != actual
+            raise "NO"
+          end
+        end
+
+        def test_defined_method
+          assert_equal(nil, defined?("x".reverse(1).reverse))
+        end
+      end
+
+      c = C.new
+      result = []
+      result << c.test_defined_method
+      result << c.test_defined_method
+      result << c.test_defined_method
+      result
+    }
+  end
+
+  def test_defined_yield
+    assert_compiles "nil", "defined?(yield)"
+    assert_compiles '[nil, nil, "yield"]', %q{
+      def test = defined?(yield)
+      [test, test, test{}]
+    }, call_threshold: 2, insns: [:defined]
+  end
+
+  def test_defined_yield_from_block
+    # This will do some EP hopping to find the local EP,
+    # so it's slightly different than doing it outside of a block.
+
+    assert_compiles '[nil, nil, "yield"]', %q{
+      def test
+        yield_self { yield_self { defined?(yield) } }
+      end
+
+      [test, test, test{}]
+    }, call_threshold: 2
+  end
+
+  def test_block_given_p
+    assert_compiles "false", "block_given?"
+    assert_compiles '[false, false, true]', %q{
+      def test = block_given?
+      [test, test, test{}]
+    }, call_threshold: 2, insns: [:opt_send_without_block]
+  end
+
+  def test_block_given_p_from_block
+    # This will do some EP hopping to find the local EP,
+    # so it's slightly different than doing it outside of a block.
+
+    assert_compiles '[false, false, true]', %q{
+      def test
+        yield_self { yield_self { block_given? } }
+      end
+
+      [test, test, test{}]
+    }, call_threshold: 2
+  end
+
+  def test_invokeblock_without_block_after_jit_call
+    assert_compiles '"no block given (yield)"', %q{
+      def test(*arr, &b)
+        arr.class
+        yield
+      end
+      begin
+        test
+      rescue => e
+        e.message
+      end
+    }
+  end
+
+  def test_putspecialobject_vm_core_and_cbase
+    assert_compiles '10', %q{
+      def test
+        alias bar test
+        10
+      end
+
+      test
+      bar
+    }, insns: [:putspecialobject]
+  end
+
+  def test_putspecialobject_const_base
+    assert_compiles '1', %q{
+      Foo = 1
+
+      def test = Foo
+
+      # First call: populates the constant cache
+      test
+      # Second call: triggers ZJIT compilation with warm cache
+      # RubyVM::ZJIT.assert_compiles will panic if this fails to compile
+      test
+    }, call_threshold: 2
+  end
+
+  def test_branchnil
+    assert_compiles '[2, nil]', %q{
+      def test(x)
+        x&.succ
+      end
+      [test(1), test(nil)]
+    }, call_threshold: 1, insns: [:branchnil]
+  end
+
+  def test_nil_nil
+    assert_compiles 'true', %q{
+      def test = nil.nil?
+      test
+    }, insns: [:opt_nil_p]
+  end
+
+  def test_non_nil_nil
+    assert_compiles 'false', %q{
+      def test = 1.nil?
+      test
+    }, insns: [:opt_nil_p]
+  end
+
+  def test_getspecial_last_match
+    assert_compiles '"hello"', %q{
+      def test(str)
+        str =~ /hello/
+        $&
+      end
+      test("hello world")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_match_pre
+    assert_compiles '"hello "', %q{
+      def test(str)
+        str =~ /world/
+        $`
+      end
+      test("hello world")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_match_post
+    assert_compiles '" world"', %q{
+      def test(str)
+        str =~ /hello/
+        $'
+      end
+      test("hello world")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_match_last_group
+    assert_compiles '"world"', %q{
+      def test(str)
+        str =~ /(hello) (world)/
+        $+
+      end
+      test("hello world")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_numbered_match_1
+    assert_compiles '"hello"', %q{
+      def test(str)
+        str =~ /(hello) (world)/
+        $1
+      end
+      test("hello world")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_numbered_match_2
+    assert_compiles '"world"', %q{
+      def test(str)
+        str =~ /(hello) (world)/
+        $2
+      end
+      test("hello world")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_numbered_match_nonexistent
+    assert_compiles 'nil', %q{
+      def test(str)
+        str =~ /(hello)/
+        $2
+      end
+      test("hello world")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_no_match
+    assert_compiles 'nil', %q{
+      def test(str)
+        str =~ /xyz/
+        $&
+      end
+      test("hello world")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_complex_pattern
+    assert_compiles '"123"', %q{
+      def test(str)
+        str =~ /(\d+)/
+        $1
+      end
+      test("abc123def")
+    }, insns: [:getspecial]
+  end
+
+  def test_getspecial_multiple_groups
+    assert_compiles '"456"', %q{
+      def test(str)
+        str =~ /(\d+)-(\d+)/
+        $2
+      end
+      test("123-456")
+    }, insns: [:getspecial]
+  end
+
+  # tool/ruby_vm/views/*.erb relies on the zjit instructions a) being contiguous and
+  # b) being reliably ordered after all the other instructions.
+  def test_instruction_order
+    insn_names = RubyVM::INSTRUCTION_NAMES
+    zjit, others = insn_names.map.with_index.partition { |name, _| name.start_with?('zjit_') }
+    zjit_indexes = zjit.map(&:last)
+    other_indexes = others.map(&:last)
+    zjit_indexes.product(other_indexes).each do |zjit_index, other_index|
+      assert zjit_index > other_index, "'#{insn_names[zjit_index]}' at #{zjit_index} "\
+        "must be defined after '#{insn_names[other_index]}' at #{other_index}"
+    end
+  end
+
+  def test_require_rubygems
+    assert_runs 'true', %q{
+      require 'rubygems'
+    }, call_threshold: 2
+  end
+
+  def test_require_rubygems_with_auto_compact
+    omit("GC.auto_compact= support is required for this test") unless GC.respond_to?(:auto_compact=)
+    assert_runs 'true', %q{
+      GC.auto_compact = true
+      require 'rubygems'
+    }, call_threshold: 2
+  end
+
+  def test_stats_availability
+    assert_runs '[true, true]', %q{
+      def test = 1
+      test
+      [
+        RubyVM::ZJIT.stats[:zjit_insn_count] > 0,
+        RubyVM::ZJIT.stats(:zjit_insn_count) > 0,
+      ]
+    }, stats: true
+  end
+
+  def test_stats_consistency
+    assert_runs '[]', %q{
+      def test = 1
+      test # increment some counters
+
+      RubyVM::ZJIT.stats.to_a.filter_map do |key, value|
+        # The value may be incremented, but the class should stay the same
+        other_value = RubyVM::ZJIT.stats(key)
+        if value.class != other_value.class
+          [key, value, other_value]
+        end
+      end
+    }, stats: true
+  end
+
+  def test_reset_stats
+    assert_runs 'true', %q{
+      def test = 1
+      100.times { test }
+
+      # Get initial stats and verify they're non-zero
+      initial_stats = RubyVM::ZJIT.stats
+
+      # Reset the stats
+      RubyVM::ZJIT.reset_stats!
+
+      # Get stats after reset
+      reset_stats = RubyVM::ZJIT.stats
+
+      [
+        # After reset, counters should be zero or at least much smaller
+        # (some instructions might execute between reset and reading stats)
+        :zjit_insn_count.then { |s| initial_stats[s] > 0 && reset_stats[s] < initial_stats[s] },
+        :compiled_iseq_count.then { |s| initial_stats[s] > 0 && reset_stats[s] < initial_stats[s] }
+      ].all?
+    }, stats: true
+  end
+
+  def test_zjit_option_uses_array_each_in_ruby
+    omit 'ZJIT wrongly compiles Array#each, so it is disabled for now'
+    assert_runs '"<internal:array>"', %q{
+      Array.instance_method(:each).source_location&.first
+    }
+  end
+
+  def test_profile_under_nested_jit_call
+    assert_compiles '[nil, nil, 3]', %q{
+      def profile
+        1 + 2
+      end
+
+      def jit_call(flag)
+        if flag
+          profile
+        end
+      end
+
+      def entry(flag)
+        jit_call(flag)
+      end
+
+      [entry(false), entry(false), entry(true)]
+    }, call_threshold: 2
+  end
+
+  def test_bop_redefined
+    assert_runs '[3, :+, 100]', %q{
+      def test
+        1 + 2
+      end
+
+      test # profile opt_plus
+      [test, Integer.class_eval { def +(_) = 100 }, test]
+    }, call_threshold: 2
+  end
+
+  def test_bop_redefined_with_adjacent_patch_points
+    assert_runs '[15, :+, 100]', %q{
+      def test
+        1 + 2 + 3 + 4 + 5
+      end
+
+      test # profile opt_plus
+      [test, Integer.class_eval { def +(_) = 100 }, test]
+    }, call_threshold: 2
+  end
+
+  # ZJIT currently only generates a MethodRedefined patch point when the method
+  # is called on the top-level self.
+  def test_method_redefined_with_top_self
+    assert_runs '["original", "redefined"]', %q{
+      def foo
+        "original"
+      end
+
+      def test = foo
+
+      test; test
+
+      result1 = test
+
+      # Redefine the method
+      def foo
+        "redefined"
+      end
+
+      result2 = test
+
+      [result1, result2]
+    }, call_threshold: 2
+  end
+
+  def test_method_redefined_with_module
+    assert_runs '["original", "redefined"]', %q{
+      module Foo
+        def self.foo = "original"
+      end
+
+      def test = Foo.foo
+      test
+      result1 = test
+
+      def Foo.foo = "redefined"
+      result2 = test
+
+      [result1, result2]
+    }, call_threshold: 2
+  end
+
+  def test_module_name_with_guard_passes
+    assert_compiles '"Integer"', %q{
+      def test(mod)
+        mod.name
+      end
+
+      test(String)
+      test(Integer)
+    }, call_threshold: 2
+  end
+
+  def test_module_name_with_guard_side_exit
+    # This test demonstrates that the guard side exit works correctly
+    # In this case, when we call with a non-Class object, it should fall back to interpreter
+    assert_compiles '["String", "Integer", "Bar"]', %q{
+      class MyClass
+        def name = "Bar"
+      end
+
+      def test(mod)
+        mod.name
+      end
+
+      results = []
+      results << test(String)
+      results << test(Integer)
+      results << test(MyClass.new)
+
+      results
+    }, call_threshold: 2
+  end
+
+  def test_objtostring_calls_to_s_on_non_strings
+    assert_compiles '["foo", "foo"]', %q{
+      results = []
+
+      class Foo
+        def to_s
+          "foo"
+        end
+      end
+
+      def test(str)
+        "#{str}"
+      end
+
+      results << test(Foo.new)
+      results << test(Foo.new)
+
+      results
+    }
+  end
+
+  def test_objtostring_rewrite_does_not_call_to_s_on_strings
+    assert_compiles '["foo", "foo"]', %q{
+      results = []
+
+      class String
+        def to_s
+          "bad"
+        end
+      end
+
+      def test(foo)
+        "#{foo}"
+      end
+
+      results << test("foo")
+      results << test("foo")
+
+      results
+    }
+  end
+
+  def test_objtostring_rewrite_does_not_call_to_s_on_string_subclasses
+    assert_compiles '["foo", "foo"]', %q{
+      results = []
+
+      class StringSubclass < String
+        def to_s
+          "bad"
+        end
+      end
+
+      foo = StringSubclass.new("foo")
+
+      def test(str)
+        "#{str}"
+      end
+
+      results << test(foo)
+      results << test(foo)
+
+      results
+    }
+  end
+
+  def test_objtostring_profiled_string_fastpath
+    assert_compiles '"foo"', %q{
+      def test(str)
+        "#{str}"
+      end
+      test('foo'); test('foo') # profile as string
+    }, call_threshold: 2
+  end
+
+  def test_objtostring_profiled_string_subclass_fastpath
+    assert_compiles '"foo"', %q{
+      class MyString < String; end
+
+      def test(str)
+        "#{str}"
+      end
+
+      foo = MyString.new("foo")
+      test(foo); test(foo) # still profiles as string
+    }, call_threshold: 2
+  end
+
+  def test_objtostring_profiled_string_fastpath_exits_on_nonstring
+    assert_compiles '"1"', %q{
+      def test(str)
+        "#{str}"
+      end
+
+      test('foo') # profile as string
+      test(1)
+    }, call_threshold: 2
+  end
+
+  def test_objtostring_profiled_nonstring_calls_to_s
+    assert_compiles '"[1, 2, 3]"', %q{
+      def test(str)
+        "#{str}"
+      end
+
+      test([1,2,3]); # profile as nonstring
+      test([1,2,3]);
+    }, call_threshold: 2
+  end
+
+  def test_objtostring_profiled_nonstring_guard_exits_when_string
+    assert_compiles '"foo"', %q{
+      def test(str)
+        "#{str}"
+      end
+
+      test([1,2,3]); # profiles as nonstring
+      test('foo');
+    }, call_threshold: 2
+  end
+
+  def test_string_bytesize_with_guard
+    assert_compiles '5', %q{
+      def test(str)
+        str.bytesize
+      end
+
+      test('hello')
+      test('world')
+    }, call_threshold: 2
+  end
+
+  def test_string_bytesize_multibyte
+    assert_compiles '4', %q{
+      def test(s)
+        s.bytesize
+      end
+
+      test("💎")
+    }, call_threshold: 2
+  end
+
+  def test_nil_value_nil_opt_with_guard
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(nil)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_nil_value_nil_opt_with_guard_side_exit
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(nil)
+      test(nil)
+      test(1)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_true_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(true)
+      test(true)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_true_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(true)
+      test(true)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_false_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(false)
+      test(false)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_false_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(false)
+      test(false)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_integer_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(1)
+      test(2)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_integer_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(1)
+      test(2)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_float_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(1.0)
+      test(2.0)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_float_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(1.0)
+      test(2.0)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_symbol_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(:foo)
+      test(:bar)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_symbol_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(:foo)
+      test(:bar)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_class_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(String)
+      test(Integer)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_class_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(String)
+      test(Integer)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_module_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(Enumerable)
+      test(Kernel)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_module_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(Enumerable)
+      test(Kernel)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_basic_object_guard_works_with_immediate
+    assert_compiles 'NilClass', %q{
+      class Foo; end
+
+      def test(val) = val.class
+
+      test(Foo.new)
+      test(Foo.new)
+      test(nil)
+    }, call_threshold: 2
+  end
+
+  def test_basic_object_guard_works_with_false
+    assert_compiles 'FalseClass', %q{
+      class Foo; end
+
+      def test(val) = val.class
+
+      test(Foo.new)
+      test(Foo.new)
+      test(false)
+    }, call_threshold: 2
+  end
+
+  def test_string_concat
+    assert_compiles '"123"', %q{
+      def test = "#{1}#{2}#{3}"
+
+      test
+    }, insns: [:concatstrings]
+  end
+
+  def test_string_concat_empty
+    assert_compiles '""', %q{
+      def test = "#{}"
+
+      test
+    }, insns: [:concatstrings]
+  end
+
+  def test_regexp_interpolation
+    assert_compiles '/123/', %q{
+      def test = /#{1}#{2}#{3}/
+
+      test
+    }, insns: [:toregexp]
+  end
+
+  def test_new_range_non_leaf
+    assert_compiles '(0/1)..1', %q{
+      def jit_entry(v) = make_range_then_exit(v)
+
+      def make_range_then_exit(v)
+        range = (v..1)
+        super rescue range # TODO(alan): replace super with side-exit intrinsic
+      end
+
+      jit_entry(0)    # profile
+      jit_entry(0)    # compile
+      jit_entry(0/1r) # run without stub
+    }, call_threshold: 2
+  end
+
+  def test_raise_in_second_argument
+    assert_compiles '{ok: true}', %q{
+      def write(hash, key)
+        hash[key] = raise rescue true
+        hash
+      end
+
+      write({}, :ok)
+    }
+  end
+
+  def test_ivar_attr_reader_optimization_with_multi_ractor_mode
+    assert_compiles '42', %q{
+      class Foo
+        class << self
+          attr_accessor :bar
+
+          def get_bar
+            bar
+          rescue Ractor::IsolationError
+            42
+          end
+        end
+      end
+
+      Foo.bar = [] # needs to be a ractor unshareable object
+
+      def test
+        Foo.get_bar
+      end
+
+      test
+      test
+
+      Ractor.new { test }.value
+    }, call_threshold: 2
+  end
+
+  def test_ivar_get_with_multi_ractor_mode
+    assert_compiles '42', %q{
+      class Foo
+        def self.set_bar
+          @bar = [] # needs to be a ractor unshareable object
+        end
+
+        def self.bar
+          @bar
+        rescue Ractor::IsolationError
+          42
+        end
+      end
+
+      Foo.set_bar
+
+      def test
+        Foo.bar
+      end
+
+      test
+      test
+
+      Ractor.new { test }.value
+    }, call_threshold: 2
+  end
+
+  def test_ivar_get_with_already_multi_ractor_mode
+    assert_compiles '42', %q{
+      class Foo
+        def self.set_bar
+          @bar = [] # needs to be a ractor unshareable object
+        end
+
+        def self.bar
+          @bar
+        rescue Ractor::IsolationError
+          42
+        end
+      end
+
+      Foo.set_bar
+      r = Ractor.new {
+        Ractor.receive
+        Foo.bar
+      }
+
+      Foo.bar
+      Foo.bar
+
+      r << :go
+      r.value
+    }, call_threshold: 2
+  end
+
+  def test_ivar_set_with_multi_ractor_mode
+    assert_compiles '42', %q{
+      class Foo
+        def self.bar
+          _foo = 1
+          _bar = 2
+          begin
+            @bar = _foo + _bar
+          rescue Ractor::IsolationError
+            42
+          end
+        end
+      end
+
+      def test
+        Foo.bar
+      end
+
+      test
+      test
+
+      Ractor.new { test }.value
+    }
+  end
+
+  def test_struct_set
+    assert_compiles '[42, 42, :frozen_error]', %q{
+      C = Struct.new(:foo).new(1)
+
+      def test
+        C.foo = Object.new
+        42
+      end
+
+      r = [test, test]
+      C.freeze
+      r << begin
+        test
+      rescue FrozenError
+        :frozen_error
+      end
+    }, call_threshold: 2
+  end
+
+  def test_global_tracepoint
+    assert_compiles 'true', %q{
+      def foo = 1
+
+      foo
+      foo
+
+      called = false
+
+      tp = TracePoint.new(:return) { |event|
+        if event.method_id == :foo
+          called = true
+        end
+      }
+      tp.enable do
+        foo
+      end
+      called
+    }
+  end
+
+  def test_local_tracepoint
+    assert_compiles 'true', %q{
+      def foo = 1
+
+      foo
+      foo
+
+      called = false
+
+      tp = TracePoint.new(:return) { |_| called = true }
+      tp.enable(target: method(:foo)) do
+        foo
+      end
+      called
+    }
+  end
+
+  def test_line_tracepoint_on_c_method
+    assert_compiles '"[[:line, true]]"', %q{
+      events = []
+      events.instance_variable_set(
+        :@tp,
+        TracePoint.new(:line) { |tp| events << [tp.event, tp.lineno] if tp.path == __FILE__ }
+      )
+      def events.to_str
+        @tp.enable; ''
+      end
+
+      # Stay in generated code while enabling tracing
+      def events.compiled(obj)
+        String(obj)
+        @tp.disable; __LINE__
+      end
+
+      line = events.compiled(events)
+      events[0][-1] = (events[0][-1] == line)
+
+      events.to_s # can't dump events as it's a singleton object AND it has a TracePoint instance variable, which also can't be dumped
+    }
+  end
+
+  def test_targeted_line_tracepoint_in_c_method_call
+    assert_compiles '"[true]"', %q{
+      events = []
+      events.instance_variable_set(:@tp, TracePoint.new(:line) { |tp| events << tp.lineno })
+      def events.to_str
+        @tp.enable(target: method(:compiled))
+        ''
+      end
+
+      # Stay in generated code while enabling tracing
+      def events.compiled(obj)
+        String(obj)
+        __LINE__
+      end
+
+      line = events.compiled(events)
+      events[0] = (events[0] == line)
+
+      events.to_s # can't dump events as it's a singleton object AND it has a TracePoint instance variable, which also can't be dumped
+    }
+  end
+
+  def test_opt_case_dispatch
+    assert_compiles '[true, false]', %q{
+      def test(x)
+        case x
+        when :foo
+          true
+        else
+          false
+        end
+      end
+
+      results = []
+      results << test(:foo)
+      results << test(1)
+      results
+    }, insns: [:opt_case_dispatch]
+  end
+
+  def test_stack_overflow
+    assert_compiles 'nil', %q{
+      def recurse(n)
+        return if n == 0
+        recurse(n-1)
+        nil # no tail call
+      end
+
+      recurse(2)
+      recurse(2)
+      begin
+        recurse(20_000)
+      rescue SystemStackError
+        # Not asserting an exception is raised here since main
+        # thread stack size is environment-sensitive. Only
+        # that we don't crash or infinite loop.
+      end
+    }, call_threshold: 2
+  end
+
+  def test_invokeblock
+    assert_compiles '42', %q{
+      def test
+        yield
+      end
+      test { 42 }
+    }, insns: [:invokeblock]
+  end
+
+  def test_invokeblock_with_args
+    assert_compiles '3', %q{
+      def test(x, y)
+        yield x, y
+      end
+      test(1, 2) { |a, b| a + b }
+    }, insns: [:invokeblock]
+  end
+
+  def test_invokeblock_no_block_given
+    assert_compiles ':error', %q{
+      def test
+        yield rescue :error
+      end
+      test
+    }, insns: [:invokeblock]
+  end
+
+  def test_invokeblock_multiple_yields
+    assert_compiles "[1, 2, 3]", %q{
+      results = []
+      def test
+        yield 1
+        yield 2
+        yield 3
+      end
+      test { |x| results << x }
+      results
+    }, insns: [:invokeblock]
+  end
+
+  def test_ccall_variadic_with_multiple_args
+    assert_compiles "[1, 2, 3]", %q{
+      def test
+        a = []
+        a.push(1, 2, 3)
+        a
+      end
+
+      test
+      test
+    }, insns: [:opt_send_without_block]
+  end
+
+  def test_ccall_variadic_with_no_args
+    assert_compiles "[1]", %q{
+      def test
+        a = [1]
+        a.push
+      end
+
+      test
+      test
+    }, insns: [:opt_send_without_block]
+  end
+
+  def test_ccall_variadic_with_no_args_causing_argument_error
+    assert_compiles ":error", %q{
+      def test
+        format
+      rescue ArgumentError
+        :error
+      end
+
+      test
+      test
+    }, insns: [:opt_send_without_block]
+  end
+
+  def test_allocating_in_hir_c_method_is
+    assert_compiles ":k", %q{
+      # Put opt_new in a frame JIT code sets up that doesn't set cfp->pc
+      def a(f) = test(f)
+      def test(f) = (f.new if f)
+      # A parallel couple methods that will set PC at the same stack height
+      def second = third
+      def third = nil
+
+      a(nil)
+      a(nil)
+
+      class Foo
+        def self.new = :k
+      end
+
+      second
+
+      a(Foo)
+    }, call_threshold: 2, insns: [:opt_new]
+  end
+
+  def test_singleton_class_invalidation_annotated_ccall
+    assert_compiles '[false, true]', %q{
+      def define_singleton(obj, define)
+        if define
+          # Wrap in C method frame to avoid exiting JIT on defineclass
+          [nil].reverse_each do
+            class << obj
+              def ==(_)
+                true
+              end
+            end
+          end
+        end
+        false
+      end
+
+      def test(define)
+        obj = BasicObject.new
+        # This == call gets compiled to a CCall
+        obj == define_singleton(obj, define)
+      end
+
+      result = []
+      result << test(false)  # Compiles BasicObject#==
+      result << test(true)   # Should use singleton#== now
+      result
+    }, call_threshold: 2
+  end
+
+  def test_singleton_class_invalidation_optimized_variadic_ccall
+    assert_compiles '[1, 1000]', %q{
+      def define_singleton(arr, define)
+        if define
+          # Wrap in C method frame to avoid exiting JIT on defineclass
+          [nil].reverse_each do
+            class << arr
+              def push(x)
+                super(x * 1000)
+              end
+            end
+          end
+        end
+        1
+      end
+
+      def test(define)
+        arr = []
+        val = define_singleton(arr, define)
+        arr.push(val)  # This CCall should be invalidated if singleton was defined
+        arr[0]
+      end
+
+      result = []
+      result << test(false)  # Compiles Array#push as CCall
+      result << test(true)   # Singleton defined, CCall should be invalidated
+      result
+    }, call_threshold: 2
+  end
+
+  def test_regression_cfp_sp_set_correctly_before_leaf_gc_call
+    assert_compiles ':ok', %q{
+      def check(l, r)
+        return 1 unless l
+        1 + check(*l) + check(*r)
+      end
+
+      def tree(depth)
+        # This duparray is our leaf-gc target.
+        return [nil, nil] unless depth > 0
+
+        # Modify the local and pass it to the following calls.
+        depth -= 1
+        [tree(depth), tree(depth)]
+      end
+
+      def test
+        GC.stress = true
+        2.times do
+          t = tree(11)
+          check(*t)
+        end
+        :ok
+      end
+
+      test
+    }, call_threshold: 14, num_profiles: 5
+  end
+
+  private
+
+  # Assert that every method call in `test_script` can be compiled by ZJIT
+  # at a given call_threshold
+  def assert_compiles(expected, test_script, insns: [], **opts)
+    assert_runs(expected, test_script, insns:, assert_compiles: true, **opts)
+  end
+
+  # Assert that `test_script` runs successfully with ZJIT enabled.
+  # Unlike `assert_compiles`, `assert_runs(assert_compiles: false)`
+  # allows ZJIT to skip compiling methods.
+  def assert_runs(expected, test_script, insns: [], assert_compiles: false, **opts)
+    pipe_fd = 3
+    disasm_method = :test
+
+    script = <<~RUBY
+      ret_val = (_test_proc = -> { #{('RubyVM::ZJIT.assert_compiles; ' if assert_compiles)}#{test_script.lstrip} }).call
+      result = {
+        ret_val:,
+        #{ unless insns.empty?
+           "insns: RubyVM::InstructionSequence.of(method(#{disasm_method.inspect})).to_a"
+        end}
+      }
+      IO.open(#{pipe_fd}).write(Marshal.dump(result))
+    RUBY
+
+    out, err, status, result = eval_with_jit(script, pipe_fd:, **opts)
+    assert_success(out, err, status)
+
+    result = Marshal.load(result)
+    assert_equal(expected, result.fetch(:ret_val).inspect)
+
+    unless insns.empty?
+      iseq = result.fetch(:insns)
+      assert_equal(
+        "YARVInstructionSequence/SimpleDataFormat",
+        iseq.first,
+        "Failed to get ISEQ disassembly. " \
+        "Make sure to put code directly under the '#{disasm_method}' method."
+      )
+      iseq_insns = iseq.last
+
+      expected_insns = Set.new(insns)
+      iseq_insns.each do
+        next unless it.is_a?(Array)
+        expected_insns.delete(it.first)
+      end
+      assert(expected_insns.empty?, -> { "Not present in ISeq: #{expected_insns.to_a}" })
+    end
+  end
+
+  # Run a Ruby process with ZJIT options and a pipe for writing test results
+  def eval_with_jit(
+    script,
+    call_threshold: 1,
+    num_profiles: 1,
+    zjit: true,
+    stats: false,
+    debug: true,
+    allowed_iseqs: nil,
+    timeout: 1000,
+    pipe_fd: nil
+  )
+    args = ["--disable-gems"]
+    if zjit
+      args << "--zjit-call-threshold=#{call_threshold}"
+      args << "--zjit-num-profiles=#{num_profiles}"
+      case stats
+      when true
+        args << "--zjit-stats"
+      when :quiet
+        args << "--zjit-stats-quiet"
+      else
+        args << "--zjit-stats=#{stats}" if stats
+      end
+      args << "--zjit-debug" if debug
+      if allowed_iseqs
+        jitlist = Tempfile.new("jitlist")
+        jitlist.write(allowed_iseqs)
+        jitlist.close
+        args << "--zjit-allowed-iseqs=#{jitlist.path}"
+      end
+    end
+    args << "-e" << script_shell_encode(script)
+    ios = {}
+    if pipe_fd
+      pipe_r, pipe_w = IO.pipe
+      # Separate thread so we don't deadlock when
+      # the child ruby blocks writing the output to pipe_fd
+      pipe_out = nil
+      pipe_reader = Thread.new do
+        pipe_out = pipe_r.read
+        pipe_r.close
+      end
+      ios[pipe_fd] = pipe_w
+    end
+    result = EnvUtil.invoke_ruby(args, '', true, true, rubybin: RbConfig.ruby, timeout: timeout, ios:)
+    if pipe_fd
+      pipe_w.close
+      pipe_reader.join(timeout)
+      result << pipe_out
+    end
+    result
+  ensure
+    pipe_reader&.kill
+    pipe_reader&.join(timeout)
+    pipe_r&.close
+    pipe_w&.close
+    jitlist&.unlink
+  end
+
+  def assert_success(out, err, status)
+    message = "exited with status #{status.to_i}"
+    message << "\nstdout:\n```\n#{out}```\n" unless out.empty?
+    message << "\nstderr:\n```\n#{err}```\n" unless err.empty?
+    assert status.success?, message
+  end
+
+  def script_shell_encode(s)
+    # We can't pass utf-8-encoded characters directly in a shell arg. But we can use Ruby \u constants.
+    s.chars.map { |c| c.ascii_only? ? c : "\\u%x" % c.codepoints[0] }.join
+  end
+end
diff --git a/test/mri/rubygems/helper.rb b/test/mri/rubygems/helper.rb
index 35149541031..dc40f4ecb1f 100644
--- a/test/mri/rubygems/helper.rb
+++ b/test/mri/rubygems/helper.rb
@@ -9,8 +9,6 @@
 
 require "test/unit"
 
-ENV["JARS_SKIP"] = "true" if Gem.java_platform? # avoid unnecessary and noisy `jar-dependencies` post install hook
-
 require "fileutils"
 require "pathname"
 require "pp"
@@ -62,6 +60,44 @@ def self.specific_extra_args_hash=(value)
   end
 end
 
+class Gem::Installer
+  # Copy from Gem::Installer#install with install_as_default option from old version
+  def install_default_gem
+    pre_install_checks
+
+    run_pre_install_hooks
+
+    spec.loaded_from = default_spec_file
+
+    FileUtils.rm_rf gem_dir
+    FileUtils.rm_rf spec.extension_dir
+
+    dir_mode = options[:dir_mode]
+    FileUtils.mkdir_p gem_dir, mode: dir_mode && 0o755
+
+    extract_bin
+    write_default_spec
+
+    generate_bin
+    generate_plugins
+
+    File.chmod(dir_mode, gem_dir) if dir_mode
+
+    say spec.post_install_message if options[:post_install_message] && !spec.post_install_message.nil?
+
+    Gem::Specification.add_spec(spec)
+
+    load_plugin
+
+    run_post_install_hooks
+
+    spec
+  rescue Errno::EACCES => e
+    # Permission denied - /path/to/foo
+    raise Gem::FilePermissionError, e.message.split(" - ").last
+  end
+end
+
 ##
 # RubyGemTestCase provides a variety of methods for testing rubygems and
 # gem-related behavior in a sandbox.  Through RubyGemTestCase you can install
@@ -297,8 +333,12 @@ def setup
     ENV["XDG_CONFIG_HOME"] = nil
     ENV["XDG_DATA_HOME"] = nil
     ENV["XDG_STATE_HOME"] = nil
+    ENV["MAKEFLAGS"] = nil
     ENV["SOURCE_DATE_EPOCH"] = nil
     ENV["BUNDLER_VERSION"] = nil
+    ENV["BUNDLE_CONFIG"] = nil
+    ENV["BUNDLE_USER_CONFIG"] = nil
+    ENV["BUNDLE_USER_HOME"] = nil
     ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = "true"
 
     @current_dir = Dir.pwd
@@ -402,8 +442,9 @@ def setup
     Gem::RemoteFetcher.fetcher = Gem::FakeFetcher.new
 
     @gem_repo = "http://gems.example.com/"
+    Gem.instance_variable_set :@default_sources, [@gem_repo]
+    Gem.instance_variable_set :@sources, nil
     @uri = Gem::URI.parse @gem_repo
-    Gem.sources.replace [@gem_repo]
 
     Gem.searcher = nil
     Gem::SpecFetcher.fetcher = nil
@@ -420,6 +461,9 @@ def setup
       @orig_hooks[name] = Gem.send(name).dup
     end
 
+    Gem::Platform.const_get(:GENERIC_CACHE).clear
+    Gem::Platform.const_get(:GENERICS).each {|g| Gem::Platform.const_get(:GENERIC_CACHE)[g] = g }
+
     @marshal_version = "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
     @orig_loaded_features = $LOADED_FEATURES.dup
   end
@@ -682,6 +726,14 @@ def write_file(path)
     path
   end
 
+  def write_dummy_extconf(gem_name)
+    write_file File.join(@tempdir, "extconf.rb") do |io|
+      io.puts "require 'mkmf'"
+      yield io if block_given?
+      io.puts "create_makefile '#{gem_name}'"
+    end
+  end
+
   ##
   # Load a YAML string, the psych 3 way
 
@@ -715,7 +767,7 @@ def all_spec_names
   #
   # Use this with #write_file to build an installed gem.
 
-  def quick_gem(name, version="2")
+  def quick_gem(name, version = "2")
     require "rubygems/specification"
 
     spec = Gem::Specification.new do |s|
@@ -801,8 +853,8 @@ def install_specs(*specs)
 
   def install_default_gems(*specs)
     specs.each do |spec|
-      installer = Gem::Installer.for_spec(spec, install_as_default: true)
-      installer.install
+      installer = Gem::Installer.for_spec(spec)
+      installer.install_default_gem
       Gem.register_default_spec(spec)
     end
   end
@@ -1024,7 +1076,7 @@ def util_set_arch(arch)
   # Add +spec+ to +@fetcher+ serving the data in the file +path+.
   # +repo+ indicates which repo to make +spec+ appear to be in.
 
-  def add_to_fetcher(spec, path=nil, repo=@gem_repo)
+  def add_to_fetcher(spec, path = nil, repo = @gem_repo)
     path ||= spec.cache_file
     @fetcher.data["#{@gem_repo}gems/#{spec.file_name}"] = read_binary(path)
   end
@@ -1197,7 +1249,7 @@ def wait_for_child_process_to_exit
   ##
   # Allows the proper version of +rake+ to be used for the test.
 
-  def build_rake_in(good=true)
+  def build_rake_in(good = true)
     gem_ruby = Gem.ruby
     Gem.ruby = self.class.rubybin
     env_rake = ENV["rake"]
@@ -1569,3 +1621,9 @@ def stub(name, val_or_callable, *block_args)
 end
 
 require_relative "utilities"
+
+# mise installed rubygems_plugin.rb to system wide `site_ruby` directory.
+# This empty module avoid to call `mise` command.
+module ReshimInstaller
+  def self.reshim; end
+end
diff --git a/test/mri/rubygems/installer_test_case.rb b/test/mri/rubygems/installer_test_case.rb
index 8a34d28db86..ded205c5f56 100644
--- a/test/mri/rubygems/installer_test_case.rb
+++ b/test/mri/rubygems/installer_test_case.rb
@@ -215,12 +215,29 @@ def util_setup_gem(ui = @ui, force = true)
   ##
   # Creates an installer for +spec+ that will install into +gem_home+.
 
-  def util_installer(spec, gem_home, force=true)
+  def util_installer(spec, gem_home, force = true)
     Gem::Installer.at(spec.cache_file,
                        install_dir: gem_home,
                        force: force)
   end
 
+  def test_ensure_writable_dir_creates_missing_parent_directories
+    installer = setup_base_installer(false)
+
+    non_existent_parent = File.join(@tempdir, "non_existent_parent")
+    target_dir = File.join(non_existent_parent, "target_dir")
+
+    refute_directory_exists non_existent_parent, "Parent directory should not exist yet"
+    refute_directory_exists target_dir, "Target directory should not exist yet"
+
+    assert_nothing_raised do
+      installer.send(:ensure_writable_dir, target_dir)
+    end
+
+    assert_directory_exists non_existent_parent, "Parent directory should exist now"
+    assert_directory_exists target_dir, "Target directory should exist now"
+  end
+
   @@symlink_supported = nil
 
   # This is needed for Windows environment without symlink support enabled (the default
diff --git a/test/mri/rubygems/mock_gem_ui.rb b/test/mri/rubygems/mock_gem_ui.rb
index 218d4b6965d..fb804c5555c 100644
--- a/test/mri/rubygems/mock_gem_ui.rb
+++ b/test/mri/rubygems/mock_gem_ui.rb
@@ -77,7 +77,7 @@ def terminated?
     @terminated
   end
 
-  def terminate_interaction(status=0)
+  def terminate_interaction(status = 0)
     @terminated = true
 
     raise TermError, status if status != 0
diff --git a/test/mri/rubygems/package/tar_test_case.rb b/test/mri/rubygems/package/tar_test_case.rb
index e3d812bf3fd..26135cf2967 100644
--- a/test/mri/rubygems/package/tar_test_case.rb
+++ b/test/mri/rubygems/package/tar_test_case.rb
@@ -6,23 +6,7 @@
 ##
 # A test case for Gem::Package::Tar* classes
 
-class Gem::Package::TarTestCase < Gem::TestCase
-  def ASCIIZ(str, length)
-    str + "\0" * (length - str.length)
-  end
-
-  def SP(s)
-    s + " "
-  end
-
-  def SP_Z(s)
-    s + " \0"
-  end
-
-  def Z(s)
-    s + "\0"
-  end
-
+module Gem::Package::TarTestMethods
   def assert_headers_equal(expected, actual)
     expected = expected.to_s unless String === expected
     actual = actual.to_s unless String === actual
@@ -66,6 +50,26 @@ def assert_headers_equal(expected, actual)
 
     assert_equal expected[chksum_off, 8], actual[chksum_off, 8]
   end
+end
+
+class Gem::Package::TarTestCase < Gem::TestCase
+  include Gem::Package::TarTestMethods
+
+  def ASCIIZ(str, length)
+    str + "\0" * (length - str.length)
+  end
+
+  def SP(s)
+    s + " "
+  end
+
+  def SP_Z(s)
+    s + " \0"
+  end
+
+  def Z(s)
+    s + "\0"
+  end
 
   def calc_checksum(header)
     sum = header.sum(0)
diff --git a/test/mri/rubygems/test_bundled_ca.rb b/test/mri/rubygems/test_bundled_ca.rb
index a737185681e..cc8fa884cac 100644
--- a/test/mri/rubygems/test_bundled_ca.rb
+++ b/test/mri/rubygems/test_bundled_ca.rb
@@ -12,7 +12,7 @@
 
 # = Testing Bundled CA
 #
-# The tested hosts are explained in detail here: https://github.com/rubygems/rubygems/commit/5e16a5428f973667cabfa07e94ff939e7a83ebd9
+# The tested hosts are explained in detail here: https://github.com/ruby/rubygems/commit/5e16a5428f973667cabfa07e94ff939e7a83ebd9
 #
 
 class TestGemBundledCA < Gem::TestCase
diff --git a/test/mri/rubygems/test_config.rb b/test/mri/rubygems/test_config.rb
index 657624d5268..822b57b0dcb 100644
--- a/test/mri/rubygems/test_config.rb
+++ b/test/mri/rubygems/test_config.rb
@@ -5,13 +5,6 @@
 require "shellwords"
 
 class TestGemConfig < Gem::TestCase
-  def test_datadir
-    util_make_gems
-    spec = Gem::Specification.find_by_name("a")
-    spec.activate
-    assert_equal "#{spec.full_gem_path}/data/a", spec.datadir
-  end
-
   def test_good_rake_path_is_escaped
     path = Gem::TestCase.class_variable_get(:@@good_rake)
     ruby, rake = path.shellsplit
diff --git a/test/mri/rubygems/test_gem.rb b/test/mri/rubygems/test_gem.rb
index cdc3479e373..74c8953904f 100644
--- a/test/mri/rubygems/test_gem.rb
+++ b/test/mri/rubygems/test_gem.rb
@@ -527,35 +527,6 @@ def test_self_configuration
     assert_equal expected, Gem.configuration
   end
 
-  def test_self_datadir
-    foo = nil
-
-    Dir.chdir @tempdir do
-      FileUtils.mkdir_p "data"
-      File.open File.join("data", "foo.txt"), "w" do |fp|
-        fp.puts "blah"
-      end
-
-      foo = util_spec "foo" do |s|
-        s.files = %w[data/foo.txt]
-      end
-
-      install_gem foo
-    end
-
-    gem "foo"
-
-    expected = File.join @gemhome, "gems", foo.full_name, "data", "foo"
-
-    assert_equal expected, Gem::Specification.find_by_name("foo").datadir
-  end
-
-  def test_self_datadir_nonexistent_package
-    assert_raise(Gem::MissingSpecError) do
-      Gem::Specification.find_by_name("xyzzy").datadir
-    end
-  end
-
   def test_self_default_exec_format
     ruby_install_name "ruby" do
       assert_equal "%s", Gem.default_exec_format
@@ -615,6 +586,7 @@ def test_default_path_vendor_dir
   end
 
   def test_self_default_sources
+    Gem.remove_instance_variable :@default_sources
     assert_equal %w[https://rubygems.org/], Gem.default_sources
   end
 
@@ -1227,6 +1199,8 @@ def test_self_sources
     Gem.sources = nil
     Gem.configuration.sources = %w[http://test.example.com/]
     assert_equal %w[http://test.example.com/], Gem.sources
+  ensure
+    Gem.configuration.sources = nil
   end
 
   def test_try_activate_returns_true_for_activated_specs
diff --git a/test/mri/rubygems/test_gem_bundler_version_finder.rb b/test/mri/rubygems/test_gem_bundler_version_finder.rb
index b72670b8022..a773d6249b5 100644
--- a/test/mri/rubygems/test_gem_bundler_version_finder.rb
+++ b/test/mri/rubygems/test_gem_bundler_version_finder.rb
@@ -2,6 +2,7 @@
 
 require_relative "helper"
 require "rubygems/bundler_version_finder"
+require "tempfile"
 
 class TestGemBundlerVersionFinder < Gem::TestCase
   def setup
@@ -32,6 +33,11 @@ def test_bundler_version_with_env_var
     assert_equal v("1.1.1.1"), bvf.bundler_version
   end
 
+  def test_bundler_version_with_empty_env_var
+    ENV["BUNDLER_VERSION"] = ""
+    assert_nil bvf.bundler_version
+  end
+
   def test_bundler_version_with_bundle_update_bundler
     ARGV.replace %w[update --bundler]
     assert_nil bvf.bundler_version
@@ -51,6 +57,75 @@ def test_bundler_version_with_bundle_update_bundler
     assert_nil bvf.bundler_version
   end
 
+  def test_bundler_version_with_bundle_config
+    config_content = <<~CONFIG
+      BUNDLE_VERSION: "system"
+    CONFIG
+
+    Tempfile.create("bundle_config") do |f|
+      f.write(config_content)
+      f.flush
+
+      bvf.stub(:bundler_config_file, f.path) do
+        assert_nil bvf.bundler_version
+      end
+    end
+  end
+
+  def test_bundler_version_with_bundle_config_single_quoted
+    config_with_single_quoted_version = <<~CONFIG
+      BUNDLE_VERSION: 'system'
+    CONFIG
+
+    Tempfile.create("bundle_config") do |f|
+      f.write(config_with_single_quoted_version)
+      f.flush
+
+      bvf.stub(:bundler_config_file, f.path) do
+        assert_nil bvf.bundler_version
+      end
+    end
+  end
+
+  def test_bundler_version_with_bundle_config_version
+    ENV["BUNDLER_VERSION"] = "1.1.1.1"
+
+    config_content = <<~CONFIG
+      BUNDLE_VERSION: "1.2.3"
+    CONFIG
+
+    Tempfile.create("bundle_config") do |f|
+      f.write(config_content)
+      f.flush
+
+      bvf.stub(:bundler_config_file, f.path) do
+        assert_equal v("1.1.1.1"), bvf.bundler_version
+      end
+    end
+  end
+
+  def test_bundler_version_with_bundle_config_non_existent_file
+    bvf.stub(:bundler_config_file, "/non/existent/path") do
+      assert_nil bvf.bundler_version
+    end
+  end
+
+  def test_bundler_version_with_bundle_config_without_version
+    config_without_version = <<~CONFIG
+      BUNDLE_JOBS: "8"
+      BUNDLE_GEM__TEST: "minitest"
+    CONFIG
+
+    Tempfile.create("bundle_config") do |f|
+      f.write(config_without_version)
+      f.flush
+
+      bvf.stub(:bundler_config_file, f.path) do
+        assert_nil bvf.bundler_version
+      end
+    end
+  end
+
   def test_bundler_version_with_lockfile
     bvf.stub(:lockfile_contents, "") do
       assert_nil bvf.bundler_version
@@ -82,7 +157,7 @@ def test_bundler_version
 
   def test_deleted_directory
     pend "Cannot perform this test on windows" if Gem.win_platform?
-    pend "Cannot perform this test on Solaris" if RUBY_PLATFORM.include?("solaris")
+
     require "tmpdir"
 
     orig_dir = Dir.pwd
diff --git a/test/mri/rubygems/test_gem_command_manager.rb b/test/mri/rubygems/test_gem_command_manager.rb
index f3848e498db..889d5ce9e66 100644
--- a/test/mri/rubygems/test_gem_command_manager.rb
+++ b/test/mri/rubygems/test_gem_command_manager.rb
@@ -43,7 +43,7 @@ def test_find_login_alias_command
     assert_kind_of Gem::Commands::SigninCommand, command
   end
 
-  def test_find_logout_alias_comamnd
+  def test_find_logout_alias_command
     command = @command_manager.find_command "logout"
 
     assert_kind_of Gem::Commands::SignoutCommand, command
@@ -78,7 +78,7 @@ def test_find_command_unknown_suggestions
 
     message = "Unknown command pish".dup
 
-    if defined?(DidYouMean::SPELL_CHECKERS) && defined?(DidYouMean::Correctable)
+    if e.respond_to?(:corrections)
       message << "\nDid you mean?  \"push\""
     end
 
@@ -287,47 +287,6 @@ def test_process_args_build
     assert_equal "foobar.rb", check_options[:args].first
   end
 
-  # HACK: move to query command test
-  def test_process_args_query
-    # capture all query options
-    check_options = nil
-    @command_manager["query"].when_invoked do |options|
-      check_options = options
-      true
-    end
-
-    # check defaults
-    Gem::Deprecate.skip_during do
-      @command_manager.process_args %w[query]
-    end
-    assert_nil(check_options[:name])
-    assert_equal :local, check_options[:domain]
-    assert_equal false, check_options[:details]
-
-    # check settings
-    check_options = nil
-    Gem::Deprecate.skip_during do
-      @command_manager.process_args %w[query --name foobar --local --details]
-    end
-    assert_equal(/foobar/i, check_options[:name])
-    assert_equal :local, check_options[:domain]
-    assert_equal true, check_options[:details]
-
-    # remote domain
-    check_options = nil
-    Gem::Deprecate.skip_during do
-      @command_manager.process_args %w[query --remote]
-    end
-    assert_equal :remote, check_options[:domain]
-
-    # both (local/remote) domains
-    check_options = nil
-    Gem::Deprecate.skip_during do
-      @command_manager.process_args %w[query --both]
-    end
-    assert_equal :both, check_options[:domain]
-  end
-
   # HACK: move to update command test
   def test_process_args_update
     # capture all update options
diff --git a/test/mri/rubygems/test_gem_commands_build_command.rb b/test/mri/rubygems/test_gem_commands_build_command.rb
index d44126d2046..9339f41f7cb 100644
--- a/test/mri/rubygems/test_gem_commands_build_command.rb
+++ b/test/mri/rubygems/test_gem_commands_build_command.rb
@@ -43,16 +43,6 @@ def test_handle_options
     assert_includes Gem.platforms, Gem::Platform.local
   end
 
-  def test_handle_deprecated_options
-    use_ui @ui do
-      @cmd.handle_options %w[-C ./test/dir]
-    end
-
-    assert_equal "WARNING:  The \"-C\" option has been deprecated and will be removed in Rubygems 4.0. " \
-                 "-C is a global flag now. Use `gem -C PATH build GEMSPEC_FILE [options]` instead\n",
-                 @ui.error
-  end
-
   def test_options_filename
     gemspec_file = File.join(@tempdir, @gem.spec_name)
 
diff --git a/test/mri/rubygems/test_gem_commands_cert_command.rb b/test/mri/rubygems/test_gem_commands_cert_command.rb
index c1734679351..39fda73ebac 100644
--- a/test/mri/rubygems/test_gem_commands_cert_command.rb
+++ b/test/mri/rubygems/test_gem_commands_cert_command.rb
@@ -498,7 +498,7 @@ def test_execute_sign
 
     assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
 
-    mask = 0o100600 & (~File.umask)
+    mask = 0o100600 & ~File.umask
 
     assert_equal mask, File.stat(path).mode unless Gem.win_platform?
   end
@@ -527,7 +527,7 @@ def test_execute_sign_encrypted_key
 
     assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
 
-    mask = 0o100600 & (~File.umask)
+    mask = 0o100600 & ~File.umask
 
     assert_equal mask, File.stat(path).mode unless Gem.win_platform?
   end
@@ -559,7 +559,7 @@ def test_execute_sign_default
 
     assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
 
-    mask = 0o100600 & (~File.umask)
+    mask = 0o100600 & ~File.umask
 
     assert_equal mask, File.stat(path).mode unless Gem.win_platform?
   end
@@ -591,7 +591,7 @@ def test_execute_sign_default_encrypted_key
 
     assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
 
-    mask = 0o100600 & (~File.umask)
+    mask = 0o100600 & ~File.umask
 
     assert_equal mask, File.stat(path).mode unless Gem.win_platform?
   end
diff --git a/test/mri/rubygems/test_gem_commands_exec_command.rb b/test/mri/rubygems/test_gem_commands_exec_command.rb
index b9d5888068f..db738b5e9f5 100644
--- a/test/mri/rubygems/test_gem_commands_exec_command.rb
+++ b/test/mri/rubygems/test_gem_commands_exec_command.rb
@@ -370,8 +370,11 @@ def test_gem_with_multiple_executables_no_match
     util_clear_gems
 
     use_ui @ui do
-      @cmd.invoke "a:2"
-      assert_equal "a-2 foo\n", @ui.output
+      e = assert_raise Gem::MockGemUi::TermError do
+        @cmd.invoke "a:2"
+      end
+      assert_equal 1, e.exit_code
+      assert_equal "ERROR:  Ambiguous which executable from gem `a` should be run: the options are [\"bar\", \"foo\"], specify one via COMMAND, and use `-g` and `-v` to specify gem and version\n", @ui.error
     end
   end
 
diff --git a/test/mri/rubygems/test_gem_commands_help_command.rb b/test/mri/rubygems/test_gem_commands_help_command.rb
index 01ab4aab2fe..4ce7285d1f8 100644
--- a/test/mri/rubygems/test_gem_commands_help_command.rb
+++ b/test/mri/rubygems/test_gem_commands_help_command.rb
@@ -36,7 +36,7 @@ def test_gem_help_platforms
 
   def test_gem_help_build
     util_gem "build" do |out, err|
-      assert_match(/-C PATH *Run as if gem build was started in <PATH>/, out)
+      assert_match(/--platform PLATFORM\s+Specify the platform of gem to build/, out)
       assert_equal "", err
     end
   end
diff --git a/test/mri/rubygems/test_gem_commands_info_command.rb b/test/mri/rubygems/test_gem_commands_info_command.rb
index f020d380d29..dab7cfb836b 100644
--- a/test/mri/rubygems/test_gem_commands_info_command.rb
+++ b/test/mri/rubygems/test_gem_commands_info_command.rb
@@ -13,7 +13,7 @@ def setup
   def gem(name, version = "1.0")
     spec = quick_gem name do |gem|
       gem.summary = "test gem"
-      gem.homepage = "https://github.com/rubygems/rubygems"
+      gem.homepage = "https://github.com/ruby/rubygems"
       gem.files = %W[lib/#{name}.rb Rakefile]
       gem.authors = ["Colby", "Jack"]
       gem.license = "MIT"
diff --git a/test/mri/rubygems/test_gem_commands_install_command.rb b/test/mri/rubygems/test_gem_commands_install_command.rb
index c7fbca196be..d2ca933a632 100644
--- a/test/mri/rubygems/test_gem_commands_install_command.rb
+++ b/test/mri/rubygems/test_gem_commands_install_command.rb
@@ -647,17 +647,10 @@ def test_execute_rdoc
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      # Don't use Dir.chdir with a block, it warnings a lot because
-      # of a downstream Dir.chdir with a block
-      old = Dir.getwd
-
-      begin
-        Dir.chdir @tempdir
+      Dir.chdir @tempdir do
         assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-      ensure
-        Dir.chdir old
       end
     end
 
@@ -665,7 +658,7 @@ def test_execute_rdoc
 
     assert_path_exist File.join(a2.doc_dir, "ri")
     assert_path_exist File.join(a2.doc_dir, "rdoc")
-  end unless Gem.rdoc_hooks_defined_via_plugin?
+  end if defined?(Gem::RDoc) && !Gem.rdoc_hooks_defined_via_plugin?
 
   def test_execute_rdoc_with_path
     specs = spec_fetcher do |fetcher|
@@ -684,24 +677,17 @@ def test_execute_rdoc_with_path
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      # Don't use Dir.chdir with a block, it warnings a lot because
-      # of a downstream Dir.chdir with a block
-      old = Dir.getwd
-
-      begin
-        Dir.chdir @tempdir
+      Dir.chdir @tempdir do
         assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-      ensure
-        Dir.chdir old
       end
     end
 
     wait_for_child_process_to_exit
 
     assert_path_exist "whatever/doc/a-2", "documentation not installed"
-  end unless Gem.rdoc_hooks_defined_via_plugin?
+  end if defined?(Gem::RDoc) && !Gem.rdoc_hooks_defined_via_plugin?
 
   def test_execute_saves_build_args
     specs = spec_fetcher do |fetcher|
@@ -720,17 +706,10 @@ def test_execute_saves_build_args
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      # Don't use Dir.chdir with a block, it warnings a lot because
-      # of a downstream Dir.chdir with a block
-      old = Dir.getwd
-
-      begin
-        Dir.chdir @tempdir
+      Dir.chdir @tempdir do
         assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-      ensure
-        Dir.chdir old
       end
     end
 
@@ -1005,6 +984,38 @@ def test_install_gem_ignore_dependencies_remote_platform_local
     assert_equal %W[a-3-#{local}], @cmd.installed_specs.map(&:full_name)
   end
 
+  def test_install_gem_platform_specificity_match
+    util_set_arch "arm64-darwin-20"
+
+    spec_fetcher do |fetcher|
+      %w[ruby universal-darwin universal-darwin-20 x64-darwin-20 arm64-darwin-20].each do |platform|
+        fetcher.download "a", 3 do |s|
+          s.platform = platform
+        end
+      end
+    end
+
+    @cmd.install_gem "a", ">= 0"
+
+    assert_equal %w[a-3-arm64-darwin-20], @cmd.installed_specs.map(&:full_name)
+  end
+
+  def test_install_gem_platform_specificity_match_reverse_order
+    util_set_arch "arm64-darwin-20"
+
+    spec_fetcher do |fetcher|
+      %w[ruby universal-darwin universal-darwin-20 x64-darwin-20 arm64-darwin-20].reverse_each do |platform|
+        fetcher.download "a", 3 do |s|
+          s.platform = platform
+        end
+      end
+    end
+
+    @cmd.install_gem "a", ">= 0"
+
+    assert_equal %w[a-3-arm64-darwin-20], @cmd.installed_specs.map(&:full_name)
+  end
+
   def test_install_gem_ignore_dependencies_specific_file
     spec = util_spec "a", 2
 
@@ -1214,6 +1225,30 @@ def test_execute_installs_from_a_gemdeps
     assert_match "Installing a (2)", @ui.output
   end
 
+  def test_execute_installs_from_a_gemdeps_with_prerelease
+    spec_fetcher do |fetcher|
+      fetcher.download "a", 1
+      fetcher.download "a", "2.a"
+    end
+
+    File.open @gemdeps, "w" do |f|
+      f << "gem 'a'"
+    end
+
+    @cmd.handle_options %w[--prerelease]
+    @cmd.options[:gemdeps] = @gemdeps
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_equal %w[a-2.a], @cmd.installed_specs.map(&:full_name)
+
+    assert_match "Installing a (2.a)", @ui.output
+  end
+
   def test_execute_installs_deps_a_gemdeps
     spec_fetcher do |fetcher|
       fetcher.download "q", "1.0"
@@ -1548,4 +1583,63 @@ def test_suggest_update_if_enabled
       assert_includes @ui.output, "A new release of RubyGems is available: 1.2.3 → 2.0.0!"
     end
   end
+
+  def test_pass_down_the_job_option_to_make
+    gemspec = nil
+
+    spec_fetcher do |fetcher|
+      fetcher.gem "a", 2 do |spec|
+        gemspec = spec
+
+        extconf_path = "#{spec.gem_dir}/extconf.rb"
+
+        write_file(extconf_path) do |io|
+          io.puts "require 'mkmf'"
+          io.puts "create_makefile '#{spec.name}'"
+        end
+
+        spec.extensions = "extconf.rb"
+      end
+    end
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.invoke "a", "-j4"
+      end
+    end
+
+    gem_make_out = File.read(File.join(gemspec.extension_dir, "gem_make.out"))
+    if vc_windows? && nmake_found?
+      refute_includes(gem_make_out, " -j4")
+    else
+      assert_includes(gem_make_out, "make -j4")
+    end
+  end
+
+  def test_execute_bindir_with_nonexistent_parent_dirs
+    spec_fetcher do |fetcher|
+      fetcher.gem "a", 2 do |s|
+        s.executables = %w[a_bin]
+        s.files = %w[bin/a_bin]
+      end
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    nested_bin_dir = File.join(@tempdir, "not", "exists")
+    refute_directory_exists nested_bin_dir, "Nested bin directory should not exist yet"
+
+    @cmd.options[:bin_dir] = nested_bin_dir
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_directory_exists nested_bin_dir, "Nested bin directory should exist now"
+    assert_path_exist File.join(nested_bin_dir, "a_bin")
+
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
+  end
 end
diff --git a/test/mri/rubygems/test_gem_commands_owner_command.rb b/test/mri/rubygems/test_gem_commands_owner_command.rb
index bc4f13ff2a5..80b1497c415 100644
--- a/test/mri/rubygems/test_gem_commands_owner_command.rb
+++ b/test/mri/rubygems/test_gem_commands_owner_command.rb
@@ -386,9 +386,10 @@ def test_with_webauthn_enabled_success
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @stub_ui.output
+    assert_match @stub_fetcher.webauthn_url_with_port(server.port), @stub_ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @stub_fetcher.last_request["OTP"]
     assert_match response_success, @stub_ui.output
@@ -413,9 +414,10 @@ def test_with_webauthn_enabled_failure
     end
 
     assert_match @stub_fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
-    assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @stub_ui.output
+    assert_match @stub_fetcher.webauthn_url_with_port(server.port), @stub_ui.output
     assert_match "ERROR:  Security device verification failed: Something went wrong", @stub_ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
     refute_match response_success, @stub_ui.output
@@ -435,9 +437,10 @@ def test_with_webauthn_enabled_success_with_polling
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
       "command with the `--otp [your_code]` option.", @stub_ui.output
+    assert_match @stub_fetcher.webauthn_url_with_port(server.port), @stub_ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @stub_fetcher.last_request["OTP"]
     assert_match response_success, @stub_ui.output
@@ -463,16 +466,17 @@ def test_with_webauthn_enabled_failure_with_polling
     end
 
     assert_match @stub_fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
-    assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
       "command with the `--otp [your_code]` option.", @stub_ui.output
+    assert_match @stub_fetcher.webauthn_url_with_port(server.port), @stub_ui.output
     assert_match "ERROR:  Security device verification failed: The token in the link you used has either expired " \
       "or been used already.", @stub_ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
     refute_match response_success, @stub_ui.output
   end
 
-  def test_remove_owners_unathorized_api_key
+  def test_remove_owners_unauthorized_api_key
     response_forbidden = "The API key doesn't have access"
     response_success   = "Owner removed successfully."
 
@@ -537,7 +541,7 @@ def test_add_owners_no_api_key_webauthn_enabled_does_not_reuse_otp_codes
     assert_empty reused_otp_codes
   end
 
-  def test_add_owners_unathorized_api_key
+  def test_add_owners_unauthorized_api_key
     response_forbidden = "The API key doesn't have access"
     response_success   = "Owner added successfully."
 
diff --git a/test/mri/rubygems/test_gem_commands_pristine_command.rb b/test/mri/rubygems/test_gem_commands_pristine_command.rb
index 46c06db014d..e9c4d329450 100644
--- a/test/mri/rubygems/test_gem_commands_pristine_command.rb
+++ b/test/mri/rubygems/test_gem_commands_pristine_command.rb
@@ -125,8 +125,8 @@ def test_execute_all
       @cmd.execute
     end
 
-    assert File.exist?(gem_bin)
-    assert File.exist?(gem_stub)
+    assert_path_exist gem_bin
+    assert_path_exist gem_stub
 
     out = @ui.output.split "\n"
 
@@ -537,8 +537,8 @@ def test_execute_only_executables
       @cmd.execute
     end
 
-    assert File.exist? gem_exec
-    refute File.exist? gem_lib
+    assert_path_exist gem_exec
+    assert_path_not_exist gem_lib
   end
 
   def test_execute_only_plugins
@@ -572,9 +572,9 @@ def test_execute_only_plugins
       @cmd.execute
     end
 
-    refute File.exist? gem_exec
-    assert File.exist? gem_plugin
-    refute File.exist? gem_lib
+    assert_path_not_exist gem_exec
+    assert_path_exist gem_plugin
+    assert_path_not_exist gem_lib
   end
 
   def test_execute_bindir
@@ -606,8 +606,8 @@ def test_execute_bindir
       @cmd.execute
     end
 
-    refute File.exist? gem_exec
-    assert File.exist? gem_bindir
+    assert_path_not_exist gem_exec
+    assert_path_exist gem_bindir
   end
 
   def test_execute_unknown_gem_at_remote_source
@@ -659,6 +659,42 @@ def test_execute_default_gem
     refute_includes "ruby_executable_hooks", File.read(exe)
   end
 
+  def test_execute_default_gem_and_regular_gem
+    a_default = new_default_spec("a", "1.2.0")
+
+    a = util_spec "a" do |s|
+      s.extensions << "ext/a/extconf.rb"
+    end
+
+    ext_path = File.join @tempdir, "ext", "a", "extconf.rb"
+    write_file ext_path do |io|
+      io.write <<-'RUBY'
+      File.open "Makefile", "w" do |f|
+        f.puts "clean:\n\techo cleaned\n"
+        f.puts "all:\n\techo built\n"
+        f.puts "install:\n\techo installed\n"
+      end
+      RUBY
+    end
+
+    install_default_gems a_default
+    install_gem a
+
+    # Remove the extension files for a
+    FileUtils.rm_rf a.gem_build_complete_path
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_includes @ui.output, "Restored #{a.full_name}"
+
+    # Check extension files for a were restored
+    assert_path_exist a.gem_build_complete_path
+  end
+
   def test_execute_multi_platform
     a = util_spec "a" do |s|
       s.extensions << "ext/a/extconf.rb"
diff --git a/test/mri/rubygems/test_gem_commands_push_command.rb b/test/mri/rubygems/test_gem_commands_push_command.rb
index 2d0190b49fe..1477a749471 100644
--- a/test/mri/rubygems/test_gem_commands_push_command.rb
+++ b/test/mri/rubygems/test_gem_commands_push_command.rb
@@ -477,9 +477,10 @@ def test_with_webauthn_enabled_success
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
     assert_match response_success, @ui.output
@@ -505,9 +506,10 @@ def test_with_webauthn_enabled_failure
     assert_equal 1, error.exit_code
 
     assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "ERROR:  Security device verification failed: Something went wrong", @ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @ui.output
     refute_match response_success, @ui.output
@@ -527,9 +529,10 @@ def test_with_webauthn_enabled_success_with_polling
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
     assert_match response_success, @ui.output
@@ -553,16 +556,17 @@ def test_with_webauthn_enabled_failure_with_polling
     assert_equal 1, error.exit_code
 
     assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
-      "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
-      "command with the `--otp [your_code]` option.", @ui.output
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
+      "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
+      "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "ERROR:  Security device verification failed: The token in the link you used has either expired " \
       "or been used already.", @ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @ui.output
     refute_match response_success, @ui.output
   end
 
-  def test_sending_gem_unathorized_api_key_with_mfa_enabled
+  def test_sending_gem_unauthorized_api_key_with_mfa_enabled
     response_mfa_enabled = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
     response_forbidden = "The API key doesn't have access"
     response_success   = "Successfully registered gem: freewill (1.0.0)"
diff --git a/test/mri/rubygems/test_gem_commands_query_command.rb b/test/mri/rubygems/test_gem_commands_query_command.rb
deleted file mode 100644
index 8e590df1244..00000000000
--- a/test/mri/rubygems/test_gem_commands_query_command.rb
+++ /dev/null
@@ -1,830 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "helper"
-require "rubygems/commands/query_command"
-
-module TestGemCommandsQueryCommandSetup
-  def setup
-    super
-
-    @cmd = Gem::Commands::QueryCommand.new
-
-    @specs = add_gems_to_fetcher
-    @stub_ui = Gem::MockGemUi.new
-    @stub_fetcher = Gem::FakeFetcher.new
-
-    @stub_fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
-      raise Gem::RemoteFetcher::FetchError
-    end
-  end
-end
-
-class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase
-  include TestGemCommandsQueryCommandSetup
-
-  def test_execute
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[-r]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_all
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[-r --all]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2, 1)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_all_prerelease
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[-r --all --prerelease]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (3.a, 2, 1)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_details
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 2 do |s|
-        s.summary = "This is a lot of text. " * 4
-        s.authors = ["Abraham Lincoln", "Hirohito"]
-        s.homepage = "http://a.example.com/"
-      end
-
-      fetcher.legacy_platform
-    end
-
-    @cmd.handle_options %w[-r -d]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2)
-    Authors: Abraham Lincoln, Hirohito
-    Homepage: http://a.example.com/
-
-    This is a lot of text. This is a lot of text. This is a lot of text.
-    This is a lot of text.
-
-pl (1)
-    Platform: i386-linux
-    Author: A User
-    Homepage: http://example.com
-
-    this is a summary
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_details_cleans_text
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 2 do |s|
-        s.summary = "This is a lot of text. " * 4
-        s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
-        s.homepage = "http://a.example.com/\x03"
-      end
-
-      fetcher.legacy_platform
-    end
-
-    @cmd.handle_options %w[-r -d]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2)
-    Authors: Abraham Lincoln ., . Hirohito
-    Homepage: http://a.example.com/.
-
-    This is a lot of text. This is a lot of text. This is a lot of text.
-    This is a lot of text.
-
-pl (1)
-    Platform: i386-linux
-    Author: A User
-    Homepage: http://example.com
-
-    this is a summary
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_details_truncates_summary
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 2 do |s|
-        s.summary = "This is a lot of text. " * 10_000
-        s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
-        s.homepage = "http://a.example.com/\x03"
-      end
-
-      fetcher.legacy_platform
-    end
-
-    @cmd.handle_options %w[-r -d]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2)
-    Authors: Abraham Lincoln ., . Hirohito
-    Homepage: http://a.example.com/.
-
-    Truncating the summary for a-2 to 100,000 characters:
-#{"    This is a lot of text. This is a lot of text. This is a lot of text.\n" * 1449}    This is a lot of te
-
-pl (1)
-    Platform: i386-linux
-    Author: A User
-    Homepage: http://example.com
-
-    this is a summary
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_installed
-    @cmd.handle_options %w[-n a --installed]
-
-    assert_raise Gem::MockGemUi::SystemExitException do
-      use_ui @stub_ui do
-        @cmd.execute
-      end
-    end
-
-    assert_equal "true\n", @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_installed_inverse
-    @cmd.handle_options %w[-n a --no-installed]
-
-    e = assert_raise Gem::MockGemUi::TermError do
-      use_ui @stub_ui do
-        @cmd.execute
-      end
-    end
-
-    assert_equal "false\n", @stub_ui.output
-    assert_equal "", @stub_ui.error
-
-    assert_equal 1, e.exit_code
-  end
-
-  def test_execute_installed_inverse_not_installed
-    @cmd.handle_options %w[-n not_installed --no-installed]
-
-    assert_raise Gem::MockGemUi::SystemExitException do
-      use_ui @stub_ui do
-        @cmd.execute
-      end
-    end
-
-    assert_equal "true\n", @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_installed_no_name
-    @cmd.handle_options %w[--installed]
-
-    e = assert_raise Gem::MockGemUi::TermError do
-      use_ui @stub_ui do
-        @cmd.execute
-      end
-    end
-
-    assert_equal "", @stub_ui.output
-    assert_equal "ERROR:  You must specify a gem name\n", @stub_ui.error
-
-    assert_equal 4, e.exit_code
-  end
-
-  def test_execute_installed_not_installed
-    @cmd.handle_options %w[-n not_installed --installed]
-
-    e = assert_raise Gem::MockGemUi::TermError do
-      use_ui @stub_ui do
-        @cmd.execute
-      end
-    end
-
-    assert_equal "false\n", @stub_ui.output
-    assert_equal "", @stub_ui.error
-
-    assert_equal 1, e.exit_code
-  end
-
-  def test_execute_installed_version
-    @cmd.handle_options %w[-n a --installed --version 2]
-
-    assert_raise Gem::MockGemUi::SystemExitException do
-      use_ui @stub_ui do
-        @cmd.execute
-      end
-    end
-
-    assert_equal "true\n", @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_installed_version_not_installed
-    @cmd.handle_options %w[-n c --installed --version 2]
-
-    e = assert_raise Gem::MockGemUi::TermError do
-      use_ui @stub_ui do
-        @cmd.execute
-      end
-    end
-
-    assert_equal "false\n", @stub_ui.output
-    assert_equal "", @stub_ui.error
-
-    assert_equal 1, e.exit_code
-  end
-
-  def test_execute_local
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.options[:domain] = :local
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-a (3.a, 2, 1)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_local_notty
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[]
-
-    @stub_ui.outs.tty = false
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-a (3.a, 2, 1)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_local_quiet
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.options[:domain] = :local
-    Gem.configuration.verbose = false
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-a (3.a, 2, 1)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_no_versions
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[-r --no-versions]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a
-pl
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_notty
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[-r]
-
-    @stub_ui.outs.tty = false
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-a (2)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_prerelease
-    @cmd.handle_options %w[-r --prerelease]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (3.a)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_prerelease_local
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[-l --prerelease]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-a (3.a, 2, 1)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_execute_no_prerelease_local
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[-l --no-prerelease]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-a (2, 1)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_execute_remote
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.options[:domain] = :remote
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_remote_notty
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[]
-
-    @stub_ui.outs.tty = false
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-a (3.a, 2, 1)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_remote_quiet
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.options[:domain] = :remote
-    Gem.configuration.verbose = false
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-a (2)
-pl (1 i386-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_make_entry
-    a_2_name = @specs["a-2"].original_name
-
-    @stub_fetcher.data.delete \
-      "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a_2_name}.gemspec.rz"
-
-    a2 = @specs["a-2"]
-    entry_tuples = [
-      [Gem::NameTuple.new(a2.name, a2.version, a2.platform),
-       Gem.sources.first],
-    ]
-
-    platforms = { a2.version => [a2.platform] }
-
-    entry = @cmd.send :make_entry, entry_tuples, platforms
-
-    assert_equal "a (2)", entry
-  end
-
-  # Test for multiple args handling!
-  def test_execute_multiple_args
-    spec_fetcher(&:legacy_platform)
-
-    @cmd.handle_options %w[a pl]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    assert_match(/^a /, @stub_ui.output)
-    assert_match(/^pl /, @stub_ui.output)
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_show_gems
-    @cmd.options[:name] = //
-    @cmd.options[:domain] = :remote
-
-    use_ui @stub_ui do
-      @cmd.send :show_gems, /a/i
-    end
-
-    assert_match(/^a /,  @stub_ui.output)
-    refute_match(/^pl /, @stub_ui.output)
-    assert_empty @stub_ui.error
-  end
-
-  private
-
-  def add_gems_to_fetcher
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 1
-      fetcher.spec "a", 2
-      fetcher.spec "a", "3.a"
-    end
-  end
-end
-
-class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase
-  include TestGemCommandsQueryCommandSetup
-
-  def test_execute_platform
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 1
-      fetcher.spec "a", 1 do |s|
-        s.platform = "x86-linux"
-      end
-
-      fetcher.spec "a", 2 do |s|
-        s.platform = "universal-darwin"
-      end
-    end
-
-    @cmd.handle_options %w[-r -a]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2 universal-darwin, 1 ruby x86-linux)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-    assert_equal "", @stub_ui.error
-  end
-
-  def test_execute_show_default_gems
-    spec_fetcher {|fetcher| fetcher.spec "a", 2 }
-
-    a1 = new_default_spec "a", 1
-    install_default_gems a1
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-a (2, default: 1)
-EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_execute_show_default_gems_with_platform
-    a1 = new_default_spec "a", 1
-    a1.platform = "java"
-    install_default_gems a1
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-a (default: 1 java)
-EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_execute_default_details
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 2
-    end
-
-    a1 = new_default_spec "a", 1
-    install_default_gems a1
-
-    @cmd.handle_options %w[-l -d]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-a (2, 1)
-    Author: A User
-    Homepage: http://example.com
-    Installed at (2): #{@gemhome}
-                 (1, default): #{a1.base_dir}
-
-    this is a summary
-    EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_execute_local_details
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 1 do |s|
-        s.platform = "x86-linux"
-      end
-
-      fetcher.spec "a", 2 do |s|
-        s.summary = "This is a lot of text. " * 4
-        s.authors = ["Abraham Lincoln", "Hirohito"]
-        s.homepage = "http://a.example.com/"
-        s.platform = "universal-darwin"
-      end
-
-      fetcher.legacy_platform
-    end
-
-    @cmd.handle_options %w[-l -d]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    str = @stub_ui.output
-
-    str.gsub!(/\(\d\): [^\n]*/, "-")
-    str.gsub!(/at: [^\n]*/, "at: -")
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-a (2, 1)
-    Platforms:
-        1: x86-linux
-        2: universal-darwin
-    Authors: Abraham Lincoln, Hirohito
-    Homepage: http://a.example.com/
-    Installed at -
-                 -
-
-    This is a lot of text. This is a lot of text. This is a lot of text.
-    This is a lot of text.
-
-pl (1)
-    Platform: i386-linux
-    Author: A User
-    Homepage: http://example.com
-    Installed at: -
-
-    this is a summary
-    EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_execute_exact_remote
-    spec_fetcher do |fetcher|
-      fetcher.spec "coolgem-omg", 3
-      fetcher.spec "coolgem", "4.2.1"
-      fetcher.spec "wow_coolgem", 1
-    end
-
-    @cmd.handle_options %w[--remote --exact coolgem]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-coolgem (4.2.1)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_execute_exact_local
-    spec_fetcher do |fetcher|
-      fetcher.spec "coolgem-omg", 3
-      fetcher.spec "coolgem", "4.2.1"
-      fetcher.spec "wow_coolgem", 1
-    end
-
-    @cmd.handle_options %w[--exact coolgem]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-coolgem (4.2.1)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_execute_exact_multiple
-    spec_fetcher do |fetcher|
-      fetcher.spec "coolgem-omg", 3
-      fetcher.spec "coolgem", "4.2.1"
-      fetcher.spec "wow_coolgem", 1
-
-      fetcher.spec "othergem-omg", 3
-      fetcher.spec "othergem", "1.2.3"
-      fetcher.spec "wow_othergem", 1
-    end
-
-    @cmd.handle_options %w[--exact coolgem othergem]
-
-    use_ui @stub_ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-coolgem (4.2.1)
-
-*** LOCAL GEMS ***
-
-othergem (1.2.3)
-    EOF
-
-    assert_equal expected, @stub_ui.output
-  end
-
-  def test_depprecated
-    assert @cmd.deprecated?
-  end
-
-  private
-
-  def add_gems_to_fetcher
-    spec_fetcher do |fetcher|
-      fetcher.download "a", 1
-      fetcher.download "a", 2
-      fetcher.download "a", "3.a"
-    end
-  end
-end
diff --git a/test/mri/rubygems/test_gem_commands_setup_command.rb b/test/mri/rubygems/test_gem_commands_setup_command.rb
index c3622c02cda..b33e05ab28d 100644
--- a/test/mri/rubygems/test_gem_commands_setup_command.rb
+++ b/test/mri/rubygems/test_gem_commands_setup_command.rb
@@ -4,13 +4,6 @@
 require "rubygems/commands/setup_command"
 
 class TestGemCommandsSetupCommand < Gem::TestCase
-  bundler_gemspec = File.expand_path("../../bundler/lib/bundler/version.rb", __dir__)
-  if File.exist?(bundler_gemspec)
-    BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1]
-  else
-    BUNDLER_VERS = "2.0.1"
-  end
-
   def setup
     super
 
@@ -35,9 +28,10 @@ def setup
 
     create_dummy_files(filelist)
 
-    gemspec = util_spec "bundler", BUNDLER_VERS do |s|
+    gemspec = util_spec "bundler", "9.9.9" do |s|
       s.bindir = "exe"
       s.executables = ["bundle", "bundler"]
+      s.files = ["lib/bundler.rb"]
     end
 
     File.open "bundler/bundler.gemspec", "w" do |io|
@@ -229,6 +223,9 @@ def test_install_default_bundler_gem
 
     assert_path_exist "#{Gem.dir}/gems/bundler-#{bundler_version}"
     assert_path_exist "#{Gem.dir}/gems/bundler-audit-1.0.0"
+
+    assert_path_exist "#{Gem.dir}/gems/bundler-#{bundler_version}/exe/bundle"
+    assert_path_not_exist "#{Gem.dir}/gems/bundler-#{bundler_version}/lib/bundler.rb"
   end
 
   def test_install_default_bundler_gem_with_default_gems_not_installed_at_default_dir
@@ -380,20 +377,22 @@ def test_show_release_notes
 
     File.open "CHANGELOG.md", "w" do |io|
       io.puts <<-HISTORY_TXT
-# #{Gem::VERSION} / 2013-03-26
+# Changelog
+
+## #{Gem::VERSION} / 2013-03-26
 
-## Bug fixes:
+### Bug fixes:
   * Fixed release note display for LANG=C when installing rubygems
   * π is tasty
 
-# 2.0.2 / 2013-03-06
+## 2.0.2 / 2013-03-06
 
-## Bug fixes:
+### Bug fixes:
   * Other bugs fixed
 
-# 2.0.1 / 2013-03-05
+## 2.0.1 / 2013-03-05
 
-## Bug fixes:
+### Bug fixes:
   * Yet more bugs fixed
       HISTORY_TXT
     end
@@ -403,9 +402,9 @@ def test_show_release_notes
     end
 
     expected = <<-EXPECTED
-# #{Gem::VERSION} / 2013-03-26
+## #{Gem::VERSION} / 2013-03-26
 
-## Bug fixes:
+### Bug fixes:
   * Fixed release note display for LANG=C when installing rubygems
   * π is tasty
 
diff --git a/test/mri/rubygems/test_gem_commands_signin_command.rb b/test/mri/rubygems/test_gem_commands_signin_command.rb
index 29e5edceb7c..e612288faf9 100644
--- a/test/mri/rubygems/test_gem_commands_signin_command.rb
+++ b/test/mri/rubygems/test_gem_commands_signin_command.rb
@@ -121,7 +121,7 @@ def test_execute_with_key_name_default_scope
     assert_match "The default access scope is:", key_name_ui.output
     assert_match "index_rubygems: y", key_name_ui.output
     assert_match "Do you want to customise scopes? [yN]", key_name_ui.output
-    assert_equal "name=test-key&index_rubygems=true", fetcher.last_request.body
+    assert_equal "name=test-key&index_rubygems=true&push_rubygem=true", fetcher.last_request.body
 
     credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
diff --git a/test/mri/rubygems/test_gem_commands_sources_command.rb b/test/mri/rubygems/test_gem_commands_sources_command.rb
index 5e675e5c844..00eb9239940 100644
--- a/test/mri/rubygems/test_gem_commands_sources_command.rb
+++ b/test/mri/rubygems/test_gem_commands_sources_command.rb
@@ -32,7 +32,7 @@ def test_execute
     end
 
     expected = <<-EOF
-*** CURRENT SOURCES ***
+*** NO CONFIGURED SOURCES, DEFAULT SOURCES LISTED BELOW ***
 
 #{@gem_repo}
     EOF
@@ -42,23 +42,28 @@ def test_execute
   end
 
   def test_execute_add
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 1
-    end
+    setup_fake_source(@new_repo)
 
-    specs = Gem::Specification.map do |spec|
-      [spec.name, spec.version, spec.original_platform]
-    end
+    @cmd.handle_options %W[--add #{@new_repo}]
 
-    specs_dump_gz = StringIO.new
-    Zlib::GzipWriter.wrap specs_dump_gz do |io|
-      Marshal.dump specs, io
+    use_ui @ui do
+      @cmd.execute
     end
 
-    @fetcher.data["#{@new_repo}/specs.#{@marshal_version}.gz"] =
-      specs_dump_gz.string
+    assert_equal [@gem_repo, @new_repo], Gem.sources
+
+    expected = <<-EOF
+#{@new_repo} added to sources
+    EOF
 
-    @cmd.handle_options %W[--add #{@new_repo}]
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
+  def test_execute_append
+    setup_fake_source(@new_repo)
+
+    @cmd.handle_options %W[--append #{@new_repo}]
 
     use_ui @ui do
       @cmd.execute
@@ -77,21 +82,31 @@ def test_execute_add
   def test_execute_add_allow_typo_squatting_source
     rubygems_org = "https://rubyems.org"
 
-    spec_fetcher do |fetcher|
-      fetcher.spec("a", 1)
-    end
+    setup_fake_source(rubygems_org)
 
-    specs = Gem::Specification.map do |spec|
-      [spec.name, spec.version, spec.original_platform]
-    end
+    @cmd.handle_options %W[--add #{rubygems_org}]
+    ui = Gem::MockGemUi.new("y")
 
-    specs_dump_gz = StringIO.new
-    Zlib::GzipWriter.wrap(specs_dump_gz) do |io|
-      Marshal.dump(specs, io)
+    use_ui ui do
+      @cmd.execute
     end
 
-    @fetcher.data["#{rubygems_org}/specs.#{@marshal_version}.gz"] = specs_dump_gz.string
-    @cmd.handle_options %W[--add #{rubygems_org}]
+    expected = "https://rubyems.org is too similar to https://rubygems.org\n\nDo you want to add this source? [yn]  https://rubyems.org added to sources\n"
+
+    assert_equal expected, ui.output
+
+    source = Gem::Source.new(rubygems_org)
+    assert Gem.sources.include?(source)
+
+    assert_empty ui.error
+  end
+
+  def test_execute_append_allow_typo_squatting_source
+    rubygems_org = "https://rubyems.org"
+
+    setup_fake_source(rubygems_org)
+
+    @cmd.handle_options %W[--append #{rubygems_org}]
     ui = Gem::MockGemUi.new("y")
 
     use_ui ui do
@@ -111,21 +126,27 @@ def test_execute_add_allow_typo_squatting_source
   def test_execute_add_allow_typo_squatting_source_forced
     rubygems_org = "https://rubyems.org"
 
-    spec_fetcher do |fetcher|
-      fetcher.spec("a", 1)
-    end
+    setup_fake_source(rubygems_org)
 
-    specs = Gem::Specification.map do |spec|
-      [spec.name, spec.version, spec.original_platform]
-    end
+    @cmd.handle_options %W[--force --add #{rubygems_org}]
 
-    specs_dump_gz = StringIO.new
-    Zlib::GzipWriter.wrap(specs_dump_gz) do |io|
-      Marshal.dump(specs, io)
-    end
+    @cmd.execute
 
-    @fetcher.data["#{rubygems_org}/specs.#{@marshal_version}.gz"] = specs_dump_gz.string
-    @cmd.handle_options %W[--force --add #{rubygems_org}]
+    expected = "https://rubyems.org added to sources\n"
+    assert_equal expected, ui.output
+
+    source = Gem::Source.new(rubygems_org)
+    assert Gem.sources.include?(source)
+
+    assert_empty ui.error
+  end
+
+  def test_execute_append_allow_typo_squatting_source_forced
+    rubygems_org = "https://rubyems.org"
+
+    setup_fake_source(rubygems_org)
+
+    @cmd.handle_options %W[--force --append #{rubygems_org}]
 
     @cmd.execute
 
@@ -141,23 +162,34 @@ def test_execute_add_allow_typo_squatting_source_forced
   def test_execute_add_deny_typo_squatting_source
     rubygems_org = "https://rubyems.org"
 
-    spec_fetcher do |fetcher|
-      fetcher.spec("a", 1)
-    end
+    setup_fake_source(rubygems_org)
 
-    specs = Gem::Specification.map do |spec|
-      [spec.name, spec.version, spec.original_platform]
-    end
+    @cmd.handle_options %W[--add #{rubygems_org}]
 
-    specs_dump_gz = StringIO.new
-    Zlib::GzipWriter.wrap(specs_dump_gz) do |io|
-      Marshal.dump(specs, io)
+    ui = Gem::MockGemUi.new("n")
+
+    use_ui ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
     end
 
-    @fetcher.data["#{rubygems_org}/specs.#{@marshal_version}.gz"] =
-      specs_dump_gz.string
+    expected = "https://rubyems.org is too similar to https://rubygems.org\n\nDo you want to add this source? [yn]  "
 
-    @cmd.handle_options %W[--add #{rubygems_org}]
+    assert_equal expected, ui.output
+
+    source = Gem::Source.new(rubygems_org)
+    refute Gem.sources.include?(source)
+
+    assert_empty ui.error
+  end
+
+  def test_execute_append_deny_typo_squatting_source
+    rubygems_org = "https://rubyems.org"
+
+    setup_fake_source(rubygems_org)
+
+    @cmd.handle_options %W[--append #{rubygems_org}]
 
     ui = Gem::MockGemUi.new("n")
 
@@ -202,6 +234,31 @@ def test_execute_add_nonexistent_source
     assert_equal "", @ui.error
   end
 
+  def test_execute_append_nonexistent_source
+    spec_fetcher
+
+    uri = "http://beta-gems.example.com/specs.#{@marshal_version}.gz"
+    @fetcher.data[uri] = proc do
+      raise Gem::RemoteFetcher::FetchError.new("it died", uri)
+    end
+
+    @cmd.handle_options %w[--append http://beta-gems.example.com]
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    expected = <<-EOF
+Error fetching http://beta-gems.example.com:
+\tit died (#{uri})
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
   def test_execute_add_existent_source_invalid_uri
     spec_fetcher
 
@@ -227,6 +284,31 @@ def test_execute_add_existent_source_invalid_uri
     assert_equal "", @ui.error
   end
 
+  def test_execute_append_existent_source_invalid_uri
+    spec_fetcher
+
+    uri = "https://u:p@example.com/specs.#{@marshal_version}.gz"
+
+    @cmd.handle_options %w[--append https://u:p@example.com]
+    @fetcher.data[uri] = proc do
+      raise Gem::RemoteFetcher::FetchError.new("it died", uri)
+    end
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    expected = <<-EOF
+Error fetching https://u:REDACTED@example.com:
+\tit died (https://u:REDACTED@example.com/specs.#{@marshal_version}.gz)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
   def test_execute_add_existent_source_invalid_uri_with_error_by_chance_including_the_uri_password
     spec_fetcher
 
@@ -252,6 +334,31 @@ def test_execute_add_existent_source_invalid_uri_with_error_by_chance_including_
     assert_equal "", @ui.error
   end
 
+  def test_execute_append_existent_source_invalid_uri_with_error_by_chance_including_the_uri_password
+    spec_fetcher
+
+    uri = "https://u:secret@example.com/specs.#{@marshal_version}.gz"
+
+    @cmd.handle_options %w[--append https://u:secret@example.com]
+    @fetcher.data[uri] = proc do
+      raise Gem::RemoteFetcher::FetchError.new("it secretly died", uri)
+    end
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    expected = <<-EOF
+Error fetching https://u:REDACTED@example.com:
+\tit secretly died (https://u:REDACTED@example.com/specs.#{@marshal_version}.gz)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
   def test_execute_add_redundant_source
     spec_fetcher
 
@@ -271,27 +378,34 @@ def test_execute_add_redundant_source
     assert_equal "", @ui.error
   end
 
-  def test_execute_add_redundant_source_trailing_slash
+  def test_execute_append_redundant_source
     spec_fetcher
 
-    # Remove pre-existing gem source (w/ slash)
-    repo_with_slash = "http://gems.example.com/"
-    @cmd.handle_options %W[--remove #{repo_with_slash}]
+    @cmd.handle_options %W[--append #{@gem_repo}]
+
     use_ui @ui do
       @cmd.execute
     end
-    source = Gem::Source.new repo_with_slash
-    assert_equal false, Gem.sources.include?(source)
+
+    assert_equal [@gem_repo], Gem.sources
 
     expected = <<-EOF
-#{repo_with_slash} removed from sources
+#{@gem_repo} moved to end of sources
     EOF
 
     assert_equal expected, @ui.output
     assert_equal "", @ui.error
+  end
+
+  def test_execute_add_redundant_source_trailing_slash
+    repo_with_slash = "http://sample.repo/"
+
+    Gem.configuration.sources = [repo_with_slash]
+
+    setup_fake_source(repo_with_slash)
 
     # Re-add pre-existing gem source (w/o slash)
-    repo_without_slash = "http://gems.example.com"
+    repo_without_slash = repo_with_slash.delete_suffix("/")
     @cmd.handle_options %W[--add #{repo_without_slash}]
     use_ui @ui do
       @cmd.execute
@@ -300,8 +414,7 @@ def test_execute_add_redundant_source_trailing_slash
     assert_equal true, Gem.sources.include?(source)
 
     expected = <<-EOF
-http://gems.example.com/ removed from sources
-http://gems.example.com added to sources
+source #{repo_without_slash} already present in the cache
     EOF
 
     assert_equal expected, @ui.output
@@ -316,35 +429,46 @@ def test_execute_add_redundant_source_trailing_slash
     assert_equal true, Gem.sources.include?(source)
 
     expected = <<-EOF
-http://gems.example.com/ removed from sources
-http://gems.example.com added to sources
-source http://gems.example.com/ already present in the cache
+source #{repo_without_slash} already present in the cache
+source #{repo_with_slash} already present in the cache
     EOF
 
     assert_equal expected, @ui.output
     assert_equal "", @ui.error
+  ensure
+    Gem.configuration.sources = nil
   end
 
   def test_execute_add_http_rubygems_org
     http_rubygems_org = "http://rubygems.org/"
 
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 1
-    end
+    setup_fake_source(http_rubygems_org)
 
-    specs = Gem::Specification.map do |spec|
-      [spec.name, spec.version, spec.original_platform]
-    end
+    @cmd.handle_options %W[--add #{http_rubygems_org}]
 
-    specs_dump_gz = StringIO.new
-    Zlib::GzipWriter.wrap specs_dump_gz do |io|
-      Marshal.dump specs, io
+    ui = Gem::MockGemUi.new "n"
+
+    use_ui ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
     end
 
-    @fetcher.data["#{http_rubygems_org}/specs.#{@marshal_version}.gz"] =
-      specs_dump_gz.string
+    assert_equal [@gem_repo], Gem.sources
 
-    @cmd.handle_options %W[--add #{http_rubygems_org}]
+    expected = <<-EXPECTED
+    EXPECTED
+
+    assert_equal expected, @ui.output
+    assert_empty @ui.error
+  end
+
+  def test_execute_append_http_rubygems_org
+    http_rubygems_org = "http://rubygems.org/"
+
+    setup_fake_source(http_rubygems_org)
+
+    @cmd.handle_options %W[--append #{http_rubygems_org}]
 
     ui = Gem::MockGemUi.new "n"
 
@@ -366,21 +490,27 @@ def test_execute_add_http_rubygems_org
   def test_execute_add_http_rubygems_org_forced
     rubygems_org = "http://rubygems.org"
 
-    spec_fetcher do |fetcher|
-      fetcher.spec("a", 1)
-    end
+    setup_fake_source(rubygems_org)
 
-    specs = Gem::Specification.map do |spec|
-      [spec.name, spec.version, spec.original_platform]
-    end
+    @cmd.handle_options %W[--force --add #{rubygems_org}]
 
-    specs_dump_gz = StringIO.new
-    Zlib::GzipWriter.wrap(specs_dump_gz) do |io|
-      Marshal.dump(specs, io)
-    end
+    @cmd.execute
 
-    @fetcher.data["#{rubygems_org}/specs.#{@marshal_version}.gz"] = specs_dump_gz.string
-    @cmd.handle_options %W[--force --add #{rubygems_org}]
+    expected = "http://rubygems.org added to sources\n"
+    assert_equal expected, ui.output
+
+    source = Gem::Source.new(rubygems_org)
+    assert Gem.sources.include?(source)
+
+    assert_empty ui.error
+  end
+
+  def test_execute_append_http_rubygems_org_forced
+    rubygems_org = "http://rubygems.org"
+
+    setup_fake_source(rubygems_org)
+
+    @cmd.handle_options %W[--force --append #{rubygems_org}]
 
     @cmd.execute
 
@@ -396,23 +526,33 @@ def test_execute_add_http_rubygems_org_forced
   def test_execute_add_https_rubygems_org
     https_rubygems_org = "https://rubygems.org/"
 
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 1
-    end
+    setup_fake_source(https_rubygems_org)
 
-    specs = Gem::Specification.map do |spec|
-      [spec.name, spec.version, spec.original_platform]
-    end
+    @cmd.handle_options %W[--add #{https_rubygems_org}]
 
-    specs_dump_gz = StringIO.new
-    Zlib::GzipWriter.wrap specs_dump_gz do |io|
-      Marshal.dump specs, io
+    ui = Gem::MockGemUi.new "n"
+
+    use_ui ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
     end
 
-    @fetcher.data["#{https_rubygems_org}/specs.#{@marshal_version}.gz"] =
-      specs_dump_gz.string
+    assert_equal [@gem_repo], Gem.sources
 
-    @cmd.handle_options %W[--add #{https_rubygems_org}]
+    expected = <<-EXPECTED
+    EXPECTED
+
+    assert_equal expected, @ui.output
+    assert_empty @ui.error
+  end
+
+  def test_execute_append_https_rubygems_org
+    https_rubygems_org = "https://rubygems.org/"
+
+    setup_fake_source(https_rubygems_org)
+
+    @cmd.handle_options %W[--append #{https_rubygems_org}]
 
     ui = Gem::MockGemUi.new "n"
 
@@ -450,6 +590,25 @@ def test_execute_add_bad_uri
     assert_equal "", @ui.error
   end
 
+  def test_execute_append_bad_uri
+    @cmd.handle_options %w[--append beta-gems.example.com]
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    assert_equal [@gem_repo], Gem.sources
+
+    expected = <<-EOF
+beta-gems.example.com is not a URI
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
   def test_execute_clear_all
     @cmd.handle_options %w[--clear-all]
 
@@ -476,7 +635,7 @@ def test_execute_list
     end
 
     expected = <<-EOF
-*** CURRENT SOURCES ***
+*** NO CONFIGURED SOURCES, DEFAULT SOURCES LISTED BELOW ***
 
 #{@gem_repo}
     EOF
@@ -486,24 +645,32 @@ def test_execute_list
   end
 
   def test_execute_remove
-    @cmd.handle_options %W[--remove #{@gem_repo}]
+    Gem.configuration.sources = [@new_repo]
+
+    setup_fake_source(@new_repo)
+
+    @cmd.handle_options %W[--remove #{@new_repo}]
 
     use_ui @ui do
       @cmd.execute
     end
 
-    expected = "#{@gem_repo} removed from sources\n"
+    expected = "#{@new_repo} removed from sources\n"
 
     assert_equal expected, @ui.output
     assert_equal "", @ui.error
+  ensure
+    Gem.configuration.sources = nil
   end
 
   def test_execute_remove_no_network
+    Gem.configuration.sources = [@new_repo]
+
     spec_fetcher
 
-    @cmd.handle_options %W[--remove #{@gem_repo}]
+    @cmd.handle_options %W[--remove #{@new_repo}]
 
-    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
+    @fetcher.data["#{@new_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError
     end
 
@@ -511,10 +678,104 @@ def test_execute_remove_no_network
       @cmd.execute
     end
 
+    expected = "#{@new_repo} removed from sources\n"
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  ensure
+    Gem.configuration.sources = nil
+  end
+
+  def test_execute_remove_not_present
+    Gem.configuration.sources = ["https://other.repo"]
+
+    @cmd.handle_options %W[--remove #{@new_repo}]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = "source #{@new_repo} cannot be removed because it's not present in #{Gem.configuration.config_file_name}\n"
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  ensure
+    Gem.configuration.sources = nil
+  end
+
+  def test_execute_remove_nothing_configured
+    spec_fetcher
+
+    @cmd.handle_options %W[--remove https://does.not.exist]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = "source https://does.not.exist cannot be removed because there are no configured sources in #{Gem.configuration.config_file_name}\n"
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
+  def test_remove_default_also_present_in_configuration
+    Gem.configuration.sources = [@gem_repo]
+
+    @cmd.handle_options %W[--remove #{@gem_repo}]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = "WARNING:  Removing a default source when it is the only source has no effect. Add a different source to #{Gem.configuration.config_file_name} if you want to stop using it as a source.\n"
+
+    assert_equal "", @ui.output
+    assert_equal expected, @ui.error
+  ensure
+    Gem.configuration.sources = nil
+  end
+
+  def test_remove_default_also_present_in_configuration_when_there_are_more_configured_sources
+    Gem.configuration.sources = [@gem_repo, "https://other.repo"]
+
+    @cmd.handle_options %W[--remove #{@gem_repo}]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
     expected = "#{@gem_repo} removed from sources\n"
 
     assert_equal expected, @ui.output
     assert_equal "", @ui.error
+  ensure
+    Gem.configuration.sources = nil
+  end
+
+  def test_execute_remove_redundant_source_trailing_slash
+    repo_with_slash = "http://sample.repo/"
+
+    Gem.configuration.sources = [repo_with_slash]
+
+    setup_fake_source(repo_with_slash)
+
+    repo_without_slash = repo_with_slash.delete_suffix("/")
+
+    @cmd.handle_options %W[--remove #{repo_without_slash}]
+    use_ui @ui do
+      @cmd.execute
+    end
+    source = Gem::Source.new repo_without_slash
+    assert_equal false, Gem.sources.include?(source)
+
+    expected = <<-EOF
+#{repo_without_slash} removed from sources
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  ensure
+    Gem.configuration.sources = nil
   end
 
   def test_execute_update
@@ -531,4 +792,102 @@ def test_execute_update
     assert_equal "source cache successfully updated\n", @ui.output
     assert_equal "", @ui.error
   end
+
+  def test_execute_prepend_new_source
+    setup_fake_source(@new_repo)
+
+    @cmd.handle_options %W[--prepend #{@new_repo}]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal [@new_repo, @gem_repo], Gem.sources
+
+    expected = <<-EOF
+#{@new_repo} added to sources
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
+  def test_execute_prepend_existing_source
+    setup_fake_source(@new_repo)
+
+    # Append the source normally first
+    @cmd.handle_options %W[--append #{@new_repo}]
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    # Initial state: [@gem_repo, @new_repo]
+    assert_equal [@gem_repo, @new_repo], Gem.sources
+
+    # Now prepend the existing source
+    @cmd.handle_options %W[--prepend #{@new_repo}]
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    # Should be moved to front: [@new_repo, @gem_repo]
+    assert_equal [@new_repo, @gem_repo], Gem.sources
+
+    expected = <<-EOF
+#{@new_repo} added to sources
+#{@new_repo} moved to top of sources
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
+  def test_execute_append_existing_source
+    setup_fake_source(@new_repo)
+
+    # Prepend the source first so it's at the beginning
+    @cmd.handle_options %W[--prepend #{@new_repo}]
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    # Initial state: [@new_repo, @gem_repo] (new_repo is first)
+    assert_equal [@new_repo, @gem_repo], Gem.sources
+
+    # Now append the existing source
+    @cmd.handle_options %W[--append #{@new_repo}]
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    # Should be moved to end: [@gem_repo, @new_repo]
+    assert_equal [@gem_repo, @new_repo], Gem.sources
+
+    expected = <<-EOF
+#{@new_repo} added to sources
+#{@new_repo} moved to end of sources
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal "", @ui.error
+  end
+
+  private
+
+  def setup_fake_source(uri)
+    spec_fetcher do |fetcher|
+      fetcher.spec "a", 1
+    end
+
+    specs = Gem::Specification.map do |spec|
+      [spec.name, spec.version, spec.original_platform]
+    end
+
+    specs_dump_gz = StringIO.new
+    Zlib::GzipWriter.wrap specs_dump_gz do |io|
+      Marshal.dump specs, io
+    end
+
+    @fetcher.data["#{uri}/specs.#{@marshal_version}.gz"] = specs_dump_gz.string
+  end
 end
diff --git a/test/mri/rubygems/test_gem_commands_update_command.rb b/test/mri/rubygems/test_gem_commands_update_command.rb
index 24e24f97f64..5ed12ad4814 100644
--- a/test/mri/rubygems/test_gem_commands_update_command.rb
+++ b/test/mri/rubygems/test_gem_commands_update_command.rb
@@ -506,7 +506,7 @@ def test_execute_rdoc
     a2 = @specs["a-2"]
 
     assert_path_exist File.join(a2.doc_dir, "rdoc")
-  end unless Gem.rdoc_hooks_defined_via_plugin?
+  end if defined?(Gem::RDoc) && !Gem.rdoc_hooks_defined_via_plugin?
 
   def test_execute_named
     spec_fetcher do |fetcher|
@@ -696,6 +696,38 @@ def test_fetch_remote_gems_prerelease
     assert_equal expected, @cmd.fetch_remote_gems(specs["a-1"])
   end
 
+  def test_pass_down_the_job_option_to_make
+    gemspec = nil
+
+    spec_fetcher do |fetcher|
+      fetcher.download "a", 3 do |spec|
+        gemspec = spec
+
+        extconf_path = "#{spec.gem_dir}/extconf.rb"
+
+        write_file(extconf_path) do |io|
+          io.puts "require 'mkmf'"
+          io.puts "create_makefile '#{spec.name}'"
+        end
+
+        spec.extensions = "extconf.rb"
+      end
+
+      fetcher.gem "a", 2
+    end
+
+    use_ui @ui do
+      @cmd.invoke("a", "-j2")
+    end
+
+    gem_make_out = File.read(File.join(gemspec.extension_dir, "gem_make.out"))
+    if vc_windows? && nmake_found?
+      refute_includes(gem_make_out, " -j2")
+    else
+      assert_includes(gem_make_out, "make -j2")
+    end
+  end
+
   def test_handle_options_system
     @cmd.handle_options %w[--system]
 
diff --git a/test/mri/rubygems/test_gem_commands_yank_command.rb b/test/mri/rubygems/test_gem_commands_yank_command.rb
index eb78e3a5428..73fd1772432 100644
--- a/test/mri/rubygems/test_gem_commands_yank_command.rb
+++ b/test/mri/rubygems/test_gem_commands_yank_command.rb
@@ -131,9 +131,10 @@ def test_with_webauthn_enabled_success
     end
 
     assert_match %r{Yanking gem from http://example}, @ui.output
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
     assert_match "Successfully yanked", @ui.output
@@ -163,9 +164,10 @@ def test_with_webauthn_enabled_failure
 
     assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
     assert_match %r{Yanking gem from http://example}, @ui.output
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "ERROR:  Security device verification failed: Something went wrong", @ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @ui.output
     refute_match "Successfully yanked", @ui.output
@@ -189,9 +191,10 @@ def test_with_webauthn_enabled_success_with_polling
     end
 
     assert_match %r{Yanking gem from http://example}, @ui.output
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
     assert_match "Successfully yanked", @ui.output
@@ -219,9 +222,10 @@ def test_with_webauthn_enabled_failure_with_polling
 
     assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
     assert_match %r{Yanking gem from http://example}, @ui.output
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "ERROR:  Security device verification failed: The token in the link you used has either expired " \
       "or been used already.", @ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @ui.output
@@ -267,7 +271,7 @@ def test_execute_host
     assert_equal [yank_uri], @fetcher.paths
   end
 
-  def test_yank_gem_unathorized_api_key
+  def test_yank_gem_unauthorized_api_key
     response_forbidden = "The API key doesn't have access"
     response_success   = "Successfully yanked"
     host               = "http://example"
diff --git a/test/mri/rubygems/test_gem_dependency_installer.rb b/test/mri/rubygems/test_gem_dependency_installer.rb
index 56b84160c4d..3e10c0883aa 100644
--- a/test/mri/rubygems/test_gem_dependency_installer.rb
+++ b/test/mri/rubygems/test_gem_dependency_installer.rb
@@ -382,13 +382,9 @@ def test_install_dependency_existing_extension
     FileUtils.mv f1_gem, @tempdir
     inst = nil
 
-    pwd = Dir.getwd
-    Dir.chdir @tempdir
-    begin
+    Dir.chdir @tempdir do
       inst = Gem::DependencyInstaller.new
       inst.install "f"
-    ensure
-      Dir.chdir pwd
     end
 
     assert_equal %w[f-1], inst.installed_gems.map(&:full_name)
@@ -523,6 +519,58 @@ def test_install_local_subdir
     assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
+  def test_install_local_with_extensions_already_installed
+    pend "needs investigation" if Gem.java_platform?
+    pend "ruby.h is not provided by ruby repo" if ruby_repo?
+
+    @spec = quick_gem "a" do |s|
+      s.extensions << "extconf.rb"
+      s.files += %w[extconf.rb a.c]
+    end
+
+    write_dummy_extconf "a"
+
+    c_source_path = File.join(@tempdir, "a.c")
+
+    write_file c_source_path do |io|
+      io.write <<-C
+        #include <ruby.h>
+        void Init_a() { }
+      C
+    end
+
+    package_path = Gem::Package.build @spec
+    installer = Gem::Installer.at(package_path)
+
+    # Make sure the gem is installed and backup the correct package
+
+    installer.install
+
+    package_bkp_path = "#{package_path}.bkp"
+    FileUtils.cp package_path, package_bkp_path
+
+    # Break the extension, rebuild it, and try to install it
+
+    write_file c_source_path do |io|
+      io.write "typo"
+    end
+
+    Gem::Package.build @spec
+
+    assert_raise Gem::Ext::BuildError do
+      installer.install
+    end
+
+    # Make sure installing the good package again still works
+
+    FileUtils.cp "#{package_path}.bkp", package_path
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new domain: :local
+      inst.install package_path
+    end
+  end
+
   def test_install_minimal_deps
     util_setup_gems
 
@@ -1066,117 +1114,6 @@ def spec.validate(*args); end
     assert_equal %w[activesupport-1.0.0], Gem::Specification.map(&:full_name)
   end
 
-  def test_find_gems_gems_with_sources
-    util_setup_gems
-
-    inst = Gem::DependencyInstaller.new
-    dep = Gem::Dependency.new "b", ">= 0"
-
-    Gem::Specification.reset
-
-    set = Gem::Deprecate.skip_during do
-      inst.find_gems_with_sources(dep)
-    end
-
-    assert_kind_of Gem::AvailableSet, set
-
-    s = set.set.first
-
-    assert_equal @b1, s.spec
-    assert_equal Gem::Source.new(@gem_repo), s.source
-  end
-
-  def test_find_gems_with_sources_local
-    util_setup_gems
-
-    FileUtils.mv @a1_gem, @tempdir
-    inst = Gem::DependencyInstaller.new
-    dep = Gem::Dependency.new "a", ">= 0"
-    set = nil
-
-    Dir.chdir @tempdir do
-      set = Gem::Deprecate.skip_during do
-        inst.find_gems_with_sources dep
-      end
-    end
-
-    gems = set.sorted
-
-    assert_equal 2, gems.length
-
-    remote, local = gems
-
-    assert_equal "a-1", local.spec.full_name, "local spec"
-    assert_equal File.join(@tempdir, @a1.file_name),
-                 local.source.download(local.spec), "local path"
-
-    assert_equal "a-1", remote.spec.full_name, "remote spec"
-    assert_equal Gem::Source.new(@gem_repo), remote.source, "remote path"
-  end
-
-  def test_find_gems_with_sources_prerelease
-    util_setup_gems
-
-    installer = Gem::DependencyInstaller.new
-
-    dependency = Gem::Dependency.new("a", Gem::Requirement.default)
-
-    set = Gem::Deprecate.skip_during do
-      installer.find_gems_with_sources(dependency)
-    end
-
-    releases = set.all_specs
-
-    assert releases.any? {|s| s.name == "a" && s.version.to_s == "1" }
-    refute releases.any? {|s| s.name == "a" && s.version.to_s == "1.a" }
-
-    dependency.prerelease = true
-
-    set = Gem::Deprecate.skip_during do
-      installer.find_gems_with_sources(dependency)
-    end
-
-    prereleases = set.all_specs
-
-    assert_equal [@a1_pre, @a1], prereleases
-  end
-
-  def test_find_gems_with_sources_with_best_only_and_platform
-    util_setup_gems
-    a1_x86_mingw32, = util_gem "a", "1" do |s|
-      s.platform = "x86-mingw32"
-    end
-    util_setup_spec_fetcher @a1, a1_x86_mingw32
-    Gem.platforms << Gem::Platform.new("x86-mingw32")
-
-    installer = Gem::DependencyInstaller.new
-
-    dependency = Gem::Dependency.new("a", Gem::Requirement.default)
-
-    set = Gem::Deprecate.skip_during do
-      installer.find_gems_with_sources(dependency, true)
-    end
-
-    releases = set.all_specs
-
-    assert_equal [a1_x86_mingw32], releases
-  end
-
-  def test_find_gems_with_sources_with_bad_source
-    Gem.sources.replace ["http://not-there.nothing"]
-
-    installer = Gem::DependencyInstaller.new
-
-    dep = Gem::Dependency.new("a")
-
-    out = Gem::Deprecate.skip_during do
-      installer.find_gems_with_sources(dep)
-    end
-
-    assert out.empty?
-    assert_kind_of Gem::SourceFetchProblem, installer.errors.first
-  end
-
   def test_resolve_dependencies
     util_setup_gems
 
diff --git a/test/mri/rubygems/test_gem_ext_cargo_builder.rb b/test/mri/rubygems/test_gem_ext_cargo_builder.rb
index 5faf3e24807..b970e442c25 100644
--- a/test/mri/rubygems/test_gem_ext_cargo_builder.rb
+++ b/test/mri/rubygems/test_gem_ext_cargo_builder.rb
@@ -3,6 +3,10 @@
 require_relative "helper"
 require "rubygems/ext"
 require "open3"
+begin
+  require "fiddle"
+rescue LoadError
+end
 
 class TestGemExtCargoBuilder < Gem::TestCase
   def setup
@@ -137,6 +141,58 @@ def test_custom_name
     end
   end
 
+  def test_linker_args
+    orig_cc = RbConfig::MAKEFILE_CONFIG["CC"]
+    RbConfig::MAKEFILE_CONFIG["CC"] = "clang"
+
+    builder = Gem::Ext::CargoBuilder.new
+    args = builder.send(:linker_args)
+
+    assert args[1], "linker=clang"
+    assert_nil args[2]
+  ensure
+    RbConfig::MAKEFILE_CONFIG["CC"] = orig_cc
+  end
+
+  def test_linker_args_with_options
+    orig_cc = RbConfig::MAKEFILE_CONFIG["CC"]
+    RbConfig::MAKEFILE_CONFIG["CC"] = "gcc -Wl,--no-undefined"
+
+    builder = Gem::Ext::CargoBuilder.new
+    args = builder.send(:linker_args)
+
+    assert args[1], "linker=clang"
+    assert args[3], "link-args=-Wl,--no-undefined"
+  ensure
+    RbConfig::MAKEFILE_CONFIG["CC"] = orig_cc
+  end
+
+  def test_linker_args_with_cachetools
+    orig_cc = RbConfig::MAKEFILE_CONFIG["CC"]
+    RbConfig::MAKEFILE_CONFIG["CC"] = "sccache clang"
+
+    builder = Gem::Ext::CargoBuilder.new
+    args = builder.send(:linker_args)
+
+    assert args[1], "linker=clang"
+    assert_nil args[2]
+  ensure
+    RbConfig::MAKEFILE_CONFIG["CC"] = orig_cc
+  end
+
+  def test_linker_args_with_cachetools_and_options
+    orig_cc = RbConfig::MAKEFILE_CONFIG["CC"]
+    RbConfig::MAKEFILE_CONFIG["CC"] = "ccache gcc -Wl,--no-undefined"
+
+    builder = Gem::Ext::CargoBuilder.new
+    args = builder.send(:linker_args)
+
+    assert args[1], "linker=clang"
+    assert args[3], "link-args=-Wl,--no-undefined"
+  ensure
+    RbConfig::MAKEFILE_CONFIG["CC"] = orig_cc
+  end
+
   private
 
   def skip_unsupported_platforms!
@@ -149,7 +205,8 @@ def skip_unsupported_platforms!
   end
 
   def assert_ffi_handle(bundle, name)
-    require "fiddle"
+    return unless defined?(Fiddle)
+
     dylib_handle = Fiddle.dlopen bundle
     assert_nothing_raised { dylib_handle[name] }
   ensure
@@ -157,7 +214,8 @@ def assert_ffi_handle(bundle, name)
   end
 
   def refute_ffi_handle(bundle, name)
-    require "fiddle"
+    return unless defined?(Fiddle)
+
     dylib_handle = Fiddle.dlopen bundle
     assert_raise { dylib_handle[name] }
   ensure
diff --git a/test/mri/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock b/test/mri/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
index 310bc3d62fc..6302e9ee37b 100644
--- a/test/mri/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
+++ b/test/mri/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -152,18 +152,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.103"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91dbe37ab6ac2fba187480fb6544b92445e41e5c6f553bf0c33743f3c450a1df"
+checksum = "f900d1ce4629a2ebffaf5de74bd8f9c1188d4c5ed406df02f97e22f77a006f44"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.103"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d56a49dcb646b70b758789c0d16c055a386a4f2a3346333abb69850fa860ce"
+checksum = "ef1e9c857028f631056bcd6d88cec390c751e343ce2223ddb26d23eb4a151d59"
 dependencies = [
  "bindgen",
  "lazy_static",
diff --git a/test/mri/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml b/test/mri/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
index 29fd66d2a5a..e26fa352a81 100644
--- a/test/mri/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
+++ b/test/mri/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-rb-sys = "0.9.103"
+rb-sys = "0.9.117"
diff --git a/test/mri/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock b/test/mri/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock
index c42e756fd11..4bbe8932a2b 100644
--- a/test/mri/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock
+++ b/test/mri/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -145,18 +145,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.103"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91dbe37ab6ac2fba187480fb6544b92445e41e5c6f553bf0c33743f3c450a1df"
+checksum = "f900d1ce4629a2ebffaf5de74bd8f9c1188d4c5ed406df02f97e22f77a006f44"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.103"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d56a49dcb646b70b758789c0d16c055a386a4f2a3346333abb69850fa860ce"
+checksum = "ef1e9c857028f631056bcd6d88cec390c751e343ce2223ddb26d23eb4a151d59"
 dependencies = [
  "bindgen",
  "lazy_static",
diff --git a/test/mri/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml b/test/mri/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml
index 1950e0149ea..55d5c5bde7f 100644
--- a/test/mri/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml
+++ b/test/mri/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-rb-sys = "0.9.103"
+rb-sys = "0.9.117"
diff --git a/test/mri/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb b/test/mri/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb
index a3fef50d54e..3693f63df6f 100644
--- a/test/mri/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb
+++ b/test/mri/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb
@@ -25,7 +25,7 @@ class TestGemExtCargoBuilderLinkFlagConverter < Gem::TestCase
   }.freeze
 
   CASES.each do |test_name, (arg, expected)|
-    raise "duplicate test name" if instance_methods.include?(test_name)
+    raise "duplicate test name" if method_defined?(test_name)
 
     define_method(test_name) do
       assert_equal(expected, Gem::Ext::CargoBuilder::LinkFlagConverter.convert(arg))
diff --git a/test/mri/rubygems/test_gem_ext_cmake_builder.rb b/test/mri/rubygems/test_gem_ext_cmake_builder.rb
index 5f886af05fc..b9b57084d4f 100644
--- a/test/mri/rubygems/test_gem_ext_cmake_builder.rb
+++ b/test/mri/rubygems/test_gem_ext_cmake_builder.rb
@@ -7,7 +7,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase
   def setup
     super
 
-    # Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340
+    # Details: https://github.com/ruby/rubygems/issues/1270#issuecomment-177368340
     pend "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
 
     require "open3"
@@ -29,7 +29,7 @@ def setup
   def test_self_build
     File.open File.join(@ext, "CMakeLists.txt"), "w" do |cmakelists|
       cmakelists.write <<-EO_CMAKE
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.26)
 project(self_build NONE)
 install (FILES test.txt DESTINATION bin)
       EO_CMAKE
@@ -39,46 +39,107 @@ def test_self_build
 
     output = []
 
-    Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
+    builder = Gem::Ext::CmakeBuilder.new
+    builder.build nil, @dest_path, output, [], @dest_path, @ext
 
     output = output.join "\n"
 
-    assert_match(/^cmake \. -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}/, output)
+    assert_match(/^current directory: #{Regexp.escape @ext}/, output)
+    assert_match(/cmake.*-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\\=#{Regexp.escape @dest_path}/, output)
+    assert_match(/cmake.*-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\\=#{Regexp.escape @dest_path}/, output)
+    assert_match(/#{Regexp.escape @ext}/, output)
+  end
+
+  def test_self_build_presets
+    File.open File.join(@ext, "CMakeLists.txt"), "w" do |cmakelists|
+      cmakelists.write <<-EO_CMAKE
+cmake_minimum_required(VERSION 3.26)
+project(self_build NONE)
+install (FILES test.txt DESTINATION bin)
+      EO_CMAKE
+    end
+
+    File.open File.join(@ext, "CMakePresets.json"), "w" do |presets|
+      presets.write <<-EO_CMAKE
+{
+  "version": 6,
+  "configurePresets": [
+    {
+      "name": "debug",
+      "displayName": "Debug",
+      "generator": "Ninja",
+      "binaryDir": "build/debug",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "release",
+      "displayName": "Release",
+      "generator": "Ninja",
+      "binaryDir": "build/release",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    }
+  ]
+}
+      EO_CMAKE
+    end
+
+    FileUtils.touch File.join(@ext, "test.txt")
+
+    output = []
+
+    builder = Gem::Ext::CmakeBuilder.new
+    builder.build nil, @dest_path, output, [], @dest_path, @ext
+
+    output = output.join "\n"
+
+    assert_match(/The gem author provided a list of presets that can be used to build the gem./, output)
+    assert_match(/Available configure presets/, output)
+    assert_match(/\"debug\"   - Debug/, output)
+    assert_match(/\"release\" - Release/, output)
+    assert_match(/^current directory: #{Regexp.escape @ext}/, output)
+    assert_match(/cmake.*-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\\=#{Regexp.escape @dest_path}/, output)
+    assert_match(/cmake.*-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\\=#{Regexp.escape @dest_path}/, output)
     assert_match(/#{Regexp.escape @ext}/, output)
-    assert_contains_make_command "", output
-    assert_contains_make_command "install", output
-    assert_match(/test\.txt/, output)
   end
 
   def test_self_build_fail
     output = []
 
+    builder = Gem::Ext::CmakeBuilder.new
     error = assert_raise Gem::InstallError do
-      Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
+      builder.build nil, @dest_path, output, [], @dest_path, @ext
     end
 
-    output = output.join "\n"
+    assert_match "cmake_configure failed", error.message
 
     shell_error_msg = /(CMake Error: .*)/
-
-    assert_match "cmake failed", error.message
-
-    assert_match(/^cmake . -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}/, output)
+    output = output.join "\n"
     assert_match(/#{shell_error_msg}/, output)
+    assert_match(/CMake Error: The source directory .* does not appear to contain CMakeLists.txt./, output)
   end
 
   def test_self_build_has_makefile
-    File.open File.join(@ext, "Makefile"), "w" do |makefile|
-      makefile.puts "all:\n\t@echo ok\ninstall:\n\t@echo ok"
+    File.open File.join(@ext, "CMakeLists.txt"), "w" do |cmakelists|
+      cmakelists.write <<-EO_CMAKE
+cmake_minimum_required(VERSION 3.26)
+project(self_build NONE)
+install (FILES test.txt DESTINATION bin)
+      EO_CMAKE
     end
 
     output = []
 
-    Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
+    builder = Gem::Ext::CmakeBuilder.new
+    builder.build nil, @dest_path, output, [], @dest_path, @ext
 
     output = output.join "\n"
 
-    assert_contains_make_command "", output
-    assert_contains_make_command "install", output
+    # The default generator will create a Makefile in the build directory
+    makefile = File.join(@ext, "build", "Makefile")
+    assert(File.exist?(makefile))
   end
 end
diff --git a/test/mri/rubygems/test_gem_ext_ext_conf_builder.rb b/test/mri/rubygems/test_gem_ext_ext_conf_builder.rb
index 218c6f3d5e3..bc383e5540a 100644
--- a/test/mri/rubygems/test_gem_ext_ext_conf_builder.rb
+++ b/test/mri/rubygems/test_gem_ext_ext_conf_builder.rb
@@ -15,15 +15,12 @@ def setup
   end
 
   def test_class_build
-    if Gem.java_platform?
-      pend("failing on jruby")
-    end
-
     if vc_windows? && !nmake_found?
       pend("test_class_build skipped - nmake not found")
     end
 
     File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
+      extconf.puts "return if Gem.java_platform?"
       extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
     end
 
@@ -35,20 +32,22 @@ def test_class_build
 
     assert_match(/^current directory:/, output[0])
     assert_match(/^#{Regexp.quote(Gem.ruby)}.* extconf.rb/, output[1])
-    assert_equal "creating Makefile\n", output[2]
-    assert_match(/^current directory:/, output[3])
-    assert_contains_make_command "clean", output[4]
-    assert_contains_make_command "", output[7]
-    assert_contains_make_command "install", output[10]
+
+    if Gem.java_platform?
+      assert_includes(output, "Skipping make for extconf.rb as no Makefile was found.")
+    else
+      assert_equal "creating Makefile\n", output[2]
+      assert_match(/^current directory:/, output[3])
+      assert_contains_make_command "clean", output[4]
+      assert_contains_make_command "", output[7]
+      assert_contains_make_command "install", output[10]
+    end
+
     assert_empty Dir.glob(File.join(@ext, "siteconf*.rb"))
     assert_empty Dir.glob(File.join(@ext, ".gem.*"))
   end
 
   def test_class_build_rbconfig_make_prog
-    if Gem.java_platform?
-      pend("failing on jruby")
-    end
-
     configure_args do
       File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
         extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
@@ -72,10 +71,6 @@ def test_class_build_env_make
     env_large_make = ENV.delete "MAKE"
     ENV["MAKE"] = "anothermake"
 
-    if Gem.java_platform?
-      pend("failing on jruby")
-    end
-
     configure_args "" do
       File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
         extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
@@ -206,11 +201,11 @@ def test_class_make
   end
 
   def test_class_make_no_Makefile
-    error = assert_raise Gem::InstallError do
+    error = assert_raise Gem::Ext::Builder::NoMakefileError do
       Gem::Ext::ExtConfBuilder.make @ext, ["output"], @ext
     end
 
-    assert_equal "Makefile not found", error.message
+    assert_match(/No Makefile found/, error.message)
   end
 
   def configure_args(args = nil)
diff --git a/test/mri/rubygems/test_gem_ext_rake_builder.rb b/test/mri/rubygems/test_gem_ext_rake_builder.rb
index bd72c1aa08c..68ad15b044f 100644
--- a/test/mri/rubygems/test_gem_ext_rake_builder.rb
+++ b/test/mri/rubygems/test_gem_ext_rake_builder.rb
@@ -29,7 +29,7 @@ def test_class_build
     end
   end
 
-  # https://github.com/rubygems/rubygems/pull/1819
+  # https://github.com/ruby/rubygems/pull/1819
   #
   # It should not fail with a non-empty args list either
   def test_class_build_with_args
diff --git a/test/mri/rubygems/test_gem_gem_runner.rb b/test/mri/rubygems/test_gem_gem_runner.rb
index 4fb205040c3..9cc2fac6191 100644
--- a/test/mri/rubygems/test_gem_gem_runner.rb
+++ b/test/mri/rubygems/test_gem_gem_runner.rb
@@ -82,17 +82,6 @@ def test_extract_build_args
     assert_equal %w[--foo], args
   end
 
-  def test_query_is_deprecated
-    args = %w[query]
-
-    use_ui @ui do
-      @runner.run(args)
-    end
-
-    assert_match(/WARNING:  query command is deprecated. It will be removed in Rubygems [0-9]+/, @ui.error)
-    assert_match(/WARNING:  It is recommended that you use `gem search` or `gem list` instead/, @ui.error)
-  end
-
   def test_info_succeeds
     args = %w[info]
 
diff --git a/test/mri/rubygems/test_gem_gemcutter_utilities.rb b/test/mri/rubygems/test_gem_gemcutter_utilities.rb
index a3236e62768..9204dc5f20e 100644
--- a/test/mri/rubygems/test_gem_gemcutter_utilities.rb
+++ b/test/mri/rubygems/test_gem_gemcutter_utilities.rb
@@ -233,9 +233,10 @@ def test_sign_in_with_webauthn_enabled
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @sign_in_ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @sign_in_ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @sign_in_ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
   end
@@ -255,9 +256,10 @@ def test_sign_in_with_webauthn_enabled_with_error
     end
     assert_equal 1, error.exit_code
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @sign_in_ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @sign_in_ui.output
     assert_match "ERROR:  Security device verification failed: Something went wrong", @sign_in_ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @sign_in_ui.output
     refute_match "Signed in with API key:", @sign_in_ui.output
@@ -273,9 +275,10 @@ def test_sign_in_with_webauthn_enabled_with_polling
       util_sign_in
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @sign_in_ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @sign_in_ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @sign_in_ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
   end
@@ -292,9 +295,10 @@ def test_sign_in_with_webauthn_enabled_with_polling_failure
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @sign_in_ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @sign_in_ui.output
     assert_match "ERROR:  Security device verification failed: " \
       "The token in the link you used has either expired or been used already.", @sign_in_ui.error
   end
diff --git a/test/mri/rubygems/test_gem_install_update_options.rb b/test/mri/rubygems/test_gem_install_update_options.rb
index 8fd5d9c543b..1e451dcb050 100644
--- a/test/mri/rubygems/test_gem_install_update_options.rb
+++ b/test/mri/rubygems/test_gem_install_update_options.rb
@@ -202,4 +202,16 @@ def test_minimal_deps
 
     assert_equal true, @cmd.options[:minimal_deps]
   end
+
+  def test_build_jobs_short_version
+    @cmd.handle_options %w[-j 4]
+
+    assert_equal 4, @cmd.options[:build_jobs]
+  end
+
+  def test_build_jobs_long_version
+    @cmd.handle_options %w[--build-jobs 4]
+
+    assert_equal 4, @cmd.options[:build_jobs]
+  end
 end
diff --git a/test/mri/rubygems/test_gem_installer.rb b/test/mri/rubygems/test_gem_installer.rb
index 83e43c135fd..293fe1e823d 100644
--- a/test/mri/rubygems/test_gem_installer.rb
+++ b/test/mri/rubygems/test_gem_installer.rb
@@ -24,36 +24,35 @@ def test_app_script_text
 
       util_make_exec @spec, ""
 
-      expected = <<-EOF
-#!#{Gem.ruby}
-#
-# This file was generated by RubyGems.
-#
-# The application 'a' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-Gem.use_gemdeps
-
-version = \">= 0.a\"
-
-str = ARGV.first
-if str
-  str = str.b[/\\A_(.*)_\\z/, 1]
-  if str and Gem::Version.correct?(str)
-    version = str
-    ARGV.shift
-  end
-end
+      expected = <<~EOF
+        #!#{Gem.ruby}
+        #
+        # This file was generated by RubyGems.
+        #
+        # The application 'a' is installed as part of a gem, and
+        # this file is here to facilitate running it.
+        #
+
+        require 'rubygems'
+
+        Gem.use_gemdeps
+
+        version = \">= 0.a\"
+
+        str = ARGV.first
+        if str
+          str = str.b[/\\A_(.*)_\\z/, 1]
+          if str and Gem::Version.correct?(str)
+            version = str
+            ARGV.shift
+          end
+        end
 
-if Gem.respond_to?(:activate_bin_path)
-load Gem.activate_bin_path('a', 'executable', version)
-else
-gem "a", version
-load Gem.bin_path("a", "executable", version)
-end
+        if Gem.respond_to?(:activate_and_load_bin_path)
+          Gem.activate_and_load_bin_path('a', 'executable', version)
+        else
+          load Gem.activate_bin_path('a', 'executable', version)
+        end
       EOF
 
       wrapper = installer.app_script_text "executable"
@@ -121,12 +120,12 @@ def test_check_executable_overwrite_format_executable
     end
 
     File.open File.join(util_inst_bindir, "executable"), "w" do |io|
-      io.write <<-EXEC
-#!/usr/local/bin/ruby
-#
-# This file was generated by RubyGems
+      io.write <<~EXEC
+        #!/usr/local/bin/ruby
+        #
+        # This file was generated by RubyGems
 
-gem 'other', version
+        gem 'other', version
      EXEC
     end
 
@@ -869,11 +868,11 @@ def test_use_plugin_immediately
       spec_version = spec.version
       plugin_path = File.join("lib", "rubygems_plugin.rb")
       write_file File.join(@tempdir, plugin_path) do |io|
-        io.write <<-PLUGIN
-#{self.class}.plugin_loaded = true
-Gem.post_install do
-  #{self.class}.post_install_is_called = true
-end
+        io.write <<~PLUGIN
+          #{self.class}.plugin_loaded = true
+          Gem.post_install do
+            #{self.class}.post_install_is_called = true
+          end
         PLUGIN
       end
       spec.files += [plugin_path]
@@ -1247,7 +1246,7 @@ def test_install_does_not_leave_lockfile_for_binstub
     end
 
     assert_raise(Gem::Ext::BuildError) do
-      installer.install
+      build_rake_in { installer.install }
     end
 
     assert_path_not_exist(File.join(installer.bin_dir, "executable.lock"))
@@ -1478,12 +1477,7 @@ def test_install_extension_dir
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+    write_dummy_extconf @spec.name
 
     @spec.files += %w[extconf.rb]
 
@@ -1503,12 +1497,7 @@ def test_install_extension_dir_is_removed_on_reinstall
     @spec = setup_base_spec
 
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+    write_dummy_extconf @spec.name
 
     @spec.files += %w[extconf.rb]
 
@@ -1539,12 +1528,7 @@ def test_install_extension_dir_is_removed_on_reinstall
   def test_install_user_extension_dir
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+    write_dummy_extconf @spec.name
 
     @spec.files += %w[extconf.rb]
 
@@ -1571,22 +1555,20 @@ def test_find_lib_file_after_install
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
+    write_dummy_extconf @spec.name do |io|
+      io.write <<~RUBY
 
         CONFIG['CC'] = '$(TOUCH) $@ ||'
         CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
         $ruby = '#{Gem.ruby}'
 
-        create_makefile("#{@spec.name}")
       RUBY
     end
 
     write_file File.join(@tempdir, "depend")
 
     write_file File.join(@tempdir, "a.c") do |io|
-      io.write <<-C
+      io.write <<~C
         #include <ruby.h>
         void Init_a() { }
       C
@@ -1618,17 +1600,12 @@ def test_install_extension_and_script
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+    write_dummy_extconf @spec.name
 
     rb = File.join("lib", "#{@spec.name}.rb")
     @spec.files += [rb]
     write_file File.join(@tempdir, rb) do |io|
-      io.write <<-RUBY
+      io.write <<~RUBY
         # #{@spec.name}.rb
       RUBY
     end
@@ -1637,7 +1614,7 @@ def test_install_extension_and_script
     rb2 = File.join("lib", @spec.name, "#{@spec.name}.rb")
     @spec.files << rb2
     write_file File.join(@tempdir, rb2) do |io|
-      io.write <<-RUBY
+      io.write <<~RUBY
         # #{@spec.name}/#{@spec.name}.rb
       RUBY
     end
@@ -1663,15 +1640,13 @@ def test_install_extension_flat
 
       @spec.extensions << "extconf.rb"
 
-      write_file File.join(@tempdir, "extconf.rb") do |io|
-        io.write <<-RUBY
-          require "mkmf"
+      write_dummy_extconf @spec.name do |io|
+        io.write <<~RUBY
 
           CONFIG['CC'] = '$(TOUCH) $@ ||'
           CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
           $ruby = '#{Gem.ruby}'
 
-          create_makefile("#{@spec.name}")
         RUBY
       end
 
@@ -1698,13 +1673,13 @@ def test_install_extension_clean_intermediate_files
     @spec.require_paths = ["."]
     @spec.extensions << "extconf.rb"
 
-    File.write File.join(@tempdir, "extconf.rb"), <<-RUBY
-      require "mkmf"
-      CONFIG['CC'] = '$(TOUCH) $@ ||'
-      CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
-      $ruby = '#{Gem.ruby}'
-      create_makefile("#{@spec.name}")
-    RUBY
+    write_dummy_extconf @spec.name do |io|
+      io.write <<~RUBY
+        CONFIG['CC'] = '$(TOUCH) $@ ||'
+        CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+        $ruby = '#{Gem.ruby}'
+      RUBY
+    end
 
     # empty depend file for no auto dependencies
     @spec.files += %W[depend #{@spec.name}.c].each do |file|
@@ -1938,10 +1913,10 @@ def spec.validate(*args); end
   end
 
   def test_pre_install_checks_malicious_platform_before_eval
-    gem_with_ill_formated_platform = File.expand_path("packages/ill-formatted-platform-1.0.0.10.gem", __dir__)
+    gem_with_ill_formatted_platform = File.expand_path("packages/ill-formatted-platform-1.0.0.10.gem", __dir__)
 
     installer = Gem::Installer.at(
-      gem_with_ill_formated_platform,
+      gem_with_ill_formatted_platform,
       install_dir: @gemhome,
       user_install: false,
       force: true
@@ -2304,19 +2279,6 @@ def test_shebang_custom_with_expands_and_arguments
     assert_equal "#!1 #{bin_env} 2 #{Gem.ruby} -ws 3 executable", shebang
   end
 
-  def test_unpack
-    installer = util_setup_installer
-
-    dest = File.join @gemhome, "gems", @spec.full_name
-
-    Gem::Deprecate.skip_during do
-      installer.unpack dest
-    end
-
-    assert_path_exist File.join dest, "lib", "code.rb"
-    assert_path_exist File.join dest, "bin", "executable"
-  end
-
   def test_write_build_info_file
     installer = setup_base_installer
 
@@ -2450,119 +2412,6 @@ def test_dir
     assert_match %r{/gemhome/gems/a-2$}, installer.dir
   end
 
-  def test_default_gem_loaded_from
-    spec = util_spec "a"
-    installer = Gem::Installer.for_spec spec, install_as_default: true
-    installer.install
-    assert_predicate spec, :default_gem?
-  end
-
-  def test_default_gem_without_wrappers
-    installer = setup_base_installer
-
-    FileUtils.rm_rf File.join(Gem.default_dir, "specifications")
-
-    installer.wrappers = false
-    installer.options[:install_as_default] = true
-    installer.gem_dir = @spec.gem_dir
-
-    use_ui @ui do
-      installer.install
-    end
-
-    assert_directory_exists File.join(@spec.gem_dir, "bin")
-    installed_exec = File.join @spec.gem_dir, "bin", "executable"
-    assert_path_exist installed_exec
-
-    assert_directory_exists File.join(Gem.default_dir, "specifications")
-    assert_directory_exists File.join(Gem.default_dir, "specifications", "default")
-
-    default_spec = eval File.read File.join(Gem.default_dir, "specifications", "default", "a-2.gemspec")
-    assert_equal Gem::Version.new("2"), default_spec.version
-    assert_equal ["bin/executable"], default_spec.files
-
-    assert_directory_exists util_inst_bindir
-
-    installed_exec = File.join util_inst_bindir, "executable"
-    assert_path_exist installed_exec
-
-    wrapper = File.read installed_exec
-
-    if symlink_supported?
-      refute_match(/generated by RubyGems/, wrapper)
-    else # when symlink not supported, it warns and fallbacks back to installing wrapper
-      assert_match(/Unable to use symlinks, installing wrapper/, @ui.error)
-      assert_match(/generated by RubyGems/, wrapper)
-    end
-  end
-
-  def test_default_gem_with_wrappers
-    installer = setup_base_installer
-
-    installer.wrappers = true
-    installer.options[:install_as_default] = true
-    installer.gem_dir = @spec.gem_dir
-
-    use_ui @ui do
-      installer.install
-    end
-
-    assert_directory_exists util_inst_bindir
-
-    installed_exec = File.join util_inst_bindir, "executable"
-    assert_path_exist installed_exec
-
-    wrapper = File.read installed_exec
-    assert_match(/generated by RubyGems/, wrapper)
-  end
-
-  def test_default_gem_with_exe_as_bindir
-    @spec = quick_gem "c" do |spec|
-      util_make_exec spec, "#!/usr/bin/ruby", "exe"
-    end
-
-    util_build_gem @spec
-
-    @spec.cache_file
-
-    installer = util_installer @spec, @gemhome
-
-    installer.options[:install_as_default] = true
-    installer.gem_dir = @spec.gem_dir
-
-    use_ui @ui do
-      installer.install
-    end
-
-    assert_directory_exists File.join(@spec.gem_dir, "exe")
-    installed_exec = File.join @spec.gem_dir, "exe", "executable"
-    assert_path_exist installed_exec
-
-    assert_directory_exists File.join(Gem.default_dir, "specifications")
-    assert_directory_exists File.join(Gem.default_dir, "specifications", "default")
-
-    default_spec = eval File.read File.join(Gem.default_dir, "specifications", "default", "c-2.gemspec")
-    assert_equal Gem::Version.new("2"), default_spec.version
-    assert_equal ["exe/executable"], default_spec.files
-  end
-
-  def test_default_gem_to_specific_install_dir
-    @gem = setup_base_gem
-    installer = util_installer @spec, "#{@gemhome}2"
-    installer.options[:install_as_default] = true
-
-    use_ui @ui do
-      installer.install
-    end
-
-    assert_directory_exists File.join("#{@gemhome}2", "specifications")
-    assert_directory_exists File.join("#{@gemhome}2", "specifications", "default")
-
-    default_spec = eval File.read File.join("#{@gemhome}2", "specifications", "default", "a-2.gemspec")
-    assert_equal Gem::Version.new("2"), default_spec.version
-    assert_equal ["bin/executable"], default_spec.files
-  end
-
   def test_package_attribute
     gem = quick_gem "c" do |spec|
       util_make_exec spec, "#!/usr/bin/ruby", "exe"
diff --git a/test/mri/rubygems/test_gem_name_tuple.rb b/test/mri/rubygems/test_gem_name_tuple.rb
index bdb8181ce85..4876737c83d 100644
--- a/test/mri/rubygems/test_gem_name_tuple.rb
+++ b/test/mri/rubygems/test_gem_name_tuple.rb
@@ -57,4 +57,41 @@ def test_spaceship
 
     assert_equal 1, a_p.<=>(a)
   end
+
+  def test_deconstruct
+    name_tuple = Gem::NameTuple.new "rails", Gem::Version.new("7.0.0"), "ruby"
+    assert_equal ["rails", Gem::Version.new("7.0.0"), "ruby"], name_tuple.deconstruct
+  end
+
+  def test_deconstruct_keys
+    name_tuple = Gem::NameTuple.new "rails", Gem::Version.new("7.0.0"), "x86_64-linux"
+    keys = name_tuple.deconstruct_keys(nil)
+    assert_equal "rails", keys[:name]
+    assert_equal Gem::Version.new("7.0.0"), keys[:version]
+    assert_equal "x86_64-linux", keys[:platform]
+  end
+
+  def test_pattern_matching_array
+    name_tuple = Gem::NameTuple.new "rails", Gem::Version.new("7.0.0"), "ruby"
+    result =
+      case name_tuple
+      in [name, version, "ruby"]
+        "#{name}-#{version}"
+      else
+        "no match"
+      end
+    assert_equal "rails-7.0.0", result
+  end
+
+  def test_pattern_matching_hash
+    name_tuple = Gem::NameTuple.new "rails", Gem::Version.new("7.0.0"), "ruby"
+    result =
+      case name_tuple
+      in name: "rails", version:, platform: "ruby"
+        version.to_s
+      else
+        "no match"
+      end
+    assert_equal "7.0.0", result
+  end
 end
diff --git a/test/mri/rubygems/test_gem_package.rb b/test/mri/rubygems/test_gem_package.rb
index 8a9cc855802..2ad63acd03b 100644
--- a/test/mri/rubygems/test_gem_package.rb
+++ b/test/mri/rubygems/test_gem_package.rb
@@ -506,7 +506,7 @@ def test_extract_files
     extracted = File.join @destination, "lib/code.rb"
     assert_path_exist extracted
 
-    mask = 0o100666 & (~File.umask)
+    mask = 0o100666 & ~File.umask
 
     assert_equal mask.to_s(8), File.stat(extracted).mode.to_s(8) unless
       Gem.win_platform?
@@ -1247,71 +1247,25 @@ def test_verify_truncate
 
   # end #verify tests
 
-  def test_verify_entry
-    entry = Object.new
-    def entry.full_name
-      raise ArgumentError, "whatever"
-    end
-
-    package = Gem::Package.new @gem
-
-    _, err = use_ui @ui do
-      e = nil
-
-      out_err = capture_output do
-        e = assert_raise ArgumentError do
-          package.verify_entry entry
+  def test_missing_metadata
+    invalid_metadata = ["metadataxgz", "foobar\nmetadata", "metadata\nfoobar"]
+    invalid_metadata.each do |fname|
+      tar = StringIO.new
+
+      Gem::Package::TarWriter.new(tar) do |gem_tar|
+        gem_tar.add_file fname, 0o444 do |io|
+          gz_io = Zlib::GzipWriter.new io, Zlib::BEST_COMPRESSION
+          gz_io.write "bad metadata"
+          gz_io.close
         end
       end
 
-      assert_equal "whatever", e.message
-      assert_equal "full_name", e.backtrace_locations.first.label
-
-      out_err
-    end
-
-    assert_equal "Exception while verifying #{@gem}\n", err
-
-    valid_metadata = ["metadata", "metadata.gz"]
-    valid_metadata.each do |vm|
-      $spec_loaded = false
-      $good_name = vm
-
-      entry = Object.new
-      def entry.full_name
-        $good_name
-      end
+      tar.rewind
 
-      package = Gem::Package.new(@gem)
-      package.instance_variable_set(:@files, [])
-      def package.load_spec(entry)
-        $spec_loaded = true
-      end
-
-      package.verify_entry(entry)
-
-      assert $spec_loaded
-    end
-
-    invalid_metadata = ["metadataxgz", "foobar\nmetadata", "metadata\nfoobar"]
-    invalid_metadata.each do |vm|
-      $spec_loaded = false
-      $bad_name = vm
-
-      entry = Object.new
-      def entry.full_name
-        $bad_name
-      end
-
-      package = Gem::Package.new(@gem)
-      package.instance_variable_set(:@files, [])
-      def package.load_spec(entry)
-        $spec_loaded = true
+      package = Gem::Package.new(Gem::Package::IOSource.new(tar))
+      assert_raise Gem::Package::FormatError do
+        package.verify
       end
-
-      package.verify_entry(entry)
-
-      refute $spec_loaded
     end
   end
 
diff --git a/test/mri/rubygems/test_gem_package_old.rb b/test/mri/rubygems/test_gem_package_old.rb
index 7582dbedd40..e532fa25e1b 100644
--- a/test/mri/rubygems/test_gem_package_old.rb
+++ b/test/mri/rubygems/test_gem_package_old.rb
@@ -39,7 +39,7 @@ def test_extract_files
       extracted = File.join @destination, "lib/foo.rb"
       assert_path_exist extracted
 
-      mask = 0o100644 & (~File.umask)
+      mask = 0o100644 & ~File.umask
 
       assert_equal mask, File.stat(extracted).mode unless Gem.win_platform?
     end
diff --git a/test/mri/rubygems/test_gem_package_tar_header_ractor.rb b/test/mri/rubygems/test_gem_package_tar_header_ractor.rb
new file mode 100644
index 00000000000..57140648052
--- /dev/null
+++ b/test/mri/rubygems/test_gem_package_tar_header_ractor.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_relative "package/tar_test_case"
+
+unless Gem::Package::TarTestCase.method_defined?(:assert_ractor)
+  require "core_assertions"
+  Gem::Package::TarTestCase.include Test::Unit::CoreAssertions
+end
+
+class TestGemPackageTarHeaderRactor < Gem::Package::TarTestCase
+  SETUP = <<~RUBY
+    header = {
+      name: "x",
+      mode: 0o644,
+      uid: 1000,
+      gid: 10_000,
+      size: 100,
+      mtime: 12_345,
+      typeflag: "0",
+      linkname: "link",
+      uname: "user",
+      gname: "group",
+      devmajor: 1,
+      devminor: 2,
+      prefix: "y",
+    }
+
+    tar_header = Gem::Package::TarHeader.new header
+    # Move this require to arguments of assert_ractor after Ruby 4.0 or updating core_assertions.rb at Ruby 3.4.
+    require "stringio"
+    # Remove this after Ruby 4.0 or updating core_assertions.rb at Ruby 3.4.
+    class Ractor; alias value take unless method_defined?(:value); end
+  RUBY
+
+  def test_decode_in_ractor
+    assert_ractor(SETUP + <<~RUBY, require: "rubygems/package", require_relative: "package/tar_test_case")
+      include Gem::Package::TarTestMethods
+
+      new_header = Ractor.new(tar_header.to_s) do |str|
+        Gem::Package::TarHeader.from StringIO.new str
+      end.value
+
+      assert_headers_equal tar_header, new_header
+    RUBY
+  end
+
+  def test_encode_in_ractor
+    assert_ractor(SETUP + <<~RUBY, require: "rubygems/package", require_relative: "package/tar_test_case")
+      include Gem::Package::TarTestMethods
+
+      header_bytes = tar_header.to_s
+
+      new_header_bytes = Ractor.new(header_bytes) do |str|
+        new_header = Gem::Package::TarHeader.from StringIO.new str
+        new_header.to_s
+      end.value
+
+      assert_headers_equal header_bytes, new_header_bytes
+    RUBY
+  end
+end unless RUBY_PLATFORM.match?(/mingw|mswin/)
diff --git a/test/mri/rubygems/test_gem_package_tar_writer.rb b/test/mri/rubygems/test_gem_package_tar_writer.rb
index 751ceaca81c..cb9e0d26fab 100644
--- a/test/mri/rubygems/test_gem_package_tar_writer.rb
+++ b/test/mri/rubygems/test_gem_package_tar_writer.rb
@@ -33,7 +33,7 @@ def test_add_file
         f.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                          @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -50,11 +50,24 @@ def test_add_file_source_date_epoch
     end
   end
 
+  def test_add_file_with_mtime
+    Time.stub :now, Time.at(1_458_518_157) do
+      mtime = Time.now
+
+      @tar_writer.add_file "x", 0o644, mtime do |f|
+        f.write "a" * 10
+      end
+
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, mtime),
+                         @io.string[0, 512])
+    end
+  end
+
   def test_add_symlink
     Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_symlink "x", "y", 0o644
 
-      assert_headers_equal(tar_symlink_header("x", "", 0o644, Time.now, "y"),
+      assert_headers_equal(tar_symlink_header("x", "", 0o644, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc, "y"),
                          @io.string[0, 512])
     end
     assert_equal 512, @io.pos
@@ -86,7 +99,7 @@ def test_add_file_digest
                    "e1cf14b0",
                    digests["SHA512"].hexdigest
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                          @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -109,7 +122,7 @@ def test_add_file_digest_multiple
                    "e1cf14b0",
                    digests["SHA512"].hexdigest
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -126,7 +139,7 @@ def test_add_file_signer
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512])
 
       assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -137,7 +150,7 @@ def test_add_file_signer
       signature = signer.sign digest.digest
 
       assert_headers_equal(tar_file_header("x.sig", "", 0o444, signature.length,
-                                           Time.now),
+                                           Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[1024, 512])
       assert_equal "#{signature}#{"\0" * (512 - signature.length)}",
                    @io.string[1536, 512]
@@ -154,7 +167,7 @@ def test_add_file_signer_empty
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -168,7 +181,7 @@ def test_add_file_simple
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512])
 
       assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -192,7 +205,7 @@ def test_add_file_simple_padding
     Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file_simple "x", 0, 100
 
-      assert_headers_equal tar_file_header("x", "", 0, 100, Time.now),
+      assert_headers_equal tar_file_header("x", "", 0, 100, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
         @io.string[0, 512]
     end
 
@@ -250,7 +263,7 @@ def test_mkdir
     Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.mkdir "foo", 0o644
 
-      assert_headers_equal tar_dir_header("foo", "", 0o644, Time.now),
+      assert_headers_equal tar_dir_header("foo", "", 0o644, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512]
 
       assert_equal 512, @io.pos
diff --git a/test/mri/rubygems/test_gem_platform.rb b/test/mri/rubygems/test_gem_platform.rb
index 070c8007bc0..c1ff36772bd 100644
--- a/test/mri/rubygems/test_gem_platform.rb
+++ b/test/mri/rubygems/test_gem_platform.rb
@@ -11,15 +11,6 @@ def test_self_local
     assert_equal Gem::Platform.new(%w[x86 darwin 8]), Gem::Platform.local
   end
 
-  def test_self_match
-    Gem::Deprecate.skip_during do
-      assert Gem::Platform.match(nil), "nil == ruby"
-      assert Gem::Platform.match(Gem::Platform.local), "exact match"
-      assert Gem::Platform.match(Gem::Platform.local.to_s), "=~ match"
-      assert Gem::Platform.match(Gem::Platform::RUBY), "ruby"
-    end
-  end
-
   def test_self_match_gem?
     assert Gem::Platform.match_gem?(nil, "json"), "nil == ruby"
     assert Gem::Platform.match_gem?(Gem::Platform.local, "json"), "exact match"
@@ -148,12 +139,29 @@ def test_initialize
       "wasm32-wasi" => ["wasm32", "wasi", nil],
       "wasm32-wasip1" => ["wasm32", "wasi", nil],
       "wasm32-wasip2" => ["wasm32", "wasi", nil],
+
+      "darwin-java-java" => ["darwin", "java", nil],
+      "linux-linux-linux" => ["linux", "linux", "linux"],
+      "linux-linux-linux1.0" => ["linux", "linux", "linux1"],
+      "x86x86-1x86x86x86x861linuxx86x86" => ["x86x86", "linux", "x86x86"],
+      "freebsd0" => [nil, "freebsd", "0"],
+      "darwin0" => [nil, "darwin", "0"],
+      "darwin0---" => [nil, "darwin", "0"],
+      "x86-linux-x8611.0l" => ["x86", "linux", "x8611"],
+      "0-x86linuxx86---" => ["0", "linux", "x86"],
+      "x86_64-macruby-x86" => ["x86_64", "macruby", nil],
+      "x86_64-dotnetx86" => ["x86_64", "dotnet", nil],
+      "x86_64-dalvik0" => ["x86_64", "dalvik", "0"],
+      "x86_64-dotnet1." => ["x86_64", "dotnet", "1"],
+
+      "--" => [nil, "unknown", nil],
     }
 
     test_cases.each do |arch, expected|
       platform = Gem::Platform.new arch
       assert_equal expected, platform.to_a, arch.inspect
-      assert_equal expected, Gem::Platform.new(platform.to_s).to_a, arch.inspect
+      platform2 = Gem::Platform.new platform.to_s
+      assert_equal expected, platform2.to_a, "#{arch.inspect} => #{platform2.inspect}"
     end
   end
 
@@ -246,19 +254,19 @@ def test_equals3_cpu
     x86_darwin8 = Gem::Platform.new "i686-darwin8.0"
 
     util_set_arch "powerpc-darwin8"
-    assert((ppc_darwin8 === Gem::Platform.local), "powerpc =~ universal")
-    assert((uni_darwin8 === Gem::Platform.local), "powerpc =~ universal")
-    refute((x86_darwin8 === Gem::Platform.local), "powerpc =~ universal")
+    assert(ppc_darwin8 === Gem::Platform.local, "powerpc =~ universal")
+    assert(uni_darwin8 === Gem::Platform.local, "powerpc =~ universal")
+    refute(x86_darwin8 === Gem::Platform.local, "powerpc =~ universal")
 
     util_set_arch "i686-darwin8"
-    refute((ppc_darwin8 === Gem::Platform.local), "powerpc =~ universal")
-    assert((uni_darwin8 === Gem::Platform.local), "x86 =~ universal")
-    assert((x86_darwin8 === Gem::Platform.local), "powerpc =~ universal")
+    refute(ppc_darwin8 === Gem::Platform.local, "powerpc =~ universal")
+    assert(uni_darwin8 === Gem::Platform.local, "x86 =~ universal")
+    assert(x86_darwin8 === Gem::Platform.local, "powerpc =~ universal")
 
     util_set_arch "universal-darwin8"
-    assert((ppc_darwin8 === Gem::Platform.local), "universal =~ ppc")
-    assert((uni_darwin8 === Gem::Platform.local), "universal =~ universal")
-    assert((x86_darwin8 === Gem::Platform.local), "universal =~ x86")
+    assert(ppc_darwin8 === Gem::Platform.local, "universal =~ ppc")
+    assert(uni_darwin8 === Gem::Platform.local, "universal =~ universal")
+    assert(x86_darwin8 === Gem::Platform.local, "universal =~ x86")
   end
 
   def test_nil_cpu_arch_is_treated_as_universal
@@ -266,18 +274,18 @@ def test_nil_cpu_arch_is_treated_as_universal
     with_uni_arch = Gem::Platform.new ["universal", "mingw32"]
     with_x86_arch = Gem::Platform.new ["x86", "mingw32"]
 
-    assert((with_nil_arch === with_uni_arch), "nil =~ universal")
-    assert((with_uni_arch === with_nil_arch), "universal =~ nil")
-    assert((with_nil_arch === with_x86_arch), "nil =~ x86")
-    assert((with_x86_arch === with_nil_arch), "x86 =~ nil")
+    assert(with_nil_arch === with_uni_arch, "nil =~ universal")
+    assert(with_uni_arch === with_nil_arch, "universal =~ nil")
+    assert(with_nil_arch === with_x86_arch, "nil =~ x86")
+    assert(with_x86_arch === with_nil_arch, "x86 =~ nil")
   end
 
   def test_nil_version_is_treated_as_any_version
     x86_darwin_8 = Gem::Platform.new "i686-darwin8.0"
     x86_darwin_nil = Gem::Platform.new "i686-darwin"
 
-    assert((x86_darwin_8 === x86_darwin_nil), "8.0 =~ nil")
-    assert((x86_darwin_nil === x86_darwin_8), "nil =~ 8.0")
+    assert(x86_darwin_8 === x86_darwin_nil, "8.0 =~ nil")
+    assert(x86_darwin_nil === x86_darwin_8, "nil =~ 8.0")
   end
 
   def test_nil_version_is_stricter_for_linux_os
@@ -371,40 +379,33 @@ def test_equals3_cpu_arm
     arm64 = Gem::Platform.new "arm64-linux"
 
     util_set_arch "armv5-linux"
-    assert((arm   === Gem::Platform.local), "arm   === armv5")
-    assert((armv5 === Gem::Platform.local), "armv5 === armv5")
-    refute((armv7 === Gem::Platform.local), "armv7 === armv5")
-    refute((arm64 === Gem::Platform.local), "arm64 === armv5")
-    refute((Gem::Platform.local === arm), "armv5 === arm")
+    assert(arm   === Gem::Platform.local, "arm   === armv5")
+    assert(armv5 === Gem::Platform.local, "armv5 === armv5")
+    refute(armv7 === Gem::Platform.local, "armv7 === armv5")
+    refute(arm64 === Gem::Platform.local, "arm64 === armv5")
+    refute(Gem::Platform.local === arm, "armv5 === arm")
 
     util_set_arch "armv7-linux"
-    assert((arm   === Gem::Platform.local), "arm   === armv7")
-    refute((armv5 === Gem::Platform.local), "armv5 === armv7")
-    assert((armv7 === Gem::Platform.local), "armv7 === armv7")
-    refute((arm64 === Gem::Platform.local), "arm64 === armv7")
-    refute((Gem::Platform.local === arm), "armv7 === arm")
+    assert(arm   === Gem::Platform.local, "arm   === armv7")
+    refute(armv5 === Gem::Platform.local, "armv5 === armv7")
+    assert(armv7 === Gem::Platform.local, "armv7 === armv7")
+    refute(arm64 === Gem::Platform.local, "arm64 === armv7")
+    refute(Gem::Platform.local === arm, "armv7 === arm")
 
     util_set_arch "arm64-linux"
-    refute((arm   === Gem::Platform.local), "arm   === arm64")
-    refute((armv5 === Gem::Platform.local), "armv5 === arm64")
-    refute((armv7 === Gem::Platform.local), "armv7 === arm64")
-    assert((arm64 === Gem::Platform.local), "arm64 === arm64")
+    refute(arm   === Gem::Platform.local, "arm   === arm64")
+    refute(armv5 === Gem::Platform.local, "armv5 === arm64")
+    refute(armv7 === Gem::Platform.local, "armv7 === arm64")
+    assert(arm64 === Gem::Platform.local, "arm64 === arm64")
   end
 
   def test_equals3_universal_mingw
     uni_mingw  = Gem::Platform.new "universal-mingw"
-    mingw32    = Gem::Platform.new "x64-mingw32"
     mingw_ucrt = Gem::Platform.new "x64-mingw-ucrt"
 
-    util_set_arch "x64-mingw32"
-    assert((uni_mingw === Gem::Platform.local), "uni_mingw === mingw32")
-    assert((mingw32 === Gem::Platform.local), "mingw32 === mingw32")
-    refute((mingw_ucrt === Gem::Platform.local), "mingw32 === mingw_ucrt")
-
     util_set_arch "x64-mingw-ucrt"
-    assert((uni_mingw === Gem::Platform.local), "uni_mingw === mingw32")
-    assert((mingw_ucrt === Gem::Platform.local), "mingw_ucrt === mingw_ucrt")
-    refute((mingw32 === Gem::Platform.local), "mingw32 === mingw_ucrt")
+    assert(uni_mingw === Gem::Platform.local, "uni_mingw === mingw_ucrt")
+    assert(mingw_ucrt === Gem::Platform.local, "mingw_ucrt === mingw_ucrt")
   end
 
   def test_equals3_version
@@ -415,11 +416,11 @@ def test_equals3_version
     x86_darwin8 = Gem::Platform.new ["x86", "darwin", "8"]
     x86_darwin9 = Gem::Platform.new ["x86", "darwin", "9"]
 
-    assert((x86_darwin  === Gem::Platform.local), "x86_darwin === x86_darwin8")
-    assert((x86_darwin8 === Gem::Platform.local), "x86_darwin8 === x86_darwin8")
+    assert(x86_darwin  === Gem::Platform.local, "x86_darwin === x86_darwin8")
+    assert(x86_darwin8 === Gem::Platform.local, "x86_darwin8 === x86_darwin8")
 
-    refute((x86_darwin7 === Gem::Platform.local), "x86_darwin7 === x86_darwin8")
-    refute((x86_darwin9 === Gem::Platform.local), "x86_darwin9 === x86_darwin8")
+    refute(x86_darwin7 === Gem::Platform.local, "x86_darwin7 === x86_darwin8")
+    refute(x86_darwin9 === Gem::Platform.local, "x86_darwin9 === x86_darwin8")
   end
 
   def test_equals_tilde
@@ -492,15 +493,171 @@ def test_inspect
     assert_equal 1, result.scan(/@version=/).size
   end
 
-  def test_gem_platform_match_with_string_argument
-    util_set_arch "x86_64-linux-musl"
+  def test_constants
+    assert_equal [nil, "java", nil], Gem::Platform::JAVA.to_a
+    assert_equal ["x86", "mswin32", nil], Gem::Platform::MSWIN.to_a
+    assert_equal [nil, "mswin64", nil], Gem::Platform::MSWIN64.to_a
+    assert_equal ["x86", "mingw32", nil], Gem::Platform::MINGW.to_a
+    assert_equal ["x64", "mingw", "ucrt"], Gem::Platform::X64_MINGW.to_a
+    assert_equal ["universal", "mingw", nil], Gem::Platform::UNIVERSAL_MINGW.to_a
+    assert_equal [["x86", "mswin32", nil], [nil, "mswin64", nil], ["universal", "mingw", nil]], Gem::Platform::WINDOWS.map(&:to_a)
+    assert_equal ["x86_64", "linux", nil], Gem::Platform::X64_LINUX.to_a
+    assert_equal ["x86_64", "linux", "musl"], Gem::Platform::X64_LINUX_MUSL.to_a
+  end
+
+  def test_generic
+    # converts non-windows platforms into ruby
+    assert_equal Gem::Platform::RUBY, Gem::Platform.generic(Gem::Platform.new("x86-darwin-10"))
+    assert_equal Gem::Platform::RUBY, Gem::Platform.generic(Gem::Platform::RUBY)
+
+    # converts java platform variants into java
+    assert_equal Gem::Platform::JAVA, Gem::Platform.generic(Gem::Platform.new("java"))
+    assert_equal Gem::Platform::JAVA, Gem::Platform.generic(Gem::Platform.new("universal-java-17"))
+
+    # converts mswin platform variants into x86-mswin32
+    assert_equal Gem::Platform::MSWIN, Gem::Platform.generic(Gem::Platform.new("mswin32"))
+    assert_equal Gem::Platform::MSWIN, Gem::Platform.generic(Gem::Platform.new("i386-mswin32"))
+    assert_equal Gem::Platform::MSWIN, Gem::Platform.generic(Gem::Platform.new("x86-mswin32"))
+
+    # converts 32-bit mingw platform variants into universal-mingw
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("i386-mingw32"))
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("x86-mingw32"))
+
+    # converts 64-bit mingw platform variants into universal-mingw
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("x64-mingw32"))
 
-    Gem::Deprecate.skip_during do
-      assert(Gem::Platform.match(Gem::Platform.new("x86_64-linux")), "should match Gem::Platform")
-      assert(Gem::Platform.match("x86_64-linux"), "should match String platform")
+    # converts x64 mingw UCRT platform variants into universal-mingw
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("x64-mingw-ucrt"))
+
+    # converts aarch64 mingw UCRT platform variants into universal-mingw
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("aarch64-mingw-ucrt"))
+
+    assert_equal Gem::Platform::RUBY, Gem::Platform.generic(Gem::Platform.new("unknown"))
+    assert_equal Gem::Platform::RUBY, Gem::Platform.generic(nil)
+    assert_equal Gem::Platform::MSWIN64, Gem::Platform.generic(Gem::Platform.new("mswin64"))
+  end
+
+  def test_platform_specificity_match
+    [
+      ["ruby", "ruby", -1, -1],
+      ["x86_64-linux-musl", "x86_64-linux-musl", -1, -1],
+      ["x86_64-linux", "x86_64-linux-musl", 100, 200],
+      ["universal-darwin", "x86-darwin", 10, 20],
+      ["universal-darwin-19", "x86-darwin", 210, 120],
+      ["universal-darwin-19", "universal-darwin-20", 200, 200],
+      ["arm-darwin-19", "arm64-darwin-19", 0, 20],
+    ].each do |spec_platform, user_platform, s1, s2|
+      spec_platform = Gem::Platform.new(spec_platform)
+      user_platform = Gem::Platform.new(user_platform)
+      assert_equal s1, Gem::Platform.platform_specificity_match(spec_platform, user_platform),
+        "Gem::Platform.platform_specificity_match(#{spec_platform.to_s.inspect}, #{user_platform.to_s.inspect})"
+      assert_equal s2, Gem::Platform.platform_specificity_match(user_platform, spec_platform),
+        "Gem::Platform.platform_specificity_match(#{user_platform.to_s.inspect}, #{spec_platform.to_s.inspect})"
     end
   end
 
+  def test_sort_and_filter_best_platform_match
+    a_1 = util_spec "a", "1"
+    a_1_java = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform::JAVA
+    end
+    a_1_universal_darwin = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin")
+    end
+    a_1_universal_darwin_19 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin-19")
+    end
+    a_1_universal_darwin_20 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin-20")
+    end
+    a_1_arm_darwin_19 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("arm64-darwin-19")
+    end
+    a_1_x86_darwin = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("x86-darwin")
+    end
+    specs = [a_1, a_1_java, a_1_universal_darwin, a_1_universal_darwin_19, a_1_universal_darwin_20, a_1_arm_darwin_19, a_1_x86_darwin]
+    assert_equal [a_1], Gem::Platform.sort_and_filter_best_platform_match(specs, "ruby")
+    assert_equal [a_1_java], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform::JAVA)
+    assert_equal [a_1_arm_darwin_19], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("arm64-darwin-19"))
+    assert_equal [a_1_universal_darwin_20], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("arm64-darwin-20"))
+    assert_equal [a_1_universal_darwin_19], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("x86-darwin-19"))
+    assert_equal [a_1_universal_darwin_20], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("x86-darwin-20"))
+    assert_equal [a_1_x86_darwin], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("x86-darwin-21"))
+  end
+
+  def test_sort_best_platform_match
+    a_1 = util_spec "a", "1"
+    a_1_java = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform::JAVA
+    end
+    a_1_universal_darwin = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin")
+    end
+    a_1_universal_darwin_19 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin-19")
+    end
+    a_1_universal_darwin_20 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin-20")
+    end
+    a_1_arm_darwin_19 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("arm64-darwin-19")
+    end
+    a_1_x86_darwin = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("x86-darwin")
+    end
+    specs = [a_1, a_1_java, a_1_universal_darwin, a_1_universal_darwin_19, a_1_universal_darwin_20, a_1_arm_darwin_19, a_1_x86_darwin]
+    assert_equal ["ruby",
+                  "java",
+                  "universal-darwin",
+                  "universal-darwin-19",
+                  "universal-darwin-20",
+                  "arm64-darwin-19",
+                  "x86-darwin"], Gem::Platform.sort_best_platform_match(specs, "ruby").map {|s| s.platform.to_s }
+    assert_equal ["java",
+                  "universal-darwin",
+                  "x86-darwin",
+                  "universal-darwin-19",
+                  "universal-darwin-20",
+                  "arm64-darwin-19",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform::JAVA).map {|s| s.platform.to_s }
+    assert_equal ["arm64-darwin-19",
+                  "universal-darwin-19",
+                  "universal-darwin",
+                  "java",
+                  "x86-darwin",
+                  "universal-darwin-20",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("arm64-darwin-19")).map {|s| s.platform.to_s }
+    assert_equal ["universal-darwin-20",
+                  "universal-darwin",
+                  "java",
+                  "x86-darwin",
+                  "arm64-darwin-19",
+                  "universal-darwin-19",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("arm64-darwin-20")).map {|s| s.platform.to_s }
+    assert_equal ["universal-darwin-19",
+                  "arm64-darwin-19",
+                  "x86-darwin",
+                  "universal-darwin",
+                  "java",
+                  "universal-darwin-20",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("x86-darwin-19")).map {|s| s.platform.to_s }
+    assert_equal ["universal-darwin-20",
+                  "x86-darwin",
+                  "universal-darwin",
+                  "java",
+                  "universal-darwin-19",
+                  "arm64-darwin-19",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("x86-darwin-20")).map {|s| s.platform.to_s }
+    assert_equal ["x86-darwin",
+                  "universal-darwin",
+                  "java",
+                  "universal-darwin-19",
+                  "universal-darwin-20",
+                  "arm64-darwin-19",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("x86-darwin-21")).map {|s| s.platform.to_s }
+  end
+
   def assert_local_match(name)
     assert_match Gem::Platform.local, name
   end
@@ -508,4 +665,38 @@ def assert_local_match(name)
   def refute_local_match(name)
     refute_match Gem::Platform.local, name
   end
+
+  def test_deconstruct
+    platform = Gem::Platform.new("x86_64-linux")
+    assert_equal ["x86_64", "linux", nil], platform.deconstruct
+  end
+
+  def test_deconstruct_keys
+    platform = Gem::Platform.new("x86_64-darwin-20")
+    assert_equal({ cpu: "x86_64", os: "darwin", version: "20" }, platform.deconstruct_keys(nil))
+  end
+
+  def test_pattern_matching_array
+    platform = Gem::Platform.new("arm64-darwin-21")
+    result =
+      case platform
+      in ["arm64", "darwin", version]
+        version
+      else
+        "no match"
+      end
+    assert_equal "21", result
+  end
+
+  def test_pattern_matching_hash
+    platform = Gem::Platform.new("x86_64-linux")
+    result =
+      case platform
+      in cpu: "x86_64", os: "linux"
+        "matched"
+      else
+        "no match"
+      end
+    assert_equal "matched", result
+  end
 end
diff --git a/test/mri/rubygems/test_gem_rdoc.rb b/test/mri/rubygems/test_gem_rdoc.rb
index c4282b309c6..9ecbb7d8c39 100644
--- a/test/mri/rubygems/test_gem_rdoc.rb
+++ b/test/mri/rubygems/test_gem_rdoc.rb
@@ -18,19 +18,7 @@ def setup
 
     install_gem @a
 
-    hook_class = if defined?(RDoc::RubyGemsHook)
-      RDoc::RubyGemsHook
-    else
-      Gem::RDoc
-    end
-
-    @hook = hook_class.new @a
-
-    begin
-      hook_class.load_rdoc
-    rescue Gem::DocumentError => e
-      pend e.message
-    end
+    @hook = Gem::RDoc.new @a
 
     Gem.configuration[:rdoc] = nil
   end
diff --git a/test/mri/rubygems/test_gem_remote_fetcher.rb b/test/mri/rubygems/test_gem_remote_fetcher.rb
index ca858cfda5d..5c1d89fad69 100644
--- a/test/mri/rubygems/test_gem_remote_fetcher.rb
+++ b/test/mri/rubygems/test_gem_remote_fetcher.rb
@@ -592,7 +592,7 @@ def test_yaml_error_on_size
     end
   end
 
-  def assert_error(exception_class=Exception)
+  def assert_error(exception_class = Exception)
     got_exception = false
 
     begin
diff --git a/test/mri/rubygems/test_gem_remote_fetcher_s3.rb b/test/mri/rubygems/test_gem_remote_fetcher_s3.rb
index fe7eb7ec01b..4a5acc5a866 100644
--- a/test/mri/rubygems/test_gem_remote_fetcher_s3.rb
+++ b/test/mri/rubygems/test_gem_remote_fetcher_s3.rb
@@ -8,6 +8,100 @@
 class TestGemRemoteFetcherS3 < Gem::TestCase
   include Gem::DefaultUserInteraction
 
+  class FakeGemRequest < Gem::Request
+    attr_reader :last_request, :uri
+
+    # Override perform_request to stub things
+    def perform_request(request)
+      @last_request = request
+      @response
+    end
+
+    def set_response(response)
+      @response = response
+    end
+  end
+
+  class FakeS3URISigner < Gem::S3URISigner
+    class << self
+      attr_accessor :return_token, :instance_profile
+    end
+
+    # Convenience method to output the recent aws iam queries made in tests
+    # this outputs the verb, path, and any non-generic headers
+    def recent_aws_query_logs
+      sreqs = @aws_iam_calls.map do |c|
+        r = c.last_request
+        s = +"#{r.method} #{c.uri}\n"
+        r.each_header do |key, v|
+          # Only include headers that start with x-
+          next unless key.start_with?("x-")
+          s << "    #{key}=#{v}\n"
+        end
+        s
+      end
+
+      sreqs.join("")
+    end
+
+    def initialize(uri, method)
+      @aws_iam_calls = []
+      super
+    end
+
+    def ec2_iam_request(uri, verb)
+      fake_s3_request = FakeGemRequest.new(uri, verb, nil, nil)
+      @aws_iam_calls << fake_s3_request
+
+      case uri.to_s
+      when "http://169.254.169.254/latest/api/token"
+        if FakeS3URISigner.return_token.nil?
+          res = Gem::Net::HTTPUnauthorized.new nil, 401, nil
+          def res.body = "you got a 401! panic!"
+        else
+          res = Gem::Net::HTTPOK.new nil, 200, nil
+          def res.body = FakeS3URISigner.return_token
+        end
+      when "http://169.254.169.254/latest/meta-data/iam/info"
+        res = Gem::Net::HTTPOK.new nil, 200, nil
+        def res.body
+          <<~JSON
+            {
+              "Code": "Success",
+              "LastUpdated": "2023-05-27:05:05",
+              "InstanceProfileArn": "arn:aws:iam::somesecretid:instance-profile/TestRole",
+              "InstanceProfileId": "SOMEPROFILEID"
+            }
+          JSON
+        end
+
+      when "http://169.254.169.254/latest/meta-data/iam/security-credentials/TestRole"
+        res = Gem::Net::HTTPOK.new nil, 200, nil
+        def res.body = FakeS3URISigner.instance_profile
+      else
+        raise "Unexpected request to #{uri}"
+      end
+
+      fake_s3_request.set_response(res)
+      fake_s3_request
+    end
+  end
+
+  class FakeGemFetcher < Gem::RemoteFetcher
+    attr_reader :fetched_uri, :last_s3_uri_signer
+
+    def request(uri, request_class, last_modified = nil)
+      @fetched_uri = uri
+      res = Gem::Net::HTTPOK.new nil, 200, nil
+      def res.body = "success"
+      res
+    end
+
+    def s3_uri_signer(uri, method)
+      @last_s3_uri_signer = FakeS3URISigner.new(uri, method)
+    end
+  end
+
   def setup
     super
 
@@ -18,39 +112,61 @@ def setup
     @a1.loaded_from = File.join(@gemhome, "specifications", @a1.full_name)
   end
 
-  def assert_fetch_s3(url, signature, token=nil, region="us-east-1", instance_profile_json=nil)
-    fetcher = Gem::RemoteFetcher.new nil
-    @fetcher = fetcher
-    $fetched_uri = nil
-    $instance_profile = instance_profile_json
+  def assert_fetched_s3_with_imds_v2(expected_token)
+    # Three API requests:
+    # 1. Get the token
+    # 2. Lookup profile details
+    # 3. Query the credentials
+    expected = <<~TEXT
+      PUT http://169.254.169.254/latest/api/token
+          x-aws-ec2-metadata-token-ttl-seconds=60
+      GET http://169.254.169.254/latest/meta-data/iam/info
+          x-aws-ec2-metadata-token=#{expected_token}
+      GET http://169.254.169.254/latest/meta-data/iam/security-credentials/TestRole
+          x-aws-ec2-metadata-token=#{expected_token}
+    TEXT
+    recent_aws_query_logs = @fetcher.last_s3_uri_signer.recent_aws_query_logs
+    assert_equal(expected.strip, recent_aws_query_logs.strip)
+  end
 
-    def fetcher.request(uri, request_class, last_modified = nil)
-      $fetched_uri = uri
-      res = Gem::Net::HTTPOK.new nil, 200, nil
-      def res.body
-        "success"
-      end
-      res
-    end
+  def assert_fetched_s3_with_imds_v1
+    # Three API requests:
+    # 1. Get the token (which fails)
+    # 2. Lookup profile details without token
+    # 3. Query the credentials without token
+    expected = <<~TEXT
+      PUT http://169.254.169.254/latest/api/token
+          x-aws-ec2-metadata-token-ttl-seconds=60
+      GET http://169.254.169.254/latest/meta-data/iam/info
+      GET http://169.254.169.254/latest/meta-data/iam/security-credentials/TestRole
+    TEXT
+    recent_aws_query_logs = @fetcher.last_s3_uri_signer.recent_aws_query_logs
+    assert_equal(expected.strip, recent_aws_query_logs.strip)
+  end
 
-    def fetcher.s3_uri_signer(uri)
-      require "json"
-      s3_uri_signer = Gem::S3URISigner.new(uri)
-      def s3_uri_signer.ec2_metadata_credentials_json
-        JSON.parse($instance_profile)
-      end
-      # Running sign operation to make sure uri.query is not mutated
-      s3_uri_signer.sign
-      raise "URI query is not empty: #{uri.query}" unless uri.query.nil?
-      s3_uri_signer
-    end
+  def with_imds_v2_failure
+    FakeS3URISigner.should_fail = true
+    yield(fetcher)
+  ensure
+    FakeS3URISigner.should_fail = false
+  end
 
-    data = fetcher.fetch_s3 Gem::URI.parse(url)
+  def assert_fetch_s3(url:, signature:, token: nil, region: "us-east-1", instance_profile_json: nil, fetcher: nil, method: "GET")
+    FakeS3URISigner.instance_profile = instance_profile_json
+    FakeS3URISigner.return_token = token
 
-    assert_equal "https://my-bucket.s3.#{region}.amazonaws.com/gems/specs.4.8.gz?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=testuser%2F20190624%2F#{region}%2Fs3%2Faws4_request&X-Amz-Date=20190624T050641Z&X-Amz-Expires=86400#{token ? "&X-Amz-Security-Token=" + token : ""}&X-Amz-SignedHeaders=host&X-Amz-Signature=#{signature}", $fetched_uri.to_s
-    assert_equal "success", data
+    @fetcher = fetcher || FakeGemFetcher.new(nil)
+    res = @fetcher.fetch_s3 Gem::URI.parse(url), nil, (method == "HEAD")
+
+    assert_equal "https://my-bucket.s3.#{region}.amazonaws.com/gems/specs.4.8.gz?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=testuser%2F20190624%2F#{region}%2Fs3%2Faws4_request&X-Amz-Date=20190624T051941Z&X-Amz-Expires=86400#{token ? "&X-Amz-Security-Token=" + token : ""}&X-Amz-SignedHeaders=host&X-Amz-Signature=#{signature}", @fetcher.fetched_uri.to_s
+    if method == "HEAD"
+      assert_equal 200, res.code
+    else
+      assert_equal "success", res
+    end
   ensure
-    $fetched_uri = nil
+    FakeS3URISigner.instance_profile = nil
+    FakeS3URISigner.return_token = nil
   end
 
   def test_fetch_s3_config_creds
@@ -59,7 +175,34 @@ def test_fetch_s3_config_creds
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
+      assert_fetch_s3(
+        url: url,
+        signature: "b5cb80c1301f7b1c50c4af54f1f6c034f80b56d32f000a855f0a903dc5a8413c",
+      )
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_head_request
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { id: "testuser", secret: "testpass" },
+    }
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      token = nil
+      region = "us-east-1"
+      instance_profile_json = nil
+      method = "HEAD"
+
+      assert_fetch_s3(
+        url: url,
+        signature: "a3c6cf9a2db62e85f4e57f8fc8ac8b5ff5c1fdd4aeef55935d05e05174d9c885",
+        token: token,
+        region: region,
+        instance_profile_json: instance_profile_json,
+        method: method
+      )
     end
   ensure
     Gem.configuration[:s3_source] = nil
@@ -71,7 +214,11 @@ def test_fetch_s3_config_creds_with_region
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2"
+      assert_fetch_s3(
+        url: url,
+        signature: "ef07487bfd8e3ca594f8fc29775b70c0a0636f51318f95d4f12b2e6e1fd8c716",
+        region: "us-west-2"
+      )
     end
   ensure
     Gem.configuration[:s3_source] = nil
@@ -83,7 +230,11 @@ def test_fetch_s3_config_creds_with_token
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken"
+      assert_fetch_s3(
+        url: url,
+        signature: "e709338735f9077edf8f6b94b247171c266a9605975e08e4a519a123c3322625",
+        token: "testtoken"
+      )
     end
   ensure
     Gem.configuration[:s3_source] = nil
@@ -98,7 +249,10 @@ def test_fetch_s3_env_creds
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
+      assert_fetch_s3(
+        url: url,
+        signature: "b5cb80c1301f7b1c50c4af54f1f6c034f80b56d32f000a855f0a903dc5a8413c"
+      )
     end
   ensure
     ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
@@ -114,7 +268,12 @@ def test_fetch_s3_env_creds_with_region
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2"
+      assert_fetch_s3(
+        url: url,
+        signature: "ef07487bfd8e3ca594f8fc29775b70c0a0636f51318f95d4f12b2e6e1fd8c716",
+        token: nil,
+        region: "us-west-2"
+      )
     end
   ensure
     ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
@@ -130,7 +289,11 @@ def test_fetch_s3_env_creds_with_token
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken"
+      assert_fetch_s3(
+        url: url,
+        signature: "e709338735f9077edf8f6b94b247171c266a9605975e08e4a519a123c3322625",
+        token: "testtoken"
+      )
     end
   ensure
     ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
@@ -140,7 +303,10 @@ def test_fetch_s3_env_creds_with_token
   def test_fetch_s3_url_creds
     url = "s3://testuser:testpass@my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
+      assert_fetch_s3(
+        url: url,
+        signature: "b5cb80c1301f7b1c50c4af54f1f6c034f80b56d32f000a855f0a903dc5a8413c"
+      )
     end
   end
 
@@ -151,8 +317,14 @@ def test_fetch_s3_instance_profile_creds
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b", nil, "us-east-1",
-                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
+      assert_fetch_s3(
+        url: url,
+        signature: "da82e098bdaed0d3087047670efc98eaadc20559a473b5eac8d70190d2a9e8fd",
+        region: "us-east-1",
+        token: "mysecrettoken",
+        instance_profile_json: '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass", "Token": "mysecrettoken"}'
+      )
+      assert_fetched_s3_with_imds_v2("mysecrettoken")
     end
   ensure
     Gem.configuration[:s3_source] = nil
@@ -165,8 +337,14 @@ def test_fetch_s3_instance_profile_creds_with_region
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2",
-                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
+      assert_fetch_s3(
+        url: url,
+        signature: "532960594dbfe31d1bbfc0e8e7a666c3cbdd8b00a143774da51b7f920704afd2",
+        region: "us-west-2",
+        token: "mysecrettoken",
+        instance_profile_json: '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass", "Token": "mysecrettoken"}'
+      )
+      assert_fetched_s3_with_imds_v2("mysecrettoken")
     end
   ensure
     Gem.configuration[:s3_source] = nil
@@ -179,14 +357,40 @@ def test_fetch_s3_instance_profile_creds_with_token
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
     Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken", "us-east-1",
-                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass", "Token": "testtoken"}'
+      assert_fetch_s3(
+        url: url,
+        signature: "e709338735f9077edf8f6b94b247171c266a9605975e08e4a519a123c3322625",
+        token: "testtoken",
+        region: "us-east-1",
+        instance_profile_json: '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass", "Token": "testtoken"}'
+      )
+      assert_fetched_s3_with_imds_v2("testtoken")
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_instance_profile_creds_with_fallback
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { provider: "instance_profile" },
+    }
+
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3(
+        url: url,
+        signature: "b5cb80c1301f7b1c50c4af54f1f6c034f80b56d32f000a855f0a903dc5a8413c",
+        token: nil,
+        region: "us-east-1",
+        instance_profile_json: '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
+      )
+      assert_fetched_s3_with_imds_v1
     end
   ensure
     Gem.configuration[:s3_source] = nil
   end
 
-  def refute_fetch_s3(url, expected_message)
+  def refute_fetch_s3(url:, expected_message:)
     fetcher = Gem::RemoteFetcher.new nil
     @fetcher = fetcher
 
@@ -199,7 +403,7 @@ def refute_fetch_s3(url, expected_message)
 
   def test_fetch_s3_no_source_key
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    refute_fetch_s3 url, "no s3_source key exists in .gemrc"
+    refute_fetch_s3(url: url, expected_message: "no s3_source key exists in .gemrc")
   end
 
   def test_fetch_s3_no_host
@@ -208,7 +412,7 @@ def test_fetch_s3_no_host
     }
 
     url = "s3://other-bucket/gems/specs.4.8.gz"
-    refute_fetch_s3 url, "no key for host other-bucket in s3_source in .gemrc"
+    refute_fetch_s3(url: url, expected_message: "no key for host other-bucket in s3_source in .gemrc")
   ensure
     Gem.configuration[:s3_source] = nil
   end
@@ -217,7 +421,7 @@ def test_fetch_s3_no_id
     Gem.configuration[:s3_source] = { "my-bucket" => { secret: "testpass" } }
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    refute_fetch_s3 url, "s3_source for my-bucket missing id or secret"
+    refute_fetch_s3(url: url, expected_message: "s3_source for my-bucket missing id or secret")
   ensure
     Gem.configuration[:s3_source] = nil
   end
@@ -226,7 +430,7 @@ def test_fetch_s3_no_secret
     Gem.configuration[:s3_source] = { "my-bucket" => { id: "testuser" } }
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    refute_fetch_s3 url, "s3_source for my-bucket missing id or secret"
+    refute_fetch_s3(url: url, expected_message: "s3_source for my-bucket missing id or secret")
   ensure
     Gem.configuration[:s3_source] = nil
   end
diff --git a/test/mri/rubygems/test_gem_request.rb b/test/mri/rubygems/test_gem_request.rb
index 5e9b264dacf..cd0a416e79c 100644
--- a/test/mri/rubygems/test_gem_request.rb
+++ b/test/mri/rubygems/test_gem_request.rb
@@ -2,7 +2,6 @@
 
 require_relative "helper"
 require "rubygems/request"
-require "ostruct"
 
 unless Gem::HAVE_OPENSSL
   warn "Skipping Gem::Request tests.  openssl not found."
@@ -249,7 +248,7 @@ def test_fetch_basic_oauth_encoded
 
     auth_header = conn.payload["Authorization"]
     assert_equal "Basic #{base64_encode64("{DEScede}pass:x-oauth-basic")}".strip, auth_header
-    assert_includes @ui.output, "GET https://REDACTED:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}"
+    assert_includes @ui.output, "GET https://REDACTED@example.rubygems/specs.#{Gem.marshal_version}"
   end
 
   def test_fetch_head
@@ -364,19 +363,19 @@ def test_verify_certificate
   def test_verify_certificate_extra_message
     pend if Gem.java_platform?
 
-    error_number = OpenSSL::X509::V_ERR_INVALID_CA
+    error_number = OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
 
     store = OpenSSL::X509::Store.new
-    context = OpenSSL::X509::StoreContext.new store
-    context.error = error_number
+    context = OpenSSL::X509::StoreContext.new store, CHILD_CERT
+    context.verify
 
     use_ui @ui do
       Gem::Request.verify_certificate context
     end
 
     expected = <<-ERROR
-ERROR:  SSL verification error at depth 0: invalid CA certificate (#{error_number})
-ERROR:  Certificate  is an invalid CA certificate
+ERROR:  SSL verification error at depth 0: unable to get local issuer certificate (#{error_number})
+ERROR:  You must add #{CHILD_CERT.issuer} to your local trusted store
     ERROR
 
     assert_equal expected, @ui.error
@@ -501,13 +500,22 @@ def util_save_version
 
   def util_stub_net_http(hash)
     old_client = Gem::Request::ConnectionPools.client
-    conn = Conn.new OpenStruct.new(hash)
+    conn = Conn.new Response.new(hash)
     Gem::Request::ConnectionPools.client = conn
     yield conn
   ensure
     Gem::Request::ConnectionPools.client = old_client
   end
 
+  class Response
+    attr_reader :code, :body, :message
+
+    def initialize(hash)
+      @code = hash[:code]
+      @body = hash[:body]
+    end
+  end
+
   class Conn
     attr_accessor :payload
 
diff --git a/test/mri/rubygems/test_gem_request_connection_pools.rb b/test/mri/rubygems/test_gem_request_connection_pools.rb
index 966447bff64..2860deabf71 100644
--- a/test/mri/rubygems/test_gem_request_connection_pools.rb
+++ b/test/mri/rubygems/test_gem_request_connection_pools.rb
@@ -148,4 +148,16 @@ def test_thread_waits_for_connection
       end
     end.join
   end
+
+  def test_checkouts_multiple_connections_from_the_pool
+    uri = Gem::URI.parse("http://example/some_endpoint")
+    pools = Gem::Request::ConnectionPools.new nil, [], 2
+    pool  = pools.pool_for uri
+
+    pool.checkout
+
+    Thread.new do
+      assert_not_nil(pool.checkout)
+    end.join
+  end
 end
diff --git a/test/mri/rubygems/test_gem_requirement.rb b/test/mri/rubygems/test_gem_requirement.rb
index de0d11ec00b..00634dc7f43 100644
--- a/test/mri/rubygems/test_gem_requirement.rb
+++ b/test/mri/rubygems/test_gem_requirement.rb
@@ -137,11 +137,7 @@ def test_satisfied_by_eh_bang_equal
     refute_satisfied_by "1.2", r
     assert_satisfied_by "1.3", r
 
-    assert_raise ArgumentError do
-      Gem::Deprecate.skip_during do
-        assert_satisfied_by nil, r
-      end
-    end
+    assert_satisfied_by nil, r
   end
 
   def test_satisfied_by_eh_blank
@@ -151,11 +147,7 @@ def test_satisfied_by_eh_blank
     assert_satisfied_by "1.2", r
     refute_satisfied_by "1.3", r
 
-    assert_raise ArgumentError do
-      Gem::Deprecate.skip_during do
-        assert_satisfied_by nil, r
-      end
-    end
+    refute_satisfied_by nil, r
   end
 
   def test_satisfied_by_eh_equal
@@ -165,11 +157,7 @@ def test_satisfied_by_eh_equal
     assert_satisfied_by "1.2", r
     refute_satisfied_by "1.3", r
 
-    assert_raise ArgumentError do
-      Gem::Deprecate.skip_during do
-        assert_satisfied_by nil, r
-      end
-    end
+    refute_satisfied_by nil, r
   end
 
   def test_satisfied_by_eh_gt
@@ -179,9 +167,7 @@ def test_satisfied_by_eh_gt
     refute_satisfied_by "1.2", r
     assert_satisfied_by "1.3", r
 
-    assert_raise ArgumentError do
-      r.satisfied_by? nil
-    end
+    refute_satisfied_by nil, r
   end
 
   def test_satisfied_by_eh_gte
diff --git a/test/mri/rubygems/test_gem_resolver_best_set.rb b/test/mri/rubygems/test_gem_resolver_best_set.rb
index 02f542efc07..ac186884d15 100644
--- a/test/mri/rubygems/test_gem_resolver_best_set.rb
+++ b/test/mri/rubygems/test_gem_resolver_best_set.rb
@@ -31,6 +31,20 @@ def test_find_all
     assert_equal %w[a-1], found.map(&:full_name)
   end
 
+  def test_pick_sets_prerelease
+    set = Gem::Resolver::BestSet.new
+    set.prerelease = true
+
+    set.pick_sets
+
+    sets = set.sets
+
+    assert_equal 1, sets.count
+
+    source_set = sets.first
+    assert_equal true, source_set.prerelease
+  end
+
   def test_find_all_local
     spec_fetcher do |fetcher|
       fetcher.spec "a", 1
diff --git a/test/mri/rubygems/test_gem_safe_marshal.rb b/test/mri/rubygems/test_gem_safe_marshal.rb
index 3cfa66fb274..bd15f4f796d 100644
--- a/test/mri/rubygems/test_gem_safe_marshal.rb
+++ b/test/mri/rubygems/test_gem_safe_marshal.rb
@@ -234,8 +234,6 @@ def test_floats
   end
 
   def test_link_after_float
-    pend "Marshal.load of links and floats is broken on truffleruby, see https://github.com/oracle/truffleruby/issues/3747" if RUBY_ENGINE == "truffleruby"
-
     a = []
     a << a
     assert_safe_load_as [0.0, a, 1.0, a]
@@ -353,7 +351,19 @@ def test_gem_spec_unmarshall_license
 
     unmarshalled_spec = Gem::SafeMarshal.safe_load(Marshal.dump(spec))
 
-    assert_equal ["MIT"], unmarshalled_spec.license
+    assert_equal ["MIT"], unmarshalled_spec.licenses
+    assert_equal "MIT", unmarshalled_spec.license
+
+    spec = Gem::Specification.new do |s|
+      s.name = "hi"
+      s.version = "1.2.3"
+      s.licenses = ["MIT", "GPL2"]
+    end
+
+    unmarshalled_spec = Gem::SafeMarshal.safe_load(Marshal.dump(spec))
+
+    assert_equal ["MIT", "GPL2"], unmarshalled_spec.licenses
+    assert_equal "MIT", unmarshalled_spec.license
   end
 
   def test_gem_spec_unmarshall_required_ruby_rubygems_version
diff --git a/test/mri/rubygems/test_gem_security_trust_dir.rb b/test/mri/rubygems/test_gem_security_trust_dir.rb
index cfde8e9d48a..bd3dfb86c23 100644
--- a/test/mri/rubygems/test_gem_security_trust_dir.rb
+++ b/test/mri/rubygems/test_gem_security_trust_dir.rb
@@ -56,7 +56,7 @@ def test_trust_cert
 
     assert_path_exist trusted
 
-    mask = 0o100600 & (~File.umask)
+    mask = 0o100600 & ~File.umask
 
     assert_equal mask, File.stat(trusted).mode unless Gem.win_platform?
 
@@ -70,7 +70,7 @@ def test_verify
 
     assert_path_exist @dest_dir
 
-    mask = 0o040700 & (~File.umask)
+    mask = 0o040700 & ~File.umask
     mask |= 0o200000 if RUBY_PLATFORM.include?("aix")
 
     assert_equal mask, File.stat(@dest_dir).mode unless Gem.win_platform?
@@ -91,7 +91,7 @@ def test_verify_wrong_permissions
 
     @trust_dir.verify
 
-    mask = 0o40700 & (~File.umask)
+    mask = 0o40700 & ~File.umask
     mask |= 0o200000 if RUBY_PLATFORM.include?("aix")
 
     assert_equal mask, File.stat(@dest_dir).mode unless Gem.win_platform?
diff --git a/test/mri/rubygems/test_gem_source_list.rb b/test/mri/rubygems/test_gem_source_list.rb
index 64353f8f90d..5327b14db8e 100644
--- a/test/mri/rubygems/test_gem_source_list.rb
+++ b/test/mri/rubygems/test_gem_source_list.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require "rubygems"
-require "rubygems/source_list"
 require_relative "helper"
+require "rubygems/source_list"
 
 class TestGemSourceList < Gem::TestCase
   def setup
@@ -116,4 +115,128 @@ def test_delete_a_source
     @sl.delete Gem::Source.new(@uri)
     assert_equal @sl.sources, []
   end
+
+  def test_prepend_new_source
+    uri2 = "http://example2"
+    source2 = Gem::Source.new(uri2)
+
+    result = @sl.prepend(uri2)
+
+    assert_kind_of Gem::Source, result
+    assert_kind_of Gem::URI, result.uri
+    assert_equal uri2, result.uri.to_s
+    assert_equal [source2, @source], @sl.sources
+  end
+
+  def test_prepend_existing_source
+    uri2 = "http://example2"
+    source2 = Gem::Source.new(uri2)
+    @sl << uri2
+
+    assert_equal [@source, source2], @sl.sources
+
+    result = @sl.prepend(uri2)
+
+    assert_kind_of Gem::Source, result
+    assert_kind_of Gem::URI, result.uri
+    assert_equal uri2, result.uri.to_s
+    assert_equal [source2, @source], @sl.sources
+  end
+
+  def test_prepend_alias_behaves_like_unshift
+    sl = Gem::SourceList.new
+
+    uri1 = "http://one"
+    uri2 = "http://two"
+
+    source1 = sl << uri1
+    source2 = sl << uri2
+
+    # move existing to front
+    result = sl.prepend(uri2)
+
+    assert_kind_of Gem::Source, result
+    assert_equal [source2, source1], sl.sources
+
+    # and again with the other
+    result = sl.prepend(uri1)
+    assert_equal [source1, source2], sl.sources
+  end
+
+  def test_append_method_new_source
+    sl = Gem::SourceList.new
+
+    uri1 = "http://example1"
+
+    result = sl.append(uri1)
+
+    assert_kind_of Gem::Source, result
+    assert_kind_of Gem::URI, result.uri
+    assert_equal uri1, result.uri.to_s
+    assert_equal [result], sl.sources
+  end
+
+  def test_append_method_existing_moves_to_end
+    sl = Gem::SourceList.new
+
+    uri1 = "http://example1"
+    uri2 = "http://example2"
+
+    s1 = sl << uri1
+    s2 = sl << uri2
+
+    # list is [s1, s2]; appending s1 should move it to end => [s2, s1]
+    result = sl.append(uri1)
+
+    assert_equal s1, result
+    assert_equal [s2, s1], sl.sources
+  end
+
+  def test_prepend_with_gem_source_object
+    sl = Gem::SourceList.new
+
+    uri1 = "http://example1"
+    uri2 = "http://example2"
+    source1 = Gem::Source.new(uri1)
+    source2 = Gem::Source.new(uri2)
+
+    # Add first source
+    sl << source1
+
+    # Prepend with Gem::Source object
+    result = sl.prepend(source2)
+
+    assert_equal source2, result
+    assert_equal [source2, source1], sl.sources
+
+    # Prepend existing source - should move to front
+    result = sl.prepend(source1)
+
+    assert_equal source1, result
+    assert_equal [source1, source2], sl.sources
+  end
+
+  def test_append_with_gem_source_object
+    sl = Gem::SourceList.new
+
+    uri1 = "http://example1"
+    uri2 = "http://example2"
+    source1 = Gem::Source.new(uri1)
+    source2 = Gem::Source.new(uri2)
+
+    # Add first source
+    sl << source1
+
+    # Append with Gem::Source object
+    result = sl.append(source2)
+
+    assert_equal source2, result
+    assert_equal [source1, source2], sl.sources
+
+    # Append existing source - should move to end
+    result = sl.append(source1)
+
+    assert_equal source1, result
+    assert_equal [source2, source1], sl.sources
+  end
 end
diff --git a/test/mri/rubygems/test_gem_specification.rb b/test/mri/rubygems/test_gem_specification.rb
index 43b649b9eae..e8c2c0eb470 100644
--- a/test/mri/rubygems/test_gem_specification.rb
+++ b/test/mri/rubygems/test_gem_specification.rb
@@ -16,7 +16,7 @@ class TestGemSpecification < Gem::TestCase
 name: keyedlist
 version: !ruby/object:Gem::Version
   version: 0.4.0
-date: 2004-03-28 15:37:49.828000 +02:00
+date: 1980-01-02 00:00:00 UTC
 platform:
 summary: A Hash which automatically computes keys.
 require_paths:
@@ -33,7 +33,6 @@ class TestGemSpecification < Gem::TestCase
 Gem::Specification.new do |s|
   s.name = %q{keyedlist}
   s.version = %q{0.4.0}
-  s.has_rdoc = true
   s.summary = %q{A Hash which automatically computes keys.}
   s.files = [%q{lib/keyedlist.rb}]
   s.require_paths = [%q{lib}]
@@ -75,7 +74,7 @@ def ext_spec(platform: Gem::Platform::RUBY)
   def assert_date(date)
     assert_kind_of Time, date
     assert_equal [0, 0, 0], [date.hour, date.min, date.sec]
-    assert_operator (Gem::Specification::TODAY..Time.now), :cover?, date
+    assert_equal Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc, date
   end
 
   def setup
@@ -564,7 +563,6 @@ def test_self_activate_unrelated
   #         [B] ~> 1.0
   #
   # and should resolve using b-1.0
-  # TODO: move these to specification
 
   def test_self_activate_over
     a = util_spec "a", "1.0", "b" => ">= 1.0", "c" => "= 1.0"
@@ -653,6 +651,17 @@ def test_self_activate_conflict
     end
   end
 
+  def test_self_activate_missing_deps_does_not_raise_nested_exceptions
+    a = util_spec "a", "1.0", "b" => ">= 1.0"
+    install_specs a
+
+    e = assert_raise Gem::MissingSpecError do
+      a.activate
+    end
+
+    refute e.cause
+  end
+
   def test_self_all_equals
     a = util_spec "foo", "1", nil, "lib/foo.rb"
 
@@ -1019,7 +1028,7 @@ def test_self_stubs_for_mult_platforms
 
     gem = "mingw"
     v   = "1.1.1"
-    platforms = ["x86-mingw32", "x64-mingw32"]
+    platforms = ["x86-mingw32", "x64-mingw-ucrt"]
 
     # create specs
     platforms.each do |plat|
@@ -1238,12 +1247,37 @@ def test_initialize_prerelease_version_before_name
   end
 
   def test_initialize_nil_version
-    expected = "nil versions are discouraged and will be deprecated in Rubygems 4\n"
-    actual_stdout, actual_stderr = capture_output do
-      Gem::Specification.new.version = nil
+    spec = Gem::Specification.new
+    spec.name = "test-name"
+
+    assert_nil spec.version
+    spec.version = nil
+    assert_nil spec.version
+
+    spec.summary = "test gem"
+    spec.authors = ["test author"]
+    e = assert_raise Gem::InvalidSpecificationException do
+      spec.validate
     end
-    assert_empty actual_stdout
-    assert_equal(expected, actual_stderr)
+    assert_match("missing value for attribute version", e.message)
+  end
+
+  def test_set_version_to_nil_after_setting_version
+    spec = Gem::Specification.new
+    spec.name = "test-name"
+
+    assert_nil spec.version
+    spec.version = "1.0.0"
+    assert_equal "1.0.0", spec.version.to_s
+    spec.version = nil
+    assert_nil spec.version
+
+    spec.summary = "test gem"
+    spec.authors = ["test author"]
+    e = assert_raise Gem::InvalidSpecificationException do
+      spec.validate
+    end
+    assert_match("missing value for attribute version", e.message)
   end
 
   def test__dump
@@ -2206,9 +2240,9 @@ def test_spaceship_name
     s1 = util_spec "a", "1"
     s2 = util_spec "b", "1"
 
-    assert_equal(-1, (s1 <=> s2))
-    assert_equal(0, (s1 <=> s1)) # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
-    assert_equal(1, (s2 <=> s1))
+    assert_equal(-1, s1 <=> s2)
+    assert_equal(0, s1 <=> s1) # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
+    assert_equal(1, s2 <=> s1)
   end
 
   def test_spaceship_platform
@@ -2217,18 +2251,18 @@ def test_spaceship_platform
       s.platform = Gem::Platform.new "x86-my_platform1"
     end
 
-    assert_equal(-1, (s1 <=> s2))
-    assert_equal(0, (s1 <=> s1)) # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
-    assert_equal(1, (s2 <=> s1))
+    assert_equal(-1, s1 <=> s2)
+    assert_equal(0, s1 <=> s1) # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
+    assert_equal(1, s2 <=> s1)
   end
 
   def test_spaceship_version
     s1 = util_spec "a", "1"
     s2 = util_spec "a", "2"
 
-    assert_equal(-1, (s1 <=> s2))
-    assert_equal(0, (s1 <=> s1)) # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
-    assert_equal(1, (s2 <=> s1))
+    assert_equal(-1, s1 <=> s2)
+    assert_equal(0, s1 <=> s1) # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
+    assert_equal(1, s2 <=> s1)
   end
 
   def test_spec_file
@@ -2661,27 +2695,7 @@ def test_validate_dependencies
         @a1.validate
       end
 
-      expected = <<-EXPECTED
-#{w}:  prerelease dependency on b (>= 1.0.rc1) is not recommended
-#{w}:  prerelease dependency on c (>= 2.0.rc2, development) is not recommended
-#{w}:  open-ended dependency on i (>= 1.2) is not recommended
-  if i is semantically versioned, use:
-    add_runtime_dependency "i", "~> 1.2"
-#{w}:  open-ended dependency on j (>= 1.2.3) is not recommended
-  if j is semantically versioned, use:
-    add_runtime_dependency "j", "~> 1.2", ">= 1.2.3"
-#{w}:  open-ended dependency on k (> 1.2) is not recommended
-  if k is semantically versioned, use:
-    add_runtime_dependency "k", "~> 1.2", "> 1.2"
-#{w}:  open-ended dependency on l (> 1.2.3) is not recommended
-  if l is semantically versioned, use:
-    add_runtime_dependency "l", "~> 1.2", "> 1.2.3"
-#{w}:  open-ended dependency on o (>= 0) is not recommended
-  use a bounded requirement, such as "~> x.y"
-#{w}:  See https://guides.rubygems.org/specification-reference/ for help
-      EXPECTED
-
-      assert_equal expected, @ui.error, "warning"
+      assert_equal "", @ui.error, "warning"
     end
   end
 
@@ -3654,8 +3668,6 @@ def test_version_change_reset_cache_file
   end
 
   def test__load_fixes_Date_objects
-    pend "Marshal.load of links and floats is broken on truffleruby, see https://github.com/oracle/truffleruby/issues/3747" if RUBY_ENGINE == "truffleruby"
-
     spec = util_spec "a", 1
     spec.instance_variable_set :@date, Date.today
 
diff --git a/test/mri/rubygems/test_gem_uri.rb b/test/mri/rubygems/test_gem_uri.rb
index 1253ebc6de4..ce633c99b63 100644
--- a/test/mri/rubygems/test_gem_uri.rb
+++ b/test/mri/rubygems/test_gem_uri.rb
@@ -21,7 +21,7 @@ def test_redacted_with_token
   end
 
   def test_redacted_with_user_x_oauth_basic
-    assert_equal "https://REDACTED:x-oauth-basic@example.com", Gem::Uri.new("https://token:x-oauth-basic@example.com").redacted.to_s
+    assert_equal "https://REDACTED@example.com", Gem::Uri.new("https://token:x-oauth-basic@example.com").redacted.to_s
   end
 
   def test_redacted_without_credential
diff --git a/test/mri/rubygems/test_gem_util.rb b/test/mri/rubygems/test_gem_util.rb
index 608210a9031..9688d066db2 100644
--- a/test/mri/rubygems/test_gem_util.rb
+++ b/test/mri/rubygems/test_gem_util.rb
@@ -13,17 +13,6 @@ def test_class_popen
     end
   end
 
-  def test_silent_system
-    pend if Gem.java_platform?
-    Gem::Deprecate.skip_during do
-      out, err = capture_output do
-        Gem::Util.silent_system(*ruby_with_rubygems_in_load_path, "-e", 'puts "hello"; warn "hello"')
-      end
-      assert_empty out
-      assert_empty err
-    end
-  end
-
   def test_traverse_parents
     FileUtils.mkdir_p "a/b/c"
 
diff --git a/test/mri/rubygems/test_gem_version.rb b/test/mri/rubygems/test_gem_version.rb
index cf771bc5a14..3987c620d0a 100644
--- a/test/mri/rubygems/test_gem_version.rb
+++ b/test/mri/rubygems/test_gem_version.rb
@@ -7,6 +7,11 @@ class TestGemVersion < Gem::TestCase
   class V < ::Gem::Version
   end
 
+  def test_nil_is_zero
+    zero = Gem::Version.create nil
+    assert_equal Gem::Version.create(0), zero
+  end
+
   def test_bump
     assert_bumped_version_equal "5.3", "5.2.4"
   end
@@ -35,13 +40,6 @@ def test_class_create
 
     assert_same real, Gem::Version.create(real)
 
-    expected = "nil versions are discouraged and will be deprecated in Rubygems 4\n"
-    actual_stdout, actual_stderr = capture_output do
-      assert_nil Gem::Version.create(nil)
-    end
-    assert_empty actual_stdout
-    assert_equal(expected, actual_stderr)
-
     assert_equal v("5.1"), Gem::Version.create("5.1")
 
     ver = "1.1"
@@ -51,13 +49,7 @@ def test_class_create
   def test_class_correct
     assert_equal true,  Gem::Version.correct?("5.1")
     assert_equal false, Gem::Version.correct?("an incorrect version")
-
-    expected = "nil versions are discouraged and will be deprecated in Rubygems 4\n"
-    actual_stdout, actual_stderr = capture_output do
-      Gem::Version.correct?(nil)
-    end
-    assert_empty actual_stdout
-    assert_equal(expected, actual_stderr)
+    assert_equal true, Gem::Version.correct?(nil)
   end
 
   def test_class_new_subclass
@@ -162,11 +154,14 @@ def test_spaceship
     assert_equal(-1, v("5.a") <=> v("5.0.0.rc2"))
     assert_equal(1, v("5.x") <=> v("5.0.0.rc2"))
 
-    assert_equal(0, v("1.9.3")  <=> "1.9.3")
-    assert_equal(1, v("1.9.3")  <=> "1.9.2.99")
-    assert_equal(-1, v("1.9.3") <=> "1.9.3.1")
-
-    assert_nil v("1.0") <=> "whatever"
+    [
+      [0, "1.9.3"],
+      [1, "1.9.2.99"],
+      [-1, "1.9.3.1"],
+      [nil, "whatever"],
+    ].each do |cmp, string_ver|
+      assert_equal(cmp, v("1.9.3") <=> string_ver)
+    end
   end
 
   def test_approximate_recommendation
diff --git a/test/mri/rubygems/test_webauthn_listener.rb b/test/mri/rubygems/test_webauthn_listener.rb
index 08edabceb26..ded41289285 100644
--- a/test/mri/rubygems/test_webauthn_listener.rb
+++ b/test/mri/rubygems/test_webauthn_listener.rb
@@ -17,7 +17,7 @@ def teardown
     super
   end
 
-  def test_listener_thread_retreives_otp_code
+  def test_listener_thread_retrieves_otp_code
     thread = Gem::GemcutterUtilities::WebauthnListener.listener_thread(Gem.host, @server)
     Gem::MockBrowser.get Gem::URI("http://localhost:#{@port}?code=xyz")
 
diff --git a/test/mri/set/fixtures/fake_sorted_set_gem/sorted_set.rb b/test/mri/set/fixtures/fake_sorted_set_gem/sorted_set.rb
deleted file mode 100644
index f45a7663037..00000000000
--- a/test/mri/set/fixtures/fake_sorted_set_gem/sorted_set.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-Object.instance_exec do
-  # Remove the constant to cancel autoload that would be fired by
-  # `class SortedSet` and cause circular require.
-  remove_const :SortedSet if const_defined?(:SortedSet)
-end
-
-class SortedSet < Set
-  # ...
-end
diff --git a/test/mri/set/test_sorted_set.rb b/test/mri/set/test_sorted_set.rb
deleted file mode 100644
index f7ad7af2993..00000000000
--- a/test/mri/set/test_sorted_set.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'set'
-
-class TC_SortedSet < Test::Unit::TestCase
-  def base_dir
-    "#{__dir__}/../lib"
-  end
-
-  def assert_runs(ruby, options: nil)
-    options = ['-I', base_dir, *options]
-    r = system(RbConfig.ruby, *options, '-e', ruby)
-    assert(r)
-  end
-
-  def test_error
-    assert_runs <<~RUBY
-      require "set"
-
-      r = begin
-        puts SortedSet.new
-      rescue Exception => e
-        e.message
-      end
-      raise r unless r.match?(/has been extracted/)
-    RUBY
-  end
-
-  def test_ok_with_gem
-    assert_runs <<~RUBY, options: ['-I', "#{__dir__}/fixtures/fake_sorted_set_gem"]
-      require "set"
-
-      var = SortedSet.new.to_s
-    RUBY
-  end
-
-  def test_ok_require
-    assert_runs <<~RUBY, options: ['-I', "#{__dir__}/fixtures/fake_sorted_set_gem"]
-      require "set"
-      require "sorted_set"
-
-      var = SortedSet.new.to_s
-    RUBY
-  end
-end
diff --git a/test/mri/socket/test_addrinfo.rb b/test/mri/socket/test_addrinfo.rb
index c61764d76d6..0c9529090e4 100644
--- a/test/mri/socket/test_addrinfo.rb
+++ b/test/mri/socket/test_addrinfo.rb
@@ -360,6 +360,12 @@ def test_family_addrinfo
     assert_raise(Socket::ResolutionError) { Addrinfo.tcp("0.0.0.0", 4649).family_addrinfo("::1", 80) }
   end
 
+  def test_ractor_shareable
+    assert_ractor(<<~'RUBY', require: 'socket', timeout: 60)
+      Ractor.make_shareable Addrinfo.new "\x10\x02\x14\xE9\xE0\x00\x00\xFB\x00\x00\x00\x00\x00\x00\x00\x00".b
+    RUBY
+  end
+
   def random_port
     # IANA suggests dynamic port for 49152 to 65535
     # http://www.iana.org/assignments/port-numbers
diff --git a/test/mri/socket/test_socket.rb b/test/mri/socket/test_socket.rb
index 27e60b33357..c42527f3703 100644
--- a/test/mri/socket/test_socket.rb
+++ b/test/mri/socket/test_socket.rb
@@ -173,8 +173,11 @@ def random_port
 
   def errors_addrinuse
     errs = [Errno::EADDRINUSE]
-    # MinGW fails with "Errno::EACCES: Permission denied - bind(2) for 0.0.0.0:49721"
-    errs << Errno::EACCES if /mingw/ =~ RUBY_PLATFORM
+    # Windows can fail with "Errno::EACCES: Permission denied - bind(2) for 0.0.0.0:49721"
+    # or "Test::Unit::ProxyError: Permission denied - bind(2) for 0.0.0.0:55333"
+    if /mswin|mingw/ =~ RUBY_PLATFORM
+      errs += [Errno::EACCES, Test::Unit::ProxyError]
+    end
     errs
   end
 
@@ -489,7 +492,7 @@ def timestamp_retry_rw(s1, s2, t1, type)
         end while IO.select([r], nil, nil, 0.1).nil?
         n
       end
-      timeout = (defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? ? 120 : 30) # for --jit-wait
+      timeout = 30
       assert_equal([[s1],[],[]], IO.select([s1], nil, nil, timeout))
       msg, _, _, stamp = s1.recvmsg
       assert_equal("a", msg)
@@ -513,7 +516,7 @@ def timestamp_retry_rw(s1, s2, t1, type)
   end
 
   def test_timestamp
-    return if /linux|freebsd|netbsd|openbsd|solaris|darwin/ !~ RUBY_PLATFORM
+    return if /linux|freebsd|netbsd|openbsd|darwin/ !~ RUBY_PLATFORM
     return if !defined?(Socket::AncillaryData) || !defined?(Socket::SO_TIMESTAMP)
     t1 = Time.now.strftime("%Y-%m-%d")
     stamp = nil
@@ -906,7 +909,7 @@ def test_tcp_socket_resolv_timeout
 
       Addrinfo.define_singleton_method(:getaddrinfo) { |*_| sleep }
 
-      assert_raise(Errno::ETIMEDOUT) do
+      assert_raise(IO::TimeoutError) do
         Socket.tcp("localhost", port, resolv_timeout: 0.01)
       end
     ensure
@@ -931,12 +934,38 @@ def test_tcp_socket_resolv_timeout_with_connection_failure
 
     server.close
 
-    assert_raise(Errno::ETIMEDOUT) do
+    assert_raise(IO::TimeoutError) do
       Socket.tcp("localhost", port, resolv_timeout: 0.01)
     end
     RUBY
   end
 
+  def test_tcp_socket_open_timeout
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+      if family == Socket::AF_INET6
+        sleep
+      else
+        [Addrinfo.tcp("127.0.0.1", 12345)]
+      end
+    end
+
+    assert_raise(IO::TimeoutError) do
+      Socket.tcp("localhost", 12345, open_timeout: 0.01)
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_open_timeout_with_other_timeouts
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    assert_raise(ArgumentError) do
+      Socket.tcp("localhost", 12345, open_timeout: 0.01, resolv_timout: 0.01)
+    end
+    RUBY
+  end
+
   def test_tcp_socket_one_hostname_resolution_succeeded_at_least
     opts = %w[-rsocket -W1]
     assert_separately opts, <<~RUBY
@@ -982,7 +1011,7 @@ def test_tcp_socket_all_hostname_resolution_failed
       Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
         case family
         when Socket::AF_INET6 then raise SocketError
-        when Socket::AF_INET then sleep(0.001); raise SocketError, "Last hostname resolution error"
+        when Socket::AF_INET then sleep(0.01); raise SocketError, "Last hostname resolution error"
         end
       end
 
diff --git a/test/mri/socket/test_tcp.rb b/test/mri/socket/test_tcp.rb
index e6a41f56604..d689ab23765 100644
--- a/test/mri/socket/test_tcp.rb
+++ b/test/mri/socket/test_tcp.rb
@@ -18,6 +18,12 @@ def test_inspect
   end
 
   def test_initialize_failure
+    assert_raise(Socket::ResolutionError) do
+      t = TCPSocket.open(nil, nil)
+    ensure
+      t&.close
+    end
+
     # These addresses are chosen from TEST-NET-1, TEST-NET-2, and TEST-NET-3.
     # [RFC 5737]
     # They are chosen because probably they are not used as a host address.
@@ -43,16 +49,14 @@ def test_initialize_failure
     server_addr = '127.0.0.1'
     server_port = 80
 
-    begin
+    e = assert_raise_kind_of(SystemCallError) do
       # Since client_addr is not an IP address of this host,
       # bind() in TCPSocket.new should fail as EADDRNOTAVAIL.
       t = TCPSocket.new(server_addr, server_port, client_addr, client_port)
-      flunk "expected SystemCallError"
-    rescue SystemCallError => e
-      assert_match "for \"#{client_addr}\" port #{client_port}", e.message
+    ensure
+      t&.close
     end
-  ensure
-    t.close if t && !t.closed?
+    assert_include e.message, "for \"#{client_addr}\" port #{client_port}"
   end
 
   def test_initialize_resolv_timeout
@@ -69,6 +73,30 @@ def test_initialize_resolv_timeout
     end
   end
 
+  def test_tcp_initialize_open_timeout
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    server = TCPServer.new("127.0.0.1", 0)
+    port = server.connect_address.ip_port
+    server.close
+
+    assert_raise(IO::TimeoutError) do
+      TCPSocket.new(
+        "localhost",
+        port,
+        open_timeout: 0.01,
+        fast_fallback: true,
+        test_mode_settings: { delay: { ipv4: 1000 } }
+      )
+    end
+  end
+
+  def test_initialize_open_timeout_with_other_timeouts
+    assert_raise(ArgumentError) do
+      TCPSocket.new("localhost", 12345, open_timeout: 0.01, resolv_timeout: 0.01)
+    end
+  end
+
   def test_initialize_connect_timeout
     assert_raise(IO::TimeoutError, Errno::ENETUNREACH, Errno::EACCES) do
       TCPSocket.new("192.0.2.1", 80, connect_timeout: 0)
@@ -293,7 +321,7 @@ def test_initialize_resolv_timeout_with_connection_failure
     port = server.connect_address.ip_port
     server.close
 
-    assert_raise(Errno::ETIMEDOUT) do
+    assert_raise(IO::TimeoutError) do
       TCPSocket.new(
         "localhost",
         port,
diff --git a/test/mri/socket/test_unix.rb b/test/mri/socket/test_unix.rb
index 3e7d85befcc..e239e3935b8 100644
--- a/test/mri/socket/test_unix.rb
+++ b/test/mri/socket/test_unix.rb
@@ -146,6 +146,7 @@ def test_fd_passing_n2
   end
 
   def test_fd_passing_race_condition
+    omit 'randomly crashes on macOS' if RUBY_PLATFORM =~ /darwin/
     r1, w = IO.pipe
     s1, s2 = UNIXSocket.pair
     s1.nonblock = s2.nonblock = true
@@ -292,14 +293,18 @@ def bound_unix_socket(klass)
     File.unlink path if path && File.socket?(path)
   end
 
-  def test_open_nul_byte
-    tmpfile = Tempfile.new("s")
-    path = tmpfile.path
-    tmpfile.close(true)
-    assert_raise(ArgumentError) {UNIXServer.open(path+"\0")}
-    assert_raise(ArgumentError) {UNIXSocket.open(path+"\0")}
-  ensure
-    File.unlink path if path && File.socket?(path)
+  def test_open_argument
+    assert_raise(TypeError) {UNIXServer.new(nil)}
+    assert_raise(TypeError) {UNIXServer.new(1)}
+    Tempfile.create("s") do |s|
+      path = s.path
+      s.close
+      File.unlink(path)
+      assert_raise(ArgumentError) {UNIXServer.open(path+"\0")}
+      assert_raise(ArgumentError) {UNIXSocket.open(path+"\0")}
+      arg = Struct.new(:to_path).new(path)
+      assert_equal(path, UNIXServer.open(arg) { |server| server.path })
+    end
   end
 
   def test_addr
diff --git a/test/mri/strscan/test_ractor.rb b/test/mri/strscan/test_ractor.rb
index 9a279d29296..a13fd8fd133 100644
--- a/test/mri/strscan/test_ractor.rb
+++ b/test/mri/strscan/test_ractor.rb
@@ -8,6 +8,10 @@ def setup
 
   def test_ractor
     assert_in_out_err([], <<-"end;", ["stra", " ", "strb", " ", "strc"], [])
+      class Ractor
+        alias value take unless method_defined? :value # compat with Ruby 3.4 and olders
+      end
+
       require "strscan"
       $VERBOSE = nil
       r = Ractor.new do
@@ -22,7 +26,7 @@ def test_ractor
           s.scan(/\\w+/)
         ]
       end
-      puts r.take.compact
+      puts r.value.compact
     end;
   end
 end
diff --git a/test/mri/strscan/test_stringscanner.rb b/test/mri/strscan/test_stringscanner.rb
index 085a9113132..dd3663ea6a2 100644
--- a/test/mri/strscan/test_stringscanner.rb
+++ b/test/mri/strscan/test_stringscanner.rb
@@ -107,11 +107,6 @@ def test_const_Version
     assert_equal(true, StringScanner::Version.frozen?)
   end
 
-  def test_const_Id
-    assert_instance_of(String, StringScanner::Id)
-    assert_equal(true, StringScanner::Id.frozen?)
-  end
-
   def test_inspect
     str = 'test string'.dup
     s = create_string_scanner(str, false)
@@ -875,7 +870,7 @@ def test_unscan
     assert_equal({}, s.named_captures)
     assert_equal("te", s.scan(/../))
     assert_equal(nil, s.scan(/\d/))
-    assert_raise(ScanError) { s.unscan }
+    assert_raise(StringScanner::Error) { s.unscan }
   end
 
   def test_rest
diff --git a/test/mri/test_delegate.rb b/test/mri/test_delegate.rb
index f7bedf37fbf..903265a8f7c 100644
--- a/test/mri/test_delegate.rb
+++ b/test/mri/test_delegate.rb
@@ -23,7 +23,7 @@ def test_delegate_class_block
 
   def test_systemcallerror_eq
     e = SystemCallError.new(0)
-    assert((SimpleDelegator.new(e) == e) == (e == SimpleDelegator.new(e)), "[ruby-dev:34808]")
+    assert_equal((SimpleDelegator.new(e) == e), (e == SimpleDelegator.new(e)), "[ruby-dev:34808]")
   end
 
   class Myclass < DelegateClass(Array);end
@@ -93,15 +93,21 @@ def test_override
   end
 
   class Parent
-    def parent_public; end
+    def parent_public
+      :public
+    end
 
     protected
 
-    def parent_protected; end
+    def parent_protected
+      :protected
+    end
 
     private
 
-    def parent_private; end
+    def parent_private
+      :private
+    end
   end
 
   class Child < DelegateClass(Parent)
@@ -157,6 +163,13 @@ def test_DelegateClass_public_instance_method
     assert_instance_of UnboundMethod, Child.public_instance_method(:to_s)
   end
 
+  def test_call_visibiltiy
+    obj = Child.new(Parent.new)
+    assert_equal :public, obj.parent_public
+    assert_equal :protected, obj.__send__(:parent_protected)
+    assert_raise(NoMethodError) { obj.__send__(:parent_private) }
+  end
+
   class IV < DelegateClass(Integer)
     attr_accessor :var
 
@@ -181,8 +194,8 @@ def test_copy_frozen
     assert_nothing_raised(bug2679) {d.dup[0] += 1}
     assert_raise(FrozenError) {d.clone[0] += 1}
     d.freeze
-    assert(d.clone.frozen?)
-    assert(!d.dup.frozen?)
+    assert_predicate(d.clone, :frozen?)
+    assert_not_predicate(d.dup, :frozen?)
   end
 
   def test_frozen
@@ -390,4 +403,20 @@ def test(a, k:) [a, k]; end
     a = DelegateClass(k).new(k.new)
     assert_equal([1, 0], a.test(1, k: 0))
   end
+
+  def test_delegate_class_can_be_used_in_ractors
+    omit "no Ractor#value" unless defined?(Ractor) && Ractor.method_defined?(:value)
+    require_path = File.expand_path(File.join(__dir__, "..", "lib", "delegate.rb"))
+    raise "file doesn't exist: #{require_path}" unless File.exist?(require_path)
+    assert_ractor <<-RUBY
+      require "#{require_path}"
+      class MyClass < DelegateClass(Array);end
+      values = 2.times.map do
+        Ractor.new do
+          MyClass.new([1,2,3]).at(0)
+        end
+      end.map(&:value)
+      assert_equal [1,1], values
+    RUBY
+  end
 end
diff --git a/test/mri/test_extlibs.rb b/test/mri/test_extlibs.rb
index 9b6676416cf..122eca3f5c5 100644
--- a/test/mri/test_extlibs.rb
+++ b/test/mri/test_extlibs.rb
@@ -10,7 +10,7 @@ def self.check_existence(ext, add_msg = nil)
     add_msg = ".  #{add_msg}" if add_msg
     log = "#{@extdir}/#{ext}/mkmf.log"
     define_method("test_existence_of_#{ext}") do
-      assert_separately([], <<-"end;", ignore_stderr: true) # do
+      assert_separately([], <<-"end;", ignore_stderr: true, timeout: 60) # do
         log = #{log.dump}
         msg = proc {
           "extension library `#{ext}' is not found#{add_msg}\n" <<
@@ -53,7 +53,6 @@ def windows?
   check_existence "etc"
   check_existence "fcntl"
   check_existence "fiber"
-  check_existence "fiddle"
   check_existence "io/console"
   check_existence "io/nonblock"
   check_existence "io/wait"
@@ -69,6 +68,5 @@ def windows?
   check_existence "stringio"
   check_existence "strscan"
   check_existence "thread"
-  check_existence "win32ole"
   check_existence "zlib", "this may be false positive, but should assert because rubygems requires this"
 end
diff --git a/test/mri/test_ipaddr.rb b/test/mri/test_ipaddr.rb
index f2b7ed713f3..005927cd054 100644
--- a/test/mri/test_ipaddr.rb
+++ b/test/mri/test_ipaddr.rb
@@ -196,6 +196,15 @@ def test_ipv4_compat
     }
     assert_equal("::192.168.1.2", b.to_s)
     assert_equal(Socket::AF_INET6, b.family)
+    assert_equal(128, b.prefix)
+
+    a = IPAddr.new("192.168.0.0/16")
+    assert_warning(/obsolete/) {
+      b = a.ipv4_compat
+    }
+    assert_equal("::192.168.0.0", b.to_s)
+    assert_equal(Socket::AF_INET6, b.family)
+    assert_equal(112, b.prefix)
   end
 
   def test_ipv4_mapped
@@ -399,6 +408,46 @@ def test_carrot
     assert_equal("::", @in6_addr_any.to_s)
   end
 
+  def test_plus
+    a = IPAddr.new("192.168.1.10")
+    assert_equal("192.168.1.20", (a + 10).to_s)
+
+    a = IPAddr.new("0.0.0.0")
+    assert_equal("0.0.0.10", (a + 10).to_s)
+
+    a = IPAddr.new("255.255.255.255")
+    assert_raise(IPAddr::InvalidAddressError) { a + 10 }
+
+    a = IPAddr.new("3ffe:505:2::a")
+    assert_equal("3ffe:505:2::14", (a + 10).to_s)
+
+    a = IPAddr.new("::")
+    assert_equal("::a", (a + 10).to_s)
+
+    a = IPAddr.new("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+    assert_raise(IPAddr::InvalidAddressError) { a + 10 }
+  end
+
+  def test_minus
+    a = IPAddr.new("192.168.1.10")
+    assert_equal("192.168.1.0", (a - 10).to_s)
+
+    a = IPAddr.new("0.0.0.0")
+    assert_raise(IPAddr::InvalidAddressError) { a - 10 }
+
+    a = IPAddr.new("255.255.255.255")
+    assert_equal("255.255.255.245", (a - 10).to_s)
+
+    a = IPAddr.new("3ffe:505:2::a")
+    assert_equal("3ffe:505:2::", (a - 10).to_s)
+
+    a = IPAddr.new("::")
+    assert_raise(IPAddr::InvalidAddressError) { a - 10 }
+
+    a = IPAddr.new("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+    assert_equal("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff5", (a - 10).to_s)
+  end
+
   def test_equal
     assert_equal(true, @a == IPAddr.new("3FFE:505:2::"))
     assert_equal(true, @a == IPAddr.new("3ffe:0505:0002::"))
@@ -571,4 +620,16 @@ def test_hash
     assert_equal(true, s.include?(a5))
     assert_equal(true, s.include?(a6))
   end
+
+  def test_raises_invalid_address_error_with_error_message
+    e = assert_raise(IPAddr::InvalidAddressError) do
+      IPAddr.new('192.168.0.1000')
+    end
+    assert_equal('invalid address: 192.168.0.1000', e.message)
+
+    e = assert_raise(IPAddr::InvalidAddressError) do
+      IPAddr.new('192.168.01.100')
+    end
+    assert_equal('zero-filled number in IPv4 address is ambiguous: 192.168.01.100', e.message)
+  end
 end
diff --git a/test/mri/test_pp.rb b/test/mri/test_pp.rb
index 2646846d8b3..4a273e6edd0 100644
--- a/test/mri/test_pp.rb
+++ b/test/mri/test_pp.rb
@@ -2,11 +2,14 @@
 
 require 'pp'
 require 'delegate'
+require 'set'
 require 'test/unit'
 require 'ruby2_keywords'
 
 module PPTestModule
 
+SetPP = Set.instance_method(:pretty_print).source_location[0].end_with?("/pp.rb")
+
 class PPTest < Test::Unit::TestCase
   def test_list0123_12
     assert_equal("[0, 1, 2, 3]\n", PP.pp([0,1,2,3], ''.dup, 12))
@@ -16,6 +19,10 @@ def test_list0123_11
     assert_equal("[0,\n 1,\n 2,\n 3]\n", PP.pp([0,1,2,3], ''.dup, 11))
   end
 
+  def test_set
+    assert_equal("Set[0, 1, 2, 3]\n", PP.pp(Set[0,1,2,3], ''.dup, 16))
+  end if SetPP
+
   OverriddenStruct = Struct.new("OverriddenStruct", :members, :class)
   def test_struct_override_members # [ruby-core:7865]
     a = OverriddenStruct.new(1,2)
@@ -130,6 +137,20 @@ def a.to_s() "aaa" end
     assert_equal("#{a.inspect}\n", result)
   end
 
+  def test_iv_hiding
+    a = Object.new
+    def a.pretty_print_instance_variables() [:@b] end
+    a.instance_eval { @a = "aaa"; @b = "bbb" }
+    assert_match(/\A#<Object:0x[\da-f]+ @b="bbb">\n\z/, PP.pp(a, ''.dup))
+  end
+
+  def test_iv_hiding_via_ruby
+    a = Object.new
+    def a.instance_variables_to_inspect() [:@b] end
+    a.instance_eval { @a = "aaa"; @b = "bbb" }
+    assert_match(/\A#<Object:0x[\da-f]+ @b="bbb">\n\z/, PP.pp(a, ''.dup))
+  end
+
   def test_basic_object
     a = BasicObject.new
     assert_match(/\A#<BasicObject:0x[\da-f]+>\n\z/, PP.pp(a, ''.dup))
@@ -150,6 +171,12 @@ def test_hash
     assert_equal("#{a.inspect}\n", PP.pp(a, ''.dup))
   end
 
+  def test_set
+    s = Set[]
+    s.add s
+    assert_equal("Set[Set[...]]\n", PP.pp(s, ''.dup))
+  end if SetPP
+
   S = Struct.new("S", :a, :b)
   def test_struct
     a = S.new(1,2)
@@ -158,7 +185,14 @@ def test_struct
     assert_equal("#{a.inspect}\n", PP.pp(a, ''.dup)) unless RUBY_ENGINE == "truffleruby"
   end
 
-  if defined?(Data.define)
+  verbose, $VERBOSE = $VERBOSE, nil
+  begin
+    has_data_define = defined?(Data.define)
+  ensure
+    $VERBOSE = verbose
+  end
+
+  if has_data_define
     D = Data.define(:aaa, :bbb)
     def test_data
       a = D.new("aaa", "bbb")
@@ -223,7 +257,6 @@ def test_hash
   end
 
   def test_hash_symbol_colon_key
-    omit if RUBY_VERSION < "3.4."
     no_quote = "{a: 1, a!: 1, a?: 1}"
     unicode_quote = "{\u{3042}: 1}"
     quote0 = '{"": 1}'
@@ -236,12 +269,41 @@ def test_hash_symbol_colon_key
     assert_equal(quote1, PP.singleline_pp(eval(quote1), ''.dup))
     assert_equal(quote2, PP.singleline_pp(eval(quote2), ''.dup))
     assert_equal(quote3, PP.singleline_pp(eval(quote3), ''.dup))
-  end
+  end if RUBY_VERSION >= "3.4."
 
   def test_hash_in_array
     omit if RUBY_ENGINE == "jruby"
-    assert_equal("[{}]", PP.singleline_pp([->(*a){a.last.clear}.ruby2_keywords.call(a: 1)], ''.dup))
-    assert_equal("[{}]", PP.singleline_pp([Hash.ruby2_keywords_hash({})], ''.dup))
+    assert_equal("[{}]", passing_keywords {PP.singleline_pp([->(*a){a.last.clear}.ruby2_keywords.call(a: 1)], ''.dup)})
+    assert_equal("[{}]", passing_keywords {PP.singleline_pp([Hash.ruby2_keywords_hash({})], ''.dup)})
+  end
+
+  if RUBY_VERSION >= "3.0"
+    def passing_keywords(&_)
+      yield
+    end
+  else
+    def passing_keywords(&_)
+      verbose, $VERBOSE = $VERBOSE, nil
+      yield
+    ensure
+      $VERBOSE = verbose
+    end
+  end
+
+  def test_direct_pp
+    buffer = String.new
+
+    a = []
+    a << a
+
+    # Isolate the test from any existing Thread.current[:__recursive_key__][:inspect].
+    Thread.new do
+      q = PP::SingleLine.new(buffer)
+      q.pp(a)
+      q.flush
+    end.join
+
+    assert_equal("[[...]]", buffer)
   end
 end
 
diff --git a/test/mri/test_pstore.rb b/test/mri/test_pstore.rb
deleted file mode 100644
index 7dfbdca367a..00000000000
--- a/test/mri/test_pstore.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'pstore'
-require 'tmpdir'
-
-class PStoreTest < Test::Unit::TestCase
-  def setup
-    @pstore_file = File.join(Dir.tmpdir, "pstore.tmp.#{Process.pid}")
-    @pstore = PStore.new(@pstore_file)
-  end
-
-  def teardown
-    File.unlink(@pstore_file) rescue nil
-  end
-
-  def test_opening_new_file_in_readonly_mode_should_result_in_empty_values
-    @pstore.transaction(true) do
-      assert_nil @pstore[:foo]
-      assert_nil @pstore[:bar]
-    end
-  end
-
-  def test_opening_new_file_in_readwrite_mode_should_result_in_empty_values
-    @pstore.transaction do
-      assert_nil @pstore[:foo]
-      assert_nil @pstore[:bar]
-    end
-  end
-
-  def test_data_should_be_loaded_correctly_when_in_readonly_mode
-    @pstore.transaction do
-      @pstore[:foo] = "bar"
-    end
-    @pstore.transaction(true) do
-      assert_equal "bar", @pstore[:foo]
-    end
-  end
-
-  def test_data_should_be_loaded_correctly_when_in_readwrite_mode
-    @pstore.transaction do
-      @pstore[:foo] = "bar"
-    end
-    @pstore.transaction do
-      assert_equal "bar", @pstore[:foo]
-    end
-  end
-
-  def test_changes_after_commit_are_discarded
-    @pstore.transaction do
-      @pstore[:foo] = "bar"
-      @pstore.commit
-      @pstore[:foo] = "baz"
-    end
-    @pstore.transaction(true) do
-      assert_equal "bar", @pstore[:foo]
-    end
-  end
-
-  def test_changes_are_not_written_on_abort
-    @pstore.transaction do
-      @pstore[:foo] = "bar"
-      @pstore.abort
-    end
-    @pstore.transaction(true) do
-      assert_nil @pstore[:foo]
-    end
-  end
-
-  def test_writing_inside_readonly_transaction_raises_error
-    assert_raise(PStore::Error) do
-      @pstore.transaction(true) do
-        @pstore[:foo] = "bar"
-      end
-    end
-  end
-
-  def test_thread_safe
-    q1 = Thread::Queue.new
-    assert_raise(PStore::Error) do
-      th = Thread.new do
-        @pstore.transaction do
-          @pstore[:foo] = "bar"
-          q1.push true
-          sleep
-        end
-      end
-      begin
-        q1.pop
-        @pstore.transaction {}
-      ensure
-        th.kill
-        th.join
-      end
-    end
-    q2 = Thread::Queue.new
-    begin
-      pstore = PStore.new(second_file, true)
-      cur = Thread.current
-      th = Thread.new do
-        pstore.transaction do
-          pstore[:foo] = "bar"
-          q1.push true
-          q2.pop
-          # wait for cur to enter a transaction
-          sleep 0.1 until cur.stop?
-        end
-      end
-      begin
-        q1.pop
-        q2.push true
-        assert_equal("bar", pstore.transaction { pstore[:foo] })
-      ensure
-        th.join
-      end
-    end
-  ensure
-    File.unlink(second_file) rescue nil
-  end
-
-  def test_nested_transaction_raises_error
-    assert_raise(PStore::Error) do
-      @pstore.transaction { @pstore.transaction { } }
-    end
-    pstore = PStore.new(second_file, true)
-    assert_raise(PStore::Error) do
-      pstore.transaction { pstore.transaction { } }
-    end
-  ensure
-    File.unlink(second_file) rescue nil
-  end
-
-  # Test that PStore's file operations do not blow up when default encodings are set
-  def test_pstore_files_are_accessed_as_binary_files
-    bug5311 = '[ruby-core:39503]'
-    n = 128
-    assert_in_out_err(["-Eutf-8:utf-8", "-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311, timeout: 30)
-      @pstore = PStore.new(ARGV[0])
-      (1..#{n}).each do |i|
-        @pstore.transaction {@pstore["Key\#{i}"] = "value \#{i}"}
-      end
-      @pstore.transaction {@pstore["Bug5311"] = '#{bug5311}'}
-      puts @pstore.transaction {@pstore["Bug5311"]}
-    SRC
-    assert_equal(bug5311, @pstore.transaction {@pstore["Bug5311"]}, bug5311)
-  end
-
-  def test_key_p
-    [:key?, :root?].each do |method|
-      clear_store
-      @pstore.transaction do
-        @pstore[:foo] = 0
-        assert_equal(true, @pstore.send(method, :foo))
-        assert_equal(false, @pstore.send(method, :bar))
-      end
-    end
-  end
-
-  def test_keys
-    [:keys, :roots].each do |method|
-      clear_store
-      @pstore.transaction do
-        assert_equal([], @pstore.send(method))
-      end
-      @pstore.transaction do
-        @pstore[:foo] = 0
-        assert_equal([:foo], @pstore.send(method))
-      end
-    end
-  end
-
-  def clear_store
-    @pstore.transaction do
-      @pstore.keys.each do |key|
-        @pstore.delete(key)
-      end
-    end
-  end
-
-  def second_file
-    File.join(Dir.tmpdir, "pstore.tmp2.#{Process.pid}")
-  end
-end
diff --git a/test/mri/test_pty.rb b/test/mri/test_pty.rb
index 1c0c6fb3e87..81b0d394ff2 100644
--- a/test/mri/test_pty.rb
+++ b/test/mri/test_pty.rb
@@ -12,7 +12,7 @@ class TestPTY < Test::Unit::TestCase
   RUBY = EnvUtil.rubybin
 
   def test_spawn_without_block
-    r, w, pid = PTY.spawn(RUBY, '-e', 'puts "a"')
+    r, w, pid = PTY.spawn(RUBY, '-e', 'puts "a"; sleep 0.1')
   rescue RuntimeError
     omit $!
   else
@@ -24,7 +24,7 @@ def test_spawn_without_block
   end
 
   def test_spawn_with_block
-    PTY.spawn(RUBY, '-e', 'puts "b"') {|r,w,pid|
+    PTY.spawn(RUBY, '-e', 'puts "b"; sleep 0.1') {|r,w,pid|
       begin
         assert_equal("b\r\n", r.gets)
       ensure
@@ -38,7 +38,7 @@ def test_spawn_with_block
   end
 
   def test_commandline
-    commandline = Shellwords.join([RUBY, '-e', 'puts "foo"'])
+    commandline = Shellwords.join([RUBY, '-e', 'puts "foo"; sleep 0.1'])
     PTY.spawn(commandline) {|r,w,pid|
       begin
         assert_equal("foo\r\n", r.gets)
@@ -53,7 +53,7 @@ def test_commandline
   end
 
   def test_argv0
-    PTY.spawn([RUBY, "argv0"], '-e', 'puts "bar"') {|r,w,pid|
+    PTY.spawn([RUBY, "argv0"], '-e', 'puts "bar"; sleep 0.1') {|r,w,pid|
       begin
         assert_equal("bar\r\n", r.gets)
       ensure
diff --git a/test/mri/test_rbconfig.rb b/test/mri/test_rbconfig.rb
index 1bbf01b9a68..e01264762da 100644
--- a/test/mri/test_rbconfig.rb
+++ b/test/mri/test_rbconfig.rb
@@ -51,4 +51,19 @@ def test_vendorarchdirs
       assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
     end
   end
+
+  def test_limits_and_sizeof_access_in_ractor
+    assert_separately(["-W0"], <<~'RUBY')
+      r = Ractor.new do
+        sizeof_int = RbConfig::SIZEOF["int"]
+        fixnum_max = RbConfig::LIMITS["FIXNUM_MAX"]
+        [sizeof_int, fixnum_max]
+      end
+
+      sizeof_int, fixnum_max = r.value
+
+      assert_kind_of Integer, sizeof_int, "RbConfig::SIZEOF['int'] should be an Integer"
+      assert_kind_of Integer, fixnum_max, "RbConfig::LIMITS['FIXNUM_MAX'] should be an Integer"
+    RUBY
+  end if defined?(Ractor)
 end
diff --git a/test/mri/test_time.rb b/test/mri/test_time.rb
index 23e8e104a16..55964d02fc1 100644
--- a/test/mri/test_time.rb
+++ b/test/mri/test_time.rb
@@ -74,7 +74,7 @@ def test_rfc2822_nonlinear
   if defined?(Ractor)
     def test_rfc2822_ractor
       assert_ractor(<<~RUBY, require: 'time')
-        actual = Ractor.new { Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600") }.take
+        actual = Ractor.new { Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600") }.value
         assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600, actual)
       RUBY
     end
diff --git a/test/mri/test_timeout.rb b/test/mri/test_timeout.rb
index 01156867b05..fead81f5719 100644
--- a/test/mri/test_timeout.rb
+++ b/test/mri/test_timeout.rb
@@ -4,6 +4,23 @@
 
 class TestTimeout < Test::Unit::TestCase
 
+  private def kill_timeout_thread
+    thread = Timeout.const_get(:State).instance.instance_variable_get(:@timeout_thread)
+    if thread
+      thread.kill
+      thread.join
+    end
+  end
+
+  def test_public_methods
+    assert_equal [:timeout], Timeout.private_instance_methods(false)
+    assert_equal [], Timeout.public_instance_methods(false)
+
+    assert_equal [:timeout], Timeout.singleton_class.public_instance_methods(false)
+
+    assert_equal [:Error, :ExitException, :VERSION], Timeout.constants.sort
+  end
+
   def test_work_is_done_in_same_thread_as_caller
     assert_equal Thread.current, Timeout.timeout(10){ Thread.current }
   end
@@ -212,6 +229,24 @@ def o.each
     end
   end
 
+  def test_handle_interrupt_with_exception_class
+    bug11344 = '[ruby-dev:49179] [Bug #11344]'
+    ok = false
+    assert_raise(Timeout::Error) {
+      Thread.handle_interrupt(Timeout::Error => :never) {
+        Timeout.timeout(0.01, Timeout::Error) {
+          sleep 0.2
+          ok = true
+          Thread.handle_interrupt(Timeout::Error => :on_blocking) {
+            sleep 0.2
+            raise "unreachable"
+          }
+        }
+      }
+    }
+    assert(ok, bug11344)
+  end
+
   def test_handle_interrupt
     bug11344 = '[ruby-dev:49179] [Bug #11344]'
     ok = false
@@ -222,6 +257,7 @@ def test_handle_interrupt
           ok = true
           Thread.handle_interrupt(Timeout::ExitException => :on_blocking) {
             sleep 0.2
+            raise "unreachable"
           }
         }
       }
@@ -229,6 +265,94 @@ def test_handle_interrupt
     assert(ok, bug11344)
   end
 
+  def test_handle_interrupt_with_interrupt_mask_inheritance
+    issue = 'https://github.com/ruby/timeout/issues/41'
+
+    [
+      -> {}, # not blocking so no opportunity to interrupt
+      -> { sleep 5 }
+    ].each_with_index do |body, idx|
+      # We need to create a new Timeout thread
+      kill_timeout_thread
+
+      # Create the timeout thread under a handle_interrupt(:never)
+      # due to the interrupt mask being inherited
+      Thread.handle_interrupt(Object => :never) {
+        assert_equal :ok, Timeout.timeout(1) { :ok }
+      }
+
+      # Ensure a simple timeout works and the interrupt mask was not inherited
+      assert_raise(Timeout::Error) {
+        Timeout.timeout(0.001) { sleep 1 }
+      }
+
+      r = []
+      # This raises Timeout::ExitException and not Timeout::Error for the non-blocking body
+      # because of the handle_interrupt(:never) which delays raising Timeout::ExitException
+      # on the main thread until getting outside of that handle_interrupt(:never) call.
+      # For this reason we document handle_interrupt(Timeout::ExitException) should not be used.
+      exc = idx == 0 ? Timeout::ExitException : Timeout::Error
+      assert_raise(exc) {
+        Thread.handle_interrupt(Timeout::ExitException => :never) {
+          Timeout.timeout(0.1) do
+            sleep 0.2
+            r << :sleep_before_done
+            Thread.handle_interrupt(Timeout::ExitException => :on_blocking) {
+              r << :body
+              body.call
+            }
+          ensure
+            sleep 0.2
+            r << :ensure_sleep_done
+          end
+        }
+      }
+      assert_equal([:sleep_before_done, :body, :ensure_sleep_done], r, issue)
+    end
+  end
+
+  # Same as above but with an exception class
+  def test_handle_interrupt_with_interrupt_mask_inheritance_with_exception_class
+    issue = 'https://github.com/ruby/timeout/issues/41'
+
+    [
+      -> {}, # not blocking so no opportunity to interrupt
+      -> { sleep 5 }
+    ].each do |body|
+      # We need to create a new Timeout thread
+      kill_timeout_thread
+
+      # Create the timeout thread under a handle_interrupt(:never)
+      # due to the interrupt mask being inherited
+      Thread.handle_interrupt(Object => :never) {
+        assert_equal :ok, Timeout.timeout(1) { :ok }
+      }
+
+      # Ensure a simple timeout works and the interrupt mask was not inherited
+      assert_raise(Timeout::Error) {
+        Timeout.timeout(0.001) { sleep 1 }
+      }
+
+      r = []
+      assert_raise(Timeout::Error) {
+        Thread.handle_interrupt(Timeout::Error => :never) {
+          Timeout.timeout(0.1, Timeout::Error) do
+            sleep 0.2
+            r << :sleep_before_done
+            Thread.handle_interrupt(Timeout::Error => :on_blocking) {
+              r << :body
+              body.call
+            }
+          ensure
+            sleep 0.2
+            r << :ensure_sleep_done
+          end
+        }
+      }
+      assert_equal([:sleep_before_done, :body, :ensure_sleep_done], r, issue)
+    end
+  end
+
   def test_fork
     omit 'fork not supported' unless Process.respond_to?(:fork)
     r, w = IO.pipe
@@ -274,4 +398,59 @@ def test_handling_enclosed_threadgroup
       }.join
     end;
   end
+
+  def test_ractor
+    assert_separately(%w[-rtimeout -W0], <<-'end;')
+      r = Ractor.new do
+        Timeout.timeout(1) { 42 }
+      end.value
+
+      assert_equal 42, r
+
+      r = Ractor.new do
+        begin
+          Timeout.timeout(0.1) { sleep }
+        rescue Timeout::Error
+          :ok
+        end
+      end.value
+
+      assert_equal :ok, r
+    end;
+  end if defined?(::Ractor) && RUBY_VERSION >= '4.0'
+
+  def test_timeout_in_trap_handler
+    # https://github.com/ruby/timeout/issues/17
+
+    # Test as if this was the first timeout usage
+    kill_timeout_thread
+
+    rd, wr = IO.pipe
+
+    signal = :TERM
+
+    original_handler = trap(signal) do
+      begin
+        Timeout.timeout(0.1) do
+          sleep 1
+        end
+      rescue Timeout::Error
+        wr.write "OK"
+        wr.close
+      else
+        wr.write "did not raise"
+      ensure
+        wr.close
+      end
+    end
+
+    begin
+      Process.kill signal, Process.pid
+
+      assert_equal "OK", rd.read
+      rd.close
+    ensure
+      trap(signal, original_handler)
+    end
+  end
 end
diff --git a/test/mri/test_tmpdir.rb b/test/mri/test_tmpdir.rb
index adc29183a83..c91fc334ed7 100644
--- a/test/mri/test_tmpdir.rb
+++ b/test/mri/test_tmpdir.rb
@@ -134,17 +134,32 @@ def assert_mktmpdir_traversal
 
   def test_ractor
     assert_ractor(<<~'end;', require: "tmpdir")
-      r = Ractor.new do
-        Dir.mktmpdir() do |d|
-          Ractor.yield d
-          Ractor.receive
+      if defined?(Ractor::Port)
+        port = Ractor::Port.new
+        r = Ractor.new port do |port|
+          Dir.mktmpdir() do |d|
+            port << d
+            Ractor.receive
+          end
+        end
+        dir = port.receive
+        assert_file.directory? dir
+        r.send true
+        r.join
+        assert_file.not_exist? dir
+      else
+        r = Ractor.new do
+          Dir.mktmpdir() do |d|
+            Ractor.yield d
+            Ractor.receive
+          end
         end
+        dir = r.take
+        assert_file.directory? dir
+        r.send true
+        r.take
+        assert_file.not_exist? dir
       end
-      dir = r.take
-      assert_file.directory? dir
-      r.send true
-      r.take
-      assert_file.not_exist? dir
     end;
   end
 end
diff --git a/test/mri/test_unicode_normalize.rb b/test/mri/test_unicode_normalize.rb
index 8789ed92d2a..dd06d271310 100644
--- a/test/mri/test_unicode_normalize.rb
+++ b/test/mri/test_unicode_normalize.rb
@@ -209,4 +209,32 @@ def test_us_ascii
     assert_equal true, ascii_string.unicode_normalized?(:nfkc)
     assert_equal true, ascii_string.unicode_normalized?(:nfkd)
   end
+
+  def test_bug_21559
+    str = "s\u{1611e}\u{323}\u{1611e}\u{307}\u{1611f}"
+    assert_equal str.unicode_normalize(:nfd), str.unicode_normalize(:nfc).unicode_normalize(:nfd)
+  end
+
+  def test_gurung_khema
+    assert_equal "\u{16121 16121 16121 16121 16121 1611E}", "\u{1611E 16121 16121 16121 16121 16121}".unicode_normalize
+  end
+
+  def test_canonical_ordering
+    a = "\u03B1\u0313\u0300\u0345"
+    a_unordered1 = "\u03B1\u0345\u0313\u0300"
+    a_unordered2 = "\u03B1\u0313\u0345\u0300"
+    u1 = "U\u0308\u0304"
+    u2 = "U\u0304\u0308"
+    s = "s\u0323\u0307"
+    s_unordered = "s\u0307\u0323"
+    o = "\u{1611e}\u{1611e}\u{1611f}"
+    # Actual cases called through String#unicode_normalize
+    assert_equal(s + o, UnicodeNormalize.canonical_ordering_one(s_unordered + o))
+    assert_equal(a[1..], UnicodeNormalize.canonical_ordering_one(a_unordered1[1..]))
+    assert_equal(a[1..] + o, UnicodeNormalize.canonical_ordering_one(a_unordered2[1..] + o))
+    # Artificial cases
+    assert_equal(a + u1 + o + u2 + s, UnicodeNormalize.canonical_ordering_one(a + u1 + o + u2 + s))
+    assert_equal(s[1..] + a + a, UnicodeNormalize.canonical_ordering_one(s_unordered[1..] + a_unordered1 + a_unordered2))
+    assert_equal(o + s + u1 + a + o + a + u2 + o, UnicodeNormalize.canonical_ordering_one(o + s_unordered + u1 + a_unordered1 + o + a_unordered2 + u2 + o))
+  end
 end
diff --git a/test/mri/uri/test_common.rb b/test/mri/uri/test_common.rb
index 6326aec561a..569264005a8 100644
--- a/test/mri/uri/test_common.rb
+++ b/test/mri/uri/test_common.rb
@@ -31,12 +31,14 @@ def test_fallback_constants
 
   def test_parser_switch
     assert_equal(URI::Parser, URI::RFC3986_Parser)
+    assert_equal(URI::PARSER, URI::RFC3986_PARSER)
     refute defined?(URI::REGEXP)
     refute defined?(URI::PATTERN)
 
     URI.parser = URI::RFC2396_PARSER
 
     assert_equal(URI::Parser, URI::RFC2396_Parser)
+    assert_equal(URI::PARSER, URI::RFC2396_PARSER)
     assert defined?(URI::REGEXP)
     assert defined?(URI::PATTERN)
     assert defined?(URI::PATTERN::ESCAPED)
@@ -45,6 +47,7 @@ def test_parser_switch
     URI.parser = URI::RFC3986_PARSER
 
     assert_equal(URI::Parser, URI::RFC3986_Parser)
+    assert_equal(URI::PARSER, URI::RFC3986_PARSER)
     refute defined?(URI::REGEXP)
     refute defined?(URI::PATTERN)
   ensure
@@ -75,7 +78,7 @@ def test_ractor
     return unless defined?(Ractor)
     assert_ractor(<<~RUBY, require: 'uri')
       r = Ractor.new { URI.parse("https://ruby-lang.org/").inspect }
-      assert_equal(URI.parse("https://ruby-lang.org/").inspect, r.take)
+      assert_equal(URI.parse("https://ruby-lang.org/").inspect, r.value)
     RUBY
   end
 
@@ -113,17 +116,18 @@ def test_register_scheme_lowercase
 
   def test_register_scheme_with_symbols
     # Valid schemes from https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
-    some_uri_class = Class.new(URI::Generic)
-    assert_raise(NameError) { URI.register_scheme 'ms-search', some_uri_class }
-    assert_raise(NameError) { URI.register_scheme 'microsoft.windows.camera', some_uri_class }
-    assert_raise(NameError) { URI.register_scheme 'coaps+ws', some_uri_class }
+    list = []
+    %w[ms-search microsoft.windows.camera coaps+ws].each {|name|
+      list << [name, URI.register_scheme(name, Class.new(URI::Generic))]
+    }
 
-    ms_search_class = Class.new(URI::Generic)
-    URI.register_scheme 'MS_SEARCH', ms_search_class
-    begin
-      assert_equal URI::Generic, URI.parse('ms-search://localhost').class
-    ensure
-      URI.const_get(:Schemes).send(:remove_const, :MS_SEARCH)
+    list.each do |scheme, uri_class|
+      assert_equal uri_class, URI.parse("#{scheme}://localhost").class
+    end
+  ensure
+    schemes = URI.const_get(:Schemes)
+    list.each do |scheme, |
+      schemes.send(:remove_const, schemes.escape(scheme))
     end
   end
 
diff --git a/test/mri/uri/test_ftp.rb b/test/mri/uri/test_ftp.rb
index f45bb0667c7..3ad7864490e 100644
--- a/test/mri/uri/test_ftp.rb
+++ b/test/mri/uri/test_ftp.rb
@@ -33,11 +33,11 @@ def test_paths
     # If you think what's below is wrong, please read RubyForge bug 2055,
     # RFC 1738 section 3.2.2, and RFC 2396.
     u = URI.parse('ftp://ftp.example.com/foo/bar/file.ext')
-    assert(u.path == 'foo/bar/file.ext')
+    assert_equal('foo/bar/file.ext', u.path)
     u = URI.parse('ftp://ftp.example.com//foo/bar/file.ext')
-    assert(u.path == '/foo/bar/file.ext')
+    assert_equal('/foo/bar/file.ext', u.path)
     u = URI.parse('ftp://ftp.example.com/%2Ffoo/bar/file.ext')
-    assert(u.path == '/foo/bar/file.ext')
+    assert_equal('/foo/bar/file.ext', u.path)
   end
 
   def test_assemble
@@ -45,8 +45,8 @@ def test_assemble
     # assuming everyone else has implemented RFC 2396.
     uri = URI::FTP.build(['user:password', 'ftp.example.com', nil,
                          '/path/file.zip', 'i'])
-    assert(uri.to_s ==
-           'ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i')
+    assert_equal('ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i',
+                 uri.to_s)
   end
 
   def test_select
diff --git a/test/mri/uri/test_generic.rb b/test/mri/uri/test_generic.rb
index 8209363b82e..94eea71b511 100644
--- a/test/mri/uri/test_generic.rb
+++ b/test/mri/uri/test_generic.rb
@@ -175,6 +175,17 @@ def test_parse
     # must be empty string to identify as path-abempty, not path-absolute
     assert_equal('', url.host)
     assert_equal('http:////example.com', url.to_s)
+
+    # sec-2957667
+    url = URI.parse('http://user:pass@example.com').merge('//example.net')
+    assert_equal('http://example.net', url.to_s)
+    assert_nil(url.userinfo)
+    url = URI.join('http://user:pass@example.com', '//example.net')
+    assert_equal('http://example.net', url.to_s)
+    assert_nil(url.userinfo)
+    url = URI.parse('http://user:pass@example.com') + '//example.net'
+    assert_equal('http://example.net', url.to_s)
+    assert_nil(url.userinfo)
   end
 
   def test_parse_scheme_with_symbols
@@ -229,9 +240,9 @@ def test_merge
     u = URI.parse('http://foo/bar/baz')
     assert_equal(nil, u.merge!(""))
     assert_equal(nil, u.merge!(u))
-    assert(nil != u.merge!("."))
+    refute_nil(u.merge!("."))
     assert_equal('http://foo/bar/', u.to_s)
-    assert(nil != u.merge!("../baz"))
+    refute_nil(u.merge!("../baz"))
     assert_equal('http://foo/baz', u.to_s)
 
     url = URI.parse('http://a/b//c') + 'd//e'
@@ -267,6 +278,16 @@ def test_merge
     assert_equal(u0, u1)
   end
 
+  def test_merge_authority
+    u = URI.parse('http://user:pass@example.com:8080')
+    u0 = URI.parse('http://new.example.org/path')
+    u1 = u.merge('//new.example.org/path')
+    assert_equal(u0, u1)
+    u0 = URI.parse('http://other@example.net')
+    u1 = u.merge('//other@example.net')
+    assert_equal(u0, u1)
+  end
+
   def test_route
     url = URI.parse('http://hoge/a.html').route_to('http://hoge/b.html')
     assert_equal('b.html', url.to_s)
@@ -338,7 +359,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/g', url.to_s)
     url = @base_url.route_to('http://a/b/c/g')
     assert_kind_of(URI::Generic, url)
-    assert('./g' != url.to_s) # ok
+    refute_equal('./g', url.to_s) # ok
     assert_equal('g', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -357,7 +378,7 @@ def test_rfc3986_examples
     assert_equal('http://a/g', url.to_s)
     url = @base_url.route_to('http://a/g')
     assert_kind_of(URI::Generic, url)
-    assert('/g' != url.to_s) # ok
+    refute_equal('/g', url.to_s) # ok
     assert_equal('../../g', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -448,7 +469,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/', url.to_s)
     url = @base_url.route_to('http://a/b/c/')
     assert_kind_of(URI::Generic, url)
-    assert('.' != url.to_s) # ok
+    refute_equal('.', url.to_s) # ok
     assert_equal('./', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -467,7 +488,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/', url.to_s)
     url = @base_url.route_to('http://a/b/')
     assert_kind_of(URI::Generic, url)
-    assert('..' != url.to_s) # ok
+    refute_equal('..', url.to_s) # ok
     assert_equal('../', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -495,7 +516,7 @@ def test_rfc3986_examples
     assert_equal('http://a/', url.to_s)
     url = @base_url.route_to('http://a/')
     assert_kind_of(URI::Generic, url)
-    assert('../..' != url.to_s) # ok
+    refute_equal('../..', url.to_s) # ok
     assert_equal('../../', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -586,7 +607,7 @@ def test_rfc3986_examples
     assert_equal('http://a/g', url.to_s)
     url = @base_url.route_to('http://a/g')
     assert_kind_of(URI::Generic, url)
-    assert('../../../g' != url.to_s)  # ok? yes, it confuses you
+    refute_equal('../../../g', url.to_s)  # ok? yes, it confuses you
     assert_equal('../../g', url.to_s) # and it is clearly
 
 #  http://a/b/c/d;p?q
@@ -596,7 +617,7 @@ def test_rfc3986_examples
     assert_equal('http://a/g', url.to_s)
     url = @base_url.route_to('http://a/g')
     assert_kind_of(URI::Generic, url)
-    assert('../../../../g' != url.to_s) # ok? yes, it confuses you
+    refute_equal('../../../../g', url.to_s) # ok? yes, it confuses you
     assert_equal('../../g', url.to_s)   # and it is clearly
 
 #  http://a/b/c/d;p?q
@@ -606,7 +627,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/g', url.to_s)
     url = @base_url.route_to('http://a/b/g')
     assert_kind_of(URI::Generic, url)
-    assert('./../g' != url.to_s) # ok
+    refute_equal('./../g', url.to_s) # ok
     assert_equal('../g', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -616,7 +637,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/g/', url.to_s)
     url = @base_url.route_to('http://a/b/c/g/')
     assert_kind_of(URI::Generic, url)
-    assert('./g/.' != url.to_s) # ok
+    refute_equal('./g/.', url.to_s) # ok
     assert_equal('g/', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -626,7 +647,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/g/h', url.to_s)
     url = @base_url.route_to('http://a/b/c/g/h')
     assert_kind_of(URI::Generic, url)
-    assert('g/./h' != url.to_s) # ok
+    refute_equal('g/./h', url.to_s) # ok
     assert_equal('g/h', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -636,7 +657,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/h', url.to_s)
     url = @base_url.route_to('http://a/b/c/h')
     assert_kind_of(URI::Generic, url)
-    assert('g/../h' != url.to_s) # ok
+    refute_equal('g/../h', url.to_s) # ok
     assert_equal('h', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -646,7 +667,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/g;x=1/y', url.to_s)
     url = @base_url.route_to('http://a/b/c/g;x=1/y')
     assert_kind_of(URI::Generic, url)
-    assert('g;x=1/./y' != url.to_s) # ok
+    refute_equal('g;x=1/./y', url.to_s) # ok
     assert_equal('g;x=1/y', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -656,7 +677,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/y', url.to_s)
     url = @base_url.route_to('http://a/b/c/y')
     assert_kind_of(URI::Generic, url)
-    assert('g;x=1/../y' != url.to_s) # ok
+    refute_equal('g;x=1/../y', url.to_s) # ok
     assert_equal('y', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -730,17 +751,18 @@ def test_join
   def test_set_component
     uri = URI.parse('http://foo:bar@baz')
     assert_equal('oof', uri.user = 'oof')
-    assert_equal('http://oof:bar@baz', uri.to_s)
+    assert_equal('http://oof@baz', uri.to_s)
     assert_equal('rab', uri.password = 'rab')
     assert_equal('http://oof:rab@baz', uri.to_s)
     assert_equal('foo', uri.userinfo = 'foo')
-    assert_equal('http://foo:rab@baz', uri.to_s)
+    assert_equal('http://foo@baz', uri.to_s)
     assert_equal(['foo', 'bar'], uri.userinfo = ['foo', 'bar'])
     assert_equal('http://foo:bar@baz', uri.to_s)
     assert_equal(['foo'], uri.userinfo = ['foo'])
-    assert_equal('http://foo:bar@baz', uri.to_s)
+    assert_equal('http://foo@baz', uri.to_s)
     assert_equal('zab', uri.host = 'zab')
-    assert_equal('http://foo:bar@zab', uri.to_s)
+    assert_equal('http://zab', uri.to_s)
+    uri.userinfo = ['foo', 'bar']
     uri.port = ""
     assert_nil(uri.port)
     uri.port = "80"
@@ -750,7 +772,8 @@ def test_set_component
     uri.port = " 080 "
     assert_equal(80, uri.port)
     assert_equal(8080, uri.port = 8080)
-    assert_equal('http://foo:bar@zab:8080', uri.to_s)
+    assert_equal('http://zab:8080', uri.to_s)
+    uri = URI.parse('http://foo:bar@zab:8080')
     assert_equal('/', uri.path = '/')
     assert_equal('http://foo:bar@zab:8080/', uri.to_s)
     assert_equal('a=1', uri.query = 'a=1')
@@ -804,18 +827,18 @@ def test_hierarchical
     hierarchical = URI.parse('http://a.b.c/example')
     opaque = URI.parse('mailto:mduerst@ifi.unizh.ch')
 
-    assert hierarchical.hierarchical?
-    refute opaque.hierarchical?
+    assert_predicate hierarchical, :hierarchical?
+    refute_predicate opaque, :hierarchical?
   end
 
   def test_absolute
     abs_uri = URI.parse('http://a.b.c/')
     not_abs = URI.parse('a.b.c')
 
-    refute not_abs.absolute?
+    refute_predicate not_abs, :absolute?
 
-    assert abs_uri.absolute
-    assert abs_uri.absolute?
+    assert_predicate abs_uri, :absolute
+    assert_predicate abs_uri, :absolute?
   end
 
   def test_ipv6
@@ -828,8 +851,10 @@ def test_ipv6
     assert_equal("http://[::1]/bar", u.to_s)
     u.hostname = "::1"
     assert_equal("http://[::1]/bar", u.to_s)
-    u.hostname = ""
-    assert_equal("http:///bar", u.to_s)
+
+    u = URI("file://foo/bar")
+    u.hostname = ''
+    assert_equal("file:///bar", u.to_s)
   end
 
   def test_build
@@ -850,6 +875,19 @@ def test_build
     assert_equal("http://[::1]/bar/baz", u.to_s)
     assert_equal("[::1]", u.host)
     assert_equal("::1", u.hostname)
+
+    assert_raise_with_message(ArgumentError, /URI::Generic/) {
+      URI::Generic.build(nil)
+    }
+
+    c = Class.new(URI::Generic) do
+      def self.component; raise; end
+    end
+    expected = /\(#{URI::Generic::COMPONENT.join(', ')}\)/
+    message = "fallback to URI::Generic::COMPONENT if component raised"
+    assert_raise_with_message(ArgumentError, expected, message) {
+      c.build(nil)
+    }
   end
 
   def test_build2
diff --git a/test/mri/uri/test_http.rb b/test/mri/uri/test_http.rb
index e937b1a26b1..8816d201758 100644
--- a/test/mri/uri/test_http.rb
+++ b/test/mri/uri/test_http.rb
@@ -19,6 +19,10 @@ def test_build
     assert_kind_of(URI::HTTP, u)
   end
 
+  def test_build_empty_host
+    assert_raise(URI::InvalidComponentError) { URI::HTTP.build(host: '') }
+  end
+
   def test_parse
     u = URI.parse('http://a')
     assert_kind_of(URI::HTTP, u)
@@ -33,19 +37,19 @@ def test_normalize
     host = 'aBcD'
     u1 = URI.parse('http://' + host + '/eFg?HiJ')
     u2 = URI.parse('http://' + host.downcase + '/eFg?HiJ')
-    assert(u1.normalize.host == 'abcd')
-    assert(u1.normalize.path == u1.path)
-    assert(u1.normalize == u2.normalize)
-    assert(!u1.normalize.host.equal?(u1.host))
-    assert( u2.normalize.host.equal?(u2.host))
+    assert_equal('abcd', u1.normalize.host)
+    assert_equal(u1.path, u1.normalize.path)
+    assert_equal(u2.normalize, u1.normalize)
+    refute_same(u1.host, u1.normalize.host)
+    assert_same(u2.host, u2.normalize.host)
 
     assert_equal('http://abc/', URI.parse('http://abc').normalize.to_s)
   end
 
   def test_equal
-    assert(URI.parse('http://abc') == URI.parse('http://ABC'))
-    assert(URI.parse('http://abc/def') == URI.parse('http://ABC/def'))
-    assert(URI.parse('http://abc/def') != URI.parse('http://ABC/DEF'))
+    assert_equal(URI.parse('http://ABC'), URI.parse('http://abc'))
+    assert_equal(URI.parse('http://ABC/def'), URI.parse('http://abc/def'))
+    refute_equal(URI.parse('http://ABC/DEF'), URI.parse('http://abc/def'))
   end
 
   def test_request_uri
diff --git a/test/mri/uri/test_mailto.rb b/test/mri/uri/test_mailto.rb
index e7d31421982..6cd33529784 100644
--- a/test/mri/uri/test_mailto.rb
+++ b/test/mri/uri/test_mailto.rb
@@ -141,6 +141,21 @@ def test_initializer
   def test_check_to
     u = URI::MailTo.build(['joe@example.com', 'subject=Ruby'])
 
+    # Valid emails
+    u.to = 'a@valid.com'
+    assert_equal(u.to, 'a@valid.com')
+
+    # Intentionally allowed violations of RFC 5322
+    u.to = 'a..a@valid.com'
+    assert_equal(u.to, 'a..a@valid.com')
+
+    u.to = 'hello.@valid.com'
+    assert_equal(u.to, 'hello.@valid.com')
+
+    u.to = '.hello@valid.com'
+    assert_equal(u.to, '.hello@valid.com')
+
+    # Invalid emails
     assert_raise(URI::InvalidComponentError) do
       u.to = '#1@mail.com'
     end
@@ -148,6 +163,63 @@ def test_check_to
     assert_raise(URI::InvalidComponentError) do
       u.to = '@invalid.email'
     end
+
+    # Invalid host emails
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@.invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.email.'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid..email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@-invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid-.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.-email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.email-'
+    end
+
+    u.to = 'a@'+'invalid'.ljust(63, 'd')+'.email'
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@'+'invalid'.ljust(64, 'd')+'.email'
+    end
+
+    u.to = 'a@invalid.'+'email'.rjust(63, 'e')
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.'+'email'.rjust(64, 'e')
+    end
+  end
+
+  def test_email_regexp
+    re = URI::MailTo::EMAIL_REGEXP
+
+    repeat = 10
+    longlabel = '.' + 'invalid'.ljust(63, 'd')
+    endlabel = ''
+    seq = (1..3).map {|i| 10**i}
+    rehearsal = 10
+    pre = ->(n) {'a@invalid' + longlabel*(n) + endlabel}
+    assert_linear_performance(seq, rehearsal: rehearsal, pre: pre) do |to|
+      repeat.times {re =~ to or flunk}
+    end
+    endlabel = '.' + 'email'.rjust(64, 'd')
+    assert_linear_performance(seq, rehearsal: rehearsal, pre: pre) do |to|
+      repeat.times {re =~ to and flunk}
+    end
   end
 
   def test_to_s
diff --git a/test/mri/uri/test_parser.rb b/test/mri/uri/test_parser.rb
index f455a5cc9bf..c14824f5e84 100644
--- a/test/mri/uri/test_parser.rb
+++ b/test/mri/uri/test_parser.rb
@@ -20,17 +20,17 @@ def test_compare
     u2 = p.parse(url)
     u3 = p.parse(url)
 
-    assert(u0 == u1)
-    assert(u0.eql?(u1))
-    assert(!u0.equal?(u1))
+    assert_equal(u1, u0)
+    assert_send([u0, :eql?, u1])
+    refute_same(u1, u0)
 
-    assert(u1 == u2)
-    assert(!u1.eql?(u2))
-    assert(!u1.equal?(u2))
+    assert_equal(u2, u1)
+    assert_not_send([u1, :eql?, u2])
+    refute_same(u1, u2)
 
-    assert(u2 == u3)
-    assert(u2.eql?(u3))
-    assert(!u2.equal?(u3))
+    assert_equal(u3, u2)
+    assert_send([u2, :eql?, u3])
+    refute_same(u3, u2)
   end
 
   def test_parse_rfc2396_parser
@@ -113,4 +113,12 @@ def test_rfc3986_port_check
       end
     end
   end
+
+  def test_rfc2822_make_regexp
+    parser = URI::RFC2396_Parser.new
+    regexp = parser.make_regexp("HTTP")
+    assert_match(regexp, "HTTP://EXAMPLE.COM/")
+    assert_match(regexp, "http://example.com/")
+    refute_match(regexp, "https://example.com/")
+  end
 end
diff --git a/test/mri/uri/test_ws.rb b/test/mri/uri/test_ws.rb
index f3918f617c4..d63ebd4a460 100644
--- a/test/mri/uri/test_ws.rb
+++ b/test/mri/uri/test_ws.rb
@@ -31,19 +31,19 @@ def test_normalize
     host = 'aBcD'
     u1 = URI.parse('ws://' + host          + '/eFg?HiJ')
     u2 = URI.parse('ws://' + host.downcase + '/eFg?HiJ')
-    assert(u1.normalize.host == 'abcd')
-    assert(u1.normalize.path == u1.path)
-    assert(u1.normalize == u2.normalize)
-    assert(!u1.normalize.host.equal?(u1.host))
-    assert( u2.normalize.host.equal?(u2.host))
+    assert_equal('abcd', u1.normalize.host)
+    assert_equal(u1.path, u1.normalize.path)
+    assert_equal(u2.normalize, u1.normalize)
+    refute_same(u1.host, u1.normalize.host)
+    assert_same(u2.host, u2.normalize.host)
 
     assert_equal('ws://abc/', URI.parse('ws://abc').normalize.to_s)
   end
 
   def test_equal
-    assert(URI.parse('ws://abc') == URI.parse('ws://ABC'))
-    assert(URI.parse('ws://abc/def') == URI.parse('ws://ABC/def'))
-    assert(URI.parse('ws://abc/def') != URI.parse('ws://ABC/DEF'))
+    assert_equal(URI.parse('ws://ABC'), URI.parse('ws://abc'))
+    assert_equal(URI.parse('ws://ABC/def'), URI.parse('ws://abc/def'))
+    refute_equal(URI.parse('ws://ABC/DEF'), URI.parse('ws://abc/def'))
   end
 
   def test_request_uri
diff --git a/test/mri/uri/test_wss.rb b/test/mri/uri/test_wss.rb
index 13a25830591..cbef327cc65 100644
--- a/test/mri/uri/test_wss.rb
+++ b/test/mri/uri/test_wss.rb
@@ -31,19 +31,19 @@ def test_normalize
     host = 'aBcD'
     u1 = URI.parse('wss://' + host          + '/eFg?HiJ')
     u2 = URI.parse('wss://' + host.downcase + '/eFg?HiJ')
-    assert(u1.normalize.host == 'abcd')
-    assert(u1.normalize.path == u1.path)
-    assert(u1.normalize == u2.normalize)
-    assert(!u1.normalize.host.equal?(u1.host))
-    assert( u2.normalize.host.equal?(u2.host))
+    assert_equal('abcd', u1.normalize.host)
+    assert_equal(u1.path, u1.normalize.path)
+    assert_equal(u2.normalize, u1.normalize)
+    refute_same(u1.host, u1.normalize.host)
+    assert_same(u2.host, u2.normalize.host)
 
     assert_equal('wss://abc/', URI.parse('wss://abc').normalize.to_s)
   end
 
   def test_equal
-    assert(URI.parse('wss://abc') == URI.parse('wss://ABC'))
-    assert(URI.parse('wss://abc/def') == URI.parse('wss://ABC/def'))
-    assert(URI.parse('wss://abc/def') != URI.parse('wss://ABC/DEF'))
+    assert_equal(URI.parse('wss://ABC'), URI.parse('wss://abc'))
+    assert_equal(URI.parse('wss://ABC/def'), URI.parse('wss://abc/def'))
+    refute_equal(URI.parse('wss://ABC/DEF'), URI.parse('wss://abc/def'))
   end
 
   def test_request_uri
diff --git a/test/mri/win32ole/available_ole.rb b/test/mri/win32ole/available_ole.rb
deleted file mode 100644
index af397e00b59..00000000000
--- a/test/mri/win32ole/available_ole.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-if defined?(WIN32OLE)
-  module AvailableOLE
-    module_function
-
-    def sysmon_available?
-      WIN32OLE::Type.new('System Monitor Control', 'SystemMonitor')
-      true
-    rescue
-      false
-    end
-
-    def ado_available?
-      WIN32OLE.new('ADODB.Connection')
-      true
-    rescue
-      false
-    end
-
-    def msxml_available?
-      !WIN32OLE::TypeLib.typelibs.find { |t| t.name.start_with?('Microsoft XML') }.nil?
-    end
-
-    def event_param
-      method = if msxml_available?
-                 typelib = WIN32OLE::TypeLib.typelibs.find { |t| t.name.start_with?('Microsoft XML') }
-                 ole_type = WIN32OLE::Type.new(typelib.name, 'IVBSAXContentHandler')
-                 WIN32OLE::Method.new(ole_type, 'startElement')
-               elsif ado_available?
-                 typelib = WIN32OLE.new('ADODB.Connection').ole_typelib
-                 ole_type = WIN32OLE::Type.new(typelib.name, 'Connection')
-                 WIN32OLE::Method.new(ole_type, 'WillConnect')
-               end
-      method && method.params[0]
-    end
-  end
-end
diff --git a/test/mri/win32ole/err_in_callback.rb b/test/mri/win32ole/err_in_callback.rb
deleted file mode 100644
index baecf780b67..00000000000
--- a/test/mri/win32ole/err_in_callback.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-db = WIN32OLE.new('ADODB.Connection')
-db.connectionString = "Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-ev = WIN32OLE::Event.new(db)
-ev.on_event('WillConnect') {|*args|
-  foo
-}
-db.open
-WIN32OLE::Event.message_loop
diff --git a/test/mri/win32ole/orig_data.csv b/test/mri/win32ole/orig_data.csv
deleted file mode 100644
index 3931c6ad1b9..00000000000
--- a/test/mri/win32ole/orig_data.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-ID,VALUE
-1,"A"
-2,"B"
-3,"C"
-4,"B"
diff --git a/test/mri/win32ole/test_err_in_callback.rb b/test/mri/win32ole/test_err_in_callback.rb
deleted file mode 100644
index bea5781bc9e..00000000000
--- a/test/mri/win32ole/test_err_in_callback.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: false
-#
-# test Win32OLE avoids cfp consistency error when the exception raised
-# in WIN32OLE::Event handler block. [ruby-dev:35450]
-#
-
-begin
-  require 'win32ole'
-rescue LoadError
-end
-if defined?(WIN32OLE)
-  require 'mkmf'
-  require 'pathname'
-  require 'test/unit'
-  require 'tmpdir'
-  class TestErrInCallBack < Test::Unit::TestCase
-    def setup
-      @ruby = nil
-      if File.exist?("./" + CONFIG["RUBY_INSTALL_NAME"] + CONFIG["EXEEXT"])
-        sep = File::ALT_SEPARATOR || "/"
-        @ruby = "." + sep + CONFIG["RUBY_INSTALL_NAME"]
-        cwd = Pathname.new(File.expand_path('.'))
-        @iopt = $:.map {|e|
-          " -I " + (Pathname.new(e).relative_path_from(cwd).to_s rescue e)
-        }.join("")
-        script = File.join(File.dirname(__FILE__), "err_in_callback.rb")
-        @script = Pathname.new(script).relative_path_from(cwd).to_s rescue script
-      end
-    end
-
-    def available_adodb?
-      begin
-        WIN32OLE.new('ADODB.Connection')
-      rescue WIN32OLE::RuntimeError
-        return false
-      end
-      return true
-    end
-
-    def test_err_in_callback
-      omit "'ADODB.Connection' is not available" unless available_adodb?
-      if @ruby
-        Dir.mktmpdir do |tmpdir|
-          logfile = File.join(tmpdir, "test_err_in_callback.log")
-          cmd = "#{@ruby} -v #{@iopt} #{@script} > #{logfile.gsub(%r(/), '\\')} 2>&1"
-          system(cmd)
-          str = ""
-          open(logfile) {|ifs|
-            str = ifs.read
-          }
-          assert_match(/NameError/, str)
-        end
-      end
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_folderitem2_invokeverb.rb b/test/mri/win32ole/test_folderitem2_invokeverb.rb
deleted file mode 100644
index a1c2b2f472c..00000000000
--- a/test/mri/win32ole/test_folderitem2_invokeverb.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: false
-#
-# This script check that Win32OLE can execute InvokeVerb method of FolderItem2.
-#
-
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE)
-  class TestInvokeVerb < Test::Unit::TestCase
-    def setup
-      # make dummy file for InvokeVerb test.
-      @fso = WIN32OLE.new('Scripting.FileSystemObject')
-      dummy_file = @fso.GetTempName
-      @cfolder = @fso.getFolder(".")
-      f = @cfolder.CreateTextFile(dummy_file)
-      f.close
-      @dummy_path = @cfolder.path + "\\" + dummy_file
-
-      shell=WIN32OLE.new('Shell.Application')
-      @nsp = shell.NameSpace(@cfolder.path)
-      @fi2 = @nsp.parseName(dummy_file)
-    end
-
-    def find_link(path)
-      arlink = []
-      @cfolder.files.each do |f|
-        if /\.lnk$/ =~ f.path
-          linkinfo = @nsp.parseName(f.name).getLink
-          arlink.push f if linkinfo.path == path
-        end
-      end
-      arlink
-    end
-
-    def test_invokeverb
-      # in Windows Vista (not tested), Windows 7
-      # The verb must be in English.
-      # Creating Shortcut is "Link"
-      links = find_link(@dummy_path)
-      assert_equal(0, links.size)
-
-      # Now create shortcut to @dummy_path
-      arg = WIN32OLE::Variant.new("Link")
-      @fi2.InvokeVerb(arg)
-
-      # Now search shortcut to @dummy_path
-      links = find_link(@dummy_path)
-      assert_equal(1, links.size)
-      @lpath = links[0].path
-    end
-
-    def teardown
-      if @lpath
-        @fso.deleteFile(@lpath)
-      end
-      if @dummy_path
-        @fso.deleteFile(@dummy_path)
-      end
-    end
-
-  end
-end
diff --git a/test/mri/win32ole/test_nil2vtempty.rb b/test/mri/win32ole/test_nil2vtempty.rb
deleted file mode 100644
index bd864036766..00000000000
--- a/test/mri/win32ole/test_nil2vtempty.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: false
-# This is test script to check that WIN32OLE should convert nil to VT_EMPTY in second try.
-# [ruby-talk:137054]
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE)
-  class TestNIL2VT_EMPTY < Test::Unit::TestCase
-    def setup
-      fs = WIN32OLE.new('Scripting.FileSystemObject')
-      @path = fs.GetFolder(".").path
-    end
-    def test_openSchema
-      con = nil
-      begin
-        con = WIN32OLE.new('ADODB.Connection')
-        con.connectionString = "Provider=MSDASQL;Extended Properties="
-        con.connectionString +="\"DRIVER={Microsoft Text Driver (*.txt; *.csv)};DBQ=#{@path}\""
-        con.open
-      rescue
-        con = nil
-      end
-      if con
-        rs = con.openSchema(4, [nil,nil,"DUMMY", "TABLE"])
-        assert(rs)
-        assert_equal("_Recordset", rs.ole_type.name)
-
-        rs = con.openSchema(4, [WIN32OLE::Variant::Empty, WIN32OLE::Variant::Empty, "DUMMY", "TABLE"])
-        assert(rs)
-        assert_equal("_Recordset", rs.ole_type.name)
-      end
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_ole_methods.rb b/test/mri/win32ole/test_ole_methods.rb
deleted file mode 100644
index fbade04e482..00000000000
--- a/test/mri/win32ole/test_ole_methods.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-#
-# This is test for [ruby-talk:196897]
-#
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_FOR_PROPERTYPUTREF < Test::Unit::TestCase
-
-    def setup
-      @obj = WIN32OLE.new('Scripting.Dictionary')
-    end
-
-    def test_ole_methods
-      x = @obj.ole_methods.select {|m|
-        m.invoke_kind == 'PROPERTYPUTREF'
-      }
-      assert_equal(1, x.size)
-      assert_equal('Item', x[0].name)
-    end
-
-    def test_ole_put_methods
-      x = @obj.ole_put_methods.select {|m|
-        m.invoke_kind == 'PROPERTYPUTREF'
-      }
-      assert_equal(1, x.size)
-      assert_equal('Item', x[0].name)
-    end
-
-  end
-end
diff --git a/test/mri/win32ole/test_propertyputref.rb b/test/mri/win32ole/test_propertyputref.rb
deleted file mode 100644
index 83418140c2e..00000000000
--- a/test/mri/win32ole/test_propertyputref.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_PROPERTYPUTREF < Test::Unit::TestCase
-    def setup
-      begin
-        @sapi = WIN32OLE.new('SAPI.SpVoice')
-        @sv = @sapi.voice
-      rescue WIN32OLE::RuntimeError
-        @sapi = nil
-      end
-    end
-    def test_sapi
-      if @sapi
-        new_id = @sapi.getvoices.item(0).Id
-        @sapi.voice = @sapi.getvoices.item(0)
-        assert_equal(new_id, @sapi.voice.Id)
-      end
-    end
-    def teardown
-      if @sapi
-        @sapi.voice = @sv
-      end
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_thread.rb b/test/mri/win32ole/test_thread.rb
deleted file mode 100644
index b30b2349c5f..00000000000
--- a/test/mri/win32ole/test_thread.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_THREAD < Test::Unit::TestCase
-    #
-    # test for Bug #2618(ruby-core:27634)
-    #
-    def assert_creating_win32ole_object_in_thread(meth)
-      t = Thread.__send__(meth) {
-        WIN32OLE.new('Scripting.Dictionary')
-      }
-      assert_nothing_raised(WIN32OLE::RuntimeError, "[Bug #2618] Thread.#{meth}") {
-        t.join
-      }
-    end
-
-    def test_creating_win32ole_object_in_thread_new
-      assert_creating_win32ole_object_in_thread(:new)
-    end
-
-    def test_creating_win32ole_object_in_thread_start
-      assert_creating_win32ole_object_in_thread(:start)
-    end
-
-    def test_creating_win32ole_object_in_thread_fork
-      assert_creating_win32ole_object_in_thread(:fork)
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole.rb b/test/mri/win32ole/test_win32ole.rb
deleted file mode 100644
index b0c147b3116..00000000000
--- a/test/mri/win32ole/test_win32ole.rb
+++ /dev/null
@@ -1,536 +0,0 @@
-# coding: us-ascii
-# frozen_string_literal: false
-
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE)
-  module CONST1
-  end
-  module CONST2
-  end
-
-  module TestCaseForDict
-    def test_convert_bignum
-      @dict1.add("a", 9999999999)
-      @dict1.add("b", 999999999)
-      @dict1.add("c", @dict1.item("b") * 10 + 9)
-      assert_equal(9999999999, @dict1.item("a"))
-      assert_equal(9999999999, @dict1.item("c"))
-    end
-    def test_add
-      @dict1.add("a", 1000)
-      assert_equal(1000, @dict1.item("a"))
-    end
-    def test_setproperty_equal_ended
-      @dict1.compareMode = 1
-      @dict1.add("one", 1)
-      assert_equal(1, @dict1.item("ONE"))
-      @dict2.add("one", 1)
-      assert_nil(@dict2.item("ONE"))
-      assert_equal(1, @dict2.item("one"))
-    end
-    def test_non_exist_property
-      assert_raise(WIN32OLE::RuntimeError) {
-        @dict1.unknown_property = 1
-      }
-    end
-
-    def test_raise_message
-      exc = assert_raise(WIN32OLE::RuntimeError) {
-        @dict1.add
-      }
-      assert_match(/^\(in OLE method `add': \)/, exc.message) #`
-
-      exc = assert_raise(WIN32OLE::RuntimeError) {
-        @dict1._invoke(1, [], [])
-      }
-      assert_match(/^\(in OLE method `<dispatch id:1>': \)/, exc.message) #`
-
-      exc = assert_raise(WIN32OLE::RuntimeError) {
-        @dict1.compareMode = -1
-      }
-      assert_match(/^\(in setting property `compareMode': \)/, exc.message) #`
-    end
-
-    def test_no_method_error
-      exc = assert_raise(NoMethodError) {
-        @dict1.non_exist_method
-      }
-      assert_match(/non_exist_method/, exc.message)
-      assert_kind_of(WIN32OLE, exc.receiver)
-    end
-
-    def test_ole_methods
-      methods = @dict1.ole_methods
-      mnames = methods.collect {|m|
-        m.name
-      }
-      assert_include(mnames, 'Add')
-    end
-
-    def test_methods
-      methods = @dict1.methods
-      assert_include(methods, :Add)
-    end
-
-    def test_ole_func_methods
-      methods = @dict1.ole_func_methods
-      mnames = methods.collect {|m|
-        m.name
-      }
-      assert_include(mnames, 'Add')
-    end
-
-    def test_ole_put_methods
-      methods = @dict1.ole_put_methods
-      mnames = methods.collect {|m|
-        m.name
-      }
-      assert_include(mnames, 'CompareMode')
-    end
-
-    def test_ole_get_methods
-      methods = @dict1.ole_get_methods
-      mnames = methods.collect {|m|
-        m.name
-      }
-      assert_include(mnames, 'Count')
-    end
-
-    def test_ole_method_help
-      minfo = @dict1.ole_method_help("Add")
-      assert_equal(2, minfo.size_params)
-    end
-
-    def test_ole_typelib
-      tlib = @dict1.ole_typelib
-      assert_equal("Microsoft Scripting Runtime", tlib.name);
-    end
-
-    def test_each
-      @dict1.add("one", 1)
-      @dict1.add("two", 2)
-      i = 0
-      @dict1.keys.each do |item|
-        i += 1
-      end
-      assert_equal(2, i)
-    end
-
-    def test_bracket
-      @dict1.add("foo", "FOO")
-      assert_equal("FOO", @dict1.item("foo"))
-      assert_equal("FOO", @dict1["foo"])
-    end
-
-    def test_bracket_equal
-      @dict1.add("foo", "FOO")
-      @dict1["foo"] = "BAR"
-      assert_equal("BAR", @dict1["foo"])
-    end
-
-    def test_bracket_with_numkey
-      @dict1.add(1, "ONE")
-      @dict1.add(2, "two")
-      assert_equal("ONE", @dict1[1])
-      @dict1[2] = "TWO"
-      assert_equal("TWO", @dict1[2])
-    end
-
-    def test_invoke_with_array
-      @dict1.add("ary1", [1,2,3])
-      assert_equal([1,2,3], @dict1["ary1"])
-
-      @dict1.add("ary2", [[1,2,"a"], [3,4,"b"]])
-      assert_equal([[1,2,"a"], [3,4,"b"]], @dict1["ary2"])
-
-      @dict1.add("ary3", [[[1]]])
-      assert_equal([[[1]]], @dict1["ary3"])
-
-      @dict1.add("ary4", [[[1], [2], [3]], [[4], [5], [6]]])
-      assert_equal([[[1],[2], [3]], [[4], [5], [6]]], @dict1["ary4"])
-    end
-  end
-
-  class TestWin32OLE < Test::Unit::TestCase
-    include TestCaseForDict
-    def setup
-      @dict1 = WIN32OLE.new('Scripting.Dictionary')
-      @dict2 = WIN32OLE.new('Scripting.Dictionary')
-    end
-    def test_s_new
-      assert_instance_of(WIN32OLE, @dict1)
-      assert_instance_of(WIN32OLE, @dict2)
-    end
-
-    def test_s_new_exc
-      assert_raise(TypeError) {
-        WIN32OLE.new(1)
-      }
-      assert_raise(TypeError) {
-        WIN32OLE.new("Scripting.Dictionary", 1)
-      }
-    end
-
-    def test_s_new_DCOM
-      rshell = WIN32OLE.new("Shell.Application")
-      assert_instance_of(WIN32OLE, rshell)
-    end
-
-    def test_s_new_from_clsid
-      shell = WIN32OLE.new("{13709620-C279-11CE-A49E-444553540000}")
-      assert_instance_of(WIN32OLE, shell)
-      exc = assert_raise(WIN32OLE::RuntimeError) {
-        WIN32OLE.new("{000}")
-      }
-      assert_match(/unknown OLE server: `\{000\}'/, exc.message) #`
-    end
-
-    def test_s_connect
-      obj = WIN32OLE.connect("winmgmts:")
-      assert_instance_of(WIN32OLE, obj)
-    end
-
-    def test_s_connect_exc
-      assert_raise(TypeError) {
-        WIN32OLE.connect(1)
-      }
-    end
-
-    def test_invoke_accept_symbol_hash_key
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      afolder = fso.getFolder(".")
-      bfolder = fso.getFolder({"FolderPath" => "."})
-      cfolder = fso.getFolder({:FolderPath => "."})
-      assert_equal(afolder.path, bfolder.path)
-      assert_equal(afolder.path, cfolder.path)
-      fso = nil
-    end
-
-    def test_setproperty
-      installer = WIN32OLE.new("WindowsInstaller.Installer")
-      record = installer.CreateRecord(2)
-      # this is the way to set property with argument in Win32OLE.
-      record.setproperty( "StringData", 1, 'dddd')
-      assert_equal('dddd', record.StringData(1))
-    end
-
-    def test_ole_type
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      tobj = fso.ole_type
-      assert_match(/^IFileSystem/, tobj.name)
-    end
-
-    def test_ole_obj_help
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      tobj = fso.ole_obj_help
-      assert_match(/^IFileSystem/, tobj.name)
-    end
-
-
-    def test_invoke_hash_key_non_str_sym
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      begin
-        fso.getFolder({1 => "."})
-        assert(false)
-      rescue TypeError
-        assert(true)
-      end
-      fso = nil
-    end
-
-    def test_get_win32ole_object
-      shell = WIN32OLE.new('Shell.Application')
-      folder = shell.nameSpace(0)
-      assert_instance_of(WIN32OLE, folder)
-    end
-
-    def test_invoke_accept_multi_hash_key
-      shell = WIN32OLE.new('Shell.Application')
-      folder = shell.nameSpace(0)
-      item = folder.items.item(0)
-      name = folder.getDetailsOf(item, 0)
-      assert_equal(item.name, name)
-      name = folder.getDetailsOf({:vItem => item, :iColumn => 0})
-      assert_equal(item.name, name)
-      name = folder.getDetailsOf({"vItem" => item, :iColumn => 0})
-      assert_equal(item.name, name)
-    end
-
-    def test_ole_invoke_with_named_arg_last
-      shell = WIN32OLE.new('Shell.Application')
-      folder = shell.nameSpace(0)
-      item = folder.items.item(0)
-      name = folder.getDetailsOf(item, {:iColumn => 0})
-      assert_equal(item.name, name)
-    end
-
-    def test__invoke
-      shell=WIN32OLE.new('Shell.Application')
-      assert_equal(shell.NameSpace(0).title, shell._invoke(0x60020002, [0], [WIN32OLE::VARIANT::VT_VARIANT]).title)
-    end
-
-    def test_ole_query_interface
-      shell=WIN32OLE.new('Shell.Application')
-      assert_raise(ArgumentError) {
-        shell.ole_query_interface
-      }
-      assert_raise(TypeError) {
-        shell.ole_query_interface(0x11223344)
-      }
-      shell2 = shell.ole_query_interface('{A4C6892C-3BA9-11D2-9DEA-00C04FB16162}')
-      assert_instance_of(WIN32OLE, shell2)
-    end
-
-    def test_ole_respond_to
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      assert(fso.ole_respond_to?('getFolder'))
-      assert(fso.ole_respond_to?('GETFOLDER'))
-      assert(fso.ole_respond_to?(:getFolder))
-      assert(!fso.ole_respond_to?('XXXXX'))
-      assert_raise(TypeError) {
-        assert_raise(fso.ole_respond_to?(1))
-      }
-    end
-
-    def test_invoke
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      assert(fso.invoke(:getFolder, "."))
-      assert(fso.invoke('getFolder', "."))
-    end
-
-    def test_s_const_load
-      assert(!defined?(CONST1::SsfWINDOWS))
-      shell=WIN32OLE.new('Shell.Application')
-      WIN32OLE.const_load(shell, CONST1)
-      assert_equal(36, CONST1::SsfWINDOWS)
-
-      assert(!defined?(CONST2::SsfWINDOWS))
-      WIN32OLE.const_load("Microsoft Shell Controls And Automation", CONST2)
-      assert_equal(36, CONST2::SsfWINDOWS)
-    end
-
-    def test_s_create_guid
-      guid = WIN32OLE.create_guid
-      assert_match(/^\{[A-Z0-9]{8}\-[A-Z0-9]{4}\-[A-Z0-9]{4}\-[A-Z0-9]{4}\-[A-Z0-9]{12}/,
-                   guid)
-    end
-
-    #
-    # WIN32OLE.codepage is initialized according to Encoding.default_external.
-    #
-    # def test_s_codepage
-    #   assert_equal(WIN32OLE::CP_ACP, WIN32OLE.codepage)
-    # end
-
-    def test_s_codepage_set
-      cp = WIN32OLE.codepage
-      WIN32OLE.codepage = WIN32OLE::CP_UTF8
-      assert_equal(WIN32OLE::CP_UTF8, WIN32OLE.codepage)
-      WIN32OLE.codepage = cp
-    end
-
-    def test_s_codepage_changed
-      omit if RUBY_PLATFORM.match("mswin")
-
-      cp = WIN32OLE.codepage
-      fso = WIN32OLE.new("Scripting.FileSystemObject")
-      fname = fso.getTempName
-      begin
-        obj = WIN32OLE::Variant.new([0x3042].pack("U*").force_encoding("UTF-8"))
-        WIN32OLE.codepage = WIN32OLE::CP_UTF8
-        assert_equal("\xE3\x81\x82".force_encoding("CP65001"), obj.value)
-
-        begin
-          WIN32OLE.codepage = 932 # Windows-31J
-        rescue WIN32OLE::RuntimeError
-        end
-        if (WIN32OLE.codepage == 932)
-          assert_equal("\x82\xA0".force_encoding("CP932"), obj.value)
-        end
-
-        begin
-          WIN32OLE.codepage = 20932 # MS EUC-JP
-        rescue WIN32OLE::RuntimeError
-        end
-        if (WIN32OLE.codepage == 20932)
-          assert_equal("\xA4\xA2".force_encoding("CP20932"), obj.value)
-        end
-
-        WIN32OLE.codepage = cp
-        file = fso.opentextfile(fname, 2, true)
-        test_str = [0x3042].pack("U*").encode("UTF-16LE")
-        begin
-          file.write test_str.force_encoding("UTF-16")
-        ensure
-          file.close
-        end
-        str = ""
-        open(fname, "r:ascii-8bit") {|ifs|
-          str = ifs.read
-        }
-        assert_equal(test_str.force_encoding("ascii-8bit"), str)
-
-        # This test fail if codepage 20932 (euc) is not installed.
-        begin
-          WIN32OLE.codepage = 20932
-        rescue WIN32OLE::RuntimeError
-        end
-        if (WIN32OLE.codepage == 20932)
-          WIN32OLE.codepage = cp
-          file = fso.opentextfile(fname, 2, true)
-          begin
-            file.write [164, 162].pack("c*").force_encoding("UTF-16")
-          ensure
-            file.close
-          end
-          open(fname, "r:ascii-8bit") {|ifs|
-            str = ifs.read
-          }
-          assert_equal("\244\242", str)
-        end
-
-      ensure
-        WIN32OLE.codepage = cp
-        if (File.exist?(fname))
-          File.unlink(fname)
-        end
-      end
-    end
-
-    def test_cp51932
-      cp = WIN32OLE.codepage
-      begin
-        obj = WIN32OLE::Variant.new([0x3042].pack("U*").force_encoding("UTF-8"))
-        begin
-          WIN32OLE.codepage = 51932
-        rescue
-        end
-        if WIN32OLE.codepage == 51932
-          assert_equal("\xA4\xA2".force_encoding("CP51932"), obj.value)
-        end
-      ensure
-        WIN32OLE.codepage = cp
-      end
-    end
-
-    def test_s_locale
-      assert_equal(WIN32OLE::LOCALE_SYSTEM_DEFAULT, WIN32OLE.locale)
-    end
-
-    def test_s_locale_set
-      begin
-        begin
-          WIN32OLE.locale = 1041
-        rescue WIN32OLE::RuntimeError
-          STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_s_locale_set is skipped(Japanese locale is not installed)")
-          return
-        end
-        assert_equal(1041, WIN32OLE.locale)
-        WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-        assert_raise(WIN32OLE::RuntimeError) {
-          WIN32OLE.locale = 111
-        }
-        assert_equal(WIN32OLE::LOCALE_SYSTEM_DEFAULT, WIN32OLE.locale)
-      ensure
-        WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-      end
-    end
-
-    def test_s_locale_change
-      begin
-        begin
-          WIN32OLE.locale = 0x0411
-        rescue WIN32OLE::RuntimeError
-        end
-        if WIN32OLE.locale == 0x0411
-          obj = WIN32OLE::Variant.new("\\100,000", WIN32OLE::VARIANT::VT_CY)
-          assert_equal("100000", obj.value)
-          assert_raise(WIN32OLE::RuntimeError) {
-            obj = WIN32OLE::Variant.new("$100.000", WIN32OLE::VARIANT::VT_CY)
-          }
-        else
-          STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_s_locale_change is skipped(Japanese locale is not installed)")
-        end
-
-        begin
-          WIN32OLE.locale = 1033
-        rescue WIN32OLE::RuntimeError
-        end
-        if WIN32OLE.locale == 1033
-          obj = WIN32OLE::Variant.new("$100,000", WIN32OLE::VARIANT::VT_CY)
-          assert_equal("100000", obj.value)
-        else
-          STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_s_locale_change is skipped(US English locale is not installed)")
-        end
-      ensure
-        WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-      end
-    end
-
-    def test_const_CP_ACP
-      assert_equal(0, WIN32OLE::CP_ACP)
-    end
-
-    def test_const_CP_OEMCP
-      assert_equal(1, WIN32OLE::CP_OEMCP)
-    end
-
-    def test_const_CP_MACCP
-      assert_equal(2, WIN32OLE::CP_MACCP)
-    end
-
-    def test_const_CP_THREAD_ACP
-      assert_equal(3, WIN32OLE::CP_THREAD_ACP)
-    end
-
-    def test_const_CP_SYMBOL
-      assert_equal(42, WIN32OLE::CP_SYMBOL)
-    end
-
-    def test_const_CP_UTF7
-      assert_equal(65000, WIN32OLE::CP_UTF7)
-    end
-
-    def test_const_CP_UTF8
-      assert_equal(65001, WIN32OLE::CP_UTF8)
-    end
-
-    def test_const_LOCALE_SYSTEM_DEFAULT
-      assert_equal(0x0800, WIN32OLE::LOCALE_SYSTEM_DEFAULT);
-    end
-
-    def test_const_LOCALE_USER_DEFAULT
-      assert_equal(0x0400, WIN32OLE::LOCALE_USER_DEFAULT);
-    end
-
-    def test_method_missing
-      assert_raise(ArgumentError) {@dict1.method_missing}
-      assert_raise(TypeError) {@dict1.method_missing(1)}
-      assert_raise(ArgumentError) {@dict1.method_missing("foo=")}
-      assert_raise(ArgumentError) {@dict1.method_missing("foo=", 1, 2)}
-    end
-  end
-
-  # test of subclass of WIN32OLE
-  class MyDict < WIN32OLE
-    def MyDict.new
-      super('Scripting.Dictionary')
-    end
-  end
-  class TestMyDict < Test::Unit::TestCase
-    include TestCaseForDict
-    def setup
-      @dict1 = MyDict.new
-      @dict2 = MyDict.new
-    end
-    def test_s_new
-      assert_instance_of(MyDict, @dict1)
-      assert_instance_of(MyDict, @dict2)
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_event.rb b/test/mri/win32ole/test_win32ole_event.rb
deleted file mode 100644
index da3ee8567e8..00000000000
--- a/test/mri/win32ole/test_win32ole_event.rb
+++ /dev/null
@@ -1,407 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-ado_installed =
-  if defined?(WIN32OLE)
-    db = nil
-    begin
-      db = WIN32OLE.new('ADODB.Connection')
-      db.connectionString = "Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-      db.open
-      db.close
-      db = nil
-      true
-    rescue
-    end
-  end
-
-swbemsink_available =
-  if defined?(WIN32OLE)
-    begin
-      WIN32OLE.new('WbemScripting.SWbemSink')
-      true
-    rescue
-    end
-  end
-
-if defined?(WIN32OLE::Event)
-  class TestWIN32OLE_EVENT < Test::Unit::TestCase
-    def test_s_new_exception
-      assert_raise(TypeError) {
-        WIN32OLE::Event.new("A")
-      }
-    end
-    def test_s_new_non_exist_event
-      dict = WIN32OLE.new('Scripting.Dictionary')
-      assert_raise(RuntimeError) {
-        WIN32OLE::Event.new(dict)
-      }
-    end
-  end
-
-  if swbemsink_available
-    class TestWIN32OLE_EVENT_SWbemSink < Test::Unit::TestCase
-      def setup
-        @wmi = WIN32OLE.connect('winmgmts://localhost/root/cimv2')
-        @sws = WIN32OLE.new('WbemScripting.SWbemSink')
-        @event = @event1 = @event2 = ""
-        @sql = "SELECT * FROM __InstanceModificationEvent WITHIN 1 WHERE TargetInstance ISA 'Win32_LocalTime'"
-      end
-
-      def message_loop(watch_ivar = nil)
-        if watch_ivar
-          orig_ivar = instance_variable_get(watch_ivar)
-        end
-
-        2.times do
-          WIN32OLE::Event.message_loop
-          sleep 1
-        end
-
-        if watch_ivar
-          # wait until event is proceeded
-          tries = 0
-          seconds = EnvUtil.apply_timeout_scale(1)
-          while tries < 5 && instance_variable_get(watch_ivar) == orig_ivar
-            $stderr.puts "test_win32ole_event.rb: retrying and sleeping #{seconds}s until #{watch_ivar} is changed from #{orig_ivar.inspect}..."
-            WIN32OLE::Event.message_loop
-            sleep(seconds)
-            tries += 1
-            seconds *= 2 # sleep at most 31s in total
-          end
-        end
-      end
-
-      def default_handler(event, *args)
-        @event += event
-      end
-
-      def handler1
-        @event1 = "handler1"
-      end
-
-      def test_s_new_non_exist_event
-        assert_raise(RuntimeError) {
-          WIN32OLE::Event.new(@sws, 'XXXXX')
-        }
-      end
-
-      def test_s_new
-        obj = WIN32OLE::Event.new(@sws, 'ISWbemSinkEvents')
-        assert_instance_of(WIN32OLE::Event, obj)
-        obj = WIN32OLE::Event.new(@sws)
-        assert_instance_of(WIN32OLE::Event, obj)
-      end
-
-      def test_s_new_loop
-        exec_notification_query_async
-        ev = WIN32OLE::Event.new(@sws)
-        ev.on_event {|*args| default_handler(*args)}
-        message_loop
-        10.times do |i|
-          WIN32OLE::Event.new(@sws)
-          message_loop
-          GC.start
-        end
-
-        # @event randomly becomes "OnCompleted" here. Try to wait until it matches.
-        # https://ci.appveyor.com/project/ruby/ruby/builds/19963142/job/8gaxepksa0i3b998
-        assert_match_with_retries(/OnObjectReady/, :@event)
-      end
-
-      def test_on_event
-        exec_notification_query_async
-        ev = WIN32OLE::Event.new(@sws, 'ISWbemSinkEvents')
-        ev.on_event {|*args| default_handler(*args)}
-        message_loop(:@event)
-        assert_match(/OnObjectReady/, @event)
-      end
-
-      def test_on_event_symbol
-        exec_notification_query_async
-        ev = WIN32OLE::Event.new(@sws)
-        ev.on_event(:OnObjectReady) {|*args|
-          handler1
-        }
-        message_loop(:@event1)
-        assert_equal("handler1", @event1)
-      end
-
-      private
-      def exec_notification_query_async
-        @wmi.ExecNotificationQueryAsync(@sws, @sql)
-      rescue => e
-        if /OLE error code:80041008 in SWbemServicesEx/ =~ e.message
-          omit "No administrator privilege?"
-        end
-        raise
-      end
-
-      def assert_match_with_retries(regexp, ivarname)
-        ivar = instance_variable_get(ivarname)
-
-        tries = 0
-        while tries < 6 && !ivar.match(regexp)
-          $stderr.puts "test_win32ole_event.rb: retrying until #{ivarname} (#{ivar}) matches #{regexp} (tries: #{tries})..."
-          sleep(2 ** tries) # sleep at most 63s in total
-          ivar = instance_variable_get(ivarname)
-          tries += 1
-        end
-
-        assert_match(regexp, ivar)
-      end
-    end
-  end
-
-  if ado_installed
-    class TestWIN32OLE_EVENT_ADO < Test::Unit::TestCase
-      CONNSTR="Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-      module ADO
-      end
-      def message_loop
-        WIN32OLE::Event.message_loop
-      end
-
-      def default_handler(event, *args)
-        @event += event
-      end
-
-      def setup
-        @db = WIN32OLE.new('ADODB.Connection')
-        if !defined?(ADO::AdStateOpen)
-          WIN32OLE.const_load(@db, ADO)
-        end
-        @db.connectionString = CONNSTR
-        @event = ""
-        @event2 = ""
-        @event3 = ""
-      end
-
-      def test_on_event2
-        ev = WIN32OLE::Event.new(@db, 'ConnectionEvents')
-        ev.on_event('WillConnect') {|*args| handler1}
-        ev.on_event('WillConnect') {|*args| handler2}
-        @db.open
-        message_loop
-        assert_equal("handler2", @event2)
-      end
-
-      def test_on_event4
-        ev = WIN32OLE::Event.new(@db, 'ConnectionEvents')
-        ev.on_event{|*args| handler1}
-        ev.on_event{|*args| handler2}
-        ev.on_event('WillConnect'){|*args| handler3(*args)}
-        @db.open
-        message_loop
-        assert_equal(CONNSTR, @event3)
-        assert("handler2", @event2)
-      end
-
-      def test_on_event5
-        ev = WIN32OLE::Event.new(@db, 'ConnectionEvents')
-        ev.on_event {|*args| default_handler(*args)}
-        ev.on_event('WillConnect'){|*args| handler3(*args)}
-        @db.open
-        message_loop
-        assert_match(/ConnectComplete/, @event)
-        assert(/WillConnect/ !~ @event)
-        assert_equal(CONNSTR, @event3)
-      end
-
-      def test_unadvise
-        ev = WIN32OLE::Event.new(@db, 'ConnectionEvents')
-        ev.on_event {|*args| default_handler(*args)}
-        @db.open
-        message_loop
-        assert_match(/WillConnect/, @event)
-        ev.unadvise
-        @event = ""
-        @db.close
-        @db.open
-        message_loop
-        assert_equal("", @event);
-        assert_raise(WIN32OLE::RuntimeError) {
-          ev.on_event {|*args| default_handler(*args)}
-        }
-      end
-
-
-      def test_on_event_with_outargs
-        ev = WIN32OLE::Event.new(@db)
-        @db.connectionString = 'XXX' # set illegal connection string
-        assert_raise(WIN32OLE::RuntimeError) {
-          @db.open
-        }
-        ev.on_event_with_outargs('WillConnect'){|*args|
-          args.last[0] = CONNSTR # ConnectionString = CONNSTR
-        }
-        @db.open
-        message_loop
-        assert(true)
-      end
-
-      def test_on_event_hash_return
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {:return => 1, :ConnectionString => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_on_event_hash_return2
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {:ConnectionString => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_on_event_hash_return3
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {'ConnectionString' => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_on_event_hash_return4
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {'return' => 1, 'ConnectionString' => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_on_event_hash_return5
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {0 => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_off_event
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event{handler1}
-        ev.off_event
-        @db.open
-        message_loop
-        assert_equal("", @event2)
-      end
-
-      def test_off_event_arg
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event('WillConnect'){handler1}
-        ev.off_event('WillConnect')
-        @db.open
-        message_loop
-        assert_equal("", @event2)
-      end
-
-      def test_off_event_arg2
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event('WillConnect'){handler1}
-        ev.on_event('ConnectComplete'){handler1}
-        ev.off_event('WillConnect')
-        @db.open
-        message_loop
-        assert_equal("handler1", @event2)
-      end
-
-      def test_off_event_sym_arg
-        ev = WIN32OLE::Event.new(@db)
-        ev.on_event('WillConnect'){handler1}
-        ev.off_event(:WillConnect)
-        @db.open
-        message_loop
-        assert_equal("", @event2)
-      end
-
-      def handler1
-        @event2 = "handler1"
-      end
-
-      def handler2
-        @event2 = "handler2"
-      end
-
-      def handler3(*arg)
-        @event3 += arg[0]
-      end
-
-      def teardown
-        if @db && @db.state == ADO::AdStateOpen
-          @db.close
-        end
-        message_loop
-        @db = nil
-      end
-
-      class Handler1
-        attr_reader :val1, :val2, :val3, :val4
-        def initialize
-          @val1 = nil
-          @val2 = nil
-          @val3 = nil
-          @val4 = nil
-        end
-        def onWillConnect(conn, uid, pwd, opts, stat, pconn)
-          @val1 = conn
-        end
-        def onConnectComplete(err, stat, pconn)
-          @val2 = err
-          @val3 = stat
-        end
-        def onInfoMessage(err, stat, pconn)
-          @val4 = stat
-        end
-      end
-
-      class Handler2
-        attr_reader :ev
-        def initialize
-          @ev = ""
-        end
-        def method_missing(ev, *arg)
-          @ev += ev
-        end
-      end
-
-      def test_handler1
-        ev = WIN32OLE::Event.new(@db)
-        h1 = Handler1.new
-        ev.handler = h1
-        @db.open
-        message_loop
-        assert_equal(CONNSTR, h1.val1)
-        assert_equal(h1.val1, ev.handler.val1)
-        assert_equal(nil, h1.val2)
-        assert_equal(ADO::AdStateOpen, h1.val3)
-        assert_equal(ADO::AdStateOpen, h1.val4)
-      end
-
-      def test_handler2
-        ev = WIN32OLE::Event.new(@db)
-        h2 = Handler2.new
-        ev.handler = h2
-        @db.open
-        message_loop
-        assert(h2.ev != "")
-      end
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_method.rb b/test/mri/win32ole/test_win32ole_method.rb
deleted file mode 100644
index 4b3e255fdc9..00000000000
--- a/test/mri/win32ole/test_win32ole_method.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE::Method)
-  class TestWIN32OLE_METHOD < Test::Unit::TestCase
-
-    def setup
-      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_open = WIN32OLE::Method.new(ole_type, "open")
-      @m_namespace = WIN32OLE::Method.new(ole_type, "namespace")
-      @m_parent = WIN32OLE::Method.new(ole_type, "parent")
-      @m_invoke = WIN32OLE::Method.new(ole_type, "invoke")
-      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
-
-      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
-    end
-
-    def test_initialize
-      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
-      assert_raise(TypeError) {
-        WIN32OLE::Method.new(1, 2)
-      }
-      assert_raise(ArgumentError) {
-        WIN32OLE::Method.new("foo")
-      }
-      assert_raise(ArgumentError) {
-        WIN32OLE::Method.new(ole_type)
-      }
-      assert_raise(WIN32OLE::RuntimeError) {
-        WIN32OLE::Method.new(ole_type, "NonExistMethod")
-      }
-      assert_raise(TypeError) {
-        WIN32OLE::Method.new(ole_type, 1)
-      }
-      method  = WIN32OLE::Method.new(ole_type, "Open")
-      assert_instance_of(WIN32OLE::Method, method)
-      method  = WIN32OLE::Method.new(ole_type, "open")
-      assert_instance_of(WIN32OLE::Method, method)
-    end
-
-    def test_name
-      assert_equal("Open", @m_open.name)
-    end
-
-    def test_return_type
-      assert_equal("VOID", @m_open.return_type)
-      assert_equal("Folder", @m_namespace.return_type)
-    end
-
-    def test_return_vtype
-      assert_equal(24, @m_open.return_vtype)
-      assert_equal(26, @m_namespace.return_vtype)
-    end
-
-    def test_return_type_detail
-      assert_equal(['VOID'], @m_open.return_type_detail)
-      assert_equal(['PTR', 'USERDEFINED', 'Folder'], @m_namespace.return_type_detail)
-    end
-
-    def test_invoke_kind
-      assert_equal('FUNC', @m_open.invoke_kind)
-      assert_equal('FUNC', @m_namespace.invoke_kind)
-      assert_equal('PROPERTYGET', @m_parent.invoke_kind)
-    end
-
-    def test_invkind
-      assert_equal(1, @m_namespace.invkind)
-      assert_equal(2, @m_parent.invkind)
-    end
-
-    def test_visible?
-      assert(@m_namespace.visible?)
-      assert(!@m_invoke.visible?)
-    end
-
-    def test_helpstring
-      assert_equal("Get special folder from ShellSpecialFolderConstants", @m_namespace.helpstring)
-    end
-
-    def test_helpfile
-      assert_equal("", @m_namespace.helpfile)
-      assert_match(/VBENLR.*\.CHM$/i, @m_file_name.helpfile)
-    end
-
-    def test_helpcontext
-      assert_equal(0, @m_namespace.helpcontext)
-      assert_equal(2181996, @m_file_name.helpcontext)
-    end
-
-    def test_dispid
-      assert_equal(1610743810, @m_namespace.dispid)
-    end
-
-    def is_ruby64?
-      /mswin64|x64-mingw/ =~ RUBY_PLATFORM
-    end
-
-    def test_offset_vtbl
-      exp = is_ruby64? ? 48 : 24
-      assert_equal(exp, @m_invoke.offset_vtbl)
-    end
-
-    def test_size_params
-      assert_equal(1, @m_open.size_params)
-      assert_equal(4, @m_browse_for_folder.size_params)
-    end
-
-    def test_size_opt_params
-      assert_equal(0, @m_open.size_opt_params)
-      assert_equal(1, @m_browse_for_folder.size_opt_params)
-    end
-
-    def test_params
-      params = @m_browse_for_folder.params
-      assert_instance_of(Array, params)
-      assert_equal(4, params.size)
-      assert_instance_of(WIN32OLE::Param, params[0])
-    end
-
-    def test_to_s
-      assert_equal(@m_namespace.name, @m_namespace.to_s)
-    end
-
-    def test_inspect
-      assert_equal("#<WIN32OLE::Method:NameSpace>", @m_namespace.inspect)
-    end
-
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_method_event.rb b/test/mri/win32ole/test_win32ole_method_event.rb
deleted file mode 100644
index ab409a1f2d5..00000000000
--- a/test/mri/win32ole/test_win32ole_method_event.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-require 'test/unit'
-
-if defined?(WIN32OLE::Method)
-  require_relative 'available_ole'
-  class TestWIN32OLE_METHOD_EVENT < Test::Unit::TestCase
-    unless AvailableOLE.sysmon_available?
-      def test_dummy_for_skip_message
-        omit 'System Monitor Control is not available'
-      end
-    else
-      def setup
-        ole_type = WIN32OLE::Type.new('System Monitor Control', 'SystemMonitor')
-        @on_dbl_click = WIN32OLE::Method.new(ole_type, 'OnDblClick')
-        ole_type = WIN32OLE::Type.new('Microsoft Shell Controls And Automation', 'Shell')
-        @namespace = WIN32OLE::Method.new(ole_type, 'namespace')
-      end
-
-      def test_event?
-        assert(@on_dbl_click.event?)
-      end
-
-      def test_event_interface
-        assert('DISystemMonitorEvents', @on_dbl_click.event_interface)
-      end
-
-      def test_event_interface_is_nil
-        assert_equal(nil, @namespace.event_interface)
-      end
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_param.rb b/test/mri/win32ole/test_win32ole_param.rb
deleted file mode 100644
index 551da537fc7..00000000000
--- a/test/mri/win32ole/test_win32ole_param.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE::Param)
-  class TestWIN32OLE_PARAM < Test::Unit::TestCase
-
-    def setup
-      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellLinkObject")
-      m_geticonlocation = WIN32OLE::Method.new(ole_type, "GetIconLocation")
-      @param_pbs = m_geticonlocation.params[0]
-
-      ole_type = WIN32OLE::Type.new("Microsoft HTML Object Library", "FontNames")
-      m_count = WIN32OLE::Method.new(ole_type, "Count")
-      @param_p = m_count.params[0]
-
-      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE::Method.new(ole_type, "CopyFile")
-      @param_source = m_copyfile.params[0]
-      @param_overwritefiles = m_copyfile.params[2]
-
-      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "Dictionary")
-      m_add = WIN32OLE::Method.new(ole_type, "Add")
-      @param_key = m_add.params[0]
-    end
-
-    def test_s_new
-      assert_raise(ArgumentError) {
-        WIN32OLE::Param.new("hoge")
-      }
-      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE::Method.new(ole_type, "CopyFile")
-      assert_raise(IndexError) {
-        WIN32OLE::Param.new(m_copyfile, 4);
-      }
-      assert_raise(IndexError) {
-        WIN32OLE::Param.new(m_copyfile, 0);
-      }
-      param = WIN32OLE::Param.new(m_copyfile, 3)
-      assert_equal("OverWriteFiles", param.name)
-      assert_equal(WIN32OLE::Param, param.class)
-      assert_equal(true, param.default)
-      assert_equal("#<WIN32OLE::Param:OverWriteFiles=true>", param.inspect)
-    end
-
-    def test_name
-      assert_equal('Source', @param_source.name)
-      assert_equal('Key', @param_key.name)
-    end
-
-    def test_ole_type
-      assert_equal('BSTR', @param_source.ole_type)
-      assert_equal('VARIANT', @param_key.ole_type)
-    end
-
-    def test_ole_type_detail
-      assert_equal(['BSTR'], @param_source.ole_type_detail)
-      assert_equal(['PTR', 'VARIANT'], @param_key.ole_type_detail)
-    end
-
-    def test_input?
-      assert_equal(true, @param_source.input?)
-      assert_equal(false, @param_pbs.input?)
-    end
-
-    def test_output?
-      assert_equal(false, @param_source.output?)
-      assert_equal(true, @param_pbs.output?)
-    end
-
-    def test_optional?
-      assert_equal(false, @param_source.optional?)
-      assert_equal(true, @param_overwritefiles.optional?)
-    end
-
-    def test_retval?
-      assert_equal(false, @param_source.retval?)
-      assert_equal(true, @param_p.retval?)
-    end
-
-    def test_default
-      assert_equal(nil, @param_source.default)
-      assert_equal(true, @param_overwritefiles.default)
-    end
-
-    def test_to_s
-      assert_equal(@param_source.name, @param_source.to_s)
-    end
-
-    def test_inspect
-      assert_equal("#<WIN32OLE::Param:Source>", @param_source.inspect)
-      assert_equal("#<WIN32OLE::Param:OverWriteFiles=true>", @param_overwritefiles.inspect)
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_param_event.rb b/test/mri/win32ole/test_win32ole_param_event.rb
deleted file mode 100644
index f5a16ead766..00000000000
--- a/test/mri/win32ole/test_win32ole_param_event.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-require 'test/unit'
-
-if defined?(WIN32OLE::Param)
-  require_relative 'available_ole'
-
-  class TestWIN32OLE_PARAM_EVENT < Test::Unit::TestCase
-    if AvailableOLE.msxml_available? || AvailableOLE.ado_available?
-      def setup
-        @param = AvailableOLE.event_param
-      end
-
-      def test_input?
-        assert_equal(true, @param.input?)
-      end
-
-      def test_output?
-        assert_equal(true, @param.output?)
-      end
-    else
-      def test_dummy_for_skip_message
-        omit 'ActiveX Data Object Library and MS XML not found'
-      end
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_record.rb b/test/mri/win32ole/test_win32ole_record.rb
deleted file mode 100644
index 2fae16788d7..00000000000
--- a/test/mri/win32ole/test_win32ole_record.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-# coding: us-ascii
-# frozen_string_literal: false
-
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-PROGID_RBCOMTEST='RbComTest.ComSrvTest'
-
-=begin
-RbComTest.ComSrvTest is following VB.NET COM server(RbComTest solution).
-(You must check COM interoperability.)
-
-Imports System.Runtime.InteropServices
-Public Class ComSrvTest
-    <StructLayout(LayoutKind.Sequential)> _
-    Public Structure Book
-        <MarshalAs(UnmanagedType.BStr)> _
-        Public title As String
-        Public cost As Integer
-    End Structure
-
-    Public Function getBook() As Book
-        Dim book As New Book
-        book.title = "The Ruby Book"
-        book.cost = 20
-        Return book
-    End Function
-
-    Public Function getBooks() As Book()
-        Dim book() As Book = {New Book, New Book}
-        book(0).title = "The CRuby Book"
-        book(0).cost = 30
-        book(1).title = "The JRuby Book"
-        book(1).cost = 40
-        Return book
-    End Function
-
-    Public Sub getBookByRefObject(ByRef obj As Object)
-        Dim book As New Book
-        book.title = "The Ruby Reference Book"
-        book.cost = 50
-        obj = book
-    End Sub
-
-    Public Function getVer2BookByValBook(<MarshalAs(UnmanagedType.Struct)> ByVal book As Book) As Book
-        Dim ret As New Book
-        ret.title = book.title + " ver2"
-        ret.cost = book.cost * 1.1
-        Return ret
-    End Function
-
-    Public Sub getBookByRefBook(<MarshalAs(UnmanagedType.LPStruct)> ByRef book As Book)
-        book.title = "The Ruby Reference Book2"
-        book.cost = 44
-    End Sub
-
-    Public Sub getVer3BookByRefBook(<MarshalAs(UnmanagedType.LPStruct)> ByRef book As Book)
-        book.title += " ver3"
-        book.cost *= 1.2
-    End Sub
-End Class
-=end
-
-
-if defined?(WIN32OLE::Record)
-  class TestWIN32OLE_RECORD < Test::Unit::TestCase
-  end
-
-  def rbcomtest_exist?
-    WIN32OLE.new(PROGID_RBCOMTEST)
-    true
-  rescue WIN32OLE::RuntimeError
-    false
-  end
-
-  class TestWIN32OLE_RECORD_BY_RBCOMTEST < Test::Unit::TestCase
-    unless rbcomtest_exist?
-      def test_dummy_for_skip_message
-        omit "#{PROGID_RBCOMTEST} for WIN32OLE::Record test is not installed"
-      end
-    else
-      def setup
-        @obj = WIN32OLE.new(PROGID_RBCOMTEST)
-      end
-
-      def test_s_new_from_win32ole
-        rec = WIN32OLE::Record.new('Book', @obj)
-        assert(rec)
-        assert_instance_of(WIN32OLE::Record, rec)
-      end
-
-      def test_s_new_from_win32ole_typelib
-        tlib = @obj.ole_typelib
-        rec = WIN32OLE::Record.new('Book', tlib)
-        assert(rec)
-        assert_instance_of(WIN32OLE::Record, rec)
-      end
-
-      def test_s_new_raise
-        assert_raise(WIN32OLE::RuntimeError) {
-          WIN32OLE::Record.new('NonExistRecordName', @obj)
-        }
-        assert_raise(ArgumentError) {
-          WIN32OLE::Record.new
-        }
-        assert_raise(ArgumentError) {
-          WIN32OLE::Record.new('NonExistRecordName')
-        }
-      end
-
-      def test_to_h
-        rec = WIN32OLE::Record.new('Book', @obj)
-        assert_equal({'title'=>nil, 'cost'=>nil}, rec.to_h)
-      end
-
-      def test_typename
-        rec = WIN32OLE::Record.new('Book', @obj)
-        assert_equal('Book', rec.typename)
-      end
-
-      def test_method_missing_getter
-        rec = WIN32OLE::Record.new('Book', @obj)
-        assert_equal(nil, rec.title)
-        assert_raise(KeyError) {
-          rec.non_exist_name
-        }
-      end
-
-      def test_method_missing_setter
-        rec = WIN32OLE::Record.new('Book', @obj)
-        rec.title = "Ruby Book"
-        assert_equal("Ruby Book", rec.title)
-      end
-
-      def test_get_record_from_comserver
-        rec = @obj.getBook
-        assert_instance_of(WIN32OLE::Record, rec)
-        assert_equal("The Ruby Book", rec.title)
-        assert_equal(20, rec.cost)
-      end
-
-      def test_get_record_array_from_comserver
-        rec = @obj.getBooks
-        assert_instance_of(Array, rec)
-        assert_equal(2, rec.size)
-        assert_instance_of(WIN32OLE::Record, rec[0])
-        assert_equal("The CRuby Book", rec[0].title)
-        assert_equal(30, rec[0].cost)
-        assert_instance_of(WIN32OLE::Record, rec[1])
-        assert_equal("The JRuby Book", rec[1].title)
-        assert_equal(40, rec[1].cost)
-      end
-
-      def test_pass_record_parameter
-        rec = WIN32OLE::Record.new('Book', @obj)
-        rec.title = "Ruby Book"
-        rec.cost = 60
-        book = @obj.getVer2BookByValBook(rec)
-        assert_equal("Ruby Book ver2", book.title)
-        assert_equal(66, book.cost)
-      end
-
-      def test_pass_variant_parameter_byref
-        obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF)
-        @obj.getBookByRefBook(obj)
-        assert_instance_of(WIN32OLE::Record, obj.value)
-        book = obj.value
-        assert_equal("The Ruby Reference Book2", book.title)
-        assert_equal(44, book.cost)
-      end
-
-      def test_pass_record_parameter_byref
-        book = WIN32OLE::Record.new('Book', @obj)
-        @obj.getBookByRefBook(book)
-        assert_equal("The Ruby Reference Book2", book.title)
-        assert_equal(44, book.cost)
-      end
-
-      def test_pass_and_get_record_parameter_byref
-        book = WIN32OLE::Record.new('Book', @obj)
-        book.title = "Ruby Book"
-        book.cost = 60
-        @obj.getVer3BookByRefBook(book)
-        assert_equal("Ruby Book ver3", book.title)
-        assert_equal(72, book.cost)
-      end
-
-      def test_ole_instance_variable_get
-        obj = WIN32OLE::Record.new('Book', @obj)
-        assert_equal(nil, obj.ole_instance_variable_get(:title))
-        assert_equal(nil, obj.ole_instance_variable_get('title'))
-      end
-
-      def test_ole_instance_variable_set
-        book = WIN32OLE::Record.new('Book', @obj)
-        book.ole_instance_variable_set(:title, "Ruby Book")
-        assert_equal("Ruby Book", book.title)
-        book.ole_instance_variable_set('title', "Ruby Book2")
-        assert_equal("Ruby Book2", book.title)
-      end
-
-      def test_inspect
-        book = WIN32OLE::Record.new('Book', @obj)
-        assert_equal(%q[#<WIN32OLE::Record(Book) {"title"=>nil, "cost"=>nil}>], book.inspect)
-      end
-    end
-  end
-
-end
diff --git a/test/mri/win32ole/test_win32ole_type.rb b/test/mri/win32ole/test_win32ole_type.rb
deleted file mode 100644
index df1ba6556c6..00000000000
--- a/test/mri/win32ole/test_win32ole_type.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE::Type)
-  class TestWIN32OLE_TYPE < Test::Unit::TestCase
-    def test_s_progids
-      progids = WIN32OLE::Type.progids
-      assert_instance_of(Array, progids)
-      assert(progids.size > 0)
-      assert_instance_of(String, progids[0])
-      assert(progids.include?("Shell.Application.1"))
-    end
-
-    def test_initialize
-      assert_raise(ArgumentError) {
-        WIN32OLE::Type.new
-      }
-      assert_raise(ArgumentError) {
-        WIN32OLE::Type.new("foo")
-      }
-      assert_raise(TypeError) {
-        WIN32OLE::Type.new(1, 2)
-      }
-      assert_raise(TypeError) {
-        WIN32OLE::Type.new("Microsoft Shell Controls And Automation", 1)
-      }
-      assert_raise(WIN32OLE::RuntimeError) {
-        WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "foo")
-      }
-      assert_raise(WIN32OLE::RuntimeError) {
-        WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Application")
-      }
-      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
-      assert_instance_of(WIN32OLE::Type, ole_type)
-      assert_equal("Shell", ole_type.name)
-      assert_equal("Class", ole_type.ole_type)
-      assert_equal("{13709620-C279-11CE-A49E-444553540000}", ole_type.guid)
-      assert_equal("Shell.Application.1", ole_type.progid)
-      assert_equal(true, ole_type.visible?)
-      assert_equal("Shell", ole_type.to_s)
-      assert_equal(0, ole_type.major_version)
-      assert_equal(0, ole_type.minor_version)
-      assert_equal(5, ole_type.typekind)
-      assert_equal("Shell Object Type Information", ole_type.helpstring)
-      assert_equal(nil, ole_type.src_type)
-      assert_equal("", ole_type.helpfile)
-      assert_equal(0, ole_type.helpcontext)
-      assert_equal([], ole_type.variables)
-      assert(ole_type.ole_methods.select{|m|/NameSpace/i =~ m.name}.size > 0)
-
-      ole_type2 = WIN32OLE::Type.new("{13709620-C279-11CE-A49E-444553540000}", "Shell")
-      assert_instance_of(WIN32OLE::Type, ole_type)
-      assert_equal(ole_type.name, ole_type2.name)
-      assert_equal(ole_type.ole_type, ole_type2.ole_type)
-      assert_equal(ole_type.guid, ole_type2.guid)
-      assert_equal(ole_type.progid, ole_type2.progid)
-      assert_equal(ole_type.visible?, ole_type2.visible?)
-      assert_equal(ole_type.to_s, ole_type2.to_s)
-      assert_equal(ole_type.major_version, ole_type2.major_version)
-      assert_equal(ole_type.minor_version, ole_type2.minor_version)
-      assert_equal(ole_type.typekind, ole_type2.typekind)
-      assert_equal(ole_type.helpstring, ole_type2.helpstring)
-      assert_equal(ole_type.src_type, ole_type2.src_type)
-      assert_equal(ole_type.helpfile, ole_type2.helpfile)
-      assert_equal(ole_type.helpcontext, ole_type2.helpcontext)
-      assert_equal(ole_type.variables.size, ole_type2.variables.size)
-      assert_equal(ole_type.ole_methods[0].name, ole_type2.ole_methods[0].name)
-      assert_equal(ole_type.ole_typelib.name, ole_type2.ole_typelib.name)
-      assert_equal(ole_type.implemented_ole_types.size, ole_type2.implemented_ole_types.size)
-      assert_equal(ole_type.inspect, ole_type2.inspect)
-    end
-
-    def setup
-      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
-    end
-
-    def test_name
-      assert_equal("Shell", @ole_type.name)
-    end
-
-    def test_ole_type
-      assert_equal("Class", @ole_type.ole_type)
-    end
-
-    def test_guid
-      assert_equal("{13709620-C279-11CE-A49E-444553540000}", @ole_type.guid)
-    end
-
-    def test_progid
-      assert_equal("Shell.Application.1", @ole_type.progid)
-    end
-
-    def test_visible?
-      assert(@ole_type.visible?)
-      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "IShellDispatch")
-      assert(!ole_type.visible?)
-    end
-
-    def test_to_s
-      assert_equal(@ole_type.to_s, @ole_type.name)
-    end
-
-    def test_major_version
-      assert_equal(0, @ole_type.major_version)
-      # ole_type = WIN32OLE::Type.new("Microsoft Word 11.0 Object Library", "Documents")
-      # assert_equal(8, ole_type.major_version)
-    end
-
-    def test_minor_version
-      assert_equal(0, @ole_type.minor_version)
-      # ole_type = WIN32OLE::Type.new("Microsoft Word 11.0 Object Library", "Documents")
-      # assert_equal(3, ole_type.minor_version)
-    end
-
-    def test_typekind
-      assert_equal(5, @ole_type.typekind)
-    end
-
-    def test_helpstring
-      assert_equal("Shell Object Type Information", @ole_type.helpstring)
-    end
-
-    def test_src_type
-      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "DriveTypeConst")
-      assert_match(/__MIDL___MIDL_itf_scrrun_/, ole_type.src_type)
-      assert_equal(nil, @ole_type.src_type)
-    end
-
-    def test_helpfile
-      assert_equal("", @ole_type.helpfile)
-      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "Folders")
-      assert_match(/VBENLR98\.CHM$/i, ole_type.helpfile)
-    end
-
-    def test_helpcontext
-      assert_equal(0, @ole_type.helpcontext)
-      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "Folders")
-      assert_equal(2181929, ole_type.helpcontext)
-    end
-
-    def test_variables
-      variables = @ole_type.variables
-      assert_instance_of(Array, variables)
-      assert(variables.size == 0)
-
-      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
-      variables = ole_type.variables
-      assert_instance_of(Array, variables)
-      assert(variables.size > 0)
-
-      assert_instance_of(WIN32OLE::Variable, variables[0])
-    end
-
-    def test_ole_methods
-      methods = @ole_type.ole_methods
-      assert_instance_of(Array, methods)
-      assert(methods.size > 0)
-      assert_instance_of(WIN32OLE::Method, methods[0]);
-      assert(methods.collect{|m| m.name}.include?("Application"))
-    end
-
-    def test_ole_typelib
-      tlib = @ole_type.ole_typelib
-      assert_instance_of(WIN32OLE::TypeLib, tlib)
-      assert_equal("Microsoft Shell Controls And Automation", tlib.name)
-    end
-
-    def test_implemented_ole_types
-      ole_types = @ole_type.implemented_ole_types
-      assert_instance_of(Array, ole_types)
-      assert_equal(1, ole_types.size)
-      assert_match(/^IShellDispatch\d{0,1}$/, ole_types[0].name)
-    end
-
-    def test_inspect
-      assert_equal("#<WIN32OLE::Type:Shell>", @ole_type.inspect)
-    end
-
-    # WIN32OLE::Type.typelibs will be obsoleted.
-    def test_s_typelibs
-      tlibs = WIN32OLE::Type.typelibs.sort
-      tlibs2 = WIN32OLE::TypeLib.typelibs.collect{|t|t.name}.sort
-      assert_equal(tlibs2, tlibs)
-    end
-
-    # WIN32OLE::Type.ole_classes will be obsoleted.
-    def test_s_ole_classes
-      ots1 = WIN32OLE::Type.ole_classes("Microsoft Shell Controls And Automation")
-      ots2 = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation").ole_types
-      otns1 = ots1.collect{|t| t.name}.sort
-      otns2 = ots2.collect{|t| t.name}.sort
-      assert_equal(otns2, otns1)
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_type_event.rb b/test/mri/win32ole/test_win32ole_type_event.rb
deleted file mode 100644
index 5d1c9fc44c9..00000000000
--- a/test/mri/win32ole/test_win32ole_type_event.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-require 'test/unit'
-
-if defined?(WIN32OLE::Type)
-  require_relative 'available_ole'
-
-  class TestWIN32OLE_TYPE_EVENT < Test::Unit::TestCase
-    unless AvailableOLE.sysmon_available?
-      def test_dummy_for_skip_message
-        omit 'System Monitor Control is not available'
-      end
-    else
-
-      def setup
-        @ole_type = WIN32OLE::Type.new('System Monitor Control', 'SystemMonitor')
-      end
-
-      def test_implemented_ole_types
-        ole_types = @ole_type.implemented_ole_types.map(&:name).sort
-        assert_equal(['DISystemMonitor', 'DISystemMonitorEvents', 'ISystemMonitor'], ole_types)
-      end
-
-      def test_default_ole_types
-        ole_types = @ole_type.default_ole_types.map(&:name).sort
-        assert_equal(['DISystemMonitor', 'DISystemMonitorEvents'], ole_types)
-      end
-
-      def test_source_ole_types
-        ole_types = @ole_type.source_ole_types.map(&:name)
-        assert_equal(['DISystemMonitorEvents'], ole_types)
-      end
-
-      def test_default_event_sources
-        event_sources = @ole_type.default_event_sources.map(&:name)
-        assert_equal(['DISystemMonitorEvents'], event_sources)
-      end
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_typelib.rb b/test/mri/win32ole/test_win32ole_typelib.rb
deleted file mode 100644
index f743ad68f90..00000000000
--- a/test/mri/win32ole/test_win32ole_typelib.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE::TypeLib)
-  class TestWIN32OLE_TYPELIB < Test::Unit::TestCase
-    def test_s_typelibs
-      tlibs = WIN32OLE::TypeLib.typelibs
-      assert_instance_of(Array, tlibs)
-      assert(tlibs.size > 0)
-      tlib = tlibs.find {|t| t.name == "Microsoft Shell Controls And Automation"}
-      assert(tlib)
-    end
-
-    def test_initialize
-      assert_raise(ArgumentError) {
-        WIN32OLE::TypeLib.new(1,2,3,4)
-      }
-
-      assert_raise(TypeError) {
-        WIN32OLE::TypeLib.new(100)
-      }
-
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_instance_of(WIN32OLE::TypeLib, tlib)
-
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation", 1.0)
-      assert_instance_of(WIN32OLE::TypeLib, tlib)
-
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation", 1, 0)
-      assert_instance_of(WIN32OLE::TypeLib, tlib)
-      guid = tlib.guid
-
-      tlib_by_guid = WIN32OLE::TypeLib.new(guid, 1, 0)
-      assert_instance_of(WIN32OLE::TypeLib, tlib_by_guid)
-      assert_equal("Microsoft Shell Controls And Automation" , tlib_by_guid.name)
-
-      path = tlib.path
-      tlib_by_path =  WIN32OLE::TypeLib.new(path)
-      assert_equal("Microsoft Shell Controls And Automation" , tlib_by_path.name)
-
-      assert_raise(WIN32OLE::RuntimeError) {
-        WIN32OLE::TypeLib.new("Non Exist Type Library")
-      }
-    end
-
-    # #Bug:3907 [ruby-dev:42338]
-    def test_initialize_with_REG_EXPAND_SZ
-      tlib = WIN32OLE::TypeLib.new("Disk Management Snap-In Object Library")
-      assert_instance_of(WIN32OLE::TypeLib, tlib)
-    end
-
-    def test_guid
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_equal("{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}", tlib.guid)
-    end
-
-    def test_name
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_equal("Microsoft Shell Controls And Automation", tlib.name)
-      tlib = WIN32OLE::TypeLib.new("{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}")
-      assert_equal("Microsoft Shell Controls And Automation", tlib.name)
-    end
-
-    def test_version
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_equal("1.0", tlib.version)
-    end
-
-    def test_major_version
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_equal(1, tlib.major_version)
-    end
-
-    def test_minor_version
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_equal(0, tlib.minor_version)
-    end
-
-    def test_path
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_match(/shell32\.dll$/i, tlib.path)
-    end
-
-    def test_visible?
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert(tlib.visible?)
-    end
-
-    def test_library_name
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_equal("Shell32", tlib.library_name)
-    end
-
-    def test_to_s
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_equal("Microsoft Shell Controls And Automation", tlib.to_s)
-    end
-
-    def test_ole_types
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      ole_types = tlib.ole_types
-      assert_instance_of(Array, ole_types)
-      assert(ole_types.size > 0)
-      assert_instance_of(WIN32OLE::Type, ole_types[0])
-    end
-
-    def test_inspect
-      tlib = WIN32OLE::TypeLib.new("Microsoft Shell Controls And Automation")
-      assert_equal("#<WIN32OLE::TypeLib:Microsoft Shell Controls And Automation>", tlib.inspect)
-    end
-
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_variable.rb b/test/mri/win32ole/test_win32ole_variable.rb
deleted file mode 100644
index 74a6cbd890a..00000000000
--- a/test/mri/win32ole/test_win32ole_variable.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE::Variable)
-  class TestWIN32OLE_VARIABLE < Test::Unit::TestCase
-
-    def setup
-      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
-      @var1 = ole_type.variables.find {|v| v.name == 'ssfDESKTOP'}
-
-      variables = WIN32OLE::Type.new("Microsoft Windows Installer Object Library", "Installer").variables
-      @var2 = variables.find {|v| v.name == 'UILevel'}
-    end
-
-    def test_initialize
-      assert_raise(TypeError) {WIN32OLE::Variable.new}
-    end
-
-    def test_name
-      assert_equal('ssfDESKTOP', @var1.name)
-    end
-
-    def test_ole_type
-      assert_equal('INT', @var1.ole_type)
-      assert_equal('MsiUILevel', @var2.ole_type)
-    end
-
-    def test_ole_type_detail
-      assert_equal(['INT'], @var1.ole_type_detail)
-      assert_equal(['USERDEFINED', 'MsiUILevel'], @var2.ole_type_detail)
-    end
-
-    def test_ole_type_value
-      assert_equal(0, @var1.value)
-      assert_equal(nil, @var2.value)
-    end
-
-    def test_ole_type_visible?
-      assert(@var1.visible?)
-    end
-
-    def test_ole_type_variable_kind
-      assert_equal("CONSTANT", @var1.variable_kind)
-      assert_equal("DISPATCH", @var2.variable_kind)
-    end
-
-    def test_ole_type_varkind
-      assert_equal(2, @var1.varkind)
-      assert_equal(3, @var2.varkind)
-    end
-
-    def test_to_s
-      assert_equal(@var1.name, @var1.to_s)
-    end
-
-    def test_inspect
-      assert_equal("#<WIN32OLE::Variable:ssfDESKTOP=0>",  @var1.inspect)
-      assert_equal("#<WIN32OLE::Variable:UILevel=nil>", @var2.inspect)
-    end
-
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_variant.rb b/test/mri/win32ole/test_win32ole_variant.rb
deleted file mode 100644
index 1837a1e1d63..00000000000
--- a/test/mri/win32ole/test_win32ole_variant.rb
+++ /dev/null
@@ -1,722 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE::Variant)
-
-  class TestWIN32OLE_VARIANT < Test::Unit::TestCase
-    def setup
-      @orglocale = WIN32OLE.locale
-      WIN32OLE.locale = 0x0409 # set locale  US-Eng
-    end
-
-    def teardown
-      WIN32OLE.locale = @orglocale
-    end
-
-    def test_s_new
-      obj = WIN32OLE::Variant.new('foo')
-      assert_instance_of(WIN32OLE::Variant, obj)
-    end
-
-    def test_s_new_exc
-      assert_raise(TypeError) {
-        WIN32OLE::Variant.new(/foo/)
-      }
-    end
-
-    def test_s_new_ary
-      obj = WIN32OLE::Variant.new([1])
-      assert_instance_of(WIN32OLE::Variant, obj)
-      assert_raise(TypeError) {
-        WIN32OLE::Variant.new([/foo/])
-      }
-    end
-
-    def test_s_new_no_argument
-      pat = /wrong number of arguments \(.*\b0\b.* 1\.\.3\)/
-      assert_raise_with_message(ArgumentError, pat) do
-        WIN32OLE::Variant.new
-      end
-    end
-
-    def test_s_new_one_argument
-      ex = nil
-      begin
-        WIN32OLE::Variant.new('foo')
-      rescue
-        ex = $!
-      end
-      assert_equal(nil, ex);
-    end
-
-    def test_s_new_with_nil
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_I2)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I2, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_I4)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_R4)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R4, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_R8)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R8, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_CY)
-      assert_equal("0", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_CY, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,30), obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_DATE, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_BSTR)
-      assert_equal("", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BSTR, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_DISPATCH)
-      assert_nil(obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_DISPATCH, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_BOOL)
-      assert_equal(false, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BOOL, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_VARIANT)
-      assert_nil(obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_VARIANT, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_I1)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I1, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_UI1)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI1, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_UI2)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI2, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_UI4)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI4, obj.vartype)
-
-
-      if defined?(WIN32OLE::VARIANT::VT_I8)
-        obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_I8)
-        assert_equal(0, obj.value)
-        assert_equal(WIN32OLE::VARIANT::VT_I8, obj.vartype)
-      end
-
-      if defined?(WIN32OLE::VARIANT::VT_UI8)
-        obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_UI8)
-        assert_equal(0, obj.value)
-        assert_equal(WIN32OLE::VARIANT::VT_UI8, obj.vartype)
-      end
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_INT)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_INT, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_UINT)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UINT, obj.vartype)
-    end
-
-    def test_s_new_with_non_nil
-      obj = WIN32OLE::Variant.new(2, WIN32OLE::VARIANT::VT_I2)
-      assert_equal(2, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I2, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(3, WIN32OLE::VARIANT::VT_I4)
-      assert_equal(3, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(4.5, WIN32OLE::VARIANT::VT_R4)
-      assert_equal(4.5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R4, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(5.5, WIN32OLE::VARIANT::VT_R8)
-      assert_equal(5.5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R8, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(600, WIN32OLE::VARIANT::VT_CY)
-      assert_equal("600", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_CY, obj.vartype)
-
-      obj = WIN32OLE::Variant.new("2001-06-15 12:17:34", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2001,06,15,12,17,34), obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_DATE, obj.vartype)
-
-      obj = WIN32OLE::Variant.new("foo", WIN32OLE::VARIANT::VT_BSTR)
-      assert_equal("foo", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BSTR, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(true, WIN32OLE::VARIANT::VT_BOOL)
-      assert_equal(true, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BOOL, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(2, WIN32OLE::VARIANT::VT_I1)
-      assert_equal(2, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I1, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(3, WIN32OLE::VARIANT::VT_UI1)
-      assert_equal(3, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI1, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(4, WIN32OLE::VARIANT::VT_UI2)
-      assert_equal(4, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI2, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(5, WIN32OLE::VARIANT::VT_UI4)
-      assert_equal(5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI4, obj.vartype)
-
-      if defined?(WIN32OLE::VARIANT::VT_I8)
-        obj = WIN32OLE::Variant.new(-123456789012345, WIN32OLE::VARIANT::VT_I8)
-        assert_equal(-123456789012345, obj.value)
-        assert_equal(WIN32OLE::VARIANT::VT_I8, obj.vartype)
-      end
-
-      if defined?(WIN32OLE::VARIANT::VT_UI8)
-        obj = WIN32OLE::Variant.new(123456789012345, WIN32OLE::VARIANT::VT_UI8)
-        assert_equal(123456789012345, obj.value)
-        assert_equal(WIN32OLE::VARIANT::VT_UI8, obj.vartype)
-      end
-
-      obj = WIN32OLE::Variant.new(4, WIN32OLE::VARIANT::VT_INT)
-      assert_equal(4, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_INT, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(5, WIN32OLE::VARIANT::VT_UINT)
-      assert_equal(5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UINT, obj.vartype)
-    end
-
-    def test_s_new_with_non_nil_byref
-      obj = WIN32OLE::Variant.new(2, WIN32OLE::VARIANT::VT_I2|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(2, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I2|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(3, WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(3, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(4.5, WIN32OLE::VARIANT::VT_R4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(4.5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R4|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(5.5, WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(5.5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(600, WIN32OLE::VARIANT::VT_CY|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal("600", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_CY|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new("2001-06-15 12:17:34", WIN32OLE::VARIANT::VT_DATE|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(Time.new(2001,06,15,12,17,34), obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_DATE|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new("foo", WIN32OLE::VARIANT::VT_BSTR|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal("foo", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BSTR|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(true, WIN32OLE::VARIANT::VT_BOOL|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(true, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BOOL|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(2, WIN32OLE::VARIANT::VT_I1|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(2, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I1|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(3, WIN32OLE::VARIANT::VT_UI1|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(3, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI1|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(4, WIN32OLE::VARIANT::VT_UI2|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(4, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI2|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(5, WIN32OLE::VARIANT::VT_UI4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI4|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(4, WIN32OLE::VARIANT::VT_INT|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(4, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_INT|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE::Variant.new(5, WIN32OLE::VARIANT::VT_UINT|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UINT|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-    end
-
-    def test_s_new_with_i8_byref
-      obj = WIN32OLE::Variant.new(-123456789012345, WIN32OLE::VARIANT::VT_I8|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(-123456789012345, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-    end
-
-    def test_s_new_with_ui8_byref
-      obj = WIN32OLE::Variant.new(123456789012345, WIN32OLE::VARIANT::VT_UI8|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(123456789012345, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-    end
-
-    def test_value
-      obj = WIN32OLE::Variant.new('foo')
-      assert_equal('foo', obj.value)
-    end
-
-    def test_s_new_2_argument
-      obj = WIN32OLE::Variant.new('foo', WIN32OLE::VARIANT::VT_BSTR|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal('foo', obj.value);
-    end
-
-    def test_s_new_2_argument2
-      obj = WIN32OLE::Variant.new('foo', WIN32OLE::VARIANT::VT_BSTR)
-      assert_equal('foo', obj.value);
-    end
-
-    def test_s_new_dispatch_array
-      vt = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_DISPATCH
-      obj = WIN32OLE::Variant.new(nil, vt)
-      assert_equal(vt, obj.vartype)
-      assert_nil(obj.value)
-
-      vt = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_DISPATCH|WIN32OLE::VARIANT::VT_BYREF
-      obj = WIN32OLE::Variant.new(nil, vt)
-      assert_equal(vt, obj.vartype)
-      assert_nil(obj.value)
-    end
-
-    def test_s_new_array
-      # should not occur stack over flow
-      ar = (1..500000).to_a.map{|i| [i]}
-      ar2 = WIN32OLE::Variant.new(ar)
-      assert_equal(ar, ar2.value)
-    end
-
-    def test_s_new_vt_record_exc
-      # VT_RECORD (= 36) should not be allowed in WIN32OLE::Variant#new
-      assert_raise(ArgumentError) {
-        WIN32OLE::Variant.new(nil, 36)
-      }
-    end
-
-    def test_s_array
-      obj = WIN32OLE::Variant.array([2,3], WIN32OLE::VARIANT::VT_I4)
-      assert_instance_of(WIN32OLE::Variant, obj)
-      assert_equal(WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_ARRAY, obj.vartype)
-      assert_equal([[0, 0, 0],[0, 0, 0]], obj.value)
-
-      obj = WIN32OLE::Variant.array([2,3], WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF|WIN32OLE::VARIANT::VT_ARRAY, obj.vartype)
-      assert_equal([[0, 0, 0],[0, 0, 0]], obj.value)
-
-      obj = WIN32OLE::Variant.array([2,3], WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_ARRAY)
-      assert_instance_of(WIN32OLE::Variant, obj)
-      assert_equal(WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_ARRAY, obj.vartype)
-      assert_equal([[0, 0, 0],[0, 0, 0]], obj.value)
-
-      assert_equal(0, obj[0,0])
-      obj[0,0] = 10
-      assert_equal([[10, 0, 0],[0, 0, 0]], obj.value)
-      obj[0,1] = "13.2"
-      assert_equal([[10, 13, 0],[0, 0, 0]], obj.value)
-
-      obj = WIN32OLE::Variant.array([3, 2], WIN32OLE::VARIANT::VT_VARIANT)
-      obj[0,0] = 10
-      obj[0,1] = "string"
-      obj[1,0] = 12.735
-      assert_equal([[10, "string"],[12.735, nil],[nil,nil]], obj.value)
-
-      obj = WIN32OLE::Variant.array([2,3], WIN32OLE::VARIANT::VT_DISPATCH)
-      assert_equal([[nil, nil, nil],[nil,nil,nil]], obj.value)
-
-    end
-
-    def test_s_array_exc
-      assert_raise(TypeError) {
-        WIN32OLE::Variant.array(2, WIN32OLE::VARIANT::VT_I4)
-      }
-    end
-
-    def test_conversion_num2str
-      obj = WIN32OLE::Variant.new(124, WIN32OLE::VARIANT::VT_BSTR)
-      assert_equal("124", obj.value);
-    end
-
-    def test_conversion_float2int
-      obj = WIN32OLE::Variant.new(12.345, WIN32OLE::VARIANT::VT_I4)
-      assert_equal(12, obj.value)
-      obj = WIN32OLE::Variant.new(12.345, WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(12, obj.value)
-    end
-
-    def test_conversion_str2num
-      obj = WIN32OLE::Variant.new("12.345", WIN32OLE::VARIANT::VT_R8)
-      assert_equal(12.345, obj.value)
-    end
-
-    def test_conversion_ole_variant2ole_variant
-      obj = WIN32OLE::Variant.new("12.345", WIN32OLE::VARIANT::VT_R4)
-      obj = WIN32OLE::Variant.new(obj, WIN32OLE::VARIANT::VT_I4)
-      assert_equal(12, obj.value)
-    end
-
-    def test_conversion_str2date
-      obj = WIN32OLE::Variant.new("2004-12-24 12:24:45", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2004,12,24,12,24,45), obj.value)
-    end
-
-    def test_conversion_time2date
-      dt = Time.mktime(2004, 12, 24, 12, 24, 45)
-      obj = WIN32OLE::Variant.new(dt, WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(dt, obj.value)
-    end
-
-    def test_conversion_dbl2date_with_msec
-      # Date is "2014/8/27 12:34:56.789"
-      obj = WIN32OLE::Variant.new(41878.524268391200167, WIN32OLE::VARIANT::VT_DATE)
-      t = obj.value
-      assert_equal("2014-08-27 12:34:56", t.strftime('%Y-%m-%d %H:%M:%S'))
-      assert_in_delta(0.789, t.nsec / 1000000000.0, 0.001)
-    end
-
-    def test_conversion_time2date_with_msec
-      t0 = Time.new(2014, 8, 27, 12, 34, 56)
-      t0 += 0.789
-      t1 = WIN32OLE::Variant.new(t0).value
-
-      # The t0.nsec is 789000000 and t1.nsec is 789000465
-      # because of error range by conversion Time between VT_DATE Variant.
-      # So check t1 and t0 are in error by less than one millisecond.
-      msg = "Expected:#{t0.strftime('%Y-%m-%dT%H:%M:%S.%N')} but was:#{t1.strftime('%Y-%m-%dT%H:%M:%S.%N')}"
-      assert_in_delta(t0, t1, 0.001, msg)
-
-      t0 = Time.new(2014, 8, 27, 12, 34, 56)
-      t0 += 0.999999999
-      t1 = WIN32OLE::Variant.new(t0).value
-      msg = "Expected:#{t0.strftime('%Y-%m-%dT%H:%M:%S.%N')} but was:#{t1.strftime('%Y-%m-%dT%H:%M:%S.%N')}"
-
-      # The t0 is "2014/08/27 12:34.56.999999999" and
-      # the t1 is "2014/08/27 12:34:57.000000628"
-      assert_in_delta(t0, t1, 0.001, msg)
-
-      t0 = Time.now
-      t1 = WIN32OLE::Variant.new(t0).value
-      msg = "Expected:#{t0.strftime('%Y-%m-%dT%H:%M:%S.%N')} but was:#{t1.strftime('%Y-%m-%dT%H:%M:%S.%N')}"
-      assert_in_delta(t0, t1, 0.001, msg)
-    end
-
-    # this test failed because of VariantTimeToSystemTime
-    # and SystemTimeToVariantTime API ignores wMilliseconds
-    # member of SYSTEMTIME  struct.
-    #
-    # def test_conversion_time_nsec2date
-    #   dt = Time.new(2004, 12,24, 12, 24, 45)
-    #   dt += 0.1
-    #   obj = WIN32OLE::Variant.new(dt, WIN32OLE::VARIANT::VT_DATE)
-    #   assert_equal(dt, obj.value)
-    # end
-
-    def test_conversion_str2cy
-      begin
-        WIN32OLE.locale = 0x0411 # set locale Japanese
-      rescue WIN32OLE::RuntimeError
-        omit("Japanese locale is not installed")
-      end
-      if WIN32OLE.locale == 0x0411
-        obj = WIN32OLE::Variant.new("\\10,000", WIN32OLE::VARIANT::VT_CY)
-        assert_equal("10000", obj.value)
-      end
-    end
-
-    def test_create_vt_array
-      obj = WIN32OLE::Variant.new([1.2, 2.3], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8)
-      assert_equal([1.2, 2.3], obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8, obj.vartype)
-
-      obj = WIN32OLE::Variant.new([1.2, 2.3], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal([1.2, 2.3], obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-    end
-
-    def test_create_vt_array2
-      obj = WIN32OLE::Variant.new([1.2, "a"], WIN32OLE::VARIANT::VT_ARRAY)
-      assert_equal([1.2, "a"], obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_VARIANT, obj.vartype)
-
-      obj = WIN32OLE::Variant.new([1.2, "a"])
-      assert_equal([1.2, "a"], obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_VARIANT, obj.vartype)
-    end
-
-
-    def test_create_vt_nested_array
-      obj = WIN32OLE::Variant.new([[1.2, "a", "b"], [3.4, "C", "D"]], WIN32OLE::VARIANT::VT_ARRAY)
-      assert_equal([[1.2, "a", "b"], [3.4, "C", "D"]], obj.value)
-
-      obj = WIN32OLE::Variant.new([[1.2, "a", "b"], [3.4, "C", "D"]])
-      assert_equal([[1.2, "a", "b"], [3.4, "C", "D"]], obj.value)
-
-      obj = WIN32OLE::Variant.new([[1.2, "a", "b"], [3.4, "C", "D"], [5.6, "E", "F"]])
-      assert_equal([[1.2, "a", "b"], [3.4, "C", "D"], [5.6, "E", "F"]], obj.value)
-
-      obj = WIN32OLE::Variant.new([[[1.2], [3.4]], [[5.6], [7.8]], [[9.1],[9.2]]])
-      assert_equal([[[1.2], [3.4]], [[5.6], [7.8]], [[9.1],[9.2]]], obj.value)
-    end
-
-    def test_create_vt_array3
-      obj = WIN32OLE::Variant.new([])
-      assert_equal([], obj.value)
-
-      obj = WIN32OLE::Variant.new([[]])
-      assert_equal([[]], obj.value)
-
-      obj = WIN32OLE::Variant.new([[],[]])
-      assert_equal([[],[]], obj.value)
-
-      obj = WIN32OLE::Variant.new([], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal([], obj.value)
-
-      obj = WIN32OLE::Variant.new([[]], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal([[]], obj.value)
-
-      obj = WIN32OLE::Variant.new([[],[]], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal([[],[]], obj.value)
-    end
-
-    def test_create_vt_array_nil
-      vartype = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_DISPATCH|WIN32OLE::VARIANT::VT_BYREF
-      obj = WIN32OLE::Variant.new(nil, vartype)
-      assert_nil(obj.value)
-      assert_equal(vartype, obj.vartype)
-
-      vartype = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_DISPATCH
-      obj = WIN32OLE::Variant.new(nil, vartype)
-      assert_nil(obj.value)
-      assert_equal(vartype, obj.vartype)
-    end
-
-    def test_create_vt_array_str
-      vartype = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BSTR
-      obj = WIN32OLE::Variant.new(["abc", "123"], vartype)
-      assert_equal(vartype, obj.vartype)
-      assert_equal(["abc", "123"], obj.value)
-
-      vartype = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF|WIN32OLE::VARIANT::VT_BSTR
-      obj = WIN32OLE::Variant.new(["abc", "123"], vartype)
-      assert_equal(vartype, obj.vartype)
-      assert_equal(["abc", "123"], obj.value)
-    end
-
-    def test_create_vt_array_exc
-      exc = assert_raise(TypeError) {
-        WIN32OLE::Variant.new("", WIN32OLE::VARIANT::VT_ARRAY)
-      }
-      assert_match(/wrong argument type String \(expected Array\)/, exc.message)
-    end
-
-    def test_create_vt_array_str2ui1array
-      obj = WIN32OLE::Variant.new("ABC", WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1)
-      assert_equal("ABC", obj.value)
-
-      obj.value = "DEF"
-      assert_equal("DEF", obj.value)
-      obj[0] = 71
-      assert_equal("GEF", obj.value)
-
-      obj = WIN32OLE::Variant.new([65, 0].pack("C*"), WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1)
-      assert_equal([65, 0].pack("C*"), obj.value)
-
-      obj = WIN32OLE::Variant.new("abc", WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal("abc", obj.value)
-      obj.value = "DEF"
-      assert_equal("DEF", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-      obj[1] = 71
-      assert_equal("DGF", obj.value)
-
-    end
-
-    def test_create_vt_array_int
-      obj = WIN32OLE::Variant.new([65, 0], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1)
-      assert_equal([65, 0].pack("C*"), obj.value)
-
-      obj = WIN32OLE::Variant.new([65, 0])
-      assert_equal([65, 0], obj.value)
-
-      obj = WIN32OLE::Variant.new([65, 0], WIN32OLE::VARIANT::VT_I2|WIN32OLE::VARIANT::VT_ARRAY)
-      assert_equal([65, 0], obj.value)
-
-    end
-
-    def test_vt_array_bracket
-      obj = WIN32OLE::Variant.new([[1,2,3],[4,5,6]])
-      assert_equal(1, obj[0,0])
-      assert_equal(2, obj[0,1])
-      assert_equal(3, obj[0,2])
-      assert_equal(4, obj[1,0])
-      assert_equal(5, obj[1,1])
-      assert_equal(6, obj[1,2])
-
-      assert_raise(WIN32OLE::RuntimeError) {
-        obj[0,4]
-      }
-      assert_raise(WIN32OLE::RuntimeError) {
-        obj[0,-1]
-      }
-      assert_raise(ArgumentError) {
-        obj[0]
-      }
-
-      obj[0,0] = 7
-      obj[1,2] = 8
-      assert_equal([[7,2,3], [4,5,8]], obj.value)
-
-      assert_raise(WIN32OLE::RuntimeError) {
-        obj[0,4] = 9
-      }
-      assert_raise(WIN32OLE::RuntimeError) {
-        obj[0,-1] = 10
-      }
-      assert_raise(ArgumentError) {
-        obj[0] = 11
-      }
-    end
-
-    def test_conversion_vt_date
-      obj = WIN32OLE::Variant.new(-657434, WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(100,1,1), obj.value)
-
-      obj = WIN32OLE::Variant.new("1500/12/29 23:59:59", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1500,12,29,23,59,59), obj.value)
-
-      obj = WIN32OLE::Variant.new("1500/12/30 00:00:00", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1500,12,30), obj.value)
-
-      obj = WIN32OLE::Variant.new("1500/12/30 00:00:01", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1500,12,30,0,0,1), obj.value)
-
-      obj = WIN32OLE::Variant.new("1899/12/29 23:59:59", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,29,23,59,59), obj.value)
-
-      obj = WIN32OLE::Variant.new("1899/12/30 00:00:00", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,30), obj.value)
-
-      obj = WIN32OLE::Variant.new("1899/12/30 00:00:01", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,30,0,0,1), obj.value)
-
-      obj = WIN32OLE::Variant.new(0, WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,30), obj.value)
-
-      obj = WIN32OLE::Variant.new("2008/12/29 23:59:59", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2008,12,29,23,59,59), obj.value)
-
-      obj = WIN32OLE::Variant.new("2008/12/30 00:00:00", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2008,12,30,0,0,0), obj.value)
-
-      obj = WIN32OLE::Variant.new("2008/12/30 00:00:01", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2008,12,30,0,0,1), obj.value)
-
-      obj = WIN32OLE::Variant.new("9999/12/31 23:59:59", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(9999,12,31,23,59,59), obj.value)
-    end
-
-    def test_create_nil_dispatch
-      var = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_DISPATCH)
-      assert_nil(var.value)
-    end
-
-    def test_create_variant_byref
-      obj = WIN32OLE::Variant.new("Str", WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF);
-      assert_equal("Str", obj.value);
-    end
-
-    def test_vartype
-      obj = WIN32OLE::Variant.new("Str")
-      assert_equal(WIN32OLE::VARIANT::VT_BSTR, obj.vartype)
-    end
-
-    def test_set_value
-      obj = WIN32OLE::Variant.new(10)
-      obj.value = 12
-      assert_equal(12, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-      obj.value = "14"
-      assert_equal(14, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-      obj.value = 11.2
-      assert_equal(11, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-
-      obj = WIN32OLE::Variant.new([1,2])
-      assert_raise(WIN32OLE::RuntimeError) {
-        obj.value = [3,4]
-      }
-
-      obj = WIN32OLE::Variant.new("2007/01/01", WIN32OLE::VARIANT::VT_DATE)
-      assert_raise(WIN32OLE::RuntimeError) {
-        obj.value = "hogehoge"
-      }
-      assert_equal(Time.new(2007,1,1), obj.value)
-
-      obj2 = WIN32OLE::Variant.new("2006/01/01", WIN32OLE::VARIANT::VT_DATE)
-      obj.value = obj2
-      assert_equal(Time.new(2006,01,01), obj.value)
-    end
-
-    def test_c_nothing
-      assert_nil(WIN32OLE::Variant::Nothing.value)
-    end
-
-    def test_c_empty
-      assert_nil(WIN32OLE::Variant::Empty.value)
-    end
-
-    def test_c_null
-      assert_nil(WIN32OLE::Variant::Null.value)
-    end
-
-    def test_c_noparam
-      # DISP_E_PARAMNOTFOUND
-      assert_equal(-2147352572, WIN32OLE::Variant::NoParam.value)
-    end
-
-    def test_vt_error_noparam
-      v = WIN32OLE::Variant.new(-1, WIN32OLE::VARIANT::VT_ERROR)
-      assert_equal(-1, v.value)
-      fso = WIN32OLE.new("Scripting.FileSystemObject")
-      exc = assert_raise(WIN32OLE::RuntimeError) {
-        fso.openTextFile("NonExistingFile", v, false)
-      }
-      assert_match(/Type mismatch/i, exc.message)
-      exc = assert_raise(WIN32OLE::RuntimeError) {
-        fso.openTextFile("NonExistingFile", WIN32OLE::Variant::NoParam, false)
-      }
-      # 800A0035 is 'file not found' error.
-      assert_match(/800A0035/, exc.message)
-
-      # -2147352572 is DISP_E_PARAMNOTFOUND
-      v = WIN32OLE::Variant.new(-2147352572, WIN32OLE::VARIANT::VT_ERROR)
-      exc = assert_raise(WIN32OLE::RuntimeError) {
-        fso.openTextFile("NonExistingFile", WIN32OLE::Variant::NoParam, false)
-      }
-      # 800A0035 is 'file not found' error code.
-      assert_match(/800A0035/, exc.message)
-    end
-
-  end
-end
-
diff --git a/test/mri/win32ole/test_win32ole_variant_m.rb b/test/mri/win32ole/test_win32ole_variant_m.rb
deleted file mode 100644
index f176d1a51e2..00000000000
--- a/test/mri/win32ole/test_win32ole_variant_m.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE::VARIANT)
-  class TestWin32OLE_VARIANT_MODULE < Test::Unit::TestCase
-    include WIN32OLE::VARIANT
-
-    def test_variant
-      assert_equal(0, VT_EMPTY)
-      assert_equal(1, VT_NULL)
-      assert_equal(2, VT_I2)
-      assert_equal(3, VT_I4)
-      assert_equal(4, VT_R4)
-      assert_equal(5, VT_R8)
-      assert_equal(6, VT_CY)
-      assert_equal(7, VT_DATE)
-      assert_equal(8, VT_BSTR)
-      assert_equal(9, VT_DISPATCH)
-      assert_equal(10, VT_ERROR)
-      assert_equal(11, VT_BOOL)
-      assert_equal(12, VT_VARIANT)
-      assert_equal(13, VT_UNKNOWN)
-      assert_equal(16, VT_I1)
-      assert_equal(17, VT_UI1)
-      assert_equal(18, VT_UI2)
-      assert_equal(19, VT_UI4)
-      assert_equal(22, VT_INT)
-      assert_equal(23, VT_UINT)
-      assert_equal(0x2000, VT_ARRAY)
-      assert_equal(0x4000, VT_BYREF)
-    end
-  end
-end
diff --git a/test/mri/win32ole/test_win32ole_variant_outarg.rb b/test/mri/win32ole/test_win32ole_variant_outarg.rb
deleted file mode 100644
index 9301a76aaa5..00000000000
--- a/test/mri/win32ole/test_win32ole_variant_outarg.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-require 'fileutils'
-
-def ado_csv_installed?
-  installed = false
-  if defined?(WIN32OLE)
-    db = nil
-    begin
-      db = WIN32OLE.new('ADODB.Connection')
-      db.connectionString = "Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-      db.open
-      db.close
-      db = nil
-      installed = true
-    rescue
-    end
-  end
-  installed
-end
-
-if defined?(WIN32OLE::Variant)
-    class TestWIN32OLE_VARIANT_OUTARG < Test::Unit::TestCase
-      module ADO
-      end
-      CONNSTR="Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-      def setup
-        return if !ado_csv_installed?
-
-        FileUtils.cp(File.dirname(__FILE__) + '/orig_data.csv', './data.csv')
-        @db = WIN32OLE.new('ADODB.Connection')
-        if !defined?(ADO::AdStateOpen)
-          WIN32OLE.const_load(@db, ADO)
-        end
-        @db.connectionString = CONNSTR
-        @db.open
-      end
-
-      def test_variant_ref_and_argv
-        if !ado_csv_installed?
-          omit("ActiveX Data Object Library not found")
-        end
-        sql = "INSERT INTO data.csv VALUES (5, 'E')"
-        @db.execute(sql, -1)
-        c = WIN32OLE::ARGV[1]
-        assert_equal(1, c)
-        obj = WIN32OLE::Variant.new(nil, WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF)
-        assert_equal(nil, obj.value)
-        @db.execute(sql , obj)
-        assert_equal(1, obj.value)
-        obj = WIN32OLE::Variant.new(-100, WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF)
-        assert_equal(-100, obj.value)
-        @db.execute(sql, obj)
-        assert_equal(1, obj.value)
-      end
-
-      def teardown
-        return if !ado_csv_installed?
-        if @db && @db.state == ADO::AdStateOpen
-          @db.close
-        end
-        File.unlink("data.csv")
-      end
-    end
-end
diff --git a/test/mri/win32ole/test_word.rb b/test/mri/win32ole/test_word.rb
deleted file mode 100644
index 34cfbbc2a4d..00000000000
--- a/test/mri/win32ole/test_word.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: false
-#
-# This is test for [ruby-Bugs#3237]
-#
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE)
-  module Word; end
-end
-
-def word_installed?
-  installed = false
-  w = nil
-  if defined?(WIN32OLE)
-    begin
-      w = WIN32OLE.new('Word.Application')
-      WIN32OLE.const_load(w, Word)
-      installed = true
-    rescue
-    ensure
-      if w
-        w.quit(Word::WdDoNotSaveChanges)
-        w = nil
-      end
-    end
-  end
-  return installed
-end
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
-    unless word_installed?
-      def test_dummy_for_skip_message
-        omit "Microsoft Word is not installed"
-      end
-    else
-      def setup
-        begin
-          @obj = WIN32OLE.new('Word.Application')
-        rescue WIN32OLE::RuntimeError
-          @obj = nil
-        end
-      end
-
-      def test_ole_methods
-        if @obj
-          @obj.visible = true
-          @obj.wordbasic.disableAutoMacros(true)
-          assert(true)
-        end
-      end
-
-      def test_s_connect
-        if @obj
-          obj2 = WIN32OLE.connect("Word.Application")
-          assert_instance_of(WIN32OLE, obj2)
-          obj2.visible = true
-        end
-      end
-
-      def teardown
-        if @obj
-          @obj.quit(Word::WdDoNotSaveChanges)
-          @obj = nil
-        end
-      end
-    end
-  end
-end
diff --git a/test/mri/yaml/test_store.rb b/test/mri/yaml/test_store.rb
index d3895302715..d4eba251fde 100644
--- a/test/mri/yaml/test_store.rb
+++ b/test/mri/yaml/test_store.rb
@@ -5,8 +5,12 @@
 
 class YAMLStoreTest < Test::Unit::TestCase
   def setup
-    @yaml_store_file = File.join(Dir.tmpdir, "yaml_store.tmp.#{Process.pid}")
-    @yaml_store = YAML::Store.new(@yaml_store_file)
+    if defined?(::PStore)
+      @yaml_store_file = File.join(Dir.tmpdir, "yaml_store.tmp.#{Process.pid}")
+      @yaml_store = YAML::Store.new(@yaml_store_file)
+    else
+      omit "PStore is not available"
+    end
   end
 
   def teardown
@@ -133,7 +137,7 @@ def test_nested_transaction_raises_error
   def test_yaml_store_files_are_accessed_as_binary_files
     bug5311 = '[ruby-core:39503]'
     n = 128
-    assert_in_out_err(["-Eutf-8:utf-8", "-ryaml/store", "-", @yaml_store_file], <<-SRC, [bug5311], [], bug5311, timeout: 60)
+    assert_in_out_err(["-Eutf-8:utf-8", "-rrubygems", "-ryaml/store", "-", @yaml_store_file], <<-SRC, [bug5311], [], bug5311, timeout: 60)
       @yaml_store = YAML::Store.new(ARGV[0])
       (1..#{n}).each do |i|
         @yaml_store.transaction {@yaml_store["Key\#{i}"] = "value \#{i}"}
@@ -177,4 +181,4 @@ def test_with_options
     end
     assert_equal(indentation_3_yaml, File.read(@yaml_store_file), bug12800)
   end
-end if defined?(::YAML::Store)
+end
diff --git a/test/mri/zlib/test_zlib.rb b/test/mri/zlib/test_zlib.rb
index 5a8463ad8e7..bedf243b3e5 100644
--- a/test/mri/zlib/test_zlib.rb
+++ b/test/mri/zlib/test_zlib.rb
@@ -9,6 +9,9 @@
 begin
   require 'zlib'
 rescue LoadError
+else
+  z = "/zlib.#{RbConfig::CONFIG["DLEXT"]}"
+  LOADED_ZLIB, = $".select {|f| f.end_with?(z)}
 end
 
 if defined? Zlib
@@ -1525,7 +1528,7 @@ def test_gunzip_encoding
     end
 
     def test_gunzip_no_memory_leak
-      assert_no_memory_leak(%[-rzlib], "#{<<~"{#"}", "#{<<~'};'}")
+      assert_no_memory_leak(%W[-r#{LOADED_ZLIB}], "#{<<~"{#"}", "#{<<~'};'}")
       d = Zlib.gzip("data")
       {#
         10_000.times {Zlib.gunzip(d)}
diff --git a/test/tool/lib/-test-/sanitizers.rb b/test/tool/lib/-test-/sanitizers.rb
new file mode 100644
index 00000000000..38ca997b714
--- /dev/null
+++ b/test/tool/lib/-test-/sanitizers.rb
@@ -0,0 +1,6 @@
+module Test
+  module Sanitizers
+    def self.asan_enabled? = false
+    def self.lsan_enabled? = false
+  end
+end
diff --git a/test/tool/lib/_tmpdir.rb b/test/tool/lib/_tmpdir.rb
new file mode 100644
index 00000000000..daa1a1f2350
--- /dev/null
+++ b/test/tool/lib/_tmpdir.rb
@@ -0,0 +1,100 @@
+template = "rubytest."
+
+# This path is only for tests.
+# Assume the directory by these environment variables are safe.
+base = [ENV["TMPDIR"], ENV["TMP"], "/tmp"].find do |tmp|
+  next unless tmp and tmp.size <= 50 and File.directory?(tmp)
+  # On macOS, the default TMPDIR is very long, in spite of UNIX socket
+  # path length being limited.
+  #
+  # Also Rubygems creates its own temporary directory per tests, and
+  # some tests copy the full path of gemhome there.  In that case, the
+  # path contains both temporary names twice, and can exceed path name
+  # limit very easily.
+  tmp
+end
+begin
+  tmpdir = File.join(base, template + Random.new_seed.to_s(36)[-6..-1])
+  Dir.mkdir(tmpdir, 0o700)
+rescue Errno::EEXIST
+  retry
+end
+# warn "tmpdir(#{tmpdir.size}) = #{tmpdir}"
+
+pid = $$
+END {
+  if pid == $$
+    begin
+      Dir.rmdir(tmpdir)
+    rescue Errno::ENOENT
+    rescue Errno::ENOTEMPTY
+      require_relative "colorize"
+      colorize = Colorize.new
+      ls = Struct.new(:colorize) do
+        def mode_inspect(m, s)
+          [
+            (m & 0o4 == 0 ? ?- : ?r),
+            (m & 0o2 == 0 ? ?- : ?w),
+            (m & 0o1 == 0 ? (s ? s.upcase : ?-) : (s || ?x)),
+          ]
+        end
+        def decorate_path(path, st)
+          case
+          when st.directory?
+            color = "bold;blue"
+            type = "/"
+          when st.symlink?
+            color = "bold;cyan"
+            # type = "@"
+          when st.executable?
+            color = "bold;green"
+            type = "*"
+          when path.end_with?(".gem")
+            color = "green"
+          end
+          colorize.decorate(path, color) + (type || "")
+        end
+        def list_tree(parent, indent = "", &block)
+          children = Dir.children(parent).map do |child|
+            [child, path = File.join(parent, child), File.lstat(path)]
+          end
+          nlink_width = children.map {|child, path, st| st.nlink}.max.to_s.size
+          size_width = children.map {|child, path, st| st.size}.max.to_s.size
+
+          children.each do |child, path, st|
+            m = st.mode
+            m = [
+              (st.file? ? ?- : st.ftype[0]),
+              mode_inspect(m >> 6, (?s unless m & 04000 == 0)),
+              mode_inspect(m >> 3, (?s unless m & 02000 == 0)),
+              mode_inspect(m,      (?t unless m & 01000 == 0)),
+            ].join("")
+            warn sprintf("%s* %s %*d %*d %s % s%s",
+                         indent, m, nlink_width, st.nlink, size_width, st.size,
+                         st.mtime.to_s, decorate_path(child,  st),
+                         (" -> " + decorate_path(File.readlink(path), File.stat(path)) if
+                           st.symlink?))
+            if st.directory?
+              list_tree(File.join(parent, child), indent + "  ", &block)
+            end
+            yield path, st if block
+          end
+        end
+      end.new(colorize)
+      warn colorize.notice("Children under ")+colorize.fail(tmpdir)+":"
+      Dir.chdir(tmpdir) do
+        ls.list_tree(".") do |path, st|
+          if st.directory?
+            Dir.rmdir(path)
+          else
+            File.unlink(path)
+          end
+        end
+      end
+      require "fileutils"
+      FileUtils.rm_rf(tmpdir)
+    end
+  end
+}
+
+ENV["TMPDIR"] = ENV["SPEC_TEMP_DIR"] = ENV["GEM_TEST_TMPDIR"] = tmpdir
diff --git a/test/tool/lib/bundle_env.rb b/test/tool/lib/bundle_env.rb
new file mode 100644
index 00000000000..9ad5ea220b4
--- /dev/null
+++ b/test/tool/lib/bundle_env.rb
@@ -0,0 +1,4 @@
+ENV["GEM_HOME"] = File.expand_path("../../.bundle", __dir__)
+ENV["BUNDLE_APP_CONFIG"] = File.expand_path("../../.bundle", __dir__)
+ENV["BUNDLE_PATH__SYSTEM"] = "true"
+ENV["BUNDLE_WITHOUT"] = "lint doc"
diff --git a/test/tool/lib/bundled_gem.rb b/test/tool/lib/bundled_gem.rb
new file mode 100644
index 00000000000..d2ed61a508f
--- /dev/null
+++ b/test/tool/lib/bundled_gem.rb
@@ -0,0 +1,126 @@
+require 'fileutils'
+require 'rubygems'
+require 'rubygems/package'
+
+# This library is used by "make extract-gems" to
+# unpack bundled gem files.
+
+module BundledGem
+  DEFAULT_GEMS_DEPENDENCIES = [
+    "net-protocol", # net-ftp
+    "time", # net-ftp
+    "singleton", # prime
+    "ipaddr", # rinda
+    "forwardable", # prime, rinda
+    "strscan", # rexml
+    "psych" # rdoc
+  ]
+
+  module_function
+
+  def unpack(file, *rest)
+    pkg = Gem::Package.new(file)
+    prepare_test(pkg.spec, *rest) do |dir|
+      pkg.extract_files(dir)
+      FileUtils.rm_rf(Dir.glob(".git*", base: dir).map {|n| File.join(dir, n)})
+    end
+    puts "Unpacked #{file}"
+  rescue Gem::Package::FormatError, Errno::ENOENT
+    puts "Try with hash version of bundled gems instead of #{file}. We don't use this gem with release version of Ruby."
+    if file =~ /^gems\/(\w+)-/
+      file = Dir.glob("gems/#{$1}-*.gem").first
+    end
+    retry
+  end
+
+  def build(gemspec, version, outdir = ".", validation: true)
+    outdir = File.expand_path(outdir)
+    gemdir, gemfile = File.split(gemspec)
+    Dir.chdir(gemdir) do
+      spec = Gem::Specification.load(gemfile)
+      abort "Failed to load #{gemspec}" unless spec
+      output = File.join(outdir, spec.file_name)
+      FileUtils.rm_rf(output)
+      package = Gem::Package.new(output)
+      package.spec = spec
+      package.build(validation == false)
+    end
+  end
+
+  def copy(path, *rest)
+    path, n = File.split(path)
+    spec = Dir.chdir(path) {Gem::Specification.load(n)} or raise "Cannot load #{path}"
+    prepare_test(spec, *rest) do |dir|
+      FileUtils.rm_rf(dir)
+      files = spec.files.reject {|f| f.start_with?(".git")}
+      dirs = files.map {|f| File.dirname(f) if f.include?("/")}.uniq
+      FileUtils.mkdir_p(dirs.map {|d| d ? "#{dir}/#{d}" : dir}.sort_by {|d| d.count("/")})
+      files.each do |f|
+        File.copy_stream(File.join(path, f), File.join(dir, f))
+      end
+    end
+    puts "Copied #{path}"
+  end
+
+  def prepare_test(spec, dir = ".")
+    target = spec.full_name
+    Gem.ensure_gem_subdirectories(dir)
+    gem_dir = File.join(dir, "gems", target)
+    yield gem_dir
+    spec_dir = spec.extensions.empty? ? "specifications" : File.join("gems", target)
+    if spec.extensions.empty?
+      spec.dependencies.reject! {|dep| DEFAULT_GEMS_DEPENDENCIES.include?(dep.name)}
+    end
+    File.binwrite(File.join(dir, spec_dir, "#{target}.gemspec"), spec.to_ruby)
+    unless spec.extensions.empty?
+      spec.dependencies.clear
+      File.binwrite(File.join(dir, spec_dir, ".bundled.#{target}.gemspec"), spec.to_ruby)
+    end
+    if spec.bindir and spec.executables
+      bindir = File.join(dir, "bin")
+      Dir.mkdir(bindir) rescue nil
+      spec.executables.each do |exe|
+        File.open(File.join(bindir, exe), "wb", 0o777) {|f|
+          f.print "#!ruby\n",
+                  %[load File.realpath("../gems/#{target}/#{spec.bindir}/#{exe}", __dir__)\n]
+        }
+      end
+    end
+    FileUtils.rm_rf(Dir.glob("#{gem_dir}/.git*"))
+  end
+
+  def dummy_gemspec(gemspec)
+    return if File.exist?(gemspec)
+    gemdir, gemfile = File.split(gemspec)
+    Dir.chdir(gemdir) do
+      spec = Gem::Specification.new do |s|
+        s.name = gemfile.chomp(".gemspec")
+        s.version =
+          File.read("lib/#{s.name}.rb")[/VERSION = "(.+?)"/, 1] ||
+          begin File.read("lib/#{s.name}/version.rb")[/VERSION = "(.+?)"/, 1]; rescue; nil; end ||
+          raise("cannot find the version of #{ s.name } gem")
+        s.authors = ["DUMMY"]
+        s.email = ["dummy@ruby-lang.org"]
+        s.files = Dir.glob("{lib,ext}/**/*").select {|f| File.file?(f)}
+        s.licenses = ["Ruby"]
+        s.description = "DO NOT USE; dummy gemspec only for test"
+        s.summary = "(dummy gemspec)"
+      end
+      File.write(gemfile, spec.to_ruby)
+    end
+  end
+
+  def checkout(gemdir, repo, rev, git: $git)
+    return unless rev or !git or git.empty?
+    unless File.exist?("#{gemdir}/.git")
+      puts "Cloning #{repo}"
+      command = "#{git} clone #{repo} #{gemdir}"
+      system(command) or raise "failed: #{command}"
+    end
+    puts "Update #{File.basename(gemdir)} to #{rev}"
+    command = "#{git} fetch origin #{rev}"
+    system(command, chdir: gemdir) or raise "failed: #{command}"
+    command = "#{git} checkout --detach #{rev}"
+    system(command, chdir: gemdir) or raise "failed: #{command}"
+  end
+end
diff --git a/test/tool/lib/colorize.rb b/test/tool/lib/colorize.rb
index 11b878d3182..09043121193 100644
--- a/test/tool/lib/colorize.rb
+++ b/test/tool/lib/colorize.rb
@@ -6,8 +6,8 @@ class Colorize
   #   Colorize.new(color: color, colors_file: colors_file)
   def initialize(color = nil, opts = ((_, color = color, nil)[0] if Hash === color))
     @colors = @reset = nil
-    @color = (opts[:color] if opts)
-    if color or (color == nil && STDOUT.tty?)
+    @color = opts && opts[:color] || color
+    if color or (color == nil && coloring?)
       if (%w[smso so].any? {|attr| /\A\e\[.*m\z/ =~ IO.popen("tput #{attr}", "r", :err => IO::NULL, &:read)} rescue nil)
         @beg = "\e["
         colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
@@ -27,21 +27,48 @@ def initialize(color = nil, opts = ((_, color = color, nil)[0] if Hash === color
   end
 
   DEFAULTS = {
-    "pass"=>"32", "fail"=>"31;1", "skip"=>"33;1",
+    # color names
     "black"=>"30", "red"=>"31", "green"=>"32", "yellow"=>"33",
     "blue"=>"34", "magenta"=>"35", "cyan"=>"36", "white"=>"37",
     "bold"=>"1", "underline"=>"4", "reverse"=>"7",
+    "bright_black"=>"90", "bright_red"=>"91", "bright_green"=>"92", "bright_yellow"=>"93",
+    "bright_blue"=>"94", "bright_magenta"=>"95", "bright_cyan"=>"96", "bright_white"=>"97",
+
+    # abstract decorations
+    "pass"=>"green", "fail"=>"red;bold", "skip"=>"yellow;bold",
+    "note"=>"bright_yellow", "notice"=>"bright_yellow", "info"=>"bright_magenta",
   }
 
+  def coloring?
+    STDOUT.tty? && (!(nc = ENV['NO_COLOR']) || nc.empty?)
+  end
+
   # colorize.decorate(str, name = color_name)
   def decorate(str, name = @color)
-    if @colors and color = (@colors[name] || DEFAULTS[name])
+    if coloring? and color = resolve_color(name)
       "#{@beg}#{color}m#{str}#{@reset}"
     else
       str
     end
   end
 
+  def resolve_color(color = @color, seen = {}, colors = nil)
+    return unless @colors
+    color.to_s.gsub(/\b[a-z][\w ]+/) do |n|
+      n.gsub!(/\W+/, "_")
+      n.downcase!
+      c = seen[n] and next c
+      if colors
+        c = colors[n]
+      elsif (c = (tbl = @colors)[n] || (tbl = DEFAULTS)[n])
+        colors = tbl
+      else
+        next n
+      end
+      seen[n] = resolve_color(c, seen, colors)
+    end
+  end
+
   DEFAULTS.each_key do |name|
     define_method(name) {|str|
       decorate(str, name)
diff --git a/test/tool/lib/core_assertions.rb b/test/tool/lib/core_assertions.rb
index 5c5c9390f99..bab3a00ac70 100644
--- a/test/tool/lib/core_assertions.rb
+++ b/test/tool/lib/core_assertions.rb
@@ -75,9 +75,18 @@ module CoreAssertions
       require_relative 'envutil'
       require 'pp'
       begin
-        require '-test-/asan'
+        require '-test-/sanitizers'
       rescue LoadError
+        # in test-unit-ruby-core gem
+        def sanitizers
+          nil
+        end
+      else
+        def sanitizers
+          Test::Sanitizers
+        end
       end
+      module_function :sanitizers
 
       nil.pretty_inspect
 
@@ -97,11 +106,14 @@ def assert_file
       end
 
       def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil,
-                            success: nil, **opt)
+                            success: nil, failed: nil, gems: false, **opt)
         args = Array(args).dup
-        args.insert((Hash === args[0] ? 1 : 0), '--disable=gems')
+        unless gems.nil?
+          args.insert((Hash === args[0] ? 1 : 0), "--#{gems ? 'enable' : 'disable'}=gems")
+        end
         stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt)
-        desc = FailDesc[status, message, stderr]
+        desc = failed[status, message, stderr] if failed
+        desc ||= FailDesc[status, message, stderr]
         if block_given?
           raise "test_stdout ignored, use block only or without block" if test_stdout != []
           raise "test_stderr ignored, use block only or without block" if test_stderr != []
@@ -159,7 +171,7 @@ def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: fal
         pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
         # ASAN has the same problem - its shadow memory greatly increases memory usage
         # (plus asan has better ways to detect memory leaks than this assertion)
-        pend 'assert_no_memory_leak may consider ASAN memory usage as leak' if defined?(Test::ASAN) && Test::ASAN.enabled?
+        pend 'assert_no_memory_leak may consider ASAN memory usage as leak' if sanitizers&.asan_enabled?
 
         require_relative 'memory_status'
         raise Test::Unit::PendedError, "unsupported platform" unless defined?(Memory::Status)
@@ -327,7 +339,16 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o
         args = args.dup
         args.insert((Hash === args.first ? 1 : 0), "-w", "--disable=gems", *$:.map {|l| "-I#{l}"})
         args << "--debug" if RUBY_ENGINE == 'jruby' # warning: tracing (e.g. set_trace_func) will not capture all events without --debug flag
+        # power_assert 3 requires ruby 3.1 or later
+        args << "-W:no-experimental" if RUBY_VERSION < "3.1."
         stdout, stderr, status = EnvUtil.invoke_ruby(args, src, capture_stdout, true, **opt)
+
+        if sanitizers&.lsan_enabled?
+          # LSAN may output messages like the following line into stderr. We should ignore it.
+          #   ==276855==Running thread 276851 was not suspended. False leaks are possible.
+          # See https://github.com/google/sanitizers/issues/1479
+          stderr.gsub!(/==\d+==Running thread \d+ was not suspended\. False leaks are possible\.\n/, "")
+        end
       ensure
         if res_c
           res_c.close
@@ -369,9 +390,17 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o
 
       # Run Ractor-related test without influencing the main test suite
       def assert_ractor(src, args: [], require: nil, require_relative: nil, file: nil, line: nil, ignore_stderr: nil, **opt)
-        return unless defined?(Ractor)
+        omit unless defined?(Ractor)
+
+        # https://bugs.ruby-lang.org/issues/21262
+        shim_value = "class Ractor; alias value take; end" unless Ractor.method_defined?(:value)
+        shim_join = "class Ractor; alias join take; end" unless Ractor.method_defined?(:join)
+
+        if require
+          require = [require] unless require.is_a?(Array)
+          require = require.map {|r| "require #{r.inspect}"}.join("\n")
+        end
 
-        require = "require #{require.inspect}" if require
         if require_relative
           dir = File.dirname(caller_locations[0,1][0].absolute_path)
           full_path = File.expand_path(require_relative, dir)
@@ -379,6 +408,8 @@ def assert_ractor(src, args: [], require: nil, require_relative: nil, file: nil,
         end
 
         assert_separately(args, file, line, <<~RUBY, ignore_stderr: ignore_stderr, **opt)
+          #{shim_value}
+          #{shim_join}
           #{require}
           previous_verbose = $VERBOSE
           $VERBOSE = nil
@@ -494,13 +525,10 @@ def assert_raise_with_message(exception, expected, msg = nil, &block)
           assert = :assert_match
         end
 
-        ex = m = nil
-        EnvUtil.with_default_internal(of: expected) do
-          ex = assert_raise(exception, msg || proc {"Exception(#{exception}) with message matches to #{expected.inspect}"}) do
-            yield
-          end
-          m = ex.message
+        ex = assert_raise(exception, msg || proc {"Exception(#{exception}) with message matches to #{expected.inspect}"}) do
+          yield
         end
+        m = ex.message
         msg = message(msg, "") {"Expected Exception(#{exception}) was raised, but the message doesn't match"}
 
         if assert == :assert_equal
@@ -683,17 +711,15 @@ def assert_warn(*args)
         assert_warning(*args) {$VERBOSE = false; yield}
       end
 
-      def assert_deprecated_warning(mesg = /deprecated/)
+      def assert_deprecated_warning(mesg = /deprecated/, &block)
         assert_warning(mesg) do
-          Warning[:deprecated] = true if Warning.respond_to?(:[]=)
-          yield
+          EnvUtil.deprecation_warning(&block)
         end
       end
 
-      def assert_deprecated_warn(mesg = /deprecated/)
+      def assert_deprecated_warn(mesg = /deprecated/, &block)
         assert_warn(mesg) do
-          Warning[:deprecated] = true if Warning.respond_to?(:[]=)
-          yield
+          EnvUtil.deprecation_warning(&block)
         end
       end
 
@@ -830,6 +856,9 @@ def assert_all_assertions_foreach(msg = nil, *keys, &block)
             rescue
               # Constants may be defined but not implemented, e.g., mingw.
             else
+              unless Process.clock_getres(clk) < 1.0e-03
+                next # needs msec precision
+              end
               PERFORMANCE_CLOCK = clk
             end
           end
diff --git a/test/tool/lib/dump.gdb b/test/tool/lib/dump.gdb
new file mode 100644
index 00000000000..56b420a5461
--- /dev/null
+++ b/test/tool/lib/dump.gdb
@@ -0,0 +1,17 @@
+set height 0
+set width 0
+set confirm off
+
+echo \n>>> Threads\n\n
+info threads
+
+echo \n>>> Machine level backtrace\n\n
+thread apply all info stack full
+
+echo \n>>> Dump Ruby level backtrace (if possible)\n\n
+call rb_vmdebug_stack_dump_all_threads()
+call fflush(stderr)
+
+echo ">>> Finish\n"
+detach
+quit
diff --git a/test/tool/lib/dump.lldb b/test/tool/lib/dump.lldb
new file mode 100644
index 00000000000..ed9cb890104
--- /dev/null
+++ b/test/tool/lib/dump.lldb
@@ -0,0 +1,13 @@
+script print("\n>>> Threads\n\n")
+thread list
+
+script print("\n>>> Machine level backtrace\n\n")
+thread backtrace all
+
+script print("\n>>> Dump Ruby level backtrace (if possible)\n\n")
+call rb_vmdebug_stack_dump_all_threads()
+call fflush(stderr)
+
+script print(">>> Finish\n")
+detach
+quit
diff --git a/test/tool/lib/envutil.rb b/test/tool/lib/envutil.rb
index cfd2f92c5aa..60896050567 100644
--- a/test/tool/lib/envutil.rb
+++ b/test/tool/lib/envutil.rb
@@ -15,23 +15,22 @@
 module EnvUtil
   def rubybin
     if ruby = ENV["RUBY"]
-      return ruby
-    end
-    ruby = "ruby"
-    exeext = RbConfig::CONFIG["EXEEXT"]
-    rubyexe = (ruby + exeext if exeext and !exeext.empty?)
-    3.times do
-      if File.exist? ruby and File.executable? ruby and !File.directory? ruby
-        return File.expand_path(ruby)
-      end
-      if rubyexe and File.exist? rubyexe and File.executable? rubyexe
-        return File.expand_path(rubyexe)
-      end
-      ruby = File.join("..", ruby)
-    end
-    if defined?(RbConfig.ruby)
+      ruby
+    elsif defined?(RbConfig.ruby)
       RbConfig.ruby
     else
+      ruby = "ruby"
+      exeext = RbConfig::CONFIG["EXEEXT"]
+      rubyexe = (ruby + exeext if exeext and !exeext.empty?)
+      3.times do
+        if File.exist? ruby and File.executable? ruby and !File.directory? ruby
+          return File.expand_path(ruby)
+        end
+        if rubyexe and File.exist? rubyexe and File.executable? rubyexe
+          return File.expand_path(rubyexe)
+        end
+        ruby = File.join("..", ruby)
+      end
       "ruby"
     end
   end
@@ -53,7 +52,14 @@ def capture_global_values
       @original_internal_encoding = Encoding.default_internal
       @original_external_encoding = Encoding.default_external
       @original_verbose = $VERBOSE
-      @original_warning = defined?(Warning.[]) ? %i[deprecated experimental].to_h {|i| [i, Warning[i]]} : nil
+      @original_warning =
+        if defined?(Warning.categories)
+          Warning.categories.to_h {|i| [i, Warning[i]]}
+        elsif defined?(Warning.[]) # 2.7+
+          %i[deprecated experimental performance].to_h do |i|
+            [i, begin Warning[i]; rescue ArgumentError; end]
+          end.compact
+        end
     end
   end
 
@@ -73,6 +79,72 @@ def timeout(sec, klass = nil, message = nil, &blk)
   end
   module_function :timeout
 
+  class Debugger
+    @list = []
+
+    attr_accessor :name
+
+    def self.register(name, &block)
+      @list << new(name, &block)
+    end
+
+    def initialize(name, &block)
+      @name = name
+      instance_eval(&block)
+    end
+
+    def usable?; false; end
+
+    def start(pid, *args) end
+
+    def dump(pid, timeout: 60, reprieve: timeout&.div(4))
+      dpid = start(pid, *command_file(File.join(__dir__, "dump.#{name}")), out: :err)
+    rescue Errno::ENOENT
+      return
+    else
+      return unless dpid
+      [[timeout, :TERM], [reprieve, :KILL]].find do |t, sig|
+        begin
+          return EnvUtil.timeout(t) {Process.wait(dpid)}
+        rescue Timeout::Error
+          Process.kill(sig, dpid)
+        end
+      end
+      true
+    end
+
+    # sudo -n: --non-interactive
+    PRECOMMAND = (%[sudo -n] if /darwin/ =~ RUBY_PLATFORM)
+
+    def spawn(*args, **opts)
+      super(*PRECOMMAND, *args, **opts)
+    end
+
+    register("gdb") do
+      class << self
+        def usable?; system(*%w[gdb --batch --quiet --nx -ex exit]); end
+        def start(pid, *args, **opts)
+          spawn(*%W[gdb --batch --quiet --pid #{pid}], *args, **opts)
+        end
+        def command_file(file) "--command=#{file}"; end
+      end
+    end
+
+    register("lldb") do
+      class << self
+        def usable?; system(*%w[lldb -Q --no-lldbinit -o exit]); end
+        def start(pid, *args, **opts)
+          spawn(*%W[lldb --batch -Q --attach-pid #{pid}], *args, **opts)
+        end
+        def command_file(file) ["--source", file]; end
+      end
+    end
+
+    def self.search
+      @debugger ||= @list.find(&:usable?)
+    end
+  end
+
   def terminate(pid, signal = :TERM, pgroup = nil, reprieve = 1)
     reprieve = apply_timeout_scale(reprieve) if reprieve
 
@@ -88,17 +160,12 @@ def terminate(pid, signal = :TERM, pgroup = nil, reprieve = 1)
       pgroup = pid
     end
 
-    lldb = true if /darwin/ =~ RUBY_PLATFORM
-
+    dumped = false
     while signal = signals.shift
 
-      if lldb and [:ABRT, :KILL].include?(signal)
-        lldb = false
-        # sudo -n: --non-interactive
-        # lldb -p: attach
-        #      -o: run command
-        system(*%W[sudo -n lldb -p #{pid} --batch -o bt\ all -o call\ rb_vmdebug_stack_dump_all_threads() -o quit])
-        true
+      if !dumped and [:ABRT, :KILL].include?(signal)
+        Debugger.search&.dump(pid)
+        dumped = true
       end
 
       begin
@@ -152,8 +219,18 @@ def invoke_ruby(args, stdin_data = "", capture_stdout = false, capture_stderr =
     if RUBYLIB and lib = child_env["RUBYLIB"]
       child_env["RUBYLIB"] = [lib, RUBYLIB].join(File::PATH_SEPARATOR)
     end
-    child_env['ASAN_OPTIONS'] = ENV['ASAN_OPTIONS'] if ENV['ASAN_OPTIONS']
+
+    # remain env
+    %w(ASAN_OPTIONS RUBY_ON_BUG).each{|name|
+      child_env[name] = ENV[name] if !child_env.key?(name) and ENV.key?(name)
+    }
+
     args = [args] if args.kind_of?(String)
+    # use the same parser as current ruby
+    if (args.none? { |arg| arg.start_with?("--parser=") } and
+        /^ +--parser=/ =~ IO.popen([rubybin, "--help"], &:read))
+      args = ["--parser=#{current_parser}"] + args
+    end
     pid = spawn(child_env, *precommand, rubybin, *args, opt)
     in_c.close
     out_c&.close
@@ -201,6 +278,12 @@ def invoke_ruby(args, stdin_data = "", capture_stdout = false, capture_stderr =
   end
   module_function :invoke_ruby
 
+  def current_parser
+    features = RUBY_DESCRIPTION[%r{\)\K [-+*/%._0-9a-zA-Z\[\] ]*(?=\[[-+*/%._0-9a-zA-Z]+\]\z)}]
+    features&.split&.include?("+PRISM") ? "prism" : "parse.y"
+  end
+  module_function :current_parser
+
   def verbose_warning
     class << (stderr = "".dup)
       alias write concat
@@ -217,6 +300,21 @@ def flush; end
   end
   module_function :verbose_warning
 
+  if defined?(Warning.[]=)
+    def deprecation_warning
+      previous_deprecated = Warning[:deprecated]
+      Warning[:deprecated] = true
+      yield
+    ensure
+      Warning[:deprecated] = previous_deprecated
+    end
+  else
+    def deprecation_warning
+      yield
+    end
+  end
+  module_function :deprecation_warning
+
   def default_warning
     $VERBOSE = false
     yield
@@ -241,6 +339,28 @@ def under_gc_stress(stress = true)
   end
   module_function :under_gc_stress
 
+  def under_gc_compact_stress(val = :empty, &block)
+    raise "compaction doesn't work well on s390x. Omit the test in the caller." if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+
+    if GC.respond_to?(:auto_compact)
+      auto_compact = GC.auto_compact
+      GC.auto_compact = val
+    end
+
+    under_gc_stress(&block)
+  ensure
+    GC.auto_compact = auto_compact if GC.respond_to?(:auto_compact)
+  end
+  module_function :under_gc_compact_stress
+
+  def without_gc
+    prev_disabled = GC.disable
+    yield
+  ensure
+    GC.enable unless prev_disabled
+  end
+  module_function :without_gc
+
   def with_default_external(enc = nil, of: nil)
     enc = of.encoding if defined?(of.encoding)
     suppress_warning { Encoding.default_external = enc }
@@ -294,16 +414,24 @@ def self.diagnostic_reports(signame, pid, now)
       cmd = @ruby_install_name if "ruby-runner#{RbConfig::CONFIG["EXEEXT"]}" == cmd
       path = DIAGNOSTIC_REPORTS_PATH
       timeformat = DIAGNOSTIC_REPORTS_TIMEFORMAT
-      pat = "#{path}/#{cmd}_#{now.strftime(timeformat)}[-_]*.crash"
+      pat = "#{path}/#{cmd}_#{now.strftime(timeformat)}[-_]*.{crash,ips}"
       first = true
       30.times do
         first ? (first = false) : sleep(0.1)
         Dir.glob(pat) do |name|
           log = File.read(name) rescue next
-          if /\AProcess:\s+#{cmd} \[#{pid}\]$/ =~ log
-            File.unlink(name)
-            File.unlink("#{path}/.#{File.basename(name)}.plist") rescue nil
-            return log
+          case name
+          when /\.crash\z/
+            if /\AProcess:\s+#{cmd} \[#{pid}\]$/ =~ log
+              File.unlink(name)
+              File.unlink("#{path}/.#{File.basename(name)}.plist") rescue nil
+              return log
+            end
+          when /\.ips\z/
+            if /^ *"pid" *: *#{pid},/ =~ log
+              File.unlink(name)
+              return log
+            end
           end
         end
       end
diff --git a/test/tool/lib/gem_env.rb b/test/tool/lib/gem_env.rb
new file mode 100644
index 00000000000..1893e076573
--- /dev/null
+++ b/test/tool/lib/gem_env.rb
@@ -0,0 +1 @@
+ENV['GEM_HOME'] = File.expand_path('../../.bundle', __dir__)
diff --git a/test/tool/lib/iseq_loader_checker.rb b/test/tool/lib/iseq_loader_checker.rb
index 3f07b3a999e..73784f8450f 100644
--- a/test/tool/lib/iseq_loader_checker.rb
+++ b/test/tool/lib/iseq_loader_checker.rb
@@ -76,6 +76,15 @@ def self.translate i1
     # return value
     i2_bin if CHECK_TO_BINARY
   end if CHECK_TO_A || CHECK_TO_BINARY
+
+  if opt == "prism"
+    # If RUBY_ISEQ_DUMP_DEBUG is "prism", we'll set up
+    # InstructionSequence.load_iseq to intercept loading filepaths to compile
+    # using prism.
+    def self.load_iseq(filepath)
+      RubyVM::InstructionSequence.compile_file_prism(filepath)
+    end
+  end
 end
 
 #require_relative 'x'; exit(1)
diff --git a/test/tool/lib/launchable.rb b/test/tool/lib/launchable.rb
new file mode 100644
index 00000000000..38f4fe92b3e
--- /dev/null
+++ b/test/tool/lib/launchable.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+require 'json'
+require 'uri'
+
+module Launchable
+  ##
+  # JsonStreamWriter writes a JSON file using a stream.
+  # By utilizing a stream, we can minimize memory usage, especially for large files.
+  class JsonStreamWriter
+    def initialize(path)
+      @file = File.open(path, "w")
+      @file.write("{")
+      @indent_level = 0
+      @is_first_key_val = true
+      @is_first_obj = true
+      write_new_line
+    end
+
+    def write_object obj
+      if @is_first_obj
+        @is_first_obj = false
+      else
+        write_comma
+        write_new_line
+      end
+      @indent_level += 1
+      @file.write(to_json_str(obj))
+      @indent_level -= 1
+      @is_first_key_val = true
+      # Occasionally, invalid JSON will be created as shown below, especially when `--repeat-count` is specified.
+      # {
+      #   "testPath": "file=test%2Ftest_timeout.rb&class=TestTimeout&testcase=test_allows_zero_seconds",
+      #   "status": "TEST_PASSED",
+      #   "duration": 2.7e-05,
+      #   "createdAt": "2024-02-09 12:21:07 +0000",
+      #   "stderr": null,
+      #   "stdout": null
+      # }: null <- here
+      # },
+      # To prevent this, IO#flush is called here.
+      @file.flush
+    end
+
+    def write_array(key)
+      @indent_level += 1
+      @file.write(to_json_str(key))
+      write_colon
+      @file.write(" ", "[")
+      write_new_line
+    end
+
+    def close
+      return if @file.closed?
+      close_array
+      @indent_level -= 1
+      write_new_line
+      @file.write("}", "\n")
+      @file.flush
+      @file.close
+    end
+
+    private
+    def to_json_str(obj)
+      json = JSON.pretty_generate(obj)
+      json.gsub(/^/, ' ' * (2 * @indent_level))
+    end
+
+    def write_indent
+      @file.write(" " * 2 * @indent_level)
+    end
+
+    def write_new_line
+      @file.write("\n")
+    end
+
+    def write_comma
+      @file.write(',')
+    end
+
+    def write_colon
+      @file.write(":")
+    end
+
+    def close_array
+      write_new_line
+      write_indent
+      @file.write("]")
+      @indent_level -= 1
+    end
+  end
+end
diff --git a/test/tool/lib/leakchecker.rb b/test/tool/lib/leakchecker.rb
index ed507969402..69df9a64b87 100644
--- a/test/tool/lib/leakchecker.rb
+++ b/test/tool/lib/leakchecker.rb
@@ -112,7 +112,7 @@ def check_fd_leak(test_name)
       }
       unless fd_leaked.empty?
         unless @@try_lsof == false
-          @@try_lsof |= system(*%W[lsof -a -d #{fd_leaked.minmax.uniq.join("-")} -p #$$], out: Test::Unit::Runner.output)
+          @@try_lsof |= system(*%W[lsof -w -a -d #{fd_leaked.minmax.uniq.join("-")} -p #$$], out: Test::Unit::Runner.output)
         end
       end
       h.each {|fd, list|
@@ -136,14 +136,14 @@ class << self
         attr_accessor :count
       end
 
-      def new(data)
+      def new(...)
         LeakChecker::TempfileCounter.count += 1
-        super(data)
+        super
       end
     }
     LeakChecker.const_set(:TempfileCounter, m)
 
-    class << Tempfile::Remover
+    class << Tempfile
       prepend LeakChecker::TempfileCounter
     end
   end
@@ -155,8 +155,8 @@ def find_tempfiles(prev_count=-1)
     if prev_count == count
       [prev_count, []]
     else
-      tempfiles = ObjectSpace.each_object(Tempfile).find_all {|t|
-        t.instance_variable_defined?(:@tmpfile) and t.path
+      tempfiles = ObjectSpace.each_object(Tempfile).reject {|t|
+        t.instance_variables.empty? || t.closed?
       }
       [count, tempfiles]
     end
@@ -182,7 +182,8 @@ def check_tempfile_leak(test_name)
 
   def find_threads
     Thread.list.find_all {|t|
-      t != Thread.current && t.alive?
+      t != Thread.current && t.alive? &&
+        !(t.thread_variable?(:"\0__detached_thread__") && t.thread_variable_get(:"\0__detached_thread__"))
     }
   end
 
@@ -232,7 +233,13 @@ def check_env(test_name)
     old_env = @env_info
     new_env = find_env
     return false if old_env == new_env
+    if defined?(Bundler::EnvironmentPreserver)
+      bundler_prefix = Bundler::EnvironmentPreserver::BUNDLER_PREFIX
+    end
     (old_env.keys | new_env.keys).sort.each {|k|
+      # Don't report changed environment variables caused by Bundler's backups
+      next if bundler_prefix and k.start_with?(bundler_prefix)
+
       if old_env.has_key?(k)
         if new_env.has_key?(k)
           if old_env[k] != new_env[k]
diff --git a/test/tool/lib/memory_status.rb b/test/tool/lib/memory_status.rb
index 5e9e80a68a6..429e5f6a1d3 100644
--- a/test/tool/lib/memory_status.rb
+++ b/test/tool/lib/memory_status.rb
@@ -12,7 +12,7 @@ module Memory
     PROC_FILE = procfile
     VM_PAT = pat
     def self.read_status
-      IO.foreach(PROC_FILE, encoding: Encoding::ASCII_8BIT) do |l|
+      File.foreach(PROC_FILE, encoding: Encoding::ASCII_8BIT) do |l|
         yield($1.downcase.intern, $2.to_i * 1024) if VM_PAT =~ l
       end
     end
@@ -20,48 +20,68 @@ def self.read_status
     data.scan(pat) {|k, v| keys << k.downcase.intern}
 
   when /mswin|mingw/ =~ RUBY_PLATFORM
-    require 'fiddle/import'
-    require 'fiddle/types'
-
-    module Win32
-      extend Fiddle::Importer
-      dlload "kernel32.dll", "psapi.dll"
-      include Fiddle::Win32Types
-      typealias "SIZE_T", "size_t"
-
-      PROCESS_MEMORY_COUNTERS = struct [
-        "DWORD  cb",
-        "DWORD  PageFaultCount",
-        "SIZE_T PeakWorkingSetSize",
-        "SIZE_T WorkingSetSize",
-        "SIZE_T QuotaPeakPagedPoolUsage",
-        "SIZE_T QuotaPagedPoolUsage",
-        "SIZE_T QuotaPeakNonPagedPoolUsage",
-        "SIZE_T QuotaNonPagedPoolUsage",
-        "SIZE_T PagefileUsage",
-        "SIZE_T PeakPagefileUsage",
-      ]
-
-      typealias "PPROCESS_MEMORY_COUNTERS", "PROCESS_MEMORY_COUNTERS*"
-
-      extern "HANDLE GetCurrentProcess()", :stdcall
-      extern "BOOL GetProcessMemoryInfo(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD)", :stdcall
-
-      module_function
-      def memory_info
-        size = PROCESS_MEMORY_COUNTERS.size
-        data = PROCESS_MEMORY_COUNTERS.malloc
-        data.cb = size
-        data if GetProcessMemoryInfo(GetCurrentProcess(), data, size)
+    keys.push(:size, :rss, :peak)
+
+    begin
+      require 'fiddle/import'
+      require 'fiddle/types'
+    rescue LoadError
+      # Fallback to PowerShell command to get memory information for current process
+      def self.read_status
+        cmd = [
+          "powershell.exe", "-NoProfile", "-Command",
+          "Get-Process -Id #{$$} | " \
+          "% { Write-Output $_.PagedMemorySize64 $_.WorkingSet64 $_.PeakWorkingSet64 }"
+        ]
+
+        IO.popen(cmd, "r", err: [:child, :out]) do |out|
+          if /^(\d+)\n(\d+)\n(\d+)$/ =~ out.read
+            yield :size, $1.to_i
+            yield :rss, $2.to_i
+            yield :peak, $3.to_i
+          end
+        end
+      end
+    else
+      module Win32
+        extend Fiddle::Importer
+        dlload "kernel32.dll", "psapi.dll"
+        include Fiddle::Win32Types
+        typealias "SIZE_T", "size_t"
+
+        PROCESS_MEMORY_COUNTERS = struct [
+          "DWORD  cb",
+          "DWORD  PageFaultCount",
+          "SIZE_T PeakWorkingSetSize",
+          "SIZE_T WorkingSetSize",
+          "SIZE_T QuotaPeakPagedPoolUsage",
+          "SIZE_T QuotaPagedPoolUsage",
+          "SIZE_T QuotaPeakNonPagedPoolUsage",
+          "SIZE_T QuotaNonPagedPoolUsage",
+          "SIZE_T PagefileUsage",
+          "SIZE_T PeakPagefileUsage",
+        ]
+
+        typealias "PPROCESS_MEMORY_COUNTERS", "PROCESS_MEMORY_COUNTERS*"
+
+        extern "HANDLE GetCurrentProcess()", :stdcall
+        extern "BOOL GetProcessMemoryInfo(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD)", :stdcall
+
+        module_function
+        def memory_info
+          size = PROCESS_MEMORY_COUNTERS.size
+          data = PROCESS_MEMORY_COUNTERS.malloc
+          data.cb = size
+          data if GetProcessMemoryInfo(GetCurrentProcess(), data, size)
+        end
       end
-    end
 
-    keys.push(:size, :rss, :peak)
-    def self.read_status
-      if info = Win32.memory_info
-        yield :size, info.PagefileUsage
-        yield :rss, info.WorkingSetSize
-        yield :peak, info.PeakWorkingSetSize
+      def self.read_status
+        if info = Win32.memory_info
+          yield :size, info.PagefileUsage
+          yield :rss, info.WorkingSetSize
+          yield :peak, info.PeakWorkingSetSize
+        end
       end
     end
   when (require_relative 'find_executable'
diff --git a/test/tool/lib/output.rb b/test/tool/lib/output.rb
new file mode 100644
index 00000000000..8cb426ae4af
--- /dev/null
+++ b/test/tool/lib/output.rb
@@ -0,0 +1,70 @@
+require_relative 'vpath'
+require_relative 'colorize'
+
+class Output
+  attr_reader :path, :vpath
+
+  def initialize(path: nil, timestamp: nil, ifchange: nil, color: nil,
+                 overwrite: false, create_only: false, vpath: VPath.new)
+    @path = path
+    @timestamp = timestamp
+    @ifchange = ifchange
+    @color = color
+    @overwrite = overwrite
+    @create_only = create_only
+    @vpath = vpath
+  end
+
+  COLOR_WHEN = {
+    'always' => true, 'auto' => nil, 'never' => false,
+    nil => true, false => false,
+  }
+
+  def def_options(opt)
+    opt.separator("  Output common options:")
+    opt.on('-o', '--output=PATH') {|v| @path = v}
+    opt.on('-t', '--timestamp[=PATH]') {|v| @timestamp = v || true}
+    opt.on('-c', '--[no-]if-change') {|v| @ifchange = v}
+    opt.on('--[no-]color=[WHEN]', COLOR_WHEN.keys) {|v| @color = COLOR_WHEN[v]}
+    opt.on('--[no-]create-only') {|v| @create_only = v}
+    opt.on('--[no-]overwrite') {|v| @overwrite = v}
+    @vpath.def_options(opt)
+  end
+
+  def write(data, overwrite: @overwrite, create_only: @create_only)
+    unless @path
+      $stdout.print data
+      return true
+    end
+    color = Colorize.new(@color)
+    unchanged = color.pass("unchanged")
+    updated = color.fail("updated")
+    outpath = nil
+
+    if (@ifchange or overwrite or create_only) and (@vpath.open(@path, "rb") {|f|
+      outpath = f.path
+      if @ifchange or create_only
+        original = f.read
+        (@ifchange and original == data) or (create_only and !original.empty?)
+      end
+    } rescue false)
+      puts "#{outpath} #{unchanged}"
+      written = false
+    else
+      unless overwrite and outpath and (File.binwrite(outpath, data) rescue nil)
+        File.binwrite(outpath = @path, data)
+      end
+      puts "#{outpath} #{updated}"
+      written = true
+    end
+    if timestamp = @timestamp
+      if timestamp == true
+        dir, base = File.split(@path)
+        timestamp = File.join(dir, ".time." + base)
+      end
+      File.binwrite(timestamp, '')
+      File.utime(nil, nil, timestamp)
+    end
+    written
+  end
+end
diff --git a/test/tool/lib/path.rb b/test/tool/lib/path.rb
new file mode 100644
index 00000000000..f16a164338d
--- /dev/null
+++ b/test/tool/lib/path.rb
@@ -0,0 +1,101 @@
+module Path
+  module_function
+
+  def clean(path)
+    path = "#{path}/".gsub(/(\A|\/)(?:\.\/)+/, '\1').tr_s('/', '/')
+    nil while path.sub!(/[^\/]+\/\.\.\//, '')
+    path
+  end
+
+  def relative(path, base)
+    path = clean(path)
+    base = clean(base)
+    path, base = [path, base].map{|s|s.split("/")}
+    until path.empty? or base.empty? or path[0] != base[0]
+      path.shift
+      base.shift
+    end
+    path, base = [path, base].map{|s|s.join("/")}
+    if base.empty?
+      path
+    elsif base.start_with?("../") or File.absolute_path?(base)
+      File.expand_path(path)
+    else
+      base.gsub!(/[^\/]+/, '..')
+      File.join(base, path)
+    end
+  end
+
+  def clean_link(src, dest)
+    begin
+      link = File.readlink(dest)
+    rescue
+    else
+      return if link == src
+      File.unlink(dest)
+    end
+    yield src, dest
+  end
+
+  # Extensions to FileUtils
+
+  module Mswin
+    def ln_safe(src, dest, real_src, *opt)
+      cmd = ["mklink", dest.tr("/", "\\"), src.tr("/", "\\")]
+      cmd[1, 0] = opt
+      return if system("cmd", "/c", *cmd)
+      # TODO: use RUNAS or something
+      puts cmd.join(" ")
+    end
+
+    def ln_dir_safe(src, dest, real_src)
+      ln_safe(src, dest, "/d")
+    end
+  end
+
+  module HardlinkExcutable
+    def ln_exe(relative_src, dest, src)
+      ln(src, dest, force: true)
+    end
+  end
+
+  def ln_safe(src, dest, real_src)
+    ln_sf(src, dest)
+  rescue Errno::ENOENT
+    # Windows disallows to create broken symboic links, probably because
+    # it is a kind of reparse points.
+    raise if File.exist?(real_src)
+  end
+
+  alias ln_dir_safe ln_safe
+  alias ln_exe ln_safe
+
+  def ln_relative(src, dest, executable = false)
+    return if File.identical?(src, dest)
+    parent = File.dirname(dest)
+    File.directory?(parent) or mkdir_p(parent)
+    if executable
+      return (ln_exe(relative(src, parent), dest, src) if File.exist?(src))
+    end
+    clean_link(relative(src, parent), dest) {|s, d| ln_safe(s, d, src)}
+  end
+
+  def ln_dir_relative(src, dest)
+    return if File.identical?(src, dest)
+    parent = File.dirname(dest)
+    File.directory?(parent) or mkdir_p(parent)
+    clean_link(relative(src, parent), dest) {|s, d| ln_dir_safe(s, d, src)}
+  end
+
+  case (CROSS_COMPILING || RUBY_PLATFORM)
+  when /linux|darwin|solaris/
+    prepend HardlinkExcutable
+    extend HardlinkExcutable
+  when /mingw|mswin/
+    unless File.respond_to?(:symlink)
+      prepend Mswin
+      extend Mswin
+    end
+  else
+  end
+end
diff --git a/test/tool/lib/test/jobserver.rb b/test/tool/lib/test/jobserver.rb
new file mode 100644
index 00000000000..7b889163b02
--- /dev/null
+++ b/test/tool/lib/test/jobserver.rb
@@ -0,0 +1,47 @@
+module Test
+  module JobServer
+  end
+end
+
+class << Test::JobServer
+  def connect(makeflags = ENV["MAKEFLAGS"])
+    return unless /(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:((?:\\.|\S)+))/ =~ makeflags
+    begin
+      if fifo = $3
+        fifo.gsub!(/\\(?=.)/, '')
+        r = File.open(fifo, IO::RDONLY|IO::NONBLOCK|IO::BINARY)
+        w = File.open(fifo, IO::WRONLY|IO::NONBLOCK|IO::BINARY)
+      else
+        r = IO.for_fd($1.to_i(10), "rb", autoclose: false)
+        w = IO.for_fd($2.to_i(10), "wb", autoclose: false)
+      end
+    rescue
+      r&.close
+      nil
+    else
+      return r, w
+    end
+  end
+
+  def acquire_possible(r, w, max)
+    return unless tokens = r.read_nonblock(max - 1, exception: false)
+    if (jobs = tokens.size) > 0
+      jobserver, w = w, nil
+      at_exit do
+        jobserver.print(tokens)
+        jobserver.close
+      end
+    end
+    return jobs + 1
+  rescue Errno::EBADF
+  ensure
+    r&.close
+    w&.close
+  end
+
+  def max_jobs(max = 2, makeflags = ENV["MAKEFLAGS"])
+    if max > 1 and (r, w = connect(makeflags))
+      acquire_possible(r, w, max)
+    end
+  end
+end
diff --git a/test/tool/lib/test/unit.rb b/test/tool/lib/test/unit.rb
index 54e1c601ce9..4ee5b66a7d7 100644
--- a/test/tool/lib/test/unit.rb
+++ b/test/tool/lib/test/unit.rb
@@ -1,50 +1,30 @@
 # frozen_string_literal: true
 
+# Enable deprecation warnings for test-all, so deprecated methods/constants/functions are dealt with early.
+Warning[:deprecated] = true
+
+if ENV['BACKTRACE_FOR_DEPRECATION_WARNINGS']
+  Warning.extend Module.new {
+    def warn(message, category: nil, **kwargs)
+      if category == :deprecated and $stderr.respond_to?(:puts)
+        $stderr.puts nil, message, caller, nil
+      else
+        super
+      end
+    end
+  }
+end
+
 require_relative '../envutil'
 require_relative '../colorize'
 require_relative '../leakchecker' if RUBY_ENGINE == 'ruby'
 require_relative '../test/unit/testcase'
+require_relative '../test/jobserver'
 require 'optparse'
 
 # See Test::Unit
 module Test
 
-  class << self
-    ##
-    # Filter object for backtraces.
-
-    attr_accessor :backtrace_filter
-  end
-
-  class BacktraceFilter # :nodoc:
-    def filter bt
-      return ["No backtrace"] unless bt
-
-      new_bt = []
-      pattern = %r[/(?:lib\/test/|core_assertions\.rb:)]
-
-      unless $DEBUG then
-        bt.each do |line|
-          break if pattern.match?(line)
-          new_bt << line
-        end
-
-        new_bt = bt.reject { |line| pattern.match?(line) } if new_bt.empty?
-        new_bt = bt.dup if new_bt.empty?
-      else
-        new_bt = bt.dup
-      end
-
-      new_bt
-    end
-  end
-
-  self.backtrace_filter = BacktraceFilter.new
-
-  def self.filter_backtrace bt # :nodoc:
-    backtrace_filter.filter bt
-  end
-
   ##
   # Test::Unit is an implementation of the xUnit testing framework for Ruby.
   module Unit
@@ -58,6 +38,26 @@ class AssertionFailedError < Exception; end
 
     class PendedError < AssertionFailedError; end
 
+    class << self
+      ##
+      # Extract the location where the last assertion method was
+      # called.  Returns "<empty>" if _e_ does not have backtrace, or
+      # an empty string if no assertion method location was found.
+
+      def location e
+        last_before_assertion = nil
+
+        return '<empty>' unless e&.backtrace # SystemStackError can return nil.
+
+        e.backtrace.reverse_each do |s|
+          break if s =~ /:in \W(?:.*\#)?(?:assert|refute|flunk|pass|fail|raise|must|wont)/
+          last_before_assertion = s
+        end
+        return "" unless last_before_assertion
+        /:in / =~ last_before_assertion ? $` : last_before_assertion
+      end
+    end
+
     module Order
       class NoSort
         def initialize(seed)
@@ -74,17 +74,7 @@ def group(list)
         end
       end
 
-      module JITFirst
-        def group(list)
-          # JIT first
-          jit, others = list.partition {|e| /test_jit/ =~ e}
-          jit + others
-        end
-      end
-
       class Alpha < NoSort
-        include JITFirst
-
         def sort_by_name(list)
           list.sort_by(&:name)
         end
@@ -97,8 +87,6 @@ def sort_by_string(list)
 
       # shuffle test suites based on CRC32 of their names
       Shuffle = Struct.new(:seed, :salt) do
-        include JITFirst
-
         def initialize(seed)
           self.class::CRC_TBL ||= (0..255).map {|i|
             (0..7).inject(i) {|c,| (c & 1 == 1) ? (0xEDB88320 ^ (c >> 1)) : (c >> 1) }
@@ -116,6 +104,10 @@ def sort_by_string(list)
           list.sort_by {|e| randomize_key(e)}
         end
 
+        def group(list)
+          list
+        end
+
         private
 
         def crc32(str, crc32 = 0xffffffff)
@@ -199,6 +191,7 @@ def process_args(args = [])
         @help = "\n" + orig_args.map { |s|
           "  " + (s =~ /[\s|&<>$()]/ ? s.inspect : s)
         }.join("\n")
+
         @options = options
       end
 
@@ -257,6 +250,8 @@ def non_options(files, options)
     end
 
     module Parallel # :nodoc: all
+      attr_accessor :prefix
+
       def process_args(args = [])
         return @options if @options
         options = super
@@ -268,23 +263,10 @@ def process_args(args = [])
 
       def non_options(files, options)
         @jobserver = nil
-        makeflags = ENV.delete("MAKEFLAGS")
-        if !options[:parallel] and
-          /(?:\A|\s)--jobserver-(?:auth|fds)=(\d+),(\d+)/ =~ makeflags
-          begin
-            r = IO.for_fd($1.to_i(10), "rb", autoclose: false)
-            w = IO.for_fd($2.to_i(10), "wb", autoclose: false)
-          rescue
-            r.close if r
-            nil
-          else
-            r.close_on_exec = true
-            w.close_on_exec = true
-            @jobserver = [r, w]
-            options[:parallel] ||= 1
-          end
+        if !options[:parallel] and @jobserver = Test::JobServer.connect(ENV.delete("MAKEFLAGS"))
+          options[:parallel] ||= 256 # number of tokens to acquire first
         end
-        @worker_timeout = EnvUtil.apply_timeout_scale(options[:worker_timeout] || 180)
+        @worker_timeout = EnvUtil.apply_timeout_scale(options[:worker_timeout] || 1200)
         super
       end
 
@@ -300,7 +282,7 @@ def setup_options(opts, options)
 
         opts.separator "parallel test options:"
 
-        options[:retry] = true
+        options[:retry] = false
 
         opts.on '-j N', '--jobs N', /\A(t)?(\d+)\z/, "Allow run tests with N jobs at once" do |_, t, a|
           options[:testing] = true & t # For testing
@@ -324,7 +306,8 @@ def setup_options(opts, options)
           options[:retry] = false
         end
 
-        opts.on '--ruby VAL', "Path to ruby which is used at -j option" do |a|
+        opts.on '--ruby VAL', "Path to ruby which is used at -j option",
+                "Also used as EnvUtil.rubybin by some assertion methods" do |a|
           options[:ruby] = a.split(/ /).reject(&:empty?)
         end
 
@@ -371,8 +354,12 @@ def puts(*args)
           @io.puts(*args)
         end
 
-        def run(task,type)
-          @file = File.basename(task, ".rb")
+        def run(task, type, base = nil)
+          if base
+            @file = task.delete_prefix(base).chomp(".rb")
+          else
+            @file = File.basename(task, ".rb")
+          end
           @real_file = task
           begin
             puts "loadpath #{[Marshal.dump($:-@loadpath)].pack("m0")}"
@@ -407,16 +394,19 @@ def close
         rescue IOError
         end
 
-        def quit
+        def quit(reason = :normal)
           return if @io.closed?
           @quit_called = true
-          @io.puts "quit"
+          @io.puts "quit #{reason}"
         rescue Errno::EPIPE => e
           warn "#{@pid}:#{@status.to_s.ljust(7)}:#{@file}: #{e.message}"
         end
 
         def kill
-          Process.kill(:KILL, @pid)
+          EnvUtil::Debugger.search&.dump(@pid)
+          signal = RUBY_PLATFORM =~ /mswin|mingw/ ? :KILL : :SEGV
+          Process.kill(signal, @pid)
+          warn "worker #{to_s} does not respond; #{signal} is sent"
         rescue Errno::ESRCH
         end
 
@@ -470,8 +460,8 @@ def after_worker_down(worker, e=nil, c=false)
         real_file = worker.real_file and warn "running file: #{real_file}"
         @need_quit = true
         warn ""
-        warn "Some worker was crashed. It seems ruby interpreter's bug"
-        warn "or, a bug of test/unit/parallel.rb. try again without -j"
+        warn "A test worker crashed. It might be an interpreter bug or"
+        warn "a bug in test/unit/parallel.rb. Try again without the -j"
         warn "option."
         warn ""
         if File.exist?('core')
@@ -534,15 +524,15 @@ def quit_workers(&cond)
         @workers.reject! do |worker|
           next unless cond&.call(worker)
           begin
-            Timeout.timeout(1) do
-              worker.quit
+            Timeout.timeout(5) do
+              worker.quit(cond ? :timeout : :normal)
             end
           rescue Errno::EPIPE
           rescue Timeout::Error
           end
           closed&.push worker
           begin
-            Timeout.timeout(0.2) do
+            Timeout.timeout(1) do
               worker.close
             end
           rescue Timeout::Error
@@ -555,7 +545,7 @@ def quit_workers(&cond)
         return if (closed ||= @workers).empty?
         pids = closed.map(&:pid)
         begin
-          Timeout.timeout(0.2 * closed.size) do
+          Timeout.timeout(1 * closed.size) do
             Process.waitall
           end
         rescue Timeout::Error
@@ -596,7 +586,7 @@ def deal(io, type, result, rep, shutting_down = false)
             worker.quit
             worker = launch_worker
           end
-          worker.run(task, type)
+          worker.run(task, type, (@prefix unless @options[:job_status] == :replace))
           @test_count += 1
 
           jobs_status(worker)
@@ -674,14 +664,22 @@ def _run_parallel suites, type, result
         @ios          = [] # Array of worker IOs
         @job_tokens   = String.new(encoding: Encoding::ASCII_8BIT) if @jobserver
         begin
-          [@tasks.size, @options[:parallel]].min.times {launch_worker}
-
           while true
-            timeout = [(@workers.filter_map {|w| w.response_at}.min&.-(Time.now) || 0) + @worker_timeout, 1].max
+            newjobs = [@tasks.size, @options[:parallel]].min - @workers.size
+            if newjobs > 0
+              if @jobserver
+                t = @jobserver[0].read_nonblock(newjobs, exception: false)
+                @job_tokens << t if String === t
+                newjobs = @job_tokens.size + 1 - @workers.size
+              end
+              newjobs.times {launch_worker}
+            end
+
+            timeout = [(@workers.filter_map {|w| w.response_at}.min&.-(Time.now) || 0), 0].max + @worker_timeout
 
             if !(_io = IO.select(@ios, nil, nil, timeout))
               timeout = Time.now - @worker_timeout
-              quit_workers {|w| w.response_at < timeout}&.map {|w|
+              quit_workers {|w| w.response_at&.<(timeout) }&.map {|w|
                 rep << {file: w.real_file, result: nil, testcase: w.current[0], error: w.current}
               }
             elsif _io.first.any? {|io|
@@ -691,15 +689,9 @@ def _run_parallel suites, type, result
             }
               break
             end
-            break if @tasks.empty? and @workers.empty?
-            if @jobserver and @job_tokens and !@tasks.empty? and
-               ((newjobs = [@tasks.size, @options[:parallel]].min) > @workers.size or
-                !@workers.any? {|x| x.status == :ready})
-              t = @jobserver[0].read_nonblock(newjobs, exception: false)
-              if String === t
-                @job_tokens << t
-                t.size.times {launch_worker}
-              end
+            if @tasks.empty?
+              break if @workers.empty?
+              next # wait for all workers to finish
             end
           end
         rescue Interrupt => ex
@@ -707,7 +699,7 @@ def _run_parallel suites, type, result
           return result
         ensure
           if file = @options[:timetable_data]
-            open(file, 'w'){|f|
+            File.open(file, 'w'){|f|
               @records.each{|(worker, suite), (st, ed)|
                 f.puts '[' + [worker.dump, suite.dump, st.to_f * 1_000, ed.to_f * 1_000].join(", ") + '],'
               }
@@ -735,14 +727,34 @@ def _run_parallel suites, type, result
             del_status_line or puts
             error, suites = suites.partition {|r| r[:error]}
             unless suites.empty?
-              puts "\n""Retrying..."
+              puts "\n"
+              @failed_output.puts "Failed tests:"
+              suites.each {|r|
+                r[:report].each {|c, m, e|
+                  @failed_output.puts "#{c}##{m}: #{e&.class}: #{e&.message&.slice(/\A.*/)}"
+                }
+              }
+              @failed_output.puts "\n"
+              puts "Retrying..."
               @verbose = options[:verbose]
               suites.map! {|r| ::Object.const_get(r[:testcase])}
               _run_suites(suites, type)
             end
             unless error.empty?
               puts "\n""Retrying hung up testcases..."
-              error.map! {|r| ::Object.const_get(r[:testcase])}
+              error = error.map do |r|
+                begin
+                  ::Object.const_get(r[:testcase])
+                rescue NameError
+                  # testcase doesn't specify the correct case, so show `r` for information
+                  require 'pp'
+
+                  $stderr.puts "Retrying is failed because the file and testcase is not consistent:"
+                  PP.pp r, $stderr
+                  @errors += 1
+                  nil
+                end
+              end.compact
               verbose = @verbose
               job_status = options[:job_status]
               options[:verbose] = @verbose = true
@@ -759,7 +771,7 @@ def _run_parallel suites, type, result
           unless rep.empty?
             rep.each do |r|
               if r[:error]
-                puke(*r[:error], Timeout::Error)
+                puke(*r[:error], Timeout::Error.new)
                 next
               end
               r[:report]&.each do |f|
@@ -779,6 +791,7 @@ def _run_parallel suites, type, result
             warn ""
             @warnings.uniq! {|w| w[1].message}
             @warnings.each do |w|
+              @errors += 1
               warn "#{w[0]}: #{w[1].message} (#{w[1].class})"
             end
             warn ""
@@ -848,7 +861,7 @@ def update_list(list, rec, max)
         end
       end
 
-      def record(suite, method, assertions, time, error)
+      def record(suite, method, assertions, time, error, source_location = nil)
         if @options.values_at(:longest, :most_asserted).any?
           @tops ||= {}
           rec = [suite.name, method, assertions, time, error]
@@ -946,7 +959,7 @@ def output
       end
 
       def _prepare_run(suites, type)
-        options[:job_status] ||= :replace if @tty && !@verbose
+        options[:job_status] ||= @tty ? :replace : :normal unless @verbose
         case options[:color]
         when :always
           color = true
@@ -962,11 +975,14 @@ def _prepare_run(suites, type)
         @output = Output.new(self) unless @options[:testing]
         filter = options[:filter]
         type = "#{type}_methods"
-        total = if filter
-                  suites.inject(0) {|n, suite| n + suite.send(type).grep(filter).size}
-                else
-                  suites.inject(0) {|n, suite| n + suite.send(type).size}
-                end
+        total = suites.sum {|suite|
+          methods = suite.send(type)
+          if filter
+            methods.count {|method| filter === "#{suite}##{method}"}
+          else
+            methods.size
+          end
+        }
         @test_count = 0
         @total_tests = total.to_s(10)
       end
@@ -1004,7 +1020,7 @@ def failed(s)
           end
           first, msg = msg.split(/$/, 2)
           first = sprintf("%3d) %s", @report_count += 1, first)
-          $stdout.print(sep, @colorize.decorate(first, color), msg, "\n")
+          @failed_output.print(sep, @colorize.decorate(first, color), msg, "\n")
           sep = nil
         end
         report.clear
@@ -1060,7 +1076,7 @@ def print(s)
             runner.add_status(" = #$1")
           when /\A\.+\z/
             runner.succeed
-          when /\A\.*[EFS][EFS.]*\z/
+          when /\A\.*[EFST][EFST.]*\z/
             runner.failed(s)
           else
             $stdout.print(s)
@@ -1165,6 +1181,28 @@ def non_options(files, options)
       end
     end
 
+    module OutputOption # :nodoc: all
+      def setup_options(parser, options)
+        super
+        parser.separator "output options:"
+
+        options[:failed_output] = $stdout
+        parser.on '--stderr-on-failure', 'Use stderr to print failure messages' do
+          options[:failed_output] = $stderr
+        end
+        parser.on '--stdout-on-failure', 'Use stdout to print failure messages', '(default)' do
+          options[:failed_output] = $stdout
+        end
+      end
+
+      def process_args(args = [])
+        return @options if @options
+        options = super
+        @failed_output = options[:failed_output]
+        options
+      end
+    end
+
     module GCOption # :nodoc: all
       def setup_options(parser, options)
         super
@@ -1226,8 +1264,13 @@ def non_options(files, options)
             puts "#{f}: #{$!}"
           end
         }
+        @load_failed = errors.size.nonzero?
         result
       end
+
+      def run(*)
+        super or @load_failed
+      end
     end
 
     module RepeatOption # :nodoc: all
@@ -1238,10 +1281,15 @@ def setup_options(parser, options)
         parser.on '--repeat-count=NUM', "Number of times to repeat", Integer do |n|
           options[:repeat_count] = n
         end
+        options[:keep_repeating] = false
+        parser.on '--[no-]keep-repeating', "Keep repeating even failed" do |n|
+          options[:keep_repeating] = true
+        end
       end
 
       def _run_anything(type)
         @repeat_count = @options[:repeat_count]
+        @keep_repeating = @options[:keep_repeating]
         super
       end
     end
@@ -1329,6 +1377,95 @@ def non_options(files, options)
       end
     end
 
+    module LaunchableOption
+      module Nothing
+        private
+        def setup_options(opts, options)
+          super
+          opts.define_tail 'Launchable options:'
+          # This is expected to be called by Test::Unit::Worker.
+          opts.on_tail '--launchable-test-reports=PATH', String, 'Do nothing'
+        end
+      end
+
+      def record(suite, method, assertions, time, error, source_location = nil)
+        if writer = @options[:launchable_test_reports]
+          if loc = (source_location || suite.instance_method(method).source_location)
+            path, lineno = loc
+            # Launchable JSON schema is defined at
+            # https://github.com/search?q=repo%3Alaunchableinc%2Fcli+https%3A%2F%2Flaunchableinc.com%2Fschema%2FRecordTestInput&type=code.
+            e = case error
+                when nil
+                  status = 'TEST_PASSED'
+                  nil
+                when Test::Unit::PendedError
+                  status = 'TEST_SKIPPED'
+                  "Skipped:\n#{suite.name}##{method} [#{location error}]:\n#{error.message}\n"
+                when Test::Unit::AssertionFailedError
+                  status = 'TEST_FAILED'
+                  "Failure:\n#{suite.name}##{method} [#{location error}]:\n#{error.message}\n"
+                when Timeout::Error
+                  status = 'TEST_FAILED'
+                  "Timeout:\n#{suite.name}##{method}\n"
+                else
+                  status = 'TEST_FAILED'
+                  bt = Test::filter_backtrace(error.backtrace).join "\n    "
+                  "Error:\n#{suite.name}##{method}:\n#{error.class}: #{error.message.b}\n    #{bt}\n"
+                end
+            repo_path = File.expand_path("#{__dir__}/../../../")
+            relative_path = path.delete_prefix("#{repo_path}/")
+            # The test path is a URL-encoded representation.
+            # https://github.com/launchableinc/cli/blob/v1.81.0/launchable/testpath.py#L18
+            test_path = {file: relative_path, class: suite.name, testcase: method}.map{|key, val|
+              "#{encode_test_path_component(key)}=#{encode_test_path_component(val)}"
+            }.join('#')
+          end
+        end
+        super
+      ensure
+        if writer && test_path && status
+          # Occasionally, the file writing operation may be paused, especially when `--repeat-count` is specified.
+          # In such cases, we proceed to execute the operation here.
+          writer.write_object(
+            {
+              testPath: test_path,
+              status: status,
+              duration: time,
+              createdAt: Time.now.to_s,
+              stderr: e,
+              stdout: nil,
+              data: {
+                lineNumber: lineno
+              }
+            }
+          )
+        end
+      end
+
+      private
+      def setup_options(opts, options)
+        super
+        opts.on_tail '--launchable-test-reports=PATH', String, 'Report test results in Launchable JSON format' do |path|
+          require_relative '../launchable'
+          options[:launchable_test_reports] = writer = Launchable::JsonStreamWriter.new(path)
+          writer.write_array('testCases')
+          main_pid = Process.pid
+          at_exit {
+            # This block is executed when the fork block in a test is completed.
+            # Therefore, we need to verify whether all tests have been completed.
+            stack = caller
+            if stack.size == 0 && main_pid == Process.pid && $!.is_a?(SystemExit)
+              writer.close
+            end
+          }
+        end
+
+        def encode_test_path_component component
+          component.to_s.gsub('%', '%25').gsub('=', '%3D').gsub('#', '%23').gsub('&', '%26')
+        end
+      end
+    end
+
     class Runner # :nodoc: all
 
       attr_accessor :report, :failures, :errors, :skips # :nodoc:
@@ -1474,7 +1611,7 @@ def _run_anything type
               [(@repeat_count ? "(#{@@current_repeat_count}/#{@repeat_count}) " : ""), type,
                 t, @test_count.fdiv(t), @assertion_count.fdiv(t)]
         end while @repeat_count && @@current_repeat_count < @repeat_count &&
-                  report.empty? && failures.zero? && errors.zero?
+                  (@keep_repeating || report.empty? && failures.zero? && errors.zero?)
 
         output.sync = old_sync if sync
 
@@ -1518,7 +1655,7 @@ def _run_suite suite, type
           _start_method(inst)
           inst._assertions = 0
 
-          print "#{suite}##{method} = " if @verbose
+          print "#{suite}##{method.inspect.sub(/\A:/, '')} = " if @verbose
 
           start_time = Time.now if @verbose
           result =
@@ -1533,9 +1670,7 @@ def _run_suite suite, type
           puts if @verbose
           $stdout.flush
 
-          unless defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # compiler process is wrongly considered as leak
-            leakchecker.check("#{inst.class}\##{inst.__name__}") if RUBY_ENGINE == 'ruby'
-          end
+          leakchecker.check("#{inst.class}\##{inst.__name__}") if RUBY_ENGINE == 'ruby'
 
           _end_method(inst)
 
@@ -1566,19 +1701,11 @@ def _end_method(inst)
       # failure or error in teardown, it will be sent again with the
       # error or failure.
 
-      def record suite, method, assertions, time, error
+      def record suite, method, assertions, time, error, source_location = nil
       end
 
       def location e # :nodoc:
-        last_before_assertion = ""
-
-        return '<empty>' unless e.backtrace # SystemStackError can return nil.
-
-        e.backtrace.reverse_each do |s|
-          break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
-          last_before_assertion = s
-        end
-        last_before_assertion.sub(/:in .*$/, '')
+        Test::Unit.location e
       end
 
       ##
@@ -1624,7 +1751,7 @@ def _run args = []
           break unless report.empty?
         end
 
-        return failures + errors if self.test_count > 0 # or return nil...
+        return (failures + errors).nonzero? # or return nil...
       rescue Interrupt
         abort 'Interrupted'
       end
@@ -1650,12 +1777,14 @@ def status io = self.output
       prepend Test::Unit::Statistics
       prepend Test::Unit::Skipping
       prepend Test::Unit::GlobOption
+      prepend Test::Unit::OutputOption
       prepend Test::Unit::RepeatOption
       prepend Test::Unit::LoadPathOption
       prepend Test::Unit::GCOption
       prepend Test::Unit::ExcludesOption
       prepend Test::Unit::TimeoutOption
       prepend Test::Unit::RunCount
+      prepend Test::Unit::LaunchableOption::Nothing
 
       ##
       # Begins the full test run. Delegates to +runner+'s #_run method.
@@ -1691,6 +1820,9 @@ def puke klass, meth, e
             when Test::Unit::AssertionFailedError then
               @failures += 1
               "Failure:\n#{klass}##{meth} [#{location e}]:\n#{e.message}\n"
+            when Timeout::Error
+              @errors += 1
+              "Timeout:\n#{klass}##{meth}\n"
             else
               @errors += 1
               bt = Test::filter_backtrace(e.backtrace).join "\n    "
@@ -1709,6 +1841,7 @@ def puke klass, meth, e
     class AutoRunner # :nodoc: all
       class Runner < Test::Unit::Runner
         include Test::Unit::RequireFiles
+        include Test::Unit::LaunchableOption
       end
 
       attr_accessor :to_run, :options
@@ -1717,6 +1850,7 @@ def initialize(force_standalone = false, default_dir = nil, argv = ARGV)
         @force_standalone = force_standalone
         @runner = Runner.new do |files, options|
           base = options[:base_directory] ||= default_dir
+          @runner.prefix = base ? (base + "/") : nil
           files << default_dir if files.empty? and default_dir
           @to_run = files
           yield self if block_given?
diff --git a/test/tool/lib/test/unit/assertions.rb b/test/tool/lib/test/unit/assertions.rb
index fe3351107ec..19581fc3ab3 100644
--- a/test/tool/lib/test/unit/assertions.rb
+++ b/test/tool/lib/test/unit/assertions.rb
@@ -798,33 +798,37 @@ def assert_no_warning(pat, msg = nil)
       MIN_MEASURABLE = 1.0 / MIN_HZ
 
       def assert_cpu_usage_low(msg = nil, pct: 0.05, wait: 1.0, stop: nil)
-        require 'benchmark'
-
         wait = EnvUtil.apply_timeout_scale(wait)
         if wait < 0.1 # TIME_QUANTUM_USEC in thread_pthread.c
           warn "test #{msg || 'assert_cpu_usage_low'} too short to be accurate"
         end
-        tms = Benchmark.measure(msg || '') do
-          if stop
-            th = Thread.start {sleep wait; stop.call}
-            yield
-            th.join
-          else
-            begin
-              Timeout.timeout(wait) {yield}
-            rescue Timeout::Error
-            end
+
+        t0, r0 = Process.times, Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+        if stop
+          th = Thread.start {sleep wait; stop.call}
+          yield
+          th.join
+        else
+          begin
+            Timeout.timeout(wait) {yield}
+          rescue Timeout::Error
           end
         end
 
-        max = pct * tms.real
+        t1, r1 = Process.times, Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+        total = t1.utime - t0.utime + t1.stime - t0.stime + t1.cutime - t0.cutime + t1.cstime - t0.cstime
+        real = r1 - r0
+
+        max = pct * real
         min_measurable = MIN_MEASURABLE
         min_measurable *= 1.30 # add a little (30%) to account for misc. overheads
         if max < min_measurable
           max = min_measurable
         end
 
-        assert_operator tms.total, :<=, max, msg
+        assert_operator total, :<=, max, msg
       end
 
       def assert_is_minus_zero(f)
diff --git a/test/tool/lib/test/unit/parallel.rb b/test/tool/lib/test/unit/parallel.rb
index b3a8957f26e..188a0d1a191 100644
--- a/test/tool/lib/test/unit/parallel.rb
+++ b/test/tool/lib/test/unit/parallel.rb
@@ -1,12 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.unshift "#{__dir__}/../.."
-require_relative '../../test/unit'
 
-require_relative '../../profile_test_all' if ENV.key?('RUBY_TEST_ALL_PROFILE')
-require_relative '../../tracepointchecker'
-require_relative '../../zombie_hunter'
-require_relative '../../iseq_loader_checker'
-require_relative '../../gc_checker'
+require_relative "../../../test/init"
 
 module Test
   module Unit
@@ -133,7 +127,18 @@ def run(args = []) # :nodoc:
               else
                 _report "ready"
               end
-            when /^quit$/
+            when /^quit (.+?)$/, "quit"
+              if $1 == "timeout"
+                err = ["", "!!! worker #{$$} killed due to timeout:"]
+                Thread.list.each do |th|
+                  err << "#{ th.inspect }:"
+                  th.backtrace.each do |s|
+                    err << "  #{ s }"
+                  end
+                end
+                err << ""
+                STDERR.puts err.join("\n")
+              end
               _report "bye"
               exit
             end
@@ -186,7 +191,7 @@ def record(suite, method, assertions, time, error) # :nodoc:
         else
           error = ProxyError.new(error)
         end
-        _report "record", Marshal.dump([suite.name, method, assertions, time, error])
+        _report "record", Marshal.dump([suite.name, method, assertions, time, error, suite.instance_method(method).source_location])
         super
       end
     end
@@ -208,5 +213,9 @@ def self.on_parallel_worker?
     end
   end
   require 'rubygems'
+  begin
+    require 'rake'
+  rescue LoadError
+  end
   Test::Unit::Worker.new.run(ARGV)
 end
diff --git a/test/tool/lib/test/unit/testcase.rb b/test/tool/lib/test/unit/testcase.rb
index 44d9ba7fdbf..51ffff37ebc 100644
--- a/test/tool/lib/test/unit/testcase.rb
+++ b/test/tool/lib/test/unit/testcase.rb
@@ -137,6 +137,9 @@ class TestCase
 
       attr_reader :__name__ # :nodoc:
 
+      # Method name of this test.
+      alias method_name __name__
+
       PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException,
                                 Interrupt, SystemExit] # :nodoc:
 
@@ -144,8 +147,7 @@ class TestCase
       # Runs the tests reporting the status to +runner+
 
       def run runner
-        @options = runner.options
-
+        @__runner_options__ = runner.options
         trap "INFO" do
           runner.report.each_with_index do |msg, i|
             warn "\n%3d) %s" % [i + 1, msg]
@@ -161,7 +163,7 @@ def run runner
         result = ""
 
         begin
-          @passed = nil
+          @__passed__ = nil
           self.before_setup
           self.setup
           self.after_setup
@@ -169,11 +171,11 @@ def run runner
           result = "." unless io?
           time = Time.now - start_time
           runner.record self.class, self.__name__, self._assertions, time, nil
-          @passed = true
+          @__passed__ = true
         rescue *PASSTHROUGH_EXCEPTIONS
           raise
         rescue Exception => e
-          @passed = Test::Unit::PendedError === e
+          @__passed__ = Test::Unit::PendedError === e
           time = Time.now - start_time
           runner.record self.class, self.__name__, self._assertions, time, e
           result = runner.puke self.class, self.__name__, e
@@ -184,7 +186,7 @@ def run runner
             rescue *PASSTHROUGH_EXCEPTIONS
               raise
             rescue Exception => e
-              @passed = false
+              @__passed__ = false
               runner.record self.class, self.__name__, self._assertions, time, e
               result = runner.puke self.class, self.__name__, e
             end
@@ -206,12 +208,12 @@ def run_test(name)
       def initialize name # :nodoc:
         @__name__ = name
         @__io__ = nil
-        @passed = nil
-        @@current = self # FIX: make thread local
+        @__passed__ = nil
+        @@__current__ = self # FIX: make thread local
       end
 
       def self.current # :nodoc:
-        @@current # FIX: make thread local
+        @@__current__ # FIX: make thread local
       end
 
       ##
@@ -263,7 +265,7 @@ def self.test_methods # :nodoc:
       # Returns true if the test passed.
 
       def passed?
-        @passed
+        @__passed__
       end
 
       ##
diff --git a/test/tool/lib/vcs.rb b/test/tool/lib/vcs.rb
index c41276e3b49..602f6dd519c 100644
--- a/test/tool/lib/vcs.rb
+++ b/test/tool/lib/vcs.rb
@@ -1,6 +1,8 @@
 # vcs
 require 'fileutils'
 require 'optparse'
+require 'pp'
+require 'tempfile'
 
 # This library is used by several other tools/ scripts to detect the current
 # VCS in use (e.g. SVN, Git) or to interact with that VCS.
@@ -9,6 +11,22 @@
 
 class VCS
   DEBUG_OUT = STDERR.dup
+
+  def self.dump(obj, pre = nil)
+    out = DEBUG_OUT
+    @pp ||= PP.new(out)
+    @pp.guard_inspect_key do
+      if pre
+        @pp.group(pre.size, pre) {
+          obj.pretty_print(@pp)
+        }
+      else
+        obj.pretty_print(@pp)
+      end
+      @pp.flush
+      out << "\n"
+    end
+  end
 end
 
 unless File.respond_to? :realpath
@@ -19,37 +37,23 @@ def File.realpath(arg)
 end
 
 def IO.pread(*args)
-  VCS::DEBUG_OUT.puts(args.inspect) if $DEBUG
+  VCS.dump(args, "args: ") if $DEBUG
   popen(*args) {|f|f.read}
 end
 
 module DebugPOpen
   refine IO.singleton_class do
     def popen(*args)
-      VCS::DEBUG_OUT.puts args.inspect if $DEBUG
+      VCS.dump(args, "args: ") if $DEBUG
       super
     end
   end
 end
 using DebugPOpen
 module DebugSystem
-  def system(*args)
-    VCS::DEBUG_OUT.puts args.inspect if $DEBUG
-    exception = false
-    opts = Hash.try_convert(args[-1])
-    if RUBY_VERSION >= "2.6"
-      unless opts
-        opts = {}
-        args << opts
-      end
-      exception = opts.fetch(:exception) {opts[:exception] = true}
-    elsif opts
-      exception = opts.delete(:exception) {true}
-      args.pop if opts.empty?
-    end
-    ret = super(*args)
-    raise "Command failed with status (#$?): #{args[0]}" if exception and !ret
-    ret
+  def system(*args, exception: true, **opts)
+    VCS.dump(args, "args: ") if $DEBUG
+    super(*args, exception: exception, **opts)
   end
 end
 
@@ -69,6 +73,9 @@ def self.detect(path = '.', options = {}, parser = nil, **opts)
     begin
       @@dirs.each do |dir, klass, pred|
         if pred ? pred[curr, dir] : File.directory?(File.join(curr, dir))
+          if klass.const_defined?(:COMMAND)
+            IO.pread([{'LANG' => 'C', 'LC_ALL' => 'C'}, klass::COMMAND, "--version"]) rescue next
+          end
           vcs = klass.new(curr)
           vcs.define_options(parser) if parser
           vcs.set_options(options)
@@ -92,9 +99,23 @@ def self.define_options(parser, opts = {})
     parser.separator("  VCS common options:")
     parser.define("--[no-]dryrun") {|v| opts[:dryrun] = v}
     parser.define("--[no-]debug") {|v| opts[:debug] = v}
+    parser.define("-z", "--zone=OFFSET", /\A[-+]\d\d:\d\d\z/) {|v| opts[:zone] = v}
     opts
   end
 
+  def release_date(time)
+    t = time.getlocal(@zone)
+    [
+      t.strftime('#define RUBY_RELEASE_YEAR %Y'),
+      t.strftime('#define RUBY_RELEASE_MONTH %-m'),
+      t.strftime('#define RUBY_RELEASE_DAY %-d'),
+    ]
+  end
+
+  def self.short_revision(rev)
+    rev
+  end
+
   attr_reader :srcdir
 
   def initialize(path)
@@ -112,14 +133,14 @@ def define_options(parser)
   def set_options(opts)
     @debug = opts.fetch(:debug) {$DEBUG}
     @dryrun = opts.fetch(:dryrun) {@debug}
+    @zone = opts.fetch(:zone) {'+09:00'}
   end
 
   attr_reader :dryrun, :debug
   alias dryrun? dryrun
   alias debug? debug
 
-  NullDevice = defined?(IO::NULL) ? IO::NULL :
-    %w[/dev/null NUL NIL: NL:].find {|dev| File.exist?(dev)}
+  NullDevice = IO::NULL
 
   # returns
   # * the last revision of the current branch
@@ -132,7 +153,7 @@ def get_revisions(path)
     end
     last, changed, modified, *rest = (
       begin
-        if NullDevice
+        if NullDevice and !debug?
           save_stderr = STDERR.dup
           STDERR.reopen NullDevice, 'w'
         end
@@ -159,6 +180,7 @@ def get_revisions(path)
       rescue ArgumentError
         modified = Time.utc(*$~[1..6]) + $7.to_i * 3600 + $8.to_i * 60
       end
+      modified = modified.getlocal(@zone)
     end
     return last, changed, modified, *rest
   end
@@ -190,6 +212,7 @@ def relative_to(path)
 
   def after_export(dir)
     FileUtils.rm_rf(Dir.glob("#{dir}/.git*"))
+    FileUtils.rm_rf(Dir.glob("#{dir}/.mailmap"))
   end
 
   def revision_handler(rev)
@@ -204,170 +227,60 @@ def short_revision(rev)
     revision_handler(rev).short_revision(rev)
   end
 
-  class SVN < self
-    register(".svn")
-    COMMAND = ENV['SVN'] || 'svn'
-
-    def self.revision_name(rev)
-      "r#{rev}"
-    end
-
-    def self.short_revision(rev)
-      rev
-    end
-
-    def _get_revisions(path, srcdir = nil)
-      if srcdir and self.class.local_path?(path)
-        path = File.join(srcdir, path)
-      end
-      if srcdir
-        info_xml = IO.pread(%W"#{COMMAND} info --xml #{srcdir}")
-        info_xml = nil unless info_xml[/<url>(.*)<\/url>/, 1] == path.to_s
-      end
-      info_xml ||= IO.pread(%W"#{COMMAND} info --xml #{path}")
-      _, last, _, changed, _ = info_xml.split(/revision="(\d+)"/)
-      modified = info_xml[/<date>([^<>]*)/, 1]
-      branch = info_xml[%r'<relative-url>\^/(?:branches/|tags/)?([^<>]+)', 1]
-      [Integer(last), Integer(changed), modified, branch]
-    end
-
-    def self.search_root(path)
-      return unless local_path?(path)
-      parent = File.realpath(path)
-      begin
-        parent = File.dirname(wkdir = parent)
-        return wkdir if File.directory?(wkdir + "/.svn")
-      end until parent == wkdir
-    end
-
-    def get_info
-      @info ||= IO.pread(%W"#{COMMAND} info --xml #{@srcdir}")
-    end
-
-    def url
-      @url ||= begin
-        url = get_info[/<root>(.*)<\/root>/, 1]
-        @url = URI.parse(url+"/") if url
-      end
-    end
-
-    def wcroot
-      @wcroot ||= begin
-        info = get_info
-        @wcroot = info[/<wcroot-abspath>(.*)<\/wcroot-abspath>/, 1]
-        @wcroot ||= self.class.search_root(@srcdir)
-      end
-    end
-
-    def branch(name)
-      return trunk if name == "trunk"
-      url + "branches/#{name}"
-    end
-
-    def tag(name)
-      url + "tags/#{name}"
-    end
-
-    def trunk
-      url + "trunk"
-    end
-    alias master trunk
-
-    def branch_list(pat)
-      IO.popen(%W"#{COMMAND} ls #{branch('')}") do |f|
-        f.each do |line|
-          line.chomp!
-          line.chomp!('/')
-          yield(line) if File.fnmatch?(pat, line)
-        end
-      end
-    end
-
-    def grep(pat, tag, *files, &block)
-      cmd = %W"#{COMMAND} cat"
-      files.map! {|n| File.join(tag, n)} if tag
-      set = block.binding.eval("proc {|match| $~ = match}")
-      IO.popen([cmd, *files]) do |f|
-        f.grep(pat) do |s|
-          set[$~]
-          yield s
-        end
-      end
-    end
+  # make-snapshot generates only release_date whereas file2lastrev generates both release_date and release_datetime
+  def revision_header(last, release_date, release_datetime = nil, branch = nil, title = nil, limit: 20)
+    short = short_revision(last)
+    if /[^\x00-\x7f]/ =~ title and title.respond_to?(:force_encoding)
+      title = title.dup.force_encoding("US-ASCII")
+    end
+    code = [
+      "#define RUBY_REVISION #{short.inspect}",
+    ]
+    unless short == last
+      code << "#define RUBY_FULL_REVISION #{last.inspect}"
+    end
+    if branch
+      e = '..'
+      name = branch.sub(/\A(.{#{limit-e.size}}).{#{e.size+1},}/o) {$1+e}
+      name = name.dump.sub(/\\#/, '#')
+      code << "#define RUBY_BRANCH_NAME #{name}"
+    end
+    if title
+      title = title.dump.sub(/\\#/, '#')
+      code << "#define RUBY_LAST_COMMIT_TITLE #{title}"
+    end
+    if release_datetime
+      t = release_datetime.utc
+      code << t.strftime('#define RUBY_RELEASE_DATETIME "%FT%TZ"')
+    end
+    code += self.release_date(release_date)
+    code
+  end
 
-    def export(revision, url, dir, keep_temp = false)
-      if @srcdir and (rootdir = wcroot)
-        srcdir = File.realpath(@srcdir)
-        rootdir << "/"
-        if srcdir.start_with?(rootdir)
-          subdir = srcdir[rootdir.size..-1]
-          subdir = nil if subdir.empty?
-          FileUtils.mkdir_p(svndir = dir+"/.svn")
-          FileUtils.ln_s(Dir.glob(rootdir+"/.svn/*"), svndir)
-          system(COMMAND, "-q", "revert", "-R", subdir || ".", :chdir => dir) or return false
-          FileUtils.rm_rf(svndir) unless keep_temp
-          if subdir
-            tmpdir = Dir.mktmpdir("tmp-co.", "#{dir}/#{subdir}")
-            File.rename(tmpdir, tmpdir = "#{dir}/#{File.basename(tmpdir)}")
-            FileUtils.mv(Dir.glob("#{dir}/#{subdir}/{.[^.]*,..?*,*}"), tmpdir)
-            begin
-              Dir.rmdir("#{dir}/#{subdir}")
-            end until (subdir = File.dirname(subdir)) == '.'
-            FileUtils.mv(Dir.glob("#{tmpdir}/#{subdir}/{.[^.]*,..?*,*}"), dir)
-            Dir.rmdir(tmpdir)
-          end
-          return self
+  class GIT < self
+    register(".git") do |path, dir|
+      SAFE_DIRECTORIES ||=
+        begin
+          command = ENV["GIT"] || 'git'
+          dirs = IO.popen(%W"#{command} config --global --get-all safe.directory", &:read).split("\n")
+        rescue
+          command = nil
+          dirs = []
+        ensure
+          VCS.dump(dirs, "safe.directory: ") if $DEBUG
+          COMMAND = command
         end
-      end
-      IO.popen(%W"#{COMMAND} export -r #{revision} #{url} #{dir}") do |pipe|
-        pipe.each {|line| /^A/ =~ line or yield line}
-      end
-      self if $?.success?
-    end
 
-    def after_export(dir)
-      super
-      FileUtils.rm_rf(dir+"/.svn")
+      COMMAND and File.exist?(File.join(path, dir))
     end
 
-    def branch_beginning(url)
-      # `--limit` of svn-log is useless in this case, because it is
-      # applied before `--search`.
-      rev = IO.pread(%W[ #{COMMAND} log --xml
-                         --search=matz --search-and=has\ started
-                         -- #{url}/version.h])[/<logentry\s+revision="(\d+)"/m, 1]
-      rev.to_i if rev
-    end
-
-    def export_changelog(url = '.', from = nil, to = nil, _path = nil, path: _path)
-      range = [to || 'HEAD', (from ? from+1 : branch_beginning(url))].compact.join(':')
-      IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'},
-               %W"#{COMMAND} log -r#{range} #{url}") do |r|
-        IO.copy_stream(r, path)
-      end
-    end
-
-    def commit
-      args = %W"#{COMMAND} commit"
-      if dryrun?
-        VCS::DEBUG_OUT.puts(args.inspect)
-        return true
-      end
-      system(*args)
-    end
-  end
-
-  class GIT < self
-    register(".git") {|path, dir| File.exist?(File.join(path, dir))}
-    COMMAND = ENV["GIT"] || 'git'
-
     def cmd_args(cmds, srcdir = nil)
       (opts = cmds.last).kind_of?(Hash) or cmds << (opts = {})
       opts[:external_encoding] ||= "UTF-8"
       if srcdir
         opts[:chdir] ||= srcdir
       end
-      VCS::DEBUG_OUT.puts cmds.inspect if debug?
+      VCS.dump(cmds, "cmds: ") if debug? and !$DEBUG
       cmds
     end
 
@@ -377,7 +290,7 @@ def cmd_pipe_at(srcdir, cmds, &block)
 
     def cmd_read_at(srcdir, cmds)
       result = without_gitconfig { IO.pread(*cmd_args(cmds, srcdir)) }
-      VCS::DEBUG_OUT.puts result.inspect if debug?
+      VCS.dump(result, "result: ") if debug?
       result
     end
 
@@ -398,7 +311,14 @@ def svn_revision(log)
     def _get_revisions(path, srcdir = nil)
       ref = Branch === path ? path.to_str : 'HEAD'
       gitcmd = [COMMAND]
-      last = cmd_read_at(srcdir, [[*gitcmd, 'rev-parse', ref]]).rstrip
+      last = nil
+      IO.pipe do |r, w|
+        last = cmd_read_at(srcdir, [[*gitcmd, 'rev-parse', ref, err: w]]).rstrip
+        w.close
+        unless r.eof?
+          raise VCS::NotFoundError, "#{COMMAND} rev-parse failed\n#{r.read.gsub(/^(?=\s*\S)/, '  ')}"
+        end
+      end
       log = cmd_read_at(srcdir, [[*gitcmd, 'log', '-n1', '--date=iso', '--pretty=fuller', *path]])
       changed = log[/\Acommit (\h+)/, 1]
       modified = log[/^CommitDate:\s+(.*)/, 1]
@@ -450,26 +370,36 @@ def self.short_revision(rev)
       rev[0, 10]
     end
 
-    def revision_handler(rev)
-      case rev
-      when Integer
-        SVN
-      else
-        super
-      end
-    end
-
     def without_gitconfig
-      home = ENV.delete('HOME')
+      envs = (%w'HOME XDG_CONFIG_HOME' + ENV.keys.grep(/\AGIT_/)).each_with_object({}) do |v, h|
+        h[v] = ENV.delete(v)
+      end
+      ENV['GIT_CONFIG_SYSTEM'] = NullDevice
+      ENV['GIT_CONFIG_GLOBAL'] = global_config
       yield
     ensure
-      ENV['HOME'] = home if home
+      ENV.update(envs)
+    end
+
+    def global_config
+      return NullDevice if SAFE_DIRECTORIES.empty?
+      unless @gitconfig
+        @gitconfig = Tempfile.new(%w"vcs_ .gitconfig")
+        @gitconfig.close
+        ENV['GIT_CONFIG_GLOBAL'] = @gitconfig.path
+        SAFE_DIRECTORIES.each do |dir|
+          system(*%W[#{COMMAND} config --global --add safe.directory #{dir}])
+        end
+        VCS.dump(`#{COMMAND} config --global --get-all safe.directory`, "safe.directory: ") if debug?
+      end
+      @gitconfig.path
     end
 
     def initialize(*)
       super
       @srcdir = File.realpath(@srcdir)
-      VCS::DEBUG_OUT.puts @srcdir.inspect if debug?
+      @gitconfig = nil
+      VCS.dump(@srcdir, "srcdir: ") if debug?
       self
     end
 
@@ -514,7 +444,7 @@ def grep(pat, tag, *files, &block)
 
     def export(revision, url, dir, keep_temp = false)
       system(COMMAND, "clone", "-c", "advice.detachedHead=false", "-s", (@srcdir || '.').to_s, "-b", url, dir) or return
-      (Integer === revision ? GITSVN : GIT).new(File.expand_path(dir))
+      GIT.new(File.expand_path(dir))
     end
 
     def branch_beginning(url)
@@ -524,22 +454,15 @@ def branch_beginning(url)
     end
 
     def export_changelog(url = '@', from = nil, to = nil, _path = nil, path: _path, base_url: nil)
-      svn = nil
       from, to = [from, to].map do |rev|
         rev or next
-        if Integer === rev
-          svn = true
-          rev = cmd_read({'LANG' => 'C', 'LC_ALL' => 'C'},
-                         %W"#{COMMAND} log -n1 --format=format:%H" <<
-                         "--grep=^ *git-svn-id: .*@#{rev} ")
-        end
         rev unless rev.empty?
       end
       unless (from && /./.match(from)) or ((from = branch_beginning(url)) && /./.match(from))
         warn "no starting commit found", uplevel: 1
         from = nil
       end
-      if svn or system(*%W"#{COMMAND} fetch origin refs/notes/commits:refs/notes/commits",
+      if system(*%W"#{COMMAND} fetch origin refs/notes/commits:refs/notes/commits",
                            chdir: @srcdir, exception: false)
         system(*%W"#{COMMAND} fetch origin refs/notes/log-fix:refs/notes/log-fix",
                chdir: @srcdir, exception: false)
@@ -552,22 +475,17 @@ def export_changelog(url = '@', from = nil, to = nil, _path = nil, path: _path,
       else
         arg = ["--since=25 Dec 00:00:00", to]
       end
-      writer =
-        if svn
-          format_changelog_as_svn(path, arg)
-        else
-          if base_url == true
-            remote, = upstream
-            if remote &&= cmd_read(env, %W[#{COMMAND} remote get-url --no-push #{remote}])
-              remote.chomp!
-              # hack to redirect git.r-l.o to github
-              remote.sub!(/\Agit@git\.ruby-lang\.org:/, 'git@github.com:ruby/')
-              remote.sub!(/\Agit@(.*?):(.*?)(?:\.git)?\z/, 'https://\1/\2/commit/')
-            end
-            base_url = remote
-          end
-          format_changelog(path, arg, base_url)
+      if base_url == true
+        remote, = upstream
+        if remote &&= cmd_read(env, %W[#{COMMAND} remote get-url --no-push #{remote}])
+          remote.chomp!
+          # hack to redirect git.r-l.o to github
+          remote.sub!(/\Agit@git\.ruby-lang\.org:/, 'git@github.com:ruby/')
+          remote.sub!(/\Agit@(.*?):(.*?)(?:\.git)?\z/, 'https://\1/\2/commit/')
         end
+        base_url = remote
+      end
+      writer = changelog_formatter(path, arg, base_url)
       if !path or path == '-'
         writer[$stdout]
       else
@@ -577,35 +495,82 @@ def export_changelog(url = '@', from = nil, to = nil, _path = nil, path: _path,
 
     LOG_FIX_REGEXP_SEPARATORS = '/!:;|,#%&'
 
-    def format_changelog(path, arg, base_url = nil)
+    def changelog_formatter(path, arg, base_url = nil)
       env = {'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}
-      cmd = %W"#{COMMAND} log --format=fuller --notes=commits --notes=log-fix --topo-order --no-merges"
+      cmd = %W[#{COMMAND} log
+        --format=fuller --notes=commits --notes=log-fix --topo-order --no-merges
+        --fixed-strings --invert-grep --grep=[ci\ skip] --grep=[skip\ ci]
+      ]
       date = "--date=iso-local"
-      unless system(env, *cmd, date, chdir: @srcdir, out: NullDevice, exception: false)
+      unless system(env, *cmd, date, "-1", chdir: @srcdir, out: NullDevice, exception: false)
         date = "--date=iso"
       end
       cmd << date
       cmd.concat(arg)
       proc do |w|
-        w.print "-*- coding: utf-8 -*-\n\n"
-        w.print "base-url = #{base_url}\n\n" if base_url
+        w.print "-*- coding: utf-8 -*-\n"
+        w.print "\n""base-url = #{base_url}\n" if base_url
+
+        begin
+          ignore_revs = File.readlines(File.join(@srcdir, ".git-blame-ignore-revs"), chomp: true)
+                          .grep_v(/^ *(?:#|$)/)
+                          .to_h {|v| [v, true]}
+          ignore_revs = nil if ignore_revs.empty?
+        rescue Errno::ENOENT
+        end
+
         cmd_pipe(env, cmd, chdir: @srcdir) do |r|
-          while s = r.gets("\ncommit ")
+          r.gets(sep = "commit ")
+          sep = "\n" + sep
+          while s = r.gets(sep, chomp: true)
             h, s = s.split(/^$/, 2)
+            if ignore_revs&.key?(h[/\A\h{40}/])
+              next
+            end
+
+            next if /^Author: *dependabot\[bot\]/ =~ h
+
             h.gsub!(/^(?:(?:Author|Commit)(?:Date)?|Date): /, '  \&')
             if s.sub!(/\nNotes \(log-fix\):\n((?: +.*\n)+)/, '')
               fix = $1
+              next if /\A *skip\Z/ =~ fix
               s = s.lines
               fix.each_line do |x|
+                next unless x.sub!(/^(\s+)(?:(\d+)|\$(?:-\d+)?)/, '')
+                b = ($2&.to_i || (s.size - 1 + $3.to_i))
+                sp = $1
+                if x.sub!(/^,(?:(\d+)|\$(?:-\d+)?)/, '')
+                  range = b..($1&.to_i || (s.size - 1 + $2.to_i))
+                else
+                  range = b..b
+                end
                 case x
-                when %r[^ +(\d+)s([#{LOG_FIX_REGEXP_SEPARATORS}])(.+)\2(.*)\2]o
-                  n = $1.to_i
-                  wrong = $3
-                  correct = $4
-                  begin
-                    s[n][wrong] = correct
-                  rescue IndexError
-                    message = ["format_changelog failed to replace #{wrong.dump} with #{correct.dump} at #$1\n"]
+                when %r[^s([#{LOG_FIX_REGEXP_SEPARATORS}])(.+)\1(.*)\1([gr]+)?]o
+                  wrong = $2
+                  correct = $3
+                  if opt = $4 and opt.include?("r") # regexp
+                    wrong = Regexp.new(wrong)
+                    correct.gsub!(/(?<!\\)(?:\\\\)*\K(?:\\n)+/) {"\n" * ($&.size / 2)}
+                    sub = opt.include?("g") ? :gsub! : :sub!
+                  else
+                    sub = false
+                  end
+                  range.each do |n|
+                    if sub
+                      ss = s[n].sub(/^#{sp}/, "") # un-indent for /^/
+                      if ss.__send__(sub, wrong, correct)
+                        s[n, 1] = ss.lines.map {|l| "#{sp}#{l}"}
+                        next
+                      end
+                    else
+                      begin
+                        s[n][wrong] = correct
+                      rescue IndexError
+                      else
+                        next
+                      end
+                    end
+                    message = ["changelog_formatter failed to replace #{wrong.dump} with #{correct.dump} at #{n}\n"]
                     from = [1, n-2].max
                     to = [s.size-1, n+2].min
                     s.each_with_index do |e, i|
@@ -615,46 +580,30 @@ def format_changelog(path, arg, base_url = nil)
                     end
                     raise message.join('')
                   end
-                when %r[^( +)(\d+)i([#{LOG_FIX_REGEXP_SEPARATORS}])(.*)\3]o
-                  s[$2.to_i, 0] = "#{$1}#{$4}\n"
-                when %r[^ +(\d+)(?:,(\d+))?d]
-                  n = $1.to_i
-                  e = $2
-                  s[n..(e ? e.to_i : n)] = []
+                when %r[^i([#{LOG_FIX_REGEXP_SEPARATORS}])(.*)\1]o
+                  insert = "#{sp}#{$2}\n"
+                  range.reverse_each do |n|
+                    s[n, 0] = insert
+                  end
+                when %r[^d]
+                  s[range] = []
                 end
               end
               s = s.join('')
             end
 
+            s.gsub!(%r[(?!<\w)([-\w]+/[-\w]+)(?:@(\h{8,40})|#(\d{5,}))\b]) do
+              path = defined?($2) ? "commit/#{$2}" : "pull/#{$3}"
+              "[#$&](https://github.com/#{$1}/#{path})"
+            end
             if %r[^ +(https://github\.com/[^/]+/[^/]+/)commit/\h+\n(?=(?: +\n(?i: +Co-authored-by: .*\n)+)?(?:\n|\Z))] =~ s
               issue = "#{$1}pull/"
-              s.gsub!(/\b[Ff]ix(?:e[sd])? \K#(?=\d+)/) {issue}
+              s.gsub!(/\b(?:(?i:fix(?:e[sd])?) +|GH-)\K#(?=\d+\b)|\(\K#(?=\d+\))/) {issue}
             end
 
             s.gsub!(/ +\n/, "\n")
             s.sub!(/^Notes:/, '  \&')
-            w.print h, s
-          end
-        end
-      end
-    end
-
-    def format_changelog_as_svn(path, arg)
-      cmd = %W"#{COMMAND} log --topo-order --no-notes -z --format=%an%n%at%n%B"
-      cmd.concat(arg)
-      proc do |w|
-        sep = "-"*72 + "\n"
-        w.print sep
-        cmd_pipe(cmd) do |r|
-          while s = r.gets("\0")
-            s.chomp!("\0")
-            author, time, s = s.split("\n", 3)
-            s.sub!(/\n\ngit-svn-id: .*@(\d+) .*\n\Z/, '')
-            rev = $1
-            time = Time.at(time.to_i).getlocal("+09:00").strftime("%F %T %z (%a, %d %b %Y)")
-            lines = s.count("\n") + 1
-            lines = "#{lines} line#{lines == 1 ? '' : 's'}"
-            w.print "r#{rev} | #{author} | #{time} | #{lines}\n\n", s, "\n", sep
+            w.print sep, h, s
           end
         end
       end
@@ -674,13 +623,13 @@ def upstream
 
     def commit(opts = {})
       args = [COMMAND, "push"]
-      args << "-n" if dryrun
+      args << "-n" if dryrun?
       remote, branch = upstream
       args << remote
       branches = %W[refs/notes/commits:refs/notes/commits HEAD:#{branch}]
       if dryrun?
         branches.each do |b|
-          VCS::DEBUG_OUT.puts((args + [b]).inspect)
+          VCS.dump(args + [b], "commit: ")
         end
         return true
       end
@@ -691,43 +640,14 @@ def commit(opts = {})
     end
   end
 
-  class GITSVN < GIT
-    def self.revision_name(rev)
-      SVN.revision_name(rev)
-    end
-
-    def last_changed_revision
-      rev = cmd_read(%W"#{COMMAND} svn info"+[STDERR=>[:child, :out]])[/^Last Changed Rev: (\d+)/, 1]
-      com = cmd_read(%W"#{COMMAND} svn find-rev r#{rev}").chomp
-      return rev, com
+  class Null < self
+    def get_revisions(path, srcdir = nil)
+      @modified ||= Time.now - 10
+      return nil, nil, @modified
     end
 
-    def commit(opts = {})
-      rev, com = last_changed_revision
-      head = cmd_read(%W"#{COMMAND} symbolic-ref --short HEAD").chomp
-
-      commits = cmd_read([COMMAND, "log", "--reverse", "--format=%H %ae %ce", "#{com}..@"], "rb").split("\n")
-      commits.each_with_index do |l, i|
-        r, a, c = l.split(' ')
-        dcommit = [COMMAND, "svn", "dcommit"]
-        dcommit.insert(-2, "-n") if dryrun
-        dcommit << "--add-author-from" unless a == c
-        dcommit << r
-        system(*dcommit) or return false
-        system(COMMAND, "checkout", head) or return false
-        system(COMMAND, "rebase") or return false
-      end
-
-      if rev
-        old = [cmd_read(%W"#{COMMAND} log -1 --format=%H").chomp]
-        old << cmd_read(%W"#{COMMAND} svn reset -r#{rev}")[/^r#{rev} = (\h+)/, 1]
-        3.times do
-          sleep 2
-          system(*%W"#{COMMAND} pull --no-edit --rebase")
-          break unless old.include?(cmd_read(%W"#{COMMAND} log -1 --format=%H").chomp)
-        end
-      end
-      true
+    def revision_header(last, release_date, release_datetime = nil, branch = nil, title = nil, limit: 20)
+      self.release_date(release_date)
     end
   end
 end
diff --git a/test/tool/lib/vpath.rb b/test/tool/lib/vpath.rb
index 48ab148405d..fa819f32423 100644
--- a/test/tool/lib/vpath.rb
+++ b/test/tool/lib/vpath.rb
@@ -53,10 +53,11 @@ def foreach(file, *args, &block)
   end
 
   def def_options(opt)
+    opt.separator("  VPath common options:")
     opt.on("-I", "--srcdir=DIR", "add a directory to search path") {|dir|
       @additional << dir
     }
-    opt.on("-L", "--vpath=PATH LIST", "add directories to search path") {|dirs|
+    opt.on("-L", "--vpath=PATH-LIST", "add directories to search path") {|dirs|
       @additional << [dirs]
     }
     opt.on("--path-separator=SEP", /\A(?:\W\z|\.(\W).+)/, "separator for vpath") {|sep, vsep|
@@ -80,6 +81,10 @@ def list
     @list
   end
 
+  def add(path)
+    @additional << path
+  end
+
   def strip(path)
     prefix = list.map {|dir| Regexp.quote(dir)}
     path.sub(/\A#{prefix.join('|')}(?:\/|\z)/, '')
diff --git a/test/tool/travis_retry.sh b/test/tool/travis_retry.sh
deleted file mode 100755
index 9b79c565501..00000000000
--- a/test/tool/travis_retry.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -eu
-# The modified version of `travis_retry` to support custom backoffs, which is used by .travis.yml.
-# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/travis_retry.bash
-
-for sleep in 0 ${WAITS:- 1 25 100}; do
-  sleep "$sleep"
-
-  echo "+ $@"
-  if "$@"; then
-    exit 0
-  fi
-done
-exit 1
diff --git a/tool/concurrent-ruby-travis.sh b/tool/concurrent-ruby-travis.sh
deleted file mode 100755
index 49a5f2cc1d2..00000000000
--- a/tool/concurrent-ruby-travis.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -v -e
-
-# set up JRuby
-mvn clean package
-export PATH=`pwd`/bin:$PATH
-gem install bundler --no-document
-
-# prep for test
-git clone --depth=10 https://github.com/ruby-concurrency/concurrent-ruby.git
-cd concurrent-ruby
-bundle install
-
-# run tests
-bundle exec rake ci
diff --git a/tool/maven-ci-script.sh b/tool/maven-ci-script.sh
index 38d6729e39b..9e8ec901a84 100755
--- a/tool/maven-ci-script.sh
+++ b/tool/maven-ci-script.sh
@@ -6,7 +6,7 @@ set -x
 if [[ -v PHASE ]]
 then
   DOWNLOAD_OUTPUT_FILTER='Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$'
-  ./mvnw $MAVEN_CLI_OPTS -B -Dinvoker.skip=false $PHASE | egrep -v "$DOWNLOAD_OUTPUT_FILTER"
+  ./mvnw -ntp -Dinvoker.skip=false $PHASE | egrep -v "$DOWNLOAD_OUTPUT_FILTER"
 
   MVN_STATUS=${PIPESTATUS[0]}
 
diff --git a/tool/rails_runner b/tool/rails_runner
index dc47e635233..a9ee61d7b4e 100755
--- a/tool/rails_runner
+++ b/tool/rails_runner
@@ -1,4 +1,5 @@
 #!/usr/bin/env jruby
+require 'rbconfig'
 require 'rubygems'
 require 'fileutils'
 require 'optparse'
@@ -7,9 +8,10 @@ ENV['RAILS_ENV'] = "development"
 # FIXME: -rlogger is because logger is getting loaded in CRuby but not
 # for us.  
 ENV['JRUBY_OPTS'] = "--dev -rlogger"
+ENV['JAVA_OPTS'] = "-Djava.net.preferIPv4Stack=true"
 
 #launcher, options, rails_version = "jruby", "", "6.1.3.2"
-launcher, options, rails_version = "jruby", "", "7.0.8.7"
+launcher, options, rails_version = "jruby", "", "7.0.10"
 OptionParser.new do |opt|
   opt.banner = "Usage: runner [OPTIONS]"
   opt.separator  ""
@@ -24,14 +26,20 @@ launcher = full_path if File.exist? full_path
 
 $jruby = "#{launcher} #{options} "
 
-def jruby_command(command, *args)
+def jruby_command(command, *args, wait: true)
   command = "#{$jruby} -rlogger -S #{command} #{args.join(' ')}"
   puts "$ #{command}"
-  value = system command
+  if wait
+    value = system command
+  else
+    value = spawn command
+  end
   puts value
+  value
 end
 
 rails_app = 'frogger'
+rails_pid = nil
 
 FileUtils.rm_rf rails_app
 jruby_command("gem", "install rails --version=#{rails_version}")
@@ -40,7 +48,20 @@ Dir.chdir(rails_app) do
   jruby_command("bundle", "update")
   jruby_command("rails", "generate scaffold person name:string")
   jruby_command("rake", "db:migrate")
-#  jruby_command("rails", "webpacker:install")
-#  jruby_command("rails", "server")
+  rails_pid = jruby_command("rails server", wait: false)
 end
+
+begin
+  system("#{$jruby} #{File.join(File.dirname(__FILE__), "verify_rails")}")
+ensure
+  puts "shutting down server"
+  case RbConfig::CONFIG['host_os']
+  when /mswin|win32|windows/
+    system "taskkill /T /PID #{rails_pid}"
+  else
+    Process.kill("TERM", rails_pid)
+    Process.waitpid(rails_pid)
+  end
+end
+
 puts "Done"
diff --git a/tool/release.sh b/tool/release.sh
index 7afe6a70dd7..67c5af52e34 100755
--- a/tool/release.sh
+++ b/tool/release.sh
@@ -20,15 +20,15 @@ echo $JRUBY_VERSION > VERSION
 
 set -x
 
-mvn
-git add VERSION core/pom.xml lib/pom.xml  pom.xml shaded/pom.xml
+./mvnw -ntp
+git add VERSION core/pom.xml lib/pom.xml  pom.xml shaded/pom.xml bin/.jruby.release
 git commit -m "Version $JRUBY_VERSION updated for release"
 cd ..
 rm -rf release
 git clone $REPO release
 cd release
 pwd
-mvn clean deploy -Prelease
+./mvnw -ntp clean deploy -Prelease
 jruby -S rake post_process_artifacts
 
 cd release
diff --git a/tool/sequel-travis.sh b/tool/sequel-travis.sh
deleted file mode 100755
index 5f55f8f97e2..00000000000
--- a/tool/sequel-travis.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-set -v -e
-
-# set up JRuby
-mvn clean package
-export PATH=`pwd`/bin:$PATH
-gem install bundler -v "~>1.17.3"
-
-# set up databases
-mysql -e 'create database sequel_test;'
-psql -c 'create database sequel_test;' -U postgres
-
-# set up sequel
-git clone --depth=10 https://github.com/jeremyevans/sequel.git
-cd sequel
-cp .ci.gemfile Gemfile
-bundle install
-
-# run tests
-bundle exec rake spec_ci
diff --git a/tool/verify_rails b/tool/verify_rails
new file mode 100644
index 00000000000..56bc05c0b42
--- /dev/null
+++ b/tool/verify_rails
@@ -0,0 +1,244 @@
+#!/usr/bin/env ruby
+
+# This script verifies the "people" app generated by tool/rails_runner.rb.
+# All CRUD operations are confirmed.
+# Generated by ChatGPT.
+
+require "net/http"
+require "uri"
+require "cgi"
+require "securerandom"
+
+BASE_URL = "http://localhost:3000"
+
+class Session
+  def initialize(base_url)
+    @base_uri = URI(base_url)
+    @cookies = {}
+  end
+
+  def get(path, headers = {})
+    request(Net::HTTP::Get, path, headers: headers)
+  end
+
+  def post(path, form: {}, headers: {})
+    request(Net::HTTP::Post, path, form: form, headers: headers)
+  end
+
+  private
+
+  def request(klass, path, form: nil, headers: {})
+    uri = URI.join(@base_uri.to_s, path)
+
+    http = Net::HTTP.new(uri.host, uri.port)
+
+    req = klass.new(uri)
+
+    if @cookies.any?
+      req["Cookie"] = @cookies.map { |k, v| "#{k}=#{v}" }.join("; ")
+    end
+
+    headers.each do |k, v|
+      req[k] = v
+    end
+
+    req.set_form_data(form) if form
+
+    response = http.request(req)
+
+    store_cookies(response)
+
+    unless response.is_a?(Net::HTTPSuccess) ||
+           response.is_a?(Net::HTTPRedirection)
+      raise "#{req.method} #{path} failed: #{response.code}\n#{response.body}"
+    end
+
+    response
+  end
+
+  def store_cookies(response)
+    set_cookie_headers = response.get_fields("Set-Cookie")
+    return unless set_cookie_headers
+
+    set_cookie_headers.each do |cookie|
+      pair = cookie.split(";").first
+      key, value = pair.split("=", 2)
+      @cookies[key] = value
+    end
+  end
+end
+
+def extract_csrf_token(html)
+  match = html.match(
+    /<meta\s+name=["']csrf-token["']\s+content=["']([^"']+)["']/
+  )
+
+  raise "Could not find CSRF token" unless match
+
+  CGI.unescapeHTML(match[1])
+end
+
+def extract_person_id(location)
+  match = location.match(%r{/people/(\d+)})
+  raise "Could not extract person id from #{location}" unless match
+  match[1]
+end
+
+puts "Waiting for server to start..."
+tries = 0
+begin
+  sock = TCPSocket.new("localhost", 3000)
+rescue
+  puts $!
+  sleep 5
+  retry unless tries > 10
+  raise
+else
+  sock.close
+end
+
+session = Session.new(BASE_URL)
+
+original_name = "Person-#{SecureRandom.hex(6)}"
+updated_name  = "Updated-#{SecureRandom.hex(6)}"
+
+puts "Original name: #{original_name}"
+puts "Updated name:  #{updated_name}"
+
+#
+# Step 1: Load index page to establish session + csrf token
+#
+index_response = session.get("/people")
+
+csrf_token = extract_csrf_token(index_response.body)
+
+puts "Fetched CSRF token"
+
+#
+# Step 2: Create person
+#
+create_response = session.post(
+  "/people",
+  form: {
+    "person[name]" => original_name
+  },
+  headers: {
+    "X-CSRF-Token" => csrf_token,
+    "Referer" => "#{BASE_URL}/people"
+  }
+)
+
+location = create_response["Location"] || create_response["location"]
+
+raise "Missing redirect location" unless location
+
+person_id = extract_person_id(location)
+
+puts "Created person id=#{person_id}"
+
+#
+# Step 3: Verify person appears in index
+#
+index_response = session.get("/people")
+
+unless index_response.body.include?(original_name)
+  raise "Original name not found in people index"
+end
+
+puts "Verified person appears in index"
+
+#
+# Step 4: View person page
+#
+show_response = session.get("/people/#{person_id}")
+
+unless show_response.body.include?(original_name)
+  raise "Original name missing from show page"
+end
+
+puts "Verified person show page"
+
+#
+# Step 5: Update person name
+#
+update_csrf = extract_csrf_token(show_response.body)
+
+update_response = session.post(
+  "/people/#{person_id}",
+  form: {
+    "_method" => "patch",
+    "person[name]" => updated_name
+  },
+  headers: {
+    "X-CSRF-Token" => update_csrf,
+    "Referer" => "#{BASE_URL}/people/#{person_id}/edit"
+  }
+)
+
+unless update_response.is_a?(Net::HTTPRedirection)
+  raise "Update did not redirect"
+end
+
+puts "Updated person"
+
+#
+# Step 6: Verify updated name in index
+#
+updated_index = session.get("/people")
+
+unless updated_index.body.include?(updated_name)
+  raise "Updated name not found in people index"
+end
+
+if updated_index.body.include?(original_name)
+  raise "Original name still present after update"
+end
+
+puts "Verified updated name in index"
+
+#
+# Step 7: Verify updated show page
+#
+updated_show = session.get("/people/#{person_id}")
+
+unless updated_show.body.include?(updated_name)
+  raise "Updated name missing from show page"
+end
+
+puts "Verified updated show page"
+
+#
+# Step 8: Delete person
+#
+delete_csrf = extract_csrf_token(updated_show.body)
+
+delete_response = session.post(
+  "/people/#{person_id}",
+  form: {
+    "_method" => "delete"
+  },
+  headers: {
+    "X-CSRF-Token" => delete_csrf,
+    "Referer" => "#{BASE_URL}/people/#{person_id}"
+  }
+)
+
+unless delete_response.is_a?(Net::HTTPRedirection)
+  raise "Delete did not redirect"
+end
+
+puts "Deleted person"
+
+#
+# Step 9: Verify person is gone
+#
+final_index = session.get("/people")
+
+if final_index.body.include?(updated_name)
+  raise "Updated person still exists after deletion"
+end
+
+puts "Verified person removed"
+
+puts
+puts "SUCCESS"
\ No newline at end of file